diff --git a/MAINTAINERS b/MAINTAINERS
index 9a143480d61..bc781b6a7d2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -99,7 +99,6 @@ nfs		alfred	Will be happy to review code, but not mandatory.
 rpc.lockd	alfred	Will be happy to review code, but not mandatory.
 truss		alfred	Will be happy to review code, but not mandatory.
 rpc		alfred	Pre-commit review requested.
-pkg_install	portmgr	Pre-commit review or approval from portmgr@ requested.
 linux emul	emulation	Please discuss changes here.
 bs{diff,patch}	cperciva	Pre-commit review requested.
 portsnap	cperciva	Pre-commit review requested.
diff --git a/Makefile.inc1 b/Makefile.inc1
index ac10c2b1412..cf39edf0fb4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -58,6 +58,7 @@
 # use that new version.  And the new (dynamically-linked) /bin/sh
 # will expect to find appropriate libraries in /lib and /libexec.
 #
+SRCDIR?=	${.CURDIR}
 .if defined(SUBDIR_OVERRIDE)
 SUBDIR=	${SUBDIR_OVERRIDE}
 .else
@@ -84,6 +85,9 @@ SUBDIR+=secure
 SUBDIR+=share
 .endif
 SUBDIR+=sys usr.bin usr.sbin
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
 .if ${MK_OFED} != "no"
 SUBDIR+=contrib/ofed
 .endif
@@ -128,8 +132,11 @@ OSRELDATE=	0
 .endif
 
 .if !defined(VERSION)
-VERSION!=	uname -srp
-VERSION+=	${OSRELDATE}
+REVISION!=	make -C ${SRCDIR}/release -V REVISION
+BRANCH!=	make -C ${SRCDIR}/release -V BRANCH
+SRCRELDATE!=	awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
+		${SRCDIR}/sys/sys/param.h
+VERSION=	FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE}
 .endif
 
 KNOWN_ARCHES?=	amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64
@@ -256,6 +263,21 @@ XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
 		-DWITHOUT_GDB
 
+# kernel-tools stage
+KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
+		PATH=${BPATH}:${PATH} \
+		WORLDTMP=${WORLDTMP} \
+		VERSION="${VERSION}" \
+		COMPILER_TYPE=${COMPILER_TYPE}
+KTMAKE=		TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
+		${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
+		DESTDIR= \
+		BOOTSTRAPPING=${OSRELDATE} \
+		SSP_CFLAGS= \
+		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
+		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
+		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF -DEARLY_BUILD
+
 # world stage
 WMAKEENV=	${CROSSENV} \
 		_SHLIBDIRPREFIX=${WORLDTMP} \
@@ -329,7 +351,7 @@ TARGET_ABI=	gnueabi
 .else
 TARGET_ABI=	unknown
 .endif
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
 XFLAGS+=	-target ${TARGET_TRIPLE}
 .endif
 .endif
@@ -485,6 +507,10 @@ _worldtmp:
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.debug.dist \
 	    -p ${WORLDTMP}/usr/lib >/dev/null
 .endif
+.if ${MK_TESTS} != "no"
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \
+	    -p ${WORLDTMP}/usr >/dev/null
+.endif
 .for _mtree in ${LOCAL_MTREE}
 	mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null
 .endfor
@@ -529,6 +555,7 @@ _cross-tools:
 	@echo ">>> stage 3: cross tools"
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; ${XMAKE} cross-tools
+	${_+_}cd ${.CURDIR}; ${XMAKE} kernel-tools
 _includes:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1008,20 +1035,7 @@ buildkernel:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> stage 2.3: build tools"
 	@echo "--------------------------------------------------------------"
-	cd ${KRNLOBJDIR}/${_kernel}; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKESRCPATH=${KERNSRCDIR}/dev/aic7xxx/aicasm \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD \
-	    -f ${KERNSRCDIR}/dev/aic7xxx/aicasm/Makefile
-# XXX - Gratuitously builds aicasm in the ``makeoptions NO_MODULES'' case.
-.if !defined(MODULES_WITH_WORLD) && !defined(NO_MODULES) && exists(${KERNSRCDIR}/modules)
-.for target in obj depend all
-	cd ${KERNSRCDIR}/modules/aic7xxx/aicasm; \
-	    PATH=${BPATH}:${PATH} \
-	    MAKEOBJDIRPREFIX=${KRNLOBJDIR}/${_kernel}/modules \
-	    ${MAKE} SSP_CFLAGS= -DNO_CPU_CFLAGS -DNO_CTF -DEARLY_BUILD ${target}
-.endfor
-.endif
+	${_+_}cd ${.CURDIR}; ${KTMAKE} kernel-tools
 .if !defined(NO_KERNELDEPEND)
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1308,10 +1322,6 @@ bootstrap-tools: .MAKE
 #
 # build-tools: Build special purpose build tools
 #
-.if defined(MODULES_WITH_WORLD) && exists(${KERNSRCDIR}/modules)
-_aicasm= sys/modules/aic7xxx/aicasm
-.endif
-
 .if !defined(NO_SHARE)
 _share=	share/syscons/scrnmaps
 .endif
@@ -1333,7 +1343,6 @@ build-tools: .MAKE
     lib/ncurses/ncurses \
     lib/ncurses/ncursesw \
     ${_share} \
-    ${_aicasm} \
     usr.bin/awk \
     lib/libmagic \
     usr.bin/mkesdb_static \
@@ -1353,6 +1362,23 @@ build-tools: .MAKE
 		${MAKE} DIRPRFX=${_tool}/ all
 .endfor
 
+#
+# kernel-tools: Build kernel-building tools
+#
+kernel-tools: .MAKE
+	mkdir -p ${MAKEOBJDIRPREFIX}/usr
+	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \
+	    -p ${MAKEOBJDIRPREFIX}/usr >/dev/null
+.for _tool in \
+    sys/dev/aic7xxx/aicasm
+	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
+		cd ${.CURDIR}/${_tool} && \
+		${MAKE} DIRPRFX=${_tool}/ obj && \
+		${MAKE} DIRPRFX=${_tool}/ depend && \
+		${MAKE} DIRPRFX=${_tool}/ all && \
+		${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install
+.endfor
+
 #
 # cross-tools: Build cross-building tools
 #
@@ -1377,12 +1403,15 @@ _binutils=	gnu/usr.bin/binutils
 # If an full path to an external cross compiler is given, don't build
 # a cross compiler.
 .if ${XCC:M/*} == "" && ${MK_CROSS_COMPILER} != "no"
-.if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang")
+.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang"
 _clang=		usr.bin/clang
 _clang_libs=	lib/clang
+.else
+_cc=		gnu/usr.bin/cc
 .endif
 
-.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" || ${TARGET} == "pc98")
+# The boot2 for pc98 requires gcc.
+.if ${TARGET} == "pc98"
 _cc=		gnu/usr.bin/cc
 .endif
 .endif
@@ -1446,11 +1475,13 @@ _startup_libs+=	lib/csu/${MACHINE_CPUARCH}
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
+_startup_libs+=	lib/libc_nonshared
 .if ${MK_LIBCPLUSPLUS} != "no"
 _startup_libs+=	lib/libcxxrt
 .endif
 
 gnu/lib/libgcc__L: lib/libc__L
+gnu/lib/libgcc__L: lib/libc_nonshared__L
 .if ${MK_LIBCPLUSPLUS} != "no"
 lib/libcxxrt__L: gnu/lib/libgcc__L
 .endif
@@ -1464,22 +1495,23 @@ _prebuild_libs=	${_kerberos5_lib_libasn1} \
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		${_kerberos5_lib_libwind} \
-		${_lib_atf_libatf_c} \
+		${_lib_atf} \
 		lib/libbz2 ${_libcom_err} lib/libcrypt \
 		lib/libelf lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
-		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
+		lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \
+		${_lib_libcapsicum} \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
 		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
 		${_cddl_lib_libumem} ${_cddl_lib_libnvpair} \
 		${_cddl_lib_libzfs_core} \
-		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
+		lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_lib_libldns} \
 		${_secure_lib_libssh} ${_secure_lib_libssl}
 
-.if ${MK_ATF} != "no"
-_lib_atf_libatf_c=	lib/atf/libatf-c
+.if ${MK_TESTS} != "no"
+_lib_atf=	lib/atf
 .endif
 
 .if ${MK_LIBTHR} != "no"
@@ -1490,6 +1522,13 @@ _lib_libthr=	lib/libthr
 _ofed_lib=	contrib/ofed/usr.lib/
 .endif
 
+.if ${MK_CASPER} != "no"
+_lib_libcapsicum=lib/libcapsicum
+.endif
+
+lib/libcapsicum__L: lib/libnv__L
+lib/libpjdlog__L: lib/libutil__L
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 .for _DIR in ${LOCAL_LIB_DIRS}
 .if exists(${.CURDIR}/${_DIR}/Makefile)
@@ -1588,10 +1627,12 @@ ${_lib}__PL: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
-		${MAKE} DIRPRFX=${_lib}/ obj && \
-		${MAKE} DIRPRFX=${_lib}/ depend && \
-		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \
-		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+		${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+		    DIRPRFX=${_lib}/ all && \
+		${MAKE} -DNO_TESTS -DNO_PROFILE -DNO_PIC \
+		    DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
@@ -1600,10 +1641,10 @@ ${_lib}__L: .PHONY .MAKE
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_lib} && \
-		${MAKE} DIRPRFX=${_lib}/ obj && \
-		${MAKE} DIRPRFX=${_lib}/ depend && \
-		${MAKE} DIRPRFX=${_lib}/ all && \
-		${MAKE} DIRPRFX=${_lib}/ install
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ obj && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ depend && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ all && \
+		${MAKE} -DNO_TESTS DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
@@ -1613,10 +1654,12 @@ ${_lib}__L: .PHONY .MAKE
 lib/libpam__L: .PHONY .MAKE
 	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
 		cd ${.CURDIR}/lib/libpam && \
-		${MAKE} DIRPRFX=lib/libpam/ obj && \
-		${MAKE} DIRPRFX=lib/libpam/ depend && \
-		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all && \
-		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ obj && \
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ depend && \
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+		    -D_NO_LIBPAM_SO_YET all && \
+		${MAKE} -DNO_TESTS DIRPRFX=lib/libpam/ \
+		    -D_NO_LIBPAM_SO_YET install
 
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}
@@ -1672,6 +1715,7 @@ delete-old-files:
 # argument list will get too long. Using .for/.endfor make "loops" will make
 # the Makefile parser segfault.
 	@exec 3<&0; \
+	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
@@ -1694,7 +1738,8 @@ delete-old-files:
 
 check-old-files:
 	@echo ">>> Checking for old files"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_FILES -V "OLD_FILES:Musr/share/*.gz:R" | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
@@ -1715,6 +1760,7 @@ delete-old-libs:
 	@echo ">>> Removing old libraries"
 	@echo "${OLD_LIBS_MESSAGE}" | fmt
 	@exec 3<&0; \
+	cd ${.CURDIR}; \
 	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
@@ -1722,22 +1768,36 @@ delete-old-libs:
 			chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || true; \
 			rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
 		fi; \
+		for ext in debug symbols; do \
+		  if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \
+		      "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+			  rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \
+			      <&3; \
+		  fi; \
+		done; \
 	done
 	@echo ">>> Old libraries removed"
 
 check-old-libs:
 	@echo ">>> Checking for old libraries"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_LIBS | xargs -n1 | \
 	while read file; do \
 		if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; then \
 			echo "${DESTDIR}/$${file}"; \
 		fi; \
+		for ext in debug symbols; do \
+		  if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+			  echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \
+		  fi; \
+		done; \
 	done
 
 delete-old-dirs:
 	@echo ">>> Removing old directories"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | sort -r | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
@@ -1750,7 +1810,8 @@ delete-old-dirs:
 
 check-old-dirs:
 	@echo ">>> Checking for old directories"
-	@${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
+	@cd ${.CURDIR}; \
+	${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
 	    -V OLD_DIRS | xargs -n1 | \
 	while read dir; do \
 		if [ -d "${DESTDIR}/$${dir}" ]; then \
@@ -1830,7 +1891,7 @@ NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
 	CPUTYPE=${XDEV_CPUTYPE}
 
 XDDIR=${XDEV_ARCH}-freebsd
-XDTP=/usr/${XDDIR}
+XDTP=usr/${XDDIR}
 CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \
 	INSTALL="sh ${.CURDIR}/tools/install.sh"
 CDENV= ${CDBENV} \
@@ -1843,8 +1904,8 @@ CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" \
 
 CDTMP=	${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp
 CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN}
-XDDESTDIR=${DESTDIR}${XDTP}
+CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDDESTDIR}/usr/bin:${PATH} ${MAKE} ${NOFUN}
+XDDESTDIR=${DESTDIR}/${XDTP}
 .if !defined(OSREL)
 OSREL!= uname -r | sed -e 's/[-(].*//'
 .endif
@@ -1924,6 +1985,7 @@ _xi-libraries:
 
 _xi-links:
 	${_+_}cd ${XDDESTDIR}/usr/bin; \
+       mkdir -p ../../../../usr/bin; \
 		for i in *; do \
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}-$$i; \
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 9f3fbb9a848..41801c107d8 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,12 +38,104 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20131202: libcapsicum and libcasper moved to /lib/
+OLD_LIBS+=usr/lib/libcapsicum.so.0
+OLD_LIBS+=usr/lib/libcasper.so.0
+# 20131109: extattr(2) mlinks fixed
+OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
+OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
+# 20131107: example files removed
+OLD_FILES+=usr/share/examples/libusb20/aux.c
+OLD_FILES+=usr/share/examples/libusb20/aux.h
+# 20131105: tzdata 2013h import
+OLD_FILES+=usr/share/zoneinfo/America/Shiprock
+OLD_FILES+=usr/share/zoneinfo/Antarctica/South_Pole
+# 20131103: WITH_LIBICONV_COMPAT removal
+OLD_FILES+=usr/include/_libiconv_compat.h
+OLD_FILES+=usr/lib/libiconv.a
+OLD_FILES+=usr/lib/libiconv.so
+OLD_FILES+=usr/lib/libiconv.so.3
+OLD_FILES+=usr/lib/libiconv_p.a
+OLD_FILES+=usr/lib32/libiconv.a
+OLD_FILES+=usr/lib32/libiconv.so
+OLD_FILES+=usr/lib32/libiconv.so.3
+OLD_FILES+=usr/lib32/libiconv_p.a
+# 20131103: removal of utxrm(8), use 'utx rm' instead.
+OLD_FILES+=usr/sbin/utxrm
+OLD_FILES+=usr/share/man/man8/utxrm.8.gz
+# 20131031: pkg_install has been removed
+OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
+OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
+OLD_FILES+=etc/periodic/security/460.chkportsum
+OLD_FILES+=etc/periodic/weekly/400.status-pkg
+OLD_FILES+=usr/sbin/pkg_add
+OLD_FILES+=usr/sbin/pkg_create
+OLD_FILES+=usr/sbin/pkg_delete
+OLD_FILES+=usr/sbin/pkg_info
+OLD_FILES+=usr/sbin/pkg_updating
+OLD_FILES+=usr/sbin/pkg_version
+OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
+OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
+# 20131030: /etc/keys moved to /usr/share/keys
+OLD_DIRS+=etc/keys
+OLD_DIRS+=etc/keys/pkg
+OLD_DIRS+=etc/keys/pkg/revoked
+OLD_DIRS+=etc/keys/pkg/trusted
+OLD_FILES+=etc/keys/pkg/trusted/pkg.freebsd.org.2013102301
+# 20131028: ng_fec(4) removed
+OLD_FILES+=usr/include/netgraph/ng_fec.h
+OLD_FILES+=usr/share/man/man4/ng_fec.4.gz
+# 20131027: header moved
+OLD_FILES+=usr/include/net/pf_mtag.h
+# 20131023: remove never used iscsi directory
+OLD_DIRS+=usr/share/examples/iscsi
+# 20131021: isf(4) removed
+OLD_FILES+=usr/sbin/isfctl
+OLD_FILES+=usr/share/man/man4/isf.4.gz
+OLD_FILES+=usr/share/man/man8/isfctl.8.gz
+# 20131014: libbsdyml becomes private
+OLD_FILES+=usr/lib/libbsdyml.a
+OLD_FILES+=usr/lib/libbsdyml.so
+OLD_LIBS+=usr/lib/libbsdyml.so.0
+OLD_FILES+=usr/lib/libbsdyml_p.a
+OLD_FILES+=usr/lib32/libbsdyml.a
+OLD_FILES+=usr/lib32/libbsdyml.so
+OLD_LIBS+=usr/lib32/libbsdyml.so.0
+OLD_FILES+=usr/lib32/libbsdyml_p.a
+OLD_FILES+=usr/share/man/man3/libbsdyml.3.gz
+OLD_FILES+=usr/include/bsdyml.h
+# 20131013: Removal of the ATF tools
+OLD_FILES+=etc/atf/FreeBSD.conf
+OLD_FILES+=etc/atf/atf-run.hooks
+OLD_FILES+=etc/atf/common.conf
+OLD_FILES+=usr/bin/atf-config
+OLD_FILES+=usr/bin/atf-report
+OLD_FILES+=usr/bin/atf-run
+OLD_FILES+=usr/bin/atf-version
+OLD_FILES+=usr/share/atf/atf-run.hooks
+OLD_FILES+=usr/share/examples/atf/atf-run.hooks
+OLD_FILES+=usr/share/examples/atf/tests-results.css
+OLD_FILES+=usr/share/man/man1/atf-config.1.gz
+OLD_FILES+=usr/share/man/man1/atf-report.1.gz
+OLD_FILES+=usr/share/man/man1/atf-run.1.gz
+OLD_FILES+=usr/share/man/man1/atf-version.1.gz
+OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
+OLD_FILES+=usr/share/man/man7/atf.7.gz
+OLD_FILES+=usr/share/xml/atf/tests-results.dtd
+OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
+# 20131009: freebsd-version moved from /libexec to /bin
+OLD_FILES+=libexec/freebsd-version
 # 20131001: ar and ranlib from binutils not used
 OLD_FILES+=usr/bin/gnu-ar
 OLD_FILES+=usr/bin/gnu-ranlib
 OLD_FILES+=usr/share/man/man1/gnu-ar.1.gz
 OLD_FILES+=usr/share/man/man1/gnu-ranlib.1.gz
 # 20130930: BIND removed from base
+OLD_FILES+=etc/mtree/BIND.chroot.dist
 OLD_FILES+=etc/namedb
 OLD_FILES+=etc/periodic/daily/470.status-named
 OLD_FILES+=usr/bin/dig
@@ -65,7 +157,7 @@ OLD_FILES+=usr/include/lwres/result.h
 OLD_FILES+=usr/include/lwres/version.h
 OLD_FILES+=usr/lib/liblwres.a
 OLD_FILES+=usr/lib/liblwres.so
-OLD_LIBS+=usr/lib/liblwres.so.50
+OLD_LIBS+=usr/lib/liblwres.so.90
 OLD_FILES+=usr/lib/liblwres_p.a
 OLD_FILES+=usr/sbin/arpaname
 OLD_FILES+=usr/sbin/ddns-confgen
@@ -75,6 +167,7 @@ OLD_FILES+=usr/sbin/dnssec-keygen
 OLD_FILES+=usr/sbin/dnssec-revoke
 OLD_FILES+=usr/sbin/dnssec-settime
 OLD_FILES+=usr/sbin/dnssec-signzone
+OLD_FILES+=usr/sbin/dnssec-verify
 OLD_FILES+=usr/sbin/genrandom
 OLD_FILES+=usr/sbin/isc-hmac-fixup
 OLD_FILES+=usr/sbin/lwresd
@@ -238,6 +331,7 @@ OLD_FILES+=usr/share/man/man8/dnssec-keygen.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-revoke.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-settime.8.gz
 OLD_FILES+=usr/share/man/man8/dnssec-signzone.8.gz
+OLD_FILES+=usr/share/man/man8/dnssec-verify.8.gz
 OLD_FILES+=usr/share/man/man8/genrandom.8.gz
 OLD_FILES+=usr/share/man/man8/isc-hmac-fixup.8.gz
 OLD_FILES+=usr/share/man/man8/lwresd.8.gz
@@ -272,6 +366,8 @@ OLD_DIRS+=var/named/var/run
 OLD_DIRS+=var/named/var/run/named
 OLD_DIRS+=var/named/var/stats
 OLD_DIRS+=var/run/named
+# 20130923: example moved
+OLD_FILES+=usr/share/examples/bsdconfig/browse_packages.sh
 # 20130908: libssh becomes private
 OLD_FILES+=usr/lib/libssh.a
 OLD_FILES+=usr/lib/libssh.so
@@ -2455,6 +2551,7 @@ OLD_FILES+=usr/sbin/zfs
 OLD_FILES+=usr/sbin/zpool
 # 20070423: rc.bluetooth (examples) removed
 OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
+OLD_DIRS+=usr/share/examples/netgraph/bluetooth
 # 20070421: worm.4 removed
 OLD_FILES+=usr/share/man/man4/worm.4.gz
 # 20070417: trunk(4) renamed to lagg(4)
@@ -6091,6 +6188,13 @@ OLD_LIBS+=usr/lib/libkse.so.1
 OLD_LIBS+=usr/lib/liblwres.so.3
 OLD_LIBS+=usr/lib/pam_ftp.so.2
 
+# 20131013: Removal of the ATF tools
+OLD_DIRS+=etc/atf
+OLD_DIRS+=usr/share/examples/atf
+OLD_DIRS+=usr/share/xml/atf
+OLD_DIRS+=usr/share/xml
+OLD_DIRS+=usr/share/xsl/atf
+OLD_DIRS+=usr/share/xsl
 # 20040925: bind9 import
 OLD_DIRS+=usr/share/doc/bind/html
 OLD_DIRS+=usr/share/doc/bind/misc
diff --git a/UPDATING b/UPDATING
index 1c7646c2742..c734d065636 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
 head, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
-	FreeBSD 10.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
+	FreeBSD 11.x has many debugging features turned on, in both the kernel
 	and userland.  These features attempt to detect incorrect use of
 	system primitives, and encourage loud failure through extra sanity
 	checking and fail stop semantics.  They also substantially impact
@@ -31,11 +31,57 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20131108:
+	The WITHOUT_ATF build knob has been removed and its functionality
+	has been subsumed into the more generic WITHOUT_TESTS.  If you were
+	using the former to disable the build of the ATF libraries, you
+	should change your settings to use the latter.
+
+20131025:
+	The default version of mtree is nmtree which is obtained from
+	NetBSD.  The output is generally the same, but may vary
+	slightly.  If you found you need identical output adding
+	"-F freebsd9" to the command line should do the trick.  For the
+	time being, the old mtree is available as fmtree.
+
+20131014:
+	libbsdyml has been renamed to libyaml and moved to /usr/lib/private.
+	This will break ports-mgmt/pkg. Rebuild the port, or upgrade to pkg
+	1.1.4_8 and verify bsdyml not linked in, before running "make
+	delete-old-libs":
+	  # make -C /usr/ports/ports-mgmt/pkg build deinstall install clean
+	  or
+	  # pkg install pkg; ldd /usr/local/sbin/pkg | grep bsdyml
+
+20131010:
+	The rc.d/jail script has been updated to support jail(8)
+	configuration file.  The "jail_<jname>_*" rc.conf(5) variables
+	for per-jail configuration are automatically converted to
+	/var/run/jail.<jname>.conf before the jail(8) utility is invoked.
+	This is transparently backward compatible.  See below about some
+	incompatibilities and rc.conf(5) manual page for more details.
+
+	These variables are now deprecated in favor of jail(8) configuration
+	file.  One can use "rc.d/jail config <jname>" command to generate
+	a jail(8) configuration file in /var/run/jail.<jname>.conf without
+	running the jail(8) utility.   The default pathname of the
+	configuration file is /etc/jail.conf and can be specified by
+	using $jail_conf or $jail_<jname>_conf variables.
+
+	Please note that jail_devfs_ruleset accepts an integer at
+	this moment.  Please consider to rewrite the ruleset name
+	with an integer.
+
 20130930:
 	BIND has been removed from the base system.  If all you need
 	is a local resolver, simply enable and start the local_unbound
 	service instead.  Otherwise, several versions of BIND are
-	available in the ports tree.
+	available in the ports tree.   The dns/bind99 port is one example.
+
+	With this change, nslookup(1) and dig(1) are no longer in the base
+	system.  Users should instead use host(1) and drill(1) which are
+	in the base system.  Alternatively, nslookup and dig can
+	be obtained by installing the dns/bind-tools port.
 
 20130916:
 	With the addition of unbound(8), a new unbound user is now
@@ -73,19 +119,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
 	has been updated to use this support.  A new gcc is required to build
 	the aesni module on both i386 and amd64.
 
-20130827:
-        Thomas Dickey (vendor author thereof) reports that dialog(1) since
-        2011/10/18 has a bug in handling --hline. Testers and I noticed the
-        --hline is not ignored but displayed as a NULL string, regardless of
-        value. This will cause confusion in some bsdconfig dialogs where the
-        --hline is used to inform users which keybindings to use. This will
-        likewise affect any other persons relying on --hline. It also looks
-        rather strange seeing "[]" at the bottom of dialog(1) widgets when
-        passing --hline "anything". Thomas said he will have a look in a few
-        weeks. NOTE: The "[]" brackets appear with the left-edge where it
-        would normally appear given the width of text to display, but the
-        displayed text is not there (part of the bug).
-
 20130821:
 	The PADLOCK_RNG and RDRAND_RNG kernel options are now devices.
 	Thus "device padlock_rng" and "device rdrand_rng" should be
diff --git a/bin/Makefile b/bin/Makefile
index e5052cad51a..7b6a4ab8c8c 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -15,6 +15,7 @@ SUBDIR= cat \
 	echo \
 	ed \
 	expr \
+	freebsd-version \
 	getfacl \
 	hostname \
 	kenv \
diff --git a/bin/df/df.1 b/bin/df/df.1
index b5cf859cb57..85136a1e104 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -198,7 +198,7 @@ If the value is outside, it will be set to the appropriate limit.
 .Xr mount 8 ,
 .Xr pstat 8 ,
 .Xr quot 8 ,
-.Xr swapinfo 8 .
+.Xr swapinfo 8
 .Sh STANDARDS
 With the exception of most options,
 the
diff --git a/bin/freebsd-version/Makefile b/bin/freebsd-version/Makefile
new file mode 100644
index 00000000000..0fe730860c2
--- /dev/null
+++ b/bin/freebsd-version/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+SCRIPTS = freebsd-version
+MAN = freebsd-version.1
+CLEANFILES = freebsd-version.sh
+NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh
+
+freebsd-version.sh.in: ${NEWVERS}
+freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in
+	eval $$(egrep '^(TYPE|REVISION|BRANCH)=' ${NEWVERS}) ; \
+	if ! sed -e "\
+			s/@@TYPE@@/$${TYPE}/g; \
+			s/@@REVISION@@/$${REVISION}/g; \
+			s/@@BRANCH@@/$${BRANCH}/g; \
+		" ${.ALLSRC} >${.TARGET} ; then \
+		rm -f ${.TARGET} ; \
+		exit 1 ; \
+	fi
+
+.include <bsd.prog.mk>
diff --git a/bin/freebsd-version/freebsd-version.1 b/bin/freebsd-version/freebsd-version.1
new file mode 100644
index 00000000000..1eea5bbd972
--- /dev/null
+++ b/bin/freebsd-version/freebsd-version.1
@@ -0,0 +1,124 @@
+.\"-
+.\" Copyright (c) 2013 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.
+.\"
+.\" 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 October 5, 2013
+.Dt FREEBSD-VERSION 1
+.Os
+.Sh NAME
+.Nm freebsd-version
+.Nd print the version and patch level of the installed system
+.Sh SYNOPSIS
+.Nm
+.Op Fl ku
+.Sh DESCRIPTION
+The
+.Nm
+utility makes a best effort to determine the version and patch level
+of the installed kernel and / or userland.
+.Pp
+The following options are available:
+.Bl -tag -width Fl
+.It Fl k
+Print the version and patch level of the installed kernel.
+Unlike
+.Xr uname 1 ,
+if a new kernel has been installed but the system has not yet
+rebooted,
+.Nm
+will print the version and patch level of the new kernel.
+.It Fl u
+Print the version and patch level of the installed userland.
+These are hardcoded into
+.Nm
+during the build.
+.El
+.Pp
+If both
+.Fl k
+and
+.Fl u
+are specified,
+.Nm
+will print the kernel version first, then the userland version, on
+separate lines.
+If neither is specified, it will print the userland version only.
+.Sh IMPLEMENTATION NOTES
+The
+.Nm
+utility should provide the correct answer in the vast majority of
+cases, including on systems kept up-to-date using
+.Xr freebsd-update 8 ,
+which does not update the kernel version unless the kernel itself was
+affected by the latest patch.
+.Pp
+To determine the name (and hence the location) of a custom kernel, the
+.Nm
+utility will attempt to parse
+.Pa /boot/defaults/loader.conf
+and
+.Pa /boot/loader.conf ,
+looking for definitions of the
+.Va kernel
+and
+.Va bootfile
+variables, both with a default value of
+.Dq kernel .
+It may however fail to locate the correct kernel if either or both of
+these variables are defined in a non-standard location, such as in
+.Pa /boot/loader.rc .
+.Sh ENVIRONMENT
+.Bl -tag -width ROOT
+.It Ev ROOT
+Path to the root of the filesystem in which to look for
+.Pa loader.conf
+and the kernel.
+.El
+.Sh EXAMPLES
+To determine the version of the currently running userland:
+.Bd -literal -offset indent
+/bin/freebsd-version -u
+.Ed
+.Pp
+To inspect a system being repaired using a live CD:
+.Bd -literal -offset indent
+mount -rt ufs /dev/ada0p2 /mnt
+env ROOT=/mnt /mnt/bin/freebsd-version -ku
+.Ed
+.Sh SEE ALSO
+.Xr uname 1 ,
+.Xr loader.conf 5 ,
+.Xr freebsd-version 8
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+The
+.Nm
+utility and this manual page were written by
+.An Dag-Erling Sm\(/orgrav Aq des@FreeBSD.org .
diff --git a/bin/freebsd-version/freebsd-version.sh.in b/bin/freebsd-version/freebsd-version.sh.in
new file mode 100644
index 00000000000..a830d264916
--- /dev/null
+++ b/bin/freebsd-version/freebsd-version.sh.in
@@ -0,0 +1,126 @@
+#!/bin/sh
+#-
+# Copyright (c) 2013 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.
+#
+# 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$
+#
+
+set -e
+
+USERLAND_VERSION="@@REVISION@@-@@BRANCH@@"
+
+: ${ROOT:=}
+: ${LOADER_DIR:=$ROOT/boot}
+: ${LOADER_CONF_FILES:=$LOADER_DIR/defaults/loader.conf $LOADER_DIR/loader.conf $LOADER_DIR/loader.conf.local}
+LOADER_RE1='^\([A-Z_a-z][0-9A-Z_a-z]*=[-./0-9A-Z_a-z]\{1,\}\).*$'
+LOADER_RE2='^\([A-Z_a-z][0-9A-Z_a-z]*="[-./0-9A-Z_a-z]\{1,\}"\).*$'
+KERNEL_RE='^@(#)@@TYPE@@ \([-.0-9A-Za-z]\{1,\}\) .*$'
+
+progname=$(basename $0)
+
+#
+# Print an error message and exit.
+#
+error() {
+	echo "$progname: $*" >&2
+	exit 1
+}
+
+#
+# Try to get the name of the installed kernel from loader.conf and
+# return the full path.  If loader.conf does not exist or we could not
+# read it, return the path to the default kernel.
+#
+kernel_file() {
+	eval $(sed -n "s/$LOADER_RE1/\\1;/p; s/$LOADER_RE2/\\1;/p" \
+	    $LOADER_CONF_FILES 2>/dev/null)
+	echo "$LOADER_DIR/${kernel:-kernel}/${bootfile:-kernel}"
+}
+
+#
+# Extract the kernel version from the installed kernel.
+#
+kernel_version() {
+	kernfile=$(kernel_file)
+	if [ ! -f "$kernfile" -o ! -r "$kernfile" ] ; then
+		error "unable to locate kernel"
+	fi
+	strings "$kernfile" | sed -n "s/$KERNEL_RE/\\1/p"
+}
+
+#
+# Print the hardcoded userland version.
+#
+userland_version() {
+	echo $USERLAND_VERSION
+}
+
+#
+# Print a usage string and exit.
+#
+usage() {
+	echo "usage: $progname [-ku]" >&2
+	exit 1
+}
+
+#
+# Main program.
+#
+main() {
+	# parse command-line arguments
+	while getopts "ku" option ; do
+		case $option in
+		k)
+			opt_k=1
+			;;
+		u)
+			opt_u=1
+			;;
+		*)
+			usage
+			;;
+		esac
+	done
+	if [ $OPTIND -le $# ] ; then
+		usage
+	fi
+
+	# default is -u
+	if [ $((opt_k + opt_u)) -eq 0 ] ; then
+		opt_u=1
+	fi
+
+	# print kernel version
+	if [ $opt_k ] ; then
+		kernel_version
+	fi
+
+	# print userland version
+	if [ $opt_u ] ; then
+		userland_version
+	fi
+}
+
+main "$@"
diff --git a/bin/pkill/pkill.c b/bin/pkill/pkill.c
index add989f0688..e73f5f258e3 100644
--- a/bin/pkill/pkill.c
+++ b/bin/pkill/pkill.c
@@ -318,7 +318,10 @@ main(int argc, char **argv)
 	 * Use KERN_PROC_PROC instead of KERN_PROC_ALL, since we
 	 * just want processes and not individual kernel threads.
 	 */
-	plist = kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc);
+	if (pidfromfile >= 0)
+		plist = kvm_getprocs(kd, KERN_PROC_PID, pidfromfile, &nproc);
+	else
+		plist = kvm_getprocs(kd, KERN_PROC_PROC, 0, &nproc);
 	if (plist == NULL) {
 		errx(STATUS_ERROR, "Cannot get process list (%s)",
 		    kvm_geterr(kd));
diff --git a/bin/ps/print.c b/bin/ps/print.c
index f36411e786a..bcd451e1fb5 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -797,8 +797,6 @@ char *
 emulname(KINFO *k, VARENT *ve __unused)
 {
 
-	if (k->ki_p->ki_emul == NULL)
-		return (NULL);
 	return (strdup(k->ki_p->ki_emul));
 }
 
@@ -827,7 +825,6 @@ out:
 char *
 loginclass(KINFO *k, VARENT *ve __unused)
 {
-	char *s;
 
 	/*
 	 * Don't display login class for system processes;
@@ -837,8 +834,5 @@ loginclass(KINFO *k, VARENT *ve __unused)
 	if (k->ki_p->ki_flag & P_SYSTEM) {
 		return (strdup("-"));
 	}
-	s = k->ki_p->ki_loginclass;
-	if (s == NULL)
-		return (NULL);
-	return (strdup(s));
+	return (strdup(k->ki_p->ki_loginclass));
 }
diff --git a/bin/sh/cd.c b/bin/sh/cd.c
index fa6f4925ace..7720fad7d64 100644
--- a/bin/sh/cd.c
+++ b/bin/sh/cd.c
@@ -182,6 +182,7 @@ cdlogical(char *dest)
 	struct stat statb;
 	int first;
 	int badstat;
+	size_t len;
 
 	/*
 	 *  Check each component of the path. If we find a symlink or
@@ -189,8 +190,9 @@ cdlogical(char *dest)
 	 *  next time we get the value of the current directory.
 	 */
 	badstat = 0;
-	cdcomppath = stalloc(strlen(dest) + 1);
-	scopy(dest, cdcomppath);
+	len = strlen(dest);
+	cdcomppath = stalloc(len + 1);
+	memcpy(cdcomppath, dest, len + 1);
 	STARTSTACKSTR(p);
 	if (*dest == '/') {
 		STPUTC('/', p);
@@ -275,6 +277,7 @@ findcwd(char *dir)
 {
 	char *new;
 	char *p;
+	size_t len;
 
 	/*
 	 * If our argument is NULL, we don't know the current directory
@@ -283,8 +286,9 @@ findcwd(char *dir)
 	 */
 	if (dir == NULL || curdir == NULL)
 		return getpwd2();
-	cdcomppath = stalloc(strlen(dir) + 1);
-	scopy(dir, cdcomppath);
+	len = strlen(dir);
+	cdcomppath = stalloc(len + 1);
+	memcpy(cdcomppath, dir, len + 1);
 	STARTSTACKSTR(new);
 	if (*dir != '/') {
 		STPUTS(curdir, new);
diff --git a/bin/sh/eval.c b/bin/sh/eval.c
index b8f76d57f3d..4f7559e1848 100644
--- a/bin/sh/eval.c
+++ b/bin/sh/eval.c
@@ -750,6 +750,45 @@ isdeclarationcmd(struct narg *arg)
 		(have_command || !isfunc("local"))));
 }
 
+static void
+xtracecommand(struct arglist *varlist, struct arglist *arglist)
+{
+	struct strlist *sp;
+	char sep = 0;
+	const char *p, *ps4;
+
+	ps4 = expandstr(ps4val());
+	out2str(ps4 != NULL ? ps4 : ps4val());
+	for (sp = varlist->list ; sp ; sp = sp->next) {
+		if (sep != 0)
+			out2c(' ');
+		p = strchr(sp->text, '=');
+		if (p != NULL) {
+			p++;
+			outbin(sp->text, p - sp->text, out2);
+			out2qstr(p);
+		} else
+			out2qstr(sp->text);
+		sep = ' ';
+	}
+	for (sp = arglist->list ; sp ; sp = sp->next) {
+		if (sep != 0)
+			out2c(' ');
+		/* Disambiguate command looking like assignment. */
+		if (sp == arglist->list &&
+				strchr(sp->text, '=') != NULL &&
+				strchr(sp->text, '\'') == NULL) {
+			out2c('\'');
+			out2str(sp->text);
+			out2c('\'');
+		} else
+			out2qstr(sp->text);
+		sep = ' ';
+	}
+	out2c('\n');
+	flushout(&errout);
+}
+
 /*
  * Check if a builtin can safely be executed in the same process,
  * even though it should be in a subshell (command substitution).
@@ -847,40 +886,8 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
 	argv -= argc;
 
 	/* Print the command if xflag is set. */
-	if (xflag) {
-		char sep = 0;
-		const char *p, *ps4;
-		ps4 = expandstr(ps4val());
-		out2str(ps4 != NULL ? ps4 : ps4val());
-		for (sp = varlist.list ; sp ; sp = sp->next) {
-			if (sep != 0)
-				out2c(' ');
-			p = strchr(sp->text, '=');
-			if (p != NULL) {
-				p++;
-				outbin(sp->text, p - sp->text, out2);
-				out2qstr(p);
-			} else
-				out2qstr(sp->text);
-			sep = ' ';
-		}
-		for (sp = arglist.list ; sp ; sp = sp->next) {
-			if (sep != 0)
-				out2c(' ');
-			/* Disambiguate command looking like assignment. */
-			if (sp == arglist.list &&
-					strchr(sp->text, '=') != NULL &&
-					strchr(sp->text, '\'') == NULL) {
-				out2c('\'');
-				out2str(sp->text);
-				out2c('\'');
-			} else
-				out2qstr(sp->text);
-			sep = ' ';
-		}
-		out2c('\n');
-		flushout(&errout);
-	}
+	if (xflag)
+		xtracecommand(&varlist, &arglist);
 
 	/* Now locate the command. */
 	if (argc == 0) {
diff --git a/bin/sh/exec.c b/bin/sh/exec.c
index 9f8e029933e..5f30ec6ab8a 100644
--- a/bin/sh/exec.c
+++ b/bin/sh/exec.c
@@ -187,14 +187,15 @@ padvance(const char **path, const char *name)
 {
 	const char *p, *start;
 	char *q;
-	size_t len;
+	size_t len, namelen;
 
 	if (*path == NULL)
 		return NULL;
 	start = *path;
 	for (p = start; *p && *p != ':' && *p != '%'; p++)
 		; /* nothing */
-	len = p - start + strlen(name) + 2;	/* "2" is for '/' and '\0' */
+	namelen = strlen(name);
+	len = p - start + namelen + 2;	/* "2" is for '/' and '\0' */
 	STARTSTACKSTR(q);
 	CHECKSTRSPACE(len, q);
 	if (p != start) {
@@ -202,7 +203,7 @@ padvance(const char **path, const char *name)
 		q += p - start;
 		*q++ = '/';
 	}
-	strcpy(q, name);
+	memcpy(q, name, namelen + 1);
 	pathopt = NULL;
 	if (*p == '%') {
 		pathopt = ++p;
@@ -527,6 +528,7 @@ cmdlookup(const char *name, int add)
 	const char *p;
 	struct tblentry *cmdp;
 	struct tblentry **pp;
+	size_t len;
 
 	p = name;
 	hashval = *p << 4;
@@ -541,11 +543,11 @@ cmdlookup(const char *name, int add)
 	}
 	if (add && cmdp == NULL) {
 		INTOFF;
-		cmdp = *pp = ckmalloc(sizeof (struct tblentry)
-					+ strlen(name) + 1);
+		len = strlen(name);
+		cmdp = *pp = ckmalloc(sizeof (struct tblentry) + len + 1);
 		cmdp->next = NULL;
 		cmdp->cmdtype = CMDUNKNOWN;
-		strcpy(cmdp->cmdname, name);
+		memcpy(cmdp->cmdname, name, len + 1);
 		INTON;
 	}
 	lastcmdentry = pp;
@@ -672,9 +674,11 @@ typecmd_impl(int argc, char **argv, int cmd, const char *path)
 
 		/* Then look at the aliases */
 		if ((ap = lookupalias(argv[i], 1)) != NULL) {
-			if (cmd == TYPECMD_SMALLV)
-				out1fmt("alias %s='%s'\n", argv[i], ap->val);
-			else
+			if (cmd == TYPECMD_SMALLV) {
+				out1fmt("alias %s=", argv[i]);
+				out1qstr(ap->val);
+				outcslow('\n', out1);
+			} else
 				out1fmt("%s is an alias for %s\n", argv[i],
 				    ap->val);
 			continue;
diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index 414bfa7a198..5224f37fc8d 100644
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -1307,9 +1307,11 @@ addfname(char *name)
 {
 	char *p;
 	struct strlist *sp;
+	size_t len;
 
-	p = stalloc(strlen(name) + 1);
-	scopy(name, p);
+	len = strlen(name);
+	p = stalloc(len + 1);
+	memcpy(p, name, len + 1);
 	sp = (struct strlist *)stalloc(sizeof *sp);
 	sp->text = p;
 	*exparg.lastp = sp;
diff --git a/bin/sh/jobs.c b/bin/sh/jobs.c
index bbb954ac0a1..1c0c6bd22d2 100644
--- a/bin/sh/jobs.c
+++ b/bin/sh/jobs.c
@@ -978,7 +978,6 @@ int
 waitforjob(struct job *jp, int *origstatus)
 {
 #if JOBS
-	pid_t mypgrp = getpgrp();
 	int propagate_int = jp->jobctl && jp->foreground;
 #endif
 	int status;
@@ -992,7 +991,7 @@ waitforjob(struct job *jp, int *origstatus)
 			dotrap();
 #if JOBS
 	if (jp->jobctl) {
-		if (tcsetpgrp(ttyfd, mypgrp) < 0)
+		if (tcsetpgrp(ttyfd, rootpid) < 0)
 			error("tcsetpgrp failed, errno=%d\n", errno);
 	}
 	if (jp->state == JOBSTOPPED)
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c
index cb330d0ec0f..119f12e9fc7 100644
--- a/bin/sh/memalloc.c
+++ b/bin/sh/memalloc.c
@@ -98,9 +98,11 @@ char *
 savestr(const char *s)
 {
 	char *p;
+	size_t len;
 
-	p = ckmalloc(strlen(s) + 1);
-	scopy(s, p);
+	len = strlen(s);
+	p = ckmalloc(len + 1);
+	memcpy(p, s, len + 1);
 	return p;
 }
 
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index 2ecd4f22f27..27fa53db2fb 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -404,6 +404,9 @@ static const struct limits limits[] = {
 #endif
 #ifdef RLIMIT_NPTS
 	{ "pseudo-terminals",	(char *)0,	RLIMIT_NPTS,	   1, 'p' },
+#endif
+#ifdef RLIMIT_KQUEUES
+	{ "kqueues",		(char *)0,	RLIMIT_KQUEUES,	   1, 'k' },
 #endif
 	{ (char *) 0,		(char *)0,	0,		   0, '\0' }
 };
@@ -421,7 +424,7 @@ ulimitcmd(int argc __unused, char **argv __unused)
 	struct rlimit	limit;
 
 	what = 'f';
-	while ((optc = nextopt("HSatfdsmcnuvlbpw")) != '\0')
+	while ((optc = nextopt("HSatfdsmcnuvlbpwk")) != '\0')
 		switch (optc) {
 		case 'H':
 			how = HARD;
diff --git a/bin/sh/mystring.c b/bin/sh/mystring.c
index 67617ec0487..de7e9b64895 100644
--- a/bin/sh/mystring.c
+++ b/bin/sh/mystring.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
  * String functions.
  *
  *	equal(s1, s2)		Return true if strings are equal.
- *	scopy(from, to)		Copy a string.
  *	number(s)		Convert a string of digits to an integer.
  *	is_number(s)		Return true if s is a string of digits.
  */
@@ -60,10 +59,6 @@ char nullstr[1];		/* zero length string */
  * equal - #defined in mystring.h
  */
 
-/*
- * scopy - #defined in mystring.h
- */
-
 
 /*
  * prefix -- see if pfx is a prefix of string.
diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h
index 5a6e3d8a400..87b76c8acff 100644
--- a/bin/sh/mystring.h
+++ b/bin/sh/mystring.h
@@ -40,4 +40,3 @@ int number(const char *);
 int is_number(const char *);
 
 #define equal(s1, s2)	(strcmp(s1, s2) == 0)
-#define scopy(s1, s2)	((void)strcpy(s2, s1))
diff --git a/bin/sh/nodetypes b/bin/sh/nodetypes
index 5e70c64e7ff..603c77707f2 100644
--- a/bin/sh/nodetypes
+++ b/bin/sh/nodetypes
@@ -118,16 +118,16 @@ NFROMTO nfile			# fd<> fname
 NAPPEND nfile			# fd>> fname
 NCLOBBER nfile			# fd>| fname
 	type	  int
-	next	  nodeptr		# next redirection in list
 	fd	  int			# file descriptor being redirected
+	next	  nodeptr		# next redirection in list
 	fname	  nodeptr		# file name, in a NARG node
 	expfname  temp	char *expfname	# actual file name
 
 NTOFD ndup			# fd<&dupfd
 NFROMFD ndup			# fd>&dupfd
 	type	  int
-	next	  nodeptr		# next redirection in list
 	fd	  int			# file descriptor being redirected
+	next	  nodeptr		# next redirection in list
 	dupfd	  int			# file descriptor to duplicate
 	vname	  nodeptr		# file name if fd>&$var
 
@@ -135,8 +135,8 @@ NFROMFD ndup			# fd>&dupfd
 NHERE nhere			# fd<<\!
 NXHERE nhere			# fd<<!
 	type	  int
-	next	  nodeptr		# next redirection in list
 	fd	  int			# file descriptor being redirected
+	next	  nodeptr		# next redirection in list
 	doc	  nodeptr		# input to command (NARG node)
 	expdoc    temp	char *expdoc	# actual document (for NXHERE)
 
diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 932554578e8..79728a04b1f 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -69,6 +69,7 @@ __FBSDID("$FreeBSD$");
 struct redirtab {
 	struct redirtab *next;
 	int renamed[10];
+	int fd0_redirected;
 };
 
 
@@ -109,11 +110,14 @@ redirect(union node *redir, int flags)
 		sv = ckmalloc(sizeof (struct redirtab));
 		for (i = 0 ; i < 10 ; i++)
 			sv->renamed[i] = EMPTY;
+		sv->fd0_redirected = fd0_redirected;
 		sv->next = redirlist;
 		redirlist = sv;
 	}
 	for (n = redir ; n ; n = n->nfile.next) {
 		fd = n->nfile.fd;
+		if (fd == 0)
+			fd0_redirected = 1;
 		if ((n->nfile.type == NTOFD || n->nfile.type == NFROMFD) &&
 		    n->ndup.dupfd == fd)
 			continue; /* redirect from/to same file descriptor */
@@ -134,8 +138,6 @@ redirect(union node *redir, int flags)
 			sv->renamed[fd] = i;
 			INTON;
 		}
-		if (fd == 0)
-			fd0_redirected++;
 		openredirect(n, memory);
 	}
 	if (memory[1])
@@ -303,8 +305,6 @@ popredir(void)
 
 	for (i = 0 ; i < 10 ; i++) {
 		if (rp->renamed[i] != EMPTY) {
-                        if (i == 0)
-                                fd0_redirected--;
 			if (rp->renamed[i] >= 0) {
 				dup2(rp->renamed[i], i);
 				close(rp->renamed[i]);
@@ -314,6 +314,7 @@ popredir(void)
 		}
 	}
 	INTOFF;
+	fd0_redirected = rp->fd0_redirected;
 	redirlist = rp->next;
 	ckfree(rp);
 	INTON;
diff --git a/bin/sh/sh.1 b/bin/sh/sh.1
index ea1d899ed8e..22e6ba6c552 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 June 14, 2013
+.Dd November 1, 2013
 .Dt SH 1
 .Os
 .Sh NAME
@@ -2551,7 +2551,7 @@ and not found.
 For aliases the alias expansion is printed;
 for commands and tracked aliases
 the complete pathname of the command is printed.
-.It Ic ulimit Oo Fl HSabcdflmnpstuvw Oc Op Ar limit
+.It Ic ulimit Oo Fl HSabcdfklmnpstuvw Oc Op Ar limit
 Set or display resource limits (see
 .Xr getrlimit 2 ) .
 If
@@ -2598,6 +2598,11 @@ The maximal size of core dump files, in 512-byte blocks.
 The maximal size of the data segment of a process, in kilobytes.
 .It Fl f Ar filesize
 The maximal size of a file, in 512-byte blocks.
+.It Fl k Ar kqueues
+The maximal number of kqueues
+(see
+.Xr kqueue 2 )
+for this user ID.
 .It Fl l Ar lockedmem
 The maximal size of memory that can be locked by a process, in
 kilobytes.
diff --git a/bin/sh/show.c b/bin/sh/show.c
index 7cb354707dd..db18ae9701b 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -390,11 +390,11 @@ opentrace(void)
 			else
 				p = "/tmp";
 		}
-		scopy(p, s);
+		strcpy(s, p);
 		strcat(s, "/trace");
 	}
 #else
-	scopy("./trace", s);
+	strcpy(s, "./trace");
 #endif /* not_this_way */
 	if ((tracefile = fopen(s, "a")) == NULL) {
 		fprintf(stderr, "Can't open %s: %s\n", s, strerror(errno));
diff --git a/bin/sh/trap.c b/bin/sh/trap.c
index 3fc85668c64..1b2c3544acd 100644
--- a/bin/sh/trap.c
+++ b/bin/sh/trap.c
@@ -362,10 +362,12 @@ void
 ignoresig(int signo)
 {
 
+	if (sigmode[signo] == 0)
+		setsignal(signo);
 	if (sigmode[signo] != S_IGN && sigmode[signo] != S_HARD_IGN) {
 		signal(signo, SIG_IGN);
+		sigmode[signo] = S_IGN;
 	}
-	sigmode[signo] = S_HARD_IGN;
 }
 
 
diff --git a/bin/sh/var.c b/bin/sh/var.c
index c20d0326370..df3ce43bfad 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -224,8 +224,9 @@ void
 setvar(const char *name, const char *val, int flags)
 {
 	const char *p;
-	int len;
-	int namelen;
+	size_t len;
+	size_t namelen;
+	size_t vallen;
 	char *nameeq;
 	int isbad;
 
@@ -244,18 +245,20 @@ setvar(const char *name, const char *val, int flags)
 	}
 	namelen = p - name;
 	if (isbad)
-		error("%.*s: bad variable name", namelen, name);
+		error("%.*s: bad variable name", (int)namelen, name);
 	len = namelen + 2;		/* 2 is space for '=' and '\0' */
 	if (val == NULL) {
 		flags |= VUNSET;
+		vallen = 0;
 	} else {
-		len += strlen(val);
+		vallen = strlen(val);
+		len += vallen;
 	}
 	nameeq = ckmalloc(len);
 	memcpy(nameeq, name, namelen);
 	nameeq[namelen] = '=';
 	if (val)
-		scopy(val, nameeq + namelen + 1);
+		memcpy(nameeq + namelen + 1, val, vallen + 1);
 	else
 		nameeq[namelen + 1] = '\0';
 	setvareq(nameeq, flags);
diff --git a/bin/test/test.c b/bin/test/test.c
index 96aa9f54970..46e9999eb0b 100644
--- a/bin/test/test.c
+++ b/bin/test/test.c
@@ -67,9 +67,18 @@ error(const char *msg, ...)
 	operand ::= <any legal UNIX file name>
 */
 
+enum token_types {
+	UNOP = 0x100,
+	BINOP = 0x200,
+	BUNOP = 0x300,
+	BBINOP = 0x400,
+	PAREN = 0x500
+};
+
 enum token {
 	EOI,
-	FILRD,
+	OPERAND,
+	FILRD = UNOP + 1,
 	FILWR,
 	FILEX,
 	FILEXIST,
@@ -85,13 +94,13 @@ enum token {
 	FILSUID,
 	FILSGID,
 	FILSTCK,
-	FILNT,
-	FILOT,
-	FILEQ,
-	FILUID,
-	FILGID,
 	STREZ,
 	STRNZ,
+	FILUID,
+	FILGID,
+	FILNT = BINOP + 1,
+	FILOT,
+	FILEQ,
 	STREQ,
 	STRNE,
 	STRLT,
@@ -102,76 +111,68 @@ enum token {
 	INTGT,
 	INTLE,
 	INTLT,
-	UNOT,
-	BAND,
+	UNOT = BUNOP + 1,
+	BAND = BBINOP + 1,
 	BOR,
-	LPAREN,
-	RPAREN,
-	OPERAND
+	LPAREN = PAREN + 1,
+	RPAREN
 };
 
-enum token_types {
-	UNOP,
-	BINOP,
-	BUNOP,
-	BBINOP,
-	PAREN
-};
+#define TOKEN_TYPE(token) ((token) & 0xff00)
 
 static struct t_op {
 	char op_text[4];
-	short op_num, op_type;
+	short op_num;
 } const ops [] = {
-	{"-r",	FILRD,	UNOP},
-	{"-w",	FILWR,	UNOP},
-	{"-x",	FILEX,	UNOP},
-	{"-e",	FILEXIST,UNOP},
-	{"-f",	FILREG,	UNOP},
-	{"-d",	FILDIR,	UNOP},
-	{"-c",	FILCDEV,UNOP},
-	{"-b",	FILBDEV,UNOP},
-	{"-p",	FILFIFO,UNOP},
-	{"-u",	FILSUID,UNOP},
-	{"-g",	FILSGID,UNOP},
-	{"-k",	FILSTCK,UNOP},
-	{"-s",	FILGZ,	UNOP},
-	{"-t",	FILTT,	UNOP},
-	{"-z",	STREZ,	UNOP},
-	{"-n",	STRNZ,	UNOP},
-	{"-h",	FILSYM,	UNOP},		/* for backwards compat */
-	{"-O",	FILUID,	UNOP},
-	{"-G",	FILGID,	UNOP},
-	{"-L",	FILSYM,	UNOP},
-	{"-S",	FILSOCK,UNOP},
-	{"=",	STREQ,	BINOP},
-	{"==",	STREQ,	BINOP},
-	{"!=",	STRNE,	BINOP},
-	{"<",	STRLT,	BINOP},
-	{">",	STRGT,	BINOP},
-	{"-eq",	INTEQ,	BINOP},
-	{"-ne",	INTNE,	BINOP},
-	{"-ge",	INTGE,	BINOP},
-	{"-gt",	INTGT,	BINOP},
-	{"-le",	INTLE,	BINOP},
-	{"-lt",	INTLT,	BINOP},
-	{"-nt",	FILNT,	BINOP},
-	{"-ot",	FILOT,	BINOP},
-	{"-ef",	FILEQ,	BINOP},
-	{"!",	UNOT,	BUNOP},
-	{"-a",	BAND,	BBINOP},
-	{"-o",	BOR,	BBINOP},
-	{"(",	LPAREN,	PAREN},
-	{")",	RPAREN,	PAREN},
-	{"",	0,	0}
+	{"-r",	FILRD},
+	{"-w",	FILWR},
+	{"-x",	FILEX},
+	{"-e",	FILEXIST},
+	{"-f",	FILREG},
+	{"-d",	FILDIR},
+	{"-c",	FILCDEV},
+	{"-b",	FILBDEV},
+	{"-p",	FILFIFO},
+	{"-u",	FILSUID},
+	{"-g",	FILSGID},
+	{"-k",	FILSTCK},
+	{"-s",	FILGZ},
+	{"-t",	FILTT},
+	{"-z",	STREZ},
+	{"-n",	STRNZ},
+	{"-h",	FILSYM},		/* for backwards compat */
+	{"-O",	FILUID},
+	{"-G",	FILGID},
+	{"-L",	FILSYM},
+	{"-S",	FILSOCK},
+	{"=",	STREQ},
+	{"==",	STREQ},
+	{"!=",	STRNE},
+	{"<",	STRLT},
+	{">",	STRGT},
+	{"-eq",	INTEQ},
+	{"-ne",	INTNE},
+	{"-ge",	INTGE},
+	{"-gt",	INTGT},
+	{"-le",	INTLE},
+	{"-lt",	INTLT},
+	{"-nt",	FILNT},
+	{"-ot",	FILOT},
+	{"-ef",	FILEQ},
+	{"!",	UNOT},
+	{"-a",	BAND},
+	{"-o",	BOR},
+	{"(",	LPAREN},
+	{")",	RPAREN},
+	{"",	0}
 };
 
-static struct t_op const *t_wp_op;
 static int nargc;
 static char **t_wp;
 static int parenlevel;
 
 static int	aexpr(enum token);
-static int	binop(void);
+static int	binop(enum token);
 static int	equalf(const char *, const char *);
 static int	filstat(char *, enum token);
 static int	getn(const char *);
@@ -295,10 +296,10 @@ primary(enum token n)
 		parenlevel--;
 		return res;
 	}
-	if (t_wp_op && t_wp_op->op_type == UNOP) {
+	if (TOKEN_TYPE(n) == UNOP) {
 		/* unary expression */
 		if (--nargc == 0)
-			syntax(t_wp_op->op_text, "argument expected");
+			syntax(NULL, "argument expected"); /* impossible */
 		switch (n) {
 		case STREZ:
 			return strlen(*++t_wp) == 0;
@@ -311,28 +312,25 @@ primary(enum token n)
 		}
 	}
 
-	if (t_lex(nargc > 0 ? t_wp[1] : NULL), t_wp_op && t_wp_op->op_type ==
-	    BINOP) {
-		return binop();
-	}
+	nn = t_lex(nargc > 0 ? t_wp[1] : NULL);
+	if (TOKEN_TYPE(nn) == BINOP)
+		return binop(nn);
 
 	return strlen(*t_wp) > 0;
 }
 
 static int
-binop(void)
+binop(enum token n)
 {
-	const char *opnd1, *opnd2;
-	struct t_op const *op;
+	const char *opnd1, *op, *opnd2;
 
 	opnd1 = *t_wp;
-	(void) t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL);
-	op = t_wp_op;
+	op = nargc > 0 ? (--nargc, *++t_wp) : NULL;
 
 	if ((opnd2 = nargc > 0 ? (--nargc, *++t_wp) : NULL) == NULL)
-		syntax(op->op_text, "argument expected");
+		syntax(op, "argument expected");
 
-	switch (op->op_num) {
+	switch (n) {
 	case STREQ:
 		return strcmp(opnd1, opnd2) == 0;
 	case STRNE:
@@ -424,22 +422,20 @@ t_lex(char *s)
 	struct t_op const *op = ops;
 
 	if (s == 0) {
-		t_wp_op = NULL;
 		return EOI;
 	}
 	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0) {
-			if (((op->op_type == UNOP || op->op_type == BUNOP)
+			if (((TOKEN_TYPE(op->op_num) == UNOP ||
+			    TOKEN_TYPE(op->op_num) == BUNOP)
 						&& isunopoperand()) ||
 			    (op->op_num == LPAREN && islparenoperand()) ||
 			    (op->op_num == RPAREN && isrparenoperand()))
 				break;
-			t_wp_op = op;
 			return op->op_num;
 		}
 		op++;
 	}
-	t_wp_op = NULL;
 	return OPERAND;
 }
 
@@ -458,7 +454,7 @@ isunopoperand(void)
 	t = *(t_wp + 2);
 	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
-			return op->op_type == BINOP &&
+			return TOKEN_TYPE(op->op_num) == BINOP &&
 			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
 		op++;
 	}
@@ -480,7 +476,7 @@ islparenoperand(void)
 		return 0;
 	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
-			return op->op_type == BINOP;
+			return TOKEN_TYPE(op->op_num) == BINOP;
 		op++;
 	}
 	return 0;
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1 b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
index e20ed9fe6ba..cc3a3112df7 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
+++ b/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
@@ -2,7 +2,7 @@
 .\" CDDL HEADER START
 .\"
 .\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License (the "License").  
+.\" Common Development and Distribution License (the "License").
 .\" You may not use this file except in compliance with the License.
 .\"
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
@@ -18,653 +18,660 @@
 .\"
 .\" CDDL HEADER END
 .\" Copyright (c) 2006, Sun Microsystems, Inc. All Rights Reserved.
-.TH dtrace 1M "5 Sep 2006" "SunOS 5.11" "System Administration Commands"
-.SH NAME
-dtrace \- DTrace dynamic tracing compiler and tracing utility
-.SH SYNOPSIS
-.LP
-.nf
-\fBdtrace\fR [\fB-32\fR | \fB-64\fR] [\fB-aACeFGHhlqSvVwZ\fR] [\fB-b\fR \fIbufsz\fR] [\fB-c\fR \fIcmd\fR] 
-    [\fB-D\fR \fIname\fR [\fI=value\fR]] [\fB-I\fR \fIpath\fR] [\fB-L\fR \fIpath\fR] [\fB-o\fR \fIoutput\fR] 
-    [\fB-s\fR \fIscript\fR] [\fB-U\fR \fIname\fR] [\fB-x\fR \fIarg\fR [\fI=val\fR]] 
-    [\fB-X\fR a | c | s | t] [\fB-p\fR \fIpid\fR] 
-    [\fB-P\fR \fIprovider\fR [[\fIpredicate\fR] \fIaction\fR]] 
-    [\fB-m\fR [\fIprovider:\fR] \fImodule\fR [[\fIpredicate\fR] \fIaction\fR]] 
-    [\fB-f\fR [[\fIprovider:\fR] \fImodule:\fR] \fIfunction\fR [[\fIpredicate\fR] \fIaction\fR]] 
-    [\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]] 
-    [\fB-i\fR \fIprobe-id\fR [[\fIpredicate\fR] \fIaction\fR]]
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-DTrace is a comprehensive dynamic tracing framework for the Solaris Operating System. DTrace provides a powerful infrastructure that permits administrators, developers, and service personnel to concisely answer arbitrary questions about the behavior of the operating system and user programs. 
-.sp
-.LP
-The \fISolaris Dynamic Tracing Guide\fR describes how to use DTrace to observe, debug, and tune system behavior. Refer to this book for a detailed description of DTrace features, including the bundled DTrace observability
-tools, instrumentation providers, and the D programming language.
-.sp
-.LP
-The \fBdtrace\fR command provides a generic interface to the essential services provided by the DTrace facility, including:
-.RS +4
-.TP
-.ie t \(bu
-.el o
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 5, 2013
+.Dt DTRACE 1
+.Os
+.Sh NAME
+.Nm dtrace
+.Nd dynamic tracing compiler and tracing utility
+.Sh SYNOPSIS
+.Nm
+.Op Fl 32 | Fl 64
+.Op Fl aACeFGhHlqSvVwZ
+.Op Fl b Ar bufsz
+.Op Fl c Ar cmd
+.Op Fl D Ar name Op Ns = Ns value
+.Op Fl I Ar path
+.Op Fl L Ar path
+.Op Fl o Ar output
+.Op Fl s Ar script
+.Op Fl U Ar name
+.Op Fl x Ar arg Op Ns = Ns value
+.Op Fl X Cm a | c | s | t
+.Op Fl p Ar pid
+.Op Fl P Ar provider Oo Oo Ar predicate Oc Ar action Oc
+.Op Fl m Oo Ar provider : Oc Ar module Oo Oo Ar predicate Oc Ar action Oc
+.Op Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \
+    Oc Ar action Oc
+.Op Fl n Oo Oo Oo Ar provider : Oc Ar module : Oc Ar function : Oc Ar name \
+    Oo Oo Ar predicate Oc Ar action Oc
+.Op Fl i Ar probe-id Oo Oo Ar predicate Oc Ar action Oc
+.Sh DESCRIPTION
+DTrace is a comprehensive dynamic tracing framework ported from Solaris.
+DTrace provides a powerful infrastructure that permits administrators,
+developers, and service personnel to concisely answer arbitrary questions about
+the behavior of the operating system and user programs.
+.Pp
+The
+.Nm
+command provides a generic interface to the essential services provided by the
+DTrace facility, including:
+.Bl -bullet -offset indent
+.It
 Options that list the set of probes and providers currently published by DTrace
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-Options that enable probes directly using any of the probe description specifiers (provider, module, function, name)
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-Options that run the D compiler and compile one or more D program files or programs written directly on the command line
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
+.It
+Options that enable probes directly using any of the probe description
+specifiers (provider, module, function, name)
+.It
+Options that run the D compiler and compile one or more D program files or
+programs written directly on the command line
+.It
 Options that generate anonymous tracing programs
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
+.It
 Options that generate program stability reports
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-Options that modify DTrace tracing and buffering behavior and enable additional D compiler features
-.RE
-.sp
-.LP
-You can use \fBdtrace\fR to create D scripts by using it in a \fB#!\fR declaration to create an interpreter file. You can also use \fBdtrace\fR to attempt to compile D programs and determine their properties without actually enabling tracing using the \fB-e\fR option. See \fBOPTIONS\fR. See the \fISolaris Dynamic Tracing Guide\fR for detailed examples of how to use the \fBdtrace\fR utility to perform these tasks.
-.SH OPTIONS
-.sp
-.LP
-The arguments accepted by the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, and \fB-i\fR options can include an optional D language \fIpredicate\fR enclosed in slashes \fB//\fR and optional D language \fIaction\fR statement list enclosed in braces \fB{}\fR. D program code specified on the command line must be appropriately quoted to avoid intepretation of meta-characters by the shell. 
-.sp
-.LP
+.It
+Options that modify DTrace tracing and buffering behavior and enable
+additional D compiler features
+.El
+.Pp
+You can use
+.Nm
+to create D scripts by using it in a shebang declaration to create an
+interpreter file.
+You can also use
+.Nm
+to attempt to compile D programs and determine their properties without
+actually enabling traces using the
+.Fl e
+option.
+.Sh OPTIONS
+The arguments accepted by the
+.Fl P ,
+.Fl m ,
+.Fl f ,
+.Fl n ,
+and
+.Fl i
+options can include an optional D language
+.Ar predicate
+enclosed in slashes and an optional D language
+.Ar action
+statement list enclosed in braces.
+D program code specified on the command line must be appropriately quoted to
+avoid interpretation of meta-characters by the shell.
+.Pp
 The following options are supported:
+.Bl -tag -width indent
+.It Fl 32 | Fl 64
+The D compiler produces programs using the native data model of the operating
+system kernel.
+If the
+.Fl 32
+option is specified,
+.Nm
+forces the D compiler to compile a D program using the 32-bit data model.
+If the
+.Fl 64
+option is specified,
+.Nm
+forces the D compiler to compile a D program using the 64-bit data model.
+These options are typically not required as
+.Nm
+selects the native data model as the default.
+The data model affects the sizes of integer types and other language properties.
+D programs compiled for either data model can be executed on both 32-bit and
+64-bit kernels.
+The
+.Fl 32
+and
+.Fl 64
+options also determine the
+.Xr elf 5
+file format (ELF32 or ELF64) produced by the
+.Fl G
+option.
+.It Fl a
+Claim anonymous tracing state and display the traced data.
+You can combine the
+.Fl a
+option with the
+.Fl e
+option to force
+.Nm
+to exit immediately after consuming the anonymous tracing state rather than
+continuing to wait for new data.
+.It Fl A
+Generate directives for anonymous tracing and write them to
+.Pa /boot/dtrace.dof .
+This option constructs a set of dtrace configuration file directives to enable
+the specified probes for anonymous tracing and then exits.
+By default,
+.Nm
+attempts to store the directives to the file
+.Pa /boot/dtrace.dof .
+This behavior can be modified using the
+.Fl o
+option to specify an alternate output file.
+.It Fl b Ar bufsz
+Set the principal trace buffer size to
+.Ar bufsz .
+The trace buffer size can include any of the size suffixes k, m, g, or t.
+If the buffer space cannot be allocated,
+.Nm dtrace
+attempts to reduce the buffer size or exit depending on the setting of the
+bufresize property.
+.It Fl c Ar cmd
+Run the specified command
+.Ar cmd
+and exit upon its completion.
+If more than one
+.Fl c
+option is present on the command line,
+.Nm dtrace
+exits when all commands have exited, reporting the exit status for each child
+process as it terminates.
+The process ID of the first command is made available to any D programs
+specified on the command line or using the
+.Fl s
+option through the
+.Li $target
+macro variable.
+.It Fl C
+Run the C preprocessor
+.Xr cpp 1
+over D programs before compiling them.
+You can pass options to the C preprocessor using the
+.Fl D ,
+.Fl U ,
+.Fl I ,
+and
+.Fl H
+options.
+You can select the degree of C standard conformance if you use the
+.Fl X
+option.
+For a description of the set of tokens defined by the D compiler when invoking
+the C preprocessor, see
+.Fl X .
+.It Fl D Ar name Op Ns = Ns value
+Define
+.Ar name
+when invoking
+.Xr cpp 1
+(enabled using the
+.Fl C
+option).
+If you specify an additional
+.Ar value ,
+the name is assigned the corresponding value.
+This option passes the
+.Fl D
+option to each
+.Xr cpp 1
+invocation.
+.It Fl e
+Exit after compiling any requests and consuming anonymous tracing state
+.Fl ( a
+option) but prior to enabling any probes.
+You can combine this option with the
+.Fl a
+option to print anonymous tracing data and exit.
+You can also combine this option with D compiler options.
+This combination verifies that the programs compile without actually executing
+them and enabling the corresponding instrumentation.
+.It Fl f Oo Oo Ar provider : Oc Ar module : Oc Ar function Oo Oo Ar predicate \
+    Oc Ar action Oc
+Specify function name to trace or list
+.Fl ( l
+option).
+The corresponding argument can include any of the probe description forms
+.Ar provider:module:function ,
+.Ar module:function ,
+or
+.Ar function .
+Unspecified probe description fields are left blank and match any probes
+regardless of the values in those fields.
+If no qualifiers other than
+.Ar function
+are specified in the description, all probes with the corresponding
+.Ar function
+are matched.
+The
+.Fl f
+argument can be suffixed with an optional D probe clause.
+You can specify more than one
+.Fl f
+option on the command line at a time.
+.It Fl F
+Coalesce trace output by identifying function entry and return.
+Function entry probe reports are indented and their output is prefixed with
+.Ql -> .
+Function return probe reports are unindented and their output is prefixed with
+.Ql <- .
+System call entry probe reports are indented and their output is prefixed with
+.Ql => .
+System call return probe reports are unindented and their output is prefixed
+with
+.Ql <= .
+.It Fl G
+Generate an ELF file containing an embedded DTrace program.
+The DTrace probes specified in the program are saved inside of a relocatable ELF
+object which can be linked into another program.
+If the
+.Fl o
+option is present, the ELF file is saved using the pathname specified as the
+argument for this operand.
+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 ELF file is saved using the name
+.Ar filename.o .
+Otherwise the ELF file is saved using the name d.out.
+.It Fl h
+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
+.It Fl H
+Print the pathnames of included files when invoking
+.Xr cpp 1
+(enabled using the
+.Fl C
+option).
+This option passes the
+.Fl H
+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 )
+to trace or list
+.Ar ( l
+option).
+You can specify probe IDs using decimal integers as shown by `dtrace -l`.
+The
+.Fl i
+argument can be suffixed with an optional D probe clause.
+You can specify more than one
+.Fl i
+option at a time.
+.It Fl I Ar path
+Add the specified directory
+.Ar path
+to the search path for #include files when invoking
+.Xr cpp 1
+(enabled using the
+.Fl C
+option).
+This option passes the
+.Fl I
+option to each
+.Xr cpp 1
+invocation.
+The specified
+.Ar path
+is inserted into the search path ahead of the default directory list.
+.It Fl l
+List probes instead of enabling them.
+If the
+.Fl l
+option is specified,
+.Nm
+produces a report of the probes matching the descriptions given using the
+.Fl P , m , f , n , i ,
+and
+.Fl s
+options.
+If none of these options are specified, this option lists all probes.
+.It Fl L Ar path
+Add the specified directory
+.Ar path
+to the search path for DTrace libraries.
+DTrace libraries are used to contain common definitions that can be used when
+writing D programs.
+The specified
+.Ar path
+is added after the default library search path.
+.It Fl m Oo Ar provider : Oc Ar module Oo Oo Ar predicate Oc Ar action Oc
+Specify module name to trace or list
+.Fl ( l
+option).
+The corresponding argument can include any of the probe description forms
+.Ar provider:module
+or
+.Ar module .
+Unspecified probe description fields are left blank and match any probes
+regardless of the values in those fields.
+If no qualifiers other than
+.Ar module
+are specified in the description, all probes with a corresponding
+.Ar module
+are matched.
+The
+.Fl m
+argument can be suffixed with an optional D probe clause.
+More than one
+.Fl m
+option can be specified on the command line at a time.
+.It Fl n Oo Oo Oo Ar provider : Oc Ar module : Oc Ar function : Oc Ar name \
+    Oo Oo Ar predicate Oc Ar action Oc
+Specify probe name to trace or list
+.Fl ( l
+option).
+The corresponding argument can include any of the probe description forms
+.Ar provider:module:function:name , module:function:name , function:name ,
+or
+.Ar name .
+Unspecified probe description fields are left blank and match any probes
+regardless of the values in those fields.
+If no qualifiers other than
+.Ar name
+are specified in the description, all probes with a corresponding
+.Ar name
+are matched.
+The
+.Fl n
+argument can be suffixed with an optional D probe clause.
+More than one
+.Fl n
+option can be specified on the command line at a time.
+.It Fl o Ar output
+Specify the
+.Ar output
+file for the
+.Fl A , G ,
+and
+.Fl l
+options, or for the traced data itself.
+If the
+.Fl A
+option is present and
+.Fl o
+is not present, the default output file is
+.Pa /boot/dtrace.dof .
+If the
+.Fl G
+option is present and the
+.Fl s
+option's argument is of the form
+.Ar filename.d
+and
+.Fl o
+is not present, the default output file is
+.Ar filename.o .
+Otherwise the default output file is
+.Ar d.out .
+.It Fl p Ar pid
+Grab the specified process-ID
+.Ar pid ,
+cache its symbol tables, and exit upon its completion.
+If more than one
+.Fl p
+option is present on the command line,
+.Nm
+exits when all commands have exited, reporting the exit status for each process
+as it terminates.
+The first process-ID is made available to any D programs specified on the
+command line or using the
+.Fl s
+option through the
+.Li $target
+macro variable.
+.It Fl P Ar provider Oo Oo Ar predicate Oc Ar action Oc
+Specify provider name to trace or list
+.Fl ( l
+option).
+The remaining probe description fields module, function, and name are left
+blank and match any probes regardless of the values in those fields.
+The
+.Fl P
+argument can be suffixed with an optional D probe clause.
+You can specify more than one
+.Fl P
+option on the command line at a time.
+.It Fl q
+Set quiet mode.
+.Nm
+suppresses messages such as the number of probes matched by the specified
+options and D programs and does not print column headers, the CPU ID, the probe
+ID, or insert newlines into the output.
+Only data traced and formatted by D program statements such as
+.Ql dtrace()
+and
+.Ql printf()
+is displayed to standard output.
+.It Fl s Ar script
+Compile the specified D program source file.
+If the
+.Fl e
+option is present, the program is compiled but instrumentation is not enabled.
+If the
+.Fl l
+option is present, the program is compiled and the set of probes matched by it
+is listed, but instrumentation is not enabled.
+If none of
+.Fl e , l , G ,
+or
+.Fl A
+are present, the instrumentation specified by the D program is enabled and
+tracing begins.
+.It Fl S
+Show D compiler intermediate code.
+The D compiler produces a report of the intermediate code generated for each D
+program to standard error.
+.It Fl U Ar name
+Undefine the specified
+.Ar name
+when invoking
+.Xr cpp 1
+(enabled using the
+.Fl C
+option).
+This option passes the
+.Fl U
+option to each
+.Xr cpp 1
+invocation.
+.It Fl v
+Set verbose mode.
+If the
+.Fl v
+option is specified,
+.Nm
+produces a program stability report showing the minimum interface stability and
+dependency level for the specified D programs.
+.It Fl V
+Report the highest D programming interface version supported by
+.Nm .
+The version information is printed to standard output and the
+.Nm
+command exits.
+.It Fl w
+Permit destructive actions in D programs specified using the
+.Fl s , P , m , f , n ,
+or
+.Fl i
+options.
+If the
+.Fl w
+option is not specified,
+.Nm
+does not permit the compilation or enabling of a D program that contains
+destructive actions.
+.It Fl x Ar arg Op Ns = Ns value
+Enable or modify a DTrace runtime option or D compiler option.
+Boolean options are enabled by specifying their name.
+Options with values are set by separating the option name and value with an
+equals sign (=).
+.It Fl X Cm a | c | s | t
+Specify the degree of conformance to the ISO C standard that should be selected
+when invoking
+.Xr cpp 1
+(enabled using the
+.Fl C
+option).
+The
+.Fl X
+option argument affects the value and presence of the __STDC__ macro depending
+upon the value of the argument letter.
 .sp
-.ne 2
-.mk
-.na
-\fB\fB-32\fR | \fB-64\fR\fR
-.ad
-.sp .6
-.RS 4n
-The D compiler produces programs using the native data model of the operating system kernel. You can use the \fBisainfo\fR \fB-b\fR command to determine the current operating system data model.  If the \fB-32\fR option is specified, \fBdtrace\fR forces
-the D compiler to compile a D program using the 32-bit data model. If the \fB-64\fR option is specified, \fBdtrace\fR forces the D compiler to compile a D program using the 64-bit data model. These options are typically not required as \fBdtrace\fR selects the
-native data model as the default. The data model affects the sizes of integer types and other language properties. D programs compiled for either data model can be executed on both 32-bit and 64-bit kernels. The \fB-32\fR and \fB-64\fR options also determine the ELF file format
-(ELF32 or ELF64) produced by the \fB-G\fR option.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-a\fR\fR
-.ad
-.sp .6
-.RS 4n
-Claim anonymous tracing state and display the traced data. You can combine the \fB-a\fR option with the \fB-e\fR option to force \fBdtrace\fR to exit immediately after consuming the anonymous tracing state rather than continuing to wait for new
-data. See the \fISolaris Dynamic Tracing Guide\fR for more information about anonymous tracing.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-A\fR\fR
-.ad
-.sp .6
-.RS 4n
-Generate \fBdriver.conf\fR(4) directives for anonymous tracing. This option constructs a set of \fBdtrace\fR(7D) configuration file directives to enable the specified probes for anonymous tracing and then exits. By default, \fBdtrace\fR attempts to store the directives to the file \fB/kernel/drv/dtrace.conf\fR. You can modify this behavior if you use the \fB-o\fR option to specify an alternate output file.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-b\fR \fIbufsz\fR\fR
-.ad
-.sp .6
-.RS 4n
-Set principal trace buffer size (\fIbufsz\fR). The trace buffer size can include any of the size suffixes \fBk\fR, \fBm\fR, \fBg\fR, or \fBt\fR.  If the buffer space cannot be allocated, \fBdtrace\fR attempts
-to reduce the buffer size or exit depending on the setting of the \fBbufresize\fR property.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-c\fR \fIcmd\fR\fR
-.ad
-.sp .6
-.RS 4n
-Run the specified command \fIcmd\fR and exit upon its completion. If more than one \fB-c\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status for each child process as it
-terminates. The process-ID of the first command is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information
-on macro variables.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-C\fR\fR
-.ad
-.sp .6
-.RS 4n
-Run the C preprocessor \fBcpp\fR(1) over D programs before compiling them. You can pass options to the C preprocessor using the \fB-D\fR, \fB-U\fR, \fB-I\fR, and \fB-H\fR options. You can select the degree of C standard conformance if you use the \fB-X\fR option. For a description of the set of tokens defined by the D compiler when invoking the C preprocessor, see \fB-X\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-D\fR \fIname\fR \fB[=\fR\fIvalue\fR\fB]\fR\fR
-.ad
-.sp .6
-.RS 4n
-Define \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). If you specify the equals sign (\fB=\fR)
-and additional \fIvalue\fR, the name is assigned the corresponding value. This option passes the \fB-D\fR option to each \fBcpp\fR invocation.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-e\fR\fR
-.ad
-.sp .6
-.RS 4n
-Exit after compiling any requests and consuming anonymous tracing state (\fB-a\fR option) but prior to enabling any probes. You can combine this option with the \fB-a\fR option to print anonymous tracing data and exit. You can also combine this option with D
-compiler options. This combination verifies that the programs compile without actually executing them and enabling the corresponding instrumentation.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-f\fR\fB[[\fR\fIprovider\fR\fB:]\fR\fImodule\fR\fB:]\fR\fIfunction\fR\fB[[\fR\fIpredicate\fR\fB]\fR\fIaction\fR\fB]]\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify function name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function\fR, \fImodule:function\fR, or \fIfunction\fR.
-Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIfunction\fR are specified in the description, all probes with the corresponding \fIfunction\fR are matched.
-The \fB-f\fR argument can be suffixed with an optional D probe clause. You can specify more than one \fB-f\fR option on the command line at a time.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-F\fR\fR
-.ad
-.sp .6
-.RS 4n
-Coalesce trace output by identifying function entry and return. Function entry probe reports are indented and their output is prefixed with \fB->\fR. Function return probe reports are unindented and their output is prefixed with \fB<-\fR\&. System call
-entry probe reports are indented and their output is prefixed with \fB=>\fR. System call return probe reports are unindented and their output is prefixed with \fB<=\fR\&.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-G\fR\fR
-.ad
-.sp .6
-.RS 4n
-Generate an ELF file containing an embedded DTrace program. The DTrace probes specified in the program are saved inside of a relocatable ELF object which can be linked into another program. If the \fB-o\fR option is present, the ELF file is saved using the pathname specified
-as the argument for this operand. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fB\fIfilename\fR.d\fR, then the ELF file is saved using the name \fB\fIfilename\fR.o\fR.
-Otherwise the ELF file is saved using the name \fBd.out\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-H\fR\fR
-.ad
-.sp .6
-.RS 4n
-Print the pathnames of included files when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-H\fR option
-to each \fBcpp\fR invocation, causing it to display the list of pathnames, one for each line, to \fBstderr\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-h\fR\fR
-.ad
-.sp .6
-.RS 4n
-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 \fB-G\fR option. If the \fB-o\fR option
-is present, the header file is saved using the pathname specified as the argument for that option. If the \fB-o\fR option is not present and the DTrace program is contained with a file whose name is \fIfilename\fR\fB\&.d\fR, then the header file is saved
-using the name \fIfilename\fR\fB\&.h\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-i\fR \fIprobe-id\fR\fB[[\fR\fIpredicate\fR] \fIaction\fR\fB]\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify probe identifier (\fIprobe-id\fR) to trace or list (\fB-l\fR option). You can specify probe IDs using decimal integers as shown by \fBdtrace\fR \fB-l\fR. The \fB-i\fR argument can be suffixed with an optional
-D probe clause. You can specify more than one \fB-i\fR option at a time.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-I\fR \fIpath\fR\fR
-.ad
-.sp .6
-.RS 4n
-Add the specified directory \fIpath\fR to the search path for \fB#include\fR files when invoking \fBcpp\fR(1) (enabled
-using the \fB-C\fR option). This option passes the \fB-I\fR option to each \fBcpp\fR invocation. The specified \fIpath\fR is inserted into the search path ahead of the default directory list.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-L\fR \fIpath\fR\fR
-.ad
-.sp .6
-.RS 4n
-Add the specified directory \fIpath\fR to the search path for DTrace libraries. DTrace libraries are used to contain common definitions that can be used when writing D programs. The specified \fIpath\fR is added after the default library
-search path.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-l\fR\fR
-.ad
-.sp .6
-.RS 4n
-List probes instead of enabling them. If the \fB-l\fR option is specified, \fBdtrace\fR produces a report of the probes matching the descriptions given using the \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, \fB-i\fR,
-and \fB-s\fR options. If none of these options are specified, this option lists all probes.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-m\fR [[\fIprovider:\fR] \fImodule:\fR [[\fIpredicate\fR] \fIaction\fR]]\fR
-.ad
-.sp .6
-.RS 4n
-Specify module name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module\fR or \fImodule\fR. Unspecified probe description fields are left blank and match
-any probes regardless of the values in those fields. If no qualifiers other than \fImodule\fR are specified in the description, all probes with a corresponding \fImodule\fR are matched. The \fB-m\fR argument can be suffixed with an optional D
-probe clause. More than one \fB-m\fR option can be specified on the command line at a time.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-n\fR [[[\fIprovider:\fR] \fImodule:\fR] \fIfunction:\fR] \fIname\fR [[\fIpredicate\fR] \fIaction\fR]\fR
-.ad
-.sp .6
-.RS 4n
-Specify probe name to trace or list (\fB-l\fR option). The corresponding argument can include any of the probe description forms \fIprovider:module:function:name\fR, \fImodule:function:name\fR, \fIfunction:name\fR,
-or \fIname\fR.  Unspecified probe description fields are left blank and match any probes regardless of the values in those fields. If no qualifiers other than \fIname\fR are specified in the description, all probes with a corresponding \fIname\fR are
-matched. The \fB-n\fR argument can be suffixed with an optional D probe clause. More than one \fB-n\fR option can be specified on the command line at a time.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-o\fR \fIoutput\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify the \fIoutput\fR file for the \fB-A\fR , \fB-G\fR, and \fB-l\fR options, or for the traced data itself. If the \fB-A\fR option is present and \fB-o\fR is not present, the default output file is \fB/kernel/drv/dtrace.conf\fR. If the \fB-G\fR option is present and the \fB-s\fR option's argument is of the form \fB\fIfilename\fR.d\fR and \fB-o\fR is not present, the default output file is \fB\fIfilename\fR.o\fR.
-Otherwise the default output file is \fBd.out\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-p\fR \fIpid\fR\fR
-.ad
-.sp .6
-.RS 4n
-Grab the specified process-ID \fIpid\fR, cache its symbol tables, and exit upon its completion. If more than one \fB-p\fR option is present on the command line, \fBdtrace\fR exits when all commands have exited, reporting the exit status
-for each process as it terminates. The first process-ID is made available to any D programs specified on the command line or using the \fB-s\fR option through the \fB$target\fR macro variable. Refer to the \fISolaris Dynamic Tracing Guide\fR for
-more information on macro variables.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-P\fR \fIprovider\fR \fB[[\fR\fIpredicate\fR\fB]\fR \fIaction\fR]\fR
-.ad
-.sp .6
-.RS 4n
-Specify provider name to trace or list (\fB-l\fR option). The remaining probe description fields module, function, and name are left blank and match any probes regardless of the values in those fields. The \fB-P\fR argument can be suffixed with an optional D
-probe clause. You can specify more than one \fB-P\fR option on the command line at a time.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-q\fR\fR
-.ad
-.sp .6
-.RS 4n
-Set quiet mode. \fBdtrace\fR suppresses messages such as the number of probes matched by the specified options and D programs and does not print column headers, the CPU ID, the probe ID, or insert newlines into the output. Only data traced and formatted by D program
-statements such as \fBtrace()\fR and \fBprintf()\fR is displayed to \fBstdout\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-s\fR\fR
-.ad
-.sp .6
-.RS 4n
-Compile the specified D program source file. If the \fB-e\fR option is present, the program is compiled but instrumentation is not enabled. If the \fB-l\fR option is present, the program is compiled and the set of probes matched by it is listed, but instrumentation
-is not enabled. If none of \fB-e\fR, \fB-l\fR, \fB-G\fR, or \fB-A\fR are present, the instrumentation specified by the D program is enabled and tracing begins.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-S\fR\fR
-.ad
-.sp .6
-.RS 4n
-Show D compiler intermediate code. The D compiler produces a report of the intermediate code generated for each D program to \fBstderr\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-U\fR \fIname\fR\fR
-.ad
-.sp .6
-.RS 4n
-Undefine the specified \fIname\fR when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option). This option passes the \fB-U\fR option to each \fBcpp\fR invocation.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-v\fR\fR
-.ad
-.sp .6
-.RS 4n
-Set verbose mode. If the \fB-v\fR option is specified, \fBdtrace\fR produces a program stability report showing the minimum interface stability and dependency level for the specified D programs. DTrace stability levels are explained in further detail in the \fISolaris Dynamic Tracing Guide\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-V\fR\fR
-.ad
-.sp .6
-.RS 4n
-Report the highest D programming interface version supported by \fBdtrace\fR. The version information is printed to \fBstdout\fR and the \fBdtrace\fR command exits. Refer to the \fISolaris Dynamic Tracing Guide\fR for
-more information about DTrace versioning features.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-w\fR\fR
-.ad
-.sp .6
-.RS 4n
-Permit destructive actions in D programs specified using the \fB-s\fR, \fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options. If the \fB-w\fR option is not specified, \fBdtrace\fR does not
-permit the compilation or enabling of a D program that contains destructive actions.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-x\fR \fIarg\fR [\fI=val\fR]\fR
-.ad
-.sp .6
-.RS 4n
-Enable or modify a DTrace runtime option or D compiler option. The list of options is found in the \fISolaris Dynamic Tracing Guide\fR.  Boolean options are enabled by specifying their name. Options with values are set by separating the option name and
-value with an equals sign (\fB=\fR).
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-X\fR \fBa | c | s | t\fR\fR
-.ad
-.sp .6
-.RS 4n
-Specify the degree of conformance to the ISO C standard that should be selected when invoking \fBcpp\fR(1) (enabled using the \fB-C\fR option).
-The \fB-X\fR option argument affects the value and presence of the \fB__STDC__\fR macro depending upon the value of the argument letter.
-.sp
-The \fB-X\fR option supports the following arguments:
-.sp
-.ne 2
-.mk
-.na
-\fB\fBa\fR\fR
-.ad
-.RS 5n
-.rt  
-Default. ISO C plus K&R compatibility extensions, with semantic changes required by ISO C. This is the default mode if \fB-X\fR is not specified. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction
-with the \fB-Xa\fR option.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBc\fR\fR
-.ad
-.RS 5n
-.rt  
-Conformance. Strictly conformant ISO C, without K&R C compatibility extensions. The predefined macro \fB__STDC__\fR has a value of 1 when \fBcpp\fR is invoked in conjunction with the \fB-Xc\fR option.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBs\fR\fR
-.ad
-.RS 5n
-.rt  
-K&R C only. The macro \fB__STDC__\fR is not defined when \fBcpp\fR is invoked in conjunction with the \fB-Xs\fR option.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBt\fR\fR
-.ad
-.RS 5n
-.rt  
-Transition. ISO C plus K&R C compatibility extensions, without semantic changes required by ISO C. The predefined macro \fB__STDC__\fR has a value of 0 when \fBcpp\fR is invoked in conjunction with the \fB-Xt\fR option.
-.RE
-
-As the \fB-X\fR option only affects how the D compiler invokes the C preprocessor, the \fB-Xa\fR and \fB-Xt\fR options are equivalent from the perspective of D and both are provided only to ease re-use of settings from a C build environment.
-.sp
-Regardless of the \fB-X\fR mode, the following additional C preprocessor definitions are always specified and valid in all modes:
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__sun\fR
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__unix\fR
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__SVR4\fR
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__sparc\fR (on SPARC systems only)
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__sparcv9\fR (on SPARC systems only when 64-bit programs are compiled)
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__i386\fR (on x86 systems only when 32-bit programs are compiled)
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__amd64\fR (on x86 systems only when 64-bit programs are compiled)
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__\fI`uname -s`\fR_\fI`uname -r`\fR\fR (for example, \fB__SunOS_5_10\fR)
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__SUNW_D=1\fR
-.RE
-.RS +4
-.TP
-.ie t \(bu
-.el o
-\fB__SUNW_D_VERSION=0x\fIMMmmmuuu\fR\fR
-.sp
-Where \fIMM\fR is the major release value in hexadecimal, \fImmm\fR is the minor release value in hexadecimal, and \fIuuu\fR is the
-micro release value in hexadecimal. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information about DTrace versioning.
-.RE
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-Z\fR\fR
-.ad
-.sp .6
-.RS 4n
-Permit probe descriptions that match zero probes. If the \fB-Z\fR option is not specified, \fBdtrace\fR reports an error and exits if any probe descriptions specified in D program files (\fB-s\fR option) or on the command line (\fB-P\fR, \fB-m\fR, \fB-f\fR, \fB-n\fR, or \fB-i\fR options) contain descriptions that do not match any known probes.
-.RE
-
-.SH OPERANDS
-.sp
-.LP
-You can specify zero or more additional arguments on the \fBdtrace\fR command line to define a set of macro variables (\fB$1\fR, \fB$2\fR, and so forth). The additional arguments can be used in D programs specified using the \fB-s\fR option
-or on the command line. The use of macro variables is described further in the \fISolaris Dynamic Tracing Guide\fR.
-.SH EXIT STATUS
-.sp
-.LP
-The following exit values are returned:
-.sp
-.ne 2
-.mk
-.na
-\fB0\fR
-.ad
-.RS 5n
-.rt  
-Successful completion. 
-.sp
-For D program requests, an exit status of \fB0\fR indicates that programs were successfully compiled, probes were successfully enabled, or anonymous state was successfully retrieved. \fBdtrace\fR returns \fB0\fR even if the specified tracing requests
-encountered errors or drops.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB1\fR\fR
-.ad
-.RS 5n
-.rt  
+The
+.Fl X
+option supports the following arguments:
+.Bl -tag -width indent
+.It a
+Default.
+ISO C plus K&R compatibility extensions, with semantic changes required by ISO
+C.
+This is the default mode if
+.Fl X
+is not specified.
+The predefined macro __STDC__ has a value of 0 when
+.Xr cpp 1
+is invoked in conjunction with the
+.Fl Xa
+option.
+.It c
+Conformance.
+Strictly conformant ISO C, without K&R C compatibility extensions.
+The predefined macro __STDC__ has a value of 1 when
+.Xr cpp 1
+is invoked in conjunction with the
+.Fl \&Xc
+option.
+.It s
+K&R C only.
+The macro __STDC__ is not defined when
+.Xr cpp 1
+is invoked in conjunction with the
+.Fl Xs
+option.
+.It t
+Transition.
+ISO C plus K&R C compatibility extensions, without semantic changes required by
+ISO C.
+The predefined macro __STDC__ has a value of 0 when
+.Xr cpp 1
+is invoked in conjunction with the
+.Fl Xt
+option.
+.El
+.Pp
+As the
+.Fl X
+option only affects how the D compiler invokes the C preprocessor, the
+.Fl Xa
+and
+.Fl Xt
+options are equivalent from the perspective of D and both are provided only to
+ease re-use of settings from a C build environment.
+.Pp
+Regardless of the
+.Fl X
+mode, the following additional C preprocessor definitions are always specified
+and valid in all modes:
+.Bl -bullet -offset indent
+.It
+__sun
+.It
+__unix
+.It
+__SVR4
+.It
+__sparc (on SPARC systems only)
+.It
+__sparcv9 (on SPARC systems only when 64-bit programs are compiled)
+.It
+__i386 (on x86 systems only when 32-bit programs are compiled)
+.It
+__amd64 (on x86 systems only when 64-bit programs are compiled)
+.It
+__`uname -s`_`uname -r` (for example,
+.Ql FreeBSD_9.2-RELEASE .
+.It
+__SUNW_D=1
+.It
+.No __SUNW_D_VERSION=0x Ns Ar MMmmmuuu
+.Pp
+Where
+.Ar MM
+is the major release value in hexadecimal,
+.Ar mmm
+is the minor release value in hexadecimal, and
+.Ar uuu
+is the micro release value in hexadecimal.
+.El
+.It Fl Z
+Permit probe descriptions that match zero probes.
+If the
+.Fl Z
+option is not specified,
+.Nm
+reports an error and exits if any probe descriptions specified in D program
+files
+.Fl ( s
+option) or on the command line
+.Fl ( P , m , f , n ,
+or
+.Fl i
+options) contain descriptions that do not match any known probes.
+.El
+.Sh OPERANDS
+You can specify zero or more additional arguments on the
+.Nm
+command line to define a set of macro variables and so forth).
+The additional arguments can be used in D programs specified using the
+.Fl s
+option or on the command line.
+.Sh FILES
+.Bl -tag -width /boot/dtrace.dof -compact
+.It Pa /boot/dtrace.dof
+File for anonymous tracing directives.
+.El
+.Sh EXIT STATUS
+The following exit statuses are returned:
+.Bl -tag -width indent
+.It 0
+Successful completion.
+.Pp
+For D program requests, an exit status of 0 indicates that programs were
+successfully compiled, probes were successfully enabled, or anonymous state
+was successfully retrieved.
+.Nm
+returns 0 even if the specified tracing requests encountered errors or drops.
+.It 1
 An error occurred.
-.sp
-For D program requests, an exit status of \fB1\fR indicates that program compilation failed or that the specified request could not be satisfied.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB2\fR\fR
-.ad
-.RS 5n
-.rt  
+.Pp
+For D program requests, an exit status of 1 indicates that program compilation
+failed or that the specified request could not be satisfied.
+.It 2
 Invalid command line options or arguments were specified.
-.RE
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-AvailabilitySUNWdtrc
-_
-Interface StabilitySee below.
-.TE
-
-.sp
-.LP
-The command-line syntax is Committed. The human-readable output is Uncommitted.
-.SH SEE ALSO
-.sp
-.LP
-\fBcpp\fR(1), \fBisainfo\fR(1), \fBlibdtrace\fR(3LIB), \fBdriver.conf\fR(4), \fBattributes\fR(5), \fBdtrace\fR(7D)
-.sp
-.LP
-\fISolaris Dynamic Tracing Guide\fR
+.El
+.Sh SEE ALSO
+.Xr cpp 1 ,
+.Xr dtruss 1 ,
+.Xr elf 5
+.Rs
+.%T Solaris Dynamic Tracing Guide
+.Re
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
index 69c0f84a490..d2afbed356a 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh
@@ -64,7 +64,7 @@ child=$!
 # ksh doing work.  (This actually goes one step further and assumes that we
 # catch some non-static function in ksh.)
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
 status=$? 
 
 kill $child
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
index 6ca823f5ddd..8be34ec235d 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh
@@ -62,7 +62,7 @@ child=$!
 #
 # The only thing we can be sure of here is that ksh is doing some work.
 #
-script | tee /dev/fd/2 | grep -w ksh > /dev/null
+script | tee /dev/fd/2 | egrep -w 'ksh(93)?' > /dev/null
 status=$? 
 
 kill $child
diff --git a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
index b1a3ab9de2f..8842d2b0956 100644
--- a/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
+++ b/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh
@@ -63,7 +63,7 @@ child=$!
 # This test is essentially the same as that in the ufunc test; see that
 # test for the rationale.
 #
-script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
+script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
 status=$? 
 
 kill $child
diff --git a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1 b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
index f3fc8e6b2d0..b634d45f934 100644
--- a/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
+++ b/cddl/contrib/opensolaris/cmd/lockstat/lockstat.1
@@ -2,7 +2,7 @@
 .\" CDDL HEADER START
 .\"
 .\" The contents of this file are subject to the terms of the
-.\" Common Development and Distribution License (the "License").  
+.\" Common Development and Distribution License (the "License").
 .\" You may not use this file except in compliance with the License.
 .\"
 .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
@@ -18,858 +18,382 @@
 .\"
 .\" CDDL HEADER END
 .\" Copyright (c) 2008, Sun Microsystems, Inc. All Rights Reserved.
-.TH lockstat 1M "28 Feb 2008" "SunOS 5.11" "System Administration Commands"
-.SH NAME
-lockstat \- report kernel lock and profiling statistics
-.SH SYNOPSIS
-.LP
-.nf
-\fBlockstat\fR [\fB-ACEHI\fR] [\fB-e\fR \fIevent_list\fR] [\fB-i\fR \fIrate\fR] 
-    [\fB-b\fR | \fB-t\fR | \fB-h\fR | \fB-s\fR \fIdepth\fR] [\fB-n\fR \fInrecords\fR] 
-    [\fB-l\fR \fIlock\fR [, \fIsize\fR]] [\fB-d\fR \fIduration\fR] 
-    [\fB-f\fR \fIfunction\fR [, \fIsize\fR]] [\fB-T\fR] [\fB-ckgwWRpP\fR] [\fB-D\fR \fIcount\fR] 
-    [\fB-o\fR \fIfilename\fR] [\fB-x\fR \fIopt\fR [=val]] \fIcommand\fR [\fIargs\fR]
-.fi
-
-.SH DESCRIPTION
-.sp
-.LP
-The \fBlockstat\fR utility gathers and displays kernel locking and profiling statistics. \fBlockstat\fR allows you to specify which events to watch (for example, spin on adaptive mutex, block on read access to rwlock due to waiting writers, and so forth) how much
-data to gather for each event, and how to display the data. By default, \fBlockstat\fR monitors all lock contention events, gathers frequency and timing data about those events, and displays the data in decreasing frequency order, so that the most common events appear first.
-.sp
-.LP
-\fBlockstat\fR gathers data until the specified command completes. For example, to gather statistics for a fixed-time interval, use \fBsleep\fR(1) as
-the command, as follows:
-.sp
-.LP
-\fBexample#\fR \fBlockstat\fR \fBsleep\fR \fB5\fR
-.sp
-.LP
-When the \fB-I\fR option is specified, \fBlockstat\fR establishes a per-processor high-level periodic interrupt source to gather profiling data. The interrupt handler simply generates a \fBlockstat\fR event whose caller is the interrupted PC (program counter).
-The profiling event is just like any other \fBlockstat\fR event, so all of the normal \fBlockstat\fR options are applicable.
-.sp
-.LP
-\fBlockstat\fR relies on DTrace to modify the running kernel's text to intercept events of interest. This imposes a small but measurable overhead on all system activity, so access to \fBlockstat\fR is restricted to super-user by default. The system administrator
-can permit other users to use \fBlockstat\fR by granting them additional DTrace privileges. Refer to the \fISolaris Dynamic Tracing Guide\fR for more information about DTrace security features.
-.SH OPTIONS
-.sp
-.LP
-The following options are supported: 
-.SS "Event Selection"
-.sp
-.LP
-If no event selection options are specified, the default is \fB-C\fR.
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-A\fR\fR
-.ad
-.sp .6
-.RS 4n
-Watch all lock events. \fB-A\fR is equivalent to \fB-CH\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-C\fR\fR
-.ad
-.sp .6
-.RS 4n
-Watch contention events. 
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-E\fR\fR
-.ad
-.sp .6
-.RS 4n
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 24, 2013
+.Dt LOCKSTAT 1
+.Os
+.Sh NAME
+.Nm lockstat
+.Nd report kernel lock and profiling statistics
+.Sh SYNOPSIS
+.Nm
+.Op Fl ACEHI
+.Op Fl e Ar event-list
+.Op Fl i Ar rate
+.Op Fl b | t | h | s Ar depth
+.Op Fl n Ar num-records
+.Op Fl l Ar lock Oo Ns , Ns Ar size Oc
+.Op Fl d Ar duration
+.Op Fl f Ar function Oo Ns , Ns Ar size Oc
+.Op Fl T
+.Op Fl ckgwWRpP
+.Op Fl D Ar count
+.Op Fl o filename
+.Op Fl x Ar opt Oo Ns = Ns Ar val Oc
+.Ar command
+.Op Oo Ar args Oc
+.Sh DESCRIPTION
+The
+.Nm
+utility gathers and displays kernel locking and profiling statistics.
+.Nm
+allows you to specify which events to watch (for example, spin on adaptive
+mutex, block on read access to rwlock due to waiting writers, and so forth), how
+much data to gather for each event, and how to display the data.
+By default,
+.Nm
+monitors all lock contention events, gathers frequency and timing data about
+those events, and displays the data in decreasing frequency order, so that the
+most common events appear first.
+.Pp
+.Nm
+gathers data until the specified command completes.
+For example, to gather statistics for a fixed-time interval, use
+.Xr sleep 1
+as the command, as follows:
+.Pp
+.Dl # lockstat sleep 5
+.Pp
+When the
+.Fl I
+option is specified,
+.Nm lockstat
+establishes a per-processor high-level periodic interrupt source to gather
+profiling data.
+The interrupt handler simply generates a
+.Nm
+event whose caller is the interrupted PC (program counter).
+The profiling event is just like any other
+.Nm lockstat
+event, so all of the normal
+.Nm lockstat
+options are applicable.
+.Pp
+.Nm
+relies on DTrace to modify the running kernel's text to intercept events of
+interest.
+This imposes a small but measurable overhead on all system activity, so access
+to
+.Nm
+is restricted to super-user by default.
+.Sh OPTIONS
+The following options are supported:
+.Ss Event Selection
+If no event selection options are specified, the default is
+.Fl C .
+.Bl -tag -width indent
+.It Fl A
+Watch all lock events.
+.Fl A
+is equivalent to
+.Fl CH .
+.It Fl C
+Watch contention events.
+.It Fl E
 Watch error events.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fR\fB-e\fR \fIevent_list\fR\fR
-.ad
-.sp .6
-.RS 4n
-Only watch the specified events. \fIevent\fR \fIlist\fR is a comma-separated list of events or ranges of events such as 1,4-7,35. Run \fBlockstat\fR with no arguments to get a brief description of all events.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-H\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl e Ar event-list
+Only watch the specified events.
+.Ar event-list
+is a comma-separated list of events or ranges of events such as 1,4-7,35.
+Run
+.Nm
+with no arguments to get a brief description of all events.
+.It Fl H
 Watch hold events.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-I\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl I
 Watch profiling interrupt events.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fR\fB-i\fR \fIrate\fR\fR
-.ad
-.sp .6
-.RS 4n
-Interrupt rate (per second) for \fB-I\fR. The default is 97 Hz, so that profiling doesn't run in lockstep with the clock interrupt (which runs at 100 Hz).
-.RE
-
-.SS "Data Gathering"
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-x\fR \fIarg\fR[=\fIval\fR]\fR
-.ad
-.sp .6
-.RS 4n
-Enable or modify a DTrace runtime option or D compiler option. The list of options is found in the \fI\fR. Boolean options are enabled by specifying their name. Options with values are set by separating the option name and
-value with an equals sign (=).
-.RE
-
-.SS "Data Gathering (Mutually Exclusive)"
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-b\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl i Ar rate
+Interrupt rate (per second) for
+.Fl I .
+The default is 97 Hz, so that profiling doesn't run in lockstep with the clock
+interrupt (which runs at 100 Hz).
+.El
+.Ss Data Gathering
+.Bl -tag -width indent
+.It Fl x Ar arg Oo Ns = Ns Ar val Oc
+Enable or modify a
+.Xr dtrace 1
+runtime option or D compiler option.
+Boolean options are enabled by specifying their name.
+Options with values are set by separating the option name and value with an
+equals sign.
+.El
+.Ss "Data Gathering (Mutually Exclusive)"
+.Bl -tag -width indent
+.It Fl b
 Basic statistics: lock, caller, number of events.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-h\fR\fR
-.ad
-.sp .6
-.RS 4n
-Histogram: Timing plus time-distribution histograms.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fR\fB-s\fR \fIdepth\fR\fR
-.ad
-.sp .6
-.RS 4n
-Stack trace: Histogram plus stack traces up to \fIdepth\fR frames deep.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-t\fR\fR
-.ad
-.sp .6
-.RS 4n
-Timing: Basic plus timing for all events [default].
-.RE
-
-.SS "Data Filtering"
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fR\fB-d\fR \fIduration\fR\fR
-.ad
-.sp .6
-.RS 4n
-Only watch events longer than \fIduration\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fR\fB-f\fR \fIfunc[,size]\fR\fR
-.ad
-.sp .6
-.RS 4n
-Only watch events generated by \fIfunc\fR, which can be specified as a symbolic name or hex address. \fIsize\fR defaults to the \fBELF\fR symbol size if available, or \fB1\fR if not.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fR\fB-l\fR \fIlock[,size]\fR\fR
-.ad
-.sp .6
-.RS 4n
-Only watch \fIlock\fR, which can be specified as a symbolic name or hex address. \fBsize\fR defaults to the \fBELF\fR symbol size or \fB1\fR if the symbol size is not available.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fR\fB-n\fR \fInrecords\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl h
+Histogram: timing plus time-distribution histograms.
+.It Fl s Ar depth
+Stack trace: histogram plus stack traces up to
+.Ar depth
+frames deep.
+.It Fl t
+Timing: Basic plus timing for all events (default).
+.El
+.Ss "Data Filtering"
+.Bl -tag -width indent
+.It Fl d Ar duration
+Only watch events longer than
+.Ar duration .
+.It Fl f Ar func Ns Oo Ns , Ns Ar size Oc Ns
+Only watch events generated by
+.Ar func ,
+which can be specified as a symbolic name or hex address.
+.Ar size
+defaults to the ELF symbol size if available, or 1 if not.
+.It Fl l Ar lock Ns Oo Ns , Ns Ar size Oc Ns
+Only watch
+.Ar lock ,
+which can be specified as a symbolic name or hex address.
+.Ar size
+defaults to the ELF symbol size or 1 if the symbol size is not available.
+.It Fl n Ar num-records
 Maximum number of data records.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-T\fR\fR
-.ad
-.sp .6
-.RS 4n
-Trace (rather than sample) events [off by default].
-.RE
-
-.SS "Data Reporting"
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-c\fR\fR
-.ad
-.sp .6
-.RS 4n
-Coalesce lock data for lock arrays (for example, \fBpse_mutex[]\fR).
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fR\fB-D\fR \fIcount\fR\fR
-.ad
-.sp .6
-.RS 4n
-Only display the top \fIcount\fR events of each type.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-g\fR\fR
-.ad
-.sp .6
-.RS 4n
-Show total events generated by function. For example, if \fBfoo()\fR calls \fBbar()\fR in a loop, the work done by \fBbar()\fR counts as work generated by \fBfoo()\fR (along with any work done by \fBfoo()\fR itself).
-The \fB-g\fR option works by counting the total number of stack frames in which each function appears. This implies two things: (1) the data reported by \fB-g\fR can be misleading if the stack traces are not deep enough, and (2) functions that are called recursively might show
-greater than 100% activity. In light of issue (1), the default data gathering mode when using \fB-g\fR is \fB-s\fR \fB50\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-k\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl T
+Trace (rather than sample) events.
+This is off by default.
+.El
+.Ss Data Reporting
+.Bl -tag -width indent
+.It Fl c
+Coalesce lock data for lock arrays.
+.It Fl D Ar count
+Only display the top
+.Ar count
+events of each type.
+.It Fl g
+Show total events generated by function.
+For example, if
+.Fn foo
+calls
+.Fn bar
+in a loop, the work done by
+.Fn bar
+counts as work generated by
+.Fn foo
+(along with any work done by
+.Fn foo
+itself).
+The
+.Fl g
+option works by counting the total number of stack frames in which each function
+appears.
+This implies two things: (1) the data reported by
+.Fl g
+can be misleading if the stack traces are not deep enough, and (2) functions
+that are called recursively might show greater than 100% activity.
+In light of issue (1), the default data gathering mode when using
+.Fl g
+is
+.Fl s 50 .
+.It Fl k
 Coalesce PCs within functions.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB\fR\fB-o\fR \fIfilename\fR\fR
-.ad
-.sp .6
-.RS 4n
-Direct output to \fIfilename\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-P\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl o Ar filename
+Direct output to
+.Ar filename .
+.It Fl P
 Sort data by (\fIcount * time\fR) product.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-p\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl p
 Parsable output format.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-R\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl R
 Display rates (events per second) rather than counts.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-W\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl W
 Whichever: distinguish events only by caller, not by lock.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fB-w\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It Fl w
 Wherever: distinguish events only by lock, not by caller.
-.RE
-
-.SH DISPLAY FORMATS
-.sp
-.LP
+.El
+.Sh DISPLAY FORMATS
 The following headers appear over various columns of data.
-.sp
-.ne 2
-.mk
-.na
-\fB\fBCount\fR or \fBops/s\fR\fR
-.ad
-.sp .6
-.RS 4n
-Number of times this event occurred, or the rate (times per second) if \fB-R\fR was specified.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBindv\fR\fR
-.ad
-.sp .6
-.RS 4n
+.Bl -tag -width indent
+.It Count or ops/s
+Number of times this event occurred, or the rate (times per second) if
+.Fl R
+was specified.
+.It indv
 Percentage of all events represented by this individual event.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBgenr\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It genr
 Percentage of all events generated by this function.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBcuml\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It cuml
 Cumulative percentage; a running total of the individuals.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBrcnt\fR\fR
-.ad
-.sp .6
-.RS 4n
-Average reference count. This will always be \fB1\fR for exclusive locks (mutexes, spin locks, rwlocks held as writer) but can be greater than \fB1\fR for shared locks (rwlocks held as reader).
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBnsec\fR\fR
-.ad
-.sp .6
-.RS 4n
-Average duration of the events in nanoseconds, as appropriate for the event. For the profiling event, duration means interrupt latency.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBLock\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It rcnt
+Average reference count.
+This will always be 1 for exclusive locks (mutexes,
+spin locks, rwlocks held as writer) but can be greater than 1 for shared locks
+(rwlocks held as reader).
+.It nsec
+Average duration of the events in nanoseconds, as appropriate for the event.
+For the profiling event, duration means interrupt latency.
+.It Lock
 Address of the lock; displayed symbolically if possible.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBCPU+PIL\fR\fR
-.ad
-.sp .6
-.RS 4n
-\fBCPU\fR plus processor interrupt level (\fBPIL\fR). For example, if \fBCPU\fR 4 is interrupted while at \fBPIL\fR 6, this will be reported as \fBcpu[4]+6\fR.
-.RE
-
-.sp
-.ne 2
-.mk
-.na
-\fB\fBCaller\fR\fR
-.ad
-.sp .6
-.RS 4n
+.It CPU+PIL
+CPU plus processor interrupt level (PIL).
+For example, if CPU 4 is interrupted while at PIL 6, this will be reported as
+cpu[4]+6.
+.It Caller
 Address of the caller; displayed symbolically if possible.
-.RE
-
-.SH EXAMPLES
-.LP
-\fBExample 1 \fRMeasuring Kernel Lock Contention
-.sp
-.in +2
-.nf
-example# \fBlockstat sleep 5\fR
-Adaptive mutex spin: 2210 events in 5.055 seconds (437 events/sec)
-.fi
-.in -2
-.sp
-
-.sp
-.in +2
-.nf
-Count indv cuml rcnt     nsec Lock                Caller
-------------------------------------------------------------------------
- 269  12%  12% 1.00     2160 service_queue       background+0xdc
- 249  11%  23% 1.00       86 service_queue       qenable_locked+0x64
- 228  10%  34% 1.00      131 service_queue       background+0x15c
-  68   3%  37% 1.00       79 0x30000024070       untimeout+0x1c
-  59   3%  40% 1.00      384 0x300066fa8e0       background+0xb0
-  43   2%  41% 1.00       30 rqcred_lock         svc_getreq+0x3c
-  42   2%  43% 1.00      341 0x30006834eb8       background+0xb0
-  41   2%  45% 1.00      135 0x30000021058       untimeout+0x1c
-  40   2%  47% 1.00       39 rqcred_lock         svc_getreq+0x260
-  37   2%  49% 1.00     2372 0x300068e83d0       hmestart+0x1c4
-  36   2%  50% 1.00       77 0x30000021058       timeout_common+0x4
-  36   2%  52% 1.00      354 0x300066fa120       background+0xb0
-  32   1%  53% 1.00       97 0x30000024070       timeout_common+0x4
-  31   1%  55% 1.00     2923 0x300069883d0       hmestart+0x1c4
-  29   1%  56% 1.00      366 0x300066fb290       background+0xb0
-  28   1%  57% 1.00      117 0x3000001e040       untimeout+0x1c
-  25   1%  59% 1.00       93 0x3000001e040       timeout_common+0x4
-  22   1%  60% 1.00       25 0x30005161110       sync_stream_buf+0xdc
-  21   1%  60% 1.00      291 0x30006834eb8       putq+0xa4
-  19   1%  61% 1.00       43 0x3000515dcb0       mdf_alloc+0xc
-  18   1%  62% 1.00      456 0x30006834eb8       qenable+0x8
-  18   1%  63% 1.00       61 service_queue       queuerun+0x168
-  17   1%  64% 1.00      268 0x30005418ee8       vmem_free+0x3c
-[...]
-
-R/W reader blocked by writer: 76 events in 5.055 seconds (15 events/sec)
-
-Count indv cuml rcnt     nsec Lock                Caller
-------------------------------------------------------------------------
-  23  30%  30% 1.00 22590137 0x300098ba358       ufs_dirlook+0xd0
-  17  22%  53% 1.00  5820995 0x3000ad815e8       find_bp+0x10
-  13  17%  70% 1.00  2639918 0x300098ba360       ufs_iget+0x198
-   4   5%  75% 1.00  3193015 0x300098ba360       ufs_getattr+0x54
-   3   4%  79% 1.00  7953418 0x3000ad817c0       find_bp+0x10
-   3   4%  83% 1.00   935211 0x3000ad815e8       find_read_lof+0x14
-   2   3%  86% 1.00 16357310 0x300073a4720       find_bp+0x10
-   2   3%  88% 1.00  2072433 0x300073a4720       find_read_lof+0x14
-   2   3%  91% 1.00  1606153 0x300073a4370       find_bp+0x10
-   1   1%  92% 1.00  2656909 0x300107e7400       ufs_iget+0x198
-[...]
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 2 \fRMeasuring Hold Times
-.sp
-.in +2
-.nf
-example# \fBlockstat -H -D 10 sleep 1\fR
-Adaptive mutex spin: 513 events
-.fi
-.in -2
-.sp
-
-.sp
-.in +2
-.nf
-Count indv cuml rcnt     nsec Lock                Caller
--------------------------------------------------------------------------
- 480   5%   5% 1.00     1136 0x300007718e8       putnext+0x40
- 286   3%   9% 1.00      666 0x3000077b430       getf+0xd8
- 271   3%  12% 1.00      537 0x3000077b430       msgio32+0x2fc
- 270   3%  15% 1.00     3670 0x300007718e8       strgetmsg+0x3d4
- 270   3%  18% 1.00     1016 0x300007c38b0       getq_noenab+0x200
- 264   3%  20% 1.00     1649 0x300007718e8       strgetmsg+0xa70
- 216   2%  23% 1.00     6251 tcp_mi_lock         tcp_snmp_get+0xfc
- 206   2%  25% 1.00      602 thread_free_lock    clock+0x250
- 138   2%  27% 1.00      485 0x300007c3998       putnext+0xb8
- 138   2%  28% 1.00     3706 0x300007718e8       strrput+0x5b8
--------------------------------------------------------------------------
-[...]
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 3 \fRMeasuring Hold Times for Stack Traces Containing a Specific Function
-.sp
-.in +2
-.nf
-example# \fBlockstat -H -f tcp_rput_data -s 50 -D 10 sleep 1\fR
-Adaptive mutex spin: 11 events in 1.023 seconds (11
-events/sec)
-.fi
-.in -2
-.sp
-
-.sp
-.in +2
-.nf
--------------------------------------------------------------------------
-Count indv cuml rcnt     nsec Lock                   Caller
-   9  82%  82% 1.00     2540 0x30000031380          tcp_rput_data+0x2b90
-
-     nsec ------ Time Distribution ------ count     Stack
-      256 |@@@@@@@@@@@@@@@@               5         tcp_rput_data+0x2b90
-      512 |@@@@@@                         2         putnext+0x78
-     1024 |@@@                            1         ip_rput+0xec4
-     2048 |                               0         _c_putnext+0x148
-     4096 |                               0         hmeread+0x31c
-     8192 |                               0         hmeintr+0x36c
-    16384 |@@@                            1
-sbus_intr_wrapper+0x30
-[...]
+.El
+.Sh EXAMPLES
+.Bl -tag -width 0n
+.It Example 1 Measuring Kernel Lock Contention
+.Pp
+.Li # lockstat sleep 5
+.Bd -literal
+Adaptive mutex spin: 41411 events in 5.011 seconds (8263 events/sec)
 
 Count indv cuml rcnt     nsec Lock                   Caller
-   1   9%  91% 1.00     1036 0x30000055380          freemsg+0x44
-
-     nsec ------ Time Distribution ------ count     Stack
-     1024 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 1         freemsg+0x44
-                                                    tcp_rput_data+0x2fd0
-                                                    putnext+0x78
-                                                    ip_rput+0xec4
-                                                    _c_putnext+0x148
-                                                    hmeread+0x31c
-                                                    hmeintr+0x36c
-
-sbus_intr_wrapper+0x30
--------------------------------------------------------------------------
-[...]
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 4 \fRBasic Kernel Profiling
-.sp
-.LP
-For basic profiling, we don't care whether the profiling interrupt sampled \fBfoo()\fR\fB+0x4c\fR or \fBfoo()\fR\fB+0x78\fR; we care only that it sampled somewhere in \fBfoo()\fR, so we use \fB-k\fR. The \fBCPU\fR and \fBPIL\fR aren't relevant to basic profiling because we are measuring the system as a whole, not a particular \fBCPU\fR or interrupt level, so we use \fB-W\fR.
-
-.sp
-.in +2
-.nf
-example# \fBlockstat -kIW -D 20 ./polltest\fR
-Profiling interrupt: 82 events in 0.424 seconds (194
-events/sec)
-.fi
-.in -2
-.sp
-
-.sp
-.in +2
-.nf
-Count indv cuml rcnt     nsec Hottest CPU+PIL     Caller
------------------------------------------------------------------------
-   8  10%  10% 1.00      698 cpu[1]              utl0
-   6   7%  17% 1.00      299 cpu[0]              read
-   5   6%  23% 1.00      124 cpu[1]              getf
-   4   5%  28% 1.00      327 cpu[0]              fifo_read
-   4   5%  33% 1.00      112 cpu[1]              poll
-   4   5%  38% 1.00      212 cpu[1]              uiomove
-   4   5%  43% 1.00      361 cpu[1]              mutex_tryenter
-   3   4%  46% 1.00      682 cpu[0]              write
-   3   4%  50% 1.00       89 cpu[0]              pcache_poll
-   3   4%  54% 1.00      118 cpu[1]              set_active_fd
-   3   4%  57% 1.00      105 cpu[0]              syscall_trap32
-   3   4%  61% 1.00      640 cpu[1]              (usermode)
-   2   2%  63% 1.00      127 cpu[1]              fifo_poll
-   2   2%  66% 1.00      300 cpu[1]              fifo_write
-   2   2%  68% 1.00      669 cpu[0]              releasef
-   2   2%  71% 1.00      112 cpu[1]              bt_getlowbit
-   2   2%  73% 1.00      247 cpu[1]              splx
-   2   2%  76% 1.00      503 cpu[0]              mutex_enter
-   2   2%  78% 1.00      467 cpu[0]+10           disp_lock_enter
-   2   2%  80% 1.00      139 cpu[1]              default_copyin
------------------------------------------------------------------------
-[...]
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 5 \fRGenerated-load Profiling
-.sp
-.LP
-In the example above, 5% of the samples were in \fBpoll()\fR. This tells us how much time was spent inside \fBpoll()\fR itself, but tells us nothing about how much work was \fBgenerated\fR by \fBpoll()\fR; that is, how much time we spent
-in functions called by \fBpoll()\fR. To determine that, we use the \fB-g\fR option. The example below shows that although \fBpolltest\fR spends only 5% of its time in \fBpoll()\fR itself, \fBpoll()\fR-induced work accounts for 34% of
-the load.
-
-.sp
-.LP
-Note that the functions that generate the profiling interrupt (\fBlockstat_intr()\fR, \fBcyclic_fire()\fR, and so forth) appear in every stack trace, and therefore are considered to have generated 100% of the load. This illustrates an important point: the generated
-load percentages do \fBnot\fR add up to 100% because they are not independent. If 72% of all stack traces contain both \fBfoo()\fR and \fBbar()\fR, then both \fBfoo()\fR and \fBbar()\fR are 72% load generators.
-
-.sp
-.in +2
-.nf
-example# \fBlockstat -kgIW -D 20 ./polltest\fR
-Profiling interrupt: 80 events in 0.412 seconds (194 events/sec)
-.fi
-.in -2
-.sp
-
-.sp
-.in +2
-.nf
-Count genr cuml rcnt     nsec Hottest CPU+PIL     Caller
--------------------------------------------------------------------------
-  80 100% ---- 1.00      310 cpu[1]              lockstat_intr
-  80 100% ---- 1.00      310 cpu[1]              cyclic_fire
-  80 100% ---- 1.00      310 cpu[1]              cbe_level14
-  80 100% ---- 1.00      310 cpu[1]              current_thread
-  27  34% ---- 1.00      176 cpu[1]              poll
-  20  25% ---- 1.00      221 cpu[0]              write
-  19  24% ---- 1.00      249 cpu[1]              read
-  17  21% ---- 1.00      232 cpu[0]              write32
-  17  21% ---- 1.00      207 cpu[1]              pcache_poll
-  14  18% ---- 1.00      319 cpu[0]              fifo_write
-  13  16% ---- 1.00      214 cpu[1]              read32
-  10  12% ---- 1.00      208 cpu[1]              fifo_read
-  10  12% ---- 1.00      787 cpu[1]              utl0
-   9  11% ---- 1.00      178 cpu[0]              pcacheset_resolve
-   9  11% ---- 1.00      262 cpu[0]              uiomove
-   7   9% ---- 1.00      506 cpu[1]              (usermode)
-   5   6% ---- 1.00      195 cpu[1]              fifo_poll
-   5   6% ---- 1.00      136 cpu[1]              syscall_trap32
-   4   5% ---- 1.00      139 cpu[0]              releasef
-   3   4% ---- 1.00      277 cpu[1]              polllock
--------------------------------------------------------------------------
-[...]
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 6 \fRGathering Lock Contention and Profiling Data for a Specific Module
-.sp
-.LP
-In this example we use the \fB-f\fR option not to specify a single function, but rather to specify the entire text space of the \fBsbus\fR module. We gather both lock contention and profiling statistics so that contention can be correlated with overall load on the
-module. 
-
-.sp
-.in +2
-.nf
-example# \fBmodinfo | grep sbus\fR
-24 102a8b6f   b8b4  59   1  sbus (SBus (sysio) nexus driver)
-.fi
-.in -2
-.sp
-
-.sp
-.in +2
-.nf
-example# \fBlockstat -kICE -f 0x102a8b6f,0xb8b4 sleep 10\fR
-Adaptive mutex spin: 39 events in 10.042 seconds (4 events/sec)
-.fi
-.in -2
-.sp
-
-.sp
-.in +2
-.nf
-Count indv cuml rcnt     nsec Lock               Caller
--------------------------------------------------------------------------
-  15  38%  38% 1.00      206 0x30005160528      sync_stream_buf
-   7  18%  56% 1.00       14 0x30005160d18      sync_stream_buf
-   6  15%  72% 1.00       27 0x300060c3118      sync_stream_buf
-   5  13%  85% 1.00       24 0x300060c3510      sync_stream_buf
-   2   5%  90% 1.00       29 0x300060c2d20      sync_stream_buf
-   2   5%  95% 1.00       24 0x30005161cf8      sync_stream_buf
-   1   3%  97% 1.00       21 0x30005161110      sync_stream_buf
-   1   3% 100% 1.00       23 0x30005160130      sync_stream_buf
+-------------------------------------------------------------------------------
+13750  33%  33% 0.00       72 vm_page_queue_free_mtx vm_page_free_toq+0x12e
+13648  33%  66% 0.00       66 vm_page_queue_free_mtx vm_page_alloc+0x138
+ 4023  10%  76% 0.00       51 vm_dom+0x80            vm_page_dequeue+0x68
+ 2672   6%  82% 0.00      186 vm_dom+0x80            vm_page_enqueue+0x63
+  618   1%  84% 0.00       31 0xfffff8000cd83a88     qsyncvp+0x37
+  506   1%  85% 0.00      164 0xfffff8000cb3f098     vputx+0x5a
+  477   1%  86% 0.00       69 0xfffff8000c7eb180     uma_dbg_getslab+0x5b
+  288   1%  87% 0.00       77 0xfffff8000cd8b000     vn_finished_write+0x29
+  263   1%  88% 0.00      103 0xfffff8000cbad448     vinactive+0xdc
+  259   1%  88% 0.00       53 0xfffff8000cd8b000     vfs_ref+0x24
+  237   1%  89% 0.00       20 0xfffff8000cbad448     vfs_hash_get+0xcc
+  233   1%  89% 0.00       22 0xfffff8000bfd9480     uma_dbg_getslab+0x5b
+  223   1%  90% 0.00       20 0xfffff8000cb3f098     cache_lookup+0x561
+  193   0%  90% 0.00       16 0xfffff8000cb40ba8     vref+0x27
+  175   0%  91% 0.00       34 0xfffff8000cbad448     vputx+0x5a
+  169   0%  91% 0.00       51 0xfffff8000cd8b000     vfs_unbusy+0x27
+  164   0%  92% 0.00       31 0xfffff8000cb40ba8     vputx+0x5a
 [...]
 
-Adaptive mutex block: 9 events in 10.042 seconds (1 events/sec)
+Adaptive mutex block: 10 events in 5.011 seconds (2 events/sec)
 
-Count indv cuml rcnt     nsec Lock               Caller
--------------------------------------------------------------------------
-   4  44%  44% 1.00   156539 0x30005160528      sync_stream_buf
-   2  22%  67% 1.00   763516 0x30005160d18      sync_stream_buf
-   1  11%  78% 1.00   462130 0x300060c3510      sync_stream_buf
-   1  11%  89% 1.00   288749 0x30005161110      sync_stream_buf
-   1  11% 100% 1.00  1015374 0x30005160130      sync_stream_buf
+Count indv cuml rcnt     nsec Lock                   Caller
+-------------------------------------------------------------------------------
+    3  30%  30% 0.00    17592 vm_page_queue_free_mtx vm_page_alloc+0x138
+    2  20%  50% 0.00    20528 vm_dom+0x80            vm_page_enqueue+0x63
+    2  20%  70% 0.00    55502 0xfffff8000cb40ba8     vputx+0x5a
+    1  10%  80% 0.00    12007 vm_page_queue_free_mtx vm_page_free_toq+0x12e
+    1  10%  90% 0.00     9125 0xfffff8000cbad448     vfs_hash_get+0xcc
+    1  10% 100% 0.00     7864 0xfffff8000cd83a88     qsyncvp+0x37
+-------------------------------------------------------------------------------
+[...]
+.Ed
+.It Example 2 Measuring Hold Times
+.Pp
+.Li # lockstat -H -D 10 sleep 1
+.Bd -literal
+Adaptive mutex hold: 109589 events in 1.039 seconds (105526 events/sec)
+
+Count indv cuml rcnt     nsec Lock                   Caller
+-------------------------------------------------------------------------------
+ 8998   8%   8% 0.00      617 0xfffff8000c7eb180     uma_dbg_getslab+0xd4
+ 5901   5%  14% 0.00      917 vm_page_queue_free_mtx vm_object_terminate+0x16a
+ 5040   5%  18% 0.00      902 vm_dom+0x80            vm_page_free_toq+0x88
+ 4884   4%  23% 0.00     1056 vm_page_queue_free_mtx vm_page_alloc+0x44e
+ 4664   4%  27% 0.00      759 vm_dom+0x80            vm_fault_hold+0x1a13
+ 4011   4%  31% 0.00      888 vm_dom                 vm_page_advise+0x11b
+ 4010   4%  34% 0.00      957 vm_dom+0x80            _vm_page_deactivate+0x5c
+ 3743   3%  38% 0.00      582 0xfffff8000cf04838     pmap_is_prefaultable+0x158
+ 2254   2%  40% 0.00      952 vm_dom                 vm_page_free_toq+0x88
+ 1639   1%  41% 0.00      591 0xfffff800d60065b8     trap_pfault+0x1f7
+-------------------------------------------------------------------------------
 [...]
 
-Profiling interrupt: 229 events in 10.042 seconds (23 events/sec)
+R/W writer hold: 64314 events in 1.039 seconds (61929 events/sec)
 
-Count indv cuml rcnt     nsec Hottest CPU+PIL    Caller
+Count indv cuml rcnt     nsec Lock                   Caller
+-------------------------------------------------------------------------------
+ 7421  12%  12% 0.00     2994 pvh_global_lock        pmap_page_is_mapped+0xb6
+ 4668   7%  19% 0.00     3313 pvh_global_lock        pmap_enter+0x9ae
+ 1639   3%  21% 0.00      733 0xfffff80168d10200     vm_object_deallocate+0x683
+ 1639   3%  24% 0.00     3061 0xfffff80168d10200     unlock_and_deallocate+0x2b
+ 1639   3%  26% 0.00     2966 0xfffff80168d10200     vm_fault_hold+0x16ee
+ 1567   2%  29% 0.00      733 0xfffff80168d10200     vm_fault_hold+0x19bc
+  821   1%  30% 0.00      786 0xfffff801eb0cc000     vm_object_madvise+0x32d
+  649   1%  31% 0.00     4918 0xfffff80191105300     vm_fault_hold+0x16ee
+  648   1%  32% 0.00     8112 0xfffff80191105300     unlock_and_deallocate+0x2b
+  647   1%  33% 0.00     1261 0xfffff80191105300     vm_object_deallocate+0x683
+-------------------------------------------------------------------------------
+.Ed
+.It Example 3 Measuring Hold Times for Stack Traces Containing a Specific Function
+.Pp
+.Li # lockstat -H -f tcp_input -s 50 -D 10 sleep 1
+.Bd -literal
+Adaptive mutex hold: 68 events in 1.026 seconds (66 events/sec)
 
--------------------------------------------------------------------------
-  89  39%  39% 1.00      426 cpu[0]+6           sync_stream_buf
-  64  28%  67% 1.00      398 cpu[0]+6           sbus_intr_wrapper
-  23  10%  77% 1.00      324 cpu[0]+6           iommu_dvma_kaddr_load
-  21   9%  86% 1.00      512 cpu[0]+6           iommu_tlb_flush
-  14   6%  92% 1.00      342 cpu[0]+6           iommu_dvma_unload
-  13   6%  98% 1.00      306 cpu[1]             iommu_dvma_sync
-   5   2% 100% 1.00      389 cpu[1]             iommu_dma_bindhdl
--------------------------------------------------------------------------
+-------------------------------------------------------------------------------
+Count indv cuml rcnt     nsec Lock                   Caller
+   32  47%  47% 0.00     1631 0xfffff800686f50d8     tcp_do_segment+0x284b
+
+      nsec ------ Time Distribution ------ count     Stack
+      1024 |@@@@@@@@@@                     11        tcp_input+0xf54
+      2048 |@@@@@@@@@@@@@                  14        ip_input+0xc8
+      4096 |@@@@@                          6         swi_net+0x192
+      8192 |                               1         intr_event_execute_handlers+0x93
+                                                     ithread_loop+0xa6
+                                                     fork_exit+0x84
+                                                     0xffffffff808cf9ee
+-------------------------------------------------------------------------------
+Count indv cuml rcnt     nsec Lock                   Caller
+   29  43%  90% 0.00     4851 0xfffff800686f50d8     sowakeup+0xf8
+
+      nsec ------ Time Distribution ------ count     Stack
+      4096 |@@@@@@@@@@@@@@@                15        tcp_do_segment+0x2423
+      8192 |@@@@@@@@@@@@                   12        tcp_input+0xf54
+     16384 |@@                             2         ip_input+0xc8
+                                                     swi_net+0x192
+                                                     intr_event_execute_handlers+0x93
+                                                     ithread_loop+0xa6
+                                                     fork_exit+0x84
+                                                     0xffffffff808cf9ee
+-------------------------------------------------------------------------------
 [...]
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 7 \fRDetermining the Average PIL (processor interrupt level) for a CPU
-.sp
-.in +2
-.nf
-example# \fBlockstat -Iw -l cpu[3] ./testprog\fR
-
-Profiling interrupt: 14791 events in 152.463 seconds (97 events/sec)
-
-Count indv cuml rcnt     nsec CPU+PIL             Hottest Caller
-
------------------------------------------------------------------------
-13641  92%  92% 1.00      253 cpu[3]              (usermode)
- 579   4%  96% 1.00      325 cpu[3]+6            ip_ocsum+0xe8
- 375   3%  99% 1.00      411 cpu[3]+10           splx
- 154   1% 100% 1.00      527 cpu[3]+4            fas_intr_svc+0x80
-  41   0% 100% 1.00      293 cpu[3]+13           send_mondo+0x18
-   1   0% 100% 1.00      266 cpu[3]+12           zsa_rxint+0x400
------------------------------------------------------------------------
-[...]
-.fi
-.in -2
-.sp
-
-.LP
-\fBExample 8 \fRDetermining which Subsystem is Causing the System to be Busy
-.sp
-.in +2
-.nf
-example# \fBlockstat -s 10 -I sleep 20\fR
-
-Profiling interrupt: 4863 events in 47.375 seconds (103 events/sec)
-
-Count indv cuml rcnt     nsec CPU+PIL          Caller
-
------------------------------------------------------------------------
-1929   40%  40% 0.00     3215 cpu[0]           usec_delay+0x78
- nsec ------ Time Distribution ------ count   Stack
- 4096 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@  1872    ata_wait+0x90
- 8192 |                               27      acersb_get_intr_status+0x34     
-16384 |                               29      ata_set_feature+0x124
-32768 |                               1       ata_disk_start+0x15c
-                                              ata_hba_start+0xbc
-                                              ghd_waitq_process_and \e
-                                              _mutex_hold+0x70
-                                              ghd_waitq_process_and \e
-                                              _mutex_exit+0x4
-                                              ghd_transport+0x12c
-                                              ata_disk_tran_start+0x108
------------------------------------------------------------------------
-[...]
-.fi
-.in -2
-.sp
-
-.SH ATTRIBUTES
-.sp
-.LP
-See \fBattributes\fR(5) for descriptions of the following attributes:
-.sp
-
-.sp
-.TS
-tab() box;
-cw(2.75i) |cw(2.75i) 
-lw(2.75i) |lw(2.75i) 
-.
-ATTRIBUTE TYPEATTRIBUTE VALUE
-_
-AvailabilitySUNWdtrc
-.TE
-
-.SH SEE ALSO
-.sp
-.LP
-\fBdtrace\fR(1M), \fBplockstat\fR(1M), \fBattributes\fR(5), \fBlockstat\fR(7D), \fBmutex\fR(9F), \fBrwlock\fR(9F)
-.sp
-.LP
-\fISolaris Dynamic Tracing Guide\fR
-.SH NOTES
-.sp
-.LP
-The profiling support provided by \fBlockstat\fR \fB-I\fR replaces the old (and undocumented) \fB/usr/bin/kgmon\fR and \fB/dev/profile\fR.
-.sp
-.LP
-Tail-call elimination can affect call sites. For example, if \fBfoo()\fR\fB+0x50\fR calls \fBbar()\fR and the last thing \fBbar()\fR does is call \fBmutex_exit()\fR, the compiler can arrange for \fBbar()\fR to
-branch to \fBmutex_exit()\fRwith a return address of \fBfoo()\fR\fB+0x58\fR. Thus, the \fBmutex_exit()\fR in \fBbar()\fR will appear as though it occurred at \fBfoo()\fR\fB+0x58\fR.
-.sp
-.LP
-The \fBPC\fR in the stack frame in which an interrupt occurs can be bogus because, between function calls, the compiler is free to use the return address register for local storage.
-.sp
-.LP
-When using the \fB-I\fR and \fB-s\fR options together, the interrupted PC will usually not appear anywhere in the stack since the interrupt handler is entered asynchronously, not by a function call from that \fBPC\fR.
-.sp
-.LP
-The \fBlockstat\fR technology is provided on an as-is basis. The format and content of \fBlockstat\fR output reflect the current Solaris kernel implementation and are therefore subject to change in future releases.
+.Ed
+.El
+.Sh SEE ALSO
+.Xr dtrace 1 ,
+.Xr ksyms 4 ,
+.Xr locking 9
+.Sh NOTES
+Tail-call elimination can affect call sites.
+For example, if
+.Fn foo Ns +0x50
+calls
+.Fn bar
+and the last thing
+.Fn bar
+does is call
+.Fn mtx_unlock ,
+the compiler can arrange for
+.Fn bar
+to branch to
+.Fn mtx_unlock
+with a return address of
+.Fn foo Ns +0x58.
+Thus, the
+.Fn mtx_unlock
+in
+.Fn bar
+will appear as though it occurred at
+.Fn foo Ns +0x58.
+.Pp
+The PC in the stack frame in which an interrupt occurs can be bogus because,
+between function calls, the compiler is free to use the return address register
+for local storage.
+.Pp
+When using the
+.Fl I
+and
+.Fl s
+options together, the interrupted PC will usually not appear anywhere in the
+stack since the interrupt handler is entered asynchronously, not by a function
+call from that PC.
diff --git a/cddl/contrib/opensolaris/cmd/lockstat/sym.c b/cddl/contrib/opensolaris/cmd/lockstat/sym.c
index 78b27d2bdcd..1aa77ad3f31 100644
--- a/cddl/contrib/opensolaris/cmd/lockstat/sym.c
+++ b/cddl/contrib/opensolaris/cmd/lockstat/sym.c
@@ -179,8 +179,19 @@ symtab_init(void)
 	size_t		sz;
 #endif
 
+#if defined(__FreeBSD__)
+	if ((fd = open("/dev/ksyms", O_RDONLY)) == -1) {
+		if (errno == ENOENT && modfind("ksyms") == -1) {
+			kldload("ksyms");
+			fd = open("/dev/ksyms", O_RDONLY);
+		}
+		if (fd == -1)
+			return (-1);
+	}
+#else
 	if ((fd = open("/dev/ksyms", O_RDONLY)) == -1)
 		return (-1);
+#endif
 
 #if defined(sun)
 	(void) elf_version(EV_CURRENT);
diff --git a/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c b/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
index aa2c1f9d2db..12884682c4a 100644
--- a/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
+++ b/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
@@ -778,7 +778,8 @@ main(int argc, char **argv)
 #endif
 	int err;
 	int opt_C = 0, opt_H = 0, opt_p = 0, opt_v = 0;
-	char c, *p, *end;
+	int c;
+	char *p, *end;
 	struct sigaction act;
 	int done = 0;
 
diff --git a/cddl/contrib/opensolaris/cmd/zdb/zdb.c b/cddl/contrib/opensolaris/cmd/zdb/zdb.c
index c265c99b4be..32ece312b7d 100644
--- a/cddl/contrib/opensolaris/cmd/zdb/zdb.c
+++ b/cddl/contrib/opensolaris/cmd/zdb/zdb.c
@@ -242,7 +242,7 @@ const char histo_stars[] = "****************************************";
 const int histo_width = sizeof (histo_stars) - 1;
 
 static void
-dump_histogram(const uint64_t *histo, int size)
+dump_histogram(const uint64_t *histo, int size, int offset)
 {
 	int i;
 	int minidx = size - 1;
@@ -263,7 +263,7 @@ dump_histogram(const uint64_t *histo, int size)
 
 	for (i = minidx; i <= maxidx; i++) {
 		(void) printf("\t\t\t%3u: %6llu %s\n",
-		    i, (u_longlong_t)histo[i],
+		    i + offset, (u_longlong_t)histo[i],
 		    &histo_stars[(max - histo[i]) * histo_width / max]);
 	}
 }
@@ -316,19 +316,19 @@ dump_zap_stats(objset_t *os, uint64_t object)
 	    (u_longlong_t)zs.zs_salt);
 
 	(void) printf("\t\tLeafs with 2^n pointers:\n");
-	dump_histogram(zs.zs_leafs_with_2n_pointers, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_leafs_with_2n_pointers, ZAP_HISTOGRAM_SIZE, 0);
 
 	(void) printf("\t\tBlocks with n*5 entries:\n");
-	dump_histogram(zs.zs_blocks_with_n5_entries, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_blocks_with_n5_entries, ZAP_HISTOGRAM_SIZE, 0);
 
 	(void) printf("\t\tBlocks n/10 full:\n");
-	dump_histogram(zs.zs_blocks_n_tenths_full, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_blocks_n_tenths_full, ZAP_HISTOGRAM_SIZE, 0);
 
 	(void) printf("\t\tEntries with n chunks:\n");
-	dump_histogram(zs.zs_entries_using_n_chunks, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_entries_using_n_chunks, ZAP_HISTOGRAM_SIZE, 0);
 
 	(void) printf("\t\tBuckets with n entries:\n");
-	dump_histogram(zs.zs_buckets_with_n_entries, ZAP_HISTOGRAM_SIZE);
+	dump_histogram(zs.zs_buckets_with_n_entries, ZAP_HISTOGRAM_SIZE, 0);
 }
 
 /*ARGSUSED*/
@@ -517,26 +517,85 @@ dump_zpldir(objset_t *os, uint64_t object, void *data, size_t size)
 	zap_cursor_fini(&zc);
 }
 
+int
+get_dtl_refcount(vdev_t *vd)
+{
+	int refcount = 0;
+
+	if (vd->vdev_ops->vdev_op_leaf) {
+		space_map_t *sm = vd->vdev_dtl_sm;
+
+		if (sm != NULL &&
+		    sm->sm_dbuf->db_size == sizeof (space_map_phys_t))
+			return (1);
+		return (0);
+	}
+
+	for (int c = 0; c < vd->vdev_children; c++)
+		refcount += get_dtl_refcount(vd->vdev_child[c]);
+	return (refcount);
+}
+
+int
+get_metaslab_refcount(vdev_t *vd)
+{
+	int refcount = 0;
+
+	if (vd->vdev_top == vd) {
+		for (int m = 0; m < vd->vdev_ms_count; m++) {
+			space_map_t *sm = vd->vdev_ms[m]->ms_sm;
+
+			if (sm != NULL &&
+			    sm->sm_dbuf->db_size == sizeof (space_map_phys_t))
+				refcount++;
+		}
+	}
+	for (int c = 0; c < vd->vdev_children; c++)
+		refcount += get_metaslab_refcount(vd->vdev_child[c]);
+
+	return (refcount);
+}
+
+static int
+verify_spacemap_refcounts(spa_t *spa)
+{
+	int expected_refcount, actual_refcount;
+
+	expected_refcount = spa_feature_get_refcount(spa,
+	    &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM]);
+	actual_refcount = get_dtl_refcount(spa->spa_root_vdev);
+	actual_refcount += get_metaslab_refcount(spa->spa_root_vdev);
+
+	if (expected_refcount != actual_refcount) {
+		(void) printf("space map refcount mismatch: expected %d != "
+		    "actual %d\n", expected_refcount, actual_refcount);
+		return (2);
+	}
+	return (0);
+}
+
 static void
-dump_spacemap(objset_t *os, space_map_obj_t *smo, space_map_t *sm)
+dump_spacemap(objset_t *os, space_map_t *sm)
 {
 	uint64_t alloc, offset, entry;
-	uint8_t mapshift = sm->sm_shift;
-	uint64_t mapstart = sm->sm_start;
 	char *ddata[] = { "ALLOC", "FREE", "CONDENSE", "INVALID",
 			    "INVALID", "INVALID", "INVALID", "INVALID" };
 
-	if (smo->smo_object == 0)
+	if (sm == NULL)
 		return;
 
 	/*
 	 * Print out the freelist entries in both encoded and decoded form.
 	 */
 	alloc = 0;
-	for (offset = 0; offset < smo->smo_objsize; offset += sizeof (entry)) {
-		VERIFY3U(0, ==, dmu_read(os, smo->smo_object, offset,
+	for (offset = 0; offset < space_map_length(sm);
+	    offset += sizeof (entry)) {
+		uint8_t mapshift = sm->sm_shift;
+
+		VERIFY0(dmu_read(os, space_map_object(sm), offset,
 		    sizeof (entry), &entry, DMU_READ_PREFETCH));
 		if (SM_DEBUG_DECODE(entry)) {
+
 			(void) printf("\t    [%6llu] %s: txg %llu, pass %llu\n",
 			    (u_longlong_t)(offset / sizeof (entry)),
 			    ddata[SM_DEBUG_ACTION_DECODE(entry)],
@@ -548,10 +607,10 @@ dump_spacemap(objset_t *os, space_map_obj_t *smo, space_map_t *sm)
 			    (u_longlong_t)(offset / sizeof (entry)),
 			    SM_TYPE_DECODE(entry) == SM_ALLOC ? 'A' : 'F',
 			    (u_longlong_t)((SM_OFFSET_DECODE(entry) <<
-			    mapshift) + mapstart),
+			    mapshift) + sm->sm_start),
 			    (u_longlong_t)((SM_OFFSET_DECODE(entry) <<
-			    mapshift) + mapstart + (SM_RUN_DECODE(entry) <<
-			    mapshift)),
+			    mapshift) + sm->sm_start +
+			    (SM_RUN_DECODE(entry) << mapshift)),
 			    (u_longlong_t)(SM_RUN_DECODE(entry) << mapshift));
 			if (SM_TYPE_DECODE(entry) == SM_ALLOC)
 				alloc += SM_RUN_DECODE(entry) << mapshift;
@@ -559,10 +618,10 @@ dump_spacemap(objset_t *os, space_map_obj_t *smo, space_map_t *sm)
 				alloc -= SM_RUN_DECODE(entry) << mapshift;
 		}
 	}
-	if (alloc != smo->smo_alloc) {
+	if (alloc != space_map_allocated(sm)) {
 		(void) printf("space_map_object alloc (%llu) INCONSISTENT "
 		    "with space map summary (%llu)\n",
-		    (u_longlong_t)smo->smo_alloc, (u_longlong_t)alloc);
+		    (u_longlong_t)space_map_allocated(sm), (u_longlong_t)alloc);
 	}
 }
 
@@ -570,15 +629,17 @@ static void
 dump_metaslab_stats(metaslab_t *msp)
 {
 	char maxbuf[32];
-	space_map_t *sm = msp->ms_map;
-	avl_tree_t *t = sm->sm_pp_root;
-	int free_pct = sm->sm_space * 100 / sm->sm_size;
+	range_tree_t *rt = msp->ms_tree;
+	avl_tree_t *t = &msp->ms_size_tree;
+	int free_pct = range_tree_space(rt) * 100 / msp->ms_size;
 
-	zdb_nicenum(space_map_maxsize(sm), maxbuf);
+	zdb_nicenum(metaslab_block_maxsize(msp), maxbuf);
 
 	(void) printf("\t %25s %10lu   %7s  %6s   %4s %4d%%\n",
 	    "segments", avl_numnodes(t), "maxsize", maxbuf,
 	    "freepct", free_pct);
+	(void) printf("\tIn-memory histogram:\n");
+	dump_histogram(rt->rt_histogram, RANGE_TREE_HISTOGRAM_SIZE, 0);
 }
 
 static void
@@ -586,33 +647,45 @@ dump_metaslab(metaslab_t *msp)
 {
 	vdev_t *vd = msp->ms_group->mg_vd;
 	spa_t *spa = vd->vdev_spa;
-	space_map_t *sm = msp->ms_map;
-	space_map_obj_t *smo = &msp->ms_smo;
+	space_map_t *sm = msp->ms_sm;
 	char freebuf[32];
 
-	zdb_nicenum(sm->sm_size - smo->smo_alloc, freebuf);
+	zdb_nicenum(msp->ms_size - space_map_allocated(sm), freebuf);
 
 	(void) printf(
 	    "\tmetaslab %6llu   offset %12llx   spacemap %6llu   free    %5s\n",
-	    (u_longlong_t)(sm->sm_start / sm->sm_size),
-	    (u_longlong_t)sm->sm_start, (u_longlong_t)smo->smo_object, freebuf);
+	    (u_longlong_t)msp->ms_id, (u_longlong_t)msp->ms_start,
+	    (u_longlong_t)space_map_object(sm), freebuf);
 
-	if (dump_opt['m'] > 1 && !dump_opt['L']) {
+	if (dump_opt['m'] > 2 && !dump_opt['L']) {
 		mutex_enter(&msp->ms_lock);
-		space_map_load_wait(sm);
-		if (!sm->sm_loaded)
-			VERIFY(space_map_load(sm, zfs_metaslab_ops,
-			    SM_FREE, smo, spa->spa_meta_objset) == 0);
+		metaslab_load_wait(msp);
+		if (!msp->ms_loaded) {
+			VERIFY0(metaslab_load(msp));
+			range_tree_stat_verify(msp->ms_tree);
+		}
 		dump_metaslab_stats(msp);
-		space_map_unload(sm);
+		metaslab_unload(msp);
 		mutex_exit(&msp->ms_lock);
 	}
 
-	if (dump_opt['d'] > 5 || dump_opt['m'] > 2) {
-		ASSERT(sm->sm_size == (1ULL << vd->vdev_ms_shift));
+	if (dump_opt['m'] > 1 && sm != NULL &&
+	    spa_feature_is_active(spa,
+	    &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM])) {
+		/*
+		 * The space map histogram represents free space in chunks
+		 * of sm_shift (i.e. bucket 0 refers to 2^sm_shift).
+		 */
+		(void) printf("\tOn-disk histogram:\n");
+		dump_histogram(sm->sm_phys->smp_histogram,
+		    SPACE_MAP_HISTOGRAM_SIZE(sm), sm->sm_shift);
+	}
+
+	if (dump_opt['d'] > 5 || dump_opt['m'] > 3) {
+		ASSERT(msp->ms_size == (1ULL << vd->vdev_ms_shift));
 
 		mutex_enter(&msp->ms_lock);
-		dump_spacemap(spa->spa_meta_objset, smo, sm);
+		dump_spacemap(spa->spa_meta_objset, msp->ms_sm);
 		mutex_exit(&msp->ms_lock);
 	}
 }
@@ -801,9 +874,9 @@ dump_all_ddts(spa_t *spa)
 }
 
 static void
-dump_dtl_seg(space_map_t *sm, uint64_t start, uint64_t size)
+dump_dtl_seg(void *arg, uint64_t start, uint64_t size)
 {
-	char *prefix = (void *)sm;
+	char *prefix = arg;
 
 	(void) printf("%s [%llu,%llu) length %llu\n",
 	    prefix,
@@ -833,17 +906,16 @@ dump_dtl(vdev_t *vd, int indent)
 	    required ? "DTL-required" : "DTL-expendable");
 
 	for (int t = 0; t < DTL_TYPES; t++) {
-		space_map_t *sm = &vd->vdev_dtl[t];
-		if (sm->sm_space == 0)
+		range_tree_t *rt = vd->vdev_dtl[t];
+		if (range_tree_space(rt) == 0)
 			continue;
 		(void) snprintf(prefix, sizeof (prefix), "\t%*s%s",
 		    indent + 2, "", name[t]);
-		mutex_enter(sm->sm_lock);
-		space_map_walk(sm, dump_dtl_seg, (void *)prefix);
-		mutex_exit(sm->sm_lock);
+		mutex_enter(rt->rt_lock);
+		range_tree_walk(rt, dump_dtl_seg, prefix);
+		mutex_exit(rt->rt_lock);
 		if (dump_opt['d'] > 5 && vd->vdev_children == 0)
-			dump_spacemap(spa->spa_meta_objset,
-			    &vd->vdev_dtl_smo, sm);
+			dump_spacemap(spa->spa_meta_objset, vd->vdev_dtl_sm);
 	}
 
 	for (int c = 0; c < vd->vdev_children; c++)
@@ -2172,39 +2244,17 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog, const blkptr_t *bp,
 }
 
 static void
-zdb_leak(space_map_t *sm, uint64_t start, uint64_t size)
+zdb_leak(void *arg, uint64_t start, uint64_t size)
 {
-	vdev_t *vd = sm->sm_ppd;
+	vdev_t *vd = arg;
 
 	(void) printf("leaked space: vdev %llu, offset 0x%llx, size %llu\n",
 	    (u_longlong_t)vd->vdev_id, (u_longlong_t)start, (u_longlong_t)size);
 }
 
-/* ARGSUSED */
-static void
-zdb_space_map_load(space_map_t *sm)
-{
-}
-
-static void
-zdb_space_map_unload(space_map_t *sm)
-{
-	space_map_vacate(sm, zdb_leak, sm);
-}
-
-/* ARGSUSED */
-static void
-zdb_space_map_claim(space_map_t *sm, uint64_t start, uint64_t size)
-{
-}
-
-static space_map_ops_t zdb_space_map_ops = {
-	zdb_space_map_load,
-	zdb_space_map_unload,
+static metaslab_ops_t zdb_metaslab_ops = {
 	NULL,	/* alloc */
-	zdb_space_map_claim,
-	NULL,	/* free */
-	NULL	/* maxsize */
+	NULL	/* fragmented */
 };
 
 static void
@@ -2259,11 +2309,21 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
 			for (int m = 0; m < vd->vdev_ms_count; m++) {
 				metaslab_t *msp = vd->vdev_ms[m];
 				mutex_enter(&msp->ms_lock);
-				space_map_unload(msp->ms_map);
-				VERIFY(space_map_load(msp->ms_map,
-				    &zdb_space_map_ops, SM_ALLOC, &msp->ms_smo,
-				    spa->spa_meta_objset) == 0);
-				msp->ms_map->sm_ppd = vd;
+				metaslab_unload(msp);
+
+				/*
+				 * For leak detection, we overload the metaslab
+				 * ms_tree to contain allocated segments
+				 * instead of free segments. As a result,
+				 * we can't use the normal metaslab_load/unload
+				 * interfaces.
+				 */
+				if (msp->ms_sm != NULL) {
+					msp->ms_ops = &zdb_metaslab_ops;
+					VERIFY0(space_map_load(msp->ms_sm,
+					    msp->ms_tree, SM_ALLOC));
+					msp->ms_loaded = B_TRUE;
+				}
 				mutex_exit(&msp->ms_lock);
 			}
 		}
@@ -2286,7 +2346,20 @@ zdb_leak_fini(spa_t *spa)
 			for (int m = 0; m < vd->vdev_ms_count; m++) {
 				metaslab_t *msp = vd->vdev_ms[m];
 				mutex_enter(&msp->ms_lock);
-				space_map_unload(msp->ms_map);
+
+				/*
+				 * The ms_tree has been overloaded to
+				 * contain allocated segments. Now that we
+				 * finished traversing all blocks, any
+				 * block that remains in the ms_tree
+				 * represents an allocated block that we
+				 * did not claim during the traversal.
+				 * Claimed blocks would have been removed
+				 * from the ms_tree.
+				 */
+				range_tree_vacate(msp->ms_tree, zdb_leak, vd);
+				msp->ms_loaded = B_FALSE;
+
 				mutex_exit(&msp->ms_lock);
 			}
 		}
@@ -2489,7 +2562,7 @@ dump_block_stats(spa_t *spa)
 					    "(in 512-byte sectors): "
 					    "number of blocks\n");
 					dump_histogram(zb->zb_psize_histogram,
-					    PSIZE_HISTO_SIZE);
+					    PSIZE_HISTO_SIZE, 0);
 				}
 			}
 		}
@@ -2659,6 +2732,9 @@ dump_zpool(spa_t *spa)
 	if (dump_opt['b'] || dump_opt['c'])
 		rc = dump_block_stats(spa);
 
+	if (rc == 0)
+		rc = verify_spacemap_refcounts(spa);
+
 	if (dump_opt['s'])
 		show_pool_stats(spa);
 
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs.8 b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
index 9daec710c8e..b0d133fcc42 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs.8
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs.8
@@ -25,10 +25,11 @@
 .\" Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
 .\" Copyright (c) 2013 Nexenta Systems, Inc. All Rights Reserved.
 .\" Copyright (c) 2013, Joyent, Inc. All rights reserved.
+.\" Copyright (c) 2013, Steven Hartland <smh@FreeBSD.org>
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 20, 2013
+.Dd October 23, 2013
 .Dt ZFS 8
 .Os
 .Sh NAME
@@ -61,7 +62,7 @@
 .Op , Ns ...
 .Sm on
 .Nm
-.Cm snapshot
+.Cm snapshot Ns | Ns Cm snap
 .Op Fl r
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
 .Ar filesystem@snapname Ns | Ns Ar volume@snapname
@@ -157,7 +158,7 @@
 .Op Fl o Ar property Ns Oo , Ns Ar property Oc Ns ...
 .Fl a | Ar filesystem
 .Nm
-.Cm unmount
+.Cm unmount Ns | Ns Cm umount
 .Op Fl f
 .Fl a | Ar filesystem Ns | Ns Ar mountpoint
 .Nm
@@ -172,11 +173,11 @@
 .Op Fl i Ar snapshot | Fl I Ar snapshot
 .Ar snapshot
 .Nm
-.Cm receive
+.Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Nm
-.Cm receive
+.Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
 .Op Fl d | e
 .Ar filesystem
@@ -1653,7 +1654,7 @@ options, as they can destroy large portions of a pool and cause unexpected
 behavior for mounted file systems in use.
 .It Xo
 .Nm
-.Cm snapshot
+.Cm snapshot Ns | Ns Cm snap
 .Op Fl r
 .Oo Fl o Ar property Ns = Ns Ar value Oc Ns ...
 .Ar filesystem@snapname Ns | Ns volume@snapname
@@ -1865,7 +1866,7 @@ syntax.
 A comma-separated list of types to display, where
 .Ar type
 is one of
-.Sy filesystem , snapshot , volume , No or Sy all .
+.Sy filesystem , snapshot , snap,  volume , No or Sy all .
 For example, specifying
 .Fl t Cm snapshot
 displays only snapshots.
@@ -2194,7 +2195,7 @@ Mount the specified filesystem.
 .El
 .It Xo
 .Nm
-.Cm unmount
+.Cm unmount Ns | Ns Cm umount
 .Op Fl f
 .Fl a | Ar filesystem Ns | Ns Ar mountpoint
 .Xc
@@ -2377,13 +2378,13 @@ on future versions of
 .Tn ZFS .
 .It Xo
 .Nm
-.Cm receive
+.Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
 .Ar filesystem Ns | Ns Ar volume Ns | Ns Ar snapshot
 .Xc
 .It Xo
 .Nm
-.Cm receive
+.Cm receive Ns | Ns Cm recv
 .Op Fl vnFu
 .Op Fl d | e
 .Ar filesystem
diff --git a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
index 3779b2996fb..81e6e8cb2ab 100644
--- a/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
+++ b/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
@@ -58,6 +58,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include <err.h>
+#include <jail.h>
 
 #include <libzfs.h>
 #include <libzfs_core.h>
@@ -258,9 +259,9 @@ get_usage(zfs_help_t idx)
 	case HELP_PROMOTE:
 		return (gettext("\tpromote <clone-filesystem>\n"));
 	case HELP_RECEIVE:
-		return (gettext("\treceive [-vnFu] <filesystem|volume|"
+		return (gettext("\treceive|recv [-vnFu] <filesystem|volume|"
 		"snapshot>\n"
-		"\treceive [-vnFu] [-d | -e] <filesystem>\n"));
+		"\treceive|recv [-vnFu] [-d | -e] <filesystem>\n"));
 	case HELP_RENAME:
 		return (gettext("\trename [-f] <filesystem|volume|snapshot> "
 		    "<filesystem|volume|snapshot>\n"
@@ -279,10 +280,10 @@ get_usage(zfs_help_t idx)
 	case HELP_SHARE:
 		return (gettext("\tshare <-a | filesystem>\n"));
 	case HELP_SNAPSHOT:
-		return (gettext("\tsnapshot [-r] [-o property=value] ... "
+		return (gettext("\tsnapshot|snap [-r] [-o property=value] ... "
 		    "<filesystem@snapname|volume@snapname> ...\n"));
 	case HELP_UNMOUNT:
-		return (gettext("\tunmount [-f] "
+		return (gettext("\tunmount|umount [-f] "
 		    "<-a | filesystem|mountpoint>\n"));
 	case HELP_UNSHARE:
 		return (gettext("\tunshare "
@@ -2010,7 +2011,7 @@ zfs_do_upgrade(int argc, char **argv)
 	boolean_t showversions = B_FALSE;
 	int ret = 0;
 	upgrade_cbdata_t cb = { 0 };
-	char c;
+	int c;
 	int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
 
 	/* check options */
@@ -3026,7 +3027,7 @@ zfs_do_list(int argc, char **argv)
 			flags &= ~ZFS_ITER_PROP_LISTSNAPS;
 			while (*optarg != '\0') {
 				static char *type_subopts[] = { "filesystem",
-				    "volume", "snapshot", "all", NULL };
+				    "volume", "snapshot", "snap", "all", NULL };
 
 				switch (getsubopt(&optarg, type_subopts,
 				    &value)) {
@@ -3037,9 +3038,10 @@ zfs_do_list(int argc, char **argv)
 					types |= ZFS_TYPE_VOLUME;
 					break;
 				case 2:
+				case 3:
 					types |= ZFS_TYPE_SNAPSHOT;
 					break;
-				case 3:
+				case 4:
 					types = ZFS_TYPE_DATASET;
 					break;
 
@@ -3559,7 +3561,7 @@ static int
 zfs_do_snapshot(int argc, char **argv)
 {
 	int ret = 0;
-	char c;
+	int c;
 	nvlist_t *props;
 	snap_cbdata_t sd = { 0 };
 	boolean_t multiple_snaps = B_FALSE;
@@ -6724,6 +6726,12 @@ main(int argc, char **argv)
 		if (strcmp(cmdname, "recv") == 0)
 			cmdname = "receive";
 
+		/*
+		 * The 'snap' command is an alias for 'snapshot'
+		 */
+		if (strcmp(cmdname, "snap") == 0)
+			cmdname = "snapshot";
+
 		/*
 		 * Special case '-?'
 		 */
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
index d018acc64e2..684d54144e5 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 20, 2013
+.Dd October 08, 2013
 .Dt ZPOOL-FEATURES 7
 .Os
 .Sh NAME
@@ -251,6 +251,24 @@ configuration.
 .\" .Xr dumpon 8
 .\" command to configure a
 .\" dump device on a pool comprised of multiple vdevs.
+.It Sy spacemap_histogram
+.Bl -column "READ\-ONLY COMPATIBLE" "com.delphix:spacemap_histogram"
+.It GUID Ta com.delphix:spacemap_histogram
+.It READ\-ONLY COMPATIBLE Ta yes
+.It DEPENDENCIES Ta none
+.El
+.Pp
+This features allows ZFS to maintain more information about how free space
+is organized within the pool. If this feature is
+.Sy enabled ,
+ZFS will
+set this feature to
+.Sy active
+when a new space map object is created or
+an existing space map is upgraded to the new format.
+Once the feature is
+.Sy active ,
+it will remain in that state until the pool is destroyed.
 .El
 .Sh SEE ALSO
 .Xr zpool 8
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
index 0dcf11b9204..76c7fc0d9fc 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
@@ -1702,6 +1702,12 @@ show_import(nvlist_t *config)
 		    "resilvered.\n"));
 		break;
 
+	case ZPOOL_STATUS_NON_NATIVE_ASHIFT:
+		(void) printf(gettext("status: One or more devices were "
+		    "configured to use a non-native block size.\n"
+		    "\tExpect reduced performance.\n"));
+		break;
+
 	default:
 		/*
 		 * No other status can be seen when importing pools.
diff --git a/cddl/contrib/opensolaris/cmd/ztest/ztest.c b/cddl/contrib/opensolaris/cmd/ztest/ztest.c
index b6dcf09963a..6e028c3f5a3 100644
--- a/cddl/contrib/opensolaris/cmd/ztest/ztest.c
+++ b/cddl/contrib/opensolaris/cmd/ztest/ztest.c
@@ -186,7 +186,7 @@ static const ztest_shared_opts_t ztest_opts_defaults = {
 
 extern uint64_t metaslab_gang_bang;
 extern uint64_t metaslab_df_alloc_threshold;
-extern uint64_t zfs_deadman_synctime;
+extern uint64_t zfs_deadman_synctime_ms;
 
 static ztest_shared_opts_t *ztest_shared_opts;
 static ztest_shared_opts_t ztest_opts;
@@ -5328,10 +5328,10 @@ ztest_deadman_thread(void *arg)
 	hrtime_t delta, total = 0;
 
 	for (;;) {
-		delta = (zs->zs_thread_stop - zs->zs_thread_start) /
-		    NANOSEC + zfs_deadman_synctime;
+		delta = zs->zs_thread_stop - zs->zs_thread_start +
+		    MSEC2NSEC(zfs_deadman_synctime_ms);
 
-		(void) poll(NULL, 0, (int)(1000 * delta));
+		(void) poll(NULL, 0, (int)NSEC2MSEC(delta));
 
 		/*
 		 * If the pool is suspended then fail immediately. Otherwise,
@@ -5339,15 +5339,15 @@ ztest_deadman_thread(void *arg)
 		 * vdev_deadman() discovers that there hasn't been any recent
 		 * I/Os then it will end up aborting the tests.
 		 */
-		if (spa_suspended(spa)) {
+		if (spa_suspended(spa) || spa->spa_root_vdev == NULL) {
 			fatal(0, "aborting test after %llu seconds because "
 			    "pool has transitioned to a suspended state.",
-			    zfs_deadman_synctime);
+			    zfs_deadman_synctime_ms / 1000);
 			return (NULL);
 		}
 		vdev_deadman(spa->spa_root_vdev);
 
-		total += zfs_deadman_synctime;
+		total += zfs_deadman_synctime_ms/1000;
 		(void) printf("ztest has been running for %lld seconds\n",
 		    total);
 	}
@@ -6080,7 +6080,7 @@ main(int argc, char **argv)
 	(void) setvbuf(stdout, NULL, _IOLBF, 0);
 
 	dprintf_setup(&argc, argv);
-	zfs_deadman_synctime = 300;
+	zfs_deadman_synctime_ms = 300000;
 
 	ztest_fd_rand = open("/dev/urandom", O_RDONLY);
 	ASSERT3S(ztest_fd_rand, >=, 0);
diff --git a/cddl/contrib/opensolaris/common/ctf/ctf_create.c b/cddl/contrib/opensolaris/common/ctf/ctf_create.c
index 239d166f441..73648148275 100644
--- a/cddl/contrib/opensolaris/common/ctf/ctf_create.c
+++ b/cddl/contrib/opensolaris/common/ctf/ctf_create.c
@@ -65,7 +65,7 @@ ctf_create(int *errp)
 	cts.cts_name = _CTF_SECTION;
 	cts.cts_type = SHT_PROGBITS;
 	cts.cts_flags = 0;
-	cts.cts_data = &hdr;
+	cts.cts_data = (void *)&hdr;
 	cts.cts_size = sizeof (hdr);
 	cts.cts_entsize = 1;
 	cts.cts_offset = 0;
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
index 2d0428aabb5..6561c9376cf 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
@@ -242,8 +242,14 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 /* XXX */
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 #elif defined(__powerpc__)
-/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+			/*
+			 * Add 4 bytes to hit the low half of this 64-bit
+			 * big-endian address.
+			 */
+			rel->r_offset = s->dofs_offset +
+			    dofr[j].dofr_offset + 4;
+			rel->r_info = ELF32_R_INFO(count + dep->de_global,
+			    R_PPC_REL32);
 #elif defined(__sparc)
 			/*
 			 * Add 4 bytes to hit the low half of this 64-bit
@@ -423,7 +429,10 @@ prepare_elf64(dtrace_hdl_t *dtp, const dof_hdr_t *dof, dof_elf64_t *dep)
 #elif defined(__mips__)
 /* XXX */
 #elif defined(__powerpc__)
-/* XXX */
+			rel->r_offset = s->dofs_offset +
+			    dofr[j].dofr_offset;
+			rel->r_info = ELF64_R_INFO(count + dep->de_global,
+			    R_PPC64_REL64);
 #elif defined(__i386) || defined(__amd64)
 			rel->r_offset = s->dofs_offset +
 			    dofr[j].dofr_offset;
@@ -824,12 +833,84 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 	return (0);
 }
 #elif defined(__powerpc__)
+/* The sentinel is 'xor r3,r3,r3'. */
+#define DT_OP_XOR_R3	0x7c631a78
+
+#define DT_OP_NOP		0x60000000
+#define DT_OP_BLR		0x4e800020
+
+/* This captures all forms of branching to address. */
+#define DT_IS_BRANCH(inst)	((inst & 0xfc000000) == 0x48000000)
+#define DT_IS_BL(inst)	(DT_IS_BRANCH(inst) && (inst & 0x01))
+
 /* XXX */
 static int
 dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
     uint32_t *off)
 {
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
+	uint32_t *ip;
+
+	if ((rela->r_offset & (sizeof (uint32_t) - 1)) != 0)
+		return (-1);
+
+	/*LINTED*/
+	ip = (uint32_t *)(p + rela->r_offset);
+
+	/*
+	 * We only know about some specific relocation types.
+	 */
+	if (GELF_R_TYPE(rela->r_info) != R_PPC_REL24 &&
+	    GELF_R_TYPE(rela->r_info) != R_PPC_PLTREL24)
+		return (-1);
+
+	/*
+	 * We may have already processed this object file in an earlier linker
+	 * invocation. Check to see if the present instruction sequence matches
+	 * the one we would install below.
+	 */
+	if (isenabled) {
+		if (ip[0] == DT_OP_XOR_R3) {
+			(*off) += sizeof (ip[0]);
+			return (0);
+		}
+	} else {
+		if (ip[0] == DT_OP_NOP) {
+			(*off) += sizeof (ip[0]);
+			return (0);
+		}
+	}
+
+	/*
+	 * We only expect branch to address instructions.
+	 */
+	if (!DT_IS_BRANCH(ip[0])) {
+		dt_dprintf("found %x instead of a branch instruction at %llx\n",
+		    ip[0], (u_longlong_t)rela->r_offset);
+		return (-1);
+	}
+
+	if (isenabled) {
+		/*
+		 * It would necessarily indicate incorrect usage if an is-
+		 * enabled probe were tail-called so flag that as an error.
+		 * It's also potentially (very) tricky to handle gracefully,
+		 * but could be done if this were a desired use scenario.
+		 */
+		if (!DT_IS_BL(ip[0])) {
+			dt_dprintf("tail call to is-enabled probe at %llx\n",
+			    (u_longlong_t)rela->r_offset);
+			return (-1);
+		}
+
+		ip[0] = DT_OP_XOR_R3;
+		(*off) += sizeof (ip[0]);
+	} else {
+		if (DT_IS_BL(ip[0]))
+			ip[0] = DT_OP_NOP;
+		else
+			ip[0] = DT_OP_BLR;
+	}
+
 	return (0);
 }
 
@@ -1628,8 +1709,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 		 */
 		return (0);
 	}
-	/* XXX Should get a temp file name here. */
-	snprintf(tfile, sizeof(tfile), "%s.tmp", file);
 #endif
 
 	/*
@@ -1704,9 +1783,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 		    "failed to open %s: %s", file, strerror(errno)));
 	}
 #else
-	if ((fd = open(tfile, O_RDWR | O_CREAT | O_TRUNC, 0666)) == -1)
+	snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file);
+	if ((fd = mkstemp(tfile)) == -1)
 		return (dt_link_error(dtp, NULL, -1, NULL,
-		    "failed to open %s: %s", tfile, strerror(errno)));
+		    "failed to create temporary file %s: %s",
+		    tfile, strerror(errno)));
 #endif
 
 	/*
@@ -1749,13 +1830,15 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 		status = dump_elf32(dtp, dof, fd);
 
 	if (status != 0 || lseek(fd, 0, SEEK_SET) != 0) {
-#else
-	/* We don't write the ELF header, just the DOF section */
-	if (dt_write(dtp, fd, dof, dof->dofh_filesz) < dof->dofh_filesz) {
-#endif
 		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)
+		return (dt_link_error(dtp, NULL, -1, NULL,
+		    "failed to write %s: %s", tfile, strerror(errno)));
+#endif
 
 	if (!dtp->dt_lazyload) {
 #if defined(sun)
@@ -1783,7 +1866,7 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
 		 * Arches which default to 64-bit need to explicitly use
 		 * the 32-bit library path.
 		 */
-		int use_32 = !(dtp->dt_oflags & DTRACE_O_LP64);
+		int use_32 = (dtp->dt_oflags & DTRACE_O_ILP32);
 #else
 		/*
 		 * Arches which are 32-bit only just use the normal
@@ -1798,9 +1881,7 @@ 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;
 
-#if !defined(sun)
 		len *= 2;
-#endif
 		cmd = alloca(len);
 
 		(void) snprintf(cmd, len, fmt, dtp->dt_ld_path, file,
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
index 9c9b2a6e63c..767114ea571 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
@@ -311,6 +311,10 @@ static const dt_ident_t _dtrace_globals[] = {
 	&dt_idops_func, "void(@)" },
 { "memref", DT_IDENT_FUNC, 0, DIF_SUBR_MEMREF, DT_ATTR_STABCMN, DT_VERS_1_1,
 	&dt_idops_func, "uintptr_t *(void *, size_t)" },
+#if !defined(sun)
+{ "memstr", DT_IDENT_FUNC, 0, DIF_SUBR_MEMSTR, DT_ATTR_STABCMN, DT_VERS_1_0,
+	&dt_idops_func, "string(void *, char, size_t)" },
+#endif
 { "min", DT_IDENT_AGGFUNC, 0, DTRACEAGG_MIN, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_func, "void(@)" },
 { "mod", DT_IDENT_ACTFUNC, 0, DT_ACT_MOD, DT_ATTR_STABCMN,
@@ -483,22 +487,16 @@ static const dt_ident_t _dtrace_globals[] = {
 	DT_VERS_1_0, &dt_idops_func, "void(...)" },
 { "typeref", DT_IDENT_FUNC, 0, DIF_SUBR_TYPEREF, DT_ATTR_STABCMN, DT_VERS_1_1,
 	&dt_idops_func, "uintptr_t *(void *, size_t, string, size_t)" },
-#if defined(sun)
 { "uaddr", DT_IDENT_ACTFUNC, 0, DT_ACT_UADDR, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
-#endif
 { "ucaller", DT_IDENT_SCALAR, 0, DIF_VAR_UCALLER, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_type, "uint64_t" },
-#if defined(sun)
 { "ufunc", DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
-#endif
 { "uid", DT_IDENT_SCALAR, 0, DIF_VAR_UID, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "uid_t" },
-#if defined(sun)
 { "umod", DT_IDENT_ACTFUNC, 0, DT_ACT_UMOD, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
-#endif
 { "uregs", DT_IDENT_ARRAY, 0, DIF_VAR_UREGS, DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_regs, NULL },
 { "ustack", DT_IDENT_ACTFUNC, 0, DT_ACT_USTACK, DT_ATTR_STABCMN, DT_VERS_1_0,
@@ -506,10 +504,8 @@ static const dt_ident_t _dtrace_globals[] = {
 { "ustackdepth", DT_IDENT_SCALAR, 0, DIF_VAR_USTACKDEPTH,
 	DT_ATTR_STABCMN, DT_VERS_1_2,
 	&dt_idops_type, "uint32_t" },
-#if defined(sun)
 { "usym", DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
 	DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
-#endif
 { "vtimestamp", DT_IDENT_SCALAR, 0, DIF_VAR_VTIMESTAMP,
 	DT_ATTR_STABCMN, DT_VERS_1_0,
 	&dt_idops_type, "uint64_t" },
diff --git a/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c b/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c
index 1aeb95f3dfd..f4b02c9fe38 100644
--- a/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c
+++ b/cddl/contrib/opensolaris/lib/libdtrace/powerpc/dt_isadep.c
@@ -35,14 +35,26 @@
 #include <dt_impl.h>
 #include <dt_pid.h>
 
+#include <libproc_compat.h>
+
 /*ARGSUSED*/
 int
 dt_pid_create_entry_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp,
     fasttrap_probe_spec_t *ftp, const GElf_Sym *symp)
 {
+	ftp->ftps_type = DTFTP_ENTRY;
+	ftp->ftps_pc = (uintptr_t)symp->st_value;
+	ftp->ftps_size = (size_t)symp->st_size;
+	ftp->ftps_noffs = 1;
+	ftp->ftps_offs[0] = 0;
 
-	dt_dprintf("%s: unimplemented\n", __func__);
-	return (DT_PROC_ERR);
+	if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
+		dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
+		    strerror(errno));
+		return (dt_set_errno(dtp, errno));
+	}
+
+	return (1);
 }
 
 int
@@ -50,8 +62,74 @@ dt_pid_create_return_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp,
     fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, uint64_t *stret)
 {
 
-	dt_dprintf("%s: unimplemented\n", __func__);
-	return (DT_PROC_ERR);
+	uintptr_t temp;
+	uint32_t *text;
+	int i;
+	int srdepth = 0;
+
+	if ((text = malloc(symp->st_size + 4)) == NULL) {
+		dt_dprintf("mr sparkle: malloc() failed\n");
+		return (DT_PROC_ERR);
+	}
+
+	if (Pread(P, text, symp->st_size, symp->st_value) != symp->st_size) {
+		dt_dprintf("mr sparkle: Pread() failed\n");
+		free(text);
+		return (DT_PROC_ERR);
+	}
+
+	/*
+	 * Leave a dummy instruction in the last slot to simplify edge
+	 * conditions.
+	 */
+	text[symp->st_size / 4] = 0;
+
+	ftp->ftps_type = DTFTP_RETURN;
+	ftp->ftps_pc = symp->st_value;
+	ftp->ftps_size = symp->st_size;
+	ftp->ftps_noffs = 0;
+
+	for (i = 0; i < symp->st_size / 4; i++) {
+
+		if ((text[i] & 0xfc000001) != 0x48000000 &&
+		    text[i] != 0x4e800020)
+			continue;
+
+		/*
+		 * Check for a jump within this function.  If it's outside this
+		 * function then it's a tail-call, so a return point.
+		 */
+		if ((text[i] & 0xfc000000) == 0x48000000) {
+			temp = (text[i] & 0x03fffffc);
+			/* Bit 30 denotes an absolute address. */
+			if (!(text[i] & 0x02)) {
+				temp += symp->st_value + i * 4;
+			}
+			else {
+				/* Sign extend the absolute address. */
+				if (temp & 0x02000000) {
+					temp |= (UINTPTR_MAX - 0x03ffffff);
+				}
+			}
+			if (temp >= symp->st_value &&
+			    temp <= (symp->st_value + symp->st_size))
+				continue;
+		}
+		dt_dprintf("return at offset %x\n", i * 4);
+		ftp->ftps_offs[ftp->ftps_noffs++] = i * 4;
+	}
+
+	free(text);
+	if (ftp->ftps_noffs > 0) {
+		if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
+			dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
+			    strerror(errno));
+			return (dt_set_errno(dtp, errno));
+		}
+	}
+
+
+	return (ftp->ftps_noffs);
 }
 
 /*ARGSUSED*/
@@ -59,9 +137,22 @@ int
 dt_pid_create_offset_probe(struct ps_prochandle *P, dtrace_hdl_t *dtp,
     fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, ulong_t off)
 {
+	if (off & 0x3)
+		return (DT_PROC_ALIGN);
 
-	dt_dprintf("%s: unimplemented\n", __func__);
-	return (DT_PROC_ERR);
+	ftp->ftps_type = DTFTP_OFFSETS;
+	ftp->ftps_pc = (uintptr_t)symp->st_value;
+	ftp->ftps_size = (size_t)symp->st_size;
+	ftp->ftps_noffs = 1;
+	ftp->ftps_offs[0] = off;
+
+	if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
+		dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
+		    strerror(errno));
+		return (dt_set_errno(dtp, errno));
+	}
+
+	return (1);
 }
 
 /*ARGSUSED*/
@@ -69,7 +160,38 @@ int
 dt_pid_create_glob_offset_probes(struct ps_prochandle *P, dtrace_hdl_t *dtp,
     fasttrap_probe_spec_t *ftp, const GElf_Sym *symp, const char *pattern)
 {
+	ulong_t i;
 
-	dt_dprintf("%s: unimplemented\n", __func__);
-	return (DT_PROC_ERR);
+	ftp->ftps_type = DTFTP_OFFSETS;
+	ftp->ftps_pc = (uintptr_t)symp->st_value;
+	ftp->ftps_size = (size_t)symp->st_size;
+	ftp->ftps_noffs = 0;
+
+	/*
+	 * If we're matching against everything, just iterate through each
+	 * instruction in the function, otherwise look for matching offset
+	 * names by constructing the string and comparing it against the
+	 * pattern.
+	 */
+	if (strcmp("*", pattern) == 0) {
+		for (i = 0; i < symp->st_size; i += 4) {
+			ftp->ftps_offs[ftp->ftps_noffs++] = i;
+		}
+	} else {
+		char name[sizeof (i) * 2 + 1];
+
+		for (i = 0; i < symp->st_size; i += 4) {
+			(void) sprintf(name, "%lx", i);
+			if (gmatch(name, pattern))
+				ftp->ftps_offs[ftp->ftps_noffs++] = i;
+		}
+	}
+
+	if (ioctl(dtp->dt_ftfd, FASTTRAPIOC_MAKEPROBE, ftp) != 0) {
+		dt_dprintf("fasttrap probe creation ioctl failed: %s\n",
+		    strerror(errno));
+		return (dt_set_errno(dtp, errno));
+	}
+
+	return (ftp->ftps_noffs);
 }
diff --git a/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c b/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
index 3302ac798fd..7a265bdc39d 100644
--- a/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
+++ b/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
@@ -210,7 +210,7 @@ NVLIST_PRTFUNC(int32, int32_t, int32_t, "%d")
 NVLIST_PRTFUNC(uint32, uint32_t, uint32_t, "0x%x")
 NVLIST_PRTFUNC(int64, int64_t, longlong_t, "%lld")
 NVLIST_PRTFUNC(uint64, uint64_t, u_longlong_t, "0x%llx")
-NVLIST_PRTFUNC(double, double, double, "0x%llf")
+NVLIST_PRTFUNC(double, double, double, "0x%f")
 NVLIST_PRTFUNC(string, char *, char *, "%s")
 NVLIST_PRTFUNC(hrtime, hrtime_t, hrtime_t, "0x%llx")
 
diff --git a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
index fa3d6090d98..f683adb13d6 100644
--- a/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
+++ b/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
@@ -995,10 +995,10 @@ nozpool_all_slices(avl_tree_t *r, const char *sname)
 #endif	/* sun */
 }
 
+#ifdef sun
 static void
 check_slices(avl_tree_t *r, int fd, const char *sname)
 {
-#ifdef sun
 	struct extvtoc vtoc;
 	struct dk_gpt *gpt;
 	char diskname[MAXNAMELEN];
@@ -1028,8 +1028,8 @@ check_slices(avl_tree_t *r, int fd, const char *sname)
 			check_one_slice(r, diskname, i, 0, 1);
 		efi_free(gpt);
 	}
-#endif	/* sun */
 }
+#endif	/* sun */
 
 static void
 zpool_open_func(void *arg)
@@ -1059,6 +1059,7 @@ zpool_open_func(void *arg)
 		return;
 	}
 	/* this file is too small to hold a zpool */
+#ifdef sun
 	if (S_ISREG(statbuf.st_mode) &&
 	    statbuf.st_size < SPA_MINDEVSIZE) {
 		(void) close(fd);
@@ -1070,6 +1071,12 @@ zpool_open_func(void *arg)
 		 */
 		check_slices(rn->rn_avl, fd, rn->rn_name);
 	}
+#else	/* !sun */
+	if (statbuf.st_size < SPA_MINDEVSIZE) {
+		(void) close(fd);
+		return;
+	}
+#endif	/* sun */
 
 	if ((zpool_read_label(fd, &config)) != 0) {
 		(void) close(fd);
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
index 15c181e204a..471756d75d0 100644
--- a/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
@@ -23,6 +23,9 @@
  * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
  */
+/*
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ */
 
 #ifndef _SYS_ZFS_CONTEXT_H
 #define	_SYS_ZFS_CONTEXT_H
@@ -62,6 +65,7 @@ extern "C" {
 #include <inttypes.h>
 #include <fsshare.h>
 #include <pthread.h>
+#include <sched.h>
 #include <sys/debug.h>
 #include <sys/note.h>
 #include <sys/types.h>
@@ -201,6 +205,8 @@ extern int aok;
  */
 #define	curthread	((void *)(uintptr_t)thr_self())
 
+#define	kpreempt(x)	sched_yield()
+
 typedef struct kthread kthread_t;
 
 #define	thread_create(stk, stksize, func, arg, len, pp, state, pri)	\
@@ -367,6 +373,16 @@ typedef struct taskq taskq_t;
 typedef uintptr_t taskqid_t;
 typedef void (task_func_t)(void *);
 
+typedef struct taskq_ent {
+	struct taskq_ent	*tqent_next;
+	struct taskq_ent	*tqent_prev;
+	task_func_t		*tqent_func;
+	void			*tqent_arg;
+	uintptr_t		tqent_flags;
+} taskq_ent_t;
+
+#define	TQENT_FLAG_PREALLOC	0x1	/* taskq_dispatch_ent used */
+
 #define	TASKQ_PREPOPULATE	0x0001
 #define	TASKQ_CPR_SAFE		0x0002	/* Use CPR safe protocol */
 #define	TASKQ_DYNAMIC		0x0004	/* Use dynamic thread scheduling */
@@ -378,6 +394,7 @@ typedef void (task_func_t)(void *);
 #define	TQ_NOQUEUE	0x02		/* Do not enqueue if can't dispatch */
 #define	TQ_FRONT	0x08		/* Queue in front */
 
+
 extern taskq_t *system_taskq;
 
 extern taskq_t	*taskq_create(const char *, int, pri_t, int, int, uint_t);
@@ -386,6 +403,8 @@ extern taskq_t	*taskq_create(const char *, int, pri_t, int, int, uint_t);
 #define	taskq_create_sysdc(a, b, d, e, p, dc, f) \
 	    (taskq_create(a, b, maxclsyspri, d, e, f))
 extern taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t);
+extern void	taskq_dispatch_ent(taskq_t *, task_func_t, void *, uint_t,
+    taskq_ent_t *);
 extern void	taskq_destroy(taskq_t *);
 extern void	taskq_wait(taskq_t *);
 extern int	taskq_member(taskq_t *, void *);
diff --git a/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c b/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
index c407bba09cc..d4036d03b0c 100644
--- a/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
+++ b/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
@@ -22,19 +22,15 @@
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
+ */
 
 #include <sys/zfs_context.h>
 
 int taskq_now;
 taskq_t *system_taskq;
 
-typedef struct task {
-	struct task	*task_next;
-	struct task	*task_prev;
-	task_func_t	*task_func;
-	void		*task_arg;
-} task_t;
-
 #define	TASKQ_ACTIVE	0x00010000
 
 struct taskq {
@@ -51,18 +47,18 @@ struct taskq {
 	int		tq_maxalloc;
 	kcondvar_t	tq_maxalloc_cv;
 	int		tq_maxalloc_wait;
-	task_t		*tq_freelist;
-	task_t		tq_task;
+	taskq_ent_t	*tq_freelist;
+	taskq_ent_t	tq_task;
 };
 
-static task_t *
+static taskq_ent_t *
 task_alloc(taskq_t *tq, int tqflags)
 {
-	task_t *t;
+	taskq_ent_t *t;
 	int rv;
 
 again:	if ((t = tq->tq_freelist) != NULL && tq->tq_nalloc >= tq->tq_minalloc) {
-		tq->tq_freelist = t->task_next;
+		tq->tq_freelist = t->tqent_next;
 	} else {
 		if (tq->tq_nalloc >= tq->tq_maxalloc) {
 			if (!(tqflags & KM_SLEEP))
@@ -87,7 +83,7 @@ again:	if ((t = tq->tq_freelist) != NULL && tq->tq_nalloc >= tq->tq_minalloc) {
 		}
 		mutex_exit(&tq->tq_lock);
 
-		t = kmem_alloc(sizeof (task_t), tqflags & KM_SLEEP);
+		t = kmem_alloc(sizeof (taskq_ent_t), tqflags & KM_SLEEP);
 
 		mutex_enter(&tq->tq_lock);
 		if (t != NULL)
@@ -97,15 +93,15 @@ again:	if ((t = tq->tq_freelist) != NULL && tq->tq_nalloc >= tq->tq_minalloc) {
 }
 
 static void
-task_free(taskq_t *tq, task_t *t)
+task_free(taskq_t *tq, taskq_ent_t *t)
 {
 	if (tq->tq_nalloc <= tq->tq_minalloc) {
-		t->task_next = tq->tq_freelist;
+		t->tqent_next = tq->tq_freelist;
 		tq->tq_freelist = t;
 	} else {
 		tq->tq_nalloc--;
 		mutex_exit(&tq->tq_lock);
-		kmem_free(t, sizeof (task_t));
+		kmem_free(t, sizeof (taskq_ent_t));
 		mutex_enter(&tq->tq_lock);
 	}
 
@@ -116,7 +112,7 @@ task_free(taskq_t *tq, task_t *t)
 taskqid_t
 taskq_dispatch(taskq_t *tq, task_func_t func, void *arg, uint_t tqflags)
 {
-	task_t *t;
+	taskq_ent_t *t;
 
 	if (taskq_now) {
 		func(arg);
@@ -130,26 +126,58 @@ taskq_dispatch(taskq_t *tq, task_func_t func, void *arg, uint_t tqflags)
 		return (0);
 	}
 	if (tqflags & TQ_FRONT) {
-		t->task_next = tq->tq_task.task_next;
-		t->task_prev = &tq->tq_task;
+		t->tqent_next = tq->tq_task.tqent_next;
+		t->tqent_prev = &tq->tq_task;
 	} else {
-		t->task_next = &tq->tq_task;
-		t->task_prev = tq->tq_task.task_prev;
+		t->tqent_next = &tq->tq_task;
+		t->tqent_prev = tq->tq_task.tqent_prev;
 	}
-	t->task_next->task_prev = t;
-	t->task_prev->task_next = t;
-	t->task_func = func;
-	t->task_arg = arg;
+	t->tqent_next->tqent_prev = t;
+	t->tqent_prev->tqent_next = t;
+	t->tqent_func = func;
+	t->tqent_arg = arg;
 	cv_signal(&tq->tq_dispatch_cv);
 	mutex_exit(&tq->tq_lock);
 	return (1);
 }
 
+void
+taskq_dispatch_ent(taskq_t *tq, task_func_t func, void *arg, uint_t flags,
+    taskq_ent_t *t)
+{
+	ASSERT(func != NULL);
+	ASSERT(!(tq->tq_flags & TASKQ_DYNAMIC));
+
+	/*
+	 * Mark it as a prealloc'd task.  This is important
+	 * to ensure that we don't free it later.
+	 */
+	t->tqent_flags |= TQENT_FLAG_PREALLOC;
+	/*
+	 * Enqueue the task to the underlying queue.
+	 */
+	mutex_enter(&tq->tq_lock);
+
+	if (flags & TQ_FRONT) {
+		t->tqent_next = tq->tq_task.tqent_next;
+		t->tqent_prev = &tq->tq_task;
+	} else {
+		t->tqent_next = &tq->tq_task;
+		t->tqent_prev = tq->tq_task.tqent_prev;
+	}
+	t->tqent_next->tqent_prev = t;
+	t->tqent_prev->tqent_next = t;
+	t->tqent_func = func;
+	t->tqent_arg = arg;
+	cv_signal(&tq->tq_dispatch_cv);
+	mutex_exit(&tq->tq_lock);
+}
+
 void
 taskq_wait(taskq_t *tq)
 {
 	mutex_enter(&tq->tq_lock);
-	while (tq->tq_task.task_next != &tq->tq_task || tq->tq_active != 0)
+	while (tq->tq_task.tqent_next != &tq->tq_task || tq->tq_active != 0)
 		cv_wait(&tq->tq_wait_cv, &tq->tq_lock);
 	mutex_exit(&tq->tq_lock);
 }
@@ -158,27 +186,32 @@ static void *
 taskq_thread(void *arg)
 {
 	taskq_t *tq = arg;
-	task_t *t;
+	taskq_ent_t *t;
+	boolean_t prealloc;
 
 	mutex_enter(&tq->tq_lock);
 	while (tq->tq_flags & TASKQ_ACTIVE) {
-		if ((t = tq->tq_task.task_next) == &tq->tq_task) {
+		if ((t = tq->tq_task.tqent_next) == &tq->tq_task) {
 			if (--tq->tq_active == 0)
 				cv_broadcast(&tq->tq_wait_cv);
 			cv_wait(&tq->tq_dispatch_cv, &tq->tq_lock);
 			tq->tq_active++;
 			continue;
 		}
-		t->task_prev->task_next = t->task_next;
-		t->task_next->task_prev = t->task_prev;
+		t->tqent_prev->tqent_next = t->tqent_next;
+		t->tqent_next->tqent_prev = t->tqent_prev;
+		t->tqent_next = NULL;
+		t->tqent_prev = NULL;
+		prealloc = t->tqent_flags & TQENT_FLAG_PREALLOC;
 		mutex_exit(&tq->tq_lock);
 
 		rw_enter(&tq->tq_threadlock, RW_READER);
-		t->task_func(t->task_arg);
+		t->tqent_func(t->tqent_arg);
 		rw_exit(&tq->tq_threadlock);
 
 		mutex_enter(&tq->tq_lock);
-		task_free(tq, t);
+		if (!prealloc)
+			task_free(tq, t);
 	}
 	tq->tq_nthreads--;
 	cv_broadcast(&tq->tq_wait_cv);
@@ -217,8 +250,8 @@ taskq_create(const char *name, int nthreads, pri_t pri,
 	tq->tq_nthreads = nthreads;
 	tq->tq_minalloc = minalloc;
 	tq->tq_maxalloc = maxalloc;
-	tq->tq_task.task_next = &tq->tq_task;
-	tq->tq_task.task_prev = &tq->tq_task;
+	tq->tq_task.tqent_next = &tq->tq_task;
+	tq->tq_task.tqent_prev = &tq->tq_task;
 	tq->tq_threadlist = kmem_alloc(nthreads * sizeof (thread_t), KM_SLEEP);
 
 	if (flags & TASKQ_PREPOPULATE) {
diff --git a/cddl/lib/libdtrace/psinfo.d b/cddl/lib/libdtrace/psinfo.d
index 068e72e4756..c2219f70a35 100644
--- a/cddl/lib/libdtrace/psinfo.d
+++ b/cddl/lib/libdtrace/psinfo.d
@@ -57,7 +57,8 @@ translator psinfo_t < struct proc *T > {
 	pr_gid = T->p_ucred->cr_rgid;
 	pr_egid = T->p_ucred->cr_groups[0];
 	pr_addr = 0;
-	pr_psargs = stringof(T->p_args->ar_args);
+	pr_psargs = (T->p_args->ar_args == 0) ? "" :
+	    memstr(T->p_args->ar_args, ' ', T->p_args->ar_length);
 	pr_arglen = T->p_args->ar_length;
 	pr_jailid = T->p_ucred->cr_prison->pr_id;
 };
diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile
index bd159fc856a..677068fdc8c 100644
--- a/cddl/lib/libnvpair/Makefile
+++ b/cddl/lib/libnvpair/Makefile
@@ -21,4 +21,13 @@ CFLAGS+= -I${.CURDIR}/../../../sys
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
 
+# This library uses macros to define fprintf behavior for several object types
+# The compiler will see the non-string literal arguments to the fprintf calls and
+# omit warnings for them. Quiesce these warnings in contrib code: 
+#
+# cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c:743:12: warning: format
+#   string is not a string literal (potentially insecure) [-Wformat-security]
+#    ARENDER(pctl, nvlist_array, nvl, name, val, nelem);
+#
+CFLAGS+= -Wno-format-security
 .include <bsd.lib.mk>
diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
index ef3ac3c2d55..0668758c2f9 100644
--- a/cddl/usr.sbin/lockstat/Makefile
+++ b/cddl/usr.sbin/lockstat/Makefile
@@ -3,7 +3,6 @@
 .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/lockstat
 
 PROG=		lockstat
-NO_MAN=
 SRCS=		lockstat.c sym.c
 BINDIR?=	/usr/sbin
 
diff --git a/contrib/apr-util/CHANGES b/contrib/apr-util/CHANGES
index 67eefbdd961..7626c50b52b 100644
--- a/contrib/apr-util/CHANGES
+++ b/contrib/apr-util/CHANGES
@@ -1,4 +1,23 @@
                                                      -*- coding: utf-8 -*-
+Changes with APR-util 1.5.3
+
+  *) Cygwin: Use correct file extension when loading APR DSOs.  PR 55587.
+     [Carlo Bramini <carlo.bramix libero.it>]
+
+  *) Add experimental cmake-based build system for Windows.  Refer to
+     README.cmake for more information.  [Jeff Trawick, Tom Donovan]
+
+  *) Fix warnings in odbc driver on 64bit systems.
+     PR 55197  [Tom Donovan]
+
+  *) Add support to apr_memcache for unix domain sockets. PR 54573 [Remi
+     Gacogne <rgacogne+asf aquaray.com>]
+
+  *) Add support for Berkeley DB 6.0. [Rainer Jung]
+
+  *) Improve platform detection for bundled expat by updating
+     config.guess and config.sub. [Rainer Jung]
+
 Changes with APR-util 1.5.2
 
   *) Windows: Add command line makefiles. [Gregg Smith]
diff --git a/contrib/apr-util/apr-util.spec b/contrib/apr-util/apr-util.spec
index 36249ff9ee8..d08400dff4f 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.2
+Version: 1.5.3
 Release: 1
 License: Apache Software License
 Group: System Environment/Libraries
diff --git a/contrib/apr-util/configure b/contrib/apr-util/configure
index 6d614e91978..ccfc3e60367 100755
--- a/contrib/apr-util/configure
+++ b/contrib/apr-util/configure
@@ -1440,7 +1440,7 @@ Optional Packages:
   --with-ldap-lib=path    path to ldap lib file
   --with-ldap=library     ldap library to use
   --with-dbm=DBM          choose the DBM type to use.
-                          DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X}
+                          DBM={sdbm,gdbm,ndbm,db,db1,db185,db2,db3,db4,db4X,db5X,db6X}
                           for some X=0,...,9
   --with-gdbm=DIR         enable GDBM support
   --with-ndbm=PATH        Find the NDBM header and library in `PATH/include'
@@ -11218,8 +11218,10 @@ fi
 
       fi
 
-      test ${apu_has_ldap} != "1" && as_fn_error $? "could not find an LDAP library" "$LINENO" 5
-      test ${apu_has_ldap} == "1" &&
+      if test ${apu_has_ldap} != "1"; then
+        as_fn_error $? "could not find an LDAP library" "$LINENO" 5
+      else
+
   if test "x$LDADD_ldap" = "x"; then
     test "x$silent" != "xyes" && echo "  setting LDADD_ldap to \"$LDADD_ldap_found\""
     LDADD_ldap="$LDADD_ldap_found"
@@ -11240,6 +11242,7 @@ fi
     done
   fi
 
+      fi
       as_ac_Lib=`$as_echo "ac_cv_lib_$apu_liblber_name''_ber_init" | $as_tr_sh`
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_init in -l$apu_liblber_name" >&5
 $as_echo_n "checking for ber_init in -l$apu_liblber_name... " >&6; }
@@ -11617,6 +11620,7 @@ fi
     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.
@@ -15708,7 +15712,7 @@ fi
       as_fn_error $? "Berkeley db3 not found" "$LINENO" 5
     fi
     ;;
-  db[45][0-9])
+  db[456][0-9])
     db_major=`echo "$requested" | sed -e 's/db//' -e 's/.$//'`
     db_minor=`echo "$requested" | sed -e 's/db//' -e 's/.//'`
 
@@ -16113,7 +16117,7 @@ fi
       as_fn_error $? "Berkeley db$db_major not found" "$LINENO" 5
     fi
     ;;
-  db[45])
+  db[456])
     db_major=`echo "$requested" | sed -e 's/db//'`
     # Start version search at version x.9
     db_minor=9
@@ -18561,11 +18565,11 @@ fi
       eval "apu_use_$requested=1"
       apu_default_dbm=$requested
       ;;
-    db185 | db[12345])
+    db185 | db[123456])
       apu_use_db=1
       apu_default_dbm=$requested
       ;;
-    db[45][0-9])
+    db[456][0-9])
       apu_use_db=1
       apu_default_dbm=`echo $requested | sed -e 's/.$//'`
       ;;
diff --git a/contrib/apr-util/crypto/apr_crypto.c b/contrib/apr-util/crypto/apr_crypto.c
index 7643b94e159..35ce3752a9b 100644
--- a/contrib/apr-util/crypto/apr_crypto.c
+++ b/contrib/apr-util/crypto/apr_crypto.c
@@ -100,7 +100,9 @@ APU_DECLARE(apr_status_t) apr_crypto_init(apr_pool_t *pool)
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for (parent = pool; parent; parent = apr_pool_parent_get(pool))
+    for (parent = apr_pool_parent_get(pool);
+         parent && parent != pool;
+         parent = apr_pool_parent_get(pool))
         pool = parent;
 #if APU_DSO_BUILD
     /* deprecate in 2.0 - permit implicit initialization */
@@ -176,7 +178,7 @@ APU_DECLARE(apr_status_t) apr_crypto_get_driver(
 
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "crypto%s.nlm", name);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(__CYGWIN__)
     apr_snprintf(modname, sizeof(modname),
             "apr_crypto_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name);
 #else
diff --git a/contrib/apr-util/dbd/apr_dbd.c b/contrib/apr-util/dbd/apr_dbd.c
index 49553f2b625..bfa97d9e380 100644
--- a/contrib/apr-util/dbd/apr_dbd.c
+++ b/contrib/apr-util/dbd/apr_dbd.c
@@ -102,8 +102,10 @@ APU_DECLARE(apr_status_t) apr_dbd_init(apr_pool_t *pool)
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for (parent = pool;  parent; parent = apr_pool_parent_get(pool))
-         pool = parent;
+    for (parent = apr_pool_parent_get(pool);
+        parent && parent != pool;
+        parent = apr_pool_parent_get(pool))
+       pool = parent;
 #if APU_DSO_BUILD
     /* deprecate in 2.0 - permit implicit initialization */
     apu_dso_init(pool);
@@ -184,7 +186,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
 
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "dbd%s.nlm", name);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined(__CYGWIN__)
     apr_snprintf(modname, sizeof(modname),
                  "apr_dbd_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", name);
 #else
@@ -204,7 +206,7 @@ APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
     }
     apu_dso_mutex_unlock();
 
-#else /* not builtin and !APR_HAS_DSO => not implemented */
+#else /* not builtin and !APU_DSO_BUILD => not implemented */
     rv = APR_ENOTIMPL;
 #endif
 
diff --git a/contrib/apr-util/dbd/apr_dbd_odbc.c b/contrib/apr-util/dbd/apr_dbd_odbc.c
index 3a97052fbb2..6ee8a7d570f 100644
--- a/contrib/apr-util/dbd/apr_dbd_odbc.c
+++ b/contrib/apr-util/dbd/apr_dbd_odbc.c
@@ -114,9 +114,9 @@ struct apr_dbd_t
     char lastError[MAX_ERROR_STRING];
     int defaultBufferSize;      /* used for CLOBs in text mode, 
                                  * and when fld size is indeterminate */
-    int transaction_mode;
-    int dboptions;              /* driver options re SQLGetData */
-    int default_transaction_mode;
+    intptr_t transaction_mode;
+    intptr_t dboptions;         /* driver options re SQLGetData */
+    intptr_t default_transaction_mode;
     int can_commit;             /* controls end_trans behavior */
 };
 
@@ -359,7 +359,7 @@ static SQLRETURN odbc_set_result_column(int icol, apr_dbd_results_t *res,
                                         SQLHANDLE stmt)
 {
     SQLRETURN rc;
-    int maxsize, textsize, realsize, type, isunsigned = 1;
+    intptr_t maxsize, textsize, realsize, type, isunsigned = 1;
 
     /* discover the sql type */
     rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_UNSIGNED, NULL, 0, NULL,
@@ -409,7 +409,7 @@ static SQLRETURN odbc_set_result_column(int icol, apr_dbd_results_t *res,
       type = SQL_C_CHAR;
     }
 
-    res->coltypes[icol] = type;
+    res->coltypes[icol] = (SQLSMALLINT)type;
 
     /* size if retrieved as text */
     rc = SQLColAttribute(stmt, icol + 1, SQL_DESC_DISPLAY_SIZE, NULL, 0,
@@ -441,12 +441,12 @@ static SQLRETURN odbc_set_result_column(int icol, apr_dbd_results_t *res,
 
         res->colptrs[icol] =  NULL;
         res->colstate[icol] = COL_AVAIL;
-        res->colsizes[icol] = maxsize;
+        res->colsizes[icol] = (SQLINTEGER)maxsize;
         rc = SQL_SUCCESS;
     }
     else {
         res->colptrs[icol] = apr_pcalloc(res->pool, maxsize);
-        res->colsizes[icol] = maxsize;
+        res->colsizes[icol] = (SQLINTEGER)maxsize;
         if (res->apr_dbd->dboptions & SQL_GD_BOUND) {
             /* we are allowed to call SQLGetData if we need to */
             rc = SQLBindCol(stmt, icol + 1, res->coltypes[icol], 
@@ -747,7 +747,7 @@ static void *odbc_get(const apr_dbd_row_t *row, const int col,
     SQLRETURN rc;
     SQLLEN indicator;
     int state = row->res->colstate[col];
-    int options = row->res->apr_dbd->dboptions;
+    intptr_t options = row->res->apr_dbd->dboptions;
 
     switch (state) {
     case (COL_UNAVAIL):
@@ -817,13 +817,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, int **attrvals)
+                               int **attrs, 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(int));
+    *attrvals = apr_pcalloc(pool, MAX_PARAMS * sizeof(intptr_t));
     *nattrs = 0;
     seps = DEFAULTSEPS;
     name[nparams] = apr_strtok(apr_pstrdup(pool, params), seps, &last);
@@ -1062,7 +1062,8 @@ static apr_dbd_t *odbc_open(apr_pool_t *pool, const char *params, const char **e
     SQLHANDLE err_h = NULL;
     SQLCHAR  *datasource = (SQLCHAR *)"", *user = (SQLCHAR *)"",
              *password = (SQLCHAR *)"";
-    int nattrs = 0, *attrs = NULL, *attrvals = NULL, connect = 0;
+    int nattrs = 0, *attrs = NULL,  connect = 0;
+    intptr_t *attrvals = NULL;
 
     err_step = "SQLAllocHandle (SQL_HANDLE_DBC)";
     err_htype = SQL_HANDLE_ENV;
@@ -1116,10 +1117,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(int), NULL);
+                   &(handle->default_transaction_mode), sizeof(intptr_t), NULL);
         handle->transaction_mode = handle->default_transaction_mode;
         SQLGetInfo(hdbc, SQL_GETDATA_EXTENSIONS ,&(handle->dboptions),
-                   sizeof(int), NULL);
+                   sizeof(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/apr_dbm.c b/contrib/apr-util/dbm/apr_dbm.c
index 5c506fc8821..8b58f8331cd 100644
--- a/contrib/apr-util/dbm/apr_dbm.c
+++ b/contrib/apr-util/dbm/apr_dbm.c
@@ -129,8 +129,10 @@ static apr_status_t dbm_open_type(apr_dbm_type_t const* * vtable,
         apr_pool_t *parent;
 
         /* Top level pool scope, need process-scope lifetime */
-        for (parent = pool;  parent; parent = apr_pool_parent_get(pool))
-             pool = parent;
+        for (parent = apr_pool_parent_get(pool);
+             parent && parent != pool;
+             parent = apr_pool_parent_get(pool))
+            pool = parent;
 
         /* deprecate in 2.0 - permit implicit initialization */
         apu_dso_init(pool);
@@ -162,7 +164,7 @@ static apr_status_t dbm_open_type(apr_dbm_type_t const* * vtable,
 
 #if defined(NETWARE)
     apr_snprintf(modname, sizeof(modname), "dbm%s.nlm", type);
-#elif defined(WIN32)
+#elif defined(WIN32) || defined (__CYGWIN__)
     apr_snprintf(modname, sizeof(modname),
                  "apr_dbm_%s-" APU_STRINGIFY(APU_MAJOR_VERSION) ".dll", type);
 #else
diff --git a/contrib/apr-util/include/apr_buckets.h b/contrib/apr-util/include/apr_buckets.h
index 4838ab28d97..025292b9865 100644
--- a/contrib/apr-util/include/apr_buckets.h
+++ b/contrib/apr-util/include/apr_buckets.h
@@ -351,9 +351,9 @@ typedef apr_status_t (*apr_brigade_flush)(apr_bucket_brigade *bb, void *ctx);
 #define APR_BRIGADE_LAST(b)	APR_RING_LAST(&(b)->list)
 
 /**
- * Insert a list of buckets at the front of a brigade
+ * Insert a single bucket at the front of a brigade
  * @param b The brigade to add to
- * @param e The first bucket in a list of buckets to insert
+ * @param e The bucket to insert
  */
 #define APR_BRIGADE_INSERT_HEAD(b, e) do {				\
 	apr_bucket *ap__b = (e);                                        \
@@ -362,9 +362,9 @@ typedef apr_status_t (*apr_brigade_flush)(apr_bucket_brigade *bb, void *ctx);
     } while (0)
 
 /**
- * Insert a list of buckets at the end of a brigade
+ * Insert a single bucket at the end of a brigade
  * @param b The brigade to add to
- * @param e The first bucket in a list of buckets to insert
+ * @param e The bucket to insert
  */
 #define APR_BRIGADE_INSERT_TAIL(b, e) do {				\
 	apr_bucket *ap__b = (e);					\
@@ -393,9 +393,9 @@ typedef apr_status_t (*apr_brigade_flush)(apr_bucket_brigade *bb, void *ctx);
     } while (0)
 
 /**
- * Insert a list of buckets before a specified bucket
+ * Insert a single bucket before a specified bucket
  * @param a The bucket to insert before
- * @param b The buckets to insert
+ * @param b The bucket to insert
  */
 #define APR_BUCKET_INSERT_BEFORE(a, b) do {				\
 	apr_bucket *ap__a = (a), *ap__b = (b);				\
@@ -404,9 +404,9 @@ typedef apr_status_t (*apr_brigade_flush)(apr_bucket_brigade *bb, void *ctx);
     } while (0)
 
 /**
- * Insert a list of buckets after a specified bucket
+ * Insert a single bucket after a specified bucket
  * @param a The bucket to insert after
- * @param b The buckets to insert
+ * @param b The bucket to insert
  */
 #define APR_BUCKET_INSERT_AFTER(a, b) do {				\
 	apr_bucket *ap__a = (a), *ap__b = (b);				\
diff --git a/contrib/apr-util/include/apr_dbd.h b/contrib/apr-util/include/apr_dbd.h
index f30977daf4c..3a334b73e2b 100644
--- a/contrib/apr-util/include/apr_dbd.h
+++ b/contrib/apr-util/include/apr_dbd.h
@@ -107,10 +107,10 @@ APU_DECLARE(apr_status_t) apr_dbd_get_driver(apr_pool_t *pool, const char *name,
 
 /** apr_dbd_open_ex: open a connection to a backend
  *
+ *  @param driver - driver struct.
  *  @param pool - working pool
  *  @param params - arguments to driver (implementation-dependent)
  *  @param handle - pointer to handle to return
- *  @param driver - driver struct.
  *  @param error - descriptive error.
  *  @return APR_SUCCESS for success
  *  @return APR_EGENERAL if driver exists but connection failed
@@ -147,10 +147,10 @@ APU_DECLARE(apr_status_t) apr_dbd_open_ex(const apr_dbd_driver_t *driver,
 
 /** apr_dbd_open: open a connection to a backend
  *
+ *  @param driver - driver struct.
  *  @param pool - working pool
  *  @param params - arguments to driver (implementation-dependent)
  *  @param handle - pointer to handle to return
- *  @param driver - driver struct.
  *  @return APR_SUCCESS for success
  *  @return APR_EGENERAL if driver exists but connection failed
  *  @see apr_dbd_open_ex
@@ -161,8 +161,8 @@ APU_DECLARE(apr_status_t) apr_dbd_open(const apr_dbd_driver_t *driver,
 
 /** apr_dbd_close: close a connection to a backend
  *
- *  @param handle - handle to close
  *  @param driver - driver struct.
+ *  @param handle - handle to close
  *  @return APR_SUCCESS for success or error status
  */
 APU_DECLARE(apr_status_t) apr_dbd_close(const apr_dbd_driver_t *driver,
diff --git a/contrib/apr-util/include/apr_hooks.h b/contrib/apr-util/include/apr_hooks.h
index b675711e72b..eee16e3c63e 100644
--- a/contrib/apr-util/include/apr_hooks.h
+++ b/contrib/apr-util/include/apr_hooks.h
@@ -313,24 +313,24 @@ APU_DECLARE_DATA extern apr_pool_t *apr_hook_global_pool;
 
 /**
  * A global variable to determine if debugging information about the
- * hooks functions should be printed
+ * hooks functions should be printed.
  */ 
 APU_DECLARE_DATA extern int apr_hook_debug_enabled;
 
 /**
- * The name of the module that is currently registering a function
+ * The name of the module that is currently registering a function.
  */ 
 APU_DECLARE_DATA extern const char *apr_hook_debug_current;
 
 /**
- * Register a hook function to be sorted
+ * Register a hook function to be sorted.
  * @param szHookName The name of the Hook the function is registered for
  * @param aHooks The array which stores all of the functions for this hook
  */
 APU_DECLARE(void) apr_hook_sort_register(const char *szHookName, 
                                         apr_array_header_t **aHooks);
 /**
- * Sort all of the registerd functions for a given hook
+ * Sort all of the registered functions for a given hook.
  */
 APU_DECLARE(void) apr_hook_sort_all(void);
 
diff --git a/contrib/apr-util/include/apr_optional_hooks.h b/contrib/apr-util/include/apr_optional_hooks.h
index 54bf65effab..8265f03f38d 100644
--- a/contrib/apr-util/include/apr_optional_hooks.h
+++ b/contrib/apr-util/include/apr_optional_hooks.h
@@ -33,11 +33,11 @@ extern "C" {
  * @{
  */
 /**
- * Function to implemnt the APR_OPTIONAL_HOOK Macro
+ * Function to implement the APR_OPTIONAL_HOOK Macro
  * @internal
  * @see APR_OPTIONAL_HOOK
  *
- * @param name The name of the hook
+ * @param szName The name of the hook
  * @param pfn A pointer to a function that will be called
  * @param aszPre a NULL-terminated array of strings that name modules whose hooks should precede this one
  * @param aszSucc a NULL-terminated array of strings that name modules whose hooks should succeed this one
diff --git a/contrib/apr-util/include/apr_queue.h b/contrib/apr-util/include/apr_queue.h
index 20c425db38f..a3a41704862 100644
--- a/contrib/apr-util/include/apr_queue.h
+++ b/contrib/apr-util/include/apr_queue.h
@@ -22,7 +22,7 @@
  * @brief Thread Safe FIFO bounded queue
  * @note Since most implementations of the queue are backed by a condition
  * variable implementation, it isn't available on systems without threads.
- * Although condition variables are some times available without threads.
+ * Although condition variables are sometimes available without threads.
  */
 
 #include "apu.h"
diff --git a/contrib/apr-util/include/apr_reslist.h b/contrib/apr-util/include/apr_reslist.h
index 1e30a538205..02a8192b99e 100644
--- a/contrib/apr-util/include/apr_reslist.h
+++ b/contrib/apr-util/include/apr_reslist.h
@@ -44,7 +44,7 @@ typedef struct apr_reslist_t apr_reslist_t;
 /* Generic constructor called by resource list when it needs to create a
  * resource.
  * @param resource opaque resource
- * @param param flags
+ * @param params flags
  * @param pool  Pool
  */
 typedef apr_status_t (*apr_reslist_constructor)(void **resource, void *params,
@@ -53,7 +53,7 @@ typedef apr_status_t (*apr_reslist_constructor)(void **resource, void *params,
 /* Generic destructor called by resource list when it needs to destroy a
  * resource.
  * @param resource opaque resource
- * @param param flags
+ * @param params flags
  * @param pool  Pool
  */
 typedef apr_status_t (*apr_reslist_destructor)(void *resource, void *params,
@@ -111,12 +111,17 @@ APU_DECLARE(apr_status_t) apr_reslist_destroy(apr_reslist_t *reslist);
  * Retrieve a resource from the list, creating a new one if necessary.
  * If we have met our maximum number of resources, we will block
  * until one becomes available.
+ * @param reslist The resource list.
+ * @param resource An address where the pointer to the resource
+ *                will be stored.
  */
 APU_DECLARE(apr_status_t) apr_reslist_acquire(apr_reslist_t *reslist,
                                               void **resource);
 
 /**
  * Return a resource back to the list of available resources.
+ * @param reslist The resource list.
+ * @param resource The resource to return to the list.
  */
 APU_DECLARE(apr_status_t) apr_reslist_release(apr_reslist_t *reslist,
                                               void *resource);
@@ -140,6 +145,8 @@ APU_DECLARE(apr_uint32_t) apr_reslist_acquired_count(apr_reslist_t *reslist);
  * Invalidate a resource in the pool - e.g. a database connection
  * that returns a "lost connection" error and can't be restored.
  * Use this instead of apr_reslist_release if the resource is bad.
+ * @param reslist The resource list.
+ * @param resource The resource to invalidate.
  */
 APU_DECLARE(apr_status_t) apr_reslist_invalidate(apr_reslist_t *reslist,
                                                  void *resource);
diff --git a/contrib/apr-util/include/apu.hw b/contrib/apr-util/include/apu.hw
index 5be70de6093..a6cde01a3a8 100644
--- a/contrib/apr-util/include/apu.hw
+++ b/contrib/apr-util/include/apu.hw
@@ -42,6 +42,12 @@
  * conventions at compile time.
  */
 
+/* Make sure we have our platform identifier macro defined we ask for later.
+ */
+#if defined(_WIN32) && !defined(WIN32)
+#define WIN32 1
+#endif
+
 #if defined(DOXYGEN) || !defined(WIN32)
 /**
  * The public APR-UTIL functions are declared with APU_DECLARE(), so they may
diff --git a/contrib/apr-util/include/apu_version.h b/contrib/apr-util/include/apu_version.h
index 7435084f328..a7a58787624 100644
--- a/contrib/apr-util/include/apu_version.h
+++ b/contrib/apr-util/include/apu_version.h
@@ -38,6 +38,9 @@
  */
 
 
+#define APU_COPYRIGHT "Copyright (c) 2013 The Apache Software " \
+                      "Foundation or its licensors, as applicable."
+
 /* The numeric compile-time version constants. These constants are the
  * authoritative version numbers for APU. 
  */
@@ -59,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       2
+#define APU_PATCH_VERSION       3
 
 /** 
  * The symbol APU_IS_DEV_VERSION is only defined for internal,
@@ -71,7 +74,9 @@
 
 #if defined(APU_IS_DEV_VERSION) || defined(DOXYGEN)
 /** Internal: string form of the "is dev" flag */
+#ifndef APU_IS_DEV_STRING
 #define APU_IS_DEV_STRING "-dev"
+#endif
 #else
 #define APU_IS_DEV_STRING ""
 #endif
diff --git a/contrib/apr-util/libaprutil.rc b/contrib/apr-util/libaprutil.rc
index 2beceeb440c..a1ffddbd5bf 100644
--- a/contrib/apr-util/libaprutil.rc
+++ b/contrib/apr-util/libaprutil.rc
@@ -1,8 +1,5 @@
 #include "apu_version.h"
 
-#define APU_COPYRIGHT "Copyright (c) 2011 The Apache Software " \
-                      "Foundation or its licensors, as applicable."
-
 #define APU_LICENSE \
   "Licensed to the Apache Software Foundation (ASF) under one or more " \
   "contributor license agreements.  See the NOTICE file distributed with " \
diff --git a/contrib/apr-util/memcache/apr_memcache.c b/contrib/apr-util/memcache/apr_memcache.c
index f6b911d9920..b9922fb767a 100644
--- a/contrib/apr-util/memcache/apr_memcache.c
+++ b/contrib/apr-util/memcache/apr_memcache.c
@@ -181,7 +181,7 @@ apr_memcache_find_server_hash_default(void *baton, apr_memcache_t *mc,
 #if APR_HAS_THREADS
             apr_thread_mutex_lock(ms->lock);
 #endif
-            /* Try the the dead server, every 5 seconds */
+            /* Try the dead server, every 5 seconds */
             if (curtime - ms->btime >  apr_time_from_sec(5)) {
                 ms->btime = curtime;
                 if (mc_version_ping(ms) == APR_SUCCESS) {
@@ -289,8 +289,13 @@ static apr_status_t conn_connect(apr_memcache_conn_t *conn)
 {
     apr_status_t rv = APR_SUCCESS;
     apr_sockaddr_t *sa;
+#if APR_HAVE_SOCKADDR_UN
+    apr_int32_t family = conn->ms->host[0] != '/' ? APR_INET : APR_UNIX;
+#else
+    apr_int32_t family = APR_INET;
+#endif
 
-    rv = apr_sockaddr_info_get(&sa, conn->ms->host, APR_INET, conn->ms->port, 0, conn->p);
+    rv = apr_sockaddr_info_get(&sa, conn->ms->host, family, conn->ms->port, 0, conn->p);
     if (rv != APR_SUCCESS) {
         return rv;
     }
@@ -322,6 +327,11 @@ mc_conn_construct(void **conn_, void *params, apr_pool_t *pool)
     apr_pool_t *np;
     apr_pool_t *tp;
     apr_memcache_server_t *ms = params;
+#if APR_HAVE_SOCKADDR_UN
+    apr_int32_t family = ms->host[0] != '/' ? APR_INET : APR_UNIX;
+#else
+    apr_int32_t family = APR_INET;
+#endif
 
     rv = apr_pool_create(&np, pool);
     if (rv != APR_SUCCESS) {
@@ -339,7 +349,7 @@ mc_conn_construct(void **conn_, void *params, apr_pool_t *pool)
     conn->p = np;
     conn->tp = tp;
 
-    rv = apr_socket_create(&conn->sock, APR_INET, SOCK_STREAM, 0, np);
+    rv = apr_socket_create(&conn->sock, family, SOCK_STREAM, 0, np);
 
     if (rv != APR_SUCCESS) {
         apr_pool_destroy(np);
diff --git a/contrib/apr-util/misc/apu_dso.c b/contrib/apr-util/misc/apu_dso.c
index 639875dc7f0..9d7f20659b5 100644
--- a/contrib/apr-util/misc/apu_dso.c
+++ b/contrib/apr-util/misc/apu_dso.c
@@ -75,7 +75,6 @@ static apr_status_t apu_dso_term(void *ptr)
 apr_status_t apu_dso_init(apr_pool_t *pool)
 {
     apr_status_t ret = APR_SUCCESS;
-    apr_pool_t *global;
     apr_pool_t *parent;
 
     if (apr_atomic_inc32(&initialised)) {
@@ -88,17 +87,19 @@ apr_status_t apu_dso_init(apr_pool_t *pool)
     }
 
     /* Top level pool scope, need process-scope lifetime */
-    for (parent = global = pool; parent; parent = apr_pool_parent_get(global))
-        global = parent;
+    for (parent = apr_pool_parent_get(pool);
+         parent && parent != pool;
+         parent = apr_pool_parent_get(pool))
+        pool = parent;
 
-    dsos = apr_hash_make(global);
+    dsos = apr_hash_make(pool);
 
 #if APR_HAS_THREADS
-    ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, global);
+    ret = apr_thread_mutex_create(&mutex, APR_THREAD_MUTEX_DEFAULT, pool);
     /* This already registers a pool cleanup */
 #endif
 
-    apr_pool_cleanup_register(global, NULL, apu_dso_term,
+    apr_pool_cleanup_register(pool, NULL, apu_dso_term,
                               apr_pool_cleanup_null);
 
     apr_atomic_dec32(&in_init);
diff --git a/contrib/apr-util/test/abts.c b/contrib/apr-util/test/abts.c
index b2c65087105..da0097d05d3 100644
--- a/contrib/apr-util/test/abts.c
+++ b/contrib/apr-util/test/abts.c
@@ -106,6 +106,9 @@ abts_suite *abts_add_suite(abts_suite *suite, const char *suite_name_full)
     /* suite_name_full may be an absolute path depending on __FILE__ 
      * expansion */
     suite_name = strrchr(suite_name_full, '/');
+    if (!suite_name) {
+        suite_name = strrchr(suite_name_full, '\\');
+    }
     if (suite_name) {
         suite_name++;
     } else {
@@ -247,7 +250,8 @@ void abts_int_nequal(abts_case *tc, const int expected, const int actual, int li
 
     tc->failed = TRUE;
     if (verbose) {
-        fprintf(stderr, "Line %d: expected <%d>, but saw <%d>\n", lineno, expected, actual);
+        fprintf(stderr, "Line %d: expected something other than <%d>, but saw <%d>\n",
+                lineno, expected, actual);
         fflush(stderr);
     }
 }
@@ -279,7 +283,8 @@ void abts_str_nequal(abts_case *tc, const char *expected, const char *actual,
 
     tc->failed = TRUE;
     if (verbose) {
-        fprintf(stderr, "Line %d: expected <%s>, but saw <%s>\n", lineno, expected, actual);
+        fprintf(stderr, "Line %d: expected something other than <%s>, but saw <%s>\n",
+                lineno, expected, actual);
         fflush(stderr);
     }
 }
diff --git a/contrib/apr-util/test/testpass.c b/contrib/apr-util/test/testpass.c
index 0b0ebccff83..2a27a8fbd77 100644
--- a/contrib/apr-util/test/testpass.c
+++ b/contrib/apr-util/test/testpass.c
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/contrib/apr-util/test/testssl.c b/contrib/apr-util/test/testssl.c
deleted file mode 100644
index e7f090e1bd6..00000000000
--- a/contrib/apr-util/test/testssl.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-/*
- * testssl: Simple APR SSL sockets test.
- */
-
-#include "apr.h"
-#include "apr_general.h"
-#include "apr_pools.h"
-#include "apr_errno.h"
-#include "apr_getopt.h"
-#include "apr_time.h"
-#define APR_WANT_STRFUNC
-#include "apr_want.h"
-
-#include "apr_ssl.h"
-#include "apr_network_io.h"
-
-#if APR_HAVE_STDIO_H
-#include <stdio.h>
-#endif
-#if APR_HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <stdlib.h>     /* for atexit(), malloc() */
-#include <string.h>
-
-struct sslTestCase {
-    char *host;
-    int port;
-    const char *request;
-    int result;
-} tests[] = {
-    { "svn.apache.org", 443, "GET / HTTP/1.0\n\n", 1 },
-    { NULL }
-};
-
-static apr_ssl_socket_t *createSocket(apr_ssl_factory_t *asf, 
-                                      apr_pollset_t *pollset,
-                                      apr_pool_t *pool, int blocking)
-{
-    apr_ssl_socket_t *sock;
-    apr_status_t rv;
-    printf("::Creating SSL socket\n");
-    rv = apr_ssl_socket_create(&sock, AF_INET, SOCK_STREAM, 0, asf, NULL);
-    if (rv != APR_SUCCESS) {
-        printf("\tFailed to create socket\n");
-        return NULL;
-    }
-    rv = apr_pollset_add_ssl_socket(pollset, sock);
-    if (rv != APR_SUCCESS) {
-        printf("\tFailed to add to pollset\n");
-        return NULL;
-    }
-    printf("\tOK\n");
-    return sock;
-}
-
-static apr_status_t connectSocket(apr_ssl_socket_t *sock,
-                                  const char *host, int port,
-                                  apr_pool_t *pool)
-{
-    apr_status_t rv;
-    apr_sockaddr_t *remoteSA;
-
-    printf("::Connecting socket\n");
-    rv = apr_sockaddr_info_get(&remoteSA, host, APR_UNSPEC, port, 0, pool);
-    if (rv != APR_SUCCESS) {
-        printf("\tFailed to get address for '%s', port %d\n", host, port);
-        return rv;
-    }
-    rv = apr_ssl_socket_connect(sock, remoteSA);
-    if (rv != APR_SUCCESS) {
-        printf("\tFailed to connect to '%s' port %d\n", host, port);
-        return rv;
-    }
-    printf("\tOK\n");
-    return rv;
-}
-
-static apr_status_t socketRead(apr_ssl_socket_t *sock,
-                               apr_pollset_t *pollset,
-                               char *buf, apr_size_t *len)
-{
-    int lrv;
-    const apr_pollfd_t *descs = NULL;
-    apr_status_t rv;
-
-    printf("::Reading from socket\n");
-    rv = apr_ssl_socket_set_poll_events(sock, APR_POLLIN);
-    if (rv != APR_SUCCESS) {
-        printf("\tUnable to change socket poll events!\n");
-        return rv;
-    }
-
-    rv = apr_pollset_poll(pollset, 30 * APR_USEC_PER_SEC, &lrv, &descs);
-    if (APR_STATUS_IS_TIMEUP(rv)) {
-        printf("\tTime up!\n");
-        return rv;
-    }
-
-    if (lrv != 1) {
-        printf("\tIncorrect return count, %d\n", lrv);
-        return rv;
-    }
-    if (descs[0].client_data != sock) {
-        printf("\tWrong socket returned?!\n");
-        return rv;
-    }
-    if ((descs[0].rtnevents & APR_POLLIN) == 0) {
-        printf("\tSocket wasn't ready? huh? req [%08x] vs rtn [%08x]\n",
-               descs[0].reqevents, descs[0].rtnevents);
-        return rv;
-    }
-    rv = apr_ssl_socket_recv(sock, buf, len);
-    if (rv == APR_SUCCESS)
-        printf("\tOK, read %d bytes\n", *len);
-    else
-        printf("\tFailed\n");
-    return rv;
-}
-
-static apr_status_t socketWrite(apr_ssl_socket_t *sock,
-                                apr_pollset_t *pollset,
-                                const char *buf, apr_size_t *len)
-{
-    int lrv;
-    const apr_pollfd_t *descs = NULL;
-    apr_status_t rv;
-
-    printf("::Writing to socket\n");
-    rv = apr_ssl_socket_set_poll_events(sock, APR_POLLOUT);
-    if (rv != APR_SUCCESS) {
-        printf("\tUnable to change socket poll events!\n");
-        return rv;
-    }
-
-    rv = apr_pollset_poll(pollset, 30 * APR_USEC_PER_SEC, &lrv, &descs);
-    if (APR_STATUS_IS_TIMEUP(rv)) {
-        printf("\tTime up!\n");
-        return rv;
-    }
-    if (lrv != 1) {
-        printf("\tIncorrect return count, %d\n", lrv);
-        return rv;
-    }
-    if (descs[0].client_data != sock) {
-        printf("\tWrong socket returned?!\n");
-        return rv;
-    }
-    if ((descs[0].rtnevents & APR_POLLOUT) == 0) {
-        printf("\tSocket wasn't ready? huh?\n");
-        return rv;
-    }
-    rv = apr_ssl_socket_send(sock, buf, len);
-    if (rv == APR_SUCCESS)
-        printf("\tOK, wrote %d bytes\n", *len);
-    else
-        printf("\tFailed\n");
-    return rv;
-}
-
-apr_status_t socketClose(apr_ssl_socket_t *sock, apr_pollset_t *pollset)
-{
-    apr_status_t rv;
-    printf("::Closing socket\n");
-    rv = apr_pollset_remove_ssl_socket(sock);
-    if (rv != APR_SUCCESS)
-        printf("\tUnable to remove socket from pollset?\n");
-    rv = apr_ssl_socket_close(sock);
-    if (rv != APR_SUCCESS)
-        printf("\tFailed to close SSL socket\n");
-    else
-        printf("\tOK\n");
-    return rv;
-}
-
-
-int main(int argc, const char * const * argv)
-{
-    apr_pool_t *pool;
-    apr_ssl_factory_t *asf = NULL;
-    apr_status_t rv;
-    apr_pollset_t *pollset;
-
-    (void) apr_initialize();
-    apr_pool_create(&pool, NULL);
-    atexit(apr_terminate);
-
-    printf("SSL Library: %s\n", apr_ssl_library_name());
-
-    if (apr_pollset_create(&pollset, 1, pool, 0) != APR_SUCCESS) {
-        printf("Failed to create pollset!\n");
-        exit(1);
-    }
-
-    if (apr_ssl_factory_create(&asf, NULL, NULL, NULL, 
-                               APR_SSL_FACTORY_CLIENT, pool) != APR_SUCCESS) {
-        fprintf(stderr, "Unable to create client factory\n");
-    } else {
-        int i;
-        for(i = 0; tests[i].host; i++) {
-            apr_ssl_socket_t *sslSock = createSocket(asf, pollset, pool, 0);
-            if (!sslSock)
-                continue;
-
-            rv = connectSocket(sslSock, tests[i].host, tests[i].port, pool);
-            if (rv == APR_SUCCESS) {
-                apr_size_t len = strlen(tests[i].request);
-                rv = socketWrite(sslSock, pollset, tests[i].request, &len);
-                if (rv == APR_SUCCESS) {
-                    char buffer[4096];
-                    len = 4096;
-                    rv = socketRead(sslSock, pollset, buffer, &len);
-                }
-            }
-            socketClose(sslSock, pollset);
-        }
-    }
-
-    apr_pollset_destroy(pollset);
-    apr_pool_destroy(pool);
-
-    return 0;
-}
-
-
diff --git a/contrib/atf/Atffile b/contrib/atf/Atffile
deleted file mode 100644
index 9306a6c089f..00000000000
--- a/contrib/atf/Atffile
+++ /dev/null
@@ -1,12 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: atf-c
-tp: atf-c++
-tp: atf-sh
-tp: test-programs
-
-tp-glob: atf-config*
-tp-glob: atf-report*
-tp-glob: atf-run*
diff --git a/contrib/atf/FREEBSD-Xlist b/contrib/atf/FREEBSD-Xlist
index 9d18c3c126f..be75e54ffc7 100644
--- a/contrib/atf/FREEBSD-Xlist
+++ b/contrib/atf/FREEBSD-Xlist
@@ -1,8 +1,21 @@
+*/*/Atffile
+*/*/Makefile*
+*/Atffile
+*/Makefile*
+Atffile
+INSTALL
+Makefile*
+aclocal.m4
+admin/
+atf-*/atf-*.m4
+atf-*/atf-*.pc.in
+atf-config/
+atf-report/
+atf-run/
+atf-version/
+bconfig.h.in
 bootstrap/
-config.log
-config.status
-libtool
-Makefile
-stamp-h1
-*/*/.deps/
-*/.deps/
+configure*
+doc/atf-formats.5
+doc/atf.7.in
+m4/
diff --git a/contrib/atf/FREEBSD-upgrade b/contrib/atf/FREEBSD-upgrade
index 45a4bf5eea8..1b1970f2e9c 100644
--- a/contrib/atf/FREEBSD-upgrade
+++ b/contrib/atf/FREEBSD-upgrade
@@ -1,28 +1,48 @@
 $FreeBSD$
 
-atf
+This document contains a collection of notes specific to the import
+of atf 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:
 
-The source code is hosted on GoogleCode as a subcomponent of the Kyua project:
+	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:
 
 	http://code.google.com/p/kyua/downloads/list
 
-For the contrib directory, the sources were initially prepared like so:
+and is imported into the atf vendor branch (see base/vendor/atf/).
 
-	./configure --prefix=/ --exec-prefix=/usr --datarootdir=/usr/share
+To merge the vendor branch into head do something like this:
 
-For the contrib directory, files and directories were pruned by:
+	cd .../base/head/contrib/atf
+	svn merge --accept=postpone \
+	    svn+ssh://svn.freebsd.org/base/vendor/atf/dist .
+	svn remove --force $(cat FREEBSD-Xlist)
 
-sh -c 'for F in `cat FREEBSD-Xlist`; do rm -rf ./$F ; done'
+and resolve any conflicts that may arise at this point.
 
-You may check if there are any new files that we don't need.
+Once this is done, you must regenerate bconfig.h.  The recommended way
+of doing so is by using the release files already imported into the
+vendor branch (which is a good justification for importing the verbatim
+sources in the first place so that this step is reproducible).  You can
+use a set of commands similar to the following:
 
-The instructions for importing new release and merging to HEAD can be found
-at FreeBSD wiki:
+	mkdir /tmp/atf
+	cd /tmp/atf
+	.../vendor/atf/dist/configure \
+	    --prefix=/ \
+	    --exec-prefix=/usr \
+	    --datarootdir=/usr/share
+	cp bconfig.h .../base/head/contrib/atf/
 
-	http://wiki.freebsd.org/SubversionPrimer/VendorImports
+Please do NOT run './configure' straight from the 'dist' directory of
+the vendor branch as you easily risk committing build products into the
+tree.
 
-To make local changes to atf, simply patch and commit to the trunk
-branch (aka HEAD).  Never make local changes on the vendor branch.
+Lastly, with the list of old and new files in this import, make sure
+to udpate the reachover Makefiles accordingly.
 
-gcooper@FreeBSD.org
-5-August-2012
+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/Makefile.am b/contrib/atf/Makefile.am
deleted file mode 100644
index 0a3a484db3b..00000000000
--- a/contrib/atf/Makefile.am
+++ /dev/null
@@ -1,151 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-atf_aclocal_DATA =
-BUILT_SOURCES =
-CLEANFILES =
-EXTRA_DIST =
-bin_PROGRAMS =
-dist_man_MANS =
-include_HEADERS =
-lib_LTLIBRARIES =
-libexec_PROGRAMS =
-man_MANS =
-noinst_DATA =
-noinst_LTLIBRARIES =
-INSTALLCHECK_TARGETS =
-PHONY_TARGETS =
-
-ACLOCAL_AMFLAGS = -I m4
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tools
-
-include admin/Makefile.am.inc
-include atf-c/Makefile.am.inc
-include atf-c++/Makefile.am.inc
-include atf-sh/Makefile.am.inc
-include bootstrap/Makefile.am.inc
-include doc/Makefile.am.inc
-include test-programs/Makefile.am.inc
-
-if ENABLE_TOOLS
-include atf-report/Makefile.am.inc
-include atf-config/Makefile.am.inc
-include atf-run/Makefile.am.inc
-include atf-version/Makefile.am.inc
-endif
-
-#
-# Top-level distfile documents.
-#
-
-doc_DATA = AUTHORS COPYING NEWS README
-noinst_DATA += INSTALL README
-EXTRA_DIST += $(doc_DATA) INSTALL README
-
-#
-# Supporting logic to run our custom testsuite.
-#
-
-TESTS_ENVIRONMENT = PATH=$(prefix)/bin:$${PATH} \
-                    PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig
-
-testsdir = $(exec_prefix)/tests
-pkgtestsdir = $(testsdir)/$(PACKAGE)
-
-if ENABLE_TOOLS
-INSTALLCHECK_TARGETS += installcheck-atf
-PHONY_TARGETS += installcheck-atf
-installcheck-atf:
-	logfile=$$(pwd)/installcheck.log; \
-	fifofile=$$(pwd)/installcheck.fifo; \
-	cd $(pkgtestsdir); \
-	rm -f $${fifofile}; \
-	mkfifo $${fifofile}; \
-	cat $${fifofile} | tee $${logfile} | $(TESTS_ENVIRONMENT) atf-report & \
-	$(TESTS_ENVIRONMENT) atf-run >>$${fifofile}; \
-	res=$${?}; \
-	wait; \
-	rm $${fifofile}; \
-	echo; \
-	echo "The verbatim output of atf-run has been saved to" \
-	     "installcheck.log; exit was $${res}"; \
-	test $${res} -eq 0
-CLEANFILES += installcheck.fifo installcheck.log
-endif
-
-PHONY_TARGETS += installcheck-kyua
-if HAVE_KYUA
-installcheck-kyua:
-	cd $(pkgtestsdir) && $(TESTS_ENVIRONMENT) $(KYUA) test
-endif
-
-installcheck-targets: $(INSTALLCHECK_TARGETS)
-
-pkgtests_DATA = Kyuafile
-if ENABLE_TOOLS
-pkgtests_DATA += Atffile
-endif
-EXTRA_DIST += $(pkgtests_DATA)
-
-BUILD_SH_TP = \
-	echo "Creating $${dst}"; \
-	echo "\#! $(bindir)/atf-sh" >$${dst}; \
-	cat $${src} >>$${dst}; \
-	chmod +x $${dst}
-
-#
-# Custom targets.
-#
-
-dist-hook: forbid-dist
-if ENABLE_TOOLS
-forbid-dist:
-	@true
-else
-forbid-dist:
-	@echo "Sorry; cannot make dist without the tools enabled."
-	@echo "Please reconfigure with --enable-tools."
-	@false
-endif
-
-PHONY_TARGETS += clean-all
-clean-all:
-	GIT="$(GIT)" $(SH) $(srcdir)/admin/clean-all.sh
-
-PHONY_TARGETS += release
-release:
-	$(SH) $(srcdir)/admin/release.sh $(PACKAGE_VERSION) $(DIST_ARCHIVES)
-
-PHONY_TARGETS += release-test
-release-test:
-	$(SH) $(srcdir)/admin/release-test.sh $(DIST_ARCHIVES)
-
-.PHONY: $(PHONY_TARGETS)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/Makefile.in b/contrib/atf/Makefile.in
deleted file mode 100644
index e9a1c403508..00000000000
--- a/contrib/atf/Makefile.in
+++ /dev/null
@@ -1,5264 +0,0 @@
-# Makefile.in generated by automake 1.11.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# This Makefile.in 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-
-
-
-
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-bin_PROGRAMS = atf-sh/atf-sh$(EXEEXT) $(am__EXEEXT_1)
-libexec_PROGRAMS = atf-sh/atf-check$(EXEEXT)
-DIST_COMMON = README $(am__configure_deps) $(atf_c_HEADERS) \
-	$(atf_c___HEADERS) $(dist_man_MANS) $(include_HEADERS) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/admin/Makefile.am.inc \
-	$(srcdir)/atf-c++/Makefile.am.inc \
-	$(srcdir)/atf-c++/detail/Makefile.am.inc \
-	$(srcdir)/atf-c/Makefile.am.inc \
-	$(srcdir)/atf-c/detail/Makefile.am.inc \
-	$(srcdir)/atf-config/Makefile.am.inc \
-	$(srcdir)/atf-report/Makefile.am.inc \
-	$(srcdir)/atf-run/Makefile.am.inc \
-	$(srcdir)/atf-sh/Makefile.am.inc \
-	$(srcdir)/atf-version/Makefile.am.inc $(srcdir)/bconfig.h.in \
-	$(srcdir)/bootstrap/Makefile.am.inc \
-	$(srcdir)/doc/Makefile.am.inc \
-	$(srcdir)/test-programs/Makefile.am.inc \
-	$(top_srcdir)/atf-c/defs.h.in $(top_srcdir)/configure AUTHORS \
-	COPYING INSTALL NEWS TODO admin/compile admin/config.guess \
-	admin/config.sub admin/depcomp admin/install-sh \
-	admin/ltmain.sh admin/missing
-tests_atf_c_PROGRAMS = atf-c/atf_c_test$(EXEEXT) \
-	atf-c/build_test$(EXEEXT) atf-c/check_test$(EXEEXT) \
-	atf-c/config_test$(EXEEXT) atf-c/error_test$(EXEEXT) \
-	atf-c/macros_test$(EXEEXT) atf-c/tc_test$(EXEEXT) \
-	atf-c/tp_test$(EXEEXT) atf-c/utils_test$(EXEEXT)
-tests_atf_c_detail_PROGRAMS = atf-c/detail/dynstr_test$(EXEEXT) \
-	atf-c/detail/env_test$(EXEEXT) atf-c/detail/fs_test$(EXEEXT) \
-	atf-c/detail/test_helpers_test$(EXEEXT) \
-	atf-c/detail/list_test$(EXEEXT) atf-c/detail/map_test$(EXEEXT) \
-	atf-c/detail/process_helpers$(EXEEXT) \
-	atf-c/detail/process_test$(EXEEXT) \
-	atf-c/detail/sanity_test$(EXEEXT) \
-	atf-c/detail/text_test$(EXEEXT) \
-	atf-c/detail/user_test$(EXEEXT)
-tests_atf_c___PROGRAMS = atf-c++/atf_c++_test$(EXEEXT) \
-	atf-c++/build_test$(EXEEXT) atf-c++/check_test$(EXEEXT) \
-	atf-c++/config_test$(EXEEXT) atf-c++/macros_test$(EXEEXT) \
-	atf-c++/tests_test$(EXEEXT) atf-c++/utils_test$(EXEEXT)
-tests_atf_c___detail_PROGRAMS =  \
-	atf-c++/detail/application_test$(EXEEXT) \
-	atf-c++/detail/env_test$(EXEEXT) \
-	atf-c++/detail/exceptions_test$(EXEEXT) \
-	atf-c++/detail/expand_test$(EXEEXT) \
-	atf-c++/detail/fs_test$(EXEEXT) \
-	atf-c++/detail/parser_test$(EXEEXT) \
-	atf-c++/detail/process_test$(EXEEXT) \
-	atf-c++/detail/sanity_test$(EXEEXT) \
-	atf-c++/detail/text_test$(EXEEXT) \
-	atf-c++/detail/ui_test$(EXEEXT)
-check_PROGRAMS = bootstrap/h_app_empty$(EXEEXT) \
-	bootstrap/h_app_opts_args$(EXEEXT) \
-	bootstrap/h_tp_basic_c$(EXEEXT) \
-	bootstrap/h_tp_basic_cpp$(EXEEXT)
-@ENABLE_TOOLS_TRUE@am__append_1 = doc/atf.7
-@ENABLE_TOOLS_TRUE@am__append_2 = doc/atf.7
-@ENABLE_TOOLS_TRUE@am__append_3 = doc/atf.7.in
-@ENABLE_TOOLS_TRUE@am__append_4 = doc/atf-formats.5 \
-@ENABLE_TOOLS_TRUE@	atf-report/atf-report.1 \
-@ENABLE_TOOLS_TRUE@	atf-config/atf-config.1 atf-run/atf-run.1 \
-@ENABLE_TOOLS_TRUE@	atf-version/atf-version.1
-tests_test_programs_PROGRAMS = test-programs/c_helpers$(EXEEXT) \
-	test-programs/cpp_helpers$(EXEEXT)
-@ENABLE_TOOLS_TRUE@am__append_5 = atf-report/atf-report \
-@ENABLE_TOOLS_TRUE@	atf-config/atf-config atf-run/atf-run \
-@ENABLE_TOOLS_TRUE@	atf-version/atf-version
-@ENABLE_TOOLS_TRUE@am__append_6 = $(css_DATA) $(dtd_DATA) $(xsl_DATA) \
-@ENABLE_TOOLS_TRUE@	$(tests_atf_report_DATA) \
-@ENABLE_TOOLS_TRUE@	atf-report/integration_test.sh \
-@ENABLE_TOOLS_TRUE@	$(tests_atf_config_DATA) \
-@ENABLE_TOOLS_TRUE@	atf-config/integration_test.sh \
-@ENABLE_TOOLS_TRUE@	$(tests_atf_run_DATA) \
-@ENABLE_TOOLS_TRUE@	atf-run/integration_test.sh $(hooks_DATA) \
-@ENABLE_TOOLS_TRUE@	$(eg_DATA) atf-version/generate-revision.sh
-@ENABLE_TOOLS_TRUE@tests_atf_report_PROGRAMS =  \
-@ENABLE_TOOLS_TRUE@	atf-report/fail_helper$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-report/misc_helpers$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-report/pass_helper$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-report/reader_test$(EXEEXT)
-@ENABLE_TOOLS_TRUE@am__append_7 = atf-report/integration_test \
-@ENABLE_TOOLS_TRUE@	atf-config/integration_test \
-@ENABLE_TOOLS_TRUE@	atf-run/integration_test \
-@ENABLE_TOOLS_TRUE@	atf-version/revision.h \
-@ENABLE_TOOLS_TRUE@	atf-version/revision.h.stamp \
-@ENABLE_TOOLS_TRUE@	installcheck.fifo installcheck.log
-@ENABLE_TOOLS_TRUE@tests_atf_run_PROGRAMS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/atffile_test$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/bad_metadata_helper$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/config_test$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/expect_helpers$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/fs_test$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/io_test$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/misc_helpers$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/pass_helper$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/several_tcs_helper$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/requirements_test$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/signals_test$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/test_program_test$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/user_test$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/zero_tcs_helper$(EXEEXT)
-@ENABLE_TOOLS_TRUE@am__append_8 = atf-version/revision.h
-@ENABLE_TOOLS_TRUE@am__append_9 = atf-version/revision.h.stamp \
-@ENABLE_TOOLS_TRUE@	installcheck-atf
-@ENABLE_TOOLS_TRUE@am__append_10 = installcheck-atf
-@ENABLE_TOOLS_TRUE@am__append_11 = Atffile
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/compiler-flags.m4 \
-	$(top_srcdir)/m4/cxx-std-funcs.m4 \
-	$(top_srcdir)/m4/developer-mode.m4 $(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)/m4/module-application.m4 \
-	$(top_srcdir)/m4/module-defs.m4 $(top_srcdir)/m4/module-env.m4 \
-	$(top_srcdir)/m4/module-fs.m4 \
-	$(top_srcdir)/m4/module-sanity.m4 \
-	$(top_srcdir)/m4/module-signals.m4 \
-	$(top_srcdir)/m4/runtime-tool.m4 $(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 \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = bconfig.h
-CONFIG_CLEAN_FILES = atf-c/defs.h
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(tests_atf_cdir)" \
-	"$(DESTDIR)$(tests_atf_c__dir)" \
-	"$(DESTDIR)$(tests_atf_c___detaildir)" \
-	"$(DESTDIR)$(tests_atf_c_detaildir)" \
-	"$(DESTDIR)$(tests_atf_reportdir)" \
-	"$(DESTDIR)$(tests_atf_rundir)" \
-	"$(DESTDIR)$(tests_test_programsdir)" \
-	"$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" \
-	"$(DESTDIR)$(tests_atf_configdir)" \
-	"$(DESTDIR)$(tests_atf_reportdir)" \
-	"$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" \
-	"$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" \
-	"$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" \
-	"$(DESTDIR)$(atf_aclocaldir)" \
-	"$(DESTDIR)$(atf_c__dirpkgconfigdir)" \
-	"$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" \
-	"$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(cssdir)" \
-	"$(DESTDIR)$(docdir)" "$(DESTDIR)$(dtddir)" \
-	"$(DESTDIR)$(egdir)" "$(DESTDIR)$(hooksdir)" \
-	"$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" \
-	"$(DESTDIR)$(tests_atf_c__dir)" \
-	"$(DESTDIR)$(tests_atf_c___detaildir)" \
-	"$(DESTDIR)$(tests_atf_c_detaildir)" \
-	"$(DESTDIR)$(tests_atf_configdir)" \
-	"$(DESTDIR)$(tests_atf_reportdir)" \
-	"$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" \
-	"$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(xsldir)" \
-	"$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" \
-	"$(DESTDIR)$(includedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
-atf_c___detail_libtest_helpers_la_LIBADD =
-am__dirstamp = $(am__leading_dot)dirstamp
-am_atf_c___detail_libtest_helpers_la_OBJECTS =  \
-	atf-c++/detail/test_helpers.lo
-atf_c___detail_libtest_helpers_la_OBJECTS =  \
-	$(am_atf_c___detail_libtest_helpers_la_OBJECTS)
-atf_c_detail_libtest_helpers_la_LIBADD =
-am_atf_c_detail_libtest_helpers_la_OBJECTS =  \
-	atf-c/detail/atf_c_detail_libtest_helpers_la-test_helpers.lo
-atf_c_detail_libtest_helpers_la_OBJECTS =  \
-	$(am_atf_c_detail_libtest_helpers_la_OBJECTS)
-libatf_c___la_DEPENDENCIES = libatf-c.la
-am_libatf_c___la_OBJECTS = atf-c++/build.lo atf-c++/check.lo \
-	atf-c++/config.lo atf-c++/tests.lo \
-	atf-c++/detail/application.lo atf-c++/detail/env.lo \
-	atf-c++/detail/exceptions.lo atf-c++/detail/expand.lo \
-	atf-c++/detail/fs.lo atf-c++/detail/parser.lo \
-	atf-c++/detail/process.lo atf-c++/detail/text.lo \
-	atf-c++/detail/ui.lo
-libatf_c___la_OBJECTS = $(am_libatf_c___la_OBJECTS)
-libatf_c___la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-	$(CXXFLAGS) $(libatf_c___la_LDFLAGS) $(LDFLAGS) -o $@
-libatf_c_la_LIBADD =
-am_libatf_c_la_OBJECTS = atf-c/libatf_c_la-build.lo \
-	atf-c/libatf_c_la-check.lo atf-c/libatf_c_la-config.lo \
-	atf-c/libatf_c_la-error.lo atf-c/libatf_c_la-tc.lo \
-	atf-c/libatf_c_la-tp.lo atf-c/libatf_c_la-utils.lo \
-	atf-c/detail/libatf_c_la-dynstr.lo \
-	atf-c/detail/libatf_c_la-env.lo atf-c/detail/libatf_c_la-fs.lo \
-	atf-c/detail/libatf_c_la-list.lo \
-	atf-c/detail/libatf_c_la-map.lo \
-	atf-c/detail/libatf_c_la-process.lo \
-	atf-c/detail/libatf_c_la-sanity.lo \
-	atf-c/detail/libatf_c_la-text.lo \
-	atf-c/detail/libatf_c_la-tp_main.lo \
-	atf-c/detail/libatf_c_la-user.lo
-nodist_libatf_c_la_OBJECTS =
-libatf_c_la_OBJECTS = $(am_libatf_c_la_OBJECTS) \
-	$(nodist_libatf_c_la_OBJECTS)
-libatf_c_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(libatf_c_la_LDFLAGS) $(LDFLAGS) -o $@
-@ENABLE_TOOLS_TRUE@am__EXEEXT_1 = atf-report/atf-report$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-config/atf-config$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf-run$(EXEEXT) \
-@ENABLE_TOOLS_TRUE@	atf-version/atf-version$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS) $(tests_atf_c_PROGRAMS) \
-	$(tests_atf_c___PROGRAMS) $(tests_atf_c___detail_PROGRAMS) \
-	$(tests_atf_c_detail_PROGRAMS) $(tests_atf_report_PROGRAMS) \
-	$(tests_atf_run_PROGRAMS) $(tests_test_programs_PROGRAMS)
-am_atf_c___atf_c___test_OBJECTS = atf-c++/atf_c++_test.$(OBJEXT)
-atf_c___atf_c___test_OBJECTS = $(am_atf_c___atf_c___test_OBJECTS)
-atf_c___atf_c___test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \
-	$(ATF_CXX_LIBS)
-am_atf_c___build_test_OBJECTS = atf-c++/build_test.$(OBJEXT)
-atf_c___build_test_OBJECTS = $(am_atf_c___build_test_OBJECTS)
-atf_c___build_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \
-	$(ATF_CXX_LIBS)
-am_atf_c___check_test_OBJECTS = atf-c++/check_test.$(OBJEXT)
-atf_c___check_test_OBJECTS = $(am_atf_c___check_test_OBJECTS)
-atf_c___check_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \
-	$(ATF_CXX_LIBS)
-am_atf_c___config_test_OBJECTS = atf-c++/config_test.$(OBJEXT)
-atf_c___config_test_OBJECTS = $(am_atf_c___config_test_OBJECTS)
-atf_c___config_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \
-	$(ATF_CXX_LIBS)
-am_atf_c___detail_application_test_OBJECTS =  \
-	atf-c++/detail/application_test.$(OBJEXT)
-atf_c___detail_application_test_OBJECTS =  \
-	$(am_atf_c___detail_application_test_OBJECTS)
-atf_c___detail_application_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_env_test_OBJECTS =  \
-	atf-c++/detail/env_test.$(OBJEXT)
-atf_c___detail_env_test_OBJECTS =  \
-	$(am_atf_c___detail_env_test_OBJECTS)
-atf_c___detail_env_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_exceptions_test_OBJECTS =  \
-	atf-c++/detail/exceptions_test.$(OBJEXT)
-atf_c___detail_exceptions_test_OBJECTS =  \
-	$(am_atf_c___detail_exceptions_test_OBJECTS)
-atf_c___detail_exceptions_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_expand_test_OBJECTS =  \
-	atf-c++/detail/expand_test.$(OBJEXT)
-atf_c___detail_expand_test_OBJECTS =  \
-	$(am_atf_c___detail_expand_test_OBJECTS)
-atf_c___detail_expand_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_fs_test_OBJECTS = atf-c++/detail/fs_test.$(OBJEXT)
-atf_c___detail_fs_test_OBJECTS = $(am_atf_c___detail_fs_test_OBJECTS)
-atf_c___detail_fs_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_parser_test_OBJECTS =  \
-	atf-c++/detail/parser_test.$(OBJEXT)
-atf_c___detail_parser_test_OBJECTS =  \
-	$(am_atf_c___detail_parser_test_OBJECTS)
-atf_c___detail_parser_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_process_test_OBJECTS =  \
-	atf-c++/detail/process_test.$(OBJEXT)
-atf_c___detail_process_test_OBJECTS =  \
-	$(am_atf_c___detail_process_test_OBJECTS)
-atf_c___detail_process_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_sanity_test_OBJECTS =  \
-	atf-c++/detail/sanity_test.$(OBJEXT)
-atf_c___detail_sanity_test_OBJECTS =  \
-	$(am_atf_c___detail_sanity_test_OBJECTS)
-atf_c___detail_sanity_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_text_test_OBJECTS =  \
-	atf-c++/detail/text_test.$(OBJEXT)
-atf_c___detail_text_test_OBJECTS =  \
-	$(am_atf_c___detail_text_test_OBJECTS)
-atf_c___detail_text_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___detail_ui_test_OBJECTS = atf-c++/detail/ui_test.$(OBJEXT)
-atf_c___detail_ui_test_OBJECTS = $(am_atf_c___detail_ui_test_OBJECTS)
-atf_c___detail_ui_test_DEPENDENCIES =  \
-	atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-am_atf_c___macros_test_OBJECTS = atf-c++/macros_test.$(OBJEXT)
-atf_c___macros_test_OBJECTS = $(am_atf_c___macros_test_OBJECTS)
-atf_c___macros_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \
-	$(ATF_CXX_LIBS)
-am_atf_c___tests_test_OBJECTS = atf-c++/tests_test.$(OBJEXT)
-atf_c___tests_test_OBJECTS = $(am_atf_c___tests_test_OBJECTS)
-atf_c___tests_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \
-	$(ATF_CXX_LIBS)
-am_atf_c___utils_test_OBJECTS = atf-c++/utils_test.$(OBJEXT)
-atf_c___utils_test_OBJECTS = $(am_atf_c___utils_test_OBJECTS)
-atf_c___utils_test_DEPENDENCIES = atf-c++/detail/libtest_helpers.la \
-	$(ATF_CXX_LIBS)
-am_atf_c_atf_c_test_OBJECTS = atf-c/atf_c_test.$(OBJEXT)
-atf_c_atf_c_test_OBJECTS = $(am_atf_c_atf_c_test_OBJECTS)
-atf_c_atf_c_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_build_test_OBJECTS = atf-c/build_test.$(OBJEXT)
-atf_c_build_test_OBJECTS = $(am_atf_c_build_test_OBJECTS)
-atf_c_build_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_check_test_OBJECTS = atf-c/check_test.$(OBJEXT)
-atf_c_check_test_OBJECTS = $(am_atf_c_check_test_OBJECTS)
-atf_c_check_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_config_test_OBJECTS = atf-c/config_test.$(OBJEXT)
-atf_c_config_test_OBJECTS = $(am_atf_c_config_test_OBJECTS)
-atf_c_config_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_detail_dynstr_test_OBJECTS =  \
-	atf-c/detail/dynstr_test.$(OBJEXT)
-atf_c_detail_dynstr_test_OBJECTS =  \
-	$(am_atf_c_detail_dynstr_test_OBJECTS)
-atf_c_detail_dynstr_test_DEPENDENCIES =  \
-	atf-c/detail/libtest_helpers.la libatf-c.la
-am_atf_c_detail_env_test_OBJECTS = atf-c/detail/env_test.$(OBJEXT)
-atf_c_detail_env_test_OBJECTS = $(am_atf_c_detail_env_test_OBJECTS)
-atf_c_detail_env_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_detail_fs_test_OBJECTS = atf-c/detail/fs_test.$(OBJEXT)
-atf_c_detail_fs_test_OBJECTS = $(am_atf_c_detail_fs_test_OBJECTS)
-atf_c_detail_fs_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_detail_list_test_OBJECTS = atf-c/detail/list_test.$(OBJEXT)
-atf_c_detail_list_test_OBJECTS = $(am_atf_c_detail_list_test_OBJECTS)
-atf_c_detail_list_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_detail_map_test_OBJECTS = atf-c/detail/map_test.$(OBJEXT)
-atf_c_detail_map_test_OBJECTS = $(am_atf_c_detail_map_test_OBJECTS)
-atf_c_detail_map_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_detail_process_helpers_OBJECTS =  \
-	atf-c/detail/process_helpers.$(OBJEXT)
-atf_c_detail_process_helpers_OBJECTS =  \
-	$(am_atf_c_detail_process_helpers_OBJECTS)
-atf_c_detail_process_helpers_LDADD = $(LDADD)
-am_atf_c_detail_process_test_OBJECTS =  \
-	atf-c/detail/process_test.$(OBJEXT)
-atf_c_detail_process_test_OBJECTS =  \
-	$(am_atf_c_detail_process_test_OBJECTS)
-atf_c_detail_process_test_DEPENDENCIES =  \
-	atf-c/detail/libtest_helpers.la libatf-c.la
-am_atf_c_detail_sanity_test_OBJECTS =  \
-	atf-c/detail/sanity_test.$(OBJEXT)
-atf_c_detail_sanity_test_OBJECTS =  \
-	$(am_atf_c_detail_sanity_test_OBJECTS)
-atf_c_detail_sanity_test_DEPENDENCIES =  \
-	atf-c/detail/libtest_helpers.la libatf-c.la
-am_atf_c_detail_test_helpers_test_OBJECTS =  \
-	atf-c/detail/test_helpers_test.$(OBJEXT)
-atf_c_detail_test_helpers_test_OBJECTS =  \
-	$(am_atf_c_detail_test_helpers_test_OBJECTS)
-atf_c_detail_test_helpers_test_DEPENDENCIES =  \
-	atf-c/detail/libtest_helpers.la libatf-c.la
-am_atf_c_detail_text_test_OBJECTS = atf-c/detail/text_test.$(OBJEXT)
-atf_c_detail_text_test_OBJECTS = $(am_atf_c_detail_text_test_OBJECTS)
-atf_c_detail_text_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_detail_user_test_OBJECTS = atf-c/detail/user_test.$(OBJEXT)
-atf_c_detail_user_test_OBJECTS = $(am_atf_c_detail_user_test_OBJECTS)
-atf_c_detail_user_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_error_test_OBJECTS = atf-c/error_test.$(OBJEXT)
-atf_c_error_test_OBJECTS = $(am_atf_c_error_test_OBJECTS)
-atf_c_error_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_macros_test_OBJECTS = atf-c/macros_test.$(OBJEXT)
-atf_c_macros_test_OBJECTS = $(am_atf_c_macros_test_OBJECTS)
-atf_c_macros_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_tc_test_OBJECTS = atf-c/tc_test.$(OBJEXT)
-atf_c_tc_test_OBJECTS = $(am_atf_c_tc_test_OBJECTS)
-atf_c_tc_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_tp_test_OBJECTS = atf-c/tp_test.$(OBJEXT)
-atf_c_tp_test_OBJECTS = $(am_atf_c_tp_test_OBJECTS)
-atf_c_tp_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am_atf_c_utils_test_OBJECTS = atf-c/utils_test.$(OBJEXT)
-atf_c_utils_test_OBJECTS = $(am_atf_c_utils_test_OBJECTS)
-atf_c_utils_test_DEPENDENCIES = atf-c/detail/libtest_helpers.la \
-	libatf-c.la
-am__atf_config_atf_config_SOURCES_DIST = atf-config/atf-config.cpp
-@ENABLE_TOOLS_TRUE@am_atf_config_atf_config_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-config/atf-config.$(OBJEXT)
-atf_config_atf_config_OBJECTS = $(am_atf_config_atf_config_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_config_atf_config_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_report_atf_report_SOURCES_DIST = atf-report/atf-report.cpp \
-	atf-report/reader.cpp atf-report/reader.hpp
-@ENABLE_TOOLS_TRUE@am_atf_report_atf_report_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-report/atf-report.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-report/reader.$(OBJEXT)
-atf_report_atf_report_OBJECTS = $(am_atf_report_atf_report_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_report_atf_report_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_report_fail_helper_SOURCES_DIST = atf-report/fail_helper.cpp
-@ENABLE_TOOLS_TRUE@am_atf_report_fail_helper_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-report/fail_helper.$(OBJEXT)
-atf_report_fail_helper_OBJECTS = $(am_atf_report_fail_helper_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_report_fail_helper_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_report_misc_helpers_SOURCES_DIST =  \
-	atf-report/misc_helpers.cpp
-@ENABLE_TOOLS_TRUE@am_atf_report_misc_helpers_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-report/misc_helpers.$(OBJEXT)
-atf_report_misc_helpers_OBJECTS =  \
-	$(am_atf_report_misc_helpers_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_report_misc_helpers_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_report_pass_helper_SOURCES_DIST = atf-report/pass_helper.cpp
-@ENABLE_TOOLS_TRUE@am_atf_report_pass_helper_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-report/pass_helper.$(OBJEXT)
-atf_report_pass_helper_OBJECTS = $(am_atf_report_pass_helper_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_report_pass_helper_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_report_reader_test_SOURCES_DIST = atf-report/reader_test.cpp \
-	atf-report/reader.cpp
-@ENABLE_TOOLS_TRUE@am_atf_report_reader_test_OBJECTS = atf-report/atf_report_reader_test-reader_test.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-report/atf_report_reader_test-reader.$(OBJEXT)
-atf_report_reader_test_OBJECTS = $(am_atf_report_reader_test_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_report_reader_test_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	atf-c++/detail/libtest_helpers.la \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_run_atf_run_SOURCES_DIST = atf-run/atf-run.cpp \
-	atf-run/atffile.cpp atf-run/atffile.hpp atf-run/config.cpp \
-	atf-run/config.hpp atf-run/fs.cpp atf-run/fs.hpp \
-	atf-run/io.cpp atf-run/io.hpp atf-run/requirements.cpp \
-	atf-run/requirements.hpp atf-run/signals.cpp \
-	atf-run/signals.hpp atf-run/test-program.cpp \
-	atf-run/test-program.hpp atf-run/timer.cpp atf-run/timer.hpp \
-	atf-run/user.cpp atf-run/user.hpp
-@ENABLE_TOOLS_TRUE@am_atf_run_atf_run_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-atf-run.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-atffile.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-config.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-fs.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-io.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-requirements.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-signals.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-test-program.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-timer.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atf_run-user.$(OBJEXT)
-atf_run_atf_run_OBJECTS = $(am_atf_run_atf_run_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_atf_run_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_run_atffile_test_SOURCES_DIST = atf-run/atffile_test.cpp \
-	atf-run/atffile.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_atffile_test_OBJECTS = atf-run/atf_run_atffile_test-atffile_test.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_atffile_test-atffile.$(OBJEXT)
-atf_run_atffile_test_OBJECTS = $(am_atf_run_atffile_test_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_atffile_test_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	atf-c++/detail/libtest_helpers.la \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_run_bad_metadata_helper_SOURCES_DIST =  \
-	atf-run/bad_metadata_helper.c
-@ENABLE_TOOLS_TRUE@am_atf_run_bad_metadata_helper_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/bad_metadata_helper.$(OBJEXT)
-atf_run_bad_metadata_helper_OBJECTS =  \
-	$(am_atf_run_bad_metadata_helper_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_bad_metadata_helper_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	libatf-c.la
-am__atf_run_config_test_SOURCES_DIST = atf-run/config_test.cpp \
-	atf-run/config.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_config_test_OBJECTS = atf-run/atf_run_config_test-config_test.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_config_test-config.$(OBJEXT)
-atf_run_config_test_OBJECTS = $(am_atf_run_config_test_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_config_test_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	atf-c++/detail/libtest_helpers.la \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_run_expect_helpers_SOURCES_DIST = atf-run/expect_helpers.c
-@ENABLE_TOOLS_TRUE@am_atf_run_expect_helpers_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/expect_helpers.$(OBJEXT)
-atf_run_expect_helpers_OBJECTS = $(am_atf_run_expect_helpers_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_expect_helpers_DEPENDENCIES = libatf-c.la
-am__atf_run_fs_test_SOURCES_DIST = atf-run/fs_test.cpp atf-run/fs.cpp \
-	atf-run/user.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_fs_test_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/fs_test.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/fs.$(OBJEXT) atf-run/user.$(OBJEXT)
-atf_run_fs_test_OBJECTS = $(am_atf_run_fs_test_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_fs_test_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_run_io_test_SOURCES_DIST = atf-run/io_test.cpp atf-run/io.cpp \
-	atf-run/signals.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_io_test_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/io_test.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/io.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/signals.$(OBJEXT)
-atf_run_io_test_OBJECTS = $(am_atf_run_io_test_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_io_test_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	atf-c++/detail/libtest_helpers.la \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_run_misc_helpers_SOURCES_DIST = atf-run/misc_helpers.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_misc_helpers_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/misc_helpers.$(OBJEXT)
-atf_run_misc_helpers_OBJECTS = $(am_atf_run_misc_helpers_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_misc_helpers_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_run_pass_helper_SOURCES_DIST = atf-run/pass_helper.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_pass_helper_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/pass_helper.$(OBJEXT)
-atf_run_pass_helper_OBJECTS = $(am_atf_run_pass_helper_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_pass_helper_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_run_requirements_test_SOURCES_DIST =  \
-	atf-run/requirements_test.cpp atf-run/requirements.cpp \
-	atf-run/user.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_requirements_test_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/requirements_test.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/requirements.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/user.$(OBJEXT)
-atf_run_requirements_test_OBJECTS =  \
-	$(am_atf_run_requirements_test_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_requirements_test_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_run_several_tcs_helper_SOURCES_DIST =  \
-	atf-run/several_tcs_helper.c
-@ENABLE_TOOLS_TRUE@am_atf_run_several_tcs_helper_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/several_tcs_helper.$(OBJEXT)
-atf_run_several_tcs_helper_OBJECTS =  \
-	$(am_atf_run_several_tcs_helper_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_several_tcs_helper_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	libatf-c.la
-am__atf_run_signals_test_SOURCES_DIST = atf-run/signals_test.cpp \
-	atf-run/signals.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_signals_test_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/signals_test.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/signals.$(OBJEXT)
-atf_run_signals_test_OBJECTS = $(am_atf_run_signals_test_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_signals_test_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_run_test_program_test_SOURCES_DIST =  \
-	atf-run/test_program_test.cpp atf-run/fs.cpp atf-run/io.cpp \
-	atf-run/requirements.cpp atf-run/signals.cpp \
-	atf-run/test-program.cpp atf-run/timer.cpp atf-run/user.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_test_program_test_OBJECTS = atf-run/atf_run_test_program_test-test_program_test.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_test_program_test-fs.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_test_program_test-io.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_test_program_test-requirements.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_test_program_test-signals.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_test_program_test-test-program.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_test_program_test-timer.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/atf_run_test_program_test-user.$(OBJEXT)
-atf_run_test_program_test_OBJECTS =  \
-	$(am_atf_run_test_program_test_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_test_program_test_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	atf-c++/detail/libtest_helpers.la \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am__atf_run_user_test_SOURCES_DIST = atf-run/user_test.cpp \
-	atf-run/user.cpp
-@ENABLE_TOOLS_TRUE@am_atf_run_user_test_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/user_test.$(OBJEXT) \
-@ENABLE_TOOLS_TRUE@	atf-run/user.$(OBJEXT)
-atf_run_user_test_OBJECTS = $(am_atf_run_user_test_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_user_test_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_run_zero_tcs_helper_SOURCES_DIST = atf-run/zero_tcs_helper.c
-@ENABLE_TOOLS_TRUE@am_atf_run_zero_tcs_helper_OBJECTS =  \
-@ENABLE_TOOLS_TRUE@	atf-run/zero_tcs_helper.$(OBJEXT)
-atf_run_zero_tcs_helper_OBJECTS =  \
-	$(am_atf_run_zero_tcs_helper_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_run_zero_tcs_helper_DEPENDENCIES = libatf-c.la
-am_atf_sh_atf_check_OBJECTS = atf-sh/atf-check.$(OBJEXT)
-atf_sh_atf_check_OBJECTS = $(am_atf_sh_atf_check_OBJECTS)
-atf_sh_atf_check_DEPENDENCIES = $(ATF_CXX_LIBS)
-am_atf_sh_atf_sh_OBJECTS = atf-sh/atf-sh.$(OBJEXT)
-atf_sh_atf_sh_OBJECTS = $(am_atf_sh_atf_sh_OBJECTS)
-atf_sh_atf_sh_DEPENDENCIES = $(ATF_CXX_LIBS)
-am__atf_version_atf_version_SOURCES_DIST =  \
-	atf-version/atf-version.cpp
-@ENABLE_TOOLS_TRUE@am_atf_version_atf_version_OBJECTS = atf-version/atf_version_atf_version-atf-version.$(OBJEXT)
-nodist_atf_version_atf_version_OBJECTS =
-atf_version_atf_version_OBJECTS =  \
-	$(am_atf_version_atf_version_OBJECTS) \
-	$(nodist_atf_version_atf_version_OBJECTS)
-@ENABLE_TOOLS_TRUE@atf_version_atf_version_DEPENDENCIES =  \
-@ENABLE_TOOLS_TRUE@	$(ATF_CXX_LIBS)
-am_bootstrap_h_app_empty_OBJECTS = bootstrap/h_app_empty.$(OBJEXT)
-bootstrap_h_app_empty_OBJECTS = $(am_bootstrap_h_app_empty_OBJECTS)
-bootstrap_h_app_empty_DEPENDENCIES = $(ATF_CXX_LIBS)
-am_bootstrap_h_app_opts_args_OBJECTS =  \
-	bootstrap/h_app_opts_args.$(OBJEXT)
-bootstrap_h_app_opts_args_OBJECTS =  \
-	$(am_bootstrap_h_app_opts_args_OBJECTS)
-bootstrap_h_app_opts_args_DEPENDENCIES = $(ATF_CXX_LIBS)
-am_bootstrap_h_tp_basic_c_OBJECTS = bootstrap/h_tp_basic_c.$(OBJEXT)
-bootstrap_h_tp_basic_c_OBJECTS = $(am_bootstrap_h_tp_basic_c_OBJECTS)
-bootstrap_h_tp_basic_c_DEPENDENCIES = libatf-c.la
-am_bootstrap_h_tp_basic_cpp_OBJECTS =  \
-	bootstrap/h_tp_basic_cpp.$(OBJEXT)
-bootstrap_h_tp_basic_cpp_OBJECTS =  \
-	$(am_bootstrap_h_tp_basic_cpp_OBJECTS)
-bootstrap_h_tp_basic_cpp_DEPENDENCIES = $(ATF_CXX_LIBS)
-am_test_programs_c_helpers_OBJECTS =  \
-	test-programs/c_helpers.$(OBJEXT)
-test_programs_c_helpers_OBJECTS =  \
-	$(am_test_programs_c_helpers_OBJECTS)
-test_programs_c_helpers_DEPENDENCIES = libatf-c.la
-am_test_programs_cpp_helpers_OBJECTS =  \
-	test-programs/cpp_helpers.$(OBJEXT)
-test_programs_cpp_helpers_OBJECTS =  \
-	$(am_test_programs_cpp_helpers_OBJECTS)
-test_programs_cpp_helpers_DEPENDENCIES = $(ATF_CXX_LIBS)
-SCRIPTS = $(tests_atf_c_SCRIPTS) $(tests_atf_c___SCRIPTS) \
-	$(tests_atf_config_SCRIPTS) $(tests_atf_report_SCRIPTS) \
-	$(tests_atf_run_SCRIPTS) $(tests_atf_sh_SCRIPTS) \
-	$(tests_test_programs_SCRIPTS)
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
-SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \
-	$(atf_c_detail_libtest_helpers_la_SOURCES) \
-	$(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \
-	$(nodist_libatf_c_la_SOURCES) $(atf_c___atf_c___test_SOURCES) \
-	$(atf_c___build_test_SOURCES) $(atf_c___check_test_SOURCES) \
-	$(atf_c___config_test_SOURCES) \
-	$(atf_c___detail_application_test_SOURCES) \
-	$(atf_c___detail_env_test_SOURCES) \
-	$(atf_c___detail_exceptions_test_SOURCES) \
-	$(atf_c___detail_expand_test_SOURCES) \
-	$(atf_c___detail_fs_test_SOURCES) \
-	$(atf_c___detail_parser_test_SOURCES) \
-	$(atf_c___detail_process_test_SOURCES) \
-	$(atf_c___detail_sanity_test_SOURCES) \
-	$(atf_c___detail_text_test_SOURCES) \
-	$(atf_c___detail_ui_test_SOURCES) \
-	$(atf_c___macros_test_SOURCES) $(atf_c___tests_test_SOURCES) \
-	$(atf_c___utils_test_SOURCES) $(atf_c_atf_c_test_SOURCES) \
-	$(atf_c_build_test_SOURCES) $(atf_c_check_test_SOURCES) \
-	$(atf_c_config_test_SOURCES) \
-	$(atf_c_detail_dynstr_test_SOURCES) \
-	$(atf_c_detail_env_test_SOURCES) \
-	$(atf_c_detail_fs_test_SOURCES) \
-	$(atf_c_detail_list_test_SOURCES) \
-	$(atf_c_detail_map_test_SOURCES) \
-	$(atf_c_detail_process_helpers_SOURCES) \
-	$(atf_c_detail_process_test_SOURCES) \
-	$(atf_c_detail_sanity_test_SOURCES) \
-	$(atf_c_detail_test_helpers_test_SOURCES) \
-	$(atf_c_detail_text_test_SOURCES) \
-	$(atf_c_detail_user_test_SOURCES) $(atf_c_error_test_SOURCES) \
-	$(atf_c_macros_test_SOURCES) $(atf_c_tc_test_SOURCES) \
-	$(atf_c_tp_test_SOURCES) $(atf_c_utils_test_SOURCES) \
-	$(atf_config_atf_config_SOURCES) \
-	$(atf_report_atf_report_SOURCES) \
-	$(atf_report_fail_helper_SOURCES) \
-	$(atf_report_misc_helpers_SOURCES) \
-	$(atf_report_pass_helper_SOURCES) \
-	$(atf_report_reader_test_SOURCES) $(atf_run_atf_run_SOURCES) \
-	$(atf_run_atffile_test_SOURCES) \
-	$(atf_run_bad_metadata_helper_SOURCES) \
-	$(atf_run_config_test_SOURCES) \
-	$(atf_run_expect_helpers_SOURCES) $(atf_run_fs_test_SOURCES) \
-	$(atf_run_io_test_SOURCES) $(atf_run_misc_helpers_SOURCES) \
-	$(atf_run_pass_helper_SOURCES) \
-	$(atf_run_requirements_test_SOURCES) \
-	$(atf_run_several_tcs_helper_SOURCES) \
-	$(atf_run_signals_test_SOURCES) \
-	$(atf_run_test_program_test_SOURCES) \
-	$(atf_run_user_test_SOURCES) \
-	$(atf_run_zero_tcs_helper_SOURCES) $(atf_sh_atf_check_SOURCES) \
-	$(atf_sh_atf_sh_SOURCES) $(atf_version_atf_version_SOURCES) \
-	$(nodist_atf_version_atf_version_SOURCES) \
-	$(bootstrap_h_app_empty_SOURCES) \
-	$(bootstrap_h_app_opts_args_SOURCES) \
-	$(bootstrap_h_tp_basic_c_SOURCES) \
-	$(bootstrap_h_tp_basic_cpp_SOURCES) \
-	$(test_programs_c_helpers_SOURCES) \
-	$(test_programs_cpp_helpers_SOURCES)
-DIST_SOURCES = $(atf_c___detail_libtest_helpers_la_SOURCES) \
-	$(atf_c_detail_libtest_helpers_la_SOURCES) \
-	$(libatf_c___la_SOURCES) $(libatf_c_la_SOURCES) \
-	$(atf_c___atf_c___test_SOURCES) $(atf_c___build_test_SOURCES) \
-	$(atf_c___check_test_SOURCES) $(atf_c___config_test_SOURCES) \
-	$(atf_c___detail_application_test_SOURCES) \
-	$(atf_c___detail_env_test_SOURCES) \
-	$(atf_c___detail_exceptions_test_SOURCES) \
-	$(atf_c___detail_expand_test_SOURCES) \
-	$(atf_c___detail_fs_test_SOURCES) \
-	$(atf_c___detail_parser_test_SOURCES) \
-	$(atf_c___detail_process_test_SOURCES) \
-	$(atf_c___detail_sanity_test_SOURCES) \
-	$(atf_c___detail_text_test_SOURCES) \
-	$(atf_c___detail_ui_test_SOURCES) \
-	$(atf_c___macros_test_SOURCES) $(atf_c___tests_test_SOURCES) \
-	$(atf_c___utils_test_SOURCES) $(atf_c_atf_c_test_SOURCES) \
-	$(atf_c_build_test_SOURCES) $(atf_c_check_test_SOURCES) \
-	$(atf_c_config_test_SOURCES) \
-	$(atf_c_detail_dynstr_test_SOURCES) \
-	$(atf_c_detail_env_test_SOURCES) \
-	$(atf_c_detail_fs_test_SOURCES) \
-	$(atf_c_detail_list_test_SOURCES) \
-	$(atf_c_detail_map_test_SOURCES) \
-	$(atf_c_detail_process_helpers_SOURCES) \
-	$(atf_c_detail_process_test_SOURCES) \
-	$(atf_c_detail_sanity_test_SOURCES) \
-	$(atf_c_detail_test_helpers_test_SOURCES) \
-	$(atf_c_detail_text_test_SOURCES) \
-	$(atf_c_detail_user_test_SOURCES) $(atf_c_error_test_SOURCES) \
-	$(atf_c_macros_test_SOURCES) $(atf_c_tc_test_SOURCES) \
-	$(atf_c_tp_test_SOURCES) $(atf_c_utils_test_SOURCES) \
-	$(am__atf_config_atf_config_SOURCES_DIST) \
-	$(am__atf_report_atf_report_SOURCES_DIST) \
-	$(am__atf_report_fail_helper_SOURCES_DIST) \
-	$(am__atf_report_misc_helpers_SOURCES_DIST) \
-	$(am__atf_report_pass_helper_SOURCES_DIST) \
-	$(am__atf_report_reader_test_SOURCES_DIST) \
-	$(am__atf_run_atf_run_SOURCES_DIST) \
-	$(am__atf_run_atffile_test_SOURCES_DIST) \
-	$(am__atf_run_bad_metadata_helper_SOURCES_DIST) \
-	$(am__atf_run_config_test_SOURCES_DIST) \
-	$(am__atf_run_expect_helpers_SOURCES_DIST) \
-	$(am__atf_run_fs_test_SOURCES_DIST) \
-	$(am__atf_run_io_test_SOURCES_DIST) \
-	$(am__atf_run_misc_helpers_SOURCES_DIST) \
-	$(am__atf_run_pass_helper_SOURCES_DIST) \
-	$(am__atf_run_requirements_test_SOURCES_DIST) \
-	$(am__atf_run_several_tcs_helper_SOURCES_DIST) \
-	$(am__atf_run_signals_test_SOURCES_DIST) \
-	$(am__atf_run_test_program_test_SOURCES_DIST) \
-	$(am__atf_run_user_test_SOURCES_DIST) \
-	$(am__atf_run_zero_tcs_helper_SOURCES_DIST) \
-	$(atf_sh_atf_check_SOURCES) $(atf_sh_atf_sh_SOURCES) \
-	$(am__atf_version_atf_version_SOURCES_DIST) \
-	$(bootstrap_h_app_empty_SOURCES) \
-	$(bootstrap_h_app_opts_args_SOURCES) \
-	$(bootstrap_h_tp_basic_c_SOURCES) \
-	$(bootstrap_h_tp_basic_cpp_SOURCES) \
-	$(test_programs_c_helpers_SOURCES) \
-	$(test_programs_cpp_helpers_SOURCES)
-man1dir = $(mandir)/man1
-man3dir = $(mandir)/man3
-man4dir = $(mandir)/man4
-man5dir = $(mandir)/man5
-man7dir = $(mandir)/man7
-NROFF = nroff
-MANS = $(dist_man_MANS) $(man_MANS)
-DATA = $(atf_aclocal_DATA) $(atf_c__dirpkgconfig_DATA) \
-	$(atf_cpkgconfig_DATA) $(atf_sh_DATA) $(atf_shpkgconfig_DATA) \
-	$(css_DATA) $(doc_DATA) $(dtd_DATA) $(eg_DATA) $(hooks_DATA) \
-	$(noinst_DATA) $(pkgtests_DATA) $(tests_atf_c_DATA) \
-	$(tests_atf_c___DATA) $(tests_atf_c___detail_DATA) \
-	$(tests_atf_c_detail_DATA) $(tests_atf_config_DATA) \
-	$(tests_atf_report_DATA) $(tests_atf_run_DATA) \
-	$(tests_atf_sh_DATA) $(tests_test_programs_DATA) $(xsl_DATA)
-HEADERS = $(atf_c_HEADERS) $(atf_c___HEADERS) $(include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  if test -d "$(distdir)"; then \
-    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-      && rm -rf "$(distdir)" \
-      || { sleep 5 && rm -rf "$(distdir)"; }; \
-  else :; fi
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AR = @AR@
-ATF_BUILD_CC = @ATF_BUILD_CC@
-ATF_BUILD_CFLAGS = @ATF_BUILD_CFLAGS@
-ATF_BUILD_CPP = @ATF_BUILD_CPP@
-ATF_BUILD_CPPFLAGS = @ATF_BUILD_CPPFLAGS@
-ATF_BUILD_CXX = @ATF_BUILD_CXX@
-ATF_BUILD_CXXFLAGS = @ATF_BUILD_CXXFLAGS@
-ATF_CONFSUBDIR = @ATF_CONFSUBDIR@
-ATF_SHELL = @ATF_SHELL@
-ATF_WORKDIR = @ATF_WORKDIR@
-ATTRIBUTE_FORMAT_PRINTF = @ATTRIBUTE_FORMAT_PRINTF@
-ATTRIBUTE_NORETURN = @ATTRIBUTE_NORETURN@
-ATTRIBUTE_UNUSED = @ATTRIBUTE_UNUSED@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_TOOLS = @ENABLE_TOOLS@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GDB = @GDB@
-GIT = @GIT@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KYUA = @KYUA@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-atf_aclocaldir = @atf_aclocaldir@
-atf_arch = @atf_arch@
-atf_confdir = @atf_confdir@
-atf_cssdir = @atf_cssdir@
-atf_dtddir = @atf_dtddir@
-atf_egdir = @atf_egdir@
-atf_machine = @atf_machine@
-atf_pkgconfigdir = @atf_pkgconfigdir@
-atf_xsldir = @atf_xsldir@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_srcdir = @target_srcdir@
-target_vendor = @target_vendor@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-atf_aclocal_DATA = atf-c/atf-common.m4 atf-c/atf-c.m4 \
-	atf-c++/atf-c++.m4 atf-sh/atf-sh.m4
-BUILT_SOURCES = $(am__append_8)
-CLEANFILES = atf-c/atf-c.pc atf-c/pkg_config_test atf-c++/atf-c++.pc \
-	atf-c++/pkg_config_test atf-sh/atf-sh.pc atf-sh/misc_helpers \
-	atf-sh/atf_check_test atf-sh/atf-check_test atf-sh/config_test \
-	atf-sh/integration_test atf-sh/normalize_test atf-sh/tc_test \
-	atf-sh/tp_test bootstrap/h_tp_basic_sh \
-	bootstrap/h_tp_atf_check_sh bootstrap/h_tp_fail \
-	bootstrap/h_tp_pass $(am__append_2) test-programs/sh_helpers \
-	test-programs/config_test test-programs/expect_test \
-	test-programs/fork_test test-programs/meta_data_test \
-	test-programs/result_test test-programs/srcdir_test \
-	$(am__append_7)
-EXTRA_DIST = admin/check-install.sh admin/check-style-common.awk \
-	admin/check-style-c.awk admin/check-style-cpp.awk \
-	admin/check-style-man.awk admin/check-style-shell.awk \
-	admin/check-style.sh atf-c/atf-common.m4 atf-c/atf-c.m4 \
-	atf-c/atf-c.pc.in $(tests_atf_c_DATA) atf-c/pkg_config_test.sh \
-	$(tests_atf_c_detail_DATA) atf-c++/atf-c++.m4 \
-	atf-c++/atf-c++.pc.in $(tests_atf_c___DATA) \
-	atf-c++/pkg_config_test.sh $(tests_atf_c___detail_DATA) \
-	$(atf_sh_DATA) atf-sh/atf-sh.m4 atf-sh/atf-sh.pc.in \
-	$(tests_atf_sh_DATA) atf-sh/misc_helpers.sh \
-	atf-sh/atf_check_test.sh atf-sh/atf-check_test.sh \
-	atf-sh/config_test.sh atf-sh/integration_test.sh \
-	atf-sh/normalize_test.sh atf-sh/tc_test.sh atf-sh/tp_test.sh \
-	bootstrap/h_tp_basic_sh.sh bootstrap/h_tp_atf_check_sh.sh \
-	bootstrap/h_tp_fail.sh bootstrap/h_tp_pass.sh \
-	bootstrap/testsuite bootstrap/package.m4 \
-	bootstrap/testsuite.at $(testsuite_incs) $(am__append_3) \
-	$(tests_test_programs_DATA) test-programs/common.sh \
-	test-programs/sh_helpers.sh test-programs/config_test.sh \
-	test-programs/expect_test.sh test-programs/fork_test.sh \
-	test-programs/meta_data_test.sh test-programs/result_test.sh \
-	test-programs/srcdir_test.sh $(am__append_6) $(doc_DATA) \
-	INSTALL README $(pkgtests_DATA)
-dist_man_MANS = atf-c/atf-c-api.3 atf-c++/atf-c++-api.3 \
-	atf-sh/atf-check.1 atf-sh/atf-sh.1 atf-sh/atf-sh-api.3 \
-	doc/atf-test-case.4 doc/atf-test-program.1 $(am__append_4)
-include_HEADERS = atf-c.h atf-c++.hpp
-lib_LTLIBRARIES = libatf-c.la libatf-c++.la
-man_MANS = $(am__append_1)
-noinst_DATA = INSTALL README
-noinst_LTLIBRARIES = atf-c/detail/libtest_helpers.la \
-	atf-c++/detail/libtest_helpers.la
-INSTALLCHECK_TARGETS = installcheck-bootstrap $(am__append_10)
-PHONY_TARGETS = check-install check-style installcheck-bootstrap \
-	$(am__append_9) installcheck-kyua clean-all release \
-	release-test
-ACLOCAL_AMFLAGS = -I m4
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-tools
-libatf_c_la_SOURCES = atf-c/build.c atf-c/build.h atf-c/check.c \
-	atf-c/check.h atf-c/config.c atf-c/config.h atf-c/error.c \
-	atf-c/error.h atf-c/error_fwd.h atf-c/macros.h atf-c/tc.c \
-	atf-c/tc.h atf-c/tp.c atf-c/tp.h atf-c/utils.c atf-c/utils.h \
-	atf-c/detail/dynstr.c atf-c/detail/dynstr.h atf-c/detail/env.c \
-	atf-c/detail/env.h atf-c/detail/fs.c atf-c/detail/fs.h \
-	atf-c/detail/list.c atf-c/detail/list.h atf-c/detail/map.c \
-	atf-c/detail/map.h atf-c/detail/process.c \
-	atf-c/detail/process.h atf-c/detail/sanity.c \
-	atf-c/detail/sanity.h atf-c/detail/text.c atf-c/detail/text.h \
-	atf-c/detail/tp_main.c atf-c/detail/user.c atf-c/detail/user.h
-nodist_libatf_c_la_SOURCES = atf-c/defs.h
-libatf_c_la_CPPFLAGS = "-DATF_ARCH=\"$(atf_arch)\"" \
-                       "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \
-                       "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \
-                       "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \
-                       "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \
-                       "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \
-                       "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \
-                       "-DATF_CONFDIR=\"$(atf_confdir)\"" \
-                       "-DATF_INCLUDEDIR=\"$(includedir)\"" \
-                       "-DATF_LIBDIR=\"$(libdir)\"" \
-                       "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \
-                       "-DATF_MACHINE=\"$(atf_machine)\"" \
-                       "-DATF_M4=\"$(ATF_M4)\"" \
-                       "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \
-                       "-DATF_SHELL=\"$(ATF_SHELL)\"" \
-                       "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" \
-                       -I$(srcdir)/atf-c
-
-libatf_c_la_LDFLAGS = -version-info 0:0:0
-atf_c_HEADERS = atf-c/build.h \
-                atf-c/check.h \
-                atf-c/config.h \
-                atf-c/defs.h \
-                atf-c/error.h \
-                atf-c/error_fwd.h \
-                atf-c/macros.h \
-                atf-c/tc.h \
-                atf-c/tp.h \
-                atf-c/utils.h
-
-atf_cdir = $(includedir)/atf-c
-atf_cpkgconfigdir = $(atf_pkgconfigdir)
-atf_cpkgconfig_DATA = atf-c/atf-c.pc
-tests_atf_c_DATA = atf-c/Atffile \
-                   atf-c/Kyuafile \
-                   atf-c/macros_h_test.c \
-                   atf-c/unused_test.c
-
-tests_atf_cdir = $(pkgtestsdir)/atf-c
-atf_c_atf_c_test_SOURCES = atf-c/atf_c_test.c
-atf_c_atf_c_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_build_test_SOURCES = atf-c/build_test.c atf-c/h_build.h
-atf_c_build_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_check_test_SOURCES = atf-c/check_test.c
-atf_c_check_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_config_test_SOURCES = atf-c/config_test.c
-atf_c_config_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_error_test_SOURCES = atf-c/error_test.c
-atf_c_error_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_macros_test_SOURCES = atf-c/macros_test.c
-atf_c_macros_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-tests_atf_c_SCRIPTS = atf-c/pkg_config_test
-atf_c_tc_test_SOURCES = atf-c/tc_test.c
-atf_c_tc_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_tp_test_SOURCES = atf-c/tp_test.c
-atf_c_tp_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_utils_test_SOURCES = atf-c/utils_test.c atf-c/h_build.h
-atf_c_utils_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-tests_atf_c_detail_DATA = atf-c/detail/Atffile \
-                          atf-c/detail/Kyuafile
-
-tests_atf_c_detaildir = $(pkgtestsdir)/atf-c/detail
-atf_c_detail_libtest_helpers_la_SOURCES = atf-c/detail/test_helpers.c \
-                                          atf-c/detail/test_helpers.h
-
-atf_c_detail_libtest_helpers_la_CPPFLAGS = -I$(srcdir)/atf-c
-atf_c_detail_dynstr_test_SOURCES = atf-c/detail/dynstr_test.c
-atf_c_detail_dynstr_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_detail_env_test_SOURCES = atf-c/detail/env_test.c
-atf_c_detail_env_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_detail_fs_test_SOURCES = atf-c/detail/fs_test.c
-atf_c_detail_fs_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_detail_test_helpers_test_SOURCES = atf-c/detail/test_helpers_test.c
-atf_c_detail_test_helpers_test_LDADD = atf-c/detail/libtest_helpers.la \
-                                       libatf-c.la
-
-atf_c_detail_list_test_SOURCES = atf-c/detail/list_test.c
-atf_c_detail_list_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_detail_map_test_SOURCES = atf-c/detail/map_test.c
-atf_c_detail_map_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_detail_process_helpers_SOURCES = atf-c/detail/process_helpers.c
-atf_c_detail_process_test_SOURCES = atf-c/detail/process_test.c
-atf_c_detail_process_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_detail_sanity_test_SOURCES = atf-c/detail/sanity_test.c
-atf_c_detail_sanity_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_detail_text_test_SOURCES = atf-c/detail/text_test.c
-atf_c_detail_text_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-atf_c_detail_user_test_SOURCES = atf-c/detail/user_test.c
-atf_c_detail_user_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-ATF_CXX_LIBS = libatf-c++.la libatf-c.la
-libatf_c___la_LIBADD = libatf-c.la
-libatf_c___la_SOURCES = atf-c++/build.cpp atf-c++/build.hpp \
-	atf-c++/check.cpp atf-c++/check.hpp atf-c++/config.cpp \
-	atf-c++/config.hpp atf-c++/macros.hpp atf-c++/tests.cpp \
-	atf-c++/tests.hpp atf-c++/utils.hpp \
-	atf-c++/detail/application.cpp atf-c++/detail/application.hpp \
-	atf-c++/detail/env.cpp atf-c++/detail/env.hpp \
-	atf-c++/detail/exceptions.cpp atf-c++/detail/exceptions.hpp \
-	atf-c++/detail/expand.cpp atf-c++/detail/expand.hpp \
-	atf-c++/detail/fs.cpp atf-c++/detail/fs.hpp \
-	atf-c++/detail/parser.cpp atf-c++/detail/parser.hpp \
-	atf-c++/detail/process.cpp atf-c++/detail/process.hpp \
-	atf-c++/detail/sanity.hpp atf-c++/detail/text.cpp \
-	atf-c++/detail/text.hpp atf-c++/detail/ui.cpp \
-	atf-c++/detail/ui.hpp
-libatf_c___la_LDFLAGS = -version-info 0:0:0
-atf_c___HEADERS = atf-c++/build.hpp \
-                  atf-c++/check.hpp \
-                  atf-c++/config.hpp \
-                  atf-c++/macros.hpp \
-                  atf-c++/tests.hpp \
-                  atf-c++/utils.hpp
-
-atf_c__dir = $(includedir)/atf-c++
-atf_c__dirpkgconfigdir = $(atf_pkgconfigdir)
-atf_c__dirpkgconfig_DATA = atf-c++/atf-c++.pc
-tests_atf_c___DATA = atf-c++/Atffile \
-                     atf-c++/Kyuafile \
-                     atf-c++/macros_hpp_test.cpp \
-                     atf-c++/unused_test.cpp
-
-tests_atf_c__dir = $(pkgtestsdir)/atf-c++
-atf_c___atf_c___test_SOURCES = atf-c++/atf_c++_test.cpp
-atf_c___atf_c___test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___build_test_SOURCES = atf-c++/build_test.cpp atf-c/h_build.h
-atf_c___build_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___check_test_SOURCES = atf-c++/check_test.cpp
-atf_c___check_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___config_test_SOURCES = atf-c++/config_test.cpp
-atf_c___config_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___macros_test_SOURCES = atf-c++/macros_test.cpp
-atf_c___macros_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-tests_atf_c___SCRIPTS = atf-c++/pkg_config_test
-atf_c___tests_test_SOURCES = atf-c++/tests_test.cpp
-atf_c___tests_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___utils_test_SOURCES = atf-c++/utils_test.cpp
-atf_c___utils_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-tests_atf_c___detail_DATA = atf-c++/detail/Atffile \
-                            atf-c++/detail/Kyuafile
-
-tests_atf_c___detaildir = $(pkgtestsdir)/atf-c++/detail
-atf_c___detail_libtest_helpers_la_SOURCES = atf-c++/detail/test_helpers.cpp \
-                                            atf-c++/detail/test_helpers.hpp
-
-atf_c___detail_application_test_SOURCES = atf-c++/detail/application_test.cpp
-atf_c___detail_application_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___detail_env_test_SOURCES = atf-c++/detail/env_test.cpp
-atf_c___detail_env_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___detail_exceptions_test_SOURCES = atf-c++/detail/exceptions_test.cpp
-atf_c___detail_exceptions_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___detail_expand_test_SOURCES = atf-c++/detail/expand_test.cpp
-atf_c___detail_expand_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___detail_fs_test_SOURCES = atf-c++/detail/fs_test.cpp
-atf_c___detail_fs_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___detail_parser_test_SOURCES = atf-c++/detail/parser_test.cpp
-atf_c___detail_parser_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___detail_process_test_SOURCES = atf-c++/detail/process_test.cpp
-atf_c___detail_process_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___detail_sanity_test_SOURCES = atf-c++/detail/sanity_test.cpp
-atf_c___detail_sanity_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___detail_text_test_SOURCES = atf-c++/detail/text_test.cpp
-atf_c___detail_text_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_c___detail_ui_test_SOURCES = atf-c++/detail/ui_test.cpp
-atf_c___detail_ui_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-atf_sh_atf_check_SOURCES = atf-sh/atf-check.cpp
-atf_sh_atf_check_LDADD = $(ATF_CXX_LIBS)
-atf_sh_atf_sh_SOURCES = atf-sh/atf-sh.cpp
-atf_sh_atf_sh_LDADD = $(ATF_CXX_LIBS)
-atf_sh_DATA = atf-sh/libatf-sh.subr
-atf_shdir = $(pkgdatadir)
-atf_shpkgconfigdir = $(atf_pkgconfigdir)
-atf_shpkgconfig_DATA = atf-sh/atf-sh.pc
-tests_atf_sh_DATA = atf-sh/Atffile \
-                    atf-sh/Kyuafile
-
-tests_atf_shdir = $(pkgtestsdir)/atf-sh
-tests_atf_sh_SCRIPTS = atf-sh/misc_helpers atf-sh/atf_check_test \
-	atf-sh/atf-check_test atf-sh/config_test \
-	atf-sh/integration_test atf-sh/normalize_test atf-sh/tc_test \
-	atf-sh/tp_test
-bootstrap_h_app_empty_SOURCES = bootstrap/h_app_empty.cpp
-bootstrap_h_app_empty_LDADD = $(ATF_CXX_LIBS)
-bootstrap_h_app_opts_args_SOURCES = bootstrap/h_app_opts_args.cpp
-bootstrap_h_app_opts_args_LDADD = $(ATF_CXX_LIBS)
-bootstrap_h_tp_basic_c_SOURCES = bootstrap/h_tp_basic_c.c
-bootstrap_h_tp_basic_c_LDADD = libatf-c.la
-bootstrap_h_tp_basic_cpp_SOURCES = bootstrap/h_tp_basic_cpp.cpp
-bootstrap_h_tp_basic_cpp_LDADD = $(ATF_CXX_LIBS)
-check_SCRIPTS = bootstrap/h_tp_basic_sh bootstrap/h_tp_atf_check_sh \
-	bootstrap/h_tp_fail bootstrap/h_tp_pass
-DISTCLEANFILES = \
-		bootstrap/atconfig \
-		testsuite.lineno \
-		testsuite.log
-
-testsuite_incs = $(srcdir)/bootstrap/t_application_help.at \
-		$(srcdir)/bootstrap/t_application_opts_args.at \
-		$(srcdir)/bootstrap/t_atf_config.at \
-		$(srcdir)/bootstrap/t_atf_run.at \
-		$(srcdir)/bootstrap/t_subr_atf_check.at \
-		$(srcdir)/bootstrap/t_test_program_compare.at \
-		$(srcdir)/bootstrap/t_test_program_filter.at \
-		$(srcdir)/bootstrap/t_test_program_list.at \
-		$(srcdir)/bootstrap/t_test_program_run.at
-
-tests_test_programs_DATA = test-programs/Atffile \
-                           test-programs/Kyuafile
-
-tests_test_programsdir = $(pkgtestsdir)/test-programs
-test_programs_c_helpers_SOURCES = test-programs/c_helpers.c
-test_programs_c_helpers_LDADD = libatf-c.la
-test_programs_cpp_helpers_SOURCES = test-programs/cpp_helpers.cpp
-test_programs_cpp_helpers_LDADD = $(ATF_CXX_LIBS)
-common_sh = $(srcdir)/test-programs/common.sh
-tests_test_programs_SCRIPTS = test-programs/sh_helpers \
-	test-programs/config_test test-programs/expect_test \
-	test-programs/fork_test test-programs/meta_data_test \
-	test-programs/result_test test-programs/srcdir_test
-@ENABLE_TOOLS_TRUE@atf_report_atf_report_SOURCES = atf-report/atf-report.cpp \
-@ENABLE_TOOLS_TRUE@                                atf-report/reader.cpp \
-@ENABLE_TOOLS_TRUE@                                atf-report/reader.hpp
-
-@ENABLE_TOOLS_TRUE@atf_report_atf_report_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@cssdir = $(atf_cssdir)
-@ENABLE_TOOLS_TRUE@css_DATA = atf-report/tests-results.css
-@ENABLE_TOOLS_TRUE@dtddir = $(atf_dtddir)
-@ENABLE_TOOLS_TRUE@dtd_DATA = atf-report/tests-results.dtd
-@ENABLE_TOOLS_TRUE@xsldir = $(atf_xsldir)
-@ENABLE_TOOLS_TRUE@xsl_DATA = atf-report/tests-results.xsl
-@ENABLE_TOOLS_TRUE@tests_atf_report_DATA = atf-report/Atffile \
-@ENABLE_TOOLS_TRUE@                        atf-report/Kyuafile
-
-@ENABLE_TOOLS_TRUE@tests_atf_reportdir = $(pkgtestsdir)/atf-report
-@ENABLE_TOOLS_TRUE@atf_report_fail_helper_SOURCES = atf-report/fail_helper.cpp
-@ENABLE_TOOLS_TRUE@atf_report_fail_helper_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_report_misc_helpers_SOURCES = atf-report/misc_helpers.cpp
-@ENABLE_TOOLS_TRUE@atf_report_misc_helpers_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_report_pass_helper_SOURCES = atf-report/pass_helper.cpp
-@ENABLE_TOOLS_TRUE@atf_report_pass_helper_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@tests_atf_report_SCRIPTS = atf-report/integration_test
-@ENABLE_TOOLS_TRUE@atf_report_reader_test_SOURCES = atf-report/reader_test.cpp \
-@ENABLE_TOOLS_TRUE@                                 atf-report/reader.cpp
-
-@ENABLE_TOOLS_TRUE@atf_report_reader_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail
-@ENABLE_TOOLS_TRUE@atf_report_reader_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_config_atf_config_SOURCES = atf-config/atf-config.cpp
-@ENABLE_TOOLS_TRUE@atf_config_atf_config_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@tests_atf_config_DATA = atf-config/Atffile \
-@ENABLE_TOOLS_TRUE@                        atf-config/Kyuafile
-
-@ENABLE_TOOLS_TRUE@tests_atf_configdir = $(pkgtestsdir)/atf-config
-@ENABLE_TOOLS_TRUE@tests_atf_config_SCRIPTS = atf-config/integration_test
-@ENABLE_TOOLS_TRUE@atf_run_atf_run_CPPFLAGS = "-DGDB=\"$(GDB)\""
-@ENABLE_TOOLS_TRUE@atf_run_atf_run_SOURCES = atf-run/atf-run.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/atffile.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/atffile.hpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/config.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/config.hpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/fs.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/fs.hpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/io.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/io.hpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/requirements.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/requirements.hpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/signals.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/signals.hpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/test-program.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/test-program.hpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/timer.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/timer.hpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/user.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/user.hpp
-
-@ENABLE_TOOLS_TRUE@atf_run_atf_run_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@tests_atf_run_DATA = atf-run/Atffile \
-@ENABLE_TOOLS_TRUE@                     atf-run/Kyuafile
-
-@ENABLE_TOOLS_TRUE@tests_atf_rundir = $(pkgtestsdir)/atf-run
-@ENABLE_TOOLS_TRUE@atf_run_atffile_test_SOURCES = atf-run/atffile_test.cpp \
-@ENABLE_TOOLS_TRUE@                               atf-run/atffile.cpp
-
-@ENABLE_TOOLS_TRUE@atf_run_atffile_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail
-@ENABLE_TOOLS_TRUE@atf_run_atffile_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_bad_metadata_helper_SOURCES = atf-run/bad_metadata_helper.c
-@ENABLE_TOOLS_TRUE@atf_run_bad_metadata_helper_LDADD = libatf-c.la
-@ENABLE_TOOLS_TRUE@atf_run_config_test_SOURCES = atf-run/config_test.cpp \
-@ENABLE_TOOLS_TRUE@                              atf-run/config.cpp
-
-@ENABLE_TOOLS_TRUE@atf_run_config_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail
-@ENABLE_TOOLS_TRUE@atf_run_config_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_expect_helpers_SOURCES = atf-run/expect_helpers.c
-@ENABLE_TOOLS_TRUE@atf_run_expect_helpers_LDADD = libatf-c.la
-@ENABLE_TOOLS_TRUE@atf_run_fs_test_SOURCES = atf-run/fs_test.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/fs.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/user.cpp
-
-@ENABLE_TOOLS_TRUE@atf_run_fs_test_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_io_test_SOURCES = atf-run/io_test.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/io.cpp \
-@ENABLE_TOOLS_TRUE@                          atf-run/signals.cpp
-
-@ENABLE_TOOLS_TRUE@atf_run_io_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_misc_helpers_SOURCES = atf-run/misc_helpers.cpp
-@ENABLE_TOOLS_TRUE@atf_run_misc_helpers_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_pass_helper_SOURCES = atf-run/pass_helper.cpp
-@ENABLE_TOOLS_TRUE@atf_run_pass_helper_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_several_tcs_helper_SOURCES = atf-run/several_tcs_helper.c
-@ENABLE_TOOLS_TRUE@atf_run_several_tcs_helper_LDADD = libatf-c.la
-@ENABLE_TOOLS_TRUE@atf_run_requirements_test_SOURCES = atf-run/requirements_test.cpp \
-@ENABLE_TOOLS_TRUE@                                    atf-run/requirements.cpp \
-@ENABLE_TOOLS_TRUE@                                    atf-run/user.cpp
-
-@ENABLE_TOOLS_TRUE@atf_run_requirements_test_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_signals_test_SOURCES = atf-run/signals_test.cpp atf-run/signals.cpp
-@ENABLE_TOOLS_TRUE@atf_run_signals_test_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_test_program_test_SOURCES = atf-run/test_program_test.cpp \
-@ENABLE_TOOLS_TRUE@                                    atf-run/fs.cpp \
-@ENABLE_TOOLS_TRUE@                                    atf-run/io.cpp \
-@ENABLE_TOOLS_TRUE@                                    atf-run/requirements.cpp \
-@ENABLE_TOOLS_TRUE@                                    atf-run/signals.cpp \
-@ENABLE_TOOLS_TRUE@                                    atf-run/test-program.cpp \
-@ENABLE_TOOLS_TRUE@                                    atf-run/timer.cpp \
-@ENABLE_TOOLS_TRUE@                                    atf-run/user.cpp
-
-@ENABLE_TOOLS_TRUE@atf_run_test_program_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail
-@ENABLE_TOOLS_TRUE@atf_run_test_program_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_user_test_SOURCES = atf-run/user_test.cpp atf-run/user.cpp
-@ENABLE_TOOLS_TRUE@atf_run_user_test_LDADD = $(ATF_CXX_LIBS)
-@ENABLE_TOOLS_TRUE@atf_run_zero_tcs_helper_SOURCES = atf-run/zero_tcs_helper.c
-@ENABLE_TOOLS_TRUE@atf_run_zero_tcs_helper_LDADD = libatf-c.la
-@ENABLE_TOOLS_TRUE@tests_atf_run_SCRIPTS = atf-run/integration_test
-@ENABLE_TOOLS_TRUE@hooksdir = $(pkgdatadir)
-@ENABLE_TOOLS_TRUE@hooks_DATA = atf-run/share/atf-run.hooks
-@ENABLE_TOOLS_TRUE@egdir = $(atf_egdir)
-@ENABLE_TOOLS_TRUE@eg_DATA = atf-run/sample/atf-run.hooks \
-@ENABLE_TOOLS_TRUE@	atf-run/sample/common.conf
-@ENABLE_TOOLS_TRUE@atf_version_atf_version_SOURCES = atf-version/atf-version.cpp
-@ENABLE_TOOLS_TRUE@nodist_atf_version_atf_version_SOURCES = atf-version/revision.h
-@ENABLE_TOOLS_TRUE@atf_version_atf_version_CPPFLAGS = -Iatf-version
-@ENABLE_TOOLS_TRUE@atf_version_atf_version_LDADD = $(ATF_CXX_LIBS)
-
-#
-# Top-level distfile documents.
-#
-doc_DATA = AUTHORS COPYING NEWS README
-
-#
-# Supporting logic to run our custom testsuite.
-#
-TESTS_ENVIRONMENT = PATH=$(prefix)/bin:$${PATH} \
-                    PKG_CONFIG_PATH=$(prefix)/lib/pkgconfig
-
-testsdir = $(exec_prefix)/tests
-pkgtestsdir = $(testsdir)/$(PACKAGE)
-pkgtests_DATA = Kyuafile $(am__append_11)
-BUILD_SH_TP = \
-	echo "Creating $${dst}"; \
-	echo "\#! $(bindir)/atf-sh" >$${dst}; \
-	cat $${src} >>$${dst}; \
-	chmod +x $${dst}
-
-all: $(BUILT_SOURCES) bconfig.h
-	$(MAKE) $(AM_MAKEFLAGS) all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .cpp .lo .o .obj
-am--refresh: Makefile
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/atf-report/Makefile.am.inc $(srcdir)/atf-config/Makefile.am.inc $(srcdir)/atf-run/Makefile.am.inc $(srcdir)/atf-version/Makefile.am.inc $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-$(srcdir)/admin/Makefile.am.inc $(srcdir)/atf-c/Makefile.am.inc $(srcdir)/atf-c/detail/Makefile.am.inc $(srcdir)/atf-c++/Makefile.am.inc $(srcdir)/atf-c++/detail/Makefile.am.inc $(srcdir)/atf-sh/Makefile.am.inc $(srcdir)/bootstrap/Makefile.am.inc $(srcdir)/doc/Makefile.am.inc $(srcdir)/test-programs/Makefile.am.inc $(srcdir)/atf-report/Makefile.am.inc $(srcdir)/atf-config/Makefile.am.inc $(srcdir)/atf-run/Makefile.am.inc $(srcdir)/atf-version/Makefile.am.inc:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	$(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-bconfig.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/bconfig.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status bconfig.h
-$(srcdir)/bconfig.h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f bconfig.h stamp-h1
-atf-c/defs.h: $(top_builddir)/config.status $(top_srcdir)/atf-c/defs.h.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	list2=; for p in $$list; do \
-	  if test -f $$p; then \
-	    list2="$$list2 $$p"; \
-	  else :; fi; \
-	done; \
-	test -z "$$list2" || { \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
-	}
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
-	for p in $$list; do \
-	  $(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-atf-c++/detail/$(am__dirstamp):
-	@$(MKDIR_P) atf-c++/detail
-	@: > atf-c++/detail/$(am__dirstamp)
-atf-c++/detail/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) atf-c++/detail/$(DEPDIR)
-	@: > atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/test_helpers.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/libtest_helpers.la: $(atf_c___detail_libtest_helpers_la_OBJECTS) $(atf_c___detail_libtest_helpers_la_DEPENDENCIES) $(EXTRA_atf_c___detail_libtest_helpers_la_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	$(CXXLINK)  $(atf_c___detail_libtest_helpers_la_OBJECTS) $(atf_c___detail_libtest_helpers_la_LIBADD) $(LIBS)
-atf-c/detail/$(am__dirstamp):
-	@$(MKDIR_P) atf-c/detail
-	@: > atf-c/detail/$(am__dirstamp)
-atf-c/detail/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) atf-c/detail/$(DEPDIR)
-	@: > atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/atf_c_detail_libtest_helpers_la-test_helpers.lo:  \
-	atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libtest_helpers.la: $(atf_c_detail_libtest_helpers_la_OBJECTS) $(atf_c_detail_libtest_helpers_la_DEPENDENCIES) $(EXTRA_atf_c_detail_libtest_helpers_la_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	$(LINK)  $(atf_c_detail_libtest_helpers_la_OBJECTS) $(atf_c_detail_libtest_helpers_la_LIBADD) $(LIBS)
-atf-c++/$(am__dirstamp):
-	@$(MKDIR_P) atf-c++
-	@: > atf-c++/$(am__dirstamp)
-atf-c++/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) atf-c++/$(DEPDIR)
-	@: > atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/build.lo: atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/check.lo: atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/config.lo: atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/tests.lo: atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/application.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/env.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/exceptions.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/expand.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/fs.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/parser.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/process.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/text.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/ui.lo: atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-libatf-c++.la: $(libatf_c___la_OBJECTS) $(libatf_c___la_DEPENDENCIES) $(EXTRA_libatf_c___la_DEPENDENCIES) 
-	$(libatf_c___la_LINK) -rpath $(libdir) $(libatf_c___la_OBJECTS) $(libatf_c___la_LIBADD) $(LIBS)
-atf-c/$(am__dirstamp):
-	@$(MKDIR_P) atf-c
-	@: > atf-c/$(am__dirstamp)
-atf-c/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) atf-c/$(DEPDIR)
-	@: > atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/libatf_c_la-build.lo: atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/libatf_c_la-check.lo: atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/libatf_c_la-config.lo: atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/libatf_c_la-error.lo: atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/libatf_c_la-tc.lo: atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/libatf_c_la-tp.lo: atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/libatf_c_la-utils.lo: atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-dynstr.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-env.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-fs.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-list.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-map.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-process.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-sanity.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-text.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-tp_main.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/libatf_c_la-user.lo: atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-libatf-c.la: $(libatf_c_la_OBJECTS) $(libatf_c_la_DEPENDENCIES) $(EXTRA_libatf_c_la_DEPENDENCIES) 
-	$(libatf_c_la_LINK) -rpath $(libdir) $(libatf_c_la_OBJECTS) $(libatf_c_la_LIBADD) $(LIBS)
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-
-clean-checkPROGRAMS:
-	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-libexecPROGRAMS: $(libexec_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-libexecPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
-
-clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-tests_atf_cPROGRAMS: $(tests_atf_c_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_cdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_cdir)"
-	@list='$(tests_atf_c_PROGRAMS)'; test -n "$(tests_atf_cdir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_atf_cdir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_atf_cdir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-tests_atf_cPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c_PROGRAMS)'; test -n "$(tests_atf_cdir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(tests_atf_cdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(tests_atf_cdir)" && rm -f $$files
-
-clean-tests_atf_cPROGRAMS:
-	@list='$(tests_atf_c_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-tests_atf_c__PROGRAMS: $(tests_atf_c___PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_c__dir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_c__dir)"
-	@list='$(tests_atf_c___PROGRAMS)'; test -n "$(tests_atf_c__dir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_atf_c__dir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_atf_c__dir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-tests_atf_c__PROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c___PROGRAMS)'; test -n "$(tests_atf_c__dir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(tests_atf_c__dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(tests_atf_c__dir)" && rm -f $$files
-
-clean-tests_atf_c__PROGRAMS:
-	@list='$(tests_atf_c___PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-tests_atf_c___detailPROGRAMS: $(tests_atf_c___detail_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_c___detaildir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_c___detaildir)"
-	@list='$(tests_atf_c___detail_PROGRAMS)'; test -n "$(tests_atf_c___detaildir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_atf_c___detaildir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_atf_c___detaildir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-tests_atf_c___detailPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c___detail_PROGRAMS)'; test -n "$(tests_atf_c___detaildir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(tests_atf_c___detaildir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(tests_atf_c___detaildir)" && rm -f $$files
-
-clean-tests_atf_c___detailPROGRAMS:
-	@list='$(tests_atf_c___detail_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-tests_atf_c_detailPROGRAMS: $(tests_atf_c_detail_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_c_detaildir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_c_detaildir)"
-	@list='$(tests_atf_c_detail_PROGRAMS)'; test -n "$(tests_atf_c_detaildir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_atf_c_detaildir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_atf_c_detaildir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-tests_atf_c_detailPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c_detail_PROGRAMS)'; test -n "$(tests_atf_c_detaildir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(tests_atf_c_detaildir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(tests_atf_c_detaildir)" && rm -f $$files
-
-clean-tests_atf_c_detailPROGRAMS:
-	@list='$(tests_atf_c_detail_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-tests_atf_reportPROGRAMS: $(tests_atf_report_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_reportdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_reportdir)"
-	@list='$(tests_atf_report_PROGRAMS)'; test -n "$(tests_atf_reportdir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_atf_reportdir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_atf_reportdir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-tests_atf_reportPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_report_PROGRAMS)'; test -n "$(tests_atf_reportdir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(tests_atf_reportdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(tests_atf_reportdir)" && rm -f $$files
-
-clean-tests_atf_reportPROGRAMS:
-	@list='$(tests_atf_report_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-tests_atf_runPROGRAMS: $(tests_atf_run_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_rundir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_rundir)"
-	@list='$(tests_atf_run_PROGRAMS)'; test -n "$(tests_atf_rundir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_atf_rundir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_atf_rundir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-tests_atf_runPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_run_PROGRAMS)'; test -n "$(tests_atf_rundir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(tests_atf_rundir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(tests_atf_rundir)" && rm -f $$files
-
-clean-tests_atf_runPROGRAMS:
-	@list='$(tests_atf_run_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-install-tests_test_programsPROGRAMS: $(tests_test_programs_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_test_programsdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_test_programsdir)"
-	@list='$(tests_test_programs_PROGRAMS)'; test -n "$(tests_test_programsdir)" || list=; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(tests_test_programsdir)$$dir'"; \
-	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(tests_test_programsdir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-tests_test_programsPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_test_programs_PROGRAMS)'; test -n "$(tests_test_programsdir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(tests_test_programsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(tests_test_programsdir)" && rm -f $$files
-
-clean-tests_test_programsPROGRAMS:
-	@list='$(tests_test_programs_PROGRAMS)'; test -n "$$list" || exit 0; \
-	echo " rm -f" $$list; \
-	rm -f $$list || exit $$?; \
-	test -n "$(EXEEXT)" || exit 0; \
-	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
-	echo " rm -f" $$list; \
-	rm -f $$list
-atf-c++/atf_c++_test.$(OBJEXT): atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/atf_c++_test$(EXEEXT): $(atf_c___atf_c___test_OBJECTS) $(atf_c___atf_c___test_DEPENDENCIES) $(EXTRA_atf_c___atf_c___test_DEPENDENCIES) atf-c++/$(am__dirstamp)
-	@rm -f atf-c++/atf_c++_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___atf_c___test_OBJECTS) $(atf_c___atf_c___test_LDADD) $(LIBS)
-atf-c++/build_test.$(OBJEXT): atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/build_test$(EXEEXT): $(atf_c___build_test_OBJECTS) $(atf_c___build_test_DEPENDENCIES) $(EXTRA_atf_c___build_test_DEPENDENCIES) atf-c++/$(am__dirstamp)
-	@rm -f atf-c++/build_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___build_test_OBJECTS) $(atf_c___build_test_LDADD) $(LIBS)
-atf-c++/check_test.$(OBJEXT): atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/check_test$(EXEEXT): $(atf_c___check_test_OBJECTS) $(atf_c___check_test_DEPENDENCIES) $(EXTRA_atf_c___check_test_DEPENDENCIES) atf-c++/$(am__dirstamp)
-	@rm -f atf-c++/check_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___check_test_OBJECTS) $(atf_c___check_test_LDADD) $(LIBS)
-atf-c++/config_test.$(OBJEXT): atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/config_test$(EXEEXT): $(atf_c___config_test_OBJECTS) $(atf_c___config_test_DEPENDENCIES) $(EXTRA_atf_c___config_test_DEPENDENCIES) atf-c++/$(am__dirstamp)
-	@rm -f atf-c++/config_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___config_test_OBJECTS) $(atf_c___config_test_LDADD) $(LIBS)
-atf-c++/detail/application_test.$(OBJEXT):  \
-	atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/application_test$(EXEEXT): $(atf_c___detail_application_test_OBJECTS) $(atf_c___detail_application_test_DEPENDENCIES) $(EXTRA_atf_c___detail_application_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/application_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_application_test_OBJECTS) $(atf_c___detail_application_test_LDADD) $(LIBS)
-atf-c++/detail/env_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/env_test$(EXEEXT): $(atf_c___detail_env_test_OBJECTS) $(atf_c___detail_env_test_DEPENDENCIES) $(EXTRA_atf_c___detail_env_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/env_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_env_test_OBJECTS) $(atf_c___detail_env_test_LDADD) $(LIBS)
-atf-c++/detail/exceptions_test.$(OBJEXT):  \
-	atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/exceptions_test$(EXEEXT): $(atf_c___detail_exceptions_test_OBJECTS) $(atf_c___detail_exceptions_test_DEPENDENCIES) $(EXTRA_atf_c___detail_exceptions_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/exceptions_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_exceptions_test_OBJECTS) $(atf_c___detail_exceptions_test_LDADD) $(LIBS)
-atf-c++/detail/expand_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/expand_test$(EXEEXT): $(atf_c___detail_expand_test_OBJECTS) $(atf_c___detail_expand_test_DEPENDENCIES) $(EXTRA_atf_c___detail_expand_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/expand_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_expand_test_OBJECTS) $(atf_c___detail_expand_test_LDADD) $(LIBS)
-atf-c++/detail/fs_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/fs_test$(EXEEXT): $(atf_c___detail_fs_test_OBJECTS) $(atf_c___detail_fs_test_DEPENDENCIES) $(EXTRA_atf_c___detail_fs_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/fs_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_fs_test_OBJECTS) $(atf_c___detail_fs_test_LDADD) $(LIBS)
-atf-c++/detail/parser_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/parser_test$(EXEEXT): $(atf_c___detail_parser_test_OBJECTS) $(atf_c___detail_parser_test_DEPENDENCIES) $(EXTRA_atf_c___detail_parser_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/parser_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_parser_test_OBJECTS) $(atf_c___detail_parser_test_LDADD) $(LIBS)
-atf-c++/detail/process_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/process_test$(EXEEXT): $(atf_c___detail_process_test_OBJECTS) $(atf_c___detail_process_test_DEPENDENCIES) $(EXTRA_atf_c___detail_process_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/process_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_process_test_OBJECTS) $(atf_c___detail_process_test_LDADD) $(LIBS)
-atf-c++/detail/sanity_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/sanity_test$(EXEEXT): $(atf_c___detail_sanity_test_OBJECTS) $(atf_c___detail_sanity_test_DEPENDENCIES) $(EXTRA_atf_c___detail_sanity_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/sanity_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_sanity_test_OBJECTS) $(atf_c___detail_sanity_test_LDADD) $(LIBS)
-atf-c++/detail/text_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/text_test$(EXEEXT): $(atf_c___detail_text_test_OBJECTS) $(atf_c___detail_text_test_DEPENDENCIES) $(EXTRA_atf_c___detail_text_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/text_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_text_test_OBJECTS) $(atf_c___detail_text_test_LDADD) $(LIBS)
-atf-c++/detail/ui_test.$(OBJEXT): atf-c++/detail/$(am__dirstamp) \
-	atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c++/detail/ui_test$(EXEEXT): $(atf_c___detail_ui_test_OBJECTS) $(atf_c___detail_ui_test_DEPENDENCIES) $(EXTRA_atf_c___detail_ui_test_DEPENDENCIES) atf-c++/detail/$(am__dirstamp)
-	@rm -f atf-c++/detail/ui_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___detail_ui_test_OBJECTS) $(atf_c___detail_ui_test_LDADD) $(LIBS)
-atf-c++/macros_test.$(OBJEXT): atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/macros_test$(EXEEXT): $(atf_c___macros_test_OBJECTS) $(atf_c___macros_test_DEPENDENCIES) $(EXTRA_atf_c___macros_test_DEPENDENCIES) atf-c++/$(am__dirstamp)
-	@rm -f atf-c++/macros_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___macros_test_OBJECTS) $(atf_c___macros_test_LDADD) $(LIBS)
-atf-c++/tests_test.$(OBJEXT): atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/tests_test$(EXEEXT): $(atf_c___tests_test_OBJECTS) $(atf_c___tests_test_DEPENDENCIES) $(EXTRA_atf_c___tests_test_DEPENDENCIES) atf-c++/$(am__dirstamp)
-	@rm -f atf-c++/tests_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___tests_test_OBJECTS) $(atf_c___tests_test_LDADD) $(LIBS)
-atf-c++/utils_test.$(OBJEXT): atf-c++/$(am__dirstamp) \
-	atf-c++/$(DEPDIR)/$(am__dirstamp)
-atf-c++/utils_test$(EXEEXT): $(atf_c___utils_test_OBJECTS) $(atf_c___utils_test_DEPENDENCIES) $(EXTRA_atf_c___utils_test_DEPENDENCIES) atf-c++/$(am__dirstamp)
-	@rm -f atf-c++/utils_test$(EXEEXT)
-	$(CXXLINK) $(atf_c___utils_test_OBJECTS) $(atf_c___utils_test_LDADD) $(LIBS)
-atf-c/atf_c_test.$(OBJEXT): atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/atf_c_test$(EXEEXT): $(atf_c_atf_c_test_OBJECTS) $(atf_c_atf_c_test_DEPENDENCIES) $(EXTRA_atf_c_atf_c_test_DEPENDENCIES) atf-c/$(am__dirstamp)
-	@rm -f atf-c/atf_c_test$(EXEEXT)
-	$(LINK) $(atf_c_atf_c_test_OBJECTS) $(atf_c_atf_c_test_LDADD) $(LIBS)
-atf-c/build_test.$(OBJEXT): atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/build_test$(EXEEXT): $(atf_c_build_test_OBJECTS) $(atf_c_build_test_DEPENDENCIES) $(EXTRA_atf_c_build_test_DEPENDENCIES) atf-c/$(am__dirstamp)
-	@rm -f atf-c/build_test$(EXEEXT)
-	$(LINK) $(atf_c_build_test_OBJECTS) $(atf_c_build_test_LDADD) $(LIBS)
-atf-c/check_test.$(OBJEXT): atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/check_test$(EXEEXT): $(atf_c_check_test_OBJECTS) $(atf_c_check_test_DEPENDENCIES) $(EXTRA_atf_c_check_test_DEPENDENCIES) atf-c/$(am__dirstamp)
-	@rm -f atf-c/check_test$(EXEEXT)
-	$(LINK) $(atf_c_check_test_OBJECTS) $(atf_c_check_test_LDADD) $(LIBS)
-atf-c/config_test.$(OBJEXT): atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/config_test$(EXEEXT): $(atf_c_config_test_OBJECTS) $(atf_c_config_test_DEPENDENCIES) $(EXTRA_atf_c_config_test_DEPENDENCIES) atf-c/$(am__dirstamp)
-	@rm -f atf-c/config_test$(EXEEXT)
-	$(LINK) $(atf_c_config_test_OBJECTS) $(atf_c_config_test_LDADD) $(LIBS)
-atf-c/detail/dynstr_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/dynstr_test$(EXEEXT): $(atf_c_detail_dynstr_test_OBJECTS) $(atf_c_detail_dynstr_test_DEPENDENCIES) $(EXTRA_atf_c_detail_dynstr_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/dynstr_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_dynstr_test_OBJECTS) $(atf_c_detail_dynstr_test_LDADD) $(LIBS)
-atf-c/detail/env_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/env_test$(EXEEXT): $(atf_c_detail_env_test_OBJECTS) $(atf_c_detail_env_test_DEPENDENCIES) $(EXTRA_atf_c_detail_env_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/env_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_env_test_OBJECTS) $(atf_c_detail_env_test_LDADD) $(LIBS)
-atf-c/detail/fs_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/fs_test$(EXEEXT): $(atf_c_detail_fs_test_OBJECTS) $(atf_c_detail_fs_test_DEPENDENCIES) $(EXTRA_atf_c_detail_fs_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/fs_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_fs_test_OBJECTS) $(atf_c_detail_fs_test_LDADD) $(LIBS)
-atf-c/detail/list_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/list_test$(EXEEXT): $(atf_c_detail_list_test_OBJECTS) $(atf_c_detail_list_test_DEPENDENCIES) $(EXTRA_atf_c_detail_list_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/list_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_list_test_OBJECTS) $(atf_c_detail_list_test_LDADD) $(LIBS)
-atf-c/detail/map_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/map_test$(EXEEXT): $(atf_c_detail_map_test_OBJECTS) $(atf_c_detail_map_test_DEPENDENCIES) $(EXTRA_atf_c_detail_map_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/map_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_map_test_OBJECTS) $(atf_c_detail_map_test_LDADD) $(LIBS)
-atf-c/detail/process_helpers.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/process_helpers$(EXEEXT): $(atf_c_detail_process_helpers_OBJECTS) $(atf_c_detail_process_helpers_DEPENDENCIES) $(EXTRA_atf_c_detail_process_helpers_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/process_helpers$(EXEEXT)
-	$(LINK) $(atf_c_detail_process_helpers_OBJECTS) $(atf_c_detail_process_helpers_LDADD) $(LIBS)
-atf-c/detail/process_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/process_test$(EXEEXT): $(atf_c_detail_process_test_OBJECTS) $(atf_c_detail_process_test_DEPENDENCIES) $(EXTRA_atf_c_detail_process_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/process_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_process_test_OBJECTS) $(atf_c_detail_process_test_LDADD) $(LIBS)
-atf-c/detail/sanity_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/sanity_test$(EXEEXT): $(atf_c_detail_sanity_test_OBJECTS) $(atf_c_detail_sanity_test_DEPENDENCIES) $(EXTRA_atf_c_detail_sanity_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/sanity_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_sanity_test_OBJECTS) $(atf_c_detail_sanity_test_LDADD) $(LIBS)
-atf-c/detail/test_helpers_test.$(OBJEXT):  \
-	atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/test_helpers_test$(EXEEXT): $(atf_c_detail_test_helpers_test_OBJECTS) $(atf_c_detail_test_helpers_test_DEPENDENCIES) $(EXTRA_atf_c_detail_test_helpers_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/test_helpers_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_test_helpers_test_OBJECTS) $(atf_c_detail_test_helpers_test_LDADD) $(LIBS)
-atf-c/detail/text_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/text_test$(EXEEXT): $(atf_c_detail_text_test_OBJECTS) $(atf_c_detail_text_test_DEPENDENCIES) $(EXTRA_atf_c_detail_text_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/text_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_text_test_OBJECTS) $(atf_c_detail_text_test_LDADD) $(LIBS)
-atf-c/detail/user_test.$(OBJEXT): atf-c/detail/$(am__dirstamp) \
-	atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-atf-c/detail/user_test$(EXEEXT): $(atf_c_detail_user_test_OBJECTS) $(atf_c_detail_user_test_DEPENDENCIES) $(EXTRA_atf_c_detail_user_test_DEPENDENCIES) atf-c/detail/$(am__dirstamp)
-	@rm -f atf-c/detail/user_test$(EXEEXT)
-	$(LINK) $(atf_c_detail_user_test_OBJECTS) $(atf_c_detail_user_test_LDADD) $(LIBS)
-atf-c/error_test.$(OBJEXT): atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/error_test$(EXEEXT): $(atf_c_error_test_OBJECTS) $(atf_c_error_test_DEPENDENCIES) $(EXTRA_atf_c_error_test_DEPENDENCIES) atf-c/$(am__dirstamp)
-	@rm -f atf-c/error_test$(EXEEXT)
-	$(LINK) $(atf_c_error_test_OBJECTS) $(atf_c_error_test_LDADD) $(LIBS)
-atf-c/macros_test.$(OBJEXT): atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/macros_test$(EXEEXT): $(atf_c_macros_test_OBJECTS) $(atf_c_macros_test_DEPENDENCIES) $(EXTRA_atf_c_macros_test_DEPENDENCIES) atf-c/$(am__dirstamp)
-	@rm -f atf-c/macros_test$(EXEEXT)
-	$(LINK) $(atf_c_macros_test_OBJECTS) $(atf_c_macros_test_LDADD) $(LIBS)
-atf-c/tc_test.$(OBJEXT): atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/tc_test$(EXEEXT): $(atf_c_tc_test_OBJECTS) $(atf_c_tc_test_DEPENDENCIES) $(EXTRA_atf_c_tc_test_DEPENDENCIES) atf-c/$(am__dirstamp)
-	@rm -f atf-c/tc_test$(EXEEXT)
-	$(LINK) $(atf_c_tc_test_OBJECTS) $(atf_c_tc_test_LDADD) $(LIBS)
-atf-c/tp_test.$(OBJEXT): atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/tp_test$(EXEEXT): $(atf_c_tp_test_OBJECTS) $(atf_c_tp_test_DEPENDENCIES) $(EXTRA_atf_c_tp_test_DEPENDENCIES) atf-c/$(am__dirstamp)
-	@rm -f atf-c/tp_test$(EXEEXT)
-	$(LINK) $(atf_c_tp_test_OBJECTS) $(atf_c_tp_test_LDADD) $(LIBS)
-atf-c/utils_test.$(OBJEXT): atf-c/$(am__dirstamp) \
-	atf-c/$(DEPDIR)/$(am__dirstamp)
-atf-c/utils_test$(EXEEXT): $(atf_c_utils_test_OBJECTS) $(atf_c_utils_test_DEPENDENCIES) $(EXTRA_atf_c_utils_test_DEPENDENCIES) atf-c/$(am__dirstamp)
-	@rm -f atf-c/utils_test$(EXEEXT)
-	$(LINK) $(atf_c_utils_test_OBJECTS) $(atf_c_utils_test_LDADD) $(LIBS)
-atf-config/$(am__dirstamp):
-	@$(MKDIR_P) atf-config
-	@: > atf-config/$(am__dirstamp)
-atf-config/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) atf-config/$(DEPDIR)
-	@: > atf-config/$(DEPDIR)/$(am__dirstamp)
-atf-config/atf-config.$(OBJEXT): atf-config/$(am__dirstamp) \
-	atf-config/$(DEPDIR)/$(am__dirstamp)
-atf-config/atf-config$(EXEEXT): $(atf_config_atf_config_OBJECTS) $(atf_config_atf_config_DEPENDENCIES) $(EXTRA_atf_config_atf_config_DEPENDENCIES) atf-config/$(am__dirstamp)
-	@rm -f atf-config/atf-config$(EXEEXT)
-	$(CXXLINK) $(atf_config_atf_config_OBJECTS) $(atf_config_atf_config_LDADD) $(LIBS)
-atf-report/$(am__dirstamp):
-	@$(MKDIR_P) atf-report
-	@: > atf-report/$(am__dirstamp)
-atf-report/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) atf-report/$(DEPDIR)
-	@: > atf-report/$(DEPDIR)/$(am__dirstamp)
-atf-report/atf-report.$(OBJEXT): atf-report/$(am__dirstamp) \
-	atf-report/$(DEPDIR)/$(am__dirstamp)
-atf-report/reader.$(OBJEXT): atf-report/$(am__dirstamp) \
-	atf-report/$(DEPDIR)/$(am__dirstamp)
-atf-report/atf-report$(EXEEXT): $(atf_report_atf_report_OBJECTS) $(atf_report_atf_report_DEPENDENCIES) $(EXTRA_atf_report_atf_report_DEPENDENCIES) atf-report/$(am__dirstamp)
-	@rm -f atf-report/atf-report$(EXEEXT)
-	$(CXXLINK) $(atf_report_atf_report_OBJECTS) $(atf_report_atf_report_LDADD) $(LIBS)
-atf-report/fail_helper.$(OBJEXT): atf-report/$(am__dirstamp) \
-	atf-report/$(DEPDIR)/$(am__dirstamp)
-atf-report/fail_helper$(EXEEXT): $(atf_report_fail_helper_OBJECTS) $(atf_report_fail_helper_DEPENDENCIES) $(EXTRA_atf_report_fail_helper_DEPENDENCIES) atf-report/$(am__dirstamp)
-	@rm -f atf-report/fail_helper$(EXEEXT)
-	$(CXXLINK) $(atf_report_fail_helper_OBJECTS) $(atf_report_fail_helper_LDADD) $(LIBS)
-atf-report/misc_helpers.$(OBJEXT): atf-report/$(am__dirstamp) \
-	atf-report/$(DEPDIR)/$(am__dirstamp)
-atf-report/misc_helpers$(EXEEXT): $(atf_report_misc_helpers_OBJECTS) $(atf_report_misc_helpers_DEPENDENCIES) $(EXTRA_atf_report_misc_helpers_DEPENDENCIES) atf-report/$(am__dirstamp)
-	@rm -f atf-report/misc_helpers$(EXEEXT)
-	$(CXXLINK) $(atf_report_misc_helpers_OBJECTS) $(atf_report_misc_helpers_LDADD) $(LIBS)
-atf-report/pass_helper.$(OBJEXT): atf-report/$(am__dirstamp) \
-	atf-report/$(DEPDIR)/$(am__dirstamp)
-atf-report/pass_helper$(EXEEXT): $(atf_report_pass_helper_OBJECTS) $(atf_report_pass_helper_DEPENDENCIES) $(EXTRA_atf_report_pass_helper_DEPENDENCIES) atf-report/$(am__dirstamp)
-	@rm -f atf-report/pass_helper$(EXEEXT)
-	$(CXXLINK) $(atf_report_pass_helper_OBJECTS) $(atf_report_pass_helper_LDADD) $(LIBS)
-atf-report/atf_report_reader_test-reader_test.$(OBJEXT):  \
-	atf-report/$(am__dirstamp) \
-	atf-report/$(DEPDIR)/$(am__dirstamp)
-atf-report/atf_report_reader_test-reader.$(OBJEXT):  \
-	atf-report/$(am__dirstamp) \
-	atf-report/$(DEPDIR)/$(am__dirstamp)
-atf-report/reader_test$(EXEEXT): $(atf_report_reader_test_OBJECTS) $(atf_report_reader_test_DEPENDENCIES) $(EXTRA_atf_report_reader_test_DEPENDENCIES) atf-report/$(am__dirstamp)
-	@rm -f atf-report/reader_test$(EXEEXT)
-	$(CXXLINK) $(atf_report_reader_test_OBJECTS) $(atf_report_reader_test_LDADD) $(LIBS)
-atf-run/$(am__dirstamp):
-	@$(MKDIR_P) atf-run
-	@: > atf-run/$(am__dirstamp)
-atf-run/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) atf-run/$(DEPDIR)
-	@: > atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-atf-run.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-atffile.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-config.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-fs.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-io.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-requirements.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-signals.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-test-program.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-timer.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atf_run-user.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf-run$(EXEEXT): $(atf_run_atf_run_OBJECTS) $(atf_run_atf_run_DEPENDENCIES) $(EXTRA_atf_run_atf_run_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/atf-run$(EXEEXT)
-	$(CXXLINK) $(atf_run_atf_run_OBJECTS) $(atf_run_atf_run_LDADD) $(LIBS)
-atf-run/atf_run_atffile_test-atffile_test.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_atffile_test-atffile.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atffile_test$(EXEEXT): $(atf_run_atffile_test_OBJECTS) $(atf_run_atffile_test_DEPENDENCIES) $(EXTRA_atf_run_atffile_test_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/atffile_test$(EXEEXT)
-	$(CXXLINK) $(atf_run_atffile_test_OBJECTS) $(atf_run_atffile_test_LDADD) $(LIBS)
-atf-run/bad_metadata_helper.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/bad_metadata_helper$(EXEEXT): $(atf_run_bad_metadata_helper_OBJECTS) $(atf_run_bad_metadata_helper_DEPENDENCIES) $(EXTRA_atf_run_bad_metadata_helper_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/bad_metadata_helper$(EXEEXT)
-	$(LINK) $(atf_run_bad_metadata_helper_OBJECTS) $(atf_run_bad_metadata_helper_LDADD) $(LIBS)
-atf-run/atf_run_config_test-config_test.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_config_test-config.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/config_test$(EXEEXT): $(atf_run_config_test_OBJECTS) $(atf_run_config_test_DEPENDENCIES) $(EXTRA_atf_run_config_test_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/config_test$(EXEEXT)
-	$(CXXLINK) $(atf_run_config_test_OBJECTS) $(atf_run_config_test_LDADD) $(LIBS)
-atf-run/expect_helpers.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/expect_helpers$(EXEEXT): $(atf_run_expect_helpers_OBJECTS) $(atf_run_expect_helpers_DEPENDENCIES) $(EXTRA_atf_run_expect_helpers_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/expect_helpers$(EXEEXT)
-	$(LINK) $(atf_run_expect_helpers_OBJECTS) $(atf_run_expect_helpers_LDADD) $(LIBS)
-atf-run/fs_test.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/fs.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/user.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/fs_test$(EXEEXT): $(atf_run_fs_test_OBJECTS) $(atf_run_fs_test_DEPENDENCIES) $(EXTRA_atf_run_fs_test_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/fs_test$(EXEEXT)
-	$(CXXLINK) $(atf_run_fs_test_OBJECTS) $(atf_run_fs_test_LDADD) $(LIBS)
-atf-run/io_test.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/io.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/signals.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/io_test$(EXEEXT): $(atf_run_io_test_OBJECTS) $(atf_run_io_test_DEPENDENCIES) $(EXTRA_atf_run_io_test_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/io_test$(EXEEXT)
-	$(CXXLINK) $(atf_run_io_test_OBJECTS) $(atf_run_io_test_LDADD) $(LIBS)
-atf-run/misc_helpers.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/misc_helpers$(EXEEXT): $(atf_run_misc_helpers_OBJECTS) $(atf_run_misc_helpers_DEPENDENCIES) $(EXTRA_atf_run_misc_helpers_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/misc_helpers$(EXEEXT)
-	$(CXXLINK) $(atf_run_misc_helpers_OBJECTS) $(atf_run_misc_helpers_LDADD) $(LIBS)
-atf-run/pass_helper.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/pass_helper$(EXEEXT): $(atf_run_pass_helper_OBJECTS) $(atf_run_pass_helper_DEPENDENCIES) $(EXTRA_atf_run_pass_helper_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/pass_helper$(EXEEXT)
-	$(CXXLINK) $(atf_run_pass_helper_OBJECTS) $(atf_run_pass_helper_LDADD) $(LIBS)
-atf-run/requirements_test.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/requirements.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/requirements_test$(EXEEXT): $(atf_run_requirements_test_OBJECTS) $(atf_run_requirements_test_DEPENDENCIES) $(EXTRA_atf_run_requirements_test_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/requirements_test$(EXEEXT)
-	$(CXXLINK) $(atf_run_requirements_test_OBJECTS) $(atf_run_requirements_test_LDADD) $(LIBS)
-atf-run/several_tcs_helper.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/several_tcs_helper$(EXEEXT): $(atf_run_several_tcs_helper_OBJECTS) $(atf_run_several_tcs_helper_DEPENDENCIES) $(EXTRA_atf_run_several_tcs_helper_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/several_tcs_helper$(EXEEXT)
-	$(LINK) $(atf_run_several_tcs_helper_OBJECTS) $(atf_run_several_tcs_helper_LDADD) $(LIBS)
-atf-run/signals_test.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/signals_test$(EXEEXT): $(atf_run_signals_test_OBJECTS) $(atf_run_signals_test_DEPENDENCIES) $(EXTRA_atf_run_signals_test_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/signals_test$(EXEEXT)
-	$(CXXLINK) $(atf_run_signals_test_OBJECTS) $(atf_run_signals_test_LDADD) $(LIBS)
-atf-run/atf_run_test_program_test-test_program_test.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_test_program_test-fs.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_test_program_test-io.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_test_program_test-requirements.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_test_program_test-signals.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_test_program_test-test-program.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_test_program_test-timer.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/atf_run_test_program_test-user.$(OBJEXT):  \
-	atf-run/$(am__dirstamp) atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/test_program_test$(EXEEXT): $(atf_run_test_program_test_OBJECTS) $(atf_run_test_program_test_DEPENDENCIES) $(EXTRA_atf_run_test_program_test_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/test_program_test$(EXEEXT)
-	$(CXXLINK) $(atf_run_test_program_test_OBJECTS) $(atf_run_test_program_test_LDADD) $(LIBS)
-atf-run/user_test.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/user_test$(EXEEXT): $(atf_run_user_test_OBJECTS) $(atf_run_user_test_DEPENDENCIES) $(EXTRA_atf_run_user_test_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/user_test$(EXEEXT)
-	$(CXXLINK) $(atf_run_user_test_OBJECTS) $(atf_run_user_test_LDADD) $(LIBS)
-atf-run/zero_tcs_helper.$(OBJEXT): atf-run/$(am__dirstamp) \
-	atf-run/$(DEPDIR)/$(am__dirstamp)
-atf-run/zero_tcs_helper$(EXEEXT): $(atf_run_zero_tcs_helper_OBJECTS) $(atf_run_zero_tcs_helper_DEPENDENCIES) $(EXTRA_atf_run_zero_tcs_helper_DEPENDENCIES) atf-run/$(am__dirstamp)
-	@rm -f atf-run/zero_tcs_helper$(EXEEXT)
-	$(LINK) $(atf_run_zero_tcs_helper_OBJECTS) $(atf_run_zero_tcs_helper_LDADD) $(LIBS)
-atf-sh/$(am__dirstamp):
-	@$(MKDIR_P) atf-sh
-	@: > atf-sh/$(am__dirstamp)
-atf-sh/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) atf-sh/$(DEPDIR)
-	@: > atf-sh/$(DEPDIR)/$(am__dirstamp)
-atf-sh/atf-check.$(OBJEXT): atf-sh/$(am__dirstamp) \
-	atf-sh/$(DEPDIR)/$(am__dirstamp)
-atf-sh/atf-check$(EXEEXT): $(atf_sh_atf_check_OBJECTS) $(atf_sh_atf_check_DEPENDENCIES) $(EXTRA_atf_sh_atf_check_DEPENDENCIES) atf-sh/$(am__dirstamp)
-	@rm -f atf-sh/atf-check$(EXEEXT)
-	$(CXXLINK) $(atf_sh_atf_check_OBJECTS) $(atf_sh_atf_check_LDADD) $(LIBS)
-atf-sh/atf-sh.$(OBJEXT): atf-sh/$(am__dirstamp) \
-	atf-sh/$(DEPDIR)/$(am__dirstamp)
-atf-sh/atf-sh$(EXEEXT): $(atf_sh_atf_sh_OBJECTS) $(atf_sh_atf_sh_DEPENDENCIES) $(EXTRA_atf_sh_atf_sh_DEPENDENCIES) atf-sh/$(am__dirstamp)
-	@rm -f atf-sh/atf-sh$(EXEEXT)
-	$(CXXLINK) $(atf_sh_atf_sh_OBJECTS) $(atf_sh_atf_sh_LDADD) $(LIBS)
-atf-version/$(am__dirstamp):
-	@$(MKDIR_P) atf-version
-	@: > atf-version/$(am__dirstamp)
-atf-version/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) atf-version/$(DEPDIR)
-	@: > atf-version/$(DEPDIR)/$(am__dirstamp)
-atf-version/atf_version_atf_version-atf-version.$(OBJEXT):  \
-	atf-version/$(am__dirstamp) \
-	atf-version/$(DEPDIR)/$(am__dirstamp)
-atf-version/atf-version$(EXEEXT): $(atf_version_atf_version_OBJECTS) $(atf_version_atf_version_DEPENDENCIES) $(EXTRA_atf_version_atf_version_DEPENDENCIES) atf-version/$(am__dirstamp)
-	@rm -f atf-version/atf-version$(EXEEXT)
-	$(CXXLINK) $(atf_version_atf_version_OBJECTS) $(atf_version_atf_version_LDADD) $(LIBS)
-bootstrap/$(am__dirstamp):
-	@$(MKDIR_P) bootstrap
-	@: > bootstrap/$(am__dirstamp)
-bootstrap/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) bootstrap/$(DEPDIR)
-	@: > bootstrap/$(DEPDIR)/$(am__dirstamp)
-bootstrap/h_app_empty.$(OBJEXT): bootstrap/$(am__dirstamp) \
-	bootstrap/$(DEPDIR)/$(am__dirstamp)
-bootstrap/h_app_empty$(EXEEXT): $(bootstrap_h_app_empty_OBJECTS) $(bootstrap_h_app_empty_DEPENDENCIES) $(EXTRA_bootstrap_h_app_empty_DEPENDENCIES) bootstrap/$(am__dirstamp)
-	@rm -f bootstrap/h_app_empty$(EXEEXT)
-	$(CXXLINK) $(bootstrap_h_app_empty_OBJECTS) $(bootstrap_h_app_empty_LDADD) $(LIBS)
-bootstrap/h_app_opts_args.$(OBJEXT): bootstrap/$(am__dirstamp) \
-	bootstrap/$(DEPDIR)/$(am__dirstamp)
-bootstrap/h_app_opts_args$(EXEEXT): $(bootstrap_h_app_opts_args_OBJECTS) $(bootstrap_h_app_opts_args_DEPENDENCIES) $(EXTRA_bootstrap_h_app_opts_args_DEPENDENCIES) bootstrap/$(am__dirstamp)
-	@rm -f bootstrap/h_app_opts_args$(EXEEXT)
-	$(CXXLINK) $(bootstrap_h_app_opts_args_OBJECTS) $(bootstrap_h_app_opts_args_LDADD) $(LIBS)
-bootstrap/h_tp_basic_c.$(OBJEXT): bootstrap/$(am__dirstamp) \
-	bootstrap/$(DEPDIR)/$(am__dirstamp)
-bootstrap/h_tp_basic_c$(EXEEXT): $(bootstrap_h_tp_basic_c_OBJECTS) $(bootstrap_h_tp_basic_c_DEPENDENCIES) $(EXTRA_bootstrap_h_tp_basic_c_DEPENDENCIES) bootstrap/$(am__dirstamp)
-	@rm -f bootstrap/h_tp_basic_c$(EXEEXT)
-	$(LINK) $(bootstrap_h_tp_basic_c_OBJECTS) $(bootstrap_h_tp_basic_c_LDADD) $(LIBS)
-bootstrap/h_tp_basic_cpp.$(OBJEXT): bootstrap/$(am__dirstamp) \
-	bootstrap/$(DEPDIR)/$(am__dirstamp)
-bootstrap/h_tp_basic_cpp$(EXEEXT): $(bootstrap_h_tp_basic_cpp_OBJECTS) $(bootstrap_h_tp_basic_cpp_DEPENDENCIES) $(EXTRA_bootstrap_h_tp_basic_cpp_DEPENDENCIES) bootstrap/$(am__dirstamp)
-	@rm -f bootstrap/h_tp_basic_cpp$(EXEEXT)
-	$(CXXLINK) $(bootstrap_h_tp_basic_cpp_OBJECTS) $(bootstrap_h_tp_basic_cpp_LDADD) $(LIBS)
-test-programs/$(am__dirstamp):
-	@$(MKDIR_P) test-programs
-	@: > test-programs/$(am__dirstamp)
-test-programs/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) test-programs/$(DEPDIR)
-	@: > test-programs/$(DEPDIR)/$(am__dirstamp)
-test-programs/c_helpers.$(OBJEXT): test-programs/$(am__dirstamp) \
-	test-programs/$(DEPDIR)/$(am__dirstamp)
-test-programs/c_helpers$(EXEEXT): $(test_programs_c_helpers_OBJECTS) $(test_programs_c_helpers_DEPENDENCIES) $(EXTRA_test_programs_c_helpers_DEPENDENCIES) test-programs/$(am__dirstamp)
-	@rm -f test-programs/c_helpers$(EXEEXT)
-	$(LINK) $(test_programs_c_helpers_OBJECTS) $(test_programs_c_helpers_LDADD) $(LIBS)
-test-programs/cpp_helpers.$(OBJEXT): test-programs/$(am__dirstamp) \
-	test-programs/$(DEPDIR)/$(am__dirstamp)
-test-programs/cpp_helpers$(EXEEXT): $(test_programs_cpp_helpers_OBJECTS) $(test_programs_cpp_helpers_DEPENDENCIES) $(EXTRA_test_programs_cpp_helpers_DEPENDENCIES) test-programs/$(am__dirstamp)
-	@rm -f test-programs/cpp_helpers$(EXEEXT)
-	$(CXXLINK) $(test_programs_cpp_helpers_OBJECTS) $(test_programs_cpp_helpers_LDADD) $(LIBS)
-install-tests_atf_cSCRIPTS: $(tests_atf_c_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_cdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_cdir)"
-	@list='$(tests_atf_c_SCRIPTS)'; test -n "$(tests_atf_cdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_atf_cdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_atf_cdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-tests_atf_cSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c_SCRIPTS)'; test -n "$(tests_atf_cdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(tests_atf_cdir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_c__SCRIPTS: $(tests_atf_c___SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_c__dir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_c__dir)"
-	@list='$(tests_atf_c___SCRIPTS)'; test -n "$(tests_atf_c__dir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_atf_c__dir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_atf_c__dir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-tests_atf_c__SCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c___SCRIPTS)'; test -n "$(tests_atf_c__dir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(tests_atf_c__dir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_configSCRIPTS: $(tests_atf_config_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_configdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_configdir)"
-	@list='$(tests_atf_config_SCRIPTS)'; test -n "$(tests_atf_configdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_atf_configdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_atf_configdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-tests_atf_configSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_config_SCRIPTS)'; test -n "$(tests_atf_configdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(tests_atf_configdir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_reportSCRIPTS: $(tests_atf_report_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_reportdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_reportdir)"
-	@list='$(tests_atf_report_SCRIPTS)'; test -n "$(tests_atf_reportdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_atf_reportdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_atf_reportdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-tests_atf_reportSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_report_SCRIPTS)'; test -n "$(tests_atf_reportdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(tests_atf_reportdir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_runSCRIPTS: $(tests_atf_run_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_rundir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_rundir)"
-	@list='$(tests_atf_run_SCRIPTS)'; test -n "$(tests_atf_rundir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_atf_rundir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_atf_rundir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-tests_atf_runSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_run_SCRIPTS)'; test -n "$(tests_atf_rundir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(tests_atf_rundir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_shSCRIPTS: $(tests_atf_sh_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_shdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_shdir)"
-	@list='$(tests_atf_sh_SCRIPTS)'; test -n "$(tests_atf_shdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_atf_shdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_atf_shdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-tests_atf_shSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_sh_SCRIPTS)'; test -n "$(tests_atf_shdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(tests_atf_shdir)'; $(am__uninstall_files_from_dir)
-install-tests_test_programsSCRIPTS: $(tests_test_programs_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_test_programsdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_test_programsdir)"
-	@list='$(tests_test_programs_SCRIPTS)'; test -n "$(tests_test_programsdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n' \
-	    -e 'h;s|.*|.|' \
-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
-	      if (++n[d] == $(am__install_max)) { \
-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
-	    else { print "f", d "/" $$4, $$1 } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	     test -z "$$files" || { \
-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(tests_test_programsdir)$$dir'"; \
-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(tests_test_programsdir)$$dir" || exit $$?; \
-	     } \
-	; done
-
-uninstall-tests_test_programsSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_test_programs_SCRIPTS)'; test -n "$(tests_test_programsdir)" || exit 0; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(tests_test_programsdir)'; $(am__uninstall_files_from_dir)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-	-rm -f atf-c++/atf_c++_test.$(OBJEXT)
-	-rm -f atf-c++/build.$(OBJEXT)
-	-rm -f atf-c++/build.lo
-	-rm -f atf-c++/build_test.$(OBJEXT)
-	-rm -f atf-c++/check.$(OBJEXT)
-	-rm -f atf-c++/check.lo
-	-rm -f atf-c++/check_test.$(OBJEXT)
-	-rm -f atf-c++/config.$(OBJEXT)
-	-rm -f atf-c++/config.lo
-	-rm -f atf-c++/config_test.$(OBJEXT)
-	-rm -f atf-c++/detail/application.$(OBJEXT)
-	-rm -f atf-c++/detail/application.lo
-	-rm -f atf-c++/detail/application_test.$(OBJEXT)
-	-rm -f atf-c++/detail/env.$(OBJEXT)
-	-rm -f atf-c++/detail/env.lo
-	-rm -f atf-c++/detail/env_test.$(OBJEXT)
-	-rm -f atf-c++/detail/exceptions.$(OBJEXT)
-	-rm -f atf-c++/detail/exceptions.lo
-	-rm -f atf-c++/detail/exceptions_test.$(OBJEXT)
-	-rm -f atf-c++/detail/expand.$(OBJEXT)
-	-rm -f atf-c++/detail/expand.lo
-	-rm -f atf-c++/detail/expand_test.$(OBJEXT)
-	-rm -f atf-c++/detail/fs.$(OBJEXT)
-	-rm -f atf-c++/detail/fs.lo
-	-rm -f atf-c++/detail/fs_test.$(OBJEXT)
-	-rm -f atf-c++/detail/parser.$(OBJEXT)
-	-rm -f atf-c++/detail/parser.lo
-	-rm -f atf-c++/detail/parser_test.$(OBJEXT)
-	-rm -f atf-c++/detail/process.$(OBJEXT)
-	-rm -f atf-c++/detail/process.lo
-	-rm -f atf-c++/detail/process_test.$(OBJEXT)
-	-rm -f atf-c++/detail/sanity_test.$(OBJEXT)
-	-rm -f atf-c++/detail/test_helpers.$(OBJEXT)
-	-rm -f atf-c++/detail/test_helpers.lo
-	-rm -f atf-c++/detail/text.$(OBJEXT)
-	-rm -f atf-c++/detail/text.lo
-	-rm -f atf-c++/detail/text_test.$(OBJEXT)
-	-rm -f atf-c++/detail/ui.$(OBJEXT)
-	-rm -f atf-c++/detail/ui.lo
-	-rm -f atf-c++/detail/ui_test.$(OBJEXT)
-	-rm -f atf-c++/macros_test.$(OBJEXT)
-	-rm -f atf-c++/tests.$(OBJEXT)
-	-rm -f atf-c++/tests.lo
-	-rm -f atf-c++/tests_test.$(OBJEXT)
-	-rm -f atf-c++/utils_test.$(OBJEXT)
-	-rm -f atf-c/atf_c_test.$(OBJEXT)
-	-rm -f atf-c/build_test.$(OBJEXT)
-	-rm -f atf-c/check_test.$(OBJEXT)
-	-rm -f atf-c/config_test.$(OBJEXT)
-	-rm -f atf-c/detail/atf_c_detail_libtest_helpers_la-test_helpers.$(OBJEXT)
-	-rm -f atf-c/detail/atf_c_detail_libtest_helpers_la-test_helpers.lo
-	-rm -f atf-c/detail/dynstr_test.$(OBJEXT)
-	-rm -f atf-c/detail/env_test.$(OBJEXT)
-	-rm -f atf-c/detail/fs_test.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-dynstr.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-dynstr.lo
-	-rm -f atf-c/detail/libatf_c_la-env.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-env.lo
-	-rm -f atf-c/detail/libatf_c_la-fs.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-fs.lo
-	-rm -f atf-c/detail/libatf_c_la-list.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-list.lo
-	-rm -f atf-c/detail/libatf_c_la-map.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-map.lo
-	-rm -f atf-c/detail/libatf_c_la-process.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-process.lo
-	-rm -f atf-c/detail/libatf_c_la-sanity.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-sanity.lo
-	-rm -f atf-c/detail/libatf_c_la-text.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-text.lo
-	-rm -f atf-c/detail/libatf_c_la-tp_main.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-tp_main.lo
-	-rm -f atf-c/detail/libatf_c_la-user.$(OBJEXT)
-	-rm -f atf-c/detail/libatf_c_la-user.lo
-	-rm -f atf-c/detail/list_test.$(OBJEXT)
-	-rm -f atf-c/detail/map_test.$(OBJEXT)
-	-rm -f atf-c/detail/process_helpers.$(OBJEXT)
-	-rm -f atf-c/detail/process_test.$(OBJEXT)
-	-rm -f atf-c/detail/sanity_test.$(OBJEXT)
-	-rm -f atf-c/detail/test_helpers_test.$(OBJEXT)
-	-rm -f atf-c/detail/text_test.$(OBJEXT)
-	-rm -f atf-c/detail/user_test.$(OBJEXT)
-	-rm -f atf-c/error_test.$(OBJEXT)
-	-rm -f atf-c/libatf_c_la-build.$(OBJEXT)
-	-rm -f atf-c/libatf_c_la-build.lo
-	-rm -f atf-c/libatf_c_la-check.$(OBJEXT)
-	-rm -f atf-c/libatf_c_la-check.lo
-	-rm -f atf-c/libatf_c_la-config.$(OBJEXT)
-	-rm -f atf-c/libatf_c_la-config.lo
-	-rm -f atf-c/libatf_c_la-error.$(OBJEXT)
-	-rm -f atf-c/libatf_c_la-error.lo
-	-rm -f atf-c/libatf_c_la-tc.$(OBJEXT)
-	-rm -f atf-c/libatf_c_la-tc.lo
-	-rm -f atf-c/libatf_c_la-tp.$(OBJEXT)
-	-rm -f atf-c/libatf_c_la-tp.lo
-	-rm -f atf-c/libatf_c_la-utils.$(OBJEXT)
-	-rm -f atf-c/libatf_c_la-utils.lo
-	-rm -f atf-c/macros_test.$(OBJEXT)
-	-rm -f atf-c/tc_test.$(OBJEXT)
-	-rm -f atf-c/tp_test.$(OBJEXT)
-	-rm -f atf-c/utils_test.$(OBJEXT)
-	-rm -f atf-config/atf-config.$(OBJEXT)
-	-rm -f atf-report/atf-report.$(OBJEXT)
-	-rm -f atf-report/atf_report_reader_test-reader.$(OBJEXT)
-	-rm -f atf-report/atf_report_reader_test-reader_test.$(OBJEXT)
-	-rm -f atf-report/fail_helper.$(OBJEXT)
-	-rm -f atf-report/misc_helpers.$(OBJEXT)
-	-rm -f atf-report/pass_helper.$(OBJEXT)
-	-rm -f atf-report/reader.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-atf-run.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-atffile.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-config.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-fs.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-io.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-requirements.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-signals.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-test-program.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-timer.$(OBJEXT)
-	-rm -f atf-run/atf_run_atf_run-user.$(OBJEXT)
-	-rm -f atf-run/atf_run_atffile_test-atffile.$(OBJEXT)
-	-rm -f atf-run/atf_run_atffile_test-atffile_test.$(OBJEXT)
-	-rm -f atf-run/atf_run_config_test-config.$(OBJEXT)
-	-rm -f atf-run/atf_run_config_test-config_test.$(OBJEXT)
-	-rm -f atf-run/atf_run_test_program_test-fs.$(OBJEXT)
-	-rm -f atf-run/atf_run_test_program_test-io.$(OBJEXT)
-	-rm -f atf-run/atf_run_test_program_test-requirements.$(OBJEXT)
-	-rm -f atf-run/atf_run_test_program_test-signals.$(OBJEXT)
-	-rm -f atf-run/atf_run_test_program_test-test-program.$(OBJEXT)
-	-rm -f atf-run/atf_run_test_program_test-test_program_test.$(OBJEXT)
-	-rm -f atf-run/atf_run_test_program_test-timer.$(OBJEXT)
-	-rm -f atf-run/atf_run_test_program_test-user.$(OBJEXT)
-	-rm -f atf-run/bad_metadata_helper.$(OBJEXT)
-	-rm -f atf-run/expect_helpers.$(OBJEXT)
-	-rm -f atf-run/fs.$(OBJEXT)
-	-rm -f atf-run/fs_test.$(OBJEXT)
-	-rm -f atf-run/io.$(OBJEXT)
-	-rm -f atf-run/io_test.$(OBJEXT)
-	-rm -f atf-run/misc_helpers.$(OBJEXT)
-	-rm -f atf-run/pass_helper.$(OBJEXT)
-	-rm -f atf-run/requirements.$(OBJEXT)
-	-rm -f atf-run/requirements_test.$(OBJEXT)
-	-rm -f atf-run/several_tcs_helper.$(OBJEXT)
-	-rm -f atf-run/signals.$(OBJEXT)
-	-rm -f atf-run/signals_test.$(OBJEXT)
-	-rm -f atf-run/user.$(OBJEXT)
-	-rm -f atf-run/user_test.$(OBJEXT)
-	-rm -f atf-run/zero_tcs_helper.$(OBJEXT)
-	-rm -f atf-sh/atf-check.$(OBJEXT)
-	-rm -f atf-sh/atf-sh.$(OBJEXT)
-	-rm -f atf-version/atf_version_atf_version-atf-version.$(OBJEXT)
-	-rm -f bootstrap/h_app_empty.$(OBJEXT)
-	-rm -f bootstrap/h_app_opts_args.$(OBJEXT)
-	-rm -f bootstrap/h_tp_basic_c.$(OBJEXT)
-	-rm -f bootstrap/h_tp_basic_cpp.$(OBJEXT)
-	-rm -f test-programs/c_helpers.$(OBJEXT)
-	-rm -f test-programs/cpp_helpers.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/atf_c++_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/build.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/build_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/check.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/check_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/config_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/macros_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/tests.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/tests_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/$(DEPDIR)/utils_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/application.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/application_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/env.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/env_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/exceptions.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/exceptions_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/expand.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/expand_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/fs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/fs_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/parser.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/parser_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/process.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/process_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/sanity_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/test_helpers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/text.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/text_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/ui.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c++/detail/$(DEPDIR)/ui_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/atf_c_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/build_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/check_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/config_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/error_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/libatf_c_la-build.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/libatf_c_la-check.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/libatf_c_la-config.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/libatf_c_la-error.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/libatf_c_la-tc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/libatf_c_la-tp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/libatf_c_la-utils.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/macros_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/tc_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/tp_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/$(DEPDIR)/utils_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/atf_c_detail_libtest_helpers_la-test_helpers.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/dynstr_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/env_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/fs_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-dynstr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-env.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-fs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-list.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-map.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-process.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-sanity.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-text.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-tp_main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/libatf_c_la-user.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/list_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/map_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/process_helpers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/process_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/sanity_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/test_helpers_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/text_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-c/detail/$(DEPDIR)/user_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-config/$(DEPDIR)/atf-config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/atf-report.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/atf_report_reader_test-reader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/fail_helper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/misc_helpers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/pass_helper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-report/$(DEPDIR)/reader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-fs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-io.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-signals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-timer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atf_run-user.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_config_test-config.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_config_test-config_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-io.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/atf_run_test_program_test-user.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/bad_metadata_helper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/expect_helpers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/fs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/fs_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/io.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/io_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/misc_helpers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/pass_helper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/requirements.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/requirements_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/several_tcs_helper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/signals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/signals_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/user.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/user_test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-run/$(DEPDIR)/zero_tcs_helper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-sh/$(DEPDIR)/atf-check.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-sh/$(DEPDIR)/atf-sh.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_app_empty.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_app_opts_args.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_tp_basic_c.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@bootstrap/$(DEPDIR)/h_tp_basic_cpp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@test-programs/$(DEPDIR)/c_helpers.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@test-programs/$(DEPDIR)/cpp_helpers.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-atf-c/detail/atf_c_detail_libtest_helpers_la-test_helpers.lo: atf-c/detail/test_helpers.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_c_detail_libtest_helpers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/atf_c_detail_libtest_helpers_la-test_helpers.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/atf_c_detail_libtest_helpers_la-test_helpers.Tpo -c -o atf-c/detail/atf_c_detail_libtest_helpers_la-test_helpers.lo `test -f 'atf-c/detail/test_helpers.c' || echo '$(srcdir)/'`atf-c/detail/test_helpers.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/atf_c_detail_libtest_helpers_la-test_helpers.Tpo atf-c/detail/$(DEPDIR)/atf_c_detail_libtest_helpers_la-test_helpers.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/test_helpers.c' object='atf-c/detail/atf_c_detail_libtest_helpers_la-test_helpers.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_c_detail_libtest_helpers_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/atf_c_detail_libtest_helpers_la-test_helpers.lo `test -f 'atf-c/detail/test_helpers.c' || echo '$(srcdir)/'`atf-c/detail/test_helpers.c
-
-atf-c/libatf_c_la-build.lo: atf-c/build.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/libatf_c_la-build.lo -MD -MP -MF atf-c/$(DEPDIR)/libatf_c_la-build.Tpo -c -o atf-c/libatf_c_la-build.lo `test -f 'atf-c/build.c' || echo '$(srcdir)/'`atf-c/build.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/$(DEPDIR)/libatf_c_la-build.Tpo atf-c/$(DEPDIR)/libatf_c_la-build.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/build.c' object='atf-c/libatf_c_la-build.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/libatf_c_la-build.lo `test -f 'atf-c/build.c' || echo '$(srcdir)/'`atf-c/build.c
-
-atf-c/libatf_c_la-check.lo: atf-c/check.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/libatf_c_la-check.lo -MD -MP -MF atf-c/$(DEPDIR)/libatf_c_la-check.Tpo -c -o atf-c/libatf_c_la-check.lo `test -f 'atf-c/check.c' || echo '$(srcdir)/'`atf-c/check.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/$(DEPDIR)/libatf_c_la-check.Tpo atf-c/$(DEPDIR)/libatf_c_la-check.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/check.c' object='atf-c/libatf_c_la-check.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/libatf_c_la-check.lo `test -f 'atf-c/check.c' || echo '$(srcdir)/'`atf-c/check.c
-
-atf-c/libatf_c_la-config.lo: atf-c/config.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/libatf_c_la-config.lo -MD -MP -MF atf-c/$(DEPDIR)/libatf_c_la-config.Tpo -c -o atf-c/libatf_c_la-config.lo `test -f 'atf-c/config.c' || echo '$(srcdir)/'`atf-c/config.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/$(DEPDIR)/libatf_c_la-config.Tpo atf-c/$(DEPDIR)/libatf_c_la-config.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/config.c' object='atf-c/libatf_c_la-config.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/libatf_c_la-config.lo `test -f 'atf-c/config.c' || echo '$(srcdir)/'`atf-c/config.c
-
-atf-c/libatf_c_la-error.lo: atf-c/error.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/libatf_c_la-error.lo -MD -MP -MF atf-c/$(DEPDIR)/libatf_c_la-error.Tpo -c -o atf-c/libatf_c_la-error.lo `test -f 'atf-c/error.c' || echo '$(srcdir)/'`atf-c/error.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/$(DEPDIR)/libatf_c_la-error.Tpo atf-c/$(DEPDIR)/libatf_c_la-error.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/error.c' object='atf-c/libatf_c_la-error.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/libatf_c_la-error.lo `test -f 'atf-c/error.c' || echo '$(srcdir)/'`atf-c/error.c
-
-atf-c/libatf_c_la-tc.lo: atf-c/tc.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/libatf_c_la-tc.lo -MD -MP -MF atf-c/$(DEPDIR)/libatf_c_la-tc.Tpo -c -o atf-c/libatf_c_la-tc.lo `test -f 'atf-c/tc.c' || echo '$(srcdir)/'`atf-c/tc.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/$(DEPDIR)/libatf_c_la-tc.Tpo atf-c/$(DEPDIR)/libatf_c_la-tc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/tc.c' object='atf-c/libatf_c_la-tc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/libatf_c_la-tc.lo `test -f 'atf-c/tc.c' || echo '$(srcdir)/'`atf-c/tc.c
-
-atf-c/libatf_c_la-tp.lo: atf-c/tp.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/libatf_c_la-tp.lo -MD -MP -MF atf-c/$(DEPDIR)/libatf_c_la-tp.Tpo -c -o atf-c/libatf_c_la-tp.lo `test -f 'atf-c/tp.c' || echo '$(srcdir)/'`atf-c/tp.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/$(DEPDIR)/libatf_c_la-tp.Tpo atf-c/$(DEPDIR)/libatf_c_la-tp.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/tp.c' object='atf-c/libatf_c_la-tp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/libatf_c_la-tp.lo `test -f 'atf-c/tp.c' || echo '$(srcdir)/'`atf-c/tp.c
-
-atf-c/libatf_c_la-utils.lo: atf-c/utils.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/libatf_c_la-utils.lo -MD -MP -MF atf-c/$(DEPDIR)/libatf_c_la-utils.Tpo -c -o atf-c/libatf_c_la-utils.lo `test -f 'atf-c/utils.c' || echo '$(srcdir)/'`atf-c/utils.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/$(DEPDIR)/libatf_c_la-utils.Tpo atf-c/$(DEPDIR)/libatf_c_la-utils.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/utils.c' object='atf-c/libatf_c_la-utils.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/libatf_c_la-utils.lo `test -f 'atf-c/utils.c' || echo '$(srcdir)/'`atf-c/utils.c
-
-atf-c/detail/libatf_c_la-dynstr.lo: atf-c/detail/dynstr.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-dynstr.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-dynstr.Tpo -c -o atf-c/detail/libatf_c_la-dynstr.lo `test -f 'atf-c/detail/dynstr.c' || echo '$(srcdir)/'`atf-c/detail/dynstr.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-dynstr.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-dynstr.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/dynstr.c' object='atf-c/detail/libatf_c_la-dynstr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-dynstr.lo `test -f 'atf-c/detail/dynstr.c' || echo '$(srcdir)/'`atf-c/detail/dynstr.c
-
-atf-c/detail/libatf_c_la-env.lo: atf-c/detail/env.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-env.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-env.Tpo -c -o atf-c/detail/libatf_c_la-env.lo `test -f 'atf-c/detail/env.c' || echo '$(srcdir)/'`atf-c/detail/env.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-env.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-env.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/env.c' object='atf-c/detail/libatf_c_la-env.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-env.lo `test -f 'atf-c/detail/env.c' || echo '$(srcdir)/'`atf-c/detail/env.c
-
-atf-c/detail/libatf_c_la-fs.lo: atf-c/detail/fs.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-fs.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-fs.Tpo -c -o atf-c/detail/libatf_c_la-fs.lo `test -f 'atf-c/detail/fs.c' || echo '$(srcdir)/'`atf-c/detail/fs.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-fs.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-fs.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/fs.c' object='atf-c/detail/libatf_c_la-fs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-fs.lo `test -f 'atf-c/detail/fs.c' || echo '$(srcdir)/'`atf-c/detail/fs.c
-
-atf-c/detail/libatf_c_la-list.lo: atf-c/detail/list.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-list.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-list.Tpo -c -o atf-c/detail/libatf_c_la-list.lo `test -f 'atf-c/detail/list.c' || echo '$(srcdir)/'`atf-c/detail/list.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-list.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-list.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/list.c' object='atf-c/detail/libatf_c_la-list.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-list.lo `test -f 'atf-c/detail/list.c' || echo '$(srcdir)/'`atf-c/detail/list.c
-
-atf-c/detail/libatf_c_la-map.lo: atf-c/detail/map.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-map.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-map.Tpo -c -o atf-c/detail/libatf_c_la-map.lo `test -f 'atf-c/detail/map.c' || echo '$(srcdir)/'`atf-c/detail/map.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-map.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-map.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/map.c' object='atf-c/detail/libatf_c_la-map.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-map.lo `test -f 'atf-c/detail/map.c' || echo '$(srcdir)/'`atf-c/detail/map.c
-
-atf-c/detail/libatf_c_la-process.lo: atf-c/detail/process.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-process.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-process.Tpo -c -o atf-c/detail/libatf_c_la-process.lo `test -f 'atf-c/detail/process.c' || echo '$(srcdir)/'`atf-c/detail/process.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-process.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-process.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/process.c' object='atf-c/detail/libatf_c_la-process.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-process.lo `test -f 'atf-c/detail/process.c' || echo '$(srcdir)/'`atf-c/detail/process.c
-
-atf-c/detail/libatf_c_la-sanity.lo: atf-c/detail/sanity.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-sanity.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-sanity.Tpo -c -o atf-c/detail/libatf_c_la-sanity.lo `test -f 'atf-c/detail/sanity.c' || echo '$(srcdir)/'`atf-c/detail/sanity.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-sanity.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-sanity.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/sanity.c' object='atf-c/detail/libatf_c_la-sanity.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-sanity.lo `test -f 'atf-c/detail/sanity.c' || echo '$(srcdir)/'`atf-c/detail/sanity.c
-
-atf-c/detail/libatf_c_la-text.lo: atf-c/detail/text.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-text.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-text.Tpo -c -o atf-c/detail/libatf_c_la-text.lo `test -f 'atf-c/detail/text.c' || echo '$(srcdir)/'`atf-c/detail/text.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-text.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-text.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/text.c' object='atf-c/detail/libatf_c_la-text.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-text.lo `test -f 'atf-c/detail/text.c' || echo '$(srcdir)/'`atf-c/detail/text.c
-
-atf-c/detail/libatf_c_la-tp_main.lo: atf-c/detail/tp_main.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-tp_main.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-tp_main.Tpo -c -o atf-c/detail/libatf_c_la-tp_main.lo `test -f 'atf-c/detail/tp_main.c' || echo '$(srcdir)/'`atf-c/detail/tp_main.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-tp_main.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-tp_main.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/tp_main.c' object='atf-c/detail/libatf_c_la-tp_main.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-tp_main.lo `test -f 'atf-c/detail/tp_main.c' || echo '$(srcdir)/'`atf-c/detail/tp_main.c
-
-atf-c/detail/libatf_c_la-user.lo: atf-c/detail/user.c
-@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT atf-c/detail/libatf_c_la-user.lo -MD -MP -MF atf-c/detail/$(DEPDIR)/libatf_c_la-user.Tpo -c -o atf-c/detail/libatf_c_la-user.lo `test -f 'atf-c/detail/user.c' || echo '$(srcdir)/'`atf-c/detail/user.c
-@am__fastdepCC_TRUE@	$(am__mv) atf-c/detail/$(DEPDIR)/libatf_c_la-user.Tpo atf-c/detail/$(DEPDIR)/libatf_c_la-user.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='atf-c/detail/user.c' object='atf-c/detail/libatf_c_la-user.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libatf_c_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o atf-c/detail/libatf_c_la-user.lo `test -f 'atf-c/detail/user.c' || echo '$(srcdir)/'`atf-c/detail/user.c
-
-.cpp.o:
-@am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-
-.cpp.obj:
-@am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
-@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cpp.lo:
-@am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
-@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
-@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-
-atf-report/atf_report_reader_test-reader_test.o: atf-report/reader_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-report/atf_report_reader_test-reader_test.o -MD -MP -MF atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Tpo -c -o atf-report/atf_report_reader_test-reader_test.o `test -f 'atf-report/reader_test.cpp' || echo '$(srcdir)/'`atf-report/reader_test.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Tpo atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-report/reader_test.cpp' object='atf-report/atf_report_reader_test-reader_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-report/atf_report_reader_test-reader_test.o `test -f 'atf-report/reader_test.cpp' || echo '$(srcdir)/'`atf-report/reader_test.cpp
-
-atf-report/atf_report_reader_test-reader_test.obj: atf-report/reader_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-report/atf_report_reader_test-reader_test.obj -MD -MP -MF atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Tpo -c -o atf-report/atf_report_reader_test-reader_test.obj `if test -f 'atf-report/reader_test.cpp'; then $(CYGPATH_W) 'atf-report/reader_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-report/reader_test.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Tpo atf-report/$(DEPDIR)/atf_report_reader_test-reader_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-report/reader_test.cpp' object='atf-report/atf_report_reader_test-reader_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-report/atf_report_reader_test-reader_test.obj `if test -f 'atf-report/reader_test.cpp'; then $(CYGPATH_W) 'atf-report/reader_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-report/reader_test.cpp'; fi`
-
-atf-report/atf_report_reader_test-reader.o: atf-report/reader.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-report/atf_report_reader_test-reader.o -MD -MP -MF atf-report/$(DEPDIR)/atf_report_reader_test-reader.Tpo -c -o atf-report/atf_report_reader_test-reader.o `test -f 'atf-report/reader.cpp' || echo '$(srcdir)/'`atf-report/reader.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-report/$(DEPDIR)/atf_report_reader_test-reader.Tpo atf-report/$(DEPDIR)/atf_report_reader_test-reader.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-report/reader.cpp' object='atf-report/atf_report_reader_test-reader.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-report/atf_report_reader_test-reader.o `test -f 'atf-report/reader.cpp' || echo '$(srcdir)/'`atf-report/reader.cpp
-
-atf-report/atf_report_reader_test-reader.obj: atf-report/reader.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-report/atf_report_reader_test-reader.obj -MD -MP -MF atf-report/$(DEPDIR)/atf_report_reader_test-reader.Tpo -c -o atf-report/atf_report_reader_test-reader.obj `if test -f 'atf-report/reader.cpp'; then $(CYGPATH_W) 'atf-report/reader.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-report/reader.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-report/$(DEPDIR)/atf_report_reader_test-reader.Tpo atf-report/$(DEPDIR)/atf_report_reader_test-reader.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-report/reader.cpp' object='atf-report/atf_report_reader_test-reader.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_report_reader_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-report/atf_report_reader_test-reader.obj `if test -f 'atf-report/reader.cpp'; then $(CYGPATH_W) 'atf-report/reader.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-report/reader.cpp'; fi`
-
-atf-run/atf_run_atf_run-atf-run.o: atf-run/atf-run.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-atf-run.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Tpo -c -o atf-run/atf_run_atf_run-atf-run.o `test -f 'atf-run/atf-run.cpp' || echo '$(srcdir)/'`atf-run/atf-run.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/atf-run.cpp' object='atf-run/atf_run_atf_run-atf-run.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-atf-run.o `test -f 'atf-run/atf-run.cpp' || echo '$(srcdir)/'`atf-run/atf-run.cpp
-
-atf-run/atf_run_atf_run-atf-run.obj: atf-run/atf-run.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-atf-run.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Tpo -c -o atf-run/atf_run_atf_run-atf-run.obj `if test -f 'atf-run/atf-run.cpp'; then $(CYGPATH_W) 'atf-run/atf-run.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atf-run.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-atf-run.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/atf-run.cpp' object='atf-run/atf_run_atf_run-atf-run.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-atf-run.obj `if test -f 'atf-run/atf-run.cpp'; then $(CYGPATH_W) 'atf-run/atf-run.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atf-run.cpp'; fi`
-
-atf-run/atf_run_atf_run-atffile.o: atf-run/atffile.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-atffile.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Tpo -c -o atf-run/atf_run_atf_run-atffile.o `test -f 'atf-run/atffile.cpp' || echo '$(srcdir)/'`atf-run/atffile.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/atffile.cpp' object='atf-run/atf_run_atf_run-atffile.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-atffile.o `test -f 'atf-run/atffile.cpp' || echo '$(srcdir)/'`atf-run/atffile.cpp
-
-atf-run/atf_run_atf_run-atffile.obj: atf-run/atffile.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-atffile.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Tpo -c -o atf-run/atf_run_atf_run-atffile.obj `if test -f 'atf-run/atffile.cpp'; then $(CYGPATH_W) 'atf-run/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-atffile.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/atffile.cpp' object='atf-run/atf_run_atf_run-atffile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-atffile.obj `if test -f 'atf-run/atffile.cpp'; then $(CYGPATH_W) 'atf-run/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile.cpp'; fi`
-
-atf-run/atf_run_atf_run-config.o: atf-run/config.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-config.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-config.Tpo -c -o atf-run/atf_run_atf_run-config.o `test -f 'atf-run/config.cpp' || echo '$(srcdir)/'`atf-run/config.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-config.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-config.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/config.cpp' object='atf-run/atf_run_atf_run-config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-config.o `test -f 'atf-run/config.cpp' || echo '$(srcdir)/'`atf-run/config.cpp
-
-atf-run/atf_run_atf_run-config.obj: atf-run/config.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-config.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-config.Tpo -c -o atf-run/atf_run_atf_run-config.obj `if test -f 'atf-run/config.cpp'; then $(CYGPATH_W) 'atf-run/config.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-config.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-config.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/config.cpp' object='atf-run/atf_run_atf_run-config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-config.obj `if test -f 'atf-run/config.cpp'; then $(CYGPATH_W) 'atf-run/config.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config.cpp'; fi`
-
-atf-run/atf_run_atf_run-fs.o: atf-run/fs.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-fs.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-fs.Tpo -c -o atf-run/atf_run_atf_run-fs.o `test -f 'atf-run/fs.cpp' || echo '$(srcdir)/'`atf-run/fs.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-fs.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-fs.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/fs.cpp' object='atf-run/atf_run_atf_run-fs.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-fs.o `test -f 'atf-run/fs.cpp' || echo '$(srcdir)/'`atf-run/fs.cpp
-
-atf-run/atf_run_atf_run-fs.obj: atf-run/fs.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-fs.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-fs.Tpo -c -o atf-run/atf_run_atf_run-fs.obj `if test -f 'atf-run/fs.cpp'; then $(CYGPATH_W) 'atf-run/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/fs.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-fs.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-fs.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/fs.cpp' object='atf-run/atf_run_atf_run-fs.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-fs.obj `if test -f 'atf-run/fs.cpp'; then $(CYGPATH_W) 'atf-run/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/fs.cpp'; fi`
-
-atf-run/atf_run_atf_run-io.o: atf-run/io.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-io.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-io.Tpo -c -o atf-run/atf_run_atf_run-io.o `test -f 'atf-run/io.cpp' || echo '$(srcdir)/'`atf-run/io.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-io.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-io.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/io.cpp' object='atf-run/atf_run_atf_run-io.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-io.o `test -f 'atf-run/io.cpp' || echo '$(srcdir)/'`atf-run/io.cpp
-
-atf-run/atf_run_atf_run-io.obj: atf-run/io.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-io.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-io.Tpo -c -o atf-run/atf_run_atf_run-io.obj `if test -f 'atf-run/io.cpp'; then $(CYGPATH_W) 'atf-run/io.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/io.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-io.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-io.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/io.cpp' object='atf-run/atf_run_atf_run-io.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-io.obj `if test -f 'atf-run/io.cpp'; then $(CYGPATH_W) 'atf-run/io.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/io.cpp'; fi`
-
-atf-run/atf_run_atf_run-requirements.o: atf-run/requirements.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-requirements.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Tpo -c -o atf-run/atf_run_atf_run-requirements.o `test -f 'atf-run/requirements.cpp' || echo '$(srcdir)/'`atf-run/requirements.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/requirements.cpp' object='atf-run/atf_run_atf_run-requirements.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-requirements.o `test -f 'atf-run/requirements.cpp' || echo '$(srcdir)/'`atf-run/requirements.cpp
-
-atf-run/atf_run_atf_run-requirements.obj: atf-run/requirements.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-requirements.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Tpo -c -o atf-run/atf_run_atf_run-requirements.obj `if test -f 'atf-run/requirements.cpp'; then $(CYGPATH_W) 'atf-run/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/requirements.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-requirements.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/requirements.cpp' object='atf-run/atf_run_atf_run-requirements.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-requirements.obj `if test -f 'atf-run/requirements.cpp'; then $(CYGPATH_W) 'atf-run/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/requirements.cpp'; fi`
-
-atf-run/atf_run_atf_run-signals.o: atf-run/signals.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-signals.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-signals.Tpo -c -o atf-run/atf_run_atf_run-signals.o `test -f 'atf-run/signals.cpp' || echo '$(srcdir)/'`atf-run/signals.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-signals.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-signals.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/signals.cpp' object='atf-run/atf_run_atf_run-signals.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-signals.o `test -f 'atf-run/signals.cpp' || echo '$(srcdir)/'`atf-run/signals.cpp
-
-atf-run/atf_run_atf_run-signals.obj: atf-run/signals.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-signals.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-signals.Tpo -c -o atf-run/atf_run_atf_run-signals.obj `if test -f 'atf-run/signals.cpp'; then $(CYGPATH_W) 'atf-run/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/signals.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-signals.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-signals.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/signals.cpp' object='atf-run/atf_run_atf_run-signals.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-signals.obj `if test -f 'atf-run/signals.cpp'; then $(CYGPATH_W) 'atf-run/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/signals.cpp'; fi`
-
-atf-run/atf_run_atf_run-test-program.o: atf-run/test-program.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-test-program.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Tpo -c -o atf-run/atf_run_atf_run-test-program.o `test -f 'atf-run/test-program.cpp' || echo '$(srcdir)/'`atf-run/test-program.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/test-program.cpp' object='atf-run/atf_run_atf_run-test-program.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-test-program.o `test -f 'atf-run/test-program.cpp' || echo '$(srcdir)/'`atf-run/test-program.cpp
-
-atf-run/atf_run_atf_run-test-program.obj: atf-run/test-program.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-test-program.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Tpo -c -o atf-run/atf_run_atf_run-test-program.obj `if test -f 'atf-run/test-program.cpp'; then $(CYGPATH_W) 'atf-run/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test-program.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-test-program.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/test-program.cpp' object='atf-run/atf_run_atf_run-test-program.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-test-program.obj `if test -f 'atf-run/test-program.cpp'; then $(CYGPATH_W) 'atf-run/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test-program.cpp'; fi`
-
-atf-run/atf_run_atf_run-timer.o: atf-run/timer.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-timer.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-timer.Tpo -c -o atf-run/atf_run_atf_run-timer.o `test -f 'atf-run/timer.cpp' || echo '$(srcdir)/'`atf-run/timer.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-timer.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-timer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/timer.cpp' object='atf-run/atf_run_atf_run-timer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-timer.o `test -f 'atf-run/timer.cpp' || echo '$(srcdir)/'`atf-run/timer.cpp
-
-atf-run/atf_run_atf_run-timer.obj: atf-run/timer.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-timer.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-timer.Tpo -c -o atf-run/atf_run_atf_run-timer.obj `if test -f 'atf-run/timer.cpp'; then $(CYGPATH_W) 'atf-run/timer.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/timer.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-timer.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-timer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/timer.cpp' object='atf-run/atf_run_atf_run-timer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-timer.obj `if test -f 'atf-run/timer.cpp'; then $(CYGPATH_W) 'atf-run/timer.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/timer.cpp'; fi`
-
-atf-run/atf_run_atf_run-user.o: atf-run/user.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-user.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-user.Tpo -c -o atf-run/atf_run_atf_run-user.o `test -f 'atf-run/user.cpp' || echo '$(srcdir)/'`atf-run/user.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-user.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-user.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/user.cpp' object='atf-run/atf_run_atf_run-user.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-user.o `test -f 'atf-run/user.cpp' || echo '$(srcdir)/'`atf-run/user.cpp
-
-atf-run/atf_run_atf_run-user.obj: atf-run/user.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atf_run-user.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atf_run-user.Tpo -c -o atf-run/atf_run_atf_run-user.obj `if test -f 'atf-run/user.cpp'; then $(CYGPATH_W) 'atf-run/user.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/user.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atf_run-user.Tpo atf-run/$(DEPDIR)/atf_run_atf_run-user.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/user.cpp' object='atf-run/atf_run_atf_run-user.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atf_run_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atf_run-user.obj `if test -f 'atf-run/user.cpp'; then $(CYGPATH_W) 'atf-run/user.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/user.cpp'; fi`
-
-atf-run/atf_run_atffile_test-atffile_test.o: atf-run/atffile_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atffile_test-atffile_test.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Tpo -c -o atf-run/atf_run_atffile_test-atffile_test.o `test -f 'atf-run/atffile_test.cpp' || echo '$(srcdir)/'`atf-run/atffile_test.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Tpo atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/atffile_test.cpp' object='atf-run/atf_run_atffile_test-atffile_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atffile_test-atffile_test.o `test -f 'atf-run/atffile_test.cpp' || echo '$(srcdir)/'`atf-run/atffile_test.cpp
-
-atf-run/atf_run_atffile_test-atffile_test.obj: atf-run/atffile_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atffile_test-atffile_test.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Tpo -c -o atf-run/atf_run_atffile_test-atffile_test.obj `if test -f 'atf-run/atffile_test.cpp'; then $(CYGPATH_W) 'atf-run/atffile_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile_test.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Tpo atf-run/$(DEPDIR)/atf_run_atffile_test-atffile_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/atffile_test.cpp' object='atf-run/atf_run_atffile_test-atffile_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atffile_test-atffile_test.obj `if test -f 'atf-run/atffile_test.cpp'; then $(CYGPATH_W) 'atf-run/atffile_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile_test.cpp'; fi`
-
-atf-run/atf_run_atffile_test-atffile.o: atf-run/atffile.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atffile_test-atffile.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Tpo -c -o atf-run/atf_run_atffile_test-atffile.o `test -f 'atf-run/atffile.cpp' || echo '$(srcdir)/'`atf-run/atffile.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Tpo atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/atffile.cpp' object='atf-run/atf_run_atffile_test-atffile.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atffile_test-atffile.o `test -f 'atf-run/atffile.cpp' || echo '$(srcdir)/'`atf-run/atffile.cpp
-
-atf-run/atf_run_atffile_test-atffile.obj: atf-run/atffile.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_atffile_test-atffile.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Tpo -c -o atf-run/atf_run_atffile_test-atffile.obj `if test -f 'atf-run/atffile.cpp'; then $(CYGPATH_W) 'atf-run/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Tpo atf-run/$(DEPDIR)/atf_run_atffile_test-atffile.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/atffile.cpp' object='atf-run/atf_run_atffile_test-atffile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_atffile_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_atffile_test-atffile.obj `if test -f 'atf-run/atffile.cpp'; then $(CYGPATH_W) 'atf-run/atffile.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/atffile.cpp'; fi`
-
-atf-run/atf_run_config_test-config_test.o: atf-run/config_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_config_test-config_test.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_config_test-config_test.Tpo -c -o atf-run/atf_run_config_test-config_test.o `test -f 'atf-run/config_test.cpp' || echo '$(srcdir)/'`atf-run/config_test.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_config_test-config_test.Tpo atf-run/$(DEPDIR)/atf_run_config_test-config_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/config_test.cpp' object='atf-run/atf_run_config_test-config_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_config_test-config_test.o `test -f 'atf-run/config_test.cpp' || echo '$(srcdir)/'`atf-run/config_test.cpp
-
-atf-run/atf_run_config_test-config_test.obj: atf-run/config_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_config_test-config_test.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_config_test-config_test.Tpo -c -o atf-run/atf_run_config_test-config_test.obj `if test -f 'atf-run/config_test.cpp'; then $(CYGPATH_W) 'atf-run/config_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config_test.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_config_test-config_test.Tpo atf-run/$(DEPDIR)/atf_run_config_test-config_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/config_test.cpp' object='atf-run/atf_run_config_test-config_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_config_test-config_test.obj `if test -f 'atf-run/config_test.cpp'; then $(CYGPATH_W) 'atf-run/config_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config_test.cpp'; fi`
-
-atf-run/atf_run_config_test-config.o: atf-run/config.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_config_test-config.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_config_test-config.Tpo -c -o atf-run/atf_run_config_test-config.o `test -f 'atf-run/config.cpp' || echo '$(srcdir)/'`atf-run/config.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_config_test-config.Tpo atf-run/$(DEPDIR)/atf_run_config_test-config.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/config.cpp' object='atf-run/atf_run_config_test-config.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_config_test-config.o `test -f 'atf-run/config.cpp' || echo '$(srcdir)/'`atf-run/config.cpp
-
-atf-run/atf_run_config_test-config.obj: atf-run/config.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_config_test-config.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_config_test-config.Tpo -c -o atf-run/atf_run_config_test-config.obj `if test -f 'atf-run/config.cpp'; then $(CYGPATH_W) 'atf-run/config.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_config_test-config.Tpo atf-run/$(DEPDIR)/atf_run_config_test-config.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/config.cpp' object='atf-run/atf_run_config_test-config.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_config_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_config_test-config.obj `if test -f 'atf-run/config.cpp'; then $(CYGPATH_W) 'atf-run/config.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/config.cpp'; fi`
-
-atf-run/atf_run_test_program_test-test_program_test.o: atf-run/test_program_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-test_program_test.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Tpo -c -o atf-run/atf_run_test_program_test-test_program_test.o `test -f 'atf-run/test_program_test.cpp' || echo '$(srcdir)/'`atf-run/test_program_test.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/test_program_test.cpp' object='atf-run/atf_run_test_program_test-test_program_test.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-test_program_test.o `test -f 'atf-run/test_program_test.cpp' || echo '$(srcdir)/'`atf-run/test_program_test.cpp
-
-atf-run/atf_run_test_program_test-test_program_test.obj: atf-run/test_program_test.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-test_program_test.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Tpo -c -o atf-run/atf_run_test_program_test-test_program_test.obj `if test -f 'atf-run/test_program_test.cpp'; then $(CYGPATH_W) 'atf-run/test_program_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test_program_test.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-test_program_test.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/test_program_test.cpp' object='atf-run/atf_run_test_program_test-test_program_test.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-test_program_test.obj `if test -f 'atf-run/test_program_test.cpp'; then $(CYGPATH_W) 'atf-run/test_program_test.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test_program_test.cpp'; fi`
-
-atf-run/atf_run_test_program_test-fs.o: atf-run/fs.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-fs.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Tpo -c -o atf-run/atf_run_test_program_test-fs.o `test -f 'atf-run/fs.cpp' || echo '$(srcdir)/'`atf-run/fs.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/fs.cpp' object='atf-run/atf_run_test_program_test-fs.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-fs.o `test -f 'atf-run/fs.cpp' || echo '$(srcdir)/'`atf-run/fs.cpp
-
-atf-run/atf_run_test_program_test-fs.obj: atf-run/fs.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-fs.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Tpo -c -o atf-run/atf_run_test_program_test-fs.obj `if test -f 'atf-run/fs.cpp'; then $(CYGPATH_W) 'atf-run/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/fs.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-fs.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/fs.cpp' object='atf-run/atf_run_test_program_test-fs.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-fs.obj `if test -f 'atf-run/fs.cpp'; then $(CYGPATH_W) 'atf-run/fs.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/fs.cpp'; fi`
-
-atf-run/atf_run_test_program_test-io.o: atf-run/io.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-io.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-io.Tpo -c -o atf-run/atf_run_test_program_test-io.o `test -f 'atf-run/io.cpp' || echo '$(srcdir)/'`atf-run/io.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-io.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-io.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/io.cpp' object='atf-run/atf_run_test_program_test-io.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-io.o `test -f 'atf-run/io.cpp' || echo '$(srcdir)/'`atf-run/io.cpp
-
-atf-run/atf_run_test_program_test-io.obj: atf-run/io.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-io.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-io.Tpo -c -o atf-run/atf_run_test_program_test-io.obj `if test -f 'atf-run/io.cpp'; then $(CYGPATH_W) 'atf-run/io.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/io.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-io.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-io.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/io.cpp' object='atf-run/atf_run_test_program_test-io.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-io.obj `if test -f 'atf-run/io.cpp'; then $(CYGPATH_W) 'atf-run/io.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/io.cpp'; fi`
-
-atf-run/atf_run_test_program_test-requirements.o: atf-run/requirements.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-requirements.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Tpo -c -o atf-run/atf_run_test_program_test-requirements.o `test -f 'atf-run/requirements.cpp' || echo '$(srcdir)/'`atf-run/requirements.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/requirements.cpp' object='atf-run/atf_run_test_program_test-requirements.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-requirements.o `test -f 'atf-run/requirements.cpp' || echo '$(srcdir)/'`atf-run/requirements.cpp
-
-atf-run/atf_run_test_program_test-requirements.obj: atf-run/requirements.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-requirements.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Tpo -c -o atf-run/atf_run_test_program_test-requirements.obj `if test -f 'atf-run/requirements.cpp'; then $(CYGPATH_W) 'atf-run/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/requirements.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-requirements.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/requirements.cpp' object='atf-run/atf_run_test_program_test-requirements.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-requirements.obj `if test -f 'atf-run/requirements.cpp'; then $(CYGPATH_W) 'atf-run/requirements.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/requirements.cpp'; fi`
-
-atf-run/atf_run_test_program_test-signals.o: atf-run/signals.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-signals.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Tpo -c -o atf-run/atf_run_test_program_test-signals.o `test -f 'atf-run/signals.cpp' || echo '$(srcdir)/'`atf-run/signals.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/signals.cpp' object='atf-run/atf_run_test_program_test-signals.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-signals.o `test -f 'atf-run/signals.cpp' || echo '$(srcdir)/'`atf-run/signals.cpp
-
-atf-run/atf_run_test_program_test-signals.obj: atf-run/signals.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-signals.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Tpo -c -o atf-run/atf_run_test_program_test-signals.obj `if test -f 'atf-run/signals.cpp'; then $(CYGPATH_W) 'atf-run/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/signals.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-signals.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/signals.cpp' object='atf-run/atf_run_test_program_test-signals.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-signals.obj `if test -f 'atf-run/signals.cpp'; then $(CYGPATH_W) 'atf-run/signals.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/signals.cpp'; fi`
-
-atf-run/atf_run_test_program_test-test-program.o: atf-run/test-program.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-test-program.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Tpo -c -o atf-run/atf_run_test_program_test-test-program.o `test -f 'atf-run/test-program.cpp' || echo '$(srcdir)/'`atf-run/test-program.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/test-program.cpp' object='atf-run/atf_run_test_program_test-test-program.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-test-program.o `test -f 'atf-run/test-program.cpp' || echo '$(srcdir)/'`atf-run/test-program.cpp
-
-atf-run/atf_run_test_program_test-test-program.obj: atf-run/test-program.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-test-program.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Tpo -c -o atf-run/atf_run_test_program_test-test-program.obj `if test -f 'atf-run/test-program.cpp'; then $(CYGPATH_W) 'atf-run/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test-program.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-test-program.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/test-program.cpp' object='atf-run/atf_run_test_program_test-test-program.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-test-program.obj `if test -f 'atf-run/test-program.cpp'; then $(CYGPATH_W) 'atf-run/test-program.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/test-program.cpp'; fi`
-
-atf-run/atf_run_test_program_test-timer.o: atf-run/timer.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-timer.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Tpo -c -o atf-run/atf_run_test_program_test-timer.o `test -f 'atf-run/timer.cpp' || echo '$(srcdir)/'`atf-run/timer.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/timer.cpp' object='atf-run/atf_run_test_program_test-timer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-timer.o `test -f 'atf-run/timer.cpp' || echo '$(srcdir)/'`atf-run/timer.cpp
-
-atf-run/atf_run_test_program_test-timer.obj: atf-run/timer.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-timer.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Tpo -c -o atf-run/atf_run_test_program_test-timer.obj `if test -f 'atf-run/timer.cpp'; then $(CYGPATH_W) 'atf-run/timer.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/timer.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-timer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/timer.cpp' object='atf-run/atf_run_test_program_test-timer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-timer.obj `if test -f 'atf-run/timer.cpp'; then $(CYGPATH_W) 'atf-run/timer.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/timer.cpp'; fi`
-
-atf-run/atf_run_test_program_test-user.o: atf-run/user.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-user.o -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-user.Tpo -c -o atf-run/atf_run_test_program_test-user.o `test -f 'atf-run/user.cpp' || echo '$(srcdir)/'`atf-run/user.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-user.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-user.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/user.cpp' object='atf-run/atf_run_test_program_test-user.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-user.o `test -f 'atf-run/user.cpp' || echo '$(srcdir)/'`atf-run/user.cpp
-
-atf-run/atf_run_test_program_test-user.obj: atf-run/user.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-run/atf_run_test_program_test-user.obj -MD -MP -MF atf-run/$(DEPDIR)/atf_run_test_program_test-user.Tpo -c -o atf-run/atf_run_test_program_test-user.obj `if test -f 'atf-run/user.cpp'; then $(CYGPATH_W) 'atf-run/user.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/user.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-run/$(DEPDIR)/atf_run_test_program_test-user.Tpo atf-run/$(DEPDIR)/atf_run_test_program_test-user.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-run/user.cpp' object='atf-run/atf_run_test_program_test-user.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_run_test_program_test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-run/atf_run_test_program_test-user.obj `if test -f 'atf-run/user.cpp'; then $(CYGPATH_W) 'atf-run/user.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-run/user.cpp'; fi`
-
-atf-version/atf_version_atf_version-atf-version.o: atf-version/atf-version.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_version_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-version/atf_version_atf_version-atf-version.o -MD -MP -MF atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Tpo -c -o atf-version/atf_version_atf_version-atf-version.o `test -f 'atf-version/atf-version.cpp' || echo '$(srcdir)/'`atf-version/atf-version.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Tpo atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-version/atf-version.cpp' object='atf-version/atf_version_atf_version-atf-version.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_version_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-version/atf_version_atf_version-atf-version.o `test -f 'atf-version/atf-version.cpp' || echo '$(srcdir)/'`atf-version/atf-version.cpp
-
-atf-version/atf_version_atf_version-atf-version.obj: atf-version/atf-version.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_version_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT atf-version/atf_version_atf_version-atf-version.obj -MD -MP -MF atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Tpo -c -o atf-version/atf_version_atf_version-atf-version.obj `if test -f 'atf-version/atf-version.cpp'; then $(CYGPATH_W) 'atf-version/atf-version.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-version/atf-version.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Tpo atf-version/$(DEPDIR)/atf_version_atf_version-atf-version.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='atf-version/atf-version.cpp' object='atf-version/atf_version_atf_version-atf-version.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(atf_version_atf_version_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o atf-version/atf_version_atf_version-atf-version.obj `if test -f 'atf-version/atf-version.cpp'; then $(CYGPATH_W) 'atf-version/atf-version.cpp'; else $(CYGPATH_W) '$(srcdir)/atf-version/atf-version.cpp'; fi`
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-	-rm -rf atf-c/.libs atf-c/_libs
-	-rm -rf atf-c++/.libs atf-c++/_libs
-	-rm -rf atf-c++/detail/.libs atf-c++/detail/_libs
-	-rm -rf atf-c/detail/.libs atf-c/detail/_libs
-	-rm -rf atf-config/.libs atf-config/_libs
-	-rm -rf atf-report/.libs atf-report/_libs
-	-rm -rf atf-run/.libs atf-run/_libs
-	-rm -rf atf-sh/.libs atf-sh/_libs
-	-rm -rf atf-version/.libs atf-version/_libs
-	-rm -rf bootstrap/.libs bootstrap/_libs
-	-rm -rf test-programs/.libs test-programs/_libs
-
-distclean-libtool:
-	-rm -f libtool config.lt
-install-man1: $(dist_man_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man1:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man1dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.1[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
-install-man3: $(dist_man_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man3dir)" || $(MKDIR_P) "$(DESTDIR)$(man3dir)"
-	@list=''; test -n "$(man3dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.3[a-z]*$$/p'; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man3dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man3dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man3dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man3dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man3:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man3dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.3[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^3][0-9a-z]*$$,3,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man3dir)'; $(am__uninstall_files_from_dir)
-install-man4: $(dist_man_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man4dir)" || $(MKDIR_P) "$(DESTDIR)$(man4dir)"
-	@list=''; test -n "$(man4dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.4[a-z]*$$/p'; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^4][0-9a-z]*$$,4,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man4dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man4dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man4dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man4dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man4:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man4dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.4[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^4][0-9a-z]*$$,4,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man4dir)'; $(am__uninstall_files_from_dir)
-install-man5: $(dist_man_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-	@list=''; test -n "$(man5dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.5[a-z]*$$/p'; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man5:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man5dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.5[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
-install-man7: $(dist_man_MANS) $(man_MANS)
-	@$(NORMAL_INSTALL)
-	test -z "$(man7dir)" || $(MKDIR_P) "$(DESTDIR)$(man7dir)"
-	@list=''; test -n "$(man7dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.7[a-z]*$$/p'; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man7dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man7dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man7dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man7dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man7:
-	@$(NORMAL_UNINSTALL)
-	@list=''; test -n "$(man7dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	l2='$(dist_man_MANS) $(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-	  sed -n '/\.7[a-z]*$$/p'; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^7][0-9a-z]*$$,7,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man7dir)'; $(am__uninstall_files_from_dir)
-install-atf_aclocalDATA: $(atf_aclocal_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(atf_aclocaldir)" || $(MKDIR_P) "$(DESTDIR)$(atf_aclocaldir)"
-	@list='$(atf_aclocal_DATA)'; test -n "$(atf_aclocaldir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(atf_aclocaldir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(atf_aclocaldir)" || exit $$?; \
-	done
-
-uninstall-atf_aclocalDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(atf_aclocal_DATA)'; test -n "$(atf_aclocaldir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(atf_aclocaldir)'; $(am__uninstall_files_from_dir)
-install-atf_c__dirpkgconfigDATA: $(atf_c__dirpkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(atf_c__dirpkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(atf_c__dirpkgconfigdir)"
-	@list='$(atf_c__dirpkgconfig_DATA)'; test -n "$(atf_c__dirpkgconfigdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(atf_c__dirpkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(atf_c__dirpkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-atf_c__dirpkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(atf_c__dirpkgconfig_DATA)'; test -n "$(atf_c__dirpkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(atf_c__dirpkgconfigdir)'; $(am__uninstall_files_from_dir)
-install-atf_cpkgconfigDATA: $(atf_cpkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(atf_cpkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(atf_cpkgconfigdir)"
-	@list='$(atf_cpkgconfig_DATA)'; test -n "$(atf_cpkgconfigdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(atf_cpkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(atf_cpkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-atf_cpkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(atf_cpkgconfig_DATA)'; test -n "$(atf_cpkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(atf_cpkgconfigdir)'; $(am__uninstall_files_from_dir)
-install-atf_shDATA: $(atf_sh_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(atf_shdir)" || $(MKDIR_P) "$(DESTDIR)$(atf_shdir)"
-	@list='$(atf_sh_DATA)'; test -n "$(atf_shdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(atf_shdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(atf_shdir)" || exit $$?; \
-	done
-
-uninstall-atf_shDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(atf_sh_DATA)'; test -n "$(atf_shdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(atf_shdir)'; $(am__uninstall_files_from_dir)
-install-atf_shpkgconfigDATA: $(atf_shpkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(atf_shpkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(atf_shpkgconfigdir)"
-	@list='$(atf_shpkgconfig_DATA)'; test -n "$(atf_shpkgconfigdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(atf_shpkgconfigdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(atf_shpkgconfigdir)" || exit $$?; \
-	done
-
-uninstall-atf_shpkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(atf_shpkgconfig_DATA)'; test -n "$(atf_shpkgconfigdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(atf_shpkgconfigdir)'; $(am__uninstall_files_from_dir)
-install-cssDATA: $(css_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(cssdir)" || $(MKDIR_P) "$(DESTDIR)$(cssdir)"
-	@list='$(css_DATA)'; test -n "$(cssdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(cssdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(cssdir)" || exit $$?; \
-	done
-
-uninstall-cssDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(css_DATA)'; test -n "$(cssdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(cssdir)'; $(am__uninstall_files_from_dir)
-install-docDATA: $(doc_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-	done
-
-uninstall-docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
-install-dtdDATA: $(dtd_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(dtddir)" || $(MKDIR_P) "$(DESTDIR)$(dtddir)"
-	@list='$(dtd_DATA)'; test -n "$(dtddir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dtddir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dtddir)" || exit $$?; \
-	done
-
-uninstall-dtdDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dtd_DATA)'; test -n "$(dtddir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(dtddir)'; $(am__uninstall_files_from_dir)
-install-egDATA: $(eg_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(egdir)" || $(MKDIR_P) "$(DESTDIR)$(egdir)"
-	@list='$(eg_DATA)'; test -n "$(egdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(egdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(egdir)" || exit $$?; \
-	done
-
-uninstall-egDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(eg_DATA)'; test -n "$(egdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(egdir)'; $(am__uninstall_files_from_dir)
-install-hooksDATA: $(hooks_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(hooksdir)" || $(MKDIR_P) "$(DESTDIR)$(hooksdir)"
-	@list='$(hooks_DATA)'; test -n "$(hooksdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(hooksdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(hooksdir)" || exit $$?; \
-	done
-
-uninstall-hooksDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(hooks_DATA)'; test -n "$(hooksdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(hooksdir)'; $(am__uninstall_files_from_dir)
-install-pkgtestsDATA: $(pkgtests_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgtestsdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgtestsdir)"
-	@list='$(pkgtests_DATA)'; test -n "$(pkgtestsdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgtestsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgtestsdir)" || exit $$?; \
-	done
-
-uninstall-pkgtestsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgtests_DATA)'; test -n "$(pkgtestsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(pkgtestsdir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_cDATA: $(tests_atf_c_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_cdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_cdir)"
-	@list='$(tests_atf_c_DATA)'; test -n "$(tests_atf_cdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_cdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_cdir)" || exit $$?; \
-	done
-
-uninstall-tests_atf_cDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c_DATA)'; test -n "$(tests_atf_cdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tests_atf_cdir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_c__DATA: $(tests_atf_c___DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_c__dir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_c__dir)"
-	@list='$(tests_atf_c___DATA)'; test -n "$(tests_atf_c__dir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_c__dir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_c__dir)" || exit $$?; \
-	done
-
-uninstall-tests_atf_c__DATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c___DATA)'; test -n "$(tests_atf_c__dir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tests_atf_c__dir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_c___detailDATA: $(tests_atf_c___detail_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_c___detaildir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_c___detaildir)"
-	@list='$(tests_atf_c___detail_DATA)'; test -n "$(tests_atf_c___detaildir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_c___detaildir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_c___detaildir)" || exit $$?; \
-	done
-
-uninstall-tests_atf_c___detailDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c___detail_DATA)'; test -n "$(tests_atf_c___detaildir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tests_atf_c___detaildir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_c_detailDATA: $(tests_atf_c_detail_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_c_detaildir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_c_detaildir)"
-	@list='$(tests_atf_c_detail_DATA)'; test -n "$(tests_atf_c_detaildir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_c_detaildir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_c_detaildir)" || exit $$?; \
-	done
-
-uninstall-tests_atf_c_detailDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_c_detail_DATA)'; test -n "$(tests_atf_c_detaildir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tests_atf_c_detaildir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_configDATA: $(tests_atf_config_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_configdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_configdir)"
-	@list='$(tests_atf_config_DATA)'; test -n "$(tests_atf_configdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_configdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_configdir)" || exit $$?; \
-	done
-
-uninstall-tests_atf_configDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_config_DATA)'; test -n "$(tests_atf_configdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tests_atf_configdir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_reportDATA: $(tests_atf_report_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_reportdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_reportdir)"
-	@list='$(tests_atf_report_DATA)'; test -n "$(tests_atf_reportdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_reportdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_reportdir)" || exit $$?; \
-	done
-
-uninstall-tests_atf_reportDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_report_DATA)'; test -n "$(tests_atf_reportdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tests_atf_reportdir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_runDATA: $(tests_atf_run_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_rundir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_rundir)"
-	@list='$(tests_atf_run_DATA)'; test -n "$(tests_atf_rundir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_rundir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_rundir)" || exit $$?; \
-	done
-
-uninstall-tests_atf_runDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_run_DATA)'; test -n "$(tests_atf_rundir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tests_atf_rundir)'; $(am__uninstall_files_from_dir)
-install-tests_atf_shDATA: $(tests_atf_sh_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_atf_shdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_atf_shdir)"
-	@list='$(tests_atf_sh_DATA)'; test -n "$(tests_atf_shdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_atf_shdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_atf_shdir)" || exit $$?; \
-	done
-
-uninstall-tests_atf_shDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_atf_sh_DATA)'; test -n "$(tests_atf_shdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tests_atf_shdir)'; $(am__uninstall_files_from_dir)
-install-tests_test_programsDATA: $(tests_test_programs_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(tests_test_programsdir)" || $(MKDIR_P) "$(DESTDIR)$(tests_test_programsdir)"
-	@list='$(tests_test_programs_DATA)'; test -n "$(tests_test_programsdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tests_test_programsdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(tests_test_programsdir)" || exit $$?; \
-	done
-
-uninstall-tests_test_programsDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(tests_test_programs_DATA)'; test -n "$(tests_test_programsdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(tests_test_programsdir)'; $(am__uninstall_files_from_dir)
-install-xslDATA: $(xsl_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(xsldir)" || $(MKDIR_P) "$(DESTDIR)$(xsldir)"
-	@list='$(xsl_DATA)'; test -n "$(xsldir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(xsldir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(xsldir)" || exit $$?; \
-	done
-
-uninstall-xslDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(xsl_DATA)'; test -n "$(xsldir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(xsldir)'; $(am__uninstall_files_from_dir)
-install-atf_cHEADERS: $(atf_c_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(atf_cdir)" || $(MKDIR_P) "$(DESTDIR)$(atf_cdir)"
-	@list='$(atf_c_HEADERS)'; test -n "$(atf_cdir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(atf_cdir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(atf_cdir)" || exit $$?; \
-	done
-
-uninstall-atf_cHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(atf_c_HEADERS)'; test -n "$(atf_cdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(atf_cdir)'; $(am__uninstall_files_from_dir)
-install-atf_c__HEADERS: $(atf_c___HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(atf_c__dir)" || $(MKDIR_P) "$(DESTDIR)$(atf_c__dir)"
-	@list='$(atf_c___HEADERS)'; test -n "$(atf_c__dir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(atf_c__dir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(atf_c__dir)" || exit $$?; \
-	done
-
-uninstall-atf_c__HEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(atf_c___HEADERS)'; test -n "$(atf_c__dir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(atf_c__dir)'; $(am__uninstall_files_from_dir)
-install-includeHEADERS: $(include_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
-	done
-
-uninstall-includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES) bconfig.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	set x; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) bconfig.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES) bconfig.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) bconfig.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@case `sed 15q $(srcdir)/NEWS` in \
-	*"$(VERSION)"*) : ;; \
-	*) \
-	  echo "NEWS not updated; not releasing" 1>&2; \
-	  exit 1;; \
-	esac
-	@list='$(MANS)'; if test -n "$$list"; then \
-	  list=`for p in $$list; do \
-	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-	  if test -n "$$list" && \
-	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-	    exit 1; \
-	  else :; fi; \
-	else :; fi
-	$(am__remove_distdir)
-	test -d "$(distdir)" || mkdir "$(distdir)"
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-	-test -n "$(am__skip_mode_fix)" \
-	|| find "$(distdir)" -type d ! -perm -755 \
-		-exec chmod u+rwx,go+rx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r "$(distdir)"
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-lzip: distdir
-	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
-
-dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
-	*.tar.lz*) \
-	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
-	*.tar.xz*) \
-	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	test -d $(distdir)/_build || exit 0; \
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && am__cwd=`pwd` \
-	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-	  && cd "$$am__cwd" \
-	  || exit 1
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
-	@test -n '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: trying to run $@ with an empty' \
-	       '$$(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	$(am__cd) '$(distuninstallcheck_dir)' || { \
-	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
-	  exit 1; \
-	}; \
-	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS)
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
-		$(HEADERS) bconfig.h
-install-binPROGRAMS: install-libLTLIBRARIES
-
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_atf_reportdir)" "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_configdir)" "$(DESTDIR)$(tests_atf_reportdir)" "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man3dir)" "$(DESTDIR)$(man4dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man7dir)" "$(DESTDIR)$(atf_aclocaldir)" "$(DESTDIR)$(atf_c__dirpkgconfigdir)" "$(DESTDIR)$(atf_cpkgconfigdir)" "$(DESTDIR)$(atf_shdir)" "$(DESTDIR)$(atf_shpkgconfigdir)" "$(DESTDIR)$(cssdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(dtddir)" "$(DESTDIR)$(egdir)" "$(DESTDIR)$(hooksdir)" "$(DESTDIR)$(pkgtestsdir)" "$(DESTDIR)$(tests_atf_cdir)" "$(DESTDIR)$(tests_atf_c__dir)" "$(DESTDIR)$(tests_atf_c___detaildir)" "$(DESTDIR)$(tests_atf_c_detaildir)" "$(DESTDIR)$(tests_atf_configdir)" "$(DESTDIR)$(tests_atf_reportdir)" "$(DESTDIR)$(tests_atf_rundir)" "$(DESTDIR)$(tests_atf_shdir)" "$(DESTDIR)$(tests_test_programsdir)" "$(DESTDIR)$(xsldir)" "$(DESTDIR)$(atf_cdir)" "$(DESTDIR)$(atf_c__dir)" "$(DESTDIR)$(includedir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-	-rm -f atf-c++/$(DEPDIR)/$(am__dirstamp)
-	-rm -f atf-c++/$(am__dirstamp)
-	-rm -f atf-c++/detail/$(DEPDIR)/$(am__dirstamp)
-	-rm -f atf-c++/detail/$(am__dirstamp)
-	-rm -f atf-c/$(DEPDIR)/$(am__dirstamp)
-	-rm -f atf-c/$(am__dirstamp)
-	-rm -f atf-c/detail/$(DEPDIR)/$(am__dirstamp)
-	-rm -f atf-c/detail/$(am__dirstamp)
-	-rm -f atf-config/$(DEPDIR)/$(am__dirstamp)
-	-rm -f atf-config/$(am__dirstamp)
-	-rm -f atf-report/$(DEPDIR)/$(am__dirstamp)
-	-rm -f atf-report/$(am__dirstamp)
-	-rm -f atf-run/$(DEPDIR)/$(am__dirstamp)
-	-rm -f atf-run/$(am__dirstamp)
-	-rm -f atf-sh/$(DEPDIR)/$(am__dirstamp)
-	-rm -f atf-sh/$(am__dirstamp)
-	-rm -f atf-version/$(DEPDIR)/$(am__dirstamp)
-	-rm -f atf-version/$(am__dirstamp)
-	-rm -f bootstrap/$(DEPDIR)/$(am__dirstamp)
-	-rm -f bootstrap/$(am__dirstamp)
-	-rm -f test-programs/$(DEPDIR)/$(am__dirstamp)
-	-rm -f test-programs/$(am__dirstamp)
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-	clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \
-	clean-noinstLTLIBRARIES clean-tests_atf_cPROGRAMS \
-	clean-tests_atf_c__PROGRAMS clean-tests_atf_c___detailPROGRAMS \
-	clean-tests_atf_c_detailPROGRAMS \
-	clean-tests_atf_reportPROGRAMS clean-tests_atf_runPROGRAMS \
-	clean-tests_test_programsPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-config/$(DEPDIR) atf-report/$(DEPDIR) atf-run/$(DEPDIR) atf-sh/$(DEPDIR) atf-version/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-libtool distclean-local distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-atf_aclocalDATA install-atf_cHEADERS \
-	install-atf_c__HEADERS install-atf_c__dirpkgconfigDATA \
-	install-atf_cpkgconfigDATA install-atf_shDATA \
-	install-atf_shpkgconfigDATA install-cssDATA install-docDATA \
-	install-dtdDATA install-egDATA install-hooksDATA \
-	install-includeHEADERS install-man install-pkgtestsDATA \
-	install-tests_atf_cDATA install-tests_atf_cPROGRAMS \
-	install-tests_atf_cSCRIPTS install-tests_atf_c__DATA \
-	install-tests_atf_c__PROGRAMS install-tests_atf_c__SCRIPTS \
-	install-tests_atf_c___detailDATA \
-	install-tests_atf_c___detailPROGRAMS \
-	install-tests_atf_c_detailDATA \
-	install-tests_atf_c_detailPROGRAMS \
-	install-tests_atf_configDATA install-tests_atf_configSCRIPTS \
-	install-tests_atf_reportDATA install-tests_atf_reportPROGRAMS \
-	install-tests_atf_reportSCRIPTS install-tests_atf_runDATA \
-	install-tests_atf_runPROGRAMS install-tests_atf_runSCRIPTS \
-	install-tests_atf_shDATA install-tests_atf_shSCRIPTS \
-	install-tests_test_programsDATA \
-	install-tests_test_programsPROGRAMS \
-	install-tests_test_programsSCRIPTS install-xslDATA
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS install-libLTLIBRARIES \
-	install-libexecPROGRAMS
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man1 install-man3 install-man4 install-man5 \
-	install-man7
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf atf-c++/$(DEPDIR) atf-c++/detail/$(DEPDIR) atf-c/$(DEPDIR) atf-c/detail/$(DEPDIR) atf-config/$(DEPDIR) atf-report/$(DEPDIR) atf-run/$(DEPDIR) atf-sh/$(DEPDIR) atf-version/$(DEPDIR) bootstrap/$(DEPDIR) test-programs/$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-atf_aclocalDATA uninstall-atf_cHEADERS \
-	uninstall-atf_c__HEADERS uninstall-atf_c__dirpkgconfigDATA \
-	uninstall-atf_cpkgconfigDATA uninstall-atf_shDATA \
-	uninstall-atf_shpkgconfigDATA uninstall-binPROGRAMS \
-	uninstall-cssDATA uninstall-docDATA uninstall-dtdDATA \
-	uninstall-egDATA uninstall-hooksDATA uninstall-includeHEADERS \
-	uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS \
-	uninstall-man uninstall-pkgtestsDATA uninstall-tests_atf_cDATA \
-	uninstall-tests_atf_cPROGRAMS uninstall-tests_atf_cSCRIPTS \
-	uninstall-tests_atf_c__DATA uninstall-tests_atf_c__PROGRAMS \
-	uninstall-tests_atf_c__SCRIPTS \
-	uninstall-tests_atf_c___detailDATA \
-	uninstall-tests_atf_c___detailPROGRAMS \
-	uninstall-tests_atf_c_detailDATA \
-	uninstall-tests_atf_c_detailPROGRAMS \
-	uninstall-tests_atf_configDATA \
-	uninstall-tests_atf_configSCRIPTS \
-	uninstall-tests_atf_reportDATA \
-	uninstall-tests_atf_reportPROGRAMS \
-	uninstall-tests_atf_reportSCRIPTS uninstall-tests_atf_runDATA \
-	uninstall-tests_atf_runPROGRAMS uninstall-tests_atf_runSCRIPTS \
-	uninstall-tests_atf_shDATA uninstall-tests_atf_shSCRIPTS \
-	uninstall-tests_test_programsDATA \
-	uninstall-tests_test_programsPROGRAMS \
-	uninstall-tests_test_programsSCRIPTS uninstall-xslDATA
-
-uninstall-man: uninstall-man1 uninstall-man3 uninstall-man4 \
-	uninstall-man5 uninstall-man7
-
-.MAKE: all check check-am install install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
-	clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
-	clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \
-	clean-noinstLTLIBRARIES clean-tests_atf_cPROGRAMS \
-	clean-tests_atf_c__PROGRAMS clean-tests_atf_c___detailPROGRAMS \
-	clean-tests_atf_c_detailPROGRAMS \
-	clean-tests_atf_reportPROGRAMS clean-tests_atf_runPROGRAMS \
-	clean-tests_test_programsPROGRAMS ctags dist dist-all \
-	dist-bzip2 dist-gzip dist-hook dist-lzip dist-lzma dist-shar \
-	dist-tarZ dist-xz dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-hdr \
-	distclean-libtool distclean-local distclean-tags \
-	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-	html-am info info-am install install-am \
-	install-atf_aclocalDATA install-atf_cHEADERS \
-	install-atf_c__HEADERS install-atf_c__dirpkgconfigDATA \
-	install-atf_cpkgconfigDATA install-atf_shDATA \
-	install-atf_shpkgconfigDATA install-binPROGRAMS \
-	install-cssDATA install-data install-data-am install-docDATA \
-	install-dtdDATA install-dvi install-dvi-am install-egDATA \
-	install-exec install-exec-am install-hooksDATA install-html \
-	install-html-am install-includeHEADERS install-info \
-	install-info-am install-libLTLIBRARIES install-libexecPROGRAMS \
-	install-man install-man1 install-man3 install-man4 \
-	install-man5 install-man7 install-pdf install-pdf-am \
-	install-pkgtestsDATA install-ps install-ps-am install-strip \
-	install-tests_atf_cDATA install-tests_atf_cPROGRAMS \
-	install-tests_atf_cSCRIPTS install-tests_atf_c__DATA \
-	install-tests_atf_c__PROGRAMS install-tests_atf_c__SCRIPTS \
-	install-tests_atf_c___detailDATA \
-	install-tests_atf_c___detailPROGRAMS \
-	install-tests_atf_c_detailDATA \
-	install-tests_atf_c_detailPROGRAMS \
-	install-tests_atf_configDATA install-tests_atf_configSCRIPTS \
-	install-tests_atf_reportDATA install-tests_atf_reportPROGRAMS \
-	install-tests_atf_reportSCRIPTS install-tests_atf_runDATA \
-	install-tests_atf_runPROGRAMS install-tests_atf_runSCRIPTS \
-	install-tests_atf_shDATA install-tests_atf_shSCRIPTS \
-	install-tests_test_programsDATA \
-	install-tests_test_programsPROGRAMS \
-	install-tests_test_programsSCRIPTS install-xslDATA \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-atf_aclocalDATA \
-	uninstall-atf_cHEADERS uninstall-atf_c__HEADERS \
-	uninstall-atf_c__dirpkgconfigDATA uninstall-atf_cpkgconfigDATA \
-	uninstall-atf_shDATA uninstall-atf_shpkgconfigDATA \
-	uninstall-binPROGRAMS uninstall-cssDATA uninstall-docDATA \
-	uninstall-dtdDATA uninstall-egDATA uninstall-hooksDATA \
-	uninstall-includeHEADERS uninstall-libLTLIBRARIES \
-	uninstall-libexecPROGRAMS uninstall-man uninstall-man1 \
-	uninstall-man3 uninstall-man4 uninstall-man5 uninstall-man7 \
-	uninstall-pkgtestsDATA uninstall-tests_atf_cDATA \
-	uninstall-tests_atf_cPROGRAMS uninstall-tests_atf_cSCRIPTS \
-	uninstall-tests_atf_c__DATA uninstall-tests_atf_c__PROGRAMS \
-	uninstall-tests_atf_c__SCRIPTS \
-	uninstall-tests_atf_c___detailDATA \
-	uninstall-tests_atf_c___detailPROGRAMS \
-	uninstall-tests_atf_c_detailDATA \
-	uninstall-tests_atf_c_detailPROGRAMS \
-	uninstall-tests_atf_configDATA \
-	uninstall-tests_atf_configSCRIPTS \
-	uninstall-tests_atf_reportDATA \
-	uninstall-tests_atf_reportPROGRAMS \
-	uninstall-tests_atf_reportSCRIPTS uninstall-tests_atf_runDATA \
-	uninstall-tests_atf_runPROGRAMS uninstall-tests_atf_runSCRIPTS \
-	uninstall-tests_atf_shDATA uninstall-tests_atf_shSCRIPTS \
-	uninstall-tests_test_programsDATA \
-	uninstall-tests_test_programsPROGRAMS \
-	uninstall-tests_test_programsSCRIPTS uninstall-xslDATA
-
-
-dist-hook: check-install
-check-install: $(srcdir)/INSTALL
-	$(srcdir)/admin/check-install.sh $(srcdir)/INSTALL
-
-dist-hook: check-style
-check-style:
-	$(srcdir)/admin/check-style.sh
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-
-# XXX For some reason, the nodist line above does not work as expected.
-# Work this problem around.
-dist-hook: kill-defs-h
-kill-defs-h:
-	rm -f $(distdir)/atf-c/defs.h
-atf-c/atf-c.pc: $(srcdir)/atf-c/atf-c.pc.in Makefile
-	test -d atf-c || mkdir -p atf-c
-	sed -e 's#__ATF_VERSION__#$(PACKAGE_VERSION)#g' \
-	    -e 's#__CC__#$(CC)#g' \
-	    -e 's#__INCLUDEDIR__#$(includedir)#g' \
-	    -e 's#__LIBDIR__#$(libdir)#g' \
-	    <$(srcdir)/atf-c/atf-c.pc.in >atf-c/atf-c.pc.tmp
-	mv atf-c/atf-c.pc.tmp atf-c/atf-c.pc
-atf-c/pkg_config_test: $(srcdir)/atf-c/pkg_config_test.sh
-	test -d atf-c || mkdir -p atf-c
-	@src="$(srcdir)/atf-c/pkg_config_test.sh"; \
-	dst="atf-c/pkg_config_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-atf-c++/atf-c++.pc: $(srcdir)/atf-c++/atf-c++.pc.in Makefile
-	test -d atf-c++ || mkdir -p atf-c++
-	sed -e 's#__ATF_VERSION__#$(PACKAGE_VERSION)#g' \
-	    -e 's#__CXX__#$(CXX)#g' \
-	    -e 's#__INCLUDEDIR__#$(includedir)#g' \
-	    -e 's#__LIBDIR__#$(libdir)#g' \
-	    <$(srcdir)/atf-c++/atf-c++.pc.in >atf-c++/atf-c++.pc.tmp
-	mv atf-c++/atf-c++.pc.tmp atf-c++/atf-c++.pc
-atf-c++/pkg_config_test: $(srcdir)/atf-c++/pkg_config_test.sh
-	test -d atf-c++ || mkdir -p atf-c++
-	@src="$(srcdir)/atf-c++/pkg_config_test.sh"; \
-	dst="atf-c++/pkg_config_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-atf-sh/atf-sh.pc: $(srcdir)/atf-sh/atf-sh.pc.in Makefile
-	test -d atf-sh || mkdir -p atf-sh
-	sed -e 's#__ATF_VERSION__#$(PACKAGE_VERSION)#g' \
-	    -e 's#__EXEC_PREFIX__#$(exec_prefix)#g' \
-	    <$(srcdir)/atf-sh/atf-sh.pc.in >atf-sh/atf-sh.pc.tmp
-	mv atf-sh/atf-sh.pc.tmp atf-sh/atf-sh.pc
-atf-sh/misc_helpers: $(srcdir)/atf-sh/misc_helpers.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/misc_helpers.sh"; \
-	dst="atf-sh/misc_helpers"; $(BUILD_SH_TP)
-atf-sh/atf_check_test: $(srcdir)/atf-sh/atf_check_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/atf_check_test.sh"; \
-	dst="atf-sh/atf_check_test"; $(BUILD_SH_TP)
-atf-sh/atf-check_test: $(srcdir)/atf-sh/atf-check_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/atf-check_test.sh"; \
-	dst="atf-sh/atf-check_test"; $(BUILD_SH_TP)
-atf-sh/config_test: $(srcdir)/atf-sh/config_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/config_test.sh"; \
-	dst="atf-sh/config_test"; $(BUILD_SH_TP)
-atf-sh/integration_test: $(srcdir)/atf-sh/integration_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/integration_test.sh"; \
-	dst="atf-sh/integration_test"; $(BUILD_SH_TP)
-atf-sh/normalize_test: $(srcdir)/atf-sh/normalize_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/normalize_test.sh"; \
-	dst="atf-sh/normalize_test"; $(BUILD_SH_TP)
-atf-sh/tc_test: $(srcdir)/atf-sh/tc_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/tc_test.sh"; \
-	dst="atf-sh/tc_test"; $(BUILD_SH_TP)
-atf-sh/tp_test: $(srcdir)/atf-sh/tp_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/tp_test.sh"; \
-	dst="atf-sh/tp_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-bootstrap/h_tp_basic_sh: $(srcdir)/bootstrap/h_tp_basic_sh.sh
-	test -d bootstrap || mkdir -p bootstrap
-	@src=$(srcdir)/bootstrap/h_tp_basic_sh.sh; dst=$@; $(BUILD_SH_TP)
-bootstrap/h_tp_atf_check_sh: \
-		$(srcdir)/bootstrap/h_tp_atf_check_sh.sh
-	test -d bootstrap || mkdir -p bootstrap
-	@src=$(srcdir)/bootstrap/h_tp_atf_check_sh.sh; dst=$@; $(BUILD_SH_TP)
-bootstrap/h_tp_fail: $(srcdir)/bootstrap/h_tp_fail.sh
-	test -d bootstrap || mkdir -p bootstrap
-	@src=$(srcdir)/bootstrap/h_tp_fail.sh; dst=$@; $(BUILD_SH_TP)
-bootstrap/h_tp_pass: $(srcdir)/bootstrap/h_tp_pass.sh
-	test -d bootstrap || mkdir -p bootstrap
-	@src=$(srcdir)/bootstrap/h_tp_pass.sh; dst=$@; $(BUILD_SH_TP)
-
-distclean-local:
-	-rm -rf testsuite.dir
-
-@target_srcdir@bootstrap/package.m4: $(top_srcdir)/configure.ac
-	{ \
-	echo '# Signature of the current package.'; \
-	echo 'm4_define(AT_PACKAGE_NAME,      @PACKAGE_NAME@)'; \
-	echo 'm4_define(AT_PACKAGE_TARNAME,   @PACKAGE_TARNAME@)'; \
-	echo 'm4_define(AT_PACKAGE_VERSION,   @PACKAGE_VERSION@)'; \
-	echo 'm4_define(AT_PACKAGE_STRING,    @PACKAGE_STRING@)'; \
-	echo 'm4_define(AT_PACKAGE_BUGREPORT, @PACKAGE_BUGREPORT@)'; \
-	echo 'm4_define(ENABLE_TOOLS,         @ENABLE_TOOLS@)'; \
-	} >$(srcdir)/bootstrap/package.m4
-
-@target_srcdir@bootstrap/testsuite: $(srcdir)/bootstrap/testsuite.at \
-                                    $(testsuite_incs) \
-                                    @target_srcdir@bootstrap/package.m4
-	autom4te --language=Autotest -I $(srcdir) \
-	    -I $(srcdir)/bootstrap \
-	    $(srcdir)/bootstrap/testsuite.at -o $@.tmp
-	mv $@.tmp $@
-installcheck-bootstrap: @target_srcdir@bootstrap/testsuite check
-	$(TESTS_ENVIRONMENT) $(srcdir)/bootstrap/testsuite
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-
-@ENABLE_TOOLS_TRUE@doc/atf.7: $(srcdir)/doc/atf.7.in
-@ENABLE_TOOLS_TRUE@	test -d doc || mkdir -p doc
-@ENABLE_TOOLS_TRUE@	sed -e 's#__DOCDIR__#$(docdir)#g' \
-@ENABLE_TOOLS_TRUE@	    -e 's#__TESTSDIR__#$(testsdir)#g' \
-@ENABLE_TOOLS_TRUE@	    <$(srcdir)/doc/atf.7.in >doc/atf.7.tmp
-@ENABLE_TOOLS_TRUE@	mv doc/atf.7.tmp doc/atf.7
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-test-programs/sh_helpers: $(srcdir)/test-programs/sh_helpers.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/sh_helpers.sh $(common_sh)"; \
-	dst="test-programs/sh_helpers"; $(BUILD_SH_TP)
-test-programs/config_test: $(srcdir)/test-programs/config_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/config_test.sh $(common_sh)"; \
-	dst="test-programs/config_test"; $(BUILD_SH_TP)
-test-programs/expect_test: $(srcdir)/test-programs/expect_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/expect_test.sh $(common_sh)"; \
-	dst="test-programs/expect_test"; $(BUILD_SH_TP)
-test-programs/fork_test: $(srcdir)/test-programs/fork_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/fork_test.sh $(common_sh)"; \
-	dst="test-programs/fork_test"; $(BUILD_SH_TP)
-test-programs/meta_data_test: $(srcdir)/test-programs/meta_data_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/meta_data_test.sh $(common_sh)"; \
-	dst="test-programs/meta_data_test"; $(BUILD_SH_TP)
-test-programs/result_test: $(srcdir)/test-programs/result_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/result_test.sh $(common_sh)"; \
-	dst="test-programs/result_test"; $(BUILD_SH_TP)
-test-programs/srcdir_test: $(srcdir)/test-programs/srcdir_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/srcdir_test.sh $(common_sh)"; \
-	dst="test-programs/srcdir_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-@ENABLE_TOOLS_TRUE@atf-report/integration_test: $(srcdir)/atf-report/integration_test.sh
-@ENABLE_TOOLS_TRUE@	test -d atf-report || mkdir -p atf-report
-@ENABLE_TOOLS_TRUE@	@src="$(srcdir)/atf-report/integration_test.sh"; \
-@ENABLE_TOOLS_TRUE@	dst="atf-report/integration_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-@ENABLE_TOOLS_TRUE@atf-config/integration_test: $(srcdir)/atf-config/integration_test.sh
-@ENABLE_TOOLS_TRUE@	test -d atf-config || mkdir -p atf-config
-@ENABLE_TOOLS_TRUE@	@src="$(srcdir)/atf-config/integration_test.sh"; \
-@ENABLE_TOOLS_TRUE@	dst="atf-config/integration_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-@ENABLE_TOOLS_TRUE@atf-run/integration_test: $(srcdir)/atf-run/integration_test.sh
-@ENABLE_TOOLS_TRUE@	test -d atf-run || mkdir -p atf-run
-@ENABLE_TOOLS_TRUE@	@src="$(srcdir)/atf-run/integration_test.sh"; \
-@ENABLE_TOOLS_TRUE@	dst="atf-run/integration_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-@ENABLE_TOOLS_TRUE@atf-version/revision.h: atf-version/revision.h.stamp
-@ENABLE_TOOLS_TRUE@	@test -d atf-version || mkdir -p atf-version
-@ENABLE_TOOLS_TRUE@	@cmp -s atf-version/revision.h atf-version/revision.h.stamp || \
-@ENABLE_TOOLS_TRUE@	    cp -p atf-version/revision.h.stamp atf-version/revision.h
-@ENABLE_TOOLS_TRUE@atf-version/revision.h.stamp:
-@ENABLE_TOOLS_TRUE@	@test -d atf-version || mkdir -p atf-version
-@ENABLE_TOOLS_TRUE@	@$(top_srcdir)/atf-version/generate-revision.sh \
-@ENABLE_TOOLS_TRUE@	    -g "$(GIT)" -r $(top_srcdir) -o atf-version/revision.h.stamp \
-@ENABLE_TOOLS_TRUE@	    -v $(PACKAGE_VERSION)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-@ENABLE_TOOLS_TRUE@installcheck-atf:
-@ENABLE_TOOLS_TRUE@	logfile=$$(pwd)/installcheck.log; \
-@ENABLE_TOOLS_TRUE@	fifofile=$$(pwd)/installcheck.fifo; \
-@ENABLE_TOOLS_TRUE@	cd $(pkgtestsdir); \
-@ENABLE_TOOLS_TRUE@	rm -f $${fifofile}; \
-@ENABLE_TOOLS_TRUE@	mkfifo $${fifofile}; \
-@ENABLE_TOOLS_TRUE@	cat $${fifofile} | tee $${logfile} | $(TESTS_ENVIRONMENT) atf-report & \
-@ENABLE_TOOLS_TRUE@	$(TESTS_ENVIRONMENT) atf-run >>$${fifofile}; \
-@ENABLE_TOOLS_TRUE@	res=$${?}; \
-@ENABLE_TOOLS_TRUE@	wait; \
-@ENABLE_TOOLS_TRUE@	rm $${fifofile}; \
-@ENABLE_TOOLS_TRUE@	echo; \
-@ENABLE_TOOLS_TRUE@	echo "The verbatim output of atf-run has been saved to" \
-@ENABLE_TOOLS_TRUE@	     "installcheck.log; exit was $${res}"; \
-@ENABLE_TOOLS_TRUE@	test $${res} -eq 0
-@HAVE_KYUA_TRUE@installcheck-kyua:
-@HAVE_KYUA_TRUE@	cd $(pkgtestsdir) && $(TESTS_ENVIRONMENT) $(KYUA) test
-
-installcheck-targets: $(INSTALLCHECK_TARGETS)
-
-#
-# Custom targets.
-#
-
-dist-hook: forbid-dist
-@ENABLE_TOOLS_TRUE@forbid-dist:
-@ENABLE_TOOLS_TRUE@	@true
-@ENABLE_TOOLS_FALSE@forbid-dist:
-@ENABLE_TOOLS_FALSE@	@echo "Sorry; cannot make dist without the tools enabled."
-@ENABLE_TOOLS_FALSE@	@echo "Please reconfigure with --enable-tools."
-@ENABLE_TOOLS_FALSE@	@false
-clean-all:
-	GIT="$(GIT)" $(SH) $(srcdir)/admin/clean-all.sh
-release:
-	$(SH) $(srcdir)/admin/release.sh $(PACKAGE_VERSION) $(DIST_ARCHIVES)
-release-test:
-	$(SH) $(srcdir)/admin/release-test.sh $(DIST_ARCHIVES)
-
-.PHONY: $(PHONY_TARGETS)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/contrib/atf/NEWS b/contrib/atf/NEWS
index 1311a36bf20..eca87eea708 100644
--- a/contrib/atf/NEWS
+++ b/contrib/atf/NEWS
@@ -2,6 +2,58 @@ Major changes between releases                  Automated Testing Framework
 ===========================================================================
 
 
+Changes in version 0.18
+***********************
+
+Experimental version released on November 16th, 2013.
+
+* Issue 45: Added require.memory support in atf-run for FreeBSD.
+
+* Fixed an issue with the handling of cin with libc++.
+
+* Issue 64: Fixed various mandoc formatting warnings.
+
+* NetBSD PR bin/48284: Made atf-check flush its progress message to
+  stdout so that an interrupted test case always shows the last message
+  being executed.
+
+* NetBSD PR bin/48285: Fixed atf_check examples in atf-sh-api(3).
+
+
+Changes in version 0.17
+***********************
+
+Experimental version released on February 14th, 2013.
+
+* Added the atf_utils_cat_file, atf_utils_compare_file,
+  atf_utils_copy_file, atf_utils_create_file, atf_utils_file_exists,
+  atf_utils_fork, atf_utils_grep_file, atf_utils_grep_string,
+  atf_utils_readline, atf_utils_redirect and atf_utils_wait utility
+  functions to atf-c-api.  Documented the already-public
+  atf_utils_free_charpp function.
+
+* Added the cat_file, compare_file, copy_file, create_file, file_exists,
+  fork, grep_collection, grep_file, grep_string, redirect and wait
+  functions to the atf::utils namespace of atf-c++-api.  These are
+  wrappers around the same functions added to the atf-c-api library.
+
+* Added the ATF_CHECK_MATCH, ATF_CHECK_MATCH_MSG, ATF_REQUIRE_MATCH and
+  ATF_REQUIRE_MATCH_MSG macros to atf-c to simplify the validation of a
+  string against a regular expression.
+
+* Miscellaneous fixes for manpage typos and compilation problems with
+  clang.
+
+* Added caching of the results of those configure tests that rely on
+  executing a test program.  This should help crossbuild systems by
+  providing a mechanism to pre-specify what the results should be.
+
+* PR bin/45690: Make atf-report convert any non-printable characters to
+  a plain-text representation (matching their corresponding hexadecimal
+  entities) in XML output files.  This is to prevent the output of test
+  cases from breaking xsltproc later.
+
+
 Changes in version 0.16
 ***********************
 
diff --git a/contrib/atf/admin/Makefile.am.inc b/contrib/atf/admin/Makefile.am.inc
deleted file mode 100644
index 9f410c61f2c..00000000000
--- a/contrib/atf/admin/Makefile.am.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-dist-hook: check-install
-PHONY_TARGETS += check-install
-check-install: $(srcdir)/INSTALL
-	$(srcdir)/admin/check-install.sh $(srcdir)/INSTALL
-
-dist-hook: check-style
-PHONY_TARGETS += check-style
-check-style:
-	$(srcdir)/admin/check-style.sh
-
-EXTRA_DIST += admin/check-install.sh \
-              admin/check-style-common.awk \
-              admin/check-style-c.awk \
-              admin/check-style-cpp.awk \
-              admin/check-style-man.awk \
-              admin/check-style-shell.awk \
-              admin/check-style.sh
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/admin/check-install.sh b/contrib/atf/admin/check-install.sh
deleted file mode 100755
index 7df8e41dbe7..00000000000
--- a/contrib/atf/admin/check-install.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#! /bin/sh
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# A utility to ensure that INSTALL lists the correct versions of the
-# tools used to generate the distfile.
-#
-
-Prog_Name=${0##*/}
-
-#
-# err message
-#
-err() {
-    echo "${Prog_Name}: ${@}" 1>&2
-    exit 1
-}
-
-#
-# warn message
-#
-warn() {
-    echo "${Prog_Name}: ${@}" 1>&2
-}
-
-#
-# check_tool readme_file prog_name verbose_name
-#
-#   Executes 'prog_name' to determine its version and checks if the
-#   given 'readme_file' contains 'verbose_name <version>' in it.
-#
-check_tool() {
-    readme=${1}
-    prog=${2}
-    name=${3}
-
-    ver=$(${prog} --version | head -n 1 | cut -d ' ' -f 4)
-
-    if grep "\\* ${name} ${ver}" ${readme} >/dev/null; then
-        true
-    else
-        warn "Incorrect version of ${name}"
-        false
-    fi
-}
-
-#
-# main readme_file
-#
-# Entry point.
-#
-main() {
-    readme=${1}
-    ret=0
-
-    check_tool ${readme} autoconf "GNU autoconf" || ret=1
-    check_tool ${readme} automake "GNU automake" || ret=1
-    check_tool ${readme} libtool "GNU libtool" || ret=1
-
-    return ${ret}
-}
-
-main "${@}"
-
-# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/admin/check-style-c.awk b/contrib/atf/admin/check-style-c.awk
deleted file mode 100644
index bf4a9551e67..00000000000
--- a/contrib/atf/admin/check-style-c.awk
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-function warn(msg) {
-    print FILENAME "[" FNR "]: " msg > "/dev/stderr"
-    error = 1
-}
-
-BEGIN {
-    skip = 0
-    error = 0
-}
-
-/NO_CHECK_STYLE_BEGIN/ {
-    skip = 1
-    next
-}
-
-/NO_CHECK_STYLE_END/ {
-    skip = 0
-    next
-}
-
-/NO_CHECK_STYLE/ {
-    next
-}
-
-{
-    if (skip)
-        next
-}
-
-/#ifdef/ {
-    warn("Undesired usage of #ifdef; use #if defined()")
-}
-
-/#ifndef/ {
-    warn("Undesired usage of #ifndef; use #if !defined()")
-}
-
-/assert[ \t]*\(/ {
-    warn("Use the macros in sanity.h instead of assert");
-}
-
-/getprogname/ {
-    warn("getprogname(3) is not portable");
-}
-
-/include.*assert.h/ {
-    warn("Do not include assert.h");
-}
-
-/setprogname/ {
-    warn("setprogname(3) is not portable");
-}
-
-/\/\// {
-    warn("Do not use C99-style comments");
-}
-
-END {
-    if (skip)
-        warn("Missing NO_CHECK_STYLE_END");
-    if (error)
-        exit 1
-}
-
-# vim: syntax=awk:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/admin/check-style-common.awk b/contrib/atf/admin/check-style-common.awk
deleted file mode 100644
index 7b6e72ad653..00000000000
--- a/contrib/atf/admin/check-style-common.awk
+++ /dev/null
@@ -1,82 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-function warn(msg) {
-    print FILENAME "[" FNR "]: " msg > "/dev/stderr"
-    error = 1
-}
-
-BEGIN {
-    skip = 0
-    error = 0
-}
-
-/NO_CHECK_STYLE_BEGIN/ {
-    skip = 1
-    next
-}
-
-/NO_CHECK_STYLE_END/ {
-    skip = 0
-    next
-}
-
-/NO_CHECK_STYLE/ {
-    next
-}
-
-{
-    if (skip)
-        next
-
-    if (length > 80)
-        warn("Line too long to fit on screen")
-}
-
-/^ *\t+/ {
-    if (! match(FILENAME, "Makefile"))
-        warn("Tab character used for indentation");
-}
-
-/[ \t]+$/ {
-    warn("Trailing spaces or tabs");
-}
-
-/#![^ ]/ { # NO_CHECK_STYLE
-    warn("Invalid shellbang: missing space after !");
-}
-
-END {
-    if (skip)
-        warn("Missing NO_CHECK_STYLE_END");
-    if (error)
-        exit 1
-}
-
-# vim: syntax=awk:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/admin/check-style-cpp.awk b/contrib/atf/admin/check-style-cpp.awk
deleted file mode 100644
index 4a797e7f98e..00000000000
--- a/contrib/atf/admin/check-style-cpp.awk
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-function warn(msg) {
-    print FILENAME "[" FNR "]: " msg > "/dev/stderr"
-    error = 1
-}
-
-BEGIN {
-    skip = 0
-    error = 0
-}
-
-/NO_CHECK_STYLE_BEGIN/ {
-    skip = 1
-    next
-}
-
-/NO_CHECK_STYLE_END/ {
-    skip = 0
-    next
-}
-
-/NO_CHECK_STYLE/ {
-    next
-}
-
-{
-    if (skip)
-        next
-}
-
-/#ifdef/ {
-    warn("Undesired usage of #ifdef; use #if defined()")
-}
-
-/#ifndef/ {
-    warn("Undesired usage of #ifndef; use #if !defined()")
-}
-
-/assert[ \t]*\(/ {
-    warn("Use the macros in sanity.hpp instead of assert");
-}
-
-/include.*assert/ {
-    warn("Do not include assert.h nor cassert");
-}
-
-/std::endl/ {
-    warn("Use \\n instead of std::endl");
-}
-
-/\/\*/ {
-    warn("Do not use C-style comments");
-}
-
-END {
-    if (skip)
-        warn("Missing NO_CHECK_STYLE_END");
-    if (error)
-        exit 1
-}
-
-# vim: syntax=awk:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/admin/check-style-man.awk b/contrib/atf/admin/check-style-man.awk
deleted file mode 100644
index 4751aaac7aa..00000000000
--- a/contrib/atf/admin/check-style-man.awk
+++ /dev/null
@@ -1,78 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-function warn(msg) {
-    print FILENAME "[" FNR "]: " msg > "/dev/stderr"
-    error = 1
-}
-
-BEGIN {
-    skip = 0
-    error = 0
-}
-
-/NO_CHECK_STYLE_BEGIN|^\.Bd/ {
-    skip = 1
-    next
-}
-
-/NO_CHECK_STYLE_END|^\.Ed/ {
-    skip = 0
-    next
-}
-
-/NO_CHECK_STYLE/ {
-    next
-}
-
-/^\.\\"/ {
-    next
-}
-
-{
-    if (skip)
-        next
-}
-
-/\.\.|e\.g\.|i\.e\./ {
-    next
-}
-
-/\.[ ]+[a-zA-Z]+/ {
-    warn("Sentence does not start on new line")
-}
-
-END {
-    if (skip)
-        warn("Missing NO_CHECK_STYLE_END");
-    if (error)
-        exit 1
-}
-
-# vim: syntax=awk:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/admin/check-style-shell.awk b/contrib/atf/admin/check-style-shell.awk
deleted file mode 100644
index ac80db40185..00000000000
--- a/contrib/atf/admin/check-style-shell.awk
+++ /dev/null
@@ -1,106 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-function warn(msg) {
-    print FILENAME "[" FNR "]: " msg > "/dev/stderr"
-    error = 1
-}
-
-BEGIN {
-    skip = 0
-    error = 0
-    emacs_modeline = 0
-    vim_modeline = 0
-}
-
-/NO_CHECK_STYLE_BEGIN/ {
-    skip = 1
-    next
-}
-
-/NO_CHECK_STYLE_END/ {
-    skip = 0
-    next
-}
-
-/NO_CHECK_STYLE/ {
-    next
-}
-
-{
-    if (skip)
-        next
-}
-
-/vim: syntax=sh/ {
-    vim_modeline = 1
-}
-
-/^[ \t]*#/ {
-    next
-}
-
-/[$ \t]+_[a-zA-Z0-9]+=/ {
-    warn("Variable should not start with an underline")
-}
-
-/[^\\]\$[^0-9!'"$?@#*{}(|\/,]+/ {
-    warn("Missing braces around variable name")
-}
-
-/=(""|'')/ {
-    warn("Assignment to the empty string does not need quotes");
-}
-
-/basename[ \t]+/ {
-    warn("Use parameter expansion instead of basename");
-}
-
-/if[ \t]+(test|![ \t]+test)/ {
-    warn("Use [ instead of test");
-}
-
-/[ \t]+(test|\[).*==/ {
-    warn("test(1)'s == operator is not portable");
-}
-
-/if.*;[ \t]*fi$/ {
-    warn("Avoid using a single-line if conditional");
-}
-
-END {
-    if (skip)
-        warn("Missing NO_CHECK_STYLE_END");
-    if (! vim_modeline)
-        warn("Missing mode lines");
-    if (error)
-        exit 1
-}
-
-# vim: syntax=awk:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/admin/check-style.sh b/contrib/atf/admin/check-style.sh
deleted file mode 100755
index a4f2410ddcc..00000000000
--- a/contrib/atf/admin/check-style.sh
+++ /dev/null
@@ -1,189 +0,0 @@
-#! /bin/sh
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# A utility to sanity check the coding style of all source files in the
-# project tree.
-#
-
-Prog_Name=${0##*/}
-
-#
-# err message
-#
-err() {
-    echo "${Prog_Name}: ${@}" 1>&2
-    exit 1
-}
-
-#
-# warn message
-#
-warn() {
-    echo "${Prog_Name}: ${@}" 1>&2
-}
-
-#
-# guess_topdir
-#
-# Locates the project's top directory and prints its path.  The caller
-# must verify if the result is correct or not.
-#
-guess_topdir() {
-    olddir=$(pwd)
-    topdir=$(pwd)
-    while [ ${topdir} != / ]; do
-        if [ -f ./atf-c.h ]; then
-            break
-        else
-            cd ..
-            topdir=$(pwd)
-        fi
-    done
-    cd ${olddir}
-    echo ${topdir}
-}
-
-#
-# find_sources
-#
-# Locates all source files within the project, relative to the current
-# directory, and prints their paths.
-#
-find_sources() {
-    find . \( -name "AUTHORS" -o \
-              -name "COPYING" -o \
-              -name "ChangeLog" -o \
-              -name "NEWS" -o \
-              -name "README" -o \
-              -name "TODO" -o \
-              -name "*.[0-9]" -o \
-              -name "*.ac" -o \
-              -name "*.at" -o \
-              -name "*.awk" -o \
-              -name "*.c" -o \
-              -name "*.cpp" -o \
-              -name "*.h" -o \
-              -name "*.h.in" -o \
-              -name "*.hpp" -o \
-              -name "*.m4" -o \
-              -name "*.sh" \
-           \) -a \( \
-              \! -path "*/atf-[0-9]*" -a \
-              \! -path "*autom4te*" -a \
-              -type f -a \
-              \! -name "aclocal.m4" \
-              \! -name "bconfig.h" \
-              \! -name "defs.h" \
-              \! -name "libtool.m4" \
-              \! -name "ltoptions.m4" \
-              \! -name "ltsugar.m4" \
-              \! -name "lt~obsolete.m4" \
-              \! -name "*.so.*" \
-           \)
-}
-
-#
-# guess_formats file
-#
-# Guesses the formats applicable to the given file and prints the resulting
-# list.
-#
-guess_formats() {
-    case ${1} in
-        */ltmain.sh)
-            ;;
-        *.[0-9])
-            echo common man
-            ;;
-        *.c|*.h)
-            echo common c
-            ;;
-        *.cpp|*.hpp)
-            echo common cpp
-            ;;
-        *.sh)
-            echo common shell
-            ;;
-        *)
-            echo common
-            ;;
-    esac
-}
-
-#
-# check_file file
-#
-# Checks the validity of the given file.
-#
-check_file() {
-    err=0
-    for format in $(guess_formats ${1}); do
-        awk -f ${topdir}/admin/check-style-${format}.awk ${1} || err=1
-    done
-
-    return ${err}
-}
-
-#
-# main [file list]
-#
-# Entry point.
-#
-main() {
-    topdir=$(guess_topdir)
-    if [ ! -f ${topdir}/atf-c.h ]; then
-        err "Could not locate the project's top directory"
-    fi
-
-    if [ ${#} -gt 0 ]; then
-        sources=${@}
-    else
-        cd ${topdir}
-        sources=$(find_sources)
-    fi
-
-    ok=0
-    for file in ${sources}; do
-        file=$(echo ${file} | sed -e "s,\\./,,")
-
-        if [ ! -f ${file} ]; then
-            err "Could not open ${file}"
-        else
-            check_file ${file} || ok=1
-        fi
-    done
-
-    return ${ok}
-}
-
-main "${@}"
-
-# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/admin/compile b/contrib/atf/admin/compile
deleted file mode 100755
index b1f4749152a..00000000000
--- a/contrib/atf/admin/compile
+++ /dev/null
@@ -1,310 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-01-04.17; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
-# Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program 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, or (at your option)
-# any later version.
-#
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l*)
-	  lib=${1#-l}
-	  found=no
-	  save_IFS=$IFS
-	  IFS=';'
-	  for dir in $lib_path $LIB
-	  do
-	    IFS=$save_IFS
-	    if $shared && test -f "$dir/$lib.dll.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.dll.lib"
-	      break
-	    fi
-	    if test -f "$dir/$lib.lib"; then
-	      found=yes
-	      set x "$@" "$dir/$lib.lib"
-	      break
-	    fi
-	  done
-	  IFS=$save_IFS
-
-	  test "$found" != yes && set x "$@" "$lib.lib"
-	  shift
-	  ;;
-	-L*)
-	  func_file_conv "${1#-L}"
-	  if test -z "$lib_path"; then
-	    lib_path=$file
-	  else
-	    lib_path="$lib_path;$file"
-	  fi
-	  linker_opts="$linker_opts -LIBPATH:$file"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/contrib/atf/admin/config.guess b/contrib/atf/admin/config.guess
deleted file mode 100755
index 49ba16f15c6..00000000000
--- a/contrib/atf/admin/config.guess
+++ /dev/null
@@ -1,1522 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-01-01'
-
-# This file 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.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-		os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-	exitcode=$?
-	trap '' 0
-	exit $exitcode ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-	echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    s390x:SunOS:*:*)
-	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-	echo i386-pc-auroraux${UNAME_RELEASE}
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
-	SUN_ARCH="i386"
-	# If there is a compiler, see if it is configured for 64-bit objects.
-	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-	# This test works for both compilers.
-	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		grep IS_64BIT_ARCH >/dev/null
-	    then
-		SUN_ARCH="x86_64"
-	    fi
-	fi
-	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-	echo m68k-milan-mint${UNAME_RELEASE}
-	exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-	echo m68k-hades-mint${UNAME_RELEASE}
-	exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-	echo m68k-unknown-mint${UNAME_RELEASE}
-	exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-	# DG/UX returns AViiON for all architectures
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
-	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[4567])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-		      532)                      # CPU_PA_RISC2_0
-			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-			esac ;;
-		    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^		//' << EOF >$dummy.c
-
-		#define _HPUX_SOURCE
-		#include <stdlib.h>
-		#include <unistd.h>
-
-		int main ()
-		{
-		#if defined(_SC_KERNEL_BITS)
-		    long bits = sysconf(_SC_KERNEL_BITS);
-		#endif
-		    long cpu  = sysconf (_SC_CPU_VERSION);
-
-		    switch (cpu)
-			{
-			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-			case CPU_PA_RISC2_0:
-		#if defined(_SC_KERNEL_BITS)
-			    switch (bits)
-				{
-				case 64: puts ("hppa2.0w"); break;
-				case 32: puts ("hppa2.0n"); break;
-				default: puts ("hppa2.0"); break;
-				} break;
-		#else  /* !defined(_SC_KERNEL_BITS) */
-			    puts ("hppa2.0"); break;
-		#endif
-			default: puts ("hppa1.0"); break;
-			}
-		    exit (0);
-		}
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-	exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-	exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-	exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-	exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	UNAME_PROCESSOR=`/usr/bin/uname -p`
-	case ${UNAME_PROCESSOR} in
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:MSYS*:*)
-	echo ${UNAME_MACHINE}-pc-msys
-	exit ;;
-    i*:windows32*:*)
-	# uname -m includes "-pc" on this system.
-	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:*)
-	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    authenticamd | genuineintel | EM64T)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    8664:Windows_NT:*)
-	echo x86_64-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-	esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-		| grep -q __ARM_PCS_VFP
-	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-	    fi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:* | mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef ${UNAME_MACHINE}
-	#undef ${UNAME_MACHINE}el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=${UNAME_MACHINE}el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=${UNAME_MACHINE}
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-	# Unixware is an offshoot of SVR4, but it has its own version
-	# number series starting with 2...
-	# I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-	# Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-	# the processor, so we play safe by assuming i586.
-	# Note: whatever this is, it MUST be the same as what config.sub
-	# prints for the "djgpp" host, or else GDB configury will decide that
-	# this is a cross-build.
-	echo i586-pc-msdosdjgpp
-	exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4; exit; } ;;
-    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-	OS_REL='.3'
-	test -r /etc/.relid \
-	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-			# says <Richard.M.Bartel@ccMail.Census.GOV>
-	echo i586-unisys-sysv4
-	exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-		echo mips-nec-sysv${UNAME_RELEASE}
-	else
-		echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-	exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-	echo i586-pc-haiku
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-	echo neo-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-	echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-    i*86:AROS:*:*)
-	echo ${UNAME_MACHINE}-pc-aros
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/contrib/atf/admin/config.sub b/contrib/atf/admin/config.sub
deleted file mode 100755
index d6b6b3c768f..00000000000
--- a/contrib/atf/admin/config.sub
+++ /dev/null
@@ -1,1766 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
-
-timestamp='2012-01-01'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file 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.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# You can get the latest version of this script from:
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
-  kopensolaris*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
-		os=
-		basic_machine=$1
-		;;
-	-bluegene*)
-		os=-cnk
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
-	-chorusrdb)
-		os=-chorusrdb
-		basic_machine=$1
-		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| hexagon \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| le32 | le64 \
-	| lm32 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64octeon | mips64octeonel \
-	| mips64orion | mips64orionel \
-	| mips64r5900 | mips64r5900el \
-	| mips64vr | mips64vrel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| moxie \
-	| mt \
-	| msp430 \
-	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| open8 \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle \
-	| pyramid \
-	| rl78 | rx \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu \
-	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
-	| ubicom32 \
-	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
-	| we32k \
-	| x86 | xc16x | xstormy16 | xtensa \
-	| z8k | z80)
-		basic_machine=$basic_machine-unknown
-		;;
-	c54x)
-		basic_machine=tic54x-unknown
-		;;
-	c55x)
-		basic_machine=tic55x-unknown
-		;;
-	c6x)
-		basic_machine=tic6x-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	strongarm | thumb | xscale)
-		basic_machine=arm-unknown
-		;;
-
-	xscaleeb)
-		basic_machine=armeb-unknown
-		;;
-
-	xscaleel)
-		basic_machine=armel-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| be32-* | be64-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| hexagon-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| le32-* | le64-* \
-	| lm32-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64octeon-* | mips64octeonel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64r5900-* | mips64r5900el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| open8-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
-	| pyramid-* \
-	| rl78-* | romp-* | rs6000-* | rx-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
-	| tahoe-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile*-* \
-	| tron-* \
-	| ubicom32-* \
-	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
-	| vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-* | z80-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aros)
-		basic_machine=i386-pc
-		os=-aros
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	bluegene*)
-		basic_machine=powerpc-ibm
-		os=-cnk
-		;;
-	c54x-*)
-		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c55x-*)
-		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c6x-*)
-		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	cegcc)
-		basic_machine=arm-unknown
-		os=-cegcc
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16 | cr16-*)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dicos)
-		basic_machine=i686-pc
-		os=-dicos
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	microblaze)
-		basic_machine=microblaze-xilinx
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	msys)
-		basic_machine=i386-pc
-		os=-msys
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	nacl)
-		basic_machine=le32-unknown
-		os=-nacl
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	neo-tandem)
-		basic_machine=neo-tandem
-		;;
-	nse-tandem)
-		basic_machine=nse-tandem
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc | ppcbe)	basic_machine=powerpc-unknown
-		;;
-	ppc-* | ppcbe-*)
-		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	strongarm-* | thumb-*)
-		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tile*)
-		basic_machine=$basic_machine-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	xscale-* | xscalee[bl]-*)
-		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	z80-*-coff)
-		basic_machine=z80-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-	# First match some system type aliases
-	# that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-auroraux)
-		os=-auroraux
-		;;
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-	-os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-	-tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-dicos*)
-		os=-dicos
-		;;
-	-nacl*)
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	score-*)
-		os=-elf
-		;;
-	spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-	c4x-* | tic4x-*)
-		os=-coff
-		;;
-	tic54x-*)
-		os=-coff
-		;;
-	tic55x-*)
-		os=-coff
-		;;
-	tic6x-*)
-		os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-cnk*|-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/contrib/atf/admin/depcomp b/contrib/atf/admin/depcomp
deleted file mode 100755
index bd0ac089584..00000000000
--- a/contrib/atf/admin/depcomp
+++ /dev/null
@@ -1,688 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2011-12-04.11; # UTC
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
-# 2011 Free Software Foundation, Inc.
-
-# This program 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, or (at your option)
-# any later version.
-
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputting dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-cygpath_u="cygpath -u -f -"
-if test "$depmode" = msvcmsys; then
-   # This is just like msvisualcpp but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvisualcpp
-fi
-
-if test "$depmode" = msvc7msys; then
-   # This is just like msvc7 but w/o cygpath translation.
-   # Just convert the backslash-escaped backslashes to single forward
-   # slashes to satisfy depend.m4
-   cygpath_u='sed s,\\\\,/,g'
-   depmode=msvc7
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am.  Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-  for arg
-  do
-    case $arg in
-    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-    *)  set fnord "$@" "$arg" ;;
-    esac
-    shift # fnord
-    shift # $arg
-  done
-  "$@"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.  hp depmode also adds that space, but also prefixes the VPATH
-## to the object.  Take care to not repeat it in the output.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
-      | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
-    echo >> "$depfile"
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$base.u
-    tmpdepfile3=$dir.libs/$base.u
-    "$@" -Wc,-M
-  else
-    tmpdepfile1=$dir$base.u
-    tmpdepfile2=$dir$base.u
-    tmpdepfile3=$dir$base.u
-    "$@" -M
-  fi
-  stat=$?
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-    exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp2)
-  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-  # compilers, which have integrated preprocessors.  The correct option
-  # to use with these is +Maked; it writes dependencies to a file named
-  # 'foo.d', which lands next to the object file, wherever that
-  # happens to be.
-  # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-  if test "$libtool" = yes; then
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir.libs/$base.d
-    "$@" -Wc,+Maked
-  else
-    tmpdepfile1=$dir$base.d
-    tmpdepfile2=$dir$base.d
-    "$@" +Maked
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-     rm -f "$tmpdepfile1" "$tmpdepfile2"
-     exit $stat
-  fi
-
-  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-  do
-    test -f "$tmpdepfile" && break
-  done
-  if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${
-	       s/^ *//
-	       s/ \\*$//
-	       s/$/:/
-	       p
-	     }' "$tmpdepfile" >> "$depfile"
-  else
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile" "$tmpdepfile2"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-msvc7)
-  if test "$libtool" = yes; then
-    showIncludes=-Wc,-showIncludes
-  else
-    showIncludes=-showIncludes
-  fi
-  "$@" $showIncludes > "$tmpdepfile"
-  stat=$?
-  grep -v '^Note: including file: ' "$tmpdepfile"
-  if test "$stat" = 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  # The first sed program below extracts the file names and escapes
-  # backslashes for cygpath.  The second sed program outputs the file
-  # name when reading, but also accumulates all include files in the
-  # hold buffer in order to output them again at the end.  This only
-  # works with sed implementations that can handle large buffers.
-  sed < "$tmpdepfile" -n '
-/^Note: including file:  *\(.*\)/ {
-  s//\1/
-  s/\\/\\\\/g
-  p
-}' | $cygpath_u | sort -u | sed -n '
-s/ /\\ /g
-s/\(.*\)/	\1 \\/p
-s/.\(.*\) \\/\1:/
-H
-$ {
-  s/.*/	/
-  G
-  p
-}' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvc7msys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no eat=no
-  for arg
-  do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    if test $eat = yes; then
-      eat=no
-      continue
-    fi
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -arch)
-      eat=yes ;;
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  # makedepend may prepend the VPATH from the source file name to the object.
-  # No need to regex-escape $object, excess matching of '.' is harmless.
-  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E 2>/dev/null |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvcmsys)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/contrib/atf/admin/install-sh b/contrib/atf/admin/install-sh
deleted file mode 100755
index a9244eb0786..00000000000
--- a/contrib/atf/admin/install-sh
+++ /dev/null
@@ -1,527 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2011-01-19.21; # UTC
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# 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 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
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.
-
-nl='
-'
-IFS=" ""	$nl"
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
-if test -z "$doit"; then
-  doit_exec=exec
-else
-  doit_exec=$doit
-fi
-
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
-
-chgrpprog=${CHGRPPROG-chgrp}
-chmodprog=${CHMODPROG-chmod}
-chownprog=${CHOWNPROG-chown}
-cmpprog=${CMPPROG-cmp}
-cpprog=${CPPROG-cp}
-mkdirprog=${MKDIRPROG-mkdir}
-mvprog=${MVPROG-mv}
-rmprog=${RMPROG-rm}
-stripprog=${STRIPPROG-strip}
-
-posix_glob='?'
-initialize_posix_glob='
-  test "$posix_glob" != "?" || {
-    if (set -f) 2>/dev/null; then
-      posix_glob=
-    else
-      posix_glob=:
-    fi
-  }
-'
-
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chgrpcmd=
-chmodcmd=$chmodprog
-chowncmd=
-mvcmd=$mvprog
-rmcmd="$rmprog -f"
-stripcmd=
-
-src=
-dst=
-dir_arg=
-dst_arg=
-
-copy_on_change=false
-no_target_directory=
-
-usage="\
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
-     --help     display this help and exit.
-     --version  display version info and exit.
-
-  -c            (ignored)
-  -C            install only if different (preserve the last data modification time)
-  -d            create directories instead of installing files.
-  -g GROUP      $chgrpprog installed files to GROUP.
-  -m MODE       $chmodprog installed files to MODE.
-  -o USER       $chownprog installed files to USER.
-  -s            $stripprog installed files.
-  -t DIRECTORY  install into DIRECTORY.
-  -T            report an error if DSTFILE is a directory.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-  RMPROG STRIPPROG
-"
-
-while test $# -ne 0; do
-  case $1 in
-    -c) ;;
-
-    -C) copy_on_change=true;;
-
-    -d) dir_arg=true;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-	shift;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) mode=$2
-	case $mode in
-	  *' '* | *'	'* | *'
-'*	  | *'*'* | *'?'* | *'['*)
-	    echo "$0: invalid mode: $mode" >&2
-	    exit 1;;
-	esac
-	shift;;
-
-    -o) chowncmd="$chownprog $2"
-	shift;;
-
-    -s) stripcmd=$stripprog;;
-
-    -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
-	case $dst_arg in
-	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
-	esac
-	shift;;
-
-    -T) no_target_directory=true;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    --)	shift
-	break;;
-
-    -*)	echo "$0: invalid option: $1" >&2
-	exit 1;;
-
-    *)  break;;
-  esac
-  shift
-done
-
-if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-  # When -d is used, all remaining arguments are directories to create.
-  # When -t is used, the destination is already specified.
-  # Otherwise, the last argument is the destination.  Remove it from $@.
-  for arg
-  do
-    if test -n "$dst_arg"; then
-      # $@ is not empty: it contains at least $arg.
-      set fnord "$@" "$dst_arg"
-      shift # fnord
-    fi
-    shift # arg
-    dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
-    case $dst_arg in
-      -* | [=\(\)!]) dst_arg=./$dst_arg;;
-    esac
-  done
-fi
-
-if test $# -eq 0; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-if test -z "$dir_arg"; then
-  do_exit='(exit $ret); exit $ret'
-  trap "ret=129; $do_exit" 1
-  trap "ret=130; $do_exit" 2
-  trap "ret=141; $do_exit" 13
-  trap "ret=143; $do_exit" 15
-
-  # Set umask so as not to create temps with too-generous modes.
-  # However, 'strip' requires both read and write access to temps.
-  case $mode in
-    # Optimize common cases.
-    *644) cp_umask=133;;
-    *755) cp_umask=22;;
-
-    *[0-7])
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw='% 200'
-      fi
-      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-    *)
-      if test -z "$stripcmd"; then
-	u_plus_rw=
-      else
-	u_plus_rw=,u+rw
-      fi
-      cp_umask=$mode$u_plus_rw;;
-  esac
-fi
-
-for src
-do
-  # Protect names problematic for `test' and other utilities.
-  case $src in
-    -* | [=\(\)!]) src=./$src;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    dstdir=$dst
-    test -d "$dstdir"
-    dstdir_status=$?
-  else
-
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dst_arg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-    dst=$dst_arg
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dst_arg: Is a directory" >&2
-	exit 1
-      fi
-      dstdir=$dst
-      dst=$dstdir/`basename "$src"`
-      dstdir_status=0
-    else
-      # Prefer dirname, but fall back on a substitute if dirname fails.
-      dstdir=`
-	(dirname "$dst") 2>/dev/null ||
-	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	     X"$dst" : 'X\(//\)[^/]' \| \
-	     X"$dst" : 'X\(//\)$' \| \
-	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-	echo X"$dst" |
-	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)[^/].*/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\/\)$/{
-		   s//\1/
-		   q
-		 }
-		 /^X\(\/\).*/{
-		   s//\1/
-		   q
-		 }
-		 s/.*/./; q'
-      `
-
-      test -d "$dstdir"
-      dstdir_status=$?
-    fi
-  fi
-
-  obsolete_mkdir_used=false
-
-  if test $dstdir_status != 0; then
-    case $posix_mkdir in
-      '')
-	# Create intermediate dirs using mode 755 as modified by the umask.
-	# This is like FreeBSD 'install' as of 1997-10-28.
-	umask=`umask`
-	case $stripcmd.$umask in
-	  # Optimize common cases.
-	  *[2367][2367]) mkdir_umask=$umask;;
-	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-
-	  *[0-7])
-	    mkdir_umask=`expr $umask + 22 \
-	      - $umask % 100 % 40 + $umask % 20 \
-	      - $umask % 10 % 4 + $umask % 2
-	    `;;
-	  *) mkdir_umask=$umask,go-w;;
-	esac
-
-	# With -d, create the new directory with the user-specified mode.
-	# Otherwise, rely on $mkdir_umask.
-	if test -n "$dir_arg"; then
-	  mkdir_mode=-m$mode
-	else
-	  mkdir_mode=
-	fi
-
-	posix_mkdir=false
-	case $umask in
-	  *[123567][0-7][0-7])
-	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-	    ;;
-	  *)
-	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-
-	    if (umask $mkdir_umask &&
-		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-	    then
-	      if test -z "$dir_arg" || {
-		   # Check for POSIX incompatibilities with -m.
-		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
-		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-		   case $ls_ld_tmpdir in
-		     d????-?r-*) different_mode=700;;
-		     d????-?--*) different_mode=755;;
-		     *) false;;
-		   esac &&
-		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-		   }
-		 }
-	      then posix_mkdir=:
-	      fi
-	      rmdir "$tmpdir/d" "$tmpdir"
-	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-	    fi
-	    trap '' 0;;
-	esac;;
-    esac
-
-    if
-      $posix_mkdir && (
-	umask $mkdir_umask &&
-	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-      )
-    then :
-    else
-
-      # The umask is ridiculous, or mkdir does not conform to POSIX,
-      # or it failed possibly due to a race condition.  Create the
-      # directory the slow way, step by step, checking for races as we go.
-
-      case $dstdir in
-	/*) prefix='/';;
-	[-=\(\)!]*) prefix='./';;
-	*)  prefix='';;
-      esac
-
-      eval "$initialize_posix_glob"
-
-      oIFS=$IFS
-      IFS=/
-      $posix_glob set -f
-      set fnord $dstdir
-      shift
-      $posix_glob set +f
-      IFS=$oIFS
-
-      prefixes=
-
-      for d
-      do
-	test X"$d" = X && continue
-
-	prefix=$prefix$d
-	if test -d "$prefix"; then
-	  prefixes=
-	else
-	  if $posix_mkdir; then
-	    (umask=$mkdir_umask &&
-	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-	    # Don't fail if two instances are running concurrently.
-	    test -d "$prefix" || exit 1
-	  else
-	    case $prefix in
-	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-	      *) qprefix=$prefix;;
-	    esac
-	    prefixes="$prefixes '$qprefix'"
-	  fi
-	fi
-	prefix=$prefix/
-      done
-
-      if test -n "$prefixes"; then
-	# Don't fail if two instances are running concurrently.
-	(umask $mkdir_umask &&
-	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-	  test -d "$dstdir" || exit 1
-	obsolete_mkdir_used=true
-      fi
-    fi
-  fi
-
-  if test -n "$dir_arg"; then
-    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-  else
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-
-    # Copy the file name to the temp name.
-    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-
-    # If -C, don't bother to copy if it wouldn't change the file.
-    if $copy_on_change &&
-       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-
-       eval "$initialize_posix_glob" &&
-       $posix_glob set -f &&
-       set X $old && old=:$2:$4:$5:$6 &&
-       set X $new && new=:$2:$4:$5:$6 &&
-       $posix_glob set +f &&
-
-       test "$old" = "$new" &&
-       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-    then
-      rm -f "$dsttmp"
-    else
-      # Rename the file to the real destination.
-      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-
-      # The rename failed, perhaps because mv can't rename something else
-      # to itself, or perhaps because mv is so ancient that it does not
-      # support -f.
-      {
-	# Now remove or move aside any old file at destination location.
-	# We try this two ways since rm can't unlink itself on some
-	# systems and the destination file might be busy for other
-	# reasons.  In this case, the final cleanup might fail but the new
-	# file should still install successfully.
-	{
-	  test ! -f "$dst" ||
-	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-	  } ||
-	  { echo "$0: cannot unlink or rename $dst" >&2
-	    (exit 1); exit 1
-	  }
-	} &&
-
-	# Now rename the file to the real destination.
-	$doit $mvcmd "$dsttmp" "$dst"
-      }
-    fi || exit 1
-
-    trap '' 0
-  fi
-done
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/contrib/atf/admin/ltmain.sh b/contrib/atf/admin/ltmain.sh
deleted file mode 100644
index 63ae69dc6fe..00000000000
--- a/contrib/atf/admin/ltmain.sh
+++ /dev/null
@@ -1,9655 +0,0 @@
-
-# libtool (GNU libtool) 2.4.2
-# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-# This is free software; see the source for copying conditions.  There is NO
-# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-# 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.
-
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-#       --config             show all configuration variables
-#       --debug              enable verbose shell tracing
-#   -n, --dry-run            display commands without modifying any files
-#       --features           display basic configuration information and exit
-#       --mode=MODE          use operation mode MODE
-#       --preserve-dup-deps  don't remove duplicate dependency libraries
-#       --quiet, --silent    don't print informational messages
-#       --no-quiet, --no-silent
-#                            print informational messages (default)
-#       --no-warn            don't display warning messages
-#       --tag=TAG            use configuration variables from tag TAG
-#   -v, --verbose            print more informational messages than default
-#       --no-verbose         don't print the extra informational messages
-#       --version            print version information
-#   -h, --help, --help-all   print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-#         clean              remove files from the build directory
-#         compile            compile a source file into a libtool object
-#         execute            automatically set library path, then run a program
-#         finish             complete the installation of libtool libraries
-#         install            install libraries or executables
-#         link               create a library or an executable
-#         uninstall          remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE.  When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-#         host-triplet:	$host
-#         shell:		$SHELL
-#         compiler:		$LTCC
-#         compiler flags:		$LTCFLAGS
-#         linker:		$LD (gnu? $with_gnu_ld)
-#         $progname:	(GNU libtool) 2.4.2
-#         automake:	$automake_version
-#         autoconf:	$autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
-
-PROGRAM=libtool
-PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-do
-  eval "if test \"\${$lt_var+set}\" = set; then
-          save_$lt_var=\$$lt_var
-          $lt_var=C
-	  export $lt_var
-	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
-	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
-	fi"
-done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-
-$lt_unset CDPATH
-
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-
-
-: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
-: ${MAKE="make"}
-: ${MKDIR="mkdir"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
-
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-} # func_dirname may be replaced by extended shell implementation
-
-
-# func_basename file
-func_basename ()
-{
-    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
-
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-    # Extract subdirectory from the argument.
-    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
-    if test "X$func_dirname_result" = "X${1}"; then
-      func_dirname_result="${3}"
-    else
-      func_dirname_result="$func_dirname_result${2}"
-    fi
-    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
-
-
-# func_stripname 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).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-    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 may be replaced by extended shell implementation
-
-
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
-		s@/\./@/@g
-		t dotsl
-		s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
-
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-#             value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
-  # Start from root dir and reassemble the path.
-  func_normal_abspath_result=
-  func_normal_abspath_tpath=$1
-  func_normal_abspath_altnamespace=
-  case $func_normal_abspath_tpath in
-    "")
-      # Empty path, that just means $cwd.
-      func_stripname '' '/' "`pwd`"
-      func_normal_abspath_result=$func_stripname_result
-      return
-    ;;
-    # The next three entries are used to spot a run of precisely
-    # two leading slashes without using negated character classes;
-    # we take advantage of case's first-match behaviour.
-    ///*)
-      # Unusual form of absolute path, do nothing.
-    ;;
-    //*)
-      # Not necessarily an ordinary path; POSIX reserves leading '//'
-      # and for example Cygwin uses it to access remote file shares
-      # over CIFS/SMB, so we conserve a leading double slash if found.
-      func_normal_abspath_altnamespace=/
-    ;;
-    /*)
-      # Absolute path, do nothing.
-    ;;
-    *)
-      # Relative path, prepend $cwd.
-      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
-    ;;
-  esac
-  # Cancel out all the simple stuff to save iterations.  We also want
-  # the path to end with a slash for ease of parsing, so make sure
-  # there is one (and only one) here.
-  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
-  while :; do
-    # Processed it all yet?
-    if test "$func_normal_abspath_tpath" = / ; then
-      # If we ascended to the root using ".." the result may be empty now.
-      if test -z "$func_normal_abspath_result" ; then
-        func_normal_abspath_result=/
-      fi
-      break
-    fi
-    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcar"`
-    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
-        -e "$pathcdr"`
-    # Figure out what to do with it
-    case $func_normal_abspath_tcomponent in
-      "")
-        # Trailing empty path component, ignore it.
-      ;;
-      ..)
-        # Parent dir; strip last assembled component from result.
-        func_dirname "$func_normal_abspath_result"
-        func_normal_abspath_result=$func_dirname_result
-      ;;
-      *)
-        # Actual path component, append it.
-        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
-      ;;
-    esac
-  done
-  # Restore leading double-slash if one was found on entry.
-  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
-
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-#             value returned in "$func_relative_path_result"
-func_relative_path ()
-{
-  func_relative_path_result=
-  func_normal_abspath "$1"
-  func_relative_path_tlibdir=$func_normal_abspath_result
-  func_normal_abspath "$2"
-  func_relative_path_tbindir=$func_normal_abspath_result
-
-  # Ascend the tree starting from libdir
-  while :; do
-    # check if we have found a prefix of bindir
-    case $func_relative_path_tbindir in
-      $func_relative_path_tlibdir)
-        # found an exact match
-        func_relative_path_tcancelled=
-        break
-        ;;
-      $func_relative_path_tlibdir*)
-        # found a matching prefix
-        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
-        func_relative_path_tcancelled=$func_stripname_result
-        if test -z "$func_relative_path_result"; then
-          func_relative_path_result=.
-        fi
-        break
-        ;;
-      *)
-        func_dirname $func_relative_path_tlibdir
-        func_relative_path_tlibdir=${func_dirname_result}
-        if test "x$func_relative_path_tlibdir" = x ; then
-          # Have to descend all the way to the root!
-          func_relative_path_result=../$func_relative_path_result
-          func_relative_path_tcancelled=$func_relative_path_tbindir
-          break
-        fi
-        func_relative_path_result=../$func_relative_path_result
-        ;;
-    esac
-  done
-
-  # Now calculate path; take care to avoid doubling-up slashes.
-  func_stripname '' '/' "$func_relative_path_result"
-  func_relative_path_result=$func_stripname_result
-  func_stripname '/' '/' "$func_relative_path_tcancelled"
-  if test "x$func_stripname_result" != x ; then
-    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
-  fi
-
-  # Normalisation. If bindir is libdir, return empty string,
-  # else relative path ending with a slash; either way, target
-  # file name can be directly appended.
-  if test ! -z "$func_relative_path_result"; then
-    func_stripname './' '' "$func_relative_path_result/"
-    func_relative_path_result=$func_stripname_result
-  fi
-}
-
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
-
-# Make sure we have an absolute path for reexecution:
-case $progpath in
-  [\\/]*|[A-Za-z]:\\*) ;;
-  *[\\/]*)
-     progdir=$func_dirname_result
-     progdir=`cd "$progdir" && pwd`
-     progpath="$progdir/$progname"
-     ;;
-  *)
-     save_IFS="$IFS"
-     IFS=${PATH_SEPARATOR-:}
-     for progdir in $PATH; do
-       IFS="$save_IFS"
-       test -x "$progdir/$progname" && break
-     done
-     IFS="$save_IFS"
-     test -n "$progdir" || progdir=`pwd`
-     progpath="$progdir/$progname"
-     ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
-
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes.  A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'.  `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
-  s/$bs4/&\\
-/g
-  s/^$bs2$dollar/$bs&/
-  s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
-  s/\n//g"
-
-# Standard options:
-opt_dry_run=false
-opt_help=false
-opt_quiet=false
-opt_verbose=false
-opt_warning=:
-
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
-
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
-    $opt_verbose && func_echo ${1+"$@"}
-
-    # A bug in bash halts the script if the last line of a function
-    # fails when set -e is in force, so we need another command to
-    # work around that:
-    :
-}
-
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
-    $ECHO "$*"
-}
-
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
-    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
-
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
-    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
-
-    # bash bug again:
-    :
-}
-
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
-{
-    func_error ${1+"$@"}
-    exit $EXIT_FAILURE
-}
-
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
-    func_error ${1+"$@"}
-    func_fatal_error "$help"
-}
-help="Try \`$progname --help' for more information."  ## default
-
-
-# func_grep expression filename
-# Check whether EXPRESSION matches any line of FILENAME, without output.
-func_grep ()
-{
-    $GREP "$1" "$2" >/dev/null 2>&1
-}
-
-
-# func_mkdir_p directory-path
-# Make sure the entire path to DIRECTORY-PATH is available.
-func_mkdir_p ()
-{
-    my_directory_path="$1"
-    my_dir_list=
-
-    if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
-
-      # Protect directory names starting with `-'
-      case $my_directory_path in
-        -*) my_directory_path="./$my_directory_path" ;;
-      esac
-
-      # While some portion of DIR does not yet exist...
-      while test ! -d "$my_directory_path"; do
-        # ...make a list in topmost first order.  Use a colon delimited
-	# list incase some portion of path contains whitespace.
-        my_dir_list="$my_directory_path:$my_dir_list"
-
-        # If the last portion added has no slash in it, the list is done
-        case $my_directory_path in */*) ;; *) break ;; esac
-
-        # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
-      done
-      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
-
-      save_mkdir_p_IFS="$IFS"; IFS=':'
-      for my_dir in $my_dir_list; do
-	IFS="$save_mkdir_p_IFS"
-        # mkdir can fail with a `File exist' error if two processes
-        # try to create one of the directories concurrently.  Don't
-        # stop in that case!
-        $MKDIR "$my_dir" 2>/dev/null || :
-      done
-      IFS="$save_mkdir_p_IFS"
-
-      # Bail out if we (or some other process) failed to create a directory.
-      test -d "$my_directory_path" || \
-        func_fatal_error "Failed to create \`$1'"
-    fi
-}
-
-
-# func_mktempdir [string]
-# Make a temporary directory that won't clash with other running
-# libtool processes, and avoids race conditions if possible.  If
-# given, STRING is the basename for that directory.
-func_mktempdir ()
-{
-    my_template="${TMPDIR-/tmp}/${1-$progname}"
-
-    if test "$opt_dry_run" = ":"; then
-      # Return a directory name, but don't create it in dry-run mode
-      my_tmpdir="${my_template}-$$"
-    else
-
-      # If mktemp works, use that first and foremost
-      my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
-
-      if test ! -d "$my_tmpdir"; then
-        # Failing that, at least try and use $RANDOM to avoid a race
-        my_tmpdir="${my_template}-${RANDOM-0}$$"
-
-        save_mktempdir_umask=`umask`
-        umask 0077
-        $MKDIR "$my_tmpdir"
-        umask $save_mktempdir_umask
-      fi
-
-      # If we're not in dry-run mode, bomb out on failure
-      test -d "$my_tmpdir" || \
-        func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
-    fi
-
-    $ECHO "$my_tmpdir"
-}
-
-
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
-{
-    case $1 in
-      *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
-      *)
-        func_quote_for_eval_unquoted_result="$1" ;;
-    esac
-
-    case $func_quote_for_eval_unquoted_result in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting, command substitution and and variable
-      # expansion for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
-        ;;
-      *)
-        func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
-    esac
-}
-
-
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
-{
-    case $1 in
-      *[\\\`\"]*)
-	my_arg=`$ECHO "$1" | $SED \
-	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
-      *)
-        my_arg="$1" ;;
-    esac
-
-    case $my_arg in
-      # Double-quote args containing shell metacharacters to delay
-      # word splitting and command substitution for a subsequent eval.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-        my_arg="\"$my_arg\""
-        ;;
-    esac
-
-    func_quote_for_expand_result="$my_arg"
-}
-
-
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$my_cmd"
-      my_status=$?
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD.  Then, if opt_dryrun is
-# not true, evaluate CMD.  If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.  Use the saved locale for evaluation.
-func_show_eval_locale ()
-{
-    my_cmd="$1"
-    my_fail_exp="${2-:}"
-
-    ${opt_silent-false} || {
-      func_quote_for_expand "$my_cmd"
-      eval "func_echo $func_quote_for_expand_result"
-    }
-
-    if ${opt_dry_run-false}; then :; else
-      eval "$lt_user_locale
-	    $my_cmd"
-      my_status=$?
-      eval "$lt_safe_locale"
-      if test "$my_status" -eq 0; then :; else
-	eval "(exit $my_status); $my_fail_exp"
-      fi
-    fi
-}
-
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result.  All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
-  case $1 in
-  [0-9]* | *[!a-zA-Z0-9_]*)
-    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
-    ;;
-  * )
-    func_tr_sh_result=$1
-    ;;
-  esac
-}
-
-
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
-    $opt_debug
-
-    $SED -n '/(C)/!b go
-	:more
-	/\./!{
-	  N
-	  s/\n# / /
-	  b more
-	}
-	:go
-	/^# '$PROGRAM' (GNU /,/# warranty; / {
-        s/^# //
-	s/^# *$//
-        s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
-        p
-     }' < "$progpath"
-     exit $?
-}
-
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/^#  *.*--help/ {
-        s/^# //
-	s/^# *$//
-	s/\$progname/'$progname'/
-	p
-    }' < "$progpath"
-    echo
-    $ECHO "run \`$progname --help | more' for full usage"
-    exit $?
-}
-
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
-func_help ()
-{
-    $opt_debug
-
-    $SED -n '/^# Usage:/,/# Report bugs to/ {
-	:print
-        s/^# //
-	s/^# *$//
-	s*\$progname*'$progname'*
-	s*\$host*'"$host"'*
-	s*\$SHELL*'"$SHELL"'*
-	s*\$LTCC*'"$LTCC"'*
-	s*\$LTCFLAGS*'"$LTCFLAGS"'*
-	s*\$LD*'"$LD"'*
-	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
-	p
-	d
-     }
-     /^# .* home page:/b print
-     /^# General help using/b print
-     ' < "$progpath"
-    ret=$?
-    if test -z "$1"; then
-      exit $ret
-    fi
-}
-
-# func_missing_arg argname
-# Echo program name prefixed message to standard error and set global
-# exit_cmd.
-func_missing_arg ()
-{
-    $opt_debug
-
-    func_error "missing argument for $1."
-    exit_cmd=exit
-}
-
-
-# func_split_short_opt shortopt
-# Set func_split_short_opt_name and func_split_short_opt_arg shell
-# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
-{
-    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
-    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
-
-    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
-    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
-
-
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
-{
-    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
-    my_sed_long_arg='1s/^--[^=]*=//'
-
-    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
-    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
-
-exit_cmd=:
-
-
-
-
-
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
-
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-    eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
-
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
-    func_quote_for_eval "${2}"
-    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
-
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-    func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
-
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
-
-
-# func_lo2o object
-func_lo2o ()
-{
-    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
-
-
-# func_xform libobj-or-source
-func_xform ()
-{
-    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
-
-
-# func_fatal_configuration arg...
-# Echo program name prefixed message to standard error, followed by
-# a configuration failure hint, and exit.
-func_fatal_configuration ()
-{
-    func_error ${1+"$@"}
-    func_error "See the $PACKAGE documentation for more information."
-    func_fatal_error "Fatal configuration error."
-}
-
-
-# func_config
-# Display the configuration for all the tags in this script.
-func_config ()
-{
-    re_begincf='^# ### BEGIN LIBTOOL'
-    re_endcf='^# ### END LIBTOOL'
-
-    # Default configuration.
-    $SED "1,/$re_begincf CONFIG/d;/$re_endcf CONFIG/,\$d" < "$progpath"
-
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      $SED -n "/$re_begincf TAG CONFIG: $tagname\$/,/$re_endcf TAG CONFIG: $tagname\$/p" < "$progpath"
-    done
-
-    exit $?
-}
-
-# func_features
-# Display the features supported by this script.
-func_features ()
-{
-    echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      echo "enable shared libraries"
-    else
-      echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      echo "enable static libraries"
-    else
-      echo "disable static libraries"
-    fi
-
-    exit $?
-}
-
-# func_enable_tag tagname
-# Verify that TAGNAME is valid, and either flag an error and exit, or
-# enable the TAGNAME tag.  We also add TAGNAME to the global $taglist
-# variable here.
-func_enable_tag ()
-{
-  # Global variable:
-  tagname="$1"
-
-  re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
-  re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
-  sed_extractcf="/$re_begincf/,/$re_endcf/p"
-
-  # Validate tagname.
-  case $tagname in
-    *[!-_A-Za-z0-9,/]*)
-      func_fatal_error "invalid tag name: $tagname"
-      ;;
-  esac
-
-  # Don't test for the "default" C tag, as we know it's
-  # there but not specially marked.
-  case $tagname in
-    CC) ;;
-    *)
-      if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
-	taglist="$taglist $tagname"
-
-	# Evaluate the configuration.  Be careful to quote the path
-	# and the sed script, to avoid splitting on whitespace, but
-	# also don't use non-portable quotes within backquotes within
-	# quotes we have to do it in 2 steps:
-	extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
-	eval "$extractedcf"
-      else
-	func_error "ignoring unknown tag $tagname"
-      fi
-      ;;
-  esac
-}
-
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
-    fi
-
-    exit $EXIT_MISMATCH
-  fi
-}
-
-
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
-  shift; set dummy --mode clean ${1+"$@"}; shift
-  ;;
-compile|compil|compi|comp|com|co|c)
-  shift; set dummy --mode compile ${1+"$@"}; shift
-  ;;
-execute|execut|execu|exec|exe|ex|e)
-  shift; set dummy --mode execute ${1+"$@"}; shift
-  ;;
-finish|finis|fini|fin|fi|f)
-  shift; set dummy --mode finish ${1+"$@"}; shift
-  ;;
-install|instal|insta|inst|ins|in|i)
-  shift; set dummy --mode install ${1+"$@"}; shift
-  ;;
-link|lin|li|l)
-  shift; set dummy --mode link ${1+"$@"}; shift
-  ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-  shift; set dummy --mode uninstall ${1+"$@"}; shift
-  ;;
-esac
-
-
-
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
-
-
-# Parse options once, thoroughly.  This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
-{
-  # this just eases exit handling
-  while test $# -gt 0; do
-    opt="$1"
-    shift
-    case $opt in
-      --debug|-x)	opt_debug='set -x'
-			func_echo "enabling shell trace mode"
-			$opt_debug
-			;;
-      --dry-run|--dryrun|-n)
-			opt_dry_run=:
-			;;
-      --config)
-			opt_config=:
-func_config
-			;;
-      --dlopen|-dlopen)
-			optarg="$1"
-			opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
-			shift
-			;;
-      --preserve-dup-deps)
-			opt_preserve_dup_deps=:
-			;;
-      --features)
-			opt_features=:
-func_features
-			;;
-      --finish)
-			opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
-			;;
-      --help)
-			opt_help=:
-			;;
-      --help-all)
-			opt_help_all=:
-opt_help=': help-all'
-			;;
-      --mode)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_mode="$optarg"
-case $optarg in
-  # Valid mode arguments:
-  clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
-  # Catch anything else as an error
-  *) func_error "invalid argument for $opt"
-     exit_cmd=exit
-     break
-     ;;
-esac
-			shift
-			;;
-      --no-silent|--no-quiet)
-			opt_silent=false
-func_append preserve_args " $opt"
-			;;
-      --no-warning|--no-warn)
-			opt_warning=false
-func_append preserve_args " $opt"
-			;;
-      --no-verbose)
-			opt_verbose=false
-func_append preserve_args " $opt"
-			;;
-      --silent|--quiet)
-			opt_silent=:
-func_append preserve_args " $opt"
-        opt_verbose=false
-			;;
-      --verbose|-v)
-			opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
-			;;
-      --tag)
-			test $# = 0 && func_missing_arg $opt && break
-			optarg="$1"
-			opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
-			shift
-			;;
-
-      -\?|-h)		func_usage				;;
-      --help)		func_help				;;
-      --version)	func_version				;;
-
-      # Separate optargs to long options:
-      --*=*)
-			func_split_long_opt "$opt"
-			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      # Separate non-argument short options:
-      -\?*|-h*|-n*|-v*)
-			func_split_short_opt "$opt"
-			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
-			shift
-			;;
-
-      --)		break					;;
-      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
-      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
-    esac
-  done
-
-  # Validate options:
-
-  # save first non-option argument
-  if test "$#" -gt 0; then
-    nonopt="$opt"
-    shift
-  fi
-
-  # preserve --debug
-  test "$opt_debug" = : || func_append preserve_args " --debug"
-
-  case $host in
-    *cygwin* | *mingw* | *pw32* | *cegcc*)
-      # don't eliminate duplications in $postdeps and $predeps
-      opt_duplicate_compiler_generated_deps=:
-      ;;
-    *)
-      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
-      ;;
-  esac
-
-  $opt_help || {
-    # Sanity checks first:
-    func_check_version_match
-
-    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-      func_fatal_configuration "not configured to build any kind of library"
-    fi
-
-    # Darwin sucks
-    eval std_shrext=\"$shrext_cmds\"
-
-    # Only execute mode is allowed to have -dlopen flags.
-    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
-      func_error "unrecognized option \`-dlopen'"
-      $ECHO "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Change the help message to a mode-specific one.
-    generic_help="$help"
-    help="Try \`$progname --help --mode=$opt_mode' for more information."
-  }
-
-
-  # Bail if the options were screwed
-  $exit_cmd $EXIT_FAILURE
-}
-
-
-
-
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_lalib_p ()
-{
-    test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
-        | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
-}
-
-# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
-# This function implements the same check as func_lalib_p without
-# resorting to external programs.  To this end, it redirects stdin and
-# closes it afterwards, without saving the original file descriptor.
-# As a safety measure, use it only where a negative result would be
-# fatal anyway.  Works if `file' does not exist.
-func_lalib_unsafe_p ()
-{
-    lalib_p=no
-    if test -f "$1" && test -r "$1" && exec 5<&0 <"$1"; then
-	for lalib_p_l in 1 2 3 4
-	do
-	    read lalib_p_line
-	    case "$lalib_p_line" in
-		\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
-	    esac
-	done
-	exec 0<&5 5<&-
-    fi
-    test "$lalib_p" = yes
-}
-
-# func_ltwrapper_script_p file
-# True iff FILE is a libtool wrapper script
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_script_p ()
-{
-    func_lalib_p "$1"
-}
-
-# func_ltwrapper_executable_p file
-# True iff FILE is a libtool wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_executable_p ()
-{
-    func_ltwrapper_exec_suffix=
-    case $1 in
-    *.exe) ;;
-    *) func_ltwrapper_exec_suffix=.exe ;;
-    esac
-    $GREP "$magic_exe" "$1$func_ltwrapper_exec_suffix" >/dev/null 2>&1
-}
-
-# func_ltwrapper_scriptname file
-# Assumes file is an ltwrapper_executable
-# uses $file to determine the appropriate filename for a
-# temporary ltwrapper_script.
-func_ltwrapper_scriptname ()
-{
-    func_dirname_and_basename "$1" "" "."
-    func_stripname '' '.exe' "$func_basename_result"
-    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-}
-
-# func_ltwrapper_p file
-# True iff FILE is a libtool wrapper script or wrapper executable
-# This function is only a basic sanity check; it will hardly flush out
-# determined imposters.
-func_ltwrapper_p ()
-{
-    func_ltwrapper_script_p "$1" || func_ltwrapper_executable_p "$1"
-}
-
-
-# func_execute_cmds commands fail_cmd
-# Execute tilde-delimited COMMANDS.
-# If FAIL_CMD is given, eval that upon failure.
-# FAIL_CMD may read-access the current command in variable CMD!
-func_execute_cmds ()
-{
-    $opt_debug
-    save_ifs=$IFS; IFS='~'
-    for cmd in $1; do
-      IFS=$save_ifs
-      eval cmd=\"$cmd\"
-      func_show_eval "$cmd" "${2-:}"
-    done
-    IFS=$save_ifs
-}
-
-
-# func_source file
-# Source FILE, adding directory component if necessary.
-# Note that it is not necessary on cygwin/mingw to append a dot to
-# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
-# behavior happens only for exec(3), not for open(2)!  Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
-func_source ()
-{
-    $opt_debug
-    case $1 in
-    */* | *\\*)	. "$1" ;;
-    *)		. "./$1" ;;
-    esac
-}
-
-
-# func_resolve_sysroot PATH
-# Replace a leading = in PATH with a sysroot.  Store the result into
-# func_resolve_sysroot_result
-func_resolve_sysroot ()
-{
-  func_resolve_sysroot_result=$1
-  case $func_resolve_sysroot_result in
-  =*)
-    func_stripname '=' '' "$func_resolve_sysroot_result"
-    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
-    ;;
-  esac
-}
-
-# func_replace_sysroot PATH
-# If PATH begins with the sysroot, replace it with = and
-# store the result into func_replace_sysroot_result.
-func_replace_sysroot ()
-{
-  case "$lt_sysroot:$1" in
-  ?*:"$lt_sysroot"*)
-    func_stripname "$lt_sysroot" '' "$1"
-    func_replace_sysroot_result="=$func_stripname_result"
-    ;;
-  *)
-    # Including no sysroot.
-    func_replace_sysroot_result=$1
-    ;;
-  esac
-}
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag ()
-{
-    $opt_debug
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	func_append_quoted CC_quoted "$arg"
-      done
-      CC_expanded=`func_echo_all $CC`
-      CC_quoted_expanded=`func_echo_all $CC_quoted`
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	      # Double-quote args containing other shell metacharacters.
-	      func_append_quoted CC_quoted "$arg"
-	    done
-	    CC_expanded=`func_echo_all $CC`
-	    CC_quoted_expanded=`func_echo_all $CC_quoted`
-	    case "$@ " in
-	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
-	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with \`--tag'"
-#	else
-#	  func_verbose "using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-
-
-
-# func_write_libtool_object output_name pic_name nonpic_name
-# Create a libtool object file (analogous to a ".la" file),
-# but don't create it if we're doing a dry run.
-func_write_libtool_object ()
-{
-    write_libobj=${1}
-    if test "$build_libtool_libs" = yes; then
-      write_lobj=\'${2}\'
-    else
-      write_lobj=none
-    fi
-
-    if test "$build_old_libs" = yes; then
-      write_oldobj=\'${3}\'
-    else
-      write_oldobj=none
-    fi
-
-    $opt_dry_run || {
-      cat >${write_libobj}T <<EOF
-# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-pic_object=$write_lobj
-
-# Name of the non-PIC object
-non_pic_object=$write_oldobj
-
-EOF
-      $MV "${write_libobj}T" "${write_libobj}"
-    }
-}
-
-
-##################################################
-# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
-##################################################
-
-# func_convert_core_file_wine_to_w32 ARG
-# Helper function used by file name conversion functions when $build is *nix,
-# and $host is mingw, cygwin, or some other w32 environment. Relies on a
-# correctly configured wine environment available, with the winepath program
-# in $build's $PATH.
-#
-# ARG is the $build file name to be converted to w32 format.
-# Result is available in $func_convert_core_file_wine_to_w32_result, and will
-# be empty on error (or when ARG is empty)
-func_convert_core_file_wine_to_w32 ()
-{
-  $opt_debug
-  func_convert_core_file_wine_to_w32_result="$1"
-  if test -n "$1"; then
-    # Unfortunately, winepath does not exit with a non-zero error code, so we
-    # are forced to check the contents of stdout. On the other hand, if the
-    # command is not found, the shell will set an exit code of 127 and print
-    # *an error message* to stdout. So we must check for both error code of
-    # zero AND non-empty stdout, which explains the odd construction:
-    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
-    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
-      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
-        $SED -e "$lt_sed_naive_backslashify"`
-    else
-      func_convert_core_file_wine_to_w32_result=
-    fi
-  fi
-}
-# end: func_convert_core_file_wine_to_w32
-
-
-# func_convert_core_path_wine_to_w32 ARG
-# Helper function used by path conversion functions when $build is *nix, and
-# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
-# configured wine environment available, with the winepath program in $build's
-# $PATH. Assumes ARG has no leading or trailing path separator characters.
-#
-# ARG is path to be converted from $build format to win32.
-# Result is available in $func_convert_core_path_wine_to_w32_result.
-# Unconvertible file (directory) names in ARG are skipped; if no directory names
-# are convertible, then the result may be empty.
-func_convert_core_path_wine_to_w32 ()
-{
-  $opt_debug
-  # unfortunately, winepath doesn't convert paths, only file names
-  func_convert_core_path_wine_to_w32_result=""
-  if test -n "$1"; then
-    oldIFS=$IFS
-    IFS=:
-    for func_convert_core_path_wine_to_w32_f in $1; do
-      IFS=$oldIFS
-      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
-      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
-        if test -z "$func_convert_core_path_wine_to_w32_result"; then
-          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
-        else
-          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
-        fi
-      fi
-    done
-    IFS=$oldIFS
-  fi
-}
-# end: func_convert_core_path_wine_to_w32
-
-
-# func_cygpath ARGS...
-# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
-# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
-# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
-# (2), returns the Cygwin file name or path in func_cygpath_result (input
-# file name or path is assumed to be in w32 format, as previously converted
-# from $build's *nix or MSYS format). In case (3), returns the w32 file name
-# or path in func_cygpath_result (input file name or path is assumed to be in
-# Cygwin format). Returns an empty string on error.
-#
-# ARGS are passed to cygpath, with the last one being the file name or path to
-# be converted.
-#
-# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
-# environment variable; do not put it in $PATH.
-func_cygpath ()
-{
-  $opt_debug
-  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
-    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
-    if test "$?" -ne 0; then
-      # on failure, ensure result is empty
-      func_cygpath_result=
-    fi
-  else
-    func_cygpath_result=
-    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
-  fi
-}
-#end: func_cygpath
-
-
-# func_convert_core_msys_to_w32 ARG
-# Convert file name or path ARG from MSYS format to w32 format.  Return
-# result in func_convert_core_msys_to_w32_result.
-func_convert_core_msys_to_w32 ()
-{
-  $opt_debug
-  # awkward: cmd appends spaces to result
-  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
-    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
-}
-#end: func_convert_core_msys_to_w32
-
-
-# func_convert_file_check ARG1 ARG2
-# Verify that ARG1 (a file name in $build format) was converted to $host
-# format in ARG2. Otherwise, emit an error message, but continue (resetting
-# func_to_host_file_result to ARG1).
-func_convert_file_check ()
-{
-  $opt_debug
-  if test -z "$2" && test -n "$1" ; then
-    func_error "Could not determine host file name corresponding to"
-    func_error "  \`$1'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback:
-    func_to_host_file_result="$1"
-  fi
-}
-# end func_convert_file_check
-
-
-# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
-# Verify that FROM_PATH (a path in $build format) was converted to $host
-# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
-# func_to_host_file_result to a simplistic fallback value (see below).
-func_convert_path_check ()
-{
-  $opt_debug
-  if test -z "$4" && test -n "$3"; then
-    func_error "Could not determine the host path corresponding to"
-    func_error "  \`$3'"
-    func_error "Continuing, but uninstalled executables may not work."
-    # Fallback.  This is a deliberately simplistic "conversion" and
-    # should not be "improved".  See libtool.info.
-    if test "x$1" != "x$2"; then
-      lt_replace_pathsep_chars="s|$1|$2|g"
-      func_to_host_path_result=`echo "$3" |
-        $SED -e "$lt_replace_pathsep_chars"`
-    else
-      func_to_host_path_result="$3"
-    fi
-  fi
-}
-# end func_convert_path_check
-
-
-# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
-# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
-# and appending REPL if ORIG matches BACKPAT.
-func_convert_path_front_back_pathsep ()
-{
-  $opt_debug
-  case $4 in
-  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
-    ;;
-  esac
-  case $4 in
-  $2 ) func_append func_to_host_path_result "$3"
-    ;;
-  esac
-}
-# end func_convert_path_front_back_pathsep
-
-
-##################################################
-# $build to $host FILE NAME CONVERSION FUNCTIONS #
-##################################################
-# invoked via `$to_host_file_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# Result will be available in $func_to_host_file_result.
-
-
-# func_to_host_file ARG
-# Converts the file name ARG from $build format to $host format. Return result
-# in func_to_host_file_result.
-func_to_host_file ()
-{
-  $opt_debug
-  $to_host_file_cmd "$1"
-}
-# end func_to_host_file
-
-
-# func_to_tool_file ARG LAZY
-# converts the file name ARG from $build format to toolchain format. Return
-# result in func_to_tool_file_result.  If the conversion in use is listed
-# in (the comma separated) LAZY, no conversion takes place.
-func_to_tool_file ()
-{
-  $opt_debug
-  case ,$2, in
-    *,"$to_tool_file_cmd",*)
-      func_to_tool_file_result=$1
-      ;;
-    *)
-      $to_tool_file_cmd "$1"
-      func_to_tool_file_result=$func_to_host_file_result
-      ;;
-  esac
-}
-# end func_to_tool_file
-
-
-# func_convert_file_noop ARG
-# Copy ARG to func_to_host_file_result.
-func_convert_file_noop ()
-{
-  func_to_host_file_result="$1"
-}
-# end func_convert_file_noop
-
-
-# func_convert_file_msys_to_w32 ARG
-# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_file_result.
-func_convert_file_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_w32
-
-
-# func_convert_file_cygwin_to_w32 ARG
-# Convert file name ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_file_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
-    # LT_CYGPATH in this case.
-    func_to_host_file_result=`cygpath -m "$1"`
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_cygwin_to_w32
-
-
-# func_convert_file_nix_to_w32 ARG
-# Convert file name ARG from *nix to w32 format.  Requires a wine environment
-# and a working winepath. Returns result in func_to_host_file_result.
-func_convert_file_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_file_wine_to_w32 "$1"
-    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_w32
-
-
-# func_convert_file_msys_to_cygwin ARG
-# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_file_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_msys_to_cygwin
-
-
-# func_convert_file_nix_to_cygwin ARG
-# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
-# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
-# in func_to_host_file_result.
-func_convert_file_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_file_result="$1"
-  if test -n "$1"; then
-    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
-    func_convert_core_file_wine_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
-    func_to_host_file_result="$func_cygpath_result"
-  fi
-  func_convert_file_check "$1" "$func_to_host_file_result"
-}
-# end func_convert_file_nix_to_cygwin
-
-
-#############################################
-# $build to $host PATH CONVERSION FUNCTIONS #
-#############################################
-# invoked via `$to_host_path_cmd ARG'
-#
-# In each case, ARG is the path to be converted from $build to $host format.
-# The result will be available in $func_to_host_path_result.
-#
-# Path separators are also converted from $build format to $host format.  If
-# ARG begins or ends with a path separator character, it is preserved (but
-# converted to $host format) on output.
-#
-# All path conversion functions are named using the following convention:
-#   file name conversion function    : func_convert_file_X_to_Y ()
-#   path conversion function         : func_convert_path_X_to_Y ()
-# where, for any given $build/$host combination the 'X_to_Y' value is the
-# same.  If conversion functions are added for new $build/$host combinations,
-# the two new functions must follow this pattern, or func_init_to_host_path_cmd
-# will break.
-
-
-# func_init_to_host_path_cmd
-# Ensures that function "pointer" variable $to_host_path_cmd is set to the
-# appropriate value, based on the value of $to_host_file_cmd.
-to_host_path_cmd=
-func_init_to_host_path_cmd ()
-{
-  $opt_debug
-  if test -z "$to_host_path_cmd"; then
-    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
-    to_host_path_cmd="func_convert_path_${func_stripname_result}"
-  fi
-}
-
-
-# func_to_host_path ARG
-# Converts the path ARG from $build format to $host format. Return result
-# in func_to_host_path_result.
-func_to_host_path ()
-{
-  $opt_debug
-  func_init_to_host_path_cmd
-  $to_host_path_cmd "$1"
-}
-# end func_to_host_path
-
-
-# func_convert_path_noop ARG
-# Copy ARG to func_to_host_path_result.
-func_convert_path_noop ()
-{
-  func_to_host_path_result="$1"
-}
-# end func_convert_path_noop
-
-
-# func_convert_path_msys_to_w32 ARG
-# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
-# conversion to w32 is not available inside the cwrapper.  Returns result in
-# func_to_host_path_result.
-func_convert_path_msys_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from ARG.  MSYS
-    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
-    # and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_msys_to_w32
-
-
-# func_convert_path_cygwin_to_w32 ARG
-# Convert path ARG from Cygwin to w32 format.  Returns result in
-# func_to_host_file_result.
-func_convert_path_cygwin_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_cygwin_to_w32
-
-
-# func_convert_path_nix_to_w32 ARG
-# Convert path ARG from *nix to w32 format.  Requires a wine environment and
-# a working winepath.  Returns result in func_to_host_file_result.
-func_convert_path_nix_to_w32 ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
-    func_convert_path_check : ";" \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
-  fi
-}
-# end func_convert_path_nix_to_w32
-
-
-# func_convert_path_msys_to_cygwin ARG
-# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
-# Returns result in func_to_host_file_result.
-func_convert_path_msys_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # See func_convert_path_msys_to_w32:
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_msys_to_cygwin
-
-
-# func_convert_path_nix_to_cygwin ARG
-# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
-# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
-# func_to_host_file_result.
-func_convert_path_nix_to_cygwin ()
-{
-  $opt_debug
-  func_to_host_path_result="$1"
-  if test -n "$1"; then
-    # Remove leading and trailing path separator characters from
-    # ARG. msys behavior is inconsistent here, cygpath turns them
-    # into '.;' and ';.', and winepath ignores them completely.
-    func_stripname : : "$1"
-    func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
-    func_to_host_path_result="$func_cygpath_result"
-    func_convert_path_check : : \
-      "$func_to_host_path_tmp1" "$func_to_host_path_result"
-    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
-  fi
-}
-# end func_convert_path_nix_to_cygwin
-
-
-# func_mode_compile arg...
-func_mode_compile ()
-{
-    $opt_debug
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-    pie_flag=
-
-    for arg
-    do
-      case $arg_mode in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  test -n "$libobj" && \
-	    func_fatal_error "you cannot specify \`-o' more than once"
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-pie | -fpie | -fPIE)
-          func_append pie_flag " $arg"
-	  continue
-	  ;;
-
-	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  func_append later " $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  func_stripname '-Wc,' '' "$arg"
-	  args=$func_stripname_result
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-	    func_append_quoted lastarg "$arg"
-	  done
-	  IFS="$save_ifs"
-	  func_stripname ' ' '' "$lastarg"
-	  lastarg=$func_stripname_result
-
-	  # Add the arguments to base_compile.
-	  func_append base_compile " $lastarg"
-	  continue
-	  ;;
-
-	*)
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      func_append_quoted base_compile "$lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      func_fatal_error "you must specify an argument for -Xcompile"
-      ;;
-    target)
-      func_fatal_error "you must specify a target with \`-o'"
-      ;;
-    *)
-      # Get the name of the library object.
-      test -z "$libobj" && {
-	func_basename "$srcfile"
-	libobj="$func_basename_result"
-      }
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    case $libobj in
-    *.[cCFSifmso] | \
-    *.ada | *.adb | *.ads | *.asm | \
-    *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
-      func_xform "$libobj"
-      libobj=$func_xform_result
-      ;;
-    esac
-
-    case $libobj in
-    *.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
-    *)
-      func_fatal_error "cannot determine name of library object from \`$libobj'"
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	continue
-	;;
-
-      -static)
-	build_libtool_libs=no
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    func_quote_for_eval "$libobj"
-    test "X$libobj" != "X$func_quote_for_eval_result" \
-      && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"'	 &()|`$[]' \
-      && func_warning "libobj name \`$libobj' may not contain shell special characters."
-    func_dirname_and_basename "$obj" "/" ""
-    objname="$func_basename_result"
-    xdir="$func_dirname_result"
-    lobj=${xdir}$objdir/$objname
-
-    test -z "$base_compile" && \
-      func_fatal_help "you must specify a compilation command"
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2* | cegcc*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$ECHO "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-      func_append removelist " $output_obj"
-      $ECHO "$srcfile" > "$lockfile"
-    fi
-
-    $opt_dry_run || $RM $removelist
-    func_append removelist " $lockfile"
-    trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
-
-    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
-    srcfile=$func_to_tool_file_result
-    func_quote_for_eval "$srcfile"
-    qsrcfile=$func_quote_for_eval_result
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $qsrcfile"
-      fi
-
-      func_mkdir_p "$xdir$objdir"
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	func_append command " -o $lobj"
-      fi
-
-      func_show_eval_locale "$command"	\
-          'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	func_show_eval '$MV "$output_obj" "$lobj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-	suppress_output=' >/dev/null 2>&1'
-      fi
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $qsrcfile$pie_flag"
-      else
-	command="$base_compile $qsrcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	func_append command " -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      func_append command "$suppress_output"
-      func_show_eval_locale "$command" \
-        '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$ECHO "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$opt_dry_run || $RM $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	func_show_eval '$MV "$output_obj" "$obj"' \
-	  'error=$?; $opt_dry_run || $RM $removelist; exit $error'
-      fi
-    fi
-
-    $opt_dry_run || {
-      func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
-
-      # Unlock the critical section if it was locked
-      if test "$need_locks" != no; then
-	removelist=$lockfile
-        $RM "$lockfile"
-      fi
-    }
-
-    exit $EXIT_SUCCESS
-}
-
-$opt_help || {
-  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
-}
-
-func_mode_help ()
-{
-    # We need to display help for each of the modes.
-    case $opt_mode in
-      "")
-        # Generic help is extracted from the usage comments
-        # at the start of this file.
-        func_help
-        ;;
-
-      clean)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      compile)
-      $ECHO \
-"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to build PIC objects only
-  -prefer-non-pic   try to build non-PIC objects only
-  -shared           do not build a \`.o' file suitable for static linking
-  -static           only build a \`.o' file suitable for static linking
-  -Wc,FLAG          pass FLAG directly to the compiler
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-        ;;
-
-      execute)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-        ;;
-
-      finish)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-        ;;
-
-      install)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The following components of INSTALL-COMMAND are treated specially:
-
-  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-        ;;
-
-      link)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -bindir BINDIR    specify path to binaries directory (for systems where
-                    libraries must be found in the PATH setting at runtime)
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-                    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-                    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -shared           only do dynamic linking of libtool libraries
-  -shrext SUFFIX    override the standard shared library file extension
-  -static           do not do any dynamic linking of uninstalled libtool libraries
-  -static-libtool-libs
-                    do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-                    specify library version info [each variable defaults to 0]
-  -weak LIBNAME     declare that the target provides the LIBNAME interface
-  -Wc,FLAG
-  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
-  -Wl,FLAG
-  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
-  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-        ;;
-
-      uninstall)
-        $ECHO \
-"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-        ;;
-
-      *)
-        func_fatal_help "invalid operation mode \`$opt_mode'"
-        ;;
-    esac
-
-    echo
-    $ECHO "Try \`$progname --help' for more information about other modes."
-}
-
-# Now that we've collected a possible --mode arg, show help if necessary
-if $opt_help; then
-  if test "$opt_help" = :; then
-    func_mode_help
-  else
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	func_mode_help
-      done
-    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
-    {
-      func_help noexit
-      for opt_mode in compile link execute install finish uninstall clean; do
-	echo
-	func_mode_help
-      done
-    } |
-    sed '1d
-      /^When reporting/,/^Report/{
-	H
-	d
-      }
-      $x
-      /information about other modes/d
-      /more detailed .*MODE/d
-      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
-  fi
-  exit $?
-fi
-
-
-# func_mode_execute arg...
-func_mode_execute ()
-{
-    $opt_debug
-    # The first argument is the command name.
-    cmd="$nonopt"
-    test -z "$cmd" && \
-      func_fatal_help "you must specify a COMMAND"
-
-    # Handle -dlopen flags immediately.
-    for file in $opt_dlopen; do
-      test -f "$file" \
-	|| func_fatal_help "\`$file' is not a file"
-
-      dir=
-      case $file in
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$lib' is not a valid libtool archive"
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-	func_source "$file"
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && \
-	    func_warning "\`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  func_append dir "/$objdir"
-	else
-	  if test ! -f "$dir/$dlname"; then
-	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	func_dirname "$file" "" "."
-	dir="$func_dirname_result"
-	;;
-
-      *)
-	func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -* | *.la | *.lo ) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if func_ltwrapper_script_p "$file"; then
-	  func_source "$file"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	elif func_ltwrapper_executable_p "$file"; then
-	  func_ltwrapper_scriptname "$file"
-	  func_source "$func_ltwrapper_scriptname_result"
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      func_append_quoted args "$file"
-    done
-
-    if test "X$opt_dry_run" = Xfalse; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
-      do
-	eval "if test \"\${save_$lt_var+set}\" = set; then
-                $lt_var=\$save_$lt_var; export $lt_var
-	      else
-		$lt_unset $lt_var
-	      fi"
-      done
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	echo "export $shlibpath_var"
-      fi
-      $ECHO "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
-
-
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libs=
-    libdirs=
-    admincmds=
-
-    for opt in "$nonopt" ${1+"$@"}
-    do
-      if test -d "$opt"; then
-	func_append libdirs " $opt"
-
-      elif test -f "$opt"; then
-	if func_lalib_unsafe_p "$opt"; then
-	  func_append libs " $opt"
-	else
-	  func_warning "\`$opt' is not a valid libtool archive"
-	fi
-
-      else
-	func_fatal_error "invalid argument \`$opt'"
-      fi
-    done
-
-    if test -n "$libs"; then
-      if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
-        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
-      else
-        sysroot_cmd=
-      fi
-
-      # Remove sysroot references
-      if $opt_dry_run; then
-        for lib in $libs; do
-          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
-        done
-      else
-        tmpdir=`func_mktempdir`
-        for lib in $libs; do
-	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
-	    > $tmpdir/tmp-la
-	  mv -f $tmpdir/tmp-la $lib
-	done
-        ${RM}r "$tmpdir"
-      fi
-    fi
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  func_execute_cmds "$finish_cmds" 'admincmds="$admincmds
-'"$cmd"'"'
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || func_append admincmds "
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    $opt_silent && exit $EXIT_SUCCESS
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      echo "----------------------------------------------------------------------"
-      echo "Libraries have been installed in:"
-      for libdir in $libdirs; do
-	$ECHO "   $libdir"
-      done
-      echo
-      echo "If you ever happen to want to link against installed libraries"
-      echo "in a given directory, LIBDIR, you must either use libtool, and"
-      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-      echo "flag during linking and do at least one of the following:"
-      if test -n "$shlibpath_var"; then
-	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-	echo "     during execution"
-      fi
-      if test -n "$runpath_var"; then
-	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-	echo "     during linking"
-      fi
-      if test -n "$hardcode_libdir_flag_spec"; then
-	libdir=LIBDIR
-	eval flag=\"$hardcode_libdir_flag_spec\"
-
-	$ECHO "   - use the \`$flag' linker flag"
-      fi
-      if test -n "$admincmds"; then
-	$ECHO "   - have your system administrator run these commands:$admincmds"
-      fi
-      if test -f /etc/ld.so.conf; then
-	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-      fi
-      echo
-
-      echo "See any operating system documentation about shared libraries for"
-      case $host in
-	solaris2.[6789]|solaris2.1[0-9])
-	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	  echo "pages."
-	  ;;
-	*)
-	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
-	  ;;
-      esac
-      echo "----------------------------------------------------------------------"
-    fi
-    exit $EXIT_SUCCESS
-}
-
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
-
-
-# func_mode_install arg...
-func_mode_install ()
-{
-    $opt_debug
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       case $nonopt in *shtool*) :;; *) false;; esac; then
-      # Aesthetically quote it.
-      func_quote_for_eval "$nonopt"
-      install_prog="$func_quote_for_eval_result "
-      arg=$1
-      shift
-    else
-      install_prog=
-      arg=$nonopt
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    func_quote_for_eval "$arg"
-    func_append install_prog "$func_quote_for_eval_result"
-    install_shared_prog=$install_prog
-    case " $install_prog " in
-      *[\\\ /]cp\ *) install_cp=: ;;
-      *) install_cp=false ;;
-    esac
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    no_mode=:
-    for arg
-    do
-      arg2=
-      if test -n "$dest"; then
-	func_append files " $dest"
-	dest=$arg
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f)
-	if $install_cp; then :; else
-	  prev=$arg
-	fi
-	;;
-      -g | -m | -o)
-	prev=$arg
-	;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*)
-	;;
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
-	    arg2=$install_override_mode
-	    no_mode=false
-	  fi
-	  prev=
-	else
-	  dest=$arg
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      func_quote_for_eval "$arg"
-      func_append install_prog " $func_quote_for_eval_result"
-      if test -n "$arg2"; then
-	func_quote_for_eval "$arg2"
-      fi
-      func_append install_shared_prog " $func_quote_for_eval_result"
-    done
-
-    test -z "$install_prog" && \
-      func_fatal_help "you must specify an install program"
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prev' option requires an argument"
-
-    if test -n "$install_override_mode" && $no_mode; then
-      if $install_cp; then :; else
-	func_quote_for_eval "$install_override_mode"
-	func_append install_shared_prog " -m $func_quote_for_eval_result"
-      fi
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	func_fatal_help "no file or destination specified"
-      else
-	func_fatal_help "you must specify a destination"
-      fi
-    fi
-
-    # Strip any trailing slash from the destination.
-    func_stripname '' '/' "$dest"
-    dest=$func_stripname_result
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      func_dirname_and_basename "$dest" "" "."
-      destdir="$func_dirname_result"
-      destname="$func_basename_result"
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files; shift
-      test "$#" -gt 1 && \
-	func_fatal_help "\`$dest' is not a directory"
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  func_fatal_help "\`$destdir' must be an absolute directory name"
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	func_append staticlibs " $file"
-	;;
-
-      *.la)
-	func_resolve_sysroot "$file"
-	file=$func_resolve_sysroot_result
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$file" \
-	  || func_fatal_help "\`$file' is not a valid libtool archive"
-
-	library_names=
-	old_library=
-	relink_command=
-	func_source "$file"
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append current_libdirs " $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) func_append future_libdirs " $libdir" ;;
-	  esac
-	fi
-
-	func_dirname "$file" "/" ""
-	dir="$func_dirname_result"
-	func_append dir "$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  test "$inst_prefix_dir" = "$destdir" && \
-	    func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  func_warning "relinking \`$file'"
-	  func_show_eval "$relink_command" \
-	    'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names; shift
-	if test -n "$1"; then
-	  realname="$1"
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
-	      'exit $?'
-	  tstripme="$stripme"
-	  case $host_os in
-	  cygwin* | mingw* | pw32* | cegcc*)
-	    case $realname in
-	    *.dll.a)
-	      tstripme=""
-	      ;;
-	    esac
-	    ;;
-	  esac
-	  if test -n "$tstripme" && test -n "$striplib"; then
-	    func_show_eval "$striplib $destdir/$realname" 'exit $?'
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    # Try `ln -sf' first, because the `ln' binary might depend on
-	    # the symlink we replace!  Solaris /bin/ln does not understand -f,
-	    # so we also need to try rm && ln -s.
-	    for linkname
-	    do
-	      test "$linkname" != "$realname" \
-		&& func_show_eval "(cd $destdir && { $LN_S -f $realname $linkname || { $RM $linkname && $LN_S $realname $linkname; }; })"
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  func_execute_cmds "$postinstall_cmds" 'exit $?'
-	fi
-
-	# Install the pseudo-library for information purposes.
-	func_basename "$file"
-	name="$func_basename_result"
-	instname="$dir/$name"i
-	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  func_lo2o "$destfile"
-	  staticdest=$func_lo2o_result
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  func_fatal_help "cannot copy a libtool object to \`$destfile'"
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	test -n "$destfile" && \
-	  func_show_eval "$install_prog $file $destfile" 'exit $?'
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  func_lo2o "$file"
-	  staticobj=$func_lo2o_result
-	  func_show_eval "$install_prog \$staticobj \$staticdest" 'exit $?'
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  func_basename "$file"
-	  destfile="$func_basename_result"
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      func_stripname '' '.exe' "$file"
-	      file=$func_stripname_result
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin* | *mingw*)
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      wrapper=$func_ltwrapper_scriptname_result
-	    else
-	      func_stripname '' '.exe' "$file"
-	      wrapper=$func_stripname_result
-	    fi
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if func_ltwrapper_script_p "$wrapper"; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  func_source "$wrapper"
-
-	  # Check the variables that should have been set.
-	  test -z "$generated_by_libtool_version" && \
-	    func_fatal_error "invalid libtool wrapper script \`$wrapper'"
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      func_source "$lib"
-	    fi
-	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      func_warning "\`$lib' has not been installed in \`$libdir'"
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  func_source "$wrapper"
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    $opt_dry_run || {
-	      if test "$finalize" = yes; then
-	        tmpdir=`func_mktempdir`
-		func_basename "$file$stripped_ext"
-		file="$func_basename_result"
-	        outputname="$tmpdir/$file"
-	        # Replace the output file specification.
-	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
-
-	        $opt_silent || {
-	          func_quote_for_expand "$relink_command"
-		  eval "func_echo $func_quote_for_expand_result"
-	        }
-	        if eval "$relink_command"; then :
-	          else
-		  func_error "error: relink \`$file' with the above command before installing it"
-		  $opt_dry_run || ${RM}r "$tmpdir"
-		  continue
-	        fi
-	        file="$outputname"
-	      else
-	        func_warning "cannot relink \`$file'"
-	      fi
-	    }
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyway
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    func_stripname '' '.exe' "$destfile"
-	    destfile=$func_stripname_result
-	    ;;
-	  esac
-	  ;;
-	esac
-	func_show_eval "$install_prog\$stripme \$file \$destfile" 'exit $?'
-	$opt_dry_run || if test -n "$outputname"; then
-	  ${RM}r "$tmpdir"
-	fi
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      func_basename "$file"
-      name="$func_basename_result"
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-      tool_oldlib=$func_to_tool_file_result
-
-      func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
-      fi
-
-      # Do each command in the postinstall commands.
-      func_execute_cmds "$old_postinstall_cmds" 'exit $?'
-    done
-
-    test -n "$future_libdirs" && \
-      func_warning "remember to run \`$progname --finish$future_libdirs'"
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      $opt_dry_run && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-}
-
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
-
-
-# func_generate_dlsyms outputname originator pic_p
-# Extract symbols from dlprefiles and create ${outputname}S.o with
-# a dlpreopen symbol table.
-func_generate_dlsyms ()
-{
-    $opt_debug
-    my_outputname="$1"
-    my_originator="$2"
-    my_pic_p="${3-no}"
-    my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
-    my_dlsyms=
-
-    if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-      if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	my_dlsyms="${my_outputname}S.c"
-      else
-	func_error "not configured to extract global symbols from dlpreopened files"
-      fi
-    fi
-
-    if test -n "$my_dlsyms"; then
-      case $my_dlsyms in
-      "") ;;
-      *.c)
-	# Discover the nlist of each of the dlfiles.
-	nlist="$output_objdir/${my_outputname}.nm"
-
-	func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
-
-	# Parse the name list into a source file.
-	func_verbose "creating $output_objdir/$my_dlsyms"
-
-	$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
-#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
-#endif
-
-/* 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_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_DLSYM_CONST const
-#endif
-
-/* External symbol declarations for the compiler. */\
-"
-
-	if test "$dlself" = yes; then
-	  func_verbose "generating symbol list for \`$output'"
-
-	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
-
-	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	  for progfile in $progfiles; do
-	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
-	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
-	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -n "$exclude_expsyms"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  if test -n "$export_symbols_regex"; then
-	    $opt_dry_run || {
-	      eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	    }
-	  fi
-
-	  # Prepare the list of exported symbols
-	  if test -z "$export_symbols"; then
-	    export_symbols="$output_objdir/$outputname.exp"
-	    $opt_dry_run || {
-	      $RM $export_symbols
-	      eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	      case $host in
-	      *cygwin* | *mingw* | *cegcc* )
-                eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-                eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
-	        ;;
-	      esac
-	    }
-	  else
-	    $opt_dry_run || {
-	      eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
-	      eval '$MV "$nlist"T "$nlist"'
-	      case $host in
-	        *cygwin* | *mingw* | *cegcc* )
-	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
-	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
-	          ;;
-	      esac
-	    }
-	  fi
-	fi
-
-	for dlprefile in $dlprefiles; do
-	  func_verbose "extracting global C symbols from \`$dlprefile'"
-	  func_basename "$dlprefile"
-	  name="$func_basename_result"
-          case $host in
-	    *cygwin* | *mingw* | *cegcc* )
-	      # if an import library, we need to obtain dlname
-	      if func_win32_import_lib_p "$dlprefile"; then
-	        func_tr_sh "$dlprefile"
-	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
-	        dlprefile_dlbasename=""
-	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
-	          # Use subshell, to avoid clobbering current variable values
-	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
-	          if test -n "$dlprefile_dlname" ; then
-	            func_basename "$dlprefile_dlname"
-	            dlprefile_dlbasename="$func_basename_result"
-	          else
-	            # no lafile. user explicitly requested -dlpreopen <import library>.
-	            $sharedlib_from_linklib_cmd "$dlprefile"
-	            dlprefile_dlbasename=$sharedlib_from_linklib_result
-	          fi
-	        fi
-	        $opt_dry_run || {
-	          if test -n "$dlprefile_dlbasename" ; then
-	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
-	          else
-	            func_warning "Could not compute DLL name from $name"
-	            eval '$ECHO ": $name " >> "$nlist"'
-	          fi
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
-	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
-	        }
-	      else # not an import lib
-	        $opt_dry_run || {
-	          eval '$ECHO ": $name " >> "$nlist"'
-	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	        }
-	      fi
-	    ;;
-	    *)
-	      $opt_dry_run || {
-	        eval '$ECHO ": $name " >> "$nlist"'
-	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
-	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	      }
-	    ;;
-          esac
-	done
-
-	$opt_dry_run || {
-	  # Make sure we have at least an empty file.
-	  test -f "$nlist" || : > "$nlist"
-
-	  if test -n "$exclude_expsyms"; then
-	    $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	    $MV "$nlist"T "$nlist"
-	  fi
-
-	  # Try sorting and uniquifying the output.
-	  if $GREP -v "^: " < "$nlist" |
-	      if sort -k 3 </dev/null >/dev/null 2>&1; then
-		sort -k 3
-	      else
-		sort +2
-	      fi |
-	      uniq > "$nlist"S; then
-	    :
-	  else
-	    $GREP -v "^: " < "$nlist" > "$nlist"S
-	  fi
-
-	  if test -f "$nlist"S; then
-	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
-	  else
-	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
-	  fi
-
-	  echo >> "$output_objdir/$my_dlsyms" "\
-
-/* The mapping between symbol names and symbols.  */
-typedef struct {
-  const char *name;
-  void *address;
-} lt_dlsymlist;
-extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
-LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
-  { \"$my_originator\", (void *) 0 },"
-
-	  case $need_lib_prefix in
-	  no)
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  *)
-	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
-	    ;;
-	  esac
-	  echo >> "$output_objdir/$my_dlsyms" "\
-  {0, (void *) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_${my_prefix}_LTX_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	} # !$opt_dry_run
-
-	pic_flag_for_symtable=
-	case "$compile_command " in
-	*" -static "*) ;;
-	*)
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
-	  *-*-hpux*)
-	    pic_flag_for_symtable=" $pic_flag"  ;;
-	  *)
-	    if test "X$my_pic_p" != Xno; then
-	      pic_flag_for_symtable=" $pic_flag"
-	    fi
-	    ;;
-	  esac
-	  ;;
-	esac
-	symtab_cflags=
-	for arg in $LTCFLAGS; do
-	  case $arg in
-	  -pie | -fpie | -fPIE) ;;
-	  *) func_append symtab_cflags " $arg" ;;
-	  esac
-	done
-
-	# Now compile the dynamic symbol file.
-	func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
-
-	# Clean up the generated files.
-	func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
-
-	# Transform the symbol file into the correct name.
-	symfileobj="$output_objdir/${my_outputname}S.$objext"
-	case $host in
-	*cygwin* | *mingw* | *cegcc* )
-	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	  else
-	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  fi
-	  ;;
-	*)
-	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
-	  ;;
-	esac
-	;;
-      *)
-	func_fatal_error "unknown suffix for \`$my_dlsyms'"
-	;;
-      esac
-    else
-      # We keep going just in case the user didn't refer to
-      # lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-      # really was required.
-
-      # Nullify the symbol file.
-      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
-    fi
-}
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-# Despite the name, also deal with 64 bit binaries.
-func_win32_libid ()
-{
-  $opt_debug
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
-      func_to_tool_file "$1" func_convert_file_msys_to_w32
-      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
-	$SED -n -e '
-	    1,100{
-		/ I /{
-		    s,.*,import,
-		    p
-		    q
-		}
-	    }'`
-      case $win32_nmres in
-      import*)  win32_libid_type="x86 archive import";;
-      *)        win32_libid_type="x86 archive static";;
-      esac
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $ECHO "$win32_libid_type"
-}
-
-# func_cygming_dll_for_implib ARG
-#
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib ()
-{
-  $opt_debug
-  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
-}
-
-# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
-#
-# The is the core of a fallback implementation of a
-# platform-specific function to extract the name of the
-# DLL associated with the specified import library LIBNAME.
-#
-# SECTION_NAME is either .idata$6 or .idata$7, depending
-# on the platform and compiler that created the implib.
-#
-# Echos the name of the DLL associated with the
-# specified import library.
-func_cygming_dll_for_implib_fallback_core ()
-{
-  $opt_debug
-  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
-  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
-    $SED '/^Contents of section '"$match_literal"':/{
-      # Place marker at beginning of archive member dllname section
-      s/.*/====MARK====/
-      p
-      d
-    }
-    # These lines can sometimes be longer than 43 characters, but
-    # are always uninteresting
-    /:[	 ]*file format pe[i]\{,1\}-/d
-    /^In archive [^:]*:/d
-    # Ensure marker is printed
-    /^====MARK====/p
-    # Remove all lines with less than 43 characters
-    /^.\{43\}/!d
-    # From remaining lines, remove first 43 characters
-    s/^.\{43\}//' |
-    $SED -n '
-      # Join marker and all lines until next marker into a single line
-      /^====MARK====/ b para
-      H
-      $ b para
-      b
-      :para
-      x
-      s/\n//g
-      # Remove the marker
-      s/^====MARK====//
-      # Remove trailing dots and whitespace
-      s/[\. \t]*$//
-      # Print
-      /./p' |
-    # we now have a list, one entry per line, of the stringified
-    # contents of the appropriate section of all members of the
-    # archive which possess that section. Heuristic: eliminate
-    # all those which have a first or second character that is
-    # a '.' (that is, objdump's representation of an unprintable
-    # character.) This should work for all archives with less than
-    # 0x302f exports -- but will fail for DLLs whose name actually
-    # begins with a literal '.' or a single character followed by
-    # a '.'.
-    #
-    # Of those that remain, print the first one.
-    $SED -e '/^\./d;/^.\./d;q'
-}
-
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
-  test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
-  $opt_debug
-  func_to_tool_file "$1" func_convert_file_msys_to_w32
-  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
-  test -n "$func_cygming_ms_implib_tmp"
-}
-
-# func_cygming_dll_for_implib_fallback ARG
-# Platform-specific function to extract the
-# name of the DLL associated with the specified
-# import library ARG.
-#
-# This fallback implementation is for use when $DLLTOOL
-# does not support the --identify-strict option.
-# Invoked by eval'ing the libtool variable
-#    $sharedlib_from_linklib_cmd
-# Result is available in the variable
-#    $sharedlib_from_linklib_result
-func_cygming_dll_for_implib_fallback ()
-{
-  $opt_debug
-  if func_cygming_gnu_implib_p "$1" ; then
-    # binutils import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
-  elif func_cygming_ms_implib_p "$1" ; then
-    # ms-generated import library
-    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
-  else
-    # unknown
-    sharedlib_from_linklib_result=""
-  fi
-}
-
-
-# func_extract_an_archive dir oldlib
-func_extract_an_archive ()
-{
-    $opt_debug
-    f_ex_an_ar_dir="$1"; shift
-    f_ex_an_ar_oldlib="$1"
-    if test "$lock_old_archive_extraction" = yes; then
-      lockfile=$f_ex_an_ar_oldlib.lock
-      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
-	func_echo "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    fi
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
-		   'stat=$?; rm -f "$lockfile"; exit $stat'
-    if test "$lock_old_archive_extraction" = yes; then
-      $opt_dry_run || rm -f "$lockfile"
-    fi
-    if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
-     :
-    else
-      func_fatal_error "object name conflicts in archive: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib"
-    fi
-}
-
-
-# func_extract_archives gentop oldlib ...
-func_extract_archives ()
-{
-    $opt_debug
-    my_gentop="$1"; shift
-    my_oldlibs=${1+"$@"}
-    my_oldobjs=""
-    my_xlib=""
-    my_xabs=""
-    my_xdir=""
-
-    for my_xlib in $my_oldlibs; do
-      # Extract the objects.
-      case $my_xlib in
-	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-	*) my_xabs=`pwd`"/$my_xlib" ;;
-      esac
-      func_basename "$my_xlib"
-      my_xlib="$func_basename_result"
-      my_xlib_u=$my_xlib
-      while :; do
-        case " $extracted_archives " in
-	*" $my_xlib_u "*)
-	  func_arith $extracted_serial + 1
-	  extracted_serial=$func_arith_result
-	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
-	*) break ;;
-	esac
-      done
-      extracted_archives="$extracted_archives $my_xlib_u"
-      my_xdir="$my_gentop/$my_xlib_u"
-
-      func_mkdir_p "$my_xdir"
-
-      case $host in
-      *-darwin*)
-	func_verbose "Extracting $my_xabs"
-	# Do not bother doing anything if just a dry run
-	$opt_dry_run || {
-	  darwin_orig_dir=`pwd`
-	  cd $my_xdir || exit $?
-	  darwin_archive=$my_xabs
-	  darwin_curdir=`pwd`
-	  darwin_base_archive=`basename "$darwin_archive"`
-	  darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
-	  if test -n "$darwin_arches"; then
-	    darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
-	    darwin_arch=
-	    func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
-	    for darwin_arch in  $darwin_arches ; do
-	      func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-	      func_extract_an_archive "`pwd`" "${darwin_base_archive}"
-	      cd "$darwin_curdir"
-	      $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
-	    done # $darwin_arches
-            ## Okay now we've a bunch of thin objects, gotta fatten them up :)
-	    darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
-	    darwin_file=
-	    darwin_files=
-	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
-	      $LIPO -create -output "$darwin_file" $darwin_files
-	    done # $darwin_filelist
-	    $RM -rf unfat-$$
-	    cd "$darwin_orig_dir"
-	  else
-	    cd $darwin_orig_dir
-	    func_extract_an_archive "$my_xdir" "$my_xabs"
-	  fi # $darwin_arches
-	} # !$opt_dry_run
-	;;
-      *)
-        func_extract_an_archive "$my_xdir" "$my_xabs"
-	;;
-      esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
-    done
-
-    func_extract_archives_result="$my_oldobjs"
-}
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=${1-no}
-
-	$ECHO "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='$sed_quote_subst'
-
-# Be Bourne compatible
-if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
-fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# 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
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variables:
-  generated_by_libtool_version='$macro_version'
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$ECHO are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    file=\"\$0\""
-
-    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
-    $ECHO "\
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
-  eval 'cat <<_LTECHO_EOF
-\$1
-_LTECHO_EOF'
-}
-    ECHO=\"$qECHO\"
-  fi
-
-# Very basic option parsing. These options are (a) specific to
-# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
-# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
-# this pattern).
-#
-# There are only two supported options: --lt-debug and
-# --lt-dump-script. There is, deliberately, no --lt-help.
-#
-# The first argument to this parsing function should be the
-# script's $0 value, followed by "$@".
-lt_option_debug=
-func_parse_lt_options ()
-{
-  lt_script_arg0=\$0
-  shift
-  for lt_opt
-  do
-    case \"\$lt_opt\" in
-    --lt-debug) lt_option_debug=1 ;;
-    --lt-dump-script)
-        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
-        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
-        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
-        cat \"\$lt_dump_D/\$lt_dump_F\"
-        exit 0
-      ;;
-    --lt-*)
-        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
-        exit 1
-      ;;
-    esac
-  done
-
-  # Print the debug banner immediately:
-  if test -n \"\$lt_option_debug\"; then
-    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
-  fi
-}
-
-# Used when --lt-debug. Prints its arguments to stdout
-# (redirection is the responsibility of the caller)
-func_lt_dump_args ()
-{
-  lt_dump_args_N=1;
-  for lt_arg
-  do
-    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
-    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
-  done
-}
-
-# Core function for launching the target application
-func_exec_program_core ()
-{
-"
-  case $host in
-  # Backslashes separate directories on plain windows
-  *-*-mingw | *-*-os2* | *-cegcc*)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-    ;;
-
-  *)
-    $ECHO "\
-      if test -n \"\$lt_option_debug\"; then
-        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
-        func_lt_dump_args \${1+\"\$@\"} 1>&2
-      fi
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-    ;;
-  esac
-  $ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
-}
-
-# A function to encapsulate launching the target application
-# Strips options in the --lt-* namespace from \$@ and
-# launches target application with the remaining arguments.
-func_exec_program ()
-{
-  case \" \$* \" in
-  *\\ --lt-*)
-    for lt_wr_arg
-    do
-      case \$lt_wr_arg in
-      --lt-*) ;;
-      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
-      esac
-      shift
-    done ;;
-  esac
-  func_exec_program_core \${1+\"\$@\"}
-}
-
-  # Parse options
-  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
-  done
-
-  # Usually 'no', except on cygwin/mingw when embedded into
-  # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
-  if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
-    # special case for '.'
-    if test \"\$thisdir\" = \".\"; then
-      thisdir=\`pwd\`
-    fi
-    # remove .libs from thisdir
-    case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
-    $objdir )   thisdir=. ;;
-    esac
-  fi
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $ECHO "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" ||
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $MKDIR \"\$progdir\"
-    else
-      $RM \"\$progdir/\$file\"
-    fi"
-
-	  $ECHO "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$ECHO \"\$relink_command_output\" >&2
-	$RM \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $MV \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $RM \"\$progdir/\$program\";
-      $MV \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $RM \"\$progdir/\$file\"
-  fi"
-	else
-	  $ECHO "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$ECHO "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# fixup the dll searchpath if we need to.
-	#
-	# Fix the DLL searchpath if we need to.  Do this before prepending
-	# to shlibpath, because on Windows, both are PATH and uninstalled
-	# libraries must come first.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $ECHO "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	$ECHO "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-      func_exec_program \${1+\"\$@\"}
-    fi
-  else
-    # The program doesn't exist.
-    \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
-    \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-}
-
-
-# func_emit_cwrapperexe_src
-# emit the source code for a wrapper executable on stdout
-# Must ONLY be called from within func_mode_link because
-# it depends on a number of variable set therein.
-func_emit_cwrapperexe_src ()
-{
-	cat <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-*/
-EOF
-	    cat <<"EOF"
-#ifdef _MSC_VER
-# define _CRT_SECURE_NO_DEPRECATE 1
-#endif
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef _MSC_VER
-# include <direct.h>
-# include <process.h>
-# include <io.h>
-#else
-# include <unistd.h>
-# include <stdint.h>
-# ifdef __CYGWIN__
-#  include <io.h>
-# endif
-#endif
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-#include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-
-/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
-# ifdef __STRICT_ANSI__
-int _putenv (const char *);
-# endif
-#elif defined(__CYGWIN__)
-# ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-# endif
-/* #elif defined (other platforms) ... */
-#endif
-
-/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-#  define _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#elif defined(__MINGW32__)
-# define setmode _setmode
-# define stat    _stat
-# define chmod   _chmod
-# define getcwd  _getcwd
-# define putenv  _putenv
-#elif defined(__CYGWIN__)
-# define HAVE_SETENV
-# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
-#endif
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef S_IXOTH
-# define S_IXOTH 0
-#endif
-#ifndef S_IXGRP
-# define S_IXGRP 0
-#endif
-
-/* path handling portability macros */
-#ifndef DIR_SEPARATOR
-# define DIR_SEPARATOR '/'
-# define PATH_SEPARATOR ':'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-# define HAVE_DOS_BASED_FILE_SYSTEM
-# define FOPEN_WB "wb"
-# ifndef DIR_SEPARATOR_2
-#  define DIR_SEPARATOR_2 '\\'
-# endif
-# ifndef PATH_SEPARATOR_2
-#  define PATH_SEPARATOR_2 ';'
-# endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-	(((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#ifndef PATH_SEPARATOR_2
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
-#else /* PATH_SEPARATOR_2 */
-# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
-#endif /* PATH_SEPARATOR_2 */
-
-#ifndef FOPEN_WB
-# define FOPEN_WB "w"
-#endif
-#ifndef _O_BINARY
-# define _O_BINARY 0
-#endif
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-#if defined(LT_DEBUGWRAPPER)
-static int lt_debug = 1;
-#else
-static int lt_debug = 0;
-#endif
-
-const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
-
-void *xmalloc (size_t num);
-char *xstrdup (const char *string);
-const char *base_name (const char *name);
-char *find_executable (const char *wrapper);
-char *chase_symlinks (const char *pathspec);
-int make_executable (const char *path);
-int check_executable (const char *path);
-char *strendzap (char *str, const char *pat);
-void lt_debugprintf (const char *file, int line, const char *fmt, ...);
-void lt_fatal (const char *file, int line, const char *message, ...);
-static const char *nonnull (const char *s);
-static const char *nonempty (const char *s);
-void lt_setenv (const char *name, const char *value);
-char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_update_exe_path (const char *name, const char *value);
-void lt_update_lib_path (const char *name, const char *value);
-char **prepare_spawn (char **argv);
-void lt_dump_script (FILE *f);
-EOF
-
-	    cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
-const char * LIB_PATH_VARNAME = "$shlibpath_var";
-EOF
-
-	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_path "$temp_rpath"
-	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * LIB_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test -n "$dllsearchpath"; then
-              func_to_host_path "$dllsearchpath:"
-	      cat <<EOF
-const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
-EOF
-	    else
-	      cat <<"EOF"
-const char * EXE_PATH_VARNAME = "";
-const char * EXE_PATH_VALUE   = "";
-EOF
-	    fi
-
-	    if test "$fast_install" = yes; then
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
-EOF
-	    else
-	      cat <<EOF
-const char * TARGET_PROGRAM_NAME = "$outputname"; /* hopefully, no .exe */
-EOF
-	    fi
-
-
-	    cat <<"EOF"
-
-#define LTWRAPPER_OPTION_PREFIX         "--lt-"
-
-static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int  newargc;
-  char *tmp_pathspec;
-  char *actual_cwrapper_path;
-  char *actual_cwrapper_name;
-  char *target_name;
-  char *lt_argv_zero;
-  intptr_t rval = 127;
-
-  int i;
-
-  program_name = (char *) xstrdup (base_name (argv[0]));
-  newargz = XMALLOC (char *, argc + 1);
-
-  /* very simple arg parsing; don't want to rely on getopt
-   * also, copy all non cwrapper options to newargz, except
-   * argz[0], which is handled differently
-   */
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strcmp (argv[i], dumpscript_opt) == 0)
-	{
-EOF
-	    case "$host" in
-	      *mingw* | *cygwin* )
-		# make stdout use "unix" line endings
-		echo "          setmode(1,_O_BINARY);"
-		;;
-	      esac
-
-	    cat <<"EOF"
-	  lt_dump_script (stdout);
-	  return 0;
-	}
-      if (strcmp (argv[i], debug_opt) == 0)
-	{
-          lt_debug = 1;
-          continue;
-	}
-      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal (__FILE__, __LINE__,
-		    "unrecognized %s option: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-EOF
-	    cat <<EOF
-  /* The GNU banner must be the first non-error debug message */
-  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
-EOF
-	    cat <<"EOF"
-  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
-
-  tmp_pathspec = find_executable (argv[0]);
-  if (tmp_pathspec == NULL)
-    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (before symlink chase) at: %s\n",
-		  tmp_pathspec);
-
-  actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  lt_debugprintf (__FILE__, __LINE__,
-                  "(main) found exe (after symlink chase) at: %s\n",
-		  actual_cwrapper_path);
-  XFREE (tmp_pathspec);
-
-  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
-  strendzap (actual_cwrapper_path, actual_cwrapper_name);
-
-  /* wrapper name transforms */
-  strendzap (actual_cwrapper_name, ".exe");
-  tmp_pathspec = lt_extend_str (actual_cwrapper_name, ".exe", 1);
-  XFREE (actual_cwrapper_name);
-  actual_cwrapper_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  /* target_name transforms -- use actual target program name; might have lt- prefix */
-  target_name = xstrdup (base_name (TARGET_PROGRAM_NAME));
-  strendzap (target_name, ".exe");
-  tmp_pathspec = lt_extend_str (target_name, ".exe", 1);
-  XFREE (target_name);
-  target_name = tmp_pathspec;
-  tmp_pathspec = 0;
-
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(main) libtool target name: %s\n",
-		  target_name);
-EOF
-
-	    cat <<EOF
-  newargz[0] =
-    XMALLOC (char, (strlen (actual_cwrapper_path) +
-		    strlen ("$objdir") + 1 + strlen (actual_cwrapper_name) + 1));
-  strcpy (newargz[0], actual_cwrapper_path);
-  strcat (newargz[0], "$objdir");
-  strcat (newargz[0], "/");
-EOF
-
-	    cat <<"EOF"
-  /* stop here, and copy so we don't have to do this twice */
-  tmp_pathspec = xstrdup (newargz[0]);
-
-  /* do NOT want the lt- prefix here, so use actual_cwrapper_name */
-  strcat (newargz[0], actual_cwrapper_name);
-
-  /* DO want the lt- prefix here if it exists, so use target_name */
-  lt_argv_zero = lt_extend_str (tmp_pathspec, target_name, 1);
-  XFREE (tmp_pathspec);
-  tmp_pathspec = NULL;
-EOF
-
-	    case $host_os in
-	      mingw*)
-	    cat <<"EOF"
-  {
-    char* p;
-    while ((p = strchr (newargz[0], '\\')) != NULL)
-      {
-	*p = '/';
-      }
-    while ((p = strchr (lt_argv_zero, '\\')) != NULL)
-      {
-	*p = '/';
-      }
-  }
-EOF
-	    ;;
-	    esac
-
-	    cat <<"EOF"
-  XFREE (target_name);
-  XFREE (actual_cwrapper_path);
-  XFREE (actual_cwrapper_name);
-
-  lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
-  lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
-     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
-     because on Windows, both *_VARNAMEs are PATH but uninstalled
-     libraries must come first. */
-  lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
-
-  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
-		  nonnull (lt_argv_zero));
-  for (i = 0; i < newargc; i++)
-    {
-      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
-		      i, nonnull (newargz[i]));
-    }
-
-EOF
-
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-  /* execv doesn't actually work on mingw as expected on unix */
-  newargz = prepare_spawn (newargz);
-  rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
-  if (rval == -1)
-    {
-      /* failed to start process */
-      lt_debugprintf (__FILE__, __LINE__,
-		      "(main) failed to launch target \"%s\": %s\n",
-		      lt_argv_zero, nonnull (strerror (errno)));
-      return 127;
-    }
-  return rval;
-EOF
-		;;
-	      *)
-		cat <<"EOF"
-  execv (lt_argv_zero, newargz);
-  return rval; /* =127, but avoids unused variable warning */
-EOF
-		;;
-	    esac
-
-	    cat <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void *p = (void *) malloc (num);
-  if (!p)
-    lt_fatal (__FILE__, __LINE__, "memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1),
-			  string) : NULL;
-}
-
-const char *
-base_name (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha ((unsigned char) name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return base;
-}
-
-int
-check_executable (const char *path)
-{
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if ((stat (path, &st) >= 0)
-      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
-    return 1;
-  else
-    return 0;
-}
-
-int
-make_executable (const char *path)
-{
-  int rval = 0;
-  struct stat st;
-
-  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
-                  nonempty (path));
-  if ((!path) || (!*path))
-    return 0;
-
-  if (stat (path, &st) >= 0)
-    {
-      rval = chmod (path, st.st_mode | S_IXOTH | S_IXGRP | S_IXUSR);
-    }
-  return rval;
-}
-
-/* Searches for the full path of the wrapper.  Returns
-   newly allocated full path name if found, NULL otherwise
-   Does not chase symlinks, even on platforms that support them.
-*/
-char *
-find_executable (const char *wrapper)
-{
-  int has_slash = 0;
-  const char *p;
-  const char *p_next;
-  /* static buffer for getcwd */
-  char tmp[LT_PATHMAX + 1];
-  int tmp_len;
-  char *concat_name;
-
-  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
-                  nonempty (wrapper));
-
-  if ((wrapper == NULL) || (*wrapper == '\0'))
-    return NULL;
-
-  /* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
-    {
-      concat_name = xstrdup (wrapper);
-      if (check_executable (concat_name))
-	return concat_name;
-      XFREE (concat_name);
-    }
-  else
-    {
-#endif
-      if (IS_DIR_SEPARATOR (wrapper[0]))
-	{
-	  concat_name = xstrdup (wrapper);
-	  if (check_executable (concat_name))
-	    return concat_name;
-	  XFREE (concat_name);
-	}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-    }
-#endif
-
-  for (p = wrapper; *p; p++)
-    if (*p == '/')
-      {
-	has_slash = 1;
-	break;
-      }
-  if (!has_slash)
-    {
-      /* no slashes; search PATH */
-      const char *path = getenv ("PATH");
-      if (path != NULL)
-	{
-	  for (p = path; *p; p = p_next)
-	    {
-	      const char *q;
-	      size_t p_len;
-	      for (q = p; *q; q++)
-		if (IS_PATH_SEPARATOR (*q))
-		  break;
-	      p_len = q - p;
-	      p_next = (*q == '\0' ? q : q + 1);
-	      if (p_len == 0)
-		{
-		  /* empty path: current directory */
-		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-                              nonnull (strerror (errno)));
-		  tmp_len = strlen (tmp);
-		  concat_name =
-		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, tmp, tmp_len);
-		  concat_name[tmp_len] = '/';
-		  strcpy (concat_name + tmp_len + 1, wrapper);
-		}
-	      else
-		{
-		  concat_name =
-		    XMALLOC (char, p_len + 1 + strlen (wrapper) + 1);
-		  memcpy (concat_name, p, p_len);
-		  concat_name[p_len] = '/';
-		  strcpy (concat_name + p_len + 1, wrapper);
-		}
-	      if (check_executable (concat_name))
-		return concat_name;
-	      XFREE (concat_name);
-	    }
-	}
-      /* not found in PATH; assume curdir */
-    }
-  /* Relative path | not found in path: prepend cwd */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
-              nonnull (strerror (errno)));
-  tmp_len = strlen (tmp);
-  concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
-  memcpy (concat_name, tmp, tmp_len);
-  concat_name[tmp_len] = '/';
-  strcpy (concat_name + tmp_len + 1, wrapper);
-
-  if (check_executable (concat_name))
-    return concat_name;
-  XFREE (concat_name);
-  return NULL;
-}
-
-char *
-chase_symlinks (const char *pathspec)
-{
-#ifndef S_ISLNK
-  return xstrdup (pathspec);
-#else
-  char buf[LT_PATHMAX];
-  struct stat s;
-  char *tmp_pathspec = xstrdup (pathspec);
-  char *p;
-  int has_symlinks = 0;
-  while (strlen (tmp_pathspec) && !has_symlinks)
-    {
-      lt_debugprintf (__FILE__, __LINE__,
-		      "checking path component for symlinks: %s\n",
-		      tmp_pathspec);
-      if (lstat (tmp_pathspec, &s) == 0)
-	{
-	  if (S_ISLNK (s.st_mode) != 0)
-	    {
-	      has_symlinks = 1;
-	      break;
-	    }
-
-	  /* search backwards for last DIR_SEPARATOR */
-	  p = tmp_pathspec + strlen (tmp_pathspec) - 1;
-	  while ((p > tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    p--;
-	  if ((p == tmp_pathspec) && (!IS_DIR_SEPARATOR (*p)))
-	    {
-	      /* no more DIR_SEPARATORS left */
-	      break;
-	    }
-	  *p = '\0';
-	}
-      else
-	{
-	  lt_fatal (__FILE__, __LINE__,
-		    "error accessing file \"%s\": %s",
-		    tmp_pathspec, nonnull (strerror (errno)));
-	}
-    }
-  XFREE (tmp_pathspec);
-
-  if (!has_symlinks)
-    {
-      return xstrdup (pathspec);
-    }
-
-  tmp_pathspec = realpath (pathspec, buf);
-  if (tmp_pathspec == 0)
-    {
-      lt_fatal (__FILE__, __LINE__,
-		"could not follow symlinks for %s", pathspec);
-    }
-  return xstrdup (tmp_pathspec);
-#endif
-}
-
-char *
-strendzap (char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert (str != NULL);
-  assert (pat != NULL);
-
-  len = strlen (str);
-  patlen = strlen (pat);
-
-  if (patlen <= len)
-    {
-      str += len - patlen;
-      if (strcmp (str, pat) == 0)
-	*str = '\0';
-    }
-  return str;
-}
-
-void
-lt_debugprintf (const char *file, int line, const char *fmt, ...)
-{
-  va_list args;
-  if (lt_debug)
-    {
-      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
-      va_start (args, fmt);
-      (void) vfprintf (stderr, fmt, args);
-      va_end (args);
-    }
-}
-
-static void
-lt_error_core (int exit_status, const char *file,
-	       int line, const char *mode,
-	       const char *message, va_list ap)
-{
-  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *file, int line, const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
-  va_end (ap);
-}
-
-static const char *
-nonnull (const char *s)
-{
-  return s ? s : "(null)";
-}
-
-static const char *
-nonempty (const char *s)
-{
-  return (s && !*s) ? "(empty)" : nonnull (s);
-}
-
-void
-lt_setenv (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_setenv) setting '%s' to '%s'\n",
-                  nonnull (name), nonnull (value));
-  {
-#ifdef HAVE_SETENV
-    /* always make a copy, for consistency with !HAVE_SETENV */
-    char *str = xstrdup (value);
-    setenv (name, str, 1);
-#else
-    int len = strlen (name) + 1 + strlen (value) + 1;
-    char *str = XMALLOC (char, len);
-    sprintf (str, "%s=%s", name, value);
-    if (putenv (str) != EXIT_SUCCESS)
-      {
-        XFREE (str);
-      }
-#endif
-  }
-}
-
-char *
-lt_extend_str (const char *orig_value, const char *add, int to_end)
-{
-  char *new_value;
-  if (orig_value && *orig_value)
-    {
-      int orig_value_len = strlen (orig_value);
-      int add_len = strlen (add);
-      new_value = XMALLOC (char, add_len + orig_value_len + 1);
-      if (to_end)
-        {
-          strcpy (new_value, orig_value);
-          strcpy (new_value + orig_value_len, add);
-        }
-      else
-        {
-          strcpy (new_value, add);
-          strcpy (new_value + add_len, orig_value);
-        }
-    }
-  else
-    {
-      new_value = xstrdup (add);
-    }
-  return new_value;
-}
-
-void
-lt_update_exe_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      /* some systems can't cope with a ':'-terminated path #' */
-      int len = strlen (new_value);
-      while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
-        {
-          new_value[len-1] = '\0';
-        }
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-void
-lt_update_lib_path (const char *name, const char *value)
-{
-  lt_debugprintf (__FILE__, __LINE__,
-		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                  nonnull (name), nonnull (value));
-
-  if (name && *name && value && *value)
-    {
-      char *new_value = lt_extend_str (getenv (name), value, 0);
-      lt_setenv (name, new_value);
-      XFREE (new_value);
-    }
-}
-
-EOF
-	    case $host_os in
-	      mingw*)
-		cat <<"EOF"
-
-/* Prepares an argument vector before calling spawn().
-   Note that spawn() does not by itself call the command interpreter
-     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
-      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-         GetVersionEx(&v);
-         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
-      }) ? "cmd.exe" : "command.com").
-   Instead it simply concatenates the arguments, separated by ' ', and calls
-   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
-   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
-   special way:
-   - Space and tab are interpreted as delimiters. They are not treated as
-     delimiters if they are surrounded by double quotes: "...".
-   - Unescaped double quotes are removed from the input. Their only effect is
-     that within double quotes, space and tab are treated like normal
-     characters.
-   - Backslashes not followed by double quotes are not special.
-   - But 2*n+1 backslashes followed by a double quote become
-     n backslashes followed by a double quote (n >= 0):
-       \" -> "
-       \\\" -> \"
-       \\\\\" -> \\"
- */
-#define SHELL_SPECIAL_CHARS "\"\\ \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"
-#define SHELL_SPACE_CHARS " \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"
-char **
-prepare_spawn (char **argv)
-{
-  size_t argc;
-  char **new_argv;
-  size_t i;
-
-  /* Count number of arguments.  */
-  for (argc = 0; argv[argc] != NULL; argc++)
-    ;
-
-  /* Allocate new argument vector.  */
-  new_argv = XMALLOC (char *, argc + 1);
-
-  /* Put quoted arguments into the new argument vector.  */
-  for (i = 0; i < argc; i++)
-    {
-      const char *string = argv[i];
-
-      if (string[0] == '\0')
-	new_argv[i] = xstrdup ("\"\"");
-      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
-	{
-	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
-	  size_t length;
-	  unsigned int backslashes;
-	  const char *s;
-	  char *quoted_string;
-	  char *p;
-
-	  length = 0;
-	  backslashes = 0;
-	  if (quote_around)
-	    length++;
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		length += backslashes + 1;
-	      length++;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    length += backslashes + 1;
-
-	  quoted_string = XMALLOC (char, length + 1);
-
-	  p = quoted_string;
-	  backslashes = 0;
-	  if (quote_around)
-	    *p++ = '"';
-	  for (s = string; *s != '\0'; s++)
-	    {
-	      char c = *s;
-	      if (c == '"')
-		{
-		  unsigned int j;
-		  for (j = backslashes + 1; j > 0; j--)
-		    *p++ = '\\';
-		}
-	      *p++ = c;
-	      if (c == '\\')
-		backslashes++;
-	      else
-		backslashes = 0;
-	    }
-	  if (quote_around)
-	    {
-	      unsigned int j;
-	      for (j = backslashes; j > 0; j--)
-		*p++ = '\\';
-	      *p++ = '"';
-	    }
-	  *p = '\0';
-
-	  new_argv[i] = quoted_string;
-	}
-      else
-	new_argv[i] = (char *) string;
-    }
-  new_argv[argc] = NULL;
-
-  return new_argv;
-}
-EOF
-		;;
-	    esac
-
-            cat <<"EOF"
-void lt_dump_script (FILE* f)
-{
-EOF
-	    func_emit_wrapper yes |
-	      $SED -n -e '
-s/^\(.\{79\}\)\(..*\)/\1\
-\2/
-h
-s/\([\\"]\)/\\\1/g
-s/$/\\n/
-s/\([^\n]*\).*/  fputs ("\1", f);/p
-g
-D'
-            cat <<"EOF"
-}
-EOF
-}
-# end: func_emit_cwrapperexe_src
-
-# func_win32_import_lib_p ARG
-# True if ARG is an import lib, as indicated by $file_magic_cmd
-func_win32_import_lib_p ()
-{
-    $opt_debug
-    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
-    *import*) : ;;
-    *) false ;;
-    esac
-}
-
-# func_mode_link arg...
-func_mode_link ()
-{
-    $opt_debug
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args=$nonopt
-    base_compile="$nonopt $@"
-    compile_command=$nonopt
-    finalize_command=$nonopt
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-    new_inherited_linker_flags=
-
-    avoid_version=no
-    bindir=
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-    weak_libs=
-    single_module="${wl}-single_module"
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -shared)
-	test "$build_libtool_libs" != yes && \
-	  func_fatal_configuration "can not build a shared library"
-	build_old_libs=no
-	break
-	;;
-      -all-static | -static | -static-libtool-libs)
-	case $arg in
-	-all-static)
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    func_warning "complete static linking is impossible in this configuration"
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	-static)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=built
-	  ;;
-	-static-libtool-libs)
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	  prefer_static_libs=yes
-	  ;;
-	esac
-	build_libtool_libs=no
-	build_old_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      func_quote_for_eval "$arg"
-      qarg=$func_quote_for_eval_unquoted_result
-      func_append libtool_args " $func_quote_for_eval_result"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  func_append compile_command " @OUTPUT@"
-	  func_append finalize_command " @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	bindir)
-	  bindir="$arg"
-	  prev=
-	  continue
-	  ;;
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    func_append compile_command " @SYMFILE@"
-	    func_append finalize_command " @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      func_append dlfiles " $arg"
-	    else
-	      func_append dlprefiles " $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  test -f "$arg" \
-	    || func_fatal_error "symbol file \`$arg' does not exist"
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	framework)
-	  case $host in
-	    *-*-darwin*)
-	      case "$deplibs " in
-		*" $qarg.ltframework "*) ;;
-		*) func_append deplibs " $qarg.ltframework" # this is fixed later
-		   ;;
-	      esac
-	      ;;
-	  esac
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat "$save_arg"`
-	    do
-#	      func_append moreargs " $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if func_lalib_unsafe_p "$arg"; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		func_source "$arg"
-
-		if test -z "$pic_object" ||
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none &&
-		   test "$non_pic_object" = none; then
-		  func_fatal_error "cannot find name of object for \`$arg'"
-		fi
-
-		# Extract subdirectory from the argument.
-		func_dirname "$arg" "/" ""
-		xdir="$func_dirname_result"
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      func_append dlfiles " $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    func_append dlprefiles " $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  func_append libobjs " $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  func_append non_pic_objects " $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		else
-		  # If the PIC object exists, use it instead.
-		  # $xdir was prepended to $pic_object above.
-		  non_pic_object="$pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if $opt_dry_run; then
-		  # Extract subdirectory from the argument.
-		  func_dirname "$arg" "/" ""
-		  xdir="$func_dirname_result"
-
-		  func_lo2o "$arg"
-		  pic_object=$xdir$objdir/$func_lo2o_result
-		  non_pic_object=$xdir$func_lo2o_result
-		  func_append libobjs " $pic_object"
-		  func_append non_pic_objects " $non_pic_object"
-	        else
-		  func_fatal_error "\`$arg' is not a valid libtool object"
-		fi
-	      fi
-	    done
-	  else
-	    func_fatal_error "link input file \`$arg' does not exist"
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    func_fatal_error "only absolute run-paths are allowed"
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) func_append rpath " $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) func_append xrpath " $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	shrext)
-	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	weak)
-	  func_append weak_libs " $arg"
-	  prev=
-	  continue
-	  ;;
-	xcclinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xcompiler)
-	  func_append compiler_flags " $qarg"
-	  prev=
-	  func_append compile_command " $qarg"
-	  func_append finalize_command " $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
-	  prev=
-	  func_append compile_command " $wl$qarg"
-	  func_append finalize_command " $wl$qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  # See comment for -static flag below, for more details.
-	  func_append compile_command " $link_static_flag"
-	  func_append finalize_command " $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	func_fatal_error "\`-allow-undefined' must not be used because it is the default"
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -bindir)
-	prev=bindir
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  func_fatal_error "more than one -exported-symbols argument is not allowed"
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -framework)
-	prev=framework
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  func_append compile_command " $arg"
-	  func_append finalize_command " $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	func_stripname "-L" '' "$arg"
-	if test -z "$func_stripname_result"; then
-	  if test "$#" -gt 0; then
-	    func_fatal_error "require no space between \`-L' and \`$1'"
-	  else
-	    func_fatal_error "need path for \`-L' option"
-	  fi
-	fi
-	func_resolve_sysroot "$func_stripname_result"
-	dir=$func_resolve_sysroot_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  test -z "$absdir" && \
-	    func_fatal_error "cannot determine absolute directory name of \`$dir'"
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "* | *" $arg "*)
-	  # Will only happen for absolute or sysroot arguments
-	  ;;
-	*)
-	  # Preserve sysroot, but never include relative directories
-	  case $dir in
-	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
-	    *) func_append deplibs " -L$dir" ;;
-	  esac
-	  func_append lib_search_path " $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  ::) dllsearchpath=$dir;;
-	  *) func_append dllsearchpath ":$dir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    func_append deplibs " System.ltframework"
-	    continue
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	func_append deplibs " $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # Tru64 UNIX uses -model [arg] to determine the layout of C++
-      # classes, name mangling, and exception handling.
-      # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot|--sysroot)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	prev=xcompiler
-	continue
-	;;
-
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	func_append compiler_flags " $arg"
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-	case "$new_inherited_linker_flags " in
-	    *" $arg "*) ;;
-	    * ) func_append new_inherited_linker_flags " $arg" ;;
-	esac
-	continue
-	;;
-
-      -multi_module)
-	single_module="${wl}-multi_module"
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "\`-no-install' is ignored for $host"
-	  func_warning "assuming \`-no-fast-install' instead"
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	func_stripname '-R' '' "$arg"
-	dir=$func_stripname_result
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	=*)
-	  func_stripname '=' '' "$dir"
-	  dir=$lt_sysroot$func_stripname_result
-	  ;;
-	*)
-	  func_fatal_error "only absolute run-paths are allowed"
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) func_append xrpath " $dir" ;;
-	esac
-	continue
-	;;
-
-      -shared)
-	# The effects of -shared are defined in a previous loop.
-	continue
-	;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -static | -static-libtool-libs)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -weak)
-        prev=weak
-	continue
-	;;
-
-      -Wc,*)
-	func_stripname '-Wc,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  func_append arg " $func_quote_for_eval_result"
-	  func_append compiler_flags " $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Wl,*)
-	func_stripname '-Wl,' '' "$arg"
-	args=$func_stripname_result
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-          func_quote_for_eval "$flag"
-	  func_append arg " $wl$func_quote_for_eval_result"
-	  func_append compiler_flags " $wl$func_quote_for_eval_result"
-	  func_append linker_flags " $func_quote_for_eval_result"
-	done
-	IFS="$save_ifs"
-	func_stripname ' ' '' "$arg"
-	arg=$func_stripname_result
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # -msg_* for osf cc
-      -msg_*)
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      # Flags to be passed through unchanged, with rationale:
-      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
-      # -r[0-9][0-9]*        specify processor for the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
-      # +DA*, +DD*           enable 64-bit mode for the HP compiler
-      # -q*                  compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
-      # -F/path              path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
-      # @file                GCC response files
-      # -tp=*                Portland pgcc target processor selection
-      # --sysroot=*          for sysroot support
-      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-        func_append compile_command " $arg"
-        func_append finalize_command " $arg"
-        func_append compiler_flags " $arg"
-        continue
-        ;;
-
-      # Some other compiler flag.
-      -* | +*)
-        func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-
-      *.$objext)
-	# A standard object.
-	func_append objs " $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if func_lalib_unsafe_p "$arg"; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  func_source "$arg"
-
-	  if test -z "$pic_object" ||
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none &&
-	     test "$non_pic_object" = none; then
-	    func_fatal_error "cannot find name of object for \`$arg'"
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  func_dirname "$arg" "/" ""
-	  xdir="$func_dirname_result"
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		func_append dlfiles " $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      func_append dlprefiles " $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    func_append libobjs " $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    func_append non_pic_objects " $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  else
-	    # If the PIC object exists, use it instead.
-	    # $xdir was prepended to $pic_object above.
-	    non_pic_object="$pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if $opt_dry_run; then
-	    # Extract subdirectory from the argument.
-	    func_dirname "$arg" "/" ""
-	    xdir="$func_dirname_result"
-
-	    func_lo2o "$arg"
-	    pic_object=$xdir$objdir/$func_lo2o_result
-	    non_pic_object=$xdir$func_lo2o_result
-	    func_append libobjs " $pic_object"
-	    func_append non_pic_objects " $non_pic_object"
-	  else
-	    func_fatal_error "\`$arg' is not a valid libtool object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	func_append deplibs " $arg"
-	func_append old_deplibs " $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	func_resolve_sysroot "$arg"
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  func_append dlfiles " $func_resolve_sysroot_result"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  func_append dlprefiles " $func_resolve_sysroot_result"
-	  prev=
-	else
-	  func_append deplibs " $func_resolve_sysroot_result"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	func_quote_for_eval "$arg"
-	arg="$func_quote_for_eval_result"
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	func_append compile_command " $arg"
-	func_append finalize_command " $arg"
-      fi
-    done # argument parsing loop
-
-    test -n "$prev" && \
-      func_fatal_help "the \`$prevarg' option requires an argument"
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      func_append compile_command " $arg"
-      func_append finalize_command " $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    func_basename "$output"
-    outputname="$func_basename_result"
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    func_dirname "$output" "/" ""
-    output_objdir="$func_dirname_result$objdir"
-    func_to_tool_file "$output_objdir/"
-    tool_output_objdir=$func_to_tool_file_result
-    # Create the object directory.
-    func_mkdir_p "$output_objdir"
-
-    # Determine the type of output
-    case $output in
-    "")
-      func_fatal_help "you must specify an output file"
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if $opt_preserve_dup_deps ; then
-	case "$libs " in
-	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	esac
-      fi
-      func_append libs " $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if $opt_duplicate_compiler_generated_deps; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
-	  esac
-	  func_append pre_post_deps " $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-
-    case $linkmode in
-    lib)
-	passes="conv dlpreopen link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-
-    for pass in $passes; do
-      # The preopen pass in lib mode reverses $deplibs; put it back here
-      # so that -L comes before libs that need it for instance...
-      if test "$linkmode,$pass" = "lib,link"; then
-	## FIXME: Find the place where the list is rebuilt in the wrong
-	##        order, and fix it there properly
-        tmp_deplibs=
-	for deplib in $deplibs; do
-	  tmp_deplibs="$deplib $tmp_deplibs"
-	done
-	deplibs="$tmp_deplibs"
-      fi
-
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$linkmode,$pass" = "lib,dlpreopen"; then
-	# Collect and forward deplibs of preopened libtool libs
-	for lib in $dlprefiles; do
-	  # Ignore non-libtool-libs
-	  dependency_libs=
-	  func_resolve_sysroot "$lib"
-	  case $lib in
-	  *.la)	func_source "$func_resolve_sysroot_result" ;;
-	  esac
-
-	  # Collect preopened libtool deplibs, except any this library
-	  # has declared as weak libs
-	  for deplib in $dependency_libs; do
-	    func_basename "$deplib"
-            deplib_base=$func_basename_result
-	    case " $weak_libs " in
-	    *" $deplib_base "*) ;;
-	    *) func_append deplibs " $deplib" ;;
-	    esac
-	  done
-	done
-	libs="$dlprefiles"
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
-        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    func_append compiler_flags " $deplib"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    func_warning "\`-l' is ignored for archives/objects"
-	    continue
-	  fi
-	  func_stripname '-l' '' "$deplib"
-	  name=$func_stripname_result
-	  if test "$linkmode" = lib; then
-	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
-	  else
-	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
-	  fi
-	  for searchdir in $searchdirs; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if func_lalib_p "$lib"; then
-		  library_names=
-		  old_library=
-		  func_source "$lib"
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    func_dirname "$lib" "" "."
-		    ladir="$func_dirname_result"
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-		;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	*.ltframework)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	    if test "$linkmode" = lib ; then
-		case "$new_inherited_linker_flags " in
-		    *" $deplib "*) ;;
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
-		esac
-	    fi
-	  fi
-	  continue
-	  ;;
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    func_stripname '-L' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    func_append newlib_search_path " $func_resolve_sysroot_result"
-	    ;;
-	  *)
-	    func_warning "\`-L' is ignored for archives/objects"
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    func_stripname '-R' '' "$deplib"
-	    func_resolve_sysroot "$func_stripname_result"
-	    dir=$func_resolve_sysroot_result
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) func_append xrpath " $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la)
-	  func_resolve_sysroot "$deplib"
-	  lib=$func_resolve_sysroot_result
-	  ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
-	    case " $dlpreconveniencelibs " in
-	    *" $deplib "*) ;;
-	    *)
-	      valid_a_lib=no
-	      case $deplibs_check_method in
-		match_pattern*)
-		  set dummy $deplibs_check_method; shift
-		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
-		    | $EGREP "$match_pattern_regex" > /dev/null; then
-		    valid_a_lib=yes
-		  fi
-		;;
-		pass_all)
-		  valid_a_lib=yes
-		;;
-	      esac
-	      if test "$valid_a_lib" != yes; then
-		echo
-		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because the file extensions .$libext of this argument makes me believe"
-		echo "*** that it is just a static archive that I should not use here."
-	      else
-		echo
-		$ECHO "*** Warning: Linking the shared library $output against the"
-		$ECHO "*** static library $deplib is not portable!"
-		deplibs="$deplib $deplibs"
-	      fi
-	      ;;
-	    esac
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      func_append newdlprefiles " $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      func_append newdlfiles " $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
-	fi
-
-	# Check to see that this really is a libtool archive.
-	func_lalib_unsafe_p "$lib" \
-	  || func_fatal_error "\`$lib' is not a valid libtool archive"
-
-	func_dirname "$lib" "" "."
-	ladir="$func_dirname_result"
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	inherited_linker_flags=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-	avoidtemprpath=
-
-
-	# Read the .la file
-	func_source "$lib"
-
-	# Convert "-framework foo" to "foo.ltframework"
-	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
-	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
-	    case " $new_inherited_linker_flags " in
-	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
-	    esac
-	  done
-	fi
-	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && func_append dlfiles " $dlopen"
-	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      func_fatal_error "cannot find name of link library for \`$lib'"
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    func_append convenience " $ladir/$objdir/$old_library"
-	    func_append old_convenience " $ladir/$objdir/$old_library"
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    func_fatal_error "\`$lib' is not a convenience library"
-	  fi
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    deplibs="$deplib $deplibs"
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	if test -n "$old_library" &&
-	   { test "$prefer_static_libs" = yes ||
-	     test "$prefer_static_libs,$installed" = "built,no"; }; then
-	  linklib=$old_library
-	else
-	  for l in $old_library $library_names; do
-	    linklib="$l"
-	  done
-	fi
-	if test -z "$linklib"; then
-	  func_fatal_error "cannot find name of link library for \`$lib'"
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    func_append dlprefiles " $lib $dependency_libs"
-	  else
-	    func_append newdlfiles " $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    func_warning "cannot determine absolute directory name of \`$ladir'"
-	    func_warning "passing it literally to the linker, although it might fail"
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	func_basename "$lib"
-	laname="$func_basename_result"
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    func_warning "library \`$lib' was moved."
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$lt_sysroot$libdir"
-	    absdir="$lt_sysroot$libdir"
-	  fi
-	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
-	else
-	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  else
-	    dir="$ladir/$objdir"
-	    absdir="$abs_ladir/$objdir"
-	    # Remove this search path later
-	    func_append notinst_path " $abs_ladir"
-	  fi
-	fi # $installed = yes
-	func_stripname 'lib' '.la' "$laname"
-	name=$func_stripname_result
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir" && test "$linkmode" = prog; then
-	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
-	  fi
-	  case "$host" in
-	    # special handling for platforms with PE-DLLs.
-	    *cygwin* | *mingw* | *cegcc* )
-	      # Linker will automatically link against shared library if both
-	      # static and shared are present.  Therefore, ensure we extract
-	      # symbols from the import library if a shared library is present
-	      # (otherwise, the dlopen module name will be incorrect).  We do
-	      # this by putting the import library name into $newdlprefiles.
-	      # We recover the dlopen module name by 'saving' the la file
-	      # name in a special purpose variable, and (later) extracting the
-	      # dlname from the la file.
-	      if test -n "$dlname"; then
-	        func_tr_sh "$dir/$linklib"
-	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
-	        func_append newdlprefiles " $dir/$linklib"
-	      else
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      fi
-	    ;;
-	    * )
-	      # Prefer using a static library (so that no silly _DYNAMIC symbols
-	      # are required to link).
-	      if test -n "$old_library"; then
-	        func_append newdlprefiles " $dir/$old_library"
-	        # Keep a list of preopened convenience libraries to check
-	        # that they are being used correctly in the link pass.
-	        test -z "$libdir" && \
-	          func_append dlpreconveniencelibs " $dir/$old_library"
-	      # Otherwise, use the dlname, so that lt_dlopen finds it.
-	      elif test -n "$dlname"; then
-	        func_append newdlprefiles " $dir/$dlname"
-	      else
-	        func_append newdlprefiles " $dir/$linklib"
-	      fi
-	    ;;
-	  esac
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  func_append newlib_search_path " $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) func_stripname '-L' '' "$deplib"
-	         func_resolve_sysroot "$func_stripname_result"
-	         func_append newlib_search_path " $func_resolve_sysroot_result"
-		 ;;
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { { test "$prefer_static_libs" = no ||
-	         test "$prefer_static_libs,$installed" = "built,yes"; } ||
-	       test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath:" in
-	      *"$absdir:"*) ;;
-	      *) func_append temp_rpath "$absdir:" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	use_static_libs=$prefer_static_libs
-	if test "$use_static_libs" = built && test "$installed" = yes; then
-	  use_static_libs=no
-	fi
-	if test -n "$library_names" &&
-	   { test "$use_static_libs" = no || test -z "$old_library"; }; then
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc*)
-	      # No point in relinking DLLs because paths are not encoded
-	      func_append notinst_deplibs " $lib"
-	      need_relink=no
-	    ;;
-	  *)
-	    if test "$installed" = no; then
-	      func_append notinst_deplibs " $lib"
-	      need_relink=yes
-	    fi
-	    ;;
-	  esac
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on some
-	  # systems (darwin).  Don't bleat about dlopened modules though!
-	  dlopenmodule=""
-	  for dlpremoduletest in $dlprefiles; do
-	    if test "X$dlpremoduletest" = "X$lib"; then
-	      dlopenmodule="$dlpremoduletest"
-	      break
-	    fi
-	  done
-	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    echo
-	    if test "$linkmode" = prog; then
-	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $ECHO "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $ECHO "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) func_append compile_rpath " $absdir" ;;
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append finalize_rpath " $libdir" ;;
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    shift
-	    realname="$1"
-	    shift
-	    libname=`eval "\\$ECHO \"$libname_spec\""`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw* | *cegcc*)
-	        func_arith $current - $age
-		major=$func_arith_result
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    func_basename "$soroot"
-	    soname="$func_basename_result"
-	    func_stripname 'lib' '.dll' "$soname"
-	    newlib=libimp-$func_stripname_result.a
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      func_verbose "extracting exported symbol list from \`$soname'"
-	      func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      func_verbose "generating import library for \`$soname'"
-	      func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
-		  *-*-sysv4*uw2*) add_dir="-L$dir" ;;
-		  *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
-		    *-*-unixware7*) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a (non-dlopened) module then we can not
-		    # link against it, someone is ignoring the earlier warnings
-		    if /usr/bin/file -L $add 2> /dev/null |
-			 $GREP ": [^:]* bundle" >/dev/null ; then
-		      if test "X$dlopenmodule" != "X$lib"; then
-			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
-			if test -z "$old_library" ; then
-			  echo
-			  echo "*** And there doesn't seem to be a static archive available"
-			  echo "*** The link will probably fail, sorry"
-			else
-			  add="$dir/$old_library"
-			fi
-		      elif test -n "$old_library"; then
-			add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes &&
-	         test "$hardcode_direct_absolute" = no; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$absdir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case $libdir in
-		    [\\/]*)
-		      func_append add_dir " -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      func_fatal_configuration "unsupported hardcode properties"
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes &&
-		 test "$hardcode_minus_L" != yes &&
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) func_append finalize_shlibpath "$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes &&
-	       test "$hardcode_direct_absolute" = no; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) func_append finalize_shlibpath "$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-		add="$inst_prefix_dir$libdir/$linklib"
-	      else
-		add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case $libdir in
-		  [\\/]*)
-		    func_append add_dir " -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    echo
-	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    echo "*** I have the capability to make that library automatically link in when"
-	    echo "*** you link to this library.  But I can only do this if you have a"
-	    echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      echo "*** But as you try to build a module library, libtool will still create "
-	      echo "*** a static module, that should work as long as the dlopening application"
-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		echo
-		echo "*** However, this would only work if libtool was able to extract symbol"
-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		echo "*** not find such a program.  So, this module is probably useless."
-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) func_stripname '-R' '' "$libdir"
-	           temp_xrpath=$func_stripname_result
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) func_append xrpath " $temp_xrpath";;
-		   esac;;
-	      *) func_append temp_deplibs " $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  func_append newlib_search_path " $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    case $deplib in
-              -L*) func_stripname '-L' '' "$deplib"
-                   func_resolve_sysroot "$func_stripname_result";;
-              *) func_resolve_sysroot "$deplib" ;;
-            esac
-	    if $opt_preserve_dup_deps ; then
-	      case "$tmp_libs " in
-	      *" $func_resolve_sysroot_result "*)
-                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
-	      esac
-	    fi
-	    func_append tmp_libs " $func_resolve_sysroot_result"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      path=
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-	        func_resolve_sysroot "$deplib"
-	        deplib=$func_resolve_sysroot_result
-	        func_dirname "$deplib" "" "."
-		dir=$func_dirname_result
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    func_warning "cannot determine absolute directory name of \`$dir'"
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if $GREP "^installed=no" $deplib > /dev/null; then
-		case $host in
-		*-*-darwin*)
-		  depdepl=
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$absdir/$objdir/$depdepl" ; then
-		      depdepl="$absdir/$objdir/$depdepl"
-		      darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
-                      if test -z "$darwin_install_name"; then
-                          darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
-                      fi
-		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
-		      path=
-		    fi
-		  fi
-		  ;;
-		*)
-		  path="-L$absdir/$objdir"
-		  ;;
-		esac
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  test -z "$libdir" && \
-		    func_fatal_error "\`$deplib' is not a valid libtool archive"
-		  test "$absdir" != "$libdir" && \
-		    func_warning "\`$deplib' seems to be moved"
-
-		  path="-L$absdir"
-		fi
-		;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      if test "$pass" = link; then
-	if test "$linkmode" = "prog"; then
-	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
-	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
-	else
-	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	fi
-      fi
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) func_append lib_search_path " $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) func_append tmp_libs " $deplib" ;;
-	      esac
-	      ;;
-	    *) func_append tmp_libs " $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  func_append tmp_libs " $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-    fi
-    if test "$linkmode" = prog || test "$linkmode" = lib; then
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for archives"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for archives" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for archives"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for archives"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info/-version-number' is ignored for archives"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for archives"
-
-      test -n "$export_symbols$export_symbols_regex" && \
-	func_warning "\`-export-symbols' is ignored for archives"
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      func_append objs "$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	func_stripname 'lib' '.la' "$outputname"
-	name=$func_stripname_result
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	test "$module" = no && \
-	  func_fatal_help "libtool library \`$output' must begin with \`lib'"
-
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  func_stripname '' '.la' "$outputname"
-	  name=$func_stripname_result
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  func_stripname '' '.la' "$outputname"
-	  libname=$func_stripname_result
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
-	else
-	  echo
-	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
-	  $ECHO "*** objects $objs is not portable!"
-	  func_append libobjs " $objs"
-	fi
-      fi
-
-      test "$dlself" != no && \
-	func_warning "\`-dlopen self' is ignored for libtool libraries"
-
-      set dummy $rpath
-      shift
-      test "$#" -gt 1 && \
-	func_warning "ignoring multiple \`-rpath's for a libtool library"
-
-      install_libdir="$1"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	test -n "$vinfo" && \
-	  func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
-
-	test -n "$release" && \
-	  func_warning "\`-release' is ignored for convenience libraries"
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	shift
-	IFS="$save_ifs"
-
-	test -n "$7" && \
-	  func_fatal_help "too many parameters to \`-version-info'"
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$1"
-	  number_minor="$2"
-	  number_revision="$3"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  # correct linux to gnu/linux during the next big refactor
-	  darwin|linux|osf|windows|none)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|qnx|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    func_arith $number_major + $number_minor
-	    current=$func_arith_result
-	    age="$number_minor"
-	    revision="$number_minor"
-	    lt_irix_increment=no
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$1"
-	  revision="$2"
-	  age="$3"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT \`$current' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION \`$revision' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE \`$age' must be a nonnegative integer"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  func_error "AGE \`$age' is greater than the current interface number \`$current'"
-	  func_fatal_error "\`$vinfo' is not valid version information"
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  func_arith $current + 1
-	  minor_current=$func_arith_result
-	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	irix | nonstopux)
-	  if test "X$lt_irix_increment" = "Xno"; then
-	    func_arith $current - $age
-	  else
-	    func_arith $current - $age + 1
-	  fi
-	  major=$func_arith_result
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    func_arith $revision - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux) # correct to gnu/linux during the next big refactor
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  func_arith $current - $age
-	  major=.$func_arith_result
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    func_arith $current - $loop
-	    iface=$func_arith_result
-	    func_arith $loop - 1
-	    loop=$func_arith_result
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  func_append verstring ":${current}.0"
-	  ;;
-
-	qnx)
-	  major=".$current"
-	  versuffix=".$current"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  func_arith $current - $age
-	  major=$func_arith_result
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  func_fatal_configuration "unknown library version type \`$version_type'"
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    func_warning "undefined symbols not allowed in $host shared libraries"
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-
-      fi
-
-      func_generate_dlsyms "$libname" "$libname" "yes"
-      func_append libobjs " $symfileobj"
-      test "X$libobjs" = "X " && libobjs=
-
-      if test "$opt_mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$ECHO "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext | *.gcno)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-		 if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-		 then
-		   continue
-		 fi
-	       fi
-	       func_append removelist " $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	test -n "$removelist" && \
-	  func_show_eval "${RM}r \$removelist"
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	func_append oldlibs " $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
-      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
-      #done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  func_replace_sysroot "$libdir"
-	  func_append temp_xrpath " -R$func_replace_sysroot_result"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) func_append dlfiles " $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) func_append dlprefiles " $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    func_append deplibs " System.ltframework"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
-	    # Do not include libc due to us having libc/libc_r.
-	    ;;
-	  *-*-sco3.2v5* | *-*-sco5v6*)
-	    # Causes problems with __ctype
-	    ;;
-	  *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
-	    # Compiler inserts libc in the correct place for threads to work
-	    ;;
-	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      func_append deplibs " -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $opt_dry_run || $RM conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $opt_dry_run || $RM conftest
-	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    func_append newdeplibs " $i"
-		    i=""
-		    ;;
-		  esac
-		fi
-		if test -n "$i" ; then
-		  libname=`eval "\\$ECHO \"$libname_spec\""`
-		  deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		  set dummy $deplib_matches; shift
-		  deplib_match=$1
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    func_append newdeplibs " $i"
-		  else
-		    droppeddeps=yes
-		    echo
-		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    echo "*** I have the capability to make that library automatically link in when"
-		    echo "*** you link to this library.  But I can only do this if you have a"
-		    echo "*** shared version of the library, which I believe you do not have"
-		    echo "*** because a test_compile did reveal that the linker did not use it for"
-		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      case $i in
-	      -l*)
-		func_stripname -l '' "$i"
-		name=$func_stripname_result
-		$opt_dry_run || $RM conftest
-		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      func_append newdeplibs " $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval "\\$ECHO \"$libname_spec\""`
-		    deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
-		    set dummy $deplib_matches; shift
-		    deplib_match=$1
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      func_append newdeplibs " $i"
-		    else
-		      droppeddeps=yes
-		      echo
-		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      echo "*** I have the capability to make that library automatically link in when"
-		      echo "*** you link to this library.  But I can only do this if you have a"
-		      echo "*** shared version of the library, which you do not appear to have"
-		      echo "*** because a test_compile did reveal that the linker did not use this one"
-		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  echo
-		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  echo "*** make it link in!  You will probably need to install it or some"
-		  echo "*** library that it depends on before this library will be fully"
-		  echo "*** functional.  Installing it before continuing would be even better."
-		fi
-		;;
-	      *)
-		func_append newdeplibs " $i"
-		;;
-	      esac
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method; shift
-	  file_magic_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		if test -n "$file_magic_glob"; then
-		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
-		else
-		  libnameglob=$libname
-		fi
-		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  if test "$want_nocaseglob" = yes; then
-		    shopt -s nocaseglob
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		    $nocaseglob
-		  else
-		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
-		  fi
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null |
-			 $GREP " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
-			 $SED -e 10q |
-			 $EGREP "$file_magic_regex" > /dev/null; then
-			func_append newdeplibs " $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method; shift
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    case $a_deplib in
-	    -l*)
-	      func_stripname -l '' "$a_deplib"
-	      name=$func_stripname_result
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  func_append newdeplibs " $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval "\\$ECHO \"$libname_spec\""`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
-		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      func_append newdeplibs " $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		echo
-		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		echo "*** I have the capability to make that library automatically link in when"
-		echo "*** you link to this library.  But I can only do this if you have a"
-		echo "*** shared version of the library, which you do not appear to have"
-		echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $ECHO "*** with $libname and none of the candidates passed a file format test"
-		  $ECHO "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	      ;;
-	    *)
-	      # Add a -L argument.
-	      func_append newdeplibs " $a_deplib"
-	      ;;
-	    esac
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
-	    done
-	  fi
-	  case $tmp_deplibs in
-	  *[!\	\ ]*)
-	    echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	    ;;
-	  esac
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    echo
-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    echo "*** a static module, that should work as long as the dlopening"
-	    echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      echo
-	      echo "*** However, this would only work if libtool was able to extract symbol"
-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      echo "*** not find such a program.  So, this module is probably useless."
-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    echo "*** The inter-library dependencies that have been dropped here will be"
-	    echo "*** automatically added whenever a program is linked with this library"
-	    echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      echo
-	      echo "*** Since this library must not contain undefined symbols,"
-	      echo "*** because either the platform does not support them or"
-	      echo "*** it was explicitly requested with -no-undefined,"
-	      echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-      # Time to change all our "foo.ltframework" stuff back to "-framework foo"
-      case $host in
-	*-*-darwin*)
-	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  ;;
-      esac
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      deplibs="$new_libs"
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	# Remove ${wl} instances when linking with ld.
-	# FIXME: should test the right _cmds variable.
-	case $archive_cmds in
-	  *\$LD\ *) wl= ;;
-        esac
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		func_replace_sysroot "$libdir"
-		libdir=$func_replace_sysroot_result
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		func_append dep_rpath " $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) func_append perm_rpath " $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      func_append rpath "$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	shift
-	realname="$1"
-	shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	linknames=
-	for link
-	do
-	  func_append linknames " $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	test "X$libobjs" = "X " && libobjs=
-
-	delfiles=
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
-	  export_symbols="$output_objdir/$libname.uexp"
-	  func_append delfiles " $export_symbols"
-	fi
-
-	orig_export_symbols=
-	case $host_os in
-	cygwin* | mingw* | cegcc*)
-	  if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
-	    # exporting using user supplied symfile
-	    if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
-	      # and it's NOT already a .def file. Must figure out
-	      # which of the given symbols are data symbols and tag
-	      # them as such. So, trigger use of export_symbols_cmds.
-	      # export_symbols gets reassigned inside the "prepare
-	      # the list of exported symbols" if statement, so the
-	      # include_expsyms logic still works.
-	      orig_export_symbols="$export_symbols"
-	      export_symbols=
-	      always_export_symbols=yes
-	    fi
-	  fi
-	  ;;
-	esac
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    func_verbose "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $opt_dry_run || $RM $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd1 in $cmds; do
-	      IFS="$save_ifs"
-	      # Take the normal branch if the nm_file_list_spec branch
-	      # doesn't work or if tool conversion is not needed.
-	      case $nm_file_list_spec~$to_tool_file_cmd in
-		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
-		  try_normal_branch=yes
-		  eval cmd=\"$cmd1\"
-		  func_len " $cmd"
-		  len=$func_len_result
-		  ;;
-		*)
-		  try_normal_branch=no
-		  ;;
-	      esac
-	      if test "$try_normal_branch" = yes \
-		 && { test "$len" -lt "$max_cmd_len" \
-		      || test "$max_cmd_len" -le -1; }
-	      then
-		func_show_eval "$cmd" 'exit $?'
-		skipped_export=false
-	      elif test -n "$nm_file_list_spec"; then
-		func_basename "$output"
-		output_la=$func_basename_result
-		save_libobjs=$libobjs
-		save_output=$output
-		output=${output_objdir}/${output_la}.nm
-		func_to_tool_file "$output"
-		libobjs=$nm_file_list_spec$func_to_tool_file_result
-		func_append delfiles " $output"
-		func_verbose "creating $NM input file list: $output"
-		for obj in $save_libobjs; do
-		  func_to_tool_file "$obj"
-		  $ECHO "$func_to_tool_file_result"
-		done > "$output"
-		eval cmd=\"$cmd1\"
-		func_show_eval "$cmd" 'exit $?'
-		output=$save_output
-		libobjs=$save_libobjs
-		skipped_export=false
-	      else
-		# The command line is too long to execute in one step.
-		func_verbose "using reloadable object file for export list..."
-		skipped_export=:
-		# Break out early, otherwise skipped_export may be
-		# set to false by a later but shorter cmd.
-		break
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  tmp_export_symbols="$export_symbols"
-	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	fi
-
-	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
-	  # The given exports_symbols file has to be filtered, so filter it.
-	  func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	  # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	  # 's' commands which not all seds can handle. GNU sed should be fine
-	  # though. Also, the filter scales superlinearly with the number of
-	  # global variables. join(1) would be nice here, but unfortunately
-	  # isn't a blessed tool.
-	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	  export_symbols=$output_objdir/$libname.def
-	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-	  case " $convenience " in
-	  *" $test_deplib "*) ;;
-	  *)
-	    func_append tmp_deplibs " $test_deplib"
-	    ;;
-	  esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec" &&
-	    test "$compiler_needs_object" = yes &&
-	    test -z "$libobjs"; then
-	    # extract the archives, so we have objects to list.
-	    # TODO: could optimize this to just extract one archive.
-	    whole_archive_flag_spec=
-	  fi
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    func_append generated " $gentop"
-
-	    func_extract_archives $gentop $convenience
-	    func_append libobjs " $func_extract_archives_result"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  func_append linker_flags " $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval test_cmds=\"$archive_expsym_cmds\"
-	    cmds=$archive_expsym_cmds
-	  else
-	    eval test_cmds=\"$archive_cmds\"
-	    cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" &&
-	   func_len " $test_cmds" &&
-	   len=$func_len_result &&
-	   test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise
-	  # or, if using GNU ld and skipped_export is not :, use a linker
-	  # script.
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-	  func_basename "$output"
-	  output_la=$func_basename_result
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  last_robj=
-	  k=1
-
-	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
-	    output=${output_objdir}/${output_la}.lnkscript
-	    func_verbose "creating GNU ld script: $output"
-	    echo 'INPUT (' > $output
-	    for obj in $save_libobjs
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    echo ')' >> $output
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$func_to_tool_file_result
-	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
-	    output=${output_objdir}/${output_la}.lnk
-	    func_verbose "creating linker input file list: $output"
-	    : > $output
-	    set x $save_libobjs
-	    shift
-	    firstobj=
-	    if test "$compiler_needs_object" = yes; then
-	      firstobj="$1 "
-	      shift
-	    fi
-	    for obj
-	    do
-	      func_to_tool_file "$obj"
-	      $ECHO "$func_to_tool_file_result" >> $output
-	    done
-	    func_append delfiles " $output"
-	    func_to_tool_file "$output"
-	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
-	  else
-	    if test -n "$save_libobjs"; then
-	      func_verbose "creating reloadable object files..."
-	      output=$output_objdir/$output_la-${k}.$objext
-	      eval test_cmds=\"$reload_cmds\"
-	      func_len " $test_cmds"
-	      len0=$func_len_result
-	      len=$len0
-
-	      # Loop over the list of objects to be linked.
-	      for obj in $save_libobjs
-	      do
-		func_len " $obj"
-		func_arith $len + $func_len_result
-		len=$func_arith_result
-		if test "X$objlist" = X ||
-		   test "$len" -lt "$max_cmd_len"; then
-		  func_append objlist " $obj"
-		else
-		  # The command $test_cmds is almost too long, add a
-		  # command to the queue.
-		  if test "$k" -eq 1 ; then
-		    # The first file doesn't have a previous command to add.
-		    reload_objs=$objlist
-		    eval concat_cmds=\"$reload_cmds\"
-		  else
-		    # All subsequent reloadable object files will link in
-		    # the last one created.
-		    reload_objs="$objlist $last_robj"
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
-		  fi
-		  last_robj=$output_objdir/$output_la-${k}.$objext
-		  func_arith $k + 1
-		  k=$func_arith_result
-		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=" $obj"
-		  func_len " $last_robj"
-		  func_arith $len0 + $func_len_result
-		  len=$func_arith_result
-		fi
-	      done
-	      # Handle the remaining objects by creating one last
-	      # reloadable object file.  All subsequent reloadable object
-	      # files will link in the last one created.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      reload_objs="$objlist $last_robj"
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
-	      if test -n "$last_robj"; then
-	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
-	      fi
-	      func_append delfiles " $output"
-
-	    else
-	      output=
-	    fi
-
-	    if ${skipped_export-false}; then
-	      func_verbose "generating symbol list for \`$libname.la'"
-	      export_symbols="$output_objdir/$libname.exp"
-	      $opt_dry_run || $RM $export_symbols
-	      libobjs=$output
-	      # Append the command to create the export file.
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\$concat_cmds$export_symbols_cmds\"
-	      if test -n "$last_robj"; then
-		eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
-	      fi
-	    fi
-
-	    test -n "$save_libobjs" &&
-	      func_verbose "creating a temporary reloadable object file: $output"
-
-	    # Loop through the commands generated above and execute them.
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $concat_cmds; do
-	      IFS="$save_ifs"
-	      $opt_silent || {
-		  func_quote_for_expand "$cmd"
-		  eval "func_echo $func_quote_for_expand_result"
-	      }
-	      $opt_dry_run || eval "$cmd" || {
-		lt_exit=$?
-
-		# Restore the uninstalled library and exit
-		if test "$opt_mode" = relink; then
-		  ( cd "$output_objdir" && \
-		    $RM "${realname}T" && \
-		    $MV "${realname}U" "$realname" )
-		fi
-
-		exit $lt_exit
-	      }
-	    done
-	    IFS="$save_ifs"
-
-	    if test -n "$export_symbols_regex" && ${skipped_export-false}; then
-	      func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-
-          if ${skipped_export-false}; then
-	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	      tmp_export_symbols="$export_symbols"
-	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
-	    fi
-
-	    if test -n "$orig_export_symbols"; then
-	      # The given exports_symbols file has to be filtered, so filter it.
-	      func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
-	      # FIXME: $output_objdir/$libname.filter potentially contains lots of
-	      # 's' commands which not all seds can handle. GNU sed should be fine
-	      # though. Also, the filter scales superlinearly with the number of
-	      # global variables. join(1) would be nice here, but unfortunately
-	      # isn't a blessed tool.
-	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
-	      export_symbols=$output_objdir/$libname.def
-	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
-	    fi
-	  fi
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	    test "X$libobjs" = "X " && libobjs=
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	    if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	      cmds=$archive_expsym_cmds
-	    else
-	      cmds=$archive_cmds
-	    fi
-	  fi
-	fi
-
-	if test -n "$delfiles"; then
-	  # Append the command to remove temporary files to $cmds.
-	  eval cmds=\"\$cmds~\$RM $delfiles\"
-	fi
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append libobjs " $func_extract_archives_result"
-	  test "X$libobjs" = "X " && libobjs=
-	fi
-
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $opt_silent || {
-	    func_quote_for_expand "$cmd"
-	    eval "func_echo $func_quote_for_expand_result"
-	  }
-	  $opt_dry_run || eval "$cmd" || {
-	    lt_exit=$?
-
-	    # Restore the uninstalled library and exit
-	    if test "$opt_mode" = relink; then
-	      ( cd "$output_objdir" && \
-	        $RM "${realname}T" && \
-		$MV "${realname}U" "$realname" )
-	    fi
-
-	    exit $lt_exit
-	  }
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$opt_mode" = relink; then
-	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
-
-	  if test -n "$convenience"; then
-	    if test -z "$whole_archive_flag_spec"; then
-	      func_show_eval '${RM}r "$gentop"'
-	    fi
-	  fi
-
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    func_show_eval '(cd "$output_objdir" && $RM "$linkname" && $LN_S "$realname" "$linkname")' 'exit $?'
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	func_warning "\`-dlopen' is ignored for objects"
-      fi
-
-      case " $deplibs" in
-      *\ -l* | *\ -L*)
-	func_warning "\`-l' and \`-L' are ignored for objects" ;;
-      esac
-
-      test -n "$rpath" && \
-	func_warning "\`-rpath' is ignored for objects"
-
-      test -n "$xrpath" && \
-	func_warning "\`-R' is ignored for objects"
-
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for objects"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for objects"
-
-      case $output in
-      *.lo)
-	test -n "$objs$old_deplibs" && \
-	  func_fatal_error "cannot build library object \`$output' from non-libtool objects"
-
-	libobj=$output
-	func_lo2o "$libobj"
-	obj=$func_lo2o_result
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $opt_dry_run || $RM $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec and hope we can get by with
-      # turning comma into space..
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
-	else
-	  gentop="$output_objdir/${obj}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $convenience
-	  reload_conv_objs="$reload_objs $func_extract_archives_result"
-	fi
-      fi
-
-      # If we're not building shared, we need to use non_pic_objs
-      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      func_execute_cmds "$reload_cmds" 'exit $?'
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  func_show_eval '${RM}r "$gentop"'
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	func_execute_cmds "$reload_cmds" 'exit $?'
-      fi
-
-      if test -n "$gentop"; then
-	func_show_eval '${RM}r "$gentop"'
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) func_stripname '' '.exe' "$output"
-	          output=$func_stripname_result.exe;;
-      esac
-      test -n "$vinfo" && \
-	func_warning "\`-version-info' is ignored for programs"
-
-      test -n "$release" && \
-	func_warning "\`-release' is ignored for programs"
-
-      test "$preload" = yes \
-        && test "$dlopen_support" = unknown \
-	&& test "$dlopen_self" = unknown \
-	&& test "$dlopen_self_static" = unknown && \
-	  func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
-	;;
-      esac
-
-      case $host in
-      *-*-darwin*)
-	# Don't allow lazy linking, it breaks C++ global constructors
-	# But is supposedly fixed on 10.4 or later (yay!).
-	if test "$tagname" = CXX ; then
-	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
-	    10.[0123])
-	      func_append compile_command " ${wl}-bind_at_load"
-	      func_append finalize_command " ${wl}-bind_at_load"
-	    ;;
-	  esac
-	fi
-	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
-	;;
-      esac
-
-
-      # move library search paths that coincide with paths to not yet
-      # installed libraries to the beginning of the library search list
-      new_libs=
-      for path in $notinst_path; do
-	case " $new_libs " in
-	*" -L$path/$objdir "*) ;;
-	*)
-	  case " $compile_deplibs " in
-	  *" -L$path/$objdir "*)
-	    func_append new_libs " -L$path/$objdir" ;;
-	  esac
-	  ;;
-	esac
-      done
-      for deplib in $compile_deplibs; do
-	case $deplib in
-	-L*)
-	  case " $new_libs " in
-	  *" $deplib "*) ;;
-	  *) func_append new_libs " $deplib" ;;
-	  esac
-	  ;;
-	*) func_append new_libs " $deplib" ;;
-	esac
-      done
-      compile_deplibs="$new_libs"
-
-
-      func_append compile_command " $compile_deplibs"
-      func_append finalize_command " $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_rpath " $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append perm_rpath " $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  ::) dllsearchpath=$libdir;;
-	  *) func_append dllsearchpath ":$libdir";;
-	  esac
-	  case :$dllsearchpath: in
-	  *":$testbindir:"*) ;;
-	  ::) dllsearchpath=$testbindir;;
-	  *) func_append dllsearchpath ":$testbindir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    func_append rpath " $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) func_append finalize_perm_rpath " $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
-      fi
-
-      func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
-
-      # template prelinking step
-      if test -n "$prelink_cmds"; then
-	func_execute_cmds "$prelink_cmds" 'exit $?'
-      fi
-
-      wrappers_required=yes
-      case $host in
-      *cegcc* | *mingw32ce*)
-        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
-      *cygwin* | *mingw* )
-        if test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      *)
-        if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-          wrappers_required=no
-        fi
-        ;;
-      esac
-      if test "$wrappers_required" = no; then
-	# Replace the output file specification.
-	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	exit_status=0
-	func_show_eval "$link_command" 'exit_status=$?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	# Delete the generated files.
-	if test -f "$output_objdir/${outputname}S.${objext}"; then
-	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
-	fi
-
-	exit $exit_status
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    func_append rpath "$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$opt_dry_run || $RM $output
-	# Link the executable and exit
-	func_show_eval "$link_command" 'exit $?'
-
-	if test -n "$postlink_cmds"; then
-	  func_to_tool_file "$output"
-	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	  func_execute_cmds "$postlink_cmds" 'exit $?'
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	func_warning "this platform does not like uninstalled shared libraries"
-	func_warning "\`$output' will be relinked during installation"
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      func_show_eval "$link_command" 'exit $?'
-
-      if test -n "$postlink_cmds"; then
-	func_to_tool_file "$output_objdir/$outputname"
-	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
-	func_execute_cmds "$postlink_cmds" 'exit $?'
-      fi
-
-      # Now create the wrapper script.
-      func_verbose "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    func_quote_for_eval "$var_value"
-	    relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if not in dry run mode.
-      $opt_dry_run || {
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) func_stripname '' '.exe' "$output"
-	         output=$func_stripname_result ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    func_stripname '' '.exe' "$outputname"
-	    outputname=$func_stripname_result ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    func_dirname_and_basename "$output" "" "."
-	    output_name=$func_basename_result
-	    output_path=$func_dirname_result
-	    cwrappersource="$output_path/$objdir/lt-$output_name.c"
-	    cwrapper="$output_path/$output_name.exe"
-	    $RM $cwrappersource $cwrapper
-	    trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_cwrapperexe_src > $cwrappersource
-
-	    # The wrapper executable is built using the $host compiler,
-	    # because it contains $host paths and files. If cross-
-	    # compiling, it, like the target executable, must be
-	    # executed on the $host or under an emulation environment.
-	    $opt_dry_run || {
-	      $LTCC $LTCFLAGS -o $cwrapper $cwrappersource
-	      $STRIP $cwrapper
-	    }
-
-	    # Now, create the wrapper script for func_source use:
-	    func_ltwrapper_scriptname $cwrapper
-	    $RM $func_ltwrapper_scriptname_result
-	    trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
-	    $opt_dry_run || {
-	      # note: this script will not be executed, so do not chmod.
-	      if test "x$build" = "x$host" ; then
-		$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
-	      else
-		func_emit_wrapper no > $func_ltwrapper_scriptname_result
-	      fi
-	    }
-	  ;;
-	  * )
-	    $RM $output
-	    trap "$RM $output; exit $EXIT_FAILURE" 1 2 15
-
-	    func_emit_wrapper no > $output
-	    chmod +x $output
-	  ;;
-	esac
-      }
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save $symfileobj"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    func_append oldobjs " $symfileobj"
-	  fi
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	func_append generated " $gentop"
-
-	func_extract_archives $gentop $addlibs
-	func_append oldobjs " $func_extract_archives_result"
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	cmds=$old_archive_from_new_cmds
-      else
-
-	# Add any objects from preloaded convenience libraries
-	if test -n "$dlprefiles"; then
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-
-	  func_extract_archives $gentop $dlprefiles
-	  func_append oldobjs " $func_extract_archives_result"
-	fi
-
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      func_basename "$obj"
-	      $ECHO "$func_basename_result"
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  echo "copying selected object files to avoid basename conflicts..."
-	  gentop="$output_objdir/${outputname}x"
-	  func_append generated " $gentop"
-	  func_mkdir_p "$gentop"
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    func_basename "$obj"
-	    objbase="$func_basename_result"
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		func_arith $counter + 1
-		counter=$func_arith_result
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      func_append oldobjs " $gentop/$newobj"
-	      ;;
-	    *) func_append oldobjs " $obj" ;;
-	    esac
-	  done
-	fi
-	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
-	tool_oldlib=$func_to_tool_file_result
-	eval cmds=\"$old_archive_cmds\"
-
-	func_len " $cmds"
-	len=$func_len_result
-	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	elif test -n "$archiver_list_spec"; then
-	  func_verbose "using command file archive linking..."
-	  for obj in $oldobjs
-	  do
-	    func_to_tool_file "$obj"
-	    $ECHO "$func_to_tool_file_result"
-	  done > $output_objdir/$libname.libcmd
-	  func_to_tool_file "$output_objdir/$libname.libcmd"
-	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  func_verbose "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  eval test_cmds=\"$old_archive_cmds\"
-	  func_len " $test_cmds"
-	  len0=$func_len_result
-	  len=$len0
-	  for obj in $save_oldobjs
-	  do
-	    func_len " $obj"
-	    func_arith $len + $func_len_result
-	    len=$func_arith_result
-	    func_append objlist " $obj"
-	    if test "$len" -lt "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-		RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	      len=$len0
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      func_execute_cmds "$cmds" 'exit $?'
-    done
-
-    test -n "$generated" && \
-      func_show_eval "${RM}r$generated"
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      func_verbose "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  func_quote_for_eval "$var_value"
-	  relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-      # Only create the output if not a dry run.
-      $opt_dry_run || {
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		func_basename "$deplib"
-		name="$func_basename_result"
-		func_resolve_sysroot "$deplib"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      -L*)
-		func_stripname -L '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -L$func_replace_sysroot_result"
-		;;
-	      -R*)
-		func_stripname -R '' "$deplib"
-		func_replace_sysroot "$func_stripname_result"
-		func_append newdependency_libs " -R$func_replace_sysroot_result"
-		;;
-	      *) func_append newdependency_libs " $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-
-	    for lib in $dlfiles; do
-	      case $lib in
-	      *.la)
-	        func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      *) func_append newdlfiles " $lib" ;;
-	      esac
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-	      *.la)
-		# Only pass preopened files to the pseudo-archive (for
-		# eventual linking with the app. that links it) if we
-		# didn't already link the preopened objects directly into
-		# the library:
-		func_basename "$lib"
-		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-		test -z "$libdir" && \
-		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
-		;;
-	      esac
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlfiles " $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      func_append newdlprefiles " $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $RM $output
-	  # place dlname in correct position for cygwin
-	  # In fact, it would be nice if we could use this code for all target
-	  # systems that can't hard-code library paths into their executables
-	  # and that have no shared library path variable independent of PATH,
-	  # but it turns out we can't easily determine that from inspecting
-	  # libtool variables, so we have to hard-code the OSs to which it
-	  # applies here; at the moment, that means platforms that use the PE
-	  # object format with DLL files.  See the long comment at the top of
-	  # tests/bindir.at for full details.
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
-	      # If a -bindir argument was supplied, place the dll there.
-	      if test "x$bindir" != x ;
-	      then
-		func_relative_path "$install_libdir" "$bindir"
-		tdlname=$func_relative_path_result$dlname
-	      else
-		# Otherwise fall back on heuristic.
-		tdlname=../bin/$dlname
-	      fi
-	      ;;
-	  esac
-	  $ECHO > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags='$new_inherited_linker_flags'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Names of additional weak libraries provided by this library
-weak_library_names='$weak_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $ECHO >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      }
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      func_show_eval '( cd "$output_objdir" && $RM "$outputname" && $LN_S "../$outputname" "$outputname" )' 'exit $?'
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-}
-
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
-    func_mode_link ${1+"$@"}
-
-
-# func_mode_uninstall arg...
-func_mode_uninstall ()
-{
-    $opt_debug
-    RM="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) func_append RM " $arg"; rmforce=yes ;;
-      -*) func_append RM " $arg" ;;
-      *) func_append files " $arg" ;;
-      esac
-    done
-
-    test -z "$RM" && \
-      func_fatal_help "you must specify an RM program"
-
-    rmdirs=
-
-    for file in $files; do
-      func_dirname "$file" "" "."
-      dir="$func_dirname_result"
-      if test "X$dir" = X.; then
-	odir="$objdir"
-      else
-	odir="$dir/$objdir"
-      fi
-      func_basename "$file"
-      name="$func_basename_result"
-      test "$opt_mode" = uninstall && odir="$dir"
-
-      # Remember odir for removal later, being careful to avoid duplicates
-      if test "$opt_mode" = clean; then
-	case " $rmdirs " in
-	  *" $odir "*) ;;
-	  *) func_append rmdirs " $odir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if { test -L "$file"; } >/dev/null 2>&1 ||
-	 { test -h "$file"; } >/dev/null 2>&1 ||
-	 test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if func_lalib_p "$file"; then
-	  func_source $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    func_append rmfiles " $odir/$n"
-	  done
-	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
-
-	  case "$opt_mode" in
-	  clean)
-	    case " $library_names " in
-	    *" $dlname "*) ;;
-	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
-	    esac
-	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
-	    ;;
-	  uninstall)
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	    ;;
-	  esac
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if func_lalib_p "$file"; then
-
-	  # Read the .lo file
-	  func_source $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" &&
-	     test "$pic_object" != none; then
-	    func_append rmfiles " $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" &&
-	     test "$non_pic_object" != none; then
-	    func_append rmfiles " $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$opt_mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    func_stripname '' '.exe' "$file"
-	    file=$func_stripname_result
-	    func_stripname '' '.exe' "$name"
-	    noexename=$func_stripname_result
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    func_append rmfiles " $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if func_ltwrapper_p "$file"; then
-	    if func_ltwrapper_executable_p "$file"; then
-	      func_ltwrapper_scriptname "$file"
-	      relink_command=
-	      func_source $func_ltwrapper_scriptname_result
-	      func_append rmfiles " $func_ltwrapper_scriptname_result"
-	    else
-	      relink_command=
-	      func_source $dir/$noexename
-	    fi
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      func_append rmfiles " $odir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      func_append rmfiles " $odir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      func_show_eval "$RM $rmfiles" 'exit_status=1'
-    done
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	func_show_eval "rmdir $dir >/dev/null 2>&1"
-      fi
-    done
-
-    exit $exit_status
-}
-
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
-    func_mode_uninstall ${1+"$@"}
-
-test -z "$opt_mode" && {
-  help="$generic_help"
-  func_fatal_help "you must specify a MODE"
-}
-
-test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$opt_mode'"
-
-if test -n "$exec_cmd"; then
-  eval exec "$exec_cmd"
-  exit $EXIT_FAILURE
-fi
-
-exit $exit_status
-
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# vi:sw=2
-
diff --git a/contrib/atf/admin/missing b/contrib/atf/admin/missing
deleted file mode 100755
index 86a8fc31e3c..00000000000
--- a/contrib/atf/admin/missing
+++ /dev/null
@@ -1,331 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2012-01-06.13; # UTC
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program 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, or (at your option)
-# any later version.
-
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/contrib/atf/atf-c++.hpp b/contrib/atf/atf-c++.hpp
index ef8db66632c..e915aef2016 100644
--- a/contrib/atf/atf-c++.hpp
+++ b/contrib/atf/atf-c++.hpp
@@ -31,5 +31,6 @@
 #define _ATF_CXX_HPP_
 
 #include <atf-c++/macros.hpp>
+#include <atf-c++/utils.hpp>
 
 #endif // !defined(_ATF_CXX_HPP_)
diff --git a/contrib/atf/atf-c++/Atffile b/contrib/atf/atf-c++/Atffile
deleted file mode 100644
index ba11f2181cf..00000000000
--- a/contrib/atf/atf-c++/Atffile
+++ /dev/null
@@ -1,14 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: detail
-
-tp: atf_c++_test
-tp: build_test
-tp: check_test
-tp: config_test
-tp: macros_test
-tp: pkg_config_test
-tp: tests_test
-tp: utils_test
diff --git a/contrib/atf/atf-c++/Makefile.am.inc b/contrib/atf/atf-c++/Makefile.am.inc
deleted file mode 100644
index 23d497dde2e..00000000000
--- a/contrib/atf/atf-c++/Makefile.am.inc
+++ /dev/null
@@ -1,111 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-ATF_CXX_LIBS = libatf-c++.la libatf-c.la
-
-lib_LTLIBRARIES += libatf-c++.la
-libatf_c___la_LIBADD = libatf-c.la
-libatf_c___la_SOURCES = atf-c++/build.cpp \
-                        atf-c++/build.hpp \
-                        atf-c++/check.cpp \
-                        atf-c++/check.hpp \
-                        atf-c++/config.cpp \
-                        atf-c++/config.hpp \
-                        atf-c++/macros.hpp \
-                        atf-c++/tests.cpp \
-                        atf-c++/tests.hpp \
-                        atf-c++/utils.hpp
-libatf_c___la_LDFLAGS = -version-info 0:0:0
-
-include_HEADERS += atf-c++.hpp
-atf_c___HEADERS = atf-c++/build.hpp \
-                  atf-c++/check.hpp \
-                  atf-c++/config.hpp \
-                  atf-c++/macros.hpp \
-                  atf-c++/tests.hpp \
-                  atf-c++/utils.hpp
-atf_c__dir = $(includedir)/atf-c++
-
-dist_man_MANS += atf-c++/atf-c++-api.3
-
-atf_aclocal_DATA += atf-c++/atf-c++.m4
-EXTRA_DIST += atf-c++/atf-c++.m4
-
-atf_c__dirpkgconfigdir = $(atf_pkgconfigdir)
-atf_c__dirpkgconfig_DATA = atf-c++/atf-c++.pc
-CLEANFILES += atf-c++/atf-c++.pc
-EXTRA_DIST += atf-c++/atf-c++.pc.in
-atf-c++/atf-c++.pc: $(srcdir)/atf-c++/atf-c++.pc.in Makefile
-	test -d atf-c++ || mkdir -p atf-c++
-	sed -e 's#__ATF_VERSION__#$(PACKAGE_VERSION)#g' \
-	    -e 's#__CXX__#$(CXX)#g' \
-	    -e 's#__INCLUDEDIR__#$(includedir)#g' \
-	    -e 's#__LIBDIR__#$(libdir)#g' \
-	    <$(srcdir)/atf-c++/atf-c++.pc.in >atf-c++/atf-c++.pc.tmp
-	mv atf-c++/atf-c++.pc.tmp atf-c++/atf-c++.pc
-
-tests_atf_c___DATA = atf-c++/Atffile \
-                     atf-c++/Kyuafile \
-                     atf-c++/macros_hpp_test.cpp \
-                     atf-c++/unused_test.cpp
-tests_atf_c__dir = $(pkgtestsdir)/atf-c++
-EXTRA_DIST += $(tests_atf_c___DATA)
-
-tests_atf_c___PROGRAMS = atf-c++/atf_c++_test
-atf_c___atf_c___test_SOURCES = atf-c++/atf_c++_test.cpp
-atf_c___atf_c___test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-tests_atf_c___PROGRAMS += atf-c++/build_test
-atf_c___build_test_SOURCES = atf-c++/build_test.cpp atf-c/h_build.h
-atf_c___build_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-tests_atf_c___PROGRAMS += atf-c++/check_test
-atf_c___check_test_SOURCES = atf-c++/check_test.cpp
-atf_c___check_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-tests_atf_c___PROGRAMS += atf-c++/config_test
-atf_c___config_test_SOURCES = atf-c++/config_test.cpp
-atf_c___config_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-tests_atf_c___PROGRAMS += atf-c++/macros_test
-atf_c___macros_test_SOURCES = atf-c++/macros_test.cpp
-atf_c___macros_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-tests_atf_c___SCRIPTS = atf-c++/pkg_config_test
-CLEANFILES += atf-c++/pkg_config_test
-EXTRA_DIST += atf-c++/pkg_config_test.sh
-atf-c++/pkg_config_test: $(srcdir)/atf-c++/pkg_config_test.sh
-	test -d atf-c++ || mkdir -p atf-c++
-	@src="$(srcdir)/atf-c++/pkg_config_test.sh"; \
-	dst="atf-c++/pkg_config_test"; $(BUILD_SH_TP)
-
-tests_atf_c___PROGRAMS += atf-c++/tests_test
-atf_c___tests_test_SOURCES = atf-c++/tests_test.cpp
-atf_c___tests_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-tests_atf_c___PROGRAMS += atf-c++/utils_test
-atf_c___utils_test_SOURCES = atf-c++/utils_test.cpp
-atf_c___utils_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-include atf-c++/detail/Makefile.am.inc
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/atf-c++/atf-c++-api.3 b/contrib/atf/atf-c++/atf-c++-api.3
index 5d6618b4eb3..c086c909671 100644
--- a/contrib/atf/atf-c++/atf-c++-api.3
+++ b/contrib/atf/atf-c++/atf-c++-api.3
@@ -26,10 +26,11 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd January 21, 2012
+.Dd November 15, 2013
 .Dt ATF-C++-API 3
 .Os
 .Sh NAME
+.Nm atf-c++-api ,
 .Nm ATF_ADD_TEST_CASE ,
 .Nm ATF_CHECK_ERRNO ,
 .Nm ATF_FAIL ,
@@ -52,6 +53,17 @@
 .Nm ATF_TEST_CASE_USE ,
 .Nm ATF_TEST_CASE_WITH_CLEANUP ,
 .Nm ATF_TEST_CASE_WITHOUT_HEAD ,
+.Nm atf::utils::cat_file ,
+.Nm atf::utils::compare_file ,
+.Nm atf::utils::copy_file ,
+.Nm atf::utils::create_file ,
+.Nm atf::utils::file_exists ,
+.Nm atf::utils::fork ,
+.Nm atf::utils::grep_collection ,
+.Nm atf::utils::grep_file ,
+.Nm atf::utils::grep_string ,
+.Nm atf::utils::redirect ,
+.Nm atf::utils::wait
 .Nd C++ API to write ATF-based test programs
 .Sh SYNOPSIS
 .In atf-c++.hpp
@@ -77,18 +89,64 @@
 .Fn ATF_TEST_CASE_USE "name"
 .Fn ATF_TEST_CASE_WITH_CLEANUP "name"
 .Fn ATF_TEST_CASE_WITHOUT_HEAD "name"
+.Ft void
+.Fo atf::utils::cat_file
+.Fa "const std::string& path"
+.Fa "const std::string& prefix"
+.Fc
+.Ft bool
+.Fo atf::utils::compare_file
+.Fa "const std::string& path"
+.Fa "const std::string& contents"
+.Fc
+.Ft void
+.Fo atf::utils::copy_file
+.Fa "const std::string& source"
+.Fa "const std::string& destination"
+.Fc
+.Ft void
+.Fo atf::utils::create_file
+.Fa "const std::string& path"
+.Fa "const std::string& contents"
+.Fc
+.Ft void
+.Fo atf::utils::file_exists
+.Fa "const std::string& path"
+.Fc
+.Ft pid_t
+.Fo atf::utils::fork
+.Fa "void"
+.Fc
+.Ft bool
+.Fo atf::utils::grep_collection
+.Fa "const std::string& regexp"
+.Fa "const Collection& collection"
+.Fc
+.Ft bool
+.Fo atf::utils::grep_file
+.Fa "const std::string& regexp"
+.Fa "const std::string& path"
+.Fc
+.Ft bool
+.Fo atf::utils::grep_string
+.Fa "const std::string& regexp"
+.Fa "const std::string& path"
+.Fc
+.Ft void
+.Fo atf::utils::redirect
+.Fa "const int fd"
+.Fa "const std::string& path"
+.Fc
+.Ft void
+.Fo atf::utils::wait
+.Fa "const pid_t pid"
+.Fa "const int expected_exit_status"
+.Fa "const std::string& expected_stdout"
+.Fa "const std::string& expected_stderr"
+.Fc
 .Sh DESCRIPTION
-ATF provides a mostly-macro-based programming interface to implement test
-programs in C or C++.
-This interface is backed by a C++ implementation, but this fact is
-hidden from the developer as much as possible through the use of
-macros to simplify programming.
-However, the use of C++ is not hidden everywhere and while you can
-implement test cases without knowing anything at all about the object model
-underneath the provided calls, you might need some minimum notions of the
-language in very specific circumstances.
-.Pp
-C++-based test programs always follow this template:
+ATF provides a C++ programming interface to implement test programs.
+C++-based test programs follow this template:
 .Bd -literal -offset indent
 extern "C" {
 .Ns ... C-specific includes go here ...
@@ -205,7 +263,7 @@ The first parameter of this macro matches the name you provided in the
 former call.
 .Ss Header definitions
 The test case's header can define the meta-data by using the
-.Fn set
+.Fn set_md_var
 method, which takes two parameters: the first one specifies the
 meta-data variable to be set and the second one specifies its value.
 Both of them are strings.
@@ -348,7 +406,7 @@ in the collection.
 .Fn ATF_REQUIRE_THROW
 takes the name of an exception and a statement and raises a failure if
 the statement does not throw the specified exception.
-.Fn ATF_REQUIRE_THROW_EQ
+.Fn ATF_REQUIRE_THROW_RE
 takes the name of an exception, a regular expresion and a statement and raises a
 failure if the statement does not throw the specified exception and if the
 message of the exception does not match the regular expression.
@@ -362,6 +420,163 @@ variable and, second, a boolean expression that, if evaluates to true,
 means that a call failed and
 .Va errno
 has to be checked against the first value.
+.Ss Utility functions
+The following functions are provided as part of the
+.Nm
+API to simplify the creation of a variety of tests.
+In particular, these are useful to write tests for command-line interfaces.
+.Pp
+.Ft void
+.Fo atf::utils::cat_file
+.Fa "const std::string& path"
+.Fa "const std::string& prefix"
+.Fc
+.Bd -ragged -offset indent
+Prints the contents of
+.Fa path
+to the standard output, prefixing every line with the string in
+.Fa prefix .
+.Ed
+.Pp
+.Ft bool
+.Fo atf::utils::compare_file
+.Fa "const std::string& path"
+.Fa "const std::string& contents"
+.Fc
+.Bd -ragged -offset indent
+Returns true if the given
+.Fa path
+matches exactly the expected inlined
+.Fa contents .
+.Ed
+.Pp
+.Ft void
+.Fo atf::utils::copy_file
+.Fa "const std::string& source"
+.Fa "const std::string& destination"
+.Fc
+.Bd -ragged -offset indent
+Copies the file
+.Fa source
+to
+.Fa destination .
+The permissions of the file are preserved during the code.
+.Ed
+.Pp
+.Ft void
+.Fo atf::utils::create_file
+.Fa "const std::string& path"
+.Fa "const std::string& contents"
+.Fc
+.Bd -ragged -offset indent
+Creates
+.Fa file
+with the text given in
+.Fa contents .
+.Ed
+.Pp
+.Ft void
+.Fo atf::utils::file_exists
+.Fa "const std::string& path"
+.Fc
+.Bd -ragged -offset indent
+Checks if
+.Fa path
+exists.
+.Ed
+.Pp
+.Ft pid_t
+.Fo atf::utils::fork
+.Fa "void"
+.Fc
+.Bd -ragged -offset indent
+Forks a process and redirects the standard output and standard error of the
+child to files for later validation with
+.Fn atf::utils::wait .
+Fails the test case if the fork fails, so this does not return an error.
+.Ed
+.Pp
+.Ft bool
+.Fo atf::utils::grep_collection
+.Fa "const std::string& regexp"
+.Fa "const Collection& collection"
+.Fc
+.Bd -ragged -offset indent
+Searches for the regular expression
+.Fa regexp
+in any of the strings contained in the
+.Fa collection .
+This is a template that accepts any one-dimensional container of strings.
+.Ed
+.Pp
+.Ft bool
+.Fo atf::utils::grep_file
+.Fa "const std::string& regexp"
+.Fa "const std::string& path"
+.Fc
+.Bd -ragged -offset indent
+Searches for the regular expression
+.Fa regexp
+in the file
+.Fa path .
+The variable arguments are used to construct the regular expression.
+.Ed
+.Pp
+.Ft bool
+.Fo atf::utils::grep_string
+.Fa "const std::string& regexp"
+.Fa "const std::string& str"
+.Fc
+.Bd -ragged -offset indent
+Searches for the regular expression
+.Fa regexp
+in the string
+.Fa str .
+.Ed
+.Ft void
+.Fo atf::utils::redirect
+.Fa "const int fd"
+.Fa "const std::string& path"
+.Fc
+.Bd -ragged -offset indent
+Redirects the given file descriptor
+.Fa fd
+to the file
+.Fa path .
+This function exits the process in case of an error and does not properly mark
+the test case as failed.
+As a result, it should only be used in subprocesses of the test case; specially
+those spawned by
+.Fn atf::utils::fork .
+.Ed
+.Pp
+.Ft void
+.Fo atf::utils::wait
+.Fa "const pid_t pid"
+.Fa "const int expected_exit_status"
+.Fa "const std::string& expected_stdout"
+.Fa "const std::string& expected_stderr"
+.Fc
+.Bd -ragged -offset indent
+Waits and validates the result of a subprocess spawned with
+.Fn atf::utils::wait .
+The validation involves checking that the subprocess exited cleanly and returned
+the code specified in
+.Fa expected_exit_status
+and that its standard output and standard error match the strings given in
+.Fa expected_stdout
+and
+.Fa expected_stderr .
+.Pp
+If any of the
+.Fa expected_stdout
+or
+.Fa expected_stderr
+strings are prefixed with
+.Sq save: ,
+then they specify the name of the file into which to store the stdout or stderr
+of the subprocess, and no comparison is performed.
+.Ed
 .Sh EXAMPLES
 The following shows a complete test program with a single test case that
 validates the addition operator:
@@ -371,7 +586,7 @@ validates the addition operator:
 ATF_TEST_CASE(addition);
 ATF_TEST_CASE_HEAD(addition)
 {
-    set("descr", "Sample tests for the addition operator");
+    set_md_var("descr", "Sample tests for the addition operator");
 }
 ATF_TEST_CASE_BODY(addition)
 {
@@ -387,7 +602,7 @@ ATF_TEST_CASE_BODY(addition)
 ATF_TEST_CASE(open_failure);
 ATF_TEST_CASE_HEAD(open_failure)
 {
-    set("descr", "Sample tests for the open function");
+    set_md_var("descr", "Sample tests for the open function");
 }
 ATF_TEST_CASE_BODY(open_failure)
 {
@@ -397,7 +612,7 @@ ATF_TEST_CASE_BODY(open_failure)
 ATF_TEST_CASE(known_bug);
 ATF_TEST_CASE_HEAD(known_bug)
 {
-    set("descr", "Reproduces a known bug");
+    set_md_var("descr", "Reproduces a known bug");
 }
 ATF_TEST_CASE_BODY(known_bug)
 {
diff --git a/contrib/atf/atf-c++/check.hpp b/contrib/atf/atf-c++/check.hpp
index 055dd4f7209..0623529c745 100644
--- a/contrib/atf/atf-c++/check.hpp
+++ b/contrib/atf/atf-c++/check.hpp
@@ -39,7 +39,7 @@ extern "C" {
 #include <string>
 #include <vector>
 
-#include <atf-c++/utils.hpp>
+#include <atf-c++/noncopyable.hpp>
 
 namespace atf {
 
@@ -60,7 +60,7 @@ namespace check {
 //! of executing arbitrary command and manages files containing
 //! its output.
 //!
-class check_result : utils::noncopyable {
+class check_result : noncopyable {
     //!
     //! \brief Internal representation of a result.
     //!
diff --git a/contrib/atf/atf-c++/check_test.cpp b/contrib/atf/atf-c++/check_test.cpp
index a4c499388b8..a92511c2f20 100644
--- a/contrib/atf/atf-c++/check_test.cpp
+++ b/contrib/atf/atf-c++/check_test.cpp
@@ -193,15 +193,15 @@ ATF_TEST_CASE_BODY(build_c_o)
 {
     ATF_TEST_CASE_USE(h_build_c_o_ok);
     run_h_tc< ATF_TEST_CASE_NAME(h_build_c_o_ok) >();
-    ATF_REQUIRE(grep_file("stdout", "-o test.o"));
-    ATF_REQUIRE(grep_file("stdout", "-c test.c"));
+    ATF_REQUIRE(atf::utils::grep_file("-o test.o", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("-c test.c", "stdout"));
 
     ATF_TEST_CASE_USE(h_build_c_o_fail);
     run_h_tc< ATF_TEST_CASE_NAME(h_build_c_o_fail) >();
-    ATF_REQUIRE(grep_file("stdout", "-o test.o"));
-    ATF_REQUIRE(grep_file("stdout", "-c test.c"));
-    ATF_REQUIRE(grep_file("stderr", "test.c"));
-    ATF_REQUIRE(grep_file("stderr", "UNDEFINED_SYMBOL"));
+    ATF_REQUIRE(atf::utils::grep_file("-o test.o", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("-c test.c", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("test.c", "stderr"));
+    ATF_REQUIRE(atf::utils::grep_file("UNDEFINED_SYMBOL", "stderr"));
 }
 
 ATF_TEST_CASE(build_cpp);
@@ -213,16 +213,16 @@ ATF_TEST_CASE_BODY(build_cpp)
 {
     ATF_TEST_CASE_USE(h_build_cpp_ok);
     run_h_tc< ATF_TEST_CASE_NAME(h_build_cpp_ok) >();
-    ATF_REQUIRE(grep_file("stdout", "-o.*test.p"));
-    ATF_REQUIRE(grep_file("stdout", "test.c"));
-    ATF_REQUIRE(grep_file("test.p", "foo bar"));
+    ATF_REQUIRE(atf::utils::grep_file("-o.*test.p", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("test.c", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("foo bar", "test.p"));
 
     ATF_TEST_CASE_USE(h_build_cpp_fail);
     run_h_tc< ATF_TEST_CASE_NAME(h_build_cpp_fail) >();
-    ATF_REQUIRE(grep_file("stdout", "-o test.p"));
-    ATF_REQUIRE(grep_file("stdout", "test.c"));
-    ATF_REQUIRE(grep_file("stderr", "test.c"));
-    ATF_REQUIRE(grep_file("stderr", "non-existent.h"));
+    ATF_REQUIRE(atf::utils::grep_file("-o test.p", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("test.c", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("test.c", "stderr"));
+    ATF_REQUIRE(atf::utils::grep_file("non-existent.h", "stderr"));
 }
 
 ATF_TEST_CASE(build_cxx_o);
@@ -234,15 +234,15 @@ ATF_TEST_CASE_BODY(build_cxx_o)
 {
     ATF_TEST_CASE_USE(h_build_cxx_o_ok);
     run_h_tc< ATF_TEST_CASE_NAME(h_build_cxx_o_ok) >();
-    ATF_REQUIRE(grep_file("stdout", "-o test.o"));
-    ATF_REQUIRE(grep_file("stdout", "-c test.cpp"));
+    ATF_REQUIRE(atf::utils::grep_file("-o test.o", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("-c test.cpp", "stdout"));
 
     ATF_TEST_CASE_USE(h_build_cxx_o_fail);
     run_h_tc< ATF_TEST_CASE_NAME(h_build_cxx_o_fail) >();
-    ATF_REQUIRE(grep_file("stdout", "-o test.o"));
-    ATF_REQUIRE(grep_file("stdout", "-c test.cpp"));
-    ATF_REQUIRE(grep_file("stderr", "test.cpp"));
-    ATF_REQUIRE(grep_file("stderr", "UNDEFINED_SYMBOL"));
+    ATF_REQUIRE(atf::utils::grep_file("-o test.o", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("-c test.cpp", "stdout"));
+    ATF_REQUIRE(atf::utils::grep_file("test.cpp", "stderr"));
+    ATF_REQUIRE(atf::utils::grep_file("UNDEFINED_SYMBOL", "stderr"));
 }
 
 ATF_TEST_CASE(exec_cleanup);
diff --git a/contrib/atf/atf-c++/detail/Atffile b/contrib/atf/atf-c++/detail/Atffile
deleted file mode 100644
index ead6ec3dcac..00000000000
--- a/contrib/atf/atf-c++/detail/Atffile
+++ /dev/null
@@ -1,13 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: application_test
-tp: env_test
-tp: exceptions_test
-tp: expand_test
-tp: fs_test
-tp: parser_test
-tp: sanity_test
-tp: text_test
-tp: ui_test
diff --git a/contrib/atf/atf-c++/detail/Kyuafile b/contrib/atf/atf-c++/detail/Kyuafile
index 472c1229d79..fd0d7abe859 100644
--- a/contrib/atf/atf-c++/detail/Kyuafile
+++ b/contrib/atf/atf-c++/detail/Kyuafile
@@ -3,6 +3,7 @@ syntax("kyuafile", 1)
 test_suite("atf")
 
 atf_test_program{name="application_test"}
+atf_test_program{name="auto_array_test"}
 atf_test_program{name="env_test"}
 atf_test_program{name="exceptions_test"}
 atf_test_program{name="expand_test"}
diff --git a/contrib/atf/atf-c++/detail/Makefile.am.inc b/contrib/atf/atf-c++/detail/Makefile.am.inc
deleted file mode 100644
index fcadd77db1f..00000000000
--- a/contrib/atf/atf-c++/detail/Makefile.am.inc
+++ /dev/null
@@ -1,99 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-libatf_c___la_SOURCES += atf-c++/detail/application.cpp \
-                         atf-c++/detail/application.hpp \
-                         atf-c++/detail/env.cpp \
-                         atf-c++/detail/env.hpp \
-                         atf-c++/detail/exceptions.cpp \
-                         atf-c++/detail/exceptions.hpp \
-                         atf-c++/detail/expand.cpp \
-                         atf-c++/detail/expand.hpp \
-                         atf-c++/detail/fs.cpp \
-                         atf-c++/detail/fs.hpp \
-                         atf-c++/detail/parser.cpp \
-                         atf-c++/detail/parser.hpp \
-                         atf-c++/detail/process.cpp \
-                         atf-c++/detail/process.hpp \
-                         atf-c++/detail/sanity.hpp \
-                         atf-c++/detail/text.cpp \
-                         atf-c++/detail/text.hpp \
-                         atf-c++/detail/ui.cpp \
-                         atf-c++/detail/ui.hpp
-
-tests_atf_c___detail_DATA = atf-c++/detail/Atffile \
-                            atf-c++/detail/Kyuafile
-tests_atf_c___detaildir = $(pkgtestsdir)/atf-c++/detail
-EXTRA_DIST += $(tests_atf_c___detail_DATA)
-
-noinst_LTLIBRARIES += atf-c++/detail/libtest_helpers.la
-atf_c___detail_libtest_helpers_la_SOURCES = atf-c++/detail/test_helpers.cpp \
-                                            atf-c++/detail/test_helpers.hpp
-
-tests_atf_c___detail_PROGRAMS = atf-c++/detail/application_test
-atf_c___detail_application_test_SOURCES = atf-c++/detail/application_test.cpp
-atf_c___detail_application_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_c___detail_PROGRAMS += atf-c++/detail/env_test
-atf_c___detail_env_test_SOURCES = atf-c++/detail/env_test.cpp
-atf_c___detail_env_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_c___detail_PROGRAMS += atf-c++/detail/exceptions_test
-atf_c___detail_exceptions_test_SOURCES = atf-c++/detail/exceptions_test.cpp
-atf_c___detail_exceptions_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_c___detail_PROGRAMS += atf-c++/detail/expand_test
-atf_c___detail_expand_test_SOURCES = atf-c++/detail/expand_test.cpp
-atf_c___detail_expand_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_c___detail_PROGRAMS += atf-c++/detail/fs_test
-atf_c___detail_fs_test_SOURCES = atf-c++/detail/fs_test.cpp
-atf_c___detail_fs_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_c___detail_PROGRAMS += atf-c++/detail/parser_test
-atf_c___detail_parser_test_SOURCES = atf-c++/detail/parser_test.cpp
-atf_c___detail_parser_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_c___detail_PROGRAMS += atf-c++/detail/process_test
-atf_c___detail_process_test_SOURCES = atf-c++/detail/process_test.cpp
-atf_c___detail_process_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_c___detail_PROGRAMS += atf-c++/detail/sanity_test
-atf_c___detail_sanity_test_SOURCES = atf-c++/detail/sanity_test.cpp
-atf_c___detail_sanity_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_c___detail_PROGRAMS += atf-c++/detail/text_test
-atf_c___detail_text_test_SOURCES = atf-c++/detail/text_test.cpp
-atf_c___detail_text_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_c___detail_PROGRAMS += atf-c++/detail/ui_test
-atf_c___detail_ui_test_SOURCES = atf-c++/detail/ui_test.cpp
-atf_c___detail_ui_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/atf-c++/detail/auto_array.hpp b/contrib/atf/atf-c++/detail/auto_array.hpp
new file mode 100644
index 00000000000..1459284e3b6
--- /dev/null
+++ b/contrib/atf/atf-c++/detail/auto_array.hpp
@@ -0,0 +1,179 @@
+//
+// Automated Testing Framework (atf)
+//
+// 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.
+//
+
+#if !defined(_ATF_CXX_AUTO_ARRAY_HPP_)
+#define _ATF_CXX_AUTO_ARRAY_HPP_
+
+#include <cstddef>
+
+namespace atf {
+
+// ------------------------------------------------------------------------
+// The "auto_array" class.
+// ------------------------------------------------------------------------
+
+template< class T >
+struct auto_array_ref {
+    T* m_ptr;
+
+    explicit auto_array_ref(T*);
+};
+
+template< class T >
+auto_array_ref< T >::auto_array_ref(T* ptr) :
+    m_ptr(ptr)
+{
+}
+
+template< class T >
+class auto_array {
+    T* m_ptr;
+
+public:
+    auto_array(T* = NULL) throw();
+    auto_array(auto_array< T >&) throw();
+    auto_array(auto_array_ref< T >) throw();
+    ~auto_array(void) throw();
+
+    T* get(void) throw();
+    const T* get(void) const throw();
+    T* release(void) throw();
+    void reset(T* = NULL) throw();
+
+    auto_array< T >& operator=(auto_array< T >&) throw();
+    auto_array< T >& operator=(auto_array_ref< T >) throw();
+
+    T& operator[](int) throw();
+    operator auto_array_ref< T >(void) throw();
+};
+
+template< class T >
+auto_array< T >::auto_array(T* ptr)
+    throw() :
+    m_ptr(ptr)
+{
+}
+
+template< class T >
+auto_array< T >::auto_array(auto_array< T >& ptr)
+    throw() :
+    m_ptr(ptr.release())
+{
+}
+
+template< class T >
+auto_array< T >::auto_array(auto_array_ref< T > ref)
+    throw() :
+    m_ptr(ref.m_ptr)
+{
+}
+
+template< class T >
+auto_array< T >::~auto_array(void)
+    throw()
+{
+    if (m_ptr != NULL)
+        delete [] m_ptr;
+}
+
+template< class T >
+T*
+auto_array< T >::get(void)
+    throw()
+{
+    return m_ptr;
+}
+
+template< class T >
+const T*
+auto_array< T >::get(void)
+    const throw()
+{
+    return m_ptr;
+}
+
+template< class T >
+T*
+auto_array< T >::release(void)
+    throw()
+{
+    T* ptr = m_ptr;
+    m_ptr = NULL;
+    return ptr;
+}
+
+template< class T >
+void
+auto_array< T >::reset(T* ptr)
+    throw()
+{
+    if (m_ptr != NULL)
+        delete [] m_ptr;
+    m_ptr = ptr;
+}
+
+template< class T >
+auto_array< T >&
+auto_array< T >::operator=(auto_array< T >& ptr)
+    throw()
+{
+    reset(ptr.release());
+    return *this;
+}
+
+template< class T >
+auto_array< T >&
+auto_array< T >::operator=(auto_array_ref< T > ref)
+    throw()
+{
+    if (m_ptr != ref.m_ptr) {
+        delete [] m_ptr;
+        m_ptr = ref.m_ptr;
+    }
+    return *this;
+}
+
+template< class T >
+T&
+auto_array< T >::operator[](int pos)
+    throw()
+{
+    return m_ptr[pos];
+}
+
+template< class T >
+auto_array< T >::operator auto_array_ref< T >(void)
+    throw()
+{
+    return auto_array_ref< T >(release());
+}
+
+} // namespace atf
+
+#endif // !defined(_ATF_CXX_AUTO_ARRAY_HPP_)
diff --git a/contrib/atf/atf-c++/detail/auto_array_test.cpp b/contrib/atf/atf-c++/detail/auto_array_test.cpp
new file mode 100644
index 00000000000..dcfe41551ce
--- /dev/null
+++ b/contrib/atf/atf-c++/detail/auto_array_test.cpp
@@ -0,0 +1,304 @@
+//
+// Automated Testing Framework (atf)
+//
+// 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.
+//
+
+extern "C" {
+#include <sys/types.h>
+}
+
+#include <iostream>
+
+#include "atf-c/defs.h"
+
+#include "../macros.hpp"
+
+#include "auto_array.hpp"
+
+// ------------------------------------------------------------------------
+// Tests for the "auto_array" class.
+// ------------------------------------------------------------------------
+
+class test_array {
+public:
+    int m_value;
+
+    static ssize_t m_nblocks;
+
+    static
+    atf::auto_array< test_array >
+    do_copy(atf::auto_array< test_array >& ta)
+    {
+        return atf::auto_array< test_array >(ta);
+    }
+
+    void* operator new(size_t size ATF_DEFS_ATTRIBUTE_UNUSED)
+    {
+        ATF_FAIL("New called but should have been new[]");
+        return new int(5);
+    }
+
+    void* operator new[](size_t size)
+    {
+        m_nblocks++;
+        void* mem = ::operator new(size);
+        std::cout << "Allocated 'test_array' object " << mem << "\n";
+        return mem;
+    }
+
+    void operator delete(void* mem ATF_DEFS_ATTRIBUTE_UNUSED)
+    {
+        ATF_FAIL("Delete called but should have been delete[]");
+    }
+
+    void operator delete[](void* mem)
+    {
+        std::cout << "Releasing 'test_array' object " << mem << "\n";
+        if (m_nblocks == 0)
+            ATF_FAIL("Unbalanced delete[]");
+        m_nblocks--;
+        ::operator delete(mem);
+    }
+};
+
+ssize_t test_array::m_nblocks = 0;
+
+ATF_TEST_CASE(auto_array_scope);
+ATF_TEST_CASE_HEAD(auto_array_scope)
+{
+    set_md_var("descr", "Tests the automatic scope handling in the "
+               "auto_array smart pointer class");
+}
+ATF_TEST_CASE_BODY(auto_array_scope)
+{
+    using atf::auto_array;
+
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    {
+        auto_array< test_array > t(new test_array[10]);
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+    }
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+}
+
+ATF_TEST_CASE(auto_array_copy);
+ATF_TEST_CASE_HEAD(auto_array_copy)
+{
+    set_md_var("descr", "Tests the auto_array smart pointer class' copy "
+               "constructor");
+}
+ATF_TEST_CASE_BODY(auto_array_copy)
+{
+    using atf::auto_array;
+
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    {
+        auto_array< test_array > t1(new test_array[10]);
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+
+        {
+            auto_array< test_array > t2(t1);
+            ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+        }
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    }
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+}
+
+ATF_TEST_CASE(auto_array_copy_ref);
+ATF_TEST_CASE_HEAD(auto_array_copy_ref)
+{
+    set_md_var("descr", "Tests the auto_array smart pointer class' copy "
+               "constructor through the auxiliary auto_array_ref object");
+}
+ATF_TEST_CASE_BODY(auto_array_copy_ref)
+{
+    using atf::auto_array;
+
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    {
+        auto_array< test_array > t1(new test_array[10]);
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+
+        {
+            auto_array< test_array > t2 = test_array::do_copy(t1);
+            ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+        }
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    }
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+}
+
+ATF_TEST_CASE(auto_array_get);
+ATF_TEST_CASE_HEAD(auto_array_get)
+{
+    set_md_var("descr", "Tests the auto_array smart pointer class' get "
+               "method");
+}
+ATF_TEST_CASE_BODY(auto_array_get)
+{
+    using atf::auto_array;
+
+    test_array* ta = new test_array[10];
+    auto_array< test_array > t(ta);
+    ATF_REQUIRE_EQ(t.get(), ta);
+}
+
+ATF_TEST_CASE(auto_array_release);
+ATF_TEST_CASE_HEAD(auto_array_release)
+{
+    set_md_var("descr", "Tests the auto_array smart pointer class' release "
+               "method");
+}
+ATF_TEST_CASE_BODY(auto_array_release)
+{
+    using atf::auto_array;
+
+    test_array* ta1 = new test_array[10];
+    {
+        auto_array< test_array > t(ta1);
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+        test_array* ta2 = t.release();
+        ATF_REQUIRE_EQ(ta2, ta1);
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+    }
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+    delete [] ta1;
+}
+
+ATF_TEST_CASE(auto_array_reset);
+ATF_TEST_CASE_HEAD(auto_array_reset)
+{
+    set_md_var("descr", "Tests the auto_array smart pointer class' reset "
+               "method");
+}
+ATF_TEST_CASE_BODY(auto_array_reset)
+{
+    using atf::auto_array;
+
+    test_array* ta1 = new test_array[10];
+    test_array* ta2 = new test_array[10];
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 2);
+
+    {
+        auto_array< test_array > t(ta1);
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 2);
+        t.reset(ta2);
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+        t.reset();
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    }
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+}
+
+ATF_TEST_CASE(auto_array_assign);
+ATF_TEST_CASE_HEAD(auto_array_assign)
+{
+    set_md_var("descr", "Tests the auto_array smart pointer class' "
+               "assignment operator");
+}
+ATF_TEST_CASE_BODY(auto_array_assign)
+{
+    using atf::auto_array;
+
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    {
+        auto_array< test_array > t1(new test_array[10]);
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+
+        {
+            auto_array< test_array > t2;
+            t2 = t1;
+            ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+        }
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    }
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+}
+
+ATF_TEST_CASE(auto_array_assign_ref);
+ATF_TEST_CASE_HEAD(auto_array_assign_ref)
+{
+    set_md_var("descr", "Tests the auto_array smart pointer class' "
+               "assignment operator through the auxiliary auto_array_ref "
+               "object");
+}
+ATF_TEST_CASE_BODY(auto_array_assign_ref)
+{
+    using atf::auto_array;
+
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    {
+        auto_array< test_array > t1(new test_array[10]);
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+
+        {
+            auto_array< test_array > t2;
+            t2 = test_array::do_copy(t1);
+            ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+        }
+        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+    }
+    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+}
+
+ATF_TEST_CASE(auto_array_access);
+ATF_TEST_CASE_HEAD(auto_array_access)
+{
+    set_md_var("descr", "Tests the auto_array smart pointer class' access "
+               "operator");
+}
+ATF_TEST_CASE_BODY(auto_array_access)
+{
+    using atf::auto_array;
+
+    auto_array< test_array > t(new test_array[10]);
+
+    for (int i = 0; i < 10; i++)
+        t[i].m_value = i * 2;
+
+    for (int i = 0; i < 10; i++)
+        ATF_REQUIRE_EQ(t[i].m_value, i * 2);
+}
+
+// ------------------------------------------------------------------------
+// Main.
+// ------------------------------------------------------------------------
+
+ATF_INIT_TEST_CASES(tcs)
+{
+    // Add the test for the "auto_array" class.
+    ATF_ADD_TEST_CASE(tcs, auto_array_scope);
+    ATF_ADD_TEST_CASE(tcs, auto_array_copy);
+    ATF_ADD_TEST_CASE(tcs, auto_array_copy_ref);
+    ATF_ADD_TEST_CASE(tcs, auto_array_get);
+    ATF_ADD_TEST_CASE(tcs, auto_array_release);
+    ATF_ADD_TEST_CASE(tcs, auto_array_reset);
+    ATF_ADD_TEST_CASE(tcs, auto_array_assign);
+    ATF_ADD_TEST_CASE(tcs, auto_array_assign_ref);
+    ATF_ADD_TEST_CASE(tcs, auto_array_access);
+}
diff --git a/contrib/atf/atf-c++/detail/parser.hpp b/contrib/atf/atf-c++/detail/parser.hpp
index f1595f531f5..f55973f50c4 100644
--- a/contrib/atf/atf-c++/detail/parser.hpp
+++ b/contrib/atf/atf-c++/detail/parser.hpp
@@ -259,7 +259,7 @@ tokenizer< IS >::next(void)
                 t = token(m_lineno, m_text_type, text);
                 quoted = true;
             } else {
-                m_is.unget();
+                m_is.putback(ch);
                 done = true;
             }
         } else {
@@ -271,13 +271,13 @@ tokenizer< IS >::next(void)
                     t = token(m_lineno, (*idelim).second,
                                    std::string("") + ch);
                 else
-                    m_is.unget();
+                    m_is.putback(ch);
             } else if (ch == '\n') {
                 done = true;
                 if (text.empty())
                     t = token(m_lineno, m_nl_type, "<<NEWLINE>>");
                 else
-                    m_is.unget();
+                    m_is.putback(ch);
             } else if (m_skipws && (ch == ' ' || ch == '\t')) {
                 if (!text.empty())
                     done = true;
diff --git a/contrib/atf/atf-c++/detail/process.cpp b/contrib/atf/atf-c++/detail/process.cpp
index deb1158bcf8..f7ae6d49de0 100644
--- a/contrib/atf/atf-c++/detail/process.cpp
+++ b/contrib/atf/atf-c++/detail/process.cpp
@@ -50,10 +50,10 @@ namespace impl = atf::process;
 // ------------------------------------------------------------------------
 
 template< class C >
-atf::utils::auto_array< const char* >
+atf::auto_array< const char* >
 collection_to_argv(const C& c)
 {
-    atf::utils::auto_array< const char* > argv(new const char*[c.size() + 1]);
+    atf::auto_array< const char* > argv(new const char*[c.size() + 1]);
 
     std::size_t pos = 0;
     for (typename C::const_iterator iter = c.begin(); iter != c.end();
diff --git a/contrib/atf/atf-c++/detail/process.hpp b/contrib/atf/atf-c++/detail/process.hpp
index 6e33e0037d8..bc55a5721c7 100644
--- a/contrib/atf/atf-c++/detail/process.hpp
+++ b/contrib/atf/atf-c++/detail/process.hpp
@@ -41,11 +41,10 @@ extern "C" {
 #include <string>
 #include <vector>
 
+#include "auto_array.hpp"
 #include "exceptions.hpp"
 #include "fs.hpp"
 
-#include "../utils.hpp"
-
 namespace atf {
 namespace process {
 
@@ -64,7 +63,7 @@ class argv_array {
     // std::tr1::shared_array instead when it becomes widely available.
     // The reason would be to remove all copy constructors and assignment
     // operators from this class.
-    utils::auto_array< const char* > m_exec_argv;
+    auto_array< const char* > m_exec_argv;
     void ctor_init_exec_argv(void);
 
 public:
diff --git a/contrib/atf/atf-c++/detail/test_helpers.cpp b/contrib/atf/atf-c++/detail/test_helpers.cpp
index 107b45a9403..d13b12467ce 100644
--- a/contrib/atf/atf-c++/detail/test_helpers.cpp
+++ b/contrib/atf/atf-c++/detail/test_helpers.cpp
@@ -27,10 +27,6 @@
 // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-extern "C" {
-#include <regex.h>
-}
-
 #include <fstream>
 #include <iostream>
 #include <string>
@@ -92,43 +88,6 @@ get_process_helpers_path(const atf::tests::tc& tc, bool is_detail)
                ".." / "atf-c" / "detail" / "process_helpers";
 }
 
-bool
-grep_file(const char* name, const char* regex)
-{
-    std::ifstream is(name);
-    ATF_REQUIRE(is);
-
-    bool found = false;
-
-    std::string line;
-    std::getline(is, line);
-    while (!found && is.good()) {
-        if (grep_string(line, regex))
-            found = true;
-        else
-            std::getline(is, line);
-    }
-
-    return found;
-}
-
-bool
-grep_string(const std::string& str, const char* regex)
-{
-    int res;
-    regex_t preg;
-
-    std::cout << "Looking for '" << regex << "' in '" << str << "'\n";
-    ATF_REQUIRE(::regcomp(&preg, regex, REG_EXTENDED) == 0);
-
-    res = ::regexec(&preg, str.c_str(), 0, NULL, 0);
-    ATF_REQUIRE(res == 0 || res == REG_NOMATCH);
-
-    ::regfree(&preg);
-
-    return res == 0;
-}
-
 void
 test_helpers_detail::check_equal(const char* expected[],
                                  const string_vector& actual)
diff --git a/contrib/atf/atf-c++/detail/test_helpers.hpp b/contrib/atf/atf-c++/detail/test_helpers.hpp
index 1f9c41c2fd8..09232ef5ce4 100644
--- a/contrib/atf/atf-c++/detail/test_helpers.hpp
+++ b/contrib/atf/atf-c++/detail/test_helpers.hpp
@@ -87,8 +87,6 @@ class tc;
 void header_check(const char*);
 void build_check_cxx_o(const atf::tests::tc&, const char*, const char*, bool);
 atf::fs::path get_process_helpers_path(const atf::tests::tc&, bool);
-bool grep_file(const char*, const char*);
-bool grep_string(const std::string&, const char*);
 
 struct run_h_tc_data {
     const atf::tests::vars_map& m_config;
diff --git a/contrib/atf/atf-c++/macros_test.cpp b/contrib/atf/atf-c++/macros_test.cpp
index 57e19e0e032..67e41061c8b 100644
--- a/contrib/atf/atf-c++/macros_test.cpp
+++ b/contrib/atf/atf-c++/macros_test.cpp
@@ -38,6 +38,7 @@ extern "C" {
 #include <stdexcept>
 
 #include "macros.hpp"
+#include "utils.hpp"
 
 #include "detail/fs.hpp"
 #include "detail/process.hpp"
@@ -291,7 +292,7 @@ ATF_TEST_CASE_BODY(pass)
 {
     ATF_TEST_CASE_USE(h_pass);
     run_h_tc< ATF_TEST_CASE_NAME(h_pass) >();
-    ATF_REQUIRE(grep_file("result", "^passed"));
+    ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
     ATF_REQUIRE(atf::fs::exists(atf::fs::path("before")));
     ATF_REQUIRE(!atf::fs::exists(atf::fs::path("after")));
 }
@@ -305,7 +306,7 @@ ATF_TEST_CASE_BODY(fail)
 {
     ATF_TEST_CASE_USE(h_fail);
     run_h_tc< ATF_TEST_CASE_NAME(h_fail) >();
-    ATF_REQUIRE(grep_file("result", "^failed: Failed on purpose"));
+    ATF_REQUIRE(atf::utils::grep_file("^failed: Failed on purpose", "result"));
     ATF_REQUIRE(atf::fs::exists(atf::fs::path("before")));
     ATF_REQUIRE(!atf::fs::exists(atf::fs::path("after")));
 }
@@ -319,7 +320,8 @@ ATF_TEST_CASE_BODY(skip)
 {
     ATF_TEST_CASE_USE(h_skip);
     run_h_tc< ATF_TEST_CASE_NAME(h_skip) >();
-    ATF_REQUIRE(grep_file("result", "^skipped: Skipped on purpose"));
+    ATF_REQUIRE(atf::utils::grep_file("^skipped: Skipped on purpose",
+        "result"));
     ATF_REQUIRE(atf::fs::exists(atf::fs::path("before")));
     ATF_REQUIRE(!atf::fs::exists(atf::fs::path("after")));
 }
@@ -354,10 +356,11 @@ ATF_TEST_CASE_BODY(require)
 
         ATF_REQUIRE(atf::fs::exists(before));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
             ATF_REQUIRE(atf::fs::exists(after));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed: .*condition not met"));
+            ATF_REQUIRE(atf::utils::grep_file(
+                "^failed: .*condition not met", "result"));
             ATF_REQUIRE(!atf::fs::exists(after));
         }
 
@@ -403,10 +406,10 @@ ATF_TEST_CASE_BODY(require_eq)
 
         ATF_REQUIRE(atf::fs::exists(before));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
             ATF_REQUIRE(atf::fs::exists(after));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed: .*v1 != v2"));
+            ATF_REQUIRE(atf::utils::grep_file("^failed: .*v1 != v2", "result"));
             ATF_REQUIRE(!atf::fs::exists(after));
         }
 
@@ -448,10 +451,10 @@ ATF_TEST_CASE_BODY(require_in)
 
         ATF_REQUIRE(atf::fs::exists(before));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
             ATF_REQUIRE(atf::fs::exists(after));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed: "));
+            ATF_REQUIRE(atf::utils::grep_file("^failed: ", "result"));
             ATF_REQUIRE(!atf::fs::exists(after));
         }
 
@@ -495,10 +498,10 @@ ATF_TEST_CASE_BODY(require_match)
 
         ATF_REQUIRE(atf::fs::exists(before));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
             ATF_REQUIRE(atf::fs::exists(after));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed: "));
+            ATF_REQUIRE(atf::utils::grep_file("^failed: ", "result"));
             ATF_REQUIRE(!atf::fs::exists(after));
         }
 
@@ -540,10 +543,10 @@ ATF_TEST_CASE_BODY(require_not_in)
 
         ATF_REQUIRE(atf::fs::exists(before));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
             ATF_REQUIRE(atf::fs::exists(after));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed: "));
+            ATF_REQUIRE(atf::utils::grep_file("^failed: ", "result"));
             ATF_REQUIRE(!atf::fs::exists(after));
         }
 
@@ -586,13 +589,13 @@ ATF_TEST_CASE_BODY(require_throw)
 
         ATF_REQUIRE(atf::fs::exists(before));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
             ATF_REQUIRE(atf::fs::exists(after));
         } else {
             std::cout << "Checking that message contains '" << t->msg
                       << "'\n";
             std::string exp_result = std::string("^failed: .*") + t->msg;
-            ATF_REQUIRE(grep_file("result", exp_result.c_str()));
+            ATF_REQUIRE(atf::utils::grep_file(exp_result.c_str(), "result"));
             ATF_REQUIRE(!atf::fs::exists(after));
         }
 
@@ -638,13 +641,13 @@ ATF_TEST_CASE_BODY(require_throw_re)
 
         ATF_REQUIRE(atf::fs::exists(before));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
             ATF_REQUIRE(atf::fs::exists(after));
         } else {
             std::cout << "Checking that message contains '" << t->msg
                       << "'\n";
             std::string exp_result = std::string("^failed: .*") + t->msg;
-            ATF_REQUIRE(grep_file("result", exp_result.c_str()));
+            ATF_REQUIRE(atf::utils::grep_file(exp_result.c_str(), "result"));
             ATF_REQUIRE(!atf::fs::exists(after));
         }
 
@@ -688,13 +691,13 @@ ATF_TEST_CASE_BODY(check_errno)
         ATF_REQUIRE(atf::fs::exists(after));
 
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed"));
+            ATF_REQUIRE(atf::utils::grep_file("^failed", "result"));
 
             std::string exp_result = "macros_test.cpp:[0-9]+: " +
                 std::string(t->msg) + "$";
-            ATF_REQUIRE(grep_file("stderr", exp_result.c_str()));
+            ATF_REQUIRE(atf::utils::grep_file(exp_result.c_str(), "stderr"));
         }
 
         atf::fs::remove(before);
@@ -734,12 +737,12 @@ ATF_TEST_CASE_BODY(require_errno)
 
         ATF_REQUIRE(atf::fs::exists(before));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf::utils::grep_file("^passed", "result"));
             ATF_REQUIRE(atf::fs::exists(after));
         } else {
             std::string exp_result = "^failed: .*macros_test.cpp:[0-9]+: " +
                 std::string(t->msg) + "$";
-            ATF_REQUIRE(grep_file("result", exp_result.c_str()));
+            ATF_REQUIRE(atf::utils::grep_file(exp_result.c_str(), "result"));
 
             ATF_REQUIRE(!atf::fs::exists(after));
         }
diff --git a/contrib/atf/atf-run/fs.hpp b/contrib/atf/atf-c++/noncopyable.hpp
similarity index 65%
rename from contrib/atf/atf-run/fs.hpp
rename to contrib/atf/atf-c++/noncopyable.hpp
index 37382684b57..a885a668cb1 100644
--- a/contrib/atf/atf-run/fs.hpp
+++ b/contrib/atf/atf-c++/noncopyable.hpp
@@ -27,31 +27,30 @@
 // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#if !defined(_ATF_RUN_FS_HPP_)
-#define _ATF_RUN_FS_HPP_
-
-#include <memory>
-
-#include "atf-c++/detail/fs.hpp"
+#if !defined(_ATF_CXX_NONCOPYABLE_HPP_)
+#define _ATF_CXX_NONCOPYABLE_HPP_
 
 namespace atf {
-namespace atf_run {
 
-class temp_dir {
-    std::auto_ptr< atf::fs::path > m_path;
+// ------------------------------------------------------------------------
+// The "noncopyable" class.
+// ------------------------------------------------------------------------
 
-public:
-    temp_dir(const atf::fs::path&);
-    ~temp_dir(void);
+class noncopyable {
+    // The class cannot be empty; otherwise we get ABI-stability warnings
+    // during the build, which will break it due to strict checking.
+    int m_noncopyable_dummy;
 
-    const atf::fs::path& get_path(void) const;
+    noncopyable(const noncopyable& nc);
+    noncopyable& operator=(const noncopyable& nc);
+
+protected:
+    // Explicitly needed to provide some non-private functions.  Otherwise
+    // we also get some warnings during the build.
+    noncopyable(void) {}
+    ~noncopyable(void) {}
 };
 
-atf::fs::path change_directory(const atf::fs::path&);
-void cleanup(const atf::fs::path&);
-atf::fs::path get_current_dir(void);
-
-} // namespace atf_run
 } // namespace atf
 
-#endif // !defined(_ATF_RUN_FS_HPP_)
+#endif // !defined(_ATF_CXX_NONCOPYABLE_HPP_)
diff --git a/contrib/atf/atf-c++/pkg_config_test.sh b/contrib/atf/atf-c++/pkg_config_test.sh
index 8409902c0fd..d99f0104f6c 100644
--- a/contrib/atf/atf-c++/pkg_config_test.sh
+++ b/contrib/atf/atf-c++/pkg_config_test.sh
@@ -59,7 +59,7 @@ atf_test_case version
 version_head()
 {
     atf_set "descr" "Checks that the version in atf-c++ is correct"
-    atf_set "require.progs" "pkg-config"
+    atf_set "require.progs" "atf-version pkg-config"
 }
 version_body()
 {
diff --git a/contrib/atf/atf-c++/tests.cpp b/contrib/atf/atf-c++/tests.cpp
index cdc0dfbad4f..2c351fcb3db 100644
--- a/contrib/atf/atf-c++/tests.cpp
+++ b/contrib/atf/atf-c++/tests.cpp
@@ -55,9 +55,11 @@ extern "C" {
 #include "atf-c/utils.h"
 }
 
+#include "noncopyable.hpp"
 #include "tests.hpp"
 
 #include "detail/application.hpp"
+#include "detail/auto_array.hpp"
 #include "detail/env.hpp"
 #include "detail/exceptions.hpp"
 #include "detail/fs.hpp"
@@ -127,7 +129,7 @@ detail::match(const std::string& regexp, const std::string& str)
 static std::map< atf_tc_t*, impl::tc* > wraps;
 static std::map< const atf_tc_t*, const impl::tc* > cwraps;
 
-struct impl::tc_impl : atf::utils::noncopyable {
+struct impl::tc_impl : atf::noncopyable {
     std::string m_ident;
     atf_tc_t m_tc;
     bool m_has_cleanup;
@@ -190,8 +192,7 @@ impl::tc::init(const vars_map& config)
 {
     atf_error_t err;
 
-    utils::auto_array< const char * > array(
-        new const char*[(config.size() * 2) + 1]);
+    auto_array< const char * > array(new const char*[(config.size() * 2) + 1]);
     const char **ptr = array.get();
     for (vars_map::const_iterator iter = config.begin();
          iter != config.end(); iter++) {
diff --git a/contrib/atf/atf-c++/tests.hpp b/contrib/atf/atf-c++/tests.hpp
index af75229d3b8..22a2a8706a9 100644
--- a/contrib/atf/atf-c++/tests.hpp
+++ b/contrib/atf/atf-c++/tests.hpp
@@ -38,7 +38,7 @@ extern "C" {
 #include <atf-c/defs.h>
 }
 
-#include <atf-c++/utils.hpp>
+#include <atf-c++/noncopyable.hpp>
 
 namespace atf {
 namespace tests {
@@ -74,7 +74,7 @@ typedef std::map< std::string, std::string > vars_map;
 
 struct tc_impl;
 
-class tc : utils::noncopyable {
+class tc : noncopyable {
     std::auto_ptr< tc_impl > pimpl;
 
 protected:
diff --git a/contrib/atf/atf-c++/utils.cpp b/contrib/atf/atf-c++/utils.cpp
new file mode 100644
index 00000000000..cc338bb8923
--- /dev/null
+++ b/contrib/atf/atf-c++/utils.cpp
@@ -0,0 +1,104 @@
+//
+// Automated Testing Framework (atf)
+//
+// 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.
+//
+
+extern "C" {
+#include "atf-c/utils.h"
+}
+
+#include <cstdlib>
+#include <iostream>
+
+#include "utils.hpp"
+
+void
+atf::utils::cat_file(const std::string& path, const std::string& prefix)
+{
+    atf_utils_cat_file(path.c_str(), prefix.c_str());
+}
+
+void
+atf::utils::copy_file(const std::string& source, const std::string& destination)
+{
+    atf_utils_copy_file(source.c_str(), destination.c_str());
+}
+
+bool
+atf::utils::compare_file(const std::string& path, const std::string& contents)
+{
+    return atf_utils_compare_file(path.c_str(), contents.c_str());
+}
+
+void
+atf::utils::create_file(const std::string& path, const std::string& contents)
+{
+    atf_utils_create_file(path.c_str(), "%s", contents.c_str());
+}
+
+bool
+atf::utils::file_exists(const std::string& path)
+{
+    return atf_utils_file_exists(path.c_str());
+}
+
+pid_t
+atf::utils::fork(void)
+{
+    std::cout.flush();
+    std::cerr.flush();
+    return atf_utils_fork();
+}
+
+bool
+atf::utils::grep_file(const std::string& regex, const std::string& path)
+{
+    return atf_utils_grep_file("%s", path.c_str(), regex.c_str());
+}
+
+bool
+atf::utils::grep_string(const std::string& regex, const std::string& str)
+{
+    return atf_utils_grep_string("%s", str.c_str(), regex.c_str());
+}
+
+void
+atf::utils::redirect(const int fd, const std::string& path)
+{
+    if (fd == STDOUT_FILENO)
+        std::cout.flush();
+    else if (fd == STDERR_FILENO)
+        std::cerr.flush();
+    atf_utils_redirect(fd, path.c_str());
+}
+
+void
+atf::utils::wait(const pid_t pid, const int exitstatus,
+                 const std::string& expout, const std::string& experr)
+{
+    atf_utils_wait(pid, exitstatus, expout.c_str(), experr.c_str());
+}
diff --git a/contrib/atf/atf-c++/utils.hpp b/contrib/atf/atf-c++/utils.hpp
index 1858b7f8e1e..b8596aecdc0 100644
--- a/contrib/atf/atf-c++/utils.hpp
+++ b/contrib/atf/atf-c++/utils.hpp
@@ -30,170 +30,38 @@
 #if !defined(_ATF_CXX_UTILS_HPP_)
 #define _ATF_CXX_UTILS_HPP_
 
-#include <cstddef>
+extern "C" {
+#include <unistd.h>
+}
+
+#include <string>
 
 namespace atf {
 namespace utils {
 
-// ------------------------------------------------------------------------
-// The "auto_array" class.
-// ------------------------------------------------------------------------
+void cat_file(const std::string&, const std::string&);
+bool compare_file(const std::string&, const std::string&);
+void copy_file(const std::string&, const std::string&);
+void create_file(const std::string&, const std::string&);
+bool file_exists(const std::string&);
+pid_t fork(void);
+bool grep_file(const std::string&, const std::string&);
+bool grep_string(const std::string&, const std::string&);
+void redirect(const int, const std::string&);
+void wait(const pid_t, const int, const std::string&, const std::string&);
 
-template< class T >
-struct auto_array_ref {
-    T* m_ptr;
-
-    explicit auto_array_ref(T*);
-};
-
-template< class T >
-auto_array_ref< T >::auto_array_ref(T* ptr) :
-    m_ptr(ptr)
+template< typename Collection >
+bool
+grep_collection(const std::string& regexp, const Collection& collection)
 {
-}
-
-template< class T >
-class auto_array {
-    T* m_ptr;
-
-public:
-    auto_array(T* = NULL) throw();
-    auto_array(auto_array< T >&) throw();
-    auto_array(auto_array_ref< T >) throw();
-    ~auto_array(void) throw();
-
-    T* get(void) throw();
-    const T* get(void) const throw();
-    T* release(void) throw();
-    void reset(T* = NULL) throw();
-
-    auto_array< T >& operator=(auto_array< T >&) throw();
-    auto_array< T >& operator=(auto_array_ref< T >) throw();
-
-    T& operator[](int) throw();
-    operator auto_array_ref< T >(void) throw();
-};
-
-template< class T >
-auto_array< T >::auto_array(T* ptr)
-    throw() :
-    m_ptr(ptr)
-{
-}
-
-template< class T >
-auto_array< T >::auto_array(auto_array< T >& ptr)
-    throw() :
-    m_ptr(ptr.release())
-{
-}
-
-template< class T >
-auto_array< T >::auto_array(auto_array_ref< T > ref)
-    throw() :
-    m_ptr(ref.m_ptr)
-{
-}
-
-template< class T >
-auto_array< T >::~auto_array(void)
-    throw()
-{
-    if (m_ptr != NULL)
-        delete [] m_ptr;
-}
-
-template< class T >
-T*
-auto_array< T >::get(void)
-    throw()
-{
-    return m_ptr;
-}
-
-template< class T >
-const T*
-auto_array< T >::get(void)
-    const throw()
-{
-    return m_ptr;
-}
-
-template< class T >
-T*
-auto_array< T >::release(void)
-    throw()
-{
-    T* ptr = m_ptr;
-    m_ptr = NULL;
-    return ptr;
-}
-
-template< class T >
-void
-auto_array< T >::reset(T* ptr)
-    throw()
-{
-    if (m_ptr != NULL)
-        delete [] m_ptr;
-    m_ptr = ptr;
-}
-
-template< class T >
-auto_array< T >&
-auto_array< T >::operator=(auto_array< T >& ptr)
-    throw()
-{
-    reset(ptr.release());
-    return *this;
-}
-
-template< class T >
-auto_array< T >&
-auto_array< T >::operator=(auto_array_ref< T > ref)
-    throw()
-{
-    if (m_ptr != ref.m_ptr) {
-        delete [] m_ptr;
-        m_ptr = ref.m_ptr;
+    for (typename Collection::const_iterator iter = collection.begin();
+         iter != collection.end(); ++iter) {
+        if (grep_string(regexp, *iter))
+            return true;
     }
-    return *this;
+    return false;
 }
 
-template< class T >
-T&
-auto_array< T >::operator[](int pos)
-    throw()
-{
-    return m_ptr[pos];
-}
-
-template< class T >
-auto_array< T >::operator auto_array_ref< T >(void)
-    throw()
-{
-    return auto_array_ref< T >(release());
-}
-
-// ------------------------------------------------------------------------
-// The "noncopyable" class.
-// ------------------------------------------------------------------------
-
-class noncopyable {
-    // The class cannot be empty; otherwise we get ABI-stability warnings
-    // during the build, which will break it due to strict checking.
-    int m_noncopyable_dummy;
-
-    noncopyable(const noncopyable& nc);
-    noncopyable& operator=(const noncopyable& nc);
-
-protected:
-    // Explicitly needed to provide some non-private functions.  Otherwise
-    // we also get some warnings during the build.
-    noncopyable(void) {}
-    ~noncopyable(void) {}
-};
-
 } // namespace utils
 } // namespace atf
 
diff --git a/contrib/atf/atf-c++/utils_test.cpp b/contrib/atf/atf-c++/utils_test.cpp
index f75e0a7a1ed..37457ff2b83 100644
--- a/contrib/atf/atf-c++/utils_test.cpp
+++ b/contrib/atf/atf-c++/utils_test.cpp
@@ -27,259 +27,409 @@
 // IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#include <iostream>
+extern "C" {
+#include <sys/stat.h>
+#include <sys/wait.h>
 
-#include "atf-c/defs.h"
+#include <fcntl.h>
+#include <unistd.h>
+}
+
+#include <cstdlib>
+#include <iostream>
+#include <set>
+#include <string>
+#include <vector>
 
 #include "macros.hpp"
 #include "utils.hpp"
 
 #include "detail/test_helpers.hpp"
 
+static std::string
+read_file(const char *path)
+{
+    char buffer[1024];
+
+    const int fd = open(path, O_RDONLY);
+    if (fd == -1)
+        ATF_FAIL("Cannot open " + std::string(path));
+    const ssize_t length = read(fd, buffer, sizeof(buffer) - 1);
+    close(fd);
+    ATF_REQUIRE(length != -1);
+    if (length == sizeof(buffer) - 1)
+        ATF_FAIL("Internal buffer not long enough to read temporary file");
+    ((char *)buffer)[length] = '\0';
+
+    return buffer;
+}
+
 // ------------------------------------------------------------------------
-// Tests for the "auto_array" class.
+// Tests cases for the free functions.
 // ------------------------------------------------------------------------
 
-class test_array {
-public:
-    int m_value;
+ATF_TEST_CASE_WITHOUT_HEAD(cat_file__empty);
+ATF_TEST_CASE_BODY(cat_file__empty)
+{
+    atf::utils::create_file("file.txt", "");
+    atf::utils::redirect(STDOUT_FILENO, "captured.txt");
+    atf::utils::cat_file("file.txt", "PREFIX");
+    std::cout.flush();
+    close(STDOUT_FILENO);
 
-    static ssize_t m_nblocks;
+    ATF_REQUIRE_EQ("", read_file("captured.txt"));
+}
 
-    static
-    atf::utils::auto_array< test_array >
-    do_copy(atf::utils::auto_array< test_array >& ta)
-    {
-        return atf::utils::auto_array< test_array >(ta);
+ATF_TEST_CASE_WITHOUT_HEAD(cat_file__one_line);
+ATF_TEST_CASE_BODY(cat_file__one_line)
+{
+    atf::utils::create_file("file.txt", "This is a single line\n");
+    atf::utils::redirect(STDOUT_FILENO, "captured.txt");
+    atf::utils::cat_file("file.txt", "PREFIX");
+    std::cout.flush();
+    close(STDOUT_FILENO);
+
+    ATF_REQUIRE_EQ("PREFIXThis is a single line\n", read_file("captured.txt"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(cat_file__several_lines);
+ATF_TEST_CASE_BODY(cat_file__several_lines)
+{
+    atf::utils::create_file("file.txt", "First\nSecond line\nAnd third\n");
+    atf::utils::redirect(STDOUT_FILENO, "captured.txt");
+    atf::utils::cat_file("file.txt", ">");
+    std::cout.flush();
+    close(STDOUT_FILENO);
+
+    ATF_REQUIRE_EQ(">First\n>Second line\n>And third\n",
+                   read_file("captured.txt"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(cat_file__no_newline_eof);
+ATF_TEST_CASE_BODY(cat_file__no_newline_eof)
+{
+    atf::utils::create_file("file.txt", "Foo\n bar baz");
+    atf::utils::redirect(STDOUT_FILENO, "captured.txt");
+    atf::utils::cat_file("file.txt", "PREFIX");
+    std::cout.flush();
+    close(STDOUT_FILENO);
+
+    ATF_REQUIRE_EQ("PREFIXFoo\nPREFIX bar baz", read_file("captured.txt"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(compare_file__empty__match);
+ATF_TEST_CASE_BODY(compare_file__empty__match)
+{
+    atf::utils::create_file("test.txt", "");
+    ATF_REQUIRE(atf::utils::compare_file("test.txt", ""));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(compare_file__empty__not_match);
+ATF_TEST_CASE_BODY(compare_file__empty__not_match)
+{
+    atf::utils::create_file("test.txt", "");
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", "\n"));
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", "foo"));
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", " "));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(compare_file__short__match);
+ATF_TEST_CASE_BODY(compare_file__short__match)
+{
+    atf::utils::create_file("test.txt", "this is a short file");
+    ATF_REQUIRE(atf::utils::compare_file("test.txt", "this is a short file"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(compare_file__short__not_match);
+ATF_TEST_CASE_BODY(compare_file__short__not_match)
+{
+    atf::utils::create_file("test.txt", "this is a short file");
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", ""));
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", "\n"));
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", "this is a Short file"));
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", "this is a short fil"));
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", "this is a short file "));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(compare_file__long__match);
+ATF_TEST_CASE_BODY(compare_file__long__match)
+{
+    char long_contents[3456];
+    size_t i = 0;
+    for (; i < sizeof(long_contents) - 1; i++)
+        long_contents[i] = '0' + (i % 10);
+    long_contents[i] = '\0';
+    atf::utils::create_file("test.txt", long_contents);
+
+    ATF_REQUIRE(atf::utils::compare_file("test.txt", long_contents));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(compare_file__long__not_match);
+ATF_TEST_CASE_BODY(compare_file__long__not_match)
+{
+    char long_contents[3456];
+    size_t i = 0;
+    for (; i < sizeof(long_contents) - 1; i++)
+        long_contents[i] = '0' + (i % 10);
+    long_contents[i] = '\0';
+    atf::utils::create_file("test.txt", long_contents);
+
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", ""));
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", "\n"));
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", "0123456789"));
+    long_contents[i - 1] = 'Z';
+    ATF_REQUIRE(!atf::utils::compare_file("test.txt", long_contents));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(copy_file__empty);
+ATF_TEST_CASE_BODY(copy_file__empty)
+{
+    atf::utils::create_file("src.txt", "");
+    ATF_REQUIRE(chmod("src.txt", 0520) != -1);
+
+    atf::utils::copy_file("src.txt", "dest.txt");
+    ATF_REQUIRE(atf::utils::compare_file("dest.txt", ""));
+    struct stat sb;
+    ATF_REQUIRE(stat("dest.txt", &sb) != -1);
+    ATF_REQUIRE_EQ(0520, sb.st_mode & 0xfff);
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(copy_file__some_contents);
+ATF_TEST_CASE_BODY(copy_file__some_contents)
+{
+    atf::utils::create_file("src.txt", "This is a\ntest file\n");
+    atf::utils::copy_file("src.txt", "dest.txt");
+    ATF_REQUIRE(atf::utils::compare_file("dest.txt", "This is a\ntest file\n"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(create_file);
+ATF_TEST_CASE_BODY(create_file)
+{
+    atf::utils::create_file("test.txt", "This is a %d test");
+
+    ATF_REQUIRE_EQ("This is a %d test", read_file("test.txt"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(file_exists);
+ATF_TEST_CASE_BODY(file_exists)
+{
+    atf::utils::create_file("test.txt", "foo");
+
+    ATF_REQUIRE( atf::utils::file_exists("test.txt"));
+    ATF_REQUIRE( atf::utils::file_exists("./test.txt"));
+    ATF_REQUIRE(!atf::utils::file_exists("./test.tx"));
+    ATF_REQUIRE(!atf::utils::file_exists("test.txt2"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(fork);
+ATF_TEST_CASE_BODY(fork)
+{
+    std::cout << "Should not get into child\n";
+    std::cerr << "Should not get into child\n";
+    pid_t pid = atf::utils::fork();
+    if (pid == 0) {
+        std::cout << "Child stdout\n";
+        std::cerr << "Child stderr\n";
+        exit(EXIT_SUCCESS);
     }
 
-    void* operator new(size_t size ATF_DEFS_ATTRIBUTE_UNUSED)
-    {
-        ATF_FAIL("New called but should have been new[]");
-        return new int(5);
+    int status;
+    ATF_REQUIRE(waitpid(pid, &status, 0) != -1);
+    ATF_REQUIRE(WIFEXITED(status));
+    ATF_REQUIRE_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
+
+    ATF_REQUIRE_EQ("Child stdout\n", read_file("atf_utils_fork_out.txt"));
+    ATF_REQUIRE_EQ("Child stderr\n", read_file("atf_utils_fork_err.txt"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(grep_collection__set);
+ATF_TEST_CASE_BODY(grep_collection__set)
+{
+    std::set< std::string > strings;
+    strings.insert("First");
+    strings.insert("Second");
+
+    ATF_REQUIRE( atf::utils::grep_collection("irs", strings));
+    ATF_REQUIRE( atf::utils::grep_collection("cond", strings));
+    ATF_REQUIRE(!atf::utils::grep_collection("Third", strings));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(grep_collection__vector);
+ATF_TEST_CASE_BODY(grep_collection__vector)
+{
+    std::vector< std::string > strings;
+    strings.push_back("First");
+    strings.push_back("Second");
+
+    ATF_REQUIRE( atf::utils::grep_collection("irs", strings));
+    ATF_REQUIRE( atf::utils::grep_collection("cond", strings));
+    ATF_REQUIRE(!atf::utils::grep_collection("Third", strings));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(grep_file);
+ATF_TEST_CASE_BODY(grep_file)
+{
+    atf::utils::create_file("test.txt", "line1\nthe second line\naaaabbbb\n");
+
+    ATF_REQUIRE(atf::utils::grep_file("line1", "test.txt"));
+    ATF_REQUIRE(atf::utils::grep_file("second line", "test.txt"));
+    ATF_REQUIRE(atf::utils::grep_file("aa.*bb", "test.txt"));
+    ATF_REQUIRE(!atf::utils::grep_file("foo", "test.txt"));
+    ATF_REQUIRE(!atf::utils::grep_file("bar", "test.txt"));
+    ATF_REQUIRE(!atf::utils::grep_file("aaaaa", "test.txt"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(grep_string);
+ATF_TEST_CASE_BODY(grep_string)
+{
+    const char *str = "a string - aaaabbbb";
+    ATF_REQUIRE(atf::utils::grep_string("a string", str));
+    ATF_REQUIRE(atf::utils::grep_string("^a string", str));
+    ATF_REQUIRE(atf::utils::grep_string("aaaabbbb$", str));
+    ATF_REQUIRE(atf::utils::grep_string("aa.*bb", str));
+    ATF_REQUIRE(!atf::utils::grep_string("foo", str));
+    ATF_REQUIRE(!atf::utils::grep_string("bar", str));
+    ATF_REQUIRE(!atf::utils::grep_string("aaaaa", str));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(redirect__stdout);
+ATF_TEST_CASE_BODY(redirect__stdout)
+{
+    std::cout << "Buffer this";
+    atf::utils::redirect(STDOUT_FILENO, "captured.txt");
+    std::cout << "The printed message";
+    std::cout.flush();
+
+    ATF_REQUIRE_EQ("The printed message", read_file("captured.txt"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(redirect__stderr);
+ATF_TEST_CASE_BODY(redirect__stderr)
+{
+    std::cerr << "Buffer this";
+    atf::utils::redirect(STDERR_FILENO, "captured.txt");
+    std::cerr << "The printed message";
+    std::cerr.flush();
+
+    ATF_REQUIRE_EQ("The printed message", read_file("captured.txt"));
+}
+
+ATF_TEST_CASE_WITHOUT_HEAD(redirect__other);
+ATF_TEST_CASE_BODY(redirect__other)
+{
+    const std::string message = "Foo bar\nbaz\n";
+    atf::utils::redirect(15, "captured.txt");
+    ATF_REQUIRE(write(15, message.c_str(), message.length()) != -1);
+    close(15);
+
+    ATF_REQUIRE_EQ(message, read_file("captured.txt"));
+}
+
+static void
+fork_and_wait(const int exitstatus, const char* expout, const char* experr)
+{
+    const pid_t pid = atf::utils::fork();
+    if (pid == 0) {
+        std::cout << "Some output\n";
+        std::cerr << "Some error\n";
+        exit(123);
     }
+    atf::utils::wait(pid, exitstatus, expout, experr);
+    exit(EXIT_SUCCESS);
+}
 
-    void* operator new[](size_t size)
-    {
-        m_nblocks++;
-        void* mem = ::operator new(size);
-        std::cout << "Allocated 'test_array' object " << mem << "\n";
-        return mem;
+ATF_TEST_CASE_WITHOUT_HEAD(wait__ok);
+ATF_TEST_CASE_BODY(wait__ok)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "Some output\n", "Some error\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
     }
+}
 
-    void operator delete(void* mem ATF_DEFS_ATTRIBUTE_UNUSED)
-    {
-        ATF_FAIL("Delete called but should have been delete[]");
+ATF_TEST_CASE_WITHOUT_HEAD(wait__invalid_exitstatus);
+ATF_TEST_CASE_BODY(wait__invalid_exitstatus)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(120, "Some output\n", "Some error\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_FAILURE, WEXITSTATUS(status));
     }
+}
 
-    void operator delete[](void* mem)
-    {
-        std::cout << "Releasing 'test_array' object " << mem << "\n";
-        if (m_nblocks == 0)
-            ATF_FAIL("Unbalanced delete[]");
-        m_nblocks--;
-        ::operator delete(mem);
+ATF_TEST_CASE_WITHOUT_HEAD(wait__invalid_stdout);
+ATF_TEST_CASE_BODY(wait__invalid_stdout)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "Some output foo\n", "Some error\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_FAILURE, WEXITSTATUS(status));
     }
-};
-
-ssize_t test_array::m_nblocks = 0;
-
-ATF_TEST_CASE(auto_array_scope);
-ATF_TEST_CASE_HEAD(auto_array_scope)
-{
-    set_md_var("descr", "Tests the automatic scope handling in the "
-               "auto_array smart pointer class");
 }
-ATF_TEST_CASE_BODY(auto_array_scope)
-{
-    using atf::utils::auto_array;
 
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-    {
-        auto_array< test_array > t(new test_array[10]);
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
+ATF_TEST_CASE_WITHOUT_HEAD(wait__invalid_stderr);
+ATF_TEST_CASE_BODY(wait__invalid_stderr)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "Some output\n", "Some error foo\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_FAILURE, WEXITSTATUS(status));
     }
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
 }
 
-ATF_TEST_CASE(auto_array_copy);
-ATF_TEST_CASE_HEAD(auto_array_copy)
+ATF_TEST_CASE_WITHOUT_HEAD(wait__save_stdout);
+ATF_TEST_CASE_BODY(wait__save_stdout)
 {
-    set_md_var("descr", "Tests the auto_array smart pointer class' copy "
-               "constructor");
-}
-ATF_TEST_CASE_BODY(auto_array_copy)
-{
-    using atf::utils::auto_array;
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "save:my-output.txt", "Some error\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
 
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-    {
-        auto_array< test_array > t1(new test_array[10]);
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-
-        {
-            auto_array< test_array > t2(t1);
-            ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-        }
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+        ATF_REQUIRE(atf::utils::compare_file("my-output.txt", "Some output\n"));
     }
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
 }
 
-ATF_TEST_CASE(auto_array_copy_ref);
-ATF_TEST_CASE_HEAD(auto_array_copy_ref)
+ATF_TEST_CASE_WITHOUT_HEAD(wait__save_stderr);
+ATF_TEST_CASE_BODY(wait__save_stderr)
 {
-    set_md_var("descr", "Tests the auto_array smart pointer class' copy "
-               "constructor through the auxiliary auto_array_ref object");
-}
-ATF_TEST_CASE_BODY(auto_array_copy_ref)
-{
-    using atf::utils::auto_array;
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "Some output\n", "save:my-output.txt");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
 
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-    {
-        auto_array< test_array > t1(new test_array[10]);
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-
-        {
-            auto_array< test_array > t2 = test_array::do_copy(t1);
-            ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-        }
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
+        ATF_REQUIRE(atf::utils::compare_file("my-output.txt", "Some error\n"));
     }
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-}
-
-ATF_TEST_CASE(auto_array_get);
-ATF_TEST_CASE_HEAD(auto_array_get)
-{
-    set_md_var("descr", "Tests the auto_array smart pointer class' get "
-               "method");
-}
-ATF_TEST_CASE_BODY(auto_array_get)
-{
-    using atf::utils::auto_array;
-
-    test_array* ta = new test_array[10];
-    auto_array< test_array > t(ta);
-    ATF_REQUIRE_EQ(t.get(), ta);
-}
-
-ATF_TEST_CASE(auto_array_release);
-ATF_TEST_CASE_HEAD(auto_array_release)
-{
-    set_md_var("descr", "Tests the auto_array smart pointer class' release "
-               "method");
-}
-ATF_TEST_CASE_BODY(auto_array_release)
-{
-    using atf::utils::auto_array;
-
-    test_array* ta1 = new test_array[10];
-    {
-        auto_array< test_array > t(ta1);
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-        test_array* ta2 = t.release();
-        ATF_REQUIRE_EQ(ta2, ta1);
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-    }
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-    delete [] ta1;
-}
-
-ATF_TEST_CASE(auto_array_reset);
-ATF_TEST_CASE_HEAD(auto_array_reset)
-{
-    set_md_var("descr", "Tests the auto_array smart pointer class' reset "
-               "method");
-}
-ATF_TEST_CASE_BODY(auto_array_reset)
-{
-    using atf::utils::auto_array;
-
-    test_array* ta1 = new test_array[10];
-    test_array* ta2 = new test_array[10];
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 2);
-
-    {
-        auto_array< test_array > t(ta1);
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 2);
-        t.reset(ta2);
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-        t.reset();
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-    }
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-}
-
-ATF_TEST_CASE(auto_array_assign);
-ATF_TEST_CASE_HEAD(auto_array_assign)
-{
-    set_md_var("descr", "Tests the auto_array smart pointer class' "
-               "assignment operator");
-}
-ATF_TEST_CASE_BODY(auto_array_assign)
-{
-    using atf::utils::auto_array;
-
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-    {
-        auto_array< test_array > t1(new test_array[10]);
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-
-        {
-            auto_array< test_array > t2;
-            t2 = t1;
-            ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-        }
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-    }
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-}
-
-ATF_TEST_CASE(auto_array_assign_ref);
-ATF_TEST_CASE_HEAD(auto_array_assign_ref)
-{
-    set_md_var("descr", "Tests the auto_array smart pointer class' "
-               "assignment operator through the auxiliary auto_array_ref "
-               "object");
-}
-ATF_TEST_CASE_BODY(auto_array_assign_ref)
-{
-    using atf::utils::auto_array;
-
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-    {
-        auto_array< test_array > t1(new test_array[10]);
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-
-        {
-            auto_array< test_array > t2;
-            t2 = test_array::do_copy(t1);
-            ATF_REQUIRE_EQ(test_array::m_nblocks, 1);
-        }
-        ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-    }
-    ATF_REQUIRE_EQ(test_array::m_nblocks, 0);
-}
-
-ATF_TEST_CASE(auto_array_access);
-ATF_TEST_CASE_HEAD(auto_array_access)
-{
-    set_md_var("descr", "Tests the auto_array smart pointer class' access "
-               "operator");
-}
-ATF_TEST_CASE_BODY(auto_array_access)
-{
-    using atf::utils::auto_array;
-
-    auto_array< test_array > t(new test_array[10]);
-
-    for (int i = 0; i < 10; i++)
-        t[i].m_value = i * 2;
-
-    for (int i = 0; i < 10; i++)
-        ATF_REQUIRE_EQ(t[i].m_value, i * 2);
 }
 
 // ------------------------------------------------------------------------
@@ -294,16 +444,43 @@ HEADER_TC(include, "atf-c++/utils.hpp");
 
 ATF_INIT_TEST_CASES(tcs)
 {
-    // Add the test for the "auto_array" class.
-    ATF_ADD_TEST_CASE(tcs, auto_array_scope);
-    ATF_ADD_TEST_CASE(tcs, auto_array_copy);
-    ATF_ADD_TEST_CASE(tcs, auto_array_copy_ref);
-    ATF_ADD_TEST_CASE(tcs, auto_array_get);
-    ATF_ADD_TEST_CASE(tcs, auto_array_release);
-    ATF_ADD_TEST_CASE(tcs, auto_array_reset);
-    ATF_ADD_TEST_CASE(tcs, auto_array_assign);
-    ATF_ADD_TEST_CASE(tcs, auto_array_assign_ref);
-    ATF_ADD_TEST_CASE(tcs, auto_array_access);
+    // Add the test for the free functions.
+    ATF_ADD_TEST_CASE(tcs, cat_file__empty);
+    ATF_ADD_TEST_CASE(tcs, cat_file__one_line);
+    ATF_ADD_TEST_CASE(tcs, cat_file__several_lines);
+    ATF_ADD_TEST_CASE(tcs, cat_file__no_newline_eof);
+
+    ATF_ADD_TEST_CASE(tcs, compare_file__empty__match);
+    ATF_ADD_TEST_CASE(tcs, compare_file__empty__not_match);
+    ATF_ADD_TEST_CASE(tcs, compare_file__short__match);
+    ATF_ADD_TEST_CASE(tcs, compare_file__short__not_match);
+    ATF_ADD_TEST_CASE(tcs, compare_file__long__match);
+    ATF_ADD_TEST_CASE(tcs, compare_file__long__not_match);
+
+    ATF_ADD_TEST_CASE(tcs, copy_file__empty);
+    ATF_ADD_TEST_CASE(tcs, copy_file__some_contents);
+
+    ATF_ADD_TEST_CASE(tcs, create_file);
+
+    ATF_ADD_TEST_CASE(tcs, file_exists);
+
+    ATF_ADD_TEST_CASE(tcs, fork);
+
+    ATF_ADD_TEST_CASE(tcs, grep_collection__set);
+    ATF_ADD_TEST_CASE(tcs, grep_collection__vector);
+    ATF_ADD_TEST_CASE(tcs, grep_file);
+    ATF_ADD_TEST_CASE(tcs, grep_string);
+
+    ATF_ADD_TEST_CASE(tcs, redirect__stdout);
+    ATF_ADD_TEST_CASE(tcs, redirect__stderr);
+    ATF_ADD_TEST_CASE(tcs, redirect__other);
+
+    ATF_ADD_TEST_CASE(tcs, wait__ok);
+    ATF_ADD_TEST_CASE(tcs, wait__invalid_exitstatus);
+    ATF_ADD_TEST_CASE(tcs, wait__invalid_stdout);
+    ATF_ADD_TEST_CASE(tcs, wait__invalid_stderr);
+    ATF_ADD_TEST_CASE(tcs, wait__save_stdout);
+    ATF_ADD_TEST_CASE(tcs, wait__save_stderr);
 
     // Add the test cases for the header file.
     ATF_ADD_TEST_CASE(tcs, include);
diff --git a/contrib/atf/atf-c.h b/contrib/atf/atf-c.h
index b8b0cd08168..86606df3f9d 100644
--- a/contrib/atf/atf-c.h
+++ b/contrib/atf/atf-c.h
@@ -32,5 +32,6 @@
 
 #include <atf-c/error.h>
 #include <atf-c/macros.h>
+#include <atf-c/utils.h>
 
 #endif /* !defined(ATF_C_H) */
diff --git a/contrib/atf/atf-c/Atffile b/contrib/atf/atf-c/Atffile
deleted file mode 100644
index 522e6f4c519..00000000000
--- a/contrib/atf/atf-c/Atffile
+++ /dev/null
@@ -1,16 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: detail
-
-tp: atf_c_test
-tp: build_test
-tp: check_test
-tp: config_test
-tp: error_test
-tp: macros_test
-tp: pkg_config_test
-tp: tc_test
-tp: tp_test
-tp: utils_test
diff --git a/contrib/atf/atf-c/Makefile.am.inc b/contrib/atf/atf-c/Makefile.am.inc
deleted file mode 100644
index b813ec4bc1d..00000000000
--- a/contrib/atf/atf-c/Makefile.am.inc
+++ /dev/null
@@ -1,157 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-lib_LTLIBRARIES += libatf-c.la
-libatf_c_la_SOURCES = atf-c/build.c \
-                      atf-c/build.h \
-                      atf-c/check.c \
-                      atf-c/check.h \
-                      atf-c/config.c \
-                      atf-c/config.h \
-                      atf-c/error.c \
-                      atf-c/error.h \
-                      atf-c/error_fwd.h \
-                      atf-c/macros.h \
-                      atf-c/tc.c \
-                      atf-c/tc.h \
-                      atf-c/tp.c \
-                      atf-c/tp.h \
-                      atf-c/utils.c \
-                      atf-c/utils.h
-nodist_libatf_c_la_SOURCES = atf-c/defs.h
-libatf_c_la_CPPFLAGS = "-DATF_ARCH=\"$(atf_arch)\"" \
-                       "-DATF_BUILD_CC=\"$(ATF_BUILD_CC)\"" \
-                       "-DATF_BUILD_CFLAGS=\"$(ATF_BUILD_CFLAGS)\"" \
-                       "-DATF_BUILD_CPP=\"$(ATF_BUILD_CPP)\"" \
-                       "-DATF_BUILD_CPPFLAGS=\"$(ATF_BUILD_CPPFLAGS)\"" \
-                       "-DATF_BUILD_CXX=\"$(ATF_BUILD_CXX)\"" \
-                       "-DATF_BUILD_CXXFLAGS=\"$(ATF_BUILD_CXXFLAGS)\"" \
-                       "-DATF_CONFDIR=\"$(atf_confdir)\"" \
-                       "-DATF_INCLUDEDIR=\"$(includedir)\"" \
-                       "-DATF_LIBDIR=\"$(libdir)\"" \
-                       "-DATF_LIBEXECDIR=\"$(libexecdir)\"" \
-                       "-DATF_MACHINE=\"$(atf_machine)\"" \
-                       "-DATF_M4=\"$(ATF_M4)\"" \
-                       "-DATF_PKGDATADIR=\"$(pkgdatadir)\"" \
-                       "-DATF_SHELL=\"$(ATF_SHELL)\"" \
-                       "-DATF_WORKDIR=\"$(ATF_WORKDIR)\"" \
-                       -I$(srcdir)/atf-c
-libatf_c_la_LDFLAGS = -version-info 0:0:0
-
-# XXX For some reason, the nodist line above does not work as expected.
-# Work this problem around.
-dist-hook: kill-defs-h
-kill-defs-h:
-	rm -f $(distdir)/atf-c/defs.h
-
-include_HEADERS += atf-c.h
-atf_c_HEADERS = atf-c/build.h \
-                atf-c/check.h \
-                atf-c/config.h \
-                atf-c/defs.h \
-                atf-c/error.h \
-                atf-c/error_fwd.h \
-                atf-c/macros.h \
-                atf-c/tc.h \
-                atf-c/tp.h \
-                atf-c/utils.h
-atf_cdir = $(includedir)/atf-c
-
-dist_man_MANS += atf-c/atf-c-api.3
-
-atf_aclocal_DATA += atf-c/atf-common.m4 atf-c/atf-c.m4
-EXTRA_DIST += atf-c/atf-common.m4 atf-c/atf-c.m4
-
-atf_cpkgconfigdir = $(atf_pkgconfigdir)
-atf_cpkgconfig_DATA = atf-c/atf-c.pc
-CLEANFILES += atf-c/atf-c.pc
-EXTRA_DIST += atf-c/atf-c.pc.in
-atf-c/atf-c.pc: $(srcdir)/atf-c/atf-c.pc.in Makefile
-	test -d atf-c || mkdir -p atf-c
-	sed -e 's#__ATF_VERSION__#$(PACKAGE_VERSION)#g' \
-	    -e 's#__CC__#$(CC)#g' \
-	    -e 's#__INCLUDEDIR__#$(includedir)#g' \
-	    -e 's#__LIBDIR__#$(libdir)#g' \
-	    <$(srcdir)/atf-c/atf-c.pc.in >atf-c/atf-c.pc.tmp
-	mv atf-c/atf-c.pc.tmp atf-c/atf-c.pc
-
-tests_atf_c_DATA = atf-c/Atffile \
-                   atf-c/Kyuafile \
-                   atf-c/macros_h_test.c \
-                   atf-c/unused_test.c
-tests_atf_cdir = $(pkgtestsdir)/atf-c
-EXTRA_DIST += $(tests_atf_c_DATA)
-
-tests_atf_c_PROGRAMS = atf-c/atf_c_test
-atf_c_atf_c_test_SOURCES = atf-c/atf_c_test.c
-atf_c_atf_c_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_PROGRAMS += atf-c/build_test
-atf_c_build_test_SOURCES = atf-c/build_test.c atf-c/h_build.h
-atf_c_build_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_PROGRAMS += atf-c/check_test
-atf_c_check_test_SOURCES = atf-c/check_test.c
-atf_c_check_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_PROGRAMS += atf-c/config_test
-atf_c_config_test_SOURCES = atf-c/config_test.c
-atf_c_config_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_PROGRAMS += atf-c/error_test
-atf_c_error_test_SOURCES = atf-c/error_test.c
-atf_c_error_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_PROGRAMS += atf-c/macros_test
-atf_c_macros_test_SOURCES = atf-c/macros_test.c
-atf_c_macros_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_SCRIPTS = atf-c/pkg_config_test
-CLEANFILES += atf-c/pkg_config_test
-EXTRA_DIST += atf-c/pkg_config_test.sh
-atf-c/pkg_config_test: $(srcdir)/atf-c/pkg_config_test.sh
-	test -d atf-c || mkdir -p atf-c
-	@src="$(srcdir)/atf-c/pkg_config_test.sh"; \
-	dst="atf-c/pkg_config_test"; $(BUILD_SH_TP)
-
-tests_atf_c_PROGRAMS += atf-c/tc_test
-atf_c_tc_test_SOURCES = atf-c/tc_test.c
-atf_c_tc_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_PROGRAMS += atf-c/tp_test
-atf_c_tp_test_SOURCES = atf-c/tp_test.c
-atf_c_tp_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_PROGRAMS += atf-c/utils_test
-atf_c_utils_test_SOURCES = atf-c/utils_test.c atf-c/h_build.h
-atf_c_utils_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-include atf-c/detail/Makefile.am.inc
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/atf-c/atf-c-api.3 b/contrib/atf/atf-c/atf-c-api.3
index 548db4f9f71..366caec79c8 100644
--- a/contrib/atf/atf-c/atf-c-api.3
+++ b/contrib/atf/atf-c/atf-c-api.3
@@ -26,14 +26,17 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd December 26, 2010
+.Dd November 15, 2013
 .Dt ATF-C-API 3
 .Os
 .Sh NAME
+.Nm atf-c-api ,
 .Nm ATF_CHECK ,
 .Nm ATF_CHECK_MSG ,
 .Nm ATF_CHECK_EQ ,
 .Nm ATF_CHECK_EQ_MSG ,
+.Nm ATF_CHECK_MATCH ,
+.Nm ATF_CHECK_MATCH_MSG ,
 .Nm ATF_CHECK_STREQ ,
 .Nm ATF_CHECK_STREQ_MSG ,
 .Nm ATF_CHECK_ERRNO ,
@@ -41,6 +44,8 @@
 .Nm ATF_REQUIRE_MSG ,
 .Nm ATF_REQUIRE_EQ ,
 .Nm ATF_REQUIRE_EQ_MSG ,
+.Nm ATF_REQUIRE_MATCH ,
+.Nm ATF_REQUIRE_MATCH_MSG ,
 .Nm ATF_REQUIRE_STREQ ,
 .Nm ATF_REQUIRE_STREQ_MSG ,
 .Nm ATF_REQUIRE_ERRNO ,
@@ -72,7 +77,19 @@
 .Nm atf_tc_fail ,
 .Nm atf_tc_fail_nonfatal ,
 .Nm atf_tc_pass ,
-.Nm atf_tc_skip
+.Nm atf_tc_skip ,
+.Nm atf_utils_cat_file ,
+.Nm atf_utils_compare_file ,
+.Nm atf_utils_copy_file ,
+.Nm atf_utils_create_file ,
+.Nm atf_utils_file_exists ,
+.Nm atf_utils_fork ,
+.Nm atf_utils_free_charpp ,
+.Nm atf_utils_grep_file ,
+.Nm atf_utils_grep_string ,
+.Nm atf_utils_readline ,
+.Nm atf_utils_redirect ,
+.Nm atf_utils_wait
 .Nd C API to write ATF-based test programs
 .Sh SYNOPSIS
 .In atf-c.h
@@ -80,6 +97,8 @@
 .Fn ATF_CHECK_MSG "expression" "fail_msg_fmt" ...
 .Fn ATF_CHECK_EQ "expression_1" "expression_2"
 .Fn ATF_CHECK_EQ_MSG "expression_1" "expression_2" "fail_msg_fmt" ...
+.Fn ATF_CHECK_MATCH "regexp" "string"
+.Fn ATF_CHECK_MATCH_MSG "regexp" "string" "fail_msg_fmt" ...
 .Fn ATF_CHECK_STREQ "string_1" "string_2"
 .Fn ATF_CHECK_STREQ_MSG "string_1" "string_2" "fail_msg_fmt" ...
 .Fn ATF_CHECK_ERRNO "exp_errno" "bool_expression"
@@ -87,6 +106,8 @@
 .Fn ATF_REQUIRE_MSG "expression" "fail_msg_fmt" ...
 .Fn ATF_REQUIRE_EQ "expression_1" "expression_2"
 .Fn ATF_REQUIRE_EQ_MSG "expression_1" "expression_2" "fail_msg_fmt" ...
+.Fn ATF_REQUIRE_MATCH "regexp" "string"
+.Fn ATF_REQUIRE_MATCH_MSG "regexp" "string" "fail_msg_fmt" ...
 .Fn ATF_REQUIRE_STREQ "string_1" "string_2"
 .Fn ATF_REQUIRE_STREQ_MSG "string_1" "string_2" "fail_msg_fmt" ...
 .Fn ATF_REQUIRE_ERRNO "exp_errno" "bool_expression"
@@ -119,10 +140,70 @@
 .Fn atf_tc_fail_nonfatal "reason"
 .Fn atf_tc_pass
 .Fn atf_tc_skip "reason"
+.Ft void
+.Fo atf_utils_cat_file
+.Fa "const char *file"
+.Fa "const char *prefix"
+.Fc
+.Ft bool
+.Fo atf_utils_compare_file
+.Fa "const char *file"
+.Fa "const char *contents"
+.Fc
+.Ft void
+.Fo atf_utils_copy_file
+.Fa "const char *source"
+.Fa "const char *destination"
+.Fc
+.Ft void
+.Fo atf_utils_create_file
+.Fa "const char *file"
+.Fa "const char *contents"
+.Fa "..."
+.Fc
+.Ft void
+.Fo atf_utils_file_exists
+.Fa "const char *file"
+.Fc
+.Ft pid_t
+.Fo atf_utils_fork
+.Fa "void"
+.Fc
+.Ft void
+.Fo atf_utils_free_charpp
+.Fa "char **argv"
+.Fc
+.Ft bool
+.Fo atf_utils_grep_file
+.Fa "const char *regexp"
+.Fa "const char *file"
+.Fa "..."
+.Fc
+.Ft bool
+.Fo atf_utils_grep_string
+.Fa "const char *regexp"
+.Fa "const char *str"
+.Fa "..."
+.Fc
+.Ft char *
+.Fo atf_utils_readline
+.Fa "int fd"
+.Fc
+.Ft void
+.Fo atf_utils_redirect
+.Fa "const int fd"
+.Fa "const char *file"
+.Fc
+.Ft void
+.Fo atf_utils_wait
+.Fa "const pid_t pid"
+.Fa "const int expected_exit_status"
+.Fa "const char *expected_stdout"
+.Fa "const char *expected_stderr"
+.Fc
 .Sh DESCRIPTION
-The ATF
-.Pp
-C-based test programs always follow this template:
+ATF provides a C programming interface to implement test programs.
+C-based test programs follow this template:
 .Bd -literal -offset indent
 .Ns ... C-specific includes go here ...
 
@@ -382,7 +463,7 @@ variant of the macros immediately abort the test case as soon as an error
 condition is detected by calling the
 .Fn atf_tc_fail
 function.
-Use this variant whenever it makes now sense to continue the execution of a
+Use this variant whenever it makes no sense to continue the execution of a
 test case when the checked condition is not met.
 The
 .Sq CHECK
@@ -417,6 +498,16 @@ and
 .Fn ATF_REQUIRE_EQ_MSG
 take two expressions and fail if the two evaluated values are not equal.
 .Pp
+.Fn ATF_CHECK_MATCH ,
+.Fn ATF_CHECK_MATCH_MSG ,
+.Fn ATF_REQUIRE_MATCH
+and
+.Fn ATF_REQUIRE_MATCH_MSG
+take a regular expression and a string and fail if the regular expression does
+not match the given string.
+Note that the regular expression is not anchored, so it will match anywhere in
+the string.
+.Pp
 .Fn ATF_CHECK_STREQ ,
 .Fn ATF_CHECK_STREQ_MSG ,
 .Fn ATF_REQUIRE_STREQ
@@ -433,6 +524,180 @@ variable and, second, a boolean expression that, if evaluates to true,
 means that a call failed and
 .Va errno
 has to be checked against the first value.
+.Ss Utility functions
+The following functions are provided as part of the
+.Nm
+API to simplify the creation of a variety of tests.
+In particular, these are useful to write tests for command-line interfaces.
+.Pp
+.Ft void
+.Fo atf_utils_cat_file
+.Fa "const char *file"
+.Fa "const char *prefix"
+.Fc
+.Bd -ragged -offset indent
+Prints the contents of
+.Fa file
+to the standard output, prefixing every line with the string in
+.Fa prefix .
+.Ed
+.Pp
+.Ft bool
+.Fo atf_utils_compare_file
+.Fa "const char *file"
+.Fa "const char *contents"
+.Fc
+.Bd -ragged -offset indent
+Returns true if the given
+.Fa file
+matches exactly the expected inlined
+.Fa contents .
+.Ed
+.Pp
+.Ft void
+.Fo atf_utils_copy_file
+.Fa "const char *source"
+.Fa "const char *destination"
+.Fc
+.Bd -ragged -offset indent
+Copies the file
+.Fa source
+to
+.Fa destination .
+The permissions of the file are preserved during the code.
+.Ed
+.Pp
+.Ft void
+.Fo atf_utils_create_file
+.Fa "const char *file"
+.Fa "const char *contents"
+.Fa "..."
+.Fc
+.Bd -ragged -offset indent
+Creates
+.Fa file
+with the text given in
+.Fa contents ,
+which is a formatting string that uses the rest of the variable arguments.
+.Ed
+.Pp
+.Ft void
+.Fo atf_utils_file_exists
+.Fa "const char *file"
+.Fc
+.Bd -ragged -offset indent
+Checks if
+.Fa file
+exists.
+.Ed
+.Pp
+.Ft pid_t
+.Fo atf_utils_fork
+.Fa "void"
+.Fc
+.Bd -ragged -offset indent
+Forks a process and redirects the standard output and standard error of the
+child to files for later validation with
+.Fn atf_utils_wait .
+Fails the test case if the fork fails, so this does not return an error.
+.Ed
+.Pp
+.Ft void
+.Fo atf_utils_free_charpp
+.Fa "char **argv"
+.Fc
+.Bd -ragged -offset indent
+Frees a dynamically-allocated array of dynamically-allocated strings.
+.Ed
+.Pp
+.Ft bool
+.Fo atf_utils_grep_file
+.Fa "const char *regexp"
+.Fa "const char *file"
+.Fa "..."
+.Fc
+.Bd -ragged -offset indent
+Searches for the
+.Fa regexp ,
+which is a formatting string representing the regular expression,
+in the
+.Fa file .
+The variable arguments are used to construct the regular expression.
+.Ed
+.Pp
+.Ft bool
+.Fo atf_utils_grep_string
+.Fa "const char *regexp"
+.Fa "const char *str"
+.Fa "..."
+.Fc
+.Bd -ragged -offset indent
+Searches for the
+.Fa regexp ,
+which is a formatting string representing the regular expression,
+in the literal string
+.Fa str .
+The variable arguments are used to construct the regular expression.
+.Ed
+.Pp
+.Ft char *
+.Fo atf_utils_readline
+.Fa "int fd"
+.Fc
+.Bd -ragged -offset indent
+Reads a line from the file descriptor
+.Fa fd .
+The line, if any, is returned as a dynamically-allocated buffer that must be
+released with
+.Xr free 3 .
+If there was nothing to read, returns
+.Sq NULL .
+.Ed
+.Pp
+.Ft void
+.Fo atf_utils_redirect
+.Fa "const int fd"
+.Fa "const char *file"
+.Fc
+.Bd -ragged -offset indent
+Redirects the given file descriptor
+.Fa fd
+to
+.Fa file .
+This function exits the process in case of an error and does not properly mark
+the test case as failed.
+As a result, it should only be used in subprocesses of the test case; specially
+those spawned by
+.Fn atf_utils_fork .
+.Ed
+.Pp
+.Ft void
+.Fo atf_utils_wait
+.Fa "const pid_t pid"
+.Fa "const int expected_exit_status"
+.Fa "const char *expected_stdout"
+.Fa "const char *expected_stderr"
+.Fc
+.Bd -ragged -offset indent
+Waits and validates the result of a subprocess spawned with
+.Fn atf_utils_wait .
+The validation involves checking that the subprocess exited cleanly and returned
+the code specified in
+.Fa expected_exit_status
+and that its standard output and standard error match the strings given in
+.Fa expected_stdout
+and
+.Fa expected_stderr .
+.Pp
+If any of the
+.Fa expected_stdout
+or
+.Fa expected_stderr
+strings are prefixed with
+.Sq save: ,
+then they specify the name of the file into which to store the stdout or stderr
+of the subprocess, and no comparison is performed.
+.Ed
 .Sh EXAMPLES
 The following shows a complete test program with a single test case that
 validates the addition operator:
diff --git a/contrib/atf/atf-c/check_test.c b/contrib/atf/atf-c/check_test.c
index b36dd73afc0..a26e032e11c 100644
--- a/contrib/atf/atf-c/check_test.c
+++ b/contrib/atf/atf-c/check_test.c
@@ -90,14 +90,10 @@ static
 void
 check_line(int fd, const char *exp)
 {
-    atf_dynstr_t line;
-
-    atf_dynstr_init(&line);
-    ATF_CHECK(!read_line(fd, &line));
-    ATF_CHECK_MSG(atf_equal_dynstr_cstring(&line, exp),
-                  "read: '%s', expected: '%s'",
-                  atf_dynstr_cstring(&line), exp);
-    atf_dynstr_fini(&line);
+    char *line = atf_utils_readline(fd);
+    ATF_CHECK(line != NULL);
+    ATF_CHECK_STREQ_MSG(exp, line, "read: '%s', expected: '%s'", line, exp);
+    free(line);
 }
 
 /* ---------------------------------------------------------------------
@@ -246,15 +242,15 @@ ATF_TC_BODY(build_c_o, tc)
 {
     init_and_run_h_tc(&ATF_TC_NAME(h_build_c_o_ok),
              &ATF_TC_PACK_NAME(h_build_c_o_ok), "stdout", "stderr");
-    ATF_CHECK(grep_file("stdout", "-o test.o"));
-    ATF_CHECK(grep_file("stdout", "-c test.c"));
+    ATF_CHECK(atf_utils_grep_file("-o test.o", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("-c test.c", "stdout"));
 
     init_and_run_h_tc(&ATF_TC_NAME(h_build_c_o_fail),
              &ATF_TC_PACK_NAME(h_build_c_o_fail), "stdout", "stderr");
-    ATF_CHECK(grep_file("stdout", "-o test.o"));
-    ATF_CHECK(grep_file("stdout", "-c test.c"));
-    ATF_CHECK(grep_file("stderr", "test.c"));
-    ATF_CHECK(grep_file("stderr", "UNDEFINED_SYMBOL"));
+    ATF_CHECK(atf_utils_grep_file("-o test.o", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("-c test.c", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("test.c", "stderr"));
+    ATF_CHECK(atf_utils_grep_file("UNDEFINED_SYMBOL", "stderr"));
 }
 
 ATF_TC(build_cpp);
@@ -267,16 +263,16 @@ ATF_TC_BODY(build_cpp, tc)
 {
     init_and_run_h_tc(&ATF_TC_NAME(h_build_cpp_ok),
              &ATF_TC_PACK_NAME(h_build_cpp_ok), "stdout", "stderr");
-    ATF_CHECK(grep_file("stdout", "-o.*test.p"));
-    ATF_CHECK(grep_file("stdout", "test.c"));
-    ATF_CHECK(grep_file("test.p", "foo bar"));
+    ATF_CHECK(atf_utils_grep_file("-o.*test.p", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("test.c", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("foo bar", "test.p"));
 
     init_and_run_h_tc(&ATF_TC_NAME(h_build_cpp_fail),
              &ATF_TC_PACK_NAME(h_build_cpp_fail), "stdout", "stderr");
-    ATF_CHECK(grep_file("stdout", "-o test.p"));
-    ATF_CHECK(grep_file("stdout", "test.c"));
-    ATF_CHECK(grep_file("stderr", "test.c"));
-    ATF_CHECK(grep_file("stderr", "non-existent.h"));
+    ATF_CHECK(atf_utils_grep_file("-o test.p", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("test.c", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("test.c", "stderr"));
+    ATF_CHECK(atf_utils_grep_file("non-existent.h", "stderr"));
 }
 
 ATF_TC(build_cxx_o);
@@ -289,15 +285,15 @@ ATF_TC_BODY(build_cxx_o, tc)
 {
     init_and_run_h_tc(&ATF_TC_NAME(h_build_cxx_o_ok),
              &ATF_TC_PACK_NAME(h_build_cxx_o_ok), "stdout", "stderr");
-    ATF_CHECK(grep_file("stdout", "-o test.o"));
-    ATF_CHECK(grep_file("stdout", "-c test.cpp"));
+    ATF_CHECK(atf_utils_grep_file("-o test.o", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("-c test.cpp", "stdout"));
 
     init_and_run_h_tc(&ATF_TC_NAME(h_build_cxx_o_fail),
              &ATF_TC_PACK_NAME(h_build_cxx_o_fail), "stdout", "stderr");
-    ATF_CHECK(grep_file("stdout", "-o test.o"));
-    ATF_CHECK(grep_file("stdout", "-c test.cpp"));
-    ATF_CHECK(grep_file("stderr", "test.cpp"));
-    ATF_CHECK(grep_file("stderr", "UNDEFINED_SYMBOL"));
+    ATF_CHECK(atf_utils_grep_file("-o test.o", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("-c test.cpp", "stdout"));
+    ATF_CHECK(atf_utils_grep_file("test.cpp", "stderr"));
+    ATF_CHECK(atf_utils_grep_file("UNDEFINED_SYMBOL", "stderr"));
 }
 
 ATF_TC(exec_array);
diff --git a/contrib/atf/atf-c/detail/Atffile b/contrib/atf/atf-c/detail/Atffile
deleted file mode 100644
index f715c98cfb7..00000000000
--- a/contrib/atf/atf-c/detail/Atffile
+++ /dev/null
@@ -1,14 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: dynstr_test
-tp: env_test
-tp: fs_test
-tp: list_test
-tp: map_test
-tp: process_test
-tp: sanity_test
-tp: test_helpers_test
-tp: text_test
-tp: user_test
diff --git a/contrib/atf/atf-c/detail/Kyuafile b/contrib/atf/atf-c/detail/Kyuafile
index 3f4901def1b..bb741da4dd5 100644
--- a/contrib/atf/atf-c/detail/Kyuafile
+++ b/contrib/atf/atf-c/detail/Kyuafile
@@ -9,6 +9,5 @@ atf_test_program{name="list_test"}
 atf_test_program{name="map_test"}
 atf_test_program{name="process_test"}
 atf_test_program{name="sanity_test"}
-atf_test_program{name="test_helpers_test"}
 atf_test_program{name="text_test"}
 atf_test_program{name="user_test"}
diff --git a/contrib/atf/atf-c/detail/Makefile.am.inc b/contrib/atf/atf-c/detail/Makefile.am.inc
deleted file mode 100644
index d3c325bd131..00000000000
--- a/contrib/atf/atf-c/detail/Makefile.am.inc
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-libatf_c_la_SOURCES += atf-c/detail/dynstr.c \
-                       atf-c/detail/dynstr.h \
-                       atf-c/detail/env.c \
-                       atf-c/detail/env.h \
-                       atf-c/detail/fs.c \
-                       atf-c/detail/fs.h \
-                       atf-c/detail/list.c \
-                       atf-c/detail/list.h \
-                       atf-c/detail/map.c \
-                       atf-c/detail/map.h \
-                       atf-c/detail/process.c \
-                       atf-c/detail/process.h \
-                       atf-c/detail/sanity.c \
-                       atf-c/detail/sanity.h \
-                       atf-c/detail/text.c \
-                       atf-c/detail/text.h \
-                       atf-c/detail/tp_main.c \
-                       atf-c/detail/user.c \
-                       atf-c/detail/user.h
-
-tests_atf_c_detail_DATA = atf-c/detail/Atffile \
-                          atf-c/detail/Kyuafile
-tests_atf_c_detaildir = $(pkgtestsdir)/atf-c/detail
-EXTRA_DIST += $(tests_atf_c_detail_DATA)
-
-noinst_LTLIBRARIES += atf-c/detail/libtest_helpers.la
-atf_c_detail_libtest_helpers_la_SOURCES = atf-c/detail/test_helpers.c \
-                                          atf-c/detail/test_helpers.h
-atf_c_detail_libtest_helpers_la_CPPFLAGS = -I$(srcdir)/atf-c
-
-tests_atf_c_detail_PROGRAMS = atf-c/detail/dynstr_test
-atf_c_detail_dynstr_test_SOURCES = atf-c/detail/dynstr_test.c
-atf_c_detail_dynstr_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/env_test
-atf_c_detail_env_test_SOURCES = atf-c/detail/env_test.c
-atf_c_detail_env_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/fs_test
-atf_c_detail_fs_test_SOURCES = atf-c/detail/fs_test.c
-atf_c_detail_fs_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/test_helpers_test
-atf_c_detail_test_helpers_test_SOURCES = atf-c/detail/test_helpers_test.c
-atf_c_detail_test_helpers_test_LDADD = atf-c/detail/libtest_helpers.la \
-                                       libatf-c.la
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/list_test
-atf_c_detail_list_test_SOURCES = atf-c/detail/list_test.c
-atf_c_detail_list_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/map_test
-atf_c_detail_map_test_SOURCES = atf-c/detail/map_test.c
-atf_c_detail_map_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/process_helpers
-atf_c_detail_process_helpers_SOURCES = atf-c/detail/process_helpers.c
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/process_test
-atf_c_detail_process_test_SOURCES = atf-c/detail/process_test.c
-atf_c_detail_process_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/sanity_test
-atf_c_detail_sanity_test_SOURCES = atf-c/detail/sanity_test.c
-atf_c_detail_sanity_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/text_test
-atf_c_detail_text_test_SOURCES = atf-c/detail/text_test.c
-atf_c_detail_text_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-tests_atf_c_detail_PROGRAMS += atf-c/detail/user_test
-atf_c_detail_user_test_SOURCES = atf-c/detail/user_test.c
-atf_c_detail_user_test_LDADD = atf-c/detail/libtest_helpers.la libatf-c.la
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/atf-c/detail/process_test.c b/contrib/atf/atf-c/detail/process_test.c
index 229593bf832..9e55f70e321 100644
--- a/contrib/atf/atf-c/detail/process_test.c
+++ b/contrib/atf/atf-c/detail/process_test.c
@@ -95,12 +95,12 @@ check_file(const enum out_type type)
 {
     switch (type) {
     case stdout_type:
-        ATF_CHECK(grep_file("stdout", "stdout: msg"));
-        ATF_CHECK(!grep_file("stdout", "stderr: msg"));
+        ATF_CHECK(atf_utils_grep_file("stdout: msg", "stdout"));
+        ATF_CHECK(!atf_utils_grep_file("stderr: msg", "stdout"));
         break;
     case stderr_type:
-        ATF_CHECK(grep_file("stderr", "stderr: msg"));
-        ATF_CHECK(!grep_file("stderr", "stdout: msg"));
+        ATF_CHECK(atf_utils_grep_file("stderr: msg", "stderr"));
+        ATF_CHECK(!atf_utils_grep_file("stdout: msg", "stderr"));
         break;
     default:
         UNREACHABLE;
@@ -110,7 +110,7 @@ check_file(const enum out_type type)
 struct capture_stream {
     struct base_stream m_base;
 
-    atf_dynstr_t m_msg;
+    char *m_msg;
 };
 #define CAPTURE_STREAM(type) \
     { .m_base = BASE_STREAM(capture_stream_init, \
@@ -126,7 +126,7 @@ capture_stream_init(void *v)
 
     s->m_base.m_sb_ptr = &s->m_base.m_sb;
     RE(atf_process_stream_init_capture(&s->m_base.m_sb));
-    RE(atf_dynstr_init(&s->m_msg));
+    s->m_msg = NULL;
 }
 
 static
@@ -137,10 +137,10 @@ capture_stream_process(void *v, atf_process_child_t *c)
 
     switch (s->m_base.m_type) {
     case stdout_type:
-        (void)read_line(atf_process_child_stdout(c), &s->m_msg);
+        s->m_msg = atf_utils_readline(atf_process_child_stdout(c));
         break;
     case stderr_type:
-        (void)read_line(atf_process_child_stderr(c), &s->m_msg);
+        s->m_msg = atf_utils_readline(atf_process_child_stderr(c));
         break;
     default:
         UNREACHABLE;
@@ -155,18 +155,18 @@ capture_stream_fini(void *v)
 
     switch (s->m_base.m_type) {
     case stdout_type:
-        ATF_CHECK(grep_string(&s->m_msg, "stdout: msg"));
-        ATF_CHECK(!grep_string(&s->m_msg, "stderr: msg"));
+        ATF_CHECK(atf_utils_grep_string("stdout: msg", s->m_msg));
+        ATF_CHECK(!atf_utils_grep_string("stderr: msg", s->m_msg));
         break;
     case stderr_type:
-        ATF_CHECK(!grep_string(&s->m_msg, "stdout: msg"));
-        ATF_CHECK(grep_string(&s->m_msg, "stderr: msg"));
+        ATF_CHECK(!atf_utils_grep_string("stdout: msg", s->m_msg));
+        ATF_CHECK(atf_utils_grep_string("stderr: msg", s->m_msg));
         break;
     default:
         UNREACHABLE;
     }
 
-    atf_dynstr_fini(&s->m_msg);
+    free(s->m_msg);
     atf_process_stream_fini(&s->m_base.m_sb);
 }
 
@@ -881,16 +881,10 @@ static
 void
 check_line(int fd, const char *exp)
 {
-    atf_dynstr_t line;
-    bool eof;
-
-    atf_dynstr_init(&line);
-    eof = read_line(fd, &line);
-    ATF_CHECK(!eof);
-    ATF_CHECK_MSG(atf_equal_dynstr_cstring(&line, exp),
-                  "read: '%s', expected: '%s'",
-                  atf_dynstr_cstring(&line), exp);
-    atf_dynstr_fini(&line);
+    char *line = atf_utils_readline(fd);
+    ATF_CHECK(line != NULL);
+    ATF_CHECK_STREQ_MSG(exp, line, "read: '%s', expected: '%s'", line, exp);
+    free(line);
 }
 
 ATF_TC(exec_failure);
diff --git a/contrib/atf/atf-c/detail/sanity_test.c b/contrib/atf/atf-c/detail/sanity_test.c
index af2bbc06f67..7c8285b5193 100644
--- a/contrib/atf/atf-c/detail/sanity_test.c
+++ b/contrib/atf/atf-c/detail/sanity_test.c
@@ -53,21 +53,6 @@
 
 enum type { inv, pre, post, unreachable };
 
-static
-bool
-grep(const atf_dynstr_t *line, const char *text)
-{
-    const char *l = atf_dynstr_cstring(line);
-    bool found;
-
-    found = false;
-
-    if (strstr(l, text) != NULL)
-        found = true;
-
-    return found;
-}
-
 struct test_data {
     enum type m_type;
     bool m_cond;
@@ -109,9 +94,8 @@ do_test(enum type t, bool cond)
 {
     atf_process_child_t child;
     atf_process_status_t status;
-    bool eof;
     int nlines;
-    atf_dynstr_t lines[3];
+    char *lines[3];
 
     {
         atf_process_stream_t outsb, errsb;
@@ -125,13 +109,9 @@ do_test(enum type t, bool cond)
     }
 
     nlines = 0;
-    eof = false;
-    do {
-        RE(atf_dynstr_init(&lines[nlines]));
-        if (!eof)
-            eof = read_line(atf_process_child_stderr(&child), &lines[nlines]);
+    while (nlines < 3 && (lines[nlines] =
+           atf_utils_readline(atf_process_child_stderr(&child))) != NULL)
         nlines++;
-    } while (nlines < 3);
     ATF_REQUIRE(nlines == 0 || nlines == 3);
 
     RE(atf_process_child_wait(&child, &status));
@@ -147,29 +127,29 @@ do_test(enum type t, bool cond)
     if (!cond) {
         switch (t) {
         case inv:
-            ATF_REQUIRE(grep(&lines[0], "Invariant"));
+            ATF_REQUIRE(atf_utils_grep_string("Invariant", lines[0]));
             break;
 
         case pre:
-            ATF_REQUIRE(grep(&lines[0], "Precondition"));
+            ATF_REQUIRE(atf_utils_grep_string("Precondition", lines[0]));
             break;
 
         case post:
-            ATF_REQUIRE(grep(&lines[0], "Postcondition"));
+            ATF_REQUIRE(atf_utils_grep_string("Postcondition", lines[0]));
             break;
 
         case unreachable:
-            ATF_REQUIRE(grep(&lines[0], "Invariant"));
+            ATF_REQUIRE(atf_utils_grep_string("Invariant", lines[0]));
             break;
         }
 
-        ATF_REQUIRE(grep(&lines[0], __FILE__));
-        ATF_REQUIRE(grep(&lines[2], PACKAGE_BUGREPORT));
+        ATF_REQUIRE(atf_utils_grep_string(__FILE__, lines[0]));
+        ATF_REQUIRE(atf_utils_grep_string(PACKAGE_BUGREPORT, lines[2]));
     }
 
     while (nlines > 0) {
         nlines--;
-        atf_dynstr_fini(&lines[nlines]);
+        free(lines[nlines]);
     }
 }
 
diff --git a/contrib/atf/atf-c/detail/test_helpers.c b/contrib/atf/atf-c/detail/test_helpers.c
index b20a8498331..aa64c12de40 100644
--- a/contrib/atf/atf-c/detail/test_helpers.c
+++ b/contrib/atf/atf-c/detail/test_helpers.c
@@ -30,7 +30,6 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <regex.h>
 #include <unistd.h>
 
 #include "atf-c/build.h"
@@ -106,72 +105,6 @@ get_process_helpers_path(const atf_tc_t *tc, const bool is_detail,
                             is_detail ? "" : "detail/"));
 }
 
-bool
-grep_string(const atf_dynstr_t *str, const char *regex)
-{
-    int res;
-    regex_t preg;
-
-    printf("Looking for '%s' in '%s'\n", regex, atf_dynstr_cstring(str));
-    ATF_REQUIRE(regcomp(&preg, regex, REG_EXTENDED) == 0);
-
-    res = regexec(&preg, atf_dynstr_cstring(str), 0, NULL, 0);
-    ATF_REQUIRE(res == 0 || res == REG_NOMATCH);
-
-    regfree(&preg);
-
-    return res == 0;
-}
-
-bool
-grep_file(const char *file, const char *regex, ...)
-{
-    bool done, found;
-    int fd;
-    va_list ap;
-    atf_dynstr_t formatted;
-
-    va_start(ap, regex);
-    RE(atf_dynstr_init_ap(&formatted, regex, ap));
-    va_end(ap);
-
-    done = false;
-    found = false;
-    ATF_REQUIRE((fd = open(file, O_RDONLY)) != -1);
-    do {
-        atf_dynstr_t line;
-
-        RE(atf_dynstr_init(&line));
-
-        done = read_line(fd, &line);
-        if (!done)
-            found = grep_string(&line, atf_dynstr_cstring(&formatted));
-
-        atf_dynstr_fini(&line);
-    } while (!found && !done);
-    close(fd);
-
-    atf_dynstr_fini(&formatted);
-
-    return found;
-}
-
-bool
-read_line(int fd, atf_dynstr_t *dest)
-{
-    char ch;
-    ssize_t cnt;
-
-    while ((cnt = read(fd, &ch, sizeof(ch))) == sizeof(ch) &&
-           ch != '\n') {
-        const atf_error_t err = atf_dynstr_append_fmt(dest, "%c", ch);
-        ATF_REQUIRE(!atf_is_error(err));
-    }
-    ATF_REQUIRE(cnt != -1);
-
-    return cnt == 0;
-}
-
 struct run_h_tc_data {
     atf_tc_t *m_tc;
     const char *m_resname;
diff --git a/contrib/atf/atf-c/detail/test_helpers.h b/contrib/atf/atf-c/detail/test_helpers.h
index b0ce6ccca46..5df034fb42a 100644
--- a/contrib/atf/atf-c/detail/test_helpers.h
+++ b/contrib/atf/atf-c/detail/test_helpers.h
@@ -81,7 +81,5 @@ void build_check_c_o(const atf_tc_t *, const char *, const char *, const bool);
 void header_check(const char *);
 void get_process_helpers_path(const atf_tc_t *, const bool,
                               struct atf_fs_path *);
-bool grep_string(const struct atf_dynstr *, const char *);
-bool grep_file(const char *, const char *, ...);
 bool read_line(int, struct atf_dynstr *);
 void run_h_tc(atf_tc_t *, const char *, const char *, const char *);
diff --git a/contrib/atf/atf-c/detail/test_helpers_test.c b/contrib/atf/atf-c/detail/test_helpers_test.c
deleted file mode 100644
index 52d8608b701..00000000000
--- a/contrib/atf/atf-c/detail/test_helpers_test.c
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Automated Testing Framework (atf)
- *
- * 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 <fcntl.h>
-#include <stdio.h>
-#include <unistd.h>
-
-#include <atf-c.h>
-
-#include "dynstr.h"
-#include "test_helpers.h"
-
-/* ---------------------------------------------------------------------
- * Test cases for the free functions.
- * --------------------------------------------------------------------- */
-
-/* TODO: Add checks for build_check_c_o and the macros defined in the
- * header file. */
-
-ATF_TC(grep_string);
-ATF_TC_HEAD(grep_string, tc)
-{
-    atf_tc_set_md_var(tc, "descr", "Tests the grep_string helper "
-                      "function");
-}
-ATF_TC_BODY(grep_string, tc)
-{
-    atf_dynstr_t str;
-
-    atf_dynstr_init_fmt(&str, "a string - aaaabbbb");
-    ATF_CHECK(grep_string(&str, "a string"));
-    ATF_CHECK(grep_string(&str, "^a string"));
-    ATF_CHECK(grep_string(&str, "aaaabbbb$"));
-    ATF_CHECK(grep_string(&str, "aa.*bb"));
-    ATF_CHECK(!grep_string(&str, "foo"));
-    ATF_CHECK(!grep_string(&str, "bar"));
-    ATF_CHECK(!grep_string(&str, "aaaaa"));
-
-    atf_dynstr_fini(&str);
-}
-
-
-ATF_TC(grep_file);
-ATF_TC_HEAD(grep_file, tc)
-{
-    atf_tc_set_md_var(tc, "descr", "Tests the grep_file helper function");
-}
-ATF_TC_BODY(grep_file, tc)
-{
-    FILE *f;
-
-    f = fopen("test.txt", "w");
-    ATF_CHECK(f != NULL);
-    fprintf(f, "line1\n");
-    fprintf(f, "the second line\n");
-    fprintf(f, "aaaabbbb\n");
-    fclose(f);
-
-    ATF_CHECK(grep_file("test.txt", "line1"));
-    ATF_CHECK(grep_file("test.txt", "line%d", 1));
-    ATF_CHECK(grep_file("test.txt", "second line"));
-    ATF_CHECK(grep_file("test.txt", "aa.*bb"));
-    ATF_CHECK(!grep_file("test.txt", "foo"));
-    ATF_CHECK(!grep_file("test.txt", "bar"));
-    ATF_CHECK(!grep_file("test.txt", "aaaaa"));
-}
-
-ATF_TC(read_line);
-ATF_TC_HEAD(read_line, tc)
-{
-    atf_tc_set_md_var(tc, "descr", "Tests the read_line function");
-}
-ATF_TC_BODY(read_line, tc)
-{
-    const char *l1 = "First line with % formatting % characters %";
-    const char *l2 = "Second line; much longer than the first one";
-    const char *l3 = "Last line, without terminator";
-
-    {
-        FILE *f;
-
-        f = fopen("test", "w");
-        ATF_REQUIRE(f != NULL);
-        fclose(f);
-    }
-
-    {
-        int fd;
-        atf_dynstr_t dest;
-        bool eof;
-
-        fd = open("test", O_RDONLY);
-        ATF_REQUIRE(fd != -1);
-
-        RE(atf_dynstr_init(&dest));
-        eof = read_line(fd, &dest);
-        ATF_REQUIRE(eof);
-        atf_dynstr_fini(&dest);
-    }
-
-    {
-        FILE *f;
-
-        f = fopen("test", "w");
-        ATF_REQUIRE(f != NULL);
-
-        fprintf(f, "%s\n", l1);
-        fprintf(f, "%s\n", l2);
-        fprintf(f, "%s", l3);
-
-        fclose(f);
-    }
-
-    {
-        int fd;
-        atf_dynstr_t dest;
-        bool eof;
-
-        fd = open("test", O_RDONLY);
-        ATF_REQUIRE(fd != -1);
-
-        RE(atf_dynstr_init(&dest));
-        eof = read_line(fd, &dest);
-        ATF_REQUIRE(!eof);
-        printf("1st line: >%s<\n", atf_dynstr_cstring(&dest));
-        ATF_REQUIRE(atf_equal_dynstr_cstring(&dest, l1));
-        atf_dynstr_fini(&dest);
-
-        RE(atf_dynstr_init(&dest));
-        eof = read_line(fd, &dest);
-        ATF_REQUIRE(!eof);
-        printf("2nd line: >%s<\n", atf_dynstr_cstring(&dest));
-        ATF_REQUIRE(atf_equal_dynstr_cstring(&dest, l2));
-        atf_dynstr_fini(&dest);
-
-        RE(atf_dynstr_init(&dest));
-        eof = read_line(fd, &dest);
-        ATF_REQUIRE(eof);
-        printf("3rd line: >%s<\n", atf_dynstr_cstring(&dest));
-        ATF_REQUIRE(atf_equal_dynstr_cstring(&dest, l3));
-        atf_dynstr_fini(&dest);
-
-        close(fd);
-    }
-}
-
-/* ---------------------------------------------------------------------
- * Main.
- * --------------------------------------------------------------------- */
-
-ATF_TP_ADD_TCS(tp)
-{
-    /* Add the tests for the free functions. */
-    ATF_TP_ADD_TC(tp, grep_string);
-    ATF_TP_ADD_TC(tp, grep_file);
-    ATF_TP_ADD_TC(tp, read_line);
-
-    return atf_no_error();
-}
diff --git a/contrib/atf/atf-c/macros.h b/contrib/atf/atf-c/macros.h
index 7afe9e8925e..7c33ccbc1e1 100644
--- a/contrib/atf/atf-c/macros.h
+++ b/contrib/atf/atf-c/macros.h
@@ -80,7 +80,7 @@
 #define ATF_TC_HEAD(tc, tcptr) \
     static \
     void \
-    atfu_ ## tc ## _head(atf_tc_t *tcptr)
+    atfu_ ## tc ## _head(atf_tc_t *tcptr ATF_DEFS_ATTRIBUTE_UNUSED)
 
 #define ATF_TC_HEAD_NAME(tc) \
     (atfu_ ## tc ## _head)
@@ -181,6 +181,24 @@
     ATF_CHECK_MSG(strcmp(x, y) == 0, "%s != %s (%s != %s): " fmt, \
                     #x, #y, x, y, ##__VA_ARGS__)
 
+#define ATF_REQUIRE_MATCH(regexp, string) \
+    ATF_REQUIRE_MSG(atf_utils_grep_string("%s", string, regexp), \
+                    "'%s' not matched in '%s'", regexp, string);
+
+#define ATF_CHECK_MATCH(regexp, string) \
+    ATF_CHECK_MSG(atf_utils_grep_string("%s", string, regexp), \
+                  "'%s' not matched in '%s'", regexp, string);
+
+#define ATF_REQUIRE_MATCH_MSG(regexp, string, fmt, ...) \
+    ATF_REQUIRE_MSG(atf_utils_grep_string("%s", string, regexp), \
+                    "'%s' not matched in '%s': " fmt, regexp, string, \
+                    ##__VA_ARGS__);
+
+#define ATF_CHECK_MATCH_MSG(regexp, string, fmt, ...) \
+    ATF_CHECK_MSG(atf_utils_grep_string("%s", string, regexp), \
+                  "'%s' not matched in '%s': " fmt, regexp, string, \
+                  ##__VA_ARGS__);
+
 #define ATF_CHECK_ERRNO(exp_errno, bool_expr) \
     atf_tc_check_errno(__FILE__, __LINE__, exp_errno, #bool_expr, bool_expr)
 
diff --git a/contrib/atf/atf-c/macros_test.c b/contrib/atf/atf-c/macros_test.c
index 9cf0525bf1d..f077a273d73 100644
--- a/contrib/atf/atf-c/macros_test.c
+++ b/contrib/atf/atf-c/macros_test.c
@@ -125,6 +125,11 @@ init_and_run_h_tc(const char *name, void (*head)(atf_tc_t *),
 #define H_CHECK_STREQ(id, v1, v2) \
     H_DEF(check_streq_ ## id, ATF_CHECK_STREQ(v1, v2))
 
+#define H_CHECK_MATCH_HEAD_NAME(id) ATF_TC_HEAD_NAME(h_check_match_ ## id)
+#define H_CHECK_MATCH_BODY_NAME(id) ATF_TC_BODY_NAME(h_check_match_ ## id)
+#define H_CHECK_MATCH(id, v1, v2) \
+    H_DEF(check_match_ ## id, ATF_CHECK_MATCH(v1, v2))
+
 #define H_CHECK_EQ_MSG_HEAD_NAME(id) \
     ATF_TC_HEAD_NAME(h_check_eq_msg_ ## id)
 #define H_CHECK_EQ_MSG_BODY_NAME(id) \
@@ -139,6 +144,13 @@ init_and_run_h_tc(const char *name, void (*head)(atf_tc_t *),
 #define H_CHECK_STREQ_MSG(id, v1, v2, msg) \
     H_DEF(check_streq_msg_ ## id, ATF_CHECK_STREQ_MSG(v1, v2, msg))
 
+#define H_CHECK_MATCH_MSG_HEAD_NAME(id) \
+    ATF_TC_HEAD_NAME(h_check_match_msg_ ## id)
+#define H_CHECK_MATCH_MSG_BODY_NAME(id) \
+    ATF_TC_BODY_NAME(h_check_match_msg_ ## id)
+#define H_CHECK_MATCH_MSG(id, v1, v2, msg) \
+    H_DEF(check_match_msg_ ## id, ATF_CHECK_MATCH_MSG(v1, v2, msg))
+
 #define H_CHECK_ERRNO_HEAD_NAME(id) ATF_TC_HEAD_NAME(h_check_errno_ ## id)
 #define H_CHECK_ERRNO_BODY_NAME(id) ATF_TC_BODY_NAME(h_check_errno_ ## id)
 #define H_CHECK_ERRNO(id, exp_errno, bool_expr) \
@@ -164,6 +176,11 @@ init_and_run_h_tc(const char *name, void (*head)(atf_tc_t *),
 #define H_REQUIRE_STREQ(id, v1, v2) \
     H_DEF(require_streq_ ## id, ATF_REQUIRE_STREQ(v1, v2))
 
+#define H_REQUIRE_MATCH_HEAD_NAME(id) ATF_TC_HEAD_NAME(h_require_match_ ## id)
+#define H_REQUIRE_MATCH_BODY_NAME(id) ATF_TC_BODY_NAME(h_require_match_ ## id)
+#define H_REQUIRE_MATCH(id, v1, v2) \
+    H_DEF(require_match_ ## id, ATF_REQUIRE_MATCH(v1, v2))
+
 #define H_REQUIRE_EQ_MSG_HEAD_NAME(id) \
     ATF_TC_HEAD_NAME(h_require_eq_msg_ ## id)
 #define H_REQUIRE_EQ_MSG_BODY_NAME(id) \
@@ -178,6 +195,13 @@ init_and_run_h_tc(const char *name, void (*head)(atf_tc_t *),
 #define H_REQUIRE_STREQ_MSG(id, v1, v2, msg) \
     H_DEF(require_streq_msg_ ## id, ATF_REQUIRE_STREQ_MSG(v1, v2, msg))
 
+#define H_REQUIRE_MATCH_MSG_HEAD_NAME(id) \
+    ATF_TC_HEAD_NAME(h_require_match_msg_ ## id)
+#define H_REQUIRE_MATCH_MSG_BODY_NAME(id) \
+    ATF_TC_BODY_NAME(h_require_match_msg_ ## id)
+#define H_REQUIRE_MATCH_MSG(id, v1, v2, msg) \
+    H_DEF(require_match_msg_ ## id, ATF_REQUIRE_MATCH_MSG(v1, v2, msg))
+
 #define H_REQUIRE_ERRNO_HEAD_NAME(id) ATF_TC_HEAD_NAME(h_require_errno_ ## id)
 #define H_REQUIRE_ERRNO_BODY_NAME(id) ATF_TC_BODY_NAME(h_require_errno_ ## id)
 #define H_REQUIRE_ERRNO(id, exp_errno, bool_expr) \
@@ -240,11 +264,11 @@ ATF_TC_BODY(check_errno, tc)
         ATF_REQUIRE(exists("after"));
 
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf_utils_grep_file("^passed", "result"));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed"));
-            ATF_REQUIRE(grep_file("error", "macros_test.c:[0-9]+: %s$",
-                t->exp_regex));
+            ATF_REQUIRE(atf_utils_grep_file("^failed", "result"));
+            ATF_REQUIRE(atf_utils_grep_file(
+                "macros_test.c:[0-9]+: %s$", "error", t->exp_regex));
         }
 
         ATF_REQUIRE(unlink("before") != -1);
@@ -282,11 +306,12 @@ ATF_TC_BODY(require_errno, tc)
 
         ATF_REQUIRE(exists("before"));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf_utils_grep_file("^passed", "result"));
             ATF_REQUIRE(exists("after"));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed: .*macros_test.c:[0-9]+: "
-                "%s$", t->exp_regex));
+            ATF_REQUIRE(atf_utils_grep_file(
+                "^failed: .*macros_test.c:[0-9]+: %s$", "result",
+                t->exp_regex));
             ATF_REQUIRE(!exists("after"));
         }
 
@@ -340,11 +365,11 @@ ATF_TC_BODY(check, tc)
         ATF_REQUIRE(exists("after"));
 
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf_utils_grep_file("^passed", "result"));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed"));
-            ATF_REQUIRE(grep_file("error", "Check failed: .*"
-                "macros_test.c:[0-9]+: %s$", t->msg));
+            ATF_REQUIRE(atf_utils_grep_file("^failed", "result"));
+            ATF_REQUIRE(atf_utils_grep_file("Check failed: .*"
+                "macros_test.c:[0-9]+: %s$", "error", t->msg));
         }
 
         ATF_REQUIRE(unlink("before") != -1);
@@ -381,11 +406,11 @@ do_check_eq_tests(const struct check_eq_test *tests)
         ATF_CHECK(exists("after"));
 
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf_utils_grep_file("^passed", "result"));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed"));
-            ATF_CHECK(grep_file("error", "Check failed: .*"
-                "macros_test.c:[0-9]+: %s$", t->msg));
+            ATF_REQUIRE(atf_utils_grep_file("^failed", "result"));
+            ATF_CHECK(atf_utils_grep_file("Check failed: .*"
+                "macros_test.c:[0-9]+: %s$", "error", t->msg));
         }
 
         ATF_CHECK(unlink("before") != -1);
@@ -442,8 +467,8 @@ H_CHECK_STREQ_MSG(2_1, "2", "1", "2 does not match 1");
 H_CHECK_STREQ_MSG(2_2, "2", "2", "2 does not match 2");
 #define CHECK_STREQ_VAR1 "5"
 #define CHECK_STREQ_VAR2 "9"
-const const char *check_streq_var1 = CHECK_STREQ_VAR1;
-const const char *check_streq_var2 = CHECK_STREQ_VAR2;
+const char *check_streq_var1 = CHECK_STREQ_VAR1;
+const char *check_streq_var2 = CHECK_STREQ_VAR2;
 H_CHECK_STREQ(vars, check_streq_var1, check_streq_var2);
 
 ATF_TC(check_streq);
@@ -484,6 +509,40 @@ ATF_TC_BODY(check_streq, tc)
     do_check_eq_tests(tests);
 }
 
+/* ---------------------------------------------------------------------
+ * Test cases for the ATF_CHECK_MATCH and ATF_CHECK_MATCH_MSG macros.
+ * --------------------------------------------------------------------- */
+
+H_CHECK_MATCH(yes, "hello [a-z]+", "abc hello world");
+H_CHECK_MATCH(no, "hello [a-z]+", "abc hello WORLD");
+H_CHECK_MATCH_MSG(yes, "hello [a-z]+", "abc hello world", "lowercase");
+H_CHECK_MATCH_MSG(no, "hello [a-z]+", "abc hello WORLD", "uppercase");
+
+ATF_TC(check_match);
+ATF_TC_HEAD(check_match, tc)
+{
+    atf_tc_set_md_var(tc, "descr", "Tests the ATF_CHECK_MATCH and "
+                      "ATF_CHECK_MATCH_MSG macros");
+}
+ATF_TC_BODY(check_match, tc)
+{
+    struct check_eq_test tests[] = {
+        { H_CHECK_MATCH_HEAD_NAME(yes), H_CHECK_MATCH_BODY_NAME(yes),
+          "hello [a-z]+", "abc hello world", "", true },
+        { H_CHECK_MATCH_HEAD_NAME(no), H_CHECK_MATCH_BODY_NAME(no),
+          "hello [a-z]+", "abc hello WORLD",
+          "'hello \\[a-z\\]\\+' not matched in 'abc hello WORLD'", false },
+        { H_CHECK_MATCH_MSG_HEAD_NAME(yes), H_CHECK_MATCH_MSG_BODY_NAME(yes),
+          "hello [a-z]+", "abc hello world", "", true },
+        { H_CHECK_MATCH_MSG_HEAD_NAME(no), H_CHECK_MATCH_MSG_BODY_NAME(no),
+          "hello [a-z]+", "abc hello WORLD",
+          "'hello \\[a-z\\]\\+' not matched in 'abc hello WORLD': uppercase",
+          false },
+        { NULL, NULL, 0, 0, "", false }
+    };
+    do_check_eq_tests(tests);
+}
+
 /* ---------------------------------------------------------------------
  * Test cases for the ATF_REQUIRE and ATF_REQUIRE_MSG macros.
  * --------------------------------------------------------------------- */
@@ -526,11 +585,11 @@ ATF_TC_BODY(require, tc)
 
         ATF_REQUIRE(exists("before"));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf_utils_grep_file("^passed", "result"));
             ATF_REQUIRE(exists("after"));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed: .*macros_test.c:[0-9]+: "
-                                  "%s$", t->msg));
+            ATF_REQUIRE(atf_utils_grep_file(
+                "^failed: .*macros_test.c:[0-9]+: %s$", "result", t->msg));
             ATF_REQUIRE(!exists("after"));
         }
 
@@ -567,11 +626,11 @@ do_require_eq_tests(const struct require_eq_test *tests)
 
         ATF_REQUIRE(exists("before"));
         if (t->ok) {
-            ATF_REQUIRE(grep_file("result", "^passed"));
+            ATF_REQUIRE(atf_utils_grep_file("^passed", "result"));
             ATF_REQUIRE(exists("after"));
         } else {
-            ATF_REQUIRE(grep_file("result", "^failed: .*macros_test.c"
-                ":[0-9]+: %s$", t->msg));
+            ATF_REQUIRE(atf_utils_grep_file("^failed: .*macros_test.c"
+                ":[0-9]+: %s$", "result", t->msg));
             ATF_REQUIRE(!exists("after"));
         }
 
@@ -630,8 +689,8 @@ H_REQUIRE_STREQ_MSG(2_1, "2", "1", "2 does not match 1");
 H_REQUIRE_STREQ_MSG(2_2, "2", "2", "2 does not match 2");
 #define REQUIRE_STREQ_VAR1 "5"
 #define REQUIRE_STREQ_VAR2 "9"
-const const char *require_streq_var1 = REQUIRE_STREQ_VAR1;
-const const char *require_streq_var2 = REQUIRE_STREQ_VAR2;
+const char *require_streq_var1 = REQUIRE_STREQ_VAR1;
+const char *require_streq_var2 = REQUIRE_STREQ_VAR2;
 H_REQUIRE_STREQ(vars, require_streq_var1, require_streq_var2);
 
 ATF_TC(require_streq);
@@ -672,6 +731,41 @@ ATF_TC_BODY(require_streq, tc)
     do_require_eq_tests(tests);
 }
 
+/* ---------------------------------------------------------------------
+ * Test cases for the ATF_REQUIRE_MATCH and ATF_REQUIRE_MATCH_MSG macros.
+ * --------------------------------------------------------------------- */
+
+H_REQUIRE_MATCH(yes, "hello [a-z]+", "abc hello world");
+H_REQUIRE_MATCH(no, "hello [a-z]+", "abc hello WORLD");
+H_REQUIRE_MATCH_MSG(yes, "hello [a-z]+", "abc hello world", "lowercase");
+H_REQUIRE_MATCH_MSG(no, "hello [a-z]+", "abc hello WORLD", "uppercase");
+
+ATF_TC(require_match);
+ATF_TC_HEAD(require_match, tc)
+{
+    atf_tc_set_md_var(tc, "descr", "Tests the ATF_REQUIRE_MATCH and "
+                      "ATF_REQUIRE_MATCH_MSG macros");
+}
+ATF_TC_BODY(require_match, tc)
+{
+    struct require_eq_test tests[] = {
+        { H_REQUIRE_MATCH_HEAD_NAME(yes), H_REQUIRE_MATCH_BODY_NAME(yes),
+          "hello [a-z]+", "abc hello world", "", true },
+        { H_REQUIRE_MATCH_HEAD_NAME(no), H_REQUIRE_MATCH_BODY_NAME(no),
+          "hello [a-z]+", "abc hello WORLD",
+          "'hello \\[a-z\\]\\+' not matched in 'abc hello WORLD'", false },
+        { H_REQUIRE_MATCH_MSG_HEAD_NAME(yes),
+          H_REQUIRE_MATCH_MSG_BODY_NAME(yes),
+          "hello [a-z]+", "abc hello world", "", true },
+        { H_REQUIRE_MATCH_MSG_HEAD_NAME(no), H_REQUIRE_MATCH_MSG_BODY_NAME(no),
+          "hello [a-z]+", "abc hello WORLD",
+          "'hello \\[a-z\\]\\+' not matched in 'abc hello WORLD': uppercase",
+          false },
+        { NULL, NULL, 0, 0, "", false }
+    };
+    do_require_eq_tests(tests);
+}
+
 /* ---------------------------------------------------------------------
  * Miscellaneous test cases covering several macros.
  * --------------------------------------------------------------------- */
@@ -728,12 +822,12 @@ ATF_TC_BODY(msg_embedded_fmt, tc)
 
         if (t->fatal) {
             bool matched =
-                grep_file("result", "^failed: .*macros_test.c:[0-9]+: "
-                          "%s$", t->msg);
+                atf_utils_grep_file(
+                    "^failed: .*macros_test.c:[0-9]+: %s$", "result", t->msg);
             ATF_CHECK_MSG(matched, "couldn't find error string in result");
         } else {
-            bool matched = grep_file("error", "Check failed: .*"
-                "macros_test.c:[0-9]+: %s$", t->msg);
+            bool matched = atf_utils_grep_file("Check failed: .*"
+                "macros_test.c:[0-9]+: %s$", "error", t->msg);
             ATF_CHECK_MSG(matched, "couldn't find error string in output");
         }
     }
@@ -765,11 +859,13 @@ ATF_TP_ADD_TCS(tp)
     ATF_TP_ADD_TC(tp, check_eq);
     ATF_TP_ADD_TC(tp, check_streq);
     ATF_TP_ADD_TC(tp, check_errno);
+    ATF_TP_ADD_TC(tp, check_match);
 
     ATF_TP_ADD_TC(tp, require);
     ATF_TP_ADD_TC(tp, require_eq);
     ATF_TP_ADD_TC(tp, require_streq);
     ATF_TP_ADD_TC(tp, require_errno);
+    ATF_TP_ADD_TC(tp, require_match);
 
     ATF_TP_ADD_TC(tp, msg_embedded_fmt);
 
diff --git a/contrib/atf/atf-c/pkg_config_test.sh b/contrib/atf/atf-c/pkg_config_test.sh
index 8770808cad8..efeae832369 100644
--- a/contrib/atf/atf-c/pkg_config_test.sh
+++ b/contrib/atf/atf-c/pkg_config_test.sh
@@ -59,7 +59,7 @@ atf_test_case version
 version_head()
 {
     atf_set "descr" "Checks that the version in atf-c is correct"
-    atf_set "require.progs" "pkg-config"
+    atf_set "require.progs" "atf-version pkg-config"
 }
 version_body()
 {
diff --git a/contrib/atf/atf-c/utils.c b/contrib/atf/atf-c/utils.c
index c33270390ac..4409f7a4fb9 100644
--- a/contrib/atf/atf-c/utils.c
+++ b/contrib/atf/atf-c/utils.c
@@ -27,10 +27,221 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <stdlib.h>
-
 #include "atf-c/utils.h"
 
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <atf-c.h>
+
+#include "detail/dynstr.h"
+
+/** Searches for a regexp in a string.
+ *
+ * \param regex The regexp to look for.
+ * \param str The string in which to look for the expression.
+ *
+ * \return True if there is a match; false otherwise. */
+static
+bool
+grep_string(const char *regex, const char *str)
+{
+    int res;
+    regex_t preg;
+
+    printf("Looking for '%s' in '%s'\n", regex, str);
+    ATF_REQUIRE(regcomp(&preg, regex, REG_EXTENDED) == 0);
+
+    res = regexec(&preg, str, 0, NULL, 0);
+    ATF_REQUIRE(res == 0 || res == REG_NOMATCH);
+
+    regfree(&preg);
+
+    return res == 0;
+}
+
+/** Prints the contents of a file to stdout.
+ *
+ * \param name The name of the file to be printed.
+ * \param prefix An string to be prepended to every line of the printed
+ *     file. */
+void
+atf_utils_cat_file(const char *name, const char *prefix)
+{
+    const int fd = open(name, O_RDONLY);
+    ATF_REQUIRE_MSG(fd != -1, "Cannot open %s", name);
+
+    char buffer[1024];
+    ssize_t count;
+    bool continued = false;
+    while ((count = read(fd, buffer, sizeof(buffer) - 1)) > 0) {
+        buffer[count] = '\0';
+
+        if (!continued)
+            printf("%s", prefix);
+
+        char *iter = buffer;
+        char *end;
+        while ((end = strchr(iter, '\n')) != NULL) {
+            *end = '\0';
+            printf("%s\n", iter);
+
+            iter = end + 1;
+            if (iter != buffer + count)
+                printf("%s", prefix);
+            else
+                continued = false;
+        }
+        if (iter < buffer + count) {
+            printf("%s", iter);
+            continued = true;
+        }
+    }
+    ATF_REQUIRE(count == 0);
+}
+
+/** Compares a file against the given golden contents.
+ *
+ * \param name Name of the file to be compared.
+ * \param contents Expected contents of the file.
+ *
+ * \return True if the file matches the contents; false otherwise. */
+bool
+atf_utils_compare_file(const char *name, const char *contents)
+{
+    const int fd = open(name, O_RDONLY);
+    ATF_REQUIRE_MSG(fd != -1, "Cannot open %s", name);
+
+    const char *pos = contents;
+    ssize_t remaining = strlen(contents);
+
+    char buffer[1024];
+    ssize_t count;
+    while ((count = read(fd, buffer, sizeof(buffer))) > 0 &&
+           count <= remaining) {
+        if (memcmp(pos, buffer, count) != 0) {
+            close(fd);
+            return false;
+        }
+        remaining -= count;
+        pos += count;
+    }
+    close(fd);
+    return count == 0 && remaining == 0;
+}
+
+/** Copies a file.
+ *
+ * \param source Path to the source file.
+ * \param destination Path to the destination file. */
+void
+atf_utils_copy_file(const char *source, const char *destination)
+{
+    const int input = open(source, O_RDONLY);
+    ATF_REQUIRE_MSG(input != -1, "Failed to open source file during "
+                    "copy (%s)", source);
+
+    const int output = open(destination, O_WRONLY | O_CREAT | O_TRUNC, 0777);
+    ATF_REQUIRE_MSG(output != -1, "Failed to open destination file during "
+                    "copy (%s)", destination);
+
+    char buffer[1024];
+    ssize_t length;
+    while ((length = read(input, buffer, sizeof(buffer))) > 0)
+        ATF_REQUIRE_MSG(write(output, buffer, length) == length,
+                        "Failed to write to %s during copy", destination);
+    ATF_REQUIRE_MSG(length != -1, "Failed to read from %s during copy", source);
+
+    struct stat sb;
+    ATF_REQUIRE_MSG(fstat(input, &sb) != -1,
+                    "Failed to stat source file %s during copy", source);
+    ATF_REQUIRE_MSG(fchmod(output, sb.st_mode) != -1,
+                    "Failed to chmod destination file %s during copy",
+                    destination);
+
+    close(output);
+    close(input);
+}
+
+/** Creates a file.
+ *
+ * \param name Name of the file to create.
+ * \param contents Text to write into the created file.
+ * \param ... Positional parameters to the contents. */
+void
+atf_utils_create_file(const char *name, const char *contents, ...)
+{
+    va_list ap;
+    atf_dynstr_t formatted;
+    atf_error_t error;
+
+    va_start(ap, contents);
+    error = atf_dynstr_init_ap(&formatted, contents, ap);
+    va_end(ap);
+    ATF_REQUIRE(!atf_is_error(error));
+
+    const int fd = open(name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+    ATF_REQUIRE_MSG(fd != -1, "Cannot create file %s", name);
+    ATF_REQUIRE(write(fd, atf_dynstr_cstring(&formatted),
+                      atf_dynstr_length(&formatted)) != -1);
+    close(fd);
+
+    atf_dynstr_fini(&formatted);
+}
+
+/** Checks if a file exists.
+ *
+ * \param path Location of the file to check for.
+ *
+ * \return True if the file exists, false otherwise. */
+bool
+atf_utils_file_exists(const char *path)
+{
+    const int ret = access(path, F_OK);
+    if (ret == -1) {
+        if (errno != ENOENT)
+            atf_tc_fail("Failed to check the existence of %s: %s", path,
+                        strerror(errno));
+        else
+            return false;
+    } else
+        return true;
+}
+
+/** Spawns a subprocess and redirects its output to files.
+ *
+ * Use the atf_utils_wait() function to wait for the completion of the spawned
+ * subprocess and validate its exit conditions.
+ *
+ * \return 0 in the new child; the PID of the new child in the parent.  Does
+ * not return in error conditions. */
+pid_t
+atf_utils_fork(void)
+{
+    const pid_t pid = fork();
+    if (pid == -1)
+        atf_tc_fail("fork failed");
+
+    if (pid == 0) {
+        atf_utils_redirect(STDOUT_FILENO, "atf_utils_fork_out.txt");
+        atf_utils_redirect(STDERR_FILENO, "atf_utils_fork_err.txt");
+    }
+    return pid;
+}
+
+/** Frees an dynamically-allocated "argv" array.
+ *
+ * \param argv A dynamically-allocated array of dynamically-allocated
+ *     strings. */
 void
 atf_utils_free_charpp(char **argv)
 {
@@ -41,3 +252,164 @@ atf_utils_free_charpp(char **argv)
 
     free(argv);
 }
+
+/** Searches for a regexp in a file.
+ *
+ * \param regex The regexp to look for.
+ * \param file The file in which to look for the expression.
+ * \param ... Positional parameters to the regex.
+ *
+ * \return True if there is a match; false otherwise. */
+bool
+atf_utils_grep_file(const char *regex, const char *file, ...)
+{
+    int fd;
+    va_list ap;
+    atf_dynstr_t formatted;
+    atf_error_t error;
+
+    va_start(ap, file);
+    error = atf_dynstr_init_ap(&formatted, regex, ap);
+    va_end(ap);
+    ATF_REQUIRE(!atf_is_error(error));
+
+    ATF_REQUIRE((fd = open(file, O_RDONLY)) != -1);
+    bool found = false;
+    char *line = NULL;
+    while (!found && (line = atf_utils_readline(fd)) != NULL) {
+        found = grep_string(atf_dynstr_cstring(&formatted), line);
+        free(line);
+    }
+    close(fd);
+
+    atf_dynstr_fini(&formatted);
+
+    return found;
+}
+
+/** Searches for a regexp in a string.
+ *
+ * \param regex The regexp to look for.
+ * \param str The string in which to look for the expression.
+ * \param ... Positional parameters to the regex.
+ *
+ * \return True if there is a match; false otherwise. */
+bool
+atf_utils_grep_string(const char *regex, const char *str, ...)
+{
+    bool res;
+    va_list ap;
+    atf_dynstr_t formatted;
+    atf_error_t error;
+
+    va_start(ap, str);
+    error = atf_dynstr_init_ap(&formatted, regex, ap);
+    va_end(ap);
+    ATF_REQUIRE(!atf_is_error(error));
+
+    res = grep_string(atf_dynstr_cstring(&formatted), str);
+
+    atf_dynstr_fini(&formatted);
+
+    return res;
+}
+
+/** Reads a line of arbitrary length.
+ *
+ * \param fd The descriptor from which to read the line.
+ *
+ * \return A pointer to the read line, which must be released with free(), or
+ * NULL if there was nothing to read from the file. */
+char *
+atf_utils_readline(const int fd)
+{
+    char ch;
+    ssize_t cnt;
+    atf_dynstr_t temp;
+    atf_error_t error;
+
+    error = atf_dynstr_init(&temp);
+    ATF_REQUIRE(!atf_is_error(error));
+
+    while ((cnt = read(fd, &ch, sizeof(ch))) == sizeof(ch) &&
+           ch != '\n') {
+        error = atf_dynstr_append_fmt(&temp, "%c", ch);
+        ATF_REQUIRE(!atf_is_error(error));
+    }
+    ATF_REQUIRE(cnt != -1);
+
+    if (cnt == 0 && atf_dynstr_length(&temp) == 0) {
+        atf_dynstr_fini(&temp);
+        return NULL;
+    } else
+        return atf_dynstr_fini_disown(&temp);
+}
+
+/** Redirects a file descriptor to a file.
+ *
+ * \param target_fd The file descriptor to be replaced.
+ * \param name The name of the file to direct the descriptor to.
+ *
+ * \pre Should only be called from the process spawned by fork_for_testing
+ * because this exits uncontrolledly.
+ * \post Terminates execution if the redirection fails. */
+void
+atf_utils_redirect(const int target_fd, const char *name)
+{
+    if (target_fd == STDOUT_FILENO)
+        fflush(stdout);
+    else if (target_fd == STDERR_FILENO)
+        fflush(stderr);
+
+    const int new_fd = open(name, O_WRONLY | O_CREAT | O_TRUNC, 0644);
+    if (new_fd == -1)
+        err(EXIT_FAILURE, "Cannot create %s", name);
+    if (new_fd != target_fd) {
+        if (dup2(new_fd, target_fd) == -1)
+            err(EXIT_FAILURE, "Cannot redirect to fd %d", target_fd);
+    }
+    close(new_fd);
+}
+
+/** Waits for a subprocess and validates its exit condition.
+ *
+ * \param pid The process to be waited for.  Must have been started by
+ *     testutils_fork().
+ * \param exitstatus Expected exit status.
+ * \param expout Expected contents of stdout.
+ * \param experr Expected contents of stderr. */
+void
+atf_utils_wait(const pid_t pid, const int exitstatus, const char *expout,
+               const char *experr)
+{
+    int status;
+    ATF_REQUIRE(waitpid(pid, &status, 0) != -1);
+
+    atf_utils_cat_file("atf_utils_fork_out.txt", "subprocess stdout: ");
+    atf_utils_cat_file("atf_utils_fork_err.txt", "subprocess stderr: ");
+
+    ATF_REQUIRE(WIFEXITED(status));
+    ATF_REQUIRE_EQ(exitstatus, WEXITSTATUS(status));
+
+    const char *save_prefix = "save:";
+    const size_t save_prefix_length = strlen(save_prefix);
+
+    if (strlen(expout) > save_prefix_length &&
+        strncmp(expout, save_prefix, save_prefix_length) == 0) {
+        atf_utils_copy_file("atf_utils_fork_out.txt",
+                            expout + save_prefix_length);
+    } else {
+        ATF_REQUIRE(atf_utils_compare_file("atf_utils_fork_out.txt", expout));
+    }
+
+    if (strlen(experr) > save_prefix_length &&
+        strncmp(experr, save_prefix, save_prefix_length) == 0) {
+        atf_utils_copy_file("atf_utils_fork_err.txt",
+                            experr + save_prefix_length);
+    } else {
+        ATF_REQUIRE(atf_utils_compare_file("atf_utils_fork_err.txt", experr));
+    }
+
+    ATF_REQUIRE(unlink("atf_utils_fork_out.txt") != -1);
+    ATF_REQUIRE(unlink("atf_utils_fork_err.txt") != -1);
+}
diff --git a/contrib/atf/atf-c/utils.h b/contrib/atf/atf-c/utils.h
index dc4c5ae6f00..666804d3a2c 100644
--- a/contrib/atf/atf-c/utils.h
+++ b/contrib/atf/atf-c/utils.h
@@ -30,6 +30,25 @@
 #if !defined(ATF_C_UTILS_H)
 #define ATF_C_UTILS_H
 
+#include <stdbool.h>
+#include <unistd.h>
+
+#include <atf-c/defs.h>
+
+void atf_utils_cat_file(const char *, const char *);
+bool atf_utils_compare_file(const char *, const char *);
+void atf_utils_copy_file(const char *, const char *);
+void atf_utils_create_file(const char *, const char *, ...)
+    ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(2, 3);
+bool atf_utils_file_exists(const char *);
+pid_t atf_utils_fork(void);
 void atf_utils_free_charpp(char **);
+bool atf_utils_grep_file(const char *, const char *, ...)
+    ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 3);
+bool atf_utils_grep_string(const char *, const char *, ...)
+    ATF_DEFS_ATTRIBUTE_FORMAT_PRINTF(1, 3);
+char *atf_utils_readline(int);
+void atf_utils_redirect(const int, const char *);
+void atf_utils_wait(const pid_t, const int, const char *, const char *);
 
 #endif /* ATF_C_UTILS_H */
diff --git a/contrib/atf/atf-c/utils_test.c b/contrib/atf/atf-c/utils_test.c
index 146272a713e..57d6af8d2a2 100644
--- a/contrib/atf/atf-c/utils_test.c
+++ b/contrib/atf/atf-c/utils_test.c
@@ -27,8 +27,15 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/stat.h>
+#include <sys/wait.h>
+
+#include <fcntl.h>
+#include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include <atf-c.h>
 
@@ -36,8 +43,218 @@
 
 #include "detail/test_helpers.h"
 
-ATF_TC_WITHOUT_HEAD(free_charpp_empty);
-ATF_TC_BODY(free_charpp_empty, tc)
+/** Reads the contents of a file into a buffer.
+ *
+ * Up to buflen-1 characters are read into buffer.  If this function returns,
+ * the contents read into the buffer are guaranteed to be nul-terminated.
+ * Note, however, that if the file contains any nul characters itself,
+ * comparing it "as a string" will not work.
+ *
+ * \param path The file to be read, which must exist.
+ * \param buffer Buffer into which to store the file contents.
+ * \param buflen Size of the target buffer.
+ *
+ * \return The count of bytes read. */
+static ssize_t
+read_file(const char *path, void *const buffer, const size_t buflen)
+{
+    const int fd = open(path, O_RDONLY);
+    ATF_REQUIRE_MSG(fd != -1, "Cannot open %s", path);
+    const ssize_t length = read(fd, buffer, buflen - 1);
+    close(fd);
+    ATF_REQUIRE(length != -1);
+    ((char *)buffer)[length] = '\0';
+    return length;
+}
+
+ATF_TC_WITHOUT_HEAD(cat_file__empty);
+ATF_TC_BODY(cat_file__empty, tc)
+{
+    atf_utils_create_file("file.txt", "%s", "");
+    atf_utils_redirect(STDOUT_FILENO, "captured.txt");
+    atf_utils_cat_file("file.txt", "PREFIX");
+    fflush(stdout);
+    close(STDOUT_FILENO);
+
+    char buffer[1024];
+    read_file("captured.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ("", buffer);
+}
+
+ATF_TC_WITHOUT_HEAD(cat_file__one_line);
+ATF_TC_BODY(cat_file__one_line, tc)
+{
+    atf_utils_create_file("file.txt", "This is a single line\n");
+    atf_utils_redirect(STDOUT_FILENO, "captured.txt");
+    atf_utils_cat_file("file.txt", "PREFIX");
+    fflush(stdout);
+    close(STDOUT_FILENO);
+
+    char buffer[1024];
+    read_file("captured.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ("PREFIXThis is a single line\n", buffer);
+}
+
+ATF_TC_WITHOUT_HEAD(cat_file__several_lines);
+ATF_TC_BODY(cat_file__several_lines, tc)
+{
+    atf_utils_create_file("file.txt", "First\nSecond line\nAnd third\n");
+    atf_utils_redirect(STDOUT_FILENO, "captured.txt");
+    atf_utils_cat_file("file.txt", ">");
+    fflush(stdout);
+    close(STDOUT_FILENO);
+
+    char buffer[1024];
+    read_file("captured.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ(">First\n>Second line\n>And third\n", buffer);
+}
+
+ATF_TC_WITHOUT_HEAD(cat_file__no_newline_eof);
+ATF_TC_BODY(cat_file__no_newline_eof, tc)
+{
+    atf_utils_create_file("file.txt", "Foo\n bar baz");
+    atf_utils_redirect(STDOUT_FILENO, "captured.txt");
+    atf_utils_cat_file("file.txt", "PREFIX");
+    fflush(stdout);
+    close(STDOUT_FILENO);
+
+    char buffer[1024];
+    read_file("captured.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ("PREFIXFoo\nPREFIX bar baz", buffer);
+}
+
+ATF_TC_WITHOUT_HEAD(compare_file__empty__match);
+ATF_TC_BODY(compare_file__empty__match, tc)
+{
+    atf_utils_create_file("test.txt", "%s", "");
+    ATF_REQUIRE(atf_utils_compare_file("test.txt", ""));
+}
+
+ATF_TC_WITHOUT_HEAD(compare_file__empty__not_match);
+ATF_TC_BODY(compare_file__empty__not_match, tc)
+{
+    atf_utils_create_file("test.txt", "%s", "");
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", "\n"));
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", "foo"));
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", " "));
+}
+
+ATF_TC_WITHOUT_HEAD(compare_file__short__match);
+ATF_TC_BODY(compare_file__short__match, tc)
+{
+    atf_utils_create_file("test.txt", "this is a short file");
+    ATF_REQUIRE(atf_utils_compare_file("test.txt", "this is a short file"));
+}
+
+ATF_TC_WITHOUT_HEAD(compare_file__short__not_match);
+ATF_TC_BODY(compare_file__short__not_match, tc)
+{
+    atf_utils_create_file("test.txt", "this is a short file");
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", ""));
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", "\n"));
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", "this is a Short file"));
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", "this is a short fil"));
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", "this is a short file "));
+}
+
+ATF_TC_WITHOUT_HEAD(compare_file__long__match);
+ATF_TC_BODY(compare_file__long__match, tc)
+{
+    char long_contents[3456];
+    size_t i = 0;
+    for (; i < sizeof(long_contents) - 1; i++)
+        long_contents[i] = '0' + (i % 10);
+    long_contents[i] = '\0';
+    atf_utils_create_file("test.txt", "%s", long_contents);
+
+    ATF_REQUIRE(atf_utils_compare_file("test.txt", long_contents));
+}
+
+ATF_TC_WITHOUT_HEAD(compare_file__long__not_match);
+ATF_TC_BODY(compare_file__long__not_match, tc)
+{
+    char long_contents[3456];
+    size_t i = 0;
+    for (; i < sizeof(long_contents) - 1; i++)
+        long_contents[i] = '0' + (i % 10);
+    long_contents[i] = '\0';
+    atf_utils_create_file("test.txt", "%s", long_contents);
+
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", ""));
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", "\n"));
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", "0123456789"));
+    long_contents[i - 1] = 'Z';
+    ATF_REQUIRE(!atf_utils_compare_file("test.txt", long_contents));
+}
+
+ATF_TC_WITHOUT_HEAD(copy_file__empty);
+ATF_TC_BODY(copy_file__empty, tc)
+{
+    atf_utils_create_file("src.txt", "%s", "");
+    ATF_REQUIRE(chmod("src.txt", 0520) != -1);
+
+    atf_utils_copy_file("src.txt", "dest.txt");
+    ATF_REQUIRE(atf_utils_compare_file("dest.txt", ""));
+    struct stat sb;
+    ATF_REQUIRE(stat("dest.txt", &sb) != -1);
+    ATF_REQUIRE_EQ(0520, sb.st_mode & 0xfff);
+}
+
+ATF_TC_WITHOUT_HEAD(copy_file__some_contents);
+ATF_TC_BODY(copy_file__some_contents, tc)
+{
+    atf_utils_create_file("src.txt", "This is a\ntest file\n");
+    atf_utils_copy_file("src.txt", "dest.txt");
+    ATF_REQUIRE(atf_utils_compare_file("dest.txt", "This is a\ntest file\n"));
+}
+
+ATF_TC_WITHOUT_HEAD(create_file);
+ATF_TC_BODY(create_file, tc)
+{
+    atf_utils_create_file("test.txt", "This is a test with %d", 12345);
+
+    char buffer[128];
+    read_file("test.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ("This is a test with 12345", buffer);
+}
+
+ATF_TC_WITHOUT_HEAD(file_exists);
+ATF_TC_BODY(file_exists, tc)
+{
+    atf_utils_create_file("test.txt", "foo");
+
+    ATF_REQUIRE( atf_utils_file_exists("test.txt"));
+    ATF_REQUIRE( atf_utils_file_exists("./test.txt"));
+    ATF_REQUIRE(!atf_utils_file_exists("./test.tx"));
+    ATF_REQUIRE(!atf_utils_file_exists("test.txt2"));
+}
+
+ATF_TC_WITHOUT_HEAD(fork);
+ATF_TC_BODY(fork, tc)
+{
+    fprintf(stdout, "Should not get into child\n");
+    fprintf(stderr, "Should not get into child\n");
+    pid_t pid = atf_utils_fork();
+    if (pid == 0) {
+        fprintf(stdout, "Child stdout\n");
+        fprintf(stderr, "Child stderr\n");
+        exit(EXIT_SUCCESS);
+    }
+
+    int status;
+    ATF_REQUIRE(waitpid(pid, &status, 0) != -1);
+    ATF_REQUIRE(WIFEXITED(status));
+    ATF_REQUIRE_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
+
+    char buffer[1024];
+    read_file("atf_utils_fork_out.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ("Child stdout\n", buffer);
+    read_file("atf_utils_fork_err.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ("Child stderr\n", buffer);
+}
+
+ATF_TC_WITHOUT_HEAD(free_charpp__empty);
+ATF_TC_BODY(free_charpp__empty, tc)
 {
     char **array = malloc(sizeof(char *) * 1);
     array[0] = NULL;
@@ -45,8 +262,8 @@ ATF_TC_BODY(free_charpp_empty, tc)
     atf_utils_free_charpp(array);
 }
 
-ATF_TC_WITHOUT_HEAD(free_charpp_some);
-ATF_TC_BODY(free_charpp_some, tc)
+ATF_TC_WITHOUT_HEAD(free_charpp__some);
+ATF_TC_BODY(free_charpp__some, tc)
 {
     char **array = malloc(sizeof(char *) * 4);
     array[0] = strdup("first");
@@ -57,12 +274,263 @@ ATF_TC_BODY(free_charpp_some, tc)
     atf_utils_free_charpp(array);
 }
 
+ATF_TC_WITHOUT_HEAD(grep_file);
+ATF_TC_BODY(grep_file, tc)
+{
+    atf_utils_create_file("test.txt", "line1\nthe second line\naaaabbbb\n");
+
+    ATF_CHECK(atf_utils_grep_file("line1", "test.txt"));
+    ATF_CHECK(atf_utils_grep_file("line%d", "test.txt", 1));
+    ATF_CHECK(atf_utils_grep_file("second line", "test.txt"));
+    ATF_CHECK(atf_utils_grep_file("aa.*bb", "test.txt"));
+    ATF_CHECK(!atf_utils_grep_file("foo", "test.txt"));
+    ATF_CHECK(!atf_utils_grep_file("bar", "test.txt"));
+    ATF_CHECK(!atf_utils_grep_file("aaaaa", "test.txt"));
+}
+
+ATF_TC_WITHOUT_HEAD(grep_string);
+ATF_TC_BODY(grep_string, tc)
+{
+    const char *str = "a string - aaaabbbb";
+    ATF_CHECK(atf_utils_grep_string("a string", str));
+    ATF_CHECK(atf_utils_grep_string("^a string", str));
+    ATF_CHECK(atf_utils_grep_string("aaaabbbb$", str));
+    ATF_CHECK(atf_utils_grep_string("a%s*bb", str, "a."));
+    ATF_CHECK(!atf_utils_grep_string("foo", str));
+    ATF_CHECK(!atf_utils_grep_string("bar", str));
+    ATF_CHECK(!atf_utils_grep_string("aaaaa", str));
+}
+
+ATF_TC_WITHOUT_HEAD(readline__none);
+ATF_TC_BODY(readline__none, tc)
+{
+    atf_utils_create_file("empty.txt", "%s", "");
+
+    const int fd = open("empty.txt", O_RDONLY);
+    ATF_REQUIRE(fd != -1);
+    ATF_REQUIRE(atf_utils_readline(fd) == NULL);
+    close(fd);
+}
+
+ATF_TC_WITHOUT_HEAD(readline__some);
+ATF_TC_BODY(readline__some, tc)
+{
+    const char *l1 = "First line with % formatting % characters %";
+    const char *l2 = "Second line; much longer than the first one";
+    const char *l3 = "Last line, without terminator";
+
+    atf_utils_create_file("test.txt", "%s\n%s\n%s", l1, l2, l3);
+
+    const int fd = open("test.txt", O_RDONLY);
+    ATF_REQUIRE(fd != -1);
+
+    char *line;
+
+    line = atf_utils_readline(fd);
+    ATF_REQUIRE_STREQ(l1, line);
+    free(line);
+
+    line = atf_utils_readline(fd);
+    ATF_REQUIRE_STREQ(l2, line);
+    free(line);
+
+    line = atf_utils_readline(fd);
+    ATF_REQUIRE_STREQ(l3, line);
+    free(line);
+
+    close(fd);
+}
+
+ATF_TC_WITHOUT_HEAD(redirect__stdout);
+ATF_TC_BODY(redirect__stdout, tc)
+{
+    printf("Buffer this");
+    atf_utils_redirect(STDOUT_FILENO, "captured.txt");
+    printf("The printed message");
+    fflush(stdout);
+
+    char buffer[1024];
+    read_file("captured.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ("The printed message", buffer);
+}
+
+ATF_TC_WITHOUT_HEAD(redirect__stderr);
+ATF_TC_BODY(redirect__stderr, tc)
+{
+    fprintf(stderr, "Buffer this");
+    atf_utils_redirect(STDERR_FILENO, "captured.txt");
+    fprintf(stderr, "The printed message");
+    fflush(stderr);
+
+    char buffer[1024];
+    read_file("captured.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ("The printed message", buffer);
+}
+
+ATF_TC_WITHOUT_HEAD(redirect__other);
+ATF_TC_BODY(redirect__other, tc)
+{
+    const char *message = "Foo bar\nbaz\n";
+    atf_utils_redirect(15, "captured.txt");
+    ATF_REQUIRE(write(15, message, strlen(message)) != -1);
+    close(15);
+
+    char buffer[1024];
+    read_file("captured.txt", buffer, sizeof(buffer));
+    ATF_REQUIRE_STREQ(message, buffer);
+}
+
+static void
+fork_and_wait(const int exitstatus, const char* expout, const char* experr)
+{
+    const pid_t pid = atf_utils_fork();
+    if (pid == 0) {
+        fprintf(stdout, "Some output\n");
+        fprintf(stderr, "Some error\n");
+        exit(123);
+    }
+    atf_utils_wait(pid, exitstatus, expout, experr);
+    exit(EXIT_SUCCESS);
+}
+
+ATF_TC_WITHOUT_HEAD(wait__ok);
+ATF_TC_BODY(wait__ok, tc)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "Some output\n", "Some error\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
+    }
+}
+
+ATF_TC_WITHOUT_HEAD(wait__invalid_exitstatus);
+ATF_TC_BODY(wait__invalid_exitstatus, tc)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(120, "Some output\n", "Some error\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_FAILURE, WEXITSTATUS(status));
+    }
+}
+
+ATF_TC_WITHOUT_HEAD(wait__invalid_stdout);
+ATF_TC_BODY(wait__invalid_stdout, tc)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "Some output foo\n", "Some error\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_FAILURE, WEXITSTATUS(status));
+    }
+}
+
+ATF_TC_WITHOUT_HEAD(wait__invalid_stderr);
+ATF_TC_BODY(wait__invalid_stderr, tc)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "Some output\n", "Some error foo\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_FAILURE, WEXITSTATUS(status));
+    }
+}
+
+ATF_TC_WITHOUT_HEAD(wait__save_stdout);
+ATF_TC_BODY(wait__save_stdout, tc)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "save:my-output.txt", "Some error\n");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
+
+        ATF_REQUIRE(atf_utils_compare_file("my-output.txt", "Some output\n"));
+    }
+}
+
+ATF_TC_WITHOUT_HEAD(wait__save_stderr);
+ATF_TC_BODY(wait__save_stderr, tc)
+{
+    const pid_t control = fork();
+    ATF_REQUIRE(control != -1);
+    if (control == 0)
+        fork_and_wait(123, "Some output\n", "save:my-output.txt");
+    else {
+        int status;
+        ATF_REQUIRE(waitpid(control, &status, 0) != -1);
+        ATF_REQUIRE(WIFEXITED(status));
+        ATF_REQUIRE_EQ(EXIT_SUCCESS, WEXITSTATUS(status));
+
+        ATF_REQUIRE(atf_utils_compare_file("my-output.txt", "Some error\n"));
+    }
+}
+
 HEADER_TC(include, "atf-c/utils.h");
 
 ATF_TP_ADD_TCS(tp)
 {
-    ATF_TP_ADD_TC(tp, free_charpp_empty);
-    ATF_TP_ADD_TC(tp, free_charpp_some);
+    ATF_TP_ADD_TC(tp, cat_file__empty);
+    ATF_TP_ADD_TC(tp, cat_file__one_line);
+    ATF_TP_ADD_TC(tp, cat_file__several_lines);
+    ATF_TP_ADD_TC(tp, cat_file__no_newline_eof);
+
+    ATF_TP_ADD_TC(tp, compare_file__empty__match);
+    ATF_TP_ADD_TC(tp, compare_file__empty__not_match);
+    ATF_TP_ADD_TC(tp, compare_file__short__match);
+    ATF_TP_ADD_TC(tp, compare_file__short__not_match);
+    ATF_TP_ADD_TC(tp, compare_file__long__match);
+    ATF_TP_ADD_TC(tp, compare_file__long__not_match);
+
+    ATF_TP_ADD_TC(tp, copy_file__empty);
+    ATF_TP_ADD_TC(tp, copy_file__some_contents);
+
+    ATF_TP_ADD_TC(tp, create_file);
+
+    ATF_TP_ADD_TC(tp, file_exists);
+
+    ATF_TP_ADD_TC(tp, fork);
+
+    ATF_TP_ADD_TC(tp, free_charpp__empty);
+    ATF_TP_ADD_TC(tp, free_charpp__some);
+
+    ATF_TP_ADD_TC(tp, grep_file);
+    ATF_TP_ADD_TC(tp, grep_string);
+
+    ATF_TP_ADD_TC(tp, readline__none);
+    ATF_TP_ADD_TC(tp, readline__some);
+
+    ATF_TP_ADD_TC(tp, redirect__stdout);
+    ATF_TP_ADD_TC(tp, redirect__stderr);
+    ATF_TP_ADD_TC(tp, redirect__other);
+
+    ATF_TP_ADD_TC(tp, wait__ok);
+    ATF_TP_ADD_TC(tp, wait__save_stdout);
+    ATF_TP_ADD_TC(tp, wait__save_stderr);
+    ATF_TP_ADD_TC(tp, wait__invalid_exitstatus);
+    ATF_TP_ADD_TC(tp, wait__invalid_stdout);
+    ATF_TP_ADD_TC(tp, wait__invalid_stderr);
 
     ATF_TP_ADD_TC(tp, include);
 
diff --git a/contrib/atf/atf-config/Atffile b/contrib/atf/atf-config/Atffile
deleted file mode 100644
index 146211e000d..00000000000
--- a/contrib/atf/atf-config/Atffile
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp-glob: *_test
diff --git a/contrib/atf/atf-config/Kyuafile b/contrib/atf/atf-config/Kyuafile
deleted file mode 100644
index 8ba4da82885..00000000000
--- a/contrib/atf/atf-config/Kyuafile
+++ /dev/null
@@ -1,5 +0,0 @@
-syntax("kyuafile", 1)
-
-test_suite("atf")
-
-atf_test_program{name="integration_test"}
diff --git a/contrib/atf/atf-config/Makefile.am.inc b/contrib/atf/atf-config/Makefile.am.inc
deleted file mode 100644
index 0f32778aad6..00000000000
--- a/contrib/atf/atf-config/Makefile.am.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-bin_PROGRAMS += atf-config/atf-config
-atf_config_atf_config_SOURCES = atf-config/atf-config.cpp
-atf_config_atf_config_LDADD = $(ATF_CXX_LIBS)
-dist_man_MANS += atf-config/atf-config.1
-
-tests_atf_config_DATA = atf-config/Atffile \
-                        atf-config/Kyuafile
-tests_atf_configdir = $(pkgtestsdir)/atf-config
-EXTRA_DIST += $(tests_atf_config_DATA)
-
-tests_atf_config_SCRIPTS = atf-config/integration_test
-CLEANFILES += atf-config/integration_test
-EXTRA_DIST += atf-config/integration_test.sh
-atf-config/integration_test: $(srcdir)/atf-config/integration_test.sh
-	test -d atf-config || mkdir -p atf-config
-	@src="$(srcdir)/atf-config/integration_test.sh"; \
-	dst="atf-config/integration_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/atf-config/atf-config.1 b/contrib/atf/atf-config/atf-config.1
deleted file mode 100644
index deae6f6406c..00000000000
--- a/contrib/atf/atf-config/atf-config.1
+++ /dev/null
@@ -1,184 +0,0 @@
-.\"
-.\" Automated Testing Framework (atf)
-.\"
-.\" 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.
-.\"
-.Dd March 14, 2009
-.Dt ATF-CONFIG 1
-.Os
-.Sh NAME
-.Nm atf-config
-.Nd queries static configuration information of ATF
-.Sh SYNOPSIS
-.Nm
-.Op Fl t
-.Op Ar var1 Op Ar .. varN
-.Nm
-.Fl h
-.Sh DESCRIPTION
-.Nm
-is a utility that queries static configuration information of ATF.
-Static configuration refers to all those values for settings that
-were built into the ATF binaries at build time.
-.Pp
-In the first synopsis form,
-.Nm
-will print variable-value pairs for all built-in static variables if
-no variable names are provided as arguments.
-If any is provided, it will only print the variable-value pairs for
-those variables.
-The output of the utility does not use the
-.Sq =
-symbol to separate the variable name from its corresponding value in
-an attempt to avoid sourcing the output in shell scripts or Makefiles.
-If you need to do that, the
-.Fl t
-flag allows you to query the value of individual variables without any
-surrounding text.
-.Pp
-In the second synopsis form,
-.Nm
-will print information about all supported options and their purpose.
-.Pp
-The following options are available:
-.Bl -tag -width flag
-.It Fl h
-Shows a short summary of all available options and their purpose.
-.It Fl t
-Changes the output of the utility to show the variable values, one
-per line, without the variable names.
-.El
-.Ss Static configuration variables
-The following list describes all the variables that are part of ATF's
-static configuration:
-.Bl -tag -width atfXbuildXcppflagsXX
-.It Va atf_arch
-The architecture name detected by ATF.
-This is derived from
-.Va atf_machine
-because it is a subset of it.
-Given that this name might be misdetected, it is provided to the user
-as a configuration variable so that he can fix its value temporarily
-until a real fix is incorporated into mainstream sources.
-.It Va atf_build_cc
-The C compiler used by the ATF checks that provide build-time tests.
-.It Va atf_build_cflags
-The C compiler flags used by the ATF checks that provide build-time tests.
-.It Va atf_build_cpp
-The C/C++ preprocessor used by the ATF checks that provide build-time tests.
-.It Va atf_build_cppflags
-The C/C++ preprocessor flags used by the ATF checks that provide build-time
-tests.
-.It Va atf_build_cxx
-The C++ compiler used by the ATF checks that provide build-time tests.
-.It Va atf_build_cxxflags
-The C++ compiler flags used by the ATF checks that provide build-time tests.
-.It Va atf_confdir
-The path to the directory that contains the system-wide configuration
-files for ATF.
-.It Va atf_includedir
-The path to the directory that contains the ATF header files.
-.It Va atf_libdir
-The path to the directory that contains the ATF libraries.
-.It Va atf_libexecdir
-The path to the directory that contains the auxiliary utilities of ATF,
-used internally by the public tools.
-.It Va atf_machine
-The machine type name detected by ATF.
-This should not be tunable but is provided for symmetry with
-.Va atf_arch .
-.It Va atf_pkgdatadir
-The path to the directory that contains the files that form the ATF's
-shell-scripting library.
-.It Va atf_shell
-The path to the shell interpreter that will be used by ATF.
-.It Va atf_workdir
-The path to the temporary directory that the utilities and the test
-programs will use to store temporary files in.
-.El
-.Sh ENVIRONMENT
-Every variable that is part of the static configuration can be
-overridden at run-time by defining an environment variable.
-This environment variable has the exact same name as the one shown by
-.Nm
-except that the name is all composed of uppercase letters.
-.Pp
-In general, empty values in the environment will be ignored unless
-otherwise noted below.
-.Pp
-The recognized environment variables are:
-.Bl -tag -width ATFXBUILDXCPPFLAGSXX
-.It Ev ATF_ARCH
-Overrides the built-in value of
-.Va atf_arch .
-.It Ev ATF_BUILD_CC
-Overrides the built-in value of
-.Va atf_build_cc .
-.It Ev ATF_BUILD_CFLAGS
-Overrides the built-in value of
-.Va atf_build_cflags .
-Empty values are allowed.
-.It Ev ATF_BUILD_CPP
-Overrides the built-in value of
-.Va atf_build_cpp .
-.It Ev ATF_BUILD_CPPFLAGS
-Overrides the built-in value of
-.Va atf_build_cppflags .
-Empty values are allowed.
-.It Ev ATF_BUILD_CXX
-Overrides the built-in value of
-.Va atf_build_cxx .
-.It Ev ATF_BUILD_CXXFLAGS
-Overrides the built-in value of
-.Va atf_build_cxxflags .
-Empty values are allowed.
-.It Ev ATF_CONFDIR
-Overrides the built-in value of
-.Va atf_confdir .
-.It Ev ATF_INCLUDEDIR
-Overrides the built-in value of
-.Va atf_includedir .
-.It Ev ATF_LIBDIR
-Overrides the built-in value of
-.Va atf_libdir .
-.It Ev ATF_LIBEXECDIR
-Overrides the built-in value of
-.Va atf_libexecdir .
-.It Ev ATF_MACHINE
-Overrides the built-in value of
-.Va atf_machine .
-.It Ev ATF_PKGDATADIR
-Overrides the built-in value of
-.Va atf_pkgdatadir .
-.It Ev ATF_SHELL
-Overrides the built-in value of
-.Va atf_shell .
-.It Ev ATF_WORKDIR
-Overrides the built-in value of
-.Va atf_workdir .
-.El
-.Sh SEE ALSO
-.Xr atf 7
diff --git a/contrib/atf/atf-config/atf-config.cpp b/contrib/atf/atf-config/atf-config.cpp
deleted file mode 100644
index e5fdca1950e..00000000000
--- a/contrib/atf/atf-config/atf-config.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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 <cstdlib>
-#include <iostream>
-#include <map>
-#include <string>
-
-extern "C" {
-#include "atf-c/defs.h"
-}
-
-#include "atf-c++/config.hpp"
-
-#include "atf-c++/detail/application.hpp"
-#include "atf-c++/detail/sanity.hpp"
-
-class atf_config : public atf::application::app {
-    static const char* m_description;
-
-    bool m_tflag;
-
-    void process_option(int, const char*);
-    std::string specific_args(void) const;
-    options_set specific_options(void) const;
-
-    std::string format_var(const std::string&, const std::string&);
-
-public:
-    atf_config(void);
-
-    int main(void);
-};
-
-const char* atf_config::m_description =
-    "atf-config is a tool that queries the value of several "
-    "installation-specific configuration values of the atf.  "
-    "It can be used by external tools to discover where specific "
-    "internal atf files are installed.";
-
-atf_config::atf_config(void) :
-    app(m_description, "atf-config(1)", "atf(7)"),
-    m_tflag(false)
-{
-}
-
-void
-atf_config::process_option(int ch, const char* arg ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-    switch (ch) {
-    case 't':
-        m_tflag = true;
-        break;
-
-    default:
-        UNREACHABLE;
-    }
-}
-
-std::string
-atf_config::specific_args(void)
-    const
-{
-    return "[var1 [.. varN]]";
-}
-
-atf_config::options_set
-atf_config::specific_options(void)
-    const
-{
-    using atf::application::option;
-    options_set opts;
-    opts.insert(option('t', "", "Terse output: show values only"));
-    return opts;
-}
-
-std::string
-atf_config::format_var(const std::string& name, const std::string& val)
-{
-    std::string str;
-
-    if (m_tflag)
-        str = val;
-    else
-        str = name + " : " + val;
-
-    return str;
-}
-
-int
-atf_config::main(void)
-{
-    if (m_argc < 1) {
-        std::map< std::string, std::string > cv = atf::config::get_all();
-
-        for (std::map< std::string, std::string >::const_iterator iter =
-             cv.begin(); iter != cv.end(); iter++)
-            std::cout << format_var((*iter).first, (*iter).second) << "\n";
-    } else {
-        for (int i = 0; i < m_argc; i++) {
-            if (!atf::config::has(m_argv[i]))
-                throw std::runtime_error(std::string("Unknown variable `") +
-                                         m_argv[i] + "'");
-        }
-
-        for (int i = 0; i < m_argc; i++) {
-            std::cout << format_var(m_argv[i], atf::config::get(m_argv[i]))
-                      << "\n";
-        }
-    }
-
-    return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char* const* argv)
-{
-    return atf_config().run(argc, argv);
-}
diff --git a/contrib/atf/atf-config/integration_test.sh b/contrib/atf/atf-config/integration_test.sh
deleted file mode 100644
index 5d6505a4176..00000000000
--- a/contrib/atf/atf-config/integration_test.sh
+++ /dev/null
@@ -1,180 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-all_vars="atf_arch \
-          atf_build_cc \
-          atf_build_cflags \
-          atf_build_cpp \
-          atf_build_cppflags \
-          atf_build_cxx \
-          atf_build_cxxflags \
-          atf_confdir \
-          atf_includedir \
-          atf_libdir \
-          atf_libexecdir \
-          atf_machine \
-          atf_pkgdatadir \
-          atf_shell \
-          atf_workdir"
-all_vars_no=15
-
-atf_test_case list_all
-list_all_head()
-{
-    atf_set "descr" "Tests that at atf-config prints all expected" \
-                    "variables, and not more"
-}
-list_all_body()
-{
-    atf_check -s eq:0 -o save:stdout -e empty atf-config
-    atf_check -s eq:0 -o empty -e empty \
-              test "$(wc -l stdout | awk '{ print $1 }')" = "${all_vars_no}"
-    for v in ${all_vars}; do
-        atf_check -s eq:0 -o ignore -e empty grep "${v}" stdout
-    done
-}
-
-atf_test_case query_one
-query_one_head()
-{
-    atf_set "descr" "Tests that querying a single variable works"
-}
-query_one_body()
-{
-    for v in ${all_vars}; do
-        atf_check -s eq:0 -o save:stdout -o match:"${v}" -e empty \
-            atf-config "${v}"
-        atf_check -s eq:0 -o empty -e empty \
-                  test "$(wc -l stdout | awk '{ print $1 }')" = 1
-    done
-}
-
-atf_test_case query_one_terse
-query_one_terse_head()
-{
-    atf_set "descr" "Tests that querying a single variable in terse mode" \
-                    "works"
-}
-query_one_terse_body()
-{
-    for v in ${all_vars}; do
-        atf_check -s eq:0 -o save:stdout -o match:"${v}" -e empty \
-            atf-config "${v}"
-        atf_check -s eq:0 -o empty -e empty \
-                  test "$(wc -l stdout | awk '{ print $1 }')" = 1
-        atf_check -s eq:0 -o save:stdout -e empty cut -d ' ' -f 3- stdout
-        atf_check -s eq:0 -o empty -e empty mv stdout expout
-        atf_check -s eq:0 -o file:expout -e empty atf-config -t "${v}"
-    done
-}
-
-atf_test_case query_multiple
-query_multiple_head()
-{
-    atf_set "descr" "Tests that querying multiple variables works"
-}
-query_multiple_body()
-{
-    atf_check -s eq:0 -o save:stdout -o match:'atf_libexecdir' \
-        -o match:'atf_shell' -e empty atf-config atf_libexecdir atf_shell
-    atf_check -s eq:0 -o empty -e empty \
-              test "$(wc -l stdout | awk '{ print $1 }')" = 2
-}
-
-atf_test_case query_unknown
-query_unknown_head()
-{
-    atf_set "descr" "Tests that querying an unknown variable delivers" \
-                    "the correct error"
-}
-query_unknown_body()
-{
-    atf_check -s eq:1 -o empty -e match:'Unknown variable.*non_existent' \
-        atf-config non_existent
-}
-
-atf_test_case query_mixture
-query_mixture_head()
-{
-    atf_set "descr" "Tests that querying a known and an unknown variable" \
-                    "delivers the correct error"
-}
-query_mixture_body()
-{
-    for v in ${all_vars}; do
-        atf_check -s eq:1 -o empty -e match:'Unknown variable.*non_existent' \
-                  atf-config "${v}" non_existent
-        atf_check -s eq:1 -o empty -e match:'Unknown variable.*non_existent' \
-                  atf-config non_existent "${v}"
-    done
-}
-
-atf_test_case override_env
-override_env_head()
-{
-    atf_set "descr" "Tests that build-time variables can be overriden" \
-                    "through their corresponding environment variables"
-}
-override_env_body()
-{
-    for v in ${all_vars}; do
-        V=$(echo ${v} | tr '[a-z]' '[A-Z]')
-        atf_check -s eq:0 -o save:stdout -e empty -x "${V}=testval atf-config"
-        atf_check -s eq:0 -o empty -e empty mv stdout all
-
-        atf_check -s eq:0 -o save:stdout -e empty grep "^${v} : " all
-        atf_check -s eq:0 -o empty -e empty mv stdout affected
-        atf_check -s eq:0 -o save:stdout -e empty grep -v "^${v} : " all
-        atf_check -s eq:0 -o empty -e empty mv stdout unaffected
-
-        atf_check -s eq:0 -o empty -e empty \
-                  test "$(wc -l affected | awk '{ print $1 }')" = 1
-        atf_check -s eq:0 -o empty -e empty \
-                  test "$(wc -l unaffected | awk '{ print $1 }')" = \
-                   "$((${all_vars_no} -1))"
-
-        atf_check -s eq:0 -o ignore -e empty grep "^${v} : testval$" affected
-        atf_check -s eq:1 -o empty -e empty grep ' : testval$' unaffected
-    done
-}
-
-atf_init_test_cases()
-{
-    atf_add_test_case list_all
-
-    atf_add_test_case query_one
-    atf_add_test_case query_one_terse
-    atf_add_test_case query_multiple
-    atf_add_test_case query_unknown
-    atf_add_test_case query_mixture
-
-    atf_add_test_case override_env
-}
-
-# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/atf-report/Atffile b/contrib/atf/atf-report/Atffile
deleted file mode 100644
index 146211e000d..00000000000
--- a/contrib/atf/atf-report/Atffile
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp-glob: *_test
diff --git a/contrib/atf/atf-report/Kyuafile b/contrib/atf/atf-report/Kyuafile
deleted file mode 100644
index d69e3fa54df..00000000000
--- a/contrib/atf/atf-report/Kyuafile
+++ /dev/null
@@ -1,6 +0,0 @@
-syntax("kyuafile", 1)
-
-test_suite("atf")
-
-atf_test_program{name="integration_test"}
-atf_test_program{name="reader_test"}
diff --git a/contrib/atf/atf-report/Makefile.am.inc b/contrib/atf/atf-report/Makefile.am.inc
deleted file mode 100644
index e62275e64ee..00000000000
--- a/contrib/atf/atf-report/Makefile.am.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-bin_PROGRAMS += atf-report/atf-report
-atf_report_atf_report_SOURCES = atf-report/atf-report.cpp \
-                                atf-report/reader.cpp \
-                                atf-report/reader.hpp
-atf_report_atf_report_LDADD = $(ATF_CXX_LIBS)
-dist_man_MANS += atf-report/atf-report.1
-
-cssdir = $(atf_cssdir)
-css_DATA = atf-report/tests-results.css
-EXTRA_DIST += $(css_DATA)
-
-dtddir = $(atf_dtddir)
-dtd_DATA = atf-report/tests-results.dtd
-EXTRA_DIST += $(dtd_DATA)
-
-xsldir = $(atf_xsldir)
-xsl_DATA = atf-report/tests-results.xsl
-EXTRA_DIST += $(xsl_DATA)
-
-tests_atf_report_DATA = atf-report/Atffile \
-                        atf-report/Kyuafile
-tests_atf_reportdir = $(pkgtestsdir)/atf-report
-EXTRA_DIST += $(tests_atf_report_DATA)
-
-tests_atf_report_PROGRAMS = atf-report/fail_helper
-atf_report_fail_helper_SOURCES = atf-report/fail_helper.cpp
-atf_report_fail_helper_LDADD = $(ATF_CXX_LIBS)
-
-tests_atf_report_PROGRAMS += atf-report/misc_helpers
-atf_report_misc_helpers_SOURCES = atf-report/misc_helpers.cpp
-atf_report_misc_helpers_LDADD = $(ATF_CXX_LIBS)
-
-tests_atf_report_PROGRAMS += atf-report/pass_helper
-atf_report_pass_helper_SOURCES = atf-report/pass_helper.cpp
-atf_report_pass_helper_LDADD = $(ATF_CXX_LIBS)
-
-tests_atf_report_SCRIPTS = atf-report/integration_test
-CLEANFILES += atf-report/integration_test
-EXTRA_DIST += atf-report/integration_test.sh
-atf-report/integration_test: $(srcdir)/atf-report/integration_test.sh
-	test -d atf-report || mkdir -p atf-report
-	@src="$(srcdir)/atf-report/integration_test.sh"; \
-	dst="atf-report/integration_test"; $(BUILD_SH_TP)
-
-tests_atf_report_PROGRAMS += atf-report/reader_test
-atf_report_reader_test_SOURCES = atf-report/reader_test.cpp \
-                                 atf-report/reader.cpp
-atf_report_reader_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail
-atf_report_reader_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/atf-report/atf-report.1 b/contrib/atf/atf-report/atf-report.1
deleted file mode 100644
index df03af0e072..00000000000
--- a/contrib/atf/atf-report/atf-report.1
+++ /dev/null
@@ -1,168 +0,0 @@
-.\"
-.\" Automated Testing Framework (atf)
-.\"
-.\" 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.
-.\"
-.Dd December 16, 2011
-.Dt ATF-REPORT 1
-.Os
-.Sh NAME
-.Nm atf-report
-.Nd transforms the output of atf-run to different formats
-.Sh SYNOPSIS
-.Nm
-.Op Fl o Ar fmt1:path1 Op .. Fl o Ar fmtN:pathN
-.Nm
-.Fl h
-.Sh DESCRIPTION
-.Nm
-reads the output of
-.Nm atf-run
-and transforms it to different formats.
-Some of these are user-friendly and others are machine-parseable, which
-opens a wide range of possibilities to analyze the results of a test
-suite's execution.
-See
-.Sx Output formats
-below for more details on which these formats are.
-.Pp
-In the first synopsis form,
-.Nm
-reads the output of
-.Nm atf-run
-through its standard input and, if no
-.Fl o
-options are given, prints a user-friendly report on its standard
-output using the
-.Sq ticker
-format.
-If
-.Fl o
-options are provided (more than one are allowed), they specify the complete
-list of reports to generate.
-They are all generated simultaneously, and for obvious reasons, two reports
-cannot be written to the same file.
-Note that the default output is suppressed when
-.Fl o
-is provided.
-.Pp
-In the second synopsis form,
-.Nm
-will print information about all supported options and their purpose.
-.Pp
-The following options are available:
-.Bl -tag -width XoXfmtXpathXX
-.It Fl h
-Shows a short summary of all available options and their purpose.
-.It Fl o Ar fmt:path
-Adds a new output format.
-.Ar fmt
-is one of the formats described later on in
-.Sx Output formats .
-.Ar path
-specifies where the report will be written to.
-Depending on the chosen format, this may refer to a single file or to
-a directory.
-For those formats that write to a single file, specifying a
-.Sq -
-as the path will redirect the report to the standard output.
-.El
-.Ss Output formats
-The following output formats are allowed:
-.Bl -tag -width tickerXX
-.It csv
-A machine-parseable Comma-Separated Values (CSV) file.
-This file contains the results for all test cases and test programs.
-Test cases are logged using the following syntax:
-.Bd -literal -offset indent
-tc, duration, test-program, test-case, result[, reason]
-.Ed
-.Pp
-The
-.Sq result
-field for test cases is always one of
-.Sq passed ,
-.Sq skipped
-or
-.Sq failed .
-The last two are always followed by a reason.
-.Pp
-Test programs are logged with the following syntax:
-.Bd -literal -offset indent
-tp, duration, test-program, result[, reason]
-.Ed
-.Pp
-In this case, the
-.Sq result
-can be one of:
-.Sq passed ,
-which denotes test programs that ran without any failure;
-.Sq failed ,
-which refers to test programs in which one or more test cases failed;
-or
-.Sq bogus ,
-which mentions those test programs that failed to execute by some reason.
-The reason field is only available in the last case.
-.Pp
-The time required to execute each test case and test program is
-also provided.
-You should not rely on the order of the entries in the resulting output.
-.It ticker
-A user-friendly report that shows the progress of the test suite's
-execution as it operates.
-This type of report should always be redirected to a virtual terminal,
-not a file, as it may use control sequences that will make the output
-unreadable in regular files.
-.It xml
-A report contained in a single XML file.
-Ideal for later processing with
-.Xr xsltproc 1
-to generate nice HTML reports.
-.El
-.Sh EXAMPLES
-The most simple way of running a test suite is to pipe the output of
-.Nm atf-run
-through
-.Nm
-without any additional flags.
-This will use the default output format, which is suitable to most users:
-.Bd -literal -offset indent
-atf-run | atf-report
-.Ed
-.Pp
-In some situations, it may be interesting to get a machine-parseable file
-aside from the standard report.
-This can be done as follows:
-.Bd -literal -offset indent
-atf-run | atf-report -o csv:testsuite.csv -o ticker:-
-.Ed
-.Pp
-Or if the standard report is not desired, thus achieving completely silent
-operation:
-atf-run | atf-report -o csv:testsuite.csv
-.Sh SEE ALSO
-.Xr atf-run 1 ,
-.Xr atf 7
diff --git a/contrib/atf/atf-report/atf-report.cpp b/contrib/atf/atf-report/atf-report.cpp
deleted file mode 100644
index bcc70408505..00000000000
--- a/contrib/atf/atf-report/atf-report.cpp
+++ /dev/null
@@ -1,705 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/time.h>
-}
-
-#include <cstdlib>
-#include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <memory>
-#include <sstream>
-#include <utility>
-#include <vector>
-
-#include "atf-c/defs.h"
-
-#include "atf-c++/detail/application.hpp"
-#include "atf-c++/detail/fs.hpp"
-#include "atf-c++/detail/sanity.hpp"
-#include "atf-c++/detail/text.hpp"
-#include "atf-c++/detail/ui.hpp"
-
-#include "reader.hpp"
-
-typedef std::auto_ptr< std::ostream > ostream_ptr;
-
-static ostream_ptr
-open_outfile(const atf::fs::path& path)
-{
-    ostream_ptr osp;
-    if (path.str() == "-")
-        osp = ostream_ptr(new std::ofstream("/dev/stdout"));
-    else
-        osp = ostream_ptr(new std::ofstream(path.c_str()));
-    if (!(*osp))
-        throw std::runtime_error("Could not create file " + path.str());
-    return osp;
-}
-
-static std::string
-format_tv(struct timeval* tv)
-{
-    std::ostringstream output;
-    output << static_cast< long >(tv->tv_sec) << '.'
-           << std::setfill('0') << std::setw(6)
-           << static_cast< long >(tv->tv_usec);
-    return output.str();
-}
-
-// ------------------------------------------------------------------------
-// The "writer" interface.
-// ------------------------------------------------------------------------
-
-//!
-//! \brief A base class that defines an output format.
-//!
-//! The writer base class defines a generic interface to output formats.
-//! This is meant to be subclassed, and each subclass can redefine any
-//! method to format the information as it wishes.
-//!
-//! This class is not tied to a output stream nor a file because, depending
-//! on the output format, we will want to write to a single file or to
-//! multiple ones.
-//!
-class writer {
-public:
-    writer(void) {}
-    virtual ~writer(void) {}
-
-    virtual void write_info(const std::string&, const std::string&) {}
-    virtual void write_ntps(size_t) {}
-    virtual void write_tp_start(const std::string&, size_t) {}
-    virtual void write_tp_end(struct timeval*, const std::string&) {}
-    virtual void write_tc_start(const std::string&) {}
-    virtual void write_tc_stdout_line(const std::string&) {}
-    virtual void write_tc_stderr_line(const std::string&) {}
-    virtual void write_tc_end(const std::string&, struct timeval*,
-                              const std::string&) {}
-    virtual void write_eof(void) {}
-};
-
-// ------------------------------------------------------------------------
-// The "csv_writer" class.
-// ------------------------------------------------------------------------
-
-//!
-//! \brief A very simple plain-text output format.
-//!
-//! The csv_writer class implements a very simple plain-text output
-//! format that summarizes the results of each executed test case.  The
-//! results are meant to be easily parseable by third-party tools, hence
-//! they are formatted as a CSV file.
-//!
-class csv_writer : public writer {
-    ostream_ptr m_os;
-    bool m_failed;
-
-    std::string m_tpname;
-    std::string m_tcname;
-
-public:
-    csv_writer(const atf::fs::path& p) :
-        m_os(open_outfile(p))
-    {
-    }
-
-    virtual
-    void
-    write_tp_start(const std::string& name,
-                   size_t ntcs ATF_DEFS_ATTRIBUTE_UNUSED)
-    {
-        m_tpname = name;
-        m_failed = false;
-    }
-
-    virtual
-    void
-    write_tp_end(struct timeval* tv, const std::string& reason)
-    {
-        const std::string timestamp = format_tv(tv);
-
-        if (!reason.empty())
-            (*m_os) << "tp, " << timestamp << ", " << m_tpname << ", bogus, "
-                    << reason << "\n";
-        else if (m_failed)
-            (*m_os) << "tp, " << timestamp << ", "<< m_tpname << ", failed\n";
-        else
-            (*m_os) << "tp, " << timestamp << ", "<< m_tpname << ", passed\n";
-    }
-
-    virtual
-    void
-    write_tc_start(const std::string& name)
-    {
-        m_tcname = name;
-    }
-
-    virtual
-    void
-    write_tc_end(const std::string& state, struct timeval* tv,
-                 const std::string& reason)
-    {
-        std::string str = m_tpname + ", " + m_tcname + ", " + state;
-        if (!reason.empty())
-            str += ", " + reason;
-        (*m_os) << "tc, " << format_tv(tv) << ", " << str << "\n";
-
-        if (state == "failed")
-            m_failed = true;
-    }
-};
-
-// ------------------------------------------------------------------------
-// The "ticker_writer" class.
-// ------------------------------------------------------------------------
-
-//!
-//! \brief A console-friendly output format.
-//!
-//! The ticker_writer class implements a formatter that is user-friendly
-//! in the sense that it shows the execution of test cases in an easy to
-//! read format.  It is not meant to be parseable and its format can
-//! freely change across releases.
-//!
-class ticker_writer : public writer {
-    ostream_ptr m_os;
-
-    size_t m_curtp, m_ntps;
-    size_t m_tcs_passed, m_tcs_failed, m_tcs_skipped, m_tcs_expected_failures;
-    std::string m_tcname, m_tpname;
-    std::vector< std::string > m_failed_tcs;
-    std::map< std::string, std::string > m_expected_failures_tcs;
-    std::vector< std::string > m_failed_tps;
-
-    void
-    write_info(const std::string& what, const std::string& val)
-    {
-        if (what == "tests.root") {
-            (*m_os) << "Tests root: " << val << "\n\n";
-        }
-    }
-
-    void
-    write_ntps(size_t ntps)
-    {
-        m_curtp = 1;
-        m_tcs_passed = 0;
-        m_tcs_failed = 0;
-        m_tcs_skipped = 0;
-        m_tcs_expected_failures = 0;
-        m_ntps = ntps;
-    }
-
-    void
-    write_tp_start(const std::string& tp, size_t ntcs)
-    {
-        using atf::text::to_string;
-        using atf::ui::format_text;
-
-        m_tpname = tp;
-
-        (*m_os) << format_text(tp + " (" + to_string(m_curtp) +
-                               "/" + to_string(m_ntps) + "): " +
-                               to_string(ntcs) + " test cases")
-                << "\n";
-        (*m_os).flush();
-    }
-
-    void
-    write_tp_end(struct timeval* tv, const std::string& reason)
-    {
-        using atf::ui::format_text_with_tag;
-
-        m_curtp++;
-
-        if (!reason.empty()) {
-            (*m_os) << format_text_with_tag("BOGUS TEST PROGRAM: Cannot "
-                                            "trust its results because "
-                                            "of `" + reason + "'",
-                                            m_tpname + ": ", false)
-                    << "\n";
-            m_failed_tps.push_back(m_tpname);
-        }
-        (*m_os) << "[" << format_tv(tv) << "s]\n\n";
-        (*m_os).flush();
-
-        m_tpname.clear();
-    }
-
-    void
-    write_tc_start(const std::string& tcname)
-    {
-        m_tcname = tcname;
-
-        (*m_os) << "    " + tcname + ": ";
-        (*m_os).flush();
-    }
-
-    void
-    write_tc_end(const std::string& state, struct timeval* tv,
-                 const std::string& reason)
-    {
-        std::string str;
-
-        (*m_os) << "[" << format_tv(tv) << "s] ";
-
-        if (state == "expected_death" || state == "expected_exit" ||
-            state == "expected_failure" || state == "expected_signal" ||
-            state == "expected_timeout") {
-            str = "Expected failure: " + reason;
-            m_tcs_expected_failures++;
-            m_expected_failures_tcs[m_tpname + ":" + m_tcname] = reason;
-        } else if (state == "failed") {
-            str = "Failed: " + reason;
-            m_tcs_failed++;
-            m_failed_tcs.push_back(m_tpname + ":" + m_tcname);
-        } else if (state == "passed") {
-            str = "Passed.";
-            m_tcs_passed++;
-        } else if (state == "skipped") {
-            str = "Skipped: " + reason;
-            m_tcs_skipped++;
-        } else
-            UNREACHABLE;
-
-        // XXX Wrap text.  format_text_with_tag does not currently allow
-        // to specify the current column, which is needed because we have
-        // already printed the tc's name.
-        (*m_os) << str << '\n';
-
-        m_tcname = "";
-    }
-
-    static void
-    write_expected_failures(const std::map< std::string, std::string >& xfails,
-                            std::ostream& os)
-    {
-        using atf::ui::format_text;
-        using atf::ui::format_text_with_tag;
-
-        os << format_text("Test cases for known bugs:") << "\n";
-
-        for (std::map< std::string, std::string >::const_iterator iter =
-             xfails.begin(); iter != xfails.end(); iter++) {
-            const std::string& name = (*iter).first;
-            const std::string& reason = (*iter).second;
-
-            os << format_text_with_tag(reason, "    " + name + ": ", false)
-               << "\n";
-        }
-    }
-
-    void
-    write_eof(void)
-    {
-        using atf::text::join;
-        using atf::text::to_string;
-        using atf::ui::format_text;
-        using atf::ui::format_text_with_tag;
-
-        if (!m_failed_tps.empty()) {
-            (*m_os) << format_text("Failed (bogus) test programs:")
-                    << "\n";
-            (*m_os) << format_text_with_tag(join(m_failed_tps, ", "),
-                                            "    ", false) << "\n\n";
-        }
-
-        if (!m_expected_failures_tcs.empty()) {
-            write_expected_failures(m_expected_failures_tcs, *m_os);
-            (*m_os) << "\n";
-        }
-
-        if (!m_failed_tcs.empty()) {
-            (*m_os) << format_text("Failed test cases:") << "\n";
-            (*m_os) << format_text_with_tag(join(m_failed_tcs, ", "),
-                                            "    ", false) << "\n\n";
-        }
-
-        (*m_os) << format_text("Summary for " + to_string(m_ntps) +
-                               " test programs:") << "\n";
-        (*m_os) << format_text_with_tag(to_string(m_tcs_passed) +
-                                        " passed test cases.",
-                                        "    ", false) << "\n";
-        (*m_os) << format_text_with_tag(to_string(m_tcs_failed) +
-                                        " failed test cases.",
-                                        "    ", false) << "\n";
-        (*m_os) << format_text_with_tag(to_string(m_tcs_expected_failures) +
-                                        " expected failed test cases.",
-                                        "    ", false) << "\n";
-        (*m_os) << format_text_with_tag(to_string(m_tcs_skipped) +
-                                        " skipped test cases.",
-                                        "    ", false) << "\n";
-    }
-
-public:
-    ticker_writer(const atf::fs::path& p) :
-        m_os(open_outfile(p))
-    {
-    }
-};
-
-// ------------------------------------------------------------------------
-// The "xml" class.
-// ------------------------------------------------------------------------
-
-//!
-//! \brief A single-file XML output format.
-//!
-//! The xml_writer class implements a formatter that prints the results
-//! of test cases in an XML format easily parseable later on by other
-//! utilities.
-//!
-class xml_writer : public writer {
-    ostream_ptr m_os;
-
-    std::string m_tcname, m_tpname;
-
-    static
-    std::string
-    attrval(const std::string& str)
-    {
-        return str;
-    }
-
-    static
-    std::string
-    elemval(const std::string& str)
-    {
-        std::string ostr;
-        for (std::string::const_iterator iter = str.begin();
-             iter != str.end(); iter++) {
-            switch (*iter) {
-            case '&': ostr += "&amp;"; break;
-            case '<': ostr += "&lt;"; break;
-            case '>': ostr += "&gt;"; break;
-            default:  ostr += *iter;
-            }
-        }
-        return ostr;
-    }
-
-    void
-    write_info(const std::string& what, const std::string& val)
-    {
-        (*m_os) << "<info class=\"" << what << "\">" << val << "</info>\n";
-    }
-
-    void
-    write_tp_start(const std::string& tp,
-                   size_t ntcs ATF_DEFS_ATTRIBUTE_UNUSED)
-    {
-        (*m_os) << "<tp id=\"" << attrval(tp) << "\">\n";
-    }
-
-    void
-    write_tp_end(struct timeval* tv, const std::string& reason)
-    {
-        if (!reason.empty())
-            (*m_os) << "<failed>" << elemval(reason) << "</failed>\n";
-        (*m_os) << "<tp-time>" << format_tv(tv) << "</tp-time>";
-        (*m_os) << "</tp>\n";
-    }
-
-    void
-    write_tc_start(const std::string& tcname)
-    {
-        (*m_os) << "<tc id=\"" << attrval(tcname) << "\">\n";
-    }
-
-    void
-    write_tc_stdout_line(const std::string& line)
-    {
-        (*m_os) << "<so>" << elemval(line) << "</so>\n";
-    }
-
-    void
-    write_tc_stderr_line(const std::string& line)
-    {
-        (*m_os) << "<se>" << elemval(line) << "</se>\n";
-    }
-
-    void
-    write_tc_end(const std::string& state, struct timeval* tv,
-                 const std::string& reason)
-    {
-        std::string str;
-
-        if (state == "expected_death" || state == "expected_exit" ||
-            state == "expected_failure" || state == "expected_signal" ||
-            state == "expected_timeout") {
-            (*m_os) << "<" << state << ">" << elemval(reason)
-                    << "</" << state << ">\n";
-        } else if (state == "passed") {
-            (*m_os) << "<passed />\n";
-        } else if (state == "failed") {
-            (*m_os) << "<failed>" << elemval(reason) << "</failed>\n";
-        } else if (state == "skipped") {
-            (*m_os) << "<skipped>" << elemval(reason) << "</skipped>\n";
-        } else
-            UNREACHABLE;
-        (*m_os) << "<tc-time>" << format_tv(tv) << "</tc-time>";
-        (*m_os) << "</tc>\n";
-    }
-
-    void
-    write_eof(void)
-    {
-        (*m_os) << "</tests-results>\n";
-    }
-
-public:
-    xml_writer(const atf::fs::path& p) :
-        m_os(open_outfile(p))
-    {
-        (*m_os) << "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n"
-                << "<!DOCTYPE tests-results PUBLIC "
-                   "\"-//NetBSD//DTD ATF Tests Results 0.1//EN\" "
-                   "\"http://www.NetBSD.org/XML/atf/tests-results.dtd\">\n\n"
-                   "<tests-results>\n";
-    }
-};
-
-// ------------------------------------------------------------------------
-// The "converter" class.
-// ------------------------------------------------------------------------
-
-//!
-//! \brief A reader that redirects events to multiple writers.
-//!
-//! The converter class implements an atf_tps_reader that, for each event
-//! raised by the parser, redirects it to multiple writers so that they
-//! can reformat it according to their output rules.
-//!
-class converter : public atf::atf_report::atf_tps_reader {
-    typedef std::vector< writer* > outs_vector;
-    outs_vector m_outs;
-
-    void
-    got_info(const std::string& what, const std::string& val)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            (*iter)->write_info(what, val);
-    }
-
-    void
-    got_ntps(size_t ntps)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            (*iter)->write_ntps(ntps);
-    }
-
-    void
-    got_tp_start(const std::string& tp, size_t ntcs)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            (*iter)->write_tp_start(tp, ntcs);
-    }
-
-    void
-    got_tp_end(struct timeval* tv, const std::string& reason)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            (*iter)->write_tp_end(tv, reason);
-    }
-
-    void
-    got_tc_start(const std::string& tcname)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            (*iter)->write_tc_start(tcname);
-    }
-
-    void
-    got_tc_stdout_line(const std::string& line)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            (*iter)->write_tc_stdout_line(line);
-    }
-
-    void
-    got_tc_stderr_line(const std::string& line)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            (*iter)->write_tc_stderr_line(line);
-    }
-
-    void
-    got_tc_end(const std::string& state, struct timeval* tv,
-               const std::string& reason)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            (*iter)->write_tc_end(state, tv, reason);
-    }
-
-    void
-    got_eof(void)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            (*iter)->write_eof();
-    }
-
-public:
-    converter(std::istream& is) :
-        atf::atf_report::atf_tps_reader(is)
-    {
-    }
-
-    ~converter(void)
-    {
-        for (outs_vector::iterator iter = m_outs.begin();
-             iter != m_outs.end(); iter++)
-            delete *iter;
-    }
-
-    void
-    add_output(const std::string& fmt, const atf::fs::path& p)
-    {
-        if (fmt == "csv") {
-            m_outs.push_back(new csv_writer(p));
-        } else if (fmt == "ticker") {
-            m_outs.push_back(new ticker_writer(p));
-        } else if (fmt == "xml") {
-            m_outs.push_back(new xml_writer(p));
-        } else
-            throw std::runtime_error("Unknown format `" + fmt + "'");
-    }
-};
-
-// ------------------------------------------------------------------------
-// The "atf_report" class.
-// ------------------------------------------------------------------------
-
-class atf_report : public atf::application::app {
-    static const char* m_description;
-
-    typedef std::pair< std::string, atf::fs::path > fmt_path_pair;
-    std::vector< fmt_path_pair > m_oflags;
-
-    void process_option(int, const char*);
-    options_set specific_options(void) const;
-
-public:
-    atf_report(void);
-
-    int main(void);
-};
-
-const char* atf_report::m_description =
-    "atf-report is a tool that parses the output of atf-run and "
-    "generates user-friendly reports in multiple different formats.";
-
-atf_report::atf_report(void) :
-    app(m_description, "atf-report(1)", "atf(7)")
-{
-}
-
-void
-atf_report::process_option(int ch, const char* arg)
-{
-    switch (ch) {
-    case 'o':
-        {
-            std::string str(arg);
-            std::string::size_type pos = str.find(':');
-            if (pos == std::string::npos)
-                throw std::runtime_error("Syntax error in -o option");
-            else {
-                std::string fmt = str.substr(0, pos);
-                atf::fs::path path = atf::fs::path(str.substr(pos + 1));
-                m_oflags.push_back(fmt_path_pair(fmt, path));
-            }
-        }
-        break;
-
-    default:
-        UNREACHABLE;
-    }
-}
-
-atf_report::options_set
-atf_report::specific_options(void)
-    const
-{
-    using atf::application::option;
-    options_set opts;
-    opts.insert(option('o', "fmt:path", "Adds a new output file; multiple "
-                                        "ones can be specified, and a - "
-                                        "path means stdout"));
-    return opts;
-}
-
-int
-atf_report::main(void)
-{
-    if (m_argc > 0)
-        throw std::runtime_error("No arguments allowed");
-
-    if (m_oflags.empty())
-        m_oflags.push_back(fmt_path_pair("ticker", atf::fs::path("-")));
-
-    // Look for path duplicates.
-    std::set< atf::fs::path > paths;
-    for (std::vector< fmt_path_pair >::const_iterator iter = m_oflags.begin();
-         iter != m_oflags.end(); iter++) {
-        atf::fs::path p = (*iter).second;
-        if (p == atf::fs::path("/dev/stdout"))
-            p = atf::fs::path("-");
-        if (paths.find(p) != paths.end())
-            throw std::runtime_error("The file `" + p.str() + "' was "
-                                     "specified more than once");
-        paths.insert((*iter).second);
-    }
-
-    // Generate the output files.
-    converter cnv(std::cin);
-    for (std::vector< fmt_path_pair >::const_iterator iter = m_oflags.begin();
-         iter != m_oflags.end(); iter++)
-        cnv.add_output((*iter).first, (*iter).second);
-    cnv.read();
-
-    return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char* const* argv)
-{
-    return atf_report().run(argc, argv);
-}
diff --git a/contrib/atf/atf-report/fail_helper.cpp b/contrib/atf/atf-report/fail_helper.cpp
deleted file mode 100644
index 1009f0e4796..00000000000
--- a/contrib/atf/atf-report/fail_helper.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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++/macros.hpp"
-
-ATF_TEST_CASE(main);
-ATF_TEST_CASE_HEAD(main)
-{
-    set_md_var("descr", "Helper test case that always fails");
-}
-ATF_TEST_CASE_BODY(main)
-{
-    fail("This always fails");
-}
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    ATF_ADD_TEST_CASE(tcs, main);
-}
diff --git a/contrib/atf/atf-report/integration_test.sh b/contrib/atf/atf-report/integration_test.sh
deleted file mode 100644
index b19346a86c3..00000000000
--- a/contrib/atf/atf-report/integration_test.sh
+++ /dev/null
@@ -1,448 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-create_helpers()
-{
-    mkdir dir1
-    cp $(atf_get_srcdir)/pass_helper dir1/tp1
-    cp $(atf_get_srcdir)/fail_helper dir1/tp2
-    cp $(atf_get_srcdir)/pass_helper tp3
-    cp $(atf_get_srcdir)/fail_helper tp4
-
-    cat >tp5 <<EOF
-#! $(atf-config -t atf_shell)
-echo foo
-EOF
-    chmod +x tp5
-
-    cat >Atffile <<EOF
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: dir1
-tp: tp3
-tp: tp4
-tp: tp5
-EOF
-
-    cat >dir1/Atffile <<EOF
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: tp1
-tp: tp2
-EOF
-}
-
-run_helpers()
-{
-    mkdir etc
-    cat >etc/atf-run.hooks <<EOF
-#! $(atf-config -t atf_shell)
-
-info_start_hook()
-{
-    atf_tps_writer_info "startinfo" "A value"
-}
-
-info_end_hook()
-{
-    atf_tps_writer_info "endinfo" "Another value"
-}
-EOF
-    echo "Using atf-run to run helpers"
-    ATF_CONFDIR=$(pwd)/etc atf-run >tps.out 2>/dev/null
-    rm -rf etc
-}
-
-atf_test_case default
-default_head()
-{
-    atf_set "descr" "Checks that the default output uses the ticker" \
-                    "format"
-}
-default_body()
-{
-    create_helpers
-    run_helpers
-
-    # Check that the default output uses the ticker format.
-    atf_check -s eq:0 -o match:'test cases' -o match:'Failed test cases' \
-        -o match:'Summary for' -e empty -x 'atf-report <tps.out'
-}
-
-# XXX The test for all expect_ values should be intermixed with the other
-# tests.  However, to do that, we need to migrate to using C helpers for
-# simplicity in raising signals...
-atf_test_case expect
-expect_body()
-{
-    ln -s "$(atf_get_srcdir)/../atf-run/expect_helpers" .
-    cat >Atffile <<EOF
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: expect_helpers
-EOF
-    run_helpers
-
-# NO_CHECK_STYLE_BEGIN
-    cat >expout <<EOF
-tc, #.#, expect_helpers, death_and_exit, expected_death, Exit case
-tc, #.#, expect_helpers, death_and_signal, expected_death, Signal case
-tc, #.#, expect_helpers, death_but_pass, failed, Test case was expected to terminate abruptly but it continued execution
-tc, #.#, expect_helpers, exit_any_and_exit, expected_exit, Call will exit
-tc, #.#, expect_helpers, exit_but_pass, failed, Test case was expected to exit cleanly but it continued execution
-tc, #.#, expect_helpers, exit_code_and_exit, expected_exit, Call will exit
-tc, #.#, expect_helpers, fail_and_fail_check, expected_failure, And fail again: 2 checks failed as expected; see output for more details
-tc, #.#, expect_helpers, fail_and_fail_requirement, expected_failure, Fail reason: The failure
-tc, #.#, expect_helpers, fail_but_pass, failed, Test case was expecting a failure but none were raised
-tc, #.#, expect_helpers, pass_and_pass, passed
-tc, #.#, expect_helpers, pass_but_fail_check, failed, 1 checks failed; see output for more details
-tc, #.#, expect_helpers, pass_but_fail_requirement, failed, Some reason
-tc, #.#, expect_helpers, signal_any_and_signal, expected_signal, Call will signal
-tc, #.#, expect_helpers, signal_but_pass, failed, Test case was expected to receive a termination signal but it continued execution
-tc, #.#, expect_helpers, signal_no_and_signal, expected_signal, Call will signal
-tc, #.#, expect_helpers, timeout_and_hang, expected_timeout, Will overrun
-tc, #.#, expect_helpers, timeout_but_pass, failed, Test case was expected to hang but it continued execution
-tp, #.#, expect_helpers, failed
-EOF
-# NO_CHECK_STYLE_END
-    atf_check -s eq:0 -o file:expout -e empty -x \
-        "atf-report -o csv:- <tps.out | " \
-        "sed -E -e 's/[0-9]+.[0-9]{6}, /#.#, /'"
-
-# NO_CHECK_STYLE_BEGIN
-    cat >expout <<EOF
-expect_helpers (1/1): 17 test cases
-    death_and_exit: [#.#s] Expected failure: Exit case
-    death_and_signal: [#.#s] Expected failure: Signal case
-    death_but_pass: [#.#s] Failed: Test case was expected to terminate abruptly but it continued execution
-    exit_any_and_exit: [#.#s] Expected failure: Call will exit
-    exit_but_pass: [#.#s] Failed: Test case was expected to exit cleanly but it continued execution
-    exit_code_and_exit: [#.#s] Expected failure: Call will exit
-    fail_and_fail_check: [#.#s] Expected failure: And fail again: 2 checks failed as expected; see output for more details
-    fail_and_fail_requirement: [#.#s] Expected failure: Fail reason: The failure
-    fail_but_pass: [#.#s] Failed: Test case was expecting a failure but none were raised
-    pass_and_pass: [#.#s] Passed.
-    pass_but_fail_check: [#.#s] Failed: 1 checks failed; see output for more details
-    pass_but_fail_requirement: [#.#s] Failed: Some reason
-    signal_any_and_signal: [#.#s] Expected failure: Call will signal
-    signal_but_pass: [#.#s] Failed: Test case was expected to receive a termination signal but it continued execution
-    signal_no_and_signal: [#.#s] Expected failure: Call will signal
-    timeout_and_hang: [#.#s] Expected failure: Will overrun
-    timeout_but_pass: [#.#s] Failed: Test case was expected to hang but it continued execution
-[#.#s]
-
-Test cases for known bugs:
-    expect_helpers:death_and_exit: Exit case
-    expect_helpers:death_and_signal: Signal case
-    expect_helpers:exit_any_and_exit: Call will exit
-    expect_helpers:exit_code_and_exit: Call will exit
-    expect_helpers:fail_and_fail_check: And fail again: 2 checks failed as expected; see output for more details
-    expect_helpers:fail_and_fail_requirement: Fail reason: The failure
-    expect_helpers:signal_any_and_signal: Call will signal
-    expect_helpers:signal_no_and_signal: Call will signal
-    expect_helpers:timeout_and_hang: Will overrun
-
-Failed test cases:
-    expect_helpers:death_but_pass, expect_helpers:exit_but_pass, expect_helpers:fail_but_pass, expect_helpers:pass_but_fail_check, expect_helpers:pass_but_fail_requirement, expect_helpers:signal_but_pass, expect_helpers:timeout_but_pass
-
-Summary for 1 test programs:
-    1 passed test cases.
-    7 failed test cases.
-    9 expected failed test cases.
-    0 skipped test cases.
-EOF
-# NO_CHECK_STYLE_END
-    atf_check -s eq:0 -o file:expout -e empty -x \
-        "atf-report -o ticker:- <tps.out | " \
-        "sed -E -e 's/[0-9]+.[0-9]{6}/#.#/'"
-
-    # Just ensure that this does not crash for now...
-    atf_check -s eq:0 -o ignore -e empty -x "atf-report -o xml:- <tps.out"
-}
-
-atf_test_case oflag
-oflag_head()
-{
-    atf_set "descr" "Checks that the -o flag works"
-}
-oflag_body()
-{
-    create_helpers
-    run_helpers
-
-    # Get the default output.
-    atf_check -s eq:0 -o save:stdout -e empty -x 'atf-report <tps.out'
-    mv stdout defout
-
-    # Check that changing the stdout output works.
-    atf_check -s eq:0 -o save:stdout -e empty -x 'atf-report -o csv:- <tps.out'
-    atf_check -s eq:1 -o empty -e empty cmp -s defout stdout
-    cp stdout expcsv
-
-    # Check that sending the output to a file does not write to stdout.
-    atf_check -s eq:0 -o empty -e empty -x 'atf-report -o csv:fmt.out <tps.out'
-    atf_check -s eq:0 -o empty -e empty cmp -s expcsv fmt.out
-    rm -f fmt.out
-
-    # Check that defining two outputs using the same format works.
-    atf_check -s eq:0 -o empty -e empty -x \
-              'atf-report -o csv:fmt.out -o csv:fmt2.out <tps.out'
-    atf_check -s eq:0 -o empty -e empty cmp -s expcsv fmt.out
-    atf_check -s eq:0 -o empty -e empty cmp -s fmt.out fmt2.out
-    rm -f fmt.out fmt2.out
-
-    # Check that defining two outputs using different formats works.
-    atf_check -s eq:0 -o empty -e empty -x \
-              'atf-report -o csv:fmt.out -o ticker:fmt2.out <tps.out'
-    atf_check -s eq:0 -o empty -e empty cmp -s expcsv fmt.out
-    atf_check -s eq:1 -o empty -e empty cmp -s fmt.out fmt2.out
-    atf_check -s eq:0 -o ignore -e empty grep "test cases" fmt2.out
-    atf_check -s eq:0 -o ignore -e empty grep "Failed test cases" fmt2.out
-    atf_check -s eq:0 -o ignore -e empty grep "Summary for" fmt2.out
-    rm -f fmt.out fmt2.out
-
-    # Check that defining two outputs over the same file does not work.
-    atf_check -s eq:1 -o empty -e match:'more than once' -x \
-              'atf-report -o csv:fmt.out -o ticker:fmt.out <tps.out'
-    rm -f fmt.out
-
-    # Check that defining two outputs over stdout (but using different
-    # paths) does not work.
-    atf_check -s eq:1 -o empty -e match:'more than once' -x \
-              'atf-report -o csv:- -o ticker:/dev/stdout <tps.out'
-    rm -f fmt.out
-}
-
-atf_test_case output_csv
-output_csv_head()
-{
-    atf_set "descr" "Checks the CSV output format"
-}
-output_csv_body()
-{
-    create_helpers
-    run_helpers
-
-# NO_CHECK_STYLE_BEGIN
-    cat >expout <<EOF
-tc, #.#, dir1/tp1, main, passed
-tp, #.#, dir1/tp1, passed
-tc, #.#, dir1/tp2, main, failed, This always fails
-tp, #.#, dir1/tp2, failed
-tc, #.#, tp3, main, passed
-tp, #.#, tp3, passed
-tc, #.#, tp4, main, failed, This always fails
-tp, #.#, tp4, failed
-tp, #.#, tp5, bogus, Invalid format for test case list: 1: Unexpected token \`<<NEWLINE>>'; expected \`:'
-EOF
-# NO_CHECK_STYLE_END
-
-    atf_check -s eq:0 -o file:expout -e empty -x \
-        "atf-report -o csv:- <tps.out | sed -E -e 's/[0-9]+.[0-9]{6}, /#.#, /'"
-}
-
-atf_test_case output_ticker
-output_ticker_head()
-{
-    atf_set "descr" "Checks the ticker output format"
-}
-output_ticker_body()
-{
-    create_helpers
-    run_helpers
-
-# NO_CHECK_STYLE_BEGIN
-    cat >expout <<EOF
-dir1/tp1 (1/5): 1 test cases
-    main: [#.#s] Passed.
-[#.#s]
-
-dir1/tp2 (2/5): 1 test cases
-    main: [#.#s] Failed: This always fails
-[#.#s]
-
-tp3 (3/5): 1 test cases
-    main: [#.#s] Passed.
-[#.#s]
-
-tp4 (4/5): 1 test cases
-    main: [#.#s] Failed: This always fails
-[#.#s]
-
-tp5 (5/5): 0 test cases
-tp5: BOGUS TEST PROGRAM: Cannot trust its results because of \`Invalid format for test case list: 1: Unexpected token \`<<NEWLINE>>'; expected \`:''
-[#.#s]
-
-Failed (bogus) test programs:
-    tp5
-
-Failed test cases:
-    dir1/tp2:main, tp4:main
-
-Summary for 5 test programs:
-    2 passed test cases.
-    2 failed test cases.
-    0 expected failed test cases.
-    0 skipped test cases.
-EOF
-
-    atf_check -s eq:0 -o file:expout -e empty -x \
-        "atf-report -o ticker:- <tps.out | sed -E -e 's/[0-9]+.[0-9]{6}/#.#/'"
-}
-# NO_CHECK_STYLE_END
-
-atf_test_case output_xml
-output_xml_head()
-{
-    atf_set "descr" "Checks the XML output format"
-}
-output_xml_body()
-{
-    create_helpers
-    run_helpers
-
-# NO_CHECK_STYLE_BEGIN
-    cat >expout <<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE tests-results PUBLIC "-//NetBSD//DTD ATF Tests Results 0.1//EN" "http://www.NetBSD.org/XML/atf/tests-results.dtd">
-
-<tests-results>
-<info class="startinfo">A value</info>
-<tp id="dir1/tp1">
-<tc id="main">
-<passed />
-<tc-time>#.#</tc-time></tc>
-<tp-time>#.#</tp-time></tp>
-<tp id="dir1/tp2">
-<tc id="main">
-<failed>This always fails</failed>
-<tc-time>#.#</tc-time></tc>
-<tp-time>#.#</tp-time></tp>
-<tp id="tp3">
-<tc id="main">
-<passed />
-<tc-time>#.#</tc-time></tc>
-<tp-time>#.#</tp-time></tp>
-<tp id="tp4">
-<tc id="main">
-<failed>This always fails</failed>
-<tc-time>#.#</tc-time></tc>
-<tp-time>#.#</tp-time></tp>
-<tp id="tp5">
-<failed>Invalid format for test case list: 1: Unexpected token \`&lt;&lt;NEWLINE&gt;&gt;'; expected \`:'</failed>
-<tp-time>#.#</tp-time></tp>
-<info class="endinfo">Another value</info>
-</tests-results>
-EOF
-# NO_CHECK_STYLE_END
-
-    atf_check -s eq:0 -o file:expout -e empty -x \
-        "atf-report -o xml:- < tps.out | sed -E -e 's/>[0-9]+.[0-9]{6}</>#.#</'"
-}
-
-atf_test_case output_xml_space
-output_xml_space_head()
-{
-    atf_set "descr" "Checks that the XML output format properly preserves" \
-                    "leading and trailing whitespace in stdout and stderr" \
-                    "lines"
-}
-output_xml_space_body()
-{
-    cp $(atf_get_srcdir)/misc_helpers .
-    cat >Atffile <<EOF
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: misc_helpers
-EOF
-
-# NO_CHECK_STYLE_BEGIN
-    cat >expout <<EOF
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE tests-results PUBLIC "-//NetBSD//DTD ATF Tests Results 0.1//EN" "http://www.NetBSD.org/XML/atf/tests-results.dtd">
-
-<tests-results>
-<info class="startinfo">A value</info>
-<tp id="misc_helpers">
-<tc id="diff">
-<so>--- a	2007-11-04 14:00:41.000000000 +0100</so>
-<so>+++ b	2007-11-04 14:00:48.000000000 +0100</so>
-<so>@@ -1,7 +1,7 @@</so>
-<so> This test is meant to simulate a diff.</so>
-<so> Blank space at beginning of context lines must be preserved.</so>
-<so> </so>
-<so>-First original line.</so>
-<so>-Second original line.</so>
-<so>+First modified line.</so>
-<so>+Second modified line.</so>
-<so> </so>
-<so> EOF</so>
-<passed />
-<tc-time>#.#</tc-time></tc>
-<tp-time>#.#</tp-time></tp>
-<info class="endinfo">Another value</info>
-</tests-results>
-EOF
-# NO_CHECK_STYLE_END
-
-    run_helpers
-    atf_check -s eq:0 -o file:expout -e empty -x \
-        "atf-report -o xml:- <tps.out | sed -E -e 's/>[0-9]+.[0-9]{6}</>#.#</'"
-}
-
-atf_test_case too_many_args
-too_many_args_body()
-{
-    cat >experr <<EOF
-atf-report: ERROR: No arguments allowed
-EOF
-    atf_check -s eq:1 -o empty -e file:experr atf-report foo
-}
-
-atf_init_test_cases()
-{
-    atf_add_test_case default
-    atf_add_test_case expect
-    atf_add_test_case oflag
-    atf_add_test_case output_csv
-    atf_add_test_case output_ticker
-    atf_add_test_case output_xml
-    atf_add_test_case output_xml_space
-    atf_add_test_case too_many_args
-}
-
-# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/atf-report/misc_helpers.cpp b/contrib/atf/atf-report/misc_helpers.cpp
deleted file mode 100644
index 6f14ce4cf1c..00000000000
--- a/contrib/atf/atf-report/misc_helpers.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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 <iostream>
-
-#include "atf-c++/macros.hpp"
-
-// ------------------------------------------------------------------------
-// Helper tests for "t_integration".
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(diff);
-ATF_TEST_CASE_HEAD(diff)
-{
-    set_md_var("descr", "Helper test case for the t_integration program");
-}
-ATF_TEST_CASE_BODY(diff)
-{
-    std::cout << "--- a	2007-11-04 14:00:41.000000000 +0100\n";
-    std::cout << "+++ b	2007-11-04 14:00:48.000000000 +0100\n";
-    std::cout << "@@ -1,7 +1,7 @@\n";
-    std::cout << " This test is meant to simulate a diff.\n";
-    std::cout << " Blank space at beginning of context lines must be "
-                 "preserved.\n";
-    std::cout << " \n";
-    std::cout << "-First original line.\n";
-    std::cout << "-Second original line.\n";
-    std::cout << "+First modified line.\n";
-    std::cout << "+Second modified line.\n";
-    std::cout << " \n";
-    std::cout << " EOF\n";
-}
-
-// ------------------------------------------------------------------------
-// Main.
-// ------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    // Add helper tests for t_integration.
-    ATF_ADD_TEST_CASE(tcs, diff);
-}
diff --git a/contrib/atf/atf-report/pass_helper.cpp b/contrib/atf/atf-report/pass_helper.cpp
deleted file mode 100644
index b752b131b38..00000000000
--- a/contrib/atf/atf-report/pass_helper.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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++/macros.hpp"
-
-ATF_TEST_CASE(main);
-ATF_TEST_CASE_HEAD(main)
-{
-    set_md_var("descr", "Helper test case that always passes");
-}
-ATF_TEST_CASE_BODY(main)
-{
-}
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    ATF_ADD_TEST_CASE(tcs, main);
-}
diff --git a/contrib/atf/atf-report/reader.cpp b/contrib/atf/atf-report/reader.cpp
deleted file mode 100644
index 8f5fde791c8..00000000000
--- a/contrib/atf/atf-report/reader.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/time.h>
-}
-
-#include <map>
-#include <sstream>
-#include <utility>
-
-#include "atf-c/defs.h"
-
-#include "atf-c++/detail/parser.hpp"
-#include "atf-c++/detail/sanity.hpp"
-#include "atf-c++/detail/text.hpp"
-
-#include "reader.hpp"
-
-namespace impl = atf::atf_report;
-#define IMPL_NAME "atf::atf_report"
-
-// ------------------------------------------------------------------------
-// Auxiliary functions.
-// ------------------------------------------------------------------------
-
-template< typename Type >
-Type
-string_to_int(const std::string& str)
-{
-    std::istringstream ss(str);
-    Type s;
-    ss >> s;
-
-    return s;
-}
-
-// ------------------------------------------------------------------------
-// The "atf_tps" auxiliary parser.
-// ------------------------------------------------------------------------
-
-namespace atf_tps {
-
-static const atf::parser::token_type eof_type = 0;
-static const atf::parser::token_type nl_type = 1;
-static const atf::parser::token_type text_type = 2;
-static const atf::parser::token_type colon_type = 3;
-static const atf::parser::token_type comma_type = 4;
-static const atf::parser::token_type tps_count_type = 5;
-static const atf::parser::token_type tp_start_type = 6;
-static const atf::parser::token_type tp_end_type = 7;
-static const atf::parser::token_type tc_start_type = 8;
-static const atf::parser::token_type tc_so_type = 9;
-static const atf::parser::token_type tc_se_type = 10;
-static const atf::parser::token_type tc_end_type = 11;
-static const atf::parser::token_type passed_type = 12;
-static const atf::parser::token_type failed_type = 13;
-static const atf::parser::token_type skipped_type = 14;
-static const atf::parser::token_type info_type = 16;
-static const atf::parser::token_type expected_death_type = 17;
-static const atf::parser::token_type expected_exit_type = 18;
-static const atf::parser::token_type expected_failure_type = 19;
-static const atf::parser::token_type expected_signal_type = 20;
-static const atf::parser::token_type expected_timeout_type = 21;
-
-class tokenizer : public atf::parser::tokenizer< std::istream > {
-public:
-    tokenizer(std::istream& is, size_t curline) :
-        atf::parser::tokenizer< std::istream >
-            (is, true, eof_type, nl_type, text_type, curline)
-    {
-        add_delim(':', colon_type);
-        add_delim(',', comma_type);
-        add_keyword("tps-count", tps_count_type);
-        add_keyword("tp-start", tp_start_type);
-        add_keyword("tp-end", tp_end_type);
-        add_keyword("tc-start", tc_start_type);
-        add_keyword("tc-so", tc_so_type);
-        add_keyword("tc-se", tc_se_type);
-        add_keyword("tc-end", tc_end_type);
-        add_keyword("passed", passed_type);
-        add_keyword("failed", failed_type);
-        add_keyword("skipped", skipped_type);
-        add_keyword("info", info_type);
-        add_keyword("expected_death", expected_death_type);
-        add_keyword("expected_exit", expected_exit_type);
-        add_keyword("expected_failure", expected_failure_type);
-        add_keyword("expected_signal", expected_signal_type);
-        add_keyword("expected_timeout", expected_timeout_type);
-    }
-};
-
-} // namespace atf_tps
-
-struct timeval
-read_timeval(atf::parser::parser< atf_tps::tokenizer >& parser)
-{
-    using namespace atf_tps;
-
-    atf::parser::token t = parser.expect(text_type, "timestamp");
-    const std::string::size_type divider = t.text().find('.');
-    if (divider == std::string::npos || divider == 0 ||
-        divider == t.text().length() - 1)
-        throw atf::parser::parse_error(t.lineno(),
-                                       "Malformed timestamp value " + t.text());
-
-    struct timeval tv;
-    tv.tv_sec = string_to_int< long >(t.text().substr(0, divider));
-    tv.tv_usec = string_to_int< long >(t.text().substr(divider + 1));
-    return tv;
-}
-
-// ------------------------------------------------------------------------
-// The "atf_tps_reader" class.
-// ------------------------------------------------------------------------
-
-impl::atf_tps_reader::atf_tps_reader(std::istream& is) :
-    m_is(is)
-{
-}
-
-impl::atf_tps_reader::~atf_tps_reader(void)
-{
-}
-
-void
-impl::atf_tps_reader::got_info(
-    const std::string& what ATF_DEFS_ATTRIBUTE_UNUSED,
-    const std::string& val ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-impl::atf_tps_reader::got_ntps(size_t ntps ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-impl::atf_tps_reader::got_tp_start(
-    const std::string& tp ATF_DEFS_ATTRIBUTE_UNUSED,
-    size_t ntcs ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-impl::atf_tps_reader::got_tp_end(
-    struct timeval* tv ATF_DEFS_ATTRIBUTE_UNUSED,
-    const std::string& reason ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-impl::atf_tps_reader::got_tc_start(
-    const std::string& tcname ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-impl::atf_tps_reader::got_tc_stdout_line(
-    const std::string& line ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-impl::atf_tps_reader::got_tc_stderr_line(
-    const std::string& line ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-impl::atf_tps_reader::got_tc_end(
-    const std::string& state ATF_DEFS_ATTRIBUTE_UNUSED,
-    struct timeval* tv ATF_DEFS_ATTRIBUTE_UNUSED,
-    const std::string& reason ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-impl::atf_tps_reader::got_eof(void)
-{
-}
-
-void
-impl::atf_tps_reader::read_info(void* pptr)
-{
-    using atf::parser::parse_error;
-    using namespace atf_tps;
-
-    atf::parser::parser< tokenizer >& p =
-        *reinterpret_cast< atf::parser::parser< tokenizer >* >
-        (pptr);
-
-    (void)p.expect(colon_type, "`:'");
-
-    atf::parser::token t = p.expect(text_type, "info property name");
-    (void)p.expect(comma_type, "`,'");
-    got_info(t.text(), atf::text::trim(p.rest_of_line()));
-
-    (void)p.expect(nl_type, "new line");
-}
-
-void
-impl::atf_tps_reader::read_tp(void* pptr)
-{
-    using atf::parser::parse_error;
-    using namespace atf_tps;
-
-    atf::parser::parser< tokenizer >& p =
-        *reinterpret_cast< atf::parser::parser< tokenizer >* >
-        (pptr);
-
-    atf::parser::token t = p.expect(tp_start_type,
-                                    "start of test program");
-
-    t = p.expect(colon_type, "`:'");
-
-    struct timeval s1 = read_timeval(p);
-
-    t = p.expect(comma_type, "`,'");
-
-    t = p.expect(text_type, "test program name");
-    std::string tpname = t.text();
-
-    t = p.expect(comma_type, "`,'");
-
-    t = p.expect(text_type, "number of test programs");
-    size_t ntcs = string_to_int< std::size_t >(t.text());
-
-    t = p.expect(nl_type, "new line");
-
-    ATF_PARSER_CALLBACK(p, got_tp_start(tpname, ntcs));
-
-    size_t i = 0;
-    while (p.good() && i < ntcs) {
-        try {
-            read_tc(&p);
-            i++;
-        } catch (const parse_error& pe) {
-            p.add_error(pe);
-            p.reset(nl_type);
-        }
-    }
-    t = p.expect(tp_end_type, "end of test program");
-
-    t = p.expect(colon_type, "`:'");
-
-    struct timeval s2 = read_timeval(p);
-
-    struct timeval s3;
-    timersub(&s2, &s1, &s3);
-
-    t = p.expect(comma_type, "`,'");
-
-    t = p.expect(text_type, "test program name");
-    if (t.text() != tpname)
-        throw parse_error(t.lineno(), "Test program name used in "
-                                      "terminator does not match "
-                                      "opening");
-
-    t = p.expect(nl_type, comma_type,
-                 "new line or comma_type");
-    std::string reason;
-    if (t.type() == comma_type) {
-        reason = text::trim(p.rest_of_line());
-        if (reason.empty())
-            throw parse_error(t.lineno(),
-                              "Empty reason for failed test program");
-        t = p.next();
-    }
-
-    ATF_PARSER_CALLBACK(p, got_tp_end(&s3, reason));
-}
-
-void
-impl::atf_tps_reader::read_tc(void* pptr)
-{
-    using atf::parser::parse_error;
-    using namespace atf_tps;
-
-    atf::parser::parser< tokenizer >& p =
-        *reinterpret_cast< atf::parser::parser< tokenizer >* >
-        (pptr);
-
-    atf::parser::token t = p.expect(tc_start_type, "start of test case");
-
-    t = p.expect(colon_type, "`:'");
-
-    struct timeval s1 = read_timeval(p);
-
-    t = p.expect(comma_type, "`,'");
-
-    t = p.expect(text_type, "test case name");
-    std::string tcname = t.text();
-
-    ATF_PARSER_CALLBACK(p, got_tc_start(tcname));
-
-    t = p.expect(nl_type, "new line");
-
-    t = p.expect(tc_end_type, tc_so_type, tc_se_type,
-                 "end of test case or test case's stdout/stderr line");
-    while (t.type() != tc_end_type &&
-           (t.type() == tc_so_type || t.type() == tc_se_type)) {
-        atf::parser::token t2 = t;
-
-        t = p.expect(colon_type, "`:'");
-
-        std::string line = p.rest_of_line();
-
-        if (t2.type() == tc_so_type) {
-            ATF_PARSER_CALLBACK(p, got_tc_stdout_line(line));
-        } else {
-            INV(t2.type() == tc_se_type);
-            ATF_PARSER_CALLBACK(p, got_tc_stderr_line(line));
-        }
-
-        t = p.expect(nl_type, "new line");
-
-        t = p.expect(tc_end_type, tc_so_type, tc_se_type,
-                     "end of test case or test case's stdout/stderr line");
-    }
-
-    t = p.expect(colon_type, "`:'");
-
-    struct timeval s2 = read_timeval(p);
-
-    struct timeval s3;
-    timersub(&s2, &s1, &s3);
-
-    t = p.expect(comma_type, "`,'");
-
-    t = p.expect(text_type, "test case name");
-    if (t.text() != tcname)
-        throw parse_error(t.lineno(),
-                          "Test case name used in terminator does not "
-                          "match opening");
-
-    t = p.expect(comma_type, "`,'");
-
-    t = p.expect(expected_death_type, expected_exit_type, expected_failure_type,
-        expected_signal_type, expected_timeout_type, passed_type, failed_type,
-        skipped_type, "expected_{death,exit,failure,signal,timeout}, failed, "
-        "passed or skipped");
-    if (t.type() == passed_type) {
-        ATF_PARSER_CALLBACK(p, got_tc_end("passed", &s3, ""));
-    } else {
-        std::string state;
-        if (t.type() == expected_death_type) state = "expected_death";
-        else if (t.type() == expected_exit_type) state = "expected_exit";
-        else if (t.type() == expected_failure_type) state = "expected_failure";
-        else if (t.type() == expected_signal_type) state = "expected_signal";
-        else if (t.type() == expected_timeout_type) state = "expected_timeout";
-        else if (t.type() == failed_type) state = "failed";
-        else if (t.type() == skipped_type) state = "skipped";
-        else UNREACHABLE;
-
-        t = p.expect(comma_type, "`,'");
-        std::string reason = text::trim(p.rest_of_line());
-        if (reason.empty())
-            throw parse_error(t.lineno(), "Empty reason for " + state +
-                " test case result");
-        ATF_PARSER_CALLBACK(p, got_tc_end(state, &s3, reason));
-    }
-
-    t = p.expect(nl_type, "new line");
-}
-
-void
-impl::atf_tps_reader::read(void)
-{
-    using atf::parser::parse_error;
-    using namespace atf_tps;
-
-    std::pair< size_t, atf::parser::headers_map > hml =
-        atf::parser::read_headers(m_is, 1);
-    atf::parser::validate_content_type(hml.second, "application/X-atf-tps", 3);
-
-    tokenizer tkz(m_is, hml.first);
-    atf::parser::parser< tokenizer > p(tkz);
-
-    try {
-        atf::parser::token t;
-
-        while ((t = p.expect(tps_count_type, info_type, "tps-count or info "
-                             "field")).type() == info_type)
-            read_info(&p);
-
-        t = p.expect(colon_type, "`:'");
-
-        t = p.expect(text_type, "number of test programs");
-        size_t ntps = string_to_int< std::size_t >(t.text());
-        ATF_PARSER_CALLBACK(p, got_ntps(ntps));
-
-        t = p.expect(nl_type, "new line");
-
-        size_t i = 0;
-        while (p.good() && i < ntps) {
-            try {
-                read_tp(&p);
-                i++;
-            } catch (const parse_error& pe) {
-                p.add_error(pe);
-                p.reset(nl_type);
-            }
-        }
-
-        while ((t = p.expect(eof_type, info_type, "end of stream or info "
-                             "field")).type() == info_type)
-            read_info(&p);
-        ATF_PARSER_CALLBACK(p, got_eof());
-    } catch (const parse_error& pe) {
-        p.add_error(pe);
-        p.reset(nl_type);
-    }
-}
diff --git a/contrib/atf/atf-report/reader.hpp b/contrib/atf/atf-report/reader.hpp
deleted file mode 100644
index 2ef038a0de4..00000000000
--- a/contrib/atf/atf-report/reader.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if !defined(_ATF_REPORT_FORMATS_HPP_)
-#define _ATF_REPORT_FORMATS_HPP_
-
-extern "C" {
-#include <sys/time.h>
-}
-
-#include <istream>
-#include <string>
-
-#include <atf-c++/tests.hpp>
-
-namespace atf {
-namespace atf_report {
-
-struct test_case_result {
-    enum state_enum {
-        PASSED,
-        FAILED,
-        SKIPPED,
-    };
-    const state_enum state;
-    const std::string& reason;
-
-    test_case_result(const state_enum p_state, const std::string& p_reason) :
-        state(p_state),
-        reason(p_reason)
-    {
-    }
-};
-
-class atf_tps_reader {
-    std::istream& m_is;
-
-    void read_info(void*);
-    void read_tp(void*);
-    void read_tc(void*);
-
-protected:
-    virtual void got_info(const std::string&, const std::string&);
-    virtual void got_ntps(size_t);
-    virtual void got_tp_start(const std::string&, size_t);
-    virtual void got_tp_end(struct timeval*, const std::string&);
-
-    virtual void got_tc_start(const std::string&);
-    virtual void got_tc_stdout_line(const std::string&);
-    virtual void got_tc_stderr_line(const std::string&);
-    virtual void got_tc_end(const std::string&, struct timeval*,
-                            const std::string&);
-    virtual void got_eof(void);
-
-public:
-    atf_tps_reader(std::istream&);
-    virtual ~atf_tps_reader(void);
-
-    void read(void);
-};
-
-} // namespace atf_report
-} // namespace atf
-
-#endif // !defined(_ATF_REPORT_FORMATS_HPP_)
diff --git a/contrib/atf/atf-report/reader_test.cpp b/contrib/atf/atf-report/reader_test.cpp
deleted file mode 100644
index 59e4059efcc..00000000000
--- a/contrib/atf/atf-report/reader_test.cpp
+++ /dev/null
@@ -1,989 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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 <iostream>
-#include <sstream>
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "atf-c++/macros.hpp"
-
-#include "atf-c++/detail/parser.hpp"
-#include "atf-c++/detail/sanity.hpp"
-#include "atf-c++/detail/test_helpers.hpp"
-#include "atf-c++/detail/text.hpp"
-
-#include "reader.hpp"
-
-namespace impl = atf::atf_report;
-
-class tps_reader : protected impl::atf_tps_reader {
-    void
-    got_info(const std::string& what, const std::string& val)
-    {
-        m_calls.push_back("got_info(" + what + ", " + val + ")");
-    }
-
-    void
-    got_ntps(size_t ntps)
-    {
-        m_calls.push_back("got_ntps(" + atf::text::to_string(ntps) + ")");
-    }
-
-    void
-    got_tp_start(const std::string& tpname, size_t ntcs)
-    {
-        m_calls.push_back("got_tp_start(" + tpname + ", " +
-                          atf::text::to_string(ntcs) + ")");
-    }
-
-    void
-    got_tp_end(struct timeval* tv ATF_DEFS_ATTRIBUTE_UNUSED,
-               const std::string& reason)
-    {
-        m_calls.push_back("got_tp_end(" + reason + ")");
-    }
-
-    void
-    got_tc_start(const std::string& tcname)
-    {
-        m_calls.push_back("got_tc_start(" + tcname + ")");
-    }
-
-    void
-    got_tc_end(const std::string& state,
-               struct timeval* tv ATF_DEFS_ATTRIBUTE_UNUSED,
-               const std::string& reason)
-    {
-        const std::string r = state + (reason.empty() ? "" : ", " + reason);
-        m_calls.push_back("got_tc_end(" + r + ")");
-    }
-
-    void
-    got_tc_stdout_line(const std::string& line)
-    {
-        m_calls.push_back("got_tc_stdout_line(" + line + ")");
-    }
-
-    void
-    got_tc_stderr_line(const std::string& line)
-    {
-        m_calls.push_back("got_tc_stderr_line(" + line + ")");
-    }
-
-    void
-    got_eof(void)
-    {
-        m_calls.push_back("got_eof()");
-    }
-
-public:
-    tps_reader(std::istream& is) :
-        impl::atf_tps_reader(is)
-    {
-    }
-
-    void
-    read(void)
-    {
-        atf_tps_reader::read();
-    }
-
-    std::vector< std::string > m_calls;
-};
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_1);
-ATF_TEST_CASE_BODY(tps_1)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 0\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_ntps(0)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_2);
-ATF_TEST_CASE_BODY(tps_2)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 2\n"
-        "tp-start: 123.456, first-prog, 0\n"
-        "tp-end: 123.567, first-prog\n"
-        "tp-start: 123.678, second-prog, 0\n"
-        "tp-end: 123.789, second-prog, This program failed\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_ntps(2)",
-        "got_tp_start(first-prog, 0)",
-        "got_tp_end()",
-        "got_tp_start(second-prog, 0)",
-        "got_tp_end(This program failed)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_3);
-ATF_TEST_CASE_BODY(tps_3)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 2\n"
-        "tp-start: 123.123, first-prog, 3\n"
-        "tc-start: 123.234, first-test\n"
-        "tc-end: 123.345, first-test, passed\n"
-        "tc-start: 123.456, second-test\n"
-        "tc-end: 123.567, second-test, skipped, Testing skipped reason\n"
-        "tc-start: 123.678, third.test\n"
-        "tc-end: 123.789, third.test, failed, Testing failed reason\n"
-        "tp-end: 123.890, first-prog\n"
-        "tp-start: 124.901, second-prog, 3\n"
-        "tc-start: 124.1012, first-test\n"
-        "tc-so:first stdout line for 1st test\n"
-        "tc-se:first stderr line for 1st test\n"
-        "tc-so:second stdout line for 1st test\n"
-        "tc-se:second stderr line for 1st test\n"
-        "tc-end: 124.1123, first-test, passed\n"
-        "tc-start: 124.1234, second-test\n"
-        "tc-so:first stdout line for 2nd test\n"
-        "tc-se:first stderr line for 2nd test\n"
-        "tc-so:second stdout line for 2nd test\n"
-        "tc-se:second stderr line for 2nd test\n"
-        "tc-end: 124.1345, second-test, skipped, Testing skipped reason\n"
-        "tc-start: 124.1456, third.test\n"
-        "tc-so:first stdout line for 3rd test\n"
-        "tc-se:first stderr line for 3rd test\n"
-        "tc-so:second stdout line for 3rd test\n"
-        "tc-se:second stderr line for 3rd test\n"
-        "tc-end: 124.1567, third.test, failed, Testing failed reason\n"
-        "tp-end: 124.1678, second-prog, This program failed\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_ntps(2)",
-        "got_tp_start(first-prog, 3)",
-        "got_tc_start(first-test)",
-        "got_tc_end(passed)",
-        "got_tc_start(second-test)",
-        "got_tc_end(skipped, Testing skipped reason)",
-        "got_tc_start(third.test)",
-        "got_tc_end(failed, Testing failed reason)",
-        "got_tp_end()",
-        "got_tp_start(second-prog, 3)",
-        "got_tc_start(first-test)",
-        "got_tc_stdout_line(first stdout line for 1st test)",
-        "got_tc_stderr_line(first stderr line for 1st test)",
-        "got_tc_stdout_line(second stdout line for 1st test)",
-        "got_tc_stderr_line(second stderr line for 1st test)",
-        "got_tc_end(passed)",
-        "got_tc_start(second-test)",
-        "got_tc_stdout_line(first stdout line for 2nd test)",
-        "got_tc_stderr_line(first stderr line for 2nd test)",
-        "got_tc_stdout_line(second stdout line for 2nd test)",
-        "got_tc_stderr_line(second stderr line for 2nd test)",
-        "got_tc_end(skipped, Testing skipped reason)",
-        "got_tc_start(third.test)",
-        "got_tc_stdout_line(first stdout line for 3rd test)",
-        "got_tc_stderr_line(first stderr line for 3rd test)",
-        "got_tc_stdout_line(second stdout line for 3rd test)",
-        "got_tc_stderr_line(second stderr line for 3rd test)",
-        "got_tc_end(failed, Testing failed reason)",
-        "got_tp_end(This program failed)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_4);
-ATF_TEST_CASE_BODY(tps_4)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "info: a, foo\n"
-        "info: b, bar\n"
-        "info: c, baz\n"
-        "tps-count: 2\n"
-        "tp-start: 234.1, first-prog, 3\n"
-        "tc-start: 234.12, first-test\n"
-        "tc-end: 234.23, first-test, passed\n"
-        "tc-start: 234.34, second-test\n"
-        "tc-end: 234.45, second-test, skipped, Testing skipped reason\n"
-        "tc-start: 234.56, third-test\n"
-        "tc-end: 234.67, third-test, failed, Testing failed reason\n"
-        "tp-end: 234.78, first-prog\n"
-        "tp-start: 234.89, second-prog, 3\n"
-        "tc-start: 234.90, first-test\n"
-        "tc-so:first stdout line for 1st test\n"
-        "tc-se:first stderr line for 1st test\n"
-        "tc-so:second stdout line for 1st test\n"
-        "tc-se:second stderr line for 1st test\n"
-        "tc-end: 234.101, first-test, passed\n"
-        "tc-start: 234.112, second-test\n"
-        "tc-so:first stdout line for 2nd test\n"
-        "tc-se:first stderr line for 2nd test\n"
-        "tc-so:second stdout line for 2nd test\n"
-        "tc-se:second stderr line for 2nd test\n"
-        "tc-end: 234.123, second-test, skipped, Testing skipped reason\n"
-        "tc-start: 234.134, third-test\n"
-        "tc-so:first stdout line for 3rd test\n"
-        "tc-se:first stderr line for 3rd test\n"
-        "tc-so:second stdout line for 3rd test\n"
-        "tc-se:second stderr line for 3rd test\n"
-        "tc-end: 234.145, third-test, failed, Testing failed reason\n"
-        "tp-end: 234.156, second-prog, This program failed\n"
-        "info: d, foo\n"
-        "info: e, bar\n"
-        "info: f, baz\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_info(a, foo)",
-        "got_info(b, bar)",
-        "got_info(c, baz)",
-        "got_ntps(2)",
-        "got_tp_start(first-prog, 3)",
-        "got_tc_start(first-test)",
-        "got_tc_end(passed)",
-        "got_tc_start(second-test)",
-        "got_tc_end(skipped, Testing skipped reason)",
-        "got_tc_start(third-test)",
-        "got_tc_end(failed, Testing failed reason)",
-        "got_tp_end()",
-        "got_tp_start(second-prog, 3)",
-        "got_tc_start(first-test)",
-        "got_tc_stdout_line(first stdout line for 1st test)",
-        "got_tc_stderr_line(first stderr line for 1st test)",
-        "got_tc_stdout_line(second stdout line for 1st test)",
-        "got_tc_stderr_line(second stderr line for 1st test)",
-        "got_tc_end(passed)",
-        "got_tc_start(second-test)",
-        "got_tc_stdout_line(first stdout line for 2nd test)",
-        "got_tc_stderr_line(first stderr line for 2nd test)",
-        "got_tc_stdout_line(second stdout line for 2nd test)",
-        "got_tc_stderr_line(second stderr line for 2nd test)",
-        "got_tc_end(skipped, Testing skipped reason)",
-        "got_tc_start(third-test)",
-        "got_tc_stdout_line(first stdout line for 3rd test)",
-        "got_tc_stderr_line(first stderr line for 3rd test)",
-        "got_tc_stdout_line(second stdout line for 3rd test)",
-        "got_tc_stderr_line(second stderr line for 3rd test)",
-        "got_tc_end(failed, Testing failed reason)",
-        "got_tp_end(This program failed)",
-        "got_info(d, foo)",
-        "got_info(e, bar)",
-        "got_info(f, baz)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_5);
-ATF_TEST_CASE_BODY(tps_5)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 1\n"
-        "tp-start: 345.123, the-prog, 1\n"
-        "tc-start: 345.134, the-test\n"
-        "tc-so:--- a	2007-11-04 14:00:41.000000000 +0100\n"
-        "tc-so:+++ b	2007-11-04 14:00:48.000000000 +0100\n"
-        "tc-so:@@ -1,7 +1,7 @@\n"
-        "tc-so: This test is meant to simulate a diff.\n"
-        "tc-so: Blank space at beginning of context lines must be preserved.\n"
-        "tc-so: \n"
-        "tc-so:-First original line.\n"
-        "tc-so:-Second original line.\n"
-        "tc-so:+First modified line.\n"
-        "tc-so:+Second modified line.\n"
-        "tc-so: \n"
-        "tc-so: EOF\n"
-        "tc-end: 345.145, the-test, passed\n"
-        "tp-end: 345.156, the-prog\n"
-    ;
-
-    // NO_CHECK_STYLE_BEGIN
-    const char* exp_calls[] = {
-        "got_ntps(1)",
-        "got_tp_start(the-prog, 1)",
-        "got_tc_start(the-test)",
-        "got_tc_stdout_line(--- a	2007-11-04 14:00:41.000000000 +0100)",
-        "got_tc_stdout_line(+++ b	2007-11-04 14:00:48.000000000 +0100)",
-        "got_tc_stdout_line(@@ -1,7 +1,7 @@)",
-        "got_tc_stdout_line( This test is meant to simulate a diff.)",
-        "got_tc_stdout_line( Blank space at beginning of context lines must be preserved.)",
-        "got_tc_stdout_line( )",
-        "got_tc_stdout_line(-First original line.)",
-        "got_tc_stdout_line(-Second original line.)",
-        "got_tc_stdout_line(+First modified line.)",
-        "got_tc_stdout_line(+Second modified line.)",
-        "got_tc_stdout_line( )",
-        "got_tc_stdout_line( EOF)",
-        "got_tc_end(passed)",
-        "got_tp_end()",
-        "got_eof()",
-        NULL
-    };
-    // NO_CHECK_STYLE_END
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_6);
-ATF_TEST_CASE_BODY(tps_6)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 1\n"
-        "tp-start: 321.1, the-prog, 8\n"
-        "tc-start: 321.12, one\n"
-        "tc-end: 321.23, one, expected_death, The reason\n"
-        "tc-start: 321.34, two\n"
-        "tc-end: 321.45, two, expected_exit, This would be an exit\n"
-        "tc-start: 321.56, three\n"
-        "tc-end: 321.67, three, expected_failure, And this a failure\n"
-        "tc-start: 321.78, four\n"
-        "tc-end: 321.89, four, expected_signal, And this a signal\n"
-        "tc-start: 321.90, five\n"
-        "tc-end: 321.101, five, failed, Another reason\n"
-        "tc-start: 321.112, six\n"
-        "tc-end: 321.123, six, passed\n"
-        "tc-start: 321.134, seven\n"
-        "tc-end: 321.145, seven, skipped, Skipping it\n"
-        "tc-start: 321.156, eight\n"
-        "tc-end: 321.167, eight, expected_timeout, Some hang reason\n"
-        "tp-end: 321.178, the-prog\n"
-    ;
-
-    // NO_CHECK_STYLE_BEGIN
-    const char* exp_calls[] = {
-        "got_ntps(1)",
-        "got_tp_start(the-prog, 8)",
-        "got_tc_start(one)",
-        "got_tc_end(expected_death, The reason)",
-        "got_tc_start(two)",
-        "got_tc_end(expected_exit, This would be an exit)",
-        "got_tc_start(three)",
-        "got_tc_end(expected_failure, And this a failure)",
-        "got_tc_start(four)",
-        "got_tc_end(expected_signal, And this a signal)",
-        "got_tc_start(five)",
-        "got_tc_end(failed, Another reason)",
-        "got_tc_start(six)",
-        "got_tc_end(passed)",
-        "got_tc_start(seven)",
-        "got_tc_end(skipped, Skipping it)",
-        "got_tc_start(eight)",
-        "got_tc_end(expected_timeout, Some hang reason)",
-        "got_tp_end()",
-        "got_eof()",
-        NULL
-    };
-    // NO_CHECK_STYLE_END
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_50);
-ATF_TEST_CASE_BODY(tps_50)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "foo\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `foo'; expected tps-count or info field",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_51);
-ATF_TEST_CASE_BODY(tps_51)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected `:'",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_52);
-ATF_TEST_CASE_BODY(tps_52)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count:\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected number of test programs",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_53);
-ATF_TEST_CASE_BODY(tps_53)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 1\n"
-        "foo\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_ntps(1)",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "4: Unexpected token `foo'; expected start of test program",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_54);
-ATF_TEST_CASE_BODY(tps_54)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 1\n"
-        "foo\n"
-        "tp-start\n"
-        "tp-start:\n"
-        "tp-start: 123\n"
-        "tp-start: 123.\n"
-        "tp-start: 123.456\n"
-        "tp-start: 123.456,\n"
-        "tp-start: 123.456, foo\n"
-        "tp-start: 123.456, foo,\n"
-        "tp-start: 123.456, foo, 0\n"
-        "bar\n"
-        "tp-start: 456.789, foo, 0\n"
-        "tp-end\n"
-        "tp-start: 777.777, foo, 0\n"
-        "tp-end:\n"
-        "tp-start: 777.777, foo, 0\n"
-        "tp-end: 777\n"
-        "tp-start: 777.777, foo, 0\n"
-        "tp-end: 777.\n"
-        "tp-start: 777.777, foo, 0\n"
-        "tp-end: 777.888\n"
-        "tp-start: 777.777, foo, 0\n"
-        "tp-end: 777.888, \n"
-        "tp-start: 777.777, foo, 0\n"
-        "tp-end: 777.888, bar\n"
-        "tp-start: 777.777, foo, 0\n"
-        "tp-end: 777.888, foo,\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_ntps(1)",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "4: Unexpected token `foo'; expected start of test program",
-        "5: Unexpected token `<<NEWLINE>>'; expected `:'",
-        "6: Unexpected token `<<NEWLINE>>'; expected timestamp",
-        "7: Malformed timestamp value 123",
-        "8: Malformed timestamp value 123.",
-        "9: Unexpected token `<<NEWLINE>>'; expected `,'",
-        "10: Unexpected token `<<NEWLINE>>'; expected test program name",
-        "11: Unexpected token `<<NEWLINE>>'; expected `,'",
-        "12: Unexpected token `<<NEWLINE>>'; expected number of test programs",
-        "14: Unexpected token `bar'; expected end of test program",
-        "16: Unexpected token `<<NEWLINE>>'; expected `:'",
-        "18: Unexpected token `<<NEWLINE>>'; expected timestamp",
-        "20: Malformed timestamp value 777",
-        "22: Malformed timestamp value 777.",
-        "24: Unexpected token `<<NEWLINE>>'; expected `,'",
-
-        "26: Unexpected token `<<NEWLINE>>'; expected test program name",
-        "28: Test program name used in terminator does not match opening",
-        "30: Empty reason for failed test program",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_55);
-ATF_TEST_CASE_BODY(tps_55)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 1\n"
-        "tp-start: 100.200, foo, 1\n"
-        "foo\n"
-        "tc-start\n"
-        "tc-start:\n"
-        "tc-start: 111\n"
-        "tc-start: 111.\n"
-        "tc-start: 111.222\n"
-        "tc-start: 111.222,\n"
-        "tc-start: 111.222, foo\n"
-        "bar\n"
-        "tc-start: 111.333, foo\n"
-        "tc-end\n"
-        "tc-start: 111.444, foo\n"
-        "tc-end:\n"
-        "tc-start: 111.444, foo\n"
-        "tc-end: 111\n"
-        "tc-start: 111.444, foo\n"
-        "tc-end: 111.\n"
-        "tc-start: 111.444, foo\n"
-        "tc-end: 111.555\n"
-        "tc-start: 111.444, foo\n"
-        "tc-end: 111.555, \n"
-        "tc-start: 111.444, foo\n"
-        "tc-end: 111.555, bar\n"
-        "tc-start: 111.444, foo\n"
-        "tc-end: 111.555, foo\n"
-        "tc-start: 111.444, foo\n"
-        "tc-end: 111.555, foo,\n"
-        "tp-end: 111.666, foo\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_ntps(1)",
-        "got_tp_start(foo, 1)",
-        NULL
-    };
-
-    // NO_CHECK_STYLE_BEGIN
-    const char* exp_errors[] = {
-        "5: Unexpected token `foo'; expected start of test case",
-        "6: Unexpected token `<<NEWLINE>>'; expected `:'",
-        "7: Unexpected token `<<NEWLINE>>'; expected timestamp",
-        "8: Malformed timestamp value 111",
-        "9: Malformed timestamp value 111.",
-        "10: Unexpected token `<<NEWLINE>>'; expected `,'",
-        "11: Unexpected token `<<NEWLINE>>'; expected test case name",
-        "13: Unexpected token `bar'; expected end of test case or test case's stdout/stderr line",
-        "15: Unexpected token `<<NEWLINE>>'; expected `:'",
-        "17: Unexpected token `<<NEWLINE>>'; expected timestamp",
-        "19: Malformed timestamp value 111",
-        "21: Malformed timestamp value 111.",
-        "23: Unexpected token `<<NEWLINE>>'; expected `,'",
-        "25: Unexpected token `<<NEWLINE>>'; expected test case name",
-        "27: Test case name used in terminator does not match opening",
-        "29: Unexpected token `<<NEWLINE>>'; expected `,'",
-        "31: Unexpected token `<<NEWLINE>>'; expected expected_{death,exit,failure,signal,timeout}, failed, passed or skipped",
-        "32: Unexpected token `tp-end'; expected start of test case",
-        NULL
-    };
-    // NO_CHECK_STYLE_END
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_56);
-ATF_TEST_CASE_BODY(tps_56)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 1\n"
-        "tp-start: 111.222, foo, 1\n"
-        "tc-start: 111.333, foo\n"
-        "tc-end: 111.444, foo, passe\n"
-        "tc-start: 111.333, foo\n"
-        "tc-end: 111.444, foo, passed,\n"
-        "tc-start: 111.555, bar\n"
-        "tc-end: 111.666, bar, failed\n"
-        "tc-start: 111.555, bar\n"
-        "tc-end: 111.666, bar, failed,\n"
-        "tc-start: 111.555, baz\n"
-        "tc-end: 111.666, baz, skipped\n"
-        "tc-start: 111.555, baz\n"
-        "tc-end: 111.666, baz, skipped,\n"
-        "tp-end: 111.777, foo\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_ntps(1)",
-        "got_tp_start(foo, 1)",
-        "got_tc_start(foo)",
-        NULL
-    };
-
-    // NO_CHECK_STYLE_BEGIN
-    const char* exp_errors[] = {
-        "6: Unexpected token `passe'; expected expected_{death,exit,failure,signal,timeout}, failed, passed or skipped",
-        "8: Unexpected token `,'; expected new line",
-        "10: Unexpected token `<<NEWLINE>>'; expected `,'",
-        "12: Empty reason for failed test case result",
-        "14: Unexpected token `<<NEWLINE>>'; expected `,'",
-        "16: Empty reason for skipped test case result",
-        "17: Unexpected token `tp-end'; expected start of test case",
-        NULL
-    };
-    // NO_CHECK_STYLE_END
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_57);
-ATF_TEST_CASE_BODY(tps_57)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 2\n"
-        "tp-start: 111.222, foo, 0\n"
-        "tp-end: 111.333, foo\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_ntps(2)",
-        "got_tp_start(foo, 0)",
-        "got_tp_end()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "6: Unexpected token `<<EOF>>'; expected start of test program",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_58);
-ATF_TEST_CASE_BODY(tps_58)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "tps-count: 1\n"
-        "tp-start: 111.222, foo, 0\n"
-        "tp-end: 111.333, foo\n"
-        "tp-start: 111.444, bar, 0\n"
-        "tp-end: 111.555, bar\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_ntps(1)",
-        "got_tp_start(foo, 0)",
-        "got_tp_end()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "6: Unexpected token `tp-start'; expected end of stream or info field",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_59);
-ATF_TEST_CASE_BODY(tps_59)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "info\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected `:'",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_60);
-ATF_TEST_CASE_BODY(tps_60)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "info:\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected info property name",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_61);
-ATF_TEST_CASE_BODY(tps_61)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "info: a\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected `,'",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_62);
-ATF_TEST_CASE_BODY(tps_62)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "info: a,\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_info(a, )",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "4: Unexpected token `<<EOF>>'; expected tps-count or info field",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_63);
-ATF_TEST_CASE_BODY(tps_63)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "info: a, b\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_info(a, b)",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "4: Unexpected token `<<EOF>>'; expected tps-count or info field",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_64);
-ATF_TEST_CASE_BODY(tps_64)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "info: a, b\n"
-        "info: a.b.c.def, g\n"
-        "tps-count\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_info(a, b)",
-        "got_info(a.b.c.def, g)",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "5: Unexpected token `<<NEWLINE>>'; expected `:'",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_65);
-ATF_TEST_CASE_BODY(tps_65)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "info: a, b\n"
-        "tps-count:\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_info(a, b)",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "4: Unexpected token `<<NEWLINE>>'; expected number of test programs",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tps_66);
-ATF_TEST_CASE_BODY(tps_66)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tps; version=\"3\"\n"
-        "\n"
-        "info: a, b\n"
-        "tps-count: 0\n"
-        "info\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_info(a, b)",
-        "got_ntps(0)",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "5: Unexpected token `<<NEWLINE>>'; expected `:'",
-        NULL
-    };
-
-    do_parser_test< tps_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    ATF_ADD_TEST_CASE(tcs, tps_1);
-    ATF_ADD_TEST_CASE(tcs, tps_2);
-    ATF_ADD_TEST_CASE(tcs, tps_3);
-    ATF_ADD_TEST_CASE(tcs, tps_4);
-    ATF_ADD_TEST_CASE(tcs, tps_5);
-    ATF_ADD_TEST_CASE(tcs, tps_6);
-    ATF_ADD_TEST_CASE(tcs, tps_50);
-    ATF_ADD_TEST_CASE(tcs, tps_51);
-    ATF_ADD_TEST_CASE(tcs, tps_52);
-    ATF_ADD_TEST_CASE(tcs, tps_53);
-    ATF_ADD_TEST_CASE(tcs, tps_54);
-    ATF_ADD_TEST_CASE(tcs, tps_55);
-    ATF_ADD_TEST_CASE(tcs, tps_56);
-    ATF_ADD_TEST_CASE(tcs, tps_57);
-    ATF_ADD_TEST_CASE(tcs, tps_58);
-    ATF_ADD_TEST_CASE(tcs, tps_59);
-    ATF_ADD_TEST_CASE(tcs, tps_60);
-    ATF_ADD_TEST_CASE(tcs, tps_61);
-    ATF_ADD_TEST_CASE(tcs, tps_62);
-    ATF_ADD_TEST_CASE(tcs, tps_63);
-    ATF_ADD_TEST_CASE(tcs, tps_64);
-    ATF_ADD_TEST_CASE(tcs, tps_65);
-    ATF_ADD_TEST_CASE(tcs, tps_66);
-}
-
diff --git a/contrib/atf/atf-report/tests-results.css b/contrib/atf/atf-report/tests-results.css
deleted file mode 100644
index 24fc12cbf30..00000000000
--- a/contrib/atf/atf-report/tests-results.css
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Automated Testing Framework (atf)
- *
- * 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.
- */
-
-body {
-    margin: 0 0 0 0;
-}
-
-.nobr {
-    white-space: nowrap;
-}
-
-h1 {
-    background: black;
-    color: white;
-    font-family: Arial;
-    font-size: 24pt;
-    padding: 5pt;
-}
-
-h2 {
-    background: #eeeeee;
-    font-family: Arial;
-    font-size: 16pt;
-    margin-left: 10pt;
-    margin-right: 10pt;
-    padding: 3pt;
-}
-
-h3 {
-    font-family: Arial;
-    font-size: 12pt;
-    margin-left: 20pt;
-    margin-right: 20pt;
-    padding: 3pt;
-}
-
-p.details {
-    margin-left: 20pt;
-    margin-right: 20pt;
-}
-
-p.term {
-    margin-left: 40pt;
-    margin-right: 40pt;
-}
-
-pre.so {
-    margin-left: 40pt;
-    margin-right: 40pt;
-}
-
-pre.se {
-    margin-left: 40pt;
-    margin-right: 40pt;
-}
-
-table.summary {
-    border-collapse: collapse;
-    border-color: black;
-    border-style: solid;
-    border-width: 1pt;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-table.summary th {
-    background: #aaaadd;
-    border-style: solid;
-    border-width: 1pt;
-    padding: 3pt 6pt 3pt 6pt;
-}
-
-table.summary td {
-    border-style: solid;
-    border-width: 1pt;
-    padding: 3pt 6pt 3pt 6pt;
-}
-
-table.summary td.numeric p {
-    text-align: right;
-}
-
-table.summary td.numeric-error p {
-    text-align: right;
-    color: red;
-}
-
-table.summary td.numeric-warning p {
-    text-align: right;
-    color: #aaaa00;
-}
-
-table.summary tr.group {
-    background: #dddddd;
-}
-
-table.summary tr.entry td p {
-    margin-left: 10pt;
-}
-
-table.tcs-summary {
-    border-collapse: collapse;
-    border-color: black;
-    border-style: solid;
-    border-width: 1pt;
-    margin-left: auto;
-    margin-right: auto;
-    width: 80%;
-}
-
-table.tcs-summary td {
-    border-style: solid;
-    border-width: 1pt;
-    padding: 3pt 6pt 3pt 6pt;
-}
-
-table.tcs-summary th {
-    background: #aaaadd;
-    border-style: solid;
-    border-width: 1pt;
-    padding: 3pt 6pt 3pt 6pt;
-}
-
-table.tcs-summary td.numeric {
-    width: 1pt;
-}
-
-table.tcs-summary td.numeric p {
-    text-align: right;
-}
-
-table.tcs-summary td.tp-numeric {
-    background: #dddddd;
-    width: 1pt;
-}
-
-table.tcs-summary td.tp-numeric p {
-    text-align: right;
-}
-
-table.tcs-summary td.tp-id {
-    background: #dddddd;
-    font-weight: bold;
-    width: 1pt;
-}
-
-table.tcs-summary td.tc-id p {
-    margin-left: 10pt;
-}
-
-table.tcs-summary td.tcr-passed {
-    background: #aaffaa;
-    width: 1pt;
-}
-
-table.tcs-summary td.tcr-failed {
-    background: #ffaaaa;
-    width: 1pt;
-}
-
-table.tcs-summary td.tcr-skipped {
-    background: #ffffaa;
-    width: 1pt;
-}
-
-table.tcs-summary td.tcr-xfail {
-    background: #ffaaff;
-    width: 1pt;
-}
-
-table.tcs-summary td.tcr-reason {
-    width: 100%;
-}
diff --git a/contrib/atf/atf-report/tests-results.dtd b/contrib/atf/atf-report/tests-results.dtd
deleted file mode 100644
index c16f7edfb53..00000000000
--- a/contrib/atf/atf-report/tests-results.dtd
+++ /dev/null
@@ -1,61 +0,0 @@
-<!--
-  ++ Automated Testing Framework (atf)
-  ++
-  ++ 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.
-  -->
-
-<!-- TODO(1.0): Set the version of the DTD to 1.0 -->
-
-<!--
-  ++ PUBLIC: -//NetBSD//DTD ATF Tests Results 0.1//EN
-  ++ URI:    http://www.NetBSD.org/XML/atf/tests-results.dtd
-  -->
-
-<!ELEMENT tests-results (info*, tp*, info*)>
-
-<!ELEMENT info (#PCDATA)>
-<!ATTLIST info class CDATA #REQUIRED>
-
-<!ELEMENT tp (tc*, failed?)>
-<!ATTLIST tp id ID #REQUIRED>
-
-<!ELEMENT tc ((so, se)*, (passed, failed, skipped))>
-<!ATTLIST tc id NMTOKEN #REQUIRED>
-
-<!ELEMENT expected_death (#PCDATA)>
-<!ELEMENT expected_exit (#PCDATA)>
-<!ELEMENT expected_failure (#PCDATA)>
-<!ELEMENT expected_signal (#PCDATA)>
-<!ELEMENT expected_timeout (#PCDATA)>
-<!ELEMENT passed EMPTY>
-<!ELEMENT failed (#PCDATA)>
-<!ELEMENT skipped (#PCDATA)>
-<!ELEMENT so (#PCDATA)>
-<!ELEMENT se (#PCDATA)>
-
-<!ENTITY amp "&#047;">
-<!ENTITY lt "&#074;">
-<!ENTITY gt "&#076;">
diff --git a/contrib/atf/atf-report/tests-results.xsl b/contrib/atf/atf-report/tests-results.xsl
deleted file mode 100644
index 91b77c5435b..00000000000
--- a/contrib/atf/atf-report/tests-results.xsl
+++ /dev/null
@@ -1,564 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE xsl:stylesheet [<!ENTITY nbsp "&#160;">]>
-
-<!--
-  ++ Automated Testing Framework (atf)
-  ++
-  ++ 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.
-  -->
-
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-  <!-- Parameters that can be overriden by the user. -->
-  <xsl:param name="global.css">tests-results.css</xsl:param>
-  <xsl:param name="global.title">ATF Tests Results</xsl:param>
-
-  <xsl:variable name="ntps"
-                select="count(tests-results/tp)" />
-  <xsl:variable name="ntps-failed"
-                select="count(tests-results/tp/failed)" />
-  <xsl:variable name="ntcs"
-                select="count(tests-results/tp/tc)" />
-  <xsl:variable name="ntcs-passed"
-                select="count(tests-results/tp/tc/passed)" />
-  <xsl:variable name="ntcs-failed"
-                select="count(tests-results/tp/tc/failed)" />
-  <xsl:variable name="ntcs-skipped"
-                select="count(tests-results/tp/tc/skipped)" />
-  <xsl:variable name="ntcs-xfail"
-                select="count(tests-results/tp/tc/expected_death) +
-                        count(tests-results/tp/tc/expected_exit) +
-                        count(tests-results/tp/tc/expected_failure) +
-                        count(tests-results/tp/tc/expected_signal) +
-                        count(tests-results/tp/tc/expected_timeout)" />
-
-  <xsl:template match="/">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()" />
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="tests-results">
-    <html xmlns="http://www.w3.org/1999/xhtml">
-      <head>
-        <meta http-equiv="Content-Type"
-              content="text/html; charset=iso-8859-1" />
-        <link rel="stylesheet" type="text/css" href="{$global.css}" />
-
-        <title><xsl:value-of select="$global.title" /></title>
-      </head>
-
-      <body>
-        <h1><xsl:value-of select="$global.title" /></h1>
-
-        <xsl:call-template name="info-top" />
-        <xsl:call-template name="tcs-summary" />
-        <xsl:if test="$ntcs-failed > 0">
-          <xsl:call-template name="failed-tcs-summary" />
-        </xsl:if>
-        <xsl:if test="$ntcs-xfail > 0">
-          <xsl:call-template name="xfail-tcs-summary" />
-        </xsl:if>
-        <xsl:if test="$ntcs-skipped > 0">
-          <xsl:call-template name="skipped-tcs-summary" />
-        </xsl:if>
-        <xsl:if test="$ntps-failed > 0">
-          <xsl:call-template name="failed-tps-summary" />
-        </xsl:if>
-        <xsl:call-template name="info-bottom" />
-
-        <xsl:apply-templates select="tp" mode="details" />
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template name="info-top">
-    <h2>Execution summary</h2>
-
-    <table class="summary">
-      <tr>
-        <th class="nobr"><p>Item</p></th>
-        <th class="nobr"><p>Value</p></th>
-      </tr>
-
-      <tr class="group">
-        <td colspan="2"><p>ATF</p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Version</p></td>
-        <td><p><xsl:apply-templates
-        select="info[@class = 'atf.version']" /></p></td>
-      </tr>
-
-      <tr class="group">
-        <td colspan="2"><p>Timings</p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Start time of tests</p></td>
-        <td><p><xsl:apply-templates
-        select="info[@class = 'time.start']" /></p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>End time of tests</p></td>
-        <td><p><xsl:apply-templates
-        select="info[@class = 'time.end']" /></p></td>
-      </tr>
-
-      <tr class="group">
-        <td colspan="2"><p>System information</p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Host name</p></td>
-        <td><p><xsl:apply-templates
-        select="info[@class = 'uname.nodename']" /></p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Operating system</p></td>
-        <td><p><xsl:apply-templates
-        select="info[@class = 'uname.sysname']" /></p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Operating system release</p></td>
-        <td><p><xsl:apply-templates
-        select="info[@class = 'uname.release']" /></p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Operating system version</p></td>
-        <td><p><xsl:apply-templates
-        select="info[@class = 'uname.version']" /></p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Platform</p></td>
-        <td><p><xsl:apply-templates
-        select="info[@class = 'uname.machine']" /></p></td>
-      </tr>
-
-      <tr class="group">
-        <td colspan="2"><p>Tests results</p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Root</p></td>
-        <td><p><xsl:value-of
-        select="info[@class = 'tests.root']" /></p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Test programs</p></td>
-        <td class="numeric"><p><xsl:value-of select="$ntps" /></p></td>
-      </tr>
-      <tr class="entry">
-        <xsl:choose>
-          <xsl:when test="$ntps-failed > 0">
-            <td><p><a href="#failed-tps-summary">Bogus test
-            programs</a></p></td>
-            <td class="numeric-error">
-              <p><xsl:value-of select="$ntps-failed" /></p>
-            </td>
-          </xsl:when>
-          <xsl:otherwise>
-            <td><p>Bogus test programs</p></td>
-            <td class="numeric">
-              <p><xsl:value-of select="$ntps-failed" /></p>
-            </td>
-          </xsl:otherwise>
-        </xsl:choose>
-      </tr>
-      <tr class="entry">
-        <td><p>Test cases</p></td>
-        <td class="numeric"><p><xsl:value-of select="$ntcs" /></p></td>
-      </tr>
-      <tr class="entry">
-        <td><p>Passed test cases</p></td>
-        <td class="numeric"><p><xsl:value-of select="$ntcs-passed" /></p></td>
-      </tr>
-      <tr class="entry">
-        <xsl:choose>
-          <xsl:when test="$ntcs-failed > 0">
-            <td><p><a href="#failed-tcs-summary">Failed test
-            cases</a></p></td>
-            <td class="numeric-error">
-              <p><xsl:value-of select="$ntcs-failed" /></p>
-            </td>
-          </xsl:when>
-          <xsl:otherwise>
-            <td><p>Failed test cases</p></td>
-            <td class="numeric">
-              <p><xsl:value-of select="$ntcs-failed" /></p>
-            </td>
-          </xsl:otherwise>
-        </xsl:choose>
-      </tr>
-      <tr class="entry">
-        <xsl:choose>
-          <xsl:when test="$ntcs-xfail > 0">
-            <td><p><a href="#xfail-tcs-summary">Expected
-            failures</a></p></td>
-            <td class="numeric-warning">
-              <p><xsl:value-of select="$ntcs-xfail" /></p>
-            </td>
-          </xsl:when>
-          <xsl:otherwise>
-            <td><p>Expected failures</p></td>
-            <td class="numeric">
-              <p><xsl:value-of select="$ntcs-xfail" /></p>
-            </td>
-          </xsl:otherwise>
-        </xsl:choose>
-      </tr>
-      <tr class="entry">
-        <xsl:choose>
-          <xsl:when test="$ntcs-skipped > 0">
-            <td><p><a href="#skipped-tcs-summary">Skipped test
-            cases</a></p></td>
-            <td class="numeric-warning">
-              <p><xsl:value-of select="$ntcs-skipped" /></p>
-            </td>
-          </xsl:when>
-          <xsl:otherwise>
-            <td><p>Skipped test cases</p></td>
-            <td class="numeric">
-              <p><xsl:value-of select="$ntcs-skipped" /></p>
-            </td>
-          </xsl:otherwise>
-        </xsl:choose>
-      </tr>
-
-      <tr class="group">
-        <td colspan="2"><p><a href="#execution-details">See more execution
-        details</a></p></td>
-      </tr>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="info-bottom">
-    <a name="execution-details" />
-    <h2 id="execution-details">Execution details</h2>
-
-    <h3>Environment variables</h3>
-
-    <ul>
-      <xsl:apply-templates select="info[@class = 'env']">
-        <xsl:sort />
-      </xsl:apply-templates>
-    </ul>
-  </xsl:template>
-
-  <xsl:template match="info[@class = 'env']">
-    <li>
-      <p><xsl:apply-templates /></p>
-    </li>
-  </xsl:template>
-
-  <xsl:template name="tcs-summary">
-    <h2>Test cases summary</h2>
-
-    <table class="tcs-summary">
-      <tr>
-        <th class="nobr"><p>Test case</p></th>
-        <th class="nobr"><p>Result</p></th>
-        <th class="nobr"><p>Reason</p></th>
-        <th class="nobr"><p>Duration</p></th>
-      </tr>
-      <xsl:apply-templates select="tp" mode="summary">
-        <xsl:with-param name="which">all</xsl:with-param>
-      </xsl:apply-templates>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="xfail-tcs-summary">
-    <a name="xfail-tcs-summary" />
-    <h2 id="xfail-tcs-summary">Expected failures summary</h2>
-
-    <table class="tcs-summary">
-      <tr>
-        <th class="nobr"><p>Test case</p></th>
-        <th class="nobr"><p>Result</p></th>
-        <th class="nobr"><p>Reason</p></th>
-        <th class="nobr"><p>Duration</p></th>
-      </tr>
-      <xsl:apply-templates select="tp" mode="summary">
-        <xsl:with-param name="which">xfail</xsl:with-param>
-      </xsl:apply-templates>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="failed-tcs-summary">
-    <a name="failed-tcs-summary" />
-    <h2 id="failed-tcs-summary">Failed test cases summary</h2>
-
-    <table class="tcs-summary">
-      <tr>
-        <th class="nobr"><p>Test case</p></th>
-        <th class="nobr"><p>Result</p></th>
-        <th class="nobr"><p>Reason</p></th>
-        <th class="nobr"><p>Duration</p></th>
-      </tr>
-      <xsl:apply-templates select="tp" mode="summary">
-        <xsl:with-param name="which">failed</xsl:with-param>
-      </xsl:apply-templates>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="failed-tps-summary">
-    <a name="failed-tps-summary" />
-    <h2 id="failed-tps-summary">Bogus test programs summary</h2>
-
-    <table class="tcs-summary">
-      <tr>
-        <th class="nobr">Test program</th>
-      </tr>
-      <xsl:apply-templates select="tp" mode="summary">
-        <xsl:with-param name="which">bogus</xsl:with-param>
-      </xsl:apply-templates>
-    </table>
-  </xsl:template>
-
-  <xsl:template name="skipped-tcs-summary">
-    <a name="skipped-tcs-summary" />
-    <h2 id="skipped-tcs-summary">Skipped test cases summary</h2>
-
-    <table class="tcs-summary">
-      <tr>
-        <th class="nobr"><p>Test case</p></th>
-        <th class="nobr"><p>Result</p></th>
-        <th class="nobr"><p>Reason</p></th>
-        <th class="nobr"><p>Duration</p></th>
-      </tr>
-      <xsl:apply-templates select="tp" mode="summary">
-        <xsl:with-param name="which">skipped</xsl:with-param>
-      </xsl:apply-templates>
-    </table>
-  </xsl:template>
-
-  <xsl:template match="tp" mode="summary">
-    <xsl:param name="which" />
-
-    <xsl:variable name="chosen">
-      <xsl:choose>
-        <xsl:when test="$which = 'bogus' and failed">yes</xsl:when>
-        <xsl:when test="$which = 'passed' and tc/passed">yes</xsl:when>
-        <xsl:when test="$which = 'failed' and tc/failed">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        tc/expected_death">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        tc/expected_exit">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        tc/expected_failure">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        tc/expected_signal">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        tc/expected_timeout">yes</xsl:when>
-        <xsl:when test="$which = 'skipped' and tc/skipped">yes</xsl:when>
-        <xsl:when test="$which = 'all'">yes</xsl:when>
-        <xsl:otherwise>no</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="$chosen = 'yes'">
-      <tr>
-        <td class="tp-id" colspan="3">
-          <p><xsl:value-of select="@id" /></p>
-        </td>
-        <td class="tp-numeric">
-          <p><xsl:value-of select="tp-time" />s</p>
-        </td>
-      </tr>
-      <xsl:if test="$which != 'bogus'">
-        <xsl:apply-templates select="tc" mode="summary">
-          <xsl:with-param name="which" select="$which" />
-        </xsl:apply-templates>
-      </xsl:if>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="tc" mode="summary">
-    <xsl:param name="which" />
-
-    <xsl:variable name="full-id"
-                  select="concat(translate(../@id, '/', '_'), '_', @id)" />
-
-    <xsl:variable name="chosen">
-      <xsl:choose>
-        <xsl:when test="$which = 'passed' and ./passed">yes</xsl:when>
-        <xsl:when test="$which = 'failed' and ./failed">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        ./expected_death">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        ./expected_exit">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        ./expected_failure">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        ./expected_signal">yes</xsl:when>
-        <xsl:when test="$which = 'xfail' and
-                        ./expected_timeout">yes</xsl:when>
-        <xsl:when test="$which = 'skipped' and ./skipped">yes</xsl:when>
-        <xsl:when test="$which = 'all'">yes</xsl:when>
-        <xsl:otherwise>no</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="$chosen = 'yes'">
-      <tr>
-        <td class="tc-id">
-          <xsl:choose>
-            <xsl:when test="expected_death|expected_exit|expected_failure|
-                            expected_signal|expected_timeout|failed|skipped">
-              <p><a href="#{$full-id}"><xsl:value-of select="@id" /></a></p>
-            </xsl:when>
-            <xsl:otherwise>
-              <p><xsl:value-of select="@id" /></p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </td>
-        <xsl:apply-templates select="expected_death|expected_exit|
-                                     expected_failure|expected_timeout|
-                                     expected_signal|failed|passed|
-                                     skipped" mode="tc" />
-        <td class="numeric">
-          <p><xsl:value-of select="tc-time" />s</p>
-        </td>
-      </tr>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="passed" mode="tc">
-    <td class="tcr-passed"><p class="nobr">Passed</p></td>
-    <td class="tcr-reason"><p>N/A</p></td>
-  </xsl:template>
-
-  <xsl:template match="expected_death" mode="tc">
-    <td class="tcr-xfail"><p class="nobr">Expected death</p></td>
-    <td class="tcr-reason"><p><xsl:apply-templates /></p></td>
-  </xsl:template>
-
-  <xsl:template match="expected_exit" mode="tc">
-    <td class="tcr-xfail"><p class="nobr">Expected exit</p></td>
-    <td class="tcr-reason"><p><xsl:apply-templates /></p></td>
-  </xsl:template>
-
-  <xsl:template match="expected_failure" mode="tc">
-    <td class="tcr-xfail"><p class="nobr">Expected failure</p></td>
-    <td class="tcr-reason"><p><xsl:apply-templates /></p></td>
-  </xsl:template>
-
-  <xsl:template match="expected_timeout" mode="tc">
-    <td class="tcr-xfail"><p class="nobr">Expected timeout</p></td>
-    <td class="tcr-reason"><p><xsl:apply-templates /></p></td>
-  </xsl:template>
-
-  <xsl:template match="expected_signal" mode="tc">
-    <td class="tcr-xfail"><p class="nobr">Expected signal</p></td>
-    <td class="tcr-reason"><p><xsl:apply-templates /></p></td>
-  </xsl:template>
-
-  <xsl:template match="failed" mode="tc">
-    <td class="tcr-failed"><p class="nobr">Failed</p></td>
-    <td class="tcr-reason"><p><xsl:apply-templates /></p></td>
-  </xsl:template>
-
-  <xsl:template match="skipped" mode="tc">
-    <td class="tcr-skipped"><p class="nobr">Skipped</p></td>
-    <td class="tcr-reason"><p><xsl:apply-templates /></p></td>
-  </xsl:template>
-
-  <xsl:template match="tp" mode="details">
-    <xsl:apply-templates select="tc[expected_death|expected_exit|
-                                    expected_failure|expected_signal|
-                                    expected_timeout|failed|skipped]"
-                         mode="details" />
-  </xsl:template>
-
-  <xsl:template match="failed" mode="details">
-    <p class="term"><strong>FAILED</strong>: <xsl:apply-templates /></p>
-  </xsl:template>
-
-  <xsl:template match="expected_death|expected_exit|expected_failure|
-                       expected_signal|expected_timeout" mode="details">
-    <p class="term"><strong>XFAIL</strong>: <xsl:apply-templates /></p>
-  </xsl:template>
-
-  <xsl:template match="skipped" mode="details">
-    <p class="term"><strong>SKIPPED</strong>: <xsl:apply-templates /></p>
-  </xsl:template>
-
-  <xsl:template match="tc" mode="details">
-    <xsl:variable name="full-id"
-                  select="concat(translate(../@id, '/', '_'), '_', @id)" />
-
-    <a name="{$full-id}" />
-    <h2 id="{$full-id}">Test case:
-    <xsl:value-of select="../@id" /><xsl:text>/</xsl:text>
-    <xsl:value-of select="@id" /></h2>
-
-    <xsl:if test="tc-time">
-      <p class="details">Duration:
-      <xsl:apply-templates select="tc-time" mode="details" /></p>
-    </xsl:if>
-
-    <h3>Termination reason</h3>
-    <xsl:apply-templates select="expected_death|expected_exit|expected_failure|
-                                 expected_signal|expected_timeout|
-                                 failed|skipped"
-                         mode="details" />
-
-    <xsl:if test="so">
-      <h3>Standard output stream</h3>
-      <pre class="so"><xsl:apply-templates select="so" mode="details" /></pre>
-    </xsl:if>
-
-    <xsl:if test="se">
-      <h3>Standard error stream</h3>
-      <pre class="se"><xsl:apply-templates select="se" mode="details" /></pre>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="tc-time" mode="details">
-    <xsl:apply-templates /> seconds
-  </xsl:template>
-
-  <xsl:template match="so" mode="details">
-    <xsl:apply-templates />
-    <xsl:if test="position() != last()">
-      <xsl:text>
-</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="se" mode="details">
-    <xsl:apply-templates />
-    <xsl:if test="position() != last()">
-      <xsl:text>
-</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="@*|node()" priority="-1">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()" />
-    </xsl:copy>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/contrib/atf/atf-run/Atffile b/contrib/atf/atf-run/Atffile
deleted file mode 100644
index 146211e000d..00000000000
--- a/contrib/atf/atf-run/Atffile
+++ /dev/null
@@ -1,5 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp-glob: *_test
diff --git a/contrib/atf/atf-run/Kyuafile b/contrib/atf/atf-run/Kyuafile
deleted file mode 100644
index 305d699e165..00000000000
--- a/contrib/atf/atf-run/Kyuafile
+++ /dev/null
@@ -1,13 +0,0 @@
-syntax("kyuafile", 1)
-
-test_suite("atf")
-
-atf_test_program{name="atffile_test"}
-atf_test_program{name="config_test"}
-atf_test_program{name="fs_test"}
-atf_test_program{name="integration_test"}
-atf_test_program{name="io_test"}
-atf_test_program{name="requirements_test"}
-atf_test_program{name="signals_test"}
-atf_test_program{name="test_program_test"}
-atf_test_program{name="user_test"}
diff --git a/contrib/atf/atf-run/Makefile.am.inc b/contrib/atf/atf-run/Makefile.am.inc
deleted file mode 100644
index 7eb8333b31c..00000000000
--- a/contrib/atf/atf-run/Makefile.am.inc
+++ /dev/null
@@ -1,150 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-bin_PROGRAMS += atf-run/atf-run
-atf_run_atf_run_CPPFLAGS = "-DGDB=\"$(GDB)\""
-atf_run_atf_run_SOURCES = atf-run/atf-run.cpp \
-                          atf-run/atffile.cpp \
-                          atf-run/atffile.hpp \
-                          atf-run/config.cpp \
-                          atf-run/config.hpp \
-                          atf-run/fs.cpp \
-                          atf-run/fs.hpp \
-                          atf-run/io.cpp \
-                          atf-run/io.hpp \
-                          atf-run/requirements.cpp \
-                          atf-run/requirements.hpp \
-                          atf-run/signals.cpp \
-                          atf-run/signals.hpp \
-                          atf-run/test-program.cpp \
-                          atf-run/test-program.hpp \
-                          atf-run/timer.cpp \
-                          atf-run/timer.hpp \
-                          atf-run/user.cpp \
-                          atf-run/user.hpp
-atf_run_atf_run_LDADD = $(ATF_CXX_LIBS)
-dist_man_MANS += atf-run/atf-run.1
-
-tests_atf_run_DATA = atf-run/Atffile \
-                     atf-run/Kyuafile
-tests_atf_rundir = $(pkgtestsdir)/atf-run
-EXTRA_DIST += $(tests_atf_run_DATA)
-
-tests_atf_run_PROGRAMS = atf-run/atffile_test
-atf_run_atffile_test_SOURCES = atf-run/atffile_test.cpp \
-                               atf-run/atffile.cpp
-atf_run_atffile_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail
-atf_run_atffile_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/bad_metadata_helper
-atf_run_bad_metadata_helper_SOURCES = atf-run/bad_metadata_helper.c
-atf_run_bad_metadata_helper_LDADD = libatf-c.la
-
-tests_atf_run_PROGRAMS += atf-run/config_test
-atf_run_config_test_SOURCES = atf-run/config_test.cpp \
-                              atf-run/config.cpp
-atf_run_config_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail
-atf_run_config_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/expect_helpers
-atf_run_expect_helpers_SOURCES = atf-run/expect_helpers.c
-atf_run_expect_helpers_LDADD = libatf-c.la
-
-tests_atf_run_PROGRAMS += atf-run/fs_test
-atf_run_fs_test_SOURCES = atf-run/fs_test.cpp \
-                          atf-run/fs.cpp \
-                          atf-run/user.cpp
-atf_run_fs_test_LDADD = $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/io_test
-atf_run_io_test_SOURCES = atf-run/io_test.cpp \
-                          atf-run/io.cpp \
-                          atf-run/signals.cpp
-atf_run_io_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/misc_helpers
-atf_run_misc_helpers_SOURCES = atf-run/misc_helpers.cpp
-atf_run_misc_helpers_LDADD = $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/pass_helper
-atf_run_pass_helper_SOURCES = atf-run/pass_helper.cpp
-atf_run_pass_helper_LDADD = $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/several_tcs_helper
-atf_run_several_tcs_helper_SOURCES = atf-run/several_tcs_helper.c
-atf_run_several_tcs_helper_LDADD = libatf-c.la
-
-tests_atf_run_PROGRAMS += atf-run/requirements_test
-atf_run_requirements_test_SOURCES = atf-run/requirements_test.cpp \
-                                    atf-run/requirements.cpp \
-                                    atf-run/user.cpp
-atf_run_requirements_test_LDADD = $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/signals_test
-atf_run_signals_test_SOURCES = atf-run/signals_test.cpp atf-run/signals.cpp
-atf_run_signals_test_LDADD = $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/test_program_test
-atf_run_test_program_test_SOURCES = atf-run/test_program_test.cpp \
-                                    atf-run/fs.cpp \
-                                    atf-run/io.cpp \
-                                    atf-run/requirements.cpp \
-                                    atf-run/signals.cpp \
-                                    atf-run/test-program.cpp \
-                                    atf-run/timer.cpp \
-                                    atf-run/user.cpp
-atf_run_test_program_test_CPPFLAGS = -I$(srcdir)/atf-c++/detail
-atf_run_test_program_test_LDADD = atf-c++/detail/libtest_helpers.la $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/user_test
-atf_run_user_test_SOURCES = atf-run/user_test.cpp atf-run/user.cpp
-atf_run_user_test_LDADD = $(ATF_CXX_LIBS)
-
-tests_atf_run_PROGRAMS += atf-run/zero_tcs_helper
-atf_run_zero_tcs_helper_SOURCES = atf-run/zero_tcs_helper.c
-atf_run_zero_tcs_helper_LDADD = libatf-c.la
-
-tests_atf_run_SCRIPTS = atf-run/integration_test
-CLEANFILES += atf-run/integration_test
-EXTRA_DIST += atf-run/integration_test.sh
-atf-run/integration_test: $(srcdir)/atf-run/integration_test.sh
-	test -d atf-run || mkdir -p atf-run
-	@src="$(srcdir)/atf-run/integration_test.sh"; \
-	dst="atf-run/integration_test"; $(BUILD_SH_TP)
-
-hooksdir = $(pkgdatadir)
-hooks_DATA = atf-run/share/atf-run.hooks
-EXTRA_DIST += $(hooks_DATA)
-
-egdir = $(atf_egdir)
-eg_DATA = atf-run/sample/atf-run.hooks
-eg_DATA += atf-run/sample/common.conf
-EXTRA_DIST += $(eg_DATA)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/atf-run/atf-run.1 b/contrib/atf/atf-run/atf-run.1
deleted file mode 100644
index d593f479445..00000000000
--- a/contrib/atf/atf-run/atf-run.1
+++ /dev/null
@@ -1,202 +0,0 @@
-.\"
-.\" Automated Testing Framework (atf)
-.\"
-.\" 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.
-.\"
-.Dd November 1, 2010
-.Dt ATF-RUN 1
-.Os
-.Sh NAME
-.Nm atf-run
-.Nd executes a collection of test programs
-.Sh SYNOPSIS
-.Nm
-.Op Fl v Ar var1=value1 Op .. Fl v Ar varN=valueN
-.Op Ar test_program1 Op Ar .. test_programN
-.Nm
-.Fl h
-.Sh DESCRIPTION
-.Nm
-executes a collection of test programs or, in other words, a complete
-test suite.
-The results of each test program are collected by the tool, and are then
-multiplexed into a single machine-parseable report; see
-.Xr atf-formats 5
-for more details.
-This report can later be transformed into many different and saner formats
-using the
-.Nm atf-report
-tool.
-.Pp
-The list of test programs to execute is read from an
-.Pa Atffile
-present in the current directory.
-This file describes the test suite stored in the directory it lives in,
-which aside from the list of test programs also includes meta-data and
-configuration variables.
-.Pp
-.Nm
-is also in charge of reading the configuration files that tune the behavior
-of each test program and passing down the necessary variables to them.
-More details on how this is done are given in the
-.Sx Configuration
-section.
-.Pp
-In the first synopsis form,
-.Nm
-parses the
-.Pa Atffile
-in the current directory and runs all the test programs specified in it.
-If any test program names are given as part of the command line, those are
-the ones executed instead of the complete list.
-.Pp
-In the second synopsis form,
-.Nm
-will print information about all supported options and their purpose.
-.Pp
-The following options are available:
-.Bl -tag -width XvXvarXvalueXX
-.It Fl h
-Shows a short summary of all available options and their purpose.
-.It Fl v Ar var=value
-Sets the configuration variable
-.Ar var
-to the given value
-.Ar value .
-.El
-.Ss Configuration
-.Nm
-reads configuration data from multiple places.
-After all of these places have been analyzed, a list of variable-value
-pairs are passed to the test programs to be run.
-.Pp
-The following locations are scanned for configuration data, in order.
-Items down the list override values defined above them:
-.Bl -enum
-.It
-Configuration variables defined in the
-.Pa Atffile .
-.It
-Configuration variables defined in the system-wide configuration file
-shared among all test suites.
-This lives in
-.Pa ${ATF_CONFDIR}/common.conf .
-.It
-Configuration variables defined in the system-wide test-suite-specific
-configuration file.
-This lives in
-.Pa ${ATF_CONFDIR}/<test-suite>.conf .
-.It
-Configuration variables defined in the user-specific configuration file
-shared among all test suites.
-This lives in
-.Pa ${HOME}/.atf/common.conf .
-.It
-Configuration variables defined in the user-specific test-suite-specific
-configuration file.
-This lives in
-.Pa ${HOME}/.atf/<test-suite>.conf .
-.It
-Configuration variables provided as part of the command line through the
-.Fl v
-option.
-.El
-.Pp
-The value of
-.Va ATF_CONFDIR
-in the above list determined as detailed in
-.Xr atf-config 1 .
-.Pp
-The following configuration variables are globally recognized:
-.Bl -tag -width XunprivilegedXuserXX
-.It Va unprivileged-user
-The name of the system user that atf-run will drop root privileges into
-for test cases defining
-.Sq require.user=unprivileged .
-Note that this is
-.Em not provided for security purposes ;
-this feature is only for the convenience of the user.
-.El
-.Ss Hooks
-.Nm Ns 's
-internal behavior can be customized by the system administrator and the
-user by means of hooks.
-These hooks are written in the shell script language for simplicity and
-are stored in the following files, which are read in the order provided
-below:
-.Bl -enum
-.It
-${ATF_CONFDIR}/atf-run.hooks
-.It
-${HOME}/.atf/atf-run.hooks
-.El
-.Pp
-The following hooks are supported:
-.Bl -tag -width infoXstartXhookXX
-.It info_start_hook
-Called before
-.Nm
-executes any test program.
-The purpose of this hook is to write additional
-.Sq info
-stanzas to the top of the output report; these are defined by the
-.Sq application/X-atf-tps format
-described in
-.Xr atf-formats 5 .
-Always use the
-.Sq atf_tps_writer_info
-function to print these.
-.Pp
-This takes no parameters.
-.It info_end_hook
-Similar to
-.Sq info_start_hook
-but executed after all test programs have been run so that additional
-.Sq info
-stanzas can be added to the bottom of the output report.
-.Pp
-This takes no parameters.
-.El
-.Pp
-All hooks are accompanied by a function named
-.Sq default_<hook_name>
-that can be executed by them to invoke the default behavior built into
-.Nm .
-For example, in order to extend the default
-.Sq info_start_hook
-hook, we could write the following function:
-.Bd -literal -offset indent
-info_start_hook()
-{
-    default_info_start_hook "${@}"
-
-    atf_tps_writer_info "uptime" "$(uptime)"
-}
-.Ed
-.Sh SEE ALSO
-.Xr atf-report 1 ,
-.Xr atf-test-program 1 ,
-.Xr atf 7
diff --git a/contrib/atf/atf-run/atf-run.cpp b/contrib/atf/atf-run/atf-run.cpp
deleted file mode 100644
index e28e8fdf077..00000000000
--- a/contrib/atf/atf-run/atf-run.cpp
+++ /dev/null
@@ -1,563 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if defined(HAVE_CONFIG_H)
-#include "bconfig.h"
-#endif
-
-extern "C" {
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-}
-
-#include <algorithm>
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <map>
-#include <string>
-
-#include "atf-c++/detail/application.hpp"
-#include "atf-c++/config.hpp"
-#include "atf-c++/tests.hpp"
-
-#include "atf-c++/detail/env.hpp"
-#include "atf-c++/detail/exceptions.hpp"
-#include "atf-c++/detail/fs.hpp"
-#include "atf-c++/detail/parser.hpp"
-#include "atf-c++/detail/process.hpp"
-#include "atf-c++/detail/sanity.hpp"
-#include "atf-c++/detail/text.hpp"
-
-#include "atffile.hpp"
-#include "config.hpp"
-#include "fs.hpp"
-#include "requirements.hpp"
-#include "test-program.hpp"
-
-namespace impl = atf::atf_run;
-
-#if defined(MAXCOMLEN)
-static const std::string::size_type max_core_name_length = MAXCOMLEN;
-#else
-static const std::string::size_type max_core_name_length = std::string::npos;
-#endif
-
-class atf_run : public atf::application::app {
-    static const char* m_description;
-
-    atf::tests::vars_map m_cmdline_vars;
-
-    static atf::tests::vars_map::value_type parse_var(const std::string&);
-
-    void process_option(int, const char*);
-    std::string specific_args(void) const;
-    options_set specific_options(void) const;
-
-    void parse_vflag(const std::string&);
-
-    std::vector< std::string > conf_args(void) const;
-
-    size_t count_tps(std::vector< std::string >) const;
-
-    int run_test(const atf::fs::path&, impl::atf_tps_writer&,
-                 const atf::tests::vars_map&);
-    int run_test_directory(const atf::fs::path&, impl::atf_tps_writer&);
-    int run_test_program(const atf::fs::path&, impl::atf_tps_writer&,
-                         const atf::tests::vars_map&);
-
-    impl::test_case_result get_test_case_result(const std::string&,
-        const atf::process::status&, const atf::fs::path&) const;
-
-public:
-    atf_run(void);
-
-    int main(void);
-};
-
-static void
-sanitize_gdb_env(void)
-{
-    try {
-        atf::env::unset("TERM");
-    } catch (...) {
-        // Just swallow exceptions here; they cannot propagate into C, which
-        // is where this function is called from, and even if these exceptions
-        // appear they are benign.
-    }
-}
-
-static void
-dump_stacktrace(const atf::fs::path& tp, const atf::process::status& s,
-                const atf::fs::path& workdir, impl::atf_tps_writer& w)
-{
-    PRE(s.signaled() && s.coredump());
-
-    w.stderr_tc("Test program crashed; attempting to get stack trace");
-
-    const atf::fs::path corename = workdir /
-        (tp.leaf_name().substr(0, max_core_name_length) + ".core");
-    if (!atf::fs::exists(corename)) {
-        w.stderr_tc("Expected file " + corename.str() + " not found");
-        return;
-    }
-
-    const atf::fs::path gdb(GDB);
-    const atf::fs::path gdbout = workdir / "gdb.out";
-    const atf::process::argv_array args(gdb.leaf_name().c_str(), "-batch",
-                                        "-q", "-ex", "bt", tp.c_str(),
-                                        corename.c_str(), NULL);
-    atf::process::status status = atf::process::exec(
-        gdb, args,
-        atf::process::stream_redirect_path(gdbout),
-        atf::process::stream_redirect_path(atf::fs::path("/dev/null")),
-        sanitize_gdb_env);
-    if (!status.exited() || status.exitstatus() != EXIT_SUCCESS) {
-        w.stderr_tc("Execution of " GDB " failed");
-        return;
-    }
-
-    std::ifstream input(gdbout.c_str());
-    if (input) {
-        std::string line;
-        while (std::getline(input, line).good())
-            w.stderr_tc(line);
-        input.close();
-    }
-
-    w.stderr_tc("Stack trace complete");
-}
-
-const char* atf_run::m_description =
-    "atf-run is a tool that runs tests programs and collects their "
-    "results.";
-
-atf_run::atf_run(void) :
-    app(m_description, "atf-run(1)", "atf(7)")
-{
-}
-
-void
-atf_run::process_option(int ch, const char* arg)
-{
-    switch (ch) {
-    case 'v':
-        parse_vflag(arg);
-        break;
-
-    default:
-        UNREACHABLE;
-    }
-}
-
-std::string
-atf_run::specific_args(void)
-    const
-{
-    return "[test-program1 .. test-programN]";
-}
-
-atf_run::options_set
-atf_run::specific_options(void)
-    const
-{
-    using atf::application::option;
-    options_set opts;
-    opts.insert(option('v', "var=value", "Sets the configuration variable "
-                                         "`var' to `value'; overrides "
-                                         "values in configuration files"));
-    return opts;
-}
-
-void
-atf_run::parse_vflag(const std::string& str)
-{
-    if (str.empty())
-        throw std::runtime_error("-v requires a non-empty argument");
-
-    std::vector< std::string > ws = atf::text::split(str, "=");
-    if (ws.size() == 1 && str[str.length() - 1] == '=') {
-        m_cmdline_vars[ws[0]] = "";
-    } else {
-        if (ws.size() != 2)
-            throw std::runtime_error("-v requires an argument of the form "
-                                     "var=value");
-
-        m_cmdline_vars[ws[0]] = ws[1];
-    }
-}
-
-int
-atf_run::run_test(const atf::fs::path& tp,
-                  impl::atf_tps_writer& w,
-                  const atf::tests::vars_map& config)
-{
-    atf::fs::file_info fi(tp);
-
-    int errcode;
-    if (fi.get_type() == atf::fs::file_info::dir_type)
-        errcode = run_test_directory(tp, w);
-    else {
-        const atf::tests::vars_map effective_config =
-            impl::merge_configs(config, m_cmdline_vars);
-
-        errcode = run_test_program(tp, w, effective_config);
-    }
-    return errcode;
-}
-
-int
-atf_run::run_test_directory(const atf::fs::path& tp,
-                            impl::atf_tps_writer& w)
-{
-    impl::atffile af = impl::read_atffile(tp / "Atffile");
-
-    atf::tests::vars_map test_suite_vars;
-    {
-        atf::tests::vars_map::const_iterator iter =
-            af.props().find("test-suite");
-        INV(iter != af.props().end());
-        test_suite_vars = impl::read_config_files((*iter).second);
-    }
-
-    bool ok = true;
-    for (std::vector< std::string >::const_iterator iter = af.tps().begin();
-         iter != af.tps().end(); iter++) {
-        const bool result = run_test(tp / *iter, w,
-            impl::merge_configs(af.conf(), test_suite_vars));
-        ok &= (result == EXIT_SUCCESS);
-    }
-
-    return ok ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-impl::test_case_result
-atf_run::get_test_case_result(const std::string& broken_reason,
-                              const atf::process::status& s,
-                              const atf::fs::path& resfile)
-    const
-{
-    using atf::text::to_string;
-    using impl::read_test_case_result;
-    using impl::test_case_result;
-
-    if (!broken_reason.empty()) {
-        test_case_result tcr;
-
-        try {
-            tcr = read_test_case_result(resfile);
-
-            if (tcr.state() == "expected_timeout") {
-                return tcr;
-            } else {
-                return test_case_result("failed", -1, broken_reason);
-            }
-        } catch (const std::runtime_error&) {
-            return test_case_result("failed", -1, broken_reason);
-        }
-    }
-
-    if (s.exited()) {
-        test_case_result tcr;
-
-        try {
-            tcr = read_test_case_result(resfile);
-        } catch (const std::runtime_error& e) {
-            return test_case_result("failed", -1, "Test case exited "
-                "normally but failed to create the results file: " +
-                std::string(e.what()));
-        }
-
-        if (tcr.state() == "expected_death") {
-            return tcr;
-        } else if (tcr.state() == "expected_exit") {
-            if (tcr.value() == -1 || s.exitstatus() == tcr.value())
-                return tcr;
-            else
-                return test_case_result("failed", -1, "Test case was "
-                    "expected to exit with a " + to_string(tcr.value()) +
-                    " error code but returned " + to_string(s.exitstatus()));
-        } else if (tcr.state() == "expected_failure") {
-            if (s.exitstatus() == EXIT_SUCCESS)
-                return tcr;
-            else
-                return test_case_result("failed", -1, "Test case returned an "
-                    "error in expected_failure mode but it should not have");
-        } else if (tcr.state() == "expected_signal") {
-            return test_case_result("failed", -1, "Test case exited cleanly "
-                "but was expected to receive a signal");
-        } else if (tcr.state() == "failed") {
-            if (s.exitstatus() == EXIT_SUCCESS)
-                return test_case_result("failed", -1, "Test case "
-                    "exited successfully but reported failure");
-            else
-                return tcr;
-        } else if (tcr.state() == "passed") {
-            if (s.exitstatus() == EXIT_SUCCESS)
-                return tcr;
-            else
-                return test_case_result("failed", -1, "Test case exited as "
-                    "passed but reported an error");
-        } else if (tcr.state() == "skipped") {
-            if (s.exitstatus() == EXIT_SUCCESS)
-                return tcr;
-            else
-                return test_case_result("failed", -1, "Test case exited as "
-                    "skipped but reported an error");
-        }
-    } else if (s.signaled()) {
-        test_case_result tcr;
-
-        try {
-            tcr = read_test_case_result(resfile);
-        } catch (const std::runtime_error&) {
-            return test_case_result("failed", -1, "Test program received "
-                "signal " + atf::text::to_string(s.termsig()) +
-                (s.coredump() ? " (core dumped)" : ""));
-        }
-
-        if (tcr.state() == "expected_death") {
-            return tcr;
-        } else if (tcr.state() == "expected_signal") {
-            if (tcr.value() == -1 || s.termsig() == tcr.value())
-                return tcr;
-            else
-                return test_case_result("failed", -1, "Test case was "
-                    "expected to exit due to a " + to_string(tcr.value()) +
-                    " signal but got " + to_string(s.termsig()));
-        } else {
-            return test_case_result("failed", -1, "Test program received "
-                "signal " + atf::text::to_string(s.termsig()) +
-                (s.coredump() ? " (core dumped)" : "") + " and created a "
-                "bogus results file");
-        }
-    }
-    UNREACHABLE;
-    return test_case_result();
-}
-
-int
-atf_run::run_test_program(const atf::fs::path& tp,
-                          impl::atf_tps_writer& w,
-                          const atf::tests::vars_map& config)
-{
-    int errcode = EXIT_SUCCESS;
-
-    impl::metadata md;
-    try {
-        md = impl::get_metadata(tp, config);
-    } catch (const atf::parser::format_error& e) {
-        w.start_tp(tp.str(), 0);
-        w.end_tp("Invalid format for test case list: " + std::string(e.what()));
-        return EXIT_FAILURE;
-    } catch (const atf::parser::parse_errors& e) {
-        const std::string reason = atf::text::join(e, "; ");
-        w.start_tp(tp.str(), 0);
-        w.end_tp("Invalid format for test case list: " + reason);
-        return EXIT_FAILURE;
-    }
-
-    impl::temp_dir resdir(atf::fs::path(atf::config::get("atf_workdir")) /
-                          "atf-run.XXXXXX");
-
-    w.start_tp(tp.str(), md.test_cases.size());
-    if (md.test_cases.empty()) {
-        w.end_tp("Bogus test program: reported 0 test cases");
-        errcode = EXIT_FAILURE;
-    } else {
-        for (std::map< std::string, atf::tests::vars_map >::const_iterator iter
-             = md.test_cases.begin(); iter != md.test_cases.end(); iter++) {
-            const std::string& tcname = (*iter).first;
-            const atf::tests::vars_map& tcmd = (*iter).second;
-
-            w.start_tc(tcname);
-
-            try {
-                const std::string& reqfail = impl::check_requirements(
-                    tcmd, config);
-                if (!reqfail.empty()) {
-                    w.end_tc("skipped", reqfail);
-                    continue;
-                }
-            } catch (const std::runtime_error& e) {
-                w.end_tc("failed", e.what());
-                errcode = EXIT_FAILURE;
-                continue;
-            }
-
-            const std::pair< int, int > user = impl::get_required_user(
-                tcmd, config);
-
-            atf::fs::path resfile = resdir.get_path() / "tcr";
-            INV(!atf::fs::exists(resfile));
-            try {
-                const bool has_cleanup = atf::text::to_bool(
-                    (*tcmd.find("has.cleanup")).second);
-
-                impl::temp_dir workdir(atf::fs::path(atf::config::get(
-                    "atf_workdir")) / "atf-run.XXXXXX");
-                if (user.first != -1 && user.second != -1) {
-                    if (::chown(workdir.get_path().c_str(), user.first,
-                                user.second) == -1) {
-                        throw atf::system_error("chown(" +
-                            workdir.get_path().str() + ")", "chown(2) failed",
-                            errno);
-                    }
-                    resfile = workdir.get_path() / "tcr";
-                }
-
-                std::pair< std::string, const atf::process::status > s =
-                    impl::run_test_case(tp, tcname, "body", tcmd, config,
-                                            resfile, workdir.get_path(), w);
-                if (s.second.signaled() && s.second.coredump())
-                    dump_stacktrace(tp, s.second, workdir.get_path(), w);
-                if (has_cleanup)
-                    (void)impl::run_test_case(tp, tcname, "cleanup", tcmd,
-                            config, resfile, workdir.get_path(), w);
-
-                // TODO: Force deletion of workdir.
-
-                impl::test_case_result tcr = get_test_case_result(s.first,
-                    s.second, resfile);
-
-                w.end_tc(tcr.state(), tcr.reason());
-                if (tcr.state() == "failed")
-                    errcode = EXIT_FAILURE;
-            } catch (...) {
-                if (atf::fs::exists(resfile))
-                    atf::fs::remove(resfile);
-                throw;
-            }
-            if (atf::fs::exists(resfile))
-                atf::fs::remove(resfile);
-
-        }
-        w.end_tp("");
-    }
-
-    return errcode;
-}
-
-size_t
-atf_run::count_tps(std::vector< std::string > tps)
-    const
-{
-    size_t ntps = 0;
-
-    for (std::vector< std::string >::const_iterator iter = tps.begin();
-         iter != tps.end(); iter++) {
-        atf::fs::path tp(*iter);
-        atf::fs::file_info fi(tp);
-
-        if (fi.get_type() == atf::fs::file_info::dir_type) {
-            impl::atffile af = impl::read_atffile(tp / "Atffile");
-            std::vector< std::string > aux = af.tps();
-            for (std::vector< std::string >::iterator i2 = aux.begin();
-                 i2 != aux.end(); i2++)
-                *i2 = (tp / *i2).str();
-            ntps += count_tps(aux);
-        } else
-            ntps++;
-    }
-
-    return ntps;
-}
-
-static
-void
-call_hook(const std::string& tool, const std::string& hook)
-{
-    const atf::fs::path sh(atf::config::get("atf_shell"));
-    const atf::fs::path hooks =
-        atf::fs::path(atf::config::get("atf_pkgdatadir")) / (tool + ".hooks");
-
-    const atf::process::status s =
-        atf::process::exec(sh,
-                           atf::process::argv_array(sh.c_str(), hooks.c_str(),
-                                                    hook.c_str(), NULL),
-                           atf::process::stream_inherit(),
-                           atf::process::stream_inherit());
-
-
-    if (!s.exited() || s.exitstatus() != EXIT_SUCCESS)
-        throw std::runtime_error("Failed to run the '" + hook + "' hook "
-                                 "for '" + tool + "'");
-}
-
-int
-atf_run::main(void)
-{
-    impl::atffile af = impl::read_atffile(atf::fs::path("Atffile"));
-
-    std::vector< std::string > tps;
-    tps = af.tps();
-    if (m_argc >= 1) {
-        // TODO: Ensure that the given test names are listed in the
-        // Atffile.  Take into account that the file can be using globs.
-        tps.clear();
-        for (int i = 0; i < m_argc; i++)
-            tps.push_back(m_argv[i]);
-    }
-
-    // Read configuration data for this test suite.
-    atf::tests::vars_map test_suite_vars;
-    {
-        atf::tests::vars_map::const_iterator iter =
-            af.props().find("test-suite");
-        INV(iter != af.props().end());
-        test_suite_vars = impl::read_config_files((*iter).second);
-    }
-
-    impl::atf_tps_writer w(std::cout);
-    call_hook("atf-run", "info_start_hook");
-    w.ntps(count_tps(tps));
-
-    bool ok = true;
-    for (std::vector< std::string >::const_iterator iter = tps.begin();
-         iter != tps.end(); iter++) {
-        const bool result = run_test(atf::fs::path(*iter), w,
-            impl::merge_configs(af.conf(), test_suite_vars));
-        ok &= (result == EXIT_SUCCESS);
-    }
-
-    call_hook("atf-run", "info_end_hook");
-
-    return ok ? EXIT_SUCCESS : EXIT_FAILURE;
-}
-
-int
-main(int argc, char* const* argv)
-{
-    return atf_run().run(argc, argv);
-}
diff --git a/contrib/atf/atf-run/atffile.cpp b/contrib/atf/atf-run/atffile.cpp
deleted file mode 100644
index 22ece645d5f..00000000000
--- a/contrib/atf/atf-run/atffile.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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 <fstream>
-
-#include "atf-c/defs.h"
-
-#include "atf-c++/detail/exceptions.hpp"
-#include "atf-c++/detail/expand.hpp"
-#include "atf-c++/detail/parser.hpp"
-#include "atf-c++/detail/sanity.hpp"
-
-#include "atffile.hpp"
-
-namespace impl = atf::atf_run;
-namespace detail = atf::atf_run::detail;
-
-// ------------------------------------------------------------------------
-// The "atf_atffile" auxiliary parser.
-// ------------------------------------------------------------------------
-
-namespace atf_atffile {
-
-static const atf::parser::token_type eof_type = 0;
-static const atf::parser::token_type nl_type = 1;
-static const atf::parser::token_type text_type = 2;
-static const atf::parser::token_type colon_type = 3;
-static const atf::parser::token_type conf_type = 4;
-static const atf::parser::token_type dblquote_type = 5;
-static const atf::parser::token_type equal_type = 6;
-static const atf::parser::token_type hash_type = 7;
-static const atf::parser::token_type prop_type = 8;
-static const atf::parser::token_type tp_type = 9;
-static const atf::parser::token_type tp_glob_type = 10;
-
-class tokenizer : public atf::parser::tokenizer< std::istream > {
-public:
-    tokenizer(std::istream& is, size_t curline) :
-        atf::parser::tokenizer< std::istream >
-            (is, true, eof_type, nl_type, text_type, curline)
-    {
-        add_delim(':', colon_type);
-        add_delim('=', equal_type);
-        add_delim('#', hash_type);
-        add_quote('"', dblquote_type);
-        add_keyword("conf", conf_type);
-        add_keyword("prop", prop_type);
-        add_keyword("tp", tp_type);
-        add_keyword("tp-glob", tp_glob_type);
-    }
-};
-
-} // namespace atf_atffile
-
-// ------------------------------------------------------------------------
-// The "atf_atffile_reader" class.
-// ------------------------------------------------------------------------
-
-detail::atf_atffile_reader::atf_atffile_reader(std::istream& is) :
-    m_is(is)
-{
-}
-
-detail::atf_atffile_reader::~atf_atffile_reader(void)
-{
-}
-
-void
-detail::atf_atffile_reader::got_conf(
-    const std::string& name ATF_DEFS_ATTRIBUTE_UNUSED,
-    const std::string& val ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-detail::atf_atffile_reader::got_prop(
-    const std::string& name ATF_DEFS_ATTRIBUTE_UNUSED,
-    const std::string& val ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-detail::atf_atffile_reader::got_tp(
-    const std::string& name ATF_DEFS_ATTRIBUTE_UNUSED,
-    bool isglob ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-detail::atf_atffile_reader::got_eof(void)
-{
-}
-
-void
-detail::atf_atffile_reader::read(void)
-{
-    using atf::parser::parse_error;
-    using namespace atf_atffile;
-
-    std::pair< size_t, atf::parser::headers_map > hml =
-        atf::parser::read_headers(m_is, 1);
-    atf::parser::validate_content_type(hml.second,
-        "application/X-atf-atffile", 1);
-
-    tokenizer tkz(m_is, hml.first);
-    atf::parser::parser< tokenizer > p(tkz);
-
-    for (;;) {
-        try {
-            atf::parser::token t =
-                p.expect(conf_type, hash_type, prop_type, tp_type,
-                         tp_glob_type, nl_type, eof_type,
-                         "conf, #, prop, tp, tp-glob, a new line or eof");
-            if (t.type() == eof_type)
-                break;
-
-            if (t.type() == conf_type) {
-                t = p.expect(colon_type, "`:'");
-
-                t = p.expect(text_type, "variable name");
-                std::string var = t.text();
-
-                t = p.expect(equal_type, "equal sign");
-
-                t = p.expect(text_type, "word or quoted string");
-                ATF_PARSER_CALLBACK(p, got_conf(var, t.text()));
-            } else if (t.type() == hash_type) {
-                (void)p.rest_of_line();
-            } else if (t.type() == prop_type) {
-                t = p.expect(colon_type, "`:'");
-
-                t = p.expect(text_type, "property name");
-                std::string name = t.text();
-
-                t = p.expect(equal_type, "equale sign");
-
-                t = p.expect(text_type, "word or quoted string");
-                ATF_PARSER_CALLBACK(p, got_prop(name, t.text()));
-            } else if (t.type() == tp_type) {
-                t = p.expect(colon_type, "`:'");
-
-                t = p.expect(text_type, "word or quoted string");
-                ATF_PARSER_CALLBACK(p, got_tp(t.text(), false));
-            } else if (t.type() == tp_glob_type) {
-                t = p.expect(colon_type, "`:'");
-
-                t = p.expect(text_type, "word or quoted string");
-                ATF_PARSER_CALLBACK(p, got_tp(t.text(), true));
-            } else if (t.type() == nl_type) {
-                continue;
-            } else
-                UNREACHABLE;
-
-            t = p.expect(nl_type, hash_type, eof_type,
-                         "new line or comment");
-            if (t.type() == hash_type) {
-                (void)p.rest_of_line();
-                t = p.next();
-            } else if (t.type() == eof_type)
-                break;
-        } catch (const parse_error& pe) {
-            p.add_error(pe);
-            p.reset(nl_type);
-        }
-    }
-
-    ATF_PARSER_CALLBACK(p, got_eof());
-}
-
-// ------------------------------------------------------------------------
-// The "reader" helper class.
-// ------------------------------------------------------------------------
-
-class reader : public detail::atf_atffile_reader {
-    const atf::fs::directory& m_dir;
-    atf::tests::vars_map m_conf, m_props;
-    std::vector< std::string > m_tps;
-
-    void
-    got_tp(const std::string& name, bool isglob)
-    {
-        if (isglob) {
-            std::vector< std::string > ms =
-                atf::expand::expand_glob(name, m_dir.names());
-            // Cannot use m_tps.insert(iterator, begin, end) here because it
-            // does not work under Solaris.
-            for (std::vector< std::string >::const_iterator iter = ms.begin();
-                 iter != ms.end(); iter++)
-                m_tps.push_back(*iter);
-        } else {
-            if (m_dir.find(name) == m_dir.end())
-                throw atf::not_found_error< atf::fs::path >
-                    ("Cannot locate the " + name + " file",
-                     atf::fs::path(name));
-            m_tps.push_back(name);
-        }
-    }
-
-    void
-    got_prop(const std::string& name, const std::string& val)
-    {
-        m_props[name] = val;
-    }
-
-    void
-    got_conf(const std::string& var, const std::string& val)
-    {
-        m_conf[var] = val;
-    }
-
-public:
-    reader(std::istream& is, const atf::fs::directory& dir) :
-        detail::atf_atffile_reader(is),
-        m_dir(dir)
-    {
-    }
-
-    const atf::tests::vars_map&
-    conf(void)
-        const
-    {
-        return m_conf;
-    }
-
-    const atf::tests::vars_map&
-    props(void)
-        const
-    {
-        return m_props;
-    }
-
-    const std::vector< std::string >&
-    tps(void)
-        const
-    {
-        return m_tps;
-    }
-};
-
-// ------------------------------------------------------------------------
-// The "atffile" class.
-// ------------------------------------------------------------------------
-
-impl::atffile::atffile(const atf::tests::vars_map& config_vars,
-                       const std::vector< std::string >& test_program_names,
-                       const atf::tests::vars_map& properties) :
-    m_conf(config_vars),
-    m_tps(test_program_names),
-    m_props(properties)
-{
-    PRE(properties.find("test-suite") != properties.end());
-}
-
-const std::vector< std::string >&
-impl::atffile::tps(void)
-    const
-{
-    return m_tps;
-}
-
-const atf::tests::vars_map&
-impl::atffile::conf(void)
-    const
-{
-    return m_conf;
-}
-
-const atf::tests::vars_map&
-impl::atffile::props(void)
-    const
-{
-    return m_props;
-}
-
-// ------------------------------------------------------------------------
-// Free functions.
-// ------------------------------------------------------------------------
-
-// XXX Glob expansion and file existance checks certainly do not belong in
-// a *parser*.  This needs to be taken out...
-impl::atffile
-impl::read_atffile(const atf::fs::path& filename)
-{
-    // Scan the directory where the atffile lives in to gather a list of
-    // all possible test programs in it.
-    fs::directory dir(filename.branch_path());
-    dir.erase(filename.leaf_name());
-    fs::directory::iterator iter = dir.begin();
-    while (iter != dir.end()) {
-        const std::string& name = (*iter).first;
-        const fs::file_info& fi = (*iter).second;
-
-        // Discard hidden files and non-executable ones so that they are
-        // not candidates for glob matching.
-        if (name[0] == '.' || (!fi.is_owner_executable() &&
-                               !fi.is_group_executable()))
-            dir.erase(iter++);
-        else
-            iter++;
-    }
-
-    // Parse the atffile.
-    std::ifstream is(filename.c_str());
-    if (!is)
-        throw atf::not_found_error< fs::path >
-            ("Cannot open Atffile", filename);
-    reader r(is, dir);
-    r.read();
-    is.close();
-
-    // Sanity checks.
-    if (r.props().find("test-suite") == r.props().end())
-        throw atf::not_found_error< std::string >
-            ("Undefined property `test-suite'", "test-suite");
-
-    return atffile(r.conf(), r.tps(), r.props());
-}
diff --git a/contrib/atf/atf-run/atffile.hpp b/contrib/atf/atf-run/atffile.hpp
deleted file mode 100644
index 8c915c24cf4..00000000000
--- a/contrib/atf/atf-run/atffile.hpp
+++ /dev/null
@@ -1,95 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if !defined(_ATF_RUN_ATFFILE_HPP_)
-#define _ATF_RUN_ATFFILE_HPP_
-
-#include <string>
-#include <vector>
-
-#include "atf-c++/tests.hpp"
-
-#include "atf-c++/detail/fs.hpp"
-
-namespace atf {
-namespace atf_run {
-
-// ------------------------------------------------------------------------
-// The "atf_atffile_reader" class.
-// ------------------------------------------------------------------------
-
-namespace detail {
-
-class atf_atffile_reader {
-    std::istream& m_is;
-
-protected:
-    virtual void got_conf(const std::string&, const std::string &);
-    virtual void got_prop(const std::string&, const std::string &);
-    virtual void got_tp(const std::string&, bool);
-    virtual void got_eof(void);
-
-public:
-    atf_atffile_reader(std::istream&);
-    virtual ~atf_atffile_reader(void);
-
-    void read(void);
-};
-
-} // namespace detail
-
-// ------------------------------------------------------------------------
-// The "atffile" class.
-// ------------------------------------------------------------------------
-
-class atffile {
-    atf::tests::vars_map m_conf;
-    std::vector< std::string > m_tps;
-    atf::tests::vars_map m_props;
-
-public:
-    atffile(const atf::tests::vars_map&,
-            const std::vector< std::string >&,
-            const atf::tests::vars_map&);
-
-    const atf::tests::vars_map& conf(void) const;
-    const std::vector< std::string >& tps(void) const;
-    const atf::tests::vars_map& props(void) const;
-};
-
-// ------------------------------------------------------------------------
-// Free functions.
-// ------------------------------------------------------------------------
-
-atffile read_atffile(const fs::path&);
-
-} // namespace atf_run
-} // namespace atf
-
-#endif // !defined(_ATF_RUN_ATFFILE_HPP_)
diff --git a/contrib/atf/atf-run/atffile_test.cpp b/contrib/atf/atf-run/atffile_test.cpp
deleted file mode 100644
index e5781a3370b..00000000000
--- a/contrib/atf/atf-run/atffile_test.cpp
+++ /dev/null
@@ -1,636 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/types.h>
-#include <sys/stat.h>
-}
-
-#include <algorithm>
-#include <fstream>
-#include <memory>
-
-#include "atf-c++/macros.hpp"
-
-#include "atf-c++/detail/exceptions.hpp"
-#include "atf-c++/detail/test_helpers.hpp"
-
-#include "atffile.hpp"
-
-namespace detail = atf::atf_run::detail;
-
-// ------------------------------------------------------------------------
-// Auxiliary functions.
-// ------------------------------------------------------------------------
-
-namespace {
-
-static
-std::auto_ptr< std::ofstream >
-new_atffile(void)
-{
-    std::auto_ptr< std::ofstream > os(new std::ofstream("Atffile"));
-    ATF_REQUIRE(*os);
-
-    (*os) << "Content-Type: application/X-atf-atffile; version=\"1\"\n\n";
-    return os;
-}
-
-static
-void
-touch_exec(const char* name)
-{
-    std::ofstream os(name);
-    ATF_REQUIRE(os);
-    os.close();
-    ATF_REQUIRE(::chmod(name, S_IRWXU) != -1);
-}
-
-static inline
-bool
-is_in(const std::string& value, const std::vector< std::string >& v)
-{
-    return std::find(v.begin(), v.end(), value) != v.end();
-}
-
-} // anonymous namespace
-
-// ------------------------------------------------------------------------
-// Tests cases for the "atffile" parser.
-// ------------------------------------------------------------------------
-
-class atffile_reader : protected detail::atf_atffile_reader {
-    void
-    got_conf(const std::string& name, const std::string& val)
-    {
-        m_calls.push_back("got_conf(" + name + ", " + val + ")");
-    }
-
-    void
-    got_prop(const std::string& name, const std::string& val)
-    {
-        m_calls.push_back("got_prop(" + name + ", " + val + ")");
-    }
-
-    void
-    got_tp(const std::string& name, bool isglob)
-    {
-        m_calls.push_back("got_tp(" + name + ", " + (isglob ? "true" : "false")
-                  + ")");
-    }
-
-    void
-    got_eof(void)
-    {
-        m_calls.push_back("got_eof()");
-    }
-
-public:
-    atffile_reader(std::istream& is) :
-        detail::atf_atffile_reader(is)
-    {
-    }
-
-    void
-    read(void)
-    {
-        atf_atffile_reader::read();
-    }
-
-    std::vector< std::string > m_calls;
-};
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_1);
-ATF_TEST_CASE_BODY(atffile_1)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_2);
-ATF_TEST_CASE_BODY(atffile_2)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "# This is a comment on a line of its own.\n"
-        "# And this is another one.\n"
-        "\n"
-        "	    # Another after some whitespace.\n"
-        "\n"
-        "# The last one after an empty line.\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_3);
-ATF_TEST_CASE_BODY(atffile_3)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "conf: var1=value1\n"
-        "conf: var2 = value2\n"
-        "conf: var3	=	value3\n"
-        "conf: var4	    =	    value4\n"
-        "\n"
-        "conf:var5=value5\n"
-        "    conf:var6=value6\n"
-        "\n"
-        "conf: var7 = \"This is a long value.\"\n"
-        "conf: var8 = \"Single-word\"\n"
-        "conf: var9 = \"    Single-word	\"\n"
-        "conf: var10 = Single-word\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_conf(var1, value1)",
-        "got_conf(var2, value2)",
-        "got_conf(var3, value3)",
-        "got_conf(var4, value4)",
-        "got_conf(var5, value5)",
-        "got_conf(var6, value6)",
-        "got_conf(var7, This is a long value.)",
-        "got_conf(var8, Single-word)",
-        "got_conf(var9,     Single-word	)",
-        "got_conf(var10, Single-word)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_4);
-ATF_TEST_CASE_BODY(atffile_4)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "prop: var1=value1\n"
-        "prop: var2 = value2\n"
-        "prop: var3	=	value3\n"
-        "prop: var4	    =	    value4\n"
-        "\n"
-        "prop:var5=value5\n"
-        "    prop:var6=value6\n"
-        "\n"
-        "prop: var7 = \"This is a long value.\"\n"
-        "prop: var8 = \"Single-word\"\n"
-        "prop: var9 = \"    Single-word	\"\n"
-        "prop: var10 = Single-word\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_prop(var1, value1)",
-        "got_prop(var2, value2)",
-        "got_prop(var3, value3)",
-        "got_prop(var4, value4)",
-        "got_prop(var5, value5)",
-        "got_prop(var6, value6)",
-        "got_prop(var7, This is a long value.)",
-        "got_prop(var8, Single-word)",
-        "got_prop(var9,     Single-word	)",
-        "got_prop(var10, Single-word)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_5);
-ATF_TEST_CASE_BODY(atffile_5)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "tp:foo\n"
-        "tp: foo\n"
-        "tp:  foo\n"
-        "tp:	foo\n"
-        "tp:	    foo\n"
-        "tp: \"name with spaces\"\n"
-        "tp: \"single-word\"\n"
-        "tp: single-word\n"
-        "\n"
-        "tp-glob:foo*?bar\n"
-        "tp-glob: foo*?bar\n"
-        "tp-glob:  foo*?bar\n"
-        "tp-glob:	foo*?bar\n"
-        "tp-glob:	    foo*?bar\n"
-        "tp-glob: \"glob * with ? spaces\"\n"
-        "tp-glob: \"single-*-word\"\n"
-        "tp-glob: single-*-word\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_tp(foo, false)",
-        "got_tp(foo, false)",
-        "got_tp(foo, false)",
-        "got_tp(foo, false)",
-        "got_tp(foo, false)",
-        "got_tp(name with spaces, false)",
-        "got_tp(single-word, false)",
-        "got_tp(single-word, false)",
-        "got_tp(foo*?bar, true)",
-        "got_tp(foo*?bar, true)",
-        "got_tp(foo*?bar, true)",
-        "got_tp(foo*?bar, true)",
-        "got_tp(foo*?bar, true)",
-        "got_tp(glob * with ? spaces, true)",
-        "got_tp(single-*-word, true)",
-        "got_tp(single-*-word, true)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_6);
-ATF_TEST_CASE_BODY(atffile_6)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "prop: foo = bar # A comment.\n"
-        "conf: foo = bar # A comment.\n"
-        "tp: foo # A comment.\n"
-        "tp-glob: foo # A comment.\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_prop(foo, bar)",
-        "got_conf(foo, bar)",
-        "got_tp(foo, false)",
-        "got_tp(foo, true)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_50);
-ATF_TEST_CASE_BODY(atffile_50)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "foo\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    // NO_CHECK_STYLE_BEGIN
-    const char* exp_errors[] = {
-        "3: Unexpected token `foo'; expected conf, #, prop, tp, tp-glob, a new line or eof",
-        NULL
-    };
-    // NO_CHECK_STYLE_END
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_51);
-ATF_TEST_CASE_BODY(atffile_51)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "foo bar\n"
-        "baz\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    // NO_CHECK_STYLE_BEGIN
-    const char* exp_errors[] = {
-        "3: Unexpected token `foo'; expected conf, #, prop, tp, tp-glob, a new line or eof",
-        "4: Unexpected token `baz'; expected conf, #, prop, tp, tp-glob, a new line or eof",
-        NULL
-    };
-    // NO_CHECK_STYLE_END
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_52);
-ATF_TEST_CASE_BODY(atffile_52)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "conf\n"
-        "conf:\n"
-        "conf: foo =\n"
-        "conf: bar = # A comment.\n"
-        "\n"
-        "prop\n"
-        "prop:\n"
-        "prop: foo =\n"
-        "prop: bar = # A comment.\n"
-        "\n"
-        "tp\n"
-        "tp:\n"
-        "tp: # A comment.\n"
-        "\n"
-        "tp-glob\n"
-        "tp-glob:\n"
-        "tp-glob: # A comment.\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected `:'",
-        "4: Unexpected token `<<NEWLINE>>'; expected variable name",
-        "5: Unexpected token `<<NEWLINE>>'; expected word or quoted string",
-        "6: Unexpected token `#'; expected word or quoted string",
-        "8: Unexpected token `<<NEWLINE>>'; expected `:'",
-        "9: Unexpected token `<<NEWLINE>>'; expected property name",
-        "10: Unexpected token `<<NEWLINE>>'; expected word or quoted string",
-        "11: Unexpected token `#'; expected word or quoted string",
-        "13: Unexpected token `<<NEWLINE>>'; expected `:'",
-        "14: Unexpected token `<<NEWLINE>>'; expected word or quoted string",
-        "15: Unexpected token `#'; expected word or quoted string",
-        "17: Unexpected token `<<NEWLINE>>'; expected `:'",
-        "18: Unexpected token `<<NEWLINE>>'; expected word or quoted string",
-        "19: Unexpected token `#'; expected word or quoted string",
-        NULL
-    };
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_53);
-ATF_TEST_CASE_BODY(atffile_53)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "prop: foo = \"Correct value\" # With comment.\n"
-        "\n"
-        "prop: bar = # A comment.\n"
-        "\n"
-        "prop: baz = \"Last variable\"\n"
-        "\n"
-        "# End of file.\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_prop(foo, Correct value)",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "5: Unexpected token `#'; expected word or quoted string",
-        NULL
-    };
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(atffile_54);
-ATF_TEST_CASE_BODY(atffile_54)
-{
-    const char* input =
-        "Content-Type: application/X-atf-atffile; version=\"1\"\n"
-        "\n"
-        "prop: foo = \"\n"
-        "prop: bar = \"text\n"
-        "prop: baz = \"te\\\"xt\n"
-        "prop: last = \"\\\"\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Missing double quotes before end of line",
-        "4: Missing double quotes before end of line",
-        "5: Missing double quotes before end of line",
-        "6: Missing double quotes before end of line",
-        NULL
-    };
-
-    do_parser_test< atffile_reader >(input, exp_calls, exp_errors);
-}
-
-// ------------------------------------------------------------------------
-// Tests cases for the "atffile" class.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(atffile_getters);
-ATF_TEST_CASE_HEAD(atffile_getters) {}
-ATF_TEST_CASE_BODY(atffile_getters) {
-    atf::tests::vars_map config_vars;
-    config_vars["config-var-1"] = "value 1";
-
-    std::vector< std::string > test_program_names;
-    test_program_names.push_back("test-program-1");
-
-    atf::tests::vars_map properties;
-    properties["test-suite"] = "a test name";
-
-    const atf::atf_run::atffile atffile(config_vars, test_program_names,
-                                        properties);
-    ATF_REQUIRE(config_vars == atffile.conf());
-    ATF_REQUIRE(test_program_names == atffile.tps());
-    ATF_REQUIRE(properties == atffile.props());
-}
-
-// ------------------------------------------------------------------------
-// Tests cases for the free functions.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE_WITHOUT_HEAD(read_ok_simple);
-ATF_TEST_CASE_BODY(read_ok_simple) {
-    std::auto_ptr< std::ofstream > os = new_atffile();
-    (*os) << "prop: test-suite = foo\n";
-    (*os) << "tp: tp-1\n";
-    (*os) << "conf: var1 = value1\n";
-    (*os) << "tp: tp-2\n";
-    (*os) << "tp: tp-3\n";
-    (*os) << "prop: prop1 = propvalue1\n";
-    (*os) << "conf: var2 = value2\n";
-    (*os).close();
-
-    touch_exec("tp-1");
-    touch_exec("tp-2");
-    touch_exec("tp-3");
-
-    const atf::atf_run::atffile atffile = atf::atf_run::read_atffile(
-        atf::fs::path("Atffile"));
-    ATF_REQUIRE_EQ(2, atffile.conf().size());
-    ATF_REQUIRE_EQ("value1", atffile.conf().find("var1")->second);
-    ATF_REQUIRE_EQ("value2", atffile.conf().find("var2")->second);
-    ATF_REQUIRE_EQ(3, atffile.tps().size());
-    ATF_REQUIRE(is_in("tp-1", atffile.tps()));
-    ATF_REQUIRE(is_in("tp-2", atffile.tps()));
-    ATF_REQUIRE(is_in("tp-3", atffile.tps()));
-    ATF_REQUIRE_EQ(2, atffile.props().size());
-    ATF_REQUIRE_EQ("foo", atffile.props().find("test-suite")->second);
-    ATF_REQUIRE_EQ("propvalue1", atffile.props().find("prop1")->second);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(read_ok_some_globs);
-ATF_TEST_CASE_BODY(read_ok_some_globs) {
-    std::auto_ptr< std::ofstream > os = new_atffile();
-    (*os) << "prop: test-suite = foo\n";
-    (*os) << "tp: foo\n";
-    (*os) << "tp-glob: *K*\n";
-    (*os) << "tp: bar\n";
-    (*os) << "tp-glob: t_*\n";
-    (*os).close();
-
-    touch_exec("foo");
-    touch_exec("bar");
-    touch_exec("aK");
-    touch_exec("KKKKK");
-    touch_exec("t_hello");
-    touch_exec("zzzt_hello");
-
-    const atf::atf_run::atffile atffile = atf::atf_run::read_atffile(
-        atf::fs::path("Atffile"));
-    ATF_REQUIRE_EQ(5, atffile.tps().size());
-    ATF_REQUIRE(is_in("foo", atffile.tps()));
-    ATF_REQUIRE(is_in("bar", atffile.tps()));
-    ATF_REQUIRE(is_in("aK", atffile.tps()));
-    ATF_REQUIRE(is_in("KKKKK", atffile.tps()));
-    ATF_REQUIRE(is_in("t_hello", atffile.tps()));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(read_missing_test_suite);
-ATF_TEST_CASE_BODY(read_missing_test_suite) {
-    std::auto_ptr< std::ofstream > os = new_atffile();
-    (*os).close();
-
-    try {
-        (void)atf::atf_run::read_atffile(atf::fs::path("Atffile"));
-        ATF_FAIL("Missing property 'test-suite' did not raise an error");
-    } catch (const atf::not_found_error< std::string >& e) {
-        ATF_REQUIRE_EQ("test-suite", e.get_value());
-    }
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(read_missing_test_program);
-ATF_TEST_CASE_BODY(read_missing_test_program) {
-    std::auto_ptr< std::ofstream > os = new_atffile();
-    (*os) << "tp: foo\n";
-    (*os) << "tp: bar\n";
-    (*os) << "tp: baz\n";
-    (*os).close();
-
-    touch_exec("foo");
-    touch_exec("baz");
-
-    try {
-        (void)atf::atf_run::read_atffile(atf::fs::path("Atffile"));
-        ATF_FAIL("Missing file 'bar' did not raise an error");
-    } catch (const atf::not_found_error< atf::fs::path >& e) {
-        ATF_REQUIRE_EQ("bar", e.get_value().str());
-    }
-}
-
-// ------------------------------------------------------------------------
-// Main.
-// ------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    // Add the test cases for the parser class.
-    ATF_ADD_TEST_CASE(tcs, atffile_1);
-    ATF_ADD_TEST_CASE(tcs, atffile_2);
-    ATF_ADD_TEST_CASE(tcs, atffile_3);
-    ATF_ADD_TEST_CASE(tcs, atffile_4);
-    ATF_ADD_TEST_CASE(tcs, atffile_5);
-    ATF_ADD_TEST_CASE(tcs, atffile_6);
-    ATF_ADD_TEST_CASE(tcs, atffile_50);
-    ATF_ADD_TEST_CASE(tcs, atffile_51);
-    ATF_ADD_TEST_CASE(tcs, atffile_52);
-    ATF_ADD_TEST_CASE(tcs, atffile_53);
-    ATF_ADD_TEST_CASE(tcs, atffile_54);
-
-    // Add the test cases for the atffile class.
-    ATF_ADD_TEST_CASE(tcs, atffile_getters);
-
-    // Add the test cases for the free functions.
-    ATF_ADD_TEST_CASE(tcs, read_ok_simple);
-    ATF_ADD_TEST_CASE(tcs, read_ok_some_globs);
-    ATF_ADD_TEST_CASE(tcs, read_missing_test_suite);
-    ATF_ADD_TEST_CASE(tcs, read_missing_test_program);
-}
diff --git a/contrib/atf/atf-run/bad_metadata_helper.c b/contrib/atf/atf-run/bad_metadata_helper.c
deleted file mode 100644
index 0f7fcb926ac..00000000000
--- a/contrib/atf/atf-run/bad_metadata_helper.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Automated Testing Framework (atf)
- *
- * 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 <stdio.h>
-#include <stdlib.h>
-
-int
-main(void)
-{
-    printf("incorrectly formatted metadata\n");
-    return EXIT_SUCCESS;
-}
diff --git a/contrib/atf/atf-run/config.cpp b/contrib/atf/atf-run/config.cpp
deleted file mode 100644
index 0ea240fe20c..00000000000
--- a/contrib/atf/atf-run/config.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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 <fstream>
-#include <vector>
-
-#include "atf-c/defs.h"
-
-#include "atf-c++/config.hpp"
-
-#include "atf-c++/detail/env.hpp"
-#include "atf-c++/detail/fs.hpp"
-#include "atf-c++/detail/sanity.hpp"
-#include "atf-c++/detail/parser.hpp"
-
-#include "config.hpp"
-
-namespace impl = atf::atf_run;
-namespace detail = atf::atf_run::detail;
-
-namespace {
-
-namespace atf_config {
-
-static const atf::parser::token_type eof_type = 0;
-static const atf::parser::token_type nl_type = 1;
-static const atf::parser::token_type text_type = 2;
-static const atf::parser::token_type dblquote_type = 3;
-static const atf::parser::token_type equal_type = 4;
-static const atf::parser::token_type hash_type = 5;
-
-class tokenizer : public atf::parser::tokenizer< std::istream > {
-public:
-    tokenizer(std::istream& is, size_t curline) :
-        atf::parser::tokenizer< std::istream >
-            (is, true, eof_type, nl_type, text_type, curline)
-    {
-        add_delim('=', equal_type);
-        add_delim('#', hash_type);
-        add_quote('"', dblquote_type);
-    }
-};
-
-} // namespace atf_config
-
-class config_reader : public detail::atf_config_reader {
-    atf::tests::vars_map m_vars;
-
-    void
-    got_var(const std::string& var, const std::string& name)
-    {
-        m_vars[var] = name;
-    }
-
-public:
-    config_reader(std::istream& is) :
-        atf_config_reader(is)
-    {
-    }
-
-    const atf::tests::vars_map&
-    get_vars(void)
-        const
-    {
-        return m_vars;
-    }
-};
-
-template< class K, class V >
-static
-void
-merge_maps(std::map< K, V >& dest, const std::map< K, V >& src)
-{
-    for (typename std::map< K, V >::const_iterator iter = src.begin();
-         iter != src.end(); iter++)
-        dest[(*iter).first] = (*iter).second;
-}
-
-static
-void
-merge_config_file(const atf::fs::path& config_path,
-                  atf::tests::vars_map& config)
-{
-    std::ifstream is(config_path.c_str());
-    if (is) {
-        config_reader reader(is);
-        reader.read();
-        merge_maps(config, reader.get_vars());
-    }
-}
-
-static
-std::vector< atf::fs::path >
-get_config_dirs(void)
-{
-    std::vector< atf::fs::path > dirs;
-    dirs.push_back(atf::fs::path(atf::config::get("atf_confdir")));
-    if (atf::env::has("HOME"))
-        dirs.push_back(atf::fs::path(atf::env::get("HOME")) / ".atf");
-    return dirs;
-}
-
-} // anonymous namespace
-
-detail::atf_config_reader::atf_config_reader(std::istream& is) :
-    m_is(is)
-{
-}
-
-detail::atf_config_reader::~atf_config_reader(void)
-{
-}
-
-void
-detail::atf_config_reader::got_var(
-    const std::string& var ATF_DEFS_ATTRIBUTE_UNUSED,
-    const std::string& val ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-detail::atf_config_reader::got_eof(void)
-{
-}
-
-void
-detail::atf_config_reader::read(void)
-{
-    using atf::parser::parse_error;
-    using namespace atf_config;
-
-    std::pair< size_t, atf::parser::headers_map > hml =
-        atf::parser::read_headers(m_is, 1);
-    atf::parser::validate_content_type(hml.second,
-        "application/X-atf-config", 1);
-
-    tokenizer tkz(m_is, hml.first);
-    atf::parser::parser< tokenizer > p(tkz);
-
-    for (;;) {
-        try {
-            atf::parser::token t = p.expect(eof_type, hash_type, text_type,
-                                            nl_type,
-                                            "eof, #, new line or text");
-            if (t.type() == eof_type)
-                break;
-
-            if (t.type() == hash_type) {
-                (void)p.rest_of_line();
-                t = p.expect(nl_type, "new line");
-            } else if (t.type() == text_type) {
-                std::string name = t.text();
-
-                t = p.expect(equal_type, "equal sign");
-
-                t = p.expect(text_type, "word or quoted string");
-                ATF_PARSER_CALLBACK(p, got_var(name, t.text()));
-
-                t = p.expect(nl_type, hash_type, "new line or comment");
-                if (t.type() == hash_type) {
-                    (void)p.rest_of_line();
-                    t = p.expect(nl_type, "new line");
-                }
-            } else if (t.type() == nl_type) {
-            } else
-                UNREACHABLE;
-        } catch (const parse_error& pe) {
-            p.add_error(pe);
-            p.reset(nl_type);
-        }
-    }
-
-    ATF_PARSER_CALLBACK(p, got_eof());
-}
-
-atf::tests::vars_map
-impl::merge_configs(const atf::tests::vars_map& lower,
-                    const atf::tests::vars_map& upper)
-{
-    atf::tests::vars_map merged = lower;
-    merge_maps(merged, upper);
-    return merged;
-}
-
-atf::tests::vars_map
-impl::read_config_files(const std::string& test_suite_name)
-{
-    atf::tests::vars_map config;
-
-    const std::vector< atf::fs::path > dirs = get_config_dirs();
-    for (std::vector< atf::fs::path >::const_iterator iter = dirs.begin();
-         iter != dirs.end(); iter++) {
-        merge_config_file((*iter) / "common.conf", config);
-        merge_config_file((*iter) / (test_suite_name + ".conf"), config);
-    }
-
-    return config;
-}
diff --git a/contrib/atf/atf-run/config.hpp b/contrib/atf/atf-run/config.hpp
deleted file mode 100644
index 2cefec9a5fe..00000000000
--- a/contrib/atf/atf-run/config.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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 <string>
-#include <vector>
-
-#include "atf-c++/tests.hpp"
-
-namespace atf {
-namespace atf_run {
-
-namespace detail {
-
-class atf_config_reader {
-    std::istream& m_is;
-
-protected:
-    virtual void got_var(const std::string&, const std::string &);
-    virtual void got_eof(void);
-
-public:
-    atf_config_reader(std::istream&);
-    virtual ~atf_config_reader(void);
-
-    void read(void);
-};
-
-} // namespace detail
-
-atf::tests::vars_map merge_configs(const atf::tests::vars_map&,
-                                   const atf::tests::vars_map&);
-atf::tests::vars_map read_config_files(const std::string&);
-
-} // namespace atf_run
-} // namespace atf
diff --git a/contrib/atf/atf-run/config_test.cpp b/contrib/atf/atf-run/config_test.cpp
deleted file mode 100644
index 5b103a78acb..00000000000
--- a/contrib/atf/atf-run/config_test.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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++/detail/env.hpp"
-#include "atf-c++/detail/test_helpers.hpp"
-#include "atf-c++/config.hpp"
-#include "atf-c++/macros.hpp"
-
-#include "config.hpp"
-
-namespace impl = atf::atf_run;
-namespace detail = atf::atf_run::detail;
-
-using atf::tests::vars_map;
-
-namespace atf {
-namespace config {
-
-void __reinit(void);
-
-}  // namespace config
-}  // namespace atf
-
-// -------------------------------------------------------------------------
-// Tests for the "config" parser.
-// -------------------------------------------------------------------------
-
-class config_reader : protected detail::atf_config_reader {
-    void
-    got_var(const std::string& name, const std::string& val)
-    {
-        m_calls.push_back("got_var(" + name + ", " + val + ")");
-    }
-
-    void
-    got_eof(void)
-    {
-        m_calls.push_back("got_eof()");
-    }
-
-public:
-    config_reader(std::istream& is) :
-        detail::atf_config_reader(is)
-    {
-    }
-
-    void
-    read(void)
-    {
-        atf_config_reader::read();
-    }
-
-    std::vector< std::string > m_calls;
-};
-
-ATF_TEST_CASE_WITHOUT_HEAD(config_1);
-ATF_TEST_CASE_BODY(config_1)
-{
-    const char* input =
-        "Content-Type: application/X-atf-config; version=\"1\"\n"
-        "\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< config_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(config_2);
-ATF_TEST_CASE_BODY(config_2)
-{
-    const char* input =
-        "Content-Type: application/X-atf-config; version=\"1\"\n"
-        "\n"
-        "# This is a comment on a line of its own.\n"
-        "# And this is another one.\n"
-        "\n"
-        "	    # Another after some whitespace.\n"
-        "\n"
-        "# The last one after an empty line.\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< config_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(config_3);
-ATF_TEST_CASE_BODY(config_3)
-{
-    const char* input =
-        "Content-Type: application/X-atf-config; version=\"1\"\n"
-        "\n"
-        "var1=value1\n"
-        "var2 = value2\n"
-        "var3	=	value3\n"
-        "var4	    =	    value4\n"
-        "\n"
-        "var5=value5\n"
-        "    var6=value6\n"
-        "\n"
-        "var7 = \"This is a long value.\"\n"
-        "var8 = \"Single-word\"\n"
-        "var9 = \"    Single-word	\"\n"
-        "var10 = Single-word\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_var(var1, value1)",
-        "got_var(var2, value2)",
-        "got_var(var3, value3)",
-        "got_var(var4, value4)",
-        "got_var(var5, value5)",
-        "got_var(var6, value6)",
-        "got_var(var7, This is a long value.)",
-        "got_var(var8, Single-word)",
-        "got_var(var9,     Single-word	)",
-        "got_var(var10, Single-word)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< config_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(config_4);
-ATF_TEST_CASE_BODY(config_4)
-{
-    const char* input =
-        "Content-Type: application/X-atf-config; version=\"1\"\n"
-        "\n"
-        "foo = bar # A comment.\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_var(foo, bar)",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< config_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(config_50);
-ATF_TEST_CASE_BODY(config_50)
-{
-    const char* input =
-        "Content-Type: application/X-atf-config; version=\"1\"\n"
-        "\n"
-        "foo\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected equal sign",
-        NULL
-    };
-
-    do_parser_test< config_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(config_51);
-ATF_TEST_CASE_BODY(config_51)
-{
-    const char* input =
-        "Content-Type: application/X-atf-config; version=\"1\"\n"
-        "\n"
-        "foo bar\n"
-        "baz\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `bar'; expected equal sign",
-        "4: Unexpected token `<<NEWLINE>>'; expected equal sign",
-        NULL
-    };
-
-    do_parser_test< config_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(config_52);
-ATF_TEST_CASE_BODY(config_52)
-{
-    const char* input =
-        "Content-Type: application/X-atf-config; version=\"1\"\n"
-        "\n"
-        "foo =\n"
-        "bar = # A comment.\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected word or quoted string",
-        "4: Unexpected token `#'; expected word or quoted string",
-        NULL
-    };
-
-    do_parser_test< config_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(config_53);
-ATF_TEST_CASE_BODY(config_53)
-{
-    const char* input =
-        "Content-Type: application/X-atf-config; version=\"1\"\n"
-        "\n"
-        "foo = \"Correct value\" # With comment.\n"
-        "\n"
-        "bar = # A comment.\n"
-        "\n"
-        "baz = \"Last variable\"\n"
-        "\n"
-        "# End of file.\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_var(foo, Correct value)",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "5: Unexpected token `#'; expected word or quoted string",
-        NULL
-    };
-
-    do_parser_test< config_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(config_54);
-ATF_TEST_CASE_BODY(config_54)
-{
-    const char* input =
-        "Content-Type: application/X-atf-config; version=\"1\"\n"
-        "\n"
-        "foo = \"\n"
-        "bar = \"text\n"
-        "baz = \"te\\\"xt\n"
-        "last = \"\\\"\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Missing double quotes before end of line",
-        "4: Missing double quotes before end of line",
-        "5: Missing double quotes before end of line",
-        "6: Missing double quotes before end of line",
-        NULL
-    };
-
-    do_parser_test< config_reader >(input, exp_calls, exp_errors);
-}
-
-// -------------------------------------------------------------------------
-// Tests for the free functions.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE(merge_configs_both_empty);
-ATF_TEST_CASE_HEAD(merge_configs_both_empty) {}
-ATF_TEST_CASE_BODY(merge_configs_both_empty) {
-    vars_map lower, upper;
-
-    ATF_REQUIRE(impl::merge_configs(lower, upper).empty());
-}
-
-ATF_TEST_CASE(merge_configs_lower_empty);
-ATF_TEST_CASE_HEAD(merge_configs_lower_empty) {}
-ATF_TEST_CASE_BODY(merge_configs_lower_empty) {
-    vars_map lower, upper;
-    upper["var"] = "value";
-
-    vars_map merged = impl::merge_configs(lower, upper);
-    ATF_REQUIRE_EQ("value", merged["var"]);
-}
-
-ATF_TEST_CASE(merge_configs_upper_empty);
-ATF_TEST_CASE_HEAD(merge_configs_upper_empty) {}
-ATF_TEST_CASE_BODY(merge_configs_upper_empty) {
-    vars_map lower, upper;
-    lower["var"] = "value";
-
-    vars_map merged = impl::merge_configs(lower, upper);
-    ATF_REQUIRE_EQ("value", merged["var"]);
-}
-
-ATF_TEST_CASE(merge_configs_mixed);
-ATF_TEST_CASE_HEAD(merge_configs_mixed) {}
-ATF_TEST_CASE_BODY(merge_configs_mixed) {
-    vars_map lower, upper;
-    lower["var1"] = "value1";
-    lower["var2"] = "value2-l";
-    upper["var2"] = "value2-u";
-    upper["var3"] = "value3";
-
-    vars_map merged = impl::merge_configs(lower, upper);
-    ATF_REQUIRE_EQ("value1", merged["var1"]);
-    ATF_REQUIRE_EQ("value2-u", merged["var2"]);
-    ATF_REQUIRE_EQ("value3", merged["var3"]);
-}
-
-ATF_TEST_CASE(read_config_files_none);
-ATF_TEST_CASE_HEAD(read_config_files_none) {}
-ATF_TEST_CASE_BODY(read_config_files_none) {
-    atf::env::set("ATF_CONFDIR", ".");
-    atf::config::__reinit();
-    ATF_REQUIRE(vars_map() == impl::read_config_files("test-suite"));
-}
-
-// -------------------------------------------------------------------------
-// Main.
-// -------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    ATF_ADD_TEST_CASE(tcs, config_1);
-    ATF_ADD_TEST_CASE(tcs, config_2);
-    ATF_ADD_TEST_CASE(tcs, config_3);
-    ATF_ADD_TEST_CASE(tcs, config_4);
-    ATF_ADD_TEST_CASE(tcs, config_50);
-    ATF_ADD_TEST_CASE(tcs, config_51);
-    ATF_ADD_TEST_CASE(tcs, config_52);
-    ATF_ADD_TEST_CASE(tcs, config_53);
-    ATF_ADD_TEST_CASE(tcs, config_54);
-
-    ATF_ADD_TEST_CASE(tcs, merge_configs_both_empty);
-    ATF_ADD_TEST_CASE(tcs, merge_configs_lower_empty);
-    ATF_ADD_TEST_CASE(tcs, merge_configs_upper_empty);
-    ATF_ADD_TEST_CASE(tcs, merge_configs_mixed);
-
-    ATF_ADD_TEST_CASE(tcs, read_config_files_none);
-}
diff --git a/contrib/atf/atf-run/expect_helpers.c b/contrib/atf/atf-run/expect_helpers.c
deleted file mode 100644
index b38ccf574bc..00000000000
--- a/contrib/atf/atf-run/expect_helpers.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Automated Testing Framework (atf)
- *
- * 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 <signal.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <atf-c.h>
-
-ATF_TC_WITHOUT_HEAD(pass_and_pass);
-ATF_TC_BODY(pass_and_pass, tc)
-{
-    atf_tc_expect_pass();
-}
-
-ATF_TC_WITHOUT_HEAD(pass_but_fail_requirement);
-ATF_TC_BODY(pass_but_fail_requirement, tc)
-{
-    atf_tc_expect_pass();
-    atf_tc_fail("Some reason");
-}
-
-ATF_TC_WITHOUT_HEAD(pass_but_fail_check);
-ATF_TC_BODY(pass_but_fail_check, tc)
-{
-    atf_tc_expect_pass();
-    atf_tc_fail_nonfatal("Some reason");
-}
-
-ATF_TC_WITHOUT_HEAD(fail_and_fail_requirement);
-ATF_TC_BODY(fail_and_fail_requirement, tc)
-{
-    atf_tc_expect_fail("Fail %s", "reason");
-    atf_tc_fail("The failure");
-    atf_tc_expect_pass();
-}
-
-ATF_TC_WITHOUT_HEAD(fail_and_fail_check);
-ATF_TC_BODY(fail_and_fail_check, tc)
-{
-    atf_tc_expect_fail("Fail first");
-    atf_tc_fail_nonfatal("abc");
-    atf_tc_expect_pass();
-
-    atf_tc_expect_fail("And fail again");
-    atf_tc_fail_nonfatal("def");
-    atf_tc_expect_pass();
-}
-
-ATF_TC_WITHOUT_HEAD(fail_but_pass);
-ATF_TC_BODY(fail_but_pass, tc)
-{
-    atf_tc_expect_fail("Fail first");
-    atf_tc_fail_nonfatal("abc");
-    atf_tc_expect_pass();
-
-    atf_tc_expect_fail("Will not fail");
-    atf_tc_expect_pass();
-
-    atf_tc_expect_fail("And fail again");
-    atf_tc_fail_nonfatal("def");
-    atf_tc_expect_pass();
-}
-
-ATF_TC_WITHOUT_HEAD(exit_any_and_exit);
-ATF_TC_BODY(exit_any_and_exit, tc)
-{
-    atf_tc_expect_exit(-1, "Call will exit");
-    exit(EXIT_SUCCESS);
-}
-
-ATF_TC_WITHOUT_HEAD(exit_code_and_exit);
-ATF_TC_BODY(exit_code_and_exit, tc)
-{
-    atf_tc_expect_exit(123, "Call will exit");
-    exit(123);
-}
-
-ATF_TC_WITHOUT_HEAD(exit_but_pass);
-ATF_TC_BODY(exit_but_pass, tc)
-{
-    atf_tc_expect_exit(-1, "Call won't exit");
-}
-
-ATF_TC_WITHOUT_HEAD(signal_any_and_signal);
-ATF_TC_BODY(signal_any_and_signal, tc)
-{
-    atf_tc_expect_signal(-1, "Call will signal");
-    kill(getpid(), SIGKILL);
-}
-
-ATF_TC_WITHOUT_HEAD(signal_no_and_signal);
-ATF_TC_BODY(signal_no_and_signal, tc)
-{
-    atf_tc_expect_signal(SIGHUP, "Call will signal");
-    kill(getpid(), SIGHUP);
-}
-
-ATF_TC_WITHOUT_HEAD(signal_but_pass);
-ATF_TC_BODY(signal_but_pass, tc)
-{
-    atf_tc_expect_signal(-1, "Call won't signal");
-}
-
-ATF_TC_WITHOUT_HEAD(death_and_exit);
-ATF_TC_BODY(death_and_exit, tc)
-{
-    atf_tc_expect_death("Exit case");
-    exit(123);
-}
-
-ATF_TC_WITHOUT_HEAD(death_and_signal);
-ATF_TC_BODY(death_and_signal, tc)
-{
-    atf_tc_expect_death("Signal case");
-    kill(getpid(), SIGKILL);
-}
-
-ATF_TC_WITHOUT_HEAD(death_but_pass);
-ATF_TC_BODY(death_but_pass, tc)
-{
-    atf_tc_expect_death("Call won't die");
-}
-
-ATF_TC(timeout_and_hang);
-ATF_TC_HEAD(timeout_and_hang, tc)
-{
-    atf_tc_set_md_var(tc, "timeout", "1");
-}
-ATF_TC_BODY(timeout_and_hang, tc)
-{
-    atf_tc_expect_timeout("Will overrun");
-    sleep(5);
-}
-
-ATF_TC(timeout_but_pass);
-ATF_TC_HEAD(timeout_but_pass, tc)
-{
-    atf_tc_set_md_var(tc, "timeout", "1");
-}
-ATF_TC_BODY(timeout_but_pass, tc)
-{
-    atf_tc_expect_timeout("Will just exit");
-}
-
-ATF_TP_ADD_TCS(tp)
-{
-    ATF_TP_ADD_TC(tp, pass_and_pass);
-    ATF_TP_ADD_TC(tp, pass_but_fail_requirement);
-    ATF_TP_ADD_TC(tp, pass_but_fail_check);
-    ATF_TP_ADD_TC(tp, fail_and_fail_requirement);
-    ATF_TP_ADD_TC(tp, fail_and_fail_check);
-    ATF_TP_ADD_TC(tp, fail_but_pass);
-    ATF_TP_ADD_TC(tp, exit_any_and_exit);
-    ATF_TP_ADD_TC(tp, exit_code_and_exit);
-    ATF_TP_ADD_TC(tp, exit_but_pass);
-    ATF_TP_ADD_TC(tp, signal_any_and_signal);
-    ATF_TP_ADD_TC(tp, signal_no_and_signal);
-    ATF_TP_ADD_TC(tp, signal_but_pass);
-    ATF_TP_ADD_TC(tp, death_and_exit);
-    ATF_TP_ADD_TC(tp, death_and_signal);
-    ATF_TP_ADD_TC(tp, death_but_pass);
-    ATF_TP_ADD_TC(tp, timeout_and_hang);
-    ATF_TP_ADD_TC(tp, timeout_but_pass);
-
-    return atf_no_error();
-}
diff --git a/contrib/atf/atf-run/fs.cpp b/contrib/atf/atf-run/fs.cpp
deleted file mode 100644
index b8931e58873..00000000000
--- a/contrib/atf/atf-run/fs.cpp
+++ /dev/null
@@ -1,264 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if defined(HAVE_CONFIG_H)
-#include "bconfig.h"
-#endif
-
-extern "C" {
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-
-#include <unistd.h>
-}
-
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
-
-#include "atf-c++/detail/process.hpp"
-#include "atf-c++/detail/sanity.hpp"
-
-#include "fs.hpp"
-#include "user.hpp"
-
-namespace impl = atf::atf_run;
-#define IMPL_NAME "atf::atf_run"
-
-// ------------------------------------------------------------------------
-// Auxiliary functions.
-// ------------------------------------------------------------------------
-
-static void cleanup_aux(const atf::fs::path&, dev_t, bool);
-static void cleanup_aux_dir(const atf::fs::path&, const atf::fs::file_info&,
-                            bool);
-static void do_unmount(const atf::fs::path&);
-
-// The cleanup routines below are tricky: they are executed immediately after
-// a test case's death, and after we have forcibly killed any stale processes.
-// However, even if the processes are dead, this does not mean that the file
-// system we are scanning is stable.  In particular, if the test case has
-// mounted file systems through fuse/puffs, the fact that the processes died
-// does not mean that the file system is truly unmounted.
-//
-// The code below attempts to cope with this by catching errors and either
-// ignoring them or retrying the actions on the same file/directory a few times
-// before giving up.
-static const int max_retries = 5;
-static const int retry_delay_in_seconds = 1;
-
-// The erase parameter in this routine is to control nested mount points.
-// We want to descend into a mount point to unmount anything that is
-// mounted under it, but we do not want to delete any files while doing
-// this traversal.  In other words, we erase files until we cross the
-// first mount point, and after that point we only scan and unmount.
-static
-void
-cleanup_aux(const atf::fs::path& p, dev_t parent_device, bool erase)
-{
-    try {
-        atf::fs::file_info fi(p);
-
-        if (fi.get_type() == atf::fs::file_info::dir_type)
-            cleanup_aux_dir(p, fi, fi.get_device() == parent_device);
-
-        if (fi.get_device() != parent_device)
-            do_unmount(p);
-
-        if (erase) {
-            if (fi.get_type() == atf::fs::file_info::dir_type)
-                atf::fs::rmdir(p);
-            else
-                atf::fs::remove(p);
-        }
-    } catch (const atf::system_error& e) {
-        if (e.code() != ENOENT && e.code() != ENOTDIR)
-            throw e;
-    }
-}
-
-static
-void
-cleanup_aux_dir(const atf::fs::path& p, const atf::fs::file_info& fi,
-                bool erase)
-{
-    if (erase && ((fi.get_mode() & S_IRWXU) != S_IRWXU)) {
-        int retries = max_retries;
-retry_chmod:
-        if (chmod(p.c_str(), fi.get_mode() | S_IRWXU) == -1) {
-            if (retries > 0) {
-                retries--;
-                ::sleep(retry_delay_in_seconds);
-                goto retry_chmod;
-            } else {
-                throw atf::system_error(IMPL_NAME "::cleanup(" +
-                                        p.str() + ")", "chmod(2) failed",
-                                        errno);
-            }
-        }
-    }
-
-    std::set< std::string > subdirs;
-    {
-        bool ok = false;
-        int retries = max_retries;
-        while (!ok) {
-            INV(retries > 0);
-            try {
-                const atf::fs::directory d(p);
-                subdirs = d.names();
-                ok = true;
-            } catch (const atf::system_error& e) {
-                retries--;
-                if (retries == 0)
-                    throw e;
-                ::sleep(retry_delay_in_seconds);
-            }
-        }
-        INV(ok);
-    }
-
-    for (std::set< std::string >::const_iterator iter = subdirs.begin();
-         iter != subdirs.end(); iter++) {
-        const std::string& name = *iter;
-        if (name != "." && name != "..")
-            cleanup_aux(p / name, fi.get_device(), erase);
-    }
-}
-
-static
-void
-do_unmount(const atf::fs::path& in_path)
-{
-    // At least, FreeBSD's unmount(2) requires the path to be absolute.
-    // Let's make it absolute in all cases just to be safe that this does
-    // not affect other systems.
-    const atf::fs::path& abs_path = in_path.is_absolute() ?
-        in_path : in_path.to_absolute();
-
-#if defined(HAVE_UNMOUNT)
-    int retries = max_retries;
-retry_unmount:
-    if (unmount(abs_path.c_str(), 0) == -1) {
-        if (errno == EBUSY && retries > 0) {
-            retries--;
-            ::sleep(retry_delay_in_seconds);
-            goto retry_unmount;
-        } else {
-            throw atf::system_error(IMPL_NAME "::cleanup(" + in_path.str() +
-                                    ")", "unmount(2) failed", errno);
-        }
-    }
-#else
-    // We could use umount(2) instead if it was available... but
-    // trying to do so under, e.g. Linux, is a nightmare because we
-    // also have to update /etc/mtab to match what we did.  It is
-    // satf::fser to just leave the system-specific umount(8) tool deal
-    // with it, at least for now.
-
-    const atf::fs::path prog("umount");
-    atf::process::argv_array argv("umount", abs_path.c_str(), NULL);
-
-    atf::process::status s = atf::process::exec(prog, argv,
-        atf::process::stream_inherit(), atf::process::stream_inherit());
-    if (!s.exited() || s.exitstatus() != EXIT_SUCCESS)
-        throw std::runtime_error("Call to unmount failed");
-#endif
-}
-
-// ------------------------------------------------------------------------
-// The "temp_dir" class.
-// ------------------------------------------------------------------------
-
-impl::temp_dir::temp_dir(const atf::fs::path& p)
-{
-    atf::utils::auto_array< char > buf(new char[p.str().length() + 1]);
-    std::strcpy(buf.get(), p.c_str());
-    if (::mkdtemp(buf.get()) == NULL)
-        throw system_error(IMPL_NAME "::temp_dir::temp_dir(" +
-                           p.str() + ")", "mkdtemp(3) failed",
-                           errno);
-
-    m_path.reset(new atf::fs::path(buf.get()));
-}
-
-impl::temp_dir::~temp_dir(void)
-{
-    cleanup(*m_path);
-}
-
-const atf::fs::path&
-impl::temp_dir::get_path(void)
-    const
-{
-    return *m_path;
-}
-
-// ------------------------------------------------------------------------
-// Free functions.
-// ------------------------------------------------------------------------
-
-atf::fs::path
-impl::change_directory(const atf::fs::path& dir)
-{
-    atf::fs::path olddir = get_current_dir();
-
-    if (olddir != dir) {
-        if (::chdir(dir.c_str()) == -1)
-            throw system_error(IMPL_NAME "::chdir(" + dir.str() + ")",
-                               "chdir(2) failed", errno);
-    }
-
-    return olddir;
-}
-
-void
-impl::cleanup(const atf::fs::path& p)
-{
-    atf::fs::file_info fi(p);
-    cleanup_aux(p, fi.get_device(), true);
-}
-
-atf::fs::path
-impl::get_current_dir(void)
-{
-    std::auto_ptr< char > cwd;
-#if defined(HAVE_GETCWD_DYN)
-    cwd.reset(getcwd(NULL, 0));
-#else
-    cwd.reset(getcwd(NULL, MAXPATHLEN));
-#endif
-    if (cwd.get() == NULL)
-        throw atf::system_error(IMPL_NAME "::get_current_dir()",
-                                "getcwd() failed", errno);
-
-    return atf::fs::path(cwd.get());
-}
diff --git a/contrib/atf/atf-run/fs_test.cpp b/contrib/atf/atf-run/fs_test.cpp
deleted file mode 100644
index f03045eb613..00000000000
--- a/contrib/atf/atf-run/fs_test.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/types.h>
-#include <sys/stat.h>
-}
-
-#include <cerrno>
-#include <fstream>
-
-#include "atf-c++/macros.hpp"
-
-#include "atf-c++/detail/exceptions.hpp"
-#include "atf-c++/detail/fs.hpp"
-
-#include "fs.hpp"
-#include "user.hpp"
-
-// ------------------------------------------------------------------------
-// Auxiliary functions.
-// ------------------------------------------------------------------------
-
-static
-void
-create_file(const char *name)
-{
-    std::ofstream os(name);
-    os.close();
-}
-
-// ------------------------------------------------------------------------
-// Test cases for the "temp_dir" class.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(temp_dir_raii);
-ATF_TEST_CASE_HEAD(temp_dir_raii)
-{
-    set_md_var("descr", "Tests the RAII behavior of the temp_dir class");
-}
-ATF_TEST_CASE_BODY(temp_dir_raii)
-{
-    using atf::atf_run::temp_dir;
-
-    atf::fs::path t1("non-existent");
-    atf::fs::path t2("non-existent");
-
-    {
-        atf::fs::path tmpl("testdir.XXXXXX");
-        temp_dir td1(tmpl);
-        temp_dir td2(tmpl);
-        t1 = td1.get_path();
-        t2 = td2.get_path();
-        ATF_REQUIRE(t1.str().find("XXXXXX") == std::string::npos);
-        ATF_REQUIRE(t2.str().find("XXXXXX") == std::string::npos);
-        ATF_REQUIRE(t1 != t2);
-        ATF_REQUIRE(!atf::fs::exists(tmpl));
-        ATF_REQUIRE( atf::fs::exists(t1));
-        ATF_REQUIRE( atf::fs::exists(t2));
-
-        atf::fs::file_info fi1(t1);
-        ATF_REQUIRE( fi1.is_owner_readable());
-        ATF_REQUIRE( fi1.is_owner_writable());
-        ATF_REQUIRE( fi1.is_owner_executable());
-        ATF_REQUIRE(!fi1.is_group_readable());
-        ATF_REQUIRE(!fi1.is_group_writable());
-        ATF_REQUIRE(!fi1.is_group_executable());
-        ATF_REQUIRE(!fi1.is_other_readable());
-        ATF_REQUIRE(!fi1.is_other_writable());
-        ATF_REQUIRE(!fi1.is_other_executable());
-
-        atf::fs::file_info fi2(t2);
-        ATF_REQUIRE( fi2.is_owner_readable());
-        ATF_REQUIRE( fi2.is_owner_writable());
-        ATF_REQUIRE( fi2.is_owner_executable());
-        ATF_REQUIRE(!fi2.is_group_readable());
-        ATF_REQUIRE(!fi2.is_group_writable());
-        ATF_REQUIRE(!fi2.is_group_executable());
-        ATF_REQUIRE(!fi2.is_other_readable());
-        ATF_REQUIRE(!fi2.is_other_writable());
-        ATF_REQUIRE(!fi2.is_other_executable());
-    }
-
-    ATF_REQUIRE(t1.str() != "non-existent");
-    ATF_REQUIRE(!atf::fs::exists(t1));
-    ATF_REQUIRE(t2.str() != "non-existent");
-    ATF_REQUIRE(!atf::fs::exists(t2));
-}
-
-
-// ------------------------------------------------------------------------
-// Test cases for the free functions.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(cleanup);
-ATF_TEST_CASE_HEAD(cleanup)
-{
-    set_md_var("descr", "Tests the cleanup function");
-}
-ATF_TEST_CASE_BODY(cleanup)
-{
-    using atf::atf_run::cleanup;
-
-    ::mkdir("root", 0755);
-    ::mkdir("root/dir", 0755);
-    ::mkdir("root/dir/1", 0100);
-    ::mkdir("root/dir/2", 0644);
-    create_file("root/reg");
-
-    atf::fs::path p("root");
-    ATF_REQUIRE(atf::fs::exists(p));
-    ATF_REQUIRE(atf::fs::exists(p / "dir"));
-    ATF_REQUIRE(atf::fs::exists(p / "dir/1"));
-    ATF_REQUIRE(atf::fs::exists(p / "dir/2"));
-    ATF_REQUIRE(atf::fs::exists(p / "reg"));
-    cleanup(p);
-    ATF_REQUIRE(!atf::fs::exists(p));
-}
-
-ATF_TEST_CASE(cleanup_eacces_on_root);
-ATF_TEST_CASE_HEAD(cleanup_eacces_on_root)
-{
-    set_md_var("descr", "Tests the cleanup function");
-}
-ATF_TEST_CASE_BODY(cleanup_eacces_on_root)
-{
-    using atf::atf_run::cleanup;
-
-    ::mkdir("aux", 0755);
-    ::mkdir("aux/root", 0755);
-    ATF_REQUIRE(::chmod("aux", 0555) != -1);
-
-    try {
-        cleanup(atf::fs::path("aux/root"));
-        ATF_REQUIRE(atf::atf_run::is_root());
-    } catch (const atf::system_error& e) {
-        ATF_REQUIRE(!atf::atf_run::is_root());
-        ATF_REQUIRE_EQ(EACCES, e.code());
-    }
-}
-
-ATF_TEST_CASE(cleanup_eacces_on_subdir);
-ATF_TEST_CASE_HEAD(cleanup_eacces_on_subdir)
-{
-    set_md_var("descr", "Tests the cleanup function");
-}
-ATF_TEST_CASE_BODY(cleanup_eacces_on_subdir)
-{
-    using atf::atf_run::cleanup;
-
-    ::mkdir("root", 0755);
-    ::mkdir("root/1", 0755);
-    ::mkdir("root/1/2", 0755);
-    ::mkdir("root/1/2/3", 0755);
-    ATF_REQUIRE(::chmod("root/1/2", 0555) != -1);
-    ATF_REQUIRE(::chmod("root/1", 0555) != -1);
-
-    const atf::fs::path p("root");
-    cleanup(p);
-    ATF_REQUIRE(!atf::fs::exists(p));
-}
-
-ATF_TEST_CASE(change_directory);
-ATF_TEST_CASE_HEAD(change_directory)
-{
-    set_md_var("descr", "Tests the change_directory function");
-}
-ATF_TEST_CASE_BODY(change_directory)
-{
-    using atf::atf_run::change_directory;
-    using atf::atf_run::get_current_dir;
-
-    ::mkdir("files", 0755);
-    ::mkdir("files/dir", 0755);
-    create_file("files/reg");
-
-    const atf::fs::path old = get_current_dir();
-
-    ATF_REQUIRE_THROW(atf::system_error,
-                    change_directory(atf::fs::path("files/reg")));
-    ATF_REQUIRE(get_current_dir() == old);
-
-    atf::fs::path old2 = change_directory(atf::fs::path("files"));
-    ATF_REQUIRE(old2 == old);
-    atf::fs::path old3 = change_directory(atf::fs::path("dir"));
-    ATF_REQUIRE(old3 == old2 / "files");
-    atf::fs::path old4 = change_directory(atf::fs::path("../.."));
-    ATF_REQUIRE(old4 == old3 / "dir");
-    ATF_REQUIRE(get_current_dir() == old);
-}
-
-ATF_TEST_CASE(get_current_dir);
-ATF_TEST_CASE_HEAD(get_current_dir)
-{
-    set_md_var("descr", "Tests the get_current_dir function");
-}
-ATF_TEST_CASE_BODY(get_current_dir)
-{
-    using atf::atf_run::change_directory;
-    using atf::atf_run::get_current_dir;
-
-    ::mkdir("files", 0755);
-    ::mkdir("files/dir", 0755);
-    create_file("files/reg");
-
-    atf::fs::path curdir = get_current_dir();
-    change_directory(atf::fs::path("."));
-    ATF_REQUIRE(get_current_dir() == curdir);
-    change_directory(atf::fs::path("files"));
-    ATF_REQUIRE(get_current_dir() == curdir / "files");
-    change_directory(atf::fs::path("dir"));
-    ATF_REQUIRE(get_current_dir() == curdir / "files/dir");
-    change_directory(atf::fs::path(".."));
-    ATF_REQUIRE(get_current_dir() == curdir / "files");
-    change_directory(atf::fs::path(".."));
-    ATF_REQUIRE(get_current_dir() == curdir);
-}
-
-// ------------------------------------------------------------------------
-// Main.
-// ------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    // Add the tests for the "temp_dir" class.
-    ATF_ADD_TEST_CASE(tcs, temp_dir_raii);
-
-    // Add the tests for the free functions.
-    ATF_ADD_TEST_CASE(tcs, cleanup);
-    ATF_ADD_TEST_CASE(tcs, cleanup_eacces_on_root);
-    ATF_ADD_TEST_CASE(tcs, cleanup_eacces_on_subdir);
-    ATF_ADD_TEST_CASE(tcs, change_directory);
-    ATF_ADD_TEST_CASE(tcs, get_current_dir);
-}
diff --git a/contrib/atf/atf-run/integration_test.sh b/contrib/atf/atf-run/integration_test.sh
deleted file mode 100644
index afd013efbf0..00000000000
--- a/contrib/atf/atf-run/integration_test.sh
+++ /dev/null
@@ -1,1134 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-create_atffile()
-{
-    ATF_CONFDIR="$(pwd)"; export ATF_CONFDIR
-
-    cat >Atffile <<EOF
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-EOF
-    for f in "${@}"; do
-        echo "tp: ${f}" >>Atffile
-    done
-}
-
-create_helper()
-{
-    cp $(atf_get_srcdir)/misc_helpers helper
-    create_atffile helper
-    TESTCASE=${1}; export TESTCASE
-}
-
-create_helper_stdin()
-{
-    # TODO: This really, really, really must use real test programs.
-    cat >${1} <<EOF
-#! $(atf-config -t atf_shell)
-while [ \${#} -gt 0 ]; do
-    case \${1} in
-        -l)
-            echo 'Content-Type: application/X-atf-tp; version="1"'
-            echo
-EOF
-    cnt=1
-    while [ ${cnt} -le ${2} ]; do
-        echo "echo 'ident: tc${cnt}'" >>${1}
-        [ ${cnt} -lt ${2} ] && echo "echo" >>${1}
-        cnt=$((${cnt} + 1))
-    done
-cat >>${1} <<EOF
-            exit 0
-            ;;
-        -r*)
-            resfile=\$(echo \${1} | cut -d r -f 2-)
-            ;;
-    esac
-    testcase=\$(echo \${1} | cut -d : -f 1)
-    shift
-done
-EOF
-    cat >>${1}
-}
-
-create_mount_helper()
-{
-    cat >${1} <<EOF
-#! /usr/bin/env atf-sh
-
-do_mount() {
-    platform=\$(uname)
-    case \${platform} in
-    Linux|NetBSD)
-        mount -t tmpfs tmpfs \${1} || atf_fail "Mount failed"
-        ;;
-    FreeBSD)
-        mdmfs -s 16m md \${1} || atf_fail "Mount failed"
-        ;;
-    SunOS)
-        mount -F tmpfs tmpfs \$(pwd)/\${1} || atf_fail "Mount failed"
-        ;;
-    *)
-        atf_fail "create_mount_helper called for an unsupported platform."
-        ;;
-    esac
-}
-
-atf_test_case main
-main_head() {
-    atf_set "require.user" "root"
-}
-main_body() {
-EOF
-    cat >>${1}
-    cat >>${1} <<EOF
-}
-
-atf_init_test_cases()
-{
-    atf_add_test_case main
-}
-EOF
-}
-
-atf_test_case no_warnings
-no_warnings_head()
-{
-    atf_set "descr" "Tests that atf-run suppresses warnings about not running" \
-                    "within atf-run"
-}
-no_warnings_body()
-{
-    create_helper pass
-    atf_check -s eq:0 -o ignore -e not-match:'WARNING.*atf-run' atf-run helper
-}
-
-atf_test_case config
-config_head()
-{
-    atf_set "descr" "Tests that the config files are read in the correct" \
-                    "order"
-}
-config_body()
-{
-    create_helper config
-
-    mkdir etc
-    mkdir .atf
-
-    echo "First: read system-wide common.conf."
-    cat >etc/common.conf <<EOF
-Content-Type: application/X-atf-config; version="1"
-
-1st = "sw common"
-2nd = "sw common"
-3rd = "sw common"
-4th = "sw common"
-EOF
-    atf_check -s eq:0 \
-        -o match:'1st: sw common' \
-        -o match:'2nd: sw common' \
-        -o match:'3rd: sw common' \
-        -o match:'4th: sw common' \
-        -e ignore -x \
-        "ATF_CONFDIR=$(pwd)/etc HOME=$(pwd) atf-run helper"
-
-    echo "Second: read system-wide <test-suite>.conf."
-    cat >etc/atf.conf <<EOF
-Content-Type: application/X-atf-config; version="1"
-
-1st = "sw atf"
-EOF
-    atf_check -s eq:0 \
-        -o match:'1st: sw atf' \
-        -o match:'2nd: sw common' \
-        -o match:'3rd: sw common' \
-        -o match:'4th: sw common' \
-        -e ignore -x \
-        "ATF_CONFDIR=$(pwd)/etc HOME=$(pwd) atf-run helper"
-
-    echo "Third: read user-specific common.conf."
-    cat >.atf/common.conf <<EOF
-Content-Type: application/X-atf-config; version="1"
-
-2nd = "us common"
-EOF
-    atf_check -s eq:0 \
-        -o match:'1st: sw atf' \
-        -o match:'2nd: us common' \
-        -o match:'3rd: sw common' \
-        -o match:'4th: sw common' \
-        -e ignore -x \
-        "ATF_CONFDIR=$(pwd)/etc HOME=$(pwd) atf-run helper"
-
-    echo "Fourth: read user-specific <test-suite>.conf."
-    cat >.atf/atf.conf <<EOF
-Content-Type: application/X-atf-config; version="1"
-
-3rd = "us atf"
-EOF
-    atf_check -s eq:0 \
-        -o match:'1st: sw atf' \
-        -o match:'2nd: us common' \
-        -o match:'3rd: us atf' \
-        -o match:'4th: sw common' \
-        -e ignore -x \
-        "ATF_CONFDIR=$(pwd)/etc HOME=$(pwd) atf-run helper"
-}
-
-atf_test_case vflag
-vflag_head()
-{
-    atf_set "descr" "Tests that the -v flag works and that it properly" \
-                    "overrides the values in configuration files"
-}
-vflag_body()
-{
-    create_helper testvar
-
-    echo "Checking that 'testvar' is not defined."
-    atf_check -s eq:1 -o ignore -e ignore -x \
-        "ATF_CONFDIR=$(pwd)/etc atf-run helper"
-
-    echo "Checking that defining 'testvar' trough '-v' works."
-    atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \
-        "ATF_CONFDIR=$(pwd)/etc atf-run -v testvar='a value' helper"
-
-    echo "Checking that defining 'testvar' trough the configuration" \
-         "file works."
-    mkdir etc
-    cat >etc/common.conf <<EOF
-Content-Type: application/X-atf-config; version="1"
-
-testvar = "value in conf file"
-EOF
-    atf_check -s eq:0 -o match:'testvar: value in conf file' -e ignore -x \
-              "ATF_CONFDIR=$(pwd)/etc atf-run helper"
-
-    echo "Checking that defining 'testvar' trough -v overrides the" \
-         "configuration file."
-    atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \
-        "ATF_CONFDIR=$(pwd)/etc atf-run -v testvar='a value' helper"
-}
-
-atf_test_case atffile
-atffile_head()
-{
-    atf_set "descr" "Tests that the variables defined by the Atffile" \
-                    "are recognized and that they take the lowest priority"
-}
-atffile_body()
-{
-    create_helper testvar
-
-    echo "Checking that 'testvar' is not defined."
-    atf_check -s eq:1 -o ignore -e ignore -x \
-              "ATF_CONFDIR=$(pwd)/etc atf-run helper"
-
-    echo "Checking that defining 'testvar' trough the Atffile works."
-    echo 'conf: testvar = "a value"' >>Atffile
-    atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \
-              "ATF_CONFDIR=$(pwd)/etc atf-run helper"
-
-    echo "Checking that defining 'testvar' trough the configuration" \
-         "file overrides the one in the Atffile."
-    mkdir etc
-    cat >etc/common.conf <<EOF
-Content-Type: application/X-atf-config; version="1"
-
-testvar = "value in conf file"
-EOF
-    atf_check -s eq:0 -o match:'testvar: value in conf file' -e ignore -x \
-              "ATF_CONFDIR=$(pwd)/etc atf-run helper"
-    rm -rf etc
-
-    echo "Checking that defining 'testvar' trough -v overrides the" \
-         "one in the Atffile."
-    atf_check -s eq:0 -o match:'testvar: new value' -e ignore -x \
-        "ATF_CONFDIR=$(pwd)/etc atf-run -v testvar='new value' helper"
-}
-
-atf_test_case atffile_recursive
-atffile_recursive_head()
-{
-    atf_set "descr" "Tests that variables defined by an Atffile are not" \
-                    "inherited by other Atffiles."
-}
-atffile_recursive_body()
-{
-    create_helper testvar
-
-    mkdir dir
-    mv Atffile helper dir
-
-    echo "Checking that 'testvar' is not inherited."
-    create_atffile dir
-    echo 'conf: testvar = "a value"' >> Atffile
-    atf_check -s eq:1 -o ignore -e ignore -x "ATF_CONFDIR=$(pwd)/etc atf-run"
-
-    echo "Checking that defining 'testvar' in the correct Atffile works."
-    echo 'conf: testvar = "a value"' >>dir/Atffile
-    atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \
-              "ATF_CONFDIR=$(pwd)/etc atf-run"
-}
-
-atf_test_case fds
-fds_head()
-{
-    atf_set "descr" "Tests that all streams are properly captured"
-}
-fds_body()
-{
-    create_helper fds
-
-    atf_check -s eq:0 \
-        -o match:'^tc-so:msg1 to stdout$' \
-        -o match:'^tc-so:msg2 to stdout$' \
-        -o match:'^tc-se:msg1 to stderr$' \
-        -o match:'^tc-se:msg2 to stderr$' \
-        -e empty atf-run
-}
-
-atf_test_case mux_streams
-mux_streams_head()
-{
-    atf_set "descr" "Tests for a race condition in stream multiplexing"
-}
-mux_streams_body()
-{
-    create_helper mux_streams
-
-    for i in 1 2 3 4 5; do
-        echo "Attempt ${i}"
-        atf_check -s eq:0 -o match:'stdout 9999' -o match:'stderr 9999' atf-run
-    done
-}
-
-atf_test_case expect
-expect_head()
-{
-    atf_set "descr" "Tests the processing of test case results and the" \
-        "expect features"
-}
-expect_body()
-{
-    ln -s "$(atf_get_srcdir)/expect_helpers" .
-    create_atffile expect_helpers
-
-    atf_check -s eq:1 \
-        -o match:'death_and_exit, expected_death' \
-        -o match:'death_and_signal, expected_death' \
-        -o match:'death_but_pass, failed' \
-        -o match:'exit_any_and_exit, expected_exit' \
-        -o match:'exit_but_pass, failed' \
-        -o match:'exit_code_and_exit, expected_exit' \
-        -o match:'fail_and_fail_check, expected_failure' \
-        -o match:'fail_and_fail_requirement, expected_failure' \
-        -o match:'fail_but_pass, failed' \
-        -o match:'pass_and_pass, passed' \
-        -o match:'pass_but_fail_check, failed' \
-        -o match:'pass_but_fail_requirement, failed' \
-        -o match:'signal_any_and_signal, expected_signal' \
-        -o match:'signal_but_pass, failed' \
-        -o match:'signal_no_and_signal, expected_signal' \
-        -o match:'timeout_and_hang, expected_timeout' \
-        -o match:'timeout_but_pass, failed' \
-        -e empty atf-run
-}
-
-atf_test_case missing_results
-missing_results_head()
-{
-    atf_set "descr" "Ensures that atf-run correctly handles test cases that " \
-                    "do not create the results file"
-}
-missing_results_body()
-{
-    create_helper_stdin helper 1 <<EOF
-test -f \${resfile} && echo "resfile found"
-exit 0
-EOF
-    chmod +x helper
-
-    create_atffile helper
-
-    re='^tc-end: [0-9][0-9]*\.[0-9]*, tc1,'
-    atf_check -s eq:1 \
-        -o match:"${re} failed,.*failed to create" \
-        -o not-match:'resfile found' \
-        -e empty atf-run
-}
-
-atf_test_case broken_results
-broken_results_head()
-{
-    atf_set "descr" "Ensures that atf-run reports test programs that" \
-                    "provide a bogus results output as broken programs"
-}
-broken_results_body()
-{
-    # We produce two errors from the header to ensure that the parse
-    # errors are printed on a single line on the output file.  Printing
-    # them on separate lines would be incorrect.
-    create_helper_stdin helper 1 <<EOF
-echo 'line 1' >\${resfile}
-echo 'line 2' >>\${resfile}
-exit 0
-EOF
-    chmod +x helper
-
-    create_atffile helper
-
-    re='^tc-end: [0-9][0-9]*\.[0-9]*, tc1,'
-    atf_check -s eq:1 -o match:"${re} .*line 1.*line 2" -e empty atf-run
-}
-
-atf_test_case broken_tp_list
-broken_tp_list_head()
-{
-    atf_set "descr" "Ensures that atf-run reports test programs that" \
-                    "provide a bogus test case list"
-}
-broken_tp_list_body()
-{
-    cat >helper <<EOF
-#! $(atf-config -t atf_shell)
-while [ \${#} -gt 0 ]; do
-    if [ \${1} = -l ]; then
-        echo 'Content-Type: application/X-atf-tp; version="1"'
-        echo
-        echo 'foo: bar'
-        exit 0
-    else
-        shift
-    fi
-done
-exit 0
-EOF
-    chmod +x helper
-
-    create_atffile helper
-
-    re='^tp-end: [0-9][0-9]*\.[0-9]*, helper,'
-    re="${re} Invalid format for test case list:.*First property.*ident"
-    atf_check -s eq:1 -o match:"${re}" -e empty atf-run
-}
-
-atf_test_case zero_tcs
-zero_tcs_head()
-{
-    atf_set "descr" "Ensures that atf-run reports test programs without" \
-                    "test cases as errors"
-}
-zero_tcs_body()
-{
-    create_helper_stdin helper 0 <<EOF
-echo 'Content-Type: application/X-atf-tp; version="1"'
-echo
-exit 1
-EOF
-    chmod +x helper
-
-    create_atffile helper
-
-    re='^tp-end: [0-9][0-9]*\.[0-9]*, helper,'
-    atf_check -s eq:1 \
-        -o match:"${re} .*Invalid format for test case list" \
-        -e empty atf-run
-}
-
-atf_test_case exit_codes
-exit_codes_head()
-{
-    atf_set "descr" "Ensures that atf-run reports bogus exit codes for" \
-                    "programs correctly"
-}
-exit_codes_body()
-{
-    create_helper_stdin helper 1 <<EOF
-echo "failed: Yes, it failed" >\${resfile}
-exit 0
-EOF
-    chmod +x helper
-
-    create_atffile helper
-
-    re='^tc-end: [0-9][0-9]*\.[0-9]*, tc1,'
-    atf_check -s eq:1 \
-        -o match:"${re} .*exited successfully.*reported failure" \
-        -e empty atf-run
-}
-
-atf_test_case signaled
-signaled_head()
-{
-    atf_set "descr" "Ensures that atf-run reports test program's crashes" \
-                    "correctly regardless of their actual results"
-}
-signaled_body()
-{
-    create_helper_stdin helper 2 <<EOF
-echo "passed" >\${resfile}
-case \${testcase} in
-    tc1) ;;
-    tc2) echo "Killing myself!" ; kill -9 \$\$ ;;
-esac
-EOF
-    chmod +x helper
-
-    create_atffile helper
-
-    re='^tc-end: [0-9][0-9]*\.[0-9]*, tc2,'
-    atf_check -s eq:1 -o match:"${re} .*received signal 9" \
-        -e empty atf-run
-}
-
-atf_test_case hooks
-hooks_head()
-{
-    atf_set "descr" "Checks that the default hooks work and that they" \
-                    "can be overriden by the user"
-}
-hooks_body()
-{
-    cp $(atf_get_srcdir)/pass_helper helper
-    create_atffile helper
-
-    mkdir atf
-    mkdir .atf
-
-    echo "Checking default hooks"
-    atf_check -s eq:0 -o match:'^info: time.start, ' \
-        -o match:'^info: time.end, ' -e empty -x \
-        "ATF_CONFDIR=$(pwd)/atf atf-run"
-
-    echo "Checking the system-wide info_start hook"
-    cat >atf/atf-run.hooks <<EOF
-info_start_hook()
-{
-    atf_tps_writer_info "test" "sw value"
-}
-EOF
-    atf_check -s eq:0 \
-        -o match:'^info: test, sw value' \
-        -o not-match:'^info: time.start, ' \
-        -o match:'^info: time.end, ' \
-        -e empty -x \
-        "ATF_CONFDIR=$(pwd)/atf atf-run"
-
-    echo "Checking the user-specific info_start hook"
-    cat >.atf/atf-run.hooks <<EOF
-info_start_hook()
-{
-    atf_tps_writer_info "test" "user value"
-}
-EOF
-    atf_check -s eq:0 \
-        -o match:'^info: test, user value' \
-        -o not-match:'^info: time.start, ' \
-        -o match:'^info: time.end, ' \
-        -e empty -x \
-        "ATF_CONFDIR=$(pwd)/atf atf-run"
-
-    rm atf/atf-run.hooks
-    rm .atf/atf-run.hooks
-
-    echo "Checking the system-wide info_end hook"
-    cat >atf/atf-run.hooks <<EOF
-info_end_hook()
-{
-    atf_tps_writer_info "test" "sw value"
-}
-EOF
-    atf_check -s eq:0 \
-        -o match:'^info: time.start, ' \
-        -o not-match:'^info: time.end, ' \
-        -o match:'^info: test, sw value' \
-        -e empty -x \
-        "ATF_CONFDIR=$(pwd)/atf atf-run"
-
-    echo "Checking the user-specific info_end hook"
-    cat >.atf/atf-run.hooks <<EOF
-info_end_hook()
-{
-    atf_tps_writer_info "test" "user value"
-}
-EOF
-    atf_check -s eq:0 \
-        -o match:'^info: time.start, ' \
-        -o not-match:'^info: time.end, ' \
-        -o match:'^info: test, user value' \
-        -e empty -x \
-         "ATF_CONFDIR=$(pwd)/atf atf-run"
-}
-
-atf_test_case isolation_env
-isolation_env_head()
-{
-    atf_set "descr" "Tests that atf-run sets a set of environment variables" \
-                    "to known sane values"
-}
-isolation_env_body()
-{
-    undef_vars="LANG LC_ALL LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY \
-                LC_NUMERIC LC_TIME"
-    def_vars="HOME TZ"
-
-    mangleenv="env"
-    for v in ${undef_vars} ${def_vars}; do
-        mangleenv="${mangleenv} ${v}=bogus-value"
-    done
-
-    create_helper env_list
-    create_atffile helper
-
-    # We must ignore stderr in this call (instead of specifying -e empty)
-    # because, when atf-run invokes the shell to run the hooks, we may get
-    # error messages about an invalid locale.  This happens, at least, when
-    # the shell is bash 4.x.
-    atf_check -s eq:0 -o save:stdout -e ignore ${mangleenv} atf-run helper
-
-    for v in ${undef_vars}; do
-        atf_check -s eq:1 -o empty -e empty grep "^tc-so:${v}=" stdout
-    done
-
-    for v in ${def_vars}; do
-        atf_check -s eq:0 -o ignore -e empty grep "^tc-so:${v}=" stdout
-    done
-
-    atf_check -s eq:0 -o ignore -e empty grep "^tc-so:TZ=UTC" stdout
-}
-
-atf_test_case isolation_home
-isolation_home_head()
-{
-    atf_set "descr" "Tests that atf-run sets HOME to a sane and valid value"
-}
-isolation_home_body()
-{
-    create_helper env_home
-    create_atffile helper
-    atf_check -s eq:0 -o ignore -e ignore env HOME=foo atf-run helper
-}
-
-atf_test_case isolation_stdin
-isolation_stdin_head()
-{
-    atf_set "descr" "Tests that atf-run nullifies the stdin of test cases"
-}
-isolation_stdin_body()
-{
-    create_helper read_stdin
-    create_atffile helper
-    atf_check -s eq:0 -o ignore -e ignore -x 'echo hello world | atf-run helper'
-}
-
-atf_test_case isolation_umask
-isolation_umask_head()
-{
-    atf_set "descr" "Tests that atf-run sets the umask to a known value"
-}
-isolation_umask_body()
-{
-    create_helper umask
-    create_atffile helper
-
-    atf_check -s eq:0 -o match:'umask: 0022' -e ignore -x \
-        "umask 0000 && atf-run helper"
-}
-
-atf_test_case cleanup_pass
-cleanup_pass_head()
-{
-    atf_set "descr" "Tests that atf-run calls the cleanup routine of the test" \
-        "case when the test case result is passed"
-}
-cleanup_pass_body()
-{
-    create_helper cleanup_states
-    create_atffile helper
-
-    atf_check -s eq:0 -o match:'cleanup_states, passed' -e ignore atf-run \
-        -v state=pass -v statedir=$(pwd) helper
-    test -f to-stay || atf_fail "Test case body did not run correctly"
-    if [ -f to-delete ]; then
-        atf_fail "Test case cleanup did not run correctly"
-    fi
-}
-
-atf_test_case cleanup_fail
-cleanup_fail_head()
-{
-    atf_set "descr" "Tests that atf-run calls the cleanup routine of the test" \
-        "case when the test case result is failed"
-}
-cleanup_fail_body()
-{
-    create_helper cleanup_states
-    create_atffile helper
-
-    atf_check -s eq:1 -o match:'cleanup_states, failed' -e ignore atf-run \
-        -v state=fail -v statedir=$(pwd) helper
-    test -f to-stay || atf_fail "Test case body did not run correctly"
-    if [ -f to-delete ]; then
-        atf_fail "Test case cleanup did not run correctly"
-    fi
-}
-
-atf_test_case cleanup_skip
-cleanup_skip_head()
-{
-    atf_set "descr" "Tests that atf-run calls the cleanup routine of the test" \
-        "case when the test case result is skipped"
-}
-cleanup_skip_body()
-{
-    create_helper cleanup_states
-    create_atffile helper
-
-    atf_check -s eq:0 -o match:'cleanup_states, skipped' -e ignore atf-run \
-        -v state=skip -v statedir=$(pwd) helper
-    test -f to-stay || atf_fail "Test case body did not run correctly"
-    if [ -f to-delete ]; then
-        atf_fail "Test case cleanup did not run correctly"
-    fi
-}
-
-atf_test_case cleanup_curdir
-cleanup_curdir_head()
-{
-    atf_set "descr" "Tests that atf-run calls the cleanup routine in the same" \
-        "work directory as the body so that they can share data"
-}
-cleanup_curdir_body()
-{
-    create_helper cleanup_curdir
-    create_atffile helper
-
-    atf_check -s eq:0 -o match:'cleanup_curdir, passed' \
-        -o match:'Old value: 1234' -e ignore atf-run helper
-}
-
-atf_test_case cleanup_signal
-cleanup_signal_head()
-{
-    atf_set "descr" "Tests that atf-run calls the cleanup routine if it gets" \
-        "a termination signal while running the body"
-}
-cleanup_signal_body()
-{
-    : # TODO: Write this.
-}
-
-atf_test_case cleanup_mount
-cleanup_mount_head()
-{
-    atf_set "descr" "Tests that the removal algorithm does not cross" \
-                    "mount points"
-    atf_set "require.user" "root"
-}
-cleanup_mount_body()
-{
-    ROOT="$(pwd)/root"; export ROOT
-
-    create_mount_helper helper <<EOF
-echo \$(pwd) >\${ROOT}
-mkdir foo
-mkdir foo/bar
-mkdir foo/bar/mnt
-do_mount foo/bar/mnt
-mkdir foo/baz
-do_mount foo/baz
-mkdir foo/baz/foo
-mkdir foo/baz/foo/bar
-do_mount foo/baz/foo/bar
-EOF
-    create_atffile helper
-    chmod +x helper
-
-    platform=$(uname)
-    case ${platform} in
-    Linux|FreeBSD|NetBSD|SunOS)
-        ;;
-    *)
-        # XXX Possibly specify in meta-data too.
-        atf_skip "Test unimplemented in this platform (${platform})"
-        ;;
-    esac
-
-    atf_check -s eq:0 -o match:"main, passed" -e ignore atf-run helper
-    mount | grep $(cat root) && atf_fail "Some file systems remain mounted"
-    atf_check -s eq:1 -o empty -e empty test -d $(cat root)/foo
-}
-
-atf_test_case cleanup_symlink
-cleanup_symlink_head()
-{
-    atf_set "descr" "Tests that the removal algorithm does not follow" \
-                    "symlinks, which may live in another device and thus" \
-                    "be treated as mount points"
-    atf_set "require.user" "root"
-}
-cleanup_symlink_body()
-{
-    ROOT="$(pwd)/root"; export ROOT
-
-    create_mount_helper helper <<EOF
-echo \$(pwd) >\${ROOT}
-atf_check -s eq:0 -o empty -e empty mkdir foo
-atf_check -s eq:0 -o empty -e empty mkdir foo/bar
-do_mount foo/bar
-atf_check -s eq:0 -o empty -e empty touch a
-atf_check -s eq:0 -o empty -e empty ln -s "\$(pwd)/a" foo/bar
-EOF
-    create_atffile helper
-    chmod +x helper
-
-    platform=$(uname)
-    case ${platform} in
-    Linux|FreeBSD|NetBSD|SunOS)
-        ;;
-    *)
-        # XXX Possibly specify in meta-data too.
-        atf_skip "Test unimplemented in this platform (${platform})"
-        ;;
-    esac
-
-    atf_check -s eq:0 -o match:"main, passed" -e ignore atf-run helper
-    mount | grep $(cat root) && atf_fail "Some file systems remain mounted"
-    atf_check -s eq:1 -o empty -e empty test -d $(cat root)/foo
-}
-
-atf_test_case require_arch
-require_arch_head()
-{
-    atf_set "descr" "Tests that atf-run validates the require.arch property"
-}
-require_arch_body()
-{
-    create_helper require_arch
-    create_atffile helper
-
-    echo "Checking for the real architecture"
-    arch=$(atf-config -t atf_arch)
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v arch="${arch}" helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v arch="foo ${arch}" helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v arch="${arch} foo" helper
-
-    echo "Checking for a fictitious architecture"
-    arch=fictitious
-    export ATF_ARCH=fictitious
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v arch="${arch}" helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v arch="foo ${arch}" helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v arch="${arch} foo" helper
-
-    echo "Triggering some failures"
-    atf_check -s eq:0 -o match:"${TESTCASE}, skipped, .*foo.*architecture" \
-        -e ignore atf-run -v arch="foo" helper
-    atf_check -s eq:0 \
-        -o match:"${TESTCASE}, skipped, .*foo bar.*architectures" -e ignore \
-        atf-run -v arch="foo bar" helper
-    atf_check -s eq:0 \
-        -o match:"${TESTCASE}, skipped, .*fictitiousxxx.*architecture" \
-        -e ignore atf-run -v arch="${arch}xxx" helper
-}
-
-atf_test_case require_config
-require_config_head()
-{
-    atf_set "descr" "Tests that atf-run validates the require.config property"
-}
-require_config_body()
-{
-    create_helper require_config
-    create_atffile helper
-
-    atf_check -s eq:0 -o match:"${TESTCASE}, skipped, .*var1.*not defined" \
-        -e ignore atf-run helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, skipped, .*var2.*not defined" \
-        -e ignore atf-run -v var1=foo helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v var1=a -v var2=' ' helper
-}
-
-atf_test_case require_files
-require_files_head()
-{
-    atf_set "descr" "Tests that atf-run validates the require.files property"
-}
-require_files_body()
-{
-    create_helper require_files
-    create_atffile helper
-
-    touch i-exist
-
-    echo "Checking absolute paths"
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v files='/bin/cp' helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v files="$(pwd)/i-exist" helper
-    atf_check -s eq:0 \
-        -o match:"${TESTCASE}, skipped, .*/dont-exist" \
-        -e ignore atf-run -v files="$(pwd)/i-exist $(pwd)/dont-exist" helper
-
-    echo "Checking that relative paths are not allowed"
-    atf_check -s eq:1 \
-        -o match:"${TESTCASE}, failed, Relative paths.*not allowed.*hello" \
-        -e ignore atf-run -v files='hello' helper
-    atf_check -s eq:1 \
-        -o match:"${TESTCASE}, failed, Relative paths.*not allowed.*a/b" \
-        -e ignore atf-run -v files='a/b' helper
-}
-
-atf_test_case require_machine
-require_machine_head()
-{
-    atf_set "descr" "Tests that atf-run validates the require.machine property"
-}
-require_machine_body()
-{
-    create_helper require_machine
-    create_atffile helper
-
-    echo "Checking for the real machine type"
-    machine=$(atf-config -t atf_machine)
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v machine="${machine}" helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v machine="foo ${machine}" helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v machine="${machine} foo" helper
-
-    echo "Checking for a fictitious machine type"
-    machine=fictitious
-    export ATF_MACHINE=fictitious
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v machine="${machine}" helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v machine="foo ${machine}" helper
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v machine="${machine} foo" helper
-
-    echo "Triggering some failures"
-    atf_check -s eq:0 -o match:"${TESTCASE}, skipped, .*foo.*machine type" \
-        -e ignore atf-run -v machine="foo" helper
-    atf_check -s eq:0 \
-        -o match:"${TESTCASE}, skipped, .*foo bar.*machine types" -e ignore \
-        atf-run -v machine="foo bar" helper
-    atf_check -s eq:0 \
-        -o match:"${TESTCASE}, skipped, .*fictitiousxxx.*machine type" \
-        -e ignore atf-run -v machine="${machine}xxx" helper
-}
-
-atf_test_case require_progs
-require_progs_head()
-{
-    atf_set "descr" "Tests that atf-run validates the require.progs property"
-}
-require_progs_body()
-{
-    create_helper require_progs
-    create_atffile helper
-
-    echo "Checking absolute paths"
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v progs='/bin/cp' helper
-    atf_check -s eq:0 \
-        -o match:"${TESTCASE}, skipped, .*/bin/__non-existent__.*PATH" \
-        -e ignore atf-run -v progs='/bin/__non-existent__' helper
-
-    echo "Checking that relative paths are not allowed"
-    atf_check -s eq:1 \
-        -o match:"${TESTCASE}, failed, Relative paths.*not allowed.*bin/cp" \
-        -e ignore atf-run -v progs='bin/cp' helper
-
-    echo "Check plain file names, searching them in the PATH."
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v progs='cp' helper
-    atf_check -s eq:0 \
-        -o match:"${TESTCASE}, skipped, .*__non-existent__.*PATH" -e ignore \
-        atf-run -v progs='__non-existent__' helper
-}
-
-atf_test_case require_user_root
-require_user_root_head()
-{
-    atf_set "descr" "Tests that atf-run validates the require.user property" \
-        "when it is set to 'root'"
-}
-require_user_root_body()
-{
-    create_helper require_user
-    create_atffile helper
-
-    if [ $(id -u) -eq 0 ]; then
-        exp=passed
-    else
-        exp=skipped
-    fi
-    atf_check -s eq:0 -o match:"${TESTCASE}, ${exp}" -e ignore atf-run \
-        -v user=root helper
-}
-
-atf_test_case require_user_unprivileged
-require_user_unprivileged_head()
-{
-    atf_set "descr" "Tests that atf-run validates the require.user property" \
-        "when it is set to 'root'"
-}
-require_user_unprivileged_body()
-{
-    create_helper require_user
-    create_atffile helper
-
-    if [ $(id -u) -eq 0 ]; then
-        exp=skipped
-    else
-        exp=passed
-    fi
-    atf_check -s eq:0 -o match:"${TESTCASE}, ${exp}" -e ignore atf-run \
-        -v user=unprivileged helper
-}
-
-atf_test_case require_user_bad
-require_user_bad_head()
-{
-    atf_set "descr" "Tests that atf-run validates the require.user property" \
-        "when it is set to 'root'"
-}
-require_user_bad_body()
-{
-    create_helper require_user
-    create_atffile helper
-
-    atf_check -s eq:1 -o match:"${TESTCASE}, failed, Invalid value.*foobar" \
-        -e ignore atf-run -v user=foobar helper
-}
-
-atf_test_case timeout
-timeout_head()
-{
-    atf_set "descr" "Tests that atf-run kills a test case that times out"
-}
-timeout_body()
-{
-    create_helper timeout
-    create_atffile helper
-
-    atf_check -s eq:1 \
-        -o match:"${TESTCASE}, failed, .*timed out after 1 second" -e ignore \
-        atf-run -v statedir=$(pwd) helper
-    if [ -f finished ]; then
-        atf_fail "Test case was not killed after time out"
-    fi
-}
-
-atf_test_case timeout_forkexit
-timeout_forkexit_head()
-{
-    atf_set "descr" "Tests that atf-run deals gracefully with a test program" \
-        "that forks, exits, but the child process hangs"
-}
-timeout_forkexit_body()
-{
-    create_helper timeout_forkexit
-    create_atffile helper
-
-    atf_check -s eq:0 -o match:"${TESTCASE}, passed" -e ignore atf-run \
-        -v statedir=$(pwd) helper
-    test -f parent-finished || atf_fail "Parent did not exit as expected"
-    test -f child-finished && atf_fail "Subprocess exited but it should have" \
-        "been forcibly terminated" || true
-}
-
-atf_test_case ignore_deprecated_use_fs
-ignore_deprecated_use_fs_head()
-{
-    atf_set "descr" "Tests that atf-run ignores the deprecated use.fs property"
-}
-ignore_deprecated_use_fs_body()
-{
-    create_helper use_fs
-    create_atffile helper
-
-    atf_check -s eq:0 -o ignore -e ignore atf-run helper
-}
-
-atf_init_test_cases()
-{
-    atf_add_test_case no_warnings
-    atf_add_test_case config
-    atf_add_test_case vflag
-    atf_add_test_case atffile
-    atf_add_test_case atffile_recursive
-    atf_add_test_case expect
-    atf_add_test_case fds
-    atf_add_test_case mux_streams
-    atf_add_test_case missing_results
-    atf_add_test_case broken_results
-    atf_add_test_case broken_tp_list
-    atf_add_test_case zero_tcs
-    atf_add_test_case exit_codes
-    atf_add_test_case signaled
-    atf_add_test_case hooks
-    atf_add_test_case isolation_env
-    atf_add_test_case isolation_home
-    atf_add_test_case isolation_stdin
-    atf_add_test_case isolation_umask
-    atf_add_test_case cleanup_pass
-    atf_add_test_case cleanup_fail
-    atf_add_test_case cleanup_skip
-    atf_add_test_case cleanup_curdir
-    atf_add_test_case cleanup_signal
-    atf_add_test_case cleanup_mount
-    atf_add_test_case cleanup_symlink
-    atf_add_test_case require_arch
-    atf_add_test_case require_config
-    atf_add_test_case require_files
-    atf_add_test_case require_machine
-    atf_add_test_case require_progs
-    atf_add_test_case require_user_root
-    atf_add_test_case require_user_unprivileged
-    atf_add_test_case require_user_bad
-    atf_add_test_case timeout
-    atf_add_test_case timeout_forkexit
-    atf_add_test_case ignore_deprecated_use_fs
-}
-
-# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/atf-run/io.cpp b/contrib/atf/atf-run/io.cpp
deleted file mode 100644
index 9be78d01261..00000000000
--- a/contrib/atf/atf-run/io.cpp
+++ /dev/null
@@ -1,361 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <fcntl.h>
-#include <poll.h>
-#include <signal.h>
-#include <unistd.h>
-}
-
-#include <cerrno>
-#include <cstring>
-
-extern "C" {
-#include "../atf-c/error.h"
-}
-
-#include "../atf-c++/detail/exceptions.hpp"
-#include "../atf-c++/detail/sanity.hpp"
-#include "../atf-c++/utils.hpp"
-
-#include "io.hpp"
-
-namespace impl = atf::atf_run;
-#define IMPL_NAME "atf::atf_run"
-
-// ------------------------------------------------------------------------
-// The "file_handle" class.
-// ------------------------------------------------------------------------
-
-impl::file_handle::file_handle(void) :
-    m_handle(invalid_value())
-{
-}
-
-impl::file_handle::file_handle(handle_type h) :
-    m_handle(h)
-{
-    PRE(m_handle != invalid_value());
-}
-
-impl::file_handle::file_handle(const file_handle& fh) :
-    m_handle(fh.m_handle)
-{
-    fh.m_handle = invalid_value();
-}
-
-impl::file_handle::~file_handle(void)
-{
-    if (is_valid())
-        close();
-}
-
-impl::file_handle&
-impl::file_handle::operator=(const file_handle& fh)
-{
-    m_handle = fh.m_handle;
-    fh.m_handle = invalid_value();
-
-    return *this;
-}
-
-bool
-impl::file_handle::is_valid(void)
-    const
-{
-    return m_handle != invalid_value();
-}
-
-void
-impl::file_handle::close(void)
-{
-    PRE(is_valid());
-
-    ::close(m_handle);
-
-    m_handle = invalid_value();
-}
-
-impl::file_handle::handle_type
-impl::file_handle::disown(void)
-{
-    PRE(is_valid());
-
-    handle_type h = m_handle;
-    m_handle = invalid_value();
-    return h;
-}
-
-impl::file_handle::handle_type
-impl::file_handle::get(void)
-    const
-{
-    PRE(is_valid());
-
-    return m_handle;
-}
-
-void
-impl::file_handle::posix_remap(handle_type h)
-{
-    PRE(is_valid());
-
-    if (m_handle == h)
-        return;
-
-    if (::dup2(m_handle, h) == -1)
-        throw system_error(IMPL_NAME "::file_handle::posix_remap",
-                           "dup2(2) failed", errno);
-
-    if (::close(m_handle) == -1) {
-        ::close(h);
-        throw system_error(IMPL_NAME "::file_handle::posix_remap",
-                           "close(2) failed", errno);
-    }
-
-    m_handle = h;
-}
-
-impl::file_handle::handle_type
-impl::file_handle::invalid_value(void)
-{
-    return -1;
-}
-
-// ------------------------------------------------------------------------
-// The "systembuf" class.
-// ------------------------------------------------------------------------
-
-impl::systembuf::systembuf(handle_type h, std::size_t bufsize) :
-    m_handle(h),
-    m_bufsize(bufsize),
-    m_read_buf(NULL),
-    m_write_buf(NULL)
-{
-    PRE(m_handle >= 0);
-    PRE(m_bufsize > 0);
-
-    try {
-        m_read_buf = new char[bufsize];
-        m_write_buf = new char[bufsize];
-    } catch (...) {
-        if (m_read_buf != NULL)
-            delete [] m_read_buf;
-        if (m_write_buf != NULL)
-            delete [] m_write_buf;
-        throw;
-    }
-
-    setp(m_write_buf, m_write_buf + m_bufsize);
-}
-
-impl::systembuf::~systembuf(void)
-{
-    delete [] m_read_buf;
-    delete [] m_write_buf;
-}
-
-impl::systembuf::int_type
-impl::systembuf::underflow(void)
-{
-    PRE(gptr() >= egptr());
-
-    bool ok;
-    ssize_t cnt = ::read(m_handle, m_read_buf, m_bufsize);
-    ok = (cnt != -1 && cnt != 0);
-
-    if (!ok)
-        return traits_type::eof();
-    else {
-        setg(m_read_buf, m_read_buf, m_read_buf + cnt);
-        return traits_type::to_int_type(*gptr());
-    }
-}
-
-impl::systembuf::int_type
-impl::systembuf::overflow(int c)
-{
-    PRE(pptr() >= epptr());
-    if (sync() == -1)
-        return traits_type::eof();
-    if (!traits_type::eq_int_type(c, traits_type::eof())) {
-        traits_type::assign(*pptr(), c);
-        pbump(1);
-    }
-    return traits_type::not_eof(c);
-}
-
-int
-impl::systembuf::sync(void)
-{
-    ssize_t cnt = pptr() - pbase();
-
-    bool ok;
-    ok = ::write(m_handle, pbase(), cnt) == cnt;
-
-    if (ok)
-        pbump(-cnt);
-    return ok ? 0 : -1;
-}
-
-// ------------------------------------------------------------------------
-// The "pistream" class.
-// ------------------------------------------------------------------------
-
-impl::pistream::pistream(const int fd) :
-    std::istream(NULL),
-    m_systembuf(fd)
-{
-    rdbuf(&m_systembuf);
-}
-
-// ------------------------------------------------------------------------
-// The "muxer" class.
-// ------------------------------------------------------------------------
-
-static int
-safe_poll(struct pollfd fds[], nfds_t nfds, int timeout)
-{
-    int ret = ::poll(fds, nfds, timeout);
-    if (ret == -1) {
-        if (errno == EINTR)
-            ret = 0;
-        else
-            throw atf::system_error(IMPL_NAME "::safe_poll", "poll(2) failed",
-                                    errno);
-    }
-    INV(ret >= 0);
-    return ret;
-}
-
-static size_t
-safe_read(const int fd, void* buffer, const size_t nbytes,
-          const bool report_errors)
-{
-    int ret;
-    while ((ret = ::read(fd, buffer, nbytes)) == -1 && errno == EINTR) {}
-    if (ret == -1) {
-        INV(errno != EINTR);
-
-        if (report_errors)
-            throw atf::system_error(IMPL_NAME "::safe_read", "read(2) failed",
-                                    errno);
-        else
-            ret = 0;
-    }
-    INV(ret >= 0);
-    return static_cast< size_t >(ret);
-}
-
-impl::muxer::muxer(const int* fds, const size_t nfds, const size_t bufsize) :
-    m_fds(fds),
-    m_nfds(nfds),
-    m_bufsize(bufsize),
-    m_buffers(new std::string[nfds])
-{
-}
-
-impl::muxer::~muxer(void)
-{
-}
-
-size_t
-impl::muxer::read_one(const size_t index, const int fd, std::string& accum,
-                      const bool report_errors)
-{
-    atf::utils::auto_array< char > buffer(new char[m_bufsize]);
-    const size_t nbytes = safe_read(fd, buffer.get(), m_bufsize - 1,
-                                    report_errors);
-    INV(nbytes < m_bufsize);
-    buffer[nbytes] = '\0';
-
-    std::string line(accum);
-
-    size_t line_start = 0;
-    for (size_t i = 0; i < nbytes; i++) {
-        if (buffer[i] == '\n') {
-            line_callback(index, line);
-            line.clear();
-            accum.clear();
-            line_start = i + 1;
-        } else if (buffer[i] == '\r') {
-            // Do nothing.
-        } else {
-            line.append(1, buffer[i]);
-        }
-    }
-    accum.append(&buffer[line_start]);
-
-    return nbytes;
-}
-
-void
-impl::muxer::mux(volatile const bool& terminate)
-{
-    atf::utils::auto_array< struct pollfd > poll_fds(new struct pollfd[m_nfds]);
-    for (size_t i = 0; i < m_nfds; i++) {
-        poll_fds[i].fd = m_fds[i];
-        poll_fds[i].events = POLLIN;
-    }
-
-    size_t nactive = m_nfds;
-    while (nactive > 0 && !terminate) {
-        int ret;
-        while (!terminate && (ret = safe_poll(poll_fds.get(), 2, 250)) == 0) {}
-
-        for (size_t i = 0; !terminate && i < m_nfds; i++) {
-            if (poll_fds[i].events == 0)
-                continue;
-
-            if (poll_fds[i].revents & POLLHUP) {
-                // Any data still available at this point will be processed by
-                // a call to the flush method.
-                poll_fds[i].events = 0;
-
-                INV(nactive >= 1);
-                nactive--;
-            } else if (poll_fds[i].revents & (POLLIN | POLLRDNORM | POLLRDBAND |
-                                       POLLPRI)) {
-                (void)read_one(i, poll_fds[i].fd, m_buffers[i], true);
-            }
-        }
-    }
-}
-
-void
-impl::muxer::flush(void)
-{
-    for (size_t i = 0; i < m_nfds; i++) {
-        while (read_one(i, m_fds[i], m_buffers[i], false) > 0) {}
-
-        if (!m_buffers[i].empty())
-            line_callback(i, m_buffers[i]);
-    }
-}
diff --git a/contrib/atf/atf-run/io.hpp b/contrib/atf/atf-run/io.hpp
deleted file mode 100644
index fd2d9fb680d..00000000000
--- a/contrib/atf/atf-run/io.hpp
+++ /dev/null
@@ -1,427 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if !defined(_ATF_RUN_IO_HPP_)
-#define _ATF_RUN_IO_HPP_
-
-#include <istream>
-#include <ostream>
-#include <streambuf>
-
-#include "fs.hpp"
-
-#include "../atf-c++/utils.hpp"
-
-namespace atf {
-namespace atf_run {
-
-// ------------------------------------------------------------------------
-// The "file_handle" class.
-// ------------------------------------------------------------------------
-
-//!
-//! \brief Simple RAII model for system file handles.
-//!
-//! The \a file_handle class is a simple RAII model for native system file
-//! handles.  This class wraps one of such handles grabbing its ownership,
-//! and automaticaly closes it upon destruction.  It is basically used
-//! inside the library to avoid leaking open file handles, shall an
-//! unexpected execution trace occur.
-//!
-//! A \a file_handle object can be copied but doing so invalidates the
-//! source object.  There can only be a single valid \a file_handle object
-//! for a given system file handle.  This is similar to std::auto_ptr\<\>'s
-//! semantics.
-//!
-//! This class also provides some convenience methods to issue special file
-//! operations under their respective platforms.
-//!
-class file_handle
-{
-public:
-    //!
-    //! \brief Opaque name for the native handle type.
-    //!
-    //! Each operating system identifies file handles using a specific type.
-    //! The \a handle_type type is used to transparently refer to file
-    //! handles regarless of the operating system in which this class is
-    //! used.
-    //!
-    //! If this class is used in a POSIX system, \a NativeSystemHandle is
-    //! an integer type while it is a \a HANDLE in a Win32 system.
-    //!
-    typedef int handle_type;
-
-    //!
-    //! \brief Constructs an invalid file handle.
-    //!
-    //! This constructor creates a new \a file_handle object that represents
-    //! an invalid file handle.  An invalid file handle can be copied but
-    //! cannot be manipulated in any way (except checking for its validity).
-    //!
-    //! \see is_valid()
-    //!
-    file_handle(void);
-
-    //!
-    //! \brief Constructs a new file handle from a native file handle.
-    //!
-    //! This constructor creates a new \a file_handle object that takes
-    //! ownership of the given \a h native file handle.  The user must not
-    //! close \a h on his own during the lifetime of the new object.
-    //! Ownership can be reclaimed using disown().
-    //!
-    //! \pre The native file handle must be valid; a close operation must
-    //!      succeed on it.
-    //!
-    //! \see disown()
-    //!
-    file_handle(handle_type h);
-
-    //!
-    //! \brief Copy constructor; invalidates the source handle.
-    //!
-    //! This copy constructor creates a new file handle from a given one.
-    //! Ownership of the native file handle is transferred to the new
-    //! object, effectively invalidating the source file handle.  This
-    //! avoids having two live \a file_handle objects referring to the
-    //! same native file handle.  The source file handle need not be
-    //! valid in the name of simplicity.
-    //!
-    //! \post The source file handle is invalid.
-    //! \post The new file handle owns the source's native file handle.
-    //!
-    file_handle(const file_handle& fh);
-
-    //!
-    //! \brief Releases resources if the handle is valid.
-    //!
-    //! If the file handle is valid, the destructor closes it.
-    //!
-    //! \see is_valid()
-    //!
-    ~file_handle(void);
-
-    //!
-    //! \brief Assignment operator; invalidates the source handle.
-    //!
-    //! This assignment operator transfers ownership of the RHS file
-    //! handle to the LHS one, effectively invalidating the source file
-    //! handle.  This avoids having two live \a file_handle objects
-    //! referring to the same native file handle.  The source file
-    //! handle need not be valid in the name of simplicity.
-    //!
-    //! \post The RHS file handle is invalid.
-    //! \post The LHS file handle owns RHS' native file handle.
-    //! \return A reference to the LHS file handle.
-    //!
-    file_handle& operator=(const file_handle& fh);
-
-    //!
-    //! \brief Checks whether the file handle is valid or not.
-    //!
-    //! Returns a boolean indicating whether the file handle is valid or
-    //! not.  If the file handle is invalid, no other applications can be
-    //! executed other than the destructor.
-    //!
-    //! \return True if the file handle is valid; false otherwise.
-    //!
-    bool is_valid(void) const;
-
-    //!
-    //! \brief Closes the file handle.
-    //!
-    //! Explicitly closes the file handle, which must be valid.  Upon
-    //! exit, the handle is not valid any more.
-    //!
-    //! \pre The file handle is valid.
-    //! \post The file handle is invalid.
-    //! \post The native file handle is closed.
-    //!
-    void close(void);
-
-    //!
-    //! \brief Reclaims ownership of the native file handle.
-    //!
-    //! Explicitly reclaims ownership of the native file handle contained
-    //! in the \a file_handle object, returning the native file handle.
-    //! The caller is responsible of closing it later on.
-    //!
-    //! \pre The file handle is valid.
-    //! \post The file handle is invalid.
-    //! \return The native file handle.
-    //!
-    handle_type disown(void);
-
-    //!
-    //! \brief Gets the native file handle.
-    //!
-    //! Returns the native file handle for the \a file_handle object.
-    //! The caller can issue any operation on it except closing it.
-    //! If closing is required, disown() shall be used.
-    //!
-    //! \pre The file handle is valid.
-    //! \return The native file handle.
-    //!
-    handle_type get(void) const;
-
-    //!
-    //! \brief Changes the native file handle to the given one.
-    //!
-    //! Given a new native file handle \a h, this operation assigns this
-    //! handle to the current object, closing its old native file handle.
-    //! In other words, it first calls dup2() to remap the old handle to
-    //! the new one and then closes the old handle.
-    //!
-    //! If \a h matches the current value of the handle, this is a no-op.
-    //! This is done for simplicity, to avoid the caller having to check
-    //! this condition on its own.
-    //!
-    //! If \a h is open, it is automatically closed by dup2().
-    //!
-    //! This operation is only available in POSIX systems.
-    //!
-    //! \pre The file handle is valid.
-    //! \pre The native file handle \a h is valid; i.e., it must be
-    //!      closeable.
-    //! \post The file handle's native file handle is \a h.
-    //! \throw system_error If the internal remapping operation fails.
-    //!
-    void posix_remap(handle_type h);
-
-private:
-    //!
-    //! \brief Internal handle value.
-    //!
-    //! This variable holds the native handle value for the file handle
-    //! hold by this object.  It is interesting to note that this needs
-    //! to be mutable because the copy constructor and the assignment
-    //! operator invalidate the source object.
-    //!
-    mutable handle_type m_handle;
-
-    //!
-    //! \brief Constant function representing an invalid handle value.
-    //!
-    //! Returns the platform-specific handle value that represents an
-    //! invalid handle.  This is a constant function rather than a regular
-    //! constant because, in the latter case, we cannot define it under
-    //! Win32 due to the value being of a complex type.
-    //!
-    static handle_type invalid_value(void);
-};
-
-// ------------------------------------------------------------------------
-// The "systembuf" class.
-// ------------------------------------------------------------------------
-
-//!
-//! \brief std::streambuf implementation for system file handles.
-//!
-//! systembuf provides a std::streambuf implementation for system file
-//! handles.  Contrarywise to file_handle, this class does \b not take
-//! ownership of the native file handle; this should be taken care of
-//! somewhere else.
-//!
-//! This class follows the expected semantics of a std::streambuf object.
-//! However, it is not copyable to avoid introducing inconsistences with
-//! the on-disk file and the in-memory buffers.
-//!
-class systembuf :
-    public std::streambuf, atf::utils::noncopyable
-{
-public:
-    typedef int handle_type;
-
-    //!
-    //! \brief Constructs a new systembuf for the given file handle.
-    //!
-    //! This constructor creates a new systembuf object that reads or
-    //! writes data from/to the \a h native file handle.  This handle
-    //! is \b not owned by the created systembuf object; the code
-    //! should take care of it externally.
-    //!
-    //! This class buffers input and output; the buffer size may be
-    //! tuned through the \a bufsize parameter, which defaults to 8192
-    //! bytes.
-    //!
-    //! \see pistream.
-    //!
-    explicit systembuf(handle_type h, std::size_t bufsize = 8192);
-    ~systembuf(void);
-
-private:
-    //!
-    //! \brief Native file handle used by the systembuf object.
-    //!
-    handle_type m_handle;
-
-    //!
-    //! \brief Internal buffer size used during read and write operations.
-    //!
-    std::size_t m_bufsize;
-
-    //!
-    //! \brief Internal buffer used during read operations.
-    //!
-    char* m_read_buf;
-
-    //!
-    //! \brief Internal buffer used during write operations.
-    //!
-    char* m_write_buf;
-
-protected:
-    //!
-    //! \brief Reads new data from the native file handle.
-    //!
-    //! This operation is called by input methods when there are no more
-    //! data in the input buffer.  The function fills the buffer with new
-    //! data, if available.
-    //!
-    //! \pre All input positions are exhausted (gptr() >= egptr()).
-    //! \post The input buffer has new data, if available.
-    //! \returns traits_type::eof() if a read error occurrs or there are
-    //!          no more data to be read.  Otherwise returns
-    //!          traits_type::to_int_type(*gptr()).
-    //!
-    virtual int_type underflow(void);
-
-    //!
-    //! \brief Makes room in the write buffer for additional data.
-    //!
-    //! This operation is called by output methods when there is no more
-    //! space in the output buffer to hold a new element.  The function
-    //! first flushes the buffer's contents to disk and then clears it to
-    //! leave room for more characters.  The given \a c character is
-    //! stored at the beginning of the new space.
-    //!
-    //! \pre All output positions are exhausted (pptr() >= epptr()).
-    //! \post The output buffer has more space if no errors occurred
-    //!       during the write to disk.
-    //! \post *(pptr() - 1) is \a c.
-    //! \returns traits_type::eof() if a write error occurrs.  Otherwise
-    //!          returns traits_type::not_eof(c).
-    //!
-    virtual int_type overflow(int c);
-
-    //!
-    //! \brief Flushes the output buffer to disk.
-    //!
-    //! Synchronizes the systembuf buffers with the contents of the file
-    //! associated to this object through the native file handle.  The
-    //! output buffer is flushed to disk and cleared to leave new room
-    //! for more data.
-    //!
-    //! \returns 0 on success, -1 if an error occurred.
-    //!
-    virtual int sync(void);
-};
-
-// ------------------------------------------------------------------------
-// The "pistream" class.
-// ------------------------------------------------------------------------
-
-//!
-//! \brief Child process' output stream.
-//!
-//! The pistream class represents an output communication channel with the
-//! child process.  The child process writes data to this stream and the
-//! parent process can read it through the pistream object.  In other
-//! words, from the child's point of view, the communication channel is an
-//! output one, but from the parent's point of view it is an input one;
-//! hence the confusing pistream name.
-//!
-//! pistream objects cannot be copied because they own the file handle
-//! they use to communicate with the child and because they buffer data
-//! that flows through the communication channel.
-//!
-//! A pistream object behaves as a std::istream stream in all senses.
-//! The class is only provided because it must provide a method to let
-//! the caller explicitly close the communication channel.
-//!
-//! \remark <b>Blocking remarks</b>: Functions that read data from this
-//! stream can block if the associated file handle blocks during the read.
-//! As this class is used to communicate with child processes through
-//! anonymous pipes, the most typical blocking condition happens when the
-//! child has no more data to send to the pipe's system buffer.  When
-//! this happens, the buffer eventually empties and the system blocks
-//! until the writer generates some data.
-//!
-class pistream :
-    public std::istream, utils::noncopyable
-{
-    //!
-    //! \brief The systembuf object used to manage this stream's data.
-    //!
-    systembuf m_systembuf;
-
-public:
-    //!
-    //! \brief Creates a new process' output stream.
-    //!
-    //! Given a file handle, this constructor creates a new pistream
-    //! object that owns the given file handle \a fh.  Ownership of
-    //! \a fh is transferred to the created pistream object.
-    //!
-    //! \pre \a fh is valid.
-    //! \post \a fh is invalid.
-    //! \post The new pistream object owns \a fh.
-    //!
-    explicit pistream(const int);
-};
-
-// ------------------------------------------------------------------------
-// The "muxer" class.
-// ------------------------------------------------------------------------
-
-class muxer : utils::noncopyable {
-    const int* m_fds;
-    const size_t m_nfds;
-
-    const size_t m_bufsize;
-    atf::utils::auto_array< std::string > m_buffers;
-
-protected:
-    virtual void line_callback(const size_t, const std::string&) = 0;
-
-    size_t read_one(const size_t, const int, std::string&, const bool);
-
-public:
-    muxer(const int*, const size_t, const size_t bufsize = 1024);
-    virtual ~muxer(void);
-
-    void mux(volatile const bool&);
-    void flush(void);
-};
-
-} // namespace atf_run
-} // namespace atf
-
-#endif // !defined(_ATF_RUN_IO_HPP_)
diff --git a/contrib/atf/atf-run/io_test.cpp b/contrib/atf/atf-run/io_test.cpp
deleted file mode 100644
index 03fc97e82e8..00000000000
--- a/contrib/atf/atf-run/io_test.cpp
+++ /dev/null
@@ -1,471 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/stat.h>
-#include <sys/wait.h>
-
-#include <fcntl.h>
-#include <unistd.h>
-}
-
-#include <cerrno>
-#include <cstddef>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <istream>
-#include <ostream>
-
-#include "../atf-c++/detail/sanity.hpp"
-#include "../atf-c++/macros.hpp"
-
-#include "io.hpp"
-#include "signals.hpp"
-
-// ------------------------------------------------------------------------
-// Auxiliary functions.
-// ------------------------------------------------------------------------
-
-static
-void
-systembuf_check_data(std::istream& is, std::size_t length)
-{
-    char ch = 'A', chr;
-    std::size_t cnt = 0;
-    while (is >> chr) {
-        ATF_REQUIRE_EQ(ch, chr);
-        if (ch == 'Z')
-            ch = 'A';
-        else
-            ch++;
-        cnt++;
-    }
-    ATF_REQUIRE_EQ(cnt, length);
-}
-
-static
-void
-systembuf_write_data(std::ostream& os, std::size_t length)
-{
-    char ch = 'A';
-    for (std::size_t i = 0; i < length; i++) {
-        os << ch;
-        if (ch == 'Z')
-            ch = 'A';
-        else
-            ch++;
-    }
-    os.flush();
-}
-
-static
-void
-systembuf_test_read(std::size_t length, std::size_t bufsize)
-{
-    using atf::atf_run::systembuf;
-
-    std::ofstream f("test_read.txt");
-    systembuf_write_data(f, length);
-    f.close();
-
-    int fd = ::open("test_read.txt", O_RDONLY);
-    ATF_REQUIRE(fd != -1);
-    systembuf sb(fd, bufsize);
-    std::istream is(&sb);
-    systembuf_check_data(is, length);
-    ::close(fd);
-    ::unlink("test_read.txt");
-}
-
-static
-void
-systembuf_test_write(std::size_t length, std::size_t bufsize)
-{
-    using atf::atf_run::systembuf;
-
-    int fd = ::open("test_write.txt", O_WRONLY | O_CREAT | O_TRUNC,
-                    S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-    ATF_REQUIRE(fd != -1);
-    systembuf sb(fd, bufsize);
-    std::ostream os(&sb);
-    systembuf_write_data(os, length);
-    ::close(fd);
-
-    std::ifstream is("test_write.txt");
-    systembuf_check_data(is, length);
-    is.close();
-    ::unlink("test_write.txt");
-}
-
-// ------------------------------------------------------------------------
-// Test cases for the "file_handle" class.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(file_handle_ctor);
-ATF_TEST_CASE_HEAD(file_handle_ctor)
-{
-    set_md_var("descr", "Tests file_handle's constructors");
-}
-ATF_TEST_CASE_BODY(file_handle_ctor)
-{
-    using atf::atf_run::file_handle;
-
-    file_handle fh1;
-    ATF_REQUIRE(!fh1.is_valid());
-
-    file_handle fh2(STDOUT_FILENO);
-    ATF_REQUIRE(fh2.is_valid());
-    fh2.disown();
-}
-
-ATF_TEST_CASE(file_handle_copy);
-ATF_TEST_CASE_HEAD(file_handle_copy)
-{
-    set_md_var("descr", "Tests file_handle's copy constructor");
-}
-ATF_TEST_CASE_BODY(file_handle_copy)
-{
-    using atf::atf_run::file_handle;
-
-    file_handle fh1;
-    file_handle fh2(STDOUT_FILENO);
-
-    file_handle fh3(fh2);
-    ATF_REQUIRE(!fh2.is_valid());
-    ATF_REQUIRE(fh3.is_valid());
-
-    fh1 = fh3;
-    ATF_REQUIRE(!fh3.is_valid());
-    ATF_REQUIRE(fh1.is_valid());
-
-    fh1.disown();
-}
-
-ATF_TEST_CASE(file_handle_get);
-ATF_TEST_CASE_HEAD(file_handle_get)
-{
-    set_md_var("descr", "Tests the file_handle::get method");
-}
-ATF_TEST_CASE_BODY(file_handle_get)
-{
-    using atf::atf_run::file_handle;
-
-    file_handle fh1(STDOUT_FILENO);
-    ATF_REQUIRE_EQ(fh1.get(), STDOUT_FILENO);
-}
-
-ATF_TEST_CASE(file_handle_posix_remap);
-ATF_TEST_CASE_HEAD(file_handle_posix_remap)
-{
-    set_md_var("descr", "Tests the file_handle::posix_remap method");
-}
-ATF_TEST_CASE_BODY(file_handle_posix_remap)
-{
-    using atf::atf_run::file_handle;
-
-    int pfd[2];
-
-    ATF_REQUIRE(::pipe(pfd) != -1);
-    file_handle rend(pfd[0]);
-    file_handle wend(pfd[1]);
-
-    ATF_REQUIRE(rend.get() != 10);
-    ATF_REQUIRE(wend.get() != 10);
-    wend.posix_remap(10);
-    ATF_REQUIRE_EQ(wend.get(), 10);
-    ATF_REQUIRE(::write(wend.get(), "test-posix-remap", 16) != -1);
-    {
-        char buf[17];
-        ATF_REQUIRE_EQ(::read(rend.get(), buf, sizeof(buf)), 16);
-        buf[16] = '\0';
-        ATF_REQUIRE(std::strcmp(buf, "test-posix-remap") == 0);
-    }
-
-    // Redo previous to ensure that remapping over the same descriptor
-    // has no side-effects.
-    ATF_REQUIRE_EQ(wend.get(), 10);
-    wend.posix_remap(10);
-    ATF_REQUIRE_EQ(wend.get(), 10);
-    ATF_REQUIRE(::write(wend.get(), "test-posix-remap", 16) != -1);
-    {
-        char buf[17];
-        ATF_REQUIRE_EQ(::read(rend.get(), buf, sizeof(buf)), 16);
-        buf[16] = '\0';
-        ATF_REQUIRE(std::strcmp(buf, "test-posix-remap") == 0);
-    }
-}
-
-// ------------------------------------------------------------------------
-// Test cases for the "systembuf" class.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(systembuf_short_read);
-ATF_TEST_CASE_HEAD(systembuf_short_read)
-{
-    set_md_var("descr", "Tests that a short read (one that fits in the "
-               "internal buffer) works when using systembuf");
-}
-ATF_TEST_CASE_BODY(systembuf_short_read)
-{
-    systembuf_test_read(64, 1024);
-}
-
-ATF_TEST_CASE(systembuf_long_read);
-ATF_TEST_CASE_HEAD(systembuf_long_read)
-{
-    set_md_var("descr", "Tests that a long read (one that does not fit in "
-               "the internal buffer) works when using systembuf");
-}
-ATF_TEST_CASE_BODY(systembuf_long_read)
-{
-    systembuf_test_read(64 * 1024, 1024);
-}
-
-ATF_TEST_CASE(systembuf_short_write);
-ATF_TEST_CASE_HEAD(systembuf_short_write)
-{
-    set_md_var("descr", "Tests that a short write (one that fits in the "
-               "internal buffer) works when using systembuf");
-}
-ATF_TEST_CASE_BODY(systembuf_short_write)
-{
-    systembuf_test_write(64, 1024);
-}
-
-ATF_TEST_CASE(systembuf_long_write);
-ATF_TEST_CASE_HEAD(systembuf_long_write)
-{
-    set_md_var("descr", "Tests that a long write (one that does not fit "
-               "in the internal buffer) works when using systembuf");
-}
-ATF_TEST_CASE_BODY(systembuf_long_write)
-{
-    systembuf_test_write(64 * 1024, 1024);
-}
-
-// ------------------------------------------------------------------------
-// Test cases for the "pistream" class.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(pistream);
-ATF_TEST_CASE_HEAD(pistream)
-{
-    set_md_var("descr", "Tests the pistream class");
-}
-ATF_TEST_CASE_BODY(pistream)
-{
-    using atf::atf_run::file_handle;
-    using atf::atf_run::pistream;
-    using atf::atf_run::systembuf;
-
-    int fds[2];
-    ATF_REQUIRE(::pipe(fds) != -1);
-
-    pistream rend(fds[0]);
-
-    systembuf wbuf(fds[1]);
-    std::ostream wend(&wbuf);
-
-    // XXX This assumes that the pipe's buffer is big enough to accept
-    // the data written without blocking!
-    wend << "1Test 1message\n";
-    wend.flush();
-    std::string tmp;
-    rend >> tmp;
-    ATF_REQUIRE_EQ(tmp, "1Test");
-    rend >> tmp;
-    ATF_REQUIRE_EQ(tmp, "1message");
-}
-
-// ------------------------------------------------------------------------
-// Tests for the "muxer" class.
-// ------------------------------------------------------------------------
-
-namespace {
-
-static void
-check_stream(std::ostream& os)
-{
-    // If we receive a signal while writing to the stream, the bad bit gets set.
-    // Things seem to behave fine afterwards if we clear such error condition.
-    // However, I'm not sure if it's safe to query errno at this point.
-    ATF_REQUIRE(os.good() || (os.bad() && errno == EINTR));
-    os.clear();
-}
-
-class mock_muxer : public atf::atf_run::muxer {
-    void line_callback(const size_t index, const std::string& line)
-    {
-        // The following should be enabled but causes the output to be so big
-        // that it is annoying.  Reenable at some point if we make atf store
-        // the output of the test cases in some other way (e.g. only if a test
-        // failes), because this message is the only help in seeing how the
-        // test fails.
-        //std::cout << "line_callback(" << index << ", " << line << ")\n";
-        check_stream(std::cout);
-        switch (index) {
-        case 0: lines0.push_back(line); break;
-        case 1: lines1.push_back(line); break;
-        default: ATF_REQUIRE(false);
-        }
-    }
-
-public:
-    mock_muxer(const int* fds, const size_t nfds, const size_t bufsize) :
-        muxer(fds, nfds, bufsize) {}
-
-    std::vector< std::string > lines0;
-    std::vector< std::string > lines1;
-};
-
-static bool child_finished = false;
-static void sigchld_handler(int signo)
-{
-    INV(signo == SIGCHLD);
-    child_finished = true;
-}
-
-static void
-child_printer(const int pipeout[2], const int pipeerr[2],
-              const size_t iterations)
-{
-    ::close(pipeout[0]);
-    ::close(pipeerr[0]);
-    ATF_REQUIRE(::dup2(pipeout[1], STDOUT_FILENO) != -1);
-    ATF_REQUIRE(::dup2(pipeerr[1], STDERR_FILENO) != -1);
-    ::close(pipeout[1]);
-    ::close(pipeerr[1]);
-
-    for (size_t i = 0; i < iterations; i++) {
-        std::cout << "stdout " << i << "\n";
-        std::cerr << "stderr " << i << "\n";
-    }
-
-    std::cout << "stdout eof\n";
-    std::cerr << "stderr eof\n";
-    std::exit(EXIT_SUCCESS);
-}
-
-static void
-muxer_test(const size_t bufsize, const size_t iterations)
-{
-    int pipeout[2], pipeerr[2];
-    ATF_REQUIRE(pipe(pipeout) != -1);
-    ATF_REQUIRE(pipe(pipeerr) != -1);
-
-    atf::atf_run::signal_programmer sigchld(SIGCHLD, sigchld_handler);
-
-    std::cout.flush();
-    std::cerr.flush();
-
-    pid_t pid = ::fork();
-    ATF_REQUIRE(pid != -1);
-    if (pid == 0) {
-        sigchld.unprogram();
-        child_printer(pipeout, pipeerr, iterations);
-        UNREACHABLE;
-    }
-    ::close(pipeout[1]);
-    ::close(pipeerr[1]);
-
-    int fds[2] = {pipeout[0], pipeerr[0]};
-    mock_muxer mux(fds, 2, bufsize);
-
-    mux.mux(child_finished);
-    check_stream(std::cout);
-    std::cout << "mux done\n";
-
-    mux.flush();
-    std::cout << "flush done\n";
-    check_stream(std::cout);
-
-    sigchld.unprogram();
-    int status;
-    ATF_REQUIRE(::waitpid(pid, &status, 0) != -1);
-    ATF_REQUIRE(WIFEXITED(status));
-    ATF_REQUIRE(WEXITSTATUS(status) == EXIT_SUCCESS);
-
-    ATF_REQUIRE(std::cout.good());
-    ATF_REQUIRE(std::cerr.good());
-    for (size_t i = 0; i < iterations; i++) {
-        std::ostringstream exp0, exp1;
-        exp0 << "stdout " << i;
-        exp1 << "stderr " << i;
-
-        ATF_REQUIRE(mux.lines0.size() > i);
-        ATF_REQUIRE_EQ(exp0.str(), mux.lines0[i]);
-        ATF_REQUIRE(mux.lines1.size() > i);
-        ATF_REQUIRE_EQ(exp1.str(), mux.lines1[i]);
-    }
-    ATF_REQUIRE_EQ("stdout eof", mux.lines0[iterations]);
-    ATF_REQUIRE_EQ("stderr eof", mux.lines1[iterations]);
-    std::cout << "all done\n";
-}
-
-} // anonymous namespace
-
-ATF_TEST_CASE_WITHOUT_HEAD(muxer_small_buffer);
-ATF_TEST_CASE_BODY(muxer_small_buffer)
-{
-    muxer_test(4, 20000);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(muxer_large_buffer);
-ATF_TEST_CASE_BODY(muxer_large_buffer)
-{
-    muxer_test(1024, 50000);
-}
-
-// ------------------------------------------------------------------------
-// Main.
-// ------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    // Add the tests for the "file_handle" class.
-    ATF_ADD_TEST_CASE(tcs, file_handle_ctor);
-    ATF_ADD_TEST_CASE(tcs, file_handle_copy);
-    ATF_ADD_TEST_CASE(tcs, file_handle_get);
-    ATF_ADD_TEST_CASE(tcs, file_handle_posix_remap);
-
-    // Add the tests for the "systembuf" class.
-    ATF_ADD_TEST_CASE(tcs, systembuf_short_read);
-    ATF_ADD_TEST_CASE(tcs, systembuf_long_read);
-    ATF_ADD_TEST_CASE(tcs, systembuf_short_write);
-    ATF_ADD_TEST_CASE(tcs, systembuf_long_write);
-
-    // Add the tests for the "pistream" class.
-    ATF_ADD_TEST_CASE(tcs, pistream);
-
-    // Add the tests for the "muxer" class.
-    ATF_ADD_TEST_CASE(tcs, muxer_small_buffer);
-    ATF_ADD_TEST_CASE(tcs, muxer_large_buffer);
-}
diff --git a/contrib/atf/atf-run/misc_helpers.cpp b/contrib/atf/atf-run/misc_helpers.cpp
deleted file mode 100644
index abc9a4a945f..00000000000
--- a/contrib/atf/atf-run/misc_helpers.cpp
+++ /dev/null
@@ -1,419 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/stat.h>
-
-#include <signal.h>
-#include <unistd.h>
-}
-
-#include <cstdlib>
-#include <fstream>
-#include <iomanip>
-#include <ios>
-#include <iostream>
-#include <string>
-
-#include "atf-c++/macros.hpp"
-
-#include "atf-c++/detail/env.hpp"
-#include "atf-c++/detail/fs.hpp"
-#include "atf-c++/detail/process.hpp"
-#include "atf-c++/detail/sanity.hpp"
-
-// ------------------------------------------------------------------------
-// Auxiliary functions.
-// ------------------------------------------------------------------------
-
-static
-void
-touch(const std::string& path)
-{
-    std::ofstream os(path.c_str());
-    if (!os)
-        ATF_FAIL("Could not create file " + path);
-    os.close();
-}
-
-// ------------------------------------------------------------------------
-// Helper tests for "t_integration".
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(pass);
-ATF_TEST_CASE_HEAD(pass)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(pass)
-{
-}
-
-ATF_TEST_CASE(config);
-ATF_TEST_CASE_HEAD(config)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(config)
-{
-    std::cout << "1st: " << get_config_var("1st") << "\n";
-    std::cout << "2nd: " << get_config_var("2nd") << "\n";
-    std::cout << "3rd: " << get_config_var("3rd") << "\n";
-    std::cout << "4th: " << get_config_var("4th") << "\n";
-}
-
-ATF_TEST_CASE(fds);
-ATF_TEST_CASE_HEAD(fds)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(fds)
-{
-    std::cout << "msg1 to stdout" << "\n";
-    std::cout << "msg2 to stdout" << "\n";
-    std::cerr << "msg1 to stderr" << "\n";
-    std::cerr << "msg2 to stderr" << "\n";
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(mux_streams);
-ATF_TEST_CASE_BODY(mux_streams)
-{
-    for (size_t i = 0; i < 10000; i++) {
-        switch (i % 5) {
-        case 0:
-            std::cout << "stdout " << i << "\n";
-            break;
-        case 1:
-            std::cerr << "stderr " << i << "\n";
-            break;
-        case 2:
-            std::cout << "stdout " << i << "\n";
-            std::cerr << "stderr " << i << "\n";
-            break;
-        case 3:
-            std::cout << "stdout " << i << "\n";
-            std::cout << "stdout " << i << "\n";
-            std::cerr << "stderr " << i << "\n";
-            break;
-        case 4:
-            std::cout << "stdout " << i << "\n";
-            std::cerr << "stderr " << i << "\n";
-            std::cerr << "stderr " << i << "\n";
-            break;
-        default:
-            UNREACHABLE;
-        }
-    }
-}
-
-ATF_TEST_CASE(testvar);
-ATF_TEST_CASE_HEAD(testvar)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(testvar)
-{
-    if (!has_config_var("testvar"))
-        fail("testvar variable not defined");
-    std::cout << "testvar: " << get_config_var("testvar") << "\n";
-}
-
-ATF_TEST_CASE(env_list);
-ATF_TEST_CASE_HEAD(env_list)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(env_list)
-{
-    const atf::process::status s =
-        atf::process::exec(atf::fs::path("env"),
-                           atf::process::argv_array("env", NULL),
-                           atf::process::stream_inherit(),
-                           atf::process::stream_inherit());
-    ATF_REQUIRE(s.exited());
-    ATF_REQUIRE(s.exitstatus() == EXIT_SUCCESS);
-}
-
-ATF_TEST_CASE(env_home);
-ATF_TEST_CASE_HEAD(env_home)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(env_home)
-{
-    ATF_REQUIRE(atf::env::has("HOME"));
-    atf::fs::path p(atf::env::get("HOME"));
-    atf::fs::file_info fi1(p);
-    atf::fs::file_info fi2(atf::fs::path("."));
-    ATF_REQUIRE_EQ(fi1.get_device(), fi2.get_device());
-    ATF_REQUIRE_EQ(fi1.get_inode(), fi2.get_inode());
-}
-
-ATF_TEST_CASE(read_stdin);
-ATF_TEST_CASE_HEAD(read_stdin)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(read_stdin)
-{
-    char buf[100];
-    ssize_t len = ::read(STDIN_FILENO, buf, sizeof(buf) - 1);
-    ATF_REQUIRE(len != -1);
-
-    buf[len + 1] = '\0';
-    for (ssize_t i = 0; i < len; i++) {
-        if (buf[i] != '\0') {
-            fail("The stdin of the test case does not seem to be /dev/zero; "
-                 "got '" + std::string(buf) + "'");
-        }
-    }
-}
-
-ATF_TEST_CASE(umask);
-ATF_TEST_CASE_HEAD(umask)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(umask)
-{
-    mode_t m = ::umask(0);
-    std::cout << "umask: " << std::setw(4) << std::setfill('0')
-              << std::oct << m << "\n";
-    (void)::umask(m);
-}
-
-ATF_TEST_CASE_WITH_CLEANUP(cleanup_states);
-ATF_TEST_CASE_HEAD(cleanup_states)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(cleanup_states)
-{
-    touch(get_config_var("statedir") + "/to-delete");
-    touch(get_config_var("statedir") + "/to-stay");
-
-    if (get_config_var("state") == "fail")
-        ATF_FAIL("On purpose");
-    else if (get_config_var("state") == "skip")
-        ATF_SKIP("On purpose");
-}
-ATF_TEST_CASE_CLEANUP(cleanup_states)
-{
-    atf::fs::remove(atf::fs::path(get_config_var("statedir") + "/to-delete"));
-}
-
-ATF_TEST_CASE_WITH_CLEANUP(cleanup_curdir);
-ATF_TEST_CASE_HEAD(cleanup_curdir)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(cleanup_curdir)
-{
-    std::ofstream os("oldvalue");
-    if (!os)
-        ATF_FAIL("Failed to create oldvalue file");
-    os << 1234;
-    os.close();
-}
-ATF_TEST_CASE_CLEANUP(cleanup_curdir)
-{
-    std::ifstream is("oldvalue");
-    if (is) {
-        int i;
-        is >> i;
-        std::cout << "Old value: " << i << "\n";
-        is.close();
-    }
-}
-
-ATF_TEST_CASE(require_arch);
-ATF_TEST_CASE_HEAD(require_arch)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-    set_md_var("require.arch", get_config_var("arch", "not-set"));
-}
-ATF_TEST_CASE_BODY(require_arch)
-{
-}
-
-ATF_TEST_CASE(require_config);
-ATF_TEST_CASE_HEAD(require_config)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-    set_md_var("require.config", "var1 var2");
-}
-ATF_TEST_CASE_BODY(require_config)
-{
-    std::cout << "var1: " << get_config_var("var1") << "\n";
-    std::cout << "var2: " << get_config_var("var2") << "\n";
-}
-
-ATF_TEST_CASE(require_files);
-ATF_TEST_CASE_HEAD(require_files)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-    set_md_var("require.files", get_config_var("files", "not-set"));
-}
-ATF_TEST_CASE_BODY(require_files)
-{
-}
-
-ATF_TEST_CASE(require_machine);
-ATF_TEST_CASE_HEAD(require_machine)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-    set_md_var("require.machine", get_config_var("machine", "not-set"));
-}
-ATF_TEST_CASE_BODY(require_machine)
-{
-}
-
-ATF_TEST_CASE(require_progs);
-ATF_TEST_CASE_HEAD(require_progs)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-    set_md_var("require.progs", get_config_var("progs", "not-set"));
-}
-ATF_TEST_CASE_BODY(require_progs)
-{
-}
-
-ATF_TEST_CASE(require_user);
-ATF_TEST_CASE_HEAD(require_user)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-    set_md_var("require.user", get_config_var("user", "not-set"));
-}
-ATF_TEST_CASE_BODY(require_user)
-{
-}
-
-ATF_TEST_CASE(timeout);
-ATF_TEST_CASE_HEAD(timeout)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-    set_md_var("timeout", "1");
-}
-ATF_TEST_CASE_BODY(timeout)
-{
-    sleep(10);
-    touch(get_config_var("statedir") + "/finished");
-}
-
-ATF_TEST_CASE(timeout_forkexit);
-ATF_TEST_CASE_HEAD(timeout_forkexit)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-}
-ATF_TEST_CASE_BODY(timeout_forkexit)
-{
-    pid_t pid = fork();
-    ATF_REQUIRE(pid != -1);
-
-    if (pid == 0) {
-        sigset_t mask;
-        sigemptyset(&mask);
-
-        std::cout << "Waiting in subprocess\n";
-        std::cout.flush();
-        ::sigsuspend(&mask);
-
-        touch(get_config_var("statedir") + "/child-finished");
-        std::cout << "Subprocess exiting\n";
-        std::cout.flush();
-        exit(EXIT_SUCCESS);
-    } else {
-        // Don't wait for the child process and let atf-run deal with it.
-        touch(get_config_var("statedir") + "/parent-finished");
-        std::cout << "Parent process exiting\n";
-        ATF_PASS();
-    }
-}
-
-ATF_TEST_CASE(use_fs);
-ATF_TEST_CASE_HEAD(use_fs)
-{
-    set_md_var("descr", "Helper test case for the t_integration test program");
-    set_md_var("use.fs", "this-is-deprecated");
-}
-ATF_TEST_CASE_BODY(use_fs)
-{
-    touch("test-file");
-}
-
-// ------------------------------------------------------------------------
-// Main.
-// ------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    std::string which = atf::env::get("TESTCASE");
-
-    // Add helper tests for t_integration.
-    if (which == "pass")
-        ATF_ADD_TEST_CASE(tcs, pass);
-    if (which == "config")
-        ATF_ADD_TEST_CASE(tcs, config);
-    if (which == "fds")
-        ATF_ADD_TEST_CASE(tcs, fds);
-    if (which == "mux_streams")
-        ATF_ADD_TEST_CASE(tcs, mux_streams);
-    if (which == "testvar")
-        ATF_ADD_TEST_CASE(tcs, testvar);
-    if (which == "env_list")
-        ATF_ADD_TEST_CASE(tcs, env_list);
-    if (which == "env_home")
-        ATF_ADD_TEST_CASE(tcs, env_home);
-    if (which == "read_stdin")
-        ATF_ADD_TEST_CASE(tcs, read_stdin);
-    if (which == "umask")
-        ATF_ADD_TEST_CASE(tcs, umask);
-    if (which == "cleanup_states")
-        ATF_ADD_TEST_CASE(tcs, cleanup_states);
-    if (which == "cleanup_curdir")
-        ATF_ADD_TEST_CASE(tcs, cleanup_curdir);
-    if (which == "require_arch")
-        ATF_ADD_TEST_CASE(tcs, require_arch);
-    if (which == "require_config")
-        ATF_ADD_TEST_CASE(tcs, require_config);
-    if (which == "require_files")
-        ATF_ADD_TEST_CASE(tcs, require_files);
-    if (which == "require_machine")
-        ATF_ADD_TEST_CASE(tcs, require_machine);
-    if (which == "require_progs")
-        ATF_ADD_TEST_CASE(tcs, require_progs);
-    if (which == "require_user")
-        ATF_ADD_TEST_CASE(tcs, require_user);
-    if (which == "timeout")
-        ATF_ADD_TEST_CASE(tcs, timeout);
-    if (which == "timeout_forkexit")
-        ATF_ADD_TEST_CASE(tcs, timeout_forkexit);
-    if (which == "use_fs")
-        ATF_ADD_TEST_CASE(tcs, use_fs);
-}
diff --git a/contrib/atf/atf-run/pass_helper.cpp b/contrib/atf/atf-run/pass_helper.cpp
deleted file mode 100644
index b752b131b38..00000000000
--- a/contrib/atf/atf-run/pass_helper.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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++/macros.hpp"
-
-ATF_TEST_CASE(main);
-ATF_TEST_CASE_HEAD(main)
-{
-    set_md_var("descr", "Helper test case that always passes");
-}
-ATF_TEST_CASE_BODY(main)
-{
-}
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    ATF_ADD_TEST_CASE(tcs, main);
-}
diff --git a/contrib/atf/atf-run/requirements.cpp b/contrib/atf/atf-run/requirements.cpp
deleted file mode 100644
index 75537d5ea52..00000000000
--- a/contrib/atf/atf-run/requirements.cpp
+++ /dev/null
@@ -1,319 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/param.h>
-#include <sys/sysctl.h>
-}
-
-#include <cerrno>
-#include <cstring>
-#include <stdexcept>
-
-extern "C" {
-#include "atf-c/defs.h"
-}
-
-#include "atf-c++/config.hpp"
-
-#include "atf-c++/detail/fs.hpp"
-#include "atf-c++/detail/env.hpp"
-#include "atf-c++/detail/sanity.hpp"
-#include "atf-c++/detail/text.hpp"
-
-#include "requirements.hpp"
-#include "user.hpp"
-
-namespace impl = atf::atf_run;
-
-namespace {
-
-static
-bool
-has_program(const atf::fs::path& program)
-{
-    bool found = false;
-
-    if (program.is_absolute()) {
-        found = atf::fs::is_executable(program);
-    } else {
-        if (program.str().find('/') != std::string::npos)
-            throw std::runtime_error("Relative paths are not allowed "
-                                     "when searching for a program (" +
-                                     program.str() + ")");
-
-        const std::vector< std::string > dirs = atf::text::split(
-            atf::env::get("PATH"), ":");
-        for (std::vector< std::string >::const_iterator iter = dirs.begin();
-             !found && iter != dirs.end(); iter++) {
-            const atf::fs::path& p = atf::fs::path(*iter) / program;
-            if (atf::fs::is_executable(p))
-                found = true;
-        }
-    }
-
-    return found;
-}
-
-static
-std::string
-check_arch(const std::string& arches)
-{
-    const std::vector< std::string > v = atf::text::split(arches, " ");
-
-    for (std::vector< std::string >::const_iterator iter = v.begin();
-         iter != v.end(); iter++) {
-        if ((*iter) == atf::config::get("atf_arch"))
-            return "";
-    }
-
-    if (v.size() == 1)
-        return "Requires the '" + arches + "' architecture";
-    else
-        return "Requires one of the '" + arches + "' architectures";
-}
-
-static
-std::string
-check_config(const std::string& variables, const atf::tests::vars_map& config)
-{
-    const std::vector< std::string > v = atf::text::split(variables, " ");
-    for (std::vector< std::string >::const_iterator iter = v.begin();
-         iter != v.end(); iter++) {
-        if (config.find((*iter)) == config.end())
-            return "Required configuration variable '" + (*iter) + "' not "
-                "defined";
-    }
-    return "";
-}
-
-static
-std::string
-check_files(const std::string& progs)
-{
-    const std::vector< std::string > v = atf::text::split(progs, " ");
-    for (std::vector< std::string >::const_iterator iter = v.begin();
-         iter != v.end(); iter++) {
-        const atf::fs::path file(*iter);
-        if (!file.is_absolute())
-            throw std::runtime_error("Relative paths are not allowed when "
-                "checking for a required file (" + file.str() + ")");
-        if (!atf::fs::exists(file))
-            return "Required file '" + file.str() + "' not found";
-    }
-    return "";
-}
-
-static
-std::string
-check_machine(const std::string& machines)
-{
-    const std::vector< std::string > v = atf::text::split(machines, " ");
-
-    for (std::vector< std::string >::const_iterator iter = v.begin();
-         iter != v.end(); iter++) {
-        if ((*iter) == atf::config::get("atf_machine"))
-            return "";
-    }
-
-    if (v.size() == 1)
-        return "Requires the '" + machines + "' machine type";
-    else
-        return "Requires one of the '" + machines + "' machine types";
-}
-
-#if defined(__APPLE__) || defined(__NetBSD__)
-static
-std::string
-check_memory_sysctl(const int64_t needed, const char* sysctl_variable)
-{
-    int64_t available;
-    std::size_t available_length = sizeof(available);
-    if (::sysctlbyname(sysctl_variable, &available, &available_length,
-                       NULL, 0) == -1) {
-        const char* e = std::strerror(errno);
-        return "Failed to get sysctl(hw.usermem64) value: " + std::string(e);
-    }
-
-    if (available < needed) {
-        return "Not enough memory; needed " + atf::text::to_string(needed) +
-            ", available " + atf::text::to_string(available);
-    } else
-        return "";
-}
-#   if defined(__APPLE__)
-static
-std::string
-check_memory_darwin(const int64_t needed)
-{
-    return check_memory_sysctl(needed, "hw.usermem");
-}
-#   elif defined(__NetBSD__)
-static
-std::string
-check_memory_netbsd(const int64_t needed)
-{
-    return check_memory_sysctl(needed, "hw.usermem64");
-}
-#   else
-#      error "Conditional error"
-#   endif
-#else
-static
-std::string
-check_memory_unknown(const int64_t needed ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-    return "";
-}
-#endif
-
-static
-std::string
-check_memory(const std::string& raw_memory)
-{
-    const int64_t needed = atf::text::to_bytes(raw_memory);
-
-#if defined(__APPLE__)
-    return check_memory_darwin(needed);
-#elif defined(__NetBSD__)
-    return check_memory_netbsd(needed);
-#else
-    return check_memory_unknown(needed);
-#endif
-}
-
-static
-std::string
-check_progs(const std::string& progs)
-{
-    const std::vector< std::string > v = atf::text::split(progs, " ");
-    for (std::vector< std::string >::const_iterator iter = v.begin();
-         iter != v.end(); iter++) {
-        if (!has_program(atf::fs::path(*iter)))
-            return "Required program '" + (*iter) + "' not found in the PATH";
-    }
-    return "";
-}
-
-static
-std::string
-check_user(const std::string& user, const atf::tests::vars_map& config)
-{
-    if (user == "root") {
-        if (!impl::is_root())
-            return "Requires root privileges";
-        else
-            return "";
-    } else if (user == "unprivileged") {
-        if (impl::is_root()) {
-            const atf::tests::vars_map::const_iterator iter = config.find(
-                "unprivileged-user");
-            if (iter == config.end())
-                return "Requires an unprivileged user and the "
-                    "'unprivileged-user' configuration variable is not set";
-            else {
-                const std::string& unprivileged_user = (*iter).second;
-                try {
-                    (void)impl::get_user_ids(unprivileged_user);
-                    return "";
-                } catch (const std::runtime_error& e) {
-                    return "Failed to get information for user " +
-                        unprivileged_user;
-                }
-            }
-        } else
-            return "";
-    } else
-        throw std::runtime_error("Invalid value '" + user + "' for property "
-                                 "require.user");
-}
-
-} // anonymous namespace
-
-std::string
-impl::check_requirements(const atf::tests::vars_map& metadata,
-                         const atf::tests::vars_map& config)
-{
-    std::string failure_reason = "";
-
-    for (atf::tests::vars_map::const_iterator iter = metadata.begin();
-         failure_reason.empty() && iter != metadata.end(); iter++) {
-        const std::string& name = (*iter).first;
-        const std::string& value = (*iter).second;
-        INV(!value.empty()); // Enforced by application/X-atf-tp parser.
-
-        if (name == "require.arch")
-            failure_reason = check_arch(value);
-        else if (name == "require.config")
-            failure_reason = check_config(value, config);
-        else if (name == "require.files")
-            failure_reason = check_files(value);
-        else if (name == "require.machine")
-            failure_reason = check_machine(value);
-        else if (name == "require.memory")
-            failure_reason = check_memory(value);
-        else if (name == "require.progs")
-            failure_reason = check_progs(value);
-        else if (name == "require.user")
-            failure_reason = check_user(value, config);
-        else {
-            // Unknown require.* properties are forbidden by the
-            // application/X-atf-tp parser.
-            INV(failure_reason.find("require.") != 0);
-        }
-    }
-
-    return failure_reason;
-}
-
-std::pair< int, int >
-impl::get_required_user(const atf::tests::vars_map& metadata,
-                        const atf::tests::vars_map& config)
-{
-    const atf::tests::vars_map::const_iterator user = metadata.find(
-        "require.user");
-    if (user == metadata.end())
-        return std::make_pair(-1, -1);
-
-    if ((*user).second == "unprivileged") {
-        if (impl::is_root()) {
-            const atf::tests::vars_map::const_iterator iter = config.find(
-                "unprivileged-user");
-            try {
-                return impl::get_user_ids((*iter).second);
-            } catch (const std::exception& e) {
-                UNREACHABLE;  // This has been validated by check_user.
-                throw e;
-            }
-        } else {
-            return std::make_pair(-1, -1);
-        }
-    } else
-        return std::make_pair(-1, -1);
-}
diff --git a/contrib/atf/atf-run/requirements.hpp b/contrib/atf/atf-run/requirements.hpp
deleted file mode 100644
index 62c072d5fac..00000000000
--- a/contrib/atf/atf-run/requirements.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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 <string>
-#include <utility>
-
-#include "atf-c++/tests.hpp"
-
-namespace atf {
-namespace atf_run {
-
-std::string check_requirements(const atf::tests::vars_map&,
-                               const atf::tests::vars_map&);
-std::pair< int, int > get_required_user(const atf::tests::vars_map&,
-                                        const atf::tests::vars_map&);
-
-} // namespace atf_run
-} // namespace atf
diff --git a/contrib/atf/atf-run/requirements_test.cpp b/contrib/atf/atf-run/requirements_test.cpp
deleted file mode 100644
index 6fe97a2ae72..00000000000
--- a/contrib/atf/atf-run/requirements_test.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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++/config.hpp"
-#include "atf-c++/detail/text.hpp"
-#include "atf-c++/macros.hpp"
-
-#include "requirements.hpp"
-#include "user.hpp"
-
-namespace impl = atf::atf_run;
-
-// -------------------------------------------------------------------------
-// Auxiliary functions.
-// -------------------------------------------------------------------------
-
-namespace {
-
-const atf::tests::vars_map no_config;
-
-void
-do_check(const std::string& expected, const atf::tests::vars_map& metadata,
-         const atf::tests::vars_map& config = no_config)
-{
-    const std::string actual = impl::check_requirements(metadata, config);
-    if (!atf::text::match(actual, expected))
-        ATF_FAIL("Requirements failure reason \"" + actual + "\" does not "
-                 "match \"" + expected + "\"");
-}
-
-} // anonymous namespace
-
-// -------------------------------------------------------------------------
-// Tests for the require.arch metadata property.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE(require_arch_one_ok);
-ATF_TEST_CASE_HEAD(require_arch_one_ok) {}
-ATF_TEST_CASE_BODY(require_arch_one_ok) {
-    atf::tests::vars_map metadata;
-    metadata["require.arch"] = atf::config::get("atf_arch");
-    do_check("", metadata);
-}
-
-ATF_TEST_CASE(require_arch_one_fail);
-ATF_TEST_CASE_HEAD(require_arch_one_fail) {}
-ATF_TEST_CASE_BODY(require_arch_one_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.arch"] = "__fake_arch__";
-    do_check("Requires the '__fake_arch__' architecture", metadata);
-}
-
-ATF_TEST_CASE(require_arch_many_ok);
-ATF_TEST_CASE_HEAD(require_arch_many_ok) {}
-ATF_TEST_CASE_BODY(require_arch_many_ok) {
-    atf::tests::vars_map metadata;
-    metadata["require.arch"] = "__foo__ " + atf::config::get("atf_arch") +
-        " __bar__";
-    do_check("", metadata);
-}
-
-ATF_TEST_CASE(require_arch_many_fail);
-ATF_TEST_CASE_HEAD(require_arch_many_fail) {}
-ATF_TEST_CASE_BODY(require_arch_many_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.arch"] = "__foo__ __bar__ __baz__";
-    do_check("Requires one of the '__foo__ __bar__ __baz__' architectures",
-             metadata);
-}
-
-// -------------------------------------------------------------------------
-// Tests for the require.config metadata property.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE(require_config_one_ok);
-ATF_TEST_CASE_HEAD(require_config_one_ok) {}
-ATF_TEST_CASE_BODY(require_config_one_ok) {
-    atf::tests::vars_map metadata, config;
-    metadata["require.config"] = "var1";
-    config["var1"] = "some-value";
-    do_check("", metadata, config);
-}
-
-ATF_TEST_CASE(require_config_one_fail);
-ATF_TEST_CASE_HEAD(require_config_one_fail) {}
-ATF_TEST_CASE_BODY(require_config_one_fail) {
-    atf::tests::vars_map metadata, config;
-    metadata["require.config"] = "var1";
-    do_check("Required configuration variable 'var1' not defined", metadata,
-             config);
-}
-
-ATF_TEST_CASE(require_config_many_ok);
-ATF_TEST_CASE_HEAD(require_config_many_ok) {}
-ATF_TEST_CASE_BODY(require_config_many_ok) {
-    atf::tests::vars_map metadata, config;
-    metadata["require.config"] = "var1 var2 var3";
-    config["var1"] = "first-value";
-    config["var2"] = "second-value";
-    config["var3"] = "third-value";
-    do_check("", metadata, config);
-}
-
-ATF_TEST_CASE(require_config_many_fail);
-ATF_TEST_CASE_HEAD(require_config_many_fail) {}
-ATF_TEST_CASE_BODY(require_config_many_fail) {
-    atf::tests::vars_map metadata, config;
-    metadata["require.config"] = "var1 var2 var3";
-    config["var1"] = "first-value";
-    config["var3"] = "third-value";
-    do_check("Required configuration variable 'var2' not defined", metadata,
-             config);
-}
-
-// -------------------------------------------------------------------------
-// Tests for the require.files metadata property.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE_WITHOUT_HEAD(require_files_one_ok);
-ATF_TEST_CASE_BODY(require_files_one_ok) {
-    atf::tests::vars_map metadata;
-    metadata["require.files"] = "/bin/ls";
-    do_check("", metadata);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(require_files_one_missing);
-ATF_TEST_CASE_BODY(require_files_one_missing) {
-    atf::tests::vars_map metadata;
-    metadata["require.files"] = "/non-existent/foo";
-    do_check("Required file '/non-existent/foo' not found", metadata);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(require_files_one_fail);
-ATF_TEST_CASE_BODY(require_files_one_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.files"] = "/bin/cp this-is-relative";
-    ATF_REQUIRE_THROW_RE(std::runtime_error, "Relative.*(this-is-relative)",
-                         impl::check_requirements(metadata, no_config));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(require_files_many_ok);
-ATF_TEST_CASE_BODY(require_files_many_ok) {
-    atf::tests::vars_map metadata;
-    metadata["require.files"] = "/bin/ls /bin/cp";
-    do_check("", metadata);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(require_files_many_missing);
-ATF_TEST_CASE_BODY(require_files_many_missing) {
-    atf::tests::vars_map metadata;
-    metadata["require.files"] = "/bin/ls /non-existent/bar /bin/cp";
-    do_check("Required file '/non-existent/bar' not found", metadata);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(require_files_many_fail);
-ATF_TEST_CASE_BODY(require_files_many_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.files"] = "/bin/cp also-relative";
-    ATF_REQUIRE_THROW_RE(std::runtime_error, "Relative.*(also-relative)",
-                         impl::check_requirements(metadata, no_config));
-}
-
-// -------------------------------------------------------------------------
-// Tests for the require.machine metadata property.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE(require_machine_one_ok);
-ATF_TEST_CASE_HEAD(require_machine_one_ok) {}
-ATF_TEST_CASE_BODY(require_machine_one_ok) {
-    atf::tests::vars_map metadata;
-    metadata["require.machine"] = atf::config::get("atf_machine");
-    do_check("", metadata);
-}
-
-ATF_TEST_CASE(require_machine_one_fail);
-ATF_TEST_CASE_HEAD(require_machine_one_fail) {}
-ATF_TEST_CASE_BODY(require_machine_one_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.machine"] = "__fake_machine__";
-    do_check("Requires the '__fake_machine__' machine type", metadata);
-}
-
-ATF_TEST_CASE(require_machine_many_ok);
-ATF_TEST_CASE_HEAD(require_machine_many_ok) {}
-ATF_TEST_CASE_BODY(require_machine_many_ok) {
-    atf::tests::vars_map metadata;
-    metadata["require.machine"] = "__foo__ " + atf::config::get("atf_machine") +
-        " __bar__";
-    do_check("", metadata);
-}
-
-ATF_TEST_CASE(require_machine_many_fail);
-ATF_TEST_CASE_HEAD(require_machine_many_fail) {}
-ATF_TEST_CASE_BODY(require_machine_many_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.machine"] = "__foo__ __bar__ __baz__";
-    do_check("Requires one of the '__foo__ __bar__ __baz__' machine types",
-             metadata);
-}
-
-// -------------------------------------------------------------------------
-// Tests for the require.memory metadata property.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE_WITHOUT_HEAD(require_memory_ok);
-ATF_TEST_CASE_BODY(require_memory_ok) {
-    atf::tests::vars_map metadata;
-    metadata["require.memory"] = "1m";
-    do_check("", metadata);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(require_memory_not_enough);
-ATF_TEST_CASE_BODY(require_memory_not_enough) {
-    atf::tests::vars_map metadata;
-    metadata["require.memory"] = "128t";
-#if defined(__APPLE__) || defined(__DragonFly__) || \
-    defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-    do_check("Not enough memory; needed 140737488355328, available [0-9]*",
-             metadata);
-#else
-    skip("Don't know how to check for the amount of physical memory");
-#endif
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(require_memory_fail);
-ATF_TEST_CASE_BODY(require_memory_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.memory"] = "foo";
-    ATF_REQUIRE_THROW(std::runtime_error,
-                      impl::check_requirements(metadata, no_config));
-}
-
-// -------------------------------------------------------------------------
-// Tests for the require.progs metadata property.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE(require_progs_one_ok);
-ATF_TEST_CASE_HEAD(require_progs_one_ok) {}
-ATF_TEST_CASE_BODY(require_progs_one_ok) {
-    atf::tests::vars_map metadata;
-    metadata["require.progs"] = "cp";
-    do_check("", metadata);
-}
-
-ATF_TEST_CASE(require_progs_one_missing);
-ATF_TEST_CASE_HEAD(require_progs_one_missing) {}
-ATF_TEST_CASE_BODY(require_progs_one_missing) {
-    atf::tests::vars_map metadata;
-    metadata["require.progs"] = "cp __non-existent__";
-    do_check("Required program '__non-existent__' not found in the PATH",
-             metadata);
-}
-
-ATF_TEST_CASE(require_progs_one_fail);
-ATF_TEST_CASE_HEAD(require_progs_one_fail) {}
-ATF_TEST_CASE_BODY(require_progs_one_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.progs"] = "bin/cp";
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    impl::check_requirements(metadata, no_config));
-}
-
-ATF_TEST_CASE(require_progs_many_ok);
-ATF_TEST_CASE_HEAD(require_progs_many_ok) {}
-ATF_TEST_CASE_BODY(require_progs_many_ok) {
-    atf::tests::vars_map metadata;
-    metadata["require.progs"] = "cp ls mv";
-    do_check("", metadata);
-}
-
-ATF_TEST_CASE(require_progs_many_missing);
-ATF_TEST_CASE_HEAD(require_progs_many_missing) {}
-ATF_TEST_CASE_BODY(require_progs_many_missing) {
-    atf::tests::vars_map metadata;
-    metadata["require.progs"] = "mv ls __foo__ cp";
-    do_check("Required program '__foo__' not found in the PATH", metadata);
-}
-
-ATF_TEST_CASE(require_progs_many_fail);
-ATF_TEST_CASE_HEAD(require_progs_many_fail) {}
-ATF_TEST_CASE_BODY(require_progs_many_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.progs"] = "ls cp ../bin/cp";
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    impl::check_requirements(metadata, no_config));
-}
-
-// -------------------------------------------------------------------------
-// Tests for the require.user metadata property.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE(require_user_root);
-ATF_TEST_CASE_HEAD(require_user_root) {}
-ATF_TEST_CASE_BODY(require_user_root) {
-    atf::tests::vars_map metadata;
-    metadata["require.user"] = "root";
-    if (atf::atf_run::is_root())
-        do_check("", metadata);
-    else
-        do_check("Requires root privileges", metadata);
-}
-
-ATF_TEST_CASE(require_user_unprivileged);
-ATF_TEST_CASE_HEAD(require_user_unprivileged) {}
-ATF_TEST_CASE_BODY(require_user_unprivileged) {
-    atf::tests::vars_map metadata;
-    metadata["require.user"] = "unprivileged";
-    if (atf::atf_run::is_root())
-        do_check("Requires an unprivileged user and the 'unprivileged-user' "
-                 "configuration variable is not set", metadata);
-    else
-        do_check("", metadata);
-}
-
-ATF_TEST_CASE(require_user_fail);
-ATF_TEST_CASE_HEAD(require_user_fail) {}
-ATF_TEST_CASE_BODY(require_user_fail) {
-    atf::tests::vars_map metadata;
-    metadata["require.user"] = "nobody";
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    impl::check_requirements(metadata, no_config));
-}
-
-// -------------------------------------------------------------------------
-// Main.
-// -------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    // Add test cases for require.arch.
-    ATF_ADD_TEST_CASE(tcs, require_arch_one_ok);
-    ATF_ADD_TEST_CASE(tcs, require_arch_one_fail);
-    ATF_ADD_TEST_CASE(tcs, require_arch_many_ok);
-    ATF_ADD_TEST_CASE(tcs, require_arch_many_fail);
-
-    // Add test cases for require.config.
-    ATF_ADD_TEST_CASE(tcs, require_config_one_ok);
-    ATF_ADD_TEST_CASE(tcs, require_config_one_fail);
-    ATF_ADD_TEST_CASE(tcs, require_config_many_ok);
-    ATF_ADD_TEST_CASE(tcs, require_config_many_fail);
-
-    // Add test cases for require.files.
-    ATF_ADD_TEST_CASE(tcs, require_files_one_ok);
-    ATF_ADD_TEST_CASE(tcs, require_files_one_missing);
-    ATF_ADD_TEST_CASE(tcs, require_files_one_fail);
-    ATF_ADD_TEST_CASE(tcs, require_files_many_ok);
-    ATF_ADD_TEST_CASE(tcs, require_files_many_missing);
-    ATF_ADD_TEST_CASE(tcs, require_files_many_fail);
-
-    // Add test cases for require.machine.
-    ATF_ADD_TEST_CASE(tcs, require_machine_one_ok);
-    ATF_ADD_TEST_CASE(tcs, require_machine_one_fail);
-    ATF_ADD_TEST_CASE(tcs, require_machine_many_ok);
-    ATF_ADD_TEST_CASE(tcs, require_machine_many_fail);
-
-    // Add test cases for require.memory.
-    ATF_ADD_TEST_CASE(tcs, require_memory_ok);
-    ATF_ADD_TEST_CASE(tcs, require_memory_not_enough);
-    ATF_ADD_TEST_CASE(tcs, require_memory_fail);
-
-    // Add test cases for require.progs.
-    ATF_ADD_TEST_CASE(tcs, require_progs_one_ok);
-    ATF_ADD_TEST_CASE(tcs, require_progs_one_missing);
-    ATF_ADD_TEST_CASE(tcs, require_progs_one_fail);
-    ATF_ADD_TEST_CASE(tcs, require_progs_many_ok);
-    ATF_ADD_TEST_CASE(tcs, require_progs_many_missing);
-    ATF_ADD_TEST_CASE(tcs, require_progs_many_fail);
-
-    // Add test cases for require.user.
-    ATF_ADD_TEST_CASE(tcs, require_user_root);
-    ATF_ADD_TEST_CASE(tcs, require_user_unprivileged);
-    ATF_ADD_TEST_CASE(tcs, require_user_fail);
-}
diff --git a/contrib/atf/atf-run/sample/atf-run.hooks b/contrib/atf/atf-run/sample/atf-run.hooks
deleted file mode 100644
index 86d187d3de3..00000000000
--- a/contrib/atf/atf-run/sample/atf-run.hooks
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Definition of custom hooks for atf-run.
-#
-# Uncomment any hooks that you want to override and add your own code
-# to them.  Some sample calls are included in them.  Be very careful
-# with what you print from here.
-#
-# See atf-run(1) for more details.
-#
-
-#info_start_hook()
-#{
-#    default_info_start_hook "${@}"
-#
-#    atf_tps_writer_info "extra.info" "An example"
-#}
-
-#info_end_hook()
-#{
-#    default_info_end_hook "${@}"
-#
-#    atf_tps_writer_info "extra.info" "An example"
-#}
diff --git a/contrib/atf/atf-run/sample/common.conf b/contrib/atf/atf-run/sample/common.conf
deleted file mode 100644
index 464ee96d09c..00000000000
--- a/contrib/atf/atf-run/sample/common.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-Content-Type: application/X-atf-config; version="1"
-
-#
-# Sample configuration file for properties affecting all test suites.
-#
-
-# When running the test suite as root, some tests require to switch to
-# an unprivileged user to perform extra checks.  Set this variable to
-# the user you want to use in those cases.  If not set, those tests will
-# be skipped.
-#unprivileged-user = "_atf"
diff --git a/contrib/atf/atf-run/several_tcs_helper.c b/contrib/atf/atf-run/several_tcs_helper.c
deleted file mode 100644
index d287c8193a6..00000000000
--- a/contrib/atf/atf-run/several_tcs_helper.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Automated Testing Framework (atf)
- *
- * 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>
-
-ATF_TC(first);
-ATF_TC_HEAD(first, tc)
-{
-    atf_tc_set_md_var(tc, "descr", "Description 1");
-}
-ATF_TC_BODY(first, tc)
-{
-}
-
-ATF_TC_WITH_CLEANUP(second);
-ATF_TC_HEAD(second, tc)
-{
-    atf_tc_set_md_var(tc, "descr", "Description 2");
-    atf_tc_set_md_var(tc, "timeout", "500");
-    atf_tc_set_md_var(tc, "X-property", "Custom property");
-}
-ATF_TC_BODY(second, tc)
-{
-}
-ATF_TC_CLEANUP(second, tc)
-{
-}
-
-ATF_TC_WITHOUT_HEAD(third);
-ATF_TC_BODY(third, tc)
-{
-}
-
-ATF_TP_ADD_TCS(tp)
-{
-    ATF_TP_ADD_TC(tp, first);
-    ATF_TP_ADD_TC(tp, second);
-    ATF_TP_ADD_TC(tp, third);
-
-    return atf_no_error();
-}
diff --git a/contrib/atf/atf-run/share/atf-run.hooks b/contrib/atf/atf-run/share/atf-run.hooks
deleted file mode 100644
index c94f3bcfc9e..00000000000
--- a/contrib/atf/atf-run/share/atf-run.hooks
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-atf_tps_writer_info()
-{
-    class=${1}; shift
-    echo "info: ${class}, $*"
-}
-
-info_start_hook()
-{
-    default_info_start_hook "${@}"
-}
-
-default_info_start_hook()
-{
-    atf_tps_writer_info "atf.version" $(atf-version | head -n 1)
-
-    atf_tps_writer_info "tests.root" $(pwd)
-
-    atf_tps_writer_info "time.start" $(date)
-
-    atf_tps_writer_info "uname.sysname" $(uname -s)
-    atf_tps_writer_info "uname.nodename" $(uname -n)
-    atf_tps_writer_info "uname.release" $(uname -r)
-    atf_tps_writer_info "uname.version" $(uname -v)
-    atf_tps_writer_info "uname.machine" $(uname -m)
-
-    # Add all the environment variables to the report.  We have to be
-    # careful with those that span over multiple lines; otherwise their
-    # values could be printed as multiple different variables (one per
-    # line), which is incorrect.
-    oldifs="${IFS}"
-    IFS='
-'
-    set -- $(env)
-    val=${1}; shift
-    while [ ${#} -gt 0 ]; do
-        if echo "${1}" | grep '^[a-zA-Z0-0_][a-zA-Z0-9_]*=' >/dev/null; then
-            atf_tps_writer_info "env" "${val}"
-            val="${1}"
-        else
-            val="${val} ${1}"
-        fi
-        shift
-    done
-    atf_tps_writer_info "env" "${val}"
-    IFS="${oldifs}"
-}
-
-info_end_hook()
-{
-    default_info_end_hook "${@}"
-}
-
-default_info_end_hook()
-{
-    atf_tps_writer_info "time.end" $(date)
-}
-
-sitehooks=$(atf-config -t atf_confdir)/atf-run.hooks
-userhooks=${HOME}/.atf/atf-run.hooks
-[ -f ${sitehooks} ] && . ${sitehooks}
-[ -f ${userhooks} ] && . ${userhooks}
-
-eval ${1}
-
-# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/atf-run/signals.cpp b/contrib/atf/atf-run/signals.cpp
deleted file mode 100644
index 851c8f02c2c..00000000000
--- a/contrib/atf/atf-run/signals.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if defined(HAVE_CONFIG_H)
-#include "bconfig.h"
-#endif
-
-extern "C" {
-#include <signal.h>
-#include <unistd.h>
-}
-
-#include <cerrno>
-
-#include "atf-c++/detail/exceptions.hpp"
-#include "atf-c++/detail/sanity.hpp"
-
-#include "signals.hpp"
-
-namespace impl = atf::atf_run;
-#define IMPL_NAME "atf::atf_run"
-
-const int impl::last_signo = LAST_SIGNO;
-
-// ------------------------------------------------------------------------
-// The "signal_holder" class.
-// ------------------------------------------------------------------------
-
-namespace {
-
-static bool happened[LAST_SIGNO + 1];
-
-static
-void
-holder_handler(const int signo)
-{
-    happened[signo] = true;
-}
-
-} // anonymous namespace
-
-impl::signal_holder::signal_holder(const int signo) :
-    m_signo(signo),
-    m_sp(NULL)
-{
-    happened[signo] = false;
-    m_sp = new signal_programmer(m_signo, holder_handler);
-}
-
-impl::signal_holder::~signal_holder(void)
-{
-    if (m_sp != NULL)
-        delete m_sp;
-
-    if (happened[m_signo])
-        ::kill(::getpid(), m_signo);
-}
-
-void
-impl::signal_holder::process(void)
-{
-    if (happened[m_signo]) {
-        delete m_sp;
-        m_sp = NULL;
-        happened[m_signo] = false;
-        ::kill(::getpid(), m_signo);
-        m_sp = new signal_programmer(m_signo, holder_handler);
-    }
-}
-
-// ------------------------------------------------------------------------
-// The "signal_programmer" class.
-// ------------------------------------------------------------------------
-
-impl::signal_programmer::signal_programmer(const int signo, const handler h) :
-    m_signo(signo),
-    m_handler(h),
-    m_programmed(false)
-{
-    struct ::sigaction sa;
-
-    sa.sa_handler = m_handler;
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = 0;
-
-    if (::sigaction(m_signo, &sa, &m_oldsa) == -1)
-        throw atf::system_error(IMPL_NAME, "Could not install handler for "
-                                "signal", errno);
-    m_programmed = true;
-}
-
-impl::signal_programmer::~signal_programmer(void)
-{
-    unprogram();
-}
-
-void
-impl::signal_programmer::unprogram(void)
-{
-    if (m_programmed) {
-        if (::sigaction(m_signo, &m_oldsa, NULL) == -1)
-            UNREACHABLE;
-        m_programmed = false;
-    }
-}
-
-// ------------------------------------------------------------------------
-// Free functions.
-// ------------------------------------------------------------------------
-
-void
-impl::reset(const int signo)
-{
-    struct ::sigaction sa;
-
-    sa.sa_handler = SIG_DFL;
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = 0;
-
-    (void)::sigaction(signo, &sa, NULL);
-}
diff --git a/contrib/atf/atf-run/signals.hpp b/contrib/atf/atf-run/signals.hpp
deleted file mode 100644
index 8765ac9ec56..00000000000
--- a/contrib/atf/atf-run/signals.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if !defined(_ATF_RUN_SIGNALS_HPP_)
-#define _ATF_RUN_SIGNALS_HPP_
-
-extern "C" {
-#include <signal.h>
-}
-
-namespace atf {
-namespace atf_run {
-
-extern const int last_signo;
-typedef void (*handler)(const int);
-
-class signal_programmer;
-
-// ------------------------------------------------------------------------
-// The "signal_holder" class.
-// ------------------------------------------------------------------------
-
-//
-// A RAII model to hold a signal while the object is alive.
-//
-class signal_holder {
-    const int m_signo;
-    signal_programmer* m_sp;
-
-public:
-    signal_holder(const int);
-    ~signal_holder(void);
-
-    void process(void);
-};
-
-// ------------------------------------------------------------------------
-// The "signal_programmer" class.
-// ------------------------------------------------------------------------
-
-//
-// A RAII model to program a signal while the object is alive.
-//
-class signal_programmer {
-    const int m_signo;
-    const handler m_handler;
-    bool m_programmed;
-    struct sigaction m_oldsa;
-
-public:
-    signal_programmer(const int, const handler);
-    ~signal_programmer(void);
-
-    void unprogram(void);
-};
-
-// ------------------------------------------------------------------------
-// Free functions.
-// ------------------------------------------------------------------------
-
-void reset(const int);
-
-} // namespace atf_run
-} // namespace atf
-
-#endif // !defined(_ATF_RUN_SIGNALS_HPP_)
diff --git a/contrib/atf/atf-run/signals_test.cpp b/contrib/atf/atf-run/signals_test.cpp
deleted file mode 100644
index 358c8a8ab59..00000000000
--- a/contrib/atf/atf-run/signals_test.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/types.h>
-#include <signal.h>
-#include <unistd.h>
-}
-
-#include <cerrno>
-#include <cstdlib>
-#include <iostream>
-
-#include "atf-c/defs.h"
-
-#include "atf-c++/macros.hpp"
-
-#include "atf-c++/detail/exceptions.hpp"
-#include "atf-c++/detail/process.hpp"
-
-#include "signals.hpp"
-
-// ------------------------------------------------------------------------
-// Auxiliary functions.
-// ------------------------------------------------------------------------
-
-namespace sigusr1 {
-    static bool happened = false;
-
-    static
-    void
-    handler(int signo ATF_DEFS_ATTRIBUTE_UNUSED)
-    {
-        happened = true;
-    }
-
-    static
-    void
-    program(void)
-    {
-        struct sigaction sa;
-        sa.sa_handler = handler;
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags = 0;
-        if (::sigaction(SIGUSR1, &sa, NULL) == -1)
-            throw atf::system_error("sigusr1::program",
-                                    "sigaction(2) failed", errno);
-    }
-} // namespace sigusr1
-
-namespace sigusr1_2 {
-    static bool happened = false;
-
-    static
-    void
-    handler(int signo ATF_DEFS_ATTRIBUTE_UNUSED)
-    {
-        happened = true;
-    }
-} // namespace sigusr1_2
-
-// ------------------------------------------------------------------------
-// Tests for the "signal_holder" class.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(signal_holder_preserve);
-ATF_TEST_CASE_HEAD(signal_holder_preserve)
-{
-    set_md_var("descr", "Tests that signal_holder preserves the original "
-               "signal handler and restores it upon destruction");
-}
-ATF_TEST_CASE_BODY(signal_holder_preserve)
-{
-    using atf::atf_run::signal_holder;
-
-    sigusr1::program();
-
-    sigusr1::happened = false;
-    ::kill(::getpid(), SIGUSR1);
-    ATF_REQUIRE(sigusr1::happened);
-
-    {
-        signal_holder hld(SIGUSR1);
-        ::kill(::getpid(), SIGUSR1);
-    }
-
-    sigusr1::happened = false;
-    ::kill(::getpid(), SIGUSR1);
-    ATF_REQUIRE(sigusr1::happened);
-}
-
-ATF_TEST_CASE(signal_holder_destructor);
-ATF_TEST_CASE_HEAD(signal_holder_destructor)
-{
-    set_md_var("descr", "Tests that signal_holder processes a pending "
-               "signal upon destruction");
-}
-ATF_TEST_CASE_BODY(signal_holder_destructor)
-{
-    using atf::atf_run::signal_holder;
-
-    sigusr1::program();
-
-    sigusr1::happened = false;
-    ::kill(::getpid(), SIGUSR1);
-    ATF_REQUIRE(sigusr1::happened);
-
-    {
-        signal_holder hld(SIGUSR1);
-
-        sigusr1::happened = false;
-        ::kill(::getpid(), SIGUSR1);
-        ATF_REQUIRE(!sigusr1::happened);
-    }
-    ATF_REQUIRE(sigusr1::happened);
-}
-
-ATF_TEST_CASE(signal_holder_process);
-ATF_TEST_CASE_HEAD(signal_holder_process)
-{
-    set_md_var("descr", "Tests that signal_holder's process method works "
-               "to process a delayed signal explicitly");
-}
-ATF_TEST_CASE_BODY(signal_holder_process)
-{
-    using atf::atf_run::signal_holder;
-
-    sigusr1::program();
-
-    sigusr1::happened = false;
-    ::kill(::getpid(), SIGUSR1);
-    ATF_REQUIRE(sigusr1::happened);
-
-    {
-        signal_holder hld(SIGUSR1);
-
-        sigusr1::happened = false;
-        ::kill(::getpid(), SIGUSR1);
-        ATF_REQUIRE(!sigusr1::happened);
-
-        hld.process();
-        ATF_REQUIRE(sigusr1::happened);
-
-        sigusr1::happened = false;
-    }
-    ATF_REQUIRE(!sigusr1::happened);
-}
-
-// ------------------------------------------------------------------------
-// Tests for the "signal_programmer" class.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(signal_programmer_program);
-ATF_TEST_CASE_HEAD(signal_programmer_program)
-{
-    set_md_var("descr", "Tests that signal_programmer correctly installs a "
-               "handler");
-}
-ATF_TEST_CASE_BODY(signal_programmer_program)
-{
-    using atf::atf_run::signal_programmer;
-
-    signal_programmer sp(SIGUSR1, sigusr1_2::handler);
-
-    sigusr1_2::happened = false;
-    ::kill(::getpid(), SIGUSR1);
-    ATF_REQUIRE(sigusr1_2::happened);
-}
-
-ATF_TEST_CASE(signal_programmer_preserve);
-ATF_TEST_CASE_HEAD(signal_programmer_preserve)
-{
-    set_md_var("descr", "Tests that signal_programmer uninstalls the "
-               "handler during destruction");
-}
-ATF_TEST_CASE_BODY(signal_programmer_preserve)
-{
-    using atf::atf_run::signal_programmer;
-
-    sigusr1::program();
-    sigusr1::happened = false;
-
-    {
-        signal_programmer sp(SIGUSR1, sigusr1_2::handler);
-
-        sigusr1_2::happened = false;
-        ::kill(::getpid(), SIGUSR1);
-        ATF_REQUIRE(sigusr1_2::happened);
-    }
-
-    ATF_REQUIRE(!sigusr1::happened);
-    ::kill(::getpid(), SIGUSR1);
-    ATF_REQUIRE(sigusr1::happened);
-}
-
-// ------------------------------------------------------------------------
-// Tests cases for the free functions.
-// ------------------------------------------------------------------------
-
-static
-void
-reset_child(void *v ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-    sigusr1::program();
-
-    sigusr1::happened = false;
-    atf::atf_run::reset(SIGUSR1);
-    kill(::getpid(), SIGUSR1);
-
-    if (sigusr1::happened) {
-        std::cerr << "Signal was not resetted correctly\n";
-        std::abort();
-    } else {
-        std::exit(EXIT_SUCCESS);
-    }
-}
-
-ATF_TEST_CASE(reset);
-ATF_TEST_CASE_HEAD(reset)
-{
-    set_md_var("descr", "Tests the reset function");
-}
-ATF_TEST_CASE_BODY(reset)
-{
-    atf::process::child c =
-        atf::process::fork(reset_child, atf::process::stream_inherit(),
-                           atf::process::stream_inherit(), NULL);
-
-    const atf::process::status s = c.wait();
-    ATF_REQUIRE(s.exited() || s.signaled());
-    ATF_REQUIRE(!s.signaled() || s.termsig() == SIGUSR1);
-}
-
-// ------------------------------------------------------------------------
-// Main.
-// ------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    // Add the tests for the "signal_holder" class.
-    ATF_ADD_TEST_CASE(tcs, signal_holder_preserve);
-    ATF_ADD_TEST_CASE(tcs, signal_holder_destructor);
-    ATF_ADD_TEST_CASE(tcs, signal_holder_process);
-
-    // Add the tests for the "signal_programmer" class.
-    ATF_ADD_TEST_CASE(tcs, signal_programmer_program);
-    ATF_ADD_TEST_CASE(tcs, signal_programmer_preserve);
-
-    // Add the test cases for the free functions.
-    ATF_ADD_TEST_CASE(tcs, reset);
-}
diff --git a/contrib/atf/atf-run/test-program.cpp b/contrib/atf/atf-run/test-program.cpp
deleted file mode 100644
index 14647c2f78f..00000000000
--- a/contrib/atf/atf-run/test-program.cpp
+++ /dev/null
@@ -1,790 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <fcntl.h>
-#include <signal.h>
-#include <unistd.h>
-}
-
-#include <cerrno>
-#include <cstdlib>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-
-#include "atf-c/defs.h"
-
-#include "atf-c++/detail/env.hpp"
-#include "atf-c++/detail/parser.hpp"
-#include "atf-c++/detail/process.hpp"
-#include "atf-c++/detail/sanity.hpp"
-#include "atf-c++/detail/text.hpp"
-
-#include "config.hpp"
-#include "fs.hpp"
-#include "io.hpp"
-#include "requirements.hpp"
-#include "signals.hpp"
-#include "test-program.hpp"
-#include "timer.hpp"
-#include "user.hpp"
-
-namespace impl = atf::atf_run;
-namespace detail = atf::atf_run::detail;
-
-namespace {
-
-static void
-check_stream(std::ostream& os)
-{
-    // If we receive a signal while writing to the stream, the bad bit gets set.
-    // Things seem to behave fine afterwards if we clear such error condition.
-    // However, I'm not sure if it's safe to query errno at this point.
-    if (os.bad()) {
-        if (errno == EINTR)
-            os.clear();
-        else
-            throw std::runtime_error("Failed");
-    }
-}
-
-namespace atf_tp {
-
-static const atf::parser::token_type eof_type = 0;
-static const atf::parser::token_type nl_type = 1;
-static const atf::parser::token_type text_type = 2;
-static const atf::parser::token_type colon_type = 3;
-static const atf::parser::token_type dblquote_type = 4;
-
-class tokenizer : public atf::parser::tokenizer< std::istream > {
-public:
-    tokenizer(std::istream& is, size_t curline) :
-        atf::parser::tokenizer< std::istream >
-            (is, true, eof_type, nl_type, text_type, curline)
-    {
-        add_delim(':', colon_type);
-        add_quote('"', dblquote_type);
-    }
-};
-
-} // namespace atf_tp
-
-class metadata_reader : public detail::atf_tp_reader {
-    impl::test_cases_map m_tcs;
-
-    void got_tc(const std::string& ident, const atf::tests::vars_map& props)
-    {
-        if (m_tcs.find(ident) != m_tcs.end())
-            throw(std::runtime_error("Duplicate test case " + ident +
-                                     " in test program"));
-        m_tcs[ident] = props;
-
-        if (m_tcs[ident].find("has.cleanup") == m_tcs[ident].end())
-            m_tcs[ident].insert(std::make_pair("has.cleanup", "false"));
-
-        if (m_tcs[ident].find("timeout") == m_tcs[ident].end())
-            m_tcs[ident].insert(std::make_pair("timeout", "300"));
-    }
-
-public:
-    metadata_reader(std::istream& is) :
-        detail::atf_tp_reader(is)
-    {
-    }
-
-    const impl::test_cases_map&
-    get_tcs(void)
-        const
-    {
-        return m_tcs;
-    }
-};
-
-struct get_metadata_params {
-    const atf::fs::path& executable;
-    const atf::tests::vars_map& config;
-
-    get_metadata_params(const atf::fs::path& p_executable,
-                        const atf::tests::vars_map& p_config) :
-        executable(p_executable),
-        config(p_config)
-    {
-    }
-};
-
-struct test_case_params {
-    const atf::fs::path& executable;
-    const std::string& test_case_name;
-    const std::string& test_case_part;
-    const atf::tests::vars_map& metadata;
-    const atf::tests::vars_map& config;
-    const atf::fs::path& resfile;
-    const atf::fs::path& workdir;
-
-    test_case_params(const atf::fs::path& p_executable,
-                     const std::string& p_test_case_name,
-                     const std::string& p_test_case_part,
-                     const atf::tests::vars_map& p_metadata,
-                     const atf::tests::vars_map& p_config,
-                     const atf::fs::path& p_resfile,
-                     const atf::fs::path& p_workdir) :
-        executable(p_executable),
-        test_case_name(p_test_case_name),
-        test_case_part(p_test_case_part),
-        metadata(p_metadata),
-        config(p_config),
-        resfile(p_resfile),
-        workdir(p_workdir)
-    {
-    }
-};
-
-static
-std::string
-generate_timestamp(void)
-{
-    struct timeval tv;
-    if (gettimeofday(&tv, NULL) == -1)
-        return "0.0";
-
-    char buf[32];
-    const int len = snprintf(buf, sizeof(buf), "%ld.%ld",
-                             static_cast< long >(tv.tv_sec),
-                             static_cast< long >(tv.tv_usec));
-    if (len >= static_cast< int >(sizeof(buf)) || len < 0)
-        return "0.0";
-    else
-        return buf;
-}
-
-static
-void
-append_to_vector(std::vector< std::string >& v1,
-                 const std::vector< std::string >& v2)
-{
-    std::copy(v2.begin(), v2.end(),
-              std::back_insert_iterator< std::vector< std::string > >(v1));
-}
-
-static
-char**
-vector_to_argv(const std::vector< std::string >& v)
-{
-    char** argv = new char*[v.size() + 1];
-    for (std::vector< std::string >::size_type i = 0; i < v.size(); i++) {
-        argv[i] = strdup(v[i].c_str());
-    }
-    argv[v.size()] = NULL;
-    return argv;
-}
-
-static
-void
-exec_or_exit(const atf::fs::path& executable,
-             const std::vector< std::string >& argv)
-{
-    // This leaks memory in case of a failure, but it is OK.  Exiting will
-    // do the necessary cleanup.
-    char* const* native_argv = vector_to_argv(argv);
-
-    ::execv(executable.c_str(), native_argv);
-
-    const std::string message = "Failed to execute '" + executable.str() +
-        "': " + std::strerror(errno) + "\n";
-    if (::write(STDERR_FILENO, message.c_str(), message.length()) == -1)
-        std::abort();
-    std::exit(EXIT_FAILURE);
-}
-
-static
-std::vector< std::string >
-config_to_args(const atf::tests::vars_map& config)
-{
-    std::vector< std::string > args;
-
-    for (atf::tests::vars_map::const_iterator iter = config.begin();
-         iter != config.end(); iter++)
-        args.push_back("-v" + (*iter).first + "=" + (*iter).second);
-
-    return args;
-}
-
-static
-void
-silence_stdin(void)
-{
-    ::close(STDIN_FILENO);
-    int fd = ::open("/dev/null", O_RDONLY);
-    if (fd == -1)
-        throw std::runtime_error("Could not open /dev/null");
-    INV(fd == STDIN_FILENO);
-}
-
-static
-void
-prepare_child(const atf::fs::path& workdir)
-{
-    const int ret = ::setpgid(::getpid(), 0);
-    INV(ret != -1);
-
-    ::umask(S_IWGRP | S_IWOTH);
-
-    for (int i = 1; i <= impl::last_signo; i++)
-        impl::reset(i);
-
-    atf::env::set("HOME", workdir.str());
-    atf::env::unset("LANG");
-    atf::env::unset("LC_ALL");
-    atf::env::unset("LC_COLLATE");
-    atf::env::unset("LC_CTYPE");
-    atf::env::unset("LC_MESSAGES");
-    atf::env::unset("LC_MONETARY");
-    atf::env::unset("LC_NUMERIC");
-    atf::env::unset("LC_TIME");
-    atf::env::set("TZ", "UTC");
-
-    atf::env::set("__RUNNING_INSIDE_ATF_RUN", "internal-yes-value");
-
-    impl::change_directory(workdir);
-
-    silence_stdin();
-}
-
-static
-void
-get_metadata_child(void* raw_params)
-{
-    const get_metadata_params* params =
-        static_cast< const get_metadata_params* >(raw_params);
-
-    std::vector< std::string > argv;
-    argv.push_back(params->executable.leaf_name());
-    argv.push_back("-l");
-    argv.push_back("-s" + params->executable.branch_path().str());
-    append_to_vector(argv, config_to_args(params->config));
-
-    exec_or_exit(params->executable, argv);
-}
-
-void
-run_test_case_child(void* raw_params)
-{
-    const test_case_params* params =
-        static_cast< const test_case_params* >(raw_params);
-
-    const std::pair< int, int > user = impl::get_required_user(
-        params->metadata, params->config);
-    if (user.first != -1 && user.second != -1)
-        impl::drop_privileges(user);
-
-    // The input 'tp' parameter may be relative and become invalid once
-    // we change the current working directory.
-    const atf::fs::path absolute_executable = params->executable.to_absolute();
-
-    // Prepare the test program's arguments.  We use dynamic memory and
-    // do not care to release it.  We are going to die anyway very soon,
-    // either due to exec(2) or to exit(3).
-    std::vector< std::string > argv;
-    argv.push_back(absolute_executable.leaf_name());
-    argv.push_back("-r" + params->resfile.str());
-    argv.push_back("-s" + absolute_executable.branch_path().str());
-    append_to_vector(argv, config_to_args(params->config));
-    argv.push_back(params->test_case_name + ":" + params->test_case_part);
-
-    prepare_child(params->workdir);
-    exec_or_exit(absolute_executable, argv);
-}
-
-static void
-tokenize_result(const std::string& line, std::string& out_state,
-                std::string& out_arg, std::string& out_reason)
-{
-    const std::string::size_type pos = line.find_first_of(":(");
-    if (pos == std::string::npos) {
-        out_state = line;
-        out_arg = "";
-        out_reason = "";
-    } else if (line[pos] == ':') {
-        out_state = line.substr(0, pos);
-        out_arg = "";
-        out_reason = atf::text::trim(line.substr(pos + 1));
-    } else if (line[pos] == '(') {
-        const std::string::size_type pos2 = line.find("):", pos);
-        if (pos2 == std::string::npos)
-            throw std::runtime_error("Invalid test case result '" + line +
-                "': unclosed optional argument");
-        out_state = line.substr(0, pos);
-        out_arg = line.substr(pos + 1, pos2 - pos - 1);
-        out_reason = atf::text::trim(line.substr(pos2 + 2));
-    } else
-        UNREACHABLE;
-}
-
-static impl::test_case_result
-handle_result(const std::string& state, const std::string& arg,
-              const std::string& reason)
-{
-    PRE(state == "passed");
-
-    if (!arg.empty() || !reason.empty())
-        throw std::runtime_error("The test case result '" + state + "' cannot "
-            "be accompanied by a reason nor an expected value");
-
-    return impl::test_case_result(state, -1, reason);
-}
-
-static impl::test_case_result
-handle_result_with_reason(const std::string& state, const std::string& arg,
-                          const std::string& reason)
-{
-    PRE(state == "expected_death" || state == "expected_failure" ||
-        state == "expected_timeout" || state == "failed" || state == "skipped");
-
-    if (!arg.empty() || reason.empty())
-        throw std::runtime_error("The test case result '" + state + "' must "
-            "be accompanied by a reason but not by an expected value");
-
-    return impl::test_case_result(state, -1, reason);
-}
-
-static impl::test_case_result
-handle_result_with_reason_and_arg(const std::string& state,
-                                  const std::string& arg,
-                                  const std::string& reason)
-{
-    PRE(state == "expected_exit" || state == "expected_signal");
-
-    if (reason.empty())
-        throw std::runtime_error("The test case result '" + state + "' must "
-            "be accompanied by a reason");
-
-    int value;
-    if (arg.empty()) {
-        value = -1;
-    } else {
-        try {
-            value = atf::text::to_type< int >(arg);
-        } catch (const std::runtime_error&) {
-            throw std::runtime_error("The value '" + arg + "' passed to the '" +
-                state + "' state must be an integer");
-        }
-    }
-
-    return impl::test_case_result(state, value, reason);
-}
-
-} // anonymous namespace
-
-detail::atf_tp_reader::atf_tp_reader(std::istream& is) :
-    m_is(is)
-{
-}
-
-detail::atf_tp_reader::~atf_tp_reader(void)
-{
-}
-
-void
-detail::atf_tp_reader::got_tc(
-    const std::string& ident ATF_DEFS_ATTRIBUTE_UNUSED,
-    const std::map< std::string, std::string >& md ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-}
-
-void
-detail::atf_tp_reader::got_eof(void)
-{
-}
-
-void
-detail::atf_tp_reader::validate_and_insert(const std::string& name,
-    const std::string& value, const size_t lineno,
-    std::map< std::string, std::string >& md)
-{
-    using atf::parser::parse_error;
-
-    if (value.empty())
-        throw parse_error(lineno, "The value for '" + name +"' cannot be "
-                          "empty");
-
-    const std::string ident_regex = "^[_A-Za-z0-9]+$";
-    const std::string integer_regex = "^[0-9]+$";
-
-    if (name == "descr") {
-        // Any non-empty value is valid.
-    } else if (name == "has.cleanup") {
-        try {
-            (void)atf::text::to_bool(value);
-        } catch (const std::runtime_error&) {
-            throw parse_error(lineno, "The has.cleanup property requires a"
-                              " boolean value");
-        }
-    } else if (name == "ident") {
-        if (!atf::text::match(value, ident_regex))
-            throw parse_error(lineno, "The identifier must match " +
-                              ident_regex + "; was '" + value + "'");
-    } else if (name == "require.arch") {
-    } else if (name == "require.config") {
-    } else if (name == "require.files") {
-    } else if (name == "require.machine") {
-    } else if (name == "require.memory") {
-        try {
-            (void)atf::text::to_bytes(value);
-        } catch (const std::runtime_error&) {
-            throw parse_error(lineno, "The require.memory property requires an "
-                              "integer value representing an amount of bytes");
-        }
-    } else if (name == "require.progs") {
-    } else if (name == "require.user") {
-    } else if (name == "timeout") {
-        if (!atf::text::match(value, integer_regex))
-            throw parse_error(lineno, "The timeout property requires an integer"
-                              " value");
-    } else if (name == "use.fs") {
-        // Deprecated; ignore it.
-    } else if (name.size() > 2 && name[0] == 'X' && name[1] == '-') {
-        // Any non-empty value is valid.
-    } else {
-        throw parse_error(lineno, "Unknown property '" + name + "'");
-    }
-
-    md.insert(std::make_pair(name, value));
-}
-
-void
-detail::atf_tp_reader::read(void)
-{
-    using atf::parser::parse_error;
-    using namespace atf_tp;
-
-    std::pair< size_t, atf::parser::headers_map > hml =
-        atf::parser::read_headers(m_is, 1);
-    atf::parser::validate_content_type(hml.second,
-        "application/X-atf-tp", 1);
-
-    tokenizer tkz(m_is, hml.first);
-    atf::parser::parser< tokenizer > p(tkz);
-
-    try {
-        atf::parser::token t = p.expect(text_type, "property name");
-        if (t.text() != "ident")
-            throw parse_error(t.lineno(), "First property of a test case "
-                              "must be 'ident'");
-
-        std::map< std::string, std::string > props;
-        do {
-            const std::string name = t.text();
-            t = p.expect(colon_type, "`:'");
-            const std::string value = atf::text::trim(p.rest_of_line());
-            t = p.expect(nl_type, "new line");
-            validate_and_insert(name, value, t.lineno(), props);
-
-            t = p.expect(eof_type, nl_type, text_type, "property name, new "
-                         "line or eof");
-            if (t.type() == nl_type || t.type() == eof_type) {
-                const std::map< std::string, std::string >::const_iterator
-                    iter = props.find("ident");
-                if (iter == props.end())
-                    throw parse_error(t.lineno(), "Test case definition did "
-                                      "not define an 'ident' property");
-                ATF_PARSER_CALLBACK(p, got_tc((*iter).second, props));
-                props.clear();
-
-                if (t.type() == nl_type) {
-                    t = p.expect(text_type, "property name");
-                    if (t.text() != "ident")
-                        throw parse_error(t.lineno(), "First property of a "
-                                          "test case must be 'ident'");
-                }
-            }
-        } while (t.type() != eof_type);
-        ATF_PARSER_CALLBACK(p, got_eof());
-    } catch (const parse_error& pe) {
-        p.add_error(pe);
-        p.reset(nl_type);
-    }
-}
-
-impl::test_case_result
-detail::parse_test_case_result(const std::string& line)
-{
-    std::string state, arg, reason;
-    tokenize_result(line, state, arg, reason);
-
-    if (state == "expected_death")
-        return handle_result_with_reason(state, arg, reason);
-    else if (state.compare(0, 13, "expected_exit") == 0)
-        return handle_result_with_reason_and_arg(state, arg, reason);
-    else if (state.compare(0, 16, "expected_failure") == 0)
-        return handle_result_with_reason(state, arg, reason);
-    else if (state.compare(0, 15, "expected_signal") == 0)
-        return handle_result_with_reason_and_arg(state, arg, reason);
-    else if (state.compare(0, 16, "expected_timeout") == 0)
-        return handle_result_with_reason(state, arg, reason);
-    else if (state == "failed")
-        return handle_result_with_reason(state, arg, reason);
-    else if (state == "passed")
-        return handle_result(state, arg, reason);
-    else if (state == "skipped")
-        return handle_result_with_reason(state, arg, reason);
-    else
-        throw std::runtime_error("Unknown test case result type in: " + line);
-}
-
-impl::atf_tps_writer::atf_tps_writer(std::ostream& os) :
-    m_os(os)
-{
-    atf::parser::headers_map hm;
-    atf::parser::attrs_map ct_attrs;
-    ct_attrs["version"] = "3";
-    hm["Content-Type"] =
-        atf::parser::header_entry("Content-Type", "application/X-atf-tps",
-                                  ct_attrs);
-    atf::parser::write_headers(hm, m_os);
-}
-
-void
-impl::atf_tps_writer::info(const std::string& what, const std::string& val)
-{
-    m_os << "info: " << what << ", " << val << "\n";
-    m_os.flush();
-}
-
-void
-impl::atf_tps_writer::ntps(size_t p_ntps)
-{
-    m_os << "tps-count: " << p_ntps << "\n";
-    m_os.flush();
-}
-
-void
-impl::atf_tps_writer::start_tp(const std::string& tp, size_t ntcs)
-{
-    m_tpname = tp;
-    m_os << "tp-start: " << generate_timestamp() << ", " << tp << ", "
-         << ntcs << "\n";
-    m_os.flush();
-}
-
-void
-impl::atf_tps_writer::end_tp(const std::string& reason)
-{
-    PRE(reason.find('\n') == std::string::npos);
-    if (reason.empty())
-        m_os << "tp-end: " << generate_timestamp() << ", " << m_tpname << "\n";
-    else
-        m_os << "tp-end: " << generate_timestamp() << ", " << m_tpname
-             << ", " << reason << "\n";
-    m_os.flush();
-}
-
-void
-impl::atf_tps_writer::start_tc(const std::string& tcname)
-{
-    m_tcname = tcname;
-    m_os << "tc-start: " << generate_timestamp() << ", " << tcname << "\n";
-    m_os.flush();
-}
-
-void
-impl::atf_tps_writer::stdout_tc(const std::string& line)
-{
-    m_os << "tc-so:" << line << "\n";
-    check_stream(m_os);
-    m_os.flush();
-    check_stream(m_os);
-}
-
-void
-impl::atf_tps_writer::stderr_tc(const std::string& line)
-{
-    m_os << "tc-se:" << line << "\n";
-    check_stream(m_os);
-    m_os.flush();
-    check_stream(m_os);
-}
-
-void
-impl::atf_tps_writer::end_tc(const std::string& state,
-                             const std::string& reason)
-{
-    std::string str =  ", " + m_tcname + ", " + state;
-    if (!reason.empty())
-        str += ", " + reason;
-    m_os << "tc-end: " << generate_timestamp() << str << "\n";
-    m_os.flush();
-}
-
-impl::metadata
-impl::get_metadata(const atf::fs::path& executable,
-                   const atf::tests::vars_map& config)
-{
-    get_metadata_params params(executable, config);
-    atf::process::child child =
-        atf::process::fork(get_metadata_child,
-                           atf::process::stream_capture(),
-                           atf::process::stream_inherit(),
-                           static_cast< void * >(&params));
-
-    impl::pistream outin(child.stdout_fd());
-
-    metadata_reader parser(outin);
-    parser.read();
-
-    const atf::process::status status = child.wait();
-    if (!status.exited() || status.exitstatus() != EXIT_SUCCESS)
-        throw atf::parser::format_error("Test program returned failure "
-                                        "exit status for test case list");
-
-    return metadata(parser.get_tcs());
-}
-
-impl::test_case_result
-impl::read_test_case_result(const atf::fs::path& results_path)
-{
-    std::ifstream results_file(results_path.c_str());
-    if (!results_file)
-        throw std::runtime_error("Failed to open " + results_path.str());
-
-    std::string line, extra_line;
-    std::getline(results_file, line);
-    if (!results_file.good())
-        throw std::runtime_error("Results file is empty");
-
-    while (std::getline(results_file, extra_line).good())
-        line += "<<NEWLINE UNEXPECTED>>" + extra_line;
-
-    results_file.close();
-
-    return detail::parse_test_case_result(line);
-}
-
-namespace {
-
-static volatile bool terminate_poll;
-
-static void
-sigchld_handler(const int signo ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-    terminate_poll = true;
-}
-
-class child_muxer : public impl::muxer {
-    impl::atf_tps_writer& m_writer;
-
-    void
-    line_callback(const size_t index, const std::string& line)
-    {
-        switch (index) {
-        case 0: m_writer.stdout_tc(line); break;
-        case 1: m_writer.stderr_tc(line); break;
-        default: UNREACHABLE;
-        }
-    }
-
-public:
-    child_muxer(const int* fds, const size_t nfds,
-                impl::atf_tps_writer& writer) :
-        muxer(fds, nfds),
-        m_writer(writer)
-    {
-    }
-};
-
-} // anonymous namespace
-
-std::pair< std::string, atf::process::status >
-impl::run_test_case(const atf::fs::path& executable,
-                    const std::string& test_case_name,
-                    const std::string& test_case_part,
-                    const atf::tests::vars_map& metadata,
-                    const atf::tests::vars_map& config,
-                    const atf::fs::path& resfile,
-                    const atf::fs::path& workdir,
-                    atf_tps_writer& writer)
-{
-    // TODO: Capture termination signals and deliver them to the subprocess
-    // instead.  Or maybe do something else; think about it.
-
-    test_case_params params(executable, test_case_name, test_case_part,
-                            metadata, config, resfile, workdir);
-    atf::process::child child =
-        atf::process::fork(run_test_case_child,
-                           atf::process::stream_capture(),
-                           atf::process::stream_capture(),
-                           static_cast< void * >(&params));
-
-    terminate_poll = false;
-
-    const atf::tests::vars_map::const_iterator iter = metadata.find("timeout");
-    INV(iter != metadata.end());
-    const unsigned int timeout =
-        atf::text::to_type< unsigned int >((*iter).second);
-    const pid_t child_pid = child.pid();
-
-    // Get the input stream of stdout and stderr.
-    impl::file_handle outfh = child.stdout_fd();
-    impl::file_handle errfh = child.stderr_fd();
-
-    bool timed_out = false;
-
-    // Process the test case's output and multiplex it into our output
-    // stream as we read it.
-    int fds[2] = {outfh.get(), errfh.get()};
-    child_muxer mux(fds, 2, writer);
-    try {
-        child_timer timeout_timer(timeout, child_pid, terminate_poll);
-        signal_programmer sigchld(SIGCHLD, sigchld_handler);
-        mux.mux(terminate_poll);
-        timed_out = timeout_timer.fired();
-    } catch (...) {
-        UNREACHABLE;
-    }
-
-    ::killpg(child_pid, SIGKILL);
-    mux.flush();
-    atf::process::status status = child.wait();
-
-    std::string reason;
-
-    if (timed_out) {
-        // Don't assume the child process has been signaled due to the timeout
-        // expiration as older versions did.  The child process may have exited
-        // but we may have timed out due to a subchild process getting stuck.
-        reason = "Test case timed out after " + atf::text::to_string(timeout) +
-            " " + (timeout == 1 ? "second" : "seconds");
-    }
-
-    return std::make_pair(reason, status);
-}
diff --git a/contrib/atf/atf-run/test-program.hpp b/contrib/atf/atf-run/test-program.hpp
deleted file mode 100644
index daba3ce01f0..00000000000
--- a/contrib/atf/atf-run/test-program.hpp
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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 <map>
-
-#include "atf-c++/tests.hpp"
-
-#include "atf-c++/detail/fs.hpp"
-#include "atf-c++/detail/process.hpp"
-
-namespace atf {
-namespace atf_run {
-
-struct test_case_result {
-    std::string m_state;
-    int m_value;
-    std::string m_reason;
-
-public:
-    test_case_result(void) :
-        m_state("UNINITIALIZED"),
-        m_value(-1),
-        m_reason("")
-    {
-    }
-
-    test_case_result(const std::string& p_state, const int p_value,
-                     const std::string& p_reason) :
-        m_state(p_state),
-        m_value(p_value),
-        m_reason(p_reason)
-    {
-    }
-
-    const std::string&
-    state(void) const
-    {
-        return m_state;
-    }
-
-    int
-    value(void) const
-    {
-        return m_value;
-    }
-
-    const std::string&
-    reason(void) const
-    {
-        return m_reason;
-    }
-};
-
-namespace detail {
-
-class atf_tp_reader {
-    std::istream& m_is;
-
-    void validate_and_insert(const std::string&, const std::string&,
-                             const size_t,
-                             std::map< std::string, std::string >&);
-
-protected:
-    virtual void got_tc(const std::string&,
-                        const std::map< std::string, std::string >&);
-    virtual void got_eof(void);
-
-public:
-    atf_tp_reader(std::istream&);
-    virtual ~atf_tp_reader(void);
-
-    void read(void);
-};
-
-test_case_result parse_test_case_result(const std::string&);
-
-} // namespace detail
-
-class atf_tps_writer {
-    std::ostream& m_os;
-
-    std::string m_tpname, m_tcname;
-
-public:
-    atf_tps_writer(std::ostream&);
-
-    void info(const std::string&, const std::string&);
-    void ntps(size_t);
-
-    void start_tp(const std::string&, size_t);
-    void end_tp(const std::string&);
-
-    void start_tc(const std::string&);
-    void stdout_tc(const std::string&);
-    void stderr_tc(const std::string&);
-    void end_tc(const std::string&, const std::string&);
-};
-
-typedef std::map< std::string, atf::tests::vars_map > test_cases_map;
-
-struct metadata {
-    test_cases_map test_cases;
-
-    metadata(void)
-    {
-    }
-
-    metadata(const test_cases_map& p_test_cases) :
-        test_cases(p_test_cases)
-    {
-    }
-};
-
-class atf_tps_writer;
-
-metadata get_metadata(const atf::fs::path&, const atf::tests::vars_map&);
-test_case_result read_test_case_result(const atf::fs::path&);
-std::pair< std::string, atf::process::status > run_test_case(
-    const atf::fs::path&, const std::string&, const std::string&,
-    const atf::tests::vars_map&, const atf::tests::vars_map&,
-    const atf::fs::path&, const atf::fs::path&, atf_tps_writer&);
-
-} // namespace atf_run
-} // namespace atf
diff --git a/contrib/atf/atf-run/test_program_test.cpp b/contrib/atf/atf-run/test_program_test.cpp
deleted file mode 100644
index 444dc3e4d8f..00000000000
--- a/contrib/atf/atf-run/test_program_test.cpp
+++ /dev/null
@@ -1,1020 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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 <fstream>
-#include <iostream>
-
-#include "atf-c++/macros.hpp"
-
-#include "atf-c++/detail/parser.hpp"
-#include "atf-c++/detail/test_helpers.hpp"
-#include "atf-c++/detail/text.hpp"
-
-#include "test-program.hpp"
-
-namespace impl = atf::atf_run;
-namespace detail = atf::atf_run::detail;
-
-using atf::tests::vars_map;
-
-// -------------------------------------------------------------------------
-// Auxiliary functions.
-// -------------------------------------------------------------------------
-
-static
-atf::fs::path
-get_helper(const atf::tests::tc& tc, const char* name)
-{
-    return atf::fs::path(tc.get_config_var("srcdir")) / name;
-}
-
-static
-void
-check_property(const vars_map& props, const char* name, const char* value)
-{
-    const vars_map::const_iterator iter = props.find(name);
-    ATF_REQUIRE(iter != props.end());
-    ATF_REQUIRE_EQ(value, (*iter).second);
-}
-
-static void
-check_result(const char* exp_state, const int exp_value, const char* exp_reason,
-             const impl::test_case_result& tcr)
-{
-    ATF_REQUIRE_EQ(exp_state, tcr.state());
-    ATF_REQUIRE_EQ(exp_value, tcr.value());
-    ATF_REQUIRE_EQ(exp_reason, tcr.reason());
-}
-
-static
-void
-write_test_case_result(const char *results_path, const std::string& contents)
-{
-    std::ofstream results_file(results_path);
-    ATF_REQUIRE(results_file);
-
-    results_file << contents;
-}
-
-static
-void
-print_indented(const std::string& str)
-{
-    std::vector< std::string > ws = atf::text::split(str, "\n");
-    for (std::vector< std::string >::const_iterator iter = ws.begin();
-         iter != ws.end(); iter++)
-        std::cout << ">>" << *iter << "<<\n";
-}
-
-// XXX Should this string handling and verbosity level be part of the
-// ATF_REQUIRE_EQ macro?  It may be hard to predict sometimes that a
-// string can have newlines in it, and so the error message generated
-// at the moment will be bogus if there are some.
-static
-void
-check_match(const atf::tests::tc& tc, const std::string& str,
-            const std::string& exp)
-{
-    if (!atf::text::match(str, exp)) {
-        std::cout << "String match check failed.\n"
-                  << "Adding >> and << to delimit the string boundaries "
-                     "below.\n";
-        std::cout << "GOT:\n";
-        print_indented(str);
-        std::cout << "EXPECTED:\n";
-        print_indented(exp);
-        tc.fail("Constructed string differs from the expected one");
-    }
-}
-
-// -------------------------------------------------------------------------
-// Tests for the "tp" reader.
-// -------------------------------------------------------------------------
-
-class tp_reader : protected detail::atf_tp_reader {
-    void
-    got_tc(const std::string& ident,
-           const std::map< std::string, std::string >& md)
-    {
-        std::string call = "got_tc(" + ident + ", {";
-        for (std::map< std::string, std::string >::const_iterator iter =
-             md.begin(); iter != md.end(); iter++) {
-            if (iter != md.begin())
-                call += ", ";
-            call += (*iter).first + '=' + (*iter).second;
-        }
-        call += "})";
-        m_calls.push_back(call);
-    }
-
-    void
-    got_eof(void)
-    {
-        m_calls.push_back("got_eof()");
-    }
-
-public:
-    tp_reader(std::istream& is) :
-        detail::atf_tp_reader(is)
-    {
-    }
-
-    void
-    read(void)
-    {
-        atf_tp_reader::read();
-    }
-
-    std::vector< std::string > m_calls;
-};
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_1);
-ATF_TEST_CASE_BODY(tp_1)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident: test_case_1\n"
-        "\n"
-        "ident: test_case_2\n"
-        "\n"
-        "ident: test_case_3\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_tc(test_case_1, {ident=test_case_1})",
-        "got_tc(test_case_2, {ident=test_case_2})",
-        "got_tc(test_case_3, {ident=test_case_3})",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_2);
-ATF_TEST_CASE_BODY(tp_2)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident: test_case_1\n"
-        "descr: This is the description\n"
-        "timeout: 300\n"
-        "\n"
-        "ident: test_case_2\n"
-        "\n"
-        "ident: test_case_3\n"
-        "X-prop1: A custom property\n"
-        "descr: Third test case\n"
-    ;
-
-    // NO_CHECK_STYLE_BEGIN
-    const char* exp_calls[] = {
-        "got_tc(test_case_1, {descr=This is the description, ident=test_case_1, timeout=300})",
-        "got_tc(test_case_2, {ident=test_case_2})",
-        "got_tc(test_case_3, {X-prop1=A custom property, descr=Third test case, ident=test_case_3})",
-        "got_eof()",
-        NULL
-    };
-    // NO_CHECK_STYLE_END
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_3);
-ATF_TEST_CASE_BODY(tp_3)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident: single_test\n"
-        "descr: Some description\n"
-        "timeout: 300\n"
-        "require.arch: thearch\n"
-        "require.config: foo-bar\n"
-        "require.files: /a/1 /b/2\n"
-        "require.machine: themachine\n"
-        "require.progs: /bin/cp mv\n"
-        "require.user: root\n"
-    ;
-
-    // NO_CHECK_STYLE_BEGIN
-    const char* exp_calls[] = {
-        "got_tc(single_test, {descr=Some description, ident=single_test, require.arch=thearch, require.config=foo-bar, require.files=/a/1 /b/2, require.machine=themachine, require.progs=/bin/cp mv, require.user=root, timeout=300})",
-        "got_eof()",
-        NULL
-    };
-    // NO_CHECK_STYLE_END
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_4);
-ATF_TEST_CASE_BODY(tp_4)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident:   single_test    \n"
-        "descr:      Some description	\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_tc(single_test, {descr=Some description, ident=single_test})",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_50);
-ATF_TEST_CASE_BODY(tp_50)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<EOF>>'; expected property name",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_51);
-ATF_TEST_CASE_BODY(tp_51)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "\n"
-        "\n"
-        "\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected property name",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_52);
-ATF_TEST_CASE_BODY(tp_52)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident: test1\n"
-        "ident: test2\n"
-    ;
-
-    const char* exp_calls[] = {
-        "got_tc(test1, {ident=test1})",
-        "got_eof()",
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_53);
-ATF_TEST_CASE_BODY(tp_53)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "descr: Out of order\n"
-        "ident: test1\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: First property of a test case must be 'ident'",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_54);
-ATF_TEST_CASE_BODY(tp_54)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident:\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: The value for 'ident' cannot be empty",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_55);
-ATF_TEST_CASE_BODY(tp_55)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident: +*,\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: The identifier must match ^[_A-Za-z0-9]+$; was '+*,'",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_56);
-ATF_TEST_CASE_BODY(tp_56)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident: test\n"
-        "timeout: hello\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "4: The timeout property requires an integer value",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_57);
-ATF_TEST_CASE_BODY(tp_57)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident: test\n"
-        "unknown: property\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "4: Unknown property 'unknown'",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_58);
-ATF_TEST_CASE_BODY(tp_58)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident: test\n"
-        "X-foo:\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "4: The value for 'X-foo' cannot be empty",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_59);
-ATF_TEST_CASE_BODY(tp_59)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "\n"
-        "ident: test\n"
-        "timeout: 300\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "3: Unexpected token `<<NEWLINE>>'; expected property name",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(tp_60);
-ATF_TEST_CASE_BODY(tp_60)
-{
-    const char* input =
-        "Content-Type: application/X-atf-tp; version=\"1\"\n"
-        "\n"
-        "ident: test\n"
-        "require.memory: 12345D\n"
-    ;
-
-    const char* exp_calls[] = {
-        NULL
-    };
-
-    const char* exp_errors[] = {
-        "4: The require.memory property requires an integer value representing"
-        " an amount of bytes",
-        NULL
-    };
-
-    do_parser_test< tp_reader >(input, exp_calls, exp_errors);
-}
-
-// -------------------------------------------------------------------------
-// Tests for the "tps" writer.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE(atf_tps_writer);
-ATF_TEST_CASE_HEAD(atf_tps_writer)
-{
-    set_md_var("descr", "Verifies the application/X-atf-tps writer");
-}
-ATF_TEST_CASE_BODY(atf_tps_writer)
-{
-    std::ostringstream expss;
-    std::ostringstream ss;
-    const char *ts_regex = "[0-9]+\\.[0-9]{1,6}, ";
-
-#define RESET \
-    expss.str(""); \
-    ss.str("")
-
-#define CHECK \
-    check_match(*this, ss.str(), expss.str())
-
-    {
-        RESET;
-
-        impl::atf_tps_writer w(ss);
-        expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n";
-        CHECK;
-    }
-
-    {
-        RESET;
-
-        impl::atf_tps_writer w(ss);
-        expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n";
-        CHECK;
-
-        w.info("foo", "bar");
-        expss << "info: foo, bar\n";
-        CHECK;
-
-        w.info("baz", "second info");
-        expss << "info: baz, second info\n";
-        CHECK;
-    }
-
-    {
-        RESET;
-
-        impl::atf_tps_writer w(ss);
-        expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n";
-        CHECK;
-
-        w.ntps(0);
-        expss << "tps-count: 0\n";
-        CHECK;
-    }
-
-    {
-        RESET;
-
-        impl::atf_tps_writer w(ss);
-        expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n";
-        CHECK;
-
-        w.ntps(123);
-        expss << "tps-count: 123\n";
-        CHECK;
-    }
-
-    {
-        RESET;
-
-        impl::atf_tps_writer w(ss);
-        expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n";
-        CHECK;
-
-        w.ntps(2);
-        expss << "tps-count: 2\n";
-        CHECK;
-
-        w.start_tp("foo", 0);
-        expss << "tp-start: " << ts_regex << "foo, 0\n";
-        CHECK;
-
-        w.end_tp("");
-        expss << "tp-end: " << ts_regex << "foo\n";
-        CHECK;
-
-        w.start_tp("bar", 0);
-        expss << "tp-start: " << ts_regex << "bar, 0\n";
-        CHECK;
-
-        w.end_tp("failed program");
-        expss << "tp-end: " << ts_regex << "bar, failed program\n";
-        CHECK;
-    }
-
-    {
-        RESET;
-
-        impl::atf_tps_writer w(ss);
-        expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n";
-        CHECK;
-
-        w.ntps(1);
-        expss << "tps-count: 1\n";
-        CHECK;
-
-        w.start_tp("foo", 1);
-        expss << "tp-start: " << ts_regex << "foo, 1\n";
-        CHECK;
-
-        w.start_tc("brokentc");
-        expss << "tc-start: " << ts_regex << "brokentc\n";
-        CHECK;
-
-        w.end_tp("aborted");
-        expss << "tp-end: " << ts_regex << "foo, aborted\n";
-        CHECK;
-    }
-
-    {
-        RESET;
-
-        impl::atf_tps_writer w(ss);
-        expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n";
-        CHECK;
-
-        w.ntps(1);
-        expss << "tps-count: 1\n";
-        CHECK;
-
-        w.start_tp("thetp", 3);
-        expss << "tp-start: " << ts_regex << "thetp, 3\n";
-        CHECK;
-
-        w.start_tc("passtc");
-        expss << "tc-start: " << ts_regex << "passtc\n";
-        CHECK;
-
-        w.end_tc("passed", "");
-        expss << "tc-end: " << ts_regex << "passtc, passed\n";
-        CHECK;
-
-        w.start_tc("failtc");
-        expss << "tc-start: " << ts_regex << "failtc\n";
-        CHECK;
-
-        w.end_tc("failed", "The reason");
-        expss << "tc-end: " << ts_regex << "failtc, failed, The reason\n";
-        CHECK;
-
-        w.start_tc("skiptc");
-        expss << "tc-start: " << ts_regex << "skiptc\n";
-        CHECK;
-
-        w.end_tc("skipped", "The reason");
-        expss << "tc-end: " << ts_regex << "skiptc, skipped, The reason\n";
-        CHECK;
-
-        w.end_tp("");
-        expss << "tp-end: " << ts_regex << "thetp\n";
-        CHECK;
-    }
-
-    {
-        RESET;
-
-        impl::atf_tps_writer w(ss);
-        expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n";
-        CHECK;
-
-        w.ntps(1);
-        expss << "tps-count: 1\n";
-        CHECK;
-
-        w.start_tp("thetp", 1);
-        expss << "tp-start: " << ts_regex << "thetp, 1\n";
-        CHECK;
-
-        w.start_tc("thetc");
-        expss << "tc-start: " << ts_regex << "thetc\n";
-        CHECK;
-
-        w.stdout_tc("a line");
-        expss << "tc-so:a line\n";
-        CHECK;
-
-        w.stdout_tc("another line");
-        expss << "tc-so:another line\n";
-        CHECK;
-
-        w.stderr_tc("an error message");
-        expss << "tc-se:an error message\n";
-        CHECK;
-
-        w.end_tc("passed", "");
-        expss << "tc-end: " << ts_regex << "thetc, passed\n";
-        CHECK;
-
-        w.end_tp("");
-        expss << "tp-end: " << ts_regex << "thetp\n";
-        CHECK;
-    }
-
-    {
-        RESET;
-
-        impl::atf_tps_writer w(ss);
-        expss << "Content-Type: application/X-atf-tps; version=\"3\"\n\n";
-        CHECK;
-
-        w.ntps(1);
-        expss << "tps-count: 1\n";
-        CHECK;
-
-        w.start_tp("thetp", 0);
-        expss << "tp-start: " << ts_regex << "thetp, 0\n";
-        CHECK;
-
-        w.end_tp("");
-        expss << "tp-end: " << ts_regex << "thetp\n";
-        CHECK;
-
-        w.info("foo", "bar");
-        expss << "info: foo, bar\n";
-        CHECK;
-
-        w.info("baz", "second value");
-        expss << "info: baz, second value\n";
-        CHECK;
-    }
-
-#undef CHECK
-#undef RESET
-}
-
-// -------------------------------------------------------------------------
-// Tests for the free functions.
-// -------------------------------------------------------------------------
-
-ATF_TEST_CASE(get_metadata_bad);
-ATF_TEST_CASE_HEAD(get_metadata_bad) {}
-ATF_TEST_CASE_BODY(get_metadata_bad) {
-    const atf::fs::path executable = get_helper(*this, "bad_metadata_helper");
-    ATF_REQUIRE_THROW(atf::parser::parse_errors,
-                    impl::get_metadata(executable, vars_map()));
-}
-
-ATF_TEST_CASE(get_metadata_zero_tcs);
-ATF_TEST_CASE_HEAD(get_metadata_zero_tcs) {}
-ATF_TEST_CASE_BODY(get_metadata_zero_tcs) {
-    const atf::fs::path executable = get_helper(*this, "zero_tcs_helper");
-    ATF_REQUIRE_THROW(atf::parser::parse_errors,
-                    impl::get_metadata(executable, vars_map()));
-}
-
-ATF_TEST_CASE(get_metadata_several_tcs);
-ATF_TEST_CASE_HEAD(get_metadata_several_tcs) {}
-ATF_TEST_CASE_BODY(get_metadata_several_tcs) {
-    const atf::fs::path executable = get_helper(*this, "several_tcs_helper");
-    const impl::metadata md = impl::get_metadata(executable, vars_map());
-    ATF_REQUIRE_EQ(3, md.test_cases.size());
-
-    {
-        const impl::test_cases_map::const_iterator iter =
-            md.test_cases.find("first");
-        ATF_REQUIRE(iter != md.test_cases.end());
-
-        ATF_REQUIRE_EQ(4, (*iter).second.size());
-        check_property((*iter).second, "descr", "Description 1");
-        check_property((*iter).second, "has.cleanup", "false");
-        check_property((*iter).second, "ident", "first");
-        check_property((*iter).second, "timeout", "300");
-    }
-
-    {
-        const impl::test_cases_map::const_iterator iter =
-            md.test_cases.find("second");
-        ATF_REQUIRE(iter != md.test_cases.end());
-
-        ATF_REQUIRE_EQ(5, (*iter).second.size());
-        check_property((*iter).second, "descr", "Description 2");
-        check_property((*iter).second, "has.cleanup", "true");
-        check_property((*iter).second, "ident", "second");
-        check_property((*iter).second, "timeout", "500");
-        check_property((*iter).second, "X-property", "Custom property");
-    }
-
-    {
-        const impl::test_cases_map::const_iterator iter =
-            md.test_cases.find("third");
-        ATF_REQUIRE(iter != md.test_cases.end());
-
-        ATF_REQUIRE_EQ(3, (*iter).second.size());
-        check_property((*iter).second, "has.cleanup", "false");
-        check_property((*iter).second, "ident", "third");
-        check_property((*iter).second, "timeout", "300");
-    }
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_death);
-ATF_TEST_CASE_BODY(parse_test_case_result_expected_death) {
-    check_result("expected_death", -1, "foo bar",
-                 detail::parse_test_case_result("expected_death: foo bar"));
-
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_death"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_death(3): foo"));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_exit);
-ATF_TEST_CASE_BODY(parse_test_case_result_expected_exit) {
-    check_result("expected_exit", -1, "foo bar",
-                 detail::parse_test_case_result("expected_exit: foo bar"));
-    check_result("expected_exit", -1, "foo bar",
-                 detail::parse_test_case_result("expected_exit(): foo bar"));
-    check_result("expected_exit", 5, "foo bar",
-                 detail::parse_test_case_result("expected_exit(5): foo bar"));
-
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_exit"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_exit("));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_failure);
-ATF_TEST_CASE_BODY(parse_test_case_result_expected_failure) {
-    check_result("expected_failure", -1, "foo bar",
-                 detail::parse_test_case_result("expected_failure: foo bar"));
-
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_failure"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_failure(3): foo"));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_signal);
-ATF_TEST_CASE_BODY(parse_test_case_result_expected_signal) {
-    check_result("expected_signal", -1, "foo bar",
-                 detail::parse_test_case_result("expected_signal: foo bar"));
-    check_result("expected_signal", -1, "foo bar",
-                 detail::parse_test_case_result("expected_signal(): foo bar"));
-    check_result("expected_signal", 5, "foo bar",
-                 detail::parse_test_case_result("expected_signal(5): foo bar"));
-
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_signal"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_signal("));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_expected_timeout);
-ATF_TEST_CASE_BODY(parse_test_case_result_expected_timeout) {
-    check_result("expected_timeout", -1, "foo bar",
-                 detail::parse_test_case_result("expected_timeout: foo bar"));
-
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_timeout"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("expected_timeout(3): foo"));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_failed);
-ATF_TEST_CASE_BODY(parse_test_case_result_failed) {
-    check_result("failed", -1, "foo bar",
-                 detail::parse_test_case_result("failed: foo bar"));
-
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("failed"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("failed(3): foo"));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_passed);
-ATF_TEST_CASE_BODY(parse_test_case_result_passed) {
-    check_result("passed", -1, "",
-                 detail::parse_test_case_result("passed"));
-
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("passed: foo"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("passed(3): foo"));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_skipped);
-ATF_TEST_CASE_BODY(parse_test_case_result_skipped) {
-    check_result("skipped", -1, "foo bar",
-                 detail::parse_test_case_result("skipped: foo bar"));
-
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("skipped"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("skipped(3): foo"));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(parse_test_case_result_unknown);
-ATF_TEST_CASE_BODY(parse_test_case_result_unknown) {
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("foo"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("bar: foo"));
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    detail::parse_test_case_result("baz: foo"));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_failed);
-ATF_TEST_CASE_BODY(read_test_case_result_failed) {
-    write_test_case_result("resfile", "failed: foo bar\n");
-    const impl::test_case_result tcr = impl::read_test_case_result(
-        atf::fs::path("resfile"));
-    ATF_REQUIRE_EQ("failed", tcr.state());
-    ATF_REQUIRE_EQ("foo bar", tcr.reason());
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_skipped);
-ATF_TEST_CASE_BODY(read_test_case_result_skipped) {
-    write_test_case_result("resfile", "skipped: baz bar\n");
-    const impl::test_case_result tcr = impl::read_test_case_result(
-        atf::fs::path("resfile"));
-    ATF_REQUIRE_EQ("skipped", tcr.state());
-    ATF_REQUIRE_EQ("baz bar", tcr.reason());
-}
-
-
-ATF_TEST_CASE(read_test_case_result_no_file);
-ATF_TEST_CASE_HEAD(read_test_case_result_no_file) {}
-ATF_TEST_CASE_BODY(read_test_case_result_no_file) {
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    impl::read_test_case_result(atf::fs::path("resfile")));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_empty_file);
-ATF_TEST_CASE_BODY(read_test_case_result_empty_file) {
-    write_test_case_result("resfile", "");
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    impl::read_test_case_result(atf::fs::path("resfile")));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_invalid);
-ATF_TEST_CASE_BODY(read_test_case_result_invalid) {
-    write_test_case_result("resfile", "passed: hello\n");
-    ATF_REQUIRE_THROW(std::runtime_error,
-                    impl::read_test_case_result(atf::fs::path("resfile")));
-}
-
-ATF_TEST_CASE_WITHOUT_HEAD(read_test_case_result_multiline);
-ATF_TEST_CASE_BODY(read_test_case_result_multiline) {
-    write_test_case_result("resfile", "skipped: foo\nbar\n");
-    const impl::test_case_result tcr = impl::read_test_case_result(
-        atf::fs::path("resfile"));
-    ATF_REQUIRE_EQ("skipped", tcr.state());
-    ATF_REQUIRE_EQ("foo<<NEWLINE UNEXPECTED>>bar", tcr.reason());
-}
-
-// -------------------------------------------------------------------------
-// Main.
-// -------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    ATF_ADD_TEST_CASE(tcs, tp_1);
-    ATF_ADD_TEST_CASE(tcs, tp_2);
-    ATF_ADD_TEST_CASE(tcs, tp_3);
-    ATF_ADD_TEST_CASE(tcs, tp_4);
-    ATF_ADD_TEST_CASE(tcs, tp_50);
-    ATF_ADD_TEST_CASE(tcs, tp_51);
-    ATF_ADD_TEST_CASE(tcs, tp_52);
-    ATF_ADD_TEST_CASE(tcs, tp_53);
-    ATF_ADD_TEST_CASE(tcs, tp_54);
-    ATF_ADD_TEST_CASE(tcs, tp_55);
-    ATF_ADD_TEST_CASE(tcs, tp_56);
-    ATF_ADD_TEST_CASE(tcs, tp_57);
-    ATF_ADD_TEST_CASE(tcs, tp_58);
-    ATF_ADD_TEST_CASE(tcs, tp_59);
-    ATF_ADD_TEST_CASE(tcs, tp_60);
-
-    ATF_ADD_TEST_CASE(tcs, atf_tps_writer);
-
-    ATF_ADD_TEST_CASE(tcs, get_metadata_bad);
-    ATF_ADD_TEST_CASE(tcs, get_metadata_zero_tcs);
-    ATF_ADD_TEST_CASE(tcs, get_metadata_several_tcs);
-
-    ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_death);
-    ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_exit);
-    ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_failure);
-    ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_signal);
-    ATF_ADD_TEST_CASE(tcs, parse_test_case_result_expected_timeout);
-    ATF_ADD_TEST_CASE(tcs, parse_test_case_result_failed);
-    ATF_ADD_TEST_CASE(tcs, parse_test_case_result_passed);
-    ATF_ADD_TEST_CASE(tcs, parse_test_case_result_skipped);
-    ATF_ADD_TEST_CASE(tcs, parse_test_case_result_unknown);
-
-    ATF_ADD_TEST_CASE(tcs, read_test_case_result_failed);
-    ATF_ADD_TEST_CASE(tcs, read_test_case_result_skipped);
-    ATF_ADD_TEST_CASE(tcs, read_test_case_result_no_file);
-    ATF_ADD_TEST_CASE(tcs, read_test_case_result_empty_file);
-    ATF_ADD_TEST_CASE(tcs, read_test_case_result_multiline);
-    ATF_ADD_TEST_CASE(tcs, read_test_case_result_invalid);
-
-    // TODO: Add tests for run_test_case once all the missing functionality
-    // is implemented.
-}
diff --git a/contrib/atf/atf-run/timer.cpp b/contrib/atf/atf-run/timer.cpp
deleted file mode 100644
index 6ed70d97f62..00000000000
--- a/contrib/atf/atf-run/timer.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if defined(HAVE_CONFIG_H)
-#   include <bconfig.h>
-#endif
-
-extern "C" {
-#include <sys/time.h>
-}
-
-#include <cerrno>
-#include <csignal>
-#include <ctime>
-
-extern "C" {
-#include "atf-c/defs.h"
-}
-
-#include "atf-c++/detail/exceptions.hpp"
-#include "atf-c++/detail/sanity.hpp"
-
-#include "signals.hpp"
-#include "timer.hpp"
-
-namespace impl = atf::atf_run;
-#define IMPL_NAME "atf::atf_run"
-
-#if !defined(HAVE_TIMER_T)
-static impl::timer* compat_handle;
-#endif
-
-// ------------------------------------------------------------------------
-// Auxiliary functions.
-// ------------------------------------------------------------------------
-
-#if defined(HAVE_TIMER_T)
-static
-void
-handler(const int signo ATF_DEFS_ATTRIBUTE_UNUSED, siginfo_t* si,
-        void* uc ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-    impl::timer* timer = static_cast< impl::timer* >(si->si_value.sival_ptr);
-    timer->set_fired();
-    timer->timeout_callback();
-}
-#else
-static
-void
-handler(const int signo ATF_DEFS_ATTRIBUTE_UNUSED,
-        siginfo_t* si ATF_DEFS_ATTRIBUTE_UNUSED,
-        void* uc ATF_DEFS_ATTRIBUTE_UNUSED)
-{
-    compat_handle->set_fired();
-    compat_handle->timeout_callback();
-}
-#endif
-
-// ------------------------------------------------------------------------
-// The "timer" class.
-// ------------------------------------------------------------------------
-
-struct impl::timer::impl {
-#if defined(HAVE_TIMER_T)
-    ::timer_t m_timer;
-    ::itimerspec m_old_it;
-#else
-    ::itimerval m_old_it;
-#endif
-
-    struct ::sigaction m_old_sa;
-    volatile bool m_fired;
-
-    impl(void) : m_fired(false)
-    {
-    }
-};
-
-impl::timer::timer(const unsigned int seconds) :
-    m_pimpl(new impl())
-{
-    struct ::sigaction sa;
-    sigemptyset(&sa.sa_mask);
-    sa.sa_flags = SA_SIGINFO;
-    sa.sa_sigaction = ::handler;
-    if (::sigaction(SIGALRM, &sa, &m_pimpl->m_old_sa) == -1)
-        throw system_error(IMPL_NAME "::timer::timer",
-                           "Failed to set signal handler", errno);
-
-#if defined(HAVE_TIMER_T)
-    struct ::sigevent se;
-    se.sigev_notify = SIGEV_SIGNAL;
-    se.sigev_signo = SIGALRM;
-    se.sigev_value.sival_ptr = static_cast< void* >(this);
-    se.sigev_notify_function = NULL;
-    se.sigev_notify_attributes = NULL;
-    if (::timer_create(CLOCK_MONOTONIC, &se, &m_pimpl->m_timer) == -1) {
-        ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL);
-        throw system_error(IMPL_NAME "::timer::timer",
-                           "Failed to create timer", errno);
-    }
-
-    struct ::itimerspec it;
-    it.it_interval.tv_sec = 0;
-    it.it_interval.tv_nsec = 0;
-    it.it_value.tv_sec = seconds;
-    it.it_value.tv_nsec = 0;
-    if (::timer_settime(m_pimpl->m_timer, 0, &it, &m_pimpl->m_old_it) == -1) {
-       ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL);
-       ::timer_delete(m_pimpl->m_timer);
-        throw system_error(IMPL_NAME "::timer::timer",
-                           "Failed to program timer", errno);
-    }
-#else
-    ::itimerval it;
-    it.it_interval.tv_sec = 0;
-    it.it_interval.tv_usec = 0;
-    it.it_value.tv_sec = seconds;
-    it.it_value.tv_usec = 0;
-    if (::setitimer(ITIMER_REAL, &it, &m_pimpl->m_old_it) == -1) {
-        ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL);
-        throw system_error(IMPL_NAME "::timer::timer",
-                           "Failed to program timer", errno);
-    }
-    INV(compat_handle == NULL);
-    compat_handle = this;
-#endif
-}
-
-impl::timer::~timer(void)
-{
-#if defined(HAVE_TIMER_T)
-    {
-        const int ret = ::timer_delete(m_pimpl->m_timer);
-        INV(ret != -1);
-    }
-#else
-    {
-        const int ret = ::setitimer(ITIMER_REAL, &m_pimpl->m_old_it, NULL);
-        INV(ret != -1);
-    }
-#endif
-    const int ret = ::sigaction(SIGALRM, &m_pimpl->m_old_sa, NULL);
-    INV(ret != -1);
-
-#if !defined(HAVE_TIMER_T)
-    compat_handle = NULL;
-#endif
-}
-
-bool
-impl::timer::fired(void)
-    const
-{
-    return m_pimpl->m_fired;
-}
-
-void
-impl::timer::set_fired(void)
-{
-    m_pimpl->m_fired = true;
-}
-
-// ------------------------------------------------------------------------
-// The "child_timer" class.
-// ------------------------------------------------------------------------
-
-impl::child_timer::child_timer(const unsigned int seconds, const pid_t pid,
-                               volatile bool& terminate) :
-    timer(seconds),
-    m_pid(pid),
-    m_terminate(terminate)
-{
-}
-
-impl::child_timer::~child_timer(void)
-{
-}
-
-void
-impl::child_timer::timeout_callback(void)
-{
-    static const timespec ts = { 1, 0 };
-    m_terminate = true;
-    ::kill(-m_pid, SIGTERM);
-    ::nanosleep(&ts, NULL);
-    if (::kill(-m_pid, 0) != -1)
-       ::kill(-m_pid, SIGKILL);
-}
diff --git a/contrib/atf/atf-run/timer.hpp b/contrib/atf/atf-run/timer.hpp
deleted file mode 100644
index d903b91a882..00000000000
--- a/contrib/atf/atf-run/timer.hpp
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if !defined(_ATF_RUN_ALARM_HPP_)
-#define _ATF_RUN_ALARM_HPP_
-
-extern "C" {
-#include <sys/types.h>
-}
-
-#include <memory>
-
-#include "atf-c++/utils.hpp"
-
-namespace atf {
-namespace atf_run {
-
-class signal_programmer;
-
-// ------------------------------------------------------------------------
-// The "timer" class.
-// ------------------------------------------------------------------------
-
-class timer : utils::noncopyable {
-    struct impl;
-    std::auto_ptr< impl > m_pimpl;
-
-public:
-    timer(const unsigned int);
-    virtual ~timer(void);
-
-    bool fired(void) const;
-    void set_fired(void);
-    virtual void timeout_callback(void) = 0;
-};
-
-// ------------------------------------------------------------------------
-// The "child_timer" class.
-// ------------------------------------------------------------------------
-
-class child_timer : public timer {
-    const pid_t m_pid;
-    volatile bool& m_terminate;
-
-public:
-    child_timer(const unsigned int, const pid_t, volatile bool&);
-    virtual ~child_timer(void);
-
-    void timeout_callback(void);
-};
-
-} // namespace atf_run
-} // namespace atf
-
-#endif // !defined(_ATF_RUN_ALARM_HPP_)
diff --git a/contrib/atf/atf-run/user.cpp b/contrib/atf/atf-run/user.cpp
deleted file mode 100644
index 37329f16667..00000000000
--- a/contrib/atf/atf-run/user.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/types.h>
-
-#include <pwd.h>
-#include <unistd.h>
-
-#include "../atf-c/detail/user.h"
-}
-
-#include <stdexcept>
-#include <string>
-
-#include "../atf-c++/detail/sanity.hpp"
-
-#include "user.hpp"
-
-namespace impl = atf::atf_run;
-#define IMPL_NAME "atf::atf_run"
-
-uid_t
-impl::euid(void)
-{
-    return atf_user_euid();
-}
-
-void
-impl::drop_privileges(const std::pair< int, int > ids)
-{
-    if (::setgid(ids.second) == -1)
-        throw std::runtime_error("Failed to drop group privileges");
-    if (::setuid(ids.first) == -1)
-        throw std::runtime_error("Failed to drop user privileges");
-}
-
-std::pair< int, int >
-impl::get_user_ids(const std::string& user)
-{
-    const struct passwd* pw = ::getpwnam(user.c_str());
-    if (pw == NULL)
-        throw std::runtime_error("Failed to get information for user " + user);
-    return std::make_pair(pw->pw_uid, pw->pw_gid);
-}
-
-bool
-impl::is_member_of_group(gid_t gid)
-{
-    return atf_user_is_member_of_group(gid);
-}
-
-bool
-impl::is_root(void)
-{
-    return atf_user_is_root();
-}
-
-bool
-impl::is_unprivileged(void)
-{
-    return atf_user_is_unprivileged();
-}
diff --git a/contrib/atf/atf-run/user.hpp b/contrib/atf/atf-run/user.hpp
deleted file mode 100644
index 11b3e5546d3..00000000000
--- a/contrib/atf/atf-run/user.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if !defined(_ATF_RUN_USER_HPP_)
-#define _ATF_RUN_USER_HPP_
-
-extern "C" {
-#include <sys/types.h>
-}
-
-#include <utility>
-
-namespace atf {
-namespace atf_run {
-
-uid_t euid(void);
-void drop_privileges(const std::pair< int, int >);
-std::pair< int, int > get_user_ids(const std::string&);
-bool is_member_of_group(gid_t);
-bool is_root(void);
-bool is_unprivileged(void);
-
-} // namespace atf_run
-} // namespace atf
-
-#endif // !defined(_ATF_RUN_USER_HPP_)
diff --git a/contrib/atf/atf-run/user_test.cpp b/contrib/atf/atf-run/user_test.cpp
deleted file mode 100644
index 7218ba6553b..00000000000
--- a/contrib/atf/atf-run/user_test.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-extern "C" {
-#include <sys/param.h>
-#include <sys/types.h>
-#include <limits.h>
-#include <unistd.h>
-}
-
-#include <iostream>
-#include <set>
-
-#include "../atf-c++/macros.hpp"
-
-#include "user.hpp"
-
-// ------------------------------------------------------------------------
-// Test cases for the free functions.
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(euid);
-ATF_TEST_CASE_HEAD(euid)
-{
-    set_md_var("descr", "Tests the euid function");
-}
-ATF_TEST_CASE_BODY(euid)
-{
-    using atf::atf_run::euid;
-
-    ATF_REQUIRE_EQ(euid(), ::geteuid());
-}
-
-ATF_TEST_CASE(is_member_of_group);
-ATF_TEST_CASE_HEAD(is_member_of_group)
-{
-    set_md_var("descr", "Tests the is_member_of_group function");
-}
-ATF_TEST_CASE_BODY(is_member_of_group)
-{
-    using atf::atf_run::is_member_of_group;
-
-    std::set< gid_t > groups;
-    gid_t maxgid = 0;
-    {
-        gid_t gids[NGROUPS_MAX];
-        int ngids = ::getgroups(NGROUPS_MAX, gids);
-        if (ngids == -1)
-            ATF_FAIL("Call to ::getgroups failed");
-        for (int i = 0; i < ngids; i++) {
-            groups.insert(gids[i]);
-            if (gids[i] > maxgid)
-                maxgid = gids[i];
-        }
-        std::cout << "User belongs to " << ngids << " groups\n";
-        std::cout << "Last GID is " << maxgid << "\n";
-    }
-
-    const gid_t maxgid_limit = 1 << 16;
-    if (maxgid > maxgid_limit) {
-        std::cout << "Test truncated from " << maxgid << " groups to "
-                  << maxgid_limit << " to keep the run time reasonable "
-            "enough\n";
-        maxgid = maxgid_limit;
-    }
-
-    for (gid_t g = 0; g <= maxgid; g++) {
-        if (groups.find(g) == groups.end()) {
-            std::cout << "Checking if user does not belong to group "
-                      << g << "\n";
-            ATF_REQUIRE(!is_member_of_group(g));
-        } else {
-            std::cout << "Checking if user belongs to group " << g << "\n";
-            ATF_REQUIRE(is_member_of_group(g));
-        }
-    }
-}
-
-ATF_TEST_CASE(is_root);
-ATF_TEST_CASE_HEAD(is_root)
-{
-    set_md_var("descr", "Tests the is_root function");
-}
-ATF_TEST_CASE_BODY(is_root)
-{
-    using atf::atf_run::is_root;
-
-    if (::geteuid() == 0) {
-        ATF_REQUIRE(is_root());
-    } else {
-        ATF_REQUIRE(!is_root());
-    }
-}
-
-ATF_TEST_CASE(is_unprivileged);
-ATF_TEST_CASE_HEAD(is_unprivileged)
-{
-    set_md_var("descr", "Tests the is_unprivileged function");
-}
-ATF_TEST_CASE_BODY(is_unprivileged)
-{
-    using atf::atf_run::is_unprivileged;
-
-    if (::geteuid() != 0) {
-        ATF_REQUIRE(is_unprivileged());
-    } else {
-        ATF_REQUIRE(!is_unprivileged());
-    }
-}
-
-// ------------------------------------------------------------------------
-// Main.
-// ------------------------------------------------------------------------
-
-ATF_INIT_TEST_CASES(tcs)
-{
-    // Add the tests for the free functions.
-    ATF_ADD_TEST_CASE(tcs, euid);
-    ATF_ADD_TEST_CASE(tcs, is_member_of_group);
-    ATF_ADD_TEST_CASE(tcs, is_root);
-    ATF_ADD_TEST_CASE(tcs, is_unprivileged);
-}
diff --git a/contrib/atf/atf-run/zero_tcs_helper.c b/contrib/atf/atf-run/zero_tcs_helper.c
deleted file mode 100644
index d4068b17a83..00000000000
--- a/contrib/atf/atf-run/zero_tcs_helper.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Automated Testing Framework (atf)
- *
- * 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>
-
-ATF_TP_ADD_TCS(tp)
-{
-    if (tp != NULL) {}  /* Use tp. */
-    return atf_no_error();
-}
diff --git a/contrib/atf/atf-sh/Atffile b/contrib/atf/atf-sh/Atffile
deleted file mode 100644
index f1735c30881..00000000000
--- a/contrib/atf/atf-sh/Atffile
+++ /dev/null
@@ -1,11 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: tc_test
-tp: tp_test
-tp: normalize_test
-tp: config_test
-tp: atf-check_test
-tp: atf_check_test
-tp: integration_test
diff --git a/contrib/atf/atf-sh/Makefile.am.inc b/contrib/atf/atf-sh/Makefile.am.inc
deleted file mode 100644
index f8f521a4c7f..00000000000
--- a/contrib/atf/atf-sh/Makefile.am.inc
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-libexec_PROGRAMS += atf-sh/atf-check
-atf_sh_atf_check_SOURCES = atf-sh/atf-check.cpp
-atf_sh_atf_check_LDADD = $(ATF_CXX_LIBS)
-dist_man_MANS += atf-sh/atf-check.1
-
-bin_PROGRAMS += atf-sh/atf-sh
-atf_sh_atf_sh_SOURCES = atf-sh/atf-sh.cpp
-atf_sh_atf_sh_LDADD = $(ATF_CXX_LIBS)
-dist_man_MANS += atf-sh/atf-sh.1
-
-atf_sh_DATA = atf-sh/libatf-sh.subr
-atf_shdir = $(pkgdatadir)
-EXTRA_DIST += $(atf_sh_DATA)
-
-dist_man_MANS += atf-sh/atf-sh-api.3
-
-atf_aclocal_DATA += atf-sh/atf-sh.m4
-EXTRA_DIST += atf-sh/atf-sh.m4
-
-atf_shpkgconfigdir = $(atf_pkgconfigdir)
-atf_shpkgconfig_DATA = atf-sh/atf-sh.pc
-CLEANFILES += atf-sh/atf-sh.pc
-EXTRA_DIST += atf-sh/atf-sh.pc.in
-atf-sh/atf-sh.pc: $(srcdir)/atf-sh/atf-sh.pc.in Makefile
-	test -d atf-sh || mkdir -p atf-sh
-	sed -e 's#__ATF_VERSION__#$(PACKAGE_VERSION)#g' \
-	    -e 's#__EXEC_PREFIX__#$(exec_prefix)#g' \
-	    <$(srcdir)/atf-sh/atf-sh.pc.in >atf-sh/atf-sh.pc.tmp
-	mv atf-sh/atf-sh.pc.tmp atf-sh/atf-sh.pc
-
-tests_atf_sh_DATA = atf-sh/Atffile \
-                    atf-sh/Kyuafile
-tests_atf_shdir = $(pkgtestsdir)/atf-sh
-EXTRA_DIST += $(tests_atf_sh_DATA)
-
-tests_atf_sh_SCRIPTS = atf-sh/misc_helpers
-CLEANFILES += atf-sh/misc_helpers
-EXTRA_DIST += atf-sh/misc_helpers.sh
-atf-sh/misc_helpers: $(srcdir)/atf-sh/misc_helpers.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/misc_helpers.sh"; \
-	dst="atf-sh/misc_helpers"; $(BUILD_SH_TP)
-
-tests_atf_sh_SCRIPTS += atf-sh/atf_check_test
-CLEANFILES += atf-sh/atf_check_test
-EXTRA_DIST += atf-sh/atf_check_test.sh
-atf-sh/atf_check_test: $(srcdir)/atf-sh/atf_check_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/atf_check_test.sh"; \
-	dst="atf-sh/atf_check_test"; $(BUILD_SH_TP)
-
-tests_atf_sh_SCRIPTS += atf-sh/atf-check_test
-CLEANFILES += atf-sh/atf-check_test
-EXTRA_DIST += atf-sh/atf-check_test.sh
-atf-sh/atf-check_test: $(srcdir)/atf-sh/atf-check_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/atf-check_test.sh"; \
-	dst="atf-sh/atf-check_test"; $(BUILD_SH_TP)
-
-tests_atf_sh_SCRIPTS += atf-sh/config_test
-CLEANFILES += atf-sh/config_test
-EXTRA_DIST += atf-sh/config_test.sh
-atf-sh/config_test: $(srcdir)/atf-sh/config_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/config_test.sh"; \
-	dst="atf-sh/config_test"; $(BUILD_SH_TP)
-
-tests_atf_sh_SCRIPTS += atf-sh/integration_test
-CLEANFILES += atf-sh/integration_test
-EXTRA_DIST += atf-sh/integration_test.sh
-atf-sh/integration_test: $(srcdir)/atf-sh/integration_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/integration_test.sh"; \
-	dst="atf-sh/integration_test"; $(BUILD_SH_TP)
-
-tests_atf_sh_SCRIPTS += atf-sh/normalize_test
-CLEANFILES += atf-sh/normalize_test
-EXTRA_DIST += atf-sh/normalize_test.sh
-atf-sh/normalize_test: $(srcdir)/atf-sh/normalize_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/normalize_test.sh"; \
-	dst="atf-sh/normalize_test"; $(BUILD_SH_TP)
-
-tests_atf_sh_SCRIPTS += atf-sh/tc_test
-CLEANFILES += atf-sh/tc_test
-EXTRA_DIST += atf-sh/tc_test.sh
-atf-sh/tc_test: $(srcdir)/atf-sh/tc_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/tc_test.sh"; \
-	dst="atf-sh/tc_test"; $(BUILD_SH_TP)
-
-tests_atf_sh_SCRIPTS += atf-sh/tp_test
-CLEANFILES += atf-sh/tp_test
-EXTRA_DIST += atf-sh/tp_test.sh
-atf-sh/tp_test: $(srcdir)/atf-sh/tp_test.sh
-	test -d atf-sh || mkdir -p atf-sh
-	@src="$(srcdir)/atf-sh/tp_test.sh"; \
-	dst="atf-sh/tp_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/atf-sh/atf-check.cpp b/contrib/atf/atf-sh/atf-check.cpp
index 713da3f6e6f..66f6c4c9ef9 100644
--- a/contrib/atf/atf-sh/atf-check.cpp
+++ b/contrib/atf/atf-sh/atf-check.cpp
@@ -49,9 +49,9 @@ extern "C" {
 
 #include "atf-c++/check.hpp"
 #include "atf-c++/config.hpp"
-#include "atf-c++/utils.hpp"
 
 #include "atf-c++/detail/application.hpp"
+#include "atf-c++/detail/auto_array.hpp"
 #include "atf-c++/detail/exceptions.hpp"
 #include "atf-c++/detail/fs.hpp"
 #include "atf-c++/detail/process.hpp"
@@ -116,7 +116,7 @@ public:
         std::ostream(NULL),
         m_fd(-1)
     {
-        atf::utils::auto_array< char > buf(new char[p.str().length() + 1]);
+        atf::auto_array< char > buf(new char[p.str().length() + 1]);
         std::strcpy(buf.get(), p.c_str());
 
         m_fd = ::mkstemp(buf.get());
@@ -331,10 +331,13 @@ static
 std::auto_ptr< atf::check::check_result >
 execute(const char* const* argv)
 {
+    // TODO: This should go to stderr... but fixing it now may be hard as test
+    // cases out there might be relying on stderr being silent.
     std::cout << "Executing command [ ";
     for (int i = 0; argv[i] != NULL; ++i)
         std::cout << argv[i] << " ";
     std::cout << "]\n";
+    std::cout.flush();
 
     atf::process::argv_array argva(argv);
     return atf::check::exec(argva);
diff --git a/contrib/atf/atf-sh/atf-check_test.sh b/contrib/atf/atf-sh/atf-check_test.sh
index 688171449db..7319a2b882b 100644
--- a/contrib/atf/atf-sh/atf-check_test.sh
+++ b/contrib/atf/atf-sh/atf-check_test.sh
@@ -211,10 +211,10 @@ oflag_inline_body()
     h_pass "echo foo bar" -o inline:"foo bar\n"
     h_pass "printf 'foo bar'" -o inline:"foo bar"
     h_pass "printf '\t\n\t\n'" -o inline:"\t\n\t\n"
-    # XXX Ugly hack to workaround the lack of \e in FreeBSD.  Look for a
-    # nicer solution...
+    # XXX Ugly hack to workaround the lack of \e in FreeBSD.  Also, \e doesn't
+    # seem to work as expected in Linux.  Look for a nicer solution.
     case $(uname) in
-    Darwin|FreeBSD)
+    Darwin|FreeBSD|Linux)
         h_pass "printf '\a\b\f\n\r\t\v'" -o inline:"\a\b\f\n\r\t\v"
         ;;
     *)
@@ -331,10 +331,10 @@ eflag_inline_body()
     h_pass "echo foo bar 1>&2" -e inline:"foo bar\n"
     h_pass "printf 'foo bar' 1>&2" -e inline:"foo bar"
     h_pass "printf '\t\n\t\n' 1>&2" -e inline:"\t\n\t\n"
-    # XXX Ugly hack to workaround the lack of \e in FreeBSD.  Look for a
-    # nicer solution...
+    # XXX Ugly hack to workaround the lack of \e in FreeBSD.  Also, \e doesn't
+    # seem to work as expected in Linux.  Look for a nicer solution.
     case $(uname) in
-    Darwin|FreeBSD)
+    Darwin|FreeBSD|Linux)
         h_pass "printf '\a\b\f\n\r\t\v' 1>&2" -e inline:"\a\b\f\n\r\t\v"
         ;;
     *)
diff --git a/contrib/atf/atf-sh/atf-sh-api.3 b/contrib/atf/atf-sh/atf-sh-api.3
index 247b52c8387..d63804cd73f 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 June 28, 2010
+.Dd October 13, 2013
 .Dt ATF-SH-API 3
 .Os
 .Sh NAME
@@ -320,18 +320,21 @@ This example demonstrates the use of the very useful
 function:
 .Bd -literal -offset indent
 # Check for silent output
-atf_check 'true' 0 null null
+atf_check -s exit:0 -o empty -e empty 'true'
 
 # Check for silent output and failure
-atf_check 'false' 1 null null
+atf_check -s exit:1 -o empty -e empty 'false'
 
 # Check for known stdout and silent stderr
 echo foo >expout
-atf_check 'echo foo' 0 expout null
+atf_check -s exit:0 -o file:expout -e empty 'echo foo'
 
 # Generate a file for later inspection
-atf_check 'ls' 0 stdout null
+atf_check -s exit:0 -o save:stdout -e empty 'ls'
 grep foo ls || atf_fail "foo file not found in listing"
+
+# Or just do the match along the way
+atf_check -s exit:0 -o match:"^foo$" -e empty 'ls'
 .Ed
 .Sh SEE ALSO
 .Xr atf-sh 1 ,
diff --git a/contrib/atf/atf-sh/atf-sh.1 b/contrib/atf/atf-sh/atf-sh.1
index b194bf4a177..7578ba0a4da 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 May 9, 2010
+.Dd October 15, 2013
 .Dt ATF-SH 1
 .Os
 .Sh NAME
@@ -67,9 +67,6 @@ The following options are available:
 .Bl -tag -width XhXX
 .It Fl h
 Shows a short summary of all available options and their purpose.
-For those formats that write to a single file, specifying a
-.Sq -
-as the path will redirect the report to the standard output.
 .El
 .Sh SEE ALSO
 .Xr atf-config 1 ,
diff --git a/contrib/atf/atf-sh/atf_check_test.sh b/contrib/atf/atf-sh/atf_check_test.sh
index 010d0f144a1..a6c7df88b03 100644
--- a/contrib/atf/atf-sh/atf_check_test.sh
+++ b/contrib/atf/atf-sh/atf_check_test.sh
@@ -168,6 +168,21 @@ equal_body()
         grep '^failed: \${x} != \${y} (a != b)$' resfile
 }
 
+atf_test_case flush_stdout_on_timeout
+flush_stdout_on_timeout_body()
+{
+    "$(atf_get_srcdir)/misc_helpers" -s "$(atf_get_srcdir)" atf_check_timeout \
+        >out 2>err &
+    pid="${!}"
+    sleep 1
+    kill "${pid}"
+
+    grep 'Executing command.*true' out \
+        || atf_fail 'First command not in output'
+    grep 'Executing command.*sleep 42' out \
+        || atf_fail 'Second command not in output'
+}
+
 atf_init_test_cases()
 {
     atf_add_test_case info_ok
@@ -176,6 +191,7 @@ atf_init_test_cases()
     atf_add_test_case null_stdout
     atf_add_test_case null_stderr
     atf_add_test_case equal
+    atf_add_test_case flush_stdout_on_timeout
 }
 
 # vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/atf-sh/misc_helpers.sh b/contrib/atf/atf-sh/misc_helpers.sh
index 8b72f0ae2b7..1f83688c6c3 100644
--- a/contrib/atf/atf-sh/misc_helpers.sh
+++ b/contrib/atf/atf-sh/misc_helpers.sh
@@ -143,6 +143,18 @@ atf_check_equal_eval_fail_body()
     atf_check_equal '${x}' '${y}'
 }
 
+atf_test_case atf_check_timeout
+atf_check_timeout_head()
+{
+    atf_set "descr" "Helper test case for the t_atf_check test program"
+    atf_set "timeout" 1
+}
+atf_check_timeout_body()
+{
+    atf_check true
+    atf_check sleep 42
+}
+
 # -------------------------------------------------------------------------
 # Helper tests for "t_config".
 # -------------------------------------------------------------------------
@@ -273,6 +285,7 @@ atf_init_test_cases()
     atf_add_test_case atf_check_equal_fail
     atf_add_test_case atf_check_equal_eval_ok
     atf_add_test_case atf_check_equal_eval_fail
+    atf_add_test_case atf_check_timeout
 
     # Add helper tests for t_config.
     atf_add_test_case config_get
diff --git a/contrib/atf/atf-version/Makefile.am.inc b/contrib/atf/atf-version/Makefile.am.inc
deleted file mode 100644
index ec553b38834..00000000000
--- a/contrib/atf/atf-version/Makefile.am.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-bin_PROGRAMS += atf-version/atf-version
-atf_version_atf_version_SOURCES = atf-version/atf-version.cpp
-nodist_atf_version_atf_version_SOURCES = atf-version/revision.h
-atf_version_atf_version_CPPFLAGS = -Iatf-version
-atf_version_atf_version_LDADD = $(ATF_CXX_LIBS)
-dist_man_MANS += atf-version/atf-version.1
-
-EXTRA_DIST += atf-version/generate-revision.sh
-
-BUILT_SOURCES += atf-version/revision.h
-CLEANFILES += atf-version/revision.h
-atf-version/revision.h: atf-version/revision.h.stamp
-	@test -d atf-version || mkdir -p atf-version
-	@cmp -s atf-version/revision.h atf-version/revision.h.stamp || \
-	    cp -p atf-version/revision.h.stamp atf-version/revision.h
-
-CLEANFILES += atf-version/revision.h.stamp
-PHONY_TARGETS += atf-version/revision.h.stamp
-atf-version/revision.h.stamp:
-	@test -d atf-version || mkdir -p atf-version
-	@$(top_srcdir)/atf-version/generate-revision.sh \
-	    -g "$(GIT)" -r $(top_srcdir) -o atf-version/revision.h.stamp \
-	    -v $(PACKAGE_VERSION)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/atf-version/atf-version.1 b/contrib/atf/atf-version/atf-version.1
deleted file mode 100644
index 136f13cd463..00000000000
--- a/contrib/atf/atf-version/atf-version.1
+++ /dev/null
@@ -1,56 +0,0 @@
-.\"
-.\" Automated Testing Framework (atf)
-.\"
-.\" 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.
-.\"
-.Dd September 16, 2007
-.Dt ATF-VERSION 1
-.Os
-.Sh NAME
-.Nm atf-version
-.Nd shows information about the installed ATF version
-.Sh SYNOPSIS
-.Nm
-.Nm
-.Fl h
-.Sh DESCRIPTION
-.Nm
-is a utility that prints information about the version of ATF currently
-installed in the system.
-.Pp
-In the first synopsis form,
-.Nm
-shows the release version of the ATF package installed in the system (the
-installation that corresponds to the instance of
-.Nm
-being executed) and also shows information related to the repository
-revision used to build that package.
-.Pp
-In the second synopsis form,
-.Nm
-will print information about all supported options and their purpose.
-.Sh SEE ALSO
-.Xr atf 7
diff --git a/contrib/atf/atf-version/atf-version.cpp b/contrib/atf/atf-version/atf-version.cpp
deleted file mode 100644
index dfd092c7490..00000000000
--- a/contrib/atf/atf-version/atf-version.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-//
-// Automated Testing Framework (atf)
-//
-// 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.
-//
-
-#if defined(HAVE_CONFIG_H)
-#include "bconfig.h"
-#endif
-
-#include <cstdlib>
-#include <iostream>
-
-#include "atf-c++/detail/application.hpp"
-#include "atf-c++/detail/ui.hpp"
-
-#include "revision.h"
-
-class atf_version : public atf::application::app {
-    static const char* m_description;
-
-public:
-    atf_version(void);
-
-    int main(void);
-};
-
-const char* atf_version::m_description =
-    "atf-version is a tool that shows information about the currently "
-    "installed version of ATF.";
-
-atf_version::atf_version(void) :
-    app(m_description, "atf-version(1)", "atf(7)")
-{
-}
-
-int
-atf_version::main(void)
-{
-    using atf::ui::format_text;
-    using atf::ui::format_text_with_tag;
-
-    std::cout << PACKAGE_STRING " (" PACKAGE_TARNAME "-" PACKAGE_VERSION
-                 ")\n" PACKAGE_COPYRIGHT "\n\n";
-
-#if defined(PACKAGE_REVISION_TYPE_DIST)
-    std::cout << format_text("Built from a distribution file; no revision "
-        "information available.") << "\n";
-#elif defined(PACKAGE_REVISION_TYPE_GIT)
-    std::cout << format_text_with_tag(PACKAGE_REVISION_BRANCH, "Branch: ",
-                                      false) << "\n";
-    std::cout << format_text_with_tag(PACKAGE_REVISION_BASE
-#   if PACKAGE_REVISION_MODIFIED
-        " (locally modified)"
-#   endif
-        " " PACKAGE_REVISION_DATE,
-        "Base revision: ", false) << "\n";
-#else
-#   error "Unknown PACKAGE_REVISION_TYPE value"
-#endif
-
-    return EXIT_SUCCESS;
-}
-
-int
-main(int argc, char* const* argv)
-{
-    return atf_version().run(argc, argv);
-}
diff --git a/contrib/atf/atf-version/generate-revision.sh b/contrib/atf/atf-version/generate-revision.sh
deleted file mode 100755
index 169be85f941..00000000000
--- a/contrib/atf/atf-version/generate-revision.sh
+++ /dev/null
@@ -1,142 +0,0 @@
-#! /bin/sh
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-#
-# Generates a header file with information about the revision used to
-# build ATF.
-#
-
-set -e
-
-Prog_Name=${0##*/}
-
-GIT=
-ROOT=
-
-#
-# err message
-#
-err() {
-    echo "${Prog_Name}: ${@}" 1>&2
-    exit 1
-}
-
-#
-# call_git args
-#
-call_git() {
-    ( cd "${ROOT}" && "${GIT}" "${@}" )
-}
-
-#
-# generate_from_dist revfile version
-#
-generate_from_dist() {
-    revfile=${1}; shift
-    version=${1}; shift
-
-    >${revfile}
-
-    echo "#define PACKAGE_REVISION_TYPE_DIST" >>${revfile}
-}
-
-#
-# generate_from_git revfile
-#
-generate_from_git() {
-    revfile=${1}
-
-    rev_base_id=$(call_git rev-parse HEAD)
-    rev_branch=$(call_git branch | grep '^\* ' | cut -d ' ' -f 2-)
-    rev_date=$(call_git log -1 | grep '^Date:' | sed -e 's,^Date:[ \t]*,,')
-    if [ -z "$(call_git status -s)" ]; then
-        rev_modified=false
-    else
-        rev_modified=true
-    fi
-
-    >${revfile}
-
-    echo "#define PACKAGE_REVISION_TYPE_GIT" >>${revfile}
-
-    echo "#define PACKAGE_REVISION_BRANCH \"${rev_branch}\"" >>${revfile}
-    echo "#define PACKAGE_REVISION_BASE \"${rev_base_id}\"" >>${revfile}
-
-    if [ ${rev_modified} = true ]; then
-        echo "#define PACKAGE_REVISION_MODIFIED 1" >>${revfile}
-    fi
-
-    echo "#define PACKAGE_REVISION_DATE \"${rev_date}\"" >>${revfile}
-}
-
-#
-# main
-#
-# Entry point.
-#
-main() {
-    outfile=
-    version=
-    while getopts :g:r:o:v: arg; do
-        case ${arg} in
-            g)
-                GIT=${OPTARG}
-                ;;
-            o)
-                outfile=${OPTARG}
-                ;;
-            r)
-                ROOT=${OPTARG}
-                ;;
-            v)
-                version=${OPTARG}
-                ;;
-            *)
-                err "Unknown option ${arg}"
-                ;;
-        esac
-    done
-    [ -n "${ROOT}" ] || \
-        err "Must specify the top-level source directory with -r"
-    [ -n "${outfile}" ] || \
-        err "Must specify an output file with -o"
-    [ -n "${version}" ] || \
-        err "Must specify a version number with -v"
-
-    if [ -n "${GIT}" -a -d ${ROOT}/.git ]; then
-        generate_from_git ${outfile}
-    else
-        generate_from_dist ${outfile} ${version}
-    fi
-}
-
-main "${@}"
-
-# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/bconfig.h b/contrib/atf/bconfig.h
index 2da4fab7482..cd80e709d4d 100644
--- a/contrib/atf/bconfig.h
+++ b/contrib/atf/bconfig.h
@@ -23,7 +23,7 @@
 #define HAVE_MEMORY_H 1
 
 /* Define to 1 if getopt has optreset */
-/* #undef HAVE_OPTRESET */
+#define HAVE_OPTRESET 1
 
 /* Define to 1 if you have the `putenv' function. */
 #define HAVE_PUTENV 1
@@ -80,9 +80,6 @@
    */
 #define LT_OBJDIR ".libs/"
 
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-/* #undef NO_MINUS_C_MINUS_O */
-
 /* Name of package */
 #define PACKAGE "atf"
 
@@ -96,7 +93,7 @@
 #define PACKAGE_NAME "Automated Testing Framework"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Automated Testing Framework 0.16"
+#define PACKAGE_STRING "Automated Testing Framework 0.18"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "atf"
@@ -105,10 +102,10 @@
 #define PACKAGE_URL "http://code.google.com/p/kyua/wiki/ATF"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.16"
+#define PACKAGE_VERSION "0.18"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.16"
+#define VERSION "0.18"
diff --git a/contrib/atf/bconfig.h.in b/contrib/atf/bconfig.h.in
deleted file mode 100644
index 5d9ceeb2505..00000000000
--- a/contrib/atf/bconfig.h.in
+++ /dev/null
@@ -1,113 +0,0 @@
-/* bconfig.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if basename takes a constant pointer */
-#undef HAVE_CONST_BASENAME
-
-/* Define to 1 if dirname takes a constant pointer */
-#undef HAVE_CONST_DIRNAME
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if getcwd(NULL, 0) works */
-#undef HAVE_GETCWD_DYN
-
-/* Define to 1 if getopt allows a + sign for POSIX behavior */
-#undef HAVE_GNU_GETOPT
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if getopt has optreset */
-#undef HAVE_OPTRESET
-
-/* Define to 1 if you have the `putenv' function. */
-#undef HAVE_PUTENV
-
-/* Define to 1 if putenv is in std */
-#undef HAVE_PUTENV_IN_STD
-
-/* Define to 1 if you have the `setenv' function. */
-#undef HAVE_SETENV
-
-/* Define to 1 if setenv is in std */
-#undef HAVE_SETENV_IN_STD
-
-/* Define to 1 if snprintf is in std */
-#undef HAVE_SNPRINTF_IN_STD
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the `unmount' function. */
-#undef HAVE_UNMOUNT
-
-/* Define to 1 if you have the `unsetenv' function. */
-#undef HAVE_UNSETENV
-
-/* Define to 1 if unsetenv is in std */
-#undef HAVE_UNSETENV_IN_STD
-
-/* Define to 1 if vsnprintf is in std */
-#undef HAVE_VSNPRINTF_IN_STD
-
-/* Define to the last valid signal number */
-#undef LAST_SIGNO
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#undef NO_MINUS_C_MINUS_O
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the copyright string applicable to this package. */
-#undef PACKAGE_COPYRIGHT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/contrib/atf/configure b/contrib/atf/configure
deleted file mode 100755
index 8f827cf38f3..00000000000
--- a/contrib/atf/configure
+++ /dev/null
@@ -1,19965 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Automated Testing Framework 0.16.
-#
-# Report bugs to <atf-devel@NetBSD.org>.
-#
-#
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
-#
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-#
-# Copyright (c) 2007-2012 The NetBSD Foundation, Inc.
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-  setopt NO_GLOB_SUBST
-else
-  case \`(set -o) 2>/dev/null\` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-"
-  as_required="as_fn_return () { (exit \$1); }
-as_fn_success () { as_fn_return 0; }
-as_fn_failure () { as_fn_return 1; }
-as_fn_ret_success () { return 0; }
-as_fn_ret_failure () { return 1; }
-
-exitcode=0
-as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-
-else
-  exitcode=1; echo positional parameters were not saved.
-fi
-test x\$exitcode = x0 || exit 1"
-  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-
-  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\" ) || exit 1
-test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null; then :
-  as_have_required=yes
-else
-  as_have_required=no
-fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  as_found=:
-  case $as_dir in #(
-	 /*)
-	   for as_base in sh bash ksh sh5; do
-	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir/$as_base
-	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  CONFIG_SHELL=$as_shell as_have_required=yes
-		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-  break 2
-fi
-fi
-	   done;;
-       esac
-  as_found=false
-done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-  CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
-IFS=$as_save_IFS
-
-
-      if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	# Preserve -v and -x to the replacement shell.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	case $- in # ((((
-	  *v*x* | *x*v* ) as_opts=-vx ;;
-	  *v* ) as_opts=-v ;;
-	  *x* ) as_opts=-x ;;
-	  * ) as_opts= ;;
-	esac
-	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-fi
-
-    if test x$as_have_required = xno; then :
-  $as_echo "$0: This script requires a shell more modern than all"
-  $as_echo "$0: the shells that I found on your system."
-  if test x${ZSH_VERSION+set} = xset ; then
-    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-  else
-    $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: atf-devel@NetBSD.org about your system, including any
-$0: error possibly output before this message. Then install
-$0: a modern shell, or manually run the script under such a
-$0: shell if you do have one."
-  fi
-  exit 1
-fi
-fi
-fi
-SHELL=${CONFIG_SHELL-/bin/sh}
-export SHELL
-# Unset more variables known to interfere with behavior of common tools.
-CLICOLOR_FORCE= GREP_OPTIONS=
-unset CLICOLOR_FORCE GREP_OPTIONS
-
-## --------------------- ##
-## M4sh Shell Functions. ##
-## --------------------- ##
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-
-test -n "$DJDIR" || exec 7<&0 </dev/null
-exec 6>&1
-
-# Name of the host.
-# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_clean_files=
-ac_config_libobj_dir=.
-LIBOBJS=
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-
-# Identity of this package.
-PACKAGE_NAME='Automated Testing Framework'
-PACKAGE_TARNAME='atf'
-PACKAGE_VERSION='0.16'
-PACKAGE_STRING='Automated Testing Framework 0.16'
-PACKAGE_BUGREPORT='atf-devel@NetBSD.org'
-PACKAGE_URL='http://code.google.com/p/kyua/wiki/ATF'
-
-ac_unique_file="atf-c.h"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#ifdef HAVE_STDINT_H
-# include <stdint.h>
-#endif
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='am__EXEEXT_FALSE
-am__EXEEXT_TRUE
-LTLIBOBJS
-LIBOBJS
-GIT
-HAVE_KYUA_FALSE
-HAVE_KYUA_TRUE
-KYUA
-GDB
-ATF_SHELL
-atf_xsldir
-atf_pkgconfigdir
-atf_egdir
-atf_dtddir
-atf_cssdir
-atf_aclocaldir
-ATF_WORKDIR
-atf_confdir
-ATF_CONFSUBDIR
-atf_machine
-atf_arch
-target_srcdir
-ATF_BUILD_CXXFLAGS
-ATF_BUILD_CXX
-ATF_BUILD_CPPFLAGS
-ATF_BUILD_CPP
-ATF_BUILD_CFLAGS
-ATF_BUILD_CC
-ATTRIBUTE_UNUSED
-ATTRIBUTE_NORETURN
-ATTRIBUTE_FORMAT_PRINTF
-CXXCPP
-am__fastdepCXX_FALSE
-am__fastdepCXX_TRUE
-CXXDEPMODE
-ac_ct_CXX
-CXXFLAGS
-CXX
-ENABLE_TOOLS_FALSE
-ENABLE_TOOLS_TRUE
-ENABLE_TOOLS
-CPP
-OTOOL64
-OTOOL
-LIPO
-NMEDIT
-DSYMUTIL
-MANIFEST_TOOL
-RANLIB
-ac_ct_AR
-AR
-DLLTOOL
-OBJDUMP
-LN_S
-NM
-ac_ct_DUMPBIN
-DUMPBIN
-LD
-FGREP
-EGREP
-GREP
-SED
-am__fastdepCC_FALSE
-am__fastdepCC_TRUE
-CCDEPMODE
-am__nodep
-AMDEPBACKSLASH
-AMDEP_FALSE
-AMDEP_TRUE
-am__quote
-am__include
-DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-LIBTOOL
-am__untar
-am__tar
-AMTAR
-am__leading_dot
-SET_MAKE
-AWK
-mkdir_p
-MKDIR_P
-INSTALL_STRIP_PROGRAM
-STRIP
-install_sh
-MAKEINFO
-AUTOHEADER
-AUTOMAKE
-AUTOCONF
-ACLOCAL
-VERSION
-PACKAGE
-CYGPATH_W
-am__isrc
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
-target_os
-target_vendor
-target_cpu
-target
-host_os
-host_vendor
-host_cpu
-host
-build_os
-build_vendor
-build_cpu
-build
-target_alias
-host_alias
-build_alias
-LIBS
-ECHO_T
-ECHO_N
-ECHO_C
-DEFS
-mandir
-localedir
-libdir
-psdir
-pdfdir
-dvidir
-htmldir
-infodir
-docdir
-oldincludedir
-includedir
-localstatedir
-sharedstatedir
-sysconfdir
-datadir
-datarootdir
-libexecdir
-sbindir
-bindir
-program_transform_name
-prefix
-exec_prefix
-PACKAGE_URL
-PACKAGE_BUGREPORT
-PACKAGE_STRING
-PACKAGE_VERSION
-PACKAGE_TARNAME
-PACKAGE_NAME
-PATH_SEPARATOR
-SHELL'
-ac_subst_files=''
-ac_user_opts='
-enable_option_checking
-enable_shared
-enable_static
-with_pic
-enable_fast_install
-enable_dependency_tracking
-with_gnu_ld
-with_sysroot
-enable_libtool_lock
-enable_tools
-enable_developer
-'
-      ac_precious_vars='build_alias
-host_alias
-target_alias
-CC
-CFLAGS
-LDFLAGS
-LIBS
-CPPFLAGS
-CPP
-CXX
-CXXFLAGS
-CCC
-CXXCPP
-ATF_BUILD_CC
-ATF_BUILD_CFLAGS
-ATF_BUILD_CPP
-ATF_BUILD_CPPFLAGS
-ATF_BUILD_CXX
-ATF_BUILD_CXXFLAGS
-ATF_CONFSUBDIR
-ATF_WORKDIR
-ATF_SHELL'
-
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-ac_unrecognized_opts=
-ac_unrecognized_sep=
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-# (The list follows the same order as the GNU Coding Standards.)
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datarootdir='${prefix}/share'
-datadir='${datarootdir}'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
-libdir='${exec_prefix}/lib'
-localedir='${datarootdir}/locale'
-mandir='${datarootdir}/man'
-
-ac_prev=
-ac_dashdash=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval $ac_prev=\$ac_option
-    ac_prev=
-    continue
-  fi
-
-  case $ac_option in
-  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-  *=)   ac_optarg= ;;
-  *)    ac_optarg=yes ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_dashdash$ac_option in
-  --)
-    ac_dashdash=yes ;;
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-    datadir=$ac_optarg ;;
-
-  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-  | --dataroo | --dataro | --datar)
-    ac_prev=datarootdir ;;
-  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-    datarootdir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=no ;;
-
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
-  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-    ac_prev=dvidir ;;
-  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-    dvidir=$ac_optarg ;;
-
-  -enable-* | --enable-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"enable_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval enable_$ac_useropt=\$ac_optarg ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-    ac_prev=htmldir ;;
-  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-  | --ht=*)
-    htmldir=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localedir | --localedir | --localedi | --localed | --locale)
-    ac_prev=localedir ;;
-  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-    localedir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst | --locals)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-    ac_prev=pdfdir ;;
-  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-    pdfdir=$ac_optarg ;;
-
-  -psdir | --psdir | --psdi | --psd | --ps)
-    ac_prev=psdir ;;
-  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-    psdir=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=\$ac_optarg ;;
-
-  -without-* | --without-*)
-    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: $ac_useropt"
-    ac_useropt_orig=$ac_useropt
-    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-    case $ac_user_opts in
-      *"
-"with_$ac_useropt"
-"*) ;;
-      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-	 ac_unrecognized_sep=', ';;
-    esac
-    eval with_$ac_useropt=no ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    case $ac_envvar in #(
-      '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
-    esac
-    eval $ac_envvar=\$ac_optarg
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  as_fn_error $? "missing argument to $ac_option"
-fi
-
-if test -n "$ac_unrecognized_opts"; then
-  case $enable_option_checking in
-    no) ;;
-    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-  esac
-fi
-
-# Check all directory arguments for consistency.
-for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
-do
-  eval ac_val=\$$ac_var
-  # Remove trailing slashes.
-  case $ac_val in
-    */ )
-      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-      eval $ac_var=\$ac_val;;
-  esac
-  # Be sure to have absolute directory names.
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* )  continue;;
-    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-  esac
-  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-ac_pwd=`pwd` && test -n "$ac_pwd" &&
-ac_ls_di=`ls -di .` &&
-ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-  as_fn_error $? "working directory cannot be determined"
-test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-  as_fn_error $? "pwd does not report name of working directory"
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then the parent directory.
-  ac_confdir=`$as_dirname -- "$as_myself" ||
-$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_myself" : 'X\(//\)[^/]' \| \
-	 X"$as_myself" : 'X\(//\)$' \| \
-	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r "$srcdir/$ac_unique_file"; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r "$srcdir/$ac_unique_file"; then
-  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
-fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-ac_abs_confdir=`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
-	pwd)`
-# When building in place, set srcdir=.
-if test "$ac_abs_confdir" = "$ac_pwd"; then
-  srcdir=.
-fi
-# Remove unnecessary trailing slashes from srcdir.
-# Double slashes in file names in object file debugging info
-# mess up M-x gdb in Emacs.
-case $srcdir in
-*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-esac
-for ac_var in $ac_precious_vars; do
-  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_env_${ac_var}_value=\$${ac_var}
-  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-done
-
-#
-# Report the --help message.
-#
-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 Automated Testing Framework 0.16 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking ...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR            user executables [EPREFIX/bin]
-  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR        program executables [EPREFIX/libexec]
-  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-  --libdir=DIR            object code libraries [EPREFIX/lib]
-  --includedir=DIR        C header files [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-  --infodir=DIR           info documentation [DATAROOTDIR/info]
-  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-  --mandir=DIR            man documentation [DATAROOTDIR/man]
-  --docdir=DIR            documentation root [DATAROOTDIR/doc/atf]
-  --htmldir=DIR           html documentation [DOCDIR]
-  --dvidir=DIR            dvi documentation [DOCDIR]
-  --pdfdir=DIR            pdf documentation [DOCDIR]
-  --psdir=DIR             ps documentation [DOCDIR]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-  --target=TARGET   configure for building compilers for TARGET [HOST]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of Automated Testing Framework 0.16:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-option-checking  ignore unrecognized --enable/--with options
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-shared[=PKGS]  build shared libraries [default=yes]
-  --enable-static[=PKGS]  build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-tools          Enables the build of the deprecated ATF tools
-  --enable-developer      enable developer features
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-sysroot=DIR Search for dependent libraries within DIR
-                        (or the compiler's sysroot if not specified).
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  LIBS        libraries to pass to the linker, e.g. -l<library>
-  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-              you have headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  ATF_BUILD_CC
-              C compiler to use at runtime
-  ATF_BUILD_CFLAGS
-              C compiler flags to use at runtime
-  ATF_BUILD_CPP
-              C/C++ preprocessor to use at runtime
-  ATF_BUILD_CPPFLAGS
-              C/C++ preprocessor flags to use at runtime
-  ATF_BUILD_CXX
-              C++ compiler to use at runtime
-  ATF_BUILD_CXXFLAGS
-              C++ compiler flags to use at runtime
-  ATF_CONFSUBDIR
-              Subdirectory of sysconfdir under which to look for files
-  ATF_WORKDIR Default location to use for ATF work directories
-  ATF_SHELL   Location of the POSIX shell interpreter to use
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <atf-devel@NetBSD.org>.
-Automated Testing Framework home page: <http://code.google.com/p/kyua/wiki/ATF>.
-_ACEOF
-ac_status=$?
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d "$ac_dir" ||
-      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-      continue
-    ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-    cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for guested configure.
-    if test -f "$ac_srcdir/configure.gnu"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-    elif test -f "$ac_srcdir/configure"; then
-      echo &&
-      $SHELL "$ac_srcdir/configure" --help=recursive
-    else
-      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi || ac_status=$?
-    cd "$ac_pwd" || { ac_status=$?; break; }
-  done
-fi
-
-test -n "$ac_init_help" && exit $ac_status
-if $ac_init_version; then
-  cat <<\_ACEOF
-Automated Testing Framework configure 0.16
-generated by GNU Autoconf 2.68
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-
-Copyright (c) 2007-2012 The NetBSD Foundation, Inc.
-_ACEOF
-  exit
-fi
-
-## ------------------------ ##
-## Autoconf initialization. ##
-## ------------------------ ##
-
-# ac_fn_c_try_compile LINENO
-# --------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_compile
-
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_link
-
-# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists and can be compiled using the include files in
-# INCLUDES, setting the cache variable VAR accordingly.
-ac_fn_c_check_header_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-#include <$2>
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_header_compile
-
-# ac_fn_c_try_cpp LINENO
-# ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_cpp
-
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
-# ac_fn_c_check_func LINENO FUNC VAR
-# ----------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_c_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_c_check_func
-
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_compile
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-    ac_retval=1
-fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_cpp
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest$ac_exeext
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    grep -v '^ *+' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-    mv -f conftest.er1 conftest.err
-  fi
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
-       }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
-  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-  # interfere with the next link command; also delete a directory that is
-  # left behind by Apple's compiler.  We do this before executing the actions.
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_cxx_try_run LINENO
-# ------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_cxx_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then :
-  ac_retval=0
-else
-  $as_echo "$as_me: program exited with status $ac_status" >&5
-       $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_run
-
-# ac_fn_cxx_check_func LINENO FUNC VAR
-# ------------------------------------
-# Tests whether FUNC exists, setting the cache variable VAR accordingly
-ac_fn_cxx_check_func ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $2 innocuous_$2
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $2 (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $2
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $2 ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$2 || defined __stub___$2
-choke me
-#endif
-
-int
-main ()
-{
-return $2 ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  eval "$3=yes"
-else
-  eval "$3=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_func
-
-# ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES
-# ---------------------------------------------
-# Tests whether TYPE exists after having included INCLUDES, setting cache
-# variable VAR accordingly.
-ac_fn_cxx_check_type ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  eval "$3=no"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof ($2))
-	 return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$4
-int
-main ()
-{
-if (sizeof (($2)))
-	    return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  eval "$3=yes"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-eval ac_res=\$$3
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-
-} # ac_fn_cxx_check_type
-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 Automated Testing Framework $as_me 0.16, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-exec 5>>config.log
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    $as_echo "PATH: $as_dir"
-  done
-IFS=$as_save_IFS
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *\'*)
-      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-    2)
-      as_fn_append ac_configure_args1 " '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      as_fn_append ac_configure_args " '$ac_arg'"
-      ;;
-    esac
-  done
-done
-{ ac_configure_args0=; unset ac_configure_args0;}
-{ ac_configure_args1=; unset ac_configure_args1;}
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Use '\'' to represent an apostrophe within the trap.
-# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    $as_echo "## ---------------- ##
-## Cache variables. ##
-## ---------------- ##"
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-(
-  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-  (set) 2>&1 |
-    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      sed -n \
-	"s/'\''/'\''\\\\'\'''\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-      ;; #(
-    *)
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-)
-    echo
-
-    $as_echo "## ----------------- ##
-## Output variables. ##
-## ----------------- ##"
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=\$$ac_var
-      case $ac_val in
-      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-      esac
-      $as_echo "$ac_var='\''$ac_val'\''"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      $as_echo "## ------------------- ##
-## File substitutions. ##
-## ------------------- ##"
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=\$$ac_var
-	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      $as_echo "## ----------- ##
-## confdefs.h. ##
-## ----------- ##"
-      echo
-      cat confdefs.h
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      $as_echo "$as_me: caught signal $ac_signal"
-    $as_echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core core.conftest.* &&
-    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -f -r conftest* confdefs.h
-
-$as_echo "/* confdefs.h */" > confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
-if test -n "$CONFIG_SITE"; then
-  # We do not want a PATH search for config.site.
-  case $CONFIG_SITE in #((
-    -*)  ac_site_file1=./$CONFIG_SITE;;
-    */*) ac_site_file1=$CONFIG_SITE;;
-    *)   ac_site_file1=./$CONFIG_SITE;;
-  esac
-elif test "x$prefix" != xNONE; then
-  ac_site_file1=$prefix/share/config.site
-  ac_site_file2=$prefix/etc/config.site
-else
-  ac_site_file1=$ac_default_prefix/share/config.site
-  ac_site_file2=$ac_default_prefix/etc/config.site
-fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-do
-  test "x$ac_site_file" = xNONE && continue
-  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file" \
-      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special files
-  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . "$cache_file";;
-      *)                      . "./$cache_file";;
-    esac
-  fi
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in $ac_precious_vars; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-  eval ac_new_val=\$ac_env_${ac_var}_value
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	# differences in whitespace do not lead to failure.
-	ac_old_val_w=`echo x $ac_old_val`
-	ac_new_val_w=`echo x $ac_new_val`
-	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	  ac_cache_corrupted=:
-	else
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
-	  eval $ac_var=\$ac_old_val
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
-$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
-$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-fi
-## -------------------- ##
-## Main body of script. ##
-## -------------------- ##
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-$as_echo "#define PACKAGE_COPYRIGHT \"Copyright (c) 2007-2012 The NetBSD Foundation, Inc.\"" >>confdefs.h
-
-ac_aux_dir=
-for ac_dir in admin "$srcdir"/admin; do
-  if test -f "$ac_dir/install-sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f "$ac_dir/install.sh"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f "$ac_dir/shtool"; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in admin \"$srcdir\"/admin" "$LINENO" 5
-fi
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-
-
-ac_config_headers="$ac_config_headers bconfig.h"
-
-
-
-ac_config_commands="$ac_config_commands bootstrap/atconfig"
-
-
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_build_alias=$build_alias
-test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-test "x$ac_build_alias" = x &&
-  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
-case $ac_cv_build in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
-esac
-build=$ac_cv_build
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_build
-shift
-build_cpu=$1
-build_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-build_os=$*
-IFS=$ac_save_IFS
-case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$host_alias" = x; then
-  ac_cv_host=$ac_cv_build
-else
-  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
-case $ac_cv_host in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
-esac
-host=$ac_cv_host
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_host
-shift
-host_cpu=$1
-host_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-host_os=$*
-IFS=$ac_save_IFS
-case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test "x$target_alias" = x; then
-  ac_cv_target=$ac_cv_host
-else
-  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
-    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
-case $ac_cv_target in
-*-*-*) ;;
-*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
-esac
-target=$ac_cv_target
-ac_save_IFS=$IFS; IFS='-'
-set x $ac_cv_target
-shift
-target_cpu=$1
-target_vendor=$2
-shift; shift
-# Remember, the first character of IFS is used to create $*,
-# except with old shells:
-target_os=$*
-IFS=$ac_save_IFS
-case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-test -n "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-am__api_version='1.11'
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-# Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    rm -rf conftest.one conftest.two conftest.dir
-	    echo one > conftest.one
-	    echo two > conftest.two
-	    mkdir conftest.dir
-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-	      test -s conftest.one && test -s conftest.two &&
-	      test -s conftest.dir/conftest.one &&
-	      test -s conftest.dir/conftest.two
-	    then
-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	      break 3
-	    fi
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-
-  done
-IFS=$as_save_IFS
-
-rm -rf conftest.one conftest.two conftest.dir
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    INSTALL=$ac_install_sh
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Reject unsafe characters in $srcdir or the absolute working directory
-# name.  Accept space and tab only in the latter.
-am_lf='
-'
-case `pwd` in
-  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
-esac
-case $srcdir in
-  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-esac
-
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-test "$program_prefix" != NONE &&
-  program_transform_name="s&^&$program_prefix&;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-# Double any \ or $.
-# By default was `s,x,x', remove it if useless.
-ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-if test x"${MISSING+set}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-  *)
-    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-  esac
-fi
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if test x"${install_sh}" != xset; then
-  case $am_aux_dir in
-  *\ * | *\	*)
-    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-  *)
-    install_sh="\${SHELL} $am_aux_dir/install-sh"
-  esac
-fi
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	     'mkdir (GNU coreutils) '* | \
-	     'mkdir (coreutils) '* | \
-	     'mkdir (fileutils) '4.1*)
-	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-	       break 3;;
-	   esac
-	 done
-       done
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # As a last resort, use the slow shell script.  Don't cache a
-    # value for MKDIR_P within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the value is a relative name.
-    MKDIR_P="$ac_install_sh -d"
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AWK="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
-  *@@@%%%=?*=@@@%%%*)
-    eval ac_cv_prog_make_${ac_make}_set=yes;;
-  *)
-    eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
-fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-if test "`cd $srcdir && pwd`" != "`pwd`"; then
-  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-  # is not polluted with repeated "-I."
-  am__isrc=' -I$(srcdir)'
-  # test to see if srcdir already configured
-  if test -f $srcdir/config.status; then
-    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-  fi
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='atf'
- VERSION='0.16'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
-
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-
-
-
-case `pwd` in
-  *\ * | *\	*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
-esac
-
-
-
-macro_version='2.4.2'
-macro_revision='1.3337'
-
-
-
-
-
-
-
-
-
-
-
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-# 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'
-
-ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
-ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
-$as_echo_n "checking how to print strings... " >&6; }
-# 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*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
-$as_echo "printf" >&6; } ;;
-  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
-$as_echo "print -r" >&6; } ;;
-  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
-$as_echo "cat" >&6; } ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
-$as_echo_n "checking for style of include used by $am_make... " >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
-case `$am_make -s -f confmf 2> /dev/null` in #(
-*the\ am__doit\ target*)
-  am__include=include
-  am__quote=
-  _am_result=GNU
-  ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   case `$am_make -s -f confmf 2> /dev/null` in #(
-   *the\ am__doit\ target*)
-     am__include=.include
-     am__quote="\""
-     _am_result=BSD
-     ;;
-   esac
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-
-# The possible output files:
-ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-
-ac_rmfiles=
-for ac_file in $ac_files
-do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-  esac
-done
-rm -f $ac_rmfiles
-
-if { { ac_try="$ac_link_default"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link_default") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
-# so that the user can short-circuit this test for compilers unknown to
-# Autoconf.
-for ac_file in $ac_files ''
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-	then :; else
-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	fi
-	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
-	# argument, so we may need to know it at that point already.
-	# Even if this section looks crufty: it has the advantage of
-	# actually working.
-	break;;
-    * )
-	break;;
-  esac
-done
-test "$ac_cv_exeext" = no && ac_cv_exeext=
-
-else
-  ac_file=''
-fi
-if test -z "$ac_file"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
-ac_exeext=$ac_cv_exeext
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
-if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files="$ac_clean_files conftest.out"
-# Check that the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-if test "$cross_compiling" != yes; then
-  { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-  if { ac_try='./conftest$ac_cv_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
-    fi
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { { ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then :
-  for ac_file in conftest.o conftest.obj conftest.*; do
-  test -f "$ac_file" || continue;
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if ${ac_cv_path_SED+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-     for ac_i in 1 2 3 4 5 6 7; do
-       ac_script="$ac_script$as_nl$ac_script"
-     done
-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
-     { ac_script=; unset ac_script;}
-     if test -z "$SED"; then
-  ac_path_SED_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-# Check for GNU ac_path_SED and select it if it is found.
-  # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in
-*GNU*)
-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo '' >> "conftest.nl"
-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_SED_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_SED="$ac_path_SED"
-      ac_path_SED_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_SED_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_SED"; then
-    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
-  fi
-else
-  ac_cv_path_SED=$SED
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
- SED="$ac_cv_path_SED"
-  rm -f conftest.sed
-
-test -z "$SED" && SED=sed
-Xsed="$SED -e 1s/^X//"
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$GREP"; then
-  ac_path_GREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in grep ggrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-# Check for GNU ac_path_GREP and select it if it is found.
-  # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'GREP' >> "conftest.nl"
-    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_GREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_GREP="$ac_path_GREP"
-      ac_path_GREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_GREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_GREP"; then
-    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-   then ac_cv_path_EGREP="$GREP -E"
-   else
-     if test -z "$EGREP"; then
-  ac_path_EGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in egrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
-  # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'EGREP' >> "conftest.nl"
-    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP="$ac_path_EGREP"
-      ac_path_EGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP"; then
-    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_EGREP=$EGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
-$as_echo_n "checking for fgrep... " >&6; }
-if ${ac_cv_path_FGREP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-   then ac_cv_path_FGREP="$GREP -F"
-   else
-     if test -z "$FGREP"; then
-  ac_path_FGREP_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_prog in fgrep; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-# Check for GNU ac_path_FGREP and select it if it is found.
-  # Check for GNU $ac_path_FGREP
-case `"$ac_path_FGREP" --version 2>&1` in
-*GNU*)
-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
-*)
-  ac_count=0
-  $as_echo_n 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    $as_echo 'FGREP' >> "conftest.nl"
-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_FGREP="$ac_path_FGREP"
-      ac_path_FGREP_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_FGREP_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_FGREP"; then
-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-  fi
-else
-  ac_cv_path_FGREP=$FGREP
-fi
-
-   fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
-$as_echo "$ac_cv_path_FGREP" >&6; }
- FGREP="$ac_cv_path_FGREP"
-
-
-test -z "$GREP" && GREP=grep
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # 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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
-$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if ${lt_cv_path_NM+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-$as_echo "$lt_cv_path_NM" >&6; }
-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
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in dumpbin "link -dump"
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DUMPBIN"; then
-  ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DUMPBIN=$ac_cv_prog_DUMPBIN
-if test -n "$DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
-$as_echo "$DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$DUMPBIN" && break
-  done
-fi
-if test -z "$DUMPBIN"; then
-  ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in dumpbin "link -dump"
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DUMPBIN"; then
-  ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
-if test -n "$ac_ct_DUMPBIN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
-$as_echo "$ac_ct_DUMPBIN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_DUMPBIN" && break
-done
-
-  if test "x$ac_ct_DUMPBIN" = x; then
-    DUMPBIN=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DUMPBIN=$ac_ct_DUMPBIN
-  fi
-fi
-
-    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
-    *COFF*)
-      DUMPBIN="$DUMPBIN -symbols"
-      ;;
-    *)
-      DUMPBIN=:
-      ;;
-    esac
-  fi
-
-  if test "$DUMPBIN" != ":"; then
-    NM="$DUMPBIN"
-  fi
-fi
-test -z "$NM" && NM=nm
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
-$as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if ${lt_cv_nm_interface+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_nm_interface="BSD nm"
-  echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
-  (eval "$ac_compile" 2>conftest.err)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-  cat conftest.err >&5
-  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
-  cat conftest.out >&5
-  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-    lt_cv_nm_interface="MS dumpbin"
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
-$as_echo "$lt_cv_nm_interface" >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
-fi
-
-# find the maximum length of command line arguments
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-$as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if ${lt_cv_sys_max_cmd_len+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-    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
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
-$as_echo "none" >&6; }
-fi
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-
-
-
-
-
-: ${CP="cp -f"}
-: ${MV="mv -f"}
-: ${RM="rm -f"}
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
-$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
-# 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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
-$as_echo "$xsi_shell" >&6; }
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
-$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-    >/dev/null 2>&1 \
-  && lt_shell_append=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
-$as_echo "$lt_shell_append" >&6; }
-
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  lt_unset=unset
-else
-  lt_unset=false
-fi
-
-
-
-
-
-# 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
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
-$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
-if ${lt_cv_to_host_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-
-fi
-
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
-$as_echo "$lt_cv_to_host_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
-$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
-if ${lt_cv_to_tool_file_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  #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
-
-fi
-
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
-$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-$as_echo_n "checking for $LD option to reload object files... " >&6; }
-if ${lt_cv_ld_reload_flag+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-$as_echo "$lt_cv_ld_reload_flag" >&6; }
-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
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
-set dummy ${ac_tool_prefix}objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OBJDUMP"; then
-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OBJDUMP=$ac_cv_prog_OBJDUMP
-if test -n "$OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
-$as_echo "$OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OBJDUMP"; then
-  ac_ct_OBJDUMP=$OBJDUMP
-  # Extract the first word of "objdump", so it can be a program name with args.
-set dummy objdump; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OBJDUMP"; then
-  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OBJDUMP="objdump"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
-if test -n "$ac_ct_OBJDUMP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
-$as_echo "$ac_ct_OBJDUMP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OBJDUMP" = x; then
-    OBJDUMP="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OBJDUMP=$ac_ct_OBJDUMP
-  fi
-else
-  OBJDUMP="$ac_cv_prog_OBJDUMP"
-fi
-
-test -z "$OBJDUMP" && OBJDUMP=objdump
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-$as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if ${lt_cv_deplibs_check_method+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-$as_echo "$lt_cv_deplibs_check_method" >&6; }
-
-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DLLTOOL=$ac_cv_prog_DLLTOOL
-if test -n "$DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
-$as_echo "$DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DLLTOOL"; then
-  ac_ct_DLLTOOL=$DLLTOOL
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DLLTOOL"; then
-  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
-if test -n "$ac_ct_DLLTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
-$as_echo "$ac_ct_DLLTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DLLTOOL" = x; then
-    DLLTOOL="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DLLTOOL=$ac_ct_DLLTOOL
-  fi
-else
-  DLLTOOL="$ac_cv_prog_DLLTOOL"
-fi
-
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
-$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
-if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
-$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
-sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
-test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
-
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in ar
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$AR" && break
-  done
-fi
-if test -z "$AR"; then
-  ac_ct_AR=$AR
-  for ac_prog in ar
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_AR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_AR" && break
-done
-
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    AR=$ac_ct_AR
-  fi
-fi
-
-: ${AR=ar}
-: ${AR_FLAGS=cru}
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
-$as_echo_n "checking for archiver @FILE support... " >&6; }
-if ${lt_cv_ar_at_file+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ar_at_file=no
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  echo conftest.$ac_objext > conftest.lst
-      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
-      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-      if test "$ac_status" -eq 0; then
-	# Ensure the archiver fails upon bogus file names.
-	rm -f conftest.$ac_objext libconftest.a
-	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
-  (eval $lt_ar_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	if test "$ac_status" -ne 0; then
-          lt_cv_ar_at_file=@
-        fi
-      fi
-      rm -f conftest.* libconftest.a
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
-$as_echo "$lt_cv_ar_at_file" >&6; }
-
-if test "x$lt_cv_ar_at_file" = xno; then
-  archiver_list_spec=
-else
-  archiver_list_spec=$lt_cv_ar_at_file
-fi
-
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_STRIP" = x; then
-    STRIP=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    STRIP=$ac_ct_STRIP
-  fi
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-test -z "$STRIP" && STRIP=:
-
-
-
-
-
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-$as_echo "$ac_ct_RANLIB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_RANLIB" = x; then
-    RANLIB=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    RANLIB=$ac_ct_RANLIB
-  fi
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-test -z "$RANLIB" && RANLIB=:
-
-
-
-
-
-
-# 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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# 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
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if ${lt_cv_sys_global_symbol_pipe+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-# 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && 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_DLSYM_CONST
-#elif defined(__osf__)
-/* This system does not cope well with relocations in const data.  */
-# define LT_DLSYM_CONST
-#else
-# define LT_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_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_prog_compiler_no_builtin_flag"
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && 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" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    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
-
-fi
-
-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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-$as_echo "failed" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-$as_echo "ok" >&6; }
-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
-$as_echo_n "checking for sysroot... " >&6; }
-
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then :
-  withval=$with_sysroot;
-else
-  with_sysroot=no
-fi
-
-
-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|'')
-   ;; #(
- *)
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
-$as_echo "${with_sysroot}" >&6; }
-   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
-   ;;
-esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
-$as_echo "${lt_sysroot:-no}" >&6; }
-
-
-
-
-
-# Check whether --enable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then :
-  enableval=$enable_libtool_lock;
-fi
-
-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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if ${lt_cv_cc_needs_belf+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_cc_needs_belf=yes
-else
-  lt_cv_cc_needs_belf=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-$as_echo "$lt_cv_cc_needs_belf" >&6; }
-  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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
-set dummy ${ac_tool_prefix}mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$MANIFEST_TOOL"; then
-  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
-if test -n "$MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
-$as_echo "$MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
-  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
-  # Extract the first word of "mt", so it can be a program name with args.
-set dummy mt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_MANIFEST_TOOL"; then
-  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
-if test -n "$ac_ct_MANIFEST_TOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
-$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_MANIFEST_TOOL" = x; then
-    MANIFEST_TOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
-  fi
-else
-  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
-fi
-
-test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
-$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
-if ${lt_cv_path_mainfest_tool+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_path_mainfest_tool=no
-  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
-  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
-  cat conftest.err >&5
-  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
-    lt_cv_path_mainfest_tool=yes
-  fi
-  rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
-$as_echo "$lt_cv_path_mainfest_tool" >&6; }
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
-  MANIFEST_TOOL=:
-fi
-
-
-
-
-
-
-  case $host_os in
-    rhapsody* | darwin*)
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$DSYMUTIL"; then
-  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-DSYMUTIL=$ac_cv_prog_DSYMUTIL
-if test -n "$DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-$as_echo "$DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_DSYMUTIL"; then
-  ac_ct_DSYMUTIL=$DSYMUTIL
-  # Extract the first word of "dsymutil", so it can be a program name with args.
-set dummy dsymutil; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_DSYMUTIL"; then
-  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
-if test -n "$ac_ct_DSYMUTIL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-$as_echo "$ac_ct_DSYMUTIL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_DSYMUTIL" = x; then
-    DSYMUTIL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    DSYMUTIL=$ac_ct_DSYMUTIL
-  fi
-else
-  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
-set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$NMEDIT"; then
-  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-NMEDIT=$ac_cv_prog_NMEDIT
-if test -n "$NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-$as_echo "$NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_NMEDIT"; then
-  ac_ct_NMEDIT=$NMEDIT
-  # Extract the first word of "nmedit", so it can be a program name with args.
-set dummy nmedit; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_NMEDIT"; then
-  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
-if test -n "$ac_ct_NMEDIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-$as_echo "$ac_ct_NMEDIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_NMEDIT" = x; then
-    NMEDIT=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    NMEDIT=$ac_ct_NMEDIT
-  fi
-else
-  NMEDIT="$ac_cv_prog_NMEDIT"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
-set dummy ${ac_tool_prefix}lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$LIPO"; then
-  ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-LIPO=$ac_cv_prog_LIPO
-if test -n "$LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
-$as_echo "$LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_LIPO"; then
-  ac_ct_LIPO=$LIPO
-  # Extract the first word of "lipo", so it can be a program name with args.
-set dummy lipo; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_LIPO"; then
-  ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_LIPO="lipo"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
-if test -n "$ac_ct_LIPO"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
-$as_echo "$ac_ct_LIPO" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_LIPO" = x; then
-    LIPO=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    LIPO=$ac_ct_LIPO
-  fi
-else
-  LIPO="$ac_cv_prog_LIPO"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL"; then
-  ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL=$ac_cv_prog_OTOOL
-if test -n "$OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
-$as_echo "$OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL"; then
-  ac_ct_OTOOL=$OTOOL
-  # Extract the first word of "otool", so it can be a program name with args.
-set dummy otool; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL"; then
-  ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL="otool"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
-if test -n "$ac_ct_OTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
-$as_echo "$ac_ct_OTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL" = x; then
-    OTOOL=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL=$ac_ct_OTOOL
-  fi
-else
-  OTOOL="$ac_cv_prog_OTOOL"
-fi
-
-    if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
-set dummy ${ac_tool_prefix}otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$OTOOL64"; then
-  ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-OTOOL64=$ac_cv_prog_OTOOL64
-if test -n "$OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
-$as_echo "$OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_OTOOL64"; then
-  ac_ct_OTOOL64=$OTOOL64
-  # Extract the first word of "otool64", so it can be a program name with args.
-set dummy otool64; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_OTOOL64"; then
-  ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_OTOOL64="otool64"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
-if test -n "$ac_ct_OTOOL64"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
-$as_echo "$ac_ct_OTOOL64" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_OTOOL64" = x; then
-    OTOOL64=":"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    OTOOL64=$ac_ct_OTOOL64
-  fi
-else
-  OTOOL64="$ac_cv_prog_OTOOL64"
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-$as_echo_n "checking for -single_module linker flag... " >&6; }
-if ${lt_cv_apple_cc_single_mod+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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" >&5
-	$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 >&5
-	# 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 >&5
-	fi
-	rm -rf libconftest.dylib*
-	rm -f conftest.*
-      fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if ${lt_cv_ld_exported_symbols_list+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_ld_exported_symbols_list=no
-      save_LDFLAGS=$LDFLAGS
-      echo "_main" > conftest.sym
-      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_ld_exported_symbols_list=yes
-else
-  lt_cv_ld_exported_symbols_list=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-	LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-$as_echo_n "checking for -force_load linker flag... " >&6; }
-if ${lt_cv_ld_force_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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" >&5
-      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
-      echo "$AR cru libconftest.a conftest.o" >&5
-      $AR cru libconftest.a conftest.o 2>&5
-      echo "$RANLIB libconftest.a" >&5
-      $RANLIB libconftest.a 2>&5
-      cat > conftest.c << _LT_EOF
-int main() { return 0;}
-_LT_EOF
-      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-      $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 >&5
-      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 >&5
-      fi
-        rm -f conftest.err libconftest.a conftest conftest.c
-        rm -rf conftest.dSYM
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
-$as_echo "$lt_cv_ld_force_load" >&6; }
-    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
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_header_stdc=yes
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then :
-  :
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      return 2;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-else
-  ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-
-
-# Set options
-
-
-
-        enable_dlopen=no
-
-
-  enable_win32_dll=no
-
-
-            # Check whether --enable-shared was given.
-if test "${enable_shared+set}" = set; then :
-  enableval=$enable_shared; 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
-else
-  enable_shared=yes
-fi
-
-
-
-
-
-
-
-
-
-  # Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then :
-  enableval=$enable_static; 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
-else
-  enable_static=yes
-fi
-
-
-
-
-
-
-
-
-
-
-# Check whether --with-pic was given.
-if test "${with_pic+set}" = set; then :
-  withval=$with_pic; 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
-else
-  pic_mode=default
-fi
-
-
-test -z "$pic_mode" && pic_mode=default
-
-
-
-
-
-
-
-  # Check whether --enable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then :
-  enableval=$enable_fast_install; 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
-else
-  enable_fast_install=yes
-fi
-
-
-
-
-
-
-
-
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-test -z "$LN_S" && LN_S="ln -s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-if test -n "${ZSH_VERSION+set}" ; then
-   setopt NO_GLOB_SUBST
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-$as_echo_n "checking for objdir... " >&6; }
-if ${lt_cv_objdir+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-$as_echo "$lt_cv_objdir" >&6; }
-objdir=$lt_cv_objdir
-
-
-
-
-
-cat >>confdefs.h <<_ACEOF
-#define LT_OBJDIR "$lt_cv_objdir/"
-_ACEOF
-
-
-
-
-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
-
-for cc_temp in $compiler""; 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-%%"`
-
-
-# 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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      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
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-$as_echo_n "checking for file... " >&6; }
-if ${lt_cv_path_MAGIC_CMD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      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
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-$as_echo "$MAGIC_CMD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-# Use C for the default configuration in the libtool script
-
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$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);}'
-
-
-
-
-
-
-
-# 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
-
-# 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
-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*
-
-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*
-
-
-## 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=
-
-if test "$GCC" = yes; then
-  case $cc_basename in
-  nvcc*)
-    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
-  *)
-    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
-  esac
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # 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\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-
-
-
-
-
-  lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic='-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_prog_compiler_pic='-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
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static=
-      ;;
-
-    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_prog_compiler_pic='-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_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-
-    case $cc_basename in
-    nvcc*) # Cuda Compiler Driver 2.2
-      lt_prog_compiler_wl='-Xlinker '
-      if test -n "$lt_prog_compiler_pic"; then
-        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
-      fi
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-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).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-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_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-      case $cc_basename in
-      # old Intel for x86_64 which still supported -KPIC.
-      ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # icc used to be incompatible with GCC.
-      # ICC 10 doesn't accept -KPIC any more.
-      icc* | ifort*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      # Lahey Fortran 8.1.
-      lf95*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='--shared'
-	lt_prog_compiler_static='--static'
-	;;
-      nagfor*)
-	# NAG Fortran compiler
-	lt_prog_compiler_wl='-Wl,-Wl,,'
-	lt_prog_compiler_pic='-PIC'
-	lt_prog_compiler_static='-Bstatic'
-	;;
-      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
-        # Portland Group compilers (*not* the Pentium gcc compiler,
-	# which looks to be a dead project)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-fpic'
-	lt_prog_compiler_static='-Bstatic'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      xl* | bgxl* | bgf* | mpixl*)
-	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-qpic'
-	lt_prog_compiler_static='-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_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
-	  ;;
-	*Sun\ F* | *Sun*Fortran*)
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Qoption ld '
-	  ;;
-	*Sun\ C*)
-	  # Sun C 5.9
-	  lt_prog_compiler_pic='-KPIC'
-	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl='-Wl,'
-	  ;;
-        *Intel*\ [CF]*Compiler*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fPIC'
-	  lt_prog_compiler_static='-static'
-	  ;;
-	*Portland\ Group*)
-	  lt_prog_compiler_wl='-Wl,'
-	  lt_prog_compiler_pic='-fpic'
-	  lt_prog_compiler_static='-Bstatic'
-	  ;;
-	esac
-	;;
-      esac
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *nto* | *qnx*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic='-fPIC -shared'
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    rdos*)
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      case $cc_basename in
-      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
-	lt_prog_compiler_wl='-Qoption ld ';;
-      *)
-	lt_prog_compiler_wl='-Wl,';;
-      esac
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    unicos*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_can_build_shared=no
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
-$as_echo "$lt_cv_prog_compiler_pic" >&6; }
-lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # 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\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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
-       lt_cv_prog_compiler_pic_works=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-
-
-
-
-
-
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   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>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=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\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o=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\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  runpath_var=
-  allow_undefined_flag=
-  always_export_symbols=no
-  archive_cmds=
-  archive_expsym_cmds=
-  compiler_needs_object=no
-  enable_shared_with_static_runtimes=no
-  export_dynamic_flag_spec=
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  hardcode_automatic=no
-  hardcode_direct=no
-  hardcode_direct_absolute=no
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_separator=
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  inherit_rpath=no
-  link_all_deplibs=unknown
-  module_cmds=
-  module_expsym_cmds=
-  old_archive_from_new_cmds=
-  old_archive_from_expsyms_cmds=
-  thread_safe_flag_spec=
-  whole_archive_flag_spec=
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # 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'.
-  exclude_expsyms='_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.
-  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
-
-  ld_shlibs=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
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-    export_dynamic_flag_spec='${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
-      whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec=
-    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
-	ld_shlibs=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
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$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)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32* | cegcc*)
-      # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      export_dynamic_flag_spec='${wl}--export-all-symbols'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms='[_]+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
-        archive_cmds='$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...
-	archive_expsym_cmds='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
-	ld_shlibs=no
-      fi
-      ;;
-
-    haiku*)
-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      link_all_deplibs=yes
-      ;;
-
-    interix[3-9]*)
-      hardcode_direct=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-      export_dynamic_flag_spec='${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.
-      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-      archive_expsym_cmds='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
-	  whole_archive_flag_spec='${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
-	  whole_archive_flag_spec='${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
-	  whole_archive_flag_spec=
-	  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
-	  whole_archive_flag_spec='${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'
-	  compiler_needs_object=yes
-	  ;;
-	esac
-	case `$CC -V 2>&1 | sed 5q` in
-	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${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'
-	  compiler_needs_object=yes
-	  tmp_sharedflag='-G' ;;
-	*Sun\ F*)			# Sun Fortran 8.3
-	  tmp_sharedflag='-G' ;;
-	esac
-	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-
-        if test "x$supports_anon_versioning" = xyes; then
-          archive_expsym_cmds='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
-	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-	  if test "x$supports_anon_versioning" = xyes; then
-	    archive_expsym_cmds='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
-        ld_shlibs=no
-      fi
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$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
-	ld_shlibs=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
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-      case `$LD -v 2>&1` in
-        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
-	ld_shlibs=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
-	    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	  else
-	    ld_shlibs=no
-	  fi
-	;;
-      esac
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = no; then
-      runpath_var=
-      hardcode_libdir_flag_spec=
-      export_dynamic_flag_spec=
-      whole_archive_flag_spec=
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$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.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=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
-	  export_symbols_cmds='$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
-	  export_symbols_cmds='$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.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_direct_absolute=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      file_list_spec='${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
-	  hardcode_direct=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
-	  hardcode_minus_L=yes
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_libdir_separator=
-	  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
-
-      export_dynamic_flag_spec='${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.
-      always_export_symbols=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.
-	allow_undefined_flag='-berok'
-        # Determine the default libpath from the value encoded in an
-        # empty executable.
-        if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`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_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$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
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$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.
-	 if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath_+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath_=`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_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath_"; then
-    lt_cv_aix_libpath_="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath_
-fi
-
-	 hardcode_libdir_flag_spec='${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.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  if test "$with_gnu_ld" = yes; then
-	    # We only use this code for GNU lds that support --whole-archive.
-	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	  else
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec='$convenience'
-	  fi
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds its shared libraries.
-	  archive_expsym_cmds="\$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
-            archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-            archive_expsym_cmds=''
-        ;;
-      m68k)
-            archive_cmds='$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)'
-            hardcode_libdir_flag_spec='-L$libdir'
-            hardcode_minus_L=yes
-        ;;
-      esac
-      ;;
-
-    bsdi[45]*)
-      export_dynamic_flag_spec=-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
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=unsupported
-	always_export_symbols=yes
-	file_list_spec='@'
-	# 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.
-	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	archive_expsym_cmds='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, )='true'
-	enable_shared_with_static_runtimes=yes
-	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-	# Don't use ranlib
-	old_postinstall_cmds='chmod 644 $oldlib'
-	postlink_cmds='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
-	hardcode_libdir_flag_spec=' '
-	allow_undefined_flag=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.
-	archive_cmds='$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.
-	old_archive_from_new_cmds='true'
-	# FIXME: Should let the user specify the lib program.
-	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-	enable_shared_with_static_runtimes=yes
-	;;
-      esac
-      ;;
-
-    darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc=no
-  hardcode_direct=no
-  hardcode_automatic=yes
-  hardcode_shlibpath_var=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec=''
-  fi
-  link_all_deplibs=yes
-  allow_undefined_flag="$_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
-    archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds="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}"
-    module_expsym_cmds="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}"
-
-  else
-  ld_shlibs=no
-  fi
-
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=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*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2.*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | dragonfly*)
-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$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
-	archive_cmds='$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
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-	hardcode_direct=yes
-	hardcode_direct_absolute=yes
-	export_dynamic_flag_spec='${wl}-E'
-	# hardcode_minus_L: Not really in the search PATH,
-	# but as the default location of the library.
-	hardcode_minus_L=yes
-      fi
-      ;;
-
-    hpux11*)
-      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$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*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-
-	  # 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)
-	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
-$as_echo_n "checking if $CC understands -b... " >&6; }
-if ${lt_cv_prog_compiler__b+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler__b=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS -b"
-   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>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler__b=yes
-       fi
-     else
-       lt_cv_prog_compiler__b=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
-$as_echo "$lt_cv_prog_compiler__b" >&6; }
-
-if test x"$lt_cv_prog_compiler__b" = xyes; then
-    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-else
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-fi
-
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator=:
-
-	case $host_cpu in
-	hppa*64*|ia64*)
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	*)
-	  hardcode_direct=yes
-	  hardcode_direct_absolute=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$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.
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
-$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
-if ${lt_cv_irix_exported_symbol+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  save_LDFLAGS="$LDFLAGS"
-	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-int foo (void) { return 0; }
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  lt_cv_irix_exported_symbol=yes
-else
-  lt_cv_irix_exported_symbol=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-           LDFLAGS="$save_LDFLAGS"
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
-$as_echo "$lt_cv_irix_exported_symbol" >&6; }
-	if test "$lt_cv_irix_exported_symbol" = yes; then
-          archive_expsym_cmds='$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
-	archive_cmds='$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'
-	archive_expsym_cmds='$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
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      inherit_rpath=yes
-      link_all_deplibs=yes
-      ;;
-
-    netbsd*)
-      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    *nto* | *qnx*)
-      ;;
-
-    openbsd*)
-      if test -f /usr/libexec/ld.so; then
-	hardcode_direct=yes
-	hardcode_shlibpath_var=no
-	hardcode_direct_absolute=yes
-	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	  export_dynamic_flag_spec='${wl}-E'
-	else
-	  case $host_os in
-	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	     hardcode_libdir_flag_spec='-R$libdir'
-	     ;;
-	   *)
-	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	     ;;
-	  esac
-	fi
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$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'
-      old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$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
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$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
-      archive_cmds_need_lc='no'
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$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'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$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'
-	archive_expsym_cmds='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
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      archive_cmds_need_lc='no'
-      hardcode_libdir_separator=:
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z defs'
-      if test "$GCC" = yes; then
-	wlarc='${wl}'
-	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='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=''
-	  archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  archive_expsym_cmds='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}'
-	  archive_cmds='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='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
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=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
-	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	else
-	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
-	fi
-	;;
-      esac
-      link_all_deplibs=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.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag='${wl}-z,text'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$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.
-      no_undefined_flag='${wl}-z,text'
-      allow_undefined_flag='${wl}-z,nodefs'
-      archive_cmds_need_lc=no
-      hardcode_shlibpath_var=no
-      hardcode_libdir_flag_spec='${wl}-R,$libdir'
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var='LD_RUN_PATH'
-
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-
-    if test x$host_vendor = xsni; then
-      case $host in
-      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-	export_dynamic_flag_spec='${wl}-Blargedynsym'
-	;;
-      esac
-    fi
-  fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-$as_echo "$ld_shlibs" >&6; }
-test "$ld_shlibs" = no && can_build_shared=no
-
-with_gnu_ld=$with_gnu_ld
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds 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.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl
-	  pic_flag=$lt_prog_compiler_pic
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag
-	  allow_undefined_flag=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc=no
-	  else
-	    lt_cv_archive_cmds_need_lc=yes
-	  fi
-	  allow_undefined_flag=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
-      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-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}'
-
-      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`'
-
-  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
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  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
-
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
-  # 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="$sys_lib_dlsearch_path_spec $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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" ||
-   test -n "$runpath_var" ||
-   test "X$hardcode_automatic" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct" != 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, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-$as_echo "$hardcode_action" >&6; }
-
-if test "$hardcode_action" = relink ||
-   test "$inherit_rpath" = 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
-
-
-
-
-
-
-  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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-    ;;
-
-  *)
-    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-$as_echo_n "checking for shl_load in -ldld... " >&6; }
-if ${ac_cv_lib_dld_shl_load+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char shl_load ();
-int
-main ()
-{
-return shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_shl_load=yes
-else
-  ac_cv_lib_dld_shl_load=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else
-  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-$as_echo_n "checking for dlopen in -ldl... " >&6; }
-if ${ac_cv_lib_dl_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dl_dlopen=yes
-else
-  ac_cv_lib_dl_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if ${ac_cv_lib_svld_dlopen+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dlopen ();
-int
-main ()
-{
-return dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_svld_dlopen=yes
-else
-  ac_cv_lib_svld_dlopen=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-$as_echo_n "checking for dld_link in -ldld... " >&6; }
-if ${ac_cv_lib_dld_dld_link+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char dld_link ();
-int
-main ()
-{
-return dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_dld_dld_link=yes
-else
-  ac_cv_lib_dld_dld_link=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  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"
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-$as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-$as_echo "$lt_cv_dlopen_self" >&6; }
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if ${lt_cv_dlopen_self_static+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-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 { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) >&5 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-$as_echo "$lt_cv_dlopen_self_static" >&6; }
-    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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-striplib=
-old_striplib=
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-$as_echo_n "checking whether stripping libraries is possible... " >&6; }
-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"
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-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"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-    else
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    fi
-    ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-  # Report which library types will actually be built
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-$as_echo_n "checking if libtool supports shared libraries... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-$as_echo "$can_build_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-$as_echo_n "checking whether to build shared libraries... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-$as_echo "$enable_shared" >&6; }
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-$as_echo_n "checking whether to build static libraries... " >&6; }
-  # Make sure either enable_shared or enable_static is yes.
-  test "$enable_shared" = yes || enable_static=yes
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-$as_echo "$enable_static" >&6; }
-
-
-
-
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-        ac_config_commands="$ac_config_commands libtool"
-
-
-
-
-# Only expand once:
-
-
-
-# Check whether --enable-tools was given.
-if test "${enable_tools+set}" = set; then :
-  enableval=$enable_tools; case $enableval in
-     yes|no) enable_tools=${enableval} ;;
-     *) as_fn_error $? "Invalid value passed to --enable-tools" "$LINENO" 5 ;;
-     esac
-else
-  enable_tools=no
-fi
-
-ENABLE_TOOLS=${enable_tools}
-
- if test "${enable_tools}" = yes; then
-  ENABLE_TOOLS_TRUE=
-  ENABLE_TOOLS_FALSE='#'
-else
-  ENABLE_TOOLS_TRUE='#'
-  ENABLE_TOOLS_FALSE=
-fi
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-          if test -n "$ac_tool_prefix"; then
-    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  fi
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl.exe
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl.exe
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CC" && break
-done
-
-  if test "x$ac_ct_CC" = x; then
-    CC=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CC=$ac_ct_CC
-  fi
-fi
-
-fi
-
-
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
-
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_c_werror_flag=$ac_c_werror_flag
-   ac_c_werror_flag=yes
-   ac_cv_prog_cc_g=no
-   CFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-else
-  CFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-else
-  ac_c_werror_flag=$ac_save_c_werror_flag
-	 CFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"; then :
-  ac_cv_prog_cc_c89=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext
-  test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
-fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
-  x)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
-  xno)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
-  *)
-    CC="$CC $ac_cv_prog_cc_c89"
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-if test "x$CC" != xcc; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-fi
-set dummy $CC; ac_cc=`$as_echo "$2" |
-		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-rm -f conftest2.*
-if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.$ac_ext >&5'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-      rm -f conftest2.*
-      if { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } &&
-	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; };
-      then
-	# cc works too.
-	:
-      else
-	# cc exists but doesn't like -o.
-	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
-  fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-fi
-rm -f core conftest*
-
-fi
-if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-
-fi
-
-# FIXME: we rely on the cache variable name because
-# there is no other way.
-set dummy $CC
-am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-if test "$am_t" != yes; then
-   # Losing compiler, so override with the script.
-   # FIXME: It is wrong to rewrite CC.
-   # But if we don't then we get into trouble of one sort or another.
-   # A longer-term fix would be to have automake use am__CC in this case,
-   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-   CC="$am_aux_dir/compile $CC"
-fi
-
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-
-
-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
-
-      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if ${ac_cv_prog_CXXCPP+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-else
-  _lt_caught_CXX_error=yes
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-compiler_needs_object_CXX=no
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_direct_absolute_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_shlibpath_var_CXX=unsupported
-hardcode_automatic_CXX=no
-inherit_rpath_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-reload_flag_CXX=$reload_flag
-reload_cmds_CXX=$reload_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Source file extension for C++ test sources.
-ac_ext=cpp
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$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.
-
-
-
-
-
-
-# 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
-
-
-  # save warnings/boilerplate of simple test code
-  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*
-
-  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*
-
-
-  # 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
-  compiler_CXX=$CC
-  for cc_temp in $compiler""; 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-%%"`
-
-
-  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_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-    else
-      lt_prog_compiler_no_builtin_flag_CXX=
-    fi
-
-    if test "$GXX" = yes; then
-      # Set up default GNU C++ configuration
-
-
-
-# Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
-  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
-fi
-if ${lt_cv_path_LD+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  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
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${lt_cv_prog_gnu_ld+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  # 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
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-$as_echo "$lt_cv_prog_gnu_ld" >&6; }
-with_gnu_ld=$lt_cv_prog_gnu_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
-        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$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'
-
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-        export_dynamic_flag_spec_CXX='${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
-          whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-        else
-          whole_archive_flag_spec_CXX=
-        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.
-        archive_cmds_CXX='$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
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-    ld_shlibs_CXX=yes
-    case $host_os in
-      aix3*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=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.
-
-        archive_cmds_CXX=''
-        hardcode_direct_CXX=yes
-        hardcode_direct_absolute_CXX=yes
-        hardcode_libdir_separator_CXX=':'
-        link_all_deplibs_CXX=yes
-        file_list_spec_CXX='${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
-	    hardcode_direct_CXX=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
-	    hardcode_minus_L_CXX=yes
-	    hardcode_libdir_flag_spec_CXX='-L$libdir'
-	    hardcode_libdir_separator_CXX=
-	  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
-
-        export_dynamic_flag_spec_CXX='${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.
-        always_export_symbols_CXX=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.
-          allow_undefined_flag_CXX='-berok'
-          # Determine the default libpath from the value encoded in an empty
-          # executable.
-          if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`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_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
-
-          hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-          archive_expsym_cmds_CXX='$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
-	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	    allow_undefined_flag_CXX="-z nodefs"
-	    archive_expsym_cmds_CXX="\$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.
-	    if test "${lt_cv_aix_libpath+set}" = set; then
-  aix_libpath=$lt_cv_aix_libpath
-else
-  if ${lt_cv_aix_libpath__CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-  lt_aix_libpath_sed='
-      /Import File Strings/,/^$/ {
-	  /^0/ {
-	      s/^0  *\([^ ]*\) *$/\1/
-	      p
-	  }
-      }'
-  lt_cv_aix_libpath__CXX=`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_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-  fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-  if test -z "$lt_cv_aix_libpath__CXX"; then
-    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
-  fi
-
-fi
-
-  aix_libpath=$lt_cv_aix_libpath__CXX
-fi
-
-	    hardcode_libdir_flag_spec_CXX='${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.
-	    no_undefined_flag_CXX=' ${wl}-bernotok'
-	    allow_undefined_flag_CXX=' ${wl}-berok'
-	    if test "$with_gnu_ld" = yes; then
-	      # We only use this code for GNU lds that support --whole-archive.
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    else
-	      # Exported symbols can be pulled into shared objects from archives
-	      whole_archive_flag_spec_CXX='$convenience'
-	    fi
-	    archive_cmds_need_lc_CXX=yes
-	    # This is similar to how AIX traditionally builds its shared
-	    # libraries.
-	    archive_expsym_cmds_CXX="\$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
-	  allow_undefined_flag_CXX=unsupported
-	  # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	  # support --undefined.  This deserves some investigation.  FIXME
-	  archive_cmds_CXX='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	else
-	  ld_shlibs_CXX=no
-	fi
-	;;
-
-      chorus*)
-        case $cc_basename in
-          *)
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=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.
-	  hardcode_libdir_flag_spec_CXX=' '
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=yes
-	  file_list_spec_CXX='@'
-	  # 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.
-	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
-	  archive_expsym_cmds_CXX='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, CXX)='true'
-	  enable_shared_with_static_runtimes_CXX=yes
-	  # Don't use ranlib
-	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
-	  postlink_cmds_CXX='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, CXX) is actually meaningless,
-	  # as there is no search path for DLLs.
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
-	  allow_undefined_flag_CXX=unsupported
-	  always_export_symbols_CXX=no
-	  enable_shared_with_static_runtimes_CXX=yes
-
-	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-	    archive_cmds_CXX='$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...
-	    archive_expsym_cmds_CXX='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
-	    ld_shlibs_CXX=no
-	  fi
-	  ;;
-	esac
-	;;
-      darwin* | rhapsody*)
-
-
-  archive_cmds_need_lc_CXX=no
-  hardcode_direct_CXX=no
-  hardcode_automatic_CXX=yes
-  hardcode_shlibpath_var_CXX=unsupported
-  if test "$lt_cv_ld_force_load" = "yes"; then
-    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
-
-  else
-    whole_archive_flag_spec_CXX=''
-  fi
-  link_all_deplibs_CXX=yes
-  allow_undefined_flag_CXX="$_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
-    archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
-    module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
-    archive_expsym_cmds_CXX="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}"
-    module_expsym_cmds_CXX="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}"
-       if test "$lt_cv_apple_cc_single_mod" != "yes"; then
-      archive_cmds_CXX="\$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}"
-      archive_expsym_cmds_CXX="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
-  ld_shlibs_CXX=no
-  fi
-
-	;;
-
-      dgux*)
-        case $cc_basename in
-          ec++*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          ghcx*)
-	    # Green Hills C++ Compiler
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      freebsd2.*)
-        # C++ shared libraries reported to be fairly broken before
-	# switch to ELF
-        ld_shlibs_CXX=no
-        ;;
-
-      freebsd-elf*)
-        archive_cmds_need_lc_CXX=no
-        ;;
-
-      freebsd* | dragonfly*)
-        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-        # conventions
-        ld_shlibs_CXX=yes
-        ;;
-
-      gnu*)
-        ;;
-
-      haiku*)
-        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        link_all_deplibs_CXX=yes
-        ;;
-
-      hpux9*)
-        hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        export_dynamic_flag_spec_CXX='${wl}-E'
-        hardcode_direct_CXX=yes
-        hardcode_minus_L_CXX=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
-            ld_shlibs_CXX=no
-            ;;
-          aCC*)
-            archive_cmds_CXX='$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
-              archive_cmds_CXX='$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
-              ld_shlibs_CXX=no
-            fi
-            ;;
-        esac
-        ;;
-
-      hpux10*|hpux11*)
-        if test $with_gnu_ld = no; then
-	  hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-          case $host_cpu in
-            hppa*64*|ia64*)
-              ;;
-            *)
-	      export_dynamic_flag_spec_CXX='${wl}-E'
-              ;;
-          esac
-        fi
-        case $host_cpu in
-          hppa*64*|ia64*)
-            hardcode_direct_CXX=no
-            hardcode_shlibpath_var_CXX=no
-            ;;
-          *)
-            hardcode_direct_CXX=yes
-            hardcode_direct_absolute_CXX=yes
-            hardcode_minus_L_CXX=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
-	    ld_shlibs_CXX=no
-	    ;;
-          aCC*)
-	    case $host_cpu in
-	      hppa*64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      ia64*)
-	        archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	        ;;
-	      *)
-	        archive_cmds_CXX='$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*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	            ;;
-	          *)
-	            archive_cmds_CXX='$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
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      interix[3-9]*)
-	hardcode_direct_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${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.
-	archive_cmds_CXX='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-	archive_expsym_cmds_CXX='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++
-	    archive_cmds_CXX='$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.
-	    old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    if test "$GXX" = yes; then
-	      if test "$with_gnu_ld" = no; then
-	        archive_cmds_CXX='$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
-	        archive_cmds_CXX='$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
-	    link_all_deplibs_CXX=yes
-	    ;;
-        esac
-        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-        hardcode_libdir_separator_CXX=:
-        inherit_rpath_CXX=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.
-	    archive_cmds_CXX='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'
-	    archive_expsym_cmds_CXX='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"'
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	    # Archives containing C++ object files must be created using
-	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	    old_archive_cmds_CXX='$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."*)
-	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$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
-	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-		;;
-	    esac
-	    archive_cmds_need_lc_CXX=no
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	    ;;
-          pgCC* | pgcpp*)
-            # Portland Group C++ compiler
-	    case `$CC -V` in
-	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
-	      prelink_cmds_CXX='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`"'
-	      old_archive_cmds_CXX='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'
-	      archive_cmds_CXX='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'
-	      archive_expsym_cmds_CXX='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
-	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-	      archive_expsym_cmds_CXX='$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
-
-	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${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++
-	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$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
-	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # 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
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    archive_cmds_CXX='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	    if test "x$supports_anon_versioning" = xyes; then
-	      archive_expsym_cmds_CXX='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
-	      no_undefined_flag_CXX=' -zdefs'
-	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
-	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='${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'
-	      compiler_needs_object_CXX=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.
-	      old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-
-      lynxos*)
-        # FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-
-      m88k*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-	;;
-
-      mvs*)
-        case $cc_basename in
-          cxx*)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	  *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-	esac
-	;;
-
-      netbsd*)
-        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
-	  archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-	  wlarc=
-	  hardcode_libdir_flag_spec_CXX='-R$libdir'
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=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*)
-        ld_shlibs_CXX=yes
-	;;
-
-      openbsd2*)
-        # C++ shared libraries are fairly broken
-	ld_shlibs_CXX=no
-	;;
-
-      openbsd*)
-	if test -f /usr/libexec/ld.so; then
-	  hardcode_direct_CXX=yes
-	  hardcode_shlibpath_var_CXX=no
-	  hardcode_direct_absolute_CXX=yes
-	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-	    export_dynamic_flag_spec_CXX='${wl}-E'
-	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-	  fi
-	  output_verbose_link_cmd=func_echo_all
-	else
-	  ld_shlibs_CXX=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.
-	    archive_cmds_CXX='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'
-
-	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	    hardcode_libdir_separator_CXX=:
-
-	    # Archives containing C++ object files must be created using
-	    # the KAI C++ compiler.
-	    case $host in
-	      osf3*) old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' ;;
-	      *) old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' ;;
-	    esac
-	    ;;
-          RCC*)
-	    # Rational C++ 2.4.1
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          cxx*)
-	    case $host in
-	      osf3*)
-	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	        archive_cmds_CXX='$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'
-	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-		;;
-	      *)
-	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$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'
-	        archive_expsym_cmds_CXX='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'
-	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-		;;
-	    esac
-
-	    hardcode_libdir_separator_CXX=:
-
-	    # 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
-	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	      case $host in
-	        osf3*)
-	          archive_cmds_CXX='$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'
-		  ;;
-	        *)
-	          archive_cmds_CXX='$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
-
-	      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	      hardcode_libdir_separator_CXX=:
-
-	      # 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
-	      ld_shlibs_CXX=no
-	    fi
-	    ;;
-        esac
-        ;;
-
-      psos*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      sunos4*)
-        case $cc_basename in
-          CC*)
-	    # Sun C++ 4.x
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          lcc*)
-	    # Lucid
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      solaris*)
-        case $cc_basename in
-          CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-            archive_cmds_need_lc_CXX=yes
-	    no_undefined_flag_CXX=' -zdefs'
-	    archive_cmds_CXX='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	    archive_expsym_cmds_CXX='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'
-
-	    hardcode_libdir_flag_spec_CXX='-R$libdir'
-	    hardcode_shlibpath_var_CXX=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?)
-		whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
-	        ;;
-	    esac
-	    link_all_deplibs_CXX=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.
-	    old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	    ;;
-          gcx*)
-	    # Green Hills C++ Compiler
-	    archive_cmds_CXX='$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.
-	    old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	    ;;
-          *)
-	    # GNU C++ compiler with Solaris linker
-	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='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.
-	        archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	        archive_expsym_cmds_CXX='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
-
-	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	      case $host_os in
-		solaris2.[0-5] | solaris2.[0-5].*) ;;
-		*)
-		  whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-		  ;;
-	      esac
-	    fi
-	    ;;
-        esac
-        ;;
-
-    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
-      no_undefined_flag_CXX='${wl}-z,text'
-      archive_cmds_need_lc_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      runpath_var='LD_RUN_PATH'
-
-      case $cc_basename in
-        CC*)
-	  archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds_CXX='$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.
-	no_undefined_flag_CXX='${wl}-z,text'
-	allow_undefined_flag_CXX='${wl}-z,nodefs'
-	archive_cmds_need_lc_CXX=no
-	hardcode_shlibpath_var_CXX=no
-	hardcode_libdir_flag_spec_CXX='${wl}-R,$libdir'
-	hardcode_libdir_separator_CXX=':'
-	link_all_deplibs_CXX=yes
-	export_dynamic_flag_spec_CXX='${wl}-Bexport'
-	runpath_var='LD_RUN_PATH'
-
-	case $cc_basename in
-          CC*)
-	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
-	      '"$old_archive_cmds_CXX"
-	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
-	      '"$reload_cmds_CXX"
-	    ;;
-	  *)
-	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-	    archive_expsym_cmds_CXX='$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
-	    ld_shlibs_CXX=no
-	    ;;
-          *)
-	    # FIXME: insert proper C++ library support
-	    ld_shlibs_CXX=no
-	    ;;
-        esac
-        ;;
-
-      vxworks*)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-
-      *)
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-        ;;
-    esac
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-    test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-    GCC_CXX="$GXX"
-    LD_CXX="$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...
-    # Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-cat > conftest.$ac_ext <<_LT_EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-_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
-
-if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; 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 "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${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 "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${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 "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$RM -f confest.$objext
-CFLAGS=$_lt_libdeps_save_CFLAGS
-
-# PORTME: override above test on systems where it is broken
-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.
-  predep_objects_CXX=
-  postdep_objects_CXX=
-  postdeps_CXX=
-  ;;
-
-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
-      postdeps_CXX='-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
-      postdeps_CXX='-library=Cstd -library=Crun'
-    fi
-    ;;
-  esac
-  ;;
-esac
-
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
- compiler_lib_search_dirs_CXX=
-if test -n "${compiler_lib_search_path_CXX}"; then
- compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
-fi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      case $host_cpu in
-      powerpc)
-            # see comment about AmigaOS4 .so support
-            lt_prog_compiler_pic_CXX='-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_prog_compiler_pic_CXX='-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
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    haiku*)
-      # PIC is the default for Haiku.
-      # The "-static" flag exists, but is broken.
-      lt_prog_compiler_static_CXX=
-      ;;
-    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_prog_compiler_pic_CXX=-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_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *qnx* | *nto*)
-      # QNX uses GNU C++, but need to define -shared option too, otherwise
-      # it will coredump.
-      lt_prog_compiler_pic_CXX='-fPIC -shared'
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-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_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68*)
-	  # Green Hills C++ Compiler
-	  # _LT_TAGVAR(lt_prog_compiler_static, CXX)="--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).
-	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++*)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | dragonfly*)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='${wl}-a ${wl}archive'
-	    case $host_cpu in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+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_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-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_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  ecpc* )
-	    # old Intel C++ for x86_64 which still supported -KPIC.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  icpc* )
-	    # Intel C++, used to be incompatible with GCC.
-	    # ICC 10 doesn't accept -KPIC any more.
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  pgCC* | pgcpp*)
-	    # Portland Group C++ compiler
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-fpic'
-	    lt_prog_compiler_static_CXX='-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_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
-	    # IBM XL 8.0, 9.0 on PPC and BlueGene
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-qpic'
-	    lt_prog_compiler_static_CXX='-qstaticlink'
-	    ;;
-	  *)
-	    case `$CC -V 2>&1 | sed 5q` in
-	    *Sun\ C*)
-	      # Sun C++ 5.9
-	      lt_prog_compiler_pic_CXX='-KPIC'
-	      lt_prog_compiler_static_CXX='-Bstatic'
-	      lt_prog_compiler_wl_CXX='-Qoption ld '
-	      ;;
-	    esac
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx*)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd*)
-	;;
-      *qnx* | *nto*)
-        # QNX uses GNU C++, but need to define -shared option too, otherwise
-        # it will coredump.
-        lt_prog_compiler_pic_CXX='-fPIC -shared'
-        ;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC*)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC*)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx*)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC* | sunCC*)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx*)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC*)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc*)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-	case $cc_basename in
-	  CC*)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC*)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-case $host_os in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
-if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
-lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_pic_works_CXX=no
-   ac_outfile=conftest.$ac_objext
-   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # 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\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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
-       lt_cv_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-
-
-
-
-
-#
-# Check to make sure the static flag actually works.
-#
-wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_static_works_CXX=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-   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>&5
-       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
-       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-       if diff conftest.exp conftest.er2 >/dev/null; then
-         lt_cv_prog_compiler_static_works_CXX=yes
-       fi
-     else
-       lt_cv_prog_compiler_static_works_CXX=yes
-     fi
-   fi
-   $RM -r conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
-
-if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-    :
-else
-    lt_prog_compiler_static_CXX=
-fi
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=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\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=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\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   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_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w . 2>&5
-   $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*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-
-
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-$as_echo_n "checking if we can lock with hard links... " >&6; }
-  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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-$as_echo "$hard_links" >&6; }
-  if test "$hard_links" = no; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  exclude_expsyms_CXX='_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
-      export_symbols_cmds_CXX='$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
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-    ;;
-  cygwin* | mingw* | cegcc*)
-    case $cc_basename in
-    cl*)
-      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-      ;;
-    *)
-      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
-      ;;
-    esac
-    ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-    ;;
-  esac
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-$as_echo "$ld_shlibs_CXX" >&6; }
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-with_gnu_ld_CXX=$with_gnu_ld
-
-
-
-
-
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX 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.
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  $RM conftest*
-	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } 2>conftest.err; then
-	  soname=conftest
-	  lib=conftest
-	  libobjs=conftest.$ac_objext
-	  deplibs=
-	  wl=$lt_prog_compiler_wl_CXX
-	  pic_flag=$lt_prog_compiler_pic_CXX
-	  compiler_flags=-v
-	  linker_flags=-v
-	  verstring=
-	  output_objdir=.
-	  libname=conftest
-	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-	  allow_undefined_flag_CXX=
-	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-	  then
-	    lt_cv_archive_cmds_need_lc_CXX=no
-	  else
-	    lt_cv_archive_cmds_need_lc_CXX=yes
-	  fi
-	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-	else
-	  cat conftest.err 1>&5
-	fi
-	$RM conftest*
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
-$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
-      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-$as_echo_n "checking dynamic linker characteristics... " >&6; }
-
-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}'
-
-      ;;
-    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`'
-
-  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
-  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  lt_cv_shlibpath_overrides_runpath=no
-    save_LDFLAGS=$LDFLAGS
-    save_libdir=$libdir
-    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  lt_cv_shlibpath_overrides_runpath=yes
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-    LDFLAGS=$save_LDFLAGS
-    libdir=$save_libdir
-
-fi
-
-  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
-
-  # Add ABI-specific directories to the system library path.
-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
-
-  # 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="$sys_lib_dlsearch_path_spec $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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-$as_echo "$dynamic_linker" >&6; }
-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
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" ||
-   test -n "$runpath_var_CXX" ||
-   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-
-  # We can hardcode non-existent directories.
-  if test "$hardcode_direct_CXX" != 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, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-$as_echo "$hardcode_action_CXX" >&6; }
-
-if test "$hardcode_action_CXX" = relink ||
-   test "$inherit_rpath_CXX" = 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
-
-
-
-
-
-
-
-  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_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler works" >&5
-$as_echo_n "checking whether the C++ compiler works... " >&6; }
-if ${atf_cv_prog_cxx_works+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  atf_cv_prog_cxx_works=yes
-else
-  atf_cv_prog_cxx_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-                ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $atf_cv_prog_cxx_works" >&5
-$as_echo "$atf_cv_prog_cxx_works" >&6; }
-if test "${atf_cv_prog_cxx_works}" = no; then
-    as_fn_error $? "C++ compiler cannot create executables" "$LINENO" 5
-fi
-
-
-
-
-    # Check whether --enable-developer was given.
-if test "${enable_developer+set}" = set; then :
-  enableval=$enable_developer;
-else
-  if test -d ${srcdir}/.git; then
-             { $as_echo "$as_me:${as_lineno-$LINENO}: building from HEAD; developer mode autoenabled" >&5
-$as_echo "$as_me: building from HEAD; developer mode autoenabled" >&6;}
-             enable_developer=yes
-         else
-             enable_developer=no
-         fi
-fi
-
-
-    #
-    # The following warning flags should also be enabled but cannot be.
-    # Reasons given below.
-    #
-    # -Wold-style-cast: Raises errors when using TIOCGWINSZ, at least under
-    #                   Mac OS X.  This is due to the way _IOR is defined.
-    #
-
-    try_c_cxx_flags="-D_FORTIFY_SOURCE=2 \
-                     -Wall \
-                     -Wcast-qual \
-                     -Wextra \
-                     -Wpointer-arith \
-                     -Wredundant-decls \
-                     -Wreturn-type \
-                     -Wshadow \
-                     -Wsign-compare \
-                     -Wswitch \
-                     -Wwrite-strings"
-
-    try_c_flags="-Wmissing-prototypes \
-                 -Wno-traditional \
-                 -Wstrict-prototypes"
-
-    try_cxx_flags="-Wabi \
-                   -Wctor-dtor-privacy \
-                   -Wno-deprecated \
-                   -Wno-non-template-friend \
-                   -Wno-pmf-conversions \
-                   -Wnon-virtual-dtor \
-                   -Woverloaded-virtual \
-                   -Wreorder \
-                   -Wsign-promo \
-                   -Wsynth"
-
-    if test ${enable_developer} = yes; then
-        try_werror=yes
-        try_c_cxx_flags="${try_c_cxx_flags} -g -Werror"
-    else
-        try_werror=no
-        try_c_cxx_flags="${try_c_cxx_flags} -DNDEBUG"
-    fi
-
-
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    valid_cflags=
-    for f in ${try_c_cxx_flags} ${try_c_flags}; do
-
-
-
-
-    if test x"${kyua_CC_has_werror-unset}" = xunset; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports -Werror" >&5
-$as_echo_n "checking whether ${CC} supports -Werror... " >&6; }
-        saved_flags="${CFLAGS}"
-        kyua_CC_has_werror=no
-        CFLAGS="${CFLAGS}  -Werror"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-                       kyua_CC_has_werror=yes
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        CFLAGS="${saved_flags}"
-    fi
-
-    if test "${f}" = "-Werror"; then
-        found=${kyua_CC_has_werror}
-    else
-        found=unset
-        if test ${kyua_CC_has_werror} = yes; then
-
-    if test x"${found-unset}" = xunset; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports ${f}" >&5
-$as_echo_n "checking whether ${CC} supports ${f}... " >&6; }
-        saved_flags="${CFLAGS}"
-        found=no
-        CFLAGS="${CFLAGS} -Werror ${f}"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-                       found=yes
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        CFLAGS="${saved_flags}"
-    fi
-
-        else
-
-    if test x"${found-unset}" = xunset; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CC} supports ${f}" >&5
-$as_echo_n "checking whether ${CC} supports ${f}... " >&6; }
-        saved_flags="${CFLAGS}"
-        found=no
-        CFLAGS="${CFLAGS}  ${f}"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-                       found=yes
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        CFLAGS="${saved_flags}"
-    fi
-
-        fi
-    fi
-    if test ${found} = yes; then
-        valid_cflags="${valid_cflags} ${f}"
-    fi
-
-
-    done
-    if test -n "${valid_cflags}"; then
-        CFLAGS="${CFLAGS} ${valid_cflags}"
-    fi
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-    valid_cxxflags=
-    for f in ${try_c_cxx_flags} ${try_cxx_flags}; do
-
-
-
-
-    if test x"${kyua_CXX_has_werror-unset}" = xunset; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports -Werror" >&5
-$as_echo_n "checking whether ${CXX} supports -Werror... " >&6; }
-        saved_flags="${CXXFLAGS}"
-        kyua_CXX_has_werror=no
-        CXXFLAGS="${CXXFLAGS}  -Werror"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-                       kyua_CXX_has_werror=yes
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        CXXFLAGS="${saved_flags}"
-    fi
-
-    if test "${f}" = "-Werror"; then
-        found=${kyua_CXX_has_werror}
-    else
-        found=unset
-        if test ${kyua_CXX_has_werror} = yes; then
-
-    if test x"${found-unset}" = xunset; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports ${f}" >&5
-$as_echo_n "checking whether ${CXX} supports ${f}... " >&6; }
-        saved_flags="${CXXFLAGS}"
-        found=no
-        CXXFLAGS="${CXXFLAGS} -Werror ${f}"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-                       found=yes
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        CXXFLAGS="${saved_flags}"
-    fi
-
-        else
-
-    if test x"${found-unset}" = xunset; then
-        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${CXX} supports ${f}" >&5
-$as_echo_n "checking whether ${CXX} supports ${f}... " >&6; }
-        saved_flags="${CXXFLAGS}"
-        found=no
-        CXXFLAGS="${CXXFLAGS}  ${f}"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-                       found=yes
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-        CXXFLAGS="${saved_flags}"
-    fi
-
-        fi
-    fi
-    if test ${found} = yes; then
-        valid_cxxflags="${valid_cxxflags} ${f}"
-    fi
-
-
-    done
-    if test -n "${valid_cxxflags}"; then
-        CXXFLAGS="${CXXFLAGS} ${valid_cxxflags}"
-    fi
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether vsnprintf is in std" >&5
-$as_echo_n "checking whether vsnprintf is in std... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <cstdarg>
-                      #include <cstdio>
-int
-main ()
-{
-va_list ap;
-                      char* buf = NULL;
-                      const char* fmt = NULL;
-                      std::vsnprintf(buf, 0, fmt, ap);
-                     return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_VSNPRINTF_IN_STD 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt allows a + sign for POSIX behavior" >&5
-$as_echo_n "checking whether getopt allows a + sign for POSIX behavior... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-int
-main ()
-{
-
-    int argc = 4;
-    char* argv[5] = {
-        strdup("conftest"),
-        strdup("-+"),
-        strdup("-a"),
-        strdup("bar"),
-        NULL
-    };
-    int ch;
-    int seen_a = 0, seen_plus = 0;
-
-    while ((ch = getopt(argc, argv, "+a:")) != -1) {
-        switch (ch) {
-        case 'a':
-            seen_a = 1;
-            break;
-
-        case '+':
-            seen_plus = 1;
-            break;
-
-        case '?':
-        default:
-            ;
-        }
-    }
-
-    return (seen_a && !seen_plus) ? EXIT_SUCCESS : EXIT_FAILURE;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  getopt_allows_plus=yes
-
-$as_echo "#define HAVE_GNU_GETOPT 1" >>confdefs.h
-
-else
-  getopt_allows_plus=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${getopt_allows_plus}" >&5
-$as_echo "${getopt_allows_plus}" >&6; }
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-    ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt has optreset" >&5
-$as_echo_n "checking whether getopt has optreset... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <unistd.h>
-int
-main ()
-{
-
-    optreset = 1;
-    return EXIT_SUCCESS;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  getopt_has_optreset=yes
-else
-  getopt_has_optreset=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    if test x"${getopt_has_optreset}" = yes; then
-
-$as_echo "#define HAVE_OPTRESET 1" >>confdefs.h
-
-    fi
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${getopt_has_optreset}" >&5
-$as_echo "${getopt_has_optreset}" >&6; }
-    ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((__format__(__printf__, a, b))) is supported" >&5
-$as_echo_n "checking whether __attribute__((__format__(__printf__, a, b))) is supported... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <stdarg.h>
-#include <stdio.h>
-
-static void test_printf(const char *, ...)
-    __attribute__((__format__(__printf__, 1, 2)));
-
-static void
-test_printf(const char *format, ...)
-{
-    va_list ap;
-
-    va_start(ap, format);
-    vprintf(format, ap);
-    va_end(ap);
-}
-int
-main ()
-{
-
-    test_printf("foo %s", "bar");
-    return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         value="__attribute__((__format__(__printf__, a, b)))"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         value=""
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ATTRIBUTE_FORMAT_PRINTF=${value}
-
-
-
-                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((__noreturn__)) is supported" >&5
-$as_echo_n "checking whether __attribute__((__noreturn__)) is supported... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-#if ((__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || __GNUC__ > 2)
-    return 0;
-#else
-    return 1;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         value="__attribute__((__noreturn__))"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         value=""
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    ATTRIBUTE_NORETURN=${value}
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((__unused__)) is supported" >&5
-$as_echo_n "checking whether __attribute__((__unused__)) is supported... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-static void
-function(int a __attribute__((__unused__)))
-{
-}
-int
-main ()
-{
-
-    function(3);
-    return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-         value="__attribute__((__unused__))"
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         value=""
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ATTRIBUTE_UNUSED=${value}
-
-
-
-
-    for ac_func in putenv setenv unsetenv
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether putenv is in std" >&5
-$as_echo_n "checking whether putenv is in std... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <cstdio>
-int
-main ()
-{
-std::putenv("a=b");
-                     return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_PUTENV_IN_STD 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether setenv is in std" >&5
-$as_echo_n "checking whether setenv is in std... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <cstdio>
-int
-main ()
-{
-std::setenv("a", "b");
-                     return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_SETENV_IN_STD 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether unsetenv is in std" >&5
-$as_echo_n "checking whether unsetenv is in std... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <cstdio>
-int
-main ()
-{
-std::unsetenv("a");
-                     return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_UNSETENV_IN_STD 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether basename takes a constant pointer" >&5
-$as_echo_n "checking whether basename takes a constant pointer... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <libgen.h>
-int
-main ()
-{
-
-         const char* s = "/foo/bar/";
-         (void)::basename(s);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_CONST_BASENAME 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dirname takes a constant pointer" >&5
-$as_echo_n "checking whether dirname takes a constant pointer... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <libgen.h>
-int
-main ()
-{
-
-         const char* s = "/foo/bar/";
-         (void)::dirname(s);
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_CONST_DIRNAME 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getcwd(NULL, 0) works" >&5
-$as_echo_n "checking whether getcwd(NULL, 0) works... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <unistd.h>
-int
-main ()
-{
-
-         char *cwd = getcwd(NULL, 0);
-         return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_GETCWD_DYN 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-    for ac_func in unmount
-do :
-  ac_fn_cxx_check_func "$LINENO" "unmount" "ac_cv_func_unmount"
-if test "x$ac_cv_func_unmount" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_UNMOUNT 1
-_ACEOF
-
-fi
-done
-
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether snprintf is in std" >&5
-$as_echo_n "checking whether snprintf is in std... " >&6; }
-    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <cstdio>
-int
-main ()
-{
-char buf;
-                      std::snprintf(&buf, 1, "");
-                     return 0;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-$as_echo "#define HAVE_SNPRINTF_IN_STD 1" >>confdefs.h
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the last valid signal" >&5
-$as_echo_n "checking for the last valid signal... " >&6; }
-    if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <err.h>
-#include <errno.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdio.h>
-#include <stdlib.h>
-int
-main ()
-{
-
-    int i;
-    FILE *f;
-
-    i = 0;
-    while (i < 1024) {
-        i++;
-        if (i != SIGKILL && i != SIGSTOP) {
-            struct sigaction sa;
-            int ret;
-
-            sa.sa_handler = SIG_IGN;
-            sigemptyset(&sa.sa_mask);
-            sa.sa_flags = 0;
-
-            ret = sigaction(i, &sa, NULL);
-            if (ret == -1) {
-                if (errno == EINVAL) {
-                    i--;
-                    break;
-                } else
-                    err(EXIT_FAILURE, "sigaction failed");
-            }
-        }
-    }
-    if (i == 100)
-        errx(EXIT_FAILURE, "too much signals");
-
-    f = fopen("conftest.cnt", "w");
-    if (f == NULL)
-        err(EXIT_FAILURE, "failed to open file");
-
-    fprintf(f, "%d\n", i);
-    fclose(f);
-
-    return EXIT_SUCCESS;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  if test ! -f conftest.cnt; then
-         last_signo=15
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed; assuming ${last_signo}" >&5
-$as_echo "failed; assuming ${last_signo}" >&6; }
-     else
-         last_signo=$(cat conftest.cnt)
-         rm -f conftest.cnt
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${last_signo}" >&5
-$as_echo "${last_signo}" >&6; }
-     fi
-else
-  last_signo=15
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed; assuming ${last_signo}" >&5
-$as_echo "failed; assuming ${last_signo}" >&6; }
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define LAST_SIGNO ${last_signo}
-_ACEOF
-
-
-
-ac_fn_cxx_check_type "$LINENO" "timer_t" "ac_cv_type_timer_t" "#include <time.h>
-"
-if test "x$ac_cv_type_timer_t" = xyes; then :
-
-fi
-
-
-
-
-    test x"${ATF_BUILD_CC-unset}" = x"unset" && ATF_BUILD_CC="${CC}"
-
-
-
-
-    test x"${ATF_BUILD_CFLAGS-unset}" = x"unset" && ATF_BUILD_CFLAGS="${CFLAGS}"
-
-
-
-
-    test x"${ATF_BUILD_CPP-unset}" = x"unset" && ATF_BUILD_CPP="${CPP}"
-
-
-
-
-    test x"${ATF_BUILD_CPPFLAGS-unset}" = x"unset" && ATF_BUILD_CPPFLAGS="${CPPFLAGS}"
-
-
-
-
-    test x"${ATF_BUILD_CXX-unset}" = x"unset" && ATF_BUILD_CXX="${CXX}"
-
-
-
-
-    test x"${ATF_BUILD_CXXFLAGS-unset}" = x"unset" && ATF_BUILD_CXXFLAGS="${CXXFLAGS}"
-
-
-
-
-if test "${srcdir}" = .; then
-    target_srcdir=
-else
-    target_srcdir="${srcdir}/"
-fi
-
-
-
-atf_arch=`uname -p`
-atf_machine=`uname -m`
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Machine type: ${atf_machine}, architecture: ${atf_arch}" >&5
-$as_echo "$as_me: Machine type: ${atf_machine}, architecture: ${atf_arch}" >&6;}
-atf_arch=${atf_arch}
-
-atf_machine=${atf_machine}
-
-
-
-
-if test x"${ATF_CONFSUBDIR-unset}" = x"unset"; then
-    ATF_CONFSUBDIR=atf
-else
-    case ${ATF_CONFSUBDIR} in
-    /*)
-        as_fn_error $? "ATF_CONFSUBDIR must hold a relative path" "$LINENO" 5
-        ;;
-    *)
-        ;;
-    esac
-fi
-if test x"${ATF_CONFSUBDIR}" = x""; then
-    atf_confdir=\${sysconfdir}
-
-else
-    atf_confdir=\${sysconfdir}/${ATF_CONFSUBDIR}
-
-fi
-
-
-if test x"${ATF_WORKDIR}" = x""; then
-    for t in /tmp /var/tmp; do
-        if test -d ${t}; then
-            ATF_WORKDIR=${t}
-            break
-        fi
-    done
-    if test x"${ATF_WORKDIR}" = x""; then
-        as_fn_error $? "Could not guess a value for ATF_WORKDIR" "$LINENO" 5
-    fi
-else
-    case ${ATF_WORKDIR} in
-    /*)
-        ;;
-    *)
-        as_fn_error $? "ATF_WORKDIR must hold an absolute path" "$LINENO" 5
-        ;;
-    esac
-fi
-
-atf_aclocaldir=\${datadir}/aclocal
-
-atf_cssdir=\${datadir}/examples/atf
-
-atf_dtddir=\${datadir}/xml/atf
-
-atf_egdir=\${datadir}/examples/atf
-
-atf_pkgconfigdir=\${libdir}/pkgconfig
-
-atf_xsldir=\${datadir}/xsl/atf
-
-
-
-
-if test x"${ATF_SHELL}" = x""; then
-    for ac_prog in bash sh
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ATF_SHELL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ATF_SHELL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ATF_SHELL="$ATF_SHELL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ATF_SHELL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ATF_SHELL=$ac_cv_path_ATF_SHELL
-if test -n "$ATF_SHELL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ATF_SHELL" >&5
-$as_echo "$ATF_SHELL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ATF_SHELL" && break
-done
-
-else
-    case ${ATF_SHELL} in
-    /*)
-        ;;
-    *)
-        as_fn_error $? "ATF_SHELL must hold an absolute path" "$LINENO" 5
-        ;;
-    esac
-fi
-if test x"${ATF_SHELL}" = x""; then
-    as_fn_error $? "No POSIX shell interpreter found; maybe set ATF_SHELL?" "$LINENO" 5
-fi
-
-
-# Extract the first word of "gdb", so it can be a program name with args.
-set dummy gdb; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GDB+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GDB in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GDB="$GDB" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GDB="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GDB=$ac_cv_path_GDB
-if test -n "$GDB"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GDB" >&5
-$as_echo "$GDB" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-# Extract the first word of "kyua", so it can be a program name with args.
-set dummy kyua; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_KYUA+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $KYUA in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_KYUA="$KYUA" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_KYUA="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-KYUA=$ac_cv_path_KYUA
-if test -n "$KYUA"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KYUA" >&5
-$as_echo "$KYUA" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- if test -n "${KYUA}"; then
-  HAVE_KYUA_TRUE=
-  HAVE_KYUA_FALSE='#'
-else
-  HAVE_KYUA_TRUE='#'
-  HAVE_KYUA_FALSE=
-fi
-
-# Extract the first word of "git", so it can be a program name with args.
-set dummy git; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GIT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GIT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GIT="$GIT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GIT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GIT=$ac_cv_path_GIT
-if test -n "$GIT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIT" >&5
-$as_echo "$GIT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-ac_config_files="$ac_config_files Makefile atf-c/defs.h"
-
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, we kill variables containing newlines.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(
-  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-    eval ac_val=\$$ac_var
-    case $ac_val in #(
-    *${as_nl}*)
-      case $ac_var in #(
-      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-      esac
-      case $ac_var in #(
-      _ | IFS | as_nl) ;; #(
-      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
-      *) { eval $ac_var=; unset $ac_var;} ;;
-      esac ;;
-    esac
-  done
-
-  (set) 2>&1 |
-    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-    *${as_nl}ac_space=\ *)
-      # `set' does not quote correctly, so add quotes: double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \.
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;; #(
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-      ;;
-    esac |
-    sort
-) |
-  sed '
-     /^ac_cv_env_/b end
-     t clear
-     :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     :end' >>confcache
-if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
-	cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-	  mv -f confcache "$cache_file"$$ &&
-	  mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-	  mv -f confcache "$cache_file" ;;
-	esac
-      fi
-    fi
-  else
-    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-U=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-  #    will be set to the directory where LIBOBJS objects are built.
-  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
- if test -n "$EXEEXT"; then
-  am__EXEEXT_TRUE=
-  am__EXEEXT_FALSE='#'
-else
-  am__EXEEXT_TRUE='#'
-  am__EXEEXT_FALSE=
-fi
-
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${ENABLE_TOOLS_TRUE}" && test -z "${ENABLE_TOOLS_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_TOOLS\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${HAVE_KYUA_TRUE}" && test -z "${HAVE_KYUA_FALSE}"; then
-  as_fn_error $? "conditional \"HAVE_KYUA\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-
-: "${CONFIG_STATUS=./config.status}"
-ac_write_fail=0
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
-as_write_fail=0
-cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-
-SHELL=\${CONFIG_SHELL-$SHELL}
-export SHELL
-_ASEOF
-cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-## -------------------- ##
-## M4sh Initialization. ##
-## -------------------- ##
-
-# Be more Bourne compatible
-DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-  emulate sh
-  NULLCMD=:
-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-  setopt NO_GLOB_SUBST
-else
-  case `(set -o) 2>/dev/null` in #(
-  *posix*) :
-    set -o posix ;; #(
-  *) :
-     ;;
-esac
-fi
-
-
-as_nl='
-'
-export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
-    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='print -r --'
-  as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-  as_echo='printf %s\n'
-  as_echo_n='printf %s'
-else
-  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-    as_echo_n='/usr/ucb/echo -n'
-  else
-    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-    as_echo_n_body='eval
-      arg=$1;
-      case $arg in #(
-      *"$as_nl"*)
-	expr "X$arg" : "X\\(.*\\)$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-      esac;
-      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-    '
-    export as_echo_n_body
-    as_echo_n='sh -c $as_echo_n_body as_echo'
-  fi
-  export as_echo_body
-  as_echo='sh -c $as_echo_body as_echo'
-fi
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  PATH_SEPARATOR=:
-  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-      PATH_SEPARATOR=';'
-  }
-fi
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
-# Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
-case $0 in #((
-  *[\\/]* ) as_myself=$0 ;;
-  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-  done
-IFS=$as_save_IFS
-
-     ;;
-esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
-# in which case we are not to be found in the path.
-if test "x$as_myself" = x; then
-  as_myself=$0
-fi
-if test ! -f "$as_myself"; then
-  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-  exit 1
-fi
-
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there.  '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-
-# as_fn_error STATUS ERROR [LINENO LOG_FD]
-# ----------------------------------------
-# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-# script with STATUS, using 1 if that was 0.
-as_fn_error ()
-{
-  as_status=$1; test $as_status -eq 0 && as_status=1
-  if test "$4"; then
-    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
-  fi
-  $as_echo "$as_me: error: $2" >&2
-  as_fn_exit $as_status
-} # as_fn_error
-
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-
-# as_fn_unset VAR
-# ---------------
-# Portably unset VAR.
-as_fn_unset ()
-{
-  { eval $1=; unset $1;}
-}
-as_unset=as_fn_unset
-# as_fn_append VAR VALUE
-# ----------------------
-# Append the text in VALUE to the end of the definition contained in VAR. Take
-# advantage of any shell optimizations that allow amortized linear growth over
-# repeated appends, instead of the typical quadratic growth present in naive
-# implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-  eval 'as_fn_append ()
-  {
-    eval $1+=\$2
-  }'
-else
-  as_fn_append ()
-  {
-    eval $1=\$$1\$2
-  }
-fi # as_fn_append
-
-# as_fn_arith ARG...
-# ------------------
-# Perform arithmetic evaluation on the ARGs, and store the result in the
-# global $as_val. Take advantage of shells that can avoid forks. The arguments
-# must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-  eval 'as_fn_arith ()
-  {
-    as_val=$(( $* ))
-  }'
-else
-  as_fn_arith ()
-  {
-    as_val=`expr "$@" || test $? -eq 1`
-  }
-fi # as_fn_arith
-
-
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-  as_dirname=dirname
-else
-  as_dirname=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-ECHO_C= ECHO_N= ECHO_T=
-case `echo -n x` in #(((((
--n*)
-  case `echo 'xy\c'` in
-  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
-  xy)  ECHO_C='\c';;
-  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-       ECHO_T='	';;
-  esac;;
-*)
-  ECHO_N='-n';;
-esac
-
-rm -f conf$$ conf$$.exe conf$$.file
-if test -d conf$$.dir; then
-  rm -f conf$$.dir/conf$$.file
-else
-  rm -f conf$$.dir
-  mkdir conf$$.dir 2>/dev/null
-fi
-if (echo >conf$$.file) 2>/dev/null; then
-  if ln -s conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s='ln -s'
-    # ... but there are two gotchas:
-    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
-    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
-  elif ln conf$$.file conf$$ 2>/dev/null; then
-    as_ln_s=ln
-  else
-    as_ln_s='cp -p'
-  fi
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-rmdir conf$$.dir 2>/dev/null
-
-
-# as_fn_mkdir_p
-# -------------
-# Create "$as_dir" as a directory, including parents if necessary.
-as_fn_mkdir_p ()
-{
-
-  case $as_dir in #(
-  -*) as_dir=./$as_dir;;
-  esac
-  test -d "$as_dir" || eval $as_mkdir_p || {
-    as_dirs=
-    while :; do
-      case $as_dir in #(
-      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-      *) as_qdir=$as_dir;;
-      esac
-      as_dirs="'$as_qdir' $as_dirs"
-      as_dir=`$as_dirname -- "$as_dir" ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      test -d "$as_dir" && break
-    done
-    test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
-
-
-} # as_fn_mkdir_p
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p='mkdir -p "$as_dir"'
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-exec 6>&1
-## ----------------------------------- ##
-## Main body of $CONFIG_STATUS script. ##
-## ----------------------------------- ##
-_ASEOF
-test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# Save the log message, to keep $0 and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.
-ac_log="
-This file was extended by Automated Testing Framework $as_me 0.16, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-on `(hostname || uname -n) 2>/dev/null | sed 1q`
-"
-
-_ACEOF
-
-case $ac_config_files in *"
-"*) set x $ac_config_files; shift; ac_config_files=$*;;
-esac
-
-case $ac_config_headers in *"
-"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-esac
-
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-# Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
-config_commands="$ac_config_commands"
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
-from templates according to the current configuration.  Unless the files
-and actions are specified as TAGs, all are instantiated by default.
-
-Usage: $0 [OPTION]... [TAG]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number and configuration settings, then exit
-      --config     print configuration, then exit
-  -q, --quiet, --silent
-                   do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-      --file=FILE[:TEMPLATE]
-                   instantiate the configuration file FILE
-      --header=FILE[:TEMPLATE]
-                   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <atf-devel@NetBSD.org>.
-Automated Testing Framework home page: <http://code.google.com/p/kyua/wiki/ATF>."
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-ac_cs_version="\\
-Automated Testing Framework config.status 0.16
-configured by $0, generated by GNU Autoconf 2.68,
-  with options \\"\$ac_cs_config\\"
-
-Copyright (C) 2010 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-
-ac_pwd='$ac_pwd'
-srcdir='$srcdir'
-INSTALL='$INSTALL'
-MKDIR_P='$MKDIR_P'
-AWK='$AWK'
-test -n "\$AWK" || AWK=awk
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# The default lists apply if the user does not specify any file.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=?*)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  --*=)
-    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-    ac_optarg=
-    ac_shift=:
-    ;;
-  *)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    $as_echo "$ac_cs_version"; exit ;;
-  --config | --confi | --conf | --con | --co | --c )
-    $as_echo "$ac_cs_config"; exit ;;
-  --debug | --debu | --deb | --de | --d | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    '') as_fn_error $? "missing file argument" ;;
-    esac
-    as_fn_append CONFIG_FILES " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    case $ac_optarg in
-    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-    ac_need_defaults=false;;
-  --he | --h)
-    # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
-  --help | --hel | -h )
-    $as_echo "$ac_cs_usage"; exit ;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
-
-  *) as_fn_append ac_config_targets " $1"
-     ac_need_defaults=false ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-  shift
-  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-  CONFIG_SHELL='$SHELL'
-  export CONFIG_SHELL
-  exec "\$@"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-  $as_echo "$ac_log"
-} >&5
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-#
-# INIT-COMMANDS
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-
-# 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'
-macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
-enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
-PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
-build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
-build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
-build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
-SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
-Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
-GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
-EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
-FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
-LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
-NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
-LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
-exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
-lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
-file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
-want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
-DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
-sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
-AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
-archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
-STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
-lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
-CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
-compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
-GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
-nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
-lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
-objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
-need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
-MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
-LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
-libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
-postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
-need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
-version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
-install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
-striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
-predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
-postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
-reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
-reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
-
-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 SHELL \
-ECHO \
-PATH_SEPARATOR \
-SED \
-GREP \
-EGREP \
-FGREP \
-LD \
-NM \
-LN_S \
-lt_SP2NL \
-lt_NL2SP \
-reload_flag \
-OBJDUMP \
-deplibs_check_method \
-file_magic_cmd \
-file_magic_glob \
-want_nocaseglob \
-DLLTOOL \
-sharedlib_from_linklib_cmd \
-AR \
-AR_FLAGS \
-archiver_list_spec \
-STRIP \
-RANLIB \
-CC \
-CFLAGS \
-compiler \
-lt_cv_sys_global_symbol_pipe \
-lt_cv_sys_global_symbol_to_cdecl \
-lt_cv_sys_global_symbol_to_c_name_address \
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-nm_file_list_spec \
-lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_pic \
-lt_prog_compiler_wl \
-lt_prog_compiler_static \
-lt_cv_prog_compiler_c_o \
-need_locks \
-MANIFEST_TOOL \
-DSYMUTIL \
-NMEDIT \
-LIPO \
-OTOOL \
-OTOOL64 \
-shrext_cmds \
-export_dynamic_flag_spec \
-whole_archive_flag_spec \
-compiler_needs_object \
-with_gnu_ld \
-allow_undefined_flag \
-no_undefined_flag \
-hardcode_libdir_flag_spec \
-hardcode_libdir_separator \
-exclude_expsyms \
-include_expsyms \
-file_list_spec \
-variables_saved_for_relink \
-libname_spec \
-library_names_spec \
-soname_spec \
-install_override_mode \
-finish_eval \
-old_striplib \
-striplib \
-compiler_lib_search_dirs \
-predep_objects \
-postdep_objects \
-predeps \
-postdeps \
-compiler_lib_search_path \
-LD_CXX \
-reload_flag_CXX \
-compiler_CXX \
-lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_pic_CXX \
-lt_prog_compiler_wl_CXX \
-lt_prog_compiler_static_CXX \
-lt_cv_prog_compiler_c_o_CXX \
-export_dynamic_flag_spec_CXX \
-whole_archive_flag_spec_CXX \
-compiler_needs_object_CXX \
-with_gnu_ld_CXX \
-allow_undefined_flag_CXX \
-no_undefined_flag_CXX \
-hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_separator_CXX \
-exclude_expsyms_CXX \
-include_expsyms_CXX \
-file_list_spec_CXX \
-compiler_lib_search_dirs_CXX \
-predep_objects_CXX \
-postdep_objects_CXX \
-predeps_CXX \
-postdeps_CXX \
-compiler_lib_search_path_CXX; 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 reload_cmds \
-old_postinstall_cmds \
-old_postuninstall_cmds \
-old_archive_cmds \
-extract_expsyms_cmds \
-old_archive_from_new_cmds \
-old_archive_from_expsyms_cmds \
-archive_cmds \
-archive_expsym_cmds \
-module_cmds \
-module_expsym_cmds \
-export_symbols_cmds \
-prelink_cmds \
-postlink_cmds \
-postinstall_cmds \
-postuninstall_cmds \
-finish_cmds \
-sys_lib_search_path_spec \
-sys_lib_dlsearch_path_spec \
-reload_cmds_CXX \
-old_archive_cmds_CXX \
-old_archive_from_new_cmds_CXX \
-old_archive_from_expsyms_cmds_CXX \
-archive_cmds_CXX \
-archive_expsym_cmds_CXX \
-module_cmds_CXX \
-module_expsym_cmds_CXX \
-export_symbols_cmds_CXX \
-prelink_cmds_CXX \
-postlink_cmds_CXX; 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
-
-ac_aux_dir='$ac_aux_dir'
-xsi_shell='$xsi_shell'
-lt_shell_append='$lt_shell_append'
-
-# 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
-
-
-    PACKAGE='$PACKAGE'
-    VERSION='$VERSION'
-    TIMESTAMP='$TIMESTAMP'
-    RM='$RM'
-    ofile='$ofile'
-
-
-
-
-
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-
-# Handling of arguments.
-for ac_config_target in $ac_config_targets
-do
-  case $ac_config_target in
-    "bconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS bconfig.h" ;;
-    "bootstrap/atconfig") CONFIG_COMMANDS="$CONFIG_COMMANDS bootstrap/atconfig" ;;
-    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-    "atf-c/defs.h") CONFIG_FILES="$CONFIG_FILES atf-c/defs.h" ;;
-
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-  esac
-done
-
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason against having it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Hook for its removal unless debugging.
-# Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
-$debug ||
-{
-  tmp= ac_tmp=
-  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
-' 0
-  trap 'as_fn_exit 1' 1 2 13 15
-}
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
-}  ||
-{
-  tmp=./conf$$-$RANDOM
-  (umask 077 && mkdir "$tmp")
-} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
-
-# Set up the scripts for CONFIG_FILES section.
-# No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
-if test -n "$CONFIG_FILES"; then
-
-
-ac_cr=`echo X | tr X '\015'`
-# On cygwin, bash can eat \r inside `` if the user requested igncr.
-# But we know of no other shell where ac_cr would be empty at this
-# point, so we can use a bashism as a fallback.
-if test "x$ac_cr" = x; then
-  eval ac_cr=\$\'\\r\'
-fi
-ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
-if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-  ac_cs_awk_cr='\\r'
-else
-  ac_cs_awk_cr=$ac_cr
-fi
-
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
-_ACEOF
-
-
-{
-  echo "cat >conf$$subs.awk <<_ACEOF" &&
-  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-  echo "_ACEOF"
-} >conf$$subs.sh ||
-  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
-  . ./conf$$subs.sh ||
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-
-  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-  if test $ac_delim_n = $ac_delim_num; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-rm -f conf$$subs.sh
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
-_ACEOF
-sed -n '
-h
-s/^/S["/; s/!.*/"]=/
-p
-g
-s/^[^!]*!//
-:repl
-t repl
-s/'"$ac_delim"'$//
-t delim
-:nl
-h
-s/\(.\{148\}\)..*/\1/
-t more1
-s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-p
-n
-b repl
-:more1
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t nl
-:delim
-h
-s/\(.\{148\}\)..*/\1/
-t more2
-s/["\\]/\\&/g; s/^/"/; s/$/"/
-p
-b
-:more2
-s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-p
-g
-s/.\{148\}//
-t delim
-' <conf$$subs.awk | sed '
-/^[^""]/{
-  N
-  s/\n//
-}
-' >>$CONFIG_STATUS || ac_write_fail=1
-rm -f conf$$subs.awk
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-_ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
-  for (key in S) S_is_set[key] = 1
-  FS = ""
-
-}
-{
-  line = $ 0
-  nfields = split(line, field, "@")
-  substed = 0
-  len = length(field[1])
-  for (i = 2; i < nfields; i++) {
-    key = field[i]
-    keylen = length(key)
-    if (S_is_set[key]) {
-      value = S[key]
-      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-      len += length(value) + length(field[++i])
-      substed = 1
-    } else
-      len += 1 + keylen
-  }
-
-  print line
-}
-
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-else
-  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
-  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
-_ACEOF
-
-# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
-# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
-h
-s///
-s/^/:/
-s/[	 ]*$/:/
-s/:\$(srcdir):/:/g
-s/:\${srcdir}:/:/g
-s/:@srcdir@:/:/g
-s/^:*//
-s/:*$//
-x
-s/\(=[	 ]*\).*/\1/
-G
-s/\n//
-s/^[^=]*=[	 ]*$//
-}'
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-fi # test -n "$CONFIG_FILES"
-
-# Set up the scripts for CONFIG_HEADERS section.
-# No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
-if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
-BEGIN {
-_ACEOF
-
-# Transform confdefs.h into an awk script `defines.awk', embedded as
-# here-document in config.status, that substitutes the proper values into
-# config.h.in to produce config.h.
-
-# Create a delimiter string that does not exist in confdefs.h, to ease
-# handling of long lines.
-ac_delim='%!_!# '
-for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
-    break
-  elif $ac_last_try; then
-    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
-  else
-    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-  fi
-done
-
-# For the awk script, D is an array of macro values keyed by name,
-# likewise P contains macro parameters if any.  Preserve backslash
-# newline sequences.
-
-ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-sed -n '
-s/.\{148\}/&'"$ac_delim"'/g
-t rset
-:rset
-s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-t def
-d
-:def
-s/\\$//
-t bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3"/p
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-d
-:bsnl
-s/["\\]/\\&/g
-s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-D["\1"]=" \3\\\\\\n"\\/p
-t cont
-s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-t cont
-d
-:cont
-n
-s/.\{148\}/&'"$ac_delim"'/g
-t clear
-:clear
-s/\\$//
-t bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/"/p
-d
-:bsnlc
-s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-b cont
-' <confdefs.h | sed '
-s/'"$ac_delim"'/"\\\
-"/g' >>$CONFIG_STATUS || ac_write_fail=1
-
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  for (key in D) D_is_set[key] = 1
-  FS = ""
-}
-/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-  line = \$ 0
-  split(line, arg, " ")
-  if (arg[1] == "#") {
-    defundef = arg[2]
-    mac1 = arg[3]
-  } else {
-    defundef = substr(arg[1], 2)
-    mac1 = arg[2]
-  }
-  split(mac1, mac2, "(") #)
-  macro = mac2[1]
-  prefix = substr(line, 1, index(line, defundef) - 1)
-  if (D_is_set[macro]) {
-    # Preserve the white space surrounding the "#".
-    print prefix "define", macro P[macro] D[macro]
-    next
-  } else {
-    # Replace #undef with comments.  This is necessary, for example,
-    # in the case of _POSIX_SOURCE, which is predefined and required
-    # on some systems where configure will not decide to define it.
-    if (defundef == "undef") {
-      print "/*", prefix defundef, macro, "*/"
-      next
-    }
-  }
-}
-{ print }
-_ACAWK
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
-fi # test -n "$CONFIG_HEADERS"
-
-
-eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-shift
-for ac_tag
-do
-  case $ac_tag in
-  :[FHLC]) ac_mode=$ac_tag; continue;;
-  esac
-  case $ac_mode$ac_tag in
-  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
-  :[FH]-) ac_tag=-:-;;
-  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-  esac
-  ac_save_IFS=$IFS
-  IFS=:
-  set x $ac_tag
-  IFS=$ac_save_IFS
-  shift
-  ac_file=$1
-  shift
-
-  case $ac_mode in
-  :L) ac_source=$1;;
-  :[FH])
-    ac_file_inputs=
-    for ac_f
-    do
-      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
-      *) # Look for the file first in the build tree, then in the source tree
-	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
-	 test -f "$ac_f" ||
-	   case $ac_f in
-	   [\\/$]*) false;;
-	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-      esac
-      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
-      as_fn_append ac_file_inputs " '$ac_f'"
-    done
-
-    # Let's still pretend it is `configure' which instantiates (i.e., don't
-    # use $as_me), people would be surprised to read:
-    #    /* config.h.  Generated by config.status.  */
-    configure_input='Generated from '`
-	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-	`' by configure.'
-    if test x"$ac_file" != x-; then
-      configure_input="$ac_file.  $configure_input"
-      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
-    fi
-    # Neutralize special characters interpreted by sed in replacement strings.
-    case $configure_input in #(
-    *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`$as_echo "$configure_input" |
-       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-    *) ac_sed_conf_input=$configure_input;;
-    esac
-
-    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
-    esac
-    ;;
-  esac
-
-  ac_dir=`$as_dirname -- "$ac_file" ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-  as_dir="$ac_dir"; as_fn_mkdir_p
-  ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
-  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-  # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-  case $ac_top_builddir_sub in
-  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-  esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
-  .)  # We are building in place.
-    ac_srcdir=.
-    ac_top_srcdir=$ac_top_builddir_sub
-    ac_abs_top_srcdir=$ac_pwd ;;
-  [\\/]* | ?:[\\/]* )  # Absolute name.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir
-    ac_abs_top_srcdir=$srcdir ;;
-  *) # Relative name.
-    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_build_prefix$srcdir
-    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
-  case $ac_mode in
-  :F)
-  #
-  # CONFIG_FILE
-  #
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-  esac
-  ac_MKDIR_P=$MKDIR_P
-  case $MKDIR_P in
-  [\\/$]* | ?:[\\/]* ) ;;
-  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-  esac
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-# If the template does not know about datarootdir, expand it.
-# FIXME: This hack should be removed a few years after 2.60.
-ac_datarootdir_hack=; ac_datarootdir_seen=
-ac_sed_dataroot='
-/datarootdir/ {
-  p
-  q
-}
-/@datadir@/p
-/@docdir@/p
-/@infodir@/p
-/@localedir@/p
-/@mandir@/p'
-case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
-*datarootdir*) ac_datarootdir_seen=yes;;
-*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-  ac_datarootdir_hack='
-  s&@datadir@&$datadir&g
-  s&@docdir@&$docdir&g
-  s&@infodir@&$infodir&g
-  s&@localedir@&$localedir&g
-  s&@mandir@&$mandir&g
-  s&\\\${datarootdir}&$datarootdir&g' ;;
-esac
-_ACEOF
-
-# Neutralize VPATH when `$srcdir' = `.'.
-# Shell code in configure.ac might set extrasub.
-# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_sed_extra="$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s|@configure_input@|$ac_sed_conf_input|;t t
-s&@top_builddir@&$ac_top_builddir_sub&;t t
-s&@top_build_prefix@&$ac_top_build_prefix&;t t
-s&@srcdir@&$ac_srcdir&;t t
-s&@abs_srcdir@&$ac_abs_srcdir&;t t
-s&@top_srcdir@&$ac_top_srcdir&;t t
-s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-s&@builddir@&$ac_builddir&;t t
-s&@abs_builddir@&$ac_abs_builddir&;t t
-s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-s&@INSTALL@&$ac_INSTALL&;t t
-s&@MKDIR_P@&$ac_MKDIR_P&;t t
-$ac_datarootdir_hack
-"
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-
-test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-which seems to be undefined.  Please make sure it is defined" >&2;}
-
-  rm -f "$ac_tmp/stdin"
-  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
-  esac \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
- ;;
-  :H)
-  #
-  # CONFIG_HEADER
-  #
-  if test x"$ac_file" != x-; then
-    {
-      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
-	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    fi
-  else
-    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
-      || as_fn_error $? "could not create -" "$LINENO" 5
-  fi
-# Compute "$ac_file"'s index in $config_headers.
-_am_arg="$ac_file"
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $_am_arg | $_am_arg:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-	 X"$_am_arg" : 'X\(//\)$' \| \
-	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$_am_arg" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`/stamp-h$_am_stamp_count
- ;;
-
-  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
- ;;
-  esac
-
-
-  case $ac_file$ac_mode in
-    "bootstrap/atconfig":C) cat >bootstrap/atconfig <<ATEOF
-# Configurable variable values for building test suites.
-# Generated by $0.
-# Copyright (C) 2010 Free Software Foundation, Inc.
-
-# The test suite will define top_srcdir=$at_top_srcdir/../.. etc.
-at_testdir='bootstrap'
-abs_builddir='$ac_abs_builddir'
-at_srcdir='$ac_srcdir'
-abs_srcdir='$ac_abs_srcdir'
-at_top_srcdir='$ac_top_srcdir'
-abs_top_srcdir='$ac_abs_top_srcdir'
-at_top_build_prefix='$ac_top_build_prefix'
-abs_top_builddir='$ac_abs_top_builddir'
-
-# Backward compatibility with Autotest <= 2.59b:
-at_top_builddir=\$at_top_build_prefix
-
-AUTOTEST_PATH='bootstrap'
-
-SHELL=\${CONFIG_SHELL-'$SHELL'}
-ATEOF
- ;;
-    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-  # are listed without --file.  Let's play safe and only enable the eval
-  # if we detect the quoting.
-  case $CONFIG_FILES in
-  *\'*) eval set x "$CONFIG_FILES" ;;
-  *)   set x $CONFIG_FILES ;;
-  esac
-  shift
-  for mf
-  do
-    # Strip MF so we end up with the name of the file.
-    mf=`echo "$mf" | sed -e 's/:.*$//'`
-    # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
-    # some people rename them; so instead we look at the file content.
-    # Grep'ing the first line is not enough: some people post-process
-    # each Makefile.in and add a new line on top of each file to say so.
-    # Grep'ing the whole file is not good either: AIX grep has a line
-    # limit of 2048, but all sed's we know have understand at least 4000.
-    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-      dirpart=`$as_dirname -- "$mf" ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-    else
-      continue
-    fi
-    # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
-    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-    test -z "$DEPDIR" && continue
-    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
-    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
-    # Find all dependency output files, they are included files with
-    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-    # simplest approach to changing $(DEPDIR) to its actual value in the
-    # expansion.
-    for file in `sed -n "
-      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-      # Make sure the directory exists.
-      test -f "$dirpart/$file" && continue
-      fdir=`$as_dirname -- "$file" ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)[^/].*/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-      # echo "creating $dirpart/$file"
-      echo '# dummy' > "$dirpart/$file"
-    done
-  done
-}
- ;;
-    "libtool":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.
-#
-#   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.
-
-
-# The names of the tagged configurations supported by this script.
-available_tags="CXX "
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Which release of libtool.m4 was used?
-macro_version=$macro_version
-macro_revision=$macro_revision
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# What type of objects to build.
-pic_mode=$pic_mode
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# An echo program that protects backslashes.
-ECHO=$lt_ECHO
-
-# The PATH separator for the build system.
-PATH_SEPARATOR=$lt_PATH_SEPARATOR
-
-# The host system.
-host_alias=$host_alias
-host=$host
-host_os=$host_os
-
-# The build system.
-build_alias=$build_alias
-build=$build
-build_os=$build_os
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="\$SED -e 1s/^X//"
-
-# A grep program that handles long lines.
-GREP=$lt_GREP
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# A literal string matcher.
-FGREP=$lt_FGREP
-
-# A BSD- or MS-compatible name lister.
-NM=$lt_NM
-
-# Whether we need soft or hard links.
-LN_S=$lt_LN_S
-
-# What is the maximum length of a command?
-max_cmd_len=$max_cmd_len
-
-# Object file suffix (normally "o").
-objext=$ac_objext
-
-# Executable file suffix (normally "").
-exeext=$exeext
-
-# whether the shell understands "unset".
-lt_unset=$lt_unset
-
-# turn spaces into newlines.
-SP2NL=$lt_lt_SP2NL
-
-# turn newlines into spaces.
-NL2SP=$lt_lt_NL2SP
-
-# convert \$build file names to \$host format.
-to_host_file_cmd=$lt_cv_to_host_file_cmd
-
-# convert \$build files to toolchain format.
-to_tool_file_cmd=$lt_cv_to_tool_file_cmd
-
-# An object symbol dumper.
-OBJDUMP=$lt_OBJDUMP
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method = "file_magic".
-file_magic_cmd=$lt_file_magic_cmd
-
-# How to find potential files when deplibs_check_method = "file_magic".
-file_magic_glob=$lt_file_magic_glob
-
-# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
-want_nocaseglob=$lt_want_nocaseglob
-
-# DLL creation program.
-DLLTOOL=$lt_DLLTOOL
-
-# Command to associate shared and link libraries.
-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
-
-# The archiver.
-AR=$lt_AR
-
-# Flags to create an archive.
-AR_FLAGS=$lt_AR_FLAGS
-
-# How to feed a file listing to the archiver.
-archiver_list_spec=$lt_archiver_list_spec
-
-# A symbol stripping program.
-STRIP=$lt_STRIP
-
-# Commands used to install an old-style archive.
-RANLIB=$lt_RANLIB
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Whether to use a lock for old archive extraction.
-lock_old_archive_extraction=$lock_old_archive_extraction
-
-# A C compiler.
-LTCC=$lt_CC
-
-# LTCC compiler flags.
-LTCFLAGS=$lt_CFLAGS
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration.
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair.
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# Transform the output of nm in a C name address pair when lib prefix is needed.
-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
-
-# Specify filename containing input files for \$NM.
-nm_file_list_spec=$lt_nm_file_list_spec
-
-# The root where to search for dependent libraries,and in which our libraries should be installed.
-lt_sysroot=$lt_sysroot
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# Used to examine libraries when file_magic_cmd begins with "file".
-MAGIC_CMD=$MAGIC_CMD
-
-# Must we lock files when doing compilation?
-need_locks=$lt_need_locks
-
-# Manifest tool.
-MANIFEST_TOOL=$lt_MANIFEST_TOOL
-
-# Tool to manipulate archived DWARF debug symbol files on Mac OS X.
-DSYMUTIL=$lt_DSYMUTIL
-
-# Tool to change global to local symbols on Mac OS X.
-NMEDIT=$lt_NMEDIT
-
-# Tool to manipulate fat objects and archives on Mac OS X.
-LIPO=$lt_LIPO
-
-# ldd/readelf like tool for Mach-O binaries on Mac OS X.
-OTOOL=$lt_OTOOL
-
-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4.
-OTOOL64=$lt_OTOOL64
-
-# Old archive suffix (normally "a").
-libext=$libext
-
-# Shared library suffix (normally ".so").
-shrext_cmds=$lt_shrext_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at link time.
-variables_saved_for_relink=$lt_variables_saved_for_relink
-
-# Do we need the "lib" prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Library versioning type.
-version_type=$version_type
-
-# Shared library runtime path variable.
-runpath_var=$runpath_var
-
-# Shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# 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
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Permission mode override for installation of shared libraries.
-install_override_mode=$lt_install_override_mode
-
-# Command to use after installation of a shared archive.
-postinstall_cmds=$lt_postinstall_cmds
-
-# Command to use after uninstallation of a shared archive.
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# As "finish_cmds", except a single script fragment to be evaled but
-# not shown.
-finish_eval=$lt_finish_eval
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Compile-time system search path for libraries.
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries.
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds
-
-# A language specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct
-
-# 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.
-hardcode_direct_absolute=$hardcode_direct_absolute
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects
-postdep_objects=$lt_postdep_objects
-predeps=$lt_predeps
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# ### 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
-
-
-ltmain="$ac_aux_dir/ltmain.sh"
-
-
-  # 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)
-
-  if test x"$xsi_shell" = xyes; then
-  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
-func_dirname ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-} # Extended-shell func_dirname 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=:
-
-
-  sed -e '/^func_basename ()$/,/^} # func_basename /c\
-func_basename ()\
-{\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_basename 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=:
-
-
-  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
-func_dirname_and_basename ()\
-{\
-\    case ${1} in\
-\      */*) func_dirname_result="${1%/*}${2}" ;;\
-\      *  ) func_dirname_result="${3}" ;;\
-\    esac\
-\    func_basename_result="${1##*/}"\
-} # Extended-shell func_dirname_and_basename 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=:
-
-
-  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
-func_stripname ()\
-{\
-\    # 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}"}\
-} # Extended-shell func_stripname 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=:
-
-
-  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
-func_split_long_opt ()\
-{\
-\    func_split_long_opt_name=${1%%=*}\
-\    func_split_long_opt_arg=${1#*=}\
-} # Extended-shell func_split_long_opt 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=:
-
-
-  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
-func_split_short_opt ()\
-{\
-\    func_split_short_opt_arg=${1#??}\
-\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
-} # Extended-shell func_split_short_opt 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=:
-
-
-  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
-func_lo2o ()\
-{\
-\    case ${1} in\
-\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
-\      *)    func_lo2o_result=${1} ;;\
-\    esac\
-} # Extended-shell func_lo2o 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=:
-
-
-  sed -e '/^func_xform ()$/,/^} # func_xform /c\
-func_xform ()\
-{\
-    func_xform_result=${1%.*}.lo\
-} # Extended-shell func_xform 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=:
-
-
-  sed -e '/^func_arith ()$/,/^} # func_arith /c\
-func_arith ()\
-{\
-    func_arith_result=$(( $* ))\
-} # Extended-shell func_arith 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=:
-
-
-  sed -e '/^func_len ()$/,/^} # func_len /c\
-func_len ()\
-{\
-    func_len_result=${#1}\
-} # Extended-shell func_len 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=:
-
-fi
-
-if test x"$lt_shell_append" = xyes; then
-  sed -e '/^func_append ()$/,/^} # func_append /c\
-func_append ()\
-{\
-    eval "${1}+=\\${2}"\
-} # Extended-shell func_append 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=:
-
-
-  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
-func_append_quoted ()\
-{\
-\    func_quote_for_eval "${2}"\
-\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
-} # Extended-shell func_append_quoted 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=:
-
-
-  # 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
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
-fi
-
-
-   mv -f "$cfgfile" "$ofile" ||
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-
-    cat <<_LT_EOF >> "$ofile"
-
-# ### BEGIN LIBTOOL TAG CONFIG: CXX
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag_CXX
-reload_cmds=$lt_reload_cmds_CXX
-
-# Commands used to build an old-style archive.
-old_archive_cmds=$lt_old_archive_cmds_CXX
-
-# A language specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU compiler?
-with_gcc=$GCC_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static.
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Whether the compiler copes with passing no objects directly.
-compiler_needs_object=$lt_compiler_needs_object_CXX
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-
-# Commands used to build a loadable module if different from building
-# a shared archive.
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Whether we are building with GNU ld or not.
-with_gnu_ld=$lt_with_gnu_ld_CXX
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that enforces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# Whether we need a single "-rpath" flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes
-# DIR into the resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# 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.
-hardcode_direct_absolute=$hardcode_direct_absolute_CXX
-
-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR
-# into the resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
-# into the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to "yes" if building a shared library automatically hardcodes DIR
-# into the library and all subsequent libraries and executables linked
-# against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Set to yes if linker adds runtime paths of dependent libraries
-# to runtime path list.
-inherit_rpath=$inherit_rpath_CXX
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Set to "yes" if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# Commands necessary for linking programs (against libraries) with templates.
-prelink_cmds=$lt_prelink_cmds_CXX
-
-# Commands necessary for finishing linking programs.
-postlink_cmds=$lt_postlink_cmds_CXX
-
-# Specify filename containing input files.
-file_list_spec=$lt_file_list_spec_CXX
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
-
-# Dependencies to place before and after the objects being linked to
-# create a shared library.
-predep_objects=$lt_predep_objects_CXX
-postdep_objects=$lt_postdep_objects_CXX
-predeps=$lt_predeps_CXX
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# ### END LIBTOOL TAG CONFIG: CXX
-_LT_EOF
-
- ;;
-
-  esac
-done # for ac_tag
-
-
-as_fn_exit 0
-_ACEOF
-ac_clean_files=$ac_clean_files_save
-
-test $ac_write_fail = 0 ||
-  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || as_fn_exit 1
-fi
-if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
-fi
-
-
-if test ${enable_tools} = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building the deprecated ATF tools (atf-run and atf-report);" >&5
-$as_echo "$as_me: WARNING: Building the deprecated ATF tools (atf-run and atf-report);" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: please migrate to Kyua as soon as feasible." >&5
-$as_echo "$as_me: WARNING: please migrate to Kyua as soon as feasible." >&2;}
-fi
-
diff --git a/contrib/atf/configure.ac b/contrib/atf/configure.ac
deleted file mode 100644
index 31248765d61..00000000000
--- a/contrib/atf/configure.ac
+++ /dev/null
@@ -1,228 +0,0 @@
-dnl
-dnl Automated Testing Framework (atf)
-dnl
-dnl Copyright (c) 2007 The NetBSD Foundation, Inc.
-dnl All rights reserved.
-dnl
-dnl Redistribution and use in source and binary forms, with or without
-dnl modification, are permitted provided that the following conditions
-dnl are met:
-dnl 1. Redistributions of source code must retain the above copyright
-dnl    notice, this list of conditions and the following disclaimer.
-dnl 2. Redistributions in binary form must reproduce the above copyright
-dnl    notice, this list of conditions and the following disclaimer in the
-dnl    documentation and/or other materials provided with the distribution.
-dnl
-dnl THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
-dnl CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-dnl MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-dnl IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
-dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-dnl GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-dnl INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-dnl IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-dnl OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-dnl IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-dnl
-
-dnl -----------------------------------------------------------------------
-dnl Initialize the GNU build system.
-dnl -----------------------------------------------------------------------
-
-AC_INIT([Automated Testing Framework], [0.16], [atf-devel@NetBSD.org], [atf],
-        [http://code.google.com/p/kyua/wiki/ATF])
-AC_PREREQ([2.65])
-AC_COPYRIGHT([Copyright (c) 2007-2012 The NetBSD Foundation, Inc.])
-AC_DEFINE([PACKAGE_COPYRIGHT],
-          ["Copyright (c) 2007-2012 The NetBSD Foundation, Inc."],
-          [Define to the copyright string applicable to this package.])
-AC_CONFIG_AUX_DIR([admin])
-AC_CONFIG_HEADERS([bconfig.h])
-AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_SRCDIR([atf-c.h])
-AC_CONFIG_TESTDIR([bootstrap])
-
-AC_CANONICAL_TARGET
-
-AM_INIT_AUTOMAKE([1.9 check-news foreign subdir-objects -Wall])
-
-LT_INIT
-
-AC_ARG_ENABLE(tools,
-    AS_HELP_STRING([--enable-tools],
-        [Enables the build of the deprecated ATF tools]),
-    [case $enableval in
-     yes|no) enable_tools=${enableval} ;;
-     *) AC_MSG_ERROR([Invalid value passed to --enable-tools]) ;;
-     esac],
-    [enable_tools=no])
-AC_SUBST([ENABLE_TOOLS], ${enable_tools})
-AM_CONDITIONAL([ENABLE_TOOLS], [test "${enable_tools}" = yes])
-
-dnl -----------------------------------------------------------------------
-dnl Check for the C and C++ compilers and required features.
-dnl -----------------------------------------------------------------------
-
-AC_LANG(C)
-AC_PROG_CC
-AM_PROG_CC_C_O
-dnl The C compiler check automatically aborts if the compiler does not work.
-dnl Nothing to do here.
-
-AC_LANG(C++)
-AC_PROG_CXX
-AC_CACHE_CHECK([whether the C++ compiler works],
-               [atf_cv_prog_cxx_works],
-               [AC_LANG_PUSH([C++])
-                AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
-                               [atf_cv_prog_cxx_works=yes],
-                               [atf_cv_prog_cxx_works=no])
-                AC_LANG_POP])
-if test "${atf_cv_prog_cxx_works}" = no; then
-    AC_MSG_ERROR([C++ compiler cannot create executables])
-fi
-
-KYUA_DEVELOPER_MODE([C,C++])
-
-ATF_MODULE_APPLICATION
-ATF_MODULE_DEFS
-ATF_MODULE_ENV
-ATF_MODULE_FS
-ATF_MODULE_SANITY
-ATF_MODULE_SIGNALS
-
-AC_CHECK_TYPE([timer_t], [], [], [[#include <time.h>]])
-
-ATF_RUNTIME_TOOL([ATF_BUILD_CC],
-                 [C compiler to use at runtime], [${CC}])
-ATF_RUNTIME_TOOL([ATF_BUILD_CFLAGS],
-                 [C compiler flags to use at runtime], [${CFLAGS}])
-ATF_RUNTIME_TOOL([ATF_BUILD_CPP],
-                 [C/C++ preprocessor to use at runtime], [${CPP}])
-ATF_RUNTIME_TOOL([ATF_BUILD_CPPFLAGS],
-                 [C/C++ preprocessor flags to use at runtime], [${CPPFLAGS}])
-ATF_RUNTIME_TOOL([ATF_BUILD_CXX],
-                 [C++ compiler to use at runtime], [${CXX}])
-ATF_RUNTIME_TOOL([ATF_BUILD_CXXFLAGS],
-                 [C++ compiler flags to use at runtime], [${CXXFLAGS}])
-
-dnl -----------------------------------------------------------------------
-dnl Generation of files in srcdir.
-dnl -----------------------------------------------------------------------
-
-dnl BSD make(1) doesn't deal with targets specified as './foo' well: they
-dnl need to be specified as 'foo'.  The following hack is to workaround this
-dnl issue.
-if test "${srcdir}" = .; then
-    target_srcdir=
-else
-    target_srcdir="${srcdir}/"
-fi
-AC_SUBST([target_srcdir])
-
-dnl -----------------------------------------------------------------------
-dnl Architecture and machine checks.
-dnl -----------------------------------------------------------------------
-
-atf_arch=`uname -p`
-atf_machine=`uname -m`
-
-AC_MSG_NOTICE([Machine type: ${atf_machine}, architecture: ${atf_arch}])
-AC_SUBST(atf_arch, ${atf_arch})
-AC_SUBST(atf_machine, ${atf_machine})
-
-dnl -----------------------------------------------------------------------
-dnl User-customizable variables.
-dnl -----------------------------------------------------------------------
-
-AC_ARG_VAR([ATF_CONFSUBDIR],
-           [Subdirectory of sysconfdir under which to look for files])
-if test x"${ATF_CONFSUBDIR-unset}" = x"unset"; then
-    ATF_CONFSUBDIR=atf
-else
-    case ${ATF_CONFSUBDIR} in
-    /*)
-        AC_MSG_ERROR([ATF_CONFSUBDIR must hold a relative path])
-        ;;
-    *)
-        ;;
-    esac
-fi
-if test x"${ATF_CONFSUBDIR}" = x""; then
-    AC_SUBST(atf_confdir, \${sysconfdir})
-else
-    AC_SUBST(atf_confdir, \${sysconfdir}/${ATF_CONFSUBDIR})
-fi
-
-AC_ARG_VAR([ATF_WORKDIR],
-           [Default location to use for ATF work directories])
-if test x"${ATF_WORKDIR}" = x""; then
-    for t in /tmp /var/tmp; do
-        if test -d ${t}; then
-            ATF_WORKDIR=${t}
-            break
-        fi
-    done
-    if test x"${ATF_WORKDIR}" = x""; then
-        AC_MSG_ERROR([Could not guess a value for ATF_WORKDIR])
-    fi
-else
-    case ${ATF_WORKDIR} in
-    /*)
-        ;;
-    *)
-        AC_MSG_ERROR([ATF_WORKDIR must hold an absolute path])
-        ;;
-    esac
-fi
-
-AC_SUBST(atf_aclocaldir, \${datadir}/aclocal)
-AC_SUBST(atf_cssdir, \${datadir}/examples/atf)
-AC_SUBST(atf_dtddir, \${datadir}/xml/atf)
-AC_SUBST(atf_egdir, \${datadir}/examples/atf)
-AC_SUBST(atf_pkgconfigdir, \${libdir}/pkgconfig)
-AC_SUBST(atf_xsldir, \${datadir}/xsl/atf)
-
-dnl -----------------------------------------------------------------------
-dnl Check for the shell and portability problems.
-dnl -----------------------------------------------------------------------
-
-AC_ARG_VAR([ATF_SHELL], [Location of the POSIX shell interpreter to use])
-if test x"${ATF_SHELL}" = x""; then
-    AC_PATH_PROGS(ATF_SHELL, [bash sh])
-else
-    case ${ATF_SHELL} in
-    /*)
-        ;;
-    *)
-        AC_MSG_ERROR([ATF_SHELL must hold an absolute path])
-        ;;
-    esac
-fi
-if test x"${ATF_SHELL}" = x""; then
-    AC_MSG_ERROR([No POSIX shell interpreter found; maybe set ATF_SHELL?])
-fi
-
-dnl -----------------------------------------------------------------------
-dnl Check for required tools.
-dnl -----------------------------------------------------------------------
-
-AC_PATH_PROG([GDB], [gdb])
-AC_PATH_PROG([KYUA], [kyua])
-AM_CONDITIONAL([HAVE_KYUA], [test -n "${KYUA}"])
-AC_PATH_PROG([GIT], [git])
-
-dnl -----------------------------------------------------------------------
-dnl Finally, generate output.
-dnl -----------------------------------------------------------------------
-
-AC_OUTPUT([Makefile atf-c/defs.h])
-
-if test ${enable_tools} = yes; then
-    AC_MSG_WARN([Building the deprecated ATF tools (atf-run and atf-report);])
-    AC_MSG_WARN([please migrate to Kyua as soon as feasible.])
-fi
-
-dnl vim: syntax=m4:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/doc/Makefile.am.inc b/contrib/atf/doc/Makefile.am.inc
deleted file mode 100644
index 858ff04715e..00000000000
--- a/contrib/atf/doc/Makefile.am.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-dist_man_MANS += doc/atf-test-case.4 \
-                 doc/atf-test-program.1
-
-if ENABLE_TOOLS
-
-man_MANS += doc/atf.7
-CLEANFILES += doc/atf.7
-EXTRA_DIST += doc/atf.7.in
-
-dist_man_MANS += doc/atf-formats.5
-
-doc/atf.7: $(srcdir)/doc/atf.7.in
-	test -d doc || mkdir -p doc
-	sed -e 's#__DOCDIR__#$(docdir)#g' \
-	    -e 's#__TESTSDIR__#$(testsdir)#g' \
-	    <$(srcdir)/doc/atf.7.in >doc/atf.7.tmp
-	mv doc/atf.7.tmp doc/atf.7
-
-endif
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/doc/atf-formats.5 b/contrib/atf/doc/atf-formats.5
deleted file mode 100644
index bb919f483a9..00000000000
--- a/contrib/atf/doc/atf-formats.5
+++ /dev/null
@@ -1,231 +0,0 @@
-.\"
-.\" Automated Testing Framework (atf)
-.\"
-.\" 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.
-.\"
-.Dd December 20, 2011
-.Dt ATF-FORMATS 5
-.Os
-.Sh NAME
-.Nm atf-formats
-.Nd machine-parseable data formats used by ATF
-.Sh DESCRIPTION
-This manual page describes the multiple data formats used in ATF.
-These formats affect configuration files, control files and any data that
-is externalized or internalized by the tools.
-.Pp
-Data files are always organized as follows:
-.Bd -literal -offset indent
-Header1: Value1            \\
-    ...                    | head
-HeaderN: ValueN            /
-                           mandatory blank line
-Free-form text contents    \\
-    ...                    | body
-    ...                    /
-.Ed
-.Pp
-A file must always contain a
-.Sq Content-Type
-header and must always separate that header from the body with a blank
-line, even if the body is empty.
-.Pp
-The
-.Sq Content-Type
-is always of the form:
-.Bd -literal -offset indent
-Content-Type: application/X-atf-<subtype>; version="<version>"
-.Ed
-.Pp
-where
-.Sq subtype
-indicates the specific file format and
-.Sq version
-its format version.
-This header must be the first one of the file.
-.Pp
-The main purpose of the
-.Sq Content-Type
-header, aside from determining the format used in the file, is to allow
-future changes to a given format.
-Whenever an incompatible change is made, the version is bumped by one.
-By keeping the header in the first line, future versions may even remove
-the need for such a header -- e.g. if some format was replaced by XML
-files, which have their own mandatory header.
-.Pp
-The rest of this document details the different format types.
-.Ss Format: application/X-atf-atffile, version: 1
-Atffiles are logically divided into three sections:
-.Bl -bullet
-.It
-Test programs: the list of test programs that define the test suite
-described by the Atffile.
-.It
-Meta-data properties: these define some constant values applicable to
-all the test programs defined in the file.
-In some sense they define the properties that describe the test suite.
-.It
-Configuration variables: defaults for configuration variables that
-can be overridden through configuration files or the command line.
-.El
-.Pp
-The grammar for Atffiles is the following:
-.Bd -literal -offset indent
-DATA ::= ( ( CONF | PROP | TP )? COMMENT? NEWLINE )* EOF
-CONF ::= 'conf:' WORD EQUAL STRING
-PROP ::= 'prop:' WORD EQUAL STRING
-TP ::= TPFILE | TPGLOB
-TPFILE ::= 'tp: ' STRING
-TPGLOB ::= 'tp-glob: ' STRING
-STRING ::= WORD | '"' WORD* '"'
-.Ed
-.Pp
-The meaning of the constructions above is:
-.Bl -tag -width TPGLOBXX
-.It CONF
-Definition of a configuration variable.
-.It PROP
-Definition of a meta-data property.
-.It TPFILE
-Addition of a test program into the test suite.
-The string is taken literally as the program's name, and this program
-must exist.
-.It TPGLOB
-Addition of multiple test programs into the test suite.
-The string is taken as a glob pattern, which may have or not have any
-matches in the current directory.
-.El
-.Pp
-An example:
-.Bd -literal -offset indent
-prop: test-suite = utilities
-
-conf: unprivileged-user = nobody
-
-tp: t_cp
-tp: t_mv
-tp: t_df
-tp-glob: t_dir_*
-.Ed
-.Ss Format: application/X-atf-config, version: 1
-Configuration files are very simple: they only contain a list of variable
-name/variable value pairs.
-Their grammar is:
-.Bd -literal -offset indent
-DATA ::= ( VAR? COMMENT? NEWLINE )* EOF
-VAR ::= WORD EQUAL STRING
-COMMENT ::= HASH WORD*
-STRING ::= WORD | '"' WORD* '"'
-.Ed
-.Pp
-An example:
-.Bd -literal -offset indent
-# This is the system-wide configuration file for ATF.
-# The above and this line are comments placed on their own line.
-
-var1 = this is a variable value
-var2 = this is another one      # Optional comment at the end.
-.Ed
-.Ss Format: application/X-atf-tps, version: 3
-The
-.Sq application/X-atf-tps
-format multiplexes the standard output, standard error and results output
-streams from multiple test programs into a single data file.
-This format is used by
-.Xr atf-run 1
-to report the execution of several test programs and is later parsed by
-.Xr atf-report 1
-to inform the user of this process.
-It has the following grammar:
-.Bd -literal -offset indent
-DATA ::= INFO* TPS-COUNT TP-STANZA* INFO* EOF
-INFO ::= 'info' COLON STRING COMMA STRING NEWLINE
-TPS-COUNT ::= 'tps-count' COLON POSITIVE-NUMBER NEWLINE
-TP-STANZA ::= TP-START TC-STANZA* TC-END
-TP-START ::= 'tp-start' COLON TIMESTAMP COMMA STRING COMMA
-             POSITIVE-NUMBER NEWLINE
-TP-END ::= 'tc-end' COLON TIMESTAMP COMMA STRING (COMMA STRING)?
-TC-STANZA ::= TC-START (TC-SO | TC-SE)* TC-END
-TC-START ::= 'tc-start' COLON TIMESTAMP COMMA STRING NEWLINE
-TC-SO ::= 'tc-so' COLON STRING NEWLINE
-TC-SE ::= 'tc-se' COLON STRING NEWLINE
-TC-END ::= 'tc-end' COLON TIMESTAMP COMMA STRING COMMA TCR NEWLINE
-TCR ::= 'passed' | ('failed' | 'skipped') COMMA STRING
-TIMESTAMP ::= [0-9]+.[0-9]+
-.Ed
-.Pp
-The meaning of the constructions above is:
-.Bl -tag -width TPSXCOUNTXX
-.It TPS-COUNT
-Indicates the number of test programs that will be executed.
-There will be this exact amount of
-.Sq TP-STANZA
-constructions following it.
-.It TP-START
-Indicates the beginning of a test program.
-This includes the program's name and the amount of test cases that
-will follow.
-.It TP-END
-Indicates the completion of a test program.
-This is followed by the program's name and, if the program ended
-prematurely, an error message indicating the reason of its failure.
-A successful execution of a test program (regardless of the status of its
-test cases) must not be accompanied by any reason.
-.It TC-START
-Indicates the beginning of a test case.
-This is accompanied by the test case's name.
-.It TC-SO
-Contains a text line sent to the standard output stream during the
-execution of the test case.
-Leading and trailing space is preserved.
-.It TC-SE
-Contains a text line sent to the standard error stream during the
-execution of the test case.
-Leading and trailing space is preserved.
-.It TC-END
-Indicates the completion of a test case.
-This is accompanied by the test case's name, its result and the reason
-associated with this result (if applicable).
-.El
-.Pp
-An example:
-.Bd -literal -offset indent
-tps-count: 2
-tp-start: calculator, 1324318951.838923, 2
-tc-start: add, 1324318951.839101
-tc-end: add, 1324318951.839500, passed
-tc-start: subtract, 1324318951.840001
-tc-so: 3-2 expected to return 1 but got 0
-tc-end: subtract, 1324318952.000123, failed, Calculated an unexpected value
-tp-end: calculator, 1324318952.002301
-tp-start: files, 1, 1324318952.502348
-tc-start: copy, 1324318952.508291
-tc-se: could not find the cp(1) utility
-tc-end: copy, 1324318953.203145, skipped
-tp-end: files, 1324318953.203800
-.Ed
-.Sh SEE ALSO
-.Xr atf 7
diff --git a/contrib/atf/doc/atf.7.in b/contrib/atf/doc/atf.7.in
deleted file mode 100644
index 5fcca44df16..00000000000
--- a/contrib/atf/doc/atf.7.in
+++ /dev/null
@@ -1,192 +0,0 @@
-.\"
-.\" Automated Testing Framework (atf)
-.\"
-.\" 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.
-.\"
-.Dd August 28, 2010
-.Dt ATF 7
-.Os
-.Sh NAME
-.Nm ATF
-.Nd introduction to the Automated Testing Framework
-.Sh DESCRIPTION
-.Em IMPORTANT: If you are here because you want to know how to run the tests in
-.Em Pa __TESTSDIR__ ,
-.Em you most likely want to read the
-.Em Xr tests 7
-.Em manual page instead.
-.Pp
-The Automated Testing Framework
-.Pf ( Nm )
-is a collection of libraries and utilities designed to ease unattended
-application testing in the hands of developers and end users of a specific
-piece of software.
-.Pp
-As regards developers,
-.Nm
-provides the necessary means to easily create
-test suites composed of multiple test programs, which in turn are a
-collection of test cases.
-It also attempts to simplify the debugging of problems when these test
-cases detect an error by providing as much information as possible
-about the failure.
-.Pp
-As regards users, it simplifies the process of running the test suites and,
-in special, encourages end users to run them often: they do not need to
-have source trees around nor any other development tools installed to be
-able to certify that a given piece of software works on their machine as
-advertised.
-.Pp
-If your operating systems distributes
-.Nm ,
-it is possible that it provides an introductory
-.Xr tests 7
-manual page.
-You are encouraged to read it now.
-.Ss License
-.Nm
-is distributed under the terms of the TNF License, a 2-clause BSD license.
-For more details please see:
-.Bd -literal -offset indent
-.Pa __DOCDIR__/COPYING
-.Ed
-.Ss Components
-.Nm
-is a highly modular piece of software.
-It provides a couple of libraries to ease the implementation of test
-programs: one for the C and C++ languages and another one for shell
-scripts.
-It also includes multiple small utilities that follow the principle of
-doing a single thing but doing it right.
-This section outlines which these components are.
-.Pp
-Public utilities:
-.Bl -tag -width atfXtestXprogramXXXXX
-.It Xr atf-check 1
-Executes a command and checks that its exit code, its standard output
-and its standard error output match pre-specified expected values.
-.It Xr atf-config 1
-Queries static configuration information.
-.It Xr atf-report 1
-Converts the output of
-.Nm atf-run
-to user-friendly and/or machine-parseable reports.
-.It Xr atf-run 1
-Automates the execution of a series of test programs and collects their
-results in a unified report.
-.It Xr atf-sh 1
-Shell interpreter for shell-based test programs.
-.El
-.Pp
-Programming interfaces:
-.Bl -tag -width atfXtestXprogramXXXXX
-.It Xr atf-c-api 3
-C programming interface for test programs.
-.It Xr atf-c++-api 3
-C++ programming interface for test programs.
-.It Xr atf-sh-api 3
-POSIX shell programming interface for test programs.
-.El
-.Pp
-Other:
-.Bl -tag -width atfXtestXprogramXXXXX
-.It Xr atf-formats 5
-Description of the machine-parseable data formats used by the tools.
-.It Xr atf-test-case 4
-Generic description of test cases, independent of the language they are
-implemented in.
-.It Xr atf-test-program 1
-Common interface provided by the test programs written using the
-.Nm
-libraries.
-.El
-.Ss Recommended reading order
-For end users wishing to run tests:
-.Bl -enum -compact
-.It
-.Xr tests 7
-(only if provided by your operating system).
-.It
-.Xr atf-test-program 1
-.It
-.Xr atf-run 1
-.It
-.Xr atf-report 1
-.It
-.Xr atf-config 1
-.El
-.Pp
-For developers wanting to write their own tests:
-.Bl -enum -compact
-.It
-Everything recommended to users.
-.It
-.Xr atf-test-case 4
-.It
-.Xr atf-c-api 3
-.It
-.Xr atf-c++-api 3
-.It
-.Xr atf-sh-api 3
-.It
-.Xr atf-sh 1
-.It
-.Xr atf-check 1
-.El
-.Pp
-For those interested in
-.Nm
-internals:
-.Bl -enum -compact
-.It
-Everything recommended to users.
-.It
-Everything recommended to developers.
-.It
-.Xr atf-formats 5
-.El
-.Sh SEE ALSO
-.Xr tests 7
-.Sh HISTORY
-.Nm
-started as a Google Summer of Code 2007 project mentored by The NetBSD
-Foundation.
-Its original goal was to provide a testing framework for The NetBSD
-Operating System, but it grew as an independent project because the
-framework itself did not need to be tied to a specific operating system.
-.Pp
-For more details on this subject, please see:
-.Bd -literal -offset indent
-.Pa __DOCDIR__/NEWS
-.Pa __DOCDIR__/ROADMAP
-.Ed
-.Sh AUTHORS
-For more details on the people that made
-.Nm
-possible, please see:
-.Bd -literal -offset indent
-.Pa __DOCDIR__/AUTHORS
-.Ed
diff --git a/contrib/atf/test-programs/Atffile b/contrib/atf/test-programs/Atffile
deleted file mode 100644
index 253d3e8ab55..00000000000
--- a/contrib/atf/test-programs/Atffile
+++ /dev/null
@@ -1,10 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = atf
-
-tp: config_test
-tp: expect_test
-tp: fork_test
-tp: meta_data_test
-tp: srcdir_test
-tp: result_test
diff --git a/contrib/atf/test-programs/Kyuafile b/contrib/atf/test-programs/Kyuafile
index de3245d4657..e5252829e51 100644
--- a/contrib/atf/test-programs/Kyuafile
+++ b/contrib/atf/test-programs/Kyuafile
@@ -4,7 +4,6 @@ test_suite("atf")
 
 atf_test_program{name="config_test"}
 atf_test_program{name="expect_test"}
-atf_test_program{name="fork_test"}
 atf_test_program{name="meta_data_test"}
 atf_test_program{name="srcdir_test"}
 atf_test_program{name="result_test"}
diff --git a/contrib/atf/test-programs/Makefile.am.inc b/contrib/atf/test-programs/Makefile.am.inc
deleted file mode 100644
index 1d886013313..00000000000
--- a/contrib/atf/test-programs/Makefile.am.inc
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-tests_test_programs_DATA = test-programs/Atffile \
-                           test-programs/Kyuafile
-tests_test_programsdir = $(pkgtestsdir)/test-programs
-EXTRA_DIST += $(tests_test_programs_DATA)
-
-tests_test_programs_PROGRAMS = test-programs/c_helpers
-test_programs_c_helpers_SOURCES = test-programs/c_helpers.c
-test_programs_c_helpers_LDADD = libatf-c.la
-
-tests_test_programs_PROGRAMS += test-programs/cpp_helpers
-test_programs_cpp_helpers_SOURCES = test-programs/cpp_helpers.cpp
-test_programs_cpp_helpers_LDADD = $(ATF_CXX_LIBS)
-
-common_sh = $(srcdir)/test-programs/common.sh
-EXTRA_DIST += test-programs/common.sh
-
-tests_test_programs_SCRIPTS = test-programs/sh_helpers
-CLEANFILES += test-programs/sh_helpers
-EXTRA_DIST += test-programs/sh_helpers.sh
-test-programs/sh_helpers: $(srcdir)/test-programs/sh_helpers.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/sh_helpers.sh $(common_sh)"; \
-	dst="test-programs/sh_helpers"; $(BUILD_SH_TP)
-
-tests_test_programs_SCRIPTS += test-programs/config_test
-CLEANFILES += test-programs/config_test
-EXTRA_DIST += test-programs/config_test.sh
-test-programs/config_test: $(srcdir)/test-programs/config_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/config_test.sh $(common_sh)"; \
-	dst="test-programs/config_test"; $(BUILD_SH_TP)
-
-tests_test_programs_SCRIPTS += test-programs/expect_test
-CLEANFILES += test-programs/expect_test
-EXTRA_DIST += test-programs/expect_test.sh
-test-programs/expect_test: $(srcdir)/test-programs/expect_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/expect_test.sh $(common_sh)"; \
-	dst="test-programs/expect_test"; $(BUILD_SH_TP)
-
-tests_test_programs_SCRIPTS += test-programs/fork_test
-CLEANFILES += test-programs/fork_test
-EXTRA_DIST += test-programs/fork_test.sh
-test-programs/fork_test: $(srcdir)/test-programs/fork_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/fork_test.sh $(common_sh)"; \
-	dst="test-programs/fork_test"; $(BUILD_SH_TP)
-
-tests_test_programs_SCRIPTS += test-programs/meta_data_test
-CLEANFILES += test-programs/meta_data_test
-EXTRA_DIST += test-programs/meta_data_test.sh
-test-programs/meta_data_test: $(srcdir)/test-programs/meta_data_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/meta_data_test.sh $(common_sh)"; \
-	dst="test-programs/meta_data_test"; $(BUILD_SH_TP)
-
-tests_test_programs_SCRIPTS += test-programs/result_test
-CLEANFILES += test-programs/result_test
-EXTRA_DIST += test-programs/result_test.sh
-test-programs/result_test: $(srcdir)/test-programs/result_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/result_test.sh $(common_sh)"; \
-	dst="test-programs/result_test"; $(BUILD_SH_TP)
-
-tests_test_programs_SCRIPTS += test-programs/srcdir_test
-CLEANFILES += test-programs/srcdir_test
-EXTRA_DIST += test-programs/srcdir_test.sh
-test-programs/srcdir_test: $(srcdir)/test-programs/srcdir_test.sh
-	test -d test-programs || mkdir -p test-programs
-	@src="$(srcdir)/test-programs/srcdir_test.sh $(common_sh)"; \
-	dst="test-programs/srcdir_test"; $(BUILD_SH_TP)
-
-# vim: syntax=make:noexpandtab:shiftwidth=8:softtabstop=8
diff --git a/contrib/atf/test-programs/c_helpers.c b/contrib/atf/test-programs/c_helpers.c
index 95cde6f717a..ac9bcc33629 100644
--- a/contrib/atf/test-programs/c_helpers.c
+++ b/contrib/atf/test-programs/c_helpers.c
@@ -177,22 +177,6 @@ ATF_TC_CLEANUP(cleanup_sigterm, tc)
     safe_remove(atf_tc_get_config_var(tc, "tmpfile"));
 }
 
-ATF_TC_WITH_CLEANUP(cleanup_fork);
-ATF_TC_HEAD(cleanup_fork, tc)
-{
-    atf_tc_set_md_var(tc, "descr", "Helper test case for the t_cleanup test "
-                      "program");
-}
-ATF_TC_BODY(cleanup_fork, tc)
-{
-}
-ATF_TC_CLEANUP(cleanup_fork, tc)
-{
-    close(STDOUT_FILENO);
-    close(STDERR_FILENO);
-    close(3);
-}
-
 /* ---------------------------------------------------------------------
  * Helper tests for "t_config".
  * --------------------------------------------------------------------- */
@@ -385,37 +369,6 @@ ATF_TC_BODY(expect_timeout_but_pass, tc)
     atf_tc_expect_timeout("Will just exit");
 }
 
-/* ---------------------------------------------------------------------
- * Helper tests for "t_fork".
- * --------------------------------------------------------------------- */
-
-ATF_TC(fork_stop);
-ATF_TC_HEAD(fork_stop, tc)
-{
-    atf_tc_set_md_var(tc, "descr", "Helper test case for the t_fork test "
-                      "program");
-}
-ATF_TC_BODY(fork_stop, tc)
-{
-    FILE *f;
-    const char *dfstr, *pfstr;
-
-    dfstr = atf_tc_get_config_var(tc, "donefile");
-    pfstr = atf_tc_get_config_var(tc, "pidfile");
-
-    f = fopen(pfstr, "w");
-    if (f == NULL)
-        atf_tc_fail("Failed to create pidfile %s", pfstr);
-    fprintf(f, "%d", (int)getpid());
-    fclose(f);
-    printf("Wrote pid file\n");
-
-    printf("Waiting for done file\n");
-    while (access(dfstr, F_OK) != 0)
-        usleep(10000);
-    printf("Exiting\n");
-}
-
 /* ---------------------------------------------------------------------
  * Helper tests for "t_meta_data".
  * --------------------------------------------------------------------- */
@@ -511,7 +464,6 @@ ATF_TP_ADD_TCS(tp)
     ATF_TP_ADD_TC(tp, cleanup_skip);
     ATF_TP_ADD_TC(tp, cleanup_curdir);
     ATF_TP_ADD_TC(tp, cleanup_sigterm);
-    ATF_TP_ADD_TC(tp, cleanup_fork);
 
     /* Add helper tests for t_config. */
     ATF_TP_ADD_TC(tp, config_unset);
@@ -538,9 +490,6 @@ ATF_TP_ADD_TCS(tp)
     ATF_TP_ADD_TC(tp, expect_timeout_and_hang);
     ATF_TP_ADD_TC(tp, expect_timeout_but_pass);
 
-    /* Add helper tests for t_fork. */
-    ATF_TP_ADD_TC(tp, fork_stop);
-
     /* Add helper tests for t_meta_data. */
     ATF_TP_ADD_TC(tp, metadata_no_descr);
     ATF_TP_ADD_TC(tp, metadata_no_head);
diff --git a/contrib/atf/test-programs/cpp_helpers.cpp b/contrib/atf/test-programs/cpp_helpers.cpp
index 4487aefb664..d8a495e7c67 100644
--- a/contrib/atf/test-programs/cpp_helpers.cpp
+++ b/contrib/atf/test-programs/cpp_helpers.cpp
@@ -36,7 +36,7 @@ extern "C" {
 #include <fstream>
 #include <iostream>
 
-#include "atf-c++/macros.hpp"
+#include <atf-c++.hpp>
 
 #include "atf-c++/detail/fs.hpp"
 
@@ -224,27 +224,6 @@ ATF_TEST_CASE_BODY(expect_timeout_but_pass)
     expect_timeout("Will just exit");
 }
 
-// ------------------------------------------------------------------------
-// Helper tests for "t_fork".
-// ------------------------------------------------------------------------
-
-ATF_TEST_CASE(fork_stop);
-ATF_TEST_CASE_HEAD(fork_stop)
-{
-    set_md_var("descr", "Helper test case for the t_fork test program");
-}
-ATF_TEST_CASE_BODY(fork_stop)
-{
-    std::ofstream os(get_config_var("pidfile").c_str());
-    os << ::getpid() << "\n";
-    os.close();
-    std::cout << "Wrote pid file\n";
-    std::cout << "Waiting for done file\n";
-    while (::access(get_config_var("donefile").c_str(), F_OK) != 0)
-        ::usleep(10000);
-    std::cout << "Exiting\n";
-}
-
 // ------------------------------------------------------------------------
 // Helper tests for "t_meta_data".
 // ------------------------------------------------------------------------
@@ -363,9 +342,6 @@ ATF_INIT_TEST_CASES(tcs)
     ATF_ADD_TEST_CASE(tcs, expect_timeout_and_hang);
     ATF_ADD_TEST_CASE(tcs, expect_timeout_but_pass);
 
-    // Add helper tests for t_fork.
-    ATF_ADD_TEST_CASE(tcs, fork_stop);
-
     // Add helper tests for t_meta_data.
     ATF_ADD_TEST_CASE(tcs, metadata_no_descr);
     ATF_ADD_TEST_CASE(tcs, metadata_no_head);
diff --git a/contrib/atf/test-programs/fork_test.sh b/contrib/atf/test-programs/fork_test.sh
deleted file mode 100644
index 70f611874e7..00000000000
--- a/contrib/atf/test-programs/fork_test.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Automated Testing Framework (atf)
-#
-# 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.
-#
-
-# TODO: This test program is about checking the test case's "environment"
-# (not the variables).  Should be named something else than t_fork.
-
-atf_test_case stop
-stop_head()
-{
-    atf_set "descr" "Tests that sending a stop signal to a test case does" \
-                    "not report it as failed"
-}
-stop_body()
-{
-    for h in $(get_helpers); do
-        ${h} -s $(atf_get_srcdir) -v pidfile=$(pwd)/pid \
-             -v donefile=$(pwd)/done -r resfile fork_stop &
-        ppid=${!}
-        echo "Waiting for pid file for test program ${ppid}"
-        while test ! -f pid; do sleep 1; done
-        pid=$(cat pid)
-        echo "Test case's pid is ${pid}"
-        kill -STOP ${pid}
-        touch done
-        echo "Wrote done file"
-        kill -CONT ${pid}
-        wait ${ppid}
-        atf_check -s eq:0 -o ignore -e empty grep '^passed$' resfile
-        rm -f pid done
-    done
-}
-
-atf_init_test_cases()
-{
-    atf_add_test_case stop
-}
-
-# vim: syntax=sh:expandtab:shiftwidth=4:softtabstop=4
diff --git a/contrib/atf/test-programs/sh_helpers.sh b/contrib/atf/test-programs/sh_helpers.sh
index de95882f647..eb55102dfee 100644
--- a/contrib/atf/test-programs/sh_helpers.sh
+++ b/contrib/atf/test-programs/sh_helpers.sh
@@ -111,23 +111,6 @@ cleanup_sigterm_cleanup()
     rm $(atf_config_get tmpfile)
 }
 
-atf_test_case cleanup_fork cleanup
-cleanup_fork_head()
-{
-    atf_set "descr" "Helper test case for the t_cleanup test program"
-}
-cleanup_fork_body()
-{
-    :
-}
-cleanup_fork_cleanup()
-{
-    exec 1>out
-    exec 2>err
-    exec 3>res
-    rm -f out err res
-}
-
 # -------------------------------------------------------------------------
 # Helper tests for "t_config".
 # -------------------------------------------------------------------------
@@ -174,24 +157,6 @@ config_multi_value_body()
     atf_check_equal "$(atf_config_get 'test')" "foo bar"
 }
 
-# -------------------------------------------------------------------------
-# Helper tests for "t_fork".
-# -------------------------------------------------------------------------
-
-atf_test_case fork_stop
-fork_stop_head()
-{
-    atf_set "descr" "Helper test case for the t_fork test program"
-}
-fork_stop_body()
-{
-    echo ${$} >$(atf_config_get pidfile)
-    echo "Wrote pid file"
-    echo "Waiting for done file"
-    while ! test -f $(atf_config_get donefile); do sleep 1; done
-    echo "Exiting"
-}
-
 # -------------------------------------------------------------------------
 # Helper tests for "t_expect".
 # -------------------------------------------------------------------------
@@ -387,7 +352,6 @@ atf_init_test_cases()
     atf_add_test_case cleanup_skip
     atf_add_test_case cleanup_curdir
     atf_add_test_case cleanup_sigterm
-    atf_add_test_case cleanup_fork
 
     # Add helper tests for t_config.
     atf_add_test_case config_unset
@@ -414,9 +378,6 @@ atf_init_test_cases()
     atf_add_test_case expect_timeout_and_hang
     atf_add_test_case expect_timeout_but_pass
 
-    # Add helper tests for t_fork.
-    atf_add_test_case fork_stop
-
     # Add helper tests for t_meta_data.
     atf_add_test_case metadata_no_descr
     atf_add_test_case metadata_no_head
diff --git a/contrib/binutils/bfd/elf32-score.c b/contrib/binutils/bfd/elf32-score.c
index 070177b1507..2c8a633e0e4 100644
--- a/contrib/binutils/bfd/elf32-score.c
+++ b/contrib/binutils/bfd/elf32-score.c
@@ -2546,7 +2546,7 @@ _bfd_score_elf_check_relocs (bfd *abfd,
 	}
       else if (r_symndx >= extsymoff + NUM_SHDR_ENTRIES (symtab_hdr))
         {
-          (*_bfd_error_handler) (_("%s: Malformed reloc detected for section %s"), abfd, name);
+          (*_bfd_error_handler) (_("%B: Malformed reloc detected for section %s"), abfd, name);
           bfd_set_error (bfd_error_bad_value);
           return FALSE;
         }
diff --git a/contrib/binutils/bfd/elflink.c b/contrib/binutils/bfd/elflink.c
index f5c989d7a77..e80f8ee3f22 100644
--- a/contrib/binutils/bfd/elflink.c
+++ b/contrib/binutils/bfd/elflink.c
@@ -4357,8 +4357,8 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
 	      if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0)
 		{
 		  (*_bfd_error_handler)
-		    (_("%s: invalid DSO for symbol `%s' definition"),
-		     abfd, name);
+		    (_("%B: invalid DSO for symbol `%s' definition"),
+		    abfd, name);
 		  bfd_set_error (bfd_error_bad_value);
 		  goto error_free_vers;
 		}
diff --git a/contrib/binutils/bfd/po/bfd.pot b/contrib/binutils/bfd/po/bfd.pot
index a01ee37160a..e5282389a1a 100644
--- a/contrib/binutils/bfd/po/bfd.pot
+++ b/contrib/binutils/bfd/po/bfd.pot
@@ -1572,7 +1572,7 @@ msgstr ""
 
 #: elf32-score.c:2549
 #, c-format
-msgid "%s: Malformed reloc detected for section %s"
+msgid "%B: Malformed reloc detected for section %s"
 msgstr ""
 
 #: elf32-score.c:2600
@@ -2440,7 +2440,7 @@ msgstr ""
 
 #: elflink.c:4309
 #, c-format
-msgid "%s: invalid DSO for symbol `%s' definition"
+msgid "%B: invalid DSO for symbol `%s' definition"
 msgstr ""
 
 #: elflink.c:5535
diff --git a/contrib/binutils/binutils/cxxfilt.c b/contrib/binutils/binutils/cxxfilt.c
index bed0537e477..a5200264711 100644
--- a/contrib/binutils/binutils/cxxfilt.c
+++ b/contrib/binutils/binutils/cxxfilt.c
@@ -63,12 +63,12 @@ demangle_it (char *mangled_name)
   result = cplus_demangle (mangled_name + skip_first, flags);
 
   if (result == NULL)
-    printf (mangled_name);
+    printf ("%s",mangled_name);
   else
     {
       if (mangled_name[0] == '.')
 	putchar ('.');
-      printf (result);
+      printf ("%s",result);
       free (result);
     }
 }
diff --git a/contrib/binutils/binutils/readelf.c b/contrib/binutils/binutils/readelf.c
index d2e2aefca38..aafd8d4502e 100644
--- a/contrib/binutils/binutils/readelf.c
+++ b/contrib/binutils/binutils/readelf.c
@@ -7118,7 +7118,7 @@ process_symbol_table (FILE *file)
 
 	      n = print_vma (si, DEC_5);
 	      if (n < 5)
-		fputs ("     " + n, stdout);
+		fputs (&"     "[n], stdout);
 	      printf (" %3lu: ", hn);
 	      print_vma (psym->st_value, LONG_HEX);
 	      putchar (' ');
diff --git a/contrib/binutils/gas/config/atof-ieee.c b/contrib/binutils/gas/config/atof-ieee.c
index bf842e1717d..8044161fc0a 100644
--- a/contrib/binutils/gas/config/atof-ieee.c
+++ b/contrib/binutils/gas/config/atof-ieee.c
@@ -420,7 +420,8 @@ gen_to_words (LITTLENUM_TYPE *words, int precision, long exponent_bits)
 		     - generic_floating_point_number.low);
 
   /* Seek (and forget) 1st significant bit.  */
-  for (exponent_skippage = 0; !next_bits (1); ++exponent_skippage);;
+  for (exponent_skippage = 0; !next_bits (1); ++exponent_skippage)
+	;;
   exponent_1 = (generic_floating_point_number.exponent
 		+ generic_floating_point_number.leader
 		+ 1
diff --git a/contrib/binutils/gas/config/tc-arm.c b/contrib/binutils/gas/config/tc-arm.c
index e1a6c6dd706..9efe5760e64 100644
--- a/contrib/binutils/gas/config/tc-arm.c
+++ b/contrib/binutils/gas/config/tc-arm.c
@@ -12660,14 +12660,14 @@ do_vfp_nsyn_cvt (enum neon_shape rs, int flavour)
       /* Conversions without bitshift.  */
       const char *enc[] =
         {
-          "ftosis",
-          "ftouis",
+          "ftosizs",
+          "ftouizs",
           "fsitos",
           "fuitos",
           "fcvtsd",
           "fcvtds",
-          "ftosid",
-          "ftouid",
+          "ftosizd",
+          "ftouizd",
           "fsitod",
           "fuitod"
         };
diff --git a/contrib/binutils/gas/config/tc-mips.c b/contrib/binutils/gas/config/tc-mips.c
index e97193f54b3..80fdfd01af4 100644
--- a/contrib/binutils/gas/config/tc-mips.c
+++ b/contrib/binutils/gas/config/tc-mips.c
@@ -15420,21 +15420,6 @@ MIPS options:\n\
 -mno-octeon-useun generate MIPS unaligned load/store instructions\n"));
 }
 
-enum dwarf2_format
-mips_dwarf2_format (void)
-{
-  if (HAVE_64BIT_SYMBOLS)
-    {
-#ifdef TE_IRIX
-      return dwarf2_format_64bit_irix;
-#else
-      return dwarf2_format_64bit;
-#endif
-    }
-  else
-    return dwarf2_format_32bit;
-}
-
 int
 mips_dwarf2_addr_size (void)
 {
diff --git a/contrib/binutils/gas/config/tc-mips.h b/contrib/binutils/gas/config/tc-mips.h
index 117417cfed5..f246f68fcd2 100644
--- a/contrib/binutils/gas/config/tc-mips.h
+++ b/contrib/binutils/gas/config/tc-mips.h
@@ -155,10 +155,6 @@ extern void mips_emit_delays (void);
 extern void mips_enable_auto_align (void);
 #define md_elf_section_change_hook()	mips_enable_auto_align()
 
-enum dwarf2_format;
-extern enum dwarf2_format mips_dwarf2_format (void);
-#define DWARF2_FORMAT() mips_dwarf2_format ()
-
 extern int mips_dwarf2_addr_size (void);
 #define DWARF2_ADDR_SIZE(bfd) mips_dwarf2_addr_size ()
 
diff --git a/contrib/binutils/gas/dwarf2dbg.c b/contrib/binutils/gas/dwarf2dbg.c
index 671a9b030d4..528f676a30b 100644
--- a/contrib/binutils/gas/dwarf2dbg.c
+++ b/contrib/binutils/gas/dwarf2dbg.c
@@ -1271,6 +1271,7 @@ out_debug_line (segT line_seg)
   symbolS *line_end;
   struct line_seg *s;
   enum dwarf2_format d2f;
+  int sizeof_initial_length;
   int sizeof_offset;
 
   subseg_set (line_seg, 0);
@@ -1287,27 +1288,24 @@ out_debug_line (segT line_seg)
   d2f = DWARF2_FORMAT ();
   if (d2f == dwarf2_format_32bit)
     {
-      expr.X_add_number = -4;
-      emit_expr (&expr, 4);
-      sizeof_offset = 4;
+      sizeof_initial_length = sizeof_offset = 4;
     }
   else if (d2f == dwarf2_format_64bit)
     {
-      expr.X_add_number = -12;
-      out_four (-1);
-      emit_expr (&expr, 8);
+      sizeof_initial_length = 12;
       sizeof_offset = 8;
+      out_four (-1);
     }
   else if (d2f == dwarf2_format_64bit_irix)
     {
-      expr.X_add_number = -8;
-      emit_expr (&expr, 8);
-      sizeof_offset = 8;
+      sizeof_initial_length = sizeof_offset = 8;
     }
   else
     {
       as_fatal (_("internal error: unknown dwarf2 format"));
     }
+  expr.X_add_number = -sizeof_initial_length;
+  emit_expr (&expr, sizeof_offset);
 
   /* Version.  */
   out_two (2);
@@ -1316,7 +1314,7 @@ out_debug_line (segT line_seg)
   expr.X_op = O_subtract;
   expr.X_add_symbol = prologue_end;
   expr.X_op_symbol = line_start;
-  expr.X_add_number = - (4 + 2 + 4);
+  expr.X_add_number = - (sizeof_initial_length + 2 + sizeof_offset);
   emit_expr (&expr, sizeof_offset);
 
   /* Parameters of the state machine.  */
diff --git a/contrib/binutils/gas/symbols.c b/contrib/binutils/gas/symbols.c
index 816395ff22d..acfd3493e5e 100644
--- a/contrib/binutils/gas/symbols.c
+++ b/contrib/binutils/gas/symbols.c
@@ -1666,7 +1666,8 @@ dollar_label_name (register long n,	/* we just saw "n$:" : n a number.  */
       *q = i % 10 + '0';
       i /= 10;
     }
-  while ((*p++ = *--q) != '\0');;
+  while ((*p++ = *--q) != '\0')
+	;;
 
   /* The label, as a '\0' ended string, starts at symbol_name_build.  */
   return symbol_name_build;
@@ -1837,7 +1838,8 @@ fb_label_name (long n,	/* We just saw "n:", "nf" or "nb" : n a number.  */
       *q = i % 10 + '0';
       i /= 10;
     }
-  while ((*p++ = *--q) != '\0');;
+  while ((*p++ = *--q) != '\0')
+	;;
 
   /* The label, as a '\0' ended string, starts at symbol_name_build.  */
   return (symbol_name_build);
diff --git a/contrib/binutils/opcodes/i386-dis.c b/contrib/binutils/opcodes/i386-dis.c
index eb33089a407..cc0075ce6b3 100644
--- a/contrib/binutils/opcodes/i386-dis.c
+++ b/contrib/binutils/opcodes/i386-dis.c
@@ -3474,7 +3474,7 @@ static bfd_vma start_pc;
  * The function returns the length of this instruction in bytes.
  */
 
-static char intel_syntax;
+static int intel_syntax;
 static char open_char;
 static char close_char;
 static char separator_char;
@@ -3547,7 +3547,7 @@ print_insn (bfd_vma pc, disassemble_info *info)
   else
     address_mode = mode_32bit;
 
-  if (intel_syntax == (char) -1)
+  if (intel_syntax == -1)
     intel_syntax = (info->mach == bfd_mach_i386_i386_intel_syntax
 		    || info->mach == bfd_mach_x86_64_intel_syntax);
 
@@ -4326,7 +4326,7 @@ dofloat (int sizeflag)
 static void
 OP_ST (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
 {
-  oappend ("%st" + intel_syntax);
+  oappend (&"%st"[intel_syntax]);
 }
 
 static void
@@ -4677,32 +4677,32 @@ append_seg (void)
   if (prefixes & PREFIX_CS)
     {
       used_prefixes |= PREFIX_CS;
-      oappend ("%cs:" + intel_syntax);
+      oappend (&"%cs:"[intel_syntax]);
     }
   if (prefixes & PREFIX_DS)
     {
       used_prefixes |= PREFIX_DS;
-      oappend ("%ds:" + intel_syntax);
+      oappend (&"%ds:"[intel_syntax]);
     }
   if (prefixes & PREFIX_SS)
     {
       used_prefixes |= PREFIX_SS;
-      oappend ("%ss:" + intel_syntax);
+      oappend (&"%ss:"[intel_syntax]);
     }
   if (prefixes & PREFIX_ES)
     {
       used_prefixes |= PREFIX_ES;
-      oappend ("%es:" + intel_syntax);
+      oappend (&"%es:"[intel_syntax]);
     }
   if (prefixes & PREFIX_FS)
     {
       used_prefixes |= PREFIX_FS;
-      oappend ("%fs:" + intel_syntax);
+      oappend (&"%fs:"[intel_syntax]);
     }
   if (prefixes & PREFIX_GS)
     {
       used_prefixes |= PREFIX_GS;
-      oappend ("%gs:" + intel_syntax);
+      oappend (&"%gs:"[intel_syntax]);
     }
 }
 
@@ -5474,7 +5474,7 @@ OP_I (int bytemode, int sizeflag)
   op &= mask;
   scratchbuf[0] = '$';
   print_operand_value (scratchbuf + 1, 1, op);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
   scratchbuf[0] = '\0';
 }
 
@@ -5525,7 +5525,7 @@ OP_I64 (int bytemode, int sizeflag)
   op &= mask;
   scratchbuf[0] = '$';
   print_operand_value (scratchbuf + 1, 1, op);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
   scratchbuf[0] = '\0';
 }
 
@@ -5575,7 +5575,7 @@ OP_sI (int bytemode, int sizeflag)
 
   scratchbuf[0] = '$';
   print_operand_value (scratchbuf + 1, 1, op);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5755,7 +5755,7 @@ OP_ESreg (int code, int sizeflag)
 	  intel_operand_size (b_mode, sizeflag);
 	}
     }
-  oappend ("%es:" + intel_syntax);
+  oappend (&"%es:"[intel_syntax]);
   ptr_reg (code, sizeflag);
 }
 
@@ -5805,7 +5805,7 @@ OP_C (int dummy ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
       add = 8;
     }
   sprintf (scratchbuf, "%%cr%d", modrm.reg + add);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5826,7 +5826,7 @@ static void
 OP_T (int dummy ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
 {
   sprintf (scratchbuf, "%%tr%d", modrm.reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5852,7 +5852,7 @@ OP_MMX (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
     }
   else
     sprintf (scratchbuf, "%%mm%d", modrm.reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5863,7 +5863,7 @@ OP_XMM (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
   if (rex & REX_R)
     add = 8;
   sprintf (scratchbuf, "%%xmm%d", modrm.reg + add);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5895,7 +5895,7 @@ OP_EM (int bytemode, int sizeflag)
     }
   else
     sprintf (scratchbuf, "%%mm%d", modrm.rm);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 /* cvt* are the only instructions in sse2 which have
@@ -5922,7 +5922,7 @@ OP_EMC (int bytemode, int sizeflag)
   codep++;
   used_prefixes |= (prefixes & PREFIX_DATA);
   sprintf (scratchbuf, "%%mm%d", modrm.rm);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5930,7 +5930,7 @@ OP_MXC (int bytemode ATTRIBUTE_UNUSED, int sizeflag ATTRIBUTE_UNUSED)
 {
   used_prefixes |= (prefixes & PREFIX_DATA);
   sprintf (scratchbuf, "%%mm%d", modrm.reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -5950,7 +5950,7 @@ OP_EX (int bytemode, int sizeflag)
   MODRM_CHECK;
   codep++;
   sprintf (scratchbuf, "%%xmm%d", modrm.rm + add);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
@@ -6438,14 +6438,22 @@ VMX_Fixup (int extrachar ATTRIBUTE_UNUSED, int sizeflag)
 static void
 OP_VMX (int bytemode, int sizeflag)
 {
-  used_prefixes |= (prefixes & (PREFIX_DATA | PREFIX_REPZ));
-  if (prefixes & PREFIX_DATA)
-    strcpy (obuf, "vmclear");
-  else if (prefixes & PREFIX_REPZ)
-    strcpy (obuf, "vmxon");
+  if (modrm.mod == 3)
+    {
+      strcpy (obuf, "rdrand");
+      OP_E (v_mode, sizeflag);
+    }
   else
-    strcpy (obuf, "vmptrld");
-  OP_E (bytemode, sizeflag);
+    {
+      used_prefixes |= (prefixes & (PREFIX_DATA | PREFIX_REPZ));
+      if (prefixes & PREFIX_DATA)
+	strcpy (obuf, "vmclear");
+      else if (prefixes & PREFIX_REPZ)
+	strcpy (obuf, "vmxon");
+      else
+	strcpy (obuf, "vmptrld");
+      OP_E (bytemode, sizeflag);
+    }
 }
 
 static void
@@ -6539,7 +6547,7 @@ static void
 XMM_Fixup (int reg, int sizeflag ATTRIBUTE_UNUSED)
 {
   sprintf (scratchbuf, "%%xmm%d", reg);
-  oappend (scratchbuf + intel_syntax);
+  oappend (&scratchbuf[intel_syntax]);
 }
 
 static void
diff --git a/contrib/binutils/opcodes/i386-opc.h b/contrib/binutils/opcodes/i386-opc.h
index 27c1dab2aae..8d6fd8a15f9 100644
--- a/contrib/binutils/opcodes/i386-opc.h
+++ b/contrib/binutils/opcodes/i386-opc.h
@@ -79,6 +79,7 @@ typedef struct template
 #define CpuNo64      0x8000000   /* Not supported in the 64bit mode  */
 
 #define CpuPCLMUL   0x10000000	/* Carry-less Multiplication extensions */
+#define CpuRdRnd    0x20000000	/* Intel Random Number Generator extensions */
 
 /* SSE4.1/4.2 Instructions required */
 #define CpuSSE4	     (CpuSSE4_1|CpuSSE4_2)
@@ -87,7 +88,7 @@ typedef struct template
 #define CpuUnknownFlags (Cpu186|Cpu286|Cpu386|Cpu486|Cpu586|Cpu686 \
 	|CpuP4|CpuSledgehammer|CpuMMX|CpuMMX2|CpuSSE|CpuSSE2|CpuSSE3|CpuVMX \
 	|Cpu3dnow|Cpu3dnowA|CpuK6|CpuPadLock|CpuSVME|CpuSSSE3|CpuSSE4_1 \
-	|CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL)
+	|CpuSSE4_2|CpuABM|CpuSSE4a|CpuXSAVE|CpuAES|CpuPCLMUL|CpuRdRnd)
 
   /* the bits in opcode_modifier are used to generate the final opcode from
      the base_opcode.  These bits also are used to detect alternate forms of
diff --git a/contrib/binutils/opcodes/i386-opc.tbl b/contrib/binutils/opcodes/i386-opc.tbl
index 6cb72199fd4..ea188ddca8f 100644
--- a/contrib/binutils/opcodes/i386-opc.tbl
+++ b/contrib/binutils/opcodes/i386-opc.tbl
@@ -1502,3 +1502,21 @@ xrstor, 1, 0xfae, 0x5, CpuXSAVE, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_xSuf,
 // INVPCID
 invpcid, 2, 0x660f3882, None, CpuNo64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg32 }
 invpcid, 2, 0x660f3882, None, Cpu64, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_sSuf|No_qSuf|No_xSuf|NoRex64, { BaseIndex|Disp8|Disp16|Disp32|Disp32S, Reg64 }
+
+// Intel AES extensions
+aesdec, 2, 0x660f38de, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aesdeclast, 2, 0x660f38df, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aesenc, 2, 0x660f38dc, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aesenclast, 2, 0x660f38dd, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aesimc, 2, 0x660f38db, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { RegXMM|LLongMem, RegXMM }
+aeskeygenassist, 3, 0x660f3adf, None, CpuAES, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Imm8, RegXMM|LLongMem, RegXMM }
+
+// Intel Carry-less Multiplication extensions
+pclmulqdq, 3, 0x660f3a44, None, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Imm8, RegXMM|LLongMem, RegXMM }
+pclmullqlqdq, 2, 0x660f3a44, 0x0, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM }
+pclmulhqlqdq, 2, 0x660f3a44, 0x1, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM }
+pclmullqhqdq, 2, 0x660f3a44, 0x10, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM }
+pclmulhqhqdq, 2, 0x660f3a44, 0x11, CpuPCLMUL, Modrm|IgnoreSize|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf|ImmExt, { RegXMM|LLongMem, RegXMM }
+
+// Intel Random Number Generator extensions
+rdrand, 1, 0x0fc7, 0x6, CpuRdRnd, Modrm|No_bSuf|No_wSuf|No_lSuf|No_sSuf|No_qSuf|No_xSuf, { Reg16|Reg32|Reg64 }
diff --git a/contrib/binutils/opcodes/i386-tbl.h b/contrib/binutils/opcodes/i386-tbl.h
index c42f56591bc..ec19f109ae4 100644
--- a/contrib/binutils/opcodes/i386-tbl.h
+++ b/contrib/binutils/opcodes/i386-tbl.h
@@ -4374,6 +4374,11 @@ const template i386_optab[] =
     Modrm|IgnoreSize|NoSuf|ImmExt,
     { RegXMM|LLongMem,
       RegXMM } },
+
+  /* Intel Random Number Generator extensions */
+  {"rdrand", 1, 0x0fc7, 0x6, CpuRdRnd,
+    Modrm|NoSuf,
+    { Reg16|Reg32|Reg64 } },
   
   { NULL, 0, 0, 0, 0, 0, { 0 } }
 };
diff --git a/contrib/bmake/hash.c b/contrib/bmake/hash.c
index a22e2f2aa26..216f2846b99 100644
--- a/contrib/bmake/hash.c
+++ b/contrib/bmake/hash.c
@@ -221,6 +221,9 @@ Hash_FindEntry(Hash_Table *t, const char *key)
 	unsigned h;
 	const char *p;
 
+	if (t == NULL || t->bucketPtr == NULL) {
+	    return NULL;
+	}
 	for (h = 0, p = key; *p;)
 		h = (h << 5) - h + *p++;
 	p = key;
diff --git a/contrib/bmake/lst.lib/lstMember.c b/contrib/bmake/lst.lib/lstMember.c
index 0ff2ed19d86..93b541498ab 100644
--- a/contrib/bmake/lst.lib/lstMember.c
+++ b/contrib/bmake/lst.lib/lstMember.c
@@ -58,6 +58,9 @@ Lst_Member(Lst l, void *d)
     List    	  	list = l;
     ListNode	lNode;
 
+    if (list == NULL) {
+	return NULL;
+    }
     lNode = list->firstPtr;
     if (lNode == NULL) {
 	return NULL;
diff --git a/contrib/bsnmp/lib/snmp.c b/contrib/bsnmp/lib/snmp.c
index 744510c6301..6b9e3e87aaa 100644
--- a/contrib/bsnmp/lib/snmp.c
+++ b/contrib/bsnmp/lib/snmp.c
@@ -288,11 +288,13 @@ parse_secparams(struct asn_buf *b, struct snmp_pdu *pdu)
 	memset(buf, 0, 256);
 	tb.asn_ptr = buf;
 	tb.asn_len = 256;
+	u_int len;
 
-	if (asn_get_octetstring(b, buf, &tb.asn_len) != ASN_ERR_OK) {
+	if (asn_get_octetstring(b, buf, &len) != ASN_ERR_OK) {
 		snmp_error("cannot parse usm header");
 		return (ASN_ERR_FAILED);
 	}
+	tb.asn_len = len;
 
 	if (asn_get_sequence(&tb, &octs_len) != ASN_ERR_OK) {
 		snmp_error("cannot decode usm header");
@@ -864,7 +866,7 @@ snmp_fix_encoding(struct asn_buf *b, struct snmp_pdu *pdu)
 			return (SNMP_CODE_FAILED);
 
 		pdu->scoped_len = b->asn_ptr - pdu->scoped_ptr;
-		if ((code = snmp_pdu_fix_padd(b, pdu))!= ASN_ERR_OK)
+		if (snmp_pdu_fix_padd(b, pdu) != ASN_ERR_OK)
 			return (SNMP_CODE_FAILED);
 
 		if (pdu->security_model != SNMP_SECMODEL_USM)
@@ -997,7 +999,7 @@ snmp_pdu_encode(struct snmp_pdu *pdu, struct asn_buf *resp_b)
 	if ((err = snmp_pdu_encode_header(resp_b, pdu)) != SNMP_CODE_OK)
 		return (err);
 	for (idx = 0; idx < pdu->nbindings; idx++)
-		if ((err = snmp_binding_encode(resp_b, &pdu->bindings[idx]))
+		if (snmp_binding_encode(resp_b, &pdu->bindings[idx])
 		    != ASN_ERR_OK)
 			return (SNMP_CODE_FAILED);
 
diff --git a/contrib/bsnmp/lib/snmp.h b/contrib/bsnmp/lib/snmp.h
index 631d2f2e71c..4657336316e 100644
--- a/contrib/bsnmp/lib/snmp.h
+++ b/contrib/bsnmp/lib/snmp.h
@@ -182,7 +182,7 @@ struct snmp_pdu {
 
 	/* fixes for encoding */
 	size_t			outer_len;
-	size_t			scoped_len;
+	asn_len_t		scoped_len;
 	u_char			*outer_ptr;
 	u_char			*digest_ptr;
 	u_char			*encrypted_ptr;
diff --git a/contrib/bsnmp/lib/snmpagent.c b/contrib/bsnmp/lib/snmpagent.c
index 888d622514f..e2aa2647dd4 100644
--- a/contrib/bsnmp/lib/snmpagent.c
+++ b/contrib/bsnmp/lib/snmpagent.c
@@ -166,7 +166,7 @@ find_subnode(const struct snmp_value *value)
 }
 
 static void
-snmp_pdu_create_response(struct snmp_pdu *pdu, struct snmp_pdu *resp)
+snmp_pdu_create_response(const struct snmp_pdu *pdu, struct snmp_pdu *resp)
 {
 	memset(resp, 0, sizeof(*resp));
 	strcpy(resp->community, pdu->community);
@@ -276,7 +276,12 @@ snmp_get(struct snmp_pdu *pdu, struct asn_buf *resp_b,
 		}
 	}
 
-	return (snmp_fix_encoding(resp_b, resp));
+	if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) {
+		snmp_debug("get: failed to encode PDU");
+		return (SNMP_RET_ERR);
+	}
+
+	return (SNMP_RET_OK);
 }
 
 static struct snmp_node *
@@ -438,7 +443,13 @@ snmp_getnext(struct snmp_pdu *pdu, struct asn_buf *resp_b,
 			return (SNMP_RET_ERR);
 		}
 	}
-	return (snmp_fix_encoding(resp_b, resp));
+
+	if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) {
+		snmp_debug("getnext: failed to encode PDU");
+		return (SNMP_RET_ERR);
+	}
+
+	return (SNMP_RET_OK);
 }
 
 enum snmp_ret
@@ -537,7 +548,12 @@ snmp_getbulk(struct snmp_pdu *pdu, struct asn_buf *resp_b,
 	}
 
   done:
-	return (snmp_fix_encoding(resp_b, resp));
+	if (snmp_fix_encoding(resp_b, resp) != SNMP_CODE_OK) {
+		snmp_debug("getnext: failed to encode PDU");
+		return (SNMP_RET_ERR);
+	}
+
+	return (SNMP_RET_OK);
 }
 
 /*
@@ -952,18 +968,57 @@ enum snmp_ret
 snmp_make_errresp(const struct snmp_pdu *pdu, struct asn_buf *pdu_b,
     struct asn_buf *resp_b)
 {
+	u_char type;
 	asn_len_t len;
 	struct snmp_pdu resp;
 	enum asn_err err;
 	enum snmp_code code;
 
-	memset(&resp, 0, sizeof(resp));
+	snmp_pdu_create_response(pdu, &resp);
+
 	if ((code = snmp_pdu_decode_header(pdu_b, &resp)) != SNMP_CODE_OK)
 		return (SNMP_RET_IGN);
 
-	if (pdu_b->asn_len < len)
+	if (pdu->version == SNMP_V3) {
+		if (resp.user.priv_proto != SNMP_PRIV_NOPRIV &&
+		   (asn_get_header(pdu_b, &type, &resp.scoped_len) != ASN_ERR_OK
+		   || type != ASN_TYPE_OCTETSTRING)) {
+			snmp_error("cannot decode encrypted pdu");
+			return (SNMP_RET_IGN);
+		}
+
+		if (asn_get_sequence(pdu_b, &len) != ASN_ERR_OK) {
+			snmp_error("cannot decode scoped pdu header");
+			return (SNMP_RET_IGN);
+		}
+
+		len = SNMP_ENGINE_ID_SIZ;
+		if (asn_get_octetstring(pdu_b, (u_char *)resp.context_engine,
+		    &len) != ASN_ERR_OK) {
+			snmp_error("cannot decode msg context engine");
+			return (SNMP_RET_IGN);
+		}
+		resp.context_engine_len = len;
+		len = SNMP_CONTEXT_NAME_SIZ;
+		if (asn_get_octetstring(pdu_b, (u_char *)resp.context_name,
+		    &len) != ASN_ERR_OK) {
+			snmp_error("cannot decode msg context name");
+			return (SNMP_RET_IGN);
+		}
+		resp.context_name[len] = '\0';
+	}
+
+
+	if (asn_get_header(pdu_b, &type, &len) != ASN_ERR_OK) {
+		snmp_error("cannot get pdu header");
 		return (SNMP_RET_IGN);
-	pdu_b->asn_len = len;
+	}
+
+	if ((type & ~ASN_TYPE_MASK) !=
+	    (ASN_TYPE_CONSTRUCTED | ASN_CLASS_CONTEXT)) {
+		snmp_error("bad pdu header tag");
+		return (SNMP_RET_IGN);
+	}
 
 	err = snmp_parse_pdus_hdr(pdu_b, &resp, &len);
 	if (ASN_ERR_STOPPED(err))
diff --git a/contrib/byacc/CHANGES b/contrib/byacc/CHANGES
index c00f9599973..d5fc2a9689d 100644
--- a/contrib/byacc/CHANGES
+++ b/contrib/byacc/CHANGES
@@ -1,3 +1,44 @@
+2013-09-25  Thomas E. Dickey  <tom@invisible-island.net>
+
+	* reader.c: fix two loop-limits found by clang 3.3 --analyze
+
+	* configure: regen
+
+	* aclocal.m4:
+	tweaks to CF_MIXEDCASE_FILENAMES and CF_XOPEN_SOURCE for msys from ncurses
+
+	* package/mingw-byacc.spec: RCS_BASE
+
+	* test/calc.tab.c, test/calc1.tab.c, test/calc2.tab.c, test/calc3.tab.c, test/code_calc.code.c, test/code_error.code.c, test/error.tab.c, test/ftp.tab.c, test/grammar.tab.c, test/pure_calc.tab.c, test/pure_error.tab.c, test/quote_calc-s.tab.c, test/quote_calc.tab.c, test/quote_calc2-s.tab.c, test/quote_calc2.tab.c, test/quote_calc3-s.tab.c, test/quote_calc3.tab.c, test/quote_calc4-s.tab.c, test/quote_calc4.tab.c:
+	regen
+
+	* skeleton.c:
+	Increase default stack-size to match FreeBSD version noted as from
+	"BSD 4.4 Lite Usr.bin Sources".  See
+
+		http://svnweb.freebsd.org/base/vendor/CSRG/dist/usr.bin/yacc/
+		http://svnweb.freebsd.org/base/head/usr.bin/yacc/
+		http://svnweb.freebsd.org/base/vendor/byacc/
+
+	The original 1.9 sources (on which I based development) used 500 for
+	stacksize; the BSD Lite sources (a year or two later) used 10000.
+
+	This is a change to default values; the YYMAXDEPTH and YYSTACKSIZE
+	symbols have "always" been overridable by applications, but rarely
+	needed to do this.  RedHat began using the FreeBSD source in 2000,
+	and switched to this source in 2007 using the 20050813 snapshot.
+
+	RedHat #743343 misattributed the change in default stacksize to
+	a regression in byacc, but did not report the issue upstream.
+
+	* package/debian/changelog, VERSION, package/byacc.spec: bump
+
+2013-09-07  Thomas E. Dickey  <tom@invisible-island.net>
+
+	* config.sub: update to 2013-09-15
+
+	* config.guess: update to 2013-06-10
+
 2013-03-04  Thomas E. Dickey  <tom@invisible-island.net>
 
 	* package/debian/changelog, VERSION, package/byacc.spec: bump
@@ -30,7 +71,7 @@
 
 2013-02-10  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.sub, config.guess: 2013-02-04
+	* config.sub, config.guess: update to 2013-02-04
 
 2012-10-03  Thomas E. Dickey  <tom@invisible-island.net>
 
@@ -348,11 +389,11 @@
 
 2011-04-01  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.sub: 2011-04-01
+	* config.sub: update to 2011-04-01
 
 2011-02-02  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.guess: 2011-01-01
+	* config.guess: update to 2011-01-01
 
 2010-12-29  Thomas E. Dickey  <tom@invisible-island.net>
 
@@ -530,11 +571,11 @@
 
 2010-09-28  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.guess: 2010-09-24
+	* config.guess: update to 2010-09-24
 
 2010-09-10  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.sub: 2010-09-11
+	* config.sub: update to 2010-09-11
 
 2010-06-10  Thomas E. Dickey  <tom@invisible-island.net>
 
@@ -770,9 +811,9 @@
 
 2009-12-31  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.guess: 2009-12-30
+	* config.guess: update to 2009-12-30
 
-	* config.sub: 2009-12-31
+	* config.sub: update to 2009-12-31
 
 2009-10-27  Thomas E. Dickey  <tom@invisible-island.net>
 
@@ -798,7 +839,7 @@
 
 2009-08-25  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.guess, config.sub: 2009-08-19
+	* config.guess, config.sub: update to 2009-08-19
 
 2009-02-21  Thomas E. Dickey  <tom@invisible-island.net>
 
@@ -979,11 +1020,11 @@
 
 2006-12-22  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.guess: 2006/12/22
+	* config.guess: update to 2006/12/22
 
 2006-12-08  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.sub: 2006/12/08
+	* config.sub: update to 2006/12/08
 
 2005-08-13  Thomas E. Dickey  <tom@invisible-island.net>
 
@@ -1012,9 +1053,9 @@
 
 2005-06-25  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.sub: 2005/6/2
+	* config.sub: update to 2005/6/2
 
-	* config.guess: 2005/5/27
+	* config.guess: update to 2005/5/27
 
 2005-05-05  Thomas E. Dickey  <tom@invisible-island.net>
 
@@ -1108,9 +1149,9 @@
 
 2005-04-16  Thomas E. Dickey  <tom@invisible-island.net>
 
-	* config.sub: 2005/2/10
+	* config.sub: update to 2005/2/10
 
-	* config.guess: 2005/3/24
+	* config.guess: update to 2005/3/24
 
 2005-04-13  Thomas E. Dickey  <tom@invisible-island.net>
 
diff --git a/contrib/byacc/VERSION b/contrib/byacc/VERSION
index 9107e3f1f90..5ef5240213b 100644
--- a/contrib/byacc/VERSION
+++ b/contrib/byacc/VERSION
@@ -1 +1 @@
-20130304
+20130925
diff --git a/contrib/byacc/aclocal.m4 b/contrib/byacc/aclocal.m4
index 0741516f0e8..07a32f2702c 100644
--- a/contrib/byacc/aclocal.m4
+++ b/contrib/byacc/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.30 2013/03/05 01:13:39 tom Exp $
+dnl $Id: aclocal.m4,v 1.31 2013/09/25 23:15:41 tom Exp $
 dnl Macros for byacc configure script (Thomas E. Dickey)
 dnl ---------------------------------------------------------------------------
 dnl Copyright 2004-2012,2013 Thomas E. Dickey
@@ -671,7 +671,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03
+dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to
 dnl create a lowercase name and see it as uppercase, it doesn't support that.
@@ -680,7 +680,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES],
 AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[
 if test "$cross_compiling" = yes ; then
 	case $target_alias in #(vi
-	*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
+	*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
 		cf_cv_mixedcase=no
 		;;
 	*)
@@ -1018,7 +1018,7 @@ fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 43 updated: 2013/02/10 10:41:05
+dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -1038,7 +1038,7 @@ case $host_os in #(vi
 aix[[4-7]]*) #(vi
 	cf_xopen_source="-D_ALL_SOURCE"
 	;;
-cygwin) #(vi
+cygwin|msys) #(vi
 	cf_XOPEN_SOURCE=600
 	;;
 darwin[[0-8]].*) #(vi
diff --git a/contrib/byacc/config.guess b/contrib/byacc/config.guess
index 6ea345452a5..b79252d6b10 100755
--- a/contrib/byacc/config.guess
+++ b/contrib/byacc/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2013-02-04'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -132,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -853,21 +874,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -880,59 +901,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -951,54 +967,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1231,19 +1256,21 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		case $UNAME_PROCESSOR in
+		    i386) UNAME_PROCESSOR=x86_64 ;;
+		    powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	    fi
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
diff --git a/contrib/byacc/config.sub b/contrib/byacc/config.sub
index 80211d0d8b2..85a159e5793 100755
--- a/contrib/byacc/config.sub
+++ b/contrib/byacc/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2013-02-04'
+timestamp='2013-09-05'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -252,12 +252,12 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc \
+	| arc | arceb \
 	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
 	| avr | avr32 \
 	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
 	| fido | fr30 | frv \
@@ -296,7 +296,7 @@ case $basic_machine in
 	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
 	| open8 \
-	| or32 \
+	| or1k | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
@@ -324,7 +324,7 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -366,13 +366,13 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -794,7 +794,7 @@ case $basic_machine in
 		os=-mingw64
 		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -830,7 +830,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1546,6 +1546,9 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
 	hexagon-*)
 		os=-elf
 		;;
@@ -1589,6 +1592,9 @@ case $basic_machine in
 	mips*-*)
 		os=-elf
 		;;
+	or1k-*)
+		os=-elf
+		;;
 	or32-*)
 		os=-coff
 		;;
diff --git a/contrib/byacc/configure b/contrib/byacc/configure
index 24049ce22dc..d0e8424a3ae 100755
--- a/contrib/byacc/configure
+++ b/contrib/byacc/configure
@@ -2112,7 +2112,7 @@ else
 
 if test "$cross_compiling" = yes ; then
 	case $target_alias in #(vi
-	*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
+	*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi
 		cf_cv_mixedcase=no
 		;;
 	*)
@@ -2340,7 +2340,7 @@ case $host_os in #(vi
 aix[4-7]*) #(vi
 	cf_xopen_source="-D_ALL_SOURCE"
 	;;
-cygwin) #(vi
+cygwin|msys) #(vi
 	cf_XOPEN_SOURCE=600
 	;;
 darwin[0-8].*) #(vi
diff --git a/contrib/byacc/package/byacc.spec b/contrib/byacc/package/byacc.spec
index bddf72fb78d..9484619a213 100644
--- a/contrib/byacc/package/byacc.spec
+++ b/contrib/byacc/package/byacc.spec
@@ -1,8 +1,8 @@
 Summary: byacc - public domain Berkeley LALR Yacc parser generator
 %define AppProgram byacc
-%define AppVersion 20130304
+%define AppVersion 20130925
 %define UseProgram yacc
-# $XTermId: byacc.spec,v 1.16 2013/03/05 01:17:35 tom Exp $
+# $XTermId: byacc.spec,v 1.17 2013/09/25 22:41:54 tom Exp $
 Name: %{AppProgram}
 Version: %{AppVersion}
 Release: 1
diff --git a/contrib/byacc/package/debian/changelog b/contrib/byacc/package/debian/changelog
index c5a5ec1a72d..500ed9ab2c9 100644
--- a/contrib/byacc/package/debian/changelog
+++ b/contrib/byacc/package/debian/changelog
@@ -1,3 +1,9 @@
+byacc (20130925) unstable; urgency=low
+
+  * increase default stack-size
+
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 25 Sep 2013 18:41:54 -0400
+
 byacc (20130304) unstable; urgency=low
 
   * changes prompted by Richard Mitton bug-report
diff --git a/contrib/byacc/package/mingw-byacc.spec b/contrib/byacc/package/mingw-byacc.spec
new file mode 100644
index 00000000000..563b53d4fd1
--- /dev/null
+++ b/contrib/byacc/package/mingw-byacc.spec
@@ -0,0 +1,60 @@
+Summary: byacc - public domain Berkeley LALR Yacc parser generator
+%define AppProgram byacc
+%define AppVersion 20130925
+%define UseProgram yacc
+# $XTermId: mingw-byacc.spec,v 1.1 2013/09/25 23:12:06 tom Exp $
+Name: %{AppProgram}
+Version: %{AppVersion}
+Release: 1
+License: Public Domain, MIT
+Group: Applications/Development
+URL: ftp://invisible-island.net/%{AppProgram}
+Source0: %{AppProgram}-%{AppVersion}.tgz
+Packager: Thomas Dickey <dickey@invisible-island.net>
+
+%description
+This package provides a parser generator utility that reads a grammar
+specification from a file and generates an LR(1) parser for it.  The
+parsers consist of a set of LALR(1) parsing tables and a driver
+routine written in the C programming language.  It has a public domain
+license which includes the generated C.
+
+%prep
+
+%setup -q -n %{AppProgram}-%{AppVersion}
+
+%build
+
+INSTALL_PROGRAM='${INSTALL}' \
+	./configure \
+		--program-prefix=b \
+		--target %{_target_platform} \
+		--prefix=%{_prefix} \
+		--bindir=%{_bindir} \
+		--libdir=%{_libdir} \
+		--mandir=%{_mandir}
+
+make
+
+%install
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+make install                    DESTDIR=$RPM_BUILD_ROOT
+( cd $RPM_BUILD_ROOT%{_bindir} && ln -s %{AppProgram} %{UseProgram} )
+
+strip $RPM_BUILD_ROOT%{_bindir}/%{AppProgram}
+
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_prefix}/bin/%{AppProgram}
+%{_prefix}/bin/%{UseProgram}
+%{_mandir}/man1/%{AppProgram}.*
+
+%changelog
+# each patch should add its ChangeLog entries here
+
+* Wed Sep 25 2013 Thomas Dickey
+- cloned from byacc.spec
diff --git a/contrib/byacc/reader.c b/contrib/byacc/reader.c
index 6b24d7d1791..3369699b73b 100644
--- a/contrib/byacc/reader.c
+++ b/contrib/byacc/reader.c
@@ -1,4 +1,4 @@
-/* $Id: reader.c,v 1.36 2012/05/26 16:05:41 tom Exp $ */
+/* $Id: reader.c,v 1.37 2013/09/25 23:46:18 tom Exp $ */
 
 #include "defs.h"
 
@@ -701,7 +701,7 @@ copy_param(int k)
 	goto out;
 
     buf[i--] = '\0';
-    while (i >= 0 && isspace(UCH(buf[i])))
+    while (i > 0 && isspace(UCH(buf[i])))
 	buf[i--] = '\0';
 
     if (buf[i] == ']')
@@ -724,8 +724,8 @@ copy_param(int k)
 	type2 = i + 1;
     }
 
-    while (i >= 0 && (isalnum(UCH(buf[i])) ||
-		      UCH(buf[i]) == '_'))
+    while (i > 0 && (isalnum(UCH(buf[i])) ||
+		     UCH(buf[i]) == '_'))
 	i--;
 
     if (!isspace(UCH(buf[i])) && buf[i] != '*')
diff --git a/contrib/byacc/skeleton.c b/contrib/byacc/skeleton.c
index 329d4f7a0f7..dda69e60b31 100644
--- a/contrib/byacc/skeleton.c
+++ b/contrib/byacc/skeleton.c
@@ -1,4 +1,4 @@
-/* $Id: skeleton.c,v 1.32 2013/03/04 23:19:39 tom Exp $ */
+/* $Id: skeleton.c,v 1.33 2013/09/25 22:44:22 tom Exp $ */
 
 #include "defs.h"
 
@@ -90,12 +90,12 @@ const char *const hdr_defs[] =
     "#ifdef YYMAXDEPTH",
     "#define YYSTACKSIZE YYMAXDEPTH",
     "#else",
-    "#define YYSTACKSIZE 500",
-    "#define YYMAXDEPTH  500",
+    "#define YYSTACKSIZE 10000",
+    "#define YYMAXDEPTH  10000",
     "#endif",
     "#endif",
     "",
-    "#define YYINITSTACKSIZE 500",
+    "#define YYINITSTACKSIZE 200",
     "",
     "typedef struct {",
     "    unsigned stacksize;",
diff --git a/contrib/byacc/test/calc.tab.c b/contrib/byacc/test/calc.tab.c
index 085c1f320cc..e86e30d1b86 100644
--- a/contrib/byacc/test/calc.tab.c
+++ b/contrib/byacc/test/calc.tab.c
@@ -284,12 +284,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/calc1.tab.c b/contrib/byacc/test/calc1.tab.c
index 7db7c3042c1..619bc71039f 100644
--- a/contrib/byacc/test/calc1.tab.c
+++ b/contrib/byacc/test/calc1.tab.c
@@ -334,12 +334,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/calc2.tab.c b/contrib/byacc/test/calc2.tab.c
index 4e988e72b98..359dbe24a44 100644
--- a/contrib/byacc/test/calc2.tab.c
+++ b/contrib/byacc/test/calc2.tab.c
@@ -286,12 +286,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/calc3.tab.c b/contrib/byacc/test/calc3.tab.c
index eff5a31ef2f..4760f152d67 100644
--- a/contrib/byacc/test/calc3.tab.c
+++ b/contrib/byacc/test/calc3.tab.c
@@ -286,12 +286,12 @@ int      yynerrs;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/code_calc.code.c b/contrib/byacc/test/code_calc.code.c
index 1c1fea10163..f921570c45a 100644
--- a/contrib/byacc/test/code_calc.code.c
+++ b/contrib/byacc/test/code_calc.code.c
@@ -187,12 +187,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/code_error.code.c b/contrib/byacc/test/code_error.code.c
index 43ce409c341..481381c5881 100644
--- a/contrib/byacc/test/code_error.code.c
+++ b/contrib/byacc/test/code_error.code.c
@@ -179,12 +179,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/error.tab.c b/contrib/byacc/test/error.tab.c
index 0cb6fb3fa70..35c82a601a4 100644
--- a/contrib/byacc/test/error.tab.c
+++ b/contrib/byacc/test/error.tab.c
@@ -193,12 +193,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/ftp.tab.c b/contrib/byacc/test/ftp.tab.c
index 6f32cb4efa7..b7b4d46217d 100644
--- a/contrib/byacc/test/ftp.tab.c
+++ b/contrib/byacc/test/ftp.tab.c
@@ -559,12 +559,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/grammar.tab.c b/contrib/byacc/test/grammar.tab.c
index 8065343db9d..7b1871508ad 100644
--- a/contrib/byacc/test/grammar.tab.c
+++ b/contrib/byacc/test/grammar.tab.c
@@ -893,12 +893,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/pure_calc.tab.c b/contrib/byacc/test/pure_calc.tab.c
index acba4041275..40d784eadf1 100644
--- a/contrib/byacc/test/pure_calc.tab.c
+++ b/contrib/byacc/test/pure_calc.tab.c
@@ -289,12 +289,12 @@ int      yynerrs;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/pure_error.tab.c b/contrib/byacc/test/pure_error.tab.c
index 55a7d7e5394..7b6334caf0d 100644
--- a/contrib/byacc/test/pure_error.tab.c
+++ b/contrib/byacc/test/pure_error.tab.c
@@ -200,12 +200,12 @@ int      yynerrs;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/quote_calc-s.tab.c b/contrib/byacc/test/quote_calc-s.tab.c
index ec4375d3d97..5f34b24c5af 100644
--- a/contrib/byacc/test/quote_calc-s.tab.c
+++ b/contrib/byacc/test/quote_calc-s.tab.c
@@ -299,12 +299,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/quote_calc.tab.c b/contrib/byacc/test/quote_calc.tab.c
index d90061415d5..1c6e111bc77 100644
--- a/contrib/byacc/test/quote_calc.tab.c
+++ b/contrib/byacc/test/quote_calc.tab.c
@@ -305,12 +305,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/quote_calc2-s.tab.c b/contrib/byacc/test/quote_calc2-s.tab.c
index 4165df114d1..fdd9c9092ad 100644
--- a/contrib/byacc/test/quote_calc2-s.tab.c
+++ b/contrib/byacc/test/quote_calc2-s.tab.c
@@ -299,12 +299,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/quote_calc2.tab.c b/contrib/byacc/test/quote_calc2.tab.c
index 159954aafe2..0043df4cb6c 100644
--- a/contrib/byacc/test/quote_calc2.tab.c
+++ b/contrib/byacc/test/quote_calc2.tab.c
@@ -305,12 +305,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/quote_calc3-s.tab.c b/contrib/byacc/test/quote_calc3-s.tab.c
index 480224a33a1..4cd55a9318c 100644
--- a/contrib/byacc/test/quote_calc3-s.tab.c
+++ b/contrib/byacc/test/quote_calc3-s.tab.c
@@ -300,12 +300,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/quote_calc3.tab.c b/contrib/byacc/test/quote_calc3.tab.c
index 1ab2ef0e585..8b00113a59d 100644
--- a/contrib/byacc/test/quote_calc3.tab.c
+++ b/contrib/byacc/test/quote_calc3.tab.c
@@ -300,12 +300,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/quote_calc4-s.tab.c b/contrib/byacc/test/quote_calc4-s.tab.c
index 3e522f233ce..bf0fda09f78 100644
--- a/contrib/byacc/test/quote_calc4-s.tab.c
+++ b/contrib/byacc/test/quote_calc4-s.tab.c
@@ -300,12 +300,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/byacc/test/quote_calc4.tab.c b/contrib/byacc/test/quote_calc4.tab.c
index ca08d776169..5913dde8618 100644
--- a/contrib/byacc/test/quote_calc4.tab.c
+++ b/contrib/byacc/test/quote_calc4.tab.c
@@ -300,12 +300,12 @@ YYSTYPE  yylval;
 #ifdef YYMAXDEPTH
 #define YYSTACKSIZE YYMAXDEPTH
 #else
-#define YYSTACKSIZE 500
-#define YYMAXDEPTH  500
+#define YYSTACKSIZE 10000
+#define YYMAXDEPTH  10000
 #endif
 #endif
 
-#define YYINITSTACKSIZE 500
+#define YYINITSTACKSIZE 200
 
 typedef struct {
     unsigned stacksize;
diff --git a/contrib/gcc/ChangeLog.gcc43 b/contrib/gcc/ChangeLog.gcc43
index 05f01073d94..98b368d7f18 100644
--- a/contrib/gcc/ChangeLog.gcc43
+++ b/contrib/gcc/ChangeLog.gcc43
@@ -1,9 +1,110 @@
-2007-06-05  Joerg Wunsch  <j.gnu@uriah.heep.sax.de> (r23479)
+2007-08-08  Andrew Haley  <aph@redhat.com> (r128087)
+
+	* config/arm/libunwind.S (UNWIND_WRAPPER _Unwind_Backtrace): New.
+	* config/arm/unwind-arm.h (__gnu_Unwind_Backtrace): New.
+	* config/arm/unwind-arm.c (__gnu_Unwind_Backtrace): New.
+
+2007-07-12  Geoffrey Keating  <geoffk@apple.com> (r126588)
+
+	* builtins.c (get_pointer_alignment): Honor DECL_ALIGN on a
+	FUNCTION_DECL.
+	* tree.c (build_decl_stat): Move code from here...
+	(make_node_stat): ... to here.  Don't uselessly clear DECL_USER_ALIGN.
+	(expr_align): Honor DECL_ALIGN on a FUNCTION_DECL.  Add comment
+	about using DECL_ALIGN of LABEL_DECL and CONST_DECL.
+	* tree.h (DECL_USER_ALIGN): Fix misplaced comment.
+	* varasm.c (assemble_start_function): Use DECL_ALIGN instead of
+	FUNCTION_BOUNDARY.
+
+2007-07-09  Geoffrey Keating  <geoffk@apple.com> (r126529)
+
+	PR 32617
+	* c-common.c (c_alignof_expr): Look at DECL_ALIGN of
+	FUNCTION_DECLs.
+	(handle_aligned_attribute): Allow use on FUNCTION_DECLs.
+	* varasm.c (assemble_start_function): Honor DECL_ALIGN
+	for FUNCTION_DECLs.  Don't use align_functions_log if
+	DECL_USER_ALIGN.
+	* print-tree.c (print_node): Print DECL_ALIGN and DECL_USER_ALIGN
+	even for FUNCTION_DECLs.
+	* c-decl.c (merge_decls): Propagate DECL_ALIGN even for
+	FUNCTION_DECLs.
+	* tree.h (DECL_ALIGN): Update for new location of 'align'.
+	(DECL_FUNCTION_CODE): Update for new location and name of
+	'function_code'.
+	(DECL_OFFSET_ALIGN): Update for new location of 'off_align'.
+	(struct tree_decl_common): Move 'align' and 'off_align' out
+	of union, ensure they're still on a 32-bit boundary.  Remove
+	other fields in union 'u1'.
+	(struct tree_function_decl): Add field 'function_code' replacing
+	'u1.f' in tree_decl_common.
+	* tree.c (build_decl_stat): Set initial value of DECL_ALIGN.
+	* doc/extend.texi (Function Attributes): Add 'aligned' attribute.
+	(Variable Attributes): Cross-reference 'aligned' attribute
+	to Function Attributes.
+	* flags.h (force_align_functions_log): Delete.
+	* toplev.c (force_align_functions_log): Delete.
+
+2007-06-28  Geoffrey Keating  <geoffk@apple.com> (r126088)
+
+	* doc/invoke.texi (C++ Dialect Options): Document
+	fvisibility-ms-compat.
+	* c.opt (fvisibility-ms-compat): New.
+
+2007-06-05  Joerg Wunsch  <j.gnu@uriah.heep.sax.de> (r125346)
 
 	PR preprocessor/23479
 	* doc/extend.texi: Document the 0b-prefixed binary integer
 	constant extension.
 	
+2007-05-31  Eric Christopher  <echristo@apple.com> (r125246)
+
+	* expr.c (convert_move): Assert that we don't have a BLKmode
+	operand.
+	(store_expr): Handle BLKmode moves by calling emit_block_move.
+
+2007-05-31  Daniel Berlin  <dberlin@dberlin.org> (r125239)
+
+	* c-typeck.c (build_indirect_ref): Include type in error message.
+	(build_binary_op): Pass types to binary_op_error.
+	* c-common.c (binary_op_error): Take two type arguments, print out
+	types with error.
+	* c-common.h (binary_op_error): Update prototype.
+
+2007-05-27  Eric Christopher  <echristo@apple.com> (r125116)
+
+	* config/rs6000/rs6000.c (rs6000_emit_prologue): Update
+	sp_offset depending on stack size. Save r12 depending
+	on registers we're saving later.
+	(rs6000_emit_epilogue): Update sp_offset depending only
+	on stack size.
+
+2007-05-24  Richard Sandiford  <rsandifo@nildram.co.uk> (r125037)
+
+	* postreload-gcse.c (reg_changed_after_insn_p): New function.
+	(oprs_unchanged_p): Use it to check all registers in a REG.
+	(record_opr_changes): Look for clobbers in CALL_INSN_FUNCTION_USAGE.
+	(reg_set_between_after_reload_p): Delete.
+	(reg_used_between_after_reload_p): Likewise.
+	(reg_set_or_used_since_bb_start): Likewise.
+	(eliminate_partially_redundant_load): Use reg_changed_after_insn_p
+	and reg_used_between_p instead of reg_set_or_used_since_bb_start.
+	Use reg_set_between_p instead of reg_set_between_after_reload_p.
+	* rtlanal.c (reg_set_p): Check whether REG overlaps
+	regs_invalidated_by_call, rather than just checking the
+	membership of REGNO (REG).
+
+2007-05-16  Eric Christopher  <echristo@apple.com> (r124763)
+
+       * config/rs6000/rs6000.c (rs6000_emit_prologue): Move altivec register
+        saving after stack push. Set sp_offset whenever we push.
+        (rs6000_emit_epilogue): Move altivec register restore before stack push.
+
+2007-05-03  Ian Lance Taylor  <iant@google.com> (r124381)
+
+	* config/rs6000/rs6000.c (rs6000_override_options): Don't set
+	MASK_PPC_GFXOPT for 8540 or 8548.
+
 2007-05-01  Dwarakanath Rajagopal <dwarak.rajagopal@amd.com> (r124341)
 
 	* doc/invoke.texi: Fix typo, 'AMD Family 10h core' instead of 
@@ -22,6 +123,63 @@
 	alignment for amdfam10 architecture. Increasing the max loop
 	alignment to 24 bytes.
 
+2007-04-16  Lawrence Crowl  <crowl@google.com> (r123909)
+
+	* doc/invoke.texi (Debugging Options): Add documentation for the
+	-femit-struct-debug options -femit-struct-debug-baseonly,
+	-femit-struct-debug-reduced, and
+	-femit-struct-debug-detailed[=...].
+
+	* c-opts.c (c_common_handle_option): Add
+	OPT_femit_struct_debug_baseonly, OPT_femit_struct_debug_reduced,
+	and OPT_femit_struct_debug_detailed_.
+	* c.opt: Add specifications for
+	-femit-struct-debug-baseonly, -femit-struct-debug-reduced,
+	and -femit-struct-debug-detailed[=...].
+	* opts.c (set_struct_debug_option): Parse the
+	-femit-struct-debug-... options.
+	* opts.c (matches_main_base, main_input_basename,
+	main_input_baselength, base_of_path, matches_main_base): Add
+	variables and functions to compare header base name to compilation
+	unit base name.
+	* opts.c (should_emit_struct_debug): Add to determine to emit a
+	structure based on the option.
+	(dump_struct_debug) Also disabled function to debug this
+	function.
+	* opts.c (handle_options): Save the base name of the
+	compilation unit.
+
+	* langhooks-def.h (LANG_HOOKS_GENERIC_TYPE_P): Define.
+        (LANG_HOOKS_FOR_TYPES_INITIALIZER): Add.
+	This hook indicates if a type is generic.  Set it by default
+	to "never generic".
+	* langhooks.h (struct lang_hooks_for_types): Add a new hook
+	to determine if a struct type is generic or not.
+	* cp/cp-tree.h (class_tmpl_impl_spec_p): Declare a C++ hook.
+	* cp/tree.c (class_tmpl_impl_spec_p): Implement the C++ hook.
+	* cp/cp-lang.c (LANG_HOOKS_GENERIC_TYPE_P): Override null C hook
+	with live C++ hook.
+
+	* flags.h (enum debug_info_usage): Add an enumeration to describe
+	a program's use of a structure type.
+	* dwarf2out.c (gen_struct_or_union_type_die): Add a new parameter
+	to indicate the program's usage of the type.  Filter structs based
+	on the -femit-struct-debug-... specification.
+	(gen_type_die): Split into two routines, gen_type_die and
+	gen_type_die_with_usage.  gen_type_die is now a wrapper
+	that assumes direct usage.
+	(gen_type_die_with_usage): Replace calls to gen_type_die
+	with gen_type_die_with_usage adding the program usage of
+	the referenced type.
+	(dwarf2out_imported_module_or_decl): Suppress struct debug
+	information using should_emit_struct_debug when appropriate.
+
+2007-04-16  Ian Lance Taylor  <iant@google.com> (r123906)
+
+	* tree-ssa-propagate.c (cfg_blocks_add): Insert blocks with fewer
+	predecessors at head rather than tail.
+
+
 2007-04-12  Richard Guenther  <rguenther@suse.de> (r123736)
 
 	PR tree-optimization/24689
@@ -44,6 +202,19 @@
 	* config/i386/i386.c (override_options): Likewise.
 	* doc/invoke.texi: Likewise.
 
+2007-03-12  Seongbae Park <seongbae.park@gmail.com> (r122851)
+
+	* c-decl.c (warn_variable_length_array): New function.
+	Refactored from grokdeclarator to handle warn_vla
+	and handle unnamed array case.
+	(grokdeclarator): Refactored VLA warning case.
+	* c.opt (Wvla): New flag.
+
+2007-03-11  Ian Lance Taylor  <iant@google.com> (r122831 - partial)
+
+	* tree-vrp.c (vrp_int_const_binop): Handle PLUS_EXPR and
+	the *_DIV_EXPR codes correctly with overflow infinities.
+
 2007-02-09  Dwarakanath Rajagopal <dwarak.rajagopal@amd.com> (r121763)
 
 	* config/i386/driver-i386.c: Turn on -mtune=native for AMDFAM10.
@@ -232,6 +403,79 @@
 
 	* config.gcc: Support core2 processor.
 
+2007-01-11  Joseph Myers  <joseph@codesourcery.com> (r120688)
+
+	* c-common.c (vector_types_convertible_p): Treat opaque types as
+	always convertible if they have the same size, but not otherwise.
+
+2007-01-08  Mark Shinwell  <shinwell@codesourcery.com> (r120572)
+
+	* c.opt: Add -flax-vector-conversions.
+	* c-typeck.c (convert_for_assignment): Pass flag to
+	vector_types_convertible_p to allow emission of note.
+	(digest_init): Likewise.
+	* c-opts.c: Handle -flax-vector-conversions.
+	* c-common.c (flag_lax_vector_conversions): New.
+	(vector_types_convertible_p): Unless -flax-vector conversions
+	has been passed, disallow conversions between vectors with
+	differing numbers of subparts and/or element types.  If such
+	a conversion is disallowed, possibly emit a note on the first
+	occasion only to inform the user of -flax-vector-conversions.
+	The new last argument specifies this.
+	* c-common.h (flag_lax_vector_conversions): New.
+	(vector_types_convertible_p): Add extra argument.
+	* config/i386/i386.c (ix86_init_mmx_sse_builtins): Use
+	char_type_node for V*QI type vectors.
+	* config/rs6000/rs6000-c.c (altivec_overloaded_builtins):
+	Update to satisfy new typechecking rules.
+	* config/rs6000/altivec.h (vec_cmple): Use vec_cmpge, for both
+	C and C++ variants.
+	* doc/invoke.texi (C Dialect Options): Document
+	-flax-vector-conversions.
+
+2007-01-05  Manuel Lopez-Ibanez  <manu@gcc.gnu.org> (r120505)
+
+	PR c/19978
+	* tree.h (TREE_OVERFLOW_P): New.
+	* c-typeck.c (parser_build_unary_op): Warn only if result
+	overflowed and operands did not.
+	(parser_build_binary_op): Likewise.
+	(convert_for_assignment): Remove redundant overflow_warning.
+	* c-common.c (overflow_warning): Don't check or set TREE_OVERFLOW.
+
+2006-12-13  Ian Lance Taylor  <iant@google.com> (r119855)
+
+	PR c++/19564
+	PR c++/19756
+	* c-typeck.c (parser_build_binary_op): Move parentheses warnings
+	to warn_about_parentheses in c-common.c.
+	* c-common.c (warn_about_parentheses): New function.
+	* c-common.h (warn_about_parentheses): Declare.
+	* doc/invoke.texi (Warning Options): Update -Wparentheses
+	description.
+
+2006-12-12  Geoffrey Keating  <geoffk@apple.com> (r119820)
+ 
+	* mips-tdump.c: Replace CROSS_COMPILE with
+	CROSS_DIRECTORY_STRUCTURE.
+	* mips-tfile.c: Likewise.
+	* gcc.c: Likewise.
+	* configure.ac: Likewise.
+	* cppdefault.c: Likewise.
+	* Makefile.in: Likewise.
+	* config/alpha/osf.h: Likewise.
+	* config/i386/cygwin.h: Likewise.
+	* config/i386/beos-elf.h: Likewise.
+	* config/i386/nto.h: Likewise.
+	* config/svr4.h: Likewise.
+	* config/rs6000/aix.h: Likewise.
+	* config/rs6000/sysv4.h: Likewise.
+	* collect2.c: Likewise.
+	* configure: Regenerate.
+
+ 	* doc/tm.texi (Alignment Output): Document that ASM_OUTPUT_SKIP
+ 	actually takes an unsigned HOST_WIDE_INT for its second parameter.
+
 2006-12-02  H.J. Lu  <hongjiu.lu@intel.com> (r119454 - partial)
 
 	PR target/30040
@@ -270,6 +514,59 @@
 	(override_options): Add entries for Core2.
 	(ix86_issue_rate): Add case for Core2.
 	
+2006-11-07  Eric Christopher  <echristo@apple.com> (r118576)
+
+	* libgcc2.c (__bswapdi2): Rename from bswapDI2.
+	(__bswapsi2): Ditto.
+	* libgcc2.h: Remove transformation of bswap routines.
+	* config/i386/i386.md (bswapsi2): New.
+	(bswapdi2): Ditto.
+
+2006-10-31  Geoffrey Keating  <geoffk@apple.com> (r118360)
+ 
+	* coverage.c (coverage_checksum_string): Update comment.
+	* dwarf2out.c (switch_to_eh_frame_section): Update for removal
+	of get_file_function_name.
+	* cgraphunit.c (cgraph_build_static_cdtor): Update for rename
+	of get_file_function_name_long.
+	* tree.c (get_file_function_name): Rename from
+	get_file_function_name_long; improve comment; handle 'I' and 'D'
+	specially when the target has ctor/dtor support; remove special
+	handling for 'F'.
+	(get_file_function_name): Remove.
+	* tree.h (get_file_function_name): Rename from
+        get_file_function_name_long.
+	(get_file_function_name): Remove prototype.
+
+2006-10-31  Geoffrey Keating  <geoffk@apple.com> (r118356)
+
+	* c-decl.c (grokdeclarator): Don't set DECL_EXTERNAL on
+	inline static functions in c99 mode.
+
+	PR 16622
+	* doc/extend.texi (Inline): Update.
+	* c-tree.h (struct language_function): Remove field 'extern_inline'.
+	* c-decl.c (current_extern_inline): Delete.
+	(pop_scope): Adjust test for an undefined nested function.
+	Add warning about undeclared inline function.
+	(diagnose_mismatched_decls): Update comments.  Disallow overriding
+	of inline functions in a translation unit in C99.  Allow inline
+	declarations in C99 at any time.
+	(merge_decls): Boolize variables.  Handle C99 'extern inline'
+	semantics.
+	(grokdeclarator): Set DECL_EXTERNAL here for functions.  Handle
+	C99 inline semantics.
+	(start_function): Don't clear current_extern_inline.  Don't set
+	DECL_EXTERNAL.
+	(c_push_function_context): Don't push current_extern_inline.
+	(c_pop_function_context): Don't restore current_extern_inline.
+
+	PR 11377
+	* c-typeck.c (build_external_ref): Warn about static variables
+	used in extern inline functions.
+	* c-decl.c (start_decl): Warn about static variables declared
+	in extern inline functions.
+
 2006-10-27  Vladimir Makarov  <vmakarov@redhat.com> (r118090)
 
 	* config/i386/i386.h (TARGET_GEODE):
@@ -391,3 +688,51 @@
 
 	* builtins.c (fold_builtin_classify): Fix typo.
 
+2006-09-07  Eric Christopher  <echristo@apple.com> (r118361)
+	    Falk Hueffner  <falk@debian.org>
+
+	* doc/extend.texi (__builtin_bswap32): Document.
+	(__builtin_bswap64): Ditto.
+	* doc/libgcc.texi (bswapsi2): Document.
+	(bswapdi2): Ditto.
+	* doc/rtl.texi (bswap): Document.
+	* optabs.c (expand_unop): Don't widen a bswap.
+	(init_optabs): Init bswap. Set libfuncs explicitly
+	for bswapsi2 and bswapdi2.
+	* optabs.h (OTI_bswap): New.
+	(bswap_optab): Ditto.
+	* genopinit.c (optabs): Handle bswap_optab.
+	* tree.h (tree_index): Add TI_UINT32_TYPE and
+	TI_UINT64_TYPE.
+	(uint32_type_node): New.
+	(uint64_type_node): Ditto.
+	* tree.c (build_common_tree_nodes_2): Initialize
+	uint32_type_node and uint64_type_node.
+	* builtins.c (expand_builtin_bswap): New.
+	(expand_builtin): Call.
+	(fold_builtin_bswap): New.
+	(fold_builtin_1): Call.
+	* fold-const.c (tree_expr_nonnegative_p): Return true
+	for bswap.
+	* builtin-types.def (BT_UINT32): New.
+	(BT_UINT64): Ditto.
+	(BT_FN_UINT32_UINT32): Ditto.
+	(BT_FN_UINT64_UINT64): Ditto.
+	* builtins.def (BUILT_IN_BSWAP32): New.
+	(BUILT_IN_BSWAP64): Ditto.
+	* rtl.def (BSWAP): New.
+	* genattrtab.c (check_attr_value): New.
+	* libgcc2.c (__bswapSI2): New.
+	(__bswapDI2): Ditto.
+	* libgcc2.h (__bswapSI2): Declare.
+	(__bswapDI2): Ditto.
+	* mklibgcc.in (lib2funcs): Add _bswapsi2 and _bswapdi2.
+	* simplify-rtx.c (simplify_const_unary_operation): Return
+	0 for BSWAP.
+	* libgcc-std.ver (__bwapsi2): Add.
+	(__bswapdi2): Ditto.
+	* reload1.c (eliminate_regs_1): Add bswap.
+	(elimination_effects): Ditto.
+	* config/i386/i386.h (x86_bswap): New.
+	(TARGET_BSWAP): Use.
+	* config/i386/i386.c (x86_bswap): Set.
diff --git a/contrib/gcc/Makefile.in b/contrib/gcc/Makefile.in
index 0f0ce9b4c74..eb19c2d07f6 100644
--- a/contrib/gcc/Makefile.in
+++ b/contrib/gcc/Makefile.in
@@ -822,7 +822,8 @@ REAL_H = real.h $(MACHMODE_H)
 
 # IN_GCC distinguishes between code compiled into GCC itself and other
 # programs built during a bootstrap.
-# autoconf inserts -DCROSS_COMPILE if we are building a cross compiler.
+# autoconf inserts -DCROSS_DIRECTORY_STRUCTURE if we are building a
+# cross compiler which does not use the native headers and libraries.
 INTERNAL_CFLAGS = -DIN_GCC @CROSS@
 
 # This is the variable actually used when we compile. If you change this,
diff --git a/contrib/gcc/builtin-types.def b/contrib/gcc/builtin-types.def
index d6330b15652..5d42b2ef9aa 100644
--- a/contrib/gcc/builtin-types.def
+++ b/contrib/gcc/builtin-types.def
@@ -75,6 +75,8 @@ DEF_PRIMITIVE_TYPE (BT_LONGLONG, long_long_integer_type_node)
 DEF_PRIMITIVE_TYPE (BT_ULONGLONG, long_long_unsigned_type_node)
 DEF_PRIMITIVE_TYPE (BT_INTMAX, intmax_type_node)
 DEF_PRIMITIVE_TYPE (BT_UINTMAX, uintmax_type_node)
+DEF_PRIMITIVE_TYPE (BT_UINT32, uint32_type_node)
+DEF_PRIMITIVE_TYPE (BT_UINT64, uint64_type_node)
 DEF_PRIMITIVE_TYPE (BT_WORD, (*lang_hooks.types.type_for_mode) (word_mode, 0))
 DEF_PRIMITIVE_TYPE (BT_FLOAT, float_type_node)
 DEF_PRIMITIVE_TYPE (BT_DOUBLE, double_type_node)
@@ -204,6 +206,10 @@ DEF_FUNCTION_TYPE_1 (BT_FN_DFLOAT128_DFLOAT128, BT_DFLOAT128, BT_DFLOAT128)
 DEF_FUNCTION_TYPE_1 (BT_FN_VOID_VPTR, BT_VOID, BT_VOLATILE_PTR)
 DEF_FUNCTION_TYPE_1 (BT_FN_VOID_PTRPTR, BT_VOID, BT_PTR_PTR)
 DEF_FUNCTION_TYPE_1 (BT_FN_UINT_UINT, BT_UINT, BT_UINT)
+DEF_FUNCTION_TYPE_1 (BT_FN_ULONG_ULONG, BT_ULONG, BT_ULONG)
+DEF_FUNCTION_TYPE_1 (BT_FN_ULONGLONG_ULONGLONG, BT_ULONGLONG, BT_ULONGLONG)
+DEF_FUNCTION_TYPE_1 (BT_FN_UINT32_UINT32, BT_UINT32, BT_UINT32)
+DEF_FUNCTION_TYPE_1 (BT_FN_UINT64_UINT64, BT_UINT64, BT_UINT64)
 
 DEF_POINTER_TYPE (BT_PTR_FN_VOID_PTR, BT_FN_VOID_PTR)
 
@@ -435,4 +441,3 @@ DEF_FUNCTION_TYPE_VAR_5 (BT_FN_INT_STRING_SIZE_INT_SIZE_CONST_STRING_VAR,
 DEF_POINTER_TYPE (BT_PTR_FN_VOID_VAR, BT_FN_VOID_VAR)
 DEF_FUNCTION_TYPE_3 (BT_FN_PTR_PTR_FN_VOID_VAR_PTR_SIZE,
 		     BT_PTR, BT_PTR_FN_VOID_VAR, BT_PTR, BT_SIZE)
-
diff --git a/contrib/gcc/builtins.c b/contrib/gcc/builtins.c
index a65d725bd28..88c4668920d 100644
--- a/contrib/gcc/builtins.c
+++ b/contrib/gcc/builtins.c
@@ -315,9 +315,7 @@ get_pointer_alignment (tree exp, unsigned int max_align)
 	      else if (offset)
 		inner = MIN (inner, BITS_PER_UNIT);
 	    }
-	  if (TREE_CODE (exp) == FUNCTION_DECL)
-	    align = FUNCTION_BOUNDARY;
-	  else if (DECL_P (exp))
+	  if (DECL_P (exp))
 	    align = MIN (inner, DECL_ALIGN (exp));
 #ifdef CONSTANT_ALIGNMENT
 	  else if (CONSTANT_CLASS_P (exp))
@@ -4589,6 +4587,30 @@ expand_builtin_alloca (tree arglist, rtx target)
   return result;
 }
 
+/* Expand a call to a bswap builtin.  The arguments are in ARGLIST.  MODE
+   is the mode to expand with.  */
+
+static rtx
+expand_builtin_bswap (tree arglist, rtx target, rtx subtarget)
+{
+  enum machine_mode mode;
+  tree arg;
+  rtx op0;
+
+  if (!validate_arglist (arglist, INTEGER_TYPE, VOID_TYPE))
+    return 0;
+
+  arg = TREE_VALUE (arglist);
+  mode = TYPE_MODE (TREE_TYPE (arg));
+  op0 = expand_expr (arg, subtarget, VOIDmode, 0);
+
+  target = expand_unop (mode, bswap_optab, op0, target, 1);
+
+  gcc_assert (target);
+
+  return convert_to_mode (mode, target, 0);
+}
+
 /* Expand a call to a unary builtin.  The arguments are in ARGLIST.
    Return 0 if a normal call should be emitted rather than expanding the
    function in-line.  If convenient, the result should be placed in TARGET.
@@ -5877,6 +5899,14 @@ expand_builtin (tree exp, rtx target, rtx subtarget, enum machine_mode mode,
       expand_stack_restore (TREE_VALUE (arglist));
       return const0_rtx;
 
+    case BUILT_IN_BSWAP32:
+    case BUILT_IN_BSWAP64:
+      target = expand_builtin_bswap (arglist, target, subtarget);
+
+      if (target)
+	return target;
+      break;
+
     CASE_INT_FN (BUILT_IN_FFS):
     case BUILT_IN_FFSIMAX:
       target = expand_builtin_unop (target_mode, arglist, target,
@@ -7539,6 +7569,67 @@ fold_builtin_bitop (tree fndecl, tree arglist)
   return NULL_TREE;
 }
 
+/* Fold function call to builtin_bswap and the long and long long
+   variants.  Return NULL_TREE if no simplification can be made.  */
+static tree
+fold_builtin_bswap (tree fndecl, tree arglist)
+{
+  tree arg;
+
+  if (! validate_arglist (arglist, INTEGER_TYPE, VOID_TYPE))
+    return 0;
+
+  /* Optimize constant value.  */
+  arg = TREE_VALUE (arglist);
+  if (TREE_CODE (arg) == INTEGER_CST && ! TREE_CONSTANT_OVERFLOW (arg))
+    {
+      HOST_WIDE_INT hi, width, r_hi = 0;
+      unsigned HOST_WIDE_INT lo, r_lo = 0;
+      tree type;
+
+      type = TREE_TYPE (arg);
+      width = TYPE_PRECISION (type);
+      lo = TREE_INT_CST_LOW (arg);
+      hi = TREE_INT_CST_HIGH (arg);
+
+      switch (DECL_FUNCTION_CODE (fndecl))
+	{
+	  case BUILT_IN_BSWAP32:
+	  case BUILT_IN_BSWAP64:
+	    {
+	      int s;
+
+	      for (s = 0; s < width; s += 8)
+		{
+		  int d = width - s - 8;
+		  unsigned HOST_WIDE_INT byte;
+
+		  if (s < HOST_BITS_PER_WIDE_INT)
+		    byte = (lo >> s) & 0xff;
+		  else
+		    byte = (hi >> (s - HOST_BITS_PER_WIDE_INT)) & 0xff;
+
+		  if (d < HOST_BITS_PER_WIDE_INT)
+		    r_lo |= byte << d;
+		  else
+		    r_hi |= byte << (d - HOST_BITS_PER_WIDE_INT);
+		}
+	    }
+
+	    break;
+
+	default:
+	  gcc_unreachable ();
+	}
+
+      if (width < HOST_BITS_PER_WIDE_INT)
+	return build_int_cst (TREE_TYPE (TREE_TYPE (fndecl)), r_lo);
+      else
+	return build_int_cst_wide (TREE_TYPE (TREE_TYPE (fndecl)), r_lo, r_hi);
+    }
+
+  return NULL_TREE;
+}
 /* Return true if EXPR is the real constant contained in VALUE.  */
 
 static bool
@@ -9053,6 +9144,10 @@ fold_builtin_1 (tree fndecl, tree arglist, bool ignore)
     CASE_FLT_FN (BUILT_IN_LLRINT):
       return fold_fixed_mathfn (fndecl, arglist);
 
+    case BUILT_IN_BSWAP32:
+    case BUILT_IN_BSWAP64:
+      return fold_builtin_bswap (fndecl, arglist);
+
     CASE_INT_FN (BUILT_IN_FFS):
     CASE_INT_FN (BUILT_IN_CLZ):
     CASE_INT_FN (BUILT_IN_CTZ):
diff --git a/contrib/gcc/builtins.def b/contrib/gcc/builtins.def
index 37ea28c0960..7c1f2efef87 100644
--- a/contrib/gcc/builtins.def
+++ b/contrib/gcc/builtins.def
@@ -594,6 +594,8 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_ALLOCA, "alloca", BT_FN_PTR_SIZE, ATTR_MALLOC_N
 DEF_GCC_BUILTIN        (BUILT_IN_APPLY, "apply", BT_FN_PTR_PTR_FN_VOID_VAR_PTR_SIZE, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_APPLY_ARGS, "apply_args", BT_FN_PTR_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_ARGS_INFO, "args_info", BT_FN_INT_INT, ATTR_NULL)
+DEF_GCC_BUILTIN        (BUILT_IN_BSWAP32, "bswap32", BT_FN_UINT32_UINT32, ATTR_CONST_NOTHROW_LIST)
+DEF_GCC_BUILTIN        (BUILT_IN_BSWAP64, "bswap64", BT_FN_UINT64_UINT64, ATTR_CONST_NOTHROW_LIST)
 DEF_LIB_BUILTIN        (BUILT_IN_CALLOC, "calloc", BT_FN_PTR_SIZE_SIZE, ATTR_MALLOC_NOTHROW_LIST)
 DEF_GCC_BUILTIN        (BUILT_IN_CLASSIFY_TYPE, "classify_type", BT_FN_INT_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_CLZ, "clz", BT_FN_INT_UINT, ATTR_CONST_NOTHROW_LIST)
diff --git a/contrib/gcc/c-common.c b/contrib/gcc/c-common.c
index b5ea60818f2..b97bb721b41 100644
--- a/contrib/gcc/c-common.c
+++ b/contrib/gcc/c-common.c
@@ -254,6 +254,10 @@ int flag_short_double;
 
 int flag_short_wchar;
 
+/* Nonzero means allow implicit conversions between vectors with
+   differing numbers of subparts and/or differing element types.  */
+int flag_lax_vector_conversions;
+
 /* Nonzero means allow Microsoft extensions without warnings or errors.  */
 int flag_ms_extensions;
 
@@ -916,39 +920,45 @@ constant_expression_warning (tree value)
     pedwarn ("overflow in constant expression");
 }
 
-/* Print a warning if an expression had overflow in folding.
+/* Print a warning if an expression had overflow in folding and its
+   operands hadn't.
+
    Invoke this function on every expression that
    (1) appears in the source code, and
-   (2) might be a constant expression that overflowed, and
+   (2) is a constant expression that overflowed, and
    (3) is not already checked by convert_and_check;
-   however, do not invoke this function on operands of explicit casts.  */
+   however, do not invoke this function on operands of explicit casts
+   or when the expression is the result of an operator and any operand
+   already overflowed.  */
 
 void
 overflow_warning (tree value)
 {
-  if ((TREE_CODE (value) == INTEGER_CST
-       || (TREE_CODE (value) == COMPLEX_CST
-	   && TREE_CODE (TREE_REALPART (value)) == INTEGER_CST))
-      && TREE_OVERFLOW (value))
+  if (skip_evaluation) return;
+
+  switch (TREE_CODE (value))
     {
-      TREE_OVERFLOW (value) = 0;
-      if (skip_evaluation == 0)
-	warning (OPT_Woverflow, "integer overflow in expression");
-    }
-  else if ((TREE_CODE (value) == REAL_CST
-	    || (TREE_CODE (value) == COMPLEX_CST
-		&& TREE_CODE (TREE_REALPART (value)) == REAL_CST))
-	   && TREE_OVERFLOW (value))
-    {
-      TREE_OVERFLOW (value) = 0;
-      if (skip_evaluation == 0)
-	warning (OPT_Woverflow, "floating point overflow in expression");
-    }
-  else if (TREE_CODE (value) == VECTOR_CST && TREE_OVERFLOW (value))
-    {
-      TREE_OVERFLOW (value) = 0;
-      if (skip_evaluation == 0)
-	warning (OPT_Woverflow, "vector overflow in expression");
+    case INTEGER_CST:
+      warning (OPT_Woverflow, "integer overflow in expression");
+      break;
+      
+    case REAL_CST:
+      warning (OPT_Woverflow, "floating point overflow in expression");
+      break;
+      
+    case VECTOR_CST:
+      warning (OPT_Woverflow, "vector overflow in expression");
+      break;
+      
+    case COMPLEX_CST:
+      if (TREE_CODE (TREE_REALPART (value)) == INTEGER_CST)
+	warning (OPT_Woverflow, "complex integer overflow in expression");
+      else if (TREE_CODE (TREE_REALPART (value)) == REAL_CST)
+	warning (OPT_Woverflow, "complex floating point overflow in expression");
+      break;
+
+    default:
+      break;
     }
 }
 
@@ -983,35 +993,67 @@ unsigned_conversion_warning (tree result, tree operand)
    strict aliasing mode is in effect. OTYPE is the original
    TREE_TYPE of EXPR, and TYPE the type we're casting to. */
 
-void
+bool
 strict_aliasing_warning (tree otype, tree type, tree expr)
 {
-  if (flag_strict_aliasing && warn_strict_aliasing
-      && POINTER_TYPE_P (type) && POINTER_TYPE_P (otype)
-      && TREE_CODE (expr) == ADDR_EXPR
+  if (!(flag_strict_aliasing && POINTER_TYPE_P (type) 
+        && POINTER_TYPE_P (otype) && !VOID_TYPE_P (TREE_TYPE (type))))
+    return false;
+
+  if ((warn_strict_aliasing > 1) && TREE_CODE (expr) == ADDR_EXPR
       && (DECL_P (TREE_OPERAND (expr, 0))
-          || handled_component_p (TREE_OPERAND (expr, 0)))
-      && !VOID_TYPE_P (TREE_TYPE (type)))
+          || handled_component_p (TREE_OPERAND (expr, 0))))
     {
       /* Casting the address of an object to non void pointer. Warn
          if the cast breaks type based aliasing.  */
-      if (!COMPLETE_TYPE_P (TREE_TYPE (type)))
-        warning (OPT_Wstrict_aliasing, "type-punning to incomplete type "
-                 "might break strict-aliasing rules");
+      if (!COMPLETE_TYPE_P (TREE_TYPE (type)) && warn_strict_aliasing == 2)
+	{
+	  warning (OPT_Wstrict_aliasing, "type-punning to incomplete type "
+		   "might break strict-aliasing rules");
+	  return true;
+	}
       else
         {
-          HOST_WIDE_INT set1 = get_alias_set (TREE_TYPE (TREE_OPERAND (expr, 0)));
+          /* warn_strict_aliasing >= 3.   This includes the default (3).  
+             Only warn if the cast is dereferenced immediately.  */
+          HOST_WIDE_INT set1 =
+	    get_alias_set (TREE_TYPE (TREE_OPERAND (expr, 0)));
           HOST_WIDE_INT set2 = get_alias_set (TREE_TYPE (type));
 
           if (!alias_sets_conflict_p (set1, set2))
-            warning (OPT_Wstrict_aliasing, "dereferencing type-punned "
-                     "pointer will break strict-aliasing rules");
-          else if (warn_strict_aliasing > 1
-                  && !alias_sets_might_conflict_p (set1, set2))
-            warning (OPT_Wstrict_aliasing, "dereferencing type-punned "
-                     "pointer might break strict-aliasing rules");
+	    {
+	      warning (OPT_Wstrict_aliasing, "dereferencing type-punned "
+		       "pointer will break strict-aliasing rules");
+	      return true;
+	    }
+          else if (warn_strict_aliasing == 2
+		   && !alias_sets_might_conflict_p (set1, set2))
+	    {
+	      warning (OPT_Wstrict_aliasing, "dereferencing type-punned "
+		       "pointer might break strict-aliasing rules");
+	      return true;
+	    }
         }
     }
+  else
+    if ((warn_strict_aliasing == 1) && !VOID_TYPE_P (TREE_TYPE (otype)))
+      {
+        /* At this level, warn for any conversions, even if an address is
+           not taken in the same statement.  This will likely produce many
+           false positives, but could be useful to pinpoint problems that
+           are not revealed at higher levels.  */
+        HOST_WIDE_INT set1 = get_alias_set (TREE_TYPE (otype));
+        HOST_WIDE_INT set2 = get_alias_set (TREE_TYPE (type));
+        if (!COMPLETE_TYPE_P(type)
+            || !alias_sets_might_conflict_p (set1, set2))
+	  {
+            warning (OPT_Wstrict_aliasing, "dereferencing type-punned "
+                     "pointer might break strict-aliasing rules");
+            return true;
+          }
+      }
+
+  return false;
 }
 
 
@@ -1057,18 +1099,45 @@ constant_fits_type_p (tree c, tree type)
   return !TREE_OVERFLOW (c);
 }
 
-/* Nonzero if vector types T1 and T2 can be converted to each other
-   without an explicit cast.  */
-int
-vector_types_convertible_p (tree t1, tree t2)
+
+/* True if vector types T1 and T2 can be converted to each other
+   without an explicit cast.  If EMIT_LAX_NOTE is true, and T1 and T2
+   can only be converted with -flax-vector-conversions yet that is not
+   in effect, emit a note telling the user about that option if such
+   a note has not previously been emitted.  */
+bool
+vector_types_convertible_p (tree t1, tree t2, bool emit_lax_note)
 {
-  return targetm.vector_opaque_p (t1)
-	 || targetm.vector_opaque_p (t2)
-	 || (tree_int_cst_equal (TYPE_SIZE (t1), TYPE_SIZE (t2))
-	     && (TREE_CODE (TREE_TYPE (t1)) != REAL_TYPE ||
-		 TYPE_PRECISION (t1) == TYPE_PRECISION (t2))
-	     && INTEGRAL_TYPE_P (TREE_TYPE (t1))
-		== INTEGRAL_TYPE_P (TREE_TYPE (t2)));
+  static bool emitted_lax_note = false;
+  bool convertible_lax;
+
+  if ((targetm.vector_opaque_p (t1) || targetm.vector_opaque_p (t2))
+      && tree_int_cst_equal (TYPE_SIZE (t1), TYPE_SIZE (t2)))
+    return true;
+
+  convertible_lax =
+    (tree_int_cst_equal (TYPE_SIZE (t1), TYPE_SIZE (t2))
+     && (TREE_CODE (TREE_TYPE (t1)) != REAL_TYPE ||
+	 TYPE_PRECISION (t1) == TYPE_PRECISION (t2))
+     && (INTEGRAL_TYPE_P (TREE_TYPE (t1))
+	 == INTEGRAL_TYPE_P (TREE_TYPE (t2))));
+
+  if (!convertible_lax || flag_lax_vector_conversions)
+    return convertible_lax;
+
+  if (TYPE_VECTOR_SUBPARTS (t1) == TYPE_VECTOR_SUBPARTS (t2)
+      && comptypes (TREE_TYPE (t1), TREE_TYPE (t2)))
+    return true;
+
+  if (emit_lax_note && !emitted_lax_note)
+    {
+      emitted_lax_note = true;
+      inform ("use -flax-vector-conversions to permit "
+              "conversions between vectors with differing "
+              "element types or numbers of subparts");
+    }
+
+  return false;
 }
 
 /* Convert EXPR to TYPE, warning about conversion problems with constants.
@@ -1950,10 +2019,10 @@ min_precision (tree value, int unsignedp)
 }
 
 /* Print an error message for invalid operands to arith operation
-   CODE.  */
+   CODE with TYPE0 for operand 0, and TYPE1 for operand 1.  */
 
 void
-binary_op_error (enum tree_code code)
+binary_op_error (enum tree_code code, tree type0, tree type1)
 {
   const char *opname;
 
@@ -2004,7 +2073,8 @@ binary_op_error (enum tree_code code)
     default:
       gcc_unreachable ();
     }
-  error ("invalid operands to binary %s", opname);
+  error ("invalid operands to binary %s (have %qT and %qT)", opname,
+	 type0, type1);
 }
 
 /* Subroutine of build_binary_op, used for comparison operations.
@@ -2585,9 +2655,13 @@ c_common_truthvalue_conversion (tree expr)
       break;
 
     case MODIFY_EXPR:
-      if (!TREE_NO_WARNING (expr))
-	warning (OPT_Wparentheses,
-		 "suggest parentheses around assignment used as truth value");
+      if (!TREE_NO_WARNING (expr)
+	  && warn_parentheses)
+	{
+	  warning (OPT_Wparentheses,
+		   "suggest parentheses around assignment used as truth value");
+	  TREE_NO_WARNING (expr) = 1;
+	}
       break;
 
     default:
@@ -2953,16 +3027,16 @@ c_sizeof_or_alignof_type (tree type, bool is_sizeof, int complain)
 }
 
 /* Implement the __alignof keyword: Return the minimum required
-   alignment of EXPR, measured in bytes.  For VAR_DECL's and
-   FIELD_DECL's return DECL_ALIGN (which can be set from an
-   "aligned" __attribute__ specification).  */
+   alignment of EXPR, measured in bytes.  For VAR_DECLs,
+   FUNCTION_DECLs and FIELD_DECLs return DECL_ALIGN (which can be set
+   from an "aligned" __attribute__ specification).  */
 
 tree
 c_alignof_expr (tree expr)
 {
   tree t;
 
-  if (TREE_CODE (expr) == VAR_DECL)
+  if (VAR_OR_FUNCTION_DECL_P (expr))
     t = size_int (DECL_ALIGN_UNIT (expr));
 
   else if (TREE_CODE (expr) == COMPONENT_REF
@@ -3104,6 +3178,85 @@ def_fn_type (builtin_type def, builtin_type ret, bool var, int n, ...)
   builtin_types[def] = t;
 }
 
+/* Build builtin functions common to both C and C++ language
+   frontends.  */
+
+static void
+c_define_builtins (tree va_list_ref_type_node, tree va_list_arg_type_node)
+{
+#define DEF_PRIMITIVE_TYPE(ENUM, VALUE) \
+  builtin_types[ENUM] = VALUE;
+#define DEF_FUNCTION_TYPE_0(ENUM, RETURN) \
+  def_fn_type (ENUM, RETURN, 0, 0);
+#define DEF_FUNCTION_TYPE_1(ENUM, RETURN, ARG1) \
+  def_fn_type (ENUM, RETURN, 0, 1, ARG1);
+#define DEF_FUNCTION_TYPE_2(ENUM, RETURN, ARG1, ARG2) \
+  def_fn_type (ENUM, RETURN, 0, 2, ARG1, ARG2);
+#define DEF_FUNCTION_TYPE_3(ENUM, RETURN, ARG1, ARG2, ARG3) \
+  def_fn_type (ENUM, RETURN, 0, 3, ARG1, ARG2, ARG3);
+#define DEF_FUNCTION_TYPE_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \
+  def_fn_type (ENUM, RETURN, 0, 4, ARG1, ARG2, ARG3, ARG4);
+#define DEF_FUNCTION_TYPE_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5)	\
+  def_fn_type (ENUM, RETURN, 0, 5, ARG1, ARG2, ARG3, ARG4, ARG5);
+#define DEF_FUNCTION_TYPE_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
+			    ARG6)					\
+  def_fn_type (ENUM, RETURN, 0, 6, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6);
+#define DEF_FUNCTION_TYPE_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
+			    ARG6, ARG7)					\
+  def_fn_type (ENUM, RETURN, 0, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7);
+#define DEF_FUNCTION_TYPE_VAR_0(ENUM, RETURN) \
+  def_fn_type (ENUM, RETURN, 1, 0);
+#define DEF_FUNCTION_TYPE_VAR_1(ENUM, RETURN, ARG1) \
+  def_fn_type (ENUM, RETURN, 1, 1, ARG1);
+#define DEF_FUNCTION_TYPE_VAR_2(ENUM, RETURN, ARG1, ARG2) \
+  def_fn_type (ENUM, RETURN, 1, 2, ARG1, ARG2);
+#define DEF_FUNCTION_TYPE_VAR_3(ENUM, RETURN, ARG1, ARG2, ARG3) \
+  def_fn_type (ENUM, RETURN, 1, 3, ARG1, ARG2, ARG3);
+#define DEF_FUNCTION_TYPE_VAR_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \
+  def_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3, ARG4);
+#define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \
+  def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5);
+#define DEF_POINTER_TYPE(ENUM, TYPE) \
+  builtin_types[(int) ENUM] = build_pointer_type (builtin_types[(int) TYPE]);
+
+#include "builtin-types.def"
+
+#undef DEF_PRIMITIVE_TYPE
+#undef DEF_FUNCTION_TYPE_1
+#undef DEF_FUNCTION_TYPE_2
+#undef DEF_FUNCTION_TYPE_3
+#undef DEF_FUNCTION_TYPE_4
+#undef DEF_FUNCTION_TYPE_5
+#undef DEF_FUNCTION_TYPE_6
+#undef DEF_FUNCTION_TYPE_VAR_0
+#undef DEF_FUNCTION_TYPE_VAR_1
+#undef DEF_FUNCTION_TYPE_VAR_2
+#undef DEF_FUNCTION_TYPE_VAR_3
+#undef DEF_FUNCTION_TYPE_VAR_4
+#undef DEF_FUNCTION_TYPE_VAR_5
+#undef DEF_POINTER_TYPE
+  builtin_types[(int) BT_LAST] = NULL_TREE;
+
+  c_init_attributes ();
+
+#define DEF_BUILTIN(ENUM, NAME, CLASS, TYPE, LIBTYPE, BOTH_P, FALLBACK_P, \
+		    NONANSI_P, ATTRS, IMPLICIT, COND)			\
+  if (NAME && COND)							\
+    def_builtin_1 (ENUM, NAME, CLASS,                                   \
+		   builtin_types[(int) TYPE],                           \
+		   builtin_types[(int) LIBTYPE],                        \
+		   BOTH_P, FALLBACK_P, NONANSI_P,                       \
+		   built_in_attributes[(int) ATTRS], IMPLICIT);
+#include "builtins.def"
+#undef DEF_BUILTIN
+
+  build_common_builtin_nodes ();
+
+  targetm.init_builtins ();
+  if (flag_mudflap)
+    mudflap_init ();
+}
+
 /* Build tree nodes and builtin functions common to both C and C++ language
    frontends.  */
 
@@ -3316,77 +3469,8 @@ c_common_nodes_and_builtins (void)
       va_list_ref_type_node = build_reference_type (va_list_type_node);
     }
 
-#define DEF_PRIMITIVE_TYPE(ENUM, VALUE) \
-  builtin_types[ENUM] = VALUE;
-#define DEF_FUNCTION_TYPE_0(ENUM, RETURN) \
-  def_fn_type (ENUM, RETURN, 0, 0);
-#define DEF_FUNCTION_TYPE_1(ENUM, RETURN, ARG1) \
-  def_fn_type (ENUM, RETURN, 0, 1, ARG1);
-#define DEF_FUNCTION_TYPE_2(ENUM, RETURN, ARG1, ARG2) \
-  def_fn_type (ENUM, RETURN, 0, 2, ARG1, ARG2);
-#define DEF_FUNCTION_TYPE_3(ENUM, RETURN, ARG1, ARG2, ARG3) \
-  def_fn_type (ENUM, RETURN, 0, 3, ARG1, ARG2, ARG3);
-#define DEF_FUNCTION_TYPE_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \
-  def_fn_type (ENUM, RETURN, 0, 4, ARG1, ARG2, ARG3, ARG4);
-#define DEF_FUNCTION_TYPE_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5)	\
-  def_fn_type (ENUM, RETURN, 0, 5, ARG1, ARG2, ARG3, ARG4, ARG5);
-#define DEF_FUNCTION_TYPE_6(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
-			    ARG6)					\
-  def_fn_type (ENUM, RETURN, 0, 6, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6);
-#define DEF_FUNCTION_TYPE_7(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5, \
-			    ARG6, ARG7)					\
-  def_fn_type (ENUM, RETURN, 0, 7, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7);
-#define DEF_FUNCTION_TYPE_VAR_0(ENUM, RETURN) \
-  def_fn_type (ENUM, RETURN, 1, 0);
-#define DEF_FUNCTION_TYPE_VAR_1(ENUM, RETURN, ARG1) \
-  def_fn_type (ENUM, RETURN, 1, 1, ARG1);
-#define DEF_FUNCTION_TYPE_VAR_2(ENUM, RETURN, ARG1, ARG2) \
-  def_fn_type (ENUM, RETURN, 1, 2, ARG1, ARG2);
-#define DEF_FUNCTION_TYPE_VAR_3(ENUM, RETURN, ARG1, ARG2, ARG3) \
-  def_fn_type (ENUM, RETURN, 1, 3, ARG1, ARG2, ARG3);
-#define DEF_FUNCTION_TYPE_VAR_4(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4) \
-  def_fn_type (ENUM, RETURN, 1, 4, ARG1, ARG2, ARG3, ARG4);
-#define DEF_FUNCTION_TYPE_VAR_5(ENUM, RETURN, ARG1, ARG2, ARG3, ARG4, ARG5) \
-  def_fn_type (ENUM, RETURN, 1, 5, ARG1, ARG2, ARG3, ARG4, ARG5);
-#define DEF_POINTER_TYPE(ENUM, TYPE) \
-  builtin_types[(int) ENUM] = build_pointer_type (builtin_types[(int) TYPE]);
-
-#include "builtin-types.def"
-
-#undef DEF_PRIMITIVE_TYPE
-#undef DEF_FUNCTION_TYPE_1
-#undef DEF_FUNCTION_TYPE_2
-#undef DEF_FUNCTION_TYPE_3
-#undef DEF_FUNCTION_TYPE_4
-#undef DEF_FUNCTION_TYPE_5
-#undef DEF_FUNCTION_TYPE_6
-#undef DEF_FUNCTION_TYPE_VAR_0
-#undef DEF_FUNCTION_TYPE_VAR_1
-#undef DEF_FUNCTION_TYPE_VAR_2
-#undef DEF_FUNCTION_TYPE_VAR_3
-#undef DEF_FUNCTION_TYPE_VAR_4
-#undef DEF_FUNCTION_TYPE_VAR_5
-#undef DEF_POINTER_TYPE
-  builtin_types[(int) BT_LAST] = NULL_TREE;
-
-  c_init_attributes ();
-
-#define DEF_BUILTIN(ENUM, NAME, CLASS, TYPE, LIBTYPE, BOTH_P, FALLBACK_P, \
-		    NONANSI_P, ATTRS, IMPLICIT, COND)			\
-  if (NAME && COND)							\
-    def_builtin_1 (ENUM, NAME, CLASS,                                   \
-		   builtin_types[(int) TYPE],                           \
-		   builtin_types[(int) LIBTYPE],                        \
-		   BOTH_P, FALLBACK_P, NONANSI_P,                       \
-		   built_in_attributes[(int) ATTRS], IMPLICIT);
-#include "builtins.def"
-#undef DEF_BUILTIN
-
-  build_common_builtin_nodes ();
-
-  targetm.init_builtins ();
-  if (flag_mudflap)
-    mudflap_init ();
+  if (!flag_preprocess_only)
+    c_define_builtins (va_list_ref_type_node, va_list_arg_type_node);
 
   main_identifier_node = get_identifier ("main");
 
@@ -4757,12 +4841,24 @@ handle_aligned_attribute (tree *node, tree ARG_UNUSED (name), tree args,
       TYPE_ALIGN (*type) = (1 << i) * BITS_PER_UNIT;
       TYPE_USER_ALIGN (*type) = 1;
     }
-  else if (TREE_CODE (decl) != VAR_DECL
+  else if (! VAR_OR_FUNCTION_DECL_P (decl)
 	   && TREE_CODE (decl) != FIELD_DECL)
     {
       error ("alignment may not be specified for %q+D", decl);
       *no_add_attrs = true;
     }
+  else if (TREE_CODE (decl) == FUNCTION_DECL
+	   && DECL_ALIGN (decl) > (1 << i) * BITS_PER_UNIT)
+    {
+      if (DECL_USER_ALIGN (decl))
+	error ("alignment for %q+D was previously specified as %d "
+	       "and may not be decreased", decl,
+	       DECL_ALIGN (decl) / BITS_PER_UNIT);
+      else
+	error ("alignment for %q+D must be at least %d", decl,
+	       DECL_ALIGN (decl) / BITS_PER_UNIT);
+      *no_add_attrs = true;
+    }
   else
     {
       DECL_ALIGN (decl) = (1 << i) * BITS_PER_UNIT;
@@ -6471,5 +6567,87 @@ warn_array_subscript_with_type_char (tree index)
     warning (OPT_Wchar_subscripts, "array subscript has type %<char%>");
 }
 
+/* Implement -Wparentheses for the unexpected C precedence rules, to
+   cover cases like x + y << z which readers are likely to
+   misinterpret.  We have seen an expression in which CODE is a binary
+   operator used to combine expressions headed by CODE_LEFT and
+   CODE_RIGHT.  CODE_LEFT and CODE_RIGHT may be ERROR_MARK, which
+   means that that side of the expression was not formed using a
+   binary operator, or it was enclosed in parentheses.  */
+
+void
+warn_about_parentheses (enum tree_code code, enum tree_code code_left,
+			enum tree_code code_right)
+{
+  if (!warn_parentheses)
+    return;
+
+  if (code == LSHIFT_EXPR || code == RSHIFT_EXPR)
+    {
+      if (code_left == PLUS_EXPR || code_left == MINUS_EXPR
+	  || code_right == PLUS_EXPR || code_right == MINUS_EXPR)
+	warning (OPT_Wparentheses,
+		 "suggest parentheses around + or - inside shift");
+    }
+
+  if (code == TRUTH_ORIF_EXPR)
+    {
+      if (code_left == TRUTH_ANDIF_EXPR
+	  || code_right == TRUTH_ANDIF_EXPR)
+	warning (OPT_Wparentheses,
+		 "suggest parentheses around && within ||");
+    }
+
+  if (code == BIT_IOR_EXPR)
+    {
+      if (code_left == BIT_AND_EXPR || code_left == BIT_XOR_EXPR
+	  || code_left == PLUS_EXPR || code_left == MINUS_EXPR
+	  || code_right == BIT_AND_EXPR || code_right == BIT_XOR_EXPR
+	  || code_right == PLUS_EXPR || code_right == MINUS_EXPR)
+	warning (OPT_Wparentheses,
+		 "suggest parentheses around arithmetic in operand of |");
+      /* Check cases like x|y==z */
+      if (TREE_CODE_CLASS (code_left) == tcc_comparison
+	  || TREE_CODE_CLASS (code_right) == tcc_comparison)
+	warning (OPT_Wparentheses,
+		 "suggest parentheses around comparison in operand of |");
+    }
+
+  if (code == BIT_XOR_EXPR)
+    {
+      if (code_left == BIT_AND_EXPR
+	  || code_left == PLUS_EXPR || code_left == MINUS_EXPR
+	  || code_right == BIT_AND_EXPR
+	  || code_right == PLUS_EXPR || code_right == MINUS_EXPR)
+	warning (OPT_Wparentheses,
+		 "suggest parentheses around arithmetic in operand of ^");
+      /* Check cases like x^y==z */
+      if (TREE_CODE_CLASS (code_left) == tcc_comparison
+	  || TREE_CODE_CLASS (code_right) == tcc_comparison)
+	warning (OPT_Wparentheses,
+		 "suggest parentheses around comparison in operand of ^");
+    }
+
+  if (code == BIT_AND_EXPR)
+    {
+      if (code_left == PLUS_EXPR || code_left == MINUS_EXPR
+	  || code_right == PLUS_EXPR || code_right == MINUS_EXPR)
+	warning (OPT_Wparentheses,
+		 "suggest parentheses around + or - in operand of &");
+      /* Check cases like x&y==z */
+      if (TREE_CODE_CLASS (code_left) == tcc_comparison
+	  || TREE_CODE_CLASS (code_right) == tcc_comparison)
+	warning (OPT_Wparentheses,
+		 "suggest parentheses around comparison in operand of &");
+    }
+
+  /* Similarly, check for cases like 1<=i<=10 that are probably errors.  */
+  if (TREE_CODE_CLASS (code) == tcc_comparison
+      && (TREE_CODE_CLASS (code_left) == tcc_comparison
+	  || TREE_CODE_CLASS (code_right) == tcc_comparison))
+    warning (OPT_Wparentheses, "comparisons like X<=Y<=Z do not "
+	     "have their mathematical meaning");
+}
+
 
 #include "gt-c-common.h"
diff --git a/contrib/gcc/c-common.h b/contrib/gcc/c-common.h
index 633990a3a35..8848ea5fdaf 100644
--- a/contrib/gcc/c-common.h
+++ b/contrib/gcc/c-common.h
@@ -389,6 +389,10 @@ extern int flag_short_double;
 
 extern int flag_short_wchar;
 
+/* Nonzero means allow implicit conversions between vectors with
+   differing numbers of subparts and/or differing element types.  */
+extern int flag_lax_vector_conversions;
+
 /* Nonzero means allow Microsoft extensions without warnings or errors.  */
 extern int flag_ms_extensions;
 
@@ -650,11 +654,11 @@ extern tree c_sizeof_or_alignof_type (tree, bool, int);
 extern tree c_alignof_expr (tree);
 /* Print an error message for invalid operands to arith operation CODE.
    NOP_EXPR is used as a special case (see truthvalue_conversion).  */
-extern void binary_op_error (enum tree_code);
+extern void binary_op_error (enum tree_code, tree, tree);
 extern tree fix_string_type (tree);
 struct varray_head_tag;
 extern void constant_expression_warning (tree);
-extern void strict_aliasing_warning(tree, tree, tree);
+extern bool strict_aliasing_warning (tree, tree, tree);
 extern void empty_body_warning (tree, tree);
 extern tree convert_and_check (tree, tree);
 extern void overflow_warning (tree);
@@ -791,7 +795,7 @@ extern tree finish_label_address_expr (tree);
 extern tree lookup_label (tree);
 extern tree lookup_name (tree);
 
-extern int vector_types_convertible_p (tree t1, tree t2);
+extern bool vector_types_convertible_p (tree t1, tree t2, bool emit_lax_note);
 
 extern rtx c_expand_expr (tree, rtx, enum machine_mode, int, rtx *);
 
@@ -850,6 +854,9 @@ extern int complete_array_type (tree *, tree, bool);
 extern tree builtin_type_for_size (int, bool);
 
 extern void warn_array_subscript_with_type_char (tree);
+extern void warn_about_parentheses (enum tree_code, enum tree_code,
+				    enum tree_code);
+
 
 /* In c-gimplify.c  */
 extern void c_genericize (tree);
diff --git a/contrib/gcc/c-decl.c b/contrib/gcc/c-decl.c
index fbafc0dbdc9..3cdd69b3d2a 100644
--- a/contrib/gcc/c-decl.c
+++ b/contrib/gcc/c-decl.c
@@ -1690,12 +1690,11 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype)
       DECL_SIZE (newdecl) = DECL_SIZE (olddecl);
       DECL_SIZE_UNIT (newdecl) = DECL_SIZE_UNIT (olddecl);
       DECL_MODE (newdecl) = DECL_MODE (olddecl);
-      if (TREE_CODE (olddecl) != FUNCTION_DECL)
-	if (DECL_ALIGN (olddecl) > DECL_ALIGN (newdecl))
-	  {
-	    DECL_ALIGN (newdecl) = DECL_ALIGN (olddecl);
-	    DECL_USER_ALIGN (newdecl) |= DECL_ALIGN (olddecl);
-	  }
+      if (DECL_ALIGN (olddecl) > DECL_ALIGN (newdecl))
+	{
+	  DECL_ALIGN (newdecl) = DECL_ALIGN (olddecl);
+	  DECL_USER_ALIGN (newdecl) |= DECL_ALIGN (olddecl);
+	}
     }
 
 
@@ -3931,6 +3930,61 @@ check_bitfield_type_and_width (tree *type, tree *width, const char *orig_name)
 }
 
 
+
+/* Print warning about variable length array if necessary.  */
+
+static void
+warn_variable_length_array (const char *name, tree size)
+{
+  int ped = !flag_isoc99 && pedantic && warn_vla != 0;
+  int const_size = TREE_CONSTANT (size);
+
+  if (ped)
+    {
+      if (const_size)
+	{
+	  if (name)
+	    pedwarn ("ISO C90 forbids array %qs whose size "
+		     "can%'t be evaluated",
+		     name);
+	  else
+	    pedwarn ("ISO C90 forbids array whose size "
+		     "can%'t be evaluated");
+	}
+      else
+	{
+	  if (name) 
+	    pedwarn ("ISO C90 forbids variable length array %qs",
+		     name);
+	  else
+	    pedwarn ("ISO C90 forbids variable length array");
+	}
+    }
+  else if (warn_vla > 0)
+    {
+      if (const_size)
+        {
+	  if (name)
+	    warning (OPT_Wvla,
+		     "the size of array %qs can"
+		     "%'t be evaluated", name);
+	  else
+	    warning (OPT_Wvla,
+		     "the size of array can %'t be evaluated");
+	}
+      else
+	{
+	  if (name)
+	    warning (OPT_Wvla,
+		     "variable length array %qs is used",
+		     name);
+	  else
+	    warning (OPT_Wvla,
+		     "variable length array is used");
+	}
+    }
+}
+
 /* Given declspecs and a declarator,
    determine the name and type of the object declared
    and construct a ..._DECL node for it.
@@ -4329,17 +4383,7 @@ grokdeclarator (const struct c_declarator *declarator,
 		       nonconstant even if it is (eg) a const variable
 		       with known value.  */
 		    size_varies = 1;
-
-		    if (!flag_isoc99 && pedantic)
-		      {
-			if (TREE_CONSTANT (size))
-			  pedwarn ("ISO C90 forbids array %qs whose size "
-				   "can%'t be evaluated",
-				   name);
-			else
-			  pedwarn ("ISO C90 forbids variable-size array %qs",
-				   name);
-		      }
+		    warn_variable_length_array (orig_name, size);
 		    if (warn_variable_decl)
 		      warning (0, "variable-sized array %qs", name);
 		  }
diff --git a/contrib/gcc/c-opts.c b/contrib/gcc/c-opts.c
index 3e89ec29020..ed6b7718ecb 100644
--- a/contrib/gcc/c-opts.c
+++ b/contrib/gcc/c-opts.c
@@ -396,7 +396,7 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       if (c_dialect_cxx ())
 	warn_sign_compare = value;
       warn_switch = value;
-      warn_strict_aliasing = value;
+      set_warn_strict_aliasing (value);
       warn_strict_overflow = value;
       warn_address = value;
 
@@ -606,6 +606,10 @@ c_common_handle_option (size_t scode, const char *arg, int value)
 	disable_builtin_function (arg);
       break;
 
+    case OPT_fdirectives_only:
+      cpp_opts->directives_only = 1;
+      break;
+
     case OPT_fdollars_in_identifiers:
       cpp_opts->dollars_in_ident = value;
       break;
@@ -706,6 +710,10 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       flag_implicit_templates = value;
       break;
 
+    case OPT_flax_vector_conversions:
+      flag_lax_vector_conversions = value;
+      break;
+
     case OPT_fms_extensions:
       flag_ms_extensions = value;
       break;
@@ -818,6 +826,18 @@ c_common_handle_option (size_t scode, const char *arg, int value)
       flag_gen_declaration = 1;
       break;
 
+    case OPT_femit_struct_debug_baseonly:
+      set_struct_debug_option ("base");
+      break;
+
+    case OPT_femit_struct_debug_reduced:
+      set_struct_debug_option ("dir:ord:sys,dir:gen:any,ind:base");
+      break;
+
+    case OPT_femit_struct_debug_detailed_:
+      set_struct_debug_option (arg);
+      break;
+
     case OPT_idirafter:
       add_path (xstrdup (arg), AFTER, 0, true);
       break;
@@ -1317,6 +1337,11 @@ sanitize_cpp_opts (void)
   if (flag_dump_macros == 'M')
     flag_no_output = 1;
 
+  /* By default, -fdirectives-only implies -dD.  This allows subsequent phases
+     to perform proper macro expansion.  */
+  if (cpp_opts->directives_only && !cpp_opts->preprocessed && !flag_dump_macros)
+    flag_dump_macros = 'D';
+
   /* Disable -dD, -dN and -dI if normal output is suppressed.  Allow
      -dM since at least glibc relies on -M -dM to work.  */
   /* Also, flag_no_output implies flag_no_line_commands, always.  */
@@ -1347,6 +1372,14 @@ sanitize_cpp_opts (void)
      actually output the current directory?  */
   if (flag_working_directory == -1)
     flag_working_directory = (debug_info_level != DINFO_LEVEL_NONE);
+
+  if (cpp_opts->directives_only)
+    {
+      if (warn_unused_macros)
+	error ("-fdirectives-only is incompatible with -Wunused_macros");
+      if (cpp_opts->traditional)
+	error ("-fdirectives-only is incompatible with -traditional");
+    }
 }
 
 /* Add include path with a prefix at the front of its name.  */
@@ -1430,6 +1463,8 @@ finish_options (void)
 	    }
 	}
     }
+  else if (cpp_opts->directives_only)
+    cpp_init_special_builtins (parse_in);
 
   include_cursor = 0;
   push_command_line_include ();
diff --git a/contrib/gcc/c-ppoutput.c b/contrib/gcc/c-ppoutput.c
index 10540b7f125..62b350b9ef3 100644
--- a/contrib/gcc/c-ppoutput.c
+++ b/contrib/gcc/c-ppoutput.c
@@ -41,6 +41,8 @@ static struct
 
 /* General output routines.  */
 static void scan_translation_unit (cpp_reader *);
+static void print_lines_directives_only (int, const void *, size_t);
+static void scan_translation_unit_directives_only (cpp_reader *);
 static void scan_translation_unit_trad (cpp_reader *);
 static void account_for_newlines (const unsigned char *, size_t);
 static int dump_macro (cpp_reader *, cpp_hashnode *, void *);
@@ -75,6 +77,9 @@ preprocess_file (cpp_reader *pfile)
     }
   else if (cpp_get_options (pfile)->traditional)
     scan_translation_unit_trad (pfile);
+  else if (cpp_get_options (pfile)->directives_only
+	   && !cpp_get_options (pfile)->preprocessed)
+    scan_translation_unit_directives_only (pfile);
   else
     scan_translation_unit (pfile);
 
@@ -179,6 +184,26 @@ scan_translation_unit (cpp_reader *pfile)
     }
 }
 
+static void
+print_lines_directives_only (int lines, const void *buf, size_t size)
+{
+  print.src_line += lines;
+  fwrite (buf, 1, size, print.outf);
+}
+
+/* Writes out the preprocessed file, handling spacing and paste
+   avoidance issues.  */
+static void
+scan_translation_unit_directives_only (cpp_reader *pfile)
+{
+  struct _cpp_dir_only_callbacks cb;
+
+  cb.print_lines = print_lines_directives_only;
+  cb.maybe_print_line = maybe_print_line;
+
+  _cpp_preprocess_dir_only (pfile, &cb);
+}
+
 /* Adjust print.src_line for newlines embedded in output.  */
 static void
 account_for_newlines (const unsigned char *str, size_t len)
diff --git a/contrib/gcc/c-typeck.c b/contrib/gcc/c-typeck.c
index b2906ee40b7..dd59620fece 100644
--- a/contrib/gcc/c-typeck.c
+++ b/contrib/gcc/c-typeck.c
@@ -1876,6 +1876,19 @@ build_indirect_ref (tree ptr, const char *errorstring)
 
   if (TREE_CODE (type) == POINTER_TYPE)
     {
+      if (TREE_CODE (pointer) == CONVERT_EXPR
+          || TREE_CODE (pointer) == NOP_EXPR
+          || TREE_CODE (pointer) == VIEW_CONVERT_EXPR)
+	{
+	  /* If a warning is issued, mark it to avoid duplicates from
+	     the backend.  This only needs to be done at
+	     warn_strict_aliasing > 2.  */
+	  if (warn_strict_aliasing > 2)
+	    if (strict_aliasing_warning (TREE_TYPE (TREE_OPERAND (pointer, 0)),
+					 type, TREE_OPERAND (pointer, 0)))
+	      TREE_NO_WARNING (pointer) = 1;
+	}
+
       if (TREE_CODE (pointer) == ADDR_EXPR
 	  && (TREE_TYPE (TREE_OPERAND (pointer, 0))
 	      == TREE_TYPE (type)))
@@ -1910,7 +1923,7 @@ build_indirect_ref (tree ptr, const char *errorstring)
 	}
     }
   else if (TREE_CODE (pointer) != ERROR_MARK)
-    error ("invalid type argument of %qs", errorstring);
+    error ("invalid type argument of %qs (have %qT)", errorstring, type);
   return error_mark_node;
 }
 
@@ -2603,7 +2616,10 @@ parser_build_unary_op (enum tree_code code, struct c_expr arg)
 
   result.original_code = ERROR_MARK;
   result.value = build_unary_op (code, arg.value, 0);
-  overflow_warning (result.value);
+  
+  if (TREE_OVERFLOW_P (result.value) && !TREE_OVERFLOW_P (arg.value))
+    overflow_warning (result.value);
+
   return result;
 }
 
@@ -2631,73 +2647,7 @@ parser_build_binary_op (enum tree_code code, struct c_expr arg1,
   /* Check for cases such as x+y<<z which users are likely
      to misinterpret.  */
   if (warn_parentheses)
-    {
-      if (code == LSHIFT_EXPR || code == RSHIFT_EXPR)
-	{
-	  if (code1 == PLUS_EXPR || code1 == MINUS_EXPR
-	      || code2 == PLUS_EXPR || code2 == MINUS_EXPR)
-	    warning (OPT_Wparentheses,
-		     "suggest parentheses around + or - inside shift");
-	}
-
-      if (code == TRUTH_ORIF_EXPR)
-	{
-	  if (code1 == TRUTH_ANDIF_EXPR
-	      || code2 == TRUTH_ANDIF_EXPR)
-	    warning (OPT_Wparentheses,
-		     "suggest parentheses around && within ||");
-	}
-
-      if (code == BIT_IOR_EXPR)
-	{
-	  if (code1 == BIT_AND_EXPR || code1 == BIT_XOR_EXPR
-	      || code1 == PLUS_EXPR || code1 == MINUS_EXPR
-	      || code2 == BIT_AND_EXPR || code2 == BIT_XOR_EXPR
-	      || code2 == PLUS_EXPR || code2 == MINUS_EXPR)
-	    warning (OPT_Wparentheses,
-		     "suggest parentheses around arithmetic in operand of |");
-	  /* Check cases like x|y==z */
-	  if (TREE_CODE_CLASS (code1) == tcc_comparison
-	      || TREE_CODE_CLASS (code2) == tcc_comparison)
-	    warning (OPT_Wparentheses,
-		     "suggest parentheses around comparison in operand of |");
-	}
-
-      if (code == BIT_XOR_EXPR)
-	{
-	  if (code1 == BIT_AND_EXPR
-	      || code1 == PLUS_EXPR || code1 == MINUS_EXPR
-	      || code2 == BIT_AND_EXPR
-	      || code2 == PLUS_EXPR || code2 == MINUS_EXPR)
-	    warning (OPT_Wparentheses,
-		     "suggest parentheses around arithmetic in operand of ^");
-	  /* Check cases like x^y==z */
-	  if (TREE_CODE_CLASS (code1) == tcc_comparison
-	      || TREE_CODE_CLASS (code2) == tcc_comparison)
-	    warning (OPT_Wparentheses,
-		     "suggest parentheses around comparison in operand of ^");
-	}
-
-      if (code == BIT_AND_EXPR)
-	{
-	  if (code1 == PLUS_EXPR || code1 == MINUS_EXPR
-	      || code2 == PLUS_EXPR || code2 == MINUS_EXPR)
-	    warning (OPT_Wparentheses,
-		     "suggest parentheses around + or - in operand of &");
-	  /* Check cases like x&y==z */
-	  if (TREE_CODE_CLASS (code1) == tcc_comparison
-	      || TREE_CODE_CLASS (code2) == tcc_comparison)
-	    warning (OPT_Wparentheses,
-		     "suggest parentheses around comparison in operand of &");
-	}
-      /* Similarly, check for cases like 1<=i<=10 that are probably errors.  */
-      if (TREE_CODE_CLASS (code) == tcc_comparison
-	  && (TREE_CODE_CLASS (code1) == tcc_comparison
-	      || TREE_CODE_CLASS (code2) == tcc_comparison))
-	warning (OPT_Wparentheses, "comparisons like X<=Y<=Z do not "
-		 "have their mathematical meaning");
-
-    }
+    warn_about_parentheses (code, code1, code2);
 
   /* Warn about comparisons against string literals, with the exception
      of testing for equality or inequality of a string literal with NULL.  */
@@ -2713,7 +2663,10 @@ parser_build_binary_op (enum tree_code code, struct c_expr arg1,
     warning (OPT_Waddress, 
              "comparison with string literal results in unspecified behaviour");
 
-  overflow_warning (result.value);
+  if (TREE_OVERFLOW_P (result.value) 
+      && !TREE_OVERFLOW_P (arg1.value) 
+      && !TREE_OVERFLOW_P (arg2.value))
+    overflow_warning (result.value);
 
   return result;
 }
@@ -3628,7 +3581,8 @@ build_c_cast (tree type, tree expr)
 	warning (OPT_Wint_to_pointer_cast, "cast to pointer from integer "
 		 "of different size");
 
-      strict_aliasing_warning (otype, type, expr);
+      if (warn_strict_aliasing <= 2)
+        strict_aliasing_warning (otype, type, expr);
 
       /* If pedantic, warn for conversions between function and object
 	 pointer types, except for converting a null pointer constant
@@ -3899,10 +3853,7 @@ convert_for_assignment (tree type, tree rhs, enum impl_conv errtype,
     }
 
   if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (rhstype))
-    {
-      overflow_warning (rhs);
-      return rhs;
-    }
+    return rhs;
 
   if (coder == VOID_TYPE)
     {
@@ -3942,7 +3893,7 @@ convert_for_assignment (tree type, tree rhs, enum impl_conv errtype,
     }
   /* Some types can interconvert without explicit casts.  */
   else if (codel == VECTOR_TYPE && coder == VECTOR_TYPE
-	   && vector_types_convertible_p (type, TREE_TYPE (rhs)))
+	   && vector_types_convertible_p (type, TREE_TYPE (rhs), true))
     return convert (type, rhs);
   /* Arithmetic types all interconvert, and enum is treated like int.  */
   else if ((codel == INTEGER_TYPE || codel == REAL_TYPE
@@ -4678,7 +4629,7 @@ digest_init (tree type, tree init, bool strict_string, int require_constant)
      below and handle as a constructor.  */
   if (code == VECTOR_TYPE
       && TREE_CODE (TREE_TYPE (inside_init)) == VECTOR_TYPE
-      && vector_types_convertible_p (TREE_TYPE (inside_init), type)
+      && vector_types_convertible_p (TREE_TYPE (inside_init), type, true)
       && TREE_CONSTANT (inside_init))
     {
       if (TREE_CODE (inside_init) == VECTOR_CST
@@ -8184,7 +8135,7 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
 	  || !same_scalar_type_ignoring_signedness (TREE_TYPE (type0),
 						    TREE_TYPE (type1))))
     {
-      binary_op_error (code);
+      binary_op_error (code, type0, type1);
       return error_mark_node;
     }
 
@@ -8480,7 +8431,7 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
 
   if (!result_type)
     {
-      binary_op_error (code);
+      binary_op_error (code, TREE_TYPE (op0), TREE_TYPE (op1));
       return error_mark_node;
     }
 
diff --git a/contrib/gcc/c.opt b/contrib/gcc/c.opt
index 038fc51d88b..86e9460a7f7 100644
--- a/contrib/gcc/c.opt
+++ b/contrib/gcc/c.opt
@@ -432,6 +432,10 @@ Wvariadic-macros
 C ObjC C++ ObjC++
 Do not warn about using variadic macros when -pedantic
 
+Wvla
+C ObjC C++ ObjC++ Var(warn_vla) Init(-1) Warning
+Warn if a variable length array is used
+
 Wwrite-strings
 C ObjC C++ ObjC++ Var(warn_write_strings)
 In C++, nonzero means warn about deprecated conversion from string literals to `char *'.  In C, similar warning, except that the conversion is of course not deprecated by the ISO C standard.
@@ -490,6 +494,10 @@ fdefault-inline
 C++ ObjC++
 Inline member functions by default
 
+fdirectives-only
+C ObjC C++ ObjC++
+Preprocess directives only.
+
 fdollars-in-identifiers
 C ObjC C++ ObjC++
 Permit '$' as an identifier character
@@ -576,6 +584,10 @@ Inject friend functions into enclosing namespace
 flabels-ok
 C++ ObjC++
 
+flax-vector-conversions
+C ObjC C++ ObjC++
+Allow implicit conversions between vectors with differing numbers of subparts and/or differing element types.
+
 fms-extensions
 C ObjC C++ ObjC++
 Don't warn about uses of Microsoft extensions
@@ -729,6 +741,10 @@ fvisibility-inlines-hidden
 C++ ObjC++
 Marks all inlined methods as having hidden visibility
 
+fvisibility-ms-compat
+C++ ObjC++ Var(flag_visibility_ms_compat)
+Changes visibility to match Microsoft Visual Studio by default
+
 fvtable-gc
 C++ ObjC++
 Discard unused virtual functions
@@ -761,6 +777,18 @@ gen-decls
 ObjC ObjC++
 Dump declarations to a .decl file
 
+femit-struct-debug-baseonly
+C ObjC C++ ObjC++
+-femit-struct-debug-baseonly	Aggressive reduced debug info for structs
+
+femit-struct-debug-reduced
+C ObjC C++ ObjC++
+-femit-struct-debug-reduced	Conservative reduced debug info for structs
+
+femit-struct-debug-detailed=
+C ObjC C++ ObjC++ Joined
+-femit-struct-debug-detailed=<spec-list>	Detailed reduced debug info for structs
+
 idirafter
 C ObjC C++ ObjC++ Joined Separate
 -idirafter <dir>	Add <dir> to the end of the system include path
diff --git a/contrib/gcc/cgraphunit.c b/contrib/gcc/cgraphunit.c
index 6d6ce2f1b42..cc8b98f5480 100644
--- a/contrib/gcc/cgraphunit.c
+++ b/contrib/gcc/cgraphunit.c
@@ -1676,7 +1676,7 @@ cgraph_build_static_cdtor (char which, tree body, int priority)
   tree decl, name, resdecl;
 
   sprintf (which_buf, "%c_%d", which, counter++);
-  name = get_file_function_name_long (which_buf);
+  name = get_file_function_name (which_buf);
 
   decl = build_decl (FUNCTION_DECL, name,
 		     build_function_type (void_type_node, void_list_node));
diff --git a/contrib/gcc/collect2.c b/contrib/gcc/collect2.c
index 02edde835d5..c6c1f3f4a2c 100644
--- a/contrib/gcc/collect2.c
+++ b/contrib/gcc/collect2.c
@@ -53,7 +53,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
    the utilities are not correct for a cross-compiler; we have to hope that
    cross-versions are in the proper directories.  */
 
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 #undef OBJECT_FORMAT_COFF
 #undef MD_EXEC_PREFIX
 #undef REAL_LD_FILE_NAME
@@ -553,7 +553,7 @@ is_ctor_dtor (const char *s)
 
 static struct path_prefix cpath, path;
 
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 /* This is the name of the target machine.  We use it to form the name
    of the files to execute.  */
 
@@ -746,7 +746,7 @@ main (int argc, char **argv)
   static const char *const strip_suffix = "strip";
   static const char *const gstrip_suffix = "gstrip";
 
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
   /* If we look for a program in the compiler directories, we just use
      the short name, since these directories are already system-specific.
      But it we look for a program in the system directories, we need to
@@ -775,7 +775,7 @@ main (int argc, char **argv)
 #endif
   const char *const full_strip_suffix	= strip_suffix;
   const char *const full_gstrip_suffix	= gstrip_suffix;
-#endif /* CROSS_COMPILE */
+#endif /* CROSS_DIRECTORY_STRUCTURE */
 
   const char *arg;
   FILE *outf;
@@ -957,7 +957,7 @@ main (int argc, char **argv)
   c_file_name = getenv ("COLLECT_GCC");
   if (c_file_name == 0)
     {
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
       c_file_name = concat (target_machine, "-gcc", NULL);
 #else
       c_file_name = "gcc";
diff --git a/contrib/gcc/common.opt b/contrib/gcc/common.opt
index 2270d0d8e99..7dd3909aa5b 100644
--- a/contrib/gcc/common.opt
+++ b/contrib/gcc/common.opt
@@ -95,7 +95,11 @@ Warn when an inlined function cannot be inlined
 
 Wlarger-than-
 Common RejectNegative Joined UInteger
--Wlarger-than-<number>	Warn if an object is larger than <number> bytes
+-Wlarger-than-<number> Warn if an object is larger than <number> bytes
+
+Wframe-larger-than-
+Common RejectNegative Joined UInteger
+-Wframe-larger-than-<number> Warn if the frame size of a function is larger than <number> bytes
 
 Wunsafe-loop-optimizations
 Common Var(warn_unsafe_loop_optimizations)
@@ -537,6 +541,14 @@ finstrument-functions
 Common Report Var(flag_instrument_function_entry_exit)
 Instrument function entry and exit with profiling calls
 
+finstrument-functions-exclude-function-list=
+Common RejectNegative Joined
+-finstrument-functions-exclude-function-list=name,...  Do not instrument listed functions
+
+finstrument-functions-exclude-file-list=
+Common RejectNegative Joined
+-finstrument-functions-exclude-file-list=filename,...  Do not instrument functions listed in files
+
 fipa-cp
 Common Report Var(flag_ipa_cp)
 Perform Interprocedural constant propagation
diff --git a/contrib/gcc/config/i386/beos-elf.h b/contrib/gcc/config/i386/beos-elf.h
index f1e2cf8c6e1..3acc830bfe1 100644
--- a/contrib/gcc/config/i386/beos-elf.h
+++ b/contrib/gcc/config/i386/beos-elf.h
@@ -135,7 +135,7 @@ Boston, MA 02110-1301, USA.  */
    for the BeOS include files relative to TOOL_INCLUDE_DIR.  Yes, we
    use ANSI string concatenation here (FIXME) */
 
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS \
     { \
@@ -177,7 +177,7 @@ Boston, MA 02110-1301, USA.  */
     { "/boot/develop/headers", 0, 0, 0 }, \
     { 0, 0, 0, 0 } \
     }
-#else /* CROSS_COMPILE */
+#else /* CROSS_DIRECTORY_STRUCTURE */
 #undef	INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS				\
     { \
diff --git a/contrib/gcc/config/i386/cygwin.h b/contrib/gcc/config/i386/cygwin.h
index a7d5e47cdc9..fe85a6df4cd 100644
--- a/contrib/gcc/config/i386/cygwin.h
+++ b/contrib/gcc/config/i386/cygwin.h
@@ -146,7 +146,7 @@ char cygwin_tool_include_dir[sizeof (TOOL_INCLUDE_DIR) + 1
 #undef TOOL_INCLUDE_DIR
 #define TOOL_INCLUDE_DIR ((const char *) cygwin_tool_include_dir)
 
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef STANDARD_INCLUDE_DIR
 #define STANDARD_INCLUDE_DIR "/usr/include"
 char cygwin_standard_include_dir[sizeof (STANDARD_INCLUDE_DIR) + 1
diff --git a/contrib/gcc/config/i386/emmintrin.h b/contrib/gcc/config/i386/emmintrin.h
index acab0a170e6..fb4055369ad 100644
--- a/contrib/gcc/config/i386/emmintrin.h
+++ b/contrib/gcc/config/i386/emmintrin.h
@@ -1126,9 +1126,9 @@ _mm_slli_epi64 (__m128i __A, int __B)
 #define _mm_slli_epi16(__A, __B) \
   ((__m128i)__builtin_ia32_psllwi128 ((__v8hi)(__A), __B))
 #define _mm_slli_epi32(__A, __B) \
-  ((__m128i)__builtin_ia32_pslldi128 ((__v8hi)(__A), __B))
+  ((__m128i)__builtin_ia32_pslldi128 ((__v4si)(__A), __B))
 #define _mm_slli_epi64(__A, __B) \
-  ((__m128i)__builtin_ia32_psllqi128 ((__v8hi)(__A), __B))
+  ((__m128i)__builtin_ia32_psllqi128 ((__v2di)(__A), __B))
 #endif
 
 #if 0
@@ -1147,7 +1147,7 @@ _mm_srai_epi32 (__m128i __A, int __B)
 #define _mm_srai_epi16(__A, __B) \
   ((__m128i)__builtin_ia32_psrawi128 ((__v8hi)(__A), __B))
 #define _mm_srai_epi32(__A, __B) \
-  ((__m128i)__builtin_ia32_psradi128 ((__v8hi)(__A), __B))
+  ((__m128i)__builtin_ia32_psradi128 ((__v4si)(__A), __B))
 #endif
 
 #if 0
diff --git a/contrib/gcc/config/i386/i386.c b/contrib/gcc/config/i386/i386.c
index 1598ae91eca..88f28369297 100644
--- a/contrib/gcc/config/i386/i386.c
+++ b/contrib/gcc/config/i386/i386.c
@@ -1089,6 +1089,8 @@ const int x86_cmpxchg = ~m_386;
 const int x86_cmpxchg8b = ~(m_386 | m_486);
 /* Exchange and add was added for 80486.  */
 const int x86_xadd = ~m_386;
+/* Byteswap was added for 80486.  */
+const int x86_bswap = ~m_386;
 const int x86_pad_returns = m_ATHLON_K8_AMDFAM10 | m_CORE2 | m_GENERIC;
 
 /* In case the average insn count for single function invocation is
@@ -15406,7 +15408,7 @@ ix86_init_mmx_sse_builtins (void)
   const struct builtin_description * d;
   size_t i;
 
-  tree V16QI_type_node = build_vector_type_for_mode (intQI_type_node, V16QImode);
+  tree V16QI_type_node = build_vector_type_for_mode (char_type_node, V16QImode);
   tree V2SI_type_node = build_vector_type_for_mode (intSI_type_node, V2SImode);
   tree V2SF_type_node = build_vector_type_for_mode (float_type_node, V2SFmode);
   tree V2DI_type_node
@@ -15415,7 +15417,7 @@ ix86_init_mmx_sse_builtins (void)
   tree V4SF_type_node = build_vector_type_for_mode (float_type_node, V4SFmode);
   tree V4SI_type_node = build_vector_type_for_mode (intSI_type_node, V4SImode);
   tree V4HI_type_node = build_vector_type_for_mode (intHI_type_node, V4HImode);
-  tree V8QI_type_node = build_vector_type_for_mode (intQI_type_node, V8QImode);
+  tree V8QI_type_node = build_vector_type_for_mode (char_type_node, V8QImode);
   tree V8HI_type_node = build_vector_type_for_mode (intHI_type_node, V8HImode);
 
   tree pchar_type_node = build_pointer_type (char_type_node);
diff --git a/contrib/gcc/config/i386/i386.h b/contrib/gcc/config/i386/i386.h
index 1394fbabfa7..4a303f61521 100644
--- a/contrib/gcc/config/i386/i386.h
+++ b/contrib/gcc/config/i386/i386.h
@@ -168,6 +168,7 @@ extern const int x86_use_bt;
 extern const int x86_cmpxchg, x86_cmpxchg8b, x86_xadd;
 extern const int x86_use_incdec;
 extern const int x86_pad_returns;
+extern const int x86_bswap;
 extern const int x86_partial_flag_reg_stall;
 extern int x86_prefetch_sse, x86_cmpxchg16b;
 
@@ -243,6 +244,7 @@ extern int x86_prefetch_sse, x86_cmpxchg16b;
 #define TARGET_CMPXCHG8B (x86_cmpxchg8b & (1 << ix86_arch))
 #define TARGET_CMPXCHG16B (x86_cmpxchg16b)
 #define TARGET_XADD (x86_xadd & (1 << ix86_arch))
+#define TARGET_BSWAP (x86_bswap & (1 << ix86_arch))
 
 #ifndef TARGET_64BIT_DEFAULT
 #define TARGET_64BIT_DEFAULT 0
diff --git a/contrib/gcc/config/i386/i386.md b/contrib/gcc/config/i386/i386.md
index 21b9cb39fe3..f009cbb42a1 100644
--- a/contrib/gcc/config/i386/i386.md
+++ b/contrib/gcc/config/i386/i386.md
@@ -284,14 +284,14 @@
     (const_int 0)))
 
 ;; Set when string REP prefix is used.
-(define_attr "prefix_rep" "" 
+(define_attr "prefix_rep" ""
   (if_then_else (and (eq_attr "unit" "sse") (eq_attr "mode" "SF,DF"))
     (const_int 1)
     (const_int 0)))
 
 ;; Set when 0f opcode prefix is used.
 (define_attr "prefix_0f" ""
-  (if_then_else 
+  (if_then_else
     (ior (eq_attr "type" "imovx,setcc,icmov,bitmanip")
 	 (eq_attr "unit" "sse,mmx"))
     (const_int 1)
@@ -466,7 +466,7 @@
 
 ;; All x87 floating point modes
 (define_mode_macro X87MODEF [SF DF XF])
- 
+
 ;; All integer modes handled by x87 fisttp operator.
 (define_mode_macro X87MODEI [HI SI DI])
 
@@ -475,7 +475,7 @@
 
 ;; All SSE floating point modes
 (define_mode_macro SSEMODEF [SF DF])
- 
+
 ;; All integer modes handled by SSE cvtts?2si* operators.
 (define_mode_macro SSEMODEI24 [SI DI])
 
@@ -1098,7 +1098,7 @@
 ;; Push/pop instructions.  They are separate since autoinc/dec is not a
 ;; general_operand.
 ;;
-;; %%% We don't use a post-inc memory reference because x86 is not a 
+;; %%% We don't use a post-inc memory reference because x86 is not a
 ;; general AUTO_INC_DEC host, which impacts how it is treated in flow.
 ;; Changing this impacts compiler performance on other non-AUTO_INC_DEC
 ;; targets without our curiosities, and it is just as easy to represent
@@ -1160,7 +1160,7 @@
   [(set_attr "type" "alu1")
    (set_attr "mode" "SI")
    (set_attr "length_immediate" "0")])
- 
+
 (define_insn "*movsi_or"
   [(set (match_operand:SI 0 "register_operand" "=r")
 	(match_operand:SI 1 "immediate_operand" "i"))
@@ -2308,7 +2308,7 @@
    && (reload_in_progress || reload_completed
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], SFmode))" 
+       || memory_operand (operands[0], SFmode))"
 {
   switch (which_alternative)
     {
@@ -2368,7 +2368,7 @@
 		   (const_string "V4SF"))
 	       /* For architectures resolving dependencies on
 		  whole SSE registers use APS move to break dependency
-		  chains, otherwise use short move to avoid extra work. 
+		  chains, otherwise use short move to avoid extra work.
 
 		  Do the same for architectures resolving dependencies on
 		  the parts.  While in DF mode it is better to always handle
@@ -2476,7 +2476,7 @@
    && (reload_in_progress || reload_completed
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], DFmode))" 
+       || memory_operand (operands[0], DFmode))"
 {
   switch (which_alternative)
     {
@@ -2596,7 +2596,7 @@
    && (reload_in_progress || reload_completed
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], DFmode))" 
+       || memory_operand (operands[0], DFmode))"
 {
   switch (which_alternative)
     {
@@ -2712,10 +2712,10 @@
 	(match_operand:DF 1 "general_operand" ""))]
   "reload_completed
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
-   && ! (ANY_FP_REG_P (operands[0]) || 
+   && ! (ANY_FP_REG_P (operands[0]) ||
 	 (GET_CODE (operands[0]) == SUBREG
 	  && ANY_FP_REG_P (SUBREG_REG (operands[0]))))
-   && ! (ANY_FP_REG_P (operands[1]) || 
+   && ! (ANY_FP_REG_P (operands[1]) ||
 	 (GET_CODE (operands[1]) == SUBREG
 	  && ANY_FP_REG_P (SUBREG_REG (operands[1]))))"
   [(const_int 0)]
@@ -2807,7 +2807,7 @@
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && (reload_in_progress || reload_completed
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], XFmode))" 
+       || memory_operand (operands[0], XFmode))"
 {
   switch (which_alternative)
     {
@@ -2841,7 +2841,7 @@
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && (reload_in_progress || reload_completed
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], XFmode))" 
+       || memory_operand (operands[0], XFmode))"
 {
   switch (which_alternative)
     {
@@ -2875,10 +2875,10 @@
   "reload_completed
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && GET_MODE (operands[0]) == XFmode
-   && ! (ANY_FP_REG_P (operands[0]) || 
+   && ! (ANY_FP_REG_P (operands[0]) ||
 	 (GET_CODE (operands[0]) == SUBREG
 	  && ANY_FP_REG_P (SUBREG_REG (operands[0]))))
-   && ! (ANY_FP_REG_P (operands[1]) || 
+   && ! (ANY_FP_REG_P (operands[1]) ||
 	 (GET_CODE (operands[1]) == SUBREG
 	  && ANY_FP_REG_P (SUBREG_REG (operands[1]))))"
   [(const_int 0)]
@@ -3073,7 +3073,7 @@
   [(set (match_operand:HI 0 "register_operand" "")
 	(zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "")))
    (clobber (reg:CC FLAGS_REG))]
-  "reload_completed 
+  "reload_completed
    && (!TARGET_ZERO_EXTEND_WITH_AND || optimize_size)
    && (!REG_P (operands[1]) || ANY_QI_REG_P (operands[1]))"
   [(set (match_operand:HI 0 "register_operand" "")
@@ -3143,7 +3143,7 @@
   [(set (match_operand:SI 0 "register_operand" "")
 	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "")))
    (clobber (reg:CC FLAGS_REG))]
-  "reload_completed 
+  "reload_completed
    && (!TARGET_ZERO_EXTEND_WITH_AND || optimize_size)
    && (!REG_P (operands[1]) || ANY_QI_REG_P (operands[1]))"
   [(set (match_dup 0)
@@ -3220,7 +3220,7 @@
   [(set (match_dup 4) (const_int 0))]
   "split_di (&operands[0], 1, &operands[3], &operands[4]);")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(zero_extend:DI (match_operand:SI 1 "register_operand" "")))
    (clobber (reg:CC FLAGS_REG))]
@@ -3229,7 +3229,7 @@
   [(set (match_dup 4) (const_int 0))]
   "split_di (&operands[0], 1, &operands[3], &operands[4]);")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
 	(zero_extend:DI (match_operand:SI 1 "general_operand" "")))
    (clobber (reg:CC FLAGS_REG))]
@@ -3308,7 +3308,7 @@
     (set_attr "mode" "DI")])
 
 ;; Extend to memory case when source register does die.
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "memory_operand" "")
 	(sign_extend:DI (match_operand:SI 1 "register_operand" "")))
    (clobber (reg:CC FLAGS_REG))
@@ -3323,7 +3323,7 @@
   "split_di (&operands[0], 1, &operands[3], &operands[4]);")
 
 ;; Extend to memory case when source register does not die.
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "memory_operand" "")
 	(sign_extend:DI (match_operand:SI 1 "register_operand" "")))
    (clobber (reg:CC FLAGS_REG))
@@ -3353,7 +3353,7 @@
 
 ;; Extend to register case.  Optimize case where source and destination
 ;; registers match and cases where we can use cltd.
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(sign_extend:DI (match_operand:SI 1 "register_operand" "")))
    (clobber (reg:CC FLAGS_REG))
@@ -3482,7 +3482,7 @@
 ;; These are all no-ops in the model used for the 80387.  So just
 ;; emit moves.
 
-;; %%% Kill these when call knows how to work out a DFmode push earlier. 
+;; %%% Kill these when call knows how to work out a DFmode push earlier.
 (define_insn "*dummy_extendsfdf2"
   [(set (match_operand:DF 0 "push_operand" "=<")
 	(float_extend:DF (match_operand:SF 1 "nonimmediate_operand" "fY")))]
@@ -4365,7 +4365,7 @@
    (set_attr "i387_cw" "trunc")
    (set_attr "mode" "DI")])
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(fix:DI (match_operand 1 "register_operand" "")))
    (use (match_operand:HI 2 "memory_operand" ""))
@@ -4380,7 +4380,7 @@
    (set (match_dup 0) (match_dup 4))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "memory_operand" "")
 	(fix:DI (match_operand 1 "register_operand" "")))
    (use (match_operand:HI 2 "memory_operand" ""))
@@ -4421,7 +4421,7 @@
    (set_attr "i387_cw" "trunc")
    (set_attr "mode" "<MODE>")])
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "register_operand" "")
 	(fix:X87MODEI12 (match_operand 1 "register_operand" "")))
    (use (match_operand:HI 2 "memory_operand" ""))
@@ -4434,7 +4434,7 @@
    (set (match_dup 0) (match_dup 4))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "memory_operand" "")
 	(fix:X87MODEI12 (match_operand 1 "register_operand" "")))
    (use (match_operand:HI 2 "memory_operand" ""))
@@ -4913,7 +4913,7 @@
 
 (define_insn "*addsi3_carry_zext"
   [(set (match_operand:DI 0 "register_operand" "=r")
-	  (zero_extend:DI 
+	  (zero_extend:DI
 	    (plus:SI (plus:SI (match_operand:SI 3 "ix86_carry_flag_operator" "")
 			      (match_operand:SI 1 "nonimmediate_operand" "%0"))
 		     (match_operand:SI 2 "general_operand" "rim"))))
@@ -5222,7 +5222,7 @@
 	(compare
 	  (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
 		   (match_operand:DI 2 "x86_64_general_operand" "rme,re"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (set (match_operand:DI 0 "nonimmediate_operand" "=r,rm")
 	(plus:DI (match_dup 1) (match_dup 2)))]
   "TARGET_64BIT && ix86_match_ccmode (insn, CCGOCmode)
@@ -5369,7 +5369,7 @@
 	(compare
 	  (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0")
 		   (match_operand:DI 2 "x86_64_general_operand" "rme"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (clobber (match_scratch:DI 0 "=r"))]
   "TARGET_64BIT
    && ix86_match_ccmode (insn, CCGOCmode)
@@ -5568,7 +5568,7 @@
 	(compare
 	  (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
 		   (match_operand:SI 2 "general_operand" "rmni,rni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (set (match_operand:SI 0 "nonimmediate_operand" "=r,rm")
 	(plus:SI (match_dup 1) (match_dup 2)))]
   "ix86_match_ccmode (insn, CCGOCmode)
@@ -5616,7 +5616,7 @@
 	(compare
 	  (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
 		   (match_operand:SI 2 "general_operand" "rmni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=r")
 	(zero_extend:DI (plus:SI (match_dup 1) (match_dup 2))))]
   "TARGET_64BIT && ix86_match_ccmode (insn, CCGOCmode)
@@ -5794,7 +5794,7 @@
 	(compare
 	  (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
 		   (match_operand:SI 2 "general_operand" "rmni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (clobber (match_scratch:SI 0 "=r"))]
   "ix86_match_ccmode (insn, CCGOCmode)
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)
@@ -5934,7 +5934,7 @@
 	(compare
 	  (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
 		   (match_operand:HI 2 "general_operand" "rmni,rni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (set (match_operand:HI 0 "nonimmediate_operand" "=r,rm")
 	(plus:HI (match_dup 1) (match_dup 2)))]
   "ix86_match_ccmode (insn, CCGOCmode)
@@ -6054,7 +6054,7 @@
 	(compare
 	  (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0")
 		   (match_operand:HI 2 "general_operand" "rmni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (clobber (match_scratch:HI 0 "=r"))]
   "ix86_match_ccmode (insn, CCGOCmode)
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
@@ -7483,7 +7483,7 @@
  		(match_operand:DF 2 "nonimmediate_operand" "")))]
    "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
    "")
- 
+
 (define_expand "divsf3"
   [(set (match_operand:SF 0 "register_operand" "")
 	(div:SF (match_operand:SF 1 "register_operand" "")
@@ -8161,7 +8161,7 @@
 	    gcc_assert (INTVAL (operands[2]) == 0xffff);
 	    mode = HImode;
 	  }
-	
+
 	operands[1] = gen_lowpart (mode, operands[1]);
 	if (mode == QImode)
 	  return "movz{bq|x}\t{%1,%0|%0, %1}";
@@ -8226,7 +8226,7 @@
 	    gcc_assert (INTVAL (operands[2]) == 0xffff);
 	    mode = HImode;
 	  }
-	
+
 	operands[1] = gen_lowpart (mode, operands[1]);
 	if (mode == QImode)
 	  return "movz{bl|x}\t{%1,%0|%0, %1}";
@@ -8270,7 +8270,7 @@
   [(parallel [(set (zero_extract:SI (match_dup 0)
 				    (const_int 8)
 				    (const_int 8))
-		   (xor:SI 
+		   (xor:SI
 		     (zero_extract:SI (match_dup 0)
 				      (const_int 8)
 				      (const_int 8))
@@ -8458,7 +8458,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(and:SI 
+	(and:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8487,7 +8487,7 @@
    (set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(and:SI 
+	(and:SI
 	  (zero_extract:SI
 	    (match_dup 1)
 	    (const_int 8)
@@ -8503,7 +8503,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(and:SI 
+	(and:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8521,7 +8521,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(and:SI 
+	(and:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8864,7 +8864,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(ior:SI 
+	(ior:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8881,7 +8881,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(ior:SI 
+	(ior:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8900,7 +8900,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(ior:SI 
+	(ior:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8919,7 +8919,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(ior:SI 
+	(ior:SI
 	  (zero_extract:SI (match_operand 1 "ext_register_operand" "0")
 	  		   (const_int 8)
 			   (const_int 8))
@@ -9202,7 +9202,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -9219,7 +9219,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -9238,7 +9238,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -9257,7 +9257,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI (match_operand 1 "ext_register_operand" "0")
 	  		   (const_int 8)
 			   (const_int 8))
@@ -9325,7 +9325,7 @@
    (set (zero_extract:SI (match_operand 0 "ext_register_operand" "=q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI (match_dup 1) (const_int 8) (const_int 8))
 	  (match_dup 2)))]
   "!TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)"
@@ -9346,7 +9346,7 @@
    (set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI (match_dup 1) (const_int 8) (const_int 8))
 	  (match_dup 2)))]
   "TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)"
@@ -9368,7 +9368,7 @@
      (set (zero_extract:SI (match_operand 0 "ext_register_operand" "")
 			   (const_int 8)
 			   (const_int 8))
-	  (xor:SI 
+	  (xor:SI
 	    (zero_extract:SI (match_dup 1) (const_int 8) (const_int 8))
 	    (match_dup 2)))])]
   ""
@@ -9867,7 +9867,7 @@
   enum machine_mode mode = GET_MODE (operands[0]);
   enum machine_mode vmode = GET_MODE (operands[2]);
   rtx tmp;
-  
+
   operands[0] = simplify_gen_subreg (vmode, operands[0], mode, 0);
   operands[1] = simplify_gen_subreg (vmode, operands[1], mode, 0);
   if (operands_match_p (operands[0], operands[2]))
@@ -9891,7 +9891,7 @@
   "reload_completed"
   [(parallel [(set (match_dup 0) (match_dup 1))
 	      (clobber (reg:CC FLAGS_REG))])]
-{ 
+{
   rtx tmp;
   operands[0] = gen_lowpart (SImode, operands[0]);
   if (GET_CODE (operands[1]) == ABS)
@@ -9998,7 +9998,7 @@
   operands[1] = tmp;
 })
 
-;; Conditionalize these after reload. If they match before reload, we 
+;; Conditionalize these after reload. If they match before reload, we
 ;; lose the clobber and ability to use integer instructions.
 
 (define_insn "*negsf2_1"
@@ -11415,8 +11415,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{q}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:DI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:DI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11448,8 +11448,8 @@
    && ix86_binary_operator_ok (ASHIFTRT, DImode, operands)"
   "sar{q}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:DI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:DI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11628,8 +11628,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{l}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11684,8 +11684,8 @@
    && ix86_binary_operator_ok (ASHIFTRT, SImode, operands)"
   "sar{l}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11785,8 +11785,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{w}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11818,8 +11818,8 @@
    && ix86_binary_operator_ok (ASHIFTRT, HImode, operands)"
   "sar{w}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11888,8 +11888,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{b}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11903,8 +11903,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{b}\t%0"
   [(set_attr "type" "ishift1")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11949,8 +11949,8 @@
    && ix86_binary_operator_ok (ASHIFTRT, QImode, operands)"
   "sar{b}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12042,7 +12042,7 @@
   "#"
   [(set_attr "type" "multi")])
 
-(define_split 
+(define_split
   [(set (match_operand:TI 0 "register_operand" "")
 	(lshiftrt:TI (match_operand:TI 1 "register_operand" "")
 		     (match_operand:QI 2 "register_operand" "")))
@@ -12052,7 +12052,7 @@
   [(const_int 0)]
   "ix86_split_lshr (operands, operands[3], TImode); DONE;")
 
-(define_split 
+(define_split
   [(set (match_operand:TI 0 "register_operand" "")
 	(lshiftrt:TI (match_operand:TI 1 "register_operand" "")
 		     (match_operand:QI 2 "immediate_operand" "")))
@@ -12077,8 +12077,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{q}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:DI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:DI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12110,8 +12110,8 @@
    && ix86_binary_operator_ok (LSHIFTRT, HImode, operands)"
   "shr{q}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:DI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:DI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12186,7 +12186,7 @@
   [(const_int 0)]
   "ix86_split_lshr (operands, operands[3], DImode); DONE;")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
 		     (match_operand:QI 2 "nonmemory_operand" "")))
@@ -12213,8 +12213,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{l}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12270,8 +12270,8 @@
    && ix86_binary_operator_ok (LSHIFTRT, HImode, operands)"
   "shr{l}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12371,8 +12371,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{w}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12404,8 +12404,8 @@
    && ix86_binary_operator_ok (LSHIFTRT, HImode, operands)"
   "shr{w}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12474,8 +12474,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{b}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12488,8 +12488,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "shr{b}\t%0"
   [(set_attr "type" "ishift1")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12534,8 +12534,8 @@
    && ix86_binary_operator_ok (LSHIFTRT, QImode, operands)"
   "shr{b}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12608,7 +12608,7 @@
 })
 
 ;; Implement rotation using two double-precision shift instructions
-;; and a scratch register.   
+;; and a scratch register.
 (define_insn_and_split "ix86_rotldi3"
  [(set (match_operand:DI 0 "register_operand" "=r")
        (rotate:DI (match_operand:DI 1 "register_operand" "0")
@@ -12616,7 +12616,7 @@
   (clobber (reg:CC FLAGS_REG))
   (clobber (match_scratch:SI 3 "=&r"))]
  "!TARGET_64BIT"
- "" 
+ ""
  "&& reload_completed"
  [(set (match_dup 3) (match_dup 4))
   (parallel
@@ -12632,7 +12632,7 @@
                               (minus:QI (const_int 32) (match_dup 2)))))
     (clobber (reg:CC FLAGS_REG))])]
  "split_di (operands, 1, operands + 4, operands + 5);")
- 
+
 (define_insn "*rotlsi3_1_one_bit_rex64"
   [(set (match_operand:DI 0 "nonimmediate_operand" "=rm")
 	(rotate:DI (match_operand:DI 1 "nonimmediate_operand" "0")
@@ -12642,8 +12642,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{q}\t%0"
   [(set_attr "type" "rotate")
-   (set (attr "length") 
-     (if_then_else (match_operand:DI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:DI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12676,8 +12676,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{l}\t%0"
   [(set_attr "type" "rotate")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12735,8 +12735,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{w}\t%0"
   [(set_attr "type" "rotate")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12769,8 +12769,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{b}\t%0"
   [(set_attr "type" "rotate1")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12783,8 +12783,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "rol{b}\t%0"
   [(set_attr "type" "rotate")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12830,9 +12830,9 @@
   emit_insn (gen_ix86_rotrdi3 (operands[0], operands[1], operands[2]));
   DONE;
 })
-  
+
 ;; Implement rotation using two double-precision shift instructions
-;; and a scratch register.   
+;; and a scratch register.
 (define_insn_and_split "ix86_rotrdi3"
  [(set (match_operand:DI 0 "register_operand" "=r")
        (rotatert:DI (match_operand:DI 1 "register_operand" "0")
@@ -12866,8 +12866,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{q}\t%0"
   [(set_attr "type" "rotate")
-   (set (attr "length") 
-     (if_then_else (match_operand:DI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:DI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12900,8 +12900,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{l}\t%0"
   [(set_attr "type" "rotate")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12915,8 +12915,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{l}\t%k0"
   [(set_attr "type" "rotate")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12962,8 +12962,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{w}\t%0"
   [(set_attr "type" "rotate")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -12996,8 +12996,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{b}\t%0"
   [(set_attr "type" "rotate")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -13010,8 +13010,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "ror{b}\t%0"
   [(set_attr "type" "rotate1")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -13378,14 +13378,14 @@
    (set_attr "mode" "QI")])
 
 ;; In general it is not safe to assume too much about CCmode registers,
-;; so simplify-rtx stops when it sees a second one.  Under certain 
+;; so simplify-rtx stops when it sees a second one.  Under certain
 ;; conditions this is safe on x86, so help combine not create
 ;;
 ;;	seta	%al
 ;;	testb	%al, %al
 ;;	sete	%al
 
-(define_split 
+(define_split
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
 	(ne:QI (match_operator 1 "ix86_comparison_operator"
 	         [(reg FLAGS_REG) (const_int 0)])
@@ -13396,7 +13396,7 @@
   PUT_MODE (operands[1], QImode);
 })
 
-(define_split 
+(define_split
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" ""))
 	(ne:QI (match_operator 1 "ix86_comparison_operator"
 	         [(reg FLAGS_REG) (const_int 0)])
@@ -13407,7 +13407,7 @@
   PUT_MODE (operands[1], QImode);
 })
 
-(define_split 
+(define_split
   [(set (match_operand:QI 0 "nonimmediate_operand" "")
 	(eq:QI (match_operator 1 "ix86_comparison_operator"
 	         [(reg FLAGS_REG) (const_int 0)])
@@ -13427,7 +13427,7 @@
     FAIL;
 })
 
-(define_split 
+(define_split
   [(set (strict_low_part (match_operand:QI 0 "nonimmediate_operand" ""))
 	(eq:QI (match_operator 1 "ix86_comparison_operator"
 	         [(reg FLAGS_REG) (const_int 0)])
@@ -13659,14 +13659,14 @@
 	     (const_int 6)))])
 
 ;; In general it is not safe to assume too much about CCmode registers,
-;; so simplify-rtx stops when it sees a second one.  Under certain 
+;; so simplify-rtx stops when it sees a second one.  Under certain
 ;; conditions this is safe on x86, so help combine not create
 ;;
 ;;	seta	%al
 ;;	testb	%al, %al
 ;;	je	Lfoo
 
-(define_split 
+(define_split
   [(set (pc)
 	(if_then_else (ne (match_operator 0 "ix86_comparison_operator"
 				      [(reg FLAGS_REG) (const_int 0)])
@@ -13681,8 +13681,8 @@
 {
   PUT_MODE (operands[0], VOIDmode);
 })
-  
-(define_split 
+
+(define_split
   [(set (pc)
 	(if_then_else (eq (match_operator 0 "ix86_comparison_operator"
 				      [(reg FLAGS_REG) (const_int 0)])
@@ -14157,7 +14157,7 @@
     return "call\t%P0";
 }
   [(set_attr "type" "call")])
-  
+
 (define_insn "*call_pop_1"
   [(call (mem:QI (match_operand:SI 0 "call_insn_operand" "rsm"))
 	 (match_operand:SI 1 "" ""))
@@ -14493,7 +14493,7 @@
 })
 
 (define_insn_and_split "eh_return_si"
-  [(set (pc) 
+  [(set (pc)
         (unspec [(match_operand:SI 0 "register_operand" "c")]
 	         UNSPEC_EH_RETURN))]
   "!TARGET_64BIT"
@@ -14503,7 +14503,7 @@
   "ix86_expand_epilogue (2); DONE;")
 
 (define_insn_and_split "eh_return_di"
-  [(set (pc) 
+  [(set (pc)
         (unspec [(match_operand:DI 0 "register_operand" "c")]
 	         UNSPEC_EH_RETURN))]
   "TARGET_64BIT"
@@ -14530,7 +14530,7 @@
 
 (define_expand "ffssi2"
   [(parallel
-     [(set (match_operand:SI 0 "register_operand" "") 
+     [(set (match_operand:SI 0 "register_operand" "")
 	   (ffs:SI (match_operand:SI 1 "nonimmediate_operand" "")))
       (clobber (match_scratch:SI 2 ""))
       (clobber (reg:CC FLAGS_REG))])]
@@ -14538,7 +14538,7 @@
   "")
 
 (define_insn_and_split "*ffs_cmove"
-  [(set (match_operand:SI 0 "register_operand" "=r") 
+  [(set (match_operand:SI 0 "register_operand" "=r")
 	(ffs:SI (match_operand:SI 1 "nonimmediate_operand" "rm")))
    (clobber (match_scratch:SI 2 "=&r"))
    (clobber (reg:CC FLAGS_REG))]
@@ -14557,7 +14557,7 @@
   "")
 
 (define_insn_and_split "*ffs_no_cmove"
-  [(set (match_operand:SI 0 "nonimmediate_operand" "=r") 
+  [(set (match_operand:SI 0 "nonimmediate_operand" "=r")
 	(ffs:SI (match_operand:SI 1 "nonimmediate_operand" "rm")))
    (clobber (match_scratch:SI 2 "=&q"))
    (clobber (reg:CC FLAGS_REG))]
@@ -14591,7 +14591,7 @@
 
 (define_expand "ffsdi2"
   [(parallel
-     [(set (match_operand:DI 0 "register_operand" "") 
+     [(set (match_operand:DI 0 "register_operand" "")
 	   (ffs:DI (match_operand:DI 1 "nonimmediate_operand" "")))
       (clobber (match_scratch:DI 2 ""))
       (clobber (reg:CC FLAGS_REG))])]
@@ -14599,7 +14599,7 @@
   "")
 
 (define_insn_and_split "*ffs_rex64"
-  [(set (match_operand:DI 0 "register_operand" "=r") 
+  [(set (match_operand:DI 0 "register_operand" "=r")
 	(ffs:DI (match_operand:DI 1 "nonimmediate_operand" "rm")))
    (clobber (match_scratch:DI 2 "=&r"))
    (clobber (reg:CC FLAGS_REG))]
@@ -14718,6 +14718,24 @@
    (set_attr "type" "bitmanip")
    (set_attr "mode" "SI")])
 
+(define_insn "bswapsi2"
+  [(set (match_operand:SI 0 "register_operand" "=r")
+	(bswap:SI (match_operand:SI 1 "register_operand" "0")))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_BSWAP"
+  "bswap\t%k0"
+  [(set_attr "prefix_0f" "1")
+   (set_attr "length" "2")])
+
+(define_insn "bswapdi2"
+  [(set (match_operand:DI 0 "register_operand" "=r")
+	(bswap:DI (match_operand:DI 1 "register_operand" "0")))
+   (clobber (reg:CC FLAGS_REG))]
+  "TARGET_64BIT && TARGET_BSWAP"
+  "bswap\t%0"
+  [(set_attr "prefix_0f" "1")
+   (set_attr "length" "3")])
+
 (define_expand "clzdi2"
   [(parallel
      [(set (match_operand:DI 0 "register_operand" "")
@@ -15231,12 +15249,12 @@
    && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
+  [(set (attr "type")
 	(if_then_else (eq_attr "alternative" "1")
-	   (if_then_else (match_operand:SF 3 "mult_operator" "") 
+	   (if_then_else (match_operand:SF 3 "mult_operator" "")
 	      (const_string "ssemul")
 	      (const_string "sseadd"))
-	   (if_then_else (match_operand:SF 3 "mult_operator" "") 
+	   (if_then_else (match_operand:SF 3 "mult_operator" "")
 	      (const_string "fmul")
 	      (const_string "fop"))))
    (set_attr "mode" "SF")])
@@ -15250,8 +15268,8 @@
    && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (if_then_else (match_operand:SF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (if_then_else (match_operand:SF 3 "mult_operator" "")
 	   (const_string "ssemul")
 	   (const_string "sseadd")))
    (set_attr "mode" "SF")])
@@ -15265,8 +15283,8 @@
    && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-	(if_then_else (match_operand:SF 3 "mult_operator" "") 
+  [(set (attr "type")
+	(if_then_else (match_operand:SF 3 "mult_operator" "")
 	   (const_string "fmul")
 	   (const_string "fop")))
    (set_attr "mode" "SF")])
@@ -15280,7 +15298,7 @@
    && !COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
+  [(set (attr "type")
         (cond [(and (eq_attr "alternative" "2")
 	            (match_operand:SF 3 "mult_operator" ""))
                  (const_string "ssemul")
@@ -15289,9 +15307,9 @@
                  (const_string "ssediv")
 	       (eq_attr "alternative" "2")
                  (const_string "sseadd")
-	       (match_operand:SF 3 "mult_operator" "") 
+	       (match_operand:SF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:SF 3 "div_operator" "") 
+               (match_operand:SF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15305,7 +15323,7 @@
   "TARGET_SSE_MATH
    && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
+  [(set (attr "type")
         (cond [(match_operand:SF 3 "mult_operator" "")
                  (const_string "ssemul")
 	       (match_operand:SF 3 "div_operator" "")
@@ -15324,10 +15342,10 @@
    && !COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:SF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:SF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:SF 3 "div_operator" "") 
+               (match_operand:SF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15341,10 +15359,10 @@
 	   (match_operand:SF 2 "register_operand" "0,0")]))]
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP && !TARGET_SSE_MATH"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:SF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:SF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:SF 3 "div_operator" "") 
+               (match_operand:SF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15358,10 +15376,10 @@
 	   (float:SF (match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r"))]))]
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP && !TARGET_SSE_MATH"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:SF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:SF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:SF 3 "div_operator" "") 
+               (match_operand:SF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15377,12 +15395,12 @@
    && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
+  [(set (attr "type")
 	(if_then_else (eq_attr "alternative" "1")
-	   (if_then_else (match_operand:DF 3 "mult_operator" "") 
+	   (if_then_else (match_operand:DF 3 "mult_operator" "")
 	      (const_string "ssemul")
 	      (const_string "sseadd"))
-	   (if_then_else (match_operand:DF 3 "mult_operator" "") 
+	   (if_then_else (match_operand:DF 3 "mult_operator" "")
 	      (const_string "fmul")
 	      (const_string "fop"))))
    (set_attr "mode" "DF")])
@@ -15396,8 +15414,8 @@
    && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (if_then_else (match_operand:DF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (if_then_else (match_operand:DF 3 "mult_operator" "")
 	   (const_string "ssemul")
 	   (const_string "sseadd")))
    (set_attr "mode" "DF")])
@@ -15411,8 +15429,8 @@
    && COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-	(if_then_else (match_operand:DF 3 "mult_operator" "") 
+  [(set (attr "type")
+	(if_then_else (match_operand:DF 3 "mult_operator" "")
 	   (const_string "fmul")
 	   (const_string "fop")))
    (set_attr "mode" "DF")])
@@ -15426,7 +15444,7 @@
    && !COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
+  [(set (attr "type")
         (cond [(and (eq_attr "alternative" "2")
 	            (match_operand:DF 3 "mult_operator" ""))
                  (const_string "ssemul")
@@ -15435,9 +15453,9 @@
                  (const_string "ssediv")
 	       (eq_attr "alternative" "2")
                  (const_string "sseadd")
-	       (match_operand:DF 3 "mult_operator" "") 
+	       (match_operand:DF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "") 
+               (match_operand:DF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15452,7 +15470,7 @@
    && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
   [(set_attr "mode" "DF")
-   (set (attr "type") 
+   (set (attr "type")
         (cond [(match_operand:DF 3 "mult_operator" "")
                  (const_string "ssemul")
 	       (match_operand:DF 3 "div_operator" "")
@@ -15470,8 +15488,8 @@
    && !COMMUTATIVE_ARITH_P (operands[3])
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:DF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:DF 3 "mult_operator" "")
                  (const_string "fmul")
                (match_operand:DF 3 "div_operator" "")
                  (const_string "fdiv")
@@ -15488,10 +15506,10 @@
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP
    && !(TARGET_SSE2 && TARGET_SSE_MATH)"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:DF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:DF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "") 
+               (match_operand:DF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15506,10 +15524,10 @@
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP
    && !(TARGET_SSE2 && TARGET_SSE_MATH)"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:DF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:DF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "") 
+               (match_operand:DF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15524,10 +15542,10 @@
   "TARGET_80387 && !(TARGET_SSE2 && TARGET_SSE_MATH)
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:DF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:DF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "") 
+               (match_operand:DF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15541,10 +15559,10 @@
 	    (match_operand:SF 2 "nonimmediate_operand" "fm,0"))]))]
   "TARGET_80387 && !(TARGET_SSE2 && TARGET_SSE_MATH)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:DF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:DF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "") 
+               (match_operand:DF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15559,10 +15577,10 @@
 	    (match_operand:SF 2 "nonimmediate_operand" "fm,0"))]))]
   "TARGET_80387 && !(TARGET_SSE2 && TARGET_SSE_MATH)"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:DF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:DF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:DF 3 "div_operator" "") 
+               (match_operand:DF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15576,8 +15594,8 @@
   "TARGET_80387
    && COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (if_then_else (match_operand:XF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (if_then_else (match_operand:XF 3 "mult_operator" "")
            (const_string "fmul")
            (const_string "fop")))
    (set_attr "mode" "XF")])
@@ -15590,10 +15608,10 @@
   "TARGET_80387
    && !COMMUTATIVE_ARITH_P (operands[3])"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:XF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:XF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "") 
+               (match_operand:XF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15606,10 +15624,10 @@
 	    (match_operand:XF 2 "register_operand" "0,0")]))]
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:XF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:XF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "") 
+               (match_operand:XF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15623,10 +15641,10 @@
 	   (float:XF (match_operand:X87MODEI12 2 "nonimmediate_operand" "m,?r"))]))]
   "TARGET_80387 && TARGET_USE_<MODE>MODE_FIOP"
   "* return which_alternative ? \"#\" : output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:XF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:XF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "") 
+               (match_operand:XF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15640,10 +15658,10 @@
 	    (match_operand:XF 2 "register_operand" "0,f")]))]
   "TARGET_80387"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:XF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:XF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "") 
+               (match_operand:XF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15657,10 +15675,10 @@
 	    (match_operand 2 "nonimmediate_operand" "fm,0"))]))]
   "TARGET_80387"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:XF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:XF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "") 
+               (match_operand:XF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15675,10 +15693,10 @@
 	    (match_operand 2 "nonimmediate_operand" "fm,0"))]))]
   "TARGET_80387"
   "* return output_387_binary_op (insn, operands);"
-  [(set (attr "type") 
-        (cond [(match_operand:XF 3 "mult_operator" "") 
+  [(set (attr "type")
+        (cond [(match_operand:XF 3 "mult_operator" "")
                  (const_string "fmul")
-               (match_operand:XF 3 "div_operator" "") 
+               (match_operand:XF 3 "div_operator" "")
                  (const_string "fdiv")
               ]
               (const_string "fop")))
@@ -15692,7 +15710,7 @@
   "TARGET_80387 && reload_completed
    && FLOAT_MODE_P (GET_MODE (operands[0]))"
   [(const_int 0)]
-{ 
+{
   operands[4] = ix86_force_to_memory (GET_MODE (operands[1]), operands[1]);
   operands[4] = gen_rtx_FLOAT (GET_MODE (operands[0]), operands[4]);
   emit_insn (gen_rtx_SET (VOIDmode, operands[0],
@@ -16105,7 +16123,7 @@
    (set_attr "mode" "XF")])
 
 ;; With sincos pattern defined, sin and cos builtin function will be
-;; expanded to sincos pattern with one of its outputs left unused. 
+;; expanded to sincos pattern with one of its outputs left unused.
 ;; Cse pass  will detected, if two sincos patterns can be combined,
 ;; otherwise sincos pattern will be split back to sin or cos pattern,
 ;; depending on the unused output.
@@ -17507,7 +17525,7 @@
   [(set_attr "type" "fpspc")
    (set_attr "mode" "DI")])
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(unspec:DI [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST))
@@ -17519,7 +17537,7 @@
    (set (match_dup 0) (match_dup 2))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "memory_operand" "")
 	(unspec:DI [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST))
@@ -17570,7 +17588,7 @@
   [(set_attr "type" "fpspc")
    (set_attr "mode" "<MODE>")])
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "register_operand" "")
 	(unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST))
@@ -17581,7 +17599,7 @@
    (set (match_dup 0) (match_dup 2))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "memory_operand" "")
 	(unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST))
@@ -17744,7 +17762,7 @@
    (set_attr "i387_cw" "floor")
    (set_attr "mode" "DI")])
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(unspec:DI [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST_FLOOR))
@@ -17760,7 +17778,7 @@
    (set (match_dup 0) (match_dup 4))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "memory_operand" "")
 	(unspec:DI [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST_FLOOR))
@@ -17802,7 +17820,7 @@
    (set_attr "i387_cw" "floor")
    (set_attr "mode" "<MODE>")])
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "register_operand" "")
 	(unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST_FLOOR))
@@ -17817,7 +17835,7 @@
    (set (match_dup 0) (match_dup 4))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "memory_operand" "")
 	(unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST_FLOOR))
@@ -17985,7 +18003,7 @@
    (set_attr "i387_cw" "ceil")
    (set_attr "mode" "DI")])
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(unspec:DI [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST_CEIL))
@@ -18001,7 +18019,7 @@
    (set (match_dup 0) (match_dup 4))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "memory_operand" "")
 	(unspec:DI [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST_CEIL))
@@ -18043,7 +18061,7 @@
    (set_attr "i387_cw" "ceil")
    (set_attr "mode" "<MODE>")])
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "register_operand" "")
 	(unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST_CEIL))
@@ -18058,7 +18076,7 @@
    (set (match_dup 0) (match_dup 4))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "memory_operand" "")
 	(unspec:X87MODEI12 [(match_operand:XF 1 "register_operand" "")]
 	 UNSPEC_FIST_CEIL))
@@ -18452,11 +18470,11 @@
 
 (define_insn "*rep_movdi_rex64"
   [(set (match_operand:DI 2 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D") 
+   (set (match_operand:DI 0 "register_operand" "=D")
         (plus:DI (ashift:DI (match_operand:DI 5 "register_operand" "2")
 			    (const_int 3))
 		 (match_operand:DI 3 "register_operand" "0")))
-   (set (match_operand:DI 1 "register_operand" "=S") 
+   (set (match_operand:DI 1 "register_operand" "=S")
         (plus:DI (ashift:DI (match_dup 5) (const_int 3))
 		 (match_operand:DI 4 "register_operand" "1")))
    (set (mem:BLK (match_dup 3))
@@ -18472,11 +18490,11 @@
 
 (define_insn "*rep_movsi"
   [(set (match_operand:SI 2 "register_operand" "=c") (const_int 0))
-   (set (match_operand:SI 0 "register_operand" "=D") 
+   (set (match_operand:SI 0 "register_operand" "=D")
         (plus:SI (ashift:SI (match_operand:SI 5 "register_operand" "2")
 			    (const_int 2))
 		 (match_operand:SI 3 "register_operand" "0")))
-   (set (match_operand:SI 1 "register_operand" "=S") 
+   (set (match_operand:SI 1 "register_operand" "=S")
         (plus:SI (ashift:SI (match_dup 5) (const_int 2))
 		 (match_operand:SI 4 "register_operand" "1")))
    (set (mem:BLK (match_dup 3))
@@ -18492,11 +18510,11 @@
 
 (define_insn "*rep_movsi_rex64"
   [(set (match_operand:DI 2 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D") 
+   (set (match_operand:DI 0 "register_operand" "=D")
         (plus:DI (ashift:DI (match_operand:DI 5 "register_operand" "2")
 			    (const_int 2))
 		 (match_operand:DI 3 "register_operand" "0")))
-   (set (match_operand:DI 1 "register_operand" "=S") 
+   (set (match_operand:DI 1 "register_operand" "=S")
         (plus:DI (ashift:DI (match_dup 5) (const_int 2))
 		 (match_operand:DI 4 "register_operand" "1")))
    (set (mem:BLK (match_dup 3))
@@ -18512,10 +18530,10 @@
 
 (define_insn "*rep_movqi"
   [(set (match_operand:SI 2 "register_operand" "=c") (const_int 0))
-   (set (match_operand:SI 0 "register_operand" "=D") 
+   (set (match_operand:SI 0 "register_operand" "=D")
         (plus:SI (match_operand:SI 3 "register_operand" "0")
 		 (match_operand:SI 5 "register_operand" "2")))
-   (set (match_operand:SI 1 "register_operand" "=S") 
+   (set (match_operand:SI 1 "register_operand" "=S")
         (plus:SI (match_operand:SI 4 "register_operand" "1") (match_dup 5)))
    (set (mem:BLK (match_dup 3))
 	(mem:BLK (match_dup 4)))
@@ -18530,10 +18548,10 @@
 
 (define_insn "*rep_movqi_rex64"
   [(set (match_operand:DI 2 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D") 
+   (set (match_operand:DI 0 "register_operand" "=D")
         (plus:DI (match_operand:DI 3 "register_operand" "0")
 		 (match_operand:DI 5 "register_operand" "2")))
-   (set (match_operand:DI 1 "register_operand" "=S") 
+   (set (match_operand:DI 1 "register_operand" "=S")
         (plus:DI (match_operand:DI 4 "register_operand" "1") (match_dup 5)))
    (set (mem:BLK (match_dup 3))
 	(mem:BLK (match_dup 4)))
@@ -18720,7 +18738,7 @@
 
 (define_insn "*rep_stosdi_rex64"
   [(set (match_operand:DI 1 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D") 
+   (set (match_operand:DI 0 "register_operand" "=D")
         (plus:DI (ashift:DI (match_operand:DI 4 "register_operand" "1")
 			    (const_int 3))
 		 (match_operand:DI 3 "register_operand" "0")))
@@ -18738,7 +18756,7 @@
 
 (define_insn "*rep_stossi"
   [(set (match_operand:SI 1 "register_operand" "=c") (const_int 0))
-   (set (match_operand:SI 0 "register_operand" "=D") 
+   (set (match_operand:SI 0 "register_operand" "=D")
         (plus:SI (ashift:SI (match_operand:SI 4 "register_operand" "1")
 			    (const_int 2))
 		 (match_operand:SI 3 "register_operand" "0")))
@@ -18756,7 +18774,7 @@
 
 (define_insn "*rep_stossi_rex64"
   [(set (match_operand:DI 1 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D") 
+   (set (match_operand:DI 0 "register_operand" "=D")
         (plus:DI (ashift:DI (match_operand:DI 4 "register_operand" "1")
 			    (const_int 2))
 		 (match_operand:DI 3 "register_operand" "0")))
@@ -18774,7 +18792,7 @@
 
 (define_insn "*rep_stosqi"
   [(set (match_operand:SI 1 "register_operand" "=c") (const_int 0))
-   (set (match_operand:SI 0 "register_operand" "=D") 
+   (set (match_operand:SI 0 "register_operand" "=D")
         (plus:SI (match_operand:SI 3 "register_operand" "0")
 		 (match_operand:SI 4 "register_operand" "1")))
    (set (mem:BLK (match_dup 3))
@@ -18791,7 +18809,7 @@
 
 (define_insn "*rep_stosqi_rex64"
   [(set (match_operand:DI 1 "register_operand" "=c") (const_int 0))
-   (set (match_operand:DI 0 "register_operand" "=D") 
+   (set (match_operand:DI 0 "register_operand" "=D")
         (plus:DI (match_operand:DI 3 "register_operand" "0")
 		 (match_operand:DI 4 "register_operand" "1")))
    (set (mem:BLK (match_dup 3))
@@ -19167,7 +19185,7 @@
 
 (define_insn "*movdicc_c_rex64"
   [(set (match_operand:DI 0 "register_operand" "=r,r")
-	(if_then_else:DI (match_operator 1 "ix86_comparison_operator" 
+	(if_then_else:DI (match_operator 1 "ix86_comparison_operator"
 				[(reg FLAGS_REG) (const_int 0)])
 		      (match_operand:DI 2 "nonimmediate_operand" "rm,0")
 		      (match_operand:DI 3 "nonimmediate_operand" "0,rm")))]
@@ -19210,7 +19228,7 @@
 
 (define_insn "*movsicc_noc"
   [(set (match_operand:SI 0 "register_operand" "=r,r")
-	(if_then_else:SI (match_operator 1 "ix86_comparison_operator" 
+	(if_then_else:SI (match_operator 1 "ix86_comparison_operator"
 				[(reg FLAGS_REG) (const_int 0)])
 		      (match_operand:SI 2 "nonimmediate_operand" "rm,0")
 		      (match_operand:SI 3 "nonimmediate_operand" "0,rm")))]
@@ -19232,7 +19250,7 @@
 
 (define_insn "*movhicc_noc"
   [(set (match_operand:HI 0 "register_operand" "=r,r")
-	(if_then_else:HI (match_operator 1 "ix86_comparison_operator" 
+	(if_then_else:HI (match_operator 1 "ix86_comparison_operator"
 				[(reg FLAGS_REG) (const_int 0)])
 		      (match_operand:HI 2 "nonimmediate_operand" "rm,0")
 		      (match_operand:HI 3 "nonimmediate_operand" "0,rm")))]
@@ -19254,7 +19272,7 @@
 
 (define_insn_and_split "*movqicc_noc"
   [(set (match_operand:QI 0 "register_operand" "=r,r")
-	(if_then_else:QI (match_operator 1 "ix86_comparison_operator" 
+	(if_then_else:QI (match_operator 1 "ix86_comparison_operator"
 				[(match_operand 4 "flags_reg_operand" "")
 				 (const_int 0)])
 		      (match_operand:QI 2 "register_operand" "r,0")
@@ -19282,7 +19300,7 @@
 
 (define_insn "*movsfcc_1_387"
   [(set (match_operand:SF 0 "register_operand" "=f,f,r,r")
-	(if_then_else:SF (match_operator 1 "fcmov_comparison_operator" 
+	(if_then_else:SF (match_operator 1 "fcmov_comparison_operator"
 				[(reg FLAGS_REG) (const_int 0)])
 		      (match_operand:SF 2 "nonimmediate_operand" "f,0,rm,0")
 		      (match_operand:SF 3 "nonimmediate_operand" "0,f,0,rm")))]
@@ -19306,7 +19324,7 @@
 
 (define_insn "*movdfcc_1"
   [(set (match_operand:DF 0 "register_operand" "=f,f,&r,&r")
-	(if_then_else:DF (match_operator 1 "fcmov_comparison_operator" 
+	(if_then_else:DF (match_operator 1 "fcmov_comparison_operator"
 				[(reg FLAGS_REG) (const_int 0)])
 		      (match_operand:DF 2 "nonimmediate_operand" "f,0,rm,0")
 		      (match_operand:DF 3 "nonimmediate_operand" "0,f,0,rm")))]
@@ -19322,7 +19340,7 @@
 
 (define_insn "*movdfcc_1_rex64"
   [(set (match_operand:DF 0 "register_operand" "=f,f,r,r")
-	(if_then_else:DF (match_operator 1 "fcmov_comparison_operator" 
+	(if_then_else:DF (match_operator 1 "fcmov_comparison_operator"
 				[(reg FLAGS_REG) (const_int 0)])
 		      (match_operand:DF 2 "nonimmediate_operand" "f,0,rm,0")
 		      (match_operand:DF 3 "nonimmediate_operand" "0,f,0,rm")))]
@@ -19338,7 +19356,7 @@
 
 (define_split
   [(set (match_operand:DF 0 "register_and_not_any_fp_reg_operand" "")
-	(if_then_else:DF (match_operator 1 "fcmov_comparison_operator" 
+	(if_then_else:DF (match_operator 1 "fcmov_comparison_operator"
 				[(match_operand 4 "flags_reg_operand" "")
 				 (const_int 0)])
 		      (match_operand:DF 2 "nonimmediate_operand" "")
@@ -19366,7 +19384,7 @@
 
 (define_insn "*movxfcc_1"
   [(set (match_operand:XF 0 "register_operand" "=f,f")
-	(if_then_else:XF (match_operator 1 "fcmov_comparison_operator" 
+	(if_then_else:XF (match_operator 1 "fcmov_comparison_operator"
 				[(reg FLAGS_REG) (const_int 0)])
 		      (match_operand:XF 2 "register_operand" "f,0")
 		      (match_operand:XF 3 "register_operand" "0,f")))]
@@ -19528,7 +19546,7 @@
 
 ;; This pattern exists to put a dependency on all ebp-based memory accesses.
 ;; Otherwise there will be nothing to keep
-;; 
+;;
 ;; [(set (reg ebp) (reg esp))]
 ;; [(set (reg esp) (plus (reg esp) (const_int -160000)))
 ;;  (clobber (eflags)]
@@ -19720,7 +19738,7 @@
       && INTVAL (operands[1]) < CHECK_STACK_LIMIT)
     emit_insn (gen_subsi3 (stack_pointer_rtx, stack_pointer_rtx,
 			   operands[1]));
-  else 
+  else
 #endif
     emit_insn (gen_allocate_stack_worker (copy_to_mode_reg (SImode,
 							    operands[1])));
@@ -19760,12 +19778,12 @@
 	    (match_operand 2 "aligned_operand" "")]))
    (clobber (reg:CC FLAGS_REG))]
   "! TARGET_PARTIAL_REG_STALL && reload_completed
-   && ((GET_MODE (operands[0]) == HImode 
+   && ((GET_MODE (operands[0]) == HImode
 	&& ((!optimize_size && !TARGET_FAST_PREFIX)
             /* ??? next two lines just !satisfies_constraint_K (...) */
 	    || GET_CODE (operands[2]) != CONST_INT
 	    || satisfies_constraint_K (operands[2])))
-       || (GET_MODE (operands[0]) == QImode 
+       || (GET_MODE (operands[0]) == QImode
 	   && (TARGET_PROMOTE_QImode || optimize_size)))"
   [(parallel [(set (match_dup 0)
 		   (match_op_dup 3 [(match_dup 1) (match_dup 2)]))
@@ -19838,7 +19856,7 @@
    (clobber (reg:CC FLAGS_REG))]
   "! TARGET_PARTIAL_REG_STALL && reload_completed
    && (GET_MODE (operands[0]) == HImode
-       || (GET_MODE (operands[0]) == QImode 
+       || (GET_MODE (operands[0]) == QImode
 	   && (TARGET_PROMOTE_QImode || optimize_size)))"
   [(parallel [(set (match_dup 0)
 		   (neg:SI (match_dup 1)))
@@ -19851,29 +19869,29 @@
 	(not (match_operand 1 "register_operand" "")))]
   "! TARGET_PARTIAL_REG_STALL && reload_completed
    && (GET_MODE (operands[0]) == HImode
-       || (GET_MODE (operands[0]) == QImode 
+       || (GET_MODE (operands[0]) == QImode
 	   && (TARGET_PROMOTE_QImode || optimize_size)))"
   [(set (match_dup 0)
 	(not:SI (match_dup 1)))]
   "operands[0] = gen_lowpart (SImode, operands[0]);
    operands[1] = gen_lowpart (SImode, operands[1]);")
 
-(define_split 
+(define_split
   [(set (match_operand 0 "register_operand" "")
-	(if_then_else (match_operator 1 "comparison_operator" 
+	(if_then_else (match_operator 1 "comparison_operator"
 				[(reg FLAGS_REG) (const_int 0)])
 		      (match_operand 2 "register_operand" "")
 		      (match_operand 3 "register_operand" "")))]
   "! TARGET_PARTIAL_REG_STALL && TARGET_CMOVE
    && (GET_MODE (operands[0]) == HImode
-       || (GET_MODE (operands[0]) == QImode 
+       || (GET_MODE (operands[0]) == QImode
 	   && (TARGET_PROMOTE_QImode || optimize_size)))"
   [(set (match_dup 0)
 	(if_then_else:SI (match_dup 1) (match_dup 2) (match_dup 3)))]
   "operands[0] = gen_lowpart (SImode, operands[0]);
    operands[2] = gen_lowpart (SImode, operands[2]);
    operands[3] = gen_lowpart (SImode, operands[3]);")
-			
+
 
 ;; RTL Peephole optimizations, run before sched2.  These primarily look to
 ;; transform a complex memory operation into two memory to register operations.
@@ -20018,7 +20036,7 @@
    (set (match_dup 0) (match_op_dup 1 [(match_dup 3) (const_int 0)]))]
   "")
 
-;; NOT is not pairable on Pentium, while XOR is, but one byte longer. 
+;; NOT is not pairable on Pentium, while XOR is, but one byte longer.
 ;; Don't split NOTs with a displacement operand, because resulting XOR
 ;; will not be pairable anyway.
 ;;
@@ -20034,7 +20052,7 @@
 	(not:SI (match_operand:SI 1 "nonimmediate_operand" "")))]
   "!optimize_size
    && peep2_regno_dead_p (0, FLAGS_REG)
-   && ((TARGET_PENTIUM 
+   && ((TARGET_PENTIUM
         && (GET_CODE (operands[0]) != MEM
             || !memory_displacement_operand (operands[0], SImode)))
        || (TARGET_K6 && long_memory_operand (operands[0], SImode)))"
@@ -20048,7 +20066,7 @@
 	(not:HI (match_operand:HI 1 "nonimmediate_operand" "")))]
   "!optimize_size
    && peep2_regno_dead_p (0, FLAGS_REG)
-   && ((TARGET_PENTIUM 
+   && ((TARGET_PENTIUM
         && (GET_CODE (operands[0]) != MEM
             || !memory_displacement_operand (operands[0], HImode)))
        || (TARGET_K6 && long_memory_operand (operands[0], HImode)))"
@@ -20062,7 +20080,7 @@
 	(not:QI (match_operand:QI 1 "nonimmediate_operand" "")))]
   "!optimize_size
    && peep2_regno_dead_p (0, FLAGS_REG)
-   && ((TARGET_PENTIUM 
+   && ((TARGET_PENTIUM
         && (GET_CODE (operands[0]) != MEM
             || !memory_displacement_operand (operands[0], QImode)))
        || (TARGET_K6 && long_memory_operand (operands[0], QImode)))"
@@ -20143,7 +20161,7 @@
 	      (set (zero_extract:SI (match_dup 2)
 				    (const_int 8)
 				    (const_int 8))
-		   (and:SI 
+		   (and:SI
 		     (zero_extract:SI
 		       (match_dup 2)
 		       (const_int 8)
@@ -20245,7 +20263,7 @@
   [(set (match_operand 0 "register_operand" "")
 	(const_int -1))]
   "(GET_MODE (operands[0]) == HImode
-    || GET_MODE (operands[0]) == SImode 
+    || GET_MODE (operands[0]) == SImode
     || (GET_MODE (operands[0]) == DImode && TARGET_64BIT))
    && (optimize_size || TARGET_PENTIUM)
    && peep2_regno_dead_p (0, FLAGS_REG)"
@@ -20601,7 +20619,7 @@
           (mult:SI (match_operand:SI 1 "nonimmediate_operand" "")
                    (match_operand:SI 2 "const_int_operand" "")))
      (clobber (reg:CC FLAGS_REG))])]
-  "!optimize_size 
+  "!optimize_size
    && (INTVAL (operands[2]) == 3
        || INTVAL (operands[2]) == 5
        || INTVAL (operands[2]) == 9)"
@@ -20633,7 +20651,7 @@
                    (match_operand:DI 2 "const_int_operand" "")))
      (clobber (reg:CC FLAGS_REG))])]
   "TARGET_64BIT
-   && !optimize_size 
+   && !optimize_size
    && (INTVAL (operands[2]) == 3
        || INTVAL (operands[2]) == 5
        || INTVAL (operands[2]) == 9)"
@@ -20764,7 +20782,7 @@
    && ((!TARGET_PARTIAL_REG_STALL
 	&& (GET_MODE (operands[0]) == QImode
 	    || GET_MODE (operands[0]) == HImode))
-       || GET_MODE (operands[0]) == SImode 
+       || GET_MODE (operands[0]) == SImode
        || (TARGET_64BIT && GET_MODE (operands[0]) == DImode))
    /* We reorder load and the shift.  */
    && !rtx_equal_p (operands[1], operands[3])
@@ -20913,7 +20931,7 @@
   [(set_attr "type" "callv")])
 
 ;; We used to use "int $5", in honor of #BR which maps to interrupt vector 5.
-;; That, however, is usually mapped by the OS to SIGSEGV, which is often 
+;; That, however, is usually mapped by the OS to SIGSEGV, which is often
 ;; caught for use by garbage collectors and the like.  Using an insn that
 ;; maps to SIGILL makes it more likely the program will rightfully die.
 ;; Keeping with tradition, "6" is in honor of #UD.
@@ -21021,7 +21039,7 @@
   int locality = INTVAL (operands[1]);
   gcc_assert (locality >= 0 && locality <= 3);
 
-  return patterns[locality];  
+  return patterns[locality];
 }
   [(set_attr "type" "sse")
    (set_attr "memory" "none")])
@@ -21039,7 +21057,7 @@
   int locality = INTVAL (operands[1]);
   gcc_assert (locality >= 0 && locality <= 3);
 
-  return patterns[locality];  
+  return patterns[locality];
 }
   [(set_attr "type" "sse")
    (set_attr "memory" "none")])
diff --git a/contrib/gcc/config/i386/nto.h b/contrib/gcc/config/i386/nto.h
index 1095a631319..42ae5563d67 100644
--- a/contrib/gcc/config/i386/nto.h
+++ b/contrib/gcc/config/i386/nto.h
@@ -43,7 +43,7 @@ Boston, MA 02110-1301, USA.  */
 #undef THREAD_MODEL_SPEC
 #define THREAD_MODEL_SPEC "posix"
 
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 #define SYSROOT_SUFFIX_SPEC "x86"
 #endif
 
diff --git a/contrib/gcc/config/rs6000/aix.h b/contrib/gcc/config/rs6000/aix.h
index 57f487664a9..242bd024177 100644
--- a/contrib/gcc/config/rs6000/aix.h
+++ b/contrib/gcc/config/rs6000/aix.h
@@ -124,14 +124,14 @@
 /* #define ASM_SPEC "-u %(asm_cpu)" */
 
 /* Default location of syscalls.exp under AIX */
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #define LINK_SYSCALLS_SPEC "-bI:/lib/syscalls.exp"
 #else
 #define LINK_SYSCALLS_SPEC ""
 #endif
 
 /* Default location of libg.exp under AIX */
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #define LINK_LIBG_SPEC "-bexport:/usr/lib/libg.exp"
 #else
 #define LINK_LIBG_SPEC ""
diff --git a/contrib/gcc/config/rs6000/altivec.h b/contrib/gcc/config/rs6000/altivec.h
index dacb6d0b744..dc9cb83dd78 100644
--- a/contrib/gcc/config/rs6000/altivec.h
+++ b/contrib/gcc/config/rs6000/altivec.h
@@ -332,7 +332,7 @@ NAME (T a1, U a2) \
 __altivec_binary_pred(vec_cmplt,
   __builtin_vec_cmpgt (a2, a1))
 __altivec_binary_pred(vec_cmple,
-  __builtin_altivec_cmpge (a2, a1))
+  __builtin_vec_cmpge (a2, a1))
 
 __altivec_scalar_pred(vec_all_in,
   __builtin_altivec_vcmpbfp_p (__CR6_EQ, a1, a2))
@@ -402,7 +402,7 @@ __altivec_scalar_pred(vec_any_nle,
 #undef __altivec_binary_pred
 #else
 #define vec_cmplt(a1, a2) __builtin_vec_cmpgt ((a2), (a1))
-#define vec_cmple(a1, a2) __builtin_altivec_vcmpgefp ((a2), (a1))
+#define vec_cmple(a1, a2) __builtin_vec_cmpge ((a2), (a1))
 
 #define vec_all_in(a1, a2) __builtin_altivec_vcmpbfp_p (__CR6_EQ, (a1), (a2))
 #define vec_any_out(a1, a2) __builtin_altivec_vcmpbfp_p (__CR6_EQ_REV, (a1), (a2))
diff --git a/contrib/gcc/config/rs6000/rs6000-c.c b/contrib/gcc/config/rs6000/rs6000-c.c
index 5c6abd10b17..5be9cf3911a 100644
--- a/contrib/gcc/config/rs6000/rs6000-c.c
+++ b/contrib/gcc/config/rs6000/rs6000-c.c
@@ -222,17 +222,17 @@ const struct altivec_builtin_types altivec_overloaded_builtins[] = {
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHSB,
     RS6000_BTI_V8HI, RS6000_BTI_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHSB,
-    RS6000_BTI_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHSH,
     RS6000_BTI_V4SI, RS6000_BTI_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHSH,
-    RS6000_BTI_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKH, ALTIVEC_BUILTIN_VUPKHPX,
     RS6000_BTI_unsigned_V4SI, RS6000_BTI_pixel_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHSH, ALTIVEC_BUILTIN_VUPKHSH,
     RS6000_BTI_V4SI, RS6000_BTI_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHSH, ALTIVEC_BUILTIN_VUPKHSH,
-    RS6000_BTI_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHPX, ALTIVEC_BUILTIN_VUPKHPX,
     RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHPX, ALTIVEC_BUILTIN_VUPKHPX,
@@ -240,17 +240,17 @@ const struct altivec_builtin_types altivec_overloaded_builtins[] = {
   { ALTIVEC_BUILTIN_VEC_VUPKHSB, ALTIVEC_BUILTIN_VUPKHSB,
     RS6000_BTI_V8HI, RS6000_BTI_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKHSB, ALTIVEC_BUILTIN_VUPKHSB,
-    RS6000_BTI_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLSB,
     RS6000_BTI_V8HI, RS6000_BTI_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLSB,
-    RS6000_BTI_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLPX,
     RS6000_BTI_unsigned_V4SI, RS6000_BTI_pixel_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLSH,
     RS6000_BTI_V4SI, RS6000_BTI_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_UNPACKL, ALTIVEC_BUILTIN_VUPKLSH,
-    RS6000_BTI_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLPX, ALTIVEC_BUILTIN_VUPKLPX,
     RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLPX, ALTIVEC_BUILTIN_VUPKLPX,
@@ -258,11 +258,11 @@ const struct altivec_builtin_types altivec_overloaded_builtins[] = {
   { ALTIVEC_BUILTIN_VEC_VUPKLSH, ALTIVEC_BUILTIN_VUPKLSH,
     RS6000_BTI_V4SI, RS6000_BTI_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLSH, ALTIVEC_BUILTIN_VUPKLSH,
-    RS6000_BTI_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_bool_V8HI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLSB, ALTIVEC_BUILTIN_VUPKLSB,
     RS6000_BTI_V8HI, RS6000_BTI_V16QI, 0, 0 },
   { ALTIVEC_BUILTIN_VEC_VUPKLSB, ALTIVEC_BUILTIN_VUPKLSB,
-    RS6000_BTI_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_bool_V16QI, 0, 0 },
 
   /* Binary AltiVec builtins.  */
   { ALTIVEC_BUILTIN_VEC_ADD, ALTIVEC_BUILTIN_VADDUBM,
@@ -576,31 +576,23 @@ const struct altivec_builtin_types altivec_overloaded_builtins[] = {
   { ALTIVEC_BUILTIN_VEC_CMPEQ, ALTIVEC_BUILTIN_VCMPEQFP,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPEQFP, ALTIVEC_BUILTIN_VCMPEQFP,
-    RS6000_BTI_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUW, ALTIVEC_BUILTIN_VCMPEQUW,
-    RS6000_BTI_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUW, ALTIVEC_BUILTIN_VCMPEQUW,
-    RS6000_BTI_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
+
   { ALTIVEC_BUILTIN_VEC_VCMPEQUW, ALTIVEC_BUILTIN_VCMPEQUW,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPEQUW, ALTIVEC_BUILTIN_VCMPEQUW,
     RS6000_BTI_bool_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUH, ALTIVEC_BUILTIN_VCMPEQUH,
-    RS6000_BTI_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUH, ALTIVEC_BUILTIN_VCMPEQUH,
-    RS6000_BTI_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
+
   { ALTIVEC_BUILTIN_VEC_VCMPEQUH, ALTIVEC_BUILTIN_VCMPEQUH,
     RS6000_BTI_bool_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPEQUH, ALTIVEC_BUILTIN_VCMPEQUH,
     RS6000_BTI_bool_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUB, ALTIVEC_BUILTIN_VCMPEQUB,
-    RS6000_BTI_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
-  { ALTIVEC_BUILTIN_VEC_VCMPEQUB, ALTIVEC_BUILTIN_VCMPEQUB,
-    RS6000_BTI_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
+
   { ALTIVEC_BUILTIN_VEC_VCMPEQUB, ALTIVEC_BUILTIN_VCMPEQUB,
     RS6000_BTI_bool_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPEQUB, ALTIVEC_BUILTIN_VCMPEQUB,
     RS6000_BTI_bool_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
+
   { ALTIVEC_BUILTIN_VEC_CMPGE, ALTIVEC_BUILTIN_VCMPGEFP,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
   { ALTIVEC_BUILTIN_VEC_CMPGT, ALTIVEC_BUILTIN_VCMPGTUB,
@@ -618,29 +610,29 @@ const struct altivec_builtin_types altivec_overloaded_builtins[] = {
   { ALTIVEC_BUILTIN_VEC_CMPGT, ALTIVEC_BUILTIN_VCMPGTFP,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTFP, ALTIVEC_BUILTIN_VCMPGTFP,
-    RS6000_BTI_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_V4SF, RS6000_BTI_V4SF, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSW, ALTIVEC_BUILTIN_VCMPGTSW,
-    RS6000_BTI_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSW, ALTIVEC_BUILTIN_VCMPGTSW,
     RS6000_BTI_bool_V4SI, RS6000_BTI_V4SI, RS6000_BTI_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUW, ALTIVEC_BUILTIN_VCMPGTUW,
-    RS6000_BTI_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
+    RS6000_BTI_bool_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUW, ALTIVEC_BUILTIN_VCMPGTUW,
     RS6000_BTI_bool_V4SI, RS6000_BTI_unsigned_V4SI, RS6000_BTI_unsigned_V4SI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSH, ALTIVEC_BUILTIN_VCMPGTSH,
-    RS6000_BTI_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSH, ALTIVEC_BUILTIN_VCMPGTSH,
     RS6000_BTI_bool_V8HI, RS6000_BTI_V8HI, RS6000_BTI_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUH, ALTIVEC_BUILTIN_VCMPGTUH,
-    RS6000_BTI_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
+    RS6000_BTI_bool_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUH, ALTIVEC_BUILTIN_VCMPGTUH,
     RS6000_BTI_bool_V8HI, RS6000_BTI_unsigned_V8HI, RS6000_BTI_unsigned_V8HI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSB, ALTIVEC_BUILTIN_VCMPGTSB,
-    RS6000_BTI_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
+    RS6000_BTI_bool_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTSB, ALTIVEC_BUILTIN_VCMPGTSB,
     RS6000_BTI_bool_V16QI, RS6000_BTI_V16QI, RS6000_BTI_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUB, ALTIVEC_BUILTIN_VCMPGTUB,
-    RS6000_BTI_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
+    RS6000_BTI_bool_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_VCMPGTUB, ALTIVEC_BUILTIN_VCMPGTUB,
     RS6000_BTI_bool_V16QI, RS6000_BTI_unsigned_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
   { ALTIVEC_BUILTIN_VEC_CMPLE, ALTIVEC_BUILTIN_VCMPGEFP,
diff --git a/contrib/gcc/config/rs6000/rs6000.c b/contrib/gcc/config/rs6000/rs6000.c
index c7efad5d198..287902f0b01 100644
--- a/contrib/gcc/config/rs6000/rs6000.c
+++ b/contrib/gcc/config/rs6000/rs6000.c
@@ -1171,11 +1171,9 @@ rs6000_override_options (const char *default_cpu)
 	 {"801", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
 	 {"821", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
 	 {"823", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
-	 {"8540", PROCESSOR_PPC8540,
-	  POWERPC_BASE_MASK | MASK_PPC_GFXOPT | MASK_STRICT_ALIGN},
+	 {"8540", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN},
 	 /* 8548 has a dummy entry for now.  */
-	 {"8548", PROCESSOR_PPC8540,
-	  POWERPC_BASE_MASK | MASK_PPC_GFXOPT | MASK_STRICT_ALIGN},
+	 {"8548", PROCESSOR_PPC8540, POWERPC_BASE_MASK | MASK_STRICT_ALIGN},
 	 {"860", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
 	 {"970", PROCESSOR_POWER4,
 	  POWERPC_7400_MASK | MASK_PPC_GPOPT | MASK_MFCRF | MASK_POWERPC64},
@@ -14468,77 +14466,6 @@ rs6000_emit_prologue (void)
       sp_offset = info->total_size;
     }
 
-  /* Save AltiVec registers if needed.  */
-  if (!WORLD_SAVE_P (info) && TARGET_ALTIVEC_ABI && info->altivec_size != 0)
-    {
-      int i;
-
-      /* There should be a non inline version of this, for when we
-	 are saving lots of vector registers.  */
-      for (i = info->first_altivec_reg_save; i <= LAST_ALTIVEC_REGNO; ++i)
-	if (info->vrsave_mask & ALTIVEC_REG_BIT (i))
-	  {
-	    rtx areg, savereg, mem;
-	    int offset;
-
-	    offset = info->altivec_save_offset + sp_offset
-	      + 16 * (i - info->first_altivec_reg_save);
-
-	    savereg = gen_rtx_REG (V4SImode, i);
-
-	    areg = gen_rtx_REG (Pmode, 0);
-	    emit_move_insn (areg, GEN_INT (offset));
-
-	    /* AltiVec addressing mode is [reg+reg].  */
-	    mem = gen_frame_mem (V4SImode,
-				 gen_rtx_PLUS (Pmode, frame_reg_rtx, areg));
-
-	    insn = emit_move_insn (mem, savereg);
-
-	    rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
-				  areg, GEN_INT (offset));
-	  }
-    }
-
-  /* VRSAVE is a bit vector representing which AltiVec registers
-     are used.  The OS uses this to determine which vector
-     registers to save on a context switch.  We need to save
-     VRSAVE on the stack frame, add whatever AltiVec registers we
-     used in this function, and do the corresponding magic in the
-     epilogue.  */
-
-  if (TARGET_ALTIVEC && TARGET_ALTIVEC_VRSAVE
-      && info->vrsave_mask != 0)
-    {
-      rtx reg, mem, vrsave;
-      int offset;
-
-      /* Get VRSAVE onto a GPR.  Note that ABI_V4 might be using r12
-	 as frame_reg_rtx and r11 as the static chain pointer for
-	 nested functions.  */
-      reg = gen_rtx_REG (SImode, 0);
-      vrsave = gen_rtx_REG (SImode, VRSAVE_REGNO);
-      if (TARGET_MACHO)
-	emit_insn (gen_get_vrsave_internal (reg));
-      else
-	emit_insn (gen_rtx_SET (VOIDmode, reg, vrsave));
-
-      if (!WORLD_SAVE_P (info))
-	{
-          /* Save VRSAVE.  */
-          offset = info->vrsave_save_offset + sp_offset;
-          mem = gen_frame_mem (SImode,
-			       gen_rtx_PLUS (Pmode, frame_reg_rtx,
-					     GEN_INT (offset)));
-          insn = emit_move_insn (mem, reg);
-	}
-
-      /* Include the registers in the mask.  */
-      emit_insn (gen_iorsi3 (reg, reg, GEN_INT ((int) info->vrsave_mask)));
-
-      insn = emit_insn (generate_set_vrsave (reg, info, 0));
-    }
-
   /* If we use the link register, get it into r0.  */
   if (!WORLD_SAVE_P (info) && info->lr_save_p)
     {
@@ -14776,7 +14703,19 @@ rs6000_emit_prologue (void)
      for which it was done previously.  */
   if (!WORLD_SAVE_P (info) && info->push_p
       && !(DEFAULT_ABI == ABI_V4 || current_function_calls_eh_return))
-    rs6000_emit_allocate_stack (info->total_size, FALSE);
+    {
+      if (info->total_size < 32767)
+      sp_offset = info->total_size;
+      else
+	frame_reg_rtx = frame_ptr_rtx;
+      rs6000_emit_allocate_stack (info->total_size,
+				  (frame_reg_rtx != sp_reg_rtx
+				   && ((info->altivec_size != 0)
+				       || (info->vrsave_mask != 0)
+				       )));
+      if (frame_reg_rtx != sp_reg_rtx)
+	rs6000_emit_stack_tie ();
+    }
 
   /* Set frame pointer, if needed.  */
   if (frame_pointer_needed)
@@ -14786,6 +14725,78 @@ rs6000_emit_prologue (void)
       RTX_FRAME_RELATED_P (insn) = 1;
     }
 
+  /* Save AltiVec registers if needed.  Save here because the red zone does
+     not include AltiVec registers.  */
+  if (!WORLD_SAVE_P (info) && TARGET_ALTIVEC_ABI && info->altivec_size != 0)
+    {
+      int i;
+
+      /* There should be a non inline version of this, for when we
+         are saving lots of vector registers.  */
+      for (i = info->first_altivec_reg_save; i <= LAST_ALTIVEC_REGNO; ++i)
+        if (info->vrsave_mask & ALTIVEC_REG_BIT (i))
+          {
+            rtx areg, savereg, mem;
+            int offset;
+
+            offset = info->altivec_save_offset + sp_offset
+              + 16 * (i - info->first_altivec_reg_save);
+
+            savereg = gen_rtx_REG (V4SImode, i);
+
+            areg = gen_rtx_REG (Pmode, 0);
+            emit_move_insn (areg, GEN_INT (offset));
+
+            /* AltiVec addressing mode is [reg+reg].  */
+            mem = gen_frame_mem (V4SImode,
+                                 gen_rtx_PLUS (Pmode, frame_reg_rtx, areg));
+
+            insn = emit_move_insn (mem, savereg);
+
+            rs6000_frame_related (insn, frame_ptr_rtx, info->total_size,
+                                  areg, GEN_INT (offset));
+          }
+    }
+
+  /* VRSAVE is a bit vector representing which AltiVec registers
+     are used.  The OS uses this to determine which vector
+     registers to save on a context switch.  We need to save
+     VRSAVE on the stack frame, add whatever AltiVec registers we
+     used in this function, and do the corresponding magic in the
+     epilogue.  */
+
+  if (TARGET_ALTIVEC && TARGET_ALTIVEC_VRSAVE
+      && info->vrsave_mask != 0)
+    {
+      rtx reg, mem, vrsave;
+      int offset;
+
+      /* Get VRSAVE onto a GPR.  Note that ABI_V4 might be using r12
+         as frame_reg_rtx and r11 as the static chain pointer for
+         nested functions.  */
+      reg = gen_rtx_REG (SImode, 0);
+      vrsave = gen_rtx_REG (SImode, VRSAVE_REGNO);
+      if (TARGET_MACHO)
+        emit_insn (gen_get_vrsave_internal (reg));
+      else
+        emit_insn (gen_rtx_SET (VOIDmode, reg, vrsave));
+
+      if (!WORLD_SAVE_P (info))
+        {
+          /* Save VRSAVE.  */
+          offset = info->vrsave_save_offset + sp_offset;
+          mem = gen_frame_mem (SImode,
+                               gen_rtx_PLUS (Pmode, frame_reg_rtx,
+                                             GEN_INT (offset)));
+          insn = emit_move_insn (mem, reg);
+        }
+
+      /* Include the registers in the mask.  */
+      emit_insn (gen_iorsi3 (reg, reg, GEN_INT ((int) info->vrsave_mask)));
+
+      insn = emit_insn (generate_set_vrsave (reg, info, 0));
+    }
+
   /* If we are using RS6000_PIC_OFFSET_TABLE_REGNUM, we need to set it up.  */
   if ((TARGET_TOC && TARGET_MINIMAL_TOC && get_pool_size () != 0)
       || (DEFAULT_ABI == ABI_V4
@@ -15043,33 +15054,9 @@ rs6000_emit_epilogue (int sibcall)
       return;
     }
 
-  /* If we have a frame pointer, a call to alloca,  or a large stack
-     frame, restore the old stack pointer using the backchain.  Otherwise,
-     we know what size to update it with.  */
-  if (use_backchain_to_restore_sp)
-    {
-      /* Under V.4, don't reset the stack pointer until after we're done
-	 loading the saved registers.  */
-      if (DEFAULT_ABI == ABI_V4)
-	frame_reg_rtx = gen_rtx_REG (Pmode, 11);
-
-      emit_move_insn (frame_reg_rtx,
-		      gen_rtx_MEM (Pmode, sp_reg_rtx));
-    }
-  else if (info->push_p)
-    {
-      if (DEFAULT_ABI == ABI_V4
-	  || current_function_calls_eh_return)
-	sp_offset = info->total_size;
-      else
-	{
-	  emit_insn (TARGET_32BIT
-		     ? gen_addsi3 (sp_reg_rtx, sp_reg_rtx,
-				   GEN_INT (info->total_size))
-		     : gen_adddi3 (sp_reg_rtx, sp_reg_rtx,
-				   GEN_INT (info->total_size)));
-	}
-    }
+  /* Set sp_offset based on the stack push from the prologue.  */
+  if (info->total_size < 32767)
+    sp_offset = info->total_size;
 
   /* Restore AltiVec registers if needed.  */
   if (TARGET_ALTIVEC_ABI && info->altivec_size != 0)
@@ -15110,6 +15097,36 @@ rs6000_emit_epilogue (int sibcall)
       emit_insn (generate_set_vrsave (reg, info, 1));
     }
 
+  sp_offset = 0;
+
+  /* If we have a frame pointer, a call to alloca,  or a large stack
+     frame, restore the old stack pointer using the backchain.  Otherwise,
+     we know what size to update it with.  */
+  if (use_backchain_to_restore_sp)
+    {
+      /* Under V.4, don't reset the stack pointer until after we're done
+	 loading the saved registers.  */
+      if (DEFAULT_ABI == ABI_V4)
+	frame_reg_rtx = gen_rtx_REG (Pmode, 11);
+
+      emit_move_insn (frame_reg_rtx,
+		      gen_rtx_MEM (Pmode, sp_reg_rtx));
+    }
+  else if (info->push_p)
+    {
+      if (DEFAULT_ABI == ABI_V4
+	  || current_function_calls_eh_return)
+	sp_offset = info->total_size;
+      else
+	{
+	  emit_insn (TARGET_32BIT
+		     ? gen_addsi3 (sp_reg_rtx, sp_reg_rtx,
+				   GEN_INT (info->total_size))
+		     : gen_adddi3 (sp_reg_rtx, sp_reg_rtx,
+				   GEN_INT (info->total_size)));
+	}
+    }
+
   /* Get the old lr if we saved it.  */
   if (info->lr_save_p)
     {
diff --git a/contrib/gcc/config/rs6000/sysv4.h b/contrib/gcc/config/rs6000/sysv4.h
index 0adde2bc8be..0b1eb1ebb4d 100644
--- a/contrib/gcc/config/rs6000/sysv4.h
+++ b/contrib/gcc/config/rs6000/sysv4.h
@@ -634,7 +634,7 @@ extern int fixuplabelno;
 %{profile: -p}"
 
 /* Don't put -Y P,<path> for cross compilers.  */
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #define LINK_PATH_SPEC "\
 %{!R*:%{L*:-R %*}} \
 %{!nostdlib: %{!YP,*: \
diff --git a/contrib/gcc/config/svr4.h b/contrib/gcc/config/svr4.h
index 6fa88fcd821..216e9290e6f 100644
--- a/contrib/gcc/config/svr4.h
+++ b/contrib/gcc/config/svr4.h
@@ -84,7 +84,7 @@ Boston, MA 02110-1301, USA.
 /* Under svr4, the normal location of the `ld' and `as' programs is the
    /usr/ccs/bin directory.  */
 
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef  MD_EXEC_PREFIX
 #define MD_EXEC_PREFIX "/usr/ccs/bin/"
 #endif
@@ -92,7 +92,7 @@ Boston, MA 02110-1301, USA.
 /* Under svr4, the normal location of the various *crt*.o files is the
    /usr/ccs/lib directory.  */
 
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef  MD_STARTFILE_PREFIX
 #define MD_STARTFILE_PREFIX "/usr/ccs/lib/"
 #endif
@@ -136,7 +136,7 @@ Boston, MA 02110-1301, USA.
    not being done.  */
 
 #undef	LINK_SPEC
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 #define LINK_SPEC "%{h*} %{v:-V} \
 		   %{b} \
 		   %{static:-dn -Bstatic} \
diff --git a/contrib/gcc/configure b/contrib/gcc/configure
index a248d39c213..7baa70a577b 100755
--- a/contrib/gcc/configure
+++ b/contrib/gcc/configure
@@ -13151,7 +13151,8 @@ for f in $build_xm_file; do
   esac
 done
 
-# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
+# Define macro CROSS_DIRECTORY_STRUCTURE in compilation if this is a
+# cross-compiler which does not use the native headers and libraries.
 # Also use all.cross instead of all.internal and adjust SYSTEM_HEADER_DIR.
 CROSS=
 ALL=all.internal
@@ -13168,7 +13169,7 @@ fi
 
 if test x$host != x$target
 then
-	CROSS="-DCROSS_COMPILE"
+	CROSS="-DCROSS_DIRECTORY_STRUCTURE"
 	ALL=all.cross
 	SYSTEM_HEADER_DIR=$build_system_header_dir
 	case "$host","$target" in
diff --git a/contrib/gcc/configure.ac b/contrib/gcc/configure.ac
index b6c394ca268..fc292336a51 100644
--- a/contrib/gcc/configure.ac
+++ b/contrib/gcc/configure.ac
@@ -1729,7 +1729,8 @@ for f in $build_xm_file; do
   esac
 done
 
-# Define macro CROSS_COMPILE in compilation if this is a cross-compiler.
+# Define macro CROSS_DIRECTORY_STRUCTURE in compilation if this is a
+# cross-compiler which does not use the native headers and libraries.
 # Also use all.cross instead of all.internal and adjust SYSTEM_HEADER_DIR.
 CROSS=						AC_SUBST(CROSS)
 ALL=all.internal				AC_SUBST(ALL)
@@ -1746,7 +1747,7 @@ fi
 
 if test x$host != x$target
 then
-	CROSS="-DCROSS_COMPILE"
+	CROSS="-DCROSS_DIRECTORY_STRUCTURE"
 	ALL=all.cross
 	SYSTEM_HEADER_DIR=$build_system_header_dir
 	case "$host","$target" in
diff --git a/contrib/gcc/coverage.c b/contrib/gcc/coverage.c
index 5eaf4888fe3..292526f6ba1 100644
--- a/contrib/gcc/coverage.c
+++ b/contrib/gcc/coverage.c
@@ -429,57 +429,75 @@ tree_coverage_counter_ref (unsigned counter, unsigned no)
 static unsigned
 coverage_checksum_string (unsigned chksum, const char *string)
 {
-  int i;
   char *dup = NULL;
+  char *ptr;
 
   /* Look for everything that looks if it were produced by
-     get_file_function_name_long and zero out the second part
+     get_file_function_name and zero out the second part
      that may result from flag_random_seed.  This is not critical
      as the checksums are used only for sanity checking.  */
-  for (i = 0; string[i]; i++)
+#define GLOBAL_PREFIX "_GLOBAL__"
+#define TRAILING_N "N_"
+#define ISCAPXDIGIT(a) (((a) >= '0' && (a) <= '9') || ((a) >= 'A' && (a) <= 'F'))
+  if ((ptr = strstr (string, GLOBAL_PREFIX)))
     {
-      int offset = 0;
-      if (!strncmp (string + i, "_GLOBAL__N_", 11))
-      offset = 11;
-      if (!strncmp (string + i, "_GLOBAL__", 9))
-      offset = 9;
+      /* Skip _GLOBAL__. */
+      ptr += strlen (GLOBAL_PREFIX);
 
-      /* C++ namespaces do have scheme:
-         _GLOBAL__N_<filename>_<wrongmagicnumber>_<magicnumber>functionname
-       since filename might contain extra underscores there seems
-       to be no better chance then walk all possible offsets looking
-       for magicnuber.  */
-      if (offset)
-	{
-	  for (i = i + offset; string[i]; i++)
-	    if (string[i]=='_')
-	      {
-		int y;
+      /* Skip optional N_ (in case __GLOBAL_N__). */
+      if (!strncmp (ptr, TRAILING_N, strlen (TRAILING_N)))
+          ptr += strlen (TRAILING_N);
+      /* At this point, ptr should point after "_GLOBAL__N_" or "_GLOBAL__". */
 
-		for (y = 1; y < 9; y++)
-		  if (!(string[i + y] >= '0' && string[i + y] <= '9')
-		      && !(string[i + y] >= 'A' && string[i + y] <= 'F'))
-		    break;
-		if (y != 9 || string[i + 9] != '_')
-		  continue;
-		for (y = 10; y < 18; y++)
-		  if (!(string[i + y] >= '0' && string[i + y] <= '9')
-		      && !(string[i + y] >= 'A' && string[i + y] <= 'F'))
-		    break;
-		if (y != 18)
-		  continue;
-		if (!dup)
-		  string = dup = xstrdup (string);
-		for (y = 10; y < 18; y++)
-		  dup[i + y] = '0';
-	      }
-	  break;
-	}
+      while ((ptr = strchr (ptr, '_')) != NULL)
+        {
+          int y;
+          /* For every "_" in the rest of the string,
+             try the follwing pattern matching */
+
+          /* Skip over '_'. */
+          ptr++;
+#define NDIGITS (8)
+          /* Try matching the pattern:
+             <8-digit hex>_<8-digit hex>
+             The second number is randomly generated
+             so we want to mask it out before computing the checksum. */
+          for (y = 0; *ptr != 0 && y < NDIGITS; y++, ptr++)
+              if (!ISCAPXDIGIT (*ptr))
+                  break;
+          if (y != NDIGITS || *ptr != '_')
+              continue;
+          /* Skip over '_' again. */
+          ptr++;
+          for (y = 0; *ptr != 0 && y < NDIGITS; y++, ptr++)
+              if (!ISCAPXDIGIT (*ptr))
+                  break;
+
+          if (y == NDIGITS)
+            {
+              /* We have a match.
+                 Duplicate the string and mask out
+                 the second 8-digit number. */
+              dup = xstrdup (string);
+              ptr = dup + (ptr - string);
+              for(y = -NDIGITS - 1 ; y < 0; y++)
+                {
+                  ptr[y] = '0';
+                }
+              ptr = dup;
+              break;
+            }
+        }
+        /* "ptr" should be NULL if we couldn't find the match
+           (strchr will return NULL if no match is found),
+           or it should point to dup which contains the string
+           with the random part masked. */
     }
 
-  chksum = crc32_string (chksum, string);
+  chksum = crc32_string (chksum, (ptr) ? ptr : string);
+
   if (dup)
-    free (dup);
+      free (dup);
 
   return chksum;
 }
diff --git a/contrib/gcc/cp/ChangeLog.gcc43 b/contrib/gcc/cp/ChangeLog.gcc43
new file mode 100644
index 00000000000..a92ca72fc79
--- /dev/null
+++ b/contrib/gcc/cp/ChangeLog.gcc43
@@ -0,0 +1,70 @@
+2007-07-09  Geoffrey Keating  <geoffk@apple.com> (r126529)
+
+	PR 32617
+	* decl.c (cxx_init_decl_processing): Don't set
+	force_align_functions_log.
+	(grokfndecl): Honour ptrmemfunc_vbit_in_pfn.
+	* typeck.c (cxx_alignof_expr): When alignof is used on a plain
+	FUNCTION_DECL, return its alignment.
+
+2007-06-28  Geoffrey Keating  <geoffk@apple.com> (r126088)
+
+	* decl2.c (determine_visibility): Implement
+	flag_visibility_ms_compat effect on type info.
+	* decl.c (cxx_init_decl_processing): Implement
+	global effect of flag_visibility_ms_compat.
+
+2007-06-28  Geoffrey Keating  <geoffk@apple.com> (r126080)
+
+	* decl2.c (start_objects): Mark constructor-runnning function
+	as artificial.
+
+2007-06-14  Geoff Keating  <geoffk@apple.com> (r125721)
+
+	PR 31093
+	* decl2.c (determine_visibility): Remove duplicate code for
+	handling type info.
+
+2007-05-31  Daniel Berlin  <dberlin@dberlin.org> (r125239)
+
+	* typeck.c (build_binary_op): Include types in error.
+
+2007-05-05  Geoffrey Keating  <geoffk@apple.com> (r124467)
+
+	PR 31775
+	* mangle.c (write_mangled_name): Mangle static variable names.
+	(write_unqualified_name): Use local-source-name for
+	namespace-scope static variables.
+
+2007-03-12  Seongbae Park <seongbae.park@gmail.com> (r122851)
+
+	* decl.c (compute_array_index_type): New warning flag warn_vla.
+
+2007-01-08  Mark Shinwell  <shinwell@codesourcery.com> (r120572)
+
+	* call.c (standard_conversion): Pass flag to
+	vector_types_convertible_p to disallow emission of note.
+	* typeck.c (convert_for_assignment): Pass flag to
+	vector_types_convertible_p to allow emission of note.
+	(ptr_reasonably_similar): Pass flag to vector_types_convertible_p
+	to disallow emission of note.
+
+2007-01-07  Manuel Lopez-Ibanez  <manu@gcc.gnu.org> (r120558)
+
+	PR c++/28986
+	* typeck.c (build_binary_op): Call overflow_warning if
+	TREE_OVERFLOW_P is true for the result and not for any of the
+	operands.
+	
+2007-01-05  Manuel Lopez-Ibanez  <manu@gcc.gnu.org> (r120505)
+
+	PR c/19978
+	* semantics.c (finish_unary_op_expr): Warn only if result
+	overflowed and operands did not.
+
+2006-10-31  Geoffrey Keating  <geoffk@apple.com> (r118360)
+
+	* name-lookup.c (get_anonymous_namespace_name): New.
+	(push_namespace_with_attribs): Use get_anonymous_namespace_name.
+	* decl2.c (start_objects): Update for rename of
+	get_file_function_name_long.
diff --git a/contrib/gcc/cp/call.c b/contrib/gcc/cp/call.c
index 848f3c894c8..24b5d1fc3ec 100644
--- a/contrib/gcc/cp/call.c
+++ b/contrib/gcc/cp/call.c
@@ -838,7 +838,7 @@ standard_conversion (tree to, tree from, tree expr, bool c_cast_p,
 	conv->rank = cr_promotion;
     }
   else if (fcode == VECTOR_TYPE && tcode == VECTOR_TYPE
-	   && vector_types_convertible_p (from, to))
+	   && vector_types_convertible_p (from, to, false))
     return build_conv (ck_std, to, conv);
   else if (!(flags & LOOKUP_CONSTRUCTOR_CALLABLE)
 	   && IS_AGGR_TYPE (to) && IS_AGGR_TYPE (from)
diff --git a/contrib/gcc/cp/cp-lang.c b/contrib/gcc/cp/cp-lang.c
index 60503278930..c33d488cb62 100644
--- a/contrib/gcc/cp/cp-lang.c
+++ b/contrib/gcc/cp/cp-lang.c
@@ -44,6 +44,8 @@ static void cp_init_ts (void);
 #define LANG_HOOKS_NAME "GNU C++"
 #undef LANG_HOOKS_INIT
 #define LANG_HOOKS_INIT cxx_init
+#undef LANG_HOOKS_GENERIC_TYPE_P
+#define LANG_HOOKS_GENERIC_TYPE_P class_tmpl_impl_spec_p
 #undef LANG_HOOKS_DECL_PRINTABLE_NAME
 #define LANG_HOOKS_DECL_PRINTABLE_NAME	cxx_printable_name
 #undef LANG_HOOKS_FOLD_OBJ_TYPE_REF
diff --git a/contrib/gcc/cp/cp-tree.h b/contrib/gcc/cp/cp-tree.h
index deea897c465..0b30f38809f 100644
--- a/contrib/gcc/cp/cp-tree.h
+++ b/contrib/gcc/cp/cp-tree.h
@@ -4373,6 +4373,7 @@ extern tree add_stmt_to_compound		(tree, tree);
 extern tree cxx_maybe_build_cleanup		(tree);
 extern void init_tree				(void);
 extern int pod_type_p				(tree);
+extern bool class_tmpl_impl_spec_p		(tree);
 extern int zero_init_p				(tree);
 extern tree canonical_type_variant		(tree);
 extern tree copy_binfo				(tree, tree, tree,
@@ -4460,8 +4461,9 @@ extern tree build_x_indirect_ref		(tree, const char *);
 extern tree build_indirect_ref			(tree, const char *);
 extern tree build_array_ref			(tree, tree);
 extern tree get_member_function_from_ptrfunc	(tree *, tree);
-extern tree build_x_binary_op			(enum tree_code, tree, tree,
-						 bool *);
+extern tree build_x_binary_op			(enum tree_code, tree,
+						 enum tree_code, tree,
+						 enum tree_code, bool *);
 extern tree build_x_unary_op			(enum tree_code, tree);
 extern tree unary_complex_lvalue		(enum tree_code, tree);
 extern tree build_x_conditional_expr		(tree, tree, tree);
diff --git a/contrib/gcc/cp/decl.c b/contrib/gcc/cp/decl.c
index 4e3c6e9bc4a..d261165874b 100644
--- a/contrib/gcc/cp/decl.c
+++ b/contrib/gcc/cp/decl.c
@@ -3157,12 +3157,9 @@ cxx_init_decl_processing (void)
     }
   if (flag_inline_functions)
     flag_inline_trees = 2;
-
-  /* Force minimum function alignment if using the least significant
-     bit of function pointers to store the virtual bit.  */
-  if (TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_pfn
-      && force_align_functions_log < 1)
-    force_align_functions_log = 1;
+  
+  if (flag_visibility_ms_compat)
+   default_visibility = VISIBILITY_HIDDEN;
 
   /* Initially, C.  */
   current_lang_name = lang_name_c;
@@ -4966,9 +4963,9 @@ make_rtl_for_nonlocal_decl (tree decl, tree init, const char* asmspec)
     {
       gcc_assert (TREE_STATIC (decl));
       /* An in-class declaration of a static data member should be
-	 external; it is only a declaration, and not a definition.  */
-      if (init == NULL_TREE)
-	gcc_assert (DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl));
+	 external; it is only a declaration, and not a definition. */
+      if (init == NULL_TREE && DECL_INITIAL (decl) == NULL_TREE)
+	gcc_assert (DECL_EXTERNAL (decl));
     }
 
   /* We don't create any RTL for local variables.  */
@@ -6065,6 +6062,14 @@ grokfndecl (tree ctype,
   if (TYPE_VOLATILE (type))
     TREE_THIS_VOLATILE (decl) = 1;
 
+  /* If pointers to member functions use the least significant bit to
+     indicate whether a function is virtual, ensure a pointer
+     to this function will have that bit clear.  */
+  if (TARGET_PTRMEMFUNC_VBIT_LOCATION == ptrmemfunc_vbit_in_pfn
+      && TREE_CODE (type) == METHOD_TYPE
+      && DECL_ALIGN (decl) < 2 * BITS_PER_UNIT)
+    DECL_ALIGN (decl) = 2 * BITS_PER_UNIT;
+
   if (friendp
       && TREE_CODE (orig_declarator) == TEMPLATE_ID_EXPR)
     {
@@ -6702,12 +6707,21 @@ compute_array_index_type (tree name, tree size)
 	error ("size of array is not an integral constant-expression");
       size = integer_one_node;
     }
-  else if (pedantic)
+  else if (pedantic && warn_vla != 0)
     {
       if (name)
-	pedwarn ("ISO C++ forbids variable-size array %qD", name);
+	pedwarn ("ISO C++ forbids variable length array %qD", name);
       else
-	pedwarn ("ISO C++ forbids variable-size array");
+	pedwarn ("ISO C++ forbids variable length array");
+    }
+  else if (warn_vla > 0)
+    {
+      if (name)
+	warning (OPT_Wvla, 
+                 "variable length array %qD is used", name);
+      else
+	warning (OPT_Wvla, 
+                 "variable length array is used");
     }
 
   if (processing_template_decl && !TREE_CONSTANT (size))
diff --git a/contrib/gcc/cp/decl2.c b/contrib/gcc/cp/decl2.c
index 310dc83159d..69cdb990f9d 100644
--- a/contrib/gcc/cp/decl2.c
+++ b/contrib/gcc/cp/decl2.c
@@ -1698,10 +1698,6 @@ determine_visibility (tree decl)
      class can influence the visibility of the DECL.  */
   if (DECL_CLASS_SCOPE_P (decl))
     class_type = DECL_CONTEXT (decl);
-  else if (TREE_CODE (decl) == VAR_DECL
-	   && DECL_TINFO_P (decl)
-	   && CLASS_TYPE_P (TREE_TYPE (DECL_NAME (decl))))
-    class_type = TREE_TYPE (DECL_NAME (decl));
   else
     {
       /* Not a class member.  */
@@ -1730,6 +1726,19 @@ determine_visibility (tree decl)
 	     but have no TEMPLATE_INFO, so don't try to check it.  */
 	  use_template = 0;
 	}
+      else if (TREE_CODE (decl) == VAR_DECL && DECL_TINFO_P (decl)
+	       && flag_visibility_ms_compat)
+	{
+	  /* Under -fvisibility-ms-compat, types are visible by default,
+	     even though their contents aren't.  */
+	  tree underlying_type = TREE_TYPE (DECL_NAME (decl));
+	  int underlying_vis = type_visibility (underlying_type);
+	  if (underlying_vis == VISIBILITY_ANON
+	      || CLASSTYPE_VISIBILITY_SPECIFIED (underlying_type))
+	    constrain_visibility (decl, underlying_vis);
+	  else
+	    DECL_VISIBILITY (decl) = VISIBILITY_DEFAULT;
+	}
       else if (TREE_CODE (decl) == VAR_DECL && DECL_TINFO_P (decl))
 	{
 	  /* tinfo visibility is based on the type it's for.  */
@@ -1787,7 +1796,8 @@ determine_visibility (tree decl)
     {
       /* Propagate anonymity from type to decl.  */
       int tvis = type_visibility (TREE_TYPE (decl));
-      if (tvis == VISIBILITY_ANON)
+      if (tvis == VISIBILITY_ANON
+	  || ! DECL_VISIBILITY_SPECIFIED (decl))
 	constrain_visibility (decl, tvis);
     }
 }
@@ -2326,7 +2336,7 @@ start_objects (int method_type, int initp)
     sprintf (type, "%c", method_type);
 
   fndecl = build_lang_decl (FUNCTION_DECL,
-			    get_file_function_name_long (type),
+			    get_file_function_name (type),
 			    build_function_type (void_type_node,
 						 void_list_node));
   start_preparsed_function (fndecl, /*attrs=*/NULL_TREE, SF_PRE_PARSED);
@@ -2335,6 +2345,10 @@ start_objects (int method_type, int initp)
      to scan the object file to find its ctor/dtor routine.  */
   TREE_PUBLIC (current_function_decl) = ! targetm.have_ctors_dtors;
 
+  /* Mark as artificial because it's not explicitly in the user's
+     source code.  */
+  DECL_ARTIFICIAL (current_function_decl) = 1;
+
   /* Mark this declaration as used to avoid spurious warnings.  */
   TREE_USED (current_function_decl) = 1;
 
diff --git a/contrib/gcc/cp/mangle.c b/contrib/gcc/cp/mangle.c
index 74ff8543eb4..c3271339f4d 100644
--- a/contrib/gcc/cp/mangle.c
+++ b/contrib/gcc/cp/mangle.c
@@ -688,7 +688,8 @@ write_mangled_name (const tree decl, bool top_level)
 	}
     }
   else if (TREE_CODE (decl) == VAR_DECL
-	   /* The names of global variables aren't mangled.  */
+	   /* The names of non-static global variables aren't mangled.  */
+	   && DECL_EXTERNAL_LINKAGE_P (decl)
 	   && (CP_DECL_CONTEXT (decl) == global_namespace
 	       /* And neither are `extern "C"' variables.  */
 	       || DECL_EXTERN_C_P (decl)))
@@ -1086,7 +1087,10 @@ write_template_prefix (const tree node)
 
     <unqualified-name>  ::= <operator-name>
 			::= <special-name>
-			::= <source-name>  */
+			::= <source-name>
+			::= <local-source-name> 
+
+    <local-source-name>	::= L <source-name> <discriminator> */
 
 static void
 write_unqualified_name (const tree decl)
@@ -1126,6 +1130,16 @@ write_unqualified_name (const tree decl)
 
       write_string (oni[DECL_OVERLOADED_OPERATOR_P (decl)].mangled_name);
     }
+  else if (VAR_OR_FUNCTION_DECL_P (decl) && ! TREE_PUBLIC (decl)
+	   && DECL_NAMESPACE_SCOPE_P (decl)
+	   && decl_linkage (decl) == lk_internal)
+    {
+      MANGLE_TRACE_TREE ("local-source-name", decl);
+      write_char ('L');
+      write_source_name (DECL_NAME (decl));
+      /* The default discriminator is 1, and that's all we ever use,
+	 so there's no code to output one here.  */
+    }
   else
     write_source_name (DECL_NAME (decl));
 }
diff --git a/contrib/gcc/cp/name-lookup.c b/contrib/gcc/cp/name-lookup.c
index 744dd5c489e..4d08174a4be 100644
--- a/contrib/gcc/cp/name-lookup.c
+++ b/contrib/gcc/cp/name-lookup.c
@@ -61,6 +61,24 @@ tree global_namespace;
    unit.  */
 static GTY(()) tree anonymous_namespace_name;
 
+/* Initialise anonymous_namespace_name if necessary, and return it.  */
+
+static tree
+get_anonymous_namespace_name(void)
+{
+  if (!anonymous_namespace_name)
+    {
+      /* The anonymous namespace has to have a unique name
+	 if typeinfo objects are being compared by name.  */
+      if (! flag_weak || ! SUPPORTS_ONE_ONLY)
+	anonymous_namespace_name = get_file_function_name ("N");
+      else
+	/* The demangler expects anonymous namespaces to be called
+	   something starting with '_GLOBAL__N_'.  */
+	anonymous_namespace_name = get_identifier ("_GLOBAL__N_1");
+    }
+  return anonymous_namespace_name;
+}
 
 /* Compute the chain index of a binding_entry given the HASH value of its
    name and the total COUNT of chains.  COUNT is assumed to be a power
@@ -3011,11 +3029,7 @@ push_namespace_with_attribs (tree name, tree attributes)
 
   if (anon)
     {
-      /* The name of anonymous namespace is unique for the translation
-	 unit.  */
-      if (!anonymous_namespace_name)
-	anonymous_namespace_name = get_file_function_name ('N');
-      name = anonymous_namespace_name;
+      name = get_anonymous_namespace_name();
       d = IDENTIFIER_NAMESPACE_VALUE (name);
       if (d)
 	/* Reopening anonymous namespace.  */
diff --git a/contrib/gcc/cp/parser.c b/contrib/gcc/cp/parser.c
index e060d49c343..edbd37aa8ed 100644
--- a/contrib/gcc/cp/parser.c
+++ b/contrib/gcc/cp/parser.c
@@ -1177,8 +1177,15 @@ typedef enum cp_parser_status_kind
 
 typedef struct cp_parser_expression_stack_entry
 {
+  /* Left hand side of the binary operation we are currently
+     parsing.  */
   tree lhs;
+  /* Original tree code for left hand side, if it was a binary
+     expression itself (used for -Wparentheses).  */
+  enum tree_code lhs_type;
+  /* Tree code for the binary operation we are parsing.  */
   enum tree_code tree_type;
+  /* Precedence of the binary operation we are parsing.  */
   int prec;
 } cp_parser_expression_stack_entry;
 
@@ -1536,7 +1543,7 @@ static tree cp_parser_builtin_offsetof
 /* Statements [gram.stmt.stmt]  */
 
 static void cp_parser_statement
-  (cp_parser *, tree, bool);
+  (cp_parser *, tree, bool, bool *);
 static void cp_parser_label_for_labeled_statement
   (cp_parser *);
 static tree cp_parser_expression_statement
@@ -1546,7 +1553,7 @@ static tree cp_parser_compound_statement
 static void cp_parser_statement_seq_opt
   (cp_parser *, tree);
 static tree cp_parser_selection_statement
-  (cp_parser *);
+  (cp_parser *, bool *);
 static tree cp_parser_condition
   (cp_parser *);
 static tree cp_parser_iteration_statement
@@ -1559,7 +1566,7 @@ static void cp_parser_declaration_statement
   (cp_parser *);
 
 static tree cp_parser_implicitly_scoped_statement
-  (cp_parser *);
+  (cp_parser *, bool *);
 static void cp_parser_already_scoped_statement
   (cp_parser *);
 
@@ -5730,12 +5737,13 @@ cp_parser_binary_expression (cp_parser* parser, bool cast_p)
   cp_parser_expression_stack_entry *sp = &stack[0];
   tree lhs, rhs;
   cp_token *token;
-  enum tree_code tree_type;
+  enum tree_code tree_type, lhs_type, rhs_type;
   enum cp_parser_prec prec = PREC_NOT_OPERATOR, new_prec, lookahead_prec;
   bool overloaded_p;
 
   /* Parse the first expression.  */
   lhs = cp_parser_cast_expression (parser, /*address_p=*/false, cast_p);
+  lhs_type = ERROR_MARK;
 
   for (;;)
     {
@@ -5768,6 +5776,7 @@ cp_parser_binary_expression (cp_parser* parser, bool cast_p)
       /* Extract another operand.  It may be the RHS of this expression
 	 or the LHS of a new, higher priority expression.  */
       rhs = cp_parser_simple_cast_expression (parser);
+      rhs_type = ERROR_MARK;
 
       /* Get another operator token.  Look up its precedence to avoid
 	 building a useless (immediately popped) stack entry for common
@@ -5783,8 +5792,10 @@ cp_parser_binary_expression (cp_parser* parser, bool cast_p)
 	  sp->prec = prec;
 	  sp->tree_type = tree_type;
 	  sp->lhs = lhs;
+	  sp->lhs_type = lhs_type;
 	  sp++;
 	  lhs = rhs;
+	  lhs_type = rhs_type;
 	  prec = new_prec;
 	  new_prec = lookahead_prec;
 	  goto get_rhs;
@@ -5801,11 +5812,15 @@ cp_parser_binary_expression (cp_parser* parser, bool cast_p)
 	  prec = sp->prec;
 	  tree_type = sp->tree_type;
 	  rhs = lhs;
+	  rhs_type = lhs_type;
 	  lhs = sp->lhs;
+	  lhs_type = sp->lhs_type;
 	}
 
       overloaded_p = false;
-      lhs = build_x_binary_op (tree_type, lhs, rhs, &overloaded_p);
+      lhs = build_x_binary_op (tree_type, lhs, lhs_type, rhs, rhs_type,
+			       &overloaded_p);
+      lhs_type = tree_type;
 
       /* If the binary operator required the use of an overloaded operator,
 	 then this expression cannot be an integral constant-expression.
@@ -6222,17 +6237,23 @@ cp_parser_builtin_offsetof (cp_parser *parser)
      try-block
 
   IN_COMPOUND is true when the statement is nested inside a
-  cp_parser_compound_statement; this matters for certain pragmas.  */
+  cp_parser_compound_statement; this matters for certain pragmas.
+
+  If IF_P is not NULL, *IF_P is set to indicate whether the statement
+  is a (possibly labeled) if statement which is not enclosed in braces
+  and has an else clause.  This is used to implement -Wparentheses.  */
 
 static void
 cp_parser_statement (cp_parser* parser, tree in_statement_expr,
-		     bool in_compound)
+		     bool in_compound, bool *if_p)
 {
   tree statement;
   cp_token *token;
   location_t statement_location;
 
  restart:
+  if (if_p != NULL)
+    *if_p = false;
   /* There is no statement yet.  */
   statement = NULL_TREE;
   /* Peek at the next token.  */
@@ -6257,7 +6278,7 @@ cp_parser_statement (cp_parser* parser, tree in_statement_expr,
 
 	case RID_IF:
 	case RID_SWITCH:
-	  statement = cp_parser_selection_statement (parser);
+	  statement = cp_parser_selection_statement (parser, if_p);
 	  break;
 
 	case RID_WHILE:
@@ -6522,7 +6543,7 @@ cp_parser_statement_seq_opt (cp_parser* parser, tree in_statement_expr)
 	break;
 
       /* Parse the statement.  */
-      cp_parser_statement (parser, in_statement_expr, true);
+      cp_parser_statement (parser, in_statement_expr, true, NULL);
     }
 }
 
@@ -6533,14 +6554,22 @@ cp_parser_statement_seq_opt (cp_parser* parser, tree in_statement_expr)
      if ( condition ) statement else statement
      switch ( condition ) statement
 
-   Returns the new IF_STMT or SWITCH_STMT.  */
+   Returns the new IF_STMT or SWITCH_STMT.
+
+   If IF_P is not NULL, *IF_P is set to indicate whether the statement
+   is a (possibly labeled) if statement which is not enclosed in
+   braces and has an else clause.  This is used to implement
+   -Wparentheses.  */
 
 static tree
-cp_parser_selection_statement (cp_parser* parser)
+cp_parser_selection_statement (cp_parser* parser, bool *if_p)
 {
   cp_token *token;
   enum rid keyword;
 
+  if (if_p != NULL)
+    *if_p = false;
+
   /* Peek at the next token.  */
   token = cp_parser_require (parser, CPP_KEYWORD, "selection-statement");
 
@@ -6576,11 +6605,13 @@ cp_parser_selection_statement (cp_parser* parser)
 
 	if (keyword == RID_IF)
 	  {
+	    bool nested_if;
+
 	    /* Add the condition.  */
 	    finish_if_stmt_cond (condition, statement);
 
 	    /* Parse the then-clause.  */
-	    cp_parser_implicitly_scoped_statement (parser);
+	    cp_parser_implicitly_scoped_statement (parser, &nested_if);
 	    finish_then_clause (statement);
 
 	    /* If the next token is `else', parse the else-clause.  */
@@ -6591,8 +6622,28 @@ cp_parser_selection_statement (cp_parser* parser)
 		cp_lexer_consume_token (parser->lexer);
 		begin_else_clause (statement);
 		/* Parse the else-clause.  */
-		cp_parser_implicitly_scoped_statement (parser);
+		cp_parser_implicitly_scoped_statement (parser, NULL);
 		finish_else_clause (statement);
+
+		/* If we are currently parsing a then-clause, then
+		   IF_P will not be NULL.  We set it to true to
+		   indicate that this if statement has an else clause.
+		   This may trigger the Wparentheses warning below
+		   when we get back up to the parent if statement.  */
+		if (if_p != NULL)
+		  *if_p = true;
+	      }
+	    else
+	      {
+		/* This if statement does not have an else clause.  If
+		   NESTED_IF is true, then the then-clause is an if
+		   statement which does have an else clause.  We warn
+		   about the potential ambiguity.  */
+		if (nested_if)
+		  warning (OPT_Wparentheses,
+			   ("%Hsuggest explicit braces "
+			    "to avoid ambiguous %<else%>"),
+			   EXPR_LOCUS (statement));
 	      }
 
 	    /* Now we're all done with the if-statement.  */
@@ -6611,7 +6662,7 @@ cp_parser_selection_statement (cp_parser* parser)
 	    in_statement = parser->in_statement;
 	    parser->in_switch_statement_p = true;
 	    parser->in_statement |= IN_SWITCH_STMT;
-	    cp_parser_implicitly_scoped_statement (parser);
+	    cp_parser_implicitly_scoped_statement (parser, NULL);
 	    parser->in_switch_statement_p = in_switch_statement_p;
 	    parser->in_statement = in_statement;
 
@@ -6789,7 +6840,7 @@ cp_parser_iteration_statement (cp_parser* parser)
 	statement = begin_do_stmt ();
 	/* Parse the body of the do-statement.  */
 	parser->in_statement = IN_ITERATION_STMT;
-	cp_parser_implicitly_scoped_statement (parser);
+	cp_parser_implicitly_scoped_statement (parser, NULL);
 	parser->in_statement = in_statement;
 	finish_do_body (statement);
 	/* Look for the `while' keyword.  */
@@ -7031,13 +7082,21 @@ cp_parser_declaration_statement (cp_parser* parser)
    but ensures that is in its own scope, even if it is not a
    compound-statement.
 
+   If IF_P is not NULL, *IF_P is set to indicate whether the statement
+   is a (possibly labeled) if statement which is not enclosed in
+   braces and has an else clause.  This is used to implement
+   -Wparentheses.
+
    Returns the new statement.  */
 
 static tree
-cp_parser_implicitly_scoped_statement (cp_parser* parser)
+cp_parser_implicitly_scoped_statement (cp_parser* parser, bool *if_p)
 {
   tree statement;
 
+  if (if_p != NULL)
+    *if_p = false;
+
   /* Mark if () ; with a special NOP_EXPR.  */
   if (cp_lexer_next_token_is (parser->lexer, CPP_SEMICOLON))
     {
@@ -7053,7 +7112,7 @@ cp_parser_implicitly_scoped_statement (cp_parser* parser)
       /* Create a compound-statement.  */
       statement = begin_compound_stmt (0);
       /* Parse the dependent-statement.  */
-      cp_parser_statement (parser, NULL_TREE, false);
+      cp_parser_statement (parser, NULL_TREE, false, if_p);
       /* Finish the dummy compound-statement.  */
       finish_compound_stmt (statement);
     }
@@ -7072,7 +7131,7 @@ cp_parser_already_scoped_statement (cp_parser* parser)
 {
   /* If the token is a `{', then we must take special action.  */
   if (cp_lexer_next_token_is_not (parser->lexer, CPP_OPEN_BRACE))
-    cp_parser_statement (parser, NULL_TREE, false);
+    cp_parser_statement (parser, NULL_TREE, false, NULL);
   else
     {
       /* Avoid calling cp_parser_compound_statement, so that we
@@ -18645,7 +18704,7 @@ cp_parser_omp_structured_block (cp_parser *parser)
   tree stmt = begin_omp_structured_block ();
   unsigned int save = cp_parser_begin_omp_structured_block (parser);
 
-  cp_parser_statement (parser, NULL_TREE, false);
+  cp_parser_statement (parser, NULL_TREE, false, NULL);
 
   cp_parser_end_omp_structured_block (parser, save);
   return finish_omp_structured_block (stmt);
@@ -18890,7 +18949,7 @@ cp_parser_omp_for_loop (cp_parser *parser)
   /* Note that the grammar doesn't call for a structured block here,
      though the loop as a whole is a structured block.  */
   body = push_stmt_list ();
-  cp_parser_statement (parser, NULL_TREE, false);
+  cp_parser_statement (parser, NULL_TREE, false, NULL);
   body = pop_stmt_list (body);
 
   return finish_omp_for (loc, decl, init, cond, incr, body, pre_body);
@@ -18983,7 +19042,7 @@ cp_parser_omp_sections_scope (cp_parser *parser)
 
       while (1)
 	{
-	  cp_parser_statement (parser, NULL_TREE, false);
+	  cp_parser_statement (parser, NULL_TREE, false, NULL);
 
 	  tok = cp_lexer_peek_token (parser->lexer);
 	  if (tok->pragma_kind == PRAGMA_OMP_SECTION)
diff --git a/contrib/gcc/cp/pt.c b/contrib/gcc/cp/pt.c
index ac28afa4136..f12fc7b74d4 100644
--- a/contrib/gcc/cp/pt.c
+++ b/contrib/gcc/cp/pt.c
@@ -9078,7 +9078,13 @@ tsubst_copy_and_build (tree t,
       return build_x_binary_op
 	(TREE_CODE (t),
 	 RECUR (TREE_OPERAND (t, 0)),
+	 (TREE_NO_WARNING (TREE_OPERAND (t, 0))
+	  ? ERROR_MARK
+	  : TREE_CODE (TREE_OPERAND (t, 0))),
 	 RECUR (TREE_OPERAND (t, 1)),
+	 (TREE_NO_WARNING (TREE_OPERAND (t, 1))
+	  ? ERROR_MARK
+	  : TREE_CODE (TREE_OPERAND (t, 1))),
 	 /*overloaded_p=*/NULL);
 
     case SCOPE_REF:
@@ -9087,7 +9093,14 @@ tsubst_copy_and_build (tree t,
     case ARRAY_REF:
       op1 = tsubst_non_call_postfix_expression (TREE_OPERAND (t, 0),
 						args, complain, in_decl);
-      return build_x_binary_op (ARRAY_REF, op1, RECUR (TREE_OPERAND (t, 1)),
+      return build_x_binary_op (ARRAY_REF, op1,
+				(TREE_NO_WARNING (TREE_OPERAND (t, 0))
+				 ? ERROR_MARK
+				 : TREE_CODE (TREE_OPERAND (t, 0))),
+				RECUR (TREE_OPERAND (t, 1)),
+				(TREE_NO_WARNING (TREE_OPERAND (t, 1))
+				 ? ERROR_MARK
+				 : TREE_CODE (TREE_OPERAND (t, 1))),
 				/*overloaded_p=*/NULL);
 
     case SIZEOF_EXPR:
diff --git a/contrib/gcc/cp/semantics.c b/contrib/gcc/cp/semantics.c
index 9c37b36cea3..547859b07c4 100644
--- a/contrib/gcc/cp/semantics.c
+++ b/contrib/gcc/cp/semantics.c
@@ -587,6 +587,16 @@ maybe_convert_cond (tree cond)
 
   /* Do the conversion.  */
   cond = convert_from_reference (cond);
+
+  if (TREE_CODE (cond) == MODIFY_EXPR
+      && !TREE_NO_WARNING (cond)
+      && warn_parentheses)
+    {
+      warning (OPT_Wparentheses,
+	       "suggest parentheses around assignment used as truth value");
+      TREE_NO_WARNING (cond) = 1;
+    }
+
   return condition_conversion (cond);
 }
 
@@ -2002,7 +2012,9 @@ finish_unary_op_expr (enum tree_code code, tree expr)
       result = copy_node (result);
       TREE_NEGATED_INT (result) = 1;
     }
-  overflow_warning (result);
+  if (TREE_OVERFLOW_P (result) && !TREE_OVERFLOW_P (expr))
+    overflow_warning (result);
+
   return result;
 }
 
diff --git a/contrib/gcc/cp/tree.c b/contrib/gcc/cp/tree.c
index e3391a51d44..eee91514bf2 100644
--- a/contrib/gcc/cp/tree.c
+++ b/contrib/gcc/cp/tree.c
@@ -1762,6 +1762,14 @@ pod_type_p (tree t)
   return 1;
 }
 
+/* Nonzero iff type T is a class template implicit specialization.  */
+
+bool
+class_tmpl_impl_spec_p (tree t)
+{
+  return CLASS_TYPE_P (t) && CLASSTYPE_TEMPLATE_INSTANTIATION (t);
+}
+
 /* Returns 1 iff zero initialization of type T means actually storing
    zeros in it.  */
 
diff --git a/contrib/gcc/cp/typeck.c b/contrib/gcc/cp/typeck.c
index 6f0777274ce..34a301d62fa 100644
--- a/contrib/gcc/cp/typeck.c
+++ b/contrib/gcc/cp/typeck.c
@@ -1358,7 +1358,10 @@ cxx_alignof_expr (tree e)
     {
       pedwarn ("ISO C++ forbids applying %<__alignof%> to an expression of "
 	       "function type");
-      t = size_one_node;
+      if (TREE_CODE (e) == FUNCTION_DECL)
+	t = size_int (DECL_ALIGN_UNIT (e));
+      else
+	t = size_one_node;
     }
   else if (type_unknown_p (e))
     {
@@ -1690,17 +1693,20 @@ rationalize_conditional_expr (enum tree_code code, tree t)
      are equal, so we know what conditional expression this used to be.  */
   if (TREE_CODE (t) == MIN_EXPR || TREE_CODE (t) == MAX_EXPR)
     {
+      tree op0 = TREE_OPERAND (t, 0);
+      tree op1 = TREE_OPERAND (t, 1);
+
       /* The following code is incorrect if either operand side-effects.  */
-      gcc_assert (!TREE_SIDE_EFFECTS (TREE_OPERAND (t, 0))
-		  && !TREE_SIDE_EFFECTS (TREE_OPERAND (t, 1)));
+      gcc_assert (!TREE_SIDE_EFFECTS (op0)
+		  && !TREE_SIDE_EFFECTS (op1));
       return
 	build_conditional_expr (build_x_binary_op ((TREE_CODE (t) == MIN_EXPR
 						    ? LE_EXPR : GE_EXPR),
-						   TREE_OPERAND (t, 0),
-						   TREE_OPERAND (t, 1),
+						   op0, TREE_CODE (op0),
+						   op1, TREE_CODE (op1),
 						   /*overloaded_p=*/NULL),
-			    build_unary_op (code, TREE_OPERAND (t, 0), 0),
-			    build_unary_op (code, TREE_OPERAND (t, 1), 0));
+			    build_unary_op (code, op0, 0),
+			    build_unary_op (code, op1, 0));
     }
 
   return
@@ -2331,6 +2337,19 @@ build_indirect_ref (tree ptr, const char *errorstring)
 	 types.  */
       tree t = canonical_type_variant (TREE_TYPE (type));
 
+      if (TREE_CODE (ptr) == CONVERT_EXPR
+          || TREE_CODE (ptr) == NOP_EXPR
+          || TREE_CODE (ptr) == VIEW_CONVERT_EXPR)
+	{
+	  /* If a warning is issued, mark it to avoid duplicates from
+	     the backend.  This only needs to be done at
+	     warn_strict_aliasing > 2.  */
+	  if (warn_strict_aliasing > 2)
+	    if (strict_aliasing_warning (TREE_TYPE (TREE_OPERAND (ptr, 0)),
+					 type, TREE_OPERAND (ptr, 0)))
+	      TREE_NO_WARNING (ptr) = 1;
+	}
+
       if (VOID_TYPE_P (t))
 	{
 	  /* A pointer to incomplete type (other than cv void) can be
@@ -2908,8 +2927,8 @@ convert_arguments (tree typelist, tree values, tree fndecl, int flags)
    conversions on the operands.  CODE is the kind of expression to build.  */
 
 tree
-build_x_binary_op (enum tree_code code, tree arg1, tree arg2,
-		   bool *overloaded_p)
+build_x_binary_op (enum tree_code code, tree arg1, enum tree_code arg1_code,
+		   tree arg2, enum tree_code arg2_code, bool *overloaded_p)
 {
   tree orig_arg1;
   tree orig_arg2;
@@ -2933,6 +2952,17 @@ build_x_binary_op (enum tree_code code, tree arg1, tree arg2,
     expr = build_new_op (code, LOOKUP_NORMAL, arg1, arg2, NULL_TREE,
 			 overloaded_p);
 
+  /* Check for cases such as x+y<<z which users are likely to
+     misinterpret.  But don't warn about obj << x + y, since that is a
+     common idiom for I/O.  */
+  if (warn_parentheses
+      && !processing_template_decl
+      && !error_operand_p (arg1)
+      && !error_operand_p (arg2)
+      && (code != LSHIFT_EXPR
+	  || !IS_AGGR_TYPE (TREE_TYPE (arg1))))
+    warn_about_parentheses (code, arg1_code, arg2_code);
+
   if (processing_template_decl && expr != error_mark_node)
     return build_min_non_dep (code, expr, orig_arg1, orig_arg2);
 
@@ -3446,7 +3476,7 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
 	      || !same_scalar_type_ignoring_signedness (TREE_TYPE (type0),
 							TREE_TYPE (type1)))
 	    {
-	      binary_op_error (code);
+	      binary_op_error (code, type0, type1);
 	      return error_mark_node;
 	    }
 	  arithmetic_types_p = 1;
@@ -3759,6 +3789,12 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1,
   result = fold_if_not_in_template (result);
   if (final_type != 0)
     result = cp_convert (final_type, result);
+
+  if (TREE_OVERFLOW_P (result) 
+      && !TREE_OVERFLOW_P (op0) 
+      && !TREE_OVERFLOW_P (op1))
+    overflow_warning (result);
+
   return result;
 }
 
@@ -5236,7 +5272,8 @@ build_reinterpret_cast_1 (tree type, tree expr, bool c_cast_p,
       /* We need to strip nops here, because the frontend likes to
 	 create (int *)&a for array-to-pointer decay, instead of &a[0].  */
       STRIP_NOPS (sexpr);
-      strict_aliasing_warning (intype, type, sexpr);
+      if (warn_strict_aliasing <= 2)
+	strict_aliasing_warning (intype, type, sexpr);
 
       return fold_if_not_in_template (build_nop (type, expr));
     }
@@ -6192,7 +6229,7 @@ convert_for_assignment (tree type, tree rhs,
   coder = TREE_CODE (rhstype);
 
   if (TREE_CODE (type) == VECTOR_TYPE && coder == VECTOR_TYPE
-      && vector_types_convertible_p (type, rhstype))
+      && vector_types_convertible_p (type, rhstype, true))
     return convert (type, rhs);
 
   if (rhs == error_mark_node || rhstype == error_mark_node)
@@ -6280,6 +6317,19 @@ convert_for_assignment (tree type, tree rhs,
 		 errtype);
     }
 
+  /* If -Wparentheses, warn about a = b = c when a has type bool and b
+     does not.  */
+  if (warn_parentheses
+      && type == boolean_type_node
+      && TREE_CODE (rhs) == MODIFY_EXPR
+      && !TREE_NO_WARNING (rhs)
+      && TREE_TYPE (rhs) != boolean_type_node)
+    {
+      warning (OPT_Wparentheses,
+	       "suggest parentheses around assignment used as truth value");
+      TREE_NO_WARNING (rhs) = 1;
+    }
+
   return perform_implicit_conversion (strip_top_quals (type), rhs);
 }
 
@@ -6749,7 +6799,7 @@ ptr_reasonably_similar (tree to, tree from)
 	continue;
 
       if (TREE_CODE (to) == VECTOR_TYPE
-	  && vector_types_convertible_p (to, from))
+	  && vector_types_convertible_p (to, from, false))
 	return 1;
 
       if (TREE_CODE (to) == INTEGER_TYPE
diff --git a/contrib/gcc/cppdefault.c b/contrib/gcc/cppdefault.c
index d040558b54c..43466609688 100644
--- a/contrib/gcc/cppdefault.c
+++ b/contrib/gcc/cppdefault.c
@@ -33,7 +33,7 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 #define STANDARD_INCLUDE_COMPONENT 0
 #endif
 
-#if defined (CROSS_COMPILE) && !defined (TARGET_SYSTEM_ROOT)
+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT)
 # undef LOCAL_INCLUDE_DIR
 # undef SYSTEM_INCLUDE_DIR
 # undef STANDARD_INCLUDE_DIR
diff --git a/contrib/gcc/doc/cppopts.texi b/contrib/gcc/doc/cppopts.texi
index 024d255042e..69738cc2202 100644
--- a/contrib/gcc/doc/cppopts.texi
+++ b/contrib/gcc/doc/cppopts.texi
@@ -506,6 +506,22 @@ Search @var{dir} only for header files requested with
 @xref{Search Path}.
 @end ifset
 
+@item -fdirectives-only
+@opindex fdirectives-only
+This option provides a simplified preprocessor to improve the
+performance of distributed build systems such as distcc.  It's
+behavior depends on a number of other flags.
+
+If the @option{-E} option is enabled, it suppresses things like macro
+expansion, trigraph conversion, and escaped newline splicing
+outside of directives.  All directives are processed normally, except that
+macro definitions are output similar to the @option{-dD} option.
+
+If the @option{-fpreprocessed} option is enabled, it suppresses
+predefinition of most builtin and command line macros.  This
+prevents duplicate definition of macros output with the @option{-E}
+option.
+
 @item -fdollars-in-identifiers
 @opindex fdollars-in-identifiers
 @anchor{fdollars-in-identifiers}
diff --git a/contrib/gcc/doc/extend.texi b/contrib/gcc/doc/extend.texi
index d27af1083a4..c6bd57d1dea 100644
--- a/contrib/gcc/doc/extend.texi
+++ b/contrib/gcc/doc/extend.texi
@@ -1577,6 +1577,7 @@ The keyword @code{__attribute__} allows you to specify special
 attributes when making a declaration.  This keyword is followed by an
 attribute specification inside double parentheses.  The following
 attributes are currently defined for functions on all targets:
+@code{aligned},
 @code{noreturn}, @code{returns_twice}, @code{noinline}, @code{always_inline},
 @code{flatten}, @code{pure}, @code{const}, @code{nothrow}, @code{sentinel},
 @code{format}, @code{format_arg}, @code{no_instrument_function},
@@ -1615,6 +1616,27 @@ is not defined in the same translation unit.
 
 Not all target machines support this attribute.
 
+@item aligned (@var{alignment})
+@cindex @code{aligned} attribute
+This attribute specifies a minimum alignment for the function,
+measured in bytes.
+
+You cannot use this attribute to decrease the alignment of a function,
+only to increase it.  However, when you explicitly specify a function
+alignment this will override the effect of the
+@option{-falign-functions} (@pxref{Optimize Options}) option for this
+function.
+
+Note that the effectiveness of @code{aligned} attributes may be
+limited by inherent limitations in your linker.  On many systems, the
+linker is only able to arrange for functions to be aligned up to a
+certain maximum alignment.  (For some linkers, the maximum supported
+alignment may be very very small.)  See your linker documentation for
+further information.
+
+The @code{aligned} attribute can also be used for variables and fields
+(@pxref{Variable Attributes}.)
+
 @item always_inline
 @cindex @code{always_inline} function attribute
 Generally, functions are not inlined unless optimization is specified.
@@ -3044,6 +3066,9 @@ up to a maximum of 8 byte alignment, then specifying @code{aligned(16)}
 in an @code{__attribute__} will still only provide you with 8 byte
 alignment.  See your linker documentation for further information.
 
+The @code{aligned} attribute can also be used for functions 
+(@pxref{Function Attributes}.)
+
 @item cleanup (@var{cleanup_function})
 @cindex @code{cleanup} attribute
 The @code{cleanup} attribute runs a function when the variable goes
@@ -6146,6 +6171,16 @@ Similar to @code{__builtin_powi}, except the argument and return types
 are @code{long double}.
 @end deftypefn
 
+@deftypefn {Built-in Function} int32_t __builtin_bswap32 (int32_t x)
+Returns @var{x} with the order of the bytes reversed; for example,
+@code{0xaabbccdd} becomes @code{0xddccbbaa}.  Byte here always means
+exactly 8 bits.
+@end deftypefn
+
+@deftypefn {Built-in Function} int64_t __builtin_bswap64 (int64_t x)
+Similar to @code{__builtin_bswap32}, except the argument and return types
+are 64-bit.
+@end deftypefn
 
 @node Target Builtins
 @section Built-in Functions Specific to Particular Target Machines
diff --git a/contrib/gcc/doc/invoke.texi b/contrib/gcc/doc/invoke.texi
index 13b9ae93d95..165bcc4fe94 100644
--- a/contrib/gcc/doc/invoke.texi
+++ b/contrib/gcc/doc/invoke.texi
@@ -167,7 +167,7 @@ in the following sections.
 -fno-asm  -fno-builtin  -fno-builtin-@var{function} @gol
 -fhosted  -ffreestanding -fopenmp -fms-extensions @gol
 -trigraphs  -no-integrated-cpp  -traditional  -traditional-cpp @gol
--fallow-single-precision  -fcond-mismatch @gol
+-fallow-single-precision  -fcond-mismatch -flax-vector-conversions @gol
 -fsigned-bitfields  -fsigned-char @gol
 -funsigned-bitfields  -funsigned-char}
 
@@ -186,6 +186,7 @@ in the following sections.
 -frepo  -fno-rtti  -fstats  -ftemplate-depth-@var{n} @gol
 -fno-threadsafe-statics -fuse-cxa-atexit  -fno-weak  -nostdinc++ @gol
 -fno-default-inline  -fvisibility-inlines-hidden @gol
+-fvisibility-ms-compat @gol
 -Wabi  -Wctor-dtor-privacy @gol
 -Wnon-virtual-dtor  -Wreorder @gol
 -Weffc++  -Wno-deprecated  -Wstrict-null-sentinel @gol
@@ -214,7 +215,8 @@ in the following sections.
 -Wimport  -Wno-import  -Winit-self  -Winline @gol
 -Wno-int-to-pointer-cast @gol
 -Wno-invalid-offsetof  -Winvalid-pch @gol
--Wlarger-than-@var{len}  -Wunsafe-loop-optimizations  -Wlong-long @gol
+-Wlarger-than-@var{len}  -Wframe-larger-than-@var{len} @gol
+-Wunsafe-loop-optimizations  -Wlong-long @gol
 -Wmain  -Wmissing-braces  -Wmissing-field-initializers @gol
 -Wmissing-format-attribute  -Wmissing-include-dirs @gol
 -Wmissing-noreturn @gol
@@ -230,7 +232,8 @@ in the following sections.
 -Wsystem-headers  -Wtrigraphs  -Wundef  -Wuninitialized @gol
 -Wunknown-pragmas  -Wno-pragmas -Wunreachable-code @gol
 -Wunused  -Wunused-function  -Wunused-label  -Wunused-parameter @gol
--Wunused-value  -Wunused-variable  -Wvariadic-macros @gol
+-Wunused-value  -Wunused-variable @gol
+-Wvariadic-macros -Wvla @gol
 -Wvolatile-register-var  -Wwrite-strings}
 
 @item C-only Warning Options
@@ -274,6 +277,8 @@ in the following sections.
 -ftest-coverage  -ftime-report -fvar-tracking @gol
 -g  -g@var{level}  -gcoff -gdwarf-2 @gol
 -ggdb  -gstabs  -gstabs+  -gvms  -gxcoff  -gxcoff+ @gol
+-femit-struct-debug-baseonly -femit-struct-debug-reduced @gol
+-femit-struct-debug-detailed@r{[}=@var{spec-list}@r{]} @gol
 -p  -pg  -print-file-name=@var{library}  -print-libgcc-file-name @gol
 -print-multi-directory  -print-multi-lib @gol
 -print-prog-name=@var{program}  -print-search-dirs  -Q @gol
@@ -755,6 +760,8 @@ See S/390 and zSeries Options.
 -fnon-call-exceptions  -funwind-tables @gol
 -fasynchronous-unwind-tables @gol
 -finhibit-size-directive  -finstrument-functions @gol
+-finstrument-functions-exclude-function-list=@var{sym},@var{sym},@dots{} @gol
+-finstrument-functions-exclude-file-list=@var{file},@var{file},@dots{} @gol
 -fno-common  -fno-ident @gol
 -fpcc-struct-return  -fpic  -fPIC -fpie -fPIE @gol
 -fno-jump-tables @gol
@@ -1331,6 +1338,12 @@ Allow conditional expressions with mismatched types in the second and
 third arguments.  The value of such an expression is void.  This option
 is not supported for C++.
 
+@item -flax-vector-conversions
+@opindex flax-vector-conversions
+Allow implicit conversions between vectors with differing numbers of
+elements and/or incompatible element types.  This option should not be
+used for new code.
+
 @item -funsigned-char
 @opindex funsigned-char
 Let the type @code{char} be unsigned, like @code{unsigned char}.
@@ -1614,6 +1627,40 @@ Explicitly instantiated inline methods are unaffected by this option
 as their linkage might otherwise cross a shared library boundary.
 @xref{Template Instantiation}.
 
+@item -fvisibility-ms-compat
+@opindex fvisibility-ms-compat
+This flag attempts to use visibility settings to make GCC's C++
+linkage model compatible with that of Microsoft Visual Studio.
+
+The flag makes these changes to GCC's linkage model:
+
+@enumerate
+@item
+It sets the default visibility to @code{hidden}, like
+@option{-fvisibility=hidden}.
+
+@item
+Types, but not their members, are not hidden by default.
+
+@item
+The One Definition Rule is relaxed for types without explicit
+visibility specifications which are defined in more than one different
+shared object: those declarations are permitted if they would have
+been permitted when this option was not used.
+@end enumerate
+
+In new code it is better to use @option{-fvisibility=hidden} and
+export those classes which are intended to be externally visible.
+Unfortunately it is possible for code to rely, perhaps accidentally,
+on the Visual Studio behaviour.
+
+Among the consequences of these changes are that static data members
+of the same type with the same name but defined in different shared
+objects will be different, so changing one will not change the other;
+and that pointers to function members defined in different shared
+objects may not compare equal.  When this flag is given, it is a
+violation of the ODR to define types with the same name differently.
+
 @item -fno-weak
 @opindex fno-weak
 Do not use weak symbol support, even if it is provided by the linker.
@@ -2212,9 +2259,7 @@ Warn if a user-supplied include directory does not exist.
 Warn if parentheses are omitted in certain contexts, such
 as when there is an assignment in a context where a truth value
 is expected, or when operators are nested whose precedence people
-often get confused about.  Only the warning for an assignment used as
-a truth value is supported when compiling C++; the other warnings are
-only supported when compiling C@.
+often get confused about.
 
 Also warn if a comparison like @samp{x<=y<=z} appears; this is
 equivalent to @samp{(x<=y ? 1 : 0) <= z}, which is a different
@@ -2236,14 +2281,15 @@ such a case:
 @end group
 @end smallexample
 
-In C, every @code{else} branch belongs to the innermost possible @code{if}
-statement, which in this example is @code{if (b)}.  This is often not
-what the programmer expected, as illustrated in the above example by
-indentation the programmer chose.  When there is the potential for this
-confusion, GCC will issue a warning when this flag is specified.
-To eliminate the warning, add explicit braces around the innermost
-@code{if} statement so there is no way the @code{else} could belong to
-the enclosing @code{if}.  The resulting code would look like this:
+In C/C++, every @code{else} branch belongs to the innermost possible
+@code{if} statement, which in this example is @code{if (b)}.  This is
+often not what the programmer expected, as illustrated in the above
+example by indentation the programmer chose.  When there is the
+potential for this confusion, GCC will issue a warning when this flag
+is specified.  To eliminate the warning, add explicit braces around
+the innermost @code{if} statement so there is no way the @code{else}
+could belong to the enclosing @code{if}.  The resulting code would
+look like this:
 
 @smallexample
 @group
@@ -2503,14 +2549,40 @@ It warns about code which might break the strict aliasing rules that the
 compiler is using for optimization.  The warning does not catch all
 cases, but does attempt to catch the more common pitfalls.  It is
 included in @option{-Wall}.
+It is equivalent to -Wstrict-aliasing=3
 
-@item -Wstrict-aliasing=2
-@opindex Wstrict-aliasing=2
+@item -Wstrict-aliasing=n
+@opindex Wstrict-aliasing=n
 This option is only active when @option{-fstrict-aliasing} is active.
 It warns about code which might break the strict aliasing rules that the
-compiler is using for optimization.  This warning catches more cases than
-@option{-Wstrict-aliasing}, but it will also give a warning for some ambiguous
-cases that are safe.
+compiler is using for optimization.
+Higher levels correspond to higher accuracy (fewer false positives).
+Higher levels also correspond to more effort, similar to the way -O works.
+@option{-Wstrict-aliasing} is equivalent to @option{-Wstrict-aliasing=n},
+with n=3.
+
+Level 1: Most aggressive, quick, least accurate.
+Possibly useful when higher levels
+do not warn but -fstrict-aliasing still breaks the code, as it has very few 
+false negatives.  However, it has many false positives.
+Warns for all pointer conversions between possibly incompatible types, 
+even if never dereferenced.  Runs in the frontend only.
+
+Level 2: Aggressive, quick, not too precise.
+May still have many false positives (not as many as level 1 though),
+and few false negatives (but possibly more than level 1).
+Unlike level 1, it only warns when an address is taken.  Warns about
+incomplete types.  Runs in the frontend only.
+
+Level 3 (default for @option{-Wstrict-aliasing}): 
+Should have very few false positives and few false 
+negatives.  Slightly slower than levels 1 or 2 when optimization is enabled.
+Takes care of the common punn+dereference pattern in the frontend:
+@code{*(int*)&some_float}.
+If optimization is enabled, it also runs in the backend, where it deals 
+with multiple statement cases using flow-sensitive points-to information.
+Only warns when the converted pointer is dereferenced.
+Does not warn about incomplete types.
 
 @item -Wstrict-overflow
 @item -Wstrict-overflow=@var{n}
@@ -2826,6 +2898,10 @@ global variable or whenever a built-in function is shadowed.
 @opindex Wlarger-than
 Warn whenever an object of larger than @var{len} bytes is defined.
 
+@item -Wframe-larger-than-@var{len}
+@opindex Wframe-larger-than
+Warn whenever the frame size of a function is larger than @var{len} bytes.
+
 @item -Wunsafe-loop-optimizations
 @opindex Wunsafe-loop-optimizations
 Warn if the loop cannot be optimized because the compiler could not
@@ -3202,6 +3278,13 @@ Warn if variadic macros are used in pedantic ISO C90 mode, or the GNU
 alternate syntax when in pedantic ISO C99 mode.  This is default.
 To inhibit the warning messages, use @option{-Wno-variadic-macros}.
 
+@item -Wvla
+@opindex Wvla
+@opindex Wno-vla
+Warn if variable length array is used in the code.
+@option{-Wno-vla} will prevent the @option{-pedantic} warning of
+the variable length array.
+
 @item -Wvolatile-register-var
 @opindex Wvolatile-register-var
 @opindex Wno-volatile-register-var
@@ -3404,6 +3487,78 @@ Compress DWARF2 debugging information by eliminating duplicated
 information about each symbol.  This option only makes sense when
 generating DWARF2 debugging information with @option{-gdwarf-2}.
 
+@item -femit-struct-debug-baseonly
+Emit debug information for struct-like types
+only when the base name of the compilation source file
+matches the base name of file in which the struct was defined.
+
+This option substantially reduces the size of debugging information,
+but at significant potential loss in type information to the debugger.
+See @option{-femit-struct-debug-reduced} for a less aggressive option.
+See @option{-femit-struct-debug-detailed} for more detailed control.
+
+This option works only with DWARF 2.
+
+@item -femit-struct-debug-reduced
+Emit debug information for struct-like types
+only when the base name of the compilation source file
+matches the base name of file in which the type was defined,
+unless the struct is a template or defined in a system header.
+
+This option significantly reduces the size of debugging information,
+with some potential loss in type information to the debugger.
+See @option{-femit-struct-debug-baseonly} for a more aggressive option.
+See @option{-femit-struct-debug-detailed} for more detailed control.
+
+This option works only with DWARF 2.
+
+@item -femit-struct-debug-detailed@r{[}=@var{spec-list}@r{]}
+Specify the struct-like types
+for which the compiler will generate debug information.
+The intent is to reduce duplicate struct debug information
+between different object files within the same program.
+
+This option is a detailed version of
+@option{-femit-struct-debug-reduced} and @option{-femit-struct-debug-baseonly},
+which will serve for most needs.
+
+A specification has the syntax
+[@samp{dir:}|@samp{ind:}][@samp{ord:}|@samp{gen:}](@samp{any}|@samp{sys}|@samp{base}|@samp{none})
+
+The optional first word limits the specification to
+structs that are used directly (@samp{dir:}) or used indirectly (@samp{ind:}).
+A struct type is used directly when it is the type of a variable, member.
+Indirect uses arise through pointers to structs.
+That is, when use of an incomplete struct would be legal, the use is indirect.
+An example is
+@samp{struct one direct; struct two * indirect;}.
+
+The optional second word limits the specification to
+ordinary structs (@samp{ord:}) or generic structs (@samp{gen:}).
+Generic structs are a bit complicated to explain.
+For C++, these are non-explicit specializations of template classes,
+or non-template classes within the above.
+Other programming languages have generics,
+but @samp{-femit-struct-debug-detailed} does not yet implement them.
+
+The third word specifies the source files for those
+structs for which the compiler will emit debug information.
+The values @samp{none} and @samp{any} have the normal meaning.
+The value @samp{base} means that
+the base of name of the file in which the type declaration appears
+must match the base of the name of the main compilation file.
+In practice, this means that
+types declared in @file{foo.c} and @file{foo.h} will have debug information,
+but types declared in other header will not.
+The value @samp{sys} means those types satisfying @samp{base}
+or declared in system or compiler headers.
+
+You may need to experiment to determine the best settings for your application.
+
+The default is @samp{-femit-struct-debug-detailed=all}.
+
+This option works only with DWARF 2.
+
 @cindex @command{prof}
 @item -p
 @opindex p
@@ -13274,6 +13429,37 @@ interrupt routines, and any functions from which the profiling functions
 cannot safely be called (perhaps signal handlers, if the profiling
 routines generate output or allocate memory).
 
+@item -finstrument-functions-exclude-file-list=@var{file},@var{file},@dots{}
+@opindex finstrument-functions-exclude-file-list
+
+Set the list of functions that are excluded from instrumentation (see
+the description of @code{-finstrument-functions}).  If the file that
+contains a function definition matches with one of @var{file}, then
+that function is not instrumented.  The match is done on substrings:
+if the @var{file} parameter is a substring of the file name, it is
+considered to be a match.
+
+For example,
+@code{-finstrument-functions-exclude-file-list=/bits/stl,include/sys}
+will exclude any inline function defined in files whose pathnames
+contain @code{/bits/stl} or @code{include/sys}.
+
+If, for some reason, you want to include letter @code{','} in one of
+@var{sym}, write @code{'\,'}. For example,
+@code{-finstrument-functions-exclude-file-list='\,\,tmp'}
+(note the single quote surrounding the option).
+
+@item -finstrument-functions-exclude-function-list=@var{sym},@var{sym},@dots{}
+@opindex finstrument-functions-exclude-function-list
+
+This is similar to @code{-finstrument-functions-exclude-file-list},
+but this option sets the list of function names to be excluded from
+instrumentation.  The function name to be matched is its user-visible
+name, such as @code{vector<int> blah(const vector<int> &)}, not the
+internal mangled name (e.g., @code{_Z4blahRSt6vectorIiSaIiEE}).  The
+match is done on substrings: if the @var{sym} parameter is a substring
+of the function name, it is considered to be a match.
+
 @item -fstack-check
 @opindex fstack-check
 Generate code to verify that you do not go beyond the boundary of the
@@ -13851,3 +14037,4 @@ exist, because otherwise they won't get converted.
 
 @xref{Protoize Caveats}, for more information on how to use
 @code{protoize} successfully.
+
diff --git a/contrib/gcc/doc/libgcc.texi b/contrib/gcc/doc/libgcc.texi
index f67b117f06d..fcc55d737c3 100644
--- a/contrib/gcc/doc/libgcc.texi
+++ b/contrib/gcc/doc/libgcc.texi
@@ -212,6 +212,11 @@ These functions return the value zero if the number of bits set in
 These functions return the number of bits set in @var{a}.
 @end deftypefn
 
+@deftypefn {Runtime Function} int32_t __bswapsi2 (int32_t @var{a})
+@deftypefnx {Runtime Function} int64_t __bswapdi2 (int64_t @var{a})
+These functions return the @var{a} byteswapped.
+@end deftypefn
+
 @node Soft float library routines
 @section Routines for floating point emulation
 @cindex soft float library
@@ -728,4 +733,3 @@ document me!
 @deftypefn {Runtime Function} void __clear_cache (char *@var{beg}, char *@var{end})
 This function clears the instruction cache between @var{beg} and @var{end}.
 @end deftypefn
-
diff --git a/contrib/gcc/doc/rtl.texi b/contrib/gcc/doc/rtl.texi
index 76e8f16face..d97b2b327ef 100644
--- a/contrib/gcc/doc/rtl.texi
+++ b/contrib/gcc/doc/rtl.texi
@@ -2084,6 +2084,11 @@ mode @var{m}.  The mode of @var{x} will usually be an integer mode.
 Represents the number of 1-bits modulo 2 in @var{x}, represented as an
 integer of mode @var{m}.  The mode of @var{x} will usually be an integer
 mode.
+
+@findex bswap
+@item (bswap:@var{m} @var{x})
+Represents the value @var{x} with the order of bytes reversed, carried out
+in mode @var{m}, which must be a fixed-point machine mode.
 @end table
 
 @node Comparisons
diff --git a/contrib/gcc/dwarf2out.c b/contrib/gcc/dwarf2out.c
index 5e4354a40b0..266973ab6c8 100644
--- a/contrib/gcc/dwarf2out.c
+++ b/contrib/gcc/dwarf2out.c
@@ -2030,7 +2030,7 @@ switch_to_eh_frame_section (void)
       /* We have no special eh_frame section.  Put the information in
 	 the data section and emit special labels to guide collect2.  */
       switch_to_section (data_section);
-      label = get_file_function_name ('F');
+      label = get_file_function_name ("F");
       ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (PTR_SIZE));
       targetm.asm_out.globalize_label (asm_out_file,
 				       IDENTIFIER_POINTER (label));
@@ -4215,7 +4215,8 @@ static void gen_ptr_to_mbr_type_die (tree, dw_die_ref);
 static dw_die_ref gen_compile_unit_die (const char *);
 static void gen_inheritance_die (tree, tree, dw_die_ref);
 static void gen_member_die (tree, dw_die_ref);
-static void gen_struct_or_union_type_die (tree, dw_die_ref);
+static void gen_struct_or_union_type_die (tree, dw_die_ref,
+						enum debug_info_usage);
 static void gen_subroutine_type_die (tree, dw_die_ref);
 static void gen_typedef_die (tree, dw_die_ref);
 static void gen_type_die (tree, dw_die_ref);
@@ -12473,7 +12474,8 @@ gen_member_die (tree type, dw_die_ref context_die)
    member DIEs needed by later specification DIEs.  */
 
 static void
-gen_struct_or_union_type_die (tree type, dw_die_ref context_die)
+gen_struct_or_union_type_die (tree type, dw_die_ref context_die,
+				enum debug_info_usage usage)
 {
   dw_die_ref type_die = lookup_type_die (type);
   dw_die_ref scope_die = 0;
@@ -12482,6 +12484,7 @@ gen_struct_or_union_type_die (tree type, dw_die_ref context_die)
 		  && (! TYPE_STUB_DECL (type)
 		      || ! TYPE_DECL_SUPPRESS_DEBUG (TYPE_STUB_DECL (type))));
   int ns_decl = (context_die && context_die->die_tag == DW_TAG_namespace);
+  complete = complete && should_emit_struct_debug (type, usage);
 
   if (type_die && ! complete)
     return;
@@ -12609,7 +12612,8 @@ gen_typedef_die (tree decl, dw_die_ref context_die)
 /* Generate a type description DIE.  */
 
 static void
-gen_type_die (tree type, dw_die_ref context_die)
+gen_type_die_with_usage (tree type, dw_die_ref context_die,
+				enum debug_info_usage usage)
 {
   int need_pop;
 
@@ -12657,16 +12661,19 @@ gen_type_die (tree type, dw_die_ref context_die)
 
       /* For these types, all that is required is that we output a DIE (or a
 	 set of DIEs) to represent the "basis" type.  */
-      gen_type_die (TREE_TYPE (type), context_die);
+      gen_type_die_with_usage (TREE_TYPE (type), context_die,
+				DINFO_USAGE_IND_USE);
       break;
 
     case OFFSET_TYPE:
       /* This code is used for C++ pointer-to-data-member types.
 	 Output a description of the relevant class type.  */
-      gen_type_die (TYPE_OFFSET_BASETYPE (type), context_die);
+      gen_type_die_with_usage (TYPE_OFFSET_BASETYPE (type), context_die,
+					DINFO_USAGE_IND_USE);
 
       /* Output a description of the type of the object pointed to.  */
-      gen_type_die (TREE_TYPE (type), context_die);
+      gen_type_die_with_usage (TREE_TYPE (type), context_die,
+					DINFO_USAGE_IND_USE);
 
       /* Now output a DIE to represent this pointer-to-data-member type
 	 itself.  */
@@ -12675,13 +12682,15 @@ gen_type_die (tree type, dw_die_ref context_die)
 
     case FUNCTION_TYPE:
       /* Force out return type (in case it wasn't forced out already).  */
-      gen_type_die (TREE_TYPE (type), context_die);
+      gen_type_die_with_usage (TREE_TYPE (type), context_die,
+					DINFO_USAGE_DIR_USE);
       gen_subroutine_type_die (type, context_die);
       break;
 
     case METHOD_TYPE:
       /* Force out return type (in case it wasn't forced out already).  */
-      gen_type_die (TREE_TYPE (type), context_die);
+      gen_type_die_with_usage (TREE_TYPE (type), context_die,
+					DINFO_USAGE_DIR_USE);
       gen_subroutine_type_die (type, context_die);
       break;
 
@@ -12707,7 +12716,7 @@ gen_type_die (tree type, dw_die_ref context_die)
 	  && AGGREGATE_TYPE_P (TYPE_CONTEXT (type))
 	  && ! TREE_ASM_WRITTEN (TYPE_CONTEXT (type)))
 	{
-	  gen_type_die (TYPE_CONTEXT (type), context_die);
+	  gen_type_die_with_usage (TYPE_CONTEXT (type), context_die, usage);
 
 	  if (TREE_ASM_WRITTEN (type))
 	    return;
@@ -12731,7 +12740,7 @@ gen_type_die (tree type, dw_die_ref context_die)
 	    gen_enumeration_type_die (type, context_die);
 	}
       else
-	gen_struct_or_union_type_die (type, context_die);
+	gen_struct_or_union_type_die (type, context_die, usage);
 
       if (need_pop)
 	pop_decl_scope ();
@@ -12760,6 +12769,12 @@ gen_type_die (tree type, dw_die_ref context_die)
   TREE_ASM_WRITTEN (type) = 1;
 }
 
+static void
+gen_type_die (tree type, dw_die_ref context_die)
+{
+  gen_type_die_with_usage (type, context_die, DINFO_USAGE_DIR_USE);
+}
+
 /* Generate a DIE for a tagged type instantiation.  */
 
 static void
@@ -13357,7 +13372,11 @@ dwarf2out_imported_module_or_decl (tree decl, tree context)
   if (!context)
     scope_die = comp_unit_die;
   else if (TYPE_P (context))
+    {
+      if (!should_emit_struct_debug (context, DINFO_USAGE_DIR_USE))
+	return;
     scope_die = force_type_die (context);
+    }
   else
     scope_die = force_decl_die (context);
 
@@ -13383,7 +13402,12 @@ dwarf2out_imported_module_or_decl (tree decl, tree context)
 
 	      if (TYPE_CONTEXT (type))
 		if (TYPE_P (TYPE_CONTEXT (type)))
+		  {
+		    if (!should_emit_struct_debug (TYPE_CONTEXT (type),
+						   DINFO_USAGE_DIR_USE))
+		      return;
 		  type_context_die = force_type_die (TYPE_CONTEXT (type));
+		  }
 	      else
 		type_context_die = force_decl_die (TYPE_CONTEXT (type));
 	      else
diff --git a/contrib/gcc/expr.c b/contrib/gcc/expr.c
index 3655eb0aa04..16e43aa3d74 100644
--- a/contrib/gcc/expr.c
+++ b/contrib/gcc/expr.c
@@ -361,6 +361,8 @@ convert_move (rtx to, rtx from, int unsignedp)
 
 
   gcc_assert (to_real == from_real);
+  gcc_assert (to_mode != BLKmode);
+  gcc_assert (from_mode != BLKmode);
 
   /* If the source and destination are already the same, then there's
      nothing to do.  */
@@ -415,7 +417,7 @@ convert_move (rtx to, rtx from, int unsignedp)
 		   != GET_MODE_PRECISION (to_mode))
 		  || (DECIMAL_FLOAT_MODE_P (from_mode)
 		      != DECIMAL_FLOAT_MODE_P (to_mode)));
-      
+
       if (GET_MODE_PRECISION (from_mode) == GET_MODE_PRECISION (to_mode))
 	/* Conversion between decimal float and binary float, same size.  */
 	tab = DECIMAL_FLOAT_MODE_P (from_mode) ? trunc_optab : sext_optab;
@@ -2135,7 +2137,7 @@ void
 use_reg (rtx *call_fusage, rtx reg)
 {
   gcc_assert (REG_P (reg) && REGNO (reg) < FIRST_PSEUDO_REGISTER);
-  
+
   *call_fusage
     = gen_rtx_EXPR_LIST (VOIDmode,
 			 gen_rtx_USE (VOIDmode, reg), *call_fusage);
@@ -2682,7 +2684,7 @@ set_storage_via_setmem (rtx object, rtx size, rtx val, unsigned int align)
 	  pred = insn_data[(int) code].operand[1].predicate;
 	  if (pred != 0 && ! (*pred) (opsize, mode))
 	    opsize = copy_to_mode_reg (mode, opsize);
-	  
+
 	  opchar = val;
 	  char_mode = insn_data[(int) code].operand[2].mode;
 	  if (char_mode != VOIDmode)
@@ -3140,9 +3142,9 @@ emit_move_multi_word (enum machine_mode mode, rtx x, rtx y)
   rtx seq, inner;
   bool need_clobber;
   int i;
-      
+
   gcc_assert (GET_MODE_SIZE (mode) >= UNITS_PER_WORD);
-      
+
   /* If X is a push on the stack, do the push now and replace
      X with a reference to the stack pointer.  */
   if (push_operand (x, mode))
@@ -4440,6 +4442,11 @@ store_expr (tree exp, rtx target, int call_param_p)
 	      temp = convert_to_mode (GET_MODE (target), temp, unsignedp);
 	      emit_move_insn (target, temp);
 	    }
+	  else if (GET_MODE (target) == BLKmode)
+	    emit_block_move (target, temp, expr_size (exp),
+			     (call_param_p
+			      ? BLOCK_OP_CALL_PARM
+			      : BLOCK_OP_NORMAL));
 	  else
 	    convert_move (target, temp, unsignedp);
 	}
@@ -4571,7 +4578,7 @@ categorize_ctor_elements_1 (tree ctor, HOST_WIDE_INT *p_nz_elts,
 	case CONSTRUCTOR:
 	  {
 	    HOST_WIDE_INT nz = 0, ic = 0;
-	    
+
 	    bool const_elt_p
 	      = categorize_ctor_elements_1 (value, &nz, &ic, p_must_clear);
 
@@ -4648,7 +4655,7 @@ categorize_ctor_elements_1 (tree ctor, HOST_WIDE_INT *p_nz_elts,
 	     largest element.  Which would avoid comparing the size of the
 	     initialized element against any tail padding in the union.
 	     Doesn't seem worth the effort...  */
-	  if (simple_cst_equal (TYPE_SIZE (TREE_TYPE (ctor)), 
+	  if (simple_cst_equal (TYPE_SIZE (TREE_TYPE (ctor)),
 				TYPE_SIZE (init_sub_type)) == 1)
 	    {
 	      /* And now we have to find out if the element itself is fully
@@ -4944,24 +4951,24 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 	    HOST_WIDE_INT bitpos = 0;
 	    tree offset;
 	    rtx to_rtx = target;
-	    
+
 	    /* Just ignore missing fields.  We cleared the whole
 	       structure, above, if any fields are missing.  */
 	    if (field == 0)
 	      continue;
-	    
+
 	    if (cleared && initializer_zerop (value))
 	      continue;
-	    
+
 	    if (host_integerp (DECL_SIZE (field), 1))
 	      bitsize = tree_low_cst (DECL_SIZE (field), 1);
 	    else
 	      bitsize = -1;
-	    
+
 	    mode = DECL_MODE (field);
 	    if (DECL_BIT_FIELD (field))
 	      mode = VOIDmode;
-	    
+
 	    offset = DECL_FIELD_OFFSET (field);
 	    if (host_integerp (offset, 0)
 		&& host_integerp (bit_position (field), 0))
@@ -4971,11 +4978,11 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 	      }
 	    else
 	      bitpos = tree_low_cst (DECL_FIELD_BIT_OFFSET (field), 0);
-	    
+
 	    if (offset)
 	      {
 		rtx offset_rtx;
-		
+
 		offset
 		  = SUBSTITUTE_PLACEHOLDER_IN_EXPR (offset,
 						    make_tree (TREE_TYPE (exp),
@@ -4983,7 +4990,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 
 		offset_rtx = expand_normal (offset);
 		gcc_assert (MEM_P (to_rtx));
-		
+
 #ifdef POINTERS_EXTEND_UNSIGNED
 		if (GET_MODE (offset_rtx) != Pmode)
 		  offset_rtx = convert_to_mode (Pmode, offset_rtx, 0);
@@ -5011,14 +5018,14 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 		&& bitpos + BITS_PER_WORD <= exp_size * BITS_PER_UNIT)
 	      {
 		tree type = TREE_TYPE (value);
-		
+
 		if (TYPE_PRECISION (type) < BITS_PER_WORD)
 		  {
 		    type = lang_hooks.types.type_for_size
 		      (BITS_PER_WORD, TYPE_UNSIGNED (type));
 		    value = fold_convert (type, value);
 		  }
-		
+
 		if (BYTES_BIG_ENDIAN)
 		  value
 		   = fold_build2 (LSHIFT_EXPR, type, value,
@@ -5035,7 +5042,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 		to_rtx = copy_rtx (to_rtx);
 		MEM_KEEP_ALIAS_SET_P (to_rtx) = 1;
 	      }
-	    
+
 	    store_constructor_field (to_rtx, bitsize, bitpos, mode,
 				     value, type, cleared,
 				     get_alias_set (TREE_TYPE (field)));
@@ -5079,7 +5086,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 	    tree index, value;
 	    HOST_WIDE_INT count = 0, zero_count = 0;
 	    need_to_clear = ! const_bounds_p;
-	    
+
 	    /* This loop is a more accurate version of the loop in
 	       mostly_zeros_p (it handles RANGE_EXPR in an index).  It
 	       is also needed to check for missing elements.  */
@@ -5089,30 +5096,30 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 
 		if (need_to_clear)
 		  break;
-		
+
 		if (index != NULL_TREE && TREE_CODE (index) == RANGE_EXPR)
 		  {
 		    tree lo_index = TREE_OPERAND (index, 0);
 		    tree hi_index = TREE_OPERAND (index, 1);
-		    
+
 		    if (! host_integerp (lo_index, 1)
 			|| ! host_integerp (hi_index, 1))
 		      {
 			need_to_clear = 1;
 			break;
 		      }
-		    
+
 		    this_node_count = (tree_low_cst (hi_index, 1)
 				       - tree_low_cst (lo_index, 1) + 1);
 		  }
 		else
 		  this_node_count = 1;
-		
+
 		count += this_node_count;
 		if (mostly_zeros_p (value))
 		  zero_count += this_node_count;
 	      }
-	    
+
 	    /* Clear the entire array first if there are any missing
 	       elements, or if the incidence of zero elements is >=
 	       75%.  */
@@ -5121,7 +5128,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 		    || 4 * zero_count >= 3 * count))
 	      need_to_clear = 1;
 	  }
-	
+
 	if (need_to_clear && size > 0)
 	  {
 	    if (REG_P (target))
@@ -5145,10 +5152,10 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 	    HOST_WIDE_INT bitpos;
 	    int unsignedp;
 	    rtx xtarget = target;
-	    
+
 	    if (cleared && initializer_zerop (value))
 	      continue;
-	    
+
 	    unsignedp = TYPE_UNSIGNED (elttype);
 	    mode = TYPE_MODE (elttype);
 	    if (mode == BLKmode)
@@ -5157,7 +5164,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 			 : -1);
 	    else
 	      bitsize = GET_MODE_BITSIZE (mode);
-	    
+
 	    if (index != NULL_TREE && TREE_CODE (index) == RANGE_EXPR)
 	      {
 		tree lo_index = TREE_OPERAND (index, 0);
@@ -5165,7 +5172,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 		rtx index_r, pos_rtx;
 		HOST_WIDE_INT lo, hi, count;
 		tree position;
-		
+
 		/* If the range is constant and "small", unroll the loop.  */
 		if (const_bounds_p
 		    && host_integerp (lo_index, 0)
@@ -5183,7 +5190,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 		    for (; lo <= hi; lo++)
 		      {
 			bitpos = lo * tree_low_cst (TYPE_SIZE (elttype), 0);
-			
+
 			if (MEM_P (target)
 			    && !MEM_KEEP_ALIAS_SET_P (target)
 			    && TREE_CODE (type) == ARRAY_TYPE
@@ -5192,7 +5199,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 			    target = copy_rtx (target);
 			    MEM_KEEP_ALIAS_SET_P (target) = 1;
 			  }
-			
+
 			store_constructor_field
 			  (target, bitsize, bitpos, mode, value, type, cleared,
 			   get_alias_set (elttype));
@@ -5203,18 +5210,18 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 		    rtx loop_start = gen_label_rtx ();
 		    rtx loop_end = gen_label_rtx ();
 		    tree exit_cond;
-		    
+
 		    expand_normal (hi_index);
 		    unsignedp = TYPE_UNSIGNED (domain);
-		    
+
 		    index = build_decl (VAR_DECL, NULL_TREE, domain);
-		    
+
 		    index_r
 		      = gen_reg_rtx (promote_mode (domain, DECL_MODE (index),
 						   &unsignedp, 0));
 		    SET_DECL_RTL (index, index_r);
 		    store_expr (lo_index, index_r, 0);
-		    
+
 		    /* Build the head of the loop.  */
 		    do_pending_stack_adjust ();
 		    emit_label (loop_start);
@@ -5231,7 +5238,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 			size_binop (MULT_EXPR, position,
 				    fold_convert (ssizetype,
 						  TYPE_SIZE_UNIT (elttype)));
-		    
+
 		    pos_rtx = expand_normal (position);
 		    xtarget = offset_address (target, pos_rtx,
 					      highest_pow2_factor (position));
@@ -5246,15 +5253,15 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 		    exit_cond = build2 (LT_EXPR, integer_type_node,
 					index, hi_index);
 		    jumpif (exit_cond, loop_end);
-		    
+
 		    /* Update the loop counter, and jump to the head of
 		       the loop.  */
 		    expand_assignment (index,
 				       build2 (PLUS_EXPR, TREE_TYPE (index),
 					       index, integer_one_node));
-		    
+
 		    emit_jump (loop_start);
-		    
+
 		    /* Build the end of the loop.  */
 		    emit_label (loop_end);
 		  }
@@ -5263,17 +5270,17 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 		     || ! host_integerp (TYPE_SIZE (elttype), 1))
 	      {
 		tree position;
-		
+
 		if (index == 0)
 		  index = ssize_int (1);
-		
+
 		if (minelt)
 		  index = fold_convert (ssizetype,
 					fold_build2 (MINUS_EXPR,
 						     TREE_TYPE (index),
 						     index,
 						     TYPE_MIN_VALUE (domain)));
-		
+
 		position =
 		  size_binop (MULT_EXPR, index,
 			      fold_convert (ssizetype,
@@ -5291,7 +5298,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 			    * tree_low_cst (TYPE_SIZE (elttype), 1));
 		else
 		  bitpos = (i * tree_low_cst (TYPE_SIZE (elttype), 1));
-		
+
 		if (MEM_P (target) && !MEM_KEEP_ALIAS_SET_P (target)
 		    && TREE_CODE (type) == ARRAY_TYPE
 		    && TYPE_NONALIASED_COMPONENT (type))
@@ -5320,25 +5327,25 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 	HOST_WIDE_INT bitpos;
 	rtvec vector = NULL;
 	unsigned n_elts;
-	
+
 	gcc_assert (eltmode != BLKmode);
-	
+
 	n_elts = TYPE_VECTOR_SUBPARTS (type);
 	if (REG_P (target) && VECTOR_MODE_P (GET_MODE (target)))
 	  {
 	    enum machine_mode mode = GET_MODE (target);
-	    
+
 	    icode = (int) vec_init_optab->handlers[mode].insn_code;
 	    if (icode != CODE_FOR_nothing)
 	      {
 		unsigned int i;
-		
+
 		vector = rtvec_alloc (n_elts);
 		for (i = 0; i < n_elts; i++)
 		  RTVEC_ELT (vector, i) = CONST0_RTX (GET_MODE_INNER (mode));
 	      }
 	  }
-	
+
 	/* If the constructor has fewer elements than the vector,
 	   clear the whole array first.  Similarly if this is static
 	   constructor of a non-BLKmode object.  */
@@ -5350,14 +5357,14 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 	  {
 	    unsigned HOST_WIDE_INT count = 0, zero_count = 0;
 	    tree value;
-	    
+
 	    FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (exp), idx, value)
 	      {
 		int n_elts_here = tree_low_cst
 		  (int_const_binop (TRUNC_DIV_EXPR,
 				    TYPE_SIZE (TREE_TYPE (value)),
 				    TYPE_SIZE (elttype), 0), 1);
-		
+
 		count += n_elts_here;
 		if (mostly_zeros_p (value))
 		  zero_count += n_elts_here;
@@ -5367,7 +5374,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 	       or if the incidence of zero elements is >= 75%.  */
 	    need_to_clear = (count < n_elts || 4 * zero_count >= 3 * count);
 	  }
-	
+
 	if (need_to_clear && size > 0 && !vector)
 	  {
 	    if (REG_P (target))
@@ -5376,7 +5383,7 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 	      clear_storage (target, GEN_INT (size), BLOCK_OP_NORMAL);
 	    cleared = 1;
 	  }
-	
+
 	/* Inform later passes that the old value is dead.  */
 	if (!cleared && !vector && REG_P (target))
 	  emit_move_insn (target, CONST0_RTX (GET_MODE (target)));
@@ -5389,16 +5396,16 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 	  {
 	    HOST_WIDE_INT eltpos;
 	    tree value = ce->value;
-	    
+
 	    bitsize = tree_low_cst (TYPE_SIZE (TREE_TYPE (value)), 1);
 	    if (cleared && initializer_zerop (value))
 	      continue;
-	    
+
 	    if (ce->index)
 	      eltpos = tree_low_cst (ce->index, 1);
 	    else
 	      eltpos = i;
-	    
+
 	    if (vector)
 	      {
 	        /* Vector CONSTRUCTORs should only be built from smaller
@@ -5419,14 +5426,14 @@ store_constructor (tree exp, rtx target, int cleared, HOST_WIDE_INT size)
 					 cleared, get_alias_set (elttype));
 	      }
 	  }
-	
+
 	if (vector)
 	  emit_insn (GEN_FCN (icode)
 		     (target,
 		      gen_rtx_PARALLEL (GET_MODE (target), vector)));
 	break;
       }
-      
+
     default:
       gcc_unreachable ();
     }
@@ -6965,7 +6972,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
 	  && GET_MODE (decl_rtl) != DECL_MODE (exp))
 	{
 	  enum machine_mode pmode;
-	  
+
 	  /* Get the signedness used for this variable.  Ensure we get the
 	     same mode we got when the variable was declared.  */
 	  pmode = promote_mode (type, DECL_MODE (exp), &unsignedp,
@@ -7336,19 +7343,19 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
 		    tree index1 = index;
 		    tree low_bound = array_ref_low_bound (exp);
 		    index1 = fold_convert (sizetype, TREE_OPERAND (exp, 1));
-		    
+
 		    /* Optimize the special-case of a zero lower bound.
-		    
+
 		       We convert the low_bound to sizetype to avoid some problems
 		       with constant folding.  (E.g. suppose the lower bound is 1,
 		       and its mode is QI.  Without the conversion,l (ARRAY
 		       +(INDEX-(unsigned char)1)) becomes ((ARRAY+(-(unsigned char)1))
 		       +INDEX), which becomes (ARRAY+255+INDEX).  Opps!)  */
-		    
+
 		    if (! integer_zerop (low_bound))
 		      index1 = size_diffop (index1, fold_convert (sizetype,
 								  low_bound));
-		  
+
 		    if (0 > compare_tree_int (index1,
 					      TREE_STRING_LENGTH (init)))
 		      {
@@ -7751,7 +7758,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
 	  else
 	    {
 	      gcc_assert (REG_P (target));
-	      
+
 	      /* Store this field into a union of the proper type.  */
 	      store_field (target,
 			   MIN ((int_size_in_bytes (TREE_TYPE
@@ -7837,9 +7844,9 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
 	 other.  */
       else if (SCALAR_INT_MODE_P (GET_MODE (op0))
 	       && SCALAR_INT_MODE_P (TYPE_MODE (type)))
-	op0 = convert_modes (TYPE_MODE (type), GET_MODE (op0), op0, 
+	op0 = convert_modes (TYPE_MODE (type), GET_MODE (op0), op0,
 			     TYPE_UNSIGNED (TREE_TYPE (TREE_OPERAND (exp, 0))));
-      /* As a last resort, spill op0 to memory, and reload it in a 
+      /* As a last resort, spill op0 to memory, and reload it in a
 	 different mode.  */
       else if (!MEM_P (op0))
 	{
@@ -8742,7 +8749,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
 
     case REALIGN_LOAD_EXPR:
       {
-        tree oprnd0 = TREE_OPERAND (exp, 0); 
+        tree oprnd0 = TREE_OPERAND (exp, 0);
         tree oprnd1 = TREE_OPERAND (exp, 1);
         tree oprnd2 = TREE_OPERAND (exp, 2);
         rtx op2;
@@ -8750,7 +8757,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
         this_optab = optab_for_tree_code (code, type);
         expand_operands (oprnd0, oprnd1, NULL_RTX, &op0, &op1, EXPAND_NORMAL);
         op2 = expand_normal (oprnd2);
-        temp = expand_ternary_op (mode, this_optab, op0, op1, op2, 
+        temp = expand_ternary_op (mode, this_optab, op0, op1, op2,
 				  target, unsignedp);
         gcc_assert (temp);
         return temp;
@@ -8765,7 +8772,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
 
 	expand_operands (oprnd0, oprnd1, NULL_RTX, &op0, &op1, EXPAND_NORMAL);
 	op2 = expand_normal (oprnd2);
-	target = expand_widen_pattern_expr (exp, op0, op1, op2, 
+	target = expand_widen_pattern_expr (exp, op0, op1, op2,
 					    target, unsignedp);
 	return target;
       }
@@ -8774,7 +8781,7 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
       {
         tree oprnd0 = TREE_OPERAND (exp, 0);
         tree oprnd1 = TREE_OPERAND (exp, 1);
-                                                                               
+
         expand_operands (oprnd0, oprnd1, NULL_RTX, &op0, &op1, 0);
         target = expand_widen_pattern_expr (exp, op0, NULL_RTX, op1,
                                             target, unsignedp);
diff --git a/contrib/gcc/final.c b/contrib/gcc/final.c
index d64f0c3e228..ef50ed93383 100644
--- a/contrib/gcc/final.c
+++ b/contrib/gcc/final.c
@@ -1425,6 +1425,15 @@ final_start_function (rtx first ATTRIBUTE_UNUSED, FILE *file,
       TREE_ASM_WRITTEN (DECL_INITIAL (current_function_decl)) = 1;
     }
 
+  if (warn_frame_larger_than
+    && get_frame_size () > frame_larger_than_size)
+  {
+      /* Issue a warning */
+      warning (OPT_Wframe_larger_than_,
+               "the frame size of %wd bytes is larger than %wd bytes",
+               get_frame_size (), frame_larger_than_size);
+  }
+
   /* First output the function prologue: code to set up the stack frame.  */
   targetm.asm_out.function_prologue (file, get_frame_size ());
 
@@ -4083,4 +4092,3 @@ struct tree_opt_pass pass_clean_state =
   0,                                    /* todo_flags_finish */
   0                                     /* letter */
 };
-
diff --git a/contrib/gcc/flags.h b/contrib/gcc/flags.h
index 226fb603110..1c1fd0d3855 100644
--- a/contrib/gcc/flags.h
+++ b/contrib/gcc/flags.h
@@ -23,6 +23,7 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #ifndef GCC_FLAGS_H
 #define GCC_FLAGS_H
 
+#include "coretypes.h"
 #include "options.h"
 
 enum debug_info_type
@@ -54,6 +55,25 @@ enum debug_info_level
 /* Specify how much debugging info to generate.  */
 extern enum debug_info_level debug_info_level;
 
+/* A major contribution to object and executable size is debug
+   information size.  A major contribution to debug information
+   size is struct descriptions replicated in several object files.
+   The following function determines whether or not debug information
+   should be generated for a given struct.  The indirect parameter
+   indicates that the struct is being handled indirectly, via
+   a pointer.  See opts.c for the implementation. */
+
+enum debug_info_usage
+{
+  DINFO_USAGE_DFN,	/* A struct definition. */
+  DINFO_USAGE_DIR_USE,	/* A direct use, such as the type of a variable. */
+  DINFO_USAGE_IND_USE,	/* An indirect use, such as through a pointer. */
+  DINFO_USAGE_NUM_ENUMS	/* The number of enumerators. */
+};
+
+extern bool should_emit_struct_debug (tree type_decl, enum debug_info_usage);
+extern void set_struct_debug_option (const char *value);
+
 /* Nonzero means use GNU-only extensions in the generated symbolic
    debugging information.  */
 extern bool use_gnu_debug_info_extensions;
@@ -102,6 +122,15 @@ extern bool extra_warnings;
 
 extern void set_Wunused (int setting);
 
+/* Used to set the level of -Wstrict-aliasing, when no level is specified.  
+   The external way to set the default level is to use
+   -Wstrict-aliasing=level.  
+   ONOFF is assumed to take value 1 when -Wstrict-aliasing is specified,
+   and 0 otherwise.  After calling this function, wstrict_aliasing will be
+   set to the default value of -Wstrict_aliasing=level.  */
+
+extern void set_warn_strict_aliasing (int onoff);
+
 /* Nonzero means warn about any objects definitions whose size is larger
    than N bytes.  Also want about function definitions whose returned
    values are larger than N bytes. The value N is in `larger_than_size'.  */
@@ -109,6 +138,12 @@ extern void set_Wunused (int setting);
 extern bool warn_larger_than;
 extern HOST_WIDE_INT larger_than_size;
 
+/* Nonzero means warn about any function whose frame size is larger
+   than N bytes. */
+
+extern bool warn_frame_larger_than;
+extern HOST_WIDE_INT frame_larger_than_size;
+
 /* Nonzero means warn about constructs which might not be strict
    aliasing safe.  */
 
@@ -226,10 +261,6 @@ extern int align_labels_log;
 extern int align_labels_max_skip;
 extern int align_functions_log;
 
-/* Like align_functions_log above, but used by front-ends to force the
-   minimum function alignment.  Zero means no alignment is forced.  */
-extern int force_align_functions_log;
-
 /* Nonzero if we dump in VCG format, not plain text.  */
 extern int dump_for_graph;
 
@@ -267,6 +298,10 @@ extern const char *flag_random_seed;
 #define abi_version_at_least(N) \
   (flag_abi_version == 0 || flag_abi_version >= (N))
 
+/* Return whether the function should be excluded from
+   instrumentation.  */
+extern bool flag_instrument_functions_exclude_p (tree fndecl);
+
 /* True if the given mode has a NaN representation and the treatment of
    NaN operands is important.  Certain optimizations, such as folding
    x * 0 into 0, are not correct for NaN operands, and are normally
diff --git a/contrib/gcc/fold-const.c b/contrib/gcc/fold-const.c
index 1aadd300a9b..e43fb3b8628 100644
--- a/contrib/gcc/fold-const.c
+++ b/contrib/gcc/fold-const.c
@@ -12591,6 +12591,8 @@ tree_expr_nonnegative_warnv_p (tree t, bool *strict_overflow_p)
 	    CASE_INT_FN (BUILT_IN_FFS):
 	    CASE_INT_FN (BUILT_IN_PARITY):
 	    CASE_INT_FN (BUILT_IN_POPCOUNT):
+	    case BUILT_IN_BSWAP32:
+	    case BUILT_IN_BSWAP64:
 	      /* Always true.  */
 	      return 1;
 
diff --git a/contrib/gcc/gcc.c b/contrib/gcc/gcc.c
index e88dc53a855..62d248b10f0 100644
--- a/contrib/gcc/gcc.c
+++ b/contrib/gcc/gcc.c
@@ -240,7 +240,7 @@ static const char *spec_machine = DEFAULT_TARGET_MACHINE;
 /* Nonzero if cross-compiling.
    When -b is used, the value comes from the `specs' file.  */
 
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 static const char *cross_compile = "1";
 #else
 static const char *cross_compile = "0";
@@ -1469,7 +1469,7 @@ static const char *gcc_libexec_prefix;
 #define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/"
 #endif
 
-#ifdef CROSS_COMPILE  /* Don't use these prefixes for a cross compiler.  */
+#ifdef CROSS_DIRECTORY_STRUCTURE  /* Don't use these prefixes for a cross compiler.  */
 #undef MD_EXEC_PREFIX
 #undef MD_STARTFILE_PREFIX
 #undef MD_STARTFILE_PREFIX_1
diff --git a/contrib/gcc/genattrtab.c b/contrib/gcc/genattrtab.c
index 2555e10750a..9e2c1df08e9 100644
--- a/contrib/gcc/genattrtab.c
+++ b/contrib/gcc/genattrtab.c
@@ -959,6 +959,7 @@ check_attr_value (rtx exp, struct attr_desc *attr)
     case CTZ:
     case POPCOUNT:
     case PARITY:
+    case BSWAP:
       XEXP (exp, 0) = check_attr_value (XEXP (exp, 0), attr);
       break;
 
diff --git a/contrib/gcc/genopinit.c b/contrib/gcc/genopinit.c
index c9cea085852..8541c1b6fd2 100644
--- a/contrib/gcc/genopinit.c
+++ b/contrib/gcc/genopinit.c
@@ -148,6 +148,7 @@ static const char * const optabs[] =
   "atan_optab->handlers[$A].insn_code = CODE_FOR_$(atan$a2$)",
   "strlen_optab->handlers[$A].insn_code = CODE_FOR_$(strlen$a$)",
   "one_cmpl_optab->handlers[$A].insn_code = CODE_FOR_$(one_cmpl$a2$)",
+  "bswap_optab->handlers[$A].insn_code = CODE_FOR_$(bswap$a2$)",
   "ffs_optab->handlers[$A].insn_code = CODE_FOR_$(ffs$a2$)",
   "clz_optab->handlers[$A].insn_code = CODE_FOR_$(clz$a2$)",
   "ctz_optab->handlers[$A].insn_code = CODE_FOR_$(ctz$a2$)",
diff --git a/contrib/gcc/gimplify.c b/contrib/gcc/gimplify.c
index 7efae388c92..be45f478f9a 100644
--- a/contrib/gcc/gimplify.c
+++ b/contrib/gcc/gimplify.c
@@ -6397,7 +6397,8 @@ gimplify_function_tree (tree fndecl)
      catch the exit hook.  */
   /* ??? Add some way to ignore exceptions for this TFE.  */
   if (flag_instrument_function_entry_exit
-      && ! DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT (fndecl))
+      && !DECL_NO_INSTRUMENT_FUNCTION_ENTRY_EXIT (fndecl)
+      && !flag_instrument_functions_exclude_p (fndecl))
     {
       tree tf, x, bind;
 
diff --git a/contrib/gcc/langhooks-def.h b/contrib/gcc/langhooks-def.h
index eae7c928d4e..633642ca31c 100644
--- a/contrib/gcc/langhooks-def.h
+++ b/contrib/gcc/langhooks-def.h
@@ -217,6 +217,7 @@ extern tree lhd_make_node (enum tree_code);
    so we create a compile-time error instead.  */
 #define LANG_HOOKS_MAKE_TYPE lhd_make_node
 #define LANG_HOOKS_INCOMPLETE_TYPE_ERROR lhd_incomplete_type_error
+#define LANG_HOOKS_GENERIC_TYPE_P	hook_bool_tree_false
 #define LANG_HOOKS_TYPE_PROMOTES_TO lhd_type_promotes_to
 #define LANG_HOOKS_REGISTER_BUILTIN_TYPE lhd_register_builtin_type
 #define LANG_HOOKS_TYPE_MAX_SIZE	lhd_return_null_tree
@@ -231,6 +232,7 @@ extern tree lhd_make_node (enum tree_code);
   LANG_HOOKS_UNSIGNED_TYPE, \
   LANG_HOOKS_SIGNED_TYPE, \
   LANG_HOOKS_SIGNED_OR_UNSIGNED_TYPE, \
+  LANG_HOOKS_GENERIC_TYPE_P, \
   LANG_HOOKS_TYPE_PROMOTES_TO, \
   LANG_HOOKS_REGISTER_BUILTIN_TYPE, \
   LANG_HOOKS_INCOMPLETE_TYPE_ERROR, \
diff --git a/contrib/gcc/langhooks.h b/contrib/gcc/langhooks.h
index e6148936829..1254c63992a 100644
--- a/contrib/gcc/langhooks.h
+++ b/contrib/gcc/langhooks.h
@@ -119,6 +119,10 @@ struct lang_hooks_for_types
      according to UNSIGNEDP.  */
   tree (*signed_or_unsigned_type) (int, tree);
 
+  /* True if the type is an instantiation of a generic type,
+     e.g. C++ template implicit specializations.  */
+  bool (*generic_p) (tree);
+
   /* Given a type, apply default promotions to unnamed function
      arguments and return the new type.  Return the same type if no
      change.  Required by any language that supports variadic
diff --git a/contrib/gcc/libgcc-std.ver b/contrib/gcc/libgcc-std.ver
index f8e9e52d082..2d0a43df01d 100644
--- a/contrib/gcc/libgcc-std.ver
+++ b/contrib/gcc/libgcc-std.ver
@@ -274,3 +274,10 @@ GCC_4.2.0 {
   __floatuntitf
   _Unwind_GetIPInfo
 }
+
+%inherit GCC_4.3 GCC_4.2.0
+GCC_4.3.0 {
+  # byte swapping routines
+  __bswapsi2
+  __bswapdi2
+}
diff --git a/contrib/gcc/libgcc2.c b/contrib/gcc/libgcc2.c
index 851bdd073c7..58ad32039a4 100644
--- a/contrib/gcc/libgcc2.c
+++ b/contrib/gcc/libgcc2.c
@@ -492,6 +492,30 @@ __ashrdi3 (DWtype u, word_type b)
 }
 #endif
 
+#ifdef L_bswapsi2
+UWtype
+__bswapsi2 (UWtype u)
+{
+  return ((((u) & 0xff000000) >> 24)
+	  | (((u) & 0x00ff0000) >>  8)
+	  | (((u) & 0x0000ff00) <<  8)
+	  | (((u) & 0x000000ff) << 24));
+}
+#endif
+#ifdef L_bswapdi2
+UDWtype
+__bswapdi2 (UDWtype u)
+{
+  return ((((u) & 0xff00000000000000ull) >> 56)
+	  | (((u) & 0x00ff000000000000ull) >> 40)
+	  | (((u) & 0x0000ff0000000000ull) >> 24)
+	  | (((u) & 0x000000ff00000000ull) >>  8)
+	  | (((u) & 0x00000000ff000000ull) <<  8)
+	  | (((u) & 0x0000000000ff0000ull) << 24)
+	  | (((u) & 0x000000000000ff00ull) << 40)
+	  | (((u) & 0x00000000000000ffull) << 56));
+}
+#endif
 #ifdef L_ffssi2
 #undef int
 int
@@ -1862,7 +1886,7 @@ CONCAT3(__div,MODE,3) (MTYPE a, MTYPE b, MTYPE c, MTYPE d)
 {
   MTYPE denom, ratio, x, y;
 
-  /* ??? We can get better behavior from logarithmic scaling instead of 
+  /* ??? We can get better behavior from logarithmic scaling instead of
      the division.  But that would mean starting to link libgcc against
      libm.  We could implement something akin to ldexp/frexp as gcc builtins
      fairly easily...  */
diff --git a/contrib/gcc/libgcc2.h b/contrib/gcc/libgcc2.h
index c13f0c76bcc..d15ab8d9dad 100644
--- a/contrib/gcc/libgcc2.h
+++ b/contrib/gcc/libgcc2.h
@@ -345,11 +345,13 @@ extern Wtype __addvSI3 (Wtype, Wtype);
 extern Wtype __subvSI3 (Wtype, Wtype);
 extern Wtype __mulvSI3 (Wtype, Wtype);
 extern Wtype __negvSI2 (Wtype);
+extern UWtype __bswapsi2 (UWtype);
 extern DWtype __absvDI2 (DWtype);
 extern DWtype __addvDI3 (DWtype, DWtype);
 extern DWtype __subvDI3 (DWtype, DWtype);
 extern DWtype __mulvDI3 (DWtype, DWtype);
 extern DWtype __negvDI2 (DWtype);
+extern UDWtype __bswapdi2 (UDWtype);
 
 #ifdef COMPAT_SIMODE_TRAPPING_ARITHMETIC
 extern SItype __absvsi2 (SItype);
diff --git a/contrib/gcc/mips-tdump.c b/contrib/gcc/mips-tdump.c
index 6cdbcfe48ba..cd5df3887a1 100644
--- a/contrib/gcc/mips-tdump.c
+++ b/contrib/gcc/mips-tdump.c
@@ -29,11 +29,11 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 #ifdef index
 #undef index
 #endif
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #include <a.out.h>
 #else
 #include "mips/a.out.h"
-#endif /* CROSS_COMPILE */
+#endif /* CROSS_DIRECTORY_STRUCTURE */
 
 /* Include getopt.h for the sake of getopt_long.  */
 #include "getopt.h"
diff --git a/contrib/gcc/mips-tfile.c b/contrib/gcc/mips-tfile.c
index 7530ac7c64e..c543f978158 100644
--- a/contrib/gcc/mips-tfile.c
+++ b/contrib/gcc/mips-tfile.c
@@ -667,11 +667,11 @@ main (void)
 
 #include <signal.h>
 
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #include <a.out.h>
 #else
 #include "mips/a.out.h"
-#endif /* CROSS_COMPILE */
+#endif /* CROSS_DIRECTORY_STRUCTURE */
 
 #include "gstab.h"
 
diff --git a/contrib/gcc/mklibgcc.in b/contrib/gcc/mklibgcc.in
index b4a31a6ca04..60e390500ea 100644
--- a/contrib/gcc/mklibgcc.in
+++ b/contrib/gcc/mklibgcc.in
@@ -91,7 +91,7 @@ lib2funcs='_muldi3 _negdi2 _lshrdi3 _ashldi3 _ashrdi3
 	_ffssi2 _ffsdi2 _clz _clzsi2 _clzdi2 _ctzsi2 _ctzdi2 _popcount_tab
 	_popcountsi2 _popcountdi2 _paritysi2 _paritydi2 _powisf2 _powidf2
 	_powixf2 _powitf2 _mulsc3 _muldc3 _mulxc3 _multc3 _divsc3 _divdc3
-	_divxc3 _divtc3'
+	_divxc3 _divtc3 _bswapsi2 _bswapdi2'
 
 if [ "$LIB2_SIDITI_CONV_FUNCS" ]; then
   for func in $swfloatfuncs; do
diff --git a/contrib/gcc/optabs.c b/contrib/gcc/optabs.c
index 539b3adaf28..3b9a23dd1b9 100644
--- a/contrib/gcc/optabs.c
+++ b/contrib/gcc/optabs.c
@@ -2591,6 +2591,10 @@ expand_unop (enum machine_mode mode, optab unoptab, rtx op0, rtx target,
 	goto try_libcall;
     }
 
+  /* We can't widen a bswap.  */
+  if (unoptab == bswap_optab)
+    goto try_libcall;
+
   if (CLASS_HAS_WIDER_MODES_P (class))
     for (wider_mode = GET_MODE_WIDER_MODE (mode);
 	 wider_mode != VOIDmode;
@@ -5253,6 +5257,7 @@ init_optabs (void)
   absv_optab = init_optabv (ABS);
   addcc_optab = init_optab (UNKNOWN);
   one_cmpl_optab = init_optab (NOT);
+  bswap_optab = init_optab (BSWAP);
   ffs_optab = init_optab (FFS);
   clz_optab = init_optab (CLZ);
   ctz_optab = init_optab (CTZ);
@@ -5456,6 +5461,11 @@ init_optabs (void)
   init_interclass_conv_libfuncs (trunc_optab, "trunc", MODE_FLOAT, MODE_DECIMAL_FLOAT);
   init_interclass_conv_libfuncs (trunc_optab, "trunc", MODE_DECIMAL_FLOAT, MODE_FLOAT);
 
+  /* Explicitly initialize the bswap libfuncs since we need them to be
+     valid for things other than word_mode.  */
+  set_optab_libfunc (bswap_optab, SImode, "__bswapsi2");
+  set_optab_libfunc (bswap_optab, DImode, "__bswapdi2");
+
   /* Use cabs for double complex abs, since systems generally have cabs.
      Don't define any libcall for float complex, so that cabs will be used.  */
   if (complex_double_type_node)
diff --git a/contrib/gcc/optabs.h b/contrib/gcc/optabs.h
index 58fb6905175..854341b5efa 100644
--- a/contrib/gcc/optabs.h
+++ b/contrib/gcc/optabs.h
@@ -146,6 +146,8 @@ enum optab_index
   /* Abs value */
   OTI_abs,
   OTI_absv,
+  /* Byteswap */
+  OTI_bswap,
   /* Bitwise not */
   OTI_one_cmpl,
   /* Bit scanning and counting */
@@ -315,6 +317,7 @@ extern GTY(()) optab optab_table[OTI_MAX];
 #define abs_optab (optab_table[OTI_abs])
 #define absv_optab (optab_table[OTI_absv])
 #define one_cmpl_optab (optab_table[OTI_one_cmpl])
+#define bswap_optab (optab_table[OTI_bswap])
 #define ffs_optab (optab_table[OTI_ffs])
 #define clz_optab (optab_table[OTI_clz])
 #define ctz_optab (optab_table[OTI_ctz])
diff --git a/contrib/gcc/opts.c b/contrib/gcc/opts.c
index fb122ba017a..87f8984a1a9 100644
--- a/contrib/gcc/opts.c
+++ b/contrib/gcc/opts.c
@@ -59,6 +59,11 @@ bool extra_warnings;
 bool warn_larger_than;
 HOST_WIDE_INT larger_than_size;
 
+/* True to warn about any function whose frame size is larger
+ * than N bytes. */
+bool warn_frame_larger_than;
+HOST_WIDE_INT frame_larger_than_size;
+
 /* Nonzero means warn about constructs which might not be
    strict-aliasing safe.  */
 int warn_strict_aliasing;
@@ -79,6 +84,256 @@ enum debug_info_type write_symbols = NO_DEBUG;
    the definitions of the different possible levels.  */
 enum debug_info_level debug_info_level = DINFO_LEVEL_NONE;
 
+/* A major contribution to object and executable size is debug
+   information size.  A major contribution to debug information size
+   is struct descriptions replicated in several object files. The
+   following flags attempt to reduce this information.  The basic
+   idea is to not emit struct debugging information in the current
+   compilation unit when that information will be generated by
+   another compilation unit.
+
+   Debug information for a struct defined in the current source
+   file should be generated in the object file.  Likewise the
+   debug information for a struct defined in a header should be
+   generated in the object file of the corresponding source file.
+   Both of these case are handled when the base name of the file of
+   the struct definition matches the base name of the source file
+   of thet current compilation unit.  This matching emits minimal
+   struct debugging information.
+
+   The base file name matching rule above will fail to emit debug
+   information for structs defined in system headers.  So a second
+   category of files includes system headers in addition to files
+   with matching bases.
+
+   The remaining types of files are library headers and application
+   headers.  We cannot currently distinguish these two types.  */
+
+enum debug_struct_file
+{
+  DINFO_STRUCT_FILE_NONE,   /* Debug no structs. */
+  DINFO_STRUCT_FILE_BASE,   /* Debug structs defined in files with the
+                               same base name as the compilation unit. */
+  DINFO_STRUCT_FILE_SYS,    /* Also debug structs defined in system
+                               header files.  */
+  DINFO_STRUCT_FILE_ANY     /* Debug structs defined in all files. */
+};
+
+/* Generic structs (e.g. templates not explicitly specialized)
+   may not have a compilation unit associated with them, and so
+   may need to be treated differently from ordinary structs.
+
+   Structs only handled by reference (indirectly), will also usually
+   not need as much debugging information.  */
+
+static enum debug_struct_file debug_struct_ordinary[DINFO_USAGE_NUM_ENUMS]
+  = { DINFO_STRUCT_FILE_ANY, DINFO_STRUCT_FILE_ANY, DINFO_STRUCT_FILE_ANY };
+static enum debug_struct_file debug_struct_generic[DINFO_USAGE_NUM_ENUMS]
+  = { DINFO_STRUCT_FILE_ANY, DINFO_STRUCT_FILE_ANY, DINFO_STRUCT_FILE_ANY };
+
+/* Parse the -femit-struct-debug-detailed option value
+   and set the flag variables. */
+
+#define MATCH( prefix, string ) \
+  ((strncmp (prefix, string, sizeof prefix - 1) == 0) \
+   ? ((string += sizeof prefix - 1), 1) : 0)
+
+void
+set_struct_debug_option (const char *spec)
+{
+  /* various labels for comparison */
+  static char dfn_lbl[] = "dfn:", dir_lbl[] = "dir:", ind_lbl[] = "ind:";
+  static char ord_lbl[] = "ord:", gen_lbl[] = "gen:";
+  static char none_lbl[] = "none", any_lbl[] = "any";
+  static char base_lbl[] = "base", sys_lbl[] = "sys";
+
+  enum debug_struct_file files = DINFO_STRUCT_FILE_ANY;
+  /* Default is to apply to as much as possible. */
+  enum debug_info_usage usage = DINFO_USAGE_NUM_ENUMS;
+  int ord = 1, gen = 1;
+
+  /* What usage? */
+  if (MATCH (dfn_lbl, spec))
+    usage = DINFO_USAGE_DFN;
+  else if (MATCH (dir_lbl, spec))
+    usage = DINFO_USAGE_DIR_USE;
+  else if (MATCH (ind_lbl, spec))
+    usage = DINFO_USAGE_IND_USE;
+
+  /* Generics or not? */
+  if (MATCH (ord_lbl, spec))
+    gen = 0;
+  else if (MATCH (gen_lbl, spec))
+    ord = 0;
+
+  /* What allowable environment? */
+  if (MATCH (none_lbl, spec))
+    files = DINFO_STRUCT_FILE_NONE;
+  else if (MATCH (any_lbl, spec))
+    files = DINFO_STRUCT_FILE_ANY;
+  else if (MATCH (sys_lbl, spec))
+    files = DINFO_STRUCT_FILE_SYS;
+  else if (MATCH (base_lbl, spec))
+    files = DINFO_STRUCT_FILE_BASE;
+  else
+    error ("argument %qs to %<-femit-struct-debug-detailed%> not recognized",
+           spec);
+
+  /* Effect the specification. */
+  if (usage == DINFO_USAGE_NUM_ENUMS)
+    {
+      if (ord)
+        {
+          debug_struct_ordinary[DINFO_USAGE_DFN] = files;
+          debug_struct_ordinary[DINFO_USAGE_DIR_USE] = files;
+          debug_struct_ordinary[DINFO_USAGE_IND_USE] = files;
+        }
+      if (gen)
+        {
+          debug_struct_generic[DINFO_USAGE_DFN] = files;
+          debug_struct_generic[DINFO_USAGE_DIR_USE] = files;
+          debug_struct_generic[DINFO_USAGE_IND_USE] = files;
+        }
+    }
+  else
+    {
+      if (ord)
+        debug_struct_ordinary[usage] = files;
+      if (gen)
+        debug_struct_generic[usage] = files;
+    }
+
+  if (*spec == ',')
+    set_struct_debug_option (spec+1);
+  else
+    {
+      /* No more -femit-struct-debug-detailed specifications.
+         Do final checks. */
+      if (*spec != '\0')
+	error ("argument %qs to %<-femit-struct-debug-detailed%> unknown",
+               spec);
+      if (debug_struct_ordinary[DINFO_USAGE_DIR_USE]
+		< debug_struct_ordinary[DINFO_USAGE_IND_USE]
+	  || debug_struct_generic[DINFO_USAGE_DIR_USE]
+		< debug_struct_generic[DINFO_USAGE_IND_USE])
+	error ("%<-femit-struct-debug-detailed=dir:...%> must allow at least"
+               " as much as %<-femit-struct-debug-detailed=ind:...%>");
+    }
+}
+
+/* Find the base name of a path, stripping off both directories and
+   a single final extension. */
+static int
+base_of_path (const char *path, const char **base_out)
+{
+  const char *base = path;
+  const char *dot = 0;
+  const char *p = path;
+  char c = *p;
+  while (c)
+    {
+      if (IS_DIR_SEPARATOR(c))
+        {
+          base = p + 1;
+          dot = 0;
+        }
+      else if (c == '.')
+        dot = p;
+      c = *++p;
+    }
+  if (!dot)
+    dot = p;
+  *base_out = base;
+  return dot - base;
+}
+
+/* Match the base name of a file to the base name of a compilation unit. */
+
+static const char *main_input_basename;
+static int main_input_baselength;
+
+static int
+matches_main_base (const char *path)
+{
+  /* Cache the last query. */
+  static const char *last_path = NULL;
+  static int last_match = 0;
+  if (path != last_path)
+    {
+      const char *base;
+      int length = base_of_path (path, &base);
+      last_path = path;
+      last_match = (length == main_input_baselength
+                    && memcmp (base, main_input_basename, length) == 0);
+    }
+  return last_match;
+}
+
+#ifdef DEBUG_DEBUG_STRUCT
+
+static int
+dump_struct_debug (tree type, enum debug_info_usage usage,
+		   enum debug_struct_file criterion, int generic,
+		   int matches, int result)
+{
+  /* Find the type name. */
+  tree type_decl = TYPE_STUB_DECL (type);
+  tree t = type_decl;
+  const char *name = 0;
+  if (TREE_CODE (t) == TYPE_DECL)
+    t = DECL_NAME (t);
+  if (t)
+    name = IDENTIFIER_POINTER (t);
+
+  fprintf (stderr, "	struct %d %s %s %s %s %d %p %s\n",
+	   criterion,
+           DECL_IN_SYSTEM_HEADER (type_decl) ? "sys" : "usr",
+           matches ? "bas" : "hdr",
+           generic ? "gen" : "ord",
+           usage == DINFO_USAGE_DFN ? ";" :
+             usage == DINFO_USAGE_DIR_USE ? "." : "*",
+           result,
+           (void*) type_decl, name);
+  return result;
+}
+#define DUMP_GSTRUCT(type, usage, criterion, generic, matches, result) \
+  dump_struct_debug (type, usage, criterion, generic, matches, result)
+
+#else
+
+#define DUMP_GSTRUCT(type, usage, criterion, generic, matches, result) \
+  (result)
+
+#endif
+
+
+bool
+should_emit_struct_debug (tree type, enum debug_info_usage usage)
+{
+  enum debug_struct_file criterion;
+  tree type_decl;
+  bool generic = lang_hooks.types.generic_p (type);
+
+  if (generic)
+    criterion = debug_struct_generic[usage];
+  else
+    criterion = debug_struct_ordinary[usage];
+
+  if (criterion == DINFO_STRUCT_FILE_NONE)
+    return DUMP_GSTRUCT (type, usage, criterion, generic, false, false);
+  if (criterion == DINFO_STRUCT_FILE_ANY)
+    return DUMP_GSTRUCT (type, usage, criterion, generic, false, true);
+
+  type_decl = TYPE_STUB_DECL (type);
+
+  if (criterion == DINFO_STRUCT_FILE_SYS && DECL_IN_SYSTEM_HEADER (type_decl))
+    return DUMP_GSTRUCT (type, usage, criterion, generic, false, true);
+
+  if (matches_main_base (DECL_SOURCE_FILE (type_decl)))
+    return DUMP_GSTRUCT (type, usage, criterion, generic, true, true);
+  return DUMP_GSTRUCT (type, usage, criterion, generic, false, false);
+}
+
 /* Nonzero means use GNU-only extensions in the generated symbolic
    debugging information.  Currently, this only has an effect when
    write_symbols is set to DBX_DEBUG, XCOFF_DEBUG, or DWARF_DEBUG.  */
@@ -108,6 +363,15 @@ static bool flag_unroll_loops_set, flag_tracer_set;
 static bool flag_value_profile_transformations_set;
 static bool flag_peel_loops_set, flag_branch_probabilities_set;
 
+/* Functions excluded from profiling.  */
+
+typedef char *char_p; /* For DEF_VEC_P.  */
+DEF_VEC_P(char_p);
+DEF_VEC_ALLOC_P(char_p,heap);
+
+static VEC(char_p,heap) *flag_instrument_functions_exclude_functions;
+static VEC(char_p,heap) *flag_instrument_functions_exclude_files;
+
 /* Input file names.  */
 const char **in_fnames;
 unsigned num_in_fnames;
@@ -354,6 +618,87 @@ add_input_filename (const char *filename)
   in_fnames[num_in_fnames - 1] = filename;
 }
 
+/* Add functions or file names to a vector of names to exclude from
+   instrumentation.  */
+
+static void
+add_instrument_functions_exclude_list (VEC(char_p,heap) **pvec,
+				       const char* arg)
+{
+  char *tmp;
+  char *r;
+  char *w;
+  char *token_start;
+
+  /* We never free this string.  */
+  tmp = xstrdup (arg);
+
+  r = tmp;
+  w = tmp;
+  token_start = tmp;
+
+  while (*r != '\0')
+    {
+      if (*r == ',')
+	{
+	  *w++ = '\0';
+	  ++r;
+	  VEC_safe_push (char_p, heap, *pvec, token_start);
+	  token_start = w;
+	}
+      if (*r == '\\' && r[1] == ',')
+	{
+	  *w++ = ',';
+	  r += 2;
+	}
+      else
+	*w++ = *r++;
+    }
+  if (*token_start != '\0')
+    VEC_safe_push (char_p, heap, *pvec, token_start);
+}
+
+/* Return whether we should exclude FNDECL from instrumentation.  */
+
+bool
+flag_instrument_functions_exclude_p (tree fndecl)
+{
+  if (VEC_length (char_p, flag_instrument_functions_exclude_functions) > 0)
+    {
+      const char *name;
+      int i;
+      char *s;
+
+      name = lang_hooks.decl_printable_name (fndecl, 0);
+      for (i = 0;
+	   VEC_iterate (char_p, flag_instrument_functions_exclude_functions,
+			i, s);
+	   ++i)
+	{
+	  if (strstr (name, s) != NULL)
+	    return true;
+	}
+    }
+
+  if (VEC_length (char_p, flag_instrument_functions_exclude_files) > 0)
+    {
+      const char *name;
+      int i;
+      char *s;
+
+      name = DECL_SOURCE_FILE (fndecl);
+      for (i = 0;
+	   VEC_iterate (char_p, flag_instrument_functions_exclude_files, i, s);
+	   ++i)
+	{
+	  if (strstr (name, s) != NULL)
+	    return true;
+	}
+    }
+
+  return false;
+}
+
 /* Decode and handle the vector of command line options.  LANG_MASK
    contains has a single bit set representing the current
    language.  */
@@ -370,7 +715,11 @@ handle_options (unsigned int argc, const char **argv, unsigned int lang_mask)
       if (opt[0] != '-' || opt[1] == '\0')
 	{
 	  if (main_input_filename == NULL)
+	    {
 	    main_input_filename = opt;
+	      main_input_baselength
+		= base_of_path (main_input_filename, &main_input_basename);
+	    }
 	  add_input_filename (opt);
 	  n = 1;
 	  continue;
@@ -725,7 +1074,15 @@ common_handle_option (size_t scode, const char *arg, int value,
       warn_larger_than = value != -1;
       break;
 
+    case OPT_Wframe_larger_than_:
+      frame_larger_than_size = value;
+      warn_frame_larger_than = value != -1;
+      break;
+
     case OPT_Wstrict_aliasing:
+      set_warn_strict_aliasing (value);
+      break;
+
     case OPT_Wstrict_aliasing_:
       warn_strict_aliasing = value;
       break;
@@ -832,6 +1189,16 @@ common_handle_option (size_t scode, const char *arg, int value,
       set_param_value ("max-inline-insns-auto", value / 2);
       break;
 
+    case OPT_finstrument_functions_exclude_function_list_:
+      add_instrument_functions_exclude_list
+	(&flag_instrument_functions_exclude_functions, arg);
+      break;
+
+    case OPT_finstrument_functions_exclude_file_list_:
+      add_instrument_functions_exclude_list
+	(&flag_instrument_functions_exclude_files, arg);
+      break;
+
     case OPT_fmessage_length_:
       pp_set_line_maximum_length (global_dc->printer, value);
       break;
@@ -1094,6 +1461,20 @@ set_Wunused (int setting)
   warn_unused_value = setting;
 }
 
+/* Used to set the level of strict aliasing warnings, 
+   when no level is specified (i.e., when -Wstrict-aliasing, and not
+   -Wstrict-aliasing=level was given).
+   ONOFF is assumed to take value 1 when -Wstrict-aliasing is specified,
+   and 0 otherwise.  After calling this function, wstrict_aliasing will be
+   set to the default value of -Wstrict_aliasing=level, currently 3.  */
+void
+set_warn_strict_aliasing (int onoff)
+{
+  gcc_assert (onoff == 0 || onoff == 1);
+  if (onoff != 0)
+    warn_strict_aliasing = 3;
+}
+
 /* The following routines are useful in setting all the flags that
    -ffast-math and -fno-fast-math imply.  */
 void
diff --git a/contrib/gcc/postreload-gcse.c b/contrib/gcc/postreload-gcse.c
index 76b7b8c9ae0..3e3f805f174 100644
--- a/contrib/gcc/postreload-gcse.c
+++ b/contrib/gcc/postreload-gcse.c
@@ -197,8 +197,6 @@ static void dump_hash_table (FILE *);
 static bool reg_killed_on_edge (rtx, edge);
 static bool reg_used_on_edge (rtx, edge);
 
-static rtx reg_set_between_after_reload_p (rtx, rtx, rtx);
-static rtx reg_used_between_after_reload_p (rtx, rtx, rtx);
 static rtx get_avail_load_store_reg (rtx);
 
 static bool bb_has_well_behaved_predecessors (basic_block);
@@ -470,6 +468,22 @@ dump_hash_table (FILE *file)
   fprintf (file, "\n");
 }
 
+/* Return true if register X is recorded as being set by an instruction
+   whose CUID is greater than the one given.  */
+
+static bool
+reg_changed_after_insn_p (rtx x, int cuid)
+{
+  unsigned int regno, end_regno;
+
+  regno = REGNO (x);
+  end_regno = END_HARD_REGNO (x);
+  do
+    if (reg_avail_info[regno] > cuid)
+      return true;
+  while (++regno < end_regno);
+  return false;
+}
 
 /* Return nonzero if the operands of expression X are unchanged
    1) from the start of INSN's basic block up to but not including INSN
@@ -493,14 +507,9 @@ oprs_unchanged_p (rtx x, rtx insn, bool after_insn)
       /* We are called after register allocation.  */
       gcc_assert (REGNO (x) < FIRST_PSEUDO_REGISTER);
       if (after_insn)
-	/* If the last CUID setting the insn is less than the CUID of
-	   INSN, then reg X is not changed in or after INSN.  */
-	return reg_avail_info[REGNO (x)] < INSN_CUID (insn);
+	return !reg_changed_after_insn_p (x, INSN_CUID (insn) - 1);
       else
-	/* Reg X is not set before INSN in the current basic block if
-	   we have not yet recorded the CUID of an insn that touches
-	   the reg.  */
-	return reg_avail_info[REGNO (x)] == 0;
+	return !reg_changed_after_insn_p (x, 0);
 
     case MEM:
       if (load_killed_in_block_p (INSN_CUID (insn), x, after_insn))
@@ -717,12 +726,28 @@ record_opr_changes (rtx insn)
   /* Finally, if this is a call, record all call clobbers.  */
   if (CALL_P (insn))
     {
-      unsigned int regno;
+      unsigned int regno, end_regno;
+      rtx link, x;
 
       for (regno = 0; regno < FIRST_PSEUDO_REGISTER; regno++)
 	if (TEST_HARD_REG_BIT (regs_invalidated_by_call, regno))
 	  record_last_reg_set_info (insn, regno);
 
+      for (link = CALL_INSN_FUNCTION_USAGE (insn); link; link = XEXP (link, 1))
+	if (GET_CODE (XEXP (link, 0)) == CLOBBER)
+	  {
+	    x = XEXP (XEXP (link, 0), 0);
+	    if (REG_P (x))
+	      {
+		gcc_assert (HARD_REGISTER_P (x));
+	        regno = REGNO (x);
+		end_regno = END_HARD_REGNO (x);
+		do
+		  record_last_reg_set_info (insn, regno);
+		while (++regno < end_regno);
+	      }
+	  }
+
       if (! CONST_OR_PURE_CALL_P (insn))
 	record_last_mem_set_info (insn);
     }
@@ -856,96 +881,6 @@ reg_used_on_edge (rtx reg, edge e)
   return false;
 }
 
-
-/* Return the insn that sets register REG or clobbers it in between
-   FROM_INSN and TO_INSN (exclusive of those two).
-   Just like reg_set_between but for hard registers and not pseudos.  */
-
-static rtx
-reg_set_between_after_reload_p (rtx reg, rtx from_insn, rtx to_insn)
-{
-  rtx insn;
-
-  /* We are called after register allocation.  */
-  gcc_assert (REG_P (reg) && REGNO (reg) < FIRST_PSEUDO_REGISTER);
-
-  if (from_insn == to_insn)
-    return NULL_RTX;
-
-  for (insn = NEXT_INSN (from_insn);
-       insn != to_insn;
-       insn = NEXT_INSN (insn))
-    if (INSN_P (insn))
-      {
-	if (set_of (reg, insn) != NULL_RTX)
-	  return insn;
-	if ((CALL_P (insn)
-	      && call_used_regs[REGNO (reg)])
-	    || find_reg_fusage (insn, CLOBBER, reg))
-	  return insn;
-
-	if (FIND_REG_INC_NOTE (insn, reg))
-	  return insn;
-      }
-
-  return NULL_RTX;
-}
-
-/* Return the insn that uses register REG in between FROM_INSN and TO_INSN
-   (exclusive of those two). Similar to reg_used_between but for hard
-   registers and not pseudos.  */
-
-static rtx
-reg_used_between_after_reload_p (rtx reg, rtx from_insn, rtx to_insn)
-{
-  rtx insn;
-
-  /* We are called after register allocation.  */
-  gcc_assert (REG_P (reg) && REGNO (reg) < FIRST_PSEUDO_REGISTER);
-
-  if (from_insn == to_insn)
-    return NULL_RTX;
-
-  for (insn = NEXT_INSN (from_insn);
-       insn != to_insn;
-       insn = NEXT_INSN (insn))
-    if (INSN_P (insn))
-      {
-	if (reg_overlap_mentioned_p (reg, PATTERN (insn))
-	    || (CALL_P (insn)
-		&& call_used_regs[REGNO (reg)])
-	    || find_reg_fusage (insn, USE, reg)
-	    || find_reg_fusage (insn, CLOBBER, reg))
-	  return insn;
-
-	if (FIND_REG_INC_NOTE (insn, reg))
-	  return insn;
-      }
-
-  return NULL_RTX;
-}
-
-/* Return true if REG is used, set, or killed between the beginning of
-   basic block BB and UP_TO_INSN.  Caches the result in reg_avail_info.  */
-
-static bool
-reg_set_or_used_since_bb_start (rtx reg, basic_block bb, rtx up_to_insn)
-{
-  rtx insn, start = PREV_INSN (BB_HEAD (bb));
-
-  if (reg_avail_info[REGNO (reg)] != 0)
-    return true;
-
-  insn = reg_used_between_after_reload_p (reg, start, up_to_insn);
-  if (! insn)
-    insn = reg_set_between_after_reload_p (reg, start, up_to_insn);
-
-  if (insn)
-    reg_avail_info[REGNO (reg)] = INSN_CUID (insn);
-
-  return insn != NULL_RTX;
-}
-
 /* Return the loaded/stored register of a load/store instruction.  */
 
 static rtx
@@ -1037,7 +972,8 @@ eliminate_partially_redundant_load (basic_block bb, rtx insn,
 
   /* Check that the loaded register is not used, set, or killed from the
      beginning of the block.  */
-  if (reg_set_or_used_since_bb_start (dest, bb, insn))
+  if (reg_changed_after_insn_p (dest, 0)
+      || reg_used_between_p (dest, PREV_INSN (BB_HEAD (bb)), insn))
     return;
 
   /* Check potential for replacing load with copy for predecessors.  */
@@ -1068,8 +1004,7 @@ eliminate_partially_redundant_load (basic_block bb, rtx insn,
 	      avail_insn = NULL;
 	      continue;
 	    }
-	  if (! reg_set_between_after_reload_p (avail_reg, avail_insn,
-						next_pred_bb_end))
+	  if (!reg_set_between_p (avail_reg, avail_insn, next_pred_bb_end))
 	    /* AVAIL_INSN remains non-null.  */
 	    break;
 	  else
diff --git a/contrib/gcc/print-tree.c b/contrib/gcc/print-tree.c
index 57b07ace4bb..ef87ab6abad 100644
--- a/contrib/gcc/print-tree.c
+++ b/contrib/gcc/print-tree.c
@@ -439,17 +439,15 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
 	      || DECL_INLINE (node) || DECL_BUILT_IN (node))
 	    indent_to (file, indent + 3);
 	  
-	  if (TREE_CODE (node) != FUNCTION_DECL)
-	    {
-	      if (DECL_USER_ALIGN (node))
-		fprintf (file, " user");
-	      
-	      fprintf (file, " align %d", DECL_ALIGN (node));
-	      if (TREE_CODE (node) == FIELD_DECL)
-		fprintf (file, " offset_align " HOST_WIDE_INT_PRINT_UNSIGNED,
-			 DECL_OFFSET_ALIGN (node));
-	    }
-	  else if (DECL_BUILT_IN (node))
+	  if (DECL_USER_ALIGN (node))
+	    fprintf (file, " user");
+	  
+	  fprintf (file, " align %d", DECL_ALIGN (node));
+	  if (TREE_CODE (node) == FIELD_DECL)
+	    fprintf (file, " offset_align " HOST_WIDE_INT_PRINT_UNSIGNED,
+		     DECL_OFFSET_ALIGN (node));
+
+	  if (TREE_CODE (node) == FUNCTION_DECL && DECL_BUILT_IN (node))
 	    {
 	      if (DECL_BUILT_IN_CLASS (node) == BUILT_IN_MD)
 		fprintf (file, " built-in BUILT_IN_MD %d", DECL_FUNCTION_CODE (node));
diff --git a/contrib/gcc/regs.h b/contrib/gcc/regs.h
index ee074b9ed1b..ed0725a46e3 100644
--- a/contrib/gcc/regs.h
+++ b/contrib/gcc/regs.h
@@ -239,5 +239,41 @@ extern void allocate_reg_info (size_t, int, int);
 
 /* Specify number of hard registers given machine mode occupy.  */
 extern unsigned char hard_regno_nregs[FIRST_PSEUDO_REGISTER][MAX_MACHINE_MODE];
+/* Return an exclusive upper bound on the registers occupied by hard
+   register (reg:MODE REGNO).  */
+
+static inline unsigned int
+end_hard_regno (enum machine_mode mode, unsigned int regno)
+{
+  return regno + hard_regno_nregs[regno][(int) mode];
+}
+
+/* Likewise for hard register X.  */
+
+#define END_HARD_REGNO(X) end_hard_regno (GET_MODE (X), REGNO (X))
+
+/* Likewise for hard or pseudo register X.  */
+
+#define END_REGNO(X) (HARD_REGISTER_P (X) ? END_HARD_REGNO (X) : REGNO (X) + 1)
+
+
+/* Return true if (reg:MODE REGNO) includes an element of REGS.  */
+
+static inline bool
+overlaps_hard_reg_set_p (const HARD_REG_SET regs, enum machine_mode mode,
+			 unsigned int regno)
+{
+  unsigned int end_regno;
+
+  if (TEST_HARD_REG_BIT (regs, regno))
+    return true;
+
+  end_regno = end_hard_regno (mode, regno);
+  while (++regno < end_regno)
+    if (TEST_HARD_REG_BIT (regs, regno))
+      return true;
+
+  return false;
+}
 
 #endif /* GCC_REGS_H */
diff --git a/contrib/gcc/reload1.c b/contrib/gcc/reload1.c
index 20da1b67b41..30ea7f3ef21 100644
--- a/contrib/gcc/reload1.c
+++ b/contrib/gcc/reload1.c
@@ -2555,6 +2555,7 @@ eliminate_regs_1 (rtx x, enum machine_mode mem_mode, rtx insn,
     case CTZ:
     case POPCOUNT:
     case PARITY:
+    case BSWAP:
       new = eliminate_regs_1 (XEXP (x, 0), mem_mode, insn, false);
       if (new != XEXP (x, 0))
 	return gen_rtx_fmt_e (code, GET_MODE (x), new);
@@ -2775,6 +2776,7 @@ elimination_effects (rtx x, enum machine_mode mem_mode)
     case CTZ:
     case POPCOUNT:
     case PARITY:
+    case BSWAP:
       elimination_effects (XEXP (x, 0), mem_mode);
       return;
 
diff --git a/contrib/gcc/rtl.def b/contrib/gcc/rtl.def
index 847b51c6321..cb37f1ab2b2 100644
--- a/contrib/gcc/rtl.def
+++ b/contrib/gcc/rtl.def
@@ -567,6 +567,9 @@ DEF_RTL_EXPR(ABS, "abs", "e", RTX_UNARY)
 /* Square root */
 DEF_RTL_EXPR(SQRT, "sqrt", "e", RTX_UNARY)
 
+/* Swap bytes.  */
+DEF_RTL_EXPR(BSWAP, "bswap", "e", RTX_UNARY)
+
 /* Find first bit that is set.
    Value is 1 + number of trailing zeros in the arg.,
    or 0 if arg is 0.  */
diff --git a/contrib/gcc/rtlanal.c b/contrib/gcc/rtlanal.c
index 54f2f725e60..4e513e86820 100644
--- a/contrib/gcc/rtlanal.c
+++ b/contrib/gcc/rtlanal.c
@@ -748,8 +748,8 @@ reg_set_p (rtx reg, rtx insn)
 	  || (CALL_P (insn)
 	      && ((REG_P (reg)
 		   && REGNO (reg) < FIRST_PSEUDO_REGISTER
-		   && TEST_HARD_REG_BIT (regs_invalidated_by_call,
-					 REGNO (reg)))
+		   && overlaps_hard_reg_set_p (regs_invalidated_by_call,
+					       GET_MODE (reg), REGNO (reg)))
 		  || MEM_P (reg)
 		  || find_reg_fusage (insn, CLOBBER, reg)))))
     return 1;
diff --git a/contrib/gcc/simplify-rtx.c b/contrib/gcc/simplify-rtx.c
index b088d920878..531face8b9d 100644
--- a/contrib/gcc/simplify-rtx.c
+++ b/contrib/gcc/simplify-rtx.c
@@ -1044,6 +1044,9 @@ simplify_const_unary_operation (enum rtx_code code, enum machine_mode mode,
 	  val &= 1;
 	  break;
 
+	case BSWAP:
+	  return 0;
+
 	case TRUNCATE:
 	  val = arg0;
 	  break;
@@ -4887,4 +4890,3 @@ simplify_rtx (rtx x)
     }
   return NULL;
 }
-
diff --git a/contrib/gcc/toplev.c b/contrib/gcc/toplev.c
index 0b73a48df3b..ab6a7ff6f54 100644
--- a/contrib/gcc/toplev.c
+++ b/contrib/gcc/toplev.c
@@ -369,10 +369,6 @@ int align_labels_log;
 int align_labels_max_skip;
 int align_functions_log;
 
-/* Like align_functions_log above, but used by front-ends to force the
-   minimum function alignment.  Zero means no alignment is forced.  */
-int force_align_functions_log;
-
 typedef struct
 {
   const char *const string;
diff --git a/contrib/gcc/tree-flow.h b/contrib/gcc/tree-flow.h
index 1d03188e8d3..ac8d9d28847 100644
--- a/contrib/gcc/tree-flow.h
+++ b/contrib/gcc/tree-flow.h
@@ -694,6 +694,8 @@ static inline bool overlap_subvar (unsigned HOST_WIDE_INT,
    definition, a function with this prototype is called.  */
 typedef bool (*walk_use_def_chains_fn) (tree, tree, void *);
 
+/* In tree-ssa-alias-warnings.c  */
+extern void strict_aliasing_warning_backend (void);
 
 /* In tree-ssa.c  */
 extern void init_tree_ssa (void);
diff --git a/contrib/gcc/tree-ssa-alias-warnings.c b/contrib/gcc/tree-ssa-alias-warnings.c
new file mode 100644
index 00000000000..0c787521931
--- /dev/null
+++ b/contrib/gcc/tree-ssa-alias-warnings.c
@@ -0,0 +1,1036 @@
+/* Strict aliasing checks.
+   Copyright (C) 2007 Free Software Foundation, Inc.
+   Contributed by Silvius Rus <rus@google.com>.
+
+   This file is part of GCC.
+
+   GCC 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, or (at your option)
+   any later version.
+
+   GCC 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 GCC; see the file COPYING.  If not, write to
+   the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
+#include "alloc-pool.h"
+#include "tree.h"
+#include "tree-dump.h"
+#include "tree-flow.h"
+#include "params.h"
+#include "function.h"
+#include "expr.h"
+#include "toplev.h"
+#include "diagnostic.h"
+#include "tree-ssa-structalias.h"
+#include "tree-ssa-propagate.h"
+#include "langhooks.h"
+
+/* Module to issue a warning when a program uses data through a type
+   different from the type through which the data were defined.
+   Implements -Wstrict-aliasing and -Wstrict-aliasing=n.
+   These checks only happen when -fstrict-aliasing is present.
+
+   The idea is to use the compiler to identify occurrences of nonstandard
+   aliasing, and report them to programmers.  Programs free of such aliasing
+   are more portable, maintainable, and can usually be optimized better.
+
+   The current, as of April 2007, C and C++ language standards forbid
+   accessing data of type A through an lvalue of another type B,
+   with certain exceptions. See the C Standard ISO/IEC 9899:1999,
+   section 6.5, paragraph 7, and the C++ Standard ISO/IEC 14882:1998,
+   section 3.10, paragraph 15.
+
+   Example 1:*a is used as int but was defined as a float, *b.
+        int* a = ...;
+        float* b = reinterpret_cast<float*> (a);
+        *b = 2.0;
+        return *a
+
+   Unfortunately, the problem is in general undecidable if we take into
+   account arithmetic expressions such as array indices or pointer arithmetic.
+   (It is at least as hard as Peano arithmetic decidability.)
+   Even ignoring arithmetic, the problem is still NP-hard, because it is
+   at least as hard as flow-insensitive may-alias analysis, which was proved
+   NP-hard by Horwitz et al, TOPLAS 1997.
+
+   It is clear that we need to choose some heuristics.
+   Unfortunately, various users have different goals which correspond to
+   different time budgets so a common approach will not suit all.
+   We present the user with three effort/accuracy levels.  By accuracy, we mean
+   a common-sense mix of low count of false positives with a
+   reasonably low number of false negatives.  We are heavily biased
+   towards a low count of false positives.
+   The effort (compilation time) is likely to increase with the level.
+
+   -Wstrict-aliasing=1
+   ===================
+   Most aggressive, least accurate.  Possibly useful when higher levels
+   do not warn but -fstrict-aliasing still breaks the code, as
+   it has very few false negatives.
+   Warn for all bad pointer conversions, even if never dereferenced.
+   Implemented in the front end (c-common.c).
+   Uses alias_sets_might_conflict to compare types.
+
+   -Wstrict-aliasing=2
+   ===================
+   Aggressive, not too precise.
+   May still have many false positives (not as many as level 1 though),
+   and few false negatives (but possibly more than level 1).
+   Runs only in the front end. Uses alias_sets_might_conflict to
+   compare types. Does not check for pointer dereferences.
+   Only warns when an address is taken. Warns about incomplete type punning.
+
+   -Wstrict-aliasing=3 (default)
+   ===================
+   Should have very few false positives and few false negatives.
+   Takes care of the common punn+dereference pattern in the front end:
+   *(int*)&some_float.
+   Takes care of multiple statement cases in the back end,
+   using flow-sensitive points-to information (-O required).
+   Uses alias_sets_conflict_p to compare types and only warns
+   when the converted pointer is dereferenced.
+   Does not warn about incomplete type punning.
+
+   Future improvements can be included by adding higher levels.
+
+   In summary, expression level analysis is performed in the front-end,
+   and multiple-statement analysis is performed in the backend.
+   The remainder of this discussion is only about the backend analysis.
+
+   This implementation uses flow-sensitive points-to information.
+   Flow-sensitivity refers to accesses to the pointer, and not the object
+   pointed.  For instance, we do not warn about the following case.
+
+   Example 2.
+        int* a = (int*)malloc (...);
+        float* b = reinterpret_cast<float*> (a);
+        *b = 2.0;
+        a = (int*)malloc (...);
+        return *a;
+
+   In SSA, it becomes clear that the INT value *A_2 referenced in the
+   return statement is not aliased to the FLOAT defined through *B_1.
+        int* a_1 = (int*)malloc (...);
+        float* b_1 = reinterpret_cast<float*> (a_1);
+        *b_1 = 2.0;
+        a_2 = (int*)malloc (...);
+        return *a_2;
+
+
+   Algorithm Outline
+   =================
+
+   ForEach (ptr, object) in the points-to table
+     If (incompatible_types (*ptr, object))
+       If (referenced (ptr, current function)
+           and referenced (object, current function))
+         Issue warning (ptr, object, reference locations)
+
+   The complexity is:
+   O (sizeof (points-to table)
+      + sizeof (function body) * lookup_time (points-to table))
+
+   Pointer dereference locations are looked up on demand.  The search is
+   a single scan of the function body, in which all references to pointers
+   and objects in the points-to table are recorded.  However, this dominant
+   time factor occurs rarely, only when cross-type aliasing was detected.
+
+
+   Limitations of the Proposed Implementation
+   ==========================================
+
+   1. We do not catch the following case, because -fstrict-aliasing will
+      associate different tags with MEM while building points-to information,
+      thus before we get to analyze it.
+      XXX: this could be solved by either running with -fno-strict-aliasing
+      or by recording the points-to information before splitting the orignal
+      tag based on type.
+
+   Example 3.
+        void* mem = malloc (...);
+	int* pi = reinterpret_cast<int*> (mem);
+	float* b = reinterpret_cast<float*> (mem);
+	*b = 2.0;
+	return *pi+1;
+
+   2. We do not check whether the two conflicting (de)references can
+      reach each other in the control flow sense.  If we fixed limitation
+      1, we would wrongly issue a warning in the following case.
+
+   Example 4.
+        void* raw = malloc (...);
+        if (...) {
+         float* b = reinterpret_cast<float*> (raw);
+         *b = 2.0;
+         return (int)*b;
+        } else {
+         int* a = reinterpret_cast<int*> (raw);
+         *a = 1;
+         return *a;
+
+   3. Only simple types are compared, thus no structures, unions or classes
+      are analyzed.  A first attempt to deal with structures introduced much
+      complication and has not showed much improvement in preliminary tests,
+      so it was left out.
+
+   4. All analysis is intraprocedural.  */
+
+
+/* Local declarations.  */
+static void find_references_in_function (void);
+
+
+
+/* Get main type of tree TYPE, stripping array dimensions and qualifiers.  */
+
+static tree
+get_main_type (tree type)
+{
+  while (TREE_CODE (type) == ARRAY_TYPE)
+    type = TREE_TYPE (type);
+  return TYPE_MAIN_VARIANT (type);
+}
+
+
+/* Get the type of the given object.  If IS_PTR is true, get the type of the
+   object pointed to or referenced by OBJECT instead.
+   For arrays, return the element type.  Ignore all qualifiers.  */
+
+static tree
+get_otype (tree object, bool is_ptr)
+{
+  tree otype = TREE_TYPE (object);
+
+  if (is_ptr)
+    {
+      gcc_assert (POINTER_TYPE_P (otype));
+      otype = TREE_TYPE (otype);
+    }
+  return get_main_type (otype);
+}
+
+
+/* Return true if tree TYPE is struct, class or union.  */
+
+static bool
+struct_class_union_p (tree type)
+{
+  return (TREE_CODE (type) == RECORD_TYPE
+	  || TREE_CODE (type) == UNION_TYPE
+	  || TREE_CODE (type) == QUAL_UNION_TYPE);
+}
+
+
+
+/* Keep data during a search for an aliasing site.
+   RHS = object or pointer aliased.  No LHS is specified because we are only
+   looking in the UseDef paths of a given variable, so LHS will always be
+   an SSA name of the same variable.
+   When IS_RHS_POINTER = true, we are looking for ... = RHS.  Otherwise,
+   we are looking for ... = &RHS.
+   SITE is the output of a search, non-NULL if the search succeeded.  */
+
+struct alias_match
+{
+  tree rhs;
+  bool is_rhs_pointer;
+  tree site;
+};
+
+
+/* Callback for find_alias_site.  Return true if the right hand site
+   of STMT matches DATA.  */
+
+static bool
+find_alias_site_helper (tree var ATTRIBUTE_UNUSED, tree stmt, void *data)
+{
+  struct alias_match *match = (struct alias_match *) data;
+  tree rhs_pointer = get_rhs (stmt);
+  tree to_match = NULL_TREE;
+
+  while (TREE_CODE (rhs_pointer) == NOP_EXPR
+         || TREE_CODE (rhs_pointer) == CONVERT_EXPR
+         || TREE_CODE (rhs_pointer) == VIEW_CONVERT_EXPR)
+    rhs_pointer = TREE_OPERAND (rhs_pointer, 0);
+
+  if (!rhs_pointer)
+    /* Not a type conversion.  */
+    return false;
+
+  if (TREE_CODE (rhs_pointer) == ADDR_EXPR && !match->is_rhs_pointer)
+    to_match = TREE_OPERAND (rhs_pointer, 0);
+  else if (POINTER_TYPE_P (rhs_pointer) && match->is_rhs_pointer)
+    to_match = rhs_pointer;
+
+  if (to_match != match->rhs)
+    /* Type conversion, but not a name match.  */
+    return false;
+
+  /* Found it.  */
+  match->site = stmt;
+  return true;
+}
+
+
+/* Find the statement where OBJECT1 gets aliased to OBJECT2.
+   If IS_PTR2 is true, consider OBJECT2 to be the name of a pointer or
+   reference rather than the actual aliased object.
+   For now, just implement the case where OBJECT1 is an SSA name defined
+   by a PHI statement.  */
+
+static tree
+find_alias_site (tree object1, bool is_ptr1 ATTRIBUTE_UNUSED,
+                 tree object2, bool is_ptr2)
+{
+  struct alias_match match;
+
+  match.rhs = object2;
+  match.is_rhs_pointer = is_ptr2;
+  match.site = NULL_TREE;
+
+  if (TREE_CODE (object1) != SSA_NAME)
+    return NULL_TREE;
+
+  walk_use_def_chains (object1, find_alias_site_helper, &match, false);
+  return match.site;
+}
+
+
+/* Structure to store temporary results when trying to figure out whether
+   an object is referenced.  Just its presence in the text is not enough,
+   as we may just be taking its address.  */
+
+struct match_info
+{
+  tree object;
+  bool is_ptr;
+  /* The difference between the number of references to OBJECT
+     and the number of occurences of &OBJECT.  */
+  int found;
+};
+
+
+/* Return the base if EXPR is an SSA name.  Return EXPR otherwise.  */
+
+static tree
+get_ssa_base (tree expr)
+{
+  if (TREE_CODE (expr) == SSA_NAME)
+    return SSA_NAME_VAR (expr);
+  else
+    return expr;
+}
+
+
+/* Record references to objects and pointer dereferences across some piece of
+   code.  The number of references is recorded for each item.
+   References to an object just to take its address are not counted.
+   For instance, if PTR is a pointer and OBJ is an object:
+   1. Expression &obj + *ptr will have the following reference match structure:
+   ptrs: <ptr, 1>
+   objs: <ptr, 1>
+   OBJ does not appear as referenced because we just take its address.
+   2. Expression ptr + *ptr will have the following reference match structure:
+   ptrs: <ptr, 1>
+   objs: <ptr, 2>
+   PTR shows up twice as an object, but is dereferenced only once.
+
+   The elements of the hash tables are tree_map objects.  */
+struct reference_matches
+{
+  htab_t ptrs;
+  htab_t objs;
+};
+
+
+/* Return the match, if any.  Otherwise, return NULL_TREE.  It will
+   return NULL_TREE even when a match was found, if the value associated
+   to KEY is NULL_TREE.  */
+
+static inline tree
+match (htab_t ref_map, tree key)
+{
+  struct tree_map to_find;
+  struct tree_map *found;
+  void **slot = NULL;
+
+  to_find.from = key;
+  to_find.hash = htab_hash_pointer (key);
+  slot = htab_find_slot (ref_map, &to_find, NO_INSERT);
+
+  if (!slot)
+    return NULL_TREE;
+
+  found = (struct tree_map *) *slot;
+  return found->to;
+}
+
+
+/* Set the entry corresponding to KEY, but only if the entry
+   already exists and its value is NULL_TREE.  Otherwise, do nothing.  */
+
+static inline void
+maybe_add_match (htab_t ref_map, struct tree_map *key)
+{
+  struct tree_map *found = htab_find (ref_map, key);
+
+  if (found && !found->to)
+    found->to = key->to;
+}
+
+
+/* Add an entry to HT, with key T and value NULL_TREE.  */
+
+static void
+add_key (htab_t ht, tree t, alloc_pool references_pool)
+{
+  void **slot;
+  struct tree_map *tp = pool_alloc (references_pool);
+
+  tp->from = t;
+  tp->to = NULL_TREE;
+  tp->hash = htab_hash_pointer(tp->from);
+
+  slot = htab_find_slot (ht, tp, INSERT);
+  *slot = (void *) tp;
+}
+
+
+/* Some memory to keep the objects in the reference table.  */
+
+static alloc_pool ref_table_alloc_pool = NULL;
+
+
+/* Get some memory to keep the objects in the reference table.  */
+
+static inline alloc_pool
+reference_table_alloc_pool (bool build)
+{
+  if (ref_table_alloc_pool || !build)
+    return ref_table_alloc_pool;
+
+  ref_table_alloc_pool =
+    create_alloc_pool ("ref_table_alloc_pool", sizeof (struct tree_map), 20);
+
+  return ref_table_alloc_pool;
+}
+
+
+/* Initialize the reference table by adding all pointers in the points-to
+   table as keys, and NULL_TREE as associated values.  */
+
+static struct reference_matches *
+build_reference_table (void)
+{
+  unsigned int i;
+  struct reference_matches *ref_table = NULL;
+  alloc_pool references_pool = reference_table_alloc_pool (true);
+
+  ref_table = XNEW (struct reference_matches);
+  ref_table->objs = htab_create (10, tree_map_hash, tree_map_eq, NULL);
+  ref_table->ptrs = htab_create (10, tree_map_hash, tree_map_eq, NULL);
+
+  for (i = 1; i < num_ssa_names; i++)
+    {
+      tree ptr = ssa_name (i);
+      struct ptr_info_def *pi;
+
+      if (ptr == NULL_TREE)
+	continue;
+
+      pi = SSA_NAME_PTR_INFO (ptr);
+
+      if (!SSA_NAME_IN_FREE_LIST (ptr) && pi && pi->name_mem_tag)
+	{
+	  /* Add pointer to the interesting dereference list.  */
+	  add_key (ref_table->ptrs, ptr, references_pool);
+
+	  /* Add all aliased names to the interesting reference list.  */
+	  if (pi->pt_vars)
+	    {
+	      unsigned ix;
+	      bitmap_iterator bi;
+
+	      EXECUTE_IF_SET_IN_BITMAP (pi->pt_vars, 0, ix, bi)
+		{
+		  tree alias = referenced_var (ix);
+		  add_key (ref_table->objs, alias, references_pool);
+		}
+	    }
+	}
+    }
+
+  return ref_table;
+}
+
+
+/*  Reference table.  */
+
+static struct reference_matches *ref_table = NULL;
+
+
+/* Clean up the reference table if allocated.  */
+
+static void
+maybe_free_reference_table (void)
+{
+  if (ref_table)
+    {
+      htab_delete (ref_table->ptrs);
+      htab_delete (ref_table->objs);
+      free (ref_table);
+      ref_table = NULL;
+    }
+
+  if (ref_table_alloc_pool)
+    {
+      free_alloc_pool (ref_table_alloc_pool);
+      ref_table_alloc_pool = NULL;
+    }
+}
+
+
+/* Get the reference table.  Initialize it if needed.  */
+
+static inline struct reference_matches *
+reference_table (bool build)
+{
+  if (ref_table || !build)
+    return ref_table;
+
+  ref_table = build_reference_table ();
+  find_references_in_function ();
+  return ref_table;
+}
+
+
+/* Callback for find_references_in_function.
+   Check whether *TP is an object reference or pointer dereference for the
+   variables given in ((struct match_info*)DATA)->OBJS or
+   ((struct match_info*)DATA)->PTRS.  The total number of references
+   is stored in the same structures.  */
+
+static tree
+find_references_in_tree_helper (tree *tp,
+				int *walk_subtrees ATTRIBUTE_UNUSED,
+				void *data)
+{
+  struct tree_map match;
+  static int parent_tree_code = ERROR_MARK;
+
+  /* Do not report references just for the purpose of taking an address.
+     XXX: we rely on the fact that the tree walk is in preorder
+     and that ADDR_EXPR is not a leaf, thus cannot be carried over across
+     walks.  */
+  if (parent_tree_code == ADDR_EXPR)
+    goto finish;
+
+  match.to = (tree) data;
+
+  if (TREE_CODE (*tp) == INDIRECT_REF)
+    {
+      match.from = TREE_OPERAND (*tp, 0);
+      match.hash = htab_hash_pointer (match.from);
+      maybe_add_match (reference_table (true)->ptrs, &match);
+    }
+  else
+    {
+      match.from = *tp;
+      match.hash = htab_hash_pointer (match.from);
+      maybe_add_match (reference_table (true)->objs, &match);
+    }
+
+finish:
+  parent_tree_code = TREE_CODE (*tp);
+  return NULL_TREE;
+}
+
+
+/* Find all the references to aliased variables in the current function.  */
+
+static void
+find_references_in_function (void)
+{
+  basic_block bb;
+  block_stmt_iterator i;
+
+  FOR_EACH_BB (bb)
+    for (i = bsi_start (bb); !bsi_end_p (i); bsi_next (&i))
+      walk_tree (bsi_stmt_ptr (i), find_references_in_tree_helper,
+		 (void *) *bsi_stmt_ptr (i), NULL);
+}
+
+
+/* Find the reference site for OBJECT.
+   If IS_PTR is true, look for derferences of OBJECT instead.
+   XXX: only the first site is returned in the current
+   implementation.  If there are no matching sites, return NULL_TREE.  */
+
+static tree
+reference_site (tree object, bool is_ptr)
+{
+  if (is_ptr)
+    return match (reference_table (true)->ptrs, object);
+  else
+    return match (reference_table (true)->objs, object);
+}
+
+
+/* Try to get more location info when something is missing.
+   OBJECT1 and OBJECT2 are aliased names.  If IS_PTR1 or IS_PTR2, the alias
+   is on the memory referenced or pointed to by OBJECT1 and OBJECT2.
+   ALIAS_SITE, DEREF_SITE1 and DEREF_SITE2 are the statements where the
+   alias takes place (some pointer assignment usually) and where the
+   alias is referenced through OBJECT1 and OBJECT2 respectively.
+   REF_TYPE1 and REF_TYPE2 will return the type of the reference at the
+   respective sites.  Only the first matching reference is returned for
+   each name.  If no statement is found, the function header is returned.  */
+
+static void
+maybe_find_missing_stmts (tree object1, bool is_ptr1,
+                          tree object2, bool is_ptr2,
+                          tree *alias_site,
+                          tree *deref_site1,
+                          tree *deref_site2)
+{
+  if (object1 && object2)
+    {
+      if (!*alias_site || !EXPR_HAS_LOCATION (*alias_site))
+	*alias_site = find_alias_site (object1, is_ptr1, object2, is_ptr2);
+
+      if (!*deref_site1 || !EXPR_HAS_LOCATION (*deref_site1))
+	*deref_site1 = reference_site (object1, is_ptr1);
+
+      if (!*deref_site2 || !EXPR_HAS_LOCATION (*deref_site2))
+	*deref_site2 = reference_site (object2, is_ptr2);
+    }
+
+  /* If we could not find the alias site, set it to one of the dereference
+     sites, if available.  */
+  if (!*alias_site)
+    {
+      if (*deref_site1)
+	*alias_site = *deref_site1;
+      else if (*deref_site2)
+	*alias_site = *deref_site2;
+    }
+
+  /* If we could not find the dereference sites, set them to the alias site,
+     if known.  */
+  if (!*deref_site1 && *alias_site)
+    *deref_site1 = *alias_site;
+  if (!*deref_site2 && *alias_site)
+    *deref_site2 = *alias_site;
+}
+
+
+/* Callback for find_first_artificial_name.
+   Find out if there are no artificial names at tree node *T.  */
+
+static tree
+ffan_walker (tree *t,
+             int *go_below ATTRIBUTE_UNUSED,
+             void *data ATTRIBUTE_UNUSED)
+{
+  if (TREE_CODE (*t) == VAR_DECL || TREE_CODE (*t) == PARM_DECL)
+    if (DECL_ARTIFICIAL (*t))
+      return *t;
+  
+  return NULL_TREE;
+}
+
+/* Return the first artificial name within EXPR, or NULL_TREE if
+   none exists.  */
+
+static tree
+find_first_artificial_name (tree expr)
+{
+  return walk_tree_without_duplicates (&expr, ffan_walker, NULL);
+}
+
+
+/* Get a name from the original program for VAR.  */
+
+static const char *
+get_var_name (tree var)
+{
+  if (TREE_CODE (var) == SSA_NAME)
+    return get_var_name (get_ssa_base (var));
+
+  if (find_first_artificial_name (var))
+    return "{unknown}";
+
+  if (TREE_CODE (var) == VAR_DECL || TREE_CODE (var) == PARM_DECL)
+    if (DECL_NAME (var))
+      return IDENTIFIER_POINTER (DECL_NAME (var));
+
+  return "{unknown}";
+}
+
+
+/* Return true if VAR contains an artificial name.  */
+
+static bool
+contains_artificial_name_p (tree var)
+{
+  if (TREE_CODE (var) == SSA_NAME)
+    return contains_artificial_name_p (get_ssa_base (var));
+
+  return find_first_artificial_name (var) != NULL_TREE;
+}
+
+
+/* Return "*" if OBJECT is not the actual alias but a pointer to it, or
+   "" otherwise.
+   IS_PTR is true when OBJECT is not the actual alias.
+   In addition to checking IS_PTR, we also make sure that OBJECT is a pointer
+   since IS_PTR would also be true for C++ references, but we should only
+   print a * before a pointer and not before a reference.  */
+
+static const char *
+get_maybe_star_prefix (tree object, bool is_ptr)
+{
+  gcc_assert (object);
+  return (is_ptr
+          && TREE_CODE (TREE_TYPE (object)) == POINTER_TYPE) ? "*" : "";
+}
+
+
+/* Callback for contains_node_type_p.
+   Returns true if *T has tree code *(int*)DATA.  */
+
+static tree
+contains_node_type_p_callback (tree *t,
+			       int *go_below ATTRIBUTE_UNUSED,
+			       void *data)
+{
+  return ((int) TREE_CODE (*t) == *((int *) data)) ? *t : NULL_TREE;
+}
+
+
+/* Return true if T contains a node with tree code TYPE.  */
+
+static bool
+contains_node_type_p (tree t, int type)
+{
+  return (walk_tree_without_duplicates (&t, contains_node_type_p_callback,
+					(void *) &type)
+	  != NULL_TREE);
+}
+
+
+/* Return true if a warning was issued in the front end at STMT.  */
+
+static bool
+already_warned_in_frontend_p (tree stmt)
+{
+  tree rhs_pointer;
+
+  if (stmt == NULL_TREE)
+    return false;
+
+  rhs_pointer = get_rhs (stmt);
+
+  if ((TREE_CODE (rhs_pointer) == NOP_EXPR
+       || TREE_CODE (rhs_pointer) == CONVERT_EXPR
+       || TREE_CODE (rhs_pointer) == VIEW_CONVERT_EXPR)
+      && TREE_NO_WARNING (rhs_pointer))
+    return true;
+  else
+    return false;
+}
+
+
+/* Return true if and only if TYPE is a function or method pointer type,
+   or pointer to a pointer to ... to a function or method.  */
+
+static bool
+is_method_pointer (tree type)
+{
+  while (TREE_CODE (type) == POINTER_TYPE)
+    type = TREE_TYPE (type);
+  return TREE_CODE (type) == METHOD_TYPE || TREE_CODE (type) == FUNCTION_TYPE;
+}
+
+
+/* Issue a -Wstrict-aliasing warning.
+   OBJECT1 and OBJECT2 are aliased names.
+   If IS_PTR1 and/or IS_PTR2 is true, then the corresponding name
+   OBJECT1/OBJECT2 is a pointer or reference to the aliased memory,
+   rather than actual storage.
+   ALIAS_SITE is a statement where the alias took place.  In the most common
+   case, that is where a pointer was assigned to the address of an object.  */
+
+static bool
+strict_aliasing_warn (tree alias_site,
+                      tree object1, bool is_ptr1,
+                      tree object2, bool is_ptr2,
+		      bool filter_artificials)
+{
+  tree ref_site1 = NULL_TREE;
+  tree ref_site2 = NULL_TREE;
+  const char *name1;
+  const char *name2;
+  location_t alias_loc;
+  location_t ref1_loc;
+  location_t ref2_loc;
+  gcc_assert (object1);
+  gcc_assert (object2);
+
+  if (contains_artificial_name_p (object1)
+      || contains_artificial_name_p (object2))
+    return false;
+
+  name1 = get_var_name (object1);
+  name2 = get_var_name (object2);
+
+  if (is_method_pointer (get_main_type (TREE_TYPE (object2))))
+    return false;
+
+  maybe_find_missing_stmts (object1, is_ptr1, object2, is_ptr2, &alias_site,
+                            &ref_site1, &ref_site2);
+
+  if (!alias_site)
+    return false;
+
+  if (EXPR_HAS_LOCATION (alias_site))
+    alias_loc = EXPR_LOCATION (alias_site);
+  else
+    return false;
+
+  if (EXPR_HAS_LOCATION (ref_site1))
+    ref1_loc = EXPR_LOCATION (ref_site1);
+  else
+    ref1_loc = alias_loc;
+
+  if (EXPR_HAS_LOCATION (ref_site2))
+    ref2_loc = EXPR_LOCATION (ref_site2);
+  else
+    ref2_loc = alias_loc;
+
+  if (already_warned_in_frontend_p (alias_site))
+    return false;
+
+  /* If they are not SSA names, but contain SSA names, drop the warning
+     because it cannot be displayed well.
+     Also drop it if they both contain artificials.
+     XXX: this is a hack, must figure out a better way to display them.  */
+  if (filter_artificials)
+    if ((find_first_artificial_name (get_ssa_base (object1))
+	 && find_first_artificial_name (get_ssa_base (object2)))
+	|| (TREE_CODE (object1) != SSA_NAME
+	    && contains_node_type_p (object1, SSA_NAME))
+	|| (TREE_CODE (object2) != SSA_NAME
+	    && contains_node_type_p (object2, SSA_NAME)))
+      return false;
+
+  /* XXX: In the following format string, %s:%d should be replaced by %H.
+     However, in my tests only the first %H printed ok, while the
+     second and third were printed as blanks.  */
+  warning (OPT_Wstrict_aliasing,
+	   "%Hlikely type-punning may break strict-aliasing rules: "
+	   "object %<%s%s%> of main type %qT is referenced at or around "
+	   "%s:%d and may be "
+	   "aliased to object %<%s%s%> of main type %qT which is referenced "
+	   "at or around %s:%d.",
+	   &alias_loc,
+	   get_maybe_star_prefix (object1, is_ptr1),
+	   name1, get_otype (object1, is_ptr1),
+	   LOCATION_FILE (ref1_loc), LOCATION_LINE (ref1_loc),
+	   get_maybe_star_prefix (object2, is_ptr2),
+	   name2, get_otype (object2, is_ptr2),
+	   LOCATION_FILE (ref2_loc), LOCATION_LINE (ref2_loc));
+
+  return true;
+}
+
+
+
+/* Return true when any objects of TYPE1 and TYPE2 respectively
+   may not be aliased according to the language standard.  */
+
+static bool
+nonstandard_alias_types_p (tree type1, tree type2)
+{
+  HOST_WIDE_INT set1;
+  HOST_WIDE_INT set2;
+
+  if (VOID_TYPE_P (type1) || VOID_TYPE_P (type2))
+    return false;
+
+  set1 = get_alias_set (type1);
+  set2 = get_alias_set (type2);
+  return !alias_sets_conflict_p (set1, set2);
+}
+
+
+
+/* Returns true if the given name is a struct field tag (SFT).  */
+
+static bool
+struct_field_tag_p (tree var)
+{
+  return TREE_CODE (var) == STRUCT_FIELD_TAG;
+}
+
+
+/* Returns true when *PTR may not be aliased to ALIAS.
+   See C standard 6.5p7 and C++ standard 3.10p15.
+   If PTR_PTR is true, ALIAS represents a pointer or reference to the
+   aliased storage rather than its actual name.  */
+
+static bool
+nonstandard_alias_p (tree ptr, tree alias, bool ptr_ptr)
+{
+  /* Find the types to compare.  */
+  tree ptr_type = get_otype (ptr, true);
+  tree alias_type = get_otype (alias, ptr_ptr);
+
+  /* XXX: for now, say it's OK if the alias escapes.
+     Not sure this is needed in general, but otherwise GCC will not
+     bootstrap.  */
+  if (var_ann (get_ssa_base (alias))->escape_mask != NO_ESCAPE)
+      return false;
+
+  /* XXX: don't get into structures for now.  It brings much complication
+     and little benefit.  */
+  if (struct_class_union_p (ptr_type) || struct_class_union_p (alias_type))
+    return false;
+
+  /* XXX: In 4.2.1, field resolution in alias is not as good as in pre-4.3
+     This fixes problems found during the backport, where a pointer to the
+     first field of a struct appears to be aliased to the whole struct.  */
+  if (struct_field_tag_p (alias))
+     return false;
+
+  /* If they are both SSA names of artificials, let it go, the warning
+     is too confusing.  */
+  if (find_first_artificial_name (ptr) && find_first_artificial_name (alias))
+    return false;
+
+  /* Compare the types.  */
+  return nonstandard_alias_types_p (ptr_type, alias_type);
+}
+
+
+/* Return true when we should skip analysis for pointer PTR based on the
+   fact that their alias information *PI is not considered relevant.  */
+
+static bool
+skip_this_pointer (tree ptr ATTRIBUTE_UNUSED, struct ptr_info_def *pi)
+{
+  /* If it is not dereferenced, it is not a problem (locally).  */
+  if (!pi->is_dereferenced)
+    return true;
+
+  /* This would probably cause too many false positives.  */
+  if (pi->value_escapes_p || pi->pt_anything)
+    return true;
+
+  return false;
+}
+
+
+/* Find aliasing to named objects for pointer PTR.  */
+
+static void
+dsa_named_for (tree ptr)
+{
+  struct ptr_info_def *pi = SSA_NAME_PTR_INFO (ptr);
+
+  if (pi)
+    {
+      if (skip_this_pointer (ptr, pi))
+	return;
+
+      /* For all the variables it could be aliased to.  */
+      if (pi->pt_vars)
+	{
+	  unsigned ix;
+	  bitmap_iterator bi;
+
+	  EXECUTE_IF_SET_IN_BITMAP (pi->pt_vars, 0, ix, bi)
+	    {
+	      tree alias = referenced_var (ix);
+
+              if (is_global_var (alias))
+                continue;
+
+	      if (nonstandard_alias_p (ptr, alias, false))
+		strict_aliasing_warn (SSA_NAME_DEF_STMT (ptr),
+				      ptr, true, alias, false, true);
+	    }
+	}
+    }
+}
+
+
+/* Detect and report strict aliasing violation of named objects.  */
+
+static void
+detect_strict_aliasing_named (void)
+{
+  unsigned int i;
+
+  for (i = 1; i < num_ssa_names; i++)
+    {
+      tree ptr = ssa_name (i);
+      struct ptr_info_def *pi;
+
+      if (ptr == NULL_TREE)
+	continue;
+
+      pi = SSA_NAME_PTR_INFO (ptr);
+
+      if (!SSA_NAME_IN_FREE_LIST (ptr) && pi && pi->name_mem_tag)
+	dsa_named_for (ptr);
+    }
+}
+
+
+/* Return false only the first time I see each instance of FUNC.  */
+
+static bool
+processed_func_p (tree func)
+{
+  static htab_t seen = NULL;
+  void **slot;
+
+  if (!seen)
+    seen = htab_create (100, htab_hash_pointer, htab_eq_pointer, NULL);
+
+  slot = htab_find_slot (seen, func, INSERT);
+  gcc_assert (slot);
+
+  if (*slot)
+    return true;
+
+  *slot = func;
+  return false;
+}
+
+
+/* Detect and warn about type-punning using points-to information.  */
+
+void
+strict_aliasing_warning_backend (void)
+{
+  if (!(flag_strict_aliasing
+        && warn_strict_aliasing == 3
+        && !processed_func_p (current_function_decl)))
+    return;
+
+  detect_strict_aliasing_named ();
+  maybe_free_reference_table ();
+}
diff --git a/contrib/gcc/tree-ssa-alias.c b/contrib/gcc/tree-ssa-alias.c
index 04c45ebd32b..c7007337241 100644
--- a/contrib/gcc/tree-ssa-alias.c
+++ b/contrib/gcc/tree-ssa-alias.c
@@ -652,7 +652,7 @@ static unsigned int
 compute_may_aliases (void)
 {
   struct alias_info *ai;
-  
+
   memset (&alias_stats, 0, sizeof (alias_stats));
 
   /* Initialize aliasing information.  */
@@ -710,6 +710,9 @@ compute_may_aliases (void)
       dump_alias_info (dump_file);
     }
 
+  /* Report strict aliasing violations.  */
+  strict_aliasing_warning_backend ();
+
   /* Deallocate memory used by aliasing data structures.  */
   delete_alias_info (ai);
 
diff --git a/contrib/gcc/tree-ssa-propagate.c b/contrib/gcc/tree-ssa-propagate.c
index e0859110679..1a8a614e58e 100644
--- a/contrib/gcc/tree-ssa-propagate.c
+++ b/contrib/gcc/tree-ssa-propagate.c
@@ -1,5 +1,5 @@
 /* Generic SSA value propagation engine.
-   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    Contributed by Diego Novillo <dnovillo@redhat.com>
 
    This file is part of GCC.
@@ -176,6 +176,8 @@ cfg_blocks_empty_p (void)
 static void 
 cfg_blocks_add (basic_block bb)
 {
+  bool head = false;
+
   gcc_assert (bb != ENTRY_BLOCK_PTR && bb != EXIT_BLOCK_PTR);
   gcc_assert (!TEST_BIT (bb_in_list, bb->index));
 
@@ -198,12 +200,26 @@ cfg_blocks_add (basic_block bb)
 	  cfg_blocks_head = 0;
 	  VEC_safe_grow (basic_block, heap, cfg_blocks, 2 * cfg_blocks_tail);
 	}
-      else
+      /* Minor optimization: we prefer to see blocks with more
+	 predecessors later, because there is more of a chance that
+	 the incoming edges will be executable.  */
+      else if (EDGE_COUNT (bb->preds)
+	       >= EDGE_COUNT (VEC_index (basic_block, cfg_blocks,
+					 cfg_blocks_head)->preds))
 	cfg_blocks_tail = ((cfg_blocks_tail + 1)
 			   % VEC_length (basic_block, cfg_blocks));
+      else
+	{
+	  if (cfg_blocks_head == 0)
+	    cfg_blocks_head = VEC_length (basic_block, cfg_blocks);
+	  --cfg_blocks_head;
+	  head = true;
+	}
     }
 
-  VEC_replace (basic_block, cfg_blocks, cfg_blocks_tail, bb);
+  VEC_replace (basic_block, cfg_blocks,
+	       head ? cfg_blocks_head : cfg_blocks_tail,
+	       bb);
   SET_BIT (bb_in_list, bb->index);
 }
 
diff --git a/contrib/gcc/tree-vrp.c b/contrib/gcc/tree-vrp.c
index 4626485191f..f97bd613104 100644
--- a/contrib/gcc/tree-vrp.c
+++ b/contrib/gcc/tree-vrp.c
@@ -2509,12 +2509,18 @@ adjust_range_with_scev (value_range_t *vr, struct loop *loop, tree stmt,
 				true))
     return;
 
+  type = TREE_TYPE (var);
+
+  /* If we see a pointer type starting at a constant, then we have an
+     unusual ivopt.  It may legitimately wrap.  */
+  if (POINTER_TYPE_P (type) && is_gimple_min_invariant (init))
+    return;
+
   /* We use TYPE_MIN_VALUE and TYPE_MAX_VALUE here instead of
      negative_overflow_infinity and positive_overflow_infinity,
      because we have concluded that the loop probably does not
      wrap.  */
 
-  type = TREE_TYPE (var);
   if (POINTER_TYPE_P (type) || !TYPE_MIN_VALUE (type))
     tmin = lower_bound_in_type (type, type);
   else
@@ -4914,7 +4920,7 @@ simplify_div_or_mod_using_ranges (tree stmt, tree rhs, enum tree_code rhs_code)
     {
       bool sop = false;
 
-      val = compare_range_with_value (GT_EXPR, vr, integer_zero_node, &sop);
+      val = compare_range_with_value (GE_EXPR, vr, integer_zero_node, &sop);
 
       if (val
 	  && sop
diff --git a/contrib/gcc/tree.c b/contrib/gcc/tree.c
index a4f0616323b..8e0b801725d 100644
--- a/contrib/gcc/tree.c
+++ b/contrib/gcc/tree.c
@@ -541,9 +541,13 @@ make_node_stat (enum tree_code code MEM_STAT_DECL)
 	DECL_IN_SYSTEM_HEADER (t) = in_system_header;
       if (CODE_CONTAINS_STRUCT (code, TS_DECL_COMMON))
 	{
-	  if (code != FUNCTION_DECL)
+	  if (code == FUNCTION_DECL)
+	    {
+	      DECL_ALIGN (t) = FUNCTION_BOUNDARY;
+	      DECL_MODE (t) = FUNCTION_MODE;
+	    }
+	  else
 	    DECL_ALIGN (t) = 1;
-	  DECL_USER_ALIGN (t) = 0;	  
 	  /* We have not yet computed the alias set for this declaration.  */
 	  DECL_POINTER_ALIAS_SET (t) = -1;
 	}
@@ -1881,14 +1885,13 @@ expr_align (tree t)
       align1 = expr_align (TREE_OPERAND (t, 2));
       return MIN (align0, align1);
 
+      /* FIXME: LABEL_DECL and CONST_DECL never have DECL_ALIGN set
+	 meaningfully, it's always 1.  */
     case LABEL_DECL:     case CONST_DECL:
     case VAR_DECL:       case PARM_DECL:   case RESULT_DECL:
-      if (DECL_ALIGN (t) != 0)
-	return DECL_ALIGN (t);
-      break;
-
     case FUNCTION_DECL:
-      return FUNCTION_BOUNDARY;
+      gcc_assert (DECL_ALIGN (t) != 0);
+      return DECL_ALIGN (t);
 
     default:
       break;
@@ -3174,8 +3177,6 @@ build_decl_stat (enum tree_code code, tree name, tree type MEM_STAT_DECL)
 
   if (code == VAR_DECL || code == PARM_DECL || code == RESULT_DECL)
     layout_decl (t, 0);
-  else if (code == FUNCTION_DECL)
-    DECL_MODE (t) = FUNCTION_MODE;
 
   return t;
 }
@@ -6044,41 +6045,48 @@ clean_symbol_name (char *p)
       *p = '_';
 }
 
-/* Generate a name for a function unique to this translation unit.
+/* Generate a name for a special-purpose function function.
+   The generated name may need to be unique across the whole link.
    TYPE is some string to identify the purpose of this function to the
-   linker or collect2.  */
+   linker or collect2; it must start with an uppercase letter,
+   one of:
+   I - for constructors
+   D - for destructors
+   N - for C++ anonymous namespaces
+   F - for DWARF unwind frame information.  */
 
 tree
-get_file_function_name_long (const char *type)
+get_file_function_name (const char *type)
 {
   char *buf;
   const char *p;
   char *q;
 
+  /* If we already have a name we know to be unique, just use that.  */
   if (first_global_object_name)
+    p = first_global_object_name;
+  /* If the target is handling the constructors/destructors, they
+     will be local to this file and the name is only necessary for
+     debugging purposes.  */
+  else if ((type[0] == 'I' || type[0] == 'D') && targetm.have_ctors_dtors)
     {
-      p = first_global_object_name;
-
-      /* For type 'F', the generated name must be unique not only to this
-	 translation unit but also to any given link.  Since global names
-	 can be overloaded, we concatenate the first global object name
-	 with a string derived from the file name of this object.  */
-      if (!strcmp (type, "F"))
-	{
-	  const char *file = main_input_filename;
-
-	  if (! file)
-	    file = input_filename;
-
-	  q = alloca (strlen (p) + 10);
-	  sprintf (q, "%s_%08X", p, crc32_string (0, file));
-
-	  p = q;
-	}
+      const char *file = main_input_filename;
+      if (! file)
+	file = input_filename;
+      /* Just use the file's basename, because the full pathname
+	 might be quite long.  */
+      p = strrchr (file, '/');
+      if (p)
+	p++;
+      else
+	p = file;
+      p = q = ASTRDUP (p);
+      clean_symbol_name (q);
     }
   else
     {
-      /* We don't have anything that we know to be unique to this translation
+      /* Otherwise, the name must be unique across the entire link.
+	 We don't have anything that we know to be unique to this translation
 	 unit, so use what we do have and throw in some randomness.  */
       unsigned len;
       const char *name = weak_global_object_name;
@@ -6110,20 +6118,6 @@ get_file_function_name_long (const char *type)
 
   return get_identifier (buf);
 }
-
-/* If KIND=='I', return a suitable global initializer (constructor) name.
-   If KIND=='D', return a suitable global clean-up (destructor) name.  */
-
-tree
-get_file_function_name (int kind)
-{
-  char p[2];
-
-  p[0] = kind;
-  p[1] = 0;
-
-  return get_file_function_name_long (p);
-}
 
 #if defined ENABLE_TREE_CHECKING && (GCC_VERSION >= 2007)
 
@@ -6585,6 +6579,10 @@ build_common_tree_nodes_2 (int short_double)
   long_double_ptr_type_node = build_pointer_type (long_double_type_node);
   integer_ptr_type_node = build_pointer_type (integer_type_node);
 
+  /* Fixed size integer types.  */
+  uint32_type_node = build_nonstandard_integer_type (32, true);
+  uint64_type_node = build_nonstandard_integer_type (64, true);
+
   /* Decimal float types. */
   dfloat32_type_node = make_node (REAL_TYPE);
   TYPE_PRECISION (dfloat32_type_node) = DECIMAL32_TYPE_SIZE; 
diff --git a/contrib/gcc/tree.h b/contrib/gcc/tree.h
index 97090be41fc..6cfc3d375cc 100644
--- a/contrib/gcc/tree.h
+++ b/contrib/gcc/tree.h
@@ -1084,6 +1084,11 @@ extern void omp_clause_range_check_failed (const tree, const char *, int,
 
 #define TREE_OVERFLOW(NODE) (CST_CHECK (NODE)->common.public_flag)
 
+/* TREE_OVERFLOW can only be true for EXPR of CONSTANT_CLASS_P. */
+
+#define TREE_OVERFLOW_P(EXPR) \
+  (CONSTANT_CLASS_P (EXPR) && TREE_OVERFLOW (EXPR))
+
 /* In a VAR_DECL, FUNCTION_DECL, NAMESPACE_DECL or TYPE_DECL,
    nonzero means name is to be accessible from outside this module.
    In an IDENTIFIER_NODE, nonzero means an external declaration
@@ -2421,13 +2426,11 @@ struct tree_struct_field_tag GTY(())
 /* Likewise for the size in bytes.  */
 #define DECL_SIZE_UNIT(NODE) (DECL_COMMON_CHECK (NODE)->decl_common.size_unit)
 /* Holds the alignment required for the datum, in bits.  */
-#define DECL_ALIGN(NODE) (DECL_COMMON_CHECK (NODE)->decl_common.u1.a.align)
+#define DECL_ALIGN(NODE) (DECL_COMMON_CHECK (NODE)->decl_common.align)
 /* The alignment of NODE, in bytes.  */
 #define DECL_ALIGN_UNIT(NODE) (DECL_ALIGN (NODE) / BITS_PER_UNIT)
-/* For FIELD_DECLs, off_align holds the number of low-order bits of
-   DECL_FIELD_OFFSET which are known to be always zero.
-   DECL_OFFSET_ALIGN thus returns the alignment that DECL_FIELD_OFFSET
-   has.  */
+/* Set if the alignment of this DECL has been set by the user, for
+   example with an 'aligned' attribute.  */
 #define DECL_USER_ALIGN(NODE) (DECL_COMMON_CHECK (NODE)->decl_common.user_align)
 /* Holds the machine mode corresponding to the declaration of a variable or
    field.  Always equal to TYPE_MODE (TREE_TYPE (decl)) except for a
@@ -2438,7 +2441,8 @@ struct tree_struct_field_tag GTY(())
    operation it is.  Note, however, that this field is overloaded, with
    DECL_BUILT_IN_CLASS as the discriminant, so the latter must always be
    checked before any access to the former.  */
-#define DECL_FUNCTION_CODE(NODE) (FUNCTION_DECL_CHECK (NODE)->decl_common.u1.f)
+#define DECL_FUNCTION_CODE(NODE) \
+  (FUNCTION_DECL_CHECK (NODE)->function_decl.function_code)
 #define DECL_DEBUG_EXPR_IS_FROM(NODE) \
   (DECL_COMMON_CHECK (NODE)->decl_common.debug_expr_is_from)
 
@@ -2576,20 +2580,9 @@ struct tree_decl_common GTY(())
   unsigned gimple_reg_flag : 1;
   unsigned call_clobbered_flag : 1;
 
-  union tree_decl_u1 {
-    /* In a FUNCTION_DECL for which DECL_BUILT_IN holds, this is
-       DECL_FUNCTION_CODE.  */
-    enum built_in_function f;
-    /* In a FUNCTION_DECL for which DECL_BUILT_IN does not hold, this
-       is used by language-dependent code.  */
-    HOST_WIDE_INT i;
-    /* DECL_ALIGN and DECL_OFFSET_ALIGN.  (These are not used for
-       FUNCTION_DECLs).  */
-    struct tree_decl_u1_a {
-      unsigned int align : 24;
-      unsigned int off_align : 8;
-    } a;
-  } GTY ((skip)) u1;
+  unsigned int align : 24;
+  /* DECL_OFFSET_ALIGN, used only for FIELD_DECLs.  */
+  unsigned int off_align : 8;
 
   tree size_unit;
   tree initial;
@@ -2674,11 +2667,11 @@ struct tree_decl_with_rtl GTY(())
    DECL_OFFSET_ALIGN thus returns the alignment that DECL_FIELD_OFFSET
    has.  */
 #define DECL_OFFSET_ALIGN(NODE) \
-  (((unsigned HOST_WIDE_INT)1) << FIELD_DECL_CHECK (NODE)->decl_common.u1.a.off_align)
+  (((unsigned HOST_WIDE_INT)1) << FIELD_DECL_CHECK (NODE)->decl_common.off_align)
 
 /* Specify that DECL_ALIGN(NODE) is a multiple of X.  */
 #define SET_DECL_OFFSET_ALIGN(NODE, X) \
-  (FIELD_DECL_CHECK (NODE)->decl_common.u1.a.off_align = exact_log2 ((X) & -(X)))
+  (FIELD_DECL_CHECK (NODE)->decl_common.off_align = exact_log2 ((X) & -(X)))
 /* 1 if the alignment for this type was requested by "aligned" attribute,
    0 if it is the default for this type.  */
 
@@ -3091,6 +3084,10 @@ struct tree_function_decl GTY(())
 {
   struct tree_decl_non_common common;
 
+  /* In a FUNCTION_DECL for which DECL_BUILT_IN holds, this is
+     DECL_FUNCTION_CODE.  Otherwise unused.  */
+  enum built_in_function function_code;
+
   unsigned static_ctor_flag : 1;
   unsigned static_dtor_flag : 1;
   unsigned uninlinable : 1;
@@ -3240,6 +3237,9 @@ enum tree_index
   TI_UINTDI_TYPE,
   TI_UINTTI_TYPE,
 
+  TI_UINT32_TYPE,
+  TI_UINT64_TYPE,
+
   TI_INTEGER_ZERO,
   TI_INTEGER_ONE,
   TI_INTEGER_MINUS_ONE,
@@ -3315,6 +3315,9 @@ extern GTY(()) tree global_trees[TI_MAX];
 #define unsigned_intDI_type_node	global_trees[TI_UINTDI_TYPE]
 #define unsigned_intTI_type_node	global_trees[TI_UINTTI_TYPE]
 
+#define uint32_type_node		global_trees[TI_UINT32_TYPE]
+#define uint64_type_node		global_trees[TI_UINT64_TYPE]
+
 #define integer_zero_node		global_trees[TI_INTEGER_ZERO]
 #define integer_one_node		global_trees[TI_INTEGER_ONE]
 #define integer_minus_one_node		global_trees[TI_INTEGER_MINUS_ONE]
@@ -4180,7 +4183,7 @@ extern GTY(()) const char * current_function_func_begin_label;
 /* In tree.c */
 extern unsigned crc32_string (unsigned, const char *);
 extern void clean_symbol_name (char *);
-extern tree get_file_function_name_long (const char *);
+extern tree get_file_function_name (const char *);
 extern tree get_callee_fndecl (tree);
 extern void change_decl_assembler_name (tree, tree);
 extern int type_num_arguments (tree);
@@ -4523,10 +4526,6 @@ extern void gimplify_function_tree (tree);
 extern const char *get_name (tree);
 extern tree unshare_expr (tree);
 extern void sort_case_labels (tree);
-
-/* If KIND=='I', return a suitable global initializer (constructor) name.
-   If KIND=='D', return a suitable global clean-up (destructor) name.  */
-extern tree get_file_function_name (int);
 
 /* Interface of the DWARF2 unwind info support.  */
 
diff --git a/contrib/gcc/varasm.c b/contrib/gcc/varasm.c
index 21b690417b7..ef3a83a9990 100644
--- a/contrib/gcc/varasm.c
+++ b/contrib/gcc/varasm.c
@@ -1383,7 +1383,7 @@ assemble_start_function (tree decl, const char *fnname)
   if (flag_reorder_blocks_and_partition)
     {
       switch_to_section (unlikely_text_section ());
-      assemble_align (FUNCTION_BOUNDARY);
+      assemble_align (DECL_ALIGN (decl));
       ASM_OUTPUT_LABEL (asm_out_file, cfun->cold_section_label);
 
       /* When the function starts with a cold section, we need to explicitly
@@ -1393,7 +1393,7 @@ assemble_start_function (tree decl, const char *fnname)
 	  && BB_PARTITION (ENTRY_BLOCK_PTR->next_bb) == BB_COLD_PARTITION)
 	{
 	  switch_to_section (text_section);
-	  assemble_align (FUNCTION_BOUNDARY);
+	  assemble_align (DECL_ALIGN (decl));
 	  ASM_OUTPUT_LABEL (asm_out_file, cfun->hot_section_label);
 	  hot_label_written = true;
 	  first_function_block_is_cold = true;
@@ -1424,18 +1424,17 @@ assemble_start_function (tree decl, const char *fnname)
     ASM_OUTPUT_LABEL (asm_out_file, cfun->hot_section_label);
 
   /* Tell assembler to move to target machine's alignment for functions.  */
-  align = floor_log2 (FUNCTION_BOUNDARY / BITS_PER_UNIT);
-  if (align < force_align_functions_log)
-    align = force_align_functions_log;
+  align = floor_log2 (DECL_ALIGN (decl) / BITS_PER_UNIT);
   if (align > 0)
     {
       ASM_OUTPUT_ALIGN (asm_out_file, align);
     }
 
   /* Handle a user-specified function alignment.
-     Note that we still need to align to FUNCTION_BOUNDARY, as above,
+     Note that we still need to align to DECL_ALIGN, as above,
      because ASM_OUTPUT_MAX_SKIP_ALIGN might not do any alignment at all.  */
-  if (align_functions_log > align
+  if (! DECL_USER_ALIGN (decl)
+      && align_functions_log > align
       && cfun->function_frequency != FUNCTION_FREQUENCY_UNLIKELY_EXECUTED)
     {
 #ifdef ASM_OUTPUT_MAX_SKIP_ALIGN
diff --git a/contrib/gcclibs/libcpp/ChangeLog.gcc43 b/contrib/gcclibs/libcpp/ChangeLog.gcc43
new file mode 100644
index 00000000000..da70d1c3005
--- /dev/null
+++ b/contrib/gcclibs/libcpp/ChangeLog.gcc43
@@ -0,0 +1,57 @@
+2007-06-05  Joerg Wunsch  <j.gnu@uriah.heep.sax.de> (r250566)
+
+	PR preprocessor/23479
+	* expr.c (cpp_classify_number): Implement 0b-prefixed binary
+	integer constants.
+	(append_digit): Likewise.
+	* include/cpplib.h: Add CPP_N_BINARY, to be used for 0b-prefixed
+	binary integer constants.
+	
+2007-05-31  Dave Korn  <dave.korn@artimi.com> (r125212)
+
+	PR preprocessor/14331
+	* lex.c (_cpp_get_fresh_line):  Don't warn if no newline at EOF.
+
+2007-05-21  Ian Lance Taylor  <iant@google.com> (r124929)
+
+	* internal.h (struct cpp_reader): Add new fields:
+	nonexistent_file_hash and nonexistent_file_ob.
+	* files.c: Include "obstack.h".
+	(find_file_in_dir): Before trying to open the file, look up the
+	path name in the hash table of nonexistent files.  After failing
+	to open the file, add the path name to the hash table.
+	(_cpp_find_file): Cache the results of looking up the file name
+	starting with the quote and bracket chain heads, if we can.
+	(nonexistent_file_hash_eq): New static function.
+	(_cpp_init_files): Initialize pfile->nonexistent_file_hash and
+	pfile->nonexistent_file_ob.
+	(_cpp_cleanup_files): Free pfile->nonexistent_file_hash and
+	pfile->nonexistent_file_ob.
+
+2007-05-14  Janis Johnson  <janis187@us.ibm.com> (r124731)
+
+	PR c/31924
+	* expr.c (interpret_float_suffix): Check for invalid suffix.
+
+2007-05-02  Eric Christopher  <echristo@apple.com> (r124358)
+
+	* expr.c (num_div_op): Don't overflow if the result is
+	zero.
+
+2007-05-02  Tom Tromey  <tromey@redhat.com> (r124356)
+
+	PR preprocessor/28709:
+	* macro.c (paste_tokens): Remove PASTE_LEFT from the old lhs.
+
+2007-01-30  Tom Tromey  <tromey@redhat.com> (r121340)
+
+	PR preprocessor/29966:
+	* macro.c (lex_expansion_token): Save and restore cpp_reader's
+	cur_token.
+	(_cpp_create_definition): Don't restore cur_token here.
+	* lex.c (_cpp_lex_token): Added assertion.
+
+2006-12-29  Ian Lance Taylor  <iant@google.com> (r120263)
+
+	* lex.c (_cpp_clean_line): Add uses of __builtin_expect.  Don't
+	look backward at the end of the line unless we saw a backslash.
diff --git a/contrib/gcclibs/libcpp/Makefile.in b/contrib/gcclibs/libcpp/Makefile.in
index 7a0b74f2092..697318daa4f 100644
--- a/contrib/gcclibs/libcpp/Makefile.in
+++ b/contrib/gcclibs/libcpp/Makefile.in
@@ -69,14 +69,14 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/../include @INCINTL@ \
 
 ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS)
 
-libcpp_a_OBJS = charset.o directives.o errors.o expr.o files.o \
-	identifiers.o init.o lex.o line-map.o macro.o mkdeps.o \
-	pch.o symtab.o traditional.o
+libcpp_a_OBJS = charset.o directives.o directives-only.o errors.o \
+	expr.o files.o identifiers.o init.o lex.o line-map.o macro.o \
+	mkdeps.o pch.o symtab.o traditional.o
 makedepend_OBJS = makedepend.o
 
-libcpp_a_SOURCES = charset.c directives.c errors.c expr.c files.c \
-	identifiers.c init.c lex.c line-map.c macro.c mkdeps.c \
-	pch.c symtab.c traditional.c
+libcpp_a_SOURCES = charset.c directives.c directives-only.c errors.c \
+	expr.c files.c identifiers.c init.c lex.c line-map.c macro.c \
+	mkdeps.c pch.c symtab.c traditional.c
 
 all: libcpp.a makedepend$(EXEEXT) $(USED_CATALOGS)
 
diff --git a/contrib/gcclibs/libcpp/charset.c b/contrib/gcclibs/libcpp/charset.c
index 78c89816735..6361f8c5132 100644
--- a/contrib/gcclibs/libcpp/charset.c
+++ b/contrib/gcclibs/libcpp/charset.c
@@ -1628,7 +1628,7 @@ _cpp_convert_input (cpp_reader *pfile, const char *input_charset,
      terminate with another \r, not an \n, so that we do not mistake
      the \r\n sequence for a single DOS line ending and erroneously
      issue the "No newline at end of file" diagnostic.  */
-  if (to.text[to.len - 1] == '\r')
+  if (to.len > 0 && to.text[to.len - 1] == '\r')
     to.text[to.len] = '\r';
   else
     to.text[to.len] = '\n';
diff --git a/contrib/gcclibs/libcpp/directives-only.c b/contrib/gcclibs/libcpp/directives-only.c
new file mode 100644
index 00000000000..5990fbf4f34
--- /dev/null
+++ b/contrib/gcclibs/libcpp/directives-only.c
@@ -0,0 +1,229 @@
+/* CPP Library - directive only preprocessing for distributed compilation.
+   Copyright (C) 2007
+   Free Software Foundation, Inc.
+   Contributed by Ollie Wild <aaw@google.com>.
+
+This program 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, or (at your option) any
+later version.
+
+This program 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 this program; if not, write to the Free Software
+Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include "config.h"
+#include "system.h"
+#include "cpplib.h"
+#include "internal.h"
+
+/* DO (Directive only) flags. */
+#define DO_BOL		 (1 << 0) /* At the beginning of a logical line. */
+#define DO_STRING	 (1 << 1) /* In a string constant. */
+#define DO_CHAR		 (1 << 2) /* In a character constant. */
+#define DO_BLOCK_COMMENT (1 << 3) /* In a block comment. */
+#define DO_LINE_COMMENT	 (1 << 4) /* In a single line "//-style" comment. */
+
+#define DO_LINE_SPECIAL (DO_STRING | DO_CHAR | DO_LINE_COMMENT)
+#define DO_SPECIAL	(DO_LINE_SPECIAL | DO_BLOCK_COMMENT)
+
+/* Writes out the preprocessed file, handling spacing and paste
+   avoidance issues.  */
+void
+_cpp_preprocess_dir_only (cpp_reader *pfile,
+			  const struct _cpp_dir_only_callbacks *cb)
+{
+  struct cpp_buffer *buffer;
+  const unsigned char *cur, *base, *next_line, *rlimit;
+  cppchar_t c, last_c;
+  unsigned flags;
+  int lines, col;
+  source_location loc;
+
+ restart:
+  /* Buffer initialization ala _cpp_clean_line(). */
+  buffer = pfile->buffer;
+  buffer->cur_note = buffer->notes_used = 0;
+  buffer->cur = buffer->line_base = buffer->next_line;
+  buffer->need_line = false;
+
+  /* This isn't really needed.  It prevents a compiler warning, though. */
+  loc = pfile->line_table->highest_line;
+
+  /* Scan initialization. */
+  next_line = cur = base = buffer->cur;
+  rlimit = buffer->rlimit;
+  flags = DO_BOL;
+  lines = 0;
+  col = 1;
+
+  for (last_c = '\n', c = *cur; cur < rlimit; last_c = c, c = *++cur, ++col)
+    {
+      /* Skip over escaped newlines. */
+      if (__builtin_expect (c == '\\', false))
+	{
+	  const unsigned char *tmp = cur + 1;
+
+	  while (is_nvspace (*tmp) && tmp < rlimit)
+	    tmp++;
+	  if (*tmp == '\r')
+	    tmp++;
+	  if (*tmp == '\n' && tmp < rlimit)
+	    {
+	      CPP_INCREMENT_LINE (pfile, 0);
+	      lines++;
+	      col = 0;
+	      cur = tmp;
+	      c = last_c;
+	      continue;
+	    }
+	}
+
+      if (__builtin_expect (last_c == '#', false) && !(flags & DO_SPECIAL))
+	{
+	  if (c != '#' && (flags & DO_BOL))
+	  {
+	    struct line_maps *line_table;
+
+	    if (!pfile->state.skipping && next_line != base)
+	      cb->print_lines (lines, base, next_line - base);
+
+	    /* Prep things for directive handling. */
+	    buffer->next_line = cur;
+	    buffer->need_line = true;
+	    _cpp_get_fresh_line (pfile);
+
+	    /* Ensure proper column numbering for generated error messages. */
+	    buffer->line_base -= col - 1;
+
+	    _cpp_handle_directive (pfile, 0 /* ignore indented */);
+
+	    /* Sanitize the line settings.  Duplicate #include's can mess
+	       things up. */
+	    line_table = pfile->line_table;
+	    line_table->highest_location = line_table->highest_line;
+
+	    /* The if block prevents us from outputing line information when
+	       the file ends with a directive and no newline.  Note that we
+	       must use pfile->buffer, not buffer. */
+	    if (pfile->buffer->cur != pfile->buffer->rlimit)
+	      cb->maybe_print_line (pfile->line_table->highest_line);
+
+	    goto restart;
+	  }
+
+	  flags &= ~DO_BOL;
+	  pfile->mi_valid = false;
+	}
+      else if (__builtin_expect (last_c == '/', false) \
+	       && !(flags & DO_SPECIAL) && c != '*' && c != '/')
+	{
+	  /* If a previous slash is not starting a block comment, clear the
+	     DO_BOL flag.  */
+	  flags &= ~DO_BOL;
+	  pfile->mi_valid = false;
+	}
+
+      switch (c)
+	{
+	case '/':
+	  if ((flags & DO_BLOCK_COMMENT) && last_c == '*')
+	    {
+	      flags &= ~DO_BLOCK_COMMENT;
+	      c = 0;
+	    }
+	  else if (!(flags & DO_SPECIAL) && last_c == '/')
+	    flags |= DO_LINE_COMMENT;
+	  else if (!(flags & DO_SPECIAL))
+	    /* Mark the position for possible error reporting. */
+	    LINEMAP_POSITION_FOR_COLUMN (loc, pfile->line_table, col);
+
+	  break;
+
+	case '*':
+	  if (!(flags & DO_SPECIAL))
+	    {
+	      if (last_c == '/')
+		flags |= DO_BLOCK_COMMENT;
+	      else
+		{
+		  flags &= ~DO_BOL;
+		  pfile->mi_valid = false;
+		}
+	    }
+
+	  break;
+
+	case '\'':
+	case '"':
+	  {
+	    unsigned state = (c == '"') ? DO_STRING : DO_CHAR;
+
+	    if (!(flags & DO_SPECIAL))
+	      {
+		flags |= state;
+		flags &= ~DO_BOL;
+		pfile->mi_valid = false;
+	      }
+	    else if ((flags & state) && last_c != '\\')
+	      flags &= ~state;
+
+	    break;
+	  }
+
+	case '\\':
+	  {
+	    if ((flags & (DO_STRING | DO_CHAR)) && last_c == '\\')
+	      c = 0;
+
+	    if (!(flags & DO_SPECIAL))
+	      {
+		flags &= ~DO_BOL;
+		pfile->mi_valid = false;
+	      }
+
+	    break;
+	  }
+
+	case '\n':
+	  CPP_INCREMENT_LINE (pfile, 0);
+	  lines++;
+	  col = 0;
+	  flags &= ~DO_LINE_SPECIAL;
+	  if (!(flags & DO_SPECIAL))
+	    flags |= DO_BOL;
+	  break;
+
+	case '#':
+	  next_line = cur;
+	  /* Don't update DO_BOL yet. */
+	  break;
+
+	case ' ': case '\t': case '\f': case '\v': case '\0':
+	  break;
+
+	default:
+	  if (!(flags & DO_SPECIAL))
+	    {
+	      flags &= ~DO_BOL;
+	      pfile->mi_valid = false;
+	    }
+	  break;
+	}
+    }
+
+  if (flags & DO_BLOCK_COMMENT)
+    cpp_error_with_line (pfile, CPP_DL_ERROR, loc, 0, "unterminated comment");
+
+  if (!pfile->state.skipping && cur != base)
+    cb->print_lines (lines, base, cur - base);
+
+  _cpp_pop_buffer (pfile);
+  if (pfile->buffer)
+    goto restart;
+}
diff --git a/contrib/gcclibs/libcpp/directives.c b/contrib/gcclibs/libcpp/directives.c
index 7fb142e48c7..70118428e2e 100644
--- a/contrib/gcclibs/libcpp/directives.c
+++ b/contrib/gcclibs/libcpp/directives.c
@@ -423,8 +423,13 @@ _cpp_handle_directive (cpp_reader *pfile, int indented)
 	 does not cause '#define foo bar' to get executed when
 	 compiled with -save-temps, we recognize directives in
 	 -fpreprocessed mode only if the # is in column 1.  macro.c
-	 puts a space in front of any '#' at the start of a macro.  */
+	 puts a space in front of any '#' at the start of a macro.
+	 
+	 We exclude the -fdirectives-only case because macro expansion
+	 has not been performed yet, and block comments can cause spaces
+	 to preceed the directive.  */
       if (CPP_OPTION (pfile, preprocessed)
+	  && !CPP_OPTION (pfile, directives_only)
 	  && (indented || !(dir->flags & IN_I)))
 	{
 	  skip = 0;
diff --git a/contrib/gcclibs/libcpp/errors.c b/contrib/gcclibs/libcpp/errors.c
index 97de4900001..c8efd538796 100644
--- a/contrib/gcclibs/libcpp/errors.c
+++ b/contrib/gcclibs/libcpp/errors.c
@@ -153,7 +153,20 @@ cpp_error (cpp_reader * pfile, int level, const char *msgid, ...)
 	}
       else
 	{
-	  src_loc = pfile->cur_token[-1].src_loc;
+	  /* Find actual previous token.  */
+	  cpp_token *t;
+
+	  if (pfile->cur_token != pfile->cur_run->base)
+	    t = pfile->cur_token - 1;
+	  else
+	    {
+	      if (pfile->cur_run->prev != NULL)
+	        t = pfile->cur_run->prev->limit;
+	      else
+	        t = NULL;
+	    }
+	  /* Retrieve corresponding source location, unless we failed.  */
+	  src_loc = t ? t->src_loc : 0;
 	}
 
       if (_cpp_begin_message (pfile, level, src_loc, 0))
diff --git a/contrib/gcclibs/libcpp/expr.c b/contrib/gcclibs/libcpp/expr.c
index 24fcb1b863e..ac7252f5084 100644
--- a/contrib/gcclibs/libcpp/expr.c
+++ b/contrib/gcclibs/libcpp/expr.c
@@ -87,16 +87,19 @@ interpret_float_suffix (const uchar *s, size_t len)
   while (len--)
     switch (s[len])
       {
-      case 'f': case 'F': f++; break;
-      case 'l': case 'L': l++; break;
+      case 'f': case 'F':
+	if (d > 0)
+	  return 0;
+	f++;
+	break;
+      case 'l': case 'L':
+	if (d > 0)
+	  return 0;
+	l++;
+	break;
       case 'i': case 'I':
       case 'j': case 'J': i++; break;
-      case 'd': case 'D': 
-	/* Disallow fd, ld suffixes.  */
-	if (d && (f || l))
-	  return 0;
-	d++;
-	break;
+      case 'd': case 'D': d++; break;
       default:
 	return 0;
       }
@@ -494,7 +497,7 @@ append_digit (cpp_num num, int digit, int base, size_t precision)
   if (add_low + digit < add_low)
     add_high++;
   add_low += digit;
-    
+
   if (result.low + add_low < result.low)
     add_high++;
   if (result.high + add_high < result.high)
@@ -1580,7 +1583,8 @@ num_div_op (cpp_reader *pfile, cpp_num lhs, cpp_num rhs, enum cpp_ttype op)
 	{
 	  if (negate)
 	    result = num_negate (result, precision);
-	  result.overflow = num_positive (result, precision) ^ !negate;
+	  result.overflow = (num_positive (result, precision) ^ !negate
+			     && !num_zerop (result));
 	}
 
       return result;
diff --git a/contrib/gcclibs/libcpp/files.c b/contrib/gcclibs/libcpp/files.c
index 83342180590..0e9f97782b1 100644
--- a/contrib/gcclibs/libcpp/files.c
+++ b/contrib/gcclibs/libcpp/files.c
@@ -1,6 +1,7 @@
 /* Part of CPP library.  File handling.
    Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+   Free Software Foundation, Inc.
    Written by Per Bothner, 1994.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -26,6 +27,7 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 #include "cpplib.h"
 #include "internal.h"
 #include "mkdeps.h"
+#include "obstack.h"
 #include "hashtab.h"
 #include "md5.h"
 #include <dirent.h>
@@ -322,6 +324,16 @@ find_file_in_dir (cpp_reader *pfile, _cpp_file *file, bool *invalid_pch)
 
   if (path)
     {
+      hashval_t hv = htab_hash_string (path);
+      char *copy;
+      void **pp;
+
+      if (htab_find_with_hash (pfile->nonexistent_file_hash, path, hv) != NULL)
+	{
+	  file->err_no = ENOENT;
+	  return false;
+	}
+
       file->path = path;
       if (pch_open_file (pfile, file, invalid_pch))
 	return true;
@@ -335,7 +347,16 @@ find_file_in_dir (cpp_reader *pfile, _cpp_file *file, bool *invalid_pch)
 	  return true;
 	}
 
+      /* We copy the path name onto an obstack partly so that we don't
+	 leak the memory, but mostly so that we don't fragment the
+	 heap.  */
+      copy = obstack_copy0 (&pfile->nonexistent_file_ob, path,
+			    strlen (path));
       free (path);
+      pp = htab_find_slot_with_hash (pfile->nonexistent_file_hash,
+				     copy, hv, INSERT);
+      *pp = copy;
+
       file->path = file->name;
     }
   else
@@ -396,6 +417,9 @@ _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir, bool f
   struct file_hash_entry *entry, **hash_slot;
   _cpp_file *file;
   bool invalid_pch = false;
+  bool saw_bracket_include = false;
+  bool saw_quote_include = false;
+  struct cpp_dir *found_in_cache = NULL;
 
   /* Ensure we get no confusion between cached files and directories.  */
   if (start_dir == NULL)
@@ -448,13 +472,19 @@ _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir, bool f
       /* Only check the cache for the starting location (done above)
 	 and the quote and bracket chain heads because there are no
 	 other possible starting points for searches.  */
-      if (file->dir != pfile->bracket_include
-	  && file->dir != pfile->quote_include)
+      if (file->dir == pfile->bracket_include)
+	saw_bracket_include = true;
+      else if (file->dir == pfile->quote_include)
+	saw_quote_include = true;
+      else
 	continue;
 
       entry = search_cache (*hash_slot, file->dir);
       if (entry)
-	break;
+	{
+	  found_in_cache = file->dir;
+	  break;
+	}
     }
 
   if (entry)
@@ -478,6 +508,29 @@ _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir, bool f
   entry->u.file = file;
   *hash_slot = entry;
 
+  /* If we passed the quote or bracket chain heads, cache them also.
+     This speeds up processing if there are lots of -I options.  */
+  if (saw_bracket_include
+      && pfile->bracket_include != start_dir
+      && found_in_cache != pfile->bracket_include)
+    {
+      entry = new_file_hash_entry (pfile);
+      entry->next = *hash_slot;
+      entry->start_dir = pfile->bracket_include;
+      entry->u.file = file;
+      *hash_slot = entry;
+    }
+  if (saw_quote_include
+      && pfile->quote_include != start_dir
+      && found_in_cache != pfile->quote_include)
+    {
+      entry = new_file_hash_entry (pfile);
+      entry->next = *hash_slot;
+      entry->start_dir = pfile->quote_include;
+      entry->u.file = file;
+      *hash_slot = entry;
+    }
+
   return file;
 }
 
@@ -722,7 +775,8 @@ _cpp_stack_file (cpp_reader *pfile, _cpp_file *file, bool import)
 
   /* Stack the buffer.  */
   buffer = cpp_push_buffer (pfile, file->buffer, file->st.st_size,
-			    CPP_OPTION (pfile, preprocessed));
+			    CPP_OPTION (pfile, preprocessed)
+			    && !CPP_OPTION (pfile, directives_only));
   buffer->file = file;
   buffer->sysp = sysp;
 
@@ -997,6 +1051,14 @@ file_hash_eq (const void *p, const void *q)
   return strcmp (hname, fname) == 0;
 }
 
+/* Compare entries in the nonexistent file hash table.  These are just
+   strings.  */
+static int
+nonexistent_file_hash_eq (const void *p, const void *q)
+{
+  return strcmp (p, q) == 0;
+}
+
 /* Initialize everything in this source file.  */
 void
 _cpp_init_files (cpp_reader *pfile)
@@ -1006,6 +1068,12 @@ _cpp_init_files (cpp_reader *pfile)
   pfile->dir_hash = htab_create_alloc (127, file_hash_hash, file_hash_eq,
 					NULL, xcalloc, free);
   allocate_file_hash_entries (pfile);
+  pfile->nonexistent_file_hash = htab_create_alloc (127, htab_hash_string,
+						    nonexistent_file_hash_eq,
+						    NULL, xcalloc, free);
+  _obstack_begin (&pfile->nonexistent_file_ob, 0, 0,
+		  (void *(*) (long)) xmalloc,
+		  (void (*) (void *)) free);
 }
 
 /* Finalize everything in this source file.  */
@@ -1014,6 +1082,8 @@ _cpp_cleanup_files (cpp_reader *pfile)
 {
   htab_delete (pfile->file_hash);
   htab_delete (pfile->dir_hash);
+  htab_delete (pfile->nonexistent_file_hash);
+  obstack_free (&pfile->nonexistent_file_ob, 0);
 }
 
 /* Enter a file name in the hash for the sake of cpp_included.  */
diff --git a/contrib/gcclibs/libcpp/include/cpplib.h b/contrib/gcclibs/libcpp/include/cpplib.h
index 7fd73b87d8a..5acef415c3d 100644
--- a/contrib/gcclibs/libcpp/include/cpplib.h
+++ b/contrib/gcclibs/libcpp/include/cpplib.h
@@ -440,6 +440,9 @@ struct cpp_options
 
   /* True means error callback should be used for diagnostics.  */
   bool client_diagnostic;
+
+  /* True disables tokenization outside of preprocessing directives. */
+  bool directives_only;
 };
 
 /* Callback for header lookup for HEADER, which is the name of a
@@ -644,6 +647,10 @@ extern struct deps *cpp_get_deps (cpp_reader *);
    too.  If there was an error opening the file, it returns NULL.  */
 extern const char *cpp_read_main_file (cpp_reader *, const char *);
 
+/* Set up built-ins with special behavior.  Use cpp_init_builtins()
+   instead unless your know what you are doing.  */
+extern void cpp_init_special_builtins (cpp_reader *);
+
 /* Set up built-ins like __FILE__.  */
 extern void cpp_init_builtins (cpp_reader *, int);
 
diff --git a/contrib/gcclibs/libcpp/init.c b/contrib/gcclibs/libcpp/init.c
index 8280f2fe1b4..248d84f53b7 100644
--- a/contrib/gcclibs/libcpp/init.c
+++ b/contrib/gcclibs/libcpp/init.c
@@ -348,11 +348,8 @@ mark_named_operators (cpp_reader *pfile)
     }
 }
 
-/* Read the builtins table above and enter them, and language-specific
-   macros, into the hash table.  HOSTED is true if this is a hosted
-   environment.  */
 void
-cpp_init_builtins (cpp_reader *pfile, int hosted)
+cpp_init_special_builtins (cpp_reader *pfile)
 {
   const struct builtin *b;
   size_t n = ARRAY_SIZE (builtin_array);
@@ -361,10 +358,7 @@ cpp_init_builtins (cpp_reader *pfile, int hosted)
     n -= 2;
   else if (! CPP_OPTION (pfile, stdc_0_in_system_headers)
 	   || CPP_OPTION (pfile, std))
-    {
-      n--;
-      _cpp_define_builtin (pfile, "__STDC__ 1");
-    }
+    n--;
 
   for (b = builtin_array; b < builtin_array + n; b++)
     {
@@ -373,6 +367,20 @@ cpp_init_builtins (cpp_reader *pfile, int hosted)
       hp->flags |= NODE_BUILTIN | NODE_WARN;
       hp->value.builtin = (enum builtin_type) b->value;
     }
+}
+
+/* Read the builtins table above and enter them, and language-specific
+   macros, into the hash table.  HOSTED is true if this is a hosted
+   environment.  */
+void
+cpp_init_builtins (cpp_reader *pfile, int hosted)
+{
+  cpp_init_special_builtins (pfile);
+
+  if (!CPP_OPTION (pfile, traditional)
+      && (! CPP_OPTION (pfile, stdc_0_in_system_headers)
+	  || CPP_OPTION (pfile, std)))
+    _cpp_define_builtin (pfile, "__STDC__ 1");
 
   if (CPP_OPTION (pfile, cplusplus))
     _cpp_define_builtin (pfile, "__cplusplus 1");
@@ -620,7 +628,8 @@ post_options (cpp_reader *pfile)
      preprocessed text.  Read preprocesed source in ISO mode.  */
   if (CPP_OPTION (pfile, preprocessed))
     {
-      pfile->state.prevent_expansion = 1;
+      if (!CPP_OPTION (pfile, directives_only))
+	pfile->state.prevent_expansion = 1;
       CPP_OPTION (pfile, traditional) = 0;
     }
 
diff --git a/contrib/gcclibs/libcpp/internal.h b/contrib/gcclibs/libcpp/internal.h
index addff6120f0..ebc2ca9d48f 100644
--- a/contrib/gcclibs/libcpp/internal.h
+++ b/contrib/gcclibs/libcpp/internal.h
@@ -355,6 +355,10 @@ struct cpp_reader
   struct file_hash_entry *file_hash_entries;
   unsigned int file_hash_entries_allocated, file_hash_entries_used;
 
+  /* Negative path lookup hash table.  */
+  struct htab *nonexistent_file_hash;
+  struct obstack nonexistent_file_ob;
+
   /* Nonzero means don't look for #include "foo" the source-file
      directory.  */
   bool quote_ignores_source_dir;
@@ -563,6 +567,17 @@ extern void _cpp_do_file_change (cpp_reader *, enum lc_reason, const char *,
 				 unsigned int, unsigned int);
 extern void _cpp_pop_buffer (cpp_reader *);
 
+/* In directives.c */
+struct _cpp_dir_only_callbacks
+{
+  /* Called to print a block of lines. */
+  void (*print_lines) (int, const void *, size_t);
+  void (*maybe_print_line) (source_location);
+};
+
+extern void _cpp_preprocess_dir_only (cpp_reader *,
+				      const struct _cpp_dir_only_callbacks *);
+
 /* In traditional.c.  */
 extern bool _cpp_scan_out_logical_line (cpp_reader *, cpp_macro *);
 extern bool _cpp_read_logical_line_trad (cpp_reader *);
diff --git a/contrib/gcclibs/libcpp/lex.c b/contrib/gcclibs/libcpp/lex.c
index df09bd6d3d6..ef59f900c64 100644
--- a/contrib/gcclibs/libcpp/lex.c
+++ b/contrib/gcclibs/libcpp/lex.c
@@ -111,31 +111,39 @@ _cpp_clean_line (cpp_reader *pfile)
 
   if (!buffer->from_stage3)
     {
+      const uchar *pbackslash = NULL;
+
       /* Short circuit for the common case of an un-escaped line with
 	 no trigraphs.  The primary win here is by not writing any
 	 data back to memory until we have to.  */
       for (;;)
 	{
 	  c = *++s;
-	  if (c == '\n' || c == '\r')
+	  if (__builtin_expect (c == '\n', false)
+	      || __builtin_expect (c == '\r', false))
 	    {
 	      d = (uchar *) s;
 
-	      if (s == buffer->rlimit)
+	      if (__builtin_expect (s == buffer->rlimit, false))
 		goto done;
 
 	      /* DOS line ending? */
-	      if (c == '\r' && s[1] == '\n')
-		s++;
+	      if (__builtin_expect (c == '\r', false)
+		  && s[1] == '\n')
+		{
+		  s++;
+		  if (s == buffer->rlimit)
+		    goto done;
+		}
 
-	      if (s == buffer->rlimit)
+	      if (__builtin_expect (pbackslash == NULL, true))
 		goto done;
 
-	      /* check for escaped newline */
+	      /* Check for escaped newline.  */
 	      p = d;
-	      while (p != buffer->next_line && is_nvspace (p[-1]))
+	      while (is_nvspace (p[-1]))
 		p--;
-	      if (p == buffer->next_line || p[-1] != '\\')
+	      if (p - 1 != pbackslash)
 		goto done;
 
 	      /* Have an escaped newline; process it and proceed to
@@ -145,7 +153,11 @@ _cpp_clean_line (cpp_reader *pfile)
 	      buffer->next_line = p - 1;
 	      break;
 	    }
-	  if (c == '?' && s[1] == '?' && _cpp_trigraph_map[s[2]])
+	  if (__builtin_expect (c == '\\', false))
+	    pbackslash = s;
+	  else if (__builtin_expect (c == '?', false)
+		   && __builtin_expect (s[1] == '?', false)
+		   && _cpp_trigraph_map[s[2]])
 	    {
 	      /* Have a trigraph.  We may or may not have to convert
 		 it.  Add a line note regardless, for -Wtrigraphs.  */
@@ -754,6 +766,11 @@ _cpp_lex_token (cpp_reader *pfile)
 	  pfile->cur_run = next_tokenrun (pfile->cur_run);
 	  pfile->cur_token = pfile->cur_run->base;
 	}
+      /* We assume that the current token is somewhere in the current
+	 run.  */
+      if (pfile->cur_token < pfile->cur_run->base
+	  || pfile->cur_token >= pfile->cur_run->limit)
+	abort ();
 
       if (pfile->lookaheads)
 	{
@@ -835,11 +852,8 @@ _cpp_get_fresh_line (cpp_reader *pfile)
 	  && buffer->next_line > buffer->rlimit
 	  && !buffer->from_stage3)
 	{
-	  /* Only warn once.  */
+	  /* Clip to buffer size.  */
 	  buffer->next_line = buffer->rlimit;
-	  cpp_error_with_line (pfile, CPP_DL_PEDWARN, pfile->line_table->highest_line,
-			       CPP_BUF_COLUMN (buffer, buffer->cur),
-			       "no newline at end of file");
 	}
 
       return_at_eof = buffer->return_at_eof;
diff --git a/contrib/gcclibs/libcpp/macro.c b/contrib/gcclibs/libcpp/macro.c
index 1eec5788f35..e9d4681a398 100644
--- a/contrib/gcclibs/libcpp/macro.c
+++ b/contrib/gcclibs/libcpp/macro.c
@@ -1,6 +1,7 @@
 /* Part of CPP library.  (Macro and #define handling.)
    Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   1999, 2000, 2001, 2002, 2003, 2004, 2005,
+   2006 Free Software Foundation, Inc.
    Written by Per Bothner, 1994.
    Based on CCCP program by Paul Rubin, June 1986
    Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -264,6 +265,9 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node)
       break;
 
     case BT_COUNTER:
+      if (CPP_OPTION (pfile, directives_only) && pfile->state.in_directive)
+	cpp_error (pfile, CPP_DL_ERROR,
+	    "__COUNTER__ expanded inside directive with -fdirectives-only");
       number = pfile->nextcounter++;
       break;
     }
@@ -435,19 +439,18 @@ static bool
 paste_tokens (cpp_reader *pfile, const cpp_token **plhs, const cpp_token *rhs)
 {
   unsigned char *buf, *end, *lhsend;
-  const cpp_token *lhs;
+  cpp_token *lhs;
   unsigned int len;
 
-  lhs = *plhs;
-  len = cpp_token_len (lhs) + cpp_token_len (rhs) + 1;
+  len = cpp_token_len (*plhs) + cpp_token_len (rhs) + 1;
   buf = (unsigned char *) alloca (len);
-  end = lhsend = cpp_spell_token (pfile, lhs, buf, false);
+  end = lhsend = cpp_spell_token (pfile, *plhs, buf, false);
 
   /* Avoid comment headers, since they are still processed in stage 3.
      It is simpler to insert a space here, rather than modifying the
      lexer to ignore comments in some circumstances.  Simply returning
      false doesn't work, since we want to clear the PASTE_LEFT flag.  */
-  if (lhs->type == CPP_DIV && rhs->type != CPP_EQ)
+  if ((*plhs)->type == CPP_DIV && rhs->type != CPP_EQ)
     *end++ = ' ';
   end = cpp_spell_token (pfile, rhs, end, false);
   *end = '\n';
@@ -457,13 +460,22 @@ paste_tokens (cpp_reader *pfile, const cpp_token **plhs, const cpp_token *rhs)
 
   /* Set pfile->cur_token as required by _cpp_lex_direct.  */
   pfile->cur_token = _cpp_temp_token (pfile);
-  *plhs = _cpp_lex_direct (pfile);
+  lhs = _cpp_lex_direct (pfile);
   if (pfile->buffer->cur != pfile->buffer->rlimit)
     {
+      source_location saved_loc = lhs->src_loc;
+
       _cpp_pop_buffer (pfile);
       _cpp_backup_tokens (pfile, 1);
       *lhsend = '\0';
 
+      /* We have to remove the PASTE_LEFT flag from the old lhs, but
+	 we want to keep the new location.  */
+      *lhs = **plhs;
+      *plhs = lhs;
+      lhs->src_loc = saved_loc;
+      lhs->flags &= ~PASTE_LEFT;
+
       /* Mandatory error for all apart from assembler.  */
       if (CPP_OPTION (pfile, lang) != CLK_ASM)
 	cpp_error (pfile, CPP_DL_ERROR,
@@ -472,6 +484,7 @@ paste_tokens (cpp_reader *pfile, const cpp_token **plhs, const cpp_token *rhs)
       return false;
     }
 
+  *plhs = lhs;
   _cpp_pop_buffer (pfile);
   return true;
 }
@@ -1402,10 +1415,12 @@ alloc_expansion_token (cpp_reader *pfile, cpp_macro *macro)
 static cpp_token *
 lex_expansion_token (cpp_reader *pfile, cpp_macro *macro)
 {
-  cpp_token *token;
+  cpp_token *token, *saved_cur_token;
 
+  saved_cur_token = pfile->cur_token;
   pfile->cur_token = alloc_expansion_token (pfile, macro);
   token = _cpp_lex_direct (pfile);
+  pfile->cur_token = saved_cur_token;
 
   /* Is this a parameter?  */
   if (token->type == CPP_NAME
@@ -1594,18 +1609,12 @@ _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node)
     ok = _cpp_create_trad_definition (pfile, macro);
   else
     {
-      cpp_token *saved_cur_token = pfile->cur_token;
-
       ok = create_iso_definition (pfile, macro);
 
-      /* Restore lexer position because of games lex_expansion_token()
-	 plays lexing the macro.  We set the type for SEEN_EOL() in
-	 directives.c.
+      /* We set the type for SEEN_EOL() in directives.c.
 
 	 Longer term we should lex the whole line before coming here,
 	 and just copy the expansion.  */
-      saved_cur_token[-1].type = pfile->cur_token[-1].type;
-      pfile->cur_token = saved_cur_token;
 
       /* Stop the lexer accepting __VA_ARGS__.  */
       pfile->state.va_args_ok = 0;
diff --git a/contrib/gcclibs/libcpp/pch.c b/contrib/gcclibs/libcpp/pch.c
index cc23b4ee908..624befd09d8 100644
--- a/contrib/gcclibs/libcpp/pch.c
+++ b/contrib/gcclibs/libcpp/pch.c
@@ -35,14 +35,14 @@ static int write_defs (cpp_reader *, cpp_hashnode *, void *);
 static int save_macros (cpp_reader *, cpp_hashnode *, void *);
 
 /* This structure represents a macro definition on disk.  */
-struct macrodef_struct 
+struct macrodef_struct
 {
   unsigned int definition_length;
   unsigned short name_length;
   unsigned short flags;
 };
 
-/* This is how we write out a macro definition.  
+/* This is how we write out a macro definition.
    Suitable for being called by cpp_forall_identifiers.  */
 
 static int
@@ -54,7 +54,7 @@ write_macdef (cpp_reader *pfile, cpp_hashnode *hn, void *file_p)
     case NT_VOID:
       if (! (hn->flags & NODE_POISONED))
 	return 1;
-      
+
     case NT_MACRO:
       if ((hn->flags & NODE_BUILTIN))
 	return 1;
@@ -76,7 +76,7 @@ write_macdef (cpp_reader *pfile, cpp_hashnode *hn, void *file_p)
 	    defn = NODE_NAME (hn);
 	    s.definition_length = s.name_length;
 	  }
-	
+
 	if (fwrite (&s, sizeof (s), 1, f) != 1
 	    || fwrite (defn, 1, s.definition_length, f) != s.definition_length)
 	  {
@@ -86,7 +86,7 @@ write_macdef (cpp_reader *pfile, cpp_hashnode *hn, void *file_p)
 	  }
       }
       return 1;
-      
+
     case NT_ASSERTION:
       /* Not currently implemented.  */
       return 1;
@@ -123,7 +123,7 @@ static int
 save_idents (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
 {
   struct cpp_savedstate *const ss = (struct cpp_savedstate *)ss_p;
-  
+
   if (hn->type != NT_VOID)
     {
       struct cpp_string news;
@@ -136,7 +136,7 @@ save_idents (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
 	{
 	  struct cpp_string *sp;
 	  unsigned char *text;
-	  
+
 	  sp = XNEW (struct cpp_string);
 	  *slot = sp;
 
@@ -157,7 +157,7 @@ hashmem (const void *p_p, size_t sz)
   const unsigned char *p = (const unsigned char *)p_p;
   size_t i;
   hashval_t h;
-  
+
   h = 0;
   for (i = 0; i < sz; i++)
     h = h * 67 - (*p++ - 113);
@@ -194,10 +194,10 @@ cpp_save_state (cpp_reader *r, FILE *f)
 {
   /* Save the list of non-void identifiers for the dependency checking.  */
   r->savedstate = XNEW (struct cpp_savedstate);
-  r->savedstate->definedhash = htab_create (100, cpp_string_hash, 
+  r->savedstate->definedhash = htab_create (100, cpp_string_hash,
 					    cpp_string_eq, NULL);
   cpp_forall_identifiers (r, save_idents, r->savedstate);
-  
+
   /* Write out the list of defined identifiers.  */
   cpp_forall_identifiers (r, write_macdef, f);
 
@@ -210,20 +210,20 @@ static int
 count_defs (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
 {
   struct cpp_savedstate *const ss = (struct cpp_savedstate *)ss_p;
-  
+
   switch (hn->type)
     {
     case NT_MACRO:
       if (hn->flags & NODE_BUILTIN)
 	return 1;
-      
+
       /* else fall through.  */
 
     case NT_VOID:
       {
 	struct cpp_string news;
 	void **slot;
-	
+
 	news.len = NODE_LEN (hn);
 	news.text = NODE_NAME (hn);
 	slot = (void **) htab_find (ss->definedhash, &news);
@@ -249,20 +249,20 @@ static int
 write_defs (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn, void *ss_p)
 {
   struct cpp_savedstate *const ss = (struct cpp_savedstate *)ss_p;
-  
+
   switch (hn->type)
     {
     case NT_MACRO:
       if (hn->flags & NODE_BUILTIN)
 	return 1;
-      
+
       /* else fall through.  */
 
     case NT_VOID:
       {
 	struct cpp_string news;
 	void **slot;
-	
+
 	news.len = NODE_LEN (hn);
 	news.text = NODE_NAME (hn);
 	slot = (void **) htab_find (ss->definedhash, &news);
@@ -303,7 +303,7 @@ cpp_write_pch_deps (cpp_reader *r, FILE *f)
   struct cpp_savedstate *const ss = r->savedstate;
   unsigned char *definedstrs;
   size_t i;
-  
+
   /* Collect the list of identifiers which have been seen and
      weren't defined to anything previously.  */
   ss->hashsize = 0;
@@ -404,7 +404,7 @@ collect_ht_nodes (cpp_reader *pfile ATTRIBUTE_UNUSED, cpp_hashnode *hn,
    with the preprocessor's current definitions.  It will be consistent
    when:
 
-   - anything that was defined just before the PCH was generated 
+   - anything that was defined just before the PCH was generated
      is defined the same way now; and
    - anything that was not defined then, but is defined now, was not
      used by the PCH.
@@ -430,10 +430,10 @@ cpp_valid_state (cpp_reader *r, const char *name, int fd)
     {
       cpp_hashnode *h;
       const unsigned char *newdefn;
-      
+
       if (read (fd, &m, sizeof (m)) != sizeof (m))
 	goto error;
-      
+
       if (m.name_length == 0)
 	break;
 
@@ -453,10 +453,10 @@ cpp_valid_state (cpp_reader *r, const char *name, int fd)
 	  namebuf = XNEWVEC (unsigned char, namebufsz);
 	}
 
-      if ((size_t)read (fd, namebuf, m.definition_length) 
+      if ((size_t)read (fd, namebuf, m.definition_length)
 	  != m.definition_length)
 	goto error;
-      
+
       h = cpp_lookup (r, namebuf, m.name_length);
       if (m.flags & NODE_POISONED
 	  || h->type != NT_MACRO
@@ -470,7 +470,7 @@ cpp_valid_state (cpp_reader *r, const char *name, int fd)
 	}
 
       newdefn = cpp_macro_definition (r, h);
-      
+
       if (m.definition_length != ustrlen (newdefn)
 	  || memcmp (namebuf, newdefn, m.definition_length) != 0)
 	{
@@ -498,17 +498,17 @@ cpp_valid_state (cpp_reader *r, const char *name, int fd)
   nl.defs = XNEWVEC (cpp_hashnode *, nl.asize);
   cpp_forall_identifiers (r, &collect_ht_nodes, &nl);
   qsort (nl.defs, nl.n_defs, sizeof (cpp_hashnode *), &comp_hashnodes);
- 
+
   /* Loop through nl.defs and undeftab, both of which are sorted lists.
      There should be no matches.  */
   first = undeftab;
   last = undeftab + m.definition_length;
   i = 0;
- 
+
   while (first < last && i < nl.n_defs)
     {
       int cmp = ustrcmp (first, NODE_NAME (nl.defs[i]));
- 
+
       if (cmp < 0)
  	first += ustrlen (first) + 1;
       else if (cmp > 0)
@@ -516,13 +516,13 @@ cpp_valid_state (cpp_reader *r, const char *name, int fd)
       else
 	{
 	  if (CPP_OPTION (r, warn_invalid_pch))
-	    cpp_error (r, CPP_DL_WARNING_SYSHDR, 
+	    cpp_error (r, CPP_DL_WARNING_SYSHDR,
 		       "%s: not used because `%s' is defined",
 		       name, first);
 	  goto fail;
 	}
     }
-   
+
   free(nl.defs);
   free (undeftab);
 
@@ -545,7 +545,7 @@ cpp_valid_state (cpp_reader *r, const char *name, int fd)
 
 /* Save all the existing macros.  */
 
-struct save_macro_data 
+struct save_macro_data
 {
   uchar **defns;
   size_t count;
@@ -567,7 +567,7 @@ struct save_macro_data
    file were not saved in this way, but this is not done (yet), except
    for builtins, and for #assert by default.  */
 
-static int 
+static int
 save_macros (cpp_reader *r, cpp_hashnode *h, void *data_p)
 {
   struct save_macro_data *data = (struct save_macro_data *)data_p;
@@ -577,9 +577,9 @@ save_macros (cpp_reader *r, cpp_hashnode *h, void *data_p)
       if (data->count == data->array_size)
 	{
 	  data->array_size *= 2;
-	  data->defns = XRESIZEVEC (uchar *, data->defns, (data->array_size)); 
+	  data->defns = XRESIZEVEC (uchar *, data->defns, (data->array_size));
 	}
-      
+
       switch (h->type)
 	{
 	case NT_ASSERTION:
@@ -596,7 +596,7 @@ save_macros (cpp_reader *r, cpp_hashnode *h, void *data_p)
 	    data->defns[data->count][defnlen] = '\n';
 	  }
 	  break;
-	  
+
 	default:
 	  abort ();
 	}
@@ -612,7 +612,7 @@ void
 cpp_prepare_state (cpp_reader *r, struct save_macro_data **data)
 {
   struct save_macro_data *d = XNEW (struct save_macro_data);
-  
+
   d->array_size = 512;
   d->defns = XNEWVEC (uchar *, d->array_size);
   d->count = 0;
@@ -622,7 +622,7 @@ cpp_prepare_state (cpp_reader *r, struct save_macro_data **data)
 }
 
 /* Given a precompiled header that was previously determined to be valid,
-   apply all its definitions (and undefinitions) to the current state. 
+   apply all its definitions (and undefinitions) to the current state.
    DEPNAME is passed to deps_restore.  */
 
 int
@@ -632,7 +632,7 @@ cpp_read_state (cpp_reader *r, const char *name, FILE *f,
   size_t i;
   struct lexer_state old_state;
 
-  /* Restore spec_nodes, which will be full of references to the old 
+  /* Restore spec_nodes, which will be full of references to the old
      hashtable entries and so will now be invalid.  */
   {
     struct spec_nodes *s = &r->spec_nodes;
@@ -691,7 +691,7 @@ cpp_read_state (cpp_reader *r, const char *name, FILE *f,
     goto error;
 
   return 0;
-  
+
  error:
   cpp_errno (r, CPP_DL_ERROR, "while reading precompiled header");
   return -1;
diff --git a/contrib/gcclibs/libiberty/ChangeLog.gcc43 b/contrib/gcclibs/libiberty/ChangeLog.gcc43
new file mode 100644
index 00000000000..1bf5e378000
--- /dev/null
+++ b/contrib/gcclibs/libiberty/ChangeLog.gcc43
@@ -0,0 +1,60 @@
+2007-05-05  Geoffrey Keating  <geoffk@apple.com> (r124467)
+
+	PR 31775
+	* mangle.c (write_mangled_name): Mangle static variable names.
+	(write_unqualified_name): Use local-source-name for
+	namespace-scope static variables.
+
+2007-03-15  Geoffrey Keating  <geoffk@apple.com> (r122972)
+
+	* cp-demangle.c (d_encoding): Exit early on error.
+	(d_pointer_to_member_type): Exit early if cplus_demangle_type
+	returns NULL.
+	(cplus_demangle_type): Likewise.
+	* testsuite/demangle-expected: New testcase.
+
+2007-01-31  Ben Elliston  <bje@au.ibm.com> (r121364)
+
+	* strsignal.c (psignal): Change type of signo to int.
+	* functions.texi: Regenerate.
+
+2007-01-12  Ben Elliston  <bje@au.ibm.com> (r120702)
+
+	* pex-unix.c (writeerr): Cast write result to void.
+
+	* choose-temp.c (choose_temp_base): Check the result of the call
+	to mktemp rather than testing the length of the modified string.
+
+2006-12-20  Geoffrey Keating  <geoffk@apple.com> (r120097)
+
+	* cp-demangle.h: Add comment explaining what to do to avoid
+	overrunning string.
+	(d_check_char): New.
+	(d_next_char): Don't advance past trailing '\0'.
+	* cp-demangle.c (cplus_demangle_mangled_name): Use d_check_char.
+	(d_nested_name): Likewise.
+	(d_special_name): Likewise.
+	(d_call_offset): Likewise.
+	(d_function_type): Likewise.
+	(d_array_type): Likewise.
+	(d_pointer_to_member_type): Likewise.
+	(d_template_param): Likewise.
+	(d_template_args): Likewise.
+	(d_template_arg): Likewise.
+	(d_expr_primary): Likewise.
+	(d_local_name): Likewise.
+	(d_substitution): Likewise.
+	(d_ctor_dtor_name): Use d_advance rather than d_next_char.
+	* testsuite/test-demangle.c: Include sys/mman.h.
+	(MAP_ANONYMOUS): Define.
+	(protect_end): New.
+	(main): Use protect_end.
+	* testsuite/demangle-expected: Add testcases for overrunning
+	the end of the string.
+
+2006-11-07  Julian Brown  <julian@codesourcery.com> (r118552)
+
+	* floatformat.c (get_field): Fix segfault with little-endian word
+	order on 64-bit hosts.
+	(put_field): Likewise.
+	(min): Move definition.
diff --git a/contrib/gcclibs/libiberty/choose-temp.c b/contrib/gcclibs/libiberty/choose-temp.c
index 0cba9905d5b..4a26a827a2c 100644
--- a/contrib/gcclibs/libiberty/choose-temp.c
+++ b/contrib/gcclibs/libiberty/choose-temp.c
@@ -65,8 +65,7 @@ choose_temp_base (void)
   strcpy (temp_filename, base);
   strcpy (temp_filename + len, TEMP_FILE);
 
-  mktemp (temp_filename);
-  if (strlen (temp_filename) == 0)
+  if (mktemp (temp_filename) == 0)
     abort ();
   return temp_filename;
 }
diff --git a/contrib/gcclibs/libiberty/cp-demangle.c b/contrib/gcclibs/libiberty/cp-demangle.c
index 2fa59785f2f..6b4781e264e 100644
--- a/contrib/gcclibs/libiberty/cp-demangle.c
+++ b/contrib/gcclibs/libiberty/cp-demangle.c
@@ -913,9 +913,9 @@ CP_STATIC_IF_GLIBCPP_V3
 struct demangle_component *
 cplus_demangle_mangled_name (struct d_info *di, int top_level)
 {
-  if (d_next_char (di) != '_')
+  if (! d_check_char (di, '_'))
     return NULL;
-  if (d_next_char (di) != 'Z')
+  if (! d_check_char (di, 'Z'))
     return NULL;
   return d_encoding (di, top_level);
 }
@@ -1021,7 +1021,7 @@ d_encoding (struct d_info *di, int top_level)
 	}
 
       peek = d_peek_char (di);
-      if (peek == '\0' || peek == 'E')
+      if (dc == NULL || peek == '\0' || peek == 'E')
 	return dc;
       return d_make_comp (di, DEMANGLE_COMPONENT_TYPED_NAME, dc,
 			  d_bare_function_type (di, has_return_type (dc)));
@@ -1054,6 +1054,9 @@ d_name (struct d_info *di)
     case 'Z':
       return d_local_name (di);
 
+    case 'L':
+      return d_unqualified_name (di);
+	
     case 'S':
       {
 	int subst;
@@ -1123,7 +1126,7 @@ d_nested_name (struct d_info *di)
   struct demangle_component *ret;
   struct demangle_component **pret;
 
-  if (d_next_char (di) != 'N')
+  if (! d_check_char (di, 'N'))
     return NULL;
 
   pret = d_cv_qualifiers (di, &ret, 1);
@@ -1134,7 +1137,7 @@ d_nested_name (struct d_info *di)
   if (*pret == NULL)
     return NULL;
 
-  if (d_next_char (di) != 'E')
+  if (! d_check_char (di, 'E'))
     return NULL;
 
   return ret;
@@ -1174,7 +1177,8 @@ d_prefix (struct d_info *di)
       if (IS_DIGIT (peek)
 	  || IS_LOWER (peek)
 	  || peek == 'C'
-	  || peek == 'D')
+	  || peek == 'D'
+	  || peek == 'L')
 	dc = d_unqualified_name (di);
       else if (peek == 'S')
 	dc = d_substitution (di, 1);
@@ -1208,6 +1212,9 @@ d_prefix (struct d_info *di)
 /* <unqualified-name> ::= <operator-name>
                       ::= <ctor-dtor-name>
                       ::= <source-name>
+		      ::= <local-source-name> 
+
+    <local-source-name>	::= L <source-name> <discriminator>
 */
 
 static struct demangle_component *
@@ -1229,6 +1236,19 @@ d_unqualified_name (struct d_info *di)
     }
   else if (peek == 'C' || peek == 'D')
     return d_ctor_dtor_name (di);
+  else if (peek == 'L')
+    {
+      struct demangle_component * ret;
+
+      d_advance (di, 1);
+
+      ret = d_source_name (di);
+      if (ret == NULL)
+	return NULL;
+      if (! d_discriminator (di))
+	return NULL;
+      return ret;
+    }
   else
     return NULL;
 }
@@ -1449,11 +1469,8 @@ d_operator_name (struct d_info *di)
 static struct demangle_component *
 d_special_name (struct d_info *di)
 {
-  char c;
-
   di->expansion += 20;
-  c = d_next_char (di);
-  if (c == 'T')
+  if (d_check_char (di, 'T'))
     {
       switch (d_next_char (di))
 	{
@@ -1502,7 +1519,7 @@ d_special_name (struct d_info *di)
 	    offset = d_number (di);
 	    if (offset < 0)
 	      return NULL;
-	    if (d_next_char (di) != '_')
+	    if (! d_check_char (di, '_'))
 	      return NULL;
 	    base_type = cplus_demangle_type (di);
 	    /* We don't display the offset.  FIXME: We should display
@@ -1523,7 +1540,7 @@ d_special_name (struct d_info *di)
 	  return NULL;
 	}
     }
-  else if (c == 'G')
+  else if (d_check_char (di, 'G'))
     {
       switch (d_next_char (di))
 	{
@@ -1570,14 +1587,14 @@ d_call_offset (struct d_info *di, int c)
   else if (c == 'v')
     {
       d_number (di);
-      if (d_next_char (di) != '_')
+      if (! d_check_char (di, '_'))
 	return 0;
       d_number (di);
     }
   else
     return 0;
 
-  if (d_next_char (di) != '_')
+  if (! d_check_char (di, '_'))
     return 0;
 
   return 1;
@@ -1601,13 +1618,13 @@ d_ctor_dtor_name (struct d_info *di)
       else if (di->last_name->type == DEMANGLE_COMPONENT_SUB_STD)
 	di->expansion += di->last_name->u.s_string.len;
     }
-  switch (d_next_char (di))
+  switch (d_peek_char (di))
     {
     case 'C':
       {
 	enum gnu_v3_ctor_kinds kind;
 
-	switch (d_next_char (di))
+	switch (d_peek_next_char (di))
 	  {
 	  case '1':
 	    kind = gnu_v3_complete_object_ctor;
@@ -1621,6 +1638,7 @@ d_ctor_dtor_name (struct d_info *di)
 	  default:
 	    return NULL;
 	  }
+	d_advance (di, 2);
 	return d_make_ctor (di, kind, di->last_name);
       }
 
@@ -1628,7 +1646,7 @@ d_ctor_dtor_name (struct d_info *di)
       {
 	enum gnu_v3_dtor_kinds kind;
 
-	switch (d_next_char (di))
+	switch (d_peek_next_char (di))
 	  {
 	  case '0':
 	    kind = gnu_v3_deleting_dtor;
@@ -1642,6 +1660,7 @@ d_ctor_dtor_name (struct d_info *di)
 	  default:
 	    return NULL;
 	  }
+	d_advance (di, 2);
 	return d_make_dtor (di, kind, di->last_name);
       }
 
@@ -1735,7 +1754,7 @@ cplus_demangle_type (struct d_info *di)
       if (pret == NULL)
 	return NULL;
       *pret = cplus_demangle_type (di);
-      if (! d_add_substitution (di, ret))
+      if (! *pret || ! d_add_substitution (di, ret))
 	return NULL;
       return ret;
     }
@@ -1925,7 +1944,7 @@ d_function_type (struct d_info *di)
 {
   struct demangle_component *ret;
 
-  if (d_next_char (di) != 'F')
+  if (! d_check_char (di, 'F'))
     return NULL;
   if (d_peek_char (di) == 'Y')
     {
@@ -1934,7 +1953,7 @@ d_function_type (struct d_info *di)
       d_advance (di, 1);
     }
   ret = d_bare_function_type (di, 1);
-  if (d_next_char (di) != 'E')
+  if (! d_check_char (di, 'E'))
     return NULL;
   return ret;
 }
@@ -2021,7 +2040,7 @@ d_array_type (struct d_info *di)
   char peek;
   struct demangle_component *dim;
 
-  if (d_next_char (di) != 'A')
+  if (! d_check_char (di, 'A'))
     return NULL;
 
   peek = d_peek_char (di);
@@ -2049,7 +2068,7 @@ d_array_type (struct d_info *di)
 	return NULL;
     }
 
-  if (d_next_char (di) != '_')
+  if (! d_check_char (di, '_'))
     return NULL;
 
   return d_make_comp (di, DEMANGLE_COMPONENT_ARRAY_TYPE, dim,
@@ -2065,7 +2084,7 @@ d_pointer_to_member_type (struct d_info *di)
   struct demangle_component *mem;
   struct demangle_component **pmem;
 
-  if (d_next_char (di) != 'M')
+  if (! d_check_char (di, 'M'))
     return NULL;
 
   cl = cplus_demangle_type (di);
@@ -2090,6 +2109,8 @@ d_pointer_to_member_type (struct d_info *di)
   if (pmem == NULL)
     return NULL;
   *pmem = cplus_demangle_type (di);
+  if (*pmem == NULL)
+    return NULL;
 
   if (pmem != &mem && (*pmem)->type != DEMANGLE_COMPONENT_FUNCTION_TYPE)
     {
@@ -2109,7 +2130,7 @@ d_template_param (struct d_info *di)
 {
   long param;
 
-  if (d_next_char (di) != 'T')
+  if (! d_check_char (di, 'T'))
     return NULL;
 
   if (d_peek_char (di) == '_')
@@ -2122,7 +2143,7 @@ d_template_param (struct d_info *di)
       param += 1;
     }
 
-  if (d_next_char (di) != '_')
+  if (! d_check_char (di, '_'))
     return NULL;
 
   ++di->did_subs;
@@ -2144,7 +2165,7 @@ d_template_args (struct d_info *di)
      constructor or destructor.  */
   hold_last_name = di->last_name;
 
-  if (d_next_char (di) != 'I')
+  if (! d_check_char (di, 'I'))
     return NULL;
 
   al = NULL;
@@ -2189,7 +2210,7 @@ d_template_arg (struct d_info *di)
     case 'X':
       d_advance (di, 1);
       ret = d_expression (di);
-      if (d_next_char (di) != 'E')
+      if (! d_check_char (di, 'E'))
 	return NULL;
       return ret;
 
@@ -2316,7 +2337,7 @@ d_expr_primary (struct d_info *di)
 {
   struct demangle_component *ret;
 
-  if (d_next_char (di) != 'L')
+  if (! d_check_char (di, 'L'))
     return NULL;
   if (d_peek_char (di) == '_')
     ret = cplus_demangle_mangled_name (di, 0);
@@ -2362,7 +2383,7 @@ d_expr_primary (struct d_info *di)
 	}
       ret = d_make_comp (di, t, type, d_make_name (di, s, d_str (di) - s));
     }
-  if (d_next_char (di) != 'E')
+  if (! d_check_char (di, 'E'))
     return NULL;
   return ret;
 }
@@ -2376,12 +2397,12 @@ d_local_name (struct d_info *di)
 {
   struct demangle_component *function;
 
-  if (d_next_char (di) != 'Z')
+  if (! d_check_char (di, 'Z'))
     return NULL;
 
   function = d_encoding (di, 0);
 
-  if (d_next_char (di) != 'E')
+  if (! d_check_char (di, 'E'))
     return NULL;
 
   if (d_peek_char (di) == 's')
@@ -2486,7 +2507,7 @@ d_substitution (struct d_info *di, int prefix)
 {
   char c;
 
-  if (d_next_char (di) != 'S')
+  if (! d_check_char (di, 'S'))
     return NULL;
 
   c = d_next_char (di);
diff --git a/contrib/gcclibs/libiberty/cp-demangle.h b/contrib/gcclibs/libiberty/cp-demangle.h
index 2517a57e69b..920ca47796c 100644
--- a/contrib/gcclibs/libiberty/cp-demangle.h
+++ b/contrib/gcclibs/libiberty/cp-demangle.h
@@ -123,10 +123,16 @@ struct d_info
   int expansion;
 };
 
+/* To avoid running past the ending '\0', don't:
+   - call d_peek_next_char if d_peek_char returned '\0'
+   - call d_advance with an 'i' that is too large
+   - call d_check_char(di, '\0')
+   Everything else is safe.  */
 #define d_peek_char(di) (*((di)->n))
 #define d_peek_next_char(di) ((di)->n[1])
 #define d_advance(di, i) ((di)->n += (i))
-#define d_next_char(di) (*((di)->n++))
+#define d_check_char(di, c) (d_peek_char(di) == c ? ((di)->n++, 1) : 0)
+#define d_next_char(di) (d_peek_char(di) == '\0' ? '\0' : *((di)->n++))
 #define d_str(di) ((di)->n)
 
 /* Functions and arrays in cp-demangle.c which are referenced by
diff --git a/contrib/gcclibs/libiberty/floatformat.c b/contrib/gcclibs/libiberty/floatformat.c
index 0bbb8ed9889..c5abbb1f9ed 100644
--- a/contrib/gcclibs/libiberty/floatformat.c
+++ b/contrib/gcclibs/libiberty/floatformat.c
@@ -249,53 +249,51 @@ const struct floatformat floatformat_ia64_quad_little =
   floatformat_always_valid
 };
 
+
+#ifndef min
+#define min(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
 /* Extract a field which starts at START and is LEN bits long.  DATA and
    TOTAL_LEN are the thing we are extracting it from, in byteorder ORDER.  */
 static unsigned long
 get_field (const unsigned char *data, enum floatformat_byteorders order,
            unsigned int total_len, unsigned int start, unsigned int len)
 {
-  unsigned long result;
+  unsigned long result = 0;
   unsigned int cur_byte;
-  int cur_bitshift;
+  int lo_bit, hi_bit, cur_bitshift = 0;
+  int nextbyte = (order == floatformat_little) ? 1 : -1;
+
+  /* Start is in big-endian bit order!  Fix that first.  */
+  start = total_len - (start + len);
 
   /* Start at the least significant part of the field.  */
-  cur_byte = (start + len) / FLOATFORMAT_CHAR_BIT;
   if (order == floatformat_little)
-    cur_byte = (total_len / FLOATFORMAT_CHAR_BIT) - cur_byte - 1;
-  cur_bitshift =
-    ((start + len) % FLOATFORMAT_CHAR_BIT) - FLOATFORMAT_CHAR_BIT;
-  result = *(data + cur_byte) >> (-cur_bitshift);
-  cur_bitshift += FLOATFORMAT_CHAR_BIT;
-  if (order == floatformat_little)
-    ++cur_byte;
+    cur_byte = start / FLOATFORMAT_CHAR_BIT;
   else
-    --cur_byte;
+    cur_byte = (total_len - start - 1) / FLOATFORMAT_CHAR_BIT;
 
-  /* Move towards the most significant part of the field.  */
-  while ((unsigned int) cur_bitshift < len)
+  lo_bit = start % FLOATFORMAT_CHAR_BIT;
+  hi_bit = min (lo_bit + len, FLOATFORMAT_CHAR_BIT);
+  
+  do
     {
-      if (len - cur_bitshift < FLOATFORMAT_CHAR_BIT)
-	/* This is the last byte; zero out the bits which are not part of
-	   this field.  */
-	result |=
-	  (*(data + cur_byte) & ((1 << (len - cur_bitshift)) - 1))
-	    << cur_bitshift;
-      else
-	result |= *(data + cur_byte) << cur_bitshift;
-      cur_bitshift += FLOATFORMAT_CHAR_BIT;
-      if (order == floatformat_little)
-	++cur_byte;
-      else
-	--cur_byte;
+      unsigned int shifted = *(data + cur_byte) >> lo_bit;
+      unsigned int bits = hi_bit - lo_bit;
+      unsigned int mask = (1 << bits) - 1;
+      result |= (shifted & mask) << cur_bitshift;
+      len -= bits;
+      cur_bitshift += bits;
+      cur_byte += nextbyte;
+      lo_bit = 0;
+      hi_bit = min (len, FLOATFORMAT_CHAR_BIT);
     }
+  while (len != 0);
+
   return result;
 }
   
-#ifndef min
-#define min(a, b) ((a) < (b) ? (a) : (b))
-#endif
-
 /* Convert from FMT to a double.
    FROM is the address of the extended float.
    Store the double in *TO.  */
@@ -428,43 +426,34 @@ put_field (unsigned char *data, enum floatformat_byteorders order,
            unsigned long stuff_to_put)
 {
   unsigned int cur_byte;
-  int cur_bitshift;
+  int lo_bit, hi_bit;
+  int nextbyte = (order == floatformat_little) ? 1 : -1;
+
+  /* Start is in big-endian bit order!  Fix that first.  */
+  start = total_len - (start + len);
 
   /* Start at the least significant part of the field.  */
-  cur_byte = (start + len) / FLOATFORMAT_CHAR_BIT;
   if (order == floatformat_little)
-    cur_byte = (total_len / FLOATFORMAT_CHAR_BIT) - cur_byte - 1;
-  cur_bitshift =
-    ((start + len) % FLOATFORMAT_CHAR_BIT) - FLOATFORMAT_CHAR_BIT;
-  *(data + cur_byte) &=
-    ~(((1 << ((start + len) % FLOATFORMAT_CHAR_BIT)) - 1) << (-cur_bitshift));
-  *(data + cur_byte) |=
-    (stuff_to_put & ((1 << FLOATFORMAT_CHAR_BIT) - 1)) << (-cur_bitshift);
-  cur_bitshift += FLOATFORMAT_CHAR_BIT;
-  if (order == floatformat_little)
-    ++cur_byte;
+    cur_byte = start / FLOATFORMAT_CHAR_BIT;
   else
-    --cur_byte;
+    cur_byte = (total_len - start - 1) / FLOATFORMAT_CHAR_BIT;
 
-  /* Move towards the most significant part of the field.  */
-  while ((unsigned int) cur_bitshift < len)
+  lo_bit = start % FLOATFORMAT_CHAR_BIT;
+  hi_bit = min (lo_bit + len, FLOATFORMAT_CHAR_BIT);
+  
+  do
     {
-      if (len - cur_bitshift < FLOATFORMAT_CHAR_BIT)
-	{
-	  /* This is the last byte.  */
-	  *(data + cur_byte) &=
-	    ~((1 << (len - cur_bitshift)) - 1);
-	  *(data + cur_byte) |= (stuff_to_put >> cur_bitshift);
-	}
-      else
-	*(data + cur_byte) = ((stuff_to_put >> cur_bitshift)
-			      & ((1 << FLOATFORMAT_CHAR_BIT) - 1));
-      cur_bitshift += FLOATFORMAT_CHAR_BIT;
-      if (order == floatformat_little)
-	++cur_byte;
-      else
-	--cur_byte;
+      unsigned char *byte_ptr = data + cur_byte;
+      unsigned int bits = hi_bit - lo_bit;
+      unsigned int mask = ((1 << bits) - 1) << lo_bit;
+      *byte_ptr = (*byte_ptr & ~mask) | ((stuff_to_put << lo_bit) & mask);
+      stuff_to_put >>= bits;
+      len -= bits;
+      cur_byte += nextbyte;
+      lo_bit = 0;
+      hi_bit = min (len, FLOATFORMAT_CHAR_BIT);
     }
+  while (len != 0);
 }
 
 /* The converse: convert the double *FROM to an extended float
diff --git a/contrib/gcclibs/libiberty/functions.texi b/contrib/gcclibs/libiberty/functions.texi
index 68c064817db..45dcd4c086e 100644
--- a/contrib/gcclibs/libiberty/functions.texi
+++ b/contrib/gcclibs/libiberty/functions.texi
@@ -948,7 +948,7 @@ documented.
 @end deftypefn
 
 @c strsignal.c:539
-@deftypefn Supplemental void psignal (unsigned @var{signo}, char *@var{message})
+@deftypefn Supplemental void psignal (int @var{signo}, char *@var{message})
 
 Print @var{message} to the standard error, followed by a colon,
 followed by the description of the signal specified by @var{signo},
diff --git a/contrib/gcclibs/libiberty/pex-unix.c b/contrib/gcclibs/libiberty/pex-unix.c
index c5fa984817e..a7760415e01 100644
--- a/contrib/gcclibs/libiberty/pex-unix.c
+++ b/contrib/gcclibs/libiberty/pex-unix.c
@@ -339,7 +339,7 @@ static void
 pex_child_error (struct pex_obj *obj, const char *executable,
 		 const char *errmsg, int err)
 {
-#define writeerr(s) write (STDERR_FILE_NO, s, strlen (s))
+#define writeerr(s) (void) write (STDERR_FILE_NO, s, strlen (s))
   writeerr (obj->pname);
   writeerr (": error trying to exec '");
   writeerr (executable);
diff --git a/contrib/gcclibs/libiberty/strsignal.c b/contrib/gcclibs/libiberty/strsignal.c
index c3a16ab9bdc..4ca9e21d113 100644
--- a/contrib/gcclibs/libiberty/strsignal.c
+++ b/contrib/gcclibs/libiberty/strsignal.c
@@ -9,7 +9,7 @@
 /* We need to declare sys_siglist, because even if the system provides
    it we can't assume that it is declared in <signal.h> (for example,
    SunOS provides sys_siglist, but it does not declare it in any
-   header file).  fHowever, we can't declare sys_siglist portably,
+   header file).  However, we can't declare sys_siglist portably,
    because on some systems it is declared with const and on some
    systems it is declared without const.  If we were using autoconf,
    we could work out the right declaration.  Until, then we just
@@ -536,7 +536,7 @@ strtosigno (const char *name)
 
 /*
 
-@deftypefn Supplemental void psignal (unsigned @var{signo}, char *@var{message})
+@deftypefn Supplemental void psignal (int @var{signo}, char *@var{message})
 
 Print @var{message} to the standard error, followed by a colon,
 followed by the description of the signal specified by @var{signo},
@@ -549,7 +549,7 @@ followed by a newline.
 #ifndef HAVE_PSIGNAL
 
 void
-psignal (unsigned signo, char *message)
+psignal (int signo, char *message)
 {
   if (signal_names == NULL)
     {
diff --git a/contrib/gcclibs/libiberty/testsuite/demangle-expected b/contrib/gcclibs/libiberty/testsuite/demangle-expected
index 3f5622f79b7..3c5f313a31a 100644
--- a/contrib/gcclibs/libiberty/testsuite/demangle-expected
+++ b/contrib/gcclibs/libiberty/testsuite/demangle-expected
@@ -3816,3 +3816,68 @@ f
 SASDASDFASDF_sdfsdf
 SASDASDFASDF_sdfsdf
 SASDASDFASDF_sdfsdf
+# These are all cases of invalid manglings where the demangler would read
+# past the end of the string.
+# d_name wasn't honouring a NULL from d_substitution
+--format=gnu-v3
+_ZSA
+_ZSA
+# d_expr_primary wasn't honouring NULL from cplus_demangle_mangled_name
+--format=gnu-v3
+_ZN1fIL_
+_ZN1fIL_
+# d_operator_name was taking two characters in a row
+--format=gnu-v3
+_Za
+_Za
+# d_prefix wasn't honouring NULL from d_substitution
+--format=gnu-v3
+_ZNSA
+_ZNSA
+# d_prefix wasn't honouring NULL from d_template_param
+--format=gnu-v3
+_ZNT
+_ZNT
+# Dereferencing NULL in d_pointer_to_member_type
+--format=gnu-v3
+_Z1aMark
+_Z1aMark
+--format=gnu-v3
+_ZSA
+_ZSA
+# d_expr_primary wasn't honouring NULL from cplus_demangle_mangled_name
+--format=gnu-v3
+_ZN1fIL_
+_ZN1fIL_
+# d_operator_name was taking two characters in a row
+--format=gnu-v3
+_Za
+_Za
+# d_prefix wasn't honouring NULL from d_substitution
+--format=gnu-v3
+_ZNSA
+_ZNSA
+# d_prefix wasn't honouring NULL from d_template_param
+--format=gnu-v3
+_ZNT
+_ZNT
+# Dereferencing NULL in d_pointer_to_member_type
+--format=gnu-v3
+_Z1aMark
+_Z1aMark
+# <local-source-name> test 1
+--format=gnu-v3
+_ZL3foo_2
+foo
+# <local-source-name> test 2
+--format=gnu-v3
+_ZZL3foo_2vE4var1
+foo()::var1
+# <local-source-name> test 3
+--format=gnu-v3
+_ZZL3foo_2vE4var1_0
+foo()::var1
+# <local-source-name> test 4
+--format=gnu-v3
+_ZZN7myspaceL3foo_1EvEN11localstruct1fEZNS_3fooEvE16otherlocalstruct
+myspace::foo()::localstruct::f(myspace::foo()::otherlocalstruct)
diff --git a/contrib/gcclibs/libiberty/testsuite/test-demangle.c b/contrib/gcclibs/libiberty/testsuite/test-demangle.c
index 93793996fe0..12b07dd6476 100644
--- a/contrib/gcclibs/libiberty/testsuite/test-demangle.c
+++ b/contrib/gcclibs/libiberty/testsuite/test-demangle.c
@@ -86,6 +86,50 @@ getline(buf)
   buf->alloced = alloc;
 }
 
+/* If we have mmap() and mprotect(), copy the string S just before a
+   protected page, so that if the demangler runs over the end of the
+   string we'll get a fault, and return the address of the new string.
+   If no mmap, or it fails, or it looks too hard, just return S.  */
+
+#ifdef HAVE_SYS_MMAN_H
+#include <sys/mman.h>
+#endif
+#if defined(MAP_ANON) && ! defined (MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
+static const char *
+protect_end (const char * s)
+{
+#if defined(HAVE_MMAP) && defined (MAP_ANONYMOUS)
+  size_t pagesize = getpagesize();
+  static char * buf;
+  size_t s_len = strlen (s);
+  char * result;
+  
+  /* Don't try if S is too long.  */
+  if (s_len >= pagesize)
+    return s;
+
+  /* Allocate one page of allocated space followed by an unmapped
+     page.  */
+  if (buf == NULL)
+    {
+      buf = mmap (NULL, pagesize * 2, PROT_READ | PROT_WRITE,
+		  MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+      if (! buf)
+	return s;
+      munmap (buf + pagesize, pagesize);
+    }
+  
+  result = buf + (pagesize - s_len - 1);
+  memcpy (result, s, s_len + 1);
+  return result;
+#else
+  return s;
+#endif
+}
+
 static void
 fail (lineno, opts, in, out, exp)
      int lineno;
@@ -150,6 +194,8 @@ main(argc, argv)
 
   for (;;)
     {
+      const char *inp;
+      
       getline (&format);
       if (feof (stdin))
 	break;
@@ -157,6 +203,8 @@ main(argc, argv)
       getline (&input);
       getline (&expect);
 
+      inp = protect_end (input.data);
+
       tests++;
 
       no_params = 0;
@@ -237,14 +285,14 @@ main(argc, argv)
 	    {
 	      enum gnu_v3_ctor_kinds kc;
 
-	      kc = is_gnu_v3_mangled_ctor (input.data);
+	      kc = is_gnu_v3_mangled_ctor (inp);
 	      sprintf (buf, "%d", (int) kc);
 	    }
 	  else
 	    {
 	      enum gnu_v3_dtor_kinds kd;
 
-	      kd = is_gnu_v3_mangled_dtor (input.data);
+	      kd = is_gnu_v3_mangled_dtor (inp);
 	      sprintf (buf, "%d", (int) kd);
 	    }
 
@@ -259,7 +307,7 @@ main(argc, argv)
 
       cplus_demangle_set_style (style);
 
-      result = cplus_demangle (input.data,
+      result = cplus_demangle (inp,
 			       DMGL_PARAMS|DMGL_ANSI|DMGL_TYPES
 			       |(ret_postfix ? DMGL_RET_POSTFIX : 0));
 
@@ -275,7 +323,7 @@ main(argc, argv)
       if (no_params)
 	{
 	  getline (&expect);
-	  result = cplus_demangle (input.data, DMGL_ANSI|DMGL_TYPES);
+	  result = cplus_demangle (inp, DMGL_ANSI|DMGL_TYPES);
 
 	  if (result
 	      ? strcmp (result, expect.data)
diff --git a/contrib/gcclibs/libssp/ssp.c b/contrib/gcclibs/libssp/ssp.c
index 9576be445b2..46cd5793cb3 100644
--- a/contrib/gcclibs/libssp/ssp.c
+++ b/contrib/gcclibs/libssp/ssp.c
@@ -56,6 +56,8 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 # include <syslog.h>
 #endif
 
+#include <stdlib.h>
+
 void *__stack_chk_guard = 0;
 
 static void __attribute__ ((constructor))
@@ -128,7 +130,7 @@ fail (const char *msg1, size_t msg1len, const char *msg3)
 #ifdef HAVE_SYSLOG_H
   /* Only send the error to syslog if there was no tty available.  */
   else
-    syslog (LOG_CRIT, msg3);
+    syslog (LOG_CRIT, "%s", msg3);
 #endif /* HAVE_SYSLOG_H */
 
   /* Try very hard to exit.  Note that signals may be blocked preventing
diff --git a/contrib/gdb/gdb/amd64fbsd-nat.c b/contrib/gdb/gdb/amd64fbsd-nat.c
index f08373422c2..dacd4a37427 100644
--- a/contrib/gdb/gdb/amd64fbsd-nat.c
+++ b/contrib/gdb/gdb/amd64fbsd-nat.c
@@ -29,6 +29,7 @@
 #include <sys/types.h>
 #include <sys/ptrace.h>
 #include <sys/sysctl.h>
+#include <sys/user.h>
 #include <machine/reg.h>
 
 #ifdef HAVE_SYS_PROCFS_H
@@ -212,24 +213,23 @@ Please report this to <bug-gdb@gnu.org>.",
 
   SC_RBP_OFFSET = offset;
 
-  /* FreeBSD provides a kern.ps_strings sysctl that we can use to
+  /* FreeBSD provides a kern.proc.sigtramp sysctl that we can use to
      locate the sigtramp.  That way we can still recognize a sigtramp
-     if its location is changed in a new kernel.  Of course this is
-     still based on the assumption that the sigtramp is placed
-     directly under the location where the program arguments and
-     environment can be found.  */
+     if its location is changed in a new kernel. */
   {
-    int mib[2];
-    long ps_strings;
+    int mib[4];
+    struct kinfo_sigtramp kst;
     size_t len;
 
     mib[0] = CTL_KERN;
-    mib[1] = KERN_PS_STRINGS;
-    len = sizeof (ps_strings);
-    if (sysctl (mib, 2, &ps_strings, &len, NULL, 0) == 0)
+    mib[1] = KERN_PROC;
+    mib[2] = KERN_PROC_SIGTRAMP;
+    mib[3] = getpid();
+    len = sizeof (kst);
+    if (sysctl (mib, sizeof(mib) / sizeof(mib[0]), &kst, &len, NULL, 0) == 0)
       {
-	amd64fbsd_sigtramp_start_addr = ps_strings - 32;
-	amd64fbsd_sigtramp_end_addr = ps_strings;
+	amd64fbsd_sigtramp_start_addr = kst.ksigtramp_start;
+	amd64fbsd_sigtramp_end_addr = kst.ksigtramp_end;
       }
   }
 }
diff --git a/contrib/gperf/doc/gperf.1 b/contrib/gperf/doc/gperf.1
index 786604ef050..217969f73c8 100644
--- a/contrib/gperf/doc/gperf.1
+++ b/contrib/gperf/doc/gperf.1
@@ -1,7 +1,7 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GPERF "1" "May 2007" "GNU gperf 3.0.3" FSF
+.TH GPERF "1" "October 2011" "GNU gperf 3.0.3" FSF
 .SH NAME
-gperf \- generate a perfect hash function from a key set
+gperf \- manual page for gperf 3.0.3
 .SH SYNOPSIS
 .B gperf
 [\fIOPTION\fR]... [\fIINPUT-FILE\fR]
@@ -129,6 +129,10 @@ binary search.
 Prevents the transfer of the type declaration to the
 output file. Use this option if the type is already
 defined elsewhere.
+.TP
+\fB\-\-size\-type\fR=\fITYPE\fR
+Specify the type for length parameters. Default type is
+\&'unsigned int'.
 .SS "Algorithm employed by gperf:"
 .TP
 \fB\-k\fR, \fB\-\-key\-positions\fR=\fIKEYS\fR
diff --git a/contrib/gperf/src/options.cc b/contrib/gperf/src/options.cc
index a86432ea65e..e4134273f17 100644
--- a/contrib/gperf/src/options.cc
+++ b/contrib/gperf/src/options.cc
@@ -67,6 +67,8 @@ static const char *const DEFAULT_STRINGPOOL_NAME = "stringpool";
 /* Default delimiters that separate keywords from their attributes.  */
 static const char *const DEFAULT_DELIMITERS = ",";
 
+static const char *const DEFAULT_SIZE_TYPE = "unsigned int";
+
 /* Prints program usage to given stream.  */
 
 void
@@ -202,6 +204,9 @@ Options::long_usage (FILE * stream)
            "                         Prevents the transfer of the type declaration to the\n"
            "                         output file. Use this option if the type is already\n"
            "                         defined elsewhere.\n");
+  fprintf (stream,
+           "      --size-type=TYPE   Specify the type for length parameters. Default type is\n"
+	   "                         'unsigned int'.\n");
   fprintf (stream, "\n");
   fprintf (stream,
            "Algorithm employed by gperf:\n");
@@ -281,7 +286,7 @@ Options::print_options () const
         {
           putchar (*arg);
           arg++;
-          if (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z')
+          if ( (*arg >= 'A' && *arg <= 'Z') || (*arg >= 'a' && *arg <= 'z') )
             {
               putchar (*arg);
               arg++;
@@ -293,7 +298,9 @@ Options::print_options () const
                   putchar (*arg);
                   arg++;
                 }
-              while (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z' || *arg == '-');
+              while ( (*arg >= 'A' && *arg <= 'Z') ||
+                      (*arg >= 'a' && *arg <= 'z') ||
+                       *arg == '-');
               if (*arg == '=')
                 {
                   putchar (*arg);
@@ -468,6 +475,7 @@ Options::Options ()
     _lengthtable_name (DEFAULT_LENGTHTABLE_NAME),
     _stringpool_name (DEFAULT_STRINGPOOL_NAME),
     _delimiters (DEFAULT_DELIMITERS),
+    _size_type (DEFAULT_SIZE_TYPE),
     _key_positions ()
 {
 }
@@ -512,6 +520,7 @@ Options::~Options ()
                "\nhash table size multiplier = %g"
                "\ninitial associated value = %d"
                "\ndelimiters = %s"
+	       "\nsize type = %s"
                "\nnumber of switch statements = %d\n",
                _option_word & TYPE ? "enabled" : "disabled",
                _option_word & UPPERLOWER ? "enabled" : "disabled",
@@ -537,7 +546,7 @@ Options::~Options ()
                _function_name, _hash_name, _wordlist_name, _lengthtable_name,
                _stringpool_name, _slot_name, _initializer_suffix,
                _asso_iterations, _jump, _size_multiple, _initial_asso_value,
-               _delimiters, _total_switches);
+               _delimiters, _size_type, _total_switches);
       if (_key_positions.is_useall())
         fprintf (stderr, "all characters are used in the hash function\n");
       else
@@ -666,6 +675,12 @@ Options::set_delimiters (const char *delimiters)
     _delimiters = delimiters;
 }
 
+void
+Options::set_size_type (const char *size_type)
+{
+  if (_size_type == DEFAULT_SIZE_TYPE) 
+    _size_type = size_type;
+}
 
 /* Parses the command line Options and sets appropriate flags in option_word.  */
 
@@ -691,6 +706,7 @@ static const struct option long_options[] =
   { "global-table", no_argument, NULL, 'G' },
   { "word-array-name", required_argument, NULL, 'W' },
   { "length-table-name", required_argument, NULL, CHAR_MAX + 4 },
+  { "size-type", required_argument, NULL, CHAR_MAX + 5 },
   { "switch", required_argument, NULL, 'S' },
   { "omit-struct-type", no_argument, NULL, 'T' },
   { "key-positions", required_argument, NULL, 'k' },
@@ -1044,6 +1060,11 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
             _lengthtable_name = /*getopt*/optarg;
             break;
           }
+        case CHAR_MAX + 5:      /* Sets the name for the length table array.  */
+          {
+            _size_type = /*getopt*/optarg;
+            break;
+          }
         default:
           short_usage (stderr);
           exit (1);
diff --git a/contrib/gperf/src/options.h b/contrib/gperf/src/options.h
index bda7f0c8939..2ca2b3b3278 100644
--- a/contrib/gperf/src/options.h
+++ b/contrib/gperf/src/options.h
@@ -209,6 +209,9 @@ public:
   /* Sets the delimiters string, if not already set.  */
   void                  set_delimiters (const char *delimiters);
 
+  const char *		get_size_type() const;
+  void			set_size_type(const char*);
+
   /* Returns key positions.  */
   const Positions&      get_key_positions () const;
 
@@ -279,6 +282,8 @@ private:
   /* Separates keywords from other attributes.  */
   const char *          _delimiters;
 
+  const char *		_size_type;
+
   /* Contains user-specified key choices.  */
   Positions             _key_positions;
 };
diff --git a/contrib/gperf/src/options.icc b/contrib/gperf/src/options.icc
index 4188ddcbfd7..8931e361b97 100644
--- a/contrib/gperf/src/options.icc
+++ b/contrib/gperf/src/options.icc
@@ -155,3 +155,9 @@ Options::get_key_positions () const
 {
   return _key_positions;
 }
+
+INLINE const char *
+Options::get_size_type() const
+{
+	return _size_type;
+}
diff --git a/contrib/gperf/src/output.cc b/contrib/gperf/src/output.cc
index 2732057326b..9cb3dd4bdb0 100644
--- a/contrib/gperf/src/output.cc
+++ b/contrib/gperf/src/output.cc
@@ -772,14 +772,14 @@ Output::output_hash_function () const
   printf (option[KRC] ?
                  "(str, len)\n"
             "     register char *str;\n"
-            "     register unsigned int len;\n" :
+            "     register %s len;\n" :
           option[C] ?
                  "(str, len)\n"
             "     register const char *str;\n"
-            "     register unsigned int len;\n" :
+            "     register %s len;\n" :
           option[ANSIC] | option[CPLUSPLUS] ?
-                 "(register const char *str, register unsigned int len)\n" :
-          "");
+                 "(register const char *str, register %s len)\n" :
+          "%s", option.get_size_type());
 
   /* Note that when the hash function is called, it has already been verified
      that  min_key_len <= len <= max_key_len.  */
@@ -875,7 +875,7 @@ Output::output_hash_function () const
                   "  switch (%s)\n"
                   "    {\n"
                   "      default:\n",
-                  option[NOLENGTH] ? "0" : "len",
+                  option[NOLENGTH] ? "0" : "(int)len",
                   option[NOLENGTH] ? "len" : "hval");
 
           while (key_pos != Positions::LASTCHAR && key_pos >= _max_key_len)
@@ -1106,9 +1106,7 @@ output_keyword_entry (KeywordExt *temp, int stringpool_index, const char *indent
   if (option[TYPE])
     printf ("{");
   if (option[SHAREDLIB])
-    printf ("(int)(long)&((struct %s_t *)0)->%s_str%d",
-            option.get_stringpool_name (), option.get_stringpool_name (),
-            stringpool_index);
+    printf("offsetof(struct %s_t, %s_str%d)", option.get_stringpool_name (), option.get_stringpool_name (), stringpool_index);
   else
     output_string (temp->_allchars, temp->_allchars_length);
   if (option[TYPE])
@@ -1902,14 +1900,14 @@ Output::output_lookup_function () const
   printf (option[KRC] ?
                  "(str, len)\n"
             "     register char *str;\n"
-            "     register unsigned int len;\n" :
+            "     register %s len;\n" :
           option[C] ?
                  "(str, len)\n"
             "     register const char *str;\n"
-            "     register unsigned int len;\n" :
+            "     register %s len;\n" :
           option[ANSIC] | option[CPLUSPLUS] ?
-                 "(register const char *str, register unsigned int len)\n" :
-          "");
+                 "(register const char *str, register %s len)\n" :
+          "%s", option.get_size_type());
 
   /* Output the function's body.  */
   printf ("{\n");
@@ -2035,8 +2033,11 @@ Output::output ()
       printf ("%s\n", _struct_decl);
     }
 
-  if (option[INCLUDE])
+  if (option[INCLUDE]) {
     printf ("#include <string.h>\n"); /* Declare strlen(), strcmp(), strncmp(). */
+    if (option[SHAREDLIB])
+      printf("#include <stddef.h>\n"); /* Declare offsetof() */
+  }
 
   if (!option[ENUM])
     {
@@ -2073,13 +2074,14 @@ Output::output ()
     printf ("class %s\n"
             "{\n"
             "private:\n"
-            "  static inline unsigned int %s (const char *str, unsigned int len);\n"
+            "  static inline unsigned int %s (const char *str, %s len);\n"
             "public:\n"
-            "  static %s%s%s (const char *str, unsigned int len);\n"
+            "  static %s%s%s (const char *str, %s len);\n"
             "};\n"
             "\n",
-            option.get_class_name (), option.get_hash_name (),
-            const_for_struct, _return_type, option.get_function_name ());
+            option.get_class_name (), option.get_hash_name (), option.get_size_type(),
+            const_for_struct, _return_type, option.get_function_name (),
+	    option.get_size_type());
 
   output_hash_function ();
 
diff --git a/contrib/gperf/src/search.cc b/contrib/gperf/src/search.cc
index c2459701036..956b5bed07b 100644
--- a/contrib/gperf/src/search.cc
+++ b/contrib/gperf/src/search.cc
@@ -36,7 +36,10 @@
 /* ============================== Portability ============================== */
 
 /* Assume ISO C++ 'for' scoping rule.  */
-#define for if (0) ; else for
+/* This code is used to work around scoping issues with visual studio 6 from
+ * 1998.  Comment it out here to queisce numerous -Wdangling-else warnings
+ * from clang.
+#define for if (0) ; else for */
 
 /* Dynamically allocated array with dynamic extent:
 
diff --git a/contrib/groff/src/roff/troff/input.cpp b/contrib/groff/src/roff/troff/input.cpp
index 15077e947fb..da1c76b0a13 100644
--- a/contrib/groff/src/roff/troff/input.cpp
+++ b/contrib/groff/src/roff/troff/input.cpp
@@ -2789,18 +2789,19 @@ void process_input_stack()
     case token::TOKEN_TRANSPARENT:
       {
 	if (bol) {
-	  if (possibly_handle_first_page_transition())
+	  if (possibly_handle_first_page_transition()) {
 	    ;
-	  else {
+	  } else {
 	    int cc;
 	    do {
 	      node *n;
 	      cc = get_copy(&n);
-	      if (cc != EOF)
+	      if (cc != EOF) {
 		if (cc != '\0')
 		  curdiv->transparent_output(transparent_translate(cc));
 		else
 		  curdiv->transparent_output(n);
+	      }
 	    } while (cc != '\n' && cc != EOF);
 	    if (cc == EOF)
 	      curdiv->transparent_output('\n');
@@ -2811,9 +2812,9 @@ void process_input_stack()
     case token::TOKEN_NEWLINE:
       {
 	if (bol && !old_have_input
-	    && !curenv->get_prev_line_interrupted())
+	    && !curenv->get_prev_line_interrupted()) {
 	  trapping_blank_line();
-	else {
+	} else {
 	  curenv->newline();
 	  bol = 1;
 	}
diff --git a/contrib/groff/src/roff/troff/mtsm.cpp b/contrib/groff/src/roff/troff/mtsm.cpp
index 38efc0a343a..4d415fd56c1 100644
--- a/contrib/groff/src/roff/troff/mtsm.cpp
+++ b/contrib/groff/src/roff/troff/mtsm.cpp
@@ -482,21 +482,24 @@ void mtsm::flush(FILE *fp, statem *s, string tag_list)
 void statem::display_state()
 {
   fprintf(stderr, " <state ");
-  if (bool_values[MTSM_BR].is_known)
+  if (bool_values[MTSM_BR].is_known) {
     if (bool_values[MTSM_BR].value)
       fprintf(stderr, "[br]");
     else
       fprintf(stderr, "[!br]");
-  if (bool_values[MTSM_EOL].is_known)
+  }
+  if (bool_values[MTSM_EOL].is_known) {
     if (bool_values[MTSM_EOL].value)
       fprintf(stderr, "[eol]");
     else
       fprintf(stderr, "[!eol]");
-  if (int_values[MTSM_SP].is_known)
+  }
+  if (int_values[MTSM_SP].is_known) {
     if (int_values[MTSM_SP].value)
       fprintf(stderr, "[sp %d]", int_values[MTSM_SP].value);
     else
       fprintf(stderr, "[!sp]");
+  }
   fprintf(stderr, ">");
   fflush(stderr);
 }
diff --git a/contrib/groff/src/roff/troff/node.cpp b/contrib/groff/src/roff/troff/node.cpp
index 0e440b21058..7ff5c858d4f 100644
--- a/contrib/groff/src/roff/troff/node.cpp
+++ b/contrib/groff/src/roff/troff/node.cpp
@@ -4600,14 +4600,14 @@ void hline_node::tprint(troff_output_file *out)
   }
   else {
     hunits rem = x - w*i;
-    if (rem > H0)
+    if (rem > H0) {
       if (n->overlaps_horizontally()) {
 	if (out->is_on())
 	  n->tprint(out);
 	out->right(rem - w);
-      }
-      else
+      } else
 	out->right(rem);
+    }
     while (--i >= 0)
       if (out->is_on())
 	n->tprint(out);
diff --git a/contrib/ipfilter/ipf.h b/contrib/ipfilter/ipf.h
index 280f98d938c..d4bd5249550 100644
--- a/contrib/ipfilter/ipf.h
+++ b/contrib/ipfilter/ipf.h
@@ -42,9 +42,10 @@ struct file;
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
+
+#define	_WANT_IFADDR
+#include <net/if_var.h>
+
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
diff --git a/contrib/jemalloc/ChangeLog b/contrib/jemalloc/ChangeLog
index 8ab884875b0..0efc7426d72 100644
--- a/contrib/jemalloc/ChangeLog
+++ b/contrib/jemalloc/ChangeLog
@@ -6,6 +6,21 @@ found in the git revision history:
     http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git
     git://canonware.com/jemalloc.git
 
+* 3.4.1 (October 20, 2013)
+
+  Bug fixes:
+  - Fix a race in the "arenas.extend" mallctl that could cause memory corruption
+    of internal data structures and subsequent crashes.
+  - Fix Valgrind integration flaws that caused Valgrind warnings about reads of
+    uninitialized memory in:
+    + arena chunk headers
+    + internal zero-initialized data structures (relevant to tcache and prof
+      code)
+  - Preserve errno during the first allocation.  A readlink(2) call during
+    initialization fails unless /etc/malloc.conf exists, so errno was typically
+    set during the first allocation prior to this fix.
+  - Fix compilation warnings reported by gcc 4.8.1.
+
 * 3.4.0 (June 2, 2013)
 
   This version is essentially a small bugfix release, but the addition of
@@ -60,7 +75,7 @@ found in the git revision history:
 
   Bug fixes:
   - Fix "arenas.extend" mallctl to output the number of arenas.
-  - Fix chunk_recycyle() to unconditionally inform Valgrind that returned memory
+  - Fix chunk_recycle() to unconditionally inform Valgrind that returned memory
     is undefined.
   - Fix build break on FreeBSD related to alloca.h.
 
diff --git a/contrib/jemalloc/FREEBSD-diffs b/contrib/jemalloc/FREEBSD-diffs
index 499fd0fcaf4..ac22cf54e0a 100644
--- a/contrib/jemalloc/FREEBSD-diffs
+++ b/contrib/jemalloc/FREEBSD-diffs
@@ -45,7 +45,7 @@ index abd5e6f..1d7491a 100644
 +  </refsect1>
  </refentry>
 diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in
-index e46ac54..527449d 100644
+index 53c135c..c547339 100644
 --- a/include/jemalloc/internal/jemalloc_internal.h.in
 +++ b/include/jemalloc/internal/jemalloc_internal.h.in
 @@ -1,5 +1,8 @@
@@ -97,10 +97,10 @@ index de44e14..564d604 100644
  
  bool	malloc_mutex_init(malloc_mutex_t *mutex);
 diff --git a/include/jemalloc/internal/private_namespace.h b/include/jemalloc/internal/private_namespace.h
-index 65de316..366676b 100644
+index cdb0b0e..2a98d1f 100644
 --- a/include/jemalloc/internal/private_namespace.h
 +++ b/include/jemalloc/internal/private_namespace.h
-@@ -216,7 +216,6 @@
+@@ -218,7 +218,6 @@
  #define	iralloc JEMALLOC_N(iralloc)
  #define	irallocx JEMALLOC_N(irallocx)
  #define	isalloc JEMALLOC_N(isalloc)
@@ -244,7 +244,7 @@ index 0000000..e6c8407
 +#endif
 +
 diff --git a/src/jemalloc.c b/src/jemalloc.c
-index bc350ed..352c98e 100644
+index ae56db6..1412a5e 100644
 --- a/src/jemalloc.c
 +++ b/src/jemalloc.c
 @@ -8,6 +8,10 @@ malloc_tsd_data(, arenas, arena_t *, NULL)
diff --git a/contrib/jemalloc/FREEBSD-upgrade b/contrib/jemalloc/FREEBSD-upgrade
index eb702d83a67..a54b5c4a4b2 100755
--- a/contrib/jemalloc/FREEBSD-upgrade
+++ b/contrib/jemalloc/FREEBSD-upgrade
@@ -60,7 +60,7 @@ do_extract() {
   local rev=$1
   # Clone.
   rm -rf ${work}
-  git clone git://canonware.com/jemalloc.git ${work}
+  git clone https://github.com/jemalloc/jemalloc.git ${work}
   (
     cd ${work}
     if [ "x${rev}" != "x" ] ; then
diff --git a/contrib/jemalloc/VERSION b/contrib/jemalloc/VERSION
index 84c9c557ac9..4faf2eb2510 100644
--- a/contrib/jemalloc/VERSION
+++ b/contrib/jemalloc/VERSION
@@ -1 +1 @@
-3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775
+3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0
diff --git a/contrib/jemalloc/doc/jemalloc.3 b/contrib/jemalloc/doc/jemalloc.3
index 44445050c3a..93484d6df8d 100644
--- a/contrib/jemalloc/doc/jemalloc.3
+++ b/contrib/jemalloc/doc/jemalloc.3
@@ -2,12 +2,12 @@
 .\"     Title: JEMALLOC
 .\"    Author: Jason Evans
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 06/02/2013
+.\"      Date: 10/20/2013
 .\"    Manual: User Manual
-.\"    Source: jemalloc 3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775
+.\"    Source: jemalloc 3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0
 .\"  Language: English
 .\"
-.TH "JEMALLOC" "3" "06/02/2013" "jemalloc 3.4.0-0-g0ed518e5dab7" "User Manual"
+.TH "JEMALLOC" "3" "10/20/2013" "jemalloc 3.4.1-0-g0135fb806e41" "User Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -31,7 +31,7 @@
 jemalloc \- general purpose memory allocation functions
 .SH "LIBRARY"
 .PP
-This manual describes jemalloc 3\&.4\&.0\-0\-g0ed518e5dab789ad2171bb38977a8927e2a26775\&. More information can be found at the
+This manual describes jemalloc 3\&.4\&.1\-0\-g0135fb806e4137dc9cdf152541926a2bc95e33f0\&. More information can be found at the
 \m[blue]\fBjemalloc website\fR\m[]\&\s-2\u[1]\d\s+2\&.
 .PP
 The following configuration options are enabled in libc\*(Aqs built\-in jemalloc:
diff --git a/contrib/jemalloc/include/jemalloc/internal/arena.h b/contrib/jemalloc/include/jemalloc/internal/arena.h
index f2c18f43543..bbcfedacead 100644
--- a/contrib/jemalloc/include/jemalloc/internal/arena.h
+++ b/contrib/jemalloc/include/jemalloc/internal/arena.h
@@ -441,6 +441,7 @@ void	arena_postfork_child(arena_t *arena);
 #ifndef JEMALLOC_ENABLE_INLINE
 arena_chunk_map_t	*arena_mapp_get(arena_chunk_t *chunk, size_t pageind);
 size_t	*arena_mapbitsp_get(arena_chunk_t *chunk, size_t pageind);
+size_t	arena_mapbitsp_read(size_t *mapbitsp);
 size_t	arena_mapbits_get(arena_chunk_t *chunk, size_t pageind);
 size_t	arena_mapbits_unallocated_size_get(arena_chunk_t *chunk,
     size_t pageind);
@@ -451,6 +452,7 @@ size_t	arena_mapbits_dirty_get(arena_chunk_t *chunk, size_t pageind);
 size_t	arena_mapbits_unzeroed_get(arena_chunk_t *chunk, size_t pageind);
 size_t	arena_mapbits_large_get(arena_chunk_t *chunk, size_t pageind);
 size_t	arena_mapbits_allocated_get(arena_chunk_t *chunk, size_t pageind);
+void	arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits);
 void	arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind,
     size_t size, size_t flags);
 void	arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind,
@@ -497,11 +499,18 @@ arena_mapbitsp_get(arena_chunk_t *chunk, size_t pageind)
 	return (&arena_mapp_get(chunk, pageind)->bits);
 }
 
+JEMALLOC_ALWAYS_INLINE size_t
+arena_mapbitsp_read(size_t *mapbitsp)
+{
+
+	return (*mapbitsp);
+}
+
 JEMALLOC_ALWAYS_INLINE size_t
 arena_mapbits_get(arena_chunk_t *chunk, size_t pageind)
 {
 
-	return (*arena_mapbitsp_get(chunk, pageind));
+	return (arena_mapbitsp_read(arena_mapbitsp_get(chunk, pageind)));
 }
 
 JEMALLOC_ALWAYS_INLINE size_t
@@ -584,83 +593,90 @@ arena_mapbits_allocated_get(arena_chunk_t *chunk, size_t pageind)
 	return (mapbits & CHUNK_MAP_ALLOCATED);
 }
 
+JEMALLOC_ALWAYS_INLINE void
+arena_mapbitsp_write(size_t *mapbitsp, size_t mapbits)
+{
+
+	*mapbitsp = mapbits;
+}
+
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_unallocated_set(arena_chunk_t *chunk, size_t pageind, size_t size,
     size_t flags)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
 
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert((size & PAGE_MASK) == 0);
 	assert((flags & ~CHUNK_MAP_FLAGS_MASK) == 0);
 	assert((flags & (CHUNK_MAP_DIRTY|CHUNK_MAP_UNZEROED)) == flags);
-	*mapbitsp = size | CHUNK_MAP_BININD_INVALID | flags;
+	arena_mapbitsp_write(mapbitsp, size | CHUNK_MAP_BININD_INVALID | flags);
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_unallocated_size_set(arena_chunk_t *chunk, size_t pageind,
     size_t size)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert((size & PAGE_MASK) == 0);
-	assert((*mapbitsp & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0);
-	*mapbitsp = size | (*mapbitsp & PAGE_MASK);
+	assert((mapbits & (CHUNK_MAP_LARGE|CHUNK_MAP_ALLOCATED)) == 0);
+	arena_mapbitsp_write(mapbitsp, size | (mapbits & PAGE_MASK));
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_large_set(arena_chunk_t *chunk, size_t pageind, size_t size,
     size_t flags)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 	size_t unzeroed;
 
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert((size & PAGE_MASK) == 0);
 	assert((flags & CHUNK_MAP_DIRTY) == flags);
-	unzeroed = *mapbitsp & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */
-	*mapbitsp = size | CHUNK_MAP_BININD_INVALID | flags | unzeroed |
-	    CHUNK_MAP_LARGE | CHUNK_MAP_ALLOCATED;
+	unzeroed = mapbits & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */
+	arena_mapbitsp_write(mapbitsp, size | CHUNK_MAP_BININD_INVALID | flags
+	    | unzeroed | CHUNK_MAP_LARGE | CHUNK_MAP_ALLOCATED);
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_large_binind_set(arena_chunk_t *chunk, size_t pageind,
     size_t binind)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 
 	assert(binind <= BININD_INVALID);
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert(arena_mapbits_large_size_get(chunk, pageind) == PAGE);
-	*mapbitsp = (*mapbitsp & ~CHUNK_MAP_BININD_MASK) | (binind <<
-	    CHUNK_MAP_BININD_SHIFT);
+	arena_mapbitsp_write(mapbitsp, (mapbits & ~CHUNK_MAP_BININD_MASK) |
+	    (binind << CHUNK_MAP_BININD_SHIFT));
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_small_set(arena_chunk_t *chunk, size_t pageind, size_t runind,
     size_t binind, size_t flags)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 	size_t unzeroed;
 
 	assert(binind < BININD_INVALID);
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
 	assert(pageind - runind >= map_bias);
 	assert((flags & CHUNK_MAP_DIRTY) == flags);
-	unzeroed = *mapbitsp & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */
-	*mapbitsp = (runind << LG_PAGE) | (binind << CHUNK_MAP_BININD_SHIFT) |
-	    flags | unzeroed | CHUNK_MAP_ALLOCATED;
+	unzeroed = mapbits & CHUNK_MAP_UNZEROED; /* Preserve unzeroed. */
+	arena_mapbitsp_write(mapbitsp, (runind << LG_PAGE) | (binind <<
+	    CHUNK_MAP_BININD_SHIFT) | flags | unzeroed | CHUNK_MAP_ALLOCATED);
 }
 
 JEMALLOC_ALWAYS_INLINE void
 arena_mapbits_unzeroed_set(arena_chunk_t *chunk, size_t pageind,
     size_t unzeroed)
 {
-	size_t *mapbitsp;
+	size_t *mapbitsp = arena_mapbitsp_get(chunk, pageind);
+	size_t mapbits = arena_mapbitsp_read(mapbitsp);
 
-	mapbitsp = arena_mapbitsp_get(chunk, pageind);
-	*mapbitsp = (*mapbitsp & ~CHUNK_MAP_UNZEROED) | unzeroed;
+	arena_mapbitsp_write(mapbitsp, (mapbits & ~CHUNK_MAP_UNZEROED) |
+	    unzeroed);
 }
 
 JEMALLOC_INLINE bool
diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
index d5829f54011..95b7c6953a3 100644
--- a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
+++ b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal.h
@@ -232,9 +232,18 @@ static const bool config_ivsalloc =
 #  define	__DECONST(type, var)	((type)(uintptr_t)(const void *)(var))
 #endif
 
+/*
+ * JEMALLOC_ALWAYS_INLINE is used within header files for functions that are
+ * static inline functions if inlining is enabled, and single-definition
+ * library-private functions if inlining is disabled.
+ *
+ * JEMALLOC_ALWAYS_INLINE_C is for use in .c files, in which case the denoted
+ * functions are always static, regardless of whether inlining is enabled.
+ */
 #ifdef JEMALLOC_DEBUG
    /* Disable inlining to make debugging easier. */
 #  define JEMALLOC_ALWAYS_INLINE
+#  define JEMALLOC_ALWAYS_INLINE_C static
 #  define JEMALLOC_INLINE
 #  define inline
 #else
@@ -242,8 +251,11 @@ static const bool config_ivsalloc =
 #  ifdef JEMALLOC_HAVE_ATTR
 #    define JEMALLOC_ALWAYS_INLINE \
 	 static inline JEMALLOC_ATTR(unused) JEMALLOC_ATTR(always_inline)
+#    define JEMALLOC_ALWAYS_INLINE_C \
+	 static inline JEMALLOC_ATTR(always_inline)
 #  else
 #    define JEMALLOC_ALWAYS_INLINE static inline
+#    define JEMALLOC_ALWAYS_INLINE_C static inline
 #  endif
 #  define JEMALLOC_INLINE static inline
 #  ifdef _MSC_VER
diff --git a/contrib/jemalloc/include/jemalloc/internal/private_namespace.h b/contrib/jemalloc/include/jemalloc/internal/private_namespace.h
index 366676b4ddc..2a98d1fe5b9 100644
--- a/contrib/jemalloc/include/jemalloc/internal/private_namespace.h
+++ b/contrib/jemalloc/include/jemalloc/internal/private_namespace.h
@@ -33,6 +33,8 @@
 #define	arena_mapbits_unzeroed_get JEMALLOC_N(arena_mapbits_unzeroed_get)
 #define	arena_mapbits_unzeroed_set JEMALLOC_N(arena_mapbits_unzeroed_set)
 #define	arena_mapbitsp_get JEMALLOC_N(arena_mapbitsp_get)
+#define	arena_mapbitsp_read JEMALLOC_N(arena_mapbitsp_read)
+#define	arena_mapbitsp_write JEMALLOC_N(arena_mapbitsp_write)
 #define	arena_mapp_get JEMALLOC_N(arena_mapp_get)
 #define	arena_maxclass JEMALLOC_N(arena_maxclass)
 #define	arena_new JEMALLOC_N(arena_new)
diff --git a/contrib/jemalloc/include/jemalloc/internal/tcache.h b/contrib/jemalloc/include/jemalloc/internal/tcache.h
index ba36204ff21..d4eecdee0dc 100644
--- a/contrib/jemalloc/include/jemalloc/internal/tcache.h
+++ b/contrib/jemalloc/include/jemalloc/internal/tcache.h
@@ -313,6 +313,7 @@ tcache_alloc_small(tcache_t *tcache, size_t size, bool zero)
 			} else if (opt_zero)
 				memset(ret, 0, size);
 		}
+		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 	} else {
 		if (config_fill && opt_junk) {
 			arena_alloc_junk_small(ret, &arena_bin_info[binind],
@@ -321,7 +322,6 @@ tcache_alloc_small(tcache_t *tcache, size_t size, bool zero)
 		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 		memset(ret, 0, size);
 	}
-	VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 
 	if (config_stats)
 		tbin->tstats.nrequests++;
@@ -368,11 +368,11 @@ tcache_alloc_large(tcache_t *tcache, size_t size, bool zero)
 				else if (opt_zero)
 					memset(ret, 0, size);
 			}
+			VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 		} else {
 			VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 			memset(ret, 0, size);
 		}
-		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 
 		if (config_stats)
 			tbin->tstats.nrequests++;
diff --git a/contrib/jemalloc/include/jemalloc/jemalloc.h b/contrib/jemalloc/include/jemalloc/jemalloc.h
index 1c1e8a515e6..8d7133bf177 100644
--- a/contrib/jemalloc/include/jemalloc/jemalloc.h
+++ b/contrib/jemalloc/include/jemalloc/jemalloc.h
@@ -7,12 +7,12 @@ extern "C" {
 #include <limits.h>
 #include <strings.h>
 
-#define	JEMALLOC_VERSION "3.4.0-0-g0ed518e5dab789ad2171bb38977a8927e2a26775"
+#define	JEMALLOC_VERSION "3.4.1-0-g0135fb806e4137dc9cdf152541926a2bc95e33f0"
 #define	JEMALLOC_VERSION_MAJOR 3
 #define	JEMALLOC_VERSION_MINOR 4
-#define	JEMALLOC_VERSION_BUGFIX 0
+#define	JEMALLOC_VERSION_BUGFIX 1
 #define	JEMALLOC_VERSION_NREV 0
-#define	JEMALLOC_VERSION_GID "0ed518e5dab789ad2171bb38977a8927e2a26775"
+#define	JEMALLOC_VERSION_GID "0135fb806e4137dc9cdf152541926a2bc95e33f0"
 
 #include "jemalloc_defs.h"
 #include "jemalloc_FreeBSD.h"
diff --git a/contrib/jemalloc/src/arena.c b/contrib/jemalloc/src/arena.c
index 05a787f89d9..d28b629a1e1 100644
--- a/contrib/jemalloc/src/arena.c
+++ b/contrib/jemalloc/src/arena.c
@@ -368,14 +368,21 @@ arena_run_zero(arena_chunk_t *chunk, size_t run_ind, size_t npages)
 	    (npages << LG_PAGE));
 }
 
+static inline void
+arena_run_page_mark_zeroed(arena_chunk_t *chunk, size_t run_ind)
+{
+
+	VALGRIND_MAKE_MEM_DEFINED((void *)((uintptr_t)chunk + (run_ind <<
+	    LG_PAGE)), PAGE);
+}
+
 static inline void
 arena_run_page_validate_zeroed(arena_chunk_t *chunk, size_t run_ind)
 {
 	size_t i;
 	UNUSED size_t *p = (size_t *)((uintptr_t)chunk + (run_ind << LG_PAGE));
 
-	VALGRIND_MAKE_MEM_DEFINED((void *)((uintptr_t)chunk + (run_ind <<
-	    LG_PAGE)), PAGE);
+	arena_run_page_mark_zeroed(chunk, run_ind);
 	for (i = 0; i < PAGE / sizeof(size_t); i++)
 		assert(p[i] == 0);
 }
@@ -458,6 +465,9 @@ arena_run_split(arena_t *arena, arena_run_t *run, size_t size, bool large,
 					} else if (config_debug) {
 						arena_run_page_validate_zeroed(
 						    chunk, run_ind+i);
+					} else {
+						arena_run_page_mark_zeroed(
+						    chunk, run_ind+i);
 					}
 				}
 			} else {
@@ -467,6 +477,9 @@ arena_run_split(arena_t *arena, arena_run_t *run, size_t size, bool large,
 				 */
 				arena_run_zero(chunk, run_ind, need_pages);
 			}
+		} else {
+			VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk +
+			    (run_ind << LG_PAGE)), (need_pages << LG_PAGE));
 		}
 
 		/*
@@ -508,9 +521,9 @@ arena_run_split(arena_t *arena, arena_run_t *run, size_t size, bool large,
 			arena_run_page_validate_zeroed(chunk,
 			    run_ind+need_pages-1);
 		}
+		VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk +
+		    (run_ind << LG_PAGE)), (need_pages << LG_PAGE));
 	}
-	VALGRIND_MAKE_MEM_UNDEFINED((void *)((uintptr_t)chunk + (run_ind <<
-	    LG_PAGE)), (need_pages << LG_PAGE));
 }
 
 static arena_chunk_t *
@@ -569,17 +582,24 @@ arena_chunk_alloc(arena_t *arena)
 		 * unless the chunk is not zeroed.
 		 */
 		if (zero == false) {
+			VALGRIND_MAKE_MEM_UNDEFINED(
+			    (void *)arena_mapp_get(chunk, map_bias+1),
+			    (size_t)((uintptr_t) arena_mapp_get(chunk,
+			    chunk_npages-1) - (uintptr_t)arena_mapp_get(chunk,
+			    map_bias+1)));
 			for (i = map_bias+1; i < chunk_npages-1; i++)
 				arena_mapbits_unzeroed_set(chunk, i, unzeroed);
-		} else if (config_debug) {
+		} else {
 			VALGRIND_MAKE_MEM_DEFINED(
 			    (void *)arena_mapp_get(chunk, map_bias+1),
-			    (void *)((uintptr_t)
-			    arena_mapp_get(chunk, chunk_npages-1)
-			    - (uintptr_t)arena_mapp_get(chunk, map_bias+1)));
-			for (i = map_bias+1; i < chunk_npages-1; i++) {
-				assert(arena_mapbits_unzeroed_get(chunk, i) ==
-				    unzeroed);
+			    (size_t)((uintptr_t) arena_mapp_get(chunk,
+			    chunk_npages-1) - (uintptr_t)arena_mapp_get(chunk,
+			    map_bias+1)));
+			if (config_debug) {
+				for (i = map_bias+1; i < chunk_npages-1; i++) {
+					assert(arena_mapbits_unzeroed_get(chunk,
+					    i) == unzeroed);
+				}
 			}
 		}
 		arena_mapbits_unallocated_set(chunk, chunk_npages-1,
@@ -1458,6 +1478,7 @@ arena_malloc_small(arena_t *arena, size_t size, bool zero)
 			} else if (opt_zero)
 				memset(ret, 0, size);
 		}
+		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 	} else {
 		if (config_fill && opt_junk) {
 			arena_alloc_junk_small(ret, &arena_bin_info[binind],
@@ -1466,7 +1487,6 @@ arena_malloc_small(arena_t *arena, size_t size, bool zero)
 		VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 		memset(ret, 0, size);
 	}
-	VALGRIND_MAKE_MEM_UNDEFINED(ret, size);
 
 	return (ret);
 }
diff --git a/contrib/jemalloc/src/chunk.c b/contrib/jemalloc/src/chunk.c
index aef3fede6dc..b17f43f0939 100644
--- a/contrib/jemalloc/src/chunk.c
+++ b/contrib/jemalloc/src/chunk.c
@@ -294,7 +294,7 @@ label_return:
 	if (xnode != NULL)
 		base_node_dealloc(xnode);
 	if (xprev != NULL)
-		base_node_dealloc(prev);
+		base_node_dealloc(xprev);
 }
 
 void
diff --git a/contrib/jemalloc/src/ctl.c b/contrib/jemalloc/src/ctl.c
index f2ef4e60611..ebba7c25997 100644
--- a/contrib/jemalloc/src/ctl.c
+++ b/contrib/jemalloc/src/ctl.c
@@ -546,43 +546,30 @@ ctl_arena_refresh(arena_t *arena, unsigned i)
 static bool
 ctl_grow(void)
 {
-	size_t astats_size;
 	ctl_arena_stats_t *astats;
 	arena_t **tarenas;
 
-	/* Extend arena stats and arenas arrays. */
-	astats_size = (ctl_stats.narenas + 2) * sizeof(ctl_arena_stats_t);
-	if (ctl_stats.narenas == narenas_auto) {
-		/* ctl_stats.arenas and arenas came from base_alloc(). */
-		astats = (ctl_arena_stats_t *)imalloc(astats_size);
-		if (astats == NULL)
-			return (true);
-		memcpy(astats, ctl_stats.arenas, (ctl_stats.narenas + 1) *
-		    sizeof(ctl_arena_stats_t));
-
-		tarenas = (arena_t **)imalloc((ctl_stats.narenas + 1) *
-		    sizeof(arena_t *));
-		if (tarenas == NULL) {
-			idalloc(astats);
-			return (true);
-		}
-		memcpy(tarenas, arenas, ctl_stats.narenas * sizeof(arena_t *));
-	} else {
-		astats = (ctl_arena_stats_t *)iralloc(ctl_stats.arenas,
-		    astats_size, 0, 0, false, false);
-		if (astats == NULL)
-			return (true);
-
-		tarenas = (arena_t **)iralloc(arenas, (ctl_stats.narenas + 1) *
-		    sizeof(arena_t *), 0, 0, false, false);
-		if (tarenas == NULL)
-			return (true);
-	}
-	/* Initialize the new astats and arenas elements. */
-	memset(&astats[ctl_stats.narenas + 1], 0, sizeof(ctl_arena_stats_t));
-	if (ctl_arena_init(&astats[ctl_stats.narenas + 1]))
+	/* Allocate extended arena stats and arenas arrays. */
+	astats = (ctl_arena_stats_t *)imalloc((ctl_stats.narenas + 2) *
+	    sizeof(ctl_arena_stats_t));
+	if (astats == NULL)
 		return (true);
-	tarenas[ctl_stats.narenas] = NULL;
+	tarenas = (arena_t **)imalloc((ctl_stats.narenas + 1) *
+	    sizeof(arena_t *));
+	if (tarenas == NULL) {
+		idalloc(astats);
+		return (true);
+	}
+
+	/* Initialize the new astats element. */
+	memcpy(astats, ctl_stats.arenas, (ctl_stats.narenas + 1) *
+	    sizeof(ctl_arena_stats_t));
+	memset(&astats[ctl_stats.narenas + 1], 0, sizeof(ctl_arena_stats_t));
+	if (ctl_arena_init(&astats[ctl_stats.narenas + 1])) {
+		idalloc(tarenas);
+		idalloc(astats);
+		return (true);
+	}
 	/* Swap merged stats to their new location. */
 	{
 		ctl_arena_stats_t tstats;
@@ -593,13 +580,34 @@ ctl_grow(void)
 		memcpy(&astats[ctl_stats.narenas + 1], &tstats,
 		    sizeof(ctl_arena_stats_t));
 	}
+	/* Initialize the new arenas element. */
+	tarenas[ctl_stats.narenas] = NULL;
+	{
+		arena_t **arenas_old = arenas;
+		/*
+		 * Swap extended arenas array into place.  Although ctl_mtx
+		 * protects this function from other threads extending the
+		 * array, it does not protect from other threads mutating it
+		 * (i.e. initializing arenas and setting array elements to
+		 * point to them).  Therefore, array copying must happen under
+		 * the protection of arenas_lock.
+		 */
+		malloc_mutex_lock(&arenas_lock);
+		arenas = tarenas;
+		memcpy(arenas, arenas_old, ctl_stats.narenas *
+		    sizeof(arena_t *));
+		narenas_total++;
+		arenas_extend(narenas_total - 1);
+		malloc_mutex_unlock(&arenas_lock);
+		/*
+		 * Deallocate arenas_old only if it came from imalloc() (not
+		 * base_alloc()).
+		 */
+		if (ctl_stats.narenas != narenas_auto)
+			idalloc(arenas_old);
+	}
 	ctl_stats.arenas = astats;
 	ctl_stats.narenas++;
-	malloc_mutex_lock(&arenas_lock);
-	arenas = tarenas;
-	narenas_total++;
-	arenas_extend(narenas_total - 1);
-	malloc_mutex_unlock(&arenas_lock);
 
 	return (false);
 }
@@ -1109,7 +1117,7 @@ epoch_ctl(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp,
     void *newp, size_t newlen)
 {
 	int ret;
-	uint64_t newval;
+	UNUSED uint64_t newval;
 
 	malloc_mutex_lock(&ctl_mtx);
 	WRITE(newval, uint64_t);
diff --git a/contrib/jemalloc/src/jemalloc.c b/contrib/jemalloc/src/jemalloc.c
index 352c98e0b6f..1412a5e409b 100644
--- a/contrib/jemalloc/src/jemalloc.c
+++ b/contrib/jemalloc/src/jemalloc.c
@@ -286,7 +286,7 @@ arenas_cleanup(void *arg)
 	malloc_mutex_unlock(&arenas_lock);
 }
 
-static JEMALLOC_ATTR(always_inline) void
+JEMALLOC_ALWAYS_INLINE_C void
 malloc_thread_init(void)
 {
 
@@ -303,7 +303,7 @@ malloc_thread_init(void)
 		quarantine_alloc_hook();
 }
 
-static JEMALLOC_ATTR(always_inline) bool
+JEMALLOC_ALWAYS_INLINE_C bool
 malloc_init(void)
 {
 
@@ -440,8 +440,9 @@ malloc_conf_init(void)
 			}
 			break;
 		case 1: {
+			int linklen = 0;
 #ifndef _WIN32
-			int linklen;
+			int saved_errno = errno;
 			const char *linkname =
 #  ifdef JEMALLOC_PREFIX
 			    "/etc/"JEMALLOC_PREFIX"malloc.conf"
@@ -450,21 +451,20 @@ malloc_conf_init(void)
 #  endif
 			    ;
 
-			if ((linklen = readlink(linkname, buf,
-			    sizeof(buf) - 1)) != -1) {
-				/*
-				 * Use the contents of the "/etc/malloc.conf"
-				 * symbolic link's name.
-				 */
-				buf[linklen] = '\0';
-				opts = buf;
-			} else
-#endif
-			{
+			/*
+			 * Try to use the contents of the "/etc/malloc.conf"
+			 * symbolic link's name.
+			 */
+			linklen = readlink(linkname, buf, sizeof(buf) - 1);
+			if (linklen == -1) {
 				/* No configuration specified. */
-				buf[0] = '\0';
-				opts = buf;
+				linklen = 0;
+				/* restore errno */
+				set_errno(saved_errno);
 			}
+#endif
+			buf[linklen] = '\0';
+			opts = buf;
 			break;
 		} case 2: {
 			const char *envname =
@@ -1407,7 +1407,7 @@ je_mallctlbymib(const size_t *mib, size_t miblen, void *oldp, size_t *oldlenp,
  */
 #ifdef JEMALLOC_EXPERIMENTAL
 
-static JEMALLOC_ATTR(always_inline) void *
+JEMALLOC_ALWAYS_INLINE_C void *
 iallocm(size_t usize, size_t alignment, bool zero, bool try_tcache,
     arena_t *arena)
 {
diff --git a/contrib/libc++/include/memory b/contrib/libc++/include/memory
index ffd0cd0ce77..345154638d0 100644
--- a/contrib/libc++/include/memory
+++ b/contrib/libc++/include/memory
@@ -965,13 +965,13 @@ public:
 
 namespace __has_pointer_type_imp
 {
-    template <class _Up> static __two test(...);
-    template <class _Up> static char test(typename _Up::pointer* = 0);
+    template <class _Up> static __two __test(...);
+    template <class _Up> static char __test(typename _Up::pointer* = 0);
 }
 
 template <class _Tp>
 struct __has_pointer_type
-    : public integral_constant<bool, sizeof(__has_pointer_type_imp::test<_Tp>(0)) == 1>
+    : public integral_constant<bool, sizeof(__has_pointer_type_imp::__test<_Tp>(0)) == 1>
 {
 };
 
diff --git a/contrib/libcxxrt/typeinfo.cc b/contrib/libcxxrt/typeinfo.cc
index fda5196e307..d36140644f0 100644
--- a/contrib/libcxxrt/typeinfo.cc
+++ b/contrib/libcxxrt/typeinfo.cc
@@ -35,15 +35,23 @@ type_info::~type_info() {}
 
 bool type_info::operator==(const type_info &other) const
 {
+#ifdef LIBCXXRT_MERGED_TYPEINFO	
 	return __type_name == other.__type_name;
+#else
+	return __type_name == other.__type_name || strcmp(__type_name, other.__type_name) == 0;
+#endif
 }
 bool type_info::operator!=(const type_info &other) const
 {
-	return __type_name != other.__type_name;
+	return !operator==(other);
 }
 bool type_info::before(const type_info &other) const
 {
+#ifdef LIBCXXRT_MERGED_TYPEINFO
 	return __type_name < other.__type_name;
+#else
+	return strcmp(__type_name, other.__type_name) < 0;
+#endif
 }
 const char* type_info::name() const
 {
diff --git a/contrib/libexecinfo/backtrace.c b/contrib/libexecinfo/backtrace.c
index 756a9825561..7dbf0bbb175 100644
--- a/contrib/libexecinfo/backtrace.c
+++ b/contrib/libexecinfo/backtrace.c
@@ -89,7 +89,7 @@ rasprintf(char **buf, size_t *bufsiz, size_t offs, const char *fmt, ...)
 			len = vsnprintf(*buf + offs, *bufsiz - offs, fmt, ap);
 			va_end(ap);
 
-			if (len < 0 || (size_t)len < *bufsiz - offs)
+			if (len < 0 || (size_t)len + 1 < *bufsiz - offs)
 				return len;
 			nbufsiz = MAX(*bufsiz + 512, (size_t)len + 1);
 		} else
diff --git a/contrib/libpcap/bpf/net/bpf_filter.c b/contrib/libpcap/bpf/net/bpf_filter.c
index be0662e2ee3..0c4fb006165 100644
--- a/contrib/libpcap/bpf/net/bpf_filter.c
+++ b/contrib/libpcap/bpf/net/bpf_filter.c
@@ -209,8 +209,8 @@ m_xhalf(m, k, err)
  */
 u_int
 bpf_filter(pc, p, wirelen, buflen)
-	register struct bpf_insn *pc;
-	register u_char *p;
+	register const struct bpf_insn *pc;
+	register const u_char *p;
 	u_int wirelen;
 	register u_int buflen;
 {
diff --git a/contrib/libpcap/bpf_dump.c b/contrib/libpcap/bpf_dump.c
index 38f88db730b..e4ff4a23923 100644
--- a/contrib/libpcap/bpf_dump.c
+++ b/contrib/libpcap/bpf_dump.c
@@ -31,7 +31,7 @@ static const char rcsid[] _U_ =
 #include <stdio.h>
 
 void
-bpf_dump(struct bpf_program *p, int option)
+bpf_dump(const struct bpf_program *p, int option)
 {
 	const struct bpf_insn *insn;
 	int i;
diff --git a/contrib/libpcap/bpf_image.c b/contrib/libpcap/bpf_image.c
index 3c801216ab6..e6c0f626174 100644
--- a/contrib/libpcap/bpf_image.c
+++ b/contrib/libpcap/bpf_image.c
@@ -53,7 +53,7 @@ static const char rcsid[] _U_ =
 
 char *
 bpf_image(p, n)
-	struct bpf_insn *p;
+	const struct bpf_insn *p;
 	int n;
 {
 	int v;
diff --git a/contrib/libpcap/grammar.y b/contrib/libpcap/grammar.y
index ac69db9f9b8..12a326e32f6 100644
--- a/contrib/libpcap/grammar.y
+++ b/contrib/libpcap/grammar.y
@@ -56,7 +56,7 @@ struct rtentry;
 #include "gencode.h"
 #ifdef HAVE_NET_PFVAR_H
 #include <net/if.h>
-#include <net/pfvar.h>
+#include <netpfil/pf/pf.h>
 #include <net/if_pflog.h>
 #endif
 #include "ieee80211.h"
diff --git a/contrib/libpcap/pcap/bpf.h b/contrib/libpcap/pcap/bpf.h
index 23f85c78e28..8576bbdbd02 100644
--- a/contrib/libpcap/pcap/bpf.h
+++ b/contrib/libpcap/pcap/bpf.h
@@ -1285,7 +1285,7 @@ struct bpf_insn {
 
 #if __STDC__ || defined(__cplusplus)
 extern int bpf_validate(const struct bpf_insn *, int);
-extern u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int);
+extern u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int);
 #else
 extern int bpf_validate();
 extern u_int bpf_filter();
diff --git a/contrib/libpcap/pcap/pcap.h b/contrib/libpcap/pcap/pcap.h
index 6248e9f7256..72f0d28c8e2 100644
--- a/contrib/libpcap/pcap/pcap.h
+++ b/contrib/libpcap/pcap/pcap.h
@@ -409,11 +409,11 @@ const char *pcap_lib_version(void);
  * declared when we build pcap-bpf.c.
  */
 #ifndef __NetBSD__
-u_int	bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); 
+u_int	bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); 
 #endif
 int	bpf_validate(const struct bpf_insn *f, int len);
-char	*bpf_image(struct bpf_insn *, int);
-void	bpf_dump(struct bpf_program *, int);
+char	*bpf_image(const struct bpf_insn *, int);
+void	bpf_dump(const struct bpf_program *, int);
 
 #if defined(WIN32)
 
diff --git a/contrib/libreadline/bind.c b/contrib/libreadline/bind.c
index 08c906bfcc3..2330a58da94 100644
--- a/contrib/libreadline/bind.c
+++ b/contrib/libreadline/bind.c
@@ -442,7 +442,7 @@ rl_translate_keyseq (seq, array, len)
 {
   register int i, c, l, temp;
 
-  for (i = l = 0; c = seq[i]; i++)
+  for (i = l = 0; (c = seq[i]); i++)
     {
       if (c == '\\')
 	{
@@ -1185,7 +1185,7 @@ rl_parse_and_bind (string)
     {
       int passc = 0;
 
-      for (i = 1; c = string[i]; i++)
+      for (i = 1; (c = string[i]); i++)
 	{
 	  if (passc)
 	    {
@@ -1276,7 +1276,7 @@ rl_parse_and_bind (string)
       int delimiter, passc;
 
       delimiter = string[i++];
-      for (passc = 0; c = string[i]; i++)
+      for (passc = 0; (c = string[i]); i++)
 	{
 	  if (passc)
 	    {
@@ -2048,7 +2048,7 @@ rl_function_dumper (print_readably)
 
   fprintf (rl_outstream, "\n");
 
-  for (i = 0; name = names[i]; i++)
+  for (i = 0; (name = names[i]); i++)
     {
       rl_command_func_t *function;
       char **invokers;
diff --git a/contrib/libreadline/complete.c b/contrib/libreadline/complete.c
index 9a930a1a040..b3bdc79bbf3 100644
--- a/contrib/libreadline/complete.c
+++ b/contrib/libreadline/complete.c
@@ -884,7 +884,7 @@ _rl_find_completion_word (fp, dp)
       /* We didn't find an unclosed quoted substring upon which to do
          completion, so use the word break characters to find the
          substring on which to complete. */
-      while (rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY))
+      while ((rl_point = MB_PREVCHAR (rl_line_buffer, rl_point, MB_FIND_ANY)))
 	{
 	  scan = rl_line_buffer[rl_point];
 
@@ -1803,7 +1803,7 @@ rl_completion_matches (text, entry_function)
   match_list = (char **)xmalloc ((match_list_size + 1) * sizeof (char *));
   match_list[1] = (char *)NULL;
 
-  while (string = (*entry_function) (text, matches))
+  while ((string = (*entry_function) (text, matches)))
     {
       if (matches + 1 == match_list_size)
 	match_list = (char **)xrealloc
@@ -1854,7 +1854,7 @@ rl_username_completion_function (text, state)
     }
 
 #if defined (HAVE_GETPWENT)
-  while (entry = getpwent ())
+  while ((entry = getpwent ()))
     {
       /* Null usernames should result in all users as possible completions. */
       if (namelen == 0 || (STREQN (username, entry->pw_name, namelen)))
diff --git a/contrib/libreadline/display.c b/contrib/libreadline/display.c
index 728364fbab0..bab04d77695 100644
--- a/contrib/libreadline/display.c
+++ b/contrib/libreadline/display.c
@@ -392,14 +392,14 @@ rl_expand_prompt (prompt)
       t = ++p;
       local_prompt = expand_prompt (p, &prompt_visible_length,
 				       &prompt_last_invisible,
-				       (int *)NULL,
+				       &prompt_invis_chars_first_line,
 				       &prompt_physical_chars);
       c = *t; *t = '\0';
       /* The portion of the prompt string up to and including the
 	 final newline is now null-terminated. */
       local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
 						   (int *)NULL,
-						   &prompt_invis_chars_first_line,
+						   (int *)NULL,
 						   (int *)NULL);
       *t = c;
       local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
@@ -911,6 +911,10 @@ rl_redisplay ()
 	     second and subsequent lines start at inv_lbreaks[N], offset by
 	     OFFSET (which has already been calculated above).  */
 
+#define INVIS_FIRST()	(prompt_physical_chars > _rl_screenwidth ? prompt_invis_chars_first_line : wrap_offset)
+#define WRAP_OFFSET(line, offset)  ((line == 0) \
+					? (offset ? INVIS_FIRST() : 0) \
+					: ((line == prompt_last_screen_line) ? wrap_offset-prompt_invis_chars_first_line : 0))
 #define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
 #define VIS_LLEN(l)	((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l]))
 #define INV_LLEN(l)	(inv_lbreaks[l+1] - inv_lbreaks[l])
@@ -945,7 +949,13 @@ rl_redisplay ()
 		  _rl_last_c_pos != o_cpos &&
 		  _rl_last_c_pos > wrap_offset &&
 		  o_cpos < prompt_last_invisible)
-		_rl_last_c_pos -= wrap_offset;
+		_rl_last_c_pos -= prompt_invis_chars_first_line;	/* XXX - was wrap_offset */
+	      else if (linenum == prompt_last_screen_line && prompt_physical_chars > _rl_screenwidth &&
+			(MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
+			cpos_adjusted == 0 &&
+			_rl_last_c_pos != o_cpos &&
+			_rl_last_c_pos > (prompt_last_invisible - _rl_screenwidth - prompt_invis_chars_first_line))
+		_rl_last_c_pos -= (wrap_offset-prompt_invis_chars_first_line);
 		  
 	      /* If this is the line with the prompt, we might need to
 		 compensate for invisible characters in the new line. Do
@@ -1049,7 +1059,7 @@ rl_redisplay ()
 		tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
 	      else
 		tx = nleft;
-	      if (_rl_last_c_pos > tx)
+	      if (tx >= 0 && _rl_last_c_pos > tx)
 		{
 	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
 	          _rl_last_c_pos = tx;
@@ -1205,7 +1215,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
      int current_line, omax, nmax, inv_botlin;
 {
   register char *ofd, *ols, *oe, *nfd, *nls, *ne;
-  int temp, lendiff, wsatend, od, nd;
+  int temp, lendiff, wsatend, od, nd, twidth, o_cpos;
   int current_invis_chars;
   int col_lendiff, col_temp;
 #if defined (HANDLE_MULTIBYTE)
@@ -1221,7 +1231,7 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
     temp = _rl_last_c_pos;
   else
-    temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
+    temp = _rl_last_c_pos - WRAP_OFFSET (_rl_last_v_pos, visible_wrap_offset);
   if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
 	&& _rl_last_v_pos == current_line - 1)
     {
@@ -1466,6 +1476,8 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
 	_rl_last_c_pos = lendiff;
     }
 
+  o_cpos = _rl_last_c_pos;
+
   /* When this function returns, _rl_last_c_pos is correct, and an absolute
      cursor postion in multibyte mode, but a buffer index when not in a
      multibyte locale. */
@@ -1475,7 +1487,9 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
   /* We need to indicate that the cursor position is correct in the presence of
      invisible characters in the prompt string.  Let's see if setting this when
      we make sure we're at the end of the drawn prompt string works. */
-  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
+  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
+      (_rl_last_c_pos > 0 || o_cpos > 0) &&
+      _rl_last_c_pos == prompt_physical_chars)
     cpos_adjusted = 1;
 #endif
 #endif
@@ -1566,11 +1580,16 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
 	    }
 	  else
 	    {
-	      /* We have horizontal scrolling and we are not inserting at
-		 the end.  We have invisible characters in this line.  This
-		 is a dumb update. */
 	      _rl_output_some_chars (nfd, temp);
 	      _rl_last_c_pos += col_temp;
+	      /* If nfd begins before any invisible characters in the prompt,
+		 adjust _rl_last_c_pos to account for wrap_offset and set
+		 cpos_adjusted to let the caller know. */
+	      if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
+		{
+		  _rl_last_c_pos -= wrap_offset;
+		  cpos_adjusted = 1;
+		}
 	      return;
 	    }
 	  /* Copy (new) chars to screen from first diff to last match. */
@@ -1578,15 +1597,15 @@ update_line (old, new, current_line, omax, nmax, inv_botlin)
 	  if ((temp - lendiff) > 0)
 	    {
 	      _rl_output_some_chars (nfd + lendiff, temp - lendiff);
-#if 1
 	     /* XXX -- this bears closer inspection.  Fixes a redisplay bug
 		reported against bash-3.0-alpha by Andreas Schwab involving
 		multibyte characters and prompt strings with invisible
 		characters, but was previously disabled. */
-	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
-#else
-	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
-#endif
+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+		twidth = _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
+	      else
+		twidth = temp - lendiff;
+	      _rl_last_c_pos += twidth;
 	    }
 	}
       else
@@ -1780,7 +1799,7 @@ _rl_move_cursor_relative (new, data)
   int woff;			/* number of invisible chars on current line */
   int cpos, dpos;		/* current and desired cursor positions */
 
-  woff = W_OFFSET (_rl_last_v_pos, wrap_offset);
+  woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
   cpos = _rl_last_c_pos;
 #if defined (HANDLE_MULTIBYTE)
   /* If we have multibyte characters, NEW is indexed by the buffer point in
@@ -1794,7 +1813,11 @@ _rl_move_cursor_relative (new, data)
       /* Use NEW when comparing against the last invisible character in the
 	 prompt string, since they're both buffer indices and DPOS is a
 	 desired display position. */
-      if (new > prompt_last_invisible)		/* XXX - don't use woff here */
+      if ((new > prompt_last_invisible) ||		/* XXX - don't use woff here */
+	  (prompt_physical_chars > _rl_screenwidth &&
+	   _rl_last_v_pos == prompt_last_screen_line &&
+	   wrap_offset != woff &&
+	   new > (prompt_last_invisible-_rl_screenwidth-wrap_offset)))
 	{
 	  dpos -= woff;
 	  /* Since this will be assigned to _rl_last_c_pos at the end (more
diff --git a/contrib/libreadline/histexpand.c b/contrib/libreadline/histexpand.c
index f46c0b2a45d..eae8ed2c85d 100644
--- a/contrib/libreadline/histexpand.c
+++ b/contrib/libreadline/histexpand.c
@@ -203,7 +203,7 @@ get_history_event (string, caller_index, delimiting_quote)
     }
 
   /* Only a closing `?' or a newline delimit a substring search string. */
-  for (local_index = i; c = string[i]; i++)
+  for (local_index = i; (c = string[i]); i++)
     {
 #if defined (HANDLE_MULTIBYTE)
       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
diff --git a/contrib/libreadline/history.c b/contrib/libreadline/history.c
index 1ccf4db786c..a1a83811b66 100644
--- a/contrib/libreadline/history.c
+++ b/contrib/libreadline/history.c
@@ -306,7 +306,7 @@ add_history (string)
 	}
     }
 
-  temp = alloc_history_entry (string, hist_inittime ());
+  temp = alloc_history_entry ((char *)string, hist_inittime ());
 
   the_history[history_length] = (HIST_ENTRY *)NULL;
   the_history[history_length - 1] = temp;
diff --git a/contrib/libreadline/input.c b/contrib/libreadline/input.c
index b91548e5198..a84038b339f 100644
--- a/contrib/libreadline/input.c
+++ b/contrib/libreadline/input.c
@@ -154,7 +154,7 @@ _rl_unget_char (key)
     {
       pop_index--;
       if (pop_index < 0)
-	pop_index = ibuffer_len - 1;
+	pop_index = ibuffer_len;
       ibuffer[pop_index] = key;
       return (1);
     }
@@ -428,7 +428,7 @@ rl_read_key ()
   else
     {
       /* If input is coming from a macro, then use that. */
-      if (c = _rl_next_macro_key ())
+      if ((c = _rl_next_macro_key ()))
 	return (c);
 
       /* If the user has an event function, then call it periodically. */
diff --git a/contrib/libreadline/search.c b/contrib/libreadline/search.c
index 33cc4fc1e73..dd8ae13e139 100644
--- a/contrib/libreadline/search.c
+++ b/contrib/libreadline/search.c
@@ -211,7 +211,11 @@ _rl_nsearch_init (dir, pchar)
   rl_end = rl_point = 0;
 
   p = _rl_make_prompt_for_search (pchar ? pchar : ':');
+#if defined (PREFER_STDARG)
+  rl_message ("%s", p);
+#else
   rl_message ("%s", p, 0);
+#endif
   free (p);
 
   RL_SETSTATE(RL_STATE_NSEARCH);
diff --git a/contrib/libreadline/support/shobj-conf b/contrib/libreadline/support/shobj-conf
index ef7863a3bc4..358b27815cc 100755
--- a/contrib/libreadline/support/shobj-conf
+++ b/contrib/libreadline/support/shobj-conf
@@ -10,7 +10,7 @@
 # Chet Ramey
 # chet@po.cwru.edu
 
-# Copyright (C) 1996-2002 Free Software Foundation, Inc.
+# Copyright (C) 1996-2007 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -114,7 +114,7 @@ linux*-*|gnu*-*|k*bsd*-gnu-*)
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
 	;;
 
-freebsd2* | netbsd*)
+freebsd2*)
 	SHOBJ_CFLAGS=-fpic
 	SHOBJ_LD=ld
 	SHOBJ_LDFLAGS='-x -Bshareable'
@@ -125,7 +125,7 @@ freebsd2* | netbsd*)
 
 # FreeBSD-3.x ELF
 freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
-	SHOBJ_CFLAGS=-fpic
+	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
 
 	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
@@ -142,7 +142,7 @@ freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
 	;;
 
 # Darwin/MacOS X
-darwin8*)
+darwin[89]*)
 	SHOBJ_STATUS=supported
 	SHLIB_STATUS=supported
 	
@@ -153,7 +153,7 @@ darwin8*)
 	SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
 	SHLIB_LIBSUFF='dylib'
 
-	SHOBJ_LDFLAGS='-undefined dynamic_lookup'
+	SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
 	SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
 
 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
@@ -171,7 +171,7 @@ darwin*|macosx*)
 	SHLIB_LIBSUFF='dylib'
 
 	case "${host_os}" in
-	darwin[78]*)	SHOBJ_LDFLAGS=''
+	darwin[789]*)	SHOBJ_LDFLAGS=''
 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
 			;;
 	*)		SHOBJ_LDFLAGS='-dynamic'
@@ -182,7 +182,7 @@ darwin*|macosx*)
 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
 	;;
 
-openbsd*)
+openbsd*|netbsd*)
 	SHOBJ_CFLAGS=-fPIC
 	SHOBJ_LD='${CC}'
 	SHOBJ_LDFLAGS='-shared'
@@ -247,7 +247,7 @@ osf*)
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
 	;;
 
-aix4.[2-9]*-*gcc*)		# lightly tested by jik@cisco.com
+aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*)		# lightly tested by jik@cisco.com
 	SHOBJ_CFLAGS=-fpic
 	SHOBJ_LD='ld'
 	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
@@ -258,7 +258,7 @@ aix4.[2-9]*-*gcc*)		# lightly tested by jik@cisco.com
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
 	;;
 
-aix4.[2-9]*)
+aix4.[2-9]*|aix[5-9].*)
 	SHOBJ_CFLAGS=-K
 	SHOBJ_LD='ld'
 	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
@@ -329,7 +329,7 @@ hpux10*-*gcc*)
 	SHOBJ_LD='${CC}'
 	# if you have problems linking here, moving the `-Wl,+h,$@' from
 	# SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work
-	SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s'
+	SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s'
 
 	SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)'
 	SHLIB_LIBSUFF='sl'
diff --git a/contrib/libreadline/tilde.c b/contrib/libreadline/tilde.c
index 1b76c9f2404..b59b5021961 100644
--- a/contrib/libreadline/tilde.c
+++ b/contrib/libreadline/tilde.c
@@ -196,7 +196,7 @@ tilde_expand (string)
   int result_size, result_index;
 
   result_index = result_size = 0;
-  if (result = strchr (string, '~'))
+  if ((result = strchr (string, '~')))
     result = (char *)xmalloc (result_size = (strlen (string) + 16));
   else
     result = (char *)xmalloc (result_size = (strlen (string) + 1));
diff --git a/contrib/libstdc++/include/bits/basic_string.h b/contrib/libstdc++/include/bits/basic_string.h
index dba1f566db5..90d2e2d5f42 100644
--- a/contrib/libstdc++/include/bits/basic_string.h
+++ b/contrib/libstdc++/include/bits/basic_string.h
@@ -390,6 +390,16 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       _S_copy_chars(_CharT* __p, const _CharT* __k1, const _CharT* __k2)
       { _M_copy(__p, __k1, __k2 - __k1); }
 
+      static int
+      _S_compare(size_type __x, size_type __y)
+      {
+         if (__x > __y)
+            return 1;
+         if (__x < __y)
+            return -1;
+         return 0;
+      }
+
       void
       _M_mutate(size_type __pos, size_type __len1, size_type __len2);
 
@@ -1934,7 +1944,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 
 	int __r = traits_type::compare(_M_data(), __str.data(), __len);
 	if (!__r)
-	  __r =  __size - __osize;
+	  __r =  _S_compare(__size, __osize);
 	return __r;
       }
 
diff --git a/contrib/libstdc++/include/bits/basic_string.tcc b/contrib/libstdc++/include/bits/basic_string.tcc
index c2798efac11..78428c1eff6 100644
--- a/contrib/libstdc++/include/bits/basic_string.tcc
+++ b/contrib/libstdc++/include/bits/basic_string.tcc
@@ -903,7 +903,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       const size_type __len = std::min(__n, __osize);
       int __r = traits_type::compare(_M_data() + __pos, __str.data(), __len);
       if (!__r)
-	__r = __n - __osize;
+	__r = _S_compare(__n, __osize);
       return __r;
     }
 
@@ -921,7 +921,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       int __r = traits_type::compare(_M_data() + __pos1,
 				     __str.data() + __pos2, __len);
       if (!__r)
-	__r = __n1 - __n2;
+	__r = _S_compare(__n1, __n2);
       return __r;
     }
 
@@ -936,7 +936,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       const size_type __len = std::min(__size, __osize);
       int __r = traits_type::compare(_M_data(), __s, __len);
       if (!__r)
-	__r = __size - __osize;
+	__r = _S_compare(__size, __osize);
       return __r;
     }
 
@@ -952,7 +952,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       const size_type __len = std::min(__n1, __osize);
       int __r = traits_type::compare(_M_data() + __pos, __s, __len);
       if (!__r)
-	__r = __n1 - __osize;
+	__r = _S_compare(__n1, __osize);
       return __r;
     }
 
@@ -968,7 +968,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
       const size_type __len = std::min(__n1, __n2);
       int __r = traits_type::compare(_M_data() + __pos, __s, __len);
       if (!__r)
-	__r = __n1 - __n2;
+	__r = _S_compare(__n1, __n2);
       return __r;
     }
 
diff --git a/contrib/libstdc++/include/bits/stl_algobase.h b/contrib/libstdc++/include/bits/stl_algobase.h
index 6f19febfe1e..2d89d0317c8 100644
--- a/contrib/libstdc++/include/bits/stl_algobase.h
+++ b/contrib/libstdc++/include/bits/stl_algobase.h
@@ -373,7 +373,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
    *  @param  first  An input iterator.
    *  @param  last   An input iterator.
    *  @param  result An output iterator.
-   *  @return   result + (first - last)
+   *  @return   result + (last - first)
    *
    *  This inline function will boil down to a call to @c memmove whenever
    *  possible.  Failing that, if random access iterators are passed, then the
diff --git a/contrib/libstdc++/include/bits/stl_tree.h b/contrib/libstdc++/include/bits/stl_tree.h
index 80cf7c4b08f..9e7a9ac31be 100644
--- a/contrib/libstdc++/include/bits/stl_tree.h
+++ b/contrib/libstdc++/include/bits/stl_tree.h
@@ -64,6 +64,8 @@
 #ifndef _TREE_H
 #define _TREE_H 1
 
+#pragma GCC system_header
+
 #include <bits/stl_algobase.h>
 #include <bits/allocator.h>
 #include <bits/stl_construct.h>
diff --git a/contrib/libstdc++/include/bits/stl_vector.h b/contrib/libstdc++/include/bits/stl_vector.h
index 1b794dc28ee..60e352cad74 100644
--- a/contrib/libstdc++/include/bits/stl_vector.h
+++ b/contrib/libstdc++/include/bits/stl_vector.h
@@ -119,9 +119,12 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD)
       _Vector_base(size_t __n, const allocator_type& __a)
       : _M_impl(__a)
       {
-	this->_M_impl._M_start = this->_M_allocate(__n);
-	this->_M_impl._M_finish = this->_M_impl._M_start;
-	this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
+	  if (__n)
+	  {
+	    this->_M_impl._M_start = this->_M_allocate(__n);
+	    this->_M_impl._M_finish = this->_M_impl._M_start;
+	    this->_M_impl._M_end_of_storage = this->_M_impl._M_start + __n;
+	  }
       }
 
       ~_Vector_base()
diff --git a/contrib/libstdc++/include/ext/hashtable.h b/contrib/libstdc++/include/ext/hashtable.h
index 233806fb745..b3f98df2e77 100644
--- a/contrib/libstdc++/include/ext/hashtable.h
+++ b/contrib/libstdc++/include/ext/hashtable.h
@@ -210,10 +210,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     };
 
   // Note: assumes long is at least 32 bits.
-  enum { _S_num_primes = 28 };
+  enum { _S_num_primes = 29 };
 
   static const unsigned long __stl_prime_list[_S_num_primes] =
     {
+      5ul,          // 5ul mini size is a Google addition
       53ul,         97ul,         193ul,       389ul,       769ul,
       1543ul,       3079ul,       6151ul,      12289ul,     24593ul,
       49157ul,      98317ul,      196613ul,    393241ul,    786433ul,
@@ -1076,6 +1077,10 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     hashtable<_Val, _Key, _HF, _Ex, _Eq, _All>::
     clear()
     {
+      // Google addition: do not iterate over buckets when empty
+      if (_M_num_elements == 0)
+        return;
+
       for (size_type __i = 0; __i < _M_buckets.size(); ++__i)
 	{
 	  _Node* __cur = _M_buckets[__i];
diff --git a/contrib/libstdc++/include/ext/mt_allocator.h b/contrib/libstdc++/include/ext/mt_allocator.h
index bc2d61f6eec..bfd9197e0dd 100644
--- a/contrib/libstdc++/include/ext/mt_allocator.h
+++ b/contrib/libstdc++/include/ext/mt_allocator.h
@@ -342,12 +342,12 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       { return _M_bin[__which]; }
       
       void
-      _M_adjust_freelist(const _Bin_record& __bin, _Block_record* __block, 
+      _M_adjust_freelist(const _Bin_record& __bin, _Block_record* __block_record, 
 			 size_t __thread_id)
       {
 	if (__gthread_active_p())
 	  {
-	    __block->_M_thread_id = __thread_id;
+	    __block_record->_M_thread_id = __thread_id;
 	    --__bin._M_free[__thread_id];
 	    ++__bin._M_used[__thread_id];
 	  }
@@ -697,11 +697,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	{
 	  // Already reserved.
 	  typedef typename __pool_type::_Block_record _Block_record;
-	  _Block_record* __block = __bin._M_first[__thread_id];
-	  __bin._M_first[__thread_id] = __block->_M_next;
+	  _Block_record* __block_record = __bin._M_first[__thread_id];
+	  __bin._M_first[__thread_id] = __block_record->_M_next;
 	  
-	  __pool._M_adjust_freelist(__bin, __block, __thread_id);
-	  __c = reinterpret_cast<char*>(__block) + __pool._M_get_align();
+	  __pool._M_adjust_freelist(__bin, __block_record, __thread_id);
+	  __c = reinterpret_cast<char*>(__block_record) + __pool._M_get_align();
 	}
       else
 	{
diff --git a/contrib/libstdc++/include/ext/throw_allocator.h b/contrib/libstdc++/include/ext/throw_allocator.h
index 5886afc7989..8862153ed7e 100644
--- a/contrib/libstdc++/include/ext/throw_allocator.h
+++ b/contrib/libstdc++/include/ext/throw_allocator.h
@@ -423,11 +423,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     s += buf;
     s += tab;
     s += "label: ";
-    sprintf(buf, "%u", ref.second.first);
+    sprintf(buf, "%lu", ref.second.first);
     s += buf;
     s += tab;
     s += "size: ";
-    sprintf(buf, "%u", ref.second.second);
+    sprintf(buf, "%lu", ref.second.second);
     s += buf;
     s += '\n';
   }
diff --git a/contrib/libstdc++/libsupc++/eh_alloc.cc b/contrib/libstdc++/libsupc++/eh_alloc.cc
index 217a8cd8043..4233502deef 100644
--- a/contrib/libstdc++/libsupc++/eh_alloc.cc
+++ b/contrib/libstdc++/libsupc++/eh_alloc.cc
@@ -78,6 +78,14 @@ using namespace __cxxabiv1;
 # define EMERGENCY_OBJ_COUNT	4
 #endif
 
+/* APPLE LOCAL begin reduce emergency buffer size */
+/* 256 bytes is more than large enough for an std::bad_alloc object */
+#undef EMERGENCY_OBJ_SIZE
+#undef EMERGENCY_OBJ_COUNT
+#define EMERGENCY_OBJ_SIZE 256
+#define EMERGENCY_OBJ_COUNT 2
+/* APPLE LOCAL end reduce emergency buffer size */
+
 #if INT_MAX == 32767 || EMERGENCY_OBJ_COUNT <= 32
 typedef unsigned int bitmask_type;
 #else
diff --git a/contrib/libstdc++/src/mt_allocator.cc b/contrib/libstdc++/src/mt_allocator.cc
index da0b09cef21..6738953e92a 100644
--- a/contrib/libstdc++/src/mt_allocator.cc
+++ b/contrib/libstdc++/src/mt_allocator.cc
@@ -107,11 +107,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     _Bin_record& __bin = _M_bin[__which];
 
     char* __c = __p - _M_get_align();
-    _Block_record* __block = reinterpret_cast<_Block_record*>(__c);
+    _Block_record* __block_record = reinterpret_cast<_Block_record*>(__c);
       
     // Single threaded application - return to global pool.
-    __block->_M_next = __bin._M_first[0];
-    __bin._M_first[0] = __block;
+    __block_record->_M_next = __bin._M_first[0];
+    __bin._M_first[0] = __block_record;
   }
 
   char* 
@@ -134,22 +134,22 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     __bin._M_address = __address;
 
     char* __c = static_cast<char*>(__v) + sizeof(_Block_address);
-    _Block_record* __block = reinterpret_cast<_Block_record*>(__c);
-    __bin._M_first[__thread_id] = __block;
+    _Block_record* __block_record = reinterpret_cast<_Block_record*>(__c);
+    __bin._M_first[__thread_id] = __block_record;
     while (--__block_count > 0)
       {
 	__c += __bin_size;
-	__block->_M_next = reinterpret_cast<_Block_record*>(__c);
-	__block = __block->_M_next;
+	__block_record->_M_next = reinterpret_cast<_Block_record*>(__c);
+	__block_record = __block_record->_M_next;
       }
-    __block->_M_next = NULL;
+    __block_record->_M_next = NULL;
 
-    __block = __bin._M_first[__thread_id];
-    __bin._M_first[__thread_id] = __block->_M_next;
+    __block_record = __bin._M_first[__thread_id];
+    __bin._M_first[__thread_id] = __block_record->_M_next;
 
     // NB: For alignment reasons, we can't use the first _M_align
     // bytes, even when sizeof(_Block_record) < _M_align.
-    return reinterpret_cast<char*>(__block) + __options._M_align;
+    return reinterpret_cast<char*>(__block_record) + __options._M_align;
   }
 
   void
@@ -256,7 +256,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
     // Know __p not null, assume valid block.
     char* __c = __p - _M_get_align();
-    _Block_record* __block = reinterpret_cast<_Block_record*>(__c);
+    _Block_record* __block_record = reinterpret_cast<_Block_record*>(__c);
     if (__gthread_active_p())
       {
 	// Calculate the number of records to remove from our freelist:
@@ -313,13 +313,13 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 
 	// Return this block to our list and update counters and
 	// owner id as needed.
-	if (__block->_M_thread_id == __thread_id)
+	if (__block_record->_M_thread_id == __thread_id)
 	  --__bin._M_used[__thread_id];
 	else
-	  __atomic_add(&__reclaimed_base[__block->_M_thread_id], 1);
+	  __atomic_add(&__reclaimed_base[__block_record->_M_thread_id], 1);
 
-	__block->_M_next = __bin._M_first[__thread_id];
-	__bin._M_first[__thread_id] = __block;
+	__block_record->_M_next = __bin._M_first[__thread_id];
+	__bin._M_first[__thread_id] = __block_record;
 	
 	++__bin._M_free[__thread_id];
       }
@@ -327,8 +327,8 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
       {
 	// Not using threads, so single threaded application - return
 	// to global pool.
-	__block->_M_next = __bin._M_first[0];
-	__bin._M_first[0] = __block;
+	__block_record->_M_next = __bin._M_first[0];
+	__bin._M_first[0] = __block_record;
       }
   }
 
@@ -354,7 +354,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
     //   blocks on global list (and if not add new ones) and
     //   get the first one.
     _Bin_record& __bin = _M_bin[__which];
-    _Block_record* __block = NULL;
+    _Block_record* __block_record = NULL;
     if (__gthread_active_p())
       {
 	// Resync the _M_used counters.
@@ -378,16 +378,16 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	    // No need to hold the lock when we are adding a whole
 	    // chunk to our own list.
 	    char* __c = static_cast<char*>(__v) + sizeof(_Block_address);
-	    __block = reinterpret_cast<_Block_record*>(__c);
+	    __block_record = reinterpret_cast<_Block_record*>(__c);
 	    __bin._M_free[__thread_id] = __block_count;
-	    __bin._M_first[__thread_id] = __block;
+	    __bin._M_first[__thread_id] = __block_record;
 	    while (--__block_count > 0)
 	      {
 		__c += __bin_size;
-		__block->_M_next = reinterpret_cast<_Block_record*>(__c);
-		__block = __block->_M_next;
+		__block_record->_M_next = reinterpret_cast<_Block_record*>(__c);
+		__block_record = __block_record->_M_next;
 	      }
-	    __block->_M_next = NULL;
+	    __block_record->_M_next = NULL;
 	  }
 	else
 	  {
@@ -405,11 +405,11 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	      {
 		__bin._M_free[__thread_id] = __block_count;
 		__bin._M_free[0] -= __block_count;
-		__block = __bin._M_first[0];
+		__block_record = __bin._M_first[0];
 		while (--__block_count > 0)
-		  __block = __block->_M_next;
-		__bin._M_first[0] = __block->_M_next;
-		__block->_M_next = NULL;
+		  __block_record = __block_record->_M_next;
+		__bin._M_first[0] = __block_record->_M_next;
+		__block_record->_M_next = NULL;
 	      }
 	    __gthread_mutex_unlock(__bin._M_mutex);
 	  }
@@ -423,30 +423,30 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
 	__bin._M_address = __address;
 
 	char* __c = static_cast<char*>(__v) + sizeof(_Block_address);
-	__block = reinterpret_cast<_Block_record*>(__c);
- 	__bin._M_first[0] = __block;
+	__block_record = reinterpret_cast<_Block_record*>(__c);
+ 	__bin._M_first[0] = __block_record;
 	while (--__block_count > 0)
 	  {
 	    __c += __bin_size;
-	    __block->_M_next = reinterpret_cast<_Block_record*>(__c);
-	    __block = __block->_M_next;
+	    __block_record->_M_next = reinterpret_cast<_Block_record*>(__c);
+	    __block_record = __block_record->_M_next;
 	  }
-	__block->_M_next = NULL;
+	__block_record->_M_next = NULL;
       }
       
-    __block = __bin._M_first[__thread_id];
-    __bin._M_first[__thread_id] = __block->_M_next;
+    __block_record = __bin._M_first[__thread_id];
+    __bin._M_first[__thread_id] = __block_record->_M_next;
 
     if (__gthread_active_p())
       {
-	__block->_M_thread_id = __thread_id;
+	__block_record->_M_thread_id = __thread_id;
 	--__bin._M_free[__thread_id];
 	++__bin._M_used[__thread_id];
       }
 
     // NB: For alignment reasons, we can't use the first _M_align
     // bytes, even when sizeof(_Block_record) < _M_align.
-    return reinterpret_cast<char*>(__block) + __options._M_align;
+    return reinterpret_cast<char*>(__block_record) + __options._M_align;
   }
 
   void
diff --git a/contrib/llvm/include/llvm/Support/Dwarf.h b/contrib/llvm/include/llvm/Support/Dwarf.h
index b52914f9385..2491b4c82e0 100644
--- a/contrib/llvm/include/llvm/Support/Dwarf.h
+++ b/contrib/llvm/include/llvm/Support/Dwarf.h
@@ -484,6 +484,9 @@ enum dwarf_constants {
   DW_OP_lo_user = 0xe0,
   DW_OP_hi_user = 0xff,
 
+  // Extensions for GNU-style thread-local storage.
+  DW_OP_GNU_push_tls_address = 0xe0,
+
   // Extensions for Fission proposal.
   DW_OP_GNU_addr_index = 0xfb,
   DW_OP_GNU_const_index = 0xfc,
diff --git a/contrib/llvm/include/llvm/Support/ELF.h b/contrib/llvm/include/llvm/Support/ELF.h
index c46dfebd379..70698995aa4 100644
--- a/contrib/llvm/include/llvm/Support/ELF.h
+++ b/contrib/llvm/include/llvm/Support/ELF.h
@@ -1468,7 +1468,81 @@ enum {
   DT_VERDEF       = 0X6FFFFFFC, // The address of the version definition table.
   DT_VERDEFNUM    = 0X6FFFFFFD, // The number of entries in DT_VERDEF.
   DT_VERNEED      = 0X6FFFFFFE, // The address of the version Dependency table.
-  DT_VERNEEDNUM   = 0X6FFFFFFF  // The number of entries in DT_VERNEED.
+  DT_VERNEEDNUM   = 0X6FFFFFFF, // The number of entries in DT_VERNEED.
+
+  // Mips specific dynamic table entry tags.
+  DT_MIPS_RLD_VERSION   = 0x70000001, // 32 bit version number for runtime
+                                      // linker interface.
+  DT_MIPS_TIME_STAMP    = 0x70000002, // Time stamp.
+  DT_MIPS_ICHECKSUM     = 0x70000003, // Checksum of external strings
+                                      // and common sizes.
+  DT_MIPS_IVERSION      = 0x70000004, // Index of version string
+                                      // in string table.
+  DT_MIPS_FLAGS         = 0x70000005, // 32 bits of flags.
+  DT_MIPS_BASE_ADDRESS  = 0x70000006, // Base address of the segment.
+  DT_MIPS_MSYM          = 0x70000007, // Address of .msym section.
+  DT_MIPS_CONFLICT      = 0x70000008, // Address of .conflict section.
+  DT_MIPS_LIBLIST       = 0x70000009, // Address of .liblist section.
+  DT_MIPS_LOCAL_GOTNO   = 0x7000000a, // Number of local global offset
+                                      // table entries.
+  DT_MIPS_CONFLICTNO    = 0x7000000b, // Number of entries
+                                      // in the .conflict section.
+  DT_MIPS_LIBLISTNO     = 0x70000010, // Number of entries
+                                      // in the .liblist section.
+  DT_MIPS_SYMTABNO      = 0x70000011, // Number of entries
+                                      // in the .dynsym section.
+  DT_MIPS_UNREFEXTNO    = 0x70000012, // Index of first external dynamic symbol
+                                      // not referenced locally.
+  DT_MIPS_GOTSYM        = 0x70000013, // Index of first dynamic symbol
+                                      // in global offset table.
+  DT_MIPS_HIPAGENO      = 0x70000014, // Number of page table entries
+                                      // in global offset table.
+  DT_MIPS_RLD_MAP       = 0x70000016, // Address of run time loader map,
+                                      // used for debugging.
+  DT_MIPS_DELTA_CLASS       = 0x70000017, // Delta C++ class definition.
+  DT_MIPS_DELTA_CLASS_NO    = 0x70000018, // Number of entries
+                                          // in DT_MIPS_DELTA_CLASS.
+  DT_MIPS_DELTA_INSTANCE    = 0x70000019, // Delta C++ class instances.
+  DT_MIPS_DELTA_INSTANCE_NO = 0x7000001A, // Number of entries
+                                          // in DT_MIPS_DELTA_INSTANCE.
+  DT_MIPS_DELTA_RELOC       = 0x7000001B, // Delta relocations.
+  DT_MIPS_DELTA_RELOC_NO    = 0x7000001C, // Number of entries
+                                          // in DT_MIPS_DELTA_RELOC.
+  DT_MIPS_DELTA_SYM         = 0x7000001D, // Delta symbols that Delta
+                                          // relocations refer to.
+  DT_MIPS_DELTA_SYM_NO      = 0x7000001E, // Number of entries
+                                          // in DT_MIPS_DELTA_SYM.
+  DT_MIPS_DELTA_CLASSSYM    = 0x70000020, // Delta symbols that hold
+                                          // class declarations.
+  DT_MIPS_DELTA_CLASSSYM_NO = 0x70000021, // Number of entries
+                                          // in DT_MIPS_DELTA_CLASSSYM.
+  DT_MIPS_CXX_FLAGS         = 0x70000022, // Flags indicating information
+                                          // about C++ flavor.
+  DT_MIPS_PIXIE_INIT        = 0x70000023, // Pixie information.
+  DT_MIPS_SYMBOL_LIB        = 0x70000024, // Address of .MIPS.symlib
+  DT_MIPS_LOCALPAGE_GOTIDX  = 0x70000025, // The GOT index of the first PTE
+                                          // for a segment
+  DT_MIPS_LOCAL_GOTIDX      = 0x70000026, // The GOT index of the first PTE
+                                          // for a local symbol
+  DT_MIPS_HIDDEN_GOTIDX     = 0x70000027, // The GOT index of the first PTE
+                                          // for a hidden symbol
+  DT_MIPS_PROTECTED_GOTIDX  = 0x70000028, // The GOT index of the first PTE
+                                          // for a protected symbol
+  DT_MIPS_OPTIONS           = 0x70000029, // Address of `.MIPS.options'.
+  DT_MIPS_INTERFACE         = 0x7000002A, // Address of `.interface'.
+  DT_MIPS_DYNSTR_ALIGN      = 0x7000002B, // Unknown.
+  DT_MIPS_INTERFACE_SIZE    = 0x7000002C, // Size of the .interface section.
+  DT_MIPS_RLD_TEXT_RESOLVE_ADDR = 0x7000002D, // Size of rld_text_resolve
+                                              // function stored in the GOT.
+  DT_MIPS_PERF_SUFFIX       = 0x7000002E, // Default suffix of DSO to be added
+                                          // by rld on dlopen() calls.
+  DT_MIPS_COMPACT_SIZE      = 0x7000002F, // Size of compact relocation
+                                          // section (O32).
+  DT_MIPS_GP_VALUE          = 0x70000030, // GP value for auxiliary GOTs.
+  DT_MIPS_AUX_DYNAMIC       = 0x70000031, // Address of auxiliary .dynamic.
+  DT_MIPS_PLTGOT            = 0x70000032, // Address of the base of the PLTGOT.
+  DT_MIPS_RWPLT             = 0x70000034  // Points to the base
+                                          // of a writable PLT.
 };
 
 // DT_FLAGS values.
@@ -1501,6 +1575,31 @@ enum {
   DF_1_DISPRELPND = 0x00010000  // Disp reloc applied at run-time.
 };
 
+// DT_MIPS_FLAGS values.
+enum {
+  RHF_NONE                    = 0x00000000, // No flags.
+  RHF_QUICKSTART              = 0x00000001, // Uses shortcut pointers.
+  RHF_NOTPOT                  = 0x00000002, // Hash size is not a power of two.
+  RHS_NO_LIBRARY_REPLACEMENT  = 0x00000004, // Ignore LD_LIBRARY_PATH.
+  RHF_NO_MOVE                 = 0x00000008, // DSO address may not be relocated.
+  RHF_SGI_ONLY                = 0x00000010, // SGI specific features.
+  RHF_GUARANTEE_INIT          = 0x00000020, // Guarantee that .init will finish
+                                            // executing before any non-init
+                                            // code in DSO is called.
+  RHF_DELTA_C_PLUS_PLUS       = 0x00000040, // Contains Delta C++ code.
+  RHF_GUARANTEE_START_INIT    = 0x00000080, // Guarantee that .init will start
+                                            // executing before any non-init
+                                            // code in DSO is called.
+  RHF_PIXIE                   = 0x00000100, // Generated by pixie.
+  RHF_DEFAULT_DELAY_LOAD      = 0x00000200, // Delay-load DSO by default.
+  RHF_REQUICKSTART            = 0x00000400, // Object may be requickstarted
+  RHF_REQUICKSTARTED          = 0x00000800, // Object has been requickstarted
+  RHF_CORD                    = 0x00001000, // Generated by cord.
+  RHF_NO_UNRES_UNDEF          = 0x00002000, // Object contains no unresolved
+                                            // undef symbols.
+  RHF_RLD_ORDER_SAFE          = 0x00004000  // Symbol table is in a safe order.
+};
+
 // ElfXX_VerDef structure version (GNU versioning)
 enum {
   VER_DEF_NONE    = 0,
diff --git a/contrib/llvm/lib/Analysis/CaptureTracking.cpp b/contrib/llvm/lib/Analysis/CaptureTracking.cpp
index a7292706dfa..21189176fb6 100644
--- a/contrib/llvm/lib/Analysis/CaptureTracking.cpp
+++ b/contrib/llvm/lib/Analysis/CaptureTracking.cpp
@@ -146,8 +146,14 @@ void llvm::PointerMayBeCaptured(const Value *V, CaptureTracker *Tracker) {
     case Instruction::PHI:
     case Instruction::Select:
       // The original value is not captured via this if the new value isn't.
+      Count = 0;
       for (Instruction::use_iterator UI = I->use_begin(), UE = I->use_end();
            UI != UE; ++UI) {
+        // If there are lots of uses, conservatively say that the value
+        // is captured to avoid taking too much compile time.
+        if (Count++ >= Threshold)
+          return Tracker->tooManyUses();
+
         Use *U = &UI.getUse();
         if (Visited.insert(U))
           if (Tracker->shouldExplore(U))
diff --git a/contrib/llvm/lib/Support/Dwarf.cpp b/contrib/llvm/lib/Support/Dwarf.cpp
index 0f91c11ac26..0a24883ff08 100644
--- a/contrib/llvm/lib/Support/Dwarf.cpp
+++ b/contrib/llvm/lib/Support/Dwarf.cpp
@@ -453,10 +453,11 @@ const char *llvm::dwarf::OperationEncodingString(unsigned Encoding) {
   case DW_OP_bit_piece:                  return "DW_OP_bit_piece";
   case DW_OP_implicit_value:             return "DW_OP_implicit_value";
   case DW_OP_stack_value:                return "DW_OP_stack_value";
-  case DW_OP_lo_user:                    return "DW_OP_lo_user";
-  case DW_OP_hi_user:                    return "DW_OP_hi_user";
 
-    // DWARF5 Fission Proposal Op Extensions
+  // GNU thread-local storage
+  case DW_OP_GNU_push_tls_address:       return "DW_OP_GNU_push_tls_address";
+
+  // DWARF5 Fission Proposal Op Extensions
   case DW_OP_GNU_addr_index:             return "DW_OP_GNU_addr_index";
   case DW_OP_GNU_const_index:            return "DW_OP_GNU_const_index";
   }
diff --git a/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp b/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
index 7c0423f8182..423bd44caa9 100644
--- a/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
+++ b/contrib/llvm/lib/Target/X86/X86InstrInfo.cpp
@@ -3881,6 +3881,10 @@ MachineInstr* X86InstrInfo::foldMemoryOperandImpl(MachineFunction &MF,
   const MachineFrameInfo *MFI = MF.getFrameInfo();
   unsigned Size = MFI->getObjectSize(FrameIndex);
   unsigned Alignment = MFI->getObjectAlignment(FrameIndex);
+  // If the function stack isn't realigned we don't want to fold instructions
+  // that need increased alignment.
+  if (!RI.needsStackRealignment(MF))
+    Alignment = std::min(Alignment, TM.getFrameLowering()->getStackAlignment());
   if (Ops.size() == 2 && Ops[0] == 0 && Ops[1] == 1) {
     unsigned NewOpc = 0;
     unsigned RCSize = 0;
diff --git a/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp b/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp
index 069cd5f9e73..8559e4cc0ae 100644
--- a/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp
+++ b/contrib/llvm/tools/clang/lib/CodeGen/CGVTables.cpp
@@ -454,10 +454,9 @@ void CodeGenVTables::EmitThunk(GlobalDecl GD, const ThunkInfo &Thunk,
   } else {
     // Normal thunk body generation.
     CodeGenFunction(CGM).GenerateThunk(ThunkFn, FnInfo, GD, Thunk);
+    if (UseAvailableExternallyLinkage)
+      ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage);
   }
-
-  if (UseAvailableExternallyLinkage)
-    ThunkFn->setLinkage(llvm::GlobalValue::AvailableExternallyLinkage);
 }
 
 void CodeGenVTables::MaybeEmitThunkAvailableExternally(GlobalDecl GD,
diff --git a/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp b/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
index d8d580b8b5c..dbb69ac920e 100644
--- a/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
+++ b/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
@@ -991,7 +991,7 @@ static StringRef getGCCToolchainDir(const ArgList &Args) {
   return GCC_INSTALL_PREFIX;
 }
 
-/// \brief Construct a GCCInstallationDetector from the driver.
+/// \brief Initialize a GCCInstallationDetector from the driver.
 ///
 /// This performs all of the autodetection and sets up the various paths.
 /// Once constructed, a GCCInstallationDetector is essentially immutable.
@@ -1000,11 +1000,9 @@ static StringRef getGCCToolchainDir(const ArgList &Args) {
 /// should instead pull the target out of the driver. This is currently
 /// necessary because the driver doesn't store the final version of the target
 /// triple.
-Generic_GCC::GCCInstallationDetector::GCCInstallationDetector(
-    const Driver &D,
-    const llvm::Triple &TargetTriple,
-    const ArgList &Args)
-    : IsValid(false) {
+void
+Generic_GCC::GCCInstallationDetector::init(
+    const Driver &D, const llvm::Triple &TargetTriple, const ArgList &Args) {
   llvm::Triple MultiarchTriple
     = TargetTriple.isArch32Bit() ? TargetTriple.get64BitArchVariant()
                                  : TargetTriple.get32BitArchVariant();
@@ -1448,7 +1446,7 @@ void Generic_GCC::GCCInstallationDetector::ScanLibDirForGCCTriple(
 
 Generic_GCC::Generic_GCC(const Driver &D, const llvm::Triple& Triple,
                          const ArgList &Args)
-  : ToolChain(D, Triple, Args), GCCInstallation(getDriver(), Triple, Args) {
+  : ToolChain(D, Triple, Args), GCCInstallation() {
   getProgramPaths().push_back(getDriver().getInstalledDir());
   if (getDriver().getInstalledDir() != getDriver().Dir)
     getProgramPaths().push_back(getDriver().Dir);
@@ -2243,6 +2241,7 @@ static StringRef getMultilibDir(const llvm::Triple &Triple,
 
 Linux::Linux(const Driver &D, const llvm::Triple &Triple, const ArgList &Args)
   : Generic_ELF(D, Triple, Args) {
+  GCCInstallation.init(D, Triple, Args);
   llvm::Triple::ArchType Arch = Triple.getArch();
   std::string SysRoot = computeSysRoot(Args);
 
diff --git a/contrib/llvm/tools/clang/lib/Driver/ToolChains.h b/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
index 2b140c1cd0a..50145e78c8e 100644
--- a/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
+++ b/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
@@ -78,7 +78,8 @@ protected:
     GCCVersion Version;
 
   public:
-    GCCInstallationDetector(const Driver &D, const llvm::Triple &TargetTriple,
+    GCCInstallationDetector() : IsValid(false) {}
+    void init(const Driver &D, const llvm::Triple &TargetTriple,
                             const ArgList &Args);
 
     /// \brief Check whether we detected a valid GCC install.
diff --git a/contrib/llvm/tools/clang/lib/Headers/emmintrin.h b/contrib/llvm/tools/clang/lib/Headers/emmintrin.h
index 56c6c228554..195e244d2ea 100644
--- a/contrib/llvm/tools/clang/lib/Headers/emmintrin.h
+++ b/contrib/llvm/tools/clang/lib/Headers/emmintrin.h
@@ -1344,7 +1344,7 @@ _mm_movepi64_pi64(__m128i __a)
 }
 
 static __inline__ __m128i __attribute__((__always_inline__, __nodebug__))
-_mm_movpi64_pi64(__m64 __a)
+_mm_movpi64_epi64(__m64 __a)
 {
   return (__m128i){ (long long)__a, 0 };
 }
diff --git a/contrib/llvm/tools/clang/tools/driver/driver.cpp b/contrib/llvm/tools/clang/tools/driver/driver.cpp
index 4c40da3080a..ef8572f6bbb 100644
--- a/contrib/llvm/tools/clang/tools/driver/driver.cpp
+++ b/contrib/llvm/tools/clang/tools/driver/driver.cpp
@@ -284,11 +284,13 @@ static void ParseProgName(SmallVectorImpl<const char *> &ArgVector,
   } suffixes [] = {
     { "clang", false, false },
     { "clang++", true, false },
+    { "clang-CC", true, false },
     { "clang-c++", true, false },
     { "clang-cc", false, false },
     { "clang-cpp", false, true },
     { "clang-g++", true, false },
     { "clang-gcc", false, false },
+    { "CC", true, false },
     { "cc", false, false },
     { "cpp", false, true },
     { "++", true, false },
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBDebugger.h b/contrib/llvm/tools/lldb/include/lldb/API/SBDebugger.h
index 518cbf67c93..80e6969cbd3 100644
--- a/contrib/llvm/tools/lldb/include/lldb/API/SBDebugger.h
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBDebugger.h
@@ -10,9 +10,11 @@
 #ifndef LLDB_SBDebugger_h_
 #define LLDB_SBDebugger_h_
 
-#include "lldb/API/SBDefines.h"
 #include <stdio.h>
 
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBPlatform.h"
+
 namespace lldb {
 
 class SBDebugger
@@ -153,6 +155,12 @@ public:
     void
     SetSelectedTarget (SBTarget& target);
 
+    lldb::SBPlatform
+    GetSelectedPlatform();
+
+    void
+    SetSelectedPlatform(lldb::SBPlatform &platform);
+
     lldb::SBSourceManager
     GetSourceManager ();
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBError.h b/contrib/llvm/tools/lldb/include/lldb/API/SBError.h
index a6d3dacb454..12b34ec6dbc 100644
--- a/contrib/llvm/tools/lldb/include/lldb/API/SBError.h
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBError.h
@@ -72,6 +72,7 @@ protected:
     friend class SBCommunication;
     friend class SBHostOS;
     friend class SBInputReader;
+    friend class SBPlatform;
     friend class SBProcess;
     friend class SBThread;
     friend class SBTarget;
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h b/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h
index eed9ed528be..6a3a640432f 100644
--- a/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBExpressionOptions.h
@@ -65,6 +65,12 @@ public:
     void
     SetTryAllThreads (bool run_others = true);
 
+    bool
+    GetTrapExceptions () const;
+    
+    void
+    SetTrapExceptions (bool trap_exceptions = true);
+
 protected:
 
     SBExpressionOptions (lldb_private::EvaluateExpressionOptions &expression_options);
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h b/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h
index e44abe4759c..5d4447f74e6 100644
--- a/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBFileSpec.h
@@ -45,6 +45,12 @@ public:
     const char *
     GetDirectory() const;
 
+    void
+    SetFilename(const char *filename);
+    
+    void
+    SetDirectory(const char *directory);
+
     uint32_t
     GetPath (char *dst_path, size_t dst_len) const;
 
@@ -65,6 +71,7 @@ private:
     friend class SBLineEntry;
     friend class SBModule;
     friend class SBModuleSpec;
+    friend class SBPlatform;
     friend class SBProcess;
     friend class SBSourceManager;
     friend class SBThread;
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBHostOS.h b/contrib/llvm/tools/lldb/include/lldb/API/SBHostOS.h
index 52754ea4e82..e5fab6fe784 100644
--- a/contrib/llvm/tools/lldb/include/lldb/API/SBHostOS.h
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBHostOS.h
@@ -30,7 +30,7 @@ public:
 
     static lldb::thread_t
     ThreadCreate (const char *name,
-                  void *(*thread_function)(void *),
+                  thread_func_t thread_function,
                   void *thread_arg,
                   lldb::SBError *err);
 
@@ -43,7 +43,7 @@ public:
                   lldb::SBError *err);
     static bool
     ThreadJoin (lldb::thread_t thread,
-                void **result,
+                thread_result_t *result,
                 lldb::SBError *err);
 
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBModule.h b/contrib/llvm/tools/lldb/include/lldb/API/SBModule.h
index a3c4879aa2f..f5955b39734 100644
--- a/contrib/llvm/tools/lldb/include/lldb/API/SBModule.h
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBModule.h
@@ -76,6 +76,42 @@ public:
     bool
     SetPlatformFileSpec (const lldb::SBFileSpec &platform_file);
 
+    //------------------------------------------------------------------
+    /// Get accessor for the remote install path for a module.
+    ///
+    /// When debugging to a remote platform by connecting to a remote
+    /// platform, the install path of the module can be set. If the
+    /// install path is set, every time the process is about to launch
+    /// the target will install this module on the remote platform prior
+    /// to launching.
+    ///
+    /// @return
+    ///     A file specification object.
+    //------------------------------------------------------------------
+    lldb::SBFileSpec
+    GetRemoteInstallFileSpec ();
+    
+    //------------------------------------------------------------------
+    /// Set accessor for the remote install path for a module.
+    ///
+    /// When debugging to a remote platform by connecting to a remote
+    /// platform, the install path of the module can be set. If the
+    /// install path is set, every time the process is about to launch
+    /// the target will install this module on the remote platform prior
+    /// to launching.
+    ///
+    /// If \a file specifies a full path to an install location, the
+    /// module will be installed to this path. If the path is relative
+    /// (no directory specified, or the path is partial like "usr/lib"
+    /// or "./usr/lib", then the install path will be resolved using
+    /// the platform's current working directory as the base path.
+    ///
+    /// @param[in]
+    ///     A file specification object.
+    //------------------------------------------------------------------
+    bool
+    SetRemoteInstallFileSpec (lldb::SBFileSpec &file);
+    
     lldb::ByteOrder
     GetByteOrder ();
     
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h b/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h
new file mode 100644
index 00000000000..16a546d81f9
--- /dev/null
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBPlatform.h
@@ -0,0 +1,198 @@
+//===-- SBPlatform.h --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLDB_SBPlatform_h_
+#define LLDB_SBPlatform_h_
+
+#include "lldb/API/SBDefines.h"
+
+struct PlatformConnectOptions;
+struct PlatformShellCommand;
+
+namespace lldb {
+
+    class SBPlatformConnectOptions
+    {
+    public:
+        SBPlatformConnectOptions (const char *url);
+
+        SBPlatformConnectOptions (const SBPlatformConnectOptions &rhs);
+
+        ~SBPlatformConnectOptions ();
+        
+        void
+        operator=(const SBPlatformConnectOptions &rhs);
+
+        const char *
+        GetURL();
+        
+        void
+        SetURL(const char *url);
+        
+        bool
+        GetRsyncEnabled();
+        
+        void
+        EnableRsync (const char *options,
+                     const char *remote_path_prefix,
+                     bool omit_remote_hostname);
+                     
+        void
+        DisableRsync ();
+        
+        const char *
+        GetLocalCacheDirectory();
+
+        void
+        SetLocalCacheDirectory(const char *path);
+    protected:
+        PlatformConnectOptions *m_opaque_ptr;
+    };
+
+    class SBPlatformShellCommand
+    {
+    public:
+        SBPlatformShellCommand (const char *shell_command);
+        
+        SBPlatformShellCommand (const SBPlatformShellCommand &rhs);
+        
+        ~SBPlatformShellCommand();
+        
+        void
+        Clear();
+
+        const char *
+        GetCommand();
+
+        void
+        SetCommand(const char *shell_command);
+        
+        const char *
+        GetWorkingDirectory ();
+
+        void
+        SetWorkingDirectory (const char *path);
+
+        uint32_t
+        GetTimeoutSeconds ();
+        
+        void
+        SetTimeoutSeconds (uint32_t sec);
+        
+        int
+        GetSignal ();
+        
+        int
+        GetStatus ();
+        
+        const char *
+        GetOutput ();
+
+    protected:
+        friend class SBPlatform;
+
+        PlatformShellCommand *m_opaque_ptr;
+    };
+
+    class SBPlatform
+    {
+    public:
+        
+        SBPlatform ();
+        
+        SBPlatform (const char *platform_name);
+        
+        ~SBPlatform();
+        
+        bool
+        IsValid () const;
+        
+        void
+        Clear ();
+
+        const char *
+        GetWorkingDirectory();
+
+        bool
+        SetWorkingDirectory(const char *path);
+
+        const char *
+        GetName ();
+
+        SBError
+        ConnectRemote (SBPlatformConnectOptions &connect_options);
+
+        void
+        DisconnectRemote ();
+        
+        bool
+        IsConnected();
+
+        //----------------------------------------------------------------------
+        // The following functions will work if the platform is connected
+        //----------------------------------------------------------------------
+        const char *
+        GetTriple();
+
+        const char *
+        GetHostname ();
+        
+        const char *
+        GetOSBuild ();
+        
+        const char *
+        GetOSDescription ();
+
+        uint32_t
+        GetOSMajorVersion ();
+
+        uint32_t
+        GetOSMinorVersion ();
+
+        uint32_t
+        GetOSUpdateVersion ();
+
+        SBError
+        Put (SBFileSpec &src, SBFileSpec &dst);
+        
+        SBError
+        Get (SBFileSpec &src, SBFileSpec &dst);
+
+        SBError
+        Install (SBFileSpec& src, SBFileSpec& dst);
+
+        SBError
+        Run (SBPlatformShellCommand &shell_command);
+
+        SBError
+        MakeDirectory (const char *path, uint32_t file_permissions = eFilePermissionsDirectoryDefault);
+
+        uint32_t
+        GetFilePermissions (const char *path);
+        
+        SBError
+        SetFilePermissions (const char *path, uint32_t file_permissions);
+
+    protected:
+        
+        friend class SBDebugger;
+        friend class SBTarget;
+
+        lldb::PlatformSP
+        GetSP () const;
+        
+        void
+        SetSP (const lldb::PlatformSP& platform_sp);
+
+        lldb::PlatformSP m_opaque_sp;
+    };
+
+} // namespace lldb
+
+#endif // LLDB_SBPlatform_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h b/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h
index 784f362122a..4ecaeaa4992 100644
--- a/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBProcess.h
@@ -269,6 +269,38 @@ public:
     lldb::SBError
     UnloadImage (uint32_t image_token);
     
+    //------------------------------------------------------------------
+    /// Return the number of different thread-origin extended backtraces
+    /// this process can support.
+    ///
+    /// When the process is stopped and you have an SBThread, lldb may be
+    /// able to show a backtrace of when that thread was originally created,
+    /// or the work item was enqueued to it (in the case of a libdispatch 
+    /// queue).
+    ///
+    /// @return
+    ///   The number of thread-origin extended backtrace types that may be
+    ///   available.
+    //------------------------------------------------------------------
+    uint32_t
+    GetNumExtendedBacktraceTypes ();
+
+    //------------------------------------------------------------------
+    /// Return the name of one of the thread-origin extended backtrace 
+    /// methods.
+    ///
+    /// @param [in] idx
+    ///   The index of the name to return.  They will be returned in
+    ///   the order that the user will most likely want to see them.
+    ///   e.g. if the type at index 0 is not available for a thread, 
+    ///   see if the type at index 1 provides an extended backtrace.
+    ///
+    /// @return
+    ///   The name at that index.
+    //------------------------------------------------------------------
+    const char *
+    GetExtendedBacktraceTypeAtIndex (uint32_t idx);
+
 protected:
     friend class SBAddress;
     friend class SBBreakpoint;
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h b/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h
index 15aeed4b600..b41c1181154 100644
--- a/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBTarget.h
@@ -267,6 +267,23 @@ public:
     lldb::SBProcess
     GetProcess ();
 
+    //------------------------------------------------------------------
+    /// Install any binaries that need to be installed.
+    ///
+    /// This function does nothing when debugging on the host system.
+    /// When connected to remote platforms, the target's main executable
+    /// and any modules that have their remote install path set will be
+    /// installed on the remote platform. If the main executable doesn't
+    /// have an install location set, it will be installed in the remote
+    /// platform's working directory.
+    ///
+    /// @return
+    ///     An error describing anything that went wrong during
+    ///     installation.
+    //------------------------------------------------------------------
+    SBError
+    Install();
+    
     //------------------------------------------------------------------
     /// Launch a new process.
     ///
@@ -747,6 +764,9 @@ public:
     lldb::SBType
     GetBasicType(lldb::BasicType type);
     
+    lldb::SBValue
+    CreateValueFromAddress (const char *name, lldb::SBAddress addr, lldb::SBType type);
+    
     SBSourceManager
     GetSourceManager();
     
diff --git a/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h b/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h
index 9645f925035..6542dca1f95 100644
--- a/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h
+++ b/contrib/llvm/tools/lldb/include/lldb/API/SBThread.h
@@ -94,6 +94,9 @@ public:
     const char *
     GetQueueName() const;
 
+    lldb::queue_id_t
+    GetQueueID() const;
+
     void
     StepOver (lldb::RunMode stop_other_threads = lldb::eOnlyDuringStepping);
 
@@ -117,6 +120,9 @@ public:
                    lldb::SBFileSpec &file_spec, 
                    uint32_t line);
 
+    SBError
+    JumpToLine (lldb::SBFileSpec &file_spec, uint32_t line);
+
     void
     RunToAddress (lldb::addr_t addr);
     
@@ -195,6 +201,12 @@ public:
     bool
     GetStatus (lldb::SBStream &status) const;
 
+    SBThread
+    GetExtendedBacktraceThread (const char *type);
+
+    uint32_t
+    GetExtendedBacktraceOriginatingIndexID ();
+
 protected:
     friend class SBBreakpoint;
     friend class SBBreakpointLocation;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h
index bd11a1c91e2..e82d6eacf7a 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/Breakpoint.h
@@ -311,6 +311,24 @@ public:
     //------------------------------------------------------------------
     lldb::BreakpointLocationSP
     GetLocationAtIndex (size_t index);
+    
+    //------------------------------------------------------------------
+    /// Removes all invalid breakpoint locations.
+    ///
+    /// Removes all breakpoint locations with architectures that aren't
+    /// compatible with \a arch. Also remove any breakpoint locations
+    /// with whose locations have address where the section has been
+    /// deleted (module and object files no longer exist).
+    ///
+    /// This is typically used after the process calls exec, or anytime
+    /// the architecture of the target changes.
+    ///
+    /// @param[in] arch
+    ///     If valid, check the module in each breakpoint to make sure
+    ///     they are compatible, otherwise, ignore architecture.
+    //------------------------------------------------------------------
+    void
+    RemoveInvalidLocations (const ArchSpec &arch);
 
     //------------------------------------------------------------------
     // The next section deals with various breakpoint options.
@@ -576,6 +594,12 @@ public:
     InvokeCallback (StoppointCallbackContext *context,
                     lldb::break_id_t bp_loc_id);
 
+    bool
+    IsHardware() const
+    {
+        return m_hardware;
+    }
+
 protected:
     friend class Target;
     //------------------------------------------------------------------
@@ -590,7 +614,10 @@ protected:
     /// variants that make breakpoints for some common cases.
     //------------------------------------------------------------------
     // This is the generic constructor
-    Breakpoint(Target &target, lldb::SearchFilterSP &filter_sp, lldb::BreakpointResolverSP &resolver_sp);
+    Breakpoint(Target &target,
+               lldb::SearchFilterSP &filter_sp,
+               lldb::BreakpointResolverSP &resolver_sp,
+               bool hardware);
     
     friend class BreakpointLocation;  // To call the following two when determining whether to stop.
 
@@ -609,12 +636,13 @@ private:
     // For Breakpoint only
     //------------------------------------------------------------------
     bool m_being_created;
+    bool m_hardware;                          // If this breakpoint is required to use a hardware breakpoint
     Target &m_target;                         // The target that holds this breakpoint.
     lldb::SearchFilterSP m_filter_sp;         // The filter that constrains the breakpoint's domain.
     lldb::BreakpointResolverSP m_resolver_sp; // The resolver that defines this breakpoint.
     BreakpointOptions m_options;              // Settable breakpoint options
     BreakpointLocationList m_locations;       // The list of locations currently found for this breakpoint.
-    std::string            m_kind_description;
+    std::string m_kind_description;
     
     void
     SendBreakpointChangedEvent (lldb::BreakpointEventType eventKind);
diff --git a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointList.h b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointList.h
index 97eb2b46bc0..27f80d0ffe0 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointList.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointList.h
@@ -132,6 +132,25 @@ public:
     bool
     Remove (lldb::break_id_t breakID, bool notify);
 
+    
+    //------------------------------------------------------------------
+    /// Removes all invalid breakpoint locations.
+    ///
+    /// Removes all breakpoint locations in the list with architectures
+    /// that aren't compatible with \a arch. Also remove any breakpoint
+    /// locations with whose locations have address where the section
+    /// has been deleted (module and object files no longer exist).
+    ///
+    /// This is typically used after the process calls exec, or anytime
+    /// the architecture of the target changes.
+    ///
+    /// @param[in] arch
+    ///     If valid, check the module in each breakpoint to make sure
+    ///     they are compatible, otherwise, ignore architecture.
+    //------------------------------------------------------------------
+    void
+    RemoveInvalidLocations (const ArchSpec &arch);
+
     void
     SetEnabledAll (bool enabled);
 
@@ -149,11 +168,17 @@ public:
     /// @param[in] module_list
     ///   The module list that has changed.
     ///
-    /// @param[in] added
+    /// @param[in] load
     ///   \b true if the modules are loaded, \b false if unloaded.
+    ///
+    /// @param[in] delete_locations
+    ///   If \a load is \b false, then delete breakpoint locations when
+    ///   when updating breakpoints.
     //------------------------------------------------------------------
     void
-    UpdateBreakpoints (ModuleList &module_list, bool added);
+    UpdateBreakpoints (ModuleList &module_list,
+                       bool load,
+                       bool delete_locations);
     
     void
     UpdateBreakpointsWhenModuleIsReplaced (lldb::ModuleSP old_module_sp, lldb::ModuleSP new_module_sp);
diff --git a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocation.h b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocation.h
index 9ab0a79c684..f4ba21a385f 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocation.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocation.h
@@ -324,7 +324,6 @@ public:
 
 protected:
     friend class BreakpointLocationList;
-    friend class CommandObjectBreakpointCommandAdd;
     friend class Process;
 
     //------------------------------------------------------------------
@@ -375,8 +374,8 @@ private:
     BreakpointLocation (lldb::break_id_t bid,
                         Breakpoint &owner,
                         const Address &addr,
-                        lldb::tid_t tid = LLDB_INVALID_THREAD_ID,
-                        bool hardware = false);
+                        lldb::tid_t tid,
+                        bool hardware);
 
     //------------------------------------------------------------------
     // Data members:
diff --git a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h
index 1cba23d9118..b25208659c7 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointLocationList.h
@@ -250,6 +250,9 @@ protected:
 
     bool
     RemoveLocation (const lldb::BreakpointLocationSP &bp_loc_sp);
+    
+    void
+    RemoveInvalidLocations (const ArchSpec &arch);
 
     typedef std::vector<lldb::BreakpointLocationSP> collection;
     typedef std::map<lldb_private::Address,
@@ -257,7 +260,7 @@ protected:
                      Address::ModulePointerAndOffsetLessThanFunctionObject> addr_map;
 
     Breakpoint &m_owner;
-    collection m_locations;
+    collection m_locations;         // Vector of locations, sorted by ID 
     addr_map m_address_to_location;
     mutable Mutex m_mutex;
     lldb::break_id_t m_next_id;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointResolver.h b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointResolver.h
index 3db3795453e..184bdc950cb 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointResolver.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointResolver.h
@@ -134,6 +134,13 @@ public:
     }
 
 protected:
+    //------------------------------------------------------------------
+    /// SetSCMatchesByLine - Takes a symbol context list of matches which supposedly represent the same file and
+    /// line number in a CU, and find the nearest actual line number that matches, and then filter down the
+    /// matching addresses to unique entries, and skip the prologue if asked to do so, and then set
+    /// breakpoint locations in this breakpoint for all the resultant addresses.
+    void SetSCMatchesByLine (SearchFilter &filter, SymbolContextList &sc_list, bool skip_prologue, const char *log_ident);
+    
     Breakpoint *m_breakpoint;  // This is the breakpoint we add locations to.
 
 private:
diff --git a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSiteList.h b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSiteList.h
index 0d4dafc4baa..d7bb8fd777e 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSiteList.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/BreakpointSiteList.h
@@ -13,6 +13,7 @@
 // C Includes
 // C++ Includes
 #include <map>
+#include <functional>
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Breakpoint/BreakpointSite.h"
diff --git a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/StoppointLocation.h b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/StoppointLocation.h
index ccedc511951..452c6388c82 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Breakpoint/StoppointLocation.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Breakpoint/StoppointLocation.h
@@ -72,20 +72,20 @@ public:
     uint32_t
     GetHardwareIndex () const
     {
-        return m_hw_index;
+        return m_hardware_index;
     }
 
 
     bool
-    HardwarePreferred () const
+    HardwareRequired () const
     {
-        return m_hw_preferred;
+        return m_hardware;
     }
 
     virtual bool
     IsHardware () const
     {
-        return m_hw_index != LLDB_INVALID_INDEX32;
+        return m_hardware_index != LLDB_INVALID_INDEX32;
     }
 
 
@@ -103,7 +103,7 @@ public:
     void
     SetHardwareIndex (uint32_t index)
     {
-        m_hw_index = index;
+        m_hardware_index = index;
     }
 
 
@@ -120,8 +120,8 @@ protected:
     lldb::break_id_t  m_loc_id;     // Stoppoint location ID
     lldb::addr_t      m_addr;       // The load address of this stop point. The base Stoppoint doesn't
                                     // store a full Address since that's not needed for the breakpoint sites.
-    bool        m_hw_preferred;     // 1 if this point has been requested to be set using hardware (which may fail due to lack of resources)
-    uint32_t    m_hw_index;         // The hardware resource index for this breakpoint/watchpoint
+    bool        m_hardware;         // True if this point has been is required to use hardware (which may fail due to lack of resources)
+    uint32_t    m_hardware_index;   // The hardware resource index for this breakpoint/watchpoint
     uint32_t    m_byte_size;        // The size in bytes of stop location.  e.g. the length of the trap opcode for
                                     // software breakpoints, or the optional length in bytes for
                                     // hardware breakpoints, or the length of the watchpoint.
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/Address.h b/contrib/llvm/tools/lldb/include/lldb/Core/Address.h
index 60cd4a86bd4..322019395ae 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/Address.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/Address.h
@@ -534,12 +534,34 @@ public:
     bool
     CalculateSymbolContextLineEntry (LineEntry &line_entry) const;
 
+    //------------------------------------------------------------------
+    // Returns true if the section should be valid, but isn't because
+    // the shared pointer to the section can't be reconstructed from
+    // a weak pointer that contains a valid weak reference to a section.
+    // Returns false if the section weak pointer has no reference to
+    // a section, or if the section is still valid
+    //------------------------------------------------------------------
+    bool
+    SectionWasDeleted() const;
+
 protected:
     //------------------------------------------------------------------
     // Member variables.
     //------------------------------------------------------------------
     lldb::SectionWP m_section_wp;   ///< The section for the address, can be NULL.
     std::atomic<lldb::addr_t> m_offset;      ///< Offset into section if \a m_section_wp is valid...
+    
+    //------------------------------------------------------------------
+    // Returns true if the m_section_wp once had a reference to a valid
+    // section shared pointer, but no longer does. This can happen if
+    // we have an address from a module that gets unloaded and deleted.
+    // This function should only be called if GetSection() returns an
+    // empty shared pointer and you want to know if this address used to
+    // have a valid section.
+    //------------------------------------------------------------------
+    bool
+    SectionWasDeletedPrivate() const;
+
 };
 
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h b/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h
index 3bfa96be0ce..7f2fd77a093 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/ArchSpec.h
@@ -41,6 +41,7 @@ public:
         eCore_arm_armv5e,
         eCore_arm_armv5t,
         eCore_arm_armv6,
+        eCore_arm_armv6m,
         eCore_arm_armv7,
         eCore_arm_armv7f,
         eCore_arm_armv7s,
@@ -53,6 +54,7 @@ public:
         eCore_thumbv5,
         eCore_thumbv5e,
         eCore_thumbv6,
+        eCore_thumbv6m,
         eCore_thumbv7,
         eCore_thumbv7f,
         eCore_thumbv7s,
@@ -60,6 +62,8 @@ public:
         eCore_thumbv7m,
         eCore_thumbv7em,
         
+        eCore_mips64,
+
         eCore_ppc_generic,
         eCore_ppc_ppc601,
         eCore_ppc_ppc602,
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionFileDescriptor.h b/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionFileDescriptor.h
index fe704d4cadf..3a2f0dd1ed0 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionFileDescriptor.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionFileDescriptor.h
@@ -11,20 +11,27 @@
 #define liblldb_ConnectionFileDescriptor_h_
 
 // C Includes
+#ifdef _WIN32
+typedef unsigned short in_port_t;
+#else
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <netinet/in.h>
+#endif
 
 // C++ Includes
+#include <memory>
+
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/Connection.h"
 #include "lldb/Host/Mutex.h"
 #include "lldb/Host/Predicate.h"
-#include "lldb/Host/SocketAddress.h"
 
 namespace lldb_private {
 
+class SocketAddress;
+
 class ConnectionFileDescriptor :
     public Connection
 {
@@ -70,6 +77,13 @@ public:
     GetWritePort () const;
 
 protected:
+
+    typedef enum
+    {
+        eFDTypeFile,        // Other FD requireing read/write
+        eFDTypeSocket,      // Socket requiring send/recv
+        eFDTypeSocketUDP    // Unconnected UDP socket requiring sendto/recvfrom
+    } FDType;
     
     void
     OpenCommandPipe ();
@@ -96,20 +110,13 @@ protected:
     NamedSocketConnect (const char *socket_name, Error *error_ptr);
     
     lldb::ConnectionStatus
-    Close (int& fd, Error *error);
-
-    typedef enum
-    {
-        eFDTypeFile,        // Other FD requireing read/write
-        eFDTypeSocket,      // Socket requiring send/recv
-        eFDTypeSocketUDP    // Unconnected UDP socket requiring sendto/recvfrom
-    } FDType;
+    Close (int& fd, FDType type, Error *error);
     
     int m_fd_send;
     int m_fd_recv;
     FDType m_fd_send_type;
     FDType m_fd_recv_type;
-    SocketAddress m_udp_send_sockaddr;
+    std::unique_ptr<SocketAddress> m_udp_send_sockaddr;
     bool m_should_close_fd;     // True if this class should close the file descriptor when it goes away.
     uint32_t m_socket_timeout_usec;
     int m_pipe_read;            // A pipe that we select on the reading end of along with
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionMachPort.h b/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionMachPort.h
index 5613e7ee800..04ec7f69136 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionMachPort.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/ConnectionMachPort.h
@@ -12,7 +12,8 @@
 #define liblldb_ConnectionMachPort_h_
 
 // C Includes
-#include <mach/mach.h>
+#include <mach/port.h>
+#include <mach/kern_return.h>
 
 // C++ Includes
 #include <string>
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/ConstString.h b/contrib/llvm/tools/lldb/include/lldb/Core/ConstString.h
index e692d3b96e5..684cc8f921e 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/ConstString.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/ConstString.h
@@ -86,7 +86,7 @@ public:
     /// @param[in] cstr
     ///     A pointer to the first character in the C string. The C 
     ///     string can be NULL terminated in a buffer that contains
-    ///     more characters than the length of the stirng, or the
+    ///     more characters than the length of the string, or the
     ///     string can be part of another string and a new substring
     ///     can be created.
     ///
@@ -148,11 +148,11 @@ public:
     ///     /b True this object contains a valid non-empty C string, \b 
     ///     false otherwise.
     //------------------------------------------------------------------
-    operator bool() const
+    explicit operator bool() const 
     {
         return m_string && m_string[0];
     }
-
+    
     //------------------------------------------------------------------
     /// Assignment operator
     ///
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/DataExtractor.h b/contrib/llvm/tools/lldb/include/lldb/Core/DataExtractor.h
index a8593043cb1..c9db2dab73d 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/DataExtractor.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/DataExtractor.h
@@ -467,6 +467,27 @@ public:
         return ptr;
     }
     
+    //------------------------------------------------------------------
+    /// Copy \a length bytes from \a *offset, without swapping bytes.
+    ///
+    /// @param[in] offset
+    ///     The offset into this data from which to start copying
+    ///
+    /// @param[in] length
+    ///     The length of the data to copy from this object
+    ///
+    /// @param[out] dst
+    ///     The buffer to place the output data.
+    ///
+    /// @return
+    ///     Returns the number of bytes that were copied, or zero if 
+    ///     anything goes wrong.
+    //------------------------------------------------------------------
+    lldb::offset_t
+    CopyData (lldb::offset_t offset,
+              lldb::offset_t length,
+              void *dst) const;
+
     //------------------------------------------------------------------
     /// Copy \a dst_len bytes from \a *offset_ptr and ensure the copied
     /// data is treated as a value that can be swapped to match the
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h b/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h
index bed93fe0252..a3c6d5eeb93 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/Debugger.h
@@ -13,14 +13,10 @@
 
 
 #include <stdint.h>
-#include <unistd.h>
 
 #include <stack>
 
 #include "lldb/lldb-public.h"
-
-#include "lldb/API/SBDefines.h"
-
 #include "lldb/Core/Broadcaster.h"
 #include "lldb/Core/Communication.h"
 #include "lldb/Core/InputReaderStack.h"
@@ -56,6 +52,10 @@ friend class SourceManager;  // For GetSourceFileCache.
 
 public:
 
+    typedef lldb::DynamicLibrarySP (*LoadPluginCallbackType) (const lldb::DebuggerSP &debugger_sp,
+                                                              const FileSpec& spec,
+                                                              Error& error);
+
     static lldb::DebuggerSP
     CreateInstance (lldb::LogOutputCallback log_callback = NULL, void *baton = NULL);
 
@@ -66,7 +66,7 @@ public:
     FindTargetWithProcess (Process *process);
 
     static void
-    Initialize ();
+    Initialize (LoadPluginCallbackType load_plugin_callback);
     
     static void 
     Terminate ();
@@ -322,6 +322,9 @@ public:
     uint32_t
     GetDisassemblyLineCount () const;
     
+    bool
+    GetAutoOneLineSummaries () const;
+    
     bool
     GetNotifyVoid () const;
 
@@ -331,9 +334,7 @@ public:
     {
         return m_instance_name;
     }
-    
-    typedef bool (*LLDBCommandPluginInit) (lldb::SBDebugger& debugger);
-    
+        
     bool
     LoadPlugin (const FileSpec& spec, Error& error);
 
@@ -375,6 +376,7 @@ protected:
     LogStreamMap m_log_streams;
     lldb::StreamSP m_log_callback_stream_sp;
     ConstString m_instance_name;
+    static LoadPluginCallbackType g_load_plugin_callback;
     typedef std::vector<lldb::DynamicLibrarySP> LoadedPluginsList;
     LoadedPluginsList m_loaded_plugins;
     
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/Disassembler.h b/contrib/llvm/tools/lldb/include/lldb/Core/Disassembler.h
index d6e90071dc5..f434d56943d 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/Disassembler.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/Disassembler.h
@@ -270,7 +270,8 @@ public:
                       const char *plugin_name,
                       const char *flavor,
                       const ExecutionContext &exe_ctx,
-                      const AddressRange &disasm_range);
+                      const AddressRange &disasm_range,
+                      bool prefer_file_cache);
     
     static lldb::DisassemblerSP 
     DisassembleBytes (const ArchSpec &arch,
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/EmulateInstruction.h b/contrib/llvm/tools/lldb/include/lldb/Core/EmulateInstruction.h
index 08b97e42491..19a3269ae37 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/EmulateInstruction.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/EmulateInstruction.h
@@ -69,14 +69,14 @@
 /// debugging. The current debugging model is "process centric" where
 /// all threads must be stopped when any thread is stopped; when
 /// hitting software breakpoints we must disable the breakpoint by
-/// restoring the original breakpoint opcde, single stepping and 
+/// restoring the original breakpoint opcode, single stepping and
 /// restoring the breakpoint trap. If all threads were allowed to run
 /// then other threads could miss the breakpoint. 
 ///
 /// This class centralizes the code that usually is done in separate 
 /// code paths in a debugger (single step prediction, finding save
 /// restore locations of registers for unwinding stack frame variables)
-/// and emulating the intruction is just a bonus.
+/// and emulating the instruction is just a bonus.
 //----------------------------------------------------------------------
 
 namespace lldb_private {
@@ -394,7 +394,7 @@ public:
     // Mandatory overrides
     //----------------------------------------------------------------------    
     virtual bool
-    SupportsEmulatingIntructionsOfType (InstructionType inst_type) = 0;
+    SupportsEmulatingInstructionsOfType (InstructionType inst_type) = 0;
     
     virtual bool
     SetTargetTriple (const ArchSpec &arch) = 0;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/Error.h b/contrib/llvm/tools/lldb/include/lldb/Core/Error.h
index 9e45d5f555d..39c67f621c9 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/Error.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/Error.h
@@ -11,11 +11,10 @@
 #define __DCError_h__
 #if defined(__cplusplus)
 
-#if defined (__APPLE__)
-#include <mach/mach.h>
-#endif
-#include <stdint.h>
-#include <stdio.h>
+#include "llvm/Support/DataTypes.h"
+
+#include <cstdarg>
+#include <cstdio>
 #include <string>
 
 #include "lldb/lldb-private.h"
@@ -70,7 +69,7 @@ public:
     Error (ValueType err, lldb::ErrorType type = lldb::eErrorTypeGeneric);
 
     explicit
-    Error (const char* err_str);
+    Error (const char *format, ...) __attribute__ ((format (printf, 2, 3)));
     
     Error (const Error &rhs);
     //------------------------------------------------------------------
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/Flags.h b/contrib/llvm/tools/lldb/include/lldb/Core/Flags.h
index 233f098ead2..5f4f8830456 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/Flags.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/Flags.h
@@ -13,7 +13,6 @@
 
 
 #include <stdint.h>
-#include <unistd.h>
 
 namespace lldb_private {
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/Log.h b/contrib/llvm/tools/lldb/include/lldb/Core/Log.h
index ced6f2565d9..b389946e264 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/Log.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/Log.h
@@ -11,11 +11,10 @@
 #define liblldb_Log_h_
 
 // C Includes
-#include <stdbool.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <signal.h>
 #include <stdio.h>
-#include <unistd.h>
 
 // C++ Includes
 // Other libraries and framework includes
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/Module.h b/contrib/llvm/tools/lldb/include/lldb/Core/Module.h
index 9c135529f45..cae5a30be70 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/Module.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/Module.h
@@ -346,6 +346,32 @@ public:
                    bool append, 
                    SymbolContextList& sc_list);
 
+    //------------------------------------------------------------------
+    /// Find addresses by file/line
+    ///
+    /// @param[in] target_sp
+    ///     The target the addresses are desired for.
+    ///
+    /// @param[in] file
+    ///     Source file to locate.
+    ///
+    /// @param[in] line
+    ///     Source line to locate.
+    ///
+    /// @param[in] function
+    ///	    Optional filter function. Addresses within this function will be
+    ///     added to the 'local' list. All others will be added to the 'extern' list.
+    ///
+    /// @param[out] output_local
+    ///     All matching addresses within 'function'
+    ///
+    /// @param[out] output_extern
+    ///     All matching addresses not within 'function'
+    void FindAddressesForLine (const lldb::TargetSP target_sp,
+                               const FileSpec &file, uint32_t line,
+                               Function *function,
+                               std::vector<Address> &output_local, std::vector<Address> &output_extern);
+
     //------------------------------------------------------------------
     /// Find global and static variables by name.
     ///
@@ -543,6 +569,18 @@ public:
         m_platform_file = file;
     }
 
+    const FileSpec &
+    GetRemoteInstallFileSpec () const
+    {
+        return m_remote_install_file;
+    }
+    
+    void
+    SetRemoteInstallFileSpec (const FileSpec &file)
+    {
+        m_remote_install_file = file;
+    }
+    
     const FileSpec &
     GetSymbolFileFileSpec () const
     {
@@ -723,8 +761,49 @@ public:
     bool
     ResolveFileAddress (lldb::addr_t vm_addr, Address& so_addr);
 
+    //------------------------------------------------------------------
+    /// Resolve the symbol context for the given address.
+    ///
+    /// Tries to resolve the matching symbol context based on a lookup
+    /// from the current symbol vendor.  If the lazy lookup fails,
+    /// an attempt is made to parse the eh_frame section to handle 
+    /// stripped symbols.  If this fails, an attempt is made to resolve
+    /// the symbol to the previous address to handle the case of a 
+    /// function with a tail call.
+    ///
+    /// Use properties of the modified SymbolContext to inspect any
+    /// resolved target, module, compilation unit, symbol, function,
+    /// function block or line entry.  Use the return value to determine
+    /// which of these properties have been modified.
+    ///
+    /// @param[in] so_addr
+    ///     A load address to resolve.
+    ///
+    /// @param[in] resolve_scope
+    ///     The scope that should be resolved (see SymbolContext::Scope).
+    ///     A combination of flags from the enumeration SymbolContextItem
+    ///     requesting a resolution depth.  Note that the flags that are
+    ///     actually resolved may be a superset of the requested flags.
+    ///     For instance, eSymbolContextSymbol requires resolution of
+    ///     eSymbolContextModule, and eSymbolContextFunction requires
+    ///     eSymbolContextSymbol.
+    ///
+    /// @param[out] sc
+    ///     The SymbolContext that is modified based on symbol resolution.
+    ///
+    /// @param[in] resolve_tail_call_address
+    ///     Determines if so_addr should resolve to a symbol in the case
+    ///     of a function whose last instruction is a call.  In this case,
+    ///     the PC can be one past the address range of the function.
+    ///
+    /// @return
+    ///     The scope that has been resolved (see SymbolContext::Scope).
+    ///
+    /// @see SymbolContext::Scope
+    //------------------------------------------------------------------
     uint32_t
-    ResolveSymbolContextForAddress (const Address& so_addr, uint32_t resolve_scope, SymbolContext& sc);
+    ResolveSymbolContextForAddress (const Address& so_addr, uint32_t resolve_scope,
+                                    SymbolContext& sc, bool resolve_tail_call_address = false);
 
     //------------------------------------------------------------------
     /// Resolve items in the symbol context for a given file and line.
@@ -992,6 +1071,7 @@ protected:
     lldb_private::UUID          m_uuid;         ///< Each module is assumed to have a unique identifier to help match it up to debug symbols.
     FileSpec                    m_file;         ///< The file representation on disk for this module (if there is one).
     FileSpec                    m_platform_file;///< The path to the module on the platform on which it is being debugged
+    FileSpec                    m_remote_install_file;  ///< If set when debugging on remote platforms, this module will be installed at this location
     FileSpec                    m_symfile_spec; ///< If this path is valid, then this is the file that _will_ be used as the symbol file for this module
     ConstString                 m_object_name;  ///< The name an object within this module that is selected, or empty of the module is represented by \a m_file.
     uint64_t                    m_object_offset;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/ModuleList.h b/contrib/llvm/tools/lldb/include/lldb/Core/ModuleList.h
index 1198e419648..f03f79fb00c 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/ModuleList.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/ModuleList.h
@@ -439,7 +439,35 @@ public:
     
     bool
     FindSourceFile (const FileSpec &orig_spec, FileSpec &new_spec) const;
-    
+
+
+    //------------------------------------------------------------------
+    /// Find addresses by file/line
+    ///
+    /// @param[in] target_sp
+    ///     The target the addresses are desired for.
+    ///
+    /// @param[in] file
+    ///     Source file to locate.
+    ///
+    /// @param[in] line
+    ///     Source line to locate.
+    ///
+    /// @param[in] function
+    ///     Optional filter function. Addresses within this function will be
+    ///     added to the 'local' list. All others will be added to the 'extern' list.
+    ///
+    /// @param[out] output_local
+    ///     All matching addresses within 'function'
+    ///
+    /// @param[out] output_extern
+    ///     All matching addresses not within 'function'
+    void FindAddressesForLine (const lldb::TargetSP target_sp,
+                               const FileSpec &file, uint32_t line,
+                               Function *function,
+                               std::vector<Address> &output_local, std::vector<Address> &output_extern);
+
+
     bool
     Remove (const lldb::ModuleSP &module_sp);
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/ModuleSpec.h b/contrib/llvm/tools/lldb/include/lldb/Core/ModuleSpec.h
index 10e1ea9f17a..dfeb7b73ca3 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/ModuleSpec.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/ModuleSpec.h
@@ -288,7 +288,7 @@ public:
     }
 
     
-    operator bool () const
+    explicit operator bool () const
     {
         if (m_file)
             return true;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/Opcode.h b/contrib/llvm/tools/lldb/include/lldb/Core/Opcode.h
index c07193b6205..fd80231a44e 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/Opcode.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/Opcode.h
@@ -38,7 +38,7 @@ namespace lldb_private {
             eType64,
             eTypeBytes
         };
-        
+
         Opcode () : m_type (eTypeInvalid)
         {
         }
@@ -78,7 +78,7 @@ namespace lldb_private {
         {
             return m_type;
         }
-    
+
         uint8_t
         GetOpcode8 (uint8_t invalid_opcode = UINT8_MAX) const
         {
@@ -91,7 +91,6 @@ namespace lldb_private {
             case Opcode::eType32:       break;
             case Opcode::eType64:       break;
             case Opcode::eTypeBytes:    break;
-                break;
             }
             return invalid_opcode;
         }
@@ -157,7 +156,7 @@ namespace lldb_private {
             m_type = eType16;
             m_data.inst16 = inst;
         }
-        
+
         void
         SetOpcode16_2 (uint32_t inst)
         {
@@ -206,7 +205,7 @@ namespace lldb_private {
                 return m_data.inst.bytes;
             return NULL;
         }
-        
+
         uint32_t
         GetByteSize () const
         {
@@ -222,7 +221,7 @@ namespace lldb_private {
             }
             return 0;
         }
-        
+
         // Get the opcode exactly as it would be laid out in memory.
         uint32_t
         GetData (DataExtractor &data) const;
@@ -246,7 +245,7 @@ namespace lldb_private {
             }
             return NULL;
         }
-        
+
         lldb::ByteOrder
         GetDataByteOrder () const;
 
@@ -257,7 +256,7 @@ namespace lldb_private {
             uint16_t inst16;
             uint32_t inst32;
             uint64_t inst64;
-            struct 
+            struct
             {
                 uint8_t bytes[16]; // This must be big enough to handle any opcode for any supported target.
                 uint8_t length;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/PluginManager.h b/contrib/llvm/tools/lldb/include/lldb/Core/PluginManager.h
index 91f8fbb997f..e02f43f4fa8 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/PluginManager.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/PluginManager.h
@@ -131,6 +131,24 @@ public:
     GetLanguageRuntimeCreateCallbackForPluginName (const ConstString &name);
 
 
+    //------------------------------------------------------------------
+    // SystemRuntime
+    //------------------------------------------------------------------
+    static bool
+    RegisterPlugin (const ConstString &name,
+                    const char *description,
+                    SystemRuntimeCreateInstance create_callback);
+
+    static bool
+    UnregisterPlugin (SystemRuntimeCreateInstance create_callback);
+
+    static SystemRuntimeCreateInstance
+    GetSystemRuntimeCreateCallbackAtIndex (uint32_t idx);
+
+    static SystemRuntimeCreateInstance
+    GetSystemRuntimeCreateCallbackForPluginName (const ConstString &name);
+
+
     //------------------------------------------------------------------
     // ObjectFile
     //------------------------------------------------------------------
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/RangeMap.h b/contrib/llvm/tools/lldb/include/lldb/Core/RangeMap.h
index ee42467c18b..d78504c7d28 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/RangeMap.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/RangeMap.h
@@ -592,7 +592,7 @@ namespace lldb_private {
         void
         Reserve (typename Collection::size_type size)
         {
-            m_entries.resize (size);
+            m_entries.reserve (size);
         }
 
         bool
@@ -1229,16 +1229,11 @@ namespace lldb_private {
                 typename Collection::const_iterator end = m_entries.end();
                 typename Collection::const_iterator pos = std::lower_bound (begin, end, entry, BaseLessThan);
                 
-                if (pos != end && pos->Contains(addr))
-                {
-                    return std::distance (begin, pos);
-                }
-                else if (pos != begin)
-                {
+                while(pos != begin && pos[-1].Contains(addr))
                     --pos;
-                    if (pos->Contains(addr))
-                        return std::distance (begin, pos);
-                }
+
+                if (pos != end && pos->Contains(addr))
+                    return std::distance (begin, pos);
             }
             return UINT32_MAX;
         }
@@ -1257,19 +1252,12 @@ namespace lldb_private {
                 typename Collection::iterator begin = m_entries.begin();
                 typename Collection::iterator end = m_entries.end();
                 typename Collection::iterator pos = std::lower_bound (begin, end, entry, BaseLessThan);
+
+                while(pos != begin && pos[-1].Contains(addr))
+                    --pos;
                 
                 if (pos != end && pos->Contains(addr))
-                {
                     return &(*pos);
-                }
-                else if (pos != begin)
-                {
-                    --pos;
-                    if (pos->Contains(addr))
-                    {
-                        return &(*pos);
-                    }
-                }
             }
             return NULL;
         }
@@ -1288,18 +1276,11 @@ namespace lldb_private {
                 typename Collection::const_iterator end = m_entries.end();
                 typename Collection::const_iterator pos = std::lower_bound (begin, end, entry, BaseLessThan);
                 
-                if (pos != end && pos->Contains(addr))
-                {
-                    return &(*pos); 
-                }
-                else if (pos != begin)
-                {
+                while(pos != begin && pos[-1].Contains(addr))
                     --pos;
-                    if (pos->Contains(addr))
-                    {
-                        return &(*pos); 
-                    }
-                }
+
+                if (pos != end && pos->Contains(addr))
+                    return &(*pos);
             }
             return NULL;
         }
@@ -1316,18 +1297,11 @@ namespace lldb_private {
                 typename Collection::const_iterator end = m_entries.end();
                 typename Collection::const_iterator pos = std::lower_bound (begin, end, range, BaseLessThan);
                 
-                if (pos != end && pos->Contains(range))
-                {
-                    return &(*pos); 
-                }
-                else if (pos != begin)
-                {
+                while(pos != begin && pos[-1].Contains(range))
                     --pos;
-                    if (pos->Contains(range))
-                    {
-                        return &(*pos); 
-                    }
-                }
+
+                if (pos != end && pos->Contains(range))
+                    return &(*pos);
             }
             return NULL;
         }
@@ -1501,12 +1475,15 @@ namespace lldb_private {
                 typename Collection::iterator end = m_entries.end();
                 typename Collection::iterator pos = std::lower_bound (begin, end, entry, BaseLessThan);
                 
+                while(pos != begin && pos[-1].addr == addr)
+                    --pos;
+
                 if (pos != end)
                 {
                     if (pos->addr == addr || !exact_match_only)
                         return &(*pos);
                 }
-           }
+            }
             return NULL;
         }
         
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/RegularExpression.h b/contrib/llvm/tools/lldb/include/lldb/Core/RegularExpression.h
index eeeb914bfa9..c116d439b94 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/RegularExpression.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/RegularExpression.h
@@ -11,7 +11,36 @@
 #define liblldb_DBRegex_h_
 #if defined(__cplusplus)
 
+#ifdef _WIN32
+#include "../lib/Support/regex_impl.h"
+
+typedef llvm_regmatch_t regmatch_t;
+typedef llvm_regex_t regex_t;
+
+inline int regcomp(llvm_regex_t * a, const char *b, int c)
+{
+    return llvm_regcomp(a, b, c);
+}
+
+inline size_t regerror(int a, const llvm_regex_t *b, char *c, size_t d)
+{
+    return llvm_regerror(a, b, c, d);
+}
+
+inline int regexec(const llvm_regex_t * a, const char * b, size_t c,
+    llvm_regmatch_t d [], int e)
+{
+    return llvm_regexec(a, b, c, d, e);
+}
+
+inline void regfree(llvm_regex_t * a)
+{
+    llvm_regfree(a);
+}
+
+#else
 #include <regex.h>
+#endif
 #include <stdint.h>
 
 #include <string>
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/StreamGDBRemote.h b/contrib/llvm/tools/lldb/include/lldb/Core/StreamGDBRemote.h
new file mode 100644
index 00000000000..3fdb6f6e701
--- /dev/null
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/StreamGDBRemote.h
@@ -0,0 +1,54 @@
+//===-- StreamGDBRemote.h ----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_StreamGDBRemote_h_
+#define liblldb_StreamGDBRemote_h_
+
+// C Includes
+// C++ Includes
+
+// Other libraries and framework includes
+// Project includes
+
+#include "lldb/Core/StreamString.h"
+
+namespace lldb_private {
+    
+    class StreamGDBRemote : public StreamString
+    {
+        public:
+        StreamGDBRemote ();
+        
+        StreamGDBRemote (uint32_t flags,
+                         uint32_t addr_size,
+                         lldb::ByteOrder byte_order);
+        
+        virtual
+        ~StreamGDBRemote ();
+        
+        //------------------------------------------------------------------
+        /// Output a block of data to the stream performing GDB-remote escaping.
+        ///
+        /// @param[in] s
+        ///     A block of data.
+        ///
+        /// @param[in] src_len
+        ///     The amount of data to write.
+        ///
+        /// @return
+        ///     Number of bytes written.
+        //------------------------------------------------------------------
+        int
+        PutEscapedBytes (const void* s,
+                         size_t src_len);
+    };
+
+} // namespace lldb_private
+
+#endif  // liblldb_StreamGDBRemote_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/UUID.h b/contrib/llvm/tools/lldb/include/lldb/Core/UUID.h
index fe72b8eb0c7..3bb14421b1e 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/UUID.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/UUID.h
@@ -12,6 +12,8 @@
 
 // C Includes
 // C++ Includes
+#include <string>
+
 // Other libraries and framework includes
 // Project includes
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/Value.h b/contrib/llvm/tools/lldb/include/lldb/Core/Value.h
index 5461ca73d08..c7d44322333 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/Value.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/Value.h
@@ -114,7 +114,7 @@ public:
 #if defined (ENABLE_128_BIT_SUPPORT)
                 else if (length >= 16) scalar = *(const __uint128_t *)bytes;
 #else
-                else if (length >= 16) scalar = *(const __uint64_t *)bytes;
+                else if (length >= 16) scalar = *(const uint64_t *)bytes;
 #endif
             }
             return scalar;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/ValueObject.h b/contrib/llvm/tools/lldb/include/lldb/Core/ValueObject.h
index 0d965d6ccc0..1ef421676ee 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/ValueObject.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/ValueObject.h
@@ -12,7 +12,6 @@
 
 // C Includes
 // C++ Includes
-#include <initializer_list>
 #include <map>
 #include <vector>
 // Other libraries and framework includes
@@ -217,229 +216,6 @@ public:
         }
 
     };
-    
-    struct DumpValueObjectOptions
-    {
-        uint32_t m_max_ptr_depth;
-        uint32_t m_max_depth;
-        bool m_show_types;
-        bool m_show_location;
-        bool m_use_objc;
-        lldb::DynamicValueType m_use_dynamic;
-        bool m_use_synthetic;
-        bool m_scope_already_checked;
-        bool m_flat_output;
-        uint32_t m_omit_summary_depth;
-        bool m_ignore_cap;
-        lldb::Format m_format;
-        lldb::TypeSummaryImplSP m_summary_sp;
-        std::string m_root_valobj_name;
-        bool m_hide_root_type;
-        bool m_hide_name;
-        bool m_hide_value;
-        
-        DumpValueObjectOptions() :
-            m_max_ptr_depth(0),
-            m_max_depth(UINT32_MAX),
-            m_show_types(false),
-            m_show_location(false),
-            m_use_objc(false),
-            m_use_dynamic(lldb::eNoDynamicValues),
-            m_use_synthetic(true),
-            m_scope_already_checked(false),
-            m_flat_output(false),
-            m_omit_summary_depth(0),
-            m_ignore_cap(false), 
-            m_format (lldb::eFormatDefault),
-            m_summary_sp(),
-            m_root_valobj_name(),
-            m_hide_root_type(false),  // provide a special compact display for "po"
-            m_hide_name(false), // provide a special compact display for "po"
-            m_hide_value(false) // provide a special compact display for "po"
-        {}
-        
-        static const DumpValueObjectOptions
-        DefaultOptions()
-        {
-            static DumpValueObjectOptions g_default_options;
-            
-            return g_default_options;
-        }
-        
-        DumpValueObjectOptions (const DumpValueObjectOptions& rhs) :
-            m_max_ptr_depth(rhs.m_max_ptr_depth),
-            m_max_depth(rhs.m_max_depth),
-            m_show_types(rhs.m_show_types),
-            m_show_location(rhs.m_show_location),
-            m_use_objc(rhs.m_use_objc),
-            m_use_dynamic(rhs.m_use_dynamic),
-            m_use_synthetic(rhs.m_use_synthetic),
-            m_scope_already_checked(rhs.m_scope_already_checked),
-            m_flat_output(rhs.m_flat_output),
-            m_omit_summary_depth(rhs.m_omit_summary_depth),
-            m_ignore_cap(rhs.m_ignore_cap),
-            m_format(rhs.m_format),
-            m_summary_sp(rhs.m_summary_sp),
-            m_root_valobj_name(rhs.m_root_valobj_name),
-            m_hide_root_type(rhs.m_hide_root_type),
-            m_hide_name(rhs.m_hide_name),
-            m_hide_value(rhs.m_hide_value)
-        {}
-        
-        DumpValueObjectOptions&
-        SetMaximumPointerDepth(uint32_t depth = 0)
-        {
-            m_max_ptr_depth = depth;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetMaximumDepth(uint32_t depth = 0)
-        {
-            m_max_depth = depth;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetShowTypes(bool show = false)
-        {
-            m_show_types = show;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetShowLocation(bool show = false)
-        {
-            m_show_location = show;
-            return *this;
-        }
-
-        DumpValueObjectOptions&
-        SetUseObjectiveC(bool use = false)
-        {
-            m_use_objc = use;
-            return *this;
-        }
-    
-        DumpValueObjectOptions&
-        SetShowSummary(bool show = true)
-        {
-            if (show == false)
-                SetOmitSummaryDepth(UINT32_MAX);
-            else
-                SetOmitSummaryDepth(0);
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetUseDynamicType(lldb::DynamicValueType dyn = lldb::eNoDynamicValues)
-        {
-            m_use_dynamic = dyn;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetUseSyntheticValue(bool use_synthetic = true)
-        {
-            m_use_synthetic = use_synthetic;
-            return *this;
-        }
-
-        DumpValueObjectOptions&
-        SetScopeChecked(bool check = true)
-        {
-            m_scope_already_checked = check;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetFlatOutput(bool flat = false)
-        {
-            m_flat_output = flat;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetOmitSummaryDepth(uint32_t depth = 0)
-        {
-            m_omit_summary_depth = depth;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetIgnoreCap(bool ignore = false)
-        {
-            m_ignore_cap = ignore;
-            return *this;
-        }
-
-        DumpValueObjectOptions&
-        SetRawDisplay(bool raw = false)
-        {
-            if (raw)
-            {
-                SetUseSyntheticValue(false);
-                SetOmitSummaryDepth(UINT32_MAX);
-                SetIgnoreCap(true);
-                SetHideName(false);
-                SetHideValue(false);
-            }
-            else
-            {
-                SetUseSyntheticValue(true);
-                SetOmitSummaryDepth(0);
-                SetIgnoreCap(false);
-                SetHideName(false);
-                SetHideValue(false);
-            }
-            return *this;
-        }
-
-        DumpValueObjectOptions&
-        SetFormat (lldb::Format format = lldb::eFormatDefault)
-        {
-            m_format = format;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetSummary (lldb::TypeSummaryImplSP summary = lldb::TypeSummaryImplSP())
-        {
-            m_summary_sp = summary;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetRootValueObjectName (const char* name = NULL)
-        {
-            if (name)
-                m_root_valobj_name.assign(name);
-            else
-                m_root_valobj_name.clear();
-            return *this;
-        }
-                
-        DumpValueObjectOptions&
-        SetHideRootType (bool hide_root_type = false)
-        {
-            m_hide_root_type = hide_root_type;
-            return *this;
-        }
-        
-        DumpValueObjectOptions&
-        SetHideName (bool hide_name = false)
-        {
-            m_hide_name = hide_name;
-            return *this;
-        }
-
-        DumpValueObjectOptions&
-        SetHideValue (bool hide_value = false)
-        {
-            m_hide_value = hide_value;
-            return *this;
-        }        
-    };
 
     class EvaluationPoint
     {
@@ -598,6 +374,10 @@ public:
     
     ClangASTType
     GetClangType ();
+    
+    // this vends a TypeImpl that is useful at the SB API layer
+    virtual TypeImpl
+    GetTypeImpl ();
 
     //------------------------------------------------------------------
     // Sublasses must implement the functions below.
@@ -725,6 +505,9 @@ public:
     virtual uint64_t
     GetValueAsUnsigned (uint64_t fail_value, bool *success = NULL);
 
+    virtual int64_t
+    GetValueAsSigned (int64_t fail_value, bool *success = NULL);
+    
     virtual bool
     SetValueFromCString (const char *value_str, Error& error);
     
@@ -768,6 +551,23 @@ public:
     lldb::ValueObjectSP
     GetChildAtIndexPath (const std::vector< std::pair<size_t, bool> > &idxs,
                          size_t* index_of_error = NULL);
+
+    // this will always create the children if necessary
+    lldb::ValueObjectSP
+    GetChildAtNamePath (const std::initializer_list<ConstString> &names,
+                        ConstString* name_of_error = NULL);
+    
+    lldb::ValueObjectSP
+    GetChildAtNamePath (const std::vector<ConstString> &names,
+                        ConstString* name_of_error = NULL);
+    
+    lldb::ValueObjectSP
+    GetChildAtNamePath (const std::initializer_list< std::pair<ConstString, bool> > &names,
+                        ConstString* name_of_error = NULL);
+    
+    lldb::ValueObjectSP
+    GetChildAtNamePath (const std::vector< std::pair<ConstString, bool> > &names,
+                        ConstString* name_of_error = NULL);
     
     virtual lldb::ValueObjectSP
     GetChildMemberWithName (const ConstString &name, bool can_create);
@@ -937,13 +737,12 @@ public:
     virtual SymbolContextScope *
     GetSymbolContextScope();
     
-    static void
-    DumpValueObject (Stream &s,
-                     ValueObject *valobj);    
-    static void
-    DumpValueObject (Stream &s,
-                     ValueObject *valobj,
-                     const DumpValueObjectOptions& options);
+    void
+    Dump (Stream &s);
+    
+    void
+    Dump (Stream &s,
+          const DumpValueObjectOptions& options);
 
     static lldb::ValueObjectSP
     CreateValueObjectFromExpression (const char* name,
@@ -962,13 +761,11 @@ public:
                                const ExecutionContext& exe_ctx,
                                ClangASTType type);
     
-    static void
-    LogValueObject (Log *log,
-                    ValueObject *valobj);
+    void
+    LogValueObject (Log *log);
 
-    static void
+    void
     LogValueObject (Log *log,
-                    ValueObject *valobj,
                     const DumpValueObjectOptions& options);
 
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectDynamicValue.h b/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectDynamicValue.h
index c0f6baade3f..68f88c96e54 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectDynamicValue.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/ValueObjectDynamicValue.h
@@ -93,6 +93,9 @@ public:
     virtual bool
     SetData (DataExtractor &data, Error &error);
     
+    virtual TypeImpl
+    GetTypeImpl ();
+    
 protected:
     virtual bool
     UpdateValue ();
@@ -116,6 +119,7 @@ protected:
     TypeAndOrName m_dynamic_type_info; // We can have a type_sp or just a name
     lldb::ValueObjectSP m_owning_valobj_sp;
     lldb::DynamicValueType m_use_dynamic;
+    TypeImpl m_type_impl;
 
 private:
     friend class ValueObject;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Core/dwarf.h b/contrib/llvm/tools/lldb/include/lldb/Core/dwarf.h
index bf77125d86a..91c8dfb9d0d 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Core/dwarf.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Core/dwarf.h
@@ -11,7 +11,6 @@
 #define DebugBase_dwarf_h_
 
 #include <stdint.h>
-#include <stdbool.h>
 
 // Get the DWARF constant defintions from llvm
 #include "llvm/Support/Dwarf.h"
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFormatterFunctions.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFormatterFunctions.h
index 2f56c56810a..415ef9be59e 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFormatterFunctions.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/CXXFormatterFunctions.h
@@ -17,6 +17,8 @@
 
 #include "lldb/Core/ConstString.h"
 #include "lldb/DataFormatters/FormatClasses.h"
+#include "lldb/DataFormatters/TypeSynthetic.h"
+#include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Target.h"
 
 #include "clang/AST/ASTContext.h"
@@ -868,6 +870,39 @@ namespace lldb_private {
         
         SyntheticChildrenFrontEnd* LibcxxStdMapSyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP);
         
+        class LibcxxStdUnorderedMapSyntheticFrontEnd : public SyntheticChildrenFrontEnd
+        {
+        public:
+            LibcxxStdUnorderedMapSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp);
+            
+            virtual size_t
+            CalculateNumChildren ();
+            
+            virtual lldb::ValueObjectSP
+            GetChildAtIndex (size_t idx);
+            
+            virtual bool
+            Update();
+            
+            virtual bool
+            MightHaveChildren ();
+            
+            virtual size_t
+            GetIndexOfChildWithName (const ConstString &name);
+            
+            virtual
+            ~LibcxxStdUnorderedMapSyntheticFrontEnd ();
+        private:
+            
+            ValueObject* m_tree;
+            size_t m_num_elements;
+            ValueObject* m_next_element;
+            std::map<size_t,lldb::ValueObjectSP> m_children;
+            std::vector<std::pair<ValueObject*, uint64_t> > m_elements_cache;
+        };
+        
+        SyntheticChildrenFrontEnd* LibcxxStdUnorderedMapSyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP);
+        
     } // namespace formatters
 } // namespace lldb_private
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/DataVisualization.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/DataVisualization.h
index 499e0fe14d9..ca0714c29f8 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/DataVisualization.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/DataVisualization.h
@@ -36,40 +36,19 @@ public:
     static uint32_t
     GetCurrentRevision ();
     
-    class ValueFormats
-    {
-    public:
-        static lldb::TypeFormatImplSP
-        GetFormat (ValueObject& valobj, lldb::DynamicValueType use_dynamic);
-        
-        static lldb::TypeFormatImplSP
-        GetFormat (const ConstString &type);
-        
-        static void
-        Add (const ConstString &type, const lldb::TypeFormatImplSP &entry);
-        
-        static bool
-        Delete (const ConstString &type);
-        
-        static void
-        Clear ();
-        
-        static void
-        LoopThrough (TypeFormatImpl::ValueCallback callback, void* callback_baton);
-        
-        static size_t
-        GetCount ();
-        
-        static lldb::TypeNameSpecifierImplSP
-        GetTypeNameSpecifierForFormatAtIndex (size_t);
-        
-        static lldb::TypeFormatImplSP
-        GetFormatAtIndex (size_t);
-    };
+    static bool
+    ShouldPrintAsOneLiner (ValueObject& valobj);
+    
+    static lldb::TypeFormatImplSP
+    GetFormat (ValueObject& valobj,
+               lldb::DynamicValueType use_dynamic);
+    
+    static lldb::TypeFormatImplSP
+    GetFormatForType (lldb::TypeNameSpecifierImplSP type_sp);
     
     static lldb::TypeSummaryImplSP
-    GetSummaryFormat(ValueObject& valobj,
-                     lldb::DynamicValueType use_dynamic);
+    GetSummaryFormat (ValueObject& valobj,
+                      lldb::DynamicValueType use_dynamic);
 
     static lldb::TypeSummaryImplSP
     GetSummaryForType (lldb::TypeNameSpecifierImplSP type_sp);
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatCache.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatCache.h
index 941b96c1fac..1505d7c4618 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatCache.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatCache.h
@@ -18,6 +18,7 @@
 // Project includes
 #include "lldb/lldb-public.h"
 #include "lldb/Core/ConstString.h"
+#include "lldb/Host/Mutex.h"
 #include "lldb/DataFormatters/FormatClasses.h"
 
 namespace lldb_private {
@@ -27,29 +28,41 @@ private:
     struct Entry
     {
     private:
+        bool m_format_cached : 1;
         bool m_summary_cached : 1;
         bool m_synthetic_cached : 1;
         
+        lldb::TypeFormatImplSP m_format_sp;
         lldb::TypeSummaryImplSP m_summary_sp;
         lldb::SyntheticChildrenSP m_synthetic_sp;
     public:
         Entry ();
+        Entry (lldb::TypeFormatImplSP);
         Entry (lldb::TypeSummaryImplSP);
         Entry (lldb::SyntheticChildrenSP);
-        Entry (lldb::TypeSummaryImplSP,lldb::SyntheticChildrenSP);
+        Entry (lldb::TypeFormatImplSP,lldb::TypeSummaryImplSP,lldb::SyntheticChildrenSP);
 
+        bool
+        IsFormatCached ();
+        
         bool
         IsSummaryCached ();
         
         bool
         IsSyntheticCached ();
         
+        lldb::TypeFormatImplSP
+        GetFormat ();
+        
         lldb::TypeSummaryImplSP
         GetSummary ();
         
         lldb::SyntheticChildrenSP
         GetSynthetic ();
         
+        void
+        SetFormat (lldb::TypeFormatImplSP);
+        
         void
         SetSummary (lldb::TypeSummaryImplSP);
         
@@ -69,12 +82,18 @@ private:
 public:
     FormatCache ();
     
+    bool
+    GetFormat (const ConstString& type,lldb::TypeFormatImplSP& format_sp);
+    
     bool
     GetSummary (const ConstString& type,lldb::TypeSummaryImplSP& summary_sp);
 
     bool
     GetSynthetic (const ConstString& type,lldb::SyntheticChildrenSP& synthetic_sp);
     
+    void
+    SetFormat (const ConstString& type,lldb::TypeFormatImplSP& format_sp);
+    
     void
     SetSummary (const ConstString& type,lldb::TypeSummaryImplSP& summary_sp);
     
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatClasses.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatClasses.h
index 48a8eda4ad4..651160371c6 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatClasses.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatClasses.h
@@ -10,10 +10,6 @@
 #ifndef lldb_FormatClasses_h_
 #define lldb_FormatClasses_h_
 
-// C Includes
-#include <stdint.h>
-#include <unistd.h>
-
 // C++ Includes
 #include <string>
 #include <vector>
@@ -24,17 +20,86 @@
 #include "lldb/lldb-public.h"
 #include "lldb/lldb-enumerations.h"
 
-#include "lldb/Core/ValueObject.h"
-#include "lldb/Interpreter/ScriptInterpreterPython.h"
 #include "lldb/Symbol/ClangASTType.h"
 #include "lldb/Symbol/Type.h"
 
-#include "lldb/DataFormatters/TypeFormat.h"
-#include "lldb/DataFormatters/TypeSummary.h"
-#include "lldb/DataFormatters/TypeSynthetic.h"
-
 namespace lldb_private {
 
+class FormattersMatchCandidate
+{
+public:
+    
+    FormattersMatchCandidate (ConstString name,
+                              uint32_t reason,
+                              bool strip_ptr,
+                              bool strip_ref,
+                              bool strip_tydef) :
+    m_type_name(name),
+    m_reason(reason),
+    m_stripped_pointer(strip_ptr),
+    m_stripped_reference(strip_ref),
+    m_stripped_typedef(strip_tydef)
+    {
+    }
+    
+    ~FormattersMatchCandidate ()
+    {}
+    
+    ConstString
+    GetTypeName () const
+    {
+        return m_type_name;
+    }
+    
+    uint32_t
+    GetReason () const
+    {
+        return m_reason;
+    }
+    
+    bool
+    DidStripPointer () const
+    {
+        return m_stripped_pointer;
+    }
+    
+    bool
+    DidStripReference () const
+    {
+        return m_stripped_reference;
+    }
+    
+    bool
+    DidStripTypedef () const
+    {
+        return m_stripped_typedef;
+    }
+    
+    template <class Formatter>
+    bool
+    IsMatch (const std::shared_ptr<Formatter>& formatter_sp) const
+    {
+        if (!formatter_sp)
+            return false;
+        if (formatter_sp->Cascades() == false && DidStripTypedef())
+            return false;
+        if (formatter_sp->SkipsPointers() && DidStripPointer())
+            return false;
+        if (formatter_sp->SkipsReferences() && DidStripReference())
+            return false;
+        return true;
+    }
+    
+private:
+    ConstString m_type_name;
+    uint32_t m_reason;
+    bool m_stripped_pointer;
+    bool m_stripped_reference;
+    bool m_stripped_typedef;
+};
+
+typedef std::vector<FormattersMatchCandidate> FormattersMatchVector;
+    
 class TypeNameSpecifierImpl
 {
 public:
@@ -61,7 +126,7 @@ public:
         if (type)
         {
             m_type.m_type_name.assign(type->GetName().GetCString());
-            m_type.m_typeimpl_sp = lldb::TypeImplSP(new TypeImpl(type));
+            m_type.m_type_pair.SetType(type);
         }
     }
 
@@ -72,7 +137,7 @@ public:
         if (type.IsValid())
         {
             m_type.m_type_name.assign(type.GetConstTypeName().GetCString());
-            m_type.m_typeimpl_sp = lldb::TypeImplSP(new TypeImpl(type));
+            m_type.m_type_pair.SetType(type);
         }
     }
     
@@ -87,16 +152,16 @@ public:
     lldb::TypeSP
     GetTypeSP ()
     {
-        if (m_type.m_typeimpl_sp && m_type.m_typeimpl_sp->IsValid())
-            return m_type.m_typeimpl_sp->GetTypeSP();
+        if (m_type.m_type_pair.IsValid())
+            return m_type.m_type_pair.GetTypeSP();
         return lldb::TypeSP();
     }
     
     ClangASTType
     GetClangASTType ()
     {
-        if (m_type.m_typeimpl_sp && m_type.m_typeimpl_sp->IsValid())
-            return m_type.m_typeimpl_sp->GetClangASTType();
+        if (m_type.m_type_pair.IsValid())
+            return m_type.m_type_pair.GetClangASTType();
         return ClangASTType();
     }
     
@@ -109,12 +174,11 @@ public:
 private:
     bool m_is_regex;
     // this works better than TypeAndOrName because the latter only wraps a TypeSP
-    // whereas TypeImplSP can also be backed by a ClangASTType which is more commonly
-    // used in LLDB. moreover, TypeImplSP is also what is currently backing SBType
+    // whereas TypePair can also be backed by a ClangASTType
     struct TypeOrName
     {
         std::string m_type_name;
-        lldb::TypeImplSP m_typeimpl_sp;
+        TypePair m_type_pair;
     };
     TypeOrName m_type;
     
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h
index 162e25143f2..750e5300831 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatManager.h
@@ -19,10 +19,13 @@
 #include "lldb/lldb-enumerations.h"
 
 #include "lldb/DataFormatters/FormatCache.h"
+#include "lldb/DataFormatters/FormatClasses.h"
 #include "lldb/DataFormatters/FormatNavigator.h"
 #include "lldb/DataFormatters/TypeCategory.h"
 #include "lldb/DataFormatters/TypeCategoryMap.h"
 
+#include <atomic>
+
 namespace lldb_private {
     
 // this file (and its. cpp) contain the low-level implementation of LLDB Data Visualization
@@ -32,8 +35,6 @@ namespace lldb_private {
 
 class FormatManager : public IFormatChangeListener
 {
-    typedef FormatNavigator<ConstString, TypeFormatImpl> ValueNavigator;
-    typedef ValueNavigator::MapType ValueMap;
     typedef FormatMap<ConstString, TypeSummaryImpl> NamedSummariesMap;
     typedef TypeCategoryMap::MapType::iterator CategoryMapIterator;
 public:
@@ -42,12 +43,6 @@ public:
     
     FormatManager ();
     
-    ValueNavigator&
-    GetValueNavigator ()
-    {
-        return m_value_nav;
-    }
-    
     NamedSummariesMap&
     GetNamedSummaryNavigator ()
     {
@@ -124,6 +119,9 @@ public:
     lldb::TypeCategoryImplSP
     GetCategory (const ConstString& category_name,
                  bool can_create = true);
+
+    lldb::TypeFormatImplSP
+    GetFormatForType (lldb::TypeNameSpecifierImplSP type_sp);
     
     lldb::TypeSummaryImplSP
     GetSummaryForType (lldb::TypeNameSpecifierImplSP type_sp);
@@ -141,6 +139,10 @@ public:
     GetSyntheticChildrenForType (lldb::TypeNameSpecifierImplSP type_sp);
 #endif
     
+    lldb::TypeFormatImplSP
+    GetFormat (ValueObject& valobj,
+               lldb::DynamicValueType use_dynamic);
+    
     lldb::TypeSummaryImplSP
     GetSummaryFormat (ValueObject& valobj,
                       lldb::DynamicValueType use_dynamic);
@@ -188,10 +190,17 @@ public:
     static lldb::Format
     GetSingleItemFormat (lldb::Format vector_format);
     
+    // this returns true if the ValueObjectPrinter is *highly encouraged*
+    // to actually represent this ValueObject in one-liner format
+    // If this object has a summary formatter, however, we should not
+    // try and do one-lining, just let the summary do the right thing
+    bool
+    ShouldPrintAsOneLiner (ValueObject& valobj);
+    
     void
     Changed ()
     {
-        __sync_add_and_fetch(&m_last_revision, +1);
+        ++m_last_revision;
         m_format_cache.Clear ();
     }
     
@@ -205,11 +214,39 @@ public:
     {
     }
     
+    static FormattersMatchVector
+    GetPossibleMatches (ValueObject& valobj,
+                        lldb::DynamicValueType use_dynamic)
+    {
+        FormattersMatchVector matches;
+        GetPossibleMatches (valobj,
+                            valobj.GetClangType(),
+                            lldb_private::eFormatterChoiceCriterionDirectChoice,
+                            use_dynamic,
+                            matches,
+                            false,
+                            false,
+                            false,
+                            true);
+        return matches;
+    }
+
 private:
+    
+    static void
+    GetPossibleMatches (ValueObject& valobj,
+                        ClangASTType clang_type,
+                        uint32_t reason,
+                        lldb::DynamicValueType use_dynamic,
+                        FormattersMatchVector& entries,
+                        bool did_strip_ptr,
+                        bool did_strip_ref,
+                        bool did_strip_typedef,
+                        bool root_level = false);
+    
     FormatCache m_format_cache;
-    ValueNavigator m_value_nav;
     NamedSummariesMap m_named_summaries_map;
-    uint32_t m_last_revision;
+    std::atomic<uint32_t> m_last_revision;
     TypeCategoryMap m_categories_map;
     
     ConstString m_default_category_name;
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatNavigator.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatNavigator.h
index a738cfd069e..1b82776fb28 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatNavigator.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/FormatNavigator.h
@@ -26,6 +26,9 @@
 #include "lldb/Core/ValueObject.h"
 
 #include "lldb/DataFormatters/FormatClasses.h"
+#include "lldb/DataFormatters/TypeFormat.h"
+#include "lldb/DataFormatters/TypeSummary.h"
+#include "lldb/DataFormatters/TypeSynthetic.h"
 
 #include "lldb/Symbol/ClangASTContext.h"
 #include "lldb/Symbol/ClangASTType.h"
@@ -76,7 +79,7 @@ GetValidTypeName_Impl (const ConstString& type)
 {
     int strip_len = 0;
     
-    if (type == false)
+    if ((bool)type == false)
         return type;
     
     const char* type_cstr = type.AsCString();
@@ -459,228 +462,29 @@ protected:
         }
         return false;
     }
-    
-    bool
-    Get_BitfieldMatch (ValueObject& valobj,
-                       ConstString typeName,
-                       MapValueType& entry,
-                       uint32_t& reason)
-    {
-        Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
-        // for bitfields, append size to the typename so one can custom format them
-        StreamString sstring;
-        sstring.Printf("%s:%d",typeName.AsCString(),valobj.GetBitfieldBitSize());
-        ConstString bitfieldname = ConstString(sstring.GetData());
-        if (log)
-            log->Printf("[Get_BitfieldMatch] appended bitfield info, final result is %s", bitfieldname.GetCString());
-        if (Get(bitfieldname, entry))
-        {
-            if (log)
-                log->Printf("[Get_BitfieldMatch] bitfield direct match found, returning");
-            return true;
-        }
-        else
-        {
-            reason |= lldb_private::eFormatterChoiceCriterionStrippedBitField;
-            if (log)
-                log->Printf("[Get_BitfieldMatch] no bitfield direct match");
-            return false;
-        }
-    }
-    
-    bool Get_ObjC (ValueObject& valobj,
-                   MapValueType& entry)
-    {
-        Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
-        lldb::ProcessSP process_sp = valobj.GetProcessSP();
-        ObjCLanguageRuntime* runtime = process_sp->GetObjCLanguageRuntime();
-        if (runtime == NULL)
-        {
-            if (log)
-                log->Printf("[Get_ObjC] no valid ObjC runtime, skipping dynamic");
-            return false;
-        }
-        ObjCLanguageRuntime::ClassDescriptorSP objc_class_sp (runtime->GetClassDescriptor(valobj));
-        if (!objc_class_sp)
-        {
-            if (log)
-                log->Printf("[Get_ObjC] invalid ISA, skipping dynamic");
-            return false;
-        }
-        ConstString name (objc_class_sp->GetClassName());
-        if (log)
-            log->Printf("[Get_ObjC] dynamic type inferred is %s - looking for direct dynamic match", name.GetCString());
-        if (Get(name, entry))
-        {
-            if (log)
-                log->Printf("[Get_ObjC] direct dynamic match found, returning");
-            return true;
-        }
-        if (log)
-            log->Printf("[Get_ObjC] no dynamic match");
-        return false;
-    }
-    
-    bool
-    Get_Impl (ValueObject& valobj,
-              ClangASTType clang_type,
-              MapValueType& entry,
-              lldb::DynamicValueType use_dynamic,
-              uint32_t& reason)
-    {
-        Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
 
-        if (!clang_type.IsValid())
+    bool
+    Get (const FormattersMatchVector& candidates,
+         MapValueType& entry,
+         uint32_t *reason)
+    {
+        for (const FormattersMatchCandidate& candidate : candidates)
         {
-            if (log)
-                log->Printf("[Get_Impl] type is invalid, returning");
-            return false;
-        }
-        
-        clang_type = clang_type.RemoveFastQualifiers();
-
-        ConstString typeName(clang_type.GetConstTypeName());
-        
-        if (valobj.GetBitfieldBitSize() > 0)
-        {
-            if (Get_BitfieldMatch(valobj, typeName, entry, reason))
-                return true;
-        }
-        
-        if (log)
-            log->Printf("[Get_Impl] trying to get %s for VO name %s of type %s",
-                        m_name.c_str(),
-                        valobj.GetName().AsCString(),
-                        typeName.AsCString());
-        
-        if (Get(typeName, entry))
-        {
-            if (log)
-                log->Printf("[Get] direct match found, returning");
-            return true;
-        }
-        if (log)
-            log->Printf("[Get_Impl] no direct match");
-        
-        // strip pointers and references and see if that helps
-        if (clang_type.IsReferenceType())
-        {
-            if (log)
-                log->Printf("[Get_Impl] stripping reference");
-            if (Get_Impl(valobj, clang_type.GetNonReferenceType(), entry, use_dynamic, reason) && !entry->SkipsReferences())
+            if (Get(candidate.GetTypeName(),entry))
             {
-                reason |= lldb_private::eFormatterChoiceCriterionStrippedPointerReference;
-                return true;
-            }
-        }
-        else if (clang_type.IsPointerType())
-        {
-            if (log)
-                log->Printf("[Get_Impl] stripping pointer");
-            if (Get_Impl(valobj, clang_type.GetPointeeType(), entry, use_dynamic, reason) && !entry->SkipsPointers())
-            {
-                reason |= lldb_private::eFormatterChoiceCriterionStrippedPointerReference;
-                return true;
-            }
-        }
-        
-        bool canBeObjCDynamic = valobj.GetClangType().IsPossibleDynamicType (NULL,
-                                                                             false, // no C++
-                                                                             true); // yes ObjC
-        
-        if (canBeObjCDynamic)
-        {
-            if (use_dynamic != lldb::eNoDynamicValues)
-            {
-                if (log)
-                    log->Printf("[Get_Impl] allowed to figure out dynamic ObjC type");
-                if (Get_ObjC(valobj,entry))
+                if (candidate.IsMatch(entry) == false)
                 {
-                    reason |= lldb_private::eFormatterChoiceCriterionDynamicObjCDiscovery;
-                    return true;
+                    entry.reset();
+                    continue;
                 }
-            }
-            if (log)
-                log->Printf("[Get_Impl] dynamic disabled or failed - stripping ObjC pointer");
-            if (Get_Impl(valobj, clang_type.GetPointeeType(), entry, use_dynamic, reason) && !entry->SkipsPointers())
-            {
-                reason |= lldb_private::eFormatterChoiceCriterionStrippedPointerReference;
-                return true;
-            }
-        }
-        
-        // try to strip typedef chains
-        if (clang_type.IsTypedefType())
-        {
-            if (log)
-                log->Printf("[Get_Impl] stripping typedef");
-            if ((Get_Impl(valobj, clang_type.GetTypedefedType(), entry, use_dynamic, reason)) && entry->Cascades())
-            {
-                reason |= lldb_private::eFormatterChoiceCriterionNavigatedTypedefs;
-                return true;
-            }
-        }
-        
-        // out of luck here
-        return false;
-    }
-    
-    // we are separately passing in valobj and type because the valobj is fixed (and is used for ObjC discovery and bitfield size)
-    // but the type can change (e.g. stripping pointers, ...)
-    bool Get (ValueObject& valobj,
-              ClangASTType clang_type,
-              MapValueType& entry,
-              lldb::DynamicValueType use_dynamic,
-              uint32_t& reason)
-    {
-        Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
-        
-        if (Get_Impl (valobj, clang_type, entry, use_dynamic, reason))
-            return true;
-        
-        // try going to the unqualified type
-        do {
-            if (log)
-                log->Printf("[Get] trying the unqualified type");
-            if (!clang_type.IsValid())
-                break;
-
-            ClangASTType unqual_clang_ast_type = clang_type.GetFullyUnqualifiedType();
-            if (!unqual_clang_ast_type.IsValid())
-            {
-                if (log)
-                    log->Printf("[Get] could not get the unqual_clang_ast_type");
-                break;
-            }
-            if (unqual_clang_ast_type.GetOpaqueQualType() != clang_type.GetOpaqueQualType())
-            {
-                if (log)
-                    log->Printf("[Get] unqualified type is there and is not the same, let's try");
-                if (Get_Impl (valobj, unqual_clang_ast_type,entry, use_dynamic, reason))
-                    return true;
-            }
-            else if (log)
-                log->Printf("[Get] unqualified type same as original type");
-        } while(false);
-        
-        // if all else fails, go to static type
-        if (valobj.IsDynamic())
-        {
-            if (log)
-                log->Printf("[Get] going to static value");
-            lldb::ValueObjectSP static_value_sp(valobj.GetStaticValue());
-            if (static_value_sp)
-            {
-                if (log)
-                    log->Printf("[Get] has a static value - actually use it");
-                if (Get(*static_value_sp.get(), static_value_sp->GetClangType(), entry, use_dynamic, reason))
+                else
                 {
-                    reason |= lldb_private::eFormatterChoiceCriterionWentToStaticValue;
+                    if(reason)
+                        *reason = candidate.GetReason();
                     return true;
                 }
             }
         }
-        
         return false;
     }
 };
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategory.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategory.h
index b76d84f4772..082395a0461 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategory.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategory.h
@@ -18,12 +18,15 @@
 #include "lldb/lldb-public.h"
 #include "lldb/lldb-enumerations.h"
 
+#include "lldb/DataFormatters/FormatClasses.h"
 #include "lldb/DataFormatters/FormatNavigator.h"
 
 namespace lldb_private {    
     class TypeCategoryImpl
     {
     private:
+        typedef FormatNavigator<ConstString, TypeFormatImpl> ValueNavigator;
+        typedef FormatNavigator<lldb::RegularExpressionSP, TypeFormatImpl> RegexValueNavigator;
         
         typedef FormatNavigator<ConstString, TypeSummaryImpl> SummaryNavigator;
         typedef FormatNavigator<lldb::RegularExpressionSP, TypeSummaryImpl> RegexSummaryNavigator;
@@ -35,11 +38,16 @@ namespace lldb_private {
         typedef FormatNavigator<ConstString, ScriptedSyntheticChildren> SynthNavigator;
         typedef FormatNavigator<lldb::RegularExpressionSP, ScriptedSyntheticChildren> RegexSynthNavigator;
 #endif // #ifndef LLDB_DISABLE_PYTHON
-        
+
+        typedef ValueNavigator::MapType ValueMap;
+        typedef RegexValueNavigator::MapType RegexValueMap;
+
         typedef SummaryNavigator::MapType SummaryMap;
         typedef RegexSummaryNavigator::MapType RegexSummaryMap;
+        
         typedef FilterNavigator::MapType FilterMap;
         typedef RegexFilterNavigator::MapType RegexFilterMap;
+
 #ifndef LLDB_DISABLE_PYTHON
         typedef SynthNavigator::MapType SynthMap;
         typedef RegexSynthNavigator::MapType RegexSynthMap;
@@ -49,9 +57,13 @@ namespace lldb_private {
         
         typedef uint16_t FormatCategoryItems;
         static const uint16_t ALL_ITEM_TYPES = UINT16_MAX;
+
+        typedef ValueNavigator::SharedPointer ValueNavigatorSP;
+        typedef RegexValueNavigator::SharedPointer RegexValueNavigatorSP;
         
         typedef SummaryNavigator::SharedPointer SummaryNavigatorSP;
         typedef RegexSummaryNavigator::SharedPointer RegexSummaryNavigatorSP;
+
         typedef FilterNavigator::SharedPointer FilterNavigatorSP;
         typedef RegexFilterNavigator::SharedPointer RegexFilterNavigatorSP;
 #ifndef LLDB_DISABLE_PYTHON
@@ -62,6 +74,18 @@ namespace lldb_private {
         TypeCategoryImpl (IFormatChangeListener* clist,
                           ConstString name);
         
+        ValueNavigatorSP
+        GetValueNavigator ()
+        {
+            return ValueNavigatorSP(m_value_nav);
+        }
+        
+        RegexValueNavigatorSP
+        GetRegexValueNavigator ()
+        {
+            return RegexValueNavigatorSP(m_regex_value_nav);
+        }
+        
         SummaryNavigatorSP
         GetSummaryNavigator ()
         {
@@ -85,6 +109,9 @@ namespace lldb_private {
         {
             return RegexFilterNavigatorSP(m_regex_filter_nav);
         }
+
+        ValueNavigator::MapValueType
+        GetFormatForType (lldb::TypeNameSpecifierImplSP type_sp);
         
         SummaryNavigator::MapValueType
         GetSummaryForType (lldb::TypeNameSpecifierImplSP type_sp);
@@ -97,8 +124,14 @@ namespace lldb_private {
         GetSyntheticForType (lldb::TypeNameSpecifierImplSP type_sp);
 #endif
         
+        lldb::TypeNameSpecifierImplSP
+        GetTypeNameSpecifierForFormatAtIndex (size_t index);
+        
         lldb::TypeNameSpecifierImplSP
         GetTypeNameSpecifierForSummaryAtIndex (size_t index);
+
+        ValueNavigator::MapValueType
+        GetFormatAtIndex (size_t index);
         
         SummaryNavigator::MapValueType
         GetSummaryAtIndex (size_t index);
@@ -147,14 +180,20 @@ namespace lldb_private {
         
         bool
         Get (ValueObject& valobj,
-             lldb::TypeSummaryImplSP& entry,
-             lldb::DynamicValueType use_dynamic,
+             const FormattersMatchVector& candidates,
+             lldb::TypeFormatImplSP& entry,
              uint32_t* reason = NULL);
         
         bool
         Get (ValueObject& valobj,
+             const FormattersMatchVector& candidates,
+             lldb::TypeSummaryImplSP& entry,
+             uint32_t* reason = NULL);
+        
+        bool
+        Get (ValueObject& valobj,
+             const FormattersMatchVector& candidates,
              lldb::SyntheticChildrenSP& entry,
-             lldb::DynamicValueType use_dynamic,
              uint32_t* reason = NULL);
         
         void
@@ -183,10 +222,15 @@ namespace lldb_private {
         typedef std::shared_ptr<TypeCategoryImpl> SharedPointer;
         
     private:
+        ValueNavigator::SharedPointer m_value_nav;
+        RegexValueNavigator::SharedPointer m_regex_value_nav;
+        
         SummaryNavigator::SharedPointer m_summary_nav;
         RegexSummaryNavigator::SharedPointer m_regex_summary_nav;
+
         FilterNavigator::SharedPointer m_filter_nav;
         RegexFilterNavigator::SharedPointer m_regex_filter_nav;
+
 #ifndef LLDB_DISABLE_PYTHON
         SynthNavigator::SharedPointer m_synth_nav;
         RegexSynthNavigator::SharedPointer m_regex_synth_nav;
@@ -213,6 +257,9 @@ namespace lldb_private {
         
         friend class TypeCategoryMap;
         
+        friend class FormatNavigator<ConstString, TypeFormatImpl>;
+        friend class FormatNavigator<lldb::RegularExpressionSP, TypeFormatImpl>;
+        
         friend class FormatNavigator<ConstString, TypeSummaryImpl>;
         friend class FormatNavigator<lldb::RegularExpressionSP, TypeSummaryImpl>;
         
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategoryMap.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategoryMap.h
index c2465ad13aa..6bed1871989 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategoryMap.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeCategoryMap.h
@@ -93,6 +93,10 @@ namespace lldb_private {
         {
             return m_map.size();
         }
+
+        lldb::TypeFormatImplSP
+        GetFormat (ValueObject& valobj,
+                   lldb::DynamicValueType use_dynamic);
         
         lldb::TypeSummaryImplSP
         GetSummaryFormat (ValueObject& valobj,
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSummary.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSummary.h
index 2183384b9d6..1c195ab2ba4 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSummary.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSummary.h
@@ -12,7 +12,6 @@
 
 // C Includes
 #include <stdint.h>
-#include <unistd.h>
 
 // C++ Includes
 #include <string>
@@ -239,7 +238,7 @@ namespace lldb_private {
         }
         
         bool
-        IsOneliner () const
+        IsOneLiner () const
         {
             return m_flags.GetShowMembersOneLiner();
         }
@@ -281,7 +280,7 @@ namespace lldb_private {
         }
         
         void
-        SetIsOneliner (bool value)
+        SetIsOneLiner (bool value)
         {
             m_flags.SetShowMembersOneLiner(value);
         }
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSynthetic.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSynthetic.h
index a32f4b76117..18b9d011e96 100644
--- a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSynthetic.h
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/TypeSynthetic.h
@@ -12,7 +12,6 @@
 
 // C Includes
 #include <stdint.h>
-#include <unistd.h>
 
 // C++ Includes
 #include <string>
@@ -533,6 +532,12 @@ namespace lldb_private {
             FrontEnd (std::string pclass,
                       ValueObject &backend);
             
+            bool
+            IsValid ()
+            {
+                return m_wrapper_sp.get() != nullptr && m_wrapper_sp->operator bool() && m_interpreter != nullptr;
+            }
+            
             virtual
             ~FrontEnd ();
             
@@ -582,8 +587,11 @@ namespace lldb_private {
         virtual SyntheticChildrenFrontEnd::AutoPointer
         GetFrontEnd(ValueObject &backend)
         {
-            return SyntheticChildrenFrontEnd::AutoPointer(new FrontEnd(m_python_class, backend));
-        }    
+            auto synth_ptr = SyntheticChildrenFrontEnd::AutoPointer(new FrontEnd(m_python_class, backend));
+            if (synth_ptr && ((FrontEnd*)synth_ptr.get())->IsValid())
+                return synth_ptr;
+            return NULL;
+        }
         
     private:
         DISALLOW_COPY_AND_ASSIGN(ScriptedSyntheticChildren);
diff --git a/contrib/llvm/tools/lldb/include/lldb/DataFormatters/ValueObjectPrinter.h b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/ValueObjectPrinter.h
new file mode 100644
index 00000000000..4e23ceedcc1
--- /dev/null
+++ b/contrib/llvm/tools/lldb/include/lldb/DataFormatters/ValueObjectPrinter.h
@@ -0,0 +1,394 @@
+//===-- ValueObjectPrinter.h ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef lldb_ValueObjectPrinter_h_
+#define lldb_ValueObjectPrinter_h_
+
+// C Includes
+// C++ Includes
+
+// Other libraries and framework includes
+// Project includes
+#include "lldb/lldb-private.h"
+#include "lldb/lldb-public.h"
+
+#include "lldb/Core/Stream.h"
+#include "lldb/Core/ValueObject.h"
+#include "lldb/DataFormatters/TypeSummary.h"
+
+namespace lldb_private {
+
+struct DumpValueObjectOptions
+{
+    uint32_t m_max_ptr_depth;
+    uint32_t m_max_depth;
+    bool m_show_types;
+    bool m_show_location;
+    bool m_use_objc;
+    lldb::DynamicValueType m_use_dynamic;
+    bool m_use_synthetic;
+    bool m_scope_already_checked;
+    bool m_flat_output;
+    uint32_t m_omit_summary_depth;
+    bool m_ignore_cap;
+    lldb::Format m_format;
+    lldb::TypeSummaryImplSP m_summary_sp;
+    std::string m_root_valobj_name;
+    bool m_hide_root_type;
+    bool m_hide_name;
+    bool m_hide_value;
+    bool m_be_raw;
+    
+    DumpValueObjectOptions() :
+    m_max_ptr_depth(0),
+    m_max_depth(UINT32_MAX),
+    m_show_types(false),
+    m_show_location(false),
+    m_use_objc(false),
+    m_use_dynamic(lldb::eNoDynamicValues),
+    m_use_synthetic(true),
+    m_scope_already_checked(false),
+    m_flat_output(false),
+    m_omit_summary_depth(0),
+    m_ignore_cap(false),
+    m_format (lldb::eFormatDefault),
+    m_summary_sp(),
+    m_root_valobj_name(),
+    m_hide_root_type(false),  // provide a special compact display for "po"
+    m_hide_name(false), // provide a special compact display for "po"
+    m_hide_value(false), // provide a special compact display for "po"
+    m_be_raw(false)
+    {}
+    
+    static const DumpValueObjectOptions
+    DefaultOptions()
+    {
+        static DumpValueObjectOptions g_default_options;
+        
+        return g_default_options;
+    }
+    
+    DumpValueObjectOptions (const DumpValueObjectOptions& rhs) :
+    m_max_ptr_depth(rhs.m_max_ptr_depth),
+    m_max_depth(rhs.m_max_depth),
+    m_show_types(rhs.m_show_types),
+    m_show_location(rhs.m_show_location),
+    m_use_objc(rhs.m_use_objc),
+    m_use_dynamic(rhs.m_use_dynamic),
+    m_use_synthetic(rhs.m_use_synthetic),
+    m_scope_already_checked(rhs.m_scope_already_checked),
+    m_flat_output(rhs.m_flat_output),
+    m_omit_summary_depth(rhs.m_omit_summary_depth),
+    m_ignore_cap(rhs.m_ignore_cap),
+    m_format(rhs.m_format),
+    m_summary_sp(rhs.m_summary_sp),
+    m_root_valobj_name(rhs.m_root_valobj_name),
+    m_hide_root_type(rhs.m_hide_root_type),
+    m_hide_name(rhs.m_hide_name),
+    m_hide_value(rhs.m_hide_value),
+    m_be_raw(rhs.m_be_raw)
+    {}
+    
+    DumpValueObjectOptions&
+    SetMaximumPointerDepth(uint32_t depth = 0)
+    {
+        m_max_ptr_depth = depth;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetMaximumDepth(uint32_t depth = 0)
+    {
+        m_max_depth = depth;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetShowTypes(bool show = false)
+    {
+        m_show_types = show;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetShowLocation(bool show = false)
+    {
+        m_show_location = show;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetUseObjectiveC(bool use = false)
+    {
+        m_use_objc = use;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetShowSummary(bool show = true)
+    {
+        if (show == false)
+            SetOmitSummaryDepth(UINT32_MAX);
+        else
+            SetOmitSummaryDepth(0);
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetUseDynamicType(lldb::DynamicValueType dyn = lldb::eNoDynamicValues)
+    {
+        m_use_dynamic = dyn;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetUseSyntheticValue(bool use_synthetic = true)
+    {
+        m_use_synthetic = use_synthetic;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetScopeChecked(bool check = true)
+    {
+        m_scope_already_checked = check;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetFlatOutput(bool flat = false)
+    {
+        m_flat_output = flat;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetOmitSummaryDepth(uint32_t depth = 0)
+    {
+        m_omit_summary_depth = depth;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetIgnoreCap(bool ignore = false)
+    {
+        m_ignore_cap = ignore;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetRawDisplay(bool raw = false)
+    {
+        if (raw)
+        {
+            SetUseSyntheticValue(false);
+            SetOmitSummaryDepth(UINT32_MAX);
+            SetIgnoreCap(true);
+            SetHideName(false);
+            SetHideValue(false);
+            m_be_raw = true;
+        }
+        else
+        {
+            SetUseSyntheticValue(true);
+            SetOmitSummaryDepth(0);
+            SetIgnoreCap(false);
+            SetHideName(false);
+            SetHideValue(false);
+            m_be_raw = false;
+        }
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetFormat (lldb::Format format = lldb::eFormatDefault)
+    {
+        m_format = format;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetSummary (lldb::TypeSummaryImplSP summary = lldb::TypeSummaryImplSP())
+    {
+        m_summary_sp = summary;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetRootValueObjectName (const char* name = NULL)
+    {
+        if (name)
+            m_root_valobj_name.assign(name);
+        else
+            m_root_valobj_name.clear();
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetHideRootType (bool hide_root_type = false)
+    {
+        m_hide_root_type = hide_root_type;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetHideName (bool hide_name = false)
+    {
+        m_hide_name = hide_name;
+        return *this;
+    }
+    
+    DumpValueObjectOptions&
+    SetHideValue (bool hide_value = false)
+    {
+        m_hide_value = hide_value;
+        return *this;
+    }
+};
+    
+class ValueObjectPrinter
+{
+public:
+    
+    ValueObjectPrinter (ValueObject* valobj,
+                        Stream* s,
+                        const DumpValueObjectOptions& options);
+    
+    ~ValueObjectPrinter () {}
+    
+    bool
+    PrintValueObject ();
+    
+    bool
+    PrintChildrenOneLiner (bool hide_names);
+    
+protected:
+    
+    // only this class (and subclasses, if any) should ever be concerned with
+    // the depth mechanism
+    ValueObjectPrinter (ValueObject* valobj,
+                        Stream* s,
+                        const DumpValueObjectOptions& options,
+                        uint32_t ptr_depth,
+                        uint32_t curr_depth);
+    
+    // we should actually be using delegating constructors here
+    // but some versions of GCC still have trouble with those
+    void
+    Init (ValueObject* valobj,
+          Stream* s,
+          const DumpValueObjectOptions& options,
+          uint32_t ptr_depth,
+          uint32_t curr_depth);
+    
+    bool
+    GetDynamicValueIfNeeded ();
+    
+    const char*
+    GetDescriptionForDisplay ();
+    
+    const char*
+    GetRootNameForDisplay (const char* if_fail = nullptr);
+    
+    bool
+    ShouldPrintValueObject ();
+    
+    bool
+    IsNil ();
+    
+    bool
+    IsPtr ();
+    
+    bool
+    IsRef ();
+    
+    bool
+    IsAggregate ();
+    
+    bool
+    PrintLocationIfNeeded ();
+    
+    bool
+    PrintTypeIfNeeded ();
+    
+    bool
+    PrintNameIfNeeded (bool show_type);
+    
+    bool
+    CheckScopeIfNeeded ();
+    
+    TypeSummaryImpl*
+    GetSummaryFormatter ();
+    
+    void
+    GetValueSummaryError (std::string& value,
+                          std::string& summary,
+                          std::string& error);
+    
+    bool
+    PrintValueAndSummaryIfNeeded (bool& value_printed,
+                                  bool& summary_printed);
+    
+    bool
+    PrintObjectDescriptionIfNeeded (bool value_printed,
+                                    bool summary_printed);
+    
+    bool
+    ShouldPrintChildren (bool is_failed_description,
+                         uint32_t& curr_ptr_depth);
+    
+    ValueObject*
+    GetValueObjectForChildrenGeneration ();
+    
+    void
+    PrintChildrenPreamble ();
+    
+    void
+    PrintChildrenPostamble (bool print_dotdotdot);
+    
+    void
+    PrintChild (lldb::ValueObjectSP child_sp,
+                uint32_t curr_ptr_depth);
+    
+    uint32_t
+    GetMaxNumChildrenToPrint (bool& print_dotdotdot);
+    
+    void
+    PrintChildren (uint32_t curr_ptr_depth);
+    
+    void
+    PrintChildrenIfNeeded (bool value_printed,
+                           bool summary_printed);
+    
+private:
+    
+    ValueObject *m_orig_valobj;
+    ValueObject *m_valobj;
+    Stream *m_stream;
+    DumpValueObjectOptions options;
+    Flags m_type_flags;
+    ClangASTType m_clang_type;
+    uint32_t m_ptr_depth;
+    uint32_t m_curr_depth;
+    LazyBool m_should_print;
+    LazyBool m_is_nil;
+    LazyBool m_is_ptr;
+    LazyBool m_is_ref;
+    LazyBool m_is_aggregate;
+    std::pair<TypeSummaryImpl*,bool> m_summary_formatter;
+    std::string m_value;
+    std::string m_summary;
+    std::string m_error;
+    
+    DISALLOW_COPY_AND_ASSIGN(ValueObjectPrinter);
+};
+    
+} // namespace lldb_private
+
+#endif	// lldb_ValueObjectPrinter_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/Expression/ClangExpressionDeclMap.h b/contrib/llvm/tools/lldb/include/lldb/Expression/ClangExpressionDeclMap.h
index b2a43e0ac75..b04e1bd6f11 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Expression/ClangExpressionDeclMap.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Expression/ClangExpressionDeclMap.h
@@ -291,6 +291,9 @@ public:
     /// @param[in] name
     ///     The name of the symbol.  
     ///
+    /// @param[in] module
+    ///     The module to limit the search to. This can be NULL
+    ///
     /// @return
     ///     Valid load address for the symbol
     //------------------------------------------------------------------
@@ -298,7 +301,8 @@ public:
     GetSymbolAddress (Target &target,
                       Process *process,
                       const ConstString &name,
-                      lldb::SymbolType symbol_type);
+                      lldb::SymbolType symbol_type,
+                      Module *module = NULL);
     
     lldb::addr_t
     GetSymbolAddress (const ConstString &name,
@@ -504,12 +508,16 @@ private:
     /// @param[in] name
     ///     The name as a plain C string.
     ///
+    /// @param[in] module
+    ///     The module to limit the search to. This can be NULL
+    ///
     /// @return
     ///     The LLDB Symbol found, or NULL if none was found.
-    //---------------------------------------------------------
+    //------------------------------------------------------------------
     const Symbol *
     FindGlobalDataSymbol (Target &target,
-                          const ConstString &name);
+                          const ConstString &name,
+                          Module *module = NULL);
     
     //------------------------------------------------------------------
     /// Given a target, find a variable that matches the given name and 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Expression/ClangFunction.h b/contrib/llvm/tools/lldb/include/lldb/Expression/ClangFunction.h
index 3f96f7bd311..9c14ddb5323 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Expression/ClangFunction.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Expression/ClangFunction.h
@@ -67,8 +67,8 @@ class ClangFunction : public ClangExpression
 {
     friend class ASTStructExtractor;
 public:
-	//------------------------------------------------------------------
-	/// Constructor
+    //------------------------------------------------------------------
+    /// Constructor
     ///
     /// @param[in] exe_scope
     ///     An execution context scope that gets us at least a target and 
@@ -84,14 +84,14 @@ public:
     /// @param[in] arg_value_list
     ///     The default values to use when calling this function.  Can
     ///     be overridden using WriteFunctionArguments().
-	//------------------------------------------------------------------  
-	ClangFunction (ExecutionContextScope &exe_scope,
+    //------------------------------------------------------------------  
+    ClangFunction (ExecutionContextScope &exe_scope,
                    Function &function_ptr, 
                    ClangASTContext *ast_context, 
                    const ValueList &arg_value_list);
     
     //------------------------------------------------------------------
-	/// Constructor
+    /// Constructor
     ///
     /// @param[in] exe_scope
     ///     An execution context scope that gets us at least a target and 
@@ -110,32 +110,32 @@ public:
     /// @param[in] arg_value_list
     ///     The default values to use when calling this function.  Can
     ///     be overridden using WriteFunctionArguments().
-	//------------------------------------------------------------------
-	ClangFunction (ExecutionContextScope &exe_scope,
+    //------------------------------------------------------------------
+    ClangFunction (ExecutionContextScope &exe_scope,
                    const ClangASTType &return_type,
                    const Address& function_address, 
                    const ValueList &arg_value_list);
     
     //------------------------------------------------------------------
-	/// Destructor
-	//------------------------------------------------------------------
-	virtual 
+    /// Destructor
+    //------------------------------------------------------------------
+    virtual 
     ~ClangFunction();
 
     //------------------------------------------------------------------
-	/// Compile the wrapper function
+    /// Compile the wrapper function
     ///
     /// @param[in] errors
     ///     The stream to print parser errors to.
     ///
     /// @return
     ///     The number of errors.
-	//------------------------------------------------------------------
+    //------------------------------------------------------------------
     unsigned
     CompileFunction (Stream &errors);
     
     //------------------------------------------------------------------
-	/// Insert the default function wrapper and its default argument struct  
+    /// Insert the default function wrapper and its default argument struct  
     ///
     /// @param[in] exe_ctx
     ///     The execution context to insert the function and its arguments
@@ -151,14 +151,14 @@ public:
     ///
     /// @return
     ///     True on success; false otherwise.
-	//------------------------------------------------------------------
+    //------------------------------------------------------------------
     bool
     InsertFunction (ExecutionContext &exe_ctx,
                     lldb::addr_t &args_addr_ref,
                     Stream &errors);
 
     //------------------------------------------------------------------
-	/// Insert the default function wrapper (using the JIT)
+    /// Insert the default function wrapper (using the JIT)
     ///
     /// @param[in] exe_ctx
     ///     The execution context to insert the function and its arguments
@@ -169,12 +169,12 @@ public:
     ///
     /// @return
     ///     True on success; false otherwise.
-	//------------------------------------------------------------------
+    //------------------------------------------------------------------
     bool WriteFunctionWrapper (ExecutionContext &exe_ctx, 
                                Stream &errors);
     
     //------------------------------------------------------------------
-	/// Insert the default function argument struct  
+    /// Insert the default function argument struct  
     ///
     /// @param[in] exe_ctx
     ///     The execution context to insert the function and its arguments
@@ -190,13 +190,13 @@ public:
     ///
     /// @return
     ///     True on success; false otherwise.
-	//------------------------------------------------------------------
+    //------------------------------------------------------------------
     bool WriteFunctionArguments (ExecutionContext &exe_ctx, 
                                  lldb::addr_t &args_addr_ref, 
                                  Stream &errors);
     
     //------------------------------------------------------------------
-	/// Insert an argument struct with a non-default function address and
+    /// Insert an argument struct with a non-default function address and
     /// non-default argument values
     ///
     /// @param[in] exe_ctx
@@ -219,150 +219,13 @@ public:
     ///
     /// @return
     ///     True on success; false otherwise.
-	//------------------------------------------------------------------
+    //------------------------------------------------------------------
     bool WriteFunctionArguments (ExecutionContext &exe_ctx, 
                                  lldb::addr_t &args_addr_ref, 
                                  Address function_address, 
                                  ValueList &arg_values, 
                                  Stream &errors);
 
-    //------------------------------------------------------------------
-	/// [Static] Execute a function, passing it a single void* parameter.
-    /// ClangFunction uses this to call the wrapper function.
-    ///
-    /// @param[in] exe_ctx
-    ///     The execution context to insert the function and its arguments
-    ///     into.
-    ///
-    /// @param[in] function_address
-    ///     The address of the function in the target process.
-    ///
-    /// @param[in] void_arg
-    ///     The value of the void* parameter.
-    ///
-    /// @param[in] stop_others
-    ///     True if other threads should pause during execution.
-    ///
-    /// @param[in] try_all_threads
-    ///     If the timeout expires, true if other threads should run.  If
-    ///     the function may try to take locks, this is useful.
-    /// 
-    /// @param[in] unwind_on_error
-    ///     If true, and the execution stops before completion, we unwind the
-    ///     function call, and return the program state to what it was before the
-    ///     execution.  If false, we leave the program in the stopped state.
-    /// 
-    /// @param[in] timeout_usec
-    ///     Timeout value (0 for no timeout). If try_all_threads is true, then we
-    ///     will try on one thread for the lesser of .25 sec and half the total timeout.
-    ///     then switch to running all threads, otherwise this will be the total timeout.
-    ///
-    /// @param[in] errors
-    ///     The stream to write errors to.
-    ///
-    /// @param[in] this_arg
-    ///     If non-NULL, the function is invoked like a C++ method, with the
-    ///     value pointed to by the pointer as its 'this' argument.
-    ///
-    /// @return
-    ///     Returns one of the ExecutionResults enum indicating function call status.
-	//------------------------------------------------------------------
-    static ExecutionResults 
-    ExecuteFunction (ExecutionContext &exe_ctx, 
-                     lldb::addr_t function_address, 
-                     lldb::addr_t &void_arg, 
-                     bool stop_others, 
-                     bool try_all_threads,
-                     bool unwind_on_error,
-                     bool ignore_breakpoints,
-                     uint32_t timeout_usec,
-                     Stream &errors,
-                     lldb::addr_t* this_arg = 0);
-    
-    //------------------------------------------------------------------
-    /// Run the function this ClangFunction was created with.
-    ///
-    /// This simple version will run the function stopping other threads
-    /// for a fixed timeout period (1000 usec) and if it does not complete,
-    /// we halt the process and try with all threads running.
-    ///
-    /// @param[in] exe_ctx
-    ///     The thread & process in which this function will run.
-    ///
-    /// @param[in] errors
-    ///     Errors will be written here if there are any.
-    ///
-    /// @param[out] results
-    ///     The result value will be put here after running the function.
-    ///
-    /// @return
-    ///     Returns one of the ExecutionResults enum indicating function call status.
-    //------------------------------------------------------------------
-    ExecutionResults 
-    ExecuteFunction(ExecutionContext &exe_ctx, 
-                     Stream &errors, 
-                     Value &results);
-    
-    //------------------------------------------------------------------
-    /// Run the function this ClangFunction was created with.
-    ///
-    /// This simple version will run the function obeying the stop_others
-    /// argument.  There is no timeout.
-    ///
-    /// @param[in] exe_ctx
-    ///     The thread & process in which this function will run.
-    ///
-    /// @param[in] errors
-    ///     Errors will be written here if there are any.
-    ///
-    /// @param[in] stop_others
-    ///     If \b true, run only this thread, if \b false let all threads run.
-    ///
-    /// @param[out] results
-    ///     The result value will be put here after running the function.
-    ///
-    /// @return
-    ///     Returns one of the ExecutionResults enum indicating function call status.
-    //------------------------------------------------------------------
-    ExecutionResults 
-    ExecuteFunction(ExecutionContext &exe_ctx, 
-                     Stream &errors, bool stop_others, 
-                     Value &results);
-    
-    //------------------------------------------------------------------
-    /// Run the function this ClangFunction was created with.
-    ///
-    /// This simple version will run the function on one thread.  If \a timeout_usec
-    /// is not zero, we time out after that timeout.  If \a try_all_threads is true, then we will
-    /// resume with all threads on, otherwise we halt the process, and eExecutionInterrupted will be returned.
-    ///
-    /// @param[in] exe_ctx
-    ///     The thread & process in which this function will run.
-    ///
-    /// @param[in] errors
-    ///     Errors will be written here if there are any.
-    ///
-    /// @param[in] timeout_usec
-    ///     Timeout value (0 for no timeout). If try_all_threads is true, then we
-    ///     will try on one thread for the lesser of .25 sec and half the total timeout.
-    ///     then switch to running all threads, otherwise this will be the total timeout.
-    ///
-    /// @param[in] try_all_threads
-    ///     If \b true, run only this thread, if \b false let all threads run.
-    ///
-    /// @param[out] results
-    ///     The result value will be put here after running the function.
-    ///
-    /// @return
-    ///     Returns one of the ExecutionResults enum indicating function call status.
-    //------------------------------------------------------------------
-    ExecutionResults 
-    ExecuteFunction(ExecutionContext &exe_ctx, 
-                    Stream &errors, 
-                    uint32_t single_thread_timeout_usec, 
-                    bool try_all_threads, 
-                    Value &results);
-    
     //------------------------------------------------------------------
     /// Run the function this ClangFunction was created with.
     ///
@@ -381,17 +244,8 @@ public:
     /// @param[in] errors
     ///     Errors will be written here if there are any.
     ///
-    /// @param[in] stop_others
-    ///     If \b true, run only this thread, if \b false let all threads run.
-    ///
-    /// @param[in] timeout_usec
-    ///     Timeout value (0 for no timeout). If try_all_threads is true, then we
-    ///     will try on one thread for the lesser of .25 sec and half the total timeout.
-    ///     then switch to running all threads, otherwise this will be the total timeout.
-    ///
-    ///
-    /// @param[in] try_all_threads
-    ///     If \b true, run only this thread, if \b false let all threads run.
+    /// @param[in] options
+    ///     The options for this expression execution.
     ///
     /// @param[out] results
     ///     The result value will be put here after running the function.
@@ -402,62 +256,10 @@ public:
     ExecutionResults 
     ExecuteFunction(ExecutionContext &exe_ctx, 
                     lldb::addr_t *args_addr_ptr, 
-                    Stream &errors, 
-                    bool stop_others, 
-                    uint32_t timeout_usec,
-                    bool try_all_threads,
-                    bool unwind_on_error,
-                    bool ignore_breakpoints,
+                    const EvaluateExpressionOptions &options,
+                    Stream &errors,
                     Value &results);
     
-    //------------------------------------------------------------------
-    /// [static] Get a thread plan to run a function.
-    ///
-    /// @param[in] exe_ctx
-    ///     The execution context to insert the function and its arguments
-    ///     into.
-    ///
-    /// @param[in] func_addr
-    ///     The address of the function in the target process.
-    ///
-    /// @param[in] args_addr_ref
-    ///     The value of the void* parameter.
-    ///
-    /// @param[in] errors
-    ///     The stream to write errors to.
-    ///
-    /// @param[in] stop_others
-    ///     True if other threads should pause during execution.
-    ///
-    /// @param[in] unwind_on_error
-    ///     True if the thread plan may simply be discarded if an error occurs.
-    ///
-    /// @param[in] ignore_breakpoints
-    ///     True if the expression execution will ignore breakpoint hits and continue executing.
-    ///
-    /// @param[in] this_arg
-    ///     If non-NULL (and cmd_arg is NULL), the function is invoked like a C++ 
-    ///     method, with the value pointed to by the pointer as its 'this' 
-    ///     argument.
-    ///
-    /// @param[in] cmd_arg
-    ///     If non-NULL, the function is invoked like an Objective-C method, with
-    ///     this_arg in the 'self' slot and cmd_arg in the '_cmd' slot
-    ///
-    /// @return
-    ///     A ThreadPlan for executing the function.
-	//------------------------------------------------------------------
-    static ThreadPlan *
-    GetThreadPlanToCallFunction (ExecutionContext &exe_ctx, 
-                                 lldb::addr_t func_addr, 
-                                 lldb::addr_t &args_addr_ref, 
-                                 Stream &errors, 
-                                 bool stop_others, 
-                                 bool unwind_on_error,
-                                 bool ignore_breakpoints,
-                                 lldb::addr_t *this_arg = 0,
-                                 lldb::addr_t *cmd_arg = 0);
-    
     //------------------------------------------------------------------
     /// Get a thread plan to run the function this ClangFunction was created with.
     ///
@@ -468,8 +270,8 @@ public:
     /// @param[in] func_addr
     ///     The address of the function in the target process.
     ///
-    /// @param[in] args_addr_ref
-    ///     The value of the void* parameter.
+    /// @param[in] args_addr
+    ///     The address of the argument struct.
     ///
     /// @param[in] errors
     ///     The stream to write errors to.
@@ -482,23 +284,12 @@ public:
     ///
     /// @return
     ///     A ThreadPlan for executing the function.
-	//------------------------------------------------------------------
+    //------------------------------------------------------------------
     ThreadPlan *
     GetThreadPlanToCallFunction (ExecutionContext &exe_ctx, 
-                                 lldb::addr_t &args_addr_ref, 
-                                 Stream &errors, 
-                                 bool stop_others, 
-                                 bool unwind_on_error = true,
-                                 bool ignore_breakpoints = true)
-    {
-        return ClangFunction::GetThreadPlanToCallFunction (exe_ctx, 
-                                                           m_jit_start_addr, 
-                                                           args_addr_ref, 
-                                                           errors, 
-                                                           stop_others, 
-                                                           unwind_on_error,
-                                                           ignore_breakpoints);
-    }
+                                 lldb::addr_t args_addr,
+                                 const EvaluateExpressionOptions &options,
+                                 Stream &errors);
     
     //------------------------------------------------------------------
     /// Get the result of the function from its struct
@@ -514,7 +305,7 @@ public:
     ///
     /// @return
     ///     True on success; false otherwise.
-	//------------------------------------------------------------------
+    //------------------------------------------------------------------
     bool FetchFunctionResults (ExecutionContext &exe_ctx, 
                                lldb::addr_t args_addr, 
                                Value &ret_value);
@@ -528,7 +319,7 @@ public:
     ///
     /// @param[in] args_addr
     ///     The address of the argument struct.
-	//------------------------------------------------------------------
+    //------------------------------------------------------------------
     void DeallocateFunctionResults (ExecutionContext &exe_ctx, 
                                     lldb::addr_t args_addr);
     
@@ -614,9 +405,9 @@ public:
         return m_arg_values;
     }
 private:
-	//------------------------------------------------------------------
-	// For ClangFunction only
-	//------------------------------------------------------------------
+    //------------------------------------------------------------------
+    // For ClangFunction only
+    //------------------------------------------------------------------
 
     std::unique_ptr<ClangExpressionParser> m_parser;                 ///< The parser responsible for compiling the function.
     std::unique_ptr<IRExecutionUnit> m_execution_unit_ap;
@@ -624,17 +415,18 @@ private:
     Function                       *m_function_ptr;                 ///< The function we're going to call.  May be NULL if we don't have debug info for the function.
     Address                         m_function_addr;                ///< If we don't have the FunctionSP, we at least need the address & return type.
     ClangASTType                    m_function_return_type;         ///< The opaque clang qual type for the function return type.
-    ClangASTContext                *m_clang_ast_context;            ///< This is the clang_ast_context that we're getting types from the and value, and the function return the function pointer is NULL.
 
     std::string                     m_wrapper_function_name;        ///< The name of the wrapper function.
     std::string                     m_wrapper_function_text;        ///< The contents of the wrapper function.
     std::string                     m_wrapper_struct_name;          ///< The name of the struct that contains the target function address, arguments, and result.
     std::list<lldb::addr_t>         m_wrapper_args_addrs;           ///< The addresses of the arguments to the wrapper function.
     
+    std::unique_ptr<ASTStructExtractor> m_struct_extractor;         ///< The class that generates the argument struct below.
+
     bool                            m_struct_valid;                 ///< True if the ASTStructExtractor has populated the variables below.
     
-	//------------------------------------------------------------------
-	/// These values are populated by the ASTStructExtractor
+    //------------------------------------------------------------------
+    /// These values are populated by the ASTStructExtractor
     size_t                          m_struct_size;                  ///< The size of the argument struct, in bytes.
     std::vector<uint64_t>           m_member_offsets;               ///< The offset of each member in the struct, in bytes.
     uint64_t                        m_return_size;                  ///< The size of the result variable, in bytes.
diff --git a/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUserExpression.h b/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUserExpression.h
index 47bfebb4664..83fdf1c2195 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUserExpression.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Expression/ClangUserExpression.h
@@ -126,13 +126,8 @@ public:
     ///     The execution context to use when looking up entities that
     ///     are needed for parsing (locations of variables, etc.)
     ///
-    /// @param[in] unwind_on_error
-    ///     If true, and the execution stops before completion, we unwind the
-    ///     function call, and return the program state to what it was before the
-    ///     execution.  If false, we leave the program in the stopped state.
-    ///
-    /// @param[in] ignore_breakpoints
-    ///     If true, ignore breakpoints while executing the expression.
+    /// @param[in] options
+    ///     Expression evaluation options.
     ///
     /// @param[in] shared_ptr_to_me
     ///     This is a shared pointer to this ClangUserExpression.  This is
@@ -145,34 +140,16 @@ public:
     ///     A pointer to direct at the persistent variable in which the
     ///     expression's result is stored.
     ///
-    /// @param[in] try_all_threads
-    ///     If true, then we will try to run all threads if the function doesn't complete on
-    ///     one thread.  See timeout_usec for the interaction of this variable and
-    ///     the timeout.
-    ///
-    /// @param[in] timeout_usec
-    ///     Timeout value (0 for no timeout). If try_all_threads is true, then we
-    ///     will try on one thread for the lesser of .25 sec and half the total timeout.
-    ///     then switch to running all threads, otherwise this will be the total timeout.
-    ///
-    ///
     /// @return
     ///     A Process::Execution results value.
     //------------------------------------------------------------------
     ExecutionResults
     Execute (Stream &error_stream,
              ExecutionContext &exe_ctx,
-             bool unwind_on_error,
-             bool ignore_breakpoints,
+             const EvaluateExpressionOptions& options,
              ClangUserExpressionSP &shared_ptr_to_me,
-             lldb::ClangExpressionVariableSP &result,
-             bool try_all_threads,
-             uint32_t timeout_usec);
+             lldb::ClangExpressionVariableSP &result);
              
-    ThreadPlan *
-    GetThreadPlanToExecuteJITExpression (Stream &error_stream,
-                                         ExecutionContext &exe_ctx);
-    
     //------------------------------------------------------------------
     /// Apply the side effects of the function to program state.
     ///
@@ -300,25 +277,8 @@ public:
     /// @param[in] exe_ctx
     ///     The execution context to use when evaluating the expression.
     ///
-    /// @param[in] execution_policy
-    ///     Determines whether or not to try using the IR interpreter to
-    ///     avoid running the expression on the parser.
-    ///
-    /// @param[in] language
-    ///     If not eLanguageTypeUnknown, a language to use when parsing
-    ///     the expression.  Currently restricted to those languages 
-    ///     supported by Clang.
-    ///
-    /// @param[in] unwind_on_error
-    ///     True if the thread's state should be restored in the case 
-    ///     of an error.
-    ///
-    /// @param[in] ignore_breakpoints
-    ///     If true, ignore breakpoints while executing the expression.
-    ///
-    /// @param[in] result_type
-    ///     If not eResultTypeAny, the type of the desired result.  Will
-    ///     result in parse errors if impossible.
+    /// @param[in] options
+    ///     Expression evaluation options.
     ///
     /// @param[in] expr_cstr
     ///     A C string containing the expression to be evaluated.
@@ -330,45 +290,20 @@ public:
     /// @param[in/out] result_valobj_sp
     ///      If execution is successful, the result valobj is placed here.
     ///
-    /// @param[in] try_all_threads
-    ///     If true, then we will try to run all threads if the function doesn't complete on
-    ///     one thread.  See timeout_usec for the interaction of this variable and
-    ///     the timeout.
-    ///
-    /// @param[in] timeout_usec
-    ///     Timeout value (0 for no timeout). If try_all_threads is true, then we
-    ///     will try on one thread for the lesser of .25 sec and half the total timeout.
-    ///     then switch to running all threads, otherwise this will be the total timeout.
+    /// @param[out]
+    ///     Filled in with an error in case the expression evaluation
+    ///     fails to parse, run, or evaluated.
     ///
     /// @result
     ///      A Process::ExecutionResults value.  eExecutionCompleted for success.
     //------------------------------------------------------------------
     static ExecutionResults
     Evaluate (ExecutionContext &exe_ctx,
-              lldb_private::ExecutionPolicy execution_policy,
-              lldb::LanguageType language,
-              ResultType desired_type,
-              bool unwind_on_error,
-              bool ignore_breakpoints,
+              const EvaluateExpressionOptions& options,
               const char *expr_cstr,
               const char *expr_prefix,
               lldb::ValueObjectSP &result_valobj_sp,
-              bool try_all_threads,
-              uint32_t timeout_usec);
-              
-    static ExecutionResults
-    EvaluateWithError (ExecutionContext &exe_ctx,
-                       lldb_private::ExecutionPolicy execution_policy,
-                       lldb::LanguageType language,
-                       ResultType desired_type,
-                       bool unwind_on_error,
-                       bool ignore_breakpoints,
-                       const char *expr_cstr,
-                       const char *expr_prefix,
-                       lldb::ValueObjectSP &result_valobj_sp,
-                       Error &error,
-                       bool try_all_threads,
-                       uint32_t timeout_usec);
+              Error &error);
     
     static const Error::ValueType kNoResult = 0x1001; ///< ValueObject::GetError() returns this if there is no result from the expression.
 private:
diff --git a/contrib/llvm/tools/lldb/include/lldb/Expression/DWARFExpression.h b/contrib/llvm/tools/lldb/include/lldb/Expression/DWARFExpression.h
index 2692831ecc8..5ecdf7fe9ee 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Expression/DWARFExpression.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Expression/DWARFExpression.h
@@ -58,7 +58,8 @@ public:
     /// @param[in] data_length
     ///     The byte length of the location expression.
     //------------------------------------------------------------------
-    DWARFExpression(const DataExtractor& data,
+    DWARFExpression(lldb::ModuleSP module,
+                    const DataExtractor& data,
                     lldb::offset_t data_offset,
                     lldb::offset_t data_length);
 
@@ -172,6 +173,9 @@ public:
     /// Make the expression parser read its location information from a
     /// given data source
     ///
+    /// @param[in] module_sp
+    ///     The module that defines the DWARF expression.
+    ///
     /// @param[in] data
     ///     A data extractor configured to read the DWARF location expression's
     ///     bytecode.
@@ -183,7 +187,7 @@ public:
     ///     The byte length of the location expression.
     //------------------------------------------------------------------
     void
-    SetOpcodeData(const DataExtractor& data, lldb::offset_t data_offset, lldb::offset_t data_length);
+    SetOpcodeData(lldb::ModuleSP module_sp, const DataExtractor& data, lldb::offset_t data_offset, lldb::offset_t data_length);
 
     //------------------------------------------------------------------
     /// Copy the DWARF location expression into a local buffer.
@@ -199,6 +203,9 @@ public:
     /// the data, it shouldn't amount to that much for the variables we
     /// end up parsing.
     ///
+    /// @param[in] module_sp
+    ///     The module that defines the DWARF expression.
+    ///
     /// @param[in] data
     ///     A data extractor configured to read and copy the DWARF
     ///     location expression's bytecode.
@@ -210,7 +217,8 @@ public:
     ///     The byte length of the location expression.
     //------------------------------------------------------------------
     void
-    CopyOpcodeData (const DataExtractor& data,
+    CopyOpcodeData (lldb::ModuleSP module_sp,
+                    const DataExtractor& data,
                     lldb::offset_t data_offset,
                     lldb::offset_t data_length);
     
@@ -279,6 +287,9 @@ public:
     ///     expression.  The location expression may access the target's
     ///     memory, especially if it comes from the expression parser.
     ///
+    /// @param[in] opcode_ctx
+    ///     The module which defined the expression.
+    ///
     /// @param[in] opcodes
     ///     This is a static method so the opcodes need to be provided
     ///     explicitly.
@@ -332,6 +343,7 @@ public:
               ClangExpressionVariableList *expr_locals,
               ClangExpressionDeclMap *decl_map,
               RegisterContext *reg_ctx,
+              lldb::ModuleSP opcode_ctx,
               const DataExtractor& opcodes,
               const lldb::offset_t offset,
               const lldb::offset_t length,
@@ -410,7 +422,8 @@ protected:
     //------------------------------------------------------------------
     /// Classes that inherit from DWARFExpression can see and modify these
     //------------------------------------------------------------------
-    
+
+    lldb::ModuleWP m_module_wp;                 ///< Module which defined this expression.
     DataExtractor m_data;                       ///< A data extractor capable of reading opcode bytes
     lldb::RegisterKind m_reg_kind;              ///< One of the defines that starts with LLDB_REGKIND_
     lldb::addr_t m_loclist_slide;               ///< A value used to slide the location list offsets so that 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h b/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h
index 9bc55920474..d0aad685527 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h
@@ -18,6 +18,7 @@
 #include <map>
 
 // Other libraries and framework includes
+#include "llvm/ADT/StringRef.h"
 #include "llvm/IR/Module.h"
 
 // Project includes
@@ -414,6 +415,10 @@ private:
             return m_default_mm_ap->GetNumStubSlabs();
         }
         
+        virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) {
+            return m_default_mm_ap->registerEHFrames(llvm::StringRef((const char *)Addr, Size));
+        }
+        
         //------------------------------------------------------------------
         /// Passthrough interface stub
         //------------------------------------------------------------------
diff --git a/contrib/llvm/tools/lldb/include/lldb/Expression/IRForTarget.h b/contrib/llvm/tools/lldb/include/lldb/Expression/IRForTarget.h
index 151bf2ab477..56632877250 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Expression/IRForTarget.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Expression/IRForTarget.h
@@ -19,6 +19,7 @@
 #include "llvm/Pass.h"
 
 #include <map>
+#include <functional>
 
 namespace llvm {
     class BasicBlock;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/Condition.h b/contrib/llvm/tools/lldb/include/lldb/Host/Condition.h
index 98439ee2ebd..2f1858b75a5 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/Condition.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/Condition.h
@@ -12,7 +12,7 @@
 #if defined(__cplusplus)
 
 
-#include <pthread.h>
+#include "lldb/lldb-types.h"
 #include "lldb/Host/Mutex.h"
 
 namespace lldb_private {
@@ -105,7 +105,7 @@ protected:
     //------------------------------------------------------------------
     // Member variables
     //------------------------------------------------------------------
-    pthread_cond_t m_condition; ///< The condition variable.
+    lldb::condition_t m_condition; ///< The condition variable.
     
     //------------------------------------------------------------------
     /// Get accessor to the pthread condition object.
@@ -113,7 +113,7 @@ protected:
     /// @return
     ///     A pointer to the condition variable owned by this object.
     //------------------------------------------------------------------
-    pthread_cond_t *
+    lldb::condition_t *
     GetCondition ();
 };
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/Config.h b/contrib/llvm/tools/lldb/include/lldb/Host/Config.h
index 2d5d39baac3..80616b747cf 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/Config.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/Config.h
@@ -14,7 +14,7 @@
 
 #include "lldb/Host/macosx/Config.h"
 
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__GNU__)
 
 #include "lldb/Host/linux/Config.h"
 
@@ -26,6 +26,10 @@
 
 #include "lldb/Host/mingw/Config.h"
 
+#elif defined(_MSC_VER)
+
+#include "lldb/Host/msvc/Config.h"
+
 #else
 
 #error undefined platform
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h b/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h
new file mode 100644
index 00000000000..2cb758e1b73
--- /dev/null
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/Debug.h
@@ -0,0 +1,406 @@
+//===-- Debug.h -------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_Debug_h_
+#define liblldb_Debug_h_
+
+#include "lldb/lldb-private.h"
+#include "lldb/Core/Error.h"
+#include "lldb/Core/StreamString.h"
+#include "lldb/Host/Mutex.h"
+#include <vector>
+
+namespace lldb_private {
+    
+    //------------------------------------------------------------------
+    // Tells a thread what it needs to do when the process is resumed.
+    //------------------------------------------------------------------
+    struct ResumeAction
+    {
+        lldb::tid_t tid;        // The thread ID that this action applies to, LLDB_INVALID_THREAD_ID for the default thread action
+        lldb::StateType state;  // Valid values are eStateStopped/eStateSuspended, eStateRunning, and eStateStepping.
+        int signal;             // When resuming this thread, resume it with this signal if this value is > 0
+    };
+    
+    //------------------------------------------------------------------
+    // A class that contains instructions for all threads for
+    // NativeProcessProtocol::Resume(). Each thread can either run, stay
+    // suspended, or step when the process is resumed. We optionally
+    // have the ability to also send a signal to the thread when the
+    // action is run or step.
+    //------------------------------------------------------------------
+    class ResumeActionList
+    {
+    public:
+        ResumeActionList () :
+            m_actions (),
+            m_signal_handled ()
+        {
+        }
+        
+        ResumeActionList (lldb::StateType default_action, int signal) :
+            m_actions(),
+            m_signal_handled ()
+        {
+            SetDefaultThreadActionIfNeeded (default_action, signal);
+        }
+        
+        
+        ResumeActionList (const ResumeAction *actions, size_t num_actions) :
+            m_actions (),
+            m_signal_handled ()
+        {
+            if (actions && num_actions)
+            {
+                m_actions.assign (actions, actions + num_actions);
+                m_signal_handled.assign (num_actions, false);
+            }
+        }
+        
+        ~ResumeActionList()
+        {
+        }
+
+        bool
+        IsEmpty() const
+        {
+            return m_actions.empty();
+        }
+        
+        void
+        Append (const ResumeAction &action)
+        {
+            m_actions.push_back (action);
+            m_signal_handled.push_back (false);
+        }
+        
+        void
+        AppendAction (lldb::tid_t tid,
+                      lldb::StateType state,
+                      int signal = 0)
+        {
+            ResumeAction action = { tid, state, signal };
+            Append (action);
+        }
+        
+        void
+        AppendResumeAll ()
+        {
+            AppendAction (LLDB_INVALID_THREAD_ID, lldb::eStateRunning);
+        }
+        
+        void
+        AppendSuspendAll ()
+        {
+            AppendAction (LLDB_INVALID_THREAD_ID, lldb::eStateStopped);
+        }
+        
+        void
+        AppendStepAll ()
+        {
+            AppendAction (LLDB_INVALID_THREAD_ID, lldb::eStateStepping);
+        }
+        
+        const ResumeAction *
+        GetActionForThread (lldb::tid_t tid, bool default_ok) const
+        {
+            const size_t num_actions = m_actions.size();
+            for (size_t i=0; i<num_actions; ++i)
+            {
+                if (m_actions[i].tid == tid)
+                    return &m_actions[i];
+            }
+            if (default_ok && tid != LLDB_INVALID_THREAD_ID)
+                return GetActionForThread (LLDB_INVALID_THREAD_ID, false);
+            return NULL;
+        }
+        
+        size_t
+        NumActionsWithState (lldb::StateType state) const
+        {
+            size_t count = 0;
+            const size_t num_actions = m_actions.size();
+            for (size_t i=0; i<num_actions; ++i)
+            {
+                if (m_actions[i].state == state)
+                    ++count;
+            }
+            return count;
+        }
+        
+        bool
+        SetDefaultThreadActionIfNeeded (lldb::StateType action, int signal)
+        {
+            if (GetActionForThread (LLDB_INVALID_THREAD_ID, true) == NULL)
+            {
+                // There isn't a default action so we do need to set it.
+                ResumeAction default_action = {LLDB_INVALID_THREAD_ID, action, signal };
+                m_actions.push_back (default_action);
+                m_signal_handled.push_back (false);
+                return true; // Return true as we did add the default action
+            }
+            return false;
+        }
+        
+        void
+        SetSignalHandledForThread (lldb::tid_t tid) const
+        {
+            if (tid != LLDB_INVALID_THREAD_ID)
+            {
+                const size_t num_actions = m_actions.size();
+                for (size_t i=0; i<num_actions; ++i)
+                {
+                    if (m_actions[i].tid == tid)
+                        m_signal_handled[i] = true;
+                }
+            }
+        }
+        
+        const ResumeAction *
+        GetFirst() const
+        {
+            return m_actions.data();
+        }
+        
+        size_t
+        GetSize () const
+        {
+            return m_actions.size();
+        }
+        
+        void
+        Clear()
+        {
+            m_actions.clear();
+            m_signal_handled.clear();
+        }
+        
+    protected:
+        std::vector<ResumeAction> m_actions;
+        mutable std::vector<bool> m_signal_handled;
+    };
+
+    struct ThreadStopInfo
+    {
+        lldb::StopReason reason;
+        union
+        {
+            // eStopTypeSignal
+            struct
+            {
+                uint32_t signo;
+            } signal;
+            
+            // eStopTypeException
+            struct
+            {
+                uint64_t type;
+                uint32_t data_count;
+                lldb::addr_t data[2];
+            } exception;
+        } details;
+    };
+
+    //------------------------------------------------------------------
+    // NativeThreadProtocol
+    //------------------------------------------------------------------
+    class NativeThreadProtocol {
+        
+    public:
+        NativeThreadProtocol (NativeProcessProtocol *process, lldb::tid_t tid) :
+            m_process (process),
+            m_tid (tid)
+        {
+        }
+        
+        virtual ~NativeThreadProtocol()
+        {
+        }
+        virtual const char *GetName() = 0;
+        virtual lldb::StateType GetState () = 0;
+        virtual Error ReadRegister (uint32_t reg, RegisterValue &reg_value) = 0;
+        virtual Error WriteRegister (uint32_t reg, const RegisterValue &reg_value) = 0;
+        virtual Error SaveAllRegisters (lldb::DataBufferSP &data_sp) = 0;
+        virtual Error RestoreAllRegisters (lldb::DataBufferSP &data_sp) = 0;
+        virtual bool GetStopReason (ThreadStopInfo &stop_info) = 0;
+        
+        lldb::tid_t
+        GetID() const
+        {
+            return m_tid;
+        }
+    protected:
+        NativeProcessProtocol *m_process;
+        lldb::tid_t m_tid;
+    };
+
+    
+    //------------------------------------------------------------------
+    // NativeProcessProtocol
+    //------------------------------------------------------------------
+    class NativeProcessProtocol {
+    public:
+        
+        static NativeProcessProtocol *
+        CreateInstance (lldb::pid_t pid);
+
+        // lldb_private::Host calls should be used to launch a process for debugging, and
+        // then the process should be attached to. When attaching to a process
+        // lldb_private::Host calls should be used to locate the process to attach to,
+        // and then this function should be called.
+        NativeProcessProtocol (lldb::pid_t pid) :
+            m_pid (pid),
+            m_threads(),
+            m_threads_mutex (Mutex::eMutexTypeRecursive),
+            m_state (lldb::eStateInvalid),
+            m_exit_status(0),
+            m_exit_description()
+        {
+        }
+
+    public:
+        virtual ~NativeProcessProtocol ()
+        {
+        }
+        
+        virtual Error Resume (const ResumeActionList &resume_actions) = 0;
+        virtual Error Halt () = 0;
+        virtual Error Detach () = 0;
+        virtual Error Signal (int signo) = 0;
+        virtual Error Kill () = 0;
+        
+        virtual Error ReadMemory (lldb::addr_t addr, void *buf, lldb::addr_t size, lldb::addr_t &bytes_read) = 0;
+        virtual Error WriteMemory (lldb::addr_t addr, const void *buf, lldb::addr_t size, lldb::addr_t &bytes_written) = 0;
+        virtual Error AllocateMemory (lldb::addr_t size, uint32_t permissions, lldb::addr_t &addr) = 0;
+        virtual Error DeallocateMemory (lldb::addr_t addr) = 0;
+        
+        virtual lldb::addr_t GetSharedLibraryInfoAddress () = 0;
+        
+        virtual bool IsAlive () = 0;
+        virtual size_t UpdateThreads () = 0;
+        virtual bool GetArchitecture (ArchSpec &arch) = 0;
+
+        //----------------------------------------------------------------------
+        // Breakpoint functions
+        //----------------------------------------------------------------------
+        virtual Error SetBreakpoint (lldb::addr_t addr, size_t size, bool hardware) = 0;
+        virtual Error RemoveBreakpoint (lldb::addr_t addr, size_t size) = 0;
+        
+        //----------------------------------------------------------------------
+        // Watchpoint functions
+        //----------------------------------------------------------------------
+        virtual uint32_t GetMaxWatchpoints () = 0;
+        virtual Error SetWatchpoint (lldb::addr_t addr, size_t size, uint32_t watch_flags, bool hardware) = 0;
+        virtual Error RemoveWatchpoint (lldb::addr_t addr) = 0;
+        
+        
+        //----------------------------------------------------------------------
+        // Accessors
+        //----------------------------------------------------------------------
+        lldb::pid_t
+        GetID() const
+        {
+            return m_pid;
+        }
+        
+        lldb::StateType
+        GetState () const
+        {
+            return m_state;
+        }
+        
+        bool
+        IsRunning () const
+        {
+            return m_state == lldb::eStateRunning || IsStepping();
+        }
+        
+        bool
+        IsStepping () const
+        {
+            return m_state == lldb::eStateStepping;
+        }
+        
+        bool
+        CanResume () const
+        {
+            return m_state == lldb::eStateStopped;
+        }
+
+        
+        void
+        SetState (lldb::StateType state)
+        {
+            m_state = state;
+        }
+
+        //----------------------------------------------------------------------
+        // Exit Status
+        //----------------------------------------------------------------------
+        virtual bool
+        GetExitStatus (int *status)
+        {
+            if (m_state == lldb::eStateExited)
+            {
+                *status = m_exit_status;
+                return true;
+            }
+            *status = 0;
+            return false;
+        }
+        virtual bool
+        SetExitStatus (int status, const char *exit_description)
+        {
+            // Exit status already set
+            if (m_state == lldb::eStateExited)
+                return false;
+            m_state = lldb::eStateExited;
+            m_exit_status = status;
+            if (exit_description && exit_description[0])
+                m_exit_description = exit_description;
+            else
+                m_exit_description.clear();
+            return true;
+        }
+
+        //----------------------------------------------------------------------
+        // Access to threads
+        //----------------------------------------------------------------------
+        lldb::NativeThreadProtocolSP
+        GetThreadAtIndex (uint32_t idx)
+        {
+            Mutex::Locker locker(m_threads_mutex);
+            if (idx < m_threads.size())
+                return m_threads[idx];
+            return lldb::NativeThreadProtocolSP();
+        }
+
+        lldb::NativeThreadProtocolSP
+        GetThreadByID (lldb::tid_t tid)
+        {
+            Mutex::Locker locker(m_threads_mutex);
+            for (auto thread_sp : m_threads)
+            {
+                if (thread_sp->GetID() == tid)
+                    return thread_sp;
+            }
+            return lldb::NativeThreadProtocolSP();
+        }
+
+    protected:
+        lldb::pid_t m_pid;
+        std::vector<lldb::NativeThreadProtocolSP> m_threads;
+        mutable Mutex m_threads_mutex;
+        lldb::StateType m_state;
+        int m_exit_status;
+        std::string m_exit_description;
+    };
+
+}
+#endif // #ifndef liblldb_Debug_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/File.h b/contrib/llvm/tools/lldb/include/lldb/Host/File.h
index df7fe92cccb..607efa029c0 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/File.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/File.h
@@ -11,7 +11,9 @@
 #define liblldb_File_h_
 #if defined(__cplusplus)
 
+#include <stdarg.h>
 #include <stdio.h>
+#include <sys/types.h>
 
 #include "lldb/lldb-private.h"
 
@@ -38,43 +40,13 @@ public:
         eOpenOptionTruncate             = (1u << 3),    // Truncate file when opening
         eOpenOptionNonBlocking          = (1u << 4),    // File reads
         eOpenOptionCanCreate            = (1u << 5),    // Create file if doesn't already exist
-        eOpenOptionCanCreateNewOnly     = (1u << 6)     // Can create file only if it doesn't already exist
+        eOpenOptionCanCreateNewOnly     = (1u << 6),    // Can create file only if it doesn't already exist
+        eOpenoptionDontFollowSymlinks   = (1u << 7)
     };
     
-    enum Permissions
-    {
-        ePermissionsUserRead        = (1u << 0),
-        ePermissionsUserWrite       = (1u << 1),
-        ePermissionsUserExecute     = (1u << 2),
-        ePermissionsGroupRead       = (1u << 3),
-        ePermissionsGroupWrite      = (1u << 4),
-        ePermissionsGroupExecute    = (1u << 5),
-        ePermissionsWorldRead       = (1u << 6),
-        ePermissionsWorldWrite      = (1u << 7),
-        ePermissionsWorldExecute    = (1u << 8),
-
-        ePermissionsUserRW      = (ePermissionsUserRead    | ePermissionsUserWrite    | 0                        ),
-        ePermissionsUserRX      = (ePermissionsUserRead    | 0                        | ePermissionsUserExecute  ),
-        ePermissionsUserRWX     = (ePermissionsUserRead    | ePermissionsUserWrite    | ePermissionsUserExecute  ),
-
-        ePermissionsGroupRW     = (ePermissionsGroupRead   | ePermissionsGroupWrite   | 0                        ),
-        ePermissionsGroupRX     = (ePermissionsGroupRead   | 0                        | ePermissionsGroupExecute ),
-        ePermissionsGroupRWX    = (ePermissionsGroupRead   | ePermissionsGroupWrite   | ePermissionsGroupExecute ),
-
-        ePermissionsWorldRW     = (ePermissionsWorldRead   | ePermissionsWorldWrite   | 0                        ),
-        ePermissionsWorldRX     = (ePermissionsWorldRead   | 0                        | ePermissionsWorldExecute ),
-        ePermissionsWorldRWX    = (ePermissionsWorldRead   | ePermissionsWorldWrite   | ePermissionsWorldExecute ),
-
-        ePermissionsEveryoneR   = (ePermissionsUserRead    | ePermissionsGroupRead    | ePermissionsWorldRead    ),
-        ePermissionsEveryoneW   = (ePermissionsUserWrite   | ePermissionsGroupWrite   | ePermissionsWorldWrite   ),
-        ePermissionsEveryoneX   = (ePermissionsUserExecute | ePermissionsGroupExecute | ePermissionsWorldExecute ),
-
-        ePermissionsEveryoneRW  = (ePermissionsEveryoneR   | ePermissionsEveryoneW    | 0                        ),
-        ePermissionsEveryoneRX  = (ePermissionsEveryoneR   | 0                        | ePermissionsEveryoneX    ),
-        ePermissionsEveryoneRWX = (ePermissionsEveryoneR   | ePermissionsEveryoneW    | ePermissionsEveryoneX    ),
-        ePermissionsDefault     = (ePermissionsUserRW      | ePermissionsGroupRead)
-    };
-
+    static mode_t
+    ConvertOpenOptionsForPOSIXOpen (uint32_t open_options);
+    
     File() : 
         m_descriptor (kInvalidDescriptor),
         m_stream (kInvalidStream),
@@ -115,8 +87,29 @@ public:
     //------------------------------------------------------------------
     File (const char *path,
           uint32_t options,
-          uint32_t permissions = ePermissionsDefault);
+          uint32_t permissions = lldb::eFilePermissionsFileDefault);
 
+    //------------------------------------------------------------------
+    /// Constructor with FileSpec.
+    ///
+    /// Takes a FileSpec pointing to a file which can be just a filename, or a full
+    /// path. If \a path is not NULL or empty, this function will call
+    /// File::Open (const char *path, uint32_t options, uint32_t permissions).
+    ///
+    /// @param[in] path
+    ///     The FileSpec for this file.
+    ///
+    /// @param[in] options
+    ///     Options to use when opening (see File::OpenOptions)
+    ///
+    /// @param[in] permissions
+    ///     Options to use when opening (see File::Permissions)
+    ///
+    /// @see File::Open (const char *path, uint32_t options, uint32_t permissions)
+    //------------------------------------------------------------------
+    File (const FileSpec& filespec,
+          uint32_t options,
+          uint32_t permissions = lldb::eFilePermissionsFileDefault);
     
     File (int fd, bool tranfer_ownership) : 
         m_descriptor (fd),
@@ -210,7 +203,7 @@ public:
     Error
     Open (const char *path,
           uint32_t options,
-          uint32_t permissions = ePermissionsDefault);
+          uint32_t permissions = lldb::eFilePermissionsFileDefault);
 
     Error
     Close ();
@@ -451,6 +444,19 @@ public:
     //------------------------------------------------------------------
     Error
     Sync ();
+    
+    //------------------------------------------------------------------
+    /// Get the permissions for a this file.
+    ///
+    /// @return
+    ///     Bits logical OR'ed together from the permission bits defined
+    ///     in lldb_private::File::Permissions.
+    //------------------------------------------------------------------
+    uint32_t
+    GetPermissions(Error &error) const;
+    
+    static uint32_t
+    GetPermissions (const char *path, Error &error);
 
     //------------------------------------------------------------------
     /// Output printf formatted output to the stream.
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h b/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h
index c58be9ec09d..086c8f20056 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/FileSpec.h
@@ -177,7 +177,7 @@ public:
     ///     A pointer to this object if either the directory or filename
     ///     is valid, NULL otherwise.
     //------------------------------------------------------------------
-    operator bool() const;
+    explicit operator bool() const;
 
     //------------------------------------------------------------------
     /// Logical NOT operator.
@@ -420,6 +420,21 @@ public:
     FileType
     GetFileType () const;
 
+    //------------------------------------------------------------------
+    /// Return the current permissions of the path.
+    ///
+    /// Returns a bitmask for the current permissions of the file
+    /// ( zero or more of the permission bits defined in
+    /// File::Permissions).
+    ///
+    /// @return
+    ///     Zero if the file doesn't exist or we are unable to get
+    ///     information for the file, otherwise one or more permission
+    ///     bits from the File::Permissions enumeration.
+    //------------------------------------------------------------------
+    uint32_t
+    GetPermissions () const;
+    
     bool
     IsDirectory () const
     {
@@ -624,6 +639,21 @@ public:
     static size_t
     Resolve (const char *src_path, char *dst_path, size_t dst_len);
 
+    FileSpec
+    CopyByAppendingPathComponent (const char *new_path) const;
+    
+    FileSpec
+    CopyByRemovingLastPathComponent () const;
+    
+    void
+    AppendPathComponent (const char *new_path);
+    
+    void
+    RemoveLastPathComponent ();
+    
+    ConstString
+    GetLastPathComponent () const;
+    
     //------------------------------------------------------------------
     /// Resolves the user name at the beginning of \a src_path, and writes the output
     /// to \a dst_path.  Note, \a src_path can contain other path components after the
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/Host.h b/contrib/llvm/tools/lldb/include/lldb/Host/Host.h
index 547bdd5d637..fe0f6f62b3b 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/Host.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/Host.h
@@ -18,6 +18,7 @@
 
 #include "lldb/lldb-private.h"
 #include "lldb/Core/StringList.h"
+#include "lldb/Host/File.h"
 
 namespace lldb_private {
 
@@ -209,6 +210,9 @@ public:
     static lldb::pid_t
     GetCurrentProcessID ();
 
+    static void
+    Kill(lldb::pid_t pid, int signo);
+
     //------------------------------------------------------------------
     /// Get the thread ID for the calling thread in the current process.
     ///
@@ -264,6 +268,17 @@ public:
                 lldb::thread_result_t *thread_result_ptr,
                 Error *error);
 
+    typedef void (*ThreadLocalStorageCleanupCallback) (void *p);
+
+    static lldb::thread_key_t
+    ThreadLocalStorageCreate(ThreadLocalStorageCleanupCallback callback);
+
+    static void*
+    ThreadLocalStorageGet(lldb::thread_key_t key);
+
+    static void
+    ThreadLocalStorageSet(lldb::thread_key_t key, void *value);
+
     //------------------------------------------------------------------
     /// Gets the name of a thread in a process.
     ///
@@ -458,7 +473,7 @@ public:
                      int *signo_ptr,                // Pass NULL if you don't want the signal that caused the process to exit
                      std::string *command_output,   // Pass NULL if you don't want the command output
                      uint32_t timeout_sec,
-                     const char *shell = "/bin/bash");
+                     const char *shell = LLDB_DEFAULT_SHELL);
     
     static lldb::DataBufferSP
     GetAuxvData (lldb_private::Process *process);
@@ -494,6 +509,60 @@ public:
     DynamicLibraryGetSymbol (void *dynamic_library_handle, 
                              const char *symbol_name, 
                              Error &error);
+    
+    static Error
+    MakeDirectory (const char* path, uint32_t mode);
+    
+    static Error
+    GetFilePermissions (const char* path, uint32_t &file_permissions);
+
+    static Error
+    SetFilePermissions (const char* path, uint32_t file_permissions);
+    
+    static Error
+    Symlink (const char *src, const char *dst);
+    
+    static Error
+    Readlink (const char *path, char *buf, size_t buf_len);
+
+    static Error
+    Unlink (const char *path);
+
+    static lldb::user_id_t
+    OpenFile (const FileSpec& file_spec,
+              uint32_t flags,
+              uint32_t mode,
+              Error &error);
+    
+    static bool
+    CloseFile (lldb::user_id_t fd,
+               Error &error);
+    
+    static uint64_t
+    WriteFile (lldb::user_id_t fd,
+               uint64_t offset,
+               const void* src,
+               uint64_t src_len,
+               Error &error);
+    
+    static uint64_t
+    ReadFile (lldb::user_id_t fd,
+              uint64_t offset,
+              void* dst,
+              uint64_t dst_len,
+              Error &error);
+
+    static lldb::user_id_t
+    GetFileSize (const FileSpec& file_spec);
+    
+    static bool
+    GetFileExists (const FileSpec& file_spec);
+    
+    static bool
+    CalculateMD5 (const FileSpec& file_spec,
+                  uint64_t &low,
+                  uint64_t &high);
+
 };
 
 } // namespace lldb_private
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/Mutex.h b/contrib/llvm/tools/lldb/include/lldb/Host/Mutex.h
index 63f759efe36..496dd0496c1 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/Mutex.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/Mutex.h
@@ -11,7 +11,7 @@
 #define liblldb_Mutex_h_
 #if defined(__cplusplus)
 
-#include <pthread.h>
+#include "lldb/lldb-types.h"
 #include <assert.h>
 
 #ifdef LLDB_CONFIGURATION_DEBUG
@@ -238,7 +238,7 @@ protected:
     //------------------------------------------------------------------
     // TODO: Hide the mutex in the implementation file in case we ever need to port to an
     // architecture that doesn't have pthread mutexes.
-    pthread_mutex_t m_mutex; ///< The pthread mutex object.
+    lldb::mutex_t m_mutex; ///< The OS mutex object.
 
 private:
     //------------------------------------------------------------------
@@ -247,7 +247,7 @@ private:
     /// @return
     ///     A pointer to the pthread mutex object owned by this object.
     //------------------------------------------------------------------
-    pthread_mutex_t *
+    lldb::mutex_t *
     GetMutex();
 
     Mutex(const Mutex&);
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/OptionParser.h b/contrib/llvm/tools/lldb/include/lldb/Host/OptionParser.h
new file mode 100644
index 00000000000..ca83eeb1ed7
--- /dev/null
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/OptionParser.h
@@ -0,0 +1,58 @@
+//===-- OptionParser.h ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_OptionParser_h_
+#define liblldb_OptionParser_h_
+
+#include <string>
+
+struct option;
+
+namespace lldb_private {
+
+typedef struct Option
+{
+    // name of long option
+    const char *name;
+    // one of no_argument, required_argument, and optional_argument:
+    // whether option takes an argument
+    int has_arg;
+    // if not NULL, set *flag to val when option found
+    int *flag;
+    // if flag not NULL, value to set *flag to; else return value
+    int val;
+} Option;
+
+class OptionParser
+{
+public:
+    enum OptionArgument
+    {
+        eNoArgument = 0,
+        eRequiredArgument,
+        eOptionalArgument
+    };
+
+    static void Prepare();
+
+    static void EnableError(bool error);
+
+    static int Parse(int argc, char * const argv [],
+        const char *optstring,
+        const Option *longopts, int *longindex);
+
+    static char* GetOptionArgument();
+    static int GetOptionIndex();
+    static int GetOptionErrorCause();
+    static std::string GetShortOptionString(struct option *long_options);
+};
+
+}
+
+#endif  // liblldb_OptionParser_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/ProcessRunLock.h b/contrib/llvm/tools/lldb/include/lldb/Host/ProcessRunLock.h
index f563be73fce..eca1ad375fc 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/ProcessRunLock.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/ProcessRunLock.h
@@ -11,9 +11,9 @@
 #define liblldb_ProcessRunLock_h_
 #if defined(__cplusplus)
 
+#include "lldb/lldb-defines.h"
 #include "lldb/Host/Mutex.h"
 #include "lldb/Host/Condition.h"
-#include <pthread.h>
 #include <stdint.h>
 #include <time.h>
 
@@ -32,75 +32,14 @@ namespace lldb_private {
 class ProcessRunLock
 {
 public:
-    ProcessRunLock () :
-        m_rwlock(),
-        m_running(false)
-    {
-        int err = ::pthread_rwlock_init(&m_rwlock, NULL); (void)err;
-//#if LLDB_CONFIGURATION_DEBUG
-//        assert(err == 0);
-//#endif
-    }
-
-    ~ProcessRunLock ()
-    {
-        int err = ::pthread_rwlock_destroy (&m_rwlock); (void)err;
-//#if LLDB_CONFIGURATION_DEBUG
-//        assert(err == 0);
-//#endif
-    }
-
-    bool
-    ReadTryLock ()
-    {
-        ::pthread_rwlock_rdlock (&m_rwlock);
-        if (m_running == false)
-        {
-            return true;
-        }
-        ::pthread_rwlock_unlock (&m_rwlock);
-        return false;
-    }
-
-    bool
-    ReadUnlock ()
-    {
-        return ::pthread_rwlock_unlock (&m_rwlock) == 0;
-    }
-    
-    bool
-    SetRunning()
-    {
-        ::pthread_rwlock_wrlock (&m_rwlock);
-        m_running = true;
-        ::pthread_rwlock_unlock (&m_rwlock);
-        return true;
-    }
-    
-    bool
-    TrySetRunning()
-    {
-        bool r;
-
-        if (::pthread_rwlock_trywrlock (&m_rwlock) == 0)
-        {
-            r = !m_running;
-            m_running = true;
-            ::pthread_rwlock_unlock (&m_rwlock);
-            return r;
-        }
-        return false;
-    }
-    
-    bool
-    SetStopped ()
-    {
-        ::pthread_rwlock_wrlock (&m_rwlock);
-        m_running = false;
-        ::pthread_rwlock_unlock (&m_rwlock);
-        return true;
-    }
-
+    ProcessRunLock();
+    ~ProcessRunLock();
+    bool ReadTryLock ();
+    bool ReadUnlock ();
+    bool SetRunning ();
+    bool TrySetRunning ();
+    bool SetStopped ();
+public:
     class ProcessRunLocker
     {
     public:
@@ -153,7 +92,7 @@ public:
     };
 
 protected:
-    pthread_rwlock_t m_rwlock;
+    lldb::rwlock_t m_rwlock;
     bool m_running;
 private:
     DISALLOW_COPY_AND_ASSIGN(ProcessRunLock);
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/SocketAddress.h b/contrib/llvm/tools/lldb/include/lldb/Host/SocketAddress.h
index e63b238c799..5e79e94fa9e 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/SocketAddress.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/SocketAddress.h
@@ -12,9 +12,18 @@
 
 // C Includes
 #include <stdint.h>
+
+#ifdef _WIN32
+#include "lldb/Host/windows/windows.h"
+#include <winsock2.h>
+#include <WS2tcpip.h>
+typedef ADDRESS_FAMILY sa_family_t;
+typedef USHORT in_port_t;
+#else
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
+#endif
 
 #if defined(__FreeBSD__)
 #include <sys/types.h>
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/Symbols.h b/contrib/llvm/tools/lldb/include/lldb/Host/Symbols.h
index 9db68e1ecf1..652a614e635 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/Symbols.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/Symbols.h
@@ -12,7 +12,6 @@
 
 // C Includes
 #include <stdint.h>
-#include <sys/time.h>
 
 // C++ Includes
 // Other libraries and framework includes
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/Terminal.h b/contrib/llvm/tools/lldb/include/lldb/Host/Terminal.h
index b334717c796..5ea88c51563 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/Terminal.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/Terminal.h
@@ -12,6 +12,7 @@
 #if defined(__cplusplus)
 
 #include "lldb/lldb-private.h"
+#include "lldb/Host/Config.h"
 
 struct termios;
 
@@ -173,7 +174,9 @@ protected:
     //------------------------------------------------------------------
     Terminal        m_tty;          ///< A terminal
     int             m_tflags;       ///< Cached tflags information.
+#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
     std::unique_ptr<struct termios> m_termios_ap; ///< Cached terminal state information.
+#endif
     lldb::pid_t     m_process_group;///< Cached process group information.
 
 };
diff --git a/contrib/llvm/tools/lldb/include/lldb/Host/TimeValue.h b/contrib/llvm/tools/lldb/include/lldb/Host/TimeValue.h
index 8c43d6d0e5f..ba230045307 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Host/TimeValue.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Host/TimeValue.h
@@ -12,6 +12,7 @@
 
 // C Includes
 #include <stdint.h>
+#ifndef _MSC_VER
 #include <sys/time.h>
 
 // BEGIN: MinGW work around
@@ -19,6 +20,7 @@
 #include <pthread.h>
 #endif
 // END: MinGW work around
+#endif
 
 // C++ Includes
 // Other libraries and framework includes
@@ -40,7 +42,7 @@ public:
     TimeValue();
     TimeValue(const TimeValue& rhs);
     TimeValue(const struct timespec& ts);
-    TimeValue(const struct timeval& tv);
+    explicit TimeValue(uint32_t seconds, uint32_t nanos = 0);
     ~TimeValue();
 
     //------------------------------------------------------------------
@@ -64,9 +66,6 @@ public:
     struct timespec
     GetAsTimeSpec () const;
 
-    struct timeval
-    GetAsTimeVal () const;
-
     bool
     IsValid () const;
 
@@ -85,6 +84,23 @@ public:
     void
     Dump (Stream *s, uint32_t width = 0) const;
 
+    /// Returns only the seconds component of the TimeValue. The nanoseconds
+    /// portion is ignored. No rounding is performed.
+    /// @brief Retrieve the seconds component
+    uint32_t seconds() const { return m_nano_seconds / NanoSecPerSec; }
+
+    /// Returns only the nanoseconds component of the TimeValue. The seconds
+    /// portion is ignored.
+    /// @brief Retrieve the nanoseconds component.
+    uint32_t nanoseconds() const { return m_nano_seconds % NanoSecPerSec; }
+
+    /// Returns only the fractional portion of the TimeValue rounded down to the
+    /// nearest microsecond (divide by one thousand).
+    /// @brief Retrieve the fractional part as microseconds;
+    uint32_t microseconds() const {
+        return (m_nano_seconds % NanoSecPerSec) / NanoSecPerMicroSec;
+    }
+
 protected:
     //------------------------------------------------------------------
     // Classes that inherit from TimeValue can see and modify these
diff --git a/contrib/llvm/tools/lldb/include/lldb/Interpreter/Args.h b/contrib/llvm/tools/lldb/include/lldb/Interpreter/Args.h
index d06c3e56aec..27feca63e4a 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Interpreter/Args.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Interpreter/Args.h
@@ -11,8 +11,6 @@
 #define liblldb_Command_h_
 
 // C Includes
-#include <getopt.h>
-
 // C++ Includes
 #include <list>
 #include <string>
@@ -24,6 +22,7 @@
 #include "lldb/lldb-private-types.h"
 #include "lldb/lldb-types.h"
 #include "lldb/Core/Error.h"
+#include "lldb/Host/OptionParser.h"
 
 namespace lldb_private {
 
@@ -319,7 +318,7 @@ public:
     ParseOptions (Options &options);
     
     size_t
-    FindArgumentIndexForOption (struct option *long_options, int long_options_index);
+    FindArgumentIndexForOption (Option *long_options, int long_options_index);
     
     bool
     IsPositionalArgument (const char *arg);
diff --git a/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandObject.h b/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandObject.h
index 2bfab0a8ecc..8544fd9f9c3 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandObject.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Interpreter/CommandObject.h
@@ -42,7 +42,7 @@ public:
             return (*help_callback)();
         }
         
-        operator bool() const
+        explicit operator bool() const
         {
             return (help_callback != NULL);
         }
diff --git a/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h b/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h
index da05e127d5d..c09528f9f51 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionGroupValueObjectDisplay.h
@@ -62,8 +62,8 @@ public:
                ignore_cap == true;
     }
     
-    ValueObject::DumpValueObjectOptions
-    GetAsDumpOptions (bool objc_is_compact = false,
+    DumpValueObjectOptions
+    GetAsDumpOptions (LanguageRuntimeDescriptionDisplayVerbosity lang_descr_verbosity = eLanguageRuntimeDescriptionDisplayVerbosityFull,
                       lldb::Format format = lldb::eFormatDefault,
                       lldb::TypeSummaryImplSP summary_sp = lldb::TypeSummaryImplSP());
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueBoolean.h b/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueBoolean.h
index 2b935e9e03e..e024f3a0f3d 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueBoolean.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueBoolean.h
@@ -92,7 +92,7 @@ public:
     ///     /b True this object contains a valid namespace decl, \b 
     ///     false otherwise.
     //------------------------------------------------------------------
-    operator bool() const
+    explicit operator bool() const
     {
         return m_current_value;
     }
diff --git a/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueEnumeration.h b/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueEnumeration.h
index 012eeb68ac0..68beddfce0d 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueEnumeration.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Interpreter/OptionValueEnumeration.h
@@ -34,7 +34,7 @@ public:
         const char *description;
     };
     typedef UniqueCStringMap<EnumeratorInfo> EnumerationMap;
-    typedef typename EnumerationMap::Entry EnumerationMapEntry;
+    typedef EnumerationMap::Entry EnumerationMapEntry;
 
     OptionValueEnumeration (const OptionEnumValueElement *enumerators, enum_type value);
     
diff --git a/contrib/llvm/tools/lldb/include/lldb/Interpreter/Options.h b/contrib/llvm/tools/lldb/include/lldb/Interpreter/Options.h
index ac4daa8f579..2b4ac119055 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Interpreter/Options.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Interpreter/Options.h
@@ -11,7 +11,6 @@
 #define liblldb_Options_h_
 
 // C Includes
-#include <getopt.h>
 
 // C++ Includes
 #include <set>
@@ -141,7 +140,7 @@ public:
     /// @see Args::ParseOptions (Options&)
     /// @see man getopt_long_only
     //------------------------------------------------------------------
-    struct option *
+    Option *
     GetLongOptions ();
 
     // This gets passed the short option as an integer...
@@ -309,7 +308,7 @@ protected:
     typedef std::vector<OptionSet> OptionSetVector;
 
     CommandInterpreter &m_interpreter;
-    std::vector<struct option> m_getopt_table;
+    std::vector<Option> m_getopt_table;
     OptionSet m_seen_options;
     OptionSetVector m_required_options;
     OptionSetVector m_optional_options;
@@ -448,6 +447,12 @@ protected:
         void
         Finalize ();
         
+        bool
+        DidFinalize ()
+        {
+            return m_did_finalize;
+        }
+        
         virtual Error
         SetOptionValue (uint32_t option_idx, 
                         const char *option_arg);
@@ -464,6 +469,10 @@ protected:
             assert (m_did_finalize);
             return &m_option_defs[0];
         }
+        
+        const OptionGroup*
+        GetGroupWithOption (char short_opt);
+        
         struct OptionInfo
         {
             OptionInfo (OptionGroup* g, uint32_t i) :
diff --git a/contrib/llvm/tools/lldb/include/lldb/Interpreter/PythonDataObjects.h b/contrib/llvm/tools/lldb/include/lldb/Interpreter/PythonDataObjects.h
index b2c9240db09..2762d452c0c 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Interpreter/PythonDataObjects.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Interpreter/PythonDataObjects.h
@@ -19,11 +19,7 @@
 #include "lldb/Core/ConstString.h"
 #include "lldb/Core/Flags.h"
 #include "lldb/Interpreter/OptionValue.h"
-#if defined (__APPLE__)
-#include <Python/Python.h>
-#else
-#include <Python.h>
-#endif
+#include "lldb/lldb-python.h"
 
 namespace lldb_private {
     
@@ -105,7 +101,7 @@ namespace lldb_private {
         PythonString
         Str ();
         
-        operator bool () const
+        explicit operator bool () const
         {
             return m_py_obj != NULL;
         }
diff --git a/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreter.h b/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreter.h
index 9a66c775d47..9f529b82291 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreter.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreter.h
@@ -41,7 +41,7 @@ public:
         return m_object;
     }
     
-    operator bool ()
+    explicit operator bool ()
     {
         return m_object != NULL;
     }
@@ -108,44 +108,47 @@ public:
                                                const char *session_dictionary_name,
                                                const lldb::ProcessSP& process_sp);
     
-    typedef uint32_t       (*SWIGPythonCalculateNumChildren)                   (void *implementor);
-    typedef void*          (*SWIGPythonGetChildAtIndex)                        (void *implementor, uint32_t idx);
-    typedef int            (*SWIGPythonGetIndexOfChildWithName)                (void *implementor, const char* child_name);
-    typedef void*          (*SWIGPythonCastPyObjectToSBValue)                  (void* data);
-    typedef bool           (*SWIGPythonUpdateSynthProviderInstance)            (void* data);
-    typedef bool           (*SWIGPythonMightHaveChildrenSynthProviderInstance) (void* data);
+    typedef uint32_t        (*SWIGPythonCalculateNumChildren)                   (void *implementor);
+    typedef void*           (*SWIGPythonGetChildAtIndex)                        (void *implementor, uint32_t idx);
+    typedef int             (*SWIGPythonGetIndexOfChildWithName)                (void *implementor, const char* child_name);
+    typedef void*           (*SWIGPythonCastPyObjectToSBValue)                  (void* data);
+    typedef lldb::ValueObjectSP  (*SWIGPythonGetValueObjectSPFromSBValue)       (void* data);
+    typedef bool            (*SWIGPythonUpdateSynthProviderInstance)            (void* data);
+    typedef bool            (*SWIGPythonMightHaveChildrenSynthProviderInstance) (void* data);
 
     
-    typedef bool           (*SWIGPythonCallCommand)                 (const char *python_function_name,
-                                                                     const char *session_dictionary_name,
-                                                                     lldb::DebuggerSP& debugger,
-                                                                     const char* args,
-                                                                     lldb_private::CommandReturnObject& cmd_retobj);
+    typedef bool            (*SWIGPythonCallCommand)            (const char *python_function_name,
+                                                                 const char *session_dictionary_name,
+                                                                 lldb::DebuggerSP& debugger,
+                                                                 const char* args,
+                                                                 lldb_private::CommandReturnObject& cmd_retobj);
     
-    typedef bool           (*SWIGPythonCallModuleInit)              (const char *python_module_name,
-                                                                     const char *session_dictionary_name,
-                                                                     lldb::DebuggerSP& debugger);
+    typedef bool            (*SWIGPythonCallModuleInit)         (const char *python_module_name,
+                                                                 const char *session_dictionary_name,
+                                                                 lldb::DebuggerSP& debugger);
     
-    typedef bool            (*SWIGPythonScriptKeyword_Process)      (const char* python_function_name,
-                                                                     const char* session_dictionary_name,
-                                                                     lldb::ProcessSP& process,
-                                                                     std::string& output);
-    typedef bool            (*SWIGPythonScriptKeyword_Thread)      (const char* python_function_name,
-                                                                    const char* session_dictionary_name,
-                                                                    lldb::ThreadSP& thread,
-                                                                    std::string& output);
+    typedef bool            (*SWIGPythonScriptKeyword_Process)  (const char* python_function_name,
+                                                                 const char* session_dictionary_name,
+                                                                 lldb::ProcessSP& process,
+                                                                 std::string& output);
+    typedef bool            (*SWIGPythonScriptKeyword_Thread)   (const char* python_function_name,
+                                                                 const char* session_dictionary_name,
+                                                                 lldb::ThreadSP& thread,
+                                                                 std::string& output);
     
-    typedef bool            (*SWIGPythonScriptKeyword_Target)      (const char* python_function_name,
-                                                                    const char* session_dictionary_name,
-                                                                    lldb::TargetSP& target,
-                                                                    std::string& output);
-
-    typedef bool            (*SWIGPythonScriptKeyword_Frame)      (const char* python_function_name,
-                                                                    const char* session_dictionary_name,
-                                                                    lldb::StackFrameSP& frame,
-                                                                    std::string& output);
+    typedef bool            (*SWIGPythonScriptKeyword_Target)   (const char* python_function_name,
+                                                                 const char* session_dictionary_name,
+                                                                 lldb::TargetSP& target,
+                                                                 std::string& output);
 
+    typedef bool            (*SWIGPythonScriptKeyword_Frame)    (const char* python_function_name,
+                                                                 const char* session_dictionary_name,
+                                                                 lldb::StackFrameSP& frame,
+                                                                 std::string& output);
     
+    typedef void*           (*SWIGPython_GetDynamicSetting)     (void* module,
+                                                                 const char* setting,
+                                                                 const lldb::TargetSP& target_sp);
 
     typedef enum
     {
@@ -162,7 +165,8 @@ public:
         eScriptReturnTypeFloat,
         eScriptReturnTypeDouble,
         eScriptReturnTypeChar,
-        eScriptReturnTypeCharStrOrNone
+        eScriptReturnTypeCharStrOrNone,
+        eScriptReturnTypeOpaqueObject
     } ScriptReturnType;
     
     ScriptInterpreter (CommandInterpreter &interpreter, lldb::ScriptLanguage script_lang);
@@ -336,6 +340,22 @@ public:
     {
         return lldb::ScriptInterpreterObjectSP();
     }
+    
+    virtual lldb::ScriptInterpreterObjectSP
+    LoadPluginModule (const FileSpec& file_spec,
+                     lldb_private::Error& error)
+    {
+        return lldb::ScriptInterpreterObjectSP();
+    }
+    
+    virtual lldb::ScriptInterpreterObjectSP
+    GetDynamicSettings (lldb::ScriptInterpreterObjectSP plugin_module_sp,
+                        Target* target,
+                        const char* setting_name,
+                        lldb_private::Error& error)
+    {
+        return lldb::ScriptInterpreterObjectSP();
+    }
 
     virtual bool
     GenerateFunction(const char *signature, const StringList &input)
@@ -473,7 +493,8 @@ public:
     LoadScriptingModule (const char* filename,
                          bool can_reload,
                          bool init_session,
-                         lldb_private::Error& error)
+                         lldb_private::Error& error,
+                         lldb::ScriptInterpreterObjectSP* module_sp = nullptr)
     {
         error.SetErrorString("loading unimplemented");
         return false;
@@ -501,7 +522,26 @@ public:
     LanguageToString (lldb::ScriptLanguage language);
     
     static void
-    InitializeInterpreter (SWIGInitCallback python_swig_init_callback);
+    InitializeInterpreter (SWIGInitCallback python_swig_init_callback,
+                           SWIGBreakpointCallbackFunction swig_breakpoint_callback,
+                           SWIGWatchpointCallbackFunction swig_watchpoint_callback,
+                           SWIGPythonTypeScriptCallbackFunction swig_typescript_callback,
+                           SWIGPythonCreateSyntheticProvider swig_synthetic_script,
+                           SWIGPythonCalculateNumChildren swig_calc_children,
+                           SWIGPythonGetChildAtIndex swig_get_child_index,
+                           SWIGPythonGetIndexOfChildWithName swig_get_index_child,
+                           SWIGPythonCastPyObjectToSBValue swig_cast_to_sbvalue ,
+                           SWIGPythonGetValueObjectSPFromSBValue swig_get_valobj_sp_from_sbvalue,
+                           SWIGPythonUpdateSynthProviderInstance swig_update_provider,
+                           SWIGPythonMightHaveChildrenSynthProviderInstance swig_mighthavechildren_provider,
+                           SWIGPythonCallCommand swig_call_command,
+                           SWIGPythonCallModuleInit swig_call_module_init,
+                           SWIGPythonCreateOSPlugin swig_create_os_plugin,
+                           SWIGPythonScriptKeyword_Process swig_run_script_keyword_process,
+                           SWIGPythonScriptKeyword_Thread swig_run_script_keyword_thread,
+                           SWIGPythonScriptKeyword_Target swig_run_script_keyword_target,
+                           SWIGPythonScriptKeyword_Frame swig_run_script_keyword_frame,
+                           SWIGPython_GetDynamicSetting swig_plugin_get);
 
     static void
     TerminateInterpreter ();
diff --git a/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h b/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
index 2616f575d20..b729cb62800 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Interpreter/ScriptInterpreterPython.h
@@ -17,12 +17,7 @@
 
 #else
 
-#if defined (__APPLE__)
-#include <Python/Python.h>
-#else
-#include <Python.h>
-#endif
-
+#include "lldb/lldb-python.h"
 #include "lldb/lldb-private.h"
 #include "lldb/Interpreter/ScriptInterpreter.h"
 #include "lldb/Core/InputReader.h"
@@ -98,6 +93,16 @@ public:
                            lldb::tid_t tid,
                            lldb::addr_t context);
     
+    virtual lldb::ScriptInterpreterObjectSP
+    LoadPluginModule (const FileSpec& file_spec,
+                      lldb_private::Error& error);
+    
+    virtual lldb::ScriptInterpreterObjectSP
+    GetDynamicSettings (lldb::ScriptInterpreterObjectSP plugin_module_sp,
+                        Target* target,
+                        const char* setting_name,
+                        lldb_private::Error& error);
+    
     virtual size_t
     CalculateNumChildren (const lldb::ScriptInterpreterObjectSP& implementor);
     
@@ -200,7 +205,8 @@ public:
     LoadScriptingModule (const char* filename,
                          bool can_reload,
                          bool init_session,
-                         lldb_private::Error& error);
+                         lldb_private::Error& error,
+                         lldb::ScriptInterpreterObjectSP* module_sp = nullptr);
     
     virtual lldb::ScriptInterpreterObjectSP
     MakeScriptObject (void* object);
@@ -239,7 +245,26 @@ public:
     InitializePrivate ();
 
     static void
-    InitializeInterpreter (SWIGInitCallback python_swig_init_callback);
+    InitializeInterpreter (SWIGInitCallback python_swig_init_callback,
+                           SWIGBreakpointCallbackFunction swig_breakpoint_callback,
+                           SWIGWatchpointCallbackFunction swig_watchpoint_callback,
+                           SWIGPythonTypeScriptCallbackFunction swig_typescript_callback,
+                           SWIGPythonCreateSyntheticProvider swig_synthetic_script,
+                           SWIGPythonCalculateNumChildren swig_calc_children,
+                           SWIGPythonGetChildAtIndex swig_get_child_index,
+                           SWIGPythonGetIndexOfChildWithName swig_get_index_child,
+                           SWIGPythonCastPyObjectToSBValue swig_cast_to_sbvalue ,
+                           SWIGPythonGetValueObjectSPFromSBValue swig_get_valobj_sp_from_sbvalue,
+                           SWIGPythonUpdateSynthProviderInstance swig_update_provider,
+                           SWIGPythonMightHaveChildrenSynthProviderInstance swig_mighthavechildren_provider,
+                           SWIGPythonCallCommand swig_call_command,
+                           SWIGPythonCallModuleInit swig_call_module_init,
+                           SWIGPythonCreateOSPlugin swig_create_os_plugin,
+                           SWIGPythonScriptKeyword_Process swig_run_script_keyword_process,
+                           SWIGPythonScriptKeyword_Thread swig_run_script_keyword_thread,
+                           SWIGPythonScriptKeyword_Target swig_run_script_keyword_target,
+                           SWIGPythonScriptKeyword_Frame swig_run_script_keyword_frame,
+                           SWIGPython_GetDynamicSetting swig_plugin_get);
 
 protected:
 
@@ -254,7 +279,7 @@ protected:
 
     void
     RestoreTerminalState ();
-    
+
 private:
     
     class SynchronicityHandler
@@ -282,7 +307,7 @@ private:
             Py_XINCREF(m_object);
         }
         
-        operator bool ()
+        explicit operator bool ()
         {
             return m_object && m_object != Py_None;
         }
@@ -351,7 +376,7 @@ private:
     public:
         PythonInputReaderManager (ScriptInterpreterPython *interpreter);
         
-        operator bool()
+        explicit operator bool()
         {
             return m_error;
         }
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/Block.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/Block.h
index a2d703b9069..4a305e3cbbe 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/Block.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/Block.h
@@ -17,6 +17,7 @@
 #include "lldb/Core/UserID.h"
 #include "lldb/Symbol/LineEntry.h"
 #include "lldb/Symbol/SymbolContext.h"
+#include "lldb/Symbol/ClangASTType.h"
 
 namespace lldb_private {
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTImporter.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTImporter.h
index 10df7da893a..dc6ce6b5b95 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTImporter.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTImporter.h
@@ -278,6 +278,8 @@ private:
         
         clang::Decl *Imported (clang::Decl *from, clang::Decl *to);
         
+        clang::Decl *GetOriginalDecl (clang::Decl *To);
+        
         std::set<clang::NamedDecl *>   *m_decls_to_deport;
         std::set<clang::NamedDecl *>   *m_decls_already_deported;
         ClangASTImporter               &m_master;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTType.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTType.h
index d9e754e8ceb..19b5d6ec672 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTType.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangASTType.h
@@ -98,7 +98,7 @@ public:
     // Tests
     //----------------------------------------------------------------------
 
-    operator bool () const
+    explicit operator bool () const
     {
         return m_type != NULL && m_ast != NULL;
     }
@@ -155,6 +155,12 @@ public:
     bool
     IsFunctionType (bool *is_variadic_ptr = NULL) const;
 
+    size_t
+    GetNumberOfFunctionArguments () const;
+    
+    ClangASTType
+    GetFunctionArgumentAtIndex (const size_t index);
+    
     bool
     IsVariadicFunctionType () const;
 
@@ -194,6 +200,9 @@ public:
     bool
     IsPointerToScalarType () const;
     
+    bool
+    IsRuntimeGeneratedType () const;
+    
     bool
     IsPointerType (ClangASTType *pointee_type = NULL) const;
     
@@ -249,7 +258,7 @@ public:
     ConstString
     GetConstTypeName () const;
     
-    std::string
+    ConstString
     GetTypeName () const;
 
     uint32_t
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangNamespaceDecl.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangNamespaceDecl.h
index d10ab2a2966..13a4c0011af 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangNamespaceDecl.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/ClangNamespaceDecl.h
@@ -10,6 +10,8 @@
 #ifndef liblldb_ClangNamespaceDecl_h_
 #define liblldb_ClangNamespaceDecl_h_
 
+#include <string>
+
 #include "lldb/lldb-public.h"
 #include "lldb/Core/ClangForward.h"
 
@@ -60,7 +62,7 @@ public:
     ///     /b True this object contains a valid namespace decl, \b 
     ///     false otherwise.
     //------------------------------------------------------------------
-    operator bool() const
+    explicit operator bool() const
     {
         return m_ast != NULL && m_namespace_decl != NULL;
     }
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/ObjectFile.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/ObjectFile.h
index 8934c31bb98..ad500f5413b 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/ObjectFile.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/ObjectFile.h
@@ -367,6 +367,34 @@ public:
     virtual Symtab *
     GetSymtab () = 0;
 
+    //------------------------------------------------------------------
+    /// Appends a Symbol for the specified so_addr to the symbol table.
+    ///
+    /// If verify_unique is false, the symbol table is not searched
+    /// to determine if a Symbol found at this address has already been
+    /// added to the symbol table.  When verify_unique is true, this
+    /// method resolves the Symbol as the first match in the SymbolTable
+    /// and appends a Symbol only if required/found.
+    ///
+    /// @return
+    ///     The resolved symbol or nullptr.  Returns nullptr if a
+    ///     a Symbol could not be found for the specified so_addr.
+    //------------------------------------------------------------------
+    virtual Symbol *
+    ResolveSymbolForAddress(const Address &so_addr, bool verify_unique)
+    {
+        // Typically overridden to lazily add stripped symbols recoverable from
+        // the exception handling unwind information (i.e. without parsing
+        // the entire eh_frame section.
+        //
+        // The availability of LC_FUNCTION_STARTS allows ObjectFileMachO
+        // to efficiently add stripped symbols when the symbol table is
+        // first constructed.  Poorer cousins are PECoff and ELF.
+        return nullptr;
+    }
+
+    //------------------------------------------------------------------
+    /// Detect if this object file has been stripped of local symbols.
     //------------------------------------------------------------------
     /// Detect if this object file has been stripped of local symbols.
     ///
@@ -478,7 +506,7 @@ public:
     ///     The address of any auxiliary tables, or an invalid address if this
     ///     object file format does not support or contain such information.
     virtual lldb_private::Address
-    GetImageInfoAddress () { return Address(); }
+    GetImageInfoAddress (Target *target) { return Address(); }
     
     //------------------------------------------------------------------
     /// Returns the address of the Entry Point in this object file - if
@@ -612,6 +640,72 @@ public:
         }
         return 0;
     }
+    
+    //------------------------------------------------------------------
+    /// Get the minimum OS version this object file can run on.
+    ///
+    /// Some object files have information that specifies the minimum OS
+    /// version that they can be used on.
+    ///
+    /// If \a versions is NULL, or if \a num_versions is 0, the return
+    /// value will indicate how many version numbers are available in
+    /// this object file. Then a subsequent call can be made to this
+    /// function with a value of \a versions and \a num_versions that
+    /// has enough storage to store some or all version numbers.
+    ///
+    /// @param[out] versions
+    ///     A pointer to an array of uint32_t types that is \a num_versions
+    ///     long. If this value is NULL, the return value will indicate
+    ///     how many version numbers are required for a subsequent call
+    ///     to this function so that all versions can be retrieved. If
+    ///     the value is non-NULL, then at most \a num_versions of the
+    ///     existing versions numbers will be filled into \a versions.
+    ///     If there is no version information available, \a versions
+    ///     will be filled with \a num_versions UINT32_MAX values
+    ///     and zero will be returned.
+    ///
+    /// @param[in] num_versions
+    ///     The maximum number of entries to fill into \a versions. If
+    ///     this value is zero, then the return value will indicate
+    ///     how many version numbers there are in total so another call
+    ///     to this function can be make with adequate storage in
+    ///     \a versions to get all of the version numbers. If \a
+    ///     num_versions is less than the actual number of version
+    ///     numbers in this object file, only \a num_versions will be
+    ///     filled into \a versions (if \a versions is non-NULL).
+    ///
+    /// @return
+    ///     This function always returns the number of version numbers
+    ///     that this object file has regardless of the number of
+    ///     version numbers that were copied into \a versions.
+    //------------------------------------------------------------------
+    virtual uint32_t
+    GetMinimumOSVersion (uint32_t *versions, uint32_t num_versions)
+    {
+        if (versions && num_versions)
+        {
+            for (uint32_t i=0; i<num_versions; ++i)
+                versions[i] = UINT32_MAX;
+        }
+        return 0;
+    }
+
+    //------------------------------------------------------------------
+    /// Get the SDK OS version this object file was built with.
+    ///
+    /// The versions arguments and returns values are the same as the
+    /// GetMinimumOSVersion()
+    //------------------------------------------------------------------
+    virtual uint32_t
+    GetSDKVersion (uint32_t *versions, uint32_t num_versions)
+    {
+        if (versions && num_versions)
+        {
+            for (uint32_t i=0; i<num_versions; ++i)
+                versions[i] = UINT32_MAX;
+        }
+        return 0;
+    }
 
     //------------------------------------------------------------------
     // Member Functions
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/Symbol.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/Symbol.h
index 11c1cc7af9a..75e0900ab64 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/Symbol.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/Symbol.h
@@ -122,6 +122,21 @@ public:
         return m_mangled;
     }
 
+    ConstString
+    GetReExportedSymbolName() const;
+
+    FileSpec
+    GetReExportedSymbolSharedLibrary () const;
+    
+    bool
+    SetReExportedSymbolName(const ConstString &name);
+
+    bool
+    SetReExportedSymbolSharedLibrary (const FileSpec &fspec);
+    
+    Symbol *
+    ResolveReExportedSymbol (Target &target);
+
     uint32_t
     GetSiblingIndex () const;
 
@@ -238,24 +253,6 @@ public:
         m_size_is_sibling = b;
     }
 
-//    void
-//    SetValue (Address &value)
-//    {
-//        m_addr_range.GetBaseAddress() = value;
-//    }
-//
-//    void
-//    SetValue (const AddressRange &range)
-//    {
-//        m_addr_range = range;
-//    }
-//
-//    void
-//    SetValue (lldb::addr_t value);
-//    {
-//        m_addr_range.GetBaseAddress().SetRawAddress(value);
-//    }
-
     // If m_type is "Code" or "Function" then this will return the prologue size
     // in bytes, else it will return zero.
     uint32_t
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolContext.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolContext.h
index 5b12adebf5f..a0501440f18 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolContext.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/SymbolContext.h
@@ -16,7 +16,6 @@
 #include "lldb/lldb-private.h"
 #include "lldb/Core/Address.h"
 #include "lldb/Core/Mangled.h"
-#include "lldb/Symbol/ClangASTType.h"
 #include "lldb/Symbol/LineEntry.h"
 
 namespace lldb_private {
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/Symtab.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/Symtab.h
index 666c3b5686b..5dfb1c822d5 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/Symtab.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/Symtab.h
@@ -95,6 +95,10 @@ public:
                                                 bool add_mangled,
                                                 NameToIndexMap &name_to_index_map) const;
 
+    ObjectFile *        GetObjectFile()
+                        {
+                            return m_objfile;
+                        }
 protected:
     typedef std::vector<Symbol>         collection;
     typedef collection::iterator        iterator;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/Type.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/Type.h
index 50b22fe96b9..920f571fa1e 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/Type.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/Type.h
@@ -304,147 +304,236 @@ protected:
     ResolveClangType (ResolveState clang_type_resolve_state);
 };
 
+// these classes are used to back the SBType* objects
 
-///
-/// Sometimes you can find the name of the type corresponding to an object, but we don't have debug
-/// information for it.  If that is the case, you can return one of these objects, and then if it
-/// has a full type, you can use that, but if not at least you can print the name for informational
-/// purposes.
-///
-
-class TypeAndOrName
-{
-public:
-    TypeAndOrName ();
-    TypeAndOrName (lldb::TypeSP &type_sp);
-    TypeAndOrName (const char *type_str);
-    TypeAndOrName (const TypeAndOrName &rhs);
-    TypeAndOrName (ConstString &type_const_string);
-    
-    TypeAndOrName &
-    operator= (const TypeAndOrName &rhs);
-    
-    bool
-    operator==(const TypeAndOrName &other) const;
-    
-    bool
-    operator!=(const TypeAndOrName &other) const;
-    
-    ConstString GetName () const;
-
-    lldb::TypeSP
-    GetTypeSP () const 
-    {
-        return m_type_sp;
-    }
-    
-    void
-    SetName (const ConstString &type_name);
-    
-    void 
-    SetName (const char *type_name_cstr);
-    
-    void
-    SetTypeSP (lldb::TypeSP type_sp);
-    
-    bool
-    IsEmpty ();
-    
-    bool
-    HasName ();
-    
-    bool
-    HasTypeSP ();
-    
-    void
-    Clear ();
-    
-    operator
-    bool ()
-    {
-        return !IsEmpty();
-    }
-    
+class TypePair {
 private:
-    lldb::TypeSP m_type_sp;
-    ConstString m_type_name;
+    ClangASTType clang_type;
+    lldb::TypeSP type_sp;
+    
+public:
+    TypePair () : clang_type(), type_sp() {}
+    TypePair (ClangASTType type) :
+    clang_type(type),
+    type_sp()
+    {
+    }
+    
+    TypePair (lldb::TypeSP type) :
+    clang_type(),
+    type_sp(type)
+    {
+        clang_type = type_sp->GetClangForwardType();
+    }
+    
+    bool
+    IsValid () const
+    {
+        return clang_type.IsValid() || (type_sp.get() != nullptr);
+    }
+    
+    explicit operator bool () const
+    {
+        return IsValid();
+    }
+    
+    bool
+    operator == (const TypePair& rhs) const
+    {
+        return clang_type == rhs.clang_type &&
+        type_sp.get() == rhs.type_sp.get();
+    }
+    
+    bool
+    operator != (const TypePair& rhs) const
+    {
+        return clang_type != rhs.clang_type ||
+        type_sp.get() != rhs.type_sp.get();
+    }
+    
+    void
+    Clear ()
+    {
+        clang_type.Clear();
+        type_sp.reset();
+    }
+    
+    ConstString
+    GetName () const
+    {
+        if (type_sp)
+            return type_sp->GetName();
+        if (clang_type)
+            return clang_type.GetTypeName();
+        return ConstString ();
+    }
+    
+    void
+    SetType (ClangASTType type)
+    {
+        type_sp.reset();
+        clang_type = type;
+    }
+    
+    void
+    SetType (lldb::TypeSP type)
+    {
+        type_sp = type;
+        clang_type = type_sp->GetClangForwardType();
+    }
+    
+    lldb::TypeSP
+    GetTypeSP () const
+    {
+        return type_sp;
+    }
+    
+    ClangASTType
+    GetClangASTType () const
+    {
+        return clang_type;
+    }
+    
+    ClangASTType
+    GetPointerType () const
+    {
+        if (type_sp)
+            return type_sp->GetClangLayoutType().GetPointerType();
+        return clang_type.GetPointerType();
+    }
+    
+    ClangASTType
+    GetPointeeType () const
+    {
+        if (type_sp)
+            return type_sp->GetClangFullType().GetPointeeType();
+        return clang_type.GetPointeeType();
+    }
+    
+    ClangASTType
+    GetReferenceType () const
+    {
+        if (type_sp)
+            return type_sp->GetClangLayoutType().GetLValueReferenceType();
+        return clang_type.GetLValueReferenceType();
+    }
+    
+    ClangASTType
+    GetDereferencedType () const
+    {
+        if (type_sp)
+            return type_sp->GetClangFullType().GetNonReferenceType();
+        return clang_type.GetNonReferenceType();
+    }
+    
+    ClangASTType
+    GetUnqualifiedType () const
+    {
+        if (type_sp)
+            return type_sp->GetClangLayoutType().GetFullyUnqualifiedType();
+        return clang_type.GetFullyUnqualifiedType();
+    }
+    
+    ClangASTType
+    GetCanonicalType () const
+    {
+        if (type_sp)
+            return type_sp->GetClangFullType().GetCanonicalType();
+        return clang_type.GetCanonicalType();
+    }
+    
+    clang::ASTContext *
+    GetClangASTContext () const
+    {
+        return clang_type.GetASTContext();
+    }
 };
-
-// the two classes here are used by the public API as a backend to
-// the SBType and SBTypeList classes
     
 class TypeImpl
 {
 public:
     
-    TypeImpl() :
-        m_clang_ast_type(),
-        m_type_sp()
-    {
-    }
+    TypeImpl();
     
-    TypeImpl(const TypeImpl& rhs) :
-        m_clang_ast_type(rhs.m_clang_ast_type),
-        m_type_sp(rhs.m_type_sp)
-    {
-    }
+    ~TypeImpl () {}
     
-    TypeImpl(const lldb_private::ClangASTType& type);
+    TypeImpl(const TypeImpl& rhs);
     
-    TypeImpl(const lldb::TypeSP& type);
+    TypeImpl (lldb::TypeSP type_sp);
+    
+    TypeImpl (ClangASTType clang_type);
+    
+    TypeImpl (lldb::TypeSP type_sp, ClangASTType dynamic);
+    
+    TypeImpl (ClangASTType clang_type, ClangASTType dynamic);
+    
+    TypeImpl (TypePair pair, ClangASTType dynamic);
+
+    void
+    SetType (lldb::TypeSP type_sp);
+    
+    void
+    SetType (ClangASTType clang_type);
+    
+    void
+    SetType (lldb::TypeSP type_sp, ClangASTType dynamic);
+    
+    void
+    SetType (ClangASTType clang_type, ClangASTType dynamic);
+    
+    void
+    SetType (TypePair pair, ClangASTType dynamic);
     
     TypeImpl&
     operator = (const TypeImpl& rhs);
     
     bool
-    operator == (const TypeImpl& rhs)
-    {
-        return m_clang_ast_type == rhs.m_clang_ast_type && m_type_sp.get() == rhs.m_type_sp.get();
-    }
-
-    bool
-    operator != (const TypeImpl& rhs)
-    {
-        return m_clang_ast_type != rhs.m_clang_ast_type || m_type_sp.get() != rhs.m_type_sp.get();
-    }
+    operator == (const TypeImpl& rhs) const;
     
     bool
-    IsValid()
-    {
-        return m_type_sp.get() != NULL || m_clang_ast_type.IsValid();
-    }
+    operator != (const TypeImpl& rhs) const;
     
-    const lldb_private::ClangASTType &
-    GetClangASTType() const
-    {
-        return m_clang_ast_type;
-    }
+    bool
+    IsValid() const;
     
-    clang::ASTContext*
-    GetASTContext();
+    explicit operator bool () const;
     
-    lldb::clang_type_t
-    GetOpaqueQualType();    
-
-    lldb::TypeSP
-    GetTypeSP ()
-    {
-        return m_type_sp;
-    }
+    void Clear();
     
     ConstString
-    GetName ();
-
+    GetName ()  const;
+    
+    TypeImpl
+    GetPointerType () const;
+    
+    TypeImpl
+    GetPointeeType () const;
+    
+    TypeImpl
+    GetReferenceType () const;
+    
+    TypeImpl
+    GetDereferencedType () const;
+    
+    TypeImpl
+    GetUnqualifiedType() const;
+    
+    TypeImpl
+    GetCanonicalType() const;
+    
+    ClangASTType
+    GetClangASTType (bool prefer_dynamic);
+    
+    clang::ASTContext *
+    GetClangASTContext (bool prefer_dynamic);
+    
     bool
     GetDescription (lldb_private::Stream &strm, 
                     lldb::DescriptionLevel description_level);
     
-    void
-    SetType (const lldb::TypeSP &type_sp);
-
 private:
-    ClangASTType m_clang_ast_type;
-    lldb::TypeSP m_type_sp;
+    TypePair m_static_type;
+    ClangASTType m_dynamic_type;
 };
 
 class TypeListImpl
@@ -590,6 +679,89 @@ protected:
 };
 
     
+///
+/// Sometimes you can find the name of the type corresponding to an object, but we don't have debug
+/// information for it.  If that is the case, you can return one of these objects, and then if it
+/// has a full type, you can use that, but if not at least you can print the name for informational
+/// purposes.
+///
+
+class TypeAndOrName
+{
+public:
+    TypeAndOrName ();
+    TypeAndOrName (lldb::TypeSP &type_sp);
+    TypeAndOrName (const ClangASTType &clang_type);
+    TypeAndOrName (const char *type_str);
+    TypeAndOrName (const TypeAndOrName &rhs);
+    TypeAndOrName (ConstString &type_const_string);
+    
+    TypeAndOrName &
+    operator= (const TypeAndOrName &rhs);
+    
+    bool
+    operator==(const TypeAndOrName &other) const;
+    
+    bool
+    operator!=(const TypeAndOrName &other) const;
+    
+    ConstString GetName () const;
+    
+    lldb::TypeSP
+    GetTypeSP () const
+    {
+        return m_type_pair.GetTypeSP();
+    }
+    
+    ClangASTType
+    GetClangASTType () const
+    {
+        return m_type_pair.GetClangASTType();
+    }
+    
+    void
+    SetName (const ConstString &type_name);
+    
+    void
+    SetName (const char *type_name_cstr);
+    
+    void
+    SetTypeSP (lldb::TypeSP type_sp);
+    
+    void
+    SetClangASTType (ClangASTType clang_type);
+    
+    bool
+    IsEmpty () const;
+    
+    bool
+    HasName () const;
+    
+    bool
+    HasTypeSP () const;
+    
+    bool
+    HasClangASTType () const;
+    
+    bool
+    HasType () const
+    {
+        return HasTypeSP() || HasClangASTType();
+    }
+    
+    void
+    Clear ();
+    
+    explicit operator bool ()
+    {
+        return !IsEmpty();
+    }
+    
+private:
+    TypePair m_type_pair;
+    ConstString m_type_name;
+};
+    
 } // namespace lldb_private
 
 #endif  // liblldb_Type_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeList.h b/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeList.h
index 9c74db6bf1f..4f3f2c9bdbe 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeList.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Symbol/TypeList.h
@@ -12,7 +12,9 @@
 
 #include "lldb/lldb-private.h"
 #include "lldb/Symbol/Type.h"
+#include "lldb/Utility/Iterable.h"
 #include <map>
+#include <functional>
 
 namespace lldb_private {
 
@@ -50,6 +52,15 @@ public:
 
     lldb::TypeSP
     GetTypeAtIndex(uint32_t idx);
+    
+    typedef std::multimap<lldb::user_id_t, lldb::TypeSP> collection;
+    typedef AdaptedIterable<collection, lldb::TypeSP, map_adapter> TypeIterable;
+    
+    TypeIterable
+    Types ()
+    {
+        return TypeIterable(m_types);
+    }
 
     void
     ForEach (std::function <bool(const lldb::TypeSP &type_sp)> const &callback) const;
@@ -74,7 +85,6 @@ public:
     RemoveMismatchedTypes (lldb::TypeClass type_class);
 
 private:
-    typedef std::multimap<lldb::user_id_t, lldb::TypeSP> collection;
     typedef collection::iterator iterator;
     typedef collection::const_iterator const_iterator;
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h b/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h
index 16f8ee7fc7d..cc6c46cf0ec 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/ABI.h
@@ -18,6 +18,8 @@
 #include "lldb/Core/PluginInterface.h"
 #include "lldb/lldb-private.h"
 
+#include "llvm/ADT/ArrayRef.h"
+
 namespace lldb_private {
 
 class ABI :
@@ -35,12 +37,7 @@ public:
                         lldb::addr_t sp,
                         lldb::addr_t functionAddress,
                         lldb::addr_t returnAddress, 
-                        lldb::addr_t *arg1_ptr = NULL,
-                        lldb::addr_t *arg2_ptr = NULL,
-                        lldb::addr_t *arg3_ptr = NULL,
-                        lldb::addr_t *arg4_ptr = NULL,
-                        lldb::addr_t *arg5_ptr = NULL,
-                        lldb::addr_t *arg6_ptr = NULL) const = 0;
+                        llvm::ArrayRef<lldb::addr_t> args) const = 0;
 
     virtual bool
     GetArgumentValues (Thread &thread,
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/DynamicLoader.h b/contrib/llvm/tools/lldb/include/lldb/Target/DynamicLoader.h
index 6b76e5891ae..272f64f3311 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/DynamicLoader.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/DynamicLoader.h
@@ -224,6 +224,26 @@ public:
        return false;
     }
 
+    //------------------------------------------------------------------
+    /// Retrieves the per-module TLS block for a given thread.
+    ///
+    /// @param[in] module
+    ///     The module to query TLS data for.
+    ///
+    /// @param[in] thread
+    ///     The specific thread to query TLS data for.
+    ///
+    /// @return
+    ///     If the given thread has TLS data allocated for the
+    ///     module, the address of the TLS block. Otherwise
+    ///     LLDB_INVALID_ADDRESS is returned.
+    //------------------------------------------------------------------
+    virtual lldb::addr_t
+    GetThreadLocalData (const lldb::ModuleSP module, const lldb::ThreadSP thread)
+    {
+        return LLDB_INVALID_ADDRESS;
+    }
+
 protected:
     //------------------------------------------------------------------
     // Member variables.
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/ExecutionContext.h b/contrib/llvm/tools/lldb/include/lldb/Target/ExecutionContext.h
index de5fe14934a..4038e70b0c5 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/ExecutionContext.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/ExecutionContext.h
@@ -461,6 +461,9 @@ public:
 
     uint32_t
     GetAddressByteSize() const;
+    
+    lldb::ByteOrder
+    GetByteOrder() const;
 
     //------------------------------------------------------------------
     /// Returns a pointer to the target object.
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/LanguageRuntime.h b/contrib/llvm/tools/lldb/include/lldb/Target/LanguageRuntime.h
index 93c0437da75..0aaa67c2382 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/LanguageRuntime.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/LanguageRuntime.h
@@ -66,6 +66,12 @@ public:
     {
     }
     
+    virtual bool
+    ExceptionBreakpointsAreSet ()
+    {
+        return false;
+    }
+    
     virtual bool
     ExceptionBreakpointsExplainStop (lldb::StopInfoSP stop_reason)
     {
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h b/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h
index b0a07946e74..355c0528bed 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/Platform.h
@@ -22,6 +22,7 @@
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/ConstString.h"
 #include "lldb/Core/PluginInterface.h"
+#include "lldb/Interpreter/Options.h"
 #include "lldb/Host/Mutex.h"
 
 namespace lldb_private {
@@ -39,7 +40,8 @@ namespace lldb_private {
     ///     @li listing and getting info for existing processes
     ///     @li attaching and possibly debugging the platform's kernel
     //----------------------------------------------------------------------
-    class Platform : public PluginInterface
+    class Platform :
+        public PluginInterface
     {
     public:
 
@@ -213,8 +215,7 @@ namespace lldb_private {
         bool
         GetOSKernelDescription (std::string &s);
 
-        // Returns the the hostname if we are connected, else the short plugin
-        // name.
+        // Returns the the name of the platform
         ConstString
         GetName ();
 
@@ -268,6 +269,15 @@ namespace lldb_private {
         {
             return ArchSpec(); // Return an invalid architecture
         }
+        
+        virtual ConstString
+        GetRemoteWorkingDirectory()
+        {
+            return m_working_dir;
+        }
+        
+        virtual bool
+        SetRemoteWorkingDirectory(const ConstString &path);
 
         virtual const char *
         GetUserName (uint32_t uid);
@@ -383,10 +393,13 @@ namespace lldb_private {
         }
 
         //------------------------------------------------------------------
-        /// Subclasses should NOT need to implement this function as it uses
-        /// the Platform::LaunchProcess() followed by Platform::Attach ()
+        /// Subclasses do not need to implement this function as it uses
+        /// the Platform::LaunchProcess() followed by Platform::Attach ().
+        /// Remote platforms will want to subclass this function in order
+        /// to be able to intercept STDIO and possibly launch a separate
+        /// process that will debug the debuggee.
         //------------------------------------------------------------------
-        lldb::ProcessSP
+        virtual lldb::ProcessSP
         DebugProcess (ProcessLaunchInfo &launch_info,
                       Debugger &debugger,
                       Target *target,       // Can be NULL, if NULL create a new target, else use existing one
@@ -459,6 +472,15 @@ namespace lldb_private {
         virtual lldb::BreakpointSP
         SetThreadCreationBreakpoint (Target &target);
         
+        //------------------------------------------------------------------
+        // Given a target, find the local SDK directory if one exists on the
+        // current host.
+        //------------------------------------------------------------------
+        virtual lldb_private::ConstString
+        GetSDKDirectory (lldb_private::Target &target)
+        {
+            return lldb_private::ConstString();
+        }
 
         const std::string &
         GetRemoteURL () const
@@ -532,6 +554,12 @@ namespace lldb_private {
         {
             m_sdk_build = sdk_build;
         }    
+
+        ConstString
+        GetWorkingDirectory ();
+        
+        bool
+        SetWorkingDirectory (const ConstString &path);
         
         // There may be modules that we don't want to find by default for operations like "setting breakpoint by name".
         // The platform will return "true" from this call if the passed in module happens to be one of these.
@@ -542,9 +570,271 @@ namespace lldb_private {
             return false;
         }
         
+        virtual Error
+        MakeDirectory (const char *path, uint32_t permissions);
+        
+        virtual Error
+        GetFilePermissions (const char *path, uint32_t &file_permissions);
+
+        virtual Error
+        SetFilePermissions (const char *path, uint32_t file_permissions);
+
+        virtual lldb::user_id_t
+        OpenFile (const FileSpec& file_spec,
+                  uint32_t flags,
+                  uint32_t mode,
+                  Error &error)
+        {
+            return UINT64_MAX;
+        }
+        
+        virtual bool
+        CloseFile (lldb::user_id_t fd,
+                   Error &error)
+        {
+            return false;
+        }
+        
+        virtual lldb::user_id_t
+        GetFileSize (const FileSpec& file_spec)
+        {
+            return UINT64_MAX;
+        }
+
+        virtual uint64_t
+        ReadFile (lldb::user_id_t fd,
+                  uint64_t offset,
+                  void *dst,
+                  uint64_t dst_len,
+                  Error &error)
+        {
+            error.SetErrorStringWithFormat ("Platform::ReadFile() is not supported in the %s platform", GetName().GetCString());
+            return -1;
+        }
+        
+        virtual uint64_t
+        WriteFile (lldb::user_id_t fd,
+                   uint64_t offset,
+                   const void* src,
+                   uint64_t src_len,
+                   Error &error)
+        {
+            error.SetErrorStringWithFormat ("Platform::ReadFile() is not supported in the %s platform", GetName().GetCString());
+            return -1;
+        }
+        
+        virtual Error
+        GetFile (const FileSpec& source,
+                 const FileSpec& destination);
+        
+        virtual Error
+        PutFile (const FileSpec& source,
+                 const FileSpec& destination,
+                 uint32_t uid = UINT32_MAX,
+                 uint32_t gid = UINT32_MAX);
+
+        virtual Error
+        CreateSymlink (const char *src, // The name of the link is in src
+                       const char *dst);// The symlink points to dst
+
+        //----------------------------------------------------------------------
+        /// Install a file or directory to the remote system.
+        ///
+        /// Install is similar to Platform::PutFile(), but it differs in that if
+        /// an application/framework/shared library is installed on a remote
+        /// platform and the remote platform requires something to be done to
+        /// register the application/framework/shared library, then this extra
+        /// registration can be done.
+        ///
+        /// @param[in] src
+        ///     The source file/directory to install on the remote system.
+        ///
+        /// @param[in] dst
+        ///     The destination file/directory where \a src will be installed.
+        ///     If \a dst has no filename specified, then its filename will
+        ///     be set from \a src. It \a dst has no directory specified, it
+        ///     will use the platform working directory. If \a dst has a
+        ///     directory specified, but the directory path is relative, the
+        ///     platform working directory will be prepended to the relative
+        ///     directory.
+        ///
+        /// @return
+        ///     An error object that describes anything that went wrong.
+        //----------------------------------------------------------------------
+        virtual Error
+        Install (const FileSpec& src, const FileSpec& dst);
+
         virtual size_t
         GetEnvironment (StringList &environment);
         
+        virtual bool
+        GetFileExists (const lldb_private::FileSpec& file_spec);
+        
+        virtual Error
+        Unlink (const char *path);
+
+        virtual bool
+        GetSupportsRSync ()
+        {
+            return m_supports_rsync;
+        }
+        
+        virtual void
+        SetSupportsRSync(bool flag)
+        {
+            m_supports_rsync = flag;
+        }
+        
+        virtual const char*
+        GetRSyncOpts ()
+        {
+            return m_rsync_opts.c_str();
+        }
+        
+        virtual void
+        SetRSyncOpts (const char* opts)
+        {
+            m_rsync_opts.assign(opts);
+        }
+        
+        virtual const char*
+        GetRSyncPrefix ()
+        {
+            return m_rsync_prefix.c_str();
+        }
+        
+        virtual void
+        SetRSyncPrefix (const char* prefix)
+        {
+            m_rsync_prefix.assign(prefix);
+        }
+        
+        virtual bool
+        GetSupportsSSH ()
+        {
+            return m_supports_ssh;
+        }
+        
+        virtual void
+        SetSupportsSSH(bool flag)
+        {
+            m_supports_ssh = flag;
+        }
+        
+        virtual const char*
+        GetSSHOpts ()
+        {
+            return m_ssh_opts.c_str();
+        }
+        
+        virtual void
+        SetSSHOpts (const char* opts)
+        {
+            m_ssh_opts.assign(opts);
+        }
+        
+        virtual bool
+        GetIgnoresRemoteHostname ()
+        {
+            return m_ignores_remote_hostname;
+        }
+        
+        virtual void
+        SetIgnoresRemoteHostname(bool flag)
+        {
+            m_ignores_remote_hostname = flag;
+        }
+        
+        virtual lldb_private::OptionGroupOptions *
+        GetConnectionOptions (CommandInterpreter& interpreter)
+        {
+            return NULL;
+        }
+        
+        virtual lldb_private::Error
+        RunShellCommand (const char *command,           // Shouldn't be NULL
+                         const char *working_dir,       // Pass NULL to use the current working directory
+                         int *status_ptr,               // Pass NULL if you don't want the process exit status
+                         int *signo_ptr,                // Pass NULL if you don't want the signal that caused the process to exit
+                         std::string *command_output,   // Pass NULL if you don't want the command output
+                         uint32_t timeout_sec);         // Timeout in seconds to wait for shell program to finish
+        
+        virtual void
+        SetLocalCacheDirectory (const char* local);
+        
+        virtual const char*
+        GetLocalCacheDirectory ();
+        
+        virtual std::string
+        GetPlatformSpecificConnectionInformation()
+        {
+            return "";
+        }
+        
+        virtual bool
+        CalculateMD5 (const FileSpec& file_spec,
+                      uint64_t &low,
+                      uint64_t &high);
+        
+        virtual int32_t
+        GetResumeCountForLaunchInfo (ProcessLaunchInfo &launch_info)
+        {
+            return 1;
+        }
+
+        //------------------------------------------------------------------
+        /// Locate a queue name given a thread's qaddr
+        ///
+        /// On a system using libdispatch ("Grand Central Dispatch") style
+        /// queues, a thread may be associated with a GCD queue or not,
+        /// and a queue may be associated with multiple threads.
+        /// The process/thread must provide a way to find the "dispatch_qaddr" 
+        /// for each thread, and from that dispatch_qaddr this Platform method
+        /// will locate the queue name and provide that.
+        ///
+        /// @param[in] process
+        ///     A process is required for reading memory.
+        ///
+        /// @param[in] dispatch_qaddr
+        ///     The dispatch_qaddr for this thread.
+        ///
+        /// @return
+        ///     The name of the queue, if there is one.  An empty string
+        ///     means that this thread is not associated with a dispatch 
+        ///     queue.
+        //------------------------------------------------------------------
+        virtual std::string
+        GetQueueNameForThreadQAddress (Process *process, lldb::addr_t dispatch_qaddr)
+        {
+            return "";
+        }
+
+        //------------------------------------------------------------------
+        /// Locate a queue ID given a thread's qaddr
+        ///
+        /// On a system using libdispatch ("Grand Central Dispatch") style
+        /// queues, a thread may be associated with a GCD queue or not,
+        /// and a queue may be associated with multiple threads.
+        /// The process/thread must provide a way to find the "dispatch_qaddr" 
+        /// for each thread, and from that dispatch_qaddr this Platform method
+        /// will locate the queue ID and provide that.
+        ///
+        /// @param[in] process
+        ///     A process is required for reading memory.
+        ///
+        /// @param[in] dispatch_qaddr
+        ///     The dispatch_qaddr for this thread.
+        ///
+        /// @return
+        ///     The queue_id for this thread, if this thread is associated
+        ///     with a dispatch queue.  Else LLDB_INVALID_QUEUE_ID is returned.
+        //------------------------------------------------------------------
+        virtual lldb::queue_id_t
+        GetQueueIDForThreadQAddress (Process *process, lldb::addr_t dispatch_qaddr)
+        {
+            return LLDB_INVALID_QUEUE_ID;
+        }
+
     protected:
         bool m_is_host;
         // Set to true when we are able to actually set the OS version while 
@@ -556,6 +846,7 @@ namespace lldb_private {
         bool m_system_arch_set_while_connected;
         ConstString m_sdk_sysroot; // the root location of where the SDK files are all located
         ConstString m_sdk_build;
+        ConstString m_working_dir; // The working directory which is used when installing modules that have no install path set
         std::string m_remote_url;
         std::string m_name;
         uint32_t m_major_os_version;
@@ -569,7 +860,14 @@ namespace lldb_private {
         IDToNameMap m_gid_map;
         size_t m_max_uid_name_len;
         size_t m_max_gid_name_len;
-        
+        bool m_supports_rsync;
+        std::string m_rsync_opts;
+        std::string m_rsync_prefix;
+        bool m_supports_ssh;
+        std::string m_ssh_opts;
+        bool m_ignores_remote_hostname;
+        std::string m_local_cache_directory;
+
         const char *
         GetCachedUserName (uint32_t uid)
         {
@@ -750,6 +1048,110 @@ namespace lldb_private {
     private:
         DISALLOW_COPY_AND_ASSIGN (PlatformList);
     };
+    
+    class OptionGroupPlatformRSync : public lldb_private::OptionGroup
+    {
+    public:
+        OptionGroupPlatformRSync ();
+        
+        virtual
+        ~OptionGroupPlatformRSync ();
+        
+        virtual lldb_private::Error
+        SetOptionValue (CommandInterpreter &interpreter,
+                        uint32_t option_idx,
+                        const char *option_value);
+        
+        void
+        OptionParsingStarting (CommandInterpreter &interpreter);
+        
+        const lldb_private::OptionDefinition*
+        GetDefinitions ();
+        
+        virtual uint32_t
+        GetNumDefinitions ();
+        
+        // Options table: Required for subclasses of Options.
+        
+        static lldb_private::OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        bool m_rsync;
+        std::string m_rsync_opts;
+        std::string m_rsync_prefix;
+        bool m_ignores_remote_hostname;
+    private:
+        DISALLOW_COPY_AND_ASSIGN(OptionGroupPlatformRSync);
+    };
+    
+    class OptionGroupPlatformSSH : public lldb_private::OptionGroup
+    {
+    public:
+        OptionGroupPlatformSSH ();
+        
+        virtual
+        ~OptionGroupPlatformSSH ();
+        
+        virtual lldb_private::Error
+        SetOptionValue (CommandInterpreter &interpreter,
+                        uint32_t option_idx,
+                        const char *option_value);
+        
+        void
+        OptionParsingStarting (CommandInterpreter &interpreter);
+        
+        virtual uint32_t
+        GetNumDefinitions ();
+        
+        const lldb_private::OptionDefinition*
+        GetDefinitions ();
+        
+        // Options table: Required for subclasses of Options.
+        
+        static lldb_private::OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        bool m_ssh;
+        std::string m_ssh_opts;
+    private:
+        DISALLOW_COPY_AND_ASSIGN(OptionGroupPlatformSSH);
+    };
+    
+    class OptionGroupPlatformCaching : public lldb_private::OptionGroup
+    {
+    public:
+        OptionGroupPlatformCaching ();
+        
+        virtual
+        ~OptionGroupPlatformCaching ();
+        
+        virtual lldb_private::Error
+        SetOptionValue (CommandInterpreter &interpreter,
+                        uint32_t option_idx,
+                        const char *option_value);
+        
+        void
+        OptionParsingStarting (CommandInterpreter &interpreter);
+        
+        virtual uint32_t
+        GetNumDefinitions ();
+        
+        const lldb_private::OptionDefinition*
+        GetDefinitions ();
+        
+        // Options table: Required for subclasses of Options.
+        
+        static lldb_private::OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        std::string m_cache_dir;
+    private:
+        DISALLOW_COPY_AND_ASSIGN(OptionGroupPlatformCaching);
+    };
+    
 } // namespace lldb_private
 
 #endif  // liblldb_Platform_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/Process.h b/contrib/llvm/tools/lldb/include/lldb/Target/Process.h
index ef89a1eb141..cda9b4f5711 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/Process.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/Process.h
@@ -10,9 +10,10 @@
 #ifndef liblldb_Process_h_
 #define liblldb_Process_h_
 
+#include "lldb/Host/Config.h"
+
 // C Includes
 #include <limits.h>
-#include <spawn.h>
 
 // C++ Includes
 #include <list>
@@ -239,6 +240,12 @@ public:
         return m_arch;
     }
     
+    void
+    SetArchitecture (ArchSpec arch)
+    {
+        m_arch = arch;
+    }
+    
     lldb::pid_t
     GetProcessID () const
     {
@@ -475,11 +482,13 @@ public:
         bool
         Open (int fd, const char *path, bool read, bool write);
         
+#ifndef LLDB_DISABLE_POSIX
         static bool
-        AddPosixSpawnFileAction (posix_spawn_file_actions_t *file_actions,
+        AddPosixSpawnFileAction (void *file_actions,
                                  const FileAction *info,
                                  Log *log, 
                                  Error& error);
+#endif
 
         int
         GetFD () const
@@ -777,7 +786,8 @@ public:
     ConvertArgumentsForLaunchingInShell (Error &error,
                                          bool localhost,
                                          bool will_debug,
-                                         bool first_arg_is_full_shell_command);
+                                         bool first_arg_is_full_shell_command,
+                                         int32_t num_resumes);
     
     void
     SetMonitorProcessCallback (Host::MonitorChildProcessCallback callback, 
@@ -1358,9 +1368,7 @@ class Process :
 {
 friend class ThreadList;
 friend class ClangFunction; // For WaitForStateChangeEventsPrivate
-friend class CommandObjectProcessLaunch;
 friend class ProcessEventData;
-friend class CommandObjectBreakpointCommand;
 friend class StopInfo;
 
 public:
@@ -1737,7 +1745,7 @@ public:
     ///     the error object is success.
     //------------------------------------------------------------------
     virtual Error
-    Launch (const ProcessLaunchInfo &launch_info);
+    Launch (ProcessLaunchInfo &launch_info);
 
     virtual Error
     LoadCore ();
@@ -1749,7 +1757,7 @@ public:
         error.SetErrorStringWithFormat("error: %s does not support loading core files.", GetPluginName().GetCString());
         return error;
     }
-    
+
     //------------------------------------------------------------------
     /// Get the dynamic loader plug-in for this process. 
     ///
@@ -1762,6 +1770,16 @@ public:
     virtual DynamicLoader *
     GetDynamicLoader ();
 
+    //------------------------------------------------------------------
+    /// Get the system runtime plug-in for this process. 
+    ///
+    /// @return
+    ///   Returns a pointer to the SystemRuntime plugin for this Process
+    ///   if one is available.  Else returns NULL.
+    //------------------------------------------------------------------
+    virtual SystemRuntime *
+    GetSystemRuntime ();
+
     //------------------------------------------------------------------
     /// Attach to an existing process using the process attach info.
     ///
@@ -2484,11 +2502,7 @@ public:
     ExecutionResults
     RunThreadPlan (ExecutionContext &exe_ctx,    
                     lldb::ThreadPlanSP &thread_plan_sp,
-                    bool stop_others,
-                    bool run_others,
-                    bool unwind_on_error,
-                    bool ignore_breakpoints,
-                    uint32_t timeout_usec,
+                    const EvaluateExpressionOptions &options,
                     Stream &errors);
 
     static const char *
@@ -3286,6 +3300,23 @@ public:
     {
         return m_thread_list;
     }
+
+    // When ExtendedBacktraces are requested, the HistoryThreads that are
+    // created need an owner -- they're saved here in the Process.  The
+    // threads in this list are not iterated over - driver programs need to
+    // request the extended backtrace calls starting from a root concrete
+    // thread one by one.
+    ThreadList &
+    GetExtendedThreadList ()
+    {
+        return m_extended_thread_list;
+    }
+
+    ThreadList::ThreadIterable
+    Threads ()
+    {
+        return m_thread_list.Threads();
+    }
     
     uint32_t
     GetNextThreadIndexID (uint64_t thread_id);
@@ -3308,8 +3339,11 @@ public:
     lldb::StateType
     GetNextEvent (lldb::EventSP &event_sp);
 
+    // Returns the process state when it is stopped. If specified, event_sp_ptr
+    // is set to the event which triggered the stop. If wait_always = false,
+    // and the process is already stopped, this function returns immediately.
     lldb::StateType
-    WaitForProcessToStop (const TimeValue *timeout, lldb::EventSP *event_sp_ptr = NULL);
+    WaitForProcessToStop (const TimeValue *timeout, lldb::EventSP *event_sp_ptr = NULL, bool wait_always = true);
 
     lldb::StateType
     WaitForStateChangedEvents (const TimeValue *timeout, lldb::EventSP &event_sp);
@@ -3649,6 +3683,8 @@ protected:
     ThreadList                  m_thread_list_real;     ///< The threads for this process as are known to the protocol we are debugging with
     ThreadList                  m_thread_list;          ///< The threads for this process as the user will see them. This is usually the same as
                                                         ///< m_thread_list_real, but might be different if there is an OS plug-in creating memory threads
+    ThreadList                  m_extended_thread_list; ///< Owner for extended threads that may be generated, cleared on natural stops
+    uint32_t                    m_extended_thread_stop_id; ///< The natural stop id when extended_thread_list was last updated
     std::vector<Notifications>  m_notifications;        ///< The list of notifications that this process can deliver.
     std::vector<lldb::addr_t>   m_image_tokens;
     Listener                    &m_listener;
@@ -3656,6 +3692,7 @@ protected:
     std::unique_ptr<DynamicLoader> m_dyld_ap;
     std::unique_ptr<DynamicCheckerFunctions> m_dynamic_checkers_ap; ///< The functions used by the expression parser to validate data that expressions use.
     std::unique_ptr<OperatingSystem> m_os_ap;
+    std::unique_ptr<SystemRuntime> m_system_runtime_ap;
     UnixSignals                 m_unix_signals;         /// This is the current signal set for this process.
     lldb::ABISP                 m_abi_sp;
     lldb::InputReaderSP         m_process_input_reader;
@@ -3711,10 +3748,10 @@ protected:
     void
     ResumePrivateStateThread ();
 
-    static void *
+    static lldb::thread_result_t
     PrivateStateThread (void *arg);
 
-    void *
+    lldb::thread_result_t
     RunPrivateStateThread ();
 
     void
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h b/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h
new file mode 100644
index 00000000000..3e61e1490d4
--- /dev/null
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/RegisterCheckpoint.h
@@ -0,0 +1,71 @@
+//===-- RegisterCheckpoint.h ------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterCheckpoint_h_
+#define liblldb_RegisterCheckpoint_h_
+
+#include "lldb/lldb-private.h"
+#include "lldb/Core/UserID.h"
+#include "lldb/Target/StackID.h"
+
+namespace lldb_private {
+
+    // Inherit from UserID in case pushing/popping all register values can be
+    // done using a 64 bit integer that holds a baton/cookie instead of actually
+    // having to read all register values into a buffer
+    class RegisterCheckpoint : public UserID
+    {
+    public:
+        
+        enum class Reason {
+            // An expression is about to be run on the thread if the protocol that
+            // talks to the debuggee supports checkpointing the registers using a
+            // push/pop then the UserID base class in the RegisterCheckpoint can
+            // be used to store the baton/cookie that refers to the remote saved
+            // state.
+            eExpression,
+            // The register checkpoint wants the raw register bytes, so they must
+            // be read into m_data_sp, or the save/restore checkpoint should fail.
+            eDataBackup
+        };
+        
+        RegisterCheckpoint(Reason reason) :
+            UserID(0),
+            m_data_sp (),
+            m_reason(reason)
+        {
+        }
+        
+        ~RegisterCheckpoint()
+        {
+        }
+        
+        lldb::DataBufferSP &
+        GetData()
+        {
+            return m_data_sp;
+        }
+        
+        const lldb::DataBufferSP &
+        GetData() const
+        {
+            return m_data_sp;
+        }
+        
+    protected:
+        lldb::DataBufferSP m_data_sp;
+        Reason m_reason;
+        
+        // Make RegisterCheckpointSP if you wish to share the data in this class.
+        DISALLOW_COPY_AND_ASSIGN(RegisterCheckpoint);
+    };
+    
+} // namespace lldb_private
+
+#endif  // liblldb_RegisterCheckpoint_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h b/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h
index dd0e73fc7eb..421acc03cb2 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/RegisterContext.h
@@ -59,6 +59,18 @@ public:
     virtual bool
     WriteRegister (const RegisterInfo *reg_info, const RegisterValue &reg_value) = 0;
     
+    virtual bool
+    ReadAllRegisterValues (lldb::DataBufferSP &data_sp)
+    {
+        return false;
+    }
+    
+    virtual bool
+    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp)
+    {
+        return false;
+    }
+
     // These two functions are used to implement "push" and "pop" of register states.  They are used primarily
     // for expression evaluation, where we need to push a new state (storing the old one in data_sp) and then
     // restoring the original state by passing the data_sp we got from ReadAllRegisters to WriteAllRegisterValues.
@@ -67,10 +79,10 @@ public:
     // so these API's should only be used when this behavior is needed.
     
     virtual bool
-    ReadAllRegisterValues (lldb::DataBufferSP &data_sp) = 0;
-
+    ReadAllRegisterValues (lldb_private::RegisterCheckpoint &reg_checkpoint);
+    
     virtual bool
-    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp) = 0;
+    WriteAllRegisterValues (const lldb_private::RegisterCheckpoint &reg_checkpoint);
     
     bool
     CopyFromRegisterContext (lldb::RegisterContextSP context);
@@ -123,12 +135,17 @@ public:
     const RegisterInfo *
     GetRegisterInfoByName (const char *reg_name, uint32_t start_idx = 0);
 
+    const RegisterInfo *
+    GetRegisterInfo (uint32_t reg_kind, uint32_t reg_num);
+
     uint64_t
     GetPC (uint64_t fail_value = LLDB_INVALID_ADDRESS);
 
     bool
     SetPC (uint64_t pc);
 
+    bool SetPC (Address addr);
+
     uint64_t
     GetSP (uint64_t fail_value = LLDB_INVALID_ADDRESS);
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/StackFrame.h b/contrib/llvm/tools/lldb/include/lldb/Target/StackFrame.h
index 877bd8ce661..e7b57cd26ac 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/StackFrame.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/StackFrame.h
@@ -26,9 +26,21 @@
 
 namespace lldb_private {
 
+/// @class StackFrame StackFrame.h "lldb/Target/StackFrame.h"
+///
+/// @brief This base class provides an interface to stack frames.
+///
+/// StackFrames may have a Canonical Frame Address (CFA) or not.  
+/// A frame may have a plain pc value or it may have a pc value + stop_id 
+/// to indicate a specific point in the debug session so the correct section 
+/// load list is used for symbolication.
+///
+/// Local variables may be available, or not.  A register context may be
+/// available, or not.
+
 class StackFrame :
-    public std::enable_shared_from_this<StackFrame>,
-    public ExecutionContextScope
+    public ExecutionContextScope,
+    public std::enable_shared_from_this<StackFrame>
 {
 public:
     enum ExpressionPathOption
@@ -39,14 +51,72 @@ public:
         eExpressionPathOptionsNoSyntheticArrayRange = (1u << 3),
         eExpressionPathOptionsAllowDirectIVarAccess = (1u << 4)
     };
+
     //------------------------------------------------------------------
-    // Constructors and Destructors
+    /// Construct a StackFrame object without supplying a RegisterContextSP.
+    ///
+    /// This is the one constructor that doesn't take a RegisterContext
+    /// parameter.  This ctor may be called when creating a history StackFrame;
+    /// these are used if we've collected a stack trace of pc addresses at
+    /// some point in the past.  We may only have pc values.  We may have pc
+    /// values and the stop_id when the stack trace was recorded.  We may have a
+    /// CFA, or more likely, we won't.
+    ///
+    /// @param [in] thread_sp
+    ///   The Thread that this frame belongs to.
+    ///
+    /// @param [in] frame_idx
+    ///   This StackFrame's frame index number in the Thread.  If inlined stack
+    ///   frames are being created, this may differ from the concrete_frame_idx
+    ///   which is the frame index without any inlined stack frames.
+    ///
+    /// @param [in] concrete_frame_idx
+    ///   The StackFrame's frame index number in the Thread without any inlined
+    ///   stack frames being included in the index.  
+    ///
+    /// @param [in] cfa
+    ///   The Canonical Frame Address (this terminology from DWARF) for this
+    ///   stack frame.  The CFA for a stack frame does not change over the
+    ///   span of the stack frame's existence.  It is often the value of the
+    ///   caller's stack pointer before the call instruction into this frame's
+    ///   function.  It is usually not the same as the frame pointer register's
+    ///   value.
+    ///
+    /// @param [in] cfa_is_valid
+    ///   A history stack frame may not have a CFA value collected.  We want to
+    ///   distinguish between "no CFA available" and a CFA of 
+    ///   LLDB_INVALID_ADDRESS.
+    ///
+    /// @param [in] pc
+    ///   The current pc value of this stack frame.
+    ///
+    /// @param [in] stop_id
+    ///   The stop_id which should be used when looking up symbols for the pc value,
+    ///   if appropriate.  This argument is ignored if stop_id_is_valid is false.
+    ///
+    /// @param [in] stop_id_is_valid
+    ///   If the stop_id argument provided is not needed for this StackFrame, this
+    ///   should be false.  If this is a history stack frame and we know the stop_id
+    ///   when the pc value was collected, that stop_id should be provided and this
+    ///   will be true.
+    ///
+    /// @param [in] is_history_frame
+    ///   If this is a historical stack frame -- possibly without CFA or registers or
+    ///   local variables -- then this should be set to true.
+    ///
+    /// @param [in] sc_ptr
+    ///   Optionally seed the StackFrame with the SymbolContext information that has
+    ///   already been discovered.
     //------------------------------------------------------------------
     StackFrame (const lldb::ThreadSP &thread_sp,
                 lldb::user_id_t frame_idx, 
                 lldb::user_id_t concrete_frame_idx, 
                 lldb::addr_t cfa, 
+                bool cfa_is_valid,
                 lldb::addr_t pc, 
+                uint32_t stop_id,
+                bool stop_id_is_valid,
+                bool is_history_frame,
                 const SymbolContext *sc_ptr);
 
     StackFrame (const lldb::ThreadSP &thread_sp,
@@ -76,21 +146,103 @@ public:
     StackID&
     GetStackID();
 
+    //------------------------------------------------------------------
+    /// Get an Address for the current pc value in this StackFrame.
+    ///
+    /// May not be the same as the actual PC value for inlined stack frames.
+    ///
+    /// @return
+    ///   The Address object set to the current PC value.
+    //------------------------------------------------------------------
     const Address&
     GetFrameCodeAddress();
-    
-    void
+
+    //------------------------------------------------------------------
+    /// Change the pc value for a given thread.
+    ///
+    /// Change the current pc value for the frame on this thread.
+    ///
+    /// @param[in] pc
+    ///     The load address that the pc will be set to.
+    ///
+    /// @return
+    ///     true if the pc was changed.  false if this failed -- possibly
+    ///     because this frame is not a live StackFrame.
+    //------------------------------------------------------------------
+    bool
     ChangePC (lldb::addr_t pc);
 
+    //------------------------------------------------------------------
+    /// Provide a SymbolContext for this StackFrame's current pc value.
+    ///
+    /// The StackFrame maintains this SymbolContext and adds additional information
+    /// to it on an as-needed basis.  This helps to avoid different functions
+    /// looking up symbolic information for a given pc value multple times.
+    ///
+    /// @params [in] resolve_scope
+    ///   Flags from the SymbolContextItem enumerated type which specify what
+    ///   type of symbol context is needed by this caller.
+    ///
+    /// @return
+    ///   A SymbolContext reference which includes the types of information
+    ///   requested by resolve_scope, if they are available.
+    //------------------------------------------------------------------
     const SymbolContext&
     GetSymbolContext (uint32_t resolve_scope);
 
+    //------------------------------------------------------------------
+    /// Return the Canonical Frame Address (DWARF term) for this frame.
+    ///
+    /// The CFA is typically the value of the stack pointer register before
+    /// the call invocation is made.  It will not change during the lifetime
+    /// of a stack frame.  It is often not the same thing as the frame pointer
+    /// register value.
+    ///
+    /// Live StackFrames will always have a CFA but other types of frames may
+    /// not be able to supply one.
+    ///
+    /// @param [out] value
+    ///   The address of the CFA for this frame, if available.
+    ///
+    /// @param [out] error_ptr
+    ///   If there is an error determining the CFA address, this may contain a
+    ///   string explaining the failure.
+    ///
+    /// @return
+    ///   Returns true if the CFA value was successfully set in value.  Some
+    ///   frames may be unable to provide this value; they will return false.
+    //------------------------------------------------------------------
     bool
     GetFrameBaseValue(Scalar &value, Error *error_ptr);
 
+    //------------------------------------------------------------------
+    /// Get the current lexical scope block for this StackFrame, if possible.
+    ///
+    /// If debug information is available for this stack frame, return a
+    /// pointer to the innermost lexical Block that the frame is currently
+    /// executing.
+    ///
+    /// @return
+    ///   A pointer to the current Block.  NULL is returned if this can
+    ///   not be provided.
+    //------------------------------------------------------------------
     Block *
     GetFrameBlock ();
 
+    //------------------------------------------------------------------
+    /// Get the RegisterContext for this frame, if possible.
+    ///
+    /// Returns a shared pointer to the RegisterContext for this stack frame.
+    /// Only a live StackFrame object will be able to return a RegisterContext -
+    /// callers must be prepared for an empty shared pointer being returned.
+    ///
+    /// Even a live StackFrame RegisterContext may not be able to provide all
+    /// registers.  Only the currently executing frame (frame 0) can reliably
+    /// provide every register in the register context.
+    ///
+    /// @return
+    ///   The RegisterContext shared point for this frame.
+    //------------------------------------------------------------------
     lldb::RegisterContextSP
     GetRegisterContext ();
 
@@ -100,73 +252,237 @@ public:
         return m_reg_context_sp;
     }
 
+    //------------------------------------------------------------------
+    /// Retrieve the list of variables that are in scope at this StackFrame's pc.
+    ///
+    /// A frame that is not live may return an empty VariableList for a given
+    /// pc value even though variables would be available at this point if
+    /// it were a live stack frame.
+    ///
+    /// @param[in] get_file_globals
+    ///     Whether to also retrieve compilation-unit scoped variables
+    ///     that are visisble to the entire compilation unit (e.g. file
+    ///     static in C, globals that are homed in this CU).
+    ///
+    /// @return
+    ///     A pointer to a list of variables.
+    //------------------------------------------------------------------
     VariableList *
     GetVariableList (bool get_file_globals);
 
+    //------------------------------------------------------------------
+    /// Retrieve the list of variables that are in scope at this StackFrame's pc.
+    ///
+    /// A frame that is not live may return an empty VariableListSP for a
+    /// given pc value even though variables would be available at this point
+    /// if it were a live stack frame.
+    ///
+    /// @param[in] get_file_globals
+    ///     Whether to also retrieve compilation-unit scoped variables
+    ///     that are visisble to the entire compilation unit (e.g. file
+    ///     static in C, globals that are homed in this CU).
+    ///
+    /// @return
+    ///     A pointer to a list of variables.
+    //------------------------------------------------------------------
     lldb::VariableListSP
     GetInScopeVariableList (bool get_file_globals);
 
-    // See ExpressionPathOption enumeration for "options" values
+    //------------------------------------------------------------------
+    /// Create a ValueObject for a variable name / pathname, possibly
+    /// including simple dereference/child selection syntax.
+    ///
+    /// @param[in] var_expr
+    ///     The string specifying a variable to base the VariableObject off
+    ///     of.
+    ///
+    /// @param[in] use_dynamic
+    ///     Whether the correct dynamic type of an object pointer should be
+    ///     determined before creating the object, or if the static type is
+    ///     sufficient.  One of the DynamicValueType enumerated values.
+    ///
+    /// @param[in] options
+    ///     An unsigned integer of flags, values from StackFrame::ExpressionPathOption
+    ///     enum.
+    /// @param[in] var_sp
+    ///     A VariableSP that will be set to the variable described in the
+    ///     var_expr path.
+    ///
+    /// @param[in] error
+    ///     Record any errors encountered while evaluating var_expr.
+    ///
+    /// @return
+    ///     A shared pointer to the ValueObject described by var_expr.
+    //------------------------------------------------------------------
     lldb::ValueObjectSP
-    GetValueForVariableExpressionPath (const char *var_expr, 
-                                       lldb::DynamicValueType use_dynamic, 
+    GetValueForVariableExpressionPath (const char *var_expr,
+                                       lldb::DynamicValueType use_dynamic,
                                        uint32_t options,
                                        lldb::VariableSP &var_sp,
                                        Error &error);
 
+    //------------------------------------------------------------------
+    /// Determine whether this StackFrame has debug information available or not
+    ///
+    /// @return
+    //    true if debug information is available for this frame (function,
+    //    compilation unit, block, etc.)
+    //------------------------------------------------------------------
     bool
     HasDebugInformation ();
 
+    //------------------------------------------------------------------
+    /// Return the disassembly for the instructions of this StackFrame's function
+    /// as a single C string.
+    ///
+    /// @return
+    //    C string with the assembly instructions for this function.
+    //------------------------------------------------------------------
     const char *
     Disassemble ();
 
+    //------------------------------------------------------------------
+    /// Print a description for this frame using the frame-format formatter settings.
+    ///
+    /// @param [in] strm
+    ///   The Stream to print the description to.
+    ///
+    /// @param [in] frame_marker
+    ///   Optional string that will be prepended to the frame output description.
+    //------------------------------------------------------------------
     void
-    DumpUsingSettingsFormat (Stream *strm);
-    
+    DumpUsingSettingsFormat (Stream *strm, const char *frame_marker = NULL);
+
+    //------------------------------------------------------------------
+    /// Print a description for this frame using a default format.
+    ///
+    /// @param [in] strm
+    ///   The Stream to print the description to.
+    ///
+    /// @param [in] show_frame_index
+    ///   Whether to print the frame number or not.
+    ///
+    /// @param [in] show_fullpaths
+    ///   Whether to print the full source paths or just the file base name.
+    //------------------------------------------------------------------
     void
     Dump (Stream *strm, bool show_frame_index, bool show_fullpaths);
-    
+
+    //------------------------------------------------------------------
+    /// Print a description of this stack frame and/or the source context/assembly
+    /// for this stack frame.
+    ///
+    /// @param[in] strm
+    ///   The Stream to send the output to.
+    ///
+    /// @param[in] show_frame_info
+    ///   If true, print the frame info by calling DumpUsingSettingsFormat().
+    ///
+    /// @param[in] show_source
+    ///   If true, print source or disassembly as per the user's settings.
+    ///
+    /// @param[in] frame_marker 
+    ///   Passed to DumpUsingSettingsFormat() for the frame info printing.
+    ///
+    /// @return
+    ///   Returns true if successful.
+    //------------------------------------------------------------------
+    bool
+    GetStatus (Stream &strm,
+               bool show_frame_info,
+               bool show_source,
+               const char *frame_marker = NULL);
+
+    //------------------------------------------------------------------
+    /// Query whether this frame is a concrete frame on the call stack,
+    /// or if it is an inlined frame derived from the debug information
+    /// and presented by the debugger.
+    ///
+    /// @return
+    ///   true if this is an inlined frame.
+    //------------------------------------------------------------------
     bool
     IsInlined ();
 
+    //------------------------------------------------------------------
+    /// Query this frame to find what frame it is in this Thread's StackFrameList.
+    ///
+    /// @return
+    ///   StackFrame index 0 indicates the currently-executing function.  Inline
+    ///   frames are included in this frame index count.
+    //------------------------------------------------------------------
     uint32_t
     GetFrameIndex () const;
 
+    //------------------------------------------------------------------
+    /// Query this frame to find what frame it is in this Thread's StackFrameList,
+    /// not counting inlined frames.
+    ///
+    /// @return
+    ///   StackFrame index 0 indicates the currently-executing function.  Inline
+    ///   frames are not included in this frame index count; their concrete
+    ///   frame index will be the same as the concrete frame that they are
+    ///   derived from.
+    //------------------------------------------------------------------
     uint32_t
     GetConcreteFrameIndex () const
     {
         return m_concrete_frame_index;
     }
-    
+
+    //------------------------------------------------------------------
+    /// Create a ValueObject for a given Variable in this StackFrame.
+    ///
+    /// @params [in] variable_sp
+    ///   The Variable to base this ValueObject on
+    ///
+    /// @params [in] use_dynamic
+    ///     Whether the correct dynamic type of the variable should be
+    ///     determined before creating the ValueObject, or if the static type
+    ///     is sufficient.  One of the DynamicValueType enumerated values.
+    ///
+    /// @return
+    //    A ValueObject for this variable.
+    //------------------------------------------------------------------
     lldb::ValueObjectSP
     GetValueObjectForFrameVariable (const lldb::VariableSP &variable_sp, lldb::DynamicValueType use_dynamic);
 
+    //------------------------------------------------------------------
+    /// Add an arbitrary Variable object (e.g. one that specifics a global or static)
+    /// to a StackFrame's list of ValueObjects.
+    ///
+    /// @params [in] variable_sp
+    ///   The Variable to base this ValueObject on
+    ///
+    /// @params [in] use_dynamic
+    ///     Whether the correct dynamic type of the variable should be
+    ///     determined before creating the ValueObject, or if the static type
+    ///     is sufficient.  One of the DynamicValueType enumerated values.
+    ///
+    /// @return
+    //    A ValueObject for this variable.
+    //------------------------------------------------------------------
     lldb::ValueObjectSP
     TrackGlobalVariable (const lldb::VariableSP &variable_sp, lldb::DynamicValueType use_dynamic);
-    
+
     //------------------------------------------------------------------
     // lldb::ExecutionContextScope pure virtual functions
     //------------------------------------------------------------------
     virtual lldb::TargetSP
     CalculateTarget ();
-    
+
     virtual lldb::ProcessSP
     CalculateProcess ();
-    
+
     virtual lldb::ThreadSP
     CalculateThread ();
-    
+
     virtual lldb::StackFrameSP
     CalculateStackFrame ();
 
-    virtual void
+    void
     CalculateExecutionContext (ExecutionContext &exe_ctx);
-    
-    bool
-    GetStatus (Stream &strm,
-               bool show_frame_info,
-               bool show_source);
-    
+
 protected:
     friend class StackFrameList;
 
@@ -175,7 +491,7 @@ protected:
 
     void
     UpdateCurrentFrameFromPreviousFrame (StackFrame &prev_frame);
-    
+
     void
     UpdatePreviousFrameFromCurrentFrame (StackFrame &curr_frame);
 
@@ -196,6 +512,10 @@ private:
     Flags m_flags;
     Scalar m_frame_base;
     Error m_frame_base_error;
+    bool m_cfa_is_valid;        // Does this frame have a CFA?  Different from CFA == LLDB_INVALID_ADDRESS
+    uint32_t m_stop_id;
+    bool m_stop_id_is_valid;      // Does this frame have a stop_id?  Use it when referring to the m_frame_code_addr.
+    bool m_is_history_frame;
     lldb::VariableListSP m_variable_list_sp;
     ValueObjectList m_variable_list_value_objects;  // Value objects for each variable in m_variable_list_sp
     StreamString m_disassembly;
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/StackFrameList.h b/contrib/llvm/tools/lldb/include/lldb/Target/StackFrameList.h
index b2689d0391e..2680be3e5a6 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/StackFrameList.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/StackFrameList.h
@@ -88,7 +88,8 @@ public:
                uint32_t first_frame,
                uint32_t num_frames,
                bool show_frame_info,
-               uint32_t num_frames_with_source);
+               uint32_t num_frames_with_source,
+               const char *frame_marker = NULL);
     
 protected:
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/StackID.h b/contrib/llvm/tools/lldb/include/lldb/Target/StackID.h
index 7e713c73d97..75ad8ab3890 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/StackID.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/StackID.h
@@ -110,13 +110,18 @@ public:
 protected:
 
     friend class StackFrame;
-    
+
     void
     SetPC (lldb::addr_t pc)
     {
         m_pc = pc;
     }
 
+    void
+    SetCFA (lldb::addr_t cfa)
+    {
+        m_cfa = cfa;
+    }
 
     //------------------------------------------------------------------
     // Classes that inherit from StackID can see and modify these
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/SystemRuntime.h b/contrib/llvm/tools/lldb/include/lldb/Target/SystemRuntime.h
new file mode 100644
index 00000000000..7a0703e6cc3
--- /dev/null
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/SystemRuntime.h
@@ -0,0 +1,177 @@
+//===-- SystemRuntime.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_SystemRuntime_h_
+#define liblldb_SystemRuntime_h_
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
+#include <vector>
+
+#include "lldb/lldb-public.h"
+#include "lldb/Core/ConstString.h"
+#include "lldb/Core/ModuleList.h"
+#include "lldb/Core/PluginInterface.h"
+#include "lldb/lldb-private.h"
+
+
+namespace lldb_private {
+
+//----------------------------------------------------------------------
+/// @class SystemRuntime SystemRuntime.h "lldb/Target/SystemRuntime.h"
+/// @brief A plug-in interface definition class for system runtimes.
+///
+/// The system runtime plugins can collect information from the system
+/// libraries during a Process' lifetime and provide information about
+/// how objects/threads were originated.
+///
+/// For instance, a system runtime plugin use a breakpoint when threads
+/// are created to record the backtrace of where that thread was created.
+/// Later, when backtracing the created thread, it could extend the backtrace
+/// to show where it was originally created from.  
+///
+/// The plugin will insert its own breakpoint when Created and start collecting
+/// information.  Later when it comes time to augment a Thread, it can be
+/// asked to provide that information.
+///
+//----------------------------------------------------------------------
+
+class SystemRuntime :
+    public PluginInterface
+{
+public:
+    //------------------------------------------------------------------
+    /// Find a system runtime plugin for a given process.
+    ///
+    /// Scans the installed SystemRuntime plugins and tries to find
+    /// an instance that can be used to track image changes in \a
+    /// process.
+    ///
+    /// @param[in] process
+    ///     The process for which to try and locate a system runtime
+    ///     plugin instance.
+    //------------------------------------------------------------------
+    static SystemRuntime* 
+    FindPlugin (Process *process);
+
+    //------------------------------------------------------------------
+    /// Construct with a process.
+    // -----------------------------------------------------------------
+    SystemRuntime(lldb_private::Process *process);
+
+    //------------------------------------------------------------------
+    /// Destructor.
+    ///
+    /// The destructor is virtual since this class is designed to be
+    /// inherited by the plug-in instance.
+    //------------------------------------------------------------------
+    virtual
+    ~SystemRuntime();
+
+    //------------------------------------------------------------------
+    /// Called after attaching to a process.
+    ///
+    /// Allow the SystemRuntime plugin to execute some code after attaching
+    /// to a process. 
+    //------------------------------------------------------------------
+    virtual void
+    DidAttach ();
+
+    //------------------------------------------------------------------
+    /// Called after launching a process.
+    ///
+    /// Allow the SystemRuntime plugin to execute some code after launching
+    /// a process. 
+    //------------------------------------------------------------------
+    virtual void
+    DidLaunch();
+
+    //------------------------------------------------------------------
+    /// Called when modules have been loaded in the process.
+    ///
+    /// Allow the SystemRuntime plugin to enable logging features in the
+    /// system runtime libraries.
+    //------------------------------------------------------------------
+    virtual void
+    ModulesDidLoad(lldb_private::ModuleList &module_list);
+
+
+    //------------------------------------------------------------------
+    /// Return a list of thread origin extended backtraces that may 
+    /// be available.
+    ///
+    /// A System Runtime may be able to provide a backtrace of when this
+    /// thread was originally created.  Furthermore, it may be able to 
+    /// provide that extended backtrace for different styles of creation.
+    /// On a system with both pthreads and libdispatch, aka Grand Central 
+    /// Dispatch, queues, the system runtime may be able to provide the
+    /// pthread creation of the thread and it may also be able to provide
+    /// the backtrace of when this GCD queue work block was enqueued.
+    /// The caller may request these different origins by name.
+    ///
+    /// The names will be provided in the order that they are most likely
+    /// to be requested.  For instance, a most natural order may be to 
+    /// request the GCD libdispatch queue origin.  If there is none, then 
+    /// request the pthread origin.
+    ///
+    /// @return
+    ///   A vector of ConstStrings with names like "pthread" or "libdispatch".
+    ///   An empty vector may be returned if no thread origin extended 
+    ///   backtrace capabilities are available.
+    //------------------------------------------------------------------
+    virtual const std::vector<ConstString> &
+    GetExtendedBacktraceTypes ();
+
+    //------------------------------------------------------------------
+    /// Return a Thread which shows the origin of this thread's creation.
+    ///
+    /// This likely returns a HistoryThread which shows how thread was
+    /// originally created (e.g. "pthread" type), or how the work that
+    /// is currently executing on it was originally enqueued (e.g. 
+    /// "libdispatch" type).
+    ///
+    /// There may be a chain of thread-origins; it may be informative to
+    /// the end user to query the returned ThreadSP for its origins as 
+    /// well.
+    ///
+    /// @param [in] thread
+    ///   The thread to examine.
+    ///
+    /// @param [in] type
+    ///   The type of thread origin being requested.  The types supported
+    ///   are returned from SystemRuntime::GetExtendedBacktraceTypes.
+    ///
+    /// @return
+    ///   A ThreadSP which will have a StackList of frames.  This Thread will
+    ///   not appear in the Process' list of current threads.  Normal thread 
+    ///   operations like stepping will not be available.  This is a historical
+    ///   view thread and may be only useful for showing a backtrace.
+    ///
+    ///   An empty ThreadSP will be returned if no thread origin is available.
+    //------------------------------------------------------------------
+    virtual lldb::ThreadSP
+    GetExtendedBacktraceThread (lldb::ThreadSP thread, ConstString type);
+
+protected:
+    //------------------------------------------------------------------
+    // Member variables.
+    //------------------------------------------------------------------
+    Process *m_process;
+
+    std::vector<ConstString> m_types;
+
+private:
+    DISALLOW_COPY_AND_ASSIGN (SystemRuntime);
+};
+
+} // namespace lldb_private
+
+#endif  // liblldb_SystemRuntime_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/Target.h b/contrib/llvm/tools/lldb/include/lldb/Target/Target.h
index 87fa57b3a29..d874891a6af 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/Target.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/Target.h
@@ -184,11 +184,15 @@ public:
     static const uint32_t default_timeout = 500000;
     EvaluateExpressionOptions() :
         m_execution_policy(eExecutionPolicyOnlyWhenNeeded),
+        m_language (lldb::eLanguageTypeUnknown),
         m_coerce_to_id(false),
         m_unwind_on_error(true),
         m_ignore_breakpoints (false),
         m_keep_in_memory(false),
-        m_run_others(true),
+        m_try_others(true),
+        m_stop_others(true),
+        m_debug(false),
+        m_trap_exceptions(true),
         m_use_dynamic(lldb::eNoDynamicValues),
         m_timeout_usec(default_timeout)
     {}
@@ -199,11 +203,22 @@ public:
         return m_execution_policy;
     }
     
-    EvaluateExpressionOptions&
+    void
     SetExecutionPolicy (ExecutionPolicy policy = eExecutionPolicyAlways)
     {
         m_execution_policy = policy;
-        return *this;
+    }
+    
+    lldb::LanguageType
+    GetLanguage() const
+    {
+        return m_language;
+    }
+    
+    void
+    SetLanguage(lldb::LanguageType language)
+    {
+        m_language = language;
     }
     
     bool
@@ -212,11 +227,10 @@ public:
         return m_coerce_to_id;
     }
     
-    EvaluateExpressionOptions&
+    void
     SetCoerceToId (bool coerce = true)
     {
         m_coerce_to_id = coerce;
-        return *this;
     }
     
     bool
@@ -225,11 +239,10 @@ public:
         return m_unwind_on_error;
     }
     
-    EvaluateExpressionOptions&
+    void
     SetUnwindOnError (bool unwind = false)
     {
         m_unwind_on_error = unwind;
-        return *this;
     }
     
     bool
@@ -238,11 +251,10 @@ public:
         return m_ignore_breakpoints;
     }
     
-    EvaluateExpressionOptions&
+    void
     SetIgnoreBreakpoints (bool ignore = false)
     {
         m_ignore_breakpoints = ignore;
-        return *this;
     }
     
     bool
@@ -251,11 +263,10 @@ public:
         return m_keep_in_memory;
     }
     
-    EvaluateExpressionOptions&
+    void
     SetKeepInMemory (bool keep = true)
     {
         m_keep_in_memory = keep;
-        return *this;
     }
     
     lldb::DynamicValueType
@@ -264,11 +275,10 @@ public:
         return m_use_dynamic;
     }
     
-    EvaluateExpressionOptions&
+    void
     SetUseDynamic (lldb::DynamicValueType dynamic = lldb::eDynamicCanRunTarget)
     {
         m_use_dynamic = dynamic;
-        return *this;
     }
     
     uint32_t
@@ -277,33 +287,71 @@ public:
         return m_timeout_usec;
     }
     
-    EvaluateExpressionOptions&
+    void
     SetTimeoutUsec (uint32_t timeout = 0)
     {
         m_timeout_usec = timeout;
-        return *this;
     }
     
     bool
-    GetRunOthers () const
+    GetTryAllThreads () const
     {
-        return m_run_others;
+        return m_try_others;
     }
     
-    EvaluateExpressionOptions&
-    SetRunOthers (bool run_others = true)
+    void
+    SetTryAllThreads (bool try_others = true)
     {
-        m_run_others = run_others;
-        return *this;
+        m_try_others = try_others;
     }
     
+    bool
+    GetStopOthers () const
+    {
+        return m_stop_others;
+    }
+    
+    void
+    SetStopOthers (bool stop_others = true)
+    {
+        m_stop_others = stop_others;
+    }
+    
+    bool
+    GetDebug() const
+    {
+        return m_debug;
+    }
+    
+    void
+    SetDebug(bool b)
+    {
+        m_debug = b;
+    }
+    
+    bool
+    GetTrapExceptions() const
+    {
+        return m_trap_exceptions;
+    }
+    
+    void
+    SetTrapExceptions (bool b)
+    {
+        m_trap_exceptions = b;
+    }
+
 private:
     ExecutionPolicy m_execution_policy;
+    lldb::LanguageType m_language;
     bool m_coerce_to_id;
     bool m_unwind_on_error;
     bool m_ignore_breakpoints;
     bool m_keep_in_memory;
-    bool m_run_others;
+    bool m_try_others;
+    bool m_stop_others;
+    bool m_debug;
+    bool m_trap_exceptions;
     lldb::DynamicValueType m_use_dynamic;
     uint32_t m_timeout_usec;
 };
@@ -503,26 +551,30 @@ public:
     CreateBreakpoint (const FileSpecList *containingModules,
                       const FileSpec &file,
                       uint32_t line_no,
-                      LazyBool check_inlines = eLazyBoolCalculate,
-                      LazyBool skip_prologue = eLazyBoolCalculate,
-                      bool internal = false);
+                      LazyBool check_inlines,
+                      LazyBool skip_prologue,
+                      bool internal,
+                      bool request_hardware);
 
     // Use this to create breakpoint that matches regex against the source lines in files given in source_file_list:
     lldb::BreakpointSP
     CreateSourceRegexBreakpoint (const FileSpecList *containingModules,
                                  const FileSpecList *source_file_list,
                                  RegularExpression &source_regex,
-                                 bool internal = false);
+                                 bool internal,
+                                 bool request_hardware);
 
     // Use this to create a breakpoint from a load address
     lldb::BreakpointSP
     CreateBreakpoint (lldb::addr_t load_addr,
-                      bool internal = false);
+                      bool internal,
+                      bool request_hardware);
 
     // Use this to create Address breakpoints:
     lldb::BreakpointSP
     CreateBreakpoint (Address &addr,
-                      bool internal = false);
+                      bool internal,
+                      bool request_hardware);
 
     // Use this to create a function breakpoint by regexp in containingModule/containingSourceFiles, or all modules if it is NULL
     // When "skip_prologue is set to eLazyBoolCalculate, we use the current target 
@@ -531,8 +583,9 @@ public:
     CreateFuncRegexBreakpoint (const FileSpecList *containingModules,
                                const FileSpecList *containingSourceFiles,
                                RegularExpression &func_regexp,
-                               LazyBool skip_prologue = eLazyBoolCalculate,
-                               bool internal = false);
+                               LazyBool skip_prologue,
+                               bool internal,
+                               bool request_hardware);
 
     // Use this to create a function breakpoint by name in containingModule, or all modules if it is NULL
     // When "skip_prologue is set to eLazyBoolCalculate, we use the current target 
@@ -542,11 +595,12 @@ public:
                       const FileSpecList *containingSourceFiles,
                       const char *func_name,
                       uint32_t func_name_type_mask, 
-                      LazyBool skip_prologue = eLazyBoolCalculate,
-                      bool internal = false);
+                      LazyBool skip_prologue,
+                      bool internal,
+                      bool request_hardware);
                       
     lldb::BreakpointSP
-    CreateExceptionBreakpoint (enum lldb::LanguageType language, bool catch_bp, bool throw_bp, bool internal = false);
+    CreateExceptionBreakpoint (enum lldb::LanguageType language, bool catch_bp, bool throw_bp, bool internal);
     
     // This is the same as the func_name breakpoint except that you can specify a vector of names.  This is cheaper
     // than a regular expression breakpoint in the case where you just want to set a breakpoint on a set of names
@@ -557,23 +611,26 @@ public:
                       const char *func_names[],
                       size_t num_names, 
                       uint32_t func_name_type_mask, 
-                      LazyBool skip_prologue = eLazyBoolCalculate,
-                      bool internal = false);
+                      LazyBool skip_prologue,
+                      bool internal,
+                      bool request_hardware);
 
     lldb::BreakpointSP
     CreateBreakpoint (const FileSpecList *containingModules,
                       const FileSpecList *containingSourceFiles,
                       const std::vector<std::string> &func_names,
                       uint32_t func_name_type_mask,
-                      LazyBool skip_prologue = eLazyBoolCalculate,
-                      bool internal = false);
+                      LazyBool skip_prologue,
+                      bool internal,
+                      bool request_hardware);
 
 
     // Use this to create a general breakpoint:
     lldb::BreakpointSP
     CreateBreakpoint (lldb::SearchFilterSP &filter_sp,
                       lldb::BreakpointResolverSP &resolver_sp,
-                      bool internal = false);
+                      bool internal,
+                      bool request_hardware);
 
     // Use this to create a watchpoint:
     lldb::WatchpointSP
@@ -696,11 +753,28 @@ public:
     ModulesDidLoad (ModuleList &module_list);
 
     void
-    ModulesDidUnload (ModuleList &module_list);
+    ModulesDidUnload (ModuleList &module_list, bool delete_locations);
     
     void
     SymbolsDidLoad (ModuleList &module_list);
     
+    void
+    ClearModules(bool delete_locations);
+
+    //------------------------------------------------------------------
+    /// Called as the last function in Process::DidExec().
+    ///
+    /// Process::DidExec() will clear a lot of state in the process,
+    /// then try to reload a dynamic loader plugin to discover what
+    /// binaries are currently available and then this function should
+    /// be called to allow the target to do any cleanup after everything
+    /// has been figured out. It can remove breakpoints that no longer
+    /// make sense as the exec might have changed the target
+    /// architecture, and unloaded some modules that might get deleted.
+    //------------------------------------------------------------------
+    void
+    DidExec ();
+    
     //------------------------------------------------------------------
     /// Gets the module for the main executable.
     ///
@@ -967,6 +1041,12 @@ public:
     ClangASTImporter *
     GetClangASTImporter();
     
+    //----------------------------------------------------------------------
+    // Install any files through the platform that need be to installed
+    // prior to launching or attaching.
+    //----------------------------------------------------------------------
+    Error
+    Install(ProcessLaunchInfo *launch_info);
     
     // Since expressions results can persist beyond the lifetime of a process,
     // and the const expression results are available after a process is gone,
@@ -1095,21 +1175,7 @@ public:
     {
         return m_suppress_stop_hooks;
     }
-    
-    bool
-    SetSuppressSyntheticValue (bool suppress)
-    {
-        bool old_value = m_suppress_synthetic_value;
-        m_suppress_synthetic_value = suppress;
-        return old_value;
-    }
-    
-    bool
-    GetSuppressSyntheticValue ()
-    {
-        return m_suppress_synthetic_value;
-    }
-    
+
 //    StopHookSP &
 //    GetStopHookByIndex (size_t index);
 //    
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h b/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h
index e4e532e4b33..4f78b0fe699 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/Thread.h
@@ -17,6 +17,7 @@
 #include "lldb/Core/UserID.h"
 #include "lldb/Core/UserSettingsController.h"
 #include "lldb/Target/ExecutionContextScope.h"
+#include "lldb/Target/RegisterCheckpoint.h"
 #include "lldb/Target/StackFrameList.h"
 
 #define LLDB_THREAD_MAX_STOP_EXC_DATA 8
@@ -130,79 +131,12 @@ public:
     DISALLOW_COPY_AND_ASSIGN (ThreadEventData);
     };
     
-    // TODO: You shouldn't just checkpoint the register state alone, so this should get
-    // moved to protected.  To do that ThreadStateCheckpoint needs to be returned as a token...
-    class RegisterCheckpoint
-    {
-    public:
-
-        RegisterCheckpoint() :
-            m_stack_id (),
-            m_data_sp ()
-        {
-        }
-
-        RegisterCheckpoint (const StackID &stack_id) :
-            m_stack_id (stack_id),
-            m_data_sp ()
-        {
-        }
-
-        ~RegisterCheckpoint()
-        {
-        }
-
-        const RegisterCheckpoint&
-        operator= (const RegisterCheckpoint &rhs)
-        {
-            if (this != &rhs)
-            {
-                this->m_stack_id = rhs.m_stack_id;
-                this->m_data_sp  = rhs.m_data_sp;
-            }
-            return *this;
-        }
-        
-        RegisterCheckpoint (const RegisterCheckpoint &rhs) :
-            m_stack_id (rhs.m_stack_id),
-            m_data_sp (rhs.m_data_sp)
-        {
-        }
-        
-        const StackID &
-        GetStackID()
-        {
-            return m_stack_id;
-        }
-
-        void
-        SetStackID (const StackID &stack_id)
-        {
-            m_stack_id = stack_id;
-        }
-
-        lldb::DataBufferSP &
-        GetData()
-        {
-            return m_data_sp;
-        }
-
-        const lldb::DataBufferSP &
-        GetData() const
-        {
-            return m_data_sp;
-        }
-
-    protected:
-        StackID m_stack_id;
-        lldb::DataBufferSP m_data_sp;
-    };
 
     struct ThreadStateCheckpoint
     {
         uint32_t           orig_stop_id;  // Dunno if I need this yet but it is an interesting bit of data.
         lldb::StopInfoSP   stop_info_sp;  // You have to restore the stop info or you might continue with the wrong signals.
-        RegisterCheckpoint register_backup;  // You need to restore the registers, of course...
+        lldb::RegisterCheckpointSP register_backup_sp;  // You need to restore the registers, of course...
         uint32_t           current_inlined_depth;
         lldb::addr_t       current_inlined_pc;
     };
@@ -339,12 +273,33 @@ public:
         return NULL;
     }
 
+    virtual void
+    SetName (const char *name)
+    {
+    }
+
+    virtual lldb::queue_id_t
+    GetQueueID ()
+    {
+        return LLDB_INVALID_QUEUE_ID;
+    }
+
+    virtual void
+    SetQueueID (lldb::queue_id_t new_val)
+    {
+    }
+
     virtual const char *
     GetQueueName ()
     {
         return NULL;
     }
 
+    virtual void
+    SetQueueName (const char *name)
+    {
+    }
+
     virtual uint32_t
     GetStackFrameCount()
     {
@@ -377,7 +332,10 @@ public:
     
     Error
     ReturnFromFrame (lldb::StackFrameSP frame_sp, lldb::ValueObjectSP return_value_sp, bool broadcast = false);
-    
+
+    Error
+    JumpToLine (const FileSpec &file, uint32_t line, bool can_leave_function, std::string *warnings = NULL);
+
     virtual lldb::StackFrameSP
     GetFrameWithStackID (const StackID &stack_id)
     {
@@ -451,6 +409,33 @@ public:
     void
     DumpUsingSettingsFormat (Stream &strm, uint32_t frame_idx);
 
+    //------------------------------------------------------------------
+    /// Retrieves the per-thread data area.
+    /// Most OSs maintain a per-thread pointer (e.g. the FS register on
+    /// x64), which we return the value of here.
+    ///
+    /// @return
+    ///     LLDB_INVALID_ADDRESS if not supported, otherwise the thread
+    ///     pointer value.
+    //------------------------------------------------------------------
+    virtual lldb::addr_t
+    GetThreadPointer ();
+
+    //------------------------------------------------------------------
+    /// Retrieves the per-module TLS block for a thread.
+    ///
+    /// @param[in] module
+    ///     The module to query TLS data for.
+    ///
+    /// @return
+    ///     If the thread has TLS data allocated for the
+    ///     module, the address of the TLS block. Otherwise
+    ///     LLDB_INVALID_ADDRESS is returned.
+    //------------------------------------------------------------------
+    virtual lldb::addr_t
+    GetThreadLocalData (const lldb::ModuleSP module);
+
+
     //------------------------------------------------------------------
     // Thread Plan Providers:
     // This section provides the basic thread plans that the Process control
@@ -492,21 +477,6 @@ public:
     virtual lldb::ThreadPlanSP
     QueueFundamentalPlan (bool abort_other_plans);
 
-    //------------------------------------------------------------------
-    /// Queues the plan used to step over a breakpoint at the current PC of \a thread.
-    /// The default version returned by Process handles trap based breakpoints, and
-    /// will disable the breakpoint, single step over it, then re-enable it.
-    ///
-    /// @param[in] abort_other_plans
-    ///    \b true if we discard the currently queued plans and replace them with this one.
-    ///    Otherwise this plan will go on the end of the plan stack.
-    ///
-    /// @return
-    ///     A shared pointer to the newly queued thread plan, or NULL if the plan could not be queued.
-    //------------------------------------------------------------------
-    virtual lldb::ThreadPlanSP
-    QueueThreadPlanForStepOverBreakpointPlan (bool abort_other_plans);
-
     //------------------------------------------------------------------
     /// Queues the plan used to step one instruction from the current PC of \a thread.
     ///
@@ -692,14 +662,6 @@ public:
                                  bool stop_others,
                                  uint32_t frame_idx);
 
-    virtual lldb::ThreadPlanSP
-    QueueThreadPlanForCallFunction (bool abort_other_plans,
-                                    Address& function,
-                                    lldb::addr_t arg,
-                                    bool stop_other_threads,
-                                    bool unwind_on_error = false,
-                                    bool ignore_breakpoints = true);
-                                            
     //------------------------------------------------------------------
     // Thread Plan accessors:
     //------------------------------------------------------------------
@@ -843,7 +805,7 @@ public:
     
     void
     SetTracer (lldb::ThreadPlanTracerSP &tracer_sp);
-    
+
     //------------------------------------------------------------------
     // Get the thread index ID. The index ID that is guaranteed to not
     // be re-used by a process. They start at 1 and increase with each
@@ -852,8 +814,25 @@ public:
     //------------------------------------------------------------------
     uint32_t
     GetIndexID () const;
-    
-    
+
+    //------------------------------------------------------------------
+    // Get the originating thread's index ID. 
+    // In the case of an "extended" thread -- a thread which represents
+    // the stack that enqueued/spawned work that is currently executing --
+    // we need to provide the IndexID of the thread that actually did
+    // this work.  We don't want to just masquerade as that thread's IndexID
+    // by using it in our own IndexID because that way leads to madness -
+    // but the driver program which is iterating over extended threads 
+    // may ask for the OriginatingThreadID to display that information
+    // to the user. 
+    // Normal threads will return the same thing as GetIndexID();
+    //------------------------------------------------------------------
+    virtual uint32_t
+    GetExtendedBacktraceOriginatingIndexID ()
+    {
+        return GetIndexID ();
+    }
+
     //------------------------------------------------------------------
     // The API ID is often the same as the Thread::GetID(), but not in
     // all cases. Thread::GetID() is the user visible thread ID that
@@ -965,6 +944,33 @@ public:
     void
     SetShouldReportStop (Vote vote);
 
+    //----------------------------------------------------------------------
+    /// Sets the extended backtrace token for this thread
+    ///
+    /// Some Thread subclasses may maintain a token to help with providing
+    /// an extended backtrace.  The SystemRuntime plugin will set/request this.
+    ///
+    /// @param [in] token
+    //----------------------------------------------------------------------
+    virtual void
+    SetExtendedBacktraceToken (uint64_t token) { }
+
+    //----------------------------------------------------------------------
+    /// Gets the extended backtrace token for this thread
+    ///
+    /// Some Thread subclasses may maintain a token to help with providing
+    /// an extended backtrace.  The SystemRuntime plugin will set/request this.
+    ///
+    /// @return
+    ///     The token needed by the SystemRuntime to create an extended backtrace.
+    ///     LLDB_INVALID_ADDRESS is returned if no token is available.
+    //----------------------------------------------------------------------
+    virtual uint64_t
+    GetExtendedBacktraceToken ()
+    {
+        return LLDB_INVALID_ADDRESS;
+    }
+
 protected:
 
     friend class ThreadPlan;
@@ -991,16 +997,6 @@ protected:
 
     typedef std::vector<lldb::ThreadPlanSP> plan_stack;
 
-    virtual bool
-    SaveFrameZeroState (RegisterCheckpoint &checkpoint);
-
-    virtual bool
-    RestoreSaveFrameZero (const RegisterCheckpoint &checkpoint);
-    
-    // register_data_sp must be a DataSP passed to ReadAllRegisterValues.
-    bool
-    ResetFrameZeroRegisters (lldb::DataBufferSP register_data_sp);
-
     virtual lldb_private::Unwind *
     GetUnwinder ();
 
@@ -1022,12 +1018,6 @@ protected:
     lldb::StackFrameListSP
     GetStackFrameList ();
     
-    struct ThreadState
-    {
-        uint32_t           orig_stop_id;
-        lldb::StopInfoSP   stop_info_sp;
-        RegisterCheckpoint register_backup;
-    };
 
     //------------------------------------------------------------------
     // Classes that inherit from Process can see and modify these
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/ThreadList.h b/contrib/llvm/tools/lldb/include/lldb/Target/ThreadList.h
index ddf49b002ec..f4dfdb23ec0 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/ThreadList.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/ThreadList.h
@@ -14,6 +14,7 @@
 
 #include "lldb/lldb-private.h"
 #include "lldb/Core/UserID.h"
+#include "lldb/Utility/Iterable.h"
 
 
 // FIXME: Currently this is a thread list with lots of functionality for use only by
@@ -69,6 +70,15 @@ public:
     // is a unique index assigned
     lldb::ThreadSP
     GetThreadAtIndex (uint32_t idx, bool can_update = true);
+    
+    typedef std::vector<lldb::ThreadSP> collection;
+    typedef LockingAdaptedIterable<collection, lldb::ThreadSP, vector_adapter> ThreadIterable;
+    
+    ThreadIterable
+    Threads ()
+    {
+        return ThreadIterable(m_threads, GetMutex());
+    }
 
     lldb::ThreadSP
     FindThreadByID (lldb::tid_t tid, bool can_update = true);
@@ -145,7 +155,6 @@ protected:
     void
     NotifySelectedThreadChanged (lldb::tid_t tid);
 
-    typedef std::vector<lldb::ThreadSP> collection;
     //------------------------------------------------------------------
     // Classes that inherit from Process can see and modify these
     //------------------------------------------------------------------
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h b/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h
index d747706c639..18f1d0facbf 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallFunction.h
@@ -18,6 +18,8 @@
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/ThreadPlan.h"
 
+#include "llvm/ADT/ArrayRef.h"
+
 namespace lldb_private {
 
 class ThreadPlanCallFunction : public ThreadPlan
@@ -29,25 +31,8 @@ public:
     ThreadPlanCallFunction (Thread &thread,
                             const Address &function,
                             const ClangASTType &return_type,
-                            lldb::addr_t arg,
-                            bool stop_other_threads,
-                            bool unwind_on_error = true,
-                            bool ignore_breakpoints = false,
-                            lldb::addr_t *this_arg = 0,
-                            lldb::addr_t *cmd_arg = 0);
-
-    ThreadPlanCallFunction (Thread &thread,
-                            const Address &function,
-                            const ClangASTType &return_type,
-                            bool stop_other_threads,
-                            bool unwind_on_error,
-                            bool ignore_breakpoints,
-                            lldb::addr_t *arg1_ptr = NULL,
-                            lldb::addr_t *arg2_ptr = NULL,
-                            lldb::addr_t *arg3_ptr = NULL,
-                            lldb::addr_t *arg4_ptr = NULL,
-                            lldb::addr_t *arg5_ptr = NULL,
-                            lldb::addr_t *arg6_ptr = NULL);
+                            llvm::ArrayRef<lldb::addr_t> args,
+                            const EvaluateExpressionOptions &options);
 
     virtual
     ~ThreadPlanCallFunction ();
@@ -136,7 +121,13 @@ public:
 
     virtual bool
     RestoreThreadState();
-
+    
+    virtual void
+    ThreadDestroyed ()
+    {
+        m_takedown_done = true;
+    }
+    
 protected:    
     void ReportRegisterState (const char *message);
 
@@ -165,10 +156,13 @@ private:
     
     bool                                            m_valid;
     bool                                            m_stop_other_threads;
+    bool                                            m_unwind_on_error;
+    bool                                            m_ignore_breakpoints;
+    bool                                            m_debug_execution;
+    bool                                            m_trap_exceptions;
     Address                                         m_function_addr;
     Address                                         m_start_addr;
     lldb::addr_t                                    m_function_sp;
-    Thread::RegisterCheckpoint                      m_register_backup;
     lldb::ThreadPlanSP                              m_subplan_sp;
     LanguageRuntime                                *m_cxx_language_runtime;
     LanguageRuntime                                *m_objc_language_runtime;
@@ -181,9 +175,9 @@ private:
     ClangASTType                                    m_return_type;
     lldb::ValueObjectSP                             m_return_valobj_sp;  // If this contains a valid pointer, use the ABI to extract values when complete
     bool                                            m_takedown_done;    // We want to ensure we only do the takedown once.  This ensures that.
+    bool                                            m_should_clear_objc_exception_bp;
+    bool                                            m_should_clear_cxx_exception_bp;
     lldb::addr_t                                    m_stop_address;     // This is the address we stopped at.  Also set in DoTakedown;
-    bool                                            m_unwind_on_error;
-    bool                                            m_ignore_breakpoints;
 
     DISALLOW_COPY_AND_ASSIGN (ThreadPlanCallFunction);
 };
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h b/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h
index 7a7ec33049e..5eb7cc1cd45 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanCallUserExpression.h
@@ -20,6 +20,8 @@
 #include "lldb/Target/ThreadPlan.h"
 #include "lldb/Target/ThreadPlanCallFunction.h"
 
+#include "llvm/ADT/ArrayRef.h"
+
 namespace lldb_private {
 
 class ThreadPlanCallUserExpression : public ThreadPlanCallFunction
@@ -27,12 +29,8 @@ class ThreadPlanCallUserExpression : public ThreadPlanCallFunction
 public:
     ThreadPlanCallUserExpression (Thread &thread,
                                   Address &function,
-                                  lldb::addr_t arg,
-                                  bool stop_other_threads,
-                                  bool unwind_on_error,
-                                  bool ignore_breakpoints,
-                                  lldb::addr_t *this_arg,
-                                  lldb::addr_t *cmd_arg,
+                                  llvm::ArrayRef<lldb::addr_t> args,
+                                  const EvaluateExpressionOptions &options,
                                   ClangUserExpression::ClangUserExpressionSP &user_expression_sp);
     
     virtual
diff --git a/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepOverRange.h b/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepOverRange.h
index de9e66829dc..2cb5288272e 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepOverRange.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Target/ThreadPlanStepOverRange.h
@@ -41,6 +41,8 @@ protected:
 
 private:
 
+    bool IsEquivalentContext(const SymbolContext &context);
+
     bool m_first_resume;
 
     DISALLOW_COPY_AND_ASSIGN (ThreadPlanStepOverRange);
diff --git a/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h b/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h
new file mode 100644
index 00000000000..9b91cae37ee
--- /dev/null
+++ b/contrib/llvm/tools/lldb/include/lldb/Utility/Iterable.h
@@ -0,0 +1,225 @@
+//===-- Iterable.h ----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_Iterable_h_
+#define liblldb_Iterable_h_
+
+#include "lldb/Host/Mutex.h"
+
+namespace lldb_private
+{
+    
+template <typename I, typename E> E map_adapter(I &iter)
+{
+    return iter->second;
+}
+    
+template <typename I, typename E> E vector_adapter(I &iter)
+{
+    return *iter;
+}
+    
+template <typename C, typename E, E (*A)(typename C::const_iterator &)> class AdaptedConstIterator
+{
+public:
+    typedef typename C::const_iterator BackingIterator;
+private:
+    BackingIterator m_iter;
+public:
+    // Wrapping constructor
+    AdaptedConstIterator (BackingIterator backing_iterator) :
+        m_iter(backing_iterator)
+    {
+    }
+    
+    // Default-constructible
+    AdaptedConstIterator () :
+        m_iter()
+    {
+    }
+    
+    // Copy-constructible
+    AdaptedConstIterator (const AdaptedConstIterator &rhs) :
+        m_iter(rhs.m_iter)
+    {
+    }
+    
+    // Copy-assignable
+    AdaptedConstIterator &operator= (const AdaptedConstIterator &rhs)
+    {
+        m_iter = rhs.m_iter;
+        return *this;
+    }
+    
+    // Destructible
+    ~AdaptedConstIterator () { }
+    
+    // Comparable
+    bool operator== (const AdaptedConstIterator &rhs)
+    {
+        return m_iter == rhs.m_iter;
+    }
+    
+    bool operator!= (const AdaptedConstIterator &rhs)
+    {
+        return m_iter != rhs.m_iter;
+    }
+    
+    // Rvalue dereferenceable
+    E operator* ()
+    {
+        return (*A)(m_iter);
+    }
+    
+    E operator-> ()
+    {
+        return (*A)(m_iter);
+    }
+    
+    // Offset dereferenceable
+    E operator[] (typename BackingIterator::difference_type offset)
+    {
+        return AdaptedConstIterator(m_iter + offset);
+    }
+    
+    // Incrementable
+    AdaptedConstIterator &operator++ ()
+    {
+        m_iter++;
+        return *this;
+    }
+    
+    // Decrementable
+    AdaptedConstIterator &operator-- ()
+    {
+        m_iter--;
+        return *this;
+    }
+    
+    // Compound assignment
+    AdaptedConstIterator &operator+= (typename BackingIterator::difference_type offset)
+    {
+        m_iter += offset;
+        return *this;
+    }
+    
+    AdaptedConstIterator &operator-= (typename BackingIterator::difference_type offset)
+    {
+        m_iter -= offset;
+        return *this;
+    }
+    
+    // Arithmetic
+    AdaptedConstIterator operator+ (typename BackingIterator::difference_type offset)
+    {
+        return AdaptedConstIterator(m_iter + offset);
+    }
+    
+    AdaptedConstIterator operator- (typename BackingIterator::difference_type offset)
+    {
+        return AdaptedConstIterator(m_iter - offset);
+    }
+    
+    // Comparable
+    bool operator< (AdaptedConstIterator &rhs)
+    {
+        return m_iter < rhs.m_iter;
+    }
+    
+    bool operator<= (AdaptedConstIterator &rhs)
+    {
+        return m_iter <= rhs.m_iter;
+    }
+    
+    bool operator> (AdaptedConstIterator &rhs)
+    {
+        return m_iter > rhs.m_iter;
+    }
+    
+    bool operator>= (AdaptedConstIterator &rhs)
+    {
+        return m_iter >= rhs.m_iter;
+    }
+    
+    friend AdaptedConstIterator operator+(typename BackingIterator::difference_type, AdaptedConstIterator &);
+    friend typename BackingIterator::difference_type operator-(AdaptedConstIterator &, AdaptedConstIterator &);
+    friend void swap(AdaptedConstIterator &, AdaptedConstIterator &);
+};
+    
+template <typename C, typename E, E (*A)(typename C::const_iterator &)>
+AdaptedConstIterator<C, E, A> operator+ (typename AdaptedConstIterator<C, E, A>::BackingIterator::difference_type offset, AdaptedConstIterator<C, E, A> &rhs)
+{
+    return rhs.operator+(offset);
+}
+
+template <typename C, typename E, E (*A)(typename C::const_iterator &)>
+typename AdaptedConstIterator<C, E, A>::BackingIterator::difference_type operator- (AdaptedConstIterator<C, E, A> &lhs, AdaptedConstIterator<C, E, A> &rhs)
+{
+    return(lhs.m_iter - rhs.m_iter);
+}
+
+template <typename C, typename E, E (*A)(typename C::const_iterator &)>
+void swap (AdaptedConstIterator<C, E, A> &lhs, AdaptedConstIterator<C, E, A> &rhs)
+{
+    std::swap(lhs.m_iter, rhs.m_iter);
+}
+    
+template <typename C, typename E, E (*A)(typename C::const_iterator &)> class AdaptedIterable
+{
+private:
+    const C &m_container;
+public:
+    AdaptedIterable (const C &container) :
+        m_container(container)
+    {
+    }
+    
+    AdaptedConstIterator<C, E, A> begin ()
+    {
+        return AdaptedConstIterator<C, E, A>(m_container.begin());
+    }
+    
+    AdaptedConstIterator<C, E, A> end ()
+    {
+        return AdaptedConstIterator<C, E, A>(m_container.end());
+    }
+};
+    
+template <typename C, typename E, E (*A)(typename C::const_iterator &)> class LockingAdaptedIterable : public AdaptedIterable<C, E, A>
+{
+private:
+    Mutex *m_mutex = nullptr;
+public:
+    LockingAdaptedIterable (C &container, Mutex &mutex) :
+        AdaptedIterable<C,E,A>(container),
+        m_mutex(&mutex)
+    {
+        m_mutex->Lock();
+    }
+    
+    LockingAdaptedIterable (LockingAdaptedIterable &&rhs) :
+        AdaptedIterable<C,E,A>(rhs),
+        m_mutex(rhs.m_mutex)
+    {
+        rhs.m_mutex = NULL;
+    }
+    
+    ~LockingAdaptedIterable ()
+    {
+        if (m_mutex)
+            m_mutex->Unlock();
+    }
+    
+private:
+    DISALLOW_COPY_AND_ASSIGN(LockingAdaptedIterable);
+};
+    
+}
+
+#endif
diff --git a/contrib/llvm/tools/lldb/include/lldb/Utility/PythonPointer.h b/contrib/llvm/tools/lldb/include/lldb/Utility/PythonPointer.h
index f782f7f1313..fe90670fd2e 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Utility/PythonPointer.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Utility/PythonPointer.h
@@ -12,11 +12,7 @@
 
 #include <algorithm>
 
-#if defined (__APPLE__)
-#include <Python/Python.h>
-#else
-#include <Python.h>
-#endif
+#include "lldb/lldb-python.h"
 
 namespace lldb_private {
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/Utility/RefCounter.h b/contrib/llvm/tools/lldb/include/lldb/Utility/RefCounter.h
deleted file mode 100644
index 6daed5498eb..00000000000
--- a/contrib/llvm/tools/lldb/include/lldb/Utility/RefCounter.h
+++ /dev/null
@@ -1,56 +0,0 @@
-//===-- RefCounter.h --------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_RefCounter_h_
-#define liblldb_RefCounter_h_
-
-#include "lldb/lldb-public.h"
-
-namespace lldb_utility {
-
-//----------------------------------------------------------------------
-// A simple reference counter object. You need an uint32_t* to use it
-// Once that is in place, everyone who needs to ref-count, can say
-// RefCounter ref(ptr);
-// (of course, the pointer is a shared resource, and must be accessible to
-// everyone who needs it). Synchronization is handled by RefCounter itself
-// The counter is decreased each time a RefCounter to it goes out of scope
-//----------------------------------------------------------------------
-class RefCounter
-{
-public:
-    typedef uint32_t value_type;
-    
-    RefCounter(value_type* ctr);
-    
-    ~RefCounter();
-    
-private:
-    value_type* m_counter;
-    DISALLOW_COPY_AND_ASSIGN (RefCounter);
-    
-    template <class T>
-    inline T
-    increment(T* t)
-    {
-        return __sync_fetch_and_add(t, 1);
-    }
-    
-    template <class T>
-    inline T
-    decrement(T* t)
-    {
-        return __sync_fetch_and_add(t, -1);
-    }
-    
-};
-
-} // namespace lldb_utility
-
-#endif // #ifndef liblldb_RefCounter_h_
diff --git a/contrib/llvm/tools/lldb/include/lldb/Utility/SharingPtr.h b/contrib/llvm/tools/lldb/include/lldb/Utility/SharingPtr.h
index 814b54b5cfe..c451ee6e359 100644
--- a/contrib/llvm/tools/lldb/include/lldb/Utility/SharingPtr.h
+++ b/contrib/llvm/tools/lldb/include/lldb/Utility/SharingPtr.h
@@ -13,6 +13,15 @@
 #include <algorithm>
 #include <memory>
 
+// Microsoft Visual C++ currently does not enable std::atomic to work
+// in CLR mode - as such we need to "hack around it" for MSVC++ builds only
+// using Windows specific instrinsics instead of the C++11 atomic support
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
+#include <atomic>
+#endif
+
 //#define ENABLE_SP_LOGGING 1 // DON'T CHECK THIS LINE IN UNLESS COMMENTED OUT
 #if defined (ENABLE_SP_LOGGING)
 
@@ -24,27 +33,17 @@ namespace lldb_private {
 
 namespace imp {
     
-template <class T>
-inline T
-increment(T& t)
-{
-    return __sync_add_and_fetch(&t, 1);
-}
-
-template <class T>
-inline T
-decrement(T& t)
-{
-    return __sync_add_and_fetch(&t, -1);
-}
-
 class shared_count
 {
     shared_count(const shared_count&);
     shared_count& operator=(const shared_count&);
 
 protected:
+#ifdef _MSC_VER
     long shared_owners_;
+#else
+    std::atomic<long> shared_owners_;
+#endif
     virtual ~shared_count();
 private:
     virtual void on_zero_shared() = 0;
@@ -592,14 +591,22 @@ private:
     void
     lldb_private::ReferenceCountedBase<T>::add_shared()
     {
-        imp::increment(shared_owners_);
+#ifdef _MSC_VER
+        _InterlockedIncrement(&shared_owners_);
+#else
+        ++shared_owners_;
+#endif
     }
     
     template <class T>
     void
     lldb_private::ReferenceCountedBase<T>::release_shared()
     {
-        if (imp::decrement(shared_owners_) == -1)
+#ifdef _MSC_VER
+        if (_InterlockedDecrement(&shared_owners_) == -1)
+#else
+        if (--shared_owners_ == -1)
+#endif
             delete static_cast<T*>(this);
     }
 
@@ -713,7 +720,7 @@ public:
         return ptr_; 
     }
     
-    operator bool() const
+    explicit operator bool() const
     {
         return ptr_ != 0;
     }
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-defines.h b/contrib/llvm/tools/lldb/include/lldb/lldb-defines.h
index 3318aa15f5a..82307d2f531 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-defines.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-defines.h
@@ -33,6 +33,7 @@
 // LLDB defines
 //----------------------------------------------------------------------
 #define LLDB_GENERIC_ERROR              UINT32_MAX
+#define LLDB_DEFAULT_SHELL              "/bin/sh"
 
 //----------------------------------------------------------------------
 // Breakpoints
@@ -81,6 +82,8 @@
 #define LLDB_INVALID_FRAME_ID           UINT32_MAX
 #define LLDB_INVALID_SIGNAL_NUMBER      INT32_MAX
 #define LLDB_INVALID_OFFSET             UINT64_MAX // Must match max of lldb::offset_t
+#define LLDB_INVALID_LINE_NUMBER        UINT32_MAX
+#define LLDB_INVALID_QUEUE_ID           0
 
 //----------------------------------------------------------------------
 /// CPU Type defintions
@@ -109,6 +112,15 @@
 #define LLDB_OPT_SET_10                 (1U << 9)
 #define LLDB_OPT_SET_FROM_TO(A, B)      (((1U << (B)) - 1) ^ (((1U << (A))-1) >> 1))
 
+#ifdef _WIN32
+#define MAX_PATH 260
+#endif
+
+#ifdef _MSC_VER
+// ignore GCC function attributes
+#define __attribute__(X)
+#endif
+
 #if defined(__cplusplus)
 
 //----------------------------------------------------------------------
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h b/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h
index 6ec5ed6a35e..0b341575be4 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-enumerations.h
@@ -380,6 +380,7 @@ namespace lldb {
         eArgTypeClassName,
         eArgTypeCommandName,
         eArgTypeCount,
+        eArgTypeDescriptionVerbosity,
         eArgTypeDirectoryName,
         eArgTypeDisassemblyFlavor,
         eArgTypeEndAddress,
@@ -406,6 +407,9 @@ namespace lldb {
         eArgTypeOffset,
         eArgTypeOldPathPrefix,
         eArgTypeOneLiner,
+        eArgTypePath,
+        eArgTypePermissionsNumber,
+        eArgTypePermissionsString,
         eArgTypePid,
         eArgTypePlugin,
         eArgTypeProcessName,
@@ -480,7 +484,8 @@ namespace lldb {
         eSymbolTypeUndefined,
         eSymbolTypeObjCClass,
         eSymbolTypeObjCMetaClass,
-        eSymbolTypeObjCIVar
+        eSymbolTypeObjCIVar,
+        eSymbolTypeReExported
     } SymbolType;
     
     typedef enum SectionType
@@ -679,6 +684,48 @@ namespace lldb {
         eAddressClassRuntime
     } AddressClass;
 
+    //----------------------------------------------------------------------
+    // File Permissions
+    //
+    // Designed to mimic the unix file permission bits so they can be
+    // used with functions that set 'mode_t' to certain values for
+    // permissions.
+    //----------------------------------------------------------------------
+    typedef enum FilePermissions
+    {
+        eFilePermissionsUserRead        = (1u << 8),
+        eFilePermissionsUserWrite       = (1u << 7),
+        eFilePermissionsUserExecute     = (1u << 6),
+        eFilePermissionsGroupRead       = (1u << 5),
+        eFilePermissionsGroupWrite      = (1u << 4),
+        eFilePermissionsGroupExecute    = (1u << 3),
+        eFilePermissionsWorldRead       = (1u << 2),
+        eFilePermissionsWorldWrite      = (1u << 1),
+        eFilePermissionsWorldExecute    = (1u << 0),
+        
+        eFilePermissionsUserRW      = (eFilePermissionsUserRead    | eFilePermissionsUserWrite      | 0                             ),
+        eFileFilePermissionsUserRX  = (eFilePermissionsUserRead    | 0                              | eFilePermissionsUserExecute   ),
+        eFilePermissionsUserRWX     = (eFilePermissionsUserRead    | eFilePermissionsUserWrite      | eFilePermissionsUserExecute   ),
+            
+        eFilePermissionsGroupRW     = (eFilePermissionsGroupRead   | eFilePermissionsGroupWrite     | 0                             ),
+        eFilePermissionsGroupRX     = (eFilePermissionsGroupRead   | 0                              | eFilePermissionsGroupExecute  ),
+        eFilePermissionsGroupRWX    = (eFilePermissionsGroupRead   | eFilePermissionsGroupWrite     | eFilePermissionsGroupExecute  ),
+        
+        eFilePermissionsWorldRW     = (eFilePermissionsWorldRead   | eFilePermissionsWorldWrite     | 0                             ),
+        eFilePermissionsWorldRX     = (eFilePermissionsWorldRead   | 0                              | eFilePermissionsWorldExecute  ),
+        eFilePermissionsWorldRWX    = (eFilePermissionsWorldRead   | eFilePermissionsWorldWrite     | eFilePermissionsWorldExecute  ),
+        
+        eFilePermissionsEveryoneR   = (eFilePermissionsUserRead    | eFilePermissionsGroupRead      | eFilePermissionsWorldRead     ),
+        eFilePermissionsEveryoneW   = (eFilePermissionsUserWrite   | eFilePermissionsGroupWrite     | eFilePermissionsWorldWrite    ),
+        eFilePermissionsEveryoneX   = (eFilePermissionsUserExecute | eFilePermissionsGroupExecute   | eFilePermissionsWorldExecute  ),
+        
+        eFilePermissionsEveryoneRW  = (eFilePermissionsEveryoneR   | eFilePermissionsEveryoneW      | 0                             ),
+        eFilePermissionsEveryoneRX  = (eFilePermissionsEveryoneR   | 0                              | eFilePermissionsEveryoneX     ),
+        eFilePermissionsEveryoneRWX = (eFilePermissionsEveryoneR   | eFilePermissionsEveryoneW      | eFilePermissionsEveryoneX     ),
+        eFilePermissionsFileDefault = eFilePermissionsUserRW,
+        eFilePermissionsDirectoryDefault = eFilePermissionsUserRWX,
+    } FilePermissions;
+
 } // namespace lldb
 
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h b/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h
index 84af8b64690..68d85f081e2 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-forward.h
@@ -79,6 +79,7 @@ class   DataExtractor;
 class   Debugger;
 class   Declaration;
 class   Disassembler;
+struct  DumpValueObjectOptions;
 class   DynamicLibrary;
 class   DynamicLoader;
 class   EmulateInstruction;
@@ -90,11 +91,13 @@ class   ExecutionContext;
 class   ExecutionContextRef;
 class   ExecutionContextRefLocker;
 class   ExecutionContextScope;
+class   File;
 class   FileSpec;
 class   FileSpecList;
 class   Flags;
 class   TypeCategoryImpl;
 class   FormatManager;
+class   FormattersMatchCandidate;
 class   FuncUnwinders;
 class   Function;
 class   FunctionInfo;
@@ -104,6 +107,7 @@ class   Instruction;
 class   InstructionList;
 class   IRExecutionUnit;
 class   LanguageRuntime;
+class   SystemRuntime;
 class   LineTable;
 class   Listener;
 class   Log;
@@ -119,6 +123,7 @@ struct  NameSearchContext;
 class   ObjCLanguageRuntime;
 class   ObjectContainer;
 class   OptionGroup;
+class   OptionGroupOptions;
 class   OptionGroupPlatform;
 class   ObjectFile;
 class   OperatingSystem;
@@ -158,6 +163,7 @@ class   PythonDictionary;
 class   PythonInteger;
 class   PythonObject;
 class   PythonString;
+class   RegisterCheckpoint;
 class   RegisterContext;
 class   RegisterLocation;
 class   RegisterLocationList;
@@ -224,13 +230,14 @@ class   ThreadPlanTracer;
 class   ThreadSpec;
 class   TimeValue;
 class   Type;
+class   TypeAndOrName;
 class   TypeCategoryMap;
 class   TypeImpl;
-class   TypeAndOrName;
 class   TypeList;
 class   TypeListImpl;
 class   TypeMemberImpl;
 class   TypeNameSpecifierImpl;
+class   TypePair;
 class   UUID;
 class   Unwind;
 class   UnwindAssembly;
@@ -246,6 +253,7 @@ class   ValueObjectConstResult;
 class   ValueObjectConstResultChild;
 class   ValueObjectConstResultImpl;
 class   ValueObjectList;
+class   ValueObjectPrinter;
 class   Variable;
 class   VariableList;
 class   Watchpoint;
@@ -285,12 +293,14 @@ namespace lldb {
     typedef std::shared_ptr<lldb_private::DynamicLoader> DynamicLoaderSP;
     typedef std::shared_ptr<lldb_private::Event> EventSP;
     typedef std::shared_ptr<lldb_private::ExecutionContextRef> ExecutionContextRefSP;
+    typedef std::shared_ptr<lldb_private::File> FileSP;
     typedef std::shared_ptr<lldb_private::Function> FunctionSP;
     typedef std::shared_ptr<lldb_private::FuncUnwinders> FuncUnwindersSP;
     typedef std::shared_ptr<lldb_private::InlineFunctionInfo> InlineFunctionInfoSP;
     typedef std::shared_ptr<lldb_private::InputReader> InputReaderSP;
     typedef std::shared_ptr<lldb_private::Instruction> InstructionSP;
     typedef std::shared_ptr<lldb_private::LanguageRuntime> LanguageRuntimeSP;
+    typedef std::shared_ptr<lldb_private::SystemRuntime> SystemRuntimeSP;
     typedef std::shared_ptr<lldb_private::LineTable> LineTableSP;
     typedef std::shared_ptr<lldb_private::Listener> ListenerSP;
     typedef std::shared_ptr<lldb_private::LogChannel> LogChannelSP;
@@ -321,6 +331,7 @@ namespace lldb {
     typedef std::shared_ptr<lldb_private::ProcessLaunchInfo> ProcessLaunchInfoSP;
     typedef std::weak_ptr<lldb_private::Process> ProcessWP;
     typedef std::shared_ptr<lldb_private::Property> PropertySP;
+    typedef std::shared_ptr<lldb_private::RegisterCheckpoint> RegisterCheckpointSP;
     typedef std::shared_ptr<lldb_private::RegisterContext> RegisterContextSP;
     typedef std::shared_ptr<lldb_private::RegularExpression> RegularExpressionSP;
     typedef std::shared_ptr<lldb_private::ScriptInterpreterObject> ScriptInterpreterObjectSP;
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h b/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h
index 60c90907145..98919422be5 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-private-enumerations.h
@@ -51,6 +51,7 @@ typedef enum ArchitectureType
     eArchTypeInvalid,
     eArchTypeMachO,
     eArchTypeELF,
+    eArchTypeCOFF,
     kNumArchTypes
 } ArchitectureType;
 
@@ -132,7 +133,8 @@ typedef enum ExecutionResults
     eExecutionDiscarded,
     eExecutionInterrupted,
     eExecutionHitBreakpoint,
-    eExecutionTimedOut
+    eExecutionTimedOut,
+    eExecutionStoppedForDebug
 } ExecutionResults;
 
 typedef enum ObjCRuntimeVersions {
@@ -191,7 +193,9 @@ typedef enum FormatCategoryItem
     eFormatCategoryItemFilter =          0x0004,
     eFormatCategoryItemRegexFilter =     0x0008,
     eFormatCategoryItemSynth =           0x0010,
-    eFormatCategoryItemRegexSynth =      0x0020
+    eFormatCategoryItemRegexSynth =      0x0020,
+    eFormatCategoryItemValue =           0x0040,
+    eFormatCategoryItemRegexValue =      0x0080
 } FormatCategoryItem;
 
 //------------------------------------------------------------------
@@ -228,6 +232,14 @@ typedef enum ScriptedCommandSynchronicity
     eScriptedCommandSynchronicityCurrentValue // use whatever the current synchronicity is
 } ScriptedCommandSynchronicity;
 
+//----------------------------------------------------------------------
+// Verbosity mode of "po" output
+//----------------------------------------------------------------------
+typedef enum LanguageRuntimeDescriptionDisplayVerbosity
+{
+    eLanguageRuntimeDescriptionDisplayVerbosityCompact, // only print the description string, if any
+    eLanguageRuntimeDescriptionDisplayVerbosityFull,    // print the full-blown output
+} LanguageRuntimeDescriptionDisplayVerbosity;
 
 //----------------------------------------------------------------------
 // Loading modules from memory
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-private-interfaces.h b/contrib/llvm/tools/lldb/include/lldb/lldb-private-interfaces.h
index 949cafed98b..5a2da8989f3 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-private-interfaces.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-private-interfaces.h
@@ -27,6 +27,7 @@ namespace lldb_private
     typedef EmulateInstruction * (*EmulateInstructionCreateInstance) (const ArchSpec &arch, InstructionType inst_type);
     typedef OperatingSystem* (*OperatingSystemCreateInstance) (Process *process, bool force);
     typedef LanguageRuntime *(*LanguageRuntimeCreateInstance) (Process *process, lldb::LanguageType language);
+    typedef SystemRuntime *(*SystemRuntimeCreateInstance) (Process *process);
     typedef Platform* (*PlatformCreateInstance) (bool force, const ArchSpec *arch);
     typedef lldb::ProcessSP (*ProcessCreateInstance) (Target &target, Listener &listener, const FileSpec *crash_file_path);
     typedef SymbolFile* (*SymbolFileCreateInstance) (ObjectFile* obj_file);
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-private-log.h b/contrib/llvm/tools/lldb/include/lldb/lldb-private-log.h
index 31a1c23c5e6..48cce69d36c 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-private-log.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-private-log.h
@@ -44,6 +44,7 @@
 #define LIBLLDB_LOG_TARGET              (1u << 22)
 #define LIBLLDB_LOG_MMAP                (1u << 23)
 #define LIBLLDB_LOG_OS                  (1u << 24)
+#define LIBLLDB_LOG_PLATFORM            (1u << 25)
 #define LIBLLDB_LOG_ALL                 (UINT32_MAX)
 #define LIBLLDB_LOG_DEFAULT             (LIBLLDB_LOG_PROCESS              |\
                                          LIBLLDB_LOG_THREAD               |\
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-private.h b/contrib/llvm/tools/lldb/include/lldb/lldb-private.h
index 90590601d94..05b2c4fd638 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-private.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-private.h
@@ -12,6 +12,10 @@
 
 #if defined(__cplusplus)
 
+#ifdef _WIN32
+#include "lldb/Host/windows/win32.h"
+#endif
+
 #include "lldb/lldb-public.h"
 #include "lldb/lldb-private-enumerations.h"
 #include "lldb/lldb-private-interfaces.h"
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-python.h b/contrib/llvm/tools/lldb/include/lldb/lldb-python.h
index 229e3967e4a..ce5c8176a3c 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-python.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-python.h
@@ -18,11 +18,7 @@
 
 #else
 
-#if defined (__APPLE__)
-#include <Python/Python.h>
-#else
 #include <Python.h>
-#endif
 
 #endif // LLDB_DISABLE_PYTHON
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-types.h b/contrib/llvm/tools/lldb/include/lldb/lldb-types.h
index 2693c0c822b..5851b5d3f92 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-types.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-types.h
@@ -14,11 +14,8 @@
 #include "lldb/lldb-forward.h"
 
 #include <assert.h>
-#include <pthread.h>
 #include <signal.h>
 #include <stdint.h>
-#include <stdbool.h>
-#include <unistd.h>
 
 //----------------------------------------------------------------------
 // All host systems must define:
@@ -38,13 +35,42 @@
 // things should be defined. Currently MacOSX is being assumed by default
 // since that is what lldb was first developed for.
 
+#ifndef _MSC_VER
+#include <stdbool.h>
+#include <unistd.h>
+#endif
+
+#ifdef _WIN32
+
+#include <process.h>
+
+namespace lldb
+{
+    typedef void*               mutex_t;
+    typedef void*               condition_t;
+    typedef void*               rwlock_t;
+    typedef uintptr_t           thread_t;                   // Host thread type
+    typedef uint32_t            thread_key_t;
+    typedef void *              thread_arg_t;               // Host thread argument type
+    typedef unsigned            thread_result_t;            // Host thread result type
+    typedef thread_result_t     (*thread_func_t)(void *);   // Host thread function type
+    typedef void                (*LogOutputCallback) (const char *, void *baton);
+    typedef bool                (*CommandOverrideCallback)(void *baton, const char **argv);
+}
+
+#else
+
+#include <pthread.h>
+
 namespace lldb {
         //----------------------------------------------------------------------
         // MacOSX Types
         //----------------------------------------------------------------------
         typedef ::pthread_mutex_t   mutex_t;
         typedef pthread_cond_t      condition_t;
+        typedef pthread_rwlock_t    rwlock_t;
         typedef pthread_t           thread_t;                   // Host thread type
+        typedef pthread_key_t       thread_key_t;
         typedef void *              thread_arg_t;               // Host thread argument type
         typedef void *              thread_result_t;            // Host thread result type
         typedef void *              (*thread_func_t)(void *);   // Host thread function type
@@ -52,19 +78,11 @@ namespace lldb {
         typedef bool                (*CommandOverrideCallback)(void *baton, const char **argv);
 } // namespace lldb
 
-#if defined(__MINGW32__)
-
-const lldb::thread_t lldb_invalid_host_thread_const = { NULL, 0 } ;
-#define LLDB_INVALID_HOST_THREAD         (lldb_invalid_host_thread_const)
-#define IS_VALID_LLDB_HOST_THREAD(t)     (!(NULL == (t).p && 0 == (t).x))
-
-#else
+#endif
 
 #define LLDB_INVALID_HOST_THREAD         ((lldb::thread_t)NULL)
 #define IS_VALID_LLDB_HOST_THREAD(t)     ((t) != LLDB_INVALID_HOST_THREAD)
 
-#endif
-
 #define LLDB_INVALID_HOST_TIME           { 0, 0 }
 
 namespace lldb 
@@ -77,6 +95,7 @@ namespace lldb
     typedef int32_t     break_id_t;
     typedef int32_t     watch_id_t;
     typedef void *      clang_type_t;
+    typedef uint64_t    queue_id_t;
 }
 
 
diff --git a/contrib/llvm/tools/lldb/include/lldb/lldb-versioning.h b/contrib/llvm/tools/lldb/include/lldb/lldb-versioning.h
index 8ccc67d8e9c..d0498a569f5 100644
--- a/contrib/llvm/tools/lldb/include/lldb/lldb-versioning.h
+++ b/contrib/llvm/tools/lldb/include/lldb/lldb-versioning.h
@@ -1604,4 +1604,4 @@
 #define LLDB_API_DEPRECATED_IN_DOT_99
 #endif // defined(LLDB_CHECK_API_VERSIONING) && defined(LLDB_API_MAJOR_VERSION_WANTED) && defined(LLDB_API_MINOR_VERSION_WANTED) && defined (LLDB_API_MAJOR_VERSION)
 
-#endif // LLDB_lldb_versioning_h_
\ No newline at end of file
+#endif // LLDB_lldb_versioning_h_
diff --git a/contrib/llvm/tools/lldb/source/API/SBCommandInterpreter.cpp b/contrib/llvm/tools/lldb/source/API/SBCommandInterpreter.cpp
index 0c839004601..ac77e2e4112 100644
--- a/contrib/llvm/tools/lldb/source/API/SBCommandInterpreter.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBCommandInterpreter.cpp
@@ -384,15 +384,103 @@ SBCommandInterpreter::SetCommandOverrideCallback (const char *command_name,
 extern "C" void 
 init_lldb(void);
 
-#else
+// these are the Pythonic implementations of the required callbacks
+// these are scripting-language specific, which is why they belong here
+// we still need to use function pointers to them instead of relying
+// on linkage-time resolution because the SWIG stuff and this file
+// get built at different times
+extern "C" bool
+LLDBSwigPythonBreakpointCallbackFunction (const char *python_function_name,
+                                          const char *session_dictionary_name,
+                                          const lldb::StackFrameSP& sb_frame,
+                                          const lldb::BreakpointLocationSP& sb_bp_loc);
 
-extern "C" void init_lldb(void);
+extern "C" bool
+LLDBSwigPythonWatchpointCallbackFunction (const char *python_function_name,
+                                          const char *session_dictionary_name,
+                                          const lldb::StackFrameSP& sb_frame,
+                                          const lldb::WatchpointSP& sb_wp);
+
+extern "C" bool
+LLDBSwigPythonCallTypeScript (const char *python_function_name,
+                              void *session_dictionary,
+                              const lldb::ValueObjectSP& valobj_sp,
+                              void** pyfunct_wrapper,
+                              std::string& retval);
+
+extern "C" void*
+LLDBSwigPythonCreateSyntheticProvider (const char *python_class_name,
+                                       const char *session_dictionary_name,
+                                       const lldb::ValueObjectSP& valobj_sp);
+
+
+extern "C" uint32_t
+LLDBSwigPython_CalculateNumChildren (void *implementor);
+
+extern "C" void *
+LLDBSwigPython_GetChildAtIndex (void *implementor, uint32_t idx);
+
+extern "C" int
+LLDBSwigPython_GetIndexOfChildWithName (void *implementor, const char* child_name);
+
+extern "C" void *
+LLDBSWIGPython_CastPyObjectToSBValue (void* data);
+
+extern lldb::ValueObjectSP
+LLDBSWIGPython_GetValueObjectSPFromSBValue (void* data);
+
+extern "C" bool
+LLDBSwigPython_UpdateSynthProviderInstance (void* implementor);
+
+extern "C" bool
+LLDBSwigPython_MightHaveChildrenSynthProviderInstance (void* implementor);
+
+extern "C" bool
+LLDBSwigPythonCallCommand (const char *python_function_name,
+                           const char *session_dictionary_name,
+                           lldb::DebuggerSP& debugger,
+                           const char* args,
+                           lldb_private::CommandReturnObject &cmd_retobj);
+
+extern "C" bool
+LLDBSwigPythonCallModuleInit (const char *python_module_name,
+                              const char *session_dictionary_name,
+                              lldb::DebuggerSP& debugger);
+
+extern "C" void*
+LLDBSWIGPythonCreateOSPlugin (const char *python_class_name,
+                              const char *session_dictionary_name,
+                              const lldb::ProcessSP& process_sp);
+
+extern "C" bool
+LLDBSWIGPythonRunScriptKeywordProcess (const char* python_function_name,
+                                       const char* session_dictionary_name,
+                                       lldb::ProcessSP& process,
+                                       std::string& output);
+
+extern "C" bool
+LLDBSWIGPythonRunScriptKeywordThread (const char* python_function_name,
+                                      const char* session_dictionary_name,
+                                      lldb::ThreadSP& thread,
+                                      std::string& output);
+
+extern "C" bool
+LLDBSWIGPythonRunScriptKeywordTarget (const char* python_function_name,
+                                      const char* session_dictionary_name,
+                                      lldb::TargetSP& target,
+                                      std::string& output);
+
+extern "C" bool
+LLDBSWIGPythonRunScriptKeywordFrame (const char* python_function_name,
+                                     const char* session_dictionary_name,
+                                     lldb::StackFrameSP& frame,
+                                     std::string& output);
+
+extern "C" void*
+LLDBSWIGPython_GetDynamicSetting (void* module,
+                                  const char* setting,
+                                  const lldb::TargetSP& target_sp);
 
-// Usually defined in the SWIG source file, but we have sripting disabled
-extern "C" void 
-init_lldb(void)
-{
-}
 
 #endif
 
@@ -404,7 +492,26 @@ SBCommandInterpreter::InitializeSWIG ()
     {
         g_initialized = true;
 #ifndef LLDB_DISABLE_PYTHON
-        ScriptInterpreter::InitializeInterpreter (init_lldb);
+        ScriptInterpreter::InitializeInterpreter (init_lldb,
+                                                  LLDBSwigPythonBreakpointCallbackFunction,
+                                                  LLDBSwigPythonWatchpointCallbackFunction,
+                                                  LLDBSwigPythonCallTypeScript,
+                                                  LLDBSwigPythonCreateSyntheticProvider,
+                                                  LLDBSwigPython_CalculateNumChildren,
+                                                  LLDBSwigPython_GetChildAtIndex,
+                                                  LLDBSwigPython_GetIndexOfChildWithName,
+                                                  LLDBSWIGPython_CastPyObjectToSBValue,
+                                                  LLDBSWIGPython_GetValueObjectSPFromSBValue,
+                                                  LLDBSwigPython_UpdateSynthProviderInstance,
+                                                  LLDBSwigPython_MightHaveChildrenSynthProviderInstance,
+                                                  LLDBSwigPythonCallCommand,
+                                                  LLDBSwigPythonCallModuleInit,
+                                                  LLDBSWIGPythonCreateOSPlugin,
+                                                  LLDBSWIGPythonRunScriptKeywordProcess,
+                                                  LLDBSWIGPythonRunScriptKeywordThread,
+                                                  LLDBSWIGPythonRunScriptKeywordTarget,
+                                                  LLDBSWIGPythonRunScriptKeywordFrame,
+                                                  LLDBSWIGPython_GetDynamicSetting);
 #endif
     }
 }
diff --git a/contrib/llvm/tools/lldb/source/API/SBData.cpp b/contrib/llvm/tools/lldb/source/API/SBData.cpp
index 5b2f075158b..06dcfc12af4 100644
--- a/contrib/llvm/tools/lldb/source/API/SBData.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBData.cpp
@@ -122,7 +122,7 @@ SBData::GetByteSize ()
         value = m_opaque_sp->GetByteSize();
     if (log)
         log->Printf ("SBData::GetByteSize () => "
-                     "(%lu)", value);
+                     "(%zu)", value);
     return value;
 }
 
@@ -479,7 +479,7 @@ SBData::ReadRawData (lldb::SBError& error,
             error.SetErrorString("unable to read data");
     }
     if (log)
-        log->Printf ("SBData::ReadRawData (error=%p,offset=%" PRIu64 ",buf=%p,size=%lu) => "
+        log->Printf ("SBData::ReadRawData (error=%p,offset=%" PRIu64 ",buf=%p,size=%zu) => "
                      "(%p)", error.get(), offset, buf, size, ok);
     return ok ? size : 0;
 }
@@ -497,7 +497,7 @@ SBData::SetData (lldb::SBError& error,
     else
         m_opaque_sp->SetData(buf, size, endian);
     if (log)
-        log->Printf ("SBData::SetData (error=%p,buf=%p,size=%lu,endian=%d,addr_size=%c) => "
+        log->Printf ("SBData::SetData (error=%p,buf=%p,size=%zu,endian=%d,addr_size=%c) => "
                      "(%p)", error.get(), buf, size, endian, addr_size, m_opaque_sp.get());
 }
 
@@ -647,7 +647,7 @@ SBData::SetDataFromUInt64Array (uint64_t* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromUInt64Array (array=%p, array_len = %lu) => "
+            log->Printf ("SBData::SetDataFromUInt64Array (array=%p, array_len = %zu) => "
                          "false", array, array_len);
         return false;
     }
@@ -662,7 +662,7 @@ SBData::SetDataFromUInt64Array (uint64_t* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromUInt64Array (array=%p, array_len = %lu) => "
+        log->Printf ("SBData::SetDataFromUInt64Array (array=%p, array_len = %zu) => "
                      "true", array, array_len);
     
     return true;
@@ -676,7 +676,7 @@ SBData::SetDataFromUInt32Array (uint32_t* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromUInt32Array (array=%p, array_len = %lu) => "
+            log->Printf ("SBData::SetDataFromUInt32Array (array=%p, array_len = %zu) => "
                          "false", array, array_len);
         return false;
     }
@@ -691,7 +691,7 @@ SBData::SetDataFromUInt32Array (uint32_t* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromUInt32Array (array=%p, array_len = %lu) => "
+        log->Printf ("SBData::SetDataFromUInt32Array (array=%p, array_len = %zu) => "
                      "true", array, array_len);
     
     return true;
@@ -705,7 +705,7 @@ SBData::SetDataFromSInt64Array (int64_t* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromSInt64Array (array=%p, array_len = %lu) => "
+            log->Printf ("SBData::SetDataFromSInt64Array (array=%p, array_len = %zu) => "
                          "false", array, array_len);
         return false;
     }
@@ -720,7 +720,7 @@ SBData::SetDataFromSInt64Array (int64_t* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromSInt64Array (array=%p, array_len = %lu) => "
+        log->Printf ("SBData::SetDataFromSInt64Array (array=%p, array_len = %zu) => "
                      "true", array, array_len);
     
     return true;
@@ -734,7 +734,7 @@ SBData::SetDataFromSInt32Array (int32_t* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromSInt32Array (array=%p, array_len = %lu) => "
+            log->Printf ("SBData::SetDataFromSInt32Array (array=%p, array_len = %zu) => "
                          "false", array, array_len);
         return false;
     }
@@ -749,7 +749,7 @@ SBData::SetDataFromSInt32Array (int32_t* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromSInt32Array (array=%p, array_len = %lu) => "
+        log->Printf ("SBData::SetDataFromSInt32Array (array=%p, array_len = %zu) => "
                      "true", array, array_len);
     
     return true;
@@ -763,7 +763,7 @@ SBData::SetDataFromDoubleArray (double* array, size_t array_len)
     if (!array || array_len == 0)
     {
         if (log)
-            log->Printf ("SBData::SetDataFromDoubleArray (array=%p, array_len = %lu) => "
+            log->Printf ("SBData::SetDataFromDoubleArray (array=%p, array_len = %zu) => "
                          "false", array, array_len);
         return false;
     }
@@ -778,7 +778,7 @@ SBData::SetDataFromDoubleArray (double* array, size_t array_len)
         m_opaque_sp->SetData(buffer_sp);
     
     if (log)
-        log->Printf ("SBData::SetDataFromDoubleArray (array=%p, array_len = %lu) => "
+        log->Printf ("SBData::SetDataFromDoubleArray (array=%p, array_len = %zu) => "
                      "true", array, array_len);
     
     return true;
diff --git a/contrib/llvm/tools/lldb/source/API/SBDebugger.cpp b/contrib/llvm/tools/lldb/source/API/SBDebugger.cpp
index f5e71d5f1a0..10c0b7dea20 100644
--- a/contrib/llvm/tools/lldb/source/API/SBDebugger.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBDebugger.cpp
@@ -38,6 +38,7 @@
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/State.h"
 #include "lldb/DataFormatters/DataVisualization.h"
+#include "lldb/Host/DynamicLibrary.h"
 #include "lldb/Interpreter/Args.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/OptionGroupPlatform.h"
@@ -47,6 +48,41 @@
 using namespace lldb;
 using namespace lldb_private;
 
+
+static lldb::DynamicLibrarySP
+LoadPlugin (const lldb::DebuggerSP &debugger_sp, const FileSpec& spec, Error& error)
+{
+    lldb::DynamicLibrarySP dynlib_sp(new lldb_private::DynamicLibrary(spec));
+    if (dynlib_sp && dynlib_sp->IsValid())
+    {
+        typedef bool (*LLDBCommandPluginInit) (lldb::SBDebugger& debugger);
+        
+        lldb::SBDebugger debugger_sb(debugger_sp);
+        // This calls the bool lldb::PluginInitialize(lldb::SBDebugger debugger) function.
+        // TODO: mangle this differently for your system - on OSX, the first underscore needs to be removed and the second one stays
+        LLDBCommandPluginInit init_func = dynlib_sp->GetSymbol<LLDBCommandPluginInit>("_ZN4lldb16PluginInitializeENS_10SBDebuggerE");
+        if (init_func)
+        {
+            if (init_func(debugger_sb))
+                return dynlib_sp;
+            else
+                error.SetErrorString("plug-in refused to load (lldb::PluginInitialize(lldb::SBDebugger) returned false)");
+        }
+        else
+        {
+            error.SetErrorString("plug-in is missing the required initialization: lldb::PluginInitialize(lldb::SBDebugger)");
+        }
+    }
+    else
+    {
+        if (spec.Exists())
+            error.SetErrorString("this file does not represent a loadable dylib");
+        else
+            error.SetErrorString("no such file");
+    }
+    return lldb::DynamicLibrarySP();
+}
+
 void
 SBDebugger::Initialize ()
 {
@@ -57,7 +93,7 @@ SBDebugger::Initialize ()
 
     SBCommandInterpreter::InitializeSWIG ();
 
-    Debugger::Initialize();
+    Debugger::Initialize(LoadPlugin);
 }
 
 void
@@ -480,7 +516,7 @@ SBDebugger::GetScriptingLanguage (const char *script_language_name)
 const char *
 SBDebugger::GetVersionString ()
 {
-    return GetVersion();
+    return lldb_private::GetVersion();
 }
 
 const char *
@@ -711,7 +747,7 @@ SBDebugger::GetIndexOfTarget (lldb::SBTarget target)
 }
 
 SBTarget
-SBDebugger::FindTargetWithProcessID (pid_t pid)
+SBDebugger::FindTargetWithProcessID (lldb::pid_t pid)
 {
     SBTarget sb_target;
     if (m_opaque_sp)
@@ -804,6 +840,42 @@ SBDebugger::SetSelectedTarget (SBTarget &sb_target)
     }
 }
 
+SBPlatform
+SBDebugger::GetSelectedPlatform()
+{
+    Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+
+    SBPlatform sb_platform;
+    DebuggerSP debugger_sp(m_opaque_sp);
+    if (debugger_sp)
+    {
+        sb_platform.SetSP(debugger_sp->GetPlatformList().GetSelectedPlatform());
+    }
+    if (log)
+    {
+        log->Printf ("SBDebugger(%p)::GetSelectedPlatform () => SBPlatform(%p): %s", m_opaque_sp.get(),
+                     sb_platform.GetSP().get(), sb_platform.GetName());
+    }
+    return sb_platform;
+}
+
+void
+SBDebugger::SetSelectedPlatform(SBPlatform &sb_platform)
+{
+    Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+    
+    DebuggerSP debugger_sp(m_opaque_sp);
+    if (debugger_sp)
+    {
+        debugger_sp->GetPlatformList().SetSelectedPlatform(sb_platform.GetSP());
+    }
+    if (log)
+    {
+        log->Printf ("SBDebugger(%p)::SetSelectedPlatform (SBPlatform(%p) %s)", m_opaque_sp.get(),
+                     sb_platform.GetSP().get(), sb_platform.GetName());
+    }
+}
+
 void
 SBDebugger::DispatchInput (void* baton, const void *data, size_t data_len)
 {
diff --git a/contrib/llvm/tools/lldb/source/API/SBExpressionOptions.cpp b/contrib/llvm/tools/lldb/source/API/SBExpressionOptions.cpp
index 127b0cf13cd..ae1c8f99df3 100644
--- a/contrib/llvm/tools/lldb/source/API/SBExpressionOptions.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBExpressionOptions.cpp
@@ -104,13 +104,25 @@ SBExpressionOptions::SetTimeoutInMicroSeconds (uint32_t timeout)
 bool
 SBExpressionOptions::GetTryAllThreads () const
 {
-    return m_opaque_ap->GetRunOthers ();
+    return m_opaque_ap->GetTryAllThreads ();
 }
 
 void
 SBExpressionOptions::SetTryAllThreads (bool run_others)
 {
-    m_opaque_ap->SetRunOthers (run_others);
+    m_opaque_ap->SetTryAllThreads (run_others);
+}
+
+bool
+SBExpressionOptions::GetTrapExceptions () const
+{
+    return m_opaque_ap->GetTrapExceptions ();
+}
+
+void
+SBExpressionOptions::SetTrapExceptions (bool trap_exceptions)
+{
+    m_opaque_ap->SetTrapExceptions (trap_exceptions);
 }
 
 EvaluateExpressionOptions *
diff --git a/contrib/llvm/tools/lldb/source/API/SBFileSpec.cpp b/contrib/llvm/tools/lldb/source/API/SBFileSpec.cpp
index 4413689501a..4fd2866c9b0 100644
--- a/contrib/llvm/tools/lldb/source/API/SBFileSpec.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBFileSpec.cpp
@@ -61,7 +61,7 @@ SBFileSpec::operator = (const SBFileSpec &rhs)
 bool
 SBFileSpec::IsValid() const
 {
-    return *m_opaque_ap;
+    return m_opaque_ap->operator bool();
 }
 
 bool
@@ -121,6 +121,24 @@ SBFileSpec::GetDirectory() const
     return s;
 }
 
+void
+SBFileSpec::SetFilename(const char *filename)
+{
+    if (filename && filename[0])
+        m_opaque_ap->GetFilename().SetCString(filename);
+    else
+        m_opaque_ap->GetFilename().Clear();
+}
+
+void
+SBFileSpec::SetDirectory(const char *directory)
+{
+    if (directory && directory[0])
+        m_opaque_ap->GetDirectory().SetCString(directory);
+    else
+        m_opaque_ap->GetDirectory().Clear();
+}
+
 uint32_t
 SBFileSpec::GetPath (char *dst_path, size_t dst_len) const
 {
diff --git a/contrib/llvm/tools/lldb/source/API/SBFunction.cpp b/contrib/llvm/tools/lldb/source/API/SBFunction.cpp
index 914d2d77f3e..bb7ea2e9f20 100644
--- a/contrib/llvm/tools/lldb/source/API/SBFunction.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBFunction.cpp
@@ -143,11 +143,13 @@ SBFunction::GetInstructions (SBTarget target, const char *flavor)
         ModuleSP module_sp (m_opaque_ptr->GetAddressRange().GetBaseAddress().GetModule());
         if (module_sp)
         {
+            const bool prefer_file_cache = false;
             sb_instructions.SetDisassembler (Disassembler::DisassembleRange (module_sp->GetArchitecture(),
                                                                              NULL,
                                                                              flavor,
                                                                              exe_ctx,
-                                                                             m_opaque_ptr->GetAddressRange()));
+                                                                             m_opaque_ptr->GetAddressRange(),
+                                                                             prefer_file_cache));
         }
     }
     return sb_instructions;
diff --git a/contrib/llvm/tools/lldb/source/API/SBHostOS.cpp b/contrib/llvm/tools/lldb/source/API/SBHostOS.cpp
index a8f7db90a15..166403103ad 100644
--- a/contrib/llvm/tools/lldb/source/API/SBHostOS.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBHostOS.cpp
@@ -42,7 +42,7 @@ lldb::thread_t
 SBHostOS::ThreadCreate
 (
     const char *name,
-    void *(*thread_function)(void *),
+    thread_func_t thread_function,
     void *thread_arg,
     SBError *error_ptr
 )
@@ -77,7 +77,7 @@ SBHostOS::ThreadDetach (lldb::thread_t thread, SBError *error_ptr)
 }
 
 bool
-SBHostOS::ThreadJoin (lldb::thread_t thread, void **result, SBError *error_ptr)
+SBHostOS::ThreadJoin (lldb::thread_t thread, thread_result_t *result, SBError *error_ptr)
 {
     return Host::ThreadJoin (thread, result, error_ptr ? error_ptr->get() : NULL);
 }
diff --git a/contrib/llvm/tools/lldb/source/API/SBModule.cpp b/contrib/llvm/tools/lldb/source/API/SBModule.cpp
index 5f5fc9292cd..0285cf304d4 100644
--- a/contrib/llvm/tools/lldb/source/API/SBModule.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBModule.cpp
@@ -162,6 +162,27 @@ SBModule::SetPlatformFileSpec (const lldb::SBFileSpec &platform_file)
     return result;
 }
 
+lldb::SBFileSpec
+SBModule::GetRemoteInstallFileSpec ()
+{
+    SBFileSpec sb_file_spec;
+    ModuleSP module_sp (GetSP ());
+    if (module_sp)
+        sb_file_spec.SetFileSpec (module_sp->GetRemoteInstallFileSpec());
+    return sb_file_spec;
+}
+
+bool
+SBModule::SetRemoteInstallFileSpec (lldb::SBFileSpec &file)
+{
+    ModuleSP module_sp (GetSP ());
+    if (module_sp)
+    {
+        module_sp->SetRemoteInstallFileSpec(file.ref());
+        return true;
+    }
+    return false;
+}
 
 
 const uint8_t *
diff --git a/contrib/llvm/tools/lldb/source/API/SBModuleSpec.cpp b/contrib/llvm/tools/lldb/source/API/SBModuleSpec.cpp
index 654a8ca6ec8..17c83abb4f2 100644
--- a/contrib/llvm/tools/lldb/source/API/SBModuleSpec.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBModuleSpec.cpp
@@ -44,7 +44,7 @@ SBModuleSpec::~SBModuleSpec ()
 bool
 SBModuleSpec::IsValid () const
 {
-    return *m_opaque_ap;
+    return m_opaque_ap->operator bool();
 }
 
 void
diff --git a/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp b/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp
new file mode 100644
index 00000000000..9914852cead
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/API/SBPlatform.cpp
@@ -0,0 +1,632 @@
+//===-- SBPlatform.cpp ------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/API/SBPlatform.h"
+#include "lldb/API/SBError.h"
+#include "lldb/API/SBFileSpec.h"
+#include "lldb/Core/ArchSpec.h"
+#include "lldb/Core/Error.h"
+#include "lldb/Host/File.h"
+#include "lldb/Interpreter/Args.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Platform.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+//----------------------------------------------------------------------
+// PlatformConnectOptions
+//----------------------------------------------------------------------
+struct PlatformConnectOptions {
+    PlatformConnectOptions(const char *url = NULL) :
+        m_url(),
+        m_rsync_options(),
+        m_rsync_remote_path_prefix(),
+        m_rsync_enabled(false),
+        m_rsync_omit_hostname_from_remote_path(false),
+        m_local_cache_directory ()
+    {
+        if (url && url[0])
+            m_url = url;
+    }
+    
+    ~PlatformConnectOptions()
+    {
+    }
+
+    std::string m_url;
+    std::string m_rsync_options;
+    std::string m_rsync_remote_path_prefix;
+    bool m_rsync_enabled;
+    bool m_rsync_omit_hostname_from_remote_path;
+    ConstString m_local_cache_directory;
+};
+
+//----------------------------------------------------------------------
+// PlatformShellCommand
+//----------------------------------------------------------------------
+struct PlatformShellCommand {
+    PlatformShellCommand(const char *shell_command = NULL) :
+        m_command(),
+        m_working_dir(),
+        m_status(0),
+        m_signo(0),
+        m_timeout_sec(UINT32_MAX)
+    {
+        if (shell_command && shell_command[0])
+            m_command = shell_command;
+    }
+    
+    ~PlatformShellCommand()
+    {
+    }
+    
+    std::string m_command;
+    std::string m_working_dir;
+    std::string m_output;
+    int m_status;
+    int m_signo;
+    uint32_t m_timeout_sec;
+};
+//----------------------------------------------------------------------
+// SBPlatformConnectOptions
+//----------------------------------------------------------------------
+SBPlatformConnectOptions::SBPlatformConnectOptions (const char *url) :
+    m_opaque_ptr(new PlatformConnectOptions(url))
+{
+    
+}
+
+SBPlatformConnectOptions::SBPlatformConnectOptions(const SBPlatformConnectOptions &rhs) :
+    m_opaque_ptr(new PlatformConnectOptions())
+{
+    *m_opaque_ptr = *rhs.m_opaque_ptr;
+}
+    
+SBPlatformConnectOptions::~SBPlatformConnectOptions ()
+{
+    delete m_opaque_ptr;
+}
+
+void
+SBPlatformConnectOptions::operator=(const SBPlatformConnectOptions &rhs)
+{
+    *m_opaque_ptr = *rhs.m_opaque_ptr;
+}
+
+const char *
+SBPlatformConnectOptions::GetURL()
+{
+    if (m_opaque_ptr->m_url.empty())
+        return NULL;
+    return m_opaque_ptr->m_url.c_str();
+}
+    
+void
+SBPlatformConnectOptions::SetURL(const char *url)
+{
+    if (url && url[0])
+        m_opaque_ptr->m_url = url;
+    else
+        m_opaque_ptr->m_url.clear();
+}
+
+bool
+SBPlatformConnectOptions::GetRsyncEnabled()
+{
+    return m_opaque_ptr->m_rsync_enabled;
+}
+    
+void
+SBPlatformConnectOptions::EnableRsync (const char *options,
+                                       const char *remote_path_prefix,
+                                       bool omit_hostname_from_remote_path)
+{
+    m_opaque_ptr->m_rsync_enabled = true;
+    m_opaque_ptr->m_rsync_omit_hostname_from_remote_path = omit_hostname_from_remote_path;
+    if (remote_path_prefix && remote_path_prefix[0])
+        m_opaque_ptr->m_rsync_remote_path_prefix = remote_path_prefix;
+    else
+        m_opaque_ptr->m_rsync_remote_path_prefix.clear();
+
+    if (options && options[0])
+        m_opaque_ptr->m_rsync_options = options;
+    else
+        m_opaque_ptr->m_rsync_options.clear();
+
+}
+
+void
+SBPlatformConnectOptions::DisableRsync ()
+{
+    m_opaque_ptr->m_rsync_enabled = false;
+}
+    
+const char *
+SBPlatformConnectOptions::GetLocalCacheDirectory()
+{
+    return m_opaque_ptr->m_local_cache_directory.GetCString();
+}
+    
+void
+SBPlatformConnectOptions::SetLocalCacheDirectory(const char *path)
+{
+    if (path && path[0])
+        m_opaque_ptr->m_local_cache_directory.SetCString(path);
+    else
+        m_opaque_ptr->m_local_cache_directory = ConstString();
+}
+
+//----------------------------------------------------------------------
+// SBPlatformShellCommand
+//----------------------------------------------------------------------
+SBPlatformShellCommand::SBPlatformShellCommand (const char *shell_command) :
+    m_opaque_ptr(new PlatformShellCommand(shell_command))
+{
+}
+
+SBPlatformShellCommand::SBPlatformShellCommand (const SBPlatformShellCommand &rhs) :
+    m_opaque_ptr(new PlatformShellCommand())
+{
+    *m_opaque_ptr = *rhs.m_opaque_ptr;
+}
+
+SBPlatformShellCommand::~SBPlatformShellCommand()
+{
+    delete m_opaque_ptr;
+}
+
+void
+SBPlatformShellCommand::Clear()
+{
+    m_opaque_ptr->m_output = std::move(std::string());
+    m_opaque_ptr->m_status = 0;
+    m_opaque_ptr->m_signo = 0;
+}
+
+const char *
+SBPlatformShellCommand::GetCommand()
+{
+    if (m_opaque_ptr->m_command.empty())
+        return NULL;
+    return m_opaque_ptr->m_command.c_str();
+}
+
+void
+SBPlatformShellCommand::SetCommand(const char *shell_command)
+{
+    if (shell_command && shell_command[0])
+        m_opaque_ptr->m_command = shell_command;
+    else
+        m_opaque_ptr->m_command.clear();
+}
+
+const char *
+SBPlatformShellCommand::GetWorkingDirectory ()
+{
+    if (m_opaque_ptr->m_working_dir.empty())
+        return NULL;
+    return m_opaque_ptr->m_working_dir.c_str();
+}
+
+void
+SBPlatformShellCommand::SetWorkingDirectory (const char *path)
+{
+    if (path && path[0])
+        m_opaque_ptr->m_working_dir = path;
+    else
+        m_opaque_ptr->m_working_dir.clear();
+}
+
+uint32_t
+SBPlatformShellCommand::GetTimeoutSeconds ()
+{
+    return m_opaque_ptr->m_timeout_sec;
+}
+
+void
+SBPlatformShellCommand::SetTimeoutSeconds (uint32_t sec)
+{
+    m_opaque_ptr->m_timeout_sec = sec;
+}
+
+int
+SBPlatformShellCommand::GetSignal ()
+{
+    return m_opaque_ptr->m_signo;
+}
+
+int
+SBPlatformShellCommand::GetStatus ()
+{
+    return m_opaque_ptr->m_status;
+}
+
+const char *
+SBPlatformShellCommand::GetOutput ()
+{
+    if (m_opaque_ptr->m_output.empty())
+        return NULL;
+    return m_opaque_ptr->m_output.c_str();
+}
+
+//----------------------------------------------------------------------
+// SBPlatform
+//----------------------------------------------------------------------
+SBPlatform::SBPlatform () :
+    m_opaque_sp ()
+{
+    
+}
+
+SBPlatform::SBPlatform (const char *platform_name) :
+    m_opaque_sp ()
+{
+    Error error;
+    m_opaque_sp = Platform::Create (platform_name, error);
+}
+
+SBPlatform::~SBPlatform()
+{
+}
+
+bool
+SBPlatform::IsValid () const
+{
+    return m_opaque_sp.get() != NULL;
+}
+
+void
+SBPlatform::Clear ()
+{
+    m_opaque_sp.reset();
+}
+
+const char *
+SBPlatform::GetName ()
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+        return platform_sp->GetName().GetCString();
+    return NULL;
+}
+
+lldb::PlatformSP
+SBPlatform::GetSP () const
+{
+    return m_opaque_sp;
+}
+
+void
+SBPlatform::SetSP (const lldb::PlatformSP& platform_sp)
+{
+    m_opaque_sp = platform_sp;
+}
+
+const char *
+SBPlatform::GetWorkingDirectory()
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+        return platform_sp->GetWorkingDirectory().GetCString();
+    return NULL;
+}
+
+bool
+SBPlatform::SetWorkingDirectory(const char *path)
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        if (path)
+            platform_sp->SetWorkingDirectory(ConstString(path));
+        else
+            platform_sp->SetWorkingDirectory(ConstString());
+        return true;
+    }
+    return false;
+}
+
+SBError
+SBPlatform::ConnectRemote (SBPlatformConnectOptions &connect_options)
+{
+    SBError sb_error;
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp && connect_options.GetURL())
+    {
+        Args args;
+        args.AppendArgument(connect_options.GetURL());
+        sb_error.ref() = platform_sp->ConnectRemote(args);
+    }
+    else
+    {
+        sb_error.SetErrorString("invalid platform");
+    }
+    return sb_error;
+}
+
+void
+SBPlatform::DisconnectRemote ()
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+        platform_sp->DisconnectRemote();
+}
+
+bool
+SBPlatform::IsConnected()
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+        platform_sp->IsConnected();
+    return false;
+}
+
+const char *
+SBPlatform::GetTriple()
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        ArchSpec arch(platform_sp->GetRemoteSystemArchitecture());
+        if (arch.IsValid())
+        {
+            // Const-ify the string so we don't need to worry about the lifetime of the string
+            return ConstString(arch.GetTriple().getTriple().c_str()).GetCString();
+        }
+    }
+    return NULL;
+}
+
+const char *
+SBPlatform::GetOSBuild()
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        std::string s;
+        if (platform_sp->GetOSBuildString(s))
+        {
+            if (!s.empty())
+            {
+                // Const-ify the string so we don't need to worry about the lifetime of the string
+                return ConstString(s.c_str()).GetCString();
+            }
+        }
+    }
+    return NULL;
+}
+
+const char *
+SBPlatform::GetOSDescription()
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        std::string s;
+        if (platform_sp->GetOSKernelDescription(s))
+        {
+            if (!s.empty())
+            {
+                // Const-ify the string so we don't need to worry about the lifetime of the string
+                return ConstString(s.c_str()).GetCString();
+            }
+        }
+    }
+    return NULL;
+}
+
+const char *
+SBPlatform::GetHostname ()
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+        return platform_sp->GetHostname();
+    return NULL;
+}
+
+uint32_t
+SBPlatform::GetOSMajorVersion ()
+{
+    uint32_t major, minor, update;
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp && platform_sp->GetOSVersion(major, minor, update))
+        return major;
+    return UINT32_MAX;
+    
+}
+
+uint32_t
+SBPlatform::GetOSMinorVersion ()
+{
+    uint32_t major, minor, update;
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp && platform_sp->GetOSVersion(major, minor, update))
+        return minor;
+    return UINT32_MAX;
+}
+
+uint32_t
+SBPlatform::GetOSUpdateVersion ()
+{
+    uint32_t major, minor, update;
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp && platform_sp->GetOSVersion(major, minor, update))
+        return update;
+    return UINT32_MAX;
+}
+
+SBError
+SBPlatform::Get (SBFileSpec &src,
+                 SBFileSpec &dst)
+{
+    SBError sb_error;
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        sb_error.ref() = platform_sp->GetFile(src.ref(), dst.ref());
+    }
+    else
+    {
+        sb_error.SetErrorString("invalid platform");
+    }
+    return sb_error;
+}
+
+SBError
+SBPlatform::Put (SBFileSpec &src,
+                 SBFileSpec &dst)
+{
+    SBError sb_error;
+    
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        if (src.Exists())
+        {
+            uint32_t permissions = src.ref().GetPermissions();
+            if (permissions == 0)
+            {
+                if (src.ref().GetFileType() == FileSpec::eFileTypeDirectory)
+                    permissions = eFilePermissionsDirectoryDefault;
+                else
+                    permissions = eFilePermissionsFileDefault;
+            }
+
+            sb_error.ref() = platform_sp->PutFile(src.ref(),
+                                                  dst.ref(),
+                                                  permissions);
+        }
+        else
+        {
+            sb_error.ref().SetErrorStringWithFormat("'src' argument doesn't exist: '%s'", src.ref().GetPath().c_str());
+        }
+    }
+    else
+    {
+        sb_error.SetErrorString("invalid platform");
+    }
+    return sb_error;
+}
+
+SBError
+SBPlatform::Install (SBFileSpec &src,
+                     SBFileSpec &dst)
+{
+    SBError sb_error;
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        if (src.Exists())
+        {
+            sb_error.ref() = platform_sp->Install(src.ref(), dst.ref());
+        }
+        else
+        {
+            sb_error.ref().SetErrorStringWithFormat("'src' argument doesn't exist: '%s'", src.ref().GetPath().c_str());
+        }
+    }
+    else
+    {
+        sb_error.SetErrorString("invalid platform");
+    }
+    return sb_error;
+}
+
+
+SBError
+SBPlatform::Run (SBPlatformShellCommand &shell_command)
+{
+    SBError sb_error;
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        if (platform_sp->IsConnected())
+        {
+            const char *command = shell_command.GetCommand();
+            if (command)
+            {
+                const char *working_dir = shell_command.GetWorkingDirectory();
+                if (working_dir == NULL)
+                {
+                    working_dir = platform_sp->GetWorkingDirectory().GetCString();
+                    if (working_dir)
+                        shell_command.SetWorkingDirectory(working_dir);
+                }
+                sb_error.ref() = platform_sp->RunShellCommand(command,
+                                                              working_dir,
+                                                              &shell_command.m_opaque_ptr->m_status,
+                                                              &shell_command.m_opaque_ptr->m_signo,
+                                                              &shell_command.m_opaque_ptr->m_output,
+                                                              shell_command.m_opaque_ptr->m_timeout_sec);
+            }
+            else
+            {
+                sb_error.SetErrorString("invalid shell command (empty)");
+            }
+        }
+        else
+        {
+            sb_error.SetErrorString("not connected");
+        }
+    }
+    else
+    {
+        sb_error.SetErrorString("invalid platform");
+    }
+    return sb_error;
+}
+
+SBError
+SBPlatform::MakeDirectory (const char *path, uint32_t file_permissions)
+{
+    SBError sb_error;
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        sb_error.ref() = platform_sp->MakeDirectory(path, file_permissions);
+    }
+    else
+    {
+        sb_error.SetErrorString("invalid platform");
+    }
+    return sb_error;
+}
+
+uint32_t
+SBPlatform::GetFilePermissions (const char *path)
+{
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        uint32_t file_permissions = 0;
+        platform_sp->GetFilePermissions(path, file_permissions);
+        return file_permissions;
+    }
+    return 0;
+    
+}
+
+SBError
+SBPlatform::SetFilePermissions (const char *path, uint32_t file_permissions)
+{
+    SBError sb_error;
+    PlatformSP platform_sp(GetSP());
+    if (platform_sp)
+    {
+        sb_error.ref() = platform_sp->SetFilePermissions(path, file_permissions);
+    }
+    else
+    {
+        sb_error.SetErrorString("invalid platform");
+    }
+    return sb_error;
+    
+}
+
diff --git a/contrib/llvm/tools/lldb/source/API/SBProcess.cpp b/contrib/llvm/tools/lldb/source/API/SBProcess.cpp
index 259eb5e9703..557006f2434 100644
--- a/contrib/llvm/tools/lldb/source/API/SBProcess.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBProcess.cpp
@@ -11,6 +11,9 @@
 
 #include "lldb/API/SBProcess.h"
 
+// C Includes
+#include <inttypes.h>
+
 #include "lldb/lldb-defines.h"
 #include "lldb/lldb-types.h"
 
@@ -23,6 +26,7 @@
 #include "lldb/Core/StreamFile.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
+#include "lldb/Target/SystemRuntime.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
 
@@ -334,7 +338,7 @@ SBProcess::PutSTDIN (const char *src, size_t src_len)
     }
     
     if (log)
-        log->Printf ("SBProcess(%p)::PutSTDIN (src=\"%s\", src_len=%d) => %lu", 
+        log->Printf ("SBProcess(%p)::PutSTDIN (src=\"%s\", src_len=%d) => %zu", 
                      process_sp.get(), 
                      src, 
                      (uint32_t) src_len, 
@@ -1254,3 +1258,37 @@ SBProcess::UnloadImage (uint32_t image_token)
         sb_error.SetErrorString("invalid process");
     return sb_error;
 }
+
+uint32_t
+SBProcess::GetNumExtendedBacktraceTypes ()
+{
+    ProcessSP process_sp(GetSP());
+    if (process_sp && process_sp->GetSystemRuntime())
+    {
+        SystemRuntime *runtime = process_sp->GetSystemRuntime();
+        return runtime->GetExtendedBacktraceTypes().size();
+    }
+    return 0;
+}
+
+const char *
+SBProcess::GetExtendedBacktraceTypeAtIndex (uint32_t idx)
+{
+    ProcessSP process_sp(GetSP());
+    if (process_sp && process_sp->GetSystemRuntime())
+    {
+        SystemRuntime *runtime = process_sp->GetSystemRuntime();
+        const std::vector<ConstString> &names = runtime->GetExtendedBacktraceTypes();
+        if (idx < names.size())
+        {
+            return names[idx].AsCString();
+        }
+        else
+        {
+            Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+            if (log)
+                log->Printf("SBProcess(%p)::GetExtendedBacktraceTypeAtIndex() => error: requested extended backtrace name out of bounds", process_sp.get());
+        }
+    }
+    return NULL;
+}
diff --git a/contrib/llvm/tools/lldb/source/API/SBStream.cpp b/contrib/llvm/tools/lldb/source/API/SBStream.cpp
index dc8eb05ab0b..531ab9f463c 100644
--- a/contrib/llvm/tools/lldb/source/API/SBStream.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBStream.cpp
@@ -82,7 +82,7 @@ SBStream::RedirectToFile (const char *path, bool append)
     uint32_t open_options = File::eOpenOptionWrite | File::eOpenOptionCanCreate;
     if (append)
         open_options |= File::eOpenOptionAppend;
-    stream_file->GetFile().Open (path, open_options, File::ePermissionsDefault);
+    stream_file->GetFile().Open (path, open_options, lldb::eFilePermissionsFileDefault);
 
     m_opaque_ap.reset (stream_file);
 
diff --git a/contrib/llvm/tools/lldb/source/API/SBSymbol.cpp b/contrib/llvm/tools/lldb/source/API/SBSymbol.cpp
index dd057e81a55..ef3d0764c96 100644
--- a/contrib/llvm/tools/lldb/source/API/SBSymbol.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBSymbol.cpp
@@ -139,11 +139,13 @@ SBSymbol::GetInstructions (SBTarget target, const char *flavor_string)
             if (module_sp)
             {
                 AddressRange symbol_range (m_opaque_ptr->GetAddress(), m_opaque_ptr->GetByteSize());
+                const bool prefer_file_cache = false;
                 sb_instructions.SetDisassembler (Disassembler::DisassembleRange (module_sp->GetArchitecture (),
                                                                                  NULL,
                                                                                  flavor_string,
                                                                                  exe_ctx,
-                                                                                 symbol_range));
+                                                                                 symbol_range,
+                                                                                 prefer_file_cache));
             }
         }
     }
diff --git a/contrib/llvm/tools/lldb/source/API/SBTarget.cpp b/contrib/llvm/tools/lldb/source/API/SBTarget.cpp
index f37c8f8a614..c8bc2171436 100644
--- a/contrib/llvm/tools/lldb/source/API/SBTarget.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBTarget.cpp
@@ -41,6 +41,7 @@
 #include "lldb/Core/SearchFilter.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Core/STLUtils.h"
+#include "lldb/Core/ValueObjectConstResult.h"
 #include "lldb/Core/ValueObjectList.h"
 #include "lldb/Core/ValueObjectVariable.h"
 #include "lldb/Host/FileSpec.h"
@@ -604,6 +605,19 @@ SBTarget::LaunchSimple
                    error);
 }
 
+SBError
+SBTarget::Install()
+{
+    SBError sb_error;
+    TargetSP target_sp(GetSP());
+    if (target_sp)
+    {
+        Mutex::Locker api_locker (target_sp->GetAPIMutex());
+        sb_error.ref() = target_sp->Install(NULL);
+    }
+    return sb_error;
+}
+
 SBProcess
 SBTarget::Launch 
 (
@@ -1260,7 +1274,8 @@ SBTarget::ResolveLoadAddress (lldb::addr_t vm_addr)
 }
 
 SBSymbolContext
-SBTarget::ResolveSymbolContextForAddress (const SBAddress& addr, uint32_t resolve_scope)
+SBTarget::ResolveSymbolContextForAddress (const SBAddress& addr,
+                                          uint32_t resolve_scope)
 {
     SBSymbolContext sc;
     if (addr.IsValid())
@@ -1274,13 +1289,15 @@ SBTarget::ResolveSymbolContextForAddress (const SBAddress& addr, uint32_t resolv
 
 
 SBBreakpoint
-SBTarget::BreakpointCreateByLocation (const char *file, uint32_t line)
+SBTarget::BreakpointCreateByLocation (const char *file,
+                                      uint32_t line)
 {
     return SBBreakpoint(BreakpointCreateByLocation (SBFileSpec (file, false), line));
 }
 
 SBBreakpoint
-SBTarget::BreakpointCreateByLocation (const SBFileSpec &sb_file_spec, uint32_t line)
+SBTarget::BreakpointCreateByLocation (const SBFileSpec &sb_file_spec,
+                                      uint32_t line)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -1293,7 +1310,8 @@ SBTarget::BreakpointCreateByLocation (const SBFileSpec &sb_file_spec, uint32_t l
         const LazyBool check_inlines = eLazyBoolCalculate;
         const LazyBool skip_prologue = eLazyBoolCalculate;
         const bool internal = false;
-        *sb_bp = target_sp->CreateBreakpoint (NULL, *sb_file_spec, line, check_inlines, skip_prologue, internal);
+        const bool hardware = false;
+        *sb_bp = target_sp->CreateBreakpoint (NULL, *sb_file_spec, line, check_inlines, skip_prologue, internal, hardware);
     }
 
     if (log)
@@ -1314,7 +1332,8 @@ SBTarget::BreakpointCreateByLocation (const SBFileSpec &sb_file_spec, uint32_t l
 }
 
 SBBreakpoint
-SBTarget::BreakpointCreateByName (const char *symbol_name, const char *module_name)
+SBTarget::BreakpointCreateByName (const char *symbol_name,
+                                  const char *module_name)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -1325,16 +1344,17 @@ SBTarget::BreakpointCreateByName (const char *symbol_name, const char *module_na
         Mutex::Locker api_locker (target_sp->GetAPIMutex());
         
         const bool internal = false;
+        const bool hardware = false;
         const LazyBool skip_prologue = eLazyBoolCalculate;
         if (module_name && module_name[0])
         {
             FileSpecList module_spec_list;
             module_spec_list.Append (FileSpec (module_name, false));
-            *sb_bp = target_sp->CreateBreakpoint (&module_spec_list, NULL, symbol_name, eFunctionNameTypeAuto, skip_prologue, internal);
+            *sb_bp = target_sp->CreateBreakpoint (&module_spec_list, NULL, symbol_name, eFunctionNameTypeAuto, skip_prologue, internal, hardware);
         }
         else
         {
-            *sb_bp = target_sp->CreateBreakpoint (NULL, NULL, symbol_name, eFunctionNameTypeAuto, skip_prologue, internal);
+            *sb_bp = target_sp->CreateBreakpoint (NULL, NULL, symbol_name, eFunctionNameTypeAuto, skip_prologue, internal, hardware);
         }
     }
     
@@ -1349,8 +1369,8 @@ SBTarget::BreakpointCreateByName (const char *symbol_name, const char *module_na
 
 lldb::SBBreakpoint
 SBTarget::BreakpointCreateByName (const char *symbol_name, 
-                            const SBFileSpecList &module_list, 
-                            const SBFileSpecList &comp_unit_list)
+                                  const SBFileSpecList &module_list,
+                                  const SBFileSpecList &comp_unit_list)
 {
     uint32_t name_type_mask = eFunctionNameTypeAuto;
     return BreakpointCreateByName (symbol_name, name_type_mask, module_list, comp_unit_list);
@@ -1358,9 +1378,9 @@ SBTarget::BreakpointCreateByName (const char *symbol_name,
 
 lldb::SBBreakpoint
 SBTarget::BreakpointCreateByName (const char *symbol_name,
-                            uint32_t name_type_mask,
-                            const SBFileSpecList &module_list, 
-                            const SBFileSpecList &comp_unit_list)
+                                  uint32_t name_type_mask,
+                                  const SBFileSpecList &module_list,
+                                  const SBFileSpecList &comp_unit_list)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -1369,14 +1389,16 @@ SBTarget::BreakpointCreateByName (const char *symbol_name,
     if (target_sp && symbol_name && symbol_name[0])
     {
         const bool internal = false;
+        const bool hardware = false;
         const LazyBool skip_prologue = eLazyBoolCalculate;
         Mutex::Locker api_locker (target_sp->GetAPIMutex());
         *sb_bp = target_sp->CreateBreakpoint (module_list.get(), 
-                                                comp_unit_list.get(), 
-                                                symbol_name, 
-                                                name_type_mask, 
-                                                skip_prologue,
-                                                internal);
+                                              comp_unit_list.get(),
+                                              symbol_name,
+                                              name_type_mask,
+                                              skip_prologue,
+                                              internal,
+                                              hardware);
     }
     
     if (log)
@@ -1403,6 +1425,7 @@ SBTarget::BreakpointCreateByNames (const char *symbol_names[],
     {
         Mutex::Locker api_locker (target_sp->GetAPIMutex());
         const bool internal = false;
+        const bool hardware = false;
         const LazyBool skip_prologue = eLazyBoolCalculate;
         *sb_bp = target_sp->CreateBreakpoint (module_list.get(), 
                                                 comp_unit_list.get(), 
@@ -1410,7 +1433,8 @@ SBTarget::BreakpointCreateByNames (const char *symbol_names[],
                                                 num_names,
                                                 name_type_mask, 
                                                 skip_prologue,
-                                                internal);
+                                                internal,
+                                                hardware);
     }
     
     if (log)
@@ -1436,7 +1460,8 @@ SBTarget::BreakpointCreateByNames (const char *symbol_names[],
 }
 
 SBBreakpoint
-SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex, const char *module_name)
+SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex,
+                                   const char *module_name)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -1447,6 +1472,7 @@ SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex, const char *mo
         Mutex::Locker api_locker (target_sp->GetAPIMutex());
         RegularExpression regexp(symbol_name_regex);
         const bool internal = false;
+        const bool hardware = false;
         const LazyBool skip_prologue = eLazyBoolCalculate;
         
         if (module_name && module_name[0])
@@ -1454,11 +1480,11 @@ SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex, const char *mo
             FileSpecList module_spec_list;
             module_spec_list.Append (FileSpec (module_name, false));
             
-            *sb_bp = target_sp->CreateFuncRegexBreakpoint (&module_spec_list, NULL, regexp, skip_prologue, internal);
+            *sb_bp = target_sp->CreateFuncRegexBreakpoint (&module_spec_list, NULL, regexp, skip_prologue, internal, hardware);
         }
         else
         {
-            *sb_bp = target_sp->CreateFuncRegexBreakpoint (NULL, NULL, regexp, skip_prologue, internal);
+            *sb_bp = target_sp->CreateFuncRegexBreakpoint (NULL, NULL, regexp, skip_prologue, internal, hardware);
         }
     }
 
@@ -1473,8 +1499,8 @@ SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex, const char *mo
 
 lldb::SBBreakpoint
 SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex, 
-                         const SBFileSpecList &module_list, 
-                         const SBFileSpecList &comp_unit_list)
+                                   const SBFileSpecList &module_list,
+                                   const SBFileSpecList &comp_unit_list)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -1485,9 +1511,10 @@ SBTarget::BreakpointCreateByRegex (const char *symbol_name_regex,
         Mutex::Locker api_locker (target_sp->GetAPIMutex());
         RegularExpression regexp(symbol_name_regex);
         const bool internal = false;
+        const bool hardware = false;
         const LazyBool skip_prologue = eLazyBoolCalculate;
         
-        *sb_bp = target_sp->CreateFuncRegexBreakpoint (module_list.get(), comp_unit_list.get(), regexp, skip_prologue, internal);
+        *sb_bp = target_sp->CreateFuncRegexBreakpoint (module_list.get(), comp_unit_list.get(), regexp, skip_prologue, internal, hardware);
     }
 
     if (log)
@@ -1509,7 +1536,8 @@ SBTarget::BreakpointCreateByAddress (addr_t address)
     if (target_sp)
     {
         Mutex::Locker api_locker (target_sp->GetAPIMutex());
-        *sb_bp = target_sp->CreateBreakpoint (address, false);
+        const bool hardware = false;
+        *sb_bp = target_sp->CreateBreakpoint (address, false, hardware);
     }
     
     if (log)
@@ -1521,7 +1549,9 @@ SBTarget::BreakpointCreateByAddress (addr_t address)
 }
 
 lldb::SBBreakpoint
-SBTarget::BreakpointCreateBySourceRegex (const char *source_regex, const lldb::SBFileSpec &source_file, const char *module_name)
+SBTarget::BreakpointCreateBySourceRegex (const char *source_regex,
+                                         const lldb::SBFileSpec &source_file,
+                                         const char *module_name)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -1532,6 +1562,7 @@ SBTarget::BreakpointCreateBySourceRegex (const char *source_regex, const lldb::S
         Mutex::Locker api_locker (target_sp->GetAPIMutex());
         RegularExpression regexp(source_regex);
         FileSpecList source_file_spec_list;
+        const bool hardware = false;
         source_file_spec_list.Append (source_file.ref());
         
         if (module_name && module_name[0])
@@ -1539,11 +1570,11 @@ SBTarget::BreakpointCreateBySourceRegex (const char *source_regex, const lldb::S
             FileSpecList module_spec_list;
             module_spec_list.Append (FileSpec (module_name, false));
             
-            *sb_bp = target_sp->CreateSourceRegexBreakpoint (&module_spec_list, &source_file_spec_list, regexp, false);
+            *sb_bp = target_sp->CreateSourceRegexBreakpoint (&module_spec_list, &source_file_spec_list, regexp, false, hardware);
         }
         else
         {
-            *sb_bp = target_sp->CreateSourceRegexBreakpoint (NULL, &source_file_spec_list, regexp, false);
+            *sb_bp = target_sp->CreateSourceRegexBreakpoint (NULL, &source_file_spec_list, regexp, false, hardware);
         }
     }
 
@@ -1560,8 +1591,8 @@ SBTarget::BreakpointCreateBySourceRegex (const char *source_regex, const lldb::S
 
 lldb::SBBreakpoint
 SBTarget::BreakpointCreateBySourceRegex (const char *source_regex, 
-                               const SBFileSpecList &module_list, 
-                               const lldb::SBFileSpecList &source_file_list)
+                                         const SBFileSpecList &module_list,
+                                         const lldb::SBFileSpecList &source_file_list)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -1570,8 +1601,9 @@ SBTarget::BreakpointCreateBySourceRegex (const char *source_regex,
     if (target_sp && source_regex && source_regex[0])
     {
         Mutex::Locker api_locker (target_sp->GetAPIMutex());
+        const bool hardware = false;
         RegularExpression regexp(source_regex);
-        *sb_bp = target_sp->CreateSourceRegexBreakpoint (module_list.get(), source_file_list.get(), regexp, false);
+        *sb_bp = target_sp->CreateSourceRegexBreakpoint (module_list.get(), source_file_list.get(), regexp, false, hardware);
     }
 
     if (log)
@@ -1585,8 +1617,8 @@ SBTarget::BreakpointCreateBySourceRegex (const char *source_regex,
 
 lldb::SBBreakpoint
 SBTarget::BreakpointCreateForException  (lldb::LanguageType language,
-                               bool catch_bp,
-                               bool throw_bp)
+                                         bool catch_bp,
+                                         bool throw_bp)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
 
@@ -1595,7 +1627,8 @@ SBTarget::BreakpointCreateForException  (lldb::LanguageType language,
     if (target_sp)
     {
         Mutex::Locker api_locker (target_sp->GetAPIMutex());
-        *sb_bp = target_sp->CreateExceptionBreakpoint (language, catch_bp, throw_bp);
+        const bool hardware = false;
+        *sb_bp = target_sp->CreateExceptionBreakpoint (language, catch_bp, throw_bp, hardware);
     }
 
     if (log)
@@ -1862,6 +1895,50 @@ SBTarget::DisableAllWatchpoints ()
     return false;
 }
 
+SBValue
+SBTarget::CreateValueFromAddress (const char *name, SBAddress addr, SBType type)
+{
+    SBValue sb_value;
+    lldb::ValueObjectSP new_value_sp;
+    if (IsValid() && name && *name && addr.IsValid() && type.IsValid())
+    {
+        lldb::addr_t address(addr.GetLoadAddress(*this));
+        lldb::TypeImplSP type_impl_sp (type.GetSP());
+        ClangASTType pointer_ast_type(type_impl_sp->GetClangASTType(true).GetPointerType ());
+        if (pointer_ast_type)
+        {
+            lldb::DataBufferSP buffer(new lldb_private::DataBufferHeap(&address,sizeof(lldb::addr_t)));
+            
+            ExecutionContext exe_ctx (ExecutionContextRef(ExecutionContext(m_opaque_sp.get(),false)));
+            ValueObjectSP ptr_result_valobj_sp(ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope(),
+                                                                               pointer_ast_type,
+                                                                               ConstString(name),
+                                                                               buffer,
+                                                                               exe_ctx.GetByteOrder(),
+                                                                               exe_ctx.GetAddressByteSize()));
+            
+            if (ptr_result_valobj_sp)
+            {
+                ptr_result_valobj_sp->GetValue().SetValueType(Value::eValueTypeLoadAddress);
+                Error err;
+                new_value_sp = ptr_result_valobj_sp->Dereference(err);
+                if (new_value_sp)
+                    new_value_sp->SetName(ConstString(name));
+            }
+        }
+    }
+    sb_value.SetSP(new_value_sp);
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+    if (log)
+    {
+        if (new_value_sp)
+            log->Printf ("SBTarget(%p)::CreateValueFromAddress => \"%s\"", m_opaque_sp.get(), new_value_sp->GetName().AsCString());
+        else
+            log->Printf ("SBTarget(%p)::CreateValueFromAddress => NULL", m_opaque_sp.get());
+    }
+    return sb_value;
+}
+
 bool
 SBTarget::DeleteAllWatchpoints ()
 {
@@ -1905,6 +1982,8 @@ SBTarget::AddModule (const char *path,
         
         if (triple)
             module_spec.GetArchitecture().SetTriple (triple, target_sp->GetPlatform ().get());
+        else
+            module_spec.GetArchitecture() = target_sp->GetArchitecture();
         
         if (symfile)
             module_spec.GetSymbolFileSpec ().SetFile(symfile, false);
diff --git a/contrib/llvm/tools/lldb/source/API/SBThread.cpp b/contrib/llvm/tools/lldb/source/API/SBThread.cpp
index 2752620c9ba..4170d5b230b 100644
--- a/contrib/llvm/tools/lldb/source/API/SBThread.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBThread.cpp
@@ -20,6 +20,7 @@
 #include "lldb/Core/Stream.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Target/SystemRuntime.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Symbol/SymbolContext.h"
@@ -432,7 +433,6 @@ SBThread::SetThread (const ThreadSP& lldb_object_sp)
     m_opaque_sp->SetThreadSP (lldb_object_sp);
 }
 
-
 lldb::tid_t
 SBThread::GetThreadID () const
 {
@@ -507,6 +507,34 @@ SBThread::GetQueueName () const
     return name;
 }
 
+lldb::queue_id_t
+SBThread::GetQueueID () const
+{
+    queue_id_t id = LLDB_INVALID_QUEUE_ID;
+    Mutex::Locker api_locker;
+    ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker);
+
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+    if (exe_ctx.HasThreadScope())
+    {
+        Process::StopLocker stop_locker;
+        if (stop_locker.TryLock(&exe_ctx.GetProcessPtr()->GetRunLock()))
+        {
+            id = exe_ctx.GetThreadPtr()->GetQueueID();
+        }
+        else
+        {
+            if (log)
+                log->Printf ("SBThread(%p)::GetQueueID() => error: process is running", exe_ctx.GetThreadPtr());
+        }
+    }
+    
+    if (log)
+        log->Printf ("SBThread(%p)::GetQueueID () => 0x%" PRIx64, exe_ctx.GetThreadPtr(), id);
+
+    return id;
+}
+
 SBError
 SBThread::ResumeNewPlan (ExecutionContext &exe_ctx, ThreadPlan *new_plan)
 {
@@ -909,6 +937,31 @@ SBThread::StepOverUntil (lldb::SBFrame &sb_frame,
     return sb_error;
 }
 
+SBError
+SBThread::JumpToLine (lldb::SBFileSpec &file_spec, uint32_t line)
+{
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+    SBError sb_error;
+
+    Mutex::Locker api_locker;
+    ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker);
+
+    if (log)
+        log->Printf ("SBThread(%p)::JumpToLine (file+line = %s:%u)", exe_ctx.GetThreadPtr(), file_spec->GetPath().c_str(), line);
+
+    if (!exe_ctx.HasThreadScope())
+    {
+        sb_error.SetErrorString("this SBThread object is invalid");
+        return sb_error;
+    }
+
+    Thread *thread = exe_ctx.GetThreadPtr();
+
+    Error err = thread->JumpToLine (file_spec.get(), line, true);
+    sb_error.SetError (err);
+    return sb_error;
+}
+
 SBError
 SBThread::ReturnFromFrame (SBFrame &frame, SBValue &return_value)
 {
@@ -1227,3 +1280,64 @@ SBThread::GetDescription (SBStream &description) const
     
     return true;
 }
+
+SBThread
+SBThread::GetExtendedBacktraceThread (const char *type)
+{
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
+    Mutex::Locker api_locker;
+    ExecutionContext exe_ctx (m_opaque_sp.get(), api_locker);
+    SBThread sb_origin_thread;
+
+    if (exe_ctx.HasThreadScope())
+    {
+        Process::StopLocker stop_locker;
+        if (stop_locker.TryLock(&exe_ctx.GetProcessPtr()->GetRunLock()))
+        {
+            ThreadSP real_thread(exe_ctx.GetThreadSP());
+            if (real_thread)
+            {
+                ConstString type_const (type);
+                Process *process = exe_ctx.GetProcessPtr();
+                if (process)
+                {
+                    SystemRuntime *runtime = process->GetSystemRuntime();
+                    if (runtime)
+                    {
+                        ThreadSP new_thread_sp (runtime->GetExtendedBacktraceThread (real_thread, type_const));
+                        if (new_thread_sp)
+                        {
+                            // Save this in the Process' ExtendedThreadList so a strong pointer retains the
+                            // object.
+                            process->GetExtendedThreadList().AddThread (new_thread_sp);
+                            sb_origin_thread.SetThread (new_thread_sp);
+                            if (log)
+                            {
+                                const char *queue_name = new_thread_sp->GetQueueName();
+                                if (queue_name == NULL)
+                                    queue_name = "";
+                                log->Printf ("SBThread(%p)::GetExtendedBacktraceThread() => new extended Thread created (%p) with queue_id 0x%" PRIx64 " queue name '%s'", exe_ctx.GetThreadPtr(), new_thread_sp.get(), new_thread_sp->GetQueueID(), queue_name);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (log)
+                log->Printf ("SBThread(%p)::GetExtendedBacktraceThread() => error: process is running", exe_ctx.GetThreadPtr());
+        }
+    }
+
+    return sb_origin_thread;
+}
+
+uint32_t
+SBThread::GetExtendedBacktraceOriginatingIndexID ()
+{
+    ThreadSP thread_sp(m_opaque_sp->GetThreadSP());
+    if (thread_sp)
+        return thread_sp->GetExtendedBacktraceOriginatingIndexID();
+    return LLDB_INVALID_INDEX32;
+}
diff --git a/contrib/llvm/tools/lldb/source/API/SBType.cpp b/contrib/llvm/tools/lldb/source/API/SBType.cpp
index 372d073acf1..3055c275208 100644
--- a/contrib/llvm/tools/lldb/source/API/SBType.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBType.cpp
@@ -7,12 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <string.h>
-
-#include "clang/AST/ASTContext.h"
-#include "clang/AST/TemplateBase.h"
-#include "clang/AST/Type.h"
-
 #include "lldb/API/SBDefines.h"
 #include "lldb/API/SBType.h"
 #include "lldb/API/SBStream.h"
@@ -69,8 +63,10 @@ SBType::operator == (SBType &rhs)
     if (IsValid() == false)
         return !rhs.IsValid();
     
-    return  (rhs.m_opaque_sp->GetASTContext() == m_opaque_sp->GetASTContext()) &&
-            (rhs.m_opaque_sp->GetOpaqueQualType() == m_opaque_sp->GetOpaqueQualType());
+    if (rhs.IsValid() == false)
+        return false;
+    
+    return *m_opaque_sp.get() == *rhs.m_opaque_sp.get();
 }
 
 bool
@@ -78,9 +74,11 @@ SBType::operator != (SBType &rhs)
 {    
     if (IsValid() == false)
         return rhs.IsValid();
-
-    return  (rhs.m_opaque_sp->GetASTContext() != m_opaque_sp->GetASTContext()) ||
-            (rhs.m_opaque_sp->GetOpaqueQualType() != m_opaque_sp->GetOpaqueQualType());
+    
+    if (rhs.IsValid() == false)
+        return true;
+    
+    return *m_opaque_sp.get() != *rhs.m_opaque_sp.get();
 }
 
 lldb::TypeImplSP
@@ -142,7 +140,7 @@ SBType::GetByteSize()
     if (!IsValid())
         return 0;
     
-    return m_opaque_sp->GetClangASTType().GetByteSize();
+    return m_opaque_sp->GetClangASTType(false).GetByteSize();
     
 }
 
@@ -151,7 +149,7 @@ SBType::IsPointerType()
 {
     if (!IsValid())
         return false;
-    return m_opaque_sp->GetClangASTType().IsPointerType();
+    return m_opaque_sp->GetClangASTType(true).IsPointerType();
 }
 
 bool
@@ -159,7 +157,7 @@ SBType::IsReferenceType()
 {
     if (!IsValid())
         return false;
-    return m_opaque_sp->GetClangASTType().IsReferenceType();
+    return m_opaque_sp->GetClangASTType(true).IsReferenceType();
 }
 
 SBType
@@ -168,7 +166,7 @@ SBType::GetPointerType()
     if (!IsValid())
         return SBType();
 
-    return SBType(ClangASTType(m_opaque_sp->GetClangASTType().GetPointerType()));
+    return SBType(TypeImplSP(new TypeImpl(m_opaque_sp->GetPointerType())));
 }
 
 SBType
@@ -176,7 +174,7 @@ SBType::GetPointeeType()
 {
     if (!IsValid())
         return SBType();
-    return SBType(ClangASTType(m_opaque_sp->GetClangASTType().GetPointeeType()));
+    return SBType(TypeImplSP(new TypeImpl(m_opaque_sp->GetPointeeType())));
 }
 
 SBType
@@ -184,7 +182,7 @@ SBType::GetReferenceType()
 {
     if (!IsValid())
         return SBType();
-    return SBType(ClangASTType(m_opaque_sp->GetClangASTType().GetLValueReferenceType()));
+    return SBType(TypeImplSP(new TypeImpl(m_opaque_sp->GetReferenceType())));
 }
 
 SBType
@@ -192,7 +190,7 @@ SBType::GetDereferencedType()
 {
     if (!IsValid())
         return SBType();
-    return SBType(ClangASTType(m_opaque_sp->GetClangASTType().GetNonReferenceType()));
+    return SBType(TypeImplSP(new TypeImpl(m_opaque_sp->GetDereferencedType())));
 }
 
 bool 
@@ -200,7 +198,7 @@ SBType::IsFunctionType ()
 {
     if (!IsValid())
         return false;
-    return m_opaque_sp->GetClangASTType().IsFunctionType();
+    return m_opaque_sp->GetClangASTType(true).IsFunctionType();
 }
 
 bool
@@ -208,7 +206,7 @@ SBType::IsPolymorphicClass ()
 {
     if (!IsValid())
         return false;
-    return m_opaque_sp->GetClangASTType().IsPolymorphicClass();
+    return m_opaque_sp->GetClangASTType(true).IsPolymorphicClass();
 }
 
 
@@ -218,7 +216,7 @@ SBType::GetFunctionReturnType ()
 {
     if (IsValid())
     {
-        ClangASTType return_clang_type (m_opaque_sp->GetClangASTType().GetFunctionReturnType());
+        ClangASTType return_clang_type (m_opaque_sp->GetClangASTType(true).GetFunctionReturnType());
         if (return_clang_type.IsValid())
             return SBType(return_clang_type);
     }
@@ -231,13 +229,13 @@ SBType::GetFunctionArgumentTypes ()
     SBTypeList sb_type_list;
     if (IsValid())
     {
-        QualType qual_type(QualType::getFromOpaquePtr(m_opaque_sp->GetOpaqueQualType()));
-        const FunctionProtoType* func = dyn_cast<FunctionProtoType>(qual_type.getTypePtr());
-        if (func)
+        ClangASTType func_type(m_opaque_sp->GetClangASTType(true));
+        size_t count = func_type.GetNumberOfFunctionArguments();
+        for (size_t i = 0;
+             i < count;
+             i++)
         {
-            const uint32_t num_args = func->getNumArgs();
-            for (uint32_t i=0; i<num_args; ++i)
-                sb_type_list.Append (SBType(ClangASTType(m_opaque_sp->GetASTContext(), func->getArgType(i).getAsOpaquePtr())));
+            sb_type_list.Append(SBType(func_type.GetFunctionArgumentAtIndex(i)));
         }
     }
     return sb_type_list;
@@ -248,14 +246,14 @@ SBType::GetUnqualifiedType()
 {
     if (!IsValid())
         return SBType();
-    return SBType(m_opaque_sp->GetClangASTType().GetFullyUnqualifiedType());
+    return SBType(TypeImplSP(new TypeImpl(m_opaque_sp->GetUnqualifiedType())));
 }
 
 lldb::SBType
 SBType::GetCanonicalType()
 {
     if (IsValid())
-        return SBType(m_opaque_sp->GetClangASTType().GetCanonicalType());
+        return SBType(TypeImplSP(new TypeImpl(m_opaque_sp->GetCanonicalType())));
     return SBType();
 }
 
@@ -264,7 +262,7 @@ lldb::BasicType
 SBType::GetBasicType()
 {
     if (IsValid())
-        return m_opaque_sp->GetClangASTType().GetBasicTypeEnumeration ();
+        return m_opaque_sp->GetClangASTType(false).GetBasicTypeEnumeration ();
     return eBasicTypeInvalid;
 }
 
@@ -272,7 +270,7 @@ SBType
 SBType::GetBasicType(lldb::BasicType basic_type)
 {
     if (IsValid())
-        return SBType (ClangASTContext::GetBasicType (m_opaque_sp->GetASTContext(), basic_type));
+        return SBType (ClangASTContext::GetBasicType (m_opaque_sp->GetClangASTContext(false), basic_type));
     return SBType();
 }
 
@@ -280,7 +278,7 @@ uint32_t
 SBType::GetNumberOfDirectBaseClasses ()
 {
     if (IsValid())
-        return m_opaque_sp->GetClangASTType().GetNumDirectBaseClasses();
+        return m_opaque_sp->GetClangASTType(true).GetNumDirectBaseClasses();
     return 0;
 }
 
@@ -288,7 +286,7 @@ uint32_t
 SBType::GetNumberOfVirtualBaseClasses ()
 {
     if (IsValid())
-        return m_opaque_sp->GetClangASTType().GetNumVirtualBaseClasses();
+        return m_opaque_sp->GetClangASTType(true).GetNumVirtualBaseClasses();
     return 0;
 }
 
@@ -296,7 +294,7 @@ uint32_t
 SBType::GetNumberOfFields ()
 {
     if (IsValid())
-        return m_opaque_sp->GetClangASTType().GetNumFields();
+        return m_opaque_sp->GetClangASTType(false).GetNumFields();
     return 0;
 }
 
@@ -323,7 +321,7 @@ SBType::GetDirectBaseClassAtIndex (uint32_t idx)
     SBTypeMember sb_type_member;
     if (IsValid())
     {
-        ClangASTType this_type (m_opaque_sp->GetClangASTType ());
+        ClangASTType this_type (m_opaque_sp->GetClangASTType (true));
         if (this_type.IsValid())
         {
             uint32_t bit_offset = 0;
@@ -344,7 +342,7 @@ SBType::GetVirtualBaseClassAtIndex (uint32_t idx)
     SBTypeMember sb_type_member;
     if (IsValid())
     {
-        ClangASTType this_type (m_opaque_sp->GetClangASTType ());
+        ClangASTType this_type (m_opaque_sp->GetClangASTType (true));
         if (this_type.IsValid())
         {
             uint32_t bit_offset = 0;
@@ -364,7 +362,7 @@ SBType::GetFieldAtIndex (uint32_t idx)
     SBTypeMember sb_type_member;
     if (IsValid())
     {
-        ClangASTType this_type (m_opaque_sp->GetClangASTType ());
+        ClangASTType this_type (m_opaque_sp->GetClangASTType (false));
         if (this_type.IsValid())
         {
             uint64_t bit_offset = 0;
@@ -397,7 +395,7 @@ SBType::IsTypeComplete()
 {
     if (!IsValid())
         return false;    
-    return m_opaque_sp->GetClangASTType().IsCompleteType();
+    return m_opaque_sp->GetClangASTType(false).IsCompleteType();
 }
 
 const char*
@@ -405,14 +403,14 @@ SBType::GetName()
 {
     if (!IsValid())
         return "";
-    return m_opaque_sp->GetClangASTType().GetConstTypeName().GetCString();
+    return m_opaque_sp->GetName().GetCString();
 }
 
 lldb::TypeClass
 SBType::GetTypeClass ()
 {
     if (IsValid())
-        return m_opaque_sp->GetClangASTType().GetTypeClass();
+        return m_opaque_sp->GetClangASTType(false).GetTypeClass();
     return lldb::eTypeClassInvalid;
 }
 
@@ -420,7 +418,7 @@ uint32_t
 SBType::GetNumberOfTemplateArguments ()
 {
     if (IsValid())
-        return m_opaque_sp->GetClangASTType().GetNumTemplateArguments();
+        return m_opaque_sp->GetClangASTType(false).GetNumTemplateArguments();
     return 0;
 }
 
@@ -430,7 +428,7 @@ SBType::GetTemplateArgumentType (uint32_t idx)
     if (IsValid())
     {
         TemplateArgumentKind kind = eTemplateArgumentKindNull;
-        ClangASTType template_arg_type = m_opaque_sp->GetClangASTType().GetTemplateArgument (idx, kind);
+        ClangASTType template_arg_type = m_opaque_sp->GetClangASTType(false).GetTemplateArgument (idx, kind);
         if (template_arg_type.IsValid())
             return SBType(template_arg_type);
     }
@@ -443,7 +441,7 @@ SBType::GetTemplateArgumentKind (uint32_t idx)
 {
     TemplateArgumentKind kind = eTemplateArgumentKindNull;
     if (IsValid())
-        m_opaque_sp->GetClangASTType().GetTemplateArgument (idx, kind);
+        m_opaque_sp->GetClangASTType(false).GetTemplateArgument (idx, kind);
     return kind;
 }
 
diff --git a/contrib/llvm/tools/lldb/source/API/SBTypeCategory.cpp b/contrib/llvm/tools/lldb/source/API/SBTypeCategory.cpp
index e3978693c81..08fdefad1be 100644
--- a/contrib/llvm/tools/lldb/source/API/SBTypeCategory.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBTypeCategory.cpp
@@ -84,10 +84,10 @@ SBTypeCategory::GetName()
 uint32_t
 SBTypeCategory::GetNumFormats ()
 {
-    if (!IsDefaultCategory())
+    if (!IsValid())
         return 0;
     
-    return DataVisualization::ValueFormats::GetCount();
+    return m_opaque_sp->GetValueNavigator()->GetCount() + m_opaque_sp->GetRegexValueNavigator()->GetCount();
 }
 
 uint32_t
@@ -127,9 +127,9 @@ SBTypeCategory::GetTypeNameSpecifierForFilterAtIndex (uint32_t index)
 lldb::SBTypeNameSpecifier
 SBTypeCategory::GetTypeNameSpecifierForFormatAtIndex (uint32_t index)
 {
-    if (!IsDefaultCategory())
+    if (!IsValid())
         return SBTypeNameSpecifier();
-    return SBTypeNameSpecifier(DataVisualization::ValueFormats::GetTypeNameSpecifierForFormatAtIndex(index));
+    return SBTypeNameSpecifier(m_opaque_sp->GetTypeNameSpecifierForFormatAtIndex(index));
 }
 
 lldb::SBTypeNameSpecifier
@@ -177,16 +177,23 @@ SBTypeCategory::GetFilterForType (SBTypeNameSpecifier spec)
 SBTypeFormat
 SBTypeCategory::GetFormatForType (SBTypeNameSpecifier spec)
 {
-    if (!IsDefaultCategory())
+    if (!IsValid())
         return SBTypeFormat();
         
     if (!spec.IsValid())
         return SBTypeFormat();
     
-    if (spec.IsRegex())
-        return SBTypeFormat();
+    lldb::TypeFormatImplSP format_sp;
     
-    return SBTypeFormat(DataVisualization::ValueFormats::GetFormat(ConstString(spec.GetName())));
+    if (spec.IsRegex())
+        m_opaque_sp->GetRegexValueNavigator()->GetExact(ConstString(spec.GetName()), format_sp);
+    else
+        m_opaque_sp->GetValueNavigator()->GetExact(ConstString(spec.GetName()), format_sp);
+    
+    if (!format_sp)
+        return lldb::SBTypeFormat();
+    
+    return lldb::SBTypeFormat(format_sp);
 }
 
 #ifndef LLDB_DISABLE_PYTHON
@@ -259,9 +266,9 @@ SBTypeCategory::GetFilterAtIndex (uint32_t index)
 SBTypeFormat
 SBTypeCategory::GetFormatAtIndex (uint32_t index)
 {
-    if (!IsDefaultCategory())
+    if (!IsValid())
         return SBTypeFormat();
-    return SBTypeFormat(DataVisualization::ValueFormats::GetFormatAtIndex((index)));
+    return SBTypeFormat(m_opaque_sp->GetFormatAtIndex((index)));
 }
 
 #ifndef LLDB_DISABLE_PYTHON
@@ -295,7 +302,7 @@ bool
 SBTypeCategory::AddTypeFormat (SBTypeNameSpecifier type_name,
                                SBTypeFormat format)
 {
-    if (!IsDefaultCategory())
+    if (!IsValid())
         return false;
     
     if (!type_name.IsValid())
@@ -305,9 +312,9 @@ SBTypeCategory::AddTypeFormat (SBTypeNameSpecifier type_name,
         return false;
     
     if (type_name.IsRegex())
-        return false;
-    
-    DataVisualization::ValueFormats::Add(ConstString(type_name.GetName()), format.GetSP());
+        m_opaque_sp->GetRegexValueNavigator()->Add(lldb::RegularExpressionSP(new RegularExpression(type_name.GetName())), format.GetSP());
+    else
+        m_opaque_sp->GetValueNavigator()->Add(ConstString(type_name.GetName()), format.GetSP());
     
     return true;
 }
@@ -315,16 +322,16 @@ SBTypeCategory::AddTypeFormat (SBTypeNameSpecifier type_name,
 bool
 SBTypeCategory::DeleteTypeFormat (SBTypeNameSpecifier type_name)
 {
-    if (!IsDefaultCategory())
+    if (!IsValid())
         return false;
     
     if (!type_name.IsValid())
         return false;
     
     if (type_name.IsRegex())
-        return false;
-
-    return DataVisualization::ValueFormats::Delete(ConstString(type_name.GetName()));
+        return m_opaque_sp->GetRegexValueNavigator()->Delete(ConstString(type_name.GetName()));
+    else
+        return m_opaque_sp->GetValueNavigator()->Delete(ConstString(type_name.GetName()));
 }
 
 #ifndef LLDB_DISABLE_PYTHON
diff --git a/contrib/llvm/tools/lldb/source/API/SBTypeNameSpecifier.cpp b/contrib/llvm/tools/lldb/source/API/SBTypeNameSpecifier.cpp
index d417499ecbd..3d03c6a0c53 100644
--- a/contrib/llvm/tools/lldb/source/API/SBTypeNameSpecifier.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBTypeNameSpecifier.cpp
@@ -36,7 +36,7 @@ SBTypeNameSpecifier::SBTypeNameSpecifier (SBType type) :
 m_opaque_sp()
 {
     if (type.IsValid())
-        m_opaque_sp = TypeNameSpecifierImplSP(new TypeNameSpecifierImpl(type.m_opaque_sp->GetClangASTType()));
+        m_opaque_sp = TypeNameSpecifierImplSP(new TypeNameSpecifierImpl(type.m_opaque_sp->GetClangASTType(true)));
 }
 
 SBTypeNameSpecifier::SBTypeNameSpecifier (const lldb::SBTypeNameSpecifier &rhs) :
diff --git a/contrib/llvm/tools/lldb/source/API/SBValue.cpp b/contrib/llvm/tools/lldb/source/API/SBValue.cpp
index aa9b23ac7c6..51b6790dd2b 100644
--- a/contrib/llvm/tools/lldb/source/API/SBValue.cpp
+++ b/contrib/llvm/tools/lldb/source/API/SBValue.cpp
@@ -63,20 +63,20 @@ public:
                lldb::DynamicValueType use_dynamic,
                bool use_synthetic,
                const char *name = NULL) :
-        m_valobj_sp(in_valobj_sp),
-        m_use_dynamic(use_dynamic),
-        m_use_synthetic(use_synthetic),
-        m_name (name)
+    m_valobj_sp(in_valobj_sp),
+    m_use_dynamic(use_dynamic),
+    m_use_synthetic(use_synthetic),
+    m_name (name)
     {
         if (!m_name.IsEmpty() && m_valobj_sp)
             m_valobj_sp->SetName(m_name);
     }
     
     ValueImpl (const ValueImpl& rhs) :
-        m_valobj_sp(rhs.m_valobj_sp),
-        m_use_dynamic(rhs.m_use_dynamic),
-        m_use_synthetic(rhs.m_use_synthetic),
-        m_name (rhs.m_name)
+    m_valobj_sp(rhs.m_valobj_sp),
+    m_use_dynamic(rhs.m_use_dynamic),
+    m_use_synthetic(rhs.m_use_synthetic),
+    m_name (rhs.m_name)
     {
     }
     
@@ -120,7 +120,7 @@ public:
         Target *target = value_sp->GetTargetSP().get();
         if (target)
             api_locker.Lock(target->GetAPIMutex());
-
+        
         ProcessSP process_sp(value_sp->GetProcessSP());
         if (process_sp && !stop_locker.TryLock (&process_sp->GetRunLock()))
         {
@@ -131,7 +131,7 @@ public:
             error.SetErrorString ("process must be stopped.");
             return ValueObjectSP();
         }
-
+        
         if (value_sp->GetDynamicValue(m_use_dynamic))
             value_sp = value_sp->GetDynamicValue(m_use_dynamic);
         if (value_sp->GetSyntheticValue(m_use_synthetic))
@@ -167,7 +167,7 @@ public:
     {
         return m_use_synthetic;
     }
-
+    
     // All the derived values that we would make from the m_valobj_sp will share
     // the ExecutionContext with m_valobj_sp, so we don't need to do the calculations
     // in GetSP to return the Target, Process, Thread or Frame.  It is convenient to
@@ -207,7 +207,7 @@ public:
         else
             return StackFrameSP();
     }
-
+    
 private:
     lldb::ValueObjectSP m_valobj_sp;
     lldb::DynamicValueType m_use_dynamic;
@@ -227,7 +227,7 @@ public:
     {
         return in_value.GetSP(m_stop_locker, m_api_locker, m_lock_error);
     }
-
+    
     Error &
     GetError()
     {
@@ -238,11 +238,11 @@ private:
     Process::StopLocker m_stop_locker;
     Mutex::Locker m_api_locker;
     Error m_lock_error;
-
+    
 };
 
 SBValue::SBValue () :
-    m_opaque_sp ()
+m_opaque_sp ()
 {
 }
 
@@ -318,7 +318,7 @@ SBValue::GetName()
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
         name = value_sp->GetName().GetCString();
-
+    
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
     if (log)
     {
@@ -327,7 +327,7 @@ SBValue::GetName()
         else
             log->Printf ("SBValue(%p)::GetName () => NULL", value_sp.get());
     }
-
+    
     return name;
 }
 
@@ -350,7 +350,7 @@ SBValue::GetTypeName ()
         else
             log->Printf ("SBValue(%p)::GetTypeName () => NULL", value_sp.get());
     }
-
+    
     return name;
 }
 
@@ -359,17 +359,17 @@ SBValue::GetByteSize ()
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
     size_t result = 0;
-
+    
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
     {
         result = value_sp->GetByteSize();
     }
-
+    
     if (log)
         log->Printf ("SBValue(%p)::GetByteSize () => %" PRIu64, value_sp.get(), (uint64_t)result);
-
+    
     return result;
 }
 
@@ -377,18 +377,18 @@ bool
 SBValue::IsInScope ()
 {
     bool result = false;
-
+    
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
     {
         result = value_sp->IsInScope ();
     }
-
+    
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
     if (log)
         log->Printf ("SBValue(%p)::IsInScope () => %i", value_sp.get(), result);
-
+    
     return result;
 }
 
@@ -396,7 +396,7 @@ const char *
 SBValue::GetValue ()
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
+    
     const char *cstr = NULL;
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
@@ -411,7 +411,7 @@ SBValue::GetValue ()
         else
             log->Printf ("SBValue(%p)::GetValue() => NULL", value_sp.get());
     }
-
+    
     return cstr;
 }
 
@@ -429,14 +429,14 @@ SBValue::GetValueType ()
     {
         switch (result)
         {
-        case eValueTypeInvalid:         log->Printf ("SBValue(%p)::GetValueType () => eValueTypeInvalid", value_sp.get()); break;
-        case eValueTypeVariableGlobal:  log->Printf ("SBValue(%p)::GetValueType () => eValueTypeVariableGlobal", value_sp.get()); break;
-        case eValueTypeVariableStatic:  log->Printf ("SBValue(%p)::GetValueType () => eValueTypeVariableStatic", value_sp.get()); break;
-        case eValueTypeVariableArgument:log->Printf ("SBValue(%p)::GetValueType () => eValueTypeVariableArgument", value_sp.get()); break;
-        case eValueTypeVariableLocal:   log->Printf ("SBValue(%p)::GetValueType () => eValueTypeVariableLocal", value_sp.get()); break;
-        case eValueTypeRegister:        log->Printf ("SBValue(%p)::GetValueType () => eValueTypeRegister", value_sp.get()); break;
-        case eValueTypeRegisterSet:     log->Printf ("SBValue(%p)::GetValueType () => eValueTypeRegisterSet", value_sp.get()); break;
-        case eValueTypeConstResult:     log->Printf ("SBValue(%p)::GetValueType () => eValueTypeConstResult", value_sp.get()); break;
+            case eValueTypeInvalid:         log->Printf ("SBValue(%p)::GetValueType () => eValueTypeInvalid", value_sp.get()); break;
+            case eValueTypeVariableGlobal:  log->Printf ("SBValue(%p)::GetValueType () => eValueTypeVariableGlobal", value_sp.get()); break;
+            case eValueTypeVariableStatic:  log->Printf ("SBValue(%p)::GetValueType () => eValueTypeVariableStatic", value_sp.get()); break;
+            case eValueTypeVariableArgument:log->Printf ("SBValue(%p)::GetValueType () => eValueTypeVariableArgument", value_sp.get()); break;
+            case eValueTypeVariableLocal:   log->Printf ("SBValue(%p)::GetValueType () => eValueTypeVariableLocal", value_sp.get()); break;
+            case eValueTypeRegister:        log->Printf ("SBValue(%p)::GetValueType () => eValueTypeRegister", value_sp.get()); break;
+            case eValueTypeRegisterSet:     log->Printf ("SBValue(%p)::GetValueType () => eValueTypeRegisterSet", value_sp.get()); break;
+            case eValueTypeConstResult:     log->Printf ("SBValue(%p)::GetValueType () => eValueTypeConstResult", value_sp.get()); break;
         }
     }
     return result;
@@ -473,7 +473,7 @@ SBValue::GetType()
     TypeImplSP type_sp;
     if (value_sp)
     {
-        type_sp.reset (new TypeImpl(value_sp->GetClangType()));
+        type_sp.reset (new TypeImpl(value_sp->GetTypeImpl()));
         sb_type.SetSP(type_sp);
     }
     if (log)
@@ -499,7 +499,7 @@ SBValue::GetValueDidChange ()
     }
     if (log)
         log->Printf ("SBValue(%p)::GetValueDidChange() => %i", value_sp.get(), result);
-
+    
     return result;
 }
 
@@ -571,7 +571,7 @@ SBValue::SetValueFromCString (const char *value_str, lldb::SBError& error)
     
     if (log)
         log->Printf ("SBValue(%p)::SetValueFromCString(\"%s\") => %i", value_sp.get(), value_str, success);
-
+    
     return success;
 }
 
@@ -671,7 +671,7 @@ SBValue::CreateChildAtOffset (const char *name, uint32_t offset, SBType type)
         TypeImplSP type_sp (type.GetSP());
         if (type.IsValid())
         {
-            sb_value.SetSP(value_sp->GetSyntheticChildAtOffset(offset, type_sp->GetClangASTType(), true),GetPreferDynamicValue(),GetPreferSyntheticValue(), name);
+            sb_value.SetSP(value_sp->GetSyntheticChildAtOffset(offset, type_sp->GetClangASTType(false), true),GetPreferDynamicValue(),GetPreferSyntheticValue(), name);
         }
     }
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
@@ -696,7 +696,7 @@ SBValue::Cast (SBType type)
     lldb::ValueObjectSP value_sp(GetSP(locker));
     TypeImplSP type_sp (type.GetSP());
     if (value_sp && type_sp)
-        sb_value.SetSP(value_sp->Cast(type_sp->GetClangASTType()),GetPreferDynamicValue(),GetPreferSyntheticValue());
+        sb_value.SetSP(value_sp->Cast(type_sp->GetClangASTType(false)),GetPreferDynamicValue(),GetPreferSyntheticValue());
     return sb_value;
 }
 
@@ -761,19 +761,19 @@ SBValue::CreateValueFromAddress(const char* name, lldb::addr_t address, SBType s
     lldb::TypeImplSP type_impl_sp (sb_type.GetSP());
     if (value_sp && type_impl_sp)
     {
-        ClangASTType pointee_ast_type(type_impl_sp->GetClangASTType().GetPointerType ());
-        if (pointee_ast_type)
+        ClangASTType pointer_ast_type(type_impl_sp->GetClangASTType(false).GetPointerType ());
+        if (pointer_ast_type)
         {
             lldb::DataBufferSP buffer(new lldb_private::DataBufferHeap(&address,sizeof(lldb::addr_t)));
-        
+            
             ExecutionContext exe_ctx (value_sp->GetExecutionContextRef());
             ValueObjectSP ptr_result_valobj_sp(ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope(),
-                                                                               pointee_ast_type,
+                                                                               pointer_ast_type,
                                                                                ConstString(name),
                                                                                buffer,
-                                                                               lldb::endian::InlHostByteOrder(), 
+                                                                               exe_ctx.GetByteOrder(),
                                                                                exe_ctx.GetAddressByteSize()));
-        
+            
             if (ptr_result_valobj_sp)
             {
                 ptr_result_valobj_sp->GetValue().SetValueType(Value::eValueTypeLoadAddress);
@@ -806,9 +806,9 @@ SBValue::CreateValueFromData (const char* name, SBData data, SBType type)
     if (value_sp)
     {
         ExecutionContext exe_ctx (value_sp->GetExecutionContextRef());
-
+        
         new_value_sp = ValueObjectConstResult::Create (exe_ctx.GetBestExecutionContextScope(),
-                                                       type.m_opaque_sp->GetClangASTType(),
+                                                       type.m_opaque_sp->GetClangASTType(false),
                                                        ConstString(name),
                                                        *data.m_opaque_sp,
                                                        LLDB_INVALID_ADDRESS);
@@ -837,7 +837,7 @@ SBValue::GetChildAtIndex (uint32_t idx)
     
     if (target_sp)
         use_dynamic = target_sp->GetPreferDynamicValue();
-
+    
     return GetChildAtIndex (idx, use_dynamic, can_create_synthetic);
 }
 
@@ -846,7 +846,7 @@ SBValue::GetChildAtIndex (uint32_t idx, lldb::DynamicValueType use_dynamic, bool
 {
     lldb::ValueObjectSP child_sp;
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
+    
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
@@ -870,7 +870,7 @@ SBValue::GetChildAtIndex (uint32_t idx, lldb::DynamicValueType use_dynamic, bool
     sb_value.SetSP (child_sp, use_dynamic, GetPreferSyntheticValue());
     if (log)
         log->Printf ("SBValue(%p)::GetChildAtIndex (%u) => SBValue(%p)", value_sp.get(), idx, value_sp.get());
-
+    
     return sb_value;
 }
 
@@ -913,9 +913,9 @@ SBValue::GetChildMemberWithName (const char *name, lldb::DynamicValueType use_dy
 {
     lldb::ValueObjectSP child_sp;
     const ConstString str_name (name);
-
+    
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
-
+    
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
@@ -925,10 +925,10 @@ SBValue::GetChildMemberWithName (const char *name, lldb::DynamicValueType use_dy
     
     SBValue sb_value;
     sb_value.SetSP(child_sp, use_dynamic_value, GetPreferSyntheticValue());
-
+    
     if (log)
         log->Printf ("SBValue(%p)::GetChildMemberWithName (name=\"%s\") => SBValue(%p)", value_sp.get(), name, value_sp.get());
-
+    
     return sb_value;
 }
 
@@ -1048,11 +1048,12 @@ SBValue::GetValueAsSigned(SBError& error, int64_t fail_value)
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
     {
-        Scalar scalar;
-        if (value_sp->ResolveValue (scalar))
-            return scalar.SLongLong (fail_value);
-        else
-            error.SetErrorString ("could not resolve value");
+        bool success = true;
+        uint64_t ret_val = fail_value;
+        ret_val = value_sp->GetValueAsSigned(fail_value, &success);
+        if (!success)
+            error.SetErrorString("could not resolve value");
+        return ret_val;
     }
     else
         error.SetErrorStringWithFormat ("could not get SBValue: %s", locker.GetError().AsCString());
@@ -1068,11 +1069,12 @@ SBValue::GetValueAsUnsigned(SBError& error, uint64_t fail_value)
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
     {
-        Scalar scalar;
-        if (value_sp->ResolveValue (scalar))
-            return scalar.ULongLong(fail_value);
-        else
+        bool success = true;
+        uint64_t ret_val = fail_value;
+        ret_val = value_sp->GetValueAsUnsigned(fail_value, &success);
+        if (!success)
             error.SetErrorString("could not resolve value");
+        return ret_val;
     }
     else
         error.SetErrorStringWithFormat ("could not get SBValue: %s", locker.GetError().AsCString());
@@ -1087,9 +1089,7 @@ SBValue::GetValueAsSigned(int64_t fail_value)
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
     {
-        Scalar scalar;
-        if (value_sp->ResolveValue (scalar))
-            return scalar.SLongLong(fail_value);
+        return value_sp->GetValueAsSigned(fail_value);
     }
     return fail_value;
 }
@@ -1101,9 +1101,7 @@ SBValue::GetValueAsUnsigned(uint64_t fail_value)
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
     {
-        Scalar scalar;
-        if (value_sp->ResolveValue (scalar))
-            return scalar.ULongLong(fail_value);
+        return value_sp->GetValueAsUnsigned(fail_value);
     }
     return fail_value;
 }
@@ -1117,7 +1115,7 @@ SBValue::MightHaveChildren ()
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
         has_children = value_sp->MightHaveChildren();
-
+    
     if (log)
         log->Printf ("SBValue(%p)::MightHaveChildren() => %i", value_sp.get(), has_children);
     return has_children;
@@ -1127,16 +1125,16 @@ uint32_t
 SBValue::GetNumChildren ()
 {
     uint32_t num_children = 0;
-
+    
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
         num_children = value_sp->GetNumChildren();
-
+    
     if (log)
         log->Printf ("SBValue(%p)::GetNumChildren () => %u", value_sp.get(), num_children);
-
+    
     return num_children;
 }
 
@@ -1149,13 +1147,13 @@ SBValue::Dereference ()
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
     {
-            Error error;
-            sb_value = value_sp->Dereference (error);
+        Error error;
+        sb_value = value_sp->Dereference (error);
     }
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
     if (log)
         log->Printf ("SBValue(%p)::Dereference () => SBValue(%p)", value_sp.get(), value_sp.get());
-
+    
     return sb_value;
 }
 
@@ -1163,17 +1161,17 @@ bool
 SBValue::TypeIsPointerType ()
 {
     bool is_ptr_type = false;
-
+    
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
         is_ptr_type = value_sp->IsPointerType();
-
+    
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_API));
     if (log)
         log->Printf ("SBValue(%p)::TypeIsPointerType () => %i", value_sp.get(), is_ptr_type);
-
-
+    
+    
     return is_ptr_type;
 }
 
@@ -1390,16 +1388,14 @@ bool
 SBValue::GetDescription (SBStream &description)
 {
     Stream &strm = description.ref();
-
+    
     ValueLocker locker;
     lldb::ValueObjectSP value_sp(GetSP(locker));
     if (value_sp)
-    {
-        ValueObject::DumpValueObject (strm, value_sp.get());
-    }
+        value_sp->Dump(strm);
     else
         strm.PutCString ("No value");
-
+    
     return true;
 }
 
@@ -1653,7 +1649,7 @@ SBValue::Watch (bool resolve_location, bool read, bool write, SBError &error)
         size_t byte_size = GetByteSize();
         if (byte_size == 0)
             return sb_watchpoint;
-                
+        
         uint32_t watch_type = 0;
         if (read)
             watch_type |= LLDB_WATCH_TYPE_READ;
@@ -1664,14 +1660,14 @@ SBValue::Watch (bool resolve_location, bool read, bool write, SBError &error)
         ClangASTType type (value_sp->GetClangType());
         WatchpointSP watchpoint_sp = target_sp->CreateWatchpoint(addr, byte_size, &type, watch_type, rc);
         error.SetError(rc);
-                
-        if (watchpoint_sp) 
+        
+        if (watchpoint_sp)
         {
             sb_watchpoint.SetSP (watchpoint_sp);
             Declaration decl;
             if (value_sp->GetDeclaration (decl))
             {
-                if (decl.GetFile()) 
+                if (decl.GetFile())
                 {
                     StreamString ss;
                     // True to show fullpath for declaration file.
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/Breakpoint.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/Breakpoint.cpp
index 9bc43814b48..32c0b1066f8 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/Breakpoint.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/Breakpoint.cpp
@@ -45,8 +45,9 @@ Breakpoint::GetEventIdentifier ()
 //----------------------------------------------------------------------
 // Breakpoint constructor
 //----------------------------------------------------------------------
-Breakpoint::Breakpoint(Target &target, SearchFilterSP &filter_sp, BreakpointResolverSP &resolver_sp) :
+Breakpoint::Breakpoint(Target &target, SearchFilterSP &filter_sp, BreakpointResolverSP &resolver_sp, bool hardware) :
     m_being_created(true),
+    m_hardware(hardware),
     m_target (target),
     m_filter_sp (filter_sp),
     m_resolver_sp (resolver_sp),
@@ -113,6 +114,12 @@ Breakpoint::GetLocationAtIndex (size_t index)
     return m_locations.GetByIndex(index);
 }
 
+void
+Breakpoint::RemoveInvalidLocations (const ArchSpec &arch)
+{
+    m_locations.RemoveInvalidLocations(arch);
+}
+
 // For each of the overall options we need to decide how they propagate to
 // the location options.  This will determine the precedence of options on
 // the breakpoint vs. its locations.
@@ -558,7 +565,7 @@ Breakpoint::GetDescription (Stream *s, lldb::DescriptionLevel level, bool show_l
         {
             s->Printf(", locations = %" PRIu64, (uint64_t)num_locations);
             if (num_resolved_locations > 0)
-                s->Printf(", resolved = %" PRIu64, (uint64_t)num_resolved_locations);
+                s->Printf(", resolved = %" PRIu64 ", hit count = %d", (uint64_t)num_resolved_locations, GetHitCount());
         }
         else
         {
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointList.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointList.cpp
index 5926663af7b..147ad36b040 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointList.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointList.cpp
@@ -68,13 +68,21 @@ BreakpointList::Remove (break_id_t break_id, bool notify)
     return false;
 }
 
+void
+BreakpointList::RemoveInvalidLocations (const ArchSpec &arch)
+{
+    Mutex::Locker locker(m_mutex);
+    for (const auto &bp_sp : m_breakpoints)
+        bp_sp->RemoveInvalidLocations(arch);
+}
+
+
 void
 BreakpointList::SetEnabledAll (bool enabled)
 {
     Mutex::Locker locker(m_mutex);
-    bp_collection::iterator pos, end = m_breakpoints.end();
-    for (pos = m_breakpoints.begin(); pos != end; ++pos)
-        (*pos)->SetEnabled (enabled);
+    for (const auto &bp_sp : m_breakpoints)
+        bp_sp->SetEnabled (enabled);
 }
 
 
@@ -163,10 +171,8 @@ BreakpointList::Dump (Stream *s) const
     s->Indent();
     s->Printf("BreakpointList with %u Breakpoints:\n", (uint32_t)m_breakpoints.size());
     s->IndentMore();
-    bp_collection::const_iterator pos;
-    bp_collection::const_iterator end = m_breakpoints.end();
-    for (pos = m_breakpoints.begin(); pos != end; ++pos)
-        (*pos)->Dump(s);
+    for (const auto &bp_sp : m_breakpoints)
+        bp_sp->Dump(s);
     s->IndentLess();
 }
 
@@ -204,13 +210,11 @@ BreakpointList::GetBreakpointAtIndex (size_t i) const
 }
 
 void
-BreakpointList::UpdateBreakpoints (ModuleList& module_list, bool added)
+BreakpointList::UpdateBreakpoints (ModuleList& module_list, bool added, bool delete_locations)
 {
     Mutex::Locker locker(m_mutex);
-    bp_collection::iterator end = m_breakpoints.end();
-    bp_collection::iterator pos;
-    for (pos = m_breakpoints.begin(); pos != end; ++pos)
-        (*pos)->ModulesChanged (module_list, added);
+    for (const auto &bp_sp : m_breakpoints)
+        bp_sp->ModulesChanged (module_list, added, delete_locations);
 
 }
 
@@ -218,10 +222,8 @@ void
 BreakpointList::UpdateBreakpointsWhenModuleIsReplaced (ModuleSP old_module_sp, ModuleSP new_module_sp)
 {
     Mutex::Locker locker(m_mutex);
-    bp_collection::iterator end = m_breakpoints.end();
-    bp_collection::iterator pos;
-    for (pos = m_breakpoints.begin(); pos != end; ++pos)
-        (*pos)->ModuleReplaced (old_module_sp, new_module_sp);
+    for (const auto &bp_sp : m_breakpoints)
+        bp_sp->ModuleReplaced (old_module_sp, new_module_sp);
 
 }
 
@@ -229,10 +231,8 @@ void
 BreakpointList::ClearAllBreakpointSites ()
 {
     Mutex::Locker locker(m_mutex);
-    bp_collection::iterator end = m_breakpoints.end();
-    bp_collection::iterator pos;
-    for (pos = m_breakpoints.begin(); pos != end; ++pos)
-        (*pos)->ClearAllBreakpointSites ();
+    for (const auto &bp_sp : m_breakpoints)
+        bp_sp->ClearAllBreakpointSites ();
 
 }
 
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp
index 1ec726dd52b..5009e862d84 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocation.cpp
@@ -291,9 +291,11 @@ BreakpointLocation::ConditionSaysStop (ExecutionContext &exe_ctx, Error &error)
     // constructor errors up to the debugger's Async I/O.
         
     ValueObjectSP result_value_sp;
-    const bool unwind_on_error = true;
-    const bool ignore_breakpoints = true;
-    const bool try_all_threads = true;
+    
+    EvaluateExpressionOptions options;
+    options.SetUnwindOnError(true);
+    options.SetIgnoreBreakpoints(true);
+    options.SetTryAllThreads(true);
     
     Error expr_error;
     
@@ -304,12 +306,9 @@ BreakpointLocation::ConditionSaysStop (ExecutionContext &exe_ctx, Error &error)
     ExecutionResults result_code =
     m_user_expression_sp->Execute(execution_errors,
                                   exe_ctx,
-                                  unwind_on_error,
-                                  ignore_breakpoints,
+                                  options,
                                   m_user_expression_sp,
-                                  result_variable_sp,
-                                  try_all_threads,
-                                  ClangUserExpression::kDefaultTimeout);
+                                  result_variable_sp);
     
     bool ret;
     
@@ -484,7 +483,7 @@ BreakpointLocation::ResolveBreakpointSite ()
     if (process == NULL)
         return false;
 
-    lldb::break_id_t new_id = process->CreateBreakpointSite (shared_from_this(), false);
+    lldb::break_id_t new_id = process->CreateBreakpointSite (shared_from_this(), m_owner.IsHardware());
 
     if (new_id == LLDB_INVALID_BREAK_ID)
     {
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
index 22a4ff0c68e..18147deca3e 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointLocationList.cpp
@@ -13,8 +13,11 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Breakpoint/BreakpointLocationList.h"
+
 #include "lldb/Breakpoint/BreakpointLocation.h"
 #include "lldb/Breakpoint/Breakpoint.h"
+#include "lldb/Core/ArchSpec.h"
+#include "lldb/Core/Module.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Target/Target.h"
 
@@ -41,7 +44,7 @@ BreakpointLocationList::Create (const Address &addr)
     Mutex::Locker locker (m_mutex);
     // The location ID is just the size of the location list + 1
     lldb::break_id_t bp_loc_id = ++m_next_id;
-    BreakpointLocationSP bp_loc_sp (new BreakpointLocation (bp_loc_id, m_owner, addr));
+    BreakpointLocationSP bp_loc_sp (new BreakpointLocation (bp_loc_id, m_owner, addr, LLDB_INVALID_THREAD_ID, m_owner.IsHardware()));
     m_locations.push_back (bp_loc_sp);
     m_address_to_location[addr] = bp_loc_sp;
     return bp_loc_sp;
@@ -74,19 +77,22 @@ BreakpointLocationList::FindIDByAddress (const Address &addr)
     return LLDB_INVALID_BREAK_ID;
 }
 
+static bool
+Compare (BreakpointLocationSP lhs, lldb::break_id_t val)
+{
+    return lhs->GetID() < val;
+}
+
 BreakpointLocationSP
 BreakpointLocationList::FindByID (lldb::break_id_t break_id) const
 {
-    BreakpointLocationSP bp_loc_sp;
     Mutex::Locker locker (m_mutex);
-    // We never remove a breakpoint locations, so the ID can be translated into
-    // the location index by subtracting 1
-    uint32_t idx = break_id - 1;
-    if (idx <= m_locations.size())
-    {
-        bp_loc_sp = m_locations[idx];
-    }
-    return bp_loc_sp;
+    collection::const_iterator end = m_locations.end();
+    collection::const_iterator pos = std::lower_bound(m_locations.begin(), end, break_id, Compare);
+    if (pos != end && (*pos)->GetID() == break_id)
+        return *(pos);
+    else
+        return BreakpointLocationSP();
 }
 
 size_t
@@ -286,7 +292,41 @@ BreakpointLocationList::RemoveLocation (const lldb::BreakpointLocationSP &bp_loc
     return false;
 }
 
-
+void
+BreakpointLocationList::RemoveInvalidLocations (const ArchSpec &arch)
+{
+    Mutex::Locker locker (m_mutex);
+    size_t idx = 0;
+    // Don't cache m_location.size() as it will change since we might
+    // remove locations from our vector...
+    while (idx < m_locations.size())
+    {
+        BreakpointLocation *bp_loc = m_locations[idx].get();
+        if (bp_loc->GetAddress().SectionWasDeleted())
+        {
+            // Section was deleted which means this breakpoint comes from a module
+            // that is no longer valid, so we should remove it.
+            m_locations.erase(m_locations.begin() + idx);
+            continue;
+        }
+        if (arch.IsValid())
+        {
+            ModuleSP module_sp (bp_loc->GetAddress().GetModule());
+            if (module_sp)
+            {
+                if (!arch.IsCompatibleMatch(module_sp->GetArchitecture()))
+                {
+                    // The breakpoint was in a module whose architecture is no longer
+                    // compatible with "arch", so we need to remove it
+                    m_locations.erase(m_locations.begin() + idx);
+                    continue;
+                }
+            }
+        }
+        // Only increment the index if we didn't remove the locations at index "idx"
+        ++idx;
+    }
+}
 
 void
 BreakpointLocationList::StartRecordingNewLocations (BreakpointLocationCollection &new_locations)
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolver.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolver.cpp
index b22fa1e6dbc..33b0ff40e35 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolver.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolver.cpp
@@ -23,9 +23,12 @@
 #include "lldb/Core/StreamString.h"
 #include "lldb/Symbol/SymbolContext.h"
 #include "lldb/Target/Target.h"
+#include "lldb/Symbol/CompileUnit.h"
+#include "lldb/Symbol/Function.h"
 #include "lldb/lldb-private-log.h"
 
 using namespace lldb_private;
+using namespace lldb;
 
 //----------------------------------------------------------------------
 // BreakpointResolver:
@@ -59,3 +62,144 @@ BreakpointResolver::ResolveBreakpoint (SearchFilter &filter)
     filter.Search (*this);
 }
 
+void
+BreakpointResolver::SetSCMatchesByLine (SearchFilter &filter, SymbolContextList &sc_list, bool skip_prologue, const char *log_ident)
+{
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS));
+
+    while (sc_list.GetSize() > 0)
+    {
+        SymbolContextList tmp_sc_list;
+        unsigned current_idx = 0;
+        SymbolContext sc;
+        bool first_entry = true;
+        
+        FileSpec match_file_spec;
+        uint32_t closest_line_number = UINT32_MAX;
+
+        // Pull out the first entry, and all the others that match its file spec, and stuff them in the tmp list.
+        while (current_idx < sc_list.GetSize())
+        {
+            bool matches;
+            
+            sc_list.GetContextAtIndex (current_idx, sc);
+            if (first_entry)
+            {
+                match_file_spec = sc.line_entry.file;
+                matches = true;
+                first_entry = false;
+            }
+            else
+                matches = (sc.line_entry.file == match_file_spec);
+            
+            if (matches)
+            {
+                tmp_sc_list.Append (sc);
+                sc_list.RemoveContextAtIndex(current_idx);
+                
+                // ResolveSymbolContext will always return a number that is >= the line number you pass in.
+                // So the smaller line number is always better.
+                if (sc.line_entry.line < closest_line_number)
+                    closest_line_number = sc.line_entry.line;
+            }
+            else
+                current_idx++;
+        }
+            
+        // Okay, we've found the closest line number match, now throw away all the others:
+        
+        current_idx = 0;
+        while (current_idx < tmp_sc_list.GetSize())
+        {
+            if (tmp_sc_list.GetContextAtIndex(current_idx, sc))
+            {
+                if (sc.line_entry.line != closest_line_number)
+                    tmp_sc_list.RemoveContextAtIndex(current_idx);
+                else
+                    current_idx++;
+            }
+        }
+        
+        // Next go through and see if there are line table entries that are contiguous, and if so keep only the
+        // first of the contiguous range:
+        
+        current_idx = 0;
+        std::map<Block *, lldb::addr_t> blocks_with_breakpoints;
+        
+        while (current_idx < tmp_sc_list.GetSize())
+        {
+            if (tmp_sc_list.GetContextAtIndex(current_idx, sc))
+            {
+                if (blocks_with_breakpoints.find (sc.block) != blocks_with_breakpoints.end())
+                    tmp_sc_list.RemoveContextAtIndex(current_idx);
+                else
+                {
+                    blocks_with_breakpoints.insert (std::pair<Block *, lldb::addr_t>(sc.block, sc.line_entry.range.GetBaseAddress().GetFileAddress()));
+                    current_idx++;
+                }
+            }
+        }
+        
+        // and make breakpoints out of the closest line number match.
+        
+        uint32_t tmp_sc_list_size = tmp_sc_list.GetSize();
+        
+        for (uint32_t i = 0; i < tmp_sc_list_size; i++)
+        {
+            if (tmp_sc_list.GetContextAtIndex(i, sc))
+            {
+                Address line_start = sc.line_entry.range.GetBaseAddress();
+                if (line_start.IsValid())
+                {
+                    if (filter.AddressPasses(line_start))
+                    {
+                        // If the line number is before the prologue end, move it there...
+                        bool skipped_prologue = false;
+                        if (skip_prologue)
+                        {
+                            if (sc.function)
+                            {
+                                Address prologue_addr(sc.function->GetAddressRange().GetBaseAddress());
+                                if (prologue_addr.IsValid() && (line_start == prologue_addr))
+                                {
+                                    const uint32_t prologue_byte_size = sc.function->GetPrologueByteSize();
+                                    if (prologue_byte_size)
+                                    {
+                                        prologue_addr.Slide(prologue_byte_size);
+                 
+                                        if (filter.AddressPasses(prologue_addr))
+                                        {
+                                            skipped_prologue = true;
+                                            line_start = prologue_addr;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    
+                        BreakpointLocationSP bp_loc_sp (m_breakpoint->AddLocation(line_start));
+                        if (log && bp_loc_sp && !m_breakpoint->IsInternal())
+                        {
+                            StreamString s;
+                            bp_loc_sp->GetDescription (&s, lldb::eDescriptionLevelVerbose);
+                            log->Printf ("Added location (skipped prologue: %s): %s \n", skipped_prologue ? "yes" : "no", s.GetData());
+                        }
+                    }
+                    else if (log)
+                    {
+                        log->Printf ("Breakpoint %s at file address 0x%" PRIx64 " didn't pass the filter.\n",
+                                     log_ident ? log_ident : "",
+                                     line_start.GetFileAddress());
+                    }
+                }
+                else
+                {
+                    if (log)
+                        log->Printf ("error: Unable to set breakpoint %s at file address 0x%" PRIx64 "\n",
+                                     log_ident ? log_ident : "",
+                                     line_start.GetFileAddress());
+                }
+            }
+        }
+    }
+}
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp
index 91a218fdb80..dcee2fd5412 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileLine.cpp
@@ -59,7 +59,6 @@ BreakpointResolverFileLine::SearchCallback
     SymbolContextList sc_list;
 
     assert (m_breakpoint != NULL);
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS));
     
     // There is a tricky bit here.  You can have two compilation units that #include the same file, and
     // in one of them the function at m_line_number is used (and so code and a line entry for it is generated) but in the
@@ -83,146 +82,13 @@ BreakpointResolverFileLine::SearchCallback
                 cu_sp->ResolveSymbolContext (m_file_spec, m_line_number, m_inlines, false, eSymbolContextEverything, sc_list);
         }
     }
-    
-    while (sc_list.GetSize() > 0)
-    {
-        SymbolContextList tmp_sc_list;
-        unsigned current_idx = 0;
-        SymbolContext sc;
-        bool first_entry = true;
-        
-        FileSpec match_file_spec;
-        uint32_t closest_line_number = UINT32_MAX;
+    StreamString s;
+    s.Printf ("for %s:%d ",
+                        m_file_spec.GetFilename().AsCString("<Unknown>"),
+                        m_line_number);
 
-        // Pull out the first entry, and all the others that match its file spec, and stuff them in the tmp list.
-        while (current_idx < sc_list.GetSize())
-        {
-            bool matches;
-            
-            sc_list.GetContextAtIndex (current_idx, sc);
-            if (first_entry)
-            {
-                match_file_spec = sc.line_entry.file;
-                matches = true;
-                first_entry = false;
-            }
-            else
-                matches = (sc.line_entry.file == match_file_spec);
-            
-            if (matches)
-            {
-                tmp_sc_list.Append (sc);
-                sc_list.RemoveContextAtIndex(current_idx);
-                
-                // ResolveSymbolContext will always return a number that is >= the line number you pass in.
-                // So the smaller line number is always better.
-                if (sc.line_entry.line < closest_line_number)
-                    closest_line_number = sc.line_entry.line;
-            }
-            else
-                current_idx++;
-        }
-            
-        // Okay, we've found the closest line number match, now throw away all the others:
-        
-        current_idx = 0;
-        while (current_idx < tmp_sc_list.GetSize())
-        {
-            if (tmp_sc_list.GetContextAtIndex(current_idx, sc))
-            {
-                if (sc.line_entry.line != closest_line_number)
-                    tmp_sc_list.RemoveContextAtIndex(current_idx);
-                else
-                    current_idx++;
-            }
-        }
-        
-        // Next go through and see if there are line table entries that are contiguous, and if so keep only the
-        // first of the contiguous range:
-        
-        lldb::addr_t last_end_addr = LLDB_INVALID_ADDRESS;
-        current_idx = 0;
-        while (current_idx < tmp_sc_list.GetSize())
-        {
-            if (tmp_sc_list.GetContextAtIndex(current_idx, sc))
-            {
-                lldb::addr_t start_file_addr = sc.line_entry.range.GetBaseAddress().GetFileAddress();
-                lldb::addr_t end_file_addr   = start_file_addr + sc.line_entry.range.GetByteSize();
-                
-                if (start_file_addr == last_end_addr)
-                    tmp_sc_list.RemoveContextAtIndex(current_idx);
-                else
-                    current_idx++;
+    SetSCMatchesByLine (filter, sc_list, m_skip_prologue, s.GetData());
 
-                last_end_addr = end_file_addr;
-            }
-        }
-        
-        // and make breakpoints out of the closest line number match.
-        
-        uint32_t tmp_sc_list_size = tmp_sc_list.GetSize();
-        
-        for (uint32_t i = 0; i < tmp_sc_list_size; i++)
-        {
-            if (tmp_sc_list.GetContextAtIndex(i, sc))
-            {
-                Address line_start = sc.line_entry.range.GetBaseAddress();
-                if (line_start.IsValid())
-                {
-                    if (filter.AddressPasses(line_start))
-                    {
-                        // If the line number is before the prologue end, move it there...
-                        bool skipped_prologue = false;
-                        if (m_skip_prologue)
-                        {
-                            if (sc.function)
-                            {
-                                Address prologue_addr(sc.function->GetAddressRange().GetBaseAddress());
-                                if (prologue_addr.IsValid() && (line_start == prologue_addr))
-                                {
-                                    const uint32_t prologue_byte_size = sc.function->GetPrologueByteSize();
-                                    if (prologue_byte_size)
-                                    {
-                                        prologue_addr.Slide(prologue_byte_size);
-                 
-                                        if (filter.AddressPasses(prologue_addr))
-                                        {
-                                            skipped_prologue = true;
-                                            line_start = prologue_addr;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    
-                        BreakpointLocationSP bp_loc_sp (m_breakpoint->AddLocation(line_start));
-                        if (log && bp_loc_sp && !m_breakpoint->IsInternal())
-                        {
-                            StreamString s;
-                            bp_loc_sp->GetDescription (&s, lldb::eDescriptionLevelVerbose);
-                            log->Printf ("Added location (skipped prologue: %s): %s \n", skipped_prologue ? "yes" : "no", s.GetData());
-                        }
-                    }
-                    else if (log)
-                    {
-                        log->Printf ("Breakpoint at file address 0x%" PRIx64 " for %s:%d didn't pass the filter.\n",
-                                     line_start.GetFileAddress(),
-                                     m_file_spec.GetFilename().AsCString("<Unknown>"),
-                                     m_line_number);
-                    }
-                }
-                else
-                {
-                    if (log)
-                        log->Printf ("error: Unable to set breakpoint at file address 0x%" PRIx64 " for %s:%d\n",
-                                     line_start.GetFileAddress(),
-                                     m_file_spec.GetFilename().AsCString("<Unknown>"),
-                                     m_line_number);
-                }
-            }
-        }
-    }
-        
     return Searcher::eCallbackReturnContinue;
 }
 
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp
index de974d04894..01aecee7b9c 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverFileRegex.cpp
@@ -54,60 +54,23 @@ BreakpointResolverFileRegex::SearchCallback
     assert (m_breakpoint != NULL);
     if (!context.target_sp)
         return eCallbackReturnContinue;
-        
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_BREAKPOINTS));
 
     CompileUnit *cu = context.comp_unit;
     FileSpec cu_file_spec = *(static_cast<FileSpec *>(cu));
     std::vector<uint32_t> line_matches;
-    context.target_sp->GetSourceManager().FindLinesMatchingRegex(cu_file_spec, m_regex, 1, UINT32_MAX, line_matches); 
+    context.target_sp->GetSourceManager().FindLinesMatchingRegex(cu_file_spec, m_regex, 1, UINT32_MAX, line_matches);
+    
     uint32_t num_matches = line_matches.size();
     for (uint32_t i = 0; i < num_matches; i++)
     {
-        uint32_t start_idx = 0;
-        bool exact = false;
-        while (1)
-        {
-            LineEntry line_entry;
+        SymbolContextList sc_list;
+        const bool search_inlines = false;
+        const bool exact = false;
         
-            // Cycle through all the line entries that might match this one:
-            start_idx = cu->FindLineEntry (start_idx, line_matches[i], NULL, exact, &line_entry);
-            if (start_idx == UINT32_MAX)
-                break;
-            exact = true;
-            start_idx++;
-            
-            Address line_start = line_entry.range.GetBaseAddress();
-            if (line_start.IsValid())
-            {
-                if (filter.AddressPasses(line_start))
-                {
-                    BreakpointLocationSP bp_loc_sp (m_breakpoint->AddLocation(line_start));
-                    if (log && bp_loc_sp && !m_breakpoint->IsInternal())
-                    {
-                        StreamString s;
-                        bp_loc_sp->GetDescription (&s, lldb::eDescriptionLevelVerbose);
-                        log->Printf ("Added location: %s\n", s.GetData());
-                    }
-                }
-                else if (log)
-                {
-                    log->Printf ("Breakpoint at file address 0x%" PRIx64 " for %s:%d didn't pass filter.\n",
-                                 line_start.GetFileAddress(),
-                                 cu_file_spec.GetFilename().AsCString("<Unknown>"),
-                                 line_matches[i]);
-                }
-            }
-            else
-            {
-                if (log)
-                    log->Printf ("error: Unable to set breakpoint at file address 0x%" PRIx64 " for %s:%d\n",
-                                 line_start.GetFileAddress(),
-                                 cu_file_spec.GetFilename().AsCString("<Unknown>"),
-                                 line_matches[i]);
-            }
-
-        }
+        cu->ResolveSymbolContext (cu_file_spec, line_matches[i], search_inlines, exact, eSymbolContextEverything, sc_list);
+        const bool skip_prologue = true;
+        
+        BreakpointResolver::SetSCMatchesByLine (filter, sc_list, skip_prologue, m_regex.GetText());
     }
     assert (m_breakpoint != NULL);        
 
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverName.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverName.cpp
index 27f85653d64..c82dd5ee050 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverName.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/BreakpointResolverName.cpp
@@ -289,7 +289,17 @@ BreakpointResolverName::SearchCallback
                 }
                 else if (sc.symbol)
                 {
-                    break_addr = sc.symbol->GetAddress();
+                    if (sc.symbol->GetType() == eSymbolTypeReExported)
+                    {
+                        const Symbol *actual_symbol = sc.symbol->ResolveReExportedSymbol(m_breakpoint->GetTarget());
+                        if (actual_symbol)
+                            break_addr = actual_symbol->GetAddress();
+                    }
+                    else
+                    {
+                        break_addr = sc.symbol->GetAddress();
+                    }
+                    
                     if (m_skip_prologue && break_addr.IsValid())
                     {
                         const uint32_t prologue_byte_size = sc.symbol->GetPrologueByteSize();
diff --git a/contrib/llvm/tools/lldb/source/Breakpoint/StoppointLocation.cpp b/contrib/llvm/tools/lldb/source/Breakpoint/StoppointLocation.cpp
index 092caa5a932..9d8d9241253 100644
--- a/contrib/llvm/tools/lldb/source/Breakpoint/StoppointLocation.cpp
+++ b/contrib/llvm/tools/lldb/source/Breakpoint/StoppointLocation.cpp
@@ -23,8 +23,8 @@ using namespace lldb_private;
 StoppointLocation::StoppointLocation (break_id_t bid, addr_t addr, bool hardware) :
     m_loc_id(bid),
     m_addr(addr),
-    m_hw_preferred(hardware),
-    m_hw_index(LLDB_INVALID_INDEX32),
+    m_hardware(hardware),
+    m_hardware_index(LLDB_INVALID_INDEX32),
     m_byte_size(0),
     m_hit_count(0)
 {
@@ -33,8 +33,8 @@ StoppointLocation::StoppointLocation (break_id_t bid, addr_t addr, bool hardware
 StoppointLocation::StoppointLocation (break_id_t bid, addr_t addr, uint32_t byte_size, bool hardware) :
     m_loc_id(bid),
     m_addr(addr),
-    m_hw_preferred(hardware),
-    m_hw_index(LLDB_INVALID_INDEX32),
+    m_hardware(hardware),
+    m_hardware_index(LLDB_INVALID_INDEX32),
     m_byte_size(byte_size),
     m_hit_count(0)
 {
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandCompletions.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandCompletions.cpp
index a9d2f21b9ba..970aa692bd2 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandCompletions.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandCompletions.cpp
@@ -11,7 +11,6 @@
 
 // C Includes
 #include <sys/stat.h>
-#include <dirent.h>
 #if defined(__APPLE__) || defined(__linux__)
 #include <pwd.h>
 #endif
@@ -121,6 +120,71 @@ CommandCompletions::SourceFiles
     return matches.GetSize();
 }
 
+typedef struct DiskFilesOrDirectoriesBaton
+{
+    const char *remainder;
+    char *partial_name_copy;
+    bool only_directories;
+    bool *saw_directory;
+    StringList *matches;
+    char *end_ptr;
+    size_t baselen;
+} DiskFilesOrDirectoriesBaton;
+
+FileSpec::EnumerateDirectoryResult DiskFilesOrDirectoriesCallback(void *baton, FileSpec::FileType file_type, const FileSpec &spec)
+{
+    const char *name = spec.GetFilename().AsCString();
+
+    const DiskFilesOrDirectoriesBaton *parameters = (DiskFilesOrDirectoriesBaton*)baton;
+    char *end_ptr = parameters->end_ptr;
+    char *partial_name_copy = parameters->partial_name_copy;
+    const char *remainder = parameters->remainder;
+
+    // Omit ".", ".." and any . files if the match string doesn't start with .
+    if (name[0] == '.')
+    {
+        if (name[1] == '\0')
+            return FileSpec::eEnumerateDirectoryResultNext;
+        else if (name[1] == '.' && name[2] == '\0')
+            return FileSpec::eEnumerateDirectoryResultNext;
+        else if (remainder[0] != '.')
+            return FileSpec::eEnumerateDirectoryResultNext;
+    }
+
+    // If we found a directory, we put a "/" at the end of the name.
+
+    if (remainder[0] == '\0' || strstr(name, remainder) == name)
+    {
+        if (strlen(name) + parameters->baselen >= PATH_MAX)
+            return FileSpec::eEnumerateDirectoryResultNext;
+
+        strcpy(end_ptr, name);
+
+        bool isa_directory = false;
+        if (file_type == FileSpec::eFileTypeDirectory)
+            isa_directory = true;
+        else if (file_type == FileSpec::eFileTypeSymbolicLink)
+        {
+            struct stat stat_buf;
+            if ((stat(partial_name_copy, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode))
+                isa_directory = true;
+        }
+
+        if (isa_directory)
+        {
+            *parameters->saw_directory = true;
+            size_t len = strlen(parameters->partial_name_copy);
+            partial_name_copy[len] = '/';
+            partial_name_copy[len + 1] = '\0';
+        }
+        if (parameters->only_directories && !isa_directory)
+            return FileSpec::eEnumerateDirectoryResultNext;
+        parameters->matches->AppendString(partial_name_copy);
+    }
+
+    return FileSpec::eEnumerateDirectoryResultNext;
+}
+
 static int
 DiskFilesOrDirectories 
 (
@@ -239,60 +303,18 @@ DiskFilesOrDirectories
 
     // Okay, containing_part is now the directory we want to open and look for files:
 
-    lldb_utility::CleanUp <DIR *, int> dir_stream (opendir(containing_part), NULL, closedir);
-    if (!dir_stream.is_valid())
-        return matches.GetSize();
-    
-    struct dirent *dirent_buf;
-    
     size_t baselen = end_ptr - partial_name_copy;
     
-    while ((dirent_buf = readdir(dir_stream.get())) != NULL) 
-    {
-        char *name = dirent_buf->d_name;
-        
-        // Omit ".", ".." and any . files if the match string doesn't start with .
-        if (name[0] == '.')
-        {
-            if (name[1] == '\0')
-                continue;
-            else if (name[1] == '.' && name[2] == '\0')
-                continue;
-            else if (remainder[0] != '.')
-                continue;
-        }
-        
-        // If we found a directory, we put a "/" at the end of the name.
-        
-        if (remainder[0] == '\0' || strstr(dirent_buf->d_name, remainder) == name)
-        {
-            if (strlen(name) + baselen >= PATH_MAX)
-                continue;
-                
-            strcpy(end_ptr, name);
-            
-            bool isa_directory = false;
-            if (dirent_buf->d_type & DT_DIR)
-                isa_directory = true;
-            else if (dirent_buf->d_type & DT_LNK)
-            { 
-                struct stat stat_buf;
-                if ((stat(partial_name_copy, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode))
-                    isa_directory = true;
-            }
-            
-            if (isa_directory)
-            {
-                saw_directory = true;
-                size_t len = strlen(partial_name_copy);
-                partial_name_copy[len] = '/';
-                partial_name_copy[len + 1] = '\0';
-            }
-            if (only_directories && !isa_directory)
-                continue;
-            matches.AppendString(partial_name_copy);
-        }
-    }
+    DiskFilesOrDirectoriesBaton parameters;
+    parameters.remainder = remainder;
+    parameters.partial_name_copy = partial_name_copy;
+    parameters.only_directories = only_directories;
+    parameters.saw_directory = &saw_directory;
+    parameters.matches = &matches;
+    parameters.end_ptr = end_ptr;
+    parameters.baselen = baselen;
+
+    FileSpec::EnumerateDirectory(containing_part, true, true, true, DiskFilesOrDirectoriesCallback, &parameters);
     
     return matches.GetSize();
 }
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectArgs.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectArgs.cpp
index 05fd53bbe89..3b919d11a56 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectArgs.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectArgs.cpp
@@ -266,7 +266,7 @@ CommandObjectArgs::DoExecute (Args& args, CommandReturnObject &result)
 OptionDefinition
 CommandObjectArgs::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "debug", 'g', no_argument, NULL, 0, eArgTypeNone, "Enable verbose debug logging of the expression parsing and evaluation."},
+    { LLDB_OPT_SET_1, false, "debug", 'g', OptionParser::eNoArgument, NULL, 0, eArgTypeNone, "Enable verbose debug logging of the expression parsing and evaluation."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpoint.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpoint.cpp
index cb70c99a195..c20da7f3ec5 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpoint.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpoint.cpp
@@ -106,6 +106,7 @@ public:
             m_queue_name(),
             m_catch_bp (false),
             m_throw_bp (true),
+            m_hardware (false),
             m_language (eLanguageTypeUnknown),
             m_skip_prologue (eLazyBoolCalculate),
             m_one_shot (false)
@@ -183,13 +184,18 @@ public:
                     break;
 
                 case 'h':
-                {
-                    bool success;
-                    m_catch_bp = Args::StringToBoolean (option_arg, true, &success);
-                    if (!success)
-                        error.SetErrorStringWithFormat ("Invalid boolean value for on-catch option: '%s'", option_arg);
-                }
-                break;
+                    {
+                        bool success;
+                        m_catch_bp = Args::StringToBoolean (option_arg, true, &success);
+                        if (!success)
+                            error.SetErrorStringWithFormat ("Invalid boolean value for on-catch option: '%s'", option_arg);
+                    }
+                    break;
+
+                case 'H':
+                    m_hardware = true;
+                    break;
+
                 case 'i':
                 {
                     m_ignore_count = Args::StringToUInt32(option_arg, UINT32_MAX, 0);
@@ -311,6 +317,7 @@ public:
             m_queue_name.clear();
             m_catch_bp = false;
             m_throw_bp = true;
+            m_hardware = false;
             m_language = eLanguageTypeUnknown;
             m_skip_prologue = eLazyBoolCalculate;
             m_one_shot = false;
@@ -345,6 +352,7 @@ public:
         std::string m_queue_name;
         bool m_catch_bp;
         bool m_throw_bp;
+        bool m_hardware; // Request to use hardware breakpoints
         lldb::LanguageType m_language;
         LazyBool m_skip_prologue;
         bool m_one_shot;
@@ -423,12 +431,15 @@ protected:
                                                    m_options.m_line_num,
                                                    check_inlines,
                                                    m_options.m_skip_prologue,
-                                                   internal).get();
+                                                   internal,
+                                                   m_options.m_hardware).get();
                 }
                 break;
 
             case eSetTypeAddress: // Breakpoint by address
-                bp = target->CreateBreakpoint (m_options.m_load_addr, false).get();
+                bp = target->CreateBreakpoint (m_options.m_load_addr,
+                                               internal,
+                                               m_options.m_hardware).get();
                 break;
 
             case eSetTypeFunctionName: // Breakpoint by function name
@@ -443,7 +454,8 @@ protected:
                                                    m_options.m_func_names,
                                                    name_type_mask,
                                                    m_options.m_skip_prologue,
-                                                   internal).get();
+                                                   internal,
+                                                   m_options.m_hardware).get();
                 }
                 break;
 
@@ -464,7 +476,8 @@ protected:
                                                             &(m_options.m_filenames),
                                                             regexp,
                                                             m_options.m_skip_prologue,
-                                                            internal).get();
+                                                            internal,
+                                                            m_options.m_hardware).get();
                 }
                 break;
             case eSetTypeSourceRegexp: // Breakpoint by regexp on source text.
@@ -496,12 +509,19 @@ protected:
                         result.SetStatus (eReturnStatusFailed);
                         return false;
                     }
-                    bp = target->CreateSourceRegexBreakpoint (&(m_options.m_modules), &(m_options.m_filenames), regexp).get();
+                    bp = target->CreateSourceRegexBreakpoint (&(m_options.m_modules),
+                                                              &(m_options.m_filenames),
+                                                              regexp,
+                                                              internal,
+                                                              m_options.m_hardware).get();
                 }
                 break;
             case eSetTypeException:
                 {
-                    bp = target->CreateExceptionBreakpoint (m_options.m_language, m_options.m_catch_bp, m_options.m_throw_bp).get();
+                    bp = target->CreateExceptionBreakpoint (m_options.m_language,
+                                                            m_options.m_catch_bp,
+                                                            m_options.m_throw_bp,
+                                                            m_options.m_hardware).get();
                 }
                 break;
             default:
@@ -603,84 +623,87 @@ private:
 OptionDefinition
 CommandObjectBreakpointSet::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_NOT_10, false, "shlib", 's', required_argument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName,
+    { LLDB_OPT_NOT_10, false, "shlib", 's', OptionParser::eRequiredArgument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName,
         "Set the breakpoint only in this shared library.  "
         "Can repeat this option multiple times to specify multiple shared libraries."},
 
-    { LLDB_OPT_SET_ALL, false, "ignore-count", 'i', required_argument,   NULL, 0, eArgTypeCount,
+    { LLDB_OPT_SET_ALL, false, "ignore-count", 'i', OptionParser::eRequiredArgument,   NULL, 0, eArgTypeCount,
         "Set the number of times this breakpoint is skipped before stopping." },
 
-    { LLDB_OPT_SET_ALL, false, "one-shot", 'o', no_argument,   NULL, 0, eArgTypeNone,
+    { LLDB_OPT_SET_ALL, false, "one-shot", 'o', OptionParser::eNoArgument,   NULL, 0, eArgTypeNone,
         "The breakpoint is deleted the first time it causes a stop." },
 
-    { LLDB_OPT_SET_ALL, false, "condition",    'c', required_argument, NULL, 0, eArgTypeExpression,
+    { LLDB_OPT_SET_ALL, false, "condition",    'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeExpression,
         "The breakpoint stops only if this condition expression evaluates to true."},
 
-    { LLDB_OPT_SET_ALL, false, "thread-index", 'x', required_argument, NULL, 0, eArgTypeThreadIndex,
+    { LLDB_OPT_SET_ALL, false, "thread-index", 'x', OptionParser::eRequiredArgument, NULL, 0, eArgTypeThreadIndex,
         "The breakpoint stops only for the thread whose indeX matches this argument."},
 
-    { LLDB_OPT_SET_ALL, false, "thread-id", 't', required_argument, NULL, 0, eArgTypeThreadID,
+    { LLDB_OPT_SET_ALL, false, "thread-id", 't', OptionParser::eRequiredArgument, NULL, 0, eArgTypeThreadID,
         "The breakpoint stops only for the thread whose TID matches this argument."},
 
-    { LLDB_OPT_SET_ALL, false, "thread-name", 'T', required_argument, NULL, 0, eArgTypeThreadName,
+    { LLDB_OPT_SET_ALL, false, "thread-name", 'T', OptionParser::eRequiredArgument, NULL, 0, eArgTypeThreadName,
         "The breakpoint stops only for the thread whose thread name matches this argument."},
 
-    { LLDB_OPT_SET_ALL, false, "queue-name", 'q', required_argument, NULL, 0, eArgTypeQueueName,
+    { LLDB_OPT_SET_ALL, false, "hardware", 'H', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,
+        "Require the breakpoint to use hardware breakpoints."},
+
+    { LLDB_OPT_SET_ALL, false, "queue-name", 'q', OptionParser::eRequiredArgument, NULL, 0, eArgTypeQueueName,
         "The breakpoint stops only for threads in the queue whose name is given by this argument."},
 
-    { LLDB_OPT_FILE, false, "file", 'f', required_argument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,
+    { LLDB_OPT_FILE, false, "file", 'f', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,
         "Specifies the source file in which to set this breakpoint.  "
         "Note, by default lldb only looks for files that are #included if they use the standard include file extensions.  "
         "To set breakpoints on .c/.cpp/.m/.mm files that are #included, set target.inline-breakpoint-strategy"
         " to \"always\"."},
 
-    { LLDB_OPT_SET_1, true, "line", 'l', required_argument, NULL, 0, eArgTypeLineNum,
+    { LLDB_OPT_SET_1, true, "line", 'l', OptionParser::eRequiredArgument, NULL, 0, eArgTypeLineNum,
         "Specifies the line number on which to set this breakpoint."},
 
     // Comment out this option for the moment, as we don't actually use it, but will in the future.
     // This way users won't see it, but the infrastructure is left in place.
-    //    { 0, false, "column",     'C', required_argument, NULL, "<column>",
+    //    { 0, false, "column",     'C', OptionParser::eRequiredArgument, NULL, "<column>",
     //    "Set the breakpoint by source location at this particular column."},
 
-    { LLDB_OPT_SET_2, true, "address", 'a', required_argument, NULL, 0, eArgTypeAddressOrExpression,
+    { LLDB_OPT_SET_2, true, "address", 'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeAddressOrExpression,
         "Set the breakpoint by address, at the specified address."},
 
-    { LLDB_OPT_SET_3, true, "name", 'n', required_argument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName,
+    { LLDB_OPT_SET_3, true, "name", 'n', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName,
         "Set the breakpoint by function name.  Can be repeated multiple times to make one breakpoint for multiple names" },
 
-    { LLDB_OPT_SET_4, true, "fullname", 'F', required_argument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeFullName,
+    { LLDB_OPT_SET_4, true, "fullname", 'F', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeFullName,
         "Set the breakpoint by fully qualified function names. For C++ this means namespaces and all arguments, and "
         "for Objective C this means a full function prototype with class and selector.   "
         "Can be repeated multiple times to make one breakpoint for multiple names." },
 
-    { LLDB_OPT_SET_5, true, "selector", 'S', required_argument, NULL, 0, eArgTypeSelector,
+    { LLDB_OPT_SET_5, true, "selector", 'S', OptionParser::eRequiredArgument, NULL, 0, eArgTypeSelector,
         "Set the breakpoint by ObjC selector name. Can be repeated multiple times to make one breakpoint for multiple Selectors." },
 
-    { LLDB_OPT_SET_6, true, "method", 'M', required_argument, NULL, 0, eArgTypeMethod,
+    { LLDB_OPT_SET_6, true, "method", 'M', OptionParser::eRequiredArgument, NULL, 0, eArgTypeMethod,
         "Set the breakpoint by C++ method names.  Can be repeated multiple times to make one breakpoint for multiple methods." },
 
-    { LLDB_OPT_SET_7, true, "func-regex", 'r', required_argument, NULL, 0, eArgTypeRegularExpression,
+    { LLDB_OPT_SET_7, true, "func-regex", 'r', OptionParser::eRequiredArgument, NULL, 0, eArgTypeRegularExpression,
         "Set the breakpoint by function name, evaluating a regular-expression to find the function name(s)." },
 
-    { LLDB_OPT_SET_8, true, "basename", 'b', required_argument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName,
+    { LLDB_OPT_SET_8, true, "basename", 'b', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName,
         "Set the breakpoint by function basename (C++ namespaces and arguments will be ignored). "
         "Can be repeated multiple times to make one breakpoint for multiple symbols." },
 
-    { LLDB_OPT_SET_9, true, "source-pattern-regexp", 'p', required_argument, NULL, 0, eArgTypeRegularExpression,
+    { LLDB_OPT_SET_9, true, "source-pattern-regexp", 'p', OptionParser::eRequiredArgument, NULL, 0, eArgTypeRegularExpression,
         "Set the breakpoint by specifying a regular expression which is matched against the source text in a source file or files "
         "specified with the -f option.  The -f option can be specified more than once.  "
         "If no source files are specified, uses the current \"default source file\"" },
 
-    { LLDB_OPT_SET_10, true, "language-exception", 'E', required_argument, NULL, 0, eArgTypeLanguage,
+    { LLDB_OPT_SET_10, true, "language-exception", 'E', OptionParser::eRequiredArgument, NULL, 0, eArgTypeLanguage,
         "Set the breakpoint on exceptions thrown by the specified language (without options, on throw but not catch.)" },
 
-    { LLDB_OPT_SET_10, false, "on-throw", 'w', required_argument, NULL, 0, eArgTypeBoolean,
+    { LLDB_OPT_SET_10, false, "on-throw", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,
         "Set the breakpoint on exception throW." },
 
-    { LLDB_OPT_SET_10, false, "on-catch", 'h', required_argument, NULL, 0, eArgTypeBoolean,
+    { LLDB_OPT_SET_10, false, "on-catch", 'h', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,
         "Set the breakpoint on exception catcH." },
 
-    { LLDB_OPT_SKIP_PROLOGUE, false, "skip-prologue", 'K', required_argument, NULL, 0, eArgTypeBoolean,
+    { LLDB_OPT_SKIP_PROLOGUE, false, "skip-prologue", 'K', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,
         "sKip the prologue if the breakpoint is at the beginning of a function.  If not set the target.skip-prologue setting is used." },
 
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
@@ -989,15 +1012,15 @@ private:
 OptionDefinition
 CommandObjectBreakpointModify::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_ALL, false, "ignore-count", 'i', required_argument, NULL, 0, eArgTypeCount, "Set the number of times this breakpoint is skipped before stopping." },
-{ LLDB_OPT_SET_ALL, false, "one-shot",     'o', required_argument, NULL, 0, eArgTypeBoolean, "The breakpoint is deleted the first time it stop causes a stop." },
-{ LLDB_OPT_SET_ALL, false, "thread-index", 'x', required_argument, NULL, 0, eArgTypeThreadIndex, "The breakpoint stops only for the thread whose index matches this argument."},
-{ LLDB_OPT_SET_ALL, false, "thread-id",    't', required_argument, NULL, 0, eArgTypeThreadID, "The breakpoint stops only for the thread whose TID matches this argument."},
-{ LLDB_OPT_SET_ALL, false, "thread-name",  'T', required_argument, NULL, 0, eArgTypeThreadName, "The breakpoint stops only for the thread whose thread name matches this argument."},
-{ LLDB_OPT_SET_ALL, false, "queue-name",   'q', required_argument, NULL, 0, eArgTypeQueueName, "The breakpoint stops only for threads in the queue whose name is given by this argument."},
-{ LLDB_OPT_SET_ALL, false, "condition",    'c', required_argument, NULL, 0, eArgTypeExpression, "The breakpoint stops only if this condition expression evaluates to true."},
-{ LLDB_OPT_SET_1,   false, "enable",       'e', no_argument,       NULL, 0, eArgTypeNone, "Enable the breakpoint."},
-{ LLDB_OPT_SET_2,   false, "disable",      'd', no_argument,       NULL, 0, eArgTypeNone, "Disable the breakpoint."},
+{ LLDB_OPT_SET_ALL, false, "ignore-count", 'i', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCount, "Set the number of times this breakpoint is skipped before stopping." },
+{ LLDB_OPT_SET_ALL, false, "one-shot",     'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean, "The breakpoint is deleted the first time it stop causes a stop." },
+{ LLDB_OPT_SET_ALL, false, "thread-index", 'x', OptionParser::eRequiredArgument, NULL, 0, eArgTypeThreadIndex, "The breakpoint stops only for the thread whose index matches this argument."},
+{ LLDB_OPT_SET_ALL, false, "thread-id",    't', OptionParser::eRequiredArgument, NULL, 0, eArgTypeThreadID, "The breakpoint stops only for the thread whose TID matches this argument."},
+{ LLDB_OPT_SET_ALL, false, "thread-name",  'T', OptionParser::eRequiredArgument, NULL, 0, eArgTypeThreadName, "The breakpoint stops only for the thread whose thread name matches this argument."},
+{ LLDB_OPT_SET_ALL, false, "queue-name",   'q', OptionParser::eRequiredArgument, NULL, 0, eArgTypeQueueName, "The breakpoint stops only for threads in the queue whose name is given by this argument."},
+{ LLDB_OPT_SET_ALL, false, "condition",    'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeExpression, "The breakpoint stops only if this condition expression evaluates to true."},
+{ LLDB_OPT_SET_1,   false, "enable",       'e', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone, "Enable the breakpoint."},
+{ LLDB_OPT_SET_2,   false, "disable",      'd', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone, "Disable the breakpoint."},
 { 0,                false, NULL,            0 , 0,                 NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -1055,7 +1078,7 @@ protected:
         {
             // No breakpoint selected; enable all currently set breakpoints.
             target->EnableAllBreakpoints ();
-            result.AppendMessageWithFormat ("All breakpoints enabled. (%lu breakpoints)\n", num_breakpoints);
+            result.AppendMessageWithFormat ("All breakpoints enabled. (%zu breakpoints)\n", num_breakpoints);
             result.SetStatus (eReturnStatusSuccessFinishNoResult);
         }
         else
@@ -1174,7 +1197,7 @@ protected:
         {
             // No breakpoint selected; disable all currently set breakpoints.
             target->DisableAllBreakpoints ();
-            result.AppendMessageWithFormat ("All breakpoints disabled. (%lu breakpoints)\n", num_breakpoints);
+            result.AppendMessageWithFormat ("All breakpoints disabled. (%zu breakpoints)\n", num_breakpoints);
             result.SetStatus (eReturnStatusSuccessFinishNoResult);
         }
         else
@@ -1398,18 +1421,18 @@ private:
 OptionDefinition
 CommandObjectBreakpointList::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "internal", 'i', no_argument, NULL, 0, eArgTypeNone,
+    { LLDB_OPT_SET_ALL, false, "internal", 'i', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,
         "Show debugger internal breakpoints" },
 
-    { LLDB_OPT_SET_1, false, "brief",    'b', no_argument, NULL, 0, eArgTypeNone,
+    { LLDB_OPT_SET_1, false, "brief",    'b', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,
         "Give a brief description of the breakpoint (no location info)."},
 
     // FIXME: We need to add an "internal" command, and then add this sort of thing to it.
     // But I need to see it for now, and don't want to wait.
-    { LLDB_OPT_SET_2, false, "full",    'f', no_argument, NULL, 0, eArgTypeNone,
+    { LLDB_OPT_SET_2, false, "full",    'f', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,
         "Give a full description of the breakpoint and its locations."},
 
-    { LLDB_OPT_SET_3, false, "verbose", 'v', no_argument, NULL, 0, eArgTypeNone,
+    { LLDB_OPT_SET_3, false, "verbose", 'v', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,
         "Explain everything we know about the breakpoint (for debugging debugger bugs)." },
 
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
@@ -1609,10 +1632,10 @@ private:
 OptionDefinition
 CommandObjectBreakpointClear::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "file", 'f', required_argument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,
+    { LLDB_OPT_SET_1, false, "file", 'f', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,
         "Specify the breakpoint by source location in this particular file."},
 
-    { LLDB_OPT_SET_1, true, "line", 'l', required_argument, NULL, 0, eArgTypeLineNum,
+    { LLDB_OPT_SET_1, true, "line", 'l', OptionParser::eRequiredArgument, NULL, 0, eArgTypeLineNum,
         "Specify the breakpoint by source location at this particular line."},
 
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
@@ -1676,7 +1699,7 @@ protected:
             else
             {
                 target->RemoveAllBreakpoints ();
-                result.AppendMessageWithFormat ("All breakpoints removed. (%lu %s)\n", num_breakpoints, num_breakpoints > 1 ? "breakpoints" : "breakpoint");
+                result.AppendMessageWithFormat ("All breakpoints removed. (%zu %s)\n", num_breakpoints, num_breakpoints > 1 ? "breakpoints" : "breakpoint");
             }
             result.SetStatus (eReturnStatusSuccessFinishNoResult);
         }
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpointCommand.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
index c4504a4c651..e540461dada 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectBreakpointCommand.cpp
@@ -640,16 +640,16 @@ g_script_option_enumeration[4] =
 OptionDefinition
 CommandObjectBreakpointCommandAdd::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "one-liner", 'o', required_argument, NULL, 0, eArgTypeOneLiner,
+    { LLDB_OPT_SET_1, false, "one-liner", 'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeOneLiner,
         "Specify a one-line breakpoint command inline. Be sure to surround it with quotes." },
 
-    { LLDB_OPT_SET_ALL, false, "stop-on-error", 'e', required_argument, NULL, 0, eArgTypeBoolean,
+    { LLDB_OPT_SET_ALL, false, "stop-on-error", 'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,
         "Specify whether breakpoint command execution should terminate on error." },
 
-    { LLDB_OPT_SET_ALL,   false, "script-type",     's', required_argument, g_script_option_enumeration, 0, eArgTypeNone,
+    { LLDB_OPT_SET_ALL,   false, "script-type",     's', OptionParser::eRequiredArgument, g_script_option_enumeration, 0, eArgTypeNone,
         "Specify the language for the commands - if none is specified, the lldb command interpreter will be used."},
 
-    { LLDB_OPT_SET_2,   false, "python-function",     'F', required_argument, NULL, 0, eArgTypePythonFunction,
+    { LLDB_OPT_SET_2,   false, "python-function",     'F', OptionParser::eRequiredArgument, NULL, 0, eArgTypePythonFunction,
         "Give the name of a Python function to run as command for this breakpoint. Be sure to give a module name if appropriate."},
     
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectCommands.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectCommands.cpp
index 4699aa6d9c4..6824ead0d9e 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectCommands.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectCommands.cpp
@@ -156,9 +156,9 @@ protected:
             }
             else
             {
-                std::pair<bool,uint64_t> start_idx = {m_options.m_start_idx.OptionWasSet(),m_options.m_start_idx.GetCurrentValue()};
-                std::pair<bool,uint64_t> stop_idx = {m_options.m_stop_idx.OptionWasSet(),m_options.m_stop_idx.GetCurrentValue()};
-                std::pair<bool,uint64_t> count = {m_options.m_count.OptionWasSet(),m_options.m_count.GetCurrentValue()};
+                std::pair<bool,uint64_t> start_idx(m_options.m_start_idx.OptionWasSet(),m_options.m_start_idx.GetCurrentValue());
+                std::pair<bool,uint64_t> stop_idx(m_options.m_stop_idx.OptionWasSet(),m_options.m_stop_idx.GetCurrentValue());
+                std::pair<bool,uint64_t> count(m_options.m_count.OptionWasSet(),m_options.m_count.GetCurrentValue());
                 
                 const CommandHistory& history(m_interpreter.GetCommandHistory());
                                               
@@ -227,10 +227,10 @@ protected:
 OptionDefinition
 CommandObjectCommandsHistory::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "count", 'c', required_argument, NULL, 0, eArgTypeUnsignedInteger,        "How many history commands to print."},
-{ LLDB_OPT_SET_1, false, "start-index", 's', required_argument, NULL, 0, eArgTypeUnsignedInteger,  "Index at which to start printing history commands (or end to mean tail mode)."},
-{ LLDB_OPT_SET_1, false, "end-index", 'e', required_argument, NULL, 0, eArgTypeUnsignedInteger,    "Index at which to stop printing history commands."},
-{ LLDB_OPT_SET_2, false, "clear", 'C', no_argument, NULL, 0, eArgTypeBoolean,    "Clears the current command history."},
+{ LLDB_OPT_SET_1, false, "count", 'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeUnsignedInteger,        "How many history commands to print."},
+{ LLDB_OPT_SET_1, false, "start-index", 's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeUnsignedInteger,  "Index at which to start printing history commands (or end to mean tail mode)."},
+{ LLDB_OPT_SET_1, false, "end-index", 'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeUnsignedInteger,    "Index at which to stop printing history commands."},
+{ LLDB_OPT_SET_2, false, "clear", 'C', OptionParser::eNoArgument, NULL, 0, eArgTypeBoolean,    "Clears the current command history."},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -410,9 +410,9 @@ protected:
 OptionDefinition
 CommandObjectCommandsSource::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_ALL, false, "stop-on-error", 'e', required_argument, NULL, 0, eArgTypeBoolean,    "If true, stop executing commands on error."},
-{ LLDB_OPT_SET_ALL, false, "stop-on-continue", 'c', required_argument, NULL, 0, eArgTypeBoolean, "If true, stop executing commands on continue."},
-{ LLDB_OPT_SET_ALL, false, "silent-run", 's', required_argument, NULL, 0, eArgTypeBoolean, "If true don't echo commands while executing."},
+{ LLDB_OPT_SET_ALL, false, "stop-on-error", 'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,    "If true, stop executing commands on error."},
+{ LLDB_OPT_SET_ALL, false, "stop-on-continue", 'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean, "If true, stop executing commands on continue."},
+{ LLDB_OPT_SET_ALL, false, "silent-run", 's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean, "If true don't echo commands while executing."},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -1243,8 +1243,8 @@ private:
 OptionDefinition
 CommandObjectCommandsAddRegex::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "help"  , 'h', required_argument, NULL, 0, eArgTypeNone, "The help text to display for this command."},
-{ LLDB_OPT_SET_1, false, "syntax", 's', required_argument, NULL, 0, eArgTypeNone, "A syntax string showing the typical usage syntax."},
+{ LLDB_OPT_SET_1, false, "help"  , 'h', OptionParser::eRequiredArgument, NULL, 0, eArgTypeNone, "The help text to display for this command."},
+{ LLDB_OPT_SET_1, false, "syntax", 's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeNone, "A syntax string showing the typical usage syntax."},
 { 0             , false,  NULL   , 0  , 0                , NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -1517,7 +1517,7 @@ protected:
 OptionDefinition
 CommandObjectCommandsScriptImport::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "allow-reload", 'r', no_argument, NULL, 0, eArgTypeNone,        "Allow the script to be loaded even if it was already loaded before. This argument exists for backwards compatibility, but reloading is always allowed, whether you specify it or not."},
+    { LLDB_OPT_SET_1, false, "allow-reload", 'r', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,        "Allow the script to be loaded even if it was already loaded before. This argument exists for backwards compatibility, but reloading is always allowed, whether you specify it or not."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -1828,8 +1828,8 @@ static OptionEnumValueElement g_script_synchro_type[] =
 OptionDefinition
 CommandObjectCommandsScriptAdd::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "function", 'f', required_argument, NULL, 0, eArgTypePythonFunction,        "Name of the Python function to bind to this command name."},
-    { LLDB_OPT_SET_1, false, "synchronicity", 's', required_argument, g_script_synchro_type, 0, eArgTypeScriptedCommandSynchronicity,        "Set the synchronicity of this command's executions with regard to LLDB event system."},
+    { LLDB_OPT_SET_1, false, "function", 'f', OptionParser::eRequiredArgument, NULL, 0, eArgTypePythonFunction,        "Name of the Python function to bind to this command name."},
+    { LLDB_OPT_SET_1, false, "synchronicity", 's', OptionParser::eRequiredArgument, g_script_synchro_type, 0, eArgTypeScriptedCommandSynchronicity,        "Set the synchronicity of this command's executions with regard to LLDB event system."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectDisassemble.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectDisassemble.cpp
index 0d40fcd7c0b..fc148b1899f 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectDisassemble.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectDisassemble.cpp
@@ -231,28 +231,28 @@ CommandObjectDisassemble::CommandOptions::GetDefinitions ()
 OptionDefinition
 CommandObjectDisassemble::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_ALL, false, "bytes"        , 'b', no_argument        , NULL, 0, eArgTypeNone,        "Show opcode bytes when disassembling."},
-{ LLDB_OPT_SET_ALL, false, "context"      , 'C', required_argument  , NULL, 0, eArgTypeNumLines,    "Number of context lines of source to show."},
-{ LLDB_OPT_SET_ALL, false, "mixed"        , 'm', no_argument        , NULL, 0, eArgTypeNone,        "Enable mixed source and assembly display."},
-{ LLDB_OPT_SET_ALL, false, "raw"          , 'r', no_argument        , NULL, 0, eArgTypeNone,        "Print raw disassembly with no symbol information."},
-{ LLDB_OPT_SET_ALL, false, "plugin"       , 'P', required_argument  , NULL, 0, eArgTypePlugin,      "Name of the disassembler plugin you want to use."},
-{ LLDB_OPT_SET_ALL, false, "flavor"       , 'F', required_argument  , NULL, 0, eArgTypeDisassemblyFlavor,        "Name of the disassembly flavor you want to use.  "
+{ LLDB_OPT_SET_ALL, false, "bytes"        , 'b', OptionParser::eNoArgument        , NULL, 0, eArgTypeNone,        "Show opcode bytes when disassembling."},
+{ LLDB_OPT_SET_ALL, false, "context"      , 'C', OptionParser::eRequiredArgument  , NULL, 0, eArgTypeNumLines,    "Number of context lines of source to show."},
+{ LLDB_OPT_SET_ALL, false, "mixed"        , 'm', OptionParser::eNoArgument        , NULL, 0, eArgTypeNone,        "Enable mixed source and assembly display."},
+{ LLDB_OPT_SET_ALL, false, "raw"          , 'r', OptionParser::eNoArgument        , NULL, 0, eArgTypeNone,        "Print raw disassembly with no symbol information."},
+{ LLDB_OPT_SET_ALL, false, "plugin"       , 'P', OptionParser::eRequiredArgument  , NULL, 0, eArgTypePlugin,      "Name of the disassembler plugin you want to use."},
+{ LLDB_OPT_SET_ALL, false, "flavor"       , 'F', OptionParser::eRequiredArgument  , NULL, 0, eArgTypeDisassemblyFlavor,        "Name of the disassembly flavor you want to use.  "
                                                                                                     "Currently the only valid options are default, and for Intel"
                                                                                                     " architectures, att and intel."},
-{ LLDB_OPT_SET_ALL, false, "arch"         , 'A', required_argument  , NULL, 0, eArgTypeArchitecture,"Specify the architecture to use from cross disassembly."},
+{ LLDB_OPT_SET_ALL, false, "arch"         , 'A', OptionParser::eRequiredArgument  , NULL, 0, eArgTypeArchitecture,"Specify the architecture to use from cross disassembly."},
 { LLDB_OPT_SET_1  |
-  LLDB_OPT_SET_2  , true , "start-address", 's', required_argument  , NULL, 0, eArgTypeAddressOrExpression,"Address at which to start disassembling."},
-{ LLDB_OPT_SET_1  , false, "end-address"  , 'e', required_argument  , NULL, 0, eArgTypeAddressOrExpression,  "Address at which to end disassembling."},
+  LLDB_OPT_SET_2  , true , "start-address", 's', OptionParser::eRequiredArgument  , NULL, 0, eArgTypeAddressOrExpression,"Address at which to start disassembling."},
+{ LLDB_OPT_SET_1  , false, "end-address"  , 'e', OptionParser::eRequiredArgument  , NULL, 0, eArgTypeAddressOrExpression,  "Address at which to end disassembling."},
 { LLDB_OPT_SET_2  |
   LLDB_OPT_SET_3  |
   LLDB_OPT_SET_4  |
-  LLDB_OPT_SET_5  , false, "count"        , 'c', required_argument  , NULL, 0, eArgTypeNumLines,    "Number of instructions to display."},
-{ LLDB_OPT_SET_3  , false, "name"         , 'n', required_argument  , NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName,
+  LLDB_OPT_SET_5  , false, "count"        , 'c', OptionParser::eRequiredArgument  , NULL, 0, eArgTypeNumLines,    "Number of instructions to display."},
+{ LLDB_OPT_SET_3  , false, "name"         , 'n', OptionParser::eRequiredArgument  , NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName,
                                                                                                     "Disassemble entire contents of the given function name."},
-{ LLDB_OPT_SET_4  , false, "frame"        , 'f', no_argument        , NULL, 0, eArgTypeNone,        "Disassemble from the start of the current frame's function."},
-{ LLDB_OPT_SET_5  , false, "pc"           , 'p', no_argument        , NULL, 0, eArgTypeNone,        "Disassemble around the current pc."},
-{ LLDB_OPT_SET_6  , false, "line"         , 'l', no_argument        , NULL, 0, eArgTypeNone,        "Disassemble the current frame's current source line instructions if there debug line table information, else disasemble around the pc."},
-{ LLDB_OPT_SET_7  , false, "address"      , 'a', required_argument  , NULL, 0, eArgTypeAddressOrExpression, "Disassemble function containing this address."},
+{ LLDB_OPT_SET_4  , false, "frame"        , 'f', OptionParser::eNoArgument        , NULL, 0, eArgTypeNone,        "Disassemble from the start of the current frame's function."},
+{ LLDB_OPT_SET_5  , false, "pc"           , 'p', OptionParser::eNoArgument        , NULL, 0, eArgTypeNone,        "Disassemble around the current pc."},
+{ LLDB_OPT_SET_6  , false, "line"         , 'l', OptionParser::eNoArgument        , NULL, 0, eArgTypeNone,        "Disassemble the current frame's current source line instructions if there is debug line table information, else disassemble around the pc."},
+{ LLDB_OPT_SET_7  , false, "address"      , 'a', OptionParser::eRequiredArgument  , NULL, 0, eArgTypeAddressOrExpression, "Disassemble function containing this address."},
 { 0               , false, NULL           ,   0, 0                  , NULL, 0, eArgTypeNone,        NULL }
 };
 
@@ -453,7 +453,9 @@ CommandObjectDisassemble::DoExecute (Args& command, CommandReturnObject &result)
                         {
                             ModuleSP module_sp (symbol_containing_address.GetModule());
                             SymbolContext sc;
-                            module_sp->ResolveSymbolContextForAddress (symbol_containing_address, eSymbolContextEverything, sc);
+                            bool resolve_tail_call_address = true; // PC can be one past the address range of the function.
+                            module_sp->ResolveSymbolContextForAddress (symbol_containing_address, eSymbolContextEverything, sc,
+                                                                       resolve_tail_call_address);
                             if (sc.function || sc.symbol)
                             {
                                 sc.GetAddressRange (eSymbolContextFunction | eSymbolContextSymbol, 0, false, range);
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.cpp
index da472d17331..5ca44ff920d 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.cpp
@@ -19,6 +19,7 @@
 #include "lldb/Core/Value.h"
 #include "lldb/Core/InputReader.h"
 #include "lldb/Core/ValueObjectVariable.h"
+#include "lldb/DataFormatters/ValueObjectPrinter.h"
 #include "lldb/Expression/ClangExpressionVariable.h"
 #include "lldb/Expression/ClangUserExpression.h"
 #include "lldb/Expression/ClangFunction.h"
@@ -49,13 +50,22 @@ CommandObjectExpression::CommandOptions::~CommandOptions ()
 {
 }
 
+static OptionEnumValueElement g_description_verbosity_type[] =
+{
+    { eLanguageRuntimeDescriptionDisplayVerbosityCompact,      "compact",       "Only show the description string"},
+    { eLanguageRuntimeDescriptionDisplayVerbosityFull,         "full",          "Show the full output, including persistent variable's name and type"},
+    { 0, NULL, NULL }
+};
+
 OptionDefinition
 CommandObjectExpression::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "all-threads",        'a', required_argument, NULL, 0, eArgTypeBoolean,    "Should we run all threads if the execution doesn't complete on one thread."},
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "ignore-breakpoints", 'i', required_argument, NULL, 0, eArgTypeBoolean,    "Ignore breakpoint hits while running expressions"},
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "timeout",            't', required_argument, NULL, 0, eArgTypeUnsignedInteger,  "Timeout value (in microseconds) for running the expression."},
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "unwind-on-error",    'u', required_argument, NULL, 0, eArgTypeBoolean,    "Clean up program state if the expression causes a crash, or raises a signal.  Note, unlike gdb hitting a breakpoint is controlled by another option (-i)."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "all-threads",        'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,    "Should we run all threads if the execution doesn't complete on one thread."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "ignore-breakpoints", 'i', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,    "Ignore breakpoint hits while running expressions"},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "timeout",            't', OptionParser::eRequiredArgument, NULL, 0, eArgTypeUnsignedInteger,  "Timeout value (in microseconds) for running the expression."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "unwind-on-error",    'u', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,    "Clean up program state if the expression causes a crash, or raises a signal.  Note, unlike gdb hitting a breakpoint is controlled by another option (-i)."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "debug",              'g', OptionParser::eNoArgument      , NULL, 0, eArgTypeNone,       "When specified, debug the JIT code by setting a breakpoint on the first instruction and forcing breakpoints to not be ignored (-i0) and no unwinding to happen on error (-u0)."},
+    { LLDB_OPT_SET_1, false, "description-verbosity", 'v', OptionParser::eOptionalArgument, g_description_verbosity_type, 0, eArgTypeDescriptionVerbosity,        "How verbose should the output of this expression be, if the object description is asked for."},
 };
 
 
@@ -127,6 +137,24 @@ CommandObjectExpression::CommandOptions::SetOptionValue (CommandInterpreter &int
                 error.SetErrorStringWithFormat("could not convert \"%s\" to a boolean value.", option_arg);
             break;
         }
+            
+    case 'v':
+        if (!option_arg)
+        {
+            m_verbosity = eLanguageRuntimeDescriptionDisplayVerbosityFull;
+            break;
+        }
+        m_verbosity = (LanguageRuntimeDescriptionDisplayVerbosity) Args::StringToOptionEnum(option_arg, g_option_table[option_idx].enum_values, 0, error);
+        if (!error.Success())
+            error.SetErrorStringWithFormat ("unrecognized value for description-verbosity '%s'", option_arg);
+        break;
+    
+    case 'g':
+        debug = true;
+        unwind_on_error = false;
+        ignore_breakpoints = false;
+        break;
+
     default:
         error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
         break;
@@ -153,6 +181,8 @@ CommandObjectExpression::CommandOptions::OptionParsingStarting (CommandInterpret
     show_summary = true;
     try_all_threads = true;
     timeout = 0;
+    debug = false;
+    m_verbosity = eLanguageRuntimeDescriptionDisplayVerbosityCompact;
 }
 
 const OptionDefinition*
@@ -333,13 +363,16 @@ CommandObjectExpression::EvaluateExpression
         bool keep_in_memory = true;
 
         EvaluateExpressionOptions options;
-        options.SetCoerceToId(m_varobj_options.use_objc)
-        .SetUnwindOnError(m_command_options.unwind_on_error)
-        .SetIgnoreBreakpoints (m_command_options.ignore_breakpoints)
-        .SetKeepInMemory(keep_in_memory)
-        .SetUseDynamic(m_varobj_options.use_dynamic)
-        .SetRunOthers(m_command_options.try_all_threads)
-        .SetTimeoutUsec(m_command_options.timeout);
+        options.SetCoerceToId(m_varobj_options.use_objc);
+        options.SetUnwindOnError(m_command_options.unwind_on_error);
+        options.SetIgnoreBreakpoints (m_command_options.ignore_breakpoints);
+        options.SetKeepInMemory(keep_in_memory);
+        options.SetUseDynamic(m_varobj_options.use_dynamic);
+        options.SetTryAllThreads(m_command_options.try_all_threads);
+        options.SetDebug(m_command_options.debug);
+        
+        if (m_command_options.timeout > 0)
+            options.SetTimeoutUsec(m_command_options.timeout);
         
         exe_results = target->EvaluateExpression (expr, 
                                                   exe_ctx.GetFramePtr(),
@@ -357,11 +390,10 @@ CommandObjectExpression::EvaluateExpression
                     if (format != eFormatDefault)
                         result_valobj_sp->SetFormat (format);
 
-                    ValueObject::DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions(true,format));
+                    DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions(m_command_options.m_verbosity,format));
 
-                    ValueObject::DumpValueObject (*(output_stream),
-                                                  result_valobj_sp.get(),   // Variable object to dump
-                                                  options);
+                    result_valobj_sp->Dump(*output_stream,options);
+                    
                     if (result)
                         result->SetStatus (eReturnStatusSuccessFinishResult);
                 }
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.h b/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.h
index 3964f2d423e..e0703a22a4c 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.h
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectExpression.h
@@ -55,8 +55,10 @@ public:
         bool        ignore_breakpoints;
         bool        show_types;
         bool        show_summary;
+        bool        debug;
         uint32_t    timeout;
         bool        try_all_threads;
+        LanguageRuntimeDescriptionDisplayVerbosity m_verbosity;
     };
 
     CommandObjectExpression (CommandInterpreter &interpreter);
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectFrame.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectFrame.cpp
index aace3a64960..0ef97326150 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectFrame.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectFrame.cpp
@@ -25,6 +25,7 @@
 #include "lldb/Core/ValueObject.h"
 #include "lldb/Core/ValueObjectVariable.h"
 #include "lldb/DataFormatters/DataVisualization.h"
+#include "lldb/DataFormatters/ValueObjectPrinter.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Interpreter/Args.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
@@ -244,7 +245,14 @@ protected:
             if (command.GetArgumentCount() == 1)
             {
                 const char *frame_idx_cstr = command.GetArgumentAtIndex(0);
-                frame_idx = Args::StringToUInt32 (frame_idx_cstr, UINT32_MAX, 0);
+                bool success = false;
+                frame_idx = Args::StringToUInt32 (frame_idx_cstr, UINT32_MAX, 0, &success);
+                if (!success)
+                {
+                    result.AppendErrorWithFormat ("invalid frame index argument '%s'", frame_idx_cstr);
+                    result.SetStatus (eReturnStatusFailed);
+                    return false;
+                }
             }
             else if (command.GetArgumentCount() == 0)
             {
@@ -283,7 +291,7 @@ protected:
 OptionDefinition
 CommandObjectFrameSelect::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "relative", 'r', required_argument, NULL, 0, eArgTypeOffset, "A relative frame index offset from the current frame index."},
+{ LLDB_OPT_SET_1, false, "relative", 'r', OptionParser::eRequiredArgument, NULL, 0, eArgTypeOffset, "A relative frame index offset from the current frame index."},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -400,7 +408,7 @@ protected:
         else if (!m_option_variable.summary_string.IsCurrentValueEmpty())
             summary_format_sp.reset(new StringSummaryFormat(TypeSummaryImpl::Flags(),m_option_variable.summary_string.GetCurrentValue()));
         
-        ValueObject::DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions(false,eFormatDefault,summary_format_sp));
+        DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions(eLanguageRuntimeDescriptionDisplayVerbosityFull,eFormatDefault,summary_format_sp));
         
         if (variable_list)
         {
@@ -447,9 +455,7 @@ protected:
                                                 if (var_sp->DumpDeclaration(&s, show_fullpaths, show_module))
                                                     s.PutCString (": ");
                                             }
-                                            ValueObject::DumpValueObject (result.GetOutputStream(), 
-                                                                          valobj_sp.get(),
-                                                                          options);
+                                            valobj_sp->Dump(result.GetOutputStream(),options);
                                         }
                                     }
                                 }
@@ -493,9 +499,7 @@ protected:
 
                             Stream &output_stream = result.GetOutputStream();
                             options.SetRootValueObjectName(valobj_sp->GetParent() ? name_cstr : NULL);
-                            ValueObject::DumpValueObject (output_stream, 
-                                                          valobj_sp.get(), 
-                                                          options);
+                            valobj_sp->Dump(output_stream,options);
                         }
                         else
                         {
@@ -571,9 +575,7 @@ protected:
                                     
                                     options.SetFormat(format);
                                     options.SetRootValueObjectName(name_cstr);
-                                    ValueObject::DumpValueObject (result.GetOutputStream(), 
-                                                                  valobj_sp.get(), 
-                                                                  options);
+                                    valobj_sp->Dump(result.GetOutputStream(),options);
                                 }
                             }
                         }
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectHelp.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectHelp.cpp
index d2c97f91260..bd0c3938c70 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectHelp.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectHelp.cpp
@@ -54,8 +54,8 @@ CommandObjectHelp::~CommandObjectHelp()
 OptionDefinition
 CommandObjectHelp::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "show-aliases", 'a', no_argument, NULL, 0, eArgTypeNone,         "Show aliases in the command list."},
-    { LLDB_OPT_SET_ALL, false, "hide-user-commands", 'u', no_argument, NULL, 0, eArgTypeNone,         "Hide user-defined commands from the list."},
+    { LLDB_OPT_SET_ALL, false, "show-aliases", 'a', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Show aliases in the command list."},
+    { LLDB_OPT_SET_ALL, false, "hide-user-commands", 'u', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Hide user-defined commands from the list."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectLog.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectLog.cpp
index 5fb79154c4e..2d815846a60 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectLog.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectLog.cpp
@@ -215,15 +215,15 @@ protected:
 OptionDefinition
 CommandObjectLogEnable::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "file",       'f', required_argument, NULL, 0, eArgTypeFilename,   "Set the destination file to log to."},
-{ LLDB_OPT_SET_1, false, "threadsafe", 't', no_argument,       NULL, 0, eArgTypeNone,        "Enable thread safe logging to avoid interweaved log lines." },
-{ LLDB_OPT_SET_1, false, "verbose",    'v', no_argument,       NULL, 0, eArgTypeNone,       "Enable verbose logging." },
-{ LLDB_OPT_SET_1, false, "debug",      'g', no_argument,       NULL, 0, eArgTypeNone,       "Enable debug logging." },
-{ LLDB_OPT_SET_1, false, "sequence",   's', no_argument,       NULL, 0, eArgTypeNone,       "Prepend all log lines with an increasing integer sequence id." },
-{ LLDB_OPT_SET_1, false, "timestamp",  'T', no_argument,       NULL, 0, eArgTypeNone,       "Prepend all log lines with a timestamp." },
-{ LLDB_OPT_SET_1, false, "pid-tid",    'p', no_argument,       NULL, 0, eArgTypeNone,       "Prepend all log lines with the process and thread ID that generates the log line." },
-{ LLDB_OPT_SET_1, false, "thread-name",'n', no_argument,       NULL, 0, eArgTypeNone,       "Prepend all log lines with the thread name for the thread that generates the log line." },
-{ LLDB_OPT_SET_1, false, "stack",      'S', no_argument,       NULL, 0, eArgTypeNone,       "Append a stack backtrace to each log line." },
+{ LLDB_OPT_SET_1, false, "file",       'f', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFilename,   "Set the destination file to log to."},
+{ LLDB_OPT_SET_1, false, "threadsafe", 't', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,        "Enable thread safe logging to avoid interweaved log lines." },
+{ LLDB_OPT_SET_1, false, "verbose",    'v', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,       "Enable verbose logging." },
+{ LLDB_OPT_SET_1, false, "debug",      'g', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,       "Enable debug logging." },
+{ LLDB_OPT_SET_1, false, "sequence",   's', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,       "Prepend all log lines with an increasing integer sequence id." },
+{ LLDB_OPT_SET_1, false, "timestamp",  'T', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,       "Prepend all log lines with a timestamp." },
+{ LLDB_OPT_SET_1, false, "pid-tid",    'p', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,       "Prepend all log lines with the process and thread ID that generates the log line." },
+{ LLDB_OPT_SET_1, false, "thread-name",'n', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,       "Prepend all log lines with the thread name for the thread that generates the log line." },
+{ LLDB_OPT_SET_1, false, "stack",      'S', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,       "Append a stack backtrace to each log line." },
 { 0, false, NULL,                       0,  0,                 NULL, 0, eArgTypeNone,       NULL }
 };
 
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.cpp
index 4725a4da657..cb7398fb955 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectMemory.cpp
@@ -12,6 +12,8 @@
 #include "CommandObjectMemory.h"
 
 // C Includes
+#include <inttypes.h>
+
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
@@ -21,6 +23,7 @@
 #include "lldb/Core/Module.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Core/ValueObjectMemory.h"
+#include "lldb/DataFormatters/ValueObjectPrinter.h"
 #include "lldb/Interpreter/Args.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
@@ -39,12 +42,12 @@ using namespace lldb_private;
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "num-per-line" ,'l', required_argument, NULL, 0, eArgTypeNumberPerLine ,"The number of items per line to display."},
-    { LLDB_OPT_SET_2, false, "binary"       ,'b', no_argument      , NULL, 0, eArgTypeNone          ,"If true, memory will be saved as binary. If false, the memory is saved save as an ASCII dump that uses the format, size, count and number per line settings."},
-    { LLDB_OPT_SET_3, true , "type"         ,'t', required_argument, NULL, 0, eArgTypeNone          ,"The name of a type to view memory as."}, 
+    { LLDB_OPT_SET_1, false, "num-per-line" ,'l', OptionParser::eRequiredArgument, NULL, 0, eArgTypeNumberPerLine ,"The number of items per line to display."},
+    { LLDB_OPT_SET_2, false, "binary"       ,'b', OptionParser::eNoArgument      , NULL, 0, eArgTypeNone          ,"If true, memory will be saved as binary. If false, the memory is saved save as an ASCII dump that uses the format, size, count and number per line settings."},
+    { LLDB_OPT_SET_3, true , "type"         ,'t', OptionParser::eRequiredArgument, NULL, 0, eArgTypeNone          ,"The name of a type to view memory as."},
     { LLDB_OPT_SET_1|
       LLDB_OPT_SET_2|
-      LLDB_OPT_SET_3, false, "force"        ,'r', no_argument,       NULL, 0, eArgTypeNone          ,"Necessary if reading over target.max-memory-read-size bytes."},
+      LLDB_OPT_SET_3, false, "force"        ,'r', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone          ,"Necessary if reading over target.max-memory-read-size bytes."},
 };
 
 
@@ -648,7 +651,7 @@ protected:
             }
             else if (m_format_options.GetCountValue().OptionWasSet())
             {
-                result.AppendErrorWithFormat("specify either the end address (0x%" PRIx64 ") or the count (--count %lu), not both.\n", end_addr, item_count);
+                result.AppendErrorWithFormat("specify either the end address (0x%" PRIx64 ") or the count (--count %zu), not both.\n", end_addr, item_count);
                 result.SetStatus(eReturnStatusFailed);
                 return false;
             }
@@ -705,7 +708,7 @@ protected:
             }
             
             if (bytes_read < total_byte_size)
-                result.AppendWarningWithFormat("Not all bytes (%lu/%lu) were able to be read from 0x%" PRIx64 ".\n", bytes_read, total_byte_size, addr);
+                result.AppendWarningWithFormat("Not all bytes (%zu/%zu) were able to be read from 0x%" PRIx64 ".\n", bytes_read, total_byte_size, addr);
         }
         else
         {
@@ -834,11 +837,9 @@ protected:
                     if (format != eFormatDefault)
                         valobj_sp->SetFormat (format);
 
-                    ValueObject::DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions(false,format));
+                    DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions(eLanguageRuntimeDescriptionDisplayVerbosityFull,format));
                     
-                    ValueObject::DumpValueObject (*output_stream,
-                                                  valobj_sp.get(),
-                                                  options);
+                    valobj_sp->Dump(*output_stream,options);
                 }
                 else
                 {
@@ -859,16 +860,28 @@ protected:
         
         Format format = m_format_options.GetFormat();
         if ( ( (format == eFormatChar) || (format == eFormatCharPrintable) )
-            && (item_byte_size != 1)
-            && (item_count == 1))
+            && (item_byte_size != 1))
         {
-            // this turns requests such as
-            // memory read -fc -s10 -c1 *charPtrPtr
-            // which make no sense (what is a char of size 10?)
-            // into a request for fetching 10 chars of size 1 from the same memory location
-            format = eFormatCharArray;
-            item_count = item_byte_size;
-            item_byte_size = 1;
+            // if a count was not passed, or it is 1
+            if (m_format_options.GetCountValue().OptionWasSet() == false || item_count == 1)
+            {
+                // this turns requests such as
+                // memory read -fc -s10 -c1 *charPtrPtr
+                // which make no sense (what is a char of size 10?)
+                // into a request for fetching 10 chars of size 1 from the same memory location
+                format = eFormatCharArray;
+                item_count = item_byte_size;
+                item_byte_size = 1;
+            }
+            else
+            {
+                // here we passed a count, and it was not 1
+                // so we have a byte_size and a count
+                // we could well multiply those, but instead let's just fail
+                result.AppendErrorWithFormat("reading memory as characters of size %zu is not supported", item_byte_size);
+                result.SetStatus(eReturnStatusFailed);
+                return false;
+            }
         }
 
         assert (output_stream);
@@ -901,15 +914,319 @@ protected:
     ClangASTType m_prev_clang_ast_type;
 };
 
+OptionDefinition
+g_memory_find_option_table[] =
+{
+    { LLDB_OPT_SET_1, false, "expression", 'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeExpression, "Evaluate an expression to obtain a byte pattern."},
+    { LLDB_OPT_SET_2, false, "string", 's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,   "Use text to find a byte pattern."},
+    { LLDB_OPT_SET_1|LLDB_OPT_SET_2, false, "count", 'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCount,   "How many times to perform the search."},
+    { LLDB_OPT_SET_1|LLDB_OPT_SET_2, false, "dump-offset", 'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeOffset,   "When dumping memory for a match, an offset from the match location to start dumping from."},
+};
+
+//----------------------------------------------------------------------
+// Find the specified data in memory
+//----------------------------------------------------------------------
+class CommandObjectMemoryFind : public CommandObjectParsed
+{
+public:
+  
+  class OptionGroupFindMemory : public OptionGroup
+  {
+  public:
+    OptionGroupFindMemory () :
+      OptionGroup(),
+      m_count(1),
+      m_offset(0)
+    {
+    }
+    
+    virtual
+    ~OptionGroupFindMemory ()
+    {
+    }
+    
+    virtual uint32_t
+    GetNumDefinitions ()
+    {
+      return sizeof (g_memory_find_option_table) / sizeof (OptionDefinition);
+    }
+    
+    virtual const OptionDefinition*
+    GetDefinitions ()
+    {
+      return g_memory_find_option_table;
+    }
+    
+    virtual Error
+    SetOptionValue (CommandInterpreter &interpreter,
+                    uint32_t option_idx,
+                    const char *option_arg)
+    {
+        Error error;
+        const int short_option = g_memory_find_option_table[option_idx].short_option;
+      
+        switch (short_option)
+        {
+        case 'e':
+              m_expr.SetValueFromCString(option_arg);
+              break;
+          
+        case 's':
+              m_string.SetValueFromCString(option_arg);
+              break;
+          
+        case 'c':
+              if (m_count.SetValueFromCString(option_arg).Fail())
+                  error.SetErrorString("unrecognized value for count");
+              break;
+                
+        case 'o':
+               if (m_offset.SetValueFromCString(option_arg).Fail())
+                   error.SetErrorString("unrecognized value for dump-offset");
+                break;
+
+        default:
+              error.SetErrorStringWithFormat("unrecognized short option '%c'", short_option);
+              break;
+        }
+        return error;
+    }
+    
+    virtual void
+    OptionParsingStarting (CommandInterpreter &interpreter)
+    {
+        m_expr.Clear();
+        m_string.Clear();
+        m_count.Clear();
+    }
+    
+      OptionValueString m_expr;
+      OptionValueString m_string;
+      OptionValueUInt64 m_count;
+      OptionValueUInt64 m_offset;
+  };
+  
+  CommandObjectMemoryFind (CommandInterpreter &interpreter) :
+  CommandObjectParsed (interpreter,
+                       "memory find",
+                       "Find a value in the memory of the process being debugged.",
+                       NULL,
+                       eFlagRequiresProcess | eFlagProcessMustBeLaunched),
+  m_option_group (interpreter),
+  m_memory_options ()
+  {
+    CommandArgumentEntry arg1;
+    CommandArgumentEntry arg2;
+    CommandArgumentData addr_arg;
+    CommandArgumentData value_arg;
+    
+    // Define the first (and only) variant of this arg.
+    addr_arg.arg_type = eArgTypeAddress;
+    addr_arg.arg_repetition = eArgRepeatPlain;
+    
+    // There is only one variant this argument could be; put it into the argument entry.
+    arg1.push_back (addr_arg);
+    
+    // Define the first (and only) variant of this arg.
+    value_arg.arg_type = eArgTypeValue;
+    value_arg.arg_repetition = eArgRepeatPlus;
+    
+    // There is only one variant this argument could be; put it into the argument entry.
+    arg2.push_back (value_arg);
+    
+    // Push the data for the first argument into the m_arguments vector.
+    m_arguments.push_back (arg1);
+    m_arguments.push_back (arg2);
+    
+    m_option_group.Append (&m_memory_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_2);
+    m_option_group.Finalize();
+  }
+  
+  virtual
+  ~CommandObjectMemoryFind ()
+  {
+  }
+  
+  Options *
+  GetOptions ()
+  {
+    return &m_option_group;
+  }
+  
+protected:
+  virtual bool
+  DoExecute (Args& command, CommandReturnObject &result)
+  {
+      // No need to check "process" for validity as eFlagRequiresProcess ensures it is valid
+      Process *process = m_exe_ctx.GetProcessPtr();
+
+      const size_t argc = command.GetArgumentCount();
+
+      if (argc != 2)
+      {
+          result.AppendError("two addresses needed for memory find");
+          return false;
+      }
+
+      Error error;
+      lldb::addr_t low_addr = Args::StringToAddress(&m_exe_ctx, command.GetArgumentAtIndex(0),LLDB_INVALID_ADDRESS,&error);
+      if (low_addr == LLDB_INVALID_ADDRESS || error.Fail())
+      {
+          result.AppendError("invalid low address");
+          return false;
+      }
+      lldb::addr_t high_addr = Args::StringToAddress(&m_exe_ctx, command.GetArgumentAtIndex(1),LLDB_INVALID_ADDRESS,&error);
+      if (high_addr == LLDB_INVALID_ADDRESS || error.Fail())
+      {
+          result.AppendError("invalid low address");
+          return false;
+      }
+
+      if (high_addr <= low_addr)
+      {
+          result.AppendError("starting address must be smaller than ending address");
+          return false;
+      }
+      
+      lldb::addr_t found_location = LLDB_INVALID_ADDRESS;
+      
+      DataBufferHeap buffer;
+      
+      if (m_memory_options.m_string.OptionWasSet())
+          buffer.CopyData(m_memory_options.m_string.GetStringValue(), strlen(m_memory_options.m_string.GetStringValue()));
+      else if (m_memory_options.m_expr.OptionWasSet())
+      {
+          StackFrame* frame = m_exe_ctx.GetFramePtr();
+          ValueObjectSP result_sp;
+          if (process->GetTarget().EvaluateExpression(m_memory_options.m_expr.GetStringValue(), frame, result_sp) && result_sp.get())
+          {
+              uint64_t value = result_sp->GetValueAsUnsigned(0);
+              switch (result_sp->GetClangType().GetByteSize())
+              {
+                  case 1: {
+                      uint8_t byte = (uint8_t)value;
+                      buffer.CopyData(&byte,1);
+                  }
+                      break;
+                  case 2: {
+                      uint16_t word = (uint16_t)value;
+                      buffer.CopyData(&word,2);
+                  }
+                      break;
+                  case 4: {
+                      uint32_t lword = (uint32_t)value;
+                      buffer.CopyData(&lword,4);
+                  }
+                      break;
+                  case 8: {
+                      buffer.CopyData(&value, 8);
+                  }
+                      break;
+                  case 3:
+                  case 5:
+                  case 6:
+                  case 7:
+                      result.AppendError("unknown type. pass a string instead");
+                      return false;
+                  default:
+                      result.AppendError("do not know how to deal with larger than 8 byte result types. pass a string instead");
+                      return false;
+              }
+          }
+          else
+          {
+              result.AppendError("expression evaluation failed. pass a string instead?");
+              return false;
+          }
+      }
+      else
+      {
+          result.AppendError("please pass either a block of text, or an expression to evaluate.");
+          return false;
+      }
+      
+      size_t count = m_memory_options.m_count.GetCurrentValue();
+      found_location = low_addr;
+      bool ever_found = false;
+      while (count)
+      {
+          found_location = Search(found_location, high_addr, buffer.GetBytes(), buffer.GetByteSize());
+          if (found_location == LLDB_INVALID_ADDRESS)
+          {
+              if (!ever_found)
+              {
+                  result.AppendMessage("Your data was not found within the range.\n");
+                  result.SetStatus(lldb::eReturnStatusSuccessFinishNoResult);
+              }
+              else
+                  result.AppendMessage("No more matches found within the range.\n");
+              break;
+          }
+          result.AppendMessageWithFormat("Your data was found at location: 0x%" PRIx64 "\n", found_location);
+
+          DataBufferHeap dumpbuffer(32,0);
+          process->ReadMemory(found_location+m_memory_options.m_offset.GetCurrentValue(), dumpbuffer.GetBytes(), dumpbuffer.GetByteSize(), error);
+          if (!error.Fail())
+          {
+              DataExtractor data(dumpbuffer.GetBytes(), dumpbuffer.GetByteSize(), process->GetByteOrder(), process->GetAddressByteSize());
+              data.Dump(&result.GetOutputStream(), 0, lldb::eFormatBytesWithASCII, 1, dumpbuffer.GetByteSize(), 16, found_location+m_memory_options.m_offset.GetCurrentValue(), 0, 0);
+              result.GetOutputStream().EOL();
+          }
+
+          --count;
+          found_location++;
+          ever_found = true;
+      }
+      
+      result.SetStatus(lldb::eReturnStatusSuccessFinishResult);
+      return true;
+  }
+    
+    lldb::addr_t
+    Search (lldb::addr_t low,
+            lldb::addr_t high,
+            uint8_t* buffer,
+            size_t buffer_size)
+    {
+        Process *process = m_exe_ctx.GetProcessPtr();
+        DataBufferHeap heap(buffer_size, 0);
+        lldb::addr_t fictional_ptr = low;
+        for (auto ptr = low;
+             low < high;
+             fictional_ptr++)
+        {
+            Error error;
+            if (ptr == low || buffer_size == 1)
+                process->ReadMemory(ptr, heap.GetBytes(), buffer_size, error);
+            else
+            {
+                memmove(heap.GetBytes(), heap.GetBytes()+1, buffer_size-1);
+                process->ReadMemory(ptr, heap.GetBytes()+buffer_size-1, 1, error);
+            }
+            if (error.Fail())
+                return LLDB_INVALID_ADDRESS;
+            if (memcmp(heap.GetBytes(), buffer, buffer_size) == 0)
+                return fictional_ptr;
+            if (ptr == low)
+                ptr += buffer_size;
+            else
+                ptr += 1;
+        }
+        return LLDB_INVALID_ADDRESS;
+    }
+  
+    OptionGroupOptions m_option_group;
+    OptionGroupFindMemory m_memory_options;
+};
+
 
 OptionDefinition
 g_memory_write_option_table[] =
 {
-{ LLDB_OPT_SET_1, true,  "infile", 'i', required_argument, NULL, 0, eArgTypeFilename, "Write memory using the contents of a file."},
-{ LLDB_OPT_SET_1, false, "offset", 'o', required_argument, NULL, 0, eArgTypeOffset,   "Start writng bytes from an offset within the input file."},
+{ LLDB_OPT_SET_1, true,  "infile", 'i', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFilename, "Write memory using the contents of a file."},
+{ LLDB_OPT_SET_1, false, "offset", 'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeOffset,   "Start writng bytes from an offset within the input file."},
 };
 
-
 //----------------------------------------------------------------------
 // Write memory to the inferior process
 //----------------------------------------------------------------------
@@ -935,13 +1252,13 @@ public:
         {
             return sizeof (g_memory_write_option_table) / sizeof (OptionDefinition);
         }
-        
+      
         virtual const OptionDefinition*
         GetDefinitions ()
         {
             return g_memory_write_option_table;
         }
-        
+      
         virtual Error
         SetOptionValue (CommandInterpreter &interpreter,
                         uint32_t option_idx,
@@ -949,7 +1266,7 @@ public:
         {
             Error error;
             const int short_option = g_memory_write_option_table[option_idx].short_option;
-            
+          
             switch (short_option)
             {
                 case 'i':
@@ -960,7 +1277,7 @@ public:
                         error.SetErrorStringWithFormat("input file does not exist: '%s'", option_arg);
                     }
                     break;
-                    
+                
                 case 'o':
                     {
                         bool success;
@@ -1219,7 +1536,7 @@ protected:
                 }
                 else if (!UIntValueIsValidForSize (uval64, item_byte_size))
                 {
-                    result.AppendErrorWithFormat ("Value 0x%" PRIx64 " is too large to fit in a %lu byte unsigned integer value.\n", uval64, item_byte_size);
+                    result.AppendErrorWithFormat ("Value 0x%" PRIx64 " is too large to fit in a %zu byte unsigned integer value.\n", uval64, item_byte_size);
                     result.SetStatus(eReturnStatusFailed);
                     return false;
                 }
@@ -1247,7 +1564,7 @@ protected:
                 }
                 else if (!UIntValueIsValidForSize (uval64, item_byte_size))
                 {
-                    result.AppendErrorWithFormat ("Value 0x%" PRIx64 " is too large to fit in a %lu byte unsigned integer value.\n", uval64, item_byte_size);
+                    result.AppendErrorWithFormat ("Value 0x%" PRIx64 " is too large to fit in a %zu byte unsigned integer value.\n", uval64, item_byte_size);
                     result.SetStatus(eReturnStatusFailed);
                     return false;
                 }
@@ -1287,7 +1604,7 @@ protected:
                 }
                 else if (!SIntValueIsValidForSize (sval64, item_byte_size))
                 {
-                    result.AppendErrorWithFormat ("Value %" PRIi64 " is too large or small to fit in a %lu byte signed integer value.\n", sval64, item_byte_size);
+                    result.AppendErrorWithFormat ("Value %" PRIi64 " is too large or small to fit in a %zu byte signed integer value.\n", sval64, item_byte_size);
                     result.SetStatus(eReturnStatusFailed);
                     return false;
                 }
@@ -1304,7 +1621,7 @@ protected:
                 }
                 else if (!UIntValueIsValidForSize (uval64, item_byte_size))
                 {
-                    result.AppendErrorWithFormat ("Value %" PRIu64 " is too large to fit in a %lu byte unsigned integer value.\n", uval64, item_byte_size);
+                    result.AppendErrorWithFormat ("Value %" PRIu64 " is too large to fit in a %zu byte unsigned integer value.\n", uval64, item_byte_size);
                     result.SetStatus(eReturnStatusFailed);
                     return false;
                 }
@@ -1321,7 +1638,7 @@ protected:
                 }
                 else if (!UIntValueIsValidForSize (uval64, item_byte_size))
                 {
-                    result.AppendErrorWithFormat ("Value %" PRIo64 " is too large to fit in a %lu byte unsigned integer value.\n", uval64, item_byte_size);
+                    result.AppendErrorWithFormat ("Value %" PRIo64 " is too large to fit in a %zu byte unsigned integer value.\n", uval64, item_byte_size);
                     result.SetStatus(eReturnStatusFailed);
                     return false;
                 }
@@ -1361,6 +1678,7 @@ CommandObjectMemory::CommandObjectMemory (CommandInterpreter &interpreter) :
                             "A set of commands for operating on memory.",
                             "memory <subcommand> [<subcommand-options>]")
 {
+    LoadSubCommand ("find", CommandObjectSP (new CommandObjectMemoryFind (interpreter)));
     LoadSubCommand ("read",  CommandObjectSP (new CommandObjectMemoryRead (interpreter)));
     LoadSubCommand ("write", CommandObjectSP (new CommandObjectMemoryWrite (interpreter)));
 }
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.cpp
index c2185e598ad..5e842bf848a 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlatform.cpp
@@ -22,14 +22,163 @@
 #include "lldb/Interpreter/Args.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
+#include "lldb/Interpreter/OptionGroupFile.h"
 #include "lldb/Interpreter/OptionGroupPlatform.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
+#include "lldb/Utility/Utils.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
+static mode_t
+ParsePermissionString(const char* permissions)
+{
+    if (strlen(permissions) != 9)
+        return (mode_t)(-1);
+    bool user_r,user_w,user_x,
+    group_r,group_w,group_x,
+    world_r,world_w,world_x;
+    
+    user_r = (permissions[0] == 'r');
+    user_w = (permissions[1] == 'w');
+    user_x = (permissions[2] == 'x');
+    
+    group_r = (permissions[3] == 'r');
+    group_w = (permissions[4] == 'w');
+    group_x = (permissions[5] == 'x');
+    
+    world_r = (permissions[6] == 'r');
+    world_w = (permissions[7] == 'w');
+    world_x = (permissions[8] == 'x');
+    
+    mode_t user,group,world;
+    user = (user_r ? 4 : 0) | (user_w ? 2 : 0) | (user_x ? 1 : 0);
+    group = (group_r ? 4 : 0) | (group_w ? 2 : 0) | (group_x ? 1 : 0);
+    world = (world_r ? 4 : 0) | (world_w ? 2 : 0) | (world_x ? 1 : 0);
+    
+    return user | group | world;
+}
+
+static OptionDefinition
+g_permissions_options[] =
+{
+    {   LLDB_OPT_SET_ALL, false, "permissions-value", 'v', OptionParser::eRequiredArgument,       NULL, 0, eArgTypePermissionsNumber         , "Give out the numeric value for permissions (e.g. 757)" },
+    {   LLDB_OPT_SET_ALL, false, "permissions-string",'s', OptionParser::eRequiredArgument, NULL, 0, eArgTypePermissionsString  , "Give out the string value for permissions (e.g. rwxr-xr--)." },
+    {   LLDB_OPT_SET_ALL, false, "user-read", 'r', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Allow user to read." },
+    {   LLDB_OPT_SET_ALL, false, "user-write", 'w', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Allow user to write." },
+    {   LLDB_OPT_SET_ALL, false, "user-exec", 'x', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Allow user to execute." },
+
+    {   LLDB_OPT_SET_ALL, false, "group-read", 'R', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Allow group to read." },
+    {   LLDB_OPT_SET_ALL, false, "group-write", 'W', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Allow group to write." },
+    {   LLDB_OPT_SET_ALL, false, "group-exec", 'X', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Allow group to execute." },
+
+    {   LLDB_OPT_SET_ALL, false, "world-read", 'd', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Allow world to read." },
+    {   LLDB_OPT_SET_ALL, false, "world-write", 't', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Allow world to write." },
+    {   LLDB_OPT_SET_ALL, false, "world-exec", 'e', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Allow world to execute." },
+
+};
+
+class OptionPermissions : public lldb_private::OptionGroup
+{
+public:
+    OptionPermissions ()
+    {
+    }
+    
+    virtual
+    ~OptionPermissions ()
+    {
+    }
+    
+    virtual lldb_private::Error
+    SetOptionValue (CommandInterpreter &interpreter,
+                    uint32_t option_idx,
+                    const char *option_arg)
+    {
+        Error error;
+        char short_option = (char) GetDefinitions()[option_idx].short_option;
+        switch (short_option)
+        {
+            case 'v':
+            {
+                bool ok;
+                uint32_t perms = Args::StringToUInt32(option_arg, 777, 8, &ok);
+                if (!ok)
+                    error.SetErrorStringWithFormat("invalid value for permissions: %s", option_arg);
+                else
+                    m_permissions = perms;
+            }
+                break;
+            case 's':
+            {
+                mode_t perms = ParsePermissionString(option_arg);
+                if (perms == (mode_t)-1)
+                    error.SetErrorStringWithFormat("invalid value for permissions: %s", option_arg);
+                else
+                    m_permissions = perms;
+            }
+            case 'r':
+                m_permissions |= lldb::eFilePermissionsUserRead;
+                break;
+            case 'w':
+                m_permissions |= lldb::eFilePermissionsUserWrite;
+                break;
+            case 'x':
+                m_permissions |= lldb::eFilePermissionsUserExecute;
+                break;
+            case 'R':
+                m_permissions |= lldb::eFilePermissionsGroupRead;
+                break;
+            case 'W':
+                m_permissions |= lldb::eFilePermissionsGroupWrite;
+                break;
+            case 'X':
+                m_permissions |= lldb::eFilePermissionsGroupExecute;
+                break;
+            case 'd':
+                m_permissions |= lldb::eFilePermissionsWorldRead;
+                break;
+            case 't':
+                m_permissions |= lldb::eFilePermissionsWorldWrite;
+                break;
+            case 'e':
+                m_permissions |= lldb::eFilePermissionsWorldExecute;
+                break;
+
+            default:
+                error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
+                break;
+        }
+        
+        return error;
+    }
+    
+    void
+    OptionParsingStarting (CommandInterpreter &interpreter)
+    {
+        m_permissions = 0;
+    }
+    
+    virtual uint32_t
+    GetNumDefinitions ()
+    {
+        return llvm::array_lengthof(g_permissions_options);
+    }
+    
+    const lldb_private::OptionDefinition*
+    GetDefinitions ()
+    {
+        return g_permissions_options;
+    }
+        
+    // Instance variables to hold the values for command options.
+    
+    uint32_t m_permissions;
+private:
+    DISALLOW_COPY_AND_ASSIGN(OptionPermissions);
+};
 
 //----------------------------------------------------------------------
 // "platform select <platform-name>"
@@ -274,11 +423,26 @@ protected:
         }
         else
         {
-            result.AppendError ("no platform us currently selected\n");
+            result.AppendError ("no platform is currently selected\n");
             result.SetStatus (eReturnStatusFailed);            
         }
         return result.Succeeded();
     }
+    
+    virtual Options *
+    GetOptions ()
+    {
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        OptionGroupOptions* m_platform_options = NULL;
+        if (platform_sp)
+        {
+            m_platform_options = platform_sp->GetConnectionOptions(m_interpreter);
+            if (m_platform_options != NULL && !m_platform_options->m_did_finalize)
+                m_platform_options->Finalize();
+        }
+        return m_platform_options;
+    }
+
 };
 
 //----------------------------------------------------------------------
@@ -359,6 +523,746 @@ protected:
         return result.Succeeded();
     }
 };
+
+//----------------------------------------------------------------------
+// "platform settings"
+//----------------------------------------------------------------------
+class CommandObjectPlatformSettings : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformSettings (CommandInterpreter &interpreter) :
+        CommandObjectParsed (interpreter,
+                             "platform settings",
+                             "Set settings for the current target's platform, or for a platform by name.",
+                             "platform settings",
+                             0),
+        m_options (interpreter),
+        m_option_working_dir (LLDB_OPT_SET_1, false, "working-dir", 'w', 0, eArgTypePath, "The working directory for the platform.")
+    {
+        m_options.Append (&m_option_working_dir, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
+    }
+    
+    virtual
+    ~CommandObjectPlatformSettings ()
+    {
+    }
+    
+protected:
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            if (m_option_working_dir.GetOptionValue().OptionWasSet())
+                platform_sp->SetWorkingDirectory (ConstString(m_option_working_dir.GetOptionValue().GetCurrentValue().GetPath().c_str()));
+        }
+        else
+        {
+            result.AppendError ("no platform is currently selected");
+            result.SetStatus (eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+    
+    virtual Options *
+    GetOptions ()
+    {
+        if (m_options.DidFinalize() == false)
+        {
+            m_options.Append(new OptionPermissions());
+            m_options.Finalize();
+        }
+        return &m_options;
+    }
+protected:
+    
+    OptionGroupOptions m_options;
+    OptionGroupFile m_option_working_dir;
+
+};
+
+
+//----------------------------------------------------------------------
+// "platform mkdir"
+//----------------------------------------------------------------------
+class CommandObjectPlatformMkDir : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformMkDir (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform mkdir",
+                         "Make a new directory on the remote end.",
+                         NULL,
+                         0),
+    m_options(interpreter)
+    {
+    }
+    
+    virtual
+    ~CommandObjectPlatformMkDir ()
+    {
+    }
+    
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            std::string cmd_line;
+            args.GetCommandString(cmd_line);
+            uint32_t mode;
+            const OptionPermissions* options_permissions = (OptionPermissions*)m_options.GetGroupWithOption('r');
+            if (options_permissions)
+                mode = options_permissions->m_permissions;
+            else
+                mode = lldb::eFilePermissionsUserRWX | lldb::eFilePermissionsGroupRWX | lldb::eFilePermissionsWorldRX;
+            Error error = platform_sp->MakeDirectory(cmd_line.c_str(), mode);
+            if (error.Success())
+            {
+                result.SetStatus (eReturnStatusSuccessFinishResult);
+            }
+            else
+            {
+                result.AppendError(error.AsCString());
+                result.SetStatus (eReturnStatusFailed);
+            }
+        }
+        else
+        {
+            result.AppendError ("no platform currently selected\n");
+            result.SetStatus (eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+    
+    virtual Options *
+    GetOptions ()
+    {
+        if (m_options.DidFinalize() == false)
+        {
+            m_options.Append(new OptionPermissions());
+            m_options.Finalize();
+        }
+        return &m_options;
+    }
+    OptionGroupOptions m_options;
+    
+};
+
+//----------------------------------------------------------------------
+// "platform fopen"
+//----------------------------------------------------------------------
+class CommandObjectPlatformFOpen : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformFOpen (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform file open",
+                         "Open a file on the remote end.",
+                         NULL,
+                         0),
+    m_options(interpreter)
+    {
+    }
+    
+    virtual
+    ~CommandObjectPlatformFOpen ()
+    {
+    }
+    
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            Error error;
+            std::string cmd_line;
+            args.GetCommandString(cmd_line);
+            mode_t perms;
+            const OptionPermissions* options_permissions = (OptionPermissions*)m_options.GetGroupWithOption('r');
+            if (options_permissions)
+                perms = options_permissions->m_permissions;
+            else
+                perms = lldb::eFilePermissionsUserRW | lldb::eFilePermissionsGroupRW | lldb::eFilePermissionsWorldRead;
+            lldb::user_id_t fd = platform_sp->OpenFile(FileSpec(cmd_line.c_str(),false),
+                                                       File::eOpenOptionRead | File::eOpenOptionWrite |
+                                                       File::eOpenOptionAppend | File::eOpenOptionCanCreate,
+                                                       perms,
+                                                       error);
+            if (error.Success())
+            {
+                result.AppendMessageWithFormat("File Descriptor = %" PRIu64 "\n",fd);
+                result.SetStatus (eReturnStatusSuccessFinishResult);
+            }
+            else
+            {
+                result.AppendError(error.AsCString());
+                result.SetStatus (eReturnStatusFailed);
+            }
+        }
+        else
+        {
+            result.AppendError ("no platform currently selected\n");
+            result.SetStatus (eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+    virtual Options *
+    GetOptions ()
+    {
+        if (m_options.DidFinalize() == false)
+        {
+            m_options.Append(new OptionPermissions());
+            m_options.Finalize();
+        }
+        return &m_options;
+    }
+    OptionGroupOptions m_options;
+};
+
+//----------------------------------------------------------------------
+// "platform fclose"
+//----------------------------------------------------------------------
+class CommandObjectPlatformFClose : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformFClose (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform file close",
+                         "Close a file on the remote end.",
+                         NULL,
+                         0)
+    {
+    }
+    
+    virtual
+    ~CommandObjectPlatformFClose ()
+    {
+    }
+    
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            std::string cmd_line;
+            args.GetCommandString(cmd_line);
+            const lldb::user_id_t fd = Args::StringToUInt64(cmd_line.c_str(), UINT64_MAX);
+            Error error;
+            bool success = platform_sp->CloseFile(fd, error);
+            if (success)
+            {
+                result.AppendMessageWithFormat("file %" PRIu64 " closed.\n", fd);
+                result.SetStatus (eReturnStatusSuccessFinishResult);
+            }
+            else
+            {
+                result.AppendError(error.AsCString());
+                result.SetStatus (eReturnStatusFailed);
+            }
+        }
+        else
+        {
+            result.AppendError ("no platform currently selected\n");
+            result.SetStatus (eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+};
+
+//----------------------------------------------------------------------
+// "platform fread"
+//----------------------------------------------------------------------
+class CommandObjectPlatformFRead : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformFRead (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform file read",
+                         "Read data from a file on the remote end.",
+                         NULL,
+                         0),
+    m_options (interpreter)
+    {
+    }
+    
+    virtual
+    ~CommandObjectPlatformFRead ()
+    {
+    }
+    
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            std::string cmd_line;
+            args.GetCommandString(cmd_line);
+            const lldb::user_id_t fd = Args::StringToUInt64(cmd_line.c_str(), UINT64_MAX);
+            std::string buffer(m_options.m_count,0);
+            Error error;
+            uint32_t retcode = platform_sp->ReadFile(fd, m_options.m_offset, &buffer[0], m_options.m_count, error);
+            result.AppendMessageWithFormat("Return = %d\n",retcode);
+            result.AppendMessageWithFormat("Data = \"%s\"\n",buffer.c_str());
+            result.SetStatus (eReturnStatusSuccessFinishResult);
+        }
+        else
+        {
+            result.AppendError ("no platform currently selected\n");
+            result.SetStatus (eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+    virtual Options *
+    GetOptions ()
+    {
+        return &m_options;
+    }
+    
+protected:
+    class CommandOptions : public Options
+    {
+    public:
+        
+        CommandOptions (CommandInterpreter &interpreter) :
+        Options (interpreter)
+        {
+        }
+        
+        virtual
+        ~CommandOptions ()
+        {
+        }
+        
+        virtual Error
+        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        {
+            Error error;
+            char short_option = (char) m_getopt_table[option_idx].val;
+            bool success = false;
+            
+            switch (short_option)
+            {
+                case 'o':
+                    m_offset = Args::StringToUInt32(option_arg, 0, 0, &success);
+                    if (!success)
+                        error.SetErrorStringWithFormat("invalid offset: '%s'", option_arg);
+                    break;
+                case 'c':
+                    m_count = Args::StringToUInt32(option_arg, 0, 0, &success);
+                    if (!success)
+                        error.SetErrorStringWithFormat("invalid offset: '%s'", option_arg);
+                    break;
+
+                default:
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
+                    break;
+            }
+            
+            return error;
+        }
+        
+        void
+        OptionParsingStarting ()
+        {
+            m_offset = 0;
+            m_count = 1;
+        }
+        
+        const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        // Options table: Required for subclasses of Options.
+        
+        static OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        uint32_t m_offset;
+        uint32_t m_count;
+    };
+    CommandOptions m_options;
+};
+OptionDefinition
+CommandObjectPlatformFRead::CommandOptions::g_option_table[] =
+{
+    {   LLDB_OPT_SET_1, false, "offset"           , 'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeIndex        , "Offset into the file at which to start reading." },
+    {   LLDB_OPT_SET_1, false, "count"            , 'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCount        , "Number of bytes to read from the file." },
+    {  0              , false, NULL               ,  0 , 0                , NULL, 0, eArgTypeNone         , NULL }
+};
+
+
+//----------------------------------------------------------------------
+// "platform fwrite"
+//----------------------------------------------------------------------
+class CommandObjectPlatformFWrite : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformFWrite (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform file write",
+                         "Write data to a file on the remote end.",
+                         NULL,
+                         0),
+    m_options (interpreter)
+    {
+    }
+    
+    virtual
+    ~CommandObjectPlatformFWrite ()
+    {
+    }
+    
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            std::string cmd_line;
+            args.GetCommandString(cmd_line);
+            Error error;
+            const lldb::user_id_t fd = Args::StringToUInt64(cmd_line.c_str(), UINT64_MAX);
+            uint32_t retcode = platform_sp->WriteFile (fd,
+                                                       m_options.m_offset,
+                                                       &m_options.m_data[0],
+                                                       m_options.m_data.size(),
+                                                       error);
+            result.AppendMessageWithFormat("Return = %d\n",retcode);
+            result.SetStatus (eReturnStatusSuccessFinishResult);
+        }
+        else
+        {
+            result.AppendError ("no platform currently selected\n");
+            result.SetStatus (eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+    virtual Options *
+    GetOptions ()
+    {
+        return &m_options;
+    }
+    
+protected:
+    class CommandOptions : public Options
+    {
+    public:
+        
+        CommandOptions (CommandInterpreter &interpreter) :
+        Options (interpreter)
+        {
+        }
+        
+        virtual
+        ~CommandOptions ()
+        {
+        }
+        
+        virtual Error
+        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        {
+            Error error;
+            char short_option = (char) m_getopt_table[option_idx].val;
+            bool success = false;
+            
+            switch (short_option)
+            {
+                case 'o':
+                    m_offset = Args::StringToUInt32(option_arg, 0, 0, &success);
+                    if (!success)
+                        error.SetErrorStringWithFormat("invalid offset: '%s'", option_arg);
+                    break;
+                case 'd':
+                    m_data.assign(option_arg);
+                    break;
+                    
+                default:
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
+                    break;
+            }
+            
+            return error;
+        }
+        
+        void
+        OptionParsingStarting ()
+        {
+            m_offset = 0;
+            m_data.clear();
+        }
+        
+        const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        // Options table: Required for subclasses of Options.
+        
+        static OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        uint32_t m_offset;
+        std::string m_data;
+    };
+    CommandOptions m_options;
+};
+OptionDefinition
+CommandObjectPlatformFWrite::CommandOptions::g_option_table[] =
+{
+    {   LLDB_OPT_SET_1, false, "offset"           , 'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeIndex        , "Offset into the file at which to start reading." },
+    {   LLDB_OPT_SET_1, false, "data"            , 'd', OptionParser::eRequiredArgument, NULL, 0, eArgTypeValue        , "Text to write to the file." },
+    {  0              , false, NULL               ,  0 , 0                , NULL, 0, eArgTypeNone         , NULL }
+};
+
+class CommandObjectPlatformFile : public CommandObjectMultiword
+{
+public:
+    //------------------------------------------------------------------
+    // Constructors and Destructors
+    //------------------------------------------------------------------
+    CommandObjectPlatformFile (CommandInterpreter &interpreter) :
+    CommandObjectMultiword (interpreter,
+                            "platform file",
+                            "A set of commands to manage file access through a platform",
+                            "platform file [open|close|read|write] ...")
+    {
+        LoadSubCommand ("open", CommandObjectSP (new CommandObjectPlatformFOpen  (interpreter)));
+        LoadSubCommand ("close", CommandObjectSP (new CommandObjectPlatformFClose  (interpreter)));
+        LoadSubCommand ("read", CommandObjectSP (new CommandObjectPlatformFRead  (interpreter)));
+        LoadSubCommand ("write", CommandObjectSP (new CommandObjectPlatformFWrite  (interpreter)));
+    }
+    
+    virtual
+    ~CommandObjectPlatformFile ()
+    {
+    }
+    
+private:
+    //------------------------------------------------------------------
+    // For CommandObjectPlatform only
+    //------------------------------------------------------------------
+    DISALLOW_COPY_AND_ASSIGN (CommandObjectPlatformFile);
+};
+
+//----------------------------------------------------------------------
+// "platform get-file remote-file-path host-file-path"
+//----------------------------------------------------------------------
+class CommandObjectPlatformGetFile : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformGetFile (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform get-file",
+                         "Transfer a file from the remote end to the local host.",
+                         "platform get-file <remote-file-spec> <local-file-spec>",
+                         0)
+    {
+        SetHelpLong(
+"Examples: \n\
+\n\
+    platform get-file /the/remote/file/path /the/local/file/path\n\
+    # Transfer a file from the remote end with file path /the/remote/file/path to the local host.\n");
+
+        CommandArgumentEntry arg1, arg2;
+        CommandArgumentData file_arg_remote, file_arg_host;
+    
+        // Define the first (and only) variant of this arg.
+        file_arg_remote.arg_type = eArgTypeFilename;
+        file_arg_remote.arg_repetition = eArgRepeatPlain;
+        // There is only one variant this argument could be; put it into the argument entry.
+        arg1.push_back (file_arg_remote);
+        
+        // Define the second (and only) variant of this arg.
+        file_arg_host.arg_type = eArgTypeFilename;
+        file_arg_host.arg_repetition = eArgRepeatPlain;
+        // There is only one variant this argument could be; put it into the argument entry.
+        arg2.push_back (file_arg_host);
+
+        // Push the data for the first and the second arguments into the m_arguments vector.
+        m_arguments.push_back (arg1);
+        m_arguments.push_back (arg2);
+    }
+    
+    virtual
+    ~CommandObjectPlatformGetFile ()
+    {
+    }
+    
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        // If the number of arguments is incorrect, issue an error message.
+        if (args.GetArgumentCount() != 2)
+        {
+            result.GetErrorStream().Printf("error: required arguments missing; specify both the source and destination file paths\n");
+            result.SetStatus(eReturnStatusFailed);
+            return false;
+        }
+
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            const char *remote_file_path = args.GetArgumentAtIndex(0);
+            const char *local_file_path = args.GetArgumentAtIndex(1);
+            Error error = platform_sp->GetFile(FileSpec(remote_file_path, false),
+                                               FileSpec(local_file_path, false));
+            if (error.Success())
+            {
+                result.AppendMessageWithFormat("successfully get-file from %s (remote) to %s (host)\n",
+                                               remote_file_path, local_file_path);
+                result.SetStatus (eReturnStatusSuccessFinishResult);
+            }
+            else
+            {
+                result.AppendMessageWithFormat("get-file failed: %s\n", error.AsCString());
+                result.SetStatus (eReturnStatusFailed);
+            }
+        }
+        else
+        {
+            result.AppendError ("no platform currently selected\n");
+            result.SetStatus (eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+};
+
+//----------------------------------------------------------------------
+// "platform get-size remote-file-path"
+//----------------------------------------------------------------------
+class CommandObjectPlatformGetSize : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformGetSize (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform get-size",
+                         "Get the file size from the remote end.",
+                         "platform get-size <remote-file-spec>",
+                         0)
+    {
+        SetHelpLong(
+"Examples: \n\
+\n\
+    platform get-size /the/remote/file/path\n\
+    # Get the file size from the remote end with path /the/remote/file/path.\n");
+
+        CommandArgumentEntry arg1;
+        CommandArgumentData file_arg_remote;
+    
+        // Define the first (and only) variant of this arg.
+        file_arg_remote.arg_type = eArgTypeFilename;
+        file_arg_remote.arg_repetition = eArgRepeatPlain;
+        // There is only one variant this argument could be; put it into the argument entry.
+        arg1.push_back (file_arg_remote);
+        
+        // Push the data for the first argument into the m_arguments vector.
+        m_arguments.push_back (arg1);
+    }
+    
+    virtual
+    ~CommandObjectPlatformGetSize ()
+    {
+    }
+    
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        // If the number of arguments is incorrect, issue an error message.
+        if (args.GetArgumentCount() != 1)
+        {
+            result.GetErrorStream().Printf("error: required argument missing; specify the source file path as the only argument\n");
+            result.SetStatus(eReturnStatusFailed);
+            return false;
+        }
+
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            std::string remote_file_path(args.GetArgumentAtIndex(0));
+            user_id_t size = platform_sp->GetFileSize(FileSpec(remote_file_path.c_str(), false));
+            if (size != UINT64_MAX)
+            {
+                result.AppendMessageWithFormat("File size of %s (remote): %" PRIu64 "\n", remote_file_path.c_str(), size);
+                result.SetStatus (eReturnStatusSuccessFinishResult);
+            }
+            else
+            {
+                result.AppendMessageWithFormat("Eroor getting file size of %s (remote)\n", remote_file_path.c_str());
+                result.SetStatus (eReturnStatusFailed);
+            }
+        }
+        else
+        {
+            result.AppendError ("no platform currently selected\n");
+            result.SetStatus (eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+};
+
+//----------------------------------------------------------------------
+// "platform put-file"
+//----------------------------------------------------------------------
+class CommandObjectPlatformPutFile : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformPutFile (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform put-file",
+                         "Transfer a file from this system to the remote end.",
+                         NULL,
+                         0)
+    {
+    }
+    
+    virtual
+    ~CommandObjectPlatformPutFile ()
+    {
+    }
+    
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        const char* src = args.GetArgumentAtIndex(0);
+        const char* dst = args.GetArgumentAtIndex(1);
+
+        FileSpec src_fs(src, true);
+        FileSpec dst_fs(dst, false);
+        
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            Error error (platform_sp->PutFile(src_fs, dst_fs));
+            if (error.Success())
+            {
+                result.SetStatus (eReturnStatusSuccessFinishNoResult);
+            }
+            else
+            {
+                result.AppendError (error.AsCString());
+                result.SetStatus (eReturnStatusFailed);
+            }
+        }
+        else
+        {
+            result.AppendError ("no platform currently selected\n");
+            result.SetStatus (eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+};
+
 //----------------------------------------------------------------------
 // "platform process launch"
 //----------------------------------------------------------------------
@@ -744,20 +1648,20 @@ protected:
 OptionDefinition
 CommandObjectPlatformProcessList::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1            , false, "pid"        , 'p', required_argument, NULL, 0, eArgTypePid              , "List the process info for a specific process ID." },
-{ LLDB_OPT_SET_2            , true , "name"       , 'n', required_argument, NULL, 0, eArgTypeProcessName      , "Find processes with executable basenames that match a string." },
-{ LLDB_OPT_SET_3            , true , "ends-with"  , 'e', required_argument, NULL, 0, eArgTypeProcessName      , "Find processes with executable basenames that end with a string." },
-{ LLDB_OPT_SET_4            , true , "starts-with", 's', required_argument, NULL, 0, eArgTypeProcessName      , "Find processes with executable basenames that start with a string." },
-{ LLDB_OPT_SET_5            , true , "contains"   , 'c', required_argument, NULL, 0, eArgTypeProcessName      , "Find processes with executable basenames that contain a string." },
-{ LLDB_OPT_SET_6            , true , "regex"      , 'r', required_argument, NULL, 0, eArgTypeRegularExpression, "Find processes with executable basenames that match a regular expression." },
-{ LLDB_OPT_SET_FROM_TO(2, 6), false, "parent"     , 'P', required_argument, NULL, 0, eArgTypePid              , "Find processes that have a matching parent process ID." },
-{ LLDB_OPT_SET_FROM_TO(2, 6), false, "uid"        , 'u', required_argument, NULL, 0, eArgTypeUnsignedInteger  , "Find processes that have a matching user ID." },
-{ LLDB_OPT_SET_FROM_TO(2, 6), false, "euid"       , 'U', required_argument, NULL, 0, eArgTypeUnsignedInteger  , "Find processes that have a matching effective user ID." },
-{ LLDB_OPT_SET_FROM_TO(2, 6), false, "gid"        , 'g', required_argument, NULL, 0, eArgTypeUnsignedInteger  , "Find processes that have a matching group ID." },
-{ LLDB_OPT_SET_FROM_TO(2, 6), false, "egid"       , 'G', required_argument, NULL, 0, eArgTypeUnsignedInteger  , "Find processes that have a matching effective group ID." },
-{ LLDB_OPT_SET_FROM_TO(2, 6), false, "arch"       , 'a', required_argument, NULL, 0, eArgTypeArchitecture     , "Find processes that have a matching architecture." },
-{ LLDB_OPT_SET_FROM_TO(1, 6), false, "show-args"  , 'A', no_argument      , NULL, 0, eArgTypeNone             , "Show process arguments instead of the process executable basename." },
-{ LLDB_OPT_SET_FROM_TO(1, 6), false, "verbose"    , 'v', no_argument      , NULL, 0, eArgTypeNone             , "Enable verbose output." },
+{ LLDB_OPT_SET_1            , false, "pid"        , 'p', OptionParser::eRequiredArgument, NULL, 0, eArgTypePid              , "List the process info for a specific process ID." },
+{ LLDB_OPT_SET_2            , true , "name"       , 'n', OptionParser::eRequiredArgument, NULL, 0, eArgTypeProcessName      , "Find processes with executable basenames that match a string." },
+{ LLDB_OPT_SET_3            , true , "ends-with"  , 'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeProcessName      , "Find processes with executable basenames that end with a string." },
+{ LLDB_OPT_SET_4            , true , "starts-with", 's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeProcessName      , "Find processes with executable basenames that start with a string." },
+{ LLDB_OPT_SET_5            , true , "contains"   , 'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeProcessName      , "Find processes with executable basenames that contain a string." },
+{ LLDB_OPT_SET_6            , true , "regex"      , 'r', OptionParser::eRequiredArgument, NULL, 0, eArgTypeRegularExpression, "Find processes with executable basenames that match a regular expression." },
+{ LLDB_OPT_SET_FROM_TO(2, 6), false, "parent"     , 'P', OptionParser::eRequiredArgument, NULL, 0, eArgTypePid              , "Find processes that have a matching parent process ID." },
+{ LLDB_OPT_SET_FROM_TO(2, 6), false, "uid"        , 'u', OptionParser::eRequiredArgument, NULL, 0, eArgTypeUnsignedInteger  , "Find processes that have a matching user ID." },
+{ LLDB_OPT_SET_FROM_TO(2, 6), false, "euid"       , 'U', OptionParser::eRequiredArgument, NULL, 0, eArgTypeUnsignedInteger  , "Find processes that have a matching effective user ID." },
+{ LLDB_OPT_SET_FROM_TO(2, 6), false, "gid"        , 'g', OptionParser::eRequiredArgument, NULL, 0, eArgTypeUnsignedInteger  , "Find processes that have a matching group ID." },
+{ LLDB_OPT_SET_FROM_TO(2, 6), false, "egid"       , 'G', OptionParser::eRequiredArgument, NULL, 0, eArgTypeUnsignedInteger  , "Find processes that have a matching effective group ID." },
+{ LLDB_OPT_SET_FROM_TO(2, 6), false, "arch"       , 'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeArchitecture     , "Find processes that have a matching architecture." },
+{ LLDB_OPT_SET_FROM_TO(1, 6), false, "show-args"  , 'A', OptionParser::eNoArgument      , NULL, 0, eArgTypeNone             , "Show process arguments instead of the process executable basename." },
+{ LLDB_OPT_SET_FROM_TO(1, 6), false, "verbose"    , 'v', OptionParser::eNoArgument      , NULL, 0, eArgTypeNone             , "Enable verbose output." },
 { 0                         , false, NULL         ,  0 , 0                , NULL, 0, eArgTypeNone             , NULL }
 };
 
@@ -868,8 +1772,206 @@ protected:
     }
 };
 
+class CommandObjectPlatformProcessAttach : public CommandObjectParsed
+{
+public:
+    
+    class CommandOptions : public Options
+    {
+    public:
+        
+        CommandOptions (CommandInterpreter &interpreter) :
+        Options(interpreter)
+        {
+            // Keep default values of all options in one place: OptionParsingStarting ()
+            OptionParsingStarting ();
+        }
+        
+        ~CommandOptions ()
+        {
+        }
+        
+        Error
+        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        {
+            Error error;
+            char short_option = (char) m_getopt_table[option_idx].val;
+            bool success = false;
+            switch (short_option)
+            {
+                case 'p':   
+                {
+                    lldb::pid_t pid = Args::StringToUInt32 (option_arg, LLDB_INVALID_PROCESS_ID, 0, &success);
+                    if (!success || pid == LLDB_INVALID_PROCESS_ID)
+                    {
+                        error.SetErrorStringWithFormat("invalid process ID '%s'", option_arg);
+                    }
+                    else
+                    {
+                        attach_info.SetProcessID (pid);
+                    }
+                }
+                    break;
+                    
+                case 'P':
+                    attach_info.SetProcessPluginName (option_arg);
+                    break;
+                    
+                case 'n': 
+                    attach_info.GetExecutableFile().SetFile(option_arg, false);
+                    break;
+                    
+                case 'w':   
+                    attach_info.SetWaitForLaunch(true);
+                    break;
+                    
+                default:
+                    error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
+                    break;
+            }
+            return error;
+        }
+        
+        void
+        OptionParsingStarting ()
+        {
+            attach_info.Clear();
+        }
+        
+        const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        virtual bool
+        HandleOptionArgumentCompletion (Args &input,
+                                        int cursor_index,
+                                        int char_pos,
+                                        OptionElementVector &opt_element_vector,
+                                        int opt_element_index,
+                                        int match_start_point,
+                                        int max_return_elements,
+                                        bool &word_complete,
+                                        StringList &matches)
+        {
+            int opt_arg_pos = opt_element_vector[opt_element_index].opt_arg_pos;
+            int opt_defs_index = opt_element_vector[opt_element_index].opt_defs_index;
+            
+            // We are only completing the name option for now...
+            
+            const OptionDefinition *opt_defs = GetDefinitions();
+            if (opt_defs[opt_defs_index].short_option == 'n')
+            {
+                // Are we in the name?
+                
+                // Look to see if there is a -P argument provided, and if so use that plugin, otherwise
+                // use the default plugin.
+                
+                const char *partial_name = NULL;
+                partial_name = input.GetArgumentAtIndex(opt_arg_pos);
+                
+                PlatformSP platform_sp (m_interpreter.GetPlatform (true));
+                if (platform_sp)
+                {
+                    ProcessInstanceInfoList process_infos;
+                    ProcessInstanceInfoMatch match_info;
+                    if (partial_name)
+                    {
+                        match_info.GetProcessInfo().GetExecutableFile().SetFile(partial_name, false);
+                        match_info.SetNameMatchType(eNameMatchStartsWith);
+                    }
+                    platform_sp->FindProcesses (match_info, process_infos);
+                    const uint32_t num_matches = process_infos.GetSize();
+                    if (num_matches > 0)
+                    {
+                        for (uint32_t i=0; i<num_matches; ++i)
+                        {
+                            matches.AppendString (process_infos.GetProcessNameAtIndex(i), 
+                                                  process_infos.GetProcessNameLengthAtIndex(i));
+                        }
+                    }
+                }
+            }
+            
+            return false;
+        }
+        
+        // Options table: Required for subclasses of Options.
+        
+        static OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        ProcessAttachInfo attach_info;
+    };
+    
+    CommandObjectPlatformProcessAttach (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform process attach",
+                         "Attach to a process.",
+                         "platform process attach <cmd-options>"),
+    m_options (interpreter)
+    {
+    }
+    
+    ~CommandObjectPlatformProcessAttach ()
+    {
+    }
+    
+    bool
+    DoExecute (Args& command,
+             CommandReturnObject &result)
+    {
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (platform_sp)
+        {
+            Error err;
+            ProcessSP remote_process_sp =
+            platform_sp->Attach(m_options.attach_info, m_interpreter.GetDebugger(), NULL, m_interpreter.GetDebugger().GetListener(), err);
+            if (err.Fail())
+            {
+                result.AppendError(err.AsCString());
+                result.SetStatus (eReturnStatusFailed);
+            }
+            else if (remote_process_sp.get() == NULL)
+            {
+                result.AppendError("could not attach: unknown reason");
+                result.SetStatus (eReturnStatusFailed);
+            }
+            else
+                result.SetStatus (eReturnStatusSuccessFinishResult);
+        }
+        else
+        {
+            result.AppendError ("no platform is currently selected");
+            result.SetStatus (eReturnStatusFailed);            
+        }
+        return result.Succeeded();
+    }
+    
+    Options *
+    GetOptions ()
+    {
+        return &m_options;
+    }
+    
+protected:
+    
+    CommandOptions m_options;
+};
 
 
+OptionDefinition
+CommandObjectPlatformProcessAttach::CommandOptions::g_option_table[] =
+{
+    { LLDB_OPT_SET_ALL, false, "plugin", 'P', OptionParser::eRequiredArgument, NULL, 0, eArgTypePlugin,        "Name of the process plugin you want to use."},
+    { LLDB_OPT_SET_1,   false, "pid",    'p', OptionParser::eRequiredArgument, NULL, 0, eArgTypePid,           "The process ID of an existing process to attach to."},
+    { LLDB_OPT_SET_2,   false, "name",   'n', OptionParser::eRequiredArgument, NULL, 0, eArgTypeProcessName,  "The name of the process to attach to."},
+    { LLDB_OPT_SET_2,   false, "waitfor",'w', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,              "Wait for the the process with <process-name> to launch."},
+    { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
+};
+
 
 class CommandObjectPlatformProcess : public CommandObjectMultiword
 {
@@ -883,7 +1985,7 @@ public:
                                 "A set of commands to query, launch and attach to platform processes",
                                 "platform process [attach|launch|list] ...")
     {
-//        LoadSubCommand ("attach", CommandObjectSP (new CommandObjectPlatformProcessAttach (interpreter)));
+        LoadSubCommand ("attach", CommandObjectSP (new CommandObjectPlatformProcessAttach (interpreter)));
         LoadSubCommand ("launch", CommandObjectSP (new CommandObjectPlatformProcessLaunch (interpreter)));
         LoadSubCommand ("info"  , CommandObjectSP (new CommandObjectPlatformProcessInfo (interpreter)));
         LoadSubCommand ("list"  , CommandObjectSP (new CommandObjectPlatformProcessList (interpreter)));
@@ -902,16 +2004,84 @@ private:
     DISALLOW_COPY_AND_ASSIGN (CommandObjectPlatformProcess);
 };
 
-
+//----------------------------------------------------------------------
+// "platform shell"
+//----------------------------------------------------------------------
 class CommandObjectPlatformShell : public CommandObjectRaw
 {
 public:
+    
+    class CommandOptions : public Options
+    {
+    public:
+        
+        CommandOptions (CommandInterpreter &interpreter) :
+        Options(interpreter),
+        timeout(10)
+        {
+        }
+        
+        virtual
+        ~CommandOptions ()
+        {
+        }
+        
+        virtual uint32_t
+        GetNumDefinitions ()
+        {
+            return 1;
+        }
+        
+        virtual const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        virtual Error
+        SetOptionValue (uint32_t option_idx,
+                        const char *option_value)
+        {
+            Error error;
+            
+            const char short_option = (char) g_option_table[option_idx].short_option;
+            
+            switch (short_option)
+            {
+                case 't':
+                {
+                    bool success;
+                    timeout = Args::StringToUInt32(option_value, 10, 10, &success);
+                    if (!success)
+                        error.SetErrorStringWithFormat("could not convert \"%s\" to a numeric value.", option_value);
+                    break;
+                }
+                default:
+                    error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
+                    break;
+            }
+            
+            return error;
+        }
+        
+        virtual void
+        OptionParsingStarting ()
+        {
+        }
+        
+        // Options table: Required for subclasses of Options.
+        
+        static OptionDefinition g_option_table[];
+        uint32_t timeout;
+    };
+    
     CommandObjectPlatformShell (CommandInterpreter &interpreter) :
-        CommandObjectRaw (interpreter, 
-                         "platform shell",
-                         "Run a shell command on a the selected platform.",
-                         "platform shell <shell-command>",
-                         0)
+    CommandObjectRaw (interpreter, 
+                      "platform shell",
+                      "Run a shell command on a the selected platform.",
+                      "platform shell <shell-command>",
+                      0),
+    m_options(interpreter)
     {
     }
     
@@ -920,31 +2090,89 @@ public:
     {
     }
     
-protected:
+    virtual
+    Options *
+    GetOptions ()
+    {
+        return &m_options;
+    }
+    
     virtual bool
     DoExecute (const char *raw_command_line, CommandReturnObject &result)
     {
-        // TODO: Implement "Platform::RunShellCommand()" and switch over to using
-        // the current platform when it is in the interface. 
-        const char *working_dir = NULL;
-        std::string output;
-        int status = -1;
-        int signo = -1;
-        Error error (Host::RunShellCommand (raw_command_line, working_dir, &status, &signo, &output, 10));
-        if (!output.empty())
-            result.GetOutputStream().PutCString(output.c_str());
-        if (status > 0)
+        m_options.NotifyOptionParsingStarting();
+        
+        const char* expr = NULL;
+
+        // Print out an usage syntax on an empty command line.
+        if (raw_command_line[0] == '\0')
         {
-            if (signo > 0)
+            result.GetOutputStream().Printf("%s\n", this->GetSyntax());
+            return true;
+        }
+
+        if (raw_command_line[0] == '-')
+        {
+            // We have some options and these options MUST end with --.
+            const char *end_options = NULL;
+            const char *s = raw_command_line;
+            while (s && s[0])
             {
-                const char *signo_cstr = Host::GetSignalAsCString(signo);
-                if (signo_cstr)
-                    result.GetOutputStream().Printf("error: command returned with status %i and signal %s\n", status, signo_cstr);
-                else
-                    result.GetOutputStream().Printf("error: command returned with status %i and signal %i\n", status, signo);
+                end_options = ::strstr (s, "--");
+                if (end_options)
+                {
+                    end_options += 2; // Get past the "--"
+                    if (::isspace (end_options[0]))
+                    {
+                        expr = end_options;
+                        while (::isspace (*expr))
+                            ++expr;
+                        break;
+                    }
+                }
+                s = end_options;
             }
-            else
-                result.GetOutputStream().Printf("error: command returned with status %i\n", status);
+            
+            if (end_options)
+            {
+                Args args (raw_command_line, end_options - raw_command_line);
+                if (!ParseOptions (args, result))
+                    return false;
+            }
+        }
+        
+        if (expr == NULL)
+            expr = raw_command_line;
+        
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        Error error;
+        if (platform_sp)
+        {
+            const char *working_dir = NULL;
+            std::string output;
+            int status = -1;
+            int signo = -1;
+            error = (platform_sp->RunShellCommand (expr, working_dir, &status, &signo, &output, m_options.timeout));
+            if (!output.empty())
+                result.GetOutputStream().PutCString(output.c_str());
+            if (status > 0)
+            {
+                if (signo > 0)
+                {
+                    const char *signo_cstr = Host::GetSignalAsCString(signo);
+                    if (signo_cstr)
+                        result.GetOutputStream().Printf("error: command returned with status %i and signal %s\n", status, signo_cstr);
+                    else
+                        result.GetOutputStream().Printf("error: command returned with status %i and signal %i\n", status, signo);
+                }
+                else
+                    result.GetOutputStream().Printf("error: command returned with status %i\n", status);
+            }
+        }
+        else
+        {
+            result.GetOutputStream().Printf("error: cannot run remote shell commands without a platform\n");
+            error.SetErrorString("error: cannot run remote shell commands without a platform");
         }
 
         if (error.Fail())
@@ -958,6 +2186,77 @@ protected:
         }
         return true;
     }
+    CommandOptions m_options;
+};
+
+OptionDefinition
+CommandObjectPlatformShell::CommandOptions::g_option_table[] =
+{
+    { LLDB_OPT_SET_ALL, false, "timeout",      't', OptionParser::eRequiredArgument, NULL, 0, eArgTypeValue,    "Seconds to wait for the remote host to finish running the command."},
+    { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
+};
+
+
+//----------------------------------------------------------------------
+// "platform install" - install a target to a remote end
+//----------------------------------------------------------------------
+class CommandObjectPlatformInstall : public CommandObjectParsed
+{
+public:
+    CommandObjectPlatformInstall (CommandInterpreter &interpreter) :
+    CommandObjectParsed (interpreter,
+                         "platform target-install",
+                         "Install a target (bundle or executable file) to the remote end.",
+                         "platform target-install <local-thing> <remote-sandbox>",
+                         0)
+    {
+    }
+    
+    virtual
+    ~CommandObjectPlatformInstall ()
+    {
+    }
+    
+    virtual bool
+    DoExecute (Args& args, CommandReturnObject &result)
+    {
+        if (args.GetArgumentCount() != 2)
+        {
+            result.AppendError("platform target-install takes two arguments");
+            result.SetStatus(eReturnStatusFailed);
+            return false;
+        }
+        // TODO: move the bulk of this code over to the platform itself
+        FileSpec src(args.GetArgumentAtIndex(0), true);
+        FileSpec dst(args.GetArgumentAtIndex(1), false);
+        if (src.Exists() == false)
+        {
+            result.AppendError("source location does not exist or is not accessible");
+            result.SetStatus(eReturnStatusFailed);
+            return false;
+        }
+        PlatformSP platform_sp (m_interpreter.GetDebugger().GetPlatformList().GetSelectedPlatform());
+        if (!platform_sp)
+        {
+            result.AppendError ("no platform currently selected");
+            result.SetStatus (eReturnStatusFailed);
+            return false;
+        }
+        
+        Error error = platform_sp->Install(src, dst);
+        if (error.Success())
+        {
+            result.SetStatus(eReturnStatusSuccessFinishNoResult);
+        }
+        else
+        {
+            result.AppendErrorWithFormat("install failed: %s", error.AsCString());
+            result.SetStatus(eReturnStatusFailed);
+        }
+        return result.Succeeded();
+    }
+private:
+
 };
 
 //----------------------------------------------------------------------
@@ -969,13 +2268,22 @@ CommandObjectPlatform::CommandObjectPlatform(CommandInterpreter &interpreter) :
                             "A set of commands to manage and create platforms.",
                             "platform [connect|disconnect|info|list|status|select] ...")
 {
-    LoadSubCommand ("select", CommandObjectSP (new CommandObjectPlatformSelect  (interpreter)));
-    LoadSubCommand ("list"  , CommandObjectSP (new CommandObjectPlatformList    (interpreter)));
-    LoadSubCommand ("status", CommandObjectSP (new CommandObjectPlatformStatus  (interpreter)));
-    LoadSubCommand ("connect", CommandObjectSP (new CommandObjectPlatformConnect  (interpreter)));
-    LoadSubCommand ("disconnect", CommandObjectSP (new CommandObjectPlatformDisconnect  (interpreter)));
-    LoadSubCommand ("process", CommandObjectSP (new CommandObjectPlatformProcess  (interpreter)));
-    LoadSubCommand ("shell", CommandObjectSP (new CommandObjectPlatformShell  (interpreter)));
+    LoadSubCommand ("select", CommandObjectSP (new CommandObjectPlatformSelect (interpreter)));
+    LoadSubCommand ("list"  , CommandObjectSP (new CommandObjectPlatformList (interpreter)));
+    LoadSubCommand ("status", CommandObjectSP (new CommandObjectPlatformStatus (interpreter)));
+    LoadSubCommand ("connect", CommandObjectSP (new CommandObjectPlatformConnect (interpreter)));
+    LoadSubCommand ("disconnect", CommandObjectSP (new CommandObjectPlatformDisconnect (interpreter)));
+    LoadSubCommand ("settings", CommandObjectSP (new CommandObjectPlatformSettings (interpreter)));
+#ifdef LLDB_CONFIGURATION_DEBUG
+    LoadSubCommand ("mkdir", CommandObjectSP (new CommandObjectPlatformMkDir (interpreter)));
+    LoadSubCommand ("file", CommandObjectSP (new CommandObjectPlatformFile (interpreter)));
+    LoadSubCommand ("get-file", CommandObjectSP (new CommandObjectPlatformGetFile (interpreter)));
+    LoadSubCommand ("get-size", CommandObjectSP (new CommandObjectPlatformGetSize (interpreter)));
+    LoadSubCommand ("put-file", CommandObjectSP (new CommandObjectPlatformPutFile (interpreter)));
+#endif
+    LoadSubCommand ("process", CommandObjectSP (new CommandObjectPlatformProcess (interpreter)));
+    LoadSubCommand ("shell", CommandObjectSP (new CommandObjectPlatformShell (interpreter)));
+    LoadSubCommand ("target-install", CommandObjectSP (new CommandObjectPlatformInstall (interpreter)));
 }
 
 
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlugin.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlugin.cpp
index 1bc7632e298..658c077bc3e 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlugin.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectPlugin.cpp
@@ -11,10 +11,6 @@
 
 #include "CommandObjectPlugin.h"
 
-#include "lldb/API/SBDebugger.h"
-#include "lldb/API/SBCommandInterpreter.h"
-#include "lldb/API/SBCommandReturnObject.h"
-
 #include "lldb/Host/Host.h"
 
 #include "lldb/Interpreter/CommandInterpreter.h"
@@ -79,8 +75,6 @@ protected:
     bool
     DoExecute (Args& command, CommandReturnObject &result)
     {
-        typedef void (*LLDBCommandPluginInit) (lldb::SBDebugger debugger);
-        
         size_t argc = command.GetArgumentCount();
         
         if (argc != 1)
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.cpp
index 4c406a4f2aa..2933c78ca90 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectProcess.cpp
@@ -251,9 +251,11 @@ protected:
         // then you'll pick up that incorrect value.
         bool synchronous_execution = m_interpreter.GetSynchronous ();
 
+        PlatformSP platform_sp (target->GetPlatform());
+
         // Finalize the file actions, and if none were given, default to opening
         // up a pseudo terminal
-        const bool default_to_use_pty = true;
+        const bool default_to_use_pty = platform_sp ? platform_sp->IsHost() : false;
         m_options.launch_info.FinalizeFileActions (target, default_to_use_pty);
 
         if (state == eStateConnected)
@@ -267,8 +269,6 @@ protected:
         
         if (!m_options.launch_info.GetArchitecture().IsValid())
             m_options.launch_info.GetArchitecture() = target->GetArchitecture();
-
-        PlatformSP platform_sp (target->GetPlatform());
         
         if (platform_sp && platform_sp->CanDebugProcess ())
         {
@@ -302,7 +302,7 @@ protected:
             if (m_options.launch_info.GetFlags().Test(eLaunchFlagStopAtEntry) == false)
             {
                 result.SetStatus (eReturnStatusSuccessContinuingNoResult);
-                StateType state = process->WaitForProcessToStop (NULL);
+                StateType state = process->WaitForProcessToStop (NULL, NULL, false);
 
                 if (state == eStateStopped)
                 {
@@ -359,14 +359,14 @@ protected:
 //OptionDefinition
 //CommandObjectProcessLaunch::CommandOptions::g_option_table[] =
 //{
-//{ SET1 | SET2 | SET3, false, "stop-at-entry", 's', no_argument,       NULL, 0, eArgTypeNone,    "Stop at the entry point of the program when launching a process."},
-//{ SET1              , false, "stdin",         'i', required_argument, NULL, 0, eArgTypeDirectoryName,    "Redirect stdin for the process to <path>."},
-//{ SET1              , false, "stdout",        'o', required_argument, NULL, 0, eArgTypeDirectoryName,    "Redirect stdout for the process to <path>."},
-//{ SET1              , false, "stderr",        'e', required_argument, NULL, 0, eArgTypeDirectoryName,    "Redirect stderr for the process to <path>."},
-//{ SET1 | SET2 | SET3, false, "plugin",        'p', required_argument, NULL, 0, eArgTypePlugin,  "Name of the process plugin you want to use."},
-//{        SET2       , false, "tty",           't', optional_argument, NULL, 0, eArgTypeDirectoryName,    "Start the process in a terminal. If <path> is specified, look for a terminal whose name contains <path>, else start the process in a new terminal."},
-//{               SET3, false, "no-stdio",      'n', no_argument,       NULL, 0, eArgTypeNone,    "Do not set up for terminal I/O to go to running process."},
-//{ SET1 | SET2 | SET3, false, "working-dir",   'w', required_argument, NULL, 0, eArgTypeDirectoryName,    "Set the current working directory to <path> when running the inferior."},
+//{ SET1 | SET2 | SET3, false, "stop-at-entry", 's', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,    "Stop at the entry point of the program when launching a process."},
+//{ SET1              , false, "stdin",         'i', OptionParser::eRequiredArgument, NULL, 0, eArgTypeDirectoryName,    "Redirect stdin for the process to <path>."},
+//{ SET1              , false, "stdout",        'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeDirectoryName,    "Redirect stdout for the process to <path>."},
+//{ SET1              , false, "stderr",        'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeDirectoryName,    "Redirect stderr for the process to <path>."},
+//{ SET1 | SET2 | SET3, false, "plugin",        'p', OptionParser::eRequiredArgument, NULL, 0, eArgTypePlugin,  "Name of the process plugin you want to use."},
+//{        SET2       , false, "tty",           't', OptionParser::eOptionalArgument, NULL, 0, eArgTypeDirectoryName,    "Start the process in a terminal. If <path> is specified, look for a terminal whose name contains <path>, else start the process in a new terminal."},
+//{               SET3, false, "no-stdio",      'n', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,    "Do not set up for terminal I/O to go to running process."},
+//{ SET1 | SET2 | SET3, false, "working-dir",   'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeDirectoryName,    "Set the current working directory to <path> when running the inferior."},
 //{ 0,                  false, NULL,             0,  0,                 NULL, 0, eArgTypeNone,    NULL }
 //};
 //
@@ -701,12 +701,12 @@ protected:
 OptionDefinition
 CommandObjectProcessAttach::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_ALL, false, "continue",'c', no_argument,         NULL, 0, eArgTypeNone,         "Immediately continue the process once attached."},
-{ LLDB_OPT_SET_ALL, false, "plugin",  'P', required_argument,   NULL, 0, eArgTypePlugin,       "Name of the process plugin you want to use."},
-{ LLDB_OPT_SET_1,   false, "pid",     'p', required_argument,   NULL, 0, eArgTypePid,          "The process ID of an existing process to attach to."},
-{ LLDB_OPT_SET_2,   false, "name",    'n', required_argument,   NULL, 0, eArgTypeProcessName,  "The name of the process to attach to."},
-{ LLDB_OPT_SET_2,   false, "include-existing", 'i', no_argument, NULL, 0, eArgTypeNone,         "Include existing processes when doing attach -w."},
-{ LLDB_OPT_SET_2,   false, "waitfor", 'w', no_argument,         NULL, 0, eArgTypeNone,         "Wait for the process with <process-name> to launch."},
+{ LLDB_OPT_SET_ALL, false, "continue",'c', OptionParser::eNoArgument,         NULL, 0, eArgTypeNone,         "Immediately continue the process once attached."},
+{ LLDB_OPT_SET_ALL, false, "plugin",  'P', OptionParser::eRequiredArgument,   NULL, 0, eArgTypePlugin,       "Name of the process plugin you want to use."},
+{ LLDB_OPT_SET_1,   false, "pid",     'p', OptionParser::eRequiredArgument,   NULL, 0, eArgTypePid,          "The process ID of an existing process to attach to."},
+{ LLDB_OPT_SET_2,   false, "name",    'n', OptionParser::eRequiredArgument,   NULL, 0, eArgTypeProcessName,  "The name of the process to attach to."},
+{ LLDB_OPT_SET_2,   false, "include-existing", 'i', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Include existing processes when doing attach -w."},
+{ LLDB_OPT_SET_2,   false, "waitfor", 'w', OptionParser::eNoArgument,         NULL, 0, eArgTypeNone,         "Wait for the process with <process-name> to launch."},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -891,7 +891,7 @@ protected:
 OptionDefinition
 CommandObjectProcessContinue::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_ALL, false, "ignore-count",'i', required_argument,         NULL, 0, eArgTypeUnsignedInteger,
+{ LLDB_OPT_SET_ALL, false, "ignore-count",'i', OptionParser::eRequiredArgument,         NULL, 0, eArgTypeUnsignedInteger,
                            "Ignore <N> crossings of the breakpoint (if it exists) for the currently selected thread."},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
@@ -1031,7 +1031,7 @@ protected:
 OptionDefinition
 CommandObjectProcessDetach::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "keep-stopped",   's', required_argument, NULL, 0, eArgTypeBoolean, "Whether or not the process should be kept stopped on detach (if possible)." },
+{ LLDB_OPT_SET_1, false, "keep-stopped",   's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean, "Whether or not the process should be kept stopped on detach (if possible)." },
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -1203,7 +1203,7 @@ protected:
 OptionDefinition
 CommandObjectProcessConnect::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "plugin", 'p', required_argument, NULL, 0, eArgTypePlugin, "Name of the process plugin you want to use."},
+    { LLDB_OPT_SET_ALL, false, "plugin", 'p', OptionParser::eRequiredArgument, NULL, 0, eArgTypePlugin, "Name of the process plugin you want to use."},
     { 0,                false, NULL,      0 , 0,                 NULL, 0, eArgTypeNone,   NULL }
 };
 
@@ -1908,9 +1908,9 @@ protected:
 OptionDefinition
 CommandObjectProcessHandle::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "stop",   's', required_argument, NULL, 0, eArgTypeBoolean, "Whether or not the process should be stopped if the signal is received." },
-{ LLDB_OPT_SET_1, false, "notify", 'n', required_argument, NULL, 0, eArgTypeBoolean, "Whether or not the debugger should notify the user if the signal is received." },
-{ LLDB_OPT_SET_1, false, "pass",  'p', required_argument, NULL, 0, eArgTypeBoolean, "Whether or not the signal should be passed to the process." },
+{ LLDB_OPT_SET_1, false, "stop",   's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean, "Whether or not the process should be stopped if the signal is received." },
+{ LLDB_OPT_SET_1, false, "notify", 'n', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean, "Whether or not the debugger should notify the user if the signal is received." },
+{ LLDB_OPT_SET_1, false, "pass",  'p', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean, "Whether or not the signal should be passed to the process." },
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectRegister.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectRegister.cpp
index ba43f23f34a..7cbfaa5d60f 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectRegister.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectRegister.cpp
@@ -98,7 +98,7 @@ public:
             {
                 strm.Indent ();
 
-                bool prefix_with_altname = m_command_options.alternate_name;
+                bool prefix_with_altname = (bool)m_command_options.alternate_name;
                 bool prefix_with_name = !prefix_with_altname;
                 reg_value.Dump(&strm, reg_info, prefix_with_name, prefix_with_altname, m_format_options.GetFormat(), 8);
                 if ((reg_info->encoding == eEncodingUint) || (reg_info->encoding == eEncodingSint))
@@ -192,7 +192,7 @@ protected:
                         if (!DumpRegisterSet (m_exe_ctx, strm, reg_ctx, set_idx))
                         {
                             if (errno)
-                                result.AppendErrorWithFormat ("register read failed with errno: %d\n", errno);
+                                result.AppendErrorWithFormat ("register read failed: %s\n", strerror(errno));
                             else
                                 result.AppendError ("unknown error while reading registers.\n");
                             result.SetStatus (eReturnStatusFailed);
@@ -351,9 +351,9 @@ protected:
 const OptionDefinition
 CommandObjectRegisterRead::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "alternate", 'A', no_argument      , NULL, 0, eArgTypeNone      , "Display register names using the alternate register name if there is one."},
-    { LLDB_OPT_SET_1  , false, "set"      , 's', required_argument, NULL, 0, eArgTypeIndex     , "Specify which register sets to dump by index."},
-    { LLDB_OPT_SET_2  , false, "all"      , 'a', no_argument      , NULL, 0, eArgTypeNone      , "Show all register sets."},
+    { LLDB_OPT_SET_ALL, false, "alternate", 'A', OptionParser::eNoArgument      , NULL, 0, eArgTypeNone      , "Display register names using the alternate register name if there is one."},
+    { LLDB_OPT_SET_1  , false, "set"      , 's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeIndex     , "Specify which register sets to dump by index."},
+    { LLDB_OPT_SET_2  , false, "all"      , 'a', OptionParser::eNoArgument      , NULL, 0, eArgTypeNone      , "Show all register sets."},
 };
 
 uint32_t
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectSettings.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectSettings.cpp
index 95cc9b68a8f..78a5ad6ca86 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectSettings.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectSettings.cpp
@@ -288,7 +288,7 @@ private:
 OptionDefinition
 CommandObjectSettingsSet::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_2, false, "global", 'g', no_argument,   NULL, 0, eArgTypeNone, "Apply the new value to the global default value." },
+    { LLDB_OPT_SET_2, false, "global", 'g', OptionParser::eNoArgument,   NULL, 0, eArgTypeNone, "Apply the new value to the global default value." },
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectSource.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectSource.cpp
index a08e39352b3..1f6873611a2 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectSource.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectSource.cpp
@@ -137,8 +137,8 @@ protected:
 OptionDefinition
 CommandObjectSourceInfo::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "line",       'l', required_argument, NULL, 0, eArgTypeLineNum,    "The line number at which to start the display source."},
-{ LLDB_OPT_SET_1, false, "file",       'f', required_argument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,    "The file from which to display source."},
+{ LLDB_OPT_SET_1, false, "line",       'l', OptionParser::eRequiredArgument, NULL, 0, eArgTypeLineNum,    "The line number at which to start the display source."},
+{ LLDB_OPT_SET_1, false, "file",       'f', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,    "The file from which to display source."},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -890,15 +890,15 @@ protected:
 OptionDefinition
 CommandObjectSourceList::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_ALL, false, "count",  'c', required_argument, NULL, 0, eArgTypeCount,   "The number of source lines to display."},
+{ LLDB_OPT_SET_ALL, false, "count",  'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCount,   "The number of source lines to display."},
 { LLDB_OPT_SET_1  |
-  LLDB_OPT_SET_2  , false, "shlib",  's', required_argument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName, "Look up the source file in the given shared library."},
-{ LLDB_OPT_SET_ALL, false, "show-breakpoints", 'b', no_argument, NULL, 0, eArgTypeNone, "Show the line table locations from the debug information that indicate valid places to set source level breakpoints."},
-{ LLDB_OPT_SET_1  , false, "file",   'f', required_argument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,    "The file from which to display source."},
-{ LLDB_OPT_SET_1  , false, "line",   'l', required_argument, NULL, 0, eArgTypeLineNum,    "The line number at which to start the display source."},
-{ LLDB_OPT_SET_2  , false, "name",   'n', required_argument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeSymbol,    "The name of a function whose source to display."},
-{ LLDB_OPT_SET_3  , false, "address",'a', required_argument, NULL, 0, eArgTypeAddressOrExpression, "Lookup the address and display the source information for the corresponding file and line."},
-{ LLDB_OPT_SET_4, false, "reverse", 'r', no_argument, NULL, 0, eArgTypeNone, "Reverse the listing to look backwards from the last displayed block of source."},
+  LLDB_OPT_SET_2  , false, "shlib",  's', OptionParser::eRequiredArgument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName, "Look up the source file in the given shared library."},
+{ LLDB_OPT_SET_ALL, false, "show-breakpoints", 'b', OptionParser::eNoArgument, NULL, 0, eArgTypeNone, "Show the line table locations from the debug information that indicate valid places to set source level breakpoints."},
+{ LLDB_OPT_SET_1  , false, "file",   'f', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,    "The file from which to display source."},
+{ LLDB_OPT_SET_1  , false, "line",   'l', OptionParser::eRequiredArgument, NULL, 0, eArgTypeLineNum,    "The line number at which to start the display source."},
+{ LLDB_OPT_SET_2  , false, "name",   'n', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeSymbol,    "The name of a function whose source to display."},
+{ LLDB_OPT_SET_3  , false, "address",'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeAddressOrExpression, "Lookup the address and display the source information for the corresponding file and line."},
+{ LLDB_OPT_SET_4, false, "reverse", 'r', OptionParser::eNoArgument, NULL, 0, eArgTypeNone, "Reverse the listing to look backwards from the last displayed block of source."},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.cpp
index dd0e2a0011b..8e7e68aad39 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectTarget.cpp
@@ -26,6 +26,7 @@
 #include "lldb/Core/State.h"
 #include "lldb/Core/Timer.h"
 #include "lldb/Core/ValueObjectVariable.h"
+#include "lldb/DataFormatters/ValueObjectPrinter.h"
 #include "lldb/Host/Symbols.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
@@ -158,6 +159,7 @@ public:
         m_arch_option (),
         m_platform_options(true), // Do include the "--platform" option in the platform settings by passing true
         m_core_file (LLDB_OPT_SET_1, false, "core", 'c', 0, eArgTypeFilename, "Fullpath to a core file to use for this target."),
+        m_platform_path (LLDB_OPT_SET_1, false, "platform-path", 'P', 0, eArgTypePath, "Path to the remote file to use for this target."),
         m_symbol_file (LLDB_OPT_SET_1, false, "symfile", 's', 0, eArgTypeFilename, "Fullpath to a stand alone debug symbols file for when debug symbols are not in the executable."),
         m_remote_file (LLDB_OPT_SET_1, false, "remote-file", 'r', 0, eArgTypeFilename, "Fullpath to the file on the remote host if debugging remotely."),
         m_add_dependents (LLDB_OPT_SET_1, false, "no-dependents", 'd', "Don't load dependent files when creating the target, just add the specified executable.", true, true)
@@ -178,6 +180,7 @@ public:
         m_option_group.Append (&m_arch_option, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Append (&m_platform_options, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Append (&m_core_file, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
+        m_option_group.Append (&m_platform_path, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Append (&m_symbol_file, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Append (&m_remote_file, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
         m_option_group.Append (&m_add_dependents, LLDB_OPT_SET_ALL, LLDB_OPT_SET_1);
@@ -226,7 +229,7 @@ protected:
         FileSpec core_file (m_core_file.GetOptionValue().GetCurrentValue());
         FileSpec remote_file (m_remote_file.GetOptionValue().GetCurrentValue());
 
-        if (argc == 1 || core_file)
+        if (argc == 1 || core_file || remote_file)
         {
             FileSpec symfile (m_symbol_file.GetOptionValue().GetCurrentValue());
             if (symfile)
@@ -243,11 +246,70 @@ protected:
 
             const char *file_path = command.GetArgumentAtIndex(0);
             Timer scoped_timer(__PRETTY_FUNCTION__, "(lldb) target create '%s'", file_path);
-            TargetSP target_sp;
+            FileSpec file_spec;
+            
+            if (file_path)
+                file_spec.SetFile (file_path, true);
+            
+            bool must_set_platform_path = false;
+            
             Debugger &debugger = m_interpreter.GetDebugger();
+            PlatformSP platform_sp(debugger.GetPlatformList().GetSelectedPlatform ());
+
+            if (remote_file)
+            {
+                // I have a remote file.. two possible cases
+                if (file_spec && file_spec.Exists())
+                {
+                    // if the remote file does not exist, push it there
+                    if (!platform_sp->GetFileExists (remote_file))
+                    {
+                        Error err = platform_sp->PutFile(file_spec, remote_file);
+                        if (err.Fail())
+                        {
+                            result.AppendError(err.AsCString());
+                            result.SetStatus (eReturnStatusFailed);
+                            return false;
+                        }
+                    }
+                }
+                else
+                {
+                    // there is no local file and we need one
+                    // in order to make the remote ---> local transfer we need a platform
+                    // TODO: if the user has passed in a --platform argument, use it to fetch the right platform
+                    if (!platform_sp)
+                    {
+                        result.AppendError("unable to perform remote debugging without a platform");
+                        result.SetStatus (eReturnStatusFailed);
+                        return false;
+                    }
+                    if (file_path)
+                    {
+                        // copy the remote file to the local file
+                        Error err = platform_sp->GetFile(remote_file, file_spec);
+                        if (err.Fail())
+                        {
+                            result.AppendError(err.AsCString());
+                            result.SetStatus (eReturnStatusFailed);
+                            return false;
+                        }
+                    }
+                    else
+                    {
+                        // make up a local file
+                        result.AppendError("remote --> local transfer without local path is not implemented yet");
+                        result.SetStatus (eReturnStatusFailed);
+                        return false;
+                    }
+                }
+            }
+
+            TargetSP target_sp;
             const char *arch_cstr = m_arch_option.GetArchitectureName();
             const bool get_dependent_files = m_add_dependents.GetOptionValue().GetCurrentValue();
             Error error (debugger.GetTargetList().CreateTarget (debugger,
+//                                                                remote_file ? remote_file : file_spec,
                                                                 file_path,
                                                                 arch_cstr,
                                                                 get_dependent_files,
@@ -273,6 +335,13 @@ protected:
                 }
                 
                 debugger.GetTargetList().SetSelectedTarget(target_sp.get());
+                if (must_set_platform_path)
+                {
+                    ModuleSpec main_module_spec(file_spec);
+                    ModuleSP module_sp = target_sp->GetSharedModule(main_module_spec);
+                    if (module_sp)
+                        module_sp->SetPlatformFileSpec(remote_file);
+                }
                 if (core_file)
                 {
                     char core_path[PATH_MAX];
@@ -341,6 +410,7 @@ private:
     OptionGroupArchitecture m_arch_option;
     OptionGroupPlatform m_platform_options;
     OptionGroupFile m_core_file;
+    OptionGroupFile m_platform_path;
     OptionGroupFile m_symbol_file;
     OptionGroupFile m_remote_file;
     OptionGroupBoolean m_add_dependents;
@@ -650,7 +720,7 @@ public:
     void
     DumpValueObject (Stream &s, VariableSP &var_sp, ValueObjectSP &valobj_sp, const char *root_name)
     {
-        ValueObject::DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions());
+        DumpValueObjectOptions options(m_varobj_options.GetAsDumpOptions());
         
         switch (var_sp->GetScope())
         {
@@ -692,10 +762,7 @@ public:
 
         options.SetRootValueObjectName(root_name);
         
-        ValueObject::DumpValueObject (s, 
-                                      valobj_sp.get(), 
-                                      options);                                        
-
+        valobj_sp->Dump(s,options);
     }
     
     
@@ -1729,10 +1796,8 @@ LookupTypeInModule (CommandInterpreter &interpreter,
             strm.Printf("%zu match%s found in ", num_matches, num_matches > 1 ? "es" : "");
             DumpFullpath (strm, &module->GetFileSpec(), 0);
             strm.PutCString(":\n");
-            const uint32_t num_types = type_list.GetSize();
-            for (uint32_t i=0; i<num_types; ++i)
+            for (TypeSP type_sp : type_list.Types())
             {
-                TypeSP type_sp (type_list.GetTypeAtIndex(i));
                 if (type_sp)
                 {
                     // Resolve the clang type so that any forward references
@@ -2214,7 +2279,7 @@ g_sort_option_enumeration[4] =
 OptionDefinition
 CommandObjectTargetModulesDumpSymtab::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "sort", 's', required_argument, g_sort_option_enumeration, 0, eArgTypeSortOrder, "Supply a sort order when dumping the symbol table."},
+    { LLDB_OPT_SET_1, false, "sort", 's', OptionParser::eRequiredArgument, g_sort_option_enumeration, 0, eArgTypeSortOrder, "Supply a sort order when dumping the symbol table."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -2694,6 +2759,8 @@ protected:
                                 module_spec.GetUUID() = m_uuid_option_group.GetOptionValue ().GetCurrentValue();
                             if (m_symbol_file.GetOptionValue().OptionWasSet())
                                 module_spec.GetSymbolFileSpec() = m_symbol_file.GetOptionValue().GetCurrentValue();
+                            if (!module_spec.GetArchitecture().IsValid())
+                                module_spec.GetArchitecture() = target->GetArchitecture();
                             Error error;
                             ModuleSP module_sp (target->GetSharedModule (module_spec, &error));
                             if (!module_sp)
@@ -3401,21 +3468,21 @@ protected:
 OptionDefinition
 CommandObjectTargetModulesList::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "address",    'a', required_argument, NULL, 0, eArgTypeAddressOrExpression, "Display the image at this address."},
-    { LLDB_OPT_SET_1, false, "arch",       'A', optional_argument, NULL, 0, eArgTypeWidth,   "Display the architecture when listing images."},
-    { LLDB_OPT_SET_1, false, "triple",     't', optional_argument, NULL, 0, eArgTypeWidth,   "Display the triple when listing images."},
-    { LLDB_OPT_SET_1, false, "header",     'h', no_argument,       NULL, 0, eArgTypeNone,    "Display the image header address as a load address if debugging, a file address otherwise."},
-    { LLDB_OPT_SET_1, false, "offset",     'o', no_argument,       NULL, 0, eArgTypeNone,    "Display the image header address offset from the header file address (the slide amount)."},
-    { LLDB_OPT_SET_1, false, "uuid",       'u', no_argument,       NULL, 0, eArgTypeNone,    "Display the UUID when listing images."},
-    { LLDB_OPT_SET_1, false, "fullpath",   'f', optional_argument, NULL, 0, eArgTypeWidth,   "Display the fullpath to the image object file."},
-    { LLDB_OPT_SET_1, false, "directory",  'd', optional_argument, NULL, 0, eArgTypeWidth,   "Display the directory with optional width for the image object file."},
-    { LLDB_OPT_SET_1, false, "basename",   'b', optional_argument, NULL, 0, eArgTypeWidth,   "Display the basename with optional width for the image object file."},
-    { LLDB_OPT_SET_1, false, "symfile",    's', optional_argument, NULL, 0, eArgTypeWidth,   "Display the fullpath to the image symbol file with optional width."},
-    { LLDB_OPT_SET_1, false, "symfile-unique", 'S', optional_argument, NULL, 0, eArgTypeWidth,   "Display the symbol file with optional width only if it is different from the executable object file."},
-    { LLDB_OPT_SET_1, false, "mod-time",   'm', optional_argument, NULL, 0, eArgTypeWidth,   "Display the modification time with optional width of the module."},
-    { LLDB_OPT_SET_1, false, "ref-count",  'r', optional_argument, NULL, 0, eArgTypeWidth,   "Display the reference count if the module is still in the shared module cache."},
-    { LLDB_OPT_SET_1, false, "pointer",    'p', optional_argument, NULL, 0, eArgTypeNone,    "Display the module pointer."},
-    { LLDB_OPT_SET_1, false, "global",     'g', no_argument,       NULL, 0, eArgTypeNone,    "Display the modules from the global module list, not just the current target."},
+    { LLDB_OPT_SET_1, false, "address",    'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeAddressOrExpression, "Display the image at this address."},
+    { LLDB_OPT_SET_1, false, "arch",       'A', OptionParser::eOptionalArgument, NULL, 0, eArgTypeWidth,   "Display the architecture when listing images."},
+    { LLDB_OPT_SET_1, false, "triple",     't', OptionParser::eOptionalArgument, NULL, 0, eArgTypeWidth,   "Display the triple when listing images."},
+    { LLDB_OPT_SET_1, false, "header",     'h', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,    "Display the image header address as a load address if debugging, a file address otherwise."},
+    { LLDB_OPT_SET_1, false, "offset",     'o', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,    "Display the image header address offset from the header file address (the slide amount)."},
+    { LLDB_OPT_SET_1, false, "uuid",       'u', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,    "Display the UUID when listing images."},
+    { LLDB_OPT_SET_1, false, "fullpath",   'f', OptionParser::eOptionalArgument, NULL, 0, eArgTypeWidth,   "Display the fullpath to the image object file."},
+    { LLDB_OPT_SET_1, false, "directory",  'd', OptionParser::eOptionalArgument, NULL, 0, eArgTypeWidth,   "Display the directory with optional width for the image object file."},
+    { LLDB_OPT_SET_1, false, "basename",   'b', OptionParser::eOptionalArgument, NULL, 0, eArgTypeWidth,   "Display the basename with optional width for the image object file."},
+    { LLDB_OPT_SET_1, false, "symfile",    's', OptionParser::eOptionalArgument, NULL, 0, eArgTypeWidth,   "Display the fullpath to the image symbol file with optional width."},
+    { LLDB_OPT_SET_1, false, "symfile-unique", 'S', OptionParser::eOptionalArgument, NULL, 0, eArgTypeWidth,   "Display the symbol file with optional width only if it is different from the executable object file."},
+    { LLDB_OPT_SET_1, false, "mod-time",   'm', OptionParser::eOptionalArgument, NULL, 0, eArgTypeWidth,   "Display the modification time with optional width of the module."},
+    { LLDB_OPT_SET_1, false, "ref-count",  'r', OptionParser::eOptionalArgument, NULL, 0, eArgTypeWidth,   "Display the reference count if the module is still in the shared module cache."},
+    { LLDB_OPT_SET_1, false, "pointer",    'p', OptionParser::eOptionalArgument, NULL, 0, eArgTypeNone,    "Display the module pointer."},
+    { LLDB_OPT_SET_1, false, "global",     'g', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,    "Display the modules from the global module list, not just the current target."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -3468,6 +3535,7 @@ public:
                 case 'a':
                 {
                     ExecutionContext exe_ctx (m_interpreter.GetExecutionContext());
+                    m_str = option_arg;
                     m_type = eLookupTypeAddress;
                     m_addr = Args::StringToAddress(&exe_ctx, option_arg, LLDB_INVALID_ADDRESS, &error);
                     if (m_addr == LLDB_INVALID_ADDRESS)
@@ -3481,6 +3549,10 @@ public:
                     m_type = eLookupTypeFunctionOrSymbol;
                     break;
                 }
+
+                default:
+                    error.SetErrorStringWithFormat ("unrecognized option %c.", short_option);
+                    break;
             }
 
             return error;
@@ -3591,8 +3663,21 @@ protected:
                 }
             }
         }
+        else
+        {
+            result.AppendError ("address-expression or function name option must be specified.");
+            result.SetStatus (eReturnStatusFailed);
+            return false;
+        }
 
         size_t num_matches = sc_list.GetSize();
+        if (num_matches == 0)
+        {
+            result.AppendErrorWithFormat ("no unwind data found that matches '%s'.", m_options.m_str.c_str());
+            result.SetStatus (eReturnStatusFailed);
+            return false;
+        }
+
         for (uint32_t idx = 0; idx < num_matches; idx++)
         {
             SymbolContext sc;
@@ -3668,8 +3753,8 @@ protected:
 OptionDefinition
 CommandObjectTargetModulesShowUnwind::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1,   false,  "name",       'n', required_argument, NULL, 0, eArgTypeFunctionName, "Show unwind instructions for a function or symbol name."},
-    { LLDB_OPT_SET_2,   false,  "address",    'a', required_argument, NULL, 0, eArgTypeAddressOrExpression, "Show unwind instructions for a function or symbol containing an address"},
+    { LLDB_OPT_SET_1,   false,  "name",       'n', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFunctionName, "Show unwind instructions for a function or symbol name."},
+    { LLDB_OPT_SET_2,   false,  "address",    'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeAddressOrExpression, "Show unwind instructions for a function or symbol containing an address"},
     { 0,                false, NULL,           0, 0,                 NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -4112,21 +4197,21 @@ protected:
 OptionDefinition
 CommandObjectTargetModulesLookup::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1,   true,  "address",    'a', required_argument, NULL, 0, eArgTypeAddressOrExpression, "Lookup an address in one or more target modules."},
-    { LLDB_OPT_SET_1,   false, "offset",     'o', required_argument, NULL, 0, eArgTypeOffset,           "When looking up an address subtract <offset> from any addresses before doing the lookup."},
+    { LLDB_OPT_SET_1,   true,  "address",    'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeAddressOrExpression, "Lookup an address in one or more target modules."},
+    { LLDB_OPT_SET_1,   false, "offset",     'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeOffset,           "When looking up an address subtract <offset> from any addresses before doing the lookup."},
     { LLDB_OPT_SET_2| LLDB_OPT_SET_4 | LLDB_OPT_SET_5
       /* FIXME: re-enable this for types when the LookupTypeInModule actually uses the regex option: | LLDB_OPT_SET_6 */ ,
-                        false, "regex",      'r', no_argument,       NULL, 0, eArgTypeNone,             "The <name> argument for name lookups are regular expressions."},
-    { LLDB_OPT_SET_2,   true,  "symbol",     's', required_argument, NULL, 0, eArgTypeSymbol,           "Lookup a symbol by name in the symbol tables in one or more target modules."},
-    { LLDB_OPT_SET_3,   true,  "file",       'f', required_argument, NULL, 0, eArgTypeFilename,         "Lookup a file by fullpath or basename in one or more target modules."},
-    { LLDB_OPT_SET_3,   false, "line",       'l', required_argument, NULL, 0, eArgTypeLineNum,          "Lookup a line number in a file (must be used in conjunction with --file)."},
+                        false, "regex",      'r', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,             "The <name> argument for name lookups are regular expressions."},
+    { LLDB_OPT_SET_2,   true,  "symbol",     's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeSymbol,           "Lookup a symbol by name in the symbol tables in one or more target modules."},
+    { LLDB_OPT_SET_3,   true,  "file",       'f', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFilename,         "Lookup a file by fullpath or basename in one or more target modules."},
+    { LLDB_OPT_SET_3,   false, "line",       'l', OptionParser::eRequiredArgument, NULL, 0, eArgTypeLineNum,          "Lookup a line number in a file (must be used in conjunction with --file)."},
     { LLDB_OPT_SET_FROM_TO(3,5),
-                        false, "no-inlines", 'i', no_argument,       NULL, 0, eArgTypeNone,             "Ignore inline entries (must be used in conjunction with --file or --function)."},
-    { LLDB_OPT_SET_4,   true,  "function",   'F', required_argument, NULL, 0, eArgTypeFunctionName,     "Lookup a function by name in the debug symbols in one or more target modules."},
-    { LLDB_OPT_SET_5,   true,  "name",       'n', required_argument, NULL, 0, eArgTypeFunctionOrSymbol, "Lookup a function or symbol by name in one or more target modules."},
-    { LLDB_OPT_SET_6,   true,  "type",       't', required_argument, NULL, 0, eArgTypeName,             "Lookup a type by name in the debug symbols in one or more target modules."},
-    { LLDB_OPT_SET_ALL, false, "verbose",    'v', no_argument,       NULL, 0, eArgTypeNone,             "Enable verbose lookup information."},
-    { LLDB_OPT_SET_ALL, false, "all",        'A', no_argument,       NULL, 0, eArgTypeNone,             "Print all matches, not just the best match, if a best match is available."},
+                        false, "no-inlines", 'i', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,             "Ignore inline entries (must be used in conjunction with --file or --function)."},
+    { LLDB_OPT_SET_4,   true,  "function",   'F', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFunctionName,     "Lookup a function by name in the debug symbols in one or more target modules."},
+    { LLDB_OPT_SET_5,   true,  "name",       'n', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFunctionOrSymbol, "Lookup a function or symbol by name in one or more target modules."},
+    { LLDB_OPT_SET_6,   true,  "type",       't', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,             "Lookup a type by name in the debug symbols in one or more target modules."},
+    { LLDB_OPT_SET_ALL, false, "verbose",    'v', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,             "Enable verbose lookup information."},
+    { LLDB_OPT_SET_ALL, false, "all",        'A', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,             "Print all matches, not just the best match, if a best match is available."},
     { 0,                false, NULL,           0, 0,                 NULL, 0, eArgTypeNone,             NULL }
 };
 
@@ -5062,27 +5147,27 @@ private:
 OptionDefinition
 CommandObjectTargetStopHookAdd::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "one-liner", 'o', required_argument, NULL, 0, eArgTypeOneLiner,
+    { LLDB_OPT_SET_ALL, false, "one-liner", 'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeOneLiner,
         "Specify a one-line breakpoint command inline. Be sure to surround it with quotes." },
-    { LLDB_OPT_SET_ALL, false, "shlib", 's', required_argument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName,
+    { LLDB_OPT_SET_ALL, false, "shlib", 's', OptionParser::eRequiredArgument, NULL, CommandCompletions::eModuleCompletion, eArgTypeShlibName,
         "Set the module within which the stop-hook is to be run."},
-    { LLDB_OPT_SET_ALL, false, "thread-index", 'x', required_argument, NULL, 0, eArgTypeThreadIndex,
+    { LLDB_OPT_SET_ALL, false, "thread-index", 'x', OptionParser::eRequiredArgument, NULL, 0, eArgTypeThreadIndex,
         "The stop hook is run only for the thread whose index matches this argument."},
-    { LLDB_OPT_SET_ALL, false, "thread-id", 't', required_argument, NULL, 0, eArgTypeThreadID,
+    { LLDB_OPT_SET_ALL, false, "thread-id", 't', OptionParser::eRequiredArgument, NULL, 0, eArgTypeThreadID,
         "The stop hook is run only for the thread whose TID matches this argument."},
-    { LLDB_OPT_SET_ALL, false, "thread-name", 'T', required_argument, NULL, 0, eArgTypeThreadName,
+    { LLDB_OPT_SET_ALL, false, "thread-name", 'T', OptionParser::eRequiredArgument, NULL, 0, eArgTypeThreadName,
         "The stop hook is run only for the thread whose thread name matches this argument."},
-    { LLDB_OPT_SET_ALL, false, "queue-name", 'q', required_argument, NULL, 0, eArgTypeQueueName,
+    { LLDB_OPT_SET_ALL, false, "queue-name", 'q', OptionParser::eRequiredArgument, NULL, 0, eArgTypeQueueName,
         "The stop hook is run only for threads in the queue whose name is given by this argument."},
-    { LLDB_OPT_SET_1, false, "file", 'f', required_argument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,
+    { LLDB_OPT_SET_1, false, "file", 'f', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,
         "Specify the source file within which the stop-hook is to be run." },
-    { LLDB_OPT_SET_1, false, "start-line", 'l', required_argument, NULL, 0, eArgTypeLineNum,
+    { LLDB_OPT_SET_1, false, "start-line", 'l', OptionParser::eRequiredArgument, NULL, 0, eArgTypeLineNum,
         "Set the start of the line range for which the stop-hook is to be run."},
-    { LLDB_OPT_SET_1, false, "end-line", 'e', required_argument, NULL, 0, eArgTypeLineNum,
+    { LLDB_OPT_SET_1, false, "end-line", 'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeLineNum,
         "Set the end of the line range for which the stop-hook is to be run."},
-    { LLDB_OPT_SET_2, false, "classname", 'c', required_argument, NULL, 0, eArgTypeClassName,
+    { LLDB_OPT_SET_2, false, "classname", 'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeClassName,
         "Specify the class within which the stop-hook is to be run." },
-    { LLDB_OPT_SET_3, false, "name", 'n', required_argument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName,
+    { LLDB_OPT_SET_3, false, "name", 'n', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSymbolCompletion, eArgTypeFunctionName,
         "Set the function name within which the stop hook will be run." },
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.cpp
index b8657b4361d..10d661882c9 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectThread.cpp
@@ -28,6 +28,7 @@
 #include "lldb/Symbol/LineEntry.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
+#include "lldb/Target/SystemRuntime.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/ThreadPlan.h"
@@ -92,6 +93,13 @@ public:
                     if (!success)
                         error.SetErrorStringWithFormat("invalid integer value for option '%c'", short_option);
                 }
+                case 'e':
+                {
+                    bool success;
+                    m_extended_backtrace =  Args::StringToBoolean (option_arg, false, &success);
+                    if (!success)
+                        error.SetErrorStringWithFormat("invalid boolean value for option '%c'", short_option);
+                }
                 break;
                 default:
                     error.SetErrorStringWithFormat("invalid short option character '%c'", short_option);
@@ -106,6 +114,7 @@ public:
         {
             m_count = UINT32_MAX;
             m_start = 0;
+            m_extended_backtrace = false;
         }
 
         const OptionDefinition*
@@ -121,6 +130,7 @@ public:
         // Instance variables to hold the values for command options.
         uint32_t m_count;
         uint32_t m_start;
+        bool     m_extended_backtrace;
     };
 
     CommandObjectThreadBacktrace (CommandInterpreter &interpreter) :
@@ -160,6 +170,32 @@ public:
     }
 
 protected:
+    void
+    DoExtendedBacktrace (Thread *thread, CommandReturnObject &result)
+    {
+        SystemRuntime *runtime = thread->GetProcess()->GetSystemRuntime();
+        if (runtime)
+        {
+            Stream &strm = result.GetOutputStream();
+            const std::vector<ConstString> &types = runtime->GetExtendedBacktraceTypes();
+            for (auto type : types)
+            {
+                ThreadSP ext_thread_sp = runtime->GetExtendedBacktraceThread (thread->shared_from_this(), type);
+                if (ext_thread_sp && ext_thread_sp->IsValid ())
+                {
+                    const uint32_t num_frames_with_source = 0;
+                    if (ext_thread_sp->GetStatus (strm, 
+                        m_options.m_start, 
+                        m_options.m_count, 
+                        num_frames_with_source))
+                    {
+                        DoExtendedBacktrace (ext_thread_sp.get(), result);
+                    }
+                }
+            }
+        }
+    }
+
     virtual bool
     DoExecute (Args& command, CommandReturnObject &result)
     {        
@@ -178,29 +214,36 @@ protected:
                                    num_frames_with_source))
             {
                 result.SetStatus (eReturnStatusSuccessFinishResult);
+                if (m_options.m_extended_backtrace)
+                {
+                    DoExtendedBacktrace (thread, result);
+                }
             }
         }
         else if (command.GetArgumentCount() == 1 && ::strcmp (command.GetArgumentAtIndex(0), "all") == 0)
         {
             Process *process = m_exe_ctx.GetProcessPtr();
-            Mutex::Locker locker (process->GetThreadList().GetMutex());
-            uint32_t num_threads = process->GetThreadList().GetSize();
-            for (uint32_t i = 0; i < num_threads; i++)
+            uint32_t idx = 0;
+            for (ThreadSP thread_sp : process->Threads())
             {
-                ThreadSP thread_sp = process->GetThreadList().GetThreadAtIndex(i);
+                if (idx != 0)
+                    result.AppendMessage("");
+
                 if (!thread_sp->GetStatus (strm,
                                            m_options.m_start,
                                            m_options.m_count,
                                            num_frames_with_source))
                 {
-                    result.AppendErrorWithFormat ("error displaying backtrace for thread: \"0x%4.4x\"\n", i);
+                    result.AppendErrorWithFormat ("error displaying backtrace for thread: \"0x%4.4x\"\n", idx);
                     result.SetStatus (eReturnStatusFailed);
                     return false;
                 }
+                if (m_options.m_extended_backtrace)
+                {
+                    DoExtendedBacktrace (thread_sp.get(), result);
+                }
                 
-                if (i < num_threads - 1)
-                    result.AppendMessage("");
-                    
+                ++idx;
             }
         }
         else
@@ -244,6 +287,10 @@ protected:
                     result.SetStatus (eReturnStatusFailed);
                     return false;
                 }
+                if (m_options.m_extended_backtrace)
+                {
+                    DoExtendedBacktrace (thread_sps[i].get(), result);
+                }
                 
                 if (i < num_args - 1)
                     result.AppendMessage("");
@@ -258,8 +305,9 @@ protected:
 OptionDefinition
 CommandObjectThreadBacktrace::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "count", 'c', required_argument, NULL, 0, eArgTypeCount, "How many frames to display (-1 for all)"},
-{ LLDB_OPT_SET_1, false, "start", 's', required_argument, NULL, 0, eArgTypeFrameIndex, "Frame in which to start the backtrace"},
+{ LLDB_OPT_SET_1, false, "count", 'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCount, "How many frames to display (-1 for all)"},
+{ LLDB_OPT_SET_1, false, "start", 's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFrameIndex, "Frame in which to start the backtrace"},
+{ LLDB_OPT_SET_1, false, "extended", 'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean, "Show the extended backtrace, if available"},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -591,10 +639,10 @@ g_duo_running_mode[] =
 OptionDefinition
 CommandObjectThreadStepWithTypeAndScope::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "avoid-no-debug",  'a', required_argument, NULL,               0, eArgTypeBoolean,     "A boolean value that sets whether step-in will step over functions with no debug information."},
-{ LLDB_OPT_SET_1, false, "run-mode",        'm', required_argument, g_tri_running_mode, 0, eArgTypeRunMode, "Determine how to run other threads while stepping the current thread."},
-{ LLDB_OPT_SET_1, false, "step-over-regexp",'r', required_argument, NULL,               0, eArgTypeRegularExpression,   "A regular expression that defines function names to not to stop at when stepping in."},
-{ LLDB_OPT_SET_1, false, "step-in-target",  't', required_argument, NULL,               0, eArgTypeFunctionName,   "The name of the directly called function step in should stop at when stepping into."},
+{ LLDB_OPT_SET_1, false, "avoid-no-debug",  'a', OptionParser::eRequiredArgument, NULL,               0, eArgTypeBoolean,     "A boolean value that sets whether step-in will step over functions with no debug information."},
+{ LLDB_OPT_SET_1, false, "run-mode",        'm', OptionParser::eRequiredArgument, g_tri_running_mode, 0, eArgTypeRunMode, "Determine how to run other threads while stepping the current thread."},
+{ LLDB_OPT_SET_1, false, "step-over-regexp",'r', OptionParser::eRequiredArgument, NULL,               0, eArgTypeRegularExpression,   "A regular expression that defines function names to not to stop at when stepping in."},
+{ LLDB_OPT_SET_1, false, "step-in-target",  't', OptionParser::eRequiredArgument, NULL,               0, eArgTypeFunctionName,   "The name of the directly called function step in should stop at when stepping into."},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -660,11 +708,14 @@ public:
         StateType state = process->GetState();
         if ((state == eStateCrashed) || (state == eStateStopped) || (state == eStateSuspended))
         {
-            Mutex::Locker locker (process->GetThreadList().GetMutex());
-            const uint32_t num_threads = process->GetThreadList().GetSize();
             const size_t argc = command.GetArgumentCount();
             if (argc > 0)
             {
+                // These two lines appear at the beginning of both blocks in
+                // this if..else, but that is because we need to release the
+                // lock before calling process->Resume below.
+                Mutex::Locker locker (process->GetThreadList().GetMutex());
+                const uint32_t num_threads = process->GetThreadList().GetSize();
                 std::vector<Thread *> resume_threads;
                 for (uint32_t i=0; i<argc; ++i)
                 {
@@ -674,7 +725,7 @@ public:
                     if (success)
                     {
                         Thread *thread = process->GetThreadList().FindThreadByIndexID(thread_idx).get();
-                        
+
                         if (thread)
                         {
                             resume_threads.push_back(thread);
@@ -693,7 +744,7 @@ public:
                         return false;
                     }
                 }
-                
+
                 if (resume_threads.empty())
                 {
                     result.AppendError ("no valid thread indexes were specified");
@@ -706,12 +757,12 @@ public:
                         result.AppendMessageWithFormat ("Resuming thread: ");
                     else
                         result.AppendMessageWithFormat ("Resuming threads: ");
-                    
+
                     for (uint32_t idx=0; idx<num_threads; ++idx)
                     {
                         Thread *thread = process->GetThreadList().GetThreadAtIndex(idx).get();
                         std::vector<Thread *>::iterator this_thread_pos = find(resume_threads.begin(), resume_threads.end(), thread);
-                        
+
                         if (this_thread_pos != resume_threads.end())
                         {
                             resume_threads.erase(this_thread_pos);
@@ -719,7 +770,7 @@ public:
                                 result.AppendMessageWithFormat ("%u, ", thread->GetIndexID());
                             else
                                 result.AppendMessageWithFormat ("%u ", thread->GetIndexID());
-                            
+
                             thread->SetResumeState (eStateRunning);
                         }
                         else
@@ -732,6 +783,11 @@ public:
             }
             else
             {
+                // These two lines appear at the beginning of both blocks in
+                // this if..else, but that is because we need to release the
+                // lock before calling process->Resume below.
+                Mutex::Locker locker (process->GetThreadList().GetMutex());
+                const uint32_t num_threads = process->GetThreadList().GetSize();
                 Thread *current_thread = process->GetThreadList().GetSelectedThread().get();
                 if (current_thread == NULL)
                 {
@@ -754,7 +810,8 @@ public:
                     }
                 }
             }
-            
+
+            // We should not be holding the thread list lock when we do this.
             Error error (process->Resume());
             if (error.Success())
             {
@@ -762,7 +819,7 @@ public:
                 if (synchronous_execution)
                 {
                     state = process->WaitForProcessToStop (NULL);
-                    
+
                     result.SetDidChangeProcessState (true);
                     result.AppendMessageWithFormat ("Process %" PRIu64 " %s\n", process->GetID(), StateAsCString (state));
                     result.SetStatus (eReturnStatusSuccessFinishNoResult);
@@ -1120,9 +1177,9 @@ protected:
 OptionDefinition
 CommandObjectThreadUntil::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "frame",   'f', required_argument, NULL,               0, eArgTypeFrameIndex,   "Frame index for until operation - defaults to 0"},
-{ LLDB_OPT_SET_1, false, "thread",  't', required_argument, NULL,               0, eArgTypeThreadIndex,  "Thread index for the thread for until operation"},
-{ LLDB_OPT_SET_1, false, "run-mode",'m', required_argument, g_duo_running_mode, 0, eArgTypeRunMode,"Determine how to run other threads while stepping this one"},
+{ LLDB_OPT_SET_1, false, "frame",   'f', OptionParser::eRequiredArgument, NULL,               0, eArgTypeFrameIndex,   "Frame index for until operation - defaults to 0"},
+{ LLDB_OPT_SET_1, false, "thread",  't', OptionParser::eRequiredArgument, NULL,               0, eArgTypeThreadIndex,  "Thread index for the thread for until operation"},
+{ LLDB_OPT_SET_1, false, "run-mode",'m', OptionParser::eRequiredArgument, g_duo_running_mode, 0, eArgTypeRunMode,"Determine how to run other threads while stepping this one"},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -1458,10 +1515,212 @@ protected:
 OptionDefinition
 CommandObjectThreadReturn::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_ALL, false, "from-expression",  'x', no_argument, NULL,               0, eArgTypeNone,     "Return from the innermost expression evaluation."},
+{ LLDB_OPT_SET_ALL, false, "from-expression",  'x', OptionParser::eNoArgument, NULL,               0, eArgTypeNone,     "Return from the innermost expression evaluation."},
 { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
+//-------------------------------------------------------------------------
+// CommandObjectThreadJump
+//-------------------------------------------------------------------------
+
+class CommandObjectThreadJump : public CommandObjectParsed
+{
+public:
+    class CommandOptions : public Options
+    {
+    public:
+
+        CommandOptions (CommandInterpreter &interpreter) :
+            Options (interpreter)
+        {
+            OptionParsingStarting ();
+        }
+
+        void
+        OptionParsingStarting ()
+        {
+            m_filenames.Clear();
+            m_line_num = 0;
+            m_line_offset = 0;
+            m_load_addr = LLDB_INVALID_ADDRESS;
+            m_force = false;
+        }
+
+        virtual
+        ~CommandOptions ()
+        {
+        }
+
+        virtual Error
+        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        {
+            bool success;
+            const int short_option = m_getopt_table[option_idx].val;
+            Error error;
+
+            switch (short_option)
+            {
+                case 'f':
+                    m_filenames.AppendIfUnique (FileSpec(option_arg, false));
+                    if (m_filenames.GetSize() > 1)
+                        return Error("only one source file expected.");
+                    break;
+                case 'l':
+                    m_line_num = Args::StringToUInt32 (option_arg, 0, 0, &success);
+                    if (!success || m_line_num == 0)
+                        return Error("invalid line number: '%s'.", option_arg);
+                    break;
+                case 'b':
+                    m_line_offset = Args::StringToSInt32 (option_arg, 0, 0, &success);
+                    if (!success)
+                        return Error("invalid line offset: '%s'.", option_arg);
+                    break;
+                case 'a':
+                    {
+                        ExecutionContext exe_ctx (m_interpreter.GetExecutionContext());
+                        m_load_addr = Args::StringToAddress(&exe_ctx, option_arg, LLDB_INVALID_ADDRESS, &error);
+                    }
+                    break;
+                case 'r':
+                    m_force = true;
+                    break;
+
+                 default:
+                    return Error("invalid short option character '%c'", short_option);
+
+            }
+            return error;
+        }
+
+        const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+
+        FileSpecList m_filenames;
+        uint32_t m_line_num;
+        int32_t m_line_offset;
+        lldb::addr_t m_load_addr;
+        bool m_force;
+
+        static OptionDefinition g_option_table[];
+    };
+
+    virtual
+    Options *
+    GetOptions ()
+    {
+        return &m_options;
+    }
+
+    CommandObjectThreadJump (CommandInterpreter &interpreter) :
+        CommandObjectParsed (interpreter,
+                          "thread jump",
+                          "Sets the program counter to a new address.",
+                          "thread jump",
+                          eFlagRequiresFrame         |
+                          eFlagTryTargetAPILock      |
+                          eFlagProcessMustBeLaunched |
+                          eFlagProcessMustBePaused   ),
+        m_options (interpreter)
+    {
+    }
+
+    ~CommandObjectThreadJump()
+    {
+    }
+
+protected:
+
+    bool DoExecute (Args& args, CommandReturnObject &result)
+    {
+        RegisterContext *reg_ctx = m_exe_ctx.GetRegisterContext();
+        StackFrame *frame = m_exe_ctx.GetFramePtr();
+        Thread *thread = m_exe_ctx.GetThreadPtr();
+        Target *target = m_exe_ctx.GetTargetPtr();
+        const SymbolContext &sym_ctx = frame->GetSymbolContext (eSymbolContextLineEntry);
+
+        if (m_options.m_load_addr != LLDB_INVALID_ADDRESS)
+        {
+            // Use this address directly.
+            Address dest = Address(m_options.m_load_addr);
+
+            lldb::addr_t callAddr = dest.GetCallableLoadAddress (target);
+            if (callAddr == LLDB_INVALID_ADDRESS)
+            {
+                result.AppendErrorWithFormat ("Invalid destination address.");
+                result.SetStatus (eReturnStatusFailed);
+                return false;
+            }
+
+            if (!reg_ctx->SetPC (callAddr))
+            {
+                result.AppendErrorWithFormat ("Error changing PC value for thread %d.", thread->GetIndexID());
+                result.SetStatus (eReturnStatusFailed);
+                return false;
+            }
+        }
+        else
+        {
+            // Pick either the absolute line, or work out a relative one.
+            int32_t line = (int32_t)m_options.m_line_num;
+            if (line == 0)
+                line = sym_ctx.line_entry.line + m_options.m_line_offset;
+
+            // Try the current file, but override if asked.
+            FileSpec file = sym_ctx.line_entry.file;
+            if (m_options.m_filenames.GetSize() == 1)
+                file = m_options.m_filenames.GetFileSpecAtIndex(0);
+
+            if (!file)
+            {
+                result.AppendErrorWithFormat ("No source file available for the current location.");
+                result.SetStatus (eReturnStatusFailed);
+                return false;
+            }
+
+            std::string warnings;
+            Error err = thread->JumpToLine (file, line, m_options.m_force, &warnings);
+
+            if (err.Fail())
+            {
+                result.SetError (err);
+                return false;
+            }
+
+            if (!warnings.empty())
+                result.AppendWarning (warnings.c_str());
+        }
+
+        result.SetStatus (eReturnStatusSuccessFinishResult);
+        return true;
+    }
+
+    CommandOptions m_options;
+};
+OptionDefinition
+CommandObjectThreadJump::CommandOptions::g_option_table[] =
+{
+    { LLDB_OPT_SET_1, false, "file", 'f', OptionParser::eRequiredArgument, NULL, CommandCompletions::eSourceFileCompletion, eArgTypeFilename,
+        "Specifies the source file to jump to."},
+
+    { LLDB_OPT_SET_1, true, "line", 'l', OptionParser::eRequiredArgument, NULL, 0, eArgTypeLineNum,
+        "Specifies the line number to jump to."},
+
+    { LLDB_OPT_SET_2, true, "by", 'b', OptionParser::eRequiredArgument, NULL, 0, eArgTypeOffset,
+        "Jumps by a relative line offset from the current line."},
+
+    { LLDB_OPT_SET_3, true, "address", 'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeAddressOrExpression,
+        "Jumps to a specific address."},
+
+    { LLDB_OPT_SET_1|
+      LLDB_OPT_SET_2|
+      LLDB_OPT_SET_3, false, "force",'r', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,"Allows the PC to leave the current function."},
+
+    { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
+};
+
 //-------------------------------------------------------------------------
 // CommandObjectMultiwordThread
 //-------------------------------------------------------------------------
@@ -1476,6 +1735,7 @@ CommandObjectMultiwordThread::CommandObjectMultiwordThread (CommandInterpreter &
     LoadSubCommand ("continue",   CommandObjectSP (new CommandObjectThreadContinue (interpreter)));
     LoadSubCommand ("list",       CommandObjectSP (new CommandObjectThreadList (interpreter)));
     LoadSubCommand ("return",     CommandObjectSP (new CommandObjectThreadReturn (interpreter)));
+    LoadSubCommand ("jump",       CommandObjectSP (new CommandObjectThreadJump (interpreter)));
     LoadSubCommand ("select",     CommandObjectSP (new CommandObjectThreadSelect (interpreter)));
     LoadSubCommand ("until",      CommandObjectSP (new CommandObjectThreadUntil (interpreter)));
     LoadSubCommand ("step-in",    CommandObjectSP (new CommandObjectThreadStepWithTypeAndScope (
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectType.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectType.cpp
index b300f213db0..1c695b37c56 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectType.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectType.cpp
@@ -369,6 +369,8 @@ private:
             m_cascade = true;
             m_skip_pointers = false;
             m_skip_references = false;
+            m_regex = false;
+            m_category.assign("default");
         }
         virtual Error
         SetOptionValue (CommandInterpreter &interpreter,
@@ -389,9 +391,15 @@ private:
                 case 'p':
                     m_skip_pointers = true;
                     break;
+                case 'w':
+                    m_category.assign(option_value);
+                    break;
                 case 'r':
                     m_skip_references = true;
                     break;
+                case 'x':
+                    m_regex = true;
+                    break;
                 default:
                     error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
                     break;
@@ -409,6 +417,8 @@ private:
         bool m_cascade;
         bool m_skip_references;
         bool m_skip_pointers;
+        bool m_regex;
+        std::string m_category;
     };
     
     OptionGroupOptions m_option_group;
@@ -510,12 +520,32 @@ protected:
 
         // now I have a valid format, let's add it to every type
         
+        TypeCategoryImplSP category_sp;
+        DataVisualization::Categories::GetCategory(ConstString(m_command_options.m_category), category_sp);
+        if (!category_sp)
+            return false;
+        
         for (size_t i = 0; i < argc; i++)
         {
             const char* typeA = command.GetArgumentAtIndex(i);
             ConstString typeCS(typeA);
             if (typeCS)
-                DataVisualization::ValueFormats::Add(typeCS, entry);
+            {
+                if (m_command_options.m_regex)
+                {
+                    RegularExpressionSP typeRX(new RegularExpression());
+                    if (!typeRX->Compile(typeCS.GetCString()))
+                    {
+                        result.AppendError("regex format error (maybe this is not really a regex?)");
+                        result.SetStatus(eReturnStatusFailed);
+                        return false;
+                    }
+                    category_sp->GetRegexSummaryNavigator()->Delete(typeCS);
+                    category_sp->GetRegexValueNavigator()->Add(typeRX, entry);
+                }
+                else
+                    category_sp->GetValueNavigator()->Add(typeCS, entry);
+            }
             else
             {
                 result.AppendError("empty typenames not allowed");
@@ -532,9 +562,12 @@ protected:
 OptionDefinition
 CommandObjectTypeFormatAdd::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "cascade", 'C', required_argument, NULL, 0, eArgTypeBoolean,    "If true, cascade through typedef chains."},
-    { LLDB_OPT_SET_ALL, false, "skip-pointers", 'p', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for pointers-to-type objects."},
-    { LLDB_OPT_SET_ALL, false, "skip-references", 'r', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for references-to-type objects."},
+    { LLDB_OPT_SET_ALL, false, "category", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,    "Add this to the given category instead of the default one."},
+    { LLDB_OPT_SET_ALL, false, "cascade", 'C', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,    "If true, cascade through typedef chains."},
+    { LLDB_OPT_SET_ALL, false, "skip-pointers", 'p', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Don't use this format for pointers-to-type objects."},
+    { LLDB_OPT_SET_ALL, false, "skip-references", 'r', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Don't use this format for references-to-type objects."},
+    { LLDB_OPT_SET_ALL, false,  "regex", 'x', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,    "Type names are actually regular expressions."},
+    { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
 
@@ -551,12 +584,89 @@ CommandObjectTypeFormatAdd::CommandOptions::GetNumDefinitions ()
 
 class CommandObjectTypeFormatDelete : public CommandObjectParsed
 {
+private:
+    class CommandOptions : public Options
+    {
+    public:
+        
+        CommandOptions (CommandInterpreter &interpreter) :
+        Options (interpreter)
+        {
+        }
+        
+        virtual
+        ~CommandOptions (){}
+        
+        virtual Error
+        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        {
+            Error error;
+            const int short_option = m_getopt_table[option_idx].val;
+            
+            switch (short_option)
+            {
+                case 'a':
+                    m_delete_all = true;
+                    break;
+                case 'w':
+                    m_category = std::string(option_arg);
+                    break;
+                default:
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
+                    break;
+            }
+            
+            return error;
+        }
+        
+        void
+        OptionParsingStarting ()
+        {
+            m_delete_all = false;
+            m_category = "default";
+        }
+        
+        const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        // Options table: Required for subclasses of Options.
+        
+        static OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        bool m_delete_all;
+        std::string m_category;
+        
+    };
+    
+    CommandOptions m_options;
+    
+    virtual Options *
+    GetOptions ()
+    {
+        return &m_options;
+    }
+    
+    static bool
+    PerCategoryCallback(void* param,
+                        const lldb::TypeCategoryImplSP& category_sp)
+    {
+		ConstString *name = (ConstString*)param;
+		category_sp->Delete(*name, eFormatCategoryItemValue | eFormatCategoryItemRegexValue);
+		return true;
+    }
+
 public:
     CommandObjectTypeFormatDelete (CommandInterpreter &interpreter) :
         CommandObjectParsed (interpreter,
                              "type format delete",
                              "Delete an existing formatting style for a type.",
-                             NULL)
+                             NULL),
+    m_options(interpreter)
     {
         CommandArgumentEntry type_arg;
         CommandArgumentData type_style_arg;
@@ -597,8 +707,20 @@ protected:
             return false;
         }
         
+        if (m_options.m_delete_all)
+        {
+            DataVisualization::Categories::LoopThrough(PerCategoryCallback, &typeCS);
+            result.SetStatus(eReturnStatusSuccessFinishNoResult);
+            return result.Succeeded();
+        }
         
-        if (DataVisualization::ValueFormats::Delete(typeCS))
+        lldb::TypeCategoryImplSP category;
+        DataVisualization::Categories::GetCategory(ConstString(m_options.m_category.c_str()), category);
+        
+        bool delete_category = category->Delete(typeCS,
+                                                eFormatCategoryItemValue | eFormatCategoryItemRegexValue);
+        
+        if (delete_category)
         {
             result.SetStatus(eReturnStatusSuccessFinishNoResult);
             return result.Succeeded();
@@ -614,18 +736,100 @@ protected:
     
 };
 
+OptionDefinition
+CommandObjectTypeFormatDelete::CommandOptions::g_option_table[] =
+{
+    { LLDB_OPT_SET_1, false, "all", 'a', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,  "Delete from every category."},
+    { LLDB_OPT_SET_2, false, "category", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,  "Delete from given category."},
+    { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
+};
+
 //-------------------------------------------------------------------------
 // CommandObjectTypeFormatClear
 //-------------------------------------------------------------------------
 
 class CommandObjectTypeFormatClear : public CommandObjectParsed
 {
+private:
+    
+    class CommandOptions : public Options
+    {
+    public:
+        
+        CommandOptions (CommandInterpreter &interpreter) :
+        Options (interpreter)
+        {
+        }
+        
+        virtual
+        ~CommandOptions (){}
+        
+        virtual Error
+        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        {
+            Error error;
+            const int short_option = m_getopt_table[option_idx].val;
+            
+            switch (short_option)
+            {
+                case 'a':
+                    m_delete_all = true;
+                    break;
+                default:
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
+                    break;
+            }
+            
+            return error;
+        }
+        
+        void
+        OptionParsingStarting ()
+        {
+            m_delete_all = false;
+        }
+        
+        const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        // Options table: Required for subclasses of Options.
+        
+        static OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        bool m_delete_all;
+        bool m_delete_named;
+    };
+    
+    CommandOptions m_options;
+    
+    virtual Options *
+    GetOptions ()
+    {
+        return &m_options;
+    }
+    
+    static bool
+    PerCategoryCallback(void* param,
+                        const lldb::TypeCategoryImplSP& cate)
+    {
+        cate->GetValueNavigator()->Clear();
+        cate->GetRegexValueNavigator()->Clear();
+        return true;
+        
+    }
+    
 public:
     CommandObjectTypeFormatClear (CommandInterpreter &interpreter) :
         CommandObjectParsed (interpreter,
                              "type format clear",
                              "Delete all existing format styles.",
-                             NULL)
+                             NULL),
+    m_options(interpreter)
     {
     }
     
@@ -637,18 +841,42 @@ protected:
     bool
     DoExecute (Args& command, CommandReturnObject &result)
     {
-        DataVisualization::ValueFormats::Clear();
+        if (m_options.m_delete_all)
+            DataVisualization::Categories::LoopThrough(PerCategoryCallback, NULL);
+        
+        else
+        {
+            lldb::TypeCategoryImplSP category;
+            if (command.GetArgumentCount() > 0)
+            {
+                const char* cat_name = command.GetArgumentAtIndex(0);
+                ConstString cat_nameCS(cat_name);
+                DataVisualization::Categories::GetCategory(cat_nameCS, category);
+            }
+            else
+                DataVisualization::Categories::GetCategory(ConstString(NULL), category);
+            category->Clear(eFormatCategoryItemValue | eFormatCategoryItemRegexValue);
+        }
+        
         result.SetStatus(eReturnStatusSuccessFinishResult);
         return result.Succeeded();
     }
     
 };
 
+OptionDefinition
+CommandObjectTypeFormatClear::CommandOptions::g_option_table[] =
+{
+    { LLDB_OPT_SET_ALL, false, "all", 'a', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,  "Clear every category."},
+    { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
+};
+
 //-------------------------------------------------------------------------
 // CommandObjectTypeFormatList
 //-------------------------------------------------------------------------
 
 bool CommandObjectTypeFormatList_LoopCallback(void* pt2self, ConstString type, const lldb::TypeFormatImplSP& entry);
+bool CommandObjectTypeRXFormatList_LoopCallback(void* pt2self, lldb::RegularExpressionSP regex, const lldb::TypeFormatImplSP& entry);
 
 class CommandObjectTypeFormatList;
 
@@ -656,18 +884,81 @@ struct CommandObjectTypeFormatList_LoopCallbackParam {
     CommandObjectTypeFormatList* self;
     CommandReturnObject* result;
     RegularExpression* regex;
+    RegularExpression* cate_regex;
     CommandObjectTypeFormatList_LoopCallbackParam(CommandObjectTypeFormatList* S, CommandReturnObject* R,
-                                            RegularExpression* X = NULL) : self(S), result(R), regex(X) {}
+                                            RegularExpression* X = NULL, RegularExpression* CX = NULL) : self(S), result(R), regex(X), cate_regex(CX) {}
 };
 
 class CommandObjectTypeFormatList : public CommandObjectParsed
 {
+    class CommandOptions : public Options
+    {
+    public:
+        
+        CommandOptions (CommandInterpreter &interpreter) :
+        Options (interpreter)
+        {
+        }
+        
+        virtual
+        ~CommandOptions (){}
+        
+        virtual Error
+        SetOptionValue (uint32_t option_idx, const char *option_arg)
+        {
+            Error error;
+            const int short_option = m_getopt_table[option_idx].val;
+            
+            switch (short_option)
+            {
+                case 'w':
+                    m_category_regex = std::string(option_arg);
+                    break;
+                default:
+                    error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
+                    break;
+            }
+            
+            return error;
+        }
+        
+        void
+        OptionParsingStarting ()
+        {
+            m_category_regex = "";
+        }
+        
+        const OptionDefinition*
+        GetDefinitions ()
+        {
+            return g_option_table;
+        }
+        
+        // Options table: Required for subclasses of Options.
+        
+        static OptionDefinition g_option_table[];
+        
+        // Instance variables to hold the values for command options.
+        
+        std::string m_category_regex;
+        
+    };
+    
+    CommandOptions m_options;
+    
+    virtual Options *
+    GetOptions ()
+    {
+        return &m_options;
+    }
+
 public:
     CommandObjectTypeFormatList (CommandInterpreter &interpreter) :
         CommandObjectParsed (interpreter,
                              "type format list",
                              "Show a list of current formatting styles.",
-                             NULL)
+                             NULL),
+    m_options(interpreter)
     {
         CommandArgumentEntry type_arg;
         CommandArgumentData type_style_arg;
@@ -691,38 +982,77 @@ protected:
         const size_t argc = command.GetArgumentCount();
         
         CommandObjectTypeFormatList_LoopCallbackParam *param;
+        RegularExpression* cate_regex =
+        m_options.m_category_regex.empty() ? NULL :
+        new RegularExpression(m_options.m_category_regex.c_str());
         
         if (argc == 1)
         {
             RegularExpression* regex = new RegularExpression(command.GetArgumentAtIndex(0));
             regex->Compile(command.GetArgumentAtIndex(0));
-            param = new CommandObjectTypeFormatList_LoopCallbackParam(this,&result,regex);
+            param = new CommandObjectTypeFormatList_LoopCallbackParam(this,&result,regex,cate_regex);
         }
         else
-            param = new CommandObjectTypeFormatList_LoopCallbackParam(this,&result);
-        DataVisualization::ValueFormats::LoopThrough(CommandObjectTypeFormatList_LoopCallback, param);
-        delete param;
+            param = new CommandObjectTypeFormatList_LoopCallbackParam(this,&result,NULL,cate_regex);
+        
+        DataVisualization::Categories::LoopThrough(PerCategoryCallback,param);
+
+        if (cate_regex)
+            delete cate_regex;
+        
         result.SetStatus(eReturnStatusSuccessFinishResult);
         return result.Succeeded();
     }
     
 private:
     
-    bool
-    LoopCallback (ConstString type,
-                  const lldb::TypeFormatImplSP& entry,
-                  RegularExpression* regex,
-                  CommandReturnObject *result)
+    static bool
+    PerCategoryCallback(void* param_vp,
+                        const lldb::TypeCategoryImplSP& cate)
     {
-        if (regex == NULL || regex->Execute(type.AsCString())) 
+        
+        CommandObjectTypeFormatList_LoopCallbackParam* param =
+        (CommandObjectTypeFormatList_LoopCallbackParam*)param_vp;
+        CommandReturnObject* result = param->result;
+        
+        const char* cate_name = cate->GetName();
+        
+        // if the category is disabled or empty and there is no regex, just skip it
+        if ((cate->IsEnabled() == false || cate->GetCount(eFormatCategoryItemValue | eFormatCategoryItemRegexValue) == 0) && param->cate_regex == NULL)
+            return true;
+        
+        // if we have a regex and this category does not match it, just skip it
+        if(param->cate_regex != NULL && strcmp(cate_name,param->cate_regex->GetText()) != 0 && param->cate_regex->Execute(cate_name) == false)
+            return true;
+        
+        result->GetOutputStream().Printf("-----------------------\nCategory: %s (%s)\n-----------------------\n",
+                                         cate_name,
+                                         (cate->IsEnabled() ? "enabled" : "disabled"));
+        
+        cate->GetValueNavigator()->LoopThrough(CommandObjectTypeFormatList_LoopCallback, param_vp);
+        
+        if (cate->GetRegexSummaryNavigator()->GetCount() > 0)
         {
-            result->GetOutputStream().Printf ("%s: %s\n", type.AsCString(), 
-                                              entry->GetDescription().c_str());
+            result->GetOutputStream().Printf("Regex-based summaries (slower):\n");
+            cate->GetRegexValueNavigator()->LoopThrough(CommandObjectTypeRXFormatList_LoopCallback, param_vp);
         }
         return true;
     }
     
+    
+    bool
+    LoopCallback (const char* type,
+                  const lldb::TypeFormatImplSP& entry,
+                  RegularExpression* regex,
+                  CommandReturnObject *result)
+    {
+        if (regex == NULL || strcmp(type,regex->GetText()) == 0 || regex->Execute(type))
+            result->GetOutputStream().Printf ("%s: %s\n", type, entry->GetDescription().c_str());
+        return true;
+    }
+    
     friend bool CommandObjectTypeFormatList_LoopCallback(void* pt2self, ConstString type, const lldb::TypeFormatImplSP& entry);
+    friend bool CommandObjectTypeRXFormatList_LoopCallback(void* pt2self, lldb::RegularExpressionSP regex, const lldb::TypeFormatImplSP& entry);
     
 };
 
@@ -733,9 +1063,25 @@ CommandObjectTypeFormatList_LoopCallback (
                                     const lldb::TypeFormatImplSP& entry)
 {
     CommandObjectTypeFormatList_LoopCallbackParam* param = (CommandObjectTypeFormatList_LoopCallbackParam*)pt2self;
-    return param->self->LoopCallback(type, entry, param->regex, param->result);
+    return param->self->LoopCallback(type.AsCString(), entry, param->regex, param->result);
 }
 
+bool
+CommandObjectTypeRXFormatList_LoopCallback (
+                                             void* pt2self,
+                                             lldb::RegularExpressionSP regex,
+                                             const lldb::TypeFormatImplSP& entry)
+{
+    CommandObjectTypeFormatList_LoopCallbackParam* param = (CommandObjectTypeFormatList_LoopCallbackParam*)pt2self;
+    return param->self->LoopCallback(regex->GetText(), entry, param->regex, param->result);
+}
+
+OptionDefinition
+CommandObjectTypeFormatList::CommandOptions::g_option_table[] =
+{
+    { LLDB_OPT_SET_ALL, false, "category-regex", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,  "Only show categories matching this filter."},
+    { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
+};
 
 #ifndef LLDB_DISABLE_PYTHON
 
@@ -1395,20 +1741,20 @@ CommandObjectTypeSummaryAdd::AddSummary(ConstString type_name,
 OptionDefinition
 CommandObjectTypeSummaryAdd::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "category", 'w', required_argument, NULL, 0, eArgTypeName,    "Add this to the given category instead of the default one."},
-    { LLDB_OPT_SET_ALL, false, "cascade", 'C', required_argument, NULL, 0, eArgTypeBoolean,    "If true, cascade through typedef chains."},
-    { LLDB_OPT_SET_ALL, false, "no-value", 'v', no_argument, NULL, 0, eArgTypeNone,         "Don't show the value, just show the summary, for this type."},
-    { LLDB_OPT_SET_ALL, false, "skip-pointers", 'p', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for pointers-to-type objects."},
-    { LLDB_OPT_SET_ALL, false, "skip-references", 'r', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for references-to-type objects."},
-    { LLDB_OPT_SET_ALL, false,  "regex", 'x', no_argument, NULL, 0, eArgTypeNone,    "Type names are actually regular expressions."},
-    { LLDB_OPT_SET_1  , true, "inline-children", 'c', no_argument, NULL, 0, eArgTypeNone,    "If true, inline all child values into summary string."},
-    { LLDB_OPT_SET_1  , false, "omit-names", 'O', no_argument, NULL, 0, eArgTypeNone,    "If true, omit value names in the summary display."},
-    { LLDB_OPT_SET_2  , true, "summary-string", 's', required_argument, NULL, 0, eArgTypeSummaryString,    "Summary string used to display text and object contents."},
-    { LLDB_OPT_SET_3, false, "python-script", 'o', required_argument, NULL, 0, eArgTypePythonScript, "Give a one-liner Python script as part of the command."},
-    { LLDB_OPT_SET_3, false, "python-function", 'F', required_argument, NULL, 0, eArgTypePythonFunction, "Give the name of a Python function to use for this type."},
-    { LLDB_OPT_SET_3, false, "input-python", 'P', no_argument, NULL, 0, eArgTypeNone, "Input Python code to use for this type manually."},
-    { LLDB_OPT_SET_2 | LLDB_OPT_SET_3,   false, "expand", 'e', no_argument, NULL, 0, eArgTypeNone,    "Expand aggregate data types to show children on separate lines."},
-    { LLDB_OPT_SET_2 | LLDB_OPT_SET_3,   false, "name", 'n', required_argument, NULL, 0, eArgTypeName,    "A name for this summary string."},
+    { LLDB_OPT_SET_ALL, false, "category", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,    "Add this to the given category instead of the default one."},
+    { LLDB_OPT_SET_ALL, false, "cascade", 'C', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,    "If true, cascade through typedef chains."},
+    { LLDB_OPT_SET_ALL, false, "no-value", 'v', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Don't show the value, just show the summary, for this type."},
+    { LLDB_OPT_SET_ALL, false, "skip-pointers", 'p', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Don't use this format for pointers-to-type objects."},
+    { LLDB_OPT_SET_ALL, false, "skip-references", 'r', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Don't use this format for references-to-type objects."},
+    { LLDB_OPT_SET_ALL, false,  "regex", 'x', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,    "Type names are actually regular expressions."},
+    { LLDB_OPT_SET_1  , true, "inline-children", 'c', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,    "If true, inline all child values into summary string."},
+    { LLDB_OPT_SET_1  , false, "omit-names", 'O', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,    "If true, omit value names in the summary display."},
+    { LLDB_OPT_SET_2  , true, "summary-string", 's', OptionParser::eRequiredArgument, NULL, 0, eArgTypeSummaryString,    "Summary string used to display text and object contents."},
+    { LLDB_OPT_SET_3, false, "python-script", 'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypePythonScript, "Give a one-liner Python script as part of the command."},
+    { LLDB_OPT_SET_3, false, "python-function", 'F', OptionParser::eRequiredArgument, NULL, 0, eArgTypePythonFunction, "Give the name of a Python function to use for this type."},
+    { LLDB_OPT_SET_3, false, "input-python", 'P', OptionParser::eNoArgument, NULL, 0, eArgTypeNone, "Input Python code to use for this type manually."},
+    { LLDB_OPT_SET_2 | LLDB_OPT_SET_3,   false, "expand", 'e', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,    "Expand aggregate data types to show children on separate lines."},
+    { LLDB_OPT_SET_2 | LLDB_OPT_SET_3,   false, "name", 'n', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,    "A name for this summary string."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -1574,8 +1920,8 @@ protected:
 OptionDefinition
 CommandObjectTypeSummaryDelete::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "all", 'a', no_argument, NULL, 0, eArgTypeNone,  "Delete from every category."},
-    { LLDB_OPT_SET_2, false, "category", 'w', required_argument, NULL, 0, eArgTypeName,  "Delete from given category."},
+    { LLDB_OPT_SET_1, false, "all", 'a', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,  "Delete from every category."},
+    { LLDB_OPT_SET_2, false, "category", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,  "Delete from given category."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -1701,7 +2047,7 @@ protected:
 OptionDefinition
 CommandObjectTypeSummaryClear::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "all", 'a', no_argument, NULL, 0, eArgTypeNone,  "Clear every category."},
+    { LLDB_OPT_SET_ALL, false, "all", 'a', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,  "Clear every category."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -1929,7 +2275,7 @@ CommandObjectTypeRXSummaryList_LoopCallback (
 OptionDefinition
 CommandObjectTypeSummaryList::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "category-regex", 'w', required_argument, NULL, 0, eArgTypeName,  "Only show categories matching this filter."},
+    { LLDB_OPT_SET_ALL, false, "category-regex", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,  "Only show categories matching this filter."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -2476,7 +2822,7 @@ CommandObjectTypeFilterRXList_LoopCallback (void* pt2self,
 OptionDefinition
 CommandObjectTypeFilterList::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "category-regex", 'w', required_argument, NULL, 0, eArgTypeName,  "Only show categories matching this filter."},
+    { LLDB_OPT_SET_ALL, false, "category-regex", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,  "Only show categories matching this filter."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -2690,7 +3036,7 @@ CommandObjectTypeSynthRXList_LoopCallback (void* pt2self,
 OptionDefinition
 CommandObjectTypeSynthList::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "category-regex", 'w', required_argument, NULL, 0, eArgTypeName,  "Only show categories matching this filter."},
+    { LLDB_OPT_SET_ALL, false, "category-regex", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,  "Only show categories matching this filter."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -2854,8 +3200,8 @@ protected:
 OptionDefinition
 CommandObjectTypeFilterDelete::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "all", 'a', no_argument, NULL, 0, eArgTypeNone,  "Delete from every category."},
-    { LLDB_OPT_SET_2, false, "category", 'w', required_argument, NULL, 0, eArgTypeName,  "Delete from given category."},
+    { LLDB_OPT_SET_1, false, "all", 'a', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,  "Delete from every category."},
+    { LLDB_OPT_SET_2, false, "category", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,  "Delete from given category."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -3020,8 +3366,8 @@ protected:
 OptionDefinition
 CommandObjectTypeSynthDelete::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "all", 'a', no_argument, NULL, 0, eArgTypeNone,  "Delete from every category."},
-    { LLDB_OPT_SET_2, false, "category", 'w', required_argument, NULL, 0, eArgTypeName,  "Delete from given category."},
+    { LLDB_OPT_SET_1, false, "all", 'a', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,  "Delete from every category."},
+    { LLDB_OPT_SET_2, false, "category", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,  "Delete from given category."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -3151,7 +3497,7 @@ protected:
 OptionDefinition
 CommandObjectTypeFilterClear::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "all", 'a', no_argument, NULL, 0, eArgTypeNone,  "Clear every category."},
+    { LLDB_OPT_SET_ALL, false, "all", 'a', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,  "Clear every category."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -3280,7 +3626,7 @@ protected:
 OptionDefinition
 CommandObjectTypeSynthClear::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "all", 'a', no_argument, NULL, 0, eArgTypeNone,  "Clear every category."},
+    { LLDB_OPT_SET_ALL, false, "all", 'a', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,  "Clear every category."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -3663,13 +4009,13 @@ CommandObjectTypeSynthAdd::DoExecute (Args& command, CommandReturnObject &result
 OptionDefinition
 CommandObjectTypeSynthAdd::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "cascade", 'C', required_argument, NULL, 0, eArgTypeBoolean,    "If true, cascade through typedef chains."},
-    { LLDB_OPT_SET_ALL, false, "skip-pointers", 'p', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for pointers-to-type objects."},
-    { LLDB_OPT_SET_ALL, false, "skip-references", 'r', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for references-to-type objects."},
-    { LLDB_OPT_SET_ALL, false, "category", 'w', required_argument, NULL, 0, eArgTypeName,         "Add this to the given category instead of the default one."},
-    { LLDB_OPT_SET_2, false, "python-class", 'l', required_argument, NULL, 0, eArgTypePythonClass,    "Use this Python class to produce synthetic children."},
-    { LLDB_OPT_SET_3, false, "input-python", 'P', no_argument, NULL, 0, eArgTypeNone,    "Type Python code to generate a class that provides synthetic children."},
-    { LLDB_OPT_SET_ALL, false,  "regex", 'x', no_argument, NULL, 0, eArgTypeNone,    "Type names are actually regular expressions."},
+    { LLDB_OPT_SET_ALL, false, "cascade", 'C', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,    "If true, cascade through typedef chains."},
+    { LLDB_OPT_SET_ALL, false, "skip-pointers", 'p', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Don't use this format for pointers-to-type objects."},
+    { LLDB_OPT_SET_ALL, false, "skip-references", 'r', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Don't use this format for references-to-type objects."},
+    { LLDB_OPT_SET_ALL, false, "category", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,         "Add this to the given category instead of the default one."},
+    { LLDB_OPT_SET_2, false, "python-class", 'l', OptionParser::eRequiredArgument, NULL, 0, eArgTypePythonClass,    "Use this Python class to produce synthetic children."},
+    { LLDB_OPT_SET_3, false, "input-python", 'P', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,    "Type Python code to generate a class that provides synthetic children."},
+    { LLDB_OPT_SET_ALL, false,  "regex", 'x', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,    "Type names are actually regular expressions."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -3967,12 +4313,12 @@ protected:
 OptionDefinition
 CommandObjectTypeFilterAdd::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "cascade", 'C', required_argument, NULL, 0, eArgTypeBoolean,    "If true, cascade through typedef chains."},
-    { LLDB_OPT_SET_ALL, false, "skip-pointers", 'p', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for pointers-to-type objects."},
-    { LLDB_OPT_SET_ALL, false, "skip-references", 'r', no_argument, NULL, 0, eArgTypeNone,         "Don't use this format for references-to-type objects."},
-    { LLDB_OPT_SET_ALL, false, "category", 'w', required_argument, NULL, 0, eArgTypeName,         "Add this to the given category instead of the default one."},
-    { LLDB_OPT_SET_ALL, false, "child", 'c', required_argument, NULL, 0, eArgTypeExpressionPath,    "Include this expression path in the synthetic view."},
-    { LLDB_OPT_SET_ALL, false,  "regex", 'x', no_argument, NULL, 0, eArgTypeNone,    "Type names are actually regular expressions."},
+    { LLDB_OPT_SET_ALL, false, "cascade", 'C', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,    "If true, cascade through typedef chains."},
+    { LLDB_OPT_SET_ALL, false, "skip-pointers", 'p', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Don't use this format for pointers-to-type objects."},
+    { LLDB_OPT_SET_ALL, false, "skip-references", 'r', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,         "Don't use this format for references-to-type objects."},
+    { LLDB_OPT_SET_ALL, false, "category", 'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName,         "Add this to the given category instead of the default one."},
+    { LLDB_OPT_SET_ALL, false, "child", 'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeExpressionPath,    "Include this expression path in the synthetic view."},
+    { LLDB_OPT_SET_ALL, false,  "regex", 'x', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,    "Type names are actually regular expressions."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.cpp
index 6f70f39c1c7..e55b2ee4d7d 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpoint.cpp
@@ -335,13 +335,13 @@ private:
 OptionDefinition
 CommandObjectWatchpointList::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "brief",    'b', no_argument, NULL, 0, eArgTypeNone,
+    { LLDB_OPT_SET_1, false, "brief",    'b', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,
         "Give a brief description of the watchpoint (no location info)."},
 
-    { LLDB_OPT_SET_2, false, "full",    'f', no_argument, NULL, 0, eArgTypeNone,
+    { LLDB_OPT_SET_2, false, "full",    'f', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,
         "Give a full description of the watchpoint and its locations."},
 
-    { LLDB_OPT_SET_3, false, "verbose", 'v', no_argument, NULL, 0, eArgTypeNone,
+    { LLDB_OPT_SET_3, false, "verbose", 'v', OptionParser::eNoArgument, NULL, 0, eArgTypeNone,
         "Explain everything we know about the watchpoint (for debugging debugger bugs)." },
 
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
@@ -397,7 +397,7 @@ protected:
         {
             // No watchpoint selected; enable all currently set watchpoints.
             target->EnableAllWatchpoints();
-            result.AppendMessageWithFormat("All watchpoints enabled. (%lu watchpoints)\n", num_watchpoints);
+            result.AppendMessageWithFormat("All watchpoints enabled. (%zu watchpoints)\n", num_watchpoints);
             result.SetStatus(eReturnStatusSuccessFinishNoResult);
         }
         else
@@ -476,7 +476,7 @@ protected:
             // No watchpoint selected; disable all currently set watchpoints.
             if (target->DisableAllWatchpoints())
             {
-                result.AppendMessageWithFormat("All watchpoints disabled. (%lu watchpoints)\n", num_watchpoints);
+                result.AppendMessageWithFormat("All watchpoints disabled. (%zu watchpoints)\n", num_watchpoints);
                 result.SetStatus(eReturnStatusSuccessFinishNoResult);
             }
             else
@@ -564,7 +564,7 @@ protected:
             else
             {
                 target->RemoveAllWatchpoints();
-                result.AppendMessageWithFormat("All watchpoints removed. (%lu watchpoints)\n", num_watchpoints);
+                result.AppendMessageWithFormat("All watchpoints removed. (%zu watchpoints)\n", num_watchpoints);
             }
             result.SetStatus (eReturnStatusSuccessFinishNoResult);
         }
@@ -706,7 +706,7 @@ protected:
         if (command.GetArgumentCount() == 0)
         {
             target->IgnoreAllWatchpoints(m_options.m_ignore_count);
-            result.AppendMessageWithFormat("All watchpoints ignored. (%lu watchpoints)\n", num_watchpoints);
+            result.AppendMessageWithFormat("All watchpoints ignored. (%zu watchpoints)\n", num_watchpoints);
             result.SetStatus (eReturnStatusSuccessFinishNoResult);
         }
         else
@@ -740,7 +740,7 @@ private:
 OptionDefinition
 CommandObjectWatchpointIgnore::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, true, "ignore-count", 'i', required_argument, NULL, 0, eArgTypeCount, "Set the number of times this watchpoint is skipped before stopping." },
+    { LLDB_OPT_SET_ALL, true, "ignore-count", 'i', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCount, "Set the number of times this watchpoint is skipped before stopping." },
     { 0,                false, NULL,            0 , 0,                 NULL, 0,    eArgTypeNone, NULL }
 };
 
@@ -903,7 +903,7 @@ private:
 OptionDefinition
 CommandObjectWatchpointModify::CommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_ALL, false, "condition",    'c', required_argument, NULL, 0, eArgTypeExpression, "The watchpoint stops only if this condition expression evaluates to true."},
+{ LLDB_OPT_SET_ALL, false, "condition",    'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeExpression, "The watchpoint stops only if this condition expression evaluates to true."},
 { 0,                false, NULL,            0 , 0,                 NULL, 0,    eArgTypeNone, NULL }
 };
 
@@ -939,7 +939,7 @@ public:
         SetHelpLong(
     "Examples: \n\
     \n\
-        watchpoint set variable -w read_wriate my_global_var \n\
+        watchpoint set variable -w read_write my_global_var \n\
         # Watch my_global_var for read/write access, with the region to watch corresponding to the byte size of the data type.\n");
 
         CommandArgumentEntry arg;
@@ -1099,7 +1099,7 @@ protected:
         }
         else
         {
-            result.AppendErrorWithFormat("Watchpoint creation failed (addr=0x%" PRIx64 ", size=%lu, variable expression='%s').\n",
+            result.AppendErrorWithFormat("Watchpoint creation failed (addr=0x%" PRIx64 ", size=%zu, variable expression='%s').\n",
                                          addr, size, command.GetArgumentAtIndex(0));
             if (error.AsCString(NULL))
                 result.AppendError(error.AsCString());
@@ -1256,11 +1256,11 @@ protected:
 
         // Use expression evaluation to arrive at the address to watch.
         EvaluateExpressionOptions options;
-        options.SetCoerceToId(false)
-        .SetUnwindOnError(true)
-        .SetKeepInMemory(false)
-        .SetRunOthers(true)
-        .SetTimeoutUsec(0);
+        options.SetCoerceToId(false);
+        options.SetUnwindOnError(true);
+        options.SetKeepInMemory(false);
+        options.SetTryAllThreads(true);
+        options.SetTimeoutUsec(0);
         
         ExecutionResults expr_result = target->EvaluateExpression (expr, 
                                                                    frame, 
@@ -1308,7 +1308,7 @@ protected:
         }
         else
         {
-            result.AppendErrorWithFormat("Watchpoint creation failed (addr=0x%" PRIx64 ", size=%lu).\n",
+            result.AppendErrorWithFormat("Watchpoint creation failed (addr=0x%" PRIx64 ", size=%zu).\n",
                                          addr, size);
             if (error.AsCString(NULL))
                 result.AppendError(error.AsCString());
diff --git a/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpointCommand.cpp b/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpointCommand.cpp
index 4e200465031..e19216d74fc 100644
--- a/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpointCommand.cpp
+++ b/contrib/llvm/tools/lldb/source/Commands/CommandObjectWatchpointCommand.cpp
@@ -601,16 +601,16 @@ g_script_option_enumeration[4] =
 OptionDefinition
 CommandObjectWatchpointCommandAdd::CommandOptions::g_option_table[] =
 {
-    { LLDB_OPT_SET_1,   false, "one-liner",       'o', required_argument, NULL, 0, eArgTypeOneLiner,
+    { LLDB_OPT_SET_1,   false, "one-liner",       'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeOneLiner,
         "Specify a one-line watchpoint command inline. Be sure to surround it with quotes." },
 
-    { LLDB_OPT_SET_ALL, false, "stop-on-error",   'e', required_argument, NULL, 0, eArgTypeBoolean,
+    { LLDB_OPT_SET_ALL, false, "stop-on-error",   'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,
         "Specify whether watchpoint command execution should terminate on error." },
 
-    { LLDB_OPT_SET_ALL, false, "script-type",     's', required_argument, g_script_option_enumeration, 0, eArgTypeNone,
+    { LLDB_OPT_SET_ALL, false, "script-type",     's', OptionParser::eRequiredArgument, g_script_option_enumeration, 0, eArgTypeNone,
         "Specify the language for the commands - if none is specified, the lldb command interpreter will be used."},
 
-    { LLDB_OPT_SET_2,   false, "python-function", 'F', required_argument, NULL, 0, eArgTypePythonFunction,
+    { LLDB_OPT_SET_2,   false, "python-function", 'F', OptionParser::eRequiredArgument, NULL, 0, eArgTypePythonFunction,
         "Give the name of a Python function to run as command for this watchpoint. Be sure to give a module name if appropriate."},
     
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
diff --git a/contrib/llvm/tools/lldb/source/Core/Address.cpp b/contrib/llvm/tools/lldb/source/Core/Address.cpp
index 8d599d80ad4..de2165cff84 100644
--- a/contrib/llvm/tools/lldb/source/Core/Address.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Address.cpp
@@ -12,7 +12,6 @@
 #include "lldb/Core/Section.h"
 #include "lldb/Symbol/Block.h"
 #include "lldb/Symbol/ObjectFile.h"
-#include "lldb/Symbol/Type.h"
 #include "lldb/Symbol/Variable.h"
 #include "lldb/Symbol/VariableList.h"
 #include "lldb/Target/ExecutionContext.h"
@@ -281,6 +280,12 @@ Address::GetFileAddress () const
         // address by adding the file base address to our offset
         return sect_file_addr + m_offset;
     }
+    else if (SectionWasDeletedPrivate())
+    {
+        // Used to have a valid section but it got deleted so the
+        // offset doesn't mean anything without the section
+        return LLDB_INVALID_ADDRESS;
+    }
     // No section, we just return the offset since it is the value in this case
     return m_offset;
 }
@@ -289,25 +294,33 @@ addr_t
 Address::GetLoadAddress (Target *target) const
 {
     SectionSP section_sp (GetSection());
-    if (!section_sp)
+    if (section_sp)
     {
-        // No section, we just return the offset since it is the value in this case
-        return m_offset;
-    }
-    
-    if (target)
-    {
-        addr_t sect_load_addr = section_sp->GetLoadBaseAddress (target);
-
-        if (sect_load_addr != LLDB_INVALID_ADDRESS)
+        if (target)
         {
-            // We have a valid file range, so we can return the file based
-            // address by adding the file base address to our offset
-            return sect_load_addr + m_offset;
+            addr_t sect_load_addr = section_sp->GetLoadBaseAddress (target);
+
+            if (sect_load_addr != LLDB_INVALID_ADDRESS)
+            {
+                // We have a valid file range, so we can return the file based
+                // address by adding the file base address to our offset
+                return sect_load_addr + m_offset;
+            }
         }
     }
-    // The section isn't resolved or no process was supplied so we can't
-    // return a valid file address.
+    else if (SectionWasDeletedPrivate())
+    {
+        // Used to have a valid section but it got deleted so the
+        // offset doesn't mean anything without the section
+        return LLDB_INVALID_ADDRESS;
+    }
+    else
+    {
+        // We don't have a section so the offset is the load address
+        return m_offset;
+    }
+    // The section isn't resolved or an invalid target was passed in
+    // so we can't return a valid load address.
     return LLDB_INVALID_ADDRESS;
 }
 
@@ -767,6 +780,27 @@ Address::Dump (Stream *s, ExecutionContextScope *exe_scope, DumpStyle style, Dum
     return true;
 }
 
+bool
+Address::SectionWasDeleted() const
+{
+    if (GetSection())
+        return false;
+    return SectionWasDeletedPrivate();
+}
+
+bool
+Address::SectionWasDeletedPrivate() const
+{
+    lldb::SectionWP empty_section_wp;
+
+    // If either call to "std::weak_ptr::owner_before(...) value returns true, this
+    // indicates that m_section_wp once contained (possibly still does) a reference
+    // to a valid shared pointer. This helps us know if we had a valid reference to
+    // a section which is now invalid because the module it was in was unloaded/deleted,
+    // or if the address doesn't have a valid reference to a section.
+    return empty_section_wp.owner_before(m_section_wp) || m_section_wp.owner_before(empty_section_wp);
+}
+
 uint32_t
 Address::CalculateSymbolContext (SymbolContext *sc, uint32_t resolve_scope) const
 {
diff --git a/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp b/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp
index 27d62c358bb..5cd6fb02159 100644
--- a/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ArchSpec.cpp
@@ -14,6 +14,7 @@
 
 #include <string>
 
+#include "llvm/Support/COFF.h"
 #include "llvm/Support/ELF.h"
 #include "llvm/Support/Host.h"
 #include "llvm/Support/MachO.h"
@@ -55,6 +56,7 @@ static const CoreDefinition g_core_definitions[ArchSpec::kNumCores] =
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv5e      , "armv5e"    },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv5t      , "armv5t"    },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv6       , "armv6"     },
+    { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv6m      , "armv6m"    },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv7       , "armv7"     },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv7f      , "armv7f"    },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::arm    , ArchSpec::eCore_arm_armv7s      , "armv7s"    },
@@ -67,13 +69,15 @@ static const CoreDefinition g_core_definitions[ArchSpec::kNumCores] =
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv5         , "thumbv5"   },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv5e        , "thumbv5e"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv6         , "thumbv6"   },
+    { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv6m        , "thumbv6m"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7         , "thumbv7"   },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7f        , "thumbv7f"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7s        , "thumbv7s"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7k        , "thumbv7k"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7m        , "thumbv7m"  },
     { eByteOrderLittle, 4, 2, 4, llvm::Triple::thumb  , ArchSpec::eCore_thumbv7em       , "thumbv7em" },
-    
+
+    { eByteOrderBig   , 8, 4, 4, llvm::Triple::mips64 , ArchSpec::eCore_mips64          , "mips64"    },
     
     { eByteOrderBig   , 4, 4, 4, llvm::Triple::ppc    , ArchSpec::eCore_ppc_generic     , "ppc"       },
     { eByteOrderBig   , 4, 4, 4, llvm::Triple::ppc    , ArchSpec::eCore_ppc_ppc601      , "ppc601"    },
@@ -159,6 +163,7 @@ static const ArchDefinitionEntry g_macho_arch_entries[] =
     { ArchSpec::eCore_arm_armv4       , llvm::MachO::CPUTypeARM       , 5      , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_arm_armv4t      , llvm::MachO::CPUTypeARM       , 5      , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_arm_armv6       , llvm::MachO::CPUTypeARM       , 6      , UINT32_MAX , SUBTYPE_MASK },
+    { ArchSpec::eCore_arm_armv6m      , llvm::MachO::CPUTypeARM       , 14     , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_arm_armv5       , llvm::MachO::CPUTypeARM       , 7      , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_arm_armv5e      , llvm::MachO::CPUTypeARM       , 7      , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_arm_armv5t      , llvm::MachO::CPUTypeARM       , 7      , UINT32_MAX , SUBTYPE_MASK },
@@ -174,6 +179,7 @@ static const ArchDefinitionEntry g_macho_arch_entries[] =
     { ArchSpec::eCore_thumbv5         , llvm::MachO::CPUTypeARM       , 7      , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_thumbv5e        , llvm::MachO::CPUTypeARM       , 7      , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_thumbv6         , llvm::MachO::CPUTypeARM       , 6      , UINT32_MAX , SUBTYPE_MASK },
+    { ArchSpec::eCore_thumbv6m        , llvm::MachO::CPUTypeARM       , 14     , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_thumbv7         , llvm::MachO::CPUTypeARM       , 9      , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_thumbv7f        , llvm::MachO::CPUTypeARM       , 10     , UINT32_MAX , SUBTYPE_MASK },
     { ArchSpec::eCore_thumbv7s        , llvm::MachO::CPUTypeARM       , 11     , UINT32_MAX , SUBTYPE_MASK },
@@ -228,7 +234,8 @@ static const ArchDefinitionEntry g_elf_arch_entries[] =
     { ArchSpec::eCore_ppc64_generic   , llvm::ELF::EM_PPC64  , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // PowerPC64
     { ArchSpec::eCore_arm_generic     , llvm::ELF::EM_ARM    , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // ARM
     { ArchSpec::eCore_sparc9_generic  , llvm::ELF::EM_SPARCV9, LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // SPARC V9
-    { ArchSpec::eCore_x86_64_x86_64   , llvm::ELF::EM_X86_64 , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }  // AMD64
+    { ArchSpec::eCore_x86_64_x86_64   , llvm::ELF::EM_X86_64 , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // AMD64
+    { ArchSpec::eCore_mips64          , llvm::ELF::EM_MIPS   , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }  // MIPS
 };
 
 static const ArchDefinition g_elf_arch_def = {
@@ -238,11 +245,30 @@ static const ArchDefinition g_elf_arch_def = {
     "elf",
 };
 
+static const ArchDefinitionEntry g_coff_arch_entries[] =
+{
+    { ArchSpec::eCore_x86_32_i386  , llvm::COFF::IMAGE_FILE_MACHINE_I386     , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // Intel 80386
+    { ArchSpec::eCore_ppc_generic  , llvm::COFF::IMAGE_FILE_MACHINE_POWERPC  , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // PowerPC
+    { ArchSpec::eCore_ppc_generic  , llvm::COFF::IMAGE_FILE_MACHINE_POWERPCFP, LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // PowerPC (with FPU)
+    { ArchSpec::eCore_arm_generic  , llvm::COFF::IMAGE_FILE_MACHINE_ARM      , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // ARM
+    { ArchSpec::eCore_arm_armv7    , llvm::COFF::IMAGE_FILE_MACHINE_ARMV7    , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // ARMv7
+    { ArchSpec::eCore_thumb        , llvm::COFF::IMAGE_FILE_MACHINE_THUMB    , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }, // ARMv7
+    { ArchSpec::eCore_x86_64_x86_64, llvm::COFF::IMAGE_FILE_MACHINE_AMD64    , LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu }  // AMD64
+};
+
+static const ArchDefinition g_coff_arch_def = {
+    eArchTypeCOFF,
+    sizeof(g_coff_arch_entries)/sizeof(g_coff_arch_entries[0]),
+    g_coff_arch_entries,
+    "pe-coff",
+};
+
 //===----------------------------------------------------------------------===//
 // Table of all ArchDefinitions
 static const ArchDefinition *g_arch_definitions[] = {
     &g_macho_arch_def,
-    &g_elf_arch_def
+    &g_elf_arch_def,
+    &g_coff_arch_def
 };
 
 static const size_t k_num_arch_definitions =
@@ -863,6 +889,15 @@ cores_match (const ArchSpec::Core core1, const ArchSpec::Core core2, bool try_in
             return true;
         break;
 
+    case ArchSpec::eCore_arm_armv6m:
+        if (!enforce_exact_match)
+        {
+            try_inverse = false;
+            if (core2 == ArchSpec::eCore_arm_armv7)
+                return true;
+        }
+        break;
+
     case ArchSpec::eCore_arm_armv7m:
     case ArchSpec::eCore_arm_armv7em:
     case ArchSpec::eCore_arm_armv7f:
diff --git a/contrib/llvm/tools/lldb/source/Core/Communication.cpp b/contrib/llvm/tools/lldb/source/Core/Communication.cpp
index 7f40e652020..6ea7a11426b 100644
--- a/contrib/llvm/tools/lldb/source/Core/Communication.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Communication.cpp
@@ -333,8 +333,8 @@ Communication::ReadThreadIsRunning ()
     return m_read_thread_enabled;
 }
 
-void *
-Communication::ReadThread (void *p)
+lldb::thread_result_t
+Communication::ReadThread (lldb::thread_arg_t p)
 {
     Communication *comm = (Communication *)p;
 
diff --git a/contrib/llvm/tools/lldb/source/Core/ConnectionFileDescriptor.cpp b/contrib/llvm/tools/lldb/source/Core/ConnectionFileDescriptor.cpp
index e320bda2fcd..5764a212ab4 100644
--- a/contrib/llvm/tools/lldb/source/Core/ConnectionFileDescriptor.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ConnectionFileDescriptor.cpp
@@ -15,10 +15,16 @@
 #endif
 
 #include "lldb/Core/ConnectionFileDescriptor.h"
+#include "lldb/Host/Config.h"
+#include "lldb/Host/SocketAddress.h"
 
 // C Includes
 #include <errno.h>
 #include <fcntl.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#ifndef LLDB_DISABLE_POSIX
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <netinet/in.h>
@@ -26,13 +32,17 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <termios.h>
-#include <sys/types.h>
-#include <string.h>
-#include <stdlib.h>
 #include <unistd.h>
+#endif
+#ifdef _WIN32
+#include "lldb/Host/windows/windows.h"
+#include <winsock2.h>
+#include <WS2tcpip.h>
+#endif
 
 // C++ Includes
 // Other libraries and framework includes
+#include "llvm/Support/ErrorHandling.h"
 #if defined(__APPLE__)
 #include "llvm/ADT/SmallVector.h"
 #endif
@@ -43,6 +53,8 @@
 #include "lldb/Core/Log.h"
 #include "lldb/Core/RegularExpression.h"
 #include "lldb/Core/Timer.h"
+#include "lldb/Host/Host.h"
+
 
 using namespace lldb;
 using namespace lldb_private;
@@ -84,7 +96,7 @@ ConnectionFileDescriptor::ConnectionFileDescriptor () :
     m_fd_recv (-1),
     m_fd_send_type (eFDTypeFile),
     m_fd_recv_type (eFDTypeFile),
-    m_udp_send_sockaddr (),
+    m_udp_send_sockaddr (new SocketAddress()),
     m_should_close_fd (false), 
     m_socket_timeout_usec(0),
     m_pipe_read(-1),
@@ -103,7 +115,7 @@ ConnectionFileDescriptor::ConnectionFileDescriptor (int fd, bool owns_fd) :
     m_fd_recv (fd),
     m_fd_send_type (eFDTypeFile),
     m_fd_recv_type (eFDTypeFile),
-    m_udp_send_sockaddr (),
+    m_udp_send_sockaddr (new SocketAddress()),
     m_should_close_fd (owns_fd),
     m_socket_timeout_usec(0),
     m_pipe_read(-1),
@@ -135,11 +147,15 @@ ConnectionFileDescriptor::OpenCommandPipe ()
     Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION));
     // Make the command file descriptor here:
     int filedes[2];
+#ifndef LLDB_DISABLE_POSIX
     int result = pipe (filedes);
+#else
+    int result = -1;
+#endif
     if (result != 0)
     {
         if (log)
-            log->Printf ("%p ConnectionFileDescriptor::ConnectionFileDescriptor () - could not make pipe: %s",
+            log->Printf ("%p ConnectionFileDescriptor::OpenCommandPipe () - could not make pipe: %s",
                          this,
                          strerror(errno));
     }
@@ -147,21 +163,39 @@ ConnectionFileDescriptor::OpenCommandPipe ()
     {
         m_pipe_read  = filedes[0];
         m_pipe_write = filedes[1];
+        if (log)
+            log->Printf ("%p ConnectionFileDescriptor::OpenCommandPipe() - success readfd=%d writefd=%d",
+                         this,
+                         m_pipe_read,
+                         m_pipe_write);
     }
 }
 
 void
 ConnectionFileDescriptor::CloseCommandPipe ()
 {
+    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION));
+    if (log)
+        log->Printf ("%p ConnectionFileDescriptor::CloseCommandPipe()",
+                     this);
+
     if (m_pipe_read != -1)
     {
+#ifdef _MSC_VER
+        llvm_unreachable("pipe close unsupported in MSVC");
+#else
         close (m_pipe_read);
+#endif
         m_pipe_read = -1;
     }
     
     if (m_pipe_write != -1)
     {
+#ifdef _MSC_VER
+        llvm_unreachable("pipe close unsupported in MSVC");
+#else
         close (m_pipe_write);
+#endif
         m_pipe_write = -1;
     }
 }
@@ -223,7 +257,11 @@ ConnectionFileDescriptor::Connect (const char *s, Error *error_ptr)
                 // get the flags from the file descriptor and making sure it 
                 // isn't a bad fd.
                 errno = 0;
+#ifndef LLDB_DISABLE_POSIX
                 int flags = ::fcntl (m_fd_send, F_GETFL, 0);
+#else
+                int flags = -1;
+#endif
                 if (flags == -1 || errno == EBADF)
                 {
                     if (error_ptr)
@@ -262,6 +300,7 @@ ConnectionFileDescriptor::Connect (const char *s, Error *error_ptr)
         {
             // file:///PATH
             const char *path = s + strlen("file://");
+#ifndef LLDB_DISABLE_POSIX
             do
             {
                 m_fd_send = m_fd_recv = ::open (path, O_RDWR);
@@ -304,6 +343,9 @@ ConnectionFileDescriptor::Connect (const char *s, Error *error_ptr)
             }
             m_should_close_fd = true;
             return eConnectionStatusSuccess;
+#else
+            return eConnectionStatusError;
+#endif
         }
         if (error_ptr)
             error_ptr->SetErrorStringWithFormat ("unsupported connection URL: '%s'", s);
@@ -344,27 +386,30 @@ ConnectionFileDescriptor::Disconnect (Error *error_ptr)
     {
         if (m_pipe_write != -1 )
         {
-            write (m_pipe_write, "q", 1);
-            close (m_pipe_write);
-            m_pipe_write = -1;
+            int result;
+            result = write (m_pipe_write, "q", 1);
+            if (log)
+                log->Printf ("%p ConnectionFileDescriptor::Disconnect(): Couldn't get the lock, sent 'q' to %d, result = %d.", this, m_pipe_write, result);
         }
+        else if (log)
+            log->Printf ("%p ConnectionFileDescriptor::Disconnect(): Couldn't get the lock, but no command pipe is available.", this);
         locker.Lock (m_mutex);
     }
-    
+
     if (m_should_close_fd == true)
     {
         if (m_fd_send == m_fd_recv)
         {
-            status = Close (m_fd_send, error_ptr);
+            status = Close (m_fd_send, m_fd_send_type, error_ptr);
         }
         else
         {
             // File descriptors are the different, close both if needed
             if (m_fd_send >= 0)
-                status = Close (m_fd_send, error_ptr);
+                status = Close (m_fd_send, m_fd_send_type, error_ptr);
             if (m_fd_recv >= 0)
             {
-                ConnectionStatus recv_status = Close (m_fd_recv, error_ptr);
+                ConnectionStatus recv_status = Close (m_fd_recv, m_fd_recv_type, error_ptr);
                 if (status == eConnectionStatusSuccess)
                     status = recv_status;
             }
@@ -420,7 +465,21 @@ ConnectionFileDescriptor::Read (void *dst,
     {
         do
         {
+#ifndef LLDB_DISABLE_POSIX
             bytes_read = ::read (m_fd_recv, dst, dst_len);
+#else
+            switch (m_fd_send_type) {
+            case eFDTypeSocket:
+            case eFDTypeSocketUDP:
+                bytes_read = ::recv (m_fd_recv, (char*)dst, dst_len, 0);
+                break;
+            default:
+                bytes_read = -1;
+                break;
+
+            }
+
+#endif
         } while (bytes_read < 0 && errno == EINTR);
     }
 
@@ -494,6 +553,13 @@ ConnectionFileDescriptor::Read (void *dst,
         case ETIMEDOUT: // A transmission timeout occurs during a read attempt on a socket.
             status = eConnectionStatusTimedOut;
             return 0;
+
+        default:
+            if (log)
+                log->Printf("%p ConnectionFileDescriptor::Read (), unexpected error: %s", this, strerror(error_value));
+            status = eConnectionStatusError;
+            break;  // Break to close....
+
         }
 
         return 0;
@@ -523,30 +589,31 @@ ConnectionFileDescriptor::Write (const void *src, size_t src_len, ConnectionStat
 
     switch (m_fd_send_type)
     {
+#ifndef LLDB_DISABLE_POSIX
         case eFDTypeFile:       // Other FD requireing read/write
             do
             {
                 bytes_sent = ::write (m_fd_send, src, src_len);
             } while (bytes_sent < 0 && errno == EINTR);
             break;
-            
+#endif
         case eFDTypeSocket:     // Socket requiring send/recv
             do
             {
-                bytes_sent = ::send (m_fd_send, src, src_len, 0);
+                bytes_sent = ::send (m_fd_send, (char*)src, src_len, 0);
             } while (bytes_sent < 0 && errno == EINTR);
             break;
             
         case eFDTypeSocketUDP:  // Unconnected UDP socket requiring sendto/recvfrom
-            assert (m_udp_send_sockaddr.GetFamily() != 0);
+            assert (m_udp_send_sockaddr->GetFamily() != 0);
             do
             {
                 bytes_sent = ::sendto (m_fd_send, 
-                                       src, 
+                                       (char*)src, 
                                        src_len, 
                                        0, 
-                                       m_udp_send_sockaddr, 
-                                       m_udp_send_sockaddr.GetLength());
+                                       *m_udp_send_sockaddr,
+                                       m_udp_send_sockaddr->GetLength());
             } while (bytes_sent < 0 && errno == EINTR);
             break;
     }
@@ -656,7 +723,8 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt
     {
         TimeValue time_value;
         time_value.OffsetWithMicroSeconds (timeout_usec);
-        tv = time_value.GetAsTimeVal();
+        tv.tv_sec = time_value.seconds();
+        tv.tv_usec = time_value.microseconds();
         tv_ptr = &tv;
     }
     
@@ -806,7 +874,8 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt
     {
         TimeValue time_value;
         time_value.OffsetWithMicroSeconds (timeout_usec);
-        tv = time_value.GetAsTimeVal();
+        tv.tv_sec = time_value.seconds();
+        tv.tv_usec = time_value.microseconds();
         tv_ptr = &tv;
     }
     
@@ -821,7 +890,9 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt
         // If this assert fires off on MacOSX, we will need to switch to using
         // libdispatch to read from file descriptors because poll() is causing
         // kernel panics and if we exceed FD_SETSIZE we will have no choice...
+#ifndef _MSC_VER
         assert (data_fd < FD_SETSIZE);
+#endif
         
         const bool have_pipe_fd = pipe_fd >= 0;
         
@@ -1077,7 +1148,7 @@ ConnectionFileDescriptor::BytesAvailable (uint32_t timeout_usec, Error *error_pt
 #endif
 
 ConnectionStatus
-ConnectionFileDescriptor::Close (int& fd, Error *error_ptr)
+ConnectionFileDescriptor::Close (int& fd, FDType type, Error *error_ptr)
 {
     if (error_ptr)
         error_ptr->Clear();
@@ -1093,7 +1164,11 @@ ConnectionFileDescriptor::Close (int& fd, Error *error_ptr)
             Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_CONNECTION));
             if (log)
                 log->Printf ("%p ConnectionFileDescriptor::Close (fd = %i)", this,fd);
-
+#if _WIN32
+            if (type != eFDTypeFile)
+              success = closesocket(fd) == 0;
+            else
+#endif
             success = ::close (fd) == 0;
             // A reference to a FD was passed in, set it to an invalid value
             fd = -1;
@@ -1115,6 +1190,7 @@ ConnectionFileDescriptor::Close (int& fd, Error *error_ptr)
 ConnectionStatus
 ConnectionFileDescriptor::NamedSocketAccept (const char *socket_name, Error *error_ptr)
 {
+#ifndef LLDB_DISABLE_POSIX
     ConnectionStatus result = eConnectionStatusError;
     struct sockaddr_un saddr_un;
 
@@ -1131,10 +1207,11 @@ ConnectionFileDescriptor::NamedSocketAccept (const char *socket_name, Error *err
     saddr_un.sun_family = AF_UNIX;
     ::strncpy(saddr_un.sun_path, socket_name, sizeof(saddr_un.sun_path) - 1);
     saddr_un.sun_path[sizeof(saddr_un.sun_path) - 1] = '\0';
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
     saddr_un.sun_len = SUN_LEN (&saddr_un);
 #endif
 
+    Host::Unlink (socket_name);
     if (::bind (listen_socket, (struct sockaddr *)&saddr_un, SUN_LEN (&saddr_un)) == 0) 
     {
         if (::listen (listen_socket, 5) == 0) 
@@ -1157,13 +1234,17 @@ ConnectionFileDescriptor::NamedSocketAccept (const char *socket_name, Error *err
             error_ptr->SetErrorToErrno();
     }
     // We are done with the listen port
-    Close (listen_socket, NULL);
+    Close (listen_socket, eFDTypeSocket, NULL);
     return result;
+#else
+    return eConnectionStatusError;
+#endif
 }
 
 ConnectionStatus
 ConnectionFileDescriptor::NamedSocketConnect (const char *socket_name, Error *error_ptr)
 {
+#ifndef LLDB_DISABLE_POSIX
     Disconnect (NULL);
     m_fd_send_type = m_fd_recv_type = eFDTypeSocket;
 
@@ -1180,7 +1261,7 @@ ConnectionFileDescriptor::NamedSocketConnect (const char *socket_name, Error *er
     saddr_un.sun_family = AF_UNIX;
     ::strncpy(saddr_un.sun_path, socket_name, sizeof(saddr_un.sun_path) - 1);
     saddr_un.sun_path[sizeof(saddr_un.sun_path) - 1] = '\0';
-#if defined(__APPLE__) || defined(__FreeBSD__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
     saddr_un.sun_len = SUN_LEN (&saddr_un);
 #endif
 
@@ -1194,6 +1275,9 @@ ConnectionFileDescriptor::NamedSocketConnect (const char *socket_name, Error *er
     if (error_ptr)
         error_ptr->Clear();
     return eConnectionStatusSuccess;
+#else
+    return eConnectionStatusError;
+#endif
 }
 
 ConnectionStatus
@@ -1224,7 +1308,7 @@ ConnectionFileDescriptor::SocketListen (uint16_t listen_port_num, Error *error_p
         {
             if (error_ptr)
                 error_ptr->SetErrorToErrno();
-            Close (listen_port, NULL);
+            Close (listen_port, eFDTypeSocket, NULL);
             return eConnectionStatusError;
         }
 
@@ -1233,7 +1317,7 @@ ConnectionFileDescriptor::SocketListen (uint16_t listen_port_num, Error *error_p
         {
             if (error_ptr)
                 error_ptr->SetErrorToErrno();
-            Close (listen_port, NULL);
+            Close (listen_port, eFDTypeSocket, NULL);
             return eConnectionStatusError;
         }
 
@@ -1242,13 +1326,13 @@ ConnectionFileDescriptor::SocketListen (uint16_t listen_port_num, Error *error_p
         {
             if (error_ptr)
                 error_ptr->SetErrorToErrno();
-            Close (listen_port, NULL);
+            Close (listen_port, eFDTypeSocket, NULL);
             return eConnectionStatusError;
         }
     }
 
     // We are done with the listen port
-    Close (listen_port, NULL);
+    Close (listen_port, eFDTypeSocket, NULL);
 
     m_should_close_fd = true;
 
@@ -1408,7 +1492,7 @@ ConnectionFileDescriptor::ConnectUDP (const char *host_and_port, Error *error_pt
         
         if (m_fd_send != -1)
         {
-            m_udp_send_sockaddr = service_info_ptr;
+            *m_udp_send_sockaddr = service_info_ptr;
             break;
         }
         else
@@ -1430,18 +1514,18 @@ ConnectionFileDescriptor::ConnectUDP (const char *host_and_port, Error *error_pt
     return eConnectionStatusSuccess;
 }
 
-#if defined(__MINGW32__) || defined(__MINGW64__)
+#if defined(_WIN32)
 typedef const char * set_socket_option_arg_type;
 typedef char * get_socket_option_arg_type;
-#else // #if defined(__MINGW32__) || defined(__MINGW64__)
+#else // #if defined(_WIN32)
 typedef const void * set_socket_option_arg_type;
 typedef void * get_socket_option_arg_type;
-#endif // #if defined(__MINGW32__) || defined(__MINGW64__)
+#endif // #if defined(_WIN32)
 
 int
 ConnectionFileDescriptor::GetSocketOption(int fd, int level, int option_name, int &option_value)
 {
-    get_socket_option_arg_type option_value_p = static_cast<get_socket_option_arg_type>(&option_value);
+    get_socket_option_arg_type option_value_p = reinterpret_cast<get_socket_option_arg_type>(&option_value);
     socklen_t option_value_size = sizeof(int);
 	return ::getsockopt(fd, level, option_name, option_value_p, &option_value_size);
 }
@@ -1449,7 +1533,7 @@ ConnectionFileDescriptor::GetSocketOption(int fd, int level, int option_name, in
 int
 ConnectionFileDescriptor::SetSocketOption(int fd, int level, int option_name, int option_value)
 {
-    set_socket_option_arg_type option_value_p = static_cast<get_socket_option_arg_type>(&option_value);
+    set_socket_option_arg_type option_value_p = reinterpret_cast<get_socket_option_arg_type>(&option_value);
 	return ::setsockopt(fd, level, option_name, option_value_p, sizeof(option_value));
 }
 
@@ -1487,7 +1571,7 @@ ConnectionFileDescriptor::SetSocketReceiveTimeout (uint32_t timeout_usec)
                 timeout.tv_sec = timeout_usec / TimeValue::MicroSecPerSec;
                 timeout.tv_usec = timeout_usec % TimeValue::MicroSecPerSec;
             }
-            if (::setsockopt (m_fd_recv, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)) == 0)
+            if (::setsockopt (m_fd_recv, SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<get_socket_option_arg_type>(&timeout), sizeof(timeout)) == 0)
             {
                 m_socket_timeout_usec = timeout_usec;
                 return true;
diff --git a/contrib/llvm/tools/lldb/source/Core/ConnectionMachPort.cpp b/contrib/llvm/tools/lldb/source/Core/ConnectionMachPort.cpp
index ca818d405a2..4a090dbe5ec 100644
--- a/contrib/llvm/tools/lldb/source/Core/ConnectionMachPort.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ConnectionMachPort.cpp
@@ -11,6 +11,7 @@
 #include "lldb/Core/ConnectionMachPort.h"
 
 // C Includes
+#include <mach/mach.h>
 #include <servers/bootstrap.h>
 
 // C++ Includes
diff --git a/contrib/llvm/tools/lldb/source/Core/ConnectionSharedMemory.cpp b/contrib/llvm/tools/lldb/source/Core/ConnectionSharedMemory.cpp
index 625f17a0985..cd708c4868c 100644
--- a/contrib/llvm/tools/lldb/source/Core/ConnectionSharedMemory.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ConnectionSharedMemory.cpp
@@ -11,12 +11,15 @@
 
 // C Includes
 #include <errno.h>
-#include <pthread.h>
 #include <stdlib.h>
+#ifdef _WIN32
+#include "lldb/Host/windows/windows.h"
+#else
 #include <sys/file.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#endif
 
 // C++ Includes
 // Other libraries and framework includes
@@ -73,7 +76,12 @@ ConnectionSharedMemory::Disconnect (Error *error_ptr)
     m_mmap.Clear();
     if (!m_name.empty())
     {
+#ifdef _WIN32
+        close(m_fd);
+        m_fd = -1;
+#else
         shm_unlink (m_name.c_str());
+#endif
         m_name.clear();
     }
     return eConnectionStatusSuccess;
@@ -114,6 +122,16 @@ ConnectionSharedMemory::Open (bool create, const char *name, size_t size, Error
     }
     
     m_name.assign (name);
+
+#ifdef _WIN32
+    HANDLE handle;
+    if (create)
+        handle = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE, (DWORD)(size >> 32), (DWORD)(size), name);
+    else
+        handle = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, name);
+
+    m_fd = _open_osfhandle((intptr_t)handle, 0);
+#else
     int oflag = O_RDWR;
     if (create)
         oflag |= O_CREAT;
@@ -121,6 +139,7 @@ ConnectionSharedMemory::Open (bool create, const char *name, size_t size, Error
 
     if (create)
         ::ftruncate (m_fd, size);
+#endif
 
     if (m_mmap.MemoryMapFromFileDescriptor(m_fd, 0, size, true, false) == size)
         return eConnectionStatusSuccess;
diff --git a/contrib/llvm/tools/lldb/source/Core/ConstString.cpp b/contrib/llvm/tools/lldb/source/Core/ConstString.cpp
index 875169428d2..ce6e51108db 100644
--- a/contrib/llvm/tools/lldb/source/Core/ConstString.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ConstString.cpp
@@ -259,8 +259,8 @@ int
 ConstString::Compare (const ConstString& lhs, const ConstString& rhs)
 {
     // If the iterators are the same, this is the same string
-    register const char *lhs_cstr = lhs.m_string;
-    register const char *rhs_cstr = rhs.m_string;
+    const char *lhs_cstr = lhs.m_string;
+    const char *rhs_cstr = rhs.m_string;
     if (lhs_cstr == rhs_cstr)
         return 0;
     if (lhs_cstr && rhs_cstr)
@@ -319,7 +319,7 @@ bool
 ConstString::GetMangledCounterpart (ConstString &counterpart) const
 {
     counterpart.m_string = StringPool().GetMangledCounterpart(m_string);
-    return counterpart;
+    return (bool)counterpart;
 }
 
 void
diff --git a/contrib/llvm/tools/lldb/source/Core/DataBufferMemoryMap.cpp b/contrib/llvm/tools/lldb/source/Core/DataBufferMemoryMap.cpp
index a4382a0c67e..008b736ef72 100644
--- a/contrib/llvm/tools/lldb/source/Core/DataBufferMemoryMap.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/DataBufferMemoryMap.cpp
@@ -12,7 +12,11 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <sys/stat.h>
+#ifdef _WIN32
+#include "lldb/Host/windows/windows.h"
+#else
 #include <sys/mman.h>
+#endif
 
 #include "lldb/Core/DataBufferMemoryMap.h"
 #include "lldb/Core/Error.h"
@@ -86,7 +90,11 @@ DataBufferMemoryMap::Clear()
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP));
         if (log)
             log->Printf("DataBufferMemoryMap::Clear() m_mmap_addr = %p, m_mmap_size = %zu", m_mmap_addr, m_mmap_size);
+#ifdef _WIN32
+        UnmapViewOfFile(m_mmap_addr);
+#else
         ::munmap((void *)m_mmap_addr, m_mmap_size);
+#endif
         m_mmap_addr = NULL;
         m_mmap_size = 0;
         m_data = NULL;
@@ -139,7 +147,17 @@ DataBufferMemoryMap::MemoryMapFromFileSpec (const FileSpec* filespec,
     Clear();
     return 0;
 }
-
+
+
+#ifdef _WIN32
+static size_t win32memmapalignment = 0;
+void LoadWin32MemMapAlignment ()
+{
+  SYSTEM_INFO data;
+  GetSystemInfo(&data);
+  win32memmapalignment = data.dwAllocationGranularity;
+}
+#endif
 
 //----------------------------------------------------------------------
 // The file descriptor FD is assumed to already be opened as read only
@@ -166,13 +184,59 @@ DataBufferMemoryMap::MemoryMapFromFileDescriptor (int fd,
         Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_MMAP|LIBLLDB_LOG_VERBOSE));
         if (log)
         {
+#ifdef _WIN32
+            log->Printf("DataBufferMemoryMap::MemoryMapFromFileSpec(fd=%p, offset=0x%" PRIx64 ", length=0x%" PRIx64 ", writeable=%i, fd_is_file=%i)",
+#else
             log->Printf("DataBufferMemoryMap::MemoryMapFromFileSpec(fd=%i, offset=0x%" PRIx64 ", length=0x%" PRIx64 ", writeable=%i, fd_is_file=%i)",
+#endif
                         fd,
                         offset,
                         length,
                         writeable,
                         fd_is_file);
         }
+#ifdef _WIN32
+        HANDLE handle = (HANDLE)_get_osfhandle(fd);
+        DWORD file_size_low, file_size_high;
+        file_size_low = GetFileSize(handle, &file_size_high);
+        const size_t file_size = (file_size_high << 32) | file_size_low;
+        const size_t max_bytes_available = file_size - offset;
+        if (length == SIZE_MAX)
+        {
+            length = max_bytes_available;
+        }
+        else if (length > max_bytes_available)
+        {
+            // Cap the length if too much data was requested
+            length = max_bytes_available;
+        }
+
+        if (length > 0)
+        {
+            HANDLE fileMapping = CreateFileMapping(handle, NULL, writeable ? PAGE_READWRITE : PAGE_READONLY, file_size_high, file_size_low, NULL);
+            if (fileMapping != NULL)
+            {
+                if (win32memmapalignment == 0) LoadWin32MemMapAlignment();
+                lldb::offset_t realoffset = offset;
+                lldb::offset_t delta = 0;
+                if (realoffset % win32memmapalignment != 0) {
+                  realoffset = realoffset / win32memmapalignment * win32memmapalignment;
+                  delta = offset - realoffset;
+	              }
+
+                LPVOID data = MapViewOfFile(fileMapping, writeable ? FILE_MAP_WRITE : FILE_MAP_READ, 0, realoffset, length + delta);
+                m_mmap_addr = (uint8_t *)data;
+                if (!data) {
+                  Error error; 
+                  error.SetErrorToErrno ();
+                } else {
+                  m_data = m_mmap_addr + delta;
+                  m_size = length;
+                }
+                CloseHandle(fileMapping);
+            }
+        }
+#else
         struct stat stat;
         if (::fstat(fd, &stat) == 0)
         {
@@ -253,6 +317,7 @@ DataBufferMemoryMap::MemoryMapFromFileDescriptor (int fd,
                 }
             }
         }
+#endif
     }
     return GetByteSize ();
 }
diff --git a/contrib/llvm/tools/lldb/source/Core/DataExtractor.cpp b/contrib/llvm/tools/lldb/source/Core/DataExtractor.cpp
index 518faeb71ea..d1f3c09c230 100644
--- a/contrib/llvm/tools/lldb/source/Core/DataExtractor.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/DataExtractor.cpp
@@ -935,6 +935,10 @@ DataExtractor::ExtractBytes (offset_t offset, offset_t length, ByteOrder dst_byt
     {
         if (dst_byte_order != GetByteOrder())
         {
+            // Validate that only a word- or register-sized dst is byte swapped
+            assert (length == 1 || length == 2 || length == 4 || length == 8 ||
+                    length == 10 || length == 16 || length == 32);
+
             for (uint32_t i=0; i<length; ++i)
                 ((uint8_t*)dst)[i] = src[length - i - 1];
         }
@@ -945,6 +949,21 @@ DataExtractor::ExtractBytes (offset_t offset, offset_t length, ByteOrder dst_byt
     return 0;
 }
 
+// Extract data as it exists in target memory
+lldb::offset_t
+DataExtractor::CopyData (offset_t offset,
+                         offset_t length,
+                         void *dst) const
+{
+    const uint8_t *src = PeekData (offset, length);
+    if (src)
+    {
+        ::memcpy (dst, src, length);
+        return length;
+    }
+    return 0;
+}
+
 // Extract data and swap if needed when doing the copy
 lldb::offset_t
 DataExtractor::CopyByteOrderedData (offset_t src_offset,
@@ -963,7 +982,12 @@ DataExtractor::CopyByteOrderedData (offset_t src_offset,
     assert (dst_void_ptr != NULL);
     assert (dst_len > 0);
     assert (dst_byte_order == eByteOrderBig || dst_byte_order == eByteOrderLittle);
-    
+
+    // Validate that only a word- or register-sized dst is byte swapped
+    assert (dst_byte_order == m_byte_order || dst_len == 1 || dst_len == 2 ||
+            dst_len == 4 || dst_len == 8 || dst_len == 10 || dst_len == 16 ||
+            dst_len == 32);
+
     // Must have valid byte orders set in this object and for destination
     if (!(dst_byte_order == eByteOrderBig || dst_byte_order == eByteOrderLittle) ||
         !(m_byte_order == eByteOrderBig || m_byte_order == eByteOrderLittle))
@@ -1330,18 +1354,22 @@ DumpAPInt (Stream *s, const DataExtractor &data, lldb::offset_t offset, lldb::of
 
 static float half2float (uint16_t half)
 {
+#ifdef _MSC_VER
+    llvm_unreachable("half2float not implemented for MSVC");
+#else
     union{ float       f; uint32_t    u;}u;
     int32_t v = (int16_t) half;
     
     if( 0 == (v & 0x7c00))
     {
         u.u = v & 0x80007FFFU;
-        return u.f * 0x1.0p125f;
+        return u.f * ldexpf(1, 125);
     }
     
     v <<= 13;
     u.u = v | 0x70000000U;
-    return u.f * 0x1.0p-112f;
+    return u.f * ldexpf(1, -112);
+#endif
 }
 
 lldb::offset_t
@@ -1703,29 +1731,35 @@ DataExtractor::Dump (Stream *s,
         case eFormatHexUppercase:
             {
                 bool wantsuppercase  = (item_format == eFormatHexUppercase);
-                if (item_byte_size <= 8)
+                switch (item_byte_size)
                 {
+                case 1:
+                case 2:
+                case 4:
+                case 8:
                     s->Printf(wantsuppercase ? "0x%*.*" PRIX64 : "0x%*.*" PRIx64, (int)(2 * item_byte_size), (int)(2 * item_byte_size), GetMaxU64Bitfield(&offset, item_byte_size, item_bit_size, item_bit_offset));
-                }
-                else
-                {
-                    assert (item_bit_size == 0 && item_bit_offset == 0);
-                    s->PutCString("0x");
-                    const uint8_t *bytes = (const uint8_t* )GetData(&offset, item_byte_size);
-                    if (bytes)
+                    break;
+                default:
                     {
-                        uint32_t idx;
-                        if (m_byte_order == eByteOrderBig)
+                        assert (item_bit_size == 0 && item_bit_offset == 0);
+                        const uint8_t *bytes = (const uint8_t* )GetData(&offset, item_byte_size);
+                        if (bytes)
                         {
-                            for (idx = 0; idx < item_byte_size; ++idx)
-                                s->Printf(wantsuppercase ? "%2.2X" : "%2.2x", bytes[idx]);
-                        }
-                        else
-                        {
-                            for (idx = 0; idx < item_byte_size; ++idx)
-                                s->Printf(wantsuppercase ? "%2.2X" : "%2.2x", bytes[item_byte_size - 1 - idx]);
+                            s->PutCString("0x");
+                            uint32_t idx;
+                                if (m_byte_order == eByteOrderBig)
+                            {
+                                for (idx = 0; idx < item_byte_size; ++idx)
+                                    s->Printf(wantsuppercase ? "%2.2X" : "%2.2x", bytes[idx]);
+                            }
+                            else
+                            {
+                                for (idx = 0; idx < item_byte_size; ++idx)
+                                    s->Printf(wantsuppercase ? "%2.2X" : "%2.2x", bytes[item_byte_size - 1 - idx]);
+                            }
                         }
                     }
+                    break;
                 }
             }
             break;
diff --git a/contrib/llvm/tools/lldb/source/Core/Debugger.cpp b/contrib/llvm/tools/lldb/source/Core/Debugger.cpp
index d1d2ebb0550..b57c6051a96 100644
--- a/contrib/llvm/tools/lldb/source/Core/Debugger.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Debugger.cpp
@@ -9,8 +9,6 @@
 
 #include "lldb/lldb-python.h"
 
-#include "lldb/API/SBDebugger.h"
-
 #include "lldb/Core/Debugger.h"
 
 #include <map>
@@ -46,6 +44,7 @@
 #include "lldb/Target/TargetList.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
+#include "lldb/Target/SectionLoadList.h"
 #include "lldb/Target/StopInfo.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Thread.h"
@@ -132,6 +131,7 @@ g_properties[] =
 {   "thread-format",            OptionValue::eTypeString , true, 0    , DEFAULT_THREAD_FORMAT, NULL, "The default thread format string to use when displaying thread information." },
 {   "use-external-editor",      OptionValue::eTypeBoolean, true, false, NULL, NULL, "Whether to use an external editor or not." },
 {   "use-color",                OptionValue::eTypeBoolean, true, true , NULL, NULL, "Whether to use Ansi color codes or not." },
+{   "auto-one-line-summaries",     OptionValue::eTypeBoolean, true, true, NULL, NULL, "If true, LLDB will automatically display small structs in one-liner format (default: true)." },
 
     {   NULL,                       OptionValue::eTypeInvalid, true, 0    , NULL, NULL, NULL }
 };
@@ -151,21 +151,10 @@ enum
     ePropertyThreadFormat,
     ePropertyUseExternalEditor,
     ePropertyUseColor,
+    ePropertyAutoOneLineSummaries
 };
 
-//
-//const char *
-//Debugger::GetFrameFormat() const
-//{
-//    return m_properties_sp->GetFrameFormat();
-//}
-//const char *
-//Debugger::GetThreadFormat() const
-//{
-//    return m_properties_sp->GetThreadFormat();
-//}
-//
-
+Debugger::LoadPluginCallbackType Debugger::g_load_plugin_callback = NULL;
 
 Error
 Debugger::SetPropertyValue (const ExecutionContext *exe_ctx,
@@ -347,6 +336,14 @@ Debugger::GetDisassemblyLineCount () const
     return m_collection_sp->GetPropertyAtIndexAsSInt64 (NULL, idx, g_properties[idx].default_uint_value);
 }
 
+bool
+Debugger::GetAutoOneLineSummaries () const
+{
+    const uint32_t idx = ePropertyAutoOneLineSummaries;
+    return m_collection_sp->GetPropertyAtIndexAsBoolean (NULL, idx, true);
+
+}
+
 #pragma mark Debugger
 
 //const DebuggerPropertiesSP &
@@ -363,8 +360,9 @@ Debugger::TestDebuggerRefCount ()
 }
 
 void
-Debugger::Initialize ()
+Debugger::Initialize (LoadPluginCallbackType load_plugin_callback)
 {
+    g_load_plugin_callback = load_plugin_callback;
     if (g_shared_debugger_refcount++ == 0)
         lldb_private::Initialize();
 }
@@ -402,31 +400,22 @@ Debugger::SettingsTerminate ()
 bool
 Debugger::LoadPlugin (const FileSpec& spec, Error& error)
 {
-    lldb::DynamicLibrarySP dynlib_sp(new lldb_private::DynamicLibrary(spec));
-    if (!dynlib_sp || dynlib_sp->IsValid() == false)
+    if (g_load_plugin_callback)
     {
-        if (spec.Exists())
-            error.SetErrorString("this file does not represent a loadable dylib");
-        else
-            error.SetErrorString("no such file");
-        return false;
+        lldb::DynamicLibrarySP dynlib_sp = g_load_plugin_callback (shared_from_this(), spec, error);
+        if (dynlib_sp)
+        {
+            m_loaded_plugins.push_back(dynlib_sp);
+            return true;
+        }
     }
-    lldb::DebuggerSP debugger_sp(shared_from_this());
-    lldb::SBDebugger debugger_sb(debugger_sp);
-    // This calls the bool lldb::PluginInitialize(lldb::SBDebugger debugger) function.
-    // TODO: mangle this differently for your system - on OSX, the first underscore needs to be removed and the second one stays
-    LLDBCommandPluginInit init_func = dynlib_sp->GetSymbol<LLDBCommandPluginInit>("_ZN4lldb16PluginInitializeENS_10SBDebuggerE");
-    if (!init_func)
+    else
     {
-        error.SetErrorString("cannot find the initialization function lldb::PluginInitialize(lldb::SBDebugger)");
-        return false;
+        // The g_load_plugin_callback is registered in SBDebugger::Initialize()
+        // and if the public API layer isn't available (code is linking against
+        // all of the internal LLDB static libraries), then we can't load plugins
+        error.SetErrorString("Public API layer is not available");
     }
-    if (init_func(debugger_sb))
-    {
-        m_loaded_plugins.push_back(dynlib_sp);
-        return true;
-    }
-    error.SetErrorString("dylib refused to be loaded");
     return false;
 }
 
@@ -821,7 +810,6 @@ Debugger::GetSelectedExecutionContext ()
         }
     }
     return exe_ctx;
-
 }
 
 InputReaderSP 
@@ -1720,7 +1708,6 @@ FormatPromptRecurse
                                     do_deref_pointer = false;
                                 }
                                 
-                                // <rdar://problem/11338654>
                                 // we do not want to use the summary for a bitfield of type T:n
                                 // if we were originally dealing with just a T - that would get
                                 // us into an endless recursion
@@ -1902,12 +1889,12 @@ FormatPromptRecurse
                                                 if (var_name_begin[0] == 'n' || var_name_begin[5] == 'f')
                                                 {
                                                     format_file_spec.GetFilename() = exe_module->GetFileSpec().GetFilename();
-                                                    var_success = format_file_spec;
+                                                    var_success = (bool)format_file_spec;
                                                 }
                                                 else
                                                 {
                                                     format_file_spec = exe_module->GetFileSpec();
-                                                    var_success = format_file_spec;
+                                                    var_success = (bool)format_file_spec;
                                                 }
                                             }
                                         }
@@ -1983,7 +1970,7 @@ FormatPromptRecurse
                                                 ValueObjectSP return_valobj_sp = StopInfo::GetReturnValueObject (stop_info_sp);
                                                 if (return_valobj_sp)
                                                 {
-                                                    ValueObject::DumpValueObject (s, return_valobj_sp.get());
+                                                    return_valobj_sp->Dump(s);
                                                     var_success = true;
                                                 }
                                             }
@@ -2067,12 +2054,12 @@ FormatPromptRecurse
                                             if (IsToken (var_name_begin, "basename}"))
                                             {
                                                 format_file_spec.GetFilename() = module->GetFileSpec().GetFilename();
-                                                var_success = format_file_spec;
+                                                var_success = (bool)format_file_spec;
                                             }
                                             else if (IsToken (var_name_begin, "fullpath}"))
                                             {
                                                 format_file_spec = module->GetFileSpec();
-                                                var_success = format_file_spec;
+                                                var_success = (bool)format_file_spec;
                                             }
                                         }
                                     }
@@ -2091,12 +2078,12 @@ FormatPromptRecurse
                                     if (IsToken (var_name_begin, "basename}"))
                                     {
                                         format_file_spec.GetFilename() = sc->comp_unit->GetFilename();
-                                        var_success = format_file_spec;
+                                        var_success = (bool)format_file_spec;
                                     }
                                     else if (IsToken (var_name_begin, "fullpath}"))
                                     {
                                         format_file_spec = *sc->comp_unit;
-                                        var_success = format_file_spec;
+                                        var_success = (bool)format_file_spec;
                                     }
                                 }
                             }
@@ -2355,12 +2342,12 @@ FormatPromptRecurse
                                         if (IsToken (var_name_begin, "basename}"))
                                         {
                                             format_file_spec.GetFilename() = sc->line_entry.file.GetFilename();
-                                            var_success = format_file_spec;
+                                            var_success = (bool)format_file_spec;
                                         }
                                         else if (IsToken (var_name_begin, "fullpath}"))
                                         {
                                             format_file_spec = sc->line_entry.file;
-                                            var_success = format_file_spec;
+                                            var_success = (bool)format_file_spec;
                                         }
                                     }
                                     else if (IsTokenWithFormat (var_name_begin, "number", token_format, "%" PRIu64, exe_ctx, sc))
diff --git a/contrib/llvm/tools/lldb/source/Core/Disassembler.cpp b/contrib/llvm/tools/lldb/source/Core/Disassembler.cpp
index e80e92c91b5..7f830acba1f 100644
--- a/contrib/llvm/tools/lldb/source/Core/Disassembler.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Disassembler.cpp
@@ -235,7 +235,8 @@ Disassembler::DisassembleRange
     const char *plugin_name,
     const char *flavor,
     const ExecutionContext &exe_ctx,
-    const AddressRange &range
+    const AddressRange &range,
+    bool prefer_file_cache
 )
 {
     lldb::DisassemblerSP disasm_sp;
@@ -245,7 +246,6 @@ Disassembler::DisassembleRange
 
         if (disasm_sp)
         {
-            const bool prefer_file_cache = false;
             size_t bytes_disassembled = disasm_sp->ParseInstructions (&exe_ctx, range, NULL, prefer_file_cache);
             if (bytes_disassembled == 0)
                 disasm_sp.reset();
@@ -611,8 +611,8 @@ Instruction::Dump (lldb_private::Stream *s,
         }
         else
         {
-            // Else, we have ARM which can show up to a uint32_t 0x00000000 (10 spaces)
-            // plus two for padding...
+            // Else, we have ARM or MIPS which can show up to a uint32_t
+            // 0x00000000 (10 spaces) plus two for padding...
             if (max_opcode_byte_size > 0)
                 m_opcode.Dump (&ss, max_opcode_byte_size * 3 + 1);
             else
diff --git a/contrib/llvm/tools/lldb/source/Core/Error.cpp b/contrib/llvm/tools/lldb/source/Core/Error.cpp
index e29f12f0b2c..7aabe5b386d 100644
--- a/contrib/llvm/tools/lldb/source/Core/Error.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Error.cpp
@@ -8,7 +8,9 @@
 //===----------------------------------------------------------------------===//
 
 // C Includes
-#include <errno.h>
+#ifdef __APPLE__
+#include <mach/mach.h>
+#endif
 
 // C++ Includes
 // Other libraries and framework includes
@@ -16,9 +18,8 @@
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
 #include "llvm/ADT/SmallVector.h"
+#include <cerrno>
 #include <cstdarg>
-#include <cstdlib>
-#include <cstring>
 
 #if defined (__arm__) && defined (__APPLE__)
 #include <SpringBoardServices/SpringBoardServer.h>
@@ -51,12 +52,16 @@ Error::Error (const Error &rhs) :
 {
 }
 
-Error::Error (const char* err_str):
+Error::Error (const char* format, ...):
     m_code (0),
     m_type (eErrorTypeInvalid),
     m_string ()
 {
-    SetErrorString(err_str);
+    va_list args;
+    va_start (args, format);
+    SetErrorToGenericError ();
+    SetErrorStringWithVarArg (format, args);
+    va_end (args);
 }
 
 //----------------------------------------------------------------------
@@ -238,7 +243,7 @@ Error::LogIfError (Log *log, const char *format, ...)
             if (err_str == NULL)
                 err_str = "???";
 
-            SetErrorStringWithFormat("error: %s err = %s (0x%8.8x)", arg_msg, err_str, m_code);
+            SetErrorStringWithFormat("%s err = %s (0x%8.8x)", arg_msg, err_str, m_code);
             if (log)
                 log->Error("%s", m_string.c_str());
 
diff --git a/contrib/llvm/tools/lldb/source/Core/FileLineResolver.cpp b/contrib/llvm/tools/lldb/source/Core/FileLineResolver.cpp
index 15cbbe6ff9e..b1346bbdd81 100644
--- a/contrib/llvm/tools/lldb/source/Core/FileLineResolver.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/FileLineResolver.cpp
@@ -50,7 +50,7 @@ FileLineResolver::SearchCallback
 {
     CompileUnit *cu = context.comp_unit;
 
-    if (m_inlines || m_file_spec.Compare(*cu, m_file_spec, m_file_spec.GetDirectory()))
+    if (m_inlines || m_file_spec.Compare(*cu, m_file_spec, (bool)m_file_spec.GetDirectory()))
     {
         uint32_t start_file_idx = 0;
         uint32_t file_idx = cu->GetSupportFiles().FindFileIndex(start_file_idx, m_file_spec, false);
diff --git a/contrib/llvm/tools/lldb/source/Core/Log.cpp b/contrib/llvm/tools/lldb/source/Core/Log.cpp
index d73ab15f697..8d659cfd752 100644
--- a/contrib/llvm/tools/lldb/source/Core/Log.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Log.cpp
@@ -10,11 +10,9 @@
 #include "lldb/lldb-python.h"
 
 // C Includes
-#include <pthread.h>
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <unistd.h>
 
 // C++ Includes
 #include <map>
@@ -101,8 +99,8 @@ Log::PrintfWithFlagsVarArg (uint32_t flags, const char *format, va_list args)
         // Timestamp if requested
         if (m_options.Test (LLDB_LOG_OPTION_PREPEND_TIMESTAMP))
         {
-            struct timeval tv = TimeValue::Now().GetAsTimeVal();
-            header.Printf ("%9ld.%6.6d ", tv.tv_sec, (int32_t)tv.tv_usec);
+            TimeValue now = TimeValue::Now();
+            header.Printf ("%9d.%6.6d ", now.seconds(), now.nanoseconds());
         }
 
         // Add the process and thread if requested
diff --git a/contrib/llvm/tools/lldb/source/Core/Mangled.cpp b/contrib/llvm/tools/lldb/source/Core/Mangled.cpp
index 4655eb131a6..a41986de514 100644
--- a/contrib/llvm/tools/lldb/source/Core/Mangled.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Mangled.cpp
@@ -10,7 +10,4698 @@
 
 // FreeBSD9-STABLE requires this to know about size_t in cxxabi.h
 #include <cstddef>
+#if defined(_MSC_VER) 
+// Cannot enable the builtin demangler on msvc as it does not support the cpp11 within the implementation.
+#elif defined (__FreeBSD__)
+#define LLDB_USE_BUILTIN_DEMANGLER
+#else
 #include <cxxabi.h>
+#endif
+
+#ifdef LLDB_USE_BUILTIN_DEMANGLER
+
+#include <vector>
+#include <algorithm>
+#include <string>
+#include <numeric>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
+//----------------------------------------------------------------------
+// Inlined copy of:
+// http://llvm.org/svn/llvm-project/libcxxabi/trunk/src/cxa_demangle.cpp
+// revision 193704.
+//
+// Changes include:
+// - remove the "__cxxabiv1" namespace
+// - stripped GCC attributes()
+// - removed extern "C" from the cxa_demangle function
+// - Changed the scope of the unnamed namespace to include cxa_demangle
+//   function.
+//----------------------------------------------------------------------
+
+namespace
+{
+
+enum
+{
+    unknown_error = -4,
+    invalid_args = -3,
+    invalid_mangled_name,
+    memory_alloc_failure,
+    success
+};
+
+template <class C>
+    const char* parse_type(const char* first, const char* last, C& db);
+template <class C>
+    const char* parse_encoding(const char* first, const char* last, C& db);
+template <class C>
+    const char* parse_name(const char* first, const char* last, C& db);
+template <class C>
+    const char* parse_expression(const char* first, const char* last, C& db);
+template <class C>
+    const char* parse_template_args(const char* first, const char* last, C& db);
+template <class C>
+    const char* parse_operator_name(const char* first, const char* last, C& db);
+template <class C>
+    const char* parse_unqualified_name(const char* first, const char* last, C& db);
+template <class C>
+    const char* parse_decltype(const char* first, const char* last, C& db);
+
+template <class C>
+void
+print_stack(const C& db)
+{
+    printf("---------\n");
+    printf("names:\n");
+    for (auto& s : db.names)
+        printf("{%s#%s}\n", s.first.c_str(), s.second.c_str());
+    int i = -1;
+    printf("subs:\n");
+    for (auto& v : db.subs)
+    {
+        if (i >= 0)
+            printf("S%i_ = {", i);
+        else
+            printf("S_  = {");
+        for (auto& s : v)
+            printf("{%s#%s}", s.first.c_str(), s.second.c_str());
+        printf("}\n");
+        ++i;
+    }
+    printf("template_param:\n");
+    for (auto& t : db.template_param)
+    {
+        printf("--\n");
+        i = -1;
+        for (auto& v : t)
+        {
+            if (i >= 0)
+                printf("T%i_ = {", i);
+            else
+                printf("T_  = {");
+            for (auto& s : v)
+                printf("{%s#%s}", s.first.c_str(), s.second.c_str());
+            printf("}\n");
+            ++i;
+        }
+    }
+    printf("---------\n\n");
+}
+
+template <class C>
+void
+print_state(const char* msg, const char* first, const char* last, const C& db)
+{
+    printf("%s: ", msg);
+    for (; first != last; ++first)
+        printf("%c", *first);
+    printf("\n");
+    print_stack(db);
+}
+
+// <number> ::= [n] <non-negative decimal integer>
+
+const char*
+parse_number(const char* first, const char* last)
+{
+    if (first != last)
+    {
+        const char* t = first;
+        if (*t == 'n')
+            ++t;
+        if (t != last)
+        {
+            if (*t == '0')
+            {
+                first = t+1;
+            }
+            else if ('1' <= *t && *t <= '9')
+            {
+                first = t+1;
+                while (first != last && std::isdigit(*first))
+                    ++first;
+            }
+        }
+    }
+    return first;
+}
+
+template <class Float>
+struct float_data;
+
+template <>
+struct float_data<float>
+{
+    static const size_t mangled_size = 8;
+    static const size_t max_demangled_size = 24;
+    static constexpr const char* spec = "%af";
+};
+
+constexpr const char* float_data<float>::spec;
+
+template <>
+struct float_data<double>
+{
+    static const size_t mangled_size = 16;
+    static const size_t max_demangled_size = 32;
+    static constexpr const char* spec = "%a";
+};
+
+constexpr const char* float_data<double>::spec;
+
+template <>
+struct float_data<long double>
+{
+    static const size_t mangled_size = 20;  // May need to be adjusted to 16 or 24 on other platforms
+    static const size_t max_demangled_size = 40;
+    static constexpr const char* spec = "%LaL";
+};
+
+constexpr const char* float_data<long double>::spec;
+
+template <class Float, class C>
+const char*
+parse_floating_number(const char* first, const char* last, C& db)
+{
+    const size_t N = float_data<Float>::mangled_size;
+    if (static_cast<std::size_t>(last - first) > N)
+    {
+        last = first + N;
+        union
+        {
+            Float value;
+            char buf[sizeof(Float)];
+        };
+        const char* t = first;
+        char* e = buf;
+        for (; t != last; ++t, ++e)
+        {
+            if (!isxdigit(*t))
+                return first;
+            unsigned d1 = isdigit(*t) ? static_cast<unsigned>(*t - '0') :
+                                        static_cast<unsigned>(*t - 'a' + 10);
+            ++t;
+            unsigned d0 = isdigit(*t) ? static_cast<unsigned>(*t - '0') :
+                                        static_cast<unsigned>(*t - 'a' + 10);
+            *e = static_cast<char>((d1 << 4) + d0);
+        }
+        if (*t == 'E')
+        {
+#if __LITTLE_ENDIAN__
+            std::reverse(buf, e);
+#endif
+            char num[float_data<Float>::max_demangled_size] = {0};
+            int n = snprintf(num, sizeof(num), float_data<Float>::spec, value);
+            if (static_cast<std::size_t>(n) >= sizeof(num))
+                return first;
+            db.names.push_back(typename C::String(num, static_cast<std::size_t>(n)));
+            first = t+1;
+        }
+    }
+    return first;
+}
+
+// <source-name> ::= <positive length number> <identifier>
+
+template <class C>
+const char*
+parse_source_name(const char* first, const char* last, C& db)
+{
+    if (first != last)
+    {
+        char c = *first;
+        if (isdigit(c) && first+1 != last)
+        {
+            const char* t = first+1;
+            size_t n = static_cast<size_t>(c - '0');
+            for (c = *t; isdigit(c); c = *t)
+            {
+                n = n * 10 + static_cast<size_t>(c - '0');
+                if (++t == last)
+                    return first;
+            }
+            if (static_cast<size_t>(last - t) >= n)
+            {
+                typename C::String r(t, n);
+                if (r.substr(0, 10) == "_GLOBAL__N")
+                    db.names.push_back("(anonymous namespace)");
+                else
+                    db.names.push_back(std::move(r));
+                first = t + n;
+            }
+        }
+    }
+    return first;
+}
+
+// <substitution> ::= S <seq-id> _
+//                ::= S_
+// <substitution> ::= Sa # ::std::allocator
+// <substitution> ::= Sb # ::std::basic_string
+// <substitution> ::= Ss # ::std::basic_string < char,
+//                                               ::std::char_traits<char>,
+//                                               ::std::allocator<char> >
+// <substitution> ::= Si # ::std::basic_istream<char,  std::char_traits<char> >
+// <substitution> ::= So # ::std::basic_ostream<char,  std::char_traits<char> >
+// <substitution> ::= Sd # ::std::basic_iostream<char, std::char_traits<char> >
+
+template <class C>
+const char*
+parse_substitution(const char* first, const char* last, C& db)
+{
+    if (last - first >= 2)
+    {
+        if (*first == 'S')
+        {
+            switch (first[1])
+            {
+            case 'a':
+                db.names.push_back("std::allocator");
+                first += 2;
+                break;
+            case 'b':
+                db.names.push_back("std::basic_string");
+                first += 2;
+                break;
+            case 's':
+                db.names.push_back("std::string");
+                first += 2;
+                break;
+            case 'i':
+                db.names.push_back("std::istream");
+                first += 2;
+                break;
+            case 'o':
+                db.names.push_back("std::ostream");
+                first += 2;
+                break;
+            case 'd':
+                db.names.push_back("std::iostream");
+                first += 2;
+                break;
+            case '_':
+                if (!db.subs.empty())
+                {
+                    for (const auto& n : db.subs.front())
+                        db.names.push_back(n);
+                    first += 2;
+                }
+                break;
+            default:
+                if (std::isdigit(first[1]) || std::isupper(first[1]))
+                {
+                    size_t sub = 0;
+                    const char* t = first+1;
+                    if (std::isdigit(*t))
+                        sub = static_cast<size_t>(*t - '0');
+                    else
+                        sub = static_cast<size_t>(*t - 'A') + 10;
+                    for (++t; t != last && (std::isdigit(*t) || std::isupper(*t)); ++t)
+                    {
+                        sub *= 36;
+                        if (std::isdigit(*t))
+                            sub += static_cast<size_t>(*t - '0');
+                        else
+                            sub += static_cast<size_t>(*t - 'A') + 10;
+                    }
+                    if (t == last || *t != '_')
+                        return first;
+                    ++sub;
+                    if (sub < db.subs.size())
+                    {
+                        for (const auto& n : db.subs[sub])
+                            db.names.push_back(n);
+                        first = t+1;
+                    }
+                }
+                break;
+            }
+        }
+    }
+    return first;
+}
+
+// <builtin-type> ::= v    # void
+//                ::= w    # wchar_t
+//                ::= b    # bool
+//                ::= c    # char
+//                ::= a    # signed char
+//                ::= h    # unsigned char
+//                ::= s    # short
+//                ::= t    # unsigned short
+//                ::= i    # int
+//                ::= j    # unsigned int
+//                ::= l    # long
+//                ::= m    # unsigned long
+//                ::= x    # long long, __int64
+//                ::= y    # unsigned long long, __int64
+//                ::= n    # __int128
+//                ::= o    # unsigned __int128
+//                ::= f    # float
+//                ::= d    # double
+//                ::= e    # long double, __float80
+//                ::= g    # __float128
+//                ::= z    # ellipsis
+//                ::= Dd   # IEEE 754r decimal floating point (64 bits)
+//                ::= De   # IEEE 754r decimal floating point (128 bits)
+//                ::= Df   # IEEE 754r decimal floating point (32 bits)
+//                ::= Dh   # IEEE 754r half-precision floating point (16 bits)
+//                ::= Di   # char32_t
+//                ::= Ds   # char16_t
+//                ::= Da   # auto (in dependent new-expressions)
+//                ::= Dn   # std::nullptr_t (i.e., decltype(nullptr))
+//                ::= u <source-name>    # vendor extended type
+
+template <class C>
+const char*
+parse_builtin_type(const char* first, const char* last, C& db)
+{
+    if (first != last)
+    {
+        switch (*first)
+        {
+        case 'v':
+            db.names.push_back("void");
+            ++first;
+            break;
+        case 'w':
+            db.names.push_back("wchar_t");
+            ++first;
+            break;
+        case 'b':
+            db.names.push_back("bool");
+            ++first;
+            break;
+        case 'c':
+            db.names.push_back("char");
+            ++first;
+            break;
+        case 'a':
+            db.names.push_back("signed char");
+            ++first;
+            break;
+        case 'h':
+            db.names.push_back("unsigned char");
+            ++first;
+            break;
+        case 's':
+            db.names.push_back("short");
+            ++first;
+            break;
+        case 't':
+            db.names.push_back("unsigned short");
+            ++first;
+            break;
+        case 'i':
+            db.names.push_back("int");
+            ++first;
+            break;
+        case 'j':
+            db.names.push_back("unsigned int");
+            ++first;
+            break;
+        case 'l':
+            db.names.push_back("long");
+            ++first;
+            break;
+        case 'm':
+            db.names.push_back("unsigned long");
+            ++first;
+            break;
+        case 'x':
+            db.names.push_back("long long");
+            ++first;
+            break;
+        case 'y':
+            db.names.push_back("unsigned long long");
+            ++first;
+            break;
+        case 'n':
+            db.names.push_back("__int128");
+            ++first;
+            break;
+        case 'o':
+            db.names.push_back("unsigned __int128");
+            ++first;
+            break;
+        case 'f':
+            db.names.push_back("float");
+            ++first;
+            break;
+        case 'd':
+            db.names.push_back("double");
+            ++first;
+            break;
+        case 'e':
+            db.names.push_back("long double");
+            ++first;
+            break;
+        case 'g':
+            db.names.push_back("__float128");
+            ++first;
+            break;
+        case 'z':
+            db.names.push_back("...");
+            ++first;
+            break;
+        case 'u':
+            {
+                const char*t = parse_source_name(first+1, last, db);
+                if (t != first+1)
+                    first = t;
+            }
+            break;
+        case 'D':
+            if (first+1 != last)
+            {
+                switch (first[1])
+                {
+                case 'd':
+                    db.names.push_back("decimal64");
+                    first += 2;
+                    break;
+                case 'e':
+                    db.names.push_back("decimal128");
+                    first += 2;
+                    break;
+                case 'f':
+                    db.names.push_back("decimal32");
+                    first += 2;
+                    break;
+                case 'h':
+                    db.names.push_back("decimal16");
+                    first += 2;
+                    break;
+                case 'i':
+                    db.names.push_back("char32_t");
+                    first += 2;
+                    break;
+                case 's':
+                    db.names.push_back("char16_t");
+                    first += 2;
+                    break;
+                case 'a':
+                    db.names.push_back("auto");
+                    first += 2;
+                    break;
+                case 'n':
+                    db.names.push_back("std::nullptr_t");
+                    first += 2;
+                    break;
+                }
+            }
+            break;
+        }
+    }
+    return first;
+}
+
+// <CV-qualifiers> ::= [r] [V] [K]
+
+const char*
+parse_cv_qualifiers(const char* first, const char* last, unsigned& cv)
+{
+    cv = 0;
+    if (first != last)
+    {
+        if (*first == 'r')
+        {
+            cv |= 4;
+            ++first;
+        }
+        if (*first == 'V')
+        {
+            cv |= 2;
+            ++first;
+        }
+        if (*first == 'K')
+        {
+            cv |= 1;
+            ++first;
+        }
+    }
+    return first;
+}
+
+// <template-param> ::= T_    # first template parameter
+//                  ::= T <parameter-2 non-negative number> _
+
+template <class C>
+const char*
+parse_template_param(const char* first, const char* last, C& db)
+{
+    if (last - first >= 2)
+    {
+        if (*first == 'T')
+        {
+            if (first[1] == '_')
+            {
+                if (!db.template_param.back().empty())
+                {
+                    for (auto& t : db.template_param.back().front())
+                        db.names.push_back(t);
+                    first += 2;
+                }
+                else
+                {
+                    db.names.push_back("T_");
+                    first += 2;
+                    db.fix_forward_references = true;
+                }
+            }
+            else if (isdigit(first[1]))
+            {
+                const char* t = first+1;
+                size_t sub = static_cast<size_t>(*t - '0');
+                for (++t; t != last && isdigit(*t); ++t)
+                {
+                    sub *= 10;
+                    sub += static_cast<size_t>(*t - '0');
+                }
+                if (t == last || *t != '_')
+                    return first;
+                ++sub;
+                if (sub < db.template_param.back().size())
+                {
+                    for (auto& temp : db.template_param.back()[sub])
+                        db.names.push_back(temp);
+                    first = t+1;
+                }
+                else
+                {
+                    db.names.push_back(typename C::String(first, t+1));
+                    first = t+1;
+                    db.fix_forward_references = true;
+                }
+            }
+        }
+    }
+    return first;
+}
+
+// cc <type> <expression>                               # const_cast<type> (expression)
+
+template <class C>
+const char*
+parse_const_cast_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 'c' && first[1] == 'c')
+    {
+        const char* t = parse_type(first+2, last, db);
+        if (t != first+2)
+        {
+            const char* t1 = parse_expression(t, last, db);
+            if (t1 != t)
+            {
+                auto expr = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back() = "const_cast<" + db.names.back().move_full() + ">(" + expr + ")";
+                first = t1;
+            }
+        }
+    }
+    return first;
+}
+
+// dc <type> <expression>                               # dynamic_cast<type> (expression)
+
+template <class C>
+const char*
+parse_dynamic_cast_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 'd' && first[1] == 'c')
+    {
+        const char* t = parse_type(first+2, last, db);
+        if (t != first+2)
+        {
+            const char* t1 = parse_expression(t, last, db);
+            if (t1 != t)
+            {
+                auto expr = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back() = "dynamic_cast<" + db.names.back().move_full() + ">(" + expr + ")";
+                first = t1;
+            }
+        }
+    }
+    return first;
+}
+
+// rc <type> <expression>                               # reinterpret_cast<type> (expression)
+
+template <class C>
+const char*
+parse_reinterpret_cast_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 'r' && first[1] == 'c')
+    {
+        const char* t = parse_type(first+2, last, db);
+        if (t != first+2)
+        {
+            const char* t1 = parse_expression(t, last, db);
+            if (t1 != t)
+            {
+                auto expr = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back() = "reinterpret_cast<" + db.names.back().move_full() + ">(" + expr + ")";
+                first = t1;
+            }
+        }
+    }
+    return first;
+}
+
+// sc <type> <expression>                               # static_cast<type> (expression)
+
+template <class C>
+const char*
+parse_static_cast_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 's' && first[1] == 'c')
+    {
+        const char* t = parse_type(first+2, last, db);
+        if (t != first+2)
+        {
+            const char* t1 = parse_expression(t, last, db);
+            if (t1 != t)
+            {
+                auto expr = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back() = "static_cast<" + db.names.back().move_full() + ">(" + expr + ")";
+                first = t1;
+            }
+        }
+    }
+    return first;
+}
+
+// sp <expression>                                  # pack expansion
+
+template <class C>
+const char*
+parse_pack_expansion(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 's' && first[1] == 'p')
+    {
+        const char* t = parse_expression(first+2, last, db);
+        if (t != first+2)
+            first = t;
+    }
+    return first;
+}
+
+// st <type>                                            # sizeof (a type)
+
+template <class C>
+const char*
+parse_sizeof_type_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 's' && first[1] == 't')
+    {
+        const char* t = parse_type(first+2, last, db);
+        if (t != first+2)
+        {
+            db.names.back() = "sizeof (" + db.names.back().move_full() + ")";
+            first = t;
+        }
+    }
+    return first;
+}
+
+// sz <expr>                                            # sizeof (a expression)
+
+template <class C>
+const char*
+parse_sizeof_expr_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 's' && first[1] == 'z')
+    {
+        const char* t = parse_expression(first+2, last, db);
+        if (t != first+2)
+        {
+            db.names.back() = "sizeof (" + db.names.back().move_full() + ")";
+            first = t;
+        }
+    }
+    return first;
+}
+
+// sZ <template-param>                                  # size of a parameter pack
+
+template <class C>
+const char*
+parse_sizeof_param_pack_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 's' && first[1] == 'Z' && first[2] == 'T')
+    {
+        size_t k0 = db.names.size();
+        const char* t = parse_template_param(first+2, last, db);
+        size_t k1 = db.names.size();
+        if (t != first+2)
+        {
+            typename C::String tmp("sizeof...(");
+            size_t k = k0;
+            if (k != k1)
+            {
+                tmp += db.names[k].move_full();
+                for (++k; k != k1; ++k)
+                    tmp += ", " + db.names[k].move_full();
+            }
+            tmp += ")";
+            for (; k1 != k0; --k1)
+                db.names.pop_back();
+            db.names.push_back(std::move(tmp));
+            first = t;
+        }
+    }
+    return first;
+}
+
+// <function-param> ::= fp <top-level CV-qualifiers> _                                     # L == 0, first parameter
+//                  ::= fp <top-level CV-qualifiers> <parameter-2 non-negative number> _   # L == 0, second and later parameters
+//                  ::= fL <L-1 non-negative number> p <top-level CV-qualifiers> _         # L > 0, first parameter
+//                  ::= fL <L-1 non-negative number> p <top-level CV-qualifiers> <parameter-2 non-negative number> _   # L > 0, second and later parameters
+
+template <class C>
+const char*
+parse_function_param(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && *first == 'f')
+    {
+        if (first[1] == 'p')
+        {
+            unsigned cv;
+            const char* t = parse_cv_qualifiers(first+2, last, cv);
+            const char* t1 = parse_number(t, last);
+            if (t1 != last && *t1 == '_')
+            {
+                db.names.push_back("fp" + typename C::String(t, t1));
+                first = t1+1;
+            }
+        }
+        else if (first[1] == 'L')
+        {
+            unsigned cv;
+            const char* t0 = parse_number(first+2, last);
+            if (t0 != last && *t0 == 'p')
+            {
+                ++t0;
+                const char* t = parse_cv_qualifiers(t0, last, cv);
+                const char* t1 = parse_number(t, last);
+                if (t1 != last && *t1 == '_')
+                {
+                    db.names.push_back("fp" + typename C::String(t, t1));
+                    first = t1+1;
+                }
+            }
+        }
+    }
+    return first;
+}
+
+// sZ <function-param>                                  # size of a function parameter pack
+
+template <class C>
+const char*
+parse_sizeof_function_param_pack_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 's' && first[1] == 'Z' && first[2] == 'f')
+    {
+        const char* t = parse_function_param(first+2, last, db);
+        if (t != first+2)
+        {
+            db.names.back() = "sizeof...(" + db.names.back().move_full() + ")";
+            first = t;
+        }
+    }
+    return first;
+}
+
+// te <expression>                                      # typeid (expression)
+// ti <type>                                            # typeid (type)
+
+template <class C>
+const char*
+parse_typeid_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 't' && (first[1] == 'e' || first[1] == 'i'))
+    {
+        const char* t;
+        if (first[1] == 'e')
+            t = parse_expression(first+2, last, db);
+        else
+            t = parse_type(first+2, last, db);
+        if (t != first+2)
+        {
+            db.names.back() = "typeid(" + db.names.back().move_full() + ")";
+            first = t;
+        }
+    }
+    return first;
+}
+
+// tw <expression>                                      # throw expression
+
+template <class C>
+const char*
+parse_throw_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 't' && first[1] == 'w')
+    {
+        const char* t = parse_expression(first+2, last, db);
+        if (t != first+2)
+        {
+            db.names.back() = "throw " + db.names.back().move_full();
+            first = t;
+        }
+    }
+    return first;
+}
+
+// ds <expression> <expression>                         # expr.*expr
+
+template <class C>
+const char*
+parse_dot_star_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 'd' && first[1] == 's')
+    {
+        const char* t = parse_expression(first+2, last, db);
+        if (t != first+2)
+        {
+            const char* t1 = parse_expression(t, last, db);
+            if (t1 != t)
+            {
+                auto expr = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back().first += ".*" + expr;
+                first = t1;
+            }
+        }
+    }
+    return first;
+}
+
+// <simple-id> ::= <source-name> [ <template-args> ]
+
+template <class C>
+const char*
+parse_simple_id(const char* first, const char* last, C& db)
+{
+    if (first != last)
+    {
+        const char* t = parse_source_name(first, last, db);
+        if (t != first)
+        {
+            const char* t1 = parse_template_args(t, last, db);
+            if (t1 != t)
+            {
+                auto args = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back().first += std::move(args);
+            }
+            first = t1;
+        }
+        else
+            first = t;
+    }
+    return first;
+}
+
+// <unresolved-type> ::= <template-param>
+//                   ::= <decltype>
+//                   ::= <substitution>
+
+template <class C>
+const char*
+parse_unresolved_type(const char* first, const char* last, C& db)
+{
+    if (first != last)
+    {
+        const char* t = first;
+        switch (*first)
+        {
+        case 'T':
+          {
+            size_t k0 = db.names.size();
+            t = parse_template_param(first, last, db);
+            size_t k1 = db.names.size();
+            if (t != first && k1 == k0 + 1)
+            {
+                db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                first = t;
+            }
+            else
+            {
+                for (; k1 != k0; --k1)
+                    db.names.pop_back();
+            }
+            break;
+          }
+        case 'D':
+            t = parse_decltype(first, last, db);
+            if (t != first)
+            {
+                db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                first = t;
+            }
+            break;
+        case 'S':
+            t = parse_substitution(first, last, db);
+            if (t != first)
+                first = t;
+            else
+            {
+                if (last - first > 2 && first[1] == 't')
+                {
+                    t = parse_unqualified_name(first+2, last, db);
+                    if (t != first+2)
+                    {
+                        db.names.back().first.insert(0, "std::");
+                        db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                        first = t;
+                    }
+                }
+            }
+            break;
+       }
+    }
+    return first;
+}
+
+// <destructor-name> ::= <unresolved-type>                               # e.g., ~T or ~decltype(f())
+//                   ::= <simple-id>                                     # e.g., ~A<2*N>
+
+template <class C>
+const char*
+parse_destructor_name(const char* first, const char* last, C& db)
+{
+    if (first != last)
+    {
+        const char* t = parse_unresolved_type(first, last, db);
+        if (t == first)
+            t = parse_simple_id(first, last, db);
+        if (t != first)
+        {
+            db.names.back().first.insert(0, "~");
+            first = t;
+        }
+    }
+    return first;
+}
+
+// <base-unresolved-name> ::= <simple-id>                                # unresolved name
+//          extension     ::= <operator-name>                            # unresolved operator-function-id
+//          extension     ::= <operator-name> <template-args>            # unresolved operator template-id
+//                        ::= on <operator-name>                         # unresolved operator-function-id
+//                        ::= on <operator-name> <template-args>         # unresolved operator template-id
+//                        ::= dn <destructor-name>                       # destructor or pseudo-destructor;
+//                                                                         # e.g. ~X or ~X<N-1>
+
+template <class C>
+const char*
+parse_base_unresolved_name(const char* first, const char* last, C& db)
+{
+    if (last - first >= 2)
+    {
+        if ((first[0] == 'o' || first[0] == 'd') && first[1] == 'n')
+        {
+            if (first[0] == 'o')
+            {
+                const char* t = parse_operator_name(first+2, last, db);
+                if (t != first+2)
+                {
+                    first = parse_template_args(t, last, db);
+                    if (first != t)
+                    {
+                        auto args = db.names.back().move_full();
+                        db.names.pop_back();
+                        db.names.back().first += std::move(args);
+                    }
+                }
+            }
+            else
+            {
+                const char* t = parse_destructor_name(first+2, last, db);
+                if (t != first+2)
+                    first = t;
+            }
+        }
+        else
+        {
+            const char* t = parse_simple_id(first, last, db);
+            if (t == first)
+            {
+                t = parse_operator_name(first, last, db);
+                if (t != first)
+                {
+                    first = parse_template_args(t, last, db);
+                    if (first != t)
+                    {
+                        auto args = db.names.back().move_full();
+                        db.names.pop_back();
+                        db.names.back().first += std::move(args);
+                    }
+                }
+            }
+            else
+                first = t;
+        }
+    }
+    return first;
+}
+
+// <unresolved-qualifier-level> ::= <simple-id>
+
+template <class C>
+const char*
+parse_unresolved_qualifier_level(const char* first, const char* last, C& db)
+{
+    return parse_simple_id(first, last, db);
+}
+
+// <unresolved-name>
+//  extension        ::= srN <unresolved-type> [<template-args>] <unresolved-qualifier-level>* E <base-unresolved-name>
+//                   ::= [gs] <base-unresolved-name>                     # x or (with "gs") ::x
+//                   ::= [gs] sr <unresolved-qualifier-level>+ E <base-unresolved-name>  
+//                                                                       # A::x, N::y, A<T>::z; "gs" means leading "::"
+//                   ::= sr <unresolved-type> <base-unresolved-name>     # T::x / decltype(p)::x
+//  extension        ::= sr <unresolved-type> <template-args> <base-unresolved-name>
+//                                                                       # T::N::x /decltype(p)::N::x
+//  (ignored)        ::= srN <unresolved-type>  <unresolved-qualifier-level>+ E <base-unresolved-name>
+
+template <class C>
+const char*
+parse_unresolved_name(const char* first, const char* last, C& db)
+{
+    if (last - first > 2)
+    {
+        const char* t = first;
+        bool global = false;
+        if (t[0] == 'g' && t[1] == 's')
+        {
+            global = true;
+            t += 2;
+        }
+        const char* t2 = parse_base_unresolved_name(t, last, db);
+        if (t2 != t)
+        {
+            if (global)
+                db.names.back().first.insert(0, "::");
+            first = t2;
+        }
+        else if (last - t > 2 && t[0] == 's' && t[1] == 'r')
+        {
+            if (t[2] == 'N')
+            {
+                t += 3;
+                const char* t1 = parse_unresolved_type(t, last, db);
+                if (t1 == t || t1 == last)
+                    return first;
+                t = t1;
+                t1 = parse_template_args(t, last, db);
+                if (t1 != t)
+                {
+                    auto args = db.names.back().move_full();
+                    db.names.pop_back();
+                    db.names.back().first += std::move(args);
+                    t = t1;
+                    if (t == last)
+                    {
+                        db.names.pop_back();
+                        return first;
+                    }
+                }
+                while (*t != 'E')
+                {
+                    t1 = parse_unresolved_qualifier_level(t, last, db);
+                    if (t1 == t || t1 == last)
+                        return first;
+                    auto s = db.names.back().move_full();
+                    db.names.pop_back();
+                    db.names.back().first += "::" + std::move(s);
+                    t = t1;
+                }
+                ++t;
+                t1 = parse_base_unresolved_name(t, last, db);
+                if (t1 == t)
+                {
+                    db.names.pop_back();
+                    return first;
+                }
+                auto s = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back().first += "::" + std::move(s);
+                first = t1;
+            }
+            else
+            {
+                t += 2;
+                const char* t1 = parse_unresolved_type(t, last, db);
+                if (t1 != t)
+                {
+                    t = t1;
+                    t1 = parse_template_args(t, last, db);
+                    if (t1 != t)
+                    {
+                        auto args = db.names.back().move_full();
+                        db.names.pop_back();
+                        db.names.back().first += std::move(args);
+                        t = t1;
+                    }
+                    t1 = parse_base_unresolved_name(t, last, db);
+                    if (t1 == t)
+                    {
+                        db.names.pop_back();
+                        return first;
+                    }
+                    auto s = db.names.back().move_full();
+                    db.names.pop_back();
+                    db.names.back().first += "::" + std::move(s);
+                    first = t1;
+                }
+                else
+                {
+                    t1 = parse_unresolved_qualifier_level(t, last, db);
+                    if (t1 == t || t1 == last)
+                        return first;
+                    t = t1;
+                    if (global)
+                        db.names.back().first.insert(0, "::");
+                    while (*t != 'E')
+                    {
+                        t1 = parse_unresolved_qualifier_level(t, last, db);
+                        if (t1 == t || t1 == last)
+                            return first;
+                        auto s = db.names.back().move_full();
+                        db.names.pop_back();
+                        db.names.back().first += "::" + std::move(s);
+                        t = t1;
+                    }
+                    ++t;
+                    t1 = parse_base_unresolved_name(t, last, db);
+                    if (t1 == t)
+                    {
+                        db.names.pop_back();
+                        return first;
+                    }
+                    auto s = db.names.back().move_full();
+                    db.names.pop_back();
+                    db.names.back().first += "::" + std::move(s);
+                    first = t1;
+                }
+            }
+        }
+    }
+    return first;
+}
+
+// dt <expression> <unresolved-name>                    # expr.name
+
+template <class C>
+const char*
+parse_dot_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 'd' && first[1] == 't')
+    {
+        const char* t = parse_expression(first+2, last, db);
+        if (t != first+2)
+        {
+            const char* t1 = parse_unresolved_name(t, last, db);
+            if (t1 != t)
+            {
+                auto name = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back().first += "." + name;
+                first = t1;
+            }
+        }
+    }
+    return first;
+}
+
+// cl <expression>+ E                                   # call
+
+template <class C>
+const char*
+parse_call_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 4 && first[0] == 'c' && first[1] == 'l')
+    {
+        const char* t = parse_expression(first+2, last, db);
+        if (t != first+2)
+        {
+            if (t == last)
+                return first;
+            db.names.back().first += db.names.back().second;
+            db.names.back().second = typename C::String();
+            db.names.back().first.append("(");
+            bool first_expr = true;
+            while (*t != 'E')
+            {
+                const char* t1 = parse_expression(t, last, db);
+                if (t1 == t || t1 == last)
+                    return first;
+                auto tmp = db.names.back().move_full();
+                db.names.pop_back();
+                if (!tmp.empty())
+                {
+                    if (!first_expr)
+                    {
+                        db.names.back().first.append(", ");
+                        first_expr = false;
+                    }
+                    db.names.back().first.append(tmp);
+                }
+                t = t1;
+            }
+            ++t;
+            db.names.back().first.append(")");
+            first = t;
+        }
+    }
+    return first;
+}
+
+// [gs] nw <expression>* _ <type> E                     # new (expr-list) type
+// [gs] nw <expression>* _ <type> <initializer>         # new (expr-list) type (init)
+// [gs] na <expression>* _ <type> E                     # new[] (expr-list) type
+// [gs] na <expression>* _ <type> <initializer>         # new[] (expr-list) type (init)
+// <initializer> ::= pi <expression>* E                 # parenthesized initialization
+
+template <class C>
+const char*
+parse_new_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 4)
+    {
+        const char* t = first;
+        bool parsed_gs = false;
+        if (t[0] == 'g' && t[1] == 's')
+        {
+            t += 2;
+            parsed_gs = true;
+        }
+        if (t[0] == 'n' && (t[1] == 'w' || t[1] == 'a'))
+        {
+            bool is_array = t[1] == 'a';
+            t += 2;
+            if (t == last)
+                return first;
+            bool has_expr_list = false;
+            bool first_expr = true;
+            while (*t != '_')
+            {
+                const char* t1 = parse_expression(t, last, db);
+                if (t1 == t || t1 == last)
+                    return first;
+                has_expr_list = true;
+                if (!first_expr)
+                {
+                    auto tmp = db.names.back().move_full();
+                    db.names.pop_back();
+                    if (!tmp.empty())
+                    {
+                        db.names.back().first.append(", ");
+                        db.names.back().first.append(tmp);
+                        first_expr = false;
+                    }
+                }
+                t = t1;
+            }
+            ++t;
+            const char* t1 = parse_type(t, last, db);
+            if (t1 == t || t1 == last)
+                return first;
+            t = t1;
+            bool has_init = false;
+            if (last - t >= 3 && t[0] == 'p' && t[1] == 'i')
+            {
+                t += 2;
+                has_init = true;
+                first_expr = true;
+                while (*t != 'E')
+                {
+                    t1 = parse_expression(t, last, db);
+                    if (t1 == t || t1 == last)
+                        return first;
+                    if (!first_expr)
+                    {
+                        auto tmp = db.names.back().move_full();
+                        db.names.pop_back();
+                        if (!tmp.empty())
+                        {
+                            db.names.back().first.append(", ");
+                            db.names.back().first.append(tmp);
+                            first_expr = false;
+                        }
+                    }
+                    t = t1;
+                }
+            }
+            if (*t != 'E')
+                return first;
+            typename C::String init_list;
+            if (has_init)
+            {
+                init_list = db.names.back().move_full();
+                db.names.pop_back();
+            }
+            auto type = db.names.back().move_full();
+            db.names.pop_back();
+            typename C::String expr_list;
+            if (has_expr_list)
+            {
+                expr_list = db.names.back().move_full();
+                db.names.pop_back();
+            }
+            typename C::String r;
+            if (parsed_gs)
+                r = "::";
+            if (is_array)
+                r += "[] ";
+            else
+                r += " ";
+            if (has_expr_list)
+                r += "(" + expr_list + ") ";
+            r += type;
+            if (has_init)
+                r += " (" + init_list + ")";
+            db.names.push_back(std::move(r));
+            first = t+1;
+        }
+    }
+    return first;
+}
+
+// cv <type> <expression>                               # conversion with one argument
+// cv <type> _ <expression>* E                          # conversion with a different number of arguments
+
+template <class C>
+const char*
+parse_conversion_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 'c' && first[1] == 'v')
+    {
+        bool try_to_parse_template_args = db.try_to_parse_template_args;
+        db.try_to_parse_template_args = false;
+        const char* t = parse_type(first+2, last, db);
+        db.try_to_parse_template_args = try_to_parse_template_args;
+        if (t != first+2 && t != last)
+        {
+            if (*t != '_')
+            {
+                const char* t1 = parse_expression(t, last, db);
+                if (t1 == t)
+                    return first;
+                t = t1;
+            }
+            else
+            {
+                ++t;
+                if (t == last)
+                    return first;
+                if (*t == 'E')
+                    db.names.emplace_back();
+                else
+                {
+                    bool first_expr = true;
+                    while (*t != 'E')
+                    {
+                        const char* t1 = parse_expression(t, last, db);
+                        if (t1 == t || t1 == last)
+                            return first;
+                        if (!first_expr)
+                        {
+                            auto tmp = db.names.back().move_full();
+                            db.names.pop_back();
+                            if (!tmp.empty())
+                            {
+                                db.names.back().first.append(", ");
+                                db.names.back().first.append(tmp);
+                                first_expr = false;
+                            }
+                        }
+                        t = t1;
+                    }
+                }
+                ++t;
+            }
+            auto tmp = db.names.back().move_full();
+            db.names.pop_back();
+            db.names.back() = "(" + db.names.back().move_full() + ")(" + tmp + ")";
+            first = t;
+        }
+    }
+    return first;
+}
+
+// pt <expression> <expression>                    # expr->name
+
+template <class C>
+const char*
+parse_arrow_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 'p' && first[1] == 't')
+    {
+        const char* t = parse_expression(first+2, last, db);
+        if (t != first+2)
+        {
+            const char* t1 = parse_expression(t, last, db);
+            if (t1 != t)
+            {
+                auto tmp = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back().first += "->";
+                db.names.back().first += tmp;
+                first = t1;
+            }
+        }
+    }
+    return first;
+}
+
+//  <ref-qualifier> ::= R                   # & ref-qualifier
+//  <ref-qualifier> ::= O                   # && ref-qualifier
+
+// <function-type> ::= F [Y] <bare-function-type> [<ref-qualifier>] E
+
+template <class C>
+const char*
+parse_function_type(const char* first, const char* last, C& db)
+{
+    if (first != last && *first == 'F')
+    {
+        const char* t = first+1;
+        if (t != last)
+        {
+            bool externC = false;
+            if (*t == 'Y')
+            {
+                externC = true;
+                if (++t == last)
+                    return first;
+            }
+            const char* t1 = parse_type(t, last, db);
+            if (t1 != t)
+            {
+                t = t1;
+                typename C::String sig("(");
+                int ref_qual = 0;
+                while (true)
+                {
+                    if (t == last)
+                    {
+                        db.names.pop_back();
+                        return first;
+                    }
+                    if (*t == 'E')
+                    {
+                        ++t;
+                        break;
+                    }
+                    if (*t == 'v')
+                    {
+                        ++t;
+                        continue;
+                    }
+                    if (*t == 'R' && t+1 != last && t[1] == 'E')
+                    {
+                        ref_qual = 1;
+                        ++t;
+                        continue;
+                    }
+                    if (*t == 'O' && t+1 != last && t[1] == 'E')
+                    {
+                        ref_qual = 2;
+                        ++t;
+                        continue;
+                    }
+                    size_t k0 = db.names.size();
+                    t1 = parse_type(t, last, db);
+                    size_t k1 = db.names.size();
+                    if (t1 == t || t1 == last)
+                        return first;
+                    for (size_t k = k0; k < k1; ++k)
+                    {
+                        if (sig.size() > 1)
+                            sig += ", ";
+                        sig += db.names[k].move_full();
+                    }
+                    for (size_t k = k0; k < k1; ++k)
+                        db.names.pop_back();
+                    t = t1;
+                }
+                sig += ")";
+                switch (ref_qual)
+                {
+                case 1:
+                    sig += " &";
+                    break;
+                case 2:
+                    sig += " &&";
+                    break;
+                }
+                db.names.back().first += " ";
+                db.names.back().second.insert(0, sig);
+                first = t;
+            }
+        }
+    }
+    return first;
+}
+
+// <pointer-to-member-type> ::= M <class type> <member type>
+
+template <class C>
+const char*
+parse_pointer_to_member_type(const char* first, const char* last, C& db)
+{
+    if (first != last && *first == 'M')
+    {
+        const char* t = parse_type(first+1, last, db);
+        if (t != first+1)
+        {
+            const char* t2 = parse_type(t, last, db);
+            if (t2 != t)
+            {
+                auto func = std::move(db.names.back());
+                db.names.pop_back();
+                auto class_type = std::move(db.names.back());
+                if (func.second.front() == '(')
+                {
+                    db.names.back().first = std::move(func.first) + "(" + class_type.move_full() + "::*";
+                    db.names.back().second = ")" + std::move(func.second);
+                }
+                else
+                {
+                    db.names.back().first = std::move(func.first) + " " + class_type.move_full() + "::*";
+                    db.names.back().second = std::move(func.second);
+                }
+                first = t2;
+            }
+        }
+    }
+    return first;
+}
+
+// <array-type> ::= A <positive dimension number> _ <element type>
+//              ::= A [<dimension expression>] _ <element type>
+
+template <class C>
+const char*
+parse_array_type(const char* first, const char* last, C& db)
+{
+    if (first != last && *first == 'A' && first+1 != last)
+    {
+        if (first[1] == '_')
+        {
+            const char* t = parse_type(first+2, last, db);
+            if (t != first+2)
+            {
+                if (db.names.back().second.substr(0, 2) == " [")
+                    db.names.back().second.erase(0, 1);
+                db.names.back().second.insert(0, " []");
+                first = t;
+            }
+        }
+        else if ('1' <= first[1] && first[1] <= '9')
+        {
+            const char* t = parse_number(first+1, last);
+            if (t != last && *t == '_')
+            {
+                const char* t2 = parse_type(t+1, last, db);
+                if (t2 != t+1)
+                {
+                    if (db.names.back().second.substr(0, 2) == " [")
+                        db.names.back().second.erase(0, 1);
+                    db.names.back().second.insert(0, " [" + typename C::String(first+1, t) + "]");
+                    first = t2;
+                }
+            }
+        }
+        else
+        {
+            const char* t = parse_expression(first+1, last, db);
+            if (t != first+1 && t != last && *t == '_')
+            {
+                const char* t2 = parse_type(++t, last, db);
+                if (t2 != t)
+                {
+                    auto type = std::move(db.names.back());
+                    db.names.pop_back();
+                    auto expr = std::move(db.names.back());
+                    db.names.back().first = std::move(type.first);
+                    if (type.second.substr(0, 2) == " [")
+                        type.second.erase(0, 1);
+                    db.names.back().second = " [" + expr.move_full() + "]" + std::move(type.second);
+                    first = t2;
+                }
+            }
+        }
+    }
+    return first;
+}
+
+// <decltype>  ::= Dt <expression> E  # decltype of an id-expression or class member access (C++0x)
+//             ::= DT <expression> E  # decltype of an expression (C++0x)
+
+template <class C>
+const char*
+parse_decltype(const char* first, const char* last, C& db)
+{
+    if (last - first >= 4 && first[0] == 'D')
+    {
+        switch (first[1])
+        {
+        case 't':
+        case 'T':
+            {
+                const char* t = parse_expression(first+2, last, db);
+                if (t != first+2 && t != last && *t == 'E')
+                {
+                    db.names.back() = "decltype(" + db.names.back().move_full() + ")";
+                    first = t+1;
+                }
+            }
+            break;
+        }
+    }
+    return first;
+}
+
+// extension:
+// <vector-type>           ::= Dv <positive dimension number> _
+//                                    <extended element type>
+//                         ::= Dv [<dimension expression>] _ <element type>
+// <extended element type> ::= <element type>
+//                         ::= p # AltiVec vector pixel
+
+template <class C>
+const char*
+parse_vector_type(const char* first, const char* last, C& db)
+{
+    if (last - first > 3 && first[0] == 'D' && first[1] == 'v')
+    {
+        if ('1' <= first[2] && first[2] <= '9')
+        {
+            const char* t = parse_number(first+2, last);
+            if (t == last || *t != '_')
+                return first;
+            const char* num = first + 2;
+            size_t sz = static_cast<size_t>(t - num);
+            if (++t != last)
+            {
+                if (*t != 'p')
+                {
+                    const char* t1 = parse_type(t, last, db);
+                    if (t1 != t)
+                    {
+                        db.names.back().first += " vector[" + typename C::String(num, sz) + "]";
+                        first = t1;
+                    }
+                }
+                else
+                {
+                    ++t;
+                    db.names.push_back("pixel vector[" + typename C::String(num, sz) + "]");
+                    first = t;
+                }
+            }
+        }
+        else
+        {
+            typename C::String num;
+            const char* t1 = first+2;
+            if (*t1 != '_')
+            {
+                const char* t = parse_expression(t1, last, db);
+                if (t != t1)
+                {
+                    num = db.names.back().move_full();
+                    db.names.pop_back();
+                    t1 = t;
+                }
+            }
+            if (t1 != last && *t1 == '_' && ++t1 != last)
+            {
+                const char* t = parse_type(t1, last, db);
+                if (t != t1)
+                {
+                    db.names.back().first += " vector[" + num + "]";
+                    first = t;
+                }
+            }
+        }
+    }
+    return first;
+}
+
+// <type> ::= <builtin-type>
+//        ::= <function-type>
+//        ::= <class-enum-type>
+//        ::= <array-type>
+//        ::= <pointer-to-member-type>
+//        ::= <template-param>
+//        ::= <template-template-param> <template-args>
+//        ::= <decltype>
+//        ::= <substitution>
+//        ::= <CV-qualifiers> <type>
+//        ::= P <type>        # pointer-to
+//        ::= R <type>        # reference-to
+//        ::= O <type>        # rvalue reference-to (C++0x)
+//        ::= C <type>        # complex pair (C 2000)
+//        ::= G <type>        # imaginary (C 2000)
+//        ::= Dp <type>       # pack expansion (C++0x)
+//        ::= U <source-name> <type>  # vendor extended type qualifier
+// extension := U <objc-name> <objc-type>  # objc-type<identifier>
+// extension := <vector-type> # <vector-type> starts with Dv
+
+// <objc-name> ::= <k0 number> objcproto <k1 number> <identifier>  # k0 = 9 + <number of digits in k1> + k1
+// <objc-type> := <source-name>  # PU<11+>objcproto 11objc_object<source-name> 11objc_object -> id<source-name>
+
+template <class C>
+const char*
+parse_type(const char* first, const char* last, C& db)
+{
+    if (first != last)
+    {
+        switch (*first)
+        {
+            case 'r':
+            case 'V':
+            case 'K':
+              {
+                unsigned cv = 0;
+                const char* t = parse_cv_qualifiers(first, last, cv);
+                if (t != first)
+                {
+                    bool is_function = *t == 'F';
+                    size_t k0 = db.names.size();
+                    const char* t1 = parse_type(t, last, db);
+                    size_t k1 = db.names.size();
+                    if (t1 != t)
+                    {
+                        if (is_function)
+                            db.subs.pop_back();
+                        db.subs.emplace_back(db.names.get_allocator());
+                        for (size_t k = k0; k < k1; ++k)
+                        {
+                            if (is_function)
+                            {
+                                size_t p = db.names[k].second.size();
+                                if (db.names[k].second[p-2] == '&')
+                                    p -= 3;
+                                else if (db.names[k].second.back() == '&')
+                                    p -= 2;
+                                if (cv & 1)
+                                {
+                                    db.names[k].second.insert(p, " const");
+                                    p += 6;
+                                }
+                                if (cv & 2)
+                                {
+                                    db.names[k].second.insert(p, " volatile");
+                                    p += 9;
+                                }
+                                if (cv & 4)
+                                    db.names[k].second.insert(p, " restrict");
+                            }
+                            else
+                            {
+                                if (cv & 1)
+                                    db.names[k].first.append(" const");
+                                if (cv & 2)
+                                    db.names[k].first.append(" volatile");
+                                if (cv & 4)
+                                    db.names[k].first.append(" restrict");
+                            }
+                            db.subs.back().push_back(db.names[k]);
+                        }
+                        first = t1;
+                    }
+                }
+              }
+                break;
+            default:
+              {
+                const char* t = parse_builtin_type(first, last, db);
+                if (t != first)
+                {
+                    first = t;
+                }
+                else
+                {
+                    switch (*first)
+                    {
+                    case 'A':
+                        t = parse_array_type(first, last, db);
+                        if (t != first)
+                        {
+                            first = t;
+                            db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                        }
+                        break;
+                    case 'C':
+                        t = parse_type(first+1, last, db);
+                        if (t != first+1)
+                        {
+                            db.names.back().first.append(" complex");
+                            first = t;
+                            db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                        }
+                        break;
+                    case 'F':
+                        t = parse_function_type(first, last, db);
+                        if (t != first)
+                        {
+                            first = t;
+                            db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                        }
+                        break;
+                    case 'G':
+                        t = parse_type(first+1, last, db);
+                        if (t != first+1)
+                        {
+                            db.names.back().first.append(" imaginary");
+                            first = t;
+                            db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                        }
+                        break;
+                    case 'M':
+                        t = parse_pointer_to_member_type(first, last, db);
+                        if (t != first)
+                        {
+                            first = t;
+                            db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                        }
+                        break;
+                    case 'O':
+                      {
+                        size_t k0 = db.names.size();
+                        t = parse_type(first+1, last, db);
+                        size_t k1 = db.names.size();
+                        if (t != first+1)
+                        {
+                            db.subs.emplace_back(db.names.get_allocator());
+                            for (size_t k = k0; k < k1; ++k)
+                            {
+                                if (db.names[k].second.substr(0, 2) == " [")
+                                {
+                                    db.names[k].first += " (";
+                                    db.names[k].second.insert(0, ")");
+                                }
+                                else if (db.names[k].second.front() == '(')
+                                {
+                                    db.names[k].first += "(";
+                                    db.names[k].second.insert(0, ")");
+                                }
+                                db.names[k].first.append("&&");
+                                db.subs.back().push_back(db.names[k]);
+                            }
+                            first = t;
+                        }
+                        break;
+                      }
+                    case 'P':
+                      {
+                        size_t k0 = db.names.size();
+                        t = parse_type(first+1, last, db);
+                        size_t k1 = db.names.size();
+                        if (t != first+1)
+                        {
+                            db.subs.emplace_back(db.names.get_allocator());
+                            for (size_t k = k0; k < k1; ++k)
+                            {
+                                if (db.names[k].second.substr(0, 2) == " [")
+                                {
+                                    db.names[k].first += " (";
+                                    db.names[k].second.insert(0, ")");
+                                }
+                                else if (db.names[k].second.front() == '(')
+                                {
+                                    db.names[k].first += "(";
+                                    db.names[k].second.insert(0, ")");
+                                }
+                                if (first[1] != 'U' || db.names[k].first.substr(0, 12) != "objc_object<")
+                                {
+                                    db.names[k].first.append("*");
+                                }
+                                else
+                                {
+                                    db.names[k].first.replace(0, 11, "id");
+                                }
+                                db.subs.back().push_back(db.names[k]);
+                            }
+                            first = t;
+                        }
+                        break;
+                      }
+                    case 'R':
+                      {
+                        size_t k0 = db.names.size();
+                        t = parse_type(first+1, last, db);
+                        size_t k1 = db.names.size();
+                        if (t != first+1)
+                        {
+                            db.subs.emplace_back(db.names.get_allocator());
+                            for (size_t k = k0; k < k1; ++k)
+                            {
+                                if (db.names[k].second.substr(0, 2) == " [")
+                                {
+                                    db.names[k].first += " (";
+                                    db.names[k].second.insert(0, ")");
+                                }
+                                else if (db.names[k].second.front() == '(')
+                                {
+                                    db.names[k].first += "(";
+                                    db.names[k].second.insert(0, ")");
+                                }
+                                db.names[k].first.append("&");
+                                db.subs.back().push_back(db.names[k]);
+                            }
+                            first = t;
+                        }
+                        break;
+                      }
+                    case 'T':
+                      {
+                        size_t k0 = db.names.size();
+                        t = parse_template_param(first, last, db);
+                        size_t k1 = db.names.size();
+                        if (t != first)
+                        {
+                            db.subs.emplace_back(db.names.get_allocator());
+                            for (size_t k = k0; k < k1; ++k)
+                                db.subs.back().push_back(db.names[k]);
+                            if (db.try_to_parse_template_args && k1 == k0+1)
+                            {
+                                const char* t1 = parse_template_args(t, last, db);
+                                if (t1 != t)
+                                {
+                                    auto args = db.names.back().move_full();
+                                    db.names.pop_back();
+                                    db.names.back().first += std::move(args);
+                                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                                    t = t1;
+                                }
+                            }
+                            first = t;
+                        }
+                        break;
+                      }
+                    case 'U':
+                        if (first+1 != last)
+                        {
+                            t = parse_source_name(first+1, last, db);
+                            if (t != first+1)
+                            {
+                                const char* t2 = parse_type(t, last, db);
+                                if (t2 != t)
+                                {
+                                    auto type = db.names.back().move_full();
+                                    db.names.pop_back();
+                                    if (db.names.back().first.substr(0, 9) != "objcproto")
+                                    {
+                                        db.names.back() = type + " " + db.names.back().move_full();
+                                    }
+                                    else
+                                    {
+                                        auto proto = db.names.back().move_full();
+                                        db.names.pop_back();
+                                        t = parse_source_name(proto.data() + 9, proto.data() + proto.size(), db);
+                                        if (t != proto.data() + 9)
+                                        {
+                                            db.names.back() = type + "<" + db.names.back().move_full() + ">";
+                                        }
+                                        else
+                                        {
+                                            db.names.push_back(type + " " + proto);
+                                        }
+                                    }
+                                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                                    first = t2;
+                                }
+                            }
+                        }
+                        break;
+                    case 'S':
+                        if (first+1 != last && first[1] == 't')
+                        {
+                            t = parse_name(first, last, db);
+                            if (t != first)
+                            {
+                                db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                                first = t;
+                            }
+                        }
+                        else
+                        {
+                            t = parse_substitution(first, last, db);
+                            if (t != first)
+                            {
+                                first = t;
+                                // Parsed a substitution.  If the substitution is a
+                                //  <template-param> it might be followed by <template-args>.
+                                t = parse_template_args(first, last, db);
+                                if (t != first)
+                                {
+                                    auto template_args = db.names.back().move_full();
+                                    db.names.pop_back();
+                                    db.names.back().first += template_args;
+                                    // Need to create substitution for <template-template-param> <template-args>
+                                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                                    first = t;
+                                }
+                            }
+                        }
+                        break;
+                    case 'D':
+                        if (first+1 != last)
+                        {
+                            switch (first[1])
+                            {
+                            case 'p':
+                              {
+                                size_t k0 = db.names.size();
+                                t = parse_type(first+2, last, db);
+                                size_t k1 = db.names.size();
+                                if (t != first+2)
+                                {
+                                    db.subs.emplace_back(db.names.get_allocator());
+                                    for (size_t k = k0; k < k1; ++k)
+                                        db.subs.back().push_back(db.names[k]);
+                                    first = t;
+                                    return first;
+                                }
+                                break;
+                              }
+                            case 't':
+                            case 'T':
+                                t = parse_decltype(first, last, db);
+                                if (t != first)
+                                {
+                                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                                    first = t;
+                                    return first;
+                                }
+                                break;
+                            case 'v':
+                                t = parse_vector_type(first, last, db);
+                                if (t != first)
+                                {
+                                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                                    first = t;
+                                    return first;
+                                }
+                                break;
+                            }
+                        }
+                        // drop through
+                    default:
+                        // must check for builtin-types before class-enum-types to avoid
+                        // ambiguities with operator-names
+                        t = parse_builtin_type(first, last, db);
+                        if (t != first)
+                        {
+                            first = t;
+                        }
+                        else
+                        {
+                            t = parse_name(first, last, db);
+                            if (t != first)
+                            {
+                                db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                                first = t;
+                            }
+                        }
+                        break;
+                    }
+              }
+                break;
+            }
+        }
+    }
+    return first;
+}
+
+//   <operator-name>
+//                   ::= aa    # &&            
+//                   ::= ad    # & (unary)     
+//                   ::= an    # &             
+//                   ::= aN    # &=            
+//                   ::= aS    # =             
+//                   ::= cl    # ()            
+//                   ::= cm    # ,             
+//                   ::= co    # ~             
+//                   ::= cv <type>    # (cast)        
+//                   ::= da    # delete[]      
+//                   ::= de    # * (unary)     
+//                   ::= dl    # delete        
+//                   ::= dv    # /             
+//                   ::= dV    # /=            
+//                   ::= eo    # ^             
+//                   ::= eO    # ^=            
+//                   ::= eq    # ==            
+//                   ::= ge    # >=            
+//                   ::= gt    # >             
+//                   ::= ix    # []            
+//                   ::= le    # <=            
+//                   ::= ls    # <<            
+//                   ::= lS    # <<=           
+//                   ::= lt    # <             
+//                   ::= mi    # -             
+//                   ::= mI    # -=            
+//                   ::= ml    # *             
+//                   ::= mL    # *=            
+//                   ::= mm    # -- (postfix in <expression> context)           
+//                   ::= na    # new[]
+//                   ::= ne    # !=            
+//                   ::= ng    # - (unary)     
+//                   ::= nt    # !             
+//                   ::= nw    # new           
+//                   ::= oo    # ||            
+//                   ::= or    # |             
+//                   ::= oR    # |=            
+//                   ::= pm    # ->*           
+//                   ::= pl    # +             
+//                   ::= pL    # +=            
+//                   ::= pp    # ++ (postfix in <expression> context)
+//                   ::= ps    # + (unary)
+//                   ::= pt    # ->            
+//                   ::= qu    # ?             
+//                   ::= rm    # %             
+//                   ::= rM    # %=            
+//                   ::= rs    # >>            
+//                   ::= rS    # >>=           
+//                   ::= v <digit> <source-name>        # vendor extended operator
+
+template <class C>
+const char*
+parse_operator_name(const char* first, const char* last, C& db)
+{
+    if (last - first >= 2)
+    {
+        switch (first[0])
+        {
+        case 'a':
+            switch (first[1])
+            {
+            case 'a':
+                db.names.push_back("operator&&");
+                first += 2;
+                break;
+            case 'd':
+            case 'n':
+                db.names.push_back("operator&");
+                first += 2;
+                break;
+            case 'N':
+                db.names.push_back("operator&=");
+                first += 2;
+                break;
+            case 'S':
+                db.names.push_back("operator=");
+                first += 2;
+                break;
+            }
+            break;
+        case 'c':
+            switch (first[1])
+            {
+            case 'l':
+                db.names.push_back("operator()");
+                first += 2;
+                break;
+            case 'm':
+                db.names.push_back("operator,");
+                first += 2;
+                break;
+            case 'o':
+                db.names.push_back("operator~");
+                first += 2;
+                break;
+            case 'v':
+                {
+                    bool try_to_parse_template_args = db.try_to_parse_template_args;
+                    db.try_to_parse_template_args = false;
+                    const char* t = parse_type(first+2, last, db);
+                    db.try_to_parse_template_args = try_to_parse_template_args;
+                    if (t != first+2)
+                    {
+                        db.names.back().first.insert(0, "operator ");
+                        db.parsed_ctor_dtor_cv = true;
+                        first = t;
+                    }
+                }
+                break;
+            }
+            break;
+        case 'd':
+            switch (first[1])
+            {
+            case 'a':
+                db.names.push_back("operator delete[]");
+                first += 2;
+                break;
+            case 'e':
+                db.names.push_back("operator*");
+                first += 2;
+                break;
+            case 'l':
+                db.names.push_back("operator delete");
+                first += 2;
+                break;
+            case 'v':
+                db.names.push_back("operator/");
+                first += 2;
+                break;
+            case 'V':
+                db.names.push_back("operator/=");
+                first += 2;
+                break;
+            }
+            break;
+        case 'e':
+            switch (first[1])
+            {
+            case 'o':
+                db.names.push_back("operator^");
+                first += 2;
+                break;
+            case 'O':
+                db.names.push_back("operator^=");
+                first += 2;
+                break;
+            case 'q':
+                db.names.push_back("operator==");
+                first += 2;
+                break;
+            }
+            break;
+        case 'g':
+            switch (first[1])
+            {
+            case 'e':
+                db.names.push_back("operator>=");
+                first += 2;
+                break;
+            case 't':
+                db.names.push_back("operator>");
+                first += 2;
+                break;
+            }
+            break;
+        case 'i':
+            if (first[1] == 'x')
+            {
+                db.names.push_back("operator[]");
+                first += 2;
+            }
+            break;
+        case 'l':
+            switch (first[1])
+            {
+            case 'e':
+                db.names.push_back("operator<=");
+                first += 2;
+                break;
+            case 's':
+                db.names.push_back("operator<<");
+                first += 2;
+                break;
+            case 'S':
+                db.names.push_back("operator<<=");
+                first += 2;
+                break;
+            case 't':
+                db.names.push_back("operator<");
+                first += 2;
+                break;
+            }
+            break;
+        case 'm':
+            switch (first[1])
+            {
+            case 'i':
+                db.names.push_back("operator-");
+                first += 2;
+                break;
+            case 'I':
+                db.names.push_back("operator-=");
+                first += 2;
+                break;
+            case 'l':
+                db.names.push_back("operator*");
+                first += 2;
+                break;
+            case 'L':
+                db.names.push_back("operator*=");
+                first += 2;
+                break;
+            case 'm':
+                db.names.push_back("operator--");
+                first += 2;
+                break;
+            }
+            break;
+        case 'n':
+            switch (first[1])
+            {
+            case 'a':
+                db.names.push_back("operator new[]");
+                first += 2;
+                break;
+            case 'e':
+                db.names.push_back("operator!=");
+                first += 2;
+                break;
+            case 'g':
+                db.names.push_back("operator-");
+                first += 2;
+                break;
+            case 't':
+                db.names.push_back("operator!");
+                first += 2;
+                break;
+            case 'w':
+                db.names.push_back("operator new");
+                first += 2;
+                break;
+            }
+            break;
+        case 'o':
+            switch (first[1])
+            {
+            case 'o':
+                db.names.push_back("operator||");
+                first += 2;
+                break;
+            case 'r':
+                db.names.push_back("operator|");
+                first += 2;
+                break;
+            case 'R':
+                db.names.push_back("operator|=");
+                first += 2;
+                break;
+            }
+            break;
+        case 'p':
+            switch (first[1])
+            {
+            case 'm':
+                db.names.push_back("operator->*");
+                first += 2;
+                break;
+            case 'l':
+                db.names.push_back("operator+");
+                first += 2;
+                break;
+            case 'L':
+                db.names.push_back("operator+=");
+                first += 2;
+                break;
+            case 'p':
+                db.names.push_back("operator++");
+                first += 2;
+                break;
+            case 's':
+                db.names.push_back("operator+");
+                first += 2;
+                break;
+            case 't':
+                db.names.push_back("operator->");
+                first += 2;
+                break;
+            }
+            break;
+        case 'q':
+            if (first[1] == 'u')
+            {
+                db.names.push_back("operator?");
+                first += 2;
+            }
+            break;
+        case 'r':
+            switch (first[1])
+            {
+            case 'm':
+                db.names.push_back("operator%");
+                first += 2;
+                break;
+            case 'M':
+                db.names.push_back("operator%=");
+                first += 2;
+                break;
+            case 's':
+                db.names.push_back("operator>>");
+                first += 2;
+                break;
+            case 'S':
+                db.names.push_back("operator>>=");
+                first += 2;
+                break;
+            }
+            break;
+        case 'v':
+            if (std::isdigit(first[1]))
+            {
+                const char* t = parse_source_name(first+2, last, db);
+                if (t != first+2)
+                {
+                    db.names.back().first.insert(0, "operator ");
+                    first = t;
+                }
+            }
+            break;
+        }
+    }
+    return first;
+}
+
+template <class C>
+const char*
+parse_integer_literal(const char* first, const char* last, const typename C::String& lit, C& db)
+{
+    const char* t = parse_number(first, last);
+    if (t != first && t != last && *t == 'E')
+    {
+        if (lit.size() > 3)
+            db.names.push_back("(" + lit + ")");
+        else
+            db.names.emplace_back();
+        if (*first == 'n')
+        {
+            db.names.back().first += '-';
+            ++first;
+        }
+        db.names.back().first.append(first, t);
+        if (lit.size() <= 3)
+            db.names.back().first += lit;
+        first = t+1;
+    }
+    return first;
+}
+
+// <expr-primary> ::= L <type> <value number> E                          # integer literal
+//                ::= L <type> <value float> E                           # floating literal
+//                ::= L <string type> E                                  # string literal
+//                ::= L <nullptr type> E                                 # nullptr literal (i.e., "LDnE")
+//                ::= L <type> <real-part float> _ <imag-part float> E   # complex floating point literal (C 2000)
+//                ::= L <mangled-name> E                                 # external name
+
+template <class C>
+const char*
+parse_expr_primary(const char* first, const char* last, C& db)
+{
+    if (last - first >= 4 && *first == 'L')
+    {
+        switch (first[1])
+        {
+        case 'w':
+            {
+            const char* t = parse_integer_literal(first+2, last, "wchar_t", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'b':
+            if (first[3] == 'E')
+            {
+                switch (first[2])
+                {
+                case '0':
+                    db.names.push_back("false");
+                    first += 4;
+                    break;
+                case '1':
+                    db.names.push_back("true");
+                    first += 4;
+                    break;
+                }
+            }
+            break;
+        case 'c':
+            {
+            const char* t = parse_integer_literal(first+2, last, "char", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'a':
+            {
+            const char* t = parse_integer_literal(first+2, last, "signed char", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'h':
+            {
+            const char* t = parse_integer_literal(first+2, last, "unsigned char", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 's':
+            {
+            const char* t = parse_integer_literal(first+2, last, "short", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 't':
+            {
+            const char* t = parse_integer_literal(first+2, last, "unsigned short", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'i':
+            {
+            const char* t = parse_integer_literal(first+2, last, "", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'j':
+            {
+            const char* t = parse_integer_literal(first+2, last, "u", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'l':
+            {
+            const char* t = parse_integer_literal(first+2, last, "l", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'm':
+            {
+            const char* t = parse_integer_literal(first+2, last, "ul", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'x':
+            {
+            const char* t = parse_integer_literal(first+2, last, "ll", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'y':
+            {
+            const char* t = parse_integer_literal(first+2, last, "ull", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'n':
+            {
+            const char* t = parse_integer_literal(first+2, last, "__int128", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'o':
+            {
+            const char* t = parse_integer_literal(first+2, last, "unsigned __int128", db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'f':
+            {
+            const char* t = parse_floating_number<float>(first+2, last, db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case 'd':
+            {
+            const char* t = parse_floating_number<double>(first+2, last, db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+         case 'e':
+            {
+            const char* t = parse_floating_number<long double>(first+2, last, db);
+            if (t != first+2)
+                first = t;
+            }
+            break;
+        case '_':
+            if (first[2] == 'Z')
+            {
+                const char* t = parse_encoding(first+3, last, db);
+                if (t != first+3 && t != last && *t == 'E')
+                    first = t+1;
+            }
+            break;
+        case 'T':
+            // Invalid mangled name per
+            //   http://sourcerytools.com/pipermail/cxx-abi-dev/2011-August/002422.html
+            break;
+        default:
+            {
+                // might be named type
+                const char* t = parse_type(first+1, last, db);
+                if (t != first+1 && t != last)
+                {
+                    if (*t != 'E')
+                    {
+                        const char* n = t;
+                        for (; n != last && isdigit(*n); ++n)
+                            ;
+                        if (n != t && n != last && *n == 'E')
+                        {
+                            db.names.back() = "(" + db.names.back().move_full() + ")" + typename C::String(t, n);
+                            first = n+1;
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        first = t+1;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    return first;
+}
+
+template <class String>
+String
+base_name(String& s)
+{
+    if (s.empty())
+        return s;
+    if (s == "std::string")
+    {
+        s = "std::basic_string<char, std::char_traits<char>, std::allocator<char> >";
+        return "basic_string";
+    }
+    if (s == "std::istream")
+    {
+        s = "std::basic_istream<char, std::char_traits<char> >";
+        return "basic_istream";
+    }
+    if (s == "std::ostream")
+    {
+        s = "std::basic_ostream<char, std::char_traits<char> >";
+        return "basic_ostream";
+    }
+    if (s == "std::iostream")
+    {
+        s = "std::basic_iostream<char, std::char_traits<char> >";
+        return "basic_iostream";
+    }
+    const char* const pf = s.data();
+    const char* pe = pf + s.size();
+    if (pe[-1] == '>')
+    {
+        unsigned c = 1;
+        while (true)
+        {
+            if (--pe == pf)
+                return String();
+            if (pe[-1] == '<')
+            {
+                if (--c == 0)
+                {
+                    --pe;
+                    break;
+                }
+            }
+            else if (pe[-1] == '>')
+                ++c;
+        }
+    }
+    const char* p0 = pe - 1;
+    for (; p0 != pf; --p0)
+    {
+        if (*p0 == ':')
+        {
+            ++p0;
+            break;
+        }
+    }
+    return String(p0, pe);
+}
+
+// <ctor-dtor-name> ::= C1    # complete object constructor
+//                  ::= C2    # base object constructor
+//                  ::= C3    # complete object allocating constructor
+//   extension      ::= C5    # ?
+//                  ::= D0    # deleting destructor
+//                  ::= D1    # complete object destructor
+//                  ::= D2    # base object destructor
+//   extension      ::= D5    # ?
+
+template <class C>
+const char*
+parse_ctor_dtor_name(const char* first, const char* last, C& db)
+{
+    if (last-first >= 2 && !db.names.empty())
+    {
+        switch (first[0])
+        {
+        case 'C':
+            switch (first[1])
+            {
+            case '1':
+            case '2':
+            case '3':
+            case '5':
+                db.names.push_back(base_name(db.names.back().first));
+                first += 2;
+                db.parsed_ctor_dtor_cv = true;
+                break;
+            }
+            break;
+        case 'D':
+            switch (first[1])
+            {
+            case '0':
+            case '1':
+            case '2':
+            case '5':
+                db.names.push_back("~" + base_name(db.names.back().first));
+                first += 2;
+                db.parsed_ctor_dtor_cv = true;
+                break;
+            }
+            break;
+        }
+    }
+    return first;
+}
+
+// <unnamed-type-name> ::= Ut [ <nonnegative number> ] _
+//                     ::= <closure-type-name>
+// 
+// <closure-type-name> ::= Ul <lambda-sig> E [ <nonnegative number> ] _ 
+// 
+// <lambda-sig> ::= <parameter type>+  # Parameter types or "v" if the lambda has no parameters
+
+template <class C>
+const char*
+parse_unnamed_type_name(const char* first, const char* last, C& db)
+{
+    if (last - first > 2 && first[0] == 'U')
+    {
+        char type = first[1];
+        switch (type)
+        {
+        case 't':
+          {
+            db.names.push_back(typename C::String("'unnamed"));
+            const char* t0 = first+2;
+            if (t0 == last)
+            {
+                db.names.pop_back();
+                return first;
+            }
+            if (std::isdigit(*t0))
+            {
+                const char* t1 = t0 + 1;
+                while (t1 != last && std::isdigit(*t1))
+                    ++t1;
+                db.names.back().first.append(t0, t1);
+                t0 = t1;
+            }
+            db.names.back().first.push_back('\'');
+            if (t0 == last || *t0 != '_')
+            {
+                db.names.pop_back();
+                return first;
+            }
+            first = t0 + 1;
+          }
+            break;
+        case 'l':
+          {
+            db.names.push_back(typename C::String("'lambda'("));
+            const char* t0 = first+2;
+            if (first[2] == 'v')
+            {
+                db.names.back().first += ')';
+                ++t0;
+            }
+            else
+            {
+                const char* t1 = parse_type(t0, last, db);
+                if (t1 == t0)
+                {
+                    db.names.pop_back();
+                    return first;
+                }
+                auto tmp = db.names.back().move_full();
+                db.names.pop_back();
+                db.names.back().first.append(tmp);
+                t0 = t1;
+                while (true)
+                {
+                    t1 = parse_type(t0, last, db);
+                    if (t1 == t0)
+                        break;
+                    tmp = db.names.back().move_full();
+                    db.names.pop_back();
+                    if (!tmp.empty())
+                    {
+                        db.names.back().first.append(", ");
+                        db.names.back().first.append(tmp);
+                    }
+                    t0 = t1;
+                }
+                db.names.back().first.append(")");
+            }
+            if (t0 == last || *t0 != 'E')
+            {
+                db.names.pop_back();
+                return first;
+            }
+            ++t0;
+            if (t0 == last)
+            {
+                db.names.pop_back();
+                return first;
+            }
+            if (std::isdigit(*t0))
+            {
+                const char* t1 = t0 + 1;
+                while (t1 != last && std::isdigit(*t1))
+                    ++t1;
+                db.names.back().first.insert(db.names.back().first.begin()+7, t0, t1);
+                t0 = t1;
+            }
+            if (t0 == last || *t0 != '_')
+            {
+                db.names.pop_back();
+                return first;
+            }
+            first = t0 + 1;
+          }
+            break;
+        }
+    }
+    return first;
+}
+
+// <unqualified-name> ::= <operator-name>
+//                    ::= <ctor-dtor-name>
+//                    ::= <source-name>   
+//                    ::= <unnamed-type-name>
+
+template <class C>
+const char*
+parse_unqualified_name(const char* first, const char* last, C& db)
+{
+    if (first != last)
+    {
+        const char* t;
+        switch (*first)
+        {
+        case 'C':
+        case 'D':
+            t = parse_ctor_dtor_name(first, last, db);
+            if (t != first)
+                first = t;
+            break;
+        case 'U':
+            t = parse_unnamed_type_name(first, last, db);
+            if (t != first)
+                first = t;
+            break;
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+            t = parse_source_name(first, last, db);
+            if (t != first)
+                first = t;
+            break;
+        default:
+            t = parse_operator_name(first, last, db);
+            if (t != first)
+                first = t;
+            break;
+        };
+    }
+    return first;
+}
+
+// <unscoped-name> ::= <unqualified-name>
+//                 ::= St <unqualified-name>   # ::std::
+// extension       ::= StL<unqualified-name>
+
+template <class C>
+const char*
+parse_unscoped_name(const char* first, const char* last, C& db)
+{
+    if (last - first >= 2)
+    {
+        const char* t0 = first;
+        bool St = false;
+        if (first[0] == 'S' && first[1] == 't')
+        {
+            t0 += 2;
+            St = true;
+            if (t0 != last && *t0 == 'L')
+                ++t0;
+        }
+        const char* t1 = parse_unqualified_name(t0, last, db);
+        if (t1 != t0)
+        {
+            if (St)
+                db.names.back().first.insert(0, "std::");
+            first = t1;
+        }
+    }
+    return first;
+}
+
+// at <type>                                            # alignof (a type)
+
+template <class C>
+const char*
+parse_alignof_type(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 'a' && first[1] == 't')
+    {
+        const char* t = parse_type(first+2, last, db);
+        if (t != first+2)
+        {
+            db.names.back().first = "alignof (" + db.names.back().move_full() + ")";
+            first = t;
+        }
+    }
+    return first;
+}
+
+// az <expression>                                            # alignof (a expression)
+
+template <class C>
+const char*
+parse_alignof_expr(const char* first, const char* last, C& db)
+{
+    if (last - first >= 3 && first[0] == 'a' && first[1] == 'z')
+    {
+        const char* t = parse_expression(first+2, last, db);
+        if (t != first+2)
+        {
+            db.names.back().first = "alignof (" + db.names.back().move_full() + ")";
+            first = t;
+        }
+    }
+    return first;
+}
+
+template <class C>
+const char*
+parse_noexcept_expression(const char* first, const char* last, C& db)
+{
+    const char* t1 = parse_expression(first, last, db);
+    if (t1 != first)
+    {
+        db.names.back().first =  "noexcept (" + db.names.back().move_full() + ")";
+        first = t1;
+    }
+    return first;
+}
+
+template <class C>
+const char*
+parse_prefix_expression(const char* first, const char* last, const typename C::String& op, C& db)
+{
+    const char* t1 = parse_expression(first, last, db);
+    if (t1 != first)
+    {
+        db.names.back().first =  op + "(" + db.names.back().move_full() + ")";
+        first = t1;
+    }
+    return first;
+}
+
+template <class C>
+const char*
+parse_binary_expression(const char* first, const char* last, const typename C::String& op, C& db)
+{
+    const char* t1 = parse_expression(first, last, db);
+    if (t1 != first)
+    {
+        const char* t2 = parse_expression(t1, last, db);
+        if (t2 != t1)
+        {
+            auto op2 = db.names.back().move_full();
+            db.names.pop_back();
+            auto op1 = db.names.back().move_full();
+            auto& nm = db.names.back().first;
+            nm.clear();
+            if (op == ">")
+                nm += '(';
+            nm += "(" + op1 + ") " + op + " (" + op2 + ")";
+            if (op == ">")
+                nm += ')';
+            first = t2;
+        }
+        else
+            db.names.pop_back();
+    }
+    return first;
+}
+
+// <expression> ::= <unary operator-name> <expression>
+//              ::= <binary operator-name> <expression> <expression>
+//              ::= <ternary operator-name> <expression> <expression> <expression>
+//              ::= cl <expression>+ E                                   # call
+//              ::= cv <type> <expression>                               # conversion with one argument
+//              ::= cv <type> _ <expression>* E                          # conversion with a different number of arguments
+//              ::= [gs] nw <expression>* _ <type> E                     # new (expr-list) type
+//              ::= [gs] nw <expression>* _ <type> <initializer>         # new (expr-list) type (init)
+//              ::= [gs] na <expression>* _ <type> E                     # new[] (expr-list) type
+//              ::= [gs] na <expression>* _ <type> <initializer>         # new[] (expr-list) type (init)
+//              ::= [gs] dl <expression>                                 # delete expression
+//              ::= [gs] da <expression>                                 # delete[] expression
+//              ::= pp_ <expression>                                     # prefix ++
+//              ::= mm_ <expression>                                     # prefix --
+//              ::= ti <type>                                            # typeid (type)
+//              ::= te <expression>                                      # typeid (expression)
+//              ::= dc <type> <expression>                               # dynamic_cast<type> (expression)
+//              ::= sc <type> <expression>                               # static_cast<type> (expression)
+//              ::= cc <type> <expression>                               # const_cast<type> (expression)
+//              ::= rc <type> <expression>                               # reinterpret_cast<type> (expression)
+//              ::= st <type>                                            # sizeof (a type)
+//              ::= sz <expression>                                      # sizeof (an expression)
+//              ::= at <type>                                            # alignof (a type)
+//              ::= az <expression>                                      # alignof (an expression)
+//              ::= nx <expression>                                      # noexcept (expression)
+//              ::= <template-param>
+//              ::= <function-param>
+//              ::= dt <expression> <unresolved-name>                    # expr.name
+//              ::= pt <expression> <unresolved-name>                    # expr->name
+//              ::= ds <expression> <expression>                         # expr.*expr
+//              ::= sZ <template-param>                                  # size of a parameter pack
+//              ::= sZ <function-param>                                  # size of a function parameter pack
+//              ::= sp <expression>                                      # pack expansion
+//              ::= tw <expression>                                      # throw expression
+//              ::= tr                                                   # throw with no operand (rethrow)
+//              ::= <unresolved-name>                                    # f(p), N::f(p), ::f(p),
+//                                                                       # freestanding dependent name (e.g., T::x),
+//                                                                       # objectless nonstatic member reference
+//              ::= <expr-primary>
+
+template <class C>
+const char*
+parse_expression(const char* first, const char* last, C& db)
+{
+    if (last - first >= 2)
+    {
+        const char* t = first;
+        bool parsed_gs = false;
+        if (last - first >= 4 && t[0] == 'g' && t[1] == 's')
+        {
+            t += 2;
+            parsed_gs = true;
+        }
+        switch (*t)
+        {
+        case 'L':
+            first = parse_expr_primary(first, last, db);
+            break;
+        case 'T':
+            first = parse_template_param(first, last, db);
+            break;
+        case 'f':
+            first = parse_function_param(first, last, db);
+            break;
+        case 'a':
+            switch (t[1])
+            {
+            case 'a':
+                t = parse_binary_expression(first+2, last, "&&", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'd':
+                t = parse_prefix_expression(first+2, last, "&", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'n':
+                t = parse_binary_expression(first+2, last, "&", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'N':
+                t = parse_binary_expression(first+2, last, "&=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'S':
+                t = parse_binary_expression(first+2, last, "=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 't':
+                first = parse_alignof_type(first, last, db);
+                break;
+            case 'z':
+                first = parse_alignof_expr(first, last, db);
+                break;
+            }
+            break;
+        case 'c':
+            switch (t[1])
+            {
+            case 'c':
+                first = parse_const_cast_expr(first, last, db);
+                break;
+            case 'l':
+                first = parse_call_expr(first, last, db);
+                break;
+            case 'm':
+                t = parse_binary_expression(first+2, last, ",", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'o':
+                t = parse_prefix_expression(first+2, last, "~", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'v':
+                first = parse_conversion_expr(first, last, db);
+                break;
+            }
+            break;
+        case 'd':
+            switch (t[1])
+            {
+            case 'a':
+                {
+                    const char* t1 = parse_expression(t+2, last, db);
+                    if (t1 != t+2)
+                    {
+                        db.names.back().first = (parsed_gs ? typename C::String("::") : typename C::String()) +
+                                          "delete[] " + db.names.back().move_full();
+                        first = t1;
+                    }
+                }
+                break;
+            case 'c':
+                first = parse_dynamic_cast_expr(first, last, db);
+                break;
+            case 'e':
+                t = parse_prefix_expression(first+2, last, "*", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'l':
+                {
+                    const char* t1 = parse_expression(t+2, last, db);
+                    if (t1 != t+2)
+                    {
+                        db.names.back().first = (parsed_gs ? typename C::String("::") : typename C::String()) +
+                                          "delete " + db.names.back().move_full();
+                        first = t1;
+                    }
+                }
+                break;
+            case 'n':
+                return parse_unresolved_name(first, last, db);
+            case 's':
+                first = parse_dot_star_expr(first, last, db);
+                break;
+            case 't':
+                first = parse_dot_expr(first, last, db);
+                break;
+            case 'v':
+                t = parse_binary_expression(first+2, last, "/", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'V':
+                t = parse_binary_expression(first+2, last, "/=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            }
+            break;
+        case 'e':
+            switch (t[1])
+            {
+            case 'o':
+                t = parse_binary_expression(first+2, last, "^", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'O':
+                t = parse_binary_expression(first+2, last, "^=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'q':
+                t = parse_binary_expression(first+2, last, "==", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            }
+            break;
+        case 'g':
+            switch (t[1])
+            {
+            case 'e':
+                t = parse_binary_expression(first+2, last, ">=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 't':
+                t = parse_binary_expression(first+2, last, ">", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            }
+            break;
+        case 'i':
+            if (t[1] == 'x')
+            {
+                const char* t1 = parse_expression(first+2, last, db);
+                if (t1 != first+2)
+                {
+                    const char* t2 = parse_expression(t1, last, db);
+                    if (t2 != t1)
+                    {
+                        auto op2 = db.names.back().move_full();
+                        db.names.pop_back();
+                        auto op1 = db.names.back().move_full();
+                        db.names.back() = "(" + op1 + ")[" + op2 + "]";
+                        first = t2;
+                    }
+                    else
+                        db.names.pop_back();
+                }
+            }
+            break;
+        case 'l':
+            switch (t[1])
+            {
+            case 'e':
+                t = parse_binary_expression(first+2, last, "<=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 's':
+                t = parse_binary_expression(first+2, last, "<<", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'S':
+                t = parse_binary_expression(first+2, last, "<<=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 't':
+                t = parse_binary_expression(first+2, last, "<", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            }
+            break;
+        case 'm':
+            switch (t[1])
+            {
+            case 'i':
+                t = parse_binary_expression(first+2, last, "-", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'I':
+                t = parse_binary_expression(first+2, last, "-=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'l':
+                t = parse_binary_expression(first+2, last, "*", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'L':
+                t = parse_binary_expression(first+2, last, "*=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'm':
+                if (first+2 != last && first[2] == '_')
+                {
+                    t = parse_prefix_expression(first+3, last, "--", db);
+                    if (t != first+3)
+                        first = t;
+                }
+                else
+                {
+                    const char* t1 = parse_expression(first+2, last, db);
+                    if (t1 != first+2)
+                    {
+                        db.names.back() = "(" + db.names.back().move_full() + ")--";
+                        first = t1;
+                    }
+                }
+                break;
+            }
+            break;
+        case 'n':
+            switch (t[1])
+            {
+            case 'a':
+            case 'w':
+                first = parse_new_expr(first, last, db);
+                break;
+            case 'e':
+                t = parse_binary_expression(first+2, last, "!=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'g':
+                t = parse_prefix_expression(first+2, last, "-", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 't':
+                t = parse_prefix_expression(first+2, last, "!", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'x':
+                t = parse_noexcept_expression(first+2, last, db);
+                if (t != first+2)
+                    first = t;
+                break;
+            }
+            break;
+        case 'o':
+            switch (t[1])
+            {
+            case 'n':
+                return parse_unresolved_name(first, last, db);
+            case 'o':
+                t = parse_binary_expression(first+2, last, "||", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'r':
+                t = parse_binary_expression(first+2, last, "|", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'R':
+                t = parse_binary_expression(first+2, last, "|=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            }
+            break;
+        case 'p':
+            switch (t[1])
+            {
+            case 'm':
+                t = parse_binary_expression(first+2, last, "->*", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'l':
+                t = parse_binary_expression(first+2, last, "+", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'L':
+                t = parse_binary_expression(first+2, last, "+=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'p':
+                if (first+2 != last && first[2] == '_')
+                {
+                    t = parse_prefix_expression(first+3, last, "++", db);
+                    if (t != first+3)
+                        first = t;
+                }
+                else
+                {
+                    const char* t1 = parse_expression(first+2, last, db);
+                    if (t1 != first+2)
+                    {
+                        db.names.back() = "(" + db.names.back().move_full() + ")++";
+                        first = t1;
+                    }
+                }
+                break;
+            case 's':
+                t = parse_prefix_expression(first+2, last, "+", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 't':
+                first = parse_arrow_expr(first, last, db);
+                break;
+            }
+            break;
+        case 'q':
+            if (t[1] == 'u')
+            {
+                const char* t1 = parse_expression(first+2, last, db);
+                if (t1 != first+2)
+                {
+                    const char* t2 = parse_expression(t1, last, db);
+                    if (t2 != t1)
+                    {
+                        const char* t3 = parse_expression(t2, last, db);
+                        if (t3 != t2)
+                        {
+                            auto op3 = db.names.back().move_full();
+                            db.names.pop_back();
+                            auto op2 = db.names.back().move_full();
+                            db.names.pop_back();
+                            auto op1 = db.names.back().move_full();
+                            db.names.back() = "(" + op1 + ") ? (" + op2 + ") : (" + op3 + ")";
+                            first = t3;
+                        }
+                        else
+                        {
+                            db.names.pop_back();
+                            db.names.pop_back();
+                        }
+                    }
+                    else
+                        db.names.pop_back();
+                }
+            }
+            break;
+        case 'r':
+            switch (t[1])
+            {
+            case 'c':
+                first = parse_reinterpret_cast_expr(first, last, db);
+                break;
+            case 'm':
+                t = parse_binary_expression(first+2, last, "%", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'M':
+                t = parse_binary_expression(first+2, last, "%=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 's':
+                t = parse_binary_expression(first+2, last, ">>", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            case 'S':
+                t = parse_binary_expression(first+2, last, ">>=", db);
+                if (t != first+2)
+                    first = t;
+                break;
+            }
+            break;
+        case 's':
+            switch (t[1])
+            {
+            case 'c':
+                first = parse_static_cast_expr(first, last, db);
+                break;
+            case 'p':
+                first = parse_pack_expansion(first, last, db);
+                break;
+            case 'r':
+                return parse_unresolved_name(first, last, db);
+            case 't':
+                first = parse_sizeof_type_expr(first, last, db);
+                break;
+            case 'z':
+                first = parse_sizeof_expr_expr(first, last, db);
+                break;
+            case 'Z':
+                if (last - t >= 3)
+                {
+                    switch (t[2])
+                    {
+                    case 'T':
+                        first = parse_sizeof_param_pack_expr(first, last, db);
+                        break;
+                    case 'f':
+                        first = parse_sizeof_function_param_pack_expr(first, last, db);
+                        break;
+                    }
+                }
+                break;
+            }
+            break;
+        case 't':
+            switch (t[1])
+            {
+            case 'e':
+            case 'i':
+                first = parse_typeid_expr(first, last, db);
+                break;
+            case 'r':
+                db.names.push_back("throw");
+                first += 2;
+                break;
+            case 'w':
+                first = parse_throw_expr(first, last, db);
+                break;
+            }
+            break;
+        case '1':
+        case '2':
+        case '3':
+        case '4':
+        case '5':
+        case '6':
+        case '7':
+        case '8':
+        case '9':
+            return parse_unresolved_name(first, last, db);
+        }
+    }
+    return first;
+}
+
+// <template-arg> ::= <type>                                             # type or template
+//                ::= X <expression> E                                   # expression
+//                ::= <expr-primary>                                     # simple expressions
+//                ::= J <template-arg>* E                                # argument pack
+//                ::= LZ <encoding> E                                    # extension
+
+template <class C>
+const char*
+parse_template_arg(const char* first, const char* last, C& db)
+{
+    if (first != last)
+    {
+        const char* t;
+        switch (*first)
+        {
+        case 'X':
+            t = parse_expression(first+1, last, db);
+            if (t != first+1)
+            {
+                if (t != last && *t == 'E')
+                    first = t+1;
+            }
+            break;
+        case 'J':
+            t = first+1;
+            if (t == last)
+                return first;
+            while (*t != 'E')
+            {
+                const char* t1 = parse_template_arg(t, last, db);
+                if (t1 == t)
+                    return first;
+                t = t1;
+            }
+            first = t+1;
+            break;
+        case 'L':
+            // <expr-primary> or LZ <encoding> E
+            if (first+1 != last && first[1] == 'Z')
+            {
+                t = parse_encoding(first+2, last, db);
+                if (t != first+2 && t != last && *t == 'E')
+                    first = t+1;
+            }
+            else
+                first = parse_expr_primary(first, last, db);
+            break;
+        default:
+            // <type>
+            first = parse_type(first, last, db);
+            break;
+        }
+    }
+    return first;
+}
+
+// <template-args> ::= I <template-arg>* E
+//     extension, the abi says <template-arg>+
+
+template <class C>
+const char*
+parse_template_args(const char* first, const char* last, C& db)
+{
+    if (last - first >= 2 && *first == 'I')
+    {
+        if (db.tag_templates)
+            db.template_param.back().clear();
+        const char* t = first+1;
+        typename C::String args("<");
+        while (*t != 'E')
+        {
+            if (db.tag_templates)
+                db.template_param.emplace_back(db.names.get_allocator());
+            size_t k0 = db.names.size();
+            const char* t1 = parse_template_arg(t, last, db);
+            size_t k1 = db.names.size();
+            if (db.tag_templates)
+                db.template_param.pop_back();
+            if (t1 == t || t1 == last)
+                return first;
+            if (db.tag_templates)
+            {
+                db.template_param.back().emplace_back(db.names.get_allocator());
+                for (size_t k = k0; k < k1; ++k)
+                    db.template_param.back().back().push_back(db.names[k]);
+            }
+            for (size_t k = k0; k < k1; ++k)
+            {
+                if (args.size() > 1)
+                    args += ", ";
+                args += db.names[k].move_full();
+            }
+            for (; k1 != k0; --k1)
+                db.names.pop_back();
+            t = t1;
+        }
+        first = t + 1;
+        if (args.back() != '>')
+            args += ">";
+        else
+            args += " >";
+        db.names.push_back(std::move(args));
+        
+    }
+    return first;
+}
+
+// <nested-name> ::= N [<CV-qualifiers>] [<ref-qualifier>] <prefix> <unqualified-name> E
+//               ::= N [<CV-qualifiers>] [<ref-qualifier>] <template-prefix> <template-args> E
+// 
+// <prefix> ::= <prefix> <unqualified-name>
+//          ::= <template-prefix> <template-args>
+//          ::= <template-param>
+//          ::= <decltype>
+//          ::= # empty
+//          ::= <substitution>
+//          ::= <prefix> <data-member-prefix>
+//  extension ::= L
+// 
+// <template-prefix> ::= <prefix> <template unqualified-name>
+//                   ::= <template-param>
+//                   ::= <substitution>
+
+template <class C>
+const char*
+parse_nested_name(const char* first, const char* last, C& db)
+{
+    if (first != last && *first == 'N')
+    {
+        unsigned cv;
+        const char* t0 = parse_cv_qualifiers(first+1, last, cv);
+        if (t0 == last)
+            return first;
+        db.ref = 0;
+        if (*t0 == 'R')
+        {
+            db.ref = 1;
+            ++t0;
+        }
+        else if (*t0 == 'O')
+        {
+            db.ref = 2;
+            ++t0;
+        }
+        db.names.emplace_back();
+        if (last - t0 >= 2 && t0[0] == 'S' && t0[1] == 't')
+        {
+            t0 += 2;
+            db.names.back().first = "std";
+        }
+        if (t0 == last)
+        {
+            db.names.pop_back();
+            return first;
+        }
+        bool pop_subs = false;
+        while (*t0 != 'E')
+        {
+            const char* t1;
+            switch (*t0)
+            {
+            case 'S':
+                if (t0 + 1 != last && t0[1] == 't')
+                    goto do_parse_unqualified_name;
+                t1 = parse_substitution(t0, last, db);
+                if (t1 != t0 && t1 != last)
+                {
+                    auto name = db.names.back().move_full();
+                    db.names.pop_back();
+                    if (!db.names.back().first.empty())
+                    {
+                        db.names.back().first += "::" + name;
+                        db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                    }
+                    else
+                        db.names.back().first = name;
+                    pop_subs = true;
+                    t0 = t1;
+                }
+                else
+                    return first;
+                break;
+            case 'T':
+                t1 = parse_template_param(t0, last, db);
+                if (t1 != t0 && t1 != last)
+                {
+                    auto name = db.names.back().move_full();
+                    db.names.pop_back();
+                    if (!db.names.back().first.empty())
+                        db.names.back().first += "::" + name;
+                    else
+                        db.names.back().first = name;
+                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                    pop_subs = true;
+                    t0 = t1;
+                }
+                else
+                    return first;
+                break;
+            case 'D':
+                if (t0 + 1 != last && t0[1] != 't' && t0[1] != 'T')
+                    goto do_parse_unqualified_name;
+                t1 = parse_decltype(t0, last, db);
+                if (t1 != t0 && t1 != last)
+                {
+                    auto name = db.names.back().move_full();
+                    db.names.pop_back();
+                    if (!db.names.back().first.empty())
+                        db.names.back().first += "::" + name;
+                    else
+                        db.names.back().first = name;
+                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                    pop_subs = true;
+                    t0 = t1;
+                }
+                else
+                    return first;
+                break;
+            case 'I':
+                t1 = parse_template_args(t0, last, db);
+                if (t1 != t0 && t1 != last)
+                {
+                    auto name = db.names.back().move_full();
+                    db.names.pop_back();
+                    db.names.back().first += name;
+                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                    t0 = t1;
+                }
+                else
+                    return first;
+                break;
+            case 'L':
+                if (++t0 == last)
+                    return first;
+                break;
+            default:
+            do_parse_unqualified_name:
+                t1 = parse_unqualified_name(t0, last, db);
+                if (t1 != t0 && t1 != last)
+                {
+                    auto name = db.names.back().move_full();
+                    db.names.pop_back();
+                    if (!db.names.back().first.empty())
+                        db.names.back().first += "::" + name;
+                    else
+                        db.names.back().first = name;
+                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                    pop_subs = true;
+                    t0 = t1;
+                }
+                else
+                    return first;
+            }
+        }
+        first = t0 + 1;
+        db.cv = cv;
+        if (pop_subs && !db.subs.empty())
+            db.subs.pop_back();
+    }
+    return first;
+}
+
+// <discriminator> := _ <non-negative number>      # when number < 10
+//                 := __ <non-negative number> _   # when number >= 10
+//  extension      := decimal-digit+
+
+const char*
+parse_discriminator(const char* first, const char* last)
+{
+    // parse but ignore discriminator
+    if (first != last)
+    {
+        if (*first == '_')
+        {
+            const char* t1 = first+1;
+            if (t1 != last)
+            {
+                if (std::isdigit(*t1))
+                    first = t1+1;
+                else if (*t1 == '_')
+                {
+                    for (++t1; t1 != last && std::isdigit(*t1); ++t1)
+                        ;
+                    if (t1 != last && *t1 == '_')
+                        first = t1 + 1;
+                }
+            }
+        }
+        else if (std::isdigit(*first))
+        {
+            const char* t1 = first+1;
+            for (; t1 != last && std::isdigit(*t1); ++t1)
+                ;
+            first = t1;
+        }
+    }
+    return first;
+}
+
+// <local-name> := Z <function encoding> E <entity name> [<discriminator>]
+//              := Z <function encoding> E s [<discriminator>]
+//              := Z <function encoding> Ed [ <parameter number> ] _ <entity name>
+
+template <class C>
+const char*
+parse_local_name(const char* first, const char* last, C& db)
+{
+    if (first != last && *first == 'Z')
+    {
+        const char* t = parse_encoding(first+1, last, db);
+        if (t != first+1 && t != last && *t == 'E' && ++t != last)
+        {
+            switch (*t)
+            {
+            case 's':
+                first = parse_discriminator(t+1, last);
+                db.names.back().first.append("::string literal");
+                break;
+            case 'd':
+                if (++t != last)
+                {
+                    const char* t1 = parse_number(t, last);
+                    if (t1 != last && *t1 == '_')
+                    {
+                        t = t1 + 1;
+                        t1 = parse_name(t, last, db);
+                        if (t1 != t)
+                        {
+                            auto name = db.names.back().move_full();
+                            db.names.pop_back();
+                            db.names.back().first.append("::");
+                            db.names.back().first.append(name);
+                            first = t1;
+                        }
+                        else
+                            db.names.pop_back();
+                    }
+                }
+                break;
+            default:
+                {
+                    const char* t1 = parse_name(t, last, db);
+                    if (t1 != t)
+                    {
+                        // parse but ignore discriminator
+                        first = parse_discriminator(t1, last);
+                        auto name = db.names.back().move_full();
+                        db.names.pop_back();
+                        db.names.back().first.append("::");
+                        db.names.back().first.append(name);
+                    }
+                    else
+                        db.names.pop_back();
+                }
+                break;
+            }
+        }
+    }
+    return first;
+}
+
+// <name> ::= <nested-name> // N
+//        ::= <local-name> # See Scope Encoding below  // Z
+//        ::= <unscoped-template-name> <template-args>
+//        ::= <unscoped-name>
+
+// <unscoped-template-name> ::= <unscoped-name>
+//                          ::= <substitution>
+
+template <class C>
+const char*
+parse_name(const char* first, const char* last, C& db)
+{
+    if (last - first >= 2)
+    {
+        const char* t0 = first;
+        // extension: ignore L here
+        if (*t0 == 'L')
+            ++t0;
+        switch (*t0)
+        {
+        case 'N':
+          {
+            const char* t1 = parse_nested_name(t0, last, db);
+            if (t1 != t0)
+                first = t1;
+            break;
+          }
+        case 'Z':
+          {
+            const char* t1 = parse_local_name(t0, last, db);
+            if (t1 != t0)
+                first = t1;
+            break;
+          }
+        default:
+          {
+            const char* t1 = parse_unscoped_name(t0, last, db);
+            if (t1 != t0)
+            {
+                if (t1 != last && *t1 == 'I')  // <unscoped-template-name> <template-args>
+                {
+                    db.subs.push_back(typename C::sub_type(1, db.names.back(), db.names.get_allocator()));
+                    t0 = t1;
+                    t1 = parse_template_args(t0, last, db);
+                    if (t1 != t0)
+                    {
+                        auto tmp = db.names.back().move_full();
+                        db.names.pop_back();
+                        db.names.back().first += tmp;
+                        first = t1;
+                    }
+                }
+                else   // <unscoped-name>
+                    first = t1;
+            }
+            else
+            {   // try <substitution> <template-args>
+                t1 = parse_substitution(t0, last, db);
+                if (t1 != t0 && t1 != last && *t1 == 'I')
+                {
+                    t0 = t1;
+                    t1 = parse_template_args(t0, last, db);
+                    if (t1 != t0)
+                    {
+                        auto tmp = db.names.back().move_full();
+                        db.names.pop_back();
+                        db.names.back().first += tmp;
+                        first = t1;
+                    }
+                }
+            }
+            break;
+          }
+        }
+    }
+    return first;
+}
+
+// <call-offset> ::= h <nv-offset> _
+//               ::= v <v-offset> _
+// 
+// <nv-offset> ::= <offset number>
+//               # non-virtual base override
+// 
+// <v-offset>  ::= <offset number> _ <virtual offset number>
+//               # virtual base override, with vcall offset
+
+const char*
+parse_call_offset(const char* first, const char* last)
+{
+    if (first != last)
+    {
+        switch (*first)
+        {
+        case 'h':
+            {
+            const char* t = parse_number(first + 1, last);
+            if (t != first + 1 && t != last && *t == '_')
+                first = t + 1;
+            }
+            break;
+        case 'v':
+            {
+            const char* t = parse_number(first + 1, last);
+            if (t != first + 1 && t != last && *t == '_')
+            {
+                const char* t2 = parse_number(++t, last);
+                if (t2 != t && t2 != last && *t2 == '_')
+                    first = t2 + 1;
+            }
+            }
+            break;
+        }
+    }
+    return first;
+}
+
+// <special-name> ::= TV <type>    # virtual table
+//                ::= TT <type>    # VTT structure (construction vtable index)
+//                ::= TI <type>    # typeinfo structure
+//                ::= TS <type>    # typeinfo name (null-terminated byte string)
+//                ::= Tc <call-offset> <call-offset> <base encoding>
+//                    # base is the nominal target function of thunk
+//                    # first call-offset is 'this' adjustment
+//                    # second call-offset is result adjustment
+//                ::= T <call-offset> <base encoding>
+//                    # base is the nominal target function of thunk
+//                ::= GV <object name> # Guard variable for one-time initialization
+//                                     # No <type>
+//      extension ::= TC <first type> <number> _ <second type> # construction vtable for second-in-first
+//      extension ::= GR <object name> # reference temporary for object
+
+template <class C>
+const char*
+parse_special_name(const char* first, const char* last, C& db)
+{
+    if (last - first > 2)
+    {
+        const char* t;
+        switch (*first)
+        {
+        case 'T':
+            switch (first[1])
+            {
+            case 'V':
+                // TV <type>    # virtual table
+                t = parse_type(first+2, last, db);
+                if (t != first+2)
+                {
+                    db.names.back().first.insert(0, "vtable for ");
+                    first = t;
+                }
+                break;
+            case 'T':
+                // TT <type>    # VTT structure (construction vtable index)
+                t = parse_type(first+2, last, db);
+                if (t != first+2)
+                {
+                    db.names.back().first.insert(0, "VTT for ");
+                    first = t;
+                }
+                break;
+            case 'I':
+                // TI <type>    # typeinfo structure
+                t = parse_type(first+2, last, db);
+                if (t != first+2)
+                {
+                    db.names.back().first.insert(0, "typeinfo for ");
+                    first = t;
+                }
+                break;
+            case 'S':
+                // TS <type>    # typeinfo name (null-terminated byte string)
+                t = parse_type(first+2, last, db);
+                if (t != first+2)
+                {
+                    db.names.back().first.insert(0, "typeinfo name for ");
+                    first = t;
+                }
+                break;
+            case 'c':
+                // Tc <call-offset> <call-offset> <base encoding>
+              {
+                const char* t0 = parse_call_offset(first+2, last);
+                if (t0 == first+2)
+                    break;
+                const char* t1 = parse_call_offset(t0, last);
+                if (t1 == t0)
+                    break;
+                t = parse_encoding(t1, last, db);
+                if (t != t1)
+                {
+                    db.names.back().first.insert(0, "covariant return thunk to ");
+                    first = t;
+                }
+              }
+                break;
+            case 'C':
+                // extension ::= TC <first type> <number> _ <second type> # construction vtable for second-in-first
+                t = parse_type(first+2, last, db);
+                if (t != first+2)
+                {
+                    const char* t0 = parse_number(t, last);
+                    if (t0 != t && t0 != last && *t0 == '_')
+                    {
+                        const char* t1 = parse_type(++t0, last, db);
+                        if (t1 != t0)
+                        {
+                            auto left = db.names.back().move_full();
+                            db.names.pop_back();
+                            db.names.back().first = "construction vtable for " +
+                                                    std::move(left) + "-in-" +
+                                                    db.names.back().move_full();
+                            first = t1;
+                        }
+                    }
+                }
+                break;
+            default:
+                // T <call-offset> <base encoding>
+                {
+                const char* t0 = parse_call_offset(first+1, last);
+                if (t0 == first+1)
+                    break;
+                t = parse_encoding(t0, last, db);
+                if (t != t0)
+                {
+                    if (first[2] == 'v')
+                    {
+                        db.names.back().first.insert(0, "virtual thunk to ");
+                        first = t;
+                    }
+                    else
+                    {
+                        db.names.back().first.insert(0, "non-virtual thunk to ");
+                        first = t;
+                    }
+                }
+                }
+                break;
+            }
+            break;
+        case 'G':
+            switch (first[1])
+            {
+            case 'V':
+                // GV <object name> # Guard variable for one-time initialization
+                t = parse_name(first+2, last, db);
+                if (t != first+2)
+                {
+                    db.names.back().first.insert(0, "guard variable for ");
+                    first = t;
+                }
+                break;
+            case 'R':
+                // extension ::= GR <object name> # reference temporary for object
+                t = parse_name(first+2, last, db);
+                if (t != first+2)
+                {
+                    db.names.back().first.insert(0, "reference temporary for ");
+                    first = t;
+                }
+                break;
+            }
+            break;
+        }
+    }
+    return first;
+}
+
+// <encoding> ::= <function name> <bare-function-type>
+//            ::= <data name>
+//            ::= <special-name>
+
+template <class C>
+const char*
+parse_encoding(const char* first, const char* last, C& db)
+{
+    if (first != last)
+    {
+        switch (*first)
+        {
+        case 'G':
+        case 'T':
+            first = parse_special_name(first, last, db);
+            break;
+        default:
+          {
+            const char* t = parse_name(first, last, db);
+            unsigned cv = db.cv;
+            unsigned ref = db.ref;
+            if (t != first)
+            {
+                if (t != last && *t != 'E' && *t != '.')
+                {
+                    bool tag_templates = db.tag_templates;
+                    db.tag_templates = false;
+                    const char* t2;
+                    typename C::String ret2;
+                    const typename C::String& nm = db.names.back().first;
+                    if (!db.parsed_ctor_dtor_cv && nm.back() == '>' && nm[nm.size()-2] != '-'
+                                                                    && nm[nm.size()-2] != '>')
+                    {
+                        t2 = parse_type(t, last, db);
+                        if (t2 == t)
+                            return first;
+                        auto ret1 = std::move(db.names.back().first);
+                        ret2 = std::move(db.names.back().second);
+                        if (ret2.empty())
+                            ret1 += ' ';
+                        db.names.pop_back();
+                        db.names.back().first.insert(0, ret1);
+                        t = t2;
+                    }
+                    db.names.back().first += '(';
+                    if (t != last && *t == 'v')
+                    {
+                        ++t;
+                    }
+                    else
+                    {
+                        bool first_arg = true;
+                        while (true)
+                        {
+                            size_t k0 = db.names.size();
+                            t2 = parse_type(t, last, db);
+                            size_t k1 = db.names.size();
+                            if (t2 == t)
+                                break;
+                            if (k1 > k0)
+                            {
+                                typename C::String tmp;
+                                for (size_t k = k0; k < k1; ++k)
+                                {
+                                    if (!tmp.empty())
+                                        tmp += ", ";
+                                    tmp += db.names[k].move_full();
+                                }
+                                for (size_t k = k0; k < k1; ++k)
+                                    db.names.pop_back();
+                                if (!tmp.empty())
+                                {
+                                    if (!first_arg)
+                                        db.names.back().first += ", ";
+                                    else
+                                        first_arg = false;
+                                    db.names.back().first += tmp;
+                                }
+                            }
+                            t = t2;
+                        }
+                    }
+                    db.names.back().first += ')';
+                    if (cv & 1)
+                        db.names.back().first.append(" const");
+                    if (cv & 2)
+                        db.names.back().first.append(" volatile");
+                    if (cv & 4)
+                        db.names.back().first.append(" restrict");
+                    if (ref == 1)
+                        db.names.back().first.append(" &");
+                    else if (ref == 2)
+                        db.names.back().first.append(" &&");
+                    db.names.back().first += ret2;
+                    first = t;
+                    db.tag_templates = tag_templates;
+                }
+                else
+                    first = t;
+            }
+            break;
+          }
+        }
+    }
+    return first;
+}
+
+// _block_invoke
+// _block_invoke<decimal-digit>+
+// _block_invoke_<decimal-digit>+
+
+template <class C>
+const char*
+parse_block_invoke(const char* first, const char* last, C& db)
+{
+    if (last - first >= 13)
+    {
+        const char test[] = "_block_invoke";
+        const char* t = first;
+        for (int i = 0; i < 13; ++i, ++t)
+        {
+            if (*t != test[i])
+                return first;
+        }
+        if (t != last)
+        {
+            if (*t == '_')
+            {
+                // must have at least 1 decimal digit
+                if (++t == last || !std::isdigit(*t))
+                    return first;
+                ++t;
+            }
+            // parse zero or more digits
+            while (t != last && isdigit(*t))
+                ++t;
+        }
+        db.names.back().first.insert(0, "invocation function for block in ");
+        first = t;
+    }
+    return first;
+}
+
+// extension
+// <dot-suffix> := .<anything and everything>
+
+template <class C>
+const char*
+parse_dot_suffix(const char* first, const char* last, C& db)
+{
+    if (first != last && *first == '.')
+    {
+        db.names.back().first += " (" + typename C::String(first, last) + ")";
+        first = last;
+    }
+    return first;
+}
+
+// <block-involcaton-function> ___Z<encoding>_block_invoke
+// <block-involcaton-function> ___Z<encoding>_block_invoke<decimal-digit>+
+// <block-involcaton-function> ___Z<encoding>_block_invoke_<decimal-digit>+
+// <mangled-name> ::= _Z<encoding>
+//                ::= <type>
+
+template <class C>
+void
+demangle(const char* first, const char* last, C& db, int& status)
+{
+    if (first >= last)
+    {
+        status = invalid_mangled_name;
+        return;
+    }
+    if (*first == '_')
+    {
+        if (last - first >= 4)
+        {
+            if (first[1] == 'Z')
+            {
+                const char* t = parse_encoding(first+2, last, db);
+                if (t != first+2 && t != last && *t == '.')
+                    t = parse_dot_suffix(t, last, db);
+                if (t != last)
+                    status = invalid_mangled_name;
+            }
+            else if (first[1] == '_' && first[2] == '_' && first[3] == 'Z')
+            {
+                const char* t = parse_encoding(first+4, last, db);
+                if (t != first+4 && t != last)
+                {
+                    const char* t1 = parse_block_invoke(t, last, db);
+                    if (t1 != last)
+                        status = invalid_mangled_name;
+                }
+                else
+                    status = invalid_mangled_name;
+            }
+            else
+                status = invalid_mangled_name;
+        }
+        else
+            status = invalid_mangled_name;
+    }
+    else
+    {
+        const char* t = parse_type(first, last, db);
+        if (t != last)
+            status = invalid_mangled_name;
+    }
+    if (status == success && db.names.empty())
+        status = invalid_mangled_name;
+}
+
+template <std::size_t N>
+class arena
+{
+    static const std::size_t alignment = 16;
+    alignas(alignment) char buf_[N];
+    char* ptr_;
+
+    std::size_t 
+    align_up(std::size_t n) noexcept
+        {return n + (alignment-1) & ~(alignment-1);}
+
+    bool
+    pointer_in_buffer(char* p) noexcept
+        {return buf_ <= p && p <= buf_ + N;}
+
+public:
+    arena() noexcept : ptr_(buf_) {}
+    ~arena() {ptr_ = nullptr;}
+    arena(const arena&) = delete;
+    arena& operator=(const arena&) = delete;
+
+    char* allocate(std::size_t n);
+    void deallocate(char* p, std::size_t n) noexcept;
+
+    static constexpr std::size_t size() {return N;}
+    std::size_t used() const {return static_cast<std::size_t>(ptr_ - buf_);}
+    void reset() {ptr_ = buf_;}
+};
+
+template <std::size_t N>
+char*
+arena<N>::allocate(std::size_t n)
+{
+    n = align_up(n);
+    if (static_cast<std::size_t>(buf_ + N - ptr_) >= n)
+    {
+        char* r = ptr_;
+        ptr_ += n;
+        return r;
+    }
+    return static_cast<char*>(std::malloc(n));
+}
+
+template <std::size_t N>
+void
+arena<N>::deallocate(char* p, std::size_t n) noexcept
+{
+    if (pointer_in_buffer(p))
+    {
+        n = align_up(n);
+        if (p + n == ptr_)
+            ptr_ = p;
+    }
+    else
+        std::free(p);
+}
+
+template <class T, std::size_t N>
+class short_alloc
+{
+    arena<N>& a_;
+public:
+    typedef T value_type;
+
+public:
+    template <class _Up> struct rebind {typedef short_alloc<_Up, N> other;};
+
+    short_alloc(arena<N>& a) noexcept : a_(a) {}
+    template <class U>
+        short_alloc(const short_alloc<U, N>& a) noexcept
+            : a_(a.a_) {}
+    short_alloc(const short_alloc&) = default;
+    short_alloc& operator=(const short_alloc&) = delete;
+
+    T* allocate(std::size_t n)
+    {
+        return reinterpret_cast<T*>(a_.allocate(n*sizeof(T)));
+    }
+    void deallocate(T* p, std::size_t n) noexcept
+    {
+        a_.deallocate(reinterpret_cast<char*>(p), n*sizeof(T));
+    }
+
+    template <class T1, std::size_t N1, class U, std::size_t M>
+    friend
+    bool
+    operator==(const short_alloc<T1, N1>& x, const short_alloc<U, M>& y) noexcept;
+
+    template <class U, std::size_t M> friend class short_alloc;
+};
+
+template <class T, std::size_t N, class U, std::size_t M>
+inline
+bool
+operator==(const short_alloc<T, N>& x, const short_alloc<U, M>& y) noexcept
+{
+    return N == M && &x.a_ == &y.a_;
+}
+
+template <class T, std::size_t N, class U, std::size_t M>
+inline
+bool
+operator!=(const short_alloc<T, N>& x, const short_alloc<U, M>& y) noexcept
+{
+    return !(x == y);
+}
+
+template <class T>
+class malloc_alloc
+{
+public:
+    typedef T value_type;
+
+    malloc_alloc() = default;
+    template <class U> malloc_alloc(const malloc_alloc<U>&) noexcept {}
+
+    T* allocate(std::size_t n)
+    {
+        return static_cast<T*>(std::malloc(n*sizeof(T)));
+    }
+    void deallocate(T* p, std::size_t) noexcept
+    {
+        std::free(p);
+    }
+};
+
+template <class T, class U>
+inline
+bool
+operator==(const malloc_alloc<T>&, const malloc_alloc<U>&) noexcept
+{
+    return true;
+}
+
+template <class T, class U>
+inline
+bool
+operator!=(const malloc_alloc<T>& x, const malloc_alloc<U>& y) noexcept
+{
+    return !(x == y);
+}
+
+const size_t bs = 4 * 1024;
+template <class T> using Alloc = short_alloc<T, bs>;
+template <class T> using Vector = std::vector<T, Alloc<T>>;
+using String = std::basic_string<char, std::char_traits<char>, malloc_alloc<char>>;
+
+struct string_pair
+{
+    String first;
+    String second;
+
+    string_pair() = default;
+    string_pair(String f) : first(std::move(f)) {}
+    string_pair(String f, String s)
+        : first(std::move(f)), second(std::move(s)) {}
+    template <size_t N>
+        string_pair(const char (&s)[N]) : first(s, N-1) {}
+
+    size_t size() const {return first.size() + second.size();}
+    String full() const {return first + second;}
+    String move_full() {return std::move(first) + std::move(second);}
+};
+
+struct Db
+{
+    typedef String String;
+    typedef Vector<string_pair> sub_type;
+    typedef Vector<sub_type> template_param_type;
+    Vector<string_pair> names;
+    Vector<sub_type> subs;
+    Vector<template_param_type> template_param;
+    unsigned cv;
+    unsigned ref;
+    bool parsed_ctor_dtor_cv;
+    bool tag_templates;
+    bool fix_forward_references;
+    bool try_to_parse_template_args;
+
+    template <size_t N>
+    Db(arena<N>& ar) :
+        names(ar),
+        subs(0, names, ar),
+        template_param(0, subs, ar)
+    {}
+};
+
+char*
+__cxa_demangle(const char* mangled_name, char* buf, size_t* n, int* status)
+{
+    if (mangled_name == nullptr || (buf != nullptr && n == nullptr))
+    {
+        if (status)
+            *status = invalid_args;
+        return nullptr;
+    }
+    size_t internal_size = buf != nullptr ? *n : 0;
+    arena<bs> a;
+    Db db(a);
+    db.cv = 0;
+    db.ref = 0;
+    db.parsed_ctor_dtor_cv = false;
+    db.tag_templates = true;
+    db.template_param.emplace_back(a);
+    db.fix_forward_references = false;
+    db.try_to_parse_template_args = true;
+    int internal_status = success;
+    size_t len = std::strlen(mangled_name);
+    demangle(mangled_name, mangled_name + len, db,
+             internal_status);
+    if (internal_status == success && db.fix_forward_references &&
+           !db.template_param.empty() && !db.template_param.front().empty())
+    {
+        db.fix_forward_references = false;
+        db.tag_templates = false;
+        db.names.clear();
+        db.subs.clear();
+        demangle(mangled_name, mangled_name + len, db, internal_status);
+        if (db.fix_forward_references)
+            internal_status = invalid_mangled_name;
+    }
+    if (internal_status == success)
+    {
+        size_t sz = db.names.back().size() + 1;
+        if (sz > internal_size)
+        {
+            char* newbuf = static_cast<char*>(std::realloc(buf, sz));
+            if (newbuf == nullptr)
+            {
+                internal_status = memory_alloc_failure;
+                buf = nullptr;
+            }
+            else
+            {
+                buf = newbuf;
+                if (n != nullptr)
+                    *n = sz;
+            }
+        }
+        if (buf != nullptr)
+        {
+            db.names.back().first += db.names.back().second;
+            std::memcpy(buf, db.names.back().first.data(), sz-1);
+            buf[sz-1] = char(0);
+        }
+    }
+    else
+        buf = nullptr;
+    if (status)
+        *status = internal_status;
+    return buf;
+}
+
+}  // unnamed namespace
+
+#endif
 
 
 #include "llvm/ADT/DenseMap.h"
@@ -199,7 +4890,14 @@ Mangled::GetDemangledName () const
             {
                 // We didn't already mangle this name, demangle it and if all goes well
                 // add it to our map.
+#ifdef LLDB_USE_BUILTIN_DEMANGLER
+                char *demangled_name = __cxa_demangle (mangled_cstr, NULL, NULL, NULL);
+#elif defined(_MSC_VER)
+                // Cannot demangle on msvc.
+                char *demangled_name = nullptr;
+#else
                 char *demangled_name = abi::__cxa_demangle (mangled_cstr, NULL, NULL, NULL);
+#endif
 
                 if (demangled_name)
                 {
diff --git a/contrib/llvm/tools/lldb/source/Core/Module.cpp b/contrib/llvm/tools/lldb/source/Core/Module.cpp
index 4252ed4cb6c..f90a097416d 100644
--- a/contrib/llvm/tools/lldb/source/Core/Module.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Module.cpp
@@ -9,6 +9,7 @@
 
 #include "lldb/lldb-python.h"
 
+#include "lldb/Core/AddressResolverFileLine.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/DataBuffer.h"
@@ -134,6 +135,7 @@ Module::Module (const ModuleSpec &module_spec) :
     m_uuid (),
     m_file (module_spec.GetFileSpec()),
     m_platform_file(module_spec.GetPlatformFileSpec()),
+    m_remote_install_file(),
     m_symfile_spec (module_spec.GetSymbolFileSpec()),
     m_object_name (module_spec.GetObjectName()),
     m_object_offset (module_spec.GetObjectOffset()),
@@ -178,6 +180,7 @@ Module::Module(const FileSpec& file_spec,
     m_uuid (),
     m_file (file_spec),
     m_platform_file(),
+    m_remote_install_file (),
     m_symfile_spec (),
     m_object_name (),
     m_object_offset (object_offset),
@@ -448,7 +451,8 @@ Module::ResolveFileAddress (lldb::addr_t vm_addr, Address& so_addr)
 }
 
 uint32_t
-Module::ResolveSymbolContextForAddress (const Address& so_addr, uint32_t resolve_scope, SymbolContext& sc)
+Module::ResolveSymbolContextForAddress (const Address& so_addr, uint32_t resolve_scope, SymbolContext& sc,
+                                        bool resolve_tail_call_address)
 {
     Mutex::Locker locker (m_mutex);
     uint32_t resolved_flags = 0;
@@ -467,6 +471,10 @@ Module::ResolveSymbolContextForAddress (const Address& so_addr, uint32_t resolve
         sc.module_sp = shared_from_this();
         resolved_flags |= eSymbolContextModule;
 
+        SymbolVendor* sym_vendor = GetSymbolVendor();
+        if (!sym_vendor)
+            return resolved_flags;
+
         // Resolve the compile unit, function, block, line table or line
         // entry if requested.
         if (resolve_scope & eSymbolContextCompUnit    ||
@@ -474,25 +482,92 @@ Module::ResolveSymbolContextForAddress (const Address& so_addr, uint32_t resolve
             resolve_scope & eSymbolContextBlock       ||
             resolve_scope & eSymbolContextLineEntry   )
         {
-            SymbolVendor *symbols = GetSymbolVendor ();
-            if (symbols)
-                resolved_flags |= symbols->ResolveSymbolContext (so_addr, resolve_scope, sc);
+            resolved_flags |= sym_vendor->ResolveSymbolContext (so_addr, resolve_scope, sc);
         }
 
         // Resolve the symbol if requested, but don't re-look it up if we've already found it.
         if (resolve_scope & eSymbolContextSymbol && !(resolved_flags & eSymbolContextSymbol))
         {
-            SymbolVendor* sym_vendor = GetSymbolVendor();
-            if (sym_vendor)
+            Symtab *symtab = sym_vendor->GetSymtab();
+            if (symtab && so_addr.IsSectionOffset())
             {
-                Symtab *symtab = sym_vendor->GetSymtab();
-                if (symtab)
+                sc.symbol = symtab->FindSymbolContainingFileAddress(so_addr.GetFileAddress());
+                if (!sc.symbol &&
+                    resolve_scope & eSymbolContextFunction && !(resolved_flags & eSymbolContextFunction))
                 {
-                    if (so_addr.IsSectionOffset())
+                    bool verify_unique = false; // No need to check again since ResolveSymbolContext failed to find a symbol at this address.
+                    if (ObjectFile *obj_file = sc.module_sp->GetObjectFile())
+                        sc.symbol = obj_file->ResolveSymbolForAddress(so_addr, verify_unique);
+                }
+
+                if (sc.symbol)
+                {
+                    if (sc.symbol->IsSynthetic())
                     {
-                        sc.symbol = symtab->FindSymbolContainingFileAddress(so_addr.GetFileAddress());
-                        if (sc.symbol)
-                            resolved_flags |= eSymbolContextSymbol;
+                        // We have a synthetic symbol so lets check if the object file
+                        // from the symbol file in the symbol vendor is different than
+                        // the object file for the module, and if so search its symbol
+                        // table to see if we can come up with a better symbol. For example
+                        // dSYM files on MacOSX have an unstripped symbol table inside of
+                        // them.
+                        ObjectFile *symtab_objfile = symtab->GetObjectFile();
+                        if (symtab_objfile && symtab_objfile->IsStripped())
+                        {
+                            SymbolFile *symfile = sym_vendor->GetSymbolFile();
+                            if (symfile)
+                            {
+                                ObjectFile *symfile_objfile = symfile->GetObjectFile();
+                                if (symfile_objfile != symtab_objfile)
+                                {
+                                    Symtab *symfile_symtab = symfile_objfile->GetSymtab();
+                                    if (symfile_symtab)
+                                    {
+                                        Symbol *symbol = symfile_symtab->FindSymbolContainingFileAddress(so_addr.GetFileAddress());
+                                        if (symbol && !symbol->IsSynthetic())
+                                        {
+                                            sc.symbol = symbol;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    resolved_flags |= eSymbolContextSymbol;
+                }
+            }
+        }
+
+        // For function symbols, so_addr may be off by one.  This is a convention consistent
+        // with FDE row indices in eh_frame sections, but requires extra logic here to permit
+        // symbol lookup for disassembly and unwind.
+        if (resolve_scope & eSymbolContextSymbol && !(resolved_flags & eSymbolContextSymbol) &&
+            resolve_tail_call_address && so_addr.IsSectionOffset())
+        {
+            Address previous_addr = so_addr;
+            previous_addr.Slide(-1);
+
+            bool do_resolve_tail_call_address = false; // prevent recursion
+            const uint32_t flags = ResolveSymbolContextForAddress(previous_addr, resolve_scope, sc,
+                                                                  do_resolve_tail_call_address);
+            if (flags & eSymbolContextSymbol)
+            {
+                AddressRange addr_range;
+                if (sc.GetAddressRange (eSymbolContextFunction | eSymbolContextSymbol, 0, false, addr_range))
+                {
+                    if (addr_range.GetBaseAddress().GetSection() == so_addr.GetSection())
+                    {
+                        // If the requested address is one past the address range of a function (i.e. a tail call),
+                        // or the decremented address is the start of a function (i.e. some forms of trampoline),
+                        // indicate that the symbol has been resolved.
+                        if (so_addr.GetOffset() == addr_range.GetBaseAddress().GetOffset() ||
+                            so_addr.GetOffset() == addr_range.GetBaseAddress().GetOffset() + addr_range.GetByteSize())
+                        {
+                            resolved_flags |= flags;
+                        }
+                    }
+                    else
+                    {
+                        sc.symbol = nullptr; // Don't trust the symbol if the sections didn't match.
                     }
                 }
             }
@@ -573,7 +648,7 @@ Module::FindCompileUnits (const FileSpec &path,
     const size_t num_compile_units = GetNumCompileUnits();
     SymbolContext sc;
     sc.module_sp = shared_from_this();
-    const bool compare_directory = path.GetDirectory();
+    const bool compare_directory = (bool)path.GetDirectory();
     for (size_t i=0; i<num_compile_units; ++i)
     {
         sc.comp_unit = GetCompileUnitAtIndex(i).get();
@@ -752,6 +827,27 @@ Module::FindFunctions (const RegularExpression& regex,
     return sc_list.GetSize() - start_size;
 }
 
+void
+Module::FindAddressesForLine (const lldb::TargetSP target_sp,
+                              const FileSpec &file, uint32_t line,
+                              Function *function,
+                              std::vector<Address> &output_local, std::vector<Address> &output_extern)
+{
+    SearchFilterByModule filter(target_sp, m_file);
+    AddressResolverFileLine resolver(file, line, true);
+    resolver.ResolveAddress (filter);
+
+    for (size_t n=0;n<resolver.GetNumberOfAddresses();n++)
+    {
+        Address addr = resolver.GetAddressRangeAtIndex(n).GetBaseAddress();
+        Function *f = addr.CalculateSymbolContextFunction();
+        if (f && f == function)
+            output_local.push_back (addr);
+        else
+            output_extern.push_back (addr);
+    }
+}
+
 size_t
 Module::FindTypes_Impl (const SymbolContext& sc,
                         const ConstString &name,
@@ -1447,14 +1543,14 @@ Module::MatchesModuleSpec (const ModuleSpec &module_ref)
     const FileSpec &file_spec = module_ref.GetFileSpec();
     if (file_spec)
     {
-        if (!FileSpec::Equal (file_spec, m_file, file_spec.GetDirectory()))
+        if (!FileSpec::Equal (file_spec, m_file, (bool)file_spec.GetDirectory()))
             return false;
     }
 
     const FileSpec &platform_file_spec = module_ref.GetPlatformFileSpec();
     if (platform_file_spec)
     {
-        if (!FileSpec::Equal (platform_file_spec, GetPlatformFileSpec (), platform_file_spec.GetDirectory()))
+        if (!FileSpec::Equal (platform_file_spec, GetPlatformFileSpec (), (bool)platform_file_spec.GetDirectory()))
             return false;
     }
     
@@ -1606,4 +1702,4 @@ Module::PrepareForFunctionNameLookup (const ConstString &name,
         lookup_name = name;
         match_name_after_lookup = false;
     }
-}
\ No newline at end of file
+}
diff --git a/contrib/llvm/tools/lldb/source/Core/ModuleList.cpp b/contrib/llvm/tools/lldb/source/Core/ModuleList.cpp
index ebc6702d3a9..215611e4242 100644
--- a/contrib/llvm/tools/lldb/source/Core/ModuleList.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ModuleList.cpp
@@ -663,7 +663,19 @@ ModuleList::FindSourceFile (const FileSpec &orig_spec, FileSpec &new_spec) const
     return false;
 }
 
-
+void
+ModuleList::FindAddressesForLine (const lldb::TargetSP target_sp,
+                                  const FileSpec &file, uint32_t line,
+                                  Function *function,
+                                  std::vector<Address> &output_local, std::vector<Address> &output_extern)
+{
+    Mutex::Locker locker(m_modules_mutex);
+    collection::const_iterator pos, end = m_modules.end();
+    for (pos = m_modules.begin(); pos != end; ++pos)
+    {
+        (*pos)->FindAddressesForLine(target_sp, file, line, function, output_local, output_extern);
+    }
+}
 
 ModuleSP
 ModuleList::FindFirstModule (const ModuleSpec &module_spec) const
diff --git a/contrib/llvm/tools/lldb/source/Core/Opcode.cpp b/contrib/llvm/tools/lldb/source/Core/Opcode.cpp
index d9878656e3f..978a110150f 100644
--- a/contrib/llvm/tools/lldb/source/Core/Opcode.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Opcode.cpp
@@ -31,18 +31,18 @@ Opcode::Dump (Stream *s, uint32_t min_byte_width)
     int bytes_written = 0;
     switch (m_type)
     {
-    case Opcode::eTypeInvalid:  
-        bytes_written = s->PutCString ("<invalid>"); 
+    case Opcode::eTypeInvalid:
+        bytes_written = s->PutCString ("<invalid>");
         break;
-    case Opcode::eType8:        
-        bytes_written = s->Printf ("0x%2.2x", m_data.inst8); 
+    case Opcode::eType8:
+        bytes_written = s->Printf ("0x%2.2x", m_data.inst8);
         break;
     case Opcode::eType16:
-        bytes_written = s->Printf ("0x%4.4x", m_data.inst16); 
+        bytes_written = s->Printf ("0x%4.4x", m_data.inst16);
         break;
     case Opcode::eType16_2:
     case Opcode::eType32:
-        bytes_written = s->Printf ("0x%8.8x", m_data.inst32); 
+        bytes_written = s->Printf ("0x%8.8x", m_data.inst32);
         break;
 
     case Opcode::eType64:
@@ -55,12 +55,12 @@ Opcode::Dump (Stream *s, uint32_t min_byte_width)
             {
                 if (i > 0)
                     bytes_written += s->PutChar (' ');
-                bytes_written += s->Printf ("%2.2x", m_data.inst.bytes[i]); 
+                bytes_written += s->Printf ("%2.2x", m_data.inst.bytes[i]);
             }
         }
         break;
     }
-    
+
     // Add spaces to make sure bytes dispay comes out even in case opcodes
     // aren't all the same size
     if (bytes_written < min_byte_width)
@@ -89,7 +89,7 @@ uint32_t
 Opcode::GetData (DataExtractor &data) const
 {
     uint32_t byte_size = GetByteSize ();
-    
+
     DataBufferSP buffer_sp;
     if (byte_size > 0)
     {
@@ -97,7 +97,7 @@ Opcode::GetData (DataExtractor &data) const
         {
             case Opcode::eTypeInvalid:
                 break;
-                
+
             case Opcode::eType8:    buffer_sp.reset (new DataBufferHeap (&m_data.inst8,  byte_size)); break;
             case Opcode::eType16:   buffer_sp.reset (new DataBufferHeap (&m_data.inst16, byte_size)); break;
             case Opcode::eType16_2:
@@ -119,7 +119,7 @@ Opcode::GetData (DataExtractor &data) const
                 break;
         }
     }
-    
+
     if (buffer_sp)
     {
         data.SetByteOrder(GetDataByteOrder());
diff --git a/contrib/llvm/tools/lldb/source/Core/PluginManager.cpp b/contrib/llvm/tools/lldb/source/Core/PluginManager.cpp
index 7a2d3772e6c..813cec22752 100644
--- a/contrib/llvm/tools/lldb/source/Core/PluginManager.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/PluginManager.cpp
@@ -854,6 +854,111 @@ PluginManager::GetLanguageRuntimeCreateCallbackForPluginName (const ConstString
     return NULL;
 }
 
+#pragma mark SystemRuntime
+
+
+struct SystemRuntimeInstance
+{
+    SystemRuntimeInstance() :
+        name(),
+        description(),
+        create_callback(NULL)
+    {
+    }
+
+    ConstString name;
+    std::string description;
+    SystemRuntimeCreateInstance create_callback;
+};
+
+typedef std::vector<SystemRuntimeInstance> SystemRuntimeInstances;
+
+static Mutex &
+GetSystemRuntimeMutex ()
+{
+    static Mutex g_instances_mutex (Mutex::eMutexTypeRecursive);
+    return g_instances_mutex;
+}
+
+static SystemRuntimeInstances &
+GetSystemRuntimeInstances ()
+{
+    static SystemRuntimeInstances g_instances;
+    return g_instances;
+}
+
+bool
+PluginManager::RegisterPlugin
+(
+    const ConstString &name,
+    const char *description,
+    SystemRuntimeCreateInstance create_callback
+)
+{
+    if (create_callback)
+    {
+        SystemRuntimeInstance instance;
+        assert ((bool)name);
+        instance.name = name;
+        if (description && description[0])
+            instance.description = description;
+        instance.create_callback = create_callback;
+        Mutex::Locker locker (GetSystemRuntimeMutex ());
+        GetSystemRuntimeInstances ().push_back (instance);
+    }
+    return false;
+}
+
+bool
+PluginManager::UnregisterPlugin (SystemRuntimeCreateInstance create_callback)
+{
+    if (create_callback)
+    {
+        Mutex::Locker locker (GetSystemRuntimeMutex ());
+        SystemRuntimeInstances &instances = GetSystemRuntimeInstances ();
+        
+        SystemRuntimeInstances::iterator pos, end = instances.end();
+        for (pos = instances.begin(); pos != end; ++ pos)
+        {
+            if (pos->create_callback == create_callback)
+            {
+                instances.erase(pos);
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+SystemRuntimeCreateInstance
+PluginManager::GetSystemRuntimeCreateCallbackAtIndex (uint32_t idx)
+{
+    Mutex::Locker locker (GetSystemRuntimeMutex ());
+    SystemRuntimeInstances &instances = GetSystemRuntimeInstances ();
+    if (idx < instances.size())
+        return instances[idx].create_callback;
+    return NULL;
+}
+
+SystemRuntimeCreateInstance
+PluginManager::GetSystemRuntimeCreateCallbackForPluginName (const ConstString &name)
+{
+    if (name)
+    {
+        Mutex::Locker locker (GetSystemRuntimeMutex ());
+        SystemRuntimeInstances &instances = GetSystemRuntimeInstances ();
+        
+        SystemRuntimeInstances::iterator pos, end = instances.end();
+        for (pos = instances.begin(); pos != end; ++ pos)
+        {
+            if (name == pos->name)
+                return pos->create_callback;
+        }
+    }
+    return NULL;
+}
+
+
 #pragma mark ObjectFile
 
 struct ObjectFileInstance
diff --git a/contrib/llvm/tools/lldb/source/Core/SearchFilter.cpp b/contrib/llvm/tools/lldb/source/Core/SearchFilter.cpp
index 54937c0afec..64b5a838d3d 100644
--- a/contrib/llvm/tools/lldb/source/Core/SearchFilter.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/SearchFilter.cpp
@@ -361,7 +361,7 @@ bool
 SearchFilterByModule::ModulePasses (const FileSpec &spec)
 {
     // Do a full match only if "spec" has a directory
-    const bool full_match = spec.GetDirectory();
+    const bool full_match = (bool)spec.GetDirectory();
     return FileSpec::Equal(spec, m_module_spec, full_match);
 }
 
@@ -409,7 +409,7 @@ SearchFilterByModule::Search (Searcher &searcher)
     for (size_t i = 0; i < num_modules; i++)
     {
         Module* module = target_modules.GetModulePointerAtIndexUnlocked(i);
-        const bool full_match = m_module_spec.GetDirectory();
+        const bool full_match = (bool)m_module_spec.GetDirectory();
         if (FileSpec::Equal (m_module_spec, module->GetFileSpec(), full_match))
         {
             SymbolContext matchingContext(m_target_sp, module->shared_from_this());
diff --git a/contrib/llvm/tools/lldb/source/Core/SourceManager.cpp b/contrib/llvm/tools/lldb/source/Core/SourceManager.cpp
index 9f289348fd9..940034625c0 100644
--- a/contrib/llvm/tools/lldb/source/Core/SourceManager.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/SourceManager.cpp
@@ -567,15 +567,15 @@ SourceManager::File::CalculateLineOffsets (uint32_t line)
 
                 // Push a 1 at index zero to indicate the file has been completely indexed.
                 m_offsets.push_back(UINT32_MAX);
-                register const char *s;
+                const char *s;
                 for (s = start; s < end; ++s)
                 {
-                    register char curr_ch = *s;
+                    char curr_ch = *s;
                     if (is_newline_char (curr_ch))
                     {
                         if (s + 1 < end)
                         {
-                            register char next_ch = s[1];
+                            char next_ch = s[1];
                             if (is_newline_char (next_ch))
                             {
                                 if (curr_ch != next_ch)
diff --git a/contrib/llvm/tools/lldb/source/Core/StreamFile.cpp b/contrib/llvm/tools/lldb/source/Core/StreamFile.cpp
index 9a4eb796dbe..2285ca95445 100644
--- a/contrib/llvm/tools/lldb/source/Core/StreamFile.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/StreamFile.cpp
@@ -49,7 +49,7 @@ StreamFile::StreamFile (FILE *fh, bool transfer_ownership) :
 
 StreamFile::StreamFile (const char *path) :
     Stream (),
-    m_file (path, File::eOpenOptionWrite | File::eOpenOptionCanCreate, File::ePermissionsDefault)
+    m_file (path, File::eOpenOptionWrite | File::eOpenOptionCanCreate, lldb::eFilePermissionsFileDefault)
 {
 }
 
diff --git a/contrib/llvm/tools/lldb/source/Core/StreamGDBRemote.cpp b/contrib/llvm/tools/lldb/source/Core/StreamGDBRemote.cpp
new file mode 100644
index 00000000000..46cb99ce98a
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Core/StreamGDBRemote.cpp
@@ -0,0 +1,54 @@
+//===-- StreamGDBRemote.cpp -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Core/StreamGDBRemote.h"
+#include <stdio.h>
+
+using namespace lldb;
+using namespace lldb_private;
+
+StreamGDBRemote::StreamGDBRemote () :
+StreamString ()
+{
+}
+
+StreamGDBRemote::StreamGDBRemote(uint32_t flags, uint32_t addr_size, ByteOrder byte_order) :
+StreamString (flags, addr_size, byte_order)
+{
+}
+
+StreamGDBRemote::~StreamGDBRemote()
+{
+}
+
+
+int
+StreamGDBRemote::PutEscapedBytes (const void* s,
+                                  size_t src_len)
+{
+    int bytes_written = 0;
+    const uint8_t *src = (const uint8_t *)s;
+    bool binary_is_set = m_flags.Test(eBinary);
+    m_flags.Clear(eBinary);
+    while (src_len)
+    {
+        uint8_t byte = *src;
+        src++; src_len--;
+        if (byte == 0x23 || byte == 0x24 || byte == 0x7d || byte == 0x2a)
+        {
+            bytes_written += PutChar(0x7d);
+            byte ^= 0x20;
+        }
+        bytes_written += PutChar(byte);
+    };
+    if (binary_is_set)
+        m_flags.Set(eBinary);
+    return bytes_written;
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Core/Timer.cpp b/contrib/llvm/tools/lldb/source/Core/Timer.cpp
index b1416bdaf62..bbd990056ba 100644
--- a/contrib/llvm/tools/lldb/source/Core/Timer.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Timer.cpp
@@ -14,6 +14,7 @@
 
 #include "lldb/Core/Stream.h"
 #include "lldb/Host/Mutex.h"
+#include "lldb/Host/Host.h"
 
 #include <stdio.h>
 
@@ -26,7 +27,7 @@ uint32_t Timer::g_display_depth = 0;
 FILE * Timer::g_file = NULL;
 typedef std::vector<Timer *> TimerStack;
 typedef std::map<const char *, uint64_t> TimerCategoryMap;
-static pthread_key_t g_key;
+static lldb::thread_key_t g_key;
 
 static Mutex &
 GetCategoryMutex()
@@ -46,11 +47,11 @@ GetCategoryMap()
 static TimerStack *
 GetTimerStackForCurrentThread ()
 {
-    void *timer_stack = ::pthread_getspecific (g_key);
+    void *timer_stack = Host::ThreadLocalStorageGet(g_key);
     if (timer_stack == NULL)
     {
-        ::pthread_setspecific (g_key, new TimerStack);
-        timer_stack = ::pthread_getspecific (g_key);
+        Host::ThreadLocalStorageSet(g_key, new TimerStack);
+        timer_stack = Host::ThreadLocalStorageGet(g_key);
     }
     return (TimerStack *)timer_stack;
 }
@@ -71,8 +72,7 @@ void
 Timer::Initialize ()
 {
     Timer::g_file = stdout;
-    ::pthread_key_create (&g_key, ThreadSpecificCleanup);
-
+    g_key = Host::ThreadLocalStorageCreate(ThreadSpecificCleanup);
 }
 
 Timer::Timer (const char *category, const char *format, ...) :
diff --git a/contrib/llvm/tools/lldb/source/Core/Value.cpp b/contrib/llvm/tools/lldb/source/Core/Value.cpp
index 3fe75d3d4ce..9dd72c7546b 100644
--- a/contrib/llvm/tools/lldb/source/Core/Value.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/Value.cpp
@@ -339,16 +339,30 @@ Value::GetValueAsData (ExecutionContext *exe_ctx,
         break;
 
     case eValueTypeScalar:
-        data.SetByteOrder (lldb::endian::InlHostByteOrder());
-        if (ast_type.IsValid())
-            data.SetAddressByteSize (ast_type.GetPointerByteSize());
-        else
-            data.SetAddressByteSize(sizeof(void *));
-        if (m_value.GetData (data))
-            return error;   // Success;
-        error.SetErrorStringWithFormat("extracting data from value failed");
-        break;
+        {
+            data.SetByteOrder (lldb::endian::InlHostByteOrder());
+            if (ast_type.IsValid())
+                data.SetAddressByteSize (ast_type.GetPointerByteSize());
+            else
+                data.SetAddressByteSize(sizeof(void *));
 
+            uint32_t limit_byte_size = UINT32_MAX;
+            
+            if (ast_type.IsValid() && ast_type.IsScalarType())
+            {
+                uint64_t type_encoding_count = 0;
+                lldb::Encoding type_encoding = ast_type.GetEncoding(type_encoding_count);
+                
+                if (type_encoding == eEncodingUint || type_encoding == eEncodingSint)
+                    limit_byte_size = ast_type.GetByteSize();
+            }
+            
+            if (m_value.GetData (data, limit_byte_size))
+                return error;   // Success;
+            
+            error.SetErrorStringWithFormat("extracting data from value failed");
+            break;
+        }
     case eValueTypeLoadAddress:
         if (exe_ctx == NULL)
         {
diff --git a/contrib/llvm/tools/lldb/source/Core/ValueObject.cpp b/contrib/llvm/tools/lldb/source/Core/ValueObject.cpp
index a30cc1306c6..d39d21a2a0b 100644
--- a/contrib/llvm/tools/lldb/source/Core/ValueObject.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ValueObject.cpp
@@ -34,6 +34,7 @@
 #include "lldb/Core/ValueObjectSyntheticFilter.h"
 
 #include "lldb/DataFormatters/DataVisualization.h"
+#include "lldb/DataFormatters/ValueObjectPrinter.h"
 
 #include "lldb/Host/Endian.h"
 
@@ -170,13 +171,12 @@ ValueObject::UpdateValueIfNeeded (bool update_format)
     // we have an error or not
     if (GetIsConstant())
     {
-        // if you were asked to update your formatters, but did not get a chance to do it
-        // clear your own values (this serves the purpose of faking a stop-id for frozen
-        // objects (which are regarded as constant, but could have changes behind their backs
-        // because of the frozen-pointer depth limit)
-		// TODO: decouple summary from value and then remove this code and only force-clear the summary
+        // if you are constant, things might still have changed behind your back
+        // (e.g. you are a frozen object and things have changed deeper than you cared to freeze-dry yourself)
+        // in this case, your value has not changed, but "computed" entries might have, so you might now have
+        // a different summary, or a different object description. clear these so we will recompute them
         if (update_format && !did_change_formats)
-            ClearUserVisibleData(eClearUserVisibleDataItemsSummary);
+            ClearUserVisibleData(eClearUserVisibleDataItemsSummary | eClearUserVisibleDataItemsDescription);
         return m_error.Success();
     }
 
@@ -245,7 +245,7 @@ ValueObject::UpdateFormatsIfNeeded()
     
     if ( (m_last_format_mgr_revision != DataVisualization::GetCurrentRevision()))
     {
-        SetValueFormat(DataVisualization::ValueFormats::GetFormat (*this, eNoDynamicValues));
+        SetValueFormat(DataVisualization::GetFormat (*this, eNoDynamicValues));
         SetSummaryFormat(DataVisualization::GetSummaryFormat (*this, GetDynamicValueType()));
 #ifndef LLDB_DISABLE_PYTHON
         SetSyntheticChildren(DataVisualization::GetSyntheticChildren (*this, GetDynamicValueType()));
@@ -272,6 +272,7 @@ ValueObject::SetNeedsUpdate ()
 void
 ValueObject::ClearDynamicTypeInformation ()
 {
+    m_children_count_valid = false;
     m_did_calculate_complete_objc_class_type = false;
     m_last_format_mgr_revision = 0;
     m_override_type = ClangASTType();
@@ -359,6 +360,12 @@ ValueObject::GetClangType ()
     return MaybeCalculateCompleteType();
 }
 
+TypeImpl
+ValueObject::GetTypeImpl ()
+{
+    return TypeImpl(GetClangType());
+}
+
 DataExtractor &
 ValueObject::GetDataExtractor ()
 {
@@ -595,6 +602,86 @@ ValueObject::GetChildAtIndexPath (const std::vector< std::pair<size_t, bool> > &
     return root;
 }
 
+lldb::ValueObjectSP
+ValueObject::GetChildAtNamePath (const std::initializer_list<ConstString> &names,
+                                 ConstString* name_of_error)
+{
+    if (names.size() == 0)
+        return GetSP();
+    ValueObjectSP root(GetSP());
+    for (ConstString name : names)
+    {
+        root = root->GetChildMemberWithName(name, true);
+        if (!root)
+        {
+            if (name_of_error)
+                *name_of_error = name;
+            return root;
+        }
+    }
+    return root;
+}
+
+lldb::ValueObjectSP
+ValueObject::GetChildAtNamePath (const std::vector<ConstString> &names,
+                                 ConstString* name_of_error)
+{
+    if (names.size() == 0)
+        return GetSP();
+    ValueObjectSP root(GetSP());
+    for (ConstString name : names)
+    {
+        root = root->GetChildMemberWithName(name, true);
+        if (!root)
+        {
+            if (name_of_error)
+                *name_of_error = name;
+            return root;
+        }
+    }
+    return root;
+}
+
+lldb::ValueObjectSP
+ValueObject::GetChildAtNamePath (const std::initializer_list< std::pair<ConstString, bool> > &names,
+                                 ConstString* name_of_error)
+{
+    if (names.size() == 0)
+        return GetSP();
+    ValueObjectSP root(GetSP());
+    for (std::pair<ConstString, bool> name : names)
+    {
+        root = root->GetChildMemberWithName(name.first, name.second);
+        if (!root)
+        {
+            if (name_of_error)
+                *name_of_error = name.first;
+            return root;
+        }
+    }
+    return root;
+}
+
+lldb::ValueObjectSP
+ValueObject::GetChildAtNamePath (const std::vector< std::pair<ConstString, bool> > &names,
+                                 ConstString* name_of_error)
+{
+    if (names.size() == 0)
+        return GetSP();
+        ValueObjectSP root(GetSP());
+        for (std::pair<ConstString, bool> name : names)
+        {
+            root = root->GetChildMemberWithName(name.first, name.second);
+            if (!root)
+            {
+                if (name_of_error)
+                    *name_of_error = name.first;
+                    return root;
+            }
+        }
+    return root;
+}
+
 size_t
 ValueObject::GetIndexOfChildWithName (const ConstString &name)
 {
@@ -943,7 +1030,7 @@ ValueObject::GetPointeeData (DataExtractor& data,
                     {
                         heap_buf_ptr->SetByteSize(bytes);
                         size_t bytes_read = process->ReadMemory(addr + offset, heap_buf_ptr->GetBytes(), bytes, error);
-                        if (error.Success())
+                        if (error.Success() || bytes_read > 0)
                         {
                             data.SetData(data_sp);
                             return bytes_read;
@@ -1455,6 +1542,27 @@ ValueObject::GetValueAsUnsigned (uint64_t fail_value, bool *success)
     return fail_value;
 }
 
+int64_t
+ValueObject::GetValueAsSigned (int64_t fail_value, bool *success)
+{
+    // If our byte size is zero this is an aggregate type that has children
+    if (!GetClangType().IsAggregateType())
+    {
+        Scalar scalar;
+        if (ResolveValue (scalar))
+        {
+            if (success)
+                *success = true;
+                return scalar.SLongLong(fail_value);
+        }
+        // fallthrough, otherwise...
+    }
+    
+    if (success)
+        *success = false;
+        return fail_value;
+}
+
 // if any more "special cases" are added to ValueObject::DumpPrintableRepresentation() please keep
 // this call up to date by returning true for your new special cases. We will eventually move
 // to checking this call result before trying to display special cases
@@ -2211,7 +2319,7 @@ ValueObject::CalculateSyntheticValue (bool use_synthetic)
         return;
     
     TargetSP target_sp(GetTargetSP());
-    if (target_sp && (target_sp->GetEnableSyntheticValue() == false || target_sp->GetSuppressSyntheticValue() == true))
+    if (target_sp && target_sp->GetEnableSyntheticValue() == false)
     {
         m_synthetic_value = NULL;
         return;
@@ -3342,329 +3450,39 @@ ValueObject::ExpandArraySliceExpression(const char* expression_cstr,
     }
 }
 
-static void
-DumpValueObject_Impl (Stream &s,
-                      ValueObject *valobj,
-                      const ValueObject::DumpValueObjectOptions& options,
-                      uint32_t ptr_depth,
-                      uint32_t curr_depth)
+void
+ValueObject::LogValueObject (Log *log)
 {
-    if (valobj)
-    {
-        bool update_success = valobj->UpdateValueIfNeeded (true);
-
-        const char *root_valobj_name = 
-            options.m_root_valobj_name.empty() ? 
-                valobj->GetName().AsCString() :
-                options.m_root_valobj_name.c_str();
-        
-        if (update_success && options.m_use_dynamic != eNoDynamicValues)
-        {
-            ValueObject *dynamic_value = valobj->GetDynamicValue(options.m_use_dynamic).get();
-            if (dynamic_value)
-                valobj = dynamic_value;
-        }
-        
-        ClangASTType clang_type = valobj->GetClangType();
-        const Flags type_flags (clang_type.GetTypeInfo ());
-        const char *err_cstr = NULL;
-        const bool has_children = type_flags.Test (ClangASTType::eTypeHasChildren);
-        const bool has_value = type_flags.Test (ClangASTType::eTypeHasValue);
-        
-        const bool print_valobj = options.m_flat_output == false || has_value;
-        
-        if (print_valobj)
-        {
-            if (options.m_show_location)
-            {
-                s.Printf("%s: ", valobj->GetLocationAsCString());
-            }
-
-            s.Indent();
-            
-            bool show_type = true;
-            // if we are at the root-level and been asked to hide the root's type, then hide it
-            if (curr_depth == 0 && options.m_hide_root_type)
-                show_type = false;
-            else
-            // otherwise decide according to the usual rules (asked to show types - always at the root level)
-                show_type = options.m_show_types || (curr_depth == 0 && !options.m_flat_output);
-            
-            if (show_type)
-            {
-                // Some ValueObjects don't have types (like registers sets). Only print
-                // the type if there is one to print
-                ConstString qualified_type_name(valobj->GetQualifiedTypeName());
-                if (qualified_type_name)
-                    s.Printf("(%s) ", qualified_type_name.GetCString());
-            }
-
-            if (options.m_flat_output)
-            {
-                // If we are showing types, also qualify the C++ base classes 
-                const bool qualify_cxx_base_classes = options.m_show_types;
-                if (!options.m_hide_name)
-                {
-                    valobj->GetExpressionPath(s, qualify_cxx_base_classes);
-                    s.PutCString(" =");
-                }
-            }
-            else if (!options.m_hide_name)
-            {
-                const char *name_cstr = root_valobj_name ? root_valobj_name : valobj->GetName().AsCString("");
-                s.Printf ("%s =", name_cstr);
-            }
-
-            if (!options.m_scope_already_checked && !valobj->IsInScope())
-            {
-                err_cstr = "out of scope";
-            }
-        }
-        
-        std::string summary_str;
-        std::string value_str;
-        const char *val_cstr = NULL;
-        const char *sum_cstr = NULL;
-        TypeSummaryImpl* entry = options.m_summary_sp ? options.m_summary_sp.get() : valobj->GetSummaryFormat().get();
-        
-        if (options.m_omit_summary_depth > 0)
-            entry = NULL;
-        
-        bool is_nil = valobj->IsObjCNil();
-        
-        if (err_cstr == NULL)
-        {
-            if (options.m_format != eFormatDefault && options.m_format != valobj->GetFormat())
-            {
-                valobj->GetValueAsCString(options.m_format,
-                                          value_str);
-            }
-            else
-            {
-                val_cstr = valobj->GetValueAsCString();
-                if (val_cstr)
-                    value_str = val_cstr;
-            }
-            err_cstr = valobj->GetError().AsCString();
-        }
-
-        if (err_cstr)
-        {
-            s.Printf (" <%s>\n", err_cstr);
-        }
-        else
-        {
-            const bool is_ref = type_flags.Test (ClangASTType::eTypeIsReference);
-            if (print_valobj)
-            {
-                if (is_nil)
-                    sum_cstr = "nil";
-                else if (options.m_omit_summary_depth == 0)
-                {
-                    if (options.m_summary_sp)
-                    {
-                        valobj->GetSummaryAsCString(entry, summary_str);
-                        sum_cstr = summary_str.c_str();
-                    }
-                    else
-                        sum_cstr = valobj->GetSummaryAsCString();
-                }
-
-                // Make sure we have a value and make sure the summary didn't
-                // specify that the value should not be printed - and do not print
-                // the value if this thing is nil
-                // (but show the value if the user passes a format explicitly)
-                if (!is_nil && !value_str.empty() && (entry == NULL || (entry->DoesPrintValue() || options.m_format != eFormatDefault) || sum_cstr == NULL) && !options.m_hide_value)
-                    s.Printf(" %s", value_str.c_str());
-
-                if (sum_cstr)
-                    s.Printf(" %s", sum_cstr);
-                
-                // let's avoid the overly verbose no description error for a nil thing
-                if (options.m_use_objc && !is_nil)
-                {
-                    if (!options.m_hide_value || !options.m_hide_name)
-                        s.Printf(" ");
-                    const char *object_desc = valobj->GetObjectDescription();
-                    if (object_desc)
-                        s.Printf("%s\n", object_desc);
-                    else
-                        s.Printf ("[no Objective-C description available]\n");
-                    return;
-                }
-            }
-
-            if (curr_depth < options.m_max_depth)
-            {
-                // We will show children for all concrete types. We won't show
-                // pointer contents unless a pointer depth has been specified.
-                // We won't reference contents unless the reference is the 
-                // root object (depth of zero).
-                bool print_children = true;
-
-                // Use a new temporary pointer depth in case we override the
-                // current pointer depth below...
-                uint32_t curr_ptr_depth = ptr_depth;
-
-                const bool is_ptr = type_flags.Test (ClangASTType::eTypeIsPointer);
-                if (is_ptr || is_ref)
-                {
-                    // We have a pointer or reference whose value is an address.
-                    // Make sure that address is not NULL
-                    AddressType ptr_address_type;
-                    if (valobj->GetPointerValue (&ptr_address_type) == 0)
-                        print_children = false;
-
-                    else if (is_ref && curr_depth == 0)
-                    {
-                        // If this is the root object (depth is zero) that we are showing
-                        // and it is a reference, and no pointer depth has been supplied
-                        // print out what it references. Don't do this at deeper depths
-                        // otherwise we can end up with infinite recursion...
-                        curr_ptr_depth = 1;
-                    }
-                    
-                    if (curr_ptr_depth == 0)
-                        print_children = false;
-                }
-                
-                if (print_children && (!entry || entry->DoesPrintChildren() || !sum_cstr))
-                {
-                    ValueObjectSP synth_valobj_sp = valobj->GetSyntheticValue (options.m_use_synthetic);
-                    ValueObject* synth_valobj = (synth_valobj_sp ? synth_valobj_sp.get() : valobj);
-                    
-                    size_t num_children = synth_valobj->GetNumChildren();
-                    bool print_dotdotdot = false;
-                    if (num_children)
-                    {
-                        if (options.m_flat_output)
-                        {
-                            if (print_valobj)
-                                s.EOL();
-                        }
-                        else
-                        {
-                            if (print_valobj)
-                                s.PutCString(is_ref ? ": {\n" : " {\n");
-                            s.IndentMore();
-                        }
-                        
-                        const size_t max_num_children = valobj->GetTargetSP()->GetMaximumNumberOfChildrenToDisplay();
-                        
-                        if (num_children > max_num_children && !options.m_ignore_cap)
-                        {
-                            num_children = max_num_children;
-                            print_dotdotdot = true;
-                        }
-
-                        ValueObject::DumpValueObjectOptions child_options(options);
-                        child_options.SetFormat(options.m_format).SetSummary().SetRootValueObjectName();
-                        child_options.SetScopeChecked(true).SetHideName(options.m_hide_name).SetHideValue(options.m_hide_value)
-                        .SetOmitSummaryDepth(child_options.m_omit_summary_depth > 1 ? child_options.m_omit_summary_depth - 1 : 0);
-                        for (size_t idx=0; idx<num_children; ++idx)
-                        {
-                            ValueObjectSP child_sp(synth_valobj->GetChildAtIndex(idx, true));
-                            if (child_sp.get())
-                            {
-                                DumpValueObject_Impl (s,
-                                                      child_sp.get(),
-                                                      child_options,
-                                                      (is_ptr || is_ref) ? curr_ptr_depth - 1 : curr_ptr_depth,
-                                                      curr_depth + 1);
-                            }
-                        }
-
-                        if (!options.m_flat_output)
-                        {
-                            if (print_dotdotdot)
-                            {
-                                ExecutionContext exe_ctx (valobj->GetExecutionContextRef());
-                                Target *target = exe_ctx.GetTargetPtr();
-                                if (target)
-                                    target->GetDebugger().GetCommandInterpreter().ChildrenTruncated();
-                                s.Indent("...\n");
-                            }
-                            s.IndentLess();
-                            s.Indent("}\n");
-                        }
-                    }
-                    else if (has_children)
-                    {
-                        // Aggregate, no children...
-                        if (print_valobj)
-                            s.PutCString(" {}\n");
-                    }
-                    else
-                    {
-                        if (print_valobj)
-                            s.EOL();
-                    }
-
-                }
-                else
-                {  
-                    s.EOL();
-                }
-            }
-            else
-            {
-                if (has_children && print_valobj)
-                {
-                    s.PutCString("{...}\n");
-                }
-            }
-        }
-    }
+    if (log)
+        return LogValueObject (log, DumpValueObjectOptions::DefaultOptions());
 }
 
 void
-ValueObject::LogValueObject (Log *log,
-                             ValueObject *valobj)
+ValueObject::LogValueObject (Log *log, const DumpValueObjectOptions& options)
 {
-    if (log && valobj)
-        return LogValueObject (log, valobj, DumpValueObjectOptions::DefaultOptions());
-}
-
-void
-ValueObject::LogValueObject (Log *log,
-                             ValueObject *valobj,
-                             const DumpValueObjectOptions& options)
-{
-    if (log && valobj)
+    if (log)
     {
         StreamString s;
-        ValueObject::DumpValueObject (s, valobj, options);
+        Dump (s, options);
         if (s.GetSize())
             log->PutCString(s.GetData());
     }
 }
 
 void
-ValueObject::DumpValueObject (Stream &s,
-                              ValueObject *valobj)
+ValueObject::Dump (Stream &s)
 {
     
-    if (!valobj)
-        return;
-    
-    DumpValueObject_Impl(s,
-                         valobj,
-                         DumpValueObjectOptions::DefaultOptions(),
-                         0,
-                         0);
+    ValueObjectPrinter printer(this,&s,DumpValueObjectOptions::DefaultOptions());
+    printer.PrintValueObject();
 }
 
 void
-ValueObject::DumpValueObject (Stream &s,
-                              ValueObject *valobj,
-                              const DumpValueObjectOptions& options)
+ValueObject::Dump (Stream &s,
+                   const DumpValueObjectOptions& options)
 {
-    DumpValueObject_Impl(s,
-                         valobj,
-                         options,
-                         options.m_max_ptr_depth, // max pointer depth allowed, we will go down from here
-                         0 // current object depth is 0 since we are just starting
-                         );
+    ValueObjectPrinter printer(this,&s,options);
+    printer.PrintValueObject();
 }
 
 ValueObjectSP
diff --git a/contrib/llvm/tools/lldb/source/Core/ValueObjectDynamicValue.cpp b/contrib/llvm/tools/lldb/source/Core/ValueObjectDynamicValue.cpp
index 977cc4cd313..47e781e7115 100644
--- a/contrib/llvm/tools/lldb/source/Core/ValueObjectDynamicValue.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ValueObjectDynamicValue.cpp
@@ -52,10 +52,15 @@ ValueObjectDynamicValue::~ValueObjectDynamicValue()
 ClangASTType
 ValueObjectDynamicValue::GetClangTypeImpl ()
 {
-    if (m_dynamic_type_info.HasTypeSP())
-        return m_value.GetClangType();
-    else
-        return m_parent->GetClangType();
+    const bool success = UpdateValueIfNeeded(false);
+    if (success)
+    {
+        if (m_dynamic_type_info.HasType())
+            return m_value.GetClangType();
+        else
+            return m_parent->GetClangType();
+    }
+    return m_parent->GetClangType();
 }
 
 ConstString
@@ -64,24 +69,35 @@ ValueObjectDynamicValue::GetTypeName()
     const bool success = UpdateValueIfNeeded(false);
     if (success)
     {
-        if (m_dynamic_type_info.HasTypeSP())
-            return GetClangType().GetConstTypeName();
         if (m_dynamic_type_info.HasName())
             return m_dynamic_type_info.GetName();
+        if (m_dynamic_type_info.HasType())
+            return GetClangType().GetConstTypeName();
     }
     return m_parent->GetTypeName();
 }
 
+TypeImpl
+ValueObjectDynamicValue::GetTypeImpl ()
+{
+    const bool success = UpdateValueIfNeeded(false);
+    if (success && m_type_impl.IsValid())
+    {
+        return m_type_impl;
+    }
+    return m_parent->GetTypeImpl();
+}
+
 ConstString
 ValueObjectDynamicValue::GetQualifiedTypeName()
 {
     const bool success = UpdateValueIfNeeded(false);
     if (success)
     {
-        if (m_dynamic_type_info.HasTypeSP())
-            return GetClangType().GetConstQualifiedTypeName ();
         if (m_dynamic_type_info.HasName())
             return m_dynamic_type_info.GetName();
+        if (m_dynamic_type_info.HasType())
+            return GetClangType().GetConstQualifiedTypeName ();
     }
     return m_parent->GetTypeName();
 }
@@ -90,7 +106,7 @@ size_t
 ValueObjectDynamicValue::CalculateNumChildren()
 {
     const bool success = UpdateValueIfNeeded(false);
-    if (success && m_dynamic_type_info.HasTypeSP())
+    if (success && m_dynamic_type_info.HasType())
         return GetClangType().GetNumChildren (true);
     else
         return m_parent->GetNumChildren();
@@ -100,7 +116,7 @@ uint64_t
 ValueObjectDynamicValue::GetByteSize()
 {
     const bool success = UpdateValueIfNeeded(false);
-    if (success && m_dynamic_type_info.HasTypeSP())
+    if (success && m_dynamic_type_info.HasType())
         return m_value.GetValueByteSize(NULL);
     else
         return m_parent->GetByteSize();
@@ -112,6 +128,40 @@ ValueObjectDynamicValue::GetValueType() const
     return m_parent->GetValueType();
 }
 
+
+static TypeAndOrName
+FixupTypeAndOrName (const TypeAndOrName& type_andor_name,
+                    ValueObject& parent)
+{
+    TypeAndOrName ret(type_andor_name);
+    if (type_andor_name.HasType())
+    {
+        // The type will always be the type of the dynamic object.  If our parent's type was a pointer,
+        // then our type should be a pointer to the type of the dynamic object.  If a reference, then the original type
+        // should be okay...
+        ClangASTType orig_type = type_andor_name.GetClangASTType();
+        ClangASTType corrected_type = orig_type;
+        if (parent.IsPointerType())
+            corrected_type = orig_type.GetPointerType ();
+        else if (parent.IsPointerOrReferenceType())
+            corrected_type = orig_type.GetLValueReferenceType ();
+        ret.SetClangASTType(corrected_type);
+    }
+    else /*if (m_dynamic_type_info.HasName())*/
+    {
+        // If we are here we need to adjust our dynamic type name to include the correct & or * symbol
+        std::string corrected_name (type_andor_name.GetName().GetCString());
+        if (parent.IsPointerType())
+            corrected_name.append(" *");
+        else if (parent.IsPointerOrReferenceType())
+            corrected_name.append(" &");
+        // the parent type should be a correctly pointer'ed or referenc'ed type
+        ret.SetClangASTType(parent.GetClangType());
+        ret.SetName(corrected_name.c_str());
+    }
+    return ret;
+}
+
 bool
 ValueObjectDynamicValue::UpdateValue ()
 {
@@ -176,6 +226,31 @@ ValueObjectDynamicValue::UpdateValue ()
     // don't...
     
     m_update_point.SetUpdated();
+
+    if (found_dynamic_type)
+    {
+        if (class_type_or_name.HasType())
+        {
+            // TypeSP are always generated from debug info
+            if (!class_type_or_name.HasTypeSP() && class_type_or_name.GetClangASTType().IsRuntimeGeneratedType())
+            {
+                m_type_impl = TypeImpl(m_parent->GetClangType(),FixupTypeAndOrName(class_type_or_name, *m_parent).GetClangASTType());
+                class_type_or_name.SetClangASTType(ClangASTType());
+            }
+            else
+            {
+                m_type_impl = TypeImpl(FixupTypeAndOrName(class_type_or_name, *m_parent).GetClangASTType());
+            }
+        }
+        else
+        {
+            m_type_impl.Clear();
+        }
+    }
+    else
+    {
+        m_type_impl.Clear();
+    }
     
     // If we don't have a dynamic type, then make ourselves just a echo of our parent.
     // Or we could return false, and make ourselves an echo of our parent?
@@ -224,33 +299,10 @@ ValueObjectDynamicValue::UpdateValue ()
         m_value.GetScalar() = load_address;
     }
     
-    ClangASTType corrected_type;
-    if (m_dynamic_type_info.HasTypeSP())
-    {
-        // The type will always be the type of the dynamic object.  If our parent's type was a pointer,
-        // then our type should be a pointer to the type of the dynamic object.  If a reference, then the original type
-        // should be okay...
-        ClangASTType orig_type = m_dynamic_type_info.GetTypeSP()->GetClangForwardType();
-        corrected_type = orig_type;
-        if (m_parent->IsPointerType())
-            corrected_type = orig_type.GetPointerType ();
-        else if (m_parent->IsPointerOrReferenceType())
-            corrected_type = orig_type.GetLValueReferenceType ();
-    }
-    else /*if (m_dynamic_type_info.HasName())*/
-    {
-        // If we are here we need to adjust our dynamic type name to include the correct & or * symbol
-        std::string type_name_buf (m_dynamic_type_info.GetName().GetCString());
-        if (m_parent->IsPointerType())
-            type_name_buf.append(" *");
-        else if (m_parent->IsPointerOrReferenceType())
-            type_name_buf.append(" &");
-        corrected_type = m_parent->GetClangType();
-        m_dynamic_type_info.SetName(type_name_buf.c_str());
-    }
+    m_dynamic_type_info = FixupTypeAndOrName(m_dynamic_type_info, *m_parent);
     
     //m_value.SetContext (Value::eContextTypeClangType, corrected_type);
-    m_value.SetClangType (corrected_type);
+    m_value.SetClangType (m_dynamic_type_info.GetClangASTType());
     
     // Our address is the location of the dynamic type stored in memory.  It isn't a load address,
     // because we aren't pointing to the LOCATION that stores the pointer to us, we're pointing to us...
diff --git a/contrib/llvm/tools/lldb/source/Core/ValueObjectSyntheticFilter.cpp b/contrib/llvm/tools/lldb/source/Core/ValueObjectSyntheticFilter.cpp
index 522ca082a69..a65b8f63e31 100644
--- a/contrib/llvm/tools/lldb/source/Core/ValueObjectSyntheticFilter.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ValueObjectSyntheticFilter.cpp
@@ -16,7 +16,7 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/ValueObject.h"
-#include "lldb/DataFormatters/FormatClasses.h"
+#include "lldb/DataFormatters/TypeSynthetic.h"
 
 using namespace lldb_private;
 
@@ -30,19 +30,19 @@ public:
     size_t
     CalculateNumChildren()
     {
-        return 0;
+        return m_backend.GetNumChildren();
     }
     
     lldb::ValueObjectSP
     GetChildAtIndex (size_t idx)
     {
-        return lldb::ValueObjectSP();
+        return m_backend.GetChildAtIndex(idx, true);
     }
     
     size_t
     GetIndexOfChildWithName (const ConstString &name)
     {
-        return UINT32_MAX;
+        return m_backend.GetIndexOfChildWithName(name);
     }
     
     bool
diff --git a/contrib/llvm/tools/lldb/source/Core/ValueObjectVariable.cpp b/contrib/llvm/tools/lldb/source/Core/ValueObjectVariable.cpp
index 38c0d91324a..3d8b07a3694 100644
--- a/contrib/llvm/tools/lldb/source/Core/ValueObjectVariable.cpp
+++ b/contrib/llvm/tools/lldb/source/Core/ValueObjectVariable.cpp
@@ -156,6 +156,10 @@ ValueObjectVariable::UpdateValue ()
         {
             m_resolved_value = m_value;
             m_value.SetContext(Value::eContextTypeVariable, variable);
+            
+            ClangASTType clang_type = GetClangType();
+            if (clang_type.IsValid())
+                m_value.SetClangType(clang_type);
 
             Value::ValueType value_type = m_value.GetValueType();
             
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/CXXFormatterFunctions.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
index fba92170d83..136c8c51e66 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/CXXFormatterFunctions.cpp
@@ -49,9 +49,9 @@ lldb_private::formatters::ExtractValueFromObjCExpression (ValueObject &valobj,
         return false;
     
     EvaluateExpressionOptions options;
-    options.SetCoerceToId(false)
-    .SetUnwindOnError(true)
-    .SetKeepInMemory(true);
+    options.SetCoerceToId(false);
+    options.SetUnwindOnError(true);
+    options.SetKeepInMemory(true);
     
     target->EvaluateExpression(expr.GetData(),
                                stack_frame,
@@ -83,10 +83,10 @@ lldb_private::formatters::ExtractSummaryFromObjCExpression (ValueObject &valobj,
         return false;
     
     EvaluateExpressionOptions options;
-    options.SetCoerceToId(false)
-    .SetUnwindOnError(true)
-    .SetKeepInMemory(true)
-    .SetUseDynamic(lldb::eDynamicCanRunTarget);
+    options.SetCoerceToId(false);
+    options.SetUnwindOnError(true);
+    options.SetKeepInMemory(true);
+    options.SetUseDynamic(lldb::eDynamicCanRunTarget);
     
     target->EvaluateExpression(expr.GetData(),
                                stack_frame,
@@ -121,10 +121,10 @@ lldb_private::formatters::CallSelectorOnObject (ValueObject &valobj,
         return valobj_sp;
     
     EvaluateExpressionOptions options;
-    options.SetCoerceToId(false)
-    .SetUnwindOnError(true)
-    .SetKeepInMemory(true)
-    .SetUseDynamic(lldb::eDynamicCanRunTarget);
+    options.SetCoerceToId(false);
+    options.SetUnwindOnError(true);
+    options.SetKeepInMemory(true);
+    options.SetUseDynamic(lldb::eDynamicCanRunTarget);
     
     target->EvaluateExpression(expr.GetData(),
                                stack_frame,
@@ -158,10 +158,10 @@ lldb_private::formatters::CallSelectorOnObject (ValueObject &valobj,
         return valobj_sp;
     
     EvaluateExpressionOptions options;
-    options.SetCoerceToId(false)
-    .SetUnwindOnError(true)
-    .SetKeepInMemory(true)
-    .SetUseDynamic(lldb::eDynamicCanRunTarget);
+    options.SetCoerceToId(false);
+    options.SetUnwindOnError(true);
+    options.SetKeepInMemory(true);
+    options.SetUseDynamic(lldb::eDynamicCanRunTarget);
     
     target->EvaluateExpression(expr.GetData(),
                                stack_frame,
@@ -1003,11 +1003,11 @@ lldb_private::formatters::NSStringSummaryProvider (ValueObject& valobj, Stream&
     if (!has_null && has_explicit_length && !is_special)
     {
         lldb::addr_t explicit_length_offset = 2*ptr_size;
-        if (is_mutable and not is_inline)
+        if (is_mutable && !is_inline)
             explicit_length_offset = explicit_length_offset + ptr_size; //  notInlineMutable.length;
         else if (is_inline)
             explicit_length = explicit_length + 0; // inline1.length;
-        else if (not is_inline and not is_mutable)
+        else if (!is_inline && !is_mutable)
             explicit_length_offset = explicit_length_offset + ptr_size; // notInlineImmutable1.length;
         else
             explicit_length_offset = 0;
@@ -1039,7 +1039,7 @@ lldb_private::formatters::NSStringSummaryProvider (ValueObject& valobj, Stream&
         location = process_sp->ReadPointerFromMemory(location, error);
         if (error.Fail())
             return false;
-        if (has_explicit_length and is_unicode)
+        if (has_explicit_length && is_unicode)
         {
             ReadUTFBufferAndDumpToStreamOptions<UTF16> options;
             options.SetConversionFunction(ConvertUTF16toUTF8);
@@ -1237,6 +1237,7 @@ lldb_private::formatters::GetOSXEpoch ()
     static time_t epoch = 0;
     if (!epoch)
     {
+#ifndef _WIN32
         tzset();
         tm tm_epoch;
         tm_epoch.tm_sec = 0;
@@ -1249,6 +1250,7 @@ lldb_private::formatters::GetOSXEpoch ()
         tm_epoch.tm_gmtoff = 0;
         tm_epoch.tm_zone = NULL;
         epoch = timegm(&tm_epoch);
+#endif
     }
     return epoch;
 }
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/DataVisualization.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/DataVisualization.cpp
index c1ef359049b..48d3517750a 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/DataVisualization.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/DataVisualization.cpp
@@ -40,67 +40,26 @@ DataVisualization::GetCurrentRevision ()
     return GetFormatManager().GetCurrentRevision();
 }
 
-lldb::TypeFormatImplSP
-DataVisualization::ValueFormats::GetFormat (ValueObject& valobj, lldb::DynamicValueType use_dynamic)
-{
-    lldb::TypeFormatImplSP entry;
-    GetFormatManager().GetValueNavigator().Get(valobj, entry, use_dynamic);
-    return entry;
-}
-
-lldb::TypeFormatImplSP
-DataVisualization::ValueFormats::GetFormat (const ConstString &type)
-{
-    lldb::TypeFormatImplSP entry;
-    GetFormatManager().GetValueNavigator().Get(type, entry);
-    return entry;
-}
-
-void
-DataVisualization::ValueFormats::Add (const ConstString &type, const lldb::TypeFormatImplSP &entry)
-{
-    GetFormatManager().GetValueNavigator().Add(FormatManager::GetValidTypeName(type),entry);
-}
-
 bool
-DataVisualization::ValueFormats::Delete (const ConstString &type)
+DataVisualization::ShouldPrintAsOneLiner (ValueObject& valobj)
 {
-    return GetFormatManager().GetValueNavigator().Delete(type);
-}
-
-void
-DataVisualization::ValueFormats::Clear ()
-{
-    GetFormatManager().GetValueNavigator().Clear();
-}
-
-void
-DataVisualization::ValueFormats::LoopThrough (TypeFormatImpl::ValueCallback callback, void* callback_baton)
-{
-    GetFormatManager().GetValueNavigator().LoopThrough(callback, callback_baton);
-}
-
-size_t
-DataVisualization::ValueFormats::GetCount ()
-{
-    return GetFormatManager().GetValueNavigator().GetCount();
-}
-
-lldb::TypeNameSpecifierImplSP
-DataVisualization::ValueFormats::GetTypeNameSpecifierForFormatAtIndex (size_t index)
-{
-    return GetFormatManager().GetValueNavigator().GetTypeNameSpecifierAtIndex(index);
+    return GetFormatManager().ShouldPrintAsOneLiner(valobj);
 }
 
 lldb::TypeFormatImplSP
-DataVisualization::ValueFormats::GetFormatAtIndex (size_t index)
+DataVisualization::GetFormat (ValueObject& valobj, lldb::DynamicValueType use_dynamic)
 {
-    return GetFormatManager().GetValueNavigator().GetAtIndex(index);
+    return GetFormatManager().GetFormat(valobj, use_dynamic);
+}
+
+lldb::TypeFormatImplSP
+DataVisualization::GetFormatForType (lldb::TypeNameSpecifierImplSP type_sp)
+{
+    return GetFormatManager().GetFormatForType(type_sp);
 }
 
 lldb::TypeSummaryImplSP
-DataVisualization::GetSummaryFormat (ValueObject& valobj,
-                                     lldb::DynamicValueType use_dynamic)
+DataVisualization::GetSummaryFormat (ValueObject& valobj, lldb::DynamicValueType use_dynamic)
 {
     return GetFormatManager().GetSummaryFormat(valobj, use_dynamic);
 }
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/FormatCache.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/FormatCache.cpp
index af7b1c386c3..3721f182f91 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/FormatCache.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/FormatCache.cpp
@@ -22,32 +22,54 @@ using namespace lldb;
 using namespace lldb_private;
 
 FormatCache::Entry::Entry () :
+m_format_cached(false),
 m_summary_cached(false),
 m_synthetic_cached(false),
+m_format_sp(),
 m_summary_sp(),
 m_synthetic_sp()
 {}
 
-FormatCache::Entry::Entry (lldb::TypeSummaryImplSP summary_sp) :
+FormatCache::Entry::Entry (lldb::TypeFormatImplSP format_sp) :
+m_summary_cached(false),
 m_synthetic_cached(false),
+m_summary_sp(),
+m_synthetic_sp()
+{
+    SetFormat (format_sp);
+}
+
+FormatCache::Entry::Entry (lldb::TypeSummaryImplSP summary_sp) :
+m_format_cached(false),
+m_synthetic_cached(false),
+m_format_sp(),
 m_synthetic_sp()
 {
     SetSummary (summary_sp);
 }
 
 FormatCache::Entry::Entry (lldb::SyntheticChildrenSP synthetic_sp) :
+m_format_cached(false),
 m_summary_cached(false),
+m_format_sp(),
 m_summary_sp()
 {
     SetSynthetic (synthetic_sp);
 }
 
-FormatCache::Entry::Entry (lldb::TypeSummaryImplSP summary_sp,lldb::SyntheticChildrenSP synthetic_sp)
+FormatCache::Entry::Entry (lldb::TypeFormatImplSP format_sp, lldb::TypeSummaryImplSP summary_sp, lldb::SyntheticChildrenSP synthetic_sp)
 {
+    SetFormat (format_sp);
     SetSummary (summary_sp);
     SetSynthetic (synthetic_sp);
 }
 
+bool
+FormatCache::Entry::IsFormatCached ()
+{
+    return m_format_cached;
+}
+
 bool
 FormatCache::Entry::IsSummaryCached ()
 {
@@ -60,6 +82,12 @@ FormatCache::Entry::IsSyntheticCached ()
     return m_synthetic_cached;
 }
 
+lldb::TypeFormatImplSP
+FormatCache::Entry::GetFormat ()
+{
+    return m_format_sp;
+}
+
 lldb::TypeSummaryImplSP
 FormatCache::Entry::GetSummary ()
 {
@@ -72,6 +100,13 @@ FormatCache::Entry::GetSynthetic ()
     return m_synthetic_sp;
 }
 
+void
+FormatCache::Entry::SetFormat (lldb::TypeFormatImplSP format_sp)
+{
+    m_format_cached = true;
+    m_format_sp = format_sp;
+}
+
 void
 FormatCache::Entry::SetSummary (lldb::TypeSummaryImplSP summary_sp)
 {
@@ -106,6 +141,26 @@ FormatCache::GetEntry (const ConstString& type)
     return m_map[type];
 }
 
+bool
+FormatCache::GetFormat (const ConstString& type,lldb::TypeFormatImplSP& format_sp)
+{
+    Mutex::Locker lock(m_mutex);
+    auto entry = GetEntry(type);
+    if (entry.IsSummaryCached())
+    {
+#ifdef LLDB_CONFIGURATION_DEBUG
+        m_cache_hits++;
+#endif
+        format_sp = entry.GetFormat();
+        return true;
+    }
+#ifdef LLDB_CONFIGURATION_DEBUG
+    m_cache_misses++;
+#endif
+    format_sp.reset();
+    return false;
+}
+
 bool
 FormatCache::GetSummary (const ConstString& type,lldb::TypeSummaryImplSP& summary_sp)
 {
@@ -146,6 +201,13 @@ FormatCache::GetSynthetic (const ConstString& type,lldb::SyntheticChildrenSP& sy
     return false;
 }
 
+void
+FormatCache::SetFormat (const ConstString& type,lldb::TypeFormatImplSP& format_sp)
+{
+    Mutex::Locker lock(m_mutex);
+    GetEntry(type).SetFormat(format_sp);
+}
+
 void
 FormatCache::SetSummary (const ConstString& type,lldb::TypeSummaryImplSP& summary_sp)
 {
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/FormatClasses.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/FormatClasses.cpp
index c67f86a7493..f27b45b3049 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/FormatClasses.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/FormatClasses.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "lldb/lldb-python.h"
+#include "lldb/DataFormatters/FormatClasses.h"
 
 // C Includes
 
@@ -16,17 +16,6 @@
 // Other libraries and framework includes
 
 // Project includes
-#include "lldb/lldb-public.h"
-#include "lldb/lldb-enumerations.h"
-
-#include "lldb/Core/Debugger.h"
-#include "lldb/Core/StreamString.h"
-#include "lldb/Core/Timer.h"
-#include "lldb/DataFormatters/FormatClasses.h"
-#include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Symbol/ClangASTType.h"
-#include "lldb/Target/StackFrame.h"
-#include "lldb/Target/Target.h"
 
 using namespace lldb;
 using namespace lldb_private;
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/FormatManager.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/FormatManager.cpp
index eeae8bc9a19..bec2edf5d5c 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/FormatManager.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/FormatManager.cpp
@@ -163,6 +163,165 @@ FormatManager::GetFormatAsCString (Format format)
     return NULL;
 }
 
+void
+FormatManager::GetPossibleMatches (ValueObject& valobj,
+                                   ClangASTType clang_type,
+                                   uint32_t reason,
+                                   lldb::DynamicValueType use_dynamic,
+                                   FormattersMatchVector& entries,
+                                   bool did_strip_ptr,
+                                   bool did_strip_ref,
+                                   bool did_strip_typedef,
+                                   bool root_level)
+{
+    clang_type = clang_type.RemoveFastQualifiers();
+    ConstString type_name(clang_type.GetConstTypeName());
+    if (valobj.GetBitfieldBitSize() > 0)
+    {
+        StreamString sstring;
+        sstring.Printf("%s:%d",type_name.AsCString(),valobj.GetBitfieldBitSize());
+        ConstString bitfieldname = ConstString(sstring.GetData());
+        entries.push_back({bitfieldname,0,did_strip_ptr,did_strip_ref,did_strip_typedef});
+        reason |= lldb_private::eFormatterChoiceCriterionStrippedBitField;
+    }
+    entries.push_back({type_name,reason,did_strip_ptr,did_strip_ref,did_strip_typedef});
+
+    if (clang_type.IsReferenceType())
+    {
+        ClangASTType non_ref_type = clang_type.GetNonReferenceType();
+        GetPossibleMatches(valobj,
+                           non_ref_type,
+                           reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
+                           use_dynamic,
+                           entries,
+                           did_strip_ptr,
+                           true,
+                           did_strip_typedef);
+    }
+    else if (clang_type.IsPointerType())
+    {
+        ClangASTType non_ptr_type = clang_type.GetPointeeType();
+        GetPossibleMatches(valobj,
+                           non_ptr_type,
+                           reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
+                           use_dynamic,
+                           entries,
+                           true,
+                           did_strip_ref,
+                           did_strip_typedef);
+    }
+    bool canBeObjCDynamic = clang_type.IsPossibleDynamicType (NULL,
+                                                              false, // no C
+                                                              true);  // yes ObjC
+    
+    if (canBeObjCDynamic)
+    {
+        if (use_dynamic != lldb::eNoDynamicValues)
+        {
+            do
+            {
+                lldb::ProcessSP process_sp = valobj.GetProcessSP();
+                ObjCLanguageRuntime* runtime = process_sp->GetObjCLanguageRuntime();
+                if (runtime == nullptr)
+                    break;
+                ObjCLanguageRuntime::ClassDescriptorSP objc_class_sp (runtime->GetClassDescriptor(valobj));
+                if (!objc_class_sp)
+                    break;
+                ConstString name (objc_class_sp->GetClassName());
+                entries.push_back({name,reason | lldb_private::eFormatterChoiceCriterionDynamicObjCDiscovery,did_strip_ptr,did_strip_ref,did_strip_typedef});
+            } while (false);
+        }
+        
+        ClangASTType non_ptr_type = clang_type.GetPointeeType();
+        GetPossibleMatches(valobj,
+                           non_ptr_type,
+                           reason | lldb_private::eFormatterChoiceCriterionStrippedPointerReference,
+                           use_dynamic,
+                           entries,
+                           true,
+                           did_strip_ref,
+                           did_strip_typedef);
+    }
+    
+    // try to strip typedef chains
+    if (clang_type.IsTypedefType())
+    {
+        ClangASTType deffed_type = clang_type.GetTypedefedType();
+        GetPossibleMatches(valobj,
+                           deffed_type,
+                           reason | lldb_private::eFormatterChoiceCriterionNavigatedTypedefs,
+                           use_dynamic,
+                           entries,
+                           did_strip_ptr,
+                           did_strip_ref,
+                           true);
+    }
+    
+    if (root_level)
+    {
+        do {
+            if (!clang_type.IsValid())
+                break;
+            
+            ClangASTType unqual_clang_ast_type = clang_type.GetFullyUnqualifiedType();
+            if (!unqual_clang_ast_type.IsValid())
+                break;
+            if (unqual_clang_ast_type.GetOpaqueQualType() != clang_type.GetOpaqueQualType())
+                GetPossibleMatches (valobj,
+                                    unqual_clang_ast_type,
+                                    reason,
+                                    use_dynamic,
+                                    entries,
+                                    did_strip_ptr,
+                                    did_strip_ref,
+                                    did_strip_typedef);
+        } while(false);
+        
+        
+        // if all else fails, go to static type
+        if (valobj.IsDynamic())
+        {
+            lldb::ValueObjectSP static_value_sp(valobj.GetStaticValue());
+            if (static_value_sp)
+                GetPossibleMatches(*static_value_sp.get(),
+                                   static_value_sp->GetClangType(),
+                                   reason | lldb_private::eFormatterChoiceCriterionWentToStaticValue,
+                                   use_dynamic,
+                                   entries,
+                                   did_strip_ptr,
+                                   did_strip_ref,
+                                   did_strip_typedef,
+                                   true);
+        }
+    }
+}
+
+lldb::TypeFormatImplSP
+FormatManager::GetFormatForType (lldb::TypeNameSpecifierImplSP type_sp)
+{
+    if (!type_sp)
+        return lldb::TypeFormatImplSP();
+    lldb::TypeFormatImplSP format_chosen_sp;
+    uint32_t num_categories = m_categories_map.GetCount();
+    lldb::TypeCategoryImplSP category_sp;
+    uint32_t prio_category = UINT32_MAX;
+    for (uint32_t category_id = 0;
+         category_id < num_categories;
+         category_id++)
+    {
+        category_sp = GetCategoryAtIndex(category_id);
+        if (category_sp->IsEnabled() == false)
+            continue;
+        lldb::TypeFormatImplSP format_current_sp = category_sp->GetFormatForType(type_sp);
+        if (format_current_sp && (format_chosen_sp.get() == NULL || (prio_category > category_sp->GetEnabledPosition())))
+        {
+            prio_category = category_sp->GetEnabledPosition();
+            format_chosen_sp = format_current_sp;
+        }
+    }
+    return format_chosen_sp;
+}
+
 lldb::TypeSummaryImplSP
 FormatManager::GetSummaryForType (lldb::TypeNameSpecifierImplSP type_sp)
 {
@@ -305,6 +464,66 @@ FormatManager::GetSingleItemFormat(lldb::Format vector_format)
     }
 }
 
+bool
+FormatManager::ShouldPrintAsOneLiner (ValueObject& valobj)
+{
+    // if settings say no oneline whatsoever
+    if (valobj.GetTargetSP().get() && valobj.GetTargetSP()->GetDebugger().GetAutoOneLineSummaries() == false)
+        return false; // then don't oneline
+    
+    // if this object has a summary, don't try to do anything special to it
+    // if the user wants one-liner, they can ask for it in summary :)
+    if (valobj.GetSummaryFormat().get() != nullptr)
+        return false;
+    
+    // no children, no party
+    if (valobj.GetNumChildren() == 0)
+        return false;
+    
+    size_t total_children_name_len = 0;
+    
+    for (size_t idx = 0;
+         idx < valobj.GetNumChildren();
+         idx++)
+    {
+        ValueObjectSP child_sp(valobj.GetChildAtIndex(idx, true));
+        // something is wrong here - bail out
+        if (!child_sp)
+            return false;
+        // if we decided to define synthetic children for a type, we probably care enough
+        // to show them, but avoid nesting children in children
+        if (child_sp->GetSyntheticChildren().get() != nullptr)
+            return false;
+        
+        total_children_name_len += child_sp->GetName().GetLength();
+        
+        // 50 itself is a "randomly" chosen number - the idea is that
+        // overly long structs should not get this treatment
+        // FIXME: maybe make this a user-tweakable setting?
+        if (total_children_name_len > 50)
+            return false;
+        
+        // if a summary is there..
+        if (child_sp->GetSummaryFormat())
+        {
+            // and it wants children, then bail out
+            if (child_sp->GetSummaryFormat()->DoesPrintChildren())
+                return false;
+        }
+        
+        // if this child has children..
+        if (child_sp->GetNumChildren())
+        {
+            // ...and no summary...
+            // (if it had a summary and the summary wanted children, we would have bailed out anyway
+            //  so this only makes us bail out if this has no summary and we would then print children)
+            if (!child_sp->GetSummaryFormat())
+                return false; // then bail out
+        }
+    }
+    return true;
+}
+
 ConstString
 FormatManager::GetValidTypeName (const ConstString& type)
 {
@@ -334,6 +553,62 @@ GetTypeForCache (ValueObject& valobj,
     return ConstString();
 }
 
+static lldb::TypeFormatImplSP
+GetHardcodedFormat (ValueObject& valobj,
+                    lldb::DynamicValueType use_dynamic)
+{
+    return lldb::TypeFormatImplSP();
+}
+
+lldb::TypeFormatImplSP
+FormatManager::GetFormat (ValueObject& valobj,
+                          lldb::DynamicValueType use_dynamic)
+{
+    TypeFormatImplSP retval;
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
+    ConstString valobj_type(GetTypeForCache(valobj, use_dynamic));
+    if (valobj_type)
+    {
+        if (log)
+            log->Printf("\n\n[FormatManager::GetFormat] Looking into cache for type %s", valobj_type.AsCString("<invalid>"));
+        if (m_format_cache.GetFormat(valobj_type,retval))
+        {
+            if (log)
+            {
+                log->Printf("[FormatManager::GetFormat] Cache search success. Returning.");
+                if (log->GetDebug())
+                    log->Printf("[FormatManager::GetFormat] Cache hits: %" PRIu64 " - Cache Misses: %" PRIu64, m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses());
+            }
+            return retval;
+        }
+        if (log)
+            log->Printf("[FormatManager::GetFormat] Cache search failed. Going normal route");
+    }
+    retval = m_categories_map.GetFormat(valobj, use_dynamic);
+    if (!retval)
+    {
+        if (log)
+            log->Printf("[FormatManager::GetFormat] Search failed. Giving hardcoded a chance.");
+        retval = GetHardcodedFormat(valobj, use_dynamic);
+    }
+    if (valobj_type)
+    {
+        if (log)
+            log->Printf("[FormatManager::GetFormat] Caching %p for type %s",retval.get(),valobj_type.AsCString("<invalid>"));
+        m_format_cache.SetFormat(valobj_type,retval);
+    }
+    if (log && log->GetDebug())
+        log->Printf("[FormatManager::GetFormat] Cache hits: %" PRIu64 " - Cache Misses: %" PRIu64, m_format_cache.GetCacheHits(), m_format_cache.GetCacheMisses());
+    return retval;
+}
+
+static lldb::TypeSummaryImplSP
+GetHardcodedSummaryFormat (ValueObject& valobj,
+                               lldb::DynamicValueType use_dynamic)
+{
+    return lldb::TypeSummaryImplSP();
+}
+
 lldb::TypeSummaryImplSP
 FormatManager::GetSummaryFormat (ValueObject& valobj,
                                  lldb::DynamicValueType use_dynamic)
@@ -359,6 +634,12 @@ FormatManager::GetSummaryFormat (ValueObject& valobj,
             log->Printf("[FormatManager::GetSummaryFormat] Cache search failed. Going normal route");
     }
     retval = m_categories_map.GetSummaryFormat(valobj, use_dynamic);
+    if (!retval)
+    {
+        if (log)
+            log->Printf("[FormatManager::GetSummaryFormat] Search failed. Giving hardcoded a chance.");
+        retval = GetHardcodedSummaryFormat(valobj, use_dynamic);
+    }
     if (valobj_type)
     {
         if (log)
@@ -371,6 +652,13 @@ FormatManager::GetSummaryFormat (ValueObject& valobj,
 }
 
 #ifndef LLDB_DISABLE_PYTHON
+static lldb::SyntheticChildrenSP
+GetHardcodedSyntheticChildren (ValueObject& valobj,
+                               lldb::DynamicValueType use_dynamic)
+{
+    return lldb::SyntheticChildrenSP();
+}
+
 lldb::SyntheticChildrenSP
 FormatManager::GetSyntheticChildren (ValueObject& valobj,
                                      lldb::DynamicValueType use_dynamic)
@@ -396,6 +684,12 @@ FormatManager::GetSyntheticChildren (ValueObject& valobj,
             log->Printf("[FormatManager::GetSyntheticChildren] Cache search failed. Going normal route");
     }
     retval = m_categories_map.GetSyntheticChildren(valobj, use_dynamic);
+    if (!retval)
+    {
+        if (log)
+            log->Printf("[FormatManager::GetSyntheticChildren] Search failed. Giving hardcoded a chance.");
+        retval = GetHardcodedSyntheticChildren(valobj, use_dynamic);
+    }
     if (valobj_type)
     {
         if (log)
@@ -410,7 +704,6 @@ FormatManager::GetSyntheticChildren (ValueObject& valobj,
 
 FormatManager::FormatManager() :
     m_format_cache(),
-    m_value_nav("format",this),
     m_named_summaries_map(this),
     m_last_revision(0),
     m_categories_map(this),
@@ -441,6 +734,22 @@ FormatManager::FormatManager() :
     EnableCategory(m_system_category_name,TypeCategoryMap::Last);
 }
 
+static void
+AddFormat (TypeCategoryImpl::SharedPointer category_sp,
+           lldb::Format format,
+           ConstString type_name,
+           TypeFormatImpl::Flags flags,
+           bool regex = false)
+{
+    lldb::TypeFormatImplSP format_sp(new TypeFormatImpl(format, flags));
+    
+    if (regex)
+        category_sp->GetRegexValueNavigator()->Add(RegularExpressionSP(new RegularExpression(type_name.AsCString())),format_sp);
+    else
+        category_sp->GetValueNavigator()->Add(type_name, format_sp);
+}
+
+
 static void
 AddStringSummary(TypeCategoryImpl::SharedPointer category_sp,
                  const char* string,
@@ -632,7 +941,8 @@ FormatManager::LoadLibcxxFormatters()
     AddCXXSynthetic(libcxx_category_sp, lldb_private::formatters::LibcxxStdMapSyntheticFrontEndCreator, "libc++ std::set synthetic children", ConstString("^std::__1::set<.+> >(( )?&)?$"), stl_synth_flags, true);
     AddCXXSynthetic(libcxx_category_sp, lldb_private::formatters::LibcxxStdMapSyntheticFrontEndCreator, "libc++ std::multiset synthetic children", ConstString("^std::__1::multiset<.+> >(( )?&)?$"), stl_synth_flags, true);
     AddCXXSynthetic(libcxx_category_sp, lldb_private::formatters::LibcxxStdMapSyntheticFrontEndCreator, "libc++ std::multimap synthetic children", ConstString("^std::__1::multimap<.+> >(( )?&)?$"), stl_synth_flags, true);
-
+    AddCXXSynthetic(libcxx_category_sp, lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEndCreator, "libc++ std::unordered containers synthetic children", ConstString("^(std::__1::)unordered_(multi)?(map|set)<.+> >$"), stl_synth_flags, true);
+    
     libcxx_category_sp->GetRegexSyntheticNavigator()->Add(RegularExpressionSP(new RegularExpression("^(std::__1::)deque<.+>(( )?&)?$")),
                                                           SyntheticChildrenSP(new ScriptedSyntheticChildren(stl_synth_flags,
                                                                                                     "lldb.formatters.cpp.libcxx.stddeque_SynthProvider")));
@@ -650,6 +960,7 @@ FormatManager::LoadLibcxxFormatters()
     AddCXXSummary(libcxx_category_sp, lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::set summary provider", ConstString("^std::__1::set<.+>(( )?&)?$"), stl_summary_flags, true);
     AddCXXSummary(libcxx_category_sp, lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::multiset summary provider", ConstString("^std::__1::multiset<.+>(( )?&)?$"), stl_summary_flags, true);
     AddCXXSummary(libcxx_category_sp, lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::multimap summary provider", ConstString("^std::__1::multimap<.+>(( )?&)?$"), stl_summary_flags, true);
+    AddCXXSummary(libcxx_category_sp, lldb_private::formatters::LibcxxContainerSummaryProvider, "libc++ std::unordered containers summary provider", ConstString("^(std::__1::)unordered_(multi)?(map|set)<.+> >$"), stl_summary_flags, true);
 
     stl_summary_flags.SetSkipPointers(true);
     AddStringSummary(libcxx_category_sp, "{${var.__ptr_%S}} (strong=${var.count} weak=${var.weak_count})}", ConstString("^std::__1::shared_ptr<.+>(( )?&)?$"), stl_summary_flags, true);
@@ -694,7 +1005,7 @@ FormatManager::LoadSystemFormatters()
     sys_category_sp->GetSummaryNavigator()->Add(ConstString("char *"), string_format);
     sys_category_sp->GetSummaryNavigator()->Add(ConstString("unsigned char *"), string_format);
     sys_category_sp->GetRegexSummaryNavigator()->Add(any_size_char_arr, string_array_format);
-    
+
     lldb::TypeSummaryImplSP ostype_summary(new StringSummaryFormat(TypeSummaryImpl::Flags().SetCascades(false)
                                                                    .SetSkipPointers(true)
                                                                    .SetSkipReferences(true)
@@ -731,6 +1042,11 @@ FormatManager::LoadSystemFormatters()
 
     AddCXXSummary(sys_category_sp, lldb_private::formatters::Char16SummaryProvider, "unichar summary provider", ConstString("unichar"), widechar_flags);
     
+    TypeFormatImpl::Flags fourchar_flags;
+    fourchar_flags.SetCascades(true).SetSkipPointers(true).SetSkipReferences(true);
+    
+    AddFormat(sys_category_sp, lldb::eFormatOSType, ConstString("FourCharCode"), fourchar_flags);
+    
 #endif
 }
 
@@ -879,22 +1195,22 @@ FormatManager::LoadObjCFormatters()
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("__NSArrayI"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("__NSArrayM"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("__NSCFArray"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("CFArrayRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("CFMutableArrayRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("CFArrayRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSArraySummaryProvider, "NSArray summary provider", ConstString("CFMutableArrayRef"), appkit_flags);
 
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("NSDictionary"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("NSMutableDictionary"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("__NSCFDictionary"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("__NSDictionaryI"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<false>, "NSDictionary summary provider", ConstString("__NSDictionaryM"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<true>, "NSDictionary summary provider", ConstString("CFDictionaryRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<true>, "NSDictionary summary provider", ConstString("CFMutableDictionaryRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<true>, "NSDictionary summary provider", ConstString("CFDictionaryRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSDictionarySummaryProvider<true>, "NSDictionary summary provider", ConstString("CFMutableDictionaryRef"), appkit_flags);
     
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSSetSummaryProvider<false>, "NSSet summary", ConstString("NSSet"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSSetSummaryProvider<false>, "NSMutableSet summary", ConstString("NSMutableSet"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSSetSummaryProvider<true>, "CFSetRef summary", ConstString("CFSetRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSSetSummaryProvider<true>, "CFMutableSetRef summary", ConstString("CFMutableSetRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSSetSummaryProvider<false>, "__NSCFSet summary", ConstString("__NSCFSet"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSSetSummaryProvider<true>, "CFSetRef summary", ConstString("CFSetRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSSetSummaryProvider<true>, "CFMutableSetRef summary", ConstString("CFMutableSetRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSSetSummaryProvider<false>, "__NSCFSet summary", ConstString("__NSCFSet"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSSetSummaryProvider<false>, "__NSSetI summary", ConstString("__NSSetI"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSSetSummaryProvider<false>, "__NSSetM summary", ConstString("__NSSetM"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSSetSummaryProvider<false>, "NSCountedSet summary", ConstString("NSCountedSet"), appkit_flags);
@@ -911,16 +1227,16 @@ FormatManager::LoadObjCFormatters()
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("__NSArrayI"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("NSArray"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("NSMutableArray"), ScriptedSyntheticChildren::Flags());
-    AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("__NSCFArray"), ScriptedSyntheticChildren::Flags());
-    AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("CFMutableArrayRef"), ScriptedSyntheticChildren::Flags());
-    AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("CFArrayRef"), ScriptedSyntheticChildren::Flags());
+    AddCXXSynthetic(corefoundation_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("__NSCFArray"), ScriptedSyntheticChildren::Flags());
+    AddCXXSynthetic(corefoundation_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("CFMutableArrayRef"), ScriptedSyntheticChildren::Flags());
+    AddCXXSynthetic(corefoundation_category_sp, lldb_private::formatters::NSArraySyntheticFrontEndCreator, "NSArray synthetic children", ConstString("CFArrayRef"), ScriptedSyntheticChildren::Flags());
 
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("__NSDictionaryM"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("__NSDictionaryI"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("NSDictionary"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("NSMutableDictionary"), ScriptedSyntheticChildren::Flags());
-    AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("CFDictionaryRef"), ScriptedSyntheticChildren::Flags());
-    AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("CFMutableDictionaryRef"), ScriptedSyntheticChildren::Flags());
+    AddCXXSynthetic(corefoundation_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("CFDictionaryRef"), ScriptedSyntheticChildren::Flags());
+    AddCXXSynthetic(corefoundation_category_sp, lldb_private::formatters::NSDictionarySyntheticFrontEndCreator, "NSDictionary synthetic children", ConstString("CFMutableDictionaryRef"), ScriptedSyntheticChildren::Flags());
 
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSSetSyntheticFrontEndCreator, "NSSet synthetic children", ConstString("NSSet"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSSetSyntheticFrontEndCreator, "__NSSetI synthetic children", ConstString("__NSSetI"), ScriptedSyntheticChildren::Flags());
@@ -930,22 +1246,22 @@ FormatManager::LoadObjCFormatters()
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSSetSyntheticFrontEndCreator, "__NSOrderedSetI synthetic children", ConstString("__NSOrderedSetI"), ScriptedSyntheticChildren::Flags());
     AddCXXSynthetic(appkit_category_sp, lldb_private::formatters::NSSetSyntheticFrontEndCreator, "__NSOrderedSetM synthetic children", ConstString("__NSOrderedSetM"), ScriptedSyntheticChildren::Flags());
     
-    AddCXXSummary(appkit_category_sp,lldb_private::formatters::CFBagSummaryProvider, "CFBag summary provider", ConstString("CFBagRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp,lldb_private::formatters::CFBagSummaryProvider, "CFBag summary provider", ConstString("__CFBag"), appkit_flags);
-    AddCXXSummary(appkit_category_sp,lldb_private::formatters::CFBagSummaryProvider, "CFBag summary provider", ConstString("const struct __CFBag"), appkit_flags);
-    AddCXXSummary(appkit_category_sp,lldb_private::formatters::CFBagSummaryProvider, "CFBag summary provider", ConstString("CFMutableBagRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp,lldb_private::formatters::CFBagSummaryProvider, "CFBag summary provider", ConstString("CFBagRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp,lldb_private::formatters::CFBagSummaryProvider, "CFBag summary provider", ConstString("__CFBag"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp,lldb_private::formatters::CFBagSummaryProvider, "CFBag summary provider", ConstString("const struct __CFBag"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp,lldb_private::formatters::CFBagSummaryProvider, "CFBag summary provider", ConstString("CFMutableBagRef"), appkit_flags);
     
-    AddCXXSummary(appkit_category_sp,lldb_private::formatters::CFBinaryHeapSummaryProvider, "CFBinaryHeap summary provider", ConstString("CFBinaryHeapRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp,lldb_private::formatters::CFBinaryHeapSummaryProvider, "CFBinaryHeap summary provider", ConstString("__CFBinaryHeap"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp,lldb_private::formatters::CFBinaryHeapSummaryProvider, "CFBinaryHeap summary provider", ConstString("CFBinaryHeapRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp,lldb_private::formatters::CFBinaryHeapSummaryProvider, "CFBinaryHeap summary provider", ConstString("__CFBinaryHeap"), appkit_flags);
 
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSString"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("CFStringRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("CFMutableStringRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("CFStringRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("CFMutableStringRef"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSMutableString"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("__NSCFConstantString"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("__NSCFString"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSCFConstantString"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSCFString"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("__NSCFConstantString"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("__NSCFString"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSCFConstantString"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSCFString"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSStringSummaryProvider, "NSString summary provider", ConstString("NSPathStore2"), appkit_flags);
     
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSAttributedStringSummaryProvider, "NSAttributedString summary provider", ConstString("NSAttributedString"), appkit_flags);
@@ -957,9 +1273,9 @@ FormatManager::LoadObjCFormatters()
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("NSData"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("NSConcreteData"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("NSConcreteMutableData"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("__NSCFData"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDataSummaryProvider<true>, "NSData summary provider", ConstString("CFDataRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDataSummaryProvider<true>, "NSData summary provider", ConstString("CFMutableDataRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSDataSummaryProvider<false>, "NSData summary provider", ConstString("__NSCFData"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSDataSummaryProvider<true>, "NSData summary provider", ConstString("CFDataRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSDataSummaryProvider<true>, "NSData summary provider", ConstString("CFMutableDataRef"), appkit_flags);
 
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSMachPortSummaryProvider, "NSMachPort summary provider", ConstString("NSMachPort"), appkit_flags);
 
@@ -970,10 +1286,11 @@ FormatManager::LoadObjCFormatters()
     AddStringSummary(appkit_category_sp,"name:${var.name%S} reason:${var.reason%S}",ConstString("NSException"),appkit_flags);
 
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("NSNumber"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("__NSCFBoolean"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("__NSCFNumber"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("NSCFBoolean"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("NSCFNumber"), appkit_flags);
+    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "CFNumberRef summary provider", ConstString("CFNumberRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("__NSCFBoolean"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("__NSCFNumber"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("NSCFBoolean"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSNumberSummaryProvider, "NSNumber summary provider", ConstString("NSCFNumber"), appkit_flags);
     
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider, "NSDecimalNumber summary provider", ConstString("NSDecimalNumber"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider, "NSHost summary provider", ConstString("NSHost"), appkit_flags);
@@ -981,7 +1298,7 @@ FormatManager::LoadObjCFormatters()
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::RuntimeSpecificDescriptionSummaryProvider, "NSValue summary provider", ConstString("NSValue"), appkit_flags);
     
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSURLSummaryProvider, "NSURL summary provider", ConstString("NSURL"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSURLSummaryProvider, "NSURL summary provider", ConstString("CFURLRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::NSURLSummaryProvider, "NSURL summary provider", ConstString("CFURLRef"), appkit_flags);
     
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDateSummaryProvider, "NSDate summary provider", ConstString("NSDate"), appkit_flags);
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSDateSummaryProvider, "NSDate summary provider", ConstString("__NSDate"), appkit_flags);
@@ -995,7 +1312,7 @@ FormatManager::LoadObjCFormatters()
     // CFAbsoluteTime is actually a double rather than a pointer to an object
     // we do not care about the numeric value, since it is probably meaningless to users
     appkit_flags.SetDontShowValue(true);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::CFAbsoluteTimeSummaryProvider, "CFAbsoluteTime summary provider", ConstString("CFAbsoluteTime"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::CFAbsoluteTimeSummaryProvider, "CFAbsoluteTime summary provider", ConstString("CFAbsoluteTime"), appkit_flags);
     appkit_flags.SetDontShowValue(false);
     
     AddCXXSummary(appkit_category_sp, lldb_private::formatters::NSIndexSetSummaryProvider, "NSIndexSet summary provider", ConstString("NSIndexSet"), appkit_flags);
@@ -1006,10 +1323,10 @@ FormatManager::LoadObjCFormatters()
                      ConstString("CFGregorianDate"),
                      appkit_flags);
     
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::CFBitVectorSummaryProvider, "CFBitVector summary provider", ConstString("CFBitVectorRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::CFBitVectorSummaryProvider, "CFBitVector summary provider", ConstString("CFMutableBitVectorRef"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::CFBitVectorSummaryProvider, "CFBitVector summary provider", ConstString("__CFBitVector"), appkit_flags);
-    AddCXXSummary(appkit_category_sp, lldb_private::formatters::CFBitVectorSummaryProvider, "CFBitVector summary provider", ConstString("__CFMutableBitVector"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::CFBitVectorSummaryProvider, "CFBitVector summary provider", ConstString("CFBitVectorRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::CFBitVectorSummaryProvider, "CFBitVector summary provider", ConstString("CFMutableBitVectorRef"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::CFBitVectorSummaryProvider, "CFBitVector summary provider", ConstString("__CFBitVector"), appkit_flags);
+    AddCXXSummary(corefoundation_category_sp, lldb_private::formatters::CFBitVectorSummaryProvider, "CFBitVector summary provider", ConstString("__CFMutableBitVector"), appkit_flags);
 #endif // LLDB_DISABLE_PYTHON
     
     TypeCategoryImpl::SharedPointer vectors_category_sp = GetCategory(m_vectortypes_category_name);
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/LibCxx.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/LibCxx.cpp
index cdc57f6bd93..21e104602a3 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/LibCxx.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/LibCxx.cpp
@@ -35,10 +35,10 @@ m_options()
 {
     if (valobj_sp)
         Update();
-    m_options.SetCoerceToId(false)
-    .SetUnwindOnError(true)
-    .SetKeepInMemory(true)
-    .SetUseDynamic(lldb::eDynamicCanRunTarget);
+    m_options.SetCoerceToId(false);
+    m_options.SetUnwindOnError(true);
+    m_options.SetKeepInMemory(true);
+    m_options.SetUseDynamic(lldb::eDynamicCanRunTarget);
 }
 
 size_t
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/LibCxxUnorderedMap.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/LibCxxUnorderedMap.cpp
new file mode 100644
index 00000000000..b73d3bf852e
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/LibCxxUnorderedMap.cpp
@@ -0,0 +1,135 @@
+//===-- LibCxxUnorderedMap.cpp -----------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/lldb-python.h"
+
+#include "lldb/DataFormatters/CXXFormatterFunctions.h"
+
+#include "lldb/Core/DataBufferHeap.h"
+#include "lldb/Core/Error.h"
+#include "lldb/Core/Stream.h"
+#include "lldb/Core/ValueObject.h"
+#include "lldb/Core/ValueObjectConstResult.h"
+#include "lldb/Host/Endian.h"
+#include "lldb/Symbol/ClangASTContext.h"
+#include "lldb/Target/ObjCLanguageRuntime.h"
+#include "lldb/Target/Target.h"
+
+using namespace lldb;
+using namespace lldb_private;
+using namespace lldb_private::formatters;
+
+lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::LibcxxStdUnorderedMapSyntheticFrontEnd (lldb::ValueObjectSP valobj_sp) :
+SyntheticChildrenFrontEnd(*valobj_sp.get()),
+m_tree(NULL),
+m_num_elements(0),
+m_next_element(nullptr),
+m_children(),
+m_elements_cache()
+{
+    if (valobj_sp)
+        Update();
+}
+
+size_t
+lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::CalculateNumChildren ()
+{
+    if (m_num_elements != UINT32_MAX)
+        return m_num_elements;
+    return 0;
+}
+
+lldb::ValueObjectSP
+lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::GetChildAtIndex (size_t idx)
+{
+    if (idx >= CalculateNumChildren())
+        return lldb::ValueObjectSP();
+    if (m_tree == NULL)
+        return lldb::ValueObjectSP();
+    
+    auto cached = m_children.find(idx);
+    if (cached != m_children.end())
+        return cached->second;
+    
+    while (idx >= m_elements_cache.size())
+    {
+        if (m_next_element == nullptr)
+            return lldb::ValueObjectSP();
+        
+        Error error;
+        ValueObjectSP node_sp = m_next_element->Dereference(error);
+        if (!node_sp || error.Fail())
+            return lldb::ValueObjectSP();
+        
+        ValueObjectSP value_sp = node_sp->GetChildMemberWithName(ConstString("__value_"), true);
+        ValueObjectSP hash_sp = node_sp->GetChildMemberWithName(ConstString("__hash_"), true);
+        if (!hash_sp || !value_sp)
+            return lldb::ValueObjectSP();
+        m_elements_cache.push_back({value_sp.get(),hash_sp->GetValueAsUnsigned(0)});
+        m_next_element = node_sp->GetChildMemberWithName(ConstString("__next_"),true).get();
+        if (!m_next_element || m_next_element->GetValueAsUnsigned(0) == 0)
+            m_next_element = nullptr;
+    }
+    
+    std::pair<ValueObject*, uint64_t> val_hash = m_elements_cache[idx];
+    if (!val_hash.first)
+        return lldb::ValueObjectSP();
+    StreamString stream;
+    stream.Printf("[%zu]",idx);
+    DataExtractor data;
+    val_hash.first->GetData(data);
+    ExecutionContext exe_ctx = val_hash.first->GetExecutionContextRef().Lock();
+    return val_hash.first->CreateValueObjectFromData(stream.GetData(),
+                                                     data,
+                                                     exe_ctx,
+                                                     val_hash.first->GetClangType());
+}
+
+bool
+lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::Update()
+{
+    m_num_elements = UINT32_MAX;
+    m_next_element = nullptr;
+    m_elements_cache.clear();
+    m_children.clear();
+    ValueObjectSP table_sp = m_backend.GetChildMemberWithName(ConstString("__table_"), true);
+    if (!table_sp)
+        return false;
+    ValueObjectSP num_elements_sp = table_sp->GetChildAtNamePath({ConstString("__p2_"),ConstString("__first_")});
+    if (!num_elements_sp)
+        return false;
+    m_num_elements = num_elements_sp->GetValueAsUnsigned(0);
+    m_tree = table_sp->GetChildAtNamePath({ConstString("__p1_"),ConstString("__first_"),ConstString("__next_")}).get();
+    if (m_num_elements > 0)
+        m_next_element = table_sp->GetChildAtNamePath({ConstString("__p1_"),ConstString("__first_"),ConstString("__next_")}).get();
+    return false;
+}
+
+bool
+lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::MightHaveChildren ()
+{
+    return true;
+}
+
+size_t
+lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::GetIndexOfChildWithName (const ConstString &name)
+{
+    return ExtractIndexFromString(name.GetCString());
+}
+
+lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEnd::~LibcxxStdUnorderedMapSyntheticFrontEnd ()
+{}
+
+SyntheticChildrenFrontEnd*
+lldb_private::formatters::LibcxxStdUnorderedMapSyntheticFrontEndCreator (CXXSyntheticChildren*, lldb::ValueObjectSP valobj_sp)
+{
+    if (!valobj_sp)
+        return NULL;
+    return (new LibcxxStdUnorderedMapSyntheticFrontEnd(valobj_sp));
+}
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/LibStdcpp.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/LibStdcpp.cpp
index e0f23cc35e3..08e7d584003 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/LibStdcpp.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/LibStdcpp.cpp
@@ -34,10 +34,10 @@ m_options()
 {
     if (valobj_sp)
         Update();
-    m_options.SetCoerceToId(false)
-    .SetUnwindOnError(true)
-    .SetKeepInMemory(true)
-    .SetUseDynamic(lldb::eDynamicCanRunTarget);
+    m_options.SetCoerceToId(false);
+    m_options.SetUnwindOnError(true);
+    m_options.SetKeepInMemory(true);
+    m_options.SetUseDynamic(lldb::eDynamicCanRunTarget);
 }
 
 size_t
@@ -215,10 +215,10 @@ lldb_private::formatters::LibstdcppMapIteratorSyntheticFrontEnd::LibstdcppMapIte
 {
     if (valobj_sp)
         Update();
-    m_options.SetCoerceToId(false)
-    .SetUnwindOnError(true)
-    .SetKeepInMemory(true)
-    .SetUseDynamic(lldb::eDynamicCanRunTarget);
+    m_options.SetCoerceToId(false);
+    m_options.SetUnwindOnError(true);
+    m_options.SetKeepInMemory(true);
+    m_options.SetUseDynamic(lldb::eDynamicCanRunTarget);
 }
 
 bool
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/NSDictionary.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/NSDictionary.cpp
index 05a5dda39e5..f53004df5c5 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/NSDictionary.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/NSDictionary.cpp
@@ -218,8 +218,10 @@ lldb_private::formatters::NSDictionaryCodeRunningSyntheticFrontEnd::GetChildAtIn
     StreamString object_fetcher_expr;
     object_fetcher_expr.Printf("struct __lldb_autogen_nspair { id key; id value; } _lldb_valgen_item; _lldb_valgen_item.key = %s; _lldb_valgen_item.value = %s; _lldb_valgen_item;",key_fetcher_expr.GetData(),value_fetcher_expr.GetData());
     lldb::ValueObjectSP child_sp;
+    EvaluateExpressionOptions options;
+    options.SetKeepInMemory(true);
     m_backend.GetTargetSP()->EvaluateExpression(object_fetcher_expr.GetData(), m_backend.GetFrameSP().get(), child_sp,
-                                                EvaluateExpressionOptions().SetKeepInMemory(true));
+                                                options);
     if (child_sp)
         child_sp->SetName(ConstString(idx_name.GetData()));
     return child_sp;
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/NSSet.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/NSSet.cpp
index 02eb2bfc124..e6fe2a34a67 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/NSSet.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/NSSet.cpp
@@ -249,6 +249,10 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::GetChildAtIndex (size_t idx)
     if (idx >= num_children)
         return lldb::ValueObjectSP();
     
+    ProcessSP process_sp = m_exe_ctx_ref.GetProcessSP();
+    if (!process_sp)
+        return lldb::ValueObjectSP();
+    
     if (m_children.empty())
     {
         // do the scan phase
@@ -260,7 +264,6 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::GetChildAtIndex (size_t idx)
         while(tries < num_children)
         {
             obj_at_idx = m_data_ptr + (test_idx * m_ptr_size);
-            ProcessSP process_sp = m_exe_ctx_ref.GetProcessSP();
             if (!process_sp)
                 return lldb::ValueObjectSP();
             Error error;
@@ -286,12 +289,34 @@ lldb_private::formatters::NSSetISyntheticFrontEnd::GetChildAtIndex (size_t idx)
     SetItemDescriptor &set_item = m_children[idx];
     if (!set_item.valobj_sp)
     {
-        // make the new ValueObject
-        StreamString expr;
-        expr.Printf("(id)%" PRIu64,set_item.item_ptr);
+        auto ptr_size = process_sp->GetAddressByteSize();
+        DataBufferHeap buffer(ptr_size,0);
+        switch (ptr_size)
+        {
+            case 0: // architecture has no clue?? - fail
+                return lldb::ValueObjectSP();
+            case 4:
+                *((uint32_t*)buffer.GetBytes()) = (uint32_t)set_item.item_ptr;
+                break;
+            case 8:
+                *((uint64_t*)buffer.GetBytes()) = (uint64_t)set_item.item_ptr;
+                break;
+            default:
+                assert(false && "pointer size is not 4 nor 8 - get out of here ASAP");
+        }
         StreamString idx_name;
         idx_name.Printf("[%zu]",idx);
-        set_item.valobj_sp = ValueObject::CreateValueObjectFromExpression(idx_name.GetData(), expr.GetData(), m_exe_ctx_ref);
+        
+        DataExtractor data(buffer.GetBytes(),
+                           buffer.GetByteSize(),
+                           process_sp->GetByteOrder(),
+                           process_sp->GetAddressByteSize());
+        
+        set_item.valobj_sp =
+            ValueObject::CreateValueObjectFromData(idx_name.GetData(),
+                                                   data,
+                                                   m_exe_ctx_ref,
+                                                   m_backend.GetClangType().GetBasicTypeFromAST(lldb::eBasicTypeObjCID));
     }
     return set_item.valobj_sp;
 }
@@ -392,6 +417,10 @@ lldb_private::formatters::NSSetMSyntheticFrontEnd::GetChildAtIndex (size_t idx)
     if (idx >= num_children)
         return lldb::ValueObjectSP();
     
+    ProcessSP process_sp = m_exe_ctx_ref.GetProcessSP();
+    if (!process_sp)
+        return lldb::ValueObjectSP();
+    
     if (m_children.empty())
     {
         // do the scan phase
@@ -403,7 +432,6 @@ lldb_private::formatters::NSSetMSyntheticFrontEnd::GetChildAtIndex (size_t idx)
         while(tries < num_children)
         {
             obj_at_idx = m_objs_addr + (test_idx * m_ptr_size);
-            ProcessSP process_sp = m_exe_ctx_ref.GetProcessSP();
             if (!process_sp)
                 return lldb::ValueObjectSP();
             Error error;
@@ -429,12 +457,34 @@ lldb_private::formatters::NSSetMSyntheticFrontEnd::GetChildAtIndex (size_t idx)
     SetItemDescriptor &set_item = m_children[idx];
     if (!set_item.valobj_sp)
     {
-        // make the new ValueObject
-        StreamString expr;
-        expr.Printf("(id)%" PRIu64,set_item.item_ptr);
+        auto ptr_size = process_sp->GetAddressByteSize();
+        DataBufferHeap buffer(ptr_size,0);
+        switch (ptr_size)
+        {
+            case 0: // architecture has no clue?? - fail
+                return lldb::ValueObjectSP();
+            case 4:
+                *((uint32_t*)buffer.GetBytes()) = (uint32_t)set_item.item_ptr;
+                break;
+            case 8:
+                *((uint64_t*)buffer.GetBytes()) = (uint64_t)set_item.item_ptr;
+                break;
+            default:
+                assert(false && "pointer size is not 4 nor 8 - get out of here ASAP");
+        }
         StreamString idx_name;
         idx_name.Printf("[%zu]",idx);
-        set_item.valobj_sp = ValueObject::CreateValueObjectFromExpression(idx_name.GetData(), expr.GetData(), m_exe_ctx_ref);
+        
+        DataExtractor data(buffer.GetBytes(),
+                           buffer.GetByteSize(),
+                           process_sp->GetByteOrder(),
+                           process_sp->GetAddressByteSize());
+        
+        set_item.valobj_sp =
+            ValueObject::CreateValueObjectFromData(idx_name.GetData(),
+                                                   data,
+                                                   m_exe_ctx_ref,
+                                                   m_backend.GetClangType().GetBasicTypeFromAST(lldb::eBasicTypeObjCID));
     }
     return set_item.valobj_sp;
 }
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategory.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategory.cpp
index c887be5da49..a02560e7878 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategory.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategory.cpp
@@ -21,6 +21,8 @@ using namespace lldb_private;
 
 TypeCategoryImpl::TypeCategoryImpl(IFormatChangeListener* clist,
                                    ConstString name) :
+m_value_nav(new ValueNavigator("format",clist)),
+m_regex_value_nav(new RegexValueNavigator("regex-format",clist)),
 m_summary_nav(new SummaryNavigator("summary",clist)),
 m_regex_summary_nav(new RegexSummaryNavigator("regex-summary",clist)),
 m_filter_nav(new FilterNavigator("filter",clist)),
@@ -37,25 +39,41 @@ m_name(name)
 
 bool
 TypeCategoryImpl::Get (ValueObject& valobj,
-                       lldb::TypeSummaryImplSP& entry,
-                       lldb::DynamicValueType use_dynamic,
+                       const FormattersMatchVector& candidates,
+                       lldb::TypeFormatImplSP& entry,
                        uint32_t* reason)
 {
     if (!IsEnabled())
         return false;
-    if (GetSummaryNavigator()->Get(valobj, entry, use_dynamic, reason))
+    if (GetValueNavigator()->Get(candidates, entry, reason))
         return true;
-    bool regex = GetRegexSummaryNavigator()->Get(valobj, entry, use_dynamic, reason);
+    bool regex = GetRegexValueNavigator()->Get(candidates, entry, reason);
     if (regex && reason)
         *reason |= lldb_private::eFormatterChoiceCriterionRegularExpressionSummary;
     return regex;
 }
 
 bool
-TypeCategoryImpl::Get(ValueObject& valobj,
-                      lldb::SyntheticChildrenSP& entry_sp,
-                      lldb::DynamicValueType use_dynamic,
-                      uint32_t* reason)
+TypeCategoryImpl::Get (ValueObject& valobj,
+                       const FormattersMatchVector& candidates,
+                       lldb::TypeSummaryImplSP& entry,
+                       uint32_t* reason)
+{
+    if (!IsEnabled())
+        return false;
+    if (GetSummaryNavigator()->Get(candidates, entry, reason))
+        return true;
+    bool regex = GetRegexSummaryNavigator()->Get(candidates, entry, reason);
+    if (regex && reason)
+        *reason |= lldb_private::eFormatterChoiceCriterionRegularExpressionSummary;
+    return regex;
+}
+
+bool
+TypeCategoryImpl::Get (ValueObject& valobj,
+                       const FormattersMatchVector& candidates,
+                       lldb::SyntheticChildrenSP& entry,
+                       uint32_t* reason)
 {
     if (!IsEnabled())
         return false;
@@ -64,16 +82,16 @@ TypeCategoryImpl::Get(ValueObject& valobj,
     bool regex_filter = false;
     // first find both Filter and Synth, and then check which is most recent
     
-    if (!GetFilterNavigator()->Get(valobj, filter_sp, use_dynamic, &reason_filter))
-        regex_filter = GetRegexFilterNavigator()->Get (valobj, filter_sp, use_dynamic, &reason_filter);
+    if (!GetFilterNavigator()->Get(candidates, filter_sp, &reason_filter))
+        regex_filter = GetRegexFilterNavigator()->Get (candidates, filter_sp, &reason_filter);
     
 #ifndef LLDB_DISABLE_PYTHON
     bool regex_synth = false;
     uint32_t reason_synth = 0;
     bool pick_synth = false;
     ScriptedSyntheticChildren::SharedPointer synth;
-    if (!GetSyntheticNavigator()->Get(valobj, synth, use_dynamic, &reason_synth))
-        regex_synth = GetRegexSyntheticNavigator()->Get (valobj, synth, use_dynamic, &reason_synth);
+    if (!GetSyntheticNavigator()->Get(candidates, synth, &reason_synth))
+        regex_synth = GetRegexSyntheticNavigator()->Get (candidates, synth, &reason_synth);
     if (!filter_sp.get() && !synth.get())
         return false;
     else if (!filter_sp.get() && synth.get())
@@ -93,40 +111,46 @@ TypeCategoryImpl::Get(ValueObject& valobj,
     {
         if (regex_synth && reason)
             *reason |= lldb_private::eFormatterChoiceCriterionRegularExpressionFilter;
-        entry_sp = synth;
+        entry = synth;
         return true;
     }
     else
     {
         if (regex_filter && reason)
             *reason |= lldb_private::eFormatterChoiceCriterionRegularExpressionFilter;
-        entry_sp = filter_sp;
+        entry = filter_sp;
         return true;
     }
     
 #else
     if (filter_sp)
     {
-        entry_sp = filter_sp;
+        entry = filter_sp;
         return true;
     }
 #endif
     
     return false;
-    
 }
 
 void
 TypeCategoryImpl::Clear (FormatCategoryItems items)
 {
+    if ( (items & eFormatCategoryItemValue)  == eFormatCategoryItemValue )
+        m_value_nav->Clear();
+    if ( (items & eFormatCategoryItemRegexValue) == eFormatCategoryItemRegexValue )
+        m_regex_value_nav->Clear();
+
     if ( (items & eFormatCategoryItemSummary) == eFormatCategoryItemSummary )
         m_summary_nav->Clear();
     if ( (items & eFormatCategoryItemRegexSummary) == eFormatCategoryItemRegexSummary )
         m_regex_summary_nav->Clear();
+
     if ( (items & eFormatCategoryItemFilter)  == eFormatCategoryItemFilter )
         m_filter_nav->Clear();
     if ( (items & eFormatCategoryItemRegexFilter) == eFormatCategoryItemRegexFilter )
         m_regex_filter_nav->Clear();
+
 #ifndef LLDB_DISABLE_PYTHON
     if ( (items & eFormatCategoryItemSynth)  == eFormatCategoryItemSynth )
         m_synth_nav->Clear();
@@ -140,14 +164,22 @@ TypeCategoryImpl::Delete (ConstString name,
                           FormatCategoryItems items)
 {
     bool success = false;
+    
+    if ( (items & eFormatCategoryItemValue)  == eFormatCategoryItemValue )
+        success = m_value_nav->Delete(name) || success;
+    if ( (items & eFormatCategoryItemRegexValue) == eFormatCategoryItemRegexValue )
+        success = m_regex_value_nav->Delete(name) || success;
+
     if ( (items & eFormatCategoryItemSummary) == eFormatCategoryItemSummary )
         success = m_summary_nav->Delete(name) || success;
     if ( (items & eFormatCategoryItemRegexSummary) == eFormatCategoryItemRegexSummary )
         success = m_regex_summary_nav->Delete(name) || success;
+
     if ( (items & eFormatCategoryItemFilter)  == eFormatCategoryItemFilter )
         success = m_filter_nav->Delete(name) || success;
     if ( (items & eFormatCategoryItemRegexFilter) == eFormatCategoryItemRegexFilter )
         success = m_regex_filter_nav->Delete(name) || success;
+
 #ifndef LLDB_DISABLE_PYTHON
     if ( (items & eFormatCategoryItemSynth)  == eFormatCategoryItemSynth )
         success = m_synth_nav->Delete(name) || success;
@@ -161,14 +193,22 @@ uint32_t
 TypeCategoryImpl::GetCount (FormatCategoryItems items)
 {
     uint32_t count = 0;
+
+    if ( (items & eFormatCategoryItemValue) == eFormatCategoryItemValue )
+        count += m_value_nav->GetCount();
+    if ( (items & eFormatCategoryItemRegexValue) == eFormatCategoryItemRegexValue )
+        count += m_regex_value_nav->GetCount();
+    
     if ( (items & eFormatCategoryItemSummary) == eFormatCategoryItemSummary )
         count += m_summary_nav->GetCount();
     if ( (items & eFormatCategoryItemRegexSummary) == eFormatCategoryItemRegexSummary )
         count += m_regex_summary_nav->GetCount();
+
     if ( (items & eFormatCategoryItemFilter)  == eFormatCategoryItemFilter )
         count += m_filter_nav->GetCount();
     if ( (items & eFormatCategoryItemRegexFilter) == eFormatCategoryItemRegexFilter )
         count += m_regex_filter_nav->GetCount();
+
 #ifndef LLDB_DISABLE_PYTHON
     if ( (items & eFormatCategoryItemSynth)  == eFormatCategoryItemSynth )
         count += m_synth_nav->GetCount();
@@ -188,15 +228,39 @@ TypeCategoryImpl::AnyMatches(ConstString type_name,
     if (!IsEnabled() && only_enabled)
         return false;
     
-    lldb::TypeSummaryImplSP summary;
-    TypeFilterImpl::SharedPointer filter;
+    lldb::TypeFormatImplSP format_sp;
+    lldb::TypeSummaryImplSP summary_sp;
+    TypeFilterImpl::SharedPointer filter_sp;
 #ifndef LLDB_DISABLE_PYTHON
-    ScriptedSyntheticChildren::SharedPointer synth;
+    ScriptedSyntheticChildren::SharedPointer synth_sp;
 #endif
     
+    if ( (items & eFormatCategoryItemValue) == eFormatCategoryItemValue )
+    {
+        if (m_value_nav->Get(type_name, format_sp))
+        {
+            if (matching_category)
+                *matching_category = m_name.GetCString();
+            if (matching_type)
+                *matching_type = eFormatCategoryItemValue;
+            return true;
+        }
+    }
+    if ( (items & eFormatCategoryItemRegexValue) == eFormatCategoryItemRegexValue )
+    {
+        if (m_regex_value_nav->Get(type_name, format_sp))
+        {
+            if (matching_category)
+                *matching_category = m_name.GetCString();
+            if (matching_type)
+                *matching_type = eFormatCategoryItemRegexValue;
+            return true;
+        }
+    }
+    
     if ( (items & eFormatCategoryItemSummary) == eFormatCategoryItemSummary )
     {
-        if (m_summary_nav->Get(type_name, summary))
+        if (m_summary_nav->Get(type_name, summary_sp))
         {
             if (matching_category)
                 *matching_category = m_name.GetCString();
@@ -207,7 +271,7 @@ TypeCategoryImpl::AnyMatches(ConstString type_name,
     }
     if ( (items & eFormatCategoryItemRegexSummary) == eFormatCategoryItemRegexSummary )
     {
-        if (m_regex_summary_nav->Get(type_name, summary))
+        if (m_regex_summary_nav->Get(type_name, summary_sp))
         {
             if (matching_category)
                 *matching_category = m_name.GetCString();
@@ -216,9 +280,10 @@ TypeCategoryImpl::AnyMatches(ConstString type_name,
             return true;
         }
     }
+    
     if ( (items & eFormatCategoryItemFilter)  == eFormatCategoryItemFilter )
     {
-        if (m_filter_nav->Get(type_name, filter))
+        if (m_filter_nav->Get(type_name, filter_sp))
         {
             if (matching_category)
                 *matching_category = m_name.GetCString();
@@ -229,7 +294,7 @@ TypeCategoryImpl::AnyMatches(ConstString type_name,
     }
     if ( (items & eFormatCategoryItemRegexFilter) == eFormatCategoryItemRegexFilter )
     {
-        if (m_regex_filter_nav->Get(type_name, filter))
+        if (m_regex_filter_nav->Get(type_name, filter_sp))
         {
             if (matching_category)
                 *matching_category = m_name.GetCString();
@@ -238,10 +303,11 @@ TypeCategoryImpl::AnyMatches(ConstString type_name,
             return true;
         }
     }
+    
 #ifndef LLDB_DISABLE_PYTHON
     if ( (items & eFormatCategoryItemSynth)  == eFormatCategoryItemSynth )
     {
-        if (m_synth_nav->Get(type_name, synth))
+        if (m_synth_nav->Get(type_name, synth_sp))
         {
             if (matching_category)
                 *matching_category = m_name.GetCString();
@@ -252,7 +318,7 @@ TypeCategoryImpl::AnyMatches(ConstString type_name,
     }
     if ( (items & eFormatCategoryItemRegexSynth) == eFormatCategoryItemRegexSynth )
     {
-        if (m_regex_synth_nav->Get(type_name, synth))
+        if (m_regex_synth_nav->Get(type_name, synth_sp))
         {
             if (matching_category)
                 *matching_category = m_name.GetCString();
@@ -265,6 +331,22 @@ TypeCategoryImpl::AnyMatches(ConstString type_name,
     return false;
 }
 
+TypeCategoryImpl::ValueNavigator::MapValueType
+TypeCategoryImpl::GetFormatForType (lldb::TypeNameSpecifierImplSP type_sp)
+{
+    ValueNavigator::MapValueType retval;
+    
+    if (type_sp)
+    {
+        if (type_sp->IsRegex())
+            m_regex_value_nav->GetExact(ConstString(type_sp->GetName()),retval);
+        else
+            m_value_nav->GetExact(ConstString(type_sp->GetName()),retval);
+    }
+    
+    return retval;
+}
+
 TypeCategoryImpl::SummaryNavigator::MapValueType
 TypeCategoryImpl::GetSummaryForType (lldb::TypeNameSpecifierImplSP type_sp)
 {
@@ -324,6 +406,15 @@ TypeCategoryImpl::GetTypeNameSpecifierForSummaryAtIndex (size_t index)
         return m_regex_summary_nav->GetTypeNameSpecifierAtIndex(index-m_summary_nav->GetCount());
 }
 
+TypeCategoryImpl::ValueNavigator::MapValueType
+TypeCategoryImpl::GetFormatAtIndex (size_t index)
+{
+    if (index < m_value_nav->GetCount())
+        return m_value_nav->GetAtIndex(index);
+    else
+        return m_regex_value_nav->GetAtIndex(index-m_value_nav->GetCount());
+}
+
 TypeCategoryImpl::SummaryNavigator::MapValueType
 TypeCategoryImpl::GetSummaryAtIndex (size_t index)
 {
@@ -342,6 +433,15 @@ TypeCategoryImpl::GetFilterAtIndex (size_t index)
         return m_regex_filter_nav->GetAtIndex(index-m_filter_nav->GetCount());
 }
 
+lldb::TypeNameSpecifierImplSP
+TypeCategoryImpl::GetTypeNameSpecifierForFormatAtIndex (size_t index)
+{
+    if (index < m_value_nav->GetCount())
+        return m_value_nav->GetTypeNameSpecifierAtIndex(index);
+    else
+        return m_regex_value_nav->GetTypeNameSpecifierAtIndex(index-m_value_nav->GetCount());
+}
+
 lldb::TypeNameSpecifierImplSP
 TypeCategoryImpl::GetTypeNameSpecifierForFilterAtIndex (size_t index)
 {
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategoryMap.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategoryMap.cpp
index 4b7222adbec..c6dba1b9f4b 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategoryMap.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/TypeCategoryMap.cpp
@@ -11,6 +11,9 @@
 
 #include "lldb/DataFormatters/TypeCategoryMap.h"
 
+#include "lldb/DataFormatters/FormatClasses.h"
+#include "lldb/DataFormatters/FormatManager.h"
+
 // C Includes
 // C++ Includes
 // Other libraries and framework includes
@@ -176,6 +179,34 @@ TypeCategoryMap::AnyMatches (ConstString type_name,
     return false;
 }
 
+lldb::TypeFormatImplSP
+TypeCategoryMap::GetFormat (ValueObject& valobj,
+                            lldb::DynamicValueType use_dynamic)
+{
+    Mutex::Locker locker(m_map_mutex);
+    
+    uint32_t reason_why;
+    ActiveCategoriesIterator begin, end = m_active_categories.end();
+    
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
+    
+    FormattersMatchVector matches = FormatManager::GetPossibleMatches(valobj, use_dynamic);
+    
+    for (begin = m_active_categories.begin(); begin != end; begin++)
+    {
+        lldb::TypeCategoryImplSP category_sp = *begin;
+        lldb::TypeFormatImplSP current_format;
+        if (log)
+            log->Printf("\n[TypeCategoryMap::GetFormat] Trying to use category %s", category_sp->GetName());
+        if (!category_sp->Get(valobj, matches, current_format, &reason_why))
+            continue;
+        return current_format;
+    }
+    if (log)
+        log->Printf("[TypeCategoryMap::GetFormat] nothing found - returning empty SP");
+    return lldb::TypeFormatImplSP();
+}
+
 lldb::TypeSummaryImplSP
 TypeCategoryMap::GetSummaryFormat (ValueObject& valobj,
                                    lldb::DynamicValueType use_dynamic)
@@ -187,13 +218,15 @@ TypeCategoryMap::GetSummaryFormat (ValueObject& valobj,
     
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
     
+    FormattersMatchVector matches = FormatManager::GetPossibleMatches(valobj, use_dynamic);
+    
     for (begin = m_active_categories.begin(); begin != end; begin++)
     {
         lldb::TypeCategoryImplSP category_sp = *begin;
         lldb::TypeSummaryImplSP current_format;
         if (log)
             log->Printf("\n[CategoryMap::GetSummaryFormat] Trying to use category %s", category_sp->GetName());
-        if (!category_sp->Get(valobj, current_format, use_dynamic, &reason_why))
+        if (!category_sp->Get(valobj, matches, current_format, &reason_why))
             continue;
         return current_format;
     }
@@ -215,13 +248,15 @@ TypeCategoryMap::GetSyntheticChildren (ValueObject& valobj,
     
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TYPES));
     
+    FormattersMatchVector matches = FormatManager::GetPossibleMatches(valobj, use_dynamic);
+    
     for (begin = m_active_categories.begin(); begin != end; begin++)
     {
         lldb::TypeCategoryImplSP category_sp = *begin;
         lldb::SyntheticChildrenSP current_format;
         if (log)
             log->Printf("\n[CategoryMap::GetSyntheticChildren] Trying to use category %s", category_sp->GetName());
-        if (!category_sp->Get(valobj, current_format, use_dynamic, &reason_why))
+        if (!category_sp->Get(valobj, matches, current_format, &reason_why))
             continue;
         return current_format;
     }
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/TypeFormat.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/TypeFormat.cpp
index 279704f2af1..7f18ddef726 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/TypeFormat.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/TypeFormat.cpp
@@ -42,7 +42,7 @@ std::string
 TypeFormatImpl::GetDescription()
 {
     StreamString sstr;
-    sstr.Printf ("%s%s%s%s\n",
+    sstr.Printf ("%s%s%s%s",
                  FormatManager::GetFormatAsCString (GetFormat()),
                  Cascades() ? "" : " (not cascading)",
                  SkipsPointers() ? " (skip pointers)" : "",
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/TypeSummary.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/TypeSummary.cpp
index 8c4d3f71c05..4c75b4b87d0 100644
--- a/contrib/llvm/tools/lldb/source/DataFormatters/TypeSummary.cpp
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/TypeSummary.cpp
@@ -23,6 +23,7 @@
 #include "lldb/Core/StreamString.h"
 #include "lldb/Core/Timer.h"
 #include "lldb/DataFormatters/TypeSummary.h"
+#include "lldb/DataFormatters/ValueObjectPrinter.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Symbol/ClangASTType.h"
 #include "lldb/Target/StackFrame.h"
@@ -65,51 +66,12 @@ StringSummaryFormat::FormatObject (ValueObject *valobj,
     if (frame)
         sc = frame->GetSymbolContext(lldb::eSymbolContextEverything);
     
-    if (IsOneliner())
+    if (IsOneLiner())
     {
-        ValueObject* object;
-        
-        ValueObjectSP synth_valobj = valobj->GetSyntheticValue();
-        if (synth_valobj)
-            object = synth_valobj.get();
-        else
-            object = valobj;
-        
-        const uint32_t num_children = object->GetNumChildren();
-        if (num_children)
-        {
-            s.PutChar('(');
-            
-            for (uint32_t idx=0; idx<num_children; ++idx)
-            {
-                lldb::ValueObjectSP child_sp(object->GetChildAtIndex(idx, true));
-                if (child_sp.get())
-                {
-                    if (idx)
-                        s.PutCString(", ");
-                    if (!HideNames())
-                    {
-                        s.PutCString(child_sp.get()->GetName().AsCString());
-                        s.PutCString(" = ");
-                    }
-                    child_sp.get()->DumpPrintableRepresentation(s,
-                                                                ValueObject::eValueObjectRepresentationStyleSummary,
-                                                                lldb::eFormatInvalid,
-                                                                ValueObject::ePrintableRepresentationSpecialCasesDisable);
-                }
-            }
-            
-            s.PutChar(')');
-            
-            retval.assign(s.GetString());
-            return true;
-        }
-        else
-        {
-            retval.assign("error: oneliner for no children");
-            return false;
-        }
-        
+        ValueObjectPrinter printer(valobj,&s,DumpValueObjectOptions());
+        printer.PrintChildrenOneLiner(HideNames());
+        retval.assign(s.GetData());
+        return true;
     }
     else
     {
@@ -135,7 +97,7 @@ StringSummaryFormat::GetDescription ()
                  Cascades() ? "" : " (not cascading)",
                  !DoesPrintChildren() ? "" : " (show children)",
                  !DoesPrintValue() ? " (hide value)" : "",
-                 IsOneliner() ? " (one-line printout)" : "",
+                 IsOneLiner() ? " (one-line printout)" : "",
                  SkipsPointers() ? " (skip pointers)" : "",
                  SkipsReferences() ? " (skip references)" : "",
                  HideNames() ? " (hide member names)" : "");
@@ -171,7 +133,7 @@ CXXFunctionSummaryFormat::GetDescription ()
                  Cascades() ? "" : " (not cascading)",
                  !DoesPrintChildren() ? "" : " (show children)",
                  !DoesPrintValue() ? " (hide value)" : "",
-                 IsOneliner() ? " (one-line printout)" : "",
+                 IsOneLiner() ? " (one-line printout)" : "",
                  SkipsPointers() ? " (skip pointers)" : "",
                  SkipsReferences() ? " (skip references)" : "",
                  HideNames() ? " (hide member names)" : "");
@@ -238,7 +200,7 @@ ScriptSummaryFormat::GetDescription ()
     sstr.Printf ("%s%s%s%s%s%s%s\n%s",       Cascades() ? "" : " (not cascading)",
                  !DoesPrintChildren() ? "" : " (show children)",
                  !DoesPrintValue() ? " (hide value)" : "",
-                 IsOneliner() ? " (one-line printout)" : "",
+                 IsOneLiner() ? " (one-line printout)" : "",
                  SkipsPointers() ? " (skip pointers)" : "",
                  SkipsReferences() ? " (skip references)" : "",
                  HideNames() ? " (hide member names)" : "",
diff --git a/contrib/llvm/tools/lldb/source/DataFormatters/ValueObjectPrinter.cpp b/contrib/llvm/tools/lldb/source/DataFormatters/ValueObjectPrinter.cpp
new file mode 100644
index 00000000000..5c7f48b600b
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/DataFormatters/ValueObjectPrinter.cpp
@@ -0,0 +1,623 @@
+//===-- ValueObjectPrinter.cpp -------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/DataFormatters/ValueObjectPrinter.h"
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
+#include "lldb/Core/Debugger.h"
+#include "lldb/DataFormatters/DataVisualization.h"
+#include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Target/Target.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+ValueObjectPrinter::ValueObjectPrinter (ValueObject* valobj,
+                                        Stream* s,
+                                        const DumpValueObjectOptions& options)
+{
+    Init(valobj,s,options,options.m_max_ptr_depth,0);
+}
+
+ValueObjectPrinter::ValueObjectPrinter (ValueObject* valobj,
+                                        Stream* s,
+                                        const DumpValueObjectOptions& options,
+                                        uint32_t ptr_depth,
+                                        uint32_t curr_depth)
+{
+    Init(valobj,s,options,ptr_depth,curr_depth);
+}
+
+void
+ValueObjectPrinter::Init (ValueObject* valobj,
+                          Stream* s,
+                          const DumpValueObjectOptions& options,
+                          uint32_t ptr_depth,
+                          uint32_t curr_depth)
+{
+    m_orig_valobj = valobj;
+    m_valobj = nullptr;
+    m_stream = s;
+    this->options = options;
+    m_ptr_depth = ptr_depth;
+    m_curr_depth = curr_depth;
+    assert (m_orig_valobj && "cannot print a NULL ValueObject");
+    assert (m_stream && "cannot print to a NULL Stream");
+    m_should_print = eLazyBoolCalculate;
+    m_is_nil = eLazyBoolCalculate;
+    m_is_ptr = eLazyBoolCalculate;
+    m_is_ref = eLazyBoolCalculate;
+    m_is_aggregate = eLazyBoolCalculate;
+    m_summary_formatter = {nullptr,false};
+    m_value.assign("");
+    m_summary.assign("");
+    m_error.assign("");
+}
+
+bool
+ValueObjectPrinter::PrintValueObject ()
+{
+    if (!GetDynamicValueIfNeeded () || m_valobj == nullptr)
+        return false;
+    
+    if (ShouldPrintValueObject())
+    {
+        PrintLocationIfNeeded();
+        m_stream->Indent();
+        
+        bool show_type = PrintTypeIfNeeded();
+        
+        PrintNameIfNeeded(show_type);
+    }
+
+    bool value_printed = false;
+    bool summary_printed = false;
+    
+    bool val_summary_ok = PrintValueAndSummaryIfNeeded (value_printed,summary_printed);
+
+    if (val_summary_ok)
+        PrintChildrenIfNeeded (value_printed, summary_printed);
+    else
+        m_stream->EOL();
+    
+    return true;
+}
+
+bool
+ValueObjectPrinter::GetDynamicValueIfNeeded ()
+{
+    if (m_valobj)
+        return true;
+    bool update_success = m_orig_valobj->UpdateValueIfNeeded (true);
+    if (!update_success)
+    {
+        m_valobj = m_orig_valobj;
+    }
+    else
+    {
+        if (m_orig_valobj->IsDynamic())
+        {
+            if (options.m_use_dynamic == eNoDynamicValues)
+            {
+                ValueObject *static_value = m_orig_valobj->GetStaticValue().get();
+                if (static_value)
+                    m_valobj = static_value;
+                else
+                    m_valobj = m_orig_valobj;
+            }
+            else
+                m_valobj = m_orig_valobj;
+        }
+        else
+        {
+            if (options.m_use_dynamic != eNoDynamicValues)
+            {
+                ValueObject *dynamic_value = m_orig_valobj->GetDynamicValue(options.m_use_dynamic).get();
+                if (dynamic_value)
+                    m_valobj = dynamic_value;
+                else
+                    m_valobj = m_orig_valobj;
+            }
+            else
+                m_valobj = m_orig_valobj;
+        }
+    }
+    m_clang_type = m_valobj->GetClangType();
+    m_type_flags = m_clang_type.GetTypeInfo ();
+    return true;
+}
+
+const char*
+ValueObjectPrinter::GetDescriptionForDisplay ()
+{
+    const char* str = m_valobj->GetObjectDescription();
+    if (!str)
+        str = m_valobj->GetSummaryAsCString();
+    if (!str)
+        str = m_valobj->GetValueAsCString();
+    return str;
+}
+
+const char*
+ValueObjectPrinter::GetRootNameForDisplay (const char* if_fail)
+{
+    const char *root_valobj_name = options.m_root_valobj_name.empty() ?
+        m_valobj->GetName().AsCString() :
+        options.m_root_valobj_name.c_str();
+    return root_valobj_name ? root_valobj_name : if_fail;
+}
+
+bool
+ValueObjectPrinter::ShouldPrintValueObject ()
+{
+    if (m_should_print == eLazyBoolCalculate)
+        m_should_print = (options.m_flat_output == false || m_type_flags.Test (ClangASTType::eTypeHasValue)) ? eLazyBoolYes : eLazyBoolNo;
+    return m_should_print == eLazyBoolYes;
+}
+
+bool
+ValueObjectPrinter::IsNil ()
+{
+    if (m_is_nil == eLazyBoolCalculate)
+        m_is_nil = m_valobj->IsObjCNil() ? eLazyBoolYes : eLazyBoolNo;
+    return m_is_nil == eLazyBoolYes;
+}
+
+bool
+ValueObjectPrinter::IsPtr ()
+{
+    if (m_is_ptr == eLazyBoolCalculate)
+        m_is_ptr = m_type_flags.Test (ClangASTType::eTypeIsPointer) ? eLazyBoolYes : eLazyBoolNo;
+    return m_is_ptr == eLazyBoolYes;
+}
+
+bool
+ValueObjectPrinter::IsRef ()
+{
+    if (m_is_ref == eLazyBoolCalculate)
+        m_is_ref = m_type_flags.Test (ClangASTType::eTypeIsReference) ? eLazyBoolYes : eLazyBoolNo;
+    return m_is_ref == eLazyBoolYes;
+}
+
+bool
+ValueObjectPrinter::IsAggregate ()
+{
+    if (m_is_aggregate == eLazyBoolCalculate)
+        m_is_aggregate = m_type_flags.Test (ClangASTType::eTypeHasChildren) ? eLazyBoolYes : eLazyBoolNo;
+    return m_is_aggregate == eLazyBoolYes;
+}
+
+bool
+ValueObjectPrinter::PrintLocationIfNeeded ()
+{
+    if (options.m_show_location)
+    {
+        m_stream->Printf("%s: ", m_valobj->GetLocationAsCString());
+        return true;
+    }
+    return false;
+}
+
+bool
+ValueObjectPrinter::PrintTypeIfNeeded ()
+{
+    bool show_type = true;
+    // if we are at the root-level and been asked to hide the root's type, then hide it
+    if (m_curr_depth == 0 && options.m_hide_root_type)
+        show_type = false;
+    else
+        // otherwise decide according to the usual rules (asked to show types - always at the root level)
+        show_type = options.m_show_types || (m_curr_depth == 0 && !options.m_flat_output);
+    
+    if (show_type)
+    {
+        // Some ValueObjects don't have types (like registers sets). Only print
+        // the type if there is one to print
+        ConstString qualified_type_name(m_valobj->GetQualifiedTypeName());
+        if (qualified_type_name)
+            m_stream->Printf("(%s) ", qualified_type_name.GetCString());
+        else
+            show_type = false;
+    }
+    return show_type;
+}
+
+bool
+ValueObjectPrinter::PrintNameIfNeeded (bool show_type)
+{
+    if (options.m_flat_output)
+    {
+        // If we are showing types, also qualify the C++ base classes
+        const bool qualify_cxx_base_classes = show_type;
+        if (!options.m_hide_name)
+        {
+            m_valobj->GetExpressionPath(*m_stream, qualify_cxx_base_classes);
+            m_stream->PutCString(" =");
+            return true;
+        }
+    }
+    else if (!options.m_hide_name)
+    {
+        const char *name_cstr = GetRootNameForDisplay("");
+        m_stream->Printf ("%s =", name_cstr);
+        return true;
+    }
+    return false;
+}
+
+bool
+ValueObjectPrinter::CheckScopeIfNeeded ()
+{
+    if (options.m_scope_already_checked)
+        return true;
+    return m_valobj->IsInScope();
+}
+
+TypeSummaryImpl*
+ValueObjectPrinter::GetSummaryFormatter ()
+{
+    if (m_summary_formatter.second == false)
+    {
+        TypeSummaryImpl* entry = options.m_summary_sp ? options.m_summary_sp.get() : m_valobj->GetSummaryFormat().get();
+        
+        if (options.m_omit_summary_depth > 0)
+            entry = NULL;
+        m_summary_formatter.first = entry;
+        m_summary_formatter.second = true;
+    }
+    return m_summary_formatter.first;
+}
+
+void
+ValueObjectPrinter::GetValueSummaryError (std::string& value,
+                                          std::string& summary,
+                                          std::string& error)
+{
+    if (options.m_format != eFormatDefault && options.m_format != m_valobj->GetFormat())
+    {
+        m_valobj->GetValueAsCString(options.m_format,
+                                    value);
+    }
+    else
+    {
+        const char* val_cstr = m_valobj->GetValueAsCString();
+        if (val_cstr)
+            value.assign(val_cstr);
+    }
+    const char* err_cstr = m_valobj->GetError().AsCString();
+    if (err_cstr)
+        error.assign(err_cstr);
+    
+    if (ShouldPrintValueObject())
+    {
+        if (IsNil())
+            summary.assign("nil");
+        else if (options.m_omit_summary_depth == 0)
+        {
+            TypeSummaryImpl* entry = GetSummaryFormatter();
+            if (entry)
+                m_valobj->GetSummaryAsCString(entry, summary);
+            else
+            {
+                const char* sum_cstr = m_valobj->GetSummaryAsCString();
+                if (sum_cstr)
+                    summary.assign(sum_cstr);
+            }
+        }
+    }
+}
+
+bool
+ValueObjectPrinter::PrintValueAndSummaryIfNeeded (bool& value_printed,
+                                                  bool& summary_printed)
+{
+    bool error_printed = false;
+    if (ShouldPrintValueObject())
+    {
+        if (!CheckScopeIfNeeded())
+            m_error.assign("out of scope");
+        if (m_error.empty())
+        {
+            GetValueSummaryError(m_value, m_summary, m_error);
+        }
+        if (m_error.size())
+        {
+            error_printed = true;
+            m_stream->Printf (" <%s>\n", m_error.c_str());
+        }
+        else
+        {
+            // Make sure we have a value and make sure the summary didn't
+            // specify that the value should not be printed - and do not print
+            // the value if this thing is nil
+            // (but show the value if the user passes a format explicitly)
+            TypeSummaryImpl* entry = GetSummaryFormatter();
+            if (!IsNil() && !m_value.empty() && (entry == NULL || (entry->DoesPrintValue() || options.m_format != eFormatDefault) || m_summary.empty()) && !options.m_hide_value)
+            {
+                m_stream->Printf(" %s", m_value.c_str());
+                value_printed = true;
+            }
+            
+            if (m_summary.size())
+            {
+                m_stream->Printf(" %s", m_summary.c_str());
+                summary_printed = true;
+            }
+        }
+    }
+    return !error_printed;
+}
+
+bool
+ValueObjectPrinter::PrintObjectDescriptionIfNeeded (bool value_printed,
+                                                    bool summary_printed)
+{
+    if (ShouldPrintValueObject())
+    {
+        // let's avoid the overly verbose no description error for a nil thing
+        if (options.m_use_objc && !IsNil())
+        {
+            if (!options.m_hide_value || !options.m_hide_name)
+                m_stream->Printf(" ");
+            const char *object_desc = nullptr;
+            if (value_printed || summary_printed)
+                object_desc = m_valobj->GetObjectDescription();
+            else
+                object_desc = GetDescriptionForDisplay();
+            if (object_desc && *object_desc)
+            {
+                m_stream->Printf("%s\n", object_desc);
+                return true;
+            }
+            else if (value_printed == false && summary_printed == false)
+                return true;
+            else
+                return false;
+        }
+    }
+    return true;
+}
+
+bool
+ValueObjectPrinter::ShouldPrintChildren (bool is_failed_description,
+                                         uint32_t& curr_ptr_depth)
+{
+    const bool is_ref = IsRef ();
+    const bool is_ptr = IsPtr ();
+
+    if (is_failed_description || m_curr_depth < options.m_max_depth)
+    {
+        // We will show children for all concrete types. We won't show
+        // pointer contents unless a pointer depth has been specified.
+        // We won't reference contents unless the reference is the
+        // root object (depth of zero).
+        
+        // Use a new temporary pointer depth in case we override the
+        // current pointer depth below...
+        uint32_t curr_ptr_depth = m_ptr_depth;
+        
+        if (is_ptr || is_ref)
+        {
+            // We have a pointer or reference whose value is an address.
+            // Make sure that address is not NULL
+            AddressType ptr_address_type;
+            if (m_valobj->GetPointerValue (&ptr_address_type) == 0)
+                return false;
+            
+            else if (is_ref && m_curr_depth == 0)
+            {
+                // If this is the root object (depth is zero) that we are showing
+                // and it is a reference, and no pointer depth has been supplied
+                // print out what it references. Don't do this at deeper depths
+                // otherwise we can end up with infinite recursion...
+                curr_ptr_depth = 1;
+            }
+            
+            return (curr_ptr_depth > 0);
+        }
+        
+        TypeSummaryImpl* entry = GetSummaryFormatter();
+
+        return (!entry || entry->DoesPrintChildren() || m_summary.empty());
+    }
+    return false;
+}
+
+ValueObject*
+ValueObjectPrinter::GetValueObjectForChildrenGeneration ()
+{
+    ValueObjectSP synth_valobj_sp = m_valobj->GetSyntheticValue (options.m_use_synthetic);
+    return (synth_valobj_sp ? synth_valobj_sp.get() : m_valobj);
+}
+
+void
+ValueObjectPrinter::PrintChildrenPreamble ()
+{
+    if (options.m_flat_output)
+    {
+        if (ShouldPrintValueObject())
+            m_stream->EOL();
+    }
+    else
+    {
+        if (ShouldPrintValueObject())
+            m_stream->PutCString(IsRef () ? ": {\n" : " {\n");
+        m_stream->IndentMore();
+    }
+}
+
+void
+ValueObjectPrinter::PrintChild (ValueObjectSP child_sp,
+                                uint32_t curr_ptr_depth)
+{
+    DumpValueObjectOptions child_options(options);
+    child_options.SetFormat(options.m_format).SetSummary().SetRootValueObjectName();
+    child_options.SetScopeChecked(true).SetHideName(options.m_hide_name).SetHideValue(options.m_hide_value)
+    .SetOmitSummaryDepth(child_options.m_omit_summary_depth > 1 ? child_options.m_omit_summary_depth - 1 : 0);
+    if (child_sp.get())
+    {
+        ValueObjectPrinter child_printer(child_sp.get(),
+                                         m_stream,
+                                         child_options,
+                                         (IsPtr() || IsRef()) ? curr_ptr_depth - 1 : curr_ptr_depth,
+                                         m_curr_depth + 1);
+        child_printer.PrintValueObject();
+    }
+
+}
+
+uint32_t
+ValueObjectPrinter::GetMaxNumChildrenToPrint (bool& print_dotdotdot)
+{
+    ValueObject* synth_m_valobj = GetValueObjectForChildrenGeneration();
+    
+    size_t num_children = synth_m_valobj->GetNumChildren();
+    print_dotdotdot = false;
+    if (num_children)
+    {
+        const size_t max_num_children = m_valobj->GetTargetSP()->GetMaximumNumberOfChildrenToDisplay();
+        
+        if (num_children > max_num_children && !options.m_ignore_cap)
+        {
+            print_dotdotdot = true;
+            return max_num_children;
+        }
+    }
+    return num_children;
+}
+
+void
+ValueObjectPrinter::PrintChildrenPostamble (bool print_dotdotdot)
+{
+    if (!options.m_flat_output)
+    {
+        if (print_dotdotdot)
+        {
+            m_valobj->GetTargetSP()->GetDebugger().GetCommandInterpreter().ChildrenTruncated();
+            m_stream->Indent("...\n");
+        }
+        m_stream->IndentLess();
+        m_stream->Indent("}\n");
+    }
+}
+
+void
+ValueObjectPrinter::PrintChildren (uint32_t curr_ptr_depth)
+{
+    ValueObject* synth_m_valobj = GetValueObjectForChildrenGeneration();
+    
+    bool print_dotdotdot = false;
+    size_t num_children = GetMaxNumChildrenToPrint(print_dotdotdot);
+    if (num_children)
+    {
+        PrintChildrenPreamble ();
+        
+        for (size_t idx=0; idx<num_children; ++idx)
+        {
+            ValueObjectSP child_sp(synth_m_valobj->GetChildAtIndex(idx, true));
+            PrintChild (child_sp, curr_ptr_depth);
+        }
+        
+        PrintChildrenPostamble (print_dotdotdot);
+    }
+    else if (IsAggregate())
+    {
+        // Aggregate, no children...
+        if (ShouldPrintValueObject())
+            m_stream->PutCString(" {}\n");
+    }
+    else
+    {
+        if (ShouldPrintValueObject())
+            m_stream->EOL();
+    }
+}
+
+bool
+ValueObjectPrinter::PrintChildrenOneLiner (bool hide_names)
+{
+    if (!GetDynamicValueIfNeeded () || m_valobj == nullptr)
+        return false;
+    
+    ValueObject* synth_m_valobj = GetValueObjectForChildrenGeneration();
+    
+    bool print_dotdotdot = false;
+    size_t num_children = GetMaxNumChildrenToPrint(print_dotdotdot);
+    
+    if (num_children)
+    {
+        m_stream->PutChar('(');
+        
+        for (uint32_t idx=0; idx<num_children; ++idx)
+        {
+            lldb::ValueObjectSP child_sp(synth_m_valobj->GetChildAtIndex(idx, true));
+            lldb::ValueObjectSP child_dyn_sp = child_sp.get() ? child_sp->GetDynamicValue(options.m_use_dynamic) : child_sp;
+            if (child_dyn_sp)
+                child_sp = child_dyn_sp;
+            if (child_sp)
+            {
+                if (idx)
+                    m_stream->PutCString(", ");
+                if (!hide_names)
+                {
+                    const char* name = child_sp.get()->GetName().AsCString();
+                    if (name && *name)
+                    {
+                        m_stream->PutCString(name);
+                        m_stream->PutCString(" = ");
+                    }
+                }
+                child_sp->DumpPrintableRepresentation(*m_stream,
+                                                      ValueObject::eValueObjectRepresentationStyleSummary,
+                                                      lldb::eFormatInvalid,
+                                                      ValueObject::ePrintableRepresentationSpecialCasesDisable);
+            }
+        }
+        
+        if (print_dotdotdot)
+            m_stream->PutCString(", ...)");
+        else
+            m_stream->PutChar(')');
+    }
+    return true;
+}
+
+void
+ValueObjectPrinter::PrintChildrenIfNeeded (bool value_printed,
+                                           bool summary_printed)
+{
+    // this flag controls whether we tried to display a description for this object and failed
+    // if that happens, we want to display the children, if any
+    bool is_failed_description = !PrintObjectDescriptionIfNeeded(value_printed, summary_printed);
+    
+    uint32_t curr_ptr_depth = m_ptr_depth;
+    bool print_children = ShouldPrintChildren (is_failed_description,curr_ptr_depth);
+    bool print_oneline = (curr_ptr_depth > 0 || options.m_show_types || options.m_be_raw) ? false : DataVisualization::ShouldPrintAsOneLiner(*m_valobj);
+    
+    if (print_children)
+    {
+        if (print_oneline)
+        {
+            m_stream->PutChar(' ');
+            PrintChildrenOneLiner (false);
+            m_stream->EOL();
+        }
+        else
+            PrintChildren (curr_ptr_depth);
+    }
+    else if (m_curr_depth >= options.m_max_depth && IsAggregate() && ShouldPrintValueObject())
+    {
+            m_stream->PutCString("{...}\n");
+    }
+    else
+        m_stream->EOL();
+}
diff --git a/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp b/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp
index 49513d740f3..316efdf9c14 100644
--- a/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp
@@ -878,31 +878,34 @@ FindObjCMethodDeclsWithOrigin (unsigned int current_id,
     if (!result[0])
         return false;
     
-    ObjCMethodDecl *result_method = dyn_cast<ObjCMethodDecl>(result[0]);
-    
-    if (!result_method)
-        return false;
-    
-    Decl *copied_decl = ast_importer->CopyDecl(ast_context, &result_method->getASTContext(), result_method);
-    
-    if (!copied_decl)
-        return false;
-    
-    ObjCMethodDecl *copied_method_decl = dyn_cast<ObjCMethodDecl>(copied_decl);
-    
-    if (!copied_method_decl)
-        return false;
-    
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
-    
-    if (log)
+    for (NamedDecl *named_decl : result)
     {
-        ASTDumper dumper((Decl*)copied_method_decl);
-        log->Printf("  CAS::FOMD[%d] found (%s) %s", current_id, log_info, dumper.GetCString());
+        ObjCMethodDecl *result_method = dyn_cast<ObjCMethodDecl>(named_decl);
+        
+        if (!result_method)
+            return false;
+        
+        Decl *copied_decl = ast_importer->CopyDecl(ast_context, &result_method->getASTContext(), result_method);
+        
+        if (!copied_decl)
+            return false;
+        
+        ObjCMethodDecl *copied_method_decl = dyn_cast<ObjCMethodDecl>(copied_decl);
+        
+        if (!copied_method_decl)
+            return false;
+        
+        Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
+        
+        if (log)
+        {
+            ASTDumper dumper((Decl*)copied_method_decl);
+            log->Printf("  CAS::FOMD[%d] found (%s) %s", current_id, log_info, dumper.GetCString());
+        }
+        
+        context.AddNamedDecl(copied_method_decl);
     }
     
-    context.AddNamedDecl(copied_method_decl);
-    
     return true;
 }
 
diff --git a/contrib/llvm/tools/lldb/source/Expression/ClangExpressionDeclMap.cpp b/contrib/llvm/tools/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 072e7819cd0..87c984ddcfb 100644
--- a/contrib/llvm/tools/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/ClangExpressionDeclMap.cpp
@@ -21,6 +21,7 @@
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Module.h"
+#include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/RegisterValue.h"
 #include "lldb/Core/ValueObjectConstResult.h"
 #include "lldb/Core/ValueObjectVariable.h"
@@ -514,6 +515,7 @@ FindCodeSymbolInContext
             {
                 case eSymbolTypeCode:
                 case eSymbolTypeResolver:
+                case eSymbolTypeReExported:
                     sc_list.Append(sym_ctx);
                     break;
 
@@ -546,7 +548,8 @@ ClangExpressionDeclMap::GetFunctionAddress
     
     FindCodeSymbolInContext(name, m_parser_vars->m_sym_ctx, sc_list);
 
-    if (!sc_list.GetSize())
+    uint32_t sc_list_size = sc_list.GetSize();
+    if (sc_list_size == 0)
     {
         // We occasionally get debug information in which a const function is reported 
         // as non-const, so the mangled name is wrong.  This is a hack to compensate.
@@ -562,40 +565,64 @@ ClangExpressionDeclMap::GetFunctionAddress
                 log->Printf("Failed to find symbols given non-const name %s; trying %s", name.GetCString(), fixed_name.GetCString());
             
             FindCodeSymbolInContext(fixed_name, m_parser_vars->m_sym_ctx, sc_list);
+            sc_list_size = sc_list.GetSize();
         }
     }
-    
-    if (!sc_list.GetSize())
-        return false;
 
-    SymbolContext sym_ctx;
-    sc_list.GetContextAtIndex(0, sym_ctx);
+    for (uint32_t i=0; i<sc_list_size; ++i)
+    {
+        SymbolContext sym_ctx;
+        sc_list.GetContextAtIndex(i, sym_ctx);
 
-    const Address *func_so_addr = NULL;
-    bool is_indirect_function = false;
+        const Address *func_so_addr = NULL;
+        bool is_indirect_function = false;
+        if (sym_ctx.function)
+            func_so_addr = &sym_ctx.function->GetAddressRange().GetBaseAddress();
+        else if (sym_ctx.symbol)
+        {
+            if (sym_ctx.symbol->GetType() == eSymbolTypeReExported)
+            {
+                Symbol *reexported_symbol = sym_ctx.symbol->ResolveReExportedSymbol(*target);
+                if (reexported_symbol)
+                {
+                    func_so_addr = &reexported_symbol->GetAddress();
+                    is_indirect_function = reexported_symbol->IsIndirect();
+                }
+            }
+            else
+            {
+                func_so_addr = &sym_ctx.symbol->GetAddress();
+                is_indirect_function = sym_ctx.symbol->IsIndirect();
+            }
+        }
 
-    if (sym_ctx.function)
-        func_so_addr = &sym_ctx.function->GetAddressRange().GetBaseAddress();
-    else if (sym_ctx.symbol) {
-        func_so_addr = &sym_ctx.symbol->GetAddress();
-        is_indirect_function = sym_ctx.symbol->IsIndirect();
-    } else
-        return false;
-
-    if (!func_so_addr || !func_so_addr->IsValid())
-        return false;
-
-    func_addr = func_so_addr->GetCallableLoadAddress (target, is_indirect_function);
-
-    return true;
+        if (func_so_addr && func_so_addr->IsValid())
+        {
+            lldb::addr_t load_addr = func_so_addr->GetCallableLoadAddress (target, is_indirect_function);
+            
+            if (load_addr != LLDB_INVALID_ADDRESS)
+            {
+                func_addr = load_addr;
+                return true;
+            }
+        }
+    }
+    return false;
 }
 
 addr_t
-ClangExpressionDeclMap::GetSymbolAddress (Target &target, Process *process, const ConstString &name, lldb::SymbolType symbol_type)
+ClangExpressionDeclMap::GetSymbolAddress (Target &target,
+                                          Process *process,
+                                          const ConstString &name,
+                                          lldb::SymbolType symbol_type,
+                                          lldb_private::Module *module)
 {
     SymbolContextList sc_list;
     
-    target.GetImages().FindSymbolsWithNameAndType(name, symbol_type, sc_list);
+    if (module)
+        module->FindSymbolsWithNameAndType(name, symbol_type, sc_list);
+    else
+        target.GetImages().FindSymbolsWithNameAndType(name, symbol_type, sc_list);
     
     const uint32_t num_matches = sc_list.GetSize();
     addr_t symbol_load_addr = LLDB_INVALID_ADDRESS;
@@ -623,6 +650,28 @@ ClangExpressionDeclMap::GetSymbolAddress (Target &target, Process *process, cons
                     symbol_load_addr = sym_address->GetCallableLoadAddress (&target, true);
                     break;
 
+                case eSymbolTypeReExported:
+                    {
+                        ConstString reexport_name = sym_ctx.symbol->GetReExportedSymbolName();
+                        if (reexport_name)
+                        {
+                            ModuleSP reexport_module_sp;
+                            ModuleSpec reexport_module_spec;
+                            reexport_module_spec.GetPlatformFileSpec() = sym_ctx.symbol->GetReExportedSymbolSharedLibrary();
+                            if (reexport_module_spec.GetPlatformFileSpec())
+                            {
+                                reexport_module_sp = target.GetImages().FindFirstModule(reexport_module_spec);
+                                if (!reexport_module_sp)
+                                {
+                                    reexport_module_spec.GetPlatformFileSpec().GetDirectory().Clear();
+                                    reexport_module_sp = target.GetImages().FindFirstModule(reexport_module_spec);
+                                }
+                            }
+                            symbol_load_addr = GetSymbolAddress(target, process, sym_ctx.symbol->GetReExportedSymbolName(), symbol_type, reexport_module_sp.get());
+                        }
+                    }
+                    break;
+
                 case eSymbolTypeData:
                 case eSymbolTypeRuntime:
                 case eSymbolTypeVariable:
@@ -680,11 +729,15 @@ ClangExpressionDeclMap::GetSymbolAddress (const ConstString &name, lldb::SymbolT
 
 const Symbol *
 ClangExpressionDeclMap::FindGlobalDataSymbol (Target &target,
-                                              const ConstString &name)
+                                              const ConstString &name,
+                                              lldb_private::Module *module)
 {
     SymbolContextList sc_list;
     
-    target.GetImages().FindSymbolsWithNameAndType(name, eSymbolTypeAny, sc_list);
+    if (module)
+        module->FindSymbolsWithNameAndType(name, eSymbolTypeAny, sc_list);
+    else
+        target.GetImages().FindSymbolsWithNameAndType(name, eSymbolTypeAny, sc_list);
     
     const uint32_t matches = sc_list.GetSize();
     for (uint32_t i=0; i<matches; ++i)
@@ -716,6 +769,28 @@ ClangExpressionDeclMap::FindGlobalDataSymbol (Target &target,
                         }
                         return symbol;
 
+                    case eSymbolTypeReExported:
+                        {
+                            ConstString reexport_name = symbol->GetReExportedSymbolName();
+                            if (reexport_name)
+                            {
+                                ModuleSP reexport_module_sp;
+                                ModuleSpec reexport_module_spec;
+                                reexport_module_spec.GetPlatformFileSpec() = symbol->GetReExportedSymbolSharedLibrary();
+                                if (reexport_module_spec.GetPlatformFileSpec())
+                                {
+                                    reexport_module_sp = target.GetImages().FindFirstModule(reexport_module_spec);
+                                    if (!reexport_module_sp)
+                                    {
+                                        reexport_module_spec.GetPlatformFileSpec().GetDirectory().Clear();
+                                        reexport_module_sp = target.GetImages().FindFirstModule(reexport_module_spec);
+                                    }
+                                }
+                                return FindGlobalDataSymbol(target, symbol->GetReExportedSymbolName(), reexport_module_sp.get());
+                            }
+                        }
+                        break;
+                        
                     case eSymbolTypeCode: // We already lookup functions elsewhere
                     case eSymbolTypeVariable:
                     case eSymbolTypeLocal:
@@ -1286,7 +1361,7 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
             
             if (sc_list.GetSize())
             {
-                Symbol *generic_symbol = NULL;
+                Symbol *extern_symbol = NULL;
                 Symbol *non_extern_symbol = NULL;
                 
                 for (uint32_t index = 0, num_indices = sc_list.GetSize();
@@ -1315,8 +1390,15 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
                     }
                     else if (sym_ctx.symbol)
                     {
+                        if (sym_ctx.symbol->GetType() == eSymbolTypeReExported)
+                        {
+                            sym_ctx.symbol = sym_ctx.symbol->ResolveReExportedSymbol(*target);
+                            if (sym_ctx.symbol == NULL)
+                                continue;
+                        }
+                        
                         if (sym_ctx.symbol->IsExternal())
-                            generic_symbol = sym_ctx.symbol;
+                            extern_symbol = sym_ctx.symbol;
                         else
                             non_extern_symbol = sym_ctx.symbol;
                     }
@@ -1324,9 +1406,9 @@ ClangExpressionDeclMap::FindExternalVisibleDecls (NameSearchContext &context,
                 
                 if (!context.m_found.function_with_type_info)
                 {
-                    if (generic_symbol)
+                    if (extern_symbol)
                     {
-                        AddOneFunction (context, NULL, generic_symbol, current_id);
+                        AddOneFunction (context, NULL, extern_symbol, current_id);
                         context.m_found.function = true;
                     }
                     else if (non_extern_symbol)
@@ -1418,7 +1500,6 @@ ClangExpressionDeclMap::GetVariableValue (VariableSP &var,
         return false;
     }
     
-    // commented out because of <rdar://problem/11024417>
     ASTContext *ast = var_type->GetClangASTContext().getASTContext();
 
     if (!ast)
diff --git a/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp b/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp
index d026f2f3c12..94c217e38e5 100644
--- a/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp
@@ -55,10 +55,6 @@
 #include "llvm/Support/PathV1.h"
 #include "llvm/Support/TargetSelect.h"
 
-#if defined(__FreeBSD__)
-#define USE_STANDARD_JIT
-#endif
-
 #if defined (USE_STANDARD_JIT)
 #include "llvm/ExecutionEngine/JIT.h"
 #else
@@ -122,7 +118,6 @@ static FrontendAction *CreateFrontendBaseAction(CompilerInstance &CI) {
             
         case ASTDump:                return new ASTDumpAction();
         case ASTPrint:               return new ASTPrintAction();
-        case ASTDumpXML:             return new ASTDumpXMLAction();
         case ASTView:                return new ASTViewAction();
         case DumpRawTokens:          return new DumpRawTokensAction();
         case DumpTokens:             return new DumpTokensAction();
@@ -198,8 +193,6 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope,
             llvm::InitializeAllAsmPrinters();
             llvm::InitializeAllTargetMCs();
             llvm::InitializeAllDisassemblers();
-            
-            llvm::DisablePrettyStackTrace = true;
         }
     } InitializeLLVM;
     
@@ -321,6 +314,8 @@ ClangExpressionParser::ClangExpressionParser (ExecutionContextScope *exe_scope,
     // Set CodeGen options
     m_compiler->getCodeGenOpts().EmitDeclMetadata = true;
     m_compiler->getCodeGenOpts().InstrumentFunctions = false;
+    m_compiler->getCodeGenOpts().DisableFPElim = true;
+    m_compiler->getCodeGenOpts().OmitLeafFramePointer = false;
     
     // Disable some warnings.
     m_compiler->getDiagnostics().setDiagnosticGroupMapping("unused-value", clang::diag::MAP_IGNORE, SourceLocation());
diff --git a/contrib/llvm/tools/lldb/source/Expression/ClangFunction.cpp b/contrib/llvm/tools/lldb/source/Expression/ClangFunction.cpp
index 177138df801..e707c60ffce 100644
--- a/contrib/llvm/tools/lldb/source/Expression/ClangFunction.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/ClangFunction.cpp
@@ -80,7 +80,6 @@ ClangFunction::ClangFunction
     m_function_ptr (&function),
     m_function_addr (),
     m_function_return_type (),
-    m_clang_ast_context (ast_context),
     m_wrapper_function_name ("__lldb_function_caller"),
     m_wrapper_struct_name ("__lldb_caller_struct"),
     m_wrapper_args_addrs (),
@@ -112,7 +111,7 @@ ClangFunction::CompileFunction (Stream &errors)
     // FIXME: How does clang tell us there's no return value?  We need to handle that case.
     unsigned num_errors = 0;
     
-    std::string return_type_str (m_function_return_type.GetTypeName());
+    std::string return_type_str (m_function_return_type.GetTypeName().AsCString(""));
     
     // Cons up the function we're going to wrap our call in, then compile it...
     // We declare the function "extern "C"" because the compiler might be in C++
@@ -163,18 +162,18 @@ ClangFunction::CompileFunction (Stream &errors)
 
         if (trust_function)
         {
-            type_name = function_clang_type.GetFunctionArgumentTypeAtIndex(i).GetTypeName();
+            type_name = function_clang_type.GetFunctionArgumentTypeAtIndex(i).GetTypeName().AsCString("");
         }
         else
         {
             ClangASTType clang_qual_type = m_arg_values.GetValueAtIndex(i)->GetClangType ();
             if (clang_qual_type)
             {
-                type_name = clang_qual_type.GetTypeName();
+                type_name = clang_qual_type.GetTypeName().AsCString("");
             }
             else
             {   
-                errors.Printf("Could not determine type of input value %lu.", i);
+                errors.Printf("Could not determine type of input value %zu.", i);
                 return 1;
             }
         }
@@ -345,7 +344,7 @@ ClangFunction::WriteFunctionArguments (ExecutionContext &exe_ctx,
     size_t num_args = arg_values.GetSize();
     if (num_args != m_arg_values.GetSize())
     {
-        errors.Printf ("Wrong number of arguments - was: %lu should be: %lu", num_args, m_arg_values.GetSize());
+        errors.Printf ("Wrong number of arguments - was: %zu should be: %zu", num_args, m_arg_values.GetSize());
         return false;
     }
     
@@ -395,14 +394,9 @@ ClangFunction::InsertFunction (ExecutionContext &exe_ctx, lldb::addr_t &args_add
 
 ThreadPlan *
 ClangFunction::GetThreadPlanToCallFunction (ExecutionContext &exe_ctx, 
-                                            lldb::addr_t func_addr, 
-                                            lldb::addr_t &args_addr, 
-                                            Stream &errors, 
-                                            bool stop_others, 
-                                            bool unwind_on_error,
-                                            bool ignore_breakpoints,
-                                            lldb::addr_t *this_arg,
-                                            lldb::addr_t *cmd_arg)
+                                            lldb::addr_t args_addr,
+                                            const EvaluateExpressionOptions &options,
+                                            Stream &errors)
 {
     Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP));
     
@@ -419,16 +413,15 @@ ClangFunction::GetThreadPlanToCallFunction (ExecutionContext &exe_ctx,
 
     // Okay, now run the function:
 
-    Address wrapper_address (func_addr);
+    Address wrapper_address (m_jit_start_addr);
+    
+    lldb::addr_t args = { args_addr };
+    
     ThreadPlan *new_plan = new ThreadPlanCallFunction (*thread, 
                                                        wrapper_address,
                                                        ClangASTType(),
-                                                       args_addr,
-                                                       stop_others, 
-                                                       unwind_on_error,
-                                                       ignore_breakpoints,
-                                                       this_arg,
-                                                       cmd_arg);
+                                                       args,
+                                                       options);
     new_plan->SetIsMasterPlan(true);
     new_plan->SetOkayToDiscard (false);
     return new_plan;
@@ -479,113 +472,24 @@ ClangFunction::DeallocateFunctionResults (ExecutionContext &exe_ctx, lldb::addr_
     exe_ctx.GetProcessRef().DeallocateMemory(args_addr);
 }
 
-ExecutionResults
-ClangFunction::ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, Value &results)
-{
-    return ExecuteFunction (exe_ctx, errors, 1000, true, results);
-}
-
-ExecutionResults
-ClangFunction::ExecuteFunction(ExecutionContext &exe_ctx, Stream &errors, bool stop_others, Value &results)
-{
-    const bool try_all_threads = false;
-    const bool unwind_on_error = true;
-    const bool ignore_breakpoints = true;
-    return ExecuteFunction (exe_ctx, NULL, errors, stop_others, 0UL, try_all_threads,
-                            unwind_on_error, ignore_breakpoints, results);
-}
-
 ExecutionResults
 ClangFunction::ExecuteFunction(
         ExecutionContext &exe_ctx, 
+        lldb::addr_t *args_addr_ptr,
+        const EvaluateExpressionOptions &options,
         Stream &errors, 
-        uint32_t timeout_usec, 
-        bool try_all_threads, 
-        Value &results)
-{
-    const bool stop_others = true;
-    const bool unwind_on_error = true;
-    const bool ignore_breakpoints = true;
-    return ExecuteFunction (exe_ctx, NULL, errors, stop_others, timeout_usec,
-                            try_all_threads, unwind_on_error, ignore_breakpoints, results);
-}
-
-// This is the static function
-ExecutionResults 
-ClangFunction::ExecuteFunction (
-        ExecutionContext &exe_ctx, 
-        lldb::addr_t function_address, 
-        lldb::addr_t &void_arg,
-        bool stop_others,
-        bool try_all_threads,
-        bool unwind_on_error,
-        bool ignore_breakpoints,
-        uint32_t timeout_usec,
-        Stream &errors,
-        lldb::addr_t *this_arg)
-{
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP));
-
-    if (log)
-        log->Printf("== [ClangFunction::ExecuteFunction] Executing function ==");
-    
-    lldb::ThreadPlanSP call_plan_sp (ClangFunction::GetThreadPlanToCallFunction (exe_ctx,
-                                                                                 function_address, 
-                                                                                 void_arg, 
-                                                                                 errors, 
-                                                                                 stop_others, 
-                                                                                 unwind_on_error,
-                                                                                 ignore_breakpoints,
-                                                                                 this_arg));
-    if (!call_plan_sp)
-        return eExecutionSetupError;
-        
-    // <rdar://problem/12027563> we need to make sure we record the fact that we are running an expression here
-    // otherwise this fact will fail to be recorded when fetching an Objective-C object description
-    if (exe_ctx.GetProcessPtr())
-        exe_ctx.GetProcessPtr()->SetRunningUserExpression(true);
-    
-    ExecutionResults results = exe_ctx.GetProcessRef().RunThreadPlan (exe_ctx, call_plan_sp,
-                                                                      stop_others, 
-                                                                      try_all_threads, 
-                                                                      unwind_on_error,
-                                                                      ignore_breakpoints,
-                                                                      timeout_usec,
-                                                                      errors);
-    
-    if (log)
-    {
-        if (results != eExecutionCompleted)
-        {
-            log->Printf("== [ClangFunction::ExecuteFunction] Execution completed abnormally ==");
-        }
-        else
-        {
-            log->Printf("== [ClangFunction::ExecuteFunction] Execution completed normally ==");
-        }
-    }
-    
-    if (exe_ctx.GetProcessPtr())
-        exe_ctx.GetProcessPtr()->SetRunningUserExpression(false);
-    
-    return results;
-}
-
-ExecutionResults
-ClangFunction::ExecuteFunction(
-        ExecutionContext &exe_ctx, 
-        lldb::addr_t *args_addr_ptr, 
-        Stream &errors, 
-        bool stop_others, 
-        uint32_t timeout_usec, 
-        bool try_all_threads,
-        bool unwind_on_error,
-        bool ignore_breakpoints,
         Value &results)
 {
     using namespace clang;
     ExecutionResults return_value = eExecutionSetupError;
     
+    // ClangFunction::ExecuteFunction execution is always just to get the result.  Do make sure we ignore
+    // breakpoints, unwind on error, and don't try to debug it.
+    EvaluateExpressionOptions real_options = options;
+    real_options.SetDebug(false);
+    real_options.SetUnwindOnError(true);
+    real_options.SetIgnoreBreakpoints(true);
+    
     lldb::addr_t args_addr;
     
     if (args_addr_ptr != NULL)
@@ -601,17 +505,44 @@ ClangFunction::ExecuteFunction(
         if (!InsertFunction(exe_ctx, args_addr, errors))
             return eExecutionSetupError;
     }
-    
-    return_value = ClangFunction::ExecuteFunction (exe_ctx, 
-                                                   m_jit_start_addr, 
-                                                   args_addr, 
-                                                   stop_others, 
-                                                   try_all_threads, 
-                                                   unwind_on_error,
-                                                   ignore_breakpoints,
-                                                   timeout_usec, 
-                                                   errors);
 
+    Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP));
+
+    if (log)
+        log->Printf("== [ClangFunction::ExecuteFunction] Executing function ==");
+    
+    lldb::ThreadPlanSP call_plan_sp (GetThreadPlanToCallFunction (exe_ctx,
+                                                                  args_addr,
+                                                                  real_options,
+                                                                  errors));
+    if (!call_plan_sp)
+        return eExecutionSetupError;
+        
+    // <rdar://problem/12027563> we need to make sure we record the fact that we are running an expression here
+    // otherwise this fact will fail to be recorded when fetching an Objective-C object description
+    if (exe_ctx.GetProcessPtr())
+        exe_ctx.GetProcessPtr()->SetRunningUserExpression(true);
+    
+    return_value = exe_ctx.GetProcessRef().RunThreadPlan (exe_ctx,
+                                                          call_plan_sp,
+                                                          real_options,
+                                                          errors);
+    
+    if (log)
+    {
+        if (return_value != eExecutionCompleted)
+        {
+            log->Printf("== [ClangFunction::ExecuteFunction] Execution completed abnormally ==");
+        }
+        else
+        {
+            log->Printf("== [ClangFunction::ExecuteFunction] Execution completed normally ==");
+        }
+    }
+    
+    if (exe_ctx.GetProcessPtr())
+        exe_ctx.GetProcessPtr()->SetRunningUserExpression(false);
+    
     if (args_addr_ptr != NULL)
         *args_addr_ptr = args_addr;
     
@@ -629,5 +560,7 @@ ClangFunction::ExecuteFunction(
 clang::ASTConsumer *
 ClangFunction::ASTTransformer (clang::ASTConsumer *passthrough)
 {
-    return new ASTStructExtractor(passthrough, m_wrapper_struct_name.c_str(), *this);
+    m_struct_extractor.reset(new ASTStructExtractor(passthrough, m_wrapper_struct_name.c_str(), *this));
+    
+    return m_struct_extractor.get();
 }
diff --git a/contrib/llvm/tools/lldb/source/Expression/ClangUserExpression.cpp b/contrib/llvm/tools/lldb/source/Expression/ClangUserExpression.cpp
index 7f09f6fa094..d9ecd41be97 100644
--- a/contrib/llvm/tools/lldb/source/Expression/ClangUserExpression.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/ClangUserExpression.cpp
@@ -95,15 +95,9 @@ ClangUserExpression::~ClangUserExpression ()
 
 clang::ASTConsumer *
 ClangUserExpression::ASTTransformer (clang::ASTConsumer *passthrough)
-{    
-    ClangASTContext *clang_ast_context = m_target->GetScratchClangASTContext();
-    
-    if (!clang_ast_context)
-        return NULL;
-    
-    if (!m_result_synthesizer.get())
-        m_result_synthesizer.reset(new ASTResultSynthesizer(passthrough,
-                                                            *m_target));
+{
+    m_result_synthesizer.reset(new ASTResultSynthesizer(passthrough,
+                                                        *m_target));
     
     return m_result_synthesizer.get();
 }
@@ -508,6 +502,9 @@ ClangUserExpression::Parse (Stream &error_stream,
     if (!m_expr_decl_map->WillParse(exe_ctx, m_materializer_ap.get()))
     {
         error_stream.PutCString ("error: current process state is unsuitable for expression parsing\n");
+        
+        m_expr_decl_map.reset(); // We are being careful here in the case of breakpoint conditions.
+        
         return false;
     }
     
@@ -525,7 +522,7 @@ ClangUserExpression::Parse (Stream &error_stream,
     {
         error_stream.Printf ("error: %d errors parsing expression\n", num_errors);
         
-        m_expr_decl_map->DidParse();
+        m_expr_decl_map.reset(); // We are being careful here in the case of breakpoint conditions.
         
         return false;
     }
@@ -540,6 +537,8 @@ ClangUserExpression::Parse (Stream &error_stream,
                                                   exe_ctx,
                                                   m_can_interpret,
                                                   execution_policy);
+    
+    m_expr_decl_map.reset(); // Make this go away since we don't need any of its state after parsing.  This also gets rid of any ClangASTImporter::Minions.
         
     if (jit_error.Success())
     {
@@ -717,35 +716,6 @@ ClangUserExpression::PrepareToExecuteJITExpression (Stream &error_stream,
     return true;
 }
 
-ThreadPlan *
-ClangUserExpression::GetThreadPlanToExecuteJITExpression (Stream &error_stream,
-                                                          ExecutionContext &exe_ctx)
-{
-    lldb::addr_t struct_address;
-            
-    lldb::addr_t object_ptr = 0;
-    lldb::addr_t cmd_ptr = 0;
-    
-    PrepareToExecuteJITExpression (error_stream, exe_ctx, struct_address, object_ptr, cmd_ptr);
-    
-    // FIXME: This should really return a ThreadPlanCallUserExpression, in order to make sure that we don't release the
-    // ClangUserExpression resources before the thread plan finishes execution in the target.  But because we are 
-    // forcing unwind_on_error to be true here, in practical terms that can't happen.
-    
-    const bool stop_others = true;
-    const bool unwind_on_error = true;
-    const bool ignore_breakpoints = false;
-    return ClangFunction::GetThreadPlanToCallFunction (exe_ctx, 
-                                                       m_jit_start_addr, 
-                                                       struct_address, 
-                                                       error_stream,
-                                                       stop_others,
-                                                       unwind_on_error,
-                                                       ignore_breakpoints,
-                                                       (m_needs_object_ptr ? &object_ptr : NULL),
-                                                       (m_needs_object_ptr && m_objectivec) ? &cmd_ptr : NULL);
-}
-
 bool
 ClangUserExpression::FinalizeJITExecution (Stream &error_stream,
                                            ExecutionContext &exe_ctx,
@@ -785,12 +755,9 @@ ClangUserExpression::FinalizeJITExecution (Stream &error_stream,
 ExecutionResults
 ClangUserExpression::Execute (Stream &error_stream,
                               ExecutionContext &exe_ctx,
-                              bool unwind_on_error,
-                              bool ignore_breakpoints,
+                              const EvaluateExpressionOptions& options,
                               ClangUserExpression::ClangUserExpressionSP &shared_ptr_to_me,
-                              lldb::ClangExpressionVariableSP &result,
-                              bool run_others,
-                              uint32_t timeout_usec)
+                              lldb::ClangExpressionVariableSP &result)
 {
     // The expression log is quite verbose, and if you're just tracking the execution of the
     // expression, it's quite convenient to have these logs come out with the STEP log as well.
@@ -856,18 +823,22 @@ ClangUserExpression::Execute (Stream &error_stream,
         }
         else
         {
-            const bool stop_others = true;
-            const bool try_all_threads = run_others;
-            
             Address wrapper_address (m_jit_start_addr);
+            
+            llvm::SmallVector <lldb::addr_t, 3> args;
+            
+            if (m_needs_object_ptr) {
+                args.push_back(object_ptr);
+                if (m_objectivec)
+                    args.push_back(cmd_ptr);
+            }
+            
+            args.push_back(struct_address);
+            
             lldb::ThreadPlanSP call_plan_sp(new ThreadPlanCallUserExpression (exe_ctx.GetThreadRef(), 
                                                                               wrapper_address, 
-                                                                              struct_address, 
-                                                                              stop_others, 
-                                                                              unwind_on_error,
-                                                                              ignore_breakpoints,
-                                                                              (m_needs_object_ptr ? &object_ptr : NULL),
-                                                                              ((m_needs_object_ptr && m_objectivec) ? &cmd_ptr : NULL),
+                                                                              args,
+                                                                              options,
                                                                               shared_ptr_to_me));
             
             if (!call_plan_sp || !call_plan_sp->ValidatePlan (&error_stream))
@@ -885,12 +856,8 @@ ClangUserExpression::Execute (Stream &error_stream,
                 exe_ctx.GetProcessPtr()->SetRunningUserExpression(true);
                 
             ExecutionResults execution_result = exe_ctx.GetProcessRef().RunThreadPlan (exe_ctx, 
-                                                                                       call_plan_sp, 
-                                                                                       stop_others, 
-                                                                                       try_all_threads, 
-                                                                                       unwind_on_error,
-                                                                                       ignore_breakpoints,
-                                                                                       timeout_usec, 
+                                                                                       call_plan_sp,
+                                                                                       options,
                                                                                        error_stream);
             
             if (exe_ctx.GetProcessPtr())
@@ -912,16 +879,22 @@ ClangUserExpression::Execute (Stream &error_stream,
                 if (error_desc)
                     error_stream.Printf ("Execution was interrupted, reason: %s.", error_desc);
                 else
-                    error_stream.Printf ("Execution was interrupted.");
+                    error_stream.PutCString ("Execution was interrupted.");
                     
-                if ((execution_result == eExecutionInterrupted && unwind_on_error)
-                    || (execution_result == eExecutionHitBreakpoint && ignore_breakpoints))
-                    error_stream.Printf ("\nThe process has been returned to the state before expression evaluation.");
+                if ((execution_result == eExecutionInterrupted && options.DoesUnwindOnError())
+                    || (execution_result == eExecutionHitBreakpoint && options.DoesIgnoreBreakpoints()))
+                    error_stream.PutCString ("\nThe process has been returned to the state before expression evaluation.");
                 else
-                    error_stream.Printf ("\nThe process has been left at the point where it was interrupted, use \"thread return -x\" to return to the state before expression evaluation.");
+                    error_stream.PutCString ("\nThe process has been left at the point where it was interrupted, use \"thread return -x\" to return to the state before expression evaluation.");
 
                 return execution_result;
             }
+            else if (execution_result == eExecutionStoppedForDebug)
+            {
+                    error_stream.PutCString ("Execution was halted at the first instruction of the expression function because \"debug\" was requested.\n"
+                                             "Use \"thread return -x\" to return to the state before expression evaluation.");
+                    return execution_result;
+            }
             else if (execution_result != eExecutionCompleted)
             {
                 error_stream.Printf ("Couldn't execute function; result was %s\n", Process::ExecutionResultAsCString (execution_result));
@@ -947,48 +920,17 @@ ClangUserExpression::Execute (Stream &error_stream,
 
 ExecutionResults
 ClangUserExpression::Evaluate (ExecutionContext &exe_ctx,
-                               lldb_private::ExecutionPolicy execution_policy,
-                               lldb::LanguageType language,
-                               ResultType desired_type,
-                               bool unwind_on_error,
-                               bool ignore_breakpoints,
+                               const EvaluateExpressionOptions& options,
                                const char *expr_cstr,
                                const char *expr_prefix,
                                lldb::ValueObjectSP &result_valobj_sp,
-                               bool run_others,
-                               uint32_t timeout_usec)
-{
-    Error error;
-    return EvaluateWithError (exe_ctx,
-                              execution_policy,
-                              language,
-                              desired_type,
-                              unwind_on_error,
-                              ignore_breakpoints,
-                              expr_cstr,
-                              expr_prefix,
-                              result_valobj_sp,
-                              error,
-                              run_others,
-                              timeout_usec);
-}
-
-ExecutionResults
-ClangUserExpression::EvaluateWithError (ExecutionContext &exe_ctx,
-                                        lldb_private::ExecutionPolicy execution_policy,
-                                        lldb::LanguageType language,
-                                        ResultType desired_type,
-                                        bool unwind_on_error,
-                                        bool ignore_breakpoints,
-                                        const char *expr_cstr,
-                                        const char *expr_prefix,
-                                        lldb::ValueObjectSP &result_valobj_sp,
-                                        Error &error,
-                                        bool run_others,
-                                        uint32_t timeout_usec)
+                               Error &error)
 {
     Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_EXPRESSIONS | LIBLLDB_LOG_STEP));
 
+    lldb_private::ExecutionPolicy execution_policy = options.GetExecutionPolicy();
+    const lldb::LanguageType language = options.GetLanguage();
+    const ResultType desired_type = options.DoesCoerceToId() ? ClangUserExpression::eResultTypeId : ClangUserExpression::eResultTypeAny;
     ExecutionResults execution_results = eExecutionSetupError;
     
     Process *process = exe_ctx.GetProcessPtr();
@@ -1046,13 +988,10 @@ ClangUserExpression::EvaluateWithError (ExecutionContext &exe_ctx,
                 log->Printf("== [ClangUserExpression::Evaluate] Executing expression ==");
 
             execution_results = user_expression_sp->Execute (error_stream, 
-                                                             exe_ctx, 
-                                                             unwind_on_error,
-                                                             ignore_breakpoints,
-                                                             user_expression_sp, 
-                                                             expr_result,
-                                                             run_others,
-                                                             timeout_usec);
+                                                             exe_ctx,
+                                                             options,
+                                                             user_expression_sp,
+                                                             expr_result);
             
             if (execution_results != eExecutionCompleted)
             {
diff --git a/contrib/llvm/tools/lldb/source/Expression/DWARFExpression.cpp b/contrib/llvm/tools/lldb/source/Expression/DWARFExpression.cpp
index e2ae19e5ac7..b36be8e545d 100644
--- a/contrib/llvm/tools/lldb/source/Expression/DWARFExpression.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/DWARFExpression.cpp
@@ -9,6 +9,10 @@
 
 #include "lldb/Expression/DWARFExpression.h"
 
+// C Includes
+#include <inttypes.h>
+
+// C++ Includes
 #include <vector>
 
 #include "lldb/Core/DataEncoder.h"
@@ -28,20 +32,18 @@
 
 #include "lldb/lldb-private-log.h"
 
-#include "lldb/Symbol/ClangASTType.h"
-#include "lldb/Symbol/ClangASTContext.h"
-#include "lldb/Symbol/Type.h"
-
 #include "lldb/Target/ABI.h"
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/StackFrame.h"
 #include "lldb/Target/StackID.h"
+#include "lldb/Target/Thread.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
+// TODO- why is this also defined (in a better way) in DWARFDefines.cpp?
 const char *
 DW_OP_value_to_name (uint32_t val)
 {
@@ -220,6 +222,7 @@ DW_OP_value_to_name (uint32_t val)
 // DWARFExpression constructor
 //----------------------------------------------------------------------
 DWARFExpression::DWARFExpression() :
+    m_module_wp(),
     m_data(),
     m_reg_kind (eRegisterKindDWARF),
     m_loclist_slide (LLDB_INVALID_ADDRESS)
@@ -227,6 +230,7 @@ DWARFExpression::DWARFExpression() :
 }
 
 DWARFExpression::DWARFExpression(const DWARFExpression& rhs) :
+    m_module_wp(rhs.m_module_wp),
     m_data(rhs.m_data),
     m_reg_kind (rhs.m_reg_kind),
     m_loclist_slide(rhs.m_loclist_slide)
@@ -234,11 +238,14 @@ DWARFExpression::DWARFExpression(const DWARFExpression& rhs) :
 }
 
 
-DWARFExpression::DWARFExpression(const DataExtractor& data, lldb::offset_t data_offset, lldb::offset_t data_length) :
+DWARFExpression::DWARFExpression(lldb::ModuleSP module_sp, const DataExtractor& data, lldb::offset_t data_offset, lldb::offset_t data_length) :
+    m_module_wp(),
     m_data(data, data_offset, data_length),
     m_reg_kind (eRegisterKindDWARF),
     m_loclist_slide(LLDB_INVALID_ADDRESS)
 {
+    if (module_sp)
+        m_module_wp = module_sp;
 }
 
 //----------------------------------------------------------------------
@@ -262,11 +269,12 @@ DWARFExpression::SetOpcodeData (const DataExtractor& data)
 }
 
 void
-DWARFExpression::CopyOpcodeData (const DataExtractor& data, lldb::offset_t data_offset, lldb::offset_t data_length)
+DWARFExpression::CopyOpcodeData (lldb::ModuleSP module_sp, const DataExtractor& data, lldb::offset_t data_offset, lldb::offset_t data_length)
 {
     const uint8_t *bytes = data.PeekData(data_offset, data_length);
     if (bytes)
     {
+        m_module_wp = module_sp;
         m_data.SetData(DataBufferSP(new DataBufferHeap(bytes, data_length)));
         m_data.SetByteOrder(data.GetByteOrder());
         m_data.SetAddressByteSize(data.GetAddressByteSize());
@@ -274,8 +282,9 @@ DWARFExpression::CopyOpcodeData (const DataExtractor& data, lldb::offset_t data_
 }
 
 void
-DWARFExpression::SetOpcodeData (const DataExtractor& data, lldb::offset_t data_offset, lldb::offset_t data_length)
+DWARFExpression::SetOpcodeData (lldb::ModuleSP module_sp, const DataExtractor& data, lldb::offset_t data_offset, lldb::offset_t data_length)
 {
+    m_module_wp = module_sp;
     m_data.SetData(data, data_offset, data_length);
 }
 
@@ -588,6 +597,9 @@ DWARFExpression::DumpLocation (Stream *s, lldb::offset_t offset, lldb::offset_t
 //        case DW_OP_APPLE_array_ref:
 //            s->PutCString("DW_OP_APPLE_array_ref");
 //            break;
+        case DW_OP_GNU_push_tls_address:
+            s->PutCString("DW_OP_GNU_push_tls_address");  // 0xe0
+            break;
         case DW_OP_APPLE_uninit:
             s->PutCString("DW_OP_APPLE_uninit");  // 0xF0
             break;
@@ -919,7 +931,8 @@ GetOpcodeDataSize (const DataExtractor &data, const lldb::offset_t data_offset,
         case DW_OP_form_tls_address:    // 0x9b DWARF3
         case DW_OP_call_frame_cfa:      // 0x9c DWARF3
         case DW_OP_stack_value: // 0x9f DWARF4
-            return 0; 
+        case DW_OP_GNU_push_tls_address: // 0xe0 GNU extension
+            return 0;
 
         // Opcodes with a single 1 byte arguments
         case DW_OP_const1u:     // 0x08 1 1-byte constant
@@ -1221,6 +1234,8 @@ DWARFExpression::Evaluate
     Error *error_ptr
 ) const
 {
+    ModuleSP module_sp = m_module_wp.lock();
+
     if (IsLocationList())
     {
         lldb::offset_t offset = 0;
@@ -1268,7 +1283,7 @@ DWARFExpression::Evaluate
 
                     if (length > 0 && lo_pc <= pc && pc < hi_pc)
                     {
-                        return DWARFExpression::Evaluate (exe_ctx, expr_locals, decl_map, reg_ctx, m_data, offset, length, m_reg_kind, initial_value_ptr, result, error_ptr);
+                        return DWARFExpression::Evaluate (exe_ctx, expr_locals, decl_map, reg_ctx, module_sp, m_data, offset, length, m_reg_kind, initial_value_ptr, result, error_ptr);
                     }
                     offset += length;
                 }
@@ -1280,7 +1295,7 @@ DWARFExpression::Evaluate
     }
 
     // Not a location list, just a single expression.
-    return DWARFExpression::Evaluate (exe_ctx, expr_locals, decl_map, reg_ctx, m_data, 0, m_data.GetByteSize(), m_reg_kind, initial_value_ptr, result, error_ptr);
+    return DWARFExpression::Evaluate (exe_ctx, expr_locals, decl_map, reg_ctx, module_sp, m_data, 0, m_data.GetByteSize(), m_reg_kind, initial_value_ptr, result, error_ptr);
 }
 
 
@@ -1292,6 +1307,7 @@ DWARFExpression::Evaluate
     ClangExpressionVariableList *expr_locals,
     ClangExpressionDeclMap *decl_map,
     RegisterContext *reg_ctx,
+    lldb::ModuleSP opcode_ctx,
     const DataExtractor& opcodes,
     const lldb::offset_t opcodes_offset,
     const lldb::offset_t opcodes_length,
@@ -1347,7 +1363,7 @@ DWARFExpression::Evaluate
         if (log && log->GetVerbose())
         {
             size_t count = stack.size();
-            log->Printf("Stack before operation has %lu values:", count);
+            log->Printf("Stack before operation has %zu values:", count);
             for (size_t i=0; i<count; ++i)
             {
                 StreamString new_value;
@@ -2659,6 +2675,54 @@ DWARFExpression::Evaluate
                 return false;
             }
             break;
+
+        //----------------------------------------------------------------------
+        // OPCODE: DW_OP_GNU_push_tls_address
+        // OPERANDS: none
+        // DESCRIPTION: Pops a TLS offset from the stack, converts it to
+        // an absolute value, and pushes it back on.
+        //----------------------------------------------------------------------
+        case DW_OP_GNU_push_tls_address:
+            {
+                if (stack.size() < 1)
+                {
+                    if (error_ptr)
+                        error_ptr->SetErrorString("DW_OP_GNU_push_tls_address needs an argument.");
+                    return false;
+                }
+
+                if (!exe_ctx || !opcode_ctx)
+                {
+                    if (error_ptr)
+                        error_ptr->SetErrorString("No context to evaluate TLS within.");
+                    return false;
+                }
+
+                Thread *thread = exe_ctx->GetThreadPtr();
+                if (!thread)
+                {
+                    if (error_ptr)
+                        error_ptr->SetErrorString("No thread to evaluate TLS within.");
+                    return false;
+                }
+
+                // Lookup the TLS block address for this thread and module.
+                addr_t tls_addr = thread->GetThreadLocalData (opcode_ctx);
+
+                if (tls_addr == LLDB_INVALID_ADDRESS)
+                {
+                    if (error_ptr)
+                        error_ptr->SetErrorString ("No TLS data currently exists for this thread.");
+                    return false;
+                }
+
+                // Convert the TLS offset into the absolute address.
+                Scalar tmp = stack.back().ResolveValue(exe_ctx);
+                stack.back() = tmp + tls_addr;
+                stack.back().SetValueType (Value::eValueTypeLoadAddress);
+            }
+            break;
+
         default:
             if (log)
                 log->Printf("Unhandled opcode %s in DWARFExpression.", DW_OP_value_to_name(op));
@@ -2675,7 +2739,7 @@ DWARFExpression::Evaluate
     else if (log && log->GetVerbose())
     {
         size_t count = stack.size();
-        log->Printf("Stack after operation has %lu values:", count);
+        log->Printf("Stack after operation has %zu values:", count);
         for (size_t i=0; i<count; ++i)
         {
             StreamString new_value;
diff --git a/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp b/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp
index dc27b65548e..792cc509853 100644
--- a/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/IRForTarget.cpp
@@ -356,7 +356,7 @@ IRForTarget::ResolveFunctionPointers(llvm::Module &llvm_module)
         
         if (value_ptr)
             *value_ptr = value;
-        
+
         fun->replaceAllUsesWith(value);
     }
     
@@ -2014,7 +2014,7 @@ IRForTarget::ReplaceStaticLiterals (llvm::BasicBlock &basic_block)
                 }
                 ss.flush();
                 
-                log->Printf("Found ConstantFP with size %lu and raw data %s", operand_data_size, s.c_str());
+                log->Printf("Found ConstantFP with size %zu and raw data %s", operand_data_size, s.c_str());
             }
             
             lldb_private::DataBufferHeap data(operand_data_size, 0);
@@ -2477,7 +2477,7 @@ IRForTarget::ReplaceVariables (Function &llvm_function)
     }
     
     if (log)
-        log->Printf("Total structure [align %" PRId64 ", size %lu]", alignment, size);
+        log->Printf("Total structure [align %" PRId64 ", size %zu]", alignment, size);
     
     return true;
 }
diff --git a/contrib/llvm/tools/lldb/source/Expression/IRInterpreter.cpp b/contrib/llvm/tools/lldb/source/Expression/IRInterpreter.cpp
index dcbf584cfb6..71ef8d6457b 100644
--- a/contrib/llvm/tools/lldb/source/Expression/IRInterpreter.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/IRInterpreter.cpp
@@ -14,6 +14,7 @@
 #include "lldb/Core/StreamString.h"
 #include "lldb/Expression/IRMemoryMap.h"
 #include "lldb/Expression/IRInterpreter.h"
+#include "lldb/Host/Endian.h"
 
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DataLayout.h"
@@ -321,13 +322,19 @@ public:
         if (!ResolveConstantValue(resolved_value, constant))
             return false;
         
-        const uint64_t *raw_data = resolved_value.getRawData();
-            
+        lldb_private::StreamString buffer (lldb_private::Stream::eBinary,
+                                           m_memory_map.GetAddressByteSize(),
+                                           m_memory_map.GetByteOrder());
+        
         size_t constant_size = m_target_data.getTypeStoreSize(constant->getType());
         
+        const uint64_t *raw_data = resolved_value.getRawData();
+        
+        buffer.PutRawBytes(raw_data, constant_size, lldb::endian::InlHostByteOrder());
+        
         lldb_private::Error write_error;
         
-        m_memory_map.WriteMemory(process_address, (uint8_t*)raw_data, constant_size, write_error);
+        m_memory_map.WriteMemory(process_address, (const uint8_t*)buffer.GetData(), constant_size, write_error);
         
         return write_error.Success();
     }
@@ -517,6 +524,7 @@ IRInterpreter::CanInterpret (llvm::Module &module,
             case Instruction::SRem:
             case Instruction::Store:
             case Instruction::Sub:
+            case Instruction::Trunc:
             case Instruction::UDiv:
             case Instruction::URem:
             case Instruction::Xor:
@@ -1162,6 +1170,42 @@ IRInterpreter::Interpret (llvm::Module &module,
                 }
             }
                 break;
+            case Instruction::Trunc:
+            {
+                const TruncInst *trunc_inst = dyn_cast<TruncInst>(inst);
+                
+                if (!trunc_inst)
+                {
+                    if (log)
+                        log->Printf("getOpcode() returns Trunc, but instruction is not a TruncInst");
+                    error.SetErrorToGenericError();
+                    error.SetErrorString(interpreter_internal_error);
+                    return false;
+                }
+                
+                Value *src_operand = trunc_inst->getOperand(0);
+                
+                lldb_private::Scalar I;
+                
+                if (!frame.EvaluateValue(I, src_operand, module))
+                {
+                    if (log)
+                        log->Printf("Couldn't evaluate %s", PrintValue(src_operand).c_str());
+                    error.SetErrorToGenericError();
+                    error.SetErrorString(bad_value_error);
+                    return false;
+                }
+                
+                frame.AssignValue(inst, I, module);
+                
+                if (log)
+                {
+                    log->Printf("Interpreted a Trunc");
+                    log->Printf("  Src : %s", frame.SummarizeValue(src_operand).c_str());
+                    log->Printf("  =   : %s", frame.SummarizeValue(inst).c_str());
+                }
+            }
+                break;
             case Instruction::Load:
             {
                 const LoadInst *load_inst = dyn_cast<LoadInst>(inst);
diff --git a/contrib/llvm/tools/lldb/source/Expression/IRMemoryMap.cpp b/contrib/llvm/tools/lldb/source/Expression/IRMemoryMap.cpp
index ef362baff16..53f74aebfed 100644
--- a/contrib/llvm/tools/lldb/source/Expression/IRMemoryMap.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/IRMemoryMap.cpp
@@ -74,15 +74,15 @@ IRMemoryMap::FindSpace (size_t size)
         {
         case 4:
             {
-                uint32_t random_data = random();
+                uint32_t random_data = rand();
                 candidate = random_data;
                 candidate &= ~0xfffull;
                 break;
             }
         case 8:
             {
-                uint32_t random_low = random();
-                uint32_t random_high = random();
+                uint32_t random_low = rand();
+                uint32_t random_high = rand();
                 candidate = random_high;
                 candidate <<= 32ull;
                 candidate |= random_low;
diff --git a/contrib/llvm/tools/lldb/source/Expression/Materializer.cpp b/contrib/llvm/tools/lldb/source/Expression/Materializer.cpp
index 8a1900ebb73..8731fbebd14 100644
--- a/contrib/llvm/tools/lldb/source/Expression/Materializer.cpp
+++ b/contrib/llvm/tools/lldb/source/Expression/Materializer.cpp
@@ -461,17 +461,11 @@ public:
         }
         else
         {
-            Error get_address_error;
-            lldb::ValueObjectSP addr_of_valobj_sp = valobj_sp->AddressOf(get_address_error);
-            if (get_address_error.Success())
+            lldb::addr_t addr_of_valobj = valobj_sp->GetAddressOf();
+            if (addr_of_valobj != LLDB_INVALID_ADDRESS)
             {
-                DataExtractor valobj_extractor;
-                addr_of_valobj_sp->GetData(valobj_extractor);
-                lldb::offset_t offset = 0;
-                lldb::addr_t addr_of_valobj_addr = valobj_extractor.GetAddress(&offset);
-                
                 Error write_error;
-                map.WritePointerToMemory(load_addr, addr_of_valobj_addr, write_error);
+                map.WritePointerToMemory(load_addr, addr_of_valobj, write_error);
                 
                 if (!write_error.Success())
                 {
@@ -498,7 +492,10 @@ public:
                     }
                     else
                     {
-                        err.SetErrorStringWithFormat("size of variable %s disagrees with the ValueObject's size", m_variable_sp->GetName().AsCString());
+                        err.SetErrorStringWithFormat("size of variable %s (%" PRIu64 ") disagrees with the ValueObject's size (%" PRIu64 ")",
+                                                     m_variable_sp->GetName().AsCString(),
+                                                     m_variable_sp->GetType()->GetByteSize(),
+                                                     data.GetByteSize());
                     }
                     return;
                 }
@@ -839,7 +836,7 @@ public:
                                                             name,
                                                             address,
                                                             eAddressTypeLoad,
-                                                            ret->GetByteSize());
+                                                            map.GetAddressByteSize());
         }
         
         ret->ValueUpdated();
diff --git a/contrib/llvm/tools/lldb/source/Host/common/Condition.cpp b/contrib/llvm/tools/lldb/source/Host/common/Condition.cpp
index daa729cadca..7bc6b655464 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/Condition.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/Condition.cpp
@@ -15,6 +15,8 @@
 
 using namespace lldb_private;
 
+#ifndef _WIN32
+
 //----------------------------------------------------------------------
 // Default constructor
 //
@@ -46,15 +48,6 @@ Condition::Broadcast ()
     return ::pthread_cond_broadcast (&m_condition);
 }
 
-//----------------------------------------------------------------------
-// Get accessor to the pthread condition object
-//----------------------------------------------------------------------
-pthread_cond_t *
-Condition::GetCondition ()
-{
-    return &m_condition;
-}
-
 //----------------------------------------------------------------------
 // Unblocks one thread waiting for the condition variable
 //----------------------------------------------------------------------
@@ -64,6 +57,11 @@ Condition::Signal ()
     return ::pthread_cond_signal (&m_condition);
 }
 
+/* convert struct timeval to ms(milliseconds) */
+static unsigned long int tv2ms(struct timeval a) {
+    return ((a.tv_sec * 1000) + (a.tv_usec / 1000));
+}
+
 //----------------------------------------------------------------------
 // The Wait() function atomically blocks the current thread
 // waiting on the owned condition variable, and unblocks the mutex
@@ -100,7 +98,16 @@ Condition::Wait (Mutex &mutex, const TimeValue *abstime, bool *timed_out)
             *timed_out = false;
     }
 
-
     return err;
 }
 
+#endif
+
+//----------------------------------------------------------------------
+// Get accessor to the pthread condition object
+//----------------------------------------------------------------------
+lldb::condition_t *
+Condition::GetCondition()
+{
+    return &m_condition;
+}
diff --git a/contrib/llvm/tools/lldb/source/Host/common/File.cpp b/contrib/llvm/tools/lldb/source/Host/common/File.cpp
index c0d3c290f4c..bbd11858aab 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/File.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/File.cpp
@@ -1,4 +1,4 @@
-//===-- FileSpec.cpp --------------------------------------------*- C++ -*-===//
+//===-- File.cpp ------------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,7 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-
 #include "lldb/Host/File.h"
 
 #include <errno.h>
@@ -16,6 +15,10 @@
 #include <stdarg.h>
 #include <sys/stat.h>
 
+#ifdef _WIN32
+#include "lldb/Host/windows/windows.h"
+#endif
+
 #include "lldb/Core/DataBufferHeap.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Host/Config.h"
@@ -79,6 +82,20 @@ File::File(const char *path, uint32_t options, uint32_t permissions) :
     Open (path, options, permissions);
 }
 
+File::File (const FileSpec& filespec,
+            uint32_t options,
+            uint32_t permissions) :
+    m_descriptor (kInvalidDescriptor),
+    m_stream (kInvalidStream),
+    m_options (0),
+    m_owned (false)
+{
+    if (filespec)
+    {
+        Open (filespec.GetPath().c_str(), options, permissions);
+    }
+}
+
 File::File (const File &rhs) :
     m_descriptor (kInvalidDescriptor),
     m_stream (kInvalidStream),
@@ -167,7 +184,11 @@ File::Duplicate (const File &rhs)
 
     if (rhs.DescriptorIsValid())
     {
+#ifdef _WIN32
+        m_descriptor = ::_dup(rhs.GetDescriptor());
+#else
         m_descriptor = ::fcntl(rhs.GetDescriptor(), F_DUPFD);
+#endif
         if (!DescriptorIsValid())
             error.SetErrorToErrno();
         else
@@ -215,23 +236,32 @@ File::Open (const char *path, uint32_t options, uint32_t permissions)
     else if (read)
     {
         oflag |= O_RDONLY;
+
+#ifndef _WIN32
+        if (options & eOpenoptionDontFollowSymlinks)
+            oflag |= O_NOFOLLOW;
+#endif
     }
     
+#ifndef _WIN32
     if (options & eOpenOptionNonBlocking)
         oflag |= O_NONBLOCK;
+#else
+    oflag |= O_BINARY;
+#endif
 
     mode_t mode = 0;
     if (oflag & O_CREAT)
     {
-        if (permissions & ePermissionsUserRead)     mode |= S_IRUSR;
-        if (permissions & ePermissionsUserWrite)    mode |= S_IWUSR;
-        if (permissions & ePermissionsUserExecute)  mode |= S_IXUSR;
-        if (permissions & ePermissionsGroupRead)    mode |= S_IRGRP;
-        if (permissions & ePermissionsGroupWrite)   mode |= S_IWGRP;
-        if (permissions & ePermissionsGroupExecute) mode |= S_IXGRP;
-        if (permissions & ePermissionsWorldRead)    mode |= S_IROTH;
-        if (permissions & ePermissionsWorldWrite)   mode |= S_IWOTH;
-        if (permissions & ePermissionsWorldExecute) mode |= S_IXOTH;
+        if (permissions & lldb::eFilePermissionsUserRead)     mode |= S_IRUSR;
+        if (permissions & lldb::eFilePermissionsUserWrite)    mode |= S_IWUSR;
+        if (permissions & lldb::eFilePermissionsUserExecute)  mode |= S_IXUSR;
+        if (permissions & lldb::eFilePermissionsGroupRead)    mode |= S_IRGRP;
+        if (permissions & lldb::eFilePermissionsGroupWrite)   mode |= S_IWGRP;
+        if (permissions & lldb::eFilePermissionsGroupExecute) mode |= S_IXGRP;
+        if (permissions & lldb::eFilePermissionsWorldRead)    mode |= S_IROTH;
+        if (permissions & lldb::eFilePermissionsWorldWrite)   mode |= S_IWOTH;
+        if (permissions & lldb::eFilePermissionsWorldExecute) mode |= S_IXOTH;
     }
 
     do
@@ -247,6 +277,53 @@ File::Open (const char *path, uint32_t options, uint32_t permissions)
     return error;
 }
 
+uint32_t
+File::GetPermissions (const char *path, Error &error)
+{
+    if (path && path[0])
+    {
+        struct stat file_stats;
+        if (::stat (path, &file_stats) == -1)
+            error.SetErrorToErrno();
+        else
+        {
+            error.Clear();
+            return file_stats.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+        }
+    }
+    else
+    {
+        if (path)
+            error.SetErrorString ("invalid path");
+        else
+            error.SetErrorString ("empty path");        
+    }
+    return 0;
+}
+
+uint32_t
+File::GetPermissions(Error &error) const
+{
+    int fd = GetDescriptor();
+    if (fd != kInvalidDescriptor)
+    {
+        struct stat file_stats;
+        if (::fstat (fd, &file_stats) == -1)
+            error.SetErrorToErrno();
+        else
+        {
+            error.Clear();
+            return file_stats.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+        }
+    }
+    else
+    {
+        error.SetErrorString ("invalid file descriptor");
+    }
+    return 0;
+}
+
+
 Error
 File::Close ()
 {
@@ -452,6 +529,11 @@ File::Sync ()
     Error error;
     if (DescriptorIsValid())
     {
+#ifdef _WIN32
+        int err = FlushFileBuffers((HANDLE)_get_osfhandle(m_descriptor));
+        if (err == 0)
+            error.SetErrorToGenericError();
+#else
         int err = 0;
         do
         {
@@ -460,6 +542,7 @@ File::Sync ()
         
         if (err == -1)
             error.SetErrorToErrno();
+#endif
     }
     else 
     {
@@ -559,6 +642,7 @@ File::Write (const void *buf, size_t &num_bytes)
 Error
 File::Read (void *buf, size_t &num_bytes, off_t &offset)
 {
+#ifndef _WIN32
     Error error;
     int fd = GetDescriptor();
     if (fd != kInvalidDescriptor)
@@ -586,6 +670,14 @@ File::Read (void *buf, size_t &num_bytes, off_t &offset)
         error.SetErrorString("invalid file handle");
     }
     return error;
+#else
+    long cur = ::lseek(m_descriptor, 0, SEEK_CUR);
+    SeekFromStart(offset);
+    Error error = Read(buf, num_bytes);
+    if (!error.Fail())
+        SeekFromStart(cur);
+    return error;
+#endif
 }
 
 Error
@@ -648,6 +740,7 @@ File::Write (const void *buf, size_t &num_bytes, off_t &offset)
     int fd = GetDescriptor();
     if (fd != kInvalidDescriptor)
     {
+#ifndef _WIN32
         ssize_t bytes_written = -1;
         do
         {
@@ -664,6 +757,17 @@ File::Write (const void *buf, size_t &num_bytes, off_t &offset)
             offset += bytes_written;
             num_bytes = bytes_written;
         }
+#else
+        long cur = ::lseek(m_descriptor, 0, SEEK_CUR);
+        error = Write(buf, num_bytes);
+        long after = ::lseek(m_descriptor, 0, SEEK_CUR);
+
+        if (!error.Fail())
+            SeekFromStart(cur);
+
+        ssize_t bytes_written = after - cur;
+        offset = after;
+#endif
     }
     else 
     {
@@ -714,3 +818,29 @@ File::PrintfVarArg (const char *format, va_list args)
     }
     return result;
 }
+
+mode_t
+File::ConvertOpenOptionsForPOSIXOpen (uint32_t open_options)
+{
+    mode_t mode = 0;
+    if (open_options & eOpenOptionRead && open_options & eOpenOptionWrite)
+        mode |= O_RDWR;
+    else if (open_options & eOpenOptionWrite)
+        mode |= O_WRONLY;
+    
+    if (open_options & eOpenOptionAppend)
+        mode |= O_APPEND;
+
+    if (open_options & eOpenOptionTruncate)
+        mode |= O_TRUNC;
+
+    if (open_options & eOpenOptionNonBlocking)
+        mode |= O_NONBLOCK;
+
+    if (open_options & eOpenOptionCanCreateNewOnly)
+        mode |= O_CREAT | O_EXCL;
+    else if (open_options & eOpenOptionCanCreate)
+        mode |= O_CREAT;
+
+    return mode;
+}
diff --git a/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp b/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp
index 025cf6f4330..fc41f065afd 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp
@@ -8,9 +8,15 @@
 //===----------------------------------------------------------------------===//
 
 
+#ifndef _WIN32
 #include <dirent.h>
+#else
+#include "lldb/Host/windows/windows.h"
+#endif
 #include <fcntl.h>
+#ifndef _MSC_VER
 #include <libgen.h>
+#endif
 #include <sys/stat.h>
 #include <set>
 #include <string.h>
@@ -25,8 +31,10 @@
 #include "llvm/Support/Path.h"
 #include "llvm/Support/Program.h"
 
+#include "lldb/Core/StreamString.h"
 #include "lldb/Host/File.h"
 #include "lldb/Host/FileSpec.h"
+#include "lldb/Host/Host.h"
 #include "lldb/Core/DataBufferHeap.h"
 #include "lldb/Core/DataBufferMemoryMap.h"
 #include "lldb/Core/RegularExpression.h"
@@ -323,7 +331,11 @@ FileSpec::SetFile (const char *pathname, bool resolve)
             // Truncate the basename off the end of the resolved path
 
             // Only attempt to get the dirname if it looks like we have a path
-            if (strchr(resolved_path, '/'))
+            if (strchr(resolved_path, '/')
+#ifdef _WIN32
+                || strchr(resolved_path, '\\')
+#endif
+                )
             {
                 char *directory = ::dirname (resolved_path);
 
@@ -334,6 +346,11 @@ FileSpec::SetFile (const char *pathname, bool resolve)
                 else
                 {
                     char *last_resolved_path_slash = strrchr(resolved_path, '/');
+#ifdef _WIN32
+                    char* last_resolved_path_slash_windows = strrchr(resolved_path, '\\');
+                    if (last_resolved_path_slash_windows > last_resolved_path_slash)
+                        last_resolved_path_slash = last_resolved_path_slash_windows;
+#endif
                     if (last_resolved_path_slash)
                     {
                         *last_resolved_path_slash = '\0';
@@ -617,10 +634,12 @@ FileSpec::GetFileType () const
         switch (file_type)
         {
         case S_IFDIR:   return eFileTypeDirectory;
-        case S_IFIFO:   return eFileTypePipe;
         case S_IFREG:   return eFileTypeRegular;
+#ifndef _WIN32
+        case S_IFIFO:   return eFileTypePipe;
         case S_IFSOCK:  return eFileTypeSocket;
         case S_IFLNK:   return eFileTypeSymbolicLink;
+#endif
         default:
             break;
         }
@@ -629,6 +648,15 @@ FileSpec::GetFileType () const
     return eFileTypeInvalid;
 }
 
+uint32_t
+FileSpec::GetPermissions () const
+{
+    uint32_t file_permissions = 0;
+    if (*this)
+        Host::GetFilePermissions(GetPath().c_str(), file_permissions);
+    return file_permissions;
+}
+
 TimeValue
 FileSpec::GetModificationTime () const
 {
@@ -908,7 +936,94 @@ FileSpec::EnumerateDirectory
 {
     if (dir_path && dir_path[0])
     {
-        lldb_utility::CleanUp <DIR *, int> dir_path_dir (opendir(dir_path), NULL, closedir);
+#if _WIN32
+        char szDir[MAX_PATH];
+        strcpy_s(szDir, MAX_PATH, dir_path);
+        strcat_s(szDir, MAX_PATH, "\\*");
+
+        WIN32_FIND_DATA ffd;
+        HANDLE hFind = FindFirstFile(szDir, &ffd);
+
+        if (hFind == INVALID_HANDLE_VALUE)
+        {
+            return eEnumerateDirectoryResultNext;
+        }
+
+        do
+        {
+            bool call_callback = false;
+            FileSpec::FileType file_type = eFileTypeUnknown;
+            if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+            {
+                size_t len = strlen(ffd.cFileName);
+
+                if (len == 1 && ffd.cFileName[0] == '.')
+                    continue;
+
+                if (len == 2 && ffd.cFileName[0] == '.' && ffd.cFileName[1] == '.')
+                    continue;
+
+                file_type = eFileTypeDirectory;
+                call_callback = find_directories;
+            }
+            else if (ffd.dwFileAttributes & FILE_ATTRIBUTE_DEVICE)
+            {
+                file_type = eFileTypeOther;
+                call_callback = find_other;
+            }
+            else
+            {
+                file_type = eFileTypeRegular;
+                call_callback = find_files;
+            }
+            if (call_callback)
+            {
+                char child_path[MAX_PATH];
+                const int child_path_len = ::snprintf (child_path, sizeof(child_path), "%s\\%s", dir_path, ffd.cFileName);
+                if (child_path_len < (int)(sizeof(child_path) - 1))
+                {
+                    // Don't resolve the file type or path
+                    FileSpec child_path_spec (child_path, false);
+
+                    EnumerateDirectoryResult result = callback (callback_baton, file_type, child_path_spec);
+
+                    switch (result)
+                    {
+                    case eEnumerateDirectoryResultNext:
+                        // Enumerate next entry in the current directory. We just
+                        // exit this switch and will continue enumerating the
+                        // current directory as we currently are...
+                        break;
+
+                    case eEnumerateDirectoryResultEnter: // Recurse into the current entry if it is a directory or symlink, or next if not
+                        if (FileSpec::EnumerateDirectory(child_path,
+                            find_directories,
+                            find_files,
+                            find_other,
+                            callback,
+                            callback_baton) == eEnumerateDirectoryResultQuit)
+                        {
+                            // The subdirectory returned Quit, which means to 
+                            // stop all directory enumerations at all levels.
+                            return eEnumerateDirectoryResultQuit;
+                        }
+                        break;
+
+                    case eEnumerateDirectoryResultExit:  // Exit from the current directory at the current level.
+                        // Exit from this directory level and tell parent to 
+                        // keep enumerating.
+                        return eEnumerateDirectoryResultNext;
+
+                    case eEnumerateDirectoryResultQuit:  // Stop directory enumerations at any level
+                        return eEnumerateDirectoryResultQuit;
+                    }
+                }
+            }
+        } while (FindNextFile(hFind, &ffd) != 0);
+
+        FindClose(hFind);
+#else
+        lldb_utility::CleanUp <DIR *, int> dir_path_dir(opendir(dir_path), NULL, closedir);
         if (dir_path_dir.is_valid())
         {
             long path_max = fpathconf (dirfd (dir_path_dir.get()), _PC_NAME_MAX);
@@ -1007,12 +1122,147 @@ FileSpec::EnumerateDirectory
                 free (buf);
             }
         }
+#endif
     }
     // By default when exiting a directory, we tell the parent enumeration
     // to continue enumerating.
     return eEnumerateDirectoryResultNext;    
 }
 
+FileSpec
+FileSpec::CopyByAppendingPathComponent (const char *new_path)  const
+{
+    const bool resolve = false;
+    if (m_filename.IsEmpty() && m_directory.IsEmpty())
+        return FileSpec(new_path,resolve);
+    StreamString stream;
+    if (m_filename.IsEmpty())
+        stream.Printf("%s/%s",m_directory.GetCString(),new_path);
+    else if (m_directory.IsEmpty())
+        stream.Printf("%s/%s",m_filename.GetCString(),new_path);
+    else
+        stream.Printf("%s/%s/%s",m_directory.GetCString(), m_filename.GetCString(),new_path);
+    return FileSpec(stream.GetData(),resolve);
+}
+
+FileSpec
+FileSpec::CopyByRemovingLastPathComponent ()  const
+{
+    const bool resolve = false;
+    if (m_filename.IsEmpty() && m_directory.IsEmpty())
+        return FileSpec("",resolve);
+    if (m_directory.IsEmpty())
+        return FileSpec("",resolve);
+    if (m_filename.IsEmpty())
+    {
+        const char* dir_cstr = m_directory.GetCString();
+        const char* last_slash_ptr = ::strrchr(dir_cstr, '/');
+        
+        // check for obvious cases before doing the full thing
+        if (!last_slash_ptr)
+            return FileSpec("",resolve);
+        if (last_slash_ptr == dir_cstr)
+            return FileSpec("/",resolve);
+        
+        size_t last_slash_pos = last_slash_ptr - dir_cstr+1;
+        ConstString new_path(dir_cstr,last_slash_pos);
+        return FileSpec(new_path.GetCString(),resolve);
+    }
+    else
+        return FileSpec(m_directory.GetCString(),resolve);
+}
+
+ConstString
+FileSpec::GetLastPathComponent () const
+{
+    if (m_filename)
+        return m_filename;
+    if (m_directory)
+    {
+        const char* dir_cstr = m_directory.GetCString();
+        const char* last_slash_ptr = ::strrchr(dir_cstr, '/');
+        if (last_slash_ptr == NULL)
+            return m_directory;
+        if (last_slash_ptr == dir_cstr)
+        {
+            if (last_slash_ptr[1] == 0)
+                return ConstString(last_slash_ptr);
+            else
+                return ConstString(last_slash_ptr+1);
+        }
+        if (last_slash_ptr[1] != 0)
+            return ConstString(last_slash_ptr+1);
+        const char* penultimate_slash_ptr = last_slash_ptr;
+        while (*penultimate_slash_ptr)
+        {
+            --penultimate_slash_ptr;
+            if (penultimate_slash_ptr == dir_cstr)
+                break;
+            if (*penultimate_slash_ptr == '/')
+                break;
+        }
+        ConstString result(penultimate_slash_ptr+1,last_slash_ptr-penultimate_slash_ptr);
+        return result;
+    }
+    return ConstString();
+}
+
+void
+FileSpec::AppendPathComponent (const char *new_path)
+{
+    const bool resolve = false;
+    if (m_filename.IsEmpty() && m_directory.IsEmpty())
+    {
+        SetFile(new_path,resolve);
+        return;
+    }
+    StreamString stream;
+    if (m_filename.IsEmpty())
+        stream.Printf("%s/%s",m_directory.GetCString(),new_path);
+    else if (m_directory.IsEmpty())
+        stream.Printf("%s/%s",m_filename.GetCString(),new_path);
+    else
+        stream.Printf("%s/%s/%s",m_directory.GetCString(), m_filename.GetCString(),new_path);
+    SetFile(stream.GetData(), resolve);
+}
+
+void
+FileSpec::RemoveLastPathComponent ()
+{
+    const bool resolve = false;
+    if (m_filename.IsEmpty() && m_directory.IsEmpty())
+    {
+        SetFile("",resolve);
+        return;
+    }
+    if (m_directory.IsEmpty())
+    {
+        SetFile("",resolve);
+        return;
+    }
+    if (m_filename.IsEmpty())
+    {
+        const char* dir_cstr = m_directory.GetCString();
+        const char* last_slash_ptr = ::strrchr(dir_cstr, '/');
+        
+        // check for obvious cases before doing the full thing
+        if (!last_slash_ptr)
+        {
+            SetFile("",resolve);
+            return;
+        }
+        if (last_slash_ptr == dir_cstr)
+        {
+            SetFile("/",resolve);
+            return;
+        }        
+        size_t last_slash_pos = last_slash_ptr - dir_cstr+1;
+        ConstString new_path(dir_cstr,last_slash_pos);
+        SetFile(new_path.GetCString(),resolve);
+    }
+    else
+        SetFile(m_directory.GetCString(),resolve);
+}
 //------------------------------------------------------------------
 /// Returns true if the filespec represents an implementation source
 /// file (files with a ".c", ".cpp", ".m", ".mm" (many more)
diff --git a/contrib/llvm/tools/lldb/source/Host/common/Host.cpp b/contrib/llvm/tools/lldb/source/Host/common/Host.cpp
index a7bad0063ef..262776f6c71 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/Host.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/Host.cpp
@@ -10,26 +10,35 @@
 #include "lldb/lldb-python.h"
 
 // C includes
-#include <dlfcn.h>
 #include <errno.h>
-#include <grp.h>
 #include <limits.h>
+#include <sys/types.h>
+#ifdef _WIN32
+#include "lldb/Host/windows/windows.h"
+#include <winsock2.h>
+#include <WS2tcpip.h>
+#else
+#include <dlfcn.h>
+#include <grp.h>
 #include <netdb.h>
 #include <pwd.h>
-#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
+#if !defined (__GNU__) && !defined (_WIN32)
+// Does not exist under GNU/HURD or Windows
 #include <sys/sysctl.h>
-#include <unistd.h>
+#endif
 
 #if defined (__APPLE__)
-
-#include <dispatch/dispatch.h>
-#include <libproc.h>
-#include <mach-o/dyld.h>
 #include <mach/mach_port.h>
-
+#include <mach/mach_init.h>
+#include <mach-o/dyld.h>
+#include <AvailabilityMacros.h>
 #endif
 
 #if defined (__linux__) || defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
+#include <spawn.h>
 #include <sys/wait.h>
 #include <sys/syscall.h>
 #endif
@@ -44,6 +53,7 @@
 #include "lldb/Core/Debugger.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
+#include "lldb/Core/Module.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Core/ThreadSafeSTLMap.h"
 #include "lldb/Host/Config.h"
@@ -52,21 +62,18 @@
 #include "lldb/Host/Mutex.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/TargetList.h"
+#include "lldb/Utility/CleanUp.h"
 
 #include "llvm/ADT/SmallString.h"
 #include "llvm/Support/Host.h"
-#include "llvm/Support/MachO.h"
 #include "llvm/Support/raw_ostream.h"
 
 
-
-
-
 using namespace lldb;
 using namespace lldb_private;
 
 
-#if !defined (__APPLE__)
+#if !defined (__APPLE__) && !defined (_WIN32)
 struct MonitorInfo
 {
     lldb::pid_t pid;                            // The process ID to monitor
@@ -75,7 +82,7 @@ struct MonitorInfo
     bool monitor_signals;                       // If true, call the callback when "pid" gets signaled.
 };
 
-static void *
+static thread_result_t
 MonitorChildProcessThreadFunction (void *arg);
 
 lldb::thread_t
@@ -89,7 +96,7 @@ Host::StartMonitoringChildProcess
 {
     lldb::thread_t thread = LLDB_INVALID_HOST_THREAD;
     MonitorInfo * info_ptr = new MonitorInfo();
-        
+
     info_ptr->pid = pid;
     info_ptr->callback = callback;
     info_ptr->callback_baton = callback_baton;
@@ -133,7 +140,7 @@ private:
     int m_old_state;    // Save the old cancelability state.
 };
 
-static void *
+static thread_result_t
 MonitorChildProcessThreadFunction (void *arg)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS));
@@ -145,9 +152,11 @@ MonitorChildProcessThreadFunction (void *arg)
 
     const Host::MonitorChildProcessCallback callback = info->callback;
     void * const callback_baton = info->callback_baton;
-    const lldb::pid_t pid = info->pid;
     const bool monitor_signals = info->monitor_signals;
 
+    assert (info->pid <= UINT32_MAX);
+    const ::pid_t pid = monitor_signals ? -1 * info->pid : info->pid;
+
     delete info;
 
     int status = -1;
@@ -160,12 +169,12 @@ MonitorChildProcessThreadFunction (void *arg)
     {
         log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS);
         if (log)
-            log->Printf("%s ::wait_pid (pid = %" PRIu64 ", &status, options = %i)...", function, pid, options);
+            log->Printf("%s ::wait_pid (pid = %" PRIi32 ", &status, options = %i)...", function, pid, options);
 
         // Wait for all child processes
         ::pthread_testcancel ();
         // Get signals from all children with same process group of pid
-        const lldb::pid_t wait_pid = ::waitpid (-1*pid, &status, options);
+        const ::pid_t wait_pid = ::waitpid (pid, &status, options);
         ::pthread_testcancel ();
 
         if (wait_pid == -1)
@@ -200,7 +209,7 @@ MonitorChildProcessThreadFunction (void *arg)
             {
                 signal = WTERMSIG(status);
                 status_cstr = "SIGNALED";
-                if (wait_pid == pid) {
+                if (wait_pid == abs(pid)) {
                     exited = true;
                     exit_status = -1;
                 }
@@ -216,7 +225,7 @@ MonitorChildProcessThreadFunction (void *arg)
 
                 log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS);
                 if (log)
-                    log->Printf ("%s ::waitpid (pid = %" PRIu64 ", &status, options = %i) => pid = %" PRIu64 ", status = 0x%8.8x (%s), signal = %i, exit_state = %i",
+                    log->Printf ("%s ::waitpid (pid = %" PRIi32 ", &status, options = %i) => pid = %" PRIi32 ", status = 0x%8.8x (%s), signal = %i, exit_state = %i",
                                  function,
                                  wait_pid,
                                  options,
@@ -233,7 +242,7 @@ MonitorChildProcessThreadFunction (void *arg)
                         callback_return = callback (callback_baton, wait_pid, exited, signal, exit_status);
                     
                     // If our process exited, then this thread should exit
-                    if (exited && wait_pid == pid)
+                    if (exited && wait_pid == abs(pid))
                     {
                         if (log)
                             log->Printf ("%s (arg = %p) thread exiting because pid received exit signal...", __FUNCTION__, arg);
@@ -259,6 +268,9 @@ MonitorChildProcessThreadFunction (void *arg)
     return NULL;
 }
 
+#endif // #if !defined (__APPLE__) && !defined (_WIN32)
+
+#if !defined (__APPLE__)
 
 void
 Host::SystemLog (SystemLogType type, const char *format, va_list args)
@@ -266,7 +278,7 @@ Host::SystemLog (SystemLogType type, const char *format, va_list args)
     vfprintf (stderr, format, args);
 }
 
-#endif // #if !defined (__APPLE__)
+#endif
 
 void
 Host::SystemLog (SystemLogType type, const char *format, ...)
@@ -277,12 +289,6 @@ Host::SystemLog (SystemLogType type, const char *format, ...)
     va_end (args);
 }
 
-size_t
-Host::GetPageSize()
-{
-    return ::getpagesize();
-}
-
 const ArchSpec &
 Host::GetArchitecture (SystemDefaultArchitecture arch_kind)
 {
@@ -445,6 +451,8 @@ Host::GetCurrentProcessID()
     return ::getpid();
 }
 
+#ifndef _WIN32
+
 lldb::tid_t
 Host::GetCurrentThreadID()
 {
@@ -521,6 +529,8 @@ Host::GetSignalAsCString (int signo)
     return NULL;
 }
 
+#endif
+
 void
 Host::WillTerminate ()
 {
@@ -563,6 +573,9 @@ struct HostThreadCreateInfo
 };
 
 static thread_result_t
+#ifdef _WIN32
+__stdcall
+#endif
 ThreadCreateTrampoline (thread_arg_t arg)
 {
     HostThreadCreateInfo *info = (HostThreadCreateInfo *)arg;
@@ -592,7 +605,12 @@ Host::ThreadCreate
     // Host::ThreadCreateTrampoline will delete this pointer for us.
     HostThreadCreateInfo *info_ptr = new HostThreadCreateInfo (thread_name, thread_fptr, thread_arg);
     
+#ifdef _WIN32
+    thread = ::_beginthreadex(0, 0, ThreadCreateTrampoline, info_ptr, 0, NULL);
+    int err = thread <= 0 ? GetLastError() : 0;
+#else
     int err = ::pthread_create (&thread, NULL, ThreadCreateTrampoline, info_ptr);
+#endif
     if (err == 0)
     {
         if (error)
@@ -606,6 +624,8 @@ Host::ThreadCreate
     return LLDB_INVALID_HOST_THREAD;
 }
 
+#ifndef _WIN32
+
 bool
 Host::ThreadCancel (lldb::thread_t thread, Error *error)
 {
@@ -633,6 +653,26 @@ Host::ThreadJoin (lldb::thread_t thread, thread_result_t *thread_result_ptr, Err
     return err == 0;
 }
 
+lldb::thread_key_t
+Host::ThreadLocalStorageCreate(ThreadLocalStorageCleanupCallback callback)
+{
+    pthread_key_t key;
+    ::pthread_key_create (&key, callback);
+    return key;
+}
+
+void*
+Host::ThreadLocalStorageGet(lldb::thread_key_t key)
+{
+    return ::pthread_getspecific (key);
+}
+
+void
+Host::ThreadLocalStorageSet(lldb::thread_key_t key, void *value)
+{
+   ::pthread_setspecific (key, value);
+}
+
 bool
 Host::SetThreadName (lldb::pid_t pid, lldb::tid_t tid, const char *name)
 {
@@ -723,9 +763,13 @@ Host::SetShortThreadName (lldb::pid_t pid, lldb::tid_t tid,
         }
         return Host::SetThreadName (pid, tid, namebuf);
     }
+
+    ::free(namebuf);
     return false;
 }
 
+#endif
+
 FileSpec
 Host::GetProgramFileSpec ()
 {
@@ -771,19 +815,6 @@ Host::GetProgramFileSpec ()
     return g_program_filespec;
 }
 
-FileSpec
-Host::GetModuleFileSpecForHostAddress (const void *host_addr)
-{
-    FileSpec module_filespec;
-    Dl_info info;
-    if (::dladdr (host_addr, &info))
-    {
-        if (info.dli_fname)
-            module_filespec.SetFile(info.dli_fname, true);
-    }
-    return module_filespec;
-}
-
 #if !defined (__APPLE__) // see Host.mm
 
 bool
@@ -800,6 +831,8 @@ Host::ResolveExecutableInBundle (FileSpec &file)
 }
 #endif
 
+#ifndef _WIN32
+
 // Opaque info that tracks a dynamic library that was loaded
 struct DynamicLibraryInfo
 {
@@ -924,6 +957,21 @@ Host::DynamicLibraryGetSymbol (void *opaque, const char *symbol_name, Error &err
     return NULL;
 }
 
+FileSpec
+Host::GetModuleFileSpecForHostAddress (const void *host_addr)
+{
+    FileSpec module_filespec;
+    Dl_info info;
+    if (::dladdr (host_addr, &info))
+    {
+        if (info.dli_fname)
+            module_filespec.SetFile(info.dli_fname, true);
+    }
+    return module_filespec;
+}
+
+#endif
+
 bool
 Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
 {
@@ -932,6 +980,7 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
     // on linux this is assumed to be the "lldb" main executable. If LLDB on
     // linux is actually in a shared library (liblldb.so) then this function will
     // need to be modified to "do the right thing".
+    Log *log = lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_HOST);
 
     switch (path_type)
     {
@@ -942,9 +991,11 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
             {
                 FileSpec lldb_file_spec (Host::GetModuleFileSpecForHostAddress ((void *)Host::GetLLDBPath));
                 g_lldb_so_dir = lldb_file_spec.GetDirectory();
+                if (log)
+                    log->Printf("Host::GetLLDBPath(ePathTypeLLDBShlibDir) => '%s'", g_lldb_so_dir.GetCString());
             }
             file_spec.GetDirectory() = g_lldb_so_dir;
-            return file_spec.GetDirectory();
+            return (bool)file_spec.GetDirectory();
         }
         break;
 
@@ -965,7 +1016,11 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
                     if (framework_pos)
                     {
                         framework_pos += strlen("LLDB.framework");
-#if !defined (__arm__)
+#if defined (__arm__)
+                        // Shallow bundle
+                        *framework_pos = '\0';
+#else
+                        // Normal bundle
                         ::strncpy (framework_pos, "/Resources", PATH_MAX - (framework_pos - raw_path));
 #endif
                     }
@@ -973,9 +1028,11 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
                     FileSpec::Resolve (raw_path, resolved_path, sizeof(resolved_path));
                     g_lldb_support_exe_dir.SetCString(resolved_path);
                 }
+                if (log)
+                    log->Printf("Host::GetLLDBPath(ePathTypeSupportExecutableDir) => '%s'", g_lldb_support_exe_dir.GetCString());
             }
             file_spec.GetDirectory() = g_lldb_support_exe_dir;
-            return file_spec.GetDirectory();
+            return (bool)file_spec.GetDirectory();
         }
         break;
 
@@ -1005,14 +1062,19 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
                 // TODO: Anyone know how we can determine this for linux? Other systems??
                 g_lldb_headers_dir.SetCString ("/opt/local/include/lldb");
 #endif
+                if (log)
+                    log->Printf("Host::GetLLDBPath(ePathTypeHeaderDir) => '%s'", g_lldb_headers_dir.GetCString());
             }
             file_spec.GetDirectory() = g_lldb_headers_dir;
-            return file_spec.GetDirectory();
+            return (bool)file_spec.GetDirectory();
         }
         break;
 
-#ifndef LLDB_DISABLE_PYTHON
-    case ePathTypePythonDir:                
+#ifdef LLDB_DISABLE_PYTHON
+    case ePathTypePythonDir:
+        return false;
+#else
+    case ePathTypePythonDir:
         {
             static ConstString g_lldb_python_dir;
             if (!g_lldb_python_dir)
@@ -1047,9 +1109,13 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
                     FileSpec::Resolve (raw_path, resolved_path, sizeof(resolved_path));
                     g_lldb_python_dir.SetCString(resolved_path);
                 }
+                
+                if (log)
+                    log->Printf("Host::GetLLDBPath(ePathTypePythonDir) => '%s'", g_lldb_python_dir.GetCString());
+
             }
             file_spec.GetDirectory() = g_lldb_python_dir;
-            return file_spec.GetDirectory();
+            return (bool)file_spec.GetDirectory();
         }
         break;
 #endif
@@ -1087,6 +1153,10 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
                     g_lldb_system_plugin_dir.SetCString(lldb_file_spec.GetPath().c_str());
                 }
 #endif // __APPLE__ || __linux__
+                
+                if (log)
+                    log->Printf("Host::GetLLDBPath(ePathTypeLLDBSystemPlugins) => '%s'", g_lldb_system_plugin_dir.GetCString());
+
             }
             
             if (g_lldb_system_plugin_dir)
@@ -1116,7 +1186,7 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
                 }
             }
             file_spec.GetDirectory() = g_lldb_user_plugin_dir;
-            return file_spec.GetDirectory();
+            return (bool)file_spec.GetDirectory();
 #elif defined (__linux__)
             static ConstString g_lldb_user_plugin_dir;
             if (!g_lldb_user_plugin_dir)
@@ -1145,9 +1215,11 @@ Host::GetLLDBPath (PathType path_type, FileSpec &file_spec)
 
                 if (lldb_file_spec.Exists())
                     g_lldb_user_plugin_dir.SetCString(lldb_file_spec.GetPath().c_str());
+                if (log)
+                    log->Printf("Host::GetLLDBPath(ePathTypeLLDBUserPlugins) => '%s'", g_lldb_user_plugin_dir.GetCString());
             }
             file_spec.GetDirectory() = g_lldb_user_plugin_dir;
-            return file_spec.GetDirectory();
+            return (bool)file_spec.GetDirectory();
 #endif
             // TODO: where would user LLDB plug-ins be located on other systems?
             return false;
@@ -1175,6 +1247,8 @@ Host::GetHostname (std::string &s)
     return false;
 }
 
+#ifndef _WIN32
+
 const char *
 Host::GetUserName (uint32_t uid, std::string &user_name)
 {
@@ -1234,22 +1308,6 @@ Host::GetGroupName (uint32_t gid, std::string &group_name)
     return NULL;
 }
 
-#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) // see macosx/Host.mm
-bool
-Host::GetOSBuildString (std::string &s)
-{
-    s.clear();
-    return false;
-}
-
-bool
-Host::GetOSKernelDescription (std::string &s)
-{
-    s.clear();
-    return false;
-}
-#endif
-
 uint32_t
 Host::GetUserID ()
 {
@@ -1274,16 +1332,32 @@ Host::GetEffectiveGroupID ()
     return getegid();
 }
 
-#if !defined (__APPLE__) && !defined(__linux__)
+#endif
+
+#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) // see macosx/Host.mm
+bool
+Host::GetOSBuildString (std::string &s)
+{
+    s.clear();
+    return false;
+}
+
+bool
+Host::GetOSKernelDescription (std::string &s)
+{
+    s.clear();
+    return false;
+}
+#endif
+
+#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) && !defined(__linux__)
 uint32_t
 Host::FindProcesses (const ProcessInstanceInfoMatch &match_info, ProcessInstanceInfoList &process_infos)
 {
     process_infos.Clear();
     return process_infos.GetSize();
 }
-#endif // #if !defined (__APPLE__) && !defined(__linux__)
 
-#if !defined (__APPLE__) && !defined (__FreeBSD__) && !defined (__FreeBSD_kernel__) && !defined(__linux__)
 bool
 Host::GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &process_info)
 {
@@ -1386,7 +1460,8 @@ Host::RunShellCommand (const char *command,
         launch_info.ConvertArgumentsForLaunchingInShell (error,
                                                          localhost,
                                                          will_debug,
-                                                         first_arg_is_full_shell_command);
+                                                         first_arg_is_full_shell_command,
+                                                         0);
     }
     else
     {
@@ -1425,23 +1500,31 @@ Host::RunShellCommand (const char *command,
     
     error = LaunchProcess (launch_info);
     const lldb::pid_t pid = launch_info.GetProcessID();
-    if (pid != LLDB_INVALID_PROCESS_ID)
+
+    if (error.Success() && pid == LLDB_INVALID_PROCESS_ID)
+        error.SetErrorString("failed to get process ID");
+
+    if (error.Success())
     {
         // The process successfully launched, so we can defer ownership of
         // "shell_info" to the MonitorShellCommand callback function that will
         // get called when the process dies. We release the unique pointer as it
         // doesn't need to delete the ShellInfo anymore.
         ShellInfo *shell_info = shell_info_ap.release();
+        TimeValue *timeout_ptr = nullptr;
         TimeValue timeout_time(TimeValue::Now());
-        timeout_time.OffsetWithSeconds(timeout_sec);
+        if (timeout_sec > 0) {
+            timeout_time.OffsetWithSeconds(timeout_sec);
+            timeout_ptr = &timeout_time;
+        }
         bool timed_out = false;
-        shell_info->process_reaped.WaitForValueEqualTo(true, &timeout_time, &timed_out);
+        shell_info->process_reaped.WaitForValueEqualTo(true, timeout_ptr, &timed_out);
         if (timed_out)
         {
             error.SetErrorString("timed out waiting for shell command to complete");
-            
+
             // Kill the process since it didn't complete withint the timeout specified
-            ::kill (pid, SIGKILL);
+            Kill (pid, SIGKILL);
             // Wait for the monitor callback to get the message
             timeout_time = TimeValue::Now();
             timeout_time.OffsetWithSeconds(1);
@@ -1477,10 +1560,6 @@ Host::RunShellCommand (const char *command,
         }
         shell_info->can_delete.SetValue(true, eBroadcastAlways);
     }
-    else
-    {
-        error.SetErrorString("failed to get process ID");
-    }
 
     if (output_file_path)
         ::unlink (output_file_path);
@@ -1490,6 +1569,212 @@ Host::RunShellCommand (const char *command,
     return error;
 }
 
+#if defined(__linux__) || defined(__FreeBSD__)
+// The functions below implement process launching via posix_spawn() for Linux
+// and FreeBSD.
+
+// The posix_spawn() and posix_spawnp() functions first appeared in FreeBSD 8.0,
+static Error
+LaunchProcessPosixSpawn (const char *exe_path, ProcessLaunchInfo &launch_info, ::pid_t &pid)
+{
+    Error error;
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_HOST | LIBLLDB_LOG_PROCESS));
+
+    assert(exe_path);
+    assert(!launch_info.GetFlags().Test (eLaunchFlagDebug));
+
+    posix_spawnattr_t attr;
+
+    error.SetError( ::posix_spawnattr_init (&attr), eErrorTypePOSIX);
+    error.LogIfError(log, "::posix_spawnattr_init ( &attr )");
+    if (error.Fail())
+        return error;
+
+    // Make a quick class that will cleanup the posix spawn attributes in case
+    // we return in the middle of this function.
+    lldb_utility::CleanUp <posix_spawnattr_t *, int> posix_spawnattr_cleanup(&attr, posix_spawnattr_destroy);
+
+    sigset_t no_signals;
+    sigset_t all_signals;
+    sigemptyset (&no_signals);
+    sigfillset (&all_signals);
+    ::posix_spawnattr_setsigmask(&attr, &all_signals);
+    ::posix_spawnattr_setsigdefault(&attr, &no_signals);
+
+    short flags = POSIX_SPAWN_SETSIGDEF | POSIX_SPAWN_SETSIGMASK;
+
+    error.SetError( ::posix_spawnattr_setflags (&attr, flags), eErrorTypePOSIX);
+    error.LogIfError(log, "::posix_spawnattr_setflags ( &attr, flags=0x%8.8x )", flags);
+    if (error.Fail())
+        return error;
+
+    const size_t num_file_actions = launch_info.GetNumFileActions ();
+    posix_spawn_file_actions_t file_actions, *file_action_ptr = NULL;
+    // Make a quick class that will cleanup the posix spawn attributes in case
+    // we return in the middle of this function.
+    lldb_utility::CleanUp <posix_spawn_file_actions_t *, int>
+        posix_spawn_file_actions_cleanup (file_action_ptr, NULL, posix_spawn_file_actions_destroy);
+
+    if (num_file_actions > 0)
+    {
+        error.SetError( ::posix_spawn_file_actions_init (&file_actions), eErrorTypePOSIX);
+        error.LogIfError(log, "::posix_spawn_file_actions_init ( &file_actions )");
+        if (error.Fail())
+            return error;
+
+        file_action_ptr = &file_actions;
+        posix_spawn_file_actions_cleanup.set(file_action_ptr);
+
+        for (size_t i = 0; i < num_file_actions; ++i)
+        {
+            const ProcessLaunchInfo::FileAction *launch_file_action = launch_info.GetFileActionAtIndex(i);
+            if (launch_file_action &&
+                !ProcessLaunchInfo::FileAction::AddPosixSpawnFileAction (&file_actions,
+                                                                         launch_file_action,
+                                                                         log,
+                                                                         error))
+                return error;
+        }
+    }
+
+    // Change working directory if neccessary.
+    char current_dir[PATH_MAX];
+    current_dir[0] = '\0';
+
+    const char *working_dir = launch_info.GetWorkingDirectory();
+    if (working_dir != NULL)
+    {
+        if (::getcwd(current_dir, sizeof(current_dir)) == NULL)
+        {
+            error.SetError(errno, eErrorTypePOSIX);
+            error.LogIfError(log, "unable to save the current directory");
+            return error;
+        }
+
+        if (::chdir(working_dir) == -1)
+        {
+            error.SetError(errno, eErrorTypePOSIX);
+            error.LogIfError(log, "unable to change working directory to %s", working_dir);
+            return error;
+        }
+    }
+
+    const char *tmp_argv[2];
+    char * const *argv = (char * const*)launch_info.GetArguments().GetConstArgumentVector();
+    char * const *envp = (char * const*)launch_info.GetEnvironmentEntries().GetConstArgumentVector();
+
+    // Prepare minimal argument list if we didn't get it from the launch_info structure.
+    // We must pass argv into posix_spawnp and it must contain at least two items -
+    // pointer to an executable and NULL.
+    if (argv == NULL)
+    {
+        tmp_argv[0] = exe_path;
+        tmp_argv[1] = NULL;
+        argv = (char * const*)tmp_argv;
+    }
+
+    error.SetError (::posix_spawnp (&pid,
+                                    exe_path,
+                                    (num_file_actions > 0) ? &file_actions : NULL,
+                                    &attr,
+                                    argv,
+                                    envp),
+                    eErrorTypePOSIX);
+
+    error.LogIfError(log, "::posix_spawnp ( pid => %i, path = '%s', file_actions = %p, attr = %p, argv = %p, envp = %p )",
+                     pid, exe_path, file_action_ptr, &attr, argv, envp);
+
+    // Change back the current directory.
+    // NOTE: do not override previously established error from posix_spawnp.
+    if (working_dir != NULL && ::chdir(current_dir) == -1 && error.Success())
+    {
+        error.SetError(errno, eErrorTypePOSIX);
+        error.LogIfError(log, "unable to change current directory back to %s",
+                         current_dir);
+    }
+
+    return error;
+}
+
+
+Error
+Host::LaunchProcess (ProcessLaunchInfo &launch_info)
+{
+    Error error;
+    char exe_path[PATH_MAX];
+
+    PlatformSP host_platform_sp (Platform::GetDefaultPlatform ());
+
+    const ArchSpec &arch_spec = launch_info.GetArchitecture();
+
+    FileSpec exe_spec(launch_info.GetExecutableFile());
+
+    FileSpec::FileType file_type = exe_spec.GetFileType();
+    if (file_type != FileSpec::eFileTypeRegular)
+    {
+        lldb::ModuleSP exe_module_sp;
+        error = host_platform_sp->ResolveExecutable (exe_spec,
+                                                     arch_spec,
+                                                     exe_module_sp,
+                                                     NULL);
+
+        if (error.Fail())
+            return error;
+
+        if (exe_module_sp)
+            exe_spec = exe_module_sp->GetFileSpec();
+    }
+
+    if (exe_spec.Exists())
+    {
+        exe_spec.GetPath (exe_path, sizeof(exe_path));
+    }
+    else
+    {
+        launch_info.GetExecutableFile().GetPath (exe_path, sizeof(exe_path));
+        error.SetErrorStringWithFormat ("executable doesn't exist: '%s'", exe_path);
+        return error;
+    }
+
+    assert(!launch_info.GetFlags().Test (eLaunchFlagLaunchInTTY));
+
+    ::pid_t pid = LLDB_INVALID_PROCESS_ID;
+
+    error = LaunchProcessPosixSpawn(exe_path, launch_info, pid);
+
+    if (pid != LLDB_INVALID_PROCESS_ID)
+    {
+        // If all went well, then set the process ID into the launch info
+        launch_info.SetProcessID(pid);
+
+        // Make sure we reap any processes we spawn or we will have zombies.
+        if (!launch_info.MonitorProcess())
+        {
+            const bool monitor_signals = false;
+            StartMonitoringChildProcess (Process::SetProcessExitStatus,
+                                         NULL,
+                                         pid,
+                                         monitor_signals);
+        }
+    }
+    else
+    {
+        // Invalid process ID, something didn't go well
+        if (error.Success())
+            error.SetErrorString ("process launch failed for unknown reasons");
+    }
+    return error;
+}
+
+#endif // defined(__linux__) or defined(__FreeBSD__)
+
+#ifndef _WIN32
+
+size_t
+Host::GetPageSize()
+{
+    return ::getpagesize();
+}
 
 uint32_t
 Host::GetNumberCPUS ()
@@ -1500,14 +1785,7 @@ Host::GetNumberCPUS ()
 #if defined(__APPLE__) or defined (__linux__) or defined (__FreeBSD__) or defined (__FreeBSD_kernel__)
 
         g_num_cores = ::sysconf(_SC_NPROCESSORS_ONLN);
-        
-#elif defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
-        
-        // Header file for this might need to be included at the top of this file
-        SYSTEM_INFO system_info;
-        ::GetSystemInfo (&system_info);
-        g_num_cores = system_info.dwNumberOfProcessors;
-        
+
 #else
         
         // Assume POSIX support if a host specific case has not been supplied above
@@ -1540,7 +1818,13 @@ Host::GetNumberCPUS ()
     return g_num_cores;
 }
 
+void
+Host::Kill(lldb::pid_t pid, int signo)
+{
+    ::kill(pid, signo);
+}
 
+#endif
 
 #if !defined (__APPLE__)
 bool
@@ -1560,9 +1844,326 @@ Host::SetCrashDescription (const char *description)
 }
 
 lldb::pid_t
-LaunchApplication (const FileSpec &app_file_spec)
+Host::LaunchApplication (const FileSpec &app_file_spec)
 {
     return LLDB_INVALID_PROCESS_ID;
 }
 
 #endif
+
+
+#ifdef LLDB_DISABLE_POSIX
+
+Error
+Host::MakeDirectory (const char* path, uint32_t mode)
+{
+    Error error;
+    error.SetErrorStringWithFormat("%s in not implemented on this host", __PRETTY_FUNCTION__);
+    return error;
+}
+
+Error
+Host::GetFilePermissions (const char* path, uint32_t &file_permissions)
+{
+    Error error;
+    error.SetErrorStringWithFormat("%s is not supported on this host", __PRETTY_FUNCTION__);
+    return error;
+}
+
+Error
+Host::SetFilePermissions (const char* path, uint32_t file_permissions)
+{
+    Error error;
+    error.SetErrorStringWithFormat("%s is not supported on this host", __PRETTY_FUNCTION__);
+    return error;
+}
+
+Error
+Host::Symlink (const char *src, const char *dst)
+{
+    Error error;
+    error.SetErrorStringWithFormat("%s is not supported on this host", __PRETTY_FUNCTION__);
+    return error;
+}
+
+Error
+Host::Readlink (const char *path, char *buf, size_t buf_len)
+{
+    Error error;
+    error.SetErrorStringWithFormat("%s is not supported on this host", __PRETTY_FUNCTION__);
+    return error;
+}
+
+Error
+Host::Unlink (const char *path)
+{
+    Error error;
+    error.SetErrorStringWithFormat("%s is not supported on this host", __PRETTY_FUNCTION__);
+    return error;
+}
+
+#else
+
+Error
+Host::MakeDirectory (const char* path, uint32_t file_permissions)
+{
+    Error error;
+    if (path && path[0])
+    {
+        if (::mkdir(path, file_permissions) != 0)
+        {
+            error.SetErrorToErrno();
+            switch (error.GetError())
+            {
+            case ENOENT:
+                {
+                    // Parent directory doesn't exist, so lets make it if we can
+                    FileSpec spec(path, false);
+                    if (spec.GetDirectory() && spec.GetFilename())
+                    {
+                        // Make the parent directory and try again
+                        Error error2 = Host::MakeDirectory(spec.GetDirectory().GetCString(), file_permissions);
+                        if (error2.Success())
+                        {
+                            // Try and make the directory again now that the parent directory was made successfully
+                            if (::mkdir(path, file_permissions) == 0)
+                                error.Clear();
+                            else
+                                error.SetErrorToErrno();
+                        }
+                    }
+                }
+                break;
+            case EEXIST:
+                {
+                    FileSpec path_spec(path, false);
+                    if (path_spec.IsDirectory())
+                        error.Clear(); // It is a directory and it already exists
+                }
+                break;
+            }
+        }
+    }
+    else
+    {
+        error.SetErrorString("empty path");
+    }
+    return error;
+}
+
+Error
+Host::GetFilePermissions (const char* path, uint32_t &file_permissions)
+{
+    Error error;
+    struct stat file_stats;
+    if (::stat (path, &file_stats) == 0)
+    {
+        // The bits in "st_mode" currently match the definitions
+        // for the file mode bits in unix.
+        file_permissions = file_stats.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
+    }
+    else
+    {
+        error.SetErrorToErrno();
+    }
+    return error;
+}
+
+Error
+Host::SetFilePermissions (const char* path, uint32_t file_permissions)
+{
+    Error error;
+    if (::chmod(path, file_permissions) != 0)
+        error.SetErrorToErrno();
+    return error;
+}
+
+Error
+Host::Symlink (const char *src, const char *dst)
+{
+    Error error;
+    if (::symlink(dst, src) == -1)
+        error.SetErrorToErrno();
+    return error;
+}
+
+Error
+Host::Unlink (const char *path)
+{
+    Error error;
+    if (::unlink(path) == -1)
+        error.SetErrorToErrno();
+    return error;
+}
+
+Error
+Host::Readlink (const char *path, char *buf, size_t buf_len)
+{
+    Error error;
+    ssize_t count = ::readlink(path, buf, buf_len);
+    if (count < 0)
+        error.SetErrorToErrno();
+    else if (count < (buf_len-1))
+        buf[count] = '\0'; // Success
+    else
+        error.SetErrorString("'buf' buffer is too small to contain link contents");
+    return error;
+}
+
+
+#endif
+
+typedef std::map<lldb::user_id_t, lldb::FileSP> FDToFileMap;
+FDToFileMap& GetFDToFileMap()
+{
+    static FDToFileMap g_fd2filemap;
+    return g_fd2filemap;
+}
+
+lldb::user_id_t
+Host::OpenFile (const FileSpec& file_spec,
+                uint32_t flags,
+                uint32_t mode,
+                Error &error)
+{
+    std::string path (file_spec.GetPath());
+    if (path.empty())
+    {
+        error.SetErrorString("empty path");
+        return UINT64_MAX;
+    }
+    FileSP file_sp(new File());
+    error = file_sp->Open(path.c_str(),flags,mode);
+    if (file_sp->IsValid() == false)
+        return UINT64_MAX;
+    lldb::user_id_t fd = file_sp->GetDescriptor();
+    GetFDToFileMap()[fd] = file_sp;
+    return fd;
+}
+
+bool
+Host::CloseFile (lldb::user_id_t fd, Error &error)
+{
+    if (fd == UINT64_MAX)
+    {
+        error.SetErrorString ("invalid file descriptor");
+        return false;
+    }
+    FDToFileMap& file_map = GetFDToFileMap();
+    FDToFileMap::iterator pos = file_map.find(fd);
+    if (pos == file_map.end())
+    {
+        error.SetErrorStringWithFormat ("invalid host file descriptor %" PRIu64, fd);
+        return false;
+    }
+    FileSP file_sp = pos->second;
+    if (!file_sp)
+    {
+        error.SetErrorString ("invalid host backing file");
+        return false;
+    }
+    error = file_sp->Close();
+    file_map.erase(pos);
+    return error.Success();
+}
+
+uint64_t
+Host::WriteFile (lldb::user_id_t fd, uint64_t offset, const void* src, uint64_t src_len, Error &error)
+{
+    if (fd == UINT64_MAX)
+    {
+        error.SetErrorString ("invalid file descriptor");
+        return UINT64_MAX;
+    }
+    FDToFileMap& file_map = GetFDToFileMap();
+    FDToFileMap::iterator pos = file_map.find(fd);
+    if (pos == file_map.end())
+    {
+        error.SetErrorStringWithFormat("invalid host file descriptor %" PRIu64 , fd);
+        return false;
+    }
+    FileSP file_sp = pos->second;
+    if (!file_sp)
+    {
+        error.SetErrorString ("invalid host backing file");
+        return UINT64_MAX;
+    }
+    if (file_sp->SeekFromStart(offset, &error) != offset || error.Fail())
+        return UINT64_MAX;
+    size_t bytes_written = src_len;
+    error = file_sp->Write(src, bytes_written);
+    if (error.Fail())
+        return UINT64_MAX;
+    return bytes_written;
+}
+
+uint64_t
+Host::ReadFile (lldb::user_id_t fd, uint64_t offset, void* dst, uint64_t dst_len, Error &error)
+{
+    if (fd == UINT64_MAX)
+    {
+        error.SetErrorString ("invalid file descriptor");
+        return UINT64_MAX;
+    }
+    FDToFileMap& file_map = GetFDToFileMap();
+    FDToFileMap::iterator pos = file_map.find(fd);
+    if (pos == file_map.end())
+    {
+        error.SetErrorStringWithFormat ("invalid host file descriptor %" PRIu64, fd);
+        return false;
+    }
+    FileSP file_sp = pos->second;
+    if (!file_sp)
+    {
+        error.SetErrorString ("invalid host backing file");
+        return UINT64_MAX;
+    }
+    if (file_sp->SeekFromStart(offset, &error) != offset || error.Fail())
+        return UINT64_MAX;
+    size_t bytes_read = dst_len;
+    error = file_sp->Read(dst ,bytes_read);
+    if (error.Fail())
+        return UINT64_MAX;
+    return bytes_read;
+}
+
+lldb::user_id_t
+Host::GetFileSize (const FileSpec& file_spec)
+{
+    return file_spec.GetByteSize();
+}
+
+bool
+Host::GetFileExists (const FileSpec& file_spec)
+{
+    return file_spec.Exists();
+}
+
+bool
+Host::CalculateMD5 (const FileSpec& file_spec,
+                    uint64_t &low,
+                    uint64_t &high)
+{
+#if defined (__APPLE__)
+    StreamString md5_cmd_line;
+    md5_cmd_line.Printf("md5 -q '%s'", file_spec.GetPath().c_str());
+    std::string hash_string;
+    Error err = Host::RunShellCommand(md5_cmd_line.GetData(), NULL, NULL, NULL, &hash_string, 60);
+    if (err.Fail())
+        return false;
+    // a correctly formed MD5 is 16-bytes, that is 32 hex digits
+    // if the output is any other length it is probably wrong
+    if (hash_string.size() != 32)
+        return false;
+    std::string part1(hash_string,0,16);
+    std::string part2(hash_string,16);
+    const char* part1_cstr = part1.c_str();
+    const char* part2_cstr = part2.c_str();
+    high = ::strtoull(part1_cstr, NULL, 16);
+    low = ::strtoull(part2_cstr, NULL, 16);
+    return true;
+#else
+    // your own MD5 implementation here
+    return false;
+#endif
+}
diff --git a/contrib/llvm/tools/lldb/source/Host/common/Mutex.cpp b/contrib/llvm/tools/lldb/source/Host/common/Mutex.cpp
index 39cd8c6adb4..4e013553562 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/Mutex.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/Mutex.cpp
@@ -10,9 +10,11 @@
 #include "lldb/Host/Mutex.h"
 #include "lldb/Host/Host.h"
 
+#ifndef _WIN32
+#include <pthread.h>
+#endif
 #include <string.h>
 #include <stdio.h>
-#include <unistd.h>
 
 #if 0
 // This logging is way too verbose to enable even for a log channel. 
@@ -177,6 +179,8 @@ Mutex::Locker::TryLock (Mutex &mutex, const char *failure_message)
     return m_mutex_ptr != NULL;
 }
 
+#ifndef _WIN32
+
 //----------------------------------------------------------------------
 // Default constructor.
 //
@@ -252,15 +256,6 @@ Mutex::~Mutex()
 #endif
 }
 
-//----------------------------------------------------------------------
-// Mutex get accessor.
-//----------------------------------------------------------------------
-pthread_mutex_t *
-Mutex::GetMutex()
-{
-    return &m_mutex;
-}
-
 //----------------------------------------------------------------------
 // Locks the mutex owned by this object, if the mutex is already
 // locked, the calling thread will block until the mutex becomes
@@ -341,6 +336,17 @@ Mutex::Unlock()
     return err;
 }
 
+#endif
+
+//----------------------------------------------------------------------
+// Mutex get accessor.
+//----------------------------------------------------------------------
+lldb::mutex_t *
+Mutex::GetMutex()
+{
+    return &m_mutex;
+}
+
 #ifdef LLDB_CONFIGURATION_DEBUG
 int
 TrackingMutex::Unlock ()
diff --git a/contrib/llvm/tools/lldb/source/Host/common/OptionParser.cpp b/contrib/llvm/tools/lldb/source/Host/common/OptionParser.cpp
new file mode 100644
index 00000000000..ead044f53cf
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Host/common/OptionParser.cpp
@@ -0,0 +1,107 @@
+//===-- source/Host/common/OptionParser.cpp ---------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Host/OptionParser.h"
+
+#ifdef _MSC_VER
+#include "../windows/msvc/getopt.inc"
+#else
+#ifdef _WIN32
+#define _BSD_SOURCE // Required so that getopt.h defines optreset
+#endif
+#include <getopt.h>
+#endif
+
+using namespace lldb_private;
+
+void
+OptionParser::Prepare()
+{
+#ifdef __GLIBC__
+    optind = 0;
+#else
+    optreset = 1;
+    optind = 1;
+#endif
+}
+
+void
+OptionParser::EnableError(bool error)
+{
+    opterr = error ? 1 : 0;
+}
+
+int
+OptionParser::Parse (int argc,
+                     char * const argv [],
+                     const char *optstring,
+                     const Option *longopts,
+                     int *longindex)
+{
+    return getopt_long_only(argc, argv, optstring, (const option*)longopts, longindex);
+}
+
+char*
+OptionParser::GetOptionArgument()
+{
+    return optarg;
+}
+
+int
+OptionParser::GetOptionIndex()
+{
+    return optind;
+}
+
+int
+OptionParser::GetOptionErrorCause()
+{
+    return optopt;
+}
+
+std::string
+OptionParser::GetShortOptionString(struct option *long_options)
+{
+    std::string s;
+    int i=0;
+    bool done = false;
+    while (!done)
+    {
+        if (long_options[i].name    == 0 &&
+            long_options[i].has_arg == 0 &&
+            long_options[i].flag    == 0 &&
+            long_options[i].val     == 0)
+        {
+            done = true;
+        }
+        else
+        {
+            if (long_options[i].flag == NULL &&
+                isalpha(long_options[i].val))
+            {
+                s.append(1, (char)long_options[i].val);
+                switch (long_options[i].has_arg)
+                {
+                    default:
+                    case no_argument:
+                        break;
+                        
+                    case optional_argument:
+                        s.append(2, ':');
+                        break;
+                    case required_argument:
+                        s.append(1, ':');
+                        break;
+                }
+            }
+            ++i;
+        }
+    }
+    return s;
+}
diff --git a/contrib/llvm/tools/lldb/source/Host/common/ProcessRunLock.cpp b/contrib/llvm/tools/lldb/source/Host/common/ProcessRunLock.cpp
new file mode 100644
index 00000000000..669a96ddd70
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Host/common/ProcessRunLock.cpp
@@ -0,0 +1,71 @@
+#ifndef _WIN32
+
+#include "lldb/Host/ProcessRunLock.h"
+
+namespace lldb_private {
+
+    ProcessRunLock::ProcessRunLock()
+        : m_running(false)
+    {
+        int err = ::pthread_rwlock_init(&m_rwlock, NULL); (void) err;
+        //#if LLDB_CONFIGURATION_DEBUG
+        //        assert(err == 0);
+        //#endif
+    }
+
+    ProcessRunLock::~ProcessRunLock()
+    {
+        int err = ::pthread_rwlock_destroy(&m_rwlock); (void) err;
+        //#if LLDB_CONFIGURATION_DEBUG
+        //        assert(err == 0);
+        //#endif
+    }
+
+    bool ProcessRunLock::ReadTryLock()
+    {
+        ::pthread_rwlock_rdlock(&m_rwlock);
+        if (m_running == false)
+        {
+            return true;
+        }
+        ::pthread_rwlock_unlock(&m_rwlock);
+        return false;
+    }
+
+    bool ProcessRunLock::ReadUnlock()
+    {
+        return ::pthread_rwlock_unlock(&m_rwlock) == 0;
+    }
+
+    bool ProcessRunLock::SetRunning()
+    {
+        ::pthread_rwlock_wrlock(&m_rwlock);
+        m_running = true;
+        ::pthread_rwlock_unlock(&m_rwlock);
+        return true;
+    }
+
+    bool ProcessRunLock::TrySetRunning()
+    {
+        bool r;
+
+        if (::pthread_rwlock_trywrlock(&m_rwlock) == 0)
+        {
+            r = !m_running;
+            m_running = true;
+            ::pthread_rwlock_unlock(&m_rwlock);
+            return r;
+        }
+        return false;
+    }
+
+    bool ProcessRunLock::SetStopped()
+    {
+        ::pthread_rwlock_wrlock(&m_rwlock);
+        m_running = false;
+        ::pthread_rwlock_unlock(&m_rwlock);
+        return true;
+    }
+}
+
+#endif
diff --git a/contrib/llvm/tools/lldb/source/Host/common/SocketAddress.cpp b/contrib/llvm/tools/lldb/source/Host/common/SocketAddress.cpp
index a22dc7a01c1..1fa7531af9d 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/SocketAddress.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/SocketAddress.cpp
@@ -11,6 +11,9 @@
 #include <stddef.h>
 
 // C Includes
+#if !defined(_MSC_VER)
+#include <arpa/inet.h>
+#endif
 #include <assert.h>
 #include <string.h>
 
diff --git a/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp b/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp
index 7189269677d..41f465abc83 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/Symbols.cpp
@@ -61,9 +61,9 @@ Symbols::LocateExecutableSymbolFile (const ModuleSpec &module_spec)
         uuid_str = uuid_str + ".debug";
     }
 
-    // Get full path to our module. Needed to check debug files like this:
-    //   /usr/lib/debug/usr/lib/libboost_date_time.so.1.46.1
-    std::string module_filename = module_spec.GetFileSpec().GetPath();
+    // Get directory of our module. Needed to check debug files like this:
+    //   /usr/lib/debug/usr/lib/library.so.debug
+    std::string module_directory = module_spec.GetFileSpec().GetDirectory().AsCString();
 
     size_t num_directories = debug_file_search_paths.GetSize();
     for (size_t idx = 0; idx < num_directories; ++idx)
@@ -79,7 +79,7 @@ Symbols::LocateExecutableSymbolFile (const ModuleSpec &module_spec)
         files.push_back (dirname + "/" + symbol_filename);
         files.push_back (dirname + "/.debug/" + symbol_filename);
         files.push_back (dirname + "/.build-id/" + uuid_str);
-        files.push_back (dirname + module_filename);
+        files.push_back (dirname + module_directory + "/" + symbol_filename);
 
         const uint32_t num_files = files.size();
         for (size_t idx_file = 0; idx_file < num_files; ++idx_file)
diff --git a/contrib/llvm/tools/lldb/source/Host/common/Terminal.cpp b/contrib/llvm/tools/lldb/source/Host/common/Terminal.cpp
index 89d21cf0bf6..f63c468bb92 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/Terminal.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/Terminal.cpp
@@ -8,10 +8,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Host/Terminal.h"
-#include "lldb/Host/Config.h"
 
 #include <fcntl.h>
-#include <unistd.h>
 #include <signal.h>
 
 #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
@@ -24,6 +22,7 @@ using namespace lldb_private;
 bool
 Terminal::IsATerminal () const
 {
+
     return m_fd >= 0 && ::isatty (m_fd);
 }
     
@@ -108,7 +107,9 @@ Terminal::SetCanonical (bool enabled)
 TerminalState::TerminalState() :
     m_tty(),
     m_tflags(-1),
+#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
     m_termios_ap(),
+#endif
     m_process_group(-1)
 {
 }
@@ -125,7 +126,9 @@ TerminalState::Clear ()
 {
     m_tty.Clear();
     m_tflags = -1;
+#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
     m_termios_ap.reset();
+#endif
     m_process_group = -1;
 }
 
@@ -140,7 +143,9 @@ TerminalState::Save (int fd, bool save_process_group)
     m_tty.SetFileDescriptor(fd);
     if (m_tty.IsATerminal())
     {
+#ifndef LLDB_DISABLE_POSIX
         m_tflags = ::fcntl (fd, F_GETFL, 0);
+#endif
 #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
         if (m_termios_ap.get() == NULL)
             m_termios_ap.reset (new struct termios);
@@ -148,16 +153,20 @@ TerminalState::Save (int fd, bool save_process_group)
         if (err != 0)
             m_termios_ap.reset();
 #endif // #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
+#ifndef LLDB_DISABLE_POSIX
         if (save_process_group)
             m_process_group = ::tcgetpgrp (0);
         else
             m_process_group = -1;
+#endif
     }
     else
     {
         m_tty.Clear();
         m_tflags = -1;
+#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
         m_termios_ap.reset();
+#endif
         m_process_group = -1;
     }
     return IsValid();
@@ -173,14 +182,17 @@ TerminalState::Restore () const
     if (IsValid())
     {
         const int fd = m_tty.GetFileDescriptor();
+#ifndef LLDB_DISABLE_POSIX
         if (TFlagsIsValid())
             fcntl (fd, F_SETFL, m_tflags);
+#endif
 
 #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
         if (TTYStateIsValid())
             tcsetattr (fd, TCSANOW, m_termios_ap.get());
 #endif // #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
 
+#ifndef LLDB_DISABLE_POSIX
         if (ProcessGroupIsValid())
         {
             // Save the original signal handler.
@@ -191,6 +203,7 @@ TerminalState::Restore () const
             // Restore the original signal handler.
             signal (SIGTTOU, saved_sigttou_callback);
         }
+#endif
         return true;
     }
     return false;
@@ -224,7 +237,11 @@ TerminalState::TFlagsIsValid() const
 bool
 TerminalState::TTYStateIsValid() const
 {
+#ifdef LLDB_CONFIG_TERMIOS_SUPPORTED
     return m_termios_ap.get() != 0;
+#else
+    return false;
+#endif
 }
 
 //----------------------------------------------------------------------
diff --git a/contrib/llvm/tools/lldb/source/Host/common/TimeValue.cpp b/contrib/llvm/tools/lldb/source/Host/common/TimeValue.cpp
index 303ac94058b..b471a3dd1f1 100644
--- a/contrib/llvm/tools/lldb/source/Host/common/TimeValue.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/common/TimeValue.cpp
@@ -8,11 +8,17 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/Host/TimeValue.h"
+#include "lldb/Host/Config.h"
 
 // C Includes
 #include <stddef.h>
 #include <time.h>
 #include <cstring>
+
+#ifdef _MSC_VER
+#include "lldb/Host/windows/windows.h"
+#endif
+
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
@@ -42,8 +48,8 @@ TimeValue::TimeValue(const struct timespec& ts) :
 {
 }
 
-TimeValue::TimeValue(const struct timeval& tv) :
-    m_nano_seconds ((uint64_t) tv.tv_sec * NanoSecPerSec + (uint64_t) tv.tv_usec * NanoSecPerMicroSec)
+TimeValue::TimeValue(uint32_t seconds, uint32_t nanos) :
+    m_nano_seconds((uint64_t) seconds * NanoSecPerSec + nanos)
 {
 }
 
@@ -84,15 +90,6 @@ TimeValue::GetAsTimeSpec () const
     return ts;
 }
 
-struct timeval
-TimeValue::GetAsTimeVal () const
-{
-    struct timeval tv;
-    tv.tv_sec = m_nano_seconds / NanoSecPerSec;
-    tv.tv_usec = (m_nano_seconds % NanoSecPerSec) / NanoSecPerMicroSec;
-    return tv;
-}
-
 void
 TimeValue::Clear ()
 {
@@ -126,9 +123,22 @@ TimeValue::OffsetWithNanoSeconds (uint64_t nsec)
 TimeValue
 TimeValue::Now()
 {
+    uint32_t seconds, nanoseconds;
+#if _MSC_VER
+    SYSTEMTIME st;
+    GetSystemTime(&st);
+    nanoseconds = st.wMilliseconds * 1000000;
+    FILETIME ft;
+    SystemTimeToFileTime(&st, &ft);
+
+    seconds = ((((uint64_t)ft.dwHighDateTime) << 32 | ft.dwLowDateTime) / 10000000) - 11644473600ULL;
+#else
     struct timeval tv;
     gettimeofday(&tv, NULL);
-    TimeValue now(tv);
+    seconds = tv.tv_sec;
+    nanoseconds = tv.tv_usec * NanoSecPerMicroSec;
+#endif
+    TimeValue now(seconds, nanoseconds);
     return now;
 }
 
@@ -148,6 +158,7 @@ TimeValue::Dump (Stream *s, uint32_t width) const
     if (s == NULL)
         return;
 
+#ifndef LLDB_DISABLE_POSIX
     char time_buf[32];
     time_t time = GetAsSecondsSinceJan1_1970();
     char *time_cstr = ::ctime_r(&time, time_buf);
@@ -163,6 +174,7 @@ TimeValue::Dump (Stream *s, uint32_t width) const
     }
     else if (width > 0)
         s->Printf("%-*s", width, "");
+#endif
 }
 
 bool
diff --git a/contrib/llvm/tools/lldb/source/Host/freebsd/Host.cpp b/contrib/llvm/tools/lldb/source/Host/freebsd/Host.cpp
index 405e7eacf5a..c4a6ca37e9c 100644
--- a/contrib/llvm/tools/lldb/source/Host/freebsd/Host.cpp
+++ b/contrib/llvm/tools/lldb/source/Host/freebsd/Host.cpp
@@ -15,25 +15,30 @@
 #include <sys/user.h>
 #include <sys/utsname.h>
 #include <sys/sysctl.h>
+#include <sys/proc.h>
 
 #include <sys/ptrace.h>
 #include <sys/exec.h>
 #include <machine/elf.h>
 
-
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Core/Error.h"
 #include "lldb/Host/Endian.h"
 #include "lldb/Host/Host.h"
+#include "lldb/Core/Module.h"
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/StreamFile.h"
 #include "lldb/Core/StreamString.h"
+#include "lldb/Core/Log.h"
 #include "lldb/Target/Process.h"
+#include "lldb/Target/Platform.h"
 
 #include "lldb/Core/DataBufferHeap.h"
 #include "lldb/Core/DataExtractor.h"
+#include "lldb/Utility/CleanUp.h"
+
 #include "llvm/Support/Host.h"
 
 
@@ -44,7 +49,6 @@ extern "C" {
 using namespace lldb;
 using namespace lldb_private;
 
-
 class FreeBSDThread
 {
 public:
@@ -120,7 +124,8 @@ Host::GetEnvironment (StringList &env)
 {
     char *v;
     char **var = environ;
-    for (; var != NULL && *var != NULL; ++var) {
+    for (; var != NULL && *var != NULL; ++var)
+    {
         v = strchr(*var, (int)'-');
         if (v == NULL)
             continue;
@@ -135,34 +140,30 @@ Host::GetOSVersion(uint32_t &major,
                    uint32_t &update)
 {
     struct utsname un;
-    int status;
 
+    ::memset(&un, 0, sizeof(utsname));
     if (uname(&un) < 0)
         return false;
 
-    status = sscanf(un.release, "%u.%u", &major, &minor);
+    int status = sscanf(un.release, "%u.%u", &major, &minor);
     return status == 2;
 }
 
-Error
-Host::LaunchProcess (ProcessLaunchInfo &launch_info)
-{
-    Error error;
-    assert(!"Not implemented yet!!!");
-    return error;
-}
-
 bool
 Host::GetOSBuildString (std::string &s)
 {
     int mib[2] = { CTL_KERN, KERN_OSREV };
-    char cstr[PATH_MAX];
-    size_t cstr_len = sizeof(cstr);
-    if (::sysctl (mib, 2, cstr, &cstr_len, NULL, 0) == 0)
+    char osrev_str[12];
+    uint32_t osrev = 0;
+    size_t osrev_len = sizeof(osrev);
+
+    if (::sysctl (mib, 2, &osrev, &osrev_len, NULL, 0) == 0)
     {
-        s.assign (cstr, cstr_len);
+        ::snprintf(osrev_str, sizeof(osrev_str), "%-8.8u", osrev);
+        s.assign (osrev_str);
         return true;
     }
+
     s.clear();
     return false;
 }
@@ -170,23 +171,25 @@ Host::GetOSBuildString (std::string &s)
 bool
 Host::GetOSKernelDescription (std::string &s)
 {
-    int mib[2] = { CTL_KERN, KERN_VERSION };
-    char cstr[PATH_MAX];
-    size_t cstr_len = sizeof(cstr);
-    if (::sysctl (mib, 2, cstr, &cstr_len, NULL, 0) == 0)
-    {
-        s.assign (cstr, cstr_len);
-        return true;
-    }
+    struct utsname un;
+
+    ::memset(&un, 0, sizeof(utsname));
     s.clear();
+
+    if (uname(&un) < 0)
     return false;
+
+    s.assign (un.version);
+
+    return true;
 }
 
 static bool
 GetFreeBSDProcessArgs (const ProcessInstanceInfoMatch *match_info_ptr,
                       ProcessInstanceInfo &process_info)
 {
-    if (process_info.ProcessIDIsValid()) {
+    if (process_info.ProcessIDIsValid())
+    {
         int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, (int)process_info.GetProcessID() };
 
         char arg_data[8192];
@@ -235,7 +238,8 @@ GetFreeBSDProcessArgs (const ProcessInstanceInfoMatch *match_info_ptr,
 static bool
 GetFreeBSDProcessCPUType (ProcessInstanceInfo &process_info)
 {
-    if (process_info.ProcessIDIsValid()) {
+    if (process_info.ProcessIDIsValid())
+    {
         process_info.GetArchitecture() = Host::GetArchitecture (Host::eSystemDefaultArchitecture);
         return true;
     }
@@ -279,16 +283,95 @@ GetFreeBSDProcessUserAndGroup(ProcessInstanceInfo &process_info)
     return false;
 }
 
+uint32_t
+Host::FindProcesses (const ProcessInstanceInfoMatch &match_info, ProcessInstanceInfoList &process_infos)
+{
+    std::vector<struct kinfo_proc> kinfos;
+
+    int mib[3] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
+
+    size_t pid_data_size = 0;
+    if (::sysctl (mib, 3, NULL, &pid_data_size, NULL, 0) != 0)
+        return 0;
+
+    // Add a few extra in case a few more show up
+    const size_t estimated_pid_count = (pid_data_size / sizeof(struct kinfo_proc)) + 10;
+
+    kinfos.resize (estimated_pid_count);
+    pid_data_size = kinfos.size() * sizeof(struct kinfo_proc);
+
+    if (::sysctl (mib, 3, &kinfos[0], &pid_data_size, NULL, 0) != 0)
+        return 0;
+
+    const size_t actual_pid_count = (pid_data_size / sizeof(struct kinfo_proc));
+
+    bool all_users = match_info.GetMatchAllUsers();
+    const lldb::pid_t our_pid = getpid();
+    const uid_t our_uid = getuid();
+    for (int i = 0; i < actual_pid_count; i++)
+    {
+        const struct kinfo_proc &kinfo = kinfos[i];
+        const bool kinfo_user_matches = (all_users ||
+                                         (kinfo.ki_ruid == our_uid) ||
+                                         // Special case, if lldb is being run as root we can attach to anything.
+                                         (our_uid == 0)
+                                         );
+
+        if (kinfo_user_matches == false      || // Make sure the user is acceptable
+            kinfo.ki_pid == our_pid          || // Skip this process
+            kinfo.ki_pid == 0                || // Skip kernel (kernel pid is zero)
+            kinfo.ki_stat == SZOMB    || // Zombies are bad, they like brains...
+            kinfo.ki_flag & P_TRACED  || // Being debugged?
+            kinfo.ki_flag & P_WEXIT)     // Working on exiting
+            continue;
+
+        // Every thread is a process in FreeBSD, but all the threads of a single process
+        // have the same pid. Do not store the process info in the result list if a process
+        // with given identifier is already registered there.
+        bool already_registered = false;
+        for (uint32_t pi = 0;
+             !already_registered &&
+             (const int)kinfo.ki_numthreads > 1 &&
+             pi < (const uint32_t)process_infos.GetSize(); pi++)
+            already_registered = (process_infos.GetProcessIDAtIndex(pi) == (uint32_t)kinfo.ki_pid);
+
+        if (already_registered)
+            continue;
+
+        ProcessInstanceInfo process_info;
+        process_info.SetProcessID (kinfo.ki_pid);
+        process_info.SetParentProcessID (kinfo.ki_ppid);
+        process_info.SetUserID (kinfo.ki_ruid);
+        process_info.SetGroupID (kinfo.ki_rgid);
+        process_info.SetEffectiveUserID (kinfo.ki_svuid);
+        process_info.SetEffectiveGroupID (kinfo.ki_svgid);
+
+        // Make sure our info matches before we go fetch the name and cpu type
+        if (match_info.Matches (process_info) &&
+            GetFreeBSDProcessArgs (&match_info, process_info))
+        {
+            GetFreeBSDProcessCPUType (process_info);
+            if (match_info.Matches (process_info))
+                process_infos.Append (process_info);
+        }
+    }
+
+    return process_infos.GetSize();
+}
+
 bool
 Host::GetProcessInfo (lldb::pid_t pid, ProcessInstanceInfo &process_info)
 {
     process_info.SetProcessID(pid);
-    if (GetFreeBSDProcessArgs(NULL, process_info)) {
+
+    if (GetFreeBSDProcessArgs(NULL, process_info))
+    {
         // should use libprocstat instead of going right into sysctl?
         GetFreeBSDProcessCPUType(process_info);
         GetFreeBSDProcessUserAndGroup(process_info);
         return true;
     }
+
     process_info.Clear();
     return false;
 }
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/Args.cpp b/contrib/llvm/tools/lldb/source/Interpreter/Args.cpp
index e6d20435803..b6f34fd1f7f 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/Args.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/Args.cpp
@@ -10,7 +10,6 @@
 #include "lldb/lldb-python.h"
 
 // C Includes
-#include <getopt.h>
 #include <cstdlib>
 // C++ Includes
 // Other libraries and framework includes
@@ -621,7 +620,7 @@ Args::ParseOptions (Options &options)
 {
     StreamString sstr;
     Error error;
-    struct option *long_options = options.GetLongOptions();
+    Option *long_options = options.GetLongOptions();
     if (long_options == NULL)
     {
         error.SetErrorStringWithFormat("invalid long options");
@@ -638,24 +637,19 @@ Args::ParseOptions (Options &options)
                 switch (long_options[i].has_arg)
                 {
                 default:
-                case no_argument:                       break;
-                case required_argument: sstr << ':';    break;
-                case optional_argument: sstr << "::";   break;
+                case OptionParser::eNoArgument:                       break;
+                case OptionParser::eRequiredArgument: sstr << ':';    break;
+                case OptionParser::eOptionalArgument: sstr << "::";   break;
                 }
             }
         }
     }
-#ifdef __GLIBC__
-    optind = 0;
-#else
-    optreset = 1;
-    optind = 1;
-#endif
+    OptionParser::Prepare();
     int val;
     while (1)
     {
         int long_options_index = -1;
-        val = ::getopt_long_only(GetArgumentCount(),
+        val = OptionParser::Parse(GetArgumentCount(),
                                  GetArgumentVector(),
                                  sstr.GetData(),
                                  long_options,
@@ -693,7 +687,7 @@ Args::ParseOptions (Options &options)
         if (long_options_index >= 0)
         {
             error = options.SetOptionValue(long_options_index,
-                                           long_options[long_options_index].has_arg == no_argument ? NULL : optarg);
+                                           long_options[long_options_index].has_arg == OptionParser::eNoArgument ? NULL : OptionParser::GetOptionArgument());
         }
         else
         {
@@ -704,7 +698,7 @@ Args::ParseOptions (Options &options)
     }
 
     // Update our ARGV now that get options has consumed all the options
-    m_argv.erase(m_argv.begin(), m_argv.begin() + optind);
+    m_argv.erase(m_argv.begin(), m_argv.begin() + OptionParser::GetOptionIndex());
     UpdateArgsAfterOptionParsing ();
     return error;
 }
@@ -821,7 +815,7 @@ Args::StringToAddress (const ExecutionContext *exe_ctx, const char *s, lldb::add
                 options.SetCoerceToId(false);
                 options.SetUnwindOnError(true);
                 options.SetKeepInMemory(false);
-                options.SetRunOthers(true);
+                options.SetTryAllThreads(true);
                 
                 ExecutionResults expr_result = target->EvaluateExpression(s,
                                                                           exe_ctx->GetFramePtr(),
@@ -1223,7 +1217,7 @@ Args::LongestCommonPrefix (std::string &common_prefix)
 }
 
 size_t
-Args::FindArgumentIndexForOption (struct option *long_options, int long_options_index)
+Args::FindArgumentIndexForOption (Option *long_options, int long_options_index)
 {
     char short_buffer[3];
     char long_buffer[255];
@@ -1275,7 +1269,7 @@ Args::ParseAliasOptions (Options &options,
 {
     StreamString sstr;
     int i;
-    struct option *long_options = options.GetLongOptions();
+    Option *long_options = options.GetLongOptions();
 
     if (long_options == NULL)
     {
@@ -1292,29 +1286,24 @@ Args::ParseAliasOptions (Options &options,
             switch (long_options[i].has_arg)
             {
                 default:
-                case no_argument:
+                case OptionParser::eNoArgument:
                     break;
-                case required_argument:
+                case OptionParser::eRequiredArgument:
                     sstr << ":";
                     break;
-                case optional_argument:
+                case OptionParser::eOptionalArgument:
                     sstr << "::";
                     break;
             }
         }
     }
 
-#ifdef __GLIBC__
-    optind = 0;
-#else
-    optreset = 1;
-    optind = 1;
-#endif
+    OptionParser::Prepare();
     int val;
     while (1)
     {
         int long_options_index = -1;
-        val = ::getopt_long_only (GetArgumentCount(),
+        val = OptionParser::Parse (GetArgumentCount(),
                                   GetArgumentVector(),
                                   sstr.GetData(),
                                   long_options,
@@ -1358,17 +1347,17 @@ Args::ParseAliasOptions (Options &options,
 
             switch (long_options[long_options_index].has_arg)
             {
-            case no_argument:
+            case OptionParser::eNoArgument:
                 option_arg_vector->push_back (OptionArgPair (std::string (option_str.GetData()), 
-                                                             OptionArgValue (no_argument, "<no-argument>")));
+                                                             OptionArgValue (OptionParser::eNoArgument, "<no-argument>")));
                 result.SetStatus (eReturnStatusSuccessFinishNoResult);
                 break;
-            case required_argument:
-                if (optarg != NULL)
+            case OptionParser::eRequiredArgument:
+                if (OptionParser::GetOptionArgument() != NULL)
                 {
                     option_arg_vector->push_back (OptionArgPair (std::string (option_str.GetData()),
-                                                                 OptionArgValue (required_argument, 
-                                                                                 std::string (optarg))));
+                                                                 OptionArgValue (OptionParser::eRequiredArgument,
+                                                                                 std::string (OptionParser::GetOptionArgument()))));
                     result.SetStatus (eReturnStatusSuccessFinishNoResult);
                 }
                 else
@@ -1378,18 +1367,18 @@ Args::ParseAliasOptions (Options &options,
                     result.SetStatus (eReturnStatusFailed);
                 }
                 break;
-            case optional_argument:
-                if (optarg != NULL)
+            case OptionParser::eOptionalArgument:
+                if (OptionParser::GetOptionArgument() != NULL)
                 {
                     option_arg_vector->push_back (OptionArgPair (std::string (option_str.GetData()),
-                                                                 OptionArgValue (optional_argument, 
-                                                                                 std::string (optarg))));
+                                                                 OptionArgValue (OptionParser::eOptionalArgument,
+                                                                                 std::string (OptionParser::GetOptionArgument()))));
                     result.SetStatus (eReturnStatusSuccessFinishNoResult);
                 }
                 else
                 {
                     option_arg_vector->push_back (OptionArgPair (std::string (option_str.GetData()),
-                                                                 OptionArgValue (optional_argument, "<no-argument>")));
+                                                                 OptionArgValue (OptionParser::eOptionalArgument, "<no-argument>")));
                     result.SetStatus (eReturnStatusSuccessFinishNoResult);
                 }
                 break;
@@ -1421,10 +1410,10 @@ Args::ParseAliasOptions (Options &options,
                         raw_input_string.erase (pos, strlen (tmp_arg));
                 }
                 ReplaceArgumentAtIndex (idx, "");
-                if ((long_options[long_options_index].has_arg != no_argument)
-                    && (optarg != NULL)
+                if ((long_options[long_options_index].has_arg != OptionParser::eNoArgument)
+                    && (OptionParser::GetOptionArgument() != NULL)
                     && (idx+1 < GetArgumentCount())
-                    && (strcmp (optarg, GetArgumentAtIndex(idx+1)) == 0))
+                    && (strcmp (OptionParser::GetOptionArgument(), GetArgumentAtIndex(idx+1)) == 0))
                 {
                     if (raw_input_string.size() > 0)
                     {
@@ -1452,7 +1441,7 @@ Args::ParseArgsForCompletion
 )
 {
     StreamString sstr;
-    struct option *long_options = options.GetLongOptions();
+    Option *long_options = options.GetLongOptions();
     option_element_vector.clear();
 
     if (long_options == NULL)
@@ -1472,31 +1461,26 @@ Args::ParseArgsForCompletion
             switch (long_options[i].has_arg)
             {
                 default:
-                case no_argument:
+                case OptionParser::eNoArgument:
                     break;
-                case required_argument:
+                case OptionParser::eRequiredArgument:
                     sstr << ":";
                     break;
-                case optional_argument:
+                case OptionParser::eOptionalArgument:
                     sstr << "::";
                     break;
             }
         }
     }
 
-#ifdef __GLIBC__
-    optind = 0;
-#else
-    optreset = 1;
-    optind = 1;
-#endif
-    opterr = 0;
+    OptionParser::Prepare();
+    OptionParser::EnableError(false);
 
     int val;
     const OptionDefinition *opt_defs = options.GetDefinitions();
 
-    // Fooey... getopt_long_only permutes the GetArgumentVector to move the options to the front.
-    // So we have to build another Arg and pass that to getopt_long_only so it doesn't
+    // Fooey... OptionParser::Parse permutes the GetArgumentVector to move the options to the front.
+    // So we have to build another Arg and pass that to OptionParser::Parse so it doesn't
     // change the one we have.
 
     std::vector<const char *> dummy_vec (GetArgumentVector(), GetArgumentVector() + GetArgumentCount() + 1);
@@ -1509,7 +1493,7 @@ Args::ParseArgsForCompletion
         bool missing_argument = false;
         int long_options_index = -1;
         
-        val = ::getopt_long_only (dummy_vec.size() - 1,
+        val = OptionParser::Parse (dummy_vec.size() - 1,
                                   (char *const *) &dummy_vec.front(),
                                   sstr.GetData(),
                                   long_options,
@@ -1527,18 +1511,18 @@ Args::ParseArgsForCompletion
             // Handling the "--" is a little tricky, since that may mean end of options or arguments, or the
             // user might want to complete options by long name.  I make this work by checking whether the
             // cursor is in the "--" argument, and if so I assume we're completing the long option, otherwise
-            // I let it pass to getopt_long_only which will terminate the option parsing.
+            // I let it pass to OptionParser::Parse which will terminate the option parsing.
             // Note, in either case we continue parsing the line so we can figure out what other options
             // were passed.  This will be useful when we come to restricting completions based on what other
             // options we've seen on the line.
 
-            if (optind < dummy_vec.size() - 1 
-                && (strcmp (dummy_vec[optind-1], "--") == 0))
+            if (OptionParser::GetOptionIndex() < dummy_vec.size() - 1
+                && (strcmp (dummy_vec[OptionParser::GetOptionIndex()-1], "--") == 0))
             {
-                dash_dash_pos = optind - 1;
-                if (optind - 1 == cursor_index)
+                dash_dash_pos = OptionParser::GetOptionIndex() - 1;
+                if (OptionParser::GetOptionIndex() - 1 == cursor_index)
                 {
-                    option_element_vector.push_back (OptionArgElement (OptionArgElement::eBareDoubleDash, optind - 1, 
+                    option_element_vector.push_back (OptionArgElement (OptionArgElement::eBareDoubleDash, OptionParser::GetOptionIndex() - 1,
                                                                    OptionArgElement::eBareDoubleDash));
                     continue;
                 }
@@ -1550,7 +1534,7 @@ Args::ParseArgsForCompletion
         }
         else if (val == '?')
         {
-            option_element_vector.push_back (OptionArgElement (OptionArgElement::eUnrecognizedArg, optind - 1, 
+            option_element_vector.push_back (OptionArgElement (OptionArgElement::eUnrecognizedArg, OptionParser::GetOptionIndex() - 1,
                                                                OptionArgElement::eUnrecognizedArg));
             continue;
         }
@@ -1561,7 +1545,7 @@ Args::ParseArgsForCompletion
         else if (val == ':')
         {
             // This is a missing argument.
-            val = optopt;
+            val = OptionParser::GetOptionErrorCause();
             missing_argument = true;
         }
 
@@ -1599,51 +1583,51 @@ Args::ParseArgsForCompletion
 
             switch (long_options[long_options_index].has_arg)
             {
-            case no_argument:
-                option_element_vector.push_back (OptionArgElement (opt_defs_index, optind - 1, 0));
+            case OptionParser::eNoArgument:
+                option_element_vector.push_back (OptionArgElement (opt_defs_index, OptionParser::GetOptionIndex() - 1, 0));
                 break;
-            case required_argument:
-                if (optarg != NULL)
+            case OptionParser::eRequiredArgument:
+                if (OptionParser::GetOptionArgument() != NULL)
                 {
                     int arg_index;
                     if (missing_argument)
                         arg_index = -1;
                     else
-                        arg_index = optind - 1;
+                        arg_index = OptionParser::GetOptionIndex() - 1;
 
-                    option_element_vector.push_back (OptionArgElement (opt_defs_index, optind - 2, arg_index));
+                    option_element_vector.push_back (OptionArgElement (opt_defs_index, OptionParser::GetOptionIndex() - 2, arg_index));
                 }
                 else
                 {
-                    option_element_vector.push_back (OptionArgElement (opt_defs_index, optind - 1, -1));
+                    option_element_vector.push_back (OptionArgElement (opt_defs_index, OptionParser::GetOptionIndex() - 1, -1));
                 }
                 break;
-            case optional_argument:
-                if (optarg != NULL)
+            case OptionParser::eOptionalArgument:
+                if (OptionParser::GetOptionArgument() != NULL)
                 {
-                    option_element_vector.push_back (OptionArgElement (opt_defs_index, optind - 2, optind - 1));
+                    option_element_vector.push_back (OptionArgElement (opt_defs_index, OptionParser::GetOptionIndex() - 2, OptionParser::GetOptionIndex() - 1));
                 }
                 else
                 {
-                    option_element_vector.push_back (OptionArgElement (opt_defs_index, optind - 2, optind - 1));
+                    option_element_vector.push_back (OptionArgElement (opt_defs_index, OptionParser::GetOptionIndex() - 2, OptionParser::GetOptionIndex() - 1));
                 }
                 break;
             default:
                 // The options table is messed up.  Here we'll just continue
-                option_element_vector.push_back (OptionArgElement (OptionArgElement::eUnrecognizedArg, optind - 1, 
+                option_element_vector.push_back (OptionArgElement (OptionArgElement::eUnrecognizedArg, OptionParser::GetOptionIndex() - 1,
                                                                    OptionArgElement::eUnrecognizedArg));
                 break;
             }
         }
         else
         {
-            option_element_vector.push_back (OptionArgElement (OptionArgElement::eUnrecognizedArg, optind - 1, 
+            option_element_vector.push_back (OptionArgElement (OptionArgElement::eUnrecognizedArg, OptionParser::GetOptionIndex() - 1,
                                                                OptionArgElement::eUnrecognizedArg));
         }
     }
     
     // Finally we have to handle the case where the cursor index points at a single "-".  We want to mark that in
-    // the option_element_vector, but only if it is not after the "--".  But it turns out that getopt_long_only just ignores
+    // the option_element_vector, but only if it is not after the "--".  But it turns out that OptionParser::Parse just ignores
     // an isolated "-".  So we have to look it up by hand here.  We only care if it is AT the cursor position.
     
     if ((dash_dash_pos == -1 || cursor_index < dash_dash_pos)
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/CommandInterpreter.cpp b/contrib/llvm/tools/lldb/source/Interpreter/CommandInterpreter.cpp
index db2f2fafbef..a7c892d255e 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/CommandInterpreter.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/CommandInterpreter.cpp
@@ -11,8 +11,6 @@
 
 #include <string>
 #include <vector>
-
-#include <getopt.h>
 #include <stdlib.h>
 
 #include "CommandObjectScript.h"
@@ -230,6 +228,13 @@ CommandInterpreter::Initialize ()
         AddAlias ("t", cmd_obj_sp);
     }
 
+    cmd_obj_sp = GetCommandSPExact ("_regexp-jump",false);
+    if (cmd_obj_sp)
+    {
+        AddAlias ("j", cmd_obj_sp);
+        AddAlias ("jump", cmd_obj_sp);
+    }
+
     cmd_obj_sp = GetCommandSPExact ("_regexp-list", false);
     if (cmd_obj_sp)
     {
@@ -318,7 +323,7 @@ CommandInterpreter::Initialize ()
 #if defined (__arm__)
         ProcessAliasOptionsArgs (cmd_obj_sp, "--", alias_arguments_vector_sp);
 #else
-        ProcessAliasOptionsArgs (cmd_obj_sp, "--shell=/bin/bash --", alias_arguments_vector_sp);
+        ProcessAliasOptionsArgs (cmd_obj_sp, "--shell=" LLDB_DEFAULT_SHELL " --", alias_arguments_vector_sp);
 #endif
         AddAlias ("r", cmd_obj_sp);
         AddAlias ("run", cmd_obj_sp);
@@ -587,7 +592,7 @@ CommandInterpreter::LoadCommandDictionary ()
     list_regex_cmd_ap(new CommandObjectRegexCommand (*this,
                                                      "_regexp-list",
                                                      "Implements the GDB 'list' command in all of its forms except FILE:FUNCTION and maps them to the appropriate 'source list' commands.",
-                                                     "_regexp-list [<line>]\n_regexp-attach [<file>:<line>]\n_regexp-attach [<file>:<line>]",
+                                                     "_regexp-list [<line>]\n_regexp-list [<file>:<line>]\n_regexp-list [<file>:<line>]",
                                                      2,
                                                      CommandCompletions::eSourceFileCompletion));
     if (list_regex_cmd_ap.get())
@@ -620,6 +625,26 @@ CommandInterpreter::LoadCommandDictionary ()
         }
     }
 
+    std::unique_ptr<CommandObjectRegexCommand>
+    jump_regex_cmd_ap(new CommandObjectRegexCommand (*this,
+                                                    "_regexp-jump",
+                                                    "Sets the program counter to a new address.",
+                                                    "_regexp-jump [<line>]\n"
+                                                    "_regexp-jump [<+-lineoffset>]\n"
+                                                    "_regexp-jump [<file>:<line>]\n"
+                                                    "_regexp-jump [*<addr>]\n", 2));
+    if (jump_regex_cmd_ap.get())
+    {
+        if (jump_regex_cmd_ap->AddRegexCommand("^\\*(.*)$", "thread jump --addr %1") &&
+            jump_regex_cmd_ap->AddRegexCommand("^([0-9]+)$", "thread jump --line %1") &&
+            jump_regex_cmd_ap->AddRegexCommand("^([^:]+):([0-9]+)$", "thread jump --file %1 --line %2") &&
+            jump_regex_cmd_ap->AddRegexCommand("^([+\\-][0-9]+)$", "thread jump --by %1"))
+        {
+            CommandObjectSP jump_regex_cmd_sp(jump_regex_cmd_ap.release());
+            m_command_dict[jump_regex_cmd_sp->GetCommandName ()] = jump_regex_cmd_sp;
+        }
+    }
+
 }
 
 int
@@ -1326,9 +1351,9 @@ CommandInterpreter::BuildAliasResult (const char *alias_name,
                 else
                 {
                     result_str.Printf (" %s", option.c_str());
-                    if (value_type != optional_argument)
+                    if (value_type != OptionParser::eOptionalArgument)
                         result_str.Printf (" ");
-                    if (value.compare ("<no_argument>") != 0)
+                    if (value.compare ("<OptionParser::eNoArgument>") != 0)
                     {
                         int index = GetOptionArgumentPosition (value.c_str());
                         if (index == 0)
@@ -1409,12 +1434,12 @@ CommandInterpreter::PreprocessCommand (std::string &command)
                     ValueObjectSP expr_result_valobj_sp;
                     
                     EvaluateExpressionOptions options;
-                    options.SetCoerceToId(false)
-                    .SetUnwindOnError(true)
-                    .SetIgnoreBreakpoints(true)
-                    .SetKeepInMemory(false)
-                    .SetRunOthers(true)
-                    .SetTimeoutUsec(0);
+                    options.SetCoerceToId(false);
+                    options.SetUnwindOnError(true);
+                    options.SetIgnoreBreakpoints(true);
+                    options.SetKeepInMemory(false);
+                    options.SetTryAllThreads(true);
+                    options.SetTimeoutUsec(0);
                     
                     ExecutionResults expr_result = target->EvaluateExpression (expr_str.c_str(), 
                                                                                exe_ctx.GetFramePtr(),
@@ -1473,6 +1498,9 @@ CommandInterpreter::PreprocessCommand (std::string &command)
                                 case eExecutionTimedOut:
                                     error.SetErrorStringWithFormat("expression timed out for the expression '%s'", expr_str.c_str());
                                     break;
+                                case eExecutionStoppedForDebug:
+                                    error.SetErrorStringWithFormat("expression stop at entry point for debugging for the expression '%s'", expr_str.c_str());
+                                    break;
                             }
                         }
                     }
@@ -2295,7 +2323,7 @@ CommandInterpreter::BuildAliasCommandArgs (CommandObject *alias_cmd_obj,
             }
             else
             {
-                if (value_type != optional_argument)
+                if (value_type != OptionParser::eOptionalArgument)
                     new_args.AppendArgument (option.c_str());
                 if (value.compare ("<no-argument>") != 0)
                 {
@@ -2303,7 +2331,7 @@ CommandInterpreter::BuildAliasCommandArgs (CommandObject *alias_cmd_obj,
                     if (index == 0)
                     {
                         // value was NOT a positional argument; must be a real value
-                        if (value_type != optional_argument)
+                        if (value_type != OptionParser::eOptionalArgument)
                             new_args.AppendArgument (value.c_str());
                         else
                         {
@@ -2330,7 +2358,7 @@ CommandInterpreter::BuildAliasCommandArgs (CommandObject *alias_cmd_obj,
                             raw_input_string = raw_input_string.erase (strpos, strlen (cmd_args.GetArgumentAtIndex (index)));
                         }
 
-                        if (value_type != optional_argument)
+                        if (value_type != OptionParser::eOptionalArgument)
                             new_args.AppendArgument (cmd_args.GetArgumentAtIndex (index));
                         else
                         {
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/CommandObject.cpp b/contrib/llvm/tools/lldb/source/Interpreter/CommandObject.cpp
index 291dc401357..c71ca28b033 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/CommandObject.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/CommandObject.cpp
@@ -14,7 +14,6 @@
 #include <string>
 #include <map>
 
-#include <getopt.h>
 #include <stdlib.h>
 #include <ctype.h>
 
@@ -1099,6 +1098,7 @@ CommandObject::g_arguments_data[] =
     { eArgTypeCount, "count", CommandCompletions::eNoCompletion, { NULL, false }, "An unsigned integer." },
     { eArgTypeDirectoryName, "directory", CommandCompletions::eDiskDirectoryCompletion, { NULL, false }, "A directory name." },
     { eArgTypeDisassemblyFlavor, "disassembly-flavor", CommandCompletions::eNoCompletion, { NULL, false }, "A disassembly flavor recognized by your disassembly plugin.  Currently the only valid options are \"att\" and \"intel\" for Intel targets" },
+    { eArgTypeDescriptionVerbosity, "description-verbosity", CommandCompletions::eNoCompletion, { NULL, false }, "How verbose the output of 'po' should be." },
     { eArgTypeEndAddress, "end-address", CommandCompletions::eNoCompletion, { NULL, false }, "Help text goes here." },
     { eArgTypeExpression, "expr", CommandCompletions::eNoCompletion, { NULL, false }, "Help text goes here." },
     { eArgTypeExpressionPath, "expr-path", CommandCompletions::eNoCompletion, { ExprPathHelpTextCallback, true }, NULL },
@@ -1123,6 +1123,9 @@ CommandObject::g_arguments_data[] =
     { eArgTypeOffset, "offset", CommandCompletions::eNoCompletion, { NULL, false }, "Help text goes here." },
     { eArgTypeOldPathPrefix, "old-path-prefix", CommandCompletions::eNoCompletion, { NULL, false }, "Help text goes here." },
     { eArgTypeOneLiner, "one-line-command", CommandCompletions::eNoCompletion, { NULL, false }, "A command that is entered as a single line of text." },
+    { eArgTypePath, "path", CommandCompletions::eDiskFileCompletion, { NULL, false }, "Path." },
+    { eArgTypePermissionsNumber, "perms-numeric", CommandCompletions::eNoCompletion, { NULL, false }, "Permissions given as an octal number (e.g. 755)." },
+    { eArgTypePermissionsString, "perms=string", CommandCompletions::eNoCompletion, { NULL, false }, "Permissions given as a string value (e.g. rw-r-xr--)." },
     { eArgTypePid, "pid", CommandCompletions::eNoCompletion, { NULL, false }, "The process ID number." },
     { eArgTypePlugin, "plugin", CommandCompletions::eNoCompletion, { NULL, false }, "Help text goes here." },
     { eArgTypeProcessName, "process-name", CommandCompletions::eNoCompletion, { NULL, false }, "The name of the process." },
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupArchitecture.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupArchitecture.cpp
index af103bb0bd9..d8f35675fba 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupArchitecture.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupArchitecture.cpp
@@ -30,7 +30,7 @@ OptionGroupArchitecture::~OptionGroupArchitecture ()
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1 , false, "arch"    , 'a', required_argument, NULL, 0, eArgTypeArchitecture , "Specify the architecture for the target."},
+    { LLDB_OPT_SET_1 , false, "arch"    , 'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeArchitecture , "Specify the architecture for the target."},
 };
 
 uint32_t
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupBoolean.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupBoolean.cpp
index 5b5b38478b0..feb135315e1 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupBoolean.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupBoolean.cpp
@@ -30,7 +30,7 @@ OptionGroupBoolean::OptionGroupBoolean (uint32_t usage_mask,
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
-    m_option_definition.option_has_arg = no_argument_toggle_default ? no_argument : required_argument;
+    m_option_definition.option_has_arg = no_argument_toggle_default ? OptionParser::eNoArgument : OptionParser::eRequiredArgument;
     m_option_definition.enum_values = NULL;
     m_option_definition.completion_type = 0;
     m_option_definition.argument_type = eArgTypeBoolean;
@@ -47,7 +47,7 @@ OptionGroupBoolean::SetOptionValue (CommandInterpreter &interpreter,
                                     const char *option_arg)
 {
     Error error;
-    if (m_option_definition.option_has_arg == no_argument)
+    if (m_option_definition.option_has_arg == OptionParser::eNoArgument)
     {
         // Not argument, toggle the default value and mark the option as having been set
         m_value.SetCurrentValue (!m_value.GetDefaultValue());
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp
index 6867395789c..48469a80417 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFile.cpp
@@ -30,7 +30,7 @@ OptionGroupFile::OptionGroupFile (uint32_t usage_mask,
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
-    m_option_definition.option_has_arg = required_argument;
+    m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
     m_option_definition.enum_values = NULL;
     m_option_definition.completion_type = completion_type;
     m_option_definition.argument_type = argument_type;
@@ -70,7 +70,7 @@ OptionGroupFileList::OptionGroupFileList (uint32_t usage_mask,
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
-    m_option_definition.option_has_arg = required_argument;
+    m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
     m_option_definition.enum_values = NULL;
     m_option_definition.completion_type = completion_type;
     m_option_definition.argument_type = argument_type;
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFormat.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFormat.cpp
index 790cbb668fa..5cae3788f3b 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFormat.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupFormat.cpp
@@ -42,10 +42,10 @@ OptionGroupFormat::~OptionGroupFormat ()
 static OptionDefinition 
 g_option_table[] =
 {
-{ LLDB_OPT_SET_1, false, "format"    ,'f', required_argument, NULL, 0, eArgTypeFormat   , "Specify a format to be used for display."},
-{ LLDB_OPT_SET_2, false, "gdb-format",'G', required_argument, NULL, 0, eArgTypeGDBFormat, "Specify a format using a GDB format specifier string."},
-{ LLDB_OPT_SET_3, false, "size"      ,'s', required_argument, NULL, 0, eArgTypeByteSize , "The size in bytes to use when displaying with the selected format."},
-{ LLDB_OPT_SET_4, false, "count"     ,'c', required_argument, NULL, 0, eArgTypeCount    , "The number of total items to display."},
+{ LLDB_OPT_SET_1, false, "format"    ,'f', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFormat   , "Specify a format to be used for display."},
+{ LLDB_OPT_SET_2, false, "gdb-format",'G', OptionParser::eRequiredArgument, NULL, 0, eArgTypeGDBFormat, "Specify a format using a GDB format specifier string."},
+{ LLDB_OPT_SET_3, false, "size"      ,'s', OptionParser::eRequiredArgument, NULL, 0, eArgTypeByteSize , "The size in bytes to use when displaying with the selected format."},
+{ LLDB_OPT_SET_4, false, "count"     ,'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCount    , "The number of total items to display."},
 };
 
 uint32_t
@@ -158,7 +158,9 @@ OptionGroupFormat::SetOptionValue (CommandInterpreter &interpreter,
                 else
                 {
                     // Byte size is disabled, make sure it wasn't specified
-                    if (byte_size > 0)
+                    // but if this is an address, it's actually necessary to
+                    // specify one so don't error out
+                    if (byte_size > 0 && format != lldb::eFormatAddressInfo)
                     {
                         error.SetErrorString ("this command doesn't support specifying a byte size");
                         return error;
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupOutputFile.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupOutputFile.cpp
index aa01bf54964..3bb8ab3b29c 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupOutputFile.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupOutputFile.cpp
@@ -31,8 +31,8 @@ OptionGroupOutputFile::~OptionGroupOutputFile ()
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1 , false, "outfile", 'o', required_argument, NULL, 0, eArgTypeFilename , "Specify a path for capturing command output."},
-    { LLDB_OPT_SET_1 , false, "append-outfile" , 'apnd', no_argument, NULL, 0, eArgTypeNone , "Append to the the file specified with '--outfile <path>'."},
+    { LLDB_OPT_SET_1 , false, "outfile", 'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFilename , "Specify a path for capturing command output."},
+    { LLDB_OPT_SET_1 , false, "append-outfile" , 'apnd', OptionParser::eNoArgument, NULL, 0, eArgTypeNone , "Append to the the file specified with '--outfile <path>'."},
 };
 
 uint32_t
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupPlatform.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupPlatform.cpp
index a54edafd019..83e28bdd02c 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupPlatform.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupPlatform.cpp
@@ -85,10 +85,10 @@ OptionGroupPlatform::OptionParsingStarting (CommandInterpreter &interpreter)
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_ALL, false, "platform", 'p', required_argument, NULL, 0, eArgTypePlatform, "Specify name of the platform to use for this target, creating the platform if necessary."},
-    { LLDB_OPT_SET_ALL, false, "version" , 'v', required_argument, NULL, 0, eArgTypeNone, "Specify the initial SDK version to use prior to connecting." },
-    { LLDB_OPT_SET_ALL, false, "build"   , 'b', required_argument, NULL, 0, eArgTypeNone, "Specify the initial SDK build number." },
-    { LLDB_OPT_SET_ALL, false, "sysroot" , 'S', required_argument, NULL, 0, eArgTypeFilename, "Specify the SDK root directory that contains a root of all remote system files." }
+    { LLDB_OPT_SET_ALL, false, "platform", 'p', OptionParser::eRequiredArgument, NULL, 0, eArgTypePlatform, "Specify name of the platform to use for this target, creating the platform if necessary."},
+    { LLDB_OPT_SET_ALL, false, "version" , 'v', OptionParser::eRequiredArgument, NULL, 0, eArgTypeNone, "Specify the initial SDK version to use prior to connecting." },
+    { LLDB_OPT_SET_ALL, false, "build"   , 'b', OptionParser::eRequiredArgument, NULL, 0, eArgTypeNone, "Specify the initial SDK build number." },
+    { LLDB_OPT_SET_ALL, false, "sysroot" , 'S', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFilename, "Specify the SDK root directory that contains a root of all remote system files." }
 };
 
 const OptionDefinition*
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupString.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupString.cpp
index ee9623967c6..37a70d0bb24 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupString.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupString.cpp
@@ -31,7 +31,7 @@ OptionGroupString::OptionGroupString (uint32_t usage_mask,
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
-    m_option_definition.option_has_arg = required_argument;
+    m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
     m_option_definition.enum_values = NULL;
     m_option_definition.completion_type = completion_type;
     m_option_definition.argument_type = argument_type;
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUInt64.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUInt64.cpp
index e6996f70255..b66c8457923 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUInt64.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUInt64.cpp
@@ -31,7 +31,7 @@ OptionGroupUInt64::OptionGroupUInt64 (uint32_t usage_mask,
     m_option_definition.required = required;
     m_option_definition.long_option = long_option;
     m_option_definition.short_option = short_option;
-    m_option_definition.option_has_arg = required_argument;
+    m_option_definition.option_has_arg = OptionParser::eRequiredArgument;
     m_option_definition.enum_values = NULL;
     m_option_definition.completion_type = completion_type;
     m_option_definition.argument_type = argument_type;
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUUID.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUUID.cpp
index 14bdc8494e4..fb3ebcf7745 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUUID.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupUUID.cpp
@@ -30,7 +30,7 @@ OptionGroupUUID::~OptionGroupUUID ()
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1 , false, "uuid", 'u', required_argument, NULL, 0, eArgTypeNone, "A module UUID value."},
+    { LLDB_OPT_SET_1 , false, "uuid", 'u', OptionParser::eRequiredArgument, NULL, 0, eArgTypeNone, "A module UUID value."},
 };
 
 uint32_t
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
index 22a7f37740d..c79f49dc1d9 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupValueObjectDisplay.cpp
@@ -15,6 +15,7 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
+#include "lldb/DataFormatters/ValueObjectPrinter.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Interpreter/CommandInterpreter.h"
 #include "lldb/Utility/Utils.h"
@@ -33,17 +34,17 @@ OptionGroupValueObjectDisplay::~OptionGroupValueObjectDisplay ()
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "dynamic-type",       'd', required_argument, g_dynamic_value_types, 0, eArgTypeNone,      "Show the object as its full dynamic type, not its static type, if available."},
-    { LLDB_OPT_SET_1, false, "synthetic-type",     'S', required_argument, NULL, 0, eArgTypeBoolean,   "Show the object obeying its synthetic provider, if available."},
-    { LLDB_OPT_SET_1, false, "depth",              'D', required_argument, NULL, 0, eArgTypeCount,     "Set the max recurse depth when dumping aggregate types (default is infinity)."},
-    { LLDB_OPT_SET_1, false, "flat",               'F', no_argument,       NULL, 0, eArgTypeNone,      "Display results in a flat format that uses expression paths for each variable or member."},
-    { LLDB_OPT_SET_1, false, "location",           'L', no_argument,       NULL, 0, eArgTypeNone,      "Show variable location information."},
-    { LLDB_OPT_SET_1, false, "object-description", 'O', no_argument,       NULL, 0, eArgTypeNone,      "Print as an Objective-C object."},
-    { LLDB_OPT_SET_1, false, "ptr-depth",          'P', required_argument, NULL, 0, eArgTypeCount,     "The number of pointers to be traversed when dumping values (default is zero)."},
-    { LLDB_OPT_SET_1, false, "show-types",         'T', no_argument,       NULL, 0, eArgTypeNone,      "Show variable types when dumping values."},
-    { LLDB_OPT_SET_1, false, "no-summary-depth",   'Y', optional_argument, NULL, 0, eArgTypeCount,     "Set the depth at which omitting summary information stops (default is 1)."},
-    { LLDB_OPT_SET_1, false, "raw-output",         'R', no_argument,       NULL, 0, eArgTypeNone,      "Don't use formatting options."},
-    { LLDB_OPT_SET_1, false, "show-all-children",  'A', no_argument,       NULL, 0, eArgTypeNone,      "Ignore the upper bound on the number of children to show."},
+    { LLDB_OPT_SET_1, false, "dynamic-type",       'd', OptionParser::eRequiredArgument, g_dynamic_value_types, 0, eArgTypeNone,      "Show the object as its full dynamic type, not its static type, if available."},
+    { LLDB_OPT_SET_1, false, "synthetic-type",     'S', OptionParser::eRequiredArgument, NULL, 0, eArgTypeBoolean,   "Show the object obeying its synthetic provider, if available."},
+    { LLDB_OPT_SET_1, false, "depth",              'D', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCount,     "Set the max recurse depth when dumping aggregate types (default is infinity)."},
+    { LLDB_OPT_SET_1, false, "flat",               'F', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,      "Display results in a flat format that uses expression paths for each variable or member."},
+    { LLDB_OPT_SET_1, false, "location",           'L', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,      "Show variable location information."},
+    { LLDB_OPT_SET_1, false, "object-description", 'O', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,      "Print as an Objective-C object."},
+    { LLDB_OPT_SET_1, false, "ptr-depth",          'P', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCount,     "The number of pointers to be traversed when dumping values (default is zero)."},
+    { LLDB_OPT_SET_1, false, "show-types",         'T', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,      "Show variable types when dumping values."},
+    { LLDB_OPT_SET_1, false, "no-summary-depth",   'Y', OptionParser::eOptionalArgument, NULL, 0, eArgTypeCount,     "Set the depth at which omitting summary information stops (default is 1)."},
+    { LLDB_OPT_SET_1, false, "raw-output",         'R', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,      "Don't use formatting options."},
+    { LLDB_OPT_SET_1, false, "show-all-children",  'A', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,      "Ignore the upper bound on the number of children to show."},
     { 0, false, NULL, 0, 0, NULL, 0, eArgTypeNone, NULL }
 };
 
@@ -147,12 +148,12 @@ OptionGroupValueObjectDisplay::OptionParsingStarting (CommandInterpreter &interp
     }
 }
 
-ValueObject::DumpValueObjectOptions
-OptionGroupValueObjectDisplay::GetAsDumpOptions (bool objc_is_compact,
+DumpValueObjectOptions
+OptionGroupValueObjectDisplay::GetAsDumpOptions (LanguageRuntimeDescriptionDisplayVerbosity lang_descr_verbosity,
                                                  lldb::Format format,
                                                  lldb::TypeSummaryImplSP summary_sp)
 {
-    ValueObject::DumpValueObjectOptions options;
+    DumpValueObjectOptions options;
     options.SetMaximumPointerDepth(ptr_depth);
     if (use_objc)
         options.SetShowSummary(false);
@@ -169,7 +170,7 @@ OptionGroupValueObjectDisplay::GetAsDumpOptions (bool objc_is_compact,
     .SetFormat(format)
     .SetSummary(summary_sp);
     
-    if (objc_is_compact)
+    if (lang_descr_verbosity == eLanguageRuntimeDescriptionDisplayVerbosityCompact)
         options.SetHideRootType(use_objc)
         .SetHideName(use_objc)
         .SetHideValue(use_objc);
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupVariable.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupVariable.cpp
index 316747eff03..31c2547e2c3 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupVariable.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupVariable.cpp
@@ -28,14 +28,14 @@ using namespace lldb_private;
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "no-args",         'a', no_argument,       NULL, 0, eArgTypeNone, "Omit function arguments."},
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "no-locals",       'l', no_argument,       NULL, 0, eArgTypeNone, "Omit local variables."},
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "show-globals",    'g', no_argument,       NULL, 0, eArgTypeNone, "Show the current frame source file global and static variables."},
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "show-declaration",'c', no_argument,       NULL, 0, eArgTypeNone, "Show variable declaration information (source file and line where the variable was declared)."},
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "regex",           'r', no_argument,       NULL, 0, eArgTypeRegularExpression, "The <variable-name> argument for name lookups are regular expressions."},
-    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "scope",           's', no_argument,       NULL, 0, eArgTypeNone, "Show variable scope (argument, local, global, static)."},
-    { LLDB_OPT_SET_1,                  false, "summary",         'y', required_argument, NULL, 0, eArgTypeName, "Specify the summary that the variable output should use."},
-    { LLDB_OPT_SET_2,                  false, "summary-string",  'z', required_argument, NULL, 0, eArgTypeName, "Specify a summary string to use to format the variable output."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "no-args",         'a', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone, "Omit function arguments."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "no-locals",       'l', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone, "Omit local variables."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "show-globals",    'g', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone, "Show the current frame source file global and static variables."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "show-declaration",'c', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone, "Show variable declaration information (source file and line where the variable was declared)."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "regex",           'r', OptionParser::eNoArgument,       NULL, 0, eArgTypeRegularExpression, "The <variable-name> argument for name lookups are regular expressions."},
+    { LLDB_OPT_SET_1 | LLDB_OPT_SET_2, false, "scope",           's', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone, "Show variable scope (argument, local, global, static)."},
+    { LLDB_OPT_SET_1,                  false, "summary",         'y', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName, "Specify the summary that the variable output should use."},
+    { LLDB_OPT_SET_2,                  false, "summary-string",  'z', OptionParser::eRequiredArgument, NULL, 0, eArgTypeName, "Specify a summary string to use to format the variable output."},
 };
 
 static Error
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupWatchpoint.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupWatchpoint.cpp
index 9eef37a3ae6..09dc8ed88d2 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupWatchpoint.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionGroupWatchpoint.cpp
@@ -40,8 +40,8 @@ static OptionEnumValueElement g_watch_size[] =
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1, false, "watch", 'w', required_argument, g_watch_type, 0, eArgTypeWatchType, "Specify the type of watching to perform."},
-    { LLDB_OPT_SET_1, false, "xsize", 'x', required_argument, g_watch_size, 0, eArgTypeByteSize, "Number of bytes to use to watch a region."}
+    { LLDB_OPT_SET_1, false, "watch", 'w', OptionParser::eRequiredArgument, g_watch_type, 0, eArgTypeWatchType, "Specify the type of watching to perform."},
+    { LLDB_OPT_SET_1, false, "xsize", 'x', OptionParser::eRequiredArgument, g_watch_size, 0, eArgTypeByteSize, "Number of bytes to use to watch a region."}
 };
 
 
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp
index e56b48b5579..3d2a7ff3307 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionValueFileSpec.cpp
@@ -84,17 +84,21 @@ OptionValueFileSpec::SetValueFromCString (const char *value_cstr,
     case eVarSetOperationAssign:
         if (value_cstr && value_cstr[0])
         {
-            Args args(value_cstr);
-            if (args.GetArgumentCount() == 1)
-            {
-                const char *path = args.GetArgumentAtIndex(0);
-                m_value_was_set = true;
-                m_current_value.SetFile(path, true);
-            }
-            else
-            {
-                error.SetErrorString("please supply a single path argument for this file or quote the path if it contains spaces");
-            }
+            // The setting value may have whitespace, double-quotes, or single-quotes around the file
+            // path to indicate that internal spaces are not word breaks.  Strip off any ws & quotes
+            // from the start and end of the file path - we aren't doing any word // breaking here so 
+            // the quoting is unnecessary.  NB this will cause a problem if someone tries to specify
+            // a file path that legitimately begins or ends with a " or ' character, or whitespace.
+            std::string filepath(value_cstr);
+            auto prefix_chars_to_trim = filepath.find_first_not_of ("\"' \t");
+            if (prefix_chars_to_trim != std::string::npos && prefix_chars_to_trim > 0)
+                filepath.erase(0, prefix_chars_to_trim);
+            auto suffix_chars_to_trim = filepath.find_last_not_of ("\"' \t");
+            if (suffix_chars_to_trim != std::string::npos && suffix_chars_to_trim < filepath.size())
+                filepath.erase (suffix_chars_to_trim + 1);
+
+            m_value_was_set = true;
+            m_current_value.SetFile(filepath.c_str(), true);
         }
         else
         {
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/OptionValueProperties.cpp b/contrib/llvm/tools/lldb/source/Interpreter/OptionValueProperties.cpp
index 0df378235cf..abee55d93ef 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/OptionValueProperties.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/OptionValueProperties.cpp
@@ -651,6 +651,7 @@ lldb::OptionValueSP
 OptionValueProperties::DeepCopy () const
 {
     assert(!"this shouldn't happen");
+    return lldb::OptionValueSP();
 }
 
 const Property *
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/Options.cpp b/contrib/llvm/tools/lldb/source/Interpreter/Options.cpp
index 293d7535663..8d245cc15da 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/Options.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/Options.cpp
@@ -256,7 +256,7 @@ Options::NumCommandOptions ()
     return i;
 }
 
-struct option *
+Option *
 Options::GetLongOptions ()
 {
     // Check to see if this has already been done.
@@ -444,13 +444,13 @@ PrintOption (const OptionDefinition &opt_def,
         strm.Printf ("--%s", opt_def.long_option);
     switch (opt_def.option_has_arg)
     {
-        case no_argument:
+        case OptionParser::eNoArgument:
             break;
-        case required_argument:
+        case OptionParser::eRequiredArgument:
             strm.Printf (" <%s>", CommandObject::GetArgumentName (opt_def.argument_type));
             break;
             
-        case optional_argument:
+        case OptionParser::eOptionalArgument:
             strm.Printf ("%s[<%s>]",
                          show_short_option ? "" : "=",
                          CommandObject::GetArgumentName (opt_def.argument_type));
@@ -529,7 +529,7 @@ Options::GenerateOptionUsage
                 // Add current option to the end of out_stream.
 
                 if (opt_defs[i].required == true && 
-                    opt_defs[i].option_has_arg == no_argument)
+                    opt_defs[i].option_has_arg == OptionParser::eNoArgument)
                 {
                     options.insert (opt_defs[i].short_option);
                 }
@@ -560,7 +560,7 @@ Options::GenerateOptionUsage
                 // Add current option to the end of out_stream.
 
                 if (opt_defs[i].required == false &&
-                    opt_defs[i].option_has_arg == no_argument)
+                    opt_defs[i].option_has_arg == OptionParser::eNoArgument)
                 {
                     options.insert (opt_defs[i].short_option);
                 }
@@ -591,7 +591,7 @@ Options::GenerateOptionUsage
         {
             if (opt_defs[i].usage_mask & opt_set_mask && isprint8(opt_defs[i].short_option))
             {
-                if (opt_defs[i].required && opt_defs[i].option_has_arg != no_argument)
+                if (opt_defs[i].required && opt_defs[i].option_has_arg != OptionParser::eNoArgument)
                     PrintOption (opt_defs[i], eDisplayBestOption, " ", NULL, true, strm);
             }
         }
@@ -604,7 +604,7 @@ Options::GenerateOptionUsage
             {
                 // Add current option to the end of out_stream.
 
-                if (!opt_defs[i].required && opt_defs[i].option_has_arg != no_argument)
+                if (!opt_defs[i].required && opt_defs[i].option_has_arg != OptionParser::eNoArgument)
                     PrintOption (opt_defs[i], eDisplayBestOption, " ", NULL, true, strm);
             }
         }
@@ -992,6 +992,18 @@ OptionGroupOptions::Append (OptionGroup* group)
     }
 }
 
+const OptionGroup*
+OptionGroupOptions::GetGroupWithOption (char short_opt)
+{
+    for (uint32_t i = 0; i < m_option_defs.size(); i++)
+    {
+        OptionDefinition opt_def = m_option_defs[i];
+        if (opt_def.short_option == short_opt)
+            return m_option_infos[i].option_group;
+    }
+    return NULL;
+}
+
 void
 OptionGroupOptions::Append (OptionGroup* group, 
                             uint32_t src_mask, 
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/PythonDataObjects.cpp b/contrib/llvm/tools/lldb/source/Interpreter/PythonDataObjects.cpp
index 2a1f348e14b..1e2bd239119 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/PythonDataObjects.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/PythonDataObjects.cpp
@@ -15,11 +15,7 @@
 
 #else
 
-#if defined (__APPLE__)
-#include <Python/Python.h>
-#else
-#include <Python.h>
-#endif
+#include "lldb/lldb-python.h"
 
 #include <stdio.h>
 
@@ -93,18 +89,22 @@ PythonObject::Str ()
 //----------------------------------------------------------------------
 
 PythonString::PythonString (PyObject *py_obj) :
-    PythonObject(py_obj)
+    PythonObject()
 {
+    Reset(py_obj); // Use "Reset()" to ensure that py_obj is a string
 }
 
 PythonString::PythonString (const PythonObject &object) :
-    PythonObject(object.GetPythonObject())
+    PythonObject()
 {
+    Reset(object.GetPythonObject()); // Use "Reset()" to ensure that py_obj is a string
 }
 
 PythonString::PythonString (const lldb::ScriptInterpreterObjectSP &script_object_sp) :
-    PythonObject (script_object_sp)
+    PythonObject()
 {
+    if (script_object_sp)
+        Reset((PyObject *)script_object_sp->GetObject()); // Use "Reset()" to ensure that py_obj is a string
 }
 
 PythonString::PythonString (const char* string) :
@@ -158,23 +158,28 @@ PythonString::SetString (const char* string)
 //----------------------------------------------------------------------
 
 PythonInteger::PythonInteger (PyObject *py_obj) :
-    PythonObject(py_obj)
+    PythonObject()
 {
+    Reset(py_obj); // Use "Reset()" to ensure that py_obj is a integer type
 }
 
 PythonInteger::PythonInteger (const PythonObject &object) :
-    PythonObject(object.GetPythonObject())
+    PythonObject()
 {
+    Reset(object.GetPythonObject()); // Use "Reset()" to ensure that py_obj is a integer type
 }
 
 PythonInteger::PythonInteger (const lldb::ScriptInterpreterObjectSP &script_object_sp) :
-    PythonObject (script_object_sp)
+    PythonObject()
 {
+    if (script_object_sp)
+        Reset((PyObject *)script_object_sp->GetObject()); // Use "Reset()" to ensure that py_obj is a string
 }
 
 PythonInteger::PythonInteger (int64_t value) :
-    PythonObject(PyInt_FromLong(value))
+    PythonObject()
 {
+    SetInteger (value);
 }
 
 
@@ -185,8 +190,11 @@ PythonInteger::~PythonInteger ()
 bool
 PythonInteger::Reset (PyObject *py_obj)
 {
-    if (py_obj && PyInt_Check(py_obj))
-        return PythonObject::Reset(py_obj);
+    if (py_obj)
+    {
+        if (PyInt_Check (py_obj) || PyLong_Check(py_obj))
+            return PythonObject::Reset(py_obj);
+    }
     
     PythonObject::Reset(NULL);
     return py_obj == NULL;
@@ -196,15 +204,19 @@ int64_t
 PythonInteger::GetInteger()
 {
     if (m_py_obj)
-        return PyInt_AsLong(m_py_obj);
-    else
-        return UINT64_MAX;
+    {
+        if (PyInt_Check(m_py_obj))
+            return PyInt_AsLong(m_py_obj);
+        else if (PyLong_Check(m_py_obj))
+            return PyLong_AsLongLong(m_py_obj);
+    }
+    return UINT64_MAX;
 }
 
 void
 PythonInteger::SetInteger (int64_t value)
 {
-    PythonObject::Reset(PyInt_FromLong(value));
+    PythonObject::Reset(PyLong_FromLongLong(value));
 }
 
 //----------------------------------------------------------------------
@@ -222,19 +234,23 @@ PythonList::PythonList (uint32_t count) :
 }
 
 PythonList::PythonList (PyObject *py_obj) :
-    PythonObject(py_obj)
+    PythonObject()
 {
+    Reset(py_obj); // Use "Reset()" to ensure that py_obj is a list
 }
 
 
 PythonList::PythonList (const PythonObject &object) :
-    PythonObject(object.GetPythonObject())
+    PythonObject()
 {
+    Reset(object.GetPythonObject()); // Use "Reset()" to ensure that py_obj is a list
 }
 
 PythonList::PythonList (const lldb::ScriptInterpreterObjectSP &script_object_sp) :
-    PythonObject (script_object_sp)
+    PythonObject()
 {
+    if (script_object_sp)
+        Reset((PyObject *)script_object_sp->GetObject()); // Use "Reset()" to ensure that py_obj is a list
 }
 
 PythonList::~PythonList ()
@@ -293,17 +309,21 @@ PythonDictionary::PythonDictionary () :
 PythonDictionary::PythonDictionary (PyObject *py_obj) :
     PythonObject(py_obj)
 {
+    Reset(py_obj); // Use "Reset()" to ensure that py_obj is a dictionary
 }
 
 
 PythonDictionary::PythonDictionary (const PythonObject &object) :
-    PythonObject(object.GetPythonObject())
+    PythonObject()
 {
+    Reset(object.GetPythonObject()); // Use "Reset()" to ensure that py_obj is a dictionary
 }
 
 PythonDictionary::PythonDictionary (const lldb::ScriptInterpreterObjectSP &script_object_sp) :
-    PythonObject (script_object_sp)
+    PythonObject ()
 {
+    if (script_object_sp)
+        Reset((PyObject *)script_object_sp->GetObject()); // Use "Reset()" to ensure that py_obj is a dictionary
 }
 
 PythonDictionary::~PythonDictionary ()
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp b/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp
index 67314731df2..1b751afb135 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreter.cpp
@@ -88,10 +88,48 @@ ScriptInterpreter::AcquireInterpreterLock ()
 }
 
 void
-ScriptInterpreter::InitializeInterpreter (SWIGInitCallback python_swig_init_callback)
+ScriptInterpreter::InitializeInterpreter (SWIGInitCallback python_swig_init_callback,
+                                          SWIGBreakpointCallbackFunction swig_breakpoint_callback,
+                                          SWIGWatchpointCallbackFunction swig_watchpoint_callback,
+                                          SWIGPythonTypeScriptCallbackFunction swig_typescript_callback,
+                                          SWIGPythonCreateSyntheticProvider swig_synthetic_script,
+                                          SWIGPythonCalculateNumChildren swig_calc_children,
+                                          SWIGPythonGetChildAtIndex swig_get_child_index,
+                                          SWIGPythonGetIndexOfChildWithName swig_get_index_child,
+                                          SWIGPythonCastPyObjectToSBValue swig_cast_to_sbvalue ,
+                                          SWIGPythonGetValueObjectSPFromSBValue swig_get_valobj_sp_from_sbvalue,
+                                          SWIGPythonUpdateSynthProviderInstance swig_update_provider,
+                                          SWIGPythonMightHaveChildrenSynthProviderInstance swig_mighthavechildren_provider,
+                                          SWIGPythonCallCommand swig_call_command,
+                                          SWIGPythonCallModuleInit swig_call_module_init,
+                                          SWIGPythonCreateOSPlugin swig_create_os_plugin,
+                                          SWIGPythonScriptKeyword_Process swig_run_script_keyword_process,
+                                          SWIGPythonScriptKeyword_Thread swig_run_script_keyword_thread,
+                                          SWIGPythonScriptKeyword_Target swig_run_script_keyword_target,
+                                          SWIGPythonScriptKeyword_Frame swig_run_script_keyword_frame,
+                                          SWIGPython_GetDynamicSetting swig_plugin_get)
 {
 #ifndef LLDB_DISABLE_PYTHON
-    ScriptInterpreterPython::InitializeInterpreter (python_swig_init_callback);
+    ScriptInterpreterPython::InitializeInterpreter (python_swig_init_callback,
+                                                    swig_breakpoint_callback,
+                                                    swig_watchpoint_callback,
+                                                    swig_typescript_callback,
+                                                    swig_synthetic_script,
+                                                    swig_calc_children,
+                                                    swig_get_child_index,
+                                                    swig_get_index_child,
+                                                    swig_cast_to_sbvalue ,
+                                                    swig_get_valobj_sp_from_sbvalue,
+                                                    swig_update_provider,
+                                                    swig_mighthavechildren_provider,
+                                                    swig_call_command,
+                                                    swig_call_module_init,
+                                                    swig_create_os_plugin,
+                                                    swig_run_script_keyword_process,
+                                                    swig_run_script_keyword_thread,
+                                                    swig_run_script_keyword_target,
+                                                    swig_run_script_keyword_frame,
+                                                    swig_plugin_get);
 #endif // #ifndef LLDB_DISABLE_PYTHON
 }
 
diff --git a/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreterPython.cpp b/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreterPython.cpp
index 9d9b8d93fb4..fb60fedbe94 100644
--- a/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreterPython.cpp
+++ b/contrib/llvm/tools/lldb/source/Interpreter/ScriptInterpreterPython.cpp
@@ -15,12 +15,7 @@
 
 #else
 
-#if defined (__APPLE__)
-#include <Python/Python.h>
-#else
-#include <Python.h>
-#endif
-
+#include "lldb/lldb-python.h"
 #include "lldb/Interpreter/ScriptInterpreterPython.h"
 
 #include <stdlib.h>
@@ -52,6 +47,7 @@ static ScriptInterpreter::SWIGPythonCalculateNumChildren g_swig_calc_children =
 static ScriptInterpreter::SWIGPythonGetChildAtIndex g_swig_get_child_index = NULL;
 static ScriptInterpreter::SWIGPythonGetIndexOfChildWithName g_swig_get_index_child = NULL;
 static ScriptInterpreter::SWIGPythonCastPyObjectToSBValue g_swig_cast_to_sbvalue  = NULL;
+static ScriptInterpreter::SWIGPythonGetValueObjectSPFromSBValue g_swig_get_valobj_sp_from_sbvalue = NULL;
 static ScriptInterpreter::SWIGPythonUpdateSynthProviderInstance g_swig_update_provider = NULL;
 static ScriptInterpreter::SWIGPythonMightHaveChildrenSynthProviderInstance g_swig_mighthavechildren_provider = NULL;
 static ScriptInterpreter::SWIGPythonCallCommand g_swig_call_command = NULL;
@@ -61,95 +57,7 @@ static ScriptInterpreter::SWIGPythonScriptKeyword_Process g_swig_run_script_keyw
 static ScriptInterpreter::SWIGPythonScriptKeyword_Thread g_swig_run_script_keyword_thread = NULL;
 static ScriptInterpreter::SWIGPythonScriptKeyword_Target g_swig_run_script_keyword_target = NULL;
 static ScriptInterpreter::SWIGPythonScriptKeyword_Frame g_swig_run_script_keyword_frame = NULL;
-
-// these are the Pythonic implementations of the required callbacks
-// these are scripting-language specific, which is why they belong here
-// we still need to use function pointers to them instead of relying
-// on linkage-time resolution because the SWIG stuff and this file
-// get built at different times
-extern "C" bool
-LLDBSwigPythonBreakpointCallbackFunction (const char *python_function_name,
-                                          const char *session_dictionary_name,
-                                          const lldb::StackFrameSP& sb_frame,
-                                          const lldb::BreakpointLocationSP& sb_bp_loc);
-
-extern "C" bool
-LLDBSwigPythonWatchpointCallbackFunction (const char *python_function_name,
-                                          const char *session_dictionary_name,
-                                          const lldb::StackFrameSP& sb_frame,
-                                          const lldb::WatchpointSP& sb_wp);
-
-extern "C" bool
-LLDBSwigPythonCallTypeScript (const char *python_function_name,
-                              void *session_dictionary,
-                              const lldb::ValueObjectSP& valobj_sp,
-                              void** pyfunct_wrapper,
-                              std::string& retval);
-
-extern "C" void*
-LLDBSwigPythonCreateSyntheticProvider (const char *python_class_name,
-                                       const char *session_dictionary_name,
-                                       const lldb::ValueObjectSP& valobj_sp);
-
-
-extern "C" uint32_t
-LLDBSwigPython_CalculateNumChildren (void *implementor);
-
-extern "C" void *
-LLDBSwigPython_GetChildAtIndex (void *implementor, uint32_t idx);
-
-extern "C" int
-LLDBSwigPython_GetIndexOfChildWithName (void *implementor, const char* child_name);
-
-extern "C" void *
-LLDBSWIGPython_CastPyObjectToSBValue (void* data);
-
-extern "C" bool
-LLDBSwigPython_UpdateSynthProviderInstance (void* implementor);
-
-extern "C" bool
-LLDBSwigPython_MightHaveChildrenSynthProviderInstance (void* implementor);
-
-extern "C" bool
-LLDBSwigPythonCallCommand (const char *python_function_name,
-                           const char *session_dictionary_name,
-                           lldb::DebuggerSP& debugger,
-                           const char* args,
-                           lldb_private::CommandReturnObject &cmd_retobj);
-
-extern "C" bool
-LLDBSwigPythonCallModuleInit (const char *python_module_name,
-                              const char *session_dictionary_name,
-                              lldb::DebuggerSP& debugger);
-
-extern "C" void*
-LLDBSWIGPythonCreateOSPlugin (const char *python_class_name,
-                              const char *session_dictionary_name,
-                              const lldb::ProcessSP& process_sp);
-
-extern "C" bool
-LLDBSWIGPythonRunScriptKeywordProcess (const char* python_function_name,
-                                       const char* session_dictionary_name,
-                                       lldb::ProcessSP& process,
-                                       std::string& output);
-
-extern "C" bool
-LLDBSWIGPythonRunScriptKeywordThread (const char* python_function_name,
-                                      const char* session_dictionary_name,
-                                      lldb::ThreadSP& thread,
-                                      std::string& output);
-
-extern "C" bool
-LLDBSWIGPythonRunScriptKeywordTarget (const char* python_function_name,
-                                      const char* session_dictionary_name,
-                                      lldb::TargetSP& target,
-                                      std::string& output);
-
-extern "C" bool
-LLDBSWIGPythonRunScriptKeywordFrame (const char* python_function_name,
-                                     const char* session_dictionary_name,
-                                     lldb::StackFrameSP& frame,
-                                     std::string& output);
+static ScriptInterpreter::SWIGPython_GetDynamicSetting g_swig_plugin_get = NULL;
 
 static int
 _check_and_flush (FILE *stream)
@@ -418,7 +326,7 @@ ScriptInterpreterPython::PythonInputReaderManager::InputReaderCallback (void *ba
             if (script_interpreter->m_embedded_thread_pty.GetMasterFileDescriptor() != -1)
             {
                 if (log)
-                    log->Printf ("ScriptInterpreterPython::NonInteractiveInputReaderCallback, GotToken, bytes='%s', byte_len = %lu", bytes,
+                    log->Printf ("ScriptInterpreterPython::NonInteractiveInputReaderCallback, GotToken, bytes='%s', byte_len = %zu", bytes,
                                  bytes_len);
                 if (bytes && bytes_len)
                     ::write (script_interpreter->m_embedded_thread_pty.GetMasterFileDescriptor(), bytes, bytes_len);
@@ -427,7 +335,7 @@ ScriptInterpreterPython::PythonInputReaderManager::InputReaderCallback (void *ba
             else
             {
                 if (log)
-                    log->Printf ("ScriptInterpreterPython::NonInteractiveInputReaderCallback, GotToken, bytes='%s', byte_len = %lu, Master File Descriptor is bad.", 
+                    log->Printf ("ScriptInterpreterPython::NonInteractiveInputReaderCallback, GotToken, bytes='%s', byte_len = %zu, Master File Descriptor is bad.", 
                                  bytes,
                                  bytes_len);
                 reader.SetIsDone (true);
@@ -954,7 +862,7 @@ ScriptInterpreterPython::InputReaderCallback
         if (script_interpreter->m_embedded_python_pty.GetMasterFileDescriptor() != -1)
         {
             if (log)
-                log->Printf ("ScriptInterpreterPython::InputReaderCallback, GotToken, bytes='%s', byte_len = %lu", bytes,
+                log->Printf ("ScriptInterpreterPython::InputReaderCallback, GotToken, bytes='%s', byte_len = %zu", bytes,
                              bytes_len);
             if (bytes && bytes_len)
             {
@@ -968,7 +876,7 @@ ScriptInterpreterPython::InputReaderCallback
         else
         {
             if (log)
-                log->Printf ("ScriptInterpreterPython::InputReaderCallback, GotToken, bytes='%s', byte_len = %lu, Master File Descriptor is bad.", 
+                log->Printf ("ScriptInterpreterPython::InputReaderCallback, GotToken, bytes='%s', byte_len = %zu, Master File Descriptor is bad.", 
                              bytes,
                              bytes_len);
             reader.SetIsDone (true);
@@ -1176,6 +1084,13 @@ ScriptInterpreterPython::ExecuteOneLineWithReturn (const char *in_string,
                     success = PyArg_Parse (py_return, format, (char *) ret_value);
                     break;
                 }
+                case eScriptReturnTypeOpaqueObject:
+                {
+                    success = true;
+                    Py_XINCREF(py_return);
+                    *((PyObject**)ret_value) = py_return;
+                    break;
+                }
             }
             Py_XDECREF (py_return);
             if (success)
@@ -2063,6 +1978,47 @@ ScriptInterpreterPython::OSPlugin_CreateThread (lldb::ScriptInterpreterObjectSP
     return MakeScriptObject(py_return);
 }
 
+lldb::ScriptInterpreterObjectSP
+ScriptInterpreterPython::LoadPluginModule (const FileSpec& file_spec,
+                                           lldb_private::Error& error)
+{
+    if (!file_spec.Exists())
+    {
+        error.SetErrorString("no such file");
+        return lldb::ScriptInterpreterObjectSP();
+    }
+
+    ScriptInterpreterObjectSP module_sp;
+    
+    if (LoadScriptingModule(file_spec.GetPath().c_str(),true,true,error,&module_sp))
+        return module_sp;
+    
+    return lldb::ScriptInterpreterObjectSP();
+}
+
+lldb::ScriptInterpreterObjectSP
+ScriptInterpreterPython::GetDynamicSettings (lldb::ScriptInterpreterObjectSP plugin_module_sp,
+                                             Target* target,
+                                             const char* setting_name,
+                                             lldb_private::Error& error)
+{
+    if (!plugin_module_sp || !target || !setting_name || !setting_name[0])
+        return lldb::ScriptInterpreterObjectSP();
+    
+    if (!g_swig_plugin_get)
+        return lldb::ScriptInterpreterObjectSP();
+    
+    PyObject *reply_pyobj = nullptr;
+    
+    {
+        Locker py_lock(this);
+        TargetSP target_sp(target->shared_from_this());
+        reply_pyobj = (PyObject*)g_swig_plugin_get(plugin_module_sp->GetObject(),setting_name,target_sp);
+    }
+    
+    return MakeScriptObject(reply_pyobj);
+}
+
 lldb::ScriptInterpreterObjectSP
 ScriptInterpreterPython::CreateSyntheticScriptedProvider (const char *class_name,
                                                           lldb::ValueObjectSP valobj)
@@ -2451,20 +2407,18 @@ ScriptInterpreterPython::GetChildAtIndex (const lldb::ScriptInterpreterObjectSP&
     if (!g_swig_get_child_index || !g_swig_cast_to_sbvalue)
         return lldb::ValueObjectSP();
     
-    void* child_ptr = NULL;
-    lldb::SBValue* value_sb = NULL;
     lldb::ValueObjectSP ret_val;
     
     {
         Locker py_lock(this);
-        child_ptr = g_swig_get_child_index (implementor,idx);
+        void* child_ptr = g_swig_get_child_index (implementor,idx);
         if (child_ptr != NULL && child_ptr != Py_None)
         {
-            value_sb = (lldb::SBValue*)g_swig_cast_to_sbvalue(child_ptr);
-            if (value_sb == NULL)
+            lldb::SBValue* sb_value_ptr = (lldb::SBValue*)g_swig_cast_to_sbvalue(child_ptr);
+            if (sb_value_ptr == NULL)
                 Py_XDECREF(child_ptr);
             else
-                ret_val = value_sb->GetSP();
+                ret_val = g_swig_get_valobj_sp_from_sbvalue (sb_value_ptr);
         }
         else
         {
@@ -2749,7 +2703,8 @@ bool
 ScriptInterpreterPython::LoadScriptingModule (const char* pathname,
                                               bool can_reload,
                                               bool init_session,
-                                              lldb_private::Error& error)
+                                              lldb_private::Error& error,
+                                              lldb::ScriptInterpreterObjectSP* module_sp)
 {
     if (!pathname || !pathname[0])
     {
@@ -2914,6 +2869,17 @@ ScriptInterpreterPython::LoadScriptingModule (const char* pathname,
             error.SetErrorString("calling __lldb_init_module failed");
             return false;
         }
+        
+        if (module_sp)
+        {
+            // everything went just great, now set the module object
+            command_stream.Clear();
+            command_stream.Printf("%s",basename.c_str());
+            void* module_pyobj = nullptr;
+            if (ExecuteOneLineWithReturn(command_stream.GetData(),ScriptInterpreter::eScriptReturnTypeOpaqueObject,&module_pyobj) && module_pyobj)
+                *module_sp = MakeScriptObject(module_pyobj);
+        }
+        
         return true;
     }
 }
@@ -3047,26 +3013,47 @@ ScriptInterpreterPython::AcquireInterpreterLock ()
 }
 
 void
-ScriptInterpreterPython::InitializeInterpreter (SWIGInitCallback python_swig_init_callback)
+ScriptInterpreterPython::InitializeInterpreter (SWIGInitCallback swig_init_callback,
+                                                SWIGBreakpointCallbackFunction swig_breakpoint_callback,
+                                                SWIGWatchpointCallbackFunction swig_watchpoint_callback,
+                                                SWIGPythonTypeScriptCallbackFunction swig_typescript_callback,
+                                                SWIGPythonCreateSyntheticProvider swig_synthetic_script,
+                                                SWIGPythonCalculateNumChildren swig_calc_children,
+                                                SWIGPythonGetChildAtIndex swig_get_child_index,
+                                                SWIGPythonGetIndexOfChildWithName swig_get_index_child,
+                                                SWIGPythonCastPyObjectToSBValue swig_cast_to_sbvalue ,
+                                                SWIGPythonGetValueObjectSPFromSBValue swig_get_valobj_sp_from_sbvalue,
+                                                SWIGPythonUpdateSynthProviderInstance swig_update_provider,
+                                                SWIGPythonMightHaveChildrenSynthProviderInstance swig_mighthavechildren_provider,
+                                                SWIGPythonCallCommand swig_call_command,
+                                                SWIGPythonCallModuleInit swig_call_module_init,
+                                                SWIGPythonCreateOSPlugin swig_create_os_plugin,
+                                                SWIGPythonScriptKeyword_Process swig_run_script_keyword_process,
+                                                SWIGPythonScriptKeyword_Thread swig_run_script_keyword_thread,
+                                                SWIGPythonScriptKeyword_Target swig_run_script_keyword_target,
+                                                SWIGPythonScriptKeyword_Frame swig_run_script_keyword_frame,
+                                                SWIGPython_GetDynamicSetting swig_plugin_get)
 {
-    g_swig_init_callback = python_swig_init_callback;
-    g_swig_breakpoint_callback = LLDBSwigPythonBreakpointCallbackFunction;
-    g_swig_watchpoint_callback = LLDBSwigPythonWatchpointCallbackFunction;
-    g_swig_typescript_callback = LLDBSwigPythonCallTypeScript;
-    g_swig_synthetic_script = LLDBSwigPythonCreateSyntheticProvider;
-    g_swig_calc_children = LLDBSwigPython_CalculateNumChildren;
-    g_swig_get_child_index = LLDBSwigPython_GetChildAtIndex;
-    g_swig_get_index_child = LLDBSwigPython_GetIndexOfChildWithName;
-    g_swig_cast_to_sbvalue = LLDBSWIGPython_CastPyObjectToSBValue;
-    g_swig_update_provider = LLDBSwigPython_UpdateSynthProviderInstance;
-    g_swig_mighthavechildren_provider = LLDBSwigPython_MightHaveChildrenSynthProviderInstance;
-    g_swig_call_command = LLDBSwigPythonCallCommand;
-    g_swig_call_module_init = LLDBSwigPythonCallModuleInit;
-    g_swig_create_os_plugin = LLDBSWIGPythonCreateOSPlugin;
-    g_swig_run_script_keyword_process = LLDBSWIGPythonRunScriptKeywordProcess;
-    g_swig_run_script_keyword_thread = LLDBSWIGPythonRunScriptKeywordThread;
-    g_swig_run_script_keyword_target = LLDBSWIGPythonRunScriptKeywordTarget;
-    g_swig_run_script_keyword_frame = LLDBSWIGPythonRunScriptKeywordFrame;
+    g_swig_init_callback = swig_init_callback;
+    g_swig_breakpoint_callback = swig_breakpoint_callback;
+    g_swig_watchpoint_callback = swig_watchpoint_callback;
+    g_swig_typescript_callback = swig_typescript_callback;
+    g_swig_synthetic_script = swig_synthetic_script;
+    g_swig_calc_children = swig_calc_children;
+    g_swig_get_child_index = swig_get_child_index;
+    g_swig_get_index_child = swig_get_index_child;
+    g_swig_cast_to_sbvalue = swig_cast_to_sbvalue;
+    g_swig_get_valobj_sp_from_sbvalue = swig_get_valobj_sp_from_sbvalue;
+    g_swig_update_provider = swig_update_provider;
+    g_swig_mighthavechildren_provider = swig_mighthavechildren_provider;
+    g_swig_call_command = swig_call_command;
+    g_swig_call_module_init = swig_call_module_init;
+    g_swig_create_os_plugin = swig_create_os_plugin;
+    g_swig_run_script_keyword_process = swig_run_script_keyword_process;
+    g_swig_run_script_keyword_thread = swig_run_script_keyword_thread;
+    g_swig_run_script_keyword_target = swig_run_script_keyword_target;
+    g_swig_run_script_keyword_frame = swig_run_script_keyword_frame;
+    g_swig_plugin_get = swig_plugin_get;
 }
 
 void
diff --git a/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp b/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp
index 4685c3e759e..abf873ff3dd 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.cpp
@@ -198,12 +198,7 @@ ABIMacOSX_arm::PrepareTrivialCall (Thread &thread,
                                    addr_t sp, 
                                    addr_t function_addr, 
                                    addr_t return_addr, 
-                                   addr_t *arg1_ptr,
-                                   addr_t *arg2_ptr,
-                                   addr_t *arg3_ptr,
-                                   addr_t *arg4_ptr,
-                                   addr_t *arg5_ptr,
-                                   addr_t *arg6_ptr) const
+                                   llvm::ArrayRef<addr_t> args) const
 {
     RegisterContext *reg_ctx = thread.GetRegisterContext().get();
     if (!reg_ctx)
@@ -215,50 +210,45 @@ ABIMacOSX_arm::PrepareTrivialCall (Thread &thread,
 
     RegisterValue reg_value;
 
-    if (arg1_ptr)
+    const char *reg_names[] = { "r0", "r1", "r2", "r3" };
+    
+    llvm::ArrayRef<addr_t>::iterator ai = args.begin(), ae = args.end();
+    
+    for (size_t i = 0; i < (sizeof(reg_names) / sizeof(reg_names[0])); ++i)
     {
-        reg_value.SetUInt32(*arg1_ptr);
-        if (!reg_ctx->WriteRegister (reg_ctx->GetRegisterInfoByName("r0"), reg_value))
+        if (ai == ae)
+            break;
+        
+        reg_value.SetUInt32(*ai);
+        if (!reg_ctx->WriteRegister(reg_ctx->GetRegisterInfoByName(reg_names[i]), reg_value))
             return false;
-
-        if (arg2_ptr)
+        
+        ++ai;
+    }
+    
+    if (ai != ae)
+    {
+        // Spill onto the stack
+        size_t num_stack_regs = ae - ai;
+        
+        sp -= (num_stack_regs * 4);
+        // Keep the stack 8 byte aligned, not that we need to
+        sp &= ~(8ull-1ull);
+        
+        // just using arg1 to get the right size
+        const RegisterInfo *reg_info = reg_ctx->GetRegisterInfo(eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG1);
+        
+        addr_t arg_pos = sp;
+        
+        for (; ai != ae; ++ai)
         {
-            reg_value.SetUInt32(*arg2_ptr);
-            if (!reg_ctx->WriteRegister (reg_ctx->GetRegisterInfoByName("r1"), reg_value))
+            reg_value.SetUInt32(*ai);
+            if (reg_ctx->WriteRegisterValueToMemory(reg_info, arg_pos, reg_info->byte_size, reg_value).Fail())
                 return false;
-
-            if (arg3_ptr)
-            {
-                reg_value.SetUInt32(*arg3_ptr);
-                if (!reg_ctx->WriteRegister (reg_ctx->GetRegisterInfoByName("r2"), reg_value))
-                    return false;
-                if (arg4_ptr)
-                {
-                    reg_value.SetUInt32(*arg4_ptr);
-                    const RegisterInfo *reg_info = reg_ctx->GetRegisterInfoByName("r3");
-                    if (!reg_ctx->WriteRegister (reg_info, reg_value))
-                        return false;
-                    if (arg5_ptr)
-                    {
-                        // Keep the stack 8 byte aligned, not that we need to
-                        sp -= 8;
-                        sp &= ~(8ull-1ull);
-                        reg_value.SetUInt32(*arg5_ptr);
-                        if (reg_ctx->WriteRegisterValueToMemory (reg_info, sp, reg_info->byte_size, reg_value).Fail())
-                            return false;
-                        if (arg6_ptr)
-                        {
-                            reg_value.SetUInt32(*arg6_ptr);
-                            if (reg_ctx->WriteRegisterValueToMemory (reg_info, sp + 4, reg_info->byte_size, reg_value).Fail())
-                                return false;
-                        }
-                    }
-                }
-            }            
+            arg_pos += reg_info->byte_size;
         }
     }
     
-
     TargetSP target_sp (thread.CalculateTarget());
     Address so_addr;
 
@@ -580,32 +570,13 @@ ABIMacOSX_arm::SetReturnValueObject(lldb::StackFrameSP &frame_sp, lldb::ValueObj
 bool
 ABIMacOSX_arm::CreateFunctionEntryUnwindPlan (UnwindPlan &unwind_plan)
 {
-    uint32_t reg_kind = unwind_plan.GetRegisterKind();
-    uint32_t lr_reg_num = LLDB_INVALID_REGNUM;
-    uint32_t sp_reg_num = LLDB_INVALID_REGNUM;
-    uint32_t pc_reg_num = LLDB_INVALID_REGNUM;
-    
-    switch (reg_kind)
-    {
-        case eRegisterKindDWARF:
-        case eRegisterKindGCC:
-            lr_reg_num = dwarf_lr;
-            sp_reg_num = dwarf_sp;
-            pc_reg_num = dwarf_pc;
-            break;
-            
-        case eRegisterKindGeneric:
-            lr_reg_num = LLDB_REGNUM_GENERIC_RA;
-            sp_reg_num = LLDB_REGNUM_GENERIC_SP;
-            pc_reg_num = LLDB_REGNUM_GENERIC_PC;
-            break;
-    }
-    
-    if (lr_reg_num == LLDB_INVALID_REGNUM ||
-        sp_reg_num == LLDB_INVALID_REGNUM ||
-        pc_reg_num == LLDB_INVALID_REGNUM)
-        return false;
+    unwind_plan.Clear();
+    unwind_plan.SetRegisterKind (eRegisterKindDWARF);
 
+    uint32_t lr_reg_num = dwarf_lr;
+    uint32_t sp_reg_num = dwarf_sp;
+    uint32_t pc_reg_num = dwarf_pc;
+    
     UnwindPlan::RowSP row(new UnwindPlan::Row);
     
     // Our Call Frame Address is the stack pointer value
@@ -626,14 +597,15 @@ ABIMacOSX_arm::CreateFunctionEntryUnwindPlan (UnwindPlan &unwind_plan)
 bool
 ABIMacOSX_arm::CreateDefaultUnwindPlan (UnwindPlan &unwind_plan)
 {
-    uint32_t fp_reg_num = dwarf_r7; // apple uses r7 for all frames. Normal arm uses r11;
+    unwind_plan.Clear ();
+    unwind_plan.SetRegisterKind (eRegisterKindDWARF);
+
+    uint32_t fp_reg_num = dwarf_r7;   // apple uses r7 for all frames. Normal arm uses r11
     uint32_t pc_reg_num = dwarf_pc;
     
     UnwindPlan::RowSP row(new UnwindPlan::Row);
     const int32_t ptr_size = 4;
     
-    unwind_plan.Clear ();
-    unwind_plan.SetRegisterKind (eRegisterKindDWARF);
     row->SetCFARegister (fp_reg_num);
     row->SetCFAOffset (2 * ptr_size);
     row->SetOffset (0);
@@ -649,6 +621,11 @@ ABIMacOSX_arm::CreateDefaultUnwindPlan (UnwindPlan &unwind_plan)
     return true;
 }
 
+// cf. "ARMv6 Function Calling Conventions"
+// https://developer.apple.com/library/ios/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARMv6FunctionCallingConventions.html
+// and "ARMv7 Function Calling Conventions"
+// https://developer.apple.com/library/ios/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARMv7FunctionCallingConventions.html
+
 // ARMv7 on iOS general purpose reg rules:
 //    r0-r3 not preserved  (used for argument passing)
 //    r4-r6 preserved
@@ -672,7 +649,7 @@ ABIMacOSX_arm::RegisterIsVolatile (const RegisterInfo *reg_info)
 {
     if (reg_info)
     {
-        // Volatile registers include: r0, r1, r2, r3, r9, r12, r13
+        // Volatile registers are: r0, r1, r2, r3, r9, r12, r13 (aka sp)
         const char *name = reg_info->name;
         if (name[0] == 'r')
         {
@@ -686,7 +663,7 @@ ABIMacOSX_arm::RegisterIsVolatile (const RegisterInfo *reg_info)
                         return true; // r1
                     case '2':
                     case '3':
-                        return name[2] == '\0'; // r12 - r13
+                        return name[3] == '\0'; // r12, r13 (sp)
                     default:
                         break;
                     }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h b/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h
index 27cea85aaf6..6f7b339e28a 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-arm/ABIMacOSX_arm.h
@@ -30,12 +30,7 @@ public:
                         lldb::addr_t sp,
                         lldb::addr_t func_addr,
                         lldb::addr_t returnAddress, 
-                        lldb::addr_t *arg1_ptr = NULL,
-                        lldb::addr_t *arg2_ptr = NULL,
-                        lldb::addr_t *arg3_ptr = NULL,
-                        lldb::addr_t *arg4_ptr = NULL,
-                        lldb::addr_t *arg5_ptr = NULL,
-                        lldb::addr_t *arg6_ptr = NULL) const;
+                        llvm::ArrayRef<lldb::addr_t> args) const;
     
     virtual bool
     GetArgumentValues (lldb_private::Thread &thread,
diff --git a/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp b/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
index deb531d937a..f360a182e06 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
@@ -235,12 +235,22 @@ ABIMacOSX_i386::GetRedZoneSize () const
 ABISP
 ABIMacOSX_i386::CreateInstance (const ArchSpec &arch)
 {
-    static ABISP g_abi_sp;
+    static ABISP g_abi_mac_sp;
+    static ABISP g_abi_other_sp;
     if (arch.GetTriple().getArch() == llvm::Triple::x86)
     {
-        if (!g_abi_sp)
-            g_abi_sp.reset (new ABIMacOSX_i386);
-        return g_abi_sp;
+        if (arch.GetTriple().isOSDarwin())
+        {
+            if (!g_abi_mac_sp)
+                g_abi_mac_sp.reset (new ABIMacOSX_i386(true));
+            return g_abi_mac_sp;
+        }
+        else
+        {
+            if (!g_abi_other_sp)
+                g_abi_other_sp.reset (new ABIMacOSX_i386(false));
+            return g_abi_other_sp;
+        }
     }
     return ABISP();
 }
@@ -250,12 +260,7 @@ ABIMacOSX_i386::PrepareTrivialCall (Thread &thread,
                                     addr_t sp, 
                                     addr_t func_addr, 
                                     addr_t return_addr, 
-                                    addr_t *arg1_ptr,
-                                    addr_t *arg2_ptr,
-                                    addr_t *arg3_ptr,
-                                    addr_t *arg4_ptr,
-                                    addr_t *arg5_ptr,
-                                    addr_t *arg6_ptr) const
+                                    llvm::ArrayRef<addr_t> args) const
 {
     RegisterContext *reg_ctx = thread.GetRegisterContext().get();
     if (!reg_ctx)
@@ -277,114 +282,25 @@ ABIMacOSX_i386::PrepareTrivialCall (Thread &thread,
     RegisterValue reg_value;
     
     // Write any arguments onto the stack
-    if (arg1_ptr)
-    {
-        sp -= 4;
-        if (arg2_ptr)
-        {
-            sp -= 4;
-            if (arg3_ptr)
-            {
-                sp -= 4;
-                if (arg4_ptr)
-                {
-                    sp -= 4;
-                    if (arg5_ptr)
-                    {
-                        sp -= 4;
-                        if (arg6_ptr)
-                        {
-                            sp -= 4;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
+    sp -= 4 * args.size();
+    
     // Align the SP    
     sp &= ~(16ull-1ull); // 16-byte alignment
     
-    if (arg1_ptr)
+    addr_t arg_pos = sp;
+    
+    for (addr_t arg : args)
     {
-        reg_value.SetUInt32(*arg1_ptr);
-        error = reg_ctx->WriteRegisterValueToMemory (reg_info_32, 
-                                                     sp, 
-                                                     reg_info_32->byte_size, 
+        reg_value.SetUInt32(arg);
+        error = reg_ctx->WriteRegisterValueToMemory (reg_info_32,
+                                                     arg_pos,
+                                                     reg_info_32->byte_size,
                                                      reg_value);
         if (error.Fail())
             return false;
-
-        if (arg2_ptr)
-        {
-            reg_value.SetUInt32(*arg2_ptr);
-            // The register info used to write memory just needs to have the correct
-            // size of a 32 bit register, the actual register it pertains to is not
-            // important, just the size needs to be correct. Here we use "eax"...
-            error = reg_ctx->WriteRegisterValueToMemory (reg_info_32, 
-                                                         sp + 4, 
-                                                         reg_info_32->byte_size, 
-                                                         reg_value);
-            if (error.Fail())
-                return false;
-            
-            if (arg3_ptr)
-            {
-                reg_value.SetUInt32(*arg3_ptr);
-                // The register info used to write memory just needs to have the correct
-                // size of a 32 bit register, the actual register it pertains to is not
-                // important, just the size needs to be correct. Here we use "eax"...
-                error = reg_ctx->WriteRegisterValueToMemory (reg_info_32, 
-                                                             sp + 8, 
-                                                             reg_info_32->byte_size, 
-                                                             reg_value);
-                if (error.Fail())
-                    return false;
-
-                if (arg4_ptr)
-                {
-                    reg_value.SetUInt32(*arg4_ptr);
-                    // The register info used to write memory just needs to have the correct
-                    // size of a 32 bit register, the actual register it pertains to is not
-                    // important, just the size needs to be correct. Here we use "eax"...
-                    error = reg_ctx->WriteRegisterValueToMemory (reg_info_32, 
-                                                                 sp + 12, 
-                                                                 reg_info_32->byte_size, 
-                                                                 reg_value);
-                    if (error.Fail())
-                        return false;
-                    if (arg5_ptr)
-                    {
-                        reg_value.SetUInt32(*arg5_ptr);
-                        // The register info used to write memory just needs to have the correct
-                        // size of a 32 bit register, the actual register it pertains to is not
-                        // important, just the size needs to be correct. Here we use "eax"...
-                        error = reg_ctx->WriteRegisterValueToMemory (reg_info_32, 
-                                                                     sp + 16, 
-                                                                     reg_info_32->byte_size, 
-                                                                     reg_value);
-                        if (error.Fail())
-                            return false;
-                        if (arg6_ptr)
-                        {
-                            reg_value.SetUInt32(*arg6_ptr);
-                            // The register info used to write memory just needs to have the correct
-                            // size of a 32 bit register, the actual register it pertains to is not
-                            // important, just the size needs to be correct. Here we use "eax"...
-                            error = reg_ctx->WriteRegisterValueToMemory (reg_info_32, 
-                                                                         sp + 20, 
-                                                                         reg_info_32->byte_size, 
-                                                                         reg_value);
-                            if (error.Fail())
-                                return false;
-                        }
-                    }
-                }
-            }
-        }
+        arg_pos += 4;
     }
     
-    
     // The return address is pushed onto the stack (yes after we just set the
     // alignment above!).
     sp -= 4;
@@ -823,37 +739,12 @@ ABIMacOSX_i386::GetReturnValueObjectImpl (Thread &thread,
 bool
 ABIMacOSX_i386::CreateFunctionEntryUnwindPlan (UnwindPlan &unwind_plan)
 {
-    uint32_t reg_kind = unwind_plan.GetRegisterKind();
-    uint32_t sp_reg_num = LLDB_INVALID_REGNUM;
-    uint32_t pc_reg_num = LLDB_INVALID_REGNUM;
-    
-    switch (reg_kind)
-    {
-        case eRegisterKindDWARF:
-            sp_reg_num = dwarf_esp;
-            pc_reg_num = dwarf_eip;
-            break;
+    unwind_plan.Clear();
+    unwind_plan.SetRegisterKind (eRegisterKindDWARF);
 
-        case eRegisterKindGCC:
-            sp_reg_num = gcc_esp;
-            pc_reg_num = gcc_eip;
-            break;
-            
-        case eRegisterKindGDB:
-            sp_reg_num = gdb_esp;
-            pc_reg_num = gdb_eip;
-            break;
-            
-        case eRegisterKindGeneric:
-            sp_reg_num = LLDB_REGNUM_GENERIC_SP;
-            pc_reg_num = LLDB_REGNUM_GENERIC_PC;
-            break;
-    }
+    uint32_t sp_reg_num = dwarf_esp;
+    uint32_t pc_reg_num = dwarf_eip;
     
-    if (sp_reg_num == LLDB_INVALID_REGNUM ||
-        pc_reg_num == LLDB_INVALID_REGNUM)
-        return false;
-
     UnwindPlan::RowSP row(new UnwindPlan::Row);
     row->SetCFARegister (sp_reg_num);
     row->SetCFAOffset (4);
@@ -867,6 +758,9 @@ ABIMacOSX_i386::CreateFunctionEntryUnwindPlan (UnwindPlan &unwind_plan)
 bool
 ABIMacOSX_i386::CreateDefaultUnwindPlan (UnwindPlan &unwind_plan)
 {
+    unwind_plan.Clear ();
+    unwind_plan.SetRegisterKind (eRegisterKindDWARF);
+
     uint32_t fp_reg_num = dwarf_ebp;
     uint32_t sp_reg_num = dwarf_esp;
     uint32_t pc_reg_num = dwarf_eip;
@@ -874,15 +768,13 @@ ABIMacOSX_i386::CreateDefaultUnwindPlan (UnwindPlan &unwind_plan)
     UnwindPlan::RowSP row(new UnwindPlan::Row);
     const int32_t ptr_size = 4;
 
-    unwind_plan.Clear ();
-    unwind_plan.SetRegisterKind (eRegisterKindDWARF);
     row->SetCFARegister (fp_reg_num);
     row->SetCFAOffset (2 * ptr_size);
     row->SetOffset (0);
     
     row->SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true);
     row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true);
-    row->SetRegisterLocationToAtCFAPlusOffset(sp_reg_num, ptr_size *  0, true);
+    row->SetRegisterLocationToIsCFAPlusOffset(sp_reg_num, 0, true);
 
     unwind_plan.AppendRow (row);
     unwind_plan.SetSourceName ("i386 default unwind plan");
diff --git a/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h b/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
index 8c2d945e634..a2eee280fa3 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.h
@@ -33,12 +33,7 @@ public:
                         lldb::addr_t sp,
                         lldb::addr_t func_addr,
                         lldb::addr_t return_addr, 
-                        lldb::addr_t *arg1_ptr = NULL,
-                        lldb::addr_t *arg2_ptr = NULL,
-                        lldb::addr_t *arg3_ptr = NULL,
-                        lldb::addr_t *arg4_ptr = NULL,
-                        lldb::addr_t *arg5_ptr = NULL,
-                        lldb::addr_t *arg6_ptr = NULL) const;
+                        llvm::ArrayRef<lldb::addr_t> args) const;
     
     virtual bool
     PrepareNormalCall (lldb_private::Thread &thread,
@@ -79,9 +74,21 @@ public:
     virtual bool
     CallFrameAddressIsValid (lldb::addr_t cfa)
     {
-        // Make sure the stack call frame addresses are are 8 byte aligned
-        if (cfa & (8ull - 1ull))
-            return false;   // Not 8 byte aligned
+        // Darwin call frame addresses must be 16-byte aligned, but other OS's
+        // only need 4-byte alignment.  Otherwise the ABI matches, so we have
+        // this one minor override here.
+        if (target_is_darwin)
+        {
+            // Make sure the stack call frame addresses are are 16 byte aligned
+            if (cfa & (16ull - 1ull))
+                return false;   // Not 16 byte aligned
+        }
+        else
+        {
+            // Make sure the stack call frame addresses are are 4 byte aligned
+            if (cfa & (4ull - 1ull))
+                return false;   // Not 4 byte aligned
+        }
         if (cfa == 0)
             return false;   // Zero is not a valid stack address
         return true;
@@ -132,7 +139,11 @@ protected:
     RegisterIsCalleeSaved (const lldb_private::RegisterInfo *reg_info);
 
 private:
-    ABIMacOSX_i386() : lldb_private::ABI() { } // Call CreateInstance instead.
+    ABIMacOSX_i386(bool is_darwin) : lldb_private::ABI(), 
+                                     target_is_darwin(is_darwin) 
+                                   { } // Call CreateInstance instead.
+
+    bool target_is_darwin;
 };
 
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp b/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
index a904d8b649c..a8ef6a51399 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.cpp
@@ -303,12 +303,7 @@ ABISysV_x86_64::PrepareTrivialCall (Thread &thread,
                                     addr_t sp, 
                                     addr_t func_addr, 
                                     addr_t return_addr, 
-                                    addr_t *arg1_ptr,
-                                    addr_t *arg2_ptr,
-                                    addr_t *arg3_ptr,
-                                    addr_t *arg4_ptr,
-                                    addr_t *arg5_ptr,
-                                    addr_t *arg6_ptr) const
+                                    llvm::ArrayRef<addr_t> args) const
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_EXPRESSIONS));
     
@@ -321,28 +316,8 @@ ABISysV_x86_64::PrepareTrivialCall (Thread &thread,
                     (uint64_t)func_addr,
                     (uint64_t)return_addr);
 
-        if (arg1_ptr)
-        {
-            s.Printf (", arg1 = 0x%" PRIx64, (uint64_t)*arg1_ptr);
-            if (arg2_ptr)
-            {
-                s.Printf (", arg2 = 0x%" PRIx64, (uint64_t)*arg2_ptr);
-                if (arg3_ptr)
-                {
-                    s.Printf (", arg3 = 0x%" PRIx64, (uint64_t)*arg3_ptr);
-                    if (arg4_ptr)
-                    {
-                        s.Printf (", arg4 = 0x%" PRIx64, (uint64_t)*arg4_ptr);
-                        if (arg5_ptr)
-                        {
-                            s.Printf (", arg5 = 0x%" PRIx64, (uint64_t)*arg5_ptr);
-                            if (arg6_ptr)
-                                s.Printf (", arg6 = 0x%" PRIx64, (uint64_t)*arg6_ptr);
-                        }
-                    }
-                }
-            }
-        }
+        for (int i = 0; i < args.size(); ++i)
+            s.Printf (", arg%d = 0x%" PRIx64, i + 1, args[i]);
         s.PutCString (")");
         log->PutCString(s.GetString().c_str());
     }
@@ -352,62 +327,19 @@ ABISysV_x86_64::PrepareTrivialCall (Thread &thread,
         return false;
     
     const RegisterInfo *reg_info = NULL;
-    if (arg1_ptr)
+    
+    if (args.size() > 6) // TODO handle more than 6 arguments
+        return false;
+    
+    for (int i = 0; i < args.size(); ++i)
     {
-        reg_info = reg_ctx->GetRegisterInfoByName("rdi", 0);
+        reg_info = reg_ctx->GetRegisterInfo(eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG1 + i);
         if (log)
-            log->Printf("About to write arg1 (0x%" PRIx64 ") into %s", (uint64_t)*arg1_ptr, reg_info->name);
-
-        if (!reg_ctx->WriteRegisterFromUnsigned (reg_info, *arg1_ptr))
+            log->Printf("About to write arg%d (0x%" PRIx64 ") into %s", i + 1, args[i], reg_info->name);
+        if (!reg_ctx->WriteRegisterFromUnsigned(reg_info, args[i]))
             return false;
-
-        if (arg2_ptr)
-        {
-            reg_info = reg_ctx->GetRegisterInfoByName("rsi", 0);
-            if (log)
-                log->Printf("About to write arg2 (0x%" PRIx64 ") into %s", (uint64_t)*arg2_ptr, reg_info->name);
-            if (!reg_ctx->WriteRegisterFromUnsigned (reg_info, *arg2_ptr))
-                return false;
-
-            if (arg3_ptr)
-            {
-                reg_info = reg_ctx->GetRegisterInfoByName("rdx", 0);
-                if (log)
-                    log->Printf("About to write arg3 (0x%" PRIx64 ") into %s", (uint64_t)*arg3_ptr, reg_info->name);
-                if (!reg_ctx->WriteRegisterFromUnsigned (reg_info, *arg3_ptr))
-                    return false;
-
-                if (arg4_ptr)
-                {
-                    reg_info = reg_ctx->GetRegisterInfoByName("rcx", 0);
-                    if (log)
-                        log->Printf("About to write arg4 (0x%" PRIx64 ") into %s", (uint64_t)*arg4_ptr, reg_info->name);
-                    if (!reg_ctx->WriteRegisterFromUnsigned (reg_info, *arg4_ptr))
-                        return false;
-
-                    if (arg5_ptr)
-                    {
-                        reg_info = reg_ctx->GetRegisterInfoByName("r8", 0);
-                        if (log)
-                            log->Printf("About to write arg5 (0x%" PRIx64 ") into %s", (uint64_t)*arg5_ptr, reg_info->name);
-                        if (!reg_ctx->WriteRegisterFromUnsigned (reg_info, *arg5_ptr))
-                            return false;
-
-                        if (arg6_ptr)
-                        {
-                            reg_info = reg_ctx->GetRegisterInfoByName("r9", 0);
-                            if (log)
-                                log->Printf("About to write arg6 (0x%" PRIx64 ") into %s", (uint64_t)*arg6_ptr, reg_info->name);
-                            if (!reg_ctx->WriteRegisterFromUnsigned (reg_info, *arg6_ptr))
-                                return false;
-                        }
-                    }
-                }
-            }
-        }
     }
 
-
     // First, align the SP
 
     if (log)
@@ -415,32 +347,75 @@ ABISysV_x86_64::PrepareTrivialCall (Thread &thread,
 
     sp &= ~(0xfull); // 16-byte alignment
 
-    // The return address is pushed onto the stack (yes after the alignment...)
     sp -= 8;
 
+    Error error;
+    const RegisterInfo *pc_reg_info = reg_ctx->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_PC);
+    const RegisterInfo *sp_reg_info = reg_ctx->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_SP);
+    ProcessSP process_sp (thread.GetProcess());
+
     RegisterValue reg_value;
-    reg_value.SetUInt64 (return_addr);
 
+#if 0
+    // This code adds an extra frame so that we don't lose the function that we came from
+    // by pushing the PC and the FP and then writing the current FP to point to the FP value
+    // we just pushed. It is disabled for now until the stack backtracing code can be debugged.
+
+    // Save current PC
+    const RegisterInfo *fp_reg_info = reg_ctx->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_FP);
+    if (reg_ctx->ReadRegister(pc_reg_info, reg_value))
+    {
+        if (log)
+            log->Printf("Pushing the current PC onto the stack: 0x%" PRIx64 ": 0x%" PRIx64, (uint64_t)sp, reg_value.GetAsUInt64());
+        
+        if (!process_sp->WritePointerToMemory(sp, reg_value.GetAsUInt64(), error))
+            return false;
+
+        sp -= 8;
+        
+        // Save current FP
+        if (reg_ctx->ReadRegister(fp_reg_info, reg_value))
+        {
+            if (log)
+                log->Printf("Pushing the current FP onto the stack: 0x%" PRIx64 ": 0x%" PRIx64, (uint64_t)sp, reg_value.GetAsUInt64());
+            
+            if (!process_sp->WritePointerToMemory(sp, reg_value.GetAsUInt64(), error))
+                return false;
+        }
+        // Setup FP backchain
+        reg_value.SetUInt64 (sp);
+        
+        if (log)
+            log->Printf("Writing FP:  0x%" PRIx64 " (for FP backchain)", reg_value.GetAsUInt64());
+
+        if (!reg_ctx->WriteRegister(fp_reg_info, reg_value))
+        {
+            return false;
+        }
+        
+        sp -= 8;
+    }
+#endif 
+    
     if (log)
-        log->Printf("Pushing the return address onto the stack: new SP 0x%" PRIx64 ", return address 0x%" PRIx64, (uint64_t)sp, (uint64_t)return_addr);
+        log->Printf("Pushing the return address onto the stack: 0x%" PRIx64 ": 0x%" PRIx64, (uint64_t)sp, (uint64_t)return_addr);
 
-    const RegisterInfo *pc_reg_info = reg_ctx->GetRegisterInfoByName("rip");
-    Error error (reg_ctx->WriteRegisterValueToMemory(pc_reg_info, sp, pc_reg_info->byte_size, reg_value));
-    if (error.Fail())
+    // Save return address onto the stack
+    if (!process_sp->WritePointerToMemory(sp, return_addr, error))
         return false;
 
     // %rsp is set to the actual stack value.
 
     if (log)
-        log->Printf("Writing SP (0x%" PRIx64 ") down", (uint64_t)sp);
+        log->Printf("Writing SP: 0x%" PRIx64, (uint64_t)sp);
     
-    if (!reg_ctx->WriteRegisterFromUnsigned (reg_ctx->GetRegisterInfoByName("rsp"), sp))
+    if (!reg_ctx->WriteRegisterFromUnsigned (sp_reg_info, sp))
         return false;
 
     // %rip is set to the address of the called function.
     
     if (log)
-        log->Printf("Writing new IP (0x%" PRIx64 ") down", (uint64_t)func_addr);
+        log->Printf("Writing IP: 0x%" PRIx64, (uint64_t)func_addr);
 
     if (!reg_ctx->WriteRegisterFromUnsigned (pc_reg_info, func_addr))
         return false;
@@ -506,12 +481,12 @@ ABISysV_x86_64::GetArgumentValues (Thread &thread,
     
     uint32_t argument_register_ids[6];
     
-    argument_register_ids[0] = reg_ctx->GetRegisterInfoByName("rdi", 0)->kinds[eRegisterKindLLDB];
-    argument_register_ids[1] = reg_ctx->GetRegisterInfoByName("rsi", 0)->kinds[eRegisterKindLLDB];
-    argument_register_ids[2] = reg_ctx->GetRegisterInfoByName("rdx", 0)->kinds[eRegisterKindLLDB];
-    argument_register_ids[3] = reg_ctx->GetRegisterInfoByName("rcx", 0)->kinds[eRegisterKindLLDB];
-    argument_register_ids[4] = reg_ctx->GetRegisterInfoByName("r8", 0)->kinds[eRegisterKindLLDB];
-    argument_register_ids[5] = reg_ctx->GetRegisterInfoByName("r9", 0)->kinds[eRegisterKindLLDB];
+    argument_register_ids[0] = reg_ctx->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG1)->kinds[eRegisterKindLLDB];
+    argument_register_ids[1] = reg_ctx->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG2)->kinds[eRegisterKindLLDB];
+    argument_register_ids[2] = reg_ctx->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG3)->kinds[eRegisterKindLLDB];
+    argument_register_ids[3] = reg_ctx->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG4)->kinds[eRegisterKindLLDB];
+    argument_register_ids[4] = reg_ctx->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG5)->kinds[eRegisterKindLLDB];
+    argument_register_ids[5] = reg_ctx->GetRegisterInfo (eRegisterKindGeneric, LLDB_REGNUM_GENERIC_ARG6)->kinds[eRegisterKindLLDB];
     
     unsigned int current_argument_register = 0;
     
@@ -1085,33 +1060,12 @@ ABISysV_x86_64::GetReturnValueObjectImpl (Thread &thread, ClangASTType &return_c
 bool
 ABISysV_x86_64::CreateFunctionEntryUnwindPlan (UnwindPlan &unwind_plan)
 {
-    uint32_t reg_kind = unwind_plan.GetRegisterKind();
-    uint32_t sp_reg_num = LLDB_INVALID_REGNUM;
-    uint32_t pc_reg_num = LLDB_INVALID_REGNUM;
+    unwind_plan.Clear();
+    unwind_plan.SetRegisterKind (eRegisterKindDWARF);
+    
+    uint32_t sp_reg_num = gcc_dwarf_rsp;
+    uint32_t pc_reg_num = gcc_dwarf_rip;
     
-    switch (reg_kind)
-    {
-    case eRegisterKindDWARF:
-    case eRegisterKindGCC:
-        sp_reg_num = gcc_dwarf_rsp;
-        pc_reg_num = gcc_dwarf_rip;
-        break;
-
-    case eRegisterKindGDB:
-        sp_reg_num = gdb_rsp;
-        pc_reg_num = gdb_rip;
-        break;
-
-    case eRegisterKindGeneric:
-        sp_reg_num = LLDB_REGNUM_GENERIC_SP;
-        pc_reg_num = LLDB_REGNUM_GENERIC_PC;
-        break;
-    }
-
-    if (sp_reg_num == LLDB_INVALID_REGNUM ||
-        pc_reg_num == LLDB_INVALID_REGNUM)
-        return false;
-
     UnwindPlan::RowSP row(new UnwindPlan::Row);
     row->SetCFARegister (sp_reg_num);
     row->SetCFAOffset (8);
@@ -1125,48 +1079,23 @@ ABISysV_x86_64::CreateFunctionEntryUnwindPlan (UnwindPlan &unwind_plan)
 bool
 ABISysV_x86_64::CreateDefaultUnwindPlan (UnwindPlan &unwind_plan)
 {
-    uint32_t reg_kind = unwind_plan.GetRegisterKind();
-    uint32_t fp_reg_num = LLDB_INVALID_REGNUM;
-    uint32_t sp_reg_num = LLDB_INVALID_REGNUM;
-    uint32_t pc_reg_num = LLDB_INVALID_REGNUM;
+    unwind_plan.Clear();
+    unwind_plan.SetRegisterKind (eRegisterKindDWARF);
+
+    uint32_t fp_reg_num = gcc_dwarf_rbp;
+    uint32_t sp_reg_num = gcc_dwarf_rsp;
+    uint32_t pc_reg_num = gcc_dwarf_rip;
     
-    switch (reg_kind)
-    {
-        case eRegisterKindDWARF:
-        case eRegisterKindGCC:
-            fp_reg_num = gcc_dwarf_rbp;
-            sp_reg_num = gcc_dwarf_rsp;
-            pc_reg_num = gcc_dwarf_rip;
-            break;
-            
-        case eRegisterKindGDB:
-            fp_reg_num = gdb_rbp;
-            sp_reg_num = gdb_rsp;
-            pc_reg_num = gdb_rip;
-            break;
-            
-        case eRegisterKindGeneric:
-            fp_reg_num = LLDB_REGNUM_GENERIC_FP;
-            sp_reg_num = LLDB_REGNUM_GENERIC_SP;
-            pc_reg_num = LLDB_REGNUM_GENERIC_PC;
-            break;
-    }
-
-    if (fp_reg_num == LLDB_INVALID_REGNUM ||
-        sp_reg_num == LLDB_INVALID_REGNUM ||
-        pc_reg_num == LLDB_INVALID_REGNUM)
-        return false;
-
     UnwindPlan::RowSP row(new UnwindPlan::Row);
 
     const int32_t ptr_size = 8;
-    row->SetCFARegister (LLDB_REGNUM_GENERIC_FP);
+    row->SetCFARegister (gcc_dwarf_rbp);
     row->SetCFAOffset (2 * ptr_size);
     row->SetOffset (0);
     
     row->SetRegisterLocationToAtCFAPlusOffset(fp_reg_num, ptr_size * -2, true);
     row->SetRegisterLocationToAtCFAPlusOffset(pc_reg_num, ptr_size * -1, true);
-    row->SetRegisterLocationToAtCFAPlusOffset(sp_reg_num, ptr_size *  0, true);
+    row->SetRegisterLocationToIsCFAPlusOffset(sp_reg_num, 0, true);
 
     unwind_plan.AppendRow (row);
     unwind_plan.SetSourceName ("x86_64 default unwind plan");
diff --git a/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h b/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h
index b10181960e8..5ccb6e5fa74 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/ABI/SysV-x86_64/ABISysV_x86_64.h
@@ -34,12 +34,7 @@ public:
                         lldb::addr_t sp,
                         lldb::addr_t functionAddress,
                         lldb::addr_t returnAddress, 
-                        lldb::addr_t *arg1_ptr = NULL,
-                        lldb::addr_t *arg2_ptr = NULL,
-                        lldb::addr_t *arg3_ptr = NULL,
-                        lldb::addr_t *arg4_ptr = NULL,
-                        lldb::addr_t *arg5_ptr = NULL,
-                        lldb::addr_t *arg6_ptr = NULL) const;
+                        llvm::ArrayRef<lldb::addr_t> args) const;
     
     virtual bool
     GetArgumentValues (lldb_private::Thread &thread,
@@ -76,9 +71,9 @@ public:
     virtual bool
     CallFrameAddressIsValid (lldb::addr_t cfa)
     {
-        // Make sure the stack call frame addresses are are 8 byte aligned
-        if (cfa & (8ull - 1ull))
-            return false;   // Not 8 byte aligned
+        // Make sure the stack call frame addresses are 16 byte aligned
+        if (cfa & (16ull - 1ull))
+            return false;   // Not 16 byte aligned
         if (cfa == 0)
             return false;   // Zero is not a valid stack address
         return true;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp b/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
index b281f2b4bfc..c8d5f445927 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
@@ -36,7 +36,7 @@
 #include "lldb/Target/Target.h"
 #include "lldb/Target/StackFrame.h"
 
-#include <regex.h>
+#include "lldb/Core/RegularExpression.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -367,20 +367,14 @@ public:
                 }
             }
             
-            if (!s_regex_compiled)
-            {
-                ::regcomp(&s_regex, "[ \t]*([^ ^\t]+)[ \t]*([^ ^\t].*)?", REG_EXTENDED);
-                s_regex_compiled = true;
-            }
+            static RegularExpression s_regex("[ \t]*([^ ^\t]+)[ \t]*([^ ^\t].*)?", REG_EXTENDED);
             
-            ::regmatch_t matches[3];
+            RegularExpression::Match matches(3);
             
-            if (!::regexec(&s_regex, out_string, sizeof(matches) / sizeof(::regmatch_t), matches, 0))
+            if (s_regex.Execute(out_string, &matches))
             {
-                if (matches[1].rm_so != -1)
-                    m_opcode_name.assign(out_string + matches[1].rm_so, matches[1].rm_eo - matches[1].rm_so);
-                if (matches[2].rm_so != -1)
-                    m_mnemonics.assign(out_string + matches[2].rm_so, matches[2].rm_eo - matches[2].rm_so);
+                matches.GetMatchAtIndex(out_string, 1, m_opcode_name);
+                matches.GetMatchAtIndex(out_string, 2, m_mnemonics);
             }
         }
     }
@@ -413,13 +407,9 @@ protected:
     LazyBool                m_does_branch;
     bool                    m_is_valid;
     bool                    m_using_file_addr;
-    
-    static bool             s_regex_compiled;
-    static ::regex_t        s_regex;
 };
 
-bool InstructionLLVMC::s_regex_compiled = false;
-::regex_t InstructionLLVMC::s_regex;
+
 
 DisassemblerLLVMC::LLVMCDisassembler::LLVMCDisassembler (const char *triple, unsigned flavor, DisassemblerLLVMC &owner):
     m_is_valid(true)
@@ -642,9 +632,15 @@ DisassemblerLLVMC::DisassemblerLLVMC (const ArchSpec &arch, const char *flavor_s
     }
     
     // Cortex-M3 devices (e.g. armv7m) can only execute thumb (T2) instructions, 
-    // so hardcode the primary disassembler to thumb mode.
+    // so hardcode the primary disassembler to thumb mode.  Same for Cortex-M4 (armv7em).
+    //
+    // Handle the Cortex-M0 (armv6m) the same; the ISA is a subset of the T and T32
+    // instructions defined in ARMv7-A.  
+
     if (arch.GetTriple().getArch() == llvm::Triple::arm
-        && (arch.GetCore() == ArchSpec::Core::eCore_arm_armv7m || arch.GetCore() == ArchSpec::Core::eCore_arm_armv7em))
+        && (arch.GetCore() == ArchSpec::Core::eCore_arm_armv7m 
+            || arch.GetCore() == ArchSpec::Core::eCore_arm_armv7em
+            || arch.GetCore() == ArchSpec::Core::eCore_arm_armv6m))
     {
         triple = thumb_arch.GetTriple().getTriple().c_str();
     }
@@ -787,7 +783,7 @@ int DisassemblerLLVMC::OpInfo (uint64_t PC,
     default:
         break;
     case 1:
-        bzero (tag_bug, sizeof(::LLVMOpInfo1));
+        memset (tag_bug, 0, sizeof(::LLVMOpInfo1));
         break;
     }
     return 0;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
index 2604ae67016..c079d0fc381 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/AuxVector.cpp
@@ -19,7 +19,7 @@
 #include "lldb/Core/Log.h"
 #include "lldb/Target/Process.h"
 
-#if defined(__linux__) or defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__)
 #include "Plugins/Process/elf-core/ProcessElfCore.h"
 #endif
 
@@ -57,7 +57,7 @@ ParseAuxvEntry(DataExtractor &data,
 DataBufferSP
 AuxVector::GetAuxvData()
 {
-#if defined(__linux__) or defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__)
     if (m_process->GetPluginName() == ProcessElfCore::GetPluginNameStatic())
         return static_cast<ProcessElfCore *>(m_process)->GetAuxvData();
 #endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
index 3e1b52938f4..3c5dcc5222a 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.cpp
@@ -14,6 +14,7 @@
 #include "lldb/Core/Error.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/Module.h"
+#include "lldb/Symbol/Symbol.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
 
@@ -30,17 +31,14 @@ ResolveRendezvousAddress(Process *process)
     addr_t info_location;
     addr_t info_addr;
     Error error;
-    size_t size;
 
     info_location = process->GetImageInfoAddress();
 
     if (info_location == LLDB_INVALID_ADDRESS)
         return LLDB_INVALID_ADDRESS;
 
-    info_addr = 0;
-    size = process->DoReadMemory(info_location, &info_addr,
-                                 process->GetAddressByteSize(), error);
-    if (size != process->GetAddressByteSize() || error.Fail())
+    info_addr = process->ReadPointerFromMemory(info_location, error);
+    if (error.Fail())
         return LLDB_INVALID_ADDRESS;
 
     if (info_addr == 0)
@@ -58,6 +56,8 @@ DYLDRendezvous::DYLDRendezvous(Process *process)
       m_added_soentries(),
       m_removed_soentries()
 {
+    m_thread_info.valid = false;
+
     // Cache a copy of the executable path
     if (m_process)
     {
@@ -88,19 +88,19 @@ DYLDRendezvous::Resolve()
     if (cursor == LLDB_INVALID_ADDRESS)
         return false;
 
-    if (!(cursor = ReadMemory(cursor, &info.version, word_size)))
+    if (!(cursor = ReadWord(cursor, &info.version, word_size)))
         return false;
 
-    if (!(cursor = ReadMemory(cursor + padding, &info.map_addr, address_size)))
+    if (!(cursor = ReadPointer(cursor + padding, &info.map_addr)))
         return false;
 
-    if (!(cursor = ReadMemory(cursor, &info.brk, address_size)))
+    if (!(cursor = ReadPointer(cursor, &info.brk)))
         return false;
 
-    if (!(cursor = ReadMemory(cursor, &info.state, word_size)))
+    if (!(cursor = ReadWord(cursor, &info.state, word_size)))
         return false;
 
-    if (!(cursor = ReadMemory(cursor + padding, &info.ldbase, address_size)))
+    if (!(cursor = ReadPointer(cursor + padding, &info.ldbase)))
         return false;
 
     // The rendezvous was successfully read.  Update our internal state.
@@ -234,16 +234,27 @@ DYLDRendezvous::TakeSnapshot(SOEntryList &entry_list)
 }
 
 addr_t
-DYLDRendezvous::ReadMemory(addr_t addr, void *dst, size_t size)
+DYLDRendezvous::ReadWord(addr_t addr, uint64_t *dst, size_t size)
 {
-    size_t bytes_read;
     Error error;
 
-    bytes_read = m_process->DoReadMemory(addr, dst, size, error);
-    if (bytes_read != size || error.Fail())
+    *dst = m_process->ReadUnsignedIntegerFromMemory(addr, size, 0, error);
+    if (error.Fail())
         return 0;
 
-    return addr + bytes_read;
+    return addr + size;
+}
+
+addr_t
+DYLDRendezvous::ReadPointer(addr_t addr, addr_t *dst)
+{
+    Error error;
+ 
+    *dst = m_process->ReadPointerFromMemory(addr, error);
+    if (error.Fail())
+        return 0;
+
+    return addr + m_process->GetAddressByteSize();
 }
 
 std::string
@@ -275,23 +286,38 @@ DYLDRendezvous::ReadStringFromMemory(addr_t addr)
 bool
 DYLDRendezvous::ReadSOEntryFromMemory(lldb::addr_t addr, SOEntry &entry)
 {
-    size_t address_size = m_process->GetAddressByteSize();
-
     entry.clear();
+
+    entry.link_addr = addr;
     
-    if (!(addr = ReadMemory(addr, &entry.base_addr, address_size)))
+    if (!(addr = ReadPointer(addr, &entry.base_addr)))
+        return false;
+
+    // mips adds an extra load offset field to the link map struct on
+    // FreeBSD and NetBSD (need to validate other OSes).
+    // http://svnweb.freebsd.org/base/head/sys/sys/link_elf.h?revision=217153&view=markup#l57
+    const ArchSpec &arch = m_process->GetTarget().GetArchitecture();
+    if (arch.GetCore() == ArchSpec::eCore_mips64)
+    {
+        assert (arch.GetTriple().getOS() == llvm::Triple::FreeBSD ||
+                arch.GetTriple().getOS() == llvm::Triple::NetBSD);
+        addr_t mips_l_offs;
+        if (!(addr = ReadPointer(addr, &mips_l_offs)))
+            return false;
+        if (mips_l_offs != 0 && mips_l_offs != entry.base_addr)
+            return false;
+    }
+    
+    if (!(addr = ReadPointer(addr, &entry.path_addr)))
         return false;
     
-    if (!(addr = ReadMemory(addr, &entry.path_addr, address_size)))
+    if (!(addr = ReadPointer(addr, &entry.dyn_addr)))
         return false;
     
-    if (!(addr = ReadMemory(addr, &entry.dyn_addr, address_size)))
+    if (!(addr = ReadPointer(addr, &entry.next)))
         return false;
     
-    if (!(addr = ReadMemory(addr, &entry.next, address_size)))
-        return false;
-    
-    if (!(addr = ReadMemory(addr, &entry.prev, address_size)))
+    if (!(addr = ReadPointer(addr, &entry.prev)))
         return false;
     
     entry.path = ReadStringFromMemory(entry.path_addr);
@@ -299,6 +325,51 @@ DYLDRendezvous::ReadSOEntryFromMemory(lldb::addr_t addr, SOEntry &entry)
     return true;
 }
 
+
+bool
+DYLDRendezvous::FindMetadata(const char *name, PThreadField field, uint32_t& value)
+{
+    Target& target = m_process->GetTarget();
+
+    SymbolContextList list;
+    if (!target.GetImages().FindSymbolsWithNameAndType (ConstString(name), eSymbolTypeAny, list))
+        return false;
+
+    Address address = list[0].symbol->GetAddress();
+    addr_t addr = address.GetLoadAddress (&target);
+    if (addr == LLDB_INVALID_ADDRESS)
+        return false;
+
+    Error error;
+    value = (uint32_t)m_process->ReadUnsignedIntegerFromMemory(addr + field*sizeof(uint32_t), sizeof(uint32_t), 0, error);
+    if (error.Fail())
+        return false;
+
+    if (field == eSize)
+        value /= 8; // convert bits to bytes
+
+    return true;
+}
+
+const DYLDRendezvous::ThreadInfo&
+DYLDRendezvous::GetThreadInfo()
+{
+    if (!m_thread_info.valid)
+    {
+        bool ok = true;
+
+        ok &= FindMetadata ("_thread_db_pthread_dtvp", eOffset, m_thread_info.dtv_offset);
+        ok &= FindMetadata ("_thread_db_dtv_dtv", eSize, m_thread_info.dtv_slot_size);
+        ok &= FindMetadata ("_thread_db_link_map_l_tls_modid", eOffset, m_thread_info.modid_offset);
+        ok &= FindMetadata ("_thread_db_dtv_t_pointer_val", eOffset, m_thread_info.tls_offset);
+
+        if (ok)
+            m_thread_info.valid = true;
+    }
+
+    return m_thread_info;
+}
+
 void
 DYLDRendezvous::DumpToLog(Log *log) const
 {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h
index 67e7228a38d..ca008931799 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DYLDRendezvous.h
@@ -48,6 +48,16 @@ class DYLDRendezvous {
     };
 
 public:
+    // Various metadata supplied by the inferior's threading library to describe
+    // the per-thread state.
+    struct ThreadInfo {
+        bool     valid;         // whether we read valid metadata
+        uint32_t dtv_offset;    // offset of DTV pointer within pthread
+        uint32_t dtv_slot_size; // size of one DTV slot
+        uint32_t modid_offset;  // offset of module ID within link_map
+        uint32_t tls_offset;    // offset of TLS pointer within DTV slot
+    };
+
     DYLDRendezvous(lldb_private::Process *process);
 
     /// Update the internal snapshot of runtime linker rendezvous and recompute
@@ -100,6 +110,10 @@ public:
     lldb::addr_t
     GetLDBase() const { return m_current.ldbase; }
 
+    /// @returns the thread layout metadata from the inferiors thread library.
+    const ThreadInfo&
+    GetThreadInfo();
+
     /// @returns true if modules have been loaded into the inferior since the
     /// last call to Resolve().
     bool
@@ -128,6 +142,7 @@ public:
     /// This object is a rough analogue to the struct link_map object which
     /// actually lives in the inferiors memory.
     struct SOEntry {
+        lldb::addr_t link_addr; ///< Address of this link_map.
         lldb::addr_t base_addr; ///< Base address of the loaded object.
         lldb::addr_t path_addr; ///< String naming the shared object.
         lldb::addr_t dyn_addr;  ///< Dynamic section of shared object.
@@ -142,6 +157,7 @@ public:
         }
 
         void clear() {
+            link_addr = 0;
             base_addr = 0;
             path_addr = 0;
             dyn_addr  = 0;
@@ -194,12 +210,22 @@ protected:
     /// Resolve().
     SOEntryList m_removed_soentries;
 
-    /// Reads @p size bytes from the inferiors address space starting at @p
-    /// addr.
+    /// Threading metadata read from the inferior.
+    ThreadInfo  m_thread_info;
+
+    /// Reads an unsigned integer of @p size bytes from the inferior's address
+    /// space starting at @p addr.
     ///
     /// @returns addr + size if the read was successful and false otherwise.
     lldb::addr_t
-    ReadMemory(lldb::addr_t addr, void *dst, size_t size);
+    ReadWord(lldb::addr_t addr, uint64_t *dst, size_t size);
+
+    /// Reads an address from the inferior's address space starting at @p addr.
+    ///
+    /// @returns addr + target address size if the read was successful and
+    /// 0 otherwise.
+    lldb::addr_t
+    ReadPointer(lldb::addr_t addr, lldb::addr_t *dst);
 
     /// Reads a null-terminated C string from the memory location starting at @p
     /// addr.
@@ -225,6 +251,10 @@ protected:
     /// supplied by the runtime linker.
     bool
     TakeSnapshot(SOEntryList &entry_list);
+
+    enum PThreadField { eSize, eNElem, eOffset };
+
+    bool FindMetadata(const char *name, PThreadField field, uint32_t& value);
 };
 
 #endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
index 91c7cd3dfca..284890f3f40 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.cpp
@@ -123,7 +123,7 @@ DynamicLoaderPOSIXDYLD::DidAttach()
     {
         ModuleList module_list;
         module_list.Append(executable);
-        UpdateLoadedSections(executable, load_offset);
+        UpdateLoadedSections(executable, LLDB_INVALID_ADDRESS, load_offset);
         LoadAllCurrentModules();
         m_process->GetTarget().ModulesDidLoad(module_list);
     }
@@ -144,7 +144,7 @@ DynamicLoaderPOSIXDYLD::DidLaunch()
     {
         ModuleList module_list;
         module_list.Append(executable);
-        UpdateLoadedSections(executable, load_offset);
+        UpdateLoadedSections(executable, LLDB_INVALID_ADDRESS, load_offset);
         ProbeEntry();
         m_process->GetTarget().ModulesDidLoad(module_list);
     }
@@ -209,11 +209,15 @@ DynamicLoaderPOSIXDYLD::CanLoadImage()
 }
 
 void
-DynamicLoaderPOSIXDYLD::UpdateLoadedSections(ModuleSP module, addr_t base_addr)
+DynamicLoaderPOSIXDYLD::UpdateLoadedSections(ModuleSP module, addr_t link_map_addr, addr_t base_addr)
 {
-    ObjectFile *obj_file = module->GetObjectFile();
-    SectionList *sections = obj_file->GetSectionList();
     SectionLoadList &load_list = m_process->GetTarget().GetSectionLoadList();
+    const SectionList *sections = GetSectionListFromModule(module);
+
+    assert(sections && "SectionList missing from loaded module.");
+
+    m_loaded_modules[module] = link_map_addr;
+
     const size_t num_sections = sections->GetSize();
 
     for (unsigned i = 0; i < num_sections; ++i)
@@ -233,6 +237,24 @@ DynamicLoaderPOSIXDYLD::UpdateLoadedSections(ModuleSP module, addr_t base_addr)
     }
 }
 
+void
+DynamicLoaderPOSIXDYLD::UnloadSections(const ModuleSP module)
+{
+    SectionLoadList &load_list = m_process->GetTarget().GetSectionLoadList();
+    const SectionList *sections = GetSectionListFromModule(module);
+
+    assert(sections && "SectionList missing from unloaded module.");
+
+    m_loaded_modules.erase(module);
+
+    const size_t num_sections = sections->GetSize();
+    for (size_t i = 0; i < num_sections; ++i)
+    {
+        SectionSP section_sp (sections->GetSectionAtIndex(i));
+        load_list.SetSectionUnloaded(section_sp);
+    }
+}
+
 void
 DynamicLoaderPOSIXDYLD::ProbeEntry()
 {
@@ -242,7 +264,7 @@ DynamicLoaderPOSIXDYLD::ProbeEntry()
     if ((entry = GetEntryPoint()) == LLDB_INVALID_ADDRESS)
         return;
     
-    entry_break = m_process->GetTarget().CreateBreakpoint(entry, true).get();
+    entry_break = m_process->GetTarget().CreateBreakpoint(entry, true, false).get();
     entry_break->SetCallback(EntryBreakpointHit, this, true);
     entry_break->SetBreakpointKind("shared-library-event");
 }
@@ -275,7 +297,7 @@ DynamicLoaderPOSIXDYLD::SetRendezvousBreakpoint()
 
     if (m_dyld_bid == LLDB_INVALID_BREAK_ID)
     {
-        Breakpoint *dyld_break = target.CreateBreakpoint (break_addr, true).get();
+        Breakpoint *dyld_break = target.CreateBreakpoint (break_addr, true, false).get();
         dyld_break->SetCallback(RendezvousBreakpointHit, this, true);
         dyld_break->SetBreakpointKind ("shared-library-event");
         m_dyld_bid = dyld_break->GetID();
@@ -319,10 +341,14 @@ DynamicLoaderPOSIXDYLD::RefreshModules()
         for (I = m_rendezvous.loaded_begin(); I != E; ++I)
         {
             FileSpec file(I->path.c_str(), true);
-            ModuleSP module_sp = LoadModuleAtAddress(file, I->base_addr);
+            ModuleSP module_sp = LoadModuleAtAddress(file, I->link_addr, I->base_addr);
             if (module_sp.get())
+            {
                 loaded_modules.AppendIfNeeded(module_sp);
+                new_modules.Append(module_sp);
+            }
         }
+        m_process->GetTarget().ModulesDidLoad(new_modules);
     }
     
     if (m_rendezvous.ModulesDidUnload())
@@ -336,10 +362,15 @@ DynamicLoaderPOSIXDYLD::RefreshModules()
             ModuleSpec module_spec (file);
             ModuleSP module_sp = 
                 loaded_modules.FindFirstModule (module_spec);
+
             if (module_sp.get())
+            {
                 old_modules.Append(module_sp);
+                UnloadSections(module_sp);
+            }
         }
         loaded_modules.Remove(old_modules);
+        m_process->GetTarget().ModulesDidUnload(old_modules, false);
     }
 }
 
@@ -404,21 +435,54 @@ DynamicLoaderPOSIXDYLD::LoadAllCurrentModules()
     ModuleList module_list;
     
     if (!m_rendezvous.Resolve())
+    {
+        Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER));
+        if (log)
+            log->Printf("DynamicLoaderPOSIXDYLD::%s unable to resolve POSIX DYLD rendezvous address",
+                        __FUNCTION__);
         return;
+    }
+
+    // The rendezvous class doesn't enumerate the main module, so track
+    // that ourselves here.
+    ModuleSP executable = GetTargetExecutable();
+    m_loaded_modules[executable] = m_rendezvous.GetLinkMapAddress();
+
 
     for (I = m_rendezvous.begin(), E = m_rendezvous.end(); I != E; ++I)
     {
-        FileSpec file(I->path.c_str(), false);
-        ModuleSP module_sp = LoadModuleAtAddress(file, I->base_addr);
+        const char *module_path = I->path.c_str();
+        FileSpec file(module_path, false);
+        ModuleSP module_sp = LoadModuleAtAddress(file, I->link_addr, I->base_addr);
+#ifdef __FreeBSD__ // llvm.org/pr17880
+        if (module_sp == executable)
+        {
+            Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER));
+            if (log)
+                log->Printf("DynamicLoaderPOSIXDYLD::%s reloading main module, ignoring rendezvous base addr %" PRIx64,
+                            __FUNCTION__, I->base_addr);
+            ModuleSP module_sp = LoadModuleAtAddress(file, I->link_addr, 0);
+        }
+#endif
+ 
         if (module_sp.get())
+        {
             module_list.Append(module_sp);
+        }
+        else
+        {
+            Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER));
+            if (log)
+                log->Printf("DynamicLoaderPOSIXDYLD::%s failed loading module %s at 0x%" PRIx64,
+                            __FUNCTION__, module_path, I->base_addr);
+        }
     }
 
     m_process->GetTarget().ModulesDidLoad(module_list);
 }
 
 ModuleSP
-DynamicLoaderPOSIXDYLD::LoadModuleAtAddress(const FileSpec &file, addr_t base_addr)
+DynamicLoaderPOSIXDYLD::LoadModuleAtAddress(const FileSpec &file, addr_t link_map_addr, addr_t base_addr)
 {
     Target &target = m_process->GetTarget();
     ModuleList &modules = target.GetImages();
@@ -427,11 +491,11 @@ DynamicLoaderPOSIXDYLD::LoadModuleAtAddress(const FileSpec &file, addr_t base_ad
     ModuleSpec module_spec (file, target.GetArchitecture());
     if ((module_sp = modules.FindFirstModule (module_spec))) 
     {
-        UpdateLoadedSections(module_sp, base_addr);
+        UpdateLoadedSections(module_sp, link_map_addr, base_addr);
     }
     else if ((module_sp = target.GetSharedModule(module_spec))) 
     {
-        UpdateLoadedSections(module_sp, base_addr);
+        UpdateLoadedSections(module_sp, link_map_addr, base_addr);
     }
 
     return module_sp;
@@ -479,3 +543,83 @@ DynamicLoaderPOSIXDYLD::GetEntryPoint()
     m_entry_point = static_cast<addr_t>(I->value);
     return m_entry_point;
 }
+
+const SectionList *
+DynamicLoaderPOSIXDYLD::GetSectionListFromModule(const ModuleSP module) const
+{
+    SectionList *sections = nullptr;
+    if (module.get())
+    {
+        ObjectFile *obj_file = module->GetObjectFile();
+        if (obj_file)
+        {
+            sections = obj_file->GetSectionList();
+        }
+    }
+    return sections;
+}
+
+static int ReadInt(Process *process, addr_t addr)
+{
+    Error error;
+    int value = (int)process->ReadUnsignedIntegerFromMemory(addr, sizeof(uint32_t), 0, error);
+    if (error.Fail())
+        return -1;
+    else
+        return value;
+}
+
+static addr_t ReadPointer(Process *process, addr_t addr)
+{
+    Error error;
+    addr_t value = process->ReadPointerFromMemory(addr, error);
+    if (error.Fail())
+        return LLDB_INVALID_ADDRESS;
+    else
+        return value;
+}
+
+lldb::addr_t
+DynamicLoaderPOSIXDYLD::GetThreadLocalData (const lldb::ModuleSP module, const lldb::ThreadSP thread)
+{
+    auto it = m_loaded_modules.find (module);
+    if (it == m_loaded_modules.end())
+        return LLDB_INVALID_ADDRESS;
+
+    addr_t link_map = it->second;
+    if (link_map == LLDB_INVALID_ADDRESS)
+        return LLDB_INVALID_ADDRESS;
+
+    const DYLDRendezvous::ThreadInfo &metadata = m_rendezvous.GetThreadInfo();
+    if (!metadata.valid)
+        return LLDB_INVALID_ADDRESS;
+
+    // Get the thread pointer.
+    addr_t tp = thread->GetThreadPointer ();
+    if (tp == LLDB_INVALID_ADDRESS)
+        return LLDB_INVALID_ADDRESS;
+
+    // Find the module's modid.
+    int modid = ReadInt (m_process, link_map + metadata.modid_offset);
+    if (modid == -1)
+        return LLDB_INVALID_ADDRESS;
+
+    // Lookup the DTV stucture for this thread.
+    addr_t dtv_ptr = tp + metadata.dtv_offset;
+    addr_t dtv = ReadPointer (m_process, dtv_ptr);
+    if (dtv == LLDB_INVALID_ADDRESS)
+        return LLDB_INVALID_ADDRESS;
+
+    // Find the TLS block for this module.
+    addr_t dtv_slot = dtv + metadata.dtv_slot_size*modid;
+    addr_t tls_block = ReadPointer (m_process, dtv_slot + metadata.tls_offset);
+
+    Module *mod = module.get();
+    Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_DYNAMIC_LOADER));
+    if (log)
+        log->Printf("DynamicLoaderPOSIXDYLD::Performed TLS lookup: "
+                    "module=%s, link_map=0x%" PRIx64 ", tp=0x%" PRIx64 ", modid=%i, tls_block=0x%" PRIx64 "\n",
+                    mod->GetObjectName().AsCString(""), link_map, tp, modid, tls_block);
+
+    return tls_block;
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h
index 0476e45d046..7997b34195a 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h
@@ -61,6 +61,9 @@ public:
     virtual lldb_private::Error
     CanLoadImage();
 
+    virtual lldb::addr_t
+    GetThreadLocalData (const lldb::ModuleSP module, const lldb::ThreadSP thread);
+
     //------------------------------------------------------------------
     // PluginInterface protocol
     //------------------------------------------------------------------
@@ -95,6 +98,9 @@ protected:
     /// Rendezvous breakpoint.
     lldb::break_id_t m_dyld_bid;
 
+    /// Loaded module list. (link map for each module)
+    std::map<lldb::ModuleWP, lldb::addr_t, std::owner_less<lldb::ModuleWP>> m_loaded_modules;
+
     /// Enables a breakpoint on a function called by the runtime
     /// linker each time a module is loaded or unloaded.
     void
@@ -117,15 +123,24 @@ protected:
     ///
     /// @param module The module to traverse.
     ///
+    /// @param link_map_addr The virtual address of the link map for the @p module.
+    ///
     /// @param base_addr The virtual base address @p module is loaded at.
     void
-    UpdateLoadedSections(lldb::ModuleSP module, 
-                         lldb::addr_t base_addr = 0);
+    UpdateLoadedSections(lldb::ModuleSP module,
+                         lldb::addr_t link_map_addr,
+                         lldb::addr_t base_addr);
+
+    /// Removes the loaded sections from the target in @p module.
+    ///
+    /// @param module The module to traverse.
+    void
+    UnloadSections(const lldb::ModuleSP module);
 
     /// Locates or creates a module given by @p file and updates/loads the
     /// resulting module at the virtual base address @p base_addr.
     lldb::ModuleSP
-    LoadModuleAtAddress(const lldb_private::FileSpec &file, lldb::addr_t base_addr);
+    LoadModuleAtAddress(const lldb_private::FileSpec &file, lldb::addr_t link_map_addr, lldb::addr_t base_addr);
 
     /// Resolves the entry point for the current inferior process and sets a
     /// breakpoint at that address.
@@ -165,6 +180,9 @@ protected:
 
 private:
     DISALLOW_COPY_AND_ASSIGN(DynamicLoaderPOSIXDYLD);
+
+    const lldb_private::SectionList *
+    GetSectionListFromModule(const lldb::ModuleSP module) const;
 };
 
 #endif  // liblldb_DynamicLoaderPOSIXDYLD_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp b/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
index 52a7fb0e8ee..181b7ba0968 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
@@ -196,7 +196,7 @@ EmulateInstructionARM::GetPluginDescriptionStatic ()
 EmulateInstruction *
 EmulateInstructionARM::CreateInstance (const ArchSpec &arch, InstructionType inst_type)
 {
-    if (EmulateInstructionARM::SupportsEmulatingIntructionsOfTypeStatic(inst_type))
+    if (EmulateInstructionARM::SupportsEmulatingInstructionsOfTypeStatic(inst_type))
     {
         if (arch.GetTriple().getArch() == llvm::Triple::arm)
         {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h b/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
index b926dc0deb4..81e78847a1f 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.h
@@ -1,4 +1,4 @@
-//===-- lldb_EmulateInstructionARM.h ------------------------------------*- C++ -*-===//
+//===-- lldb_EmulateInstructionARM.h ----------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -79,7 +79,7 @@ public:
                     InstructionType inst_type);
     
     static bool
-    SupportsEmulatingIntructionsOfTypeStatic (InstructionType inst_type)
+    SupportsEmulatingInstructionsOfTypeStatic (InstructionType inst_type)
     {
         switch (inst_type)
         {
@@ -149,9 +149,9 @@ public:
 //    }
     
     virtual bool
-    SupportsEmulatingIntructionsOfType (InstructionType inst_type)
+    SupportsEmulatingInstructionsOfType (InstructionType inst_type)
     {
-        return SupportsEmulatingIntructionsOfTypeStatic (inst_type);
+        return SupportsEmulatingInstructionsOfTypeStatic (inst_type);
     }
 
     virtual bool
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulationStateARM.h b/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulationStateARM.h
index 8d84abc7561..ad596a3c277 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulationStateARM.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulationStateARM.h
@@ -80,7 +80,7 @@ public:
                          const lldb_private::RegisterValue &reg_value);
 private:
     uint32_t m_gpr[17];
-    struct sd_regs
+    struct _sd_regs
     {
         union 
         {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp b/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
index 247d7b0e7fe..f3c2d63729a 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.cpp
@@ -402,7 +402,7 @@ ItaniumABILanguageRuntime::CreateExceptionBreakpoint (bool catch_bp,
     FileSpecList filter_modules;
     BreakpointResolverSP exception_resolver_sp = CreateExceptionResolver (NULL, catch_bp, throw_bp, for_expressions);
     SearchFilterSP filter_sp (CreateExceptionSearchFilter ());
-    return target.CreateBreakpoint (filter_sp, exception_resolver_sp, is_internal);
+    return target.CreateBreakpoint (filter_sp, exception_resolver_sp, is_internal, false);
 }
 
 void
@@ -444,6 +444,12 @@ ItaniumABILanguageRuntime::ClearExceptionBreakpoints ()
     }    
 }
 
+bool
+ItaniumABILanguageRuntime::ExceptionBreakpointsAreSet ()
+{
+    return m_cxx_exception_bp_sp && m_cxx_exception_bp_sp->IsEnabled();
+}
+
 bool
 ItaniumABILanguageRuntime::ExceptionBreakpointsExplainStop (lldb::StopInfoSP stop_reason)
 {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h b/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
index 6b2c437de25..cd0a4b2c15e 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h
@@ -70,6 +70,9 @@ namespace lldb_private {
         virtual void
         ClearExceptionBreakpoints ();
         
+        virtual bool
+        ExceptionBreakpointsAreSet ();
+        
         virtual bool
         ExceptionBreakpointsExplainStop (lldb::StopInfoSP stop_reason);
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp b/contrib/llvm/tools/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
index 1ec5f3d733a..32574e3ef2f 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/ObjectContainer/BSD-Archive/ObjectContainerBSDArchive.cpp
@@ -9,7 +9,24 @@
 
 #include "ObjectContainerBSDArchive.h"
 
+#ifdef _WIN32
+// Defines from ar, missing on Windows
+#define ARMAG   "!<arch>\n"
+#define SARMAG  8
+#define ARFMAG  "`\n"
+
+typedef struct ar_hdr
+{
+    char ar_name[16];
+    char ar_date[12];
+    char ar_uid[6], ar_gid[6];
+    char ar_mode[8];
+    char ar_size[10];
+    char ar_fmag[2];
+} ar_hdr;
+#else
 #include <ar.h>
+#endif
 
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/DataBuffer.h"
@@ -444,7 +461,7 @@ ObjectContainerBSDArchive::Dump (Stream *s) const
     s->Indent();
     const size_t num_archs = GetNumArchitectures();
     const size_t num_objects = GetNumObjects();
-    s->Printf("ObjectContainerBSDArchive, num_archs = %lu, num_objects = %lu", num_archs, num_objects);
+    s->Printf("ObjectContainerBSDArchive, num_archs = %zu, num_objects = %zu", num_archs, num_objects);
     uint32_t i;
     ArchSpec arch;
     s->IndentMore();
diff --git a/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index 2e9f6903280..7bdacfe14cd 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -16,12 +16,15 @@
 #include "lldb/Core/DataBuffer.h"
 #include "lldb/Core/Error.h"
 #include "lldb/Core/FileSpecList.h"
+#include "lldb/Core/Log.h"
 #include "lldb/Core/Module.h"
 #include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/PluginManager.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Core/Stream.h"
+#include "lldb/Symbol/DWARFCallFrameInfo.h"
 #include "lldb/Symbol/SymbolContext.h"
+#include "lldb/Target/Target.h"
 #include "lldb/Host/Host.h"
 
 #include "llvm/ADT/PointerUnion.h"
@@ -141,6 +144,44 @@ ELFRelocation::RelocSymbol64(const ELFRelocation &rel)
 
 } // end anonymous namespace
 
+bool
+ELFNote::Parse(const DataExtractor &data, lldb::offset_t *offset)
+{
+    // Read all fields.
+    if (data.GetU32(offset, &n_namesz, 3) == NULL)
+        return false;
+
+    // The name field is required to be nul-terminated, and n_namesz
+    // includes the terminating nul in observed implementations (contrary
+    // to the ELF-64 spec).  A special case is needed for cores generated
+    // by some older Linux versions, which write a note named "CORE"
+    // without a nul terminator and n_namesz = 4.
+    if (n_namesz == 4)
+    {
+        char buf[4];
+        if (data.ExtractBytes (*offset, 4, data.GetByteOrder(), buf) != 4)
+            return false;
+        if (strncmp (buf, "CORE", 4) == 0)
+        {
+            n_name = "CORE";
+            *offset += 4;
+            return true;
+        }
+    }
+
+    const char *cstr = data.GetCStr(offset, llvm::RoundUpToAlignment (n_namesz, 4));
+    if (cstr == NULL)
+    {
+        Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_SYMBOLS));
+        if (log)
+            log->Printf("Failed to parse note name lacking nul terminator");
+
+        return false;
+    }
+    n_name = cstr;
+    return true;
+}
+
 //------------------------------------------------------------------
 // Static methods.
 //------------------------------------------------------------------
@@ -514,7 +555,7 @@ ObjectFileELF::GetDependentModules(FileSpecList &files)
 }
 
 Address
-ObjectFileELF::GetImageInfoAddress()
+ObjectFileELF::GetImageInfoAddress(Target *target)
 {
     if (!ParseDynamicSymbols())
         return Address();
@@ -545,6 +586,17 @@ ObjectFileELF::GetImageInfoAddress()
             addr_t offset = i * dynsym_hdr->sh_entsize + GetAddressByteSize();
             return Address(dynsym_section_sp, offset);
         }
+        else if (symbol.d_tag == DT_MIPS_RLD_MAP && target)
+        {
+            addr_t offset = i * dynsym_hdr->sh_entsize + GetAddressByteSize();
+            addr_t dyn_base = dynsym_section_sp->GetLoadBaseAddress(target);
+            if (dyn_base == LLDB_INVALID_ADDRESS)
+                return Address();
+            Address addr;
+            Error error;
+            if (target->ReadPointerFromMemory(dyn_base + offset, false, error, addr))
+                return addr;
+        }
     }
 
     return Address();
@@ -672,42 +724,26 @@ ParseNoteGNUBuildID(DataExtractor &data, lldb_private::UUID &uuid)
 {
     // Try to parse the note section (ie .note.gnu.build-id|.notes|.note|...) and get the build id.
     // BuildID documentation: https://fedoraproject.org/wiki/Releases/FeatureBuildId
-    struct
-    {
-        uint32_t name_len;  // Length of note name
-        uint32_t desc_len;  // Length of note descriptor
-        uint32_t type;      // Type of note (1 is ABI_TAG, 3 is BUILD_ID)
-    } notehdr;
     lldb::offset_t offset = 0;
     static const uint32_t g_gnu_build_id = 3; // NT_GNU_BUILD_ID from elf.h
 
     while (true)
     {
-        if (data.GetU32 (&offset, &notehdr, 3) == NULL)
+        ELFNote note = ELFNote();
+        if (!note.Parse(data, &offset))
             return false;
 
-        notehdr.name_len = llvm::RoundUpToAlignment (notehdr.name_len, 4);
-        notehdr.desc_len = llvm::RoundUpToAlignment (notehdr.desc_len, 4);
-
-        lldb::offset_t offset_next_note = offset + notehdr.name_len + notehdr.desc_len;
-
         // 16 bytes is UUID|MD5, 20 bytes is SHA1
-        if ((notehdr.type == g_gnu_build_id) && (notehdr.name_len == 4) &&
-            (notehdr.desc_len == 16 || notehdr.desc_len == 20))
+        if (note.n_name == "GNU" && (note.n_type == g_gnu_build_id) &&
+            (note.n_descsz == 16 || note.n_descsz == 20))
         {
-            char name[4];
-            if (data.GetU8 (&offset, name, 4) == NULL)
+            uint8_t uuidbuf[20]; 
+            if (data.GetU8 (&offset, &uuidbuf, note.n_descsz) == NULL)
                 return false;
-            if (!strcmp(name, "GNU"))
-            {
-                uint8_t uuidbuf[20]; 
-                if (data.GetU8 (&offset, &uuidbuf, notehdr.desc_len) == NULL)
-                    return false;
-                uuid.SetBytes (uuidbuf, notehdr.desc_len);
-                return true;
-            }
+            uuid.SetBytes (uuidbuf, note.n_descsz);
+            return true;
         }
-        offset = offset_next_note;
+        offset += llvm::RoundUpToAlignment(note.n_descsz, 4);
     }
     return false;
 }
@@ -1280,6 +1316,11 @@ ObjectFileELF::FindDynamicSymbol(unsigned tag)
 unsigned
 ObjectFileELF::PLTRelocationType()
 {
+    // DT_PLTREL
+    //  This member specifies the type of relocation entry to which the
+    //  procedure linkage table refers. The d_val member holds DT_REL or
+    //  DT_RELA, as appropriate. All relocations in a procedure linkage table
+    //  must use the same relocation.
     const ELFDynamic *symbol = FindDynamicSymbol(DT_PLTREL);
 
     if (symbol)
@@ -1304,7 +1345,10 @@ ParsePLTRelocations(Symtab *symbol_table,
     ELFRelocation rel(rel_type);
     ELFSymbol symbol;
     lldb::offset_t offset = 0;
-    const elf_xword plt_entsize = plt_hdr->sh_entsize;
+    // Clang 3.3 sets entsize to 4 for 32-bit binaries, but the plt entries are 16 bytes.
+    // So round the entsize up by the alignment if addralign is set.
+    const elf_xword plt_entsize = plt_hdr->sh_addralign ?
+        llvm::RoundUpToAlignment (plt_hdr->sh_entsize, plt_hdr->sh_addralign) : plt_hdr->sh_entsize;
     const elf_xword num_relocations = rel_hdr->sh_size / rel_hdr->sh_entsize;
 
     typedef unsigned (*reloc_info_fn)(const ELFRelocation &rel);
@@ -1479,10 +1523,17 @@ ObjectFileELF::GetSymtab()
         if (symtab)
             symbol_id += ParseSymbolTable (m_symtab_ap.get(), symbol_id, symtab);
 
-        // Synthesize trampoline symbols to help navigate the PLT.
+        // DT_JMPREL
+        //      If present, this entry's d_ptr member holds the address of relocation
+        //      entries associated solely with the procedure linkage table. Separating
+        //      these relocation entries lets the dynamic linker ignore them during
+        //      process initialization, if lazy binding is enabled. If this entry is
+        //      present, the related entries of types DT_PLTRELSZ and DT_PLTREL must
+        //      also be present.
         const ELFDynamic *symbol = FindDynamicSymbol(DT_JMPREL);
         if (symbol)
         {
+            // Synthesize trampoline symbols to help navigate the PLT.
             addr_t addr = symbol->d_ptr;
             Section *reloc_section = section_list->FindSectionContainingFileAddress(addr).get();
             if (reloc_section) 
@@ -1498,6 +1549,57 @@ ObjectFileELF::GetSymtab()
     return m_symtab_ap.get();
 }
 
+Symbol *
+ObjectFileELF::ResolveSymbolForAddress(const Address& so_addr, bool verify_unique)
+{
+    if (!m_symtab_ap.get())
+        return nullptr; // GetSymtab() should be called first.
+
+    const SectionList *section_list = GetSectionList();
+    if (!section_list)
+        return nullptr;
+
+    if (DWARFCallFrameInfo *eh_frame = GetUnwindTable().GetEHFrameInfo())
+    {
+        AddressRange range;
+        if (eh_frame->GetAddressRange (so_addr, range))
+        {
+            const addr_t file_addr = range.GetBaseAddress().GetFileAddress();
+            Symbol * symbol = verify_unique ? m_symtab_ap->FindSymbolContainingFileAddress(file_addr) : nullptr;
+            if (symbol)
+                return symbol;
+
+            // Note that a (stripped) symbol won't be found by GetSymtab()...
+            lldb::SectionSP eh_sym_section_sp = section_list->FindSectionContainingFileAddress(file_addr);
+            if (eh_sym_section_sp.get())
+            {
+                addr_t section_base = eh_sym_section_sp->GetFileAddress();
+                addr_t offset = file_addr - section_base;
+                uint64_t symbol_id = m_symtab_ap->GetNumSymbols();
+
+                Symbol eh_symbol(
+                        symbol_id,            // Symbol table index.
+                        "???",                // Symbol name.
+                        false,                // Is the symbol name mangled?
+                        eSymbolTypeCode,      // Type of this symbol.
+                        true,                 // Is this globally visible?
+                        false,                // Is this symbol debug info?
+                        false,                // Is this symbol a trampoline?
+                        true,                 // Is this symbol artificial?
+                        eh_sym_section_sp,    // Section in which this symbol is defined or null.
+                        offset,               // Offset in section or symbol value.
+                        range.GetByteSize(),  // Size in bytes of this symbol.
+                        true,                 // Size is valid.
+                        0);                   // Symbol flags.
+                if (symbol_id == m_symtab_ap->AddSymbol(eh_symbol))
+                    return m_symtab_ap->SymbolAtIndex(symbol_id);
+            }
+        }
+    }
+    return nullptr;
+}
+
+
 bool
 ObjectFileELF::IsStripped ()
 {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h b/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
index 2365101f427..a2ab9b8f370 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.h
@@ -20,6 +20,34 @@
 
 #include "ELFHeader.h"
 
+struct ELFNote
+{
+    elf::elf_word n_namesz;
+    elf::elf_word n_descsz;
+    elf::elf_word n_type;
+
+    std::string n_name;
+
+    ELFNote() : n_namesz(0), n_descsz(0), n_type(0)
+    {
+    }
+
+    /// Parse an ELFNote entry from the given DataExtractor starting at position
+    /// \p offset.
+    ///
+    /// @param[in] data
+    ///    The DataExtractor to read from.
+    ///
+    /// @param[in,out] offset
+    ///    Pointer to an offset in the data.  On return the offset will be
+    ///    advanced by the number of bytes read.
+    ///
+    /// @return
+    ///    True if the ELFRel entry was successfully read and false otherwise.
+    bool
+    Parse(const lldb_private::DataExtractor &data, lldb::offset_t *offset);
+};
+
 //------------------------------------------------------------------------------
 /// @class ObjectFileELF
 /// @brief Generic ELF object file reader.
@@ -102,6 +130,9 @@ public:
     virtual lldb_private::Symtab *
     GetSymtab();
 
+    virtual lldb_private::Symbol *
+    ResolveSymbolForAddress(const lldb_private::Address& so_addr, bool verify_unique);
+
     virtual bool
     IsStripped ();
 
@@ -124,7 +155,7 @@ public:
     GetDependentModules(lldb_private::FileSpecList& files);
 
     virtual lldb_private::Address
-    GetImageInfoAddress();
+    GetImageInfoAddress(lldb_private::Target *target);
     
     virtual lldb_private::Address
     GetEntryPointAddress ();
diff --git a/contrib/llvm/tools/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp b/contrib/llvm/tools/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
index 4cfe38e5840..37b32419735 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/OperatingSystem/Python/OperatingSystemPython.cpp
@@ -144,7 +144,7 @@ OperatingSystemPython::GetDynamicRegisterInfo ()
         if (!dictionary)
             return NULL;
         
-        m_register_info_ap.reset (new DynamicRegisterInfo (dictionary));
+        m_register_info_ap.reset (new DynamicRegisterInfo (dictionary, m_process->GetTarget().GetArchitecture().GetByteOrder()));
         assert (m_register_info_ap->GetNumRegisters() > 0);
         assert (m_register_info_ap->GetNumRegisterSets() > 0);
     }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp b/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
index dc0917255d9..da29c16ac3a 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.cpp
@@ -10,10 +10,13 @@
 #include "lldb/lldb-python.h"
 
 #include "PlatformFreeBSD.h"
+#include "lldb/Host/Config.h"
 
 // C Includes
 #include <stdio.h>
+#ifndef LLDB_DISABLE_POSIX
 #include <sys/utsname.h>
+#endif
 
 // C++ Includes
 // Other libraries and framework includes
@@ -153,6 +156,26 @@ PlatformFreeBSD::~PlatformFreeBSD()
 {
 }
 
+//TODO:VK: inherit PlatformPOSIX
+lldb_private::Error
+PlatformFreeBSD::RunShellCommand (const char *command,
+                                  const char *working_dir,
+                                  int *status_ptr,
+                                  int *signo_ptr,
+                                  std::string *command_output,
+                                  uint32_t timeout_sec)
+{
+    if (IsHost())
+        return Host::RunShellCommand(command, working_dir, status_ptr, signo_ptr, command_output, timeout_sec);
+    else
+    {
+        if (m_remote_platform_sp)
+            return m_remote_platform_sp->RunShellCommand(command, working_dir, status_ptr, signo_ptr, command_output, timeout_sec);
+        else
+            return Error("unable to run a remote command without a platform");
+    }
+}
+
 
 Error
 PlatformFreeBSD::ResolveExecutable (const FileSpec &exe_file,
@@ -162,10 +185,10 @@ PlatformFreeBSD::ResolveExecutable (const FileSpec &exe_file,
 {
     Error error;
     // Nothing special to do here, just use the actual file and architecture
-
+    
     char exe_path[PATH_MAX];
     FileSpec resolved_exe_file (exe_file);
-
+    
     if (IsHost())
     {
         // If we have "ls" as the exe_file, resolve the executable location based on
@@ -175,10 +198,10 @@ PlatformFreeBSD::ResolveExecutable (const FileSpec &exe_file,
             exe_file.GetPath(exe_path, sizeof(exe_path));
             resolved_exe_file.SetFile(exe_path, true);
         }
-
+        
         if (!resolved_exe_file.Exists())
             resolved_exe_file.ResolveExecutableLocation ();
-
+        
         if (resolved_exe_file.Exists())
             error.Clear();
         else
@@ -214,7 +237,6 @@ PlatformFreeBSD::ResolveExecutable (const FileSpec &exe_file,
         }
     }
 
-
     if (error.Success())
     {
         ModuleSpec module_spec (resolved_exe_file, exe_arch);
@@ -225,7 +247,7 @@ PlatformFreeBSD::ResolveExecutable (const FileSpec &exe_file,
                                                  module_search_paths_ptr,
                                                  NULL,
                                                  NULL);
-
+            
             if (!exe_module_sp || exe_module_sp->GetObjectFile() == NULL)
             {
                 exe_module_sp.reset();
@@ -256,12 +278,12 @@ PlatformFreeBSD::ResolveExecutable (const FileSpec &exe_file,
                     else
                         error.SetErrorToGenericError();
                 }
-
+                
                 if (idx > 0)
                     arch_names.PutCString (", ");
                 arch_names.PutCString (platform_arch.GetArchitectureName());
             }
-
+            
             if (error.Fail() || !exe_module_sp)
             {
                 error.SetErrorStringWithFormat ("'%s' doesn't contain any '%s' platform architectures: %s",
@@ -271,11 +293,6 @@ PlatformFreeBSD::ResolveExecutable (const FileSpec &exe_file,
             }
         }
     }
-    else
-    {
-        error.SetErrorStringWithFormat ("'%s' does not exist",
-                                        exe_file.GetPath().c_str());
-    }
 
     return error;
 }
@@ -636,13 +653,23 @@ PlatformFreeBSD::GetSupportedArchitectureAtIndex (uint32_t idx, ArchSpec &arch)
 void
 PlatformFreeBSD::GetStatus (Stream &strm)
 {
+#ifndef LLDB_DISABLE_POSIX
     struct utsname un;
 
-    if (uname(&un)) {
-        strm << "FreeBSD";
-        return;
-    }
+    strm << "      Host: ";
 
+    ::memset(&un, 0, sizeof(utsname));
+    if (uname(&un) == -1)
+        strm << "FreeBSD" << '\n';
+
+    strm << un.sysname << ' ' << un.release;
+    if (un.nodename[0] != '\0')
+        strm << " (" << un.nodename << ')';
+    strm << '\n';
+
+    // Dump a common information about the platform status.
     strm << "Host: " << un.sysname << ' ' << un.release << ' ' << un.version << '\n';
+#endif
+
     Platform::GetStatus(strm);
 }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h b/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
index 4aa158eb6e8..11d1cd60977 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Platform/FreeBSD/PlatformFreeBSD.h
@@ -71,6 +71,14 @@ public:
     //------------------------------------------------------------
     // lldb_private::Platform functions
     //------------------------------------------------------------
+    virtual lldb_private::Error
+    RunShellCommand (const char *command,
+                     const char *working_dir,
+                     int *status_ptr,
+                     int *signo_ptr,
+                     std::string *command_output,
+                     uint32_t timeout_sec);
+
     virtual lldb_private::Error
     ResolveExecutable (const lldb_private::FileSpec &exe_file,
                        const lldb_private::ArchSpec &arch,
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp b/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
new file mode 100644
index 00000000000..b5f92dcc3dc
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.cpp
@@ -0,0 +1,591 @@
+//===-- PlatformPOSIX.cpp ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "PlatformPOSIX.h"
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+// Project includes
+
+#include "lldb/Core/DataBufferHeap.h"
+#include "lldb/Core/Log.h"
+#include "lldb/Core/StreamString.h"
+#include "lldb/Host/File.h"
+#include "lldb/Host/FileSpec.h"
+#include "lldb/Host/Host.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+
+//------------------------------------------------------------------
+/// Default Constructor
+//------------------------------------------------------------------
+PlatformPOSIX::PlatformPOSIX (bool is_host) :
+Platform(is_host),  // This is the local host platform
+m_remote_platform_sp ()
+{
+}
+
+//------------------------------------------------------------------
+/// Destructor.
+///
+/// The destructor is virtual since this class is designed to be
+/// inherited from by the plug-in instance.
+//------------------------------------------------------------------
+PlatformPOSIX::~PlatformPOSIX()
+{
+}
+
+lldb_private::OptionGroupOptions*
+PlatformPOSIX::GetConnectionOptions (lldb_private::CommandInterpreter& interpreter)
+{
+    if (m_options.get() == NULL)
+    {
+        m_options.reset(new OptionGroupOptions(interpreter));
+        m_options->Append(new OptionGroupPlatformRSync());
+        m_options->Append(new OptionGroupPlatformSSH());
+        m_options->Append(new OptionGroupPlatformCaching());
+    }
+    return m_options.get();
+}
+
+lldb_private::Error
+PlatformPOSIX::RunShellCommand (const char *command,           // Shouldn't be NULL
+                                const char *working_dir,       // Pass NULL to use the current working directory
+                                int *status_ptr,               // Pass NULL if you don't want the process exit status
+                                int *signo_ptr,                // Pass NULL if you don't want the signal that caused the process to exit
+                                std::string *command_output,   // Pass NULL if you don't want the command output
+                                uint32_t timeout_sec)         // Timeout in seconds to wait for shell program to finish
+{
+    if (IsHost())
+        return Host::RunShellCommand(command, working_dir, status_ptr, signo_ptr, command_output, timeout_sec);
+    else
+    {
+        if (m_remote_platform_sp)
+            return m_remote_platform_sp->RunShellCommand(command, working_dir, status_ptr, signo_ptr, command_output, timeout_sec);
+        else
+            return Error("unable to run a remote command without a platform");
+    }
+}
+
+Error
+PlatformPOSIX::MakeDirectory (const char *path, uint32_t file_permissions)
+{
+    if (m_remote_platform_sp)
+        return m_remote_platform_sp->MakeDirectory(path, file_permissions);
+    else
+        return Platform::MakeDirectory(path ,file_permissions);
+}
+
+Error
+PlatformPOSIX::GetFilePermissions (const char *path, uint32_t &file_permissions)
+{
+    if (m_remote_platform_sp)
+        return m_remote_platform_sp->GetFilePermissions(path, file_permissions);
+    else
+        return Platform::GetFilePermissions(path ,file_permissions);
+}
+
+Error
+PlatformPOSIX::SetFilePermissions (const char *path, uint32_t file_permissions)
+{
+    if (m_remote_platform_sp)
+        return m_remote_platform_sp->MakeDirectory(path, file_permissions);
+    else
+        return Platform::SetFilePermissions(path ,file_permissions);
+}
+
+lldb::user_id_t
+PlatformPOSIX::OpenFile (const FileSpec& file_spec,
+                         uint32_t flags,
+                         uint32_t mode,
+                         Error &error)
+{
+    if (IsHost())
+        return Host::OpenFile(file_spec, flags, mode, error);
+    else if (m_remote_platform_sp)
+        return m_remote_platform_sp->OpenFile(file_spec, flags, mode, error);
+    else
+        return Platform::OpenFile(file_spec, flags, mode, error);
+}
+
+bool
+PlatformPOSIX::CloseFile (lldb::user_id_t fd, Error &error)
+{
+    if (IsHost())
+        return Host::CloseFile(fd, error);
+    else if (m_remote_platform_sp)
+        return m_remote_platform_sp->CloseFile(fd, error);
+    else
+        return Platform::CloseFile(fd, error);
+}
+
+uint64_t
+PlatformPOSIX::ReadFile (lldb::user_id_t fd,
+                         uint64_t offset,
+                         void *dst,
+                         uint64_t dst_len,
+                         Error &error)
+{
+    if (IsHost())
+        return Host::ReadFile(fd, offset, dst, dst_len, error);
+    else if (m_remote_platform_sp)
+        return m_remote_platform_sp->ReadFile(fd, offset, dst, dst_len, error);
+    else
+        return Platform::ReadFile(fd, offset, dst, dst_len, error);
+}
+
+uint64_t
+PlatformPOSIX::WriteFile (lldb::user_id_t fd,
+                          uint64_t offset,
+                          const void* src,
+                          uint64_t src_len,
+                          Error &error)
+{
+    if (IsHost())
+        return Host::WriteFile(fd, offset, src, src_len, error);
+    else if (m_remote_platform_sp)
+        return m_remote_platform_sp->WriteFile(fd, offset, src, src_len, error);
+    else
+        return Platform::WriteFile(fd, offset, src, src_len, error);
+}
+
+static uint32_t
+chown_file(Platform *platform,
+           const char* path,
+           uint32_t uid = UINT32_MAX,
+           uint32_t gid = UINT32_MAX)
+{
+    if (!platform || !path || *path == 0)
+        return UINT32_MAX;
+    
+    if (uid == UINT32_MAX && gid == UINT32_MAX)
+        return 0;   // pretend I did chown correctly - actually I just didn't care
+    
+    StreamString command;
+    command.PutCString("chown ");
+    if (uid != UINT32_MAX)
+        command.Printf("%d",uid);
+    if (gid != UINT32_MAX)
+        command.Printf(":%d",gid);
+    command.Printf("%s",path);
+    int status;
+    platform->RunShellCommand(command.GetData(),
+                              NULL,
+                              &status,
+                              NULL,
+                              NULL,
+                              10);
+    return status;
+}
+
+lldb_private::Error
+PlatformPOSIX::PutFile (const lldb_private::FileSpec& source,
+                         const lldb_private::FileSpec& destination,
+                         uint32_t uid,
+                         uint32_t gid)
+{
+    Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM));
+
+    if (IsHost())
+    {
+        if (FileSpec::Equal(source, destination, true))
+            return Error();
+        // cp src dst
+        // chown uid:gid dst
+        std::string src_path (source.GetPath());
+        if (src_path.empty())
+            return Error("unable to get file path for source");
+        std::string dst_path (destination.GetPath());
+        if (dst_path.empty())
+            return Error("unable to get file path for destination");
+        StreamString command;
+        command.Printf("cp %s %s", src_path.c_str(), dst_path.c_str());
+        int status;
+        RunShellCommand(command.GetData(),
+                        NULL,
+                        &status,
+                        NULL,
+                        NULL,
+                        10);
+        if (status != 0)
+            return Error("unable to perform copy");
+        if (uid == UINT32_MAX && gid == UINT32_MAX)
+            return Error();
+        if (chown_file(this,dst_path.c_str(),uid,gid) != 0)
+            return Error("unable to perform chown");
+        return Error();
+    }
+    else if (m_remote_platform_sp)
+    {
+        if (GetSupportsRSync())
+        {
+            std::string src_path (source.GetPath());
+            if (src_path.empty())
+                return Error("unable to get file path for source");
+            std::string dst_path (destination.GetPath());
+            if (dst_path.empty())
+                return Error("unable to get file path for destination");
+            StreamString command;
+            if (GetIgnoresRemoteHostname())
+            {
+                if (!GetRSyncPrefix())
+                    command.Printf("rsync %s %s %s",
+                                   GetRSyncOpts(),
+                                   src_path.c_str(),
+                                   dst_path.c_str());
+                else
+                    command.Printf("rsync %s %s %s%s",
+                                   GetRSyncOpts(),
+                                   src_path.c_str(),
+                                   GetRSyncPrefix(),
+                                   dst_path.c_str());
+            }
+            else
+                command.Printf("rsync %s %s %s:%s",
+                               GetRSyncOpts(),
+                               src_path.c_str(),
+                               GetHostname(),
+                               dst_path.c_str());
+            if (log)
+                log->Printf("[PutFile] Running command: %s\n", command.GetData());
+            int retcode;
+            Host::RunShellCommand(command.GetData(),
+                                  NULL,
+                                  &retcode,
+                                  NULL,
+                                  NULL,
+                                  60);
+            if (retcode == 0)
+            {
+                // Don't chown a local file for a remote system
+//                if (chown_file(this,dst_path.c_str(),uid,gid) != 0)
+//                    return Error("unable to perform chown");
+                return Error();
+            }
+            // if we are still here rsync has failed - let's try the slow way before giving up
+        }
+        
+        if (log)
+            log->Printf ("PlatformPOSIX::PutFile(src='%s', dst='%s', uid=%u, gid=%u)",
+                         source.GetPath().c_str(),
+                         destination.GetPath().c_str(),
+                         uid,
+                         gid); // REMOVE THIS PRINTF PRIOR TO CHECKIN
+        // open
+        // read, write, read, write, ...
+        // close
+        // chown uid:gid dst
+        if (log)
+            log->Printf("[PutFile] Using block by block transfer....\n");
+        
+        uint32_t source_open_options = File::eOpenOptionRead;
+        if (source.GetFileType() == FileSpec::eFileTypeSymbolicLink)
+            source_open_options |= File::eOpenoptionDontFollowSymlinks;
+
+        File source_file(source, source_open_options, lldb::eFilePermissionsUserRW);
+        Error error;
+        uint32_t permissions = source_file.GetPermissions(error);
+        if (permissions == 0)
+            permissions = lldb::eFilePermissionsFileDefault;
+
+        if (!source_file.IsValid())
+            return Error("unable to open source file");
+        lldb::user_id_t dest_file = OpenFile (destination,
+                                              File::eOpenOptionCanCreate | File::eOpenOptionWrite | File::eOpenOptionTruncate,
+                                              permissions,
+                                              error);
+        if (log)
+            log->Printf ("dest_file = %" PRIu64 "\n", dest_file);
+        if (error.Fail())
+            return error;
+        if (dest_file == UINT64_MAX)
+            return Error("unable to open target file");
+        lldb::DataBufferSP buffer_sp(new DataBufferHeap(1024, 0));
+        uint64_t offset = 0;
+        while (error.Success())
+        {
+            size_t bytes_read = buffer_sp->GetByteSize();
+            error = source_file.Read(buffer_sp->GetBytes(), bytes_read);
+            if (bytes_read)
+            {
+                WriteFile(dest_file, offset, buffer_sp->GetBytes(), bytes_read, error);
+                offset += bytes_read;
+            }
+            else
+                break;
+        }
+        CloseFile(dest_file, error);
+        if (uid == UINT32_MAX && gid == UINT32_MAX)
+            return error;
+        // This is remopve, don't chown a local file...
+//        std::string dst_path (destination.GetPath());
+//        if (chown_file(this,dst_path.c_str(),uid,gid) != 0)
+//            return Error("unable to perform chown");
+        return error;
+    }
+    return Platform::PutFile(source,destination,uid,gid);
+}
+
+lldb::user_id_t
+PlatformPOSIX::GetFileSize (const FileSpec& file_spec)
+{
+    if (IsHost())
+        return Host::GetFileSize(file_spec);
+    else if (m_remote_platform_sp)
+        return m_remote_platform_sp->GetFileSize(file_spec);
+    else
+        return Platform::GetFileSize(file_spec);
+}
+
+Error
+PlatformPOSIX::CreateSymlink(const char *src, const char *dst)
+{
+    if (IsHost())
+        return Host::Symlink(src, dst);
+    else if (m_remote_platform_sp)
+        return m_remote_platform_sp->CreateSymlink(src, dst);
+    else
+        return Platform::CreateSymlink(src, dst);
+}
+
+bool
+PlatformPOSIX::GetFileExists (const FileSpec& file_spec)
+{
+    if (IsHost())
+        return file_spec.Exists();
+    else if (m_remote_platform_sp)
+        return m_remote_platform_sp->GetFileExists(file_spec);
+    else
+        return Platform::GetFileExists(file_spec);
+}
+
+Error
+PlatformPOSIX::Unlink (const char *path)
+{
+    if (IsHost())
+        return Host::Unlink (path);
+    else if (m_remote_platform_sp)
+        return m_remote_platform_sp->Unlink(path);
+    else
+        return Platform::Unlink(path);
+}
+
+lldb_private::Error
+PlatformPOSIX::GetFile (const lldb_private::FileSpec& source /* remote file path */,
+                        const lldb_private::FileSpec& destination /* local file path */)
+{
+    Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM));
+
+    // Check the args, first.
+    std::string src_path (source.GetPath());
+    if (src_path.empty())
+        return Error("unable to get file path for source");
+    std::string dst_path (destination.GetPath());
+    if (dst_path.empty())
+        return Error("unable to get file path for destination");
+    if (IsHost())
+    {
+        if (FileSpec::Equal(source, destination, true))
+            return Error("local scenario->source and destination are the same file path: no operation performed");
+        // cp src dst
+        StreamString cp_command;
+        cp_command.Printf("cp %s %s", src_path.c_str(), dst_path.c_str());
+        int status;
+        RunShellCommand(cp_command.GetData(),
+                        NULL,
+                        &status,
+                        NULL,
+                        NULL,
+                        10);
+        if (status != 0)
+            return Error("unable to perform copy");
+        return Error();
+    }
+    else if (m_remote_platform_sp)
+    {
+        if (GetSupportsRSync())
+        {
+            StreamString command;
+            if (GetIgnoresRemoteHostname())
+            {
+                if (!GetRSyncPrefix())
+                    command.Printf("rsync %s %s %s",
+                                   GetRSyncOpts(),
+                                   src_path.c_str(),
+                                   dst_path.c_str());
+                else
+                    command.Printf("rsync %s %s%s %s",
+                                   GetRSyncOpts(),
+                                   GetRSyncPrefix(),
+                                   src_path.c_str(),
+                                   dst_path.c_str());
+            }
+            else
+                command.Printf("rsync %s %s:%s %s",
+                               GetRSyncOpts(),
+                               m_remote_platform_sp->GetHostname(),
+                               src_path.c_str(),
+                               dst_path.c_str());
+            if (log)
+                log->Printf("[GetFile] Running command: %s\n", command.GetData());
+            int retcode;
+            Host::RunShellCommand(command.GetData(),
+                                  NULL,
+                                  &retcode,
+                                  NULL,
+                                  NULL,
+                                  60);
+            if (retcode == 0)
+                return Error();
+            // If we are here, rsync has failed - let's try the slow way before giving up
+        }
+        // open src and dst
+        // read/write, read/write, read/write, ...
+        // close src
+        // close dst
+        if (log)
+            log->Printf("[GetFile] Using block by block transfer....\n");
+        Error error;
+        user_id_t fd_src = OpenFile (source,
+                                     File::eOpenOptionRead,
+                                     lldb::eFilePermissionsFileDefault,
+                                     error);
+
+        if (fd_src == UINT64_MAX)
+            return Error("unable to open source file");
+
+        uint32_t permissions = 0;
+        error = GetFilePermissions(source.GetPath().c_str(), permissions);
+        
+        if (permissions == 0)
+            permissions = lldb::eFilePermissionsFileDefault;
+
+        user_id_t fd_dst = Host::OpenFile(destination,
+                                          File::eOpenOptionCanCreate | File::eOpenOptionWrite | File::eOpenOptionTruncate,
+                                          permissions,
+                                          error);
+
+        if (fd_dst == UINT64_MAX)
+        {
+            if (error.Success())
+                error.SetErrorString("unable to open destination file");
+        }
+
+        if (error.Success())
+        {
+            lldb::DataBufferSP buffer_sp(new DataBufferHeap(1024, 0));
+            uint64_t offset = 0;
+            error.Clear();
+            while (error.Success())
+            {
+                const uint64_t n_read = ReadFile (fd_src,
+                                                  offset,
+                                                  buffer_sp->GetBytes(),
+                                                  buffer_sp->GetByteSize(),
+                                                  error);
+                if (error.Fail())
+                    break;
+                if (n_read == 0)
+                    break;
+                if (Host::WriteFile(fd_dst,
+                                    offset,
+                                    buffer_sp->GetBytes(),
+                                    n_read,
+                                    error) != n_read)
+                {
+                    if (!error.Fail())
+                        error.SetErrorString("unable to write to destination file");
+                        break;
+                }
+                offset += n_read;
+            }
+        }
+        // Ignore the close error of src.
+        if (fd_src != UINT64_MAX)
+            CloseFile(fd_src, error);
+        // And close the dst file descriptot.
+        if (fd_dst != UINT64_MAX && !Host::CloseFile(fd_dst, error))
+        {
+            if (!error.Fail())
+                error.SetErrorString("unable to close destination file");
+
+        }
+        return error;
+    }
+    return Platform::GetFile(source,destination);
+}
+
+std::string
+PlatformPOSIX::GetPlatformSpecificConnectionInformation()
+{
+    StreamString stream;
+    if (GetSupportsRSync())
+    {
+        stream.PutCString("rsync");
+        if ( (GetRSyncOpts() && *GetRSyncOpts()) ||
+             (GetRSyncPrefix() && *GetRSyncPrefix()) ||
+             GetIgnoresRemoteHostname())
+        {
+            stream.Printf(", options: ");
+            if (GetRSyncOpts() && *GetRSyncOpts())
+                stream.Printf("'%s' ",GetRSyncOpts());
+            stream.Printf(", prefix: ");
+            if (GetRSyncPrefix() && *GetRSyncPrefix())
+                stream.Printf("'%s' ",GetRSyncPrefix());
+            if (GetIgnoresRemoteHostname())
+                stream.Printf("ignore remote-hostname ");
+        }
+    }
+    if (GetSupportsSSH())
+    {
+        stream.PutCString("ssh");
+        if (GetSSHOpts() && *GetSSHOpts())
+            stream.Printf(", options: '%s' ",GetSSHOpts());
+    }
+    if (GetLocalCacheDirectory() && *GetLocalCacheDirectory())
+        stream.Printf("cache dir: %s",GetLocalCacheDirectory());
+    if (stream.GetSize())
+        return stream.GetData();
+    else
+        return "";
+}
+
+bool
+PlatformPOSIX::CalculateMD5 (const FileSpec& file_spec,
+                            uint64_t &low,
+                            uint64_t &high)
+{
+    if (IsHost())
+        return Platform::CalculateMD5 (file_spec, low, high);
+    if (m_remote_platform_sp)
+        return m_remote_platform_sp->CalculateMD5(file_spec, low, high);
+    return false;
+}
+
+lldb_private::ConstString
+PlatformPOSIX::GetRemoteWorkingDirectory()
+{
+    if (IsRemote() && m_remote_platform_sp)
+        return m_remote_platform_sp->GetRemoteWorkingDirectory();
+    else
+        return Platform::GetRemoteWorkingDirectory();
+}
+
+bool
+PlatformPOSIX::SetRemoteWorkingDirectory(const lldb_private::ConstString &path)
+{
+    if (IsRemote() && m_remote_platform_sp)
+        return m_remote_platform_sp->SetRemoteWorkingDirectory(path);
+    else
+        return Platform::SetRemoteWorkingDirectory(path);
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h b/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h
new file mode 100644
index 00000000000..336e0f90fca
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Platform/POSIX/PlatformPOSIX.h
@@ -0,0 +1,124 @@
+//===-- PlatformPOSIX.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_PlatformPOSIX_h_
+#define liblldb_PlatformPOSIX_h_
+
+// C Includes
+// C++ Includes
+
+#include <memory>
+
+// Other libraries and framework includes
+// Project includes
+#include "lldb/Interpreter/Options.h"
+#include "lldb/Target/Platform.h"
+
+class PlatformPOSIX : public lldb_private::Platform
+{
+public:
+    PlatformPOSIX (bool is_host);
+    
+    virtual
+    ~PlatformPOSIX();
+    
+    //------------------------------------------------------------
+    // lldb_private::Platform functions
+    //------------------------------------------------------------
+    virtual lldb_private::OptionGroupOptions*
+    GetConnectionOptions (lldb_private::CommandInterpreter& interpreter);
+    
+    virtual lldb_private::Error
+    PutFile (const lldb_private::FileSpec& source,
+             const lldb_private::FileSpec& destination,
+             uint32_t uid = UINT32_MAX,
+             uint32_t gid = UINT32_MAX);
+    
+    virtual lldb::user_id_t
+    OpenFile (const lldb_private::FileSpec& file_spec,
+              uint32_t flags,
+              uint32_t mode,
+              lldb_private::Error &error);
+    
+    virtual bool
+    CloseFile (lldb::user_id_t fd,
+               lldb_private::Error &error);
+    
+    virtual uint64_t
+    ReadFile (lldb::user_id_t fd,
+              uint64_t offset,
+              void *dst,
+              uint64_t dst_len,
+              lldb_private::Error &error);
+    
+    virtual uint64_t
+    WriteFile (lldb::user_id_t fd,
+               uint64_t offset,
+               const void* src,
+               uint64_t src_len,
+               lldb_private::Error &error);
+    
+    virtual lldb::user_id_t
+    GetFileSize (const lldb_private::FileSpec& file_spec);
+
+    virtual lldb_private::Error
+    CreateSymlink(const char *src, const char *dst);
+
+    virtual lldb_private::Error
+    GetFile (const lldb_private::FileSpec& source,
+             const lldb_private::FileSpec& destination);
+    
+    virtual lldb_private::ConstString
+    GetRemoteWorkingDirectory();
+    
+    virtual bool
+    SetRemoteWorkingDirectory(const lldb_private::ConstString &path);
+    
+    virtual lldb_private::Error
+    RunShellCommand (const char *command,           // Shouldn't be NULL
+                     const char *working_dir,       // Pass NULL to use the current working directory
+                     int *status_ptr,               // Pass NULL if you don't want the process exit status
+                     int *signo_ptr,                // Pass NULL if you don't want the signal that caused the process to exit
+                     std::string *command_output,   // Pass NULL if you don't want the command output
+                     uint32_t timeout_sec);         // Timeout in seconds to wait for shell program to finish
+    
+    virtual lldb_private::Error
+    MakeDirectory (const char *path, uint32_t mode);
+    
+    virtual lldb_private::Error
+    GetFilePermissions (const char *path, uint32_t &file_permissions);
+
+    virtual lldb_private::Error
+    SetFilePermissions (const char *path, uint32_t file_permissions);
+
+    virtual bool
+    GetFileExists (const lldb_private::FileSpec& file_spec);
+    
+    virtual lldb_private::Error
+    Unlink (const char *path);
+
+    virtual std::string
+    GetPlatformSpecificConnectionInformation();
+    
+    virtual bool
+    CalculateMD5 (const lldb_private::FileSpec& file_spec,
+                  uint64_t &low,
+                  uint64_t &high);
+
+protected:
+    std::auto_ptr<lldb_private::OptionGroupOptions> m_options;
+        
+    lldb::PlatformSP m_remote_platform_sp; // Allow multiple ways to connect to a remote POSIX-compliant OS
+    
+private:
+    DISALLOW_COPY_AND_ASSIGN (PlatformPOSIX);
+    
+};
+
+#endif  // liblldb_PlatformPOSIX_h_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
index 684d1921e92..248abaf6fea 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
@@ -10,9 +10,12 @@
 #include "lldb/lldb-python.h"
 
 #include "PlatformRemoteGDBServer.h"
+#include "lldb/Host/Config.h"
 
 // C Includes
+#ifndef LLDB_DISABLE_POSIX
 #include <sys/sysctl.h>
+#endif
 
 // C++ Includes
 // Other libraries and framework includes
@@ -107,7 +110,11 @@ PlatformRemoteGDBServer::ResolveExecutable (const FileSpec &exe_file,
                                             const FileSpecList *module_search_paths_ptr)
 {
     Error error;
-    error.SetErrorString ("PlatformRemoteGDBServer::ResolveExecutable() is unimplemented");
+    //error.SetErrorString ("PlatformRemoteGDBServer::ResolveExecutable() is unimplemented");
+    if (m_gdb_client.GetFileExists(exe_file))
+        return error;
+    // TODO: get the remote end to somehow resolve this file
+    error.SetErrorString("file not found on remote end");
     return error;
 }
 
@@ -187,6 +194,47 @@ PlatformRemoteGDBServer::GetRemoteSystemArchitecture ()
     return m_gdb_client.GetSystemArchitecture();
 }
 
+lldb_private::ConstString
+PlatformRemoteGDBServer::GetRemoteWorkingDirectory()
+{
+    if (IsConnected())
+    {
+        Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+        std::string cwd;
+        if (m_gdb_client.GetWorkingDir(cwd))
+        {
+            ConstString working_dir(cwd.c_str());
+            if (log)
+                log->Printf("PlatformRemoteGDBServer::GetRemoteWorkingDirectory() -> '%s'", working_dir.GetCString());
+            return working_dir;
+        }
+        else
+        {
+            return ConstString();
+        }
+    }
+    else
+    {
+        return Platform::GetRemoteWorkingDirectory();
+    }
+}
+
+bool
+PlatformRemoteGDBServer::SetRemoteWorkingDirectory(const lldb_private::ConstString &path)
+{
+    if (IsConnected())
+    {
+        // Clear the working directory it case it doesn't get set correctly. This will
+        // for use to re-read it
+        Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+        if (log)
+            log->Printf("PlatformRemoteGDBServer::SetRemoteWorkingDirectory('%s')", path.GetCString());
+        return m_gdb_client.SetWorkingDir(path.GetCString()) == 0;
+    }
+    else
+        return Platform::SetRemoteWorkingDirectory(path);
+}
+
 bool
 PlatformRemoteGDBServer::IsConnected () const
 {
@@ -213,8 +261,10 @@ PlatformRemoteGDBServer::ConnectRemote (Args& args)
             {
                 if (m_gdb_client.HandshakeWithServer(&error))
                 {
-                    m_gdb_client.QueryNoAckModeSupported();
                     m_gdb_client.GetHostInfo();
+                    // If a working directory was set prior to connecting, send it down now
+                    if (m_working_dir)
+                        m_gdb_client.SetWorkingDir(m_working_dir.GetCString());
 #if 0
                     m_gdb_client.TestPacketSpeed(10000);
 #endif
@@ -222,6 +272,8 @@ PlatformRemoteGDBServer::ConnectRemote (Args& args)
                 else
                 {
                     m_gdb_client.Disconnect();
+                    if (error.Success())
+                        error.SetErrorString("handshake failed");
                 }
             }
         }
@@ -312,7 +364,6 @@ PlatformRemoteGDBServer::LaunchProcess (ProcessLaunchInfo &launch_info)
     }
     
     // Send the environment and the program + arguments after we connect
-    const char **argv = launch_info.GetArguments().GetConstArgumentVector();
     const char **envp = launch_info.GetEnvironmentEntries().GetConstArgumentVector();
 
     if (envp)
@@ -324,8 +375,14 @@ PlatformRemoteGDBServer::LaunchProcess (ProcessLaunchInfo &launch_info)
                 break;
         }
     }
+    
+    ArchSpec arch_spec = launch_info.GetArchitecture();
+    const char *arch_triple = arch_spec.GetTriple().str().c_str();
+    
+    m_gdb_client.SendLaunchArchPacket(arch_triple);
+    
     const uint32_t old_packet_timeout = m_gdb_client.SetPacketTimeout (5);
-    int arg_packet_err = m_gdb_client.SendArgumentsPacket (argv);
+    int arg_packet_err = m_gdb_client.SendArgumentsPacket (launch_info);
     m_gdb_client.SetPacketTimeout (old_packet_timeout);
     if (arg_packet_err == 0)
     {
@@ -348,6 +405,80 @@ PlatformRemoteGDBServer::LaunchProcess (ProcessLaunchInfo &launch_info)
     return error;
 }
 
+lldb::ProcessSP
+PlatformRemoteGDBServer::DebugProcess (lldb_private::ProcessLaunchInfo &launch_info,
+                                       lldb_private::Debugger &debugger,
+                                       lldb_private::Target *target,       // Can be NULL, if NULL create a new target, else use existing one
+                                       lldb_private::Listener &listener,
+                                       lldb_private::Error &error)
+{
+    lldb::ProcessSP process_sp;
+    if (IsRemote())
+    {
+        if (IsConnected())
+        {
+            lldb::pid_t debugserver_pid = LLDB_INVALID_PROCESS_ID;
+            uint16_t port = m_gdb_client.LaunchGDBserverAndGetPort(debugserver_pid);
+            
+            if (port == 0)
+            {
+                error.SetErrorStringWithFormat ("unable to launch a GDB server on '%s'", GetHostname ());
+            }
+            else
+            {
+                if (target == NULL)
+                {
+                    TargetSP new_target_sp;
+                    
+                    error = debugger.GetTargetList().CreateTarget (debugger,
+                                                                   NULL,
+                                                                   NULL,
+                                                                   false,
+                                                                   NULL,
+                                                                   new_target_sp);
+                    target = new_target_sp.get();
+                }
+                else
+                    error.Clear();
+                
+                if (target && error.Success())
+                {
+                    debugger.GetTargetList().SetSelectedTarget(target);
+                    
+                    // The darwin always currently uses the GDB remote debugger plug-in
+                    // so even when debugging locally we are debugging remotely!
+                    process_sp = target->CreateProcess (listener, "gdb-remote", NULL);
+                    
+                    if (process_sp)
+                    {
+                        char connect_url[256];
+                        const char *override_hostname = getenv("LLDB_PLATFORM_REMOTE_GDB_SERVER_HOSTNAME");
+                        const char *port_offset_c_str = getenv("LLDB_PLATFORM_REMOTE_GDB_SERVER_PORT_OFFSET");
+                        int port_offset = port_offset_c_str ? ::atoi(port_offset_c_str) : 0;
+                        const int connect_url_len = ::snprintf (connect_url,
+                                                                sizeof(connect_url),
+                                                                "connect://%s:%u",
+                                                                override_hostname ? override_hostname : GetHostname (),
+                                                                port + port_offset);
+                        assert (connect_url_len < (int)sizeof(connect_url));
+                        error = process_sp->ConnectRemote (NULL, connect_url);
+                        if (error.Success())
+                            error = process_sp->Launch(launch_info);
+                        else if (debugserver_pid != LLDB_INVALID_PROCESS_ID)
+                            m_gdb_client.KillSpawnedProcess(debugserver_pid);
+                    }
+                }
+            }
+        }
+        else
+        {
+            error.SetErrorString("not connected to remote gdb server");
+        }
+    }
+    return process_sp;
+    
+}
+
 lldb::ProcessSP
 PlatformRemoteGDBServer::Attach (lldb_private::ProcessAttachInfo &attach_info,
                                  Debugger &debugger,
@@ -360,7 +491,8 @@ PlatformRemoteGDBServer::Attach (lldb_private::ProcessAttachInfo &attach_info,
     {
         if (IsConnected())
         {
-            uint16_t port = m_gdb_client.LaunchGDBserverAndGetPort();
+            lldb::pid_t debugserver_pid = LLDB_INVALID_PROCESS_ID;
+            uint16_t port = m_gdb_client.LaunchGDBserverAndGetPort(debugserver_pid);
             
             if (port == 0)
             {
@@ -394,15 +526,22 @@ PlatformRemoteGDBServer::Attach (lldb_private::ProcessAttachInfo &attach_info,
                     if (process_sp)
                     {
                         char connect_url[256];
+                        const char *override_hostname = getenv("LLDB_PLATFORM_REMOTE_GDB_SERVER_HOSTNAME");
+                        const char *port_offset_c_str = getenv("LLDB_PLATFORM_REMOTE_GDB_SERVER_PORT_OFFSET");
+                        int port_offset = port_offset_c_str ? ::atoi(port_offset_c_str) : 0;
                         const int connect_url_len = ::snprintf (connect_url, 
                                                                 sizeof(connect_url), 
                                                                 "connect://%s:%u", 
-                                                                GetHostname (), 
-                                                                port);
+                                                                override_hostname ? override_hostname : GetHostname (), 
+                                                                port + port_offset);
                         assert (connect_url_len < (int)sizeof(connect_url));
                         error = process_sp->ConnectRemote (NULL, connect_url);
                         if (error.Success())
                             error = process_sp->Attach(attach_info);
+                        else if (debugserver_pid != LLDB_INVALID_PROCESS_ID)
+                        {
+                            m_gdb_client.KillSpawnedProcess(debugserver_pid);
+                        }
                     }
                 }
             }
@@ -415,4 +554,122 @@ PlatformRemoteGDBServer::Attach (lldb_private::ProcessAttachInfo &attach_info,
     return process_sp;
 }
 
+Error
+PlatformRemoteGDBServer::MakeDirectory (const char *path, uint32_t mode)
+{
+    Error error = m_gdb_client.MakeDirectory(path,mode);
+    Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+    if (log)
+        log->Printf ("PlatformRemoteGDBServer::MakeDirectory(path='%s', mode=%o) error = %u (%s)", path, mode, error.GetError(), error.AsCString());
+    return error;
+}
 
+
+Error
+PlatformRemoteGDBServer::GetFilePermissions (const char *path, uint32_t &file_permissions)
+{
+    Error error = m_gdb_client.GetFilePermissions(path, file_permissions);
+    Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+    if (log)
+        log->Printf ("PlatformRemoteGDBServer::GetFilePermissions(path='%s', file_permissions=%o) error = %u (%s)", path, file_permissions, error.GetError(), error.AsCString());
+    return error;
+}
+
+Error
+PlatformRemoteGDBServer::SetFilePermissions (const char *path, uint32_t file_permissions)
+{
+    Error error = m_gdb_client.SetFilePermissions(path, file_permissions);
+    Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+    if (log)
+        log->Printf ("PlatformRemoteGDBServer::SetFilePermissions(path='%s', file_permissions=%o) error = %u (%s)", path, file_permissions, error.GetError(), error.AsCString());
+    return error;
+}
+
+
+lldb::user_id_t
+PlatformRemoteGDBServer::OpenFile (const lldb_private::FileSpec& file_spec,
+                                   uint32_t flags,
+                                   uint32_t mode,
+                                   Error &error)
+{
+    return m_gdb_client.OpenFile (file_spec, flags, mode, error);
+}
+
+bool
+PlatformRemoteGDBServer::CloseFile (lldb::user_id_t fd, Error &error)
+{
+    return m_gdb_client.CloseFile (fd, error);
+}
+
+lldb::user_id_t
+PlatformRemoteGDBServer::GetFileSize (const lldb_private::FileSpec& file_spec)
+{
+    return m_gdb_client.GetFileSize(file_spec);
+}
+
+uint64_t
+PlatformRemoteGDBServer::ReadFile (lldb::user_id_t fd,
+                                   uint64_t offset,
+                                   void *dst,
+                                   uint64_t dst_len,
+                                   Error &error)
+{
+    return m_gdb_client.ReadFile (fd, offset, dst, dst_len, error);
+}
+
+uint64_t
+PlatformRemoteGDBServer::WriteFile (lldb::user_id_t fd,
+                                    uint64_t offset,
+                                    const void* src,
+                                    uint64_t src_len,
+                                    Error &error)
+{
+    return m_gdb_client.WriteFile (fd, offset, src, src_len, error);
+}
+
+lldb_private::Error
+PlatformRemoteGDBServer::PutFile (const lldb_private::FileSpec& source,
+         const lldb_private::FileSpec& destination,
+         uint32_t uid,
+         uint32_t gid)
+{
+    return Platform::PutFile(source,destination,uid,gid);
+}
+
+Error
+PlatformRemoteGDBServer::CreateSymlink (const char *src,    // The name of the link is in src
+                                        const char *dst)    // The symlink points to dst
+{
+    Error error = m_gdb_client.CreateSymlink (src, dst);
+    Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+    if (log)
+        log->Printf ("PlatformRemoteGDBServer::CreateSymlink(src='%s', dst='%s') error = %u (%s)", src, dst, error.GetError(), error.AsCString());
+    return error;
+}
+
+Error
+PlatformRemoteGDBServer::Unlink (const char *path)
+{
+    Error error = m_gdb_client.Unlink (path);
+    Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+    if (log)
+        log->Printf ("PlatformRemoteGDBServer::Unlink(path='%s') error = %u (%s)", path, error.GetError(), error.AsCString());
+    return error;
+}
+
+bool
+PlatformRemoteGDBServer::GetFileExists (const lldb_private::FileSpec& file_spec)
+{
+    return m_gdb_client.GetFileExists (file_spec);
+}
+
+lldb_private::Error
+PlatformRemoteGDBServer::RunShellCommand (const char *command,           // Shouldn't be NULL
+                                          const char *working_dir,       // Pass NULL to use the current working directory
+                                          int *status_ptr,               // Pass NULL if you don't want the process exit status
+                                          int *signo_ptr,                // Pass NULL if you don't want the signal that caused the process to exit
+                                          std::string *command_output,   // Pass NULL if you don't want the command output
+                                          uint32_t timeout_sec)          // Timeout in seconds to wait for shell program to finish
+{
+    return m_gdb_client.RunShellCommand (command, working_dir, status_ptr, signo_ptr, command_output, timeout_sec);
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h b/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
index 22b3dd49be5..808fb5ed61c 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
@@ -88,6 +88,13 @@ public:
     virtual lldb_private::Error
     LaunchProcess (lldb_private::ProcessLaunchInfo &launch_info);
     
+    virtual lldb::ProcessSP
+    DebugProcess (lldb_private::ProcessLaunchInfo &launch_info,
+                  lldb_private::Debugger &debugger,
+                  lldb_private::Target *target,       // Can be NULL, if NULL create a new target, else use existing one
+                  lldb_private::Listener &listener,
+                  lldb_private::Error &error);
+
     virtual lldb::ProcessSP
     Attach (lldb_private::ProcessAttachInfo &attach_info,
             lldb_private::Debugger &debugger,
@@ -115,6 +122,13 @@ public:
     virtual lldb_private::ArchSpec
     GetRemoteSystemArchitecture ();
 
+    virtual lldb_private::ConstString
+    GetRemoteWorkingDirectory();
+    
+    virtual bool
+    SetRemoteWorkingDirectory(const lldb_private::ConstString &path);
+    
+
     // Remote subclasses should override this and return a valid instance
     // name if connected.
     virtual const char *
@@ -134,6 +148,66 @@ public:
 
     virtual lldb_private::Error
     DisconnectRemote ();
+    
+    virtual lldb_private::Error
+    MakeDirectory (const char *path, uint32_t file_permissions);
+    
+    virtual lldb_private::Error
+    GetFilePermissions (const char *path, uint32_t &file_permissions);
+    
+    virtual lldb_private::Error
+    SetFilePermissions (const char *path, uint32_t file_permissions);
+    
+
+    virtual lldb::user_id_t
+    OpenFile (const lldb_private::FileSpec& file_spec,
+              uint32_t flags,
+              uint32_t mode,
+              lldb_private::Error &error);
+    
+    virtual bool
+    CloseFile (lldb::user_id_t fd,
+               lldb_private::Error &error);
+    
+    virtual uint64_t
+    ReadFile (lldb::user_id_t fd,
+              uint64_t offset,
+              void *data_ptr,
+              uint64_t len,
+              lldb_private::Error &error);
+    
+    virtual uint64_t
+    WriteFile (lldb::user_id_t fd,
+               uint64_t offset,
+               const void* data,
+               uint64_t len,
+               lldb_private::Error &error);
+
+    virtual lldb::user_id_t
+    GetFileSize (const lldb_private::FileSpec& file_spec);
+
+    virtual lldb_private::Error
+    PutFile (const lldb_private::FileSpec& source,
+             const lldb_private::FileSpec& destination,
+             uint32_t uid = UINT32_MAX,
+             uint32_t gid = UINT32_MAX);
+    
+    virtual lldb_private::Error
+    CreateSymlink (const char *src, const char *dst);
+
+    virtual bool
+    GetFileExists (const lldb_private::FileSpec& file_spec);
+
+    virtual lldb_private::Error
+    Unlink (const char *path);
+
+    virtual lldb_private::Error
+    RunShellCommand (const char *command,           // Shouldn't be NULL
+                     const char *working_dir,       // Pass NULL to use the current working directory
+                     int *status_ptr,               // Pass NULL if you don't want the process exit status
+                     int *signo_ptr,                // Pass NULL if you don't want the signal that caused the process to exit
+                     std::string *command_output,   // Pass NULL if you don't want the command output
+                     uint32_t timeout_sec);         // Timeout in seconds to wait for shell program to finish
 
 protected:
     GDBRemoteCommunicationClient m_gdb_client;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
new file mode 100644
index 00000000000..493f36ca8b4
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
@@ -0,0 +1,69 @@
+//===-- FreeBSDThread.cpp ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// C Includes
+// C++ Includes
+// Other libraries and framework includes
+#include "lldb/Core/State.h"
+
+// Project includes
+#include "FreeBSDThread.h"
+#include "ProcessFreeBSD.h"
+#include "ProcessPOSIXLog.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+//------------------------------------------------------------------------------
+// Constructors and destructors.
+
+FreeBSDThread::FreeBSDThread(Process &process, lldb::tid_t tid)
+    : POSIXThread(process, tid)
+{
+}
+
+FreeBSDThread::~FreeBSDThread()
+{
+}
+
+//------------------------------------------------------------------------------
+// ProcessInterface protocol.
+
+void
+FreeBSDThread::WillResume(lldb::StateType resume_state)
+{
+    Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_THREAD));
+    if (log)
+        log->Printf("tid %lu resume_state = %s", GetID(),
+                    lldb_private::StateAsCString(resume_state));
+    ProcessSP process_sp(GetProcess());
+    ProcessFreeBSD *process = static_cast<ProcessFreeBSD *>(process_sp.get());
+    int signo = GetResumeSignal();
+    bool signo_valid = process->GetUnixSignals().SignalIsValid(signo);
+
+    switch (resume_state)
+    {
+    case eStateSuspended:
+    case eStateStopped:
+        process->m_suspend_tids.push_back(GetID());
+        break;
+    case eStateRunning:
+        process->m_run_tids.push_back(GetID());
+        if (signo_valid)
+            process->m_resume_signo = signo;
+        break;
+    case eStateStepping:
+        process->m_step_tids.push_back(GetID());
+        if (signo_valid)
+            process->m_resume_signo = signo;
+        break; 
+    default:
+        break;
+    }
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h
new file mode 100644
index 00000000000..8741075cb60
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.h
@@ -0,0 +1,39 @@
+//===-- FreeBSDThread.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_FreeBSDThread_H_
+#define liblldb_FreeBSDThread_H_
+
+// Other libraries and framework includes
+#include "POSIXThread.h"
+
+//------------------------------------------------------------------------------
+// @class FreeBSDThread
+// @brief Abstraction of a FreeBSD thread.
+class FreeBSDThread
+    : public POSIXThread
+{
+public:
+
+    //------------------------------------------------------------------
+    // Constructors and destructors
+    //------------------------------------------------------------------
+    FreeBSDThread(lldb_private::Process &process, lldb::tid_t tid);
+
+    virtual ~FreeBSDThread();
+
+    //--------------------------------------------------------------------------
+    // FreeBSDThread internal API.
+
+    // POSIXThread override
+    virtual void
+    WillResume(lldb::StateType resume_state);
+};
+
+#endif // #ifndef liblldb_FreeBSDThread_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
index ea26d972b86..083f08ebba8 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
@@ -23,7 +23,7 @@
 #include "ProcessPOSIXLog.h"
 #include "Plugins/Process/Utility/InferiorCallPOSIX.h"
 #include "ProcessMonitor.h"
-#include "POSIXThread.h"
+#include "FreeBSDThread.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -122,11 +122,154 @@ ProcessFreeBSD::Terminate()
 {
 }
 
+Error
+ProcessFreeBSD::DoDetach(bool keep_stopped)
+{
+    Error error;
+    if (keep_stopped)
+    {
+        error.SetErrorString("Detaching with keep_stopped true is not currently supported on FreeBSD.");
+        return error;
+    }
+
+    error = m_monitor->Detach(GetID());
+
+    if (error.Success())
+        SetPrivateState(eStateDetached);
+
+    return error;
+}
+
+Error
+ProcessFreeBSD::DoResume()
+{
+    Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_PROCESS));
+
+    // FreeBSD's ptrace() uses 0 to indicate "no signal is to be sent."
+    int resume_signal = 0;
+
+    SetPrivateState(eStateRunning);
+
+    Mutex::Locker lock(m_thread_list.GetMutex());
+    bool do_step = false;
+
+    for (tid_collection::const_iterator t_pos = m_run_tids.begin(), t_end = m_run_tids.end(); t_pos != t_end; ++t_pos)
+    {
+        m_monitor->ThreadSuspend(*t_pos, false);
+    }
+    for (tid_collection::const_iterator t_pos = m_step_tids.begin(), t_end = m_step_tids.end(); t_pos != t_end; ++t_pos)
+    {
+        m_monitor->ThreadSuspend(*t_pos, false);
+        do_step = true;
+    }
+    for (tid_collection::const_iterator t_pos = m_suspend_tids.begin(), t_end = m_suspend_tids.end(); t_pos != t_end; ++t_pos)
+    {
+        m_monitor->ThreadSuspend(*t_pos, true);
+        // XXX Cannot PT_CONTINUE properly with suspended threads.
+        do_step = true;
+    }
+
+    if (log)
+        log->Printf("process %lu resuming (%s)", GetID(), do_step ? "step" : "continue");
+    if (do_step)
+        m_monitor->SingleStep(GetID(), resume_signal);
+    else
+        m_monitor->Resume(GetID(), resume_signal);
+
+    return Error();
+}
+
 bool
 ProcessFreeBSD::UpdateThreadList(ThreadList &old_thread_list, ThreadList &new_thread_list)
 {
-    // XXX haxx
-    new_thread_list = old_thread_list;
-  
-    return false;
+    Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_PROCESS));
+    if (log)
+        log->Printf("ProcessFreeBSD::%s (pid = %" PRIu64 ")", __FUNCTION__, GetID());
+
+    std::vector<lldb::pid_t> tds;
+    if (!GetMonitor().GetCurrentThreadIDs(tds))
+    {
+        return false;
+    }
+
+    ThreadList old_thread_list_copy(old_thread_list);
+    for (size_t i = 0; i < tds.size(); ++i)
+    {
+        tid_t tid = tds[i];
+        ThreadSP thread_sp (old_thread_list_copy.RemoveThreadByID(tid, false));
+        if (!thread_sp)
+        {
+            thread_sp.reset(new FreeBSDThread(*this, tid));
+            if (log)
+                log->Printf("ProcessFreeBSD::%s new tid = %" PRIu64, __FUNCTION__, tid);
+        }
+        else
+        {
+            if (log)
+                log->Printf("ProcessFreeBSD::%s existing tid = %" PRIu64, __FUNCTION__, tid);
+        }
+        new_thread_list.AddThread(thread_sp);
+    }
+    for (size_t i = 0; i < old_thread_list_copy.GetSize(false); ++i)
+    {
+        ThreadSP old_thread_sp(old_thread_list_copy.GetThreadAtIndex(i, false));
+        if (old_thread_sp)
+        {
+            if (log)
+                log->Printf("ProcessFreeBSD::%s remove tid", __FUNCTION__);
+        }
+    }
+
+    return true;
 }
+
+Error
+ProcessFreeBSD::WillResume()
+{
+    m_suspend_tids.clear();
+    m_run_tids.clear();
+    m_step_tids.clear();
+    return ProcessPOSIX::WillResume();
+}
+
+void
+ProcessFreeBSD::SendMessage(const ProcessMessage &message)
+{
+    Mutex::Locker lock(m_message_mutex);
+
+    switch (message.GetKind())
+    {
+    case ProcessMessage::eInvalidMessage:
+        return;
+
+    case ProcessMessage::eAttachMessage:
+        SetPrivateState(eStateStopped);
+        return;
+
+    case ProcessMessage::eLimboMessage:
+    case ProcessMessage::eExitMessage:
+        m_exit_status = message.GetExitStatus();
+        SetExitStatus(m_exit_status, NULL);
+        break;
+
+    case ProcessMessage::eSignalMessage:
+    case ProcessMessage::eSignalDeliveredMessage:
+    case ProcessMessage::eBreakpointMessage:
+    case ProcessMessage::eTraceMessage:
+    case ProcessMessage::eWatchpointMessage:
+    case ProcessMessage::eCrashMessage:
+        SetPrivateState(eStateStopped);
+        break;
+
+    case ProcessMessage::eNewThreadMessage:
+        assert(0 && "eNewThreadMessage unexpected on FreeBSD");
+        break;
+
+    case ProcessMessage::eExecMessage:
+        SetPrivateState(eStateStopped);
+        break;
+    }
+
+    m_message_queue.push(message);
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
index 5f79b74cad3..ccae5cb8f00 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.h
@@ -54,9 +54,21 @@ public:
     ProcessFreeBSD(lldb_private::Target& target,
                    lldb_private::Listener &listener);
 
+    virtual lldb_private::Error
+    DoDetach(bool keep_stopped);
+
     virtual bool
     UpdateThreadList(lldb_private::ThreadList &old_thread_list, lldb_private::ThreadList &new_thread_list);
 
+    virtual lldb_private::Error
+    DoResume();
+
+    virtual lldb_private::Error
+    WillResume();
+
+    virtual void
+    SendMessage(const ProcessMessage &message);
+
     //------------------------------------------------------------------
     // PluginInterface protocol
     //------------------------------------------------------------------
@@ -77,6 +89,16 @@ public:
     EnablePluginLogging(lldb_private::Stream *strm,
                         lldb_private::Args &command);
 
+protected:
+    friend class FreeBSDThread;
+
+    typedef std::vector<lldb::tid_t> tid_collection;
+    tid_collection m_suspend_tids;
+    tid_collection m_run_tids;
+    tid_collection m_step_tids;
+
+    int m_resume_signo;
+
 };
 
 #endif  // liblldb_MacOSXProcess_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
index 9fd51d2d640..d5179967f37 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.cpp
@@ -70,12 +70,12 @@ PtraceWrapper(int req, lldb::pid_t pid, void *addr, int data,
     Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet(POSIX_LOG_PTRACE));
 
     if (log) {
-        log->Printf("ptrace(%s, %lu, %p, %x) called from file %s line %d",
+        log->Printf("ptrace(%s, %" PRIu64 ", %p, %x) called from file %s line %d",
                     reqName, pid, addr, data, file, line);
         if (req == PT_IO) {
             struct ptrace_io_desc *pi = (struct ptrace_io_desc *) addr;
             
-            log->Printf("PT_IO: op=%s offs=%zx size=%ld",
+            log->Printf("PT_IO: op=%s offs=%zx size=%zu",
                      Get_PT_IO_OP(pi->piod_op), (size_t)pi->piod_offs, pi->piod_len);
         }
     }
@@ -465,13 +465,12 @@ WriteFPROperation::Execute(ProcessMonitor *monitor)
 class ResumeOperation : public Operation
 {
 public:
-    ResumeOperation(lldb::tid_t tid, uint32_t signo, bool &result) :
-        m_tid(tid), m_signo(signo), m_result(result) { }
+    ResumeOperation(uint32_t signo, bool &result) :
+        m_signo(signo), m_result(result) { }
 
     void Execute(ProcessMonitor *monitor);
 
 private:
-    lldb::tid_t m_tid;
     uint32_t m_signo;
     bool &m_result;
 };
@@ -479,17 +478,18 @@ private:
 void
 ResumeOperation::Execute(ProcessMonitor *monitor)
 {
+    lldb::pid_t pid = monitor->GetPID();
     int data = 0;
 
     if (m_signo != LLDB_INVALID_SIGNAL_NUMBER)
         data = m_signo;
 
-    if (PTRACE(PT_CONTINUE, m_tid, (caddr_t)1, data))
+    if (PTRACE(PT_CONTINUE, pid, (caddr_t)1, data))
     {
         Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_PROCESS));
 
         if (log)
-            log->Printf ("ResumeOperation (%"  PRIu64 ") failed: %s", m_tid, strerror(errno));
+            log->Printf ("ResumeOperation (%"  PRIu64 ") failed: %s", pid, strerror(errno));
         m_result = false;
     }
     else
@@ -502,13 +502,12 @@ ResumeOperation::Execute(ProcessMonitor *monitor)
 class SingleStepOperation : public Operation
 {
 public:
-    SingleStepOperation(lldb::tid_t tid, uint32_t signo, bool &result)
-        : m_tid(tid), m_signo(signo), m_result(result) { }
+    SingleStepOperation(uint32_t signo, bool &result)
+        : m_signo(signo), m_result(result) { }
 
     void Execute(ProcessMonitor *monitor);
 
 private:
-    lldb::tid_t m_tid;
     uint32_t m_signo;
     bool &m_result;
 };
@@ -516,12 +515,13 @@ private:
 void
 SingleStepOperation::Execute(ProcessMonitor *monitor)
 {
+    lldb::pid_t pid = monitor->GetPID();
     int data = 0;
 
     if (m_signo != LLDB_INVALID_SIGNAL_NUMBER)
         data = m_signo;
 
-    if (PTRACE(PT_STEP, m_tid, NULL, data))
+    if (PTRACE(PT_STEP, pid, NULL, data))
         m_result = false;
     else
         m_result = true;
@@ -559,6 +559,31 @@ LwpInfoOperation::Execute(ProcessMonitor *monitor)
     }
 }
 
+//------------------------------------------------------------------------------
+/// @class ThreadSuspendOperation
+/// @brief Implements ProcessMonitor::ThreadSuspend.
+class ThreadSuspendOperation : public Operation
+{
+public:
+    ThreadSuspendOperation(lldb::tid_t tid, bool suspend, bool &result)
+        : m_tid(tid), m_suspend(suspend), m_result(result) { }
+
+    void Execute(ProcessMonitor *monitor);
+
+private:
+    lldb::tid_t m_tid;
+    bool m_suspend;
+    bool &m_result;
+} ;
+
+void
+ThreadSuspendOperation::Execute(ProcessMonitor *monitor)
+{
+    m_result = !PTRACE(m_suspend ? PT_SUSPEND : PT_RESUME, m_tid, NULL, 0);
+}
+
+
+
 //------------------------------------------------------------------------------
 /// @class EventMessageOperation
 /// @brief Implements ProcessMonitor::GetEventMessage.
@@ -585,7 +610,7 @@ EventMessageOperation::Execute(ProcessMonitor *monitor)
         m_result = false;
     else {
         if (plwp.pl_flags & PL_FLAG_FORKED) {
-            m_message = (unsigned long *)plwp.pl_child_pid;
+            *m_message = plwp.pl_child_pid;
             m_result = true;
         } else
             m_result = false;
@@ -704,23 +729,16 @@ ProcessMonitor::ProcessMonitor(ProcessPOSIX *process,
       m_operation_thread(LLDB_INVALID_HOST_THREAD),
       m_monitor_thread(LLDB_INVALID_HOST_THREAD),
       m_pid(LLDB_INVALID_PROCESS_ID),
-      m_server_mutex(Mutex::eMutexTypeRecursive),
       m_terminal_fd(-1),
-      m_client_fd(-1),
-      m_server_fd(-1)
+      m_operation(0)
 {
-    std::unique_ptr<LaunchArgs> args;
-
-    args.reset(new LaunchArgs(this, module, argv, envp,
-                              stdin_path, stdout_path, stderr_path, working_dir));
+    std::unique_ptr<LaunchArgs> args(new LaunchArgs(this, module, argv, envp,
+                                     stdin_path, stdout_path, stderr_path,
+                                     working_dir));
     
 
-    // Server/client descriptors.
-    if (!EnableIPC())
-    {
-        error.SetErrorToGenericError();
-        error.SetErrorString("Monitor failed to initialize.");
-    }
+    sem_init(&m_operation_pending, 0, 0);
+    sem_init(&m_operation_done, 0, 0);
 
     StartLaunchOpThread(args.get(), error);
     if (!error.Success())
@@ -765,21 +783,14 @@ ProcessMonitor::ProcessMonitor(ProcessPOSIX *process,
       m_operation_thread(LLDB_INVALID_HOST_THREAD),
       m_monitor_thread(LLDB_INVALID_HOST_THREAD),
       m_pid(pid),
-      m_server_mutex(Mutex::eMutexTypeRecursive),
       m_terminal_fd(-1),
-      m_client_fd(-1),
-      m_server_fd(-1)
+      m_operation(0)
 {
-    std::unique_ptr<AttachArgs> args;
+    sem_init(&m_operation_pending, 0, 0);
+    sem_init(&m_operation_done, 0, 0);
 
-    args.reset(new AttachArgs(this, pid));
 
-    // Server/client descriptors.
-    if (!EnableIPC())
-    {
-        error.SetErrorToGenericError();
-        error.SetErrorString("Monitor failed to initialize.");
-    }
+    std::unique_ptr<AttachArgs> args(new AttachArgs(this, pid));
 
     StartAttachOpThread(args.get(), error);
     if (!error.Success())
@@ -855,7 +866,6 @@ ProcessMonitor::Launch(LaunchArgs *args)
 {
     ProcessMonitor *monitor = args->m_monitor;
     ProcessFreeBSD &process = monitor->GetProcess();
-    lldb::ProcessSP processSP = process.shared_from_this();
     const char **argv = args->m_argv;
     const char **envp = args->m_envp;
     const char *stdin_path = args->m_stdin_path;
@@ -868,21 +878,10 @@ ProcessMonitor::Launch(LaunchArgs *args)
     char err_str[err_len];
     lldb::pid_t pid;
 
-    lldb::ThreadSP inferior;
-    Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_PROCESS));
-
     // Propagate the environment if one is not supplied.
     if (envp == NULL || envp[0] == NULL)
         envp = const_cast<const char **>(environ);
 
-    // Pseudo terminal setup.
-    if (!terminal.OpenFirstAvailableMaster(O_RDWR | O_NOCTTY, err_str, err_len))
-    {
-        args->m_error.SetErrorToGenericError();
-        args->m_error.SetErrorString("Could not open controlling TTY.");
-        goto FINISH;
-    }
-
     if ((pid = terminal.Fork(err_str, err_len)) == -1)
     {
         args->m_error.SetErrorToGenericError();
@@ -979,7 +978,7 @@ ProcessMonitor::Launch(LaunchArgs *args)
         }
         goto FINISH;
     }
-    assert(WIFSTOPPED(status) && wpid == pid &&
+    assert(WIFSTOPPED(status) && wpid == (::pid_t)pid &&
            "Could not sync with inferior process.");
 
 #ifdef notyet
@@ -1002,32 +1001,12 @@ ProcessMonitor::Launch(LaunchArgs *args)
     if (!EnsureFDFlags(monitor->m_terminal_fd, O_NONBLOCK, args->m_error))
         goto FINISH;
 
-    // Update the process thread list with this new thread.
-    inferior.reset(process.CreateNewPOSIXThread(*processSP, pid));
-    if (log)
-        log->Printf ("ProcessMonitor::%s() adding pid = %" PRIu64, __FUNCTION__, pid);
-    process.GetThreadList().AddThread(inferior);
-
-    // Let our process instance know the thread has stopped.
-    process.SendMessage(ProcessMessage::Trace(pid));
+    process.SendMessage(ProcessMessage::Attach(pid));
 
 FINISH:
     return args->m_error.Success();
 }
 
-bool
-ProcessMonitor::EnableIPC()
-{
-    int fd[2];
-
-    if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd))
-        return false;
-
-    m_client_fd = fd[0];
-    m_server_fd = fd[1];
-    return true;
-}
-
 void
 ProcessMonitor::StartAttachOpThread(AttachArgs *args, lldb_private::Error &error)
 {
@@ -1059,9 +1038,6 @@ ProcessMonitor::Attach(AttachArgs *args)
 
     ProcessMonitor *monitor = args->m_monitor;
     ProcessFreeBSD &process = monitor->GetProcess();
-    lldb::ProcessSP processSP = process.shared_from_this();
-    ThreadList &tl = process.GetThreadList();
-    lldb::ThreadSP inferior;
 
     if (pid <= 1)
     {
@@ -1084,17 +1060,35 @@ ProcessMonitor::Attach(AttachArgs *args)
         goto FINISH;
     }
 
-    // Update the process thread list with the attached thread.
-    inferior.reset(process.CreateNewPOSIXThread(*processSP, pid));
-    tl.AddThread(inferior);
+    process.SendMessage(ProcessMessage::Attach(pid));
 
-    // Let our process instance know the thread has stopped.
-    process.SendMessage(ProcessMessage::Trace(pid));
-
- FINISH:
+FINISH:
     return args->m_error.Success();
 }
 
+size_t
+ProcessMonitor::GetCurrentThreadIDs(std::vector<lldb::tid_t>&thread_ids)
+{
+    lwpid_t *tids;
+    int tdcnt;
+
+    thread_ids.clear();
+
+    tdcnt = PTRACE(PT_GETNUMLWPS, m_pid, NULL, 0);
+    if (tdcnt <= 0)
+        return 0;
+    tids = (lwpid_t *)malloc(tdcnt * sizeof(*tids));
+    if (tids == NULL)
+        return 0;
+    if (PTRACE(PT_GETLWPLIST, m_pid, (void *)tids, tdcnt) < 0) {
+        free(tids);
+        return 0;
+    }
+    thread_ids = std::vector<lldb::tid_t>(tids, tids + tdcnt);
+    free(tids);
+    return thread_ids.size();
+}
+
 bool
 ProcessMonitor::MonitorCallback(void *callback_baton,
                                 lldb::pid_t pid,
@@ -1127,11 +1121,11 @@ ProcessMonitor::MonitorCallback(void *callback_baton,
         switch (plwp.pl_siginfo.si_signo)
         {
         case SIGTRAP:
-            message = MonitorSIGTRAP(monitor, &plwp.pl_siginfo, pid);
+            message = MonitorSIGTRAP(monitor, &plwp.pl_siginfo, plwp.pl_lwpid);
             break;
             
         default:
-            message = MonitorSignal(monitor, &plwp.pl_siginfo, pid);
+            message = MonitorSignal(monitor, &plwp.pl_siginfo, plwp.pl_lwpid);
             break;
         }
 
@@ -1144,7 +1138,7 @@ ProcessMonitor::MonitorCallback(void *callback_baton,
 
 ProcessMessage
 ProcessMonitor::MonitorSIGTRAP(ProcessMonitor *monitor,
-                               const siginfo_t *info, lldb::pid_t pid)
+                               const siginfo_t *info, lldb::tid_t tid)
 {
     ProcessMessage message;
 
@@ -1165,26 +1159,26 @@ ProcessMonitor::MonitorSIGTRAP(ProcessMonitor *monitor,
         // state of "limbo" until we are explicitly commanded to detach,
         // destroy, resume, etc.
         unsigned long data = 0;
-        if (!monitor->GetEventMessage(pid, &data))
+        if (!monitor->GetEventMessage(tid, &data))
             data = -1;
         if (log)
-            log->Printf ("ProcessMonitor::%s() received exit? event, data = %lx, pid = %" PRIu64, __FUNCTION__, data, pid);
-        message = ProcessMessage::Limbo(pid, (data >> 8));
+            log->Printf ("ProcessMonitor::%s() received exit? event, data = %lx, tid = %" PRIu64, __FUNCTION__, data, tid);
+        message = ProcessMessage::Limbo(tid, (data >> 8));
         break;
     }
 
     case 0:
     case TRAP_TRACE:
         if (log)
-            log->Printf ("ProcessMonitor::%s() received trace event, pid = %" PRIu64, __FUNCTION__, pid);
-        message = ProcessMessage::Trace(pid);
+            log->Printf ("ProcessMonitor::%s() received trace event, tid = %" PRIu64, __FUNCTION__, tid);
+        message = ProcessMessage::Trace(tid);
         break;
 
     case SI_KERNEL:
     case TRAP_BRKPT:
         if (log)
-            log->Printf ("ProcessMonitor::%s() received breakpoint event, pid = %" PRIu64, __FUNCTION__, pid);
-        message = ProcessMessage::Break(pid);
+            log->Printf ("ProcessMonitor::%s() received breakpoint event, tid = %" PRIu64, __FUNCTION__, tid);
+        message = ProcessMessage::Break(tid);
         break;
     }
 
@@ -1193,7 +1187,7 @@ ProcessMonitor::MonitorSIGTRAP(ProcessMonitor *monitor,
 
 ProcessMessage
 ProcessMonitor::MonitorSignal(ProcessMonitor *monitor,
-                              const siginfo_t *info, lldb::pid_t pid)
+                              const siginfo_t *info, lldb::tid_t tid)
 {
     ProcessMessage message;
     int signo = info->si_signo;
@@ -1217,9 +1211,9 @@ ProcessMonitor::MonitorSignal(ProcessMonitor *monitor,
                             "SI_USER",
                             info->si_pid);
         if (info->si_pid == getpid())
-            return ProcessMessage::SignalDelivered(pid, signo);
+            return ProcessMessage::SignalDelivered(tid, signo);
         else
-            return ProcessMessage::Signal(pid, signo);
+            return ProcessMessage::Signal(tid, signo);
     }
 
     if (log)
@@ -1228,30 +1222,30 @@ ProcessMonitor::MonitorSignal(ProcessMonitor *monitor,
     if (signo == SIGSEGV) {
         lldb::addr_t fault_addr = reinterpret_cast<lldb::addr_t>(info->si_addr);
         ProcessMessage::CrashReason reason = GetCrashReasonForSIGSEGV(info);
-        return ProcessMessage::Crash(pid, reason, signo, fault_addr);
+        return ProcessMessage::Crash(tid, reason, signo, fault_addr);
     }
 
     if (signo == SIGILL) {
         lldb::addr_t fault_addr = reinterpret_cast<lldb::addr_t>(info->si_addr);
         ProcessMessage::CrashReason reason = GetCrashReasonForSIGILL(info);
-        return ProcessMessage::Crash(pid, reason, signo, fault_addr);
+        return ProcessMessage::Crash(tid, reason, signo, fault_addr);
     }
 
     if (signo == SIGFPE) {
         lldb::addr_t fault_addr = reinterpret_cast<lldb::addr_t>(info->si_addr);
         ProcessMessage::CrashReason reason = GetCrashReasonForSIGFPE(info);
-        return ProcessMessage::Crash(pid, reason, signo, fault_addr);
+        return ProcessMessage::Crash(tid, reason, signo, fault_addr);
     }
 
     if (signo == SIGBUS) {
         lldb::addr_t fault_addr = reinterpret_cast<lldb::addr_t>(info->si_addr);
         ProcessMessage::CrashReason reason = GetCrashReasonForSIGBUS(info);
-        return ProcessMessage::Crash(pid, reason, signo, fault_addr);
+        return ProcessMessage::Crash(tid, reason, signo, fault_addr);
     }
 
     // Everything else is "normal" and does not require any special action on
     // our part.
-    return ProcessMessage::Signal(pid, signo);
+    return ProcessMessage::Signal(tid, signo);
 }
 
 ProcessMessage::CrashReason
@@ -1392,79 +1386,36 @@ ProcessMonitor::GetCrashReasonForSIGBUS(const siginfo_t *info)
 void
 ProcessMonitor::ServeOperation(OperationArgs *args)
 {
-    int status;
-    pollfd fdset;
-
     ProcessMonitor *monitor = args->m_monitor;
 
-    fdset.fd = monitor->m_server_fd;
-    fdset.events = POLLIN | POLLPRI;
-    fdset.revents = 0;
-
     // We are finised with the arguments and are ready to go.  Sync with the
     // parent thread and start serving operations on the inferior.
     sem_post(&args->m_semaphore);
 
     for (;;)
     {
-        if ((status = poll(&fdset, 1, -1)) < 0)
-        {
-            switch (errno)
-            {
-            default:
-                assert(false && "Unexpected poll() failure!");
-                continue;
+        // wait for next pending operation
+        sem_wait(&monitor->m_operation_pending);
 
-            case EINTR: continue; // Just poll again.
-            case EBADF: return;   // Connection terminated.
-            }
-        }
+        monitor->m_operation->Execute(monitor);
 
-        assert(status == 1 && "Too many descriptors!");
-
-        if (fdset.revents & POLLIN)
-        {
-            Operation *op = NULL;
-
-        READ_AGAIN:
-            if ((status = read(fdset.fd, &op, sizeof(op))) < 0)
-            {
-                // There is only one acceptable failure.
-                assert(errno == EINTR);
-                goto READ_AGAIN;
-            }
-            if (status == 0)
-                continue; // Poll again. The connection probably terminated.
-            assert(status == sizeof(op));
-            op->Execute(monitor);
-            write(fdset.fd, &op, sizeof(op));
-        }
+        // notify calling thread that operation is complete
+        sem_post(&monitor->m_operation_done);
     }
 }
 
 void
 ProcessMonitor::DoOperation(Operation *op)
 {
-    int status;
-    Operation *ack = NULL;
-    Mutex::Locker lock(m_server_mutex);
+    Mutex::Locker lock(m_operation_mutex);
 
-    // FIXME: Do proper error checking here.
-    write(m_client_fd, &op, sizeof(op));
+    m_operation = op;
 
-READ_AGAIN:
-    if ((status = read(m_client_fd, &ack, sizeof(ack))) < 0)
-    {
-        // If interrupted by a signal handler try again.  Otherwise the monitor
-        // thread probably died and we have a stale file descriptor -- abort the
-        // operation.
-        if (errno == EINTR)
-            goto READ_AGAIN;
-        return;
-    }
+    // notify operation thread that an operation is ready to be processed
+    sem_post(&m_operation_pending);
 
-    assert(status == sizeof(ack));
-    assert(ack == op && "Invalid monitor thread response!");
+    // wait for operation to complete
+    sem_wait(&m_operation_done);
 }
 
 size_t
@@ -1556,15 +1507,21 @@ ProcessMonitor::WriteRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, un
 }
 
 bool
-ProcessMonitor::Resume(lldb::tid_t tid, uint32_t signo)
+ProcessMonitor::ReadThreadPointer(lldb::tid_t tid, lldb::addr_t &value)
+{
+    return false;
+}
+
+bool
+ProcessMonitor::Resume(lldb::tid_t unused, uint32_t signo)
 {
     bool result;
     Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_PROCESS));
 
     if (log)
-        log->Printf ("ProcessMonitor::%s() resuming thread = %"  PRIu64 " with signal %s", __FUNCTION__, tid,
+        log->Printf ("ProcessMonitor::%s() resuming pid %"  PRIu64 " with signal %s", __FUNCTION__, GetPID(),
                                  m_process->GetUnixSignals().GetSignalAsCString (signo));
-    ResumeOperation op(tid, signo, result);
+    ResumeOperation op(signo, result);
     DoOperation(&op);
     if (log)
         log->Printf ("ProcessMonitor::%s() resuming result = %s", __FUNCTION__, result ? "true" : "false");
@@ -1572,10 +1529,10 @@ ProcessMonitor::Resume(lldb::tid_t tid, uint32_t signo)
 }
 
 bool
-ProcessMonitor::SingleStep(lldb::tid_t tid, uint32_t signo)
+ProcessMonitor::SingleStep(lldb::tid_t unused, uint32_t signo)
 {
     bool result;
-    SingleStepOperation op(tid, signo, result);
+    SingleStepOperation op(signo, result);
     DoOperation(&op);
     return result;
 }
@@ -1598,6 +1555,15 @@ ProcessMonitor::GetLwpInfo(lldb::tid_t tid, void *lwpinfo, int &ptrace_err)
     return result;
 }
 
+bool
+ProcessMonitor::ThreadSuspend(lldb::tid_t tid, bool suspend)
+{
+    bool result;
+    ThreadSuspendOperation op(tid, suspend, result);
+    DoOperation(&op);
+    return result;
+}
+
 bool
 ProcessMonitor::GetEventMessage(lldb::tid_t tid, unsigned long *message)
 {
@@ -1648,9 +1614,36 @@ ProcessMonitor::StopMonitor()
 {
     StopMonitoringChildProcess();
     StopOpThread();
-    CloseFD(m_terminal_fd);
-    CloseFD(m_client_fd);
-    CloseFD(m_server_fd);
+    sem_destroy(&m_operation_pending);
+    sem_destroy(&m_operation_done);
+
+    // Note: ProcessPOSIX passes the m_terminal_fd file descriptor to
+    // Process::SetSTDIOFileDescriptor, which in turn transfers ownership of
+    // the descriptor to a ConnectionFileDescriptor object.  Consequently
+    // even though still has the file descriptor, we shouldn't close it here.
+}
+
+// FIXME: On Linux, when a new thread is created, we receive to notifications,
+// (1) a SIGTRAP|PTRACE_EVENT_CLONE from the main process thread with the
+// child thread id as additional information, and (2) a SIGSTOP|SI_USER from
+// the new child thread indicating that it has is stopped because we attached.
+// We have no guarantee of the order in which these arrive, but we need both
+// before we are ready to proceed.  We currently keep a list of threads which
+// have sent the initial SIGSTOP|SI_USER event.  Then when we receive the
+// SIGTRAP|PTRACE_EVENT_CLONE notification, if the initial stop has not occurred
+// we call ProcessMonitor::WaitForInitialTIDStop() to wait for it.
+//
+// Right now, the above logic is in ProcessPOSIX, so we need a definition of
+// this function in the FreeBSD ProcessMonitor implementation even if it isn't
+// logically needed.
+//
+// We really should figure out what actually happens on FreeBSD and move the
+// Linux-specific logic out of ProcessPOSIX as needed.
+
+bool
+ProcessMonitor::WaitForInitialTIDStop(lldb::tid_t tid)
+{
+    return true;
 }
 
 void
@@ -1665,13 +1658,3 @@ ProcessMonitor::StopOpThread()
     Host::ThreadJoin(m_operation_thread, &result, NULL);
     m_operation_thread = LLDB_INVALID_HOST_THREAD;
 }
-
-void
-ProcessMonitor::CloseFD(int &fd)
-{
-    if (fd != -1)
-    {
-        close(fd);
-        fd = -1;
-    }
-}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h
index ce66c03f2f8..36b2fe08442 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/FreeBSD/ProcessMonitor.h
@@ -160,26 +160,38 @@ public:
     bool
     WriteRegisterSet(lldb::tid_t tid, void *buf, size_t buf_size, unsigned int regset);
 
+    /// Reads the value of the thread-specific pointer for a given thread ID.
+    bool
+    ReadThreadPointer(lldb::tid_t tid, lldb::addr_t &value);
+
+    /// Returns current thread IDs in process
+    size_t
+    GetCurrentThreadIDs(std::vector<lldb::tid_t> &thread_ids);
+
     /// Writes a ptrace_lwpinfo structure corresponding to the given thread ID
     /// to the memory region pointed to by @p lwpinfo.
     bool
     GetLwpInfo(lldb::tid_t tid, void *lwpinfo, int &error_no);
 
+    /// Suspends or unsuspends a thread prior to process resume or step.
+    bool
+    ThreadSuspend(lldb::tid_t tid, bool suspend);
+
     /// Writes the raw event message code (vis-a-vis PTRACE_GETEVENTMSG)
     /// corresponding to the given thread IDto the memory pointed to by @p
     /// message.
     bool
     GetEventMessage(lldb::tid_t tid, unsigned long *message);
 
-    /// Resumes the given thread.  If @p signo is anything but
-    /// LLDB_INVALID_SIGNAL_NUMBER, deliver that signal to the thread.
+    /// Resumes the process.  If @p signo is anything but
+    /// LLDB_INVALID_SIGNAL_NUMBER, deliver that signal to the process.
     bool
-    Resume(lldb::tid_t tid, uint32_t signo);
+    Resume(lldb::tid_t unused, uint32_t signo);
 
-    /// Single steps the given thread.  If @p signo is anything but
-    /// LLDB_INVALID_SIGNAL_NUMBER, deliver that signal to the thread.
+    /// Single steps the process.  If @p signo is anything but
+    /// LLDB_INVALID_SIGNAL_NUMBER, deliver that signal to the process.
     bool
-    SingleStep(lldb::tid_t tid, uint32_t signo);
+    SingleStep(lldb::tid_t unused, uint32_t signo);
 
     /// Sends the inferior process a PTRACE_KILL signal.  The inferior will
     /// still exists and can be interrogated.  Once resumed it will exit as
@@ -193,6 +205,10 @@ public:
     void
     StopMonitor();
 
+    // Waits for the initial stop message from a new thread.
+    bool
+    WaitForInitialTIDStop(lldb::tid_t tid);
+
 private:
     ProcessFreeBSD *m_process;
 
@@ -200,12 +216,17 @@ private:
     lldb::thread_t m_monitor_thread;
     lldb::pid_t m_pid;
 
-
-    lldb_private::Mutex m_server_mutex;
     int m_terminal_fd;
-    int m_client_fd;
-    int m_server_fd;
 
+    // current operation which must be executed on the privileged thread
+    Operation *m_operation;
+    lldb_private::Mutex m_operation_mutex;
+
+    // semaphores notified when Operation is ready to be processed and when
+    // the operation is complete.
+    sem_t m_operation_pending;
+    sem_t m_operation_done;
+    
     struct OperationArgs
     {
         OperationArgs(ProcessMonitor *monitor);
@@ -252,9 +273,6 @@ private:
     static bool
     Launch(LaunchArgs *args);
 
-    bool
-    EnableIPC();
-
     struct AttachArgs : OperationArgs
     {
         AttachArgs(ProcessMonitor *monitor,
@@ -314,9 +332,6 @@ private:
     /// Stops the operation thread used to attach/launch a process.
     void
     StopOpThread();
-
-    void
-    CloseFD(int &fd);
 };
 
 #endif // #ifndef liblldb_ProcessMonitor_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp
index 93c296679df..e1dda424693 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.cpp
@@ -29,10 +29,12 @@
 #include "ProcessPOSIX.h"
 #include "ProcessPOSIXLog.h"
 #include "ProcessMonitor.h"
-#include "RegisterContext_i386.h"
-#include "RegisterContext_x86_64.h"
-#include "RegisterContextPOSIX.h"
+#include "RegisterContextPOSIXProcessMonitor_mips64.h"
+#include "RegisterContextPOSIXProcessMonitor_x86.h"
+#include "RegisterContextLinux_i386.h"
 #include "RegisterContextLinux_x86_64.h"
+#include "RegisterContextFreeBSD_i386.h"
+#include "RegisterContextFreeBSD_mips64.h"
 #include "RegisterContextFreeBSD_x86_64.h"
 
 #include "UnwindLLDB.h"
@@ -46,7 +48,8 @@ POSIXThread::POSIXThread(Process &process, lldb::tid_t tid)
       m_frame_ap (),
       m_breakpoint (),
       m_thread_name_valid (false),
-      m_thread_name ()
+      m_thread_name (),
+      m_posix_thread(NULL)
 {
     Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_THREAD));
     if (log && log->GetMask().Test(POSIX_LOG_VERBOSE))
@@ -80,6 +83,7 @@ POSIXThread::GetMonitor()
     return process.GetMonitor();
 }
 
+// Overridden by FreeBSDThread; this is used only on Linux.
 void
 POSIXThread::RefreshStateAfterStop()
 {
@@ -138,34 +142,66 @@ POSIXThread::GetRegisterContext()
 {
     if (!m_reg_context_sp)
     {
-        ArchSpec arch = Host::GetArchitecture();
+        m_posix_thread = NULL;
 
-        switch (arch.GetCore())
+        RegisterInfoInterface *reg_interface = NULL;
+        const ArchSpec &target_arch = GetProcess()->GetTarget().GetArchitecture();
+
+        switch (target_arch.GetCore())
         {
-        default:
-            assert(false && "CPU type not supported!");
-            break;
-
-        case ArchSpec::eCore_x86_32_i386:
-        case ArchSpec::eCore_x86_32_i486:
-        case ArchSpec::eCore_x86_32_i486sx:
-            m_reg_context_sp.reset(new RegisterContext_i386(*this, 0));
-            break;
-
-        case ArchSpec::eCore_x86_64_x86_64:
-            switch (arch.GetTriple().getOS())
+            case ArchSpec::eCore_mips64:
             {
-                case llvm::Triple::FreeBSD:
-                    m_reg_context_sp.reset(new RegisterContextFreeBSD_x86_64(*this, 0));
-                    break;
-                case llvm::Triple::Linux:
-                    m_reg_context_sp.reset(new RegisterContextLinux_x86_64(*this, 0));
-                    break;
-                default:
-                    assert(false && "OS not supported");
-                    break;
+                RegisterInfoInterface *reg_interface = NULL;
+
+                switch (target_arch.GetTriple().getOS())
+                {
+                    case llvm::Triple::FreeBSD:
+                        reg_interface = new RegisterContextFreeBSD_mips64(target_arch);
+                        break;
+                    default:
+                        assert(false && "OS not supported");
+                        break;
+                }
+
+                if (reg_interface)
+                {
+                    RegisterContextPOSIXProcessMonitor_mips64 *reg_ctx = new RegisterContextPOSIXProcessMonitor_mips64(*this, 0, reg_interface);
+                    m_posix_thread = reg_ctx;
+                    m_reg_context_sp.reset(reg_ctx);
+                }
+                break;
             }
-            break;
+
+            case ArchSpec::eCore_x86_32_i386:
+            case ArchSpec::eCore_x86_32_i486:
+            case ArchSpec::eCore_x86_32_i486sx:
+            case ArchSpec::eCore_x86_64_x86_64:
+            {
+                switch (target_arch.GetTriple().getOS())
+                {
+                    case llvm::Triple::FreeBSD:
+                        reg_interface = new RegisterContextFreeBSD_x86_64(target_arch);
+                        break;
+                    case llvm::Triple::Linux:
+                        reg_interface = new RegisterContextLinux_x86_64(target_arch);
+                        break;
+                    default:
+                        assert(false && "OS not supported");
+                        break;
+                }
+
+                if (reg_interface)
+                {
+                    RegisterContextPOSIXProcessMonitor_x86_64 *reg_ctx = new RegisterContextPOSIXProcessMonitor_x86_64(*this, 0, reg_interface);
+                    m_posix_thread = reg_ctx;
+                    m_reg_context_sp.reset(reg_ctx);
+                }
+                break;
+            }
+
+            default:
+                assert(false && "CPU type not supported!");
+                break;
         }
     }
     return m_reg_context_sp;
@@ -195,6 +231,17 @@ POSIXThread::CreateRegisterContextForFrame(lldb_private::StackFrame *frame)
     return reg_ctx_sp;
 }
 
+lldb::addr_t
+POSIXThread::GetThreadPointer ()
+{
+    ProcessMonitor &monitor = GetMonitor();
+    addr_t addr;
+    if (monitor.ReadThreadPointer (GetID(), addr))
+        return addr;
+    else
+        return LLDB_INVALID_ADDRESS;
+}
+
 bool
 POSIXThread::CalculateStopInfo()
 {
@@ -211,6 +258,7 @@ POSIXThread::GetUnwinder()
     return m_unwinder_ap.get();
 }
 
+// Overridden by FreeBSDThread; this is used only on Linux.
 void
 POSIXThread::WillResume(lldb::StateType resume_state)
 {
@@ -228,43 +276,6 @@ POSIXThread::DidStop()
     // Don't set the thread state to stopped unless we really stopped.
 }
 
-bool
-POSIXThread::Resume()
-{
-    lldb::StateType resume_state = GetResumeState();
-    ProcessMonitor &monitor = GetMonitor();
-    bool status;
-
-    Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_THREAD));
-    if (log)
-        log->Printf ("POSIXThread::%s (), resume_state = %s", __FUNCTION__,
-                         StateAsCString(resume_state));
-
-    switch (resume_state)
-    {
-    default:
-        assert(false && "Unexpected state for resume!");
-        status = false;
-        break;
-
-    case lldb::eStateRunning:
-        SetState(resume_state);
-        status = monitor.Resume(GetID(), GetResumeSignal());
-        break;
-
-    case lldb::eStateStepping:
-        SetState(resume_state);
-        status = monitor.SingleStep(GetID(), GetResumeSignal());
-        break;
-    case lldb::eStateStopped:
-    case lldb::eStateSuspended:
-        status = true;
-        break;
-    }
-
-    return status;
-}
-
 void
 POSIXThread::Notify(const ProcessMessage &message)
 {
@@ -314,6 +325,10 @@ POSIXThread::Notify(const ProcessMessage &message)
     case ProcessMessage::eNewThreadMessage:
         ThreadNotify(message);
         break;
+
+    case ProcessMessage::eExecMessage:
+        ExecNotify(message);
+        break;
     }
 }
 
@@ -328,7 +343,7 @@ POSIXThread::EnableHardwareWatchpoint(Watchpoint *wp)
         bool wp_read = wp->WatchpointRead();
         bool wp_write = wp->WatchpointWrite();
         uint32_t wp_hw_index = wp->GetHardwareIndex();
-        RegisterContextPOSIX* reg_ctx = GetRegisterContextPOSIX();
+        POSIXBreakpointProtocol* reg_ctx = GetPOSIXBreakpointProtocol();
         if (reg_ctx)
             wp_set = reg_ctx->SetHardwareWatchpointWithIndex(wp_addr, wp_size,
                                                              wp_read, wp_write,
@@ -365,7 +380,7 @@ POSIXThread::FindVacantWatchpointIndex()
     uint32_t hw_index = LLDB_INVALID_INDEX32;
     uint32_t num_hw_wps = NumSupportedHardwareWatchpoints();
     uint32_t wp_idx;
-    RegisterContextPOSIX* reg_ctx = GetRegisterContextPOSIX();
+    POSIXBreakpointProtocol* reg_ctx = GetPOSIXBreakpointProtocol();
     if (reg_ctx)
     {
         for (wp_idx = 0; wp_idx < num_hw_wps; wp_idx++)
@@ -387,7 +402,7 @@ POSIXThread::BreakNotify(const ProcessMessage &message)
     Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_THREAD));
 
     assert(GetRegisterContext());
-    status = GetRegisterContextPOSIX()->UpdateAfterBreakpoint();
+    status = GetPOSIXBreakpointProtocol()->UpdateAfterBreakpoint();
     assert(status && "Breakpoint update failed!");
 
     // With our register state restored, resolve the breakpoint object
@@ -399,31 +414,22 @@ POSIXThread::BreakNotify(const ProcessMessage &message)
     lldb::BreakpointSiteSP bp_site(GetProcess()->GetBreakpointSiteList().FindByAddress(pc));
 
     // If the breakpoint is for this thread, then we'll report the hit, but if it is for another thread,
-    // we can just report no reason.  We don't need to worry about stepping over the breakpoint here, that
-    // will be taken care of when the thread resumes and notices that there's a breakpoint under the pc.
-    if (bp_site && bp_site->ValidForThisThread(this))
+    // we create a stop reason with should_stop=false.  If there is no breakpoint location, then report
+    // an invalid stop reason. We don't need to worry about stepping over the breakpoint here, that will
+    // be taken care of when the thread resumes and notices that there's a breakpoint under the pc.
+    if (bp_site)
     {
         lldb::break_id_t bp_id = bp_site->GetID();
-        if (GetProcess()->GetThreadList().SetSelectedThreadByID(GetID()))
+        if (bp_site->ValidForThisThread(this))
             SetStopInfo (StopInfo::CreateStopReasonWithBreakpointSiteID(*this, bp_id));
-        else
-            assert(false && "Invalid thread ID during BreakNotify.");
-    }
-    else
-    {
-        const ThreadSpec *spec = bp_site ? 
-            bp_site->GetOwnerAtIndex(0)->GetOptionsNoCreate()->GetThreadSpecNoCreate() : 0;
-
-        if (spec && spec->TIDMatches(*this))
-            assert(false && "BreakpointSite is invalid for the current ThreadSpec.");
         else
         {
-            if (!m_stop_info_sp) {
-                StopInfoSP invalid_stop_info_sp;
-                SetStopInfo (invalid_stop_info_sp);
-            }
+            const bool should_stop = false;
+            SetStopInfo (StopInfo::CreateStopReasonWithBreakpointSiteID(*this, bp_id, should_stop));
         }
     }
+    else
+        SetStopInfo(StopInfoSP());
 }
 
 void
@@ -436,7 +442,7 @@ POSIXThread::WatchNotify(const ProcessMessage &message)
         log->Printf ("POSIXThread::%s () Hardware Watchpoint Address = 0x%8.8"
                      PRIx64, __FUNCTION__, halt_addr);
 
-    RegisterContextPOSIX* reg_ctx = GetRegisterContextPOSIX();
+    POSIXBreakpointProtocol* reg_ctx = GetPOSIXBreakpointProtocol();
     if (reg_ctx)
     {
         uint32_t num_hw_wps = reg_ctx->NumSupportedHardwareWatchpoints();
@@ -532,22 +538,26 @@ POSIXThread::GetRegisterIndexFromOffset(unsigned offset)
         llvm_unreachable("CPU type not supported!");
         break;
 
+    case ArchSpec::eCore_mips64:
     case ArchSpec::eCore_x86_32_i386:
     case ArchSpec::eCore_x86_32_i486:
     case ArchSpec::eCore_x86_32_i486sx:
     case ArchSpec::eCore_x86_64_x86_64:
         {
-            RegisterContextSP base = GetRegisterContext();
-            if (base) {
-                RegisterContextPOSIX &context = static_cast<RegisterContextPOSIX &>(*base);
-                reg = context.GetRegisterIndexFromOffset(offset);
-            }
+            POSIXBreakpointProtocol* reg_ctx = GetPOSIXBreakpointProtocol();
+            reg = reg_ctx->GetRegisterIndexFromOffset(offset);
         }
         break;
     }
     return reg;
 }
 
+void
+POSIXThread::ExecNotify(const ProcessMessage &message)
+{
+    SetStopInfo (StopInfo::CreateStopReasonWithExec(*this));
+}
+
 const char *
 POSIXThread::GetRegisterName(unsigned reg)
 {
@@ -560,6 +570,7 @@ POSIXThread::GetRegisterName(unsigned reg)
         assert(false && "CPU type not supported!");
         break;
 
+    case ArchSpec::eCore_mips64:
     case ArchSpec::eCore_x86_32_i386:
     case ArchSpec::eCore_x86_32_i486:
     case ArchSpec::eCore_x86_32_i486sx:
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h
index d051d23860d..a59a3a7e676 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/POSIXThread.h
@@ -21,7 +21,7 @@
 
 class ProcessMessage;
 class ProcessMonitor;
-class RegisterContextPOSIX;
+class POSIXBreakpointProtocol;
 
 //------------------------------------------------------------------------------
 // @class POSIXThread
@@ -59,6 +59,9 @@ public:
     virtual lldb::RegisterContextSP
     CreateRegisterContextForFrame (lldb_private::StackFrame *frame);
 
+    virtual lldb::addr_t
+    GetThreadPointer ();
+
     //--------------------------------------------------------------------------
     // These functions provide a mapping from the register offset
     // back to the register index or name for use in debugging or log
@@ -76,8 +79,6 @@ public:
     //--------------------------------------------------------------------------
     // These methods form a specialized interface to POSIX threads.
     //
-    bool Resume();
-
     void Notify(const ProcessMessage &message);
 
     //--------------------------------------------------------------------------
@@ -92,15 +93,12 @@ public:
     uint32_t FindVacantWatchpointIndex();
 
 protected:
-    RegisterContextPOSIX *
-    GetRegisterContextPOSIX ()
+    POSIXBreakpointProtocol *
+    GetPOSIXBreakpointProtocol ()
     {
         if (!m_reg_context_sp)
             m_reg_context_sp = GetRegisterContext();
-#if 0
-        return dynamic_cast<RegisterContextPOSIX*>(m_reg_context_sp.get());
-#endif
-        return (RegisterContextPOSIX *)m_reg_context_sp.get();
+        return m_posix_thread;
     }
     
     std::unique_ptr<lldb_private::StackFrame> m_frame_ap;
@@ -109,6 +107,7 @@ protected:
 
     bool m_thread_name_valid;
     std::string m_thread_name;
+    POSIXBreakpointProtocol *m_posix_thread;
 
     ProcessMonitor &
     GetMonitor();
@@ -125,6 +124,7 @@ protected:
     void CrashNotify(const ProcessMessage &message);
     void ThreadNotify(const ProcessMessage &message);
     void ExitNotify(const ProcessMessage &message);
+    void ExecNotify(const ProcessMessage &message);
 
     lldb_private::Unwind *
     GetUnwinder();
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.cpp
index 60a29e07cea..5c53627f9e0 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.cpp
@@ -218,6 +218,9 @@ ProcessMessage::PrintKind(Kind kind)
     case eInvalidMessage:
         str = "eInvalidMessage";
         break;
+    case eAttachMessage:
+        str = "eAttachMessage";
+        break;
     case eExitMessage:
         str = "eExitMessage";
         break;
@@ -245,6 +248,9 @@ ProcessMessage::PrintKind(Kind kind)
     case eNewThreadMessage:
         str = "eNewThreadMessage";
         break;
+    case eExecMessage:
+        str = "eExecMessage";
+        break;
     }
 #endif
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.h
index c6c460c1344..40462d0f0e1 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessMessage.h
@@ -23,6 +23,7 @@ public:
     enum Kind
     {
         eInvalidMessage,
+        eAttachMessage,
         eExitMessage,
         eLimboMessage,
         eSignalMessage,
@@ -31,7 +32,8 @@ public:
         eBreakpointMessage,
         eWatchpointMessage,
         eCrashMessage,
-        eNewThreadMessage
+        eNewThreadMessage,
+        eExecMessage
     };
 
     enum CrashReason
@@ -79,6 +81,11 @@ public:
 
     lldb::tid_t GetTID() const { return m_tid; }
 
+    /// Indicates that the process @p pid has successfully attached.
+    static ProcessMessage Attach(lldb::pid_t pid) {
+        return ProcessMessage(pid, eAttachMessage);
+    }
+
     /// Indicates that the thread @p tid is about to exit with status @p status.
     static ProcessMessage Limbo(lldb::tid_t tid, int status) {
         return ProcessMessage(tid, eLimboMessage, status);
@@ -127,6 +134,11 @@ public:
         return ProcessMessage(tid, eExitMessage, status);
     }
 
+    /// Indicates that the thread @p pid has exec'd.
+    static ProcessMessage Exec(lldb::tid_t tid) {
+        return ProcessMessage(tid, eExecMessage);
+    }
+
     int GetExitStatus() const {
         assert(GetKind() == eExitMessage || GetKind() == eLimboMessage);
         return m_status;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
index f04631ddf91..8cfd9d614cc 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.cpp
@@ -259,42 +259,16 @@ ProcessPOSIX::DidLaunch()
 {
 }
 
-Error
-ProcessPOSIX::DoResume()
-{
-    StateType state = GetPrivateState();
-
-    assert(state == eStateStopped);
-
-    SetPrivateState(eStateRunning);
-
-    bool did_resume = false;
-
-    Mutex::Locker lock(m_thread_list.GetMutex());
-
-    uint32_t thread_count = m_thread_list.GetSize(false);
-    for (uint32_t i = 0; i < thread_count; ++i)
-    {
-        POSIXThread *thread = static_cast<POSIXThread*>(
-            m_thread_list.GetThreadAtIndex(i, false).get());
-        did_resume = thread->Resume() || did_resume;
-    }
-    assert(did_resume && "Process resume failed!");
-
-    return Error();
-}
-
 addr_t
 ProcessPOSIX::GetImageInfoAddress()
 {
     Target *target = &GetTarget();
     ObjectFile *obj_file = target->GetExecutableModule()->GetObjectFile();
-    Address addr = obj_file->GetImageInfoAddress();
+    Address addr = obj_file->GetImageInfoAddress(target);
 
-    if (addr.IsValid()) 
+    if (addr.IsValid())
         return addr.GetLoadAddress(target);
-    else
-        return LLDB_INVALID_ADDRESS;
+    return LLDB_INVALID_ADDRESS;
 }
 
 Error
@@ -318,34 +292,6 @@ ProcessPOSIX::DoHalt(bool &caused_stop)
     return error;
 }
 
-Error
-ProcessPOSIX::DoDetach(bool keep_stopped)
-{
-    Error error;
-    if (keep_stopped)
-    {
-        // FIXME: If you want to implement keep_stopped,
-        // this would be the place to do it.
-        error.SetErrorString("Detaching with keep_stopped true is not currently supported on this platform.");
-        return error;
-    }
-
-    Mutex::Locker lock(m_thread_list.GetMutex());
-
-    uint32_t thread_count = m_thread_list.GetSize(false);
-    for (uint32_t i = 0; i < thread_count; ++i)
-    {
-        POSIXThread *thread = static_cast<POSIXThread*>(
-            m_thread_list.GetThreadAtIndex(i, false).get());
-        error = m_monitor->Detach(thread->GetID());
-    }
-
-    if (error.Success())
-        SetPrivateState(eStateDetached);
-
-    return error;
-}
-
 Error
 ProcessPOSIX::DoSignal(int signal)
 {
@@ -381,77 +327,28 @@ ProcessPOSIX::DoDestroy()
 }
 
 void
-ProcessPOSIX::SendMessage(const ProcessMessage &message)
+ProcessPOSIX::DoDidExec()
 {
-    Mutex::Locker lock(m_message_mutex);
-
-    Mutex::Locker thread_lock(m_thread_list.GetMutex());
-
-    POSIXThread *thread = static_cast<POSIXThread*>(
-        m_thread_list.FindThreadByID(message.GetTID(), false).get());
-
-    switch (message.GetKind())
+    Target *target = &GetTarget();
+    if (target)
     {
-    case ProcessMessage::eInvalidMessage:
-        return;
-
-    case ProcessMessage::eLimboMessage:
-        assert(thread);
-        thread->SetState(eStateStopped);
-        if (message.GetTID() == GetID())
+        PlatformSP platform_sp (target->GetPlatform());
+        assert (platform_sp.get());
+        if (platform_sp)
         {
-            m_exit_status = message.GetExitStatus();
-            if (m_exit_now)
-            {
-                SetPrivateState(eStateExited);
-                m_monitor->Detach(GetID());
-            }
-            else
-            {
-                StopAllThreads(message.GetTID());
-                SetPrivateState(eStateStopped);
-            }
+            ProcessInstanceInfo process_info;
+            platform_sp->GetProcessInfo(GetID(), process_info);
+            ModuleSP exe_module_sp;
+            FileSpecList executable_search_paths (Target::GetDefaultExecutableSearchPaths());
+            Error error = platform_sp->ResolveExecutable(process_info.GetExecutableFile(),
+                                                   target->GetArchitecture(),
+                                                   exe_module_sp,
+                                                   executable_search_paths.GetSize() ? &executable_search_paths : NULL);
+            if (!error.Success())
+                return;
+            target->SetExecutableModule(exe_module_sp, true);
         }
-        else
-        {
-            StopAllThreads(message.GetTID());
-            SetPrivateState(eStateStopped);
-        }
-        break;
-
-    case ProcessMessage::eExitMessage:
-        assert(thread);
-        thread->SetState(eStateExited);
-        // FIXME: I'm not sure we need to do this.
-        if (message.GetTID() == GetID())
-        {
-            m_exit_status = message.GetExitStatus();
-            SetExitStatus(m_exit_status, NULL);
-        }
-        else if (!IsAThreadRunning())
-            SetPrivateState(eStateStopped);
-        break;
-
-    case ProcessMessage::eSignalMessage:
-    case ProcessMessage::eSignalDeliveredMessage:
-        if (message.GetSignal() == SIGSTOP &&
-            AddThreadForInitialStopIfNeeded(message.GetTID()))
-            return;
-        // Intentional fall-through
-
-    case ProcessMessage::eBreakpointMessage:
-    case ProcessMessage::eTraceMessage:
-    case ProcessMessage::eWatchpointMessage:
-    case ProcessMessage::eNewThreadMessage:
-    case ProcessMessage::eCrashMessage:
-        assert(thread);
-        thread->SetState(eStateStopped);
-        StopAllThreads(message.GetTID());
-        SetPrivateState(eStateStopped);
-        break;
     }
-
-    m_message_queue.push(message);
 }
 
 void 
@@ -473,6 +370,12 @@ ProcessPOSIX::AddThreadForInitialStopIfNeeded(lldb::tid_t stop_tid)
     return added_to_set;
 }
 
+bool
+ProcessPOSIX::WaitingForInitialStop(lldb::tid_t stop_tid)
+{
+    return (m_seen_initial_stop.find(stop_tid) == m_seen_initial_stop.end());
+}
+
 POSIXThread *
 ProcessPOSIX::CreateNewPOSIXThread(lldb_private::Process &process, lldb::tid_t tid)
 {
@@ -499,8 +402,6 @@ ProcessPOSIX::RefreshStateAfterStop()
         lldb::tid_t tid = message.GetTID();
         if (log)
             log->Printf ("ProcessPOSIX::%s(), message_queue size = %d, pid = %" PRIi64, __FUNCTION__, (int)m_message_queue.size(), tid);
-        POSIXThread *thread = static_cast<POSIXThread*>(
-            GetThreadList().FindThreadByID(tid, false).get());
 
         if (message.GetKind() == ProcessMessage::eNewThreadMessage)
         {
@@ -517,6 +418,8 @@ ProcessPOSIX::RefreshStateAfterStop()
 
         m_thread_list.RefreshStateAfterStop();
 
+        POSIXThread *thread = static_cast<POSIXThread*>(
+            GetThreadList().FindThreadByID(tid, false).get());
         if (thread)
             thread->Notify(message);
 
@@ -813,19 +716,21 @@ ProcessPOSIX::UpdateThreadList(ThreadList &old_thread_list, ThreadList &new_thre
     if (log && log->GetMask().Test(POSIX_LOG_VERBOSE))
         log->Printf ("ProcessPOSIX::%s() (pid = %" PRIi64 ")", __FUNCTION__, GetID());
 
+    bool has_updated = false;
     // Update the process thread list with this new thread.
     // FIXME: We should be using tid, not pid.
     assert(m_monitor);
     ThreadSP thread_sp (old_thread_list.FindThreadByID (GetID(), false));
     if (!thread_sp) {
         thread_sp.reset(CreateNewPOSIXThread(*this, GetID()));
+        has_updated = true;
     }
 
     if (log && log->GetMask().Test(POSIX_LOG_VERBOSE))
         log->Printf ("ProcessPOSIX::%s() updated pid = %" PRIi64, __FUNCTION__, GetID());
     new_thread_list.AddThread(thread_sp);
 
-    return new_thread_list.GetSize(false) > 0;
+    return has_updated; // the list has been updated
 }
 
 ByteOrder
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h
index 48b19bac47e..8b30498b80f 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/ProcessPOSIX.h
@@ -64,13 +64,13 @@ public:
     DidLaunch();
 
     virtual lldb_private::Error
-    DoResume();
+    DoResume() = 0;
 
     virtual lldb_private::Error
     DoHalt(bool &caused_stop);
 
     virtual lldb_private::Error
-    DoDetach(bool keep_stopped);
+    DoDetach(bool keep_stopped) = 0;
 
     virtual lldb_private::Error
     DoSignal(int signal);
@@ -78,6 +78,9 @@ public:
     virtual lldb_private::Error
     DoDestroy();
 
+    virtual void
+    DoDidExec();
+
     virtual void
     RefreshStateAfterStop();
 
@@ -145,7 +148,8 @@ public:
     // ProcessPOSIX internal API.
 
     /// Registers the given message with this process.
-    void SendMessage(const ProcessMessage &message);
+    virtual void
+    SendMessage(const ProcessMessage &message) = 0;
 
     ProcessMonitor &
     GetMonitor() { assert(m_monitor); return *m_monitor; }
@@ -167,6 +171,9 @@ public:
     bool
     AddThreadForInitialStopIfNeeded(lldb::tid_t stop_tid);
 
+    bool
+    WaitingForInitialStop(lldb::tid_t stop_tid);
+
     virtual POSIXThread *
     CreateNewPOSIXThread(lldb_private::Process &process, lldb::tid_t tid);
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.cpp
new file mode 100644
index 00000000000..50ec8d414a1
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.cpp
@@ -0,0 +1,78 @@
+//===-- RegisterContextFreeBSD_i386.cpp ------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+
+#include "RegisterContextPOSIX_x86.h"
+#include "RegisterContextFreeBSD_i386.h"
+
+using namespace lldb_private;
+using namespace lldb;
+
+// http://svnweb.freebsd.org/base/head/sys/x86/include/reg.h
+struct GPR
+{
+    uint32_t fs;
+    uint32_t es;
+    uint32_t ds;
+    uint32_t edi;
+    uint32_t esi;
+    uint32_t ebp;
+    uint32_t isp;
+    uint32_t ebx;
+    uint32_t edx;
+    uint32_t ecx;
+    uint32_t eax;
+    uint32_t trapno;
+    uint32_t err;
+    uint32_t eip;
+    uint32_t cs;
+    uint32_t eflags;
+    uint32_t esp;
+    uint32_t ss;
+    uint32_t gs;
+};
+
+#define DR_SIZE 0
+#define DR_OFFSET(reg_index) 0
+
+//---------------------------------------------------------------------------
+// Include RegisterInfos_i386 to declare our g_register_infos_i386 structure.
+//---------------------------------------------------------------------------
+#define DECLARE_REGISTER_INFOS_I386_STRUCT
+#include "RegisterInfos_i386.h"
+#undef DECLARE_REGISTER_INFOS_I386_STRUCT
+
+RegisterContextFreeBSD_i386::RegisterContextFreeBSD_i386(const ArchSpec &target_arch) :
+    RegisterInfoInterface(target_arch)
+{
+}
+
+RegisterContextFreeBSD_i386::~RegisterContextFreeBSD_i386()
+{
+}
+
+size_t
+RegisterContextFreeBSD_i386::GetGPRSize()
+{
+    return sizeof(GPR);
+}
+
+const RegisterInfo *
+RegisterContextFreeBSD_i386::GetRegisterInfo()
+{
+    switch (m_target_arch.GetCore())
+    {
+        case ArchSpec::eCore_x86_32_i386:
+        case ArchSpec::eCore_x86_32_i486:
+        case ArchSpec::eCore_x86_32_i486sx:
+            return g_register_infos_i386;
+        default:
+            assert(false && "Unhandled target architecture.");
+            return NULL;
+    }
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.h
new file mode 100644
index 00000000000..4ec2ad3e970
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_i386.h
@@ -0,0 +1,29 @@
+//===-- RegisterContextFreeBSD_i386.h ---------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContextFreeBSD_i386_H_
+#define liblldb_RegisterContextFreeBSD_i386_H_
+
+#include "RegisterContextPOSIX.h"
+
+class RegisterContextFreeBSD_i386
+  : public RegisterInfoInterface
+{
+public:
+    RegisterContextFreeBSD_i386(const lldb_private::ArchSpec &target_arch);
+    virtual ~RegisterContextFreeBSD_i386();
+
+    size_t
+    GetGPRSize();
+
+    const lldb_private::RegisterInfo *
+    GetRegisterInfo();
+};
+
+#endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.cpp
new file mode 100644
index 00000000000..4714251fd2d
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.cpp
@@ -0,0 +1,90 @@
+//===-- RegisterContextFreeBSD_mips64.cpp ----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+
+#include <vector>
+#include "RegisterContextPOSIX_mips64.h"
+#include "RegisterContextFreeBSD_mips64.h"
+
+using namespace lldb_private;
+using namespace lldb;
+
+// http://svnweb.freebsd.org/base/head/sys/mips/include/regnum.h
+typedef struct _GPR
+{
+    uint64_t zero;
+    uint64_t r1;
+    uint64_t r2;        
+    uint64_t r3;
+    uint64_t r4;
+    uint64_t r5;
+    uint64_t r6;
+    uint64_t r7;
+    uint64_t r8;
+    uint64_t r9;
+    uint64_t r10;
+    uint64_t r11;
+    uint64_t r12;
+    uint64_t r13;
+    uint64_t r14;
+    uint64_t r15;
+    uint64_t r16;
+    uint64_t r17;
+    uint64_t r18;
+    uint64_t r19;
+    uint64_t r20;
+    uint64_t r21;
+    uint64_t r22;
+    uint64_t r23;
+    uint64_t r24;
+    uint64_t r25;
+    uint64_t r26;
+    uint64_t r27;
+    uint64_t gp;
+    uint64_t sp;
+    uint64_t r30;
+    uint64_t ra;
+    uint64_t sr;
+    uint64_t mullo;
+    uint64_t mulhi;
+    uint64_t badvaddr;
+    uint64_t cause;
+    uint64_t pc;
+    uint64_t ic;
+    uint64_t dummy;
+} GPR;
+
+//---------------------------------------------------------------------------
+// Include RegisterInfos_mips64 to declare our g_register_infos_mips64 structure.
+//---------------------------------------------------------------------------
+#define DECLARE_REGISTER_INFOS_MIPS64_STRUCT
+#include "RegisterInfos_mips64.h"
+#undef DECLARE_REGISTER_INFOS_MIPS64_STRUCT
+
+RegisterContextFreeBSD_mips64::RegisterContextFreeBSD_mips64(const ArchSpec &target_arch) :
+    RegisterInfoInterface(target_arch)
+{
+}
+
+RegisterContextFreeBSD_mips64::~RegisterContextFreeBSD_mips64()
+{
+}
+
+size_t
+RegisterContextFreeBSD_mips64::GetGPRSize()
+{
+    return sizeof(GPR);
+}
+
+const RegisterInfo *
+RegisterContextFreeBSD_mips64::GetRegisterInfo()
+{
+    assert (m_target_arch.GetCore() == ArchSpec::eCore_mips64);
+    return g_register_infos_mips64;
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.h
new file mode 100644
index 00000000000..9ee76795534
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_mips64.h
@@ -0,0 +1,29 @@
+//===-- RegisterContextFreeBSD_mips64.h -------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContextFreeBSD_mips64_H_
+#define liblldb_RegisterContextFreeBSD_mips64_H_
+
+#include "RegisterContextPOSIX.h"
+
+class RegisterContextFreeBSD_mips64:
+    public RegisterInfoInterface
+{
+public:
+    RegisterContextFreeBSD_mips64(const lldb_private::ArchSpec &target_arch);
+    virtual ~RegisterContextFreeBSD_mips64();
+
+    size_t
+    GetGPRSize();
+
+    const lldb_private::RegisterInfo *
+    GetRegisterInfo();
+};
+
+#endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.cpp
index 0fb9dc1cb3d..471734580ff 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.cpp
@@ -1,4 +1,4 @@
-//===-- RegisterContextFreeBSD_x86_64.h ------------------------*- C++ -*-===//
+//===-- RegisterContextFreeBSD_x86_64.cpp ----------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,27 +7,15 @@
 //
 //===---------------------------------------------------------------------===//
 
-#include "RegisterContextFreeBSD_x86_64.h"
 #include <vector>
+#include "RegisterContextPOSIX_x86.h"
+#include "RegisterContextFreeBSD_i386.h"
+#include "RegisterContextFreeBSD_x86_64.h"
 
 using namespace lldb_private;
+using namespace lldb;
 
-// Computes the offset of the given GPR in the user data area.
-#define GPR_OFFSET(regname)                                                 \
-    (offsetof(GPR, regname))
-
-// Update the FreeBSD specific information (offset and size).
-#define UPDATE_GPR_INFO(reg)                                                \
-do {                                                                        \
-    GetRegisterContext()[gpr_##reg].byte_size = sizeof(GPR::reg);               \
-    GetRegisterContext()[gpr_##reg].byte_offset = GPR_OFFSET(reg);              \
-} while(false);
-
-#define UPDATE_I386_GPR_INFO(i386_reg, reg)                                 \
-do {                                                                        \
-    GetRegisterContext()[gpr_##i386_reg].byte_offset = GPR_OFFSET(reg);         \
-} while(false);
-
+// http://svnweb.freebsd.org/base/head/sys/x86/include/reg.h
 typedef struct _GPR
 {
     uint64_t r15;
@@ -58,15 +46,47 @@ typedef struct _GPR
     uint64_t ss;
 } GPR;
 
-// Use a singleton function to avoid global constructors in shared libraries.
-static std::vector<RegisterInfo> & GetRegisterContext () {
-    static std::vector<RegisterInfo> g_register_infos;
-    return g_register_infos;
+#define DR_SIZE 0
+#define DR_OFFSET(reg_index) 0
+
+//---------------------------------------------------------------------------
+// Include RegisterInfos_x86_64 to declare our g_register_infos_x86_64 structure.
+//---------------------------------------------------------------------------
+#define DECLARE_REGISTER_INFOS_X86_64_STRUCT
+#include "RegisterInfos_x86_64.h"
+#undef DECLARE_REGISTER_INFOS_X86_64_STRUCT
+
+static const RegisterInfo *
+GetRegisterInfo_i386(const lldb_private::ArchSpec& arch)
+{
+    static std::vector<lldb_private::RegisterInfo> g_register_infos;
+
+    // Allocate RegisterInfo only once
+    if (g_register_infos.empty())
+    {
+        // Copy the register information from base class
+        std::unique_ptr<RegisterContextFreeBSD_i386> reg_interface(new RegisterContextFreeBSD_i386 (arch));
+        const RegisterInfo *base_info = reg_interface->GetRegisterInfo();
+        g_register_infos.insert(g_register_infos.end(), &base_info[0], &base_info[k_num_registers_i386]);
+
+        //---------------------------------------------------------------------------
+        // Include RegisterInfos_x86_64 to update the g_register_infos structure
+        //  with x86_64 offsets.
+        //---------------------------------------------------------------------------
+        #define UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS
+        #include "RegisterInfos_x86_64.h"
+        #undef UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS
+    }
+
+    return &g_register_infos[0];
 }
 
+RegisterContextFreeBSD_x86_64::RegisterContextFreeBSD_x86_64(const ArchSpec &target_arch) :
+    RegisterInfoInterface(target_arch)
+{
+}
 
-RegisterContextFreeBSD_x86_64::RegisterContextFreeBSD_x86_64(Thread &thread, uint32_t concrete_frame_idx):
-    RegisterContext_x86_64(thread, concrete_frame_idx)
+RegisterContextFreeBSD_x86_64::~RegisterContextFreeBSD_x86_64()
 {
 }
 
@@ -79,58 +99,17 @@ RegisterContextFreeBSD_x86_64::GetGPRSize()
 const RegisterInfo *
 RegisterContextFreeBSD_x86_64::GetRegisterInfo()
 {
-    // Allocate RegisterInfo only once
-    if (GetRegisterContext().empty())
+    switch (m_target_arch.GetCore())
     {
-        // Copy the register information from base class
-        const RegisterInfo *base_info = RegisterContext_x86_64::GetRegisterInfo();
-        if (base_info)
-        {
-            GetRegisterContext().insert(GetRegisterContext().end(), &base_info[0], &base_info[k_num_registers]);
-            // Update the FreeBSD specific register information (offset and size).
-            UpdateRegisterInfo();
-        }
+        case ArchSpec::eCore_x86_32_i386:
+        case ArchSpec::eCore_x86_32_i486:
+        case ArchSpec::eCore_x86_32_i486sx:
+            return GetRegisterInfo_i386 (m_target_arch);
+        case ArchSpec::eCore_x86_64_x86_64:
+            return g_register_infos_x86_64;
+        default:
+            assert(false && "Unhandled target architecture.");
+            return NULL;
     }
-    return &GetRegisterContext()[0];
-}
-
-void
-RegisterContextFreeBSD_x86_64::UpdateRegisterInfo()
-{
-    UPDATE_GPR_INFO(rax);
-    UPDATE_GPR_INFO(rbx);
-    UPDATE_GPR_INFO(rcx);
-    UPDATE_GPR_INFO(rdx);
-    UPDATE_GPR_INFO(rdi);
-    UPDATE_GPR_INFO(rsi);
-    UPDATE_GPR_INFO(rbp);
-    UPDATE_GPR_INFO(rsp);
-    UPDATE_GPR_INFO(r8);
-    UPDATE_GPR_INFO(r9);
-    UPDATE_GPR_INFO(r10);
-    UPDATE_GPR_INFO(r11);
-    UPDATE_GPR_INFO(r12);
-    UPDATE_GPR_INFO(r13);
-    UPDATE_GPR_INFO(r14);
-    UPDATE_GPR_INFO(r15);
-    UPDATE_GPR_INFO(rip);
-    UPDATE_GPR_INFO(rflags);
-    UPDATE_GPR_INFO(cs);
-    UPDATE_GPR_INFO(fs);
-    UPDATE_GPR_INFO(gs);
-    UPDATE_GPR_INFO(ss);
-    UPDATE_GPR_INFO(ds);
-    UPDATE_GPR_INFO(es);
-
-    UPDATE_I386_GPR_INFO(eax, rax);
-    UPDATE_I386_GPR_INFO(ebx, rbx);
-    UPDATE_I386_GPR_INFO(ecx, rcx);
-    UPDATE_I386_GPR_INFO(edx, rdx);
-    UPDATE_I386_GPR_INFO(edi, rdi);
-    UPDATE_I386_GPR_INFO(esi, rsi);
-    UPDATE_I386_GPR_INFO(ebp, rbp);
-    UPDATE_I386_GPR_INFO(esp, rsp);
-    UPDATE_I386_GPR_INFO(eip, rip);
-    UPDATE_I386_GPR_INFO(eflags, rflags);
 }
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.h
index ffff40a9c65..731bb0ea6bc 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.h
@@ -1,4 +1,4 @@
-//===-- RegisterContextFreeBSD_x86_64.h ---------------------------*- C++ -*-===//
+//===-- RegisterContextFreeBSD_x86_64.h -------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -10,23 +10,20 @@
 #ifndef liblldb_RegisterContextFreeBSD_x86_64_H_
 #define liblldb_RegisterContextFreeBSD_x86_64_H_
 
-#include "Plugins/Process/POSIX/RegisterContext_x86_64.h"
+#include "RegisterContextPOSIX.h"
 
 class RegisterContextFreeBSD_x86_64:
-    public RegisterContext_x86_64
+    public RegisterInfoInterface
 {
 public:
-    RegisterContextFreeBSD_x86_64(lldb_private::Thread &thread, uint32_t concrete_frame_idx);
+    RegisterContextFreeBSD_x86_64(const lldb_private::ArchSpec &target_arch);
+    virtual ~RegisterContextFreeBSD_x86_64();
 
     size_t
     GetGPRSize();
 
-protected:
-    virtual const lldb_private::RegisterInfo *
+    const lldb_private::RegisterInfo *
     GetRegisterInfo();
-
-    virtual void
-    UpdateRegisterInfo();
 };
 
 #endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp
new file mode 100644
index 00000000000..0828efbc6c3
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.cpp
@@ -0,0 +1,96 @@
+//===-- RegisterContextLinux_i386.cpp --------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+
+#include "RegisterContextPOSIX_x86.h"
+#include "RegisterContextLinux_i386.h"
+
+using namespace lldb_private;
+using namespace lldb;
+
+struct GPR
+{
+    uint32_t ebx;
+    uint32_t ecx;
+    uint32_t edx;
+    uint32_t esi;
+    uint32_t edi;
+    uint32_t ebp;
+    uint32_t eax;
+    uint32_t ds;
+    uint32_t es;
+    uint32_t fs;
+    uint32_t gs;
+    uint32_t orig_ax;
+    uint32_t eip;
+    uint32_t cs;
+    uint32_t eflags;
+    uint32_t esp;
+    uint32_t ss;
+};
+
+struct UserArea
+{
+    GPR      regs;          // General purpose registers.
+    int32_t  fpvalid;       // True if FPU is being used.
+    FXSAVE   i387;          // FPU registers.
+    uint32_t tsize;         // Text segment size.
+    uint32_t dsize;         // Data segment size.
+    uint32_t ssize;         // Stack segment size.
+    uint32_t start_code;    // VM address of text.
+    uint32_t start_stack;   // VM address of stack bottom (top in rsp).
+    int32_t  signal;        // Signal causing core dump.
+    int32_t  reserved;      // Unused.
+    uint32_t ar0;           // Location of GPR's.
+    uint32_t fpstate;       // Location of FPR's. Should be a FXSTATE *, but this
+	                        //  has to be 32-bits even on 64-bit systems.
+    uint32_t magic;         // Identifier for core dumps.
+    char     u_comm[32];    // Command causing core dump.
+    uint32_t u_debugreg[8]; // Debug registers (DR0 - DR7).
+};
+
+#define DR_SIZE sizeof(UserArea::u_debugreg[0])
+#define DR_OFFSET(reg_index) \
+    (LLVM_EXTENSION offsetof(UserArea, u_debugreg[reg_index]))
+
+//---------------------------------------------------------------------------
+// Include RegisterInfos_i386 to declare our g_register_infos_i386 structure.
+//---------------------------------------------------------------------------
+#define DECLARE_REGISTER_INFOS_I386_STRUCT
+#include "RegisterInfos_i386.h"
+#undef DECLARE_REGISTER_INFOS_I386_STRUCT
+
+RegisterContextLinux_i386::RegisterContextLinux_i386(const ArchSpec &target_arch) :
+    RegisterInfoInterface(target_arch)
+{
+}
+
+RegisterContextLinux_i386::~RegisterContextLinux_i386()
+{
+}
+
+size_t
+RegisterContextLinux_i386::GetGPRSize()
+{
+    return sizeof(GPR);
+}
+
+const RegisterInfo *
+RegisterContextLinux_i386::GetRegisterInfo()
+{
+    switch (m_target_arch.GetCore())
+    {
+        case ArchSpec::eCore_x86_32_i386:
+        case ArchSpec::eCore_x86_32_i486:
+        case ArchSpec::eCore_x86_32_i486sx:
+            return g_register_infos_i386;
+        default:
+            assert(false && "Unhandled target architecture.");
+            return NULL;
+    }
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.h
new file mode 100644
index 00000000000..81afdbf8b1c
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_i386.h
@@ -0,0 +1,29 @@
+//===-- RegisterContextLinux_i386.h -----------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContextLinux_i386_H_
+#define liblldb_RegisterContextLinux_i386_H_
+
+#include "RegisterContextPOSIX.h"
+
+class RegisterContextLinux_i386
+  : public RegisterInfoInterface
+{
+public:
+    RegisterContextLinux_i386(const lldb_private::ArchSpec &target_arch);
+    virtual ~RegisterContextLinux_i386();
+
+    size_t
+    GetGPRSize();
+
+    const lldb_private::RegisterInfo *
+    GetRegisterInfo();
+};
+
+#endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.cpp
index c1aea2a41a1..5434ddfcf38 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.cpp
@@ -1,4 +1,4 @@
-//===-- RegisterContextLinux_x86_64.h --------------------------*- C++ -*-===//
+//===-- RegisterContextLinux_x86_64.cpp ------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,36 +7,13 @@
 //
 //===---------------------------------------------------------------------===//
 
-#include "llvm/Support/Compiler.h"
-#include "RegisterContextLinux_x86_64.h"
 #include <vector>
+#include "RegisterContextPOSIX_x86.h"
+#include "RegisterContextLinux_i386.h"
+#include "RegisterContextLinux_x86_64.h"
 
 using namespace lldb_private;
-
-// Computes the offset of the given GPR in the user data area.
-#define GPR_OFFSET(regname)                                                 \
-    (offsetof(GPR, regname))
-
-// Update the Linux specific information (offset and size).
-#define UPDATE_GPR_INFO(reg)                                                \
-do {                                                                        \
-    GetRegisterContext()[gpr_##reg].byte_size = sizeof(GPR::reg);               \
-    GetRegisterContext()[gpr_##reg].byte_offset = GPR_OFFSET(reg);              \
-} while(false);
-
-#define UPDATE_I386_GPR_INFO(i386_reg, reg)                                 \
-do {                                                                        \
-    GetRegisterContext()[gpr_##i386_reg].byte_offset = GPR_OFFSET(reg);         \
-} while(false);
-
-#define DR_OFFSET(reg_index)                                                \
-    (LLVM_EXTENSION offsetof(UserArea, u_debugreg[reg_index]))
-
-#define UPDATE_DR_INFO(reg_index)                                                \
-do {                                                                             \
-    GetRegisterContext()[dr##reg_index].byte_size = sizeof(UserArea::u_debugreg[0]); \
-    GetRegisterContext()[dr##reg_index].byte_offset = DR_OFFSET(reg_index);          \
-} while(false);
+using namespace lldb;
 
 typedef struct _GPR
 {
@@ -69,8 +46,6 @@ typedef struct _GPR
     uint64_t gs;
 } GPR;
 
-typedef RegisterContext_x86_64::FXSAVE FXSAVE;
-
 struct UserArea
 {
     GPR      gpr;           // General purpose registers.
@@ -94,14 +69,48 @@ struct UserArea
     uint64_t fault_address; // Control register CR3.
 };
 
-// Use a singleton function to avoid global constructors in shared libraries.
-static std::vector<RegisterInfo> & GetRegisterContext () {
-    static std::vector<RegisterInfo> g_register_infos;
-    return g_register_infos;
+#define DR_SIZE sizeof(UserArea::u_debugreg[0])
+#define DR_OFFSET(reg_index) \
+    (LLVM_EXTENSION offsetof(UserArea, u_debugreg[reg_index]))
+
+//---------------------------------------------------------------------------
+// Include RegisterInfos_x86_64 to declare our g_register_infos_x86_64 structure.
+//---------------------------------------------------------------------------
+#define DECLARE_REGISTER_INFOS_X86_64_STRUCT
+#include "RegisterInfos_x86_64.h"
+#undef DECLARE_REGISTER_INFOS_X86_64_STRUCT
+
+static const RegisterInfo *
+GetRegisterInfo_i386(const lldb_private::ArchSpec &arch)
+{
+    static std::vector<lldb_private::RegisterInfo> g_register_infos;
+
+    // Allocate RegisterInfo only once
+    if (g_register_infos.empty())
+    {
+        // Copy the register information from base class
+        std::unique_ptr<RegisterContextLinux_i386> reg_interface(new RegisterContextLinux_i386 (arch));
+        const RegisterInfo *base_info = reg_interface->GetRegisterInfo();
+        g_register_infos.insert(g_register_infos.end(), &base_info[0], &base_info[k_num_registers_i386]);
+
+        //---------------------------------------------------------------------------
+        // Include RegisterInfos_x86_64 to update the g_register_infos structure
+        //  with x86_64 offsets.
+        //---------------------------------------------------------------------------
+        #define UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS
+        #include "RegisterInfos_x86_64.h"
+        #undef UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS
+    }
+
+    return &g_register_infos[0];
 }
 
-RegisterContextLinux_x86_64::RegisterContextLinux_x86_64(Thread &thread, uint32_t concrete_frame_idx):
-    RegisterContext_x86_64(thread, concrete_frame_idx)
+RegisterContextLinux_x86_64::RegisterContextLinux_x86_64(const ArchSpec &target_arch) :
+    RegisterInfoInterface(target_arch)
+{
+}
+
+RegisterContextLinux_x86_64::~RegisterContextLinux_x86_64()
 {
 }
 
@@ -114,67 +123,17 @@ RegisterContextLinux_x86_64::GetGPRSize()
 const RegisterInfo *
 RegisterContextLinux_x86_64::GetRegisterInfo()
 {
-    // Allocate RegisterInfo only once
-    if (GetRegisterContext().empty())
+    switch (m_target_arch.GetCore())
     {
-        // Copy the register information from base class
-        const RegisterInfo *base_info = RegisterContext_x86_64::GetRegisterInfo();
-        if (base_info)
-        {
-            GetRegisterContext().insert(GetRegisterContext().end(), &base_info[0], &base_info[k_num_registers]);
-            // Update the Linux specific register information (offset and size).
-            UpdateRegisterInfo();
-        }
+        case ArchSpec::eCore_x86_32_i386:
+        case ArchSpec::eCore_x86_32_i486:
+        case ArchSpec::eCore_x86_32_i486sx:
+            return GetRegisterInfo_i386 (m_target_arch);
+        case ArchSpec::eCore_x86_64_x86_64:
+            return g_register_infos_x86_64;
+        default:
+            assert(false && "Unhandled target architecture.");
+            return NULL;
     }
-    return &GetRegisterContext()[0];
-}
-
-void
-RegisterContextLinux_x86_64::UpdateRegisterInfo()
-{
-    UPDATE_GPR_INFO(rax);
-    UPDATE_GPR_INFO(rbx);
-    UPDATE_GPR_INFO(rcx);
-    UPDATE_GPR_INFO(rdx);
-    UPDATE_GPR_INFO(rdi);
-    UPDATE_GPR_INFO(rsi);
-    UPDATE_GPR_INFO(rbp);
-    UPDATE_GPR_INFO(rsp);
-    UPDATE_GPR_INFO(r8);
-    UPDATE_GPR_INFO(r9);
-    UPDATE_GPR_INFO(r10);
-    UPDATE_GPR_INFO(r11);
-    UPDATE_GPR_INFO(r12);
-    UPDATE_GPR_INFO(r13);
-    UPDATE_GPR_INFO(r14);
-    UPDATE_GPR_INFO(r15);
-    UPDATE_GPR_INFO(rip);
-    UPDATE_GPR_INFO(rflags);
-    UPDATE_GPR_INFO(cs);
-    UPDATE_GPR_INFO(fs);
-    UPDATE_GPR_INFO(gs);
-    UPDATE_GPR_INFO(ss);
-    UPDATE_GPR_INFO(ds);
-    UPDATE_GPR_INFO(es);
-
-    UPDATE_I386_GPR_INFO(eax, rax);
-    UPDATE_I386_GPR_INFO(ebx, rbx);
-    UPDATE_I386_GPR_INFO(ecx, rcx);
-    UPDATE_I386_GPR_INFO(edx, rdx);
-    UPDATE_I386_GPR_INFO(edi, rdi);
-    UPDATE_I386_GPR_INFO(esi, rsi);
-    UPDATE_I386_GPR_INFO(ebp, rbp);
-    UPDATE_I386_GPR_INFO(esp, rsp);
-    UPDATE_I386_GPR_INFO(eip, rip);
-    UPDATE_I386_GPR_INFO(eflags, rflags);
-
-    UPDATE_DR_INFO(0);
-    UPDATE_DR_INFO(1);
-    UPDATE_DR_INFO(2);
-    UPDATE_DR_INFO(3);
-    UPDATE_DR_INFO(4);
-    UPDATE_DR_INFO(5);
-    UPDATE_DR_INFO(6);
-    UPDATE_DR_INFO(7);
 }
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.h
index 1509ef55b8d..21c809b5dc3 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextLinux_x86_64.h
@@ -10,23 +10,20 @@
 #ifndef liblldb_RegisterContextLinux_x86_64_H_
 #define liblldb_RegisterContextLinux_x86_64_H_
 
-#include "Plugins/Process/POSIX/RegisterContext_x86_64.h"
+#include "RegisterContextPOSIX.h"
 
-class RegisterContextLinux_x86_64:
-    public RegisterContext_x86_64
+class RegisterContextLinux_x86_64
+  : public RegisterInfoInterface
 {
 public:
-    RegisterContextLinux_x86_64(lldb_private::Thread &thread, uint32_t concrete_frame_idx);
+    RegisterContextLinux_x86_64(const lldb_private::ArchSpec &target_arch);
+    virtual ~RegisterContextLinux_x86_64();
 
     size_t
     GetGPRSize();
 
-protected:
-    virtual const lldb_private::RegisterInfo *
+    const lldb_private::RegisterInfo *
     GetRegisterInfo();
-
-    virtual void
-    UpdateRegisterInfo();
 };
 
 #endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX.h
index 63ae01e83a9..e48c528403e 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX.h
@@ -13,20 +13,19 @@
 // C Includes
 // C++ Includes
 // Other libraries and framework includes
+#include "lldb/Core/ArchSpec.h"
 #include "lldb/Target/RegisterContext.h"
 
 //------------------------------------------------------------------------------
-/// @class RegisterContextPOSIX
+/// @class POSIXBreakpointProtocol
 ///
 /// @brief Extends RegisterClass with a few virtual operations useful on POSIX.
-class RegisterContextPOSIX
-    : public lldb_private::RegisterContext
+class POSIXBreakpointProtocol
 {
 public:
-    RegisterContextPOSIX(lldb_private::Thread &thread,
-                         uint32_t concrete_frame_idx)
-        : RegisterContext(thread, concrete_frame_idx)
+    POSIXBreakpointProtocol()
         { m_watchpoints_initialized = false; }
+    virtual ~POSIXBreakpointProtocol() {}
 
     /// Updates the register state of the associated thread after hitting a
     /// breakpoint (if that make sense for the architecture).  Default
@@ -35,36 +34,61 @@ public:
     ///
     /// @return
     ///    True if the operation succeeded and false otherwise.
-    virtual bool UpdateAfterBreakpoint() { return true; }
+    virtual bool UpdateAfterBreakpoint() = 0;
 
     /// Determines the index in lldb's register file given a kernel byte offset.
     virtual unsigned
-    GetRegisterIndexFromOffset(unsigned offset) { return LLDB_INVALID_REGNUM; }
+    GetRegisterIndexFromOffset(unsigned offset) = 0;
 
     // Checks to see if a watchpoint specified by hw_index caused the inferior
     // to stop.
     virtual bool
-    IsWatchpointHit (uint32_t hw_index) { return false; }
+    IsWatchpointHit (uint32_t hw_index) = 0;
 
     // Resets any watchpoints that have been hit.
     virtual bool
-    ClearWatchpointHits () { return false; }
+    ClearWatchpointHits () = 0;
 
     // Returns the watchpoint address associated with a watchpoint hardware
     // index.
     virtual lldb::addr_t
-    GetWatchpointAddress (uint32_t hw_index) { return LLDB_INVALID_ADDRESS; }
+    GetWatchpointAddress (uint32_t hw_index) = 0;
 
     virtual bool
-    IsWatchpointVacant (uint32_t hw_index) { return false; }
+    IsWatchpointVacant (uint32_t hw_index) = 0;
 
     virtual bool
     SetHardwareWatchpointWithIndex (lldb::addr_t addr, size_t size,
                                     bool read, bool write,
-                                    uint32_t hw_index) { return false; }
+                                    uint32_t hw_index) = 0;
+
+    // From lldb_private::RegisterContext
+    virtual uint32_t
+    NumSupportedHardwareWatchpoints () = 0;
 
 protected:
     bool m_watchpoints_initialized;
 };
 
+//------------------------------------------------------------------------------
+/// @class RegisterInfoInterface
+///
+/// @brief RegisterInfo interface to patch RegisterInfo structure for archs.
+class RegisterInfoInterface
+{
+public:
+    RegisterInfoInterface(const lldb_private::ArchSpec& target_arch) : m_target_arch(target_arch) {}
+    virtual ~RegisterInfoInterface () {}
+
+    virtual size_t
+    GetGPRSize () = 0;
+
+    virtual const lldb_private::RegisterInfo *
+    GetRegisterInfo () = 0;
+
+public:
+    lldb_private::ArchSpec m_target_arch;
+};
+
 #endif // #ifndef liblldb_RegisterContextPOSIX_H_
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp
new file mode 100644
index 00000000000..f70d00e98a3
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.cpp
@@ -0,0 +1,318 @@
+//===-- RegisterContextPOSIXProcessMonitor_mips64.h ------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+
+#include "lldb/Target/Thread.h"
+#include "lldb/Core/RegisterValue.h"
+
+#include "RegisterContextPOSIX_mips64.h"
+#include "ProcessPOSIX.h"
+#include "RegisterContextPOSIXProcessMonitor_mips64.h"
+#include "ProcessMonitor.h"
+
+using namespace lldb_private;
+using namespace lldb;
+
+#define REG_CONTEXT_SIZE (GetGPRSize())
+
+RegisterContextPOSIXProcessMonitor_mips64::RegisterContextPOSIXProcessMonitor_mips64(Thread &thread,
+                                                                                     uint32_t concrete_frame_idx,
+                                                                                     RegisterInfoInterface *register_info)
+    : RegisterContextPOSIX_mips64(thread, concrete_frame_idx, register_info)
+{
+}
+
+ProcessMonitor &
+RegisterContextPOSIXProcessMonitor_mips64::GetMonitor()
+{
+    ProcessSP base = CalculateProcess();
+    ProcessPOSIX *process = static_cast<ProcessPOSIX*>(base.get());
+    return process->GetMonitor();
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::ReadGPR()
+{
+     ProcessMonitor &monitor = GetMonitor();
+     return monitor.ReadGPR(m_thread.GetID(), &m_gpr_mips64, GetGPRSize());
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::ReadFPR()
+{
+    // XXX not yet implemented
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::WriteGPR()
+{
+    ProcessMonitor &monitor = GetMonitor();
+    return monitor.WriteGPR(m_thread.GetID(), &m_gpr_mips64, GetGPRSize());
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::WriteFPR()
+{
+    // XXX not yet implemented
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::ReadRegister(const unsigned reg,
+                                                        RegisterValue &value)
+{
+    ProcessMonitor &monitor = GetMonitor();
+    return monitor.ReadRegisterValue(m_thread.GetID(),
+                                     GetRegisterOffset(reg),
+                                     GetRegisterName(reg),
+                                     GetRegisterSize(reg),
+                                     value);
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::WriteRegister(const unsigned reg,
+                                                         const RegisterValue &value)
+{
+    unsigned reg_to_write = reg;
+    RegisterValue value_to_write = value;
+
+    // Check if this is a subregister of a full register.
+    const RegisterInfo *reg_info = GetRegisterInfoAtIndex(reg);
+    if (reg_info->invalidate_regs && (reg_info->invalidate_regs[0] != LLDB_INVALID_REGNUM))
+    {
+        RegisterValue full_value;
+        uint32_t full_reg = reg_info->invalidate_regs[0];
+        const RegisterInfo *full_reg_info = GetRegisterInfoAtIndex(full_reg);
+
+        // Read the full register.
+        if (ReadRegister(full_reg_info, full_value))
+        {
+            Error error;
+            ByteOrder byte_order = GetByteOrder();
+            uint8_t dst[RegisterValue::kMaxRegisterByteSize];
+
+            // Get the bytes for the full register.
+            const uint32_t dest_size = full_value.GetAsMemoryData (full_reg_info, 
+                                                                   dst, 
+                                                                   sizeof(dst), 
+                                                                   byte_order, 
+                                                                   error);
+            if (error.Success() && dest_size)
+            {
+                uint8_t src[RegisterValue::kMaxRegisterByteSize];
+
+                // Get the bytes for the source data.
+                const uint32_t src_size = value.GetAsMemoryData (reg_info, src, sizeof(src), byte_order, error);
+                if (error.Success() && src_size && (src_size < dest_size))
+                {
+                    // Copy the src bytes to the destination.
+                    memcpy (dst + (reg_info->byte_offset & 0x1), src, src_size);
+                    // Set this full register as the value to write.
+                    value_to_write.SetBytes(dst, full_value.GetByteSize(), byte_order);
+                    value_to_write.SetType(full_reg_info);
+                    reg_to_write = full_reg;
+                }
+            }
+        }
+    }
+
+    ProcessMonitor &monitor = GetMonitor();
+    return monitor.WriteRegisterValue(m_thread.GetID(),
+                                      GetRegisterOffset(reg_to_write),
+                                      GetRegisterName(reg_to_write),
+                                      value_to_write);
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::ReadRegister(const RegisterInfo *reg_info, RegisterValue &value)
+{
+    if (!reg_info)
+        return false;
+
+    const uint32_t reg = reg_info->kinds[eRegisterKindLLDB];
+
+    if (IsFPR(reg))
+    {
+        if (!ReadFPR())
+            return false;
+    }
+    else
+    {
+        uint32_t full_reg = reg;
+        bool is_subreg = reg_info->invalidate_regs && (reg_info->invalidate_regs[0] != LLDB_INVALID_REGNUM);
+
+        if (is_subreg)
+        {
+            // Read the full aligned 64-bit register.
+            full_reg = reg_info->invalidate_regs[0];
+        }
+
+        bool success = ReadRegister(full_reg, value);
+
+        if (success)
+        {
+            // If our read was not aligned (for ah,bh,ch,dh), shift our returned value one byte to the right.
+            if (is_subreg && (reg_info->byte_offset & 0x1))
+                value.SetUInt64(value.GetAsUInt64() >> 8);
+
+            // If our return byte size was greater than the return value reg size, then
+            // use the type specified by reg_info rather than the uint64_t default
+            if (value.GetByteSize() > reg_info->byte_size)
+                value.SetType(reg_info);
+        }
+        return success; 
+    }
+
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::WriteRegister(const RegisterInfo *reg_info, const RegisterValue &value)
+{
+    const uint32_t reg = reg_info->kinds[eRegisterKindLLDB];
+
+    if (IsGPR(reg))
+        return WriteRegister(reg, value);
+
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::ReadAllRegisterValues(DataBufferSP &data_sp)
+{
+    bool success = false;
+    data_sp.reset (new DataBufferHeap (REG_CONTEXT_SIZE, 0));
+    if (data_sp && ReadGPR () && ReadFPR ())
+    {
+        uint8_t *dst = data_sp->GetBytes();
+        success = dst != 0;
+
+        if (success)
+        {
+            ::memcpy (dst, &m_gpr_mips64, GetGPRSize());
+            dst += GetGPRSize();
+        }
+    }
+    return success;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::WriteAllRegisterValues(const DataBufferSP &data_sp)
+{
+    bool success = false;
+    if (data_sp && data_sp->GetByteSize() == REG_CONTEXT_SIZE)
+    {
+        uint8_t *src = data_sp->GetBytes();
+        if (src)
+        {
+            ::memcpy (&m_gpr_mips64, src, GetGPRSize());
+
+            if (WriteGPR())
+            {
+                src += GetGPRSize();
+            }
+        }
+    }
+    return success;
+}
+
+uint32_t
+RegisterContextPOSIXProcessMonitor_mips64::SetHardwareWatchpoint(addr_t addr, size_t size,
+                                              bool read, bool write)
+{
+    const uint32_t num_hw_watchpoints = NumSupportedHardwareWatchpoints();
+    uint32_t hw_index;
+
+    for (hw_index = 0; hw_index < num_hw_watchpoints; ++hw_index)
+    {
+        if (IsWatchpointVacant(hw_index))
+            return SetHardwareWatchpointWithIndex(addr, size,
+                                                  read, write,
+                                                  hw_index);
+    }
+
+    return LLDB_INVALID_INDEX32;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::ClearHardwareWatchpoint(uint32_t hw_index)
+{
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::HardwareSingleStep(bool enable)
+{
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::UpdateAfterBreakpoint()
+{
+    // PC points one byte past the int3 responsible for the breakpoint.
+    lldb::addr_t pc;
+
+    if ((pc = GetPC()) == LLDB_INVALID_ADDRESS)
+        return false;
+
+    SetPC(pc - 1);
+    return true;
+}
+
+unsigned
+RegisterContextPOSIXProcessMonitor_mips64::GetRegisterIndexFromOffset(unsigned offset)
+{
+    unsigned reg;
+    for (reg = 0; reg < k_num_registers_mips64; reg++)
+    {
+        if (GetRegisterInfo()[reg].byte_offset == offset)
+            break;
+    }
+    assert(reg < k_num_registers_mips64 && "Invalid register offset.");
+    return reg;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::IsWatchpointHit(uint32_t hw_index)
+{
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::ClearWatchpointHits()
+{
+    return false;
+}
+
+addr_t
+RegisterContextPOSIXProcessMonitor_mips64::GetWatchpointAddress(uint32_t hw_index)
+{
+    return LLDB_INVALID_ADDRESS;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::IsWatchpointVacant(uint32_t hw_index)
+{
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_mips64::SetHardwareWatchpointWithIndex(addr_t addr, size_t size,
+                                                       bool read, bool write,
+                                                       uint32_t hw_index)
+{
+    return false;
+}
+
+uint32_t
+RegisterContextPOSIXProcessMonitor_mips64::NumSupportedHardwareWatchpoints()
+{
+    return 0;
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.h
new file mode 100644
index 00000000000..8f545eef0d5
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_mips64.h
@@ -0,0 +1,95 @@
+//===-- RegisterContextPOSIXProcessMonitor_mips64.h -------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContextPOSIXProcessMonitor_mips64_H_
+#define liblldb_RegisterContextPOSIXProcessMonitor_mips64_H_
+
+#include "Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h"
+
+class RegisterContextPOSIXProcessMonitor_mips64:
+    public RegisterContextPOSIX_mips64,
+    public POSIXBreakpointProtocol
+{
+public:
+    RegisterContextPOSIXProcessMonitor_mips64(lldb_private::Thread &thread,
+                                              uint32_t concrete_frame_idx,
+                                              RegisterInfoInterface *register_info);
+
+protected:
+    bool
+    ReadGPR();
+
+    bool
+    ReadFPR();
+
+    bool
+    WriteGPR();
+
+    bool
+    WriteFPR();
+
+    // lldb_private::RegisterContext
+    bool
+    ReadRegister(const unsigned reg, lldb_private::RegisterValue &value);
+
+    bool
+    WriteRegister(const unsigned reg, const lldb_private::RegisterValue &value);
+
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp);
+
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp);
+
+    uint32_t
+    SetHardwareWatchpoint(lldb::addr_t addr, size_t size, bool read, bool write);
+
+    bool
+    ClearHardwareWatchpoint(uint32_t hw_index);
+
+    bool
+    HardwareSingleStep(bool enable);
+
+    // POSIXBreakpointProtocol
+    bool
+    UpdateAfterBreakpoint();
+
+    unsigned
+    GetRegisterIndexFromOffset(unsigned offset);
+
+    bool
+    IsWatchpointHit(uint32_t hw_index);
+
+    bool
+    ClearWatchpointHits();
+
+    lldb::addr_t
+    GetWatchpointAddress(uint32_t hw_index);
+
+    bool
+    IsWatchpointVacant(uint32_t hw_index);
+
+    bool
+    SetHardwareWatchpointWithIndex(lldb::addr_t addr, size_t size, bool read, bool write, uint32_t hw_index);
+
+    uint32_t
+    NumSupportedHardwareWatchpoints();
+
+private:
+    ProcessMonitor &
+    GetMonitor();
+};
+
+#endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp
new file mode 100644
index 00000000000..f833c9b4752
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.cpp
@@ -0,0 +1,632 @@
+//===-- RegisterContextPOSIXProcessMonitor_x86.h ---------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+
+#include "lldb/Target/Thread.h"
+#include "lldb/Core/RegisterValue.h"
+
+#include "ProcessPOSIX.h"
+#include "RegisterContextPOSIXProcessMonitor_x86.h"
+#include "ProcessMonitor.h"
+
+using namespace lldb_private;
+using namespace lldb;
+
+// Support ptrace extensions even when compiled without required kernel support
+#ifndef NT_X86_XSTATE
+  #define NT_X86_XSTATE 0x202
+#endif
+
+#define REG_CONTEXT_SIZE (GetGPRSize() + sizeof(FPR))
+
+static uint32_t
+size_and_rw_bits(size_t size, bool read, bool write)
+{
+    uint32_t rw;
+
+    if (read)
+        rw = 0x3; // READ or READ/WRITE
+    else if (write)
+        rw = 0x1; // WRITE
+    else
+        assert(0 && "read and write cannot both be false");
+
+    switch (size)
+    {
+    case 1:
+        return rw;
+    case 2:
+        return (0x1 << 2) | rw;
+    case 4:
+        return (0x3 << 2) | rw;
+    case 8:
+        return (0x2 << 2) | rw;
+    default:
+        assert(0 && "invalid size, must be one of 1, 2, 4, or 8");
+    }
+}
+
+RegisterContextPOSIXProcessMonitor_x86_64::RegisterContextPOSIXProcessMonitor_x86_64(Thread &thread,
+                                                                                     uint32_t concrete_frame_idx,
+                                                                                     RegisterInfoInterface *register_info)
+    : RegisterContextPOSIX_x86(thread, concrete_frame_idx, register_info)
+{
+}
+
+ProcessMonitor &
+RegisterContextPOSIXProcessMonitor_x86_64::GetMonitor()
+{
+    ProcessSP base = CalculateProcess();
+    ProcessPOSIX *process = static_cast<ProcessPOSIX*>(base.get());
+    return process->GetMonitor();
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::ReadGPR()
+{
+     ProcessMonitor &monitor = GetMonitor();
+     return monitor.ReadGPR(m_thread.GetID(), &m_gpr_x86_64, GetGPRSize());
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::ReadFPR()
+{
+    ProcessMonitor &monitor = GetMonitor();
+    if (GetFPRType() == eFXSAVE)
+        return monitor.ReadFPR(m_thread.GetID(), &m_fpr.xstate.fxsave, sizeof(m_fpr.xstate.fxsave));
+
+    if (GetFPRType() == eXSAVE)
+        return monitor.ReadRegisterSet(m_thread.GetID(), &m_iovec, sizeof(m_fpr.xstate.xsave), NT_X86_XSTATE);
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::WriteGPR()
+{
+    ProcessMonitor &monitor = GetMonitor();
+    return monitor.WriteGPR(m_thread.GetID(), &m_gpr_x86_64, GetGPRSize());
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::WriteFPR()
+{
+    ProcessMonitor &monitor = GetMonitor();
+    if (GetFPRType() == eFXSAVE)
+        return monitor.WriteFPR(m_thread.GetID(), &m_fpr.xstate.fxsave, sizeof(m_fpr.xstate.fxsave));
+
+    if (GetFPRType() == eXSAVE)
+        return monitor.WriteRegisterSet(m_thread.GetID(), &m_iovec, sizeof(m_fpr.xstate.xsave), NT_X86_XSTATE);
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::ReadRegister(const unsigned reg,
+                                                        RegisterValue &value)
+{
+    ProcessMonitor &monitor = GetMonitor();
+    return monitor.ReadRegisterValue(m_thread.GetID(),
+                                     GetRegisterOffset(reg),
+                                     GetRegisterName(reg),
+                                     GetRegisterSize(reg),
+                                     value);
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::WriteRegister(const unsigned reg,
+                                                         const RegisterValue &value)
+{
+    unsigned reg_to_write = reg;
+    RegisterValue value_to_write = value;
+
+    // Check if this is a subregister of a full register.
+    const RegisterInfo *reg_info = GetRegisterInfoAtIndex(reg);
+    if (reg_info->invalidate_regs && (reg_info->invalidate_regs[0] != LLDB_INVALID_REGNUM))
+    {
+        RegisterValue full_value;
+        uint32_t full_reg = reg_info->invalidate_regs[0];
+        const RegisterInfo *full_reg_info = GetRegisterInfoAtIndex(full_reg);
+
+        // Read the full register.
+        if (ReadRegister(full_reg_info, full_value))
+        {
+            Error error;
+            ByteOrder byte_order = GetByteOrder();
+            uint8_t dst[RegisterValue::kMaxRegisterByteSize];
+
+            // Get the bytes for the full register.
+            const uint32_t dest_size = full_value.GetAsMemoryData (full_reg_info, 
+                                                                   dst, 
+                                                                   sizeof(dst), 
+                                                                   byte_order, 
+                                                                   error);
+            if (error.Success() && dest_size)
+            {
+                uint8_t src[RegisterValue::kMaxRegisterByteSize];
+
+                // Get the bytes for the source data.
+                const uint32_t src_size = value.GetAsMemoryData (reg_info, src, sizeof(src), byte_order, error);
+                if (error.Success() && src_size && (src_size < dest_size))
+                {
+                    // Copy the src bytes to the destination.
+                    memcpy (dst + (reg_info->byte_offset & 0x1), src, src_size);
+                    // Set this full register as the value to write.
+                    value_to_write.SetBytes(dst, full_value.GetByteSize(), byte_order);
+                    value_to_write.SetType(full_reg_info);
+                    reg_to_write = full_reg;
+                }
+            }
+        }
+    }
+
+    ProcessMonitor &monitor = GetMonitor();
+    return monitor.WriteRegisterValue(m_thread.GetID(),
+                                      GetRegisterOffset(reg_to_write),
+                                      GetRegisterName(reg_to_write),
+                                      value_to_write);
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::ReadRegister(const RegisterInfo *reg_info, RegisterValue &value)
+{
+    if (!reg_info)
+        return false;
+
+    const uint32_t reg = reg_info->kinds[eRegisterKindLLDB];
+
+    if (IsFPR(reg, GetFPRType()))
+    {
+        if (!ReadFPR())
+            return false;
+    }
+    else
+    {
+        uint32_t full_reg = reg;
+        bool is_subreg = reg_info->invalidate_regs && (reg_info->invalidate_regs[0] != LLDB_INVALID_REGNUM);
+
+        if (is_subreg)
+        {
+            // Read the full aligned 64-bit register.
+            full_reg = reg_info->invalidate_regs[0];
+        }
+
+        bool success = ReadRegister(full_reg, value);
+
+        if (success)
+        {
+            // If our read was not aligned (for ah,bh,ch,dh), shift our returned value one byte to the right.
+            if (is_subreg && (reg_info->byte_offset & 0x1))
+                value.SetUInt64(value.GetAsUInt64() >> 8);
+
+            // If our return byte size was greater than the return value reg size, then
+            // use the type specified by reg_info rather than the uint64_t default
+            if (value.GetByteSize() > reg_info->byte_size)
+                value.SetType(reg_info);
+        }
+        return success; 
+    }
+
+    if (reg_info->encoding == eEncodingVector)
+    {
+        ByteOrder byte_order = GetByteOrder();
+
+        if (byte_order != ByteOrder::eByteOrderInvalid)
+        {
+            if (reg >= m_reg_info.first_st && reg <= m_reg_info.last_st)
+               value.SetBytes(m_fpr.xstate.fxsave.stmm[reg - m_reg_info.first_st].bytes, reg_info->byte_size, byte_order);
+            if (reg >= m_reg_info.first_mm && reg <= m_reg_info.last_mm)
+               value.SetBytes(m_fpr.xstate.fxsave.stmm[reg - m_reg_info.first_mm].bytes, reg_info->byte_size, byte_order);
+            if (reg >= m_reg_info.first_xmm && reg <= m_reg_info.last_xmm)
+                value.SetBytes(m_fpr.xstate.fxsave.xmm[reg - m_reg_info.first_xmm].bytes, reg_info->byte_size, byte_order);
+            if (reg >= m_reg_info.first_ymm && reg <= m_reg_info.last_ymm)
+            {
+                // Concatenate ymm using the register halves in xmm.bytes and ymmh.bytes
+                if (GetFPRType() == eXSAVE && CopyXSTATEtoYMM(reg, byte_order))
+                    value.SetBytes(m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes, reg_info->byte_size, byte_order);
+                else
+                    return false;
+            }
+            return value.GetType() == RegisterValue::eTypeBytes;
+        }
+        return false;
+    }
+
+    // Get pointer to m_fpr.xstate.fxsave variable and set the data from it.
+    assert (reg_info->byte_offset < sizeof(m_fpr));
+    uint8_t *src = (uint8_t *)&m_fpr + reg_info->byte_offset; 
+    switch (reg_info->byte_size)
+    {
+        case 2:
+            value.SetUInt16(*(uint16_t *)src);
+            return true;
+        case 4:
+            value.SetUInt32(*(uint32_t *)src);
+            return true;
+        case 8:
+            value.SetUInt64(*(uint64_t *)src);
+            return true;
+        default:
+            assert(false && "Unhandled data size.");
+            return false;
+    }
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::WriteRegister(const RegisterInfo *reg_info, const RegisterValue &value)
+{
+    const uint32_t reg = reg_info->kinds[eRegisterKindLLDB];
+
+    if (IsGPR(reg))
+        return WriteRegister(reg, value);
+
+    if (IsFPR(reg, GetFPRType()))
+    {
+        if (reg_info->encoding == eEncodingVector)
+        {
+            if (reg >= m_reg_info.first_st && reg <= m_reg_info.last_st)
+               ::memcpy (m_fpr.xstate.fxsave.stmm[reg - m_reg_info.first_st].bytes, value.GetBytes(), value.GetByteSize());
+
+            if (reg >= m_reg_info.first_mm && reg <= m_reg_info.last_mm)
+               ::memcpy (m_fpr.xstate.fxsave.stmm[reg - m_reg_info.first_mm].bytes, value.GetBytes(), value.GetByteSize());
+ 
+            if (reg >= m_reg_info.first_xmm && reg <= m_reg_info.last_xmm)
+               ::memcpy (m_fpr.xstate.fxsave.xmm[reg - m_reg_info.first_xmm].bytes, value.GetBytes(), value.GetByteSize());
+            
+            if (reg >= m_reg_info.first_ymm && reg <= m_reg_info.last_ymm)
+            {
+               if (GetFPRType() != eXSAVE)
+                   return false; // the target processor does not support AVX
+
+               // Store ymm register content, and split into the register halves in xmm.bytes and ymmh.bytes
+               ::memcpy (m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes, value.GetBytes(), value.GetByteSize());
+               if (false == CopyYMMtoXSTATE(reg, GetByteOrder()))
+                   return false;
+            }
+        }
+        else
+        {
+            // Get pointer to m_fpr.xstate.fxsave variable and set the data to it.
+            assert (reg_info->byte_offset < sizeof(m_fpr));
+            uint8_t *dst = (uint8_t *)&m_fpr + reg_info->byte_offset; 
+            switch (reg_info->byte_size)
+            {
+                case 2:
+                    *(uint16_t *)dst = value.GetAsUInt16();
+                    break;
+                case 4:
+                    *(uint32_t *)dst = value.GetAsUInt32();
+                    break;
+                case 8:
+                    *(uint64_t *)dst = value.GetAsUInt64();
+                    break;
+                default:
+                    assert(false && "Unhandled data size.");
+                    return false;
+            }
+        }
+
+        if (WriteFPR())
+        {
+            if (IsAVX(reg))
+                return CopyYMMtoXSTATE(reg, GetByteOrder());
+            return true;
+        }
+    }
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::ReadAllRegisterValues(DataBufferSP &data_sp)
+{
+    bool success = false;
+    data_sp.reset (new DataBufferHeap (REG_CONTEXT_SIZE, 0));
+    if (data_sp && ReadGPR () && ReadFPR ())
+    {
+        uint8_t *dst = data_sp->GetBytes();
+        success = dst != 0;
+
+        if (success)
+        {
+            ::memcpy (dst, &m_gpr_x86_64, GetGPRSize());
+            dst += GetGPRSize();
+        }
+        if (GetFPRType() == eFXSAVE)
+            ::memcpy (dst, &m_fpr.xstate.fxsave, sizeof(m_fpr.xstate.fxsave));
+        
+        if (GetFPRType() == eXSAVE)
+        {
+            ByteOrder byte_order = GetByteOrder();
+
+            // Assemble the YMM register content from the register halves.
+            for (uint32_t reg  = m_reg_info.first_ymm; success && reg <= m_reg_info.last_ymm; ++reg)
+                success = CopyXSTATEtoYMM(reg, byte_order);
+
+            if (success)
+            {
+                // Copy the extended register state including the assembled ymm registers.
+                ::memcpy (dst, &m_fpr, sizeof(m_fpr));
+            }
+        }
+    }
+    return success;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::WriteAllRegisterValues(const DataBufferSP &data_sp)
+{
+    bool success = false;
+    if (data_sp && data_sp->GetByteSize() == REG_CONTEXT_SIZE)
+    {
+        uint8_t *src = data_sp->GetBytes();
+        if (src)
+        {
+            ::memcpy (&m_gpr_x86_64, src, GetGPRSize());
+
+            if (WriteGPR())
+            {
+                src += GetGPRSize();
+                if (GetFPRType() == eFXSAVE)
+                    ::memcpy (&m_fpr.xstate.fxsave, src, sizeof(m_fpr.xstate.fxsave));
+                if (GetFPRType() == eXSAVE)
+                    ::memcpy (&m_fpr.xstate.xsave, src, sizeof(m_fpr.xstate.xsave));
+
+                success = WriteFPR();
+                if (success)
+                {
+                    if (GetFPRType() == eXSAVE)
+                    {
+                        ByteOrder byte_order = GetByteOrder();
+
+                        // Parse the YMM register content from the register halves.
+                        for (uint32_t reg = m_reg_info.first_ymm; success && reg <= m_reg_info.last_ymm; ++reg)
+                            success = CopyYMMtoXSTATE(reg, byte_order);
+                    }
+                }
+            }
+        }
+    }
+    return success;
+}
+
+uint32_t
+RegisterContextPOSIXProcessMonitor_x86_64::SetHardwareWatchpoint(addr_t addr, size_t size,
+                                              bool read, bool write)
+{
+    const uint32_t num_hw_watchpoints = NumSupportedHardwareWatchpoints();
+    uint32_t hw_index;
+
+    for (hw_index = 0; hw_index < num_hw_watchpoints; ++hw_index)
+    {
+        if (IsWatchpointVacant(hw_index))
+            return SetHardwareWatchpointWithIndex(addr, size,
+                                                  read, write,
+                                                  hw_index);
+    }
+
+    return LLDB_INVALID_INDEX32;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::ClearHardwareWatchpoint(uint32_t hw_index)
+{
+    if (hw_index < NumSupportedHardwareWatchpoints())
+    {
+        RegisterValue current_dr7_bits;
+
+        if (ReadRegister(m_reg_info.first_dr + 7, current_dr7_bits))
+        {
+            uint64_t new_dr7_bits = current_dr7_bits.GetAsUInt64() & ~(3 << (2*hw_index));
+
+            if (WriteRegister(m_reg_info.first_dr + 7, RegisterValue(new_dr7_bits)))
+                return true;
+        }
+    }
+
+    return false;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::HardwareSingleStep(bool enable)
+{
+    enum { TRACE_BIT = 0x100 };
+    uint64_t rflags;
+
+    if ((rflags = ReadRegisterAsUnsigned(m_reg_info.gpr_flags, -1UL)) == -1UL)
+        return false;
+    
+    if (enable)
+    {
+        if (rflags & TRACE_BIT)
+            return true;
+
+        rflags |= TRACE_BIT;
+    }
+    else
+    {
+        if (!(rflags & TRACE_BIT))
+            return false;
+
+        rflags &= ~TRACE_BIT;
+    }
+
+    return WriteRegisterFromUnsigned(m_reg_info.gpr_flags, rflags);
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::UpdateAfterBreakpoint()
+{
+    // PC points one byte past the int3 responsible for the breakpoint.
+    lldb::addr_t pc;
+
+    if ((pc = GetPC()) == LLDB_INVALID_ADDRESS)
+        return false;
+
+    SetPC(pc - 1);
+    return true;
+}
+
+unsigned
+RegisterContextPOSIXProcessMonitor_x86_64::GetRegisterIndexFromOffset(unsigned offset)
+{
+    unsigned reg;
+    for (reg = 0; reg < m_reg_info.num_registers; reg++)
+    {
+        if (GetRegisterInfo()[reg].byte_offset == offset)
+            break;
+    }
+    assert(reg < m_reg_info.num_registers && "Invalid register offset.");
+    return reg;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::IsWatchpointHit(uint32_t hw_index)
+{
+    bool is_hit = false;
+
+    if (m_watchpoints_initialized == false)
+    {    
+        // Reset the debug status and debug control registers
+        RegisterValue zero_bits = RegisterValue(uint64_t(0));
+        if (!WriteRegister(m_reg_info.first_dr + 6, zero_bits) || !WriteRegister(m_reg_info.first_dr + 7, zero_bits))
+            assert(false && "Could not initialize watchpoint registers");
+        m_watchpoints_initialized = true;
+    }    
+
+    if (hw_index < NumSupportedHardwareWatchpoints())
+    {    
+        RegisterValue value;
+
+        if (ReadRegister(m_reg_info.first_dr + 6, value))
+        {    
+            uint64_t val = value.GetAsUInt64();
+            is_hit = val & (1 << hw_index);
+        }    
+    }    
+
+    return is_hit;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::ClearWatchpointHits()
+{
+    return WriteRegister(m_reg_info.first_dr + 6, RegisterValue((uint64_t)0));
+}
+
+addr_t
+RegisterContextPOSIXProcessMonitor_x86_64::GetWatchpointAddress(uint32_t hw_index)
+{
+    addr_t wp_monitor_addr = LLDB_INVALID_ADDRESS;
+
+    if (hw_index < NumSupportedHardwareWatchpoints())
+    {
+        if (!IsWatchpointVacant(hw_index))
+        {
+            RegisterValue value;
+
+            if (ReadRegister(m_reg_info.first_dr + hw_index, value))
+                wp_monitor_addr = value.GetAsUInt64();
+        }
+    }
+
+    return wp_monitor_addr;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::IsWatchpointVacant(uint32_t hw_index)
+{
+    bool is_vacant = false;
+    RegisterValue value;
+
+    assert(hw_index < NumSupportedHardwareWatchpoints());
+
+    if (m_watchpoints_initialized == false)
+    {
+        // Reset the debug status and debug control registers
+        RegisterValue zero_bits = RegisterValue(uint64_t(0));
+        if (!WriteRegister(m_reg_info.first_dr + 6, zero_bits) || !WriteRegister(m_reg_info.first_dr + 7, zero_bits))
+            assert(false && "Could not initialize watchpoint registers");
+        m_watchpoints_initialized = true;
+    }
+
+    if (ReadRegister(m_reg_info.first_dr + 7, value))
+    {
+        uint64_t val = value.GetAsUInt64();
+        is_vacant = (val & (3 << 2*hw_index)) == 0;
+    }
+
+    return is_vacant;
+}
+
+bool
+RegisterContextPOSIXProcessMonitor_x86_64::SetHardwareWatchpointWithIndex(addr_t addr, size_t size,
+                                                       bool read, bool write,
+                                                       uint32_t hw_index)
+{
+    const uint32_t num_hw_watchpoints = NumSupportedHardwareWatchpoints();
+
+    if (num_hw_watchpoints == 0 || hw_index >= num_hw_watchpoints)
+        return false;
+
+    if (!(size == 1 || size == 2 || size == 4 || size == 8))
+        return false;
+
+    if (read == false && write == false)
+        return false;
+
+    if (!IsWatchpointVacant(hw_index))
+        return false;
+
+    // Set both dr7 (debug control register) and dri (debug address register).
+
+    // dr7{7-0} encodes the local/global enable bits:
+    //  global enable --. .-- local enable
+    //                  | |
+    //                  v v
+    //      dr0 -> bits{1-0}
+    //      dr1 -> bits{3-2}
+    //      dr2 -> bits{5-4}
+    //      dr3 -> bits{7-6}
+    //
+    // dr7{31-16} encodes the rw/len bits:
+    //  b_x+3, b_x+2, b_x+1, b_x
+    //      where bits{x+1, x} => rw
+    //            0b00: execute, 0b01: write, 0b11: read-or-write,
+    //            0b10: io read-or-write (unused)
+    //      and bits{x+3, x+2} => len
+    //            0b00: 1-byte, 0b01: 2-byte, 0b11: 4-byte, 0b10: 8-byte
+    //
+    //      dr0 -> bits{19-16}
+    //      dr1 -> bits{23-20}
+    //      dr2 -> bits{27-24}
+    //      dr3 -> bits{31-28}
+    if (hw_index < num_hw_watchpoints)
+    {
+        RegisterValue current_dr7_bits;
+
+        if (ReadRegister(m_reg_info.first_dr + 7, current_dr7_bits))
+        {
+            uint64_t new_dr7_bits = current_dr7_bits.GetAsUInt64() |
+                                    (1 << (2*hw_index) |
+                                    size_and_rw_bits(size, read, write) <<
+                                    (16+4*hw_index));
+
+            if (WriteRegister(m_reg_info.first_dr + hw_index, RegisterValue(addr)) &&
+                WriteRegister(m_reg_info.first_dr + 7, RegisterValue(new_dr7_bits)))
+                return true;
+        }
+    }
+
+    return false;
+}
+
+uint32_t
+RegisterContextPOSIXProcessMonitor_x86_64::NumSupportedHardwareWatchpoints()
+{
+    // Available debug address registers: dr0, dr1, dr2, dr3
+    return 4;
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.h
new file mode 100644
index 00000000000..2b64fa8003a
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIXProcessMonitor_x86.h
@@ -0,0 +1,95 @@
+//===-- RegisterContextPOSIXProcessMonitor_x86.h ----------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContextPOSIXProcessMonitor_x86_H_
+#define liblldb_RegisterContextPOSIXProcessMonitor_x86_H_
+
+#include "Plugins/Process/POSIX/RegisterContextPOSIX_x86.h"
+
+class RegisterContextPOSIXProcessMonitor_x86_64:
+    public RegisterContextPOSIX_x86,
+    public POSIXBreakpointProtocol
+{
+public:
+    RegisterContextPOSIXProcessMonitor_x86_64(lldb_private::Thread &thread,
+                                              uint32_t concrete_frame_idx,
+                                              RegisterInfoInterface *register_info);
+
+protected:
+    bool
+    ReadGPR();
+
+    bool
+    ReadFPR();
+
+    bool
+    WriteGPR();
+
+    bool
+    WriteFPR();
+
+    // lldb_private::RegisterContext
+    bool
+    ReadRegister(const unsigned reg, lldb_private::RegisterValue &value);
+
+    bool
+    WriteRegister(const unsigned reg, const lldb_private::RegisterValue &value);
+
+    bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+
+    bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp);
+
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp);
+
+    uint32_t
+    SetHardwareWatchpoint(lldb::addr_t addr, size_t size, bool read, bool write);
+
+    bool
+    ClearHardwareWatchpoint(uint32_t hw_index);
+
+    bool
+    HardwareSingleStep(bool enable);
+
+    // POSIXBreakpointProtocol
+    bool
+    UpdateAfterBreakpoint();
+
+    unsigned
+    GetRegisterIndexFromOffset(unsigned offset);
+
+    bool
+    IsWatchpointHit(uint32_t hw_index);
+
+    bool
+    ClearWatchpointHits();
+
+    lldb::addr_t
+    GetWatchpointAddress(uint32_t hw_index);
+
+    bool
+    IsWatchpointVacant(uint32_t hw_index);
+
+    bool
+    SetHardwareWatchpointWithIndex(lldb::addr_t addr, size_t size, bool read, bool write, uint32_t hw_index);
+
+    uint32_t
+    NumSupportedHardwareWatchpoints();
+
+private:
+    ProcessMonitor &
+    GetMonitor();
+};
+
+#endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.cpp
new file mode 100644
index 00000000000..45c99aec165
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.cpp
@@ -0,0 +1,238 @@
+//===-- RegisterContextPOSIX_mips64.cpp -------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <cstring>
+#include <errno.h>
+#include <stdint.h>
+
+#include "lldb/Core/DataBufferHeap.h"
+#include "lldb/Core/DataExtractor.h"
+#include "lldb/Core/RegisterValue.h"
+#include "lldb/Core/Scalar.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Thread.h"
+#include "lldb/Host/Endian.h"
+#include "llvm/Support/Compiler.h"
+
+#include "ProcessPOSIX.h"
+#include "RegisterContextPOSIX_mips64.h"
+#include "Plugins/Process/elf-core/ProcessElfCore.h"
+
+using namespace lldb_private;
+using namespace lldb;
+
+static const
+uint32_t g_gpr_regnums[] =
+{
+    gpr_zero_mips64,
+    gpr_r1_mips64,
+    gpr_r2_mips64,
+    gpr_r3_mips64,
+    gpr_r4_mips64,
+    gpr_r5_mips64,
+    gpr_r6_mips64,
+    gpr_r7_mips64,
+    gpr_r8_mips64,
+    gpr_r9_mips64,
+    gpr_r10_mips64,
+    gpr_r11_mips64,
+    gpr_r12_mips64,
+    gpr_r13_mips64,
+    gpr_r14_mips64,
+    gpr_r15_mips64,
+    gpr_r16_mips64,
+    gpr_r17_mips64,
+    gpr_r18_mips64,
+    gpr_r19_mips64,
+    gpr_r20_mips64,
+    gpr_r21_mips64,
+    gpr_r22_mips64,
+    gpr_r23_mips64,
+    gpr_r24_mips64,
+    gpr_r25_mips64,
+    gpr_r26_mips64,
+    gpr_r27_mips64,
+    gpr_gp_mips64,
+    gpr_sp_mips64,
+    gpr_r30_mips64,
+    gpr_ra_mips64,
+    gpr_sr_mips64,
+    gpr_mullo_mips64,
+    gpr_mulhi_mips64,
+    gpr_badvaddr_mips64,
+    gpr_cause_mips64,
+    gpr_pc_mips64,
+    gpr_ic_mips64,
+    gpr_dummy_mips64
+};
+
+// Number of register sets provided by this context.
+enum
+{
+    k_num_register_sets = 1
+};
+
+static const RegisterSet
+g_reg_sets_mips64[k_num_register_sets] =
+{
+    { "General Purpose Registers",  "gpr", k_num_gpr_registers_mips64, g_gpr_regnums },
+};
+
+bool RegisterContextPOSIX_mips64::IsGPR(unsigned reg)
+{
+    return reg <= k_num_gpr_registers_mips64;   // GPR's come first.
+}
+
+bool
+RegisterContextPOSIX_mips64::IsFPR(unsigned reg)
+{
+    // XXX
+    return false;
+}
+
+RegisterContextPOSIX_mips64::RegisterContextPOSIX_mips64(Thread &thread,
+                                               uint32_t concrete_frame_idx,
+                                               RegisterInfoInterface *register_info)
+    : RegisterContext(thread, concrete_frame_idx)
+{
+    m_register_info_ap.reset(register_info);
+
+    // elf-core yet to support ReadFPR()
+    ProcessSP base = CalculateProcess();
+    if (base.get()->GetPluginName() ==  ProcessElfCore::GetPluginNameStatic())
+        return;
+}
+
+RegisterContextPOSIX_mips64::~RegisterContextPOSIX_mips64()
+{
+}
+
+void
+RegisterContextPOSIX_mips64::Invalidate()
+{
+}
+
+void
+RegisterContextPOSIX_mips64::InvalidateAllRegisters()
+{
+}
+
+unsigned
+RegisterContextPOSIX_mips64::GetRegisterOffset(unsigned reg)
+{
+    assert(reg < k_num_registers_mips64 && "Invalid register number.");
+    return GetRegisterInfo()[reg].byte_offset;
+}
+
+unsigned
+RegisterContextPOSIX_mips64::GetRegisterSize(unsigned reg)
+{
+    assert(reg < k_num_registers_mips64 && "Invalid register number.");
+    return GetRegisterInfo()[reg].byte_size;
+}
+
+size_t
+RegisterContextPOSIX_mips64::GetRegisterCount()
+{
+    size_t num_registers = k_num_registers_mips64;
+    return num_registers;
+}
+
+size_t
+RegisterContextPOSIX_mips64::GetGPRSize()
+{
+    return m_register_info_ap->GetGPRSize();
+}
+
+const RegisterInfo *
+RegisterContextPOSIX_mips64::GetRegisterInfo()
+{
+    // Commonly, this method is overridden and g_register_infos is copied and specialized.
+    // So, use GetRegisterInfo() rather than g_register_infos in this scope.
+    return m_register_info_ap->GetRegisterInfo ();
+}
+
+const RegisterInfo *
+RegisterContextPOSIX_mips64::GetRegisterInfoAtIndex(size_t reg)
+{
+    if (reg < k_num_registers_mips64)
+        return &GetRegisterInfo()[reg];
+    else
+        return NULL;
+}
+
+size_t
+RegisterContextPOSIX_mips64::GetRegisterSetCount()
+{
+    size_t sets = 0;
+    for (size_t set = 0; set < k_num_register_sets; ++set)
+    {
+        if (IsRegisterSetAvailable(set))
+            ++sets;
+    }
+
+    return sets;
+}
+
+const RegisterSet *
+RegisterContextPOSIX_mips64::GetRegisterSet(size_t set)
+{
+    if (IsRegisterSetAvailable(set))
+        return &g_reg_sets_mips64[set];
+    else
+        return NULL;
+}
+
+const char *
+RegisterContextPOSIX_mips64::GetRegisterName(unsigned reg)
+{
+    assert(reg < k_num_registers_mips64 && "Invalid register offset.");
+    return GetRegisterInfo()[reg].name;
+}
+
+lldb::ByteOrder
+RegisterContextPOSIX_mips64::GetByteOrder()
+{
+    // Get the target process whose privileged thread was used for the register read.
+    lldb::ByteOrder byte_order = eByteOrderInvalid;
+    Process *process = CalculateProcess().get();
+
+    if (process)
+        byte_order = process->GetByteOrder();
+    return byte_order;
+}
+
+bool
+RegisterContextPOSIX_mips64::IsRegisterSetAvailable(size_t set_index)
+{
+    size_t num_sets = k_num_register_sets;
+
+    return (set_index < num_sets);
+}
+
+// Used when parsing DWARF and EH frame information and any other
+// object file sections that contain register numbers in them.
+uint32_t
+RegisterContextPOSIX_mips64::ConvertRegisterKindToRegisterNumber(uint32_t kind,
+                                                                 uint32_t num)
+{
+    const uint32_t num_regs = GetRegisterCount();
+
+    assert (kind < kNumRegisterKinds);
+    for (uint32_t reg_idx = 0; reg_idx < num_regs; ++reg_idx)
+    {
+        const RegisterInfo *reg_info = GetRegisterInfoAtIndex (reg_idx);
+
+        if (reg_info->kinds[kind] == num)
+            return reg_idx;
+    }
+
+    return LLDB_INVALID_REGNUM;
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h
new file mode 100644
index 00000000000..a2a7d1f4527
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h
@@ -0,0 +1,138 @@
+//===-- RegisterContextPOSIX_mips64.h ---------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContextPOSIX_mips64_H_
+#define liblldb_RegisterContextPOSIX_mips64_H_
+
+#include "lldb/Core/Log.h"
+#include "RegisterContextPOSIX.h"
+#include "RegisterContext_mips64.h"
+
+class ProcessMonitor;
+
+// ---------------------------------------------------------------------------
+// Internal codes for all mips64 registers.
+// ---------------------------------------------------------------------------
+enum
+{
+    k_first_gpr_mips64,
+    gpr_zero_mips64 = k_first_gpr_mips64,
+    gpr_r1_mips64,
+    gpr_r2_mips64,
+    gpr_r3_mips64,
+    gpr_r4_mips64,
+    gpr_r5_mips64,
+    gpr_r6_mips64,
+    gpr_r7_mips64,
+    gpr_r8_mips64,
+    gpr_r9_mips64,
+    gpr_r10_mips64,
+    gpr_r11_mips64,
+    gpr_r12_mips64,
+    gpr_r13_mips64,
+    gpr_r14_mips64,
+    gpr_r15_mips64,
+    gpr_r16_mips64,
+    gpr_r17_mips64,
+    gpr_r18_mips64,
+    gpr_r19_mips64,
+    gpr_r20_mips64,
+    gpr_r21_mips64,
+    gpr_r22_mips64,
+    gpr_r23_mips64,
+    gpr_r24_mips64,
+    gpr_r25_mips64,
+    gpr_r26_mips64,
+    gpr_r27_mips64,
+    gpr_gp_mips64,
+    gpr_sp_mips64,
+    gpr_r30_mips64,
+    gpr_ra_mips64,
+    gpr_sr_mips64,
+    gpr_mullo_mips64,
+    gpr_mulhi_mips64,
+    gpr_badvaddr_mips64,
+    gpr_cause_mips64,
+    gpr_pc_mips64,
+    gpr_ic_mips64,
+    gpr_dummy_mips64,
+
+    k_num_registers_mips64,
+    k_num_gpr_registers_mips64 = k_num_registers_mips64
+};
+
+class RegisterContextPOSIX_mips64
+  : public lldb_private::RegisterContext
+{
+public:
+    RegisterContextPOSIX_mips64 (lldb_private::Thread &thread,
+                            uint32_t concrete_frame_idx,
+                            RegisterInfoInterface *register_info);
+
+    ~RegisterContextPOSIX_mips64();
+
+    void
+    Invalidate();
+
+    void
+    InvalidateAllRegisters();
+
+    size_t
+    GetRegisterCount();
+
+    virtual size_t
+    GetGPRSize();
+
+    virtual unsigned
+    GetRegisterSize(unsigned reg);
+
+    virtual unsigned
+    GetRegisterOffset(unsigned reg);
+
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg);
+
+    size_t
+    GetRegisterSetCount();
+
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t set);
+
+    const char *
+    GetRegisterName(unsigned reg);
+
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(uint32_t kind, uint32_t num);
+
+protected:
+    uint64_t m_gpr_mips64[k_num_gpr_registers_mips64];         // general purpose registers.
+    std::unique_ptr<RegisterInfoInterface> m_register_info_ap; // Register Info Interface (FreeBSD or Linux)
+
+    // Determines if an extended register set is supported on the processor running the inferior process.
+    virtual bool
+    IsRegisterSetAvailable(size_t set_index);
+
+    virtual const lldb_private::RegisterInfo *
+    GetRegisterInfo();
+
+    bool
+    IsGPR(unsigned reg);
+
+    bool
+    IsFPR(unsigned reg);
+
+    lldb::ByteOrder GetByteOrder();
+
+    virtual bool ReadGPR() = 0;
+    virtual bool ReadFPR() = 0;
+    virtual bool WriteGPR() = 0;
+    virtual bool WriteFPR() = 0;
+};
+
+#endif // #ifndef liblldb_RegisterContextPOSIX_mips64_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.cpp
new file mode 100644
index 00000000000..9ae541a6309
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.cpp
@@ -0,0 +1,666 @@
+//===-- RegisterContextPOSIX_x86.cpp ----------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <cstring>
+#include <errno.h>
+#include <stdint.h>
+
+#include "lldb/Core/DataBufferHeap.h"
+#include "lldb/Core/DataExtractor.h"
+#include "lldb/Core/RegisterValue.h"
+#include "lldb/Core/Scalar.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Thread.h"
+#include "lldb/Host/Endian.h"
+#include "llvm/Support/Compiler.h"
+
+#include "ProcessPOSIX.h"
+#include "RegisterContext_x86.h"
+#include "RegisterContextPOSIX_x86.h"
+#include "Plugins/Process/elf-core/ProcessElfCore.h"
+
+using namespace lldb_private;
+using namespace lldb;
+
+const uint32_t
+g_gpr_regnums_i386[] =
+{
+    gpr_eax_i386,
+    gpr_ebx_i386,
+    gpr_ecx_i386,
+    gpr_edx_i386,
+    gpr_edi_i386,
+    gpr_esi_i386,
+    gpr_ebp_i386,
+    gpr_esp_i386,
+    gpr_eip_i386,
+    gpr_eflags_i386,
+    gpr_cs_i386,
+    gpr_fs_i386,
+    gpr_gs_i386,
+    gpr_ss_i386,
+    gpr_ds_i386,
+    gpr_es_i386,
+    gpr_ax_i386,
+    gpr_bx_i386,
+    gpr_cx_i386,
+    gpr_dx_i386,
+    gpr_di_i386,
+    gpr_si_i386,
+    gpr_bp_i386,
+    gpr_sp_i386,
+    gpr_ah_i386,
+    gpr_bh_i386,
+    gpr_ch_i386,
+    gpr_dh_i386,
+    gpr_al_i386,
+    gpr_bl_i386,
+    gpr_cl_i386,
+    gpr_dl_i386
+};
+static_assert((sizeof(g_gpr_regnums_i386) / sizeof(g_gpr_regnums_i386[0])) == k_num_gpr_registers_i386,
+    "g_gpr_regnums_i386 has wrong number of register infos");
+
+const uint32_t
+g_fpu_regnums_i386[] =
+{
+    fpu_fctrl_i386,
+    fpu_fstat_i386,
+    fpu_ftag_i386,
+    fpu_fop_i386,
+    fpu_fiseg_i386,
+    fpu_fioff_i386,
+    fpu_foseg_i386,
+    fpu_fooff_i386,
+    fpu_mxcsr_i386,
+    fpu_mxcsrmask_i386,
+    fpu_st0_i386,
+    fpu_st1_i386,
+    fpu_st2_i386,
+    fpu_st3_i386,
+    fpu_st4_i386,
+    fpu_st5_i386,
+    fpu_st6_i386,
+    fpu_st7_i386,
+    fpu_mm0_i386,
+    fpu_mm1_i386,
+    fpu_mm2_i386,
+    fpu_mm3_i386,
+    fpu_mm4_i386,
+    fpu_mm5_i386,
+    fpu_mm6_i386,
+    fpu_mm7_i386,
+    fpu_xmm0_i386,
+    fpu_xmm1_i386,
+    fpu_xmm2_i386,
+    fpu_xmm3_i386,
+    fpu_xmm4_i386,
+    fpu_xmm5_i386,
+    fpu_xmm6_i386,
+    fpu_xmm7_i386
+};
+static_assert((sizeof(g_fpu_regnums_i386) / sizeof(g_fpu_regnums_i386[0])) == k_num_fpr_registers_i386,
+    "g_fpu_regnums_i386 has wrong number of register infos");
+
+const uint32_t
+g_avx_regnums_i386[] =
+{
+    fpu_ymm0_i386,
+    fpu_ymm1_i386,
+    fpu_ymm2_i386,
+    fpu_ymm3_i386,
+    fpu_ymm4_i386,
+    fpu_ymm5_i386,
+    fpu_ymm6_i386,
+    fpu_ymm7_i386
+};
+static_assert((sizeof(g_avx_regnums_i386) / sizeof(g_avx_regnums_i386[0])) == k_num_avx_registers_i386,
+    " g_avx_regnums_i386 has wrong number of register infos");
+
+static const
+uint32_t g_gpr_regnums_x86_64[] =
+{
+    gpr_rax_x86_64,
+    gpr_rbx_x86_64,
+    gpr_rcx_x86_64,
+    gpr_rdx_x86_64,
+    gpr_rdi_x86_64,
+    gpr_rsi_x86_64,
+    gpr_rbp_x86_64,
+    gpr_rsp_x86_64,
+    gpr_r8_x86_64,
+    gpr_r9_x86_64,
+    gpr_r10_x86_64,
+    gpr_r11_x86_64,
+    gpr_r12_x86_64,
+    gpr_r13_x86_64,
+    gpr_r14_x86_64,
+    gpr_r15_x86_64,
+    gpr_rip_x86_64,
+    gpr_rflags_x86_64,
+    gpr_cs_x86_64,
+    gpr_fs_x86_64,
+    gpr_gs_x86_64,
+    gpr_ss_x86_64,
+    gpr_ds_x86_64,
+    gpr_es_x86_64,
+    gpr_eax_x86_64,
+    gpr_ebx_x86_64,
+    gpr_ecx_x86_64,
+    gpr_edx_x86_64,
+    gpr_edi_x86_64,
+    gpr_esi_x86_64,
+    gpr_ebp_x86_64,
+    gpr_esp_x86_64,
+    gpr_r8d_x86_64,    // Low 32 bits or r8
+    gpr_r9d_x86_64,    // Low 32 bits or r9
+    gpr_r10d_x86_64,   // Low 32 bits or r10
+    gpr_r11d_x86_64,   // Low 32 bits or r11
+    gpr_r12d_x86_64,   // Low 32 bits or r12
+    gpr_r13d_x86_64,   // Low 32 bits or r13
+    gpr_r14d_x86_64,   // Low 32 bits or r14
+    gpr_r15d_x86_64,   // Low 32 bits or r15
+    gpr_ax_x86_64,
+    gpr_bx_x86_64,
+    gpr_cx_x86_64,
+    gpr_dx_x86_64,
+    gpr_di_x86_64,
+    gpr_si_x86_64,
+    gpr_bp_x86_64,
+    gpr_sp_x86_64,
+    gpr_r8w_x86_64,    // Low 16 bits or r8
+    gpr_r9w_x86_64,    // Low 16 bits or r9
+    gpr_r10w_x86_64,   // Low 16 bits or r10
+    gpr_r11w_x86_64,   // Low 16 bits or r11
+    gpr_r12w_x86_64,   // Low 16 bits or r12
+    gpr_r13w_x86_64,   // Low 16 bits or r13
+    gpr_r14w_x86_64,   // Low 16 bits or r14
+    gpr_r15w_x86_64,   // Low 16 bits or r15
+    gpr_ah_x86_64,
+    gpr_bh_x86_64,
+    gpr_ch_x86_64,
+    gpr_dh_x86_64,
+    gpr_al_x86_64,
+    gpr_bl_x86_64,
+    gpr_cl_x86_64,
+    gpr_dl_x86_64,
+    gpr_dil_x86_64,
+    gpr_sil_x86_64,
+    gpr_bpl_x86_64,
+    gpr_spl_x86_64,
+    gpr_r8l_x86_64,    // Low 8 bits or r8
+    gpr_r9l_x86_64,    // Low 8 bits or r9
+    gpr_r10l_x86_64,   // Low 8 bits or r10
+    gpr_r11l_x86_64,   // Low 8 bits or r11
+    gpr_r12l_x86_64,   // Low 8 bits or r12
+    gpr_r13l_x86_64,   // Low 8 bits or r13
+    gpr_r14l_x86_64,   // Low 8 bits or r14
+    gpr_r15l_x86_64,   // Low 8 bits or r15
+};
+static_assert((sizeof(g_gpr_regnums_x86_64) / sizeof(g_gpr_regnums_x86_64[0])) == k_num_gpr_registers_x86_64,
+    "g_gpr_regnums_x86_64 has wrong number of register infos");
+
+static const uint32_t
+g_fpu_regnums_x86_64[] =
+{
+    fpu_fctrl_x86_64,
+    fpu_fstat_x86_64,
+    fpu_ftag_x86_64,
+    fpu_fop_x86_64,
+    fpu_fiseg_x86_64,
+    fpu_fioff_x86_64,
+    fpu_foseg_x86_64,
+    fpu_fooff_x86_64,
+    fpu_mxcsr_x86_64,
+    fpu_mxcsrmask_x86_64,
+    fpu_st0_x86_64,
+    fpu_st1_x86_64,
+    fpu_st2_x86_64,
+    fpu_st3_x86_64,
+    fpu_st4_x86_64,
+    fpu_st5_x86_64,
+    fpu_st6_x86_64,
+    fpu_st7_x86_64,
+    fpu_mm0_x86_64,
+    fpu_mm1_x86_64,
+    fpu_mm2_x86_64,
+    fpu_mm3_x86_64,
+    fpu_mm4_x86_64,
+    fpu_mm5_x86_64,
+    fpu_mm6_x86_64,
+    fpu_mm7_x86_64,
+    fpu_xmm0_x86_64,
+    fpu_xmm1_x86_64,
+    fpu_xmm2_x86_64,
+    fpu_xmm3_x86_64,
+    fpu_xmm4_x86_64,
+    fpu_xmm5_x86_64,
+    fpu_xmm6_x86_64,
+    fpu_xmm7_x86_64,
+    fpu_xmm8_x86_64,
+    fpu_xmm9_x86_64,
+    fpu_xmm10_x86_64,
+    fpu_xmm11_x86_64,
+    fpu_xmm12_x86_64,
+    fpu_xmm13_x86_64,
+    fpu_xmm14_x86_64,
+    fpu_xmm15_x86_64
+};
+static_assert((sizeof(g_fpu_regnums_x86_64) / sizeof(g_fpu_regnums_x86_64[0])) == k_num_fpr_registers_x86_64,
+    "g_fpu_regnums_x86_64 has wrong number of register infos");
+
+static const uint32_t
+g_avx_regnums_x86_64[] =
+{
+    fpu_ymm0_x86_64,
+    fpu_ymm1_x86_64,
+    fpu_ymm2_x86_64,
+    fpu_ymm3_x86_64,
+    fpu_ymm4_x86_64,
+    fpu_ymm5_x86_64,
+    fpu_ymm6_x86_64,
+    fpu_ymm7_x86_64,
+    fpu_ymm8_x86_64,
+    fpu_ymm9_x86_64,
+    fpu_ymm10_x86_64,
+    fpu_ymm11_x86_64,
+    fpu_ymm12_x86_64,
+    fpu_ymm13_x86_64,
+    fpu_ymm14_x86_64,
+    fpu_ymm15_x86_64
+};
+static_assert((sizeof(g_avx_regnums_x86_64) / sizeof(g_avx_regnums_x86_64[0])) == k_num_avx_registers_x86_64,
+    "g_avx_regnums_x86_64 has wrong number of register infos");
+
+uint32_t RegisterContextPOSIX_x86::g_contained_eax[] = { gpr_eax_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_ebx[] = { gpr_ebx_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_ecx[] = { gpr_ecx_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_edx[] = { gpr_edx_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_edi[] = { gpr_edi_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_esi[] = { gpr_esi_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_ebp[] = { gpr_ebp_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_esp[] = { gpr_esp_i386, LLDB_INVALID_REGNUM };
+
+uint32_t RegisterContextPOSIX_x86::g_invalidate_eax[] = { gpr_eax_i386, gpr_ax_i386, gpr_ah_i386,  gpr_al_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_ebx[] = { gpr_ebx_i386, gpr_bx_i386, gpr_bh_i386,  gpr_bl_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_ecx[] = { gpr_ecx_i386, gpr_cx_i386, gpr_ch_i386,  gpr_cl_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_edx[] = { gpr_edx_i386, gpr_dx_i386, gpr_dh_i386,  gpr_dl_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_edi[] = { gpr_edi_i386, gpr_di_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_esi[] = { gpr_esi_i386, gpr_si_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_ebp[] = { gpr_ebp_i386, gpr_bp_i386, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_esp[] = { gpr_esp_i386, gpr_sp_i386, LLDB_INVALID_REGNUM };
+
+uint32_t RegisterContextPOSIX_x86::g_contained_rax[] = { gpr_rax_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_rbx[] = { gpr_rbx_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_rcx[] = { gpr_rcx_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_rdx[] = { gpr_rdx_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_rdi[] = { gpr_rdi_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_rsi[] = { gpr_rsi_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_rbp[] = { gpr_rbp_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_rsp[] = { gpr_rsp_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_r8[]  = { gpr_r8_x86_64,  LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_r9[]  = { gpr_r9_x86_64,  LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_r10[] = { gpr_r10_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_r11[] = { gpr_r11_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_r12[] = { gpr_r12_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_r13[] = { gpr_r13_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_r14[] = { gpr_r14_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_contained_r15[] = { gpr_r15_x86_64, LLDB_INVALID_REGNUM };
+
+uint32_t RegisterContextPOSIX_x86::g_invalidate_rax[] = { gpr_rax_x86_64, gpr_eax_x86_64,  gpr_ax_x86_64,   gpr_ah_x86_64,   gpr_al_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_rbx[] = { gpr_rbx_x86_64, gpr_ebx_x86_64,  gpr_bx_x86_64,   gpr_bh_x86_64,   gpr_bl_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_rcx[] = { gpr_rcx_x86_64, gpr_ecx_x86_64,  gpr_cx_x86_64,   gpr_ch_x86_64,   gpr_cl_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_rdx[] = { gpr_rdx_x86_64, gpr_edx_x86_64,  gpr_dx_x86_64,   gpr_dh_x86_64,   gpr_dl_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_rdi[] = { gpr_rdi_x86_64, gpr_edi_x86_64,  gpr_di_x86_64,   gpr_dil_x86_64,  LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_rsi[] = { gpr_rsi_x86_64, gpr_esi_x86_64,  gpr_si_x86_64,   gpr_sil_x86_64,  LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_rbp[] = { gpr_rbp_x86_64, gpr_ebp_x86_64,  gpr_bp_x86_64,   gpr_bpl_x86_64,  LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_rsp[] = { gpr_rsp_x86_64, gpr_esp_x86_64,  gpr_sp_x86_64,   gpr_spl_x86_64,  LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_r8[]  = { gpr_r8_x86_64,  gpr_r8d_x86_64,  gpr_r8w_x86_64,  gpr_r8l_x86_64,  LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_r9[]  = { gpr_r9_x86_64,  gpr_r9d_x86_64,  gpr_r9w_x86_64,  gpr_r9l_x86_64,  LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_r10[] = { gpr_r10_x86_64, gpr_r10d_x86_64, gpr_r10w_x86_64, gpr_r10l_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_r11[] = { gpr_r11_x86_64, gpr_r11d_x86_64, gpr_r11w_x86_64, gpr_r11l_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_r12[] = { gpr_r12_x86_64, gpr_r12d_x86_64, gpr_r12w_x86_64, gpr_r12l_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_r13[] = { gpr_r13_x86_64, gpr_r13d_x86_64, gpr_r13w_x86_64, gpr_r13l_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_r14[] = { gpr_r14_x86_64, gpr_r14d_x86_64, gpr_r14w_x86_64, gpr_r14l_x86_64, LLDB_INVALID_REGNUM };
+uint32_t RegisterContextPOSIX_x86::g_invalidate_r15[] = { gpr_r15_x86_64, gpr_r15d_x86_64, gpr_r15w_x86_64, gpr_r15l_x86_64, LLDB_INVALID_REGNUM };
+
+// Number of register sets provided by this context.
+enum
+{
+    k_num_extended_register_sets = 1,
+    k_num_register_sets = 3
+};
+
+static const RegisterSet
+g_reg_sets_i386[k_num_register_sets] =
+{
+    { "General Purpose Registers",  "gpr", k_num_gpr_registers_i386, g_gpr_regnums_i386 },
+    { "Floating Point Registers",   "fpu", k_num_fpr_registers_i386, g_fpu_regnums_i386 },
+    { "Advanced Vector Extensions", "avx", k_num_avx_registers_i386, g_avx_regnums_i386 }
+};
+
+static const RegisterSet
+g_reg_sets_x86_64[k_num_register_sets] =
+{
+    { "General Purpose Registers",  "gpr", k_num_gpr_registers_x86_64, g_gpr_regnums_x86_64 },
+    { "Floating Point Registers",   "fpu", k_num_fpr_registers_x86_64, g_fpu_regnums_x86_64 },
+    { "Advanced Vector Extensions", "avx", k_num_avx_registers_x86_64, g_avx_regnums_x86_64 }
+};
+
+bool RegisterContextPOSIX_x86::IsGPR(unsigned reg)
+{
+    return reg <= m_reg_info.last_gpr;   // GPR's come first.
+}
+
+bool RegisterContextPOSIX_x86::IsFPR(unsigned reg)
+{
+    return (m_reg_info.first_fpr <= reg && reg <= m_reg_info.last_fpr);
+}
+
+bool RegisterContextPOSIX_x86::IsAVX(unsigned reg)
+{
+    return (m_reg_info.first_ymm <= reg && reg <= m_reg_info.last_ymm);
+}
+
+bool RegisterContextPOSIX_x86::IsFPR(unsigned reg, FPRType fpr_type)
+{
+    bool generic_fpr = IsFPR(reg);
+
+    if (fpr_type == eXSAVE)
+        return generic_fpr || IsAVX(reg);
+    return generic_fpr;
+}
+
+RegisterContextPOSIX_x86::RegisterContextPOSIX_x86(Thread &thread,
+                                                   uint32_t concrete_frame_idx,
+                                                   RegisterInfoInterface *register_info)
+    : RegisterContext(thread, concrete_frame_idx)
+{
+    m_register_info_ap.reset(register_info);
+
+    switch (register_info->m_target_arch.GetCore())
+    {
+        case ArchSpec::eCore_x86_32_i386:
+        case ArchSpec::eCore_x86_32_i486:
+        case ArchSpec::eCore_x86_32_i486sx:
+            m_reg_info.num_registers        = k_num_registers_i386;
+            m_reg_info.num_gpr_registers    = k_num_gpr_registers_i386;
+            m_reg_info.num_fpr_registers    = k_num_fpr_registers_i386;
+            m_reg_info.num_avx_registers    = k_num_avx_registers_i386;
+            m_reg_info.last_gpr             = k_last_gpr_i386;
+            m_reg_info.first_fpr            = k_first_fpr_i386;
+            m_reg_info.last_fpr             = k_last_fpr_i386;
+            m_reg_info.first_st             = fpu_st0_i386;
+            m_reg_info.last_st              = fpu_st7_i386;
+            m_reg_info.first_mm             = fpu_mm0_i386;
+            m_reg_info.last_mm              = fpu_mm7_i386;
+            m_reg_info.first_xmm            = fpu_xmm0_i386;
+            m_reg_info.last_xmm             = fpu_xmm7_i386;
+            m_reg_info.first_ymm            = fpu_ymm0_i386;
+            m_reg_info.last_ymm             = fpu_ymm7_i386;
+            m_reg_info.first_dr             = dr0_i386;
+            m_reg_info.gpr_flags            = gpr_eflags_i386;
+            break;
+        case ArchSpec::eCore_x86_64_x86_64:
+            m_reg_info.num_registers        = k_num_registers_x86_64;
+            m_reg_info.num_gpr_registers    = k_num_gpr_registers_x86_64;
+            m_reg_info.num_fpr_registers    = k_num_fpr_registers_x86_64;
+            m_reg_info.num_avx_registers    = k_num_avx_registers_x86_64;
+            m_reg_info.last_gpr             = k_last_gpr_x86_64;
+            m_reg_info.first_fpr            = k_first_fpr_x86_64;
+            m_reg_info.last_fpr             = k_last_fpr_x86_64;
+            m_reg_info.first_st             = fpu_st0_x86_64;
+            m_reg_info.last_st              = fpu_st7_x86_64;
+            m_reg_info.first_mm             = fpu_mm0_x86_64;
+            m_reg_info.last_mm              = fpu_mm7_x86_64;
+            m_reg_info.first_xmm            = fpu_xmm0_x86_64;
+            m_reg_info.last_xmm             = fpu_xmm15_x86_64;
+            m_reg_info.first_ymm            = fpu_ymm0_x86_64;
+            m_reg_info.last_ymm             = fpu_ymm15_x86_64;
+            m_reg_info.first_dr             = dr0_x86_64;
+            m_reg_info.gpr_flags            = gpr_rflags_x86_64;
+            break;
+        default:
+            assert(false && "Unhandled target architecture.");
+            break;
+    }
+
+    // Initialize m_iovec to point to the buffer and buffer size
+    // using the conventions of Berkeley style UIO structures, as required
+    // by PTRACE extensions.
+    m_iovec.iov_base = &m_fpr.xstate.xsave;
+    m_iovec.iov_len = sizeof(m_fpr.xstate.xsave);
+
+    ::memset(&m_fpr, 0, sizeof(FPR));
+
+    // elf-core yet to support ReadFPR()
+    ProcessSP base = CalculateProcess();
+    if (base.get()->GetPluginName() ==  ProcessElfCore::GetPluginNameStatic())
+        return;
+    
+    m_fpr_type = eNotValid;
+}
+
+RegisterContextPOSIX_x86::~RegisterContextPOSIX_x86()
+{
+}
+
+RegisterContextPOSIX_x86::FPRType RegisterContextPOSIX_x86::GetFPRType()
+{
+    if (m_fpr_type == eNotValid)
+    {
+        // TODO: Use assembly to call cpuid on the inferior and query ebx or ecx
+        m_fpr_type = eXSAVE; // extended floating-point registers, if available
+        if (false == ReadFPR())
+            m_fpr_type = eFXSAVE; // assume generic floating-point registers
+    }
+    return m_fpr_type;
+}
+
+void
+RegisterContextPOSIX_x86::Invalidate()
+{
+}
+
+void
+RegisterContextPOSIX_x86::InvalidateAllRegisters()
+{
+}
+
+unsigned
+RegisterContextPOSIX_x86::GetRegisterOffset(unsigned reg)
+{
+    assert(reg < m_reg_info.num_registers && "Invalid register number.");
+    return GetRegisterInfo()[reg].byte_offset;
+}
+
+unsigned
+RegisterContextPOSIX_x86::GetRegisterSize(unsigned reg)
+{
+    assert(reg < m_reg_info.num_registers && "Invalid register number.");
+    return GetRegisterInfo()[reg].byte_size;
+}
+
+size_t
+RegisterContextPOSIX_x86::GetRegisterCount()
+{
+    size_t num_registers = m_reg_info.num_gpr_registers + m_reg_info.num_fpr_registers;
+    if (GetFPRType() == eXSAVE)
+      return num_registers + m_reg_info.num_avx_registers;
+    return num_registers;
+}
+
+size_t
+RegisterContextPOSIX_x86::GetGPRSize()
+{
+    return m_register_info_ap->GetGPRSize ();
+}
+
+const RegisterInfo *
+RegisterContextPOSIX_x86::GetRegisterInfo()
+{
+    // Commonly, this method is overridden and g_register_infos is copied and specialized.
+    // So, use GetRegisterInfo() rather than g_register_infos in this scope.
+    return m_register_info_ap->GetRegisterInfo ();
+}
+
+const RegisterInfo *
+RegisterContextPOSIX_x86::GetRegisterInfoAtIndex(size_t reg)
+{
+    if (reg < m_reg_info.num_registers)
+        return &GetRegisterInfo()[reg];
+    else
+        return NULL;
+}
+
+size_t
+RegisterContextPOSIX_x86::GetRegisterSetCount()
+{
+    size_t sets = 0;
+    for (size_t set = 0; set < k_num_register_sets; ++set)
+    {
+        if (IsRegisterSetAvailable(set))
+            ++sets;
+    }
+
+    return sets;
+}
+
+const RegisterSet *
+RegisterContextPOSIX_x86::GetRegisterSet(size_t set)
+{
+    if (IsRegisterSetAvailable(set))
+    {
+        switch (m_register_info_ap->m_target_arch.GetCore())
+        {
+            case ArchSpec::eCore_x86_32_i386:
+            case ArchSpec::eCore_x86_32_i486:
+            case ArchSpec::eCore_x86_32_i486sx:
+                return &g_reg_sets_i386[set];
+            case ArchSpec::eCore_x86_64_x86_64:
+                return &g_reg_sets_x86_64[set];
+            default:
+                assert(false && "Unhandled target architecture.");
+                return NULL;
+        }
+    }
+    return NULL;
+}
+
+const char *
+RegisterContextPOSIX_x86::GetRegisterName(unsigned reg)
+{
+    assert(reg < m_reg_info.num_registers && "Invalid register offset.");
+    return GetRegisterInfo()[reg].name;
+}
+
+lldb::ByteOrder
+RegisterContextPOSIX_x86::GetByteOrder()
+{
+    // Get the target process whose privileged thread was used for the register read.
+    lldb::ByteOrder byte_order = eByteOrderInvalid;
+    Process *process = CalculateProcess().get();
+
+    if (process)
+        byte_order = process->GetByteOrder();
+    return byte_order;
+}
+
+// Parse ymm registers and into xmm.bytes and ymmh.bytes.
+bool RegisterContextPOSIX_x86::CopyYMMtoXSTATE(uint32_t reg, lldb::ByteOrder byte_order)
+{
+    if (!IsAVX(reg))
+        return false;
+
+    if (byte_order == eByteOrderLittle)
+    {
+        ::memcpy(m_fpr.xstate.fxsave.xmm[reg - m_reg_info.first_ymm].bytes,
+                 m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes,
+                 sizeof(XMMReg));
+        ::memcpy(m_fpr.xstate.xsave.ymmh[reg - m_reg_info.first_ymm].bytes,
+                 m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes + sizeof(XMMReg),
+                 sizeof(YMMHReg));
+        return true;
+    }
+
+    if (byte_order == eByteOrderBig)
+    {
+        ::memcpy(m_fpr.xstate.fxsave.xmm[reg - m_reg_info.first_ymm].bytes,
+                 m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes + sizeof(XMMReg),
+                 sizeof(XMMReg));
+        ::memcpy(m_fpr.xstate.xsave.ymmh[reg - m_reg_info.first_ymm].bytes,
+                 m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes,
+                 sizeof(YMMHReg));
+        return true;
+    }
+    return false; // unsupported or invalid byte order
+}
+
+// Concatenate xmm.bytes with ymmh.bytes
+bool RegisterContextPOSIX_x86::CopyXSTATEtoYMM(uint32_t reg, lldb::ByteOrder byte_order)
+{
+    if (!IsAVX(reg))
+        return false;
+
+    if (byte_order == eByteOrderLittle)
+    {
+        ::memcpy(m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes,
+                 m_fpr.xstate.fxsave.xmm[reg - m_reg_info.first_ymm].bytes,
+                 sizeof(XMMReg));
+        ::memcpy(m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes + sizeof(XMMReg),
+                 m_fpr.xstate.xsave.ymmh[reg - m_reg_info.first_ymm].bytes,
+                 sizeof(YMMHReg));
+        return true;
+    }
+
+    if (byte_order == eByteOrderBig)
+    {
+        ::memcpy(m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes + sizeof(XMMReg),
+                 m_fpr.xstate.fxsave.xmm[reg - m_reg_info.first_ymm].bytes,
+                 sizeof(XMMReg));
+        ::memcpy(m_ymm_set.ymm[reg - m_reg_info.first_ymm].bytes,
+                 m_fpr.xstate.xsave.ymmh[reg - m_reg_info.first_ymm].bytes,
+                 sizeof(YMMHReg));
+        return true;
+    }
+    return false; // unsupported or invalid byte order
+}
+
+bool
+RegisterContextPOSIX_x86::IsRegisterSetAvailable(size_t set_index)
+{
+    // Note: Extended register sets are assumed to be at the end of g_reg_sets...
+    size_t num_sets = k_num_register_sets - k_num_extended_register_sets;
+
+    if (GetFPRType() == eXSAVE) // ...and to start with AVX registers.
+        ++num_sets;
+    return (set_index < num_sets);
+}
+
+
+// Used when parsing DWARF and EH frame information and any other
+// object file sections that contain register numbers in them. 
+uint32_t
+RegisterContextPOSIX_x86::ConvertRegisterKindToRegisterNumber(uint32_t kind,
+                                                                 uint32_t num)
+{
+    const uint32_t num_regs = GetRegisterCount();
+
+    assert (kind < kNumRegisterKinds);
+    for (uint32_t reg_idx = 0; reg_idx < num_regs; ++reg_idx)
+    {
+        const RegisterInfo *reg_info = GetRegisterInfoAtIndex (reg_idx);
+
+        if (reg_info->kinds[kind] == num)
+            return reg_idx;
+    }
+
+    return LLDB_INVALID_REGNUM;
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.h
new file mode 100644
index 00000000000..5e922025b83
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContextPOSIX_x86.h
@@ -0,0 +1,462 @@
+//===-- RegisterContextPOSIX_x86.h ------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContextPOSIX_x86_H_
+#define liblldb_RegisterContextPOSIX_x86_H_
+
+#include "lldb/Core/Log.h"
+#include "RegisterContextPOSIX.h"
+#include "RegisterContext_x86.h"
+
+class ProcessMonitor;
+
+//---------------------------------------------------------------------------
+// Internal codes for all i386 registers.
+//---------------------------------------------------------------------------
+enum
+{
+    k_first_gpr_i386,
+    gpr_eax_i386 = k_first_gpr_i386,
+    gpr_ebx_i386,
+    gpr_ecx_i386,
+    gpr_edx_i386,
+    gpr_edi_i386,
+    gpr_esi_i386,
+    gpr_ebp_i386,
+    gpr_esp_i386,
+    gpr_eip_i386,
+    gpr_eflags_i386,
+    gpr_cs_i386,
+    gpr_fs_i386,
+    gpr_gs_i386,
+    gpr_ss_i386,
+    gpr_ds_i386,
+    gpr_es_i386,
+
+    k_first_alias_i386,
+    gpr_ax_i386 = k_first_alias_i386,
+    gpr_bx_i386,
+    gpr_cx_i386,
+    gpr_dx_i386,
+    gpr_di_i386,
+    gpr_si_i386,
+    gpr_bp_i386,
+    gpr_sp_i386,
+    gpr_ah_i386,
+    gpr_bh_i386,
+    gpr_ch_i386,
+    gpr_dh_i386,
+    gpr_al_i386,
+    gpr_bl_i386,
+    gpr_cl_i386,
+    gpr_dl_i386,
+    k_last_alias_i386 = gpr_dl_i386,
+
+    k_last_gpr_i386 = k_last_alias_i386,
+
+    k_first_fpr_i386,
+    fpu_fctrl_i386 = k_first_fpr_i386,
+    fpu_fstat_i386,
+    fpu_ftag_i386,
+    fpu_fop_i386,
+    fpu_fiseg_i386,
+    fpu_fioff_i386,
+    fpu_foseg_i386,
+    fpu_fooff_i386,
+    fpu_mxcsr_i386,
+    fpu_mxcsrmask_i386,
+    fpu_st0_i386,
+    fpu_st1_i386,
+    fpu_st2_i386,
+    fpu_st3_i386,
+    fpu_st4_i386,
+    fpu_st5_i386,
+    fpu_st6_i386,
+    fpu_st7_i386,
+    fpu_mm0_i386,
+    fpu_mm1_i386,
+    fpu_mm2_i386,
+    fpu_mm3_i386,
+    fpu_mm4_i386,
+    fpu_mm5_i386,
+    fpu_mm6_i386,
+    fpu_mm7_i386,
+    fpu_xmm0_i386,
+    fpu_xmm1_i386,
+    fpu_xmm2_i386,
+    fpu_xmm3_i386,
+    fpu_xmm4_i386,
+    fpu_xmm5_i386,
+    fpu_xmm6_i386,
+    fpu_xmm7_i386,
+    k_last_fpr_i386 = fpu_xmm7_i386,
+
+    k_first_avx_i386,
+    fpu_ymm0_i386 = k_first_avx_i386,
+    fpu_ymm1_i386,
+    fpu_ymm2_i386,
+    fpu_ymm3_i386,
+    fpu_ymm4_i386,
+    fpu_ymm5_i386,
+    fpu_ymm6_i386,
+    fpu_ymm7_i386,
+    k_last_avx_i386 = fpu_ymm7_i386,
+
+    dr0_i386,
+    dr1_i386,
+    dr2_i386,
+    dr3_i386,
+    dr4_i386,
+    dr5_i386,
+    dr6_i386,
+    dr7_i386,
+
+    k_num_registers_i386,
+    k_num_gpr_registers_i386 = k_last_gpr_i386 - k_first_gpr_i386 + 1,
+    k_num_fpr_registers_i386 = k_last_fpr_i386 - k_first_fpr_i386 + 1,
+    k_num_avx_registers_i386 = k_last_avx_i386 - k_first_avx_i386 + 1
+};
+
+//---------------------------------------------------------------------------
+// Internal codes for all x86_64 registers.
+//---------------------------------------------------------------------------
+enum
+{
+    k_first_gpr_x86_64,
+    gpr_rax_x86_64 = k_first_gpr_x86_64,
+    gpr_rbx_x86_64,
+    gpr_rcx_x86_64,
+    gpr_rdx_x86_64,
+    gpr_rdi_x86_64,
+    gpr_rsi_x86_64,
+    gpr_rbp_x86_64,
+    gpr_rsp_x86_64,
+    gpr_r8_x86_64,
+    gpr_r9_x86_64,
+    gpr_r10_x86_64,
+    gpr_r11_x86_64,
+    gpr_r12_x86_64,
+    gpr_r13_x86_64,
+    gpr_r14_x86_64,
+    gpr_r15_x86_64,
+    gpr_rip_x86_64,
+    gpr_rflags_x86_64,
+    gpr_cs_x86_64,
+    gpr_fs_x86_64,
+    gpr_gs_x86_64,
+    gpr_ss_x86_64,
+    gpr_ds_x86_64,
+    gpr_es_x86_64,
+
+    k_first_alias_x86_64,
+    gpr_eax_x86_64 = k_first_alias_x86_64,
+    gpr_ebx_x86_64,
+    gpr_ecx_x86_64,
+    gpr_edx_x86_64,
+    gpr_edi_x86_64,
+    gpr_esi_x86_64,
+    gpr_ebp_x86_64,
+    gpr_esp_x86_64,
+    gpr_r8d_x86_64,    // Low 32 bits of r8
+    gpr_r9d_x86_64,    // Low 32 bits of r9
+    gpr_r10d_x86_64,   // Low 32 bits of r10
+    gpr_r11d_x86_64,   // Low 32 bits of r11
+    gpr_r12d_x86_64,   // Low 32 bits of r12
+    gpr_r13d_x86_64,   // Low 32 bits of r13
+    gpr_r14d_x86_64,   // Low 32 bits of r14
+    gpr_r15d_x86_64,   // Low 32 bits of r15
+    gpr_ax_x86_64,
+    gpr_bx_x86_64,
+    gpr_cx_x86_64,
+    gpr_dx_x86_64,
+    gpr_di_x86_64,
+    gpr_si_x86_64,
+    gpr_bp_x86_64,
+    gpr_sp_x86_64,
+    gpr_r8w_x86_64,    // Low 16 bits of r8
+    gpr_r9w_x86_64,    // Low 16 bits of r9
+    gpr_r10w_x86_64,   // Low 16 bits of r10
+    gpr_r11w_x86_64,   // Low 16 bits of r11
+    gpr_r12w_x86_64,   // Low 16 bits of r12
+    gpr_r13w_x86_64,   // Low 16 bits of r13
+    gpr_r14w_x86_64,   // Low 16 bits of r14
+    gpr_r15w_x86_64,   // Low 16 bits of r15
+    gpr_ah_x86_64,
+    gpr_bh_x86_64,
+    gpr_ch_x86_64,
+    gpr_dh_x86_64,
+    gpr_al_x86_64,
+    gpr_bl_x86_64,
+    gpr_cl_x86_64,
+    gpr_dl_x86_64,
+    gpr_dil_x86_64,
+    gpr_sil_x86_64,
+    gpr_bpl_x86_64,
+    gpr_spl_x86_64,
+    gpr_r8l_x86_64,    // Low 8 bits of r8
+    gpr_r9l_x86_64,    // Low 8 bits of r9
+    gpr_r10l_x86_64,   // Low 8 bits of r10
+    gpr_r11l_x86_64,   // Low 8 bits of r11
+    gpr_r12l_x86_64,   // Low 8 bits of r12
+    gpr_r13l_x86_64,   // Low 8 bits of r13
+    gpr_r14l_x86_64,   // Low 8 bits of r14
+    gpr_r15l_x86_64,   // Low 8 bits of r15
+    k_last_alias_x86_64 = gpr_r15l_x86_64,
+
+    k_last_gpr_x86_64 = k_last_alias_x86_64,
+
+    k_first_fpr_x86_64,
+    fpu_fctrl_x86_64 = k_first_fpr_x86_64,
+    fpu_fstat_x86_64,
+    fpu_ftag_x86_64,
+    fpu_fop_x86_64,
+    fpu_fiseg_x86_64,
+    fpu_fioff_x86_64,
+    fpu_foseg_x86_64,
+    fpu_fooff_x86_64,
+    fpu_mxcsr_x86_64,
+    fpu_mxcsrmask_x86_64,
+    fpu_st0_x86_64,
+    fpu_st1_x86_64,
+    fpu_st2_x86_64,
+    fpu_st3_x86_64,
+    fpu_st4_x86_64,
+    fpu_st5_x86_64,
+    fpu_st6_x86_64,
+    fpu_st7_x86_64,
+    fpu_mm0_x86_64,
+    fpu_mm1_x86_64,
+    fpu_mm2_x86_64,
+    fpu_mm3_x86_64,
+    fpu_mm4_x86_64,
+    fpu_mm5_x86_64,
+    fpu_mm6_x86_64,
+    fpu_mm7_x86_64,
+    fpu_xmm0_x86_64,
+    fpu_xmm1_x86_64,
+    fpu_xmm2_x86_64,
+    fpu_xmm3_x86_64,
+    fpu_xmm4_x86_64,
+    fpu_xmm5_x86_64,
+    fpu_xmm6_x86_64,
+    fpu_xmm7_x86_64,
+    fpu_xmm8_x86_64,
+    fpu_xmm9_x86_64,
+    fpu_xmm10_x86_64,
+    fpu_xmm11_x86_64,
+    fpu_xmm12_x86_64,
+    fpu_xmm13_x86_64,
+    fpu_xmm14_x86_64,
+    fpu_xmm15_x86_64,
+    k_last_fpr_x86_64 = fpu_xmm15_x86_64,
+
+    k_first_avx_x86_64,
+    fpu_ymm0_x86_64 = k_first_avx_x86_64,
+    fpu_ymm1_x86_64,
+    fpu_ymm2_x86_64,
+    fpu_ymm3_x86_64,
+    fpu_ymm4_x86_64,
+    fpu_ymm5_x86_64,
+    fpu_ymm6_x86_64,
+    fpu_ymm7_x86_64,
+    fpu_ymm8_x86_64,
+    fpu_ymm9_x86_64,
+    fpu_ymm10_x86_64,
+    fpu_ymm11_x86_64,
+    fpu_ymm12_x86_64,
+    fpu_ymm13_x86_64,
+    fpu_ymm14_x86_64,
+    fpu_ymm15_x86_64,
+    k_last_avx_x86_64 = fpu_ymm15_x86_64,
+
+    dr0_x86_64,
+    dr1_x86_64,
+    dr2_x86_64,
+    dr3_x86_64,
+    dr4_x86_64,
+    dr5_x86_64,
+    dr6_x86_64,
+    dr7_x86_64,
+
+    k_num_registers_x86_64,
+    k_num_gpr_registers_x86_64 = k_last_gpr_x86_64 - k_first_gpr_x86_64 + 1,
+    k_num_fpr_registers_x86_64 = k_last_fpr_x86_64 - k_first_fpr_x86_64 + 1,
+    k_num_avx_registers_x86_64 = k_last_avx_x86_64 - k_first_avx_x86_64 + 1
+};
+
+class RegisterContextPOSIX_x86
+  : public lldb_private::RegisterContext
+{
+public:
+    RegisterContextPOSIX_x86 (lldb_private::Thread &thread,
+                            uint32_t concrete_frame_idx,
+                            RegisterInfoInterface *register_info);
+
+    ~RegisterContextPOSIX_x86();
+
+    void
+    Invalidate();
+
+    void
+    InvalidateAllRegisters();
+
+    size_t
+    GetRegisterCount();
+
+    virtual size_t
+    GetGPRSize();
+
+    virtual unsigned
+    GetRegisterSize(unsigned reg);
+
+    virtual unsigned
+    GetRegisterOffset(unsigned reg);
+
+    const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex(size_t reg);
+
+    size_t
+    GetRegisterSetCount();
+
+    const lldb_private::RegisterSet *
+    GetRegisterSet(size_t set);
+
+    const char *
+    GetRegisterName(unsigned reg);
+
+    uint32_t
+    ConvertRegisterKindToRegisterNumber(uint32_t kind, uint32_t num);
+
+    //---------------------------------------------------------------------------
+    // Note: prefer kernel definitions over user-land
+    //---------------------------------------------------------------------------
+    enum FPRType
+    {
+        eNotValid = 0,
+        eFSAVE,  // TODO
+        eFXSAVE,
+        eSOFT,   // TODO
+        eXSAVE
+    };
+
+    static uint32_t g_contained_eax[];
+    static uint32_t g_contained_ebx[];
+    static uint32_t g_contained_ecx[];
+    static uint32_t g_contained_edx[];
+    static uint32_t g_contained_edi[];
+    static uint32_t g_contained_esi[];
+    static uint32_t g_contained_ebp[];
+    static uint32_t g_contained_esp[];
+
+    static uint32_t g_invalidate_eax[];
+    static uint32_t g_invalidate_ebx[];
+    static uint32_t g_invalidate_ecx[];
+    static uint32_t g_invalidate_edx[];
+    static uint32_t g_invalidate_edi[];
+    static uint32_t g_invalidate_esi[];
+    static uint32_t g_invalidate_ebp[];
+    static uint32_t g_invalidate_esp[];
+
+    static uint32_t g_contained_rax[];
+    static uint32_t g_contained_rbx[];
+    static uint32_t g_contained_rcx[];
+    static uint32_t g_contained_rdx[];
+    static uint32_t g_contained_rdi[];
+    static uint32_t g_contained_rsi[];
+    static uint32_t g_contained_rbp[];
+    static uint32_t g_contained_rsp[];
+    static uint32_t g_contained_r8[];
+    static uint32_t g_contained_r9[];
+    static uint32_t g_contained_r10[];
+    static uint32_t g_contained_r11[];
+    static uint32_t g_contained_r12[];
+    static uint32_t g_contained_r13[];
+    static uint32_t g_contained_r14[];
+    static uint32_t g_contained_r15[];
+
+    static uint32_t g_invalidate_rax[];
+    static uint32_t g_invalidate_rbx[];
+    static uint32_t g_invalidate_rcx[];
+    static uint32_t g_invalidate_rdx[];
+    static uint32_t g_invalidate_rdi[];
+    static uint32_t g_invalidate_rsi[];
+    static uint32_t g_invalidate_rbp[];
+    static uint32_t g_invalidate_rsp[];
+    static uint32_t g_invalidate_r8[];
+    static uint32_t g_invalidate_r9[];
+    static uint32_t g_invalidate_r10[];
+    static uint32_t g_invalidate_r11[];
+    static uint32_t g_invalidate_r12[];
+    static uint32_t g_invalidate_r13[];
+    static uint32_t g_invalidate_r14[];
+    static uint32_t g_invalidate_r15[];
+
+protected:
+    struct RegInfo
+    {
+        uint32_t num_registers;
+        uint32_t num_gpr_registers;
+        uint32_t num_fpr_registers;
+        uint32_t num_avx_registers;
+
+        uint32_t last_gpr;
+        uint32_t first_fpr;
+        uint32_t last_fpr;
+
+        uint32_t first_st;
+        uint32_t last_st;
+        uint32_t first_mm;
+        uint32_t last_mm;
+        uint32_t first_xmm;
+        uint32_t last_xmm;
+        uint32_t first_ymm;
+        uint32_t last_ymm;
+
+        uint32_t first_dr;
+        uint32_t gpr_flags;
+    };
+
+    uint64_t m_gpr_x86_64[k_num_gpr_registers_x86_64];         // 64-bit general purpose registers.
+    RegInfo  m_reg_info;
+    FPRType  m_fpr_type;                                       // determines the type of data stored by union FPR, if any.
+    FPR      m_fpr;                                            // floating-point registers including extended register sets.
+    IOVEC    m_iovec;                                          // wrapper for xsave.
+    YMM      m_ymm_set;                                        // copy of ymmh and xmm register halves.
+    std::unique_ptr<RegisterInfoInterface> m_register_info_ap; // Register Info Interface (FreeBSD or Linux)
+
+    // Determines if an extended register set is supported on the processor running the inferior process.
+    virtual bool
+    IsRegisterSetAvailable(size_t set_index);
+
+    virtual const lldb_private::RegisterInfo *
+    GetRegisterInfo();
+
+    bool
+    IsGPR(unsigned reg);
+
+    bool
+    IsFPR(unsigned reg);
+
+    bool
+    IsAVX(unsigned reg);
+
+    lldb::ByteOrder GetByteOrder();
+
+    bool CopyXSTATEtoYMM(uint32_t reg, lldb::ByteOrder byte_order);
+    bool CopyYMMtoXSTATE(uint32_t reg, lldb::ByteOrder byte_order);
+    bool IsFPR(unsigned reg, FPRType fpr_type);
+    FPRType GetFPRType();
+
+    virtual bool ReadGPR() = 0;
+    virtual bool ReadFPR() = 0;
+    virtual bool WriteGPR() = 0;
+    virtual bool WriteFPR() = 0;
+};
+
+#endif // #ifndef liblldb_RegisterContextPOSIX_x86_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_i386.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_i386.cpp
deleted file mode 100644
index 49676bd3fc7..00000000000
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_i386.cpp
+++ /dev/null
@@ -1,551 +0,0 @@
-//===-- RegisterContextPOSIX_i386.cpp ---------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Core/DataExtractor.h"
-#include "lldb/Target/Thread.h"
-#include "lldb/Host/Endian.h"
-#include "llvm/Support/Compiler.h"
-
-#include "ProcessPOSIX.h"
-#include "ProcessPOSIXLog.h"
-#include "ProcessMonitor.h"
-#include "RegisterContext_i386.h"
-#include "RegisterContext_x86.h"
-
-using namespace lldb_private;
-using namespace lldb;
-
-enum
-{
-    k_first_gpr,
-    gpr_eax = k_first_gpr,
-    gpr_ebx,
-    gpr_ecx,
-    gpr_edx,
-    gpr_edi,
-    gpr_esi,
-    gpr_ebp,
-    gpr_esp,
-    gpr_ss,
-    gpr_eflags,
-#ifdef __FreeBSD__
-    gpr_orig_ax,
-#endif
-    gpr_eip,
-    gpr_cs,
-    gpr_ds,
-    gpr_es,
-    gpr_fs,
-    gpr_gs,
-    k_last_gpr = gpr_gs,
-
-    k_first_fpr,
-    fpu_fcw = k_first_fpr,
-    fpu_fsw,
-    fpu_ftw,
-    fpu_fop,
-    fpu_ip,
-    fpu_cs,
-    fpu_foo,
-    fpu_fos,
-    fpu_mxcsr,
-    fpu_stmm0,
-    fpu_stmm1,
-    fpu_stmm2,
-    fpu_stmm3,
-    fpu_stmm4,
-    fpu_stmm5,
-    fpu_stmm6,
-    fpu_stmm7,
-    fpu_xmm0,
-    fpu_xmm1,
-    fpu_xmm2,
-    fpu_xmm3,
-    fpu_xmm4,
-    fpu_xmm5,
-    fpu_xmm6,
-    fpu_xmm7,
-    k_last_fpr = fpu_xmm7,
-
-    k_num_registers,
-    k_num_gpr_registers = k_last_gpr - k_first_gpr + 1,
-    k_num_fpu_registers = k_last_fpr - k_first_fpr + 1
-};
-
-// Number of register sets provided by this context.
-enum
-{
-    k_num_register_sets = 2
-};
-
-static const
-uint32_t g_gpr_regnums[k_num_gpr_registers] =
-{
-    gpr_eax,
-    gpr_ebx,
-    gpr_ecx,
-    gpr_edx,
-    gpr_edi,
-    gpr_esi,
-    gpr_ebp,
-    gpr_esp,
-    gpr_ss,
-    gpr_eflags,
-#ifdef __FreeBSD__
-    gpr_orig_ax,
-#endif
-    gpr_eip,
-    gpr_cs,
-    gpr_ds,
-    gpr_es,
-    gpr_fs,
-    gpr_gs,
-};
-
-static const uint32_t
-g_fpu_regnums[k_num_fpu_registers] =
-{
-    fpu_fcw,
-    fpu_fsw,
-    fpu_ftw,
-    fpu_fop,
-    fpu_ip,
-    fpu_cs,
-    fpu_foo,
-    fpu_fos,
-    fpu_mxcsr,
-    fpu_stmm0,
-    fpu_stmm1,
-    fpu_stmm2,
-    fpu_stmm3,
-    fpu_stmm4,
-    fpu_stmm5,
-    fpu_stmm6,
-    fpu_stmm7,
-    fpu_xmm0,
-    fpu_xmm1,
-    fpu_xmm2,
-    fpu_xmm3,
-    fpu_xmm4,
-    fpu_xmm5,
-    fpu_xmm6,
-    fpu_xmm7,
-};
-
-static const RegisterSet
-g_reg_sets[k_num_register_sets] =
-{
-    { "General Purpose Registers", "gpr", k_num_gpr_registers, g_gpr_regnums },
-    { "Floating Point Registers",  "fpu", k_num_fpu_registers, g_fpu_regnums }
-};
-
-// Computes the offset of the given GPR in the user data area.
-#define GPR_OFFSET(regname) \
-    (offsetof(RegisterContext_i386::UserArea, regs) + \
-     offsetof(RegisterContext_i386::GPR, regname))
-
-// Computes the offset of the given FPR in the user data area.
-#define FPR_OFFSET(regname) \
-    (offsetof(RegisterContext_i386::UserArea, i387) + \
-     offsetof(RegisterContext_i386::FPU, regname))
-
-// Number of bytes needed to represent a GPR.
-#define GPR_SIZE(reg) sizeof(((RegisterContext_i386::GPR*)NULL)->reg)
-
-// Number of bytes needed to represent a FPR.
-#define FPR_SIZE(reg) sizeof(((RegisterContext_i386::FPU*)NULL)->reg)
-
-// Number of bytes needed to represent the i'th FP register.
-#define FP_SIZE sizeof(((RegisterContext_i386::MMSReg*)NULL)->bytes)
-
-// Number of bytes needed to represent an XMM register.
-#define XMM_SIZE sizeof(RegisterContext_i386::XMMReg)
-
-#define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4)        \
-    { #reg, alt, GPR_SIZE(reg), GPR_OFFSET(reg), eEncodingUint, \
-      eFormatHex, { kind1, kind2, kind3, kind4, gpr_##reg }, NULL, NULL }
-
-#define DEFINE_FPR(reg, kind1, kind2, kind3, kind4)              \
-    { #reg, NULL, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint, \
-      eFormatHex, { kind1, kind2, kind3, kind4, fpu_##reg }, NULL, NULL }
-
-#define DEFINE_FP(reg, i)                                          \
-    { #reg#i, NULL, FP_SIZE, LLVM_EXTENSION FPR_OFFSET(reg[i]),    \
-      eEncodingVector, eFormatVectorOfUInt8,                       \
-      { dwarf_##reg##i, dwarf_##reg##i,                            \
-        LLDB_INVALID_REGNUM, gdb_##reg##i, fpu_##reg##i }, NULL, NULL }
-
-#define DEFINE_XMM(reg, i)                                         \
-    { #reg#i, NULL, XMM_SIZE, LLVM_EXTENSION FPR_OFFSET(reg[i]),   \
-       eEncodingVector, eFormatVectorOfUInt8,                      \
-      { dwarf_##reg##i, dwarf_##reg##i,                            \
-        LLDB_INVALID_REGNUM, gdb_##reg##i, fpu_##reg##i }, NULL, NULL }
-
-static RegisterInfo
-g_register_infos[k_num_registers] =
-{
-    // General purpose registers.
-    DEFINE_GPR(eax,    NULL,    gcc_eax,    dwarf_eax,    LLDB_INVALID_REGNUM,    gdb_eax),
-    DEFINE_GPR(ebx,    NULL,    gcc_ebx,    dwarf_ebx,    LLDB_INVALID_REGNUM,    gdb_ebx),
-    DEFINE_GPR(ecx,    NULL,    gcc_ecx,    dwarf_ecx,    LLDB_INVALID_REGNUM,    gdb_ecx),
-    DEFINE_GPR(edx,    NULL,    gcc_edx,    dwarf_edx,    LLDB_INVALID_REGNUM,    gdb_edx),
-    DEFINE_GPR(edi,    NULL,    gcc_edi,    dwarf_edi,    LLDB_INVALID_REGNUM,    gdb_edi),
-    DEFINE_GPR(esi,    NULL,    gcc_esi,    dwarf_esi,    LLDB_INVALID_REGNUM,    gdb_esi),
-    DEFINE_GPR(ebp,    "fp",    gcc_ebp,    dwarf_ebp,    LLDB_INVALID_REGNUM,    gdb_ebp),
-    DEFINE_GPR(esp,    "sp",    gcc_esp,    dwarf_esp,    LLDB_INVALID_REGNUM,    gdb_esp),
-    DEFINE_GPR(ss,     NULL,    LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,    gdb_ss),
-    DEFINE_GPR(eflags, "flags", gcc_eflags, dwarf_eflags, LLDB_INVALID_REGNUM,    gdb_eflags),
-    DEFINE_GPR(eip,    "pc",    gcc_eip,    dwarf_eip,    LLDB_INVALID_REGNUM,    gdb_eip),
-    DEFINE_GPR(cs,     NULL,    LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,    gdb_cs),
-    DEFINE_GPR(ds,     NULL,    LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,    gdb_ds),
-    DEFINE_GPR(es,     NULL,    LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,    gdb_es),
-    DEFINE_GPR(fs,     NULL,    LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,    gdb_fs),
-    DEFINE_GPR(gs,     NULL,    LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,     LLDB_INVALID_REGNUM,    gdb_gs),
-
-    // Floating point registers.
-    DEFINE_FPR(fcw,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fcw),
-    DEFINE_FPR(fsw,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fsw),
-    DEFINE_FPR(ftw,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_ftw),
-    DEFINE_FPR(fop,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fop),
-    DEFINE_FPR(ip,        LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_ip),
-    DEFINE_FPR(cs,        LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_cs),
-    DEFINE_FPR(foo,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_dp),
-    DEFINE_FPR(fos,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ds),
-    DEFINE_FPR(mxcsr,     LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_mxcsr),
-
-    DEFINE_FP(stmm, 0),
-    DEFINE_FP(stmm, 1),
-    DEFINE_FP(stmm, 2),
-    DEFINE_FP(stmm, 3),
-    DEFINE_FP(stmm, 4),
-    DEFINE_FP(stmm, 5),
-    DEFINE_FP(stmm, 6),
-    DEFINE_FP(stmm, 7),
-
-    // XMM registers
-    DEFINE_XMM(xmm, 0),
-    DEFINE_XMM(xmm, 1),
-    DEFINE_XMM(xmm, 2),
-    DEFINE_XMM(xmm, 3),
-    DEFINE_XMM(xmm, 4),
-    DEFINE_XMM(xmm, 5),
-    DEFINE_XMM(xmm, 6),
-    DEFINE_XMM(xmm, 7),
-
-};
-
-#ifndef NDEBUG
-static size_t k_num_register_infos = (sizeof(g_register_infos)/sizeof(RegisterInfo));
-#endif
-
-static unsigned GetRegOffset(unsigned reg)
-{
-    assert(reg < k_num_registers && "Invalid register number.");
-    return g_register_infos[reg].byte_offset;
-}
-
-static unsigned GetRegSize(unsigned reg)
-{
-    assert(reg < k_num_registers && "Invalid register number.");
-    return g_register_infos[reg].byte_size;
-}
-
-RegisterContext_i386::RegisterContext_i386(Thread &thread,
-                                                     uint32_t concrete_frame_idx)
-    : RegisterContextPOSIX(thread, concrete_frame_idx)
-{
-}
-
-RegisterContext_i386::~RegisterContext_i386()
-{
-}
-
-ProcessMonitor &
-RegisterContext_i386::GetMonitor()
-{
-    ProcessSP base = CalculateProcess();
-    ProcessPOSIX *process = static_cast<ProcessPOSIX*>(base.get());
-    return process->GetMonitor();
-}
-
-void
-RegisterContext_i386::Invalidate()
-{
-}
-
-void
-RegisterContext_i386::InvalidateAllRegisters()
-{
-}
-
-size_t
-RegisterContext_i386::GetRegisterCount()
-{
-    assert(k_num_register_infos == k_num_registers);
-    return k_num_registers;
-}
-
-const RegisterInfo *
-RegisterContext_i386::GetRegisterInfoAtIndex(size_t reg)
-{
-    assert(k_num_register_infos == k_num_registers);
-    if (reg < k_num_registers)
-        return &g_register_infos[reg];
-    else
-        return NULL;
-}
-
-size_t
-RegisterContext_i386::GetRegisterSetCount()
-{
-    return k_num_register_sets;
-}
-
-const RegisterSet *
-RegisterContext_i386::GetRegisterSet(size_t set)
-{
-    if (set < k_num_register_sets)
-        return &g_reg_sets[set];
-    else
-        return NULL;
-}
-
-unsigned
-RegisterContext_i386::GetRegisterIndexFromOffset(unsigned offset)
-{
-    unsigned reg;
-    for (reg = 0; reg < k_num_registers; reg++)
-    {
-        if (g_register_infos[reg].byte_offset == offset)
-            break;
-    }
-    assert(reg < k_num_registers && "Invalid register offset.");
-    return reg;
-}
-
-const char *
-RegisterContext_i386::GetRegisterName(unsigned reg)
-{
-    assert(reg < k_num_registers && "Invalid register offset.");
-    return g_register_infos[reg].name;
-}
-
-bool
-RegisterContext_i386::ReadRegister(const RegisterInfo *reg_info,
-                                        RegisterValue &value)
-{
-    const uint32_t reg = reg_info->kinds[eRegisterKindLLDB];
-    ProcessMonitor &monitor = GetMonitor();
-    return monitor.ReadRegisterValue(m_thread.GetID(), GetRegOffset(reg),
-                                     GetRegisterName(reg), GetRegSize(reg), value);
-}
-
-bool
-RegisterContext_i386::ReadAllRegisterValues(DataBufferSP &data_sp)
-{
-    return false;
-}
-
-bool RegisterContext_i386::WriteRegister(const RegisterInfo *reg_info,
-                                         const RegisterValue &value)
-{
-    const uint32_t reg = reg_info->kinds[eRegisterKindLLDB];
-    ProcessMonitor &monitor = GetMonitor();
-    return monitor.WriteRegisterValue(m_thread.GetID(), GetRegOffset(reg),
-                                      GetRegisterName(reg), value);
-}
-
-bool
-RegisterContext_i386::WriteAllRegisterValues(const DataBufferSP &data)
-{
-    return false;
-}
-
-bool
-RegisterContext_i386::UpdateAfterBreakpoint()
-{
-    // PC points one byte past the int3 responsible for the breakpoint.
-    lldb::addr_t pc;
-
-    if ((pc = GetPC()) == LLDB_INVALID_ADDRESS)
-        return false;
-
-    SetPC(pc - 1);
-    return true;
-}
-
-uint32_t
-RegisterContext_i386::ConvertRegisterKindToRegisterNumber(uint32_t kind,
-                                                               uint32_t num)
-{
-    if (kind == eRegisterKindGeneric)
-    {
-        switch (num)
-        {
-        case LLDB_REGNUM_GENERIC_PC:    return gpr_eip;
-        case LLDB_REGNUM_GENERIC_SP:    return gpr_esp;
-        case LLDB_REGNUM_GENERIC_FP:    return gpr_ebp;
-        case LLDB_REGNUM_GENERIC_FLAGS: return gpr_eflags;
-        case LLDB_REGNUM_GENERIC_RA:
-        default:
-            return LLDB_INVALID_REGNUM;
-        }
-    }
-
-    if (kind == eRegisterKindGCC || kind == eRegisterKindDWARF)
-    {
-        switch (num)
-        {
-        case dwarf_eax:  return gpr_eax;
-        case dwarf_edx:  return gpr_edx;
-        case dwarf_ecx:  return gpr_ecx;
-        case dwarf_ebx:  return gpr_ebx;
-        case dwarf_esi:  return gpr_esi;
-        case dwarf_edi:  return gpr_edi;
-        case dwarf_ebp:  return gpr_ebp;
-        case dwarf_esp:  return gpr_esp;
-        case dwarf_eip:  return gpr_eip;
-        case dwarf_xmm0: return fpu_xmm0;
-        case dwarf_xmm1: return fpu_xmm1;
-        case dwarf_xmm2: return fpu_xmm2;
-        case dwarf_xmm3: return fpu_xmm3;
-        case dwarf_xmm4: return fpu_xmm4;
-        case dwarf_xmm5: return fpu_xmm5;
-        case dwarf_xmm6: return fpu_xmm6;
-        case dwarf_xmm7: return fpu_xmm7;
-        case dwarf_stmm0: return fpu_stmm0;
-        case dwarf_stmm1: return fpu_stmm1;
-        case dwarf_stmm2: return fpu_stmm2;
-        case dwarf_stmm3: return fpu_stmm3;
-        case dwarf_stmm4: return fpu_stmm4;
-        case dwarf_stmm5: return fpu_stmm5;
-        case dwarf_stmm6: return fpu_stmm6;
-        case dwarf_stmm7: return fpu_stmm7;
-        default:
-            return LLDB_INVALID_REGNUM;
-        }
-    }
-
-    if (kind == eRegisterKindGDB)
-    {
-        switch (num)
-        {
-        case gdb_eax     : return gpr_eax;
-        case gdb_ebx     : return gpr_ebx;
-        case gdb_ecx     : return gpr_ecx;
-        case gdb_edx     : return gpr_edx;
-        case gdb_esi     : return gpr_esi;
-        case gdb_edi     : return gpr_edi;
-        case gdb_ebp     : return gpr_ebp;
-        case gdb_esp     : return gpr_esp;
-        case gdb_eip     : return gpr_eip;
-        case gdb_eflags  : return gpr_eflags;
-        case gdb_cs      : return gpr_cs;
-        case gdb_ss      : return gpr_ss;
-        case gdb_ds      : return gpr_ds;
-        case gdb_es      : return gpr_es;
-        case gdb_fs      : return gpr_fs;
-        case gdb_gs      : return gpr_gs;
-        case gdb_stmm0   : return fpu_stmm0;
-        case gdb_stmm1   : return fpu_stmm1;
-        case gdb_stmm2   : return fpu_stmm2;
-        case gdb_stmm3   : return fpu_stmm3;
-        case gdb_stmm4   : return fpu_stmm4;
-        case gdb_stmm5   : return fpu_stmm5;
-        case gdb_stmm6   : return fpu_stmm6;
-        case gdb_stmm7   : return fpu_stmm7;
-        case gdb_fcw     : return fpu_fcw;
-        case gdb_fsw     : return fpu_fsw;
-        case gdb_ftw     : return fpu_ftw;
-        case gdb_fpu_cs  : return fpu_cs;
-        case gdb_ip      : return fpu_ip;
-        case gdb_fpu_ds  : return fpu_fos;
-        case gdb_dp      : return fpu_foo;
-        case gdb_fop     : return fpu_fop;
-        case gdb_xmm0    : return fpu_xmm0;
-        case gdb_xmm1    : return fpu_xmm1;
-        case gdb_xmm2    : return fpu_xmm2;
-        case gdb_xmm3    : return fpu_xmm3;
-        case gdb_xmm4    : return fpu_xmm4;
-        case gdb_xmm5    : return fpu_xmm5;
-        case gdb_xmm6    : return fpu_xmm6;
-        case gdb_xmm7    : return fpu_xmm7;
-        case gdb_mxcsr   : return fpu_mxcsr;
-        default:
-            return LLDB_INVALID_REGNUM;
-        }
-    }
-    else if (kind == eRegisterKindLLDB)
-    {
-        return num;
-    }
-
-    return LLDB_INVALID_REGNUM;
-}
-
-bool
-RegisterContext_i386::HardwareSingleStep(bool enable)
-{
-    enum { TRACE_BIT = 0x100 };
-    uint64_t eflags;
-
-    if ((eflags = ReadRegisterAsUnsigned(gpr_eflags, -1UL)) == -1UL)
-        return false;
-
-    if (enable)
-    {
-        if (eflags & TRACE_BIT)
-            return true;
-
-        eflags |= TRACE_BIT;
-    }
-    else
-    {
-        if (!(eflags & TRACE_BIT))
-            return false;
-
-        eflags &= ~TRACE_BIT;
-    }
-
-    return WriteRegisterFromUnsigned(gpr_eflags, eflags);
-}
-
-void
-RegisterContext_i386::LogGPR(const char *title)
-{
-    Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_REGISTERS));
-    if (log)
-    {
-        if (title)
-            log->Printf ("%s", title);
-        for (uint32_t i=0; i<k_num_gpr_registers; i++)
-        {
-            uint32_t reg = gpr_eax + i;
-            log->Printf("%12s = 0x%8.8" PRIx64, g_register_infos[reg].name, ((uint64_t*)&user.regs)[reg]);
-        }
-    }
-}
-
-bool
-RegisterContext_i386::ReadGPR()
-{
-    bool result;
-
-    ProcessMonitor &monitor = GetMonitor();
-    result = monitor.ReadGPR(m_thread.GetID(), &user.regs, sizeof(user.regs));
-    LogGPR("RegisterContext_i386::ReadGPR()");
-    return result;
-}
-
-bool
-RegisterContext_i386::ReadFPR()
-{
-    ProcessMonitor &monitor = GetMonitor();
-    return monitor.ReadFPR(m_thread.GetID(), &user.i387, sizeof(user.i387));
-}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_i386.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_i386.h
deleted file mode 100644
index 96066c47b81..00000000000
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_i386.h
+++ /dev/null
@@ -1,169 +0,0 @@
-//===-- RegisterContext_i386.h ------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_RegisterContext_i386_h_
-#define liblldb_RegisterContext_i386_h_
-
-// C Includes
-// C++ Includes
-// Other libraries and framework includes
-// Project includes
-#include "lldb/Core/Log.h"
-#include "RegisterContextPOSIX.h"
-
-class RegisterContext_i386 : public RegisterContextPOSIX
-{
-public:
-    RegisterContext_i386(lldb_private::Thread &thread,
-                              uint32_t concreate_frame_idx);
-
-    ~RegisterContext_i386();
-
-    void
-    Invalidate();
-
-    void
-    InvalidateAllRegisters();
-
-    size_t
-    GetRegisterCount();
-
-    const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex(size_t reg);
-
-    size_t
-    GetRegisterSetCount();
-
-    const lldb_private::RegisterSet *
-    GetRegisterSet(size_t set);
-
-    unsigned
-    GetRegisterIndexFromOffset(unsigned offset);
-
-    const char *
-    GetRegisterName(unsigned reg);
-
-    bool
-    ReadRegisterValue(uint32_t reg, lldb_private::Scalar &value);
-
-    bool
-    ReadRegisterBytes(uint32_t reg, lldb_private::DataExtractor &data);
-
-    virtual bool
-    ReadRegister(const lldb_private::RegisterInfo *reg_info,
-                 lldb_private::RegisterValue &value);
-
-    bool
-    ReadAllRegisterValues(lldb::DataBufferSP &data_sp);
-
-    bool
-    WriteRegisterValue(uint32_t reg, const lldb_private::Scalar &value);
-
-    bool
-    WriteRegisterBytes(uint32_t reg, lldb_private::DataExtractor &data,
-                       uint32_t data_offset = 0);
-
-    virtual bool
-    WriteRegister(const lldb_private::RegisterInfo *reg_info,
-                  const lldb_private::RegisterValue &value);
-
-    bool
-    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp);
-
-    uint32_t
-    ConvertRegisterKindToRegisterNumber(uint32_t kind, uint32_t num);
-
-    bool
-    HardwareSingleStep(bool enable);
-
-    bool
-    UpdateAfterBreakpoint();
-
-    struct GPR
-    {
-        uint32_t ebx;
-        uint32_t ecx;
-        uint32_t edx;
-        uint32_t esi;
-        uint32_t edi;
-        uint32_t ebp;
-        uint32_t eax;
-        uint32_t ds;
-        uint32_t es;
-        uint32_t fs;
-        uint32_t gs;
-        uint32_t orig_ax;
-        uint32_t eip;
-        uint32_t cs;
-        uint32_t eflags;
-        uint32_t esp;
-        uint32_t ss;
-    };
-
-    struct MMSReg
-    {
-        uint8_t bytes[8];
-    };
-
-    struct XMMReg
-    {
-        uint8_t bytes[16];
-    };
-
-    struct FPU
-    {
-        uint16_t    fcw;
-        uint16_t    fsw;
-        uint16_t    ftw;
-        uint16_t    fop;
-        uint32_t    ip;
-        uint32_t    cs;
-        uint32_t    foo;
-        uint32_t    fos;
-        uint32_t    mxcsr;
-        uint32_t    reserved;
-        MMSReg      stmm[8];
-        XMMReg      xmm[8];
-        uint32_t    pad[56];
-    };
-
-    // A user area like this no longer exists on FreeBSD
-    // making this a Linux artifact. Nonetheless, it is safe
-    // leaving it here while the code is being cleaned up and generalized.
-
-    struct UserArea
-    {
-        GPR      regs;          // General purpose registers.
-        int32_t  fpvalid;       // True if FPU is being used.
-        FPU      i387;          // FPU registers.
-        uint32_t tsize;         // Text segment size.
-        uint32_t dsize;         // Data segment size.
-        uint32_t ssize;         // Stack segment size.
-        uint32_t start_code;    // VM address of text.
-        uint32_t start_stack;   // VM address of stack bottom (top in rsp).
-        int32_t  signal;        // Signal causing core dump.
-        int32_t  reserved;      // Unused.
-        uint32_t ar0;           // Location of GPR's.
-        FPU*     fpstate;       // Location of FPR's.
-        uint32_t magic;         // Identifier for core dumps.
-        char     u_comm[32];    // Command causing core dump.
-        uint32_t u_debugreg[8]; // Debug registers (DR0 - DR7).
-    };
-private:
-    UserArea user;
-
-    ProcessMonitor &GetMonitor();
-
-    void LogGPR(const char *title);
-
-    bool ReadGPR();
-    bool ReadFPR();
-};
-
-#endif // #ifndef liblldb_RegisterContext_i386_h_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_mips64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_mips64.h
new file mode 100644
index 00000000000..dfd473d7cbe
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_mips64.h
@@ -0,0 +1,104 @@
+//===-- RegisterContext_mips64.h --------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContext_mips64_H_
+#define liblldb_RegisterContext_mips64_H_
+
+// GCC and DWARF Register numbers (eRegisterKindGCC & eRegisterKindDWARF)
+enum
+{
+    // GP Registers
+    gcc_dwarf_zero_mips64 = 0,
+    gcc_dwarf_r1_mips64,
+    gcc_dwarf_r2_mips64,
+    gcc_dwarf_r3_mips64,
+    gcc_dwarf_r4_mips64,
+    gcc_dwarf_r5_mips64,
+    gcc_dwarf_r6_mips64,
+    gcc_dwarf_r7_mips64,
+    gcc_dwarf_r8_mips64,
+    gcc_dwarf_r9_mips64,
+    gcc_dwarf_r10_mips64,
+    gcc_dwarf_r11_mips64,
+    gcc_dwarf_r12_mips64,
+    gcc_dwarf_r13_mips64,
+    gcc_dwarf_r14_mips64,
+    gcc_dwarf_r15_mips64,
+    gcc_dwarf_r16_mips64,
+    gcc_dwarf_r17_mips64,
+    gcc_dwarf_r18_mips64,
+    gcc_dwarf_r19_mips64,
+    gcc_dwarf_r20_mips64,
+    gcc_dwarf_r21_mips64,
+    gcc_dwarf_r22_mips64,
+    gcc_dwarf_r23_mips64,
+    gcc_dwarf_r24_mips64,
+    gcc_dwarf_r25_mips64,
+    gcc_dwarf_r26_mips64,
+    gcc_dwarf_r27_mips64,
+    gcc_dwarf_gp_mips64,
+    gcc_dwarf_sp_mips64,
+    gcc_dwarf_r30_mips64,
+    gcc_dwarf_ra_mips64,
+    gcc_dwarf_sr_mips64,
+    gcc_dwarf_lo_mips64,
+    gcc_dwarf_hi_mips64,
+    gcc_dwarf_bad_mips64,
+    gcc_dwarf_cause_mips64,
+    gcc_dwarf_pc_mips64,
+    gcc_dwarf_ic_mips64,
+    gcc_dwarf_dummy_mips64
+};
+
+// GDB Register numbers (eRegisterKindGDB)
+enum
+{
+    gdb_zero_mips64 = 0,
+    gdb_r1_mips64,
+    gdb_r2_mips64,
+    gdb_r3_mips64,
+    gdb_r4_mips64,
+    gdb_r5_mips64,
+    gdb_r6_mips64,
+    gdb_r7_mips64,
+    gdb_r8_mips64,
+    gdb_r9_mips64,
+    gdb_r10_mips64,
+    gdb_r11_mips64,
+    gdb_r12_mips64,
+    gdb_r13_mips64,
+    gdb_r14_mips64,
+    gdb_r15_mips64,
+    gdb_r16_mips64,
+    gdb_r17_mips64,
+    gdb_r18_mips64,
+    gdb_r19_mips64,
+    gdb_r20_mips64,
+    gdb_r21_mips64,
+    gdb_r22_mips64,
+    gdb_r23_mips64,
+    gdb_r24_mips64,
+    gdb_r25_mips64,
+    gdb_r26_mips64,
+    gdb_r27_mips64,
+    gdb_gp_mips64,
+    gdb_sp_mips64,
+    gdb_r30_mips64,
+    gdb_ra_mips64,
+    gdb_sr_mips64,
+    gdb_lo_mips64,
+    gdb_hi_mips64,
+    gdb_bad_mips64,
+    gdb_cause_mips64,
+    gdb_pc_mips64,
+    gdb_ic_mips64,
+    gdb_dummy_mips64
+};
+
+#endif // liblldb_RegisterContext_mips64_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86.h
index 61a25c40775..df3e1e5a84b 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86.h
@@ -1,4 +1,4 @@
-//===-- RegisterContext_x86.h ---------------------------*- C++ -*-===//
+//===-- RegisterContext_x86.h -----------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -10,101 +10,470 @@
 #ifndef liblldb_RegisterContext_x86_H_
 #define liblldb_RegisterContext_x86_H_
 
+//---------------------------------------------------------------------------
+// i386 gcc, dwarf, gdb enums
+//---------------------------------------------------------------------------
+
+// Register numbers seen in eh_frame (eRegisterKindGCC)
+//
+// From Jason Molenda: "gcc registers" is the register numbering used in the eh_frame
+// CFI.  The only registers that are described in eh_frame CFI are those that are
+// preserved across function calls aka callee-saved aka non-volatile.  And none
+// of the floating point registers on x86 are preserved across function calls.
+//
+// The only reason there is a "gcc register" and a "dwarf register" is because of a
+// mistake years and years ago with i386 where they got esp and ebp
+// backwards when they emitted the eh_frame instructions.  Once there were
+// binaries In The Wild using the reversed numbering, we had to stick with it
+// forever.
 enum
 {
-    gcc_eax = 0,
-    gcc_ecx,
-    gcc_edx,
-    gcc_ebx,
-    gcc_ebp,
-    gcc_esp,
-    gcc_esi,
-    gcc_edi,
-    gcc_eip,
-    gcc_eflags
+    // 2nd parameter in DwarfRegNum() is regnum for exception handling on x86-32.
+    // See http://llvm.org/docs/WritingAnLLVMBackend.html#defining-a-register
+    gcc_eax_i386 = 0,
+    gcc_ecx_i386,
+    gcc_edx_i386,
+    gcc_ebx_i386,
+    gcc_ebp_i386, // Warning: these are switched from dwarf values
+    gcc_esp_i386, //
+    gcc_esi_i386,
+    gcc_edi_i386,
+    gcc_eip_i386,
+    gcc_eflags_i386,
+    gcc_st0_i386 = 12,
+    gcc_st1_i386,
+    gcc_st2_i386,
+    gcc_st3_i386,
+    gcc_st4_i386,
+    gcc_st5_i386,
+    gcc_st6_i386,
+    gcc_st7_i386,
+    gcc_xmm0_i386 = 21,
+    gcc_xmm1_i386,
+    gcc_xmm2_i386,
+    gcc_xmm3_i386,
+    gcc_xmm4_i386,
+    gcc_xmm5_i386,
+    gcc_xmm6_i386,
+    gcc_xmm7_i386,
+    gcc_mm0_i386 = 29,
+    gcc_mm1_i386,
+    gcc_mm2_i386,
+    gcc_mm3_i386,
+    gcc_mm4_i386,
+    gcc_mm5_i386,
+    gcc_mm6_i386,
+    gcc_mm7_i386,
 };
 
+// DWARF register numbers (eRegisterKindDWARF)
+// Intel's x86 or IA-32
 enum
 {
-    dwarf_eax = 0,
-    dwarf_ecx,
-    dwarf_edx,
-    dwarf_ebx,
-    dwarf_esp,
-    dwarf_ebp,
-    dwarf_esi,
-    dwarf_edi,
-    dwarf_eip,
-    dwarf_eflags,
-    dwarf_stmm0 = 11,
-    dwarf_stmm1,
-    dwarf_stmm2,
-    dwarf_stmm3,
-    dwarf_stmm4,
-    dwarf_stmm5,
-    dwarf_stmm6,
-    dwarf_stmm7,
-    dwarf_xmm0 = 21,
-    dwarf_xmm1,
-    dwarf_xmm2,
-    dwarf_xmm3,
-    dwarf_xmm4,
-    dwarf_xmm5,
-    dwarf_xmm6,
-    dwarf_xmm7
+    // General Purpose Registers.
+    dwarf_eax_i386 = 0,
+    dwarf_ecx_i386,
+    dwarf_edx_i386,
+    dwarf_ebx_i386,
+    dwarf_esp_i386,
+    dwarf_ebp_i386,
+    dwarf_esi_i386,
+    dwarf_edi_i386,
+    dwarf_eip_i386,
+    dwarf_eflags_i386,
+    // Floating Point Registers
+    dwarf_st0_i386 = 11,
+    dwarf_st1_i386,
+    dwarf_st2_i386,
+    dwarf_st3_i386,
+    dwarf_st4_i386,
+    dwarf_st5_i386,
+    dwarf_st6_i386,
+    dwarf_st7_i386,
+    // SSE Registers
+    dwarf_xmm0_i386 = 21,
+    dwarf_xmm1_i386,
+    dwarf_xmm2_i386,
+    dwarf_xmm3_i386,
+    dwarf_xmm4_i386,
+    dwarf_xmm5_i386,
+    dwarf_xmm6_i386,
+    dwarf_xmm7_i386,
+    // MMX Registers
+    dwarf_mm0_i386 = 29,
+    dwarf_mm1_i386,
+    dwarf_mm2_i386,
+    dwarf_mm3_i386,
+    dwarf_mm4_i386,
+    dwarf_mm5_i386,
+    dwarf_mm6_i386,
+    dwarf_mm7_i386,
+    dwarf_fctrl_i386 = 37, // x87 control word
+    dwarf_fstat_i386 = 38, // x87 status word
+    dwarf_mxcsr_i386 = 39,
+    dwarf_es_i386 = 40,
+    dwarf_cs_i386 = 41,
+    dwarf_ss_i386 = 42,
+    dwarf_ds_i386 = 43,
+    dwarf_fs_i386 = 44,
+    dwarf_gs_i386 = 45
+
+    // I believe the ymm registers use the dwarf_xmm%_i386 register numbers and
+    //  then differentiate based on size of the register.
 };
 
+// Register numbers GDB uses (eRegisterKindGDB)
+//
+// From Jason Molenda: The "gdb numbers" are what you would see in the stabs debug format.
 enum
 {
-    gdb_eax        =  0,
-    gdb_ecx        =  1,
-    gdb_edx        =  2,
-    gdb_ebx        =  3,
-    gdb_esp        =  4,
-    gdb_ebp        =  5,
-    gdb_esi        =  6,
-    gdb_edi        =  7,
-    gdb_eip        =  8,
-    gdb_eflags     =  9,
-    gdb_cs         = 10,
-    gdb_ss         = 11,
-    gdb_ds         = 12,
-    gdb_es         = 13,
-    gdb_fs         = 14,
-    gdb_gs         = 15,
-    gdb_stmm0      = 16,
-    gdb_stmm1      = 17,
-    gdb_stmm2      = 18,
-    gdb_stmm3      = 19,
-    gdb_stmm4      = 20,
-    gdb_stmm5      = 21,
-    gdb_stmm6      = 22,
-    gdb_stmm7      = 23,
-    gdb_fcw        = 24,
-    gdb_fsw        = 25,
-    gdb_ftw        = 26,
-    gdb_fpu_cs     = 27,
-    gdb_ip         = 28,
-    gdb_fpu_ds     = 29,
-    gdb_dp         = 30,
-    gdb_fop        = 31,
-    gdb_xmm0       = 32,
-    gdb_xmm1       = 33,
-    gdb_xmm2       = 34,
-    gdb_xmm3       = 35,
-    gdb_xmm4       = 36,
-    gdb_xmm5       = 37,
-    gdb_xmm6       = 38,
-    gdb_xmm7       = 39,
-    gdb_mxcsr      = 40,
-    gdb_mm0        = 41,
-    gdb_mm1        = 42,
-    gdb_mm2        = 43,
-    gdb_mm3        = 44,
-    gdb_mm4        = 45,
-    gdb_mm5        = 46,
-    gdb_mm6        = 47,
-    gdb_mm7        = 48
+    gdb_eax_i386,
+    gdb_ecx_i386,
+    gdb_edx_i386,
+    gdb_ebx_i386,
+    gdb_esp_i386,
+    gdb_ebp_i386,
+    gdb_esi_i386,
+    gdb_edi_i386,
+    gdb_eip_i386,
+    gdb_eflags_i386,
+    gdb_cs_i386,
+    gdb_ss_i386,
+    gdb_ds_i386,
+    gdb_es_i386,
+    gdb_fs_i386,
+    gdb_gs_i386,
+    gdb_st0_i386 = 16,
+    gdb_st1_i386,
+    gdb_st2_i386,
+    gdb_st3_i386,
+    gdb_st4_i386,
+    gdb_st5_i386,
+    gdb_st6_i386,
+    gdb_st7_i386,
+    gdb_fctrl_i386, // FPU Control Word
+    gdb_fstat_i386, // FPU Status Word
+    gdb_ftag_i386,  // FPU Tag Word
+    gdb_fiseg_i386, // FPU IP Selector 
+    gdb_fioff_i386, // FPU IP Offset
+    gdb_foseg_i386, // FPU Operand Pointer Selector
+    gdb_fooff_i386, // FPU Operand Pointer Offset
+    gdb_fop_i386,   // Last Instruction Opcode
+    gdb_xmm0_i386 = 32,
+    gdb_xmm1_i386,
+    gdb_xmm2_i386,
+    gdb_xmm3_i386,
+    gdb_xmm4_i386,
+    gdb_xmm5_i386,
+    gdb_xmm6_i386,
+    gdb_xmm7_i386,
+    gdb_mxcsr_i386 = 40,
+    gdb_ymm0h_i386,
+    gdb_ymm1h_i386,
+    gdb_ymm2h_i386,
+    gdb_ymm3h_i386,
+    gdb_ymm4h_i386,
+    gdb_ymm5h_i386,
+    gdb_ymm6h_i386,
+    gdb_ymm7h_i386,
+    gdb_mm0_i386,
+    gdb_mm1_i386,
+    gdb_mm2_i386,
+    gdb_mm3_i386,
+    gdb_mm4_i386,
+    gdb_mm5_i386,
+    gdb_mm6_i386,
+    gdb_mm7_i386,
+};
+
+//---------------------------------------------------------------------------
+// AMD x86_64, AMD64, Intel EM64T, or Intel 64 gcc, dwarf, gdb enums
+//---------------------------------------------------------------------------
+
+// GCC and DWARF Register numbers (eRegisterKindGCC & eRegisterKindDWARF)
+//  This is the spec I used (as opposed to x86-64-abi-0.99.pdf):
+//  http://software.intel.com/sites/default/files/article/402129/mpx-linux64-abi.pdf
+enum
+{
+    // GP Registers
+    gcc_dwarf_rax_x86_64 = 0,
+    gcc_dwarf_rdx_x86_64,
+    gcc_dwarf_rcx_x86_64,
+    gcc_dwarf_rbx_x86_64,
+    gcc_dwarf_rsi_x86_64,
+    gcc_dwarf_rdi_x86_64,
+    gcc_dwarf_rbp_x86_64,
+    gcc_dwarf_rsp_x86_64,
+    // Extended GP Registers
+    gcc_dwarf_r8_x86_64 = 8,
+    gcc_dwarf_r9_x86_64,
+    gcc_dwarf_r10_x86_64,
+    gcc_dwarf_r11_x86_64,
+    gcc_dwarf_r12_x86_64,
+    gcc_dwarf_r13_x86_64,
+    gcc_dwarf_r14_x86_64,
+    gcc_dwarf_r15_x86_64,
+    // Return Address (RA) mapped to RIP
+    gcc_dwarf_rip_x86_64 = 16,
+    // SSE Vector Registers
+    gcc_dwarf_xmm0_x86_64 = 17,
+    gcc_dwarf_xmm1_x86_64,
+    gcc_dwarf_xmm2_x86_64,
+    gcc_dwarf_xmm3_x86_64,
+    gcc_dwarf_xmm4_x86_64,
+    gcc_dwarf_xmm5_x86_64,
+    gcc_dwarf_xmm6_x86_64,
+    gcc_dwarf_xmm7_x86_64,
+    gcc_dwarf_xmm8_x86_64,
+    gcc_dwarf_xmm9_x86_64,
+    gcc_dwarf_xmm10_x86_64,
+    gcc_dwarf_xmm11_x86_64,
+    gcc_dwarf_xmm12_x86_64,
+    gcc_dwarf_xmm13_x86_64,
+    gcc_dwarf_xmm14_x86_64,
+    gcc_dwarf_xmm15_x86_64,
+    // Floating Point Registers
+    gcc_dwarf_st0_x86_64 = 33,
+    gcc_dwarf_st1_x86_64,
+    gcc_dwarf_st2_x86_64,
+    gcc_dwarf_st3_x86_64,
+    gcc_dwarf_st4_x86_64,
+    gcc_dwarf_st5_x86_64,
+    gcc_dwarf_st6_x86_64,
+    gcc_dwarf_st7_x86_64,
+    // MMX Registers
+    gcc_dwarf_mm0_x86_64 = 41,
+    gcc_dwarf_mm1_x86_64,
+    gcc_dwarf_mm2_x86_64,
+    gcc_dwarf_mm3_x86_64,
+    gcc_dwarf_mm4_x86_64,
+    gcc_dwarf_mm5_x86_64,
+    gcc_dwarf_mm6_x86_64,
+    gcc_dwarf_mm7_x86_64,
+    // Control and Status Flags Register
+    gcc_dwarf_rflags_x86_64 = 49,
+    //  selector registers
+    gcc_dwarf_es_x86_64 = 50,
+    gcc_dwarf_cs_x86_64,
+    gcc_dwarf_ss_x86_64,
+    gcc_dwarf_ds_x86_64,
+    gcc_dwarf_fs_x86_64,
+    gcc_dwarf_gs_x86_64,
+    // Floating point control registers
+    gcc_dwarf_mxcsr_x86_64 = 64, // Media Control and Status
+    gcc_dwarf_fctrl_x86_64,      // x87 control word
+    gcc_dwarf_fstat_x86_64,      // x87 status word
+    // Upper Vector Registers    
+    gcc_dwarf_ymm0h_x86_64 = 67,
+    gcc_dwarf_ymm1h_x86_64,
+    gcc_dwarf_ymm2h_x86_64,
+    gcc_dwarf_ymm3h_x86_64,
+    gcc_dwarf_ymm4h_x86_64,
+    gcc_dwarf_ymm5h_x86_64,
+    gcc_dwarf_ymm6h_x86_64,
+    gcc_dwarf_ymm7h_x86_64,
+    gcc_dwarf_ymm8h_x86_64,
+    gcc_dwarf_ymm9h_x86_64,
+    gcc_dwarf_ymm10h_x86_64,
+    gcc_dwarf_ymm11h_x86_64,
+    gcc_dwarf_ymm12h_x86_64,
+    gcc_dwarf_ymm13h_x86_64,
+    gcc_dwarf_ymm14h_x86_64,
+    gcc_dwarf_ymm15h_x86_64,
+    // AVX2 Vector Mask Registers
+    // gcc_dwarf_k0_x86_64 = 118,
+    // gcc_dwarf_k1_x86_64,
+    // gcc_dwarf_k2_x86_64,
+    // gcc_dwarf_k3_x86_64,
+    // gcc_dwarf_k4_x86_64,
+    // gcc_dwarf_k5_x86_64,
+    // gcc_dwarf_k6_x86_64,
+    // gcc_dwarf_k7_x86_64,
+};
+
+// GDB Register numbers (eRegisterKindGDB)
+enum
+{
+    // GP Registers
+    gdb_rax_x86_64 = 0,
+    gdb_rbx_x86_64,
+    gdb_rcx_x86_64,
+    gdb_rdx_x86_64,
+    gdb_rsi_x86_64,
+    gdb_rdi_x86_64,
+    gdb_rbp_x86_64,
+    gdb_rsp_x86_64,
+    // Extended GP Registers
+    gdb_r8_x86_64,
+    gdb_r9_x86_64,
+    gdb_r10_x86_64,
+    gdb_r11_x86_64,
+    gdb_r12_x86_64,
+    gdb_r13_x86_64,
+    gdb_r14_x86_64,
+    gdb_r15_x86_64,
+    // Return Address (RA) mapped to RIP
+    gdb_rip_x86_64,
+    // Control and Status Flags Register
+    gdb_rflags_x86_64,
+    gdb_cs_x86_64,
+    gdb_ss_x86_64,
+    gdb_ds_x86_64,
+    gdb_es_x86_64,
+    gdb_fs_x86_64,
+    gdb_gs_x86_64,
+    // Floating Point Registers
+    gdb_st0_x86_64,
+    gdb_st1_x86_64,
+    gdb_st2_x86_64,
+    gdb_st3_x86_64,
+    gdb_st4_x86_64,
+    gdb_st5_x86_64,
+    gdb_st6_x86_64,
+    gdb_st7_x86_64,
+    gdb_fctrl_x86_64,
+    gdb_fstat_x86_64,
+    gdb_ftag_x86_64,
+    gdb_fiseg_x86_64,
+    gdb_fioff_x86_64,
+    gdb_foseg_x86_64,
+    gdb_fooff_x86_64,
+    gdb_fop_x86_64,
+    // SSE Vector Registers
+    gdb_xmm0_x86_64 = 40,
+    gdb_xmm1_x86_64,
+    gdb_xmm2_x86_64,
+    gdb_xmm3_x86_64,
+    gdb_xmm4_x86_64,
+    gdb_xmm5_x86_64,
+    gdb_xmm6_x86_64,
+    gdb_xmm7_x86_64,
+    gdb_xmm8_x86_64,
+    gdb_xmm9_x86_64,
+    gdb_xmm10_x86_64,
+    gdb_xmm11_x86_64,
+    gdb_xmm12_x86_64,
+    gdb_xmm13_x86_64,
+    gdb_xmm14_x86_64,
+    gdb_xmm15_x86_64,
+    // Floating point control registers
+    gdb_mxcsr_x86_64 = 56,
+    gdb_ymm0h_x86_64,
+    gdb_ymm1h_x86_64,
+    gdb_ymm2h_x86_64,
+    gdb_ymm3h_x86_64,
+    gdb_ymm4h_x86_64,
+    gdb_ymm5h_x86_64,
+    gdb_ymm6h_x86_64,
+    gdb_ymm7h_x86_64,
+    gdb_ymm8h_x86_64,
+    gdb_ymm9h_x86_64,
+    gdb_ymm10h_x86_64,
+    gdb_ymm11h_x86_64,
+    gdb_ymm12h_x86_64,
+    gdb_ymm13h_x86_64,
+    gdb_ymm14h_x86_64,
+    gdb_ymm15h_x86_64
+};
+
+//---------------------------------------------------------------------------
+// Generic floating-point registers
+//---------------------------------------------------------------------------
+
+struct MMSReg
+{
+    uint8_t bytes[10];
+    uint8_t pad[6];
+};
+
+struct XMMReg
+{
+    uint8_t bytes[16];      // 128-bits for each XMM register
+};
+
+// i387_fxsave_struct
+struct FXSAVE
+{
+    uint16_t fctrl;         // FPU Control Word (fcw)
+    uint16_t fstat;         // FPU Status Word (fsw)
+    uint16_t ftag;          // FPU Tag Word (ftw)
+    uint16_t fop;           // Last Instruction Opcode (fop)
+    union
+    {
+        struct
+        {
+            uint64_t fip;   // Instruction Pointer
+            uint64_t fdp;   // Data Pointer
+        } x86_64;
+        struct
+        {
+            uint32_t fioff;   // FPU IP Offset (fip)
+            uint32_t fiseg;   // FPU IP Selector (fcs)
+            uint32_t fooff;   // FPU Operand Pointer Offset (foo)
+            uint32_t foseg;   // FPU Operand Pointer Selector (fos)
+        } i386;
+    } ptr;
+    uint32_t mxcsr;         // MXCSR Register State
+    uint32_t mxcsrmask;     // MXCSR Mask 
+    MMSReg   stmm[8];       // 8*16 bytes for each FP-reg = 128 bytes
+    XMMReg   xmm[16];       // 16*16 bytes for each XMM-reg = 256 bytes
+    uint32_t padding[24];
+};
+
+//---------------------------------------------------------------------------
+// Extended floating-point registers
+//---------------------------------------------------------------------------
+
+struct YMMHReg
+{
+    uint8_t  bytes[16];     // 16 * 8 bits for the high bytes of each YMM register
+};
+
+struct YMMReg
+{
+    uint8_t  bytes[32];     // 16 * 16 bits for each YMM register
+};
+
+struct YMM
+{
+    YMMReg   ymm[16];       // assembled from ymmh and xmm registers
+};
+
+struct XSAVE_HDR
+{
+    uint64_t  xstate_bv;    // OS enabled xstate mask to determine the extended states supported by the processor
+    uint64_t  reserved1[2];
+    uint64_t  reserved2[5];
+} __attribute__((packed));
+
+// x86 extensions to FXSAVE (i.e. for AVX processors) 
+struct XSAVE 
+{
+    FXSAVE    i387;         // floating point registers typical in i387_fxsave_struct
+    XSAVE_HDR header;       // The xsave_hdr_struct can be used to determine if the following extensions are usable
+    YMMHReg   ymmh[16];     // High 16 bytes of each of 16 YMM registers (the low bytes are in FXSAVE.xmm for compatibility with SSE)
+    // Slot any extensions to the register file here
+} __attribute__((packed, aligned (64)));
+
+// Floating-point registers
+struct FPR
+{
+    // Thread state for the floating-point unit of the processor read by ptrace.
+    union XSTATE
+    {
+        FXSAVE   fxsave;    // Generic floating-point registers.
+        XSAVE    xsave;     // x86 extended processor state.
+    } xstate;
+};
+
+//---------------------------------------------------------------------------
+// ptrace PTRACE_GETREGSET, PTRACE_SETREGSET structure
+//---------------------------------------------------------------------------
+
+struct IOVEC
+{
+    void    *iov_base;      // pointer to XSAVE
+    size_t   iov_len;       // sizeof(XSAVE)
 };
 
 #endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86_64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86_64.cpp
deleted file mode 100644
index 617b18484e5..00000000000
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86_64.cpp
+++ /dev/null
@@ -1,1563 +0,0 @@
-//===-- RegisterContext_x86_64.cpp -------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include <cstring>
-#include <errno.h>
-#include <stdint.h>
-
-#include "lldb/Core/DataBufferHeap.h"
-#include "lldb/Core/DataExtractor.h"
-#include "lldb/Core/RegisterValue.h"
-#include "lldb/Core/Scalar.h"
-#include "lldb/Target/Target.h"
-#include "lldb/Target/Thread.h"
-#include "lldb/Host/Endian.h"
-#include "llvm/Support/Compiler.h"
-
-#include "ProcessPOSIX.h"
-#if defined(__linux__) or defined(__FreeBSD__)
-#include "ProcessMonitor.h"
-#endif
-#include "RegisterContext_i386.h"
-#include "RegisterContext_x86.h"
-#include "RegisterContext_x86_64.h"
-#include "Plugins/Process/elf-core/ProcessElfCore.h"
-
-using namespace lldb_private;
-using namespace lldb;
-
-// Support ptrace extensions even when compiled without required kernel support
-#ifndef NT_X86_XSTATE
-  #define NT_X86_XSTATE 0x202
-#endif
-
-enum
-{
-    gcc_dwarf_gpr_rax = 0,
-    gcc_dwarf_gpr_rdx,
-    gcc_dwarf_gpr_rcx,
-    gcc_dwarf_gpr_rbx,
-    gcc_dwarf_gpr_rsi,
-    gcc_dwarf_gpr_rdi,
-    gcc_dwarf_gpr_rbp,
-    gcc_dwarf_gpr_rsp,
-    gcc_dwarf_gpr_r8,
-    gcc_dwarf_gpr_r9,
-    gcc_dwarf_gpr_r10,
-    gcc_dwarf_gpr_r11,
-    gcc_dwarf_gpr_r12,
-    gcc_dwarf_gpr_r13,
-    gcc_dwarf_gpr_r14,
-    gcc_dwarf_gpr_r15,
-    gcc_dwarf_gpr_rip,
-    gcc_dwarf_fpu_xmm0,
-    gcc_dwarf_fpu_xmm1,
-    gcc_dwarf_fpu_xmm2,
-    gcc_dwarf_fpu_xmm3,
-    gcc_dwarf_fpu_xmm4,
-    gcc_dwarf_fpu_xmm5,
-    gcc_dwarf_fpu_xmm6,
-    gcc_dwarf_fpu_xmm7,
-    gcc_dwarf_fpu_xmm8,
-    gcc_dwarf_fpu_xmm9,
-    gcc_dwarf_fpu_xmm10,
-    gcc_dwarf_fpu_xmm11,
-    gcc_dwarf_fpu_xmm12,
-    gcc_dwarf_fpu_xmm13,
-    gcc_dwarf_fpu_xmm14,
-    gcc_dwarf_fpu_xmm15,
-    gcc_dwarf_fpu_stmm0,
-    gcc_dwarf_fpu_stmm1,
-    gcc_dwarf_fpu_stmm2,
-    gcc_dwarf_fpu_stmm3,
-    gcc_dwarf_fpu_stmm4,
-    gcc_dwarf_fpu_stmm5,
-    gcc_dwarf_fpu_stmm6,
-    gcc_dwarf_fpu_stmm7,
-    gcc_dwarf_fpu_ymm0,
-    gcc_dwarf_fpu_ymm1,
-    gcc_dwarf_fpu_ymm2,
-    gcc_dwarf_fpu_ymm3,
-    gcc_dwarf_fpu_ymm4,
-    gcc_dwarf_fpu_ymm5,
-    gcc_dwarf_fpu_ymm6,
-    gcc_dwarf_fpu_ymm7,
-    gcc_dwarf_fpu_ymm8,
-    gcc_dwarf_fpu_ymm9,
-    gcc_dwarf_fpu_ymm10,
-    gcc_dwarf_fpu_ymm11,
-    gcc_dwarf_fpu_ymm12,
-    gcc_dwarf_fpu_ymm13,
-    gcc_dwarf_fpu_ymm14,
-    gcc_dwarf_fpu_ymm15
-};
-
-enum
-{
-    gdb_gpr_rax     =   0,
-    gdb_gpr_rbx     =   1,
-    gdb_gpr_rcx     =   2,
-    gdb_gpr_rdx     =   3,
-    gdb_gpr_rsi     =   4,
-    gdb_gpr_rdi     =   5,
-    gdb_gpr_rbp     =   6,
-    gdb_gpr_rsp     =   7,
-    gdb_gpr_r8      =   8,
-    gdb_gpr_r9      =   9,
-    gdb_gpr_r10     =  10,
-    gdb_gpr_r11     =  11,
-    gdb_gpr_r12     =  12,
-    gdb_gpr_r13     =  13,
-    gdb_gpr_r14     =  14,
-    gdb_gpr_r15     =  15,
-    gdb_gpr_rip     =  16,
-    gdb_gpr_rflags  =  17,
-    gdb_gpr_cs      =  18,
-    gdb_gpr_ss      =  19,
-    gdb_gpr_ds      =  20,
-    gdb_gpr_es      =  21,
-    gdb_gpr_fs      =  22,
-    gdb_gpr_gs      =  23,
-    gdb_fpu_stmm0   =  24,
-    gdb_fpu_stmm1   =  25,
-    gdb_fpu_stmm2   =  26,
-    gdb_fpu_stmm3   =  27,
-    gdb_fpu_stmm4   =  28,
-    gdb_fpu_stmm5   =  29,
-    gdb_fpu_stmm6   =  30,
-    gdb_fpu_stmm7   =  31,
-    gdb_fpu_fcw     =  32,
-    gdb_fpu_fsw     =  33,
-    gdb_fpu_ftw     =  34,
-    gdb_fpu_cs_64   =  35,
-    gdb_fpu_ip      =  36,
-    gdb_fpu_ds_64   =  37,
-    gdb_fpu_dp      =  38,
-    gdb_fpu_fop     =  39,
-    gdb_fpu_xmm0    =  40,
-    gdb_fpu_xmm1    =  41,
-    gdb_fpu_xmm2    =  42,
-    gdb_fpu_xmm3    =  43,
-    gdb_fpu_xmm4    =  44,
-    gdb_fpu_xmm5    =  45,
-    gdb_fpu_xmm6    =  46,
-    gdb_fpu_xmm7    =  47,
-    gdb_fpu_xmm8    =  48,
-    gdb_fpu_xmm9    =  49,
-    gdb_fpu_xmm10   =  50,
-    gdb_fpu_xmm11   =  51,
-    gdb_fpu_xmm12   =  52,
-    gdb_fpu_xmm13   =  53,
-    gdb_fpu_xmm14   =  54,
-    gdb_fpu_xmm15   =  55,
-    gdb_fpu_mxcsr   =  56,
-    gdb_fpu_ymm0    =  57,
-    gdb_fpu_ymm1    =  58,
-    gdb_fpu_ymm2    =  59,
-    gdb_fpu_ymm3    =  60,
-    gdb_fpu_ymm4    =  61,
-    gdb_fpu_ymm5    =  62,
-    gdb_fpu_ymm6    =  63,
-    gdb_fpu_ymm7    =  64,
-    gdb_fpu_ymm8    =  65,
-    gdb_fpu_ymm9    =  66,
-    gdb_fpu_ymm10   =  67,
-    gdb_fpu_ymm11   =  68,
-    gdb_fpu_ymm12   =  69,
-    gdb_fpu_ymm13   =  70,
-    gdb_fpu_ymm14   =  71,
-    gdb_fpu_ymm15   =  72
-};
-
-static const
-uint32_t g_gpr_regnums[k_num_gpr_registers] =
-{
-    gpr_rax,
-    gpr_rbx,
-    gpr_rcx,
-    gpr_rdx,
-    gpr_rdi,
-    gpr_rsi,
-    gpr_rbp,
-    gpr_rsp,
-    gpr_r8,
-    gpr_r9,
-    gpr_r10,
-    gpr_r11,
-    gpr_r12,
-    gpr_r13,
-    gpr_r14,
-    gpr_r15,
-    gpr_rip,
-    gpr_rflags,
-    gpr_cs,
-    gpr_fs,
-    gpr_gs,
-    gpr_ss,
-    gpr_ds,
-    gpr_es,
-    gpr_eax,
-    gpr_ebx,
-    gpr_ecx,
-    gpr_edx,
-    gpr_edi,
-    gpr_esi,
-    gpr_ebp,
-    gpr_esp,
-    gpr_eip,
-    gpr_eflags
-};
-
-static const uint32_t
-g_fpu_regnums[k_num_fpr_registers] =
-{
-    fpu_fcw,
-    fpu_fsw,
-    fpu_ftw,
-    fpu_fop,
-    fpu_ip,
-    fpu_cs,
-    fpu_dp,
-    fpu_ds,
-    fpu_mxcsr,
-    fpu_mxcsrmask,
-    fpu_stmm0,
-    fpu_stmm1,
-    fpu_stmm2,
-    fpu_stmm3,
-    fpu_stmm4,
-    fpu_stmm5,
-    fpu_stmm6,
-    fpu_stmm7,
-    fpu_xmm0,
-    fpu_xmm1,
-    fpu_xmm2,
-    fpu_xmm3,
-    fpu_xmm4,
-    fpu_xmm5,
-    fpu_xmm6,
-    fpu_xmm7,
-    fpu_xmm8,
-    fpu_xmm9,
-    fpu_xmm10,
-    fpu_xmm11,
-    fpu_xmm12,
-    fpu_xmm13,
-    fpu_xmm14,
-    fpu_xmm15
-};
-
-static const uint32_t
-g_avx_regnums[k_num_avx_registers] =
-{
-    fpu_ymm0,
-    fpu_ymm1,
-    fpu_ymm2,
-    fpu_ymm3,
-    fpu_ymm4,
-    fpu_ymm5,
-    fpu_ymm6,
-    fpu_ymm7,
-    fpu_ymm8,
-    fpu_ymm9,
-    fpu_ymm10,
-    fpu_ymm11,
-    fpu_ymm12,
-    fpu_ymm13,
-    fpu_ymm14,
-    fpu_ymm15
-};
-
-// Number of register sets provided by this context.
-enum
-{
-    k_num_extended_register_sets = 1,
-    k_num_register_sets = 3
-};
-
-static const RegisterSet
-g_reg_sets[k_num_register_sets] =
-{
-    { "General Purpose Registers",  "gpr", k_num_gpr_registers, g_gpr_regnums },
-    { "Floating Point Registers",   "fpu", k_num_fpr_registers, g_fpu_regnums },
-    { "Advanced Vector Extensions", "avx", k_num_avx_registers, g_avx_regnums }
-};
-
-// Computes the offset of the given FPR in the extended data area.
-#define FPR_OFFSET(regname) \
-    (offsetof(RegisterContext_x86_64::FPR, xstate) + \
-     offsetof(RegisterContext_x86_64::FXSAVE, regname))
-
-// Computes the offset of the YMM register assembled from register halves.
-#define YMM_OFFSET(regname) \
-    (offsetof(RegisterContext_x86_64::YMM, regname))
-
-// Number of bytes needed to represent a i386 GPR
-#define GPR_i386_SIZE(reg) sizeof(((RegisterContext_i386::GPR*)NULL)->reg)
-
-// Number of bytes needed to represent a FPR.
-#define FPR_SIZE(reg) sizeof(((RegisterContext_x86_64::FXSAVE*)NULL)->reg)
-
-// Number of bytes needed to represent the i'th FP register.
-#define FP_SIZE sizeof(((RegisterContext_x86_64::MMSReg*)NULL)->bytes)
-
-// Number of bytes needed to represent an XMM register.
-#define XMM_SIZE sizeof(RegisterContext_x86_64::XMMReg)
-
-// Number of bytes needed to represent a YMM register.
-#define YMM_SIZE sizeof(RegisterContext_x86_64::YMMReg)
-
-// Note that the size and offset will be updated by platform-specific classes.
-#define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4)           \
-    { #reg, alt, 0, 0, eEncodingUint,                              \
-      eFormatHex, { kind1, kind2, kind3, kind4, gpr_##reg }, NULL, NULL }
-
-// Dummy data for RegisterInfo::value_regs as expected by DumpRegisterSet. 
-static uint32_t value_regs = LLDB_INVALID_REGNUM;
-
-#define DEFINE_GPR_i386(reg_i386, reg_x86_64, alt, kind1, kind2, kind3, kind4) \
-    { #reg_i386, alt, GPR_i386_SIZE(reg_i386), 0, eEncodingUint,   \
-      eFormatHex, { kind1, kind2, kind3, kind4, gpr_##reg_i386 }, &value_regs, NULL }
-
-#define DEFINE_FPR(reg, kind1, kind2, kind3, kind4)                \
-    { #reg, NULL, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint,   \
-      eFormatHex, { kind1, kind2, kind3, kind4, fpu_##reg }, NULL, NULL }
-
-#define DEFINE_FP(reg, i)                                          \
-    { #reg#i, NULL, FP_SIZE, LLVM_EXTENSION FPR_OFFSET(reg[i]),    \
-      eEncodingVector, eFormatVectorOfUInt8,                       \
-      { gcc_dwarf_fpu_##reg##i, gcc_dwarf_fpu_##reg##i,            \
-        LLDB_INVALID_REGNUM, gdb_fpu_##reg##i, fpu_##reg##i }, NULL, NULL }
-
-#define DEFINE_XMM(reg, i)                                         \
-    { #reg#i, NULL, XMM_SIZE, LLVM_EXTENSION FPR_OFFSET(reg[i]),   \
-      eEncodingVector, eFormatVectorOfUInt8,                       \
-      { gcc_dwarf_fpu_##reg##i, gcc_dwarf_fpu_##reg##i,            \
-        LLDB_INVALID_REGNUM, gdb_fpu_##reg##i, fpu_##reg##i }, NULL, NULL }
-
-#define DEFINE_YMM(reg, i)                                         \
-    { #reg#i, NULL, YMM_SIZE, LLVM_EXTENSION YMM_OFFSET(reg[i]),   \
-      eEncodingVector, eFormatVectorOfUInt8,                       \
-      { gcc_dwarf_fpu_##reg##i, gcc_dwarf_fpu_##reg##i,            \
-        LLDB_INVALID_REGNUM, gdb_fpu_##reg##i, fpu_##reg##i }, NULL, NULL }
-
-#define DEFINE_DR(reg, i)                                              \
-    { #reg#i, NULL, 0, 0, eEncodingUint, eFormatHex,                   \
-      { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, \
-      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM }, NULL, NULL }
-
-#define REG_CONTEXT_SIZE (GetGPRSize() + sizeof(RegisterContext_x86_64::FPR))
-
-static RegisterInfo
-g_register_infos[k_num_registers] =
-{
-    // General purpose registers.
-    DEFINE_GPR(rax,    NULL,    gcc_dwarf_gpr_rax,   gcc_dwarf_gpr_rax,   LLDB_INVALID_REGNUM,       gdb_gpr_rax),
-    DEFINE_GPR(rbx,    NULL,    gcc_dwarf_gpr_rbx,   gcc_dwarf_gpr_rbx,   LLDB_INVALID_REGNUM,       gdb_gpr_rbx),
-    DEFINE_GPR(rcx,    NULL,    gcc_dwarf_gpr_rcx,   gcc_dwarf_gpr_rcx,   LLDB_INVALID_REGNUM,       gdb_gpr_rcx),
-    DEFINE_GPR(rdx,    NULL,    gcc_dwarf_gpr_rdx,   gcc_dwarf_gpr_rdx,   LLDB_INVALID_REGNUM,       gdb_gpr_rdx),
-    DEFINE_GPR(rdi,    NULL,    gcc_dwarf_gpr_rdi,   gcc_dwarf_gpr_rdi,   LLDB_INVALID_REGNUM,       gdb_gpr_rdi),
-    DEFINE_GPR(rsi,    NULL,    gcc_dwarf_gpr_rsi,   gcc_dwarf_gpr_rsi,   LLDB_INVALID_REGNUM,       gdb_gpr_rsi),
-    DEFINE_GPR(rbp,    "fp",    gcc_dwarf_gpr_rbp,   gcc_dwarf_gpr_rbp,   LLDB_REGNUM_GENERIC_FP,    gdb_gpr_rbp),
-    DEFINE_GPR(rsp,    "sp",    gcc_dwarf_gpr_rsp,   gcc_dwarf_gpr_rsp,   LLDB_REGNUM_GENERIC_SP,    gdb_gpr_rsp),
-    DEFINE_GPR(r8,     NULL,    gcc_dwarf_gpr_r8,    gcc_dwarf_gpr_r8,    LLDB_INVALID_REGNUM,       gdb_gpr_r8),
-    DEFINE_GPR(r9,     NULL,    gcc_dwarf_gpr_r9,    gcc_dwarf_gpr_r9,    LLDB_INVALID_REGNUM,       gdb_gpr_r9),
-    DEFINE_GPR(r10,    NULL,    gcc_dwarf_gpr_r10,   gcc_dwarf_gpr_r10,   LLDB_INVALID_REGNUM,       gdb_gpr_r10),
-    DEFINE_GPR(r11,    NULL,    gcc_dwarf_gpr_r11,   gcc_dwarf_gpr_r11,   LLDB_INVALID_REGNUM,       gdb_gpr_r11),
-    DEFINE_GPR(r12,    NULL,    gcc_dwarf_gpr_r12,   gcc_dwarf_gpr_r12,   LLDB_INVALID_REGNUM,       gdb_gpr_r12),
-    DEFINE_GPR(r13,    NULL,    gcc_dwarf_gpr_r13,   gcc_dwarf_gpr_r13,   LLDB_INVALID_REGNUM,       gdb_gpr_r13),
-    DEFINE_GPR(r14,    NULL,    gcc_dwarf_gpr_r14,   gcc_dwarf_gpr_r14,   LLDB_INVALID_REGNUM,       gdb_gpr_r14),
-    DEFINE_GPR(r15,    NULL,    gcc_dwarf_gpr_r15,   gcc_dwarf_gpr_r15,   LLDB_INVALID_REGNUM,       gdb_gpr_r15),
-    DEFINE_GPR(rip,    "pc",    gcc_dwarf_gpr_rip,   gcc_dwarf_gpr_rip,   LLDB_REGNUM_GENERIC_PC,    gdb_gpr_rip),
-    DEFINE_GPR(rflags, "flags", LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_REGNUM_GENERIC_FLAGS, gdb_gpr_rflags),
-    DEFINE_GPR(cs,     NULL,    LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,       gdb_gpr_cs),
-    DEFINE_GPR(fs,     NULL,    LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,       gdb_gpr_fs),
-    DEFINE_GPR(gs,     NULL,    LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,       gdb_gpr_gs),
-    DEFINE_GPR(ss,     NULL,    LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,       gdb_gpr_ss),
-    DEFINE_GPR(ds,     NULL,    LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,       gdb_gpr_ds),
-    DEFINE_GPR(es,     NULL,    LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,       gdb_gpr_es),
-    // i386 registers
-    DEFINE_GPR_i386(eax,    rax,    NULL,    gcc_eax,    dwarf_eax,    LLDB_INVALID_REGNUM,       gdb_eax),
-    DEFINE_GPR_i386(ebx,    rbx,    NULL,    gcc_ebx,    dwarf_ebx,    LLDB_INVALID_REGNUM,       gdb_ebx),
-    DEFINE_GPR_i386(ecx,    rcx,    NULL,    gcc_ecx,    dwarf_ecx,    LLDB_INVALID_REGNUM,       gdb_ecx),
-    DEFINE_GPR_i386(edx,    rdx,    NULL,    gcc_edx,    dwarf_edx,    LLDB_INVALID_REGNUM,       gdb_edx),
-    DEFINE_GPR_i386(edi,    rdi,    NULL,    gcc_edi,    dwarf_edi,    LLDB_INVALID_REGNUM,       gdb_edi),
-    DEFINE_GPR_i386(esi,    rsi,    NULL,    gcc_esi,    dwarf_esi,    LLDB_INVALID_REGNUM,       gdb_esi),
-    DEFINE_GPR_i386(ebp,    rbp,    "fp",    gcc_ebp,    dwarf_ebp,    LLDB_REGNUM_GENERIC_FP,    gdb_ebp),
-    DEFINE_GPR_i386(esp,    rsp,    "sp",    gcc_esp,    dwarf_esp,    LLDB_REGNUM_GENERIC_SP,    gdb_esp),
-    DEFINE_GPR_i386(eip,    rip,    "pc",    gcc_eip,    dwarf_eip,    LLDB_REGNUM_GENERIC_PC,    gdb_eip),
-    DEFINE_GPR_i386(eflags, rflags, "flags", gcc_eflags, dwarf_eflags, LLDB_REGNUM_GENERIC_FLAGS, gdb_eflags),
-    // i387 Floating point registers.
-    DEFINE_FPR(fcw,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_fcw),
-    DEFINE_FPR(fsw,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_fsw),
-    DEFINE_FPR(ftw,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ftw),
-    DEFINE_FPR(fop,       LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_fop),
-    DEFINE_FPR(ip,        LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ip),
-    // FIXME: Extract segment from ip.
-    DEFINE_FPR(ip,        LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_cs_64),
-    DEFINE_FPR(dp,        LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_dp),
-    // FIXME: Extract segment from dp.
-    DEFINE_FPR(dp,        LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_ds_64),
-    DEFINE_FPR(mxcsr,     LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fpu_mxcsr),
-    DEFINE_FPR(mxcsrmask, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM),
-
-    // FP registers.
-    DEFINE_FP(stmm, 0),
-    DEFINE_FP(stmm, 1),
-    DEFINE_FP(stmm, 2),
-    DEFINE_FP(stmm, 3),
-    DEFINE_FP(stmm, 4),
-    DEFINE_FP(stmm, 5),
-    DEFINE_FP(stmm, 6),
-    DEFINE_FP(stmm, 7),
-
-    // XMM registers
-    DEFINE_XMM(xmm, 0),
-    DEFINE_XMM(xmm, 1),
-    DEFINE_XMM(xmm, 2),
-    DEFINE_XMM(xmm, 3),
-    DEFINE_XMM(xmm, 4),
-    DEFINE_XMM(xmm, 5),
-    DEFINE_XMM(xmm, 6),
-    DEFINE_XMM(xmm, 7),
-    DEFINE_XMM(xmm, 8),
-    DEFINE_XMM(xmm, 9),
-    DEFINE_XMM(xmm, 10),
-    DEFINE_XMM(xmm, 11),
-    DEFINE_XMM(xmm, 12),
-    DEFINE_XMM(xmm, 13),
-    DEFINE_XMM(xmm, 14),
-    DEFINE_XMM(xmm, 15),
-
-    // Copy of YMM registers assembled from xmm and ymmh
-    DEFINE_YMM(ymm, 0),
-    DEFINE_YMM(ymm, 1),
-    DEFINE_YMM(ymm, 2),
-    DEFINE_YMM(ymm, 3),
-    DEFINE_YMM(ymm, 4),
-    DEFINE_YMM(ymm, 5),
-    DEFINE_YMM(ymm, 6),
-    DEFINE_YMM(ymm, 7),
-    DEFINE_YMM(ymm, 8),
-    DEFINE_YMM(ymm, 9),
-    DEFINE_YMM(ymm, 10),
-    DEFINE_YMM(ymm, 11),
-    DEFINE_YMM(ymm, 12),
-    DEFINE_YMM(ymm, 13),
-    DEFINE_YMM(ymm, 14),
-    DEFINE_YMM(ymm, 15),
-
-    // Debug registers for lldb internal use
-    DEFINE_DR(dr, 0),
-    DEFINE_DR(dr, 1),
-    DEFINE_DR(dr, 2),
-    DEFINE_DR(dr, 3),
-    DEFINE_DR(dr, 4),
-    DEFINE_DR(dr, 5),
-    DEFINE_DR(dr, 6),
-    DEFINE_DR(dr, 7)
-};
-
-static bool IsGPR(unsigned reg)
-{
-    return reg <= k_last_gpr;   // GPR's come first.
-}
-
-static bool IsAVX(unsigned reg)
-{
-    return (k_first_avx <= reg && reg <= k_last_avx);
-}
-static bool IsFPR(unsigned reg)
-{
-    return (k_first_fpr <= reg && reg <= k_last_fpr);
-}
-
-
-bool RegisterContext_x86_64::IsFPR(unsigned reg, FPRType fpr_type)
-{
-    bool generic_fpr = ::IsFPR(reg);
-    if (fpr_type == eXSAVE)
-      return generic_fpr || IsAVX(reg);
-
-    return generic_fpr;
-}
-
-RegisterContext_x86_64::RegisterContext_x86_64(Thread &thread,
-                                               uint32_t concrete_frame_idx)
-    : RegisterContextPOSIX(thread, concrete_frame_idx)
-{
-    // Initialize m_iovec to point to the buffer and buffer size
-    // using the conventions of Berkeley style UIO structures, as required
-    // by PTRACE extensions.
-    m_iovec.iov_base = &m_fpr.xstate.xsave;
-    m_iovec.iov_len = sizeof(m_fpr.xstate.xsave);
-
-    ::memset(&m_fpr, 0, sizeof(RegisterContext_x86_64::FPR));
-
-    // elf-core yet to support ReadFPR()
-    ProcessSP base = CalculateProcess();
-    if (base.get()->GetPluginName() ==  ProcessElfCore::GetPluginNameStatic())
-        return;
-    
-    // TODO: Use assembly to call cpuid on the inferior and query ebx or ecx
-    m_fpr_type = eXSAVE; // extended floating-point registers, if available
-    if (false == ReadFPR())
-        m_fpr_type = eFXSAVE; // assume generic floating-point registers
-}
-
-RegisterContext_x86_64::~RegisterContext_x86_64()
-{
-}
-
-void
-RegisterContext_x86_64::Invalidate()
-{
-}
-
-void
-RegisterContext_x86_64::InvalidateAllRegisters()
-{
-}
-
-unsigned
-RegisterContext_x86_64::GetRegisterOffset(unsigned reg)
-{
-    assert(reg < k_num_registers && "Invalid register number.");
-    return GetRegisterInfo()[reg].byte_offset;
-}
-
-unsigned
-RegisterContext_x86_64::GetRegisterSize(unsigned reg)
-{
-    assert(reg < k_num_registers && "Invalid register number.");
-    return GetRegisterInfo()[reg].byte_size;
-}
-
-size_t
-RegisterContext_x86_64::GetRegisterCount()
-{
-    size_t num_registers = k_num_gpr_registers + k_num_fpr_registers;
-    if (m_fpr_type == eXSAVE)
-      return num_registers + k_num_avx_registers;
-    return num_registers;
-}
-
-const RegisterInfo *
-RegisterContext_x86_64::GetRegisterInfo()
-{
-    // Commonly, this method is overridden and g_register_infos is copied and specialized.
-    // So, use GetRegisterInfo() rather than g_register_infos in this scope.
-    return g_register_infos;
-}
-
-const RegisterInfo *
-RegisterContext_x86_64::GetRegisterInfoAtIndex(size_t reg)
-{
-    if (reg < k_num_registers)
-        return &GetRegisterInfo()[reg];
-    else
-        return NULL;
-}
-
-size_t
-RegisterContext_x86_64::GetRegisterSetCount()
-{
-    size_t sets = 0;
-    for (size_t set = 0; set < k_num_register_sets; ++set)
-        if (IsRegisterSetAvailable(set))
-            ++sets;
-
-    return sets;
-}
-
-const RegisterSet *
-RegisterContext_x86_64::GetRegisterSet(size_t set)
-{
-    if (IsRegisterSetAvailable(set))
-        return &g_reg_sets[set];
-    else
-        return NULL;
-}
-
-unsigned
-RegisterContext_x86_64::GetRegisterIndexFromOffset(unsigned offset)
-{
-    unsigned reg;
-    for (reg = 0; reg < k_num_registers; reg++)
-    {
-        if (GetRegisterInfo()[reg].byte_offset == offset)
-            break;
-    }
-    assert(reg < k_num_registers && "Invalid register offset.");
-    return reg;
-}
-
-const char *
-RegisterContext_x86_64::GetRegisterName(unsigned reg)
-{
-    assert(reg < k_num_registers && "Invalid register offset.");
-    return GetRegisterInfo()[reg].name;
-}
-
-lldb::ByteOrder
-RegisterContext_x86_64::GetByteOrder()
-{
-    // Get the target process whose privileged thread was used for the register read.
-    lldb::ByteOrder byte_order = eByteOrderInvalid;
-    Process *process = CalculateProcess().get();
-
-    if (process)
-        byte_order = process->GetByteOrder();
-    return byte_order;
-}
-
-// Parse ymm registers and into xmm.bytes and ymmh.bytes.
-bool RegisterContext_x86_64::CopyYMMtoXSTATE(uint32_t reg, lldb::ByteOrder byte_order)
-{
-    if (!IsAVX(reg))
-        return false;
-
-    if (byte_order == eByteOrderLittle) {
-      ::memcpy(m_fpr.xstate.fxsave.xmm[reg - fpu_ymm0].bytes,
-               m_ymm_set.ymm[reg - fpu_ymm0].bytes,
-               sizeof(RegisterContext_x86_64::XMMReg));
-      ::memcpy(m_fpr.xstate.xsave.ymmh[reg - fpu_ymm0].bytes,
-               m_ymm_set.ymm[reg - fpu_ymm0].bytes + sizeof(RegisterContext_x86_64::XMMReg),
-               sizeof(RegisterContext_x86_64::YMMHReg));
-      return true;
-    }
-
-    if (byte_order == eByteOrderBig) {
-      ::memcpy(m_fpr.xstate.fxsave.xmm[reg - fpu_ymm0].bytes,
-               m_ymm_set.ymm[reg - fpu_ymm0].bytes + sizeof(RegisterContext_x86_64::XMMReg),
-               sizeof(RegisterContext_x86_64::XMMReg));
-      ::memcpy(m_fpr.xstate.xsave.ymmh[reg - fpu_ymm0].bytes,
-               m_ymm_set.ymm[reg - fpu_ymm0].bytes,
-               sizeof(RegisterContext_x86_64::YMMHReg));
-      return true;
-    }
-    return false; // unsupported or invalid byte order
-}
-
-// Concatenate xmm.bytes with ymmh.bytes
-bool RegisterContext_x86_64::CopyXSTATEtoYMM(uint32_t reg, lldb::ByteOrder byte_order)
-{
-    if (!IsAVX(reg))
-        return false;
-
-    if (byte_order == eByteOrderLittle) {
-      ::memcpy(m_ymm_set.ymm[reg - fpu_ymm0].bytes,
-               m_fpr.xstate.fxsave.xmm[reg - fpu_ymm0].bytes,
-               sizeof(RegisterContext_x86_64::XMMReg));
-      ::memcpy(m_ymm_set.ymm[reg - fpu_ymm0].bytes + sizeof(RegisterContext_x86_64::XMMReg),
-               m_fpr.xstate.xsave.ymmh[reg - fpu_ymm0].bytes,
-               sizeof(RegisterContext_x86_64::YMMHReg));
-      return true;
-    }
-    if (byte_order == eByteOrderBig) {
-      ::memcpy(m_ymm_set.ymm[reg - fpu_ymm0].bytes + sizeof(RegisterContext_x86_64::XMMReg),
-               m_fpr.xstate.fxsave.xmm[reg - fpu_ymm0].bytes,
-               sizeof(RegisterContext_x86_64::XMMReg));
-      ::memcpy(m_ymm_set.ymm[reg - fpu_ymm0].bytes,
-               m_fpr.xstate.xsave.ymmh[reg - fpu_ymm0].bytes,
-               sizeof(RegisterContext_x86_64::YMMHReg));
-      return true;
-    }
-    return false; // unsupported or invalid byte order
-}
-
-bool
-RegisterContext_x86_64::IsRegisterSetAvailable(size_t set_index)
-{
-    // Note: Extended register sets are assumed to be at the end of g_reg_sets...
-    size_t num_sets = k_num_register_sets - k_num_extended_register_sets;
-    if (m_fpr_type == eXSAVE) // ...and to start with AVX registers.
-        ++num_sets;
-
-    return (set_index < num_sets);
-}   
-
-bool
-RegisterContext_x86_64::ReadRegister(const RegisterInfo *reg_info, RegisterValue &value)
-{
-    if (!reg_info)
-        return false;
-
-    const uint32_t reg = reg_info->kinds[eRegisterKindLLDB];
-
-    if (IsFPR(reg, m_fpr_type)) {
-        if (!ReadFPR())
-            return false;
-    }
-    else {
-        bool success = ReadRegister(reg, value);
-
-        // If an i386 register should be parsed from an x86_64 register...
-        if (success && reg >= k_first_i386 && reg <= k_last_i386)
-            if (value.GetByteSize() > reg_info->byte_size)
-                value.SetType(reg_info); // ...use the type specified by reg_info rather than the uint64_t default
-        return success; 
-    }
-
-    if (reg_info->encoding == eEncodingVector) {
-        ByteOrder byte_order = GetByteOrder();
-
-        if (byte_order != ByteOrder::eByteOrderInvalid) {
-            if (reg >= fpu_stmm0 && reg <= fpu_stmm7) {
-               value.SetBytes(m_fpr.xstate.fxsave.stmm[reg - fpu_stmm0].bytes, reg_info->byte_size, byte_order);
-            }
-            if (reg >= fpu_xmm0 && reg <= fpu_xmm15) {
-                value.SetBytes(m_fpr.xstate.fxsave.xmm[reg - fpu_xmm0].bytes, reg_info->byte_size, byte_order);
-            }
-            if (reg >= fpu_ymm0 && reg <= fpu_ymm15) {
-                // Concatenate ymm using the register halves in xmm.bytes and ymmh.bytes
-                if (m_fpr_type == eXSAVE && CopyXSTATEtoYMM(reg, byte_order))
-                    value.SetBytes(m_ymm_set.ymm[reg - fpu_ymm0].bytes, reg_info->byte_size, byte_order);
-                else
-                    return false;
-            }
-            return value.GetType() == RegisterValue::eTypeBytes;
-        }
-        return false;
-    }
-
-    // Note that lldb uses slightly different naming conventions from sys/user.h
-    switch (reg)
-    {
-    default:
-        return false;
-    case fpu_dp:
-        value = m_fpr.xstate.fxsave.dp;
-        break;
-    case fpu_fcw:
-        value = m_fpr.xstate.fxsave.fcw;
-        break;
-    case fpu_fsw:
-        value = m_fpr.xstate.fxsave.fsw;
-        break;
-    case fpu_ip:
-        value = m_fpr.xstate.fxsave.ip;
-        break;
-    case fpu_fop:
-        value = m_fpr.xstate.fxsave.fop;
-        break;
-    case fpu_ftw:
-        value = m_fpr.xstate.fxsave.ftw;
-        break;
-    case fpu_mxcsr:
-        value = m_fpr.xstate.fxsave.mxcsr;
-        break;
-    case fpu_mxcsrmask:
-        value = m_fpr.xstate.fxsave.mxcsrmask;
-        break;
-    }
-    return true;
-}
-
-bool
-RegisterContext_x86_64::ReadAllRegisterValues(DataBufferSP &data_sp)
-{
-    bool success = false;
-    data_sp.reset (new DataBufferHeap (REG_CONTEXT_SIZE, 0));
-    if (data_sp && ReadGPR () && ReadFPR ())
-    {
-        uint8_t *dst = data_sp->GetBytes();
-        success = dst != 0;
-
-        if (success) {
-            ::memcpy (dst, &m_gpr, GetGPRSize());
-            dst += GetGPRSize();
-        }
-        if (m_fpr_type == eFXSAVE)
-            ::memcpy (dst, &m_fpr.xstate.fxsave, sizeof(m_fpr.xstate.fxsave));
-        
-        if (m_fpr_type == eXSAVE) {
-            ByteOrder byte_order = GetByteOrder();
-
-            // Assemble the YMM register content from the register halves.
-            for (uint32_t reg = fpu_ymm0; success && reg <= fpu_ymm15; ++reg)
-                success = CopyXSTATEtoYMM(reg, byte_order);
-
-            if (success) {
-                // Copy the extended register state including the assembled ymm registers.
-                ::memcpy (dst, &m_fpr, sizeof(m_fpr));
-            }
-        }
-    }
-    return success;
-}
-
-bool
-RegisterContext_x86_64::WriteRegister(const lldb_private::RegisterInfo *reg_info,
-                                      const lldb_private::RegisterValue &value)
-{
-    const uint32_t reg = reg_info->kinds[eRegisterKindLLDB];
-    if (IsGPR(reg)) {
-        return WriteRegister(reg, value);
-    }
-
-    if (IsFPR(reg, m_fpr_type)) {
-        switch (reg)
-        {
-        default:
-            if (reg_info->encoding != eEncodingVector)
-                return false;
-
-            if (reg >= fpu_stmm0 && reg <= fpu_stmm7)
-               ::memcpy (m_fpr.xstate.fxsave.stmm[reg - fpu_stmm0].bytes, value.GetBytes(), value.GetByteSize());
-            
-            if (reg >= fpu_xmm0 && reg <= fpu_xmm15)
-               ::memcpy (m_fpr.xstate.fxsave.xmm[reg - fpu_xmm0].bytes, value.GetBytes(), value.GetByteSize());
-            
-            if (reg >= fpu_ymm0 && reg <= fpu_ymm15) {
-               if (m_fpr_type != eXSAVE)
-                   return false; // the target processor does not support AVX
-
-               // Store ymm register content, and split into the register halves in xmm.bytes and ymmh.bytes
-               ::memcpy (m_ymm_set.ymm[reg - fpu_ymm0].bytes, value.GetBytes(), value.GetByteSize());
-               if (false == CopyYMMtoXSTATE(reg, GetByteOrder()))
-                   return false;
-            }
-            break;
-        case fpu_dp:
-            m_fpr.xstate.fxsave.dp = value.GetAsUInt64();
-            break;
-        case fpu_fcw:
-            m_fpr.xstate.fxsave.fcw = value.GetAsUInt16();
-            break;
-        case fpu_fsw:
-            m_fpr.xstate.fxsave.fsw = value.GetAsUInt16();
-            break;
-        case fpu_ip:
-            m_fpr.xstate.fxsave.ip = value.GetAsUInt64();
-            break;
-        case fpu_fop:
-            m_fpr.xstate.fxsave.fop = value.GetAsUInt16();
-            break;
-        case fpu_ftw:
-            m_fpr.xstate.fxsave.ftw = value.GetAsUInt16();
-            break;
-        case fpu_mxcsr:
-            m_fpr.xstate.fxsave.mxcsr = value.GetAsUInt32();
-            break;
-        case fpu_mxcsrmask:
-            m_fpr.xstate.fxsave.mxcsrmask = value.GetAsUInt32();
-            break;
-        }
-        if (WriteFPR()) {
-            if (IsAVX(reg))
-                return CopyYMMtoXSTATE(reg, GetByteOrder());
-            return true;
-        }
-    }
-    return false;
-}
-
-bool
-RegisterContext_x86_64::WriteAllRegisterValues(const DataBufferSP &data_sp)
-{
-    bool success = false;
-    if (data_sp && data_sp->GetByteSize() == REG_CONTEXT_SIZE)
-    {
-        uint8_t *src = data_sp->GetBytes();
-        if (src) {
-            ::memcpy (&m_gpr, src, GetGPRSize());
-
-            if (WriteGPR()) {
-                src += GetGPRSize();
-                if (m_fpr_type == eFXSAVE)
-                    ::memcpy (&m_fpr.xstate.fxsave, src, sizeof(m_fpr.xstate.fxsave));
-                if (m_fpr_type == eXSAVE)
-                    ::memcpy (&m_fpr.xstate.xsave, src, sizeof(m_fpr.xstate.xsave));
-
-                success = WriteFPR();
-                if (success) {
-                    success = true;
-
-                    if (m_fpr_type == eXSAVE) {
-                        ByteOrder byte_order = GetByteOrder();
-
-                        // Parse the YMM register content from the register halves.
-                        for (uint32_t reg = fpu_ymm0; success && reg <= fpu_ymm15; ++reg)
-                            success = CopyYMMtoXSTATE(reg, byte_order);
-                    }
-                }
-            }
-        }
-    }
-    return success;
-}
-
-bool
-RegisterContext_x86_64::UpdateAfterBreakpoint()
-{
-    // PC points one byte past the int3 responsible for the breakpoint.
-    lldb::addr_t pc;
-
-    if ((pc = GetPC()) == LLDB_INVALID_ADDRESS)
-        return false;
-
-    SetPC(pc - 1);
-    return true;
-}
-
-uint32_t
-RegisterContext_x86_64::ConvertRegisterKindToRegisterNumber(uint32_t kind,
-                                                                 uint32_t num)
-{
-    const Process *process = CalculateProcess().get();
-    if (process)
-    {
-        const ArchSpec arch = process->GetTarget().GetArchitecture();;
-        switch (arch.GetCore())
-        {
-        default:
-            assert(false && "CPU type not supported!");
-            break;
-
-        case ArchSpec::eCore_x86_32_i386:
-        case ArchSpec::eCore_x86_32_i486:
-        case ArchSpec::eCore_x86_32_i486sx:
-        {
-            if (kind == eRegisterKindGeneric)
-            {
-                switch (num)
-                {
-                case LLDB_REGNUM_GENERIC_PC:    return gpr_eip;
-                case LLDB_REGNUM_GENERIC_SP:    return gpr_esp;
-                case LLDB_REGNUM_GENERIC_FP:    return gpr_ebp;
-                case LLDB_REGNUM_GENERIC_FLAGS: return gpr_eflags;
-                case LLDB_REGNUM_GENERIC_RA:
-                default:
-                    return LLDB_INVALID_REGNUM;
-                }
-            }
-
-            if (kind == eRegisterKindGCC || kind == eRegisterKindDWARF)
-            {
-                switch (num)
-                {
-                case dwarf_eax:  return gpr_eax;
-                case dwarf_edx:  return gpr_edx;
-                case dwarf_ecx:  return gpr_ecx;
-                case dwarf_ebx:  return gpr_ebx;
-                case dwarf_esi:  return gpr_esi;
-                case dwarf_edi:  return gpr_edi;
-                case dwarf_ebp:  return gpr_ebp;
-                case dwarf_esp:  return gpr_esp;
-                case dwarf_eip:  return gpr_eip;
-                case dwarf_xmm0: return fpu_xmm0;
-                case dwarf_xmm1: return fpu_xmm1;
-                case dwarf_xmm2: return fpu_xmm2;
-                case dwarf_xmm3: return fpu_xmm3;
-                case dwarf_xmm4: return fpu_xmm4;
-                case dwarf_xmm5: return fpu_xmm5;
-                case dwarf_xmm6: return fpu_xmm6;
-                case dwarf_xmm7: return fpu_xmm7;
-                case dwarf_stmm0: return fpu_stmm0;
-                case dwarf_stmm1: return fpu_stmm1;
-                case dwarf_stmm2: return fpu_stmm2;
-                case dwarf_stmm3: return fpu_stmm3;
-                case dwarf_stmm4: return fpu_stmm4;
-                case dwarf_stmm5: return fpu_stmm5;
-                case dwarf_stmm6: return fpu_stmm6;
-                case dwarf_stmm7: return fpu_stmm7;
-                default:
-                    return LLDB_INVALID_REGNUM;
-                }
-            }
-
-            if (kind == eRegisterKindGDB)
-            {
-                switch (num)
-                {
-                case gdb_eax     : return gpr_eax;
-                case gdb_ebx     : return gpr_ebx;
-                case gdb_ecx     : return gpr_ecx;
-                case gdb_edx     : return gpr_edx;
-                case gdb_esi     : return gpr_esi;
-                case gdb_edi     : return gpr_edi;
-                case gdb_ebp     : return gpr_ebp;
-                case gdb_esp     : return gpr_esp;
-                case gdb_eip     : return gpr_eip;
-                case gdb_eflags  : return gpr_eflags;
-                case gdb_cs      : return gpr_cs;
-                case gdb_ss      : return gpr_ss;
-                case gdb_ds      : return gpr_ds;
-                case gdb_es      : return gpr_es;
-                case gdb_fs      : return gpr_fs;
-                case gdb_gs      : return gpr_gs;
-                case gdb_stmm0   : return fpu_stmm0;
-                case gdb_stmm1   : return fpu_stmm1;
-                case gdb_stmm2   : return fpu_stmm2;
-                case gdb_stmm3   : return fpu_stmm3;
-                case gdb_stmm4   : return fpu_stmm4;
-                case gdb_stmm5   : return fpu_stmm5;
-                case gdb_stmm6   : return fpu_stmm6;
-                case gdb_stmm7   : return fpu_stmm7;
-                case gdb_fcw     : return fpu_fcw;
-                case gdb_fsw     : return fpu_fsw;
-                case gdb_ftw     : return fpu_ftw;
-                case gdb_fpu_cs  : return fpu_cs;
-                case gdb_ip      : return fpu_ip;
-                case gdb_fpu_ds  : return fpu_ds; //fpu_fos
-                case gdb_dp      : return fpu_dp; //fpu_foo
-                case gdb_fop     : return fpu_fop;
-                case gdb_xmm0    : return fpu_xmm0;
-                case gdb_xmm1    : return fpu_xmm1;
-                case gdb_xmm2    : return fpu_xmm2;
-                case gdb_xmm3    : return fpu_xmm3;
-                case gdb_xmm4    : return fpu_xmm4;
-                case gdb_xmm5    : return fpu_xmm5;
-                case gdb_xmm6    : return fpu_xmm6;
-                case gdb_xmm7    : return fpu_xmm7;
-                case gdb_mxcsr   : return fpu_mxcsr;
-                default:
-                    return LLDB_INVALID_REGNUM;
-                }
-            }
-            else if (kind == eRegisterKindLLDB)
-            {
-                return num;
-            }
-
-            break;
-        }
-
-        case ArchSpec::eCore_x86_64_x86_64:
-        {
-            if (kind == eRegisterKindGeneric)
-            {
-                switch (num)
-                {
-                case LLDB_REGNUM_GENERIC_PC:    return gpr_rip;
-                case LLDB_REGNUM_GENERIC_SP:    return gpr_rsp;
-                case LLDB_REGNUM_GENERIC_FP:    return gpr_rbp;
-                case LLDB_REGNUM_GENERIC_FLAGS: return gpr_rflags;
-                case LLDB_REGNUM_GENERIC_RA:
-                default:
-                    return LLDB_INVALID_REGNUM;
-                }
-            }
-
-            if (kind == eRegisterKindGCC || kind == eRegisterKindDWARF)
-            {
-                switch (num)
-                {
-                case gcc_dwarf_gpr_rax:  return gpr_rax;
-                case gcc_dwarf_gpr_rdx:  return gpr_rdx;
-                case gcc_dwarf_gpr_rcx:  return gpr_rcx;
-                case gcc_dwarf_gpr_rbx:  return gpr_rbx;
-                case gcc_dwarf_gpr_rsi:  return gpr_rsi;
-                case gcc_dwarf_gpr_rdi:  return gpr_rdi;
-                case gcc_dwarf_gpr_rbp:  return gpr_rbp;
-                case gcc_dwarf_gpr_rsp:  return gpr_rsp;
-                case gcc_dwarf_gpr_r8:   return gpr_r8;
-                case gcc_dwarf_gpr_r9:   return gpr_r9;
-                case gcc_dwarf_gpr_r10:  return gpr_r10;
-                case gcc_dwarf_gpr_r11:  return gpr_r11;
-                case gcc_dwarf_gpr_r12:  return gpr_r12;
-                case gcc_dwarf_gpr_r13:  return gpr_r13;
-                case gcc_dwarf_gpr_r14:  return gpr_r14;
-                case gcc_dwarf_gpr_r15:  return gpr_r15;
-                case gcc_dwarf_gpr_rip:  return gpr_rip;
-                case gcc_dwarf_fpu_xmm0: return fpu_xmm0;
-                case gcc_dwarf_fpu_xmm1: return fpu_xmm1;
-                case gcc_dwarf_fpu_xmm2: return fpu_xmm2;
-                case gcc_dwarf_fpu_xmm3: return fpu_xmm3;
-                case gcc_dwarf_fpu_xmm4: return fpu_xmm4;
-                case gcc_dwarf_fpu_xmm5: return fpu_xmm5;
-                case gcc_dwarf_fpu_xmm6: return fpu_xmm6;
-                case gcc_dwarf_fpu_xmm7: return fpu_xmm7;
-                case gcc_dwarf_fpu_xmm8: return fpu_xmm8;
-                case gcc_dwarf_fpu_xmm9: return fpu_xmm9;
-                case gcc_dwarf_fpu_xmm10: return fpu_xmm10;
-                case gcc_dwarf_fpu_xmm11: return fpu_xmm11;
-                case gcc_dwarf_fpu_xmm12: return fpu_xmm12;
-                case gcc_dwarf_fpu_xmm13: return fpu_xmm13;
-                case gcc_dwarf_fpu_xmm14: return fpu_xmm14;
-                case gcc_dwarf_fpu_xmm15: return fpu_xmm15;
-                case gcc_dwarf_fpu_stmm0: return fpu_stmm0;
-                case gcc_dwarf_fpu_stmm1: return fpu_stmm1;
-                case gcc_dwarf_fpu_stmm2: return fpu_stmm2;
-                case gcc_dwarf_fpu_stmm3: return fpu_stmm3;
-                case gcc_dwarf_fpu_stmm4: return fpu_stmm4;
-                case gcc_dwarf_fpu_stmm5: return fpu_stmm5;
-                case gcc_dwarf_fpu_stmm6: return fpu_stmm6;
-                case gcc_dwarf_fpu_stmm7: return fpu_stmm7;
-                case gcc_dwarf_fpu_ymm0: return fpu_ymm0;
-                case gcc_dwarf_fpu_ymm1: return fpu_ymm1;
-                case gcc_dwarf_fpu_ymm2: return fpu_ymm2;
-                case gcc_dwarf_fpu_ymm3: return fpu_ymm3;
-                case gcc_dwarf_fpu_ymm4: return fpu_ymm4;
-                case gcc_dwarf_fpu_ymm5: return fpu_ymm5;
-                case gcc_dwarf_fpu_ymm6: return fpu_ymm6;
-                case gcc_dwarf_fpu_ymm7: return fpu_ymm7;
-                case gcc_dwarf_fpu_ymm8: return fpu_ymm8;
-                case gcc_dwarf_fpu_ymm9: return fpu_ymm9;
-                case gcc_dwarf_fpu_ymm10: return fpu_ymm10;
-                case gcc_dwarf_fpu_ymm11: return fpu_ymm11;
-                case gcc_dwarf_fpu_ymm12: return fpu_ymm12;
-                case gcc_dwarf_fpu_ymm13: return fpu_ymm13;
-                case gcc_dwarf_fpu_ymm14: return fpu_ymm14;
-                case gcc_dwarf_fpu_ymm15: return fpu_ymm15;
-                default:
-                    return LLDB_INVALID_REGNUM;
-                }
-            }
-
-            if (kind == eRegisterKindGDB)
-            {
-                switch (num)
-                {
-                case gdb_gpr_rax     : return gpr_rax;
-                case gdb_gpr_rbx     : return gpr_rbx;
-                case gdb_gpr_rcx     : return gpr_rcx;
-                case gdb_gpr_rdx     : return gpr_rdx;
-                case gdb_gpr_rsi     : return gpr_rsi;
-                case gdb_gpr_rdi     : return gpr_rdi;
-                case gdb_gpr_rbp     : return gpr_rbp;
-                case gdb_gpr_rsp     : return gpr_rsp;
-                case gdb_gpr_r8      : return gpr_r8;
-                case gdb_gpr_r9      : return gpr_r9;
-                case gdb_gpr_r10     : return gpr_r10;
-                case gdb_gpr_r11     : return gpr_r11;
-                case gdb_gpr_r12     : return gpr_r12;
-                case gdb_gpr_r13     : return gpr_r13;
-                case gdb_gpr_r14     : return gpr_r14;
-                case gdb_gpr_r15     : return gpr_r15;
-                case gdb_gpr_rip     : return gpr_rip;
-                case gdb_gpr_rflags  : return gpr_rflags;
-                case gdb_gpr_cs      : return gpr_cs;
-                case gdb_gpr_ss      : return gpr_ss;
-                case gdb_gpr_ds      : return gpr_ds;
-                case gdb_gpr_es      : return gpr_es;
-                case gdb_gpr_fs      : return gpr_fs;
-                case gdb_gpr_gs      : return gpr_gs;
-                case gdb_fpu_stmm0   : return fpu_stmm0;
-                case gdb_fpu_stmm1   : return fpu_stmm1;
-                case gdb_fpu_stmm2   : return fpu_stmm2;
-                case gdb_fpu_stmm3   : return fpu_stmm3;
-                case gdb_fpu_stmm4   : return fpu_stmm4;
-                case gdb_fpu_stmm5   : return fpu_stmm5;
-                case gdb_fpu_stmm6   : return fpu_stmm6;
-                case gdb_fpu_stmm7   : return fpu_stmm7;
-                case gdb_fpu_fcw     : return fpu_fcw;
-                case gdb_fpu_fsw     : return fpu_fsw;
-                case gdb_fpu_ftw     : return fpu_ftw;
-                case gdb_fpu_cs_64   : return fpu_cs;
-                case gdb_fpu_ip      : return fpu_ip;
-                case gdb_fpu_ds_64   : return fpu_ds;
-                case gdb_fpu_dp      : return fpu_dp;
-                case gdb_fpu_fop     : return fpu_fop;
-                case gdb_fpu_xmm0    : return fpu_xmm0;
-                case gdb_fpu_xmm1    : return fpu_xmm1;
-                case gdb_fpu_xmm2    : return fpu_xmm2;
-                case gdb_fpu_xmm3    : return fpu_xmm3;
-                case gdb_fpu_xmm4    : return fpu_xmm4;
-                case gdb_fpu_xmm5    : return fpu_xmm5;
-                case gdb_fpu_xmm6    : return fpu_xmm6;
-                case gdb_fpu_xmm7    : return fpu_xmm7;
-                case gdb_fpu_xmm8    : return fpu_xmm8;
-                case gdb_fpu_xmm9    : return fpu_xmm9;
-                case gdb_fpu_xmm10   : return fpu_xmm10;
-                case gdb_fpu_xmm11   : return fpu_xmm11;
-                case gdb_fpu_xmm12   : return fpu_xmm12;
-                case gdb_fpu_xmm13   : return fpu_xmm13;
-                case gdb_fpu_xmm14   : return fpu_xmm14;
-                case gdb_fpu_xmm15   : return fpu_xmm15;
-                case gdb_fpu_mxcsr   : return fpu_mxcsr;
-                case gdb_fpu_ymm0    : return fpu_ymm0;
-                case gdb_fpu_ymm1    : return fpu_ymm1;
-                case gdb_fpu_ymm2    : return fpu_ymm2;
-                case gdb_fpu_ymm3    : return fpu_ymm3;
-                case gdb_fpu_ymm4    : return fpu_ymm4;
-                case gdb_fpu_ymm5    : return fpu_ymm5;
-                case gdb_fpu_ymm6    : return fpu_ymm6;
-                case gdb_fpu_ymm7    : return fpu_ymm7;
-                case gdb_fpu_ymm8    : return fpu_ymm8;
-                case gdb_fpu_ymm9    : return fpu_ymm9;
-                case gdb_fpu_ymm10   : return fpu_ymm10;
-                case gdb_fpu_ymm11   : return fpu_ymm11;
-                case gdb_fpu_ymm12   : return fpu_ymm12;
-                case gdb_fpu_ymm13   : return fpu_ymm13;
-                case gdb_fpu_ymm14   : return fpu_ymm14;
-                case gdb_fpu_ymm15   : return fpu_ymm15;
-                default:
-                    return LLDB_INVALID_REGNUM;
-                }
-            }
-            else if (kind == eRegisterKindLLDB)
-            {
-                return num;
-            }
-        }
-        }
-    }
-
-    return LLDB_INVALID_REGNUM;
-}
-
-uint32_t
-RegisterContext_x86_64::NumSupportedHardwareWatchpoints()
-{
-    // Available debug address registers: dr0, dr1, dr2, dr3
-    return 4;
-}
-
-bool
-RegisterContext_x86_64::IsWatchpointVacant(uint32_t hw_index)
-{
-    bool is_vacant = false;
-    RegisterValue value;
-
-    assert(hw_index < NumSupportedHardwareWatchpoints());
-
-    if (m_watchpoints_initialized == false)
-    {
-        // Reset the debug status and debug control registers
-        RegisterValue zero_bits = RegisterValue(uint64_t(0));
-        if (!WriteRegister(dr6, zero_bits) || !WriteRegister(dr7, zero_bits))
-            assert(false && "Could not initialize watchpoint registers");
-        m_watchpoints_initialized = true;
-    }
-
-    if (ReadRegister(dr7, value))
-    {
-        uint64_t val = value.GetAsUInt64();
-        is_vacant = (val & (3 << 2*hw_index)) == 0;
-    }
-
-    return is_vacant;
-}
-
-static uint32_t
-size_and_rw_bits(size_t size, bool read, bool write)
-{
-    uint32_t rw;
-    if (read) {
-        rw = 0x3; // READ or READ/WRITE
-    } else if (write) {
-        rw = 0x1; // WRITE
-    } else {
-        assert(0 && "read and write cannot both be false");
-    }
-
-    switch (size) {
-    case 1:
-        return rw;
-    case 2:
-        return (0x1 << 2) | rw;
-    case 4:
-        return (0x3 << 2) | rw;
-    case 8:
-        return (0x2 << 2) | rw;
-    default:
-        assert(0 && "invalid size, must be one of 1, 2, 4, or 8");
-    }
-}
-
-uint32_t
-RegisterContext_x86_64::SetHardwareWatchpoint(addr_t addr, size_t size,
-                                              bool read, bool write)
-{
-    const uint32_t num_hw_watchpoints = NumSupportedHardwareWatchpoints();
-    uint32_t hw_index;
-
-    for (hw_index = 0; hw_index < num_hw_watchpoints; ++hw_index)
-    {
-        if (IsWatchpointVacant(hw_index))
-            return SetHardwareWatchpointWithIndex(addr, size,
-                                                  read, write,
-                                                  hw_index);
-    }
-
-    return LLDB_INVALID_INDEX32;
-}
-
-bool
-RegisterContext_x86_64::SetHardwareWatchpointWithIndex(addr_t addr, size_t size,
-                                                       bool read, bool write,
-                                                       uint32_t hw_index)
-{
-    const uint32_t num_hw_watchpoints = NumSupportedHardwareWatchpoints();
-
-    if (num_hw_watchpoints == 0 || hw_index >= num_hw_watchpoints)
-        return false;
-
-    if (!(size == 1 || size == 2 || size == 4 || size == 8))
-        return false;
-
-    if (read == false && write == false)
-        return false;
-
-    if (!IsWatchpointVacant(hw_index))
-        return false;
-
-    // Set both dr7 (debug control register) and dri (debug address register).
-
-    // dr7{7-0} encodes the local/gloabl enable bits:
-    //  global enable --. .-- local enable
-    //                  | |
-    //                  v v
-    //      dr0 -> bits{1-0}
-    //      dr1 -> bits{3-2}
-    //      dr2 -> bits{5-4}
-    //      dr3 -> bits{7-6}
-    //
-    // dr7{31-16} encodes the rw/len bits:
-    //  b_x+3, b_x+2, b_x+1, b_x
-    //      where bits{x+1, x} => rw
-    //            0b00: execute, 0b01: write, 0b11: read-or-write,
-    //            0b10: io read-or-write (unused)
-    //      and bits{x+3, x+2} => len
-    //            0b00: 1-byte, 0b01: 2-byte, 0b11: 4-byte, 0b10: 8-byte
-    //
-    //      dr0 -> bits{19-16}
-    //      dr1 -> bits{23-20}
-    //      dr2 -> bits{27-24}
-    //      dr3 -> bits{31-28}
-    if (hw_index < num_hw_watchpoints)
-    {
-        RegisterValue current_dr7_bits;
-
-        if (ReadRegister(dr7, current_dr7_bits))
-        {
-            uint64_t new_dr7_bits = current_dr7_bits.GetAsUInt64() |
-                                    (1 << (2*hw_index) |
-                                    size_and_rw_bits(size, read, write) <<
-                                    (16+4*hw_index));
-
-            if (WriteRegister(dr0 + hw_index, RegisterValue(addr)) &&
-                WriteRegister(dr7, RegisterValue(new_dr7_bits)))
-                return true;
-        }
-    }
-
-    return false;
-}
-
-bool
-RegisterContext_x86_64::ClearHardwareWatchpoint(uint32_t hw_index)
-{
-    if (hw_index < NumSupportedHardwareWatchpoints())
-    {
-        RegisterValue current_dr7_bits;
-
-        if (ReadRegister(dr7, current_dr7_bits))
-        {
-            uint64_t new_dr7_bits = current_dr7_bits.GetAsUInt64() & ~(3 << (2*hw_index));
-
-            if (WriteRegister(dr7, RegisterValue(new_dr7_bits)))
-                return true;
-        }
-    }
-
-    return false;
-}
-
-bool
-RegisterContext_x86_64::IsWatchpointHit(uint32_t hw_index)
-{
-    bool is_hit = false;
-
-    if (m_watchpoints_initialized == false)
-    {
-        // Reset the debug status and debug control registers
-        RegisterValue zero_bits = RegisterValue(uint64_t(0));
-        if (!WriteRegister(dr6, zero_bits) || !WriteRegister(dr7, zero_bits))
-            assert(false && "Could not initialize watchpoint registers");
-        m_watchpoints_initialized = true;
-    }
-
-    if (hw_index < NumSupportedHardwareWatchpoints())
-    {
-        RegisterValue value;
-
-        if (ReadRegister(dr6, value))
-        {
-            uint64_t val = value.GetAsUInt64();
-            is_hit = val & (1 << hw_index);
-        }
-    }
-
-    return is_hit;
-}
-
-addr_t
-RegisterContext_x86_64::GetWatchpointAddress(uint32_t hw_index)
-{
-    addr_t wp_monitor_addr = LLDB_INVALID_ADDRESS;
-
-    if (hw_index < NumSupportedHardwareWatchpoints())
-    {
-        if (!IsWatchpointVacant(hw_index))
-        {
-            RegisterValue value;
-
-            if (ReadRegister(dr0 + hw_index, value))
-                wp_monitor_addr = value.GetAsUInt64();
-        }
-    }
-
-    return wp_monitor_addr;
-}
-
-
-bool
-RegisterContext_x86_64::ClearWatchpointHits()
-{
-    return WriteRegister(dr6, RegisterValue((uint64_t)0));
-}
-
-bool
-RegisterContext_x86_64::HardwareSingleStep(bool enable)
-{
-    enum { TRACE_BIT = 0x100 };
-    uint64_t rflags;
-
-    if ((rflags = ReadRegisterAsUnsigned(gpr_rflags, -1UL)) == -1UL)
-        return false;
-    
-    if (enable)
-    {
-        if (rflags & TRACE_BIT)
-            return true;
-
-        rflags |= TRACE_BIT;
-    }
-    else
-    {
-        if (!(rflags & TRACE_BIT))
-            return false;
-
-        rflags &= ~TRACE_BIT;
-    }
-
-    return WriteRegisterFromUnsigned(gpr_rflags, rflags);
-}
-
-#if defined(__linux__) or defined(__FreeBSD__)
-
-ProcessMonitor &
-RegisterContext_x86_64::GetMonitor()
-{
-    ProcessSP base = CalculateProcess();
-    ProcessPOSIX *process = static_cast<ProcessPOSIX*>(base.get());
-    return process->GetMonitor();
-}
-
-bool
-RegisterContext_x86_64::ReadGPR()
-{
-     ProcessMonitor &monitor = GetMonitor();
-     return monitor.ReadGPR(m_thread.GetID(), &m_gpr, GetGPRSize());
-}
-
-bool
-RegisterContext_x86_64::ReadFPR()
-{
-    ProcessMonitor &monitor = GetMonitor();
-    if (m_fpr_type == eFXSAVE)
-        return monitor.ReadFPR(m_thread.GetID(), &m_fpr.xstate.fxsave, sizeof(m_fpr.xstate.fxsave));
-
-    if (m_fpr_type == eXSAVE)
-        return monitor.ReadRegisterSet(m_thread.GetID(), &m_iovec, sizeof(m_fpr.xstate.xsave), NT_X86_XSTATE);
-    return false;
-}
-
-bool
-RegisterContext_x86_64::WriteGPR()
-{
-    ProcessMonitor &monitor = GetMonitor();
-    return monitor.WriteGPR(m_thread.GetID(), &m_gpr, GetGPRSize());
-}
-
-bool
-RegisterContext_x86_64::WriteFPR()
-{
-    ProcessMonitor &monitor = GetMonitor();
-    if (m_fpr_type == eFXSAVE)
-        return monitor.WriteFPR(m_thread.GetID(), &m_fpr.xstate.fxsave, sizeof(m_fpr.xstate.fxsave));
-
-    if (m_fpr_type == eXSAVE)
-        return monitor.WriteRegisterSet(m_thread.GetID(), &m_iovec, sizeof(m_fpr.xstate.xsave), NT_X86_XSTATE);
-    return false;
-}
-
-bool
-RegisterContext_x86_64::ReadRegister(const unsigned reg,
-                                     RegisterValue &value)
-{
-    ProcessMonitor &monitor = GetMonitor();
-    return monitor.ReadRegisterValue(m_thread.GetID(),
-                                     GetRegisterOffset(reg),
-                                     GetRegisterName(reg),
-                                     GetRegisterSize(reg),
-                                     value);
-}
-
-bool
-RegisterContext_x86_64::WriteRegister(const unsigned reg,
-                                      const RegisterValue &value)
-{
-    ProcessMonitor &monitor = GetMonitor();
-    return monitor.WriteRegisterValue(m_thread.GetID(),
-                                      GetRegisterOffset(reg),
-                                      GetRegisterName(reg),
-                                      value);
-}
-
-#else
-
-bool
-RegisterContext_x86_64::ReadGPR()
-{
-    llvm_unreachable("not implemented");
-    return false;
-}
-
-bool
-RegisterContext_x86_64::ReadFPR()
-{
-    llvm_unreachable("not implemented");
-    return false;
-}
-
-bool
-RegisterContext_x86_64::WriteGPR()
-{
-    llvm_unreachable("not implemented");
-    return false;
-}
-
-bool
-RegisterContext_x86_64::WriteFPR()
-{
-    llvm_unreachable("not implemented");
-    return false;
-}
-
-bool
-RegisterContext_x86_64::ReadRegister(const unsigned reg,
-                                     RegisterValue &value)
-{
-    llvm_unreachable("not implemented");
-    return false;
-}
-
-bool
-RegisterContext_x86_64::WriteRegister(const unsigned reg,
-                                      const RegisterValue &value)
-{
-    llvm_unreachable("not implemented");
-    return false;
-}
-
-#endif
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86_64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86_64.h
deleted file mode 100644
index 9d59bd78e54..00000000000
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterContext_x86_64.h
+++ /dev/null
@@ -1,347 +0,0 @@
-//===-- RegisterContext_x86_64.h ---------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef liblldb_RegisterContext_x86_64_H_
-#define liblldb_RegisterContext_x86_64_H_
-
-#include "lldb/Core/Log.h"
-#include "RegisterContextPOSIX.h"
-
-class ProcessMonitor;
-
-// Internal codes for all x86_64 registers.
-enum
-{
-    k_first_gpr,
-    gpr_rax = k_first_gpr,
-    gpr_rbx,
-    gpr_rcx,
-    gpr_rdx,
-    gpr_rdi,
-    gpr_rsi,
-    gpr_rbp,
-    gpr_rsp,
-    gpr_r8,
-    gpr_r9,
-    gpr_r10,
-    gpr_r11,
-    gpr_r12,
-    gpr_r13,
-    gpr_r14,
-    gpr_r15,
-    gpr_rip,
-    gpr_rflags,
-    gpr_cs,
-    gpr_fs,
-    gpr_gs,
-    gpr_ss,
-    gpr_ds,
-    gpr_es,
-    k_first_i386,
-    gpr_eax = k_first_i386,
-    gpr_ebx,
-    gpr_ecx,
-    gpr_edx,
-    gpr_edi,
-    gpr_esi,
-    gpr_ebp,
-    gpr_esp,
-    gpr_eip,
-    gpr_eflags, // eRegisterKindLLDB == 33
-    k_last_i386 = gpr_eflags,
-    k_last_gpr = gpr_eflags,
-
-    k_first_fpr,
-    fpu_fcw = k_first_fpr,
-    fpu_fsw,
-    fpu_ftw,
-    fpu_fop,
-    fpu_ip,
-    fpu_cs,
-    fpu_dp,
-    fpu_ds,
-    fpu_mxcsr,
-    fpu_mxcsrmask,
-    fpu_stmm0,
-    fpu_stmm1,
-    fpu_stmm2,
-    fpu_stmm3,
-    fpu_stmm4,
-    fpu_stmm5,
-    fpu_stmm6,
-    fpu_stmm7,
-    fpu_xmm0,
-    fpu_xmm1,
-    fpu_xmm2,
-    fpu_xmm3,
-    fpu_xmm4,
-    fpu_xmm5,
-    fpu_xmm6,
-    fpu_xmm7,
-    fpu_xmm8,
-    fpu_xmm9,
-    fpu_xmm10,
-    fpu_xmm11,
-    fpu_xmm12,
-    fpu_xmm13,
-    fpu_xmm14,
-    fpu_xmm15,
-    k_last_fpr = fpu_xmm15,
-    k_first_avx,
-    fpu_ymm0 = k_first_avx,
-    fpu_ymm1,
-    fpu_ymm2,
-    fpu_ymm3,
-    fpu_ymm4,
-    fpu_ymm5,
-    fpu_ymm6,
-    fpu_ymm7,
-    fpu_ymm8,
-    fpu_ymm9,
-    fpu_ymm10,
-    fpu_ymm11,
-    fpu_ymm12,
-    fpu_ymm13,
-    fpu_ymm14,
-    fpu_ymm15,
-    k_last_avx = fpu_ymm15,
-
-    dr0,
-    dr1,
-    dr2,
-    dr3,
-    dr4,
-    dr5,
-    dr6,
-    dr7,
-
-    k_num_registers,
-    k_num_gpr_registers = k_last_gpr - k_first_gpr + 1,
-    k_num_fpr_registers = k_last_fpr - k_first_fpr + 1,
-    k_num_avx_registers = k_last_avx - k_first_avx + 1
-};
-
-class RegisterContext_x86_64
-  : public RegisterContextPOSIX
-{
-public:
-    RegisterContext_x86_64 (lldb_private::Thread &thread,
-                            uint32_t concrete_frame_idx);
-
-    ~RegisterContext_x86_64();
-
-    void
-    Invalidate();
-
-    void
-    InvalidateAllRegisters();
-
-    size_t
-    GetRegisterCount();
-
-    virtual size_t
-    GetGPRSize() = 0;
-
-    virtual unsigned
-    GetRegisterSize(unsigned reg);
-
-    virtual unsigned
-    GetRegisterOffset(unsigned reg);
-
-    const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex(size_t reg);
-
-    size_t
-    GetRegisterSetCount();
-
-    const lldb_private::RegisterSet *
-    GetRegisterSet(size_t set);
-
-    unsigned
-    GetRegisterIndexFromOffset(unsigned offset);
-
-    const char *
-    GetRegisterName(unsigned reg);
-
-    virtual bool
-    ReadRegister(const lldb_private::RegisterInfo *reg_info,
-                 lldb_private::RegisterValue &value);
-
-    bool
-    ReadAllRegisterValues(lldb::DataBufferSP &data_sp);
-
-    virtual bool
-    WriteRegister(const lldb_private::RegisterInfo *reg_info,
-                  const lldb_private::RegisterValue &value);
-
-    bool
-    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp);
-
-    uint32_t
-    ConvertRegisterKindToRegisterNumber(uint32_t kind, uint32_t num);
-
-    uint32_t
-    NumSupportedHardwareWatchpoints();
-
-    uint32_t
-    SetHardwareWatchpoint(lldb::addr_t, size_t size, bool read, bool write);
-
-    bool
-    SetHardwareWatchpointWithIndex(lldb::addr_t, size_t size, bool read,
-                                   bool write, uint32_t hw_index);
-
-    bool
-    ClearHardwareWatchpoint(uint32_t hw_index);
-
-    bool
-    HardwareSingleStep(bool enable);
-
-    bool
-    UpdateAfterBreakpoint();
-
-    bool
-    IsWatchpointVacant(uint32_t hw_index);
-
-    bool
-    IsWatchpointHit (uint32_t hw_index);
-
-    lldb::addr_t
-    GetWatchpointAddress (uint32_t hw_index);
-
-    bool
-    ClearWatchpointHits();
-
-    //---------------------------------------------------------------------------
-    // Generic floating-point registers
-    //---------------------------------------------------------------------------
-
-    struct MMSReg
-    {
-        uint8_t bytes[10];
-        uint8_t pad[6];
-    };
-
-    struct XMMReg
-    {
-        uint8_t bytes[16]; // 128-bits for each XMM register
-    };
-
-    struct FXSAVE
-    {
-        uint16_t fcw;
-        uint16_t fsw;
-        uint16_t ftw;
-        uint16_t fop;
-        uint64_t ip;
-        uint64_t dp;
-        uint32_t mxcsr;
-        uint32_t mxcsrmask;
-        MMSReg   stmm[8];
-        XMMReg   xmm[16];
-        uint32_t padding[24];
-    };
-
-    //---------------------------------------------------------------------------
-    // Extended floating-point registers
-    //---------------------------------------------------------------------------
-    struct YMMHReg
-    {
-        uint8_t  bytes[16];     // 16 * 8 bits for the high bytes of each YMM register
-    };
-
-    struct YMMReg
-    {
-        uint8_t  bytes[32];     // 16 * 16 bits for each YMM register
-    };
-
-    struct YMM
-    {
-        YMMReg   ymm[16];       // assembled from ymmh and xmm registers
-    };
-
-    struct XSAVE_HDR
-    {
-        uint64_t  xstate_bv;    // OS enabled xstate mask to determine the extended states supported by the processor
-        uint64_t  reserved1[2];
-        uint64_t  reserved2[5];
-    } __attribute__((packed));
-
-    // x86 extensions to FXSAVE (i.e. for AVX processors) 
-    struct XSAVE 
-    {
-        FXSAVE    i387;         // floating point registers typical in i387_fxsave_struct
-        XSAVE_HDR header;       // The xsave_hdr_struct can be used to determine if the following extensions are usable
-        YMMHReg   ymmh[16];     // High 16 bytes of each of 16 YMM registers (the low bytes are in FXSAVE.xmm for compatibility with SSE)
-        // Slot any extensions to the register file here
-    } __attribute__((packed, aligned (64)));
-
-    struct IOVEC
-    {
-        void    *iov_base;      // pointer to XSAVE
-        size_t   iov_len;       // sizeof(XSAVE)
-    };
-
-    //---------------------------------------------------------------------------
-    // Note: prefer kernel definitions over user-land
-    //---------------------------------------------------------------------------
-    enum FPRType
-    {
-        eNotValid = 0,
-        eFSAVE,  // TODO
-        eFXSAVE,
-        eSOFT,   // TODO
-        eXSAVE
-    };
-
-    // Floating-point registers
-    struct FPR
-    {
-        // Thread state for the floating-point unit of the processor read by ptrace.
-        union XSTATE {
-            FXSAVE   fxsave;    // Generic floating-point registers.
-            XSAVE    xsave;     // x86 extended processor state.
-        } xstate;
-    };
-
-protected:
-    // Determines if an extended register set is supported on the processor running the inferior process.
-    virtual bool
-    IsRegisterSetAvailable(size_t set_index);
-
-    virtual const lldb_private::RegisterInfo *
-    GetRegisterInfo();
-
-    virtual bool
-    ReadRegister(const unsigned reg, lldb_private::RegisterValue &value);
-
-    virtual bool
-    WriteRegister(const unsigned reg, const lldb_private::RegisterValue &value);
-
-private:
-    uint64_t m_gpr[k_num_gpr_registers]; // general purpose registers.
-    FPRType  m_fpr_type;                 // determines the type of data stored by union FPR, if any.
-    FPR      m_fpr;                      // floating-point registers including extended register sets.
-    IOVEC    m_iovec;                    // wrapper for xsave.
-    YMM      m_ymm_set;                  // copy of ymmh and xmm register halves.
-
-    ProcessMonitor &GetMonitor();
-    lldb::ByteOrder GetByteOrder();
-
-    bool CopyXSTATEtoYMM(uint32_t reg, lldb::ByteOrder byte_order);
-    bool CopyYMMtoXSTATE(uint32_t reg, lldb::ByteOrder byte_order);
-    bool IsFPR(unsigned reg, FPRType fpr_type);
-
-    bool ReadGPR();
-    bool ReadFPR();
-
-    bool WriteGPR();
-    bool WriteFPR();
-};
-
-#endif // #ifndef liblldb_RegisterContext_x86_64_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_i386.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_i386.h
new file mode 100644
index 00000000000..7c516568cd6
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_i386.h
@@ -0,0 +1,207 @@
+//===-- RegisterInfos_i386.h -----------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+#include "llvm/Support/Compiler.h"
+
+#ifdef DECLARE_REGISTER_INFOS_I386_STRUCT
+
+// Computes the offset of the given GPR in the user data area.
+#define GPR_OFFSET(regname) \
+    (LLVM_EXTENSION offsetof(GPR, regname))
+
+// Computes the offset of the given FPR in the extended data area.
+#define FPR_OFFSET(regname)  \
+    (LLVM_EXTENSION offsetof(FPR, xstate) + \
+     LLVM_EXTENSION offsetof(FXSAVE, regname))
+
+// Computes the offset of the YMM register assembled from register halves.
+#define YMM_OFFSET(regname) \
+    (LLVM_EXTENSION offsetof(YMM, regname))
+
+// Number of bytes needed to represent a FPR.
+#define FPR_SIZE(reg) sizeof(((FXSAVE*)NULL)->reg)
+
+// Number of bytes needed to represent the i'th FP register.
+#define FP_SIZE sizeof(((MMSReg*)NULL)->bytes)
+
+// Number of bytes needed to represent an XMM register.
+#define XMM_SIZE sizeof(XMMReg)
+
+// Number of bytes needed to represent a YMM register.
+#define YMM_SIZE sizeof(YMMReg)
+
+// Note that the size and offset will be updated by platform-specific classes.
+#define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4)            \
+    { #reg, alt, sizeof(GPR::reg), GPR_OFFSET(reg), eEncodingUint,  \
+      eFormatHex, { kind1, kind2, kind3, kind4, gpr_##reg##_i386 }, NULL, NULL }
+
+#define DEFINE_FPR(name, reg, kind1, kind2, kind3, kind4)           \
+    { #name, NULL, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint,   \
+      eFormatHex, { kind1, kind2, kind3, kind4, fpu_##name##_i386 }, NULL, NULL }
+
+// RegisterKind: GCC, DWARF, Generic, GDB, LLDB
+
+#define DEFINE_FP_ST(reg, i)                                       \
+    { #reg#i, NULL, FP_SIZE, LLVM_EXTENSION FPR_OFFSET(stmm[i]),    \
+      eEncodingVector, eFormatVectorOfUInt8,                       \
+      { gcc_st##i##_i386, dwarf_st##i##_i386, LLDB_INVALID_REGNUM, gdb_st##i##_i386, fpu_st##i##_i386 }, \
+      NULL, NULL }
+
+#define DEFINE_FP_MM(reg, i)                                                \
+    { #reg#i, NULL, sizeof(uint64_t), LLVM_EXTENSION FPR_OFFSET(stmm[i]),   \
+      eEncodingUint, eFormatHex,                                            \
+      { gcc_mm##i##_i386, dwarf_mm##i##_i386, LLDB_INVALID_REGNUM, gdb_mm##i##_i386, fpu_mm##i##_i386 }, \
+      NULL, NULL }
+
+#define DEFINE_XMM(reg, i)                                         \
+    { #reg#i, NULL, XMM_SIZE, LLVM_EXTENSION FPR_OFFSET(reg[i]),   \
+      eEncodingVector, eFormatVectorOfUInt8,                       \
+      { gcc_##reg##i##_i386, dwarf_##reg##i##_i386, LLDB_INVALID_REGNUM, gdb_##reg##i##_i386, fpu_##reg##i##_i386}, \
+      NULL, NULL }
+
+// I believe the YMM registers use dwarf_xmm_%_i386 register numbers and then differentiate based on register size.
+#define DEFINE_YMM(reg, i)                                         \
+    { #reg#i, NULL, YMM_SIZE, LLVM_EXTENSION YMM_OFFSET(reg[i]),   \
+      eEncodingVector, eFormatVectorOfUInt8,                       \
+      { LLDB_INVALID_REGNUM, dwarf_xmm##i##_i386, LLDB_INVALID_REGNUM, gdb_##reg##i##h_i386, fpu_##reg##i##_i386 }, \
+      NULL, NULL }
+
+#define DEFINE_DR(reg, i)                                               \
+    { #reg#i, NULL, DR_SIZE, DR_OFFSET(i), eEncodingUint, eFormatHex,   \
+      { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,  \
+        LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM }, NULL, NULL }
+
+#define DEFINE_GPR_PSEUDO_16(reg16, reg32)                  \
+    { #reg16, NULL, 2, GPR_OFFSET(reg32), eEncodingUint,    \
+      eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_##reg16##_i386 }, RegisterContextPOSIX_x86::g_contained_##reg32, RegisterContextPOSIX_x86::g_invalidate_##reg32 }
+#define DEFINE_GPR_PSEUDO_8H(reg8, reg32)                   \
+    { #reg8, NULL, 1, GPR_OFFSET(reg32)+1, eEncodingUint,   \
+      eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_##reg8##_i386 }, RegisterContextPOSIX_x86::g_contained_##reg32, RegisterContextPOSIX_x86::g_invalidate_##reg32 }
+#define DEFINE_GPR_PSEUDO_8L(reg8, reg32)                   \
+    { #reg8, NULL, 1, GPR_OFFSET(reg32), eEncodingUint,     \
+      eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_##reg8##_i386 }, RegisterContextPOSIX_x86::g_contained_##reg32, RegisterContextPOSIX_x86::g_invalidate_##reg32 }
+ 
+static RegisterInfo
+g_register_infos_i386[] =
+{
+    // General purpose registers.
+    DEFINE_GPR(eax,    NULL,    gcc_eax_i386,        dwarf_eax_i386,      LLDB_INVALID_REGNUM,       gdb_eax_i386),
+    DEFINE_GPR(ebx,    NULL,    gcc_ebx_i386,        dwarf_ebx_i386,      LLDB_INVALID_REGNUM,       gdb_ebx_i386),
+    DEFINE_GPR(ecx,    NULL,    gcc_ecx_i386,        dwarf_ecx_i386,      LLDB_INVALID_REGNUM,       gdb_ecx_i386),
+    DEFINE_GPR(edx,    NULL,    gcc_edx_i386,        dwarf_edx_i386,      LLDB_INVALID_REGNUM,       gdb_edx_i386),
+    DEFINE_GPR(edi,    NULL,    gcc_edi_i386,        dwarf_edi_i386,      LLDB_INVALID_REGNUM,       gdb_edi_i386),
+    DEFINE_GPR(esi,    NULL,    gcc_esi_i386,        dwarf_esi_i386,      LLDB_INVALID_REGNUM,       gdb_esi_i386),
+    DEFINE_GPR(ebp,    "fp",    gcc_ebp_i386,        dwarf_ebp_i386,      LLDB_REGNUM_GENERIC_FP,    gdb_ebp_i386),
+    DEFINE_GPR(esp,    "sp",    gcc_esp_i386,        dwarf_esp_i386,      LLDB_REGNUM_GENERIC_SP,    gdb_esp_i386),
+    DEFINE_GPR(eip,    "pc",    gcc_eip_i386,        dwarf_eip_i386,      LLDB_REGNUM_GENERIC_PC,    gdb_eip_i386),
+    DEFINE_GPR(eflags, "flags", gcc_eflags_i386,     dwarf_eflags_i386,   LLDB_REGNUM_GENERIC_FLAGS, gdb_eflags_i386),
+    DEFINE_GPR(cs,     NULL,    LLDB_INVALID_REGNUM, dwarf_cs_i386,       LLDB_INVALID_REGNUM,       gdb_cs_i386),
+    DEFINE_GPR(fs,     NULL,    LLDB_INVALID_REGNUM, dwarf_fs_i386,       LLDB_INVALID_REGNUM,       gdb_fs_i386),
+    DEFINE_GPR(gs,     NULL,    LLDB_INVALID_REGNUM, dwarf_gs_i386,       LLDB_INVALID_REGNUM,       gdb_gs_i386),
+    DEFINE_GPR(ss,     NULL,    LLDB_INVALID_REGNUM, dwarf_ss_i386,       LLDB_INVALID_REGNUM,       gdb_ss_i386),
+    DEFINE_GPR(ds,     NULL,    LLDB_INVALID_REGNUM, dwarf_ds_i386,       LLDB_INVALID_REGNUM,       gdb_ds_i386),
+    DEFINE_GPR(es,     NULL,    LLDB_INVALID_REGNUM, dwarf_es_i386,       LLDB_INVALID_REGNUM,       gdb_es_i386),
+
+    DEFINE_GPR_PSEUDO_16(ax,  eax),
+    DEFINE_GPR_PSEUDO_16(bx,  ebx),
+    DEFINE_GPR_PSEUDO_16(cx,  ecx),
+    DEFINE_GPR_PSEUDO_16(dx,  edx),
+    DEFINE_GPR_PSEUDO_16(di,  edi),
+    DEFINE_GPR_PSEUDO_16(si,  esi),
+    DEFINE_GPR_PSEUDO_16(bp,  ebp),
+    DEFINE_GPR_PSEUDO_16(sp,  esp),
+    DEFINE_GPR_PSEUDO_8H(ah,  eax),
+    DEFINE_GPR_PSEUDO_8H(bh,  ebx),
+    DEFINE_GPR_PSEUDO_8H(ch,  ecx),
+    DEFINE_GPR_PSEUDO_8H(dh,  edx),
+    DEFINE_GPR_PSEUDO_8L(al,  eax),
+    DEFINE_GPR_PSEUDO_8L(bl,  ebx),
+    DEFINE_GPR_PSEUDO_8L(cl,  ecx),
+    DEFINE_GPR_PSEUDO_8L(dl,  edx),
+
+    // i387 Floating point registers.
+    DEFINE_FPR(fctrl,     fctrl,          LLDB_INVALID_REGNUM, dwarf_fctrl_i386,    LLDB_INVALID_REGNUM, gdb_fctrl_i386),
+    DEFINE_FPR(fstat,     fstat,          LLDB_INVALID_REGNUM, dwarf_fstat_i386,    LLDB_INVALID_REGNUM, gdb_fstat_i386),
+    DEFINE_FPR(ftag,      ftag,           LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_ftag_i386),
+    DEFINE_FPR(fop,       fop,            LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fop_i386),
+    DEFINE_FPR(fiseg,     ptr.i386.fiseg, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fiseg_i386),
+    DEFINE_FPR(fioff,     ptr.i386.fioff, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fioff_i386),
+    DEFINE_FPR(foseg,     ptr.i386.foseg, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_foseg_i386),
+    DEFINE_FPR(fooff,     ptr.i386.fooff, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gdb_fooff_i386),
+    DEFINE_FPR(mxcsr,     mxcsr,          LLDB_INVALID_REGNUM, dwarf_mxcsr_i386,    LLDB_INVALID_REGNUM, gdb_mxcsr_i386),
+    DEFINE_FPR(mxcsrmask, mxcsrmask,      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM),
+
+    // FP registers.
+    DEFINE_FP_ST(st, 0),
+    DEFINE_FP_ST(st, 1),
+    DEFINE_FP_ST(st, 2),
+    DEFINE_FP_ST(st, 3),
+    DEFINE_FP_ST(st, 4),
+    DEFINE_FP_ST(st, 5),
+    DEFINE_FP_ST(st, 6),
+    DEFINE_FP_ST(st, 7),
+    DEFINE_FP_MM(mm, 0),
+    DEFINE_FP_MM(mm, 1),
+    DEFINE_FP_MM(mm, 2),
+    DEFINE_FP_MM(mm, 3),
+    DEFINE_FP_MM(mm, 4),
+    DEFINE_FP_MM(mm, 5),
+    DEFINE_FP_MM(mm, 6),
+    DEFINE_FP_MM(mm, 7),
+
+    // XMM registers
+    DEFINE_XMM(xmm, 0),
+    DEFINE_XMM(xmm, 1),
+    DEFINE_XMM(xmm, 2),
+    DEFINE_XMM(xmm, 3),
+    DEFINE_XMM(xmm, 4),
+    DEFINE_XMM(xmm, 5),
+    DEFINE_XMM(xmm, 6),
+    DEFINE_XMM(xmm, 7),
+
+    // Copy of YMM registers assembled from xmm and ymmh
+    DEFINE_YMM(ymm, 0),
+    DEFINE_YMM(ymm, 1),
+    DEFINE_YMM(ymm, 2),
+    DEFINE_YMM(ymm, 3),
+    DEFINE_YMM(ymm, 4),
+    DEFINE_YMM(ymm, 5),
+    DEFINE_YMM(ymm, 6),
+    DEFINE_YMM(ymm, 7),
+
+    // Debug registers for lldb internal use
+    DEFINE_DR(dr, 0),
+    DEFINE_DR(dr, 1),
+    DEFINE_DR(dr, 2),
+    DEFINE_DR(dr, 3),
+    DEFINE_DR(dr, 4),
+    DEFINE_DR(dr, 5),
+    DEFINE_DR(dr, 6),
+    DEFINE_DR(dr, 7)
+};
+static_assert((sizeof(g_register_infos_i386) / sizeof(g_register_infos_i386[0])) == k_num_registers_i386,
+    "g_register_infos_x86_64 has wrong number of register infos");
+
+#undef GPR_OFFSET
+#undef FPR_OFFSET
+#undef YMM_OFFSET
+#undef FPR_SIZE
+#undef FP_SIZE
+#undef XMM_SIZE
+#undef YMM_SIZE
+#undef DEFINE_GPR
+#undef DEFINE_FPR
+#undef DEFINE_FP
+#undef DEFINE_XMM
+#undef DEFINE_YMM
+#undef DEFINE_DR
+#undef DEFINE_GPR_PSEUDO_16
+#undef DEFINE_GPR_PSEUDO_8H
+#undef DEFINE_GPR_PSEUDO_8L
+
+#endif // DECLARE_REGISTER_INFOS_I386_STRUCT
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_mips64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_mips64.h
new file mode 100644
index 00000000000..13526e3680b
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_mips64.h
@@ -0,0 +1,74 @@
+//===-- RegisterInfos_mips64.h ---------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+
+// Computes the offset of the given GPR in the user data area.
+#define GPR_OFFSET(regname)                                                 \
+    (offsetof(GPR, regname))
+
+#ifdef DECLARE_REGISTER_INFOS_MIPS64_STRUCT
+
+// Note that the size and offset will be updated by platform-specific classes.
+#define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4)           \
+    { #reg, alt, sizeof(GPR::reg), GPR_OFFSET(reg), eEncodingUint, \
+      eFormatHex, { kind1, kind2, kind3, kind4, gpr_##reg##_mips64 }, NULL, NULL }
+
+static RegisterInfo
+g_register_infos_mips64[] =
+{
+    // General purpose registers.                 GCC,                  DWARF,              Generic,                GDB
+    DEFINE_GPR(zero,     "r0",  gcc_dwarf_zero_mips64,  gcc_dwarf_zero_mips64,  LLDB_INVALID_REGNUM,    gdb_zero_mips64),
+    DEFINE_GPR(r1,       NULL,  gcc_dwarf_r1_mips64,    gcc_dwarf_r1_mips64,    LLDB_INVALID_REGNUM,    gdb_r1_mips64),
+    DEFINE_GPR(r2,       NULL,  gcc_dwarf_r2_mips64,    gcc_dwarf_r2_mips64,    LLDB_INVALID_REGNUM,    gdb_r2_mips64),
+    DEFINE_GPR(r3,       NULL,  gcc_dwarf_r3_mips64,    gcc_dwarf_r3_mips64,    LLDB_INVALID_REGNUM,    gdb_r3_mips64),
+    DEFINE_GPR(r4,       NULL,  gcc_dwarf_r4_mips64,    gcc_dwarf_r4_mips64,    LLDB_INVALID_REGNUM,    gdb_r4_mips64),
+    DEFINE_GPR(r5,       NULL,  gcc_dwarf_r5_mips64,    gcc_dwarf_r5_mips64,    LLDB_INVALID_REGNUM,    gdb_r5_mips64),
+    DEFINE_GPR(r6,       NULL,  gcc_dwarf_r6_mips64,    gcc_dwarf_r6_mips64,    LLDB_INVALID_REGNUM,    gdb_r6_mips64),
+    DEFINE_GPR(r7,       NULL,  gcc_dwarf_r7_mips64,    gcc_dwarf_r7_mips64,    LLDB_INVALID_REGNUM,    gdb_r7_mips64),
+    DEFINE_GPR(r8,       NULL,  gcc_dwarf_r8_mips64,    gcc_dwarf_r8_mips64,    LLDB_INVALID_REGNUM,    gdb_r8_mips64),
+    DEFINE_GPR(r9,       NULL,  gcc_dwarf_r9_mips64,    gcc_dwarf_r9_mips64,    LLDB_INVALID_REGNUM,    gdb_r9_mips64),
+    DEFINE_GPR(r10,      NULL,  gcc_dwarf_r10_mips64,   gcc_dwarf_r10_mips64,   LLDB_INVALID_REGNUM,    gdb_r10_mips64),
+    DEFINE_GPR(r11,      NULL,  gcc_dwarf_r11_mips64,   gcc_dwarf_r11_mips64,   LLDB_INVALID_REGNUM,    gdb_r11_mips64),
+    DEFINE_GPR(r12,      NULL,  gcc_dwarf_r12_mips64,   gcc_dwarf_r12_mips64,   LLDB_INVALID_REGNUM,    gdb_r12_mips64),
+    DEFINE_GPR(r13,      NULL,  gcc_dwarf_r13_mips64,   gcc_dwarf_r13_mips64,   LLDB_INVALID_REGNUM,    gdb_r13_mips64),
+    DEFINE_GPR(r14,      NULL,  gcc_dwarf_r14_mips64,   gcc_dwarf_r14_mips64,   LLDB_INVALID_REGNUM,    gdb_r14_mips64),
+    DEFINE_GPR(r15,      NULL,  gcc_dwarf_r15_mips64,   gcc_dwarf_r15_mips64,   LLDB_INVALID_REGNUM,    gdb_r15_mips64),
+    DEFINE_GPR(r16,      NULL,  gcc_dwarf_r16_mips64,   gcc_dwarf_r16_mips64,   LLDB_INVALID_REGNUM,    gdb_r16_mips64),
+    DEFINE_GPR(r17,      NULL,  gcc_dwarf_r17_mips64,   gcc_dwarf_r17_mips64,   LLDB_INVALID_REGNUM,    gdb_r17_mips64),
+    DEFINE_GPR(r18,      NULL,  gcc_dwarf_r18_mips64,   gcc_dwarf_r18_mips64,   LLDB_INVALID_REGNUM,    gdb_r18_mips64),
+    DEFINE_GPR(r19,      NULL,  gcc_dwarf_r19_mips64,   gcc_dwarf_r19_mips64,   LLDB_INVALID_REGNUM,    gdb_r19_mips64),
+    DEFINE_GPR(r20,      NULL,  gcc_dwarf_r20_mips64,   gcc_dwarf_r20_mips64,   LLDB_INVALID_REGNUM,    gdb_r20_mips64),
+    DEFINE_GPR(r21,      NULL,  gcc_dwarf_r21_mips64,   gcc_dwarf_r21_mips64,   LLDB_INVALID_REGNUM,    gdb_r21_mips64),
+    DEFINE_GPR(r22,      NULL,  gcc_dwarf_r22_mips64,   gcc_dwarf_r22_mips64,   LLDB_INVALID_REGNUM,    gdb_r22_mips64),
+    DEFINE_GPR(r23,      NULL,  gcc_dwarf_r23_mips64,   gcc_dwarf_r23_mips64,   LLDB_INVALID_REGNUM,    gdb_r23_mips64),
+    DEFINE_GPR(r24,      NULL,  gcc_dwarf_r24_mips64,   gcc_dwarf_r24_mips64,   LLDB_INVALID_REGNUM,    gdb_r24_mips64),
+    DEFINE_GPR(r25,      NULL,  gcc_dwarf_r25_mips64,   gcc_dwarf_r25_mips64,   LLDB_INVALID_REGNUM,    gdb_r25_mips64),
+    DEFINE_GPR(r26,      NULL,  gcc_dwarf_r26_mips64,   gcc_dwarf_r26_mips64,   LLDB_INVALID_REGNUM,    gdb_r26_mips64),
+    DEFINE_GPR(r27,      NULL,  gcc_dwarf_r27_mips64,   gcc_dwarf_r27_mips64,   LLDB_INVALID_REGNUM,    gdb_r27_mips64),
+    DEFINE_GPR(gp,       "r28", gcc_dwarf_gp_mips64,    gcc_dwarf_gp_mips64,    LLDB_INVALID_REGNUM,    gdb_gp_mips64),
+    DEFINE_GPR(sp,       "r29", gcc_dwarf_sp_mips64,    gcc_dwarf_sp_mips64,    LLDB_REGNUM_GENERIC_SP, gdb_sp_mips64),
+    DEFINE_GPR(r30,      NULL,  gcc_dwarf_r30_mips64,   gcc_dwarf_r30_mips64,   LLDB_INVALID_REGNUM,    gdb_r30_mips64),
+    DEFINE_GPR(ra,       "r31", gcc_dwarf_ra_mips64,    gcc_dwarf_ra_mips64,    LLDB_INVALID_REGNUM,    gdb_ra_mips64),
+    DEFINE_GPR(sr,       NULL,  gcc_dwarf_sr_mips64,    gcc_dwarf_sr_mips64,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM),
+    DEFINE_GPR(mullo,    NULL,  gcc_dwarf_lo_mips64,    gcc_dwarf_lo_mips64,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM),
+    DEFINE_GPR(mulhi,    NULL,  gcc_dwarf_hi_mips64,    gcc_dwarf_hi_mips64,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM),
+    DEFINE_GPR(badvaddr, NULL,  gcc_dwarf_bad_mips64,   gcc_dwarf_bad_mips64,   LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM),
+    DEFINE_GPR(cause,    NULL,  gcc_dwarf_cause_mips64, gcc_dwarf_cause_mips64, LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM),
+    DEFINE_GPR(pc,       "pc",  gcc_dwarf_pc_mips64,    gcc_dwarf_pc_mips64,    LLDB_REGNUM_GENERIC_PC, LLDB_INVALID_REGNUM),
+    DEFINE_GPR(ic,       NULL,  gcc_dwarf_ic_mips64,    gcc_dwarf_ic_mips64,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM),
+    DEFINE_GPR(dummy,    NULL,  gcc_dwarf_dummy_mips64, gcc_dwarf_dummy_mips64, LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM),
+};
+static_assert((sizeof(g_register_infos_mips64) / sizeof(g_register_infos_mips64[0])) == k_num_registers_mips64,
+    "g_register_infos_mips64 has wrong number of register infos");
+
+#undef DEFINE_GPR
+
+#endif // DECLARE_REGISTER_INFOS_MIPS64_STRUCT
+
+#undef GPR_OFFSET
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h
new file mode 100644
index 00000000000..86abdba68db
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/POSIX/RegisterInfos_x86_64.h
@@ -0,0 +1,409 @@
+//===-- RegisterInfos_x86_64.h ---------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+#include "llvm/Support/Compiler.h"
+
+// Computes the offset of the given GPR in the user data area.
+#define GPR_OFFSET(regname) \
+    (LLVM_EXTENSION offsetof(GPR, regname))
+
+// Computes the offset of the given FPR in the extended data area.
+#define FPR_OFFSET(regname) \
+    (LLVM_EXTENSION offsetof(FPR, xstate) + \
+     LLVM_EXTENSION offsetof(FXSAVE, regname))
+
+// Computes the offset of the YMM register assembled from register halves.
+#define YMM_OFFSET(regname) \
+    (LLVM_EXTENSION offsetof(YMM, regname))
+
+#ifdef DECLARE_REGISTER_INFOS_X86_64_STRUCT
+
+// Number of bytes needed to represent a FPR.
+#define FPR_SIZE(reg) sizeof(((FXSAVE*)NULL)->reg)
+
+// Number of bytes needed to represent the i'th FP register.
+#define FP_SIZE sizeof(((MMSReg*)NULL)->bytes)
+
+// Number of bytes needed to represent an XMM register.
+#define XMM_SIZE sizeof(XMMReg)
+
+// Number of bytes needed to represent a YMM register.
+#define YMM_SIZE sizeof(YMMReg)
+
+// RegisterKind: GCC, DWARF, Generic, GDB, LLDB
+
+// Note that the size and offset will be updated by platform-specific classes.
+#define DEFINE_GPR(reg, alt, kind1, kind2, kind3, kind4)    \
+    { #reg, alt, sizeof(GPR::reg), GPR_OFFSET(reg), eEncodingUint, \
+      eFormatHex, { kind1, kind2, kind3, kind4, gpr_##reg##_x86_64 }, NULL, NULL }
+
+#define DEFINE_FPR(name, reg, kind1, kind2, kind3, kind4)    \
+    { #name, NULL, FPR_SIZE(reg), FPR_OFFSET(reg), eEncodingUint,   \
+      eFormatHex, { kind1, kind2, kind3, kind4, fpu_##name##_x86_64 }, NULL, NULL }
+
+#define DEFINE_FP_ST(reg, i)                                       \
+    { #reg#i, NULL, FP_SIZE, LLVM_EXTENSION FPR_OFFSET(stmm[i]),   \
+      eEncodingVector, eFormatVectorOfUInt8,                       \
+      { gcc_dwarf_st##i##_x86_64, gcc_dwarf_st##i##_x86_64, LLDB_INVALID_REGNUM, gdb_st##i##_x86_64, fpu_st##i##_x86_64 }, \
+      NULL, NULL }
+
+#define DEFINE_FP_MM(reg, i)                                                \
+    { #reg#i, NULL, sizeof(uint64_t), LLVM_EXTENSION FPR_OFFSET(stmm[i]),   \
+      eEncodingUint, eFormatHex,                                            \
+      { gcc_dwarf_mm##i##_x86_64, gcc_dwarf_mm##i##_x86_64, LLDB_INVALID_REGNUM, gdb_st##i##_x86_64, fpu_mm##i##_x86_64 }, \
+      NULL, NULL }
+
+#define DEFINE_XMM(reg, i)                                         \
+    { #reg#i, NULL, XMM_SIZE, LLVM_EXTENSION FPR_OFFSET(reg[i]),   \
+      eEncodingVector, eFormatVectorOfUInt8,                       \
+      { gcc_dwarf_##reg##i##_x86_64, gcc_dwarf_##reg##i##_x86_64, LLDB_INVALID_REGNUM, gdb_##reg##i##_x86_64, fpu_##reg##i##_x86_64}, \
+      NULL, NULL }
+
+#define DEFINE_YMM(reg, i)                                                          \
+    { #reg#i, NULL, YMM_SIZE, LLVM_EXTENSION YMM_OFFSET(reg[i]),                    \
+      eEncodingVector, eFormatVectorOfUInt8,                                        \
+      { gcc_dwarf_##reg##i##h_x86_64, gcc_dwarf_##reg##i##h_x86_64, LLDB_INVALID_REGNUM, gdb_##reg##i##h_x86_64, fpu_##reg##i##_x86_64 }, \
+      NULL, NULL }
+
+#define DEFINE_DR(reg, i)                                               \
+    { #reg#i, NULL, DR_SIZE, DR_OFFSET(i), eEncodingUint, eFormatHex,   \
+      { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM,  \
+      LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM }, NULL, NULL }
+
+#define DEFINE_GPR_PSEUDO_32(reg32, reg64)          \
+    { #reg32, NULL, 4, GPR_OFFSET(reg64), eEncodingUint,   \
+      eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_##reg32##_x86_64 }, RegisterContextPOSIX_x86::g_contained_##reg64, RegisterContextPOSIX_x86::g_invalidate_##reg64 }
+#define DEFINE_GPR_PSEUDO_16(reg16, reg64)          \
+    { #reg16, NULL, 2, GPR_OFFSET(reg64), eEncodingUint,   \
+      eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_##reg16##_x86_64 }, RegisterContextPOSIX_x86::g_contained_##reg64, RegisterContextPOSIX_x86::g_invalidate_##reg64 }
+#define DEFINE_GPR_PSEUDO_8H(reg8, reg64)           \
+    { #reg8, NULL, 1, GPR_OFFSET(reg64)+1, eEncodingUint,  \
+      eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_##reg8##_x86_64 }, RegisterContextPOSIX_x86::g_contained_##reg64, RegisterContextPOSIX_x86::g_invalidate_##reg64 }
+#define DEFINE_GPR_PSEUDO_8L(reg8, reg64)           \
+    { #reg8, NULL, 1, GPR_OFFSET(reg64), eEncodingUint,    \
+      eFormatHex, { LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM, gpr_##reg8##_x86_64 }, RegisterContextPOSIX_x86::g_contained_##reg64, RegisterContextPOSIX_x86::g_invalidate_##reg64 }
+
+static RegisterInfo
+g_register_infos_x86_64[] =
+{
+    // General purpose registers.                GCC,                   DWARF,                Generic,                  GDB
+    DEFINE_GPR(rax,    NULL,    gcc_dwarf_rax_x86_64,    gcc_dwarf_rax_x86_64,    LLDB_INVALID_REGNUM,       gdb_rax_x86_64),
+    DEFINE_GPR(rbx,    NULL,    gcc_dwarf_rbx_x86_64,    gcc_dwarf_rbx_x86_64,    LLDB_INVALID_REGNUM,       gdb_rbx_x86_64),
+    DEFINE_GPR(rcx,    "arg4",  gcc_dwarf_rcx_x86_64,    gcc_dwarf_rcx_x86_64,    LLDB_REGNUM_GENERIC_ARG4,  gdb_rcx_x86_64),
+    DEFINE_GPR(rdx,    "arg3",  gcc_dwarf_rdx_x86_64,    gcc_dwarf_rdx_x86_64,    LLDB_REGNUM_GENERIC_ARG3,  gdb_rdx_x86_64),
+    DEFINE_GPR(rdi,    "arg1",  gcc_dwarf_rdi_x86_64,    gcc_dwarf_rdi_x86_64,    LLDB_REGNUM_GENERIC_ARG1,  gdb_rdi_x86_64),
+    DEFINE_GPR(rsi,    "arg2",  gcc_dwarf_rsi_x86_64,    gcc_dwarf_rsi_x86_64,    LLDB_REGNUM_GENERIC_ARG2,  gdb_rsi_x86_64),
+    DEFINE_GPR(rbp,    "fp",    gcc_dwarf_rbp_x86_64,    gcc_dwarf_rbp_x86_64,    LLDB_REGNUM_GENERIC_FP,    gdb_rbp_x86_64),
+    DEFINE_GPR(rsp,    "sp",    gcc_dwarf_rsp_x86_64,    gcc_dwarf_rsp_x86_64,    LLDB_REGNUM_GENERIC_SP,    gdb_rsp_x86_64),
+    DEFINE_GPR(r8,     "arg5",  gcc_dwarf_r8_x86_64,     gcc_dwarf_r8_x86_64,     LLDB_REGNUM_GENERIC_ARG5,  gdb_r8_x86_64),
+    DEFINE_GPR(r9,     "arg6",  gcc_dwarf_r9_x86_64,     gcc_dwarf_r9_x86_64,     LLDB_REGNUM_GENERIC_ARG6,  gdb_r9_x86_64),
+    DEFINE_GPR(r10,    NULL,    gcc_dwarf_r10_x86_64,    gcc_dwarf_r10_x86_64,    LLDB_INVALID_REGNUM,       gdb_r10_x86_64),
+    DEFINE_GPR(r11,    NULL,    gcc_dwarf_r11_x86_64,    gcc_dwarf_r11_x86_64,    LLDB_INVALID_REGNUM,       gdb_r11_x86_64),
+    DEFINE_GPR(r12,    NULL,    gcc_dwarf_r12_x86_64,    gcc_dwarf_r12_x86_64,    LLDB_INVALID_REGNUM,       gdb_r12_x86_64),
+    DEFINE_GPR(r13,    NULL,    gcc_dwarf_r13_x86_64,    gcc_dwarf_r13_x86_64,    LLDB_INVALID_REGNUM,       gdb_r13_x86_64),
+    DEFINE_GPR(r14,    NULL,    gcc_dwarf_r14_x86_64,    gcc_dwarf_r14_x86_64,    LLDB_INVALID_REGNUM,       gdb_r14_x86_64),
+    DEFINE_GPR(r15,    NULL,    gcc_dwarf_r15_x86_64,    gcc_dwarf_r15_x86_64,    LLDB_INVALID_REGNUM,       gdb_r15_x86_64),
+    DEFINE_GPR(rip,    "pc",    gcc_dwarf_rip_x86_64,    gcc_dwarf_rip_x86_64,    LLDB_REGNUM_GENERIC_PC,    gdb_rip_x86_64),
+    DEFINE_GPR(rflags, "flags", gcc_dwarf_rflags_x86_64, gcc_dwarf_rflags_x86_64, LLDB_REGNUM_GENERIC_FLAGS, gdb_rflags_x86_64),
+    DEFINE_GPR(cs,     NULL,    gcc_dwarf_cs_x86_64,     gcc_dwarf_cs_x86_64,     LLDB_INVALID_REGNUM,       gdb_cs_x86_64),
+    DEFINE_GPR(fs,     NULL,    gcc_dwarf_fs_x86_64,     gcc_dwarf_fs_x86_64,     LLDB_INVALID_REGNUM,       gdb_fs_x86_64),
+    DEFINE_GPR(gs,     NULL,    gcc_dwarf_gs_x86_64,     gcc_dwarf_gs_x86_64,     LLDB_INVALID_REGNUM,       gdb_gs_x86_64),
+    DEFINE_GPR(ss,     NULL,    gcc_dwarf_ss_x86_64,     gcc_dwarf_ss_x86_64,     LLDB_INVALID_REGNUM,       gdb_ss_x86_64),
+    DEFINE_GPR(ds,     NULL,    gcc_dwarf_ds_x86_64,     gcc_dwarf_ds_x86_64,     LLDB_INVALID_REGNUM,       gdb_ds_x86_64),
+    DEFINE_GPR(es,     NULL,    gcc_dwarf_es_x86_64,     gcc_dwarf_es_x86_64,     LLDB_INVALID_REGNUM,       gdb_es_x86_64),
+
+    DEFINE_GPR_PSEUDO_32(eax, rax),
+    DEFINE_GPR_PSEUDO_32(ebx, rbx),
+    DEFINE_GPR_PSEUDO_32(ecx, rcx),
+    DEFINE_GPR_PSEUDO_32(edx, rdx),
+    DEFINE_GPR_PSEUDO_32(edi, rdi),
+    DEFINE_GPR_PSEUDO_32(esi, rsi),
+    DEFINE_GPR_PSEUDO_32(ebp, rbp),
+    DEFINE_GPR_PSEUDO_32(esp, rsp),
+    DEFINE_GPR_PSEUDO_32(r8d,  r8),
+    DEFINE_GPR_PSEUDO_32(r9d,  r9),
+    DEFINE_GPR_PSEUDO_32(r10d, r10),
+    DEFINE_GPR_PSEUDO_32(r11d, r11),
+    DEFINE_GPR_PSEUDO_32(r12d, r12),
+    DEFINE_GPR_PSEUDO_32(r13d, r13),
+    DEFINE_GPR_PSEUDO_32(r14d, r14),
+    DEFINE_GPR_PSEUDO_32(r15d, r15),
+    DEFINE_GPR_PSEUDO_16(ax,   rax),
+    DEFINE_GPR_PSEUDO_16(bx,   rbx),
+    DEFINE_GPR_PSEUDO_16(cx,   rcx),
+    DEFINE_GPR_PSEUDO_16(dx,   rdx),
+    DEFINE_GPR_PSEUDO_16(di,   rdi),
+    DEFINE_GPR_PSEUDO_16(si,   rsi),
+    DEFINE_GPR_PSEUDO_16(bp,   rbp),
+    DEFINE_GPR_PSEUDO_16(sp,   rsp),
+    DEFINE_GPR_PSEUDO_16(r8w,  r8),
+    DEFINE_GPR_PSEUDO_16(r9w,  r9),
+    DEFINE_GPR_PSEUDO_16(r10w, r10),
+    DEFINE_GPR_PSEUDO_16(r11w, r11),
+    DEFINE_GPR_PSEUDO_16(r12w, r12),
+    DEFINE_GPR_PSEUDO_16(r13w, r13),
+    DEFINE_GPR_PSEUDO_16(r14w, r14),
+    DEFINE_GPR_PSEUDO_16(r15w, r15),
+    DEFINE_GPR_PSEUDO_8H(ah,   rax),
+    DEFINE_GPR_PSEUDO_8H(bh,   rbx),
+    DEFINE_GPR_PSEUDO_8H(ch,   rcx),
+    DEFINE_GPR_PSEUDO_8H(dh,   rdx),
+    DEFINE_GPR_PSEUDO_8L(al,   rax),
+    DEFINE_GPR_PSEUDO_8L(bl,   rbx),
+    DEFINE_GPR_PSEUDO_8L(cl,   rcx),
+    DEFINE_GPR_PSEUDO_8L(dl,   rdx),
+    DEFINE_GPR_PSEUDO_8L(dil,  rdi),
+    DEFINE_GPR_PSEUDO_8L(sil,  rsi),
+    DEFINE_GPR_PSEUDO_8L(bpl,  rbp),
+    DEFINE_GPR_PSEUDO_8L(spl,  rsp),
+    DEFINE_GPR_PSEUDO_8L(r8l,  r8),
+    DEFINE_GPR_PSEUDO_8L(r9l,  r9),
+    DEFINE_GPR_PSEUDO_8L(r10l, r10),
+    DEFINE_GPR_PSEUDO_8L(r11l, r11),
+    DEFINE_GPR_PSEUDO_8L(r12l, r12),
+    DEFINE_GPR_PSEUDO_8L(r13l, r13),
+    DEFINE_GPR_PSEUDO_8L(r14l, r14),
+    DEFINE_GPR_PSEUDO_8L(r15l, r15),
+
+    // i387 Floating point registers.     GCC,                                   DWARF,               Generic,            GDB
+    DEFINE_FPR(fctrl,     fctrl,          gcc_dwarf_fctrl_x86_64, gcc_dwarf_fctrl_x86_64, LLDB_INVALID_REGNUM, gdb_fctrl_x86_64),
+    DEFINE_FPR(fstat,     fstat,          gcc_dwarf_fstat_x86_64, gcc_dwarf_fstat_x86_64, LLDB_INVALID_REGNUM, gdb_fstat_x86_64),
+    DEFINE_FPR(ftag,      ftag,           LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM, gdb_ftag_x86_64),
+    DEFINE_FPR(fop,       fop,            LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM, gdb_fop_x86_64),
+    DEFINE_FPR(fiseg,     ptr.i386.fiseg, LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM, gdb_fiseg_x86_64),
+    DEFINE_FPR(fioff,     ptr.i386.fioff, LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM, gdb_fioff_x86_64),
+    DEFINE_FPR(foseg,     ptr.i386.foseg, LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM, gdb_foseg_x86_64),
+    DEFINE_FPR(fooff,     ptr.i386.fooff, LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM, gdb_fooff_x86_64),
+    DEFINE_FPR(mxcsr,     mxcsr,          gcc_dwarf_mxcsr_x86_64, gcc_dwarf_mxcsr_x86_64, LLDB_INVALID_REGNUM, gdb_mxcsr_x86_64),
+    DEFINE_FPR(mxcsrmask, mxcsrmask,      LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM,    LLDB_INVALID_REGNUM, LLDB_INVALID_REGNUM),
+
+    // FP registers.
+    DEFINE_FP_ST(st, 0),
+    DEFINE_FP_ST(st, 1),
+    DEFINE_FP_ST(st, 2),
+    DEFINE_FP_ST(st, 3),
+    DEFINE_FP_ST(st, 4),
+    DEFINE_FP_ST(st, 5),
+    DEFINE_FP_ST(st, 6),
+    DEFINE_FP_ST(st, 7),
+    DEFINE_FP_MM(mm, 0),
+    DEFINE_FP_MM(mm, 1),
+    DEFINE_FP_MM(mm, 2),
+    DEFINE_FP_MM(mm, 3),
+    DEFINE_FP_MM(mm, 4),
+    DEFINE_FP_MM(mm, 5),
+    DEFINE_FP_MM(mm, 6),
+    DEFINE_FP_MM(mm, 7),
+
+    // XMM registers
+    DEFINE_XMM(xmm, 0),
+    DEFINE_XMM(xmm, 1),
+    DEFINE_XMM(xmm, 2),
+    DEFINE_XMM(xmm, 3),
+    DEFINE_XMM(xmm, 4),
+    DEFINE_XMM(xmm, 5),
+    DEFINE_XMM(xmm, 6),
+    DEFINE_XMM(xmm, 7),
+    DEFINE_XMM(xmm, 8),
+    DEFINE_XMM(xmm, 9),
+    DEFINE_XMM(xmm, 10),
+    DEFINE_XMM(xmm, 11),
+    DEFINE_XMM(xmm, 12),
+    DEFINE_XMM(xmm, 13),
+    DEFINE_XMM(xmm, 14),
+    DEFINE_XMM(xmm, 15),
+
+    // Copy of YMM registers assembled from xmm and ymmh
+    DEFINE_YMM(ymm, 0),
+    DEFINE_YMM(ymm, 1),
+    DEFINE_YMM(ymm, 2),
+    DEFINE_YMM(ymm, 3),
+    DEFINE_YMM(ymm, 4),
+    DEFINE_YMM(ymm, 5),
+    DEFINE_YMM(ymm, 6),
+    DEFINE_YMM(ymm, 7),
+    DEFINE_YMM(ymm, 8),
+    DEFINE_YMM(ymm, 9),
+    DEFINE_YMM(ymm, 10),
+    DEFINE_YMM(ymm, 11),
+    DEFINE_YMM(ymm, 12),
+    DEFINE_YMM(ymm, 13),
+    DEFINE_YMM(ymm, 14),
+    DEFINE_YMM(ymm, 15),
+
+    // Debug registers for lldb internal use
+    DEFINE_DR(dr, 0),
+    DEFINE_DR(dr, 1),
+    DEFINE_DR(dr, 2),
+    DEFINE_DR(dr, 3),
+    DEFINE_DR(dr, 4),
+    DEFINE_DR(dr, 5),
+    DEFINE_DR(dr, 6),
+    DEFINE_DR(dr, 7)
+};
+static_assert((sizeof(g_register_infos_x86_64) / sizeof(g_register_infos_x86_64[0])) == k_num_registers_x86_64,
+    "g_register_infos_x86_64 has wrong number of register infos");
+
+#undef FPR_SIZE
+#undef FP_SIZE
+#undef XMM_SIZE
+#undef YMM_SIZE
+#undef DEFINE_GPR
+#undef DEFINE_FPR
+#undef DEFINE_FP
+#undef DEFINE_XMM
+#undef DEFINE_YMM
+#undef DEFINE_DR
+#undef DEFINE_GPR_PSEUDO_32
+#undef DEFINE_GPR_PSEUDO_16
+#undef DEFINE_GPR_PSEUDO_8H
+#undef DEFINE_GPR_PSEUDO_8L
+
+#endif // DECLARE_REGISTER_INFOS_X86_64_STRUCT
+
+
+#ifdef UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS
+
+#define UPDATE_GPR_INFO(reg, reg64)                                             \
+do {                                                                            \
+    g_register_infos[gpr_##reg##_i386].byte_offset = GPR_OFFSET(reg64);         \
+} while(false);
+
+#define UPDATE_GPR_INFO_8H(reg, reg64)                                          \
+do {                                                                            \
+    g_register_infos[gpr_##reg##_i386].byte_offset = GPR_OFFSET(reg64) + 1;     \
+} while(false);
+
+#define UPDATE_FPR_INFO(reg, reg64)                                             \
+do {                                                                            \
+    g_register_infos[fpu_##reg##_i386].byte_offset = FPR_OFFSET(reg64);         \
+} while(false);
+
+#define UPDATE_FP_INFO(reg, i)                                                  \
+do {                                                                            \
+    g_register_infos[fpu_##reg##i##_i386].byte_offset = FPR_OFFSET(stmm[i]);    \
+} while(false);
+
+#define UPDATE_XMM_INFO(reg, i)                                                 \
+do {                                                                            \
+    g_register_infos[fpu_##reg##i##_i386].byte_offset = FPR_OFFSET(reg[i]);     \
+} while(false);
+
+#define UPDATE_YMM_INFO(reg, i)                                                 \
+do {                                                                            \
+    g_register_infos[fpu_##reg##i##_i386].byte_offset = YMM_OFFSET(reg[i]);     \
+} while(false);
+
+#define UPDATE_DR_INFO(reg_index)                                               \
+do {                                                                            \
+    g_register_infos[dr##reg_index##_i386].byte_offset = DR_OFFSET(reg_index);  \
+} while(false);
+
+    // Update the register offsets
+    UPDATE_GPR_INFO(eax,    rax);
+    UPDATE_GPR_INFO(ebx,    rbx);
+    UPDATE_GPR_INFO(ecx,    rcx);
+    UPDATE_GPR_INFO(edx,    rdx);
+    UPDATE_GPR_INFO(edi,    rdi);
+    UPDATE_GPR_INFO(esi,    rsi);
+    UPDATE_GPR_INFO(ebp,    rbp);
+    UPDATE_GPR_INFO(esp,    rsp);
+    UPDATE_GPR_INFO(eip,    rip);
+    UPDATE_GPR_INFO(eflags, rflags);
+    UPDATE_GPR_INFO(cs,     cs);
+    UPDATE_GPR_INFO(fs,     fs);
+    UPDATE_GPR_INFO(gs,     gs);
+    UPDATE_GPR_INFO(ss,     ss);
+    UPDATE_GPR_INFO(ds,     ds);
+    UPDATE_GPR_INFO(es,     es);
+
+    UPDATE_GPR_INFO(ax,     rax);
+    UPDATE_GPR_INFO(bx,     rbx);
+    UPDATE_GPR_INFO(cx,     rcx);
+    UPDATE_GPR_INFO(dx,     rdx);
+    UPDATE_GPR_INFO(di,     rdi);
+    UPDATE_GPR_INFO(si,     rsi);
+    UPDATE_GPR_INFO(bp,     rbp);
+    UPDATE_GPR_INFO(sp,     rsp);
+    UPDATE_GPR_INFO_8H(ah,  rax);
+    UPDATE_GPR_INFO_8H(bh,  rbx);
+    UPDATE_GPR_INFO_8H(ch,  rcx);
+    UPDATE_GPR_INFO_8H(dh,  rdx);
+    UPDATE_GPR_INFO(al,     rax);
+    UPDATE_GPR_INFO(bl,     rbx);
+    UPDATE_GPR_INFO(cl,     rcx);
+    UPDATE_GPR_INFO(dl,     rdx);
+
+    UPDATE_FPR_INFO(fctrl,     fctrl);
+    UPDATE_FPR_INFO(fstat,     fstat);
+    UPDATE_FPR_INFO(ftag,      ftag);
+    UPDATE_FPR_INFO(fop,       fop);
+    UPDATE_FPR_INFO(fiseg,     ptr.i386.fiseg);
+    UPDATE_FPR_INFO(fioff,     ptr.i386.fioff);
+    UPDATE_FPR_INFO(fooff,     ptr.i386.fooff);
+    UPDATE_FPR_INFO(foseg,     ptr.i386.foseg);
+    UPDATE_FPR_INFO(mxcsr,     mxcsr);
+    UPDATE_FPR_INFO(mxcsrmask, mxcsrmask);
+
+    UPDATE_FP_INFO(st, 0);
+    UPDATE_FP_INFO(st, 1);
+    UPDATE_FP_INFO(st, 2);
+    UPDATE_FP_INFO(st, 3);
+    UPDATE_FP_INFO(st, 4);
+    UPDATE_FP_INFO(st, 5);
+    UPDATE_FP_INFO(st, 6);
+    UPDATE_FP_INFO(st, 7);
+    UPDATE_FP_INFO(mm, 0);
+    UPDATE_FP_INFO(mm, 1);
+    UPDATE_FP_INFO(mm, 2);
+    UPDATE_FP_INFO(mm, 3);
+    UPDATE_FP_INFO(mm, 4);
+    UPDATE_FP_INFO(mm, 5);
+    UPDATE_FP_INFO(mm, 6);
+    UPDATE_FP_INFO(mm, 7);
+
+    UPDATE_XMM_INFO(xmm, 0);
+    UPDATE_XMM_INFO(xmm, 1);
+    UPDATE_XMM_INFO(xmm, 2);
+    UPDATE_XMM_INFO(xmm, 3);
+    UPDATE_XMM_INFO(xmm, 4);
+    UPDATE_XMM_INFO(xmm, 5);
+    UPDATE_XMM_INFO(xmm, 6);
+    UPDATE_XMM_INFO(xmm, 7);
+
+    UPDATE_YMM_INFO(ymm, 0);
+    UPDATE_YMM_INFO(ymm, 1);
+    UPDATE_YMM_INFO(ymm, 2);
+    UPDATE_YMM_INFO(ymm, 3);
+    UPDATE_YMM_INFO(ymm, 4);
+    UPDATE_YMM_INFO(ymm, 5);
+    UPDATE_YMM_INFO(ymm, 6);
+    UPDATE_YMM_INFO(ymm, 7);
+
+    UPDATE_DR_INFO(0);
+    UPDATE_DR_INFO(1);
+    UPDATE_DR_INFO(2);
+    UPDATE_DR_INFO(3);
+    UPDATE_DR_INFO(4);
+    UPDATE_DR_INFO(5);
+    UPDATE_DR_INFO(6);
+    UPDATE_DR_INFO(7);
+
+#undef UPDATE_GPR_INFO
+#undef UPDATE_GPR_INFO_8H
+#undef UPDATE_FPR_INFO
+#undef UPDATE_FP_INFO
+#undef UPDATE_XMM_INFO
+#undef UPDATE_YMM_INFO
+#undef UPDATE_DR_INFO
+
+#endif // UPDATE_REGISTER_INFOS_I386_STRUCT_WITH_X86_64_OFFSETS
+
+#undef GPR_OFFSET
+#undef FPR_OFFSET
+#undef YMM_OFFSET
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.cpp
index 0c95d66cef9..dc90b7ae02c 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.cpp
@@ -16,6 +16,9 @@
 // Other libraries and framework includes
 // Project includes
 #include "lldb/Interpreter/Args.h"
+#include "lldb/Core/RegularExpression.h"
+#include "lldb/Core/StreamFile.h"
+#include "lldb/DataFormatters/FormatManager.h"
 
 #ifndef LLDB_DISABLE_PYTHON
 #include "lldb/Interpreter/PythonDataObjects.h"
@@ -29,18 +32,24 @@ DynamicRegisterInfo::DynamicRegisterInfo () :
     m_sets (),
     m_set_reg_nums (),
     m_set_names (),
-    m_reg_data_byte_size (0)
+    m_value_regs_map (),
+    m_invalidate_regs_map (),
+    m_reg_data_byte_size (0),
+    m_finalized (false)
 {
 }
 
-DynamicRegisterInfo::DynamicRegisterInfo (const lldb_private::PythonDictionary &dict) :
+DynamicRegisterInfo::DynamicRegisterInfo (const lldb_private::PythonDictionary &dict, ByteOrder byte_order) :
     m_regs (),
     m_sets (),
     m_set_reg_nums (),
     m_set_names (),
-    m_reg_data_byte_size (0)
+    m_value_regs_map (),
+    m_invalidate_regs_map (),
+    m_reg_data_byte_size (0),
+    m_finalized (false)
 {
-    SetRegisterInfo (dict);
+    SetRegisterInfo (dict, byte_order);
 }
 
 DynamicRegisterInfo::~DynamicRegisterInfo ()
@@ -49,8 +58,10 @@ DynamicRegisterInfo::~DynamicRegisterInfo ()
 
 
 size_t
-DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDictionary &dict)
+DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDictionary &dict,
+                                      ByteOrder byte_order)
 {
+    assert(!m_finalized);
 #ifndef LLDB_DISABLE_PYTHON
     PythonList sets (dict.GetItemForKey("sets"));
     if (sets)
@@ -89,6 +100,12 @@ DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDictionary &dict
         PythonString gcc_pystr("gcc");
         PythonString dwarf_pystr("dwarf");
         PythonString generic_pystr("generic");
+        PythonString slice_pystr("slice");
+        PythonString composite_pystr("composite");
+        PythonString invalidate_regs_pystr("invalidate-regs");
+        
+//        typedef std::map<std::string, std::vector<std::string> > InvalidateNameMap;
+//        InvalidateNameMap invalidate_map;
         for (uint32_t i=0; i<num_regs; ++i)
         {
             PythonDictionary reg_info_dict(regs.GetItemAtIndex(i));
@@ -96,6 +113,8 @@ DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDictionary &dict
             {
                 // { 'name':'rcx'       , 'bitsize' :  64, 'offset' :  16, 'encoding':'uint'  , 'format':'hex'         , 'set': 0, 'gcc' : 2, 'dwarf' : 2, 'generic':'arg4', 'alt-name':'arg4', },
                 RegisterInfo reg_info;
+                std::vector<uint32_t> value_regs;
+                std::vector<uint32_t> invalidate_regs;
                 bzero (&reg_info, sizeof(reg_info));
                 
                 reg_info.name = ConstString (reg_info_dict.GetItemForKeyAsString(name_pystr)).GetCString();
@@ -111,16 +130,177 @@ DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDictionary &dict
 
                 if (reg_info.byte_offset == UINT32_MAX)
                 {
-                    Clear();
-                    return 0;
+                    // No offset for this register, see if the register has a value expression
+                    // which indicates this register is part of another register. Value expressions
+                    // are things like "rax[31:0]" which state that the current register's value
+                    // is in a concrete register "rax" in bits 31:0. If there is a value expression
+                    // we can calculate the offset
+                    bool success = false;
+                    const char *slice_cstr = reg_info_dict.GetItemForKeyAsString(slice_pystr);
+                    if (slice_cstr)
+                    {
+                        // Slices use the following format:
+                        //  REGNAME[MSBIT:LSBIT]
+                        // REGNAME - name of the register to grab a slice of
+                        // MSBIT - the most significant bit at which the current register value starts at
+                        // LSBIT - the least significant bit at which the current register value ends at
+                        static RegularExpression g_bitfield_regex("([A-Za-z_][A-Za-z0-9_]*)\\[([0-9]+):([0-9]+)\\]");
+                        RegularExpression::Match regex_match(3);
+                        if (g_bitfield_regex.Execute(slice_cstr, &regex_match))
+                        {
+                            llvm::StringRef reg_name_str;
+                            std::string msbit_str;
+                            std::string lsbit_str;
+                            if (regex_match.GetMatchAtIndex(slice_cstr, 1, reg_name_str) &&
+                                regex_match.GetMatchAtIndex(slice_cstr, 2, msbit_str) &&
+                                regex_match.GetMatchAtIndex(slice_cstr, 3, lsbit_str))
+                            {
+                                const uint32_t msbit = Args::StringToUInt32(msbit_str.c_str(), UINT32_MAX);
+                                const uint32_t lsbit = Args::StringToUInt32(lsbit_str.c_str(), UINT32_MAX);
+                                if (msbit != UINT32_MAX && lsbit != UINT32_MAX)
+                                {
+                                    if (msbit > lsbit)
+                                    {
+                                        const uint32_t msbyte = msbit / 8;
+                                        const uint32_t lsbyte = lsbit / 8;
+
+                                        ConstString containing_reg_name(reg_name_str);
+                                        
+                                        RegisterInfo *containing_reg_info = GetRegisterInfo (containing_reg_name);
+                                        if (containing_reg_info)
+                                        {
+                                            const uint32_t max_bit = containing_reg_info->byte_size * 8;
+                                            if (msbit < max_bit && lsbit < max_bit)
+                                            {
+                                                m_invalidate_regs_map[containing_reg_info->kinds[eRegisterKindLLDB]].push_back(i);
+                                                m_value_regs_map[i].push_back(containing_reg_info->kinds[eRegisterKindLLDB]);
+                                                m_invalidate_regs_map[i].push_back(containing_reg_info->kinds[eRegisterKindLLDB]);
+                                                
+                                                if (byte_order == eByteOrderLittle)
+                                                {
+                                                    success = true;
+                                                    reg_info.byte_offset = containing_reg_info->byte_offset + lsbyte;
+                                                }
+                                                else if (byte_order == eByteOrderBig)
+                                                {
+                                                    success = true;
+                                                    reg_info.byte_offset = containing_reg_info->byte_offset + msbyte;
+                                                }
+                                                else
+                                                {
+                                                    assert(!"Invalid byte order");
+                                                }
+                                            }
+                                            else
+                                            {
+                                                if (msbit > max_bit)
+                                                    printf("error: msbit (%u) must be less than the bitsize of the register (%u)\n", msbit, max_bit);
+                                                else
+                                                    printf("error: lsbit (%u) must be less than the bitsize of the register (%u)\n", lsbit, max_bit);
+                                            }
+                                        }
+                                        else
+                                        {
+                                            printf("error: invalid concrete register \"%s\"\n", containing_reg_name.GetCString());
+                                        }
+                                    }
+                                    else
+                                    {
+                                        printf("error: msbit (%u) must be greater than lsbit (%u)\n", msbit, lsbit);
+                                    }
+                                }
+                                else
+                                {
+                                    printf("error: msbit (%u) and lsbit (%u) must be valid\n", msbit, lsbit);
+                                }
+                            }
+                            else
+                            {
+                                // TODO: print error invalid slice string that doesn't follow the format
+                                printf("error: failed to extract regex matches for parsing the register bitfield regex\n");
+
+                            }
+                        }
+                        else
+                        {
+                            // TODO: print error invalid slice string that doesn't follow the format
+                            printf("error: failed to match against register bitfield regex\n");
+                        }
+                    }
+                    else
+                    {
+                        PythonList composite_reg_list (reg_info_dict.GetItemForKey(composite_pystr));
+                        if (composite_reg_list)
+                        {
+                            const size_t num_composite_regs = composite_reg_list.GetSize();
+                            if (num_composite_regs > 0)
+                            {
+                                uint32_t composite_offset = UINT32_MAX;
+                                for (uint32_t composite_idx=0; composite_idx<num_composite_regs; ++composite_idx)
+                                {
+                                    PythonString composite_reg_name_pystr(composite_reg_list.GetItemAtIndex(composite_idx));
+                                    if (composite_reg_name_pystr)
+                                    {
+                                        ConstString composite_reg_name(composite_reg_name_pystr.GetString());
+                                        if (composite_reg_name)
+                                        {
+                                            RegisterInfo *composite_reg_info = GetRegisterInfo (composite_reg_name);
+                                            if (composite_reg_info)
+                                            {
+                                                if (composite_offset > composite_reg_info->byte_offset)
+                                                    composite_offset = composite_reg_info->byte_offset;
+                                                m_value_regs_map[i].push_back(composite_reg_info->kinds[eRegisterKindLLDB]);
+                                                m_invalidate_regs_map[composite_reg_info->kinds[eRegisterKindLLDB]].push_back(i);
+                                                m_invalidate_regs_map[i].push_back(composite_reg_info->kinds[eRegisterKindLLDB]);
+                                            }
+                                            else
+                                            {
+                                                // TODO: print error invalid slice string that doesn't follow the format
+                                                printf("error: failed to find composite register by name: \"%s\"\n", composite_reg_name.GetCString());
+                                            }
+                                        }
+                                        else
+                                        {
+                                            printf("error: 'composite' key contained an empty string\n");
+                                        }
+                                    }
+                                    else
+                                    {
+                                        printf("error: 'composite' list value wasn't a python string\n");
+                                    }
+                                }
+                                if (composite_offset != UINT32_MAX)
+                                {
+                                    reg_info.byte_offset = composite_offset;
+                                    success = m_value_regs_map.find(i) != m_value_regs_map.end();
+                                }
+                                else
+                                {
+                                    printf("error: 'composite' registers must specify at least one real register\n");
+                                }
+                            }
+                            else
+                            {
+                                printf("error: 'composite' list was empty\n");
+                            }
+                        }
+                    }
+                    
+                    
+                    if (!success)
+                    {
+                        Clear();
+                        return 0;
+                    }
                 }
-                reg_info.byte_size = reg_info_dict.GetItemForKeyAsInteger(bitsize_pystr, 0) / 8;
-                
-                if (reg_info.byte_size == 0)
+                const int64_t bitsize = reg_info_dict.GetItemForKeyAsInteger(bitsize_pystr, 0);
+                if (bitsize == 0)
                 {
                     Clear();
                     return 0;
                 }
+
+                reg_info.byte_size =  bitsize / 8;
                 
                 const char *format_cstr = reg_info_dict.GetItemForKeyAsString(format_pystr);
                 if (format_cstr)
@@ -132,13 +312,15 @@ DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDictionary &dict
                     }
                 }
                 else
-                    reg_info.format = eFormatHex;
-                    
+                {
+                    reg_info.format = (Format)reg_info_dict.GetItemForKeyAsInteger (format_pystr, eFormatHex);
+                }
+                
                 const char *encoding_cstr = reg_info_dict.GetItemForKeyAsString(encoding_pystr);
                 if (encoding_cstr)
                     reg_info.encoding = Args::StringToEncoding (encoding_cstr, eEncodingUint);
                 else
-                    reg_info.encoding = eEncodingUint;
+                    reg_info.encoding = (Encoding)reg_info_dict.GetItemForKeyAsInteger (encoding_pystr, eEncodingUint);
 
                 const int64_t set = reg_info_dict.GetItemForKeyAsInteger(set_pystr, -1);
                 if (set >= m_sets.size())
@@ -147,11 +329,75 @@ DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDictionary &dict
                     return 0;
                 }
 
+                // Fill in the register numbers
                 reg_info.kinds[lldb::eRegisterKindLLDB]    = i;
                 reg_info.kinds[lldb::eRegisterKindGDB]     = i;
                 reg_info.kinds[lldb::eRegisterKindGCC]     = reg_info_dict.GetItemForKeyAsInteger(gcc_pystr, LLDB_INVALID_REGNUM);
                 reg_info.kinds[lldb::eRegisterKindDWARF]   = reg_info_dict.GetItemForKeyAsInteger(dwarf_pystr, LLDB_INVALID_REGNUM);
-                reg_info.kinds[lldb::eRegisterKindGeneric] = Args::StringToGenericRegister (reg_info_dict.GetItemForKeyAsString(generic_pystr));
+                const char *generic_cstr = reg_info_dict.GetItemForKeyAsString(generic_pystr);
+                if (generic_cstr)
+                    reg_info.kinds[lldb::eRegisterKindGeneric] = Args::StringToGenericRegister (generic_cstr);
+                else
+                    reg_info.kinds[lldb::eRegisterKindGeneric] = reg_info_dict.GetItemForKeyAsInteger(generic_pystr, LLDB_INVALID_REGNUM);
+
+                // Check if this register invalidates any other register values when it is modified
+                PythonList invalidate_reg_list (reg_info_dict.GetItemForKey(invalidate_regs_pystr));
+                if (invalidate_reg_list)
+                {
+                    const size_t num_regs = invalidate_reg_list.GetSize();
+                    if (num_regs > 0)
+                    {
+                        for (uint32_t idx=0; idx<num_regs; ++idx)
+                        {
+                            PythonObject invalidate_reg_object (invalidate_reg_list.GetItemAtIndex(idx));
+                            PythonString invalidate_reg_name_pystr(invalidate_reg_object);
+                            if (invalidate_reg_name_pystr)
+                            {
+                                ConstString invalidate_reg_name(invalidate_reg_name_pystr.GetString());
+                                if (invalidate_reg_name)
+                                {
+                                    RegisterInfo *invalidate_reg_info = GetRegisterInfo (invalidate_reg_name);
+                                    if (invalidate_reg_info)
+                                    {
+                                        m_invalidate_regs_map[i].push_back(invalidate_reg_info->kinds[eRegisterKindLLDB]);
+                                    }
+                                    else
+                                    {
+                                        // TODO: print error invalid slice string that doesn't follow the format
+                                        printf("error: failed to find a 'invalidate-regs' register for \"%s\" while parsing register \"%s\"\n", invalidate_reg_name.GetCString(), reg_info.name);
+                                    }
+                                }
+                                else
+                                {
+                                    printf("error: 'invalidate-regs' list value was an empty string\n");
+                                }
+                            }
+                            else
+                            {
+                                PythonInteger invalidate_reg_num(invalidate_reg_object);
+
+                                if (invalidate_reg_num)
+                                {
+                                    const int64_t r = invalidate_reg_num.GetInteger();
+                                    if (r != UINT64_MAX)
+                                        m_invalidate_regs_map[i].push_back(r);
+                                    else
+                                        printf("error: 'invalidate-regs' list value wasn't a valid integer\n");
+                                }
+                                else
+                                {
+                                    printf("error: 'invalidate-regs' list value wasn't a python string or integer\n");
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        printf("error: 'invalidate-regs' contained an empty list\n");
+                    }
+                }
+
+                // Calculate the register offset
                 const size_t end_reg_offset = reg_info.byte_offset + reg_info.byte_size;
                 if (m_reg_data_byte_size < end_reg_offset)
                     m_reg_data_byte_size = end_reg_offset;
@@ -169,7 +415,7 @@ DynamicRegisterInfo::SetRegisterInfo (const lldb_private::PythonDictionary &dict
         Finalize ();
     }
 #endif
-    return 0;
+    return m_regs.size();
 }
 
 
@@ -179,10 +425,22 @@ DynamicRegisterInfo::AddRegister (RegisterInfo &reg_info,
                                   ConstString &reg_alt_name, 
                                   ConstString &set_name)
 {
+    assert(!m_finalized);
     const uint32_t reg_num = m_regs.size();
     reg_info.name = reg_name.AsCString();
     assert (reg_info.name);
     reg_info.alt_name = reg_alt_name.AsCString(NULL);
+    uint32_t i;
+    if (reg_info.value_regs)
+    {
+        for (i=0; reg_info.value_regs[i] != LLDB_INVALID_REGNUM; ++i)
+            m_value_regs_map[reg_num].push_back(reg_info.value_regs[i]);
+    }
+    if (reg_info.invalidate_regs)
+    {
+        for (i=0; reg_info.invalidate_regs[i] != LLDB_INVALID_REGNUM; ++i)
+            m_invalidate_regs_map[reg_num].push_back(reg_info.invalidate_regs[i]);
+    }
     m_regs.push_back (reg_info);
     uint32_t set = GetRegisterSetIndexByName (set_name, true);
     assert (set < m_sets.size());
@@ -197,12 +455,99 @@ DynamicRegisterInfo::AddRegister (RegisterInfo &reg_info,
 void
 DynamicRegisterInfo::Finalize ()
 {
-    for (uint32_t set = 0; set < m_sets.size(); ++set)
+    if (m_finalized)
+        return;
+    
+    m_finalized = true;
+    const size_t num_sets = m_sets.size();
+    for (size_t set = 0; set < num_sets; ++set)
     {
         assert (m_sets.size() == m_set_reg_nums.size());
         m_sets[set].num_registers = m_set_reg_nums[set].size();
         m_sets[set].registers = &m_set_reg_nums[set][0];
     }
+    
+    // sort and unique all value registers and make sure each is terminated with
+    // LLDB_INVALID_REGNUM
+    
+    for (reg_to_regs_map::iterator pos = m_value_regs_map.begin(), end = m_value_regs_map.end();
+         pos != end;
+         ++pos)
+    {
+        if (pos->second.size() > 1)
+        {
+            std::sort (pos->second.begin(), pos->second.end());
+            reg_num_collection::iterator unique_end = std::unique (pos->second.begin(), pos->second.end());
+            if (unique_end != pos->second.end())
+                pos->second.erase(unique_end, pos->second.end());
+        }
+        assert (!pos->second.empty());
+        if (pos->second.back() != LLDB_INVALID_REGNUM)
+            pos->second.push_back(LLDB_INVALID_REGNUM);
+    }
+    
+    // Now update all value_regs with each register info as needed
+    const size_t num_regs = m_regs.size();
+    for (size_t i=0; i<num_regs; ++i)
+    {
+        if (m_value_regs_map.find(i) != m_value_regs_map.end())
+            m_regs[i].value_regs = m_value_regs_map[i].data();
+        else
+            m_regs[i].value_regs = NULL;
+    }
+
+    // Expand all invalidation dependencies
+    for (reg_to_regs_map::iterator pos = m_invalidate_regs_map.begin(), end = m_invalidate_regs_map.end();
+         pos != end;
+         ++pos)
+    {
+        const uint32_t reg_num = pos->first;
+        
+        if (m_regs[reg_num].value_regs)
+        {
+            reg_num_collection extra_invalid_regs;
+            for (const uint32_t invalidate_reg_num : pos->second)
+            {
+                reg_to_regs_map::iterator invalidate_pos = m_invalidate_regs_map.find(invalidate_reg_num);
+                if (invalidate_pos != m_invalidate_regs_map.end())
+                {
+                    for (const uint32_t concrete_invalidate_reg_num : invalidate_pos->second)
+                    {
+                        if (concrete_invalidate_reg_num != reg_num)
+                            extra_invalid_regs.push_back(concrete_invalidate_reg_num);
+                    }
+                }
+            }
+            pos->second.insert(pos->second.end(), extra_invalid_regs.begin(), extra_invalid_regs.end());
+        }
+    }
+
+    // sort and unique all invalidate registers and make sure each is terminated with
+    // LLDB_INVALID_REGNUM
+    for (reg_to_regs_map::iterator pos = m_invalidate_regs_map.begin(), end = m_invalidate_regs_map.end();
+         pos != end;
+         ++pos)
+    {
+        if (pos->second.size() > 1)
+        {
+            std::sort (pos->second.begin(), pos->second.end());
+            reg_num_collection::iterator unique_end = std::unique (pos->second.begin(), pos->second.end());
+            if (unique_end != pos->second.end())
+                pos->second.erase(unique_end, pos->second.end());
+        }
+        assert (!pos->second.empty());
+        if (pos->second.back() != LLDB_INVALID_REGNUM)
+            pos->second.push_back(LLDB_INVALID_REGNUM);
+    }
+
+    // Now update all invalidate_regs with each register info as needed
+    for (size_t i=0; i<num_regs; ++i)
+    {
+        if (m_invalidate_regs_map.find(i) != m_invalidate_regs_map.end())
+            m_regs[i].invalidate_regs = m_invalidate_regs_map[i].data();
+        else
+            m_regs[i].invalidate_regs = NULL;
+    }
 }
 
 size_t
@@ -276,4 +621,83 @@ DynamicRegisterInfo::Clear()
     m_sets.clear();
     m_set_reg_nums.clear();
     m_set_names.clear();
+    m_value_regs_map.clear();
+    m_invalidate_regs_map.clear();
+    m_reg_data_byte_size = 0;
+    m_finalized = false;
+}
+
+void
+DynamicRegisterInfo::Dump () const
+{
+    StreamFile s(stdout, false);
+    const size_t num_regs = m_regs.size();
+    s.Printf("%p: DynamicRegisterInfo contains %zu registers:\n", this, num_regs);
+    for (size_t i=0; i<num_regs; ++i)
+    {
+        s.Printf("[%3zu] name = %-10s", i, m_regs[i].name);
+        s.Printf(", size = %2u, offset = %4u, encoding = %u, format = %-10s",
+                 m_regs[i].byte_size,
+                 m_regs[i].byte_offset,
+                 m_regs[i].encoding,
+                 FormatManager::GetFormatAsCString (m_regs[i].format));
+        if (m_regs[i].kinds[eRegisterKindGDB] != LLDB_INVALID_REGNUM)
+            s.Printf(", gdb = %3u", m_regs[i].kinds[eRegisterKindGDB]);
+        if (m_regs[i].kinds[eRegisterKindDWARF] != LLDB_INVALID_REGNUM)
+            s.Printf(", dwarf = %3u", m_regs[i].kinds[eRegisterKindDWARF]);
+        if (m_regs[i].kinds[eRegisterKindGCC] != LLDB_INVALID_REGNUM)
+            s.Printf(", gcc = %3u", m_regs[i].kinds[eRegisterKindGCC]);
+        if (m_regs[i].kinds[eRegisterKindGeneric] != LLDB_INVALID_REGNUM)
+            s.Printf(", generic = %3u", m_regs[i].kinds[eRegisterKindGeneric]);
+        if (m_regs[i].alt_name)
+            s.Printf(", alt-name = %s", m_regs[i].alt_name);
+        if (m_regs[i].value_regs)
+        {
+            s.Printf(", value_regs = [ ");
+            for (size_t j=0; m_regs[i].value_regs[j] != LLDB_INVALID_REGNUM; ++j)
+            {
+                s.Printf("%s ", m_regs[m_regs[i].value_regs[j]].name);
+            }
+            s.Printf("]");
+        }
+        if (m_regs[i].invalidate_regs)
+        {
+            s.Printf(", invalidate_regs = [ ");
+            for (size_t j=0; m_regs[i].invalidate_regs[j] != LLDB_INVALID_REGNUM; ++j)
+            {
+                s.Printf("%s ", m_regs[m_regs[i].invalidate_regs[j]].name);
+            }
+            s.Printf("]");
+        }
+        s.EOL();
+    }
+    
+    const size_t num_sets = m_sets.size();
+    s.Printf("%p: DynamicRegisterInfo contains %zu register sets:\n", this, num_sets);
+    for (size_t i=0; i<num_sets; ++i)
+    {
+        s.Printf("set[%zu] name = %s, regs = [", i, m_sets[i].name);
+        for (size_t idx=0; idx<m_sets[i].num_registers; ++idx)
+        {
+            s.Printf("%s ", m_regs[m_sets[i].registers[idx]].name);
+        }
+        s.Printf("]\n");
+    }
+}
+
+
+
+lldb_private::RegisterInfo *
+DynamicRegisterInfo::GetRegisterInfo (const lldb_private::ConstString &reg_name)
+{
+    for (auto &reg_info : m_regs)
+    {
+        // We can use pointer comparison since we used a ConstString to set
+        // the "name" member in AddRegister()
+        if (reg_info.name == reg_name.GetCString())
+        {
+            return &reg_info;
+        }
+    }
+    return NULL;
 }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.h b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.h
index a11cd333545..a41c77e49f9 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/DynamicRegisterInfo.h
@@ -13,6 +13,7 @@
 // C Includes
 // C++ Includes
 #include <vector>
+#include <map>
 
 // Other libraries and framework includes
 // Project includes
@@ -24,13 +25,15 @@ class DynamicRegisterInfo
 public:
     DynamicRegisterInfo ();
 
-    DynamicRegisterInfo (const lldb_private::PythonDictionary &dict);
+    DynamicRegisterInfo (const lldb_private::PythonDictionary &dict,
+                         lldb::ByteOrder byte_order);
     
     virtual 
     ~DynamicRegisterInfo ();
 
     size_t
-    SetRegisterInfo (const lldb_private::PythonDictionary &dict);
+    SetRegisterInfo (const lldb_private::PythonDictionary &dict,
+                     lldb::ByteOrder byte_order);
 
     void
     AddRegister (lldb_private::RegisterInfo &reg_info, 
@@ -62,6 +65,9 @@ public:
     uint32_t
     ConvertRegisterKindToRegisterNumber (uint32_t kind, uint32_t num) const;
 
+    void
+    Dump () const;
+
     void
     Clear();
 
@@ -74,12 +80,19 @@ protected:
     typedef std::vector <uint32_t> reg_num_collection;
     typedef std::vector <reg_num_collection> set_reg_num_collection;
     typedef std::vector <lldb_private::ConstString> name_collection;
+    typedef std::map<uint32_t, reg_num_collection> reg_to_regs_map;
+
+    lldb_private::RegisterInfo *
+    GetRegisterInfo (const lldb_private::ConstString &reg_name);
 
     reg_collection m_regs;
     set_collection m_sets;
     set_reg_num_collection m_set_reg_nums;
     name_collection m_set_names;
+    reg_to_regs_map m_value_regs_map;
+    reg_to_regs_map m_invalidate_regs_map;
     size_t m_reg_data_byte_size;   // The number of bytes required to store all registers
+    bool m_finalized;
 };
 
 #endif  // lldb_DynamicRegisterInfo_h_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp
new file mode 100644
index 00000000000..521136295fd
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.cpp
@@ -0,0 +1,95 @@
+//===-- HistoryThread.cpp ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/lldb-private.h"
+
+#include "Plugins/Process/Utility/HistoryUnwind.h"
+#include "Plugins/Process/Utility/HistoryThread.h"
+#include "Plugins/Process/Utility/RegisterContextHistory.h"
+
+#include "lldb/Core/Log.h"
+#include "lldb/Target/StackFrameList.h"
+#include "lldb/Target/Process.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+HistoryThread::HistoryThread (lldb_private::Process &process, 
+                              lldb::tid_t tid,
+                              std::vector<lldb::addr_t> pcs, 
+                              uint32_t stop_id, 
+                              bool stop_id_is_valid) : 
+        Thread (process, LLDB_INVALID_THREAD_ID),
+        m_framelist_mutex(),
+        m_framelist(),
+        m_pcs (pcs),
+        m_stop_id (stop_id),
+        m_stop_id_is_valid (stop_id_is_valid),
+        m_extended_unwind_token (LLDB_INVALID_ADDRESS),
+        m_queue_name (),
+        m_thread_name (),
+        m_originating_unique_thread_id (tid),
+        m_queue_id (LLDB_INVALID_QUEUE_ID)
+{
+    m_unwinder_ap.reset (new HistoryUnwind (*this, pcs, stop_id, stop_id_is_valid));
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
+    if (log)
+        log->Printf ("%p HistoryThread::HistoryThread", this);
+}
+
+HistoryThread::~HistoryThread ()
+{
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
+    if (log)
+        log->Printf ("%p HistoryThread::~HistoryThread (tid=0x%" PRIx64 ")", this, GetID());
+    DestroyThread();
+}
+
+lldb::RegisterContextSP
+HistoryThread::GetRegisterContext ()
+{
+    RegisterContextSP rctx ;
+    if (m_pcs.size() > 0)
+    {
+        rctx.reset (new RegisterContextHistory (*this, 0, GetProcess()->GetAddressByteSize(), m_pcs[0]));
+    }
+    return rctx;
+
+}
+
+lldb::RegisterContextSP
+HistoryThread::CreateRegisterContextForFrame (StackFrame *frame)
+{
+    return m_unwinder_ap->CreateRegisterContextForFrame (frame);
+}
+
+lldb::StackFrameListSP
+HistoryThread::GetStackFrameList ()
+{
+    Mutex::Locker (m_framelist_mutex);
+    if (m_framelist.get() == NULL)
+    {
+        m_framelist.reset (new StackFrameList (*this, StackFrameListSP(), true));
+    }
+
+    return m_framelist;
+}
+
+uint32_t
+HistoryThread::GetExtendedBacktraceOriginatingIndexID ()
+{
+    if (m_originating_unique_thread_id != LLDB_INVALID_THREAD_ID)
+    {
+        if (GetProcess()->HasAssignedIndexIDToThread (m_originating_unique_thread_id))
+        {
+            return GetProcess()->AssignIndexIDToThread (m_originating_unique_thread_id);
+        }
+    }
+    return LLDB_INVALID_THREAD_ID;
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h
new file mode 100644
index 00000000000..01fdd160870
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryThread.h
@@ -0,0 +1,114 @@
+//===-- HistoryThread.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_HistoryThread_h_
+#define liblldb_HistoryThread_h_
+
+#include "lldb/lldb-private.h"
+#include "lldb/Host/Mutex.h"
+#include "lldb/Core/Broadcaster.h"
+#include "lldb/Core/Event.h"
+#include "lldb/Core/UserID.h"
+#include "lldb/Core/UserSettingsController.h"
+#include "lldb/Target/ExecutionContextScope.h"
+#include "lldb/Target/StackFrameList.h"
+#include "lldb/Target/Thread.h"
+
+namespace lldb_private {
+
+class HistoryThread : public lldb_private::Thread
+{
+public:
+    HistoryThread (lldb_private::Process &process, lldb::tid_t tid, std::vector<lldb::addr_t> pcs, uint32_t stop_id, bool stop_id_is_valid);
+
+    virtual ~HistoryThread ();
+
+    virtual lldb::RegisterContextSP
+    GetRegisterContext ();
+
+    virtual lldb::RegisterContextSP
+    CreateRegisterContextForFrame (StackFrame *frame);
+
+    virtual void
+    RefreshStateAfterStop() { }
+
+    bool
+    CalculateStopInfo () { return false; }
+
+    void 
+    SetExtendedBacktraceToken (uint64_t token)
+    {
+        m_extended_unwind_token = token;
+    }
+
+    uint64_t
+    GetExtendedBacktraceToken ()
+    {
+        return m_extended_unwind_token;
+    }
+
+    const char *
+    GetQueueName ()
+    {
+        return m_queue_name.c_str();
+    }
+
+    void
+    SetQueueName (const char *name)
+    {
+        m_queue_name = name;
+    }
+
+    lldb::queue_id_t
+    GetQueueID ()
+    {
+        return m_queue_id;
+    }
+
+    void
+    SetQueueID (lldb::queue_id_t queue)
+    {
+        m_queue_id = queue;
+    }
+
+    const char *
+    GetThreadName ()
+    {
+        return m_thread_name.c_str();
+    }
+
+    uint32_t
+    GetExtendedBacktraceOriginatingIndexID ();
+
+    void
+    SetThreadName (const char *name)
+    {
+        m_thread_name = name;
+    }
+
+protected:
+    virtual lldb::StackFrameListSP
+    GetStackFrameList ();
+
+    mutable Mutex               m_framelist_mutex;
+    lldb::StackFrameListSP      m_framelist;
+    std::vector<lldb::addr_t>   m_pcs;
+    uint32_t                    m_stop_id;
+    bool                        m_stop_id_is_valid;
+
+    uint64_t                    m_extended_unwind_token;
+    std::string                 m_queue_name;
+    std::string                 m_thread_name;
+    lldb::tid_t                 m_originating_unique_thread_id;
+    lldb::queue_id_t            m_queue_id;
+};
+
+} // namespace lldb_private
+
+#endif  // liblldb_HistoryThread_h_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp
new file mode 100644
index 00000000000..86665fd17b1
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp
@@ -0,0 +1,79 @@
+//===-- HistoryUnwind.cpp ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/lldb-private.h"
+
+#include "Plugins/Process/Utility/RegisterContextHistory.h"
+#include "Plugins/Process/Utility/HistoryUnwind.h"
+
+#include "lldb/Target/StackFrame.h"
+#include "lldb/Target/Thread.h"
+#include "lldb/Target/Process.h"
+#include "lldb/Target/Target.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+HistoryUnwind::HistoryUnwind (Thread &thread,
+                              std::vector<lldb::addr_t> pcs,
+                              uint32_t stop_id,
+                              bool stop_id_is_valid) :
+        Unwind (thread),
+        m_pcs (pcs),
+        m_stop_id (stop_id),
+        m_stop_id_is_valid (stop_id_is_valid)
+{
+}
+
+HistoryUnwind::~HistoryUnwind ()
+{
+}
+
+void
+HistoryUnwind::DoClear ()
+{
+    Mutex::Locker locker(m_unwind_mutex);
+    m_pcs.clear();
+    m_stop_id_is_valid = false;
+}
+
+lldb::RegisterContextSP
+HistoryUnwind::DoCreateRegisterContextForFrame (StackFrame *frame)
+{
+    RegisterContextSP rctx;
+    if (frame)
+    {
+        addr_t pc = frame->GetFrameCodeAddress().GetLoadAddress (&frame->GetThread()->GetProcess()->GetTarget());
+        if (pc != LLDB_INVALID_ADDRESS)
+        {
+            rctx.reset (new RegisterContextHistory (*frame->GetThread().get(), frame->GetConcreteFrameIndex(), 
+                        frame->GetThread()->GetProcess()->GetAddressByteSize(), pc));
+        }
+    }
+    return rctx;
+}
+
+bool
+HistoryUnwind::DoGetFrameInfoAtIndex (uint32_t frame_idx, lldb::addr_t& cfa, lldb::addr_t& pc)
+{
+    Mutex::Locker (m_unwind_mutex);
+    if (frame_idx < m_pcs.size())
+    {
+        cfa = frame_idx;
+        pc = m_pcs[frame_idx];
+        return true;
+    }
+    return false;
+}
+
+uint32_t
+HistoryUnwind::DoGetFrameCount ()
+{
+    return m_pcs.size();
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h
new file mode 100644
index 00000000000..0661b802860
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/HistoryUnwind.h
@@ -0,0 +1,51 @@
+//===-- HistoryUnwind.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_HistoryUnwind_h_
+#define liblldb_HistoryUnwind_h_
+
+#include <vector>
+
+#include "lldb/lldb-private.h"
+#include "lldb/Host/Mutex.h"
+#include "lldb/Target/Unwind.h"
+
+namespace lldb_private {
+
+class HistoryUnwind : public lldb_private::Unwind
+{
+public:
+    HistoryUnwind (Thread &thread, std::vector<lldb::addr_t> pcs, uint32_t stop_id, bool stop_id_is_valid);
+
+    virtual ~HistoryUnwind ();
+
+protected:
+    void
+    DoClear();
+
+    lldb::RegisterContextSP
+    DoCreateRegisterContextForFrame (StackFrame *frame);
+
+    bool
+    DoGetFrameInfoAtIndex (uint32_t frame_idx,
+                           lldb::addr_t& cfa, 
+                           lldb::addr_t& pc);
+    uint32_t
+    DoGetFrameCount ();
+
+private:
+
+    std::vector<lldb::addr_t>   m_pcs;
+    uint32_t                    m_stop_id;
+    bool                        m_stop_id_is_valid;
+};
+
+} // namespace lldb_private
+
+#endif  // liblldb_HistoryUnwind_h_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
index 499d6d76615..6d1b04f7f1a 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/InferiorCallPOSIX.cpp
@@ -17,8 +17,19 @@
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/ThreadPlanCallFunction.h"
+#include "lldb/Host/Config.h"
 
+#ifndef LLDB_DISABLE_POSIX
 #include <sys/mman.h>
+#else
+// define them
+#define PROT_NONE 0
+#define PROT_READ 1
+#define PROT_WRITE 2
+#define PROT_EXEC 4
+#define MAP_PRIVATE 2
+#define MAP_ANON 0x1000
+#endif
 
 using namespace lldb;
 using namespace lldb_private;
@@ -48,11 +59,13 @@ bool lldb_private::InferiorCallMmap(Process *process, addr_t &allocated_addr,
         {
             const uint32_t range_scope = eSymbolContextFunction | eSymbolContextSymbol;
             const bool use_inline_block_range = false;
-            const bool stop_other_threads = true;
-            const bool unwind_on_error = true;
-            const bool ignore_breakpoints = true;
-            const bool try_all_threads = true;
-            const uint32_t timeout_usec = 500000;
+            EvaluateExpressionOptions options;
+            options.SetStopOthers(true);
+            options.SetUnwindOnError(true);
+            options.SetIgnoreBreakpoints(true);
+            options.SetTryAllThreads(true);
+            options.SetDebug (false);
+            options.SetTimeoutUsec(500000);
 
             addr_t prot_arg, flags_arg = 0;
             if (prot == eMmapProtNone)
@@ -77,19 +90,13 @@ bool lldb_private::InferiorCallMmap(Process *process, addr_t &allocated_addr,
             {
                 ClangASTContext *clang_ast_context = process->GetTarget().GetScratchClangASTContext();
                 ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
+                lldb::addr_t args[] = { addr, length, prot_arg, flags_arg, fd, offset };
                 ThreadPlanCallFunction *call_function_thread_plan
                   = new ThreadPlanCallFunction (*thread,
                                                 mmap_range.GetBaseAddress(),
                                                 clang_void_ptr_type,
-                                                stop_other_threads,
-                                                unwind_on_error,
-                                                ignore_breakpoints,
-                                                &addr,
-                                                &length,
-                                                &prot_arg,
-                                                &flags_arg,
-                                                &fd,
-                                                &offset);
+                                                args,
+                                                options);
                 lldb::ThreadPlanSP call_plan_sp (call_function_thread_plan);
                 if (call_plan_sp)
                 {
@@ -104,12 +111,8 @@ bool lldb_private::InferiorCallMmap(Process *process, addr_t &allocated_addr,
                         ExecutionContext exe_ctx;
                         frame->CalculateExecutionContext (exe_ctx);
                         ExecutionResults result = process->RunThreadPlan (exe_ctx,
-                                                                          call_plan_sp,        
-                                                                          stop_other_threads,
-                                                                          try_all_threads,
-                                                                          unwind_on_error,
-                                                                          ignore_breakpoints,
-                                                                          timeout_usec,
+                                                                          call_plan_sp,
+                                                                          options,
                                                                           error_strm);
                         if (result == eExecutionCompleted)
                         {
@@ -158,56 +161,52 @@ bool lldb_private::InferiorCallMunmap(Process *process, addr_t addr,
        SymbolContext sc;
        if (sc_list.GetContextAtIndex(0, sc))
        {
-           const uint32_t range_scope = eSymbolContextFunction | eSymbolContextSymbol;
-           const bool use_inline_block_range = false;
-           const bool stop_other_threads = true;
-           const bool unwind_on_error = true;
-           const bool ignore_breakpoints = true;
-           const bool try_all_threads = true;
-           const uint32_t timeout_usec = 500000;
+            const uint32_t range_scope = eSymbolContextFunction | eSymbolContextSymbol;
+            const bool use_inline_block_range = false;
+            EvaluateExpressionOptions options;
+            options.SetStopOthers(true);
+            options.SetUnwindOnError(true);
+            options.SetIgnoreBreakpoints(true);
+            options.SetTryAllThreads(true);
+            options.SetDebug (false);
+            options.SetTimeoutUsec(500000);
            
-           AddressRange munmap_range;
-           if (sc.GetAddressRange(range_scope, 0, use_inline_block_range, munmap_range))
-           {
-               lldb::ThreadPlanSP call_plan_sp (new ThreadPlanCallFunction (*thread,
+            AddressRange munmap_range;
+            if (sc.GetAddressRange(range_scope, 0, use_inline_block_range, munmap_range))
+            {
+                lldb::addr_t args[] = { addr, length };
+                lldb::ThreadPlanSP call_plan_sp (new ThreadPlanCallFunction (*thread,
                                                                             munmap_range.GetBaseAddress(),
                                                                             ClangASTType(),
-                                                                            stop_other_threads,
-                                                                            unwind_on_error,
-                                                                            ignore_breakpoints,
-                                                                            &addr,
-                                                                            &length));
-               if (call_plan_sp)
-               {
-                   StreamFile error_strm;
-                   // This plan is a utility plan, so set it to discard itself when done.
-                   call_plan_sp->SetIsMasterPlan (true);
-                   call_plan_sp->SetOkayToDiscard(true);
+                                                                            args,
+                                                                            options));
+                if (call_plan_sp)
+                {
+                    StreamFile error_strm;
+                    // This plan is a utility plan, so set it to discard itself when done.
+                    call_plan_sp->SetIsMasterPlan (true);
+                    call_plan_sp->SetOkayToDiscard(true);
                    
-                   StackFrame *frame = thread->GetStackFrameAtIndex (0).get();
-                   if (frame)
-                   {
-                       ExecutionContext exe_ctx;
-                       frame->CalculateExecutionContext (exe_ctx);
-                       ExecutionResults result = process->RunThreadPlan (exe_ctx,
-                                                                         call_plan_sp,        
-                                                                         stop_other_threads,
-                                                                         try_all_threads,
-                                                                         unwind_on_error,
-                                                                         ignore_breakpoints,
-                                                                         timeout_usec,
-                                                                         error_strm);
-                       if (result == eExecutionCompleted)
-                       {
-                           return true;
-                       }
-                   }
-               }
-           }
-       }
-   }
+                    StackFrame *frame = thread->GetStackFrameAtIndex (0).get();
+                    if (frame)
+                    {
+                        ExecutionContext exe_ctx;
+                        frame->CalculateExecutionContext (exe_ctx);
+                        ExecutionResults result = process->RunThreadPlan (exe_ctx,
+                                                                          call_plan_sp,
+                                                                          options,
+                                                                          error_strm);
+                        if (result == eExecutionCompleted)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+        }
+    }
 
-   return false;
+    return false;
 }
 
 bool lldb_private::InferiorCall(Process *process, const Address *address, addr_t &returned_func) {
@@ -215,11 +214,13 @@ bool lldb_private::InferiorCall(Process *process, const Address *address, addr_t
     if (thread == NULL || address == NULL)
         return false;
 
-    const bool stop_other_threads = true;
-    const bool unwind_on_error = true;
-    const bool ignore_breakpoints = true;
-    const bool try_all_threads = true;
-    const uint32_t timeout_usec = 500000;
+    EvaluateExpressionOptions options;
+    options.SetStopOthers(true);
+    options.SetUnwindOnError(true);
+    options.SetIgnoreBreakpoints(true);
+    options.SetTryAllThreads(true);
+    options.SetDebug (false);
+    options.SetTimeoutUsec(500000);
 
     ClangASTContext *clang_ast_context = process->GetTarget().GetScratchClangASTContext();
     ClangASTType clang_void_ptr_type = clang_ast_context->GetBasicType(eBasicTypeVoid).GetPointerType();
@@ -227,9 +228,8 @@ bool lldb_private::InferiorCall(Process *process, const Address *address, addr_t
         = new ThreadPlanCallFunction (*thread,
                                       *address,
                                       clang_void_ptr_type,
-                                      stop_other_threads,
-                                      unwind_on_error,
-                                      ignore_breakpoints);
+                                      llvm::ArrayRef<addr_t>(),
+                                      options);
     lldb::ThreadPlanSP call_plan_sp (call_function_thread_plan);
     if (call_plan_sp)
     {
@@ -245,11 +245,7 @@ bool lldb_private::InferiorCall(Process *process, const Address *address, addr_t
             frame->CalculateExecutionContext (exe_ctx);
             ExecutionResults result = process->RunThreadPlan (exe_ctx,
                                                               call_plan_sp,
-                                                              stop_other_threads,
-                                                              try_all_threads,
-                                                              unwind_on_error,
-                                                              ignore_breakpoints,
-                                                              timeout_usec,
+                                                              options,
                                                               error_strm);
             if (result == eExecutionCompleted)
             {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp
new file mode 100644
index 00000000000..b7adb202ba4
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.cpp
@@ -0,0 +1,138 @@
+//===-- RegisterContextHistory.cpp ---------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+
+#include "lldb/lldb-private.h"
+#include "lldb/Core/Address.h"
+#include "lldb/Core/AddressRange.h"
+#include "lldb/Core/DataBufferHeap.h"
+#include "lldb/Core/Log.h"
+#include "lldb/Core/Module.h"
+#include "lldb/Core/RegisterValue.h"
+#include "lldb/Core/Value.h"
+#include "lldb/Expression/DWARFExpression.h"
+#include "lldb/Symbol/FuncUnwinders.h"
+#include "lldb/Symbol/Function.h"
+#include "lldb/Symbol/ObjectFile.h"
+#include "lldb/Symbol/SymbolContext.h"
+#include "lldb/Symbol/Symbol.h"
+#include "lldb/Target/ABI.h"
+#include "lldb/Target/ExecutionContext.h"
+#include "lldb/Target/Process.h"
+#include "lldb/Target/StackFrame.h"
+#include "lldb/Target/Target.h"
+#include "lldb/Target/Thread.h"
+#include "lldb/Target/DynamicLoader.h"
+
+#include "RegisterContextHistory.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+RegisterContextHistory::RegisterContextHistory (Thread &thread, uint32_t concrete_frame_idx, uint32_t address_byte_size, addr_t pc_value) :
+RegisterContext (thread, concrete_frame_idx),
+    m_pc_value (pc_value)
+{
+    m_reg_set0.name = "General Purpose Registers";
+    m_reg_set0.short_name = "GPR";
+    m_reg_set0.num_registers = 1;
+    m_reg_set0.registers = new uint32_t(0);
+    
+    m_pc_reg_info.name = "pc";
+    m_pc_reg_info.alt_name = "pc";
+    m_pc_reg_info.byte_offset = 0;
+    m_pc_reg_info.byte_size = address_byte_size;
+    m_pc_reg_info.encoding = eEncodingUint;
+    m_pc_reg_info.format = eFormatPointer;
+    m_pc_reg_info.invalidate_regs = NULL;
+    m_pc_reg_info.value_regs = NULL;
+    m_pc_reg_info.kinds[eRegisterKindGCC] = LLDB_INVALID_REGNUM;
+    m_pc_reg_info.kinds[eRegisterKindDWARF] = LLDB_INVALID_REGNUM;
+    m_pc_reg_info.kinds[eRegisterKindGeneric] = LLDB_REGNUM_GENERIC_PC;
+    m_pc_reg_info.kinds[eRegisterKindGDB] = LLDB_INVALID_REGNUM;
+    m_pc_reg_info.kinds[eRegisterKindLLDB] = LLDB_INVALID_REGNUM;
+}
+
+RegisterContextHistory::~RegisterContextHistory ()
+{
+    delete m_reg_set0.registers;
+    delete m_pc_reg_info.invalidate_regs;
+    delete m_pc_reg_info.value_regs;
+}
+
+void
+RegisterContextHistory::InvalidateAllRegisters () {}
+
+size_t
+RegisterContextHistory::GetRegisterCount ()
+{
+    return 1;
+}
+
+const lldb_private::RegisterInfo *
+RegisterContextHistory::GetRegisterInfoAtIndex (size_t reg)
+{
+    if (reg)
+        return NULL;
+    return &m_pc_reg_info;
+}
+
+size_t
+RegisterContextHistory::GetRegisterSetCount ()
+{
+    return 1;
+}
+
+const lldb_private::RegisterSet *
+RegisterContextHistory::GetRegisterSet (size_t reg_set)
+{
+    if (reg_set)
+        return NULL;
+    return &m_reg_set0;
+}
+
+bool
+RegisterContextHistory::ReadRegister (const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value)
+{
+    if (!reg_info)
+        return false;
+    uint32_t reg_number = reg_info->kinds[eRegisterKindGeneric];
+    if (reg_number == LLDB_REGNUM_GENERIC_PC)
+    {
+        value.SetUInt(m_pc_value, reg_info->byte_size);
+        return true;
+    }
+    return false;
+}
+
+bool
+RegisterContextHistory::WriteRegister (const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value)
+{
+    return false;
+}
+
+bool
+RegisterContextHistory::ReadAllRegisterValues (lldb::DataBufferSP &data_sp)
+{
+    return false;
+}
+
+bool
+RegisterContextHistory::WriteAllRegisterValues (const lldb::DataBufferSP &data_sp)
+{
+    return false;
+}
+
+uint32_t
+RegisterContextHistory::ConvertRegisterKindToRegisterNumber (uint32_t kind, uint32_t num)
+{
+    if (kind == eRegisterKindGeneric && num == LLDB_REGNUM_GENERIC_PC)
+        return 0;
+    return LLDB_INVALID_REGNUM;
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h
new file mode 100644
index 00000000000..58e16080b52
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextHistory.h
@@ -0,0 +1,79 @@
+//===-- RegisterContextHistory.h ----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef lldb_RegisterContextHistory_h_
+#define lldb_RegisterContextHistory_h_
+
+#include <vector>
+
+#include "lldb/lldb-private.h"
+#include "lldb/Target/RegisterContext.h"
+#include "lldb/Symbol/SymbolContext.h"
+
+namespace lldb_private {
+    
+class RegisterContextHistory : public lldb_private::RegisterContext
+{
+public:
+    typedef std::shared_ptr<RegisterContextHistory> SharedPtr;
+    
+    RegisterContextHistory (Thread &thread, uint32_t concrete_frame_idx, uint32_t address_byte_size, lldb::addr_t pc_value);
+    
+    ///
+    // pure virtual functions from the base class that we must implement
+    ///
+
+    virtual
+    ~RegisterContextHistory ();
+
+    virtual void
+    InvalidateAllRegisters ();
+
+    virtual size_t
+    GetRegisterCount ();
+
+    virtual const lldb_private::RegisterInfo *
+    GetRegisterInfoAtIndex (size_t reg);
+
+    virtual size_t
+    GetRegisterSetCount ();
+
+    virtual const lldb_private::RegisterSet *
+    GetRegisterSet (size_t reg_set);
+
+    virtual bool
+    ReadRegister (const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+
+    virtual bool
+    WriteRegister (const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+
+    virtual bool
+    ReadAllRegisterValues (lldb::DataBufferSP &data_sp);
+
+    virtual bool
+    WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
+
+    virtual uint32_t
+    ConvertRegisterKindToRegisterNumber (uint32_t kind, uint32_t num);
+    
+private:
+    //------------------------------------------------------------------
+    // For RegisterContextLLDB only
+    //------------------------------------------------------------------
+    
+    lldb_private::RegisterSet m_reg_set0; // register set 0 (PC only)
+    lldb_private::RegisterInfo m_pc_reg_info;
+
+    lldb::addr_t m_pc_value;
+    
+    DISALLOW_COPY_AND_ASSIGN (RegisterContextHistory);
+};
+} // namespace lldb_private
+
+#endif  // lldb_RegisterContextHistory_h_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp
index 1ffc30da576..c19aec3a02c 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextLLDB.cpp
@@ -369,8 +369,13 @@ RegisterContextLLDB::InitializeNonZerothFrame()
         return;
     }
 
+    bool resolve_tail_call_address = true; // m_current_pc can be one past the address range of the function...
+    uint32_t resolved_scope = pc_module_sp->ResolveSymbolContextForAddress (m_current_pc,
+                                                                            eSymbolContextFunction | eSymbolContextSymbol,
+                                                                            m_sym_ctx, resolve_tail_call_address);
+
     // We require that eSymbolContextSymbol be successfully filled in or this context is of no use to us.
-    if ((pc_module_sp->ResolveSymbolContextForAddress (m_current_pc, eSymbolContextFunction| eSymbolContextSymbol, m_sym_ctx) & eSymbolContextSymbol) == eSymbolContextSymbol)
+    if ((resolved_scope & eSymbolContextSymbol) == eSymbolContextSymbol)
     {
         m_sym_ctx_valid = true;
     }
@@ -387,35 +392,18 @@ RegisterContextLLDB::InitializeNonZerothFrame()
     if (m_sym_ctx_valid == false)
        decr_pc_and_recompute_addr_range = true;
 
-    // Or if we're in the middle of the stack (and not "above" an asynchronous event like sigtramp),
-    // and our "current" pc is the start of a function...
+    // Or if we're in the middle of the stack (and not "above" an asynchronous event like sigtramp), and
+    // our "current" pc is the start of a function or our "current" pc is one past the end of a function...
     if (m_sym_ctx_valid
         && GetNextFrame()->m_frame_type != eSigtrampFrame
         && GetNextFrame()->m_frame_type != eDebuggerFrame
         && addr_range.GetBaseAddress().IsValid()
-        && addr_range.GetBaseAddress().GetSection() == m_current_pc.GetSection()
-        && addr_range.GetBaseAddress().GetOffset() == m_current_pc.GetOffset())
+        && addr_range.GetBaseAddress().GetSection() == m_current_pc.GetSection())
     {
-        decr_pc_and_recompute_addr_range = true;
-    }
-
-    // We need to back up the pc by 1 byte and re-search for the Symbol to handle the case where the "saved pc"
-    // value is pointing to the next function, e.g. if a function ends with a CALL instruction.
-    // FIXME this may need to be an architectural-dependent behavior; if so we'll need to add a member function
-    // to the ABI plugin and consult that.
-    if (decr_pc_and_recompute_addr_range)
-    {
-        Address temporary_pc(m_current_pc);
-        temporary_pc.SetOffset(m_current_pc.GetOffset() - 1);
-        m_sym_ctx.Clear(false);
-        m_sym_ctx_valid = false;
-        if ((pc_module_sp->ResolveSymbolContextForAddress (temporary_pc, eSymbolContextFunction| eSymbolContextSymbol, m_sym_ctx) & eSymbolContextSymbol) == eSymbolContextSymbol)
+        if (addr_range.GetBaseAddress().GetOffset() == m_current_pc.GetOffset() ||
+            addr_range.GetBaseAddress().GetOffset() + addr_range.GetByteSize() == m_current_pc.GetOffset())
         {
-            m_sym_ctx_valid = true;
-        }
-        if (!m_sym_ctx.GetAddressRange (eSymbolContextFunction | eSymbolContextSymbol, 0, false,  addr_range))
-        {
-            m_sym_ctx_valid = false;
+            decr_pc_and_recompute_addr_range = true;
         }
     }
 
@@ -632,6 +620,10 @@ RegisterContextLLDB::GetFullUnwindPlanForFrame ()
         arch_default_unwind_plan_sp.reset (new UnwindPlan (lldb::eRegisterKindGeneric));
         abi->CreateDefaultUnwindPlan(*arch_default_unwind_plan_sp);
     }
+    else
+    {
+        UnwindLogMsg ("unable to get architectural default UnwindPlan from ABI plugin");
+    }
 
     bool behaves_like_zeroth_frame = false;
     if (IsFrameZero ()
@@ -648,9 +640,10 @@ RegisterContextLLDB::GetFullUnwindPlanForFrame ()
     // in the zeroth frame, we need to use the "unwind at first instruction" arch default UnwindPlan
     // Also, if this Process can report on memory region attributes, any non-executable region means
     // we jumped through a bad function pointer - handle the same way as 0x0.
-    // Note, if the symbol context has a function for the symbol, then we don't need to do this check.
+    // Note, if we have a symbol context & a symbol, we don't want to follow this code path.  This is
+    // for jumping to memory regions without any information available.
 
-    if ((!m_sym_ctx_valid  || m_sym_ctx.function == NULL) && behaves_like_zeroth_frame && m_current_pc.IsValid())
+    if ((!m_sym_ctx_valid || m_sym_ctx.symbol == NULL) && behaves_like_zeroth_frame && m_current_pc.IsValid())
     {
         uint32_t permissions;
         addr_t current_pc_addr = m_current_pc.GetLoadAddress (exe_ctx.GetTargetPtr());
@@ -757,8 +750,24 @@ RegisterContextLLDB::GetFullUnwindPlanForFrame ()
         return unwind_plan_sp;
     }
 
+    // If we're on the first instruction of a function, and we have an architectural default UnwindPlan
+    // for the initial instruction of a function, use that.
+    if (m_current_offset_backed_up_one == 0)
+    {
+        unwind_plan_sp = func_unwinders_sp->GetUnwindPlanArchitectureDefaultAtFunctionEntry (m_thread);
+        if (unwind_plan_sp)
+        {
+            UnwindLogMsgVerbose ("frame uses %s for full UnwindPlan", unwind_plan_sp->GetSourceName().GetCString());
+            return unwind_plan_sp;
+        }
+    }
+
     // If nothing else, use the architectural default UnwindPlan and hope that does the job.
-    UnwindLogMsgVerbose ("frame uses %s for full UnwindPlan", arch_default_unwind_plan_sp->GetSourceName().GetCString());
+    if (arch_default_unwind_plan_sp)
+        UnwindLogMsgVerbose ("frame uses %s for full UnwindPlan", arch_default_unwind_plan_sp->GetSourceName().GetCString());
+    else
+        UnwindLogMsg ("Unable to find any UnwindPlan for full unwind of this frame.");
+
     return arch_default_unwind_plan_sp;
 }
 
@@ -1101,7 +1110,8 @@ RegisterContextLLDB::SavedLocationForRegister (uint32_t lldb_regnum, lldb_privat
             const RegisterInfo *reg_info = GetRegisterInfoAtIndex(lldb_regnum);
             if (reg_info && abi->RegisterIsVolatile (reg_info))
             {
-                UnwindLogMsg ("did not supply reg location for %d because it is volatile", lldb_regnum);
+                UnwindLogMsg ("did not supply reg location for %d (%s) because it is volatile",
+                    lldb_regnum, reg_info->name ? reg_info->name : "??");
                 return UnwindLLDB::RegisterSearchResult::eRegisterIsVolatile;
             }
         }
@@ -1186,7 +1196,8 @@ RegisterContextLLDB::SavedLocationForRegister (uint32_t lldb_regnum, lldb_privat
         DataExtractor dwarfdata (unwindplan_regloc.GetDWARFExpressionBytes(),
                                  unwindplan_regloc.GetDWARFExpressionLength(),
                                  process->GetByteOrder(), process->GetAddressByteSize());
-        DWARFExpression dwarfexpr (dwarfdata, 0, unwindplan_regloc.GetDWARFExpressionLength());
+        ModuleSP opcode_ctx;
+        DWARFExpression dwarfexpr (opcode_ctx, dwarfdata, 0, unwindplan_regloc.GetDWARFExpressionLength());
         dwarfexpr.SetRegisterKind (unwindplan_registerkind);
         Value result;
         Error error;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
index 2c3eee45248..5b6d9fe9f3b 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/RegisterContextMacOSXFrameBackchain.cpp
@@ -147,9 +147,9 @@ RegisterContextMacOSXFrameBackchain::ReadRegister (const RegisterInfo *reg_info,
             }
             break;
 
-            // TOOD: need a better way to detect when "long double" types are 
+            // TOOD: need a better way to detect when "long double" types are
             // the same bytes size as "double"
-#if !defined(__arm__)
+#if !defined(__arm__) && !defined(_MSC_VER) && !defined(__mips__)
         case sizeof (long double):
             if (sizeof (long double) == sizeof(uint32_t))
             {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp
index 0eea0036349..552ae501bd2 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/Utility/UnwindLLDB.cpp
@@ -185,21 +185,7 @@ UnwindLLDB::AddOneMoreFrame (ABI *abi)
         }
         goto unwind_done;
     }
-    if (!m_frames.empty())
-    {
-        if (m_frames.back()->start_pc == cursor_sp->start_pc)
-        {
-            if (m_frames.back()->cfa == cursor_sp->cfa)
-                goto unwind_done; // Infinite loop where the current cursor is the same as the previous one...
-            else if (abi && abi->StackUsesFrames())
-            {
-                // We might have a CFA that is not using the frame pointer and
-                // we want to validate that the frame pointer is valid.
-                if (reg_ctx_sp->GetFP() == 0)
-                    goto unwind_done;
-            }
-        }
-    }
+
     cursor_sp->reg_ctx_lldb_sp = reg_ctx_sp;
     m_frames.push_back (cursor_sp);
     return true;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
index dd553ce36c8..93641ede1bc 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
@@ -338,9 +338,9 @@ ProcessElfCore::GetImageInfoAddress()
 {
     Target *target = &GetTarget();
     ObjectFile *obj_file = target->GetExecutableModule()->GetObjectFile();
-    Address addr = obj_file->GetImageInfoAddress();
+    Address addr = obj_file->GetImageInfoAddress(target);
 
-    if (addr.IsValid()) 
+    if (addr.IsValid())
         return addr.GetLoadAddress(target);
     return LLDB_INVALID_ADDRESS;
 }
@@ -363,85 +363,14 @@ enum {
     NT_FREEBSD_PROCSTAT_AUXV = 16
 };
 
-/// Align the given value to next boundary specified by the alignment bytes
-static uint32_t
-AlignToNext(uint32_t value, int alignment_bytes)
-{
-    return (value + alignment_bytes - 1) & ~(alignment_bytes - 1);
-}
-
-/// Note Structure found in ELF core dumps.
-/// This is PT_NOTE type program/segments in the core file.
-struct ELFNote
-{
-    elf::elf_word n_namesz;
-    elf::elf_word n_descsz;
-    elf::elf_word n_type;
-
-    std::string n_name;
-
-    ELFNote() : n_namesz(0), n_descsz(0), n_type(0)
-    {
-    }
-
-    /// Parse an ELFNote entry from the given DataExtractor starting at position
-    /// \p offset.
-    ///
-    /// @param[in] data
-    ///    The DataExtractor to read from.
-    ///
-    /// @param[in,out] offset
-    ///    Pointer to an offset in the data.  On return the offset will be
-    ///    advanced by the number of bytes read.
-    ///
-    /// @return
-    ///    True if the ELFRel entry was successfully read and false otherwise.
-    bool
-    Parse(const DataExtractor &data, lldb::offset_t *offset)
-    {
-        // Read all fields.
-        if (data.GetU32(offset, &n_namesz, 3) == NULL)
-            return false;
-
-        // The name field is required to be nul-terminated, and n_namesz
-        // includes the terminating nul in observed implementations (contrary
-        // to the ELF-64 spec).  A special case is needed for cores generated
-        // by some older Linux versions, which write a note named "CORE"
-        // without a nul terminator and n_namesz = 4.
-        if (n_namesz == 4)
-        {
-            char buf[4];
-            if (data.ExtractBytes (*offset, 4, data.GetByteOrder(), buf) != 4)
-                return false;
-            if (strncmp (buf, "CORE", 4) == 0)
-            {
-                n_name = "CORE";
-                *offset += 4;
-                return true;
-            }
-        }
-
-        const char *cstr = data.GetCStr(offset, AlignToNext(n_namesz, 4));
-        if (cstr == NULL)
-        {
-            Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_PROCESS));
-            if (log)
-                log->Printf("Failed to parse note name lacking nul terminator");
-
-            return false;
-        }
-        n_name = cstr;
-        return true;
-    }
-};
-
 // Parse a FreeBSD NT_PRSTATUS note - see FreeBSD sys/procfs.h for details.
 static void
 ParseFreeBSDPrStatus(ThreadData *thread_data, DataExtractor &data,
                      ArchSpec &arch)
 {
     lldb::offset_t offset = 0;
-    bool have_padding = (arch.GetMachine() == llvm::Triple::x86_64);
+    bool have_padding = (arch.GetMachine() == llvm::Triple::mips64 ||
+                         arch.GetMachine() == llvm::Triple::x86_64);
     int pr_version = data.GetU32(&offset);
 
     Log *log (ProcessPOSIXLog::GetLogIfAllCategoriesSet (POSIX_LOG_PROCESS));
@@ -525,7 +454,7 @@ ProcessElfCore::ParseThreadContextsFromNoteSegment(const elf::ELFProgramHeader *
 
         size_t note_start, note_size;
         note_start = offset;
-        note_size = AlignToNext(note.n_descsz, 4);
+        note_size = llvm::RoundUpToAlignment(note.n_descsz, 4);
 
         // Store the NOTE information in the current thread
         DataExtractor note_data (segment_data, note_start, note_size);
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreFreeBSD_x86_64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreFreeBSD_x86_64.cpp
deleted file mode 100644
index 6210175f9a7..00000000000
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreFreeBSD_x86_64.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//===-- RegisterContextCoreFreeBSD_x86_64.cpp -------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Core/DataExtractor.h"
-#include "lldb/Core/RegisterValue.h"
-#include "lldb/Target/Thread.h"
-#include "RegisterContextCoreFreeBSD_x86_64.h"
-
-RegisterContextCoreFreeBSD_x86_64::RegisterContextCoreFreeBSD_x86_64(Thread &thread,
-                        const DataExtractor &gpregset, const DataExtractor &fpregset)
-    : RegisterContextFreeBSD_x86_64(thread, 0)
-{
-    size_t size, len;
-
-    size = GetGPRSize();
-    m_gpregset = new uint8_t[size];
-    len = gpregset.ExtractBytes(0, size, lldb::eByteOrderLittle, m_gpregset);
-    assert(len == size);
-}
-
-RegisterContextCoreFreeBSD_x86_64::~RegisterContextCoreFreeBSD_x86_64()
-{
-    delete [] m_gpregset;
-}
-
-bool
-RegisterContextCoreFreeBSD_x86_64::ReadRegister(const RegisterInfo *reg_info, RegisterValue &value)
-{
-    value = *(uint64_t *)(m_gpregset + reg_info->byte_offset);
-    return true;
-}
-
-bool
-RegisterContextCoreFreeBSD_x86_64::ReadAllRegisterValues(lldb::DataBufferSP &data_sp)
-{
-    return false;
-}
-
-bool
-RegisterContextCoreFreeBSD_x86_64::WriteRegister(const RegisterInfo *reg_info, const RegisterValue &value)
-{
-    return false;
-}
-
-bool
-RegisterContextCoreFreeBSD_x86_64::WriteAllRegisterValues(const lldb::DataBufferSP &data_sp)
-{
-    return false;
-}
-
-bool
-RegisterContextCoreFreeBSD_x86_64::UpdateAfterBreakpoint()
-{
-    return false;
-}
-
-bool
-RegisterContextCoreFreeBSD_x86_64::HardwareSingleStep(bool enable)
-{
-    return false;
-}
-
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreFreeBSD_x86_64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreFreeBSD_x86_64.h
deleted file mode 100644
index acd594a6e66..00000000000
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreFreeBSD_x86_64.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//===-- RegisterContextCoreFreeBSD_x86_64.h ----------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===---------------------------------------------------------------------===//
-
-#ifndef liblldb_RegisterContextCoreFreeBSD_x86_64_H_
-#define liblldb_RegisterContextCoreFreeBSD_x86_64_H_
-
-#include "Plugins/Process/POSIX/RegisterContextFreeBSD_x86_64.h"
-
-using namespace lldb_private;
-
-class RegisterContextCoreFreeBSD_x86_64: public RegisterContextFreeBSD_x86_64
-{
-public:
-    RegisterContextCoreFreeBSD_x86_64 (Thread &thread, const DataExtractor &gpregset,
-                                       const DataExtractor &fpregset);
-
-    ~RegisterContextCoreFreeBSD_x86_64();
-
-    virtual bool
-    ReadRegister(const RegisterInfo *reg_info, RegisterValue &value);
-
-    bool
-    ReadAllRegisterValues(lldb::DataBufferSP &data_sp);
-
-    virtual bool
-    WriteRegister(const RegisterInfo *reg_info, const RegisterValue &value);
-
-    bool
-    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp);
-
-    bool
-    HardwareSingleStep(bool enable);
-
-    bool
-    UpdateAfterBreakpoint();
-
-private:
-    uint8_t *m_gpregset;
-};
-
-#endif // #ifndef liblldb_RegisterContextCoreFreeBSD_x86_64_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreLinux_x86_64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreLinux_x86_64.cpp
deleted file mode 100644
index d9e3f6d5f90..00000000000
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreLinux_x86_64.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//===-- RegisterContextCoreLinux_x86_64.cpp -------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Core/DataExtractor.h"
-#include "lldb/Core/RegisterValue.h"
-#include "lldb/Target/Thread.h"
-#include "RegisterContextCoreLinux_x86_64.h"
-
-RegisterContextCoreLinux_x86_64::RegisterContextCoreLinux_x86_64(Thread &thread,
-                                                const DataExtractor &gpregset,
-                                                const DataExtractor &fpregset)
-    : RegisterContextLinux_x86_64(thread, 0)
-{
-    size_t size, len;
-
-    size = GetGPRSize();
-    m_gpregset = new uint8_t[size];
-    len = gpregset.ExtractBytes(0, size, lldb::eByteOrderLittle, m_gpregset);
-    assert(len == size);
-}
-
-RegisterContextCoreLinux_x86_64::~RegisterContextCoreLinux_x86_64()
-{
-    delete [] m_gpregset;
-}
-
-bool
-RegisterContextCoreLinux_x86_64::ReadRegister(const RegisterInfo *reg_info, RegisterValue &value)
-{
-    value = *(uint64_t *)(m_gpregset + reg_info->byte_offset);
-    return true;
-}
-
-bool
-RegisterContextCoreLinux_x86_64::ReadAllRegisterValues(lldb::DataBufferSP &data_sp)
-{
-    return false;
-}
-
-bool
-RegisterContextCoreLinux_x86_64::WriteRegister(const RegisterInfo *reg_info, const RegisterValue &value)
-{
-    return false;
-}
-
-bool
-RegisterContextCoreLinux_x86_64::WriteAllRegisterValues(const lldb::DataBufferSP &data_sp)
-{
-    return false;
-}
-
-bool
-RegisterContextCoreLinux_x86_64::UpdateAfterBreakpoint()
-{
-    return false;
-}
-
-bool
-RegisterContextCoreLinux_x86_64::HardwareSingleStep(bool enable)
-{
-    return false;
-}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreLinux_x86_64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreLinux_x86_64.h
deleted file mode 100644
index 9cf545afd56..00000000000
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextCoreLinux_x86_64.h
+++ /dev/null
@@ -1,54 +0,0 @@
-//===-- RegisterContextCoreLinux_x86_64.h ----------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===---------------------------------------------------------------------===//
-
-#ifndef liblldb_RegisterContextCoreLinux_x86_64_H_
-#define liblldb_RegisterContextCoreLinux_x86_64_H_
-
-#include "Plugins/Process/POSIX/RegisterContextLinux_x86_64.h"
-
-using namespace lldb_private;
-
-class RegisterContextCoreLinux_x86_64: public RegisterContextLinux_x86_64
-{
-public:
-    RegisterContextCoreLinux_x86_64 (Thread &thread, const DataExtractor &gpregset,
-                                     const DataExtractor &fpregset);
-
-    ~RegisterContextCoreLinux_x86_64();
-
-    virtual bool
-    ReadRegister(const RegisterInfo *reg_info, RegisterValue &value);
-
-    bool
-    ReadAllRegisterValues(lldb::DataBufferSP &data_sp);
-
-    virtual bool
-    WriteRegister(const RegisterInfo *reg_info, const RegisterValue &value);
-
-    bool
-    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp);
-
-    bool
-    HardwareSingleStep(bool enable);
-
-    bool
-    UpdateAfterBreakpoint();
-
-protected:
-    bool
-    ReadFPR()
-    {
-        assert(0);
-    }
-
-private:
-    uint8_t *m_gpregset;
-};
-
-#endif // #ifndef liblldb_RegisterContextCoreLinux_x86_64_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp
new file mode 100644
index 00000000000..b95a51130ca
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.cpp
@@ -0,0 +1,94 @@
+//===-- RegisterContextCorePOSIX_mips64.cpp ---------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Core/DataExtractor.h"
+#include "lldb/Core/RegisterValue.h"
+#include "lldb/Target/Thread.h"
+#include "RegisterContextPOSIX.h"
+#include "RegisterContextPOSIXCore_mips64.h"
+
+using namespace lldb_private;
+
+RegisterContextCorePOSIX_mips64::RegisterContextCorePOSIX_mips64(Thread &thread,
+                                                                 RegisterInfoInterface *register_info,
+                                                                 const DataExtractor &gpregset,
+                                                                 const DataExtractor &fpregset)
+    : RegisterContextPOSIX_mips64(thread, 0, register_info)
+{
+    size_t i;
+    lldb::offset_t offset = 0;
+
+    for (i = 0; i < k_num_gpr_registers_mips64; i++)
+    {
+        m_reg[i] = gpregset.GetU64(&offset);
+    }
+}
+
+RegisterContextCorePOSIX_mips64::~RegisterContextCorePOSIX_mips64()
+{
+}
+
+bool
+RegisterContextCorePOSIX_mips64::ReadGPR()
+{
+    return true;
+}
+
+bool
+RegisterContextCorePOSIX_mips64::ReadFPR()
+{
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_mips64::WriteGPR()
+{
+    assert(0);
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_mips64::WriteFPR()
+{
+    assert(0);
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_mips64::ReadRegister(const RegisterInfo *reg_info, RegisterValue &value)
+{
+    int reg_num = reg_info->byte_offset / 8;
+    assert(reg_num < k_num_gpr_registers_mips64);
+    value = m_reg[reg_num];
+    return true;
+}
+
+bool
+RegisterContextCorePOSIX_mips64::ReadAllRegisterValues(lldb::DataBufferSP &data_sp)
+{
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_mips64::WriteRegister(const RegisterInfo *reg_info, const RegisterValue &value)
+{
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_mips64::WriteAllRegisterValues(const lldb::DataBufferSP &data_sp)
+{
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_mips64::HardwareSingleStep(bool enable)
+{
+    return false;
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.h
new file mode 100644
index 00000000000..92e486bf223
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_mips64.h
@@ -0,0 +1,58 @@
+//===-- RegisterContextCorePOSIX_mips64.h ----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContextCorePOSIX_mips64_H_
+#define liblldb_RegisterContextCorePOSIX_mips64_H_
+
+#include "Plugins/Process/POSIX/RegisterContextPOSIX_mips64.h"
+
+class RegisterContextCorePOSIX_mips64 :
+    public RegisterContextPOSIX_mips64
+{
+public:
+    RegisterContextCorePOSIX_mips64 (lldb_private::Thread &thread,
+                                     RegisterInfoInterface *register_info,
+                                     const lldb_private::DataExtractor &gpregset,
+                                     const lldb_private::DataExtractor &fpregset);
+
+    ~RegisterContextCorePOSIX_mips64();
+
+    virtual bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+
+    virtual bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp);
+
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp);
+
+    bool
+    HardwareSingleStep(bool enable);
+
+protected:
+    bool
+    ReadGPR();
+
+    bool
+    ReadFPR();
+
+    bool
+    WriteGPR();
+
+    bool
+    WriteFPR();
+
+private:
+    uint64_t m_reg[40];
+};
+
+#endif // #ifndef liblldb_RegisterContextCorePOSIX_mips64_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp
new file mode 100644
index 00000000000..610506c20a0
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.cpp
@@ -0,0 +1,92 @@
+//===-- RegisterContextCorePOSIX_x86_64.cpp ---------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/Core/DataExtractor.h"
+#include "lldb/Core/RegisterValue.h"
+#include "lldb/Target/Thread.h"
+#include "RegisterContextPOSIX.h"
+#include "RegisterContextPOSIXCore_x86_64.h"
+
+using namespace lldb_private;
+
+RegisterContextCorePOSIX_x86_64::RegisterContextCorePOSIX_x86_64(Thread &thread,
+                                                                 RegisterInfoInterface *register_info,
+                                                                 const DataExtractor &gpregset,
+                                                                 const DataExtractor &fpregset)
+    : RegisterContextPOSIX_x86 (thread, 0, register_info)
+{
+    size_t size, len;
+
+    size = GetGPRSize();
+    m_gpregset = new uint8_t[size];
+    len = gpregset.ExtractBytes (0, size, lldb::eByteOrderLittle, m_gpregset);
+    assert(len == size);
+}
+
+RegisterContextCorePOSIX_x86_64::~RegisterContextCorePOSIX_x86_64()
+{
+    delete [] m_gpregset;
+}
+
+bool
+RegisterContextCorePOSIX_x86_64::ReadGPR()
+{
+    return m_gpregset != NULL;
+}
+
+bool
+RegisterContextCorePOSIX_x86_64::ReadFPR()
+{
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_x86_64::WriteGPR()
+{
+    assert(0);
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_x86_64::WriteFPR()
+{
+    assert(0);
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_x86_64::ReadRegister(const RegisterInfo *reg_info, RegisterValue &value)
+{
+    value = *(uint64_t *)(m_gpregset + reg_info->byte_offset);
+    return true;
+}
+
+bool
+RegisterContextCorePOSIX_x86_64::ReadAllRegisterValues(lldb::DataBufferSP &data_sp)
+{
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_x86_64::WriteRegister(const RegisterInfo *reg_info, const RegisterValue &value)
+{
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_x86_64::WriteAllRegisterValues(const lldb::DataBufferSP &data_sp)
+{
+    return false;
+}
+
+bool
+RegisterContextCorePOSIX_x86_64::HardwareSingleStep(bool enable)
+{
+    return false;
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.h b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.h
new file mode 100644
index 00000000000..d4ea14fab7b
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/RegisterContextPOSIXCore_x86_64.h
@@ -0,0 +1,58 @@
+//===-- RegisterContextCorePOSIX_x86_64.h ----------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===---------------------------------------------------------------------===//
+
+#ifndef liblldb_RegisterContextCorePOSIX_x86_64_H_
+#define liblldb_RegisterContextCorePOSIX_x86_64_H_
+
+#include "Plugins/Process/POSIX/RegisterContextPOSIX_x86.h"
+
+class RegisterContextCorePOSIX_x86_64 :
+    public RegisterContextPOSIX_x86
+{
+public:
+    RegisterContextCorePOSIX_x86_64 (lldb_private::Thread &thread,
+                                     RegisterInfoInterface *register_info,
+                                     const lldb_private::DataExtractor &gpregset,
+                                     const lldb_private::DataExtractor &fpregset);
+
+    ~RegisterContextCorePOSIX_x86_64();
+
+    virtual bool
+    ReadRegister(const lldb_private::RegisterInfo *reg_info, lldb_private::RegisterValue &value);
+
+    virtual bool
+    WriteRegister(const lldb_private::RegisterInfo *reg_info, const lldb_private::RegisterValue &value);
+
+    bool
+    ReadAllRegisterValues(lldb::DataBufferSP &data_sp);
+
+    bool
+    WriteAllRegisterValues(const lldb::DataBufferSP &data_sp);
+
+    bool
+    HardwareSingleStep(bool enable);
+
+protected:
+    bool
+    ReadGPR();
+
+    bool
+    ReadFPR();
+
+    bool
+    WriteGPR();
+
+    bool
+    WriteFPR();
+
+private:
+    uint8_t *m_gpregset;
+};
+
+#endif // #ifndef liblldb_RegisterContextCorePOSIX_x86_64_H_
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp
index a7229663dc8..3bda86dc0f7 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp
@@ -16,8 +16,11 @@
 
 #include "ThreadElfCore.h"
 #include "ProcessElfCore.h"
-#include "RegisterContextCoreFreeBSD_x86_64.h"
-#include "RegisterContextCoreLinux_x86_64.h"
+#include "RegisterContextLinux_x86_64.h"
+#include "RegisterContextFreeBSD_mips64.h"
+#include "RegisterContextFreeBSD_x86_64.h"
+#include "RegisterContextPOSIXCore_mips64.h"
+#include "RegisterContextPOSIXCore_x86_64.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -84,14 +87,28 @@ ThreadElfCore::CreateRegisterContextForFrame (StackFrame *frame)
         ArchSpec arch = process->GetArchitecture();
         switch (arch.GetMachine())
         {
+            case llvm::Triple::mips64:
+                switch (arch.GetTriple().getOS())
+                {
+                    case llvm::Triple::FreeBSD:
+                        m_thread_reg_ctx_sp.reset(new RegisterContextCorePOSIX_mips64 (*this, new RegisterContextFreeBSD_mips64(arch), m_gpregset_data, m_fpregset_data));
+                        break;
+                    default:
+                        if (log)
+                            log->Printf ("elf-core::%s:: OS(%d) not supported",
+                                         __FUNCTION__, arch.GetTriple().getOS());
+                        assert (false && "OS not supported");
+                        break;
+                }
+                break;
             case llvm::Triple::x86_64:
                 switch (arch.GetTriple().getOS())
                 {
                     case llvm::Triple::FreeBSD:
-                        m_thread_reg_ctx_sp.reset(new RegisterContextCoreFreeBSD_x86_64 (*this, m_gpregset_data, m_fpregset_data));
+                        m_thread_reg_ctx_sp.reset(new RegisterContextCorePOSIX_x86_64 (*this, new RegisterContextFreeBSD_x86_64(arch), m_gpregset_data, m_fpregset_data));
                         break;
                     case llvm::Triple::Linux:
-                        m_thread_reg_ctx_sp.reset(new RegisterContextCoreLinux_x86_64 (*this, m_gpregset_data, m_fpregset_data));
+                        m_thread_reg_ctx_sp.reset(new RegisterContextCorePOSIX_x86_64 (*this, new RegisterContextLinux_x86_64(arch), m_gpregset_data, m_fpregset_data));
                         break;
                     default:
                         if (log)
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h
index ca6339d7ec9..2661edfa50c 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h
@@ -29,6 +29,10 @@ struct compat_timeval
 #define ELFLINUXPRSTATUS64_SIZE (112)
 #define ELFLINUXPRPSINFO64_SIZE (132)
 
+#undef si_signo
+#undef si_code
+#undef si_errno
+
 struct ELFLinuxPrStatus
 {
     int32_t         si_signo;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
index d7efdf2302d..f67e1b5d49c 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp
@@ -133,7 +133,11 @@ GDBRemoteCommunication::GDBRemoteCommunication(const char *comm_name,
                                                const char *listener_name, 
                                                bool is_platform) :
     Communication(comm_name),
+#ifdef LLDB_CONFIGURATION_DEBUG
+    m_packet_timeout (1000),
+#else
     m_packet_timeout (1),
+#endif
     m_sequence_mutex (Mutex::eMutexTypeRecursive),
     m_public_is_running (false),
     m_private_is_running (false),
@@ -173,7 +177,7 @@ GDBRemoteCommunication::SendAck ()
     char ch = '+';
     const size_t bytes_written = Write (&ch, 1, status, NULL);
     if (log)
-        log->Printf ("<%4zu> send packet: %c", bytes_written, ch);
+        log->Printf ("<%4" PRIu64 "> send packet: %c", (uint64_t)bytes_written, ch);
     m_history.AddPacket (ch, History::ePacketTypeSend, bytes_written);
     return bytes_written;
 }
@@ -186,7 +190,7 @@ GDBRemoteCommunication::SendNack ()
     char ch = '-';
     const size_t bytes_written = Write (&ch, 1, status, NULL);
     if (log)
-        log->Printf ("<%4zu> send packet: %c", bytes_written, ch);
+        log->Printf("<%4" PRIu64 "> send packet: %c", (uint64_t)bytes_written, ch);
     m_history.AddPacket (ch, History::ePacketTypeSend, bytes_written);
     return bytes_written;
 }
@@ -222,7 +226,7 @@ GDBRemoteCommunication::SendPacketNoLock (const char *payload, size_t payload_le
             if (!m_history.DidDumpToLog ())
                 m_history.Dump (log);
 
-            log->Printf ("<%4zu> send packet: %.*s", bytes_written, (int)packet.GetSize(), packet.GetData());
+            log->Printf("<%4" PRIu64 "> send packet: %.*s", (uint64_t)bytes_written, (int)packet.GetSize(), packet.GetData());
         }
 
         m_history.AddPacket (packet.GetString(), packet.GetSize(), History::ePacketTypeSend, bytes_written);
@@ -456,13 +460,38 @@ GDBRemoteCommunication::CheckForPacket (const uint8_t *src, size_t src_len, Stri
                 if (!m_history.DidDumpToLog ())
                     m_history.Dump (log);
                 
-                log->Printf ("<%4zu> read packet: %.*s", total_length, (int)(total_length), m_bytes.c_str());
+                log->Printf("<%4" PRIu64 "> read packet: %.*s", (uint64_t)total_length, (int)(total_length), m_bytes.c_str());
             }
 
             m_history.AddPacket (m_bytes.c_str(), total_length, History::ePacketTypeRecv, total_length);
 
-            packet_str.assign (m_bytes, content_start, content_length);
-            
+            // Clear packet_str in case there is some existing data in it.
+            packet_str.clear();
+            // Copy the packet from m_bytes to packet_str expanding the
+            // run-length encoding in the process.
+            // Reserve enough byte for the most common case (no RLE used)
+            packet_str.reserve(m_bytes.length());
+            for (std::string::const_iterator c = m_bytes.begin() + content_start; c != m_bytes.begin() + content_start + content_length; ++c)
+            {
+                if (*c == '*')
+                {
+                    // '*' indicates RLE. Next character will give us the
+                    // repeat count and previous character is what is to be
+                    // repeated.
+                    char char_to_repeat = packet_str.back();
+                    // Number of time the previous character is repeated
+                    int repeat_count = *++c + 3 - ' ';
+                    // We have the char_to_repeat and repeat_count. Now push
+                    // it in the packet.
+                    for (int i = 0; i < repeat_count; ++i)
+                        packet_str.push_back(char_to_repeat);
+                }
+                else
+                {
+                    packet_str.push_back(*c);
+                }
+            }
+
             if (m_bytes[0] == '$')
             {
                 assert (checksum_idx < m_bytes.size());
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
index ca594a8f3fd..2690992eeed 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.cpp
@@ -11,6 +11,8 @@
 #include "GDBRemoteCommunicationClient.h"
 
 // C Includes
+#include <sys/stat.h>
+
 // C++ Includes
 #include <sstream>
 
@@ -20,6 +22,7 @@
 #include "lldb/Core/ConnectionFileDescriptor.h"
 #include "lldb/Core/Log.h"
 #include "lldb/Core/State.h"
+#include "lldb/Core/StreamGDBRemote.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Host/Endian.h"
 #include "lldb/Host/Host.h"
@@ -29,10 +32,15 @@
 #include "Utility/StringExtractorGDBRemote.h"
 #include "ProcessGDBRemote.h"
 #include "ProcessGDBRemoteLog.h"
+#include "lldb/Host/Config.h"
 
 using namespace lldb;
 using namespace lldb_private;
 
+#ifdef LLDB_DISABLE_POSIX
+#define SIGSTOP 17
+#endif
+
 //----------------------------------------------------------------------
 // GDBRemoteCommunicationClient constructor
 //----------------------------------------------------------------------
@@ -56,6 +64,8 @@ GDBRemoteCommunicationClient::GDBRemoteCommunicationClient(bool is_platform) :
     m_watchpoints_trigger_after_instruction(eLazyBoolCalculate),
     m_attach_or_wait_reply(eLazyBoolCalculate),
     m_prepare_for_reg_writing_reply (eLazyBoolCalculate),
+    m_supports_p (eLazyBoolCalculate),
+    m_supports_QSaveRegisterState (eLazyBoolCalculate),
     m_supports_qProcessInfoPID (true),
     m_supports_qfProcessInfo (true),
     m_supports_qUserName (true),
@@ -66,6 +76,8 @@ GDBRemoteCommunicationClient::GDBRemoteCommunicationClient(bool is_platform) :
     m_supports_z2 (true),
     m_supports_z3 (true),
     m_supports_z4 (true),
+    m_supports_QEnvironment (true),
+    m_supports_QEnvironmentHexEncoded (true),
     m_curr_tid (LLDB_INVALID_THREAD_ID),
     m_curr_tid_run (LLDB_INVALID_THREAD_ID),
     m_num_supported_hardware_watchpoints (0),
@@ -79,7 +91,11 @@ GDBRemoteCommunicationClient::GDBRemoteCommunicationClient(bool is_platform) :
     m_process_arch(),
     m_os_version_major (UINT32_MAX),
     m_os_version_minor (UINT32_MAX),
-    m_os_version_update (UINT32_MAX)
+    m_os_version_update (UINT32_MAX),
+    m_os_build (),
+    m_os_kernel (),
+    m_hostname (),
+    m_default_packet_timeout (0)
 {
 }
 
@@ -95,17 +111,35 @@ GDBRemoteCommunicationClient::~GDBRemoteCommunicationClient()
 bool
 GDBRemoteCommunicationClient::HandshakeWithServer (Error *error_ptr)
 {
+    ResetDiscoverableSettings();
+
     // Start the read thread after we send the handshake ack since if we
     // fail to send the handshake ack, there is no reason to continue...
     if (SendAck())
-        return true;
-    
-    if (error_ptr)
-        error_ptr->SetErrorString("failed to send the handshake ack");
+    {
+        // The return value from QueryNoAckModeSupported() is true if the packet
+        // was sent and _any_ response (including UNIMPLEMENTED) was received),
+        // or false if no response was received. This quickly tells us if we have
+        // a live connection to a remote GDB server...
+        if (QueryNoAckModeSupported())
+        {
+            return true;
+        }
+        else
+        {
+            if (error_ptr)
+                error_ptr->SetErrorString("failed to get reply to handshake packet");
+        }
+    }
+    else
+    {
+        if (error_ptr)
+            error_ptr->SetErrorString("failed to send the handshake ack");
+    }
     return false;
 }
 
-void
+bool
 GDBRemoteCommunicationClient::QueryNoAckModeSupported ()
 {
     if (m_supports_not_sending_acks == eLazyBoolCalculate)
@@ -121,8 +155,10 @@ GDBRemoteCommunicationClient::QueryNoAckModeSupported ()
                 m_send_acks = false;
                 m_supports_not_sending_acks = eLazyBoolYes;
             }
+            return true;
         }
     }
+    return false;
 }
 
 void
@@ -192,6 +228,8 @@ GDBRemoteCommunicationClient::ResetDiscoverableSettings()
     m_supports_vCont_C = eLazyBoolCalculate;
     m_supports_vCont_s = eLazyBoolCalculate;
     m_supports_vCont_S = eLazyBoolCalculate;
+    m_supports_p = eLazyBoolCalculate;
+    m_supports_QSaveRegisterState = eLazyBoolCalculate;
     m_qHostInfo_is_valid = eLazyBoolCalculate;
     m_qProcessInfo_is_valid = eLazyBoolCalculate;
     m_supports_alloc_dealloc_memory = eLazyBoolCalculate;
@@ -209,6 +247,8 @@ GDBRemoteCommunicationClient::ResetDiscoverableSettings()
     m_supports_z2 = true;
     m_supports_z3 = true;
     m_supports_z4 = true;
+    m_supports_QEnvironment = true;
+    m_supports_QEnvironmentHexEncoded = true;
     m_host_arch.Clear();
     m_process_arch.Clear();
 }
@@ -287,6 +327,32 @@ GDBRemoteCommunicationClient::GetVContSupported (char flavor)
     return false;
 }
 
+// Check if the target supports 'p' packet. It sends out a 'p'
+// packet and checks the response. A normal packet will tell us
+// that support is available.
+//
+// Takes a valid thread ID because p needs to apply to a thread.
+bool
+GDBRemoteCommunicationClient::GetpPacketSupported (lldb::tid_t tid)
+{
+    if (m_supports_p == eLazyBoolCalculate)
+    {
+        StringExtractorGDBRemote response;
+        m_supports_p = eLazyBoolNo;
+        char packet[256];
+        if (GetThreadSuffixSupported())
+            snprintf(packet, sizeof(packet), "p0;thread:%" PRIx64 ";", tid);
+        else
+            snprintf(packet, sizeof(packet), "p0");
+        
+        if (SendPacketAndWaitForResponse(packet, response, false))
+        {
+            if (response.IsNormalResponse())
+                m_supports_p = eLazyBoolYes;
+        }
+    }
+    return m_supports_p;
+}
 
 size_t
 GDBRemoteCommunicationClient::SendPacketAndWaitForResponse
@@ -943,19 +1009,43 @@ GDBRemoteCommunicationClient::GetLaunchSuccess (std::string &error_str)
 }
 
 int
-GDBRemoteCommunicationClient::SendArgumentsPacket (char const *argv[])
+GDBRemoteCommunicationClient::SendArgumentsPacket (const ProcessLaunchInfo &launch_info)
 {
-    if (argv && argv[0])
+    // Since we don't get the send argv0 separate from the executable path, we need to
+    // make sure to use the actual exectuable path found in the launch_info...
+    std::vector<const char *> argv;
+    FileSpec exe_file = launch_info.GetExecutableFile();
+    std::string exe_path;
+    const char *arg = NULL;
+    const Args &launch_args = launch_info.GetArguments();
+    if (exe_file)
+        exe_path = exe_file.GetPath();
+    else
+    {
+        arg = launch_args.GetArgumentAtIndex(0);
+        if (arg)
+            exe_path = arg;
+    }
+    if (!exe_path.empty())
+    {
+        argv.push_back(exe_path.c_str());
+        for (uint32_t i=1; (arg = launch_args.GetArgumentAtIndex(i)) != NULL; ++i)
+        {
+            if (arg)
+                argv.push_back(arg);
+        }
+    }
+    if (!argv.empty())
     {
         StreamString packet;
         packet.PutChar('A');
-        const char *arg;
-        for (uint32_t i = 0; (arg = argv[i]) != NULL; ++i)
+        for (size_t i = 0, n = argv.size(); i < n; ++i)
         {
+            arg = argv[i];
             const int arg_len = strlen(arg);
             if (i > 0)
                 packet.PutChar(',');
-            packet.Printf("%i,%i,", arg_len * 2, i);
+            packet.Printf("%i,%i,", arg_len * 2, (int)i);
             packet.PutBytesAsRawHex8 (arg, arg_len);
         }
 
@@ -978,15 +1068,61 @@ GDBRemoteCommunicationClient::SendEnvironmentPacket (char const *name_equal_valu
     if (name_equal_value && name_equal_value[0])
     {
         StreamString packet;
-        packet.Printf("QEnvironment:%s", name_equal_value);
-        StringExtractorGDBRemote response;
-        if (SendPacketAndWaitForResponse (packet.GetData(), packet.GetSize(), response, false))
+        bool send_hex_encoding = false;
+        for (const char *p = name_equal_value; *p != '\0' && send_hex_encoding == false; ++p)
         {
-            if (response.IsOKResponse())
-                return 0;
-            uint8_t error = response.GetError();
-            if (error)
-                return error;
+            if (isprint(*p))
+            {
+                switch (*p)
+                {
+                    case '$':
+                    case '#':
+                        send_hex_encoding = true;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            else
+            {
+                // We have non printable characters, lets hex encode this...
+                send_hex_encoding = true;
+            }
+        }
+        
+        StringExtractorGDBRemote response;
+        if (send_hex_encoding)
+        {
+            if (m_supports_QEnvironmentHexEncoded)
+            {
+                packet.PutCString("QEnvironmentHexEncoded:");
+                packet.PutBytesAsRawHex8 (name_equal_value, strlen(name_equal_value));
+                if (SendPacketAndWaitForResponse (packet.GetData(), packet.GetSize(), response, false))
+                {
+                    if (response.IsOKResponse())
+                        return 0;
+                    uint8_t error = response.GetError();
+                    if (error)
+                        return error;
+                    if (response.IsUnsupportedResponse())
+                        m_supports_QEnvironmentHexEncoded = false;
+                }
+            }
+            
+        }
+        else if (m_supports_QEnvironment)
+        {
+            packet.Printf("QEnvironment:%s", name_equal_value);
+            if (SendPacketAndWaitForResponse (packet.GetData(), packet.GetSize(), response, false))
+            {
+                if (response.IsOKResponse())
+                    return 0;
+                uint8_t error = response.GetError();
+                if (error)
+                    return error;
+                if (response.IsUnsupportedResponse())
+                    m_supports_QEnvironment = false;
+            }
         }
     }
     return -1;
@@ -1213,6 +1349,15 @@ GDBRemoteCommunicationClient::GetHostInfo (bool force)
                         else
                             --num_keys_decoded;
                     }
+                    else if (name.compare("default_packet_timeout") == 0)
+                    {
+                        m_default_packet_timeout = Args::StringToUInt32(value.c_str(), 0);
+                        if (m_default_packet_timeout > 0)
+                        {
+                            SetPacketTimeout(m_default_packet_timeout);
+                            ++num_keys_decoded;
+                        }
+                    }
 
                 }
                 
@@ -1347,6 +1492,14 @@ GDBRemoteCommunicationClient::GetHostArchitecture ()
     return m_host_arch;
 }
 
+uint32_t
+GDBRemoteCommunicationClient::GetHostDefaultPacketTimeout ()
+{
+    if (m_qHostInfo_is_valid == eLazyBoolCalculate)
+        GetHostInfo ();
+    return m_default_packet_timeout;
+}
+
 addr_t
 GDBRemoteCommunicationClient::AllocateMemory (size_t size, uint32_t permissions)
 {
@@ -1676,6 +1829,22 @@ GDBRemoteCommunicationClient::SetSTDERR (char const *path)
     return -1;
 }
 
+bool
+GDBRemoteCommunicationClient::GetWorkingDir (std::string &cwd)
+{
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse ("qGetWorkingDir", response, false))
+    {
+        if (response.IsUnsupportedResponse())
+            return false;
+        if (response.IsErrorResponse())
+            return false;
+        response.GetHexByteString (cwd);
+        return !cwd.empty();
+    }
+    return false;
+}
+
 int
 GDBRemoteCommunicationClient::SetWorkingDir (char const *path)
 {
@@ -2132,27 +2301,60 @@ GDBRemoteCommunicationClient::SendSpeedTestPacket (uint32_t send_size, uint32_t
 }
 
 uint16_t
-GDBRemoteCommunicationClient::LaunchGDBserverAndGetPort ()
+GDBRemoteCommunicationClient::LaunchGDBserverAndGetPort (lldb::pid_t &pid)
 {
+    pid = LLDB_INVALID_PROCESS_ID;
     StringExtractorGDBRemote response;
-    if (SendPacketAndWaitForResponse("qLaunchGDBServer", strlen("qLaunchGDBServer"), response, false))
+    StreamString stream;
+    stream.PutCString("qLaunchGDBServer;");
+    std::string hostname;
+    if (Host::GetHostname (hostname))
+    {
+        // Make the GDB server we launch only accept connections from this host
+        stream.Printf("host:%s;", hostname.c_str());
+    }
+    else
+    {
+        // Make the GDB server we launch accept connections from any host since we can't figure out the hostname
+        stream.Printf("host:*;");
+    }
+    const char *packet = stream.GetData();
+    int packet_len = stream.GetSize();
+
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
     {
         std::string name;
         std::string value;
         uint16_t port = 0;
-        //lldb::pid_t pid = LLDB_INVALID_PROCESS_ID;
         while (response.GetNameColonValue(name, value))
         {
-            if (name.size() == 4 && name.compare("port") == 0)
+            if (name.compare("port") == 0)
                 port = Args::StringToUInt32(value.c_str(), 0, 0);
-//            if (name.size() == 3 && name.compare("pid") == 0)
-//                pid = Args::StringToUInt32(value.c_str(), LLDB_INVALID_PROCESS_ID, 0);
+            else if (name.compare("pid") == 0)
+                pid = Args::StringToUInt64(value.c_str(), LLDB_INVALID_PROCESS_ID, 0);
         }
         return port;
     }
     return 0;
 }
 
+bool
+GDBRemoteCommunicationClient::KillSpawnedProcess (lldb::pid_t pid)
+{
+    StreamString stream;
+    stream.Printf ("qKillSpawnedProcess:%" PRId64 , pid);
+    const char *packet = stream.GetData();
+    int packet_len = stream.GetSize();
+
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.IsOKResponse())
+            return true;
+    }
+    return false;
+}
+
 bool
 GDBRemoteCommunicationClient::SetCurrentThread (uint64_t tid)
 {
@@ -2222,7 +2424,9 @@ GDBRemoteCommunicationClient::GetThreadStopInfo (lldb::tid_t tid, StringExtracto
         assert (packet_len < (int)sizeof(packet));
         if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
         {
-            if (response.IsNormalResponse())
+            if (response.IsUnsupportedResponse())
+                m_supports_qThreadStopInfo = false;
+            else if (response.IsNormalResponse())
                 return true;
             else
                 return false;
@@ -2232,8 +2436,6 @@ GDBRemoteCommunicationClient::GetThreadStopInfo (lldb::tid_t tid, StringExtracto
             m_supports_qThreadStopInfo = false;
         }
     }
-//    if (SetCurrentThread (tid))
-//        return GetStopReply (response);
     return false;
 }
 
@@ -2346,3 +2548,566 @@ GDBRemoteCommunicationClient::GetShlibInfoAddr()
     return LLDB_INVALID_ADDRESS;
 }
 
+lldb_private::Error
+GDBRemoteCommunicationClient::RunShellCommand (const char *command,           // Shouldn't be NULL
+                                               const char *working_dir,       // Pass NULL to use the current working directory
+                                               int *status_ptr,               // Pass NULL if you don't want the process exit status
+                                               int *signo_ptr,                // Pass NULL if you don't want the signal that caused the process to exit
+                                               std::string *command_output,   // Pass NULL if you don't want the command output
+                                               uint32_t timeout_sec)          // Timeout in seconds to wait for shell program to finish
+{
+    lldb_private::StreamString stream;
+    stream.PutCString("qPlatform_shell:");
+    stream.PutBytesAsRawHex8(command, strlen(command));
+    stream.PutChar(',');
+    stream.PutHex32(timeout_sec);
+    if (working_dir && *working_dir)
+    {
+        stream.PutChar(',');
+        stream.PutBytesAsRawHex8(working_dir, strlen(working_dir));
+    }
+    const char *packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.GetChar() != 'F')
+            return Error("malformed reply");
+        if (response.GetChar() != ',')
+            return Error("malformed reply");
+        uint32_t exitcode = response.GetHexMaxU32(false, UINT32_MAX);
+        if (exitcode == UINT32_MAX)
+            return Error("unable to run remote process");
+        else if (status_ptr)
+            *status_ptr = exitcode;
+        if (response.GetChar() != ',')
+            return Error("malformed reply");
+        uint32_t signo = response.GetHexMaxU32(false, UINT32_MAX);
+        if (signo_ptr)
+            *signo_ptr = signo;
+        if (response.GetChar() != ',')
+            return Error("malformed reply");
+        std::string output;
+        response.GetEscapedBinaryData(output);
+        if (command_output)
+            command_output->assign(output);
+        return Error();
+    }
+    return Error("unable to send packet");
+}
+
+Error
+GDBRemoteCommunicationClient::MakeDirectory (const char *path,
+                                             uint32_t file_permissions)
+{
+    lldb_private::StreamString stream;
+    stream.PutCString("qPlatform_mkdir:");
+    stream.PutHex32(file_permissions);
+    stream.PutChar(',');
+    stream.PutBytesAsRawHex8(path, strlen(path));
+    const char *packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        return Error(response.GetHexMaxU32(false, UINT32_MAX), eErrorTypePOSIX);
+    }
+    return Error();
+
+}
+
+Error
+GDBRemoteCommunicationClient::SetFilePermissions (const char *path,
+                                                  uint32_t file_permissions)
+{
+    lldb_private::StreamString stream;
+    stream.PutCString("qPlatform_chmod:");
+    stream.PutHex32(file_permissions);
+    stream.PutChar(',');
+    stream.PutBytesAsRawHex8(path, strlen(path));
+    const char *packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        return Error(response.GetHexMaxU32(false, UINT32_MAX), eErrorTypePOSIX);
+    }
+    return Error();
+    
+}
+
+static uint64_t
+ParseHostIOPacketResponse (StringExtractorGDBRemote &response,
+                           uint64_t fail_result,
+                           Error &error)
+{
+    response.SetFilePos(0);
+    if (response.GetChar() != 'F')
+        return fail_result;
+    int32_t result = response.GetS32 (-2);
+    if (result == -2)
+        return fail_result;
+    if (response.GetChar() == ',')
+    {
+        int result_errno = response.GetS32 (-2);
+        if (result_errno != -2)
+            error.SetError(result_errno, eErrorTypePOSIX);
+        else
+            error.SetError(-1, eErrorTypeGeneric);
+    }
+    else
+        error.Clear();
+    return  result;
+}
+lldb::user_id_t
+GDBRemoteCommunicationClient::OpenFile (const lldb_private::FileSpec& file_spec,
+                                        uint32_t flags,
+                                        mode_t mode,
+                                        Error &error)
+{
+    lldb_private::StreamString stream;
+    stream.PutCString("vFile:open:");
+    std::string path (file_spec.GetPath());
+    if (path.empty())
+        return UINT64_MAX;
+    stream.PutCStringAsRawHex8(path.c_str());
+    stream.PutChar(',');
+    const uint32_t posix_open_flags = File::ConvertOpenOptionsForPOSIXOpen(flags);
+    stream.PutHex32(posix_open_flags);
+    stream.PutChar(',');
+    stream.PutHex32(mode);
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        return ParseHostIOPacketResponse (response, UINT64_MAX, error);
+    }
+    return UINT64_MAX;
+}
+
+bool
+GDBRemoteCommunicationClient::CloseFile (lldb::user_id_t fd,
+                                         Error &error)
+{
+    lldb_private::StreamString stream;
+    stream.Printf("vFile:close:%i", (int)fd);
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        return ParseHostIOPacketResponse (response, -1, error) == 0;
+    }
+    return false;
+}
+
+// Extension of host I/O packets to get the file size.
+lldb::user_id_t
+GDBRemoteCommunicationClient::GetFileSize (const lldb_private::FileSpec& file_spec)
+{
+    lldb_private::StreamString stream;
+    stream.PutCString("vFile:size:");
+    std::string path (file_spec.GetPath());
+    stream.PutCStringAsRawHex8(path.c_str());
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.GetChar() != 'F')
+            return UINT64_MAX;
+        uint32_t retcode = response.GetHexMaxU64(false, UINT64_MAX);
+        return retcode;
+    }
+    return UINT64_MAX;
+}
+
+Error
+GDBRemoteCommunicationClient::GetFilePermissions(const char *path, uint32_t &file_permissions)
+{
+    Error error;
+    lldb_private::StreamString stream;
+    stream.PutCString("vFile:mode:");
+    stream.PutCStringAsRawHex8(path);
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.GetChar() != 'F')
+        {
+            error.SetErrorStringWithFormat ("invalid response to '%s' packet", packet);
+        }
+        else
+        {
+            const uint32_t mode = response.GetS32(-1);
+            if (mode == -1)
+            {
+                if (response.GetChar() == ',')
+                {
+                    int response_errno = response.GetS32(-1);
+                    if (response_errno > 0)
+                        error.SetError(response_errno, lldb::eErrorTypePOSIX);
+                    else
+                        error.SetErrorToGenericError();
+                }
+                else
+                    error.SetErrorToGenericError();
+            }
+            else
+            {
+                file_permissions = mode & (S_IRWXU|S_IRWXG|S_IRWXO);
+            }
+        }
+    }
+    else
+    {
+        error.SetErrorStringWithFormat ("failed to send '%s' packet", packet);
+    }
+    return error;
+}
+
+uint64_t
+GDBRemoteCommunicationClient::ReadFile (lldb::user_id_t fd,
+                                        uint64_t offset,
+                                        void *dst,
+                                        uint64_t dst_len,
+                                        Error &error)
+{
+    lldb_private::StreamString stream;
+    stream.Printf("vFile:pread:%i,%" PRId64 ",%" PRId64, (int)fd, dst_len, offset);
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.GetChar() != 'F')
+            return 0;
+        uint32_t retcode = response.GetHexMaxU32(false, UINT32_MAX);
+        if (retcode == UINT32_MAX)
+            return retcode;
+        const char next = (response.Peek() ? *response.Peek() : 0);
+        if (next == ',')
+            return 0;
+        if (next == ';')
+        {
+            response.GetChar(); // skip the semicolon
+            std::string buffer;
+            if (response.GetEscapedBinaryData(buffer))
+            {
+                const uint64_t data_to_write = std::min<uint64_t>(dst_len, buffer.size());
+                if (data_to_write > 0)
+                    memcpy(dst, &buffer[0], data_to_write);
+                return data_to_write;
+            }
+        }
+    }
+    return 0;
+}
+
+uint64_t
+GDBRemoteCommunicationClient::WriteFile (lldb::user_id_t fd,
+                                         uint64_t offset,
+                                         const void* src,
+                                         uint64_t src_len,
+                                         Error &error)
+{
+    lldb_private::StreamGDBRemote stream;
+    stream.Printf("vFile:pwrite:%i,%" PRId64 ",", (int)fd, offset);
+    stream.PutEscapedBytes(src, src_len);
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.GetChar() != 'F')
+        {
+            error.SetErrorStringWithFormat("write file failed");
+            return 0;
+        }
+        uint64_t bytes_written = response.GetU64(UINT64_MAX);
+        if (bytes_written == UINT64_MAX)
+        {
+            error.SetErrorToGenericError();
+            if (response.GetChar() == ',')
+            {
+                int response_errno = response.GetS32(-1);
+                if (response_errno > 0)
+                    error.SetError(response_errno, lldb::eErrorTypePOSIX);
+            }
+            return 0;
+        }
+        return bytes_written;
+    }
+    else
+    {
+        error.SetErrorString ("failed to send vFile:pwrite packet");
+    }
+    return 0;
+}
+
+Error
+GDBRemoteCommunicationClient::CreateSymlink (const char *src, const char *dst)
+{
+    Error error;
+    lldb_private::StreamGDBRemote stream;
+    stream.PutCString("vFile:symlink:");
+    // the unix symlink() command reverses its parameters where the dst if first,
+    // so we follow suit here
+    stream.PutCStringAsRawHex8(dst);
+    stream.PutChar(',');
+    stream.PutCStringAsRawHex8(src);
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.GetChar() == 'F')
+        {
+            uint32_t result = response.GetU32(UINT32_MAX);
+            if (result != 0)
+            {
+                error.SetErrorToGenericError();
+                if (response.GetChar() == ',')
+                {
+                    int response_errno = response.GetS32(-1);
+                    if (response_errno > 0)
+                        error.SetError(response_errno, lldb::eErrorTypePOSIX);
+                }
+            }
+        }
+        else
+        {
+            // Should have returned with 'F<result>[,<errno>]'
+            error.SetErrorStringWithFormat("symlink failed");
+        }
+    }
+    else
+    {
+        error.SetErrorString ("failed to send vFile:symlink packet");
+    }
+    return error;
+}
+
+Error
+GDBRemoteCommunicationClient::Unlink (const char *path)
+{
+    Error error;
+    lldb_private::StreamGDBRemote stream;
+    stream.PutCString("vFile:unlink:");
+    // the unix symlink() command reverses its parameters where the dst if first,
+    // so we follow suit here
+    stream.PutCStringAsRawHex8(path);
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.GetChar() == 'F')
+        {
+            uint32_t result = response.GetU32(UINT32_MAX);
+            if (result != 0)
+            {
+                error.SetErrorToGenericError();
+                if (response.GetChar() == ',')
+                {
+                    int response_errno = response.GetS32(-1);
+                    if (response_errno > 0)
+                        error.SetError(response_errno, lldb::eErrorTypePOSIX);
+                }
+            }
+        }
+        else
+        {
+            // Should have returned with 'F<result>[,<errno>]'
+            error.SetErrorStringWithFormat("unlink failed");
+        }
+    }
+    else
+    {
+        error.SetErrorString ("failed to send vFile:unlink packet");
+    }
+    return error;
+}
+
+// Extension of host I/O packets to get whether a file exists.
+bool
+GDBRemoteCommunicationClient::GetFileExists (const lldb_private::FileSpec& file_spec)
+{
+    lldb_private::StreamString stream;
+    stream.PutCString("vFile:exists:");
+    std::string path (file_spec.GetPath());
+    stream.PutCStringAsRawHex8(path.c_str());
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.GetChar() != 'F')
+            return false;
+        if (response.GetChar() != ',')
+            return false;
+        bool retcode = (response.GetChar() != '0');
+        return retcode;
+    }
+    return false;
+}
+
+bool
+GDBRemoteCommunicationClient::CalculateMD5 (const lldb_private::FileSpec& file_spec,
+                                            uint64_t &high,
+                                            uint64_t &low)
+{
+    lldb_private::StreamString stream;
+    stream.PutCString("vFile:MD5:");
+    std::string path (file_spec.GetPath());
+    stream.PutCStringAsRawHex8(path.c_str());
+    const char* packet = stream.GetData();
+    int packet_len = stream.GetSize();
+    StringExtractorGDBRemote response;
+    if (SendPacketAndWaitForResponse(packet, packet_len, response, false))
+    {
+        if (response.GetChar() != 'F')
+            return false;
+        if (response.GetChar() != ',')
+            return false;
+        if (response.Peek() && *response.Peek() == 'x')
+            return false;
+        low = response.GetHexMaxU64(false, UINT64_MAX);
+        high = response.GetHexMaxU64(false, UINT64_MAX);
+        return true;
+    }
+    return false;
+}
+
+bool
+GDBRemoteCommunicationClient::ReadRegister(lldb::tid_t tid, uint32_t reg, StringExtractorGDBRemote &response)
+{
+    Mutex::Locker locker;
+    if (GetSequenceMutex (locker, "Didn't get sequence mutex for p packet."))
+    {
+        const bool thread_suffix_supported = GetThreadSuffixSupported();
+        
+        if (thread_suffix_supported || SetCurrentThread(tid))
+        {
+            char packet[64];
+            int packet_len = 0;
+            if (thread_suffix_supported)
+                packet_len = ::snprintf (packet, sizeof(packet), "p%x;thread:%4.4" PRIx64 ";", reg, tid);
+            else
+                packet_len = ::snprintf (packet, sizeof(packet), "p%x", reg);
+            assert (packet_len < ((int)sizeof(packet) - 1));
+            return SendPacketAndWaitForResponse(packet, response, false);
+        }
+    }
+    return false;
+
+}
+
+
+bool
+GDBRemoteCommunicationClient::ReadAllRegisters (lldb::tid_t tid, StringExtractorGDBRemote &response)
+{
+    Mutex::Locker locker;
+    if (GetSequenceMutex (locker, "Didn't get sequence mutex for g packet."))
+    {
+        const bool thread_suffix_supported = GetThreadSuffixSupported();
+
+        if (thread_suffix_supported || SetCurrentThread(tid))
+        {
+            char packet[64];
+            int packet_len = 0;
+            // Get all registers in one packet
+            if (thread_suffix_supported)
+                packet_len = ::snprintf (packet, sizeof(packet), "g;thread:%4.4" PRIx64 ";", tid);
+            else
+                packet_len = ::snprintf (packet, sizeof(packet), "g");
+            assert (packet_len < ((int)sizeof(packet) - 1));
+            return SendPacketAndWaitForResponse(packet, response, false);
+        }
+    }
+    return false;
+}
+bool
+GDBRemoteCommunicationClient::SaveRegisterState (lldb::tid_t tid, uint32_t &save_id)
+{
+    save_id = 0; // Set to invalid save ID
+    if (m_supports_QSaveRegisterState == eLazyBoolNo)
+        return false;
+    
+    m_supports_QSaveRegisterState = eLazyBoolYes;
+    Mutex::Locker locker;
+    if (GetSequenceMutex (locker, "Didn't get sequence mutex for QSaveRegisterState."))
+    {
+        const bool thread_suffix_supported = GetThreadSuffixSupported();
+        if (thread_suffix_supported || SetCurrentThread(tid))
+        {
+            char packet[256];
+            if (thread_suffix_supported)
+                ::snprintf (packet, sizeof(packet), "QSaveRegisterState;thread:%4.4" PRIx64 ";", tid);
+            else
+                ::strncpy (packet, "QSaveRegisterState", sizeof(packet));
+            
+            StringExtractorGDBRemote response;
+
+            if (SendPacketAndWaitForResponse(packet, response, false))
+            {
+                if (response.IsUnsupportedResponse())
+                {
+                    // This packet isn't supported, don't try calling it again
+                    m_supports_QSaveRegisterState = eLazyBoolNo;
+                }
+                    
+                const uint32_t response_save_id = response.GetU32(0);
+                if (response_save_id != 0)
+                {
+                    save_id = response_save_id;
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
+
+bool
+GDBRemoteCommunicationClient::RestoreRegisterState (lldb::tid_t tid, uint32_t save_id)
+{
+    // We use the "m_supports_QSaveRegisterState" variable here becuase the
+    // QSaveRegisterState and QRestoreRegisterState packets must both be supported in
+    // order to be useful
+    if (m_supports_QSaveRegisterState == eLazyBoolNo)
+        return false;
+    
+    Mutex::Locker locker;
+    if (GetSequenceMutex (locker, "Didn't get sequence mutex for QRestoreRegisterState."))
+    {
+        const bool thread_suffix_supported = GetThreadSuffixSupported();
+        if (thread_suffix_supported || SetCurrentThread(tid))
+        {
+            char packet[256];
+            if (thread_suffix_supported)
+                ::snprintf (packet, sizeof(packet), "QRestoreRegisterState:%u;thread:%4.4" PRIx64 ";", save_id, tid);
+            else
+                ::snprintf (packet, sizeof(packet), "QRestoreRegisterState:%u" PRIx64 ";", save_id);
+            
+            StringExtractorGDBRemote response;
+            
+            if (SendPacketAndWaitForResponse(packet, response, false))
+            {
+                if (response.IsOKResponse())
+                {
+                    return true;
+                }
+                else if (response.IsUnsupportedResponse())
+                {
+                    // This packet isn't supported, don't try calling this packet or
+                    // QSaveRegisterState again...
+                    m_supports_QSaveRegisterState = eLazyBoolNo;
+                }
+            }
+        }
+    }
+    return false;
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h
index 5bb8387b909..564afbb2911 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h
@@ -38,7 +38,6 @@ public:
     //------------------------------------------------------------------
     GDBRemoteCommunicationClient(bool is_platform);
 
-    virtual
     ~GDBRemoteCommunicationClient();
 
     //------------------------------------------------------------------
@@ -65,10 +64,16 @@ public:
                                           size_t packet_length,
                                           StringExtractorGDBRemote &response);
 
-    virtual bool
+    bool
     GetThreadSuffixSupported ();
 
-    void
+    // This packet is usually sent first and the boolean return value
+    // indicates if the packet was send and any response was received
+    // even in the response is UNIMPLEMENTED. If the packet failed to
+    // get a response, then false is returned. This quickly tells us
+    // if we were able to connect and communicte with the remote GDB
+    // server
+    bool
     QueryNoAckModeSupported ();
 
     void
@@ -89,7 +94,10 @@ public:
     GetLaunchSuccess (std::string &error_str);
 
     uint16_t
-    LaunchGDBserverAndGetPort ();
+    LaunchGDBserverAndGetPort (lldb::pid_t &pid);
+    
+    bool
+    KillSpawnedProcess (lldb::pid_t pid);
 
     //------------------------------------------------------------------
     /// Sends a GDB remote protocol 'A' packet that delivers program
@@ -106,7 +114,7 @@ public:
     ///     response was received.
     //------------------------------------------------------------------
     int
-    SendArgumentsPacket (char const *argv[]);
+    SendArgumentsPacket (const lldb_private::ProcessLaunchInfo &launch_info);
 
     //------------------------------------------------------------------
     /// Sends a "QEnvironment:NAME=VALUE" packet that will build up the
@@ -182,7 +190,10 @@ public:
 
     //------------------------------------------------------------------
     /// Sets the working directory to \a path for a process that will 
-    /// be launched with the 'A' packet.
+    /// be launched with the 'A' packet for non platform based
+    /// connections. If this packet is sent to a GDB server that
+    /// implements the platform, it will change the current working
+    /// directory for the platform process.
     ///
     /// @param[in] path
     ///     The path to a directory to use when launching our processs
@@ -193,6 +204,19 @@ public:
     int
     SetWorkingDir (char const *path);
 
+    //------------------------------------------------------------------
+    /// Gets the current working directory of a remote platform GDB
+    /// server.
+    ///
+    /// @param[out] cwd
+    ///     The current working directory on the remote platform.
+    ///
+    /// @return
+    ///     Boolean for success
+    //------------------------------------------------------------------
+    bool
+    GetWorkingDir (std::string &cwd);
+
     lldb::addr_t
     AllocateMemory (size_t size, uint32_t permissions);
 
@@ -217,6 +241,9 @@ public:
 
     const lldb_private::ArchSpec &
     GetHostArchitecture ();
+    
+    uint32_t
+    GetHostDefaultPacketTimeout();
 
     const lldb_private::ArchSpec &
     GetProcessArchitecture ();
@@ -224,6 +251,9 @@ public:
     bool
     GetVContSupported (char flavor);
 
+    bool
+    GetpPacketSupported (lldb::tid_t tid);
+
     bool
     GetVAttachOrWaitSupported ();
     
@@ -347,9 +377,84 @@ public:
         return m_interrupt_sent;
     }
     
+    lldb::user_id_t
+    OpenFile (const lldb_private::FileSpec& file_spec,
+              uint32_t flags,
+              mode_t mode,
+              lldb_private::Error &error);
+    
+    bool
+    CloseFile (lldb::user_id_t fd,
+               lldb_private::Error &error);
+    
+    lldb::user_id_t
+    GetFileSize (const lldb_private::FileSpec& file_spec);
+    
+    lldb_private::Error
+    GetFilePermissions(const char *path, uint32_t &file_permissions);
+
+    lldb_private::Error
+    SetFilePermissions(const char *path, uint32_t file_permissions);
+
+    uint64_t
+    ReadFile (lldb::user_id_t fd,
+              uint64_t offset,
+              void *dst,
+              uint64_t dst_len,
+              lldb_private::Error &error);
+    
+    uint64_t
+    WriteFile (lldb::user_id_t fd,
+               uint64_t offset,
+               const void* src,
+               uint64_t src_len,
+               lldb_private::Error &error);
+    
+    lldb_private::Error
+    CreateSymlink (const char *src,
+                   const char *dst);
+    
+    lldb_private::Error
+    Unlink (const char *path);
+
+    lldb_private::Error
+    MakeDirectory (const char *path,
+                   uint32_t mode);
+    
+    bool
+    GetFileExists (const lldb_private::FileSpec& file_spec);
+    
+    lldb_private::Error
+    RunShellCommand (const char *command,           // Shouldn't be NULL
+                     const char *working_dir,       // Pass NULL to use the current working directory
+                     int *status_ptr,               // Pass NULL if you don't want the process exit status
+                     int *signo_ptr,                // Pass NULL if you don't want the signal that caused the process to exit
+                     std::string *command_output,   // Pass NULL if you don't want the command output
+                     uint32_t timeout_sec);         // Timeout in seconds to wait for shell program to finish
+    
+    bool
+    CalculateMD5 (const lldb_private::FileSpec& file_spec,
+                  uint64_t &high,
+                  uint64_t &low);
+    
     std::string
     HarmonizeThreadIdsForProfileData (ProcessGDBRemote *process,
                                       StringExtractorGDBRemote &inputStringExtractor);
+
+    bool
+    ReadRegister(lldb::tid_t tid,
+                 uint32_t reg_num,
+                 StringExtractorGDBRemote &response);
+
+    bool
+    ReadAllRegisters (lldb::tid_t tid,
+                      StringExtractorGDBRemote &response);
+
+    bool
+    SaveRegisterState (lldb::tid_t tid, uint32_t &save_id);
+    
+    bool
+    RestoreRegisterState (lldb::tid_t tid, uint32_t save_id);
     
 protected:
 
@@ -377,6 +482,8 @@ protected:
     lldb_private::LazyBool m_watchpoints_trigger_after_instruction;
     lldb_private::LazyBool m_attach_or_wait_reply;
     lldb_private::LazyBool m_prepare_for_reg_writing_reply;
+    lldb_private::LazyBool m_supports_p;
+    lldb_private::LazyBool m_supports_QSaveRegisterState;
     
     bool
         m_supports_qProcessInfoPID:1,
@@ -388,7 +495,9 @@ protected:
         m_supports_z1:1,
         m_supports_z2:1,
         m_supports_z3:1,
-        m_supports_z4:1;
+        m_supports_z4:1,
+        m_supports_QEnvironment:1,
+        m_supports_QEnvironmentHexEncoded:1;
     
 
     lldb::tid_t m_curr_tid;         // Current gdb remote protocol thread index for all other operations
@@ -416,6 +525,7 @@ protected:
     std::string m_os_build;
     std::string m_os_kernel;
     std::string m_hostname;
+    uint32_t m_default_packet_timeout;
     
     bool
     DecodeProcessInfoResponse (StringExtractorGDBRemote &response, 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
index 3a14e9fe759..7cc3a05304d 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp
@@ -7,8 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include <errno.h>
 
 #include "GDBRemoteCommunicationServer.h"
+#include "lldb/Core/StreamGDBRemote.h"
 
 // C Includes
 // C++ Includes
@@ -20,6 +22,7 @@
 #include "lldb/Core/State.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Host/Endian.h"
+#include "lldb/Host/File.h"
 #include "lldb/Host/Host.h"
 #include "lldb/Host/TimeValue.h"
 #include "lldb/Target/Process.h"
@@ -40,10 +43,12 @@ GDBRemoteCommunicationServer::GDBRemoteCommunicationServer(bool is_platform) :
     m_async_thread (LLDB_INVALID_HOST_THREAD),
     m_process_launch_info (),
     m_process_launch_error (),
+    m_spawned_pids (),
+    m_spawned_pids_mutex (Mutex::eMutexTypeRecursive),
     m_proc_infos (),
     m_proc_infos_index (0),
-    m_lo_port_num (0),
-    m_hi_port_num (0)
+    m_port_map (),
+    m_port_offset(0)
 {
 }
 
@@ -65,7 +70,7 @@ GDBRemoteCommunicationServer::~GDBRemoteCommunicationServer()
 //        log->Printf ("ProcessGDBRemote::%s (arg = %p, pid = %i) thread starting...", __FUNCTION__, arg, process->GetID());
 //
 //    StringExtractorGDBRemote packet;
-//    
+//
 //    while ()
 //    {
 //        if (packet.
@@ -79,9 +84,9 @@ GDBRemoteCommunicationServer::~GDBRemoteCommunicationServer()
 //}
 //
 bool
-GDBRemoteCommunicationServer::GetPacketAndSendResponse (uint32_t timeout_usec, 
+GDBRemoteCommunicationServer::GetPacketAndSendResponse (uint32_t timeout_usec,
                                                         Error &error,
-                                                        bool &interrupt, 
+                                                        bool &interrupt,
                                                         bool &quit)
 {
     StringExtractorGDBRemote packet;
@@ -103,7 +108,7 @@ GDBRemoteCommunicationServer::GetPacketAndSendResponse (uint32_t timeout_usec,
                 error.SetErrorString("interrupt received");
                 interrupt = true;
                 break;
-            
+
             case StringExtractorGDBRemote::eServerPacketType_unimplemented:
                 return SendUnimplementedResponse (packet.GetStringRef().c_str()) > 0;
 
@@ -112,22 +117,25 @@ GDBRemoteCommunicationServer::GetPacketAndSendResponse (uint32_t timeout_usec,
 
             case StringExtractorGDBRemote::eServerPacketType_qfProcessInfo:
                 return Handle_qfProcessInfo (packet);
-                
+
             case StringExtractorGDBRemote::eServerPacketType_qsProcessInfo:
                 return Handle_qsProcessInfo (packet);
-                
+
             case StringExtractorGDBRemote::eServerPacketType_qC:
                 return Handle_qC (packet);
-                
+
             case StringExtractorGDBRemote::eServerPacketType_qHostInfo:
                 return Handle_qHostInfo (packet);
-                
+
             case StringExtractorGDBRemote::eServerPacketType_qLaunchGDBServer:
                 return Handle_qLaunchGDBServer (packet);
-                
+
+            case StringExtractorGDBRemote::eServerPacketType_qKillSpawnedProcess:
+                return Handle_qKillSpawnedProcess (packet);
+
             case StringExtractorGDBRemote::eServerPacketType_qLaunchSuccess:
                 return Handle_qLaunchSuccess (packet);
-                
+
             case StringExtractorGDBRemote::eServerPacketType_qGroupName:
                 return Handle_qGroupName (packet);
 
@@ -140,26 +148,74 @@ GDBRemoteCommunicationServer::GetPacketAndSendResponse (uint32_t timeout_usec,
             case StringExtractorGDBRemote::eServerPacketType_qUserName:
                 return Handle_qUserName (packet);
 
+            case StringExtractorGDBRemote::eServerPacketType_qGetWorkingDir:
+                return Handle_qGetWorkingDir(packet);
+    
             case StringExtractorGDBRemote::eServerPacketType_QEnvironment:
                 return Handle_QEnvironment (packet);
-            
+
+            case StringExtractorGDBRemote::eServerPacketType_QLaunchArch:
+                return Handle_QLaunchArch (packet);
+
             case StringExtractorGDBRemote::eServerPacketType_QSetDisableASLR:
                 return Handle_QSetDisableASLR (packet);
-            
+
             case StringExtractorGDBRemote::eServerPacketType_QSetSTDIN:
                 return Handle_QSetSTDIN (packet);
-            
+
             case StringExtractorGDBRemote::eServerPacketType_QSetSTDOUT:
                 return Handle_QSetSTDOUT (packet);
-            
+
             case StringExtractorGDBRemote::eServerPacketType_QSetSTDERR:
                 return Handle_QSetSTDERR (packet);
-            
+
             case StringExtractorGDBRemote::eServerPacketType_QSetWorkingDir:
                 return Handle_QSetWorkingDir (packet);
 
             case StringExtractorGDBRemote::eServerPacketType_QStartNoAckMode:
                 return Handle_QStartNoAckMode (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_qPlatform_mkdir:
+                return Handle_qPlatform_mkdir (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_qPlatform_chmod:
+                return Handle_qPlatform_chmod (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_qPlatform_shell:
+                return Handle_qPlatform_shell (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_open:
+                return Handle_vFile_Open (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_close:
+                return Handle_vFile_Close (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_pread:
+                return Handle_vFile_pRead (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_pwrite:
+                return Handle_vFile_pWrite (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_size:
+                return Handle_vFile_Size (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_mode:
+                return Handle_vFile_Mode (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_exists:
+                return Handle_vFile_Exists (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_stat:
+                return Handle_vFile_Stat (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_md5:
+                return Handle_vFile_MD5 (packet);
+
+            case StringExtractorGDBRemote::eServerPacketType_vFile_symlink:
+                return Handle_vFile_symlink (packet);
+                
+            case StringExtractorGDBRemote::eServerPacketType_vFile_unlink:
+                return Handle_vFile_unlink (packet);
         }
         return true;
     }
@@ -207,7 +263,7 @@ bool
 GDBRemoteCommunicationServer::Handle_qHostInfo (StringExtractorGDBRemote &packet)
 {
     StreamString response;
-    
+
     // $cputype:16777223;cpusubtype:3;ostype:Darwin;vendor:apple;endian:little;ptrsize:8;#00
 
     ArchSpec host_arch (Host::GetArchitecture ());
@@ -222,12 +278,12 @@ GDBRemoteCommunicationServer::Handle_qHostInfo (StringExtractorGDBRemote &packet
         response.Printf ("cputype:%u;", cpu);
     if (sub != LLDB_INVALID_CPUTYPE)
         response.Printf ("cpusubtype:%u;", sub);
-    
+
     if (cpu == ArchSpec::kCore_arm_any)
         response.Printf("watchpoint_exceptions_received:before;");   // On armv7 we use "synchronous" watchpoints which means the exception is delivered before the instruction executes.
     else
         response.Printf("watchpoint_exceptions_received:after;");
-    
+
     switch (lldb::endian::InlHostByteOrder())
     {
     case eByteOrderBig:     response.PutCString ("endian:big;"); break;
@@ -235,7 +291,7 @@ GDBRemoteCommunicationServer::Handle_qHostInfo (StringExtractorGDBRemote &packet
     case eByteOrderPDP:     response.PutCString ("endian:pdp;"); break;
     default:                response.PutCString ("endian:unknown;"); break;
     }
-    
+
     uint32_t major = UINT32_MAX;
     uint32_t minor = UINT32_MAX;
     uint32_t update = UINT32_MAX;
@@ -267,13 +323,34 @@ GDBRemoteCommunicationServer::Handle_qHostInfo (StringExtractorGDBRemote &packet
         response.PutCStringAsRawHex8(s.c_str());
         response.PutChar(';');
     }
+#if defined(__APPLE__)
+
+#if defined(__arm__)
+    // For iOS devices, we are connected through a USB Mux so we never pretend
+    // to actually have a hostname as far as the remote lldb that is connecting
+    // to this lldb-platform is concerned
+    response.PutCString ("hostname:");
+    response.PutCStringAsRawHex8("localhost");
+    response.PutChar(';');
+#else   // #if defined(__arm__)
     if (Host::GetHostname (s))
     {
         response.PutCString ("hostname:");
         response.PutCStringAsRawHex8(s.c_str());
         response.PutChar(';');
     }
-    
+
+#endif  // #if defined(__arm__)
+
+#else   // #if defined(__APPLE__)
+    if (Host::GetHostname (s))
+    {
+        response.PutCString ("hostname:");
+        response.PutCStringAsRawHex8(s.c_str());
+        response.PutChar(';');
+    }
+#endif  // #if defined(__APPLE__)
+
     return SendPacketNoLock (response.GetData(), response.GetSize()) > 0;
 }
 
@@ -319,7 +396,7 @@ GDBRemoteCommunicationServer::Handle_qProcessInfoPID (StringExtractorGDBRemote &
     return SendErrorResponse (1);
 }
 
-bool 
+bool
 GDBRemoteCommunicationServer::Handle_qfProcessInfo (StringExtractorGDBRemote &packet)
 {
     m_proc_infos_index = 0;
@@ -329,7 +406,7 @@ GDBRemoteCommunicationServer::Handle_qfProcessInfo (StringExtractorGDBRemote &pa
     packet.SetFilePos(::strlen ("qfProcessInfo"));
     if (packet.GetChar() == ':')
     {
-    
+
         std::string key;
         std::string value;
         while (packet.GetNameColonValue(key, value))
@@ -360,11 +437,11 @@ GDBRemoteCommunicationServer::Handle_qfProcessInfo (StringExtractorGDBRemote &pa
                 {
                     match_info.SetNameMatchType (eNameMatchContains);
                 }
-                else if (value.compare("regex") == 0)       
+                else if (value.compare("regex") == 0)
                 {
                     match_info.SetNameMatchType (eNameMatchRegularExpression);
                 }
-                else 
+                else
                 {
                     success = false;
                 }
@@ -405,7 +482,7 @@ GDBRemoteCommunicationServer::Handle_qfProcessInfo (StringExtractorGDBRemote &pa
             {
                 success = false;
             }
-            
+
             if (!success)
                 return SendErrorResponse (2);
         }
@@ -420,7 +497,7 @@ GDBRemoteCommunicationServer::Handle_qfProcessInfo (StringExtractorGDBRemote &pa
     return SendErrorResponse (3);
 }
 
-bool 
+bool
 GDBRemoteCommunicationServer::Handle_qsProcessInfo (StringExtractorGDBRemote &packet)
 {
     if (m_proc_infos_index < m_proc_infos.GetSize())
@@ -433,7 +510,7 @@ GDBRemoteCommunicationServer::Handle_qsProcessInfo (StringExtractorGDBRemote &pa
     return SendErrorResponse (4);
 }
 
-bool 
+bool
 GDBRemoteCommunicationServer::Handle_qUserName (StringExtractorGDBRemote &packet)
 {
     // Packet format: "qUserName:%i" where %i is the uid
@@ -450,10 +527,10 @@ GDBRemoteCommunicationServer::Handle_qUserName (StringExtractorGDBRemote &packet
         }
     }
     return SendErrorResponse (5);
-    
+
 }
 
-bool 
+bool
 GDBRemoteCommunicationServer::Handle_qGroupName (StringExtractorGDBRemote &packet)
 {
     // Packet format: "qGroupName:%i" where %i is the gid
@@ -539,11 +616,11 @@ AcceptPortFromInferior (void *arg)
 //    for (int i=0; i<num_retries; i++)
 //    {
 //        struct proc_bsdinfo bsd_info;
-//        int error = ::proc_pidinfo (pid, PROC_PIDTBSDINFO, 
-//                                    (uint64_t) 0, 
-//                                    &bsd_info, 
+//        int error = ::proc_pidinfo (pid, PROC_PIDTBSDINFO,
+//                                    (uint64_t) 0,
+//                                    &bsd_info,
 //                                    PROC_PIDTBSDINFO_SIZE);
-//        
+//
 //        switch (error)
 //        {
 //            case EINVAL:
@@ -551,10 +628,10 @@ AcceptPortFromInferior (void *arg)
 //            case ESRCH:
 //            case EPERM:
 //                return false;
-//                
+//
 //            default:
 //                break;
-//                
+//
 //            case 0:
 //                if (bsd_info.pbi_status == SSTOP)
 //                    return true;
@@ -567,9 +644,9 @@ AcceptPortFromInferior (void *arg)
 bool
 GDBRemoteCommunicationServer::Handle_A (StringExtractorGDBRemote &packet)
 {
-    // The 'A' packet is the most over designed packet ever here with 
-    // redundant argument indexes, redundant argument lengths and needed hex 
-    // encoded argument string values. Really all that is needed is a comma 
+    // The 'A' packet is the most over designed packet ever here with
+    // redundant argument indexes, redundant argument lengths and needed hex
+    // encoded argument string values. Really all that is needed is a comma
     // separated hex encoded argument value list, but we will stay true to the
     // documented version of the 'A' packet here...
 
@@ -615,7 +692,7 @@ GDBRemoteCommunicationServer::Handle_A (StringExtractorGDBRemote &packet)
                                 if (packet.GetChar() != ',')
                                     success = false;
                             }
-                            
+
                             if (success)
                             {
                                 if (arg_idx == 0)
@@ -649,11 +726,11 @@ GDBRemoteCommunicationServer::Handle_qC (StringExtractorGDBRemote &packet)
     response.Printf("QC%" PRIx64, pid);
     if (m_is_platform)
     {
-        // If we launch a process and this GDB server is acting as a platform, 
-        // then we need to clear the process launch state so we can start 
+        // If we launch a process and this GDB server is acting as a platform,
+        // then we need to clear the process launch state so we can start
         // launching another process. In order to launch a process a bunch or
         // packets need to be sent: environment packets, working directory,
-        // disable ASLR, and many more settings. When we launch a process we 
+        // disable ASLR, and many more settings. When we launch a process we
         // then need to know when to clear this information. Currently we are
         // selecting the 'qC' packet as that packet which seems to make the most
         // sense.
@@ -665,9 +742,32 @@ GDBRemoteCommunicationServer::Handle_qC (StringExtractorGDBRemote &packet)
     return SendPacketNoLock (response.GetData(), response.GetSize());
 }
 
+bool
+GDBRemoteCommunicationServer::DebugserverProcessReaped (lldb::pid_t pid)
+{
+    Mutex::Locker locker (m_spawned_pids_mutex);
+    FreePortForProcess(pid);
+    return m_spawned_pids.erase(pid) > 0;
+}
+bool
+GDBRemoteCommunicationServer::ReapDebugserverProcess (void *callback_baton,
+                                                      lldb::pid_t pid,
+                                                      bool exited,
+                                                      int signal,    // Zero for no signal
+                                                      int status)    // Exit value of process if signal is zero
+{
+    GDBRemoteCommunicationServer *server = (GDBRemoteCommunicationServer *)callback_baton;
+    server->DebugserverProcessReaped (pid);
+    return true;
+}
+
 bool
 GDBRemoteCommunicationServer::Handle_qLaunchGDBServer (StringExtractorGDBRemote &packet)
 {
+#ifdef _WIN32
+    // No unix sockets on windows
+    return false;
+#else
     // Spawn a local debugserver as a platform so we can then attach or launch
     // a process...
 
@@ -677,60 +777,180 @@ GDBRemoteCommunicationServer::Handle_qLaunchGDBServer (StringExtractorGDBRemote
         ConnectionFileDescriptor file_conn;
         char connect_url[PATH_MAX];
         Error error;
-        char unix_socket_name[PATH_MAX] = "/tmp/XXXXXX";    
-        if (::mktemp (unix_socket_name) == NULL)
+        std::string hostname;
+        // TODO: /tmp/ should not be hardcoded. User might want to override /tmp
+        // with the TMPDIR environnement variable
+        packet.SetFilePos(::strlen ("qLaunchGDBServer;"));
+        std::string name;
+        std::string value;
+        uint16_t port = UINT16_MAX;
+        while (packet.GetNameColonValue(name, value))
         {
-            error.SetErrorString ("failed to make temporary path for a unix socket");
+            if (name.compare ("host") == 0)
+                hostname.swap(value);
+            else if (name.compare ("port") == 0)
+                port = Args::StringToUInt32(value.c_str(), 0, 0);
         }
-        else
+        if (port == UINT16_MAX)
+            port = GetNextAvailablePort();
+
+        // Spawn a new thread to accept the port that gets bound after
+        // binding to port 0 (zero).
+        lldb::thread_t accept_thread = LLDB_INVALID_HOST_THREAD;
+        const char *unix_socket_name = NULL;
+        char unix_socket_name_buf[PATH_MAX] = "/tmp/XXXXXXXXX";
+
+        if (port == 0)
         {
-            ::snprintf (connect_url, sizeof(connect_url), "unix-accept://%s", unix_socket_name);
-            // Spawn a new thread to accept the port that gets bound after
-            // binding to port 0 (zero).
-            lldb::thread_t accept_thread = Host::ThreadCreate (unix_socket_name,
-                                                               AcceptPortFromInferior,
-                                                               connect_url,
-                                                               &error);
-            
-            if (IS_VALID_LLDB_HOST_THREAD(accept_thread))
+            if (::mkstemp (unix_socket_name_buf) == 0)
             {
-                // Spawn a debugserver and try to get
-                ProcessLaunchInfo debugserver_launch_info;
-                error = StartDebugserverProcess ("localhost:0", 
-                                                 unix_socket_name, 
-                                                 debugserver_launch_info);
-                
-                lldb::pid_t debugserver_pid = debugserver_launch_info.GetProcessID();
-                if (error.Success())
+                unix_socket_name = unix_socket_name_buf;
+                ::snprintf (connect_url, sizeof(connect_url), "unix-accept://%s", unix_socket_name);
+                accept_thread = Host::ThreadCreate (unix_socket_name,
+                                                    AcceptPortFromInferior,
+                                                    connect_url,
+                                                    &error);
+            }
+            else
+            {
+                error.SetErrorStringWithFormat("failed to make temporary path for a unix socket: %s", strerror(errno));
+            }
+        }
+
+        if (error.Success())
+        {
+            // Spawn a debugserver and try to get the port it listens to.
+            ProcessLaunchInfo debugserver_launch_info;
+            StreamString host_and_port;
+            if (hostname.empty())
+                hostname = "localhost";
+            host_and_port.Printf("%s:%u", hostname.c_str(), port);
+            const char *host_and_port_cstr = host_and_port.GetString().c_str();
+            Log *log(GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM));
+            if (log)
+                log->Printf("Launching debugserver with: %s...\n", host_and_port_cstr);
+
+            debugserver_launch_info.SetMonitorProcessCallback(ReapDebugserverProcess, this, false);
+            
+            error = StartDebugserverProcess (host_and_port_cstr,
+                                             unix_socket_name,
+                                             debugserver_launch_info);
+
+            lldb::pid_t debugserver_pid = debugserver_launch_info.GetProcessID();
+
+
+            if (debugserver_pid != LLDB_INVALID_PROCESS_ID)
+            {
+                Mutex::Locker locker (m_spawned_pids_mutex);
+                m_spawned_pids.insert(debugserver_pid);
+                if (port > 0)
+                    AssociatePortWithProcess(port, debugserver_pid);
+            }
+            else
+            {
+                if (port > 0)
+                    FreePort (port);
+            }
+
+            if (error.Success())
+            {
+                bool success = false;
+
+                if (IS_VALID_LLDB_HOST_THREAD(accept_thread))
                 {
-                    bool success = false;
-                    
                     thread_result_t accept_thread_result = NULL;
                     if (Host::ThreadJoin (accept_thread, &accept_thread_result, &error))
                     {
                         if (accept_thread_result)
                         {
-                            uint16_t port = (intptr_t)accept_thread_result;
+                            port = (intptr_t)accept_thread_result;
                             char response[256];
-                            const int response_len = ::snprintf (response, sizeof(response), "pid:%" PRIu64 ";port:%u;", debugserver_pid, port);
-                            assert (response_len < (int)sizeof(response));
+                            const int response_len = ::snprintf (response, sizeof(response), "pid:%" PRIu64 ";port:%u;", debugserver_pid, port + m_port_offset);
+                            assert (response_len < sizeof(response));
                             //m_port_to_pid_map[port] = debugserver_launch_info.GetProcessID();
                             success = SendPacketNoLock (response, response_len) > 0;
                         }
                     }
-                    ::unlink (unix_socket_name);
-                    
-                    if (!success)
-                    {
-                        if (debugserver_pid != LLDB_INVALID_PROCESS_ID)
-                            ::kill (debugserver_pid, SIGINT);
-                    }
-                    return success;
                 }
+                else
+                {
+                    char response[256];
+                    const int response_len = ::snprintf (response, sizeof(response), "pid:%" PRIu64 ";port:%u;", debugserver_pid, port + m_port_offset);
+                    assert (response_len < sizeof(response));
+                    //m_port_to_pid_map[port] = debugserver_launch_info.GetProcessID();
+                    success = SendPacketNoLock (response, response_len) > 0;
+
+                }
+                Host::Unlink (unix_socket_name);
+
+                if (!success)
+                {
+                    if (debugserver_pid != LLDB_INVALID_PROCESS_ID)
+                        ::kill (debugserver_pid, SIGINT);
+                }
+                return success;
+            }
+            else if (accept_thread)
+            {
+                Host::Unlink (unix_socket_name);
             }
         }
     }
-    return SendErrorResponse (13);
+    return SendErrorResponse (9);
+#endif
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_qKillSpawnedProcess (StringExtractorGDBRemote &packet)
+{
+    // Spawn a local debugserver as a platform so we can then attach or launch
+    // a process...
+
+    if (m_is_platform)
+    {
+        packet.SetFilePos(::strlen ("qKillSpawnedProcess:"));
+
+        lldb::pid_t pid = packet.GetU64(LLDB_INVALID_PROCESS_ID);
+
+        // Scope for locker
+        {
+            Mutex::Locker locker (m_spawned_pids_mutex);
+            if (m_spawned_pids.find(pid) == m_spawned_pids.end())
+                return SendErrorResponse (10);
+        }
+        Host::Kill (pid, SIGTERM);
+
+        for (size_t i=0; i<10; ++i)
+        {
+            // Scope for locker
+            {
+                Mutex::Locker locker (m_spawned_pids_mutex);
+                if (m_spawned_pids.find(pid) == m_spawned_pids.end())
+                    return SendOKResponse();
+            }
+            usleep (10000);
+        }
+
+        // Scope for locker
+        {
+            Mutex::Locker locker (m_spawned_pids_mutex);
+            if (m_spawned_pids.find(pid) == m_spawned_pids.end())
+                return SendOKResponse();
+        }
+        Host::Kill (pid, SIGKILL);
+
+        for (size_t i=0; i<10; ++i)
+        {
+            // Scope for locker
+            {
+                Mutex::Locker locker (m_spawned_pids_mutex);
+                if (m_spawned_pids.find(pid) == m_spawned_pids.end())
+                    return SendOKResponse();
+            }
+            usleep (10000);
+        }
+    }
+    return SendErrorResponse (11);
 }
 
 bool
@@ -738,7 +958,7 @@ GDBRemoteCommunicationServer::Handle_qLaunchSuccess (StringExtractorGDBRemote &p
 {
     if (m_process_launch_error.Success())
         return SendOKResponse();
-    StreamString response;    
+    StreamString response;
     response.PutChar('E');
     response.PutCString(m_process_launch_error.AsCString("<unknown error>"));
     return SendPacketNoLock (response.GetData(), response.GetSize());
@@ -754,7 +974,22 @@ GDBRemoteCommunicationServer::Handle_QEnvironment  (StringExtractorGDBRemote &pa
         m_process_launch_info.GetEnvironmentEntries ().AppendArgument (packet.Peek());
         return SendOKResponse ();
     }
-    return SendErrorResponse (9);
+    return SendErrorResponse (12);
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_QLaunchArch (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen ("QLaunchArch:"));
+    const uint32_t bytes_left = packet.GetBytesLeft();
+    if (bytes_left > 0)
+    {
+        const char* arch_triple = packet.Peek();
+        ArchSpec arch_spec(arch_triple,NULL);
+        m_process_launch_info.SetArchitecture(arch_spec);
+        return SendOKResponse();
+    }
+    return SendErrorResponse(13);
 }
 
 bool
@@ -774,10 +1009,60 @@ GDBRemoteCommunicationServer::Handle_QSetWorkingDir (StringExtractorGDBRemote &p
     packet.SetFilePos(::strlen ("QSetWorkingDir:"));
     std::string path;
     packet.GetHexByteString(path);
-    m_process_launch_info.SwapWorkingDirectory (path);
+    if (m_is_platform)
+    {
+#ifdef _WIN32
+        // Not implemented on Windows
+        return SendUnimplementedResponse("GDBRemoteCommunicationServer::Handle_QSetWorkingDir unimplemented");
+#else
+        // If this packet is sent to a platform, then change the current working directory
+        if (::chdir(path.c_str()) != 0)
+            return SendErrorResponse(errno);
+#endif
+    }
+    else
+    {
+        m_process_launch_info.SwapWorkingDirectory (path);
+    }
     return SendOKResponse ();
 }
 
+bool
+GDBRemoteCommunicationServer::Handle_qGetWorkingDir (StringExtractorGDBRemote &packet)
+{
+    StreamString response;
+
+    if (m_is_platform)
+    {
+        // If this packet is sent to a platform, then change the current working directory
+        char cwd[PATH_MAX];
+        if (getcwd(cwd, sizeof(cwd)) == NULL)
+        {
+            return SendErrorResponse(errno);
+        }
+        else
+        {
+            response.PutBytesAsRawHex8(cwd, strlen(cwd));
+            SendPacketNoLock(response.GetData(), response.GetSize());
+            return true;
+        }
+    }
+    else
+    {
+        const char *working_dir = m_process_launch_info.GetWorkingDirectory();
+        if (working_dir && working_dir[0])
+        {
+            response.PutBytesAsRawHex8(working_dir, strlen(working_dir));
+            SendPacketNoLock(response.GetData(), response.GetSize());
+            return true;
+        }
+        else
+        {
+            return SendErrorResponse(14);
+        }
+    }
+}
+
 bool
 GDBRemoteCommunicationServer::Handle_QSetSTDIN (StringExtractorGDBRemote &packet)
 {
@@ -792,7 +1077,7 @@ GDBRemoteCommunicationServer::Handle_QSetSTDIN (StringExtractorGDBRemote &packet
         m_process_launch_info.AppendFileAction(file_action);
         return SendOKResponse ();
     }
-    return SendErrorResponse (10);
+    return SendErrorResponse (15);
 }
 
 bool
@@ -809,7 +1094,7 @@ GDBRemoteCommunicationServer::Handle_QSetSTDOUT (StringExtractorGDBRemote &packe
         m_process_launch_info.AppendFileAction(file_action);
         return SendOKResponse ();
     }
-    return SendErrorResponse (11);
+    return SendErrorResponse (16);
 }
 
 bool
@@ -826,7 +1111,7 @@ GDBRemoteCommunicationServer::Handle_QSetSTDERR (StringExtractorGDBRemote &packe
         m_process_launch_info.AppendFileAction(file_action);
         return SendOKResponse ();
     }
-    return SendErrorResponse (12);
+    return SendErrorResponse (17);
 }
 
 bool
@@ -837,3 +1122,337 @@ GDBRemoteCommunicationServer::Handle_QStartNoAckMode (StringExtractorGDBRemote &
     m_send_acks = false;
     return true;
 }
+
+bool
+GDBRemoteCommunicationServer::Handle_qPlatform_mkdir (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("qPlatform_mkdir:"));
+    mode_t mode = packet.GetHexMaxU32(false, UINT32_MAX);
+    if (packet.GetChar() == ',')
+    {
+        std::string path;
+        packet.GetHexByteString(path);
+        Error error = Host::MakeDirectory(path.c_str(),mode);
+        if (error.Success())
+            return SendPacketNoLock ("OK", 2);
+        else
+            return SendErrorResponse(error.GetError());
+    }
+    return SendErrorResponse(20);
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_qPlatform_chmod (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("qPlatform_chmod:"));
+    
+    mode_t mode = packet.GetHexMaxU32(false, UINT32_MAX);
+    if (packet.GetChar() == ',')
+    {
+        std::string path;
+        packet.GetHexByteString(path);
+        Error error = Host::SetFilePermissions (path.c_str(), mode);
+        if (error.Success())
+            return SendPacketNoLock ("OK", 2);
+        else
+            return SendErrorResponse(error.GetError());
+    }
+    return SendErrorResponse(19);
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_Open (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("vFile:open:"));
+    std::string path;
+    packet.GetHexByteStringTerminatedBy(path,',');
+    if (!path.empty())
+    {
+        if (packet.GetChar() == ',')
+        {
+            uint32_t flags = packet.GetHexMaxU32(false, 0);
+            if (packet.GetChar() == ',')
+            {
+                mode_t mode = packet.GetHexMaxU32(false, 0600);
+                Error error;
+                int fd = ::open (path.c_str(), flags, mode);
+                printf ("open('%s', flags=0x%x, mode=%o) fd = %i (%s)\n", path.c_str(), flags, mode, fd, fd == -1 ? strerror(errno) : "<success>");
+                const int save_errno = fd == -1 ? errno : 0;
+                StreamString response;
+                response.PutChar('F');
+                response.Printf("%i", fd);
+                if (save_errno)
+                    response.Printf(",%i", save_errno);
+                return SendPacketNoLock(response.GetData(), response.GetSize());
+            }
+        }
+    }
+    return SendErrorResponse(18);
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_Close (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("vFile:close:"));
+    int fd = packet.GetS32(-1);
+    Error error;
+    int err = -1;
+    int save_errno = 0;
+    if (fd >= 0)
+    {
+        err = close(fd);
+        save_errno = err == -1 ? errno : 0;
+    }
+    else
+    {
+        save_errno = EINVAL;
+    }
+    StreamString response;
+    response.PutChar('F');
+    response.Printf("%i", err);
+    if (save_errno)
+        response.Printf(",%i", save_errno);
+    return SendPacketNoLock(response.GetData(), response.GetSize());
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_pRead (StringExtractorGDBRemote &packet)
+{
+#ifdef _WIN32
+    // Not implemented on Windows
+    return SendUnimplementedResponse("GDBRemoteCommunicationServer::Handle_vFile_pRead() unimplemented");
+#else
+    StreamGDBRemote response;
+    packet.SetFilePos(::strlen("vFile:pread:"));
+    int fd = packet.GetS32(-1);
+    if (packet.GetChar() == ',')
+    {
+        uint64_t count = packet.GetU64(UINT64_MAX);
+        if (packet.GetChar() == ',')
+        {
+            uint64_t offset = packet.GetU64(UINT32_MAX);
+            if (count == UINT64_MAX)
+            {
+                response.Printf("F-1:%i", EINVAL);
+                return SendPacketNoLock(response.GetData(), response.GetSize());
+            }
+            
+            std::string buffer(count, 0);
+            const ssize_t bytes_read = ::pread (fd, &buffer[0], buffer.size(), offset);
+            const int save_errno = bytes_read == -1 ? errno : 0;
+            response.PutChar('F');
+            response.Printf("%zi", bytes_read);
+            if (save_errno)
+                response.Printf(",%i", save_errno);
+            else
+            {
+                response.PutChar(';');
+                response.PutEscapedBytes(&buffer[0], bytes_read);
+            }
+            return SendPacketNoLock(response.GetData(), response.GetSize());
+        }
+    }
+    return SendErrorResponse(21);
+
+#endif
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_pWrite (StringExtractorGDBRemote &packet)
+{
+#ifdef _WIN32
+    return SendUnimplementedResponse("GDBRemoteCommunicationServer::Handle_vFile_pWrite() unimplemented");
+#else
+    packet.SetFilePos(::strlen("vFile:pwrite:"));
+
+    StreamGDBRemote response;
+    response.PutChar('F');
+
+    int fd = packet.GetU32(UINT32_MAX);
+    if (packet.GetChar() == ',')
+    {
+        off_t offset = packet.GetU64(UINT32_MAX);
+        if (packet.GetChar() == ',')
+        {
+            std::string buffer;
+            if (packet.GetEscapedBinaryData(buffer))
+            {
+                const ssize_t bytes_written = ::pwrite (fd, buffer.data(), buffer.size(), offset);
+                const int save_errno = bytes_written == -1 ? errno : 0;
+                response.Printf("%zi", bytes_written);
+                if (save_errno)
+                    response.Printf(",%i", save_errno);
+            }
+            else
+            {
+                response.Printf ("-1,%i", EINVAL);
+            }
+            return SendPacketNoLock(response.GetData(), response.GetSize());
+        }
+    }
+    return SendErrorResponse(27);
+#endif
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_Size (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("vFile:size:"));
+    std::string path;
+    packet.GetHexByteString(path);
+    if (!path.empty())
+    {
+        lldb::user_id_t retcode = Host::GetFileSize(FileSpec(path.c_str(), false));
+        StreamString response;
+        response.PutChar('F');
+        response.PutHex64(retcode);
+        if (retcode == UINT64_MAX)
+        {
+            response.PutChar(',');
+            response.PutHex64(retcode); // TODO: replace with Host::GetSyswideErrorCode()
+        }
+        return SendPacketNoLock(response.GetData(), response.GetSize());
+    }
+    return SendErrorResponse(22);
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_Mode (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("vFile:mode:"));
+    std::string path;
+    packet.GetHexByteString(path);
+    if (!path.empty())
+    {
+        Error error;
+        const uint32_t mode = File::GetPermissions(path.c_str(), error);
+        StreamString response;
+        response.Printf("F%u", mode);
+        if (mode == 0 || error.Fail())
+            response.Printf(",%i", (int)error.GetError());
+        return SendPacketNoLock(response.GetData(), response.GetSize());
+    }
+    return SendErrorResponse(23);
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_Exists (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("vFile:exists:"));
+    std::string path;
+    packet.GetHexByteString(path);
+    if (!path.empty())
+    {
+        bool retcode = Host::GetFileExists(FileSpec(path.c_str(), false));
+        StreamString response;
+        response.PutChar('F');
+        response.PutChar(',');
+        if (retcode)
+            response.PutChar('1');
+        else
+            response.PutChar('0');
+        return SendPacketNoLock(response.GetData(), response.GetSize());
+    }
+    return SendErrorResponse(24);
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_symlink (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("vFile:symlink:"));
+    std::string dst, src;
+    packet.GetHexByteStringTerminatedBy(dst, ',');
+    packet.GetChar(); // Skip ',' char
+    packet.GetHexByteString(src);
+    Error error = Host::Symlink(src.c_str(), dst.c_str());
+    StreamString response;
+    response.Printf("F%u,%u", error.GetError(), error.GetError());
+    return SendPacketNoLock(response.GetData(), response.GetSize());
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_unlink (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("vFile:unlink:"));
+    std::string path;
+    packet.GetHexByteString(path);
+    Error error = Host::Unlink(path.c_str());
+    StreamString response;
+    response.Printf("F%u,%u", error.GetError(), error.GetError());
+    return SendPacketNoLock(response.GetData(), response.GetSize());
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_qPlatform_shell (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("qPlatform_shell:"));
+    std::string path;
+    std::string working_dir;
+    packet.GetHexByteStringTerminatedBy(path,',');
+    if (!path.empty())
+    {
+        if (packet.GetChar() == ',')
+        {
+            // FIXME: add timeout to qPlatform_shell packet
+            // uint32_t timeout = packet.GetHexMaxU32(false, 32);
+            uint32_t timeout = 10;
+            if (packet.GetChar() == ',')
+                packet.GetHexByteString(working_dir);
+            int status, signo;
+            std::string output;
+            Error err = Host::RunShellCommand(path.c_str(),
+                                              working_dir.empty() ? NULL : working_dir.c_str(),
+                                              &status, &signo, &output, timeout);
+            StreamGDBRemote response;
+            if (err.Fail())
+            {
+                response.PutCString("F,");
+                response.PutHex32(UINT32_MAX);
+            }
+            else
+            {
+                response.PutCString("F,");
+                response.PutHex32(status);
+                response.PutChar(',');
+                response.PutHex32(signo);
+                response.PutChar(',');
+                response.PutEscapedBytes(output.c_str(), output.size());
+            }
+            return SendPacketNoLock(response.GetData(), response.GetSize());
+        }
+    }
+    return SendErrorResponse(24);
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_Stat (StringExtractorGDBRemote &packet)
+{
+    return SendUnimplementedResponse("GDBRemoteCommunicationServer::Handle_vFile_Stat() unimplemented");
+}
+
+bool
+GDBRemoteCommunicationServer::Handle_vFile_MD5 (StringExtractorGDBRemote &packet)
+{
+    packet.SetFilePos(::strlen("vFile:MD5:"));
+    std::string path;
+    packet.GetHexByteString(path);
+    if (!path.empty())
+    {
+        uint64_t a,b;
+        StreamGDBRemote response;
+        if (Host::CalculateMD5(FileSpec(path.c_str(),false),a,b) == false)
+        {
+            response.PutCString("F,");
+            response.PutCString("x");
+        }
+        else
+        {
+            response.PutCString("F,");
+            response.PutHex64(a);
+            response.PutHex64(b);
+        }
+        return SendPacketNoLock(response.GetData(), response.GetSize());
+    }
+    return SendErrorResponse(25);
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h
index cce0e4e64c1..721ea5012b3 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h
@@ -12,10 +12,12 @@
 
 // C Includes
 // C++ Includes
+#include <vector>
+#include <set>
 // Other libraries and framework includes
 // Project includes
+#include "lldb/Host/Mutex.h"
 #include "lldb/Target/Process.h"
-
 #include "GDBRemoteCommunication.h"
 
 class ProcessGDBRemote;
@@ -24,6 +26,8 @@ class StringExtractorGDBRemote;
 class GDBRemoteCommunicationServer : public GDBRemoteCommunication
 {
 public:
+    typedef std::map<uint16_t, lldb::pid_t> PortMap;
+
     enum
     {
         eBroadcastBitRunPacketSent = kLoUserBroadcastBit
@@ -56,23 +60,95 @@ public:
     // Set both ports to zero to let the platform automatically bind to 
     // a port chosen by the OS.
     void
-    SetPortRange (uint16_t lo_port_num, uint16_t hi_port_num)
+    SetPortMap (PortMap &&port_map)
     {
-        m_lo_port_num = lo_port_num;
-        m_hi_port_num = hi_port_num;
+        m_port_map = port_map;
+    }
+
+    //----------------------------------------------------------------------
+    // If we are using a port map where we can only use certain ports,
+    // get the next available port.
+    //
+    // If we are using a port map and we are out of ports, return UINT16_MAX
+    //
+    // If we aren't using a port map, return 0 to indicate we should bind to
+    // port 0 and then figure out which port we used.
+    //----------------------------------------------------------------------
+    uint16_t
+    GetNextAvailablePort ()
+    {
+        if (m_port_map.empty())
+            return 0; // Bind to port zero and get a port, we didn't have any limitations
+        
+        for (auto &pair : m_port_map)
+        {
+            if (pair.second == LLDB_INVALID_PROCESS_ID)
+            {
+                pair.second = ~(lldb::pid_t)LLDB_INVALID_PROCESS_ID;
+                return pair.first;
+            }
+        }
+        return UINT16_MAX;
+    }
+
+    bool
+    AssociatePortWithProcess (uint16_t port, lldb::pid_t pid)
+    {
+        PortMap::iterator pos = m_port_map.find(port);
+        if (pos != m_port_map.end())
+        {
+            pos->second = pid;
+            return true;
+        }
+        return false;
+    }
+
+    bool
+    FreePort (uint16_t port)
+    {
+        PortMap::iterator pos = m_port_map.find(port);
+        if (pos != m_port_map.end())
+        {
+            pos->second = LLDB_INVALID_PROCESS_ID;
+            return true;
+        }
+        return false;
+    }
+
+    bool
+    FreePortForProcess (lldb::pid_t pid)
+    {
+        if (!m_port_map.empty())
+        {
+            for (auto &pair : m_port_map)
+            {
+                if (pair.second == pid)
+                {
+                    pair.second = LLDB_INVALID_PROCESS_ID;
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    void
+    SetPortOffset (uint16_t port_offset)
+    {
+        m_port_offset = port_offset;
     }
 
 protected:
-    //typedef std::map<uint16_t, lldb::pid_t> PortToPIDMap;
-
     lldb::thread_t m_async_thread;
     lldb_private::ProcessLaunchInfo m_process_launch_info;
     lldb_private::Error m_process_launch_error;
+    std::set<lldb::pid_t> m_spawned_pids;
+    lldb_private::Mutex m_spawned_pids_mutex;
     lldb_private::ProcessInstanceInfoList m_proc_infos;
     uint32_t m_proc_infos_index;
-    uint16_t m_lo_port_num;
-    uint16_t m_hi_port_num;
-    //PortToPIDMap m_port_to_pid_map;
+    PortMap m_port_map;
+    uint16_t m_port_offset;
+    
 
     size_t
     SendUnimplementedResponse (const char *packet);
@@ -85,7 +161,7 @@ protected:
 
     bool
     Handle_A (StringExtractorGDBRemote &packet);
-
+    
     bool
     Handle_qLaunchSuccess (StringExtractorGDBRemote &packet);
 
@@ -94,7 +170,16 @@ protected:
     
     bool
     Handle_qLaunchGDBServer (StringExtractorGDBRemote &packet);
+    
+    bool
+    Handle_qKillSpawnedProcess (StringExtractorGDBRemote &packet);
 
+    bool
+    Handle_qPlatform_mkdir (StringExtractorGDBRemote &packet);
+    
+    bool
+    Handle_qPlatform_chmod (StringExtractorGDBRemote &packet);
+    
     bool
     Handle_qProcessInfoPID (StringExtractorGDBRemote &packet);
     
@@ -119,11 +204,17 @@ protected:
     bool
     Handle_QEnvironment  (StringExtractorGDBRemote &packet);
     
+    bool
+    Handle_QLaunchArch (StringExtractorGDBRemote &packet);
+    
     bool
     Handle_QSetDisableASLR (StringExtractorGDBRemote &packet);
 
     bool
     Handle_QSetWorkingDir (StringExtractorGDBRemote &packet);
+    
+    bool
+    Handle_qGetWorkingDir (StringExtractorGDBRemote &packet);
 
     bool
     Handle_QStartNoAckMode (StringExtractorGDBRemote &packet);
@@ -137,7 +228,53 @@ protected:
     bool
     Handle_QSetSTDERR (StringExtractorGDBRemote &packet);
     
+    bool
+    Handle_vFile_Open (StringExtractorGDBRemote &packet);
+
+    bool
+    Handle_vFile_Close (StringExtractorGDBRemote &packet);
+
+    bool
+    Handle_vFile_pRead (StringExtractorGDBRemote &packet);
+
+    bool
+    Handle_vFile_pWrite (StringExtractorGDBRemote &packet);
+
+    bool
+    Handle_vFile_Size (StringExtractorGDBRemote &packet);
+    
+    bool
+    Handle_vFile_Mode (StringExtractorGDBRemote &packet);
+
+    bool
+    Handle_vFile_Exists (StringExtractorGDBRemote &packet);
+    
+    bool
+    Handle_vFile_symlink (StringExtractorGDBRemote &packet);
+    
+    bool
+    Handle_vFile_unlink (StringExtractorGDBRemote &packet);
+
+    bool
+    Handle_vFile_Stat (StringExtractorGDBRemote &packet);
+    
+    bool
+    Handle_vFile_MD5 (StringExtractorGDBRemote &packet);
+    
+    bool
+    Handle_qPlatform_shell (StringExtractorGDBRemote &packet);
+
 private:
+    bool
+    DebugserverProcessReaped (lldb::pid_t pid);
+    
+    static bool
+    ReapDebugserverProcess (void *callback_baton,
+                            lldb::pid_t pid,
+                            bool exited,
+                            int signal,
+                            int status);
+
     //------------------------------------------------------------------
     // For GDBRemoteCommunicationServer only
     //------------------------------------------------------------------
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
index b1612a5f3c2..c291df786d1 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.cpp
@@ -17,6 +17,9 @@
 #include "lldb/Core/RegisterValue.h"
 #include "lldb/Core/Scalar.h"
 #include "lldb/Core/StreamString.h"
+#ifndef LLDB_DISABLE_PYTHON
+#include "lldb/Interpreter/PythonDataObjects.h"
+#endif
 #include "lldb/Target/ExecutionContext.h"
 #include "lldb/Utility/Utils.h"
 // Project includes
@@ -54,7 +57,7 @@ GDBRemoteRegisterContext::GDBRemoteRegisterContext
     // Make a heap based buffer that is big enough to store all registers
     DataBufferSP reg_data_sp(new DataBufferHeap (reg_info.GetRegisterDataByteSize(), 0));
     m_reg_data.SetData (reg_data_sp);
-
+    m_reg_data.SetByteOrder(thread.GetProcess()->GetByteOrder());
 }
 
 //----------------------------------------------------------------------
@@ -150,20 +153,13 @@ bool
 GDBRemoteRegisterContext::GetPrimordialRegister(const lldb_private::RegisterInfo *reg_info,
                                                 GDBRemoteCommunicationClient &gdb_comm)
 {
-    char packet[64];
-    StringExtractorGDBRemote response;
-    int packet_len = 0;
     const uint32_t reg = reg_info->kinds[eRegisterKindLLDB];
-    if (gdb_comm.GetThreadSuffixSupported())
-        packet_len = ::snprintf (packet, sizeof(packet), "p%x;thread:%4.4" PRIx64 ";", reg, m_thread.GetProtocolID());
-    else
-        packet_len = ::snprintf (packet, sizeof(packet), "p%x", reg);
-    assert (packet_len < ((int)sizeof(packet) - 1));
-    if (gdb_comm.SendPacketAndWaitForResponse(packet, response, false))
+    StringExtractorGDBRemote response;
+    if (gdb_comm.ReadRegister(m_thread.GetProtocolID(), reg, response))
         return PrivateSetRegisterValue (reg, response);
-
     return false;
 }
+
 bool
 GDBRemoteRegisterContext::ReadRegisterBytes (const RegisterInfo *reg_info, DataExtractor &data)
 {
@@ -182,93 +178,51 @@ GDBRemoteRegisterContext::ReadRegisterBytes (const RegisterInfo *reg_info, DataE
 
     if (!GetRegisterIsValid(reg))
     {
-        Mutex::Locker locker;
-        if (gdb_comm.GetSequenceMutex (locker, "Didn't get sequence mutex for read register."))
+        if (m_read_all_at_once)
         {
-            const bool thread_suffix_supported = gdb_comm.GetThreadSuffixSupported();
-            ProcessSP process_sp (m_thread.GetProcess());
-            if (thread_suffix_supported || static_cast<ProcessGDBRemote *>(process_sp.get())->GetGDBRemote().SetCurrentThread(m_thread.GetProtocolID()))
+            StringExtractorGDBRemote response;
+            if (!gdb_comm.ReadAllRegisters(m_thread.GetProtocolID(), response))
+                return false;
+            if (response.IsNormalResponse())
+                if (response.GetHexBytes ((void *)m_reg_data.GetDataStart(), m_reg_data.GetByteSize(), '\xcc') == m_reg_data.GetByteSize())
+                    SetAllRegisterValid (true);
+        }
+        else if (reg_info->value_regs)
+        {
+            // Process this composite register request by delegating to the constituent
+            // primordial registers.
+            
+            // Index of the primordial register.
+            bool success = true;
+            for (uint32_t idx = 0; success; ++idx)
             {
-                char packet[64];
-                StringExtractorGDBRemote response;
-                int packet_len = 0;
-                if (m_read_all_at_once)
-                {
-                    // Get all registers in one packet
-                    if (thread_suffix_supported)
-                        packet_len = ::snprintf (packet, sizeof(packet), "g;thread:%4.4" PRIx64 ";", m_thread.GetProtocolID());
-                    else
-                        packet_len = ::snprintf (packet, sizeof(packet), "g");
-                    assert (packet_len < ((int)sizeof(packet) - 1));
-                    if (gdb_comm.SendPacketAndWaitForResponse(packet, response, false))
-                    {
-                        if (response.IsNormalResponse())
-                            if (response.GetHexBytes ((void *)m_reg_data.GetDataStart(), m_reg_data.GetByteSize(), '\xcc') == m_reg_data.GetByteSize())
-                                SetAllRegisterValid (true);
-                    }
-                }
-                else if (reg_info->value_regs)
-                {
-                    // Process this composite register request by delegating to the constituent
-                    // primordial registers.
-                    
-                    // Index of the primordial register.
-                    bool success = true;
-                    for (uint32_t idx = 0; success; ++idx)
-                    {
-                        const uint32_t prim_reg = reg_info->value_regs[idx];
-                        if (prim_reg == LLDB_INVALID_REGNUM)
-                            break;
-                        // We have a valid primordial regsiter as our constituent.
-                        // Grab the corresponding register info.
-                        const RegisterInfo *prim_reg_info = GetRegisterInfoAtIndex(prim_reg);
-                        if (prim_reg_info == NULL)
-                            success = false;
-                        else
-                        {
-                            // Read the containing register if it hasn't already been read
-                            if (!GetRegisterIsValid(prim_reg))
-                                success = GetPrimordialRegister(prim_reg_info, gdb_comm);
-                        }
-                    }
-
-                    if (success)
-                    {
-                        // If we reach this point, all primordial register requests have succeeded.
-                        // Validate this composite register.
-                        SetRegisterIsValid (reg_info, true);
-                    }
-                }
+                const uint32_t prim_reg = reg_info->value_regs[idx];
+                if (prim_reg == LLDB_INVALID_REGNUM)
+                    break;
+                // We have a valid primordial regsiter as our constituent.
+                // Grab the corresponding register info.
+                const RegisterInfo *prim_reg_info = GetRegisterInfoAtIndex(prim_reg);
+                if (prim_reg_info == NULL)
+                    success = false;
                 else
                 {
-                    // Get each register individually
-                    GetPrimordialRegister(reg_info, gdb_comm);
+                    // Read the containing register if it hasn't already been read
+                    if (!GetRegisterIsValid(prim_reg))
+                        success = GetPrimordialRegister(prim_reg_info, gdb_comm);
                 }
             }
+
+            if (success)
+            {
+                // If we reach this point, all primordial register requests have succeeded.
+                // Validate this composite register.
+                SetRegisterIsValid (reg_info, true);
+            }
         }
         else
         {
-#if LLDB_CONFIGURATION_DEBUG
-            StreamString strm;
-            gdb_comm.DumpHistory(strm);
-            Host::SetCrashDescription (strm.GetData());
-            assert (!"Didn't get sequence mutex for read register.");
-#else
-            Log *log (ProcessGDBRemoteLog::GetLogIfAnyCategoryIsSet (GDBR_LOG_THREAD | GDBR_LOG_PACKETS));
-            if (log)
-            {
-                if (log->GetVerbose())
-                {
-                    StreamString strm;
-                    gdb_comm.DumpHistory(strm);
-                    log->Printf("error: failed to get packet sequence mutex, not sending read register for \"%s\":\n%s", reg_info->name, strm.GetData());
-                }
-                else
-                {
-                    log->Printf("error: failed to get packet sequence mutex, not sending read register for \"%s\"", reg_info->name);
-                }
-            }
-#endif
+            // Get each register individually
+            GetPrimordialRegister(reg_info, gdb_comm);
         }
 
         // Make sure we got a valid register value after reading it
@@ -485,6 +439,54 @@ GDBRemoteRegisterContext::WriteRegisterBytes (const lldb_private::RegisterInfo *
     return false;
 }
 
+bool
+GDBRemoteRegisterContext::ReadAllRegisterValues (lldb_private::RegisterCheckpoint &reg_checkpoint)
+{
+    ExecutionContext exe_ctx (CalculateThread());
+    
+    Process *process = exe_ctx.GetProcessPtr();
+    Thread *thread = exe_ctx.GetThreadPtr();
+    if (process == NULL || thread == NULL)
+        return false;
+    
+    GDBRemoteCommunicationClient &gdb_comm (((ProcessGDBRemote *)process)->GetGDBRemote());
+
+    uint32_t save_id = 0;
+    if (gdb_comm.SaveRegisterState(thread->GetProtocolID(), save_id))
+    {
+        reg_checkpoint.SetID(save_id);
+        reg_checkpoint.GetData().reset();
+        return true;
+    }
+    else
+    {
+        reg_checkpoint.SetID(0); // Invalid save ID is zero
+        return ReadAllRegisterValues(reg_checkpoint.GetData());
+    }
+}
+
+bool
+GDBRemoteRegisterContext::WriteAllRegisterValues (const lldb_private::RegisterCheckpoint &reg_checkpoint)
+{
+    uint32_t save_id = reg_checkpoint.GetID();
+    if (save_id != 0)
+    {
+        ExecutionContext exe_ctx (CalculateThread());
+        
+        Process *process = exe_ctx.GetProcessPtr();
+        Thread *thread = exe_ctx.GetThreadPtr();
+        if (process == NULL || thread == NULL)
+            return false;
+        
+        GDBRemoteCommunicationClient &gdb_comm (((ProcessGDBRemote *)process)->GetGDBRemote());
+        
+        return gdb_comm.RestoreRegisterState(m_thread.GetProtocolID(), save_id);
+    }
+    else
+    {
+        return WriteAllRegisterValues(reg_checkpoint.GetData());
+    }
+}
 
 bool
 GDBRemoteRegisterContext::ReadAllRegisterValues (lldb::DataBufferSP &data_sp)
@@ -696,6 +698,7 @@ GDBRemoteRegisterContext::ConvertRegisterKindToRegisterNumber (uint32_t kind, ui
     return m_reg_info.ConvertRegisterKindToRegisterNumber (kind, num);
 }
 
+
 void
 GDBRemoteDynamicRegisterInfo::HardcodeARMRegisters(bool from_scratch)
 {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h
index 3110ddf8edf..38f29bbca0d 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/GDBRemoteRegisterContext.h
@@ -21,23 +21,20 @@
 #include "lldb/Core/ConstString.h"
 #include "lldb/Core/DataExtractor.h"
 #include "lldb/Target/RegisterContext.h"
+#include "Plugins/Process/Utility/DynamicRegisterInfo.h"
+
 #include "GDBRemoteCommunicationClient.h"
 
 class ThreadGDBRemote;
 class ProcessGDBRemote;
 class StringExtractor;
 
-class GDBRemoteDynamicRegisterInfo
+class GDBRemoteDynamicRegisterInfo :
+    public DynamicRegisterInfo
 {
 public:
     GDBRemoteDynamicRegisterInfo () :
-        m_regs (),
-        m_sets (),
-        m_set_reg_nums (),
-        m_reg_names (),
-        m_reg_alt_names (),
-        m_set_names (),
-        m_reg_data_byte_size (0)
+        DynamicRegisterInfo()
     {
     }
 
@@ -45,152 +42,9 @@ public:
     {
     }
 
-    void
-    AddRegister (lldb_private::RegisterInfo reg_info, 
-                 lldb_private::ConstString &reg_name, 
-                 lldb_private::ConstString &reg_alt_name, 
-                 lldb_private::ConstString &set_name)
-    {
-        const uint32_t reg_num = (uint32_t)m_regs.size();
-        m_reg_names.push_back (reg_name);
-        m_reg_alt_names.push_back (reg_alt_name);
-        reg_info.name = reg_name.AsCString();
-        assert (reg_info.name);
-        reg_info.alt_name = reg_alt_name.AsCString(NULL);
-        uint32_t i;
-        if (reg_info.value_regs)
-        {
-            for (i=0; reg_info.value_regs[i] != LLDB_INVALID_REGNUM; ++i)
-                m_value_regs_map[reg_num].push_back(reg_info.value_regs[i]);
-            m_value_regs_map[reg_num].push_back(LLDB_INVALID_REGNUM);
-            reg_info.value_regs = m_value_regs_map[reg_num].data();
-        }
-        if (reg_info.invalidate_regs)
-        {
-            for (i=0; reg_info.invalidate_regs[i] != LLDB_INVALID_REGNUM; ++i)
-                m_invalidate_regs_map[reg_num].push_back(reg_info.invalidate_regs[i]);
-            m_invalidate_regs_map[reg_num].push_back(LLDB_INVALID_REGNUM);
-            reg_info.invalidate_regs = m_invalidate_regs_map[reg_num].data();
-        }
-        m_regs.push_back (reg_info);
-        uint32_t set = GetRegisterSetIndexByName (set_name);
-        assert (set < m_sets.size());
-        assert (set < m_set_reg_nums.size());
-        assert (set < m_set_names.size());
-        m_set_reg_nums[set].push_back(reg_num);
-        size_t end_reg_offset = reg_info.byte_offset + reg_info.byte_size;
-        if (m_reg_data_byte_size < end_reg_offset)
-            m_reg_data_byte_size = end_reg_offset;
-    }
-
-    void
-    Finalize ()
-    {
-        for (uint32_t set = 0; set < m_sets.size(); ++set)
-        {
-            assert (m_sets.size() == m_set_reg_nums.size());
-            m_sets[set].num_registers = m_set_reg_nums[set].size();
-            m_sets[set].registers = &m_set_reg_nums[set][0];
-        }
-    }
-
-    size_t
-    GetNumRegisters() const
-    {
-        return m_regs.size();
-    }
-
-    size_t
-    GetNumRegisterSets() const
-    {
-        return m_sets.size();
-    }
-
-    size_t
-    GetRegisterDataByteSize() const
-    {
-        return m_reg_data_byte_size;
-    }
-
-    const lldb_private::RegisterInfo *
-    GetRegisterInfoAtIndex (uint32_t i) const
-    {
-        if (i < m_regs.size())
-            return &m_regs[i];
-        return NULL;
-    }
-
-    const lldb_private::RegisterSet *
-    GetRegisterSet (uint32_t i) const
-    {
-        if (i < m_sets.size())
-            return &m_sets[i];
-        return NULL;
-    }
-
-    uint32_t
-    GetRegisterSetIndexByName (lldb_private::ConstString &set_name)
-    {
-        name_collection::iterator pos, end = m_set_names.end();
-        for (pos = m_set_names.begin(); pos != end; ++pos)
-        {
-            if (*pos == set_name)
-                return static_cast<uint32_t>(std::distance (m_set_names.begin(), pos));
-        }
-
-        m_set_names.push_back(set_name);
-        m_set_reg_nums.resize(m_set_reg_nums.size()+1);
-        lldb_private::RegisterSet new_set = { set_name.AsCString(), NULL, 0, NULL };
-        m_sets.push_back (new_set);
-        return static_cast<uint32_t>(m_sets.size() - 1);
-    }
-
-    uint32_t
-    ConvertRegisterKindToRegisterNumber (uint32_t kind, uint32_t num) const
-    {
-        reg_collection::const_iterator pos, end = m_regs.end();
-        for (pos = m_regs.begin(); pos != end; ++pos)
-        {
-            if (pos->kinds[kind] == num)
-                return static_cast<uint32_t>(std::distance (m_regs.begin(), pos));
-        }
-
-        return LLDB_INVALID_REGNUM;
-    }
-    void
-    Clear()
-    {
-        m_regs.clear();
-        m_sets.clear();
-        m_set_reg_nums.clear();
-        m_reg_names.clear();
-        m_reg_alt_names.clear();
-        m_set_names.clear();
-    }
-
     void
     HardcodeARMRegisters(bool from_scratch);
 
-protected:
-    //------------------------------------------------------------------
-    // Classes that inherit from GDBRemoteRegisterContext can see and modify these
-    //------------------------------------------------------------------
-    typedef std::vector <lldb_private::RegisterInfo> reg_collection;
-    typedef std::vector <lldb_private::RegisterSet> set_collection;
-    typedef std::vector <uint32_t> reg_num_collection;
-    typedef std::vector <reg_num_collection> set_reg_num_collection;
-    typedef std::vector <lldb_private::ConstString> name_collection;
-    typedef std::map<uint32_t, reg_num_collection> reg_to_regs_map;
-
-    reg_collection m_regs;
-    set_collection m_sets;
-    set_reg_num_collection m_set_reg_nums;
-    name_collection m_reg_names;
-    name_collection m_reg_alt_names;
-    name_collection m_set_names;
-    reg_to_regs_map m_value_regs_map;
-    reg_to_regs_map m_invalidate_regs_map;
-    size_t m_reg_data_byte_size;   // The number of bytes required to store all registers
 };
 
 class GDBRemoteRegisterContext : public lldb_private::RegisterContext
@@ -237,6 +91,12 @@ public:
     virtual bool
     WriteAllRegisterValues (const lldb::DataBufferSP &data_sp);
 
+    virtual bool
+    ReadAllRegisterValues (lldb_private::RegisterCheckpoint &reg_checkpoint);
+
+    virtual bool
+    WriteAllRegisterValues (const lldb_private::RegisterCheckpoint &reg_checkpoint);
+
     virtual uint32_t
     ConvertRegisterKindToRegisterNumber (uint32_t kind, uint32_t num);
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 89da55a012a..3a62aa1bb87 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -8,13 +8,16 @@
 //===----------------------------------------------------------------------===//
 
 #include "lldb/lldb-python.h"
+#include "lldb/Host/Config.h"
 
 // C Includes
 #include <errno.h>
-#include <spawn.h>
 #include <stdlib.h>
+#ifndef LLDB_DISABLE_POSIX
+#include <spawn.h>
 #include <netinet/in.h>
 #include <sys/mman.h>       // for mmap
+#endif
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
@@ -46,6 +49,9 @@
 #include "lldb/Interpreter/CommandObject.h"
 #include "lldb/Interpreter/CommandObjectMultiword.h"
 #include "lldb/Interpreter/CommandReturnObject.h"
+#ifndef LLDB_DISABLE_PYTHON
+#include "lldb/Interpreter/PythonDataObjects.h"
+#endif
 #include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Target/DynamicLoader.h"
 #include "lldb/Target/Target.h"
@@ -93,12 +99,14 @@ namespace {
     g_properties[] =
     {
         { "packet-timeout" , OptionValue::eTypeUInt64 , true , 1, NULL, NULL, "Specify the default packet timeout in seconds." },
+        { "target-definition-file" , OptionValue::eTypeFileSpec , true, 0 , NULL, NULL, "The file that provides the description for remote target registers." },
         {  NULL            , OptionValue::eTypeInvalid, false, 0, NULL, NULL, NULL  }
     };
     
     enum
     {
-        ePropertyPacketTimeout
+        ePropertyPacketTimeout,
+        ePropertyTargetDefinitionFile
     };
     
     class PluginProperties : public Properties
@@ -129,6 +137,20 @@ namespace {
             const uint32_t idx = ePropertyPacketTimeout;
             return m_collection_sp->GetPropertyAtIndexAsUInt64(NULL, idx, g_properties[idx].default_uint_value);
         }
+
+        bool
+        SetPacketTimeout(uint64_t timeout)
+        {
+            const uint32_t idx = ePropertyPacketTimeout;
+            return m_collection_sp->SetPropertyAtIndexAsUInt64(NULL, idx, timeout);
+        }
+
+        FileSpec
+        GetTargetDefinitionFile () const
+        {
+            const uint32_t idx = ePropertyTargetDefinitionFile;
+            return m_collection_sp->GetPropertyAtIndexAsFileSpec (NULL, idx);
+        }
     };
     
     typedef std::shared_ptr<PluginProperties> ProcessKDPPropertiesSP;
@@ -253,13 +275,13 @@ ProcessGDBRemote::ProcessGDBRemote(Target& target, Listener &listener) :
     m_continue_C_tids (),
     m_continue_s_tids (),
     m_continue_S_tids (),
-    m_dispatch_queue_offsets_addr (LLDB_INVALID_ADDRESS),
     m_max_memory_size (512),
     m_addr_to_mmap_size (),
     m_thread_create_bp_sp (),
     m_waiting_for_attach (false),
     m_destroy_tried_resuming (false),
-    m_command_sp ()
+    m_command_sp (),
+    m_breakpoint_pc_offset (0)
 {
     m_async_broadcaster.SetEventName (eBroadcastBitAsyncThreadShouldExit,   "async thread should exit");
     m_async_broadcaster.SetEventName (eBroadcastBitAsyncContinue,           "async thread continue");
@@ -304,6 +326,48 @@ ProcessGDBRemote::GetPluginVersion()
     return 1;
 }
 
+bool
+ProcessGDBRemote::ParsePythonTargetDefinition(const FileSpec &target_definition_fspec)
+{
+#ifndef LLDB_DISABLE_PYTHON
+    ScriptInterpreter *interpreter = GetTarget().GetDebugger().GetCommandInterpreter().GetScriptInterpreter();
+    Error error;
+    lldb::ScriptInterpreterObjectSP module_object_sp (interpreter->LoadPluginModule(target_definition_fspec, error));
+    if (module_object_sp)
+    {
+        lldb::ScriptInterpreterObjectSP target_definition_sp (interpreter->GetDynamicSettings(module_object_sp,
+                                                                                              &GetTarget(),
+                                                                                              "gdb-server-target-definition",
+                                                                                              error));
+        
+        PythonDictionary target_dict(target_definition_sp);
+
+        if (target_dict)
+        {
+            PythonDictionary host_info_dict (target_dict.GetItemForKey("host-info"));
+            if (host_info_dict)
+            {
+                ArchSpec host_arch (host_info_dict.GetItemForKeyAsString(PythonString("triple")));
+                
+                if (!host_arch.IsCompatibleMatch(GetTarget().GetArchitecture()))
+                {
+                    GetTarget().SetArchitecture(host_arch);
+                }
+                    
+            }
+            m_breakpoint_pc_offset = target_dict.GetItemForKeyAsInteger("breakpoint-pc-offset", 0);
+
+            if (m_register_info.SetRegisterInfo (target_dict, GetTarget().GetArchitecture().GetByteOrder()) > 0)
+            {
+                return true;
+            }
+        }
+    }
+#endif
+    return false;
+}
+
+
 void
 ProcessGDBRemote::BuildDynamicRegisterInfo (bool force)
 {
@@ -479,6 +543,28 @@ ProcessGDBRemote::BuildDynamicRegisterInfo (bool force)
         }
     }
 
+    // Check if qHostInfo specified a specific packet timeout for this connection.
+    // If so then lets update our setting so the user knows what the timeout is
+    // and can see it.
+    const uint32_t host_packet_timeout = m_gdb_comm.GetHostDefaultPacketTimeout();
+    if (host_packet_timeout)
+    {
+        GetGlobalPluginProperties()->SetPacketTimeout(host_packet_timeout);
+    }
+    
+
+    if (reg_num == 0)
+    {
+        FileSpec target_definition_fspec = GetGlobalPluginProperties()->GetTargetDefinitionFile ();
+        
+        if (target_definition_fspec)
+        {
+            // See if we can get register definitions from a python file
+            if (ParsePythonTargetDefinition (target_definition_fspec))
+                return;
+        }
+    }
+
     // We didn't get anything if the accumulated reg_num is zero.  See if we are
     // debugging ARM and fill with a hard coded register set until we can get an
     // updated debugserver down on the devices.
@@ -560,6 +646,11 @@ ProcessGDBRemote::DoConnectRemote (Stream *strm, const char *remote_url)
         GetThreadList();
         if (m_gdb_comm.SendPacketAndWaitForResponse("?", 1, m_last_stop_packet, false))
         {
+            if (!m_target.GetArchitecture().IsValid()) { // Make sure we have an architecture
+               m_target.SetArchitecture(m_gdb_comm.GetProcessArchitecture());
+            }
+
+
             const StateType state = SetThreadStopInfo (m_last_stop_packet);
             if (state == eStateStopped)
             {
@@ -728,7 +819,7 @@ ProcessGDBRemote::DoLaunch (Module *exe_module, const ProcessLaunchInfo &launch_
             }
 
             const uint32_t old_packet_timeout = m_gdb_comm.SetPacketTimeout (10);
-            int arg_packet_err = m_gdb_comm.SendArgumentsPacket (launch_info.GetArguments().GetConstArgumentVector());
+            int arg_packet_err = m_gdb_comm.SendArgumentsPacket (launch_info);
             if (arg_packet_err == 0)
             {
                 std::string error_str;
@@ -758,6 +849,10 @@ ProcessGDBRemote::DoLaunch (Module *exe_module, const ProcessLaunchInfo &launch_
 
             if (m_gdb_comm.SendPacketAndWaitForResponse("?", 1, m_last_stop_packet, false))
             {
+                if (!m_target.GetArchitecture().IsValid()) { // Make sure we have an architecture
+                   m_target.SetArchitecture(m_gdb_comm.GetProcessArchitecture());
+                }
+
                 SetPrivateState (SetThreadStopInfo (m_last_stop_packet));
                 
                 if (!disable_stdio)
@@ -830,15 +925,13 @@ ProcessGDBRemote::ConnectToDebugserver (const char *connect_url)
     // then we aren't actually connected to anything, so try and do the
     // handshake with the remote GDB server and make sure that goes 
     // alright.
-    if (!m_gdb_comm.HandshakeWithServer (NULL))
+    if (!m_gdb_comm.HandshakeWithServer (&error))
     {
         m_gdb_comm.Disconnect();
         if (error.Success())
             error.SetErrorString("not connected to remote gdb server");
         return error;
     }
-    m_gdb_comm.ResetDiscoverableSettings();
-    m_gdb_comm.QueryNoAckModeSupported ();
     m_gdb_comm.GetThreadSuffixSupported ();
     m_gdb_comm.GetListThreadsInStopReplySupported ();
     m_gdb_comm.GetHostInfo ();
@@ -862,8 +955,6 @@ ProcessGDBRemote::DidLaunchOrAttach ()
         log->Printf ("ProcessGDBRemote::DidLaunch()");
     if (GetID() != LLDB_INVALID_PROCESS_ID)
     {
-        m_dispatch_queue_offsets_addr = LLDB_INVALID_ADDRESS;
-
         BuildDynamicRegisterInfo (false);
 
         // See if the GDB server supports the qHostInfo information
@@ -1064,6 +1155,13 @@ ProcessGDBRemote::DoAttachToProcessWithName (const char *process_name, bool wait
 }
 
 
+bool
+ProcessGDBRemote::SetExitStatus (int exit_status, const char *cstr)
+{
+    m_gdb_comm.Disconnect();
+    return Process::SetExitStatus (exit_status, cstr);
+}
+
 void
 ProcessGDBRemote::DidAttach ()
 {
@@ -1653,7 +1751,7 @@ ProcessGDBRemote::SetThreadStopInfo (StringExtractor& stop_packet)
                             // Currently we are going to assume SIGTRAP means we are either
                             // hitting a breakpoint or hardware single stepping. 
                             handled = true;
-                            addr_t pc = thread_sp->GetRegisterContext()->GetPC();
+                            addr_t pc = thread_sp->GetRegisterContext()->GetPC() + m_breakpoint_pc_offset;
                             lldb::BreakpointSiteSP bp_site_sp = thread_sp->GetProcess()->GetBreakpointSiteList().FindByAddress(pc);
                             
                             if (bp_site_sp)
@@ -1663,6 +1761,8 @@ ProcessGDBRemote::SetThreadStopInfo (StringExtractor& stop_packet)
                                 // will be taken care of when the thread resumes and notices that there's a breakpoint under the pc.
                                 if (bp_site_sp->ValidForThisThread (thread_sp.get()))
                                 {
+                                    if(m_breakpoint_pc_offset != 0)
+                                        thread_sp->GetRegisterContext()->SetPC(pc);
                                     thread_sp->SetStopInfo (StopInfo::CreateStopReasonWithBreakpointSiteID (*thread_sp, bp_site_sp->GetID()));
                                 }
                                 else
@@ -2221,7 +2321,7 @@ ProcessGDBRemote::EnableBreakpointSite (BreakpointSite *bp_site)
     {
         const size_t bp_op_size = GetSoftwareBreakpointTrapOpcode (bp_site);
 
-        if (bp_site->HardwarePreferred())
+        if (bp_site->HardwareRequired())
         {
             // Try and set hardware breakpoint, and if that fails, fall through
             // and set a software breakpoint?
@@ -2231,12 +2331,19 @@ ProcessGDBRemote::EnableBreakpointSite (BreakpointSite *bp_site)
                 {
                     bp_site->SetEnabled(true);
                     bp_site->SetType (BreakpointSite::eHardware);
-                    return error;
+                }
+                else
+                {
+                    error.SetErrorString("failed to set hardware breakpoint (hardware breakpoint resources might be exhausted or unavailable)");
                 }
             }
+            else
+            {
+                error.SetErrorString("hardware breakpoints are not supported");
+            }
+            return error;
         }
-
-        if (m_gdb_comm.SupportsGDBStoppointPacket (eBreakpointSoftware))
+        else if (m_gdb_comm.SupportsGDBStoppointPacket (eBreakpointSoftware))
         {
             if (m_gdb_comm.SendGDBStoppointTypePacket(eBreakpointSoftware, true, addr, bp_op_size) == 0)
             {
@@ -2686,9 +2793,10 @@ ProcessGDBRemote::MonitorDebugserverProcess
 void
 ProcessGDBRemote::KillDebugserverProcess ()
 {
+    m_gdb_comm.Disconnect();
     if (m_debugserver_pid != LLDB_INVALID_PROCESS_ID)
     {
-        ::kill (m_debugserver_pid, SIGINT);
+        Host::Kill (m_debugserver_pid, SIGINT);
         m_debugserver_pid = LLDB_INVALID_PROCESS_ID;
     }
 }
@@ -2795,7 +2903,7 @@ ProcessGDBRemote::StopAsyncThread ()
 }
 
 
-void *
+thread_result_t
 ProcessGDBRemote::AsyncThread (void *arg)
 {
     ProcessGDBRemote *process = (ProcessGDBRemote*) arg;
@@ -2917,97 +3025,6 @@ ProcessGDBRemote::AsyncThread (void *arg)
     return NULL;
 }
 
-const char *
-ProcessGDBRemote::GetDispatchQueueNameForThread
-(
-    addr_t thread_dispatch_qaddr,
-    std::string &dispatch_queue_name
-)
-{
-    dispatch_queue_name.clear();
-    if (thread_dispatch_qaddr != 0 && thread_dispatch_qaddr != LLDB_INVALID_ADDRESS)
-    {
-        // Cache the dispatch_queue_offsets_addr value so we don't always have
-        // to look it up
-        if (m_dispatch_queue_offsets_addr == LLDB_INVALID_ADDRESS)
-        {
-            static ConstString g_dispatch_queue_offsets_symbol_name ("dispatch_queue_offsets");
-            const Symbol *dispatch_queue_offsets_symbol = NULL;
-            ModuleSpec libSystem_module_spec (FileSpec("libSystem.B.dylib", false));
-            ModuleSP module_sp(GetTarget().GetImages().FindFirstModule (libSystem_module_spec));
-            if (module_sp)
-                dispatch_queue_offsets_symbol = module_sp->FindFirstSymbolWithNameAndType (g_dispatch_queue_offsets_symbol_name, eSymbolTypeData);
-            
-            if (dispatch_queue_offsets_symbol == NULL)
-            {
-                ModuleSpec libdispatch_module_spec (FileSpec("libdispatch.dylib", false));
-                module_sp = GetTarget().GetImages().FindFirstModule (libdispatch_module_spec);
-                if (module_sp)
-                    dispatch_queue_offsets_symbol = module_sp->FindFirstSymbolWithNameAndType (g_dispatch_queue_offsets_symbol_name, eSymbolTypeData);
-            }
-            if (dispatch_queue_offsets_symbol)
-                m_dispatch_queue_offsets_addr = dispatch_queue_offsets_symbol->GetAddress().GetLoadAddress(&m_target);
-
-            if (m_dispatch_queue_offsets_addr == LLDB_INVALID_ADDRESS)
-                return NULL;
-        }
-
-        uint8_t memory_buffer[8];
-        DataExtractor data (memory_buffer, 
-                            sizeof(memory_buffer), 
-                            m_target.GetArchitecture().GetByteOrder(), 
-                            m_target.GetArchitecture().GetAddressByteSize());
-
-        // Excerpt from src/queue_private.h
-        struct dispatch_queue_offsets_s
-        {
-            uint16_t dqo_version;
-            uint16_t dqo_label;      // in version 1-3, offset to string; in version 4+, offset to a pointer to a string
-            uint16_t dqo_label_size; // in version 1-3, length of string; in version 4+, size of a (void*) in this process
-        } dispatch_queue_offsets;
-
-
-        Error error;
-        if (ReadMemory (m_dispatch_queue_offsets_addr, memory_buffer, sizeof(dispatch_queue_offsets), error) == sizeof(dispatch_queue_offsets))
-        {
-            lldb::offset_t data_offset = 0;
-            if (data.GetU16(&data_offset, &dispatch_queue_offsets.dqo_version, sizeof(dispatch_queue_offsets)/sizeof(uint16_t)))
-            {
-                if (ReadMemory (thread_dispatch_qaddr, &memory_buffer, data.GetAddressByteSize(), error) == data.GetAddressByteSize())
-                {
-                    data_offset = 0;
-                    lldb::addr_t queue_addr = data.GetAddress(&data_offset);
-                    if (dispatch_queue_offsets.dqo_version >= 4)
-                    {
-                        // libdispatch versions 4+, pointer to dispatch name is in the 
-                        // queue structure.
-                        lldb::addr_t pointer_to_label_address = queue_addr + dispatch_queue_offsets.dqo_label;
-                        if (ReadMemory (pointer_to_label_address, &memory_buffer, data.GetAddressByteSize(), error) == data.GetAddressByteSize())
-                        {
-                            data_offset = 0;
-                            lldb::addr_t label_addr = data.GetAddress(&data_offset);
-                            ReadCStringFromMemory (label_addr, dispatch_queue_name, error);
-                        }
-                    }
-                    else
-                    {
-                        // libdispatch versions 1-3, dispatch name is a fixed width char array
-                        // in the queue structure.
-                        lldb::addr_t label_addr = queue_addr + dispatch_queue_offsets.dqo_label;
-                        dispatch_queue_name.resize(dispatch_queue_offsets.dqo_label_size, '\0');
-                        size_t bytes_read = ReadMemory (label_addr, &dispatch_queue_name[0], dispatch_queue_offsets.dqo_label_size, error);
-                        if (bytes_read < dispatch_queue_offsets.dqo_label_size)
-                            dispatch_queue_name.erase (bytes_read);
-                    }
-                }
-            }
-        }
-    }
-    if (dispatch_queue_name.empty())
-        return NULL;
-    return dispatch_queue_name.c_str();
-}
-
 //uint32_t
 //ProcessGDBRemote::ListProcessesMatchingName (const char *name, StringList &matches, std::vector<lldb::pid_t> &pids)
 //{
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
index e104b7191ea..35244074bab 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
@@ -222,6 +222,13 @@ public:
     {
         return m_gdb_comm;
     }
+    
+    //----------------------------------------------------------------------
+    // Override SetExitStatus so we can disconnect from the remote GDB server
+    //----------------------------------------------------------------------
+    virtual bool
+    SetExitStatus (int exit_status, const char *cstr);
+
 
 protected:
     friend class ThreadGDBRemote;
@@ -291,6 +298,12 @@ protected:
     void
     SetLastStopPacket (const StringExtractorGDBRemote &response);
 
+    bool
+    ParsePythonTargetDefinition(const lldb_private::FileSpec &target_definition_fspec);
+    
+    bool
+    ParseRegisters(lldb_private::ScriptInterpreterObject *registers_array);
+
     //------------------------------------------------------------------
     /// Broadcaster event bits definitions.
     //------------------------------------------------------------------
@@ -326,13 +339,13 @@ protected:
     tid_sig_collection m_continue_C_tids; // 'C' for continue with signal
     tid_collection m_continue_s_tids;                  // 's' for step
     tid_sig_collection m_continue_S_tids; // 'S' for step with signal
-    lldb::addr_t m_dispatch_queue_offsets_addr;
     size_t m_max_memory_size;       // The maximum number of bytes to read/write when reading and writing memory
     MMapMap m_addr_to_mmap_size;
     lldb::BreakpointSP m_thread_create_bp_sp;
     bool m_waiting_for_attach;
     bool m_destroy_tried_resuming;
     lldb::CommandObjectSP m_command_sp;
+    int64_t m_breakpoint_pc_offset;
     
     bool
     StartAsyncThread ();
@@ -340,7 +353,7 @@ protected:
     void
     StopAsyncThread ();
 
-    static void *
+    static lldb::thread_result_t
     AsyncThread (void *arg);
 
     static bool
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp
index 38fb84d66ef..4e475c80bda 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.cpp
@@ -10,16 +10,17 @@
 
 #include "ThreadGDBRemote.h"
 
+#include "lldb/Breakpoint/Watchpoint.h"
 #include "lldb/Core/ArchSpec.h"
 #include "lldb/Core/DataExtractor.h"
-#include "lldb/Core/StreamString.h"
 #include "lldb/Core/State.h"
+#include "lldb/Core/StreamString.h"
+#include "lldb/Target/Platform.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/StopInfo.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/Unwind.h"
-#include "lldb/Breakpoint/Watchpoint.h"
 
 #include "ProcessGDBRemote.h"
 #include "ProcessGDBRemoteLog.h"
@@ -73,13 +74,38 @@ ThreadGDBRemote::GetQueueName ()
         ProcessSP process_sp (GetProcess());
         if (process_sp)
         {
-            ProcessGDBRemote *gdb_process = static_cast<ProcessGDBRemote *>(process_sp.get());
-            return gdb_process->GetDispatchQueueNameForThread (m_thread_dispatch_qaddr, m_dispatch_queue_name);
+            PlatformSP platform_sp (process_sp->GetTarget().GetPlatform());
+            if (platform_sp)
+            {
+                m_dispatch_queue_name = platform_sp->GetQueueNameForThreadQAddress (process_sp.get(), m_thread_dispatch_qaddr);
+            }
+            if (m_dispatch_queue_name.length() > 0)
+            {
+                return m_dispatch_queue_name.c_str();
+            }
         }
     }
     return NULL;
 }
 
+queue_id_t
+ThreadGDBRemote::GetQueueID ()
+{
+    if (m_thread_dispatch_qaddr != 0 || m_thread_dispatch_qaddr != LLDB_INVALID_ADDRESS)
+    {
+        ProcessSP process_sp (GetProcess());
+        if (process_sp)
+        {
+            PlatformSP platform_sp (process_sp->GetTarget().GetPlatform());
+            if (platform_sp)
+            {
+                return platform_sp->GetQueueIDForThreadQAddress (process_sp.get(), m_thread_dispatch_qaddr);
+            }
+        }
+    }
+    return LLDB_INVALID_QUEUE_ID;
+}
+
 void
 ThreadGDBRemote::WillResume (StateType resume_state)
 {
@@ -164,7 +190,6 @@ lldb::RegisterContextSP
 ThreadGDBRemote::CreateRegisterContextForFrame (StackFrame *frame)
 {
     lldb::RegisterContextSP reg_ctx_sp;
-    const bool read_all_registers_at_once = false;
     uint32_t concrete_frame_idx = 0;
     
     if (frame)
@@ -177,6 +202,8 @@ ThreadGDBRemote::CreateRegisterContextForFrame (StackFrame *frame)
         if (process_sp)
         {
             ProcessGDBRemote *gdb_process = static_cast<ProcessGDBRemote *>(process_sp.get());
+            // read_all_registers_at_once will be true if 'p' packet is not supported.
+            bool read_all_registers_at_once = !gdb_process->GetGDBRemote().GetpPacketSupported (GetID());
             reg_ctx_sp.reset (new GDBRemoteRegisterContext (*this, concrete_frame_idx, gdb_process->m_register_info, read_all_registers_at_once));
         }
     }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h
index 50a3f19c650..dd4cc036ef8 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/Process/gdb-remote/ThreadGDBRemote.h
@@ -38,6 +38,9 @@ public:
     virtual const char *
     GetQueueName ();
 
+    virtual lldb::queue_id_t
+    GetQueueID ();
+
     virtual lldb::RegisterContextSP
     GetRegisterContext ();
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp
index 06e87eab33c..ff2e3762556 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.cpp
@@ -32,13 +32,13 @@ DWARFAbbreviationDeclaration::DWARFAbbreviationDeclaration(dw_tag_t tag, uint8_t
 }
 
 bool
-DWARFAbbreviationDeclaration::Extract(const DataExtractor& data, lldb::offset_t* offset_ptr)
+DWARFAbbreviationDeclaration::Extract(const DWARFDataExtractor& data, lldb::offset_t* offset_ptr)
 {
     return Extract(data, offset_ptr, data.GetULEB128(offset_ptr));
 }
 
 bool
-DWARFAbbreviationDeclaration::Extract(const DataExtractor& data, lldb::offset_t *offset_ptr, dw_uleb128_t code)
+DWARFAbbreviationDeclaration::Extract(const DWARFDataExtractor& data, lldb::offset_t *offset_ptr, dw_uleb128_t code)
 {
     m_code = code;
     m_attributes.clear();
@@ -139,7 +139,7 @@ DWARFAbbreviationDeclaration::CopyExcludingAddressAttributes(const DWARFAbbrevia
 void
 DWARFAbbreviationDeclaration::CopyChangingStringToStrp(
     const DWARFAbbreviationDeclaration& abbr_decl,
-    const DataExtractor& debug_info_data,
+    const DWARFDataExtractor& debug_info_data,
     dw_offset_t debug_info_offset,
     const DWARFCompileUnit* cu,
     const uint32_t strp_min_len
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.h
index f462b7fc108..48b9ebe37ee 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAbbreviationDeclaration.h
@@ -58,13 +58,13 @@ public:
     void            CopyExcludingAddressAttributes(const DWARFAbbreviationDeclaration& abbr_decl, const uint32_t idx);
     void            CopyChangingStringToStrp(
                         const DWARFAbbreviationDeclaration& abbr_decl,
-                        const lldb_private::DataExtractor& debug_info_data,
+                        const lldb_private::DWARFDataExtractor& debug_info_data,
                         dw_offset_t debug_info_offset,
                         const DWARFCompileUnit* cu,
                         const uint32_t strp_min_len);
     uint32_t        FindAttributeIndex(dw_attr_t attr) const;
-    bool            Extract(const lldb_private::DataExtractor& data, lldb::offset_t *offset_ptr);
-    bool            Extract(const lldb_private::DataExtractor& data, lldb::offset_t *offset_ptr, dw_uleb128_t code);
+    bool            Extract(const lldb_private::DWARFDataExtractor& data, lldb::offset_t *offset_ptr);
+    bool            Extract(const lldb_private::DWARFDataExtractor& data, lldb::offset_t *offset_ptr, dw_uleb128_t code);
 //  void            Append(BinaryStreamBuf& out_buff) const;
     bool            IsValid();
     void            Dump(lldb_private::Stream *s) const;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h
index 8310b1dda5f..40c8af3d6e8 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFAttribute.h
@@ -28,7 +28,7 @@ public:
     dw_form_t   get_form() const { return (dw_form_t)m_attr_form; }
     void        get(dw_attr_t& attr, dw_form_t& form)  const
     {
-        register uint32_t attr_form = m_attr_form;
+        uint32_t attr_form = m_attr_form;
         attr = attr_form >> 16;
         form = (dw_form_t)attr_form;
     }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
index 493b3af6ecd..cf664db28ac 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp
@@ -69,7 +69,7 @@ DWARFCompileUnit::Clear()
 }
 
 bool
-DWARFCompileUnit::Extract(const DataExtractor &debug_info, lldb::offset_t *offset_ptr)
+DWARFCompileUnit::Extract(const DWARFDataExtractor &debug_info, lldb::offset_t *offset_ptr)
 {
     Clear();
 
@@ -103,30 +103,6 @@ DWARFCompileUnit::Extract(const DataExtractor &debug_info, lldb::offset_t *offse
 }
 
 
-dw_offset_t
-DWARFCompileUnit::Extract(lldb::offset_t offset, const DataExtractor& debug_info_data, const DWARFAbbreviationDeclarationSet* abbrevs)
-{
-    Clear();
-
-    m_offset = offset;
-
-    if (debug_info_data.ValidOffset(offset))
-    {
-        m_length        = debug_info_data.GetU32(&offset);
-        m_version       = debug_info_data.GetU16(&offset);
-        bool abbrevs_OK = debug_info_data.GetU32(&offset) == abbrevs->GetOffset();
-        m_abbrevs       = abbrevs;
-        m_addr_size     = debug_info_data.GetU8 (&offset);
-
-        bool version_OK = SymbolFileDWARF::SupportedVersion(m_version);
-        bool addr_size_OK = ((m_addr_size == 4) || (m_addr_size == 8));
-
-        if (version_OK && addr_size_OK && abbrevs_OK && debug_info_data.ValidOffset(offset))
-            return offset;
-    }
-    return DW_INVALID_OFFSET;
-}
-
 void
 DWARFCompileUnit::ClearDIEs(bool keep_compile_unit_die)
 {
@@ -187,7 +163,7 @@ DWARFCompileUnit::ExtractDIEsIfNeeded (bool cu_die_only)
     uint32_t depth = 0;
     // We are in our compile unit, parse starting at the offset
     // we were told to parse
-    const DataExtractor& debug_info_data = m_dwarf2Data->get_debug_info_data();
+    const DWARFDataExtractor& debug_info_data = m_dwarf2Data->get_debug_info_data();
     std::vector<uint32_t> die_index_stack;
     die_index_stack.reserve(32);
     die_index_stack.push_back(0);
@@ -312,7 +288,7 @@ DWARFCompileUnit::GetAbbrevOffset() const
 bool
 DWARFCompileUnit::Verify(Stream *s) const
 {
-    const DataExtractor& debug_info = m_dwarf2Data->get_debug_info_data();
+    const DWARFDataExtractor& debug_info = m_dwarf2Data->get_debug_info_data();
     bool valid_offset = debug_info.ValidOffset(m_offset);
     bool length_OK = debug_info.ValidOffset(GetNextCompileUnitOffset()-1);
     bool version_OK = SymbolFileDWARF::SupportedVersion(m_version);
@@ -612,7 +588,7 @@ DWARFCompileUnit::Index (const uint32_t cu_idx,
                          NameToDIE& types,
                          NameToDIE& namespaces)
 {
-    const DataExtractor* debug_str = &m_dwarf2Data->get_debug_str_data();
+    const DWARFDataExtractor* debug_str = &m_dwarf2Data->get_debug_str_data();
 
     const uint8_t *fixed_form_sizes = DWARFFormValue::GetFixedFormSizesForAddressSize (GetAddressByteSize());
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h
index 9fee0a2d223..35597f38942 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.h
@@ -29,8 +29,7 @@ public:
 
     DWARFCompileUnit(SymbolFileDWARF* dwarf2Data);
 
-    bool        Extract(const lldb_private::DataExtractor &debug_info, lldb::offset_t *offset_ptr);
-    dw_offset_t Extract(lldb::offset_t offset, const lldb_private::DataExtractor& debug_info_data, const DWARFAbbreviationDeclarationSet* abbrevs);
+    bool        Extract(const lldb_private::DWARFDataExtractor &debug_info, lldb::offset_t *offset_ptr);
     size_t      ExtractDIEsIfNeeded (bool cu_die_only);
     bool        LookupAddress(
                     const dw_addr_t address,
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp
new file mode 100644
index 00000000000..9bf47cd7a9a
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.cpp
@@ -0,0 +1,30 @@
+//===-- DWARFDataExtractor.cpp ----------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "DWARFDataExtractor.h"
+
+namespace lldb_private {
+
+uint64_t
+DWARFDataExtractor::GetDWARFInitialLength(lldb::offset_t *offset_ptr) const
+{
+    uint64_t length = GetU32(offset_ptr);
+    m_is_dwarf64 = (length == UINT32_MAX);
+    if (m_is_dwarf64)
+        length = GetU64(offset_ptr);
+    return length;
+}
+
+dw_offset_t
+DWARFDataExtractor::GetDWARFOffset(lldb::offset_t *offset_ptr) const
+{
+    return GetMaxU64(offset_ptr, m_is_dwarf64 ? 8 : 4);
+}
+
+}
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.h
new file mode 100644
index 00000000000..6e5b974a71f
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDataExtractor.h
@@ -0,0 +1,43 @@
+//===-- DWARFDataExtractor.h ------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef liblldb_DWARFDataExtractor_h_                                 
+#define liblldb_DWARFDataExtractor_h_                                 
+
+// Other libraries and framework includes.
+#include "lldb/Core/DataExtractor.h"
+#include "lldb/Core/dwarf.h"
+
+namespace lldb_private {
+
+class DWARFDataExtractor : public lldb_private::DataExtractor
+{
+public:
+    DWARFDataExtractor() : DataExtractor(), m_is_dwarf64(false) { };
+
+    DWARFDataExtractor (const DWARFDataExtractor& data, lldb::offset_t offset, lldb::offset_t length) :
+      DataExtractor(data, offset, length), m_is_dwarf64(false) { };
+
+    uint64_t
+    GetDWARFInitialLength(lldb::offset_t *offset_ptr) const;
+
+    dw_offset_t
+    GetDWARFOffset(lldb::offset_t *offset_ptr) const;
+
+    size_t
+    GetDWARFSizeofInitialLength() const { return m_is_dwarf64 ? 12 : 4; }
+
+protected:
+    mutable bool m_is_dwarf64;
+};
+
+}
+
+#endif  // liblldb_DWARFDataExtractor_h_                                 
+
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.cpp
index 47657d5089b..6773d0762a2 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "DWARFDebugAbbrev.h"
-#include "lldb/Core/DataExtractor.h"
+#include "DWARFDataExtractor.h"
 #include "lldb/Core/Stream.h"
 
 using namespace lldb;
@@ -30,7 +30,7 @@ DWARFAbbreviationDeclarationSet::Clear()
 // DWARFAbbreviationDeclarationSet::Extract()
 //----------------------------------------------------------------------
 bool
-DWARFAbbreviationDeclarationSet::Extract(const DataExtractor& data, lldb::offset_t *offset_ptr)
+DWARFAbbreviationDeclarationSet::Extract(const DWARFDataExtractor& data, lldb::offset_t *offset_ptr)
 {
     const lldb::offset_t begin_offset = *offset_ptr;
     m_offset = begin_offset;
@@ -142,7 +142,7 @@ DWARFDebugAbbrev::DWARFDebugAbbrev() :
 // DWARFDebugAbbrev::Parse()
 //----------------------------------------------------------------------
 void
-DWARFDebugAbbrev::Parse(const DataExtractor& data)
+DWARFDebugAbbrev::Parse(const DWARFDataExtractor& data)
 {
     lldb::offset_t offset = 0;
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.h
index eba439928a2..8ec2c4ba8e2 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAbbrev.h
@@ -43,7 +43,7 @@ public:
     void Clear();
     dw_offset_t GetOffset() const { return m_offset; }
     void Dump(lldb_private::Stream *s) const;
-    bool Extract(const lldb_private::DataExtractor& data, lldb::offset_t *offset_ptr);
+    bool Extract(const lldb_private::DWARFDataExtractor& data, lldb::offset_t *offset_ptr);
     //void Encode(BinaryStreamBuf& debug_abbrev_buf) const;
     dw_uleb128_t AppendAbbrevDeclSequential(const DWARFAbbreviationDeclaration& abbrevDecl);
 
@@ -65,7 +65,7 @@ public:
     DWARFDebugAbbrev();
     const DWARFAbbreviationDeclarationSet*  GetAbbreviationDeclarationSet(dw_offset_t cu_abbr_offset) const;
     void Dump(lldb_private::Stream *s) const;
-    void Parse(const lldb_private::DataExtractor& data);
+    void Parse(const lldb_private::DWARFDataExtractor& data);
 protected:
     DWARFAbbreviationDeclarationCollMap m_abbrevCollMap;
     mutable DWARFAbbreviationDeclarationCollMapConstIter m_prev_abbr_offset_pos;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp
index b1eb27299ef..d083f8a615c 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.cpp
@@ -162,7 +162,7 @@ DWARFDebugArangeSet::AddDescriptor(const DWARFDebugArangeSet::Descriptor& range)
 }
 
 bool
-DWARFDebugArangeSet::Extract(const DataExtractor &data, lldb::offset_t *offset_ptr)
+DWARFDebugArangeSet::Extract(const DWARFDataExtractor &data, lldb::offset_t *offset_ptr)
 {
     if (data.ValidOffset(*offset_ptr))
     {
@@ -183,9 +183,9 @@ DWARFDebugArangeSet::Extract(const DataExtractor &data, lldb::offset_t *offset_p
         // descriptor on the target system. This header is followed by a series
         // of tuples. Each tuple consists of an address and a length, each in
         // the size appropriate for an address on the target architecture.
-        m_header.length     = data.GetU32(offset_ptr);
+        m_header.length     = data.GetDWARFInitialLength(offset_ptr);
         m_header.version    = data.GetU16(offset_ptr);
-        m_header.cu_offset  = data.GetU32(offset_ptr);
+        m_header.cu_offset  = data.GetDWARFOffset(offset_ptr);
         m_header.addr_size  = data.GetU8(offset_ptr);
         m_header.seg_size   = data.GetU8(offset_ptr);
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.h
index 19ec8d042e7..fde36b7e0ad 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugArangeSet.h
@@ -41,7 +41,7 @@ public:
         void        SetHeader(uint16_t version, uint32_t cu_offset, uint8_t addr_size, uint8_t seg_size);
         void        AddDescriptor(const DWARFDebugArangeSet::Descriptor& range);
         void        Compact();
-        bool        Extract(const lldb_private::DataExtractor &data, lldb::offset_t *offset_ptr);
+        bool        Extract(const lldb_private::DWARFDataExtractor &data, lldb::offset_t *offset_ptr);
         void        Dump(lldb_private::Stream *s) const;
         dw_offset_t GetCompileUnitDIEOffset() const { return m_header.cu_offset; }
         dw_offset_t GetOffsetOfNextEntry() const;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
index 3b004c4b389..4f77bff86bd 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.cpp
@@ -56,7 +56,7 @@ public:
 // Extract
 //----------------------------------------------------------------------
 bool
-DWARFDebugAranges::Extract(const DataExtractor &debug_aranges_data)
+DWARFDebugAranges::Extract(const DWARFDataExtractor &debug_aranges_data)
 {
     if (debug_aranges_data.ValidOffset(0))
     {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.h
index 88db929226a..206aa3a60f4 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugAranges.h
@@ -35,7 +35,7 @@ public:
     }
 
     bool
-    Extract(const lldb_private::DataExtractor &debug_aranges_data);
+    Extract(const lldb_private::DWARFDataExtractor &debug_aranges_data);
 
     bool
     Generate(SymbolFileDWARF* dwarf2Data);
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
index 4c76eed8166..d4db12c17a4 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp
@@ -57,7 +57,7 @@ DWARFDebugInfo::GetCompileUnitAranges ()
         Log *log (LogChannelDWARF::GetLogIfAll(DWARF_LOG_DEBUG_ARANGES));
 
         m_cu_aranges_ap.reset (new DWARFDebugAranges());
-        const DataExtractor &debug_aranges_data = m_dwarf2Data->get_debug_aranges_data();
+        const DWARFDataExtractor &debug_aranges_data = m_dwarf2Data->get_debug_aranges_data();
         if (debug_aranges_data.GetByteSize() > 0)
         {
             if (log)
@@ -66,18 +66,35 @@ DWARFDebugInfo::GetCompileUnitAranges ()
             m_cu_aranges_ap->Extract (debug_aranges_data);
             
         }
-        else
+
+        // Make a list of all CUs represented by the arange data in the file.
+        std::set<dw_offset_t> cus_with_data;
+        for (size_t n=0;n<m_cu_aranges_ap.get()->GetNumRanges();n++)
         {
-            if (log)
-                log->Printf ("DWARFDebugInfo::GetCompileUnitAranges() for \"%s\" by parsing", 
-                             m_dwarf2Data->GetObjectFile()->GetFileSpec().GetPath().c_str());
-            const size_t num_compile_units = GetNumCompileUnits();
-            const bool clear_dies_if_already_not_parsed = true;
-            for (size_t idx = 0; idx < num_compile_units; ++idx)
+            dw_offset_t offset = m_cu_aranges_ap.get()->OffsetAtIndex(n);
+            if (offset != DW_INVALID_OFFSET)
+                cus_with_data.insert (offset);
+        }
+
+        // Manually build arange data for everything that wasn't in the .debug_aranges table.
+        bool printed = false;
+        const size_t num_compile_units = GetNumCompileUnits();
+        const bool clear_dies_if_already_not_parsed = true;
+        for (size_t idx = 0; idx < num_compile_units; ++idx)
+        {
+            DWARFCompileUnit* cu = GetCompileUnitAtIndex(idx);
+
+            dw_offset_t offset = cu->GetOffset();
+            if (cus_with_data.find(offset) == cus_with_data.end())
             {
-                DWARFCompileUnit* cu = GetCompileUnitAtIndex(idx);
-                if (cu)
-                    cu->BuildAddressRangeTable (m_dwarf2Data, m_cu_aranges_ap.get(), clear_dies_if_already_not_parsed);
+                if (log)
+                {
+                    if (!printed)
+                        log->Printf ("DWARFDebugInfo::GetCompileUnitAranges() for \"%s\" by parsing",
+                                     m_dwarf2Data->GetObjectFile()->GetFileSpec().GetPath().c_str());
+                    printed = true;
+                }
+                cu->BuildAddressRangeTable (m_dwarf2Data, m_cu_aranges_ap.get(), clear_dies_if_already_not_parsed);
             }
         }
 
@@ -146,7 +163,7 @@ DWARFDebugInfo::ParseCompileUnitHeadersIfNeeded()
         if (m_dwarf2Data != NULL)
         {
             lldb::offset_t offset = 0;
-            const DataExtractor &debug_info_data = m_dwarf2Data->get_debug_info_data();
+            const DWARFDataExtractor &debug_info_data = m_dwarf2Data->get_debug_info_data();
             while (debug_info_data.ValidOffset(offset))
             {
                 DWARFCompileUnitSP cu_sp(new DWARFCompileUnit(m_dwarf2Data));
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
index 03c12e366f9..37741eb1da9 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp
@@ -116,7 +116,7 @@ DWARFDebugInfoEntry::Attributes::FormValueAsUnsignedAtIndex(SymbolFileDWARF* dwa
 bool
 DWARFDebugInfoEntry::FastExtract
 (
-    const DataExtractor& debug_info_data,
+    const DWARFDataExtractor& debug_info_data,
     const DWARFCompileUnit* cu,
     const uint8_t *fixed_form_sizes,
     lldb::offset_t *offset_ptr
@@ -151,8 +151,8 @@ DWARFDebugInfoEntry::FastExtract
         m_has_children = abbrevDecl->HasChildren();
         // Skip all data in the .debug_info for the attributes
         const uint32_t numAttributes = abbrevDecl->NumAttributes();
-        register uint32_t i;
-        register dw_form_t form;
+        uint32_t i;
+        dw_form_t form;
         for (i=0; i<numAttributes; ++i)
         {
             form = abbrevDecl->GetFormByIndexUnchecked(i);
@@ -166,7 +166,7 @@ DWARFDebugInfoEntry::FastExtract
                 do
                 {
                     form_is_indirect = false;
-                    register uint32_t form_size = 0;
+                    uint32_t form_size = 0;
                     switch (form)
                     {
                     // Blocks if inlined data that have a length field and the data bytes
@@ -281,8 +281,8 @@ DWARFDebugInfoEntry::Extract
     lldb::offset_t *offset_ptr
 )
 {
-    const DataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
-//    const DataExtractor& debug_str_data = dwarf2Data->get_debug_str_data();
+    const DWARFDataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
+//    const DWARFDataExtractor& debug_str_data = dwarf2Data->get_debug_str_data();
     const uint32_t cu_end_offset = cu->GetNextCompileUnitOffset();
     const uint8_t cu_addr_size = cu->GetAddressByteSize();
     lldb::offset_t offset = *offset_ptr;
@@ -332,7 +332,7 @@ DWARFDebugInfoEntry::Extract
                         do
                         {
                             form_is_indirect = false;
-                            register uint32_t form_size = 0;
+                            uint32_t form_size = 0;
                             switch (form)
                             {
                             // Blocks if inlined data that have a length field and the data bytes
@@ -591,7 +591,7 @@ DWARFDebugInfoEntry::DumpAncestry
 //        // The number of attributes are the same...
 //        if (a_attr_count > 0)
 //        {
-//            const DataExtractor* debug_str_data_ptr = &dwarf2Data->get_debug_str_data();
+//            const DWARFDataExtractor* debug_str_data_ptr = &dwarf2Data->get_debug_str_data();
 //
 //            uint32_t i;
 //            for (i=0; i<a_attr_count; ++i)
@@ -763,9 +763,11 @@ DWARFDebugInfoEntry::GetDIENamesAndRanges
     lldb::offset_t offset;
     const DWARFAbbreviationDeclaration* abbrevDecl = GetAbbreviationDeclarationPtr(dwarf2Data, cu, offset);
 
+    lldb::ModuleSP module = dwarf2Data->GetObjectFile()->GetModule();
+
     if (abbrevDecl)
     {
-        const DataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
+        const DWARFDataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
 
         if (!debug_info_data.ValidOffset(offset))
             return false;
@@ -874,17 +876,17 @@ DWARFDebugInfoEntry::GetDIENamesAndRanges
                         {
                             uint32_t block_offset = form_value.BlockData() - debug_info_data.GetDataStart();
                             uint32_t block_length = form_value.Unsigned();
-                            frame_base->SetOpcodeData(debug_info_data, block_offset, block_length);
+                            frame_base->SetOpcodeData(module, debug_info_data, block_offset, block_length);
                         }
                         else
                         {
-                            const DataExtractor &debug_loc_data = dwarf2Data->get_debug_loc_data();
+                            const DWARFDataExtractor &debug_loc_data = dwarf2Data->get_debug_loc_data();
                             const dw_offset_t debug_loc_offset = form_value.Unsigned();
 
                             size_t loc_list_length = DWARFLocationList::Size(debug_loc_data, debug_loc_offset);
                             if (loc_list_length > 0)
                             {
-                                frame_base->SetOpcodeData(debug_loc_data, debug_loc_offset, loc_list_length);
+                                frame_base->SetOpcodeData(module, debug_loc_data, debug_loc_offset, loc_list_length);
                                 if (lo_pc != LLDB_INVALID_ADDRESS)
                                 {
                                     assert (lo_pc >= cu->GetBaseAddress());
@@ -959,7 +961,7 @@ DWARFDebugInfoEntry::Dump
     uint32_t recurse_depth
 ) const
 {
-    const DataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
+    const DWARFDataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
     lldb::offset_t offset = m_offset;
 
     if (debug_info_data.ValidOffset(offset))
@@ -1053,7 +1055,7 @@ DWARFDebugInfoEntry::DumpAttribute
 (
     SymbolFileDWARF* dwarf2Data,
     const DWARFCompileUnit* cu,
-    const DataExtractor& debug_info_data,
+    const DWARFDataExtractor& debug_info_data,
     lldb::offset_t *offset_ptr,
     Stream &s,
     dw_attr_t attr,
@@ -1063,7 +1065,7 @@ DWARFDebugInfoEntry::DumpAttribute
     bool verbose    = s.GetVerbose();
     bool show_form  = s.GetFlags().Test(DWARFDebugInfo::eDumpFlag_ShowForm);
     
-    const DataExtractor* debug_str_data = dwarf2Data ? &dwarf2Data->get_debug_str_data() : NULL;
+    const DWARFDataExtractor* debug_str_data = dwarf2Data ? &dwarf2Data->get_debug_str_data() : NULL;
     if (verbose)
         s.Offset (*offset_ptr);
     else
@@ -1131,7 +1133,7 @@ DWARFDebugInfoEntry::DumpAttribute
                     form_value.Dump(s, debug_str_data, cu);
 
                 // Location description is inlined in data in the form value
-                DataExtractor locationData(debug_info_data, (*offset_ptr) - form_value.Unsigned(), form_value.Unsigned());
+                DWARFDataExtractor locationData(debug_info_data, (*offset_ptr) - form_value.Unsigned(), form_value.Unsigned());
                 if ( verbose ) s.PutCString(" ( ");
                 print_dwarf_expression (s, locationData, DWARFCompileUnit::GetAddressByteSize(cu), 4, false);
                 if ( verbose ) s.PutCString(" )");
@@ -1221,7 +1223,7 @@ DWARFDebugInfoEntry::GetAttributes
 
     if (abbrevDecl)
     {
-        const DataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
+        const DWARFDataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
 
         if (fixed_form_sizes == NULL)
             fixed_form_sizes = DWARFFormValue::GetFixedFormSizesForAddressSize(cu->GetAddressByteSize());
@@ -1322,7 +1324,7 @@ DWARFDebugInfoEntry::GetAttributeValue
 
         if (attr_idx != DW_INVALID_INDEX)
         {
-            const DataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
+            const DWARFDataExtractor& debug_info_data = dwarf2Data->get_debug_info_data();
 
             uint32_t idx=0;
             while (idx<attr_idx)
@@ -1495,7 +1497,7 @@ DWARFDebugInfoEntry::GetAttributeValueAsLocation
     SymbolFileDWARF* dwarf2Data,
     const DWARFCompileUnit* cu,
     const dw_attr_t attr,
-    DataExtractor& location_data,
+    DWARFDataExtractor& location_data,
     uint32_t &block_size
 ) const
 {
@@ -1512,7 +1514,7 @@ DWARFDebugInfoEntry::GetAttributeValueAsLocation
         if (blockData)
         {
             // We have an inlined location list in the .debug_info section
-            const DataExtractor& debug_info = dwarf2Data->get_debug_info_data();
+            const DWARFDataExtractor& debug_info = dwarf2Data->get_debug_info_data();
             dw_offset_t block_offset = blockData - debug_info.GetDataStart();
             block_size = (end_addr_offset - attr_offset) - form_value.Unsigned();
             location_data.SetData(debug_info, block_offset, block_size);
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h
index 85f4109ae01..f7405755528 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.h
@@ -142,7 +142,7 @@ public:
                     DWARFDebugAranges* debug_aranges) const;
 
     bool        FastExtract(
-                    const lldb_private::DataExtractor& debug_info_data,
+                    const lldb_private::DWARFDataExtractor& debug_info_data,
                     const DWARFCompileUnit* cu,
                     const uint8_t *fixed_form_sizes,
                     lldb::offset_t* offset_ptr);
@@ -214,7 +214,7 @@ public:
                     SymbolFileDWARF* dwarf2Data,
                     const DWARFCompileUnit* cu,
                     const dw_attr_t attr,
-                    lldb_private::DataExtractor& data,
+                    lldb_private::DWARFDataExtractor& data,
                     uint32_t &block_size) const;
 
     const char* GetName(
@@ -289,7 +289,7 @@ public:
     static void DumpAttribute(
                     SymbolFileDWARF* dwarf2Data,
                     const DWARFCompileUnit* cu,
-                    const lldb_private::DataExtractor& debug_info_data,
+                    const lldb_private::DWARFDataExtractor& debug_info_data,
                     lldb::offset_t *offset_ptr,
                     lldb_private::Stream &s,
                     dw_attr_t attr,
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
index 6c9336a0842..0a2f1f74940 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.cpp
@@ -32,7 +32,7 @@ using namespace std;
 // representation.
 //----------------------------------------------------------------------
 void
-DWARFDebugLine::Parse(const DataExtractor& debug_line_data)
+DWARFDebugLine::Parse(const DWARFDataExtractor& debug_line_data)
 {
     m_lineTableMap.clear();
     lldb::offset_t offset = 0;
@@ -59,7 +59,7 @@ DWARFDebugLine::Parse(const DataExtractor& debug_line_data)
 }
 
 void
-DWARFDebugLine::ParseIfNeeded(const DataExtractor& debug_line_data)
+DWARFDebugLine::ParseIfNeeded(const DWARFDataExtractor& debug_line_data)
 {
     if (m_lineTableMap.empty())
         Parse(debug_line_data);
@@ -110,7 +110,7 @@ DumpStateToFile (dw_offset_t offset, const DWARFDebugLine::State& state, void* u
 bool
 DWARFDebugLine::DumpLineTableRows(Log *log, SymbolFileDWARF* dwarf2Data, dw_offset_t debug_line_offset)
 {
-    const DataExtractor& debug_line_data = dwarf2Data->get_debug_line_data();
+    const DWARFDataExtractor& debug_line_data = dwarf2Data->get_debug_line_data();
 
     if (debug_line_offset == DW_INVALID_OFFSET)
     {
@@ -131,7 +131,7 @@ DWARFDebugLine::DumpLineTableRows(Log *log, SymbolFileDWARF* dwarf2Data, dw_offs
 // DWARFDebugLine::DumpStatementTable
 //----------------------------------------------------------------------
 dw_offset_t
-DWARFDebugLine::DumpStatementTable(Log *log, const DataExtractor& debug_line_data, const dw_offset_t debug_line_offset)
+DWARFDebugLine::DumpStatementTable(Log *log, const DWARFDataExtractor& debug_line_data, const dw_offset_t debug_line_offset)
 {
     if (debug_line_data.ValidOffset(debug_line_offset))
     {
@@ -156,7 +156,7 @@ DWARFDebugLine::DumpStatementTable(Log *log, const DataExtractor& debug_line_dat
 bool
 DWARFDebugLine::DumpOpcodes(Log *log, SymbolFileDWARF* dwarf2Data, dw_offset_t debug_line_offset, uint32_t dump_flags)
 {
-    const DataExtractor& debug_line_data = dwarf2Data->get_debug_line_data();
+    const DWARFDataExtractor& debug_line_data = dwarf2Data->get_debug_line_data();
 
     if (debug_line_data.GetByteSize() == 0)
     {
@@ -183,7 +183,7 @@ DWARFDebugLine::DumpOpcodes(Log *log, SymbolFileDWARF* dwarf2Data, dw_offset_t d
 // DumpStatementOpcodes
 //----------------------------------------------------------------------
 dw_offset_t
-DWARFDebugLine::DumpStatementOpcodes(Log *log, const DataExtractor& debug_line_data, const dw_offset_t debug_line_offset, uint32_t flags)
+DWARFDebugLine::DumpStatementOpcodes(Log *log, const DWARFDataExtractor& debug_line_data, const dw_offset_t debug_line_offset, uint32_t flags)
 {
     lldb::offset_t offset = debug_line_offset;
     if (debug_line_data.ValidOffset(offset))
@@ -386,7 +386,7 @@ DWARFDebugLine::DumpStatementOpcodes(Log *log, const DataExtractor& debug_line_d
 // the line table.
 //----------------------------------------------------------------------
 void
-DWARFDebugLine::Parse(const DataExtractor& debug_line_data, DWARFDebugLine::State::Callback callback, void* userData)
+DWARFDebugLine::Parse(const DWARFDataExtractor& debug_line_data, DWARFDebugLine::State::Callback callback, void* userData)
 {
     lldb::offset_t offset = 0;
     if (debug_line_data.ValidOffset(offset))
@@ -401,7 +401,7 @@ DWARFDebugLine::Parse(const DataExtractor& debug_line_data, DWARFDebugLine::Stat
 // DWARFDebugLine::ParsePrologue
 //----------------------------------------------------------------------
 bool
-DWARFDebugLine::ParsePrologue(const DataExtractor& debug_line_data, lldb::offset_t* offset_ptr, Prologue* prologue)
+DWARFDebugLine::ParsePrologue(const DWARFDataExtractor& debug_line_data, lldb::offset_t* offset_ptr, Prologue* prologue)
 {
     const lldb::offset_t prologue_offset = *offset_ptr;
 
@@ -410,12 +410,12 @@ DWARFDebugLine::ParsePrologue(const DataExtractor& debug_line_data, lldb::offset
     prologue->Clear();
     uint32_t i;
     const char * s;
-    prologue->total_length      = debug_line_data.GetU32(offset_ptr);
+    prologue->total_length      = debug_line_data.GetDWARFInitialLength(offset_ptr);
     prologue->version           = debug_line_data.GetU16(offset_ptr);
     if (prologue->version != 2)
       return false;
 
-    prologue->prologue_length   = debug_line_data.GetU32(offset_ptr);
+    prologue->prologue_length   = debug_line_data.GetDWARFOffset(offset_ptr);
     const lldb::offset_t end_prologue_offset = prologue->prologue_length + *offset_ptr;
     prologue->min_inst_length   = debug_line_data.GetU8(offset_ptr);
     prologue->default_is_stmt   = debug_line_data.GetU8(offset_ptr);
@@ -456,10 +456,11 @@ DWARFDebugLine::ParsePrologue(const DataExtractor& debug_line_data, lldb::offset
             break;
     }
 
+    // XXX GNU as is broken for 64-Bit DWARF
     if (*offset_ptr != end_prologue_offset)
     {
         Host::SystemLog (Host::eSystemLogWarning, 
-                         "warning: parsing line table prologue at 0x%8.8" PRIx64 " should have ended at 0x%8.8" PRIx64 " but it ended ad 0x%8.8" PRIx64 "\n",
+                         "warning: parsing line table prologue at 0x%8.8" PRIx64 " should have ended at 0x%8.8" PRIx64 " but it ended at 0x%8.8" PRIx64 "\n",
                          prologue_offset,
                          end_prologue_offset, 
                          *offset_ptr);
@@ -469,18 +470,20 @@ DWARFDebugLine::ParsePrologue(const DataExtractor& debug_line_data, lldb::offset
 
 bool
 DWARFDebugLine::ParseSupportFiles (const lldb::ModuleSP &module_sp,
-                                   const DataExtractor& debug_line_data,
+                                   const DWARFDataExtractor& debug_line_data,
                                    const char *cu_comp_dir,
                                    dw_offset_t stmt_list,
                                    FileSpecList &support_files)
 {
-    lldb::offset_t offset = stmt_list + 4;    // Skip the total length
+    lldb::offset_t offset = stmt_list;
+    // Skip the total length
+    (void)debug_line_data.GetDWARFInitialLength(&offset);
     const char * s;
     uint32_t version = debug_line_data.GetU16(&offset);
     if (version != 2)
       return false;
 
-    const dw_offset_t end_prologue_offset = debug_line_data.GetU32(&offset) + offset;
+    const dw_offset_t end_prologue_offset = debug_line_data.GetDWARFOffset(&offset) + offset;
     // Skip instruction length, default is stmt, line base, line range and
     // opcode base, and all opcode lengths
     offset += 4;
@@ -554,7 +557,7 @@ DWARFDebugLine::ParseSupportFiles (const lldb::ModuleSP &module_sp,
     if (offset != end_prologue_offset)
     {
         Host::SystemLog (Host::eSystemLogError, 
-                         "warning: parsing line table prologue at 0x%8.8x should have ended at 0x%8.8x but it ended ad 0x%8.8" PRIx64 "\n",
+                         "warning: parsing line table prologue at 0x%8.8x should have ended at 0x%8.8x but it ended at 0x%8.8" PRIx64 "\n",
                          stmt_list, 
                          end_prologue_offset, 
                          offset);
@@ -572,7 +575,7 @@ DWARFDebugLine::ParseSupportFiles (const lldb::ModuleSP &module_sp,
 bool
 DWARFDebugLine::ParseStatementTable
 (
-    const DataExtractor& debug_line_data,
+    const DWARFDataExtractor& debug_line_data,
     lldb::offset_t* offset_ptr,
     DWARFDebugLine::State::Callback callback,
     void* userData
@@ -600,7 +603,7 @@ DWARFDebugLine::ParseStatementTable
     if (log)
         prologue->Dump (log);
 
-    const dw_offset_t end_offset = debug_line_offset + prologue->total_length + sizeof(prologue->total_length);
+    const dw_offset_t end_offset = debug_line_offset + prologue->total_length + (debug_line_data.GetDWARFSizeofInitialLength());
 
     State state(prologue, log, callback, userData);
 
@@ -873,7 +876,7 @@ ParseStatementTableCallback(dw_offset_t offset, const DWARFDebugLine::State& sta
 // the prologue and all rows.
 //----------------------------------------------------------------------
 bool
-DWARFDebugLine::ParseStatementTable(const DataExtractor& debug_line_data, lldb::offset_t *offset_ptr, LineTable* line_table)
+DWARFDebugLine::ParseStatementTable(const DWARFDataExtractor& debug_line_data, lldb::offset_t *offset_ptr, LineTable* line_table)
 {
     return ParseStatementTable(debug_line_data, offset_ptr, ParseStatementTableCallback, line_table);
 }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h
index cfa8654ed9b..0caaf596add 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugLine.h
@@ -16,6 +16,7 @@
 
 #include "lldb/lldb-private.h"
 
+#include "DWARFDataExtractor.h"
 #include "DWARFDefines.h"
 
 class SymbolFileDWARF;
@@ -82,10 +83,6 @@ public:
         std::vector<std::string>        include_directories;
         std::vector<FileNameEntry>      file_names;
 
-        // Length of the prologue in bytes
-        uint32_t Length() const { return prologue_length + sizeof(total_length) + sizeof(version) + sizeof(prologue_length); }
-        // Length of the line table data in bytes (not including the prologue)
-        uint32_t StatementTableLength() const { return total_length + sizeof(total_length) - Length(); }
         int32_t MaxLineIncrementForSpecialOpcode() const { return line_base + (int8_t)line_range - 1; }
         bool IsValid() const;
 //      void Append(BinaryStreamBuf& buff) const;
@@ -196,13 +193,13 @@ public:
 
     static bool DumpOpcodes(lldb_private::Log *log, SymbolFileDWARF* dwarf2Data, dw_offset_t line_offset = DW_INVALID_OFFSET, uint32_t dump_flags = 0);   // If line_offset is invalid, dump everything
     static bool DumpLineTableRows(lldb_private::Log *log, SymbolFileDWARF* dwarf2Data, dw_offset_t line_offset = DW_INVALID_OFFSET);  // If line_offset is invalid, dump everything
-    static bool ParseSupportFiles(const lldb::ModuleSP &module_sp, const lldb_private::DataExtractor& debug_line_data, const char *cu_comp_dir, dw_offset_t stmt_list, lldb_private::FileSpecList &support_files);
-    static bool ParsePrologue(const lldb_private::DataExtractor& debug_line_data, lldb::offset_t* offset_ptr, Prologue* prologue);
-    static bool ParseStatementTable(const lldb_private::DataExtractor& debug_line_data, lldb::offset_t* offset_ptr, State::Callback callback, void* userData);
-    static dw_offset_t DumpStatementTable(lldb_private::Log *log, const lldb_private::DataExtractor& debug_line_data, const dw_offset_t line_offset);
-    static dw_offset_t DumpStatementOpcodes(lldb_private::Log *log, const lldb_private::DataExtractor& debug_line_data, const dw_offset_t line_offset, uint32_t flags);
-    static bool ParseStatementTable(const lldb_private::DataExtractor& debug_line_data, lldb::offset_t *offset_ptr, LineTable* line_table);
-    static void Parse(const lldb_private::DataExtractor& debug_line_data, DWARFDebugLine::State::Callback callback, void* userData);
+    static bool ParseSupportFiles(const lldb::ModuleSP &module_sp, const lldb_private::DWARFDataExtractor& debug_line_data, const char *cu_comp_dir, dw_offset_t stmt_list, lldb_private::FileSpecList &support_files);
+    static bool ParsePrologue(const lldb_private::DWARFDataExtractor& debug_line_data, lldb::offset_t* offset_ptr, Prologue* prologue);
+    static bool ParseStatementTable(const lldb_private::DWARFDataExtractor& debug_line_data, lldb::offset_t* offset_ptr, State::Callback callback, void* userData);
+    static dw_offset_t DumpStatementTable(lldb_private::Log *log, const lldb_private::DWARFDataExtractor& debug_line_data, const dw_offset_t line_offset);
+    static dw_offset_t DumpStatementOpcodes(lldb_private::Log *log, const lldb_private::DWARFDataExtractor& debug_line_data, const dw_offset_t line_offset, uint32_t flags);
+    static bool ParseStatementTable(const lldb_private::DWARFDataExtractor& debug_line_data, lldb::offset_t *offset_ptr, LineTable* line_table);
+    static void Parse(const lldb_private::DWARFDataExtractor& debug_line_data, DWARFDebugLine::State::Callback callback, void* userData);
 //  static void AppendLineTableData(const DWARFDebugLine::Prologue* prologue, const DWARFDebugLine::Row::collection& state_coll, const uint32_t addr_size, BinaryStreamBuf &debug_line_data);
 
     DWARFDebugLine() :
@@ -210,8 +207,8 @@ public:
     {
     }
 
-    void Parse(const lldb_private::DataExtractor& debug_line_data);
-    void ParseIfNeeded(const lldb_private::DataExtractor& debug_line_data);
+    void Parse(const lldb_private::DWARFDataExtractor& debug_line_data);
+    void ParseIfNeeded(const lldb_private::DWARFDataExtractor& debug_line_data);
     LineTable::shared_ptr GetLineTable(const dw_offset_t offset) const;
 
 protected:
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.cpp
index 60ace9e8229..0e2aaa47e8c 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.cpp
@@ -26,7 +26,7 @@ DWARFDebugMacinfo::~DWARFDebugMacinfo()
 }
 
 void
-DWARFDebugMacinfo::Dump(Stream *s, const DataExtractor& macinfo_data, lldb::offset_t offset)
+DWARFDebugMacinfo::Dump(Stream *s, const DWARFDataExtractor& macinfo_data, lldb::offset_t offset)
 {
     DWARFDebugMacinfoEntry maninfo_entry;
     if (macinfo_data.GetByteSize() == 0)
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.h
index 5f3b437d964..077718cf7db 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfo.h
@@ -21,7 +21,7 @@ public:
 
     static void
     Dump (lldb_private::Stream *s,
-          const lldb_private::DataExtractor& macinfo_data,
+          const lldb_private::DWARFDataExtractor& macinfo_data,
           lldb::offset_t offset = LLDB_INVALID_OFFSET);
 };
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp
index 5cd9cb6be47..4a176bb8aad 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.cpp
@@ -80,7 +80,7 @@ DWARFDebugMacinfoEntry::Dump(Stream *s) const
 
 
 bool
-DWARFDebugMacinfoEntry::Extract(const DataExtractor& mac_info_data, lldb::offset_t* offset_ptr)
+DWARFDebugMacinfoEntry::Extract(const DWARFDataExtractor& mac_info_data, lldb::offset_t* offset_ptr)
 {
     if (mac_info_data.ValidOffset(*offset_ptr))
     {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.h
index 46fd44a22a6..72318d86e1c 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugMacinfoEntry.h
@@ -38,7 +38,7 @@ public:
     GetCString() const;
 
     bool
-    Extract(const lldb_private::DataExtractor& mac_info_data,
+    Extract(const lldb_private::DWARFDataExtractor& mac_info_data,
             lldb::offset_t* offset_ptr);
 
 protected:
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp
index 3e511007a1e..06ac825e0d4 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.cpp
@@ -29,7 +29,7 @@ DWARFDebugPubnames::DWARFDebugPubnames() :
 }
 
 bool
-DWARFDebugPubnames::Extract(const DataExtractor& data)
+DWARFDebugPubnames::Extract(const DWARFDataExtractor& data)
 {
     Timer scoped_timer (__PRETTY_FUNCTION__,
                         "DWARFDebugPubnames::Extract (byte_size = %" PRIu64 ")",
@@ -77,7 +77,7 @@ DWARFDebugPubnames::GeneratePubnames(SymbolFileDWARF* dwarf2Data)
     if (debug_info)
     {
 
-        const DataExtractor* debug_str = &dwarf2Data->get_debug_str_data();
+        const DWARFDataExtractor* debug_str = &dwarf2Data->get_debug_str_data();
 
         uint32_t cu_idx = 0;
         const uint32_t num_compile_units = dwarf2Data->GetNumCompileUnits();
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.h
index 09eb80ab300..cacb1ea109b 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnames.h
@@ -20,7 +20,7 @@ class DWARFDebugPubnames
 {
 public:
             DWARFDebugPubnames();
-    bool    Extract(const lldb_private::DataExtractor& data);
+    bool    Extract(const lldb_private::DWARFDataExtractor& data);
     bool    GeneratePubnames(SymbolFileDWARF* dwarf2Data);
     bool    GeneratePubBaseTypes(SymbolFileDWARF* dwarf2Data);
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.cpp
index 2df8d525f03..b7e1b27d150 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.cpp
@@ -78,21 +78,21 @@ DWARFDebugPubnamesSet::InitNameIndexes() const
 
 
 bool
-DWARFDebugPubnamesSet::Extract(const DataExtractor& data, lldb::offset_t *offset_ptr)
+DWARFDebugPubnamesSet::Extract(const DWARFDataExtractor& data, lldb::offset_t *offset_ptr)
 {
     if (data.ValidOffset(*offset_ptr))
     {
         m_descriptors.clear();
         m_offset = *offset_ptr;
-        m_header.length     = data.GetU32(offset_ptr);
+        m_header.length     = data.GetDWARFInitialLength(offset_ptr);
         m_header.version    = data.GetU16(offset_ptr);
-        m_header.die_offset = data.GetU32(offset_ptr);
-        m_header.die_length = data.GetU32(offset_ptr);
+        m_header.die_offset = data.GetDWARFOffset(offset_ptr);
+        m_header.die_length = data.GetDWARFOffset(offset_ptr);
 
         Descriptor pubnameDesc;
         while (data.ValidOffset(*offset_ptr))
         {
-            pubnameDesc.offset  = data.GetU32(offset_ptr);
+            pubnameDesc.offset  = data.GetDWARFOffset(offset_ptr);
 
             if (pubnameDesc.offset)
             {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h
index 941c83e58a4..075807b2dcc 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugPubnamesSet.h
@@ -13,7 +13,7 @@
 #include "SymbolFileDWARF.h"
 #include <string>
 #include <vector>
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L || defined(_MSC_VER)
 #include <unordered_map>
 #else
 #include <ext/hash_map>
@@ -70,7 +70,7 @@ public:
     uint32_t    NumDescriptors() const { return m_descriptors.size(); }
     void        AddDescriptor(dw_offset_t cu_rel_offset, const char* name);
     void        Clear();
-    bool        Extract(const lldb_private::DataExtractor& debug_pubnames_data, lldb::offset_t *offset_ptr);
+    bool        Extract(const lldb_private::DWARFDataExtractor& debug_pubnames_data, lldb::offset_t *offset_ptr);
     void        Dump(lldb_private::Log *s) const;
     void        InitNameIndexes() const;
     void        Find(const char* name, bool ignore_case, std::vector<dw_offset_t>& die_offset_coll) const;
@@ -87,7 +87,7 @@ protected:
 
     dw_offset_t     m_offset;
     Header          m_header;
-#if __cplusplus >= 201103L
+#if __cplusplus >= 201103L || defined(_MSC_VER)
     typedef std::unordered_multimap<const char*, uint32_t, std::hash<const char*>, CStringEqualBinaryPredicate> cstr_to_index_mmap;
 #else
     typedef __gnu_cxx::hash_multimap<const char*, uint32_t, __gnu_cxx::hash<const char*>, CStringEqualBinaryPredicate> cstr_to_index_mmap;
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
index 461b17fc3ab..daa3b0aa666 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp
@@ -32,6 +32,7 @@ DWARFDebugRanges::Extract(SymbolFileDWARF* dwarf2Data)
     dw_offset_t debug_ranges_offset = offset;
     while (Extract(dwarf2Data, &offset, range_list))
     {
+        range_list.Sort();
         m_range_map[debug_ranges_offset] = range_list;
         debug_ranges_offset = offset;
     }
@@ -87,7 +88,7 @@ DWARFDebugRanges::Extract(SymbolFileDWARF* dwarf2Data, lldb::offset_t *offset_pt
     range_list.Clear();
 
     lldb::offset_t range_offset = *offset_ptr;
-    const DataExtractor& debug_ranges_data = dwarf2Data->get_debug_ranges_data();
+    const DWARFDataExtractor& debug_ranges_data = dwarf2Data->get_debug_ranges_data();
     uint32_t addr_size = debug_ranges_data.GetAddressByteSize();
 
     while (debug_ranges_data.ValidOffsetForDataOfSize(*offset_ptr, 2 * addr_size))
@@ -132,7 +133,7 @@ DWARFDebugRanges::Extract(SymbolFileDWARF* dwarf2Data, lldb::offset_t *offset_pt
 
 
 void
-DWARFDebugRanges::Dump(Stream &s, const DataExtractor& debug_ranges_data, lldb::offset_t *offset_ptr, dw_addr_t cu_base_addr)
+DWARFDebugRanges::Dump(Stream &s, const DWARFDataExtractor& debug_ranges_data, lldb::offset_t *offset_ptr, dw_addr_t cu_base_addr)
 {
     uint32_t addr_size = s.GetAddressByteSize();
     bool verbose = s.GetVerbose();
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.h
index 40899abe9c2..50af91d4100 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.h
@@ -26,7 +26,7 @@ public:
     DWARFDebugRanges();
     ~DWARFDebugRanges();
     void Extract(SymbolFileDWARF* dwarf2Data);
-    static void Dump(lldb_private::Stream &s, const lldb_private::DataExtractor& debug_ranges_data, lldb::offset_t *offset_ptr, dw_addr_t cu_base_addr);
+    static void Dump(lldb_private::Stream &s, const lldb_private::DWARFDataExtractor& debug_ranges_data, lldb::offset_t *offset_ptr, dw_addr_t cu_base_addr);
     bool FindRanges(dw_offset_t debug_ranges_offset, DWARFDebugRanges::RangeList& range_list) const;
 
 protected:
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.h
index accd3446317..2be5d90c37b 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDeclContext.h
@@ -54,7 +54,7 @@ public:
         }
 
         // Test operator
-        operator bool() const
+        explicit operator bool() const
         {
             return tag != 0;
         }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
index e37aefb27a7..d47e6a350c9 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFDefines.h
@@ -11,7 +11,6 @@
 #define SymbolFileDWARF_DWARFDefines_h_
 
 #include <stdint.h>
-#include <stdbool.h>
 #include "lldb/Core/dwarf.h"
 
 namespace lldb_private {
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
index 6113a146c93..abd273770dd 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp
@@ -114,7 +114,7 @@ DWARFFormValue::DWARFFormValue(dw_form_t form) :
 }
 
 bool
-DWARFFormValue::ExtractValue(const DataExtractor& data, lldb::offset_t* offset_ptr, const DWARFCompileUnit* cu)
+DWARFFormValue::ExtractValue(const DWARFDataExtractor& data, lldb::offset_t* offset_ptr, const DWARFCompileUnit* cu)
 {
     bool indirect = false;
     bool is_block = false;
@@ -183,13 +183,13 @@ DWARFFormValue::ExtractValue(const DataExtractor& data, lldb::offset_t* offset_p
 }
 
 bool
-DWARFFormValue::SkipValue(const DataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu) const
+DWARFFormValue::SkipValue(const DWARFDataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu) const
 {
     return DWARFFormValue::SkipValue(m_form, debug_info_data, offset_ptr, cu);
 }
 
 bool
-DWARFFormValue::SkipValue(dw_form_t form, const DataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu)
+DWARFFormValue::SkipValue(dw_form_t form, const DWARFDataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu)
 {
     switch (form)
     {
@@ -278,7 +278,7 @@ DWARFFormValue::SkipValue(dw_form_t form, const DataExtractor& debug_info_data,
 
 
 void
-DWARFFormValue::Dump(Stream &s, const DataExtractor* debug_str_data, const DWARFCompileUnit* cu) const
+DWARFFormValue::Dump(Stream &s, const DWARFDataExtractor* debug_str_data, const DWARFCompileUnit* cu) const
 {
     uint64_t uvalue = Unsigned();
     bool cu_relative_offset = false;
@@ -378,7 +378,7 @@ DWARFFormValue::Dump(Stream &s, const DataExtractor* debug_str_data, const DWARF
 }
 
 const char*
-DWARFFormValue::AsCString(const DataExtractor* debug_str_data_ptr) const
+DWARFFormValue::AsCString(const DWARFDataExtractor* debug_str_data_ptr) const
 {
     if (IsInlinedCStr())
         return m_value.value.cstr;
@@ -496,7 +496,7 @@ DWARFFormValue::IsDataForm(const dw_form_t form)
 }
 
 int
-DWARFFormValue::Compare (const DWARFFormValue& a_value, const DWARFFormValue& b_value, const DWARFCompileUnit* a_cu, const DWARFCompileUnit* b_cu, const DataExtractor* debug_str_data_ptr)
+DWARFFormValue::Compare (const DWARFFormValue& a_value, const DWARFFormValue& b_value, const DWARFCompileUnit* a_cu, const DWARFCompileUnit* b_cu, const DWARFDataExtractor* debug_str_data_ptr)
 {
     dw_form_t a_form = a_value.Form();
     dw_form_t b_form = b_value.Form();
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
index 4c400b2df58..fce995e4ff2 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.h
@@ -11,6 +11,7 @@
 #define SymbolFileDWARF_DWARFFormValue_h_
 
 #include <stddef.h> // for NULL
+#include "DWARFDataExtractor.h"
 
 class DWARFCompileUnit;
 
@@ -48,8 +49,8 @@ public:
     dw_form_t           Form()  const { return m_form; }
     void                SetForm(dw_form_t form) { m_form = form; }
     const ValueType&    Value() const { return m_value; }
-    void                Dump(lldb_private::Stream &s, const lldb_private::DataExtractor* debug_str_data, const DWARFCompileUnit* cu) const;
-    bool                ExtractValue(const lldb_private::DataExtractor& data,
+    void                Dump(lldb_private::Stream &s, const lldb_private::DWARFDataExtractor* debug_str_data, const DWARFCompileUnit* cu) const;
+    bool                ExtractValue(const lldb_private::DWARFDataExtractor& data,
                                      lldb::offset_t* offset_ptr,
                                      const DWARFCompileUnit* cu);
     bool                IsInlinedCStr() const { return (m_value.data != NULL) && m_value.data == (uint8_t*)m_value.value.cstr; }
@@ -62,16 +63,16 @@ public:
     void                SetUnsigned(uint64_t uval) { m_value.value.uval = uval; }
     int64_t             Signed() const { return m_value.value.sval; }
     void                SetSigned(int64_t sval) { m_value.value.sval = sval; }
-    const char*         AsCString(const lldb_private::DataExtractor* debug_str_data_ptr) const;
-    bool                SkipValue(const lldb_private::DataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu) const;
-    static bool         SkipValue(const dw_form_t form, const lldb_private::DataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu);
-//  static bool         TransferValue(dw_form_t form, const lldb_private::DataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu, BinaryStreamBuf& out_buff);
+    const char*         AsCString(const lldb_private::DWARFDataExtractor* debug_str_data_ptr) const;
+    bool                SkipValue(const lldb_private::DWARFDataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu) const;
+    static bool         SkipValue(const dw_form_t form, const lldb_private::DWARFDataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu);
+//  static bool         TransferValue(dw_form_t form, const lldb_private::DWARFDataExtractor& debug_info_data, lldb::offset_t *offset_ptr, const DWARFCompileUnit* cu, BinaryStreamBuf& out_buff);
 //  static bool         TransferValue(const DWARFFormValue& formValue, const DWARFCompileUnit* cu, BinaryStreamBuf& out_buff);
 //  static bool         PutUnsigned(dw_form_t form, dw_offset_t offset, uint64_t value, BinaryStreamBuf& out_buff, const DWARFCompileUnit* cu, bool fixup_cu_relative_refs);
     static bool         IsBlockForm(const dw_form_t form);
     static bool         IsDataForm(const dw_form_t form);
     static const uint8_t * GetFixedFormSizesForAddressSize (uint8_t addr_size);
-    static int          Compare (const DWARFFormValue& a, const DWARFFormValue& b, const DWARFCompileUnit* a_cu, const DWARFCompileUnit* b_cu, const lldb_private::DataExtractor* debug_str_data_ptr);
+    static int          Compare (const DWARFFormValue& a, const DWARFFormValue& b, const DWARFCompileUnit* a_cu, const DWARFCompileUnit* b_cu, const lldb_private::DWARFDataExtractor* debug_str_data_ptr);
 protected:
     dw_form_t   m_form;     // Form for this value
     ValueType   m_value;    // Contains all data for the form
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.cpp
index fdc07836b88..d79ae79822b 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.cpp
@@ -15,11 +15,11 @@
 
 using namespace lldb_private;
 
-static int print_dwarf_exp_op (Stream &s, const DataExtractor& data, lldb::offset_t *offset_ptr, int address_size, int dwarf_ref_size);
+static int print_dwarf_exp_op (Stream &s, const DWARFDataExtractor& data, lldb::offset_t *offset_ptr, int address_size, int dwarf_ref_size);
 
 int
 print_dwarf_expression (Stream &s,
-                        const DataExtractor& data,
+                        const DWARFDataExtractor& data,
                         int address_size,
                         int dwarf_ref_size,
                         bool location_expression)
@@ -47,7 +47,7 @@ print_dwarf_expression (Stream &s,
 
 static int
 print_dwarf_exp_op (Stream &s,
-                    const DataExtractor& data,
+                    const DWARFDataExtractor& data,
                     lldb::offset_t *offset_ptr,
                     int address_size,
                     int dwarf_ref_size)
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.h
index ff7c907e921..69cc0c15969 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationDescription.h
@@ -14,7 +14,7 @@
 
 int
 print_dwarf_expression (lldb_private::Stream &s,
-                        const lldb_private::DataExtractor& data,
+                        const lldb_private::DWARFDataExtractor& data,
                         int address_size,
                         int dwarf_ref_size,
                         bool location_expression);
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationList.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationList.cpp
index dad5691267d..26768f060ef 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationList.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationList.cpp
@@ -18,7 +18,7 @@
 using namespace lldb_private;
 
 dw_offset_t
-DWARFLocationList::Dump(Stream &s, const DWARFCompileUnit* cu, const DataExtractor& debug_loc_data, lldb::offset_t offset)
+DWARFLocationList::Dump(Stream &s, const DWARFCompileUnit* cu, const DWARFDataExtractor& debug_loc_data, lldb::offset_t offset)
 {
     uint64_t start_addr, end_addr;
     uint32_t addr_size = DWARFCompileUnit::GetAddressByteSize(cu);
@@ -42,7 +42,7 @@ DWARFLocationList::Dump(Stream &s, const DWARFCompileUnit* cu, const DataExtract
                             ": ");
         uint32_t loc_length = debug_loc_data.GetU16(&offset);
 
-        DataExtractor locationData(debug_loc_data, offset, loc_length);
+        DWARFDataExtractor locationData(debug_loc_data, offset, loc_length);
     //  if ( dump_flags & DWARFDebugInfo::eDumpFlag_Verbose ) *ostrm_ptr << " ( ";
         print_dwarf_expression (s, locationData, addr_size, 4, false);
         offset += loc_length;
@@ -52,7 +52,7 @@ DWARFLocationList::Dump(Stream &s, const DWARFCompileUnit* cu, const DataExtract
 }
 
 bool
-DWARFLocationList::Extract(const DataExtractor& debug_loc_data, lldb::offset_t* offset_ptr, DataExtractor& location_list_data)
+DWARFLocationList::Extract(const DWARFDataExtractor& debug_loc_data, lldb::offset_t* offset_ptr, DWARFDataExtractor& location_list_data)
 {
     // Initialize with no data just in case we don't find anything
     location_list_data.Clear();
@@ -69,7 +69,7 @@ DWARFLocationList::Extract(const DataExtractor& debug_loc_data, lldb::offset_t*
 }
 
 size_t
-DWARFLocationList::Size(const DataExtractor& debug_loc_data, lldb::offset_t offset)
+DWARFLocationList::Size(const DWARFDataExtractor& debug_loc_data, lldb::offset_t offset)
 {
     const dw_offset_t debug_loc_offset = offset;
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationList.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationList.h
index 85e11d90b36..6dcc0d74e44 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationList.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/DWARFLocationList.h
@@ -18,16 +18,16 @@ public:
     static dw_offset_t
     Dump (lldb_private::Stream &s,
           const DWARFCompileUnit* cu,
-          const lldb_private::DataExtractor& debug_loc_data,
+          const lldb_private::DWARFDataExtractor& debug_loc_data,
           lldb::offset_t offset);
 
     static bool
-    Extract (const lldb_private::DataExtractor& debug_loc_data,
+    Extract (const lldb_private::DWARFDataExtractor& debug_loc_data,
              lldb::offset_t* offset_ptr,
-             lldb_private::DataExtractor& location_list_data);
+             lldb_private::DWARFDataExtractor& location_list_data);
 
     static size_t
-    Size (const lldb_private::DataExtractor& debug_loc_data,
+    Size (const lldb_private::DWARFDataExtractor& debug_loc_data,
           lldb::offset_t offset);
 
 };
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/HashedNameToDIE.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/HashedNameToDIE.h
index c31cbaf3ca2..44a24f2756a 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/HashedNameToDIE.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/HashedNameToDIE.h
@@ -432,7 +432,7 @@ struct DWARFMappedHash
         }
         
         bool
-        Read (const lldb_private::DataExtractor &data, 
+        Read (const lldb_private::DWARFDataExtractor &data, 
               lldb::offset_t *offset_ptr, 
               DIEInfo &hash_data) const
         {
@@ -585,8 +585,8 @@ struct DWARFMappedHash
     {
     public:
         
-        MemoryTable (lldb_private::DataExtractor &table_data, 
-                     const lldb_private::DataExtractor &string_table,
+        MemoryTable (lldb_private::DWARFDataExtractor &table_data, 
+                     const lldb_private::DWARFDataExtractor &string_table,
                      const char *name) :
             MappedHash::MemoryTable<uint32_t, Header, DIEInfoArray> (table_data),
             m_data (table_data),
@@ -923,8 +923,8 @@ struct DWARFMappedHash
         }
         
     protected:
-        const lldb_private::DataExtractor &m_data;
-        const lldb_private::DataExtractor &m_string_table;
+        const lldb_private::DWARFDataExtractor &m_data;
+        const lldb_private::DWARFDataExtractor &m_string_table;
         std::string m_name;
     };
 };
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp
index 27fa261813b..c9ffa9ec781 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/LogChannelDWARF.cpp
@@ -174,10 +174,11 @@ LogChannelDWARF::ListCategories (Stream *strm)
 {
     strm->Printf ("Logging categories for '%s':\n"
                   "  all - turn on all available logging categories\n"
-                  "  info - log the parsing if .debug_info\n"
-                  "  line - log the parsing if .debug_line\n"
-                  "  pubnames - log the parsing if .debug_pubnames\n"
-                  "  pubtypes - log the parsing if .debug_pubtypes\n"
+                  "  info - log the parsing of .debug_info\n"
+                  "  line - log the parsing of .debug_line\n"
+                  "  pubnames - log the parsing of .debug_pubnames\n"
+                  "  pubtypes - log the parsing of .debug_pubtypes\n"
+                  "  aranges - log the parsing of .debug_aranges\n"
                   "  lookups - log any lookups that happen by name, regex, or address\n"
                   "  completion - log struct/unions/class type completions\n"
                   "  map - log insertions of object files into DWARF debug maps\n",
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/NameToDIE.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/NameToDIE.cpp
index 5514469d075..e4626900d81 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/NameToDIE.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/NameToDIE.cpp
@@ -9,7 +9,6 @@
 
 #include "NameToDIE.h"
 #include "lldb/Core/ConstString.h"
-#include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/Stream.h"
 #include "lldb/Core/StreamString.h"
 #include "lldb/Core/RegularExpression.h"
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index f265af837ee..09b50531b8a 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -70,7 +70,7 @@
 
 #ifdef ENABLE_DEBUG_PRINTF
 #include <stdio.h>
-#define DEBUG_PRINTF(fmt, ...) printf(fmt, ## __VA_ARGS__)
+#define DEBUG_PRINTF(fmt, ...) printf(fmt, __VA_ARGS__)
 #else
 #define DEBUG_PRINTF(fmt, ...)
 #endif
@@ -699,8 +699,8 @@ SymbolFileDWARF::CalculateAbilities ()
     return abilities;
 }
 
-const DataExtractor&
-SymbolFileDWARF::GetCachedSectionData (uint32_t got_flag, SectionType sect_type, DataExtractor &data)
+const DWARFDataExtractor&
+SymbolFileDWARF::GetCachedSectionData (uint32_t got_flag, SectionType sect_type, DWARFDataExtractor &data)
 {
     if (m_flags.IsClear (got_flag))
     {
@@ -728,73 +728,73 @@ SymbolFileDWARF::GetCachedSectionData (uint32_t got_flag, SectionType sect_type,
     return data;
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_debug_abbrev_data()
 {
     return GetCachedSectionData (flagsGotDebugAbbrevData, eSectionTypeDWARFDebugAbbrev, m_data_debug_abbrev);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_debug_aranges_data()
 {
     return GetCachedSectionData (flagsGotDebugArangesData, eSectionTypeDWARFDebugAranges, m_data_debug_aranges);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_debug_frame_data()
 {
     return GetCachedSectionData (flagsGotDebugFrameData, eSectionTypeDWARFDebugFrame, m_data_debug_frame);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_debug_info_data()
 {
     return GetCachedSectionData (flagsGotDebugInfoData, eSectionTypeDWARFDebugInfo, m_data_debug_info);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_debug_line_data()
 {
     return GetCachedSectionData (flagsGotDebugLineData, eSectionTypeDWARFDebugLine, m_data_debug_line);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_debug_loc_data()
 {
     return GetCachedSectionData (flagsGotDebugLocData, eSectionTypeDWARFDebugLoc, m_data_debug_loc);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_debug_ranges_data()
 {
     return GetCachedSectionData (flagsGotDebugRangesData, eSectionTypeDWARFDebugRanges, m_data_debug_ranges);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_debug_str_data()
 {
     return GetCachedSectionData (flagsGotDebugStrData, eSectionTypeDWARFDebugStr, m_data_debug_str);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_apple_names_data()
 {
     return GetCachedSectionData (flagsGotAppleNamesData, eSectionTypeDWARFAppleNames, m_data_apple_names);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_apple_types_data()
 {
     return GetCachedSectionData (flagsGotAppleTypesData, eSectionTypeDWARFAppleTypes, m_data_apple_types);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_apple_namespaces_data()
 {
     return GetCachedSectionData (flagsGotAppleNamespacesData, eSectionTypeDWARFAppleNamespaces, m_data_apple_namespaces);
 }
 
-const DataExtractor&
+const DWARFDataExtractor&
 SymbolFileDWARF::get_apple_objc_data()
 {
     return GetCachedSectionData (flagsGotAppleObjCData, eSectionTypeDWARFAppleObjC, m_data_apple_objc);
@@ -806,7 +806,7 @@ SymbolFileDWARF::DebugAbbrev()
 {
     if (m_abbr.get() == NULL)
     {
-        const DataExtractor &debug_abbrev_data = get_debug_abbrev_data();
+        const DWARFDataExtractor &debug_abbrev_data = get_debug_abbrev_data();
         if (debug_abbrev_data.GetByteSize() > 0)
         {
             m_abbr.reset(new DWARFDebugAbbrev());
@@ -1706,6 +1706,7 @@ SymbolFileDWARF::ParseChildMembers
     const uint8_t *fixed_form_sizes = DWARFFormValue::GetFixedFormSizesForAddressSize (dwarf_cu->GetAddressByteSize());
     uint32_t member_idx = 0;
     BitfieldInfo last_field_info;
+    ModuleSP module = GetObjectFile()->GetModule();
 
     for (die = parent_die->GetFirstChild(); die != NULL; die = die->GetSibling())
     {
@@ -1762,13 +1763,14 @@ SymbolFileDWARF::ParseChildMembers
                                 {
                                     Value initialValue(0);
                                     Value memberOffset(0);
-                                    const DataExtractor& debug_info_data = get_debug_info_data();
+                                    const DWARFDataExtractor& debug_info_data = get_debug_info_data();
                                     uint32_t block_length = form_value.Unsigned();
                                     uint32_t block_offset = form_value.BlockData() - debug_info_data.GetDataStart();
                                     if (DWARFExpression::Evaluate(NULL, // ExecutionContext *
                                                                   NULL, // ClangExpressionVariableList *
                                                                   NULL, // ClangExpressionDeclMap *
                                                                   NULL, // RegisterContext *
+                                                                  module,
                                                                   debug_info_data, 
                                                                   block_offset, 
                                                                   block_length, 
@@ -2153,13 +2155,14 @@ SymbolFileDWARF::ParseChildMembers
                                 {
                                     Value initialValue(0);
                                     Value memberOffset(0);
-                                    const DataExtractor& debug_info_data = get_debug_info_data();
+                                    const DWARFDataExtractor& debug_info_data = get_debug_info_data();
                                     uint32_t block_length = form_value.Unsigned();
                                     uint32_t block_offset = form_value.BlockData() - debug_info_data.GetDataStart();
                                     if (DWARFExpression::Evaluate (NULL, 
                                                                    NULL, 
                                                                    NULL, 
                                                                    NULL,
+                                                                   module,
                                                                    debug_info_data, 
                                                                    block_offset, 
                                                                    block_length, 
@@ -2214,12 +2217,17 @@ SymbolFileDWARF::ParseChildMembers
                         
                         if (is_virtual)
                         {
-                            layout_info.vbase_offsets.insert(std::make_pair(class_clang_type.GetAsCXXRecordDecl(),
-                                                                            clang::CharUnits::fromQuantity(member_byte_offset)));
+                            // Do not specify any offset for virtual inheritance. The DWARF produced by clang doesn't
+                            // give us a constant offset, but gives us a DWARF expressions that requires an actual object
+                            // in memory. the DW_AT_data_member_location for a virtual base class looks like:
+                            //      DW_AT_data_member_location( DW_OP_dup, DW_OP_deref, DW_OP_constu(0x00000018), DW_OP_minus, DW_OP_deref, DW_OP_plus )
+                            // Given this, there is really no valid response we can give to clang for virtual base
+                            // class offsets, and this should eventually be removed from LayoutRecordType() in the external
+                            // AST source in clang.
                         }
                         else
                         {
-                            layout_info.base_offsets.insert(std::make_pair(class_clang_type.GetAsCXXRecordDecl(),
+                            layout_info.base_offsets.insert(std::make_pair(base_class_clang_type.GetAsCXXRecordDecl(),
                                                                            clang::CharUnits::fromQuantity(member_byte_offset)));
                         }
                     }
@@ -2460,22 +2468,21 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (ClangASTType &clang_type)
                     
                     if (class_language == eLanguageTypeObjC)
                     {
-                        std::string class_str (clang_type.GetTypeName());
-                        if (!class_str.empty())
+                        ConstString class_name (clang_type.GetTypeName());
+                        if (class_name)
                         {
                             
                             DIEArray method_die_offsets;
                             if (m_using_apple_tables)
                             {
                                 if (m_apple_objc_ap.get())
-                                    m_apple_objc_ap->FindByName(class_str.c_str(), method_die_offsets);
+                                    m_apple_objc_ap->FindByName(class_name.GetCString(), method_die_offsets);
                             }
                             else
                             {
                                 if (!m_indexed)
                                     Index ();
                                 
-                                ConstString class_name (class_str.c_str());
                                 m_objc_class_selectors_index.Find (class_name, method_die_offsets);
                             }
                             
@@ -2497,7 +2504,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (ClangASTType &clang_type)
                                         if (m_using_apple_tables)
                                         {
                                             GetObjectFile()->GetModule()->ReportErrorIfModifyDetected ("the DWARF debug information has been modified (.apple_objc accelerator table had bad die 0x%8.8x for '%s')\n",
-                                                                                                       die_offset, class_str.c_str());
+                                                                                                       die_offset, class_name.GetCString());
                                         }
                                     }            
                                 }
@@ -2621,7 +2628,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (ClangASTType &clang_type)
             }
         }
 
-        return clang_type;
+        return (bool)clang_type;
 
     case DW_TAG_enumeration_type:
         clang_type.StartTagDeclarationDefinition ();
@@ -2633,7 +2640,7 @@ SymbolFileDWARF::ResolveClangOpaqueTypeDefinition (ClangASTType &clang_type)
             ParseChildEnumerators(sc, clang_type, is_signed, type->GetByteSize(), dwarf_cu, die);
         }
         clang_type.CompleteTagDeclarationDefinition ();
-        return clang_type;
+        return (bool)clang_type;
 
     default:
         assert(false && "not a forward clang type decl!");
@@ -2845,7 +2852,7 @@ SymbolFileDWARF::ResolveSymbolContext(const FileSpec& file_spec, uint32_t line,
             for (cu_idx = 0; (dwarf_cu = debug_info->GetCompileUnitAtIndex(cu_idx)) != NULL; ++cu_idx)
             {
                 CompileUnit *dc_cu = GetCompUnitForDWARFCompUnit(dwarf_cu, cu_idx);
-                const bool full_match = file_spec.GetDirectory();
+                const bool full_match = (bool)file_spec.GetDirectory();
                 bool file_spec_matches_cu_file_spec = dc_cu != NULL && FileSpec::Equal(file_spec, *dc_cu, full_match);
                 if (check_inlines || file_spec_matches_cu_file_spec)
                 {
@@ -3096,7 +3103,7 @@ SymbolFileDWARF::FindGlobalVariables (const ConstString &name, const lldb_privat
     }
     
     if (!NamespaceDeclMatchesThisSymbolFile(namespace_decl))
-		return 0;
+        return 0;
     
     DWARFDebugInfo* info = DebugInfo();
     if (info == NULL)
@@ -3553,7 +3560,7 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
         sc_list.Clear();
     
     if (!NamespaceDeclMatchesThisSymbolFile(namespace_decl))
-		return 0;
+        return 0;
         
     // If name is empty then we won't find anything.
     if (name.IsEmpty())
@@ -3691,22 +3698,30 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
                                     {
                                         Type *type = sc.function->GetType();
                                         
-                                        clang::DeclContext* decl_ctx = GetClangDeclContextContainingTypeUID (type->GetID());
-                                        if (decl_ctx->isRecord())
+                                        if (type)
                                         {
-                                            if (name_type_mask & eFunctionNameTypeBase)
+                                            clang::DeclContext* decl_ctx = GetClangDeclContextContainingTypeUID (type->GetID());
+                                            if (decl_ctx->isRecord())
                                             {
-                                                sc_list.RemoveContextAtIndex(sc_list.GetSize()-1);
-                                                keep_die = false;
+                                                if (name_type_mask & eFunctionNameTypeBase)
+                                                {
+                                                    sc_list.RemoveContextAtIndex(sc_list.GetSize()-1);
+                                                    keep_die = false;
+                                                }
+                                            }
+                                            else
+                                            {
+                                                if (name_type_mask & eFunctionNameTypeMethod)
+                                                {
+                                                    sc_list.RemoveContextAtIndex(sc_list.GetSize()-1);
+                                                    keep_die = false;
+                                                }
                                             }
                                         }
                                         else
                                         {
-                                            if (name_type_mask & eFunctionNameTypeMethod)
-                                            {
-                                                sc_list.RemoveContextAtIndex(sc_list.GetSize()-1);
-                                                keep_die = false;
-                                            }
+                                            GetObjectFile()->GetModule()->ReportWarning ("function at die offset 0x%8.8x had no function type",
+                                                                                         die_offset);
                                         }
                                     }
                                 }
@@ -3736,8 +3751,9 @@ SymbolFileDWARF::FindFunctions (const ConstString &name,
         {
             FindFunctions (name, m_function_fullname_index, sc_list);
 
-            // Temporary workaround for global/anonymous namespace functions on linux
-#if defined (__linux__)
+            // FIXME Temporary workaround for global/anonymous namespace
+            // functions on FreeBSD and Linux
+#if defined (__FreeBSD__) || defined (__linux__)
             // If we didn't find any functions in the global namespace try
             // looking in the basename index but ignore any returned
             // functions that have a namespace (ie. mangled names starting with 
@@ -3930,7 +3946,7 @@ SymbolFileDWARF::FindTypes (const SymbolContext& sc,
         types.Clear();
     
     if (!NamespaceDeclMatchesThisSymbolFile(namespace_decl))
-		return 0;
+        return 0;
 
     DIEArray die_offsets;
     
@@ -4032,7 +4048,7 @@ SymbolFileDWARF::FindNamespace (const SymbolContext& sc,
     }
     
     if (!NamespaceDeclMatchesThisSymbolFile(parent_namespace_decl))
-		return ClangNamespaceDecl();
+        return ClangNamespaceDecl();
 
     ClangNamespaceDecl namespace_decl;
     DWARFDebugInfo* info = DebugInfo();
@@ -4191,9 +4207,9 @@ SymbolFileDWARF::ParseChildParameters (const SymbolContext& sc,
                             case DW_AT_location:
     //                          if (form_value.BlockData())
     //                          {
-    //                              const DataExtractor& debug_info_data = debug_info();
+    //                              const DWARFDataExtractor& debug_info_data = debug_info();
     //                              uint32_t block_length = form_value.Unsigned();
-    //                              DataExtractor location(debug_info_data, form_value.BlockData() - debug_info_data.GetDataStart(), block_length);
+    //                              DWARFDataExtractor location(debug_info_data, form_value.BlockData() - debug_info_data.GetDataStart(), block_length);
     //                          }
     //                          else
     //                          {
@@ -4831,17 +4847,16 @@ SymbolFileDWARF::FindCompleteObjCDefinitionTypeForDIE (const DWARFDebugInfoEntry
                 
                 if (try_resolving_type)
                 {
-					if (must_be_implementation && type_cu->Supports_DW_AT_APPLE_objc_complete_type())
-	                    try_resolving_type = type_die->GetAttributeValueAsUnsigned (this, type_cu, DW_AT_APPLE_objc_complete_type, 0);
+                    if (must_be_implementation && type_cu->Supports_DW_AT_APPLE_objc_complete_type())
+                        try_resolving_type = type_die->GetAttributeValueAsUnsigned (this, type_cu, DW_AT_APPLE_objc_complete_type, 0);
                     
                     if (try_resolving_type)
                     {
                         Type *resolved_type = ResolveType (type_cu, type_die, false);
                         if (resolved_type && resolved_type != DIE_IS_BEING_PARSED)
                         {
-                            DEBUG_PRINTF ("resolved 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ") from %s to 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ")\n",
+                            DEBUG_PRINTF ("resolved 0x%8.8" PRIx64 " from %s to 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ")\n",
                                           MakeUserID(die->GetOffset()), 
-                                          MakeUserID(dwarf_cu->GetOffset()),
                                           m_obj_file->GetFileSpec().GetFilename().AsCString(),
                                           MakeUserID(type_die->GetOffset()), 
                                           MakeUserID(type_cu->GetOffset()));
@@ -5117,7 +5132,7 @@ SymbolFileDWARF::FindDefinitionTypeForDIE (DWARFCompileUnit* cu,
                         {
                             DEBUG_PRINTF ("resolved 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ") from %s to 0x%8.8" PRIx64 " (cu 0x%8.8" PRIx64 ")\n",
                                           MakeUserID(die->GetOffset()), 
-                                          MakeUserID(dwarf_cu->GetOffset()),
+                                          MakeUserID(cu->GetOffset()),
                                           m_obj_file->GetFileSpec().GetFilename().AsCString(),
                                           MakeUserID(type_die->GetOffset()), 
                                           MakeUserID(type_cu->GetOffset()));
@@ -5732,7 +5747,7 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu,
                         }
                     }
 
-                    DEBUG_PRINTF ("0x%8.8" PRIx64 ": %s (\"%s\") type => 0x%8.8x\n", MakeUserID(die->GetOffset()), DW_TAG_value_to_name(tag), type_name_cstr, encoding_uid);
+                    DEBUG_PRINTF ("0x%8.8" PRIx64 ": %s (\"%s\") type => 0x%8.8lx\n", MakeUserID(die->GetOffset()), DW_TAG_value_to_name(tag), type_name_cstr, encoding_uid);
 
                     switch (tag)
                     {
@@ -5892,12 +5907,12 @@ SymbolFileDWARF::ParseType (const SymbolContext& sc, DWARFCompileUnit* dwarf_cu,
                                 {
                                 case DW_AT_decl_file:
                                     if (dwarf_cu->DW_AT_decl_file_attributes_are_invalid())
-									{
-										// llvm-gcc outputs invalid DW_AT_decl_file attributes that always
-										// point to the compile unit file, so we clear this invalid value
-										// so that we can still unique types efficiently.
+                                    {
+                                        // llvm-gcc outputs invalid DW_AT_decl_file attributes that always
+                                        // point to the compile unit file, so we clear this invalid value
+                                        // so that we can still unique types efficiently.
                                         decl.SetFile(FileSpec ("<invalid>", false));
-									}
+                                    }
                                     else
                                         decl.SetFile(sc.comp_unit->GetSupportFiles().GetFileSpecAtIndex(form_value.Unsigned())); 
                                     break;
@@ -7255,6 +7270,7 @@ SymbolFileDWARF::ParseVariableDIE
         return var_sp;  // Already been parsed!
     
     const dw_tag_t tag = die->Tag();
+    ModuleSP module = GetObjectFile()->GetModule();
     
     if ((tag == DW_TAG_variable) ||
         (tag == DW_TAG_constant) ||
@@ -7298,13 +7314,13 @@ SymbolFileDWARF::ParseVariableDIE
                         {
                             location_is_const_value_data = true;
                             // The constant value will be either a block, a data value or a string.
-                            const DataExtractor& debug_info_data = get_debug_info_data();
+                            const DWARFDataExtractor& debug_info_data = get_debug_info_data();
                             if (DWARFFormValue::IsBlockForm(form_value.Form()))
                             {
                                 // Retrieve the value as a block expression.
                                 uint32_t block_offset = form_value.BlockData() - debug_info_data.GetDataStart();
                                 uint32_t block_length = form_value.Unsigned();
-                                location.CopyOpcodeData(debug_info_data, block_offset, block_length);
+                                location.CopyOpcodeData(module, debug_info_data, block_offset, block_length);
                             }
                             else if (DWARFFormValue::IsDataForm(form_value.Form()))
                             {
@@ -7312,7 +7328,7 @@ SymbolFileDWARF::ParseVariableDIE
                                 const uint8_t *fixed_form_sizes = DWARFFormValue::GetFixedFormSizesForAddressSize (dwarf_cu->GetAddressByteSize());
                                 uint32_t data_offset = attributes.DIEOffsetAtIndex(i);
                                 uint32_t data_length = fixed_form_sizes[form_value.Form()];
-                                location.CopyOpcodeData(debug_info_data, data_offset, data_length);
+                                location.CopyOpcodeData(module, debug_info_data, data_offset, data_length);
                             }
                             else
                             {
@@ -7322,14 +7338,14 @@ SymbolFileDWARF::ParseVariableDIE
                                     const uint8_t *fixed_form_sizes = DWARFFormValue::GetFixedFormSizesForAddressSize (dwarf_cu->GetAddressByteSize());
                                     uint32_t data_offset = attributes.DIEOffsetAtIndex(i);
                                     uint32_t data_length = fixed_form_sizes[form_value.Form()];
-                                    location.CopyOpcodeData(debug_info_data, data_offset, data_length);
+                                    location.CopyOpcodeData(module, debug_info_data, data_offset, data_length);
                                 }
                                 else
                                 {
                                     const char *str = form_value.AsCString(&debug_info_data);
                                     uint32_t string_offset = str - (const char *)debug_info_data.GetDataStart();
                                     uint32_t string_length = strlen(str) + 1;
-                                    location.CopyOpcodeData(debug_info_data, string_offset, string_length);
+                                    location.CopyOpcodeData(module, debug_info_data, string_offset, string_length);
                                 }
                             }
                         }
@@ -7340,21 +7356,21 @@ SymbolFileDWARF::ParseVariableDIE
                             has_explicit_location = true;
                             if (form_value.BlockData())
                             {
-                                const DataExtractor& debug_info_data = get_debug_info_data();
+                                const DWARFDataExtractor& debug_info_data = get_debug_info_data();
 
                                 uint32_t block_offset = form_value.BlockData() - debug_info_data.GetDataStart();
                                 uint32_t block_length = form_value.Unsigned();
-                                location.CopyOpcodeData(get_debug_info_data(), block_offset, block_length);
+                                location.CopyOpcodeData(module, get_debug_info_data(), block_offset, block_length);
                             }
                             else
                             {
-                                const DataExtractor&    debug_loc_data = get_debug_loc_data();
+                                const DWARFDataExtractor&    debug_loc_data = get_debug_loc_data();
                                 const dw_offset_t debug_loc_offset = form_value.Unsigned();
 
                                 size_t loc_list_length = DWARFLocationList::Size(debug_loc_data, debug_loc_offset);
                                 if (loc_list_length > 0)
                                 {
-                                    location.CopyOpcodeData(debug_loc_data, debug_loc_offset, loc_list_length);
+                                    location.CopyOpcodeData(module, debug_loc_data, debug_loc_offset, loc_list_length);
                                     assert (func_low_pc != LLDB_INVALID_ADDRESS);
                                     location.SetLocationListSlide (func_low_pc - dwarf_cu->GetBaseAddress());
                                 }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
index b6c6d94782d..55886572ada 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h
@@ -28,7 +28,6 @@
 #include "lldb/Core/ClangForward.h"
 #include "lldb/Core/ConstString.h"
 #include "lldb/Core/dwarf.h"
-#include "lldb/Core/DataExtractor.h"
 #include "lldb/Core/Flags.h"
 #include "lldb/Core/UniqueCStringMap.h"
 #include "lldb/Symbol/ClangASTContext.h"
@@ -37,6 +36,7 @@
 
 // Project includes
 #include "DWARFDefines.h"
+#include "DWARFDataExtractor.h"
 #include "HashedNameToDIE.h"
 #include "NameToDIE.h"
 #include "UniqueDWARFASTType.h"
@@ -199,18 +199,18 @@ public:
     //virtual size_t        GetCompUnitCount() = 0;
     //virtual CompUnitSP    GetCompUnitAtIndex(size_t cu_idx) = 0;
 
-    const lldb_private::DataExtractor&      get_debug_abbrev_data ();
-    const lldb_private::DataExtractor&      get_debug_aranges_data ();
-    const lldb_private::DataExtractor&      get_debug_frame_data ();
-    const lldb_private::DataExtractor&      get_debug_info_data ();
-    const lldb_private::DataExtractor&      get_debug_line_data ();
-    const lldb_private::DataExtractor&      get_debug_loc_data ();
-    const lldb_private::DataExtractor&      get_debug_ranges_data ();
-    const lldb_private::DataExtractor&      get_debug_str_data ();
-    const lldb_private::DataExtractor&      get_apple_names_data ();
-    const lldb_private::DataExtractor&      get_apple_types_data ();
-    const lldb_private::DataExtractor&      get_apple_namespaces_data ();
-    const lldb_private::DataExtractor&      get_apple_objc_data ();
+    const lldb_private::DWARFDataExtractor&     get_debug_abbrev_data ();
+    const lldb_private::DWARFDataExtractor&     get_debug_aranges_data ();
+    const lldb_private::DWARFDataExtractor&     get_debug_frame_data ();
+    const lldb_private::DWARFDataExtractor&     get_debug_info_data ();
+    const lldb_private::DWARFDataExtractor&     get_debug_line_data ();
+    const lldb_private::DWARFDataExtractor&     get_debug_loc_data ();
+    const lldb_private::DWARFDataExtractor&     get_debug_ranges_data ();
+    const lldb_private::DWARFDataExtractor&     get_debug_str_data ();
+    const lldb_private::DWARFDataExtractor&     get_apple_names_data ();
+    const lldb_private::DWARFDataExtractor&     get_apple_types_data ();
+    const lldb_private::DWARFDataExtractor&     get_apple_namespaces_data ();
+    const lldb_private::DWARFDataExtractor&     get_apple_objc_data ();
 
 
     DWARFDebugAbbrev*       DebugAbbrev();
@@ -222,10 +222,10 @@ public:
     DWARFDebugRanges*       DebugRanges();
     const DWARFDebugRanges* DebugRanges() const;
 
-    const lldb_private::DataExtractor&
+    const lldb_private::DWARFDataExtractor&
     GetCachedSectionData (uint32_t got_flag, 
                           lldb::SectionType sect_type, 
-                          lldb_private::DataExtractor &data);
+                          lldb_private::DWARFDataExtractor &data);
 
     static bool
     SupportedVersion(uint16_t version);
@@ -560,23 +560,23 @@ protected:
               uint32_t type_mask,
               TypeSet &type_set);
 
-    lldb::ModuleWP                  m_debug_map_module_wp;
-    SymbolFileDWARFDebugMap *       m_debug_map_symfile;
-    clang::TranslationUnitDecl *    m_clang_tu_decl;
-    lldb_private::Flags             m_flags;
-    lldb_private::DataExtractor     m_dwarf_data; 
-    lldb_private::DataExtractor     m_data_debug_abbrev;
-    lldb_private::DataExtractor     m_data_debug_aranges;
-    lldb_private::DataExtractor     m_data_debug_frame;
-    lldb_private::DataExtractor     m_data_debug_info;
-    lldb_private::DataExtractor     m_data_debug_line;
-    lldb_private::DataExtractor     m_data_debug_loc;
-    lldb_private::DataExtractor     m_data_debug_ranges;
-    lldb_private::DataExtractor     m_data_debug_str;
-    lldb_private::DataExtractor     m_data_apple_names;
-    lldb_private::DataExtractor     m_data_apple_types;
-    lldb_private::DataExtractor     m_data_apple_namespaces;
-    lldb_private::DataExtractor     m_data_apple_objc;
+    lldb::ModuleWP                        m_debug_map_module_wp;
+    SymbolFileDWARFDebugMap *             m_debug_map_symfile;
+    clang::TranslationUnitDecl *          m_clang_tu_decl;
+    lldb_private::Flags                   m_flags;
+    lldb_private::DWARFDataExtractor      m_dwarf_data; 
+    lldb_private::DWARFDataExtractor      m_data_debug_abbrev;
+    lldb_private::DWARFDataExtractor      m_data_debug_aranges;
+    lldb_private::DWARFDataExtractor      m_data_debug_frame;
+    lldb_private::DWARFDataExtractor      m_data_debug_info;
+    lldb_private::DWARFDataExtractor      m_data_debug_line;
+    lldb_private::DWARFDataExtractor      m_data_debug_loc;
+    lldb_private::DWARFDataExtractor      m_data_debug_ranges;
+    lldb_private::DWARFDataExtractor      m_data_debug_str;
+    lldb_private::DWARFDataExtractor      m_data_apple_names;
+    lldb_private::DWARFDataExtractor      m_data_apple_types;
+    lldb_private::DWARFDataExtractor      m_data_apple_namespaces;
+    lldb_private::DWARFDataExtractor      m_data_apple_objc;
 
     // The unique pointer items below are generated on demand if and when someone accesses
     // them through a non const version of this class.
diff --git a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
index a0430e3d52b..856c42c2c9a 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
@@ -847,7 +847,7 @@ SymbolFileDWARFDebugMap::ResolveSymbolContext (const FileSpec& file_spec, uint32
             if (GetFileSpecForSO (i, so_file_spec))
             {
                 // Match the full path if the incoming file_spec has a directory (not just a basename)
-                const bool full_match = file_spec.GetDirectory();
+                const bool full_match = (bool)file_spec.GetDirectory();
                 resolve = FileSpec::Equal (file_spec, so_file_spec, full_match);
             }
         }
diff --git a/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp b/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
index c93dea9b5d3..8ddc1cd2ee8 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.cpp
@@ -53,11 +53,13 @@ UnwindAssemblyInstEmulation::GetNonCallSiteUnwindPlanFromAssembly (AddressRange&
         
         ExecutionContext exe_ctx;
         thread.CalculateExecutionContext(exe_ctx);
+        const bool prefer_file_cache = true;
         DisassemblerSP disasm_sp (Disassembler::DisassembleRange (m_arch,
                                                                   NULL,
                                                                   NULL,
                                                                   exe_ctx,
-                                                                  range));
+                                                                  range,
+                                                                  prefer_file_cache));
         
         Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND));
 
diff --git a/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp b/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
index d491683f687..1768798f71d 100644
--- a/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
+++ b/contrib/llvm/tools/lldb/source/Plugins/UnwindAssembly/x86/UnwindAssembly-x86.cpp
@@ -597,16 +597,25 @@ AssemblyParse_x86::get_non_call_site_unwind_plan (UnwindPlan &unwind_plan)
         if (push_reg_p (machine_regno))
         {
             current_sp_bytes_offset_from_cfa += m_wordsize;
+            bool need_to_push_row = false;
+            // the PUSH instruction has moved the stack pointer - if the CFA is set in terms of the stack pointer,
+            // we need to add a new row of instructions.
+            if (row->GetCFARegister() == m_lldb_sp_regnum)
+            {
+                need_to_push_row = true;
+                row->SetCFAOffset (current_sp_bytes_offset_from_cfa);
+            }
+            // record where non-volatile (callee-saved, spilled) registers are saved on the stack
             if (nonvolatile_reg_p (machine_regno) && machine_regno_to_lldb_regno (machine_regno, lldb_regno))
             {
-                row->SetOffset (current_func_text_offset + insn_len);
-                if (row->GetCFARegister() == m_lldb_sp_regnum)
-                {
-                    row->SetCFAOffset (current_sp_bytes_offset_from_cfa);
-                }
+                need_to_push_row = true;
                 UnwindPlan::Row::RegisterLocation regloc;
                 regloc.SetAtCFAPlusOffset (-current_sp_bytes_offset_from_cfa);
                 row->SetRegisterInfo (lldb_regno, regloc);
+            }
+            if (need_to_push_row)
+            {
+                row->SetOffset (current_func_text_offset + insn_len);
                 unwind_plan.AppendRow (row);
                 // Allocate a new Row, populate it with the existing Row contents.
                 newrow = new UnwindPlan::Row;
diff --git a/contrib/llvm/tools/lldb/source/Symbol/ClangASTImporter.cpp b/contrib/llvm/tools/lldb/source/Symbol/ClangASTImporter.cpp
index 15294962045..afdca97ece2 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/ClangASTImporter.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/ClangASTImporter.cpp
@@ -716,3 +716,18 @@ ClangASTImporter::Minion::Imported (clang::Decl *from, clang::Decl *to)
     
     return clang::ASTImporter::Imported(from, to);
 }
+
+clang::Decl *ClangASTImporter::Minion::GetOriginalDecl (clang::Decl *To)
+{
+    ASTContextMetadataSP to_context_md = m_master.GetContextMetadata(&To->getASTContext());
+    
+    if (!to_context_md)
+        return NULL;
+    
+    OriginMap::iterator iter = to_context_md->m_origins.find(To);
+    
+    if (iter == to_context_md->m_origins.end())
+        return NULL;
+    
+    return const_cast<clang::Decl*>(iter->second.decl);
+}
diff --git a/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp b/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
index 2e7c0790fe5..c904b7983ba 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
@@ -288,6 +288,26 @@ ClangASTType::IsArrayType (ClangASTType *element_type_ptr,
     return 0;
 }
 
+bool
+ClangASTType::IsRuntimeGeneratedType () const
+{
+    if (!IsValid())
+        return false;
+    
+    clang::DeclContext* decl_ctx = GetDeclContextForType();
+    if (!decl_ctx)
+        return false;
+
+    if (!llvm::isa<clang::ObjCInterfaceDecl>(decl_ctx))
+        return false;
+    
+    clang::ObjCInterfaceDecl *result_iface_decl = llvm::dyn_cast<clang::ObjCInterfaceDecl>(decl_ctx);
+    
+    ClangASTMetadata* ast_metadata = ClangASTContext::GetMetadata(m_ast, result_iface_decl);
+    if (!ast_metadata)
+        return false;
+    return (ast_metadata->GetISAPtr() != 0);
+}
 
 bool
 ClangASTType::IsCharType () const
@@ -385,6 +405,34 @@ ClangASTType::IsFunctionType (bool *is_variadic_ptr) const
     return false;
 }
 
+size_t
+ClangASTType::GetNumberOfFunctionArguments () const
+{
+    if (IsValid())
+    {
+        QualType qual_type (GetCanonicalQualType());
+        const FunctionProtoType* func = dyn_cast<FunctionProtoType>(qual_type.getTypePtr());
+        if (func)
+            return func->getNumArgs();
+    }
+    return 0;
+}
+
+ClangASTType
+ClangASTType::GetFunctionArgumentAtIndex (const size_t index)
+{
+    if (IsValid())
+    {
+        QualType qual_type (GetCanonicalQualType());
+        const FunctionProtoType* func = dyn_cast<FunctionProtoType>(qual_type.getTypePtr());
+        if (func)
+        {
+            if (index < func->getNumArgs())
+                return ClangASTType(m_ast, func->getArgType(index).getAsOpaquePtr());
+        }
+    }
+    return ClangASTType();
+}
 
 bool
 ClangASTType::IsFunctionPointerType () const
@@ -1065,14 +1113,14 @@ ClangASTType::GetConstTypeName () const
 {
     if (IsValid())
     {
-        std::string type_name (GetTypeName());
-        if (!type_name.empty())
-            return ConstString (type_name.c_str());
+        ConstString type_name (GetTypeName());
+        if (type_name)
+            return type_name;
     }
     return ConstString("<invalid>");
 }
 
-std::string
+ConstString
 ClangASTType::GetTypeName () const
 {
     std::string type_name;
@@ -1093,7 +1141,7 @@ ClangASTType::GetTypeName () const
             type_name = qual_type.getAsString(printing_policy);
         }
     }
-    return type_name;
+    return ConstString(type_name);
 }
 
 
@@ -1865,7 +1913,6 @@ ClangASTType::GetEncoding (uint64_t &count) const
         case clang::Type::TemplateSpecialization:
         case clang::Type::Atomic:
             break;
-            
     }
     count = 0;
     return lldb::eEncodingInvalid;
@@ -2271,20 +2318,10 @@ ClangASTType::GetNumDirectBaseClasses () const
             break;
             
         case clang::Type::ObjCObjectPointer:
-            if (GetCompleteType())
-            {
-                const ObjCObjectPointerType *objc_class_type = qual_type->getAsObjCInterfacePointerType();
-                if (objc_class_type)
-                {
-                    ObjCInterfaceDecl *class_interface_decl = objc_class_type->getInterfaceDecl();
-                    if (class_interface_decl && class_interface_decl->getSuperClass())
-                        count = 1;
-                }
-            }
+            count = GetPointeeType().GetNumDirectBaseClasses();
             break;
             
         case clang::Type::ObjCObject:
-        case clang::Type::ObjCInterface:
             if (GetCompleteType())
             {
                 const ObjCObjectType *objc_class_type = qual_type->getAsObjCQualifiedInterfaceType();
@@ -2297,6 +2334,19 @@ ClangASTType::GetNumDirectBaseClasses () const
                 }
             }
             break;
+        case clang::Type::ObjCInterface:
+            if (GetCompleteType())
+            {
+                const ObjCInterfaceType *objc_interface_type = qual_type->getAs<ObjCInterfaceType>();
+                if (objc_interface_type)
+                {
+                    ObjCInterfaceDecl *class_interface_decl = objc_interface_type->getInterface();
+                    
+                    if (class_interface_decl && class_interface_decl->getSuperClass())
+                        count = 1;
+                }
+            }
+            break;
             
             
         case clang::Type::Typedef:
@@ -2472,12 +2522,16 @@ ClangASTType::GetDirectBaseClassAtIndex (size_t idx, uint32_t *bit_offset_ptr) c
             break;
             
         case clang::Type::ObjCObjectPointer:
+            return GetPointeeType().GetDirectBaseClassAtIndex(idx,bit_offset_ptr);
+            
+        case clang::Type::ObjCObject:
             if (idx == 0 && GetCompleteType())
             {
-                const ObjCObjectPointerType *objc_class_type = qual_type->getAsObjCInterfacePointerType();
+                const ObjCObjectType *objc_class_type = qual_type->getAsObjCQualifiedInterfaceType();
                 if (objc_class_type)
                 {
-                    ObjCInterfaceDecl *class_interface_decl = objc_class_type->getInterfaceDecl();
+                    ObjCInterfaceDecl *class_interface_decl = objc_class_type->getInterface();
+                    
                     if (class_interface_decl)
                     {
                         ObjCInterfaceDecl *superclass_interface_decl = class_interface_decl->getSuperClass();
@@ -2491,15 +2545,13 @@ ClangASTType::GetDirectBaseClassAtIndex (size_t idx, uint32_t *bit_offset_ptr) c
                 }
             }
             break;
-            
-        case clang::Type::ObjCObject:
         case clang::Type::ObjCInterface:
             if (idx == 0 && GetCompleteType())
             {
-                const ObjCObjectType *objc_class_type = qual_type->getAsObjCQualifiedInterfaceType();
-                if (objc_class_type)
+                const ObjCObjectType *objc_interface_type = qual_type->getAs<ObjCInterfaceType>();
+                if (objc_interface_type)
                 {
-                    ObjCInterfaceDecl *class_interface_decl = objc_class_type->getInterface();
+                    ObjCInterfaceDecl *class_interface_decl = objc_interface_type->getInterface();
                     
                     if (class_interface_decl)
                     {
@@ -2977,7 +3029,7 @@ ClangASTType::GetChildClangTypeAtIndex (ExecutionContext *exe_ctx,
                             // Base classes should be a multiple of 8 bits in size
                             child_byte_offset = bit_offset/8;
                             ClangASTType base_class_clang_type(m_ast, base_class->getType());
-                            child_name = base_class_clang_type.GetTypeName();
+                            child_name = base_class_clang_type.GetTypeName().AsCString("");
                             uint64_t base_class_clang_type_bit_size = base_class_clang_type.GetBitSize();
                             
                             // Base classes bit sizes should be a multiple of 8 bits in size
@@ -3507,7 +3559,17 @@ ClangASTType::GetIndexOfChildMemberWithName (const char *name,
                          field != field_end;
                          ++field, ++child_idx)
                     {
-                        if (field->getName().equals (name_sref))
+                        llvm::StringRef field_name = field->getName();
+                        if (field_name.empty())
+                        {
+                            ClangASTType field_type(m_ast,field->getType());
+                            child_indexes.push_back(child_idx);
+                            if (field_type.GetIndexOfChildMemberWithName(name,  omit_empty_base_classes, child_indexes))
+                                return child_indexes.size();
+                            child_indexes.pop_back();
+                                
+                        }
+                        else if (field_name.equals (name_sref))
                         {
                             // We have to add on the number of base classes to this index!
                             child_indexes.push_back (child_idx + ClangASTContext::GetNumBaseClasses (cxx_record_decl, omit_empty_base_classes));
@@ -3767,7 +3829,7 @@ ClangASTType::GetIndexOfChildWithName (const char *name, bool omit_empty_base_cl
                                 continue;
                             
                             ClangASTType base_class_clang_type (m_ast, base_class->getType());
-                            std::string base_class_type_name (base_class_clang_type.GetTypeName());
+                            std::string base_class_type_name (base_class_clang_type.GetTypeName().AsCString(""));
                             if (base_class_type_name.compare (name) == 0)
                                 return child_idx;
                             ++child_idx;
diff --git a/contrib/llvm/tools/lldb/source/Symbol/CompileUnit.cpp b/contrib/llvm/tools/lldb/source/Symbol/CompileUnit.cpp
index 751b09ec5a6..62ae1cc1cbe 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/CompileUnit.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/CompileUnit.cpp
@@ -324,7 +324,7 @@ CompileUnit::ResolveSymbolContext
     // "file_spec" has an empty directory, then only compare the basenames
     // when finding file indexes
     std::vector<uint32_t> file_indexes;
-    const bool full_match = file_spec.GetDirectory();
+    const bool full_match = (bool)file_spec.GetDirectory();
     bool file_spec_matches_cu_file_spec = FileSpec::Equal(file_spec, *this, full_match);
 
     // If we are not looking for inlined functions and our file spec doesn't
diff --git a/contrib/llvm/tools/lldb/source/Symbol/DWARFCallFrameInfo.cpp b/contrib/llvm/tools/lldb/source/Symbol/DWARFCallFrameInfo.cpp
index e8f99a98011..d3d96289669 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/DWARFCallFrameInfo.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/DWARFCallFrameInfo.cpp
@@ -341,7 +341,7 @@ DWARFCallFrameInfo::GetFDEIndex ()
         dw_offset_t next_entry = current_entry + len + 4;
         dw_offset_t cie_id = m_cfi_data.GetU32 (&offset);
 
-        if (cie_id == 0 || cie_id == UINT32_MAX)
+        if (cie_id == 0 || cie_id == UINT32_MAX || len == 0)
         {
             m_cie_map[current_entry] = ParseCIE (current_entry);
             offset = next_entry;
@@ -444,6 +444,8 @@ DWARFCallFrameInfo::FDEToUnwindPlan (dw_offset_t dwarf_offset, Address startaddr
     unwind_plan.SetRegisterKind (m_reg_kind);
     unwind_plan.SetReturnAddressRegister (cie->return_addr_reg_num);
 
+    std::vector<UnwindPlan::RowSP> stack;
+
     UnwindPlan::Row::RegisterLocation reg_location;
     while (m_cfi_data.ValidOffset(offset) && offset < end_offset)
     {
@@ -629,7 +631,7 @@ DWARFCallFrameInfo::FDEToUnwindPlan (dw_offset_t dwarf_offset, Address startaddr
                         // the stack and place them in the current row. (This operation is
                         // useful for compilers that move epilogue code into the body of a
                         // function.)
-                        unwind_plan.AppendRow (row);
+                        stack.push_back (row);
                         UnwindPlan::Row *newrow = new UnwindPlan::Row;
                         *newrow = *row.get();
                         row.reset (newrow);
@@ -645,7 +647,8 @@ DWARFCallFrameInfo::FDEToUnwindPlan (dw_offset_t dwarf_offset, Address startaddr
                     // useful for compilers that move epilogue code into the body of a
                     // function.)
                     {
-                        row = unwind_plan.GetRowAtIndex(unwind_plan.GetRowCount() - 1);
+                        row = stack.back ();
+                        stack.pop_back ();
                     }
                     break;
 
diff --git a/contrib/llvm/tools/lldb/source/Symbol/FuncUnwinders.cpp b/contrib/llvm/tools/lldb/source/Symbol/FuncUnwinders.cpp
index 3de06179ee0..68b05ade4bd 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/FuncUnwinders.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/FuncUnwinders.cpp
@@ -114,9 +114,12 @@ FuncUnwinders::GetUnwindPlanAtNonCallSite (Thread& thread)
     if (m_tried_unwind_at_non_call_site == false && m_unwind_plan_non_call_site_sp.get() == NULL)
     {
         m_tried_unwind_at_non_call_site = true;
-        m_unwind_plan_non_call_site_sp.reset (new UnwindPlan (lldb::eRegisterKindGeneric));
-        if (!m_assembly_profiler->GetNonCallSiteUnwindPlanFromAssembly (m_range, thread, *m_unwind_plan_non_call_site_sp))
-            m_unwind_plan_non_call_site_sp.reset();
+        if (m_assembly_profiler)
+        {
+            m_unwind_plan_non_call_site_sp.reset (new UnwindPlan (lldb::eRegisterKindGeneric));
+            if (!m_assembly_profiler->GetNonCallSiteUnwindPlanFromAssembly (m_range, thread, *m_unwind_plan_non_call_site_sp))
+                m_unwind_plan_non_call_site_sp.reset();
+        }
     }
     return m_unwind_plan_non_call_site_sp;
 }
@@ -140,9 +143,12 @@ FuncUnwinders::GetUnwindPlanFastUnwind (Thread& thread)
     if (m_tried_unwind_fast == false && m_unwind_plan_fast_sp.get() == NULL)
     {
         m_tried_unwind_fast = true;
-        m_unwind_plan_fast_sp.reset (new UnwindPlan (lldb::eRegisterKindGeneric));
-        if (!m_assembly_profiler->GetFastUnwindPlan (m_range, thread, *m_unwind_plan_fast_sp))
-            m_unwind_plan_fast_sp.reset();
+        if (m_assembly_profiler)
+        {
+            m_unwind_plan_fast_sp.reset (new UnwindPlan (lldb::eRegisterKindGeneric));
+            if (!m_assembly_profiler->GetFastUnwindPlan (m_range, thread, *m_unwind_plan_fast_sp))
+                m_unwind_plan_fast_sp.reset();
+        }
     }
     return m_unwind_plan_fast_sp;
 }
@@ -216,7 +222,7 @@ FuncUnwinders::GetUnwindPlanArchitectureDefaultAtFunctionEntry (Thread& thread)
         }
     }
 
-    return m_unwind_plan_arch_default_sp;
+    return m_unwind_plan_arch_default_at_func_entry_sp;
 }
 
 
@@ -226,7 +232,8 @@ FuncUnwinders::GetFirstNonPrologueInsn (Target& target)
     if (m_first_non_prologue_insn.IsValid())
         return m_first_non_prologue_insn;
     ExecutionContext exe_ctx (target.shared_from_this(), false);
-    m_assembly_profiler->FirstNonPrologueInsn (m_range, exe_ctx, m_first_non_prologue_insn);
+    if (m_assembly_profiler)
+        m_assembly_profiler->FirstNonPrologueInsn (m_range, exe_ctx, m_first_non_prologue_insn);
     return m_first_non_prologue_insn;
 }
 
diff --git a/contrib/llvm/tools/lldb/source/Symbol/LineEntry.cpp b/contrib/llvm/tools/lldb/source/Symbol/LineEntry.cpp
index 10dc552ea01..08a2392e113 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/LineEntry.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/LineEntry.cpp
@@ -17,7 +17,7 @@ using namespace lldb_private;
 LineEntry::LineEntry() :
     range(),
     file(),
-    line(0),
+    line(LLDB_INVALID_LINE_NUMBER),
     column(0),
     is_start_of_statement(0),
     is_start_of_basic_block(0),
@@ -58,7 +58,7 @@ LineEntry::Clear()
 {
     range.Clear();
     file.Clear();
-    line = 0;
+    line = LLDB_INVALID_LINE_NUMBER;
     column = 0;
     is_start_of_statement = 0;
     is_start_of_basic_block = 0;
@@ -71,7 +71,7 @@ LineEntry::Clear()
 bool
 LineEntry::IsValid() const
 {
-    return range.GetBaseAddress().IsValid() && line != 0;
+    return range.GetBaseAddress().IsValid() && line != LLDB_INVALID_LINE_NUMBER;
 }
 
 bool
diff --git a/contrib/llvm/tools/lldb/source/Symbol/ObjectFile.cpp b/contrib/llvm/tools/lldb/source/Symbol/ObjectFile.cpp
index 0c6159122cf..ec69c9dd1e1 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/ObjectFile.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/ObjectFile.cpp
@@ -423,6 +423,7 @@ ObjectFile::GetAddressClass (addr_t file_addr)
             case eSymbolTypeObjCClass:      return eAddressClassRuntime;
             case eSymbolTypeObjCMetaClass:  return eAddressClassRuntime;
             case eSymbolTypeObjCIVar:       return eAddressClassRuntime;
+            case eSymbolTypeReExported:     return eAddressClassRuntime;
             }
         }
     }
@@ -459,7 +460,8 @@ size_t
 ObjectFile::CopyData (off_t offset, size_t length, void *dst) const
 {
     // The entire file has already been mmap'ed into m_data, so just copy from there
-    return m_data.CopyByteOrderedData (offset, length, dst, length, lldb::endian::InlHostByteOrder());
+    // Note that the data remains in target byte order.
+    return m_data.CopyData (offset, length, dst);
 }
 
 
@@ -501,7 +503,7 @@ ObjectFile::ReadSectionData (const Section *section, off_t section_offset, void
                 uint64_t section_dst_len = dst_len;
                 if (section_dst_len > section_bytes_left)
                     section_dst_len = section_bytes_left;
-                bzero(dst, section_dst_len);
+                memset(dst, 0, section_dst_len);
                 return section_dst_len;
             }
         }
diff --git a/contrib/llvm/tools/lldb/source/Symbol/Symbol.cpp b/contrib/llvm/tools/lldb/source/Symbol/Symbol.cpp
index 7f3543c3b23..a881b6f3101 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/Symbol.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/Symbol.cpp
@@ -10,6 +10,7 @@
 #include "lldb/Symbol/Symbol.h"
 
 #include "lldb/Core/Module.h"
+#include "lldb/Core/ModuleSpec.h"
 #include "lldb/Core/Section.h"
 #include "lldb/Core/Stream.h"
 #include "lldb/Symbol/ObjectFile.h"
@@ -176,6 +177,66 @@ Symbol::ValueIsAddress() const
     return m_addr_range.GetBaseAddress().GetSection().get() != NULL;
 }
 
+ConstString
+Symbol::GetReExportedSymbolName() const
+{
+    if (m_type == eSymbolTypeReExported)
+    {
+        // For eSymbolTypeReExported, the "const char *" from a ConstString
+        // is used as the offset in the address range base address. We can
+        // then make this back into a string that is the re-exported name.
+        intptr_t str_ptr = m_addr_range.GetBaseAddress().GetOffset();
+        if (str_ptr != 0)
+            return ConstString((const char *)str_ptr);
+        else
+            return GetName();
+    }
+    return ConstString();
+}
+
+FileSpec
+Symbol::GetReExportedSymbolSharedLibrary() const
+{
+    if (m_type == eSymbolTypeReExported)
+    {
+        // For eSymbolTypeReExported, the "const char *" from a ConstString
+        // is used as the offset in the address range base address. We can
+        // then make this back into a string that is the re-exported name.
+        intptr_t str_ptr = m_addr_range.GetByteSize();
+        if (str_ptr != 0)
+            return FileSpec((const char *)str_ptr, false);
+    }
+    return FileSpec();
+}
+
+bool
+Symbol::SetReExportedSymbolName(const ConstString &name)
+{
+    if (m_type == eSymbolTypeReExported)
+    {
+        // For eSymbolTypeReExported, the "const char *" from a ConstString
+        // is used as the offset in the address range base address.
+        m_addr_range.GetBaseAddress().SetOffset((intptr_t)name.GetCString());
+        return true;
+    }
+    return false;
+    
+}
+
+bool
+Symbol::SetReExportedSymbolSharedLibrary(const FileSpec &fspec)
+{
+    if (m_type == eSymbolTypeReExported)
+    {
+        // For eSymbolTypeReExported, the "const char *" from a ConstString
+        // is used as the offset in the address range base address.
+        m_addr_range.SetByteSize((intptr_t)ConstString(fspec.GetPath().c_str()).GetCString());
+        return true;
+    }
+    return false;
+    
+}
+
 uint32_t
 Symbol::GetSiblingIndex() const
 {
@@ -267,6 +328,19 @@ Symbol::Dump(Stream *s, Target *target, uint32_t index) const
                     m_flags,
                     m_mangled.GetName().AsCString(""));
     }
+    else if (m_type == eSymbolTypeReExported)
+    {
+        s->Printf ("                                                         0x%8.8x %s",
+                   m_flags,
+                   m_mangled.GetName().AsCString(""));
+        
+        ConstString reexport_name = GetReExportedSymbolName();
+        intptr_t shlib = m_addr_range.GetByteSize();
+        if (shlib)
+            s->Printf(" -> %s`%s\n", (const char *)shlib, reexport_name.GetCString());
+        else
+            s->Printf(" -> %s\n", reexport_name.GetCString());
+    }
     else
     {
         const char *format = m_size_is_sibling ?
@@ -380,6 +454,7 @@ Symbol::GetTypeAsString() const
     ENUM_TO_CSTRING(Invalid);
     ENUM_TO_CSTRING(Absolute);
     ENUM_TO_CSTRING(Code);
+    ENUM_TO_CSTRING(Resolver);
     ENUM_TO_CSTRING(Data);
     ENUM_TO_CSTRING(Trampoline);
     ENUM_TO_CSTRING(Runtime);
@@ -404,6 +479,7 @@ Symbol::GetTypeAsString() const
     ENUM_TO_CSTRING(ObjCClass);
     ENUM_TO_CSTRING(ObjCMetaClass);
     ENUM_TO_CSTRING(ObjCIVar);
+    ENUM_TO_CSTRING(ReExported);
     default:
         break;
     }
@@ -460,3 +536,47 @@ Symbol::GetByteSize () const
     return m_addr_range.GetByteSize();
 }
 
+Symbol *
+Symbol::ResolveReExportedSymbol (Target &target)
+{
+    ConstString reexport_name (GetReExportedSymbolName());
+    if (reexport_name)
+    {
+        ModuleSpec module_spec;
+        ModuleSP module_sp;
+        module_spec.GetFileSpec() = GetReExportedSymbolSharedLibrary();
+        if (module_spec.GetFileSpec())
+        {
+            // Try searching for the module file spec first using the full path
+            module_sp = target.GetImages().FindFirstModule(module_spec);
+            if (!module_sp)
+            {
+                // Next try and find the module by basename in case environment
+                // variables or other runtime trickery causes shared libraries
+                // to be loaded from alternate paths
+                module_spec.GetFileSpec().GetDirectory().Clear();
+                module_sp = target.GetImages().FindFirstModule(module_spec);
+            }
+        }
+        
+        if (module_sp)
+        {
+            lldb_private::SymbolContextList sc_list;
+            module_sp->FindSymbolsWithNameAndType(reexport_name, eSymbolTypeAny, sc_list);
+            const size_t num_scs = sc_list.GetSize();
+            if (num_scs > 0)
+            {
+                for (size_t i=0; i<num_scs; ++i)
+                {
+                    lldb_private::SymbolContext sc;
+                    if (sc_list.GetContextAtIndex(i, sc))
+                    {
+                        if (sc.symbol->IsExternal())
+                            return sc.symbol;
+                    }
+                }
+            }
+        }
+    }
+    return NULL;
+}
diff --git a/contrib/llvm/tools/lldb/source/Symbol/SymbolContext.cpp b/contrib/llvm/tools/lldb/source/Symbol/SymbolContext.cpp
index ac91161f7d6..f1e581f7161 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/SymbolContext.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/SymbolContext.cpp
@@ -910,15 +910,15 @@ SymbolContextSpecifier::GetDescription (Stream *s, lldb::DescriptionLevel level)
         s->Printf ("File: %s", path_str);
         if (m_type == eLineStartSpecified)
         {
-            s->Printf (" from line %lu", m_start_line);
+            s->Printf (" from line %zu", m_start_line);
             if (m_type == eLineEndSpecified)
-                s->Printf ("to line %lu", m_end_line);
+                s->Printf ("to line %zu", m_end_line);
             else
                 s->Printf ("to end");
         }
         else if (m_type == eLineEndSpecified)
         {
-            s->Printf (" from start to line %ld", m_end_line);
+            s->Printf (" from start to line %zu", m_end_line);
         }
         s->Printf (".\n");
     }
@@ -926,16 +926,16 @@ SymbolContextSpecifier::GetDescription (Stream *s, lldb::DescriptionLevel level)
     if (m_type == eLineStartSpecified)
     {
         s->Indent();
-        s->Printf ("From line %lu", m_start_line);
+        s->Printf ("From line %zu", m_start_line);
         if (m_type == eLineEndSpecified)
-            s->Printf ("to line %lu", m_end_line);
+            s->Printf ("to line %zu", m_end_line);
         else
             s->Printf ("to end");
         s->Printf (".\n");
     }
     else if (m_type == eLineEndSpecified)
     {
-        s->Printf ("From start to line %ld.\n", m_end_line);
+        s->Printf ("From start to line %zu.\n", m_end_line);
     }
     
     if (m_type == eFunctionSpecified)
diff --git a/contrib/llvm/tools/lldb/source/Symbol/Symtab.cpp b/contrib/llvm/tools/lldb/source/Symbol/Symtab.cpp
index 27af6988aa9..430fc178920 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/Symtab.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/Symtab.cpp
@@ -90,14 +90,14 @@ Symtab::Dump (Stream *s, Target *target, SortOrder sort_order)
         object_name = m_objfile->GetModule()->GetObjectName().GetCString();
 
     if (file_spec)
-        s->Printf("Symtab, file = %s%s%s%s, num_symbols = %lu",
+        s->Printf("Symtab, file = %s%s%s%s, num_symbols = %zu",
         file_spec.GetPath().c_str(),
         object_name ? "(" : "",
         object_name ? object_name : "",
         object_name ? ")" : "",
         m_symbols.size());
     else
-        s->Printf("Symtab, num_symbols = %lu", m_symbols.size());
+        s->Printf("Symtab, num_symbols = %zu", m_symbols.size());
 
     if (!m_symbols.empty())
     {
@@ -166,7 +166,7 @@ Symtab::Dump(Stream *s, Target *target, std::vector<uint32_t>& indexes) const
     const size_t num_symbols = GetNumSymbols();
     //s->Printf("%.*p: ", (int)sizeof(void*) * 2, this);
     s->Indent();
-    s->Printf("Symtab %lu symbol indexes (%lu symbols total):\n", indexes.size(), m_symbols.size());
+    s->Printf("Symtab %zu symbol indexes (%zu symbols total):\n", indexes.size(), m_symbols.size());
     s->IndentMore();
 
     if (!indexes.empty())
@@ -682,7 +682,7 @@ Symtab::AppendSymbolIndexesWithNameAndType (const ConstString& symbol_name, Symb
             if (symbol_type == eSymbolTypeAny || m_symbols[*pos].GetType() == symbol_type)
                 ++pos;
             else
-                indexes.erase(pos);
+                pos = indexes.erase(pos);
         }
     }
     return indexes.size();
@@ -701,7 +701,7 @@ Symtab::AppendSymbolIndexesWithNameAndType (const ConstString& symbol_name, Symb
             if (symbol_type == eSymbolTypeAny || m_symbols[*pos].GetType() == symbol_type)
                 ++pos;
             else
-                indexes.erase(pos);
+                pos = indexes.erase(pos);
         }
     }
     return indexes.size();
@@ -1135,6 +1135,7 @@ Symtab::FindFunctionSymbols (const ConstString &name,
                     {
                     case eSymbolTypeCode:
                     case eSymbolTypeResolver:
+                    case eSymbolTypeReExported:
                         symbol_indexes.push_back(temp_symbol_indexes[i]);
                         break;
                     default:
diff --git a/contrib/llvm/tools/lldb/source/Symbol/Type.cpp b/contrib/llvm/tools/lldb/source/Symbol/Type.cpp
index 0af2359e1da..32a1d474053 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/Type.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/Type.cpp
@@ -798,12 +798,12 @@ Type::GetTypeScopeAndBasename (const char* &name_cstr,
 
 
 
-TypeAndOrName::TypeAndOrName () : m_type_sp(), m_type_name()
+TypeAndOrName::TypeAndOrName () : m_type_pair(), m_type_name()
 {
 
 }
 
-TypeAndOrName::TypeAndOrName (TypeSP &in_type_sp) : m_type_sp(in_type_sp)
+TypeAndOrName::TypeAndOrName (TypeSP &in_type_sp) : m_type_pair(in_type_sp)
 {
     if (in_type_sp)
         m_type_name = in_type_sp->GetName();
@@ -813,7 +813,7 @@ TypeAndOrName::TypeAndOrName (const char *in_type_str) : m_type_name(in_type_str
 {
 }
 
-TypeAndOrName::TypeAndOrName (const TypeAndOrName &rhs) : m_type_sp (rhs.m_type_sp), m_type_name (rhs.m_type_name)
+TypeAndOrName::TypeAndOrName (const TypeAndOrName &rhs) : m_type_pair (rhs.m_type_pair), m_type_name (rhs.m_type_name)
 {
 
 }
@@ -828,7 +828,7 @@ TypeAndOrName::operator= (const TypeAndOrName &rhs)
     if (this != &rhs)
     {
         m_type_name = rhs.m_type_name;
-        m_type_sp = rhs.m_type_sp;
+        m_type_pair = rhs.m_type_pair;
     }
     return *this;
 }
@@ -836,7 +836,7 @@ TypeAndOrName::operator= (const TypeAndOrName &rhs)
 bool
 TypeAndOrName::operator==(const TypeAndOrName &other) const
 {
-    if (m_type_sp != other.m_type_sp)
+    if (m_type_pair != other.m_type_pair)
         return false;
     if (m_type_name != other.m_type_name)
         return false;
@@ -846,7 +846,7 @@ TypeAndOrName::operator==(const TypeAndOrName &other) const
 bool
 TypeAndOrName::operator!=(const TypeAndOrName &other) const
 {
-    if (m_type_sp != other.m_type_sp)
+    if (m_type_pair != other.m_type_pair)
         return true;
     if (m_type_name != other.m_type_name)
         return true;
@@ -855,11 +855,12 @@ TypeAndOrName::operator!=(const TypeAndOrName &other) const
 
 ConstString
 TypeAndOrName::GetName () const
-{    
-    if (m_type_sp)
-        return m_type_sp->GetName();
-    else
+{
+    if (m_type_name)
         return m_type_name;
+    if (m_type_pair)
+        return m_type_pair.GetName();
+    return ConstString("<invalid>");
 }
 
 void
@@ -877,15 +878,23 @@ TypeAndOrName::SetName (const char *type_name_cstr)
 void
 TypeAndOrName::SetTypeSP (lldb::TypeSP type_sp)
 {
-    m_type_sp = type_sp;
-    if (type_sp)
-        m_type_name = type_sp->GetName();
+    m_type_pair.SetType(type_sp);
+    if (m_type_pair)
+        m_type_name = m_type_pair.GetName();
+}
+
+void
+TypeAndOrName::SetClangASTType (ClangASTType clang_type)
+{
+    m_type_pair.SetType(clang_type);
+    if (m_type_pair)
+        m_type_name = m_type_pair.GetName();
 }
 
 bool
-TypeAndOrName::IsEmpty()
+TypeAndOrName::IsEmpty()  const
 {
-    if (m_type_name || m_type_sp)
+    if ((bool)m_type_name || (bool)m_type_pair)
         return false;
     else
         return true;
@@ -895,96 +904,247 @@ void
 TypeAndOrName::Clear ()
 {
     m_type_name.Clear();
-    m_type_sp.reset();
+    m_type_pair.Clear();
 }
 
 bool
-TypeAndOrName::HasName ()
+TypeAndOrName::HasName () const
 {
     return (bool)m_type_name;
 }
 
 bool
-TypeAndOrName::HasTypeSP ()
+TypeAndOrName::HasTypeSP () const
 {
-    return m_type_sp.get() != NULL;
+    return m_type_pair.GetTypeSP().get() != nullptr;
 }
 
-TypeImpl::TypeImpl(const lldb_private::ClangASTType& clang_ast_type) :
-    m_clang_ast_type(clang_ast_type),
-    m_type_sp()
+bool
+TypeAndOrName::HasClangASTType () const
+{
+    return m_type_pair.GetClangASTType().IsValid();
+}
+
+
+TypeImpl::TypeImpl() :
+m_static_type(),
+m_dynamic_type()
 {
 }
 
-TypeImpl::TypeImpl(const lldb::TypeSP& type) :
-    m_clang_ast_type(type->GetClangForwardType()),
-    m_type_sp(type)
+TypeImpl::TypeImpl(const TypeImpl& rhs) :
+m_static_type(rhs.m_static_type),
+m_dynamic_type(rhs.m_dynamic_type)
+{
+}
+
+TypeImpl::TypeImpl (lldb::TypeSP type_sp) :
+m_static_type(type_sp),
+m_dynamic_type()
+{
+}
+
+TypeImpl::TypeImpl (ClangASTType clang_type) :
+m_static_type(clang_type),
+m_dynamic_type()
+{
+}
+
+TypeImpl::TypeImpl (lldb::TypeSP type_sp, ClangASTType dynamic) :
+m_static_type (type_sp),
+m_dynamic_type(dynamic)
+{
+}
+
+TypeImpl::TypeImpl (ClangASTType clang_type, ClangASTType dynamic) :
+m_static_type (clang_type),
+m_dynamic_type(dynamic)
+{
+}
+
+TypeImpl::TypeImpl (TypePair pair, ClangASTType dynamic) :
+m_static_type (pair),
+m_dynamic_type(dynamic)
 {
 }
 
 void
-TypeImpl::SetType (const lldb::TypeSP &type_sp)
+TypeImpl::SetType (lldb::TypeSP type_sp)
 {
-    if (type_sp)
-    {
-        m_clang_ast_type = type_sp->GetClangForwardType();
-        m_type_sp = type_sp;
-    }
-    else
-    {
-        m_clang_ast_type.Clear();
-        m_type_sp.reset();
-    }
+    m_static_type.SetType(type_sp);
+}
+
+void
+TypeImpl::SetType (ClangASTType clang_type)
+{
+    m_static_type.SetType (clang_type);
+}
+
+void
+TypeImpl::SetType (lldb::TypeSP type_sp, ClangASTType dynamic)
+{
+    m_static_type.SetType (type_sp);
+    m_dynamic_type = dynamic;
+}
+
+void
+TypeImpl::SetType (ClangASTType clang_type, ClangASTType dynamic)
+{
+    m_static_type.SetType (clang_type);
+    m_dynamic_type = dynamic;
+}
+
+void
+TypeImpl::SetType (TypePair pair, ClangASTType dynamic)
+{
+    m_static_type = pair;
+    m_dynamic_type = dynamic;
 }
 
 TypeImpl&
 TypeImpl::operator = (const TypeImpl& rhs)
 {
-    if (*this != rhs)
+    if (rhs != *this)
     {
-        m_clang_ast_type = rhs.m_clang_ast_type;
-        m_type_sp = rhs.m_type_sp;
+        m_static_type = rhs.m_static_type;
+        m_dynamic_type = rhs.m_dynamic_type;
     }
     return *this;
 }
 
-clang::ASTContext*
-TypeImpl::GetASTContext()
+bool
+TypeImpl::operator == (const TypeImpl& rhs) const
 {
-    if (!IsValid())
-        return NULL;
-    
-    return m_clang_ast_type.GetASTContext();
-}
-
-lldb::clang_type_t
-TypeImpl::GetOpaqueQualType()
-{
-    if (!IsValid())
-        return NULL;
-    
-    return m_clang_ast_type.GetOpaqueQualType();
+    return m_static_type == rhs.m_static_type &&
+    m_dynamic_type == rhs.m_dynamic_type;
 }
 
 bool
-TypeImpl::GetDescription (lldb_private::Stream &strm, 
-                          lldb::DescriptionLevel description_level)
+TypeImpl::operator != (const TypeImpl& rhs) const
 {
-    if (m_clang_ast_type.IsValid())
-    {
-        m_clang_ast_type.DumpTypeDescription (&strm);
-    }
-    else
-    {
-        strm.PutCString ("No value");
-    }
-    return true;
+    return m_static_type != rhs.m_static_type ||
+    m_dynamic_type != rhs.m_dynamic_type;
+}
+
+bool
+TypeImpl::IsValid() const
+{
+    // just a name is not valid
+    return m_static_type.IsValid() || m_dynamic_type.IsValid();
+}
+
+TypeImpl::operator bool () const
+{
+    return IsValid();
+}
+
+void
+TypeImpl::Clear()
+{
+    m_static_type.Clear();
+    m_dynamic_type.Clear();
 }
 
 ConstString
-TypeImpl::GetName ()
+TypeImpl::GetName ()  const
 {
-    if (m_clang_ast_type.IsValid())
-        return m_clang_ast_type.GetConstTypeName();
-    return ConstString();
+    if (m_dynamic_type)
+        return m_dynamic_type.GetTypeName();
+    return m_static_type.GetName ();
+}
+
+TypeImpl
+TypeImpl::GetPointerType () const
+{
+    if (m_dynamic_type.IsValid())
+    {
+        return TypeImpl(m_static_type, m_dynamic_type.GetPointerType());
+    }
+    return TypeImpl(m_static_type.GetPointerType());
+}
+
+TypeImpl
+TypeImpl::GetPointeeType () const
+{
+    if (m_dynamic_type.IsValid())
+    {
+        return TypeImpl(m_static_type, m_dynamic_type.GetPointeeType());
+    }
+    return TypeImpl(m_static_type.GetPointeeType());
+}
+
+TypeImpl
+TypeImpl::GetReferenceType () const
+{
+    if (m_dynamic_type.IsValid())
+    {
+        return TypeImpl(m_static_type, m_dynamic_type.GetLValueReferenceType());
+    }
+    return TypeImpl(m_static_type.GetReferenceType());
+}
+
+TypeImpl
+TypeImpl::GetDereferencedType () const
+{
+    if (m_dynamic_type.IsValid())
+    {
+        return TypeImpl(m_static_type, m_dynamic_type.GetNonReferenceType());
+    }
+    return TypeImpl(m_static_type.GetDereferencedType());
+}
+
+TypeImpl
+TypeImpl::GetUnqualifiedType() const
+{
+    if (m_dynamic_type.IsValid())
+    {
+        return TypeImpl(m_static_type, m_dynamic_type.GetFullyUnqualifiedType());
+    }
+    return TypeImpl(m_static_type.GetUnqualifiedType());
+}
+
+TypeImpl
+TypeImpl::GetCanonicalType() const
+{
+    if (m_dynamic_type.IsValid())
+    {
+        return TypeImpl(m_static_type, m_dynamic_type.GetCanonicalType());
+    }
+    return TypeImpl(m_static_type.GetCanonicalType());
+}
+
+ClangASTType
+TypeImpl::GetClangASTType (bool prefer_dynamic)
+{
+    if (prefer_dynamic)
+    {
+        if (m_dynamic_type.IsValid())
+            return m_dynamic_type;
+    }
+    return m_static_type.GetClangASTType();
+}
+
+clang::ASTContext *
+TypeImpl::GetClangASTContext (bool prefer_dynamic)
+{
+    if (prefer_dynamic)
+    {
+        if (m_dynamic_type.IsValid())
+            return m_dynamic_type.GetASTContext();
+    }
+    return m_static_type.GetClangASTContext();
+}
+
+bool
+TypeImpl::GetDescription (lldb_private::Stream &strm,
+                lldb::DescriptionLevel description_level)
+{
+    if (m_dynamic_type.IsValid())
+    {
+        strm.Printf("Dynamic:\n");
+        m_dynamic_type.DumpTypeDescription(&strm);
+        strm.Printf("\nStatic:\n");
+    }
+    m_static_type.GetClangASTType().DumpTypeDescription(&strm);
+    return true;
 }
diff --git a/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp b/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp
index c089a7bb8db..7b361e7d2eb 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/UnwindPlan.cpp
@@ -10,6 +10,7 @@
 #include "lldb/Symbol/UnwindPlan.h"
 
 #include "lldb/Core/ConstString.h"
+#include "lldb/Core/Log.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/Thread.h"
@@ -373,6 +374,49 @@ UnwindPlan::SetPlanValidAddressRange (const AddressRange& range)
 bool
 UnwindPlan::PlanValidAtAddress (Address addr)
 {
+    // If this UnwindPlan has no rows, it is an invalid UnwindPlan.
+    if (GetRowCount() == 0)
+    {
+        Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND));
+        if (log)
+        {
+            StreamString s;
+            if (addr.Dump (&s, NULL, Address::DumpStyleSectionNameOffset))
+            {
+                log->Printf ("UnwindPlan is invalid -- no unwind rows for UnwindPlan '%s' at address %s",
+                             m_source_name.GetCString(), s.GetData());
+            }
+            else
+            {
+                log->Printf ("UnwindPlan is invalid -- no unwind rows for UnwindPlan '%s'",
+                             m_source_name.GetCString());
+            }
+        }
+        return false;
+    }
+
+    // If the 0th Row of unwind instructions is missing, or if it doesn't provide
+    // a register to use to find the Canonical Frame Address, this is not a valid UnwindPlan.
+    if (GetRowAtIndex(0).get() == NULL || GetRowAtIndex(0)->GetCFARegister() == LLDB_INVALID_REGNUM)
+    {
+        Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_UNWIND));
+        if (log)
+        {
+            StreamString s;
+            if (addr.Dump (&s, NULL, Address::DumpStyleSectionNameOffset))
+            {
+                log->Printf ("UnwindPlan is invalid -- no CFA register defined in row 0 for UnwindPlan '%s' at address %s",
+                             m_source_name.GetCString(), s.GetData());
+            }
+            else
+            {
+                log->Printf ("UnwindPlan is invalid -- no CFA register defined in row 0 for UnwindPlan '%s'",
+                             m_source_name.GetCString());
+            }
+        }
+        return false;
+    }
+
     if (!m_plan_valid_address_range.GetBaseAddress().IsValid() || m_plan_valid_address_range.GetByteSize() == 0)
         return true;
 
diff --git a/contrib/llvm/tools/lldb/source/Symbol/UnwindTable.cpp b/contrib/llvm/tools/lldb/source/Symbol/UnwindTable.cpp
index c77628bf7dd..33eb4d6c092 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/UnwindTable.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/UnwindTable.cpp
@@ -102,7 +102,7 @@ UnwindTable::GetFuncUnwindersContainingAddress (const Address& addr, SymbolConte
 
     FuncUnwindersSP func_unwinder_sp(new FuncUnwinders(*this, m_assembly_profiler, range));
     m_unwinds.insert (insert_pos, std::make_pair(range.GetBaseAddress().GetFileAddress(), func_unwinder_sp));
-//    StreamFile s(stdout);
+//    StreamFile s(stdout, false);
 //    Dump (s);
     return func_unwinder_sp;
 }
diff --git a/contrib/llvm/tools/lldb/source/Symbol/Variable.cpp b/contrib/llvm/tools/lldb/source/Symbol/Variable.cpp
index 36439b56162..7276e0a4a1a 100644
--- a/contrib/llvm/tools/lldb/source/Symbol/Variable.cpp
+++ b/contrib/llvm/tools/lldb/source/Symbol/Variable.cpp
@@ -684,11 +684,14 @@ PrivateAutoComplete (StackFrame *frame,
                 
                 VariableList *variable_list = frame->GetVariableList(get_file_globals);
                 
-                const size_t num_variables = variable_list->GetSize();
-                for (size_t i=0; i<num_variables; ++i)
+                if (variable_list)
                 {
-                    Variable *variable = variable_list->GetVariableAtIndex(i).get();
-                    matches.AppendString (variable->GetName().AsCString());
+                    const size_t num_variables = variable_list->GetSize();
+                    for (size_t i=0; i<num_variables; ++i)
+                    {
+                        Variable *variable = variable_list->GetVariableAtIndex(i).get();
+                        matches.AppendString (variable->GetName().AsCString());
+                    }
                 }
             }
         }
diff --git a/contrib/llvm/tools/lldb/source/Target/ExecutionContext.cpp b/contrib/llvm/tools/lldb/source/Target/ExecutionContext.cpp
index 8b5731e8028..7a8b60189bc 100644
--- a/contrib/llvm/tools/lldb/source/Target/ExecutionContext.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ExecutionContext.cpp
@@ -241,7 +241,15 @@ ExecutionContext::GetAddressByteSize() const
     return sizeof(void *);
 }
 
-
+lldb::ByteOrder
+ExecutionContext::GetByteOrder() const
+{
+    if (m_target_sp && m_target_sp->GetArchitecture().IsValid())
+        m_target_sp->GetArchitecture().GetByteOrder();
+    if (m_process_sp)
+        m_process_sp->GetByteOrder();
+    return lldb::endian::InlHostByteOrder();
+}
 
 RegisterContext *
 ExecutionContext::GetRegisterContext () const
diff --git a/contrib/llvm/tools/lldb/source/Target/LanguageRuntime.cpp b/contrib/llvm/tools/lldb/source/Target/LanguageRuntime.cpp
index d2f586ac82f..2fdc2539d08 100644
--- a/contrib/llvm/tools/lldb/source/Target/LanguageRuntime.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/LanguageRuntime.cpp
@@ -268,8 +268,8 @@ LanguageRuntime::CreateExceptionBreakpoint (Target &target,
 {
     BreakpointResolverSP resolver_sp(new ExceptionBreakpointResolver(language, catch_bp, throw_bp));
     SearchFilterSP filter_sp(new ExceptionSearchFilter(target.shared_from_this(), language));
-    
-    BreakpointSP exc_breakpt_sp (target.CreateBreakpoint (filter_sp, resolver_sp, is_internal));
+    bool hardware = false;
+    BreakpointSP exc_breakpt_sp (target.CreateBreakpoint (filter_sp, resolver_sp, is_internal, hardware));
     if (is_internal)
         exc_breakpt_sp->SetBreakpointKind("exception");
     
diff --git a/contrib/llvm/tools/lldb/source/Target/Platform.cpp b/contrib/llvm/tools/lldb/source/Target/Platform.cpp
index e6d3bc7a55d..66f9c0e552a 100644
--- a/contrib/llvm/tools/lldb/source/Target/Platform.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/Platform.cpp
@@ -22,6 +22,7 @@
 #include "lldb/Host/Host.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/Target.h"
+#include "lldb/Utility/Utils.h"
 
 using namespace lldb;
 using namespace lldb_private;
@@ -236,6 +237,7 @@ Platform::Platform (bool is_host) :
     m_system_arch_set_while_connected (false),
     m_sdk_sysroot (),
     m_sdk_build (),
+    m_working_dir (),
     m_remote_url (),
     m_name (),
     m_major_os_version (UINT32_MAX),
@@ -247,7 +249,13 @@ Platform::Platform (bool is_host) :
     m_uid_map(),
     m_gid_map(),
     m_max_uid_name_len (0),
-    m_max_gid_name_len (0)
+    m_max_gid_name_len (0),
+    m_supports_rsync (false),
+    m_rsync_opts (),
+    m_rsync_prefix (),
+    m_supports_ssh (false),
+    m_ssh_opts (),
+    m_ignores_remote_hostname (false)
 {
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_OBJECT));
     if (log)
@@ -311,6 +319,18 @@ Platform::GetStatus (Stream &strm)
             strm.Printf("  Hostname: %s\n", GetHostname());
         strm.Printf(" Connected: %s\n", is_connected ? "yes" : "no");
     }
+
+    if (GetWorkingDirectory())
+    {
+        strm.Printf("WorkingDir: %s\n", GetWorkingDirectory().GetCString());
+    }
+    if (!IsConnected())
+        return;
+
+    std::string specific_info(GetPlatformSpecificConnectionInformation());
+    
+    if (specific_info.empty() == false)
+        strm.Printf("Platform-specific connection: %s\n", specific_info.c_str());
 }
 
 
@@ -389,13 +409,333 @@ Platform::GetOSKernelDescription (std::string &s)
         return GetRemoteOSKernelDescription (s);
 }
 
+ConstString
+Platform::GetWorkingDirectory ()
+{
+    if (IsHost())
+    {
+        char cwd[PATH_MAX];
+        if (getcwd(cwd, sizeof(cwd)))
+            return ConstString(cwd);
+        else
+            return ConstString();
+    }
+    else
+    {
+        if (!m_working_dir)
+            m_working_dir = GetRemoteWorkingDirectory();
+        return m_working_dir;
+    }
+}
+
+
+struct RecurseCopyBaton
+{
+    const FileSpec& dst;
+    Platform *platform_ptr;
+    Error error;
+};
+
+
+static FileSpec::EnumerateDirectoryResult
+RecurseCopy_Callback (void *baton,
+                      FileSpec::FileType file_type,
+                      const FileSpec &src)
+{
+    RecurseCopyBaton* rc_baton = (RecurseCopyBaton*)baton;
+    switch (file_type)
+    {
+        case FileSpec::eFileTypePipe:
+        case FileSpec::eFileTypeSocket:
+            // we have no way to copy pipes and sockets - ignore them and continue
+            return FileSpec::eEnumerateDirectoryResultNext;
+            break;
+            
+        case FileSpec::eFileTypeDirectory:
+            {
+                // make the new directory and get in there
+                FileSpec dst_dir = rc_baton->dst;
+                if (!dst_dir.GetFilename())
+                    dst_dir.GetFilename() = src.GetLastPathComponent();
+                std::string dst_dir_path (dst_dir.GetPath());
+                Error error = rc_baton->platform_ptr->MakeDirectory(dst_dir_path.c_str(), lldb::eFilePermissionsDirectoryDefault);
+                if (error.Fail())
+                {
+                    rc_baton->error.SetErrorStringWithFormat("unable to setup directory %s on remote end", dst_dir_path.c_str());
+                    return FileSpec::eEnumerateDirectoryResultQuit; // got an error, bail out
+                }
+                
+                // now recurse
+                std::string src_dir_path (src.GetPath());
+                
+                // Make a filespec that only fills in the directory of a FileSpec so
+                // when we enumerate we can quickly fill in the filename for dst copies
+                FileSpec recurse_dst;
+                recurse_dst.GetDirectory().SetCString(dst_dir.GetPath().c_str());
+                RecurseCopyBaton rc_baton2 = { recurse_dst, rc_baton->platform_ptr, Error() };
+                FileSpec::EnumerateDirectory(src_dir_path.c_str(), true, true, true, RecurseCopy_Callback, &rc_baton2);
+                if (rc_baton2.error.Fail())
+                {
+                    rc_baton->error.SetErrorString(rc_baton2.error.AsCString());
+                    return FileSpec::eEnumerateDirectoryResultQuit; // got an error, bail out
+                }
+                return FileSpec::eEnumerateDirectoryResultNext;
+            }
+            break;
+            
+        case FileSpec::eFileTypeSymbolicLink:
+            {
+                // copy the file and keep going
+                FileSpec dst_file = rc_baton->dst;
+                if (!dst_file.GetFilename())
+                    dst_file.GetFilename() = src.GetFilename();
+                
+                char buf[PATH_MAX];
+                
+                rc_baton->error = Host::Readlink (src.GetPath().c_str(), buf, sizeof(buf));
+
+                if (rc_baton->error.Fail())
+                    return FileSpec::eEnumerateDirectoryResultQuit; // got an error, bail out
+                
+                rc_baton->error = rc_baton->platform_ptr->CreateSymlink(dst_file.GetPath().c_str(), buf);
+
+                if (rc_baton->error.Fail())
+                    return FileSpec::eEnumerateDirectoryResultQuit; // got an error, bail out
+
+                return FileSpec::eEnumerateDirectoryResultNext;
+            }
+            break;
+        case FileSpec::eFileTypeRegular:
+            {
+                // copy the file and keep going
+                FileSpec dst_file = rc_baton->dst;
+                if (!dst_file.GetFilename())
+                    dst_file.GetFilename() = src.GetFilename();
+                Error err = rc_baton->platform_ptr->PutFile(src, dst_file);
+                if (err.Fail())
+                {
+                    rc_baton->error.SetErrorString(err.AsCString());
+                    return FileSpec::eEnumerateDirectoryResultQuit; // got an error, bail out
+                }
+                return FileSpec::eEnumerateDirectoryResultNext;
+            }
+            break;
+            
+        case FileSpec::eFileTypeInvalid:
+        case FileSpec::eFileTypeOther:
+        case FileSpec::eFileTypeUnknown:
+            rc_baton->error.SetErrorStringWithFormat("invalid file detected during copy: %s", src.GetPath().c_str());
+            return FileSpec::eEnumerateDirectoryResultQuit; // got an error, bail out
+            break;
+    }
+}
+
+Error
+Platform::Install (const FileSpec& src, const FileSpec& dst)
+{
+    Error error;
+    
+    Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+    if (log)
+        log->Printf ("Platform::Install (src='%s', dst='%s')", src.GetPath().c_str(), dst.GetPath().c_str());
+    FileSpec fixed_dst(dst);
+    
+    if (!fixed_dst.GetFilename())
+        fixed_dst.GetFilename() = src.GetFilename();
+
+    ConstString working_dir = GetWorkingDirectory();
+
+    if (dst)
+    {
+        if (dst.GetDirectory())
+        {
+            const char first_dst_dir_char = dst.GetDirectory().GetCString()[0];
+            if (first_dst_dir_char == '/' || first_dst_dir_char  == '\\')
+            {
+                fixed_dst.GetDirectory() = dst.GetDirectory();
+            }
+            // If the fixed destination file doesn't have a directory yet,
+            // then we must have a relative path. We will resolve this relative
+            // path against the platform's working directory
+            if (!fixed_dst.GetDirectory())
+            {
+                FileSpec relative_spec;
+                std::string path;
+                if (working_dir)
+                {
+                    relative_spec.SetFile(working_dir.GetCString(), false);
+                    relative_spec.AppendPathComponent(dst.GetPath().c_str());
+                    fixed_dst.GetDirectory() = relative_spec.GetDirectory();
+                }
+                else
+                {
+                    error.SetErrorStringWithFormat("platform working directory must be valid for relative path '%s'", dst.GetPath().c_str());
+                    return error;
+                }
+            }
+        }
+        else
+        {
+            if (working_dir)
+            {
+                fixed_dst.GetDirectory() = working_dir;
+            }
+            else
+            {
+                error.SetErrorStringWithFormat("platform working directory must be valid for relative path '%s'", dst.GetPath().c_str());
+                return error;
+            }
+        }
+    }
+    else
+    {
+        if (working_dir)
+        {
+            fixed_dst.GetDirectory() = working_dir;
+        }
+        else
+        {
+            error.SetErrorStringWithFormat("platform working directory must be valid when destination directory is empty");
+            return error;
+        }
+    }
+    
+    if (log)
+        log->Printf ("Platform::Install (src='%s', dst='%s') fixed_dst='%s'", src.GetPath().c_str(), dst.GetPath().c_str(), fixed_dst.GetPath().c_str());
+
+    if (GetSupportsRSync())
+    {
+        error = PutFile(src, dst);
+    }
+    else
+    {
+        switch (src.GetFileType())
+        {
+            case FileSpec::eFileTypeDirectory:
+                {
+                    if (GetFileExists (fixed_dst))
+                        Unlink (fixed_dst.GetPath().c_str());
+                    uint32_t permissions = src.GetPermissions();
+                    if (permissions == 0)
+                        permissions = eFilePermissionsDirectoryDefault;
+                    std::string dst_dir_path(fixed_dst.GetPath());
+                    error = MakeDirectory(dst_dir_path.c_str(), permissions);
+                    if (error.Success())
+                    {
+                        // Make a filespec that only fills in the directory of a FileSpec so
+                        // when we enumerate we can quickly fill in the filename for dst copies
+                        FileSpec recurse_dst;
+                        recurse_dst.GetDirectory().SetCString(dst_dir_path.c_str());
+                        std::string src_dir_path (src.GetPath());
+                        RecurseCopyBaton baton = { recurse_dst, this, Error() };
+                        FileSpec::EnumerateDirectory(src_dir_path.c_str(), true, true, true, RecurseCopy_Callback, &baton);
+                        return baton.error;
+                    }
+                }
+                break;
+
+            case FileSpec::eFileTypeRegular:
+                if (GetFileExists (fixed_dst))
+                    Unlink (fixed_dst.GetPath().c_str());
+                error = PutFile(src, fixed_dst);
+                break;
+
+            case FileSpec::eFileTypeSymbolicLink:
+                {
+                    if (GetFileExists (fixed_dst))
+                        Unlink (fixed_dst.GetPath().c_str());
+                    char buf[PATH_MAX];
+                    error = Host::Readlink(src.GetPath().c_str(), buf, sizeof(buf));
+                    if (error.Success())
+                        error = CreateSymlink(dst.GetPath().c_str(), buf);
+                }
+                break;
+            case FileSpec::eFileTypePipe:
+                error.SetErrorString("platform install doesn't handle pipes");
+                break;
+            case FileSpec::eFileTypeSocket:
+                error.SetErrorString("platform install doesn't handle sockets");
+                break;
+            case FileSpec::eFileTypeInvalid:
+            case FileSpec::eFileTypeUnknown:
+            case FileSpec::eFileTypeOther:
+                error.SetErrorString("platform install doesn't handle non file or directory items");
+                break;
+        }
+    }
+    return error;
+}
+
+bool
+Platform::SetWorkingDirectory (const ConstString &path)
+{
+    if (IsHost())
+    {
+        Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+        if (log)
+            log->Printf("Platform::SetWorkingDirectory('%s')", path.GetCString());
+#ifdef _WIN32
+        // Not implemented on Windows
+        return false;
+#else
+        if (path)
+        {
+            if (chdir(path.GetCString()) == 0)
+                return true;
+        }
+        return false;
+#endif
+    }
+    else
+    {
+        m_working_dir.Clear();
+        return SetRemoteWorkingDirectory(path);
+    }
+}
+
+Error
+Platform::MakeDirectory (const char *path, uint32_t permissions)
+{
+    if (IsHost())
+        return Host::MakeDirectory (path, permissions);
+    else
+    {
+        Error error;
+        error.SetErrorStringWithFormat("remote platform %s doesn't support %s", GetPluginName().GetCString(), __PRETTY_FUNCTION__);
+        return error;
+    }
+}
+
+Error
+Platform::GetFilePermissions (const char *path, uint32_t &file_permissions)
+{
+    if (IsHost())
+        return Host::GetFilePermissions(path, file_permissions);
+    else
+    {
+        Error error;
+        error.SetErrorStringWithFormat("remote platform %s doesn't support %s", GetPluginName().GetCString(), __PRETTY_FUNCTION__);
+        return error;
+    }
+}
+
+Error
+Platform::SetFilePermissions (const char *path, uint32_t file_permissions)
+{
+    if (IsHost())
+        return Host::SetFilePermissions(path, file_permissions);
+    else
+    {
+        Error error;
+        error.SetErrorStringWithFormat("remote platform %s doesn't support %s", GetPluginName().GetCString(), __PRETTY_FUNCTION__);
+        return error;
+    }
+}
+
 ConstString
 Platform::GetName ()
 {
-    const char *name = GetHostname();
-    if (name == NULL || name[0] == '\0')
-        return GetPluginName();
-    return ConstString (name);
+    return GetPluginName();
 }
 
 const char *
@@ -409,6 +749,16 @@ Platform::GetHostname ()
     return m_name.c_str();
 }
 
+bool
+Platform::SetRemoteWorkingDirectory(const ConstString &path)
+{
+    Log *log = GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PLATFORM);
+    if (log)
+        log->Printf("Platform::SetRemoteWorkingDirectory('%s')", path.GetCString());
+    m_working_dir = path;
+    return true;
+}
+
 const char *
 Platform::GetUserName (uint32_t uid)
 {
@@ -649,10 +999,12 @@ Platform::LaunchProcess (ProcessLaunchInfo &launch_info)
             const bool is_localhost = true;
             const bool will_debug = launch_info.GetFlags().Test(eLaunchFlagDebug);
             const bool first_arg_is_full_shell_command = false;
+            uint32_t num_resumes = GetResumeCountForLaunchInfo (launch_info);
             if (!launch_info.ConvertArgumentsForLaunchingInShell (error,
                                                                   is_localhost,
                                                                   will_debug,
-                                                                  first_arg_is_full_shell_command))
+                                                                  first_arg_is_full_shell_command,
+                                                                  num_resumes))
                 return error;
         }
 
@@ -760,9 +1112,170 @@ Platform::IsCompatibleArchitecture (const ArchSpec &arch, bool exact_arch_match,
     if (compatible_arch_ptr)
         compatible_arch_ptr->Clear();
     return false;
-    
 }
 
+Error
+Platform::PutFile (const FileSpec& source,
+                   const FileSpec& destination,
+                   uint32_t uid,
+                   uint32_t gid)
+{
+    Error error("unimplemented");
+    return error;
+}
+
+Error
+Platform::GetFile (const FileSpec& source,
+                   const FileSpec& destination)
+{
+    Error error("unimplemented");
+    return error;
+}
+
+Error
+Platform::CreateSymlink (const char *src, // The name of the link is in src
+                         const char *dst)// The symlink points to dst
+{
+    Error error("unimplemented");
+    return error;
+}
+
+bool
+Platform::GetFileExists (const lldb_private::FileSpec& file_spec)
+{
+    return false;
+}
+
+Error
+Platform::Unlink (const char *path)
+{
+    Error error("unimplemented");
+    return error;
+}
+
+
+
+lldb_private::Error
+Platform::RunShellCommand (const char *command,           // Shouldn't be NULL
+                           const char *working_dir,       // Pass NULL to use the current working directory
+                           int *status_ptr,               // Pass NULL if you don't want the process exit status
+                           int *signo_ptr,                // Pass NULL if you don't want the signal that caused the process to exit
+                           std::string *command_output,   // Pass NULL if you don't want the command output
+                           uint32_t timeout_sec)          // Timeout in seconds to wait for shell program to finish
+{
+    if (IsHost())
+        return Host::RunShellCommand (command, working_dir, status_ptr, signo_ptr, command_output, timeout_sec);
+    else
+        return Error("unimplemented");
+}
+
+
+bool
+Platform::CalculateMD5 (const FileSpec& file_spec,
+                        uint64_t &low,
+                        uint64_t &high)
+{
+    if (IsHost())
+        return Host::CalculateMD5(file_spec, low, high);
+    else
+        return false;
+}
+
+void
+Platform::SetLocalCacheDirectory (const char* local)
+{
+    m_local_cache_directory.assign(local);
+}
+
+const char*
+Platform::GetLocalCacheDirectory ()
+{
+    return m_local_cache_directory.c_str();
+}
+
+static OptionDefinition
+g_rsync_option_table[] =
+{
+    {   LLDB_OPT_SET_ALL, false, "rsync"                  , 'r', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Enable rsync." },
+    {   LLDB_OPT_SET_ALL, false, "rsync-opts"             , 'R', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCommandName  , "Platform-specific options required for rsync to work." },
+    {   LLDB_OPT_SET_ALL, false, "rsync-prefix"           , 'P', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCommandName  , "Platform-specific rsync prefix put before the remote path." },
+    {   LLDB_OPT_SET_ALL, false, "ignore-remote-hostname" , 'i', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Do not automatically fill in the remote hostname when composing the rsync command." },
+};
+
+static OptionDefinition
+g_ssh_option_table[] =
+{
+    {   LLDB_OPT_SET_ALL, false, "ssh"                    , 's', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone         , "Enable SSH." },
+    {   LLDB_OPT_SET_ALL, false, "ssh-opts"               , 'S', OptionParser::eRequiredArgument, NULL, 0, eArgTypeCommandName  , "Platform-specific options required for SSH to work." },
+};
+
+static OptionDefinition
+g_caching_option_table[] =
+{
+    {   LLDB_OPT_SET_ALL, false, "local-cache-dir"        , 'c', OptionParser::eRequiredArgument, NULL, 0, eArgTypePath         , "Path in which to store local copies of files." },
+};
+
+OptionGroupPlatformRSync::OptionGroupPlatformRSync ()
+{
+}
+
+OptionGroupPlatformRSync::~OptionGroupPlatformRSync ()
+{
+}
+
+const lldb_private::OptionDefinition*
+OptionGroupPlatformRSync::GetDefinitions ()
+{
+    return g_rsync_option_table;
+}
+
+void
+OptionGroupPlatformRSync::OptionParsingStarting (CommandInterpreter &interpreter)
+{
+    m_rsync = false;
+    m_rsync_opts.clear();
+    m_rsync_prefix.clear();
+    m_ignores_remote_hostname = false;
+}
+
+lldb_private::Error
+OptionGroupPlatformRSync::SetOptionValue (CommandInterpreter &interpreter,
+                uint32_t option_idx,
+                const char *option_arg)
+{
+    Error error;
+    char short_option = (char) GetDefinitions()[option_idx].short_option;
+    switch (short_option)
+    {
+        case 'r':
+            m_rsync = true;
+            break;
+            
+        case 'R':
+            m_rsync_opts.assign(option_arg);
+            break;
+            
+        case 'P':
+            m_rsync_prefix.assign(option_arg);
+            break;
+            
+        case 'i':
+            m_ignores_remote_hostname = true;
+            break;
+            
+        default:
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
+            break;
+    }
+    
+    return error;
+}
+
+uint32_t
+OptionGroupPlatformRSync::GetNumDefinitions ()
+{
+    return llvm::array_lengthof(g_rsync_option_table);
+}
 
 lldb::BreakpointSP
 Platform::SetThreadCreationBreakpoint (lldb_private::Target &target)
@@ -770,10 +1283,108 @@ Platform::SetThreadCreationBreakpoint (lldb_private::Target &target)
     return lldb::BreakpointSP();
 }
 
+OptionGroupPlatformSSH::OptionGroupPlatformSSH ()
+{
+}
+
+OptionGroupPlatformSSH::~OptionGroupPlatformSSH ()
+{
+}
+
+const lldb_private::OptionDefinition*
+OptionGroupPlatformSSH::GetDefinitions ()
+{
+    return g_ssh_option_table;
+}
+
+void
+OptionGroupPlatformSSH::OptionParsingStarting (CommandInterpreter &interpreter)
+{
+    m_ssh = false;
+    m_ssh_opts.clear();
+}
+
+lldb_private::Error
+OptionGroupPlatformSSH::SetOptionValue (CommandInterpreter &interpreter,
+                                          uint32_t option_idx,
+                                          const char *option_arg)
+{
+    Error error;
+    char short_option = (char) GetDefinitions()[option_idx].short_option;
+    switch (short_option)
+    {
+        case 's':
+            m_ssh = true;
+            break;
+            
+        case 'S':
+            m_ssh_opts.assign(option_arg);
+            break;
+            
+        default:
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
+            break;
+    }
+    
+    return error;
+}
+
+uint32_t
+OptionGroupPlatformSSH::GetNumDefinitions ()
+{
+    return llvm::array_lengthof(g_ssh_option_table);
+}
+
+OptionGroupPlatformCaching::OptionGroupPlatformCaching ()
+{
+}
+
+OptionGroupPlatformCaching::~OptionGroupPlatformCaching ()
+{
+}
+
+const lldb_private::OptionDefinition*
+OptionGroupPlatformCaching::GetDefinitions ()
+{
+    return g_caching_option_table;
+}
+
+void
+OptionGroupPlatformCaching::OptionParsingStarting (CommandInterpreter &interpreter)
+{
+    m_cache_dir.clear();
+}
+
+lldb_private::Error
+OptionGroupPlatformCaching::SetOptionValue (CommandInterpreter &interpreter,
+                                        uint32_t option_idx,
+                                        const char *option_arg)
+{
+    Error error;
+    char short_option = (char) GetDefinitions()[option_idx].short_option;
+    switch (short_option)
+    {
+        case 'c':
+            m_cache_dir.assign(option_arg);
+            break;
+            
+        default:
+            error.SetErrorStringWithFormat ("unrecognized option '%c'", short_option);
+            break;
+    }
+    
+    return error;
+}
+
+uint32_t
+OptionGroupPlatformCaching::GetNumDefinitions ()
+{
+    return llvm::array_lengthof(g_caching_option_table);
+}
+
 size_t
 Platform::GetEnvironment (StringList &environment)
 {
     environment.Clear();
     return false;
 }
-
diff --git a/contrib/llvm/tools/lldb/source/Target/Process.cpp b/contrib/llvm/tools/lldb/source/Target/Process.cpp
index 6edb9390d99..1de322aee14 100644
--- a/contrib/llvm/tools/lldb/source/Target/Process.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/Process.cpp
@@ -35,12 +35,17 @@
 #include "lldb/Target/Platform.h"
 #include "lldb/Target/RegisterContext.h"
 #include "lldb/Target/StopInfo.h"
+#include "lldb/Target/SystemRuntime.h"
 #include "lldb/Target/Target.h"
 #include "lldb/Target/TargetList.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/ThreadPlan.h"
 #include "lldb/Target/ThreadPlanBase.h"
 
+#ifndef LLDB_DISABLE_POSIX
+#include <spawn.h>
+#endif
+
 using namespace lldb;
 using namespace lldb_private;
 
@@ -485,7 +490,8 @@ bool
 ProcessLaunchInfo::ConvertArgumentsForLaunchingInShell (Error &error,
                                                         bool localhost,
                                                         bool will_debug,
-                                                        bool first_arg_is_full_shell_command)
+                                                        bool first_arg_is_full_shell_command,
+                                                        int32_t num_resumes)
 {
     error.Clear();
 
@@ -567,14 +573,14 @@ ProcessLaunchInfo::ConvertArgumentsForLaunchingInShell (Error &error,
                     // 1 - stop in shell
                     // 2 - stop in /usr/bin/arch
                     // 3 - then we will stop in our program
-                    SetResumeCount(2);
+                    SetResumeCount(num_resumes + 1);
                 }
                 else
                 {
                     // Set the resume count to 1:
                     // 1 - stop in shell
                     // 2 - then we will stop in our program
-                    SetResumeCount(1);
+                    SetResumeCount(num_resumes);
                 }
             }
         
@@ -663,8 +669,9 @@ ProcessLaunchInfo::FileAction::Duplicate (int fd, int dup_fd)
 
 
 
+#ifndef LLDB_DISABLE_POSIX
 bool
-ProcessLaunchInfo::FileAction::AddPosixSpawnFileAction (posix_spawn_file_actions_t *file_actions,
+ProcessLaunchInfo::FileAction::AddPosixSpawnFileAction (void *_file_actions,
                                                         const FileAction *info,
                                                         Log *log, 
                                                         Error& error)
@@ -672,6 +679,8 @@ ProcessLaunchInfo::FileAction::AddPosixSpawnFileAction (posix_spawn_file_actions
     if (info == NULL)
         return false;
 
+    posix_spawn_file_actions_t *file_actions = reinterpret_cast<posix_spawn_file_actions_t *>(_file_actions);
+
     switch (info->m_action)
     {
         case eFileActionNone:
@@ -733,6 +742,7 @@ ProcessLaunchInfo::FileAction::AddPosixSpawnFileAction (posix_spawn_file_actions
     }
     return error.Success();
 }
+#endif
 
 Error
 ProcessLaunchCommandOptions::SetOptionValue (uint32_t option_idx, const char *option_arg)
@@ -808,7 +818,7 @@ ProcessLaunchCommandOptions::SetOptionValue (uint32_t option_idx, const char *op
             if (option_arg && option_arg[0])
                 launch_info.SetShell (option_arg);
             else
-                launch_info.SetShell ("/bin/bash");
+                launch_info.SetShell (LLDB_DEFAULT_SHELL);
             break;
             
         case 'v':
@@ -826,21 +836,21 @@ ProcessLaunchCommandOptions::SetOptionValue (uint32_t option_idx, const char *op
 OptionDefinition
 ProcessLaunchCommandOptions::g_option_table[] =
 {
-{ LLDB_OPT_SET_ALL, false, "stop-at-entry", 's', no_argument,       NULL, 0, eArgTypeNone,          "Stop at the entry point of the program when launching a process."},
-{ LLDB_OPT_SET_ALL, false, "disable-aslr",  'A', no_argument,       NULL, 0, eArgTypeNone,          "Disable address space layout randomization when launching a process."},
-{ LLDB_OPT_SET_ALL, false, "plugin",        'p', required_argument, NULL, 0, eArgTypePlugin,        "Name of the process plugin you want to use."},
-{ LLDB_OPT_SET_ALL, false, "working-dir",   'w', required_argument, NULL, 0, eArgTypeDirectoryName,          "Set the current working directory to <path> when running the inferior."},
-{ LLDB_OPT_SET_ALL, false, "arch",          'a', required_argument, NULL, 0, eArgTypeArchitecture,  "Set the architecture for the process to launch when ambiguous."},
-{ LLDB_OPT_SET_ALL, false, "environment",   'v', required_argument, NULL, 0, eArgTypeNone,          "Specify an environment variable name/value stirng (--environement NAME=VALUE). Can be specified multiple times for subsequent environment entries."},
-{ LLDB_OPT_SET_ALL, false, "shell",         'c', optional_argument, NULL, 0, eArgTypeFilename,          "Run the process in a shell (not supported on all platforms)."},
+{ LLDB_OPT_SET_ALL, false, "stop-at-entry", 's', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,          "Stop at the entry point of the program when launching a process."},
+{ LLDB_OPT_SET_ALL, false, "disable-aslr",  'A', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,          "Disable address space layout randomization when launching a process."},
+{ LLDB_OPT_SET_ALL, false, "plugin",        'p', OptionParser::eRequiredArgument, NULL, 0, eArgTypePlugin,        "Name of the process plugin you want to use."},
+{ LLDB_OPT_SET_ALL, false, "working-dir",   'w', OptionParser::eRequiredArgument, NULL, 0, eArgTypeDirectoryName,          "Set the current working directory to <path> when running the inferior."},
+{ LLDB_OPT_SET_ALL, false, "arch",          'a', OptionParser::eRequiredArgument, NULL, 0, eArgTypeArchitecture,  "Set the architecture for the process to launch when ambiguous."},
+{ LLDB_OPT_SET_ALL, false, "environment",   'v', OptionParser::eRequiredArgument, NULL, 0, eArgTypeNone,          "Specify an environment variable name/value string (--environment NAME=VALUE). Can be specified multiple times for subsequent environment entries."},
+{ LLDB_OPT_SET_ALL, false, "shell",         'c', OptionParser::eOptionalArgument, NULL, 0, eArgTypeFilename,          "Run the process in a shell (not supported on all platforms)."},
 
-{ LLDB_OPT_SET_1  , false, "stdin",         'i', required_argument, NULL, 0, eArgTypeFilename,    "Redirect stdin for the process to <filename>."},
-{ LLDB_OPT_SET_1  , false, "stdout",        'o', required_argument, NULL, 0, eArgTypeFilename,    "Redirect stdout for the process to <filename>."},
-{ LLDB_OPT_SET_1  , false, "stderr",        'e', required_argument, NULL, 0, eArgTypeFilename,    "Redirect stderr for the process to <filename>."},
+{ LLDB_OPT_SET_1  , false, "stdin",         'i', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFilename,    "Redirect stdin for the process to <filename>."},
+{ LLDB_OPT_SET_1  , false, "stdout",        'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFilename,    "Redirect stdout for the process to <filename>."},
+{ LLDB_OPT_SET_1  , false, "stderr",        'e', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFilename,    "Redirect stderr for the process to <filename>."},
 
-{ LLDB_OPT_SET_2  , false, "tty",           't', no_argument,       NULL, 0, eArgTypeNone,    "Start the process in a terminal (not supported on all platforms)."},
+{ LLDB_OPT_SET_2  , false, "tty",           't', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,    "Start the process in a terminal (not supported on all platforms)."},
 
-{ LLDB_OPT_SET_3  , false, "no-stdio",      'n', no_argument,       NULL, 0, eArgTypeNone,    "Do not set up for terminal I/O to go to running process."},
+{ LLDB_OPT_SET_3  , false, "no-stdio",      'n', OptionParser::eNoArgument,       NULL, 0, eArgTypeNone,    "Do not set up for terminal I/O to go to running process."},
 
 { 0               , false, NULL,             0,  0,                 NULL, 0, eArgTypeNone,    NULL }
 };
@@ -1013,6 +1023,8 @@ Process::Process(Target &target, Listener &listener) :
     m_thread_mutex (Mutex::eMutexTypeRecursive),
     m_thread_list_real (this),
     m_thread_list (this),
+    m_extended_thread_list (this),
+    m_extended_thread_stop_id (0),
     m_notifications (),
     m_image_tokens (),
     m_listener (listener),
@@ -1134,9 +1146,11 @@ Process::Finalize()
     m_dynamic_checkers_ap.reset();
     m_abi_sp.reset();
     m_os_ap.reset();
+    m_system_runtime_ap.reset();
     m_dyld_ap.reset();
     m_thread_list_real.Destroy();
     m_thread_list.Destroy();
+    m_extended_thread_list.Destroy();
     std::vector<Notifications> empty_notifications;
     m_notifications.swap(empty_notifications);
     m_image_tokens.clear();
@@ -1221,7 +1235,7 @@ Process::GetNextEvent (EventSP &event_sp)
 
 
 StateType
-Process::WaitForProcessToStop (const TimeValue *timeout, lldb::EventSP *event_sp_ptr)
+Process::WaitForProcessToStop (const TimeValue *timeout, lldb::EventSP *event_sp_ptr, bool wait_always)
 {
     // We can't just wait for a "stopped" event, because the stopped event may have restarted the target.
     // We have to actually check each event, and in the case of a stopped event check the restarted flag
@@ -1234,6 +1248,19 @@ Process::WaitForProcessToStop (const TimeValue *timeout, lldb::EventSP *event_sp
     if (state == eStateDetached || state == eStateExited)
         return state;
 
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS));
+    if (log)
+        log->Printf ("Process::%s (timeout = %p)", __FUNCTION__, timeout);
+
+    if (!wait_always &&
+        StateIsStoppedState(state, true) &&
+        StateIsStoppedState(GetPrivateState(), true)) {
+        if (log)
+            log->Printf("Process::%s returning without waiting for events; process private and public states are already 'stopped'.",
+                        __FUNCTION__);
+        return state;
+    }
+
     while (state != eStateInvalid)
     {
         EventSP event_sp;
@@ -1567,6 +1594,13 @@ Process::UpdateThreadListIfNeeded ()
                 m_thread_list_real.Update(real_thread_list);
                 m_thread_list.Update (new_thread_list);
                 m_thread_list.SetStopID (stop_id);
+
+                if (GetLastNaturalStopID () != m_extended_thread_stop_id)
+                {
+                    // Clear any extended threads that we may have accumulated previously
+                    m_extended_thread_list.Clear();
+                    m_extended_thread_stop_id = GetLastNaturalStopID ();
+                }
             }
         }
     }
@@ -1792,35 +1826,36 @@ Process::LoadImage (const FileSpec &image_spec, Error &error)
             {
                 ExecutionContext exe_ctx;
                 frame_sp->CalculateExecutionContext (exe_ctx);
-                const bool unwind_on_error = true;
-                const bool ignore_breakpoints = true;
+                EvaluateExpressionOptions expr_options;
+                expr_options.SetUnwindOnError(true);
+                expr_options.SetIgnoreBreakpoints(true);
+                expr_options.SetExecutionPolicy(eExecutionPolicyAlways);
                 StreamString expr;
                 expr.Printf("dlopen (\"%s\", 2)", path);
                 const char *prefix = "extern \"C\" void* dlopen (const char *path, int mode);\n";
                 lldb::ValueObjectSP result_valobj_sp;
+                Error expr_error;
                 ClangUserExpression::Evaluate (exe_ctx,
-                                               eExecutionPolicyAlways,
-                                               lldb::eLanguageTypeUnknown,
-                                               ClangUserExpression::eResultTypeAny,
-                                               unwind_on_error,
-                                               ignore_breakpoints,
+                                               expr_options,
                                                expr.GetData(),
                                                prefix,
                                                result_valobj_sp,
-                                               true,
-                                               ClangUserExpression::kDefaultTimeout);
-                error = result_valobj_sp->GetError();
-                if (error.Success())
+                                               expr_error);
+                if (expr_error.Success())
                 {
-                    Scalar scalar;
-                    if (result_valobj_sp->ResolveValue (scalar))
+                    error = result_valobj_sp->GetError();
+                    if (error.Success())
                     {
-                        addr_t image_ptr = scalar.ULongLong(LLDB_INVALID_ADDRESS);
-                        if (image_ptr != 0 && image_ptr != LLDB_INVALID_ADDRESS)
+                        Scalar scalar;
+                        if (result_valobj_sp->ResolveValue (scalar))
                         {
-                            uint32_t image_token = m_image_tokens.size();
-                            m_image_tokens.push_back (image_ptr);
-                            return image_token;
+                            addr_t image_ptr = scalar.ULongLong(LLDB_INVALID_ADDRESS);
+                            if (image_ptr != 0 && image_ptr != LLDB_INVALID_ADDRESS)
+                            {
+                                uint32_t image_token = m_image_tokens.size();
+                                m_image_tokens.push_back (image_ptr);
+                                return image_token;
+                            }
                         }
                     }
                 }
@@ -1869,23 +1904,21 @@ Process::UnloadImage (uint32_t image_token)
                     {
                         ExecutionContext exe_ctx;
                         frame_sp->CalculateExecutionContext (exe_ctx);
-                        const bool unwind_on_error = true;
-                        const bool ignore_breakpoints = true;
+                        EvaluateExpressionOptions expr_options;
+                        expr_options.SetUnwindOnError(true);
+                        expr_options.SetIgnoreBreakpoints(true);
+                        expr_options.SetExecutionPolicy(eExecutionPolicyAlways);
                         StreamString expr;
                         expr.Printf("dlclose ((void *)0x%" PRIx64 ")", image_addr);
                         const char *prefix = "extern \"C\" int dlclose(void* handle);\n";
                         lldb::ValueObjectSP result_valobj_sp;
+                        Error expr_error;
                         ClangUserExpression::Evaluate (exe_ctx,
-                                                       eExecutionPolicyAlways,
-                                                       lldb::eLanguageTypeUnknown,
-                                                       ClangUserExpression::eResultTypeAny,
-                                                       unwind_on_error,
-                                                       ignore_breakpoints,
+                                                       expr_options,
                                                        expr.GetData(),
                                                        prefix,
                                                        result_valobj_sp,
-                                                       true,
-                                                       ClangUserExpression::kDefaultTimeout);
+                                                       expr_error);
                         if (result_valobj_sp->GetError().Success())
                         {
                             Scalar scalar;
@@ -2072,11 +2105,46 @@ Process::CreateBreakpointSite (const BreakpointLocationSP &owner, bool use_hardw
             bp_site_sp.reset (new BreakpointSite (&m_breakpoint_site_list, owner, load_addr, use_hardware));
             if (bp_site_sp)
             {
-                if (EnableBreakpointSite (bp_site_sp.get()).Success())
+                Error error = EnableBreakpointSite (bp_site_sp.get());
+                if (error.Success())
                 {
                     owner->SetBreakpointSite (bp_site_sp);
                     return m_breakpoint_site_list.Add (bp_site_sp);
                 }
+                else
+                {
+                    bool show_error = true;
+                    switch (GetState())
+                    {
+                        case eStateInvalid:
+                        case eStateUnloaded:
+                        case eStateConnected:
+                        case eStateAttaching:
+                        case eStateLaunching:
+                        case eStateDetached:
+                        case eStateExited:
+                            show_error = false;
+                            break;
+                            
+                        case eStateStopped:
+                        case eStateRunning:
+                        case eStateStepping:
+                        case eStateCrashed:
+                        case eStateSuspended:
+                            show_error = IsAlive();
+                            break;
+                    }
+                    
+                    if (show_error)
+                    {
+                        // Report error for setting breakpoint...
+                        m_target.GetDebugger().GetErrorFile().Printf ("warning: failed to set breakpoint site at 0x%" PRIx64 " for breakpoint %i.%i: %s\n",
+                                                                      load_addr,
+                                                                      owner->GetBreakpoint().GetID(),
+                                                                      owner->GetID(),
+                                                                      error.AsCString() ? error.AsCString() : "unkown error");
+                    }
+                }
             }
         }
     }
@@ -2317,6 +2385,7 @@ Process::DisableSoftwareBreakpoint (BreakpointSite *bp_site)
 size_t
 Process::ReadMemory (addr_t addr, void *buf, size_t size, Error &error)
 {
+    error.Clear();
     if (!GetDisableMemoryCache())
     {        
 #if defined (VERIFY_MEMORY_READS)
@@ -2722,8 +2791,8 @@ Process::AllocateMemory(size_t size, uint32_t permissions, Error &error)
     addr_t allocated_addr = DoAllocateMemory (size, permissions, error);
     Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_PROCESS));
     if (log)
-        log->Printf("Process::AllocateMemory(size=%4zu, permissions=%s) => 0x%16.16" PRIx64 " (m_stop_id = %u m_memory_id = %u)",
-                    size, 
+        log->Printf("Process::AllocateMemory(size=%" PRIu64 ", permissions=%s) => 0x%16.16" PRIx64 " (m_stop_id = %u m_memory_id = %u)",
+                    (uint64_t)size,
                     GetPermissionsAsCString (permissions),
                     (uint64_t)allocated_addr,
                     m_mod_id.GetStopID(),
@@ -2840,11 +2909,12 @@ Process::WaitForProcessStopPrivate (const TimeValue *timeout, EventSP &event_sp)
 }
 
 Error
-Process::Launch (const ProcessLaunchInfo &launch_info)
+Process::Launch (ProcessLaunchInfo &launch_info)
 {
     Error error;
     m_abi_sp.reset();
     m_dyld_ap.reset();
+    m_system_runtime_ap.reset();
     m_os_ap.reset();
     m_process_input_reader.reset();
 
@@ -2857,6 +2927,13 @@ Process::Launch (const ProcessLaunchInfo &launch_info)
         exe_module->GetPlatformFileSpec().GetPath(platform_exec_file_path, sizeof(platform_exec_file_path));
         if (exe_module->GetFileSpec().Exists())
         {
+            // Install anything that might need to be installed prior to launching.
+            // For host systems, this will do nothing, but if we are connected to a
+            // remote platform it will install any needed binaries
+            error = GetTarget().Install(&launch_info);
+            if (error.Fail())
+                return error;
+
             if (PrivateStateThreadIsValid ())
                 PausePrivateStateThread ();
     
@@ -2913,6 +2990,10 @@ Process::Launch (const ProcessLaunchInfo &launch_info)
                         if (dyld)
                             dyld->DidLaunch();
 
+                        SystemRuntime *system_runtime = GetSystemRuntime ();
+                        if (system_runtime)
+                            system_runtime->DidLaunch();
+
                         m_os_ap.reset (OperatingSystem::FindPlugin (this, NULL));
                         // This delays passing the stopped event to listeners till DidLaunch gets
                         // a chance to complete...
@@ -2956,6 +3037,10 @@ Process::LoadCore ()
         if (dyld)
             dyld->DidAttach();
         
+        SystemRuntime *system_runtime = GetSystemRuntime ();
+        if (system_runtime)
+            system_runtime->DidAttach();
+
         m_os_ap.reset (OperatingSystem::FindPlugin (this, NULL));
         // We successfully loaded a core file, now pretend we stopped so we can
         // show all of the threads in the core file and explore the crashed
@@ -2974,6 +3059,14 @@ Process::GetDynamicLoader ()
     return m_dyld_ap.get();
 }
 
+SystemRuntime *
+Process::GetSystemRuntime ()
+{
+    if (m_system_runtime_ap.get() == NULL)
+        m_system_runtime_ap.reset (SystemRuntime::FindPlugin(this));
+    return m_system_runtime_ap.get();
+}
+
 
 Process::NextEventAction::EventActionResult
 Process::AttachCompletionHandler::PerformAction (lldb::EventSP &event_sp)
@@ -3036,6 +3129,7 @@ Process::Attach (ProcessAttachInfo &attach_info)
     m_abi_sp.reset();
     m_process_input_reader.reset();
     m_dyld_ap.reset();
+    m_system_runtime_ap.reset();
     m_os_ap.reset();
     
     lldb::pid_t attach_pid = attach_info.GetProcessID();
@@ -3208,6 +3302,10 @@ Process::CompleteAttach ()
     if (dyld)
         dyld->DidAttach();
 
+    SystemRuntime *system_runtime = GetSystemRuntime ();
+    if (system_runtime)
+        system_runtime->DidAttach();
+
     m_os_ap.reset (OperatingSystem::FindPlugin (this, NULL));
     // Figure out which one is the executable, and set that in our target:
     const ModuleList &target_modules = m_target.GetImages();
@@ -3968,15 +4066,15 @@ Process::HandlePrivateEvent (EventSP &event_sp)
     m_currently_handling_event.SetValue(false, eBroadcastAlways);
 }
 
-void *
+thread_result_t
 Process::PrivateStateThread (void *arg)
 {
     Process *proc = static_cast<Process*> (arg);
-    void *result = proc->RunPrivateStateThread ();
+    thread_result_t result = proc->RunPrivateStateThread();
     return result;
 }
 
-void *
+thread_result_t
 Process::RunPrivateStateThread ()
 {
     bool control_only = true;
@@ -4642,11 +4740,7 @@ Process::SettingsTerminate ()
 ExecutionResults
 Process::RunThreadPlan (ExecutionContext &exe_ctx,
                         lldb::ThreadPlanSP &thread_plan_sp,
-                        bool stop_others,
-                        bool run_others,
-                        bool unwind_on_error,
-                        bool ignore_breakpoints,
-                        uint32_t timeout_usec,
+                        const EvaluateExpressionOptions &options,
                         Stream &errors)
 {
     ExecutionResults return_value = eExecutionSetupError;
@@ -4757,6 +4851,17 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
     
     thread->QueueThreadPlan(thread_plan_sp, false); // This used to pass "true" does that make sense?
     
+    if (options.GetDebug())
+    {
+        // In this case, we aren't actually going to run, we just want to stop right away.
+        // Flush this thread so we will refetch the stacks and show the correct backtrace.
+        // FIXME: To make this prettier we should invent some stop reason for this, but that
+        // is only cosmetic, and this functionality is only of use to lldb developers who can
+        // live with not pretty...
+        thread->Flush();
+        return eExecutionStoppedForDebug;
+    }
+    
     Listener listener("lldb.process.listener.run-thread-plan");
     
     lldb::EventSP event_to_broadcast_sp;
@@ -4798,11 +4903,12 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
         TimeValue one_thread_timeout = TimeValue::Now();
         TimeValue final_timeout = one_thread_timeout;
         
-        if (run_others)
+        uint32_t timeout_usec = options.GetTimeoutUsec();
+        if (options.GetTryAllThreads())
         {
             // If we are running all threads then we take half the time to run all threads, bounded by
             // .25 sec.
-            if (timeout_usec == 0)
+            if (options.GetTimeoutUsec() == 0)
                 one_thread_timeout.OffsetWithMicroSeconds(default_one_thread_timeout_usec);
             else
             {
@@ -4914,7 +5020,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
                         
             if (before_first_timeout)
             {
-                if (run_others)
+                if (options.GetTryAllThreads())
                     timeout_ptr = &one_thread_timeout;
                 else
                 {
@@ -5030,7 +5136,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
                                                 if (log)
                                                     log->Printf ("Process::RunThreadPlan() stopped for breakpoint: %s.", stop_info_sp->GetDescription());
                                                 return_value = eExecutionHitBreakpoint;
-                                                if (!ignore_breakpoints)
+                                                if (!options.DoesIgnoreBreakpoints())
                                                 {
                                                     event_to_broadcast_sp = event_sp;
                                                 }
@@ -5039,7 +5145,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
                                             {
                                                 if (log)
                                                     log->PutCString ("Process::RunThreadPlan(): thread plan didn't successfully complete.");
-                                                if (!unwind_on_error)
+                                                if (!options.DoesUnwindOnError())
                                                     event_to_broadcast_sp = event_sp;
                                                 return_value = eExecutionInterrupted;
                                             }
@@ -5090,20 +5196,20 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
                 // either exit, or try with all threads running for the same timeout.
                 
                 if (log) {
-                    if (run_others)
+                    if (options.GetTryAllThreads())
                     {
                         uint64_t remaining_time = final_timeout - TimeValue::Now();
                         if (before_first_timeout)
                             log->Printf ("Process::RunThreadPlan(): Running function with one thread timeout timed out, "
-                                         "running till  for %" PRId64 " usec with all threads enabled.",
+                                         "running till  for %" PRIu64 " usec with all threads enabled.",
                                          remaining_time);
                         else
                             log->Printf ("Process::RunThreadPlan(): Restarting function with all threads enabled "
-                                         "and timeout: %d timed out, abandoning execution.",
+                                         "and timeout: %u timed out, abandoning execution.",
                                          timeout_usec);
                     }
                     else
-                        log->Printf ("Process::RunThreadPlan(): Running function with timeout: %d timed out, "
+                        log->Printf ("Process::RunThreadPlan(): Running function with timeout: %u timed out, "
                                      "abandoning execution.", 
                                      timeout_usec);
                 }
@@ -5173,7 +5279,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
                                     continue;
                                 }
 
-                                if (!run_others)
+                                if (!options.GetTryAllThreads())
                                 {
                                     if (log)
                                         log->PutCString ("Process::RunThreadPlan(): try_all_threads was false, we stopped so now we're quitting.");
@@ -5246,8 +5352,8 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
         // 1) The execution successfully completed
         // 2) We hit a breakpoint, and ignore_breakpoints was true
         // 3) We got some other error, and discard_on_error was true
-        bool should_unwind = (return_value == eExecutionInterrupted && unwind_on_error)
-                             || (return_value == eExecutionHitBreakpoint && ignore_breakpoints);
+        bool should_unwind = (return_value == eExecutionInterrupted && options.DoesUnwindOnError())
+                             || (return_value == eExecutionHitBreakpoint && options.DoesIgnoreBreakpoints());
         
         if (return_value == eExecutionCompleted
             || should_unwind)
@@ -5349,7 +5455,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
                     log->Printf("Process::RunThreadPlan(): execution interrupted: %s", s.GetData());
             }
             
-            if (should_unwind && thread_plan_sp)
+            if (should_unwind)
             {
                 if (log)
                     log->Printf ("Process::RunThreadPlan: ExecutionInterrupted - discarding thread plans up to %p.", thread_plan_sp.get());
@@ -5367,7 +5473,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
             if (log)
                 log->PutCString("Process::RunThreadPlan(): execution set up error.");
                 
-            if (unwind_on_error && thread_plan_sp)
+            if (options.DoesUnwindOnError())
             {
                 thread->DiscardThreadPlansUpToPlan (thread_plan_sp);
                 thread_plan_sp->SetPrivate (orig_plan_private);
@@ -5391,7 +5497,7 @@ Process::RunThreadPlan (ExecutionContext &exe_ctx,
             {
                 if (log)
                     log->PutCString("Process::RunThreadPlan(): thread plan stopped in mid course");
-                if (unwind_on_error && thread_plan_sp)
+                if (options.DoesUnwindOnError() && thread_plan_sp)
                 {
                     if (log)
                         log->PutCString("Process::RunThreadPlan(): discarding thread plan 'cause unwind_on_error is set.");
@@ -5463,6 +5569,9 @@ Process::ExecutionResultAsCString (ExecutionResults result)
         case eExecutionTimedOut:
             result_name = "eExecutionTimedOut";
             break;
+        case eExecutionStoppedForDebug:
+            result_name = "eExecutionStoppedForDebug";
+            break;
     }
     return result_name;
 }
@@ -5578,11 +5687,10 @@ Process::DidExec ()
 {
     Target &target = GetTarget();
     target.CleanupProcess ();
-    ModuleList unloaded_modules (target.GetImages());
-    target.ModulesDidUnload (unloaded_modules);
-    target.GetSectionLoadList().Clear();
+    target.ClearModules(false);
     m_dynamic_checkers_ap.reset();
     m_abi_sp.reset();
+    m_system_runtime_ap.reset();
     m_os_ap.reset();
     m_dyld_ap.reset();
     m_image_tokens.clear();
@@ -5592,4 +5700,12 @@ Process::DidExec ()
     m_memory_cache.Clear(true);
     DoDidExec();
     CompleteAttach ();
+    // Flush the process (threads and all stack frames) after running CompleteAttach()
+    // in case the dynamic loader loaded things in new locations.
+    Flush();
+    
+    // After we figure out what was loaded/unloaded in CompleteAttach,
+    // we need to let the target know so it can do any cleanup it needs to.
+    target.DidExec();
 }
+
diff --git a/contrib/llvm/tools/lldb/source/Target/RegisterContext.cpp b/contrib/llvm/tools/lldb/source/Target/RegisterContext.cpp
index 0d89db724ab..93dce3ea0ed 100644
--- a/contrib/llvm/tools/lldb/source/Target/RegisterContext.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/RegisterContext.cpp
@@ -81,6 +81,15 @@ RegisterContext::GetRegisterInfoByName (const char *reg_name, uint32_t start_idx
     return NULL;
 }
 
+const RegisterInfo *
+RegisterContext::GetRegisterInfo (uint32_t kind, uint32_t num)
+{
+    const uint32_t reg_num = ConvertRegisterKindToRegisterNumber(kind, num);
+    if (reg_num == LLDB_INVALID_REGNUM)
+        return NULL;
+    return GetRegisterInfoAtIndex (reg_num);
+}
+
 const char *
 RegisterContext::GetRegisterName (uint32_t reg)
 {
@@ -113,6 +122,19 @@ RegisterContext::SetPC(uint64_t pc)
     return success;
 }
 
+bool
+RegisterContext::SetPC(Address addr)
+{
+    TargetSP target_sp = m_thread.CalculateTarget();
+    Target *target = target_sp.get();
+
+    lldb::addr_t callAddr = addr.GetCallableLoadAddress (target);
+    if (callAddr == LLDB_INVALID_ADDRESS)
+        return false;
+
+    return SetPC (callAddr);
+}
+
 uint64_t
 RegisterContext::GetSP(uint64_t fail_value)
 {
@@ -418,6 +440,18 @@ RegisterContext::WriteRegisterValueToMemory (const RegisterInfo *reg_info,
 
 }
 
+bool
+RegisterContext::ReadAllRegisterValues (lldb_private::RegisterCheckpoint &reg_checkpoint)
+{
+    return ReadAllRegisterValues(reg_checkpoint.GetData());
+}
+
+bool
+RegisterContext::WriteAllRegisterValues (const lldb_private::RegisterCheckpoint &reg_checkpoint)
+{
+    return WriteAllRegisterValues(reg_checkpoint.GetData());
+}
+
 TargetSP
 RegisterContext::CalculateTarget ()
 {
diff --git a/contrib/llvm/tools/lldb/source/Target/StackFrame.cpp b/contrib/llvm/tools/lldb/source/Target/StackFrame.cpp
index 3c4c43d9f44..a936a57d048 100644
--- a/contrib/llvm/tools/lldb/source/Target/StackFrame.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/StackFrame.cpp
@@ -48,7 +48,11 @@ StackFrame::StackFrame (const ThreadSP &thread_sp,
                         user_id_t frame_idx, 
                         user_id_t unwind_frame_index, 
                         addr_t cfa, 
+                        bool cfa_is_valid,
                         addr_t pc, 
+                        uint32_t stop_id,
+                        bool stop_id_is_valid,
+                        bool is_history_frame,
                         const SymbolContext *sc_ptr) :
     m_thread_wp (thread_sp),
     m_frame_index (frame_idx),
@@ -60,10 +64,21 @@ StackFrame::StackFrame (const ThreadSP &thread_sp,
     m_flags (),
     m_frame_base (),
     m_frame_base_error (),
+    m_cfa_is_valid (cfa_is_valid),
+    m_stop_id  (stop_id),
+    m_stop_id_is_valid (stop_id_is_valid),
+    m_is_history_frame (is_history_frame),
     m_variable_list_sp (),
     m_variable_list_value_objects (),
     m_disassembly ()
 {
+    // If we don't have a CFA value, use the frame index for our StackID so that recursive
+    // functions properly aren't confused with one another on a history stack.
+    if (m_is_history_frame && m_cfa_is_valid == false)
+    {
+        m_id.SetCFA (m_frame_index);
+    }
+
     if (sc_ptr != NULL)
     {
         m_sc = *sc_ptr;
@@ -88,6 +103,10 @@ StackFrame::StackFrame (const ThreadSP &thread_sp,
     m_flags (),
     m_frame_base (),
     m_frame_base_error (),
+    m_cfa_is_valid (true),
+    m_stop_id  (0),
+    m_stop_id_is_valid (false),
+    m_is_history_frame (false),
     m_variable_list_sp (),
     m_variable_list_value_objects (),
     m_disassembly ()
@@ -123,6 +142,10 @@ StackFrame::StackFrame (const ThreadSP &thread_sp,
     m_flags (),
     m_frame_base (),
     m_frame_base_error (),
+    m_cfa_is_valid (true),
+    m_stop_id  (0),
+    m_stop_id_is_valid (false),
+    m_is_history_frame (false),
     m_variable_list_sp (),
     m_variable_list_value_objects (),
     m_disassembly ()
@@ -246,15 +269,19 @@ StackFrame::GetFrameCodeAddress()
     return m_frame_code_addr;
 }
 
-void
+bool
 StackFrame::ChangePC (addr_t pc)
 {
+    // We can't change the pc value of a history stack frame - it is immutable.
+    if (m_is_history_frame)
+        return false;
     m_frame_code_addr.SetRawAddress(pc);
     m_sc.Clear(false);
     m_flags.Reset(0);
     ThreadSP thread_sp (GetThread());
     if (thread_sp)
         thread_sp->ClearStackFrames ();
+    return true;
 }
 
 const char *
@@ -517,6 +544,10 @@ StackFrame::GetVariableList (bool get_file_globals)
 VariableListSP
 StackFrame::GetInScopeVariableList (bool get_file_globals)
 {
+    // We can't fetch variable information for a history stack frame.
+    if (m_is_history_frame)
+        return VariableListSP();
+
     VariableListSP var_list_sp(new VariableList);
     GetSymbolContext (eSymbolContextCompUnit | eSymbolContextBlock);
 
@@ -549,6 +580,9 @@ StackFrame::GetValueForVariableExpressionPath (const char *var_expr_cstr,
                                                VariableSP &var_sp,
                                                Error &error)
 {
+    // We can't fetch variable information for a history stack frame.
+    if (m_is_history_frame)
+        return ValueObjectSP();
 
     if (var_expr_cstr && var_expr_cstr[0])
     {
@@ -1108,6 +1142,12 @@ StackFrame::GetValueForVariableExpressionPath (const char *var_expr_cstr,
 bool
 StackFrame::GetFrameBaseValue (Scalar &frame_base, Error *error_ptr)
 {
+    if (m_cfa_is_valid == false)
+    {
+        m_frame_base_error.SetErrorString("No frame base available for this historical stack frame.");
+        return false;
+    }
+
     if (m_flags.IsClear(GOT_FRAME_BASE))
     {
         if (m_sc.function)
@@ -1172,6 +1212,10 @@ ValueObjectSP
 StackFrame::GetValueObjectForFrameVariable (const VariableSP &variable_sp, DynamicValueType use_dynamic)
 {
     ValueObjectSP valobj_sp;
+    if (m_is_history_frame)
+    {
+        return valobj_sp;
+    }
     VariableList *var_list = GetVariableList (true);
     if (var_list)
     {
@@ -1202,6 +1246,9 @@ StackFrame::GetValueObjectForFrameVariable (const VariableSP &variable_sp, Dynam
 ValueObjectSP
 StackFrame::TrackGlobalVariable (const VariableSP &variable_sp, DynamicValueType use_dynamic)
 {
+    if (m_is_history_frame)
+        return ValueObjectSP();
+
     // Check to make sure we aren't already tracking this variable?
     ValueObjectSP valobj_sp (GetValueObjectForFrameVariable (variable_sp, use_dynamic));
     if (!valobj_sp)
@@ -1275,7 +1322,7 @@ StackFrame::CalculateExecutionContext (ExecutionContext &exe_ctx)
 }
 
 void
-StackFrame::DumpUsingSettingsFormat (Stream *strm)
+StackFrame::DumpUsingSettingsFormat (Stream *strm, const char *frame_marker)
 {
     if (strm == NULL)
         return;
@@ -1283,6 +1330,10 @@ StackFrame::DumpUsingSettingsFormat (Stream *strm)
     GetSymbolContext(eSymbolContextEverything);
     ExecutionContext exe_ctx (shared_from_this());
     StreamString s;
+    
+    if (frame_marker)
+        s.PutCString(frame_marker);
+
     const char *frame_format = NULL;
     Target *target = exe_ctx.GetTargetPtr();
     if (target)
@@ -1370,13 +1421,14 @@ StackFrame::HasCachedData () const
 bool
 StackFrame::GetStatus (Stream& strm,
                        bool show_frame_info,
-                       bool show_source)
+                       bool show_source,
+                       const char *frame_marker)
 {
     
     if (show_frame_info)
     {
         strm.Indent();
-        DumpUsingSettingsFormat (&strm);
+        DumpUsingSettingsFormat (&strm, frame_marker);
     }
     
     if (show_source)
diff --git a/contrib/llvm/tools/lldb/source/Target/StackFrameList.cpp b/contrib/llvm/tools/lldb/source/Target/StackFrameList.cpp
index 69309dfae7b..631a77bd495 100644
--- a/contrib/llvm/tools/lldb/source/Target/StackFrameList.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/StackFrameList.cpp
@@ -301,7 +301,7 @@ StackFrameList::GetFramesUpTo(uint32_t end_idx)
                     if (reg_ctx_sp)
                     {
 
-                        const bool success = unwinder->GetFrameInfoAtIndex(idx, cfa, pc);
+                        const bool success = unwinder && unwinder->GetFrameInfoAtIndex(idx, cfa, pc);
                         // There shouldn't be any way not to get the frame info for frame 0.
                         // But if the unwinder can't make one, lets make one by hand with the
                         // SP as the CFA and see if that gets any further.
@@ -329,14 +329,17 @@ StackFrameList::GetFramesUpTo(uint32_t end_idx)
             }
             else
             {
-                const bool success = unwinder->GetFrameInfoAtIndex(idx, cfa, pc);
+                const bool success = unwinder && unwinder->GetFrameInfoAtIndex(idx, cfa, pc);
                 if (!success)
                 {
                     // We've gotten to the end of the stack.
                     SetAllFramesFetched();
                     break;
                 }
-                unwind_frame_sp.reset (new StackFrame (m_thread.shared_from_this(), m_frames.size(), idx, cfa, pc, NULL));
+                const bool cfa_is_valid = true;
+                const bool stop_id_is_valid = false;
+                const bool is_history_frame = false;
+                unwind_frame_sp.reset (new StackFrame (m_thread.shared_from_this(), m_frames.size(), idx, cfa, cfa_is_valid, pc, 0, stop_id_is_valid, is_history_frame, NULL));
                 m_frames.push_back (unwind_frame_sp);
             }
             
@@ -448,14 +451,17 @@ StackFrameList::GetFramesUpTo(uint32_t end_idx)
     {
         if (end_idx < m_concrete_frames_fetched)
             return;
-            
-        uint32_t num_frames = unwinder->GetFramesUpTo(end_idx);
-        if (num_frames <= end_idx + 1)
+
+        if (unwinder)
         {
-            //Done unwinding.
-            m_concrete_frames_fetched = UINT32_MAX;
+            uint32_t num_frames = unwinder->GetFramesUpTo(end_idx);
+            if (num_frames <= end_idx + 1)
+            {
+                //Done unwinding.
+                m_concrete_frames_fetched = UINT32_MAX;
+            }
+            m_frames.resize(num_frames);
         }
-        m_frames.resize(num_frames);
     }
 }
 
@@ -534,7 +540,10 @@ StackFrameList::GetFrameAtIndex (uint32_t idx)
                 addr_t pc, cfa;
                 if (unwinder->GetFrameInfoAtIndex(idx, cfa, pc))
                 {
-                    frame_sp.reset (new StackFrame (m_thread.shared_from_this(), idx, idx, cfa, pc, NULL));
+                    const bool cfa_is_valid = true;
+                    const bool stop_id_is_valid = false;
+                    const bool is_history_frame = false;
+                    frame_sp.reset (new StackFrame (m_thread.shared_from_this(), idx, idx, cfa, cfa_is_valid, pc, 0, stop_id_is_valid, is_history_frame, NULL));
                     
                     Function *function = frame_sp->GetSymbolContext (eSymbolContextFunction).function;
                     if (function)
@@ -863,7 +872,8 @@ StackFrameList::GetStatus (Stream& strm,
                            uint32_t first_frame,
                            uint32_t num_frames,
                            bool show_frame_info,
-                           uint32_t num_frames_with_source)
+                           uint32_t num_frames_with_source,
+                           const char *selected_frame_marker)
 {
     size_t num_frames_displayed = 0;
     
@@ -880,15 +890,34 @@ StackFrameList::GetStatus (Stream& strm,
     else
         last_frame = first_frame + num_frames;
     
+    StackFrameSP selected_frame_sp = m_thread.GetSelectedFrame();
+    const char *unselected_marker = NULL;
+    std::string buffer;
+    if (selected_frame_marker)
+    {
+        size_t len = strlen(selected_frame_marker);
+        buffer.insert(buffer.begin(), len, ' ');
+        unselected_marker = buffer.c_str();
+    }
+    const char *marker = NULL;
+    
     for (frame_idx = first_frame; frame_idx < last_frame; ++frame_idx)
     {
         frame_sp = GetFrameAtIndex(frame_idx);
         if (frame_sp.get() == NULL)
             break;
         
+        if (selected_frame_marker != NULL)
+        {
+            if (frame_sp == selected_frame_sp)
+                marker = selected_frame_marker;
+            else
+                marker = unselected_marker;
+        }
+        
         if (!frame_sp->GetStatus (strm,
                                   show_frame_info,
-                                  num_frames_with_source > (first_frame - frame_idx)))
+                                  num_frames_with_source > (first_frame - frame_idx), marker))
             break;
         ++num_frames_displayed;
     }
diff --git a/contrib/llvm/tools/lldb/source/Target/StopInfo.cpp b/contrib/llvm/tools/lldb/source/Target/StopInfo.cpp
index 81b9d866f71..914969a633e 100644
--- a/contrib/llvm/tools/lldb/source/Target/StopInfo.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/StopInfo.cpp
@@ -694,22 +694,17 @@ protected:
                     // We need to make sure the user sees any parse errors in their condition, so we'll hook the
                     // constructor errors up to the debugger's Async I/O.
                     ExecutionResults result_code;
+                    EvaluateExpressionOptions expr_options;
+                    expr_options.SetUnwindOnError(true);
+                    expr_options.SetIgnoreBreakpoints(true);
                     ValueObjectSP result_value_sp;
-                    const bool unwind_on_error = true;
-                    const bool ignore_breakpoints = true;
                     Error error;
-                    result_code = ClangUserExpression::EvaluateWithError (exe_ctx,
-                                                                          eExecutionPolicyOnlyWhenNeeded,
-                                                                          lldb::eLanguageTypeUnknown,
-                                                                          ClangUserExpression::eResultTypeAny,
-                                                                          unwind_on_error,
-                                                                          ignore_breakpoints,
-                                                                          wp_sp->GetConditionText(),
-                                                                          NULL,
-                                                                          result_value_sp,
-                                                                          error,
-                                                                          true,
-                                                                          ClangUserExpression::kDefaultTimeout);
+                    result_code = ClangUserExpression::Evaluate (exe_ctx,
+                                                                 expr_options,
+                                                                 wp_sp->GetConditionText(),
+                                                                 NULL,
+                                                                 result_value_sp,
+                                                                 error);
                     if (result_code == eExecutionCompleted)
                     {
                         if (result_value_sp)
diff --git a/contrib/llvm/tools/lldb/source/Target/SystemRuntime.cpp b/contrib/llvm/tools/lldb/source/Target/SystemRuntime.cpp
new file mode 100644
index 00000000000..5c07ed388ae
--- /dev/null
+++ b/contrib/llvm/tools/lldb/source/Target/SystemRuntime.cpp
@@ -0,0 +1,73 @@
+//===-- SystemRuntime.cpp ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/lldb-private.h"
+#include "lldb/Target/SystemRuntime.h"
+#include "lldb/Target/Process.h"
+#include "lldb/Core/PluginManager.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+SystemRuntime*
+SystemRuntime::FindPlugin (Process *process)
+{
+    SystemRuntimeCreateInstance create_callback = NULL;
+    for (uint32_t idx = 0; (create_callback = PluginManager::GetSystemRuntimeCreateCallbackAtIndex(idx)) != NULL; ++idx)
+    {
+        std::unique_ptr<SystemRuntime> instance_ap(create_callback(process));
+        if (instance_ap.get())
+            return instance_ap.release();
+    }
+    return NULL;
+}
+
+
+//----------------------------------------------------------------------
+// SystemRuntime constructor
+//----------------------------------------------------------------------
+SystemRuntime::SystemRuntime(Process *process) :
+    m_process (process),
+    m_types ()
+{
+}
+
+//----------------------------------------------------------------------
+// Destructor
+//----------------------------------------------------------------------
+SystemRuntime::~SystemRuntime()
+{
+}
+
+void
+SystemRuntime::DidAttach ()
+{
+}
+
+void
+SystemRuntime::DidLaunch()
+{
+}
+
+void
+SystemRuntime::ModulesDidLoad (ModuleList &module_list)
+{
+}
+
+const std::vector<ConstString> &
+SystemRuntime::GetExtendedBacktraceTypes ()
+{
+    return m_types;
+}
+
+ThreadSP
+SystemRuntime::GetExtendedBacktraceThread (ThreadSP thread, ConstString type)
+{
+    return ThreadSP();
+}
diff --git a/contrib/llvm/tools/lldb/source/Target/Target.cpp b/contrib/llvm/tools/lldb/source/Target/Target.cpp
index 5766b737c7d..fd9626a5de8 100644
--- a/contrib/llvm/tools/lldb/source/Target/Target.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/Target.cpp
@@ -43,6 +43,7 @@
 #include "lldb/Symbol/ObjectFile.h"
 #include "lldb/Target/Process.h"
 #include "lldb/Target/StackFrame.h"
+#include "lldb/Target/SystemRuntime.h"
 #include "lldb/Target/Thread.h"
 #include "lldb/Target/ThreadSpec.h"
 
@@ -83,8 +84,7 @@ Target::Target(Debugger &debugger, const ArchSpec &target_arch, const lldb::Plat
     m_source_manager_ap(),
     m_stop_hooks (),
     m_stop_hook_next_id (0),
-    m_suppress_stop_hooks (false),
-    m_suppress_synthetic_value(false)
+    m_suppress_stop_hooks (false)
 {
     SetEventName (eBroadcastBitBreakpointChanged, "breakpoint-changed");
     SetEventName (eBroadcastBitModulesLoaded, "modules-loaded");
@@ -192,7 +192,7 @@ Target::Destroy()
     DeleteCurrentProcess ();
     m_platform_sp.reset();
     m_arch.Clear();
-    m_images.Clear();
+    ClearModules(true);
     m_section_load_list.Clear();
     const bool notify = false;
     m_breakpoint_list.RemoveAll(notify);
@@ -201,14 +201,10 @@ Target::Destroy()
     m_last_created_watchpoint.reset();
     m_search_filter_sp.reset();
     m_image_search_paths.Clear(notify);
-    m_scratch_ast_context_ap.reset();
-    m_scratch_ast_source_ap.reset();
-    m_ast_importer_ap.reset();
     m_persistent_variables.Clear();
     m_stop_hooks.clear();
     m_stop_hook_next_id = 0;
     m_suppress_stop_hooks = false;
-    m_suppress_synthetic_value = false;
 }
 
 
@@ -247,11 +243,12 @@ BreakpointSP
 Target::CreateSourceRegexBreakpoint (const FileSpecList *containingModules,
                                      const FileSpecList *source_file_spec_list,
                                      RegularExpression &source_regex,
-                                     bool internal)
+                                     bool internal,
+                                     bool hardware)
 {
     SearchFilterSP filter_sp(GetSearchFilterForModuleAndCUList (containingModules, source_file_spec_list));
     BreakpointResolverSP resolver_sp(new BreakpointResolverFileRegex (NULL, source_regex));
-    return CreateBreakpoint (filter_sp, resolver_sp, internal);
+    return CreateBreakpoint (filter_sp, resolver_sp, internal, hardware);
 }
 
 
@@ -261,7 +258,8 @@ Target::CreateBreakpoint (const FileSpecList *containingModules,
                           uint32_t line_no,
                           LazyBool check_inlines,
                           LazyBool skip_prologue,
-                          bool internal)
+                          bool internal,
+                          bool hardware)
 {
     if (check_inlines == eLazyBoolCalculate)
     {
@@ -304,12 +302,12 @@ Target::CreateBreakpoint (const FileSpecList *containingModules,
                                                                      line_no,
                                                                      check_inlines,
                                                                      skip_prologue));
-    return CreateBreakpoint (filter_sp, resolver_sp, internal);
+    return CreateBreakpoint (filter_sp, resolver_sp, internal, hardware);
 }
 
 
 BreakpointSP
-Target::CreateBreakpoint (lldb::addr_t addr, bool internal)
+Target::CreateBreakpoint (lldb::addr_t addr, bool internal, bool hardware)
 {
     Address so_addr;
     // Attempt to resolve our load address if possible, though it is ok if
@@ -322,16 +320,16 @@ Target::CreateBreakpoint (lldb::addr_t addr, bool internal)
         // The address didn't resolve, so just set this as an absolute address
         so_addr.SetOffset (addr);
     }
-    BreakpointSP bp_sp (CreateBreakpoint(so_addr, internal));
+    BreakpointSP bp_sp (CreateBreakpoint(so_addr, internal, hardware));
     return bp_sp;
 }
 
 BreakpointSP
-Target::CreateBreakpoint (Address &addr, bool internal)
+Target::CreateBreakpoint (Address &addr, bool internal, bool hardware)
 {
     SearchFilterSP filter_sp(new SearchFilterForNonModuleSpecificSearches (shared_from_this()));
     BreakpointResolverSP resolver_sp (new BreakpointResolverAddress (NULL, addr));
-    return CreateBreakpoint (filter_sp, resolver_sp, internal);
+    return CreateBreakpoint (filter_sp, resolver_sp, internal, hardware);
 }
 
 BreakpointSP
@@ -340,7 +338,8 @@ Target::CreateBreakpoint (const FileSpecList *containingModules,
                           const char *func_name, 
                           uint32_t func_name_type_mask, 
                           LazyBool skip_prologue,
-                          bool internal)
+                          bool internal,
+                          bool hardware)
 {
     BreakpointSP bp_sp;
     if (func_name)
@@ -355,7 +354,7 @@ Target::CreateBreakpoint (const FileSpecList *containingModules,
                                                                       func_name_type_mask, 
                                                                       Breakpoint::Exact, 
                                                                       skip_prologue));
-        bp_sp = CreateBreakpoint (filter_sp, resolver_sp, internal);
+        bp_sp = CreateBreakpoint (filter_sp, resolver_sp, internal, hardware);
     }
     return bp_sp;
 }
@@ -366,7 +365,8 @@ Target::CreateBreakpoint (const FileSpecList *containingModules,
                           const std::vector<std::string> &func_names,
                           uint32_t func_name_type_mask,
                           LazyBool skip_prologue,
-                          bool internal)
+                          bool internal,
+                          bool hardware)
 {
     BreakpointSP bp_sp;
     size_t num_names = func_names.size();
@@ -381,7 +381,7 @@ Target::CreateBreakpoint (const FileSpecList *containingModules,
                                                                       func_names,
                                                                       func_name_type_mask,
                                                                       skip_prologue));
-        bp_sp = CreateBreakpoint (filter_sp, resolver_sp, internal);
+        bp_sp = CreateBreakpoint (filter_sp, resolver_sp, internal, hardware);
     }
     return bp_sp;
 }
@@ -393,7 +393,8 @@ Target::CreateBreakpoint (const FileSpecList *containingModules,
                           size_t num_names, 
                           uint32_t func_name_type_mask, 
                           LazyBool skip_prologue,
-                          bool internal)
+                          bool internal,
+                          bool hardware)
 {
     BreakpointSP bp_sp;
     if (num_names > 0)
@@ -408,7 +409,7 @@ Target::CreateBreakpoint (const FileSpecList *containingModules,
                                                                       num_names, 
                                                                       func_name_type_mask,
                                                                       skip_prologue));
-        bp_sp = CreateBreakpoint (filter_sp, resolver_sp, internal);
+        bp_sp = CreateBreakpoint (filter_sp, resolver_sp, internal, hardware);
     }
     return bp_sp;
 }
@@ -478,14 +479,15 @@ Target::CreateFuncRegexBreakpoint (const FileSpecList *containingModules,
                                    const FileSpecList *containingSourceFiles,
                                    RegularExpression &func_regex, 
                                    LazyBool skip_prologue,
-                                   bool internal)
+                                   bool internal,
+                                   bool hardware)
 {
     SearchFilterSP filter_sp(GetSearchFilterForModuleAndCUList (containingModules, containingSourceFiles));
     BreakpointResolverSP resolver_sp(new BreakpointResolverName (NULL, 
                                                                  func_regex, 
                                                                  skip_prologue == eLazyBoolCalculate ? GetSkipPrologue() : skip_prologue));
 
-    return CreateBreakpoint (filter_sp, resolver_sp, internal);
+    return CreateBreakpoint (filter_sp, resolver_sp, internal, hardware);
 }
 
 lldb::BreakpointSP
@@ -495,12 +497,12 @@ Target::CreateExceptionBreakpoint (enum lldb::LanguageType language, bool catch_
 }
     
 BreakpointSP
-Target::CreateBreakpoint (SearchFilterSP &filter_sp, BreakpointResolverSP &resolver_sp, bool internal)
+Target::CreateBreakpoint (SearchFilterSP &filter_sp, BreakpointResolverSP &resolver_sp, bool internal, bool request_hardware)
 {
     BreakpointSP bp_sp;
     if (filter_sp && resolver_sp)
     {
-        bp_sp.reset(new Breakpoint (*this, filter_sp, resolver_sp));
+        bp_sp.reset(new Breakpoint (*this, filter_sp, resolver_sp, request_hardware));
         resolver_sp->SetBreakpoint (bp_sp.get());
 
         if (internal)
@@ -630,7 +632,7 @@ Target::CreateWatchpoint(lldb::addr_t addr, size_t size, const ClangASTType *typ
         if (!CheckIfWatchpointsExhausted(this, error))
         {
             if (!OptionGroupWatchpoint::IsWatchSizeSupported(size))
-                error.SetErrorStringWithFormat("watch size of %lu is not supported", size);
+                error.SetErrorStringWithFormat("watch size of %zu is not supported", size);
         }
         wp_sp.reset();
     }
@@ -1012,13 +1014,29 @@ LoadScriptingResourceForModule (const ModuleSP &module_sp, Target *target)
 }
 
 void
-Target::SetExecutableModule (ModuleSP& executable_sp, bool get_dependent_files)
+Target::ClearModules(bool delete_locations)
 {
-    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TARGET));
+    ModulesDidUnload (m_images, delete_locations);
+    GetSectionLoadList().Clear();
     m_images.Clear();
     m_scratch_ast_context_ap.reset();
     m_scratch_ast_source_ap.reset();
     m_ast_importer_ap.reset();
+}
+
+void
+Target::DidExec ()
+{
+    // When a process exec's we need to know about it so we can do some cleanup. 
+    m_breakpoint_list.RemoveInvalidLocations(m_arch);
+    m_internal_breakpoint_list.RemoveInvalidLocations(m_arch);
+}
+
+void
+Target::SetExecutableModule (ModuleSP& executable_sp, bool get_dependent_files)
+{
+    Log *log(lldb_private::GetLogIfAllCategoriesSet (LIBLLDB_LOG_TARGET));
+    ClearModules(false);
     
     if (executable_sp.get())
     {
@@ -1087,10 +1105,8 @@ Target::SetArchitecture (const ArchSpec &arch_spec)
           log->Printf ("Target::SetArchitecture changing architecture to %s (%s)", arch_spec.GetArchitectureName(), arch_spec.GetTriple().getTriple().c_str());
         m_arch = arch_spec;
         ModuleSP executable_sp = GetExecutableModule ();
-        m_images.Clear();
-        m_scratch_ast_context_ap.reset();
-        m_scratch_ast_source_ap.reset();
-        m_ast_importer_ap.reset();
+
+        ClearModules(true);
         // Need to do something about unsetting breakpoints.
         
         if (executable_sp)
@@ -1135,7 +1151,7 @@ Target::ModuleRemoved (const ModuleList& module_list, const ModuleSP &module_sp)
     // A module is being added to this target for the first time
     ModuleList my_module_list;
     my_module_list.Append(module_sp);
-    ModulesDidUnload (my_module_list);
+    ModulesDidUnload (my_module_list, false);
 }
 
 void
@@ -1150,7 +1166,15 @@ Target::ModulesDidLoad (ModuleList &module_list)
 {
     if (module_list.GetSize())
     {
-        m_breakpoint_list.UpdateBreakpoints (module_list, true);
+        m_breakpoint_list.UpdateBreakpoints (module_list, true, false);
+        if (m_process_sp)
+        {
+            SystemRuntime *sys_runtime = m_process_sp->GetSystemRuntime();
+            if (sys_runtime)
+            {
+                sys_runtime->ModulesDidLoad (module_list);
+            }
+        }
         // TODO: make event data that packages up the module_list
         BroadcastEvent (eBroadcastBitModulesLoaded, NULL);
     }
@@ -1171,17 +1195,17 @@ Target::SymbolsDidLoad (ModuleList &module_list)
             }
         }
         
-        m_breakpoint_list.UpdateBreakpoints (module_list, true);
+        m_breakpoint_list.UpdateBreakpoints (module_list, true, false);
         BroadcastEvent(eBroadcastBitSymbolsLoaded, NULL);
     }
 }
 
 void
-Target::ModulesDidUnload (ModuleList &module_list)
+Target::ModulesDidUnload (ModuleList &module_list, bool delete_locations)
 {
     if (module_list.GetSize())
     {
-        m_breakpoint_list.UpdateBreakpoints (module_list, false);
+        m_breakpoint_list.UpdateBreakpoints (module_list, false, delete_locations);
         // TODO: make event data that packages up the module_list
         BroadcastEvent (eBroadcastBitModulesUnloaded, NULL);
     }
@@ -1724,10 +1748,7 @@ Target::ImageSearchPathsChanged
     Target *target = (Target *)baton;
     ModuleSP exe_module_sp (target->GetExecutableModule());
     if (exe_module_sp)
-    {
-        target->m_images.Clear();
         target->SetExecutableModule (exe_module_sp, true);
-    }
 }
 
 ClangASTContext *
@@ -1875,18 +1896,13 @@ Target::EvaluateExpression
     else
     {
         const char *prefix = GetExpressionPrefixContentsAsCString();
-                
+        Error error;
         execution_results = ClangUserExpression::Evaluate (exe_ctx, 
-                                                           options.GetExecutionPolicy(),
-                                                           lldb::eLanguageTypeUnknown,
-                                                           options.DoesCoerceToId() ? ClangUserExpression::eResultTypeId : ClangUserExpression::eResultTypeAny,
-                                                           options.DoesUnwindOnError(),
-                                                           options.DoesIgnoreBreakpoints(),
-                                                           expr_cstr, 
+                                                           options,
+                                                           expr_cstr,
                                                            prefix, 
                                                            result_valobj_sp,
-                                                           options.GetRunOthers(),
-                                                           options.GetTimeoutUsec());
+                                                           error);
     }
     
     m_suppress_stop_hooks = old_suppress_value;
@@ -2174,12 +2190,78 @@ Target::RunStopHooks ()
     result.GetImmediateErrorStream()->Flush();
 }
 
+const TargetPropertiesSP &
+Target::GetGlobalProperties()
+{
+    static TargetPropertiesSP g_settings_sp;
+    if (!g_settings_sp)
+    {
+        g_settings_sp.reset (new TargetProperties (NULL));
+    }
+    return g_settings_sp;
+}
+
+Error
+Target::Install (ProcessLaunchInfo *launch_info)
+{
+    Error error;
+    PlatformSP platform_sp (GetPlatform());
+    if (platform_sp)
+    {
+        if (platform_sp->IsRemote())
+        {
+            if (platform_sp->IsConnected())
+            {
+                // Install all files that have an install path, and always install the
+                // main executable when connected to a remote platform
+                const ModuleList& modules = GetImages();
+                const size_t num_images = modules.GetSize();
+                for (size_t idx = 0; idx < num_images; ++idx)
+                {
+                    const bool is_main_executable = idx == 0;
+                    ModuleSP module_sp(modules.GetModuleAtIndex(idx));
+                    if (module_sp)
+                    {
+                        FileSpec local_file (module_sp->GetFileSpec());
+                        if (local_file)
+                        {
+                            FileSpec remote_file (module_sp->GetRemoteInstallFileSpec());
+                            if (!remote_file)
+                            {
+                                if (is_main_executable) // TODO: add setting for always installing main executable???
+                                {
+                                    // Always install the main executable
+                                    remote_file.GetDirectory() = platform_sp->GetWorkingDirectory();
+                                    remote_file.GetFilename() = module_sp->GetFileSpec().GetFilename();
+                                }
+                            }
+                            if (remote_file)
+                            {
+                                error = platform_sp->Install(local_file, remote_file);
+                                if (error.Success())
+                                {
+                                    module_sp->SetPlatformFileSpec(remote_file);
+                                    if (is_main_executable)
+                                    {
+                                        if (launch_info)
+                                            launch_info->SetExecutableFile(remote_file, false);
+                                    }
+                                }
+                                else
+                                    break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return error;
+}
 
 //--------------------------------------------------------------
-// class Target::StopHook
+// Target::StopHook
 //--------------------------------------------------------------
-
-
 Target::StopHook::StopHook (lldb::TargetSP target_sp, lldb::user_id_t uid) :
         UserID (uid),
         m_target_sp (target_sp),
@@ -2511,6 +2593,9 @@ protected:
     mutable bool m_got_host_env;
 };
 
+//----------------------------------------------------------------------
+// TargetProperties
+//----------------------------------------------------------------------
 TargetProperties::TargetProperties (Target *target) :
     Properties ()
 {
@@ -2799,17 +2884,10 @@ TargetProperties::GetMemoryModuleLoadLevel() const
 }
 
 
-const TargetPropertiesSP &
-Target::GetGlobalProperties()
-{
-    static TargetPropertiesSP g_settings_sp;
-    if (!g_settings_sp)
-    {
-        g_settings_sp.reset (new TargetProperties (NULL));
-    }
-    return g_settings_sp;
-}
 
+//----------------------------------------------------------------------
+// Target::TargetEventData
+//----------------------------------------------------------------------
 const ConstString &
 Target::TargetEventData::GetFlavorString ()
 {
diff --git a/contrib/llvm/tools/lldb/source/Target/TargetList.cpp b/contrib/llvm/tools/lldb/source/Target/TargetList.cpp
index 8d907f43269..c4da84fbf8b 100644
--- a/contrib/llvm/tools/lldb/source/Target/TargetList.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/TargetList.cpp
@@ -363,7 +363,7 @@ TargetList::FindTargetWithExecutableAndArchitecture
 {
     Mutex::Locker locker (m_target_list_mutex);
     TargetSP target_sp;
-    bool full_match = exe_file_spec.GetDirectory();
+    bool full_match = (bool)exe_file_spec.GetDirectory();
 
     collection::const_iterator pos, end = m_target_list.end();
     for (pos = m_target_list.begin(); pos != end; ++pos)
diff --git a/contrib/llvm/tools/lldb/source/Target/Thread.cpp b/contrib/llvm/tools/lldb/source/Target/Thread.cpp
index b65434bf948..07f5321990b 100644
--- a/contrib/llvm/tools/lldb/source/Target/Thread.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/Thread.cpp
@@ -282,12 +282,18 @@ Thread::~Thread()
 void 
 Thread::DestroyThread ()
 {
-    // Tell any plans on the plan stack that the thread is being destroyed since
-    // any active plans that have a thread go away in the middle of might need
-    // to do cleanup.
+    // Tell any plans on the plan stacks that the thread is being destroyed since
+    // any plans that have a thread go away in the middle of might need
+    // to do cleanup, or in some cases NOT do cleanup...
     for (auto plan : m_plan_stack)
         plan->ThreadDestroyed();
 
+    for (auto plan : m_discarded_plan_stack)
+        plan->ThreadDestroyed();
+
+    for (auto plan : m_completed_plan_stack)
+        plan->ThreadDestroyed();
+
     m_destroy_called = true;
     m_plan_stack.clear();
     m_discarded_plan_stack.clear();
@@ -490,7 +496,19 @@ Thread::ThreadStoppedForAReason (void)
 bool
 Thread::CheckpointThreadState (ThreadStateCheckpoint &saved_state)
 {
-    if (!SaveFrameZeroState(saved_state.register_backup))
+    saved_state.register_backup_sp.reset();
+    lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0));
+    if (frame_sp)
+    {
+        lldb::RegisterCheckpointSP reg_checkpoint_sp(new RegisterCheckpoint(RegisterCheckpoint::Reason::eExpression));
+        if (reg_checkpoint_sp)
+        {
+            lldb::RegisterContextSP reg_ctx_sp (frame_sp->GetRegisterContext());
+            if (reg_ctx_sp && reg_ctx_sp->ReadAllRegisterValues (*reg_checkpoint_sp))
+                saved_state.register_backup_sp = reg_checkpoint_sp;
+        }
+    }
+    if (!saved_state.register_backup_sp)
         return false;
 
     saved_state.stop_info_sp = GetStopInfo();
@@ -505,8 +523,26 @@ Thread::CheckpointThreadState (ThreadStateCheckpoint &saved_state)
 bool
 Thread::RestoreRegisterStateFromCheckpoint (ThreadStateCheckpoint &saved_state)
 {
-    RestoreSaveFrameZero(saved_state.register_backup);
-    return true;
+    if (saved_state.register_backup_sp)
+    {
+        lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0));
+        if (frame_sp)
+        {
+            lldb::RegisterContextSP reg_ctx_sp (frame_sp->GetRegisterContext());
+            if (reg_ctx_sp)
+            {
+                bool ret = reg_ctx_sp->WriteAllRegisterValues (*saved_state.register_backup_sp);
+                
+                // Clear out all stack frames as our world just changed.
+                ClearStackFrames();
+                reg_ctx_sp->InvalidateIfNeeded(true);
+                if (m_unwinder_ap.get())
+                    m_unwinder_ap->Clear();
+                return ret;
+            }
+        }
+    }
+    return false;
 }
 
 bool
@@ -1413,14 +1449,6 @@ Thread::QueueThreadPlanForStepInRange
 }
 
 
-ThreadPlanSP
-Thread::QueueThreadPlanForStepOverBreakpointPlan (bool abort_other_plans)
-{
-    ThreadPlanSP thread_plan_sp (new ThreadPlanStepOverBreakpoint (*this));
-    QueueThreadPlan (thread_plan_sp, abort_other_plans);
-    return thread_plan_sp;
-}
-
 ThreadPlanSP
 Thread::QueueThreadPlanForStepOut 
 (
@@ -1463,25 +1491,6 @@ Thread::QueueThreadPlanForStepThrough (StackID &return_stack_id, bool abort_othe
     return thread_plan_sp;
 }
 
-ThreadPlanSP
-Thread::QueueThreadPlanForCallFunction (bool abort_other_plans,
-                                        Address& function,
-                                        lldb::addr_t arg,
-                                        bool stop_other_threads,
-                                        bool unwind_on_error,
-                                        bool ignore_breakpoints)
-{
-    ThreadPlanSP thread_plan_sp (new ThreadPlanCallFunction (*this,
-                                                             function,
-                                                             ClangASTType(),
-                                                             arg,
-                                                             stop_other_threads,
-                                                             unwind_on_error,
-                                                             ignore_breakpoints));
-    QueueThreadPlan (thread_plan_sp, abort_other_plans);
-    return thread_plan_sp;
-}
-
 ThreadPlanSP
 Thread::QueueThreadPlanForRunToAddress (bool abort_other_plans,
                                         Address &target_addr,
@@ -1745,6 +1754,79 @@ Thread::ReturnFromFrame (lldb::StackFrameSP frame_sp, lldb::ValueObjectSP return
     return return_error;
 }
 
+static void DumpAddressList (Stream &s, const std::vector<Address> &list, ExecutionContextScope *exe_scope)
+{
+    for (size_t n=0;n<list.size();n++)
+    {
+        s << "\t";
+        list[n].Dump (&s, exe_scope, Address::DumpStyleResolvedDescription, Address::DumpStyleSectionNameOffset);
+        s << "\n";
+    }
+}
+
+Error
+Thread::JumpToLine (const FileSpec &file, uint32_t line, bool can_leave_function, std::string *warnings)
+{
+    ExecutionContext exe_ctx (GetStackFrameAtIndex(0));
+    Target *target = exe_ctx.GetTargetPtr();
+    TargetSP target_sp = exe_ctx.GetTargetSP();
+    RegisterContext *reg_ctx = exe_ctx.GetRegisterContext();
+    StackFrame *frame = exe_ctx.GetFramePtr();
+    const SymbolContext &sc = frame->GetSymbolContext(eSymbolContextFunction);
+
+    // Find candidate locations.
+    std::vector<Address> candidates, within_function, outside_function;
+    target->GetImages().FindAddressesForLine (target_sp, file, line, sc.function, within_function, outside_function);
+
+    // If possible, we try and stay within the current function.
+    // Within a function, we accept multiple locations (optimized code may do this,
+    // there's no solution here so we do the best we can).
+    // However if we're trying to leave the function, we don't know how to pick the
+    // right location, so if there's more than one then we bail.
+    if (!within_function.empty())
+        candidates = within_function;
+    else if (outside_function.size() == 1 && can_leave_function)
+        candidates = outside_function;
+
+    // Check if we got anything.
+    if (candidates.empty())
+    {
+        if (outside_function.empty())
+        {
+            return Error("Cannot locate an address for %s:%i.",
+                         file.GetFilename().AsCString(), line);
+        }
+        else if (outside_function.size() == 1)
+        {
+            return Error("%s:%i is outside the current function.",
+                         file.GetFilename().AsCString(), line);
+        }
+        else
+        {
+            StreamString sstr;
+            DumpAddressList(sstr, outside_function, target);
+            return Error("%s:%i has multiple candidate locations:\n%s",
+                         file.GetFilename().AsCString(), line, sstr.GetString().c_str());
+        }
+    }
+
+    // Accept the first location, warn about any others.
+    Address dest = candidates[0];
+    if (warnings && candidates.size() > 1)
+    {
+        StreamString sstr;
+        sstr.Printf("%s:%i appears multiple times in this function, selecting the first location:\n",
+                     file.GetFilename().AsCString(), line);
+        DumpAddressList(sstr, candidates, target);
+        *warnings = sstr.GetString();
+    }
+
+    if (!reg_ctx->SetPC (dest))
+        return Error("Cannot change PC to target address.");
+
+    return Error();
+}
+
 void
 Thread::DumpUsingSettingsFormat (Stream &strm, uint32_t frame_idx)
 {
@@ -1784,6 +1866,24 @@ Thread::SettingsTerminate ()
 {
 }
 
+lldb::addr_t
+Thread::GetThreadPointer ()
+{
+    return LLDB_INVALID_ADDRESS;
+}
+
+addr_t
+Thread::GetThreadLocalData (const ModuleSP module)
+{
+    // The default implementation is to ask the dynamic loader for it.
+    // This can be overridden for specific platforms.
+    DynamicLoader *loader = GetProcess()->GetDynamicLoader();
+    if (loader)
+        return loader->GetThreadLocalData (module, shared_from_this());
+    else
+        return LLDB_INVALID_ADDRESS;
+}
+
 lldb::StackFrameSP
 Thread::GetStackFrameSPForStackFramePtr (StackFrame *stack_frame_ptr)
 {
@@ -1863,13 +1963,21 @@ Thread::GetStatus (Stream &strm, uint32_t start_frame, uint32_t num_frames, uint
         strm.IndentMore();
         
         const bool show_frame_info = true;
-        strm.IndentMore ();
+        
+        const char *selected_frame_marker = NULL;
+        if (num_frames == 1 || (GetID() != GetProcess()->GetThreadList().GetSelectedThread()->GetID()))
+            strm.IndentMore ();
+        else
+            selected_frame_marker = "* ";
+
         num_frames_shown = GetStackFrameList ()->GetStatus (strm,
                                                             start_frame, 
                                                             num_frames, 
                                                             show_frame_info, 
-                                                            num_frames_with_source);
-        strm.IndentLess();
+                                                            num_frames_with_source,
+                                                            selected_frame_marker);
+        if (num_frames == 1)
+            strm.IndentLess();
         strm.IndentLess();
     }
     return num_frames_shown;
@@ -1889,48 +1997,6 @@ Thread::GetStackFrameStatus (Stream& strm,
                                            num_frames_with_source);
 }
 
-bool
-Thread::SaveFrameZeroState (RegisterCheckpoint &checkpoint)
-{
-    lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0));
-    if (frame_sp)
-    {
-        checkpoint.SetStackID(frame_sp->GetStackID());
-        lldb::RegisterContextSP reg_ctx_sp (frame_sp->GetRegisterContext());
-        if (reg_ctx_sp)
-            return reg_ctx_sp->ReadAllRegisterValues (checkpoint.GetData());
-    }
-    return false;
-}
-
-bool
-Thread::RestoreSaveFrameZero (const RegisterCheckpoint &checkpoint)
-{
-    return ResetFrameZeroRegisters (checkpoint.GetData());
-}
-
-bool
-Thread::ResetFrameZeroRegisters (lldb::DataBufferSP register_data_sp)
-{
-    lldb::StackFrameSP frame_sp(GetStackFrameAtIndex (0));
-    if (frame_sp)
-    {
-        lldb::RegisterContextSP reg_ctx_sp (frame_sp->GetRegisterContext());
-        if (reg_ctx_sp)
-        {
-            bool ret = reg_ctx_sp->WriteAllRegisterValues (register_data_sp);
-
-            // Clear out all stack frames as our world just changed.
-            ClearStackFrames();
-            reg_ctx_sp->InvalidateIfNeeded(true);
-            if (m_unwinder_ap.get())
-                m_unwinder_ap->Clear();
-            return ret;
-        }
-    }
-    return false;
-}
-
 Unwind *
 Thread::GetUnwinder ()
 {
@@ -1944,6 +2010,7 @@ Thread::GetUnwinder ()
             case llvm::Triple::x86:
             case llvm::Triple::arm:
             case llvm::Triple::thumb:
+            case llvm::Triple::mips64:
                 m_unwinder_ap.reset (new UnwindLLDB (*this));
                 break;
                 
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp
index c9baaafffd6..854750b8581 100644
--- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallFunction.cpp
@@ -55,8 +55,6 @@ ThreadPlanCallFunction::ConstructorSetup (Thread &thread,
     if (!abi)
         return false;
     
-    TargetSP target_sp (thread.CalculateTarget());
-
     Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP));
     
     SetBreakpoints();
@@ -74,7 +72,7 @@ ThreadPlanCallFunction::ConstructorSetup (Thread &thread,
         return false;
     }
     
-    Module *exe_module = target_sp->GetExecutableModulePointer();
+    Module *exe_module = GetTarget().GetExecutableModulePointer();
 
     if (exe_module == NULL)
     {
@@ -107,7 +105,7 @@ ThreadPlanCallFunction::ConstructorSetup (Thread &thread,
         }
     }
     
-    start_load_addr = m_start_addr.GetLoadAddress (target_sp.get());
+    start_load_addr = m_start_addr.GetLoadAddress (&GetTarget());
     
     // Checkpoint the thread state so we can restore it later.
     if (log && log->GetVerbose())
@@ -120,7 +118,7 @@ ThreadPlanCallFunction::ConstructorSetup (Thread &thread,
             log->Printf ("ThreadPlanCallFunction(%p): %s.", this, m_constructor_errors.GetData());
         return false;
     }
-    function_load_addr = m_function_addr.GetLoadAddress (target_sp.get());
+    function_load_addr = m_function_addr.GetLoadAddress (&GetTarget());
     
     return true;
 }
@@ -128,88 +126,22 @@ ThreadPlanCallFunction::ConstructorSetup (Thread &thread,
 ThreadPlanCallFunction::ThreadPlanCallFunction (Thread &thread,
                                                 const Address &function,
                                                 const ClangASTType &return_type,
-                                                addr_t arg,
-                                                bool stop_other_threads,
-                                                bool unwind_on_error,
-                                                bool ignore_breakpoints,
-                                                addr_t *this_arg,
-                                                addr_t *cmd_arg) :
+                                                llvm::ArrayRef<addr_t> args,
+                                                const EvaluateExpressionOptions &options) :
     ThreadPlan (ThreadPlan::eKindCallFunction, "Call function plan", thread, eVoteNoOpinion, eVoteNoOpinion),
     m_valid (false),
-    m_stop_other_threads (stop_other_threads),
+    m_stop_other_threads (options.GetStopOthers()),
+    m_unwind_on_error (options.DoesUnwindOnError()),
+    m_ignore_breakpoints (options.DoesIgnoreBreakpoints()),
+    m_debug_execution (options.GetDebug()),
+    m_trap_exceptions (options.GetTrapExceptions()),
     m_function_addr (function),
     m_function_sp (0),
     m_return_type (return_type),
     m_takedown_done (false),
-    m_stop_address (LLDB_INVALID_ADDRESS),
-    m_unwind_on_error (unwind_on_error),
-    m_ignore_breakpoints (ignore_breakpoints)
-{
-    lldb::addr_t start_load_addr;
-    ABI *abi;
-    lldb::addr_t function_load_addr;
-    if (!ConstructorSetup (thread, abi, start_load_addr, function_load_addr))
-        return;
-        
-    if (this_arg && cmd_arg)
-    {
-        if (!abi->PrepareTrivialCall (thread, 
-                                      m_function_sp, 
-                                      function_load_addr, 
-                                      start_load_addr, 
-                                      this_arg,
-                                      cmd_arg,
-                                      &arg))
-            return;
-    }
-    else if (this_arg)
-    {
-        if (!abi->PrepareTrivialCall (thread, 
-                                      m_function_sp, 
-                                      function_load_addr, 
-                                      start_load_addr, 
-                                      this_arg,
-                                      &arg))
-            return;
-    }
-    else
-    {
-        if (!abi->PrepareTrivialCall (thread, 
-                                      m_function_sp, 
-                                      function_load_addr, 
-                                      start_load_addr, 
-                                      &arg))
-            return;
-    }
-    
-    ReportRegisterState ("Function call was set up.  Register state was:");
-    
-    m_valid = true;    
-}
-
-
-ThreadPlanCallFunction::ThreadPlanCallFunction (Thread &thread,
-                                                const Address &function,
-                                                const ClangASTType &return_type,
-                                                bool stop_other_threads,
-                                                bool unwind_on_error,
-                                                bool ignore_breakpoints,
-                                                addr_t *arg1_ptr,
-                                                addr_t *arg2_ptr,
-                                                addr_t *arg3_ptr,
-                                                addr_t *arg4_ptr,
-                                                addr_t *arg5_ptr,
-                                                addr_t *arg6_ptr) :
-    ThreadPlan (ThreadPlan::eKindCallFunction, "Call function plan", thread, eVoteNoOpinion, eVoteNoOpinion),
-    m_valid (false),
-    m_stop_other_threads (stop_other_threads),
-    m_function_addr (function),
-    m_function_sp (0),
-    m_return_type (return_type),
-    m_takedown_done (false),
-    m_stop_address (LLDB_INVALID_ADDRESS),
-    m_unwind_on_error (unwind_on_error),
-    m_ignore_breakpoints (ignore_breakpoints)
+    m_should_clear_objc_exception_bp(false),
+    m_should_clear_cxx_exception_bp (false),
+    m_stop_address (LLDB_INVALID_ADDRESS)
 {
     lldb::addr_t start_load_addr;
     ABI *abi;
@@ -217,19 +149,12 @@ ThreadPlanCallFunction::ThreadPlanCallFunction (Thread &thread,
     if (!ConstructorSetup (thread, abi, start_load_addr, function_load_addr))
         return;
     
-    if (!abi->PrepareTrivialCall (thread, 
-                                  m_function_sp,
-                                  function_load_addr, 
-                                  start_load_addr, 
-                                  arg1_ptr,
-                                  arg2_ptr,
-                                  arg3_ptr,
-                                  arg4_ptr,
-                                  arg5_ptr,
-                                  arg6_ptr))
-    {
-            return;
-    }
+    if (!abi->PrepareTrivialCall(thread,
+                                 m_function_sp,
+                                 function_load_addr,
+                                 start_load_addr,
+                                 args))
+        return;
     
     ReportRegisterState ("Function call was set up.  Register state was:");
     
@@ -299,7 +224,11 @@ ThreadPlanCallFunction::DoTakedown (bool success)
         m_takedown_done = true;
         m_stop_address = m_thread.GetStackFrameAtIndex(0)->GetRegisterContext()->GetPC();
         m_real_stop_info_sp = GetPrivateStopInfo ();
-        m_thread.RestoreRegisterStateFromCheckpoint(m_stored_thread_state);
+        if (!m_thread.RestoreRegisterStateFromCheckpoint(m_stored_thread_state))
+        {
+            if (log)
+                log->Printf("ThreadPlanCallFunction(%p): DoTakedown failed to restore register state", this);
+        }
         SetPlanComplete(success);
         ClearBreakpoints();
         if (log && log->GetVerbose())
@@ -560,25 +489,34 @@ void
 ThreadPlanCallFunction::SetBreakpoints ()
 {
     ProcessSP process_sp (m_thread.CalculateProcess());
-    if (process_sp)
+    if (m_trap_exceptions && process_sp)
     {
         m_cxx_language_runtime = process_sp->GetLanguageRuntime(eLanguageTypeC_plus_plus);
         m_objc_language_runtime = process_sp->GetLanguageRuntime(eLanguageTypeObjC);
     
         if (m_cxx_language_runtime)
+        {
+            m_should_clear_cxx_exception_bp = !m_cxx_language_runtime->ExceptionBreakpointsAreSet();
             m_cxx_language_runtime->SetExceptionBreakpoints();
+        }
         if (m_objc_language_runtime)
+        {
+            m_should_clear_objc_exception_bp = !m_objc_language_runtime->ExceptionBreakpointsAreSet();
             m_objc_language_runtime->SetExceptionBreakpoints();
+        }
     }
 }
 
 void
 ThreadPlanCallFunction::ClearBreakpoints ()
 {
-    if (m_cxx_language_runtime)
-        m_cxx_language_runtime->ClearExceptionBreakpoints();
-    if (m_objc_language_runtime)
-        m_objc_language_runtime->ClearExceptionBreakpoints();
+    if (m_trap_exceptions)
+    {
+        if (m_cxx_language_runtime && m_should_clear_cxx_exception_bp)
+            m_cxx_language_runtime->ClearExceptionBreakpoints();
+        if (m_objc_language_runtime && m_should_clear_objc_exception_bp)
+            m_objc_language_runtime->ClearExceptionBreakpoints();
+    }
 }
 
 bool
@@ -586,21 +524,24 @@ ThreadPlanCallFunction::BreakpointsExplainStop()
 {
     StopInfoSP stop_info_sp = GetPrivateStopInfo ();
     
-    if ((m_cxx_language_runtime &&
-            m_cxx_language_runtime->ExceptionBreakpointsExplainStop(stop_info_sp))
-       ||(m_objc_language_runtime &&
-            m_objc_language_runtime->ExceptionBreakpointsExplainStop(stop_info_sp)))
+    if (m_trap_exceptions)
     {
-        Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP));
-        if (log)
-            log->Printf ("ThreadPlanCallFunction::BreakpointsExplainStop - Hit an exception breakpoint, setting plan complete.");
-        
-        SetPlanComplete(false);
-        
-        // If the user has set the ObjC language breakpoint, it would normally get priority over our internal
-        // catcher breakpoint, but in this case we can't let that happen, so force the ShouldStop here.
-        stop_info_sp->OverrideShouldStop (true);
-        return true;
+        if ((m_cxx_language_runtime &&
+                m_cxx_language_runtime->ExceptionBreakpointsExplainStop(stop_info_sp))
+           ||(m_objc_language_runtime &&
+                m_objc_language_runtime->ExceptionBreakpointsExplainStop(stop_info_sp)))
+        {
+            Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_STEP));
+            if (log)
+                log->Printf ("ThreadPlanCallFunction::BreakpointsExplainStop - Hit an exception breakpoint, setting plan complete.");
+            
+            SetPlanComplete(false);
+            
+            // If the user has set the ObjC language breakpoint, it would normally get priority over our internal
+            // catcher breakpoint, but in this case we can't let that happen, so force the ShouldStop here.
+            stop_info_sp->OverrideShouldStop (true);
+            return true;
+        }
     }
     
     return false;
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallUserExpression.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallUserExpression.cpp
index 70de1cbe86e..827de3e6057 100644
--- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallUserExpression.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanCallUserExpression.cpp
@@ -38,14 +38,10 @@ using namespace lldb_private;
 
 ThreadPlanCallUserExpression::ThreadPlanCallUserExpression (Thread &thread,
                                                 Address &function,
-                                                lldb::addr_t arg,
-                                                bool stop_other_threads,
-                                                bool unwind_on_error,
-                                                bool ignore_breakpoints,
-                                                lldb::addr_t *this_arg,
-                                                lldb::addr_t *cmd_arg,
+                                                llvm::ArrayRef<lldb::addr_t> args,
+                                                const EvaluateExpressionOptions &options,
                                                 ClangUserExpression::ClangUserExpressionSP &user_expression_sp) :
-    ThreadPlanCallFunction (thread, function, ClangASTType(), arg, stop_other_threads, unwind_on_error, ignore_breakpoints, this_arg, cmd_arg),
+    ThreadPlanCallFunction (thread, function, ClangASTType(), args, options),
     m_user_expression_sp (user_expression_sp)
 {
     // User expressions are generally "User generated" so we should set them up to stop when done.
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanRunToAddress.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanRunToAddress.cpp
index 86825d2eb26..9e771397305 100644
--- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanRunToAddress.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanRunToAddress.cpp
@@ -88,7 +88,7 @@ ThreadPlanRunToAddress::SetInitialBreakpoints ()
     for (size_t i = 0; i < num_addresses; i++)
     {
         Breakpoint *breakpoint;
-        breakpoint = m_thread.CalculateTarget()->CreateBreakpoint (m_addresses[i], true).get();
+        breakpoint = m_thread.CalculateTarget()->CreateBreakpoint (m_addresses[i], true, false).get();
         if (breakpoint != NULL)
         {
             m_break_ids[i] = breakpoint->GetID();
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInRange.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInRange.cpp
index c1f14bd216d..2cfd29f8919 100644
--- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInRange.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepInRange.cpp
@@ -132,9 +132,9 @@ ThreadPlanStepInRange::ShouldStop (Event *event_ptr)
         
         bool stop_others;
         if (m_stop_others == lldb::eOnlyThisThread)
-            stop_others = false;
-        else
             stop_others = true;
+        else
+            stop_others = false;
             
         FrameComparison frame_order = CompareCurrentFrameToStartFrame();
         
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOut.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOut.cpp
index ba529587437..c5efb558152 100644
--- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOut.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOut.cpp
@@ -102,7 +102,7 @@ ThreadPlanStepOut::ThreadPlanStepOut
         if (m_return_addr == LLDB_INVALID_ADDRESS)
             return;
         
-        Breakpoint *return_bp = m_thread.CalculateTarget()->CreateBreakpoint (m_return_addr, true).get();
+        Breakpoint *return_bp = m_thread.CalculateTarget()->CreateBreakpoint (m_return_addr, true, false).get();
         if (return_bp != NULL)
         {
             return_bp->SetThreadID(m_thread.GetID());
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp
index 7b8539ce422..2d8108bf9b7 100644
--- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepOverRange.cpp
@@ -65,6 +65,32 @@ ThreadPlanStepOverRange::GetDescription (Stream *s, lldb::DescriptionLevel level
     }
 }
 
+bool
+ThreadPlanStepOverRange::IsEquivalentContext(const SymbolContext &context)
+{
+
+    // Match as much as is specified in the m_addr_context:
+    // This is a fairly loose sanity check.  Note, sometimes the target doesn't get filled
+    // in so I left out the target check.  And sometimes the module comes in as the .o file from the
+    // inlined range, so I left that out too...
+    if (m_addr_context.comp_unit)
+    {
+        if (m_addr_context.comp_unit == context.comp_unit)
+        {
+            if (m_addr_context.function && m_addr_context.function == context.function)
+            {
+                if (m_addr_context.block && m_addr_context.block == context.block)
+                    return true;
+            }
+        }
+    }
+    else if (m_addr_context.symbol && m_addr_context.symbol == context.symbol)
+    {
+        return true;
+    }
+    return false;
+}
+
 bool
 ThreadPlanStepOverRange::ShouldStop (Event *event_ptr)
 {
@@ -109,51 +135,29 @@ ThreadPlanStepOverRange::ShouldStop (Event *event_ptr)
     {
         // Make sure we really are in a new frame.  Do that by unwinding and seeing if the
         // start function really is our start function...
-        StackFrameSP older_frame_sp = m_thread.GetStackFrameAtIndex(1);
-        
-        // But if we can't even unwind one frame we should just get out of here & stop...
-        if (older_frame_sp)
+        for(uint32_t i = 1;; ++i)
         {
+            StackFrameSP older_frame_sp = m_thread.GetStackFrameAtIndex(i);
+            if (!older_frame_sp) {
+                // We can't unwind the next frame we should just get out of here & stop...
+                break;
+            }
+
             const SymbolContext &older_context = older_frame_sp->GetSymbolContext(eSymbolContextEverything);
-            
-            // Match as much as is specified in the m_addr_context:
-            // This is a fairly loose sanity check.  Note, sometimes the target doesn't get filled
-            // in so I left out the target check.  And sometimes the module comes in as the .o file from the
-            // inlined range, so I left that out too...
-            
-            bool older_ctx_is_equivalent = true;
-            if (m_addr_context.comp_unit)
-            {
-                if (m_addr_context.comp_unit == older_context.comp_unit)
-                {
-                    if (m_addr_context.function && m_addr_context.function == older_context.function)
-                    {
-                        if (m_addr_context.block && m_addr_context.block == older_context.block)
-                        {
-                            older_ctx_is_equivalent = true;
-                        }
-                    }
-                }
-            }
-            else if (m_addr_context.symbol && m_addr_context.symbol == older_context.symbol)
-            {
-                older_ctx_is_equivalent = true;
-            }
-        
-            if (older_ctx_is_equivalent)
+            if (IsEquivalentContext(older_context))
             {
                 new_plan_sp = m_thread.QueueThreadPlanForStepOut (false,
-                                                           NULL, 
-                                                           true, 
-                                                           stop_others, 
-                                                           eVoteNo, 
+                                                           NULL,
+                                                           true,
+                                                           stop_others,
+                                                           eVoteNo,
                                                            eVoteNoOpinion,
                                                            0);
+                break;
             }
-            else 
+            else
             {
                 new_plan_sp = m_thread.QueueThreadPlanForStepThrough (m_stack_id, false, stop_others);
-                
             }
         }
     }
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepRange.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepRange.cpp
index 3940d542c10..309f773c505 100644
--- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepRange.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepRange.cpp
@@ -173,6 +173,25 @@ ThreadPlanStepRange::InRange ()
                         log->Printf ("Step range plan stepped to another range of same line: %s", s.GetData());
                     }
                 }
+                else if (new_context.line_entry.line == 0)
+                {
+                    new_context.line_entry.line = m_addr_context.line_entry.line;
+                    m_addr_context = new_context;
+                    AddRange(m_addr_context.line_entry.range);
+                    ret_value = true;
+                    if (log)
+                    {
+                        StreamString s;
+                        m_addr_context.line_entry.Dump (&s,
+                                                        m_thread.CalculateTarget().get(),
+                                                        true,
+                                                        Address::DumpStyleLoadAddress,
+                                                        Address::DumpStyleLoadAddress,
+                                                        true);
+
+                        log->Printf ("Step range plan stepped to a range at linenumber 0 stepping through that range: %s", s.GetData());
+                    }
+                }
                 else if (new_context.line_entry.range.GetBaseAddress().GetLoadAddress(m_thread.CalculateTarget().get())
                          != pc_load_addr)
                 {
@@ -284,11 +303,13 @@ ThreadPlanStepRange::GetInstructionsForAddress(lldb::addr_t addr, size_t &range_
                 ExecutionContext exe_ctx (m_thread.GetProcess());
                 const char *plugin_name = NULL;
                 const char *flavor = NULL;
+                const bool prefer_file_cache = true;
                 m_instruction_ranges[i] = Disassembler::DisassembleRange(GetTarget().GetArchitecture(),
                                                                          plugin_name,
                                                                          flavor,
                                                                          exe_ctx,
-                                                                         m_address_ranges[i]);
+                                                                         m_address_ranges[i],
+                                                                         prefer_file_cache);
                 
             }
             if (!m_instruction_ranges[i])
@@ -361,7 +382,7 @@ ThreadPlanStepRange::SetNextBranchBreakpoint ()
         {
             const bool is_internal = true;
             run_to_address = instructions->GetInstructionAtIndex(branch_index)->GetAddress();
-            m_next_branch_bp_sp = GetTarget().CreateBreakpoint(run_to_address, is_internal);
+            m_next_branch_bp_sp = GetTarget().CreateBreakpoint(run_to_address, is_internal, false);
             if (m_next_branch_bp_sp)
             {
                 if (log)
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepThrough.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepThrough.cpp
index 92d1fcd850d..37cd03c6986 100644
--- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepThrough.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepThrough.cpp
@@ -56,7 +56,7 @@ ThreadPlanStepThrough::ThreadPlanStepThrough (Thread &thread, StackID &m_stack_i
         if (return_frame_sp)
         {
             m_backstop_addr = return_frame_sp->GetFrameCodeAddress().GetLoadAddress(m_thread.CalculateTarget().get());
-            Breakpoint *return_bp = m_thread.GetProcess()->GetTarget().CreateBreakpoint (m_backstop_addr, true).get();
+            Breakpoint *return_bp = m_thread.GetProcess()->GetTarget().CreateBreakpoint (m_backstop_addr, true, false).get();
             if (return_bp != NULL)
             {
                 return_bp->SetThreadID(m_thread.GetID());
diff --git a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp
index e1b5a0560c7..62e05c7fe34 100644
--- a/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/ThreadPlanStepUntil.cpp
@@ -68,7 +68,7 @@ ThreadPlanStepUntil::ThreadPlanStepUntil
         {
             // TODO: add inline functionality
             m_return_addr = return_frame_sp->GetStackID().GetPC();
-            Breakpoint *return_bp = target_sp->CreateBreakpoint (m_return_addr, true).get();
+            Breakpoint *return_bp = target_sp->CreateBreakpoint (m_return_addr, true, false).get();
             if (return_bp != NULL)
             {
                 return_bp->SetThreadID(thread_id);
@@ -82,7 +82,7 @@ ThreadPlanStepUntil::ThreadPlanStepUntil
         // Now set breakpoints on all our return addresses:
         for (size_t i = 0; i < num_addresses; i++)
         {
-            Breakpoint *until_bp = target_sp->CreateBreakpoint (address_list[i], true).get();
+            Breakpoint *until_bp = target_sp->CreateBreakpoint (address_list[i], true, false).get();
             if (until_bp != NULL)
             {
                 until_bp->SetThreadID(thread_id);
diff --git a/contrib/llvm/tools/lldb/source/Target/UnixSignals.cpp b/contrib/llvm/tools/lldb/source/Target/UnixSignals.cpp
index 7fe81f85e85..16a35b5f5a2 100644
--- a/contrib/llvm/tools/lldb/source/Target/UnixSignals.cpp
+++ b/contrib/llvm/tools/lldb/source/Target/UnixSignals.cpp
@@ -74,13 +74,13 @@ UnixSignals::Reset ()
     AddSignal (11,   "SIGSEGV",   "SEGV",    false,   true , true , "segmentation violation");
     AddSignal (12,   "SIGSYS",    "SYS",     false,   true , true , "bad argument to system call");
     AddSignal (13,   "SIGPIPE",   "PIPE",    false,   true , true , "write on a pipe with no one to read it");
-    AddSignal (14,   "SIGALRM",   "ALRM",    false,   false, true , "alarm clock");
+    AddSignal (14,   "SIGALRM",   "ALRM",    false,   false, false, "alarm clock");
     AddSignal (15,   "SIGTERM",   "TERM",    false,   true , true , "software termination signal from kill");
     AddSignal (16,   "SIGURG",    "URG",     false,   false, false, "urgent condition on IO channel");
     AddSignal (17,   "SIGSTOP",   "STOP",    true ,   true , true , "sendable stop signal not from tty");
     AddSignal (18,   "SIGTSTP",   "TSTP",    false,   true , true , "stop signal from tty");
     AddSignal (19,   "SIGCONT",   "CONT",    false,   true , true , "continue a stopped process");
-    AddSignal (20,   "SIGCHLD",   "CHLD",    false,   false, true , "to parent on child stop or exit");
+    AddSignal (20,   "SIGCHLD",   "CHLD",    false,   false, false, "to parent on child stop or exit");
     AddSignal (21,   "SIGTTIN",   "TTIN",    false,   true , true , "to readers process group upon background tty read");
     AddSignal (22,   "SIGTTOU",   "TTOU",    false,   true , true , "to readers process group upon background tty write");
     AddSignal (23,   "SIGIO",     "IO",      false,   false, false, "input/output possible signal");
diff --git a/contrib/llvm/tools/lldb/source/Utility/PseudoTerminal.cpp b/contrib/llvm/tools/lldb/source/Utility/PseudoTerminal.cpp
index e4b444c3687..98d581def4c 100644
--- a/contrib/llvm/tools/lldb/source/Utility/PseudoTerminal.cpp
+++ b/contrib/llvm/tools/lldb/source/Utility/PseudoTerminal.cpp
@@ -17,6 +17,21 @@
 #include <sys/ioctl.h>
 #endif
 
+#ifdef _WIN32
+#include "lldb/Host/windows/win32.h"
+// empty functions
+int posix_openpt(int flag) { return 0; }
+
+int strerror_r(int errnum, char *buf, size_t buflen) { return 0; }
+
+int unlockpt(int fd) { return 0; }
+int grantpt(int fd) { return 0; }
+char *ptsname(int fd) { return 0; }
+
+pid_t fork(void) { return 0; }
+pid_t setsid(void) { return 0; }
+#endif
+
 using namespace lldb_utility;
 
 //----------------------------------------------------------------------
diff --git a/contrib/llvm/tools/lldb/source/Utility/RefCounter.cpp b/contrib/llvm/tools/lldb/source/Utility/RefCounter.cpp
deleted file mode 100644
index c3acedd2f05..00000000000
--- a/contrib/llvm/tools/lldb/source/Utility/RefCounter.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//===---------------------RefCounter.cpp ------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/Utility/RefCounter.h"
-
-namespace lldb_utility {
-
-RefCounter::RefCounter(RefCounter::value_type* ctr):
-m_counter(ctr)
-{
-    increment(m_counter);
-}
-
-RefCounter::~RefCounter()
-{
-    decrement(m_counter);
-}
-
-} // namespace lldb_utility
diff --git a/contrib/llvm/tools/lldb/source/Utility/SharingPtr.cpp b/contrib/llvm/tools/lldb/source/Utility/SharingPtr.cpp
index f64d7e3995b..be237cec61c 100644
--- a/contrib/llvm/tools/lldb/source/Utility/SharingPtr.cpp
+++ b/contrib/llvm/tools/lldb/source/Utility/SharingPtr.cpp
@@ -138,13 +138,21 @@ namespace imp
     void
     shared_count::add_shared()
     {
-        increment(shared_owners_);
+#ifdef _MSC_VER
+        _InterlockedIncrement(&shared_owners_);
+#else
+        ++shared_owners_;
+#endif
     }
 
     void
     shared_count::release_shared()
     {
-        if (decrement(shared_owners_) == -1)
+#ifdef _MSC_VER
+        if (_InterlockedDecrement(&shared_owners_) == -1)
+#else
+        if (--shared_owners_ == -1)
+#endif
         {
             on_zero_shared();
             delete this;
diff --git a/contrib/llvm/tools/lldb/source/Utility/StringExtractor.cpp b/contrib/llvm/tools/lldb/source/Utility/StringExtractor.cpp
index 2f4bcecda8f..9d231570882 100644
--- a/contrib/llvm/tools/lldb/source/Utility/StringExtractor.cpp
+++ b/contrib/llvm/tools/lldb/source/Utility/StringExtractor.cpp
@@ -145,11 +145,10 @@ StringExtractor::GetChar (char fail_value)
 uint8_t
 StringExtractor::GetHexU8 (uint8_t fail_value, bool set_eof_on_fail)
 {
-    uint32_t i = m_index;
-    if ((i + 2) <= m_packet.size())
+    if (GetBytesLeft() >= 2)
     {
-        const uint8_t hi_nibble = g_hex_ascii_to_hex_integer[static_cast<uint8_t>(m_packet[i])];
-        const uint8_t lo_nibble = g_hex_ascii_to_hex_integer[static_cast<uint8_t>(m_packet[i+1])];
+        const uint8_t hi_nibble = g_hex_ascii_to_hex_integer[static_cast<uint8_t>(m_packet[m_index])];
+        const uint8_t lo_nibble = g_hex_ascii_to_hex_integer[static_cast<uint8_t>(m_packet[m_index+1])];
         if (hi_nibble < 16 && lo_nibble < 16)
         {
             m_index += 2;
@@ -168,10 +167,68 @@ StringExtractor::GetU32 (uint32_t fail_value, int base)
     {
         char *end = NULL;
         const char *start = m_packet.c_str();
-        const char *uint_cstr = start + m_index;
-        uint32_t result = ::strtoul (uint_cstr, &end, base);
+        const char *cstr = start + m_index;
+        uint32_t result = ::strtoul (cstr, &end, base);
 
-        if (end && end != uint_cstr)
+        if (end && end != cstr)
+        {
+            m_index = end - start;
+            return result;
+        }
+    }
+    return fail_value;
+}
+
+int32_t
+StringExtractor::GetS32 (int32_t fail_value, int base)
+{
+    if (m_index < m_packet.size())
+    {
+        char *end = NULL;
+        const char *start = m_packet.c_str();
+        const char *cstr = start + m_index;
+        int32_t result = ::strtol (cstr, &end, base);
+        
+        if (end && end != cstr)
+        {
+            m_index = end - start;
+            return result;
+        }
+    }
+    return fail_value;
+}
+
+
+uint64_t
+StringExtractor::GetU64 (uint64_t fail_value, int base)
+{
+    if (m_index < m_packet.size())
+    {
+        char *end = NULL;
+        const char *start = m_packet.c_str();
+        const char *cstr = start + m_index;
+        uint64_t result = ::strtoull (cstr, &end, base);
+        
+        if (end && end != cstr)
+        {
+            m_index = end - start;
+            return result;
+        }
+    }
+    return fail_value;
+}
+
+int64_t
+StringExtractor::GetS64 (int64_t fail_value, int base)
+{
+    if (m_index < m_packet.size())
+    {
+        char *end = NULL;
+        const char *start = m_packet.c_str();
+        const char *cstr = start + m_index;
+        int64_t result = ::strtoll (cstr, &end, base);
+        
+        if (end && end != cstr)
         {
             m_index = end - start;
             return result;
@@ -371,6 +428,20 @@ StringExtractor::GetHexByteString (std::string &str)
     return str.size();
 }
 
+size_t
+StringExtractor::GetHexByteStringTerminatedBy (std::string &str,
+                                               char terminator)
+{
+    str.clear();
+    char ch;
+    while ((ch = GetHexU8(0,false)) != '\0')
+        str.append(1, ch);
+    if (Peek() && *Peek() == terminator)
+        return str.size();
+    str.clear();
+    return str.size();
+}
+
 bool
 StringExtractor::GetNameColonValue (std::string &name, std::string &value)
 {
diff --git a/contrib/llvm/tools/lldb/source/Utility/StringExtractor.h b/contrib/llvm/tools/lldb/source/Utility/StringExtractor.h
index 0ded3101fcc..2aab3b09f47 100644
--- a/contrib/llvm/tools/lldb/source/Utility/StringExtractor.h
+++ b/contrib/llvm/tools/lldb/source/Utility/StringExtractor.h
@@ -101,9 +101,18 @@ public:
     bool
     GetNameColonValue (std::string &name, std::string &value);
 
+    int32_t
+    GetS32 (int32_t fail_value, int base = 0);
+
     uint32_t
     GetU32 (uint32_t fail_value, int base = 0);
 
+    int64_t
+    GetS64 (int64_t fail_value, int base = 0);
+    
+    uint64_t
+    GetU64 (uint64_t fail_value, int base = 0);
+
     uint32_t
     GetHexMaxU32 (bool little_endian, uint32_t fail_value);
 
@@ -119,6 +128,10 @@ public:
     size_t
     GetHexByteString (std::string &str);
 
+    size_t
+    GetHexByteStringTerminatedBy (std::string &str,
+                                  char terminator);
+    
     const char *
     Peek ()
     {
diff --git a/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp b/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp
index 7e06a0f59bc..08e7af72565 100644
--- a/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp
+++ b/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.cpp
@@ -94,6 +94,9 @@ StringExtractorGDBRemote::GetServerPacketType () const
             else if (PACKET_STARTS_WITH ("QSetSTDERR:"))        return eServerPacketType_QSetSTDERR;
             else if (PACKET_STARTS_WITH ("QSetWorkingDir:"))    return eServerPacketType_QSetWorkingDir;
             break;
+        case 'L':
+            if (PACKET_STARTS_WITH ("QLaunchArch:"))            return eServerPacketType_QLaunchArch;
+            break;
         }
         break;
             
@@ -114,20 +117,29 @@ StringExtractorGDBRemote::GetServerPacketType () const
 
         case 'G':
             if (PACKET_STARTS_WITH ("qGroupName:"))             return eServerPacketType_qGroupName;
+            if (PACKET_MATCHES ("qGetWorkingDir"))              return eServerPacketType_qGetWorkingDir;
             break;
 
         case 'H':
             if (PACKET_MATCHES ("qHostInfo"))                   return eServerPacketType_qHostInfo;
             break;
 
+        case 'K':
+            if (PACKET_STARTS_WITH ("qKillSpawnedProcess"))     return eServerPacketType_qKillSpawnedProcess;
+            break;
+        
         case 'L':
-            if (PACKET_MATCHES ("qLaunchGDBServer"))            return eServerPacketType_qLaunchGDBServer;
+            if (PACKET_STARTS_WITH ("qLaunchGDBServer"))        return eServerPacketType_qLaunchGDBServer;
             if (PACKET_MATCHES ("qLaunchSuccess"))              return eServerPacketType_qLaunchSuccess;
             break;
             
         case 'P':
             if (PACKET_STARTS_WITH ("qProcessInfoPID:"))        return eServerPacketType_qProcessInfoPID;
+            if (PACKET_STARTS_WITH ("qPlatform_shell:"))   return eServerPacketType_qPlatform_shell;
+            if (PACKET_STARTS_WITH ("qPlatform_mkdir:"))        return eServerPacketType_qPlatform_mkdir;
+            if (PACKET_STARTS_WITH ("qPlatform_chmod:"))        return eServerPacketType_qPlatform_chmod;
             break;
+                
 
         case 'S':
             if (PACKET_STARTS_WITH ("qSpeedTest:"))             return eServerPacketType_qSpeedTest;
@@ -138,6 +150,23 @@ StringExtractorGDBRemote::GetServerPacketType () const
             break;
         }
         break;
+    case 'v':
+            if (PACKET_STARTS_WITH("vFile:"))
+            {
+                if (PACKET_STARTS_WITH("vFile:open:"))          return eServerPacketType_vFile_open;
+                else if (PACKET_STARTS_WITH("vFile:close:"))    return eServerPacketType_vFile_close;
+                else if (PACKET_STARTS_WITH("vFile:pread"))     return eServerPacketType_vFile_pread;
+                else if (PACKET_STARTS_WITH("vFile:pwrite"))    return eServerPacketType_vFile_pwrite;
+                else if (PACKET_STARTS_WITH("vFile:size"))      return eServerPacketType_vFile_size;
+                else if (PACKET_STARTS_WITH("vFile:exists"))    return eServerPacketType_vFile_exists;
+                else if (PACKET_STARTS_WITH("vFile:stat"))      return eServerPacketType_vFile_stat;
+                else if (PACKET_STARTS_WITH("vFile:mode"))      return eServerPacketType_vFile_mode;
+                else if (PACKET_STARTS_WITH("vFile:MD5"))       return eServerPacketType_vFile_md5;
+                else if (PACKET_STARTS_WITH("vFile:symlink"))   return eServerPacketType_vFile_symlink;
+                else if (PACKET_STARTS_WITH("vFile:unlink"))    return eServerPacketType_vFile_unlink;
+
+            }
+            break;
     }
     return eServerPacketType_unimplemented;
 }
@@ -180,3 +209,19 @@ StringExtractorGDBRemote::GetError ()
     }
     return 0;
 }
+
+size_t
+StringExtractorGDBRemote::GetEscapedBinaryData (std::string &str)
+{
+    str.clear();
+    char ch;
+    while (GetBytesLeft())
+    {
+        ch = GetChar();
+        if (ch == 0x7d)
+            ch = (GetChar() ^ 0x20);
+        str.append(1,ch);
+    }
+    return str.size();
+}
+
diff --git a/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.h b/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.h
index 5a24d894b10..2379882e8bf 100644
--- a/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.h
+++ b/contrib/llvm/tools/lldb/source/Utility/StringExtractorGDBRemote.h
@@ -53,17 +53,34 @@ public:
         eServerPacketType_qGroupName,
         eServerPacketType_qHostInfo,
         eServerPacketType_qLaunchGDBServer,
+        eServerPacketType_qKillSpawnedProcess,
         eServerPacketType_qLaunchSuccess,
         eServerPacketType_qProcessInfoPID,
         eServerPacketType_qSpeedTest,
         eServerPacketType_qUserName,
+        eServerPacketType_qGetWorkingDir,
         eServerPacketType_QEnvironment,
+        eServerPacketType_QLaunchArch,
         eServerPacketType_QSetDisableASLR,
         eServerPacketType_QSetSTDIN,
         eServerPacketType_QSetSTDOUT,
         eServerPacketType_QSetSTDERR,
         eServerPacketType_QSetWorkingDir,
-        eServerPacketType_QStartNoAckMode
+        eServerPacketType_QStartNoAckMode,
+        eServerPacketType_qPlatform_shell,
+        eServerPacketType_qPlatform_mkdir,
+        eServerPacketType_qPlatform_chmod,
+        eServerPacketType_vFile_open,
+        eServerPacketType_vFile_close,
+        eServerPacketType_vFile_pread,
+        eServerPacketType_vFile_pwrite,
+        eServerPacketType_vFile_size,
+        eServerPacketType_vFile_mode,
+        eServerPacketType_vFile_exists,
+        eServerPacketType_vFile_md5,
+        eServerPacketType_vFile_stat,
+        eServerPacketType_vFile_symlink,
+        eServerPacketType_vFile_unlink
     };
     
     ServerPacketType
@@ -98,6 +115,10 @@ public:
     // digits. Otherwise the error encoded in XX is returned.
     uint8_t
     GetError();
+    
+    size_t
+    GetEscapedBinaryData (std::string &str);
+
 };
 
 #endif  // utility_StringExtractorGDBRemote_h_
diff --git a/contrib/llvm/tools/lldb/source/lldb-log.cpp b/contrib/llvm/tools/lldb/source/lldb-log.cpp
index c53fa56ef01..5e1dc3a54e8 100644
--- a/contrib/llvm/tools/lldb/source/lldb-log.cpp
+++ b/contrib/llvm/tools/lldb/source/lldb-log.cpp
@@ -126,6 +126,7 @@ lldb_private::DisableLog (const char **categories, Stream *feedback_strm)
                 else if (0 == ::strncasecmp(arg, "expr", 4))    flag_bits &= ~LIBLLDB_LOG_EXPRESSIONS;
                 else if (0 == ::strncasecmp(arg, "object", 6))  flag_bits &= ~LIBLLDB_LOG_OBJECT;
                 else if (0 == ::strcasecmp(arg, "process"))     flag_bits &= ~LIBLLDB_LOG_PROCESS;
+                else if (0 == ::strcasecmp(arg, "platform"))    flag_bits &= ~LIBLLDB_LOG_PLATFORM;
                 else if (0 == ::strcasecmp(arg, "script"))      flag_bits &= ~LIBLLDB_LOG_SCRIPT;
                 else if (0 == ::strcasecmp(arg, "state"))       flag_bits &= ~LIBLLDB_LOG_STATE;
                 else if (0 == ::strcasecmp(arg, "step"))        flag_bits &= ~LIBLLDB_LOG_STEP;
@@ -190,29 +191,30 @@ lldb_private::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, const ch
             else if (0 == ::strcasecmp(arg, "api"))         flag_bits |= LIBLLDB_LOG_API;
             else if (0 == ::strncasecmp(arg, "break", 5))   flag_bits |= LIBLLDB_LOG_BREAKPOINTS;
             else if (0 == ::strcasecmp(arg, "commands"))    flag_bits |= LIBLLDB_LOG_COMMANDS;
+            else if (0 == ::strncasecmp(arg, "commu", 5))   flag_bits |= LIBLLDB_LOG_COMMUNICATION;
+            else if (0 == ::strncasecmp(arg, "conn", 4))    flag_bits |= LIBLLDB_LOG_CONNECTION;
             else if (0 == ::strcasecmp(arg, "default"))     flag_bits |= LIBLLDB_LOG_DEFAULT;
             else if (0 == ::strcasecmp(arg, "dyld"))        flag_bits |= LIBLLDB_LOG_DYNAMIC_LOADER;
             else if (0 == ::strncasecmp(arg, "event", 5))   flag_bits |= LIBLLDB_LOG_EVENTS;
             else if (0 == ::strncasecmp(arg, "expr", 4))    flag_bits |= LIBLLDB_LOG_EXPRESSIONS;
+            else if (0 == ::strncasecmp(arg, "host", 4))    flag_bits |= LIBLLDB_LOG_HOST;
+            else if (0 == ::strncasecmp(arg, "mmap", 4))    flag_bits |= LIBLLDB_LOG_MMAP;
+            else if (0 == ::strncasecmp(arg, "module", 6))  flag_bits |= LIBLLDB_LOG_MODULES;
             else if (0 == ::strncasecmp(arg, "object", 6))  flag_bits |= LIBLLDB_LOG_OBJECT;
+            else if (0 == ::strcasecmp(arg, "os"))          flag_bits |= LIBLLDB_LOG_OS;
+            else if (0 == ::strcasecmp(arg, "platform"))    flag_bits |= LIBLLDB_LOG_PLATFORM;
             else if (0 == ::strcasecmp(arg, "process"))     flag_bits |= LIBLLDB_LOG_PROCESS;
             else if (0 == ::strcasecmp(arg, "script"))      flag_bits |= LIBLLDB_LOG_SCRIPT;
             else if (0 == ::strcasecmp(arg, "state"))       flag_bits |= LIBLLDB_LOG_STATE;
             else if (0 == ::strcasecmp(arg, "step"))        flag_bits |= LIBLLDB_LOG_STEP;
-            else if (0 == ::strcasecmp(arg, "thread"))      flag_bits |= LIBLLDB_LOG_THREAD;
+            else if (0 == ::strncasecmp(arg, "symbol", 6))  flag_bits |= LIBLLDB_LOG_SYMBOLS;
             else if (0 == ::strcasecmp(arg, "target"))      flag_bits |= LIBLLDB_LOG_TARGET;
+            else if (0 == ::strncasecmp(arg, "temp", 4))    flag_bits |= LIBLLDB_LOG_TEMPORARY;
+            else if (0 == ::strcasecmp(arg, "thread"))      flag_bits |= LIBLLDB_LOG_THREAD;
+            else if (0 == ::strncasecmp(arg, "types", 5))   flag_bits |= LIBLLDB_LOG_TYPES;
+            else if (0 == ::strncasecmp(arg, "unwind", 6))  flag_bits |= LIBLLDB_LOG_UNWIND;
             else if (0 == ::strcasecmp(arg, "verbose"))     flag_bits |= LIBLLDB_LOG_VERBOSE;
             else if (0 == ::strncasecmp(arg, "watch", 5))   flag_bits |= LIBLLDB_LOG_WATCHPOINTS;
-            else if (0 == ::strncasecmp(arg, "temp", 4))    flag_bits |= LIBLLDB_LOG_TEMPORARY;
-            else if (0 == ::strncasecmp(arg, "comm", 4))    flag_bits |= LIBLLDB_LOG_COMMUNICATION;
-            else if (0 == ::strncasecmp(arg, "conn", 4))    flag_bits |= LIBLLDB_LOG_CONNECTION;
-            else if (0 == ::strncasecmp(arg, "host", 4))    flag_bits |= LIBLLDB_LOG_HOST;
-            else if (0 == ::strncasecmp(arg, "unwind", 6))  flag_bits |= LIBLLDB_LOG_UNWIND;
-            else if (0 == ::strncasecmp(arg, "types", 5))   flag_bits |= LIBLLDB_LOG_TYPES;
-            else if (0 == ::strncasecmp(arg, "symbol", 6))  flag_bits |= LIBLLDB_LOG_SYMBOLS;
-            else if (0 == ::strncasecmp(arg, "module", 6))  flag_bits |= LIBLLDB_LOG_MODULES;
-            else if (0 == ::strncasecmp(arg, "mmap", 4))    flag_bits |= LIBLLDB_LOG_MMAP;
-            else if (0 == ::strcasecmp(arg, "os"))          flag_bits |= LIBLLDB_LOG_OS;
             else
             {
                 feedback_strm->Printf("error: unrecognized log category '%s'\n", arg);
@@ -237,12 +239,18 @@ lldb_private::ListLogCategories (Stream *strm)
                  "  api - enable logging of API calls and return values\n"
                  "  break - log breakpoints\n"
                  "  commands - log command argument parsing\n"
+                 "  communication - log communication activities\n"
+                 "  connection - log connection details\n"
                  "  default - enable the default set of logging categories for liblldb\n"
                  "  dyld - log shared library related activities\n"
                  "  events - log broadcaster, listener and event queue activities\n"
                  "  expr - log expressions\n"
-                 "  object - log object construction/destruction for important objects\n"
+                 "  host - log host activities\n"
+                 "  mmap - log mmap related activities\n"
                  "  module - log module activities such as when modules are created, detroyed, replaced, and more\n"
+                 "  object - log object construction/destruction for important objects\n"
+                 "  os - log OperatingSystem plugin related activities\n"
+                 "  platform - log platform events and activities\n"
                  "  process - log process events and activities\n"
                  "  script - log events about the script interpreter\n"
                  "  state - log private and public process state changes\n"
diff --git a/contrib/llvm/tools/lldb/source/lldb.cpp b/contrib/llvm/tools/lldb/source/lldb.cpp
index 29c3c0e229c..ab4e491d614 100644
--- a/contrib/llvm/tools/lldb/source/lldb.cpp
+++ b/contrib/llvm/tools/lldb/source/lldb.cpp
@@ -37,6 +37,7 @@
 #include "Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h"
 #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h"
 #include "Plugins/Platform/FreeBSD/PlatformFreeBSD.h"
+#include "Plugins/Platform/POSIX/PlatformPOSIX.h"
 #include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h"
 #ifndef LLDB_DISABLE_PYTHON
 #include "Plugins/OperatingSystem/Python/OperatingSystemPython.h"
@@ -53,9 +54,10 @@
 #include "Plugins/Platform/MacOSX/PlatformRemoteiOS.h"
 #include "Plugins/Platform/MacOSX/PlatformDarwinKernel.h"
 #include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h"
+#include "Plugins/SystemRuntime/MacOSX/SystemRuntimeMacOSX.h"
 #endif
 
-#if defined(__linux__) or defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__)
 #include "Plugins/Process/elf-core/ProcessElfCore.h"
 #endif
 
@@ -123,6 +125,7 @@ lldb_private::Initialize ()
         PlatformRemoteiOS::Initialize();
         PlatformMacOSX::Initialize();
         PlatformiOSSimulator::Initialize();
+        SystemRuntimeMacOSX::Initialize();
 #endif
 #if defined (__linux__)
         //----------------------------------------------------------------------
@@ -134,7 +137,7 @@ lldb_private::Initialize ()
         ProcessFreeBSD::Initialize();
 #endif
 
-#if defined(__linux__) or defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__)
         ProcessElfCore::Initialize();
 #endif
         //----------------------------------------------------------------------
@@ -167,7 +170,6 @@ lldb_private::Terminate ()
     
     // Terminate and unload and loaded system or user LLDB plug-ins
     PluginManager::Terminate();
-
     ABISysV_x86_64::Terminate();
     DisassemblerLLVMC::Terminate();
     ObjectContainerBSDArchive::Terminate();
@@ -198,6 +200,7 @@ lldb_private::Terminate ()
     PlatformDarwinKernel::Terminate();
     PlatformRemoteiOS::Terminate();
     PlatformiOSSimulator::Terminate();
+    SystemRuntimeMacOSX::Terminate();
 #endif
 
     Debugger::SettingsTerminate ();
@@ -210,7 +213,7 @@ lldb_private::Terminate ()
     ProcessFreeBSD::Terminate();
 #endif
 
-#if defined(__linux__) or defined(__FreeBSD__)
+#if defined(__linux__) || defined(__FreeBSD__)
     ProcessElfCore::Terminate();
 #endif
     ProcessGDBRemote::Terminate();
@@ -388,7 +391,7 @@ lldb_private::NameMatches (const char *name,
         llvm::StringRef match_sref(match);
         switch (match_type)
         {
-        case eNameMatchIgnore:
+        case eNameMatchIgnore: // This case cannot occur: tested before
             return true;
         case eNameMatchEquals:      return name_sref == match_sref;
         case eNameMatchContains:    return name_sref.find (match_sref) != llvm::StringRef::npos;
diff --git a/contrib/llvm/tools/lldb/tools/driver/Driver.cpp b/contrib/llvm/tools/lldb/tools/driver/Driver.cpp
index 875adc22283..e2742425dd4 100644
--- a/contrib/llvm/tools/lldb/tools/driver/Driver.cpp
+++ b/contrib/llvm/tools/lldb/tools/driver/Driver.cpp
@@ -9,19 +9,15 @@
 
 #include "Driver.h"
 
-#include <getopt.h>
-#include <libgen.h>
-#include <sys/ioctl.h>
-#include <termios.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <fcntl.h>
-#include <inttypes.h>
 
 #include <string>
 
+#include <thread>
 #include "IOChannel.h"
 #include "lldb/API/SBBreakpoint.h"
 #include "lldb/API/SBCommandInterpreter.h"
@@ -99,13 +95,21 @@ static OptionDefinition g_options[] =
         "extensions have been implemented." },
     { LLDB_3_TO_5,       false, "debug"          , 'd', no_argument      , 0,  eArgTypeNone,
         "Tells the debugger to print out extra information for debugging itself." },
+    { LLDB_3_TO_5,       false, "source-quietly"          , 'b', no_argument      , 0,  eArgTypeNone,
+        "Tells the debugger to print out extra information for debugging itself." },
     { LLDB_3_TO_5,       false, "source"         , 's', required_argument, 0,  eArgTypeFilename,
-        "Tells the debugger to read in and execute the file <file>, which should contain lldb commands." },
+        "Tells the debugger to read in and execute the lldb commands in the given file, after any file provided on the command line has been loaded." },
+    { LLDB_3_TO_5,       false, "one-line"         , 'o', required_argument, 0,  eArgTypeNone,
+        "Tells the debugger to execute this one-line lldb command after any file provided on the command line has been loaded." },
+    { LLDB_3_TO_5,       false, "source-before-file"         , 'S', required_argument, 0,  eArgTypeFilename,
+        "Tells the debugger to read in and execute the lldb commands in the given file, before any file provided on the command line has been loaded." },
+    { LLDB_3_TO_5,       false, "one-line-before-file"         , 'O', required_argument, 0,  eArgTypeNone,
+        "Tells the debugger to execute this one-line lldb command before any file provided on the command line has been loaded." },
     { LLDB_3_TO_5,       false, "editor"         , 'e', no_argument      , 0,  eArgTypeNone,
         "Tells the debugger to open source files using the host's \"external editor\" mechanism." },
     { LLDB_3_TO_5,       false, "no-lldbinit"    , 'x', no_argument      , 0,  eArgTypeNone,
         "Do not automatically parse any '.lldbinit' files." },
-    { LLDB_3_TO_5,       false, "no-use-colors"  , 'o', no_argument      , 0,  eArgTypeNone,
+    { LLDB_3_TO_5,       false, "no-use-colors"  , 'X', no_argument      , 0,  eArgTypeNone,
         "Do not use colors." },
     { LLDB_OPT_SET_6,    true , "python-path"    , 'P', no_argument      , 0,  eArgTypeNone,
         "Prints out the path to the lldb.py file for this version of lldb." },
@@ -147,7 +151,9 @@ Driver::CloseIOChannelFile ()
     // Write an End of File sequence to the file descriptor to ensure any
     // read functions can exit.
     char eof_str[] = "\x04";
-    ::write (m_editline_pty.GetMasterFileDescriptor(), eof_str, strlen(eof_str));
+    int mfd = m_editline_pty.GetMasterFileDescriptor();
+    if (mfd != -1)
+        ::write (m_editline_pty.GetMasterFileDescriptor(), eof_str, strlen(eof_str));
 
     m_editline_pty.CloseMasterFileDescriptor();
 
@@ -341,6 +347,15 @@ ShowUsage (FILE *out, OptionDefinition *option_table, Driver::OptionData data)
 
     indent_level -= 5;
 
+    fprintf (out, "\n%*sMultiple \"-s\" and \"-o\" options can be provided.  They will be processed from left to right in order, "
+                  "\n%*swith the source files and commands interleaved.  The same is true of the \"-S\" and \"-O\" options."
+                  "\n%*sThe before file and after file sets can intermixed freely, the command parser will sort them out."
+                  "\n%*sThe order of the file specifiers (\"-c\", \"-f\", etc.) is not significant in this regard.\n\n",
+             indent_level, "", 
+             indent_level, "", 
+             indent_level, "",
+             indent_level, "");
+    
     fprintf (out, "\n%*s(If you don't provide -f then the first argument will be the file to be debugged"
                   "\n%*s so '%s -- <filename> [<ARG1> [<ARG2>]]' also works."
                   "\n%*s Remember to end the options with \"--\" if any of your arguments have a \"-\" in them.)\n\n",
@@ -390,8 +405,10 @@ Driver::OptionData::OptionData () :
     m_script_lang (lldb::eScriptLanguageDefault),
     m_core_file (),
     m_crash_log (),
-    m_source_command_files (),
+    m_initial_commands (),
+    m_after_file_commands (),
     m_debug_mode (false),
+    m_source_quietly(false),
     m_print_version (false),
     m_print_python_path (false),
     m_print_help (false),
@@ -412,8 +429,10 @@ Driver::OptionData::Clear ()
 {
     m_args.clear ();
     m_script_lang = lldb::eScriptLanguageDefault;
-    m_source_command_files.clear ();
+    m_initial_commands.clear ();
+    m_after_file_commands.clear ();
     m_debug_mode = false;
+    m_source_quietly = false;
     m_print_help = false;
     m_print_version = false;
     m_print_python_path = false;
@@ -423,6 +442,34 @@ Driver::OptionData::Clear ()
     m_process_pid = LLDB_INVALID_PROCESS_ID;
 }
 
+void
+Driver::OptionData::AddInitialCommand (const char *command, bool before_file, bool is_file, SBError &error)
+{
+    std::vector<std::pair<bool, std::string> > *command_set;
+    if (before_file)
+        command_set = &(m_initial_commands);
+    else
+        command_set = &(m_after_file_commands);
+
+    if (is_file)
+    {
+        SBFileSpec file(command);
+        if (file.Exists())
+            command_set->push_back (std::pair<bool, std::string> (true, optarg));
+        else if (file.ResolveExecutableLocation())
+        {
+            char final_path[PATH_MAX];
+            file.GetPath (final_path, sizeof(final_path));
+            std::string path_str (final_path);
+            command_set->push_back (std::pair<bool, std::string> (true, path_str));
+        }
+        else
+            error.SetErrorStringWithFormat("file specified in --source (-s) option doesn't exist: '%s'", optarg);
+    }
+    else
+        command_set->push_back (std::pair<bool, std::string> (false, optarg));
+}
+
 void
 Driver::ResetOptionValues ()
 {
@@ -451,18 +498,60 @@ Driver::GetScriptLanguage() const
     return m_option_data.m_script_lang;
 }
 
-size_t
-Driver::GetNumSourceCommandFiles () const
+void
+Driver::ExecuteInitialCommands (bool before_file)
 {
-    return m_option_data.m_source_command_files.size();
-}
-
-const char *
-Driver::GetSourceCommandFileAtIndex (uint32_t idx) const
-{
-    if (idx < m_option_data.m_source_command_files.size())
-        return m_option_data.m_source_command_files[idx].c_str();
-    return NULL;
+    size_t num_commands;
+    std::vector<std::pair<bool, std::string> > *command_set;
+    if (before_file)
+        command_set = &(m_option_data.m_initial_commands);
+    else
+        command_set = &(m_option_data.m_after_file_commands);
+    
+    num_commands = command_set->size();
+    SBCommandReturnObject result;
+    bool old_async = GetDebugger().GetAsync();
+    GetDebugger().SetAsync(false);
+    for (size_t idx = 0; idx < num_commands; idx++)
+    {
+        bool is_file = (*command_set)[idx].first;
+        const char *command = (*command_set)[idx].second.c_str();
+        char command_string[PATH_MAX * 2];
+        const bool dump_stream_only_if_no_immediate = true;
+        const char *executed_command = command;
+        if (is_file)
+        {
+            ::snprintf (command_string, sizeof(command_string), "command source '%s'", command);
+            executed_command = command_string;
+        }
+        
+        m_debugger.GetCommandInterpreter().HandleCommand (executed_command, result, false);
+        if (!m_option_data.m_source_quietly || result.Succeeded() == false)
+        {
+            const size_t output_size = result.GetOutputSize();
+            if (output_size > 0)
+                m_io_channel_ap->OutWrite (result.GetOutput(dump_stream_only_if_no_immediate), output_size, NO_ASYNC);
+            const size_t error_size = result.GetErrorSize();
+            if (error_size > 0)
+                m_io_channel_ap->OutWrite (result.GetError(dump_stream_only_if_no_immediate), error_size, NO_ASYNC);
+        }
+        
+        if (result.Succeeded() == false)
+        {
+            char error_buffer[1024];
+            size_t error_size;
+            const char *type = before_file ? "before file" : "after_file";
+            if (is_file)
+                error_size = ::snprintf(error_buffer, sizeof(error_buffer), "Aborting %s command execution, command file: '%s' failed.\n", type, command);
+            else
+                error_size = ::snprintf(error_buffer, sizeof(error_buffer), "Aborting %s command execution, command: '%s' failed.\n", type, command);
+            
+            m_io_channel_ap->OutWrite(error_buffer, error_size, NO_ASYNC);
+            break;
+        }
+        result.Clear();
+    }
+    GetDebugger().SetAsync(old_async);
 }
 
 bool
@@ -478,7 +567,7 @@ Driver::GetDebugMode() const
 // if the user only wanted help or version information.
 
 SBError
-Driver::ParseArgs (int argc, const char *argv[], FILE *out_fh, bool &exit)
+Driver::ParseArgs (int argc, const char *argv[], FILE *out_fh, bool &exiting)
 {
     ResetOptionValues ();
 
@@ -623,7 +712,7 @@ Driver::ParseArgs (int argc, const char *argv[], FILE *out_fh, bool &exit)
                         m_debugger.SkipAppInitFiles (true);
                         break;
 
-                    case 'o':
+                    case 'X':
                         m_debugger.SetUseColor (false);
                         break;
 
@@ -658,6 +747,10 @@ Driver::ParseArgs (int argc, const char *argv[], FILE *out_fh, bool &exit)
                         m_option_data.m_debug_mode = true;
                         break;
 
+                    case 'q':
+                        m_option_data.m_source_quietly = true;
+                        break;
+
                     case 'n':
                         m_option_data.m_process_name = optarg;
                         break;
@@ -676,22 +769,17 @@ Driver::ParseArgs (int argc, const char *argv[], FILE *out_fh, bool &exit)
                         }
                         break;
                     case 's':
-                        {
-                            SBFileSpec file(optarg);
-                            if (file.Exists())
-                                m_option_data.m_source_command_files.push_back (optarg);
-                            else if (file.ResolveExecutableLocation())
-                            {
-                                char final_path[PATH_MAX];
-                                file.GetPath (final_path, sizeof(final_path));
-                                std::string path_str (final_path);
-                                m_option_data.m_source_command_files.push_back (path_str);
-                            }
-                            else
-                                error.SetErrorStringWithFormat("file specified in --source (-s) option doesn't exist: '%s'", optarg);
-                        }
+                        m_option_data.AddInitialCommand(optarg, false, true, error);
+                        break;
+                    case 'o':
+                        m_option_data.AddInitialCommand(optarg, false, false, error);
+                        break;
+                    case 'S':
+                        m_option_data.AddInitialCommand(optarg, true, true, error);
+                        break;
+                    case 'O':
+                        m_option_data.AddInitialCommand(optarg, true, false, error);
                         break;
-
                     default:
                         m_option_data.m_print_help = true;
                         error.SetErrorStringWithFormat ("unrecognized option %c", short_option);
@@ -712,12 +800,12 @@ Driver::ParseArgs (int argc, const char *argv[], FILE *out_fh, bool &exit)
     if (error.Fail() || m_option_data.m_print_help)
     {
         ShowUsage (out_fh, g_options, m_option_data);
-        exit = true;
+        exiting = true;
     }
     else if (m_option_data.m_print_version)
     {
         ::fprintf (out_fh, "%s\n", m_debugger.GetVersionString());
-        exit = true;
+        exiting = true;
     }
     else if (m_option_data.m_print_python_path)
     {
@@ -735,7 +823,7 @@ Driver::ParseArgs (int argc, const char *argv[], FILE *out_fh, bool &exit)
         }
         else
             ::fprintf (out_fh, "<COULD NOT FIND PATH>\n");
-        exit = true;
+        exiting = true;
     }
     else if (m_option_data.m_process_name.empty() && m_option_data.m_process_pid == LLDB_INVALID_PROCESS_ID)
     {
@@ -1221,6 +1309,12 @@ Driver::EditLineInputReaderCallback
 void
 Driver::MainLoop ()
 {
+#if defined(_MSC_VER)
+    m_editline_slave_fh = stdin;
+    FILE *editline_output_slave_fh = stdout;
+    lldb_utility::PseudoTerminal editline_output_pty;
+#else
+
     char error_str[1024];
     if (m_editline_pty.OpenFirstAvailableMaster(O_RDWR|O_NOCTTY, error_str, sizeof(error_str)) == false)
     {
@@ -1281,6 +1375,7 @@ Driver::MainLoop ()
             ::setbuf (editline_output_slave_fh, NULL);
         }
     }
+#endif
 
    // struct termios stdin_termios;
 
@@ -1322,6 +1417,7 @@ Driver::MainLoop ()
 
     m_io_channel_ap.reset (new IOChannel(m_editline_slave_fh, editline_output_slave_fh, stdout, stderr, this));
 
+#if !defined (_MSC_VER)
     SBCommunication out_comm_2("driver.editline_output");
     out_comm_2.SetCloseOnEOF (false);
     out_comm_2.AdoptFileDesriptor (editline_output_pty.GetMasterFileDescriptor(), false);
@@ -1332,6 +1428,7 @@ Driver::MainLoop ()
         ::fprintf (stderr, "error: failed to start libedit output read thread");
         exit (5);
     }
+#endif
 
 
     struct winsize window_size;
@@ -1400,42 +1497,15 @@ Driver::MainLoop ()
             }
 
             // Now we handle options we got from the command line
-            char command_string[PATH_MAX * 2];
-            const size_t num_source_command_files = GetNumSourceCommandFiles();
-            const bool dump_stream_only_if_no_immediate = true;
-            if (num_source_command_files > 0)
-            {
-                for (size_t i=0; i < num_source_command_files; ++i)
-                {
-                    const char *command_file = GetSourceCommandFileAtIndex(i);
-                    ::snprintf (command_string, sizeof(command_string), "command source '%s'", command_file);
-                    m_debugger.GetCommandInterpreter().HandleCommand (command_string, result, false);
-                    if (GetDebugMode())
-                    {
-                        result.PutError (m_debugger.GetErrorFileHandle());
-                        result.PutOutput (m_debugger.GetOutputFileHandle());
-                    }
-                    
-                    // if the command sourcing generated an error - dump the result object
-                    if (result.Succeeded() == false)
-                    {
-                        const size_t output_size = result.GetOutputSize();
-                        if (output_size > 0)
-                            m_io_channel_ap->OutWrite (result.GetOutput(dump_stream_only_if_no_immediate), output_size, NO_ASYNC);
-                        const size_t error_size = result.GetErrorSize();
-                        if (error_size > 0)
-                            m_io_channel_ap->OutWrite (result.GetError(dump_stream_only_if_no_immediate), error_size, NO_ASYNC);
-                    }
-                    
-                    result.Clear();
-                }
-            }
-
+            // First source in the commands specified to be run before the file arguments are processed.
+            ExecuteInitialCommands(true);
+            
             // Was there a core file specified?
             std::string core_file_spec("");
             if (!m_option_data.m_core_file.empty())
                 core_file_spec.append("--core ").append(m_option_data.m_core_file);
 
+            char command_string[PATH_MAX * 2];
             const size_t num_args = m_option_data.m_args.size();
             if (num_args > 0)
             {
@@ -1487,6 +1557,9 @@ Driver::MainLoop ()
                 result.PutError(m_debugger.GetErrorFileHandle());
                 result.PutOutput(m_debugger.GetOutputFileHandle());
             }
+            
+            // Now execute the commands specified for after the file arguments are processed.
+            ExecuteInitialCommands(false);
 
             SBEvent event;
 
@@ -1597,9 +1670,11 @@ Driver::MainLoop ()
             master_out_comm.Disconnect();
             master_out_comm.ReadThreadStop();
 
+#if !defined(_MSC_VER)
             out_comm_2.SetReadThreadBytesReceivedCallback(NULL, NULL);
             out_comm_2.Disconnect();
             out_comm_2.ReadThreadStop();
+#endif
 
             editline_output_pty.CloseMasterFileDescriptor();
             reset_stdin_termios();
@@ -1714,15 +1789,15 @@ main (int argc, char const *argv[], const char *envp[])
     {
         Driver driver;
 
-        bool exit = false;
-        SBError error (driver.ParseArgs (argc, argv, stdout, exit));
+        bool exiting = false;
+        SBError error (driver.ParseArgs (argc, argv, stdout, exiting));
         if (error.Fail())
         {
             const char *error_cstr = error.GetCString ();
             if (error_cstr)
                 ::fprintf (stderr, "error: %s\n", error_cstr);
         }
-        else if (!exit)
+        else if (!exiting)
         {
             driver.MainLoop ();
         }
diff --git a/contrib/llvm/tools/lldb/tools/driver/Driver.h b/contrib/llvm/tools/lldb/tools/driver/Driver.h
index 2a4a27df4cd..dcfd5ed11cd 100644
--- a/contrib/llvm/tools/lldb/tools/driver/Driver.h
+++ b/contrib/llvm/tools/lldb/tools/driver/Driver.h
@@ -10,6 +10,7 @@
 #ifndef lldb_Driver_h_
 #define lldb_Driver_h_
 
+#include "Platform.h"
 #include "lldb/Utility/PseudoTerminal.h"
 
 #include <set>
@@ -83,12 +84,9 @@ public:
     lldb::ScriptLanguage
     GetScriptLanguage() const;
 
-    size_t
-    GetNumSourceCommandFiles () const;
-
-    const char *
-    GetSourceCommandFileAtIndex (uint32_t idx) const;
-
+    void
+    ExecuteInitialCommands (bool before_file);
+    
     bool
     GetDebugMode() const;
 
@@ -102,14 +100,19 @@ public:
         void
         Clear();
 
+        void
+        AddInitialCommand (const char *command, bool before_file, bool is_file, lldb::SBError &error);
+    
         //static OptionDefinition m_cmd_option_table[];
 
         std::vector<std::string> m_args;
         lldb::ScriptLanguage m_script_lang;
         std::string m_core_file;
         std::string m_crash_log;
-        std::vector<std::string> m_source_command_files;
+        std::vector<std::pair<bool,std::string> > m_initial_commands;
+        std::vector<std::pair<bool,std::string> > m_after_file_commands;
         bool m_debug_mode;
+        bool m_source_quietly;
         bool m_print_version;
         bool m_print_python_path;
         bool m_print_help;
diff --git a/contrib/llvm/tools/lldb/tools/driver/ELWrapper.cpp b/contrib/llvm/tools/lldb/tools/driver/ELWrapper.cpp
new file mode 100644
index 00000000000..258f47e5169
--- /dev/null
+++ b/contrib/llvm/tools/lldb/tools/driver/ELWrapper.cpp
@@ -0,0 +1,422 @@
+//===-- ELWrapper.cpp -------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// this file is only relevant for Visual C++
+#if defined( _MSC_VER )
+
+#include "lldb/Host/windows/windows.h"
+
+#include "ELWrapper.h"
+#include <vector>
+#include <assert.h>
+
+// index one of the variable arguments
+//  presuming "(EditLine *el, ..." is first in the argument list
+#define GETARG( X ) ( (void* ) *( ( (int**) &el ) + ((X) + 2) ) )
+
+// edit line EL_ADDFN function pointer type
+typedef unsigned char (*el_addfn_func)(EditLine *e, int ch);
+
+// edit line wrapper binding container
+struct el_binding
+{
+    //
+    const char   *name;
+    const char   *help;
+    // function pointer to callback routine
+    el_addfn_func func;
+    // ascii key this function is bound to
+    const char   *key;
+};
+
+// stored key bindings
+static std::vector<el_binding*> _bindings;
+
+//TODO: this should infact be related to the exact edit line context we create
+static void *clientData = NULL;
+
+// store the current prompt string
+// default to what we expect to receive anyway
+static const char *_prompt = "(lldb) ";
+
+#if !defined( _WIP_INPUT_METHOD )
+
+static char *
+el_get_s (char *buffer, int chars)
+{
+    return gets_s(buffer, chars);
+}
+#else
+
+static void
+con_output (char _in)
+{
+    HANDLE hout = GetStdHandle( STD_OUTPUT_HANDLE );
+    DWORD written = 0;
+    // get the cursor position
+    CONSOLE_SCREEN_BUFFER_INFO info;
+    GetConsoleScreenBufferInfo( hout, &info );
+    // output this char
+    WriteConsoleOutputCharacterA( hout, &_in, 1, info.dwCursorPosition, &written );
+    // advance cursor position
+    info.dwCursorPosition.X++;
+    SetConsoleCursorPosition( hout, info.dwCursorPosition );
+}
+
+static void
+con_backspace (void)
+{
+    HANDLE hout = GetStdHandle( STD_OUTPUT_HANDLE );
+    DWORD written = 0;
+    // get cursor position
+    CONSOLE_SCREEN_BUFFER_INFO info;
+    GetConsoleScreenBufferInfo( hout, &info );
+    // nudge cursor backwards
+    info.dwCursorPosition.X--;
+    SetConsoleCursorPosition( hout, info.dwCursorPosition );
+    // blank out the last character
+    WriteConsoleOutputCharacterA( hout, " ", 1, info.dwCursorPosition, &written );
+}
+
+static void
+con_return (void)
+{
+    HANDLE hout = GetStdHandle( STD_OUTPUT_HANDLE );
+    DWORD written = 0;
+    // get cursor position
+    CONSOLE_SCREEN_BUFFER_INFO info;
+    GetConsoleScreenBufferInfo( hout, &info );
+    // move onto the new line
+    info.dwCursorPosition.X = 0;
+    info.dwCursorPosition.Y++;
+    SetConsoleCursorPosition( hout, info.dwCursorPosition );
+}
+
+static bool
+runBind (char _key)
+{
+    for ( int i=0; i<_bindings.size(); i++ )
+    {
+        el_binding *bind = _bindings[i];
+        if ( bind->key[0] == _key )
+        {
+            bind->func( (EditLine*) -1, _key );
+            return true;
+        }
+    }
+    return false;
+}
+
+// replacement get_s which is EL_BIND aware
+static char *
+el_get_s (char *buffer, int chars)
+{
+    //
+    char *head = buffer;
+    //
+    for ( ;; Sleep( 10 ) )
+    {
+        //
+        INPUT_RECORD _record;
+        //
+        DWORD _read = 0;
+        if ( ReadConsoleInputA( GetStdHandle( STD_INPUT_HANDLE ), &_record, 1, &_read ) == FALSE )
+            break;
+        // if we didnt read a key
+        if ( _read == 0 )
+            continue;
+        // only interested in key events
+        if ( _record.EventType != KEY_EVENT )
+            continue;
+        // is the key down
+        if (! _record.Event.KeyEvent.bKeyDown )
+            continue;
+        // read the ascii key character
+        char _key = _record.Event.KeyEvent.uChar.AsciiChar;
+        // non ascii conformant key press
+        if ( _key == 0 )
+        {
+            // check the scan code
+            // if VK_UP scroll back through history
+            // if VK_DOWN scroll forward through history
+            continue;
+        }
+        // try to execute any bind this key may have
+        if ( runBind( _key ) )
+            continue;
+        // if we read a return key
+        if ( _key == '\n' || _key == '\r' )
+        {
+            con_return( );
+            break;
+        }
+        // key is backspace
+        if ( _key == 0x8 )
+        {
+            // avoid deleting past beginning
+            if ( head > buffer )
+            {
+                con_backspace( );
+                head--;
+            }
+            continue;
+        }
+
+        // add this key to the input buffer
+        if ( (head-buffer) < (chars-1) )
+        {
+            con_output( _key );
+            *(head++) = _key;
+        }
+    }
+    // insert end of line character
+    *head = '\0';
+
+    return buffer;
+}
+#endif
+
+// edit line initalise
+EditLine *
+el_init (const char *, FILE *, FILE *, FILE *)
+{
+    //
+    SetConsoleTitleA( "lldb" );
+    // return dummy handle
+    return (EditLine*) -1;
+}
+
+const char *
+el_gets (EditLine *el, int *length)
+{
+    // print the prompt if we have one
+    if ( _prompt != NULL )
+        printf( _prompt );
+    // create a buffer for the user input
+    char *buffer = new char[ MAX_PATH ];
+    // try to get user input string
+    if ( el_get_s( buffer, MAX_PATH ) )
+    {
+        // get the string length in 'length'
+        while ( buffer[ *length ] != '\0' )
+            (*length)++;
+        // return the input buffer
+        // remember that this memory has the be free'd somewhere
+        return buffer;
+    }
+    else
+    {
+        // on error
+        delete [] buffer;
+        return NULL;
+    }
+}
+
+int
+el_set (EditLine *el, int code, ...)
+{
+    int **arg = (int**) &el;
+    //
+    switch ( code )
+    {
+    // edit line set prompt message
+    case ( EL_PROMPT ):
+        {
+            // EL_PROMPT, char *(*f)( EditLine *)
+            //      define a prompt printing function as 'f', which is to return a string that
+            //      contains the prompt.
+
+            // get the function pointer from the arg list
+            void *func_vp = (void*) *(arg+2);
+            // cast to suitable prototype
+            const char* (*func_fp)(EditLine*) = (const char*(*)(EditLine *)) func_vp;
+            // call to get the prompt as a string
+            _prompt = func_fp( el );
+        }
+        break;
+    case ( EL_EDITOR ):
+        {
+            // EL_EDITOR, const char *mode
+            //      set editing mode to "emacs" or "vi"
+        }
+        break;
+    case ( EL_HIST ):
+        {
+            // EL_HIST, History *(*fun)(History *, int op, ... ), const char *ptr
+            //      defines which histroy function to use, which is usualy history(). Ptr should be the
+            //      value returned by history_init().
+        }
+        break;
+    case ( EL_ADDFN ):
+        {
+            // EL_ADDFN, const char *name, const char *help, unsigned char (*func)(EditLine *e, int ch)
+            //      add a user defined function, func), referred to as 'name' which is invoked when a key which is bound to 'name' is
+            //      entered. 'help' is a description of 'name'. at involcation time, 'ch' is the key which caused the invocation. the
+            //      return value of 'func()' should be one of:
+            //          CC_NORM         add a normal character
+            //          CC_NEWLINE      end of line was entered
+            //          CC_EOF          EOF was entered
+            //          CC_ARGHACK      expecting further command input as arguments, do nothing visually.
+            //          CC_REFRESH      refresh display.
+            //          CC_REFRESH_BEEP refresh display and beep.
+            //          CC_CURSOR       cursor moved so update and perform CC_REFRESH
+            //          CC_REDISPLAY        redisplay entire input line. this is usefull if a key binding outputs extra information.
+            //          CC_ERROR            an error occured. beep and flush tty.
+            //          CC_FATAL            fatal error, reset tty to known state.
+
+            el_binding *binding = new el_binding;
+            binding->name = (const char *)  GETARG( 0 );
+            binding->help = (const char *)  GETARG( 1 );
+            binding->func = (el_addfn_func) GETARG( 2 );
+            binding->key  = 0;
+            // add this to the bindings list
+            _bindings.push_back( binding );
+        }
+        break;
+    case ( EL_BIND ):
+        {
+            // EL_BIND, const char *, ..., NULL
+            //      perform the BIND buildin command.  Refer to editrc(5) for more information.
+
+            const char *name = (const char*) GETARG( 1 );
+
+            for ( int i=0; i<_bindings.size(); i++ )
+            {
+                el_binding *bind = _bindings[i];
+                if ( strcmp( bind->name, name ) == 0 )
+                {
+                    bind->key = (const char *) GETARG( 0 );
+                    break;
+                }
+            }
+
+        }
+        break;
+    case ( EL_CLIENTDATA ):
+        {
+            clientData = GETARG( 0 );
+        }
+        break;
+    default:
+        assert( !"Not Implemented!" );
+    }
+    return 0;
+}
+
+void
+el_end (EditLine *el)
+{
+    assert( !"Not implemented!" );
+}
+
+void
+el_reset (EditLine *)
+{
+    assert( !"Not implemented!" );
+}
+
+int
+el_getc (EditLine *, char *)
+{
+    assert( !"Not implemented!" );
+    return 0;
+}
+
+void
+el_push (EditLine *, char *)
+{
+    assert( !"Not implemented!" );
+}
+
+void
+el_beep (EditLine *)
+{
+    Beep( 1000, 500 );
+}
+
+int
+el_parse (EditLine *, int, const char **)
+{
+    assert( !"Not implemented!" );
+    return 0;
+}
+
+int
+el_get (EditLine *el, int code, ...)
+{
+    switch ( code )
+    {
+    case ( EL_CLIENTDATA ):
+        {
+            void **dout = (void**) GETARG( 0 );
+            *dout = clientData;
+        }
+        break;
+    default:
+        assert( !"Not implemented!" );
+    }
+    return 0;
+}
+
+int
+el_source (EditLine *el, const char *file)
+{
+    // init edit line by reading the contents of 'file'
+    // nothing to do here on windows...
+    return 0;
+}
+
+void
+el_resize (EditLine *)
+{
+    assert( !"Not implemented!" );
+}
+
+const LineInfo *
+el_line (EditLine *el)
+{
+    assert( !"Not implemented!" );
+    return 0;
+}
+
+int
+el_insertstr (EditLine *, const char *)
+{
+    assert( !"Not implemented!" );
+    return 0;
+}
+
+void
+el_deletestr (EditLine *, int)
+{
+    assert( !"Not implemented!" );
+}
+
+History *
+history_init (void)
+{
+    // return dummy handle
+    return (History*) -1;
+}
+
+void
+history_end (History *)
+{
+    assert( !"Not implemented!" );
+}
+
+int
+history (History *, HistEvent *, int op, ...)
+{
+    // perform operation 'op' on the history list with optional argumetns as needed by
+    // the operation.
+    return 0;
+}
+
+#endif
diff --git a/contrib/llvm/tools/lldb/tools/driver/ELWrapper.h b/contrib/llvm/tools/lldb/tools/driver/ELWrapper.h
new file mode 100644
index 00000000000..a30182d948b
--- /dev/null
+++ b/contrib/llvm/tools/lldb/tools/driver/ELWrapper.h
@@ -0,0 +1,122 @@
+//===-- ELWrapper.h ---------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#pragma once
+
+#include <stdio.h>
+
+// EditLine editor function return codes.
+// For user-defined function interface
+#define CC_NORM         0
+#define CC_NEWLINE      1
+#define CC_EOF          2
+#define CC_ARGHACK      3
+#define CC_REFRESH      4
+#define CC_CURSOR       5
+#define CC_ERROR        6
+#define CC_FATAL        7
+#define CC_REDISPLAY    8
+#define CC_REFRESH_BEEP 9
+
+// el_set/el_get parameters
+#define EL_PROMPT        0    // , el_pfunc_t
+#define EL_TERMINAL      1    // , const char *
+#define EL_EDITOR        2    // , const char *
+#define EL_SIGNAL        3    // , int);
+#define EL_BIND          4    // , const char *, ..., NULL
+#define EL_TELLTC        5    // , const char *, ..., NULL
+#define EL_SETTC         6    // , const char *, ..., NULL
+#define EL_ECHOTC        7    // , const char *, ..., NULL
+#define EL_SETTY         8    // , const char *, ..., NULL
+#define EL_ADDFN         9    // , const char *, const char *, el_func_t
+#define EL_HIST          10   // , hist_fun_t, const char *
+#define EL_EDITMODE      11   // , int
+#define EL_RPROMPT       12   // , el_pfunc_t
+#define EL_GETCFN        13   // , el_rfunc_t
+#define EL_CLIENTDATA    14   // , void *
+#define EL_UNBUFFERED    15   // , int
+#define EL_PREP_TERM     16   // , int
+#define EL_GETTC         17   // , const char *, ..., NULL
+#define EL_GETFP         18   // , int, FILE **
+#define EL_SETFP         19   // , int, FILE *
+#define EL_REFRESH       20   // , void
+
+#define EL_BUILTIN_GETCFN (NULL)
+
+// history defines
+#define H_FUNC           0    // , UTSL
+#define H_SETSIZE        1    // , const int
+#define H_GETSIZE        2    // , void
+#define H_FIRST          3    // , void
+#define H_LAST           4    // , void
+#define H_PREV           5    // , void
+#define H_NEXT           6    // , void
+#define H_CURR           8    // , const int
+#define H_SET            7    // , int
+#define H_ADD            9    // , const char *
+#define H_ENTER          10   // , const char *
+#define H_APPEND         11   // , const char *
+#define H_END            12   // , void
+#define H_NEXT_STR       13   // , const char *
+#define H_PREV_STR       14   // , const char *
+#define H_NEXT_EVENT     15   // , const int
+#define H_PREV_EVENT     16   // , const int
+#define H_LOAD           17   // , const char *
+#define H_SAVE           18   // , const char *
+#define H_CLEAR          19   // , void
+#define H_SETUNIQUE      20   // , int
+#define H_GETUNIQUE      21   // , void
+#define H_DEL            22   // , int
+
+struct EditLine
+{
+};
+
+struct LineInfo
+{
+    const char *buffer;
+    const char *cursor;
+    const char *lastchar;
+};
+
+struct History
+{
+};
+
+struct HistEvent
+{
+    int         num;
+    const char *str;
+};
+
+extern "C"
+{
+    // edit line API
+    EditLine        *el_init     ( const char *, FILE *, FILE *, FILE * );
+    const char      *el_gets     ( EditLine *, int * );
+    int              el_set      ( EditLine *, int, ... );
+
+    void             el_end      ( EditLine * );
+    void             el_reset    ( EditLine * );
+    int              el_getc     ( EditLine *, char * );
+    void             el_push     ( EditLine *, char * );
+    void             el_beep     ( EditLine * );
+    int              el_parse    ( EditLine *, int, const char ** );
+    int              el_get      ( EditLine *, int, ... );
+    int              el_source   ( EditLine *, const char * );
+    void             el_resize   ( EditLine * );
+    const LineInfo  *el_line     ( EditLine * );
+    int              el_insertstr( EditLine *, const char * );
+    void             el_deletestr( EditLine *, int );
+
+    // history API
+    History         *history_init( void );
+    void             history_end ( History * );
+    int              history     ( History *, HistEvent *, int, ... );
+};
\ No newline at end of file
diff --git a/contrib/llvm/tools/lldb/tools/driver/GetOptWrapper.cpp b/contrib/llvm/tools/lldb/tools/driver/GetOptWrapper.cpp
new file mode 100644
index 00000000000..e7cdfd786c6
--- /dev/null
+++ b/contrib/llvm/tools/lldb/tools/driver/GetOptWrapper.cpp
@@ -0,0 +1,33 @@
+//===-- GetOptWrapper.cpp ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// this file is only relevant for Visual C++
+#if defined( _MSC_VER )
+
+#include "GetOptWrapper.h"
+
+/*
+
+// already defined in lldbHostCommon.lib due to 'getopt.inc'
+
+extern int
+getopt_long_only
+(
+    int                  ___argc,
+    char *const         *___argv,
+    const char          *__shortopts,
+    const struct option *__longopts,
+    int                 *__longind
+)
+{
+    return -1;
+}
+*/
+
+#endif
\ No newline at end of file
diff --git a/contrib/llvm/tools/lldb/tools/driver/GetOptWrapper.h b/contrib/llvm/tools/lldb/tools/driver/GetOptWrapper.h
new file mode 100644
index 00000000000..9c9cf03d762
--- /dev/null
+++ b/contrib/llvm/tools/lldb/tools/driver/GetOptWrapper.h
@@ -0,0 +1,49 @@
+//===-- GetOptWrapper.h -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef lldb_GetOptWrapper_h_
+#define lldb_GetOptWrapper_h_
+
+// from getopt.h
+#define no_argument       0
+#define required_argument 1
+#define optional_argument 2
+
+// defined int unistd.h
+extern int   optreset;
+
+// from getopt.h
+extern char *optarg;
+extern int   optind;
+extern int   opterr;
+extern int   optopt;
+
+// option structure
+struct option
+{
+    const char *name;
+    // has_arg can't be an enum because some compilers complain about
+    // type mismatches in all the code that assumes it is an int.
+    int  has_arg;
+    int *flag;
+    int  val;
+};
+
+// 
+extern int
+getopt_long_only
+(
+    int                  ___argc,
+    char *const         *___argv,
+    const char          *__shortopts,
+    const struct option *__longopts,
+    int                 *__longind
+);
+
+#endif // lldb_GetOptWrapper_h_
\ No newline at end of file
diff --git a/contrib/llvm/tools/lldb/tools/driver/IOChannel.cpp b/contrib/llvm/tools/lldb/tools/driver/IOChannel.cpp
index 7adf2e4e85e..7cba73aaae8 100644
--- a/contrib/llvm/tools/lldb/tools/driver/IOChannel.cpp
+++ b/contrib/llvm/tools/lldb/tools/driver/IOChannel.cpp
@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "Platform.h"
 #include "IOChannel.h"
 
 #include <map>
@@ -73,7 +74,8 @@ void
 IOChannel::EraseCharsBeforeCursor ()
 {
     const LineInfo *line_info  = el_line(m_edit_line);
-    el_deletestr(m_edit_line, line_info->cursor - line_info->buffer);
+    if (line_info != NULL)
+        el_deletestr(m_edit_line, line_info->cursor - line_info->buffer);
 }
 
 unsigned char
@@ -205,6 +207,7 @@ IOChannel::IOChannel
     m_read_thread_should_exit (false),
     m_out_file (out),
     m_err_file (err),
+    m_editline_out (editline_out),
     m_command_queue (),
     m_completion_key ("\t"),
     m_edit_line (::el_init (SBHostOS::GetProgramFileSpec().GetFilename(), editline_in, editline_out,  editline_out)),
@@ -212,50 +215,35 @@ IOChannel::IOChannel
     m_history_event(),
     m_getting_command (false),
     m_expecting_prompt (false),
-	m_prompt_str (),
+    m_prompt_str (),
     m_refresh_request_pending (false)
 {
     assert (m_edit_line);
-    ::el_set (m_edit_line, EL_PROMPT, el_prompt);
-    ::el_set (m_edit_line, EL_EDITOR, "emacs");
-    ::el_set (m_edit_line, EL_HIST, history, m_history);
-
-    el_set (m_edit_line, EL_ADDFN, "lldb_complete",
-            "LLDB completion function",
-            IOChannel::ElCompletionFn);
+    el_set (m_edit_line, EL_PROMPT, el_prompt);
+    el_set (m_edit_line, EL_EDITOR, "emacs");
+    el_set (m_edit_line, EL_HIST, history, m_history);
+    el_set (m_edit_line, EL_ADDFN, "lldb_complete", "LLDB completion function", IOChannel::ElCompletionFn);
     el_set (m_edit_line, EL_BIND, m_completion_key, "lldb_complete", NULL);
     el_set (m_edit_line, EL_BIND, "^r", "em-inc-search-prev", NULL);  // Cycle through backwards search, entering string
     el_set (m_edit_line, EL_BIND, "^w", "ed-delete-prev-word", NULL); // Delete previous word, behave like bash does.
-    el_set (m_edit_line, EL_BIND, "\e[3~", "ed-delete-next-char", NULL); // Fix the delete key.
+    el_set (m_edit_line, EL_BIND, "\033[3~", "ed-delete-next-char", NULL); // Fix the delete key.
     el_set (m_edit_line, EL_CLIENTDATA, this);
 
     // Source $PWD/.editrc then $HOME/.editrc
-    ::el_source (m_edit_line, NULL);
+    el_source (m_edit_line, NULL);
 
     assert (m_history);
-    ::history (m_history, &m_history_event, H_SETSIZE, 800);
-    ::history (m_history, &m_history_event, H_SETUNIQUE, 1);
+    history (m_history, &m_history_event, H_SETSIZE, 800);
+    history (m_history, &m_history_event, H_SETUNIQUE, 1);
     // Load history
     HistorySaveLoad (false);
 
-    // Set up mutex to make sure OutErr, OutWrite and RefreshPrompt do not interfere
-    // with each other when writing.
-
-    int error;
-    ::pthread_mutexattr_t attr;
-    error = ::pthread_mutexattr_init (&attr);
-    assert (error == 0);
-    error = ::pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
-    assert (error == 0);
-    error = ::pthread_mutex_init (&m_output_mutex, &attr);
-    assert (error == 0);
-    error = ::pthread_mutexattr_destroy (&attr);
-    assert (error == 0);
-
     // Initialize time that ::el_gets was last called.
-
     m_enter_elgets_time.tv_sec = 0;
     m_enter_elgets_time.tv_usec = 0;
+
+    // set the initial state to non flushed
+    m_output_flushed = false;
 }
 
 IOChannel::~IOChannel ()
@@ -274,8 +262,6 @@ IOChannel::~IOChannel ()
         ::el_end (m_edit_line);
         m_edit_line = NULL;
     }
-
-    ::pthread_mutex_destroy (&m_output_mutex);
 }
 
 void
@@ -299,16 +285,24 @@ IOChannel::HistorySaveLoad (bool save)
 void
 IOChannel::LibeditOutputBytesReceived (void *baton, const void *src, size_t src_len)
 {
-	// Make this a member variable.
-    // static std::string prompt_str;
     IOChannel *io_channel = (IOChannel *) baton;
-    IOLocker locker (io_channel->m_output_mutex);
+    std::lock_guard<std::recursive_mutex> locker(io_channel->m_output_mutex);
     const char *bytes = (const char *) src;
 
+    bool flush = false;
+
+    // See if we have a 'flush' synchronization point in there.
+    // this is performed from 'fputc ('\0', m_editline_out);' in LibeditGetInput()
+    if (src_len > 0 && bytes[src_len-1] == '\0')
+    {
+        src_len--;
+        flush = true;
+    }
+
     if (io_channel->IsGettingCommand() && io_channel->m_expecting_prompt)
     {
         io_channel->m_prompt_str.append (bytes, src_len);
-		// Log this to make sure the prompt is really what you think it is.
+        // Log this to make sure the prompt is really what you think it is.
         if (io_channel->m_prompt_str.find (el_prompt(io_channel->m_edit_line)) == 0)
         {
             io_channel->m_expecting_prompt = false;
@@ -327,6 +321,15 @@ IOChannel::LibeditOutputBytesReceived (void *baton, const void *src, size_t src_
             io_channel->m_refresh_request_pending = false;
         io_channel->OutWrite (bytes, src_len, NO_ASYNC);
     }
+
+#if !defined (_MSC_VER)
+    if (flush)
+    {
+        io_channel->m_output_flushed = true;
+        io_channel->m_output_cond.notify_all();
+    }
+#endif
+
 }
 
 IOChannel::LibeditGetInputResult
@@ -344,7 +347,28 @@ IOChannel::LibeditGetInput (std::string &new_line)
 
         // Call el_gets to prompt the user and read the user's input.
         const char *line = ::el_gets (m_edit_line, &line_len);
-        
+
+#if !defined (_MSC_VER)
+        // Force the piped output from el_gets to finish processing.
+        // el_gets does an fflush internally, which is not sufficient here; it only
+        // writes the data into m_editline_out, but doesn't affect whether our worker
+        // thread will read that data yet. So we block here manually.
+        {
+            std::lock_guard<std::recursive_mutex> locker(m_output_mutex);
+            m_output_flushed = false;
+
+            // Write a synchronization point into the stream, so we can guarantee
+            // LibeditOutputBytesReceived has processed everything up till that mark.
+            fputc ('\0', m_editline_out);
+
+            while (!m_output_flushed)
+            {
+                // wait until the condition variable is signaled
+                m_output_cond.wait(m_output_mutex);
+            }
+        }
+#endif
+
         // Re-set the boolean indicating whether or not el_gets is trying to get input.
         SetGettingCommand (false);
 
@@ -379,7 +403,7 @@ IOChannel::LibeditGetInput (std::string &new_line)
     return retval;
 }
 
-void *
+thread_result_t
 IOChannel::IOReadThread (void *ptr)
 {
     IOChannel *myself = static_cast<IOChannel *> (ptr);
@@ -502,8 +526,7 @@ IOChannel::Start ()
     if (IS_VALID_LLDB_HOST_THREAD(m_read_thread))
         return true;
 
-    m_read_thread = SBHostOS::ThreadCreate ("<lldb.driver.commandline_io>", IOChannel::IOReadThread, this,
-                                            NULL);
+    m_read_thread = SBHostOS::ThreadCreate("<lldb.driver.commandline_io>", (lldb::thread_func_t) IOChannel::IOReadThread, this, NULL);
 
     return (IS_VALID_LLDB_HOST_THREAD(m_read_thread));
 }
@@ -531,11 +554,11 @@ IOChannel::RefreshPrompt ()
 {
     // If we are not in the middle of getting input from the user, there is no need to 
     // refresh the prompt.
-    IOLocker locker (m_output_mutex);
+    std::lock_guard<std::recursive_mutex> locker(m_output_mutex);
     if (! IsGettingCommand())
         return;
 
-	// If we haven't finished writing the prompt, there's no need to refresh it.
+    // If we haven't finished writing the prompt, there's no need to refresh it.
     if (m_expecting_prompt)
         return;
 
@@ -562,7 +585,7 @@ IOChannel::OutWrite (const char *buffer, size_t len, bool asynchronous)
     }
 
     // Use the mutex to make sure OutWrite and ErrWrite do not interfere with each other's output.
-    IOLocker locker (m_output_mutex);
+    std::lock_guard<std::recursive_mutex> locker(m_output_mutex);
     if (m_driver->EditlineReaderIsTop() && asynchronous)
         ::fwrite (undo_prompt_string, 1, 4, m_out_file);
     ::fwrite (buffer, 1, len, m_out_file);
@@ -577,7 +600,7 @@ IOChannel::ErrWrite (const char *buffer, size_t len, bool asynchronous)
         return;
 
     // Use the mutex to make sure OutWrite and ErrWrite do not interfere with each other's output.
-    IOLocker locker (m_output_mutex);
+    std::lock_guard<std::recursive_mutex> locker(m_output_mutex);
     if (asynchronous)
         ::fwrite (undo_prompt_string, 1, 4, m_err_file);
     ::fwrite (buffer, 1, len, m_err_file);
@@ -631,17 +654,3 @@ IOChannel::SetGettingCommand (bool new_value)
 {
     m_getting_command = new_value;
 }
-
-IOLocker::IOLocker (pthread_mutex_t &mutex) :
-    m_mutex_ptr (&mutex)
-{
-    if (m_mutex_ptr)
-        ::pthread_mutex_lock (m_mutex_ptr);
-        
-}
-
-IOLocker::~IOLocker ()
-{
-    if (m_mutex_ptr)
-        ::pthread_mutex_unlock (m_mutex_ptr);
-}
diff --git a/contrib/llvm/tools/lldb/tools/driver/IOChannel.h b/contrib/llvm/tools/lldb/tools/driver/IOChannel.h
index 36653a0c289..3788673da97 100644
--- a/contrib/llvm/tools/lldb/tools/driver/IOChannel.h
+++ b/contrib/llvm/tools/lldb/tools/driver/IOChannel.h
@@ -10,18 +10,13 @@
 #ifndef lldb_IOChannel_h_
 #define lldb_IOChannel_h_
 
+#include <thread>
+#include <mutex>
+#include <atomic>
+#include <condition_variable>
+
 #include <string>
 #include <queue>
-
-#if defined(__FreeBSD__)
-#include <readline/readline.h>
-#else
-#include <editline/readline.h>
-#endif
-#include <histedit.h>
-#include <pthread.h>
-#include <sys/time.h>
-
 #include "Driver.h"
 
 class IOChannel : public lldb::SBBroadcaster
@@ -63,7 +58,7 @@ public:
     bool
     Stop ();
 
-    static void *
+    static lldb::thread_result_t
     IOReadThread (void *);
 
     void
@@ -127,7 +122,8 @@ protected:
 
 private:
 
-    pthread_mutex_t m_output_mutex;
+    std::recursive_mutex m_output_mutex;
+    std::condition_variable_any m_output_cond;
     struct timeval m_enter_elgets_time;
 
     Driver *m_driver;
@@ -135,6 +131,7 @@ private:
     bool m_read_thread_should_exit;
     FILE *m_out_file;
     FILE *m_err_file;
+    FILE *m_editline_out;
     std::queue<std::string> m_command_queue;
     const char *m_completion_key;
 
@@ -143,7 +140,8 @@ private:
     HistEvent m_history_event;
     bool m_getting_command;
     bool m_expecting_prompt;
-	std::string m_prompt_str;  // for accumlating the prompt as it gets written out by editline
+    bool m_output_flushed;
+    std::string m_prompt_str;  // for accumlating the prompt as it gets written out by editline
     bool m_refresh_request_pending;
 
     void
@@ -153,22 +151,4 @@ private:
     HandleCompletion (EditLine *e, int ch);
 };
 
-class IOLocker 
-{
-public:
-
-    IOLocker (pthread_mutex_t &mutex);
-
-    ~IOLocker ();
-
-protected:
-
-    pthread_mutex_t *m_mutex_ptr;
-
-private:
-
-    IOLocker (const IOLocker&);
-    const IOLocker& operator= (const IOLocker&);
-};
-
 #endif  // lldb_IOChannel_h_
diff --git a/contrib/llvm/tools/lldb/tools/driver/Platform.cpp b/contrib/llvm/tools/lldb/tools/driver/Platform.cpp
new file mode 100644
index 00000000000..5b5286e6811
--- /dev/null
+++ b/contrib/llvm/tools/lldb/tools/driver/Platform.cpp
@@ -0,0 +1,111 @@
+//===-- Platform.cpp --------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// this file is only relevant for Visual C++
+#if defined( _MSC_VER )
+
+#include <process.h>
+#include <assert.h>
+
+#include "Platform.h"
+
+// index one of the variable arguments
+//  presuming "(EditLine *el, ..." is first in the argument list
+#define GETARG( Y, X ) ( (void* ) *( ( (int**) &(Y) ) + (X) ) )
+
+// the control handler or SIGINT handler
+static sighandler_t _ctrlHandler = NULL;
+
+// the default console control handler
+BOOL
+WINAPI CtrlHandler (DWORD ctrlType)
+{
+    if ( _ctrlHandler != NULL )
+    {
+        _ctrlHandler( 0 );
+        return TRUE;
+    }
+    return FALSE;
+}
+
+int
+ioctl (int d, int request, ...)
+{
+    switch ( request )
+    {
+    // request the console windows size
+    case ( TIOCGWINSZ ):
+        {
+            // locate the window size structure on stack
+            winsize *ws = (winsize*) GETARG( d, 2 );
+            // get screen buffer information
+            CONSOLE_SCREEN_BUFFER_INFO info;
+            GetConsoleScreenBufferInfo( GetStdHandle( STD_OUTPUT_HANDLE ), &info );
+            // fill in the columns
+            ws->ws_col = info.dwMaximumWindowSize.X;
+            //
+            return 0;
+        }
+        break;
+    default:
+        assert( !"Not implemented!" );
+    }
+    return -1;
+}
+
+int
+kill (pid_t pid, int sig)
+{
+    // is the app trying to kill itself
+    if ( pid == getpid( ) )
+        exit( sig );
+    //
+    assert( !"Not implemented!" );
+    return -1;
+}
+
+int
+tcsetattr (int fd, int optional_actions, const struct termios *termios_p)
+{
+    assert( !"Not implemented!" );
+    return -1;
+}
+
+int
+tcgetattr (int fildes, struct termios *termios_p)
+{
+//  assert( !"Not implemented!" );
+    // error return value (0=success)
+    return -1;
+}
+
+sighandler_t
+signal (int sig, sighandler_t sigFunc)
+{
+    switch ( sig )
+    {
+    case ( SIGINT ):
+        {
+            _ctrlHandler = sigFunc;
+            SetConsoleCtrlHandler( CtrlHandler, TRUE );
+        }
+        break;
+    case ( SIGPIPE  ):
+    case ( SIGWINCH ):
+    case ( SIGTSTP  ):
+    case ( SIGCONT  ):
+        // ignore these for now
+        break;
+    default:
+        assert( !"Not implemented!" );
+    }
+    return 0;
+}
+
+#endif
\ No newline at end of file
diff --git a/contrib/llvm/tools/lldb/tools/driver/Platform.h b/contrib/llvm/tools/lldb/tools/driver/Platform.h
new file mode 100644
index 00000000000..f1fe1e4aac1
--- /dev/null
+++ b/contrib/llvm/tools/lldb/tools/driver/Platform.h
@@ -0,0 +1,113 @@
+//===-- Platform.h ----------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef lldb_Platform_h_
+#define lldb_Platform_h_
+
+#if defined( _MSC_VER )
+
+    // this will stop signal.h being included
+    #define _INC_SIGNAL
+
+    #include <io.h>
+    #include <eh.h>
+    #include <inttypes.h>
+    #include "ELWrapper.h"
+    #include "lldb/Host/windows/Windows.h"
+    #include "GetOptWrapper.h"
+
+    struct timeval
+    {
+        long tv_sec;
+        long tv_usec;
+    };
+
+    struct winsize
+    {
+        long ws_col;
+    };
+
+    typedef unsigned char   cc_t;
+    typedef unsigned int    speed_t;
+    typedef unsigned int    tcflag_t;
+
+    // fcntl.h
+    #define O_NOCTTY 0400
+
+    // ioctls.h
+    #define TIOCGWINSZ 0x5413
+
+    // signal.h
+    #define SIGPIPE  13
+    #define SIGCONT  18
+    #define SIGTSTP  20
+    #define SIGWINCH 28
+
+    // tcsetattr arguments
+    #define TCSANOW 0
+
+    #define NCCS 32
+    struct termios
+    {
+        tcflag_t c_iflag;  // input mode flags
+        tcflag_t c_oflag;  // output mode flags
+        tcflag_t c_cflag;  // control mode flags
+        tcflag_t c_lflag;  // local mode flags
+        cc_t c_line;       // line discipline
+        cc_t c_cc[NCCS];   // control characters
+        speed_t c_ispeed;  // input speed
+        speed_t c_ospeed;  // output speed
+    };
+
+    typedef long pid_t;
+
+    #define STDIN_FILENO 0
+
+    #define PATH_MAX MAX_PATH
+    #define snprintf _snprintf
+
+    extern int  ioctl( int d, int request, ... );
+    extern int  kill ( pid_t pid, int sig      );
+    extern int  tcsetattr( int fd, int optional_actions, const struct termios *termios_p );
+    extern int  tcgetattr( int fildes, struct termios *termios_p );
+
+    // signal handler function pointer type
+    typedef void (*sighandler_t)(int);
+
+    // signal.h
+    #define SIGINT 2
+    // default handler
+    #define SIG_DFL ( (sighandler_t) -1 )
+    // ignored
+    #define SIG_IGN ( (sighandler_t) -2 )
+    extern sighandler_t signal( int sig, sighandler_t );
+
+#else
+
+    #include <inttypes.h>
+
+    #include <getopt.h>
+    #include <libgen.h>
+    #include <sys/ioctl.h>
+    #include <termios.h>
+    #include <unistd.h>
+
+    #include <histedit.h>
+    #include <pthread.h>
+    #include <sys/time.h>
+
+    #if defined(__FreeBSD__)
+        #include <readline/readline.h>
+    #else
+        #include <editline/readline.h>
+    #endif
+
+#endif
+
+#endif // lldb_Platform_h_
diff --git a/contrib/llvm/tools/lldb/tools/lldb-platform/lldb-platform.cpp b/contrib/llvm/tools/lldb/tools/lldb-platform/lldb-platform.cpp
new file mode 100644
index 00000000000..bc9d6297477
--- /dev/null
+++ b/contrib/llvm/tools/lldb/tools/lldb-platform/lldb-platform.cpp
@@ -0,0 +1,317 @@
+//===-- lldb-platform.cpp ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/lldb-python.h"
+
+// C Includes
+#include <errno.h>
+#include <getopt.h>
+#include <signal.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+// C++ Includes
+
+// Other libraries and framework includes
+#include "lldb/lldb-private-log.h"
+#include "lldb/Core/Error.h"
+#include "lldb/Core/ConnectionFileDescriptor.h"
+#include "lldb/Core/ConnectionMachPort.h"
+#include "lldb/Core/Debugger.h"
+#include "lldb/Core/StreamFile.h"
+#include "lldb/Host/OptionParser.h"
+#include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Interpreter/CommandReturnObject.h"
+#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.h"
+#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
+using namespace lldb;
+using namespace lldb_private;
+
+//----------------------------------------------------------------------
+// option descriptors for getopt_long_only()
+//----------------------------------------------------------------------
+
+int g_debug = 0;
+int g_verbose = 0;
+int g_stay_alive = 0;
+
+static struct option g_long_options[] =
+{
+    { "debug",              no_argument,        &g_debug,           1   },
+    { "verbose",            no_argument,        &g_verbose,         1   },
+    { "stay-alive",         no_argument,        &g_stay_alive,      1   },
+    { "listen",             required_argument,  NULL,               'L' },
+    { "port-offset",        required_argument,  NULL,               'p' },
+    { "gdbserver-port",     required_argument,  NULL,               'P' },
+    { "min-gdbserver-port", required_argument,  NULL,               'm' },
+    { "max-gdbserver-port", required_argument,  NULL,               'M' },
+    { "lldb-command",       required_argument,  NULL,               'c' },
+    { NULL,                 0,                  NULL,               0   }
+};
+
+#if defined (__APPLE__)
+#define LOW_PORT    (IPPORT_RESERVED)
+#define HIGH_PORT   (IPPORT_HIFIRSTAUTO)
+#else
+#define LOW_PORT    (1024u)
+#define HIGH_PORT   (49151u)
+#endif
+
+
+//----------------------------------------------------------------------
+// Watch for signals
+//----------------------------------------------------------------------
+void
+signal_handler(int signo)
+{
+    switch (signo)
+    {
+    case SIGHUP:
+        // Use SIGINT first, if that does not work, use SIGHUP as a last resort.
+        // And we should not call exit() here because it results in the global destructors
+        // to be invoked and wreaking havoc on the threads still running.
+        Host::SystemLog(Host::eSystemLogWarning, "SIGHUP received, exiting lldb-platform...\n");
+        abort();
+        break;
+    }
+}
+
+static void
+display_usage (const char *progname)
+{
+    fprintf(stderr, "Usage:\n  %s [--log-file log-file-path] [--log-flags flags] --listen port\n", progname);
+    exit(0);
+}
+
+//----------------------------------------------------------------------
+// main
+//----------------------------------------------------------------------
+int
+main (int argc, char *argv[])
+{
+    const char *progname = argv[0];
+    signal (SIGPIPE, SIG_IGN);
+    signal (SIGHUP, signal_handler);
+    int long_option_index = 0;
+    Error error;
+    std::string listen_host_port;
+    int ch;
+    Debugger::Initialize(NULL);
+
+    lldb::DebuggerSP debugger_sp = Debugger::CreateInstance ();
+
+    debugger_sp->SetInputFileHandle(stdin, false);
+    debugger_sp->SetOutputFileHandle(stdout, false);
+    debugger_sp->SetErrorFileHandle(stderr, false);
+    
+    GDBRemoteCommunicationServer::PortMap gdbserver_portmap;
+    int min_gdbserver_port = 0;
+    int max_gdbserver_port = 0;
+    uint16_t port_offset = 0;
+    
+    std::vector<std::string> lldb_commands;
+    bool show_usage = false;
+    int option_error = 0;
+    
+    std::string short_options(OptionParser::GetShortOptionString(g_long_options));
+                            
+#if __GLIBC__
+    optind = 0;
+#else
+    optreset = 1;
+    optind = 1;
+#endif
+
+    while ((ch = getopt_long_only(argc, argv, short_options.c_str(), g_long_options, &long_option_index)) != -1)
+    {
+        switch (ch)
+        {
+        case 0:   // Any optional that auto set themselves will return 0
+            break;
+
+        case 'L':
+            listen_host_port.append (optarg);
+            break;
+
+        case 'p':
+            {
+                char *end = NULL;
+                long tmp_port_offset = strtoul(optarg, &end, 0);
+                if (end && *end == '\0')
+                {
+                    if (LOW_PORT <= tmp_port_offset && tmp_port_offset <= HIGH_PORT)
+                    {
+                        port_offset = (uint16_t)tmp_port_offset;
+                    }
+                    else
+                    {
+                        fprintf (stderr, "error: port offset %li is not in the valid user port range of %u - %u\n", tmp_port_offset, LOW_PORT, HIGH_PORT);
+                        option_error = 5;
+                    }
+                }
+                else
+                {
+                    fprintf (stderr, "error: invalid port offset string %s\n", optarg);
+                    option_error = 4;
+                }
+            }
+            break;
+                
+        case 'P':
+        case 'm':
+        case 'M':
+            {
+                char *end = NULL;
+                long portnum = strtoul(optarg, &end, 0);
+                if (end && *end == '\0')
+                {
+                    if (LOW_PORT <= portnum && portnum <= HIGH_PORT)
+                    {
+                        if (ch  == 'P')
+                            gdbserver_portmap[(uint16_t)portnum] = LLDB_INVALID_PROCESS_ID;
+                        else if (ch == 'm')
+                            min_gdbserver_port = portnum;
+                        else
+                            max_gdbserver_port = portnum;
+                    }
+                    else
+                    {
+                        fprintf (stderr, "error: port number %li is not in the valid user port range of %u - %u\n", portnum, LOW_PORT, HIGH_PORT);
+                        option_error = 1;
+                    }
+                }
+                else
+                {
+                    fprintf (stderr, "error: invalid port number string %s\n", optarg);
+                    option_error = 2;
+                }
+            }
+            break;
+            
+        case 'c':
+            lldb_commands.push_back(optarg);
+            break;
+
+        case 'h':   /* fall-through is intentional */
+        case '?':
+            show_usage = true;
+            break;
+        }
+    }
+
+    // Make a port map for a port range that was specified.
+    if (min_gdbserver_port < max_gdbserver_port)
+    {
+        for (uint16_t port = min_gdbserver_port; port < max_gdbserver_port; ++port)
+            gdbserver_portmap[port] = LLDB_INVALID_PROCESS_ID;
+    }
+    else if (min_gdbserver_port != max_gdbserver_port)
+    {
+        fprintf (stderr, "error: --min-gdbserver-port (%u) is greater than --max-gdbserver-port (%u)\n", min_gdbserver_port, max_gdbserver_port);
+        option_error = 3;
+        
+    }
+
+    // Print usage and exit if no listening port is specified.
+    if (listen_host_port.empty())
+        show_usage = true;
+    
+    if (show_usage || option_error)
+    {
+        display_usage(progname);
+        exit(option_error);
+    }
+    
+    // Skip any options we consumed with getopt_long_only
+    argc -= optind;
+    argv += optind;
+
+    // Execute any LLDB commands that we were asked to evaluate.
+    for (const auto &lldb_command : lldb_commands)
+    {
+        lldb_private::CommandReturnObject result;
+        printf("(lldb) %s\n", lldb_command.c_str());
+        debugger_sp->GetCommandInterpreter().HandleCommand(lldb_command.c_str(), eLazyBoolNo, result);
+        const char *output = result.GetOutputData();
+        if (output && output[0])
+            puts(output);
+    }
+
+
+    do {
+        GDBRemoteCommunicationServer gdb_server (true);
+        
+        if (port_offset > 0)
+            gdb_server.SetPortOffset(port_offset);
+
+        if (!gdbserver_portmap.empty())
+        {
+            gdb_server.SetPortMap(std::move(gdbserver_portmap));
+        }
+
+        if (!listen_host_port.empty())
+        {
+            std::unique_ptr<ConnectionFileDescriptor> conn_ap(new ConnectionFileDescriptor());
+            if (conn_ap.get())
+            {
+                for (int j = 0; j < listen_host_port.size(); j++)
+                {
+                    char c = listen_host_port[j];
+                    if (c > '9' || c < '0')
+                        printf("WARNING: passing anything but a number as argument to --listen will most probably make connecting impossible.\n");
+                }
+                std::auto_ptr<ConnectionFileDescriptor> conn_ap(new ConnectionFileDescriptor());
+                if (conn_ap.get())
+                {
+                    std::string connect_url ("listen://");
+                    connect_url.append(listen_host_port.c_str());
+
+                    printf ("Listening for a connection on %s...\n", listen_host_port.c_str());
+                    if (conn_ap->Connect(connect_url.c_str(), &error) == eConnectionStatusSuccess)
+                    {
+                        printf ("Connection established.\n");
+                        gdb_server.SetConnection (conn_ap.release());
+                    }
+                }
+            }
+
+            if (gdb_server.IsConnected())
+            {
+                // After we connected, we need to get an initial ack from...
+                if (gdb_server.HandshakeWithClient(&error))
+                {
+                    bool interrupt = false;
+                    bool done = false;
+                    while (!interrupt && !done)
+                    {
+                        if (!gdb_server.GetPacketAndSendResponse (UINT32_MAX, error, interrupt, done))
+                            break;
+                    }
+                    
+                    if (error.Fail())
+                    {
+                        fprintf(stderr, "error: %s\n", error.AsCString());
+                    }
+                }
+                else
+                {
+                    fprintf(stderr, "error: handshake with client failed\n");
+                }
+            }
+        }
+    } while (g_stay_alive);
+
+    Debugger::Terminate();
+
+    fprintf(stderr, "lldb-platform exiting...\n");
+
+    return 0;
+}
diff --git a/contrib/mdocml/lib.in b/contrib/mdocml/lib.in
index 7198a79799c..6af91106dbd 100644
--- a/contrib/mdocml/lib.in
+++ b/contrib/mdocml/lib.in
@@ -32,6 +32,7 @@ LINE("libc",		"Standard C\\~Library (libc, \\-lc)")
 LINE("libc_r",		"Reentrant C\\~Library (libc_r, \\-lc_r)")
 LINE("libcalendar",	"Calendar Arithmetic Library (libcalendar, \\-lcalendar)")
 LINE("libcam",		"Common Access Method User Library (libcam, \\-lcam)")
+LINE("libcapsicum",	"Capsicum Library (libcapsicum, \\-lcapsicum)")
 LINE("libcdk",		"Curses Development Kit Library (libcdk, \\-lcdk)")
 LINE("libcipher",	"FreeSec Crypt Library (libcipher, \\-lcipher)")
 LINE("libcompat",	"Compatibility Library (libcompat, \\-lcompat)")
@@ -67,6 +68,7 @@ LINE("libmemstat",	"Kernel Memory Allocator Statistics Library (libmemstat, \\-l
 LINE("libmenu",		"Curses Menu Library (libmenu, \\-lmenu)")
 LINE("libnetgraph",	"Netgraph User Library (libnetgraph, \\-lnetgraph)")
 LINE("libnetpgp",	"Netpgp signing, verification, encryption and decryption (libnetpgp, \\-lnetpgp)")
+LINE("libnv",		"Name/value pairs library (libnv, \\-lnv)")
 LINE("libossaudio",	"OSS Audio Emulation Library (libossaudio, \\-lossaudio)")
 LINE("libpam",		"Pluggable Authentication Module Library (libpam, \\-lpam)")
 LINE("libpcap",		"Packet Capture Library (libpcap, \\-lpcap)")
diff --git a/contrib/mtree/compare.c b/contrib/mtree/compare.c
index d2389e6877c..e3639ceea08 100644
--- a/contrib/mtree/compare.c
+++ b/contrib/mtree/compare.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: compare.c,v 1.55 2012/10/05 00:59:35 christos Exp $	*/
+/*	$NetBSD: compare.c,v 1.58 2013/11/21 18:39:50 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: compare.c,v 1.55 2012/10/05 00:59:35 christos Exp $");
+__RCSID("$NetBSD: compare.c,v 1.58 2013/11/21 18:39:50 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -48,6 +48,7 @@ __RCSID("$NetBSD: compare.c,v 1.55 2012/10/05 00:59:35 christos Exp $");
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -71,13 +72,18 @@ __RCSID("$NetBSD: compare.c,v 1.55 2012/10/05 00:59:35 christos Exp $");
 #define	INDENTNAMELEN	8
 #define MARK								\
 do {									\
-	len = printf("%s: ", RP(p));					\
-	if (len > INDENTNAMELEN) {					\
+	if (flavor == F_FREEBSD9) {					\
+		len = printf("%s changed\n", RP(p));			\
 		tab = "\t";						\
-		printf("\n");						\
 	} else {							\
-		tab = "";						\
-		printf("%*s", INDENTNAMELEN - (int)len, "");		\
+		len = printf("%s: ", RP(p));				\
+		if (len > INDENTNAMELEN) {				\
+			tab = "\t";					\
+			printf("\n");					\
+		} else {						\
+			tab = "";					\
+			printf("%*s", INDENTNAMELEN - (int)len, "");	\
+		}							\
 	}								\
 } while (0)
 #define	LABEL if (!label++) MARK
@@ -170,7 +176,8 @@ compare(NODE *s, FTSENT *p)
 		break;
 #endif
 typeerr:		LABEL;
-		printf("\ttype (%s, %s)\n",
+		printf(flavor == F_FREEBSD9 ?
+		    "\ttype expected %s found %s\n" : "\ttype (%s, %s)\n",
 		    nodetype(s->type), inotype(p->fts_statp->st_mode));
 		return (label);
 	}
@@ -192,9 +199,11 @@ typeerr:		LABEL;
 	    (s->type == F_BLOCK || s->type == F_CHAR) &&
 	    s->st_rdev != p->fts_statp->st_rdev) {
 		LABEL;
-		printf("%sdevice (%#llx, %#llx",
-		    tab, (long long)s->st_rdev,
-		    (long long)p->fts_statp->st_rdev);
+		printf(flavor == F_FREEBSD9 ?
+		    "%sdevice expected %#jx found %#jx" :
+		    "%sdevice (%#jx, %#jx",
+		    tab, (uintmax_t)s->st_rdev,
+		    (uintmax_t)p->fts_statp->st_rdev);
 		if (uflag) {
 			if ((unlink(p->fts_accpath) == -1) ||
 			    (mknod(p->fts_accpath,
@@ -202,10 +211,12 @@ typeerr:		LABEL;
 			      s->st_rdev) == -1) ||
 			    (lchown(p->fts_accpath, p->fts_statp->st_uid,
 			      p->fts_statp->st_gid) == -1) )
-				printf(", not modified: %s)\n",
-				    strerror(errno));
+				printf(", not modified: %s%s\n",
+				    strerror(errno),
+				    flavor == F_FREEBSD9 ? "" : ")");
 			 else
-				printf(", modified)\n");
+				printf(", modified%s\n",
+				    flavor == F_FREEBSD9 ? "" : ")");
 		} else
 			printf(")\n");
 		tab = "\t";
@@ -213,28 +224,34 @@ typeerr:		LABEL;
 	/* Set the uid/gid first, then set the mode. */
 	if (s->flags & (F_UID | F_UNAME) && s->st_uid != p->fts_statp->st_uid) {
 		LABEL;
-		printf("%suser (%lu, %lu",
+		printf(flavor == F_FREEBSD9 ?
+		    "%suser expected %lu found %lu" : "%suser (%lu, %lu",
 		    tab, (u_long)s->st_uid, (u_long)p->fts_statp->st_uid);
 		if (uflag) {
 			if (lchown(p->fts_accpath, s->st_uid, -1))
-				printf(", not modified: %s)\n",
-				    strerror(errno));
+				printf(", not modified: %s%s\n",
+				    strerror(errno),
+				    flavor == F_FREEBSD9 ? "" : ")");
 			else
-				printf(", modified)\n");
+				printf(", modified%s\n",
+				    flavor == F_FREEBSD9 ? "" : ")");
 		} else
 			printf(")\n");
 		tab = "\t";
 	}
 	if (s->flags & (F_GID | F_GNAME) && s->st_gid != p->fts_statp->st_gid) {
 		LABEL;
-		printf("%sgid (%lu, %lu",
+		printf(flavor == F_FREEBSD9 ?
+		    "%sgid expected %lu found %lu" : "%sgid (%lu, %lu",
 		    tab, (u_long)s->st_gid, (u_long)p->fts_statp->st_gid);
 		if (uflag) {
 			if (lchown(p->fts_accpath, -1, s->st_gid))
-				printf(", not modified: %s)\n",
-				    strerror(errno));
+				printf(", not modified: %s%s\n",
+				    strerror(errno),
+				    flavor == F_FREEBSD9 ? "" : ")");
 			else
-				printf(", modified)\n");
+				printf(", modified%s\n",
+				    flavor == F_FREEBSD9 ? "" : ")");
 		}
 		else
 			printf(")\n");
@@ -259,15 +276,19 @@ typeerr:		LABEL;
 		}
 
 		LABEL;
-		printf("%spermissions (%#lo, %#lo",
+		printf(flavor == F_FREEBSD9 ?
+		    "%spermissions expcted %#lo found %#lo" :
+		    "%spermissions (%#lo, %#lo",
 		    tab, (u_long)s->st_mode,
 		    (u_long)p->fts_statp->st_mode & MBITS);
 		if (uflag) {
 			if (lchmod(p->fts_accpath, s->st_mode))
-				printf(", not modified: %s)\n",
-				    strerror(errno));
+				printf(", not modified: %s%s\n",
+				    strerror(errno),
+				    flavor == F_FREEBSD9 ? "" : ")");
 			else
-				printf(", modified)\n");
+				printf(", modified%s\n",
+				    flavor == F_FREEBSD9 ? "" : ")");
 		}
 		else
 			printf(")\n");
@@ -277,15 +298,18 @@ typeerr:		LABEL;
 	if (s->flags & F_NLINK && s->type != F_DIR &&
 	    s->st_nlink != p->fts_statp->st_nlink) {
 		LABEL;
-		printf("%slink count (%lu, %lu)\n",
+		printf(flavor == F_FREEBSD9 ?
+		    "%slink count expected %lu found %lu\n" :
+		    "%slink count (%lu, %lu)\n",
 		    tab, (u_long)s->st_nlink, (u_long)p->fts_statp->st_nlink);
 		tab = "\t";
 	}
 	if (s->flags & F_SIZE && s->st_size != p->fts_statp->st_size) {
 		LABEL;
-		printf("%ssize (%lld, %lld)\n",
-		    tab, (long long)s->st_size,
-		    (long long)p->fts_statp->st_size);
+		printf(flavor == F_FREEBSD9 ?
+		    "%ssize expected %ju found %ju\n" : "%ssize (%ju, %ju)\n",
+		    tab, (uintmax_t)s->st_size,
+		    (uintmax_t)p->fts_statp->st_size);
 		tab = "\t";
 	}
 	/*
@@ -318,18 +342,22 @@ typeerr:		LABEL;
 		if (tv[0].tv_sec != tv[1].tv_sec ||
 		    tv[0].tv_usec != tv[1].tv_usec) {
 			LABEL;
-			printf("%smodification time (%.24s, ",
+			printf(flavor == F_FREEBSD9 ?
+			    "%smodification time expected %.24s found " :
+			    "%smodification time (%.24s, ",
 			    tab, ctime(&smtime));
 			printf("%.24s", ctime(&pmtime));
 			if (tflag) {
 				tv[1] = tv[0];
 				if (utimes(p->fts_accpath, tv))
-					printf(", not modified: %s)\n",
-					    strerror(errno));
+					printf(", not modified: %s%s\n",
+					    strerror(errno),
+					    flavor == F_FREEBSD9 ? "" : ")");
 				else
-					printf(", modified)\n");
+					printf(", modified%s\n",
+					    flavor == F_FREEBSD9 ? "" : ")");
 			} else
-				printf(")\n");
+				printf("%s\n", flavor == F_FREEBSD9 ? "" : ")");
 			tab = "\t";
 		}
 	}
@@ -346,7 +374,9 @@ typeerr:		LABEL;
 			char *f_s;
 			LABEL;
 			f_s = flags_to_string(s->st_flags, "none");
-			printf("%sflags (\"%s\" is not ", tab, f_s);
+			printf(flavor == F_FREEBSD9 ?
+			    "%sflags expected \"%s\" found " :
+			    "%sflags (\"%s\" is not ", tab, f_s);
 			free(f_s);
 			f_s = flags_to_string(p->fts_statp->st_flags, "none");
 			printf("\"%s\"", f_s);
@@ -360,7 +390,7 @@ typeerr:		LABEL;
 			else
 				SETFLAGS(0, (~SP_FLGS & CH_MASK));
 		} else
-			printf(")\n");
+			printf("%s\n", flavor == F_FREEBSD9 ? "" : ")");
 		tab = "\t";
 	}
 #endif	/* HAVE_STRUCT_STAT_ST_FLAGS */
@@ -386,7 +416,9 @@ typeerr:		LABEL;
 			close(fd);
 			if (s->cksum != val) {
 				LABEL;
-				printf("%scksum (%lu, %lu)\n",
+				printf(flavor == F_FREEBSD9 ?
+				    "%scksum expected %lu found %lu\n" :
+				    "%scksum (%lu, %lu)\n",
 				    tab, s->cksum, (unsigned long)val);
 			}
 			tab = "\t";
@@ -402,7 +434,9 @@ typeerr:		LABEL;
 		} else {
 			if (strcmp(s->md5digest, digestbuf)) {
 				LABEL;
-				printf("%s%s (0x%s, 0x%s)\n",
+				printf(flavor == F_FREEBSD9 ?
+				    "%s%s expected %s found %s\n" :
+				    "%s%s (0x%s, 0x%s)\n",
 				    tab, MD5KEY, s->md5digest, digestbuf);
 			}
 			tab = "\t";
@@ -420,7 +454,9 @@ typeerr:		LABEL;
 		} else {
 			if (strcmp(s->rmd160digest, digestbuf)) {
 				LABEL;
-				printf("%s%s (0x%s, 0x%s)\n",
+				printf(flavor == F_FREEBSD9 ?
+				    "%s%s expected %s found %s\n" :
+				    "%s%s (0x%s, 0x%s)\n",
 				    tab, RMD160KEY, s->rmd160digest, digestbuf);
 			}
 			tab = "\t";
@@ -438,7 +474,9 @@ typeerr:		LABEL;
 		} else {
 			if (strcmp(s->sha1digest, digestbuf)) {
 				LABEL;
-				printf("%s%s (0x%s, 0x%s)\n",
+				printf(flavor == F_FREEBSD9 ? 
+				    "%s%s expected %s found %s\n" :
+				    "%s%s (0x%s, 0x%s)\n",
 				    tab, SHA1KEY, s->sha1digest, digestbuf);
 			}
 			tab = "\t";
@@ -456,7 +494,9 @@ typeerr:		LABEL;
 		} else {
 			if (strcmp(s->sha256digest, digestbuf)) {
 				LABEL;
-				printf("%s%s (0x%s, 0x%s)\n",
+				printf(flavor == F_FREEBSD9 ? 
+				    "%s%s expected %s found %s\n" :
+				    "%s%s (0x%s, 0x%s)\n",
 				    tab, SHA256KEY, s->sha256digest, digestbuf);
 			}
 			tab = "\t";
@@ -473,7 +513,9 @@ typeerr:		LABEL;
 		} else {
 			if (strcmp(s->sha384digest, digestbuf)) {
 				LABEL;
-				printf("%s%s (0x%s, 0x%s)\n",
+				printf(flavor == F_FREEBSD9 ? 
+				    "%s%s expected %s found %s\n" :
+				    "%s%s (0x%s, 0x%s)\n",
 				    tab, SHA384KEY, s->sha384digest, digestbuf);
 			}
 			tab = "\t";
@@ -490,7 +532,9 @@ typeerr:		LABEL;
 		} else {
 			if (strcmp(s->sha512digest, digestbuf)) {
 				LABEL;
-				printf("%s%s (0x%s, 0x%s)\n",
+				printf(flavor == F_FREEBSD9 ? 
+				    "%s%s expected %s found %s\n" :
+				    "%s%s (0x%s, 0x%s)\n",
 				    tab, SHA512KEY, s->sha512digest, digestbuf);
 			}
 			tab = "\t";
@@ -501,16 +545,20 @@ typeerr:		LABEL;
 	if (s->flags & F_SLINK &&
 	    strcmp(cp = rlink(p->fts_accpath), s->slink)) {
 		LABEL;
-		printf("%slink ref (%s, %s", tab, cp, s->slink);
+		printf(flavor == F_FREEBSD9 ? 
+		    "%slink ref expected %s found %s" :
+		    "%slink ref (%s, %s", tab, cp, s->slink);
 		if (uflag) {
 			if ((unlink(p->fts_accpath) == -1) ||
 			    (symlink(s->slink, p->fts_accpath) == -1) )
-				printf(", not modified: %s)\n",
-				    strerror(errno));
+				printf(", not modified: %s%s\n",
+				    strerror(errno),
+				    flavor == F_FREEBSD9 ? "" : ")");
 			else
-				printf(", modified)\n");
+				printf(", modified%s\n",
+				    flavor == F_FREEBSD9 ? "" : ")");
 		} else
-			printf(")\n");
+			printf("%s\n", flavor == F_FREEBSD9 ? "" : ")");
 	}
 	return (label);
 }
diff --git a/contrib/mtree/create.c b/contrib/mtree/create.c
index 10306f993d2..1e44661f013 100644
--- a/contrib/mtree/create.c
+++ b/contrib/mtree/create.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: create.c,v 1.69 2013/02/03 19:15:17 christos Exp $	*/
+/*	$NetBSD: create.c,v 1.72 2013/10/17 17:22:59 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: create.c,v 1.69 2013/02/03 19:15:17 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.72 2013/10/17 17:22:59 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -55,6 +55,7 @@ __RCSID("$NetBSD: create.c,v 1.69 2013/02/03 19:15:17 christos Exp $");
 #include <pwd.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
@@ -216,22 +217,22 @@ statf(int indent, FTSENT *p)
 		    p->fts_statp->st_mode & MBITS);
 	if (keys & F_DEV &&
 	    (S_ISBLK(p->fts_statp->st_mode) || S_ISCHR(p->fts_statp->st_mode)))
-		output(indent, &offset, "device=%#llx",
-		    (long long)p->fts_statp->st_rdev);
+		output(indent, &offset, "device=%#jx",
+		    (uintmax_t)p->fts_statp->st_rdev);
 	if (keys & F_NLINK && p->fts_statp->st_nlink != 1)
 		output(indent, &offset, "nlink=%u", p->fts_statp->st_nlink);
 	if (keys & F_SIZE &&
-	    (flavor != F_NETBSD6 || S_ISREG(p->fts_statp->st_mode)))
-		output(indent, &offset, "size=%lld",
-		    (long long)p->fts_statp->st_size);
+	    (flavor == F_FREEBSD9 || S_ISREG(p->fts_statp->st_mode)))
+		output(indent, &offset, "size=%ju",
+		    (uintmax_t)p->fts_statp->st_size);
 	if (keys & F_TIME)
 #if defined(BSD4_4) && !defined(HAVE_NBTOOL_CONFIG_H)
-		output(indent, &offset, "time=%ld.%09ld",
-		    (long)p->fts_statp->st_mtimespec.tv_sec,
+		output(indent, &offset, "time=%jd.%09ld",
+		    (intmax_t)p->fts_statp->st_mtimespec.tv_sec,
 		    p->fts_statp->st_mtimespec.tv_nsec);
 #else
-		output(indent, &offset, "time=%ld.%09ld",
-		    (long)p->fts_statp->st_mtime, (long)0);
+		output(indent, &offset, "time=%jd.%09ld",
+		    (intmax_t)p->fts_statp->st_mtime, (long)0);
 #endif
 	if (keys & F_CKSUM && S_ISREG(p->fts_statp->st_mode)) {
 		if ((fd = open(p->fts_accpath, O_RDONLY, 0)) < 0 ||
diff --git a/contrib/mtree/getid.c b/contrib/mtree/getid.c
index 64eef27ef4e..3079180d8f2 100644
--- a/contrib/mtree/getid.c
+++ b/contrib/mtree/getid.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getid.c,v 1.7 2008/04/28 20:24:17 martin Exp $	*/
+/*	$NetBSD: getid.c,v 1.8 2013/10/16 17:27:42 christos Exp $	*/
 /*	from: NetBSD: getpwent.c,v 1.48 2000/10/03 03:22:26 enami Exp */
 /*	from: NetBSD: getgrent.c,v 1.41 2002/01/12 23:51:30 lukem Exp */
 
@@ -65,7 +65,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: getid.c,v 1.7 2008/04/28 20:24:17 martin Exp $");
+__RCSID("$NetBSD: getid.c,v 1.8 2013/10/16 17:27:42 christos Exp $");
 
 #include <sys/param.h>
 
@@ -230,6 +230,9 @@ grscan(int search, gid_t gid, const char *name)
 				;
 			continue;
 		}
+		/* skip comments */
+		if (pwline[0] == '#')
+			continue;
 		if (grmatchline(search, gid, name))
 			return 1;
 	}
@@ -371,6 +374,9 @@ pwscan(int search, uid_t uid, const char *name)
 				;
 			continue;
 		}
+		/* skip comments */
+		if (pwline[0] == '#')
+			continue;
 		if (pwmatchline(search, uid, name))
 			return 1;
 	}
diff --git a/contrib/mtree/spec.c b/contrib/mtree/spec.c
index 3500b2ff68b..ba39180e043 100644
--- a/contrib/mtree/spec.c
+++ b/contrib/mtree/spec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: spec.c,v 1.85 2012/12/20 16:43:16 christos Exp $	*/
+/*	$NetBSD: spec.c,v 1.88 2013/10/17 17:22:59 christos Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -67,7 +67,7 @@
 #if 0
 static char sccsid[] = "@(#)spec.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: spec.c,v 1.85 2012/12/20 16:43:16 christos Exp $");
+__RCSID("$NetBSD: spec.c,v 1.88 2013/10/17 17:22:59 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -81,6 +81,7 @@ __RCSID("$NetBSD: spec.c,v 1.85 2012/12/20 16:43:16 christos Exp $");
 #include <pwd.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -217,6 +218,12 @@ noparent:		mtree_err("no parent node");
 				/*
 				 * empty tree
 				 */
+			/*
+			 * Allow a bare "." root node by forcing it to
+			 * type=dir for compatibility with FreeBSD.
+			 */
+			if (strcmp(centry->name, ".") == 0 && centry->type == 0)
+				centry->type = F_DIR;
 			if (strcmp(centry->name, ".") != 0 ||
 			    centry->type != F_DIR)
 				mtree_err(
@@ -350,16 +357,18 @@ dump_nodes(const char *dir, NODE *root, int pathlast)
 			appendfield(pathlast, "mode=%#o", cur->st_mode);
 		if (MATCHFLAG(F_DEV) &&
 		    (cur->type == F_BLOCK || cur->type == F_CHAR))
-			appendfield(pathlast, "device=%#llx", (long long)cur->st_rdev);
+			appendfield(pathlast, "device=%#jx",
+			    (uintmax_t)cur->st_rdev);
 		if (MATCHFLAG(F_NLINK))
 			appendfield(pathlast, "nlink=%d", cur->st_nlink);
 		if (MATCHFLAG(F_SLINK))
 			appendfield(pathlast, "link=%s", vispath(cur->slink));
 		if (MATCHFLAG(F_SIZE))
-			appendfield(pathlast, "size=%lld", (long long)cur->st_size);
+			appendfield(pathlast, "size=%ju",
+			    (uintmax_t)cur->st_size);
 		if (MATCHFLAG(F_TIME))
-			appendfield(pathlast, "time=%lld.%09ld",
-			    (long long)cur->st_mtimespec.tv_sec,
+			appendfield(pathlast, "time=%jd.%09ld",
+			    (intmax_t)cur->st_mtimespec.tv_sec,
 			    cur->st_mtimespec.tv_nsec);
 		if (MATCHFLAG(F_CKSUM))
 			appendfield(pathlast, "cksum=%lu", cur->cksum);
diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1
index e62cdeae51e..1702f372d4f 100644
--- a/contrib/netcat/nc.1
+++ b/contrib/netcat/nc.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: nc.1,v 1.62 2013/03/20 09:27:56 sthen Exp $
+.\"     $OpenBSD: nc.1,v 1.63 2013/07/16 00:07:52 schwarze Exp $
 .\"
 .\" Copyright (c) 1996 David Sacerdote
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 7, 2012
+.Dd March 20, 2013
 .Dt NC 1
 .Os
 .Sh NAME
@@ -490,10 +490,10 @@ if the proxy requires it:
 .Xr tcp 4
 .Sh AUTHORS
 Original implementation by *Hobbit*
-.Aq hobbit@avian.org .
+.Aq Mt hobbit@avian.org .
 .br
 Rewritten with IPv6 support by
-.An Eric Jackson Aq ericj@monkey.org .
+.An Eric Jackson Aq Mt ericj@monkey.org .
 .Sh CAVEATS
 UDP port scans using the
 .Fl uz
diff --git a/contrib/netcat/netcat.c b/contrib/netcat/netcat.c
index 71454af3615..0037efa0399 100644
--- a/contrib/netcat/netcat.c
+++ b/contrib/netcat/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.111 2013/03/20 09:27:56 sthen Exp $ */
+/* $OpenBSD: netcat.c,v 1.112 2013/04/29 00:28:23 okan Exp $ */
 /*
  * Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
  *
@@ -568,7 +568,7 @@ unix_connect(char *path)
 		if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
 			return (-1);
 	}
-	(void)fcntl(s, F_SETFD, 1);
+	(void)fcntl(s, F_SETFD, FD_CLOEXEC);
 
 	memset(&sun, 0, sizeof(struct sockaddr_un));
 	sun.sun_family = AF_UNIX;
diff --git a/contrib/nvi/README b/contrib/nvi/README
index bb05379e7a7..c129439d38d 100644
--- a/contrib/nvi/README
+++ b/contrib/nvi/README
@@ -1,6 +1,6 @@
-#	$Id: README,v 9.0 2012/10/07 09:13:54 zy Exp $
+#	$Id: README,v 9.1 2013/11/02 02:50:23 zy Exp $
 
-This is version 2.1.1 (2012-10-07) of nex/nvi, a reimplementation of the ex/vi
+This is version 2.1.2 (2012-11-02) of nex/nvi, a reimplementation of the ex/vi
 text editors originally distributed as part of the Fourth Berkeley
 Software Distribution (4BSD), by the University of California, Berkeley.
 
diff --git a/contrib/nvi/cl/cl_term.c b/contrib/nvi/cl/cl_term.c
index 3d8cdb2e2b5..7e8f6c7735a 100644
--- a/contrib/nvi/cl/cl_term.c
+++ b/contrib/nvi/cl/cl_term.c
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: cl_term.c,v 10.33 2012/04/21 23:51:46 zy Exp $";
+static const char sccsid[] = "$Id: cl_term.c,v 10.34 2013/12/07 16:21:14 wjenkner Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -187,14 +187,18 @@ cl_term_init(SCR *sp)
 int
 cl_term_end(GS *gp)
 {
-	SEQ *qp, *nqp;
+	SEQ *qp, *nqp, *pre_qp = NULL;
 
 	/* Delete screen specific mappings. */
 	SLIST_FOREACH_SAFE(qp, gp->seqq, q, nqp)
 		if (F_ISSET(qp, SEQ_SCREEN)) {
-			SLIST_REMOVE_HEAD(gp->seqq, q);
+			if (qp == SLIST_FIRST(gp->seqq))
+				SLIST_REMOVE_HEAD(gp->seqq, q);
+			else
+				SLIST_REMOVE_AFTER(pre_qp, q);
 			(void)seq_free(qp);
-		}
+		} else
+			pre_qp = qp;
 	return (0);
 }
 
diff --git a/contrib/nvi/common/key.c b/contrib/nvi/common/key.c
index 652b8f3eae0..9fc20b73d94 100644
--- a/contrib/nvi/common/key.c
+++ b/contrib/nvi/common/key.c
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: key.c,v 10.53 2013/03/11 01:20:53 yamt Exp $";
+static const char sccsid[] = "$Id: key.c,v 10.54 2013/11/13 12:15:27 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -272,7 +272,7 @@ v_key_name(
 	 * The code prints non-printable wide characters in 4 or 5 digits
 	 * Unicode escape sequences, so only supports plane 0 to 15.
 	 */
-	if (ISPRINT(ach))
+	if (CAN_PRINT(sp, ach))
 		goto done;
 nopr:	if (iscntrl(ch) && (ch < 0x20 || ch == 0x7f)) {
 		sp->cname[0] = '^';
diff --git a/contrib/nvi/common/key.h b/contrib/nvi/common/key.h
index 3eeca124a00..43cef77a4af 100644
--- a/contrib/nvi/common/key.h
+++ b/contrib/nvi/common/key.h
@@ -6,7 +6,7 @@
  *
  * See the LICENSE file for redistribution information.
  *
- *	$Id: key.h,v 10.55 2012/10/07 01:31:17 zy Exp $
+ *	$Id: key.h,v 10.56 2013/11/13 12:15:27 zy Exp $
  */
 
 #include "multibyte.h"
@@ -23,8 +23,9 @@
 #define INPUT2INT5(sp,cw,n,nlen,w,wlen)					    \
     sp->conv.input2int(sp, n, nlen, &(cw), &wlen, &w)
 #define CONST
+#define INTISWIDE(c)        (wctob(c) == EOF)
 #define CHAR_WIDTH(sp, ch)  wcwidth(ch)
-#define INTISWIDE(c)	(wctob(c) == EOF)
+#define CAN_PRINT(sp, ch)   (CHAR_WIDTH(sp, ch) > 0)
 #else
 #define FILE2INT5(sp,buf,n,nlen,w,wlen) \
     (w = n, wlen = nlen, 0)
@@ -36,9 +37,10 @@
     (n = w, nlen = wlen, 0)
 #define INPUT2INT5(sp,buf,n,nlen,w,wlen) \
     (w = n, wlen = nlen, 0)
-#define CONST const
-#define INTISWIDE(c)	    0
+#define CONST               const
+#define INTISWIDE(c)        0
 #define CHAR_WIDTH(sp, ch)  1
+#define CAN_PRINT(sp, ch)   isprint(ch)
 #endif
 #define FILE2INT(sp,n,nlen,w,wlen)					    \
     FILE2INT5(sp,sp->cw,n,nlen,w,wlen)
diff --git a/contrib/nvi/common/main.c b/contrib/nvi/common/main.c
index 16b3fb19e22..6ff41817300 100644
--- a/contrib/nvi/common/main.c
+++ b/contrib/nvi/common/main.c
@@ -11,9 +11,9 @@
 
 #ifndef lint
 static const char copyright[] =
-"%Z% Copyright (c) 1992, 1993, 1994\n\
+"@(#) Copyright (c) 1992, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n\
-%Z% Copyright (c) 1992, 1993, 1994, 1995, 1996\n\
+@(#) Copyright (c) 1992, 1993, 1994, 1995, 1996\n\
 	Keith Bostic.  All rights reserved.\n";
 #endif /* not lint */
 
diff --git a/contrib/nvi/docs/USD.doc/vi.man/vi.1 b/contrib/nvi/docs/USD.doc/vi.man/vi.1
index 43ca222e948..44da037cd34 100644
--- a/contrib/nvi/docs/USD.doc/vi.man/vi.1
+++ b/contrib/nvi/docs/USD.doc/vi.man/vi.1
@@ -5,1619 +5,2742 @@
 .\" Copyright (c) 2011
 .\"	Zhihao Yuan.  All rights reserved.
 .\"
-.\" This document may not be republished without written permission from
-.\" Keith Bostic. 
+.\" The vi program is freely redistributable.
+.\" You are welcome to copy, modify and share it with others
+.\" under the conditions listed in the LICENSE file.
+.\" If any company (not individual!) finds vi sufficiently useful
+.\" that you would have purchased it, or if any company wishes to
+.\" redistribute it, contributions to the authors would be appreciated.
 .\"
-.\" See the LICENSE file for redistribution information.
+.\"     $Id: vi.1,v 9.0 2013/11/02 12:11:56 zy Exp $
+.\"     $FreeBSD$
 .\"
-.\"     @(#)vi.1       8.51 (Berkeley) 10/10/96
-.\"	$FreeBSD$
-.\"     $Id: vi.1,v 8.59 2012/02/12 12:56:37 zy Exp $
-.\"
-.TH VI 1 "11 February, 2012"
-.UC
-.SH NAME
-ex, vi, view \- text editors
-.SH SYNOPSIS
-.B ex
-[\c
-.B -eFRrSsv\c
-] [\c
-.BI -c " cmd"\c
-] [\c
-.BI -t " tag"\c
-] [\c
-.BI -w " size"\c
-] [file ...]
-.br
-.B vi
-[\c
-.B -eFlRrSv\c
-] [\c
-.BI -c " cmd"\c
-] [\c
-.BI -t " tag"\c
-] [\c
-.BI -w " size"\c
-] [file ...]
-.br
-.B view
-[\c
-.B -eFRrSv\c
-] [\c
-.BI -c " cmd"\c
-] [\c
-.BI -t " tag"\c
-] [\c
-.BI -w " size"\c
-] [file ...]
-.SH LICENSE
-The vi program is freely redistributable.  You are welcome to copy,
-modify and share it with others under the conditions listed in the
-LICENSE file.  If any company (not individual!) finds vi sufficiently
-useful that you would have purchased it, or if any company wishes to
-redistribute it, contributions to the authors would be appreciated.
-.SH DESCRIPTION
-.I \&Vi
-is a screen oriented text editor.
-.I \&Ex
+.Dd November 2, 2013
+.Dt VI 1
+.Os
+.Sh NAME
+.Nm ex , vi , view
+.Nd text editors
+.Sh SYNOPSIS
+.Nm ex
+.Op Fl FRrSsv
+.Op Fl c Ar cmd
+.Op Fl t Ar tag
+.Op Fl w Ar size
+.Op Ar
+.Nm vi\ \&
+.Op Fl eFRrS
+.Op Fl c Ar cmd
+.Op Fl t Ar tag
+.Op Fl w Ar size
+.Op Ar
+.Nm view
+.Op Fl eFrS
+.Op Fl c Ar cmd
+.Op Fl t Ar tag
+.Op Fl w Ar size
+.Op Ar
+.Sh DESCRIPTION
+.Nm vi
+is a screen-oriented text editor.
+.Nm ex
 is a line-oriented text editor.
-.I \&Ex
+.Nm ex
 and
-.I \&vi
+.Nm vi
 are different interfaces to the same program,
 and it is possible to switch back and forth during an edit session.
-.I View
+.Nm view
 is the equivalent of using the
-.B \-R
-(read-only) option of
-.IR \&vi .
-.PP
+.Fl R
+.Pq read-only
+option of
+.Nm vi .
+.Pp
 This manual page is the one provided with the
-.I nex/nvi
+.Nm nex Ns / Ns Nm nvi
 versions of the
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 text editors.
-.I Nex/nvi
+.Nm nex Ns / Ns Nm nvi
 are intended as bug-for-bug compatible replacements for the original
-Fourth Berkeley Software Distribution (4BSD)
-.I \&ex
+Fourth Berkeley Software Distribution
+.Pq 4BSD
+.Nm ex
 and
-.I \&vi
+.Nm vi
 programs.
 For the rest of this manual page,
-.I nex/nvi
+.Nm nex Ns / Ns Nm nvi
 is used only when it's necessary to distinguish it from the historic
 implementations of
-.IR ex/vi .
-.PP
+.Nm ex Ns / Ns Nm vi .
+.Pp
 This manual page is intended for users already familiar with
-.IR ex/vi .
+.Nm ex Ns / Ns Nm vi .
 Anyone else should almost certainly read a good tutorial on the
 editor before this manual page.
-If you're in an unfamiliar environment, and you absolutely have to
-get work done immediately, read the section after the options
-description, entitled ``Fast Startup''.
+If you're in an unfamiliar environment,
+and you absolutely have to get work done immediately,
+read the section after the options description, entitled
+.Sx FAST STARTUP .
 It's probably enough to get you going.
-.PP
+.Pp
 The following options are available:
-.TP
-.B \-c
+.Bl -tag -width "-w size "
+.It Fl c Ar cmd
 Execute
-.B cmd
-immediately after starting the edit session.
-Particularly useful for initial positioning in the file, however
-.B cmd
+.Ar cmd
+on the first file loaded.
+Particularly useful for initial positioning in the file, although
+.Ar cmd
 is not limited to positioning commands.
-This is the POSIX 1003.2 interface for the historic ``+cmd'' syntax.
-.I Nex/nvi
+This is the POSIX 1003.2 interface for the historic
+.Dq +cmd
+syntax.
+.Nm nex Ns / Ns Nm nvi
 supports both the old and new syntax.
-.TP
-.B \-e
+.It Fl e
 Start editing in ex mode, as if the command name were
-.IR \&ex .
-.TP
-.B \-F
+.Nm ex .
+.It Fl F
 Don't copy the entire file when first starting to edit.
 (The default is to make a copy in case someone else modifies
 the file during your edit session.)
-.TP
-.B \-l
-Start editing with the lisp and showmatch options set.
-.TP
-.B \-R
+.\" .It Fl l
+.\" Start editing with the lisp and showmatch options set.
+.It Fl R
 Start editing in read-only mode, as if the command name was
-.IR view ,
+.Nm view ,
 or the
-.B readonly
+.Cm readonly
 option was set.
-.TP
-.B \-r
+.It Fl r
 Recover the specified files, or, if no files are specified,
 list the files that could be recovered.
 If no recoverable files by the specified name exist,
 the file is edited as if the
-.B \-r
+.Fl r
 option had not been specified.
-.TP
-.B \-S
+.It Fl S
 Run with the
-.B secure
+.Cm secure
 edit option set, disallowing all access to external programs.
-.TP
-.B \-s
+.It Fl s
 Enter batch mode; applicable only to
-.I \&ex
+.Nm ex
 edit sessions.
 Batch mode is useful when running
-.I \&ex
+.Nm ex
 scripts.
-Prompts, informative messages and other user oriented message
-are turned off,
+Prompts, informative messages and other user oriented messages are turned off,
 and no startup files or environment variables are read.
-This is the POSIX 1003.2 interface for the historic ``\-'' argument.
-.I \&Nex/nvi
+This is the POSIX 1003.2 interface for the historic
+.Dq -
+argument.
+.Nm nex Ns / Ns Nm nvi
 supports both the old and new syntax.
-.TP
-.B \-t
-Start editing at the specified tag.
-(See
-.IR ctags (1)).
-.TP
-.B \-w
-Set the initial window size to the specified number of lines.
-.TP
-.B \-v
+.It Fl t Ar tag
+Start editing at the specified
+.Ar tag
+.Pq see Xr ctags 1 .
+.It Fl v
 Start editing in vi mode, as if the command name was
-.I \&vi
-or
-.IR view .
-.PP
+.Nm vi .
+.It Fl w Ar size
+Set the initial window size to the specified number of lines.
+.El
+.Pp
 Command input for
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 is read from the standard input.
 In the
-.I \&vi
+.Nm vi
 interface, it is an error if standard input is not a terminal.
 In the
-.I \&ex
+.Nm ex
 interface, if standard input is not a terminal,
-.I \&ex
-will read commands from it regardless, however, the session will be a
+.Nm ex
+will read commands from it regardless; however, the session will be a
 batch mode session, exactly as if the
-.B \-s
+.Fl s
 option had been specified.
-.PP
-.I Ex/vi
-exits 0 on success, and greater than 0 if an error occurs.
-.SH FAST STARTUP
+.Sh FAST STARTUP
 This section will tell you the minimum amount that you need to
 do simple editing tasks using
-.IR \&vi .
-If you've never used any screen editor before, you're likely to have
-problems even with this simple introduction.
+.Nm vi .
+If you've never used any screen editor before,
+you're likely to have problems even with this simple introduction.
 In that case you should find someone that already knows
-.I \&vi
+.Nm vi
 and have them walk you through this section.
-.PP
-.I \&Vi
+.Pp
+.Nm vi
 is a screen editor.
-This means that it takes up almost the entire screen, displaying part
-of the file on each screen line, except for the last line of the screen.
+This means that it takes up almost the entire screen,
+displaying part of the file on each screen line,
+except for the last line of the screen.
 The last line of the screen is used for you to give commands to
-.IR \&vi ,
+.Nm vi ,
 and for
-.I \&vi
+.Nm vi
 to give information to you.
-.PP
+.Pp
 The other fact that you need to understand is that
-.I \&vi
-is a modeful editor, i.e. you are either entering text or you
-are executing commands, and you have to be in the right mode
-to do one or the other.
+.Nm vi
+is a modeful editor,
+i.e., you are either entering text or you are executing commands,
+and you have to be in the right mode to do one or the other.
 You will be in command mode when you first start editing a file.
 There are commands that switch you into input mode.
 There is only one key that takes you out of input mode,
-and that is the <escape> key.
-(Key names are written using less-than and greater-than signs, e.g.
-<escape> means the ``escape'' key, usually labeled ``esc'' on your
-terminal's keyboard.)
+and that is the
+.Aq escape
+key.
+.Pp
+Key names are written using less-than and greater-than signs, e.g.,
+.Aq escape
+means the
+.Dq escape
+key, usually labeled
+.Dq Esc
+on your terminal's keyboard.
 If you're ever confused as to which mode you're in,
-keep entering the <escape> key until
-.I \&vi
+keep entering the
+.Aq escape
+key until
+.Nm vi
 beeps at you.
-(Generally,
-.I \&vi
+Generally,
+.Nm vi
 will beep at you if you try and do something that's not allowed.
-It will also display error messages.)
-.PP
-To start editing a file, enter the command ``vi file_name<carriage-return>''.
-The command you should enter as soon as you start editing is
-``:set verbose showmode<carriage-return>''.
+It will also display error messages.
+.Pp
+To start editing a file, enter the following command:
+.Pp
+.Dl $ vi file
+.Pp
+The command you should enter as soon as you start editing is:
+.Pp
+.Dl :set verbose showmode
+.Pp
 This will make the editor give you verbose error messages and display
 the current mode at the bottom of the screen.
-.PP
+.Pp
 The commands to move around the file are:
-.TP
-.B h
+.Bl -tag -width Ds
+.It Cm h
 Move the cursor left one character.
-.TP
-.B j
+.It Cm j
 Move the cursor down one line.
-.TP
-.B k
+.It Cm k
 Move the cursor up one line.
-.TP
-.B l
+.It Cm l
 Move the cursor right one character.
-.TP
-.B <cursor-arrows>
+.It Aq Cm cursor-arrows
 The cursor arrow keys should work, too.
-.TP
-.B /text<carriage-return>
-Search for the string ``text'' in the file,
+.It Cm / Ns text
+Search for the string
+.Dq text
+in the file,
 and move the cursor to its first character.
-.PP
+.El
+.Pp
 The commands to enter new text are:
-.TP
-.B a
-Append new text,
-.I after
-the cursor.
-.TP
-.B i
-Insert new text,
-.I before
-the cursor.
-.TP
-.B o
-Open a new line below the line the cursor is on, and start
-entering text.
-.TP
-.B O
-Open a new line above the line the cursor is on, and start
-entering text.
-.TP
-.B <escape>
-Once you've entered input mode using the one of the
-.BR \&a ,
-.BR \&i ,
-.BR \&O
-or 
-.B \&o
+.Bl -tag -width "<escape>"
+.It Cm a
+Append new text, after the cursor.
+.It Cm i
+Insert new text, before the cursor.
+.It Cm o
+Open a new line below the line the cursor is on, and start entering text.
+.It Cm O
+Open a new line above the line the cursor is on, and start entering text.
+.It Aq Cm escape
+Once you've entered input mode using one of the
+.Cm a ,
+.Cm i ,
+.Cm o
+or
+.Cm O
 commands, use
-.B <escape>
+.Aq Cm escape
 to quit entering text and return to command mode.
-.PP
+.El
+.Pp
 The commands to copy text are:
-.TP
-.B yy
+.Bl -tag -width Ds
+.It Cm yy
 Copy the line the cursor is on.
-.TP
-.B p
+.It Cm p
 Append the copied line after the line the cursor is on.
-.PP
+.El
+.Pp
 The commands to delete text are:
-.TP
-.B dd
+.Bl -tag -width Ds
+.It Cm dd
 Delete the line the cursor is on.
-.TP
-.B x
+.It Cm x
 Delete the character the cursor is on.
-.PP
+.El
+.Pp
 The commands to write the file are:
-.TP
-.B :w<carriage-return>
+.Bl -tag -width Ds
+.It Cm :w
 Write the file back to the file with the name that you originally used
 as an argument on the
-.I \&vi
+.Nm vi
 command line.
-.TP
-.B ":w file_name<carriage-return>"
-Write the file back to the file with the name ``file_name''.
-.PP
+.It Cm :w Ar file_name
+Write the file back to the file with the name
+.Ar file_name .
+.El
+.Pp
 The commands to quit editing and exit the editor are:
-.TP
-.B :q<carriage-return>
-Quit editing and leave vi (if you've modified the file, but not
-saved your changes,
-.I \&vi
+.Bl -tag -width Ds
+.It Cm :q
+Quit editing and leave
+.Nm vi
+(if you've modified the file, but not saved your changes,
+.Nm vi
 will refuse to quit).
-.TP
-.B :q!<carriage-return>
+.It Cm :q!
 Quit, discarding any modifications that you may have made.
-.PP
-One final caution.
+.El
+.Pp
+One final caution:
 Unusual characters can take up more than one column on the screen,
 and long lines can take up more than a single screen line.
-The above commands work on ``physical'' characters and lines,
-i.e. they affect the entire line no matter how many screen lines it
-takes up and the entire character no matter how many screen columns
-it takes up.
-.SH VI COMMANDS
+The above commands work on
+.Dq physical
+characters and lines,
+i.e., they affect the entire line no matter how many screen lines it takes up
+and the entire character no matter how many screen columns it takes up.
+.Sh REGULAR EXPRESSIONS
+.Nm ex Ns / Ns Nm vi
+supports regular expressions
+.Pq REs ,
+as documented in
+.Xr re_format 7 ,
+for line addresses, as the first part of the
+.Nm ex Cm substitute ,
+.Cm global
+and
+.Cm v
+commands, and in search patterns.
+Basic regular expressions
+.Pq BREs
+are enabled by default;
+extended regular expressions
+.Pq EREs
+are used if the
+.Cm extended
+option is enabled.
+The use of regular expressions can be largely disabled using the
+.Cm magic
+option.
+.Pp
+The following strings have special meanings in the
+.Nm ex Ns / Ns Nm vi
+version of regular expressions:
+.Bl -bullet -offset 6u
+.It
+An empty regular expression is equivalent to the last regular expression used.
+.It
+.Sq \e\(la
+matches the beginning of the word.
+.It
+.Sq \e\(ra
+matches the end of the word.
+.It
+.Sq \(a~
+matches the replacement part of the last
+.Cm substitute
+command.
+.El
+.Sh BUFFERS
+A buffer is an area where commands can save changed or deleted text
+for later use.
+.Nm vi
+buffers are named with a single character preceded by a double quote,
+for example
+.Pf \&" Ns Aq c ;
+.Nm ex
+buffers are the same,
+but without the double quote.
+.Nm nex Ns / Ns Nm nvi
+permits the use of any character without another meaning in the position where
+a buffer name is expected.
+.Pp
+All buffers are either in
+.Em line mode
+or
+.Em character mode .
+Inserting a buffer in line mode into the text creates new lines for each of the
+lines it contains, while a buffer in character mode creates new lines for any
+lines
+.Em other
+than the first and last lines it contains.
+The first and last lines are inserted at the current cursor position, becoming
+part of the current line.
+If there is more than one line in the buffer,
+the current line itself will be split.
+All
+.Nm ex
+commands which store text into buffers do so in line mode.
+The behaviour of
+.Nm vi
+commands depend on their associated motion command:
+.Bl -bullet -offset 6u
+.It
+.Aq Cm control-A ,
+.Cm h ,
+.Cm l ,
+.Cm ,\& ,
+.Cm 0 ,
+.Cm B ,
+.Cm E ,
+.Cm F ,
+.Cm T ,
+.Cm W ,
+.Cm ^ ,
+.Cm b ,
+.Cm e ,
+.Cm f
+and
+.Cm t
+make the destination buffer character-oriented.
+.It
+.Cm j ,
+.Aq Cm control-M ,
+.Cm k ,
+.Cm ' ,
+.Cm - ,
+.Cm G ,
+.Cm H ,
+.Cm L ,
+.Cm M ,
+.Cm _
+and
+.Cm |\&
+make the destination buffer line-oriented.
+.It
+.Cm $ ,
+.Cm % ,
+.Cm ` ,
+.Cm (\& ,
+.Cm )\& ,
+.Cm / ,
+.Cm ?\& ,
+.Cm [[ ,
+.Cm ]] ,
+.Cm {
+and
+.Cm }
+make the destination buffer character-oriented, unless the starting and
+end positions are the first and last characters on a line.
+In that case, the buffer is line-oriented.
+.El
+.Pp
+The
+.Nm ex
+command
+.Cm display buffers
+displays the current mode for each buffer.
+.Pp
+Buffers named
+.Sq a
+through
+.Sq z
+may be referred to using their uppercase equivalent, in which case new content
+will be appended to the buffer, instead of replacing it.
+.Pp
+Buffers named
+.Sq 1
+through
+.Sq 9
+are special.
+A region of text modified using the
+.Cm c
+.Pq change
+or
+.Cm d
+.Pq delete
+commands is placed into the numeric buffer
+.Sq 1
+if no other buffer is specified and if it meets one of the following conditions:
+.Bl -bullet -offset 6u
+.It
+It includes characters from more than one line.
+.It
+It is specified using a line-oriented motion.
+.It
+It is specified using one of the following motion commands:
+.Aq Cm control-A ,
+.Cm ` Ns Aq Cm character ,
+.Cm n ,
+.Cm N ,
+.Cm % ,
+.Cm / ,
+.Cm { ,
+.Cm } ,
+.Cm \&( ,
+.Cm \&) ,
+and
+.Cm \&? .
+.El
+.Pp
+Before this copy is done, the previous contents of buffer
+.Sq 1
+are moved into buffer
+.Sq 2 ,
+.Sq 2
+into buffer
+.Sq 3 ,
+and so on.
+The contents of buffer
+.Sq 9
+are discarded.
+Note that this rotation occurs
+.Em regardless
+of the user specifying another buffer.
+In
+.Nm vi ,
+text may be explicitly stored into the numeric buffers.
+In this case, the buffer rotation occurs before the replacement of the buffer's
+contents.
+The numeric buffers are only available in
+.Nm vi
+mode.
+.Sh VI COMMANDS
 The following section describes the commands available in the command
 mode of the
-.I \&vi
+.Nm vi
 editor.
-In each entry below, the tag line is a usage synopsis for the command
-character.
-.PP
-.TP
-.B "[count] <control-A>"
+The following words have a special meaning in the commands description:
+.Pp
+.Bl -tag -width bigword -compact -offset 3u
+.It Ar bigword
+A set of non-whitespace characters.
+.It Ar buffer
+Temporary area where commands may place text.
+If not specified, the default buffer is used.
+See also
+.Sx BUFFERS ,
+above.
+.It Ar count
+A positive number used to specify the desired number of iterations
+of a command.
+It defaults to 1 if not specified.
+.It Ar motion
+A cursor movement command which indicates the other end of the affected region
+of text, the first being the current cursor position.
+Repeating the command character makes it affect the whole current line.
+.It Ar word
+A sequence of letters, digits or underscores.
+.El
+.Pp
+.Ar buffer
+and
+.Ar count ,
+if both present, may be specified in any order.
+.Ar motion
+and
+.Ar count ,
+if both present, are effectively multiplied together
+and considered part of the motion.
+.Pp
+.Bl -tag -width Ds -compact
+.It Xo
+.Aq Cm control-A
+.Xc
 Search forward
-.I count
-times for the current word.
-.TP
-.B "[count] <control-B>"
+for the word starting at the cursor position.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-B
+.Xc
 Page backwards
-.I count
+.Ar count
 screens.
-.TP
-.B "[count] <control-D>"
+Two lines of overlap are maintained, if possible.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-D
+.Xc
 Scroll forward
-.I count
+.Ar count
 lines.
-.TP
-.B "[count] <control-E>"
+If
+.Ar count
+is not given, scroll forward the number of lines specified by the last
+.Aq Cm control-D
+or
+.Aq Cm control-U
+command.
+If this is the first
+.Aq Cm control-D
+command, scroll half the number of lines in the current screen.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-E
+.Xc
 Scroll forward
-.I count
+.Ar count
 lines, leaving the current line and column as is, if possible.
-.TP
-.B "[count] <control-F>"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-F
+.Xc
 Page forward
-.I count
+.Ar count
 screens.
-.TP
-.B "<control-G>"
-Display the file information.
-.TP
-.B "<control-H>"
-.TP
-.B "[count] h"
+Two lines of overlap are maintained, if possible.
+.Pp
+.It Aq Cm control-G
+Display the following file information:
+the file name
+.Pq as given to Nm vi ;
+whether the file has been modified since it was last written;
+if the file is read-only;
+the current line number;
+the total number of lines in the file;
+and the current line number as a percentage of the total lines in the file.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-H
+.Xc
+.It Xo
+.Op Ar count
+.Cm h
+.Xc
 Move the cursor back
-.I count
+.Ar count
 characters in the current line.
-.TP
-.B "[count] <control-J>"
-.TP
-.B "[count] <control-N>"
-.TP
-.B "[count] j"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-J
+.Xc
+.It Xo
+.Op Ar count
+.Aq Cm control-N
+.Xc
+.It Xo
+.Op Ar count
+.Cm j
+.Xc
 Move the cursor down
-.I count
+.Ar count
 lines without changing the current column.
-.TP
-.B "<control-L>"
-.TP
-.B "<control-R>"
+.Pp
+.It Aq Cm control-L
+.It Aq Cm control-R
 Repaint the screen.
-.TP
-.B "[count] <control-M>"
-.TP
-.B "[count] +"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-M
+.Xc
+.It Xo
+.Op Ar count
+.Cm +
+.Xc
 Move the cursor down
-.I count
-lines to the first nonblank character of that line.
-.TP
-.B "[count] <control-P>"
-.TP
-.B "[count] k"
+.Ar count
+lines to the first non-blank character of that line.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-P
+.Xc
+.It Xo
+.Op Ar count
+.Cm k
+.Xc
 Move the cursor up
-.I count
+.Ar count
 lines, without changing the current column.
-.TP
-.B "<control-T>"
+.Pp
+.It Aq Cm control-T
 Return to the most recent tag context.
-.TP
-.B "<control-U>"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-U
+.Xc
 Scroll backwards
-.I count
+.Ar count
 lines.
-.TP
-.B "<control-W>"
-Switch to the next lower screen in the window, or, to the first
-screen if there are no lower screens in the window.
-.TP
-.B "<control-Y>"
+If
+.Ar count
+is not given, scroll backwards the number of lines specified by the last
+.Aq Cm control-D
+or
+.Aq Cm control-U
+command.
+If this is the first
+.Aq Cm control-U
+command, scroll half the number of lines in the current screen.
+.Pp
+.It Aq Cm control-W
+Switch to the next lower screen in the window,
+or to the first screen if there are no lower screens in the window.
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm control-Y
+.Xc
 Scroll backwards
-.I count
+.Ar count
 lines, leaving the current line and column as is, if possible.
-.TP
-.B "<control-Z>"
+.Pp
+.It Aq Cm control-Z
 Suspend the current editor session.
-.TP
-.B "<escape>"
-Execute
-.I \&ex
-commands or cancel partial commands.
-.TP
-.B "<control-]>"
+.Pp
+.It Aq Cm escape
+Execute the
+.Nm ex
+command being entered, or cancel it if it is only partial.
+.Pp
+.It Aq Cm control-]
 Push a tag reference onto the tag stack.
-.TP
-.B "<control-^>"
+.Pp
+.It Aq Cm control-^
 Switch to the most recently edited file.
-.TP
-.B "[count] <space>"
-.TP
-.B "[count] l"
+.Pp
+.It Xo
+.Op Ar count
+.Aq Cm space
+.Xc
+.It Xo
+.Op Ar count
+.Cm l
+.Xc
 Move the cursor forward
-.I count
+.Ar count
 characters without changing the current line.
-.TP
-.B "[count] ! motion shell-argument(s)"
-Replace text with results from a shell command.
-.TP
-.B "[count] # #|+|-"
-Increment or decrement the cursor number.
-.TP
-.B "[count] $"
+.Pp
+.It Xo
+.Op Ar count
+.Cm !\&
+.Ar motion shell-argument(s)
+.Aq Li carriage-return
+.Xc
+Replace the lines spanned by
+.Ar count
+and
+.Ar motion
+with the output
+.Pq standard output and standard error
+of the program named by the
+.Cm shell
+option, called with a
+.Fl c
+flag followed by the
+.Ar shell-argument(s)
+.Pq bundled into a single argument .
+Within
+.Ar shell-argument(s) ,
+the
+.Sq % ,
+.Sq #
+and
+.Sq !\&
+characters are expanded to the current file name,
+the previous current file name,
+and the command text of the previous
+.Cm !\&
+or
+.Cm :!
+commands, respectively.
+The special meaning of
+.Sq % ,
+.Sq #
+and
+.Sq !\&
+can be overridden by escaping them with a backslash.
+.Pp
+.It Xo
+.Op Ar count
+.Cm #
+.Sm off
+.Cm # | + | -
+.Sm on
+.Xc
+Increment
+.Pq trailing So # Sc or So + Sc
+or decrement
+.Pq trailing Sq -
+the number under the cursor by
+.Ar count ,
+starting at the cursor position or at the first non-blank
+character following it.
+Numbers with a leading
+.Sq 0x
+or
+.Sq 0X
+are interpreted as hexadecimal numbers.
+Numbers with a leading
+.Sq 0
+are interpreted as octal numbers unless they contain a non-octal digit.
+Other numbers may be prefixed with a
+.Sq +
+or
+.Sq -
+sign.
+.Pp
+.It Xo
+.Op Ar count
+.Cm $
+.Xc
 Move the cursor to the end of a line.
-.TP
-.B "%"
-Move to the matching character.
-.TP
-.B "&"
+If
+.Ar count
+is specified, additionally move the cursor down
+.Ar count
+\- 1 lines.
+.Pp
+.It Cm %
+Move to the
+.Cm matchchars
+character matching
+the one found at the cursor position or the closest to the right of it.
+.Pp
+.It Cm &
 Repeat the previous substitution command on the current line.
-.TP
-.B "'<character>"
-.TP
-.B "`<character>"
-Return to a context marked by the character
-.IR <character> .
-.TP
-.B "[count] ("
-Back up
-.I count
-sentences.
-.TP
-.B "[count] )"
-Move forward
-.I count
-sentences.
-.TP
-.B "[count] ,"
+.Pp
+.It Xo
+.Cm ' Ns Aq Ar character
+.Xc
+.It Xo
+.Cm ` Ns Aq Ar character
+.Xc
+Return to the cursor position marked by the character
+.Ar character ,
+or, if
+.Ar character
+is
+.Sq '
+or
+.Sq ` ,
+to the position of the cursor before the last of the following commands:
+.Aq Cm control-A ,
+.Aq Cm control-T ,
+.Aq Cm control-] ,
+.Cm % ,
+.Cm ' ,
+.Cm ` ,
+.Cm (\& ,
+.Cm )\& ,
+.Cm / ,
+.Cm ?\& ,
+.Cm G ,
+.Cm H ,
+.Cm L ,
+.Cm [[ ,
+.Cm ]] ,
+.Cm { ,
+.Cm } .
+The first form returns to the first non-blank character of the line marked by
+.Ar character .
+The second form returns to the line and column marked by
+.Ar character .
+.Pp
+.It Xo
+.Op Ar count
+.Cm \&(
+.Xc
+.It Xo
+.Op Ar count
+.Cm \&)
+.Xc
+Move
+.Ar count
+sentences backward or forward, respectively.
+A sentence is an area of text that begins with the first nonblank character
+following the previous sentence, paragraph, or section
+boundary and continues until the next period, exclamation point,
+or question mark character, followed by any number of closing parentheses,
+brackets, double or single quote characters, followed by
+either an end-of-line or two whitespace characters.
+Groups of empty lines
+.Pq or lines containing only whitespace characters
+are treated as a single sentence.
+.Pp
+.It Xo
+.Op Ar count
+.Cm ,\&
+.Xc
 Reverse find character
-.I count
+.Pq i.e., the last Cm F , f , T No or Cm t No command
+.Ar count
 times.
-.TP
-.B "[count] -"
-Move to first nonblank of the previous line,
-.I count
+.Pp
+.It Xo
+.Op Ar count
+.Cm -
+.Xc
+Move to the first non-blank character of the previous line,
+.Ar count
 times.
-.TP
-.B "[count] ."
+.Pp
+.It Xo
+.Op Ar count
+.Cm .\&
+.Xc
 Repeat the last
-.I \&vi
+.Nm vi
 command that modified text.
-.TP
-.B "/RE<carriage-return>"
-.TP
-.B "/RE/ [offset]<carriage-return>"
-.TP
-.B "?RE<carriage-return>"
-.TP
-.B "?RE? [offset]<carriage-return>"
-.TP
-.B "N"
-.TP
-.B "n"
-Search forward or backward for a regular expression.
-.TP
-.B "0"
+.Ar count
+replaces both the
+.Ar count
+argument of the repeated command and that of the associated
+.Ar motion .
+If the
+.Cm .\&
+command repeats the
+.Cm u
+command, the change log is rolled forward or backward, depending on the action
+of the
+.Cm u
+command.
+.Pp
+.It Xo
+.Pf / Ns Ar RE
+.Aq Li carriage-return
+.Xc
+.It Xo
+.Pf / Ns Ar RE Ns /
+.Op Ar offset
+.Op Cm z
+.Aq Li carriage-return
+.Xc
+.It Xo
+.Pf ?\& Ns Ar RE
+.Aq Li carriage-return
+.Xc
+.It Xo
+.Pf ?\& Ns Ar RE Ns ?\&
+.Op Ar offset
+.Op Cm z
+.Aq Li carriage-return
+.Xc
+.It Cm N
+.It Cm n
+Search forward
+.Pq Sq /
+or backward
+.Pq Sq ?\&
+for a regular expression.
+.Cm n
+and
+.Cm N
+repeat the last search in the same or opposite directions, respectively.
+If
+.Ar RE
+is empty, the last search regular expression is used.
+If
+.Ar offset
+is specified, the cursor is placed
+.Ar offset
+lines before or after the matched regular expression.
+If either
+.Cm n
+or
+.Cm N
+commands are used as motion components for the
+.Cm !\&
+command, there will be no prompt for the text of the command and the previous
+.Cm !\&
+will be executed.
+Multiple search patterns may be grouped together by delimiting them with
+semicolons and zero or more whitespace characters.
+These patterns are evaluated from left to right with the final cursor position
+determined by the last search pattern.
+A
+.Cm z
+command may be appended to the closed search expressions to reposition the
+result line.
+.Pp
+.It Cm 0
 Move to the first character in the current line.
-.TP
-.B ":"
-Execute an ex command.
-.TP
-.B "[count] ;"
+.Pp
+.It Cm :\&
+Execute an
+.Nm ex
+command.
+.Pp
+.It Xo
+.Op Ar count
+.Cm ;\&
+.Xc
 Repeat the last character find
-.I count
+.Pq i.e., the last .Cm F , f , T No or Cm t No command
+.Ar count
 times.
-.TP
-.B "[count] < motion"
-.TP
-.B "[count] > motion"
-Shift lines left or right.
-.TP
-.B "@ buffer"
-Execute a named buffer.
-.TP
-.B "[count] A"
+.Pp
+.It Xo
+.Op Ar count
+.Cm <
+.Ar motion
+.Xc
+.It Xo
+.Op Ar count
+.Cm >
+.Ar motion
+.Xc
+Shift
+.Ar count
+lines left or right, respectively, by an amount of
+.Cm shiftwidth .
+.Pp
+.It Cm @ Ar buffer
+Execute a named
+.Ar buffer
+as
+.Nm vi
+commands.
+The buffer may include
+.Nm ex
+commands too, but they must be expressed as a
+.Cm \&:
+command.
+If
+.Ar buffer
+is
+.Sq @
+or
+.Sq * ,
+then the last buffer executed shall be used.
+.Pp
+.It Xo
+.Op Ar count
+.Cm A
+.Xc
 Enter input mode, appending the text after the end of the line.
-.TP
-.B "[count] B"
+If a
+.Ar count
+argument is given, the characters input are repeated
+.Ar count
+\- 1 times after input mode is exited.
+.Pp
+.It Xo
+.Op Ar count
+.Cm B
+.Xc
 Move backwards
-.I count
+.Ar count
 bigwords.
-.TP
-.B "[buffer] [count] C"
+.Pp
+.It Xo
+.Op Ar buffer
+.Cm C
+.Xc
 Change text from the current position to the end-of-line.
-.TP
-.B "[buffer] D"
+If
+.Ar buffer
+is specified,
+.Dq yank
+the deleted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar buffer
+.Cm D
+.Xc
 Delete text from the current position to the end-of-line.
-.TP
-.B "[count] E"
+If
+.Ar buffer
+is specified,
+.Dq yank
+the deleted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar count
+.Cm E
+.Xc
 Move forward
-.I count
+.Ar count
 end-of-bigwords.
-.TP
-.B "[count] F <character>"
+.Pp
+.It Xo
+.Op Ar count
+.Cm F Aq Ar character
+.Xc
 Search
-.I count
+.Ar count
 times backward through the current line for
-.IR <character> .
-.TP
-.B "[count] G"
+.Aq Ar character .
+.Pp
+.It Xo
+.Op Ar count
+.Cm G
+.Xc
 Move to line
-.IR count ,
+.Ar count ,
 or the last line of the file if
-.I count
-not specified.
-.TP
-.B "[count] H"
+.Ar count
+is not specified.
+.Pp
+.It Xo
+.Op Ar count
+.Cm H
+.Xc
 Move to the screen line
-.I "count - 1"
-lines below the top of the screen.
-.TP
-.B "[count] I"
+.Ar count
+\- 1 lines below the top of the screen.
+.Pp
+.It Xo
+.Op Ar count
+.Cm I
+.Xc
 Enter input mode, inserting the text at the beginning of the line.
-.TP
-.B "[count] J"
-Join lines.
-.TP
-.B "[count] L"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+\- 1 more times.
+.Pp
+.It Xo
+.Op Ar count
+.Cm J
+.Xc
+Join
+.Ar count
+lines with the current line.
+The spacing between two joined lines is set to two whitespace characters if the
+former ends with a question mark, a period or an exclamation point.
+It is set to one whitespace character otherwise.
+.Pp
+.It Xo
+.Op Ar count
+.Cm L
+.Xc
 Move to the screen line
-.I "count - 1"
-lines above the bottom of the screen.
-.TP
-.B " M"
+.Ar count
+\- 1 lines above the bottom of the screen.
+.Pp
+.It Cm M
 Move to the screen line in the middle of the screen.
-.TP
-.B "[count] O"
+.Pp
+.It Xo
+.Op Ar count
+.Cm O
+.Xc
 Enter input mode, appending text in a new line above the current line.
-.TP
-.B "[buffer] P"
-Insert text from a buffer.
-.TP
-.B "Q"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+\- 1 more times.
+.Pp
+.It Xo
+.Op Ar buffer
+.Cm P
+.Xc
+Insert text from
+.Ar buffer
+before the current column if
+.Ar buffer
+is character-oriented or before the current line if it is line-oriented.
+.Pp
+.It Cm Q
 Exit
-.I \&vi
-(or visual) mode and switch to
-.I \&ex
+.Nm vi
+.Pq or visual
+mode and switch to
+.Nm ex
 mode.
-.TP
-.B "[count] R"
+.Pp
+.It Xo
+.Op Ar count
+.Cm R
+.Xc
 Enter input mode, replacing the characters in the current line.
-.TP
-.B "[buffer] [count] S"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+\- 1 more times upon exit from insert mode.
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm S
+.Xc
 Substitute
-.I count
+.Ar count
 lines.
-.TP
-.B "[count] T <character>"
+If
+.Ar buffer
+is specified,
+.Dq yank
+the deleted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar count
+.Cm T
+.Aq Ar character
+.Xc
 Search backwards,
-.I count
-times,
-through the current line for the character
-.I after
-the specified
-.IR <character> .
-.TP
-.B "U"
-Restore the current line to its state before the cursor last
-moved to it.
-.TP
-.B "[count] W"
+.Ar count
+times, through the current line for the character after the specified
+.Aq Ar character .
+.Pp
+.It Cm U
+Restore the current line to its state before the cursor last moved to it.
+.Pp
+.It Xo
+.Op Ar count
+.Cm W
+.Xc
 Move forward
-.I count
+.Ar count
 bigwords.
-.TP
-.B "[buffer] [count] X"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm X
+.Xc
 Delete
-.I count
-characters before the cursor.
-.TP
-.B "[buffer] [count] Y"
-Copy (or ``yank'')
-.I count
-lines into the specified buffer.
-.TP
-.B "ZZ"
+.Ar count
+characters before the cursor, on the current line.
+If
+.Ar buffer
+is specified,
+.Dq yank
+the deleted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm Y
+.Xc
+Copy
+.Pq or Dq yank
+.Ar count
+lines into
+.Ar buffer .
+.Pp
+.It Cm ZZ
 Write the file and exit
-.IR \&vi .
-.TP
-.B "[count] [["
+.Nm vi
+if there are no more files to edit.
+Entering two
+.Dq quit
+commands in a row ignores any remaining file to edit.
+.Pp
+.It Xo
+.Op Ar count
+.Cm [[
+.Xc
 Back up
-.I count
+.Ar count
 section boundaries.
-.TP
-.B "[count] ]]"
+.Pp
+.It Xo
+.Op Ar count
+.Cm ]]
+.Xc
 Move forward
-.I count
+.Ar count
 section boundaries.
-.TP
-.B "\&^"
-Move to first nonblank character on the current line.
-.TP
-.B "[count] _"
+.Pp
+.It Cm ^
+Move to the first non-blank character on the current line.
+.Pp
+.It Xo
+.Op Ar count
+.Cm _
+.Xc
 Move down
-.I "count - 1"
-lines, to the first nonblank character.
-.TP
-.B "[count] a"
+.Ar count
+\- 1 lines, to the first non-blank character.
+.Pp
+.It Xo
+.Op Ar count
+.Cm a
+.Xc
 Enter input mode, appending the text after the cursor.
-.TP
-.B "[count] b"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+number of times.
+.Pp
+.It Xo
+.Op Ar count
+.Cm b
+.Xc
 Move backwards
-.I count
+.Ar count
 words.
-.TP
-.B "[buffer] [count] c motion"
-Change a region of text.
-.TP
-.B "[buffer] [count] d motion"
-Delete a region of text.
-.TP
-.B "[count] e"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm c
+.Ar motion
+.Xc
+Change the region of text described by
+.Ar count
+and
+.Ar motion .
+If
+.Ar buffer
+is specified,
+.Dq yank
+the changed text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm d
+.Ar motion
+.Xc
+Delete the region of text described by
+.Ar count
+and
+.Ar motion .
+If
+.Ar buffer
+is specified,
+.Dq yank
+the deleted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar count
+.Cm e
+.Xc
 Move forward
-.I count
+.Ar count
 end-of-words.
-.TP
-.B "[count] f<character>"
+.Pp
+.It Xo
+.Op Ar count
+.Cm f Aq Ar character
+.Xc
 Search forward,
-.I count
+.Ar count
 times, through the rest of the current line for
-.IR <character> .
-.TP
-.B "[count] i"
+.Aq Ar character .
+.Pp
+.It Xo
+.Op Ar count
+.Cm i
+.Xc
 Enter input mode, inserting the text before the cursor.
-.TP
-.B "m <character>"
-Save the current context (line and column) as
-.IR <character> .
-.TP
-.B "[count] o"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+number of times.
+.Pp
+.It Xo
+.Cm m
+.Aq Ar character
+.Xc
+Save the current context
+.Pq line and column
+as
+.Aq Ar character .
+.Pp
+.It Xo
+.Op Ar count
+.Cm o
+.Xc
 Enter input mode, appending text in a new line under the current line.
-.TP
-.B "[buffer] p"
-Append text from a buffer.
-.TP
-.B "[count] r <character>"
+If a
+.Ar count
+argument is given,
+the characters input are repeated
+.Ar count
+\- 1 more times.
+.Pp
+.It Xo
+.Op Ar buffer
+.Cm p
+.Xc
+Append text from
+.Ar buffer .
+Text is appended after the current column if
+.Ar buffer
+is character oriented, or after the current line otherwise.
+.Pp
+.It Xo
+.Op Ar count
+.Cm r
+.Aq Ar character
+.Xc
 Replace
-.I count
-characters.
-.TP
-.B "[buffer] [count] s"
+.Ar count
+characters with
+.Ar character .
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm s
+.Xc
 Substitute
-.I count
+.Ar count
 characters in the current line starting with the current character.
-.TP
-.B "[count] t <character>"
+If
+.Ar buffer
+is specified,
+.Dq yank
+the substituted text into
+.Ar buffer .
+.Pp
+.It Xo
+.Op Ar count
+.Cm t
+.Aq Ar character
+.Xc
 Search forward,
-.I count
-times, through the current line for the character immediately
-.I before
-.IR <character> .
-.TP
-.B "u"
+.Ar count
+times, through the current line for the character immediately before
+.Aq Ar character .
+.Pp
+.It Cm u
 Undo the last change made to the file.
-.TP
-.B "[count] w"
+If repeated, the
+.Cm u
+command alternates between these two states.
+The
+.Cm .\&
+command, when used immediately after
+.Cm u ,
+causes the change log to be rolled forward or backward, depending on the action
+of the
+.Cm u
+command.
+.Pp
+.It Xo
+.Op Ar count
+.Cm w
+.Xc
 Move forward
-.I count
+.Ar count
 words.
-.TP
-.B "[buffer] [count] x"
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm x
+.Xc
 Delete
-.I count
-characters.
-.TP
-.B "[buffer] [count] y motion"
-Copy (or ``yank'')
-a text region specified by the
-.I count
-and motion into a buffer.
-.TP
-.B "[count1] z [count2] -|.|+|^|<carriage-return>"
+.Ar count
+characters at the current cursor position, but no more than there are till the
+end of the line.
+.Pp
+.It Xo
+.Op Ar buffer
+.Op Ar count
+.Cm y
+.Ar motion
+.Xc
+Copy
+.Pq or Dq yank
+a text region specified by
+.Ar count
+and
+.Ar motion
+into a buffer.
+.Pp
+.It Xo
+.Op Ar count1
+.Cm z
+.Op Ar count2
+.Cm type
+.Xc
 Redraw, optionally repositioning and resizing the screen.
-.TP
-.B "[count] {"
+If
+.Ar count2
+is specified, limit the screen size to
+.Ar count2
+lines.
+The following
+.Cm type
+characters may be used:
+.Bl -tag -width Ds
+.It Cm +
+If
+.Ar count1
+is specified, place the line
+.Ar count1
+at the top of the screen.
+Otherwise, display the screen after the current screen.
+.It Aq Cm carriage-return
+Place the line
+.Ar count1
+at the top of the screen.
+.It Cm .\&
+Place the line
+.Ar count1
+in the center of the screen.
+.It Cm -
+Place the line
+.Ar count1
+at the bottom of the screen.
+.It Cm ^
+If
+.Ar count1
+is given,
+display the screen before the screen before
+.Ar count1
+.Pq i.e., 2 screens before .
+Otherwise, display the screen before the current screen.
+.El
+.Pp
+.It Xo
+.Op Ar count
+.Cm {\&
+.Xc
 Move backward
-.I count
+.Ar count
 paragraphs.
-.TP
-.B "[count] |"
+.Pp
+.It Xo
+.Op Ar column
+.Cm |\&
+.Xc
 Move to a specific
-.I column
+.Ar column
 position on the current line.
-.TP
-.B "[count] }"
+If
+.Ar column
+is omitted,
+move to the start of the current line.
+.Pp
+.It Xo
+.Op Ar count
+.Cm }\&
+.Xc
 Move forward
-.I count
+.Ar count
 paragraphs.
-.TP
-.B "[count] ~"
-Reverse the case of the next
-.I count
-character(s).
-.TP
-.B "[count] ~ motion"
-Reverse the case of the characters in a text region specified by the
-.I count
+.Pp
+.It Xo
+.Op Ar count
+.Cm ~
+.Ar motion
+.Xc
+If the
+.Cm tildeop
+option is not set, reverse the case of the next
+.Ar count
+character(s) and no
+.Ar motion
+can be specified.
+Otherwise
+.Ar motion
+is mandatory and
+.Cm ~
+reverses the case of the characters in a text region specified by the
+.Ar count
 and
-.IR motion .
-.TP
-.B "<interrupt>"
+.Ar motion .
+.Pp
+.It Aq Cm interrupt
 Interrupt the current operation.
-.SH VI TEXT INPUT COMMANDS
-The following section describes the commands available in the text
-input mode of the
-.I \&vi
+The
+.Aq interrupt
+character is usually
+.Aq control-C .
+.El
+.Sh VI TEXT INPUT COMMANDS
+The following section describes the commands available in the text input mode
+of the
+.Nm vi
 editor.
-.PP
-.TP
-.B "<nul>"
+.Pp
+.Bl -tag -width Ds -compact
+.It Aq Cm nul
 Replay the previous input.
-.TP
-.B "<control-D>"
+.Pp
+.It Aq Cm control-D
 Erase to the previous
-.B shiftwidth
+.Ar shiftwidth
 column boundary.
-.TP
-.B "^<control-D>"
+.Pp
+.It Cm ^ Ns Aq Cm control-D
 Erase all of the autoindent characters, and reset the autoindent level.
-.TP
-.B "0<control-D>"
+.Pp
+.It Cm 0 Ns Aq Cm control-D
 Erase all of the autoindent characters.
-.TP
-.B "<control-T>"
+.Pp
+.It Aq Cm control-T
 Insert sufficient
-.I <tab>
+.Aq tab
 and
-.I <space>
+.Aq space
 characters to move forward to the next
-.B shiftwidth
+.Ar shiftwidth
 column boundary.
-.TP
-.B "<erase>
-.TP
-.B "<control-H>"
+.Pp
+.It Aq Cm erase
+.It Aq Cm control-H
 Erase the last character.
-.TP
-.B "<literal next>"
-Quote the next character.
-.TP
-.B "<escape>
+.Pp
+.It Aq Cm literal next
+Escape the next character from any special meaning.
+The
+.Aq literal\ \&next
+character is usually
+.Aq control-V .
+.Pp
+.It Aq Cm escape
 Resolve all text input into the file, and return to command mode.
-.TP
-.B "<line erase>"
+.Pp
+.It Aq Cm line erase
 Erase the current line.
-.TP
-.B "<control-W>"
-.TP
-.B "<word erase>"
+.Pp
+.It Aq Cm control-W
+.It Aq Cm word erase
 Erase the last word.
 The definition of word is dependent on the
-.B altwerase
+.Cm altwerase
 and
-.B ttywerase
+.Cm ttywerase
 options.
-.TP
-.B "<control-X>[0-9A-Fa-f]+"
+.Pp
+.Sm off
+.It Xo
+.Aq Cm control-X
+.Bq Cm 0-9A-Fa-f
+.Cm +
+.Xc
+.Sm on
 Insert a character with the specified hexadecimal value into the text.
-.TP
-.B "<interrupt>"
+.Pp
+.It Aq Cm interrupt
 Interrupt text input mode, returning to command mode.
-.SH EX COMMANDS
+The
+.Aq interrupt
+character is usually
+.Aq control-C .
+.El
+.Sh EX COMMANDS
 The following section describes the commands available in the
-.I \&ex
+.Nm ex
 editor.
 In each entry below, the tag line is a usage synopsis for the command.
-.PP
-.TP
-.B "<end-of-file>"
+.Pp
+.Bl -tag -width Ds -compact
+.It Aq Cm end-of-file
 Scroll the screen.
-.TP
-.B "! argument(s)"
-.TP
-.B "[range]! argument(s)"
+.Pp
+.It Cm !\& Ar argument(s)
+.It Xo
+.Op Ar range
+.Cm !\&
+.Ar argument(s)
+.Xc
 Execute a shell command, or filter lines through a shell command.
-.TP
-.B \&"
+.Pp
+.It Cm \&"
 A comment.
-.TP
-.B "[range] nu[mber] [count] [flags]"
-.TP
-.B "[range] # [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm nu Ns Op Cm mber
+.Op Ar count
+.Op Ar flags
+.Xc
+.It Xo
+.Op Ar range
+.Cm #
+.Op Ar count
+.Op Ar flags
+.Xc
 Display the selected lines, each preceded with its line number.
-.TP
-.B "@ buffer"
-.TP
-.B "* buffer"
+.Pp
+.It Cm @ Ar buffer
+.It Cm * Ar buffer
 Execute a buffer.
-.TP
-.B "[line] a[ppend][!]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm < Ns Op Cm < ...
+.Op Ar count
+.Op Ar flags
+.Xc
+Shift lines left.
+.Pp
+.It Xo
+.Op Ar line
+.Cm =
+.Op Ar flags
+.Xc
+Display the line number of
+.Ar line .
+If
+.Ar line
+is not specified, display the line number of the last line in the file.
+.Pp
+.It Xo
+.Op Ar range
+.Cm > Ns Op Cm > ...
+.Op Ar count
+.Op Ar flags
+.Xc
+Shift lines right.
+.Pp
+.It Xo
+.Cm ab Ns Op Cm breviate
+.Ar lhs rhs
+.Xc
+.Nm vi
+only.
+Add
+.Ar lhs
+as an abbreviation for
+.Ar rhs
+to the abbreviation list.
+.Pp
+.It Xo
+.Op Ar line
+.Cm a Ns Op Cm ppend Ns
+.Op Cm !\&
+.Xc
 The input text is appended after the specified line.
-.TP
-.B "[range] c[hange][!] [count]"
+.Pp
+.It Cm ar Ns Op Cm gs
+Display the argument list.
+.Pp
+.It Cm bg
+.Nm vi
+only.
+Background the current screen.
+.Pp
+.It Xo
+.Op Ar range
+.Cm c Ns Op Cm hange Ns
+.Op Cm !\&
+.Op Ar count
+.Xc
 The input text replaces the specified range.
-.TP
-.B "cs[cope] add | find | help | kill | reset"
+.Pp
+.It Xo
+.Cm chd Ns Op Cm ir Ns
+.Op Cm !\&
+.Op Ar directory
+.Xc
+.It Xo
+.Cm cd Ns Op Cm !\&
+.Op Ar directory
+.Xc
+Change the current working directory.
+.Pp
+.It Xo
+.Op Ar range
+.Cm co Ns Op Cm py
+.Ar line
+.Op Ar flags
+.Xc
+.It Xo
+.Op Ar range
+.Cm t
+.Ar line
+.Op Ar flags
+.Xc
+Copy the specified lines after the destination
+.Ar line .
+.Pp
+.It Xo
+.Cm cs Ns Op Cm cope
+.Cm add | find | help | kill | reset
+.Xc
 Execute a Cscope command.
-.TP
-.B "[range] d[elete] [buffer] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm d Ns Op Cm elete
+.Op Ar buffer
+.Op Ar count
+.Op Ar flags
+.Xc
 Delete the lines from the file.
-.TP
-.B "di[splay] b[uffers] | c[onnections] | s[creens] | t[ags]"
+.Pp
+.It Xo
+.Cm di Ns Op Cm splay
+.Cm b Ns Oo Cm uffers Oc |
+.Cm c Ns Oo Cm onnections Oc |
+.Cm s Ns Oo Cm creens Oc |
+.Cm t Ns Op Cm ags
+.Xc
 Display buffers, Cscope connections, screens or tags.
-.TP
-.B "[Ee][dit][!] [+cmd] [file]"
-.TP
-.B "[Ee]x[!] [+cmd] [file]"
+.Pp
+.It Xo
+.Op Cm Ee Ns
+.Op Cm dit Ns
+.Op Cm !\&
+.Op Ar +cmd
+.Op Ar file
+.Xc
+.It Xo
+.Op Cm Ee Ns
+.Cm x Ns Op Cm !\&
+.Op Ar +cmd
+.Op Ar file
+.Xc
 Edit a different file.
-.TP
-.B "exu[sage] [command]"
+.Pp
+.It Xo
+.Cm exu Ns Op Cm sage
+.Op Ar command
+.Xc
 Display usage for an
-.I \&ex
+.Nm ex
 command.
-.TP
-.B "f[ile] [file]"
+.Pp
+.It Xo
+.Cm f Ns Op Cm ile
+.Op Ar file
+.Xc
 Display and optionally change the file name.
-.TP
-.B "[Ff]g [name]"
-.I \&Vi
+.Pp
+.It Xo
+.Op Cm Ff Ns
+.Cm g
+.Op Ar name
+.Xc
+.Nm vi
 mode only.
 Foreground the specified screen.
-.TP
-.B "[range] g[lobal] /pattern/ [commands]"
-.TP
-.B "[range] v /pattern/ [commands]"
-Apply commands to lines matching (or not matching) a pattern.
-.TP
-.B "he[lp]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm g Ns Op Cm lobal
+.No / Ns Ar pattern Ns /
+.Op Ar commands
+.Xc
+.It Xo
+.Op Ar range
+.Cm v
+.No / Ns Ar pattern Ns /
+.Op Ar commands
+.Xc
+Apply commands to lines matching
+.Pq Sq global
+or not matching
+.Pq Sq v
+a pattern.
+.Pp
+.It Cm he Ns Op Cm lp
 Display a help message.
-.TP
-.B "[line] i[nsert][!]"
+.Pp
+.It Xo
+.Op Ar line
+.Cm i Ns Op Cm nsert Ns
+.Op Cm !\&
+.Xc
 The input text is inserted before the specified line.
-.TP
-.B "[range] j[oin][!] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm j Ns Op Cm oin Ns
+.Op Cm !\&
+.Op Ar count
+.Op Ar flags
+.Xc
 Join lines of text together.
-.TP
-.B "[range] l[ist] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm l Ns Op Cm ist
+.Op Ar count
+.Op Ar flags
+.Xc
 Display the lines unambiguously.
-.TP
-.B "map[!] [lhs rhs]"
-Define or display maps (for
-.I \&vi
-only).
-.TP
-.B "[line] ma[rk] <character>"
-.TP
-.B "[line] k <character>"
+.Pp
+.It Xo
+.Cm map Ns Op Cm !\&
+.Op Ar lhs rhs
+.Xc
+Define or display maps
+.Pq for Nm vi No only .
+.Pp
+.It Xo
+.Op Ar line
+.Cm ma Ns Op Cm rk
+.Aq Ar character
+.Xc
+.It Xo
+.Op Ar line
+.Cm k Aq Ar character
+.Xc
 Mark the line with the mark
-.IR <character> .
-.TP
-.B "[range] m[ove] line"
+.Aq Ar character .
+.Pp
+.It Xo
+.Op Ar range
+.Cm m Ns Op Cm ove
+.Ar line
+.Xc
 Move the specified lines after the target line.
-.TP
-.B "mk[exrc][!] file"
+.Pp
+.It Xo
+.Cm mk Ns Op Cm exrc Ns
+.Op Cm !\&
+.Ar file
+.Xc
 Write the abbreviations, editor options and maps to the specified
-file.
-.TP
-.B "[Nn][ext][!] [file ...]"
+.Ar file .
+.Pp
+.It Xo
+.Op Cm Nn Ns
+.Op Cm ext Ns
+.Op Cm !\&
+.Op Ar
+.Xc
 Edit the next file from the argument list.
-.TP
-.B "[line] o[pen] /pattern/ [flags]"
-Enter open mode.
-.TP
-.B "pre[serve]"
+.\" .Pp
+.\" .It Xo
+.\" .Op Ar line
+.\" .Cm o Ns Op Cm pen
+.\" .No / Ns Ar pattern Ns /
+.\" .Op Ar flags
+.\" .Xc
+.\" Enter open mode.
+.Pp
+.It Cm pre Ns Op Cm serve
 Save the file in a form that can later be recovered using the
-.I \&ex
-.B \-r
+.Nm ex
+.Fl r
 option.
-.TP
-.B "[Pp]rev[ious][!]"
+.Pp
+.It Xo
+.Op Cm \&Pp Ns
+.Cm rev Ns Op Cm ious Ns
+.Op Cm !\&
+.Xc
 Edit the previous file from the argument list.
-.TP
-.B "[range] p[rint] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm p Ns Op Cm rint
+.Op Ar count
+.Op Ar flags
+.Xc
 Display the specified lines.
-.TP
-.B "[line] pu[t] [buffer]"
+.Pp
+.It Xo
+.Op Ar line
+.Cm pu Ns Op Cm t
+.Op Ar buffer
+.Xc
 Append buffer contents to the current line.
-.TP
-.B "q[uit][!]"
+.Pp
+.It Xo
+.Cm q Ns Op Cm uit Ns
+.Op Cm !\&
+.Xc
 End the editing session.
-.TP
-.B "[line] r[ead][!] [file]"
+.Pp
+.It Xo
+.Op Ar line
+.Cm r Ns Op Cm ead Ns
+.Op Cm !\&
+.Op Ar file
+.Xc
 Read a file.
-.TP
-.B "rec[over] file"
+.Pp
+.It Xo
+.Cm rec Ns Op Cm over
+.Ar file
+.Xc
 Recover
-.I file
+.Ar file
 if it was previously saved.
-.TP
-.B "res[ize] [+|-]size"
-.I \&Vi
+.Pp
+.It Xo
+.Cm res Ns Op Cm ize
+.Op Cm + Ns | Ns Cm - Ns
+.Ar size
+.Xc
+.Nm vi
 mode only.
 Grow or shrink the current screen.
-.TP
-.B "rew[ind][!]"
+.Pp
+.It Xo
+.Cm rew Ns Op Cm ind Ns
+.Op Cm !\&
+.Xc
 Rewind the argument list.
-.TP
-.B "se[t] [option[=[value]] ...] [nooption ...] [option? ...] [all]"
+.Pp
+.It Xo
+.Cm se Ns Op Cm t
+.Sm off
+.Op option Oo = Oo value Oc Oc \ \&...
+.Sm on
+.Pf \ \& Op nooption ...
+.Op option? ...
+.Op Ar all
+.Xc
 Display or set editor options.
-.TP
-.B "sh[ell]"
+.Pp
+.It Cm sh Ns Op Cm ell
 Run a shell program.
-.TP
-.B "so[urce] file"
+.Pp
+.It Xo
+.Cm so Ns Op Cm urce
+.Ar file
+.Xc
 Read and execute
-.I \&ex
+.Nm ex
 commands from a file.
-.TP
-.B "[range] s[ubstitute] [/pattern/replace/] [options] [count] [flags]"
-.TP
-.B "[range] & [options] [count] [flags]"
-.TP
-.B "[range] ~ [options] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm s Ns Op Cm ubstitute
+.Sm off
+.Op / Ar pattern No / Ar replace No /
+.Sm on
+.Pf \ \& Op Ar options
+.Op Ar count
+.Op Ar flags
+.Xc
+.It Xo
+.Op Ar range
+.Cm &
+.Op Ar options
+.Op Ar count
+.Op Ar flags
+.Xc
+.It Xo
+.Op Ar range
+.Cm ~
+.Op Ar options
+.Op Ar count
+.Op Ar flags
+.Xc
 Make substitutions.
-.TP
-.B "su[spend][!]"
-.TP
-.B "st[op][!]"
-.TP
-.B <suspend>
+The
+.Ar replace
+field may contain any of the following sequences:
+.Bl -tag -width Ds
+.It Sq \*(Am
+The text matched by
+.Ar pattern .
+.It Sq \(a~
+The replacement part of the previous
+.Cm substitute
+command.
+.It Sq %
+If this is the entire
+.Ar replace
+pattern, the replacement part of the previous
+.Cm substitute
+command.
+.It Sq \e\(sh
+Where
+.Sq \(sh
+is an integer from 1 to 9, the text matched by the #'th subexpression in
+.Ar pattern .
+.It Sq \eL
+Causes the characters up to the end of the line of the next occurrence of
+.Sq \eE
+or
+.Sq \ee
+to be converted to lowercase.
+.It Sq \el
+Causes the next character to be converted to lowercase.
+.It Sq \eU
+Causes the characters up to the end of the line of the next occurrence of
+.Sq \eE
+or
+.Sq \ee
+to be converted to uppercase.
+.It Sq \eu
+Causes the next character to be converted to uppercase.
+.El
+.Pp
+.It Xo
+.Cm su Ns Op Cm spend Ns
+.Op Cm !\&
+.Xc
+.It Xo
+.Cm st Ns Op Cm op Ns
+.Op Cm !\&
+.Xc
+.It Aq Cm suspend
 Suspend the edit session.
-.TP
-.B "[Tt]a[g][!] tagstring"
+The
+.Aq suspend
+character is usually
+.Aq control-Z .
+.Pp
+.It Xo
+.Op Cm Tt Ns
+.Cm a Ns Op Cm g Ns
+.Op Cm !\&
+.Ar tagstring
+.Xc
 Edit the file containing the specified tag.
-.TP
-.B "tagn[ext][!]"
+.Pp
+.It Xo
+.Cm tagn Ns Op Cm ext Ns
+.Op Cm !\&
+.Xc
 Edit the file containing the next context for the current tag.
-.TP
-.B "tagp[op][!] [file | number]"
+.Pp
+.It Xo
+.Cm tagp Ns Op Cm op Ns
+.Op Cm !\&
+.Op Ar file | number
+.Xc
 Pop to the specified tag in the tags stack.
-.TP
-.B "tagp[rev][!]"
+.Pp
+.It Xo
+.Cm tagpr Ns Op Cm ev Ns
+.Op Cm !\&
+.Xc
 Edit the file containing the previous context for the current tag.
-.TP
-.B "unm[ap][!] lhs"
+.Pp
+.It Xo
+.Cm tagt Ns Op Cm op Ns
+.Op Cm !\&
+.Xc
+Pop to the least recent tag on the tags stack, clearing the stack.
+.Pp
+.It Xo
+.Cm una Ns Op Cm bbreviate
+.Ar lhs
+.Xc
+.Nm vi
+only.
+Delete an abbreviation.
+.Pp
+.It Cm u Ns Op Cm ndo
+Undo the last change made to the file.
+.Pp
+.It Xo
+.Cm unm Ns Op Cm ap Ns
+.Op Cm !\&
+.Ar lhs
+.Xc
 Unmap a mapped string.
-.TP
-.B "ve[rsion]"
+.Pp
+.It Cm ve Ns Op Cm rsion
 Display the version of the
-.I \&ex/vi
+.Nm ex Ns / Ns Nm vi
 editor.
-.TP
-.B "[line] vi[sual] [type] [count] [flags]"
-.I \&Ex
+.Pp
+.It Xo
+.Op Ar line
+.Cm vi Ns Op Cm sual
+.Op Ar type
+.Op Ar count
+.Op Ar flags
+.Xc
+.Nm ex
 mode only.
 Enter
-.IR \&vi .
-.TP
-.B "[Vi]i[sual][!] [+cmd] [file]"
-.I \&Vi
+.Nm vi .
+.Pp
+.It Xo
+.Op Cm Vi Ns
+.Cm i Ns Op Cm sual Ns
+.Op Cm !\&
+.Op Ar +cmd
+.Op Ar file
+.Xc
+.Nm vi
 mode only.
 Edit a new file.
-.TP
-.B "viu[sage] [command]"
+.Pp
+.It Xo
+.Cm viu Ns Op Cm sage
+.Op Ar command
+.Xc
 Display usage for a
-.I \&vi
+.Nm vi
 command.
-.TP
-.B "[range] w[rite][!] [>>] [file]"
-.TP
-.B "[range] w[rite] [!] [file]"
-.TP
-.B "[range] wn[!] [>>] [file]"
-.TP
-.B "[range] wq[!] [>>] [file]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm w Ns Op Cm rite Ns
+.Op Cm !\&
+.Op >>
+.Op Ar file
+.Xc
+.It Xo
+.Op Ar range
+.Cm w Ns Op Cm rite
+.Op Cm !\&
+.Op Ar file
+.Xc
+.It Xo
+.Op Ar range
+.Cm wn Ns Op Cm !\&
+.Op >>
+.Op Ar file
+.Xc
+.It Xo
+.Op Ar range
+.Cm wq Ns Op Cm !\&
+.Op >>
+.Op Ar file
+.Xc
 Write the file.
-.TP
-.B "[range] x[it][!] [file]"
-Write the file if it has been modified.
-.TP
-.B "[range] ya[nk] [buffer] [count]"
+.Pp
+.It Xo
+.Op Ar range
+.Cm x Ns Op Cm it Ns
+.Op Cm !\&
+.Op Ar file
+.Xc
+Exit the editor,
+writing the file if it has been modified.
+.Pp
+.It Xo
+.Op Ar range
+.Cm ya Ns Op Cm nk
+.Op Ar buffer
+.Op Ar count
+.Xc
 Copy the specified lines to a buffer.
-.TP
-.B "[line] z [type] [count] [flags]"
+.Pp
+.It Xo
+.Op Ar line
+.Cm z
+.Op Ar type
+.Op Ar count
+.Op Ar flags
+.Xc
 Adjust the window.
-.SH SET OPTIONS
-There are a large number of options that may be set (or unset) to
-change the editor's behavior.
+.El
+.Sh SET OPTIONS
+There are a large number of options that may be set
+.Pq or unset
+to change the editor's behavior.
 This section describes the options, their abbreviations and their
 default values.
-.PP
+.Pp
 In each entry below, the first part of the tag line is the full name
 of the option, followed by any equivalent abbreviations.
 The part in square brackets is the default value of the option.
-Most of the options are boolean, i.e. they are either on or off,
+Most of the options are boolean, i.e., they are either on or off,
 and do not have an associated value.
-.PP
+.Pp
 Options apply to both
-.I \&ex
+.Nm ex
 and
-.I \&vi
+.Nm vi
 modes, unless otherwise specified.
-.PP
-.TP
-.B "altwerase [off]"
-.I \&Vi
+.Bl -tag -width Ds
+.It Cm altwerase Bq off
+.Nm vi
 only.
 Select an alternate word erase algorithm.
-.TP
-.B "autoindent, ai [off]"
+.It Cm autoindent , ai Bq off
 Automatically indent new lines.
-.TP
-.B "autoprint, ap [off]"
-.I \&Ex
+.It Cm autoprint , ap Bq on
+.Nm ex
 only.
 Display the current line automatically.
-.TP
-.B "autowrite, aw [off]"
-Write modified files automatically when changing files.
-.\" I cannot get a double quote to print between the square brackets
-.\" to save my life.  The ONLY way I've been able to get this to work
-.\" is with the .tr command.
-.tr Q"
-.ds ms backup [QQ]
-.TP
-.B "\*(ms"
-.tr QQ
-Backup files before they are overwritten.
-.TP
-.B "beautify, bf [off]"
+.It Cm autowrite , aw Bq off
+Write modified files automatically when changing files or suspending the editor
+session.
+.It Cm backup Bq \&"\&"
+Back up files before they are overwritten.
+.It Cm beautify , bf Bq off
 Discard control characters.
-.TP
-.B "cdpath [environment variable CDPATH, or current directory]"
+.It Cm cdpath Bq "environment variable CDPATH, or current directory"
 The directory paths used as path prefixes for the
-.B cd
+.Cm cd
 command.
-.TP
-.B "cedit [no default]"
+.It Cm cedit Bq no default
 Set the character to edit the colon command-line history.
-.TP
-.B "columns, co [80]"
+.It Cm columns , co Bq 80
 Set the number of columns in the screen.
-.TP
-.B "comment [off]"
-.I \&Vi
+.It Cm comment Bq off
+.Nm vi
 only.
 Skip leading comments in shell, C and C++ language files.
-.TP
-.B "directory, dir [environment variable TMPDIR, or /tmp]"
+.It Cm directory , dir Bq "environment variable TMPDIR, or /tmp"
 The directory where temporary files are created.
-.TP
-.B "edcompatible, ed [off]"
-Remember the values of the ``c'' and ``g'' suffices to the
-.B substitute
-commands, instead of initializing them as unset for each new
-command.
-.TP
-.B "errorbells, eb [off]"
-.I \&Ex
+.It Cm edcompatible , ed Bq off
+Remember the values of the
+.Sq c
+and
+.Sq g
+suffixes to the
+.Cm substitute
+commands, instead of initializing them as unset for each new command.
+.It Cm errorbells , eb Bq off
+.Nm ex
 only.
 Announce error messages with a bell.
-.TP
-.B "exrc, ex [off]"
+.It Cm escapetime Bq 1
+The tenths of a second
+.Nm ex Ns / Ns Nm vi
+waits for a subsequent key to complete an
+.Aq escape
+key mapping.
+.It Cm exrc , ex Bq off
 Read the startup files in the local directory.
-.TP
-.B "extended [off]"
-Regular expressions are extended (i.e.
-.IR egrep (1)\-\c
-style) expressions.
-.TP
-.B "filec [<tab>]"
-Set the character to perform file path completion on the colon
-command line.
-.TP
-.B "fileencoding, fe [auto detect]"
+.It Cm extended Bq off
+Use extended regular expressions
+.Pq EREs
+rather than basic regular expressions
+.Pq BREs .
+See
+.Xr re_format 7
+for more information on regular expressions.
+.It Cm filec Bq Aq tab
+Set the character to perform file path completion on the colon command line.
+.It Cm fileencoding , fe Bq auto detect
 Set the encoding of the current file.
-.TP
-.B "flash [on]"
+.It Cm flash Bq on
 Flash the screen instead of beeping the keyboard on error.
-.TP
-.B "hardtabs, ht [8]"
+.It Cm hardtabs, ht Bq 0
 Set the spacing between hardware tab settings.
-.TP
-.B "iclower [off]"
-Makes all Regular Expressions case-insensitive,
+This option currently has no effect.
+.It Cm iclower Bq off
+Makes all regular expressions case-insensitive,
 as long as an upper-case letter does not appear in the search string.
-.TP
-.B "ignorecase, ic [off]"
+.It Cm ignorecase , ic Bq off
 Ignore case differences in regular expressions.
-.TP
-.B "inputencoding, ie [locale]"
+.It Cm inputencoding , ie Bq locale
 Set the encoding of your input characters.
-.TP
-.B "keytime [6]"
-The 10th's of a second
-.I ex/vi
+.It Cm keytime Bq 6
+The tenths of a second
+.Nm ex Ns / Ns Nm vi
 waits for a subsequent key to complete a key mapping.
-.TP
-.B "leftright [off]"
-.I \&Vi
+.It Cm leftright Bq off
+.Nm vi
 only.
 Do left-right scrolling.
-.TP
-.B "lines, li [24]"
-.I \&Vi
+.It Cm lines , li Bq 24
+.Nm vi
 only.
 Set the number of lines in the screen.
-.TP
-.B "lisp [off]"
-.I \&Vi
+.It Cm lisp Bq off
+.Nm vi
 only.
 Modify various search commands and options to work with Lisp.
-.I "This option is not yet implemented."
-.TP
-.B "list [off]"
+This option is not yet implemented.
+.It Cm list Bq off
 Display lines in an unambiguous fashion.
-.TP
-.B "lock [on]"
-Attempt to get an exclusive lock on any file being edited,
-read or written.
-.TP
-.B "magic [on]"
-Treat certain characters specially in regular expressions.
-.TP
-.B "matchchars [[]{}()]"
+.It Cm lock Bq on
+Attempt to get an exclusive lock on any file being edited, read or written.
+.It Cm magic Bq on
+When turned off, all regular expression characters except for
+.Sq \(ha
+and
+.Sq \(Do
+are treated as ordinary characters.
+Preceding individual characters by
+.Sq \e
+re-enables them.
+.It Cm matchchars Bq []{}()
 Character pairs looked for by the
-.B %
+.Cm %
 command.
-.TP
-.B "matchtime [7]"
-.I \&Vi
+.It Cm matchtime Bq 7
+.Nm vi
 only.
-The 10th's of a second
-.I ex/vi
+The tenths of a second
+.Nm ex Ns / Ns Nm vi
 pauses on the matching character when the
-.B showmatch
+.Cm showmatch
 option is set.
-.TP
-.B "mesg [on]"
+.It Cm mesg Bq on
 Permit messages from other users.
-.TP
-.B "modelines, modeline [off]"
+.It Cm msgcat Bq /usr/share/vi/catalog/
+Selects a message catalog to be used to display error and informational
+messages in a specified language.
+.It Cm modelines , modeline Bq off
 Read the first and last few lines of each file for
-.I ex
+.Nm ex
 commands.
-.I "This option will never be implemented."
-.\" I cannot get a double quote to print between the square brackets
-.\" to save my life.  The ONLY way I've been able to get this to work
-.\" is with the .tr command.
-.tr Q"
-.ds ms noprint [QQ]
-.TP
-.B "\*(ms"
-.tr QQ
+This option will never be implemented.
+.It Cm noprint Bq \&"\&"
 Characters that are never handled as printable characters.
-.TP
-.B "number, nu [off]"
+.It Cm number , nu Bq off
 Precede each line displayed with its current line number.
-.TP
-.B "octal [off]"
+.It Cm octal Bq off
 Display unknown characters as octal numbers, instead of the default
 hexadecimal.
-.TP
-.B "open [on]"
-.I \&Ex
+.It Cm open Bq on
+.Nm ex
 only.
 If this option is not set, the
-.B open
+.Cm open
 and
-.B visual
+.Cm visual
 commands are disallowed.
-.TP
-.B "optimize, opt [on]"
-.I \&Vi
+.It Cm optimize , opt Bq on
+.Nm vi
 only.
 Optimize text throughput to dumb terminals.
-.I "This option is not yet implemented."
-.TP
-.B "paragraphs, para [IPLPPPQPP LIpplpipbp]"
-.I \&Vi
+This option is not yet implemented.
+.It Cm paragraphs , para Bq "IPLPPPQPP LIpplpipbp"
+.Nm vi
 only.
 Define additional paragraph boundaries for the
-.B \&{
+.Cm {\&
 and
-.B \&}
+.Cm }\&
 commands.
-.TP
-.B "path []"
+.It Cm path Bq \&"\&"
 Define additional directories to search for files being edited.
-.\" I cannot get a double quote to print between the square brackets
-.\" to save my life.  The ONLY way I've been able to get this to work
-.\" is with the .tr command.
-.tr Q"
-.ds ms print [QQ]
-.TP
-.B "\*(ms"
-.tr QQ
+.It Cm print Bq \&"\&"
 Characters that are always handled as printable characters.
-.TP
-.B "prompt [on]"
-.I \&Ex
+.It Cm prompt Bq on
+.Nm ex
 only.
 Display a command prompt.
-.TP
-.B "readonly, ro [off]"
+.It Cm readonly , ro Bq off
 Mark the file and session as read-only.
-.TP
-.B "recdir [/var/tmp/vi.recover]"
+.It Cm recdir Bq /var/tmp/vi.recover
 The directory where recovery files are stored.
-.TP
-.B "redraw, re [off]"
-.I \&Vi
+.It Cm redraw , re Bq off
+.Nm vi
 only.
 Simulate an intelligent terminal on a dumb one.
-.I "This option is not yet implemented."
-.TP
-.B "remap [on]"
+This option is not yet implemented.
+.It Cm remap Bq on
 Remap keys until resolved.
-.TP
-.B "report [5]"
-Set the number of lines about which the editor reports changes
-or yanks.
-.TP
-.B "ruler [off]"
-.I \&Vi
+.It Cm report Bq 5
+Set the number of lines about which the editor reports changes or yanks.
+.It Cm ruler Bq off
+.Nm vi
 only.
 Display a row/column ruler on the colon command line.
-.TP
-.B "scroll, scr [window / 2]"
+.It Cm scroll , scr Bq "window size / 2"
 Set the number of lines scrolled.
-.TP
-.B "searchincr [off]"
+.It Cm searchincr Bq off
 Makes the
-.B \&/
+.Cm /
 and
-.B \&?
+.Cm ?\&
 commands incremental.
-.TP
-.B "sections, sect [NHSHH HUnhsh]"
-.I \&Vi
+.It Cm sections , sect Bq "NHSHH HUnhsh"
+.Nm vi
 only.
 Define additional section boundaries for the
-.B \&[[
+.Cm [[
 and
-.B \&]]
+.Cm ]]
 commands.
-.TP
-.B "secure [off]"
+.It Cm secure Bq off
 Turns off all access to external programs.
-.TP
-.B "shell, sh [environment variable SHELL, or /bin/sh]"
+.It Cm shell , sh Bq "environment variable SHELL, or /bin/sh"
 Select the shell used by the editor.
-.\" I cannot get a double quote to print between the square brackets
-.\" to save my life.  The ONLY way I've been able to get this to work
-.\" is with the .tr command.
-.tr Q"
-.ds ms shellmeta [~{[*?$`'Q\e]
-.TP
-.B "\*(ms"
-.tr QQ
+.It Cm shellmeta Bq ~{[*?$`'\&"\e
 Set the meta characters checked to determine if file name expansion
 is necessary.
-.TP
-.B "shiftwidth, sw [8]"
+.It Cm shiftwidth , sw Bq 8
 Set the autoindent and shift command indentation width.
-.TP
-.B "showmatch, sm [off]"
-.I \&Vi
+.It Cm showmatch , sm Bq off
+.Nm vi
 only.
 Note the left matching characters when the right ones are inserted.
-.TP
-.B "showmode, smd [off]"
-.I \&Vi
+.It Cm showmode , smd Bq off
+.Nm vi
 only.
-Display the current editor mode and a ``modified'' flag.
-.TP
-.B "sidescroll [16]"
-.I \&Vi
+Display the current editor mode and a
+.Dq modified
+flag.
+.It Cm sidescroll Bq 16
+.Nm vi
 only.
 Set the amount a left-right scroll will shift.
-.TP
-.B "slowopen, slow [off]"
+.It Cm slowopen , slow Bq off
 Delay display updating during text input.
-.I "This option is not yet implemented."
-.TP
-.B "sourceany [off]"
+This option is not yet implemented.
+.It Cm sourceany Bq off
 Read startup files not owned by the current user.
-.I "This option will never be implemented."
-.TP
-.B "tabstop, ts [8]"
+This option will never be implemented.
+.It Cm tabstop , ts Bq 8
 This option sets tab widths for the editor display.
-.TP
-.B "taglength, tl [0]"
+.It Cm taglength , tl Bq 0
 Set the number of significant characters in tag names.
-.TP
-.B "tags, tag [tags /var/db/libc.tags /sys/kern/tags]"
+.It Cm tags , tag Bq tags
 Set the list of tags files.
-.TP
-.B "term, ttytype, tty [environment variable TERM]"
+.It Xo
+.Cm term , ttytype , tty
+.Bq "environment variable TERM"
+.Xc
 Set the terminal type.
-.TP
-.B "terse [off]"
+.It Cm terse Bq off
 This option has historically made editor messages less verbose.
 It has no effect in this implementation.
-.TP
-.B "tildeop [off]"
+.It Cm tildeop Bq off
 Modify the
-.B \&~
+.Cm ~
 command to take an associated motion.
-.TP
-.B "timeout, to [on]"
+.It Cm timeout , to Bq on
 Time out on keys which may be mapped.
-.TP
-.B "ttywerase [off]"
-.I \&Vi
+.It Cm ttywerase Bq off
+.Nm vi
 only.
 Select an alternate erase algorithm.
-.TP
-.B "verbose [off]"
-.I \&Vi
+.It Cm verbose Bq off
+.Nm vi
 only.
 Display an error message for every error.
-.TP
-.B "w300 [no default]"
-.I \&Vi
+.It Cm w300 Bq no default
+.Nm vi
 only.
 Set the window size if the baud rate is less than 1200 baud.
-.TP
-.B "w1200 [no default]"
-.I \&Vi
+.It Cm w1200 Bq no default
+.Nm vi
 only.
 Set the window size if the baud rate is equal to 1200 baud.
-.TP
-.B "w9600 [no default]"
-.I \&Vi
+.It Cm w9600 Bq no default
+.Nm vi
 only.
 Set the window size if the baud rate is greater than 1200 baud.
-.TP
-.B "warn [on]"
-.I \&Ex
+.It Cm warn Bq on
+.Nm ex
 only.
-This option causes a warning message to the terminal if the file has
-been modified, since it was last written, before a
-.B \&!
+This option causes a warning message to be printed on the terminal
+if the file has been modified since it was last written, before a
+.Cm !\&
 command.
-.TP
-.B "window, w, wi [environment variable LINES]"
+.It Xo
+.Cm window , w , wi
+.Bq "environment variable LINES \- 1"
+.Xc
 Set the window size for the screen.
-.TP
-.B "windowname [off]"
+.It Cm windowname Bq off
 Change the icon/window name to the current file name.
-.TP
-.B "wraplen, wl [0]"
-.I \&Vi
+.It Cm wraplen , wl Bq 0
+.Nm vi
 only.
-Break lines automatically, the specified number of columns from the
-left-hand margin.
+Break lines automatically,
+the specified number of columns from the left-hand margin.
 If both the
-.B wraplen
+.Cm wraplen
 and
-.B wrapmargin
+.Cm wrapmargin
 edit options are set, the
-.B wrapmargin
+.Cm wrapmargin
 value is used.
-.TP
-.B "wrapmargin, wm [0]"
-.I \&Vi
+.It Cm wrapmargin , wm Bq 0
+.Nm vi
 only.
-Break lines automatically, the specified number of columns from the
-right-hand margin.
+Break lines automatically,
+the specified number of columns from the right-hand margin.
 If both the
-.B wraplen
+.Cm wraplen
 and
-.B wrapmargin
+.Cm wrapmargin
 edit options are set, the
-.B wrapmargin
+.Cm wrapmargin
 value is used.
-.TP
-.B "wrapscan, ws [on]"
+.It Cm wrapscan , ws Bq on
 Set searches to wrap around the end or beginning of the file.
-.TP
-.B "writeany, wa [off]"
+.It Cm writeany , wa Bq off
 Turn off file-overwriting checks.
-.SH ENVIRONMENT VARIABLES
-.TP
-.I COLUMNS
+.El
+.Sh ENVIRONMENT
+.Bl -tag -width "COLUMNS"
+.It Ev COLUMNS
 The number of columns on the screen.
 This value overrides any system or terminal specific values.
 If the
-.I COLUMNS
+.Ev COLUMNS
 environment variable is not set when
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 runs, or the
-.B columns
+.Cm columns
 option is explicitly reset by the user,
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 enters the value into the environment.
-.TP
-.I EXINIT
+.It Ev EXINIT
 A list of
-.I \&ex
-startup commands, read if the variable
-.I NEXINIT
-is not set.
-.TP
-.I HOME
-The user's home directory, used as the initial directory path
-for the startup ``$\fIHOME\fP/.nexrc'' and ``$\fIHOME\fP/.exrc''
+.Nm ex
+startup commands, read after
+.Pa /etc/vi.exrc
+unless the variable
+.Ev NEXINIT
+is also set.
+.It Ev HOME
+The user's home directory, used as the initial directory path for the startup
+.Pa $HOME/.nexrc
+and
+.Pa $HOME/.exrc
 files.
 This value is also used as the default directory for the
-.I \&vi
-.B \&cd
+.Cm cd
 command.
-.TP
-.I LINES
+.It Ev LINES
 The number of rows on the screen.
 This value overrides any system or terminal specific values.
 If the
-.I LINES
+.Ev LINES
 environment variable is not set when
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 runs, or the
-.B lines
+.Cm lines
 option is explicitly reset by the user,
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 enters the value into the environment.
-.TP
-.I NEXINIT
+.It Ev NEXINIT
 A list of
-.I \&ex
-startup commands.
-.TP
-.I SHELL
-The user's shell of choice (see also the
-.B shell
-option).
-.TP
-.I TERM
+.Nm ex
+startup commands, read after
+.Pa /etc/vi.exrc .
+.It Ev SHELL
+The user's shell of choice
+.Pq see also the Cm shell No option .
+.It Ev TERM
 The user's terminal type.
-The default is the type ``unknown''.
+The default is the type
+.Dq unknown .
 If the
-.I TERM
+.Ev TERM
 environment variable is not set when
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 runs, or the
-.B term
+.Cm term
 option is explicitly reset by the user,
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 enters the value into the environment.
-.TP
-.I TMPDIR
-The location used to stored temporary files (see also the
-.B directory
-edit option).
-.SH ASYNCHRONOUS EVENTS
-.TP
-SIGALRM
-.I \&Vi/ex
-uses this signal for periodic backups of file modifications and to
-display ``busy'' messages when operations are likely to take a long time.
-.TP
-SIGHUP
-.TP
-SIGTERM
-If the current buffer has changed since it was last written in its
-entirety, the editor attempts to save the modified file so it can
-be later recovered.
+.It Ev TMPDIR
+The location used to store temporary files
+.Pq see also the Cm directory No edit option .
+.El
+.Sh ASYNCHRONOUS EVENTS
+.Bl -tag -width "SIGWINCH" -compact
+.It Dv SIGALRM
+.Nm vi Ns / Ns Nm ex
+uses this signal for periodic backups of file modifications and to display
+.Dq busy
+messages when operations are likely to take a long time.
+.Pp
+.It Dv SIGHUP
+.It Dv SIGTERM
+If the current buffer has changed since it was last written in its entirety,
+the editor attempts to save the modified file so it can be later recovered.
 See the
-.I \&vi/ex
-Reference manual section entitled ``Recovery'' for more information.
-.TP
-SIGINT
-When an interrupt occurs,
-the current operation is halted,
+.Nm vi Ns / Ns Nm ex
+reference manual section
+.Sx Recovery
+for more information.
+.Pp
+.It Dv SIGINT
+When an interrupt occurs, the current operation is halted
 and the editor returns to the command level.
 If interrupted during text input,
 the text already input is resolved into the file as if the text
 input had been normally terminated.
-.TP
-SIGWINCH
+.Pp
+.It Dv SIGWINCH
 The screen is resized.
 See the
-.I \&vi/ex
-Reference manual section entitled ``Sizing the Screen'' for more information.
-.TP
-SIGCONT
-.TP
-SIGQUIT
-.TP
-SIGTSTP
-.I \&Vi/ex
-ignores these signals.
-.SH FILES
-.TP
-/bin/sh
+.Nm vi Ns / Ns Nm ex
+reference manual section
+.Sx Sizing the Screen
+for more information.
+.\" .Pp
+.\" .It Dv SIGCONT
+.\" .It Dv SIGTSTP
+.\" .Nm vi Ns / Ns Nm ex
+.\" ignores these signals.
+.El
+.Sh FILES
+.Bl -tag -width "/var/tmp/vi.recover"
+.It Pa /bin/sh
 The default user shell.
-.TP
-/etc/vi.exrc
-System-wide vi startup file.
-.TP
-/tmp
+.It Pa /etc/vi.exrc
+System-wide
+.Nm vi
+startup file.
+It is read for
+.Nm ex
+commands first in the startup sequence.
+Must be owned by root or the user,
+and writable only by the owner.
+.It Pa /tmp
 Temporary file directory.
-.TP
-/var/tmp/vi.recover
+.It Pa /var/tmp/vi.recover
 The default recovery file directory.
-.TP
-$HOME/.nexrc
-1st choice for user's home directory startup file.
-.TP
-$HOME/.exrc
-2nd choice for user's home directory startup file.
-.TP
-\&.nexrc
-1st choice for local directory startup file.
-.TP
-\&.exrc
-2nd choice for local directory startup file.
-.SH SEE ALSO
-.IR ctags (1),
-.IR iconv (1),
-.IR more (1),
-.IR curses (3),
-.IR dbopen (3)
-.sp
-The ``Vi Quick Reference'' card.
-.sp
-``An Introduction to Display Editing with Vi'', found in the
-``UNIX User's Manual Supplementary Documents''
-section of both the 4.3BSD and 4.4BSD manual sets.
-This document is the closest thing available to an introduction to the
-.I \&vi
-screen editor.
-.sp
-``Ex Reference Manual (Version 3.7)'',
-found in the
-``UNIX User's Manual Supplementary Documents''
-section of both the 4.3BSD and 4.4BSD manual sets.
-This document is the final reference for the
-.I \&ex
-editor, as distributed in most historic 4BSD and System V systems.
-.sp
-``Edit: A tutorial'',
-found in the
-``UNIX User's Manual Supplementary Documents''
-section of the 4.3BSD manual set.
-This document is an introduction to a simple version of the
-.I \&ex
-screen editor.
-.sp
-``Ex/Vi Reference Manual'',
-found in the
-``UNIX User's Manual Supplementary Documents''
-section of the 4.4BSD manual set.
-This document is the final reference for the
-.I \&nex/nvi
-text editors, as distributed in 4.4BSD and 4.4BSD-Lite.
-.PP
-.I Roff
-source for all of these documents is distributed with
-.I nex/nvi
-in the
-.I nvi/USD.doc
-directory of the
-.I nex/nvi
-source code.
-.sp
-The files ``autowrite'', ``input'', ``quoting'' and ``structures''
-found in the
-.I nvi/docs/internals
-directory of the
-.I nex/nvi
-source code.
-.SH HISTORY
+.It Pa $HOME/.nexrc
+First choice for user's home directory startup file, read for
+.Nm ex
+commands right after
+.Pa /etc/vi.exrc
+unless either
+.Ev NEXINIT
+or
+.Ev EXINIT
+are set.
+Must be owned by root or the user,
+and writable only by the owner.
+.It Pa $HOME/.exrc
+Second choice for user's home directory startup file, read for
+.Nm ex
+commands under the same conditions as
+.Pa $HOME/.nexrc .
+.It Pa .nexrc
+First choice for local directory startup file, read for
+.Nm ex
+commands at the end of the startup sequence if the
+.Cm exrc
+option was turned on earlier.
+Must be owned by the user
+and writable only by the owner.
+.It Pa .exrc
+Second choice for local directory startup file, read for
+.Nm ex
+commands under the same conditions as
+.Pa .nexrc .
+.El
+.Sh EXIT STATUS
 The
-.I nex/nvi
-replacements for the
-.I ex/vi
-editor first appeared in 4.4BSD.
-.SH STANDARDS
-.I \&Nex/nvi
-is close to IEEE Std1003.2 (``POSIX'').
+.Nm ex
+and
+.Nm vi
+utilities exit 0 on success,
+and \*(Gt0 if an error occurs.
+.Sh SEE ALSO
+.Xr ctags 1 ,
+.Xr iconv 1 ,
+.Xr re_format 7
+.Sh STANDARDS
+.Nm nex Ns / Ns Nm nvi
+is close to
+.St -p1003.1-2008 .
 That document differs from historical
-.I ex/vi
+.Nm ex Ns / Ns Nm vi
 practice in several places; there are changes to be made on both sides.
+.Sh HISTORY
+The
+.Nm ex
+editor first appeared in
+.Bx 1 .
+The
+.Nm nex Ns / Ns Nm nvi
+replacements for the
+.Nm ex Ns / Ns Nm vi
+editor first appeared in
+.Bx 4.4 .
+.Sh AUTHORS
+.An Bill Joy
+wrote the original version of
+.Nm ex
+in 1977.
diff --git a/contrib/nvi/ex/ex_print.c b/contrib/nvi/ex/ex_print.c
index 2c9208aa672..5903e9711ee 100644
--- a/contrib/nvi/ex/ex_print.c
+++ b/contrib/nvi/ex/ex_print.c
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: ex_print.c,v 10.25 2011/12/12 22:12:20 zy Exp $";
+static const char sccsid[] = "$Id: ex_print.c,v 10.26 2013/11/02 02:11:07 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -213,7 +213,7 @@ ex_prchars(SCR *sp, const CHAR_T *p, size_t *colp, size_t len,
 	gp = sp->gp;
 	ts = O_VAL(sp, O_TABSTOP);
 	for (col = *colp; len--;)
-		if ((ch = *p++) == '\t' && !LF_ISSET(E_C_LIST))
+		if ((ch = *p++) == L('\t') && !LF_ISSET(E_C_LIST))
 			for (tlen = ts - col % ts;
 			    col < sp->cols && tlen--; ++col) {
 				(void)ex_printf(sp,
@@ -223,21 +223,32 @@ ex_prchars(SCR *sp, const CHAR_T *p, size_t *colp, size_t len,
 			}
 		else {
 			kp = KEY_NAME(sp, ch);
-			tlen = KEY_LEN(sp, ch);
-			if (!repeatc  && col + tlen < sp->cols) {
+			tlen = KEY_COL(sp, ch);
+
+			/*
+			 * Start a new line if the last character does not fit
+			 * into the current line.  The implicit new lines are
+			 * not interruptible.
+			 */
+			if (col + tlen > sp->cols) {
+				col = 0;
+				(void)ex_puts(sp, "\n");
+			}
+
+			col += tlen;
+			if (!repeatc) {
 				(void)ex_puts(sp, kp);
-				col += tlen;
-			} else
-				for (; tlen--; ++kp, ++col) {
-					if (col == sp->cols) {
-						col = 0;
-						(void)ex_puts(sp, "\n");
-					}
-					(void)ex_printf(sp,
-					    "%c", repeatc ? repeatc : *kp);
-					if (INTERRUPTED(sp))
-						goto intr;
-				}
+				if (INTERRUPTED(sp))
+					goto intr;
+			} else while (tlen--) {
+				(void)ex_printf(sp, "%c", repeatc);
+				if (INTERRUPTED(sp))
+					goto intr;
+			}
+			if (col == sp->cols) {
+				col = 0;
+				(void)ex_puts(sp, "\n");
+			}
 		}
 intr:	*colp = col;
 	return (0);
diff --git a/contrib/nvi/ex/version.h b/contrib/nvi/ex/version.h
index 295dd8e68b6..ef0af0f559d 100644
--- a/contrib/nvi/ex/version.h
+++ b/contrib/nvi/ex/version.h
@@ -1 +1 @@
-#define VI_VERSION "2.1.1 (2012-10-07)"
+#define VI_VERSION "2.1.2 (2012-11-02)"
diff --git a/contrib/nvi/vi/v_txt.c b/contrib/nvi/vi/v_txt.c
index e81e34880e2..1348b278979 100644
--- a/contrib/nvi/vi/v_txt.c
+++ b/contrib/nvi/vi/v_txt.c
@@ -295,7 +295,8 @@ v_txt(
 	tiqh = sp->tiq;
 	if (!TAILQ_EMPTY(tiqh)) {
 		tp = TAILQ_FIRST(tiqh);
-		if (TAILQ_NEXT(tp, q) != NULL || tp->lb_len < len + 32) {
+		if (TAILQ_NEXT(tp, q) != NULL ||
+		    tp->lb_len < (len + 32) * sizeof(CHAR_T)) {
 			text_lfree(tiqh);
 			goto newtp;
 		}
diff --git a/contrib/nvi/vi/vs_refresh.c b/contrib/nvi/vi/vs_refresh.c
index 98b66c492d1..8343b8041c2 100644
--- a/contrib/nvi/vi/vs_refresh.c
+++ b/contrib/nvi/vi/vs_refresh.c
@@ -10,7 +10,7 @@
 #include "config.h"
 
 #ifndef lint
-static const char sccsid[] = "$Id: vs_refresh.c,v 10.52 2011/12/16 11:06:25 zy Exp $";
+static const char sccsid[] = "$Id: vs_refresh.c,v 10.53 2013/11/01 11:57:36 zy Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -331,7 +331,8 @@ small_fill:			(void)gp->scr_move(sp, LASTLINE(sp), 0);
 				if (vs_sm_1down(sp))
 					return (1);
 			goto adjust;
-		}
+		} else
+			goto top;	/* XXX No such line. */
 
 		/*
 		 * If less than a half screen from the bottom of the file,
diff --git a/contrib/opie/libopie/accessfile.c b/contrib/opie/libopie/accessfile.c
index 8e2765feb63..154ec1e8088 100644
--- a/contrib/opie/libopie/accessfile.c
+++ b/contrib/opie/libopie/accessfile.c
@@ -28,6 +28,7 @@ License Agreement applies to this software.
 #include "opie_cfg.h"
 
 #include <stdio.h>
+#include <ctype.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
diff --git a/contrib/opie/libopie/generator.c b/contrib/opie/libopie/generator.c
index d4888f990e3..da264640819 100644
--- a/contrib/opie/libopie/generator.c
+++ b/contrib/opie/libopie/generator.c
@@ -49,6 +49,7 @@ $FreeBSD$
 #if DEBUG
 #include <syslog.h>
 #endif /* DEBUG */
+#include <stdio.h>
 #include "opie.h"
 
 static char *algids[] = { NULL, NULL, NULL, "sha1", "md4", "md5" };
diff --git a/contrib/opie/libopie/lookup.c b/contrib/opie/libopie/lookup.c
index 3003da7c738..de6d6147742 100644
--- a/contrib/opie/libopie/lookup.c
+++ b/contrib/opie/libopie/lookup.c
@@ -13,6 +13,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 
 #include "opie_cfg.h"
 #include <stdio.h>
+#include <string.h>
 #include "opie.h"
 
 int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal)
diff --git a/contrib/opie/libopie/newseed.c b/contrib/opie/libopie/newseed.c
index 2965b0efc6a..771a2abcfd4 100644
--- a/contrib/opie/libopie/newseed.c
+++ b/contrib/opie/libopie/newseed.c
@@ -18,6 +18,9 @@ $FreeBSD$
 */
 
 #include "opie_cfg.h"
+#ifndef HAVE_TIME_H
+#define HAVE_TIME_H 1
+#endif
 #if HAVE_TIME_H
 #include <time.h>
 #endif /* HAVE_TIME_H */
@@ -35,6 +38,8 @@ $FreeBSD$
 #if DEBUG
 #include <syslog.h>
 #endif /* DEBUG */
+#include <stdio.h>
+#include <stdlib.h>
 #include "opie.h"
 
 int opienewseed FUNCTION((seed), char *seed)
diff --git a/contrib/opie/libopie/parsechallenge.c b/contrib/opie/libopie/parsechallenge.c
index 2b23a35ca13..fe60ea73768 100644
--- a/contrib/opie/libopie/parsechallenge.c
+++ b/contrib/opie/libopie/parsechallenge.c
@@ -19,6 +19,8 @@ you didn't get a copy, you may request one from <license@inner.net>.
 #if HAVE_STRING_H
 #include <string.h>
 #endif /* HAVE_STRING_H */
+#include <ctype.h>
+#include <stdlib.h>
 #include "opie.h"
 
 struct algorithm {
diff --git a/contrib/opie/libopie/passwd.c b/contrib/opie/libopie/passwd.c
index 1c3b1ab6008..0ee050334fd 100644
--- a/contrib/opie/libopie/passwd.c
+++ b/contrib/opie/libopie/passwd.c
@@ -20,6 +20,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 	Created by cmetz for OPIE 2.22.
 */
 
+#include <string.h>
 #include "opie_cfg.h"
 #include "opie.h"
 
diff --git a/contrib/opie/libopie/randomchallenge.c b/contrib/opie/libopie/randomchallenge.c
index 7cf18bb54f9..c1236b9786f 100644
--- a/contrib/opie/libopie/randomchallenge.c
+++ b/contrib/opie/libopie/randomchallenge.c
@@ -26,6 +26,9 @@ License Agreement applies to this software.
         Created at NRL for OPIE 2.2 from opiesubr2.c
 */
 
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
 #include "opie_cfg.h"
 #include "opie.h"
 
diff --git a/contrib/opie/libopie/verify.c b/contrib/opie/libopie/verify.c
index e6abec4d217..766d5cbdc06 100644
--- a/contrib/opie/libopie/verify.c
+++ b/contrib/opie/libopie/verify.c
@@ -24,6 +24,7 @@ you didn't get a copy, you may request one from <license@inner.net>.
 #ifdef HAVE_STRING_H
 #include <string.h>
 #endif /* HAVE_STRING_H */
+#include <ctype.h>
 #include "opie.h"
 
 #define RESPONSE_STANDARD  0
diff --git a/contrib/opie/libopie/version.c b/contrib/opie/libopie/version.c
index 2364e7755cb..ec41f6523c6 100644
--- a/contrib/opie/libopie/version.c
+++ b/contrib/opie/libopie/version.c
@@ -17,6 +17,8 @@ License Agreement applies to this software.
 	Modified by cmetz for OPIE 2.2. Use FUNCTION declaration et al.
         Created at NRL for OPIE 2.2 from opiesubr.c.
 */
+#include <stdio.h>
+#include <stdlib.h>
 #include "opie_cfg.h"
 #include "opie.h"
 
diff --git a/contrib/opie/opie.h b/contrib/opie/opie.h
index be508c77f73..2549d04fc42 100644
--- a/contrib/opie/opie.h
+++ b/contrib/opie/opie.h
@@ -128,6 +128,7 @@ void opieunlockaeh __P((void));
 void opiedisableaeh __P((void));
 int  opielookup __P((struct opie *,char *));
 int  opiepasscheck __P((char *));
+int opienewseed __P((char *));
 void opierandomchallenge __P((char *));
 char * opieskipspace __P((register char *));
 void opiestripcrlf __P((char *));
@@ -139,6 +140,8 @@ const char *opie_get_algorithm __P((void));
 int  opie_haskey __P((char *username));
 char *opie_keyinfo __P((char *));
 int  opie_passverify __P((char *username, char *passwd));
+int opieinsecure __P((void));
+void opieversion __P((void));
 __END_DECLS
 
 #if _OPIE
@@ -158,6 +161,7 @@ FILE *__opieopen __P((char *, int, int));
 int __opiereadrec __P((struct opie *));
 int __opiewriterec __P((struct opie *));
 int __opieparsechallenge __P((char *buffer, int *algorithm, int *sequence, char **seed, int *exts));
+VOIDRET opiehashlen __P((int algorithm, VOIDPTR in, struct opie_otpkey *out, int n));
 __END_DECLS
 
 #define opiestrncpy(dst, src, n) \
diff --git a/contrib/opie/opieinfo.c b/contrib/opie/opieinfo.c
index 09f9784241d..1aeead6fb83 100644
--- a/contrib/opie/opieinfo.c
+++ b/contrib/opie/opieinfo.c
@@ -38,6 +38,7 @@ $FreeBSD$
 #include <sys/param.h>
 #include <errno.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
diff --git a/contrib/opie/opiekey.c b/contrib/opie/opiekey.c
index 698834968b8..a260d9650d1 100644
--- a/contrib/opie/opiekey.c
+++ b/contrib/opie/opiekey.c
@@ -45,6 +45,7 @@ $FreeBSD$
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "opie.h"
 
diff --git a/contrib/smbfs/lib/smb/nls.c b/contrib/smbfs/lib/smb/nls.c
index 32744288a8c..5c2dbd9b48c 100644
--- a/contrib/smbfs/lib/smb/nls.c
+++ b/contrib/smbfs/lib/smb/nls.c
@@ -36,12 +36,8 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <sys/iconv.h>
 #include <sys/sysctl.h>
 #include <ctype.h>
-#ifndef APPLE
-#include <dlfcn.h>
-#endif
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
@@ -50,21 +46,16 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <netsmb/smb_lib.h>
 
-/*
- * prototype iconv* functions
- */
-typedef void *iconv_t;
-
-static iconv_t (*my_iconv_open)(const char *, const char *);
-static size_t(*my_iconv)(iconv_t, const char **, size_t *, char **, size_t *);
-static int(*my_iconv_close)(iconv_t);
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
 
 u_char nls_lower[256];
 u_char nls_upper[256];
 
+#ifdef HAVE_ICONV
 static iconv_t nls_toext, nls_toloc;
-static int iconv_loaded;
-static void *iconv_lib;
+#endif
 
 int
 nls_setlocale(const char *name)
@@ -85,117 +76,107 @@ nls_setlocale(const char *name)
 int
 nls_setrecode(const char *local, const char *external)
 {
-#ifdef APPLE
-	return ENOENT;
-#else
+#ifdef HAVE_ICONV
 	iconv_t icd;
 
-	if (iconv_loaded == 2)
-		return ENOENT;
-	else if (iconv_loaded == 0) {
-		iconv_loaded++;
-		iconv_lib = dlopen("libiconv.so", RTLD_LAZY | RTLD_GLOBAL);
-		if (iconv_lib == NULL) {
-			warn("Unable to load iconv library: %s\n", dlerror());
-			iconv_loaded++;
-			return ENOENT;
-		}
-		my_iconv_open = dlsym(iconv_lib, "iconv_open");
-		my_iconv = dlsym(iconv_lib, "iconv");
-		my_iconv_close = dlsym(iconv_lib, "iconv_close");
-	}
 	if (nls_toext)
-		my_iconv_close(nls_toext);
+		iconv_close(nls_toext);
 	if (nls_toloc)
-		my_iconv_close(nls_toloc);
+		iconv_close(nls_toloc);
 	nls_toext = nls_toloc = (iconv_t)0;
-	icd = my_iconv_open(external, local);
+	icd = iconv_open(external, local);
 	if (icd == (iconv_t)-1)
 		return errno;
 	nls_toext = icd;
-	icd = my_iconv_open(local, external);
+	icd = iconv_open(local, external);
 	if (icd == (iconv_t)-1) {
-		my_iconv_close(nls_toext);
+		iconv_close(nls_toext);
 		nls_toext = (iconv_t)0;
 		return errno;
 	}
 	nls_toloc = icd;
 	return 0;
+#else
+	return ENOENT;
 #endif
 }
 
 char *
 nls_str_toloc(char *dst, const char *src)
 {
+#ifdef HAVE_ICONV
 	char *p = dst;
 	size_t inlen, outlen;
 
-	if (!iconv_loaded)
-		return strcpy(dst, src);
-
 	if (nls_toloc == (iconv_t)0)
 		return strcpy(dst, src);
 	inlen = outlen = strlen(src);
-	my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
-	while (my_iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
+	iconv(nls_toloc, NULL, NULL, &p, &outlen);
+	while (iconv(nls_toloc, &src, &inlen, &p, &outlen) == -1) {
 		*p++ = *src++;
 		inlen--;
 		outlen--;
 	}
 	*p = 0;
 	return dst;
+#else
+	return strcpy(dst, src);
+#endif
 }
 
 char *
 nls_str_toext(char *dst, const char *src)
 {
+#ifdef HAVE_ICONV
 	char *p = dst;
 	size_t inlen, outlen;
 
-	if (!iconv_loaded)
-		return strcpy(dst, src);
-
 	if (nls_toext == (iconv_t)0)
 		return strcpy(dst, src);
 	inlen = outlen = strlen(src);
-	my_iconv(nls_toext, NULL, NULL, &p, &outlen);
-	while (my_iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
+	iconv(nls_toext, NULL, NULL, &p, &outlen);
+	while (iconv(nls_toext, &src, &inlen, &p, &outlen) == -1) {
 		*p++ = *src++;
 		inlen--;
 		outlen--;
 	}
 	*p = 0;
 	return dst;
+#else
+	return strcpy(dst, src);
+#endif
 }
 
 void *
 nls_mem_toloc(void *dst, const void *src, int size)
 {
+#ifdef HAVE_ICONV
 	char *p = dst;
 	const char *s = src;
 	size_t inlen, outlen;
 
-	if (!iconv_loaded)
-		return memcpy(dst, src, size);
-
 	if (size == 0)
 		return NULL;
 
 	if (nls_toloc == (iconv_t)0)
 		return memcpy(dst, src, size);
 	inlen = outlen = size;
-	my_iconv(nls_toloc, NULL, NULL, &p, &outlen);
-	while (my_iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
+	iconv(nls_toloc, NULL, NULL, &p, &outlen);
+	while (iconv(nls_toloc, &s, &inlen, &p, &outlen) == -1) {
 		*p++ = *s++;
 		inlen--;
 		outlen--;
 	}
 	return dst;
+#else
+	return memcpy(dst, src, size);
+#endif
 }
 
 void *
 nls_mem_toext(void *dst, const void *src, int size)
 {
+#ifdef HAVE_ICONV
 	char *p = dst;
 	const char *s = src;
 	size_t inlen, outlen;
@@ -203,17 +184,20 @@ nls_mem_toext(void *dst, const void *src, int size)
 	if (size == 0)
 		return NULL;
 
-	if (!iconv_loaded || nls_toext == (iconv_t)0)
+	if (nls_toext == (iconv_t)0)
 		return memcpy(dst, src, size);
 
 	inlen = outlen = size;
-	my_iconv(nls_toext, NULL, NULL, &p, &outlen);
-	while (my_iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) {
+	iconv(nls_toext, NULL, NULL, &p, &outlen);
+	while (iconv(nls_toext, &s, &inlen, &p, &outlen) == -1) {
 		*p++ = *s++;
 		inlen--;
 		outlen--;
 	}
 	return dst;
+#else
+	return memcpy(dst, src, size);
+#endif
 }
 
 char *
diff --git a/contrib/subversion/CHANGES b/contrib/subversion/CHANGES
index 55b1b4d9e72..4dc583338fe 100644
--- a/contrib/subversion/CHANGES
+++ b/contrib/subversion/CHANGES
@@ -1,3 +1,128 @@
+Version 1.8.5
+(25 November 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.5
+
+ User-visible changes:
+  - Client-side bugfixes:
+    * fix externals that point at redirected locations (issues #4428, #4429)
+    * diff: fix assertion with move inside a copy (issue #4444)
+
+  - Server-side bugfixes:
+    * mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
+    * mod_dav_svn: canonicalize paths properly (r1542071)
+    * mod_authz_svn: fix crash of mod_authz_svn with invalid config (r1541432)
+    * hotcopy: fix hotcopy losing revprop files in packed repos (issue #4448)
+ 
+  - Other tool improvements and bugfixes:
+    * mod_dontdothat: Fix the uri parser (r1542069 et al)
+
+ Developer-visible changes:
+  - General:
+    * fix compilation with '--enable-optimize' with clang (r1534860)
+    * fix copmpilation with debug build of BDB on Windows (r1501656, r1501702)
+    * fix '--with-openssl' option when building on Windows (r1535139) 
+    * add test to fail when built against broken ZLib (r1537193 et al)
+
+  - Bindings:
+    * swig-rb: fix tests to run without installing on OS X (r1535161)
+    * ctypes-python: build with compiler selected via configure (r1536537)
+
+
+Version 1.8.4
+(29 October 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.4
+
+ User-visible changes:
+  - Client- and server-side bugfixes:
+    * fix assertion on urls of the form 'file://./' (r1516806)
+    * stop linking against psapi.dll on Windows (r1534102)
+    * translation updates for Swedish
+
+  - Client-side bugfixes:
+    * revert: fix problems reverting moves (issue #4436)
+    * update: fix assertion when file external access is denied (issue #4422)
+    * merge: reduce network connections for automatic merge (r1468980 et al)
+    * merge: fix path corruption during reintegration (r1523666)
+    * mergeinfo: fix crash (r1519955)
+    * ra_serf: verify the result of xml parsing (r1501199 et al)
+    * ra_serf: improve error messages during commit (r1526439)
+    * ra_local: fix error with repository in Windows drive root (r1518184)
+    * fix crash on windows when piped command is interrupted (r1522892)
+    * fix crash in the crash handler on windows (r1532023)
+    * fix assertion when upgrading old working copies (r1520529)
+
+  - Server-side bugfixes:
+    * hotcopy: cleanup unpacked revprops with '--incremental' (r1512300 et al)
+    * fix OOM on concurrent requests at threaded server start (r1527103 et al)
+    * fsfs: improve error message when unsupported fsfs format found (r1534158)
+    * fix memory problem in 3rd party FS module loader (r1519615 et al)
+
+ Developer-visible changes:
+  - General:
+    * allow compiling against serf 1.3 and later on Windows (r1517123)
+
+  - Bindings:
+    * javahl: canonicalize path for streamFileContent method (r1524869)
+
+
+Version 1.8.3
+(29 August 2013, from /branches/1.8.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.8.3
+
+ User-visible changes:
+  - Client- and server-side bugfixes:
+    * translation updates for Swedish
+    * enforce strict version equality between tools and libraries (r1502267)
+    * consistently output revisions as "r%ld" in error messags (r1499044 et al)
+
+  - Client-side bugfixes:
+    * status: always use absolute paths in XML output (issue #4398)
+    * ra_serf: 'svn log -v' fails with a 1.2.x server (issue #4044)
+    * ra_serf: fix crash when committing cp with deep deletion (issue #4400)
+    * diff: issue an error for files that can't fit in memory (r1513119 et al)
+    * svnmucc: generate proper error for mismatched URLs (r1511353)
+    * update: fix a crash when a temp file doesn't exist (r1513156)
+    * commit & update: improve sleep for timestamps performance (r1508438)
+    * diff: continue on missing or obstructing files (issue #4396)
+    * ra_serf: use runtime serf version for User-Agent (r1514315, r1514628)
+    * ra_serf: ignore case when checking certificate common names (r1514763)
+    * ra_serf: format distinguished names properly (r1514804)
+    * ra_serf: do not retry HTTP requests if we started to parse them (r1503318)
+    * ra_serf: output ssl cert verification failure reason (r1514785 et al)
+    * ra_serf: allow session reuse after SVN_ERR_CEASE_INVOCATION (r1502901)
+    * ra_serf: include library version in '--version' output (r1514295 et al)
+    * info: fix spurious error on wc root with child in conflict (r1515366)
+
+  - Server-side bugfixes:
+    * svnserve: fix creation of pid files (r1516556)
+    * svnadmin: fix output encoding in non-UTF8 environments (r1506966)
+    * svnsync: fix high memory usage when running over ra_serf (r1515249 et al)
+    * mod_dav_svn: do not map requests to filesystem (r1512432 et al)
+    * svnauthz: improve help strings (r1511272) 
+    * fsfs: fixed manifest file growth with revprop changes (r1513874)
+    * fsfs: fix packed revprops causing loss of revprops (r1513879 et al)
+  
+  - Other tool improvements and bugfixes:
+    * svnwcsub/irkerbridge: fix symlink attack via pid file (r175 from upstream)
+
+ Developer-visible changes:
+  - General:
+    * describe APR unimplemented errors as coming from APR (r1503010 et al)
+    * mod_dav_svn: update INSTALL to reflect configure defaults (r1515141)
+    * davautocheck: use the correct apxs binary by default (r1507889, r1507891)
+
+  - API changes:
+    * svn_config_walk_auth_data() config_dir arg: permit NULL (r1507382 et al)
+
+  - Bindings:
+    * swig-pl: fix SVN::Client not honoring config file settings (r150744)
+    * swig-pl & swig-py: disable unusable svn_fs_set_warning_func (r1515119)
+
+
+Version 1.8.2
+(Not released, see changes for 1.8.3.)
+ 
+ 
 Version 1.8.1
 (23 July 2013, from /branches/1.8.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.8.1
@@ -54,6 +179,8 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.1
     * svnadmin create: deny '--fs-type=fsfs --compatible-version=1.0' (r1494223)
     * svnadmin upgrade: fix data loss when cancelling in last stage (r1494298)
     * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+            See CVE-2013-4131, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-4131-advisory.txt
 
   - Other tool improvements and bugfixes:
     * fsfs-stats (tool): resolve segfault when passing invalid path (r1492164)
@@ -361,7 +488,7 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.0
     * support for Serf 2 (r1147538)
     * introduction of editor v2 (via private APIs only) (r1166332 et al)
     * improve SQLite setup for compatibility with OS X 10.7. (r1181666)
-    * rework switch statement to accomodate OWC compiler limitations (r1204407)
+    * rework switch statement to accommodate OWC compiler limitations (r1204407)
     * new --enable-sqlite-compatibility-version configure option (r1201421)
     * make test suite LD_LIBRARY_PATH include just-built auth plugins (r1200474)
     * packages/ directory removed, contents were outdated and unused (r1442167)
@@ -426,6 +553,65 @@ http://svn.apache.org/repos/asf/subversion/tags/1.8.0
     * fix some reference counting bugs in swig-py bindings (r1464899, r1466524)
 
 
+Version 1.7.14
+(25 Nov 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.14
+
+ User-visible changes:
+  - Client- and server-side bugfixes:
+    * fix assertion on urls of the form 'file://./' (r1516806)
+
+  - Client-side bugfixes:
+    * upgrade: fix an assertion when used with pre-1.3 wcs (r1530849)
+    * ra_local: fix error with repository in Windows drive root (r1518184)
+    * fix crash on windows when piped command is interrupted (r1522892)
+    * fix externals that point at redirected locations (issues #4428, #4429)
+    * diff: fix incorrect calculation of changes in some cases (issue #4283)
+    * diff: fix errors with added/deleted targets (issues #4153, #4421)
+
+  - Server-side bugfixes:
+    * mod_dav_svn: Prevent crashes with some 3rd party modules (r1537360 et al)
+    * fix OOM on concurrent requests at threaded server start (r1527103 et al)
+    * fsfs: limit commit time of files with deep change histories (r1536790)
+    * mod_dav_svn: canonicalize paths properly (r1542071)
+
+  - Other tool improvements and bugfixes:
+    * mod_dontdothat: Fix the uri parser (r1542069 et al)
+
+ Developer-visible changes:
+  - Bindings:
+    * javahl: canonicalize path for streamFileContent method (r1524869)
+
+
+Version 1.7.13
+(29 Aug 2013, from /branches/1.7.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.7.13
+
+ User-visible changes:
+  - General
+    * merge: fix bogus mergeinfo with conflicting file merges (issue #4306)
+    * diff: fix duplicated path component in '--summarize' output (issue #4408)
+    * ra_serf: ignore case when checking certificate common names (r1514763)
+
+  - Server-side bugfixes:
+    * svnserve: fix creation of pid files (r1516556)
+    * mod_dav_svn: better status codes for commit failures (r1490684)
+    * mod_dav_svn: do not map requests to filesystem (r1512432 et al)
+
+ Developer-visible changes:
+  - General:
+    * support linking against gssapi on Solaris 10 (r1515068)
+    * don't use uninitialized variable to produce an error code (r1482282)
+
+  - Bindings:
+    * swig-pl: fix SVN::Client not honoring config file settings (r150744)
+    * swig-pl & swig-py: disable unusable svn_fs_set_warning_func (r1515119)
+
+
+Version 1.7.12
+(Not released, see changes for 1.7.13.)
+ 
+ 
 Version 1.7.11
 (23 Jul 2013, from /branches/1.7.x)
 http://svn.apache.org/repos/asf/subversion/tags/1.7.11
@@ -436,9 +622,13 @@ http://svn.apache.org/repos/asf/subversion/tags/1.7.11
 
   - Server-side bugfixes:
     * mod_dav_svn: fix incorrect path canonicalization (r1503528)
+            See CVE-2013-4131, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-4131-advisory.txt
 
   - Other tool improvements and bugfixes:
     * fix argument processing in contrib hook scripts (r1485350)
+            See CVE-2013-2088, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-2088-advisory.txt
 
  Developer-visible changes:
   - Bindings:
@@ -464,7 +654,11 @@ http://svn.apache.org/repos/asf/subversion/tags/1.7.10
 
   - Server-side bugfixes:
     * fix FSFS repository corruption due to newline in filename (issue #4340)
+            See CVE-2013-1968, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-1968-advisory.txt
     * fix svnserve exiting when a client connection is aborted (r1482759)
+            See CVE-2013-2112, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
     * fix svnserve memory use after clear (issue #4365)
     * fix repository corruption on power/disk failure on Windows (r1483781)
 
@@ -490,6 +684,9 @@ http://svn.apache.org/repos/asf/subversion/tags/1.7.9
     * fix segfault when using kwallet (r1421103)
     
   - Server-side bugfixes:
+      See CVE-2013-1845, CVE-2013-1846, CVE-2013-1847, CVE-2013-1849,
+      and CVE-2013-1884, and descriptive advisories at
+            http://subversion.apache.org/security/
     * svnserve will log the replayed rev not the low-water rev. (r1461278)
     * mod_dav_svn will omit some property values for activity urls (r1453780)
     * fix an assertion in mod_dav_svn when acting as a proxy on / (issue #4272)
@@ -1027,6 +1224,8 @@ http://svn.apache.org/repos/asf/subversion/tags/1.6.23
   - Server-side bugfixes:
     * fix FSFS repository corruption due to newline in filename (issue #4340)
     * fix svnserve exiting when a client connection is aborted (r1482759)
+            See CVE-2013-2112, and descriptive advisory at
+            http://subversion.apache.org/security/CVE-2013-2112-advisory.txt
 
   - Other tool improvements and bugfixes:
     * fix argument processing in contrib hook scripts (r1485350)
diff --git a/contrib/subversion/INSTALL b/contrib/subversion/INSTALL
index 55ca3445313..25f4e13ca1d 100644
--- a/contrib/subversion/INSTALL
+++ b/contrib/subversion/INSTALL
@@ -3,7 +3,7 @@
                           A Quick Guide
                ======================================
 
-$LastChangedDate: 2013-06-05 04:00:25 +0000 (Wed, 05 Jun 2013) $
+$LastChangedDate: 2013-09-27 06:57:44 +0000 (Fri, 27 Sep 2013) $
 
 
 Contents:
@@ -477,7 +477,7 @@ I.    INTRODUCTION
 
       13. SQLite  (REQUIRED)
 
-      Subversion 1.7 requires SQLite version 3.6.18 or above.  You can meet
+      Subversion 1.8 requires SQLite version 3.7.12 or above.  You can meet
       this dependency several ways:
         * Use an SQLite amalgamation file.
         * Specify an SQLite installation to use.
@@ -1263,7 +1263,8 @@ III.  BUILDING A SUBVERSION SERVER
 
       After the make install, the Subversion shared libraries are in
       /usr/local/lib/.  mod_dav_svn.so should be installed in
-      /usr/local/apache2/modules/.
+      /usr/local/libexec/ (or elsewhere, such as /usr/local/apache2/modules/,
+      if you passed --with-apache-libexecdir to configure).
 
 
       Section II.E explains how to build the server on Windows.
@@ -1287,8 +1288,9 @@ III.  BUILDING A SUBVERSION SERVER
       http://httpd.apache.org/docs-2.0/
 
       First, your httpd.conf needs to load the mod_dav_svn module.
-      Subversion's 'make install' target should automatically add this
-      line for you.  But if apache gives you an error like "Unknown
+      If you pass --enable-mod-activation to Subversion's configure,
+      'make install' target should automatically add this line for you.
+      In any case, if Apache HTTPD gives you an error like "Unknown
       DAV provider: svn", then you may want to verify that this line
       exists in your httpd.conf:
 
diff --git a/contrib/subversion/Makefile.in b/contrib/subversion/Makefile.in
index 1b5d9d8191a..ebee667f4ed 100644
--- a/contrib/subversion/Makefile.in
+++ b/contrib/subversion/Makefile.in
@@ -108,6 +108,7 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
 
 CC = @CC@
 CXX = @CXX@
+CPP = @CPP@
 EXEEXT = @EXEEXT@
 
 SHELL = @SHELL@
@@ -331,7 +332,7 @@ INSTALL_EXTRA_SWIG_RB=\
 # export an env variable so that the tests can run without being installed
 TEST_SHLIB_VAR_SWIG_RB=\
   if [ "@SVN_APR_SHLIB_PATH_VAR@" = "DYLD_LIBRARY_PATH" ]; then \
-    for d in $(SWIG_PY_DIR)/libsvn_swig_rb $(SWIG_PY_DIR)/../../../libsvn_*; do \
+    for d in $(SWIG_RB_DIR)/libsvn_swig_ruby $(SWIG_RB_DIR)/../../../libsvn_*; do \
       if [ -n "$$DYLD_LIBRARY_PATH" ]; then \
         @SVN_APR_SHLIB_PATH_VAR@="$$@SVN_APR_SHLIB_PATH_VAR@:$$d/.libs"; \
       else \
@@ -340,8 +341,8 @@ TEST_SHLIB_VAR_SWIG_RB=\
     done; \
     export @SVN_APR_SHLIB_PATH_VAR@; \
   fi;
- 
-APXS = @APXS@ 
+
+APXS = @APXS@
 
 PYTHON = @PYTHON@
 PERL = @PERL@
@@ -871,7 +872,7 @@ install-swig-rb-doc:
 
 # ctypes-python make targets
 ctypes-python: local-all
-	$(SHELL) $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_CONFIG)" "$(SVN_APRUTIL_CONFIG)"
+	$(SHELL) $(abs_srcdir)/build/run_ctypesgen.sh "$(LT_EXECUTE)" "$(CPPFLAGS)" "$(EXTRA_CTYPES_LDFLAGS)" "$(PYTHON)" "$(CTYPESGEN)" "$(abs_srcdir)" "$(abs_builddir)" "$(libdir)" "$(SVN_APR_CONFIG)" "$(SVN_APRUTIL_CONFIG)" "$(CPP)"
 
 install-ctypes-python: ctypes-python
 	cd $(CTYPES_PYTHON_SRC_DIR); \
diff --git a/contrib/subversion/build-outputs.mk b/contrib/subversion/build-outputs.mk
index 55bac4fb2e7..3e05d53144c 100644
--- a/contrib/subversion/build-outputs.mk
+++ b/contrib/subversion/build-outputs.mk
@@ -115,7 +115,7 @@ checksum_test_PATH = subversion/tests/libsvn_subr
 checksum_test_DEPS =  subversion/tests/libsvn_subr/checksum-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la
 checksum_test_OBJECTS = checksum-test.lo
 subversion/tests/libsvn_subr/checksum-test$(EXEEXT): $(checksum_test_DEPS)
-	cd subversion/tests/libsvn_subr && $(LINK) $(checksum_test_LDFLAGS) -o checksum-test$(EXEEXT)  $(checksum_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(LIBS)
+	cd subversion/tests/libsvn_subr && $(LINK) $(checksum_test_LDFLAGS) -o checksum-test$(EXEEXT)  $(checksum_test_OBJECTS) ../../../subversion/tests/libsvn_test-1.la ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(SVN_ZLIB_LIBS) $(LIBS)
 
 client_test_PATH = subversion/tests/libsvn_client
 client_test_DEPS =  subversion/tests/libsvn_client/client-test.lo subversion/tests/libsvn_test-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la
@@ -1977,7 +1977,7 @@ subversion/libsvn_client/compat_providers.lo: subversion/libsvn_client/compat_pr
 
 subversion/libsvn_client/copy.lo: subversion/libsvn_client/copy.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
 
-subversion/libsvn_client/copy_foreign.lo: subversion/libsvn_client/copy_foreign.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/copy_foreign.lo: subversion/libsvn_client/copy_foreign.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
 subversion/libsvn_client/ctx.lo: subversion/libsvn_client/ctx.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h
 
@@ -1985,17 +1985,17 @@ subversion/libsvn_client/delete.lo: subversion/libsvn_client/delete.c subversion
 
 subversion/libsvn_client/deprecated.lo: subversion/libsvn_client/deprecated.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
 
-subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/diff.lo: subversion/libsvn_client/diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_io_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
 subversion/libsvn_client/diff_local.lo: subversion/libsvn_client/diff_local.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
 subversion/libsvn_client/diff_summarize.lo: subversion/libsvn_client/diff_summarize.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h
 
-subversion/libsvn_client/export.lo: subversion/libsvn_client/export.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/export.lo: subversion/libsvn_client/export.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
 subversion/libsvn_client/externals.lo: subversion/libsvn_client/externals.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
-subversion/libsvn_client/import.lo: subversion/libsvn_client/import.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/import.lo: subversion/libsvn_client/import.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
 subversion/libsvn_client/info.lo: subversion/libsvn_client/info.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
@@ -2007,11 +2007,11 @@ subversion/libsvn_client/locking_commands.lo: subversion/libsvn_client/locking_c
 
 subversion/libsvn_client/log.lo: subversion/libsvn_client/log.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
-subversion/libsvn_client/merge.lo: subversion/libsvn_client/merge.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
+subversion/libsvn_client/merge.lo: subversion/libsvn_client/merge.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
 
 subversion/libsvn_client/mergeinfo.lo: subversion/libsvn_client/mergeinfo.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_magic.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/libsvn_client/mergeinfo.h subversion/svn_private_config.h
 
-subversion/libsvn_client/patch.lo: subversion/libsvn_client/patch.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/patch.lo: subversion/libsvn_client/patch.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_magic.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
 subversion/libsvn_client/prop_commands.lo: subversion/libsvn_client/prop_commands.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
@@ -2019,7 +2019,7 @@ subversion/libsvn_client/ra.lo: subversion/libsvn_client/ra.c subversion/include
 
 subversion/libsvn_client/relocate.lo: subversion/libsvn_client/relocate.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
-subversion/libsvn_client/repos_diff.lo: subversion/libsvn_client/repos_diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
+subversion/libsvn_client/repos_diff.lo: subversion/libsvn_client/repos_diff.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
 subversion/libsvn_client/resolved.lo: subversion/libsvn_client/resolved.c subversion/include/private/svn_client_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_magic.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_client/client.h subversion/svn_private_config.h
 
@@ -2133,13 +2133,13 @@ subversion/libsvn_fs_base/dag.lo: subversion/libsvn_fs_base/dag.c subversion/inc
 
 subversion/libsvn_fs_base/err.lo: subversion/libsvn_fs_base/err.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/id.h subversion/svn_private_config.h
 
-subversion/libsvn_fs_base/fs.lo: subversion/libsvn_fs_base/fs.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/uuid.h subversion/svn_private_config.h
+subversion/libsvn_fs_base/fs.lo: subversion/libsvn_fs_base/fs.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/checksum-reps-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/reps-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/strings-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/uuid.h subversion/svn_private_config.h
 
 subversion/libsvn_fs_base/id.lo: subversion/libsvn_fs_base/id.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/id.h
 
 subversion/libsvn_fs_base/key-gen.lo: subversion/libsvn_fs_base/key-gen.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_base/key-gen.h
 
-subversion/libsvn_fs_base/lock.lo: subversion/libsvn_fs_base/lock.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h
+subversion/libsvn_fs_base/lock.lo: subversion/libsvn_fs_base/lock.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/lock-tokens-table.h subversion/libsvn_fs_base/bdb/locks-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h
 
 subversion/libsvn_fs_base/node-rev.lo: subversion/libsvn_fs_base/node-rev.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/reps-strings.h subversion/libsvn_fs_base/trail.h subversion/svn_private_config.h
 
@@ -2151,15 +2151,15 @@ subversion/libsvn_fs_base/trail.lo: subversion/libsvn_fs_base/trail.c subversion
 
 subversion/libsvn_fs_base/tree.lo: subversion/libsvn_fs_base/tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/changes-table.h subversion/libsvn_fs_base/bdb/copies-table.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/miscellaneous-table.h subversion/libsvn_fs_base/bdb/node-origins-table.h subversion/libsvn_fs_base/bdb/nodes-table.h subversion/libsvn_fs_base/bdb/rev-table.h subversion/libsvn_fs_base/bdb/txn-table.h subversion/libsvn_fs_base/dag.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/key-gen.h subversion/libsvn_fs_base/lock.h subversion/libsvn_fs_base/node-rev.h subversion/libsvn_fs_base/revs-txns.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/tree.h subversion/svn_private_config.h
 
-subversion/libsvn_fs_base/util/fs_skels.lo: subversion/libsvn_fs_base/util/fs_skels.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h
+subversion/libsvn_fs_base/util/fs_skels.lo: subversion/libsvn_fs_base/util/fs_skels.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_skel.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/id.h subversion/libsvn_fs_base/util/fs_skels.h subversion/svn_private_config.h
 
 subversion/libsvn_fs_base/uuid.lo: subversion/libsvn_fs_base/uuid.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/bdb/uuids-table.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/libsvn_fs_base/trail.h subversion/libsvn_fs_base/uuid.h subversion/svn_private_config.h
 
-subversion/libsvn_fs_fs/caching.lo: subversion/libsvn_fs_fs/caching.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
+subversion/libsvn_fs_fs/caching.lo: subversion/libsvn_fs_fs/caching.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
 
 subversion/libsvn_fs_fs/dag.lo: subversion/libsvn_fs_fs/dag.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/key-gen.h subversion/libsvn_fs_fs/temp_serializer.h subversion/svn_private_config.h
 
-subversion/libsvn_fs_fs/fs.lo: subversion/libsvn_fs_fs/fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
+subversion/libsvn_fs_fs/fs.lo: subversion/libsvn_fs_fs/fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
 
 subversion/libsvn_fs_fs/fs_fs.lo: subversion/libsvn_fs_fs/fs_fs.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/key-gen.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/rep-cache.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
 
@@ -2171,9 +2171,9 @@ subversion/libsvn_fs_fs/lock.lo: subversion/libsvn_fs_fs/lock.c subversion/inclu
 
 subversion/libsvn_fs_fs/rep-cache.lo: subversion/libsvn_fs_fs/rep-cache.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/rep-cache-db.h subversion/libsvn_fs_fs/rep-cache.h subversion/svn_private_config.h
 
-subversion/libsvn_fs_fs/temp_serializer.lo: subversion/libsvn_fs_fs/temp_serializer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/temp_serializer.h
+subversion/libsvn_fs_fs/temp_serializer.lo: subversion/libsvn_fs_fs/temp_serializer.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_temp_serializer.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/temp_serializer.h
 
-subversion/libsvn_fs_fs/tree.lo: subversion/libsvn_fs_fs/tree.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/key-gen.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
+subversion/libsvn_fs_fs/tree.lo: subversion/libsvn_fs_fs/tree.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fs_private.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_mutex.h subversion/include/private/svn_named_atomic.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_fs/dag.h subversion/libsvn_fs_fs/fs.h subversion/libsvn_fs_fs/fs_fs.h subversion/libsvn_fs_fs/id.h subversion/libsvn_fs_fs/key-gen.h subversion/libsvn_fs_fs/lock.h subversion/libsvn_fs_fs/temp_serializer.h subversion/libsvn_fs_fs/tree.h subversion/svn_private_config.h
 
 subversion/libsvn_fs_util/fs-util.lo: subversion/libsvn_fs_util/fs-util.c subversion/include/private/svn_debug.h subversion/include/private/svn_fs_util.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_fs/fs-loader.h subversion/svn_private_config.h
 
@@ -2189,7 +2189,7 @@ subversion/libsvn_ra/ra_loader.lo: subversion/libsvn_ra/ra_loader.c subversion/i
 
 subversion/libsvn_ra/util.lo: subversion/libsvn_ra/util.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
 
-subversion/libsvn_ra_local/ra_plugin.lo: subversion/libsvn_ra_local/ra_plugin.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h
+subversion/libsvn_ra_local/ra_plugin.lo: subversion/libsvn_ra_local/ra_plugin.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h
 
 subversion/libsvn_ra_local/split_url.lo: subversion/libsvn_ra_local/split_url.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_local/ra_local.h subversion/svn_private_config.h
 
@@ -2237,7 +2237,7 @@ subversion/libsvn_ra_serf/util_error.lo: subversion/libsvn_ra_serf/util_error.c
 
 subversion/libsvn_ra_serf/xml.lo: subversion/libsvn_ra_serf/xml.c subversion/include/private/svn_dav_protocol.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dav.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra_serf/blncache.h subversion/libsvn_ra_serf/ra_serf.h subversion/svn_private_config.h
 
-subversion/libsvn_ra_svn/client.lo: subversion/libsvn_ra_svn/client.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h
+subversion/libsvn_ra_svn/client.lo: subversion/libsvn_ra_svn/client.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_ra/ra_loader.h subversion/libsvn_ra/wrapper_template.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h
 
 subversion/libsvn_ra_svn/cram.lo: subversion/libsvn_ra_svn/cram.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_ra_svn/ra_svn.h subversion/svn_private_config.h
 
@@ -2273,7 +2273,7 @@ subversion/libsvn_repos/load-fs-vtable.lo: subversion/libsvn_repos/load-fs-vtabl
 
 subversion/libsvn_repos/load.lo: subversion/libsvn_repos/load.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_mergeinfo_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
 
-subversion/libsvn_repos/log.lo: subversion/libsvn_repos/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
+subversion/libsvn_repos/log.lo: subversion/libsvn_repos/log.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
 
 subversion/libsvn_repos/node_tree.lo: subversion/libsvn_repos/node_tree.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
 
@@ -2281,7 +2281,7 @@ subversion/libsvn_repos/notify.lo: subversion/libsvn_repos/notify.c subversion/i
 
 subversion/libsvn_repos/replay.lo: subversion/libsvn_repos/replay.c subversion/include/private/svn_debug.h subversion/include/private/svn_delta_private.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_repos_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
 
-subversion/libsvn_repos/reporter.lo: subversion/libsvn_repos/reporter.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
+subversion/libsvn_repos/reporter.lo: subversion/libsvn_repos/reporter.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
 
 subversion/libsvn_repos/repos.lo: subversion/libsvn_repos/repos.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_repos_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/libsvn_repos/repos.h subversion/svn_private_config.h
 
@@ -2291,9 +2291,9 @@ subversion/libsvn_subr/adler32.lo: subversion/libsvn_subr/adler32.c subversion/i
 
 subversion/libsvn_subr/atomic.lo: subversion/libsvn_subr/atomic.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h
 
-subversion/libsvn_subr/auth.lo: subversion/libsvn_subr/auth.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h
+subversion/libsvn_subr/auth.lo: subversion/libsvn_subr/auth.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/auth.h subversion/svn_private_config.h
 
-subversion/libsvn_subr/base64.lo: subversion/libsvn_subr/base64.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
+subversion/libsvn_subr/base64.lo: subversion/libsvn_subr/base64.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h
 
 subversion/libsvn_subr/cache-inprocess.lo: subversion/libsvn_subr/cache-inprocess.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/cache.h subversion/svn_private_config.h
 
@@ -2303,9 +2303,9 @@ subversion/libsvn_subr/cache-memcache.lo: subversion/libsvn_subr/cache-memcache.
 
 subversion/libsvn_subr/cache.lo: subversion/libsvn_subr/cache.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/cache.h
 
-subversion/libsvn_subr/cache_config.lo: subversion/libsvn_subr/cache_config.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
+subversion/libsvn_subr/cache_config.lo: subversion/libsvn_subr/cache_config.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
 
-subversion/libsvn_subr/checksum.lo: subversion/libsvn_subr/checksum.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/md5.h subversion/libsvn_subr/sha1.h subversion/svn_private_config.h
+subversion/libsvn_subr/checksum.lo: subversion/libsvn_subr/checksum.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_subr/md5.h subversion/libsvn_subr/sha1.h subversion/svn_private_config.h
 
 subversion/libsvn_subr/cmdline.lo: subversion/libsvn_subr/cmdline.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/private/svn_utf_private.h subversion/include/svn_auth.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_nls.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_xml.h subversion/libsvn_subr/win32_crashrpt.h subversion/svn_private_config.h
 
@@ -2327,7 +2327,7 @@ subversion/libsvn_subr/date.lo: subversion/libsvn_subr/date.c subversion/include
 
 subversion/libsvn_subr/debug.lo: subversion/libsvn_subr/debug.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h
 
-subversion/libsvn_subr/deprecated.lo: subversion/libsvn_subr/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_subr/opt.h subversion/svn_private_config.h
+subversion/libsvn_subr/deprecated.lo: subversion/libsvn_subr/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_subr/opt.h subversion/svn_private_config.h
 
 subversion/libsvn_subr/dirent_uri.lo: subversion/libsvn_subr/dirent_uri.c subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/dirent_uri.h subversion/svn_private_config.h
 
@@ -2339,7 +2339,7 @@ subversion/libsvn_subr/error.lo: subversion/libsvn_subr/error.c subversion/inclu
 
 subversion/libsvn_subr/gpg_agent.lo: subversion/libsvn_subr/gpg_agent.c subversion/include/private/svn_auth_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
 
-subversion/libsvn_subr/hash.lo: subversion/libsvn_subr/hash.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
+subversion/libsvn_subr/hash.lo: subversion/libsvn_subr/hash.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h
 
 subversion/libsvn_subr/io.lo: subversion/libsvn_subr/io.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_io_private.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h
 
@@ -2355,7 +2355,7 @@ subversion/libsvn_subr/magic.lo: subversion/libsvn_subr/magic.c subversion/inclu
 
 subversion/libsvn_subr/md5.lo: subversion/libsvn_subr/md5.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_md5.h subversion/include/svn_types.h subversion/libsvn_subr/md5.h
 
-subversion/libsvn_subr/mergeinfo.lo: subversion/libsvn_subr/mergeinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
+subversion/libsvn_subr/mergeinfo.lo: subversion/libsvn_subr/mergeinfo.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svn_private_config.h
 
 subversion/libsvn_subr/mutex.lo: subversion/libsvn_subr/mutex.c subversion/include/private/svn_debug.h subversion/include/private/svn_mutex.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/svn_private_config.h
 
@@ -2371,7 +2371,7 @@ subversion/libsvn_subr/pool.lo: subversion/libsvn_subr/pool.c subversion/include
 
 subversion/libsvn_subr/prompt.lo: subversion/libsvn_subr/prompt.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
 
-subversion/libsvn_subr/properties.lo: subversion/libsvn_subr/properties.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h
+subversion/libsvn_subr/properties.lo: subversion/libsvn_subr/properties.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_props.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h
 
 subversion/libsvn_subr/pseudo_md5.lo: subversion/libsvn_subr/pseudo_md5.c subversion/include/private/svn_pseudo_md5.h
 
@@ -2385,7 +2385,7 @@ subversion/libsvn_subr/skel.lo: subversion/libsvn_subr/skel.c subversion/include
 
 subversion/libsvn_subr/sorts.lo: subversion/libsvn_subr/sorts.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h
 
-subversion/libsvn_subr/spillbuf.lo: subversion/libsvn_subr/spillbuf.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
+subversion/libsvn_subr/spillbuf.lo: subversion/libsvn_subr/spillbuf.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h
 
 subversion/libsvn_subr/sqlite.lo: subversion/libsvn_subr/sqlite.c subversion/include/private/svn_atomic.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_subr/internal_statements.h subversion/svn_private_config.h
 
@@ -2397,7 +2397,7 @@ subversion/libsvn_subr/ssl_client_cert_pw_providers.lo: subversion/libsvn_subr/s
 
 subversion/libsvn_subr/ssl_server_trust_providers.lo: subversion/libsvn_subr/ssl_server_trust_providers.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h
 
-subversion/libsvn_subr/stream.lo: subversion/libsvn_subr/stream.c subversion/include/private/svn_debug.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_error_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h
+subversion/libsvn_subr/stream.lo: subversion/libsvn_subr/stream.c subversion/include/private/svn_debug.h subversion/include/private/svn_eol_private.h subversion/include/private/svn_error_private.h subversion/include/private/svn_io_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h
 
 subversion/libsvn_subr/string.lo: subversion/libsvn_subr/string.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/svn_ctype.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
 
@@ -2441,7 +2441,7 @@ subversion/libsvn_wc/adm_crawler.lo: subversion/libsvn_wc/adm_crawler.c subversi
 
 subversion/libsvn_wc/adm_files.lo: subversion/libsvn_wc/adm_files.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
 
-subversion/libsvn_wc/adm_ops.lo: subversion/libsvn_wc/adm_ops.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/adm_ops.lo: subversion/libsvn_wc/adm_ops.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
 
 subversion/libsvn_wc/ambient_depth_filter_editor.lo: subversion/libsvn_wc/ambient_depth_filter_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
 
@@ -2457,15 +2457,15 @@ subversion/libsvn_wc/crop.lo: subversion/libsvn_wc/crop.c subversion/include/pri
 
 subversion/libsvn_wc/delete.lo: subversion/libsvn_wc/delete.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
 
-subversion/libsvn_wc/deprecated.lo: subversion/libsvn_wc/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/deprecated.lo: subversion/libsvn_wc/deprecated.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
 
-subversion/libsvn_wc/diff_editor.lo: subversion/libsvn_wc/diff_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
+subversion/libsvn_wc/diff_editor.lo: subversion/libsvn_wc/diff_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
 
 subversion/libsvn_wc/diff_local.lo: subversion/libsvn_wc/diff_local.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/diff.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
 
 subversion/libsvn_wc/entries.lo: subversion/libsvn_wc/entries.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
 
-subversion/libsvn_wc/externals.lo: subversion/libsvn_wc/externals.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/externals.lo: subversion/libsvn_wc/externals.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
 
 subversion/libsvn_wc/info.lo: subversion/libsvn_wc/info.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
 
@@ -2477,7 +2477,7 @@ subversion/libsvn_wc/node.lo: subversion/libsvn_wc/node.c subversion/include/pri
 
 subversion/libsvn_wc/old-and-busted.lo: subversion/libsvn_wc/old-and-busted.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/lock.h subversion/libsvn_wc/props.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
 
-subversion/libsvn_wc/props.lo: subversion/libsvn_wc/props.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/props.lo: subversion/libsvn_wc/props.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
 
 subversion/libsvn_wc/questions.lo: subversion/libsvn_wc/questions.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
 
@@ -2493,7 +2493,7 @@ subversion/libsvn_wc/translate.lo: subversion/libsvn_wc/translate.c subversion/i
 
 subversion/libsvn_wc/tree_conflicts.lo: subversion/libsvn_wc/tree_conflicts.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/svn_private_config.h
 
-subversion/libsvn_wc/update_editor.lo: subversion/libsvn_wc/update_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
+subversion/libsvn_wc/update_editor.lo: subversion/libsvn_wc/update_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_editor.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_subr_private.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/props.h subversion/libsvn_wc/translate.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
 
 subversion/libsvn_wc/upgrade.lo: subversion/libsvn_wc/upgrade.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_skel.h subversion/include/private/svn_sqlite.h subversion/include/private/svn_token.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/libsvn_wc/adm_files.h subversion/libsvn_wc/conflicts.h subversion/libsvn_wc/entries.h subversion/libsvn_wc/props.h subversion/libsvn_wc/tree_conflicts.h subversion/libsvn_wc/wc-queries.h subversion/libsvn_wc/wc.h subversion/libsvn_wc/wc_db.h subversion/libsvn_wc/workqueue.h subversion/svn_private_config.h
 
@@ -2659,7 +2659,7 @@ subversion/svn/mkdir-cmd.lo: subversion/svn/mkdir-cmd.c subversion/include/priva
 
 subversion/svn/move-cmd.lo: subversion/svn/move-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
 
-subversion/svn/notify.lo: subversion/svn/notify.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
+subversion/svn/notify.lo: subversion/svn/notify.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
 
 subversion/svn/patch-cmd.lo: subversion/svn/patch-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
 
@@ -2687,7 +2687,7 @@ subversion/svn/status-cmd.lo: subversion/svn/status-cmd.c subversion/include/pri
 
 subversion/svn/status.lo: subversion/svn/status.c subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/include/svn_xml.h subversion/svn/cl-conflicts.h subversion/svn/cl.h subversion/svn_private_config.h
 
-subversion/svn/svn.lo: subversion/svn/svn.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
+subversion/svn/svn.lo: subversion/svn/svn.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
 
 subversion/svn/switch-cmd.lo: subversion/svn/switch-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_wc.h subversion/svn/cl.h subversion/svn_private_config.h
 
@@ -2701,13 +2701,13 @@ subversion/svn/util.lo: subversion/svn/util.c subversion/include/private/svn_cli
 
 subversion/svnadmin/svnadmin.lo: subversion/svnadmin/svnadmin.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h
 
-subversion/svndumpfilter/svndumpfilter.lo: subversion/svndumpfilter/svndumpfilter.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h
+subversion/svndumpfilter/svndumpfilter.lo: subversion/svndumpfilter/svndumpfilter.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h
 
-subversion/svnlook/svnlook.lo: subversion/svnlook/svnlook.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_io_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h
+subversion/svnlook/svnlook.lo: subversion/svnlook/svnlook.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_private.h subversion/include/private/svn_fspath.h subversion/include/private/svn_io_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_repos.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/svn_private_config.h
 
-subversion/svnmucc/svnmucc.lo: subversion/svnmucc/svnmucc.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/svnmucc/svnmucc.lo: subversion/svnmucc/svnmucc.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
 
-subversion/svnrdump/dump_editor.lo: subversion/svnrdump/dump_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/svnrdump/svnrdump.h
+subversion/svnrdump/dump_editor.lo: subversion/svnrdump/dump_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_editor.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/svnrdump/svnrdump.h
 
 subversion/svnrdump/load_editor.lo: subversion/svnrdump/load_editor.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_repos_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnrdump/svnrdump.h
 
@@ -2721,15 +2721,15 @@ subversion/svnserve/log-escape.lo: subversion/svnserve/log-escape.c subversion/i
 
 subversion/svnserve/serve.lo: subversion/svnserve/serve.c subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_fspath.h subversion/include/private/svn_log.h subversion/include/private/svn_mergeinfo_private.h subversion/include/private/svn_ra_svn_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_compat.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_time.h subversion/include/svn_types.h subversion/include/svn_user.h subversion/svn_private_config.h subversion/svnserve/server.h
 
-subversion/svnserve/svnserve.lo: subversion/svnserve/svnserve.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnserve/server.h subversion/svnserve/winservice.h
+subversion/svnserve/svnserve.lo: subversion/svnserve/svnserve.c subversion/include/private/svn_atomic.h subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra_svn.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnserve/server.h subversion/svnserve/winservice.h
 
 subversion/svnserve/winservice.lo: subversion/svnserve/winservice.c subversion/include/private/svn_debug.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/svnserve/winservice.h
 
-subversion/svnsync/svnsync.lo: subversion/svnsync/svnsync.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnsync/sync.h
+subversion/svnsync/svnsync.lo: subversion/svnsync/svnsync.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_editor.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_ra_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/svn_private_config.h subversion/svnsync/sync.h
 
 subversion/svnsync/sync.lo: subversion/svnsync/sync.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_props.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h subversion/svnsync/sync.h
 
-subversion/svnversion/svnversion.lo: subversion/svnversion/svnversion.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
+subversion/svnversion/svnversion.lo: subversion/svnversion/svnversion.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_opt_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
 
 subversion/tests/cmdline/atomic-ra-revprop-change.lo: subversion/tests/cmdline/atomic-ra-revprop-change.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h
 
@@ -2743,7 +2743,7 @@ subversion/tests/libsvn_delta/svndiff-test.lo: subversion/tests/libsvn_delta/svn
 
 subversion/tests/libsvn_delta/vdelta-test.lo: subversion/tests/libsvn_delta/vdelta-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/libsvn_delta/delta.h subversion/tests/libsvn_delta/delta-window-test.h subversion/tests/svn_test.h
 
-subversion/tests/libsvn_delta/window-test.lo: subversion/tests/libsvn_delta/window-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
+subversion/tests/libsvn_delta/window-test.lo: subversion/tests/libsvn_delta/window-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/tests/svn_test.h
 
 subversion/tests/libsvn_diff/diff-diff3-test.lo: subversion/tests/libsvn_diff/diff-diff3-test.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h
 
@@ -2805,7 +2805,7 @@ subversion/tests/libsvn_subr/revision-test.lo: subversion/tests/libsvn_subr/revi
 
 subversion/tests/libsvn_subr/skel-test.lo: subversion/tests/libsvn_subr/skel-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_skel.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
 
-subversion/tests/libsvn_subr/spillbuf-test.lo: subversion/tests/libsvn_subr/spillbuf-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/tests/svn_test.h
+subversion/tests/libsvn_subr/spillbuf-test.lo: subversion/tests/libsvn_subr/spillbuf-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/tests/svn_test.h
 
 subversion/tests/libsvn_subr/stream-test.lo: subversion/tests/libsvn_subr/stream-test.c subversion/include/private/svn_debug.h subversion/include/private/svn_io_private.h subversion/include/svn_base64.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_subst.h subversion/include/svn_types.h subversion/tests/svn_test.h
 
@@ -2851,7 +2851,7 @@ subversion/tests/libsvn_wc/wc-test.lo: subversion/tests/libsvn_wc/wc-test.c subv
 
 subversion/tests/svn_test_fs.lo: subversion/tests/svn_test_fs.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/tests/svn_test.h subversion/tests/svn_test_fs.h
 
-subversion/tests/svn_test_main.lo: subversion/tests/svn_test_main.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/svn_private_config.h subversion/tests/svn_test.h
+subversion/tests/svn_test_main.lo: subversion/tests/svn_test_main.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_ctype.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/svn_private_config.h subversion/tests/svn_test.h
 
 tools/client-side/svn-bench/help-cmd.lo: tools/client-side/svn-bench/help-cmd.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_client.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h tools/client-side/svn-bench/cl.h
 
@@ -2869,7 +2869,7 @@ tools/client-side/svn-bench/util.lo: tools/client-side/svn-bench/util.c subversi
 
 tools/dev/fsfs-access-map.lo: tools/dev/fsfs-access-map.c subversion/include/private/svn_debug.h subversion/include/private/svn_string_private.h subversion/include/svn_checksum.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
 
-tools/dev/fsfs-reorg.lo: tools/dev/fsfs-reorg.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h
+tools/dev/fsfs-reorg.lo: tools/dev/fsfs-reorg.c subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h
 
 tools/dev/svnraisetreeconflict/svnraisetreeconflict.lo: tools/dev/svnraisetreeconflict/svnraisetreeconflict.c subversion/include/private/svn_cmdline_private.h subversion/include/private/svn_debug.h subversion/include/private/svn_diff_tree.h subversion/include/private/svn_wc_private.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_opt.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_ra.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h subversion/include/svn_wc.h subversion/svn_private_config.h
 
@@ -2879,9 +2879,9 @@ tools/diff/diff3.lo: tools/diff/diff3.c subversion/include/private/svn_debug.h s
 
 tools/diff/diff4.lo: tools/diff/diff4.c subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_diff.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h
 
-tools/server-side/fsfs-stats.lo: tools/server-side/fsfs-stats.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h
+tools/server-side/fsfs-stats.lo: tools/server-side/fsfs-stats.c subversion/include/private/svn_cache.h subversion/include/private/svn_debug.h subversion/include/private/svn_dep_compat.h subversion/include/private/svn_string_private.h subversion/include/private/svn_subr_private.h subversion/include/svn_cache_config.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_diff.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_hash.h subversion/include/svn_io.h subversion/include/svn_iter.h subversion/include/svn_pools.h subversion/include/svn_sorts.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h subversion/include/svn_version.h
 
-tools/server-side/mod_dontdothat/mod_dontdothat.lo: tools/server-side/mod_dontdothat/mod_dontdothat.c subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_string.h subversion/include/svn_types.h
+tools/server-side/mod_dontdothat/mod_dontdothat.lo: tools/server-side/mod_dontdothat/mod_dontdothat.c subversion/include/mod_dav_svn.h subversion/include/private/svn_debug.h subversion/include/private/svn_fspath.h subversion/include/svn_checksum.h subversion/include/svn_config.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_io.h subversion/include/svn_path.h subversion/include/svn_string.h subversion/include/svn_types.h
 	if $(INSTALL_APACHE_MODS) ; then $(COMPILE_APACHE_MOD) $(canonicalized_srcdir)tools/server-side/mod_dontdothat/mod_dontdothat.c ; else echo "fake" > tools/server-side/mod_dontdothat/mod_dontdothat.lo ; fi
 
 tools/server-side/svn-populate-node-origins-index.lo: tools/server-side/svn-populate-node-origins-index.c subversion/include/private/svn_debug.h subversion/include/svn_auth.h subversion/include/svn_checksum.h subversion/include/svn_cmdline.h subversion/include/svn_config.h subversion/include/svn_delta.h subversion/include/svn_dirent_uri.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_repos.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_utf.h
diff --git a/contrib/subversion/build.conf b/contrib/subversion/build.conf
index fd620146f32..5a3ee4756e3 100644
--- a/contrib/subversion/build.conf
+++ b/contrib/subversion/build.conf
@@ -325,7 +325,7 @@ install = fsmod-lib
 path = subversion/libsvn_subr
 libs = aprutil apriconv apr xml zlib apr_memcache sqlite magic
 msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
-            crypt32.lib version.lib psapi.lib
+            crypt32.lib version.lib
 msvc-export = 
         svn_auth.h svn_base64.h svn_cache_config.h svn_checksum.h svn_cmdline.h
         svn_compat.h svn_config.h svn_ctype.h svn_dirent_uri.h svn_dso.h 
@@ -766,7 +766,7 @@ type = exe
 path = subversion/tests/libsvn_subr
 sources = checksum-test.c
 install = test
-libs = libsvn_test libsvn_subr apr
+libs = libsvn_test libsvn_subr apr zlib
 
 [compat-test]
 description = Test compatibility functions
@@ -1263,13 +1263,13 @@ lang = python
 [__SWIG_PERL__]
 type = swig_project
 path = build/win32
-libs = swig_client swig_delta swig_fs swig_ra swig_repos swig_wc swig_core
+libs = swig_client swig_delta swig_diff swig_fs swig_ra swig_repos swig_wc swig_core
 lang = perl
 
 [__SWIG_RUBY__]
 type = swig_project
 path = build/win32
-libs = swig_client swig_delta swig_fs swig_ra swig_repos swig_wc swig_core
+libs = swig_client swig_delta swig_diff swig_fs swig_ra swig_repos swig_wc swig_core
 lang = ruby
 
 [__JAVAHL__]
diff --git a/contrib/subversion/configure b/contrib/subversion/configure
index fd905fb3a1a..f3a6901e267 100755
--- a/contrib/subversion/configure
+++ b/contrib/subversion/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for subversion 1.8.1.
+# Generated by GNU Autoconf 2.69 for subversion 1.8.5.
 #
 # Report bugs to <http://subversion.apache.org/>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='subversion'
 PACKAGE_TARNAME='subversion'
-PACKAGE_VERSION='1.8.1'
-PACKAGE_STRING='subversion 1.8.1'
+PACKAGE_VERSION='1.8.5'
+PACKAGE_STRING='subversion 1.8.5'
 PACKAGE_BUGREPORT='http://subversion.apache.org/'
 PACKAGE_URL=''
 
@@ -1456,7 +1456,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 subversion 1.8.1 to adapt to many kinds of systems.
+\`configure' configures subversion 1.8.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1522,7 +1522,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of subversion 1.8.1:";;
+     short | recursive ) echo "Configuration of subversion 1.8.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1736,7 +1736,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-subversion configure 1.8.1
+subversion configure 1.8.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2280,7 +2280,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 subversion $as_me 1.8.1, which was
+It was created by subversion $as_me 1.8.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2660,8 +2660,8 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.8.1" >&5
-$as_echo "$as_me: Configuring Subversion 1.8.1" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Configuring Subversion 1.8.5" >&5
+$as_echo "$as_me: Configuring Subversion 1.8.5" >&6;}
 
 abs_srcdir="`cd $srcdir && pwd`"
 
@@ -21158,43 +21158,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
 $as_echo "yes" >&6; }
 
 
-else
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    CFLAGS="$_svn_xxflags__save"
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-  _svn_xxflags__save="$CFLAGS"
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC accepts -fwhole-program" >&5
-$as_echo_n "checking if $CC accepts -fwhole-program... " >&6; }
-  CFLAGS="-fwhole-program $CFLAGS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
 else
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -21501,43 +21464,6 @@ if ac_fn_cxx_try_compile "$LINENO"; then :
 $as_echo "yes" >&6; }
 
 
-else
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    CXXFLAGS="$_svn_xxflags__save"
-
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-  _svn_xxflags__save="$CXXFLAGS"
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX accepts -fwhole-program" >&5
-$as_echo_n "checking if $CXX accepts -fwhole-program... " >&6; }
-  CXXFLAGS="-fwhole-program $CXXFLAGS"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-
 else
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -25736,7 +25662,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 subversion $as_me 1.8.1, which was
+This file was extended by subversion $as_me 1.8.5, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -25802,7 +25728,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="\\
-subversion config.status 1.8.1
+subversion config.status 1.8.5
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/contrib/subversion/configure.ac b/contrib/subversion/configure.ac
index 169b34bc013..a2704ad95b9 100644
--- a/contrib/subversion/configure.ac
+++ b/contrib/subversion/configure.ac
@@ -1089,7 +1089,6 @@ if test "$enable_optimization" = "yes"; then
             SVN_CFLAGS_ADD_IFELSE([-O])])])])
       SVN_CFLAGS_ADD_IFELSE([-Wno-clobbered])
       SVN_CFLAGS_ADD_IFELSE([-flto])
-      SVN_CFLAGS_ADD_IFELSE([-fwhole-program])
     fi
   fi
   if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"]; then
@@ -1106,7 +1105,6 @@ if test "$enable_optimization" = "yes"; then
             SVN_CXXFLAGS_ADD_IFELSE([-O])])])])
       SVN_CXXFLAGS_ADD_IFELSE([-Wno-clobbered])
       SVN_CXXFLAGS_ADD_IFELSE([-flto])
-      SVN_CXXFLAGS_ADD_IFELSE([-fwhole-program])
     fi
   fi
 elif test "$enable_optimization" = "no"; then
diff --git a/contrib/subversion/subversion/include/private/svn_client_private.h b/contrib/subversion/subversion/include/private/svn_client_private.h
index 3e6efb56dbc..91ea6476b88 100644
--- a/contrib/subversion/subversion/include/private/svn_client_private.h
+++ b/contrib/subversion/subversion/include/private/svn_client_private.h
@@ -306,6 +306,11 @@ svn_client__copy_foreign(const char *url,
  * The keys for the subtree mergeinfo are the repository root-relative
  * paths of TARGET_PATH_OR_URL and/or its subtrees, regardless of whether
  * TARGET_PATH_OR_URL is a URL or WC path.
+ *
+ * If RA_SESSION is not NULL, use it to obtain merge information instead of
+ * opening a new session. The session might be reparented after usage, so
+ * callers should reparent the session back to their original location if
+ * needed.
  */
 svn_error_t *
 svn_client__mergeinfo_log(svn_boolean_t finding_merged,
@@ -322,6 +327,7 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
                           svn_depth_t depth,
                           const apr_array_header_t *revprops,
                           svn_client_ctx_t *ctx,
+                          svn_ra_session_t *ra_session,
                           apr_pool_t *result_pool,
                           apr_pool_t *scratch_pool);
 
diff --git a/contrib/subversion/subversion/include/private/svn_subr_private.h b/contrib/subversion/subversion/include/private/svn_subr_private.h
index a45e6644a6f..30fbbf264c9 100644
--- a/contrib/subversion/subversion/include/private/svn_subr_private.h
+++ b/contrib/subversion/subversion/include/private/svn_subr_private.h
@@ -26,6 +26,7 @@
 
 #include "svn_types.h"
 #include "svn_io.h"
+#include "svn_version.h"
 
 
 #ifdef __cplusplus
@@ -331,6 +332,18 @@ svn_version__at_least(svn_version_t *version,
                       int minor,
                       int patch);
 
+/** Like svn_ver_check_list(), but with a @a comparator parameter.
+ * Private backport of svn_ver_check_list2() from trunk.
+ */
+svn_error_t *
+svn_ver__check_list2(const svn_version_t *my_version,
+                     const svn_version_checklist_t *checklist,
+                     svn_boolean_t (*comparator)(const svn_version_t *,
+                                                 const svn_version_t *));
+
+/** To minimize merge churn in callers, alias the trunk name privately. */
+#define svn_ver_check_list2 svn_ver__check_list2
+
 /** @} */
 
 #ifdef __cplusplus
diff --git a/contrib/subversion/subversion/include/svn_config.h b/contrib/subversion/subversion/include/svn_config.h
index c5d69762785..be8ec4cdb98 100644
--- a/contrib/subversion/subversion/include/svn_config.h
+++ b/contrib/subversion/subversion/include/svn_config.h
@@ -732,6 +732,12 @@ typedef svn_error_t *
  * under @a config_dir.  If the callback sets its delete_cred return
  * flag, delete the associated credential.
  *
+ * If @a config_dir is not NULL, it must point to an alternative
+ * config directory location. If it is NULL, the default location
+ * is used.
+ *
+ * @note @a config_dir may only be NULL in 1.8.2 and later.
+ *
  * @note Removing credentials from the config-based disk store will
  * not purge them from any open svn_auth_baton_t instance.  Consider
  * using svn_auth_forget_credentials() -- from the @a cleanup_func,
diff --git a/contrib/subversion/subversion/include/svn_types.h b/contrib/subversion/subversion/include/svn_types.h
index 6b3a08741fa..1ad21942e6f 100644
--- a/contrib/subversion/subversion/include/svn_types.h
+++ b/contrib/subversion/subversion/include/svn_types.h
@@ -219,6 +219,16 @@ svn__apr_hash_index_val(const apr_hash_index_t *hi);
                       || ((s) == APR_OS_START_SYSERR + ERROR_INVALID_NAME))
 #endif
 
+/** On Windows, APR_STATUS_IS_EPIPE does not include ERROR_NO_DATA error.
+ * So we include it.*/
+/* ### These fixes should go into APR. */
+#ifndef WIN32
+#define SVN__APR_STATUS_IS_EPIPE(s)  APR_STATUS_IS_EPIPE(s)
+#else
+#define SVN__APR_STATUS_IS_EPIPE(s)  (APR_STATUS_IS_EPIPE(s) \
+                      || ((s) == APR_OS_START_SYSERR + ERROR_NO_DATA))
+#endif
+
 /** @} */
 
 
diff --git a/contrib/subversion/subversion/include/svn_version.h b/contrib/subversion/subversion/include/svn_version.h
index d466d84e984..d516a18ad91 100644
--- a/contrib/subversion/subversion/include/svn_version.h
+++ b/contrib/subversion/subversion/include/svn_version.h
@@ -72,7 +72,7 @@ extern "C" {
  *
  * @since New in 1.1.
  */
-#define SVN_VER_PATCH      1
+#define SVN_VER_PATCH      5
 
 
 /** @deprecated Provided for backward compatibility with the 1.0 API. */
@@ -95,7 +95,7 @@ extern "C" {
  *
  * Always change this at the same time as SVN_VER_NUMTAG.
  */
-#define SVN_VER_TAG        " (r1503906)"
+#define SVN_VER_TAG        " (r1542147)"
 
 
 /** Number tag: a string describing the version.
@@ -121,7 +121,7 @@ extern "C" {
  * When rolling a tarball, we automatically replace it with what we
  * guess to be the correct revision number.
  */
-#define SVN_VER_REVISION   1503906
+#define SVN_VER_REVISION   1542147
 
 
 /* Version strings composed from the above definitions. */
diff --git a/contrib/subversion/subversion/libsvn_client/commit.c b/contrib/subversion/subversion/libsvn_client/commit.c
index 6b308855821..07fdce19cdd 100644
--- a/contrib/subversion/subversion/libsvn_client/commit.c
+++ b/contrib/subversion/subversion/libsvn_client/commit.c
@@ -999,9 +999,22 @@ svn_client_commit6(const apr_array_header_t *targets,
     }
 
  cleanup:
-  /* Sleep to ensure timestamp integrity. */
+  /* Sleep to ensure timestamp integrity.  BASE_ABSPATH may have been
+     removed by the commit or it may the common ancestor of multiple
+     working copies. */
   if (timestamp_sleep)
-    svn_io_sleep_for_timestamps(base_abspath, pool);
+    {
+      const char *wcroot_abspath;
+      svn_error_t *err = svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx,
+                                            base_abspath, pool, pool);
+      if (err)
+        {
+          svn_error_clear(err);
+          wcroot_abspath = NULL;
+        }
+
+      svn_io_sleep_for_timestamps(wcroot_abspath, pool);
+    }
 
   /* Abort the commit if it is still in progress. */
   svn_pool_clear(iterpool); /* Close open handles before aborting */
diff --git a/contrib/subversion/subversion/libsvn_client/externals.c b/contrib/subversion/subversion/libsvn_client/externals.c
index 30748ea6af6..e572dc7b3f0 100644
--- a/contrib/subversion/subversion/libsvn_client/externals.c
+++ b/contrib/subversion/subversion/libsvn_client/externals.c
@@ -737,7 +737,7 @@ handle_external_item_change(svn_client_ctx_t *ctx,
   switch (ext_kind)
     {
       case svn_node_dir:
-        SVN_ERR(switch_dir_external(local_abspath, new_url,
+        SVN_ERR(switch_dir_external(local_abspath, new_loc->url,
                                     &(new_item->peg_revision),
                                     &(new_item->revision),
                                     parent_dir_abspath,
diff --git a/contrib/subversion/subversion/libsvn_client/merge.c b/contrib/subversion/subversion/libsvn_client/merge.c
index 17a5d23f5c4..cb07f8303c2 100644
--- a/contrib/subversion/subversion/libsvn_client/merge.c
+++ b/contrib/subversion/subversion/libsvn_client/merge.c
@@ -10716,7 +10716,7 @@ log_find_operative_revs(void *baton,
 
           suffix = svn_relpath_skip_ancestor(subtree_missing_this_rev,
                                              source_rel_path);
-          if (suffix)
+          if (suffix && suffix[0] != '\0')
             {
               missing_path = apr_pstrmemdup(pool, path,
                                             strlen(path) - strlen(suffix) - 1);
@@ -12051,11 +12051,15 @@ short_circuit_mergeinfo_log(svn_mergeinfo_catalog_t *target_mergeinfo_cat,
                             svn_log_entry_receiver_t receiver,
                             svn_revnum_t *revision,
                             svn_client_ctx_t *ctx,
+                            svn_ra_session_t *ra_session,
                             apr_pool_t *result_pool,
                             apr_pool_t *scratch_pool)
 {
   apr_array_header_t *revprops;
   svn_error_t *err;
+  const char *session_url;
+
+  SVN_ERR(svn_ra_get_session_url(ra_session, &session_url, scratch_pool));
 
   revprops = apr_array_make(scratch_pool, 0, sizeof(const char *));
   err = svn_client__mergeinfo_log(finding_merged,
@@ -12068,8 +12072,12 @@ short_circuit_mergeinfo_log(svn_mergeinfo_catalog_t *target_mergeinfo_cat,
                                   source_end_revision,
                                   receiver, revision,
                                   TRUE, svn_depth_infinity,
-                                  revprops, ctx, result_pool,
-                                  scratch_pool);
+                                  revprops, ctx, ra_session,
+                                  result_pool, scratch_pool);
+
+  err = svn_error_compose_create(
+                  err,
+                  svn_ra_reparent(ra_session, session_url, scratch_pool));
 
   if (err)
     {
@@ -12133,6 +12141,7 @@ find_last_merged_location(svn_client__pathrev_t **base_p,
                           const branch_history_t *source_branch,
                           svn_client__pathrev_t *target,
                           svn_client_ctx_t *ctx,
+                          svn_ra_session_t *ra_session,
                           apr_pool_t *result_pool,
                           apr_pool_t *scratch_pool)
 {
@@ -12160,7 +12169,8 @@ find_last_merged_location(svn_client__pathrev_t **base_p,
                                       &source_end_rev, &source_start_rev,
                                       operative_rev_receiver,
                                       &youngest_merged_rev,
-                                      ctx, result_pool, scratch_pool));
+                                      ctx, ra_session,
+                                      result_pool, scratch_pool));
 
   if (!SVN_IS_VALID_REVNUM(youngest_merged_rev))
     {
@@ -12195,7 +12205,8 @@ find_last_merged_location(svn_client__pathrev_t **base_p,
                                           &source_start_rev, &source_end_rev,
                                           operative_rev_receiver,
                                           &oldest_eligible_rev,
-                                          ctx, scratch_pool, scratch_pool));
+                                          ctx, ra_session,
+                                          scratch_pool, scratch_pool));
 
       /* If there are revisions eligible for merging, use the oldest one
          to calculate the base.  Otherwise there are no operative revisions
@@ -12249,7 +12260,9 @@ find_base_on_source(svn_client__pathrev_t **base_p,
                                     s_t->yca,
                                     &s_t->source_branch,
                                     s_t->target_branch.tip,
-                                    ctx, result_pool, scratch_pool));
+                                    ctx,
+                                    s_t->source_ra_session,
+                                    result_pool, scratch_pool));
   return SVN_NO_ERROR;
 }
 
@@ -12282,7 +12295,9 @@ find_base_on_target(svn_client__pathrev_t **base_p,
                                     s_t->yca,
                                     &s_t->target_branch,
                                     s_t->source,
-                                    ctx, result_pool, scratch_pool));
+                                    ctx,
+                                    s_t->target_ra_session,
+                                    result_pool, scratch_pool));
 
   return SVN_NO_ERROR;
 }
diff --git a/contrib/subversion/subversion/libsvn_client/mergeinfo.c b/contrib/subversion/subversion/libsvn_client/mergeinfo.c
index 6dd34343e0d..2d277f5f616 100644
--- a/contrib/subversion/subversion/libsvn_client/mergeinfo.c
+++ b/contrib/subversion/subversion/libsvn_client/mergeinfo.c
@@ -1021,6 +1021,11 @@ svn_client__elide_mergeinfo(const char *target_abspath,
    Set *REPOS_ROOT to the root URL of the repository associated with
    PATH_OR_URL.
 
+   If RA_SESSION is NOT NULL and PATH_OR_URL refers to a URL, RA_SESSION
+   (which must be of the repository containing PATH_OR_URL) will be used
+   instead of a temporary RA session. Caller is responsible for reparenting
+   the session if it wants to use it after the call.
+
    Allocate *MERGEINFO_CATALOG and all its contents in RESULT_POOL.  Use
    SCRATCH_POOL for all temporary allocations.
 
@@ -1034,17 +1039,30 @@ get_mergeinfo(svn_mergeinfo_catalog_t *mergeinfo_catalog,
               svn_boolean_t include_descendants,
               svn_boolean_t ignore_invalid_mergeinfo,
               svn_client_ctx_t *ctx,
+              svn_ra_session_t *ra_session,
               apr_pool_t *result_pool,
               apr_pool_t *scratch_pool)
 {
-  svn_ra_session_t *ra_session;
   const char *local_abspath;
   svn_boolean_t use_url = svn_path_is_url(path_or_url);
   svn_client__pathrev_t *peg_loc;
 
-  SVN_ERR(svn_client__ra_session_from_path2(&ra_session, &peg_loc,
-                                            path_or_url, NULL, peg_revision,
-                                            peg_revision, ctx, scratch_pool));
+  if (ra_session && svn_path_is_url(path_or_url))
+    {
+      SVN_ERR(svn_ra_reparent(ra_session, path_or_url, scratch_pool));
+      SVN_ERR(svn_client__resolve_rev_and_url(&peg_loc, ra_session,
+                                              path_or_url,
+                                              peg_revision,
+                                              peg_revision,
+                                              ctx, scratch_pool));
+    }
+  else
+    {
+      SVN_ERR(svn_client__ra_session_from_path2(&ra_session, &peg_loc,
+                                                path_or_url, NULL,
+                                                peg_revision,
+                                                peg_revision, ctx, scratch_pool));
+    }
 
   /* If PATH_OR_URL is as working copy path determine if we will need to
      contact the repository for the requested PEG_REVISION. */
@@ -1064,10 +1082,6 @@ get_mergeinfo(svn_mergeinfo_catalog_t *mergeinfo_catalog,
       }
     }
 
-  /* Check server Merge Tracking capability. */
-  SVN_ERR(svn_ra__assert_mergeinfo_capable_server(ra_session, path_or_url,
-                                                  scratch_pool));
-
   SVN_ERR(svn_ra_get_repos_root2(ra_session, repos_root, result_pool));
 
   if (use_url)
@@ -1391,17 +1405,21 @@ filter_log_entry_with_rangelist(void *baton,
              obviously back.  If it was added or replaced it's still around
              possibly it was replaced one or more times, but it's back now.
              Regardless, LOG_ENTRY->REVISION is *not* an eligible revision! */
-          if (ancestor_is_self /* Explicit mergeinfo on TARGET_PATH_AFFECTED */
+          if (nearest_ancestor_mergeinfo &&
+              ancestor_is_self /* Explicit mergeinfo on TARGET_PATH_AFFECTED */
               && (change->action != 'M'))
             {
               svn_rangelist_t *rangelist =
                   svn_hash_gets(nearest_ancestor_mergeinfo, path);
-              svn_merge_range_t *youngest_range = APR_ARRAY_IDX(
-                rangelist, rangelist->nelts - 1, svn_merge_range_t *);
+              if (rangelist)
+                {
+                  svn_merge_range_t *youngest_range = APR_ARRAY_IDX(
+                    rangelist, rangelist->nelts - 1, svn_merge_range_t *);
 
-              if (youngest_range
-                  && (youngest_range->end > log_entry->revision))
-                continue;
+                  if (youngest_range
+                      && (youngest_range->end > log_entry->revision))
+                    continue;
+                }
             }
 
           if (nearest_ancestor_mergeinfo)
@@ -1496,33 +1514,22 @@ logs_for_mergeinfo_rangelist(const char *source_url,
                              svn_log_entry_receiver_t log_receiver,
                              void *log_receiver_baton,
                              svn_client_ctx_t *ctx,
+                             svn_ra_session_t *ra_session,
                              apr_pool_t *scratch_pool)
 {
-  apr_array_header_t *target;
   svn_merge_range_t *oldest_range, *youngest_range;
-  apr_array_header_t *revision_ranges;
-  svn_opt_revision_t oldest_rev, youngest_rev;
+  svn_revnum_t oldest_rev, youngest_rev;
   struct filter_log_entry_baton_t fleb;
 
   if (! rangelist->nelts)
     return SVN_NO_ERROR;
 
-  /* Sort the rangelist. */
-  qsort(rangelist->elts, rangelist->nelts,
-        rangelist->elt_size, svn_sort_compare_ranges);
-
-  /* Build a single-member log target list using SOURCE_URL. */
-  target = apr_array_make(scratch_pool, 1, sizeof(const char *));
-  APR_ARRAY_PUSH(target, const char *) = source_url;
-
   /* Calculate and construct the bounds of our log request. */
   youngest_range = APR_ARRAY_IDX(rangelist, rangelist->nelts - 1,
                                  svn_merge_range_t *);
-  youngest_rev.kind = svn_opt_revision_number;
-  youngest_rev.value.number = youngest_range->end;
+  youngest_rev = youngest_range->end;
   oldest_range = APR_ARRAY_IDX(rangelist, 0, svn_merge_range_t *);
-  oldest_rev.kind = svn_opt_revision_number;
-  oldest_rev.value.number = oldest_range->start;
+  oldest_rev = oldest_range->start;
 
   if (! target_mergeinfo_catalog)
     target_mergeinfo_catalog = apr_hash_make(scratch_pool);
@@ -1547,19 +1554,29 @@ logs_for_mergeinfo_rangelist(const char *source_url,
   fleb.log_receiver_baton = log_receiver_baton;
   fleb.ctx = ctx;
 
-  /* Drive the log. */
-  revision_ranges = apr_array_make(scratch_pool, 1,
-                                   sizeof(svn_opt_revision_range_t *));
-  if (oldest_revs_first)
-    APR_ARRAY_PUSH(revision_ranges, svn_opt_revision_range_t *)
-      = svn_opt__revision_range_create(&oldest_rev, &youngest_rev, scratch_pool);
+  if (!ra_session)
+    SVN_ERR(svn_client__open_ra_session_internal(&ra_session, NULL, source_url,
+                                                 NULL, NULL, FALSE, FALSE, ctx,
+                                                 scratch_pool, scratch_pool));
   else
-    APR_ARRAY_PUSH(revision_ranges, svn_opt_revision_range_t *)
-      = svn_opt__revision_range_create(&youngest_rev, &oldest_rev, scratch_pool);
-  SVN_ERR(svn_client_log5(target, &youngest_rev, revision_ranges,
-                          0, discover_changed_paths, FALSE, FALSE, revprops,
-                          filter_log_entry_with_rangelist, &fleb, ctx,
-                          scratch_pool));
+    SVN_ERR(svn_ra_reparent(ra_session, source_url, scratch_pool));
+
+  {
+    apr_array_header_t *target;
+    target = apr_array_make(scratch_pool, 1, sizeof(const char *));
+    APR_ARRAY_PUSH(target, const char *) = "";
+
+    SVN_ERR(svn_ra_get_log2(ra_session, target,
+                            oldest_revs_first ? oldest_rev : youngest_rev,
+                            oldest_revs_first ? youngest_rev : oldest_rev,
+                            0 /* limit */,
+                            discover_changed_paths,
+                            FALSE /* strict_node_history */,
+                            FALSE /* include_merged_revisions */,
+                            revprops,
+                            filter_log_entry_with_rangelist, &fleb,
+                            scratch_pool));
+  }
 
   /* Check for cancellation. */
   if (ctx->cancel_func)
@@ -1620,7 +1637,7 @@ svn_client_mergeinfo_get_merged(apr_hash_t **mergeinfo_p,
   svn_mergeinfo_t mergeinfo;
 
   SVN_ERR(get_mergeinfo(&mergeinfo_cat, &repos_root, path_or_url,
-                        peg_revision, FALSE, FALSE, ctx, pool, pool));
+                        peg_revision, FALSE, FALSE, ctx, NULL, pool, pool));
   if (mergeinfo_cat)
     {
       const char *repos_relpath;
@@ -1666,6 +1683,7 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
                           svn_depth_t depth,
                           const apr_array_header_t *revprops,
                           svn_client_ctx_t *ctx,
+                          svn_ra_session_t *ra_session,
                           apr_pool_t *result_pool,
                           apr_pool_t *scratch_pool)
 {
@@ -1719,6 +1737,9 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
 
   subpool = svn_pool_create(scratch_pool);
 
+  if (ra_session)
+    target_session = ra_session;
+
   /* We need the union of TARGET_PATH_OR_URL@TARGET_PEG_REVISION's mergeinfo
      and MERGE_SOURCE_URL's history.  It's not enough to do path
      matching, because renames in the history of MERGE_SOURCE_URL
@@ -1735,11 +1756,27 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
              it ourselves.  We do need to get the repos_root
              though, because get_mergeinfo() won't do it for us. */
           target_mergeinfo_cat = *target_mergeinfo_catalog;
-          SVN_ERR(svn_client__ra_session_from_path2(&target_session, &pathrev,
-                                                    target_path_or_url, NULL,
-                                                    target_peg_revision,
-                                                    target_peg_revision,
-                                                    ctx, subpool));
+
+          if (ra_session && svn_path_is_url(target_path_or_url))
+            {
+              SVN_ERR(svn_ra_reparent(ra_session, target_path_or_url, subpool));
+              SVN_ERR(svn_client__resolve_rev_and_url(&pathrev, ra_session,
+                                                      target_path_or_url,
+                                                      target_peg_revision,
+                                                      target_peg_revision,
+                                                      ctx, subpool));
+              target_session = ra_session;
+            }
+          else
+            {
+              SVN_ERR(svn_client__ra_session_from_path2(&target_session,
+                                                        &pathrev,
+                                                        target_path_or_url,
+                                                        NULL,
+                                                        target_peg_revision,
+                                                        target_peg_revision,
+                                                        ctx, subpool));
+            }
           SVN_ERR(svn_ra_get_repos_root2(target_session, &repos_root,
                                          scratch_pool));
         }
@@ -1751,7 +1788,7 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
           SVN_ERR(get_mergeinfo(target_mergeinfo_catalog, &repos_root,
                                 target_path_or_url, target_peg_revision,
                                 depth == svn_depth_infinity, TRUE,
-                                ctx, result_pool, scratch_pool));
+                                ctx, ra_session, result_pool, scratch_pool));
           target_mergeinfo_cat = *target_mergeinfo_catalog;
         }
     }
@@ -1763,7 +1800,7 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
       SVN_ERR(get_mergeinfo(&target_mergeinfo_cat, &repos_root,
                             target_path_or_url, target_peg_revision,
                             depth == svn_depth_infinity, TRUE,
-                            ctx, scratch_pool, scratch_pool));
+                            ctx, ra_session, scratch_pool, scratch_pool));
     }
 
   if (!svn_path_is_url(target_path_or_url))
@@ -1833,11 +1870,28 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
                                                      scratch_pool));
       }
 
-    SVN_ERR(svn_client__ra_session_from_path2(&source_session, &pathrev,
-                                              source_path_or_url, NULL,
-                                              source_peg_revision,
-                                              source_peg_revision,
-                                              ctx, subpool));
+    if (target_session
+        && svn_path_is_url(source_path_or_url)
+        && repos_root
+        && svn_uri_skip_ancestor(repos_root, source_path_or_url, subpool))
+      {
+        /* We can re-use the existing session */
+        source_session = target_session;
+        SVN_ERR(svn_ra_reparent(source_session, source_path_or_url, subpool));
+        SVN_ERR(svn_client__resolve_rev_and_url(&pathrev, source_session,
+                                                source_path_or_url,
+                                                source_peg_revision,
+                                                source_peg_revision,
+                                                ctx, subpool));
+      }
+    else
+      {
+        SVN_ERR(svn_client__ra_session_from_path2(&source_session, &pathrev,
+                                                  source_path_or_url, NULL,
+                                                  source_peg_revision,
+                                                  source_peg_revision,
+                                                  ctx, subpool));
+      }
     SVN_ERR(svn_client__get_revision_number(&start_rev, &youngest_rev,
                                             ctx->wc_ctx, source_path_or_url,
                                             source_session,
@@ -1856,9 +1910,6 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
                                                  scratch_pool));
     if (start_rev > end_rev)
       oldest_revs_first = FALSE;
-
-    /* Close the source and target sessions. */
-    svn_pool_destroy(subpool);
   }
 
   /* Separate the explicit or inherited mergeinfo on TARGET_PATH_OR_URL,
@@ -2115,7 +2166,10 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
   log_target = svn_path_url_add_component2(repos_root, log_target + 1,
                                            scratch_pool);
 
-  SVN_ERR(logs_for_mergeinfo_rangelist(log_target, merge_source_fspaths,
+  {
+    svn_error_t *err;
+
+    err = logs_for_mergeinfo_rangelist(log_target, merge_source_fspaths,
                                        finding_merged,
                                        master_inheritable_rangelist,
                                        oldest_revs_first,
@@ -2126,8 +2180,13 @@ svn_client__mergeinfo_log(svn_boolean_t finding_merged,
                                        discover_changed_paths,
                                        revprops,
                                        log_receiver, log_receiver_baton,
-                                       ctx, scratch_pool));
-  return SVN_NO_ERROR;
+                                       ctx, target_session, scratch_pool);
+
+    /* Close the source and target sessions. */
+    svn_pool_destroy(subpool); /* For SVN_ERR_CEASE_INVOCATION */
+
+    return svn_error_trace(err);
+  }
 }
 
 svn_error_t *
@@ -2146,13 +2205,15 @@ svn_client_mergeinfo_log2(svn_boolean_t finding_merged,
                           svn_client_ctx_t *ctx,
                           apr_pool_t *scratch_pool)
 {
-  return svn_client__mergeinfo_log(finding_merged, target_path_or_url,
+  return svn_error_trace(
+         svn_client__mergeinfo_log(finding_merged, target_path_or_url,
                                    target_peg_revision, NULL,
                                    source_path_or_url, source_peg_revision,
                                    source_start_revision, source_end_revision,
                                    log_receiver, log_receiver_baton,
                                    discover_changed_paths, depth, revprops,
-                                   ctx, scratch_pool, scratch_pool);
+                                   ctx, NULL,
+                                   scratch_pool, scratch_pool));
 }
 
 svn_error_t *
@@ -2190,7 +2251,7 @@ svn_client_suggest_merge_sources(apr_array_header_t **suggestions,
 
   /* ### TODO: Share ra_session batons to improve efficiency? */
   SVN_ERR(get_mergeinfo(&mergeinfo_cat, &repos_root, path_or_url,
-                        peg_revision, FALSE, FALSE, ctx, pool, pool));
+                        peg_revision, FALSE, FALSE, ctx, NULL, pool, pool));
 
   if (mergeinfo_cat && apr_hash_count(mergeinfo_cat))
     {
diff --git a/contrib/subversion/subversion/libsvn_client/update.c b/contrib/subversion/subversion/libsvn_client/update.c
index 21f33ec93dc..fe3f86d1063 100644
--- a/contrib/subversion/subversion/libsvn_client/update.c
+++ b/contrib/subversion/subversion/libsvn_client/update.c
@@ -701,7 +701,23 @@ svn_client_update4(apr_array_header_t **result_revs,
 
  cleanup:
   if (sleep)
-    svn_io_sleep_for_timestamps((paths->nelts == 1) ? path : NULL, pool);
+    {
+      const char *wcroot_abspath;
+
+      if (paths->nelts == 1)
+        {
+          const char *abspath;
+
+          /* PATH iteslf may have been removed by the update. */
+          SVN_ERR(svn_dirent_get_absolute(&abspath, path, pool));
+          SVN_ERR(svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx, abspath,
+                                     pool, pool));
+        }
+      else
+        wcroot_abspath = NULL;
+
+      svn_io_sleep_for_timestamps(wcroot_abspath, pool);
+    }
 
   return svn_error_trace(err);
 }
diff --git a/contrib/subversion/subversion/libsvn_diff/diff_file.c b/contrib/subversion/subversion/libsvn_diff/diff_file.c
index e70c2f98a15..830552ac46f 100644
--- a/contrib/subversion/subversion/libsvn_diff/diff_file.c
+++ b/contrib/subversion/subversion/libsvn_diff/diff_file.c
@@ -166,26 +166,39 @@ read_chunk(apr_file_t *file, const char *path,
 static svn_error_t *
 map_or_read_file(apr_file_t **file,
                  MMAP_T_PARAM(mm)
-                 char **buffer, apr_off_t *size,
+                 char **buffer, apr_size_t *size_p,
                  const char *path, apr_pool_t *pool)
 {
   apr_finfo_t finfo;
   apr_status_t rv;
+  apr_size_t size;
 
   *buffer = NULL;
 
   SVN_ERR(svn_io_file_open(file, path, APR_READ, APR_OS_DEFAULT, pool));
   SVN_ERR(svn_io_file_info_get(&finfo, APR_FINFO_SIZE, *file, pool));
 
-#if APR_HAS_MMAP
-  if (finfo.size > APR_MMAP_THRESHOLD)
+  if (finfo.size > APR_SIZE_MAX)
     {
-      rv = apr_mmap_create(mm, *file, 0, (apr_size_t) finfo.size,
-                           APR_MMAP_READ, pool);
+      return svn_error_createf(APR_ENOMEM, NULL,
+                               _("File '%s' is too large to be read in "
+                                 "to memory"), path);
+    }
+
+  size = (apr_size_t) finfo.size;
+#if APR_HAS_MMAP
+  if (size > APR_MMAP_THRESHOLD)
+    {
+      rv = apr_mmap_create(mm, *file, 0, size, APR_MMAP_READ, pool);
       if (rv == APR_SUCCESS)
         {
           *buffer = (*mm)->mm;
         }
+      else
+        {
+          /* Clear *MM because output parameters are undefined on error. */
+          *mm = NULL;
+        }
 
       /* On failure we just fall through and try reading the file into
        * memory instead.
@@ -193,12 +206,11 @@ map_or_read_file(apr_file_t **file,
     }
 #endif /* APR_HAS_MMAP */
 
-   if (*buffer == NULL && finfo.size > 0)
+   if (*buffer == NULL && size > 0)
     {
-      *buffer = apr_palloc(pool, (apr_size_t) finfo.size);
+      *buffer = apr_palloc(pool, size);
 
-      SVN_ERR(svn_io_file_read_full2(*file, *buffer, (apr_size_t) finfo.size,
-                                     NULL, NULL, pool));
+      SVN_ERR(svn_io_file_read_full2(*file, *buffer, size, NULL, NULL, pool));
 
       /* Since we have the entire contents of the file we can
        * close it now.
@@ -208,7 +220,7 @@ map_or_read_file(apr_file_t **file,
       *file = NULL;
     }
 
-  *size = finfo.size;
+  *size_p = size;
 
   return SVN_NO_ERROR;
 }
@@ -2360,7 +2372,7 @@ svn_diff_file_output_merge2(svn_stream_t *output_stream,
 
   for (idx = 0; idx < 3; idx++)
     {
-      apr_off_t size;
+      apr_size_t size;
 
       SVN_ERR(map_or_read_file(&file[idx],
                                MMAP_T_ARG(mm[idx])
diff --git a/contrib/subversion/subversion/libsvn_fs/fs-loader.c b/contrib/subversion/subversion/libsvn_fs/fs-loader.c
index 01d6ba1afc1..336b84f7bb6 100644
--- a/contrib/subversion/subversion/libsvn_fs/fs-loader.c
+++ b/contrib/subversion/subversion/libsvn_fs/fs-loader.c
@@ -81,7 +81,8 @@ static struct fs_type_defn base_defn =
 #else
     NULL,
 #endif
-    NULL
+    NULL /* End of static list: this needs to be reset to NULL if the
+            common_pool used when setting it has been cleared. */
   };
 
 static struct fs_type_defn fsfs_defn =
@@ -355,6 +356,7 @@ svn_fs_initialize(apr_pool_t *pool)
     return SVN_NO_ERROR;
 
   common_pool = svn_pool_create(pool);
+  base_defn.next = NULL;
   SVN_ERR(svn_mutex__init(&common_pool_lock, TRUE, common_pool));
 
   /* ### This won't work if POOL is NULL and libsvn_fs is loaded as a DSO
diff --git a/contrib/subversion/subversion/libsvn_fs_base/fs.c b/contrib/subversion/subversion/libsvn_fs_base/fs.c
index bee921ba6b2..4ad9e6f72be 100644
--- a/contrib/subversion/subversion/libsvn_fs_base/fs.c
+++ b/contrib/subversion/subversion/libsvn_fs_base/fs.c
@@ -65,6 +65,8 @@
 
 #include "../libsvn_fs/fs-loader.h"
 #include "private/svn_fs_util.h"
+#include "private/svn_subr_private.h"
+
 
 
 /* Checking for return values, and reporting errors.  */
@@ -1427,7 +1429,7 @@ svn_fs_base__init(const svn_version_t *loader_version,
     return svn_error_createf(SVN_ERR_VERSION_MISMATCH, NULL,
                              _("Unsupported FS loader version (%d) for bdb"),
                              loader_version->major);
-  SVN_ERR(svn_ver_check_list(base_version(), checklist));
+  SVN_ERR(svn_ver_check_list2(base_version(), checklist, svn_ver_equal));
   SVN_ERR(check_bdb_version());
   SVN_ERR(svn_fs_bdb__init(common_pool));
 
diff --git a/contrib/subversion/subversion/libsvn_fs_fs/fs.c b/contrib/subversion/subversion/libsvn_fs_fs/fs.c
index 4f3a340240f..691f416d374 100644
--- a/contrib/subversion/subversion/libsvn_fs_fs/fs.c
+++ b/contrib/subversion/subversion/libsvn_fs_fs/fs.c
@@ -41,6 +41,7 @@
 #include "rep-cache.h"
 #include "svn_private_config.h"
 #include "private/svn_fs_util.h"
+#include "private/svn_subr_private.h"
 
 #include "../libsvn_fs/fs-loader.h"
 
@@ -449,7 +450,7 @@ svn_fs_fs__init(const svn_version_t *loader_version,
     return svn_error_createf(SVN_ERR_VERSION_MISMATCH, NULL,
                              _("Unsupported FS loader version (%d) for fsfs"),
                              loader_version->major);
-  SVN_ERR(svn_ver_check_list(fs_version(), checklist));
+  SVN_ERR(svn_ver_check_list2(fs_version(), checklist, svn_ver_equal));
 
   *vtable = &library_vtable;
   return SVN_NO_ERROR;
diff --git a/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c b/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
index c6074acee07..101e417eb28 100644
--- a/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
+++ b/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
@@ -982,6 +982,31 @@ check_format_file_buffer_numeric(const char *buf, apr_off_t offset,
   return check_file_buffer_numeric(buf, offset, path, "Format", pool);
 }
 
+/* Return the error SVN_ERR_FS_UNSUPPORTED_FORMAT if FS's format
+   number is not the same as a format number supported by this
+   Subversion. */
+static svn_error_t *
+check_format(int format)
+{
+  /* Blacklist.  These formats may be either younger or older than
+     SVN_FS_FS__FORMAT_NUMBER, but we don't support them. */
+  if (format == SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT)
+    return svn_error_createf(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL,
+                             _("Found format '%d', only created by "
+                               "unreleased dev builds; see "
+                               "http://subversion.apache.org"
+                               "/docs/release-notes/1.7#revprop-packing"),
+                             format);
+
+  /* We support all formats from 1-current simultaneously */
+  if (1 <= format && format <= SVN_FS_FS__FORMAT_NUMBER)
+    return SVN_NO_ERROR;
+
+  return svn_error_createf(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL,
+     _("Expected FS format between '1' and '%d'; found format '%d'"),
+     SVN_FS_FS__FORMAT_NUMBER, format);
+}
+
 /* Read the format number and maximum number of files per directory
    from PATH and return them in *PFORMAT and *MAX_FILES_PER_DIR
    respectively.
@@ -1032,6 +1057,9 @@ read_format(int *pformat, int *max_files_per_dir,
   SVN_ERR(check_format_file_buffer_numeric(buf->data, 0, path, pool));
   SVN_ERR(svn_cstring_atoi(pformat, buf->data));
 
+  /* Check that we support this format at all */
+  SVN_ERR(check_format(*pformat));
+
   /* Set the default values for anything that can be set via an option. */
   *max_files_per_dir = 0;
 
@@ -1117,31 +1145,6 @@ write_format(const char *path, int format, int max_files_per_dir,
   return svn_io_set_file_read_only(path, FALSE, pool);
 }
 
-/* Return the error SVN_ERR_FS_UNSUPPORTED_FORMAT if FS's format
-   number is not the same as a format number supported by this
-   Subversion. */
-static svn_error_t *
-check_format(int format)
-{
-  /* Blacklist.  These formats may be either younger or older than
-     SVN_FS_FS__FORMAT_NUMBER, but we don't support them. */
-  if (format == SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT)
-    return svn_error_createf(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL,
-                             _("Found format '%d', only created by "
-                               "unreleased dev builds; see "
-                               "http://subversion.apache.org"
-                               "/docs/release-notes/1.7#revprop-packing"),
-                             format);
-
-  /* We support all formats from 1-current simultaneously */
-  if (1 <= format && format <= SVN_FS_FS__FORMAT_NUMBER)
-    return SVN_NO_ERROR;
-
-  return svn_error_createf(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL,
-     _("Expected FS format between '1' and '%d'; found format '%d'"),
-     SVN_FS_FS__FORMAT_NUMBER, format);
-}
-
 svn_boolean_t
 svn_fs_fs__fs_supports_mergeinfo(svn_fs_t *fs)
 {
@@ -1404,7 +1407,6 @@ svn_fs_fs__open(svn_fs_t *fs, const char *path, apr_pool_t *pool)
   /* Read the FS format number. */
   SVN_ERR(read_format(&format, &max_files_per_dir,
                       path_format(fs, pool), pool));
-  SVN_ERR(check_format(format));
 
   /* Now we've got a format number no matter what. */
   ffd->format = format;
@@ -1564,7 +1566,6 @@ upgrade_body(void *baton, apr_pool_t *pool)
 
   /* Read the FS format number and max-files-per-dir setting. */
   SVN_ERR(read_format(&format, &max_files_per_dir, format_path, pool));
-  SVN_ERR(check_format(format));
 
   /* If the config file does not exist, create one. */
   SVN_ERR(svn_io_check_path(svn_dirent_join(fs->path, PATH_CONFIG, pool),
@@ -3536,7 +3537,7 @@ typedef struct packed_revprops_t
   /* sum of values in SIZES */
   apr_size_t total_size;
 
-  /* first revision in the pack */
+  /* first revision in the pack (>= MANIFEST_START) */
   svn_revnum_t start_revision;
 
   /* size of the revprops in PACKED_REVPROPS */
@@ -3550,8 +3551,12 @@ typedef struct packed_revprops_t
    * in the pack, i.e. the pack content without header and compression */
   svn_stringbuf_t *packed_revprops;
 
+  /* First revision covered by MANIFEST.
+   * Will equal the shard start revision or 1, for the 1st shard. */
+  svn_revnum_t manifest_start;
+
   /* content of the manifest.
-   * Maps long(rev - START_REVISION) to const char* pack file name */
+   * Maps long(rev - MANIFEST_START) to const char* pack file name */
   apr_array_header_t *manifest;
 } packed_revprops_t;
 
@@ -3655,7 +3660,10 @@ get_revprop_packname(svn_fs_t *fs,
   /* parse the manifest. Every line is a file name */
   revprops->manifest = apr_array_make(pool, ffd->max_files_per_dir,
                                       sizeof(const char*));
-  while (content->data)
+
+  /* Read all lines.  Since the last line ends with a newline, we will
+     end up with a valid but empty string after the last entry. */
+  while (content->data && *content->data)
     {
       APR_ARRAY_PUSH(revprops->manifest, const char*) = content->data;
       content->data = strchr(content->data, '\n');
@@ -3667,13 +3675,15 @@ get_revprop_packname(svn_fs_t *fs,
     }
 
   /* Index for our revision. Rev 0 is excluded from the first shard. */
-  idx = (int)(revprops->revision % ffd->max_files_per_dir);
-  if (revprops->revision < ffd->max_files_per_dir)
-    --idx;
+  revprops->manifest_start = revprops->revision
+                           - (revprops->revision % ffd->max_files_per_dir);
+  if (revprops->manifest_start == 0)
+    ++revprops->manifest_start;
+  idx = (int)(revprops->revision - revprops->manifest_start);
 
   if (revprops->manifest->nelts <= idx)
     return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
-                             _("Packed revprop manifest for rev %ld too "
+                             _("Packed revprop manifest for r%ld too "
                                "small"), revprops->revision);
 
   /* Now get the file name */
@@ -3682,6 +3692,17 @@ get_revprop_packname(svn_fs_t *fs,
   return SVN_NO_ERROR;
 }
 
+/* Return TRUE, if revision R1 and R2 refer to the same shard in FS.
+ */
+static svn_boolean_t
+same_shard(svn_fs_t *fs,
+           svn_revnum_t r1,
+           svn_revnum_t r2)
+{
+  fs_fs_data_t *ffd = fs->fsap_data;
+  return (r1 / ffd->max_files_per_dir) == (r2 / ffd->max_files_per_dir);
+}
+
 /* Given FS and the full packed file content in REVPROPS->PACKED_REVPROPS,
  * fill the START_REVISION, SIZES, OFFSETS members. Also, make
  * PACKED_REVPROPS point to the first serialized revprop.
@@ -3714,6 +3735,26 @@ parse_packed_revprops(svn_fs_t *fs,
   SVN_ERR(read_number_from_stream(&first_rev, NULL, stream, iterpool));
   SVN_ERR(read_number_from_stream(&count, NULL, stream, iterpool));
 
+  /* Check revision range for validity. */
+  if (   !same_shard(fs, revprops->revision, first_rev)
+      || !same_shard(fs, revprops->revision, first_rev + count - 1)
+      || count < 1)
+    return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
+                             _("Revprop pack for revision r%ld"
+                               " contains revprops for r%ld .. r%ld"),
+                             revprops->revision,
+                             (svn_revnum_t)first_rev,
+                             (svn_revnum_t)(first_rev + count -1));
+
+  /* Since start & end are in the same shard, it is enough to just test
+   * the FIRST_REV for being actually packed.  That will also cover the
+   * special case of rev 0 never being packed. */
+  if (!is_packed_revprop(fs, first_rev))
+    return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
+                             _("Revprop pack for revision r%ld"
+                               " starts at non-packed revisions r%ld"),
+                             revprops->revision, (svn_revnum_t)first_rev);
+
   /* make PACKED_REVPROPS point to the first char after the header.
    * This is where the serialized revprops are. */
   header_end = strstr(uncompressed->data, "\n\n");
@@ -3846,14 +3887,14 @@ read_pack_revprop(packed_revprops_t **revprops,
   /* the file content should be available now */
   if (!result->packed_revprops)
     return svn_error_createf(SVN_ERR_FS_PACKED_REVPROP_READ_FAILURE, NULL,
-                  _("Failed to read revprop pack file for rev %ld"), rev);
+                  _("Failed to read revprop pack file for r%ld"), rev);
 
   /* parse it. RESULT will be complete afterwards. */
   err = parse_packed_revprops(fs, result, pool, iterpool);
   svn_pool_destroy(iterpool);
   if (err)
     return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
-                  _("Revprop pack file for rev %ld is corrupt"), rev);
+                  _("Revprop pack file for r%ld is corrupt"), rev);
 
   *revprops = result;
 
@@ -4117,7 +4158,8 @@ repack_revprops(svn_fs_t *fs,
   return SVN_NO_ERROR;
 }
 
-/* Allocate a new pack file name for the revisions at index [START,END)
+/* Allocate a new pack file name for revisions
+ *     [REVPROPS->START_REVISION + START, REVPROPS->START_REVISION + END - 1]
  * of REVPROPS->MANIFEST.  Add the name of old file to FILES_TO_DELETE,
  * auto-create that array if necessary.  Return an open file stream to
  * the new file in *STREAM allocated in POOL.
@@ -4136,10 +4178,13 @@ repack_stream_open(svn_stream_t **stream,
   svn_string_t *new_filename;
   int i;
   apr_file_t *file;
+  int manifest_offset
+    = (int)(revprops->start_revision - revprops->manifest_start);
 
   /* get the old (= current) file name and enlist it for later deletion */
-  const char *old_filename
-    = APR_ARRAY_IDX(revprops->manifest, start, const char*);
+  const char *old_filename = APR_ARRAY_IDX(revprops->manifest,
+                                           start + manifest_offset,
+                                           const char*);
 
   if (*files_to_delete == NULL)
     *files_to_delete = apr_array_make(pool, 3, sizeof(const char*));
@@ -4161,7 +4206,8 @@ repack_stream_open(svn_stream_t **stream,
 
   /* update the manifest to point to the new file */
   for (i = start; i < end; ++i)
-    APR_ARRAY_IDX(revprops->manifest, i, const char*) = new_filename->data;
+    APR_ARRAY_IDX(revprops->manifest, i + manifest_offset, const char*)
+      = new_filename->data;
 
   /* create a file stream for the new file */
   SVN_ERR(svn_io_file_open(&file, svn_dirent_join(revprops->folder,
@@ -10883,6 +10929,55 @@ hotcopy_update_current(svn_revnum_t *dst_youngest,
 }
 
 
+/* Remove revision or revprop files between START_REV (inclusive) and
+ * END_REV (non-inclusive) from folder DST_SUBDIR in DST_FS.  Assume
+ * sharding as per MAX_FILES_PER_DIR.
+ * Use SCRATCH_POOL for temporary allocations. */
+static svn_error_t *
+hotcopy_remove_files(svn_fs_t *dst_fs,
+                     const char *dst_subdir,
+                     svn_revnum_t start_rev,
+                     svn_revnum_t end_rev,
+                     int max_files_per_dir,
+                     apr_pool_t *scratch_pool)
+{
+  const char *shard;
+  const char *dst_subdir_shard;
+  svn_revnum_t rev;
+  apr_pool_t *iterpool;
+
+  /* Pre-compute paths for initial shard. */
+  shard = apr_psprintf(scratch_pool, "%ld", start_rev / max_files_per_dir);
+  dst_subdir_shard = svn_dirent_join(dst_subdir, shard, scratch_pool);
+
+  iterpool = svn_pool_create(scratch_pool);
+  for (rev = start_rev; rev < end_rev; rev++)
+    {
+      const char *path;
+      svn_pool_clear(iterpool);
+
+      /* If necessary, update paths for shard. */
+      if (rev != start_rev && rev % max_files_per_dir == 0)
+        {
+          shard = apr_psprintf(iterpool, "%ld", rev / max_files_per_dir);
+          dst_subdir_shard = svn_dirent_join(dst_subdir, shard, scratch_pool);
+        }
+
+      /* remove files for REV */
+      path = svn_dirent_join(dst_subdir_shard,
+                             apr_psprintf(iterpool, "%ld", rev),
+                             iterpool);
+
+      /* Make the rev file writable and remove it. */
+      SVN_ERR(svn_io_set_file_read_write(path, TRUE, iterpool));
+      SVN_ERR(svn_io_remove_file2(path, TRUE, iterpool));
+    }
+
+  svn_pool_destroy(iterpool);
+
+  return SVN_NO_ERROR;
+}
+
 /* Remove revisions between START_REV (inclusive) and END_REV (non-inclusive)
  * from DST_FS. Assume sharding as per MAX_FILES_PER_DIR.
  * Use SCRATCH_POOL for temporary allocations. */
@@ -10893,43 +10988,37 @@ hotcopy_remove_rev_files(svn_fs_t *dst_fs,
                          int max_files_per_dir,
                          apr_pool_t *scratch_pool)
 {
-  const char *dst_subdir;
-  const char *shard;
-  const char *dst_subdir_shard;
-  svn_revnum_t rev;
-  apr_pool_t *iterpool;
+  SVN_ERR_ASSERT(start_rev <= end_rev);
+  SVN_ERR(hotcopy_remove_files(dst_fs,
+                               svn_dirent_join(dst_fs->path,
+                                               PATH_REVS_DIR,
+                                               scratch_pool),
+                               start_rev, end_rev,
+                               max_files_per_dir, scratch_pool));
 
+  return SVN_NO_ERROR;
+}
+
+/* Remove revision properties between START_REV (inclusive) and END_REV
+ * (non-inclusive) from DST_FS. Assume sharding as per MAX_FILES_PER_DIR.
+ * Use SCRATCH_POOL for temporary allocations.  Revision 0 revprops will
+ * not be deleted. */
+static svn_error_t *
+hotcopy_remove_revprop_files(svn_fs_t *dst_fs,
+                             svn_revnum_t start_rev,
+                             svn_revnum_t end_rev,
+                             int max_files_per_dir,
+                             apr_pool_t *scratch_pool)
+{
   SVN_ERR_ASSERT(start_rev <= end_rev);
 
-  dst_subdir = svn_dirent_join(dst_fs->path, PATH_REVS_DIR, scratch_pool);
-
-  /* Pre-compute paths for initial shard. */
-  shard = apr_psprintf(scratch_pool, "%ld", start_rev / max_files_per_dir);
-  dst_subdir_shard = svn_dirent_join(dst_subdir, shard, scratch_pool);
-
-  iterpool = svn_pool_create(scratch_pool);
-  for (rev = start_rev; rev < end_rev; rev++)
-    {
-      const char *rev_path;
-
-      svn_pool_clear(iterpool);
-
-      /* If necessary, update paths for shard. */
-      if (rev != start_rev && rev % max_files_per_dir == 0)
-        {
-          shard = apr_psprintf(iterpool, "%ld", rev / max_files_per_dir);
-          dst_subdir_shard = svn_dirent_join(dst_subdir, shard, scratch_pool);
-        }
-
-      rev_path = svn_dirent_join(dst_subdir_shard,
-                                 apr_psprintf(iterpool, "%ld", rev),
-                                 iterpool);
-
-      /* Make the rev file writable and remove it. */
-      SVN_ERR(svn_io_set_file_read_write(rev_path, TRUE, iterpool));
-      SVN_ERR(svn_io_remove_file2(rev_path, TRUE, iterpool));
-    }
-  svn_pool_destroy(iterpool);
+  /* don't delete rev 0 props */
+  SVN_ERR(hotcopy_remove_files(dst_fs,
+                               svn_dirent_join(dst_fs->path,
+                                               PATH_REVPROPS_DIR,
+                                               scratch_pool),
+                               start_rev ? start_rev : 1, end_rev,
+                               max_files_per_dir, scratch_pool));
 
   return SVN_NO_ERROR;
 }
@@ -10970,6 +11059,27 @@ hotcopy_incremental_check_preconditions(svn_fs_t *src_fs,
   return SVN_NO_ERROR;
 }
 
+/* Remove folder PATH.  Ignore errors due to the sub-tree not being empty.
+ * CANCEL_FUNC and CANCEL_BATON do the usual thing.
+ * Use POOL for temporary allocations.
+ */
+static svn_error_t *
+remove_folder(const char *path,
+              svn_cancel_func_t cancel_func,
+              void *cancel_baton,
+              apr_pool_t *pool)
+{
+  svn_error_t *err = svn_io_remove_dir2(path, TRUE,
+                                        cancel_func, cancel_baton, pool);
+
+  if (err && APR_STATUS_IS_ENOTEMPTY(err->apr_err))
+    {
+      svn_error_clear(err);
+      err = SVN_NO_ERROR;
+    }
+
+  return svn_error_trace(err);
+}
 
 /* Baton for hotcopy_body(). */
 struct hotcopy_body_baton {
@@ -11160,8 +11270,6 @@ hotcopy_body(void *baton, apr_pool_t *pool)
   /* First, copy packed shards. */
   for (rev = 0; rev < src_min_unpacked_rev; rev += max_files_per_dir)
     {
-      svn_error_t *err;
-
       svn_pool_clear(iterpool);
 
       if (cancel_func)
@@ -11181,20 +11289,24 @@ hotcopy_body(void *baton, apr_pool_t *pool)
 
       /* Remove revision files which are now packed. */
       if (incremental)
-        SVN_ERR(hotcopy_remove_rev_files(dst_fs, rev, rev + max_files_per_dir,
-                                         max_files_per_dir, iterpool));
+        {
+          SVN_ERR(hotcopy_remove_rev_files(dst_fs, rev,
+                                           rev + max_files_per_dir,
+                                           max_files_per_dir, iterpool));
+          if (dst_ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
+            SVN_ERR(hotcopy_remove_revprop_files(dst_fs, rev,
+                                                 rev + max_files_per_dir,
+                                                 max_files_per_dir,
+                                                 iterpool));
+        }
 
       /* Now that all revisions have moved into the pack, the original
        * rev dir can be removed. */
-      err = svn_io_remove_dir2(path_rev_shard(dst_fs, rev, iterpool),
-                               TRUE, cancel_func, cancel_baton, iterpool);
-      if (err)
-        {
-          if (APR_STATUS_IS_ENOTEMPTY(err->apr_err))
-            svn_error_clear(err);
-          else
-            return svn_error_trace(err);
-        }
+      SVN_ERR(remove_folder(path_rev_shard(dst_fs, rev, iterpool),
+                            cancel_func, cancel_baton, iterpool));
+      if (rev > 0 && dst_ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
+        SVN_ERR(remove_folder(path_revprops_shard(dst_fs, rev, iterpool),
+                              cancel_func, cancel_baton, iterpool));
     }
 
   if (cancel_func)
diff --git a/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h b/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
index 9f64e8234c8..f74138f8032 100644
--- a/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
+++ b/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
@@ -1,4 +1,4 @@
-/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_fs_fs/token-map.h.
+/* This file is automatically generated from rep-cache-db.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_fs_fs/token-map.h.
  * Do not edit this file -- edit the source and rerun gen-make.py */
 
 #define STMT_CREATE_SCHEMA 0
diff --git a/contrib/subversion/subversion/libsvn_ra/ra_loader.c b/contrib/subversion/subversion/libsvn_ra/ra_loader.c
index 91c9cc14bcc..d9cb96b9efe 100644
--- a/contrib/subversion/subversion/libsvn_ra/ra_loader.c
+++ b/contrib/subversion/subversion/libsvn_ra/ra_loader.c
@@ -1436,7 +1436,7 @@ svn_ra_print_modules(svn_stringbuf_t *output,
              built with SASL. */
           line = apr_psprintf(iterpool, "* ra_%s : %s\n",
                               defn->ra_name,
-                              vtable->get_description());
+                              vtable->get_description(iterpool));
           svn_stringbuf_appendcstr(output, line);
 
           for (schemes = vtable->get_schemes(iterpool); *schemes != NULL;
diff --git a/contrib/subversion/subversion/libsvn_ra/ra_loader.h b/contrib/subversion/subversion/libsvn_ra/ra_loader.h
index 4d86121e6a5..227730aec23 100644
--- a/contrib/subversion/subversion/libsvn_ra/ra_loader.h
+++ b/contrib/subversion/subversion/libsvn_ra/ra_loader.h
@@ -45,7 +45,7 @@ typedef struct svn_ra__vtable_t {
 
   /* Return a short description of the RA implementation, as a localized
    * string. */
-  const char *(*get_description)(void);
+  const char *(*get_description)(apr_pool_t *pool);
 
   /* Return a list of actual URI schemes supported by this implementation.
    * The returned array is NULL-terminated. */
diff --git a/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c b/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c
index e7e8021d017..4ccc86ddc37 100644
--- a/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c
+++ b/contrib/subversion/subversion/libsvn_ra_local/ra_plugin.c
@@ -41,6 +41,7 @@
 #include "private/svn_repos_private.h"
 #include "private/svn_fspath.h"
 #include "private/svn_atomic.h"
+#include "private/svn_subr_private.h"
 
 #define APR_WANT_STRFUNC
 #include <apr_want.h>
@@ -502,7 +503,7 @@ apply_lock_tokens(svn_fs_t *fs,
         N_("Module for accessing a repository on local disk.")
 
 static const char *
-svn_ra_local__get_description(void)
+svn_ra_local__get_description(apr_pool_t *pool)
 {
   return _(RA_LOCAL_DESCRIPTION);
 }
@@ -1745,7 +1746,7 @@ svn_ra_local__init(const svn_version_t *loader_version,
                                "ra_local"),
                              loader_version->major);
 
-  SVN_ERR(svn_ver_check_list(ra_local_version(), checklist));
+  SVN_ERR(svn_ver_check_list2(ra_local_version(), checklist, svn_ver_equal));
 
 #ifndef SVN_LIBSVN_CLIENT_LINKS_RA_LOCAL
   /* This assumes that POOL was the pool used to load the dso. */
diff --git a/contrib/subversion/subversion/libsvn_ra_local/split_url.c b/contrib/subversion/subversion/libsvn_ra_local/split_url.c
index d08bb26aa76..ec6cb68a94e 100644
--- a/contrib/subversion/subversion/libsvn_ra_local/split_url.c
+++ b/contrib/subversion/subversion/libsvn_ra_local/split_url.c
@@ -39,6 +39,7 @@ svn_ra_local__split_URL(svn_repos_t **repos,
   const char *repos_dirent;
   const char *repos_root_dirent;
   svn_stringbuf_t *urlbuf;
+  apr_size_t root_end;
 
   SVN_ERR(svn_uri_get_dirent_from_file_url(&repos_dirent, URL, pool));
 
@@ -65,10 +66,17 @@ svn_ra_local__split_URL(svn_repos_t **repos,
                    "/",
                    svn_dirent_skip_ancestor(repos_root_dirent, repos_dirent),
                    (const char *)NULL); */
-  *fs_path = &repos_dirent[strlen(repos_root_dirent)];
-
-  if (**fs_path == '\0')
+  root_end = strlen(repos_root_dirent);
+  if (! repos_dirent[root_end])
     *fs_path = "/";
+  else if (repos_dirent[root_end] == '/')
+    *fs_path = &repos_dirent[root_end];
+  else
+    {
+      /* On Windows "C:/" is the parent directory of "C:/dir" */
+      *fs_path = &repos_dirent[root_end-1];
+      SVN_ERR_ASSERT((*fs_path)[0] == '/');
+    }
 
   /* Remove the path components after the root dirent from the original URL,
      to get a URL to the repository root.
diff --git a/contrib/subversion/subversion/libsvn_ra_serf/commit.c b/contrib/subversion/subversion/libsvn_ra_serf/commit.c
index 56a2bcea1e3..9682a65f202 100644
--- a/contrib/subversion/subversion/libsvn_ra_serf/commit.c
+++ b/contrib/subversion/subversion/libsvn_ra_serf/commit.c
@@ -397,10 +397,18 @@ checkout_dir(dir_context_t *dir,
     {
       if (p_dir->added)
         {
+          /* Calculate the working_url by skipping the shared ancestor bewteen
+           * the parent->relpath and dir->relpath.  This is safe since an
+           * add is guaranteed to have a parent that is checked out. */
+          dir_context_t *parent = p_dir->parent_dir;
+          const char *relpath = svn_relpath_skip_ancestor(parent->relpath,
+                                                          dir->relpath);
+
           /* Implicitly checkout this dir now. */
+          SVN_ERR_ASSERT(parent->working_url);
           dir->working_url = svn_path_url_add_component2(
-                                   dir->parent_dir->working_url,
-                                   dir->name, dir->pool);
+                                   parent->working_url,
+                                   relpath, dir->pool);
           return SVN_NO_ERROR;
         }
       p_dir = p_dir->parent_dir;
@@ -1924,7 +1932,18 @@ add_file(const char *path,
 
       if (handler->sline.code != 404)
         {
-          return svn_error_createf(SVN_ERR_RA_DAV_ALREADY_EXISTS, NULL,
+          if (handler->sline.code != 200)
+            {
+              svn_error_t *err;
+
+              err = svn_ra_serf__error_on_status(handler->sline,
+                                                 handler->path,
+                                                 handler->location);
+
+              SVN_ERR(err);
+            }
+
+          return svn_error_createf(SVN_ERR_FS_ALREADY_EXISTS, NULL,
                                    _("File '%s' already exists"), path);
         }
     }
diff --git a/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h b/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
index f6310b351dc..335a9e397e0 100644
--- a/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
+++ b/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
@@ -57,13 +57,6 @@ extern "C" {
 /** Use this to silence compiler warnings about unused parameters. */
 #define UNUSED_CTX(x) ((void)(x))
 
-/** Our User-Agent string. */
-#define USER_AGENT "SVN/" SVN_VER_NUMBER " (" SVN_BUILD_TARGET ")" \
-                   " serf/" \
-                   APR_STRINGIFY(SERF_MAJOR_VERSION) "." \
-                   APR_STRINGIFY(SERF_MINOR_VERSION) "." \
-                   APR_STRINGIFY(SERF_PATCH_VERSION)
-
 /** Wait duration (in microseconds) used in calls to serf_context_run() */
 #define SVN_RA_SERF__CONTEXT_RUN_DURATION 500000
 
@@ -658,11 +651,6 @@ struct svn_ra_serf__xml_parser_t {
 
      See libsvn_ra_serf/util.c  */
   struct svn_ra_serf__pending_t *pending;
-
-  /* Response restart support */
-  const void *headers_baton; /* Last pointer to headers */
-  apr_off_t skip_size; /* Number of bytes to skip */
-  apr_off_t read_size; /* Number of bytes read from response */
 };
 
 
diff --git a/contrib/subversion/subversion/libsvn_ra_serf/replay.c b/contrib/subversion/subversion/libsvn_ra_serf/replay.c
index 2d385f345f3..66e2f584d53 100644
--- a/contrib/subversion/subversion/libsvn_ra_serf/replay.c
+++ b/contrib/subversion/subversion/libsvn_ra_serf/replay.c
@@ -90,8 +90,6 @@ typedef struct prop_info_t {
 typedef struct replay_context_t {
   apr_pool_t *src_rev_pool;
   apr_pool_t *dst_rev_pool;
-  /*file_pool is cleared after completion of each file. */
-  apr_pool_t *file_pool;
 
   /* Are we done fetching this file? */
   svn_boolean_t done;
@@ -147,10 +145,11 @@ push_state(svn_ra_serf__xml_parser_t *parser,
       state == OPEN_FILE || state == ADD_FILE)
     {
       replay_info_t *info;
+      apr_pool_t *pool = svn_pool_create(replay_ctx->dst_rev_pool);
 
-      info = apr_palloc(replay_ctx->dst_rev_pool, sizeof(*info));
+      info = apr_palloc(pool, sizeof(*info));
 
-      info->pool = replay_ctx->dst_rev_pool;
+      info->pool = pool;
       info->parent = parser->state->private;
       info->baton = NULL;
       info->stream = NULL;
@@ -160,12 +159,13 @@ push_state(svn_ra_serf__xml_parser_t *parser,
   else if (state == CHANGE_PROP)
     {
       prop_info_t *info;
+      apr_pool_t *pool = svn_pool_create(replay_ctx->dst_rev_pool);
 
-      info = apr_pcalloc(replay_ctx->dst_rev_pool, sizeof(*info));
+      info = apr_pcalloc(pool, sizeof(*info));
 
-      info->pool = replay_ctx->dst_rev_pool;
+      info->pool = pool;
       info->parent = parser->state->private;
-      info->prop_value = svn_stringbuf_create_empty(info->pool);
+      info->prop_value = svn_stringbuf_create_empty(pool);
 
       parser->state->private = info;
     }
@@ -194,7 +194,6 @@ start_replay(svn_ra_serf__xml_parser_t *parser,
 
       /* Create a pool for the commit editor. */
       ctx->dst_rev_pool = svn_pool_create(ctx->src_rev_pool);
-      ctx->file_pool = svn_pool_create(ctx->dst_rev_pool);
 
       SVN_ERR(svn_ra_serf__select_revprops(&ctx->props,
                                            ctx->revprop_target,
@@ -334,6 +333,8 @@ start_replay(svn_ra_serf__xml_parser_t *parser,
       SVN_ERR(ctx->editor->close_directory(info->baton, scratch_pool));
 
       svn_ra_serf__xml_pop_state(parser);
+
+      svn_pool_destroy(info->pool);
     }
   else if ((state == OPEN_DIR || state == ADD_DIR) &&
            strcmp(name.name, "open-file") == 0)
@@ -341,7 +342,6 @@ start_replay(svn_ra_serf__xml_parser_t *parser,
       const char *file_name, *rev;
       replay_info_t *info;
 
-      svn_pool_clear(ctx->file_pool);
       file_name = svn_xml_get_attr_value("name", attrs);
       if (!file_name)
         {
@@ -359,7 +359,7 @@ start_replay(svn_ra_serf__xml_parser_t *parser,
 
       SVN_ERR(ctx->editor->open_file(file_name, info->parent->baton,
                                      SVN_STR_TO_REV(rev),
-                                     ctx->file_pool, &info->baton));
+                                     info->pool, &info->baton));
     }
   else if ((state == OPEN_DIR || state == ADD_DIR) &&
            strcmp(name.name, "add-file") == 0)
@@ -368,7 +368,6 @@ start_replay(svn_ra_serf__xml_parser_t *parser,
       svn_revnum_t rev;
       replay_info_t *info;
 
-      svn_pool_clear(ctx->file_pool);
       file_name = svn_xml_get_attr_value("name", attrs);
       if (!file_name)
         {
@@ -387,7 +386,7 @@ start_replay(svn_ra_serf__xml_parser_t *parser,
 
       SVN_ERR(ctx->editor->add_file(file_name, info->parent->baton,
                                     copyfrom, rev,
-                                    ctx->file_pool, &info->baton));
+                                    info->pool, &info->baton));
     }
   else if ((state == OPEN_FILE || state == ADD_FILE) &&
            strcmp(name.name, "apply-textdelta") == 0)
@@ -407,7 +406,7 @@ start_replay(svn_ra_serf__xml_parser_t *parser,
         }
 
       SVN_ERR(ctx->editor->apply_textdelta(info->baton, checksum,
-                                           ctx->file_pool,
+                                           info->pool,
                                            &textdelta,
                                            &textdelta_baton));
 
@@ -426,6 +425,8 @@ start_replay(svn_ra_serf__xml_parser_t *parser,
       SVN_ERR(ctx->editor->close_file(info->baton, checksum, scratch_pool));
 
       svn_ra_serf__xml_pop_state(parser);
+
+      svn_pool_destroy(info->pool);
     }
   else if (((state == OPEN_FILE || state == ADD_FILE) &&
             strcmp(name.name, "change-file-prop") == 0) ||
@@ -451,14 +452,13 @@ start_replay(svn_ra_serf__xml_parser_t *parser,
       else
         info->del_prop = FALSE;
 
+      info->name = apr_pstrdup(info->pool, prop_name);
       if (state == OPEN_FILE || state == ADD_FILE)
         {
-          info->name = apr_pstrdup(ctx->file_pool, prop_name);
           info->change = ctx->editor->change_file_prop;
         }
       else
         {
-          info->name = apr_pstrdup(ctx->dst_rev_pool, prop_name);
           info->change = ctx->editor->change_dir_prop;
         }
 
@@ -538,15 +538,14 @@ end_replay(svn_ra_serf__xml_parser_t *parser,
           info->prop_value = NULL;  /* morph killed the stringbuf.  */
 #endif
 
-          if (strcmp(name.name, "change-file-prop") == 0)
-            prop_val = svn_base64_decode_string(morph, ctx->file_pool);
-          else
-            prop_val = svn_base64_decode_string(morph, ctx->dst_rev_pool);
+          prop_val = svn_base64_decode_string(morph, info->pool);
         }
 
       SVN_ERR(info->change(info->parent->baton, info->name, prop_val,
                            info->parent->pool));
       svn_ra_serf__xml_pop_state(parser);
+
+      svn_pool_destroy(info->pool);
     }
 
   return SVN_NO_ERROR;
diff --git a/contrib/subversion/subversion/libsvn_ra_serf/serf.c b/contrib/subversion/subversion/libsvn_ra_serf/serf.c
index b0b6346c5a9..66f9962500a 100644
--- a/contrib/subversion/subversion/libsvn_ra_serf/serf.c
+++ b/contrib/subversion/subversion/libsvn_ra_serf/serf.c
@@ -61,11 +61,18 @@ ra_serf_version(void)
 #define RA_SERF_DESCRIPTION \
     N_("Module for accessing a repository via WebDAV protocol using serf.")
 
+#define RA_SERF_DESCRIPTION_VER \
+    N_("Module for accessing a repository via WebDAV protocol using serf.\n" \
+       "  - using serf %d.%d.%d")
+
 /* Implements svn_ra__vtable_t.get_description(). */
 static const char *
-ra_serf_get_description(void)
+ra_serf_get_description(apr_pool_t *pool)
 {
-  return _(RA_SERF_DESCRIPTION);
+  int major, minor, patch;
+
+  serf_lib_version(&major, &minor, &patch);
+  return apr_psprintf(pool, _(RA_SERF_DESCRIPTION_VER), major, minor, patch);
 }
 
 /* Implements svn_ra__vtable_t.get_schemes(). */
@@ -413,6 +420,18 @@ svn_ra_serf__progress(void *progress_baton, apr_off_t read, apr_off_t written)
     }
 }
 
+/** Our User-Agent string. */
+static const char *
+get_user_agent_string(apr_pool_t *pool)
+{
+  int major, minor, patch;
+  serf_lib_version(&major, &minor, &patch);
+
+  return apr_psprintf(pool, "SVN/%s (%s) serf/%d.%d.%d",
+                      SVN_VER_NUMBER, SVN_BUILD_TARGET,
+                      major, minor, patch);
+}
+
 /* Implements svn_ra__vtable_t.open_session(). */
 static svn_error_t *
 svn_ra_serf__open(svn_ra_session_t *session,
@@ -495,10 +514,10 @@ svn_ra_serf__open(svn_ra_session_t *session,
     SVN_ERR(callbacks->get_client_string(callback_baton, &client_string, pool));
 
   if (client_string)
-    serf_sess->useragent = apr_pstrcat(pool, USER_AGENT, " ",
+    serf_sess->useragent = apr_pstrcat(pool, get_user_agent_string(pool), " ",
                                        client_string, (char *)NULL);
   else
-    serf_sess->useragent = USER_AGENT;
+    serf_sess->useragent = get_user_agent_string(pool);
 
   /* go ahead and tell serf about the connection. */
   status =
@@ -1260,7 +1279,7 @@ svn_ra_serf__init(const svn_version_t *loader_version,
   int serf_minor;
   int serf_patch;
 
-  SVN_ERR(svn_ver_check_list(ra_serf_version(), checklist));
+  SVN_ERR(svn_ver_check_list2(ra_serf_version(), checklist, svn_ver_equal));
 
   /* Simplified version check to make sure we can safely use the
      VTABLE parameter. The RA loader does a more exhaustive check. */
diff --git a/contrib/subversion/subversion/libsvn_ra_serf/util.c b/contrib/subversion/subversion/libsvn_ra_serf/util.c
index ce1e31a94c8..55efca4b2f8 100644
--- a/contrib/subversion/subversion/libsvn_ra_serf/util.c
+++ b/contrib/subversion/subversion/libsvn_ra_serf/util.c
@@ -191,13 +191,65 @@ construct_realm(svn_ra_serf__session_t *session,
 static char *
 convert_organisation_to_str(apr_hash_t *org, apr_pool_t *pool)
 {
-  return apr_psprintf(pool, "%s, %s, %s, %s, %s (%s)",
-                      (char*)svn_hash_gets(org, "OU"),
-                      (char*)svn_hash_gets(org, "O"),
-                      (char*)svn_hash_gets(org, "L"),
-                      (char*)svn_hash_gets(org, "ST"),
-                      (char*)svn_hash_gets(org, "C"),
-                      (char*)svn_hash_gets(org, "E"));
+  const char *org_unit = svn_hash_gets(org, "OU");
+  const char *org_name = svn_hash_gets(org, "O");
+  const char *locality = svn_hash_gets(org, "L");
+  const char *state = svn_hash_gets(org, "ST");
+  const char *country = svn_hash_gets(org, "C");
+  const char *email = svn_hash_gets(org, "E");
+  svn_stringbuf_t *buf = svn_stringbuf_create_empty(pool);
+
+  if (org_unit)
+    {
+      svn_stringbuf_appendcstr(buf, org_unit);
+      svn_stringbuf_appendcstr(buf, ", ");
+    }
+
+  if (org_name)
+    {
+      svn_stringbuf_appendcstr(buf, org_name);
+      svn_stringbuf_appendcstr(buf, ", ");
+    }
+
+  if (locality)
+    {
+      svn_stringbuf_appendcstr(buf, locality);
+      svn_stringbuf_appendcstr(buf, ", ");
+    }
+
+  if (state)
+    {
+      svn_stringbuf_appendcstr(buf, state);
+      svn_stringbuf_appendcstr(buf, ", ");
+    }
+
+  if (country)
+    {
+      svn_stringbuf_appendcstr(buf, country);
+      svn_stringbuf_appendcstr(buf, ", ");
+    }
+
+  /* Chop ', ' if any. */
+  svn_stringbuf_chop(buf, 2);
+
+  if (email)
+    {
+      svn_stringbuf_appendcstr(buf, "(");
+      svn_stringbuf_appendcstr(buf, email);
+      svn_stringbuf_appendcstr(buf, ")");
+    }
+
+  return buf->data;
+}
+
+static void append_reason(svn_stringbuf_t *errmsg, const char *reason, int *reasons)
+{
+  if (*reasons < 1)
+    svn_stringbuf_appendcstr(errmsg, _(": "));
+  else
+    svn_stringbuf_appendcstr(errmsg, _(", "));
+  svn_stringbuf_appendcstr(errmsg, reason);
+  (*reasons)++;
 }
 
 /* This function is called on receiving a ssl certificate of a server when
@@ -258,11 +310,12 @@ ssl_server_cert(void *baton, int failures,
       for (i = 0; i < san->nelts; i++) {
           char *s = APR_ARRAY_IDX(san, i, char*);
           if (apr_fnmatch(s, conn->session->session_url.hostname,
-                          APR_FNM_PERIOD) == APR_SUCCESS) {
+                          APR_FNM_PERIOD | APR_FNM_CASE_BLIND) == APR_SUCCESS)
+            {
               found_matching_hostname = 1;
               cert_info.hostname = s;
               break;
-          }
+            }
       }
   }
 
@@ -270,7 +323,7 @@ ssl_server_cert(void *baton, int failures,
   if (!found_matching_hostname && cert_info.hostname)
     {
       if (apr_fnmatch(cert_info.hostname, conn->session->session_url.hostname,
-                      APR_FNM_PERIOD) == APR_FNM_NOMATCH)
+                      APR_FNM_PERIOD | APR_FNM_CASE_BLIND) == APR_FNM_NOMATCH)
         {
           svn_failures |= SVN_AUTH_SSL_CNMISMATCH;
         }
@@ -301,7 +354,35 @@ ssl_server_cert(void *baton, int failures,
                          SVN_AUTH_PARAM_SSL_SERVER_CERT_INFO, NULL);
 
   if (!server_creds)
-    return svn_error_create(SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED, NULL, NULL);
+    {
+      svn_stringbuf_t *errmsg;
+      int reasons = 0;
+
+      errmsg = svn_stringbuf_create(
+                 _("Server SSL certificate verification failed"),
+                 scratch_pool);
+
+
+      if (svn_failures & SVN_AUTH_SSL_NOTYETVALID)
+        append_reason(errmsg, _("certificate is not yet valid"), &reasons);
+
+      if (svn_failures & SVN_AUTH_SSL_EXPIRED)
+        append_reason(errmsg, _("certificate has expired"), &reasons);
+
+      if (svn_failures & SVN_AUTH_SSL_CNMISMATCH)
+        append_reason(errmsg,
+                      _("certificate issued for a different hostname"),
+                      &reasons);
+
+      if (svn_failures & SVN_AUTH_SSL_UNKNOWNCA)
+        append_reason(errmsg, _("issuer is not trusted"), &reasons);
+
+      if (svn_failures & SVN_AUTH_SSL_OTHER)
+        append_reason(errmsg, _("and other reason(s)"), &reasons);
+
+      return svn_error_create(SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED, NULL,
+                              errmsg->data);
+    }
 
   return SVN_NO_ERROR;
 }
@@ -746,8 +827,6 @@ svn_ra_serf__context_run_wait(svn_boolean_t *done,
          the connection timed out.  */
       if (APR_STATUS_IS_TIMEUP(status))
         {
-          svn_error_clear(err);
-          err = SVN_NO_ERROR;
           status = 0;
 
           if (sess->timeout)
@@ -758,8 +837,11 @@ svn_ra_serf__context_run_wait(svn_boolean_t *done,
                 }
               else
                 {
-                  return svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
-                                          _("Connection timed out"));
+                  return
+                      svn_error_compose_create(
+                            err,
+                            svn_error_create(SVN_ERR_RA_DAV_CONN_TIMEOUT, NULL,
+                                             _("Connection timed out")));
                 }
             }
         }
@@ -805,6 +887,23 @@ svn_ra_serf__context_run_one(svn_ra_serf__handler_t *handler,
   /* Wait until the response logic marks its DONE status.  */
   err = svn_ra_serf__context_run_wait(&handler->done, handler->session,
                                       scratch_pool);
+
+  /* A callback invocation has been canceled. In this simple case of
+     context_run_one, we can keep the ra-session operational by resetting
+     the connection.
+
+     If we don't do this, the next context run will notice that the connection
+     is still in the error state and will just return SVN_ERR_CEASE_INVOCATION
+     (=the last error for the connection) again  */
+  if (err && err->apr_err == SVN_ERR_CEASE_INVOCATION)
+    {
+      apr_status_t status = serf_connection_reset(handler->conn->conn);
+
+      if (status)
+        err = svn_error_compose_create(err,
+                                       svn_ra_serf__wrap_err(status, NULL));
+    }
+
   if (handler->server_error)
     {
       err = svn_error_compose_create(err, handler->server_error->error);
@@ -1388,19 +1487,22 @@ inject_to_parser(svn_ra_serf__xml_parser_t *ctx,
   int xml_status;
 
   xml_status = XML_Parse(ctx->xmlp, data, (int) len, 0);
-  if (xml_status == XML_STATUS_ERROR && !ctx->ignore_errors)
+
+  if (! ctx->ignore_errors)
     {
-      if (sl == NULL)
-        return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
-                                 _("XML parsing failed"));
+      SVN_ERR(ctx->error);
 
-      return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
-                               _("XML parsing failed: (%d %s)"),
-                               sl->code, sl->reason);
-    }
+      if (xml_status != XML_STATUS_OK)
+        {
+          if (sl == NULL)
+            return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+                                     _("XML parsing failed"));
 
-  if (ctx->error && !ctx->ignore_errors)
-    return svn_error_trace(ctx->error);
+          return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+                                   _("XML parsing failed: (%d %s)"),
+                                   sl->code, sl->reason);
+        }
+     }
 
   return SVN_NO_ERROR;
 }
@@ -1481,14 +1583,26 @@ svn_ra_serf__process_pending(svn_ra_serf__xml_parser_t *parser,
   if (pending_empty &&
       parser->pending->network_eof)
     {
+      int xml_status;
       SVN_ERR_ASSERT(parser->xmlp != NULL);
 
-      /* Tell the parser that no more content will be parsed. Ignore the
-         return status. We just don't care.  */
-      (void) XML_Parse(parser->xmlp, NULL, 0, 1);
+      /* Tell the parser that no more content will be parsed. */
+      xml_status = XML_Parse(parser->xmlp, NULL, 0, 1);
 
       apr_pool_cleanup_run(parser->pool, &parser->xmlp, xml_parser_cleanup);
       parser->xmlp = NULL;
+
+      if (! parser->ignore_errors)
+        {
+          SVN_ERR(parser->error);
+
+          if (xml_status != XML_STATUS_OK)
+            {
+              return svn_error_createf(SVN_ERR_RA_DAV_MALFORMED_DATA, NULL,
+                                       _("XML parsing failed"));
+            }
+        }
+
       add_done_item(parser);
     }
 
@@ -1588,22 +1702,6 @@ svn_ra_serf__handle_xml_parser(serf_request_t *request,
       return svn_error_trace(err);
     }
 
-  if (ctx->headers_baton == NULL)
-    ctx->headers_baton = serf_bucket_response_get_headers(response);
-  else if (ctx->headers_baton != serf_bucket_response_get_headers(response))
-    {
-      /* We got a new response to an existing parser...
-         This tells us the connection has restarted and we should continue
-         where we stopped last time.
-       */
-
-      /* Is this a second attempt?? */
-      if (!ctx->skip_size)
-        ctx->skip_size = ctx->read_size;
-
-      ctx->read_size = 0; /* New request, nothing read */
-    }
-
   if (!ctx->xmlp)
     {
       ctx->xmlp = XML_ParserCreate(NULL);
@@ -1623,41 +1721,11 @@ svn_ra_serf__handle_xml_parser(serf_request_t *request,
       apr_size_t len;
 
       status = serf_bucket_read(response, PARSE_CHUNK_SIZE, &data, &len);
-
       if (SERF_BUCKET_READ_ERROR(status))
         {
           return svn_ra_serf__wrap_err(status, NULL);
         }
 
-      ctx->read_size += len;
-
-      if (ctx->skip_size)
-        {
-          /* Handle restarted requests correctly: Skip what we already read */
-          apr_size_t skip;
-
-          if (ctx->skip_size >= ctx->read_size)
-            {
-            /* Eek.  What did the file shrink or something? */
-              if (APR_STATUS_IS_EOF(status))
-                {
-                  SVN_ERR_MALFUNCTION();
-                }
-
-              /* Skip on to the next iteration of this loop. */
-              if (APR_STATUS_IS_EAGAIN(status))
-                {
-                  return svn_ra_serf__wrap_err(status, NULL);
-                }
-              continue;
-            }
-
-          skip = (apr_size_t)(len - (ctx->read_size - ctx->skip_size));
-          data += skip;
-          len -= skip;
-          ctx->skip_size = 0;
-        }
-
       /* Note: once the callbacks invoked by inject_to_parser() sets the
          PAUSED flag, then it will not be cleared. write_to_pending() will
          only save the content. Logic outside of serf_context_run() will
@@ -1703,12 +1771,25 @@ svn_ra_serf__handle_xml_parser(serf_request_t *request,
              in the PENDING structures, then we're completely done.  */
           if (!HAS_PENDING_DATA(ctx->pending))
             {
+              int xml_status;
               SVN_ERR_ASSERT(ctx->xmlp != NULL);
 
-              /* Ignore the return status. We just don't care.  */
-              (void) XML_Parse(ctx->xmlp, NULL, 0, 1);
+              xml_status = XML_Parse(ctx->xmlp, NULL, 0, 1);
 
               apr_pool_cleanup_run(ctx->pool, &ctx->xmlp, xml_parser_cleanup);
+
+              if (! ctx->ignore_errors)
+                {
+                  SVN_ERR(ctx->error);
+
+                  if (xml_status != XML_STATUS_OK)
+                    {
+                      return svn_error_create(
+                                    SVN_ERR_XML_MALFORMED, NULL,
+                                    _("The XML response contains invalid XML"));
+                    }
+                }
+
               add_done_item(ctx);
             }
 
@@ -1828,12 +1909,26 @@ handle_response(serf_request_t *request,
     {
       /* Uh-oh. Our connection died.  */
       if (handler->response_error)
-        SVN_ERR(handler->response_error(request, response, 0,
-                                        handler->response_error_baton));
+        {
+          /* Give a handler chance to prevent request requeue. */
+          SVN_ERR(handler->response_error(request, response, 0,
+                                          handler->response_error_baton));
 
-      /* Requeue another request for this handler.
-         ### how do we know if the handler can deal with this?!  */
-      svn_ra_serf__request_create(handler);
+          svn_ra_serf__request_create(handler);
+        }
+      /* Response error callback is not configured. Requeue another request
+         for this handler only if we didn't started to process body.
+         Return error otherwise. */
+      else if (!handler->reading_body)
+        {
+          svn_ra_serf__request_create(handler);
+        }
+      else
+        {
+          return svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
+                                    _("%s request on '%s' failed"),
+                                   handler->method, handler->path);
+        }
 
       return SVN_NO_ERROR;
     }
@@ -2417,6 +2512,10 @@ svn_ra_serf__error_on_status(serf_status_line sline,
                       "server or an intermediate proxy does not accept "
                       "chunked encoding. Try setting 'http-chunked-requests' "
                       "to 'auto' or 'no' in your client configuration."));
+      case 501:
+        return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+                                 _("The requested feature is not supported by "
+                                   "'%s'"), path);
     }
 
   if (sline.code >= 300)
diff --git a/contrib/subversion/subversion/libsvn_ra_svn/client.c b/contrib/subversion/subversion/libsvn_ra_svn/client.c
index 2157e420619..335f3215a69 100644
--- a/contrib/subversion/subversion/libsvn_ra_svn/client.c
+++ b/contrib/subversion/subversion/libsvn_ra_svn/client.c
@@ -50,6 +50,7 @@
 #include "svn_private_config.h"
 
 #include "private/svn_fspath.h"
+#include "private/svn_subr_private.h"
 
 #include "../libsvn_ra/ra_loader.h"
 
@@ -701,7 +702,7 @@ static svn_error_t *open_session(svn_ra_svn__session_baton_t **sess_p,
   N_("Module for accessing a repository using the svn network protocol.")
 #endif
 
-static const char *ra_svn_get_description(void)
+static const char *ra_svn_get_description(apr_pool_t *pool)
 {
   return _(RA_SVN_DESCRIPTION);
 }
@@ -2775,7 +2776,7 @@ svn_ra_svn__init(const svn_version_t *loader_version,
       { NULL, NULL }
     };
 
-  SVN_ERR(svn_ver_check_list(svn_ra_svn_version(), checklist));
+  SVN_ERR(svn_ver_check_list2(svn_ra_svn_version(), checklist, svn_ver_equal));
 
   /* Simplified version check to make sure we can safely use the
      VTABLE parameter. The RA loader does a more exhaustive check. */
diff --git a/contrib/subversion/subversion/libsvn_subr/auth.c b/contrib/subversion/subversion/libsvn_subr/auth.c
index 540635827d3..9dc4c776336 100644
--- a/contrib/subversion/subversion/libsvn_subr/auth.c
+++ b/contrib/subversion/subversion/libsvn_subr/auth.c
@@ -36,6 +36,7 @@
 #include "svn_dso.h"
 #include "svn_version.h"
 #include "private/svn_dep_compat.h"
+#include "private/svn_subr_private.h"
 
 #include "auth.h"
 
@@ -478,7 +479,8 @@ svn_auth_get_platform_specific_provider(svn_auth_provider_object_t **provider,
               check_list[0].version_query = version_function;
               check_list[1].label = NULL;
               check_list[1].version_query = NULL;
-              SVN_ERR(svn_ver_check_list(svn_subr_version(), check_list));
+              SVN_ERR(svn_ver_check_list2(svn_subr_version(), check_list,
+                                          svn_ver_equal));
             }
           if (apr_dso_sym(&provider_function_symbol,
                           dso,
diff --git a/contrib/subversion/subversion/libsvn_subr/cache_config.c b/contrib/subversion/subversion/libsvn_subr/cache_config.c
index 86c12dc49dd..17659f8c851 100644
--- a/contrib/subversion/subversion/libsvn_subr/cache_config.c
+++ b/contrib/subversion/subversion/libsvn_subr/cache_config.c
@@ -23,6 +23,7 @@
 #include <apr_atomic.h>
 
 #include "svn_cache_config.h"
+#include "private/svn_atomic.h"
 #include "private/svn_cache.h"
 
 #include "svn_pools.h"
@@ -69,30 +70,27 @@ svn_cache_config_get(void)
   return &cache_settings;
 }
 
-/* Access the process-global (singleton) membuffer cache. The first call
- * will automatically allocate the cache using the current cache config.
- * NULL will be returned if the desired cache size is 0 or if the cache
- * could not be created for some reason.
+/* Initializer function as required by svn_atomic__init_once.  Allocate
+ * the process-global (singleton) membuffer cache and return it in the
+ * svn_membuffer_t * in *BATON.  UNUSED_POOL is unused and should be NULL.
  */
-svn_membuffer_t *
-svn_cache__get_global_membuffer_cache(void)
+static svn_error_t *
+initialize_cache(void *baton, apr_pool_t *unused_pool)
 {
-  static svn_membuffer_t * volatile cache = NULL;
+  svn_membuffer_t **cache_p = baton;
+  svn_membuffer_t *cache = NULL;
 
   apr_uint64_t cache_size = cache_settings.cache_size;
-  if (!cache && cache_size)
+  if (cache_size)
     {
       svn_error_t *err;
 
-      svn_membuffer_t *old_cache = NULL;
-      svn_membuffer_t *new_cache = NULL;
-
       /* auto-allocate cache */
       apr_allocator_t *allocator = NULL;
       apr_pool_t *pool = NULL;
 
       if (apr_allocator_create(&allocator))
-        return NULL;
+        return SVN_NO_ERROR;
 
       /* Ensure that we free partially allocated data if we run OOM
        * before the cache is complete: If the cache cannot be allocated
@@ -112,11 +110,11 @@ svn_cache__get_global_membuffer_cache(void)
        */
       apr_pool_create_ex(&pool, NULL, NULL, allocator);
       if (pool == NULL)
-        return NULL;
+        return SVN_NO_ERROR;
       apr_allocator_owner_set(allocator, pool);
 
       err = svn_cache__membuffer_cache_create(
-          &new_cache,
+          &cache,
           (apr_size_t)cache_size,
           (apr_size_t)(cache_size / 10),
           0,
@@ -129,33 +127,40 @@ svn_cache__get_global_membuffer_cache(void)
        */
       if (err)
         {
-          /* Memory and error cleanup */
-          svn_error_clear(err);
+          /* Memory cleanup */
           svn_pool_destroy(pool);
 
-          /* Prevent future attempts to create the cache. However, an
-           * existing cache instance (see next comment) remains valid.
-           */
+          /* Document that we actually don't have a cache. */
           cache_settings.cache_size = 0;
 
-          /* The current caller won't get the cache object.
-           * However, a concurrent call might have succeeded in creating
-           * the cache object. That call and all following ones will then
-           * use the successfully created cache instance.
-           */
-          return NULL;
+          return svn_error_trace(err);
         }
 
-      /* Handle race condition: if we are the first to create a
-       * cache object, make it our global singleton. Otherwise,
-       * discard the new cache and keep the existing one.
-       *
-       * Cast is necessary because of APR bug:
-       * https://issues.apache.org/bugzilla/show_bug.cgi?id=50731
-       */
-      old_cache = apr_atomic_casptr((volatile void **)&cache, new_cache, NULL);
-      if (old_cache != NULL)
-        svn_pool_destroy(pool);
+      /* done */
+      *cache_p = cache;
+    }
+
+  return SVN_NO_ERROR;
+}
+
+/* Access the process-global (singleton) membuffer cache. The first call
+ * will automatically allocate the cache using the current cache config.
+ * NULL will be returned if the desired cache size is 0 or if the cache
+ * could not be created for some reason.
+ */
+svn_membuffer_t *
+svn_cache__get_global_membuffer_cache(void)
+{
+  static svn_membuffer_t *cache = NULL;
+  static svn_atomic_t initialized = 0;
+
+  svn_error_t *err
+    = svn_atomic__init_once(&initialized, initialize_cache, &cache, NULL);
+  if (err)
+    {
+      /* no caches today ... */
+      svn_error_clear(err);
+      return NULL;
     }
 
   return cache;
diff --git a/contrib/subversion/subversion/libsvn_subr/cmdline.c b/contrib/subversion/subversion/libsvn_subr/cmdline.c
index 8484c96a374..f52fa29833e 100644
--- a/contrib/subversion/subversion/libsvn_subr/cmdline.c
+++ b/contrib/subversion/subversion/libsvn_subr/cmdline.c
@@ -356,7 +356,7 @@ svn_cmdline_fputs(const char *string, FILE* stream, apr_pool_t *pool)
         {
           /* ### Issue #3014: Return a specific error for broken pipes,
            * ### with a single element in the error chain. */
-          if (APR_STATUS_IS_EPIPE(apr_get_os_error()))
+          if (SVN__APR_STATUS_IS_EPIPE(apr_get_os_error()))
             return svn_error_create(SVN_ERR_IO_PIPE_WRITE_ERROR, NULL, NULL);
           else
             return svn_error_wrap_apr(apr_get_os_error(), _("Write error"));
@@ -379,7 +379,7 @@ svn_cmdline_fflush(FILE *stream)
         {
           /* ### Issue #3014: Return a specific error for broken pipes,
            * ### with a single element in the error chain. */
-          if (APR_STATUS_IS_EPIPE(apr_get_os_error()))
+          if (SVN__APR_STATUS_IS_EPIPE(apr_get_os_error()))
             return svn_error_create(SVN_ERR_IO_PIPE_WRITE_ERROR, NULL, NULL);
           else
             return svn_error_wrap_apr(apr_get_os_error(), _("Write error"));
diff --git a/contrib/subversion/subversion/libsvn_subr/config_auth.c b/contrib/subversion/subversion/libsvn_subr/config_auth.c
index d53403c44b4..091e4e84abc 100644
--- a/contrib/subversion/subversion/libsvn_subr/config_auth.c
+++ b/contrib/subversion/subversion/libsvn_subr/config_auth.c
@@ -173,12 +173,6 @@ svn_config_walk_auth_data(const char *config_dir,
       NULL
     };
 
-  if (! config_dir)
-    {
-      /* Can't locate the cache to clear */
-      return SVN_NO_ERROR;
-    }
-
   iterpool = svn_pool_create(scratch_pool);
   for (i = 0; cred_kinds[i]; i++)
     {
diff --git a/contrib/subversion/subversion/libsvn_subr/deprecated.c b/contrib/subversion/subversion/libsvn_subr/deprecated.c
index 378b3f828ed..93bd89db5cd 100644
--- a/contrib/subversion/subversion/libsvn_subr/deprecated.c
+++ b/contrib/subversion/subversion/libsvn_subr/deprecated.c
@@ -47,6 +47,7 @@
 #include "opt.h"
 #include "private/svn_opt_private.h"
 #include "private/svn_mergeinfo_private.h"
+#include "private/svn_subr_private.h"
 
 #include "svn_private_config.h"
 
@@ -1301,4 +1302,10 @@ svn_subst_build_keywords(svn_subst_keywords_t *kw,
   return SVN_NO_ERROR;
 }
 
-
+/*** From version.c ***/
+svn_error_t *
+svn_ver_check_list(const svn_version_t *my_version,
+                   const svn_version_checklist_t *checklist)
+{
+  return svn_ver_check_list2(my_version, checklist, svn_ver_compatible);
+}
diff --git a/contrib/subversion/subversion/libsvn_subr/dirent_uri.c b/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
index 2b51e7aa2ae..4801f8c8e11 100644
--- a/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
+++ b/contrib/subversion/subversion/libsvn_subr/dirent_uri.c
@@ -1857,6 +1857,9 @@ svn_uri_is_canonical(const char *uri, apr_pool_t *scratch_pool)
 #endif /* SVN_USE_DOS_PATHS */
 
   /* Now validate the rest of the URI. */
+  seg = ptr;
+  while (*ptr && (*ptr != '/'))
+    ptr++;
   while(1)
     {
       apr_size_t seglen = ptr - seg;
@@ -1875,9 +1878,8 @@ svn_uri_is_canonical(const char *uri, apr_pool_t *scratch_pool)
 
       if (*ptr == '/')
         ptr++;
+
       seg = ptr;
-
-
       while (*ptr && (*ptr != '/'))
         ptr++;
     }
diff --git a/contrib/subversion/subversion/libsvn_subr/internal_statements.h b/contrib/subversion/subversion/libsvn_subr/internal_statements.h
index dd81d9fb7de..82a85befebd 100644
--- a/contrib/subversion/subversion/libsvn_subr/internal_statements.h
+++ b/contrib/subversion/subversion/libsvn_subr/internal_statements.h
@@ -1,4 +1,4 @@
-/* This file is automatically generated from internal_statements.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_subr/token-map.h.
+/* This file is automatically generated from internal_statements.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_subr/token-map.h.
  * Do not edit this file -- edit the source and rerun gen-make.py */
 
 #define STMT_INTERNAL_SAVEPOINT_SVN 0
diff --git a/contrib/subversion/subversion/libsvn_subr/io.c b/contrib/subversion/subversion/libsvn_subr/io.c
index d31819410f0..385ae37dbe8 100644
--- a/contrib/subversion/subversion/libsvn_subr/io.c
+++ b/contrib/subversion/subversion/libsvn_subr/io.c
@@ -3306,7 +3306,7 @@ do_io_file_wrapper_cleanup(apr_file_t *file, apr_status_t status,
 
   /* ### Issue #3014: Return a specific error for broken pipes,
    * ### with a single element in the error chain. */
-  if (APR_STATUS_IS_EPIPE(status))
+  if (SVN__APR_STATUS_IS_EPIPE(status))
     return svn_error_create(SVN_ERR_IO_PIPE_WRITE_ERROR, NULL, NULL);
 
   if (name)
diff --git a/contrib/subversion/subversion/libsvn_subr/opt.c b/contrib/subversion/subversion/libsvn_subr/opt.c
index 28ffed17872..e499089c417 100644
--- a/contrib/subversion/subversion/libsvn_subr/opt.c
+++ b/contrib/subversion/subversion/libsvn_subr/opt.c
@@ -1115,10 +1115,8 @@ svn_opt__print_version_info(const char *pgm_name,
     return svn_cmdline_printf(pool, "%s\n", SVN_VER_NUMBER);
 
   SVN_ERR(svn_cmdline_printf(pool, _("%s, version %s\n"
-                                     "   compiled %s, %s on %s\n\n"),
+                                     "   compiled on %s\n\n"),
                              pgm_name, SVN_VERSION,
-                             svn_version_ext_build_date(info),
-                             svn_version_ext_build_time(info),
                              svn_version_ext_build_host(info)));
   SVN_ERR(svn_cmdline_printf(pool, "%s\n", svn_version_ext_copyright(info)));
 
diff --git a/contrib/subversion/subversion/libsvn_subr/sysinfo.c b/contrib/subversion/subversion/libsvn_subr/sysinfo.c
index 455dca44cb6..7c37822d10a 100644
--- a/contrib/subversion/subversion/libsvn_subr/sysinfo.c
+++ b/contrib/subversion/subversion/libsvn_subr/sysinfo.c
@@ -546,7 +546,7 @@ linux_release_name(apr_pool_t *pool)
 
 #ifdef WIN32
 typedef DWORD (WINAPI *FNGETNATIVESYSTEMINFO)(LPSYSTEM_INFO);
-typedef BOOL (WINAPI *FNENUMPROCESSMODULES) (HANDLE, HMODULE, DWORD, LPDWORD);
+typedef BOOL (WINAPI *FNENUMPROCESSMODULES) (HANDLE, HMODULE*, DWORD, LPDWORD);
 
 /* Get system and version info, and try to tell the difference
    between the native system type and the runtime environment of the
@@ -763,16 +763,36 @@ win32_release_name(apr_pool_t *pool)
 static HMODULE *
 enum_loaded_modules(apr_pool_t *pool)
 {
+  HMODULE psapi_dll = 0;
   HANDLE current = GetCurrentProcess();
   HMODULE dummy[1];
   HMODULE *handles;
   DWORD size;
+  FNENUMPROCESSMODULES EnumProcessModules_;
 
-  if (!EnumProcessModules(current, dummy, sizeof(dummy), &size))
+  psapi_dll = GetModuleHandleA("psapi.dll");
+
+  if (!psapi_dll)
+    {
+      /* Load and never unload, just like static linking */
+      psapi_dll = LoadLibraryA("psapi.dll");
+    }
+
+  if (!psapi_dll)
+      return NULL;
+
+  EnumProcessModules_ = (FNENUMPROCESSMODULES)
+                              GetProcAddress(psapi_dll, "EnumProcessModules");
+
+  /* Before Windows XP psapi was an optional module */
+  if (! EnumProcessModules_)
+    return NULL;
+
+  if (!EnumProcessModules_(current, dummy, sizeof(dummy), &size))
     return NULL;
 
   handles = apr_palloc(pool, size + sizeof *handles);
-  if (!EnumProcessModules(current, handles, size, &size))
+  if (! EnumProcessModules_(current, handles, size, &size))
     return NULL;
   handles[size / sizeof *handles] = NULL;
   return handles;
diff --git a/contrib/subversion/subversion/libsvn_subr/utf.c b/contrib/subversion/subversion/libsvn_subr/utf.c
index 535e3daf9f5..4f9102d29d7 100644
--- a/contrib/subversion/subversion/libsvn_subr/utf.c
+++ b/contrib/subversion/subversion/libsvn_subr/utf.c
@@ -212,6 +212,7 @@ xlate_alloc_handle(xlate_handle_node_t **ret,
 {
   apr_status_t apr_err;
   apr_xlate_t *handle;
+  const char *name;
 
   /* The error handling doesn't support the following cases, since we don't
      use them currently.  Catch this here. */
@@ -224,8 +225,10 @@ xlate_alloc_handle(xlate_handle_node_t **ret,
 #if defined(WIN32)
   apr_err = svn_subr__win32_xlate_open((win32_xlate_t **)&handle, topage,
                                        frompage, pool);
+  name = "win32-xlate: ";
 #else
   apr_err = apr_xlate_open(&handle, topage, frompage, pool);
+  name = "APR: ";
 #endif
 
   if (APR_STATUS_IS_EINVAL(apr_err) || APR_STATUS_IS_ENOTIMPL(apr_err))
@@ -254,9 +257,9 @@ xlate_alloc_handle(xlate_handle_node_t **ret,
          later.  APR_STRERR will be in the local encoding, not in UTF-8, though.
        */
       svn_strerror(apr_err, apr_strerr, sizeof(apr_strerr));
-      return svn_error_create(apr_err, 
-                              svn_error_create(apr_err, NULL, apr_strerr),
-                              errstr);
+      return svn_error_createf(SVN_ERR_PLUGIN_LOAD_FAILURE, 
+                               svn_error_create(apr_err, NULL, apr_strerr),
+                               "%s%s", name, errstr);
     }
 
   /* Allocate and initialize the node. */
diff --git a/contrib/subversion/subversion/libsvn_subr/version.c b/contrib/subversion/subversion/libsvn_subr/version.c
index ad2a270b76e..d89a5122121 100644
--- a/contrib/subversion/subversion/libsvn_subr/version.c
+++ b/contrib/subversion/subversion/libsvn_subr/version.c
@@ -75,8 +75,10 @@ svn_boolean_t svn_ver_equal(const svn_version_t *my_version,
 
 
 svn_error_t *
-svn_ver_check_list(const svn_version_t *my_version,
-                   const svn_version_checklist_t *checklist)
+svn_ver__check_list2(const svn_version_t *my_version,
+                     const svn_version_checklist_t *checklist,
+                     svn_boolean_t (*comparator)(const svn_version_t *,
+                                                 const svn_version_t *))
 {
   svn_error_t *err = SVN_NO_ERROR;
   int i;
@@ -84,12 +86,17 @@ svn_ver_check_list(const svn_version_t *my_version,
   for (i = 0; checklist[i].label != NULL; ++i)
     {
       const svn_version_t *lib_version = checklist[i].version_query();
-      if (!svn_ver_compatible(my_version, lib_version))
+      if (!comparator(my_version, lib_version))
         err = svn_error_createf(SVN_ERR_VERSION_MISMATCH, err,
-                                _("Version mismatch in '%s':"
+                                _("Version mismatch in '%s'%s:"
                                   " found %d.%d.%d%s,"
                                   " expected %d.%d.%d%s"),
                                 checklist[i].label,
+                                comparator == svn_ver_equal
+                                ? _(" (expecting equality)")
+                                : comparator == svn_ver_compatible
+                                ? _(" (expecting compatibility)")
+                                : "",
                                 lib_version->major, lib_version->minor,
                                 lib_version->patch, lib_version->tag,
                                 my_version->major, my_version->minor,
@@ -125,8 +132,8 @@ svn_version_extended(svn_boolean_t verbose,
 {
   svn_version_extended_t *info = apr_pcalloc(pool, sizeof(*info));
 
-  info->build_date = __DATE__;
-  info->build_time = __TIME__;
+  info->build_date = NULL;
+  info->build_time = NULL;
   info->build_host = SVN_BUILD_HOST;
   info->copyright = apr_pstrdup
     (pool, _("Copyright (C) 2013 The Apache Software Foundation.\n"
diff --git a/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c b/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
index 6becc96d74d..4b665c169d7 100644
--- a/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
+++ b/contrib/subversion/subversion/libsvn_subr/win32_crashrpt.c
@@ -427,13 +427,15 @@ write_var_values(PSYMBOL_INFO sym_info, ULONG sym_size, void *baton)
 
       format_value(value_str, sym_info->ModBase, sym_info->TypeIndex,
                    (void *)var_data);
-      fprintf(log_file, "%s=%s", sym_info->Name, value_str);
+      fprintf(log_file, "%.*s=%s", (int)sym_info->NameLen, sym_info->Name,
+              value_str);
     }
   if (!log_params && sym_info->Flags & SYMFLAG_LOCAL)
     {
       format_value(value_str, sym_info->ModBase, sym_info->TypeIndex,
                    (void *)var_data);
-      fprintf(log_file, "        %s = %s\n", sym_info->Name, value_str);
+      fprintf(log_file, "        %.*s = %s\n", (int)sym_info->NameLen,
+              sym_info->Name, value_str);
     }
 
   return TRUE;
@@ -466,8 +468,10 @@ write_function_detail(STACKFRAME64 stack_frame, int nr_of_frame, FILE *log_file)
   if (SymFromAddr_(proc, stack_frame.AddrPC.Offset, &func_disp, pIHS))
     {
       fprintf(log_file,
-                    "#%d  0x%08I64x in %.200s(",
-                    nr_of_frame, stack_frame.AddrPC.Offset, pIHS->Name);
+                    "#%d  0x%08I64x in %.*s(",
+                    nr_of_frame, stack_frame.AddrPC.Offset,
+                    pIHS->NameLen > 200 ? 200 : (int)pIHS->NameLen,
+                    pIHS->Name);
 
       /* restrict symbol enumeration to this frame only */
       ih_stack_frame.InstructionOffset = stack_frame.AddrPC.Offset;
diff --git a/contrib/subversion/subversion/libsvn_wc/diff.h b/contrib/subversion/subversion/libsvn_wc/diff.h
index d16a9e5eecc..ebaf5a8825c 100644
--- a/contrib/subversion/subversion/libsvn_wc/diff.h
+++ b/contrib/subversion/subversion/libsvn_wc/diff.h
@@ -38,7 +38,9 @@
 extern "C" {
 #endif /* __cplusplus */
 
-/* Reports the file LOCAL_ABSPATH as ADDED file with relpath RELPATH to
+/* A function to diff locally added and locally copied files.
+  
+   Reports the file LOCAL_ABSPATH as ADDED file with relpath RELPATH to
    PROCESSOR with as parent baton PROCESSOR_PARENT_BATON.
 
    The node is expected to have status svn_wc__db_status_normal, or
@@ -61,7 +63,9 @@ svn_wc__diff_local_only_file(svn_wc__db_t *db,
                              void *cancel_baton,
                              apr_pool_t *scratch_pool);
 
-/* Reports the directory LOCAL_ABSPATH and everything below it (limited by
+/* A function to diff locally added and locally copied directories.
+  
+   Reports the directory LOCAL_ABSPATH and everything below it (limited by
    DEPTH) as added with relpath RELPATH to PROCESSOR with as parent baton
    PROCESSOR_PARENT_BATON.
 
diff --git a/contrib/subversion/subversion/libsvn_wc/diff_editor.c b/contrib/subversion/subversion/libsvn_wc/diff_editor.c
index 839241f9db6..b4268843893 100644
--- a/contrib/subversion/subversion/libsvn_wc/diff_editor.c
+++ b/contrib/subversion/subversion/libsvn_wc/diff_editor.c
@@ -474,14 +474,18 @@ svn_wc__diff_base_working_diff(svn_wc__db_t *db,
     {
       const svn_io_dirent2_t *dirent;
 
+      /* Verify truename to mimic status for iota/IOTA difference on Windows */
       SVN_ERR(svn_io_stat_dirent2(&dirent, local_abspath,
-                                  FALSE /* verify truename */,
+                                  TRUE /* verify truename */,
                                   TRUE /* ingore_enoent */,
                                   scratch_pool, scratch_pool));
 
-      if (dirent->kind == svn_node_file
-          && dirent->filesize == recorded_size
-          && dirent->mtime == recorded_time)
+      /* If a file does not exist on disk (missing/obstructed) then we
+         can't provide a text diff */
+      if (dirent->kind != svn_node_file
+          || (dirent->kind == svn_node_file
+              && dirent->filesize == recorded_size
+              && dirent->mtime == recorded_time))
         {
           files_same = TRUE;
         }
diff --git a/contrib/subversion/subversion/libsvn_wc/diff_local.c b/contrib/subversion/subversion/libsvn_wc/diff_local.c
index ad87c76a603..0bd4a45cd44 100644
--- a/contrib/subversion/subversion/libsvn_wc/diff_local.c
+++ b/contrib/subversion/subversion/libsvn_wc/diff_local.c
@@ -195,23 +195,15 @@ diff_status_callback(void *baton,
   struct diff_baton *eb = baton;
   svn_wc__db_t *db = eb->db;
 
-  switch (status->node_status)
+  if (! status->versioned)
+    return SVN_NO_ERROR; /* unversioned (includes dir externals) */
+
+  if (status->node_status == svn_wc_status_conflicted
+      && status->text_status == svn_wc_status_none
+      && status->prop_status == svn_wc_status_none)
     {
-      case svn_wc_status_unversioned:
-      case svn_wc_status_ignored:
-        return SVN_NO_ERROR; /* No diff */
-
-      case svn_wc_status_conflicted:
-        if (status->text_status == svn_wc_status_none
-            && status->prop_status == svn_wc_status_none)
-          {
-            /* Node is an actual only node describing a tree conflict */
-            return SVN_NO_ERROR;
-          }
-        break;
-
-      default:
-        break; /* Go check other conditions */
+      /* Node is an actual only node describing a tree conflict */
+      return SVN_NO_ERROR;
     }
 
   /* Not text/prop modified, not copied. Easy out */
@@ -399,7 +391,7 @@ diff_status_callback(void *baton,
           }
       }
 
-    if (local_only)
+    if (local_only && (db_status != svn_wc__db_status_deleted))
       {
         if (db_kind == svn_node_file)
           SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
diff --git a/contrib/subversion/subversion/libsvn_wc/info.c b/contrib/subversion/subversion/libsvn_wc/info.c
index 4a37e00ab57..dc80ee72d27 100644
--- a/contrib/subversion/subversion/libsvn_wc/info.c
+++ b/contrib/subversion/subversion/libsvn_wc/info.c
@@ -548,7 +548,7 @@ svn_wc__get_info(svn_wc_context_t *wc_ctx,
                                                   &repos_uuid,
                                                   wc_ctx->db,
                                                   svn_dirent_dirname(
-                                                            local_abspath,
+                                                            this_abspath,
                                                             iterpool),
                                                   scratch_pool,
                                                   iterpool));
diff --git a/contrib/subversion/subversion/libsvn_wc/old-and-busted.c b/contrib/subversion/subversion/libsvn_wc/old-and-busted.c
index 20f7c6ca9c7..b87be85550b 100644
--- a/contrib/subversion/subversion/libsvn_wc/old-and-busted.c
+++ b/contrib/subversion/subversion/libsvn_wc/old-and-busted.c
@@ -811,11 +811,15 @@ atts_to_entry(svn_wc_entry_t **new_entry,
 
      ### not used by loggy; no need to set MODIFY_FLAGS  */
   entry->url = extract_string(atts, ENTRIES_ATTR_URL, pool);
+  if (entry->url)
+    entry->url = svn_uri_canonicalize(entry->url, pool);
 
   /* Set up repository root.  Make sure it is a prefix of url.
 
      ### not used by loggy; no need to set MODIFY_FLAGS  */
   entry->repos = extract_string(atts, ENTRIES_ATTR_REPOS, pool);
+  if (entry->repos)
+    entry->repos = svn_uri_canonicalize(entry->repos, pool);
 
   if (entry->url && entry->repos
       && !svn_uri__is_ancestor(entry->repos, entry->url))
diff --git a/contrib/subversion/subversion/libsvn_wc/update_editor.c b/contrib/subversion/subversion/libsvn_wc/update_editor.c
index a353b1b0717..e02dc301637 100644
--- a/contrib/subversion/subversion/libsvn_wc/update_editor.c
+++ b/contrib/subversion/subversion/libsvn_wc/update_editor.c
@@ -1012,9 +1012,13 @@ window_handler(svn_txdelta_window_t *window, void *baton)
 
   if (err)
     {
-      /* We failed to apply the delta; clean up the temporary file.  */
-      svn_error_clear(svn_io_remove_file2(hb->new_text_base_tmp_abspath, TRUE,
-                                          hb->pool));
+      /* We failed to apply the delta; clean up the temporary file if it
+         already created by lazy_open_target(). */
+      if (hb->new_text_base_tmp_abspath)
+        {
+          svn_error_clear(svn_io_remove_file2(hb->new_text_base_tmp_abspath,
+                                              TRUE, hb->pool));
+        }
     }
   else
     {
@@ -3009,18 +3013,55 @@ absent_node(const char *path,
       kind = svn_node_unknown;
     }
 
-  if (status == svn_wc__db_status_normal
-      && kind == svn_node_dir)
+  if (status == svn_wc__db_status_normal)
     {
-      /* We found an obstructing working copy!
+      svn_boolean_t wcroot;
+      /* We found an obstructing working copy or a file external! */
 
-         We can do two things now:
-            1) notify the user, record a skip, etc.
-            2) Just record the absent node in BASE in the parent
-               working copy.
+      SVN_ERR(svn_wc__db_is_wcroot(&wcroot, eb->db, local_abspath,
+                                   scratch_pool));
 
-         As option 2 happens to be exactly what we do anyway, lets do that.
-      */
+      if (wcroot)
+        {
+          /*
+             We have an obstructing working copy; possibly a directory external
+
+             We can do two things now:
+             1) notify the user, record a skip, etc.
+             2) Just record the absent node in BASE in the parent
+                working copy.
+
+             As option 2 happens to be exactly what we do anyway, fall through.
+           */
+        }
+      else
+        {
+          /* The server asks us to replace a file external
+             (Existing BASE node; not reported by the working copy crawler or
+              there would have been a delete_entry() call.
+
+             There is no way we can store this state in the working copy as
+             the BASE layer is already filled.
+
+             We could error out, but that is not helping anybody; the user is not
+             even seeing with what the file external would be replaced, so let's
+             report a skip and continue the update.
+           */
+
+          if (eb->notify_func)
+            {
+              svn_wc_notify_t *notify;
+              notify = svn_wc_create_notify(
+                                    local_abspath,
+                                    svn_wc_notify_update_skip_obstruction,
+                                    scratch_pool);
+
+              eb->notify_func(eb->notify_baton, notify, scratch_pool);
+            }
+
+          svn_pool_destroy(scratch_pool);
+          return SVN_NO_ERROR;
+        }
     }
   else if (status == svn_wc__db_status_not_present
            || status == svn_wc__db_status_server_excluded
diff --git a/contrib/subversion/subversion/libsvn_wc/wc-checks.h b/contrib/subversion/subversion/libsvn_wc/wc-checks.h
index 43ab4cc18ee..3d87a03b74f 100644
--- a/contrib/subversion/subversion/libsvn_wc/wc-checks.h
+++ b/contrib/subversion/subversion/libsvn_wc/wc-checks.h
@@ -1,4 +1,4 @@
-/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_wc/token-map.h.
+/* This file is automatically generated from wc-checks.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_wc/token-map.h.
  * Do not edit this file -- edit the source and rerun gen-make.py */
 
 #define STMT_VERIFICATION_TRIGGERS 0
diff --git a/contrib/subversion/subversion/libsvn_wc/wc-metadata.h b/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
index d0421788d8a..2e3182de64e 100644
--- a/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
+++ b/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
@@ -1,4 +1,4 @@
-/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_wc/token-map.h.
+/* This file is automatically generated from wc-metadata.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_wc/token-map.h.
  * Do not edit this file -- edit the source and rerun gen-make.py */
 
 #define STMT_CREATE_SCHEMA 0
diff --git a/contrib/subversion/subversion/libsvn_wc/wc-queries.h b/contrib/subversion/subversion/libsvn_wc/wc-queries.h
index 950f6257f9a..edcf81e3bc7 100644
--- a/contrib/subversion/subversion/libsvn_wc/wc-queries.h
+++ b/contrib/subversion/subversion/libsvn_wc/wc-queries.h
@@ -1,4 +1,4 @@
-/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.1/subversion/libsvn_wc/token-map.h.
+/* This file is automatically generated from wc-queries.sql and .dist_sandbox/subversion-1.8.5/subversion/libsvn_wc/token-map.h.
  * Do not edit this file -- edit the source and rerun gen-make.py */
 
 #define STMT_SELECT_NODE_INFO 0
@@ -2000,7 +2000,7 @@
 #define STMT_SELECT_MOVED_OUTSIDE 191
 #define STMT_191_INFO {"STMT_SELECT_MOVED_OUTSIDE", NULL}
 #define STMT_191 \
-  "SELECT local_relpath, moved_to FROM nodes " \
+  "SELECT local_relpath, moved_to, op_depth FROM nodes " \
   "WHERE wc_id = ?1 " \
   "  AND (local_relpath = ?2 OR (((local_relpath) > (CASE (?2) WHEN '' THEN '' ELSE (?2) || '/' END)) AND ((local_relpath) < CASE (?2) WHEN '' THEN X'FFFF' ELSE (?2) || '0' END))) " \
   "  AND op_depth >= ?3 " \
diff --git a/contrib/subversion/subversion/libsvn_wc/wc-queries.sql b/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
index d5f7e82557f..d275a7bada0 100644
--- a/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
+++ b/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
@@ -1571,7 +1571,7 @@ WHERE wc_id = ?1
   AND moved_to IS NOT NULL
 
 -- STMT_SELECT_MOVED_OUTSIDE
-SELECT local_relpath, moved_to FROM nodes
+SELECT local_relpath, moved_to, op_depth FROM nodes
 WHERE wc_id = ?1
   AND (local_relpath = ?2 OR IS_STRICT_DESCENDANT_OF(local_relpath, ?2))
   AND op_depth >= ?3
diff --git a/contrib/subversion/subversion/libsvn_wc/wc_db.c b/contrib/subversion/subversion/libsvn_wc/wc_db.c
index e41165765d4..8b024c2f18e 100644
--- a/contrib/subversion/subversion/libsvn_wc/wc_db.c
+++ b/contrib/subversion/subversion/libsvn_wc/wc_db.c
@@ -2248,6 +2248,12 @@ db_base_remove(svn_wc__db_wcroot_t *wcroot,
        * might introduce actual-only nodes without direct parents,
        * and we're not yet sure if other existing code is prepared
        * to handle such nodes. To be revisited post-1.8.
+       *
+       * ### In case of a conflict we are most likely creating WORKING nodes
+       *     describing a copy of what was in BASE. The move information
+       *     should be updated to describe a move from the WORKING layer.
+       *     When stored that way the resolver of the tree conflict still has
+       *     the knowledge of what was moved.
        */
       SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
                                         STMT_SELECT_MOVED_OUTSIDE));
@@ -6388,6 +6394,7 @@ op_revert_txn(void *baton,
     {
       SVN_ERR(svn_wc__db_resolve_break_moved_away_internal(wcroot,
                                                            local_relpath,
+                                                           op_depth,
                                                            scratch_pool));
     }
   else
@@ -6554,10 +6561,12 @@ op_revert_recursive_txn(void *baton,
   while (have_row)
     {
       const char *move_src_relpath = svn_sqlite__column_text(stmt, 0, NULL);
+      int move_op_depth = svn_sqlite__column_int(stmt, 2);
       svn_error_t *err;
 
       err = svn_wc__db_resolve_break_moved_away_internal(wcroot,
                                                          move_src_relpath,
+                                                         move_op_depth,
                                                          scratch_pool);
       if (err)
         return svn_error_compose_create(err, svn_sqlite__reset(stmt));
diff --git a/contrib/subversion/subversion/libsvn_wc/wc_db.h b/contrib/subversion/subversion/libsvn_wc/wc_db.h
index 88e455fb51d..61906e3cb64 100644
--- a/contrib/subversion/subversion/libsvn_wc/wc_db.h
+++ b/contrib/subversion/subversion/libsvn_wc/wc_db.h
@@ -3382,7 +3382,14 @@ svn_wc__db_resolve_delete_raise_moved_away(svn_wc__db_t *db,
                                            apr_pool_t *scratch_pool);
 
 /* Like svn_wc__db_resolve_delete_raise_moved_away this should be
-   combined. */
+   combined.
+   
+   ### LOCAL_ABSPATH specifies the move origin, but the move origin
+   ### is not necessary unique enough. This function needs an op_root_abspath
+   ### argument to differentiate between different origins.
+
+   ### See move_tests.py: move_many_update_delete for an example case.
+   */
 svn_error_t *
 svn_wc__db_resolve_break_moved_away(svn_wc__db_t *db,
                                     const char *local_abspath,
diff --git a/contrib/subversion/subversion/libsvn_wc/wc_db_private.h b/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
index 0679b32e7e3..e8f31d13237 100644
--- a/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
+++ b/contrib/subversion/subversion/libsvn_wc/wc_db_private.h
@@ -442,9 +442,12 @@ svn_wc__db_bump_moved_away(svn_wc__db_wcroot_t *wcroot,
                            svn_wc__db_t *db,
                            apr_pool_t *scratch_pool);
 
+/* Unbreak the move from LOCAL_RELPATH on op-depth in WCROOT, by making
+   the destination a normal copy */
 svn_error_t *
 svn_wc__db_resolve_break_moved_away_internal(svn_wc__db_wcroot_t *wcroot,
                                              const char *local_relpath,
+                                             int op_depth,
                                              apr_pool_t *scratch_pool);
 
 svn_error_t *
diff --git a/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c b/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
index a8cce76c0c0..7f4f8539952 100644
--- a/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
+++ b/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
@@ -2284,30 +2284,34 @@ svn_wc__db_bump_moved_away(svn_wc__db_wcroot_t *wcroot,
                            svn_wc__db_t *db,
                            apr_pool_t *scratch_pool)
 {
-  const char *dummy1, *move_dst_op_root_relpath;
-  const char *move_src_root_relpath, *move_src_op_root_relpath;
   apr_hash_t *src_done;
 
   SVN_ERR(svn_sqlite__exec_statements(wcroot->sdb,
                                       STMT_CREATE_UPDATE_MOVE_LIST));
 
-  SVN_ERR(svn_wc__db_op_depth_moved_to(&dummy1, &move_dst_op_root_relpath,
-                                       &move_src_root_relpath,
-                                       &move_src_op_root_relpath, 0,
-                                       wcroot, local_relpath,
-                                       scratch_pool, scratch_pool));
-
-  if (move_src_root_relpath)
+  if (local_relpath[0] != '\0')
     {
-      if (strcmp(move_src_root_relpath, local_relpath))
-        {
-          SVN_ERR(bump_mark_tree_conflict(wcroot, move_src_root_relpath,
-                                          move_src_op_root_relpath,
-                                          move_dst_op_root_relpath,
-                                          db, scratch_pool));
-          return SVN_NO_ERROR;
-        }
+      const char *dummy1, *move_dst_op_root_relpath;
+      const char *move_src_root_relpath, *move_src_op_root_relpath;
 
+      /* Is the root of the update moved away? (Impossible for the wcroot) */
+      SVN_ERR(svn_wc__db_op_depth_moved_to(&dummy1, &move_dst_op_root_relpath,
+                                           &move_src_root_relpath,
+                                           &move_src_op_root_relpath, 0,
+                                           wcroot, local_relpath,
+                                           scratch_pool, scratch_pool));
+
+      if (move_src_root_relpath)
+        {
+          if (strcmp(move_src_root_relpath, local_relpath))
+            {
+              SVN_ERR(bump_mark_tree_conflict(wcroot, move_src_root_relpath,
+                                              move_src_op_root_relpath,
+                                              move_dst_op_root_relpath,
+                                              db, scratch_pool));
+              return SVN_NO_ERROR;
+            }
+        }
     }
 
   src_done = apr_hash_make(scratch_pool);
@@ -2440,17 +2444,23 @@ break_move(svn_wc__db_wcroot_t *wcroot,
 svn_error_t *
 svn_wc__db_resolve_break_moved_away_internal(svn_wc__db_wcroot_t *wcroot,
                                              const char *local_relpath,
+                                             int op_depth,
                                              apr_pool_t *scratch_pool)
 {
   const char *dummy1, *move_dst_op_root_relpath;
   const char *dummy2, *move_src_op_root_relpath;
 
+  /* We want to include the passed op-depth, but the function does a > check */
   SVN_ERR(svn_wc__db_op_depth_moved_to(&dummy1, &move_dst_op_root_relpath,
                                        &dummy2,
                                        &move_src_op_root_relpath,
-                                       relpath_depth(local_relpath) - 1,
+                                       op_depth - 1,
                                        wcroot, local_relpath,
                                        scratch_pool, scratch_pool));
+
+  SVN_ERR_ASSERT(move_src_op_root_relpath != NULL
+                 && move_dst_op_root_relpath != NULL);
+
   SVN_ERR(break_move(wcroot, local_relpath,
                      relpath_depth(move_src_op_root_relpath),
                      move_dst_op_root_relpath,
@@ -2519,6 +2529,7 @@ svn_wc__db_resolve_break_moved_away(svn_wc__db_t *db,
 
   SVN_WC__DB_WITH_TXN(
     svn_wc__db_resolve_break_moved_away_internal(wcroot, local_relpath,
+                                                 relpath_depth(local_relpath),
                                                  scratch_pool),
     wcroot);
 
diff --git a/contrib/subversion/subversion/svn/cl.h b/contrib/subversion/subversion/svn/cl.h
index 8cc358c9822..8a732c7e8a4 100644
--- a/contrib/subversion/subversion/svn/cl.h
+++ b/contrib/subversion/subversion/svn/cl.h
@@ -424,12 +424,12 @@ svn_cl__time_cstring_to_human_cstring(const char **human_cstring,
    Increment *TEXT_CONFLICTS, *PROP_CONFLICTS, or *TREE_CONFLICTS if
    a conflict was encountered.
 
-   Use CWD_ABSPATH -- the absolute path of the current working
-   directory -- to shorten PATH into something relative to that
-   directory as necessary.
+   Use TARGET_ABSPATH and TARGET_PATH to shorten PATH into something
+   relative to the target as necessary.
 */
 svn_error_t *
-svn_cl__print_status(const char *cwd_abspath,
+svn_cl__print_status(const char *target_abspath,
+                     const char *target_path,
                      const char *path,
                      const svn_client_status_t *status,
                      svn_boolean_t suppress_externals_placeholders,
@@ -447,12 +447,12 @@ svn_cl__print_status(const char *cwd_abspath,
 /* Print STATUS for PATH in XML to stdout.  Use POOL for temporary
    allocations.
 
-   Use CWD_ABSPATH -- the absolute path of the current working
-   directory -- to shorten PATH into something relative to that
-   directory as necessary.
+   Use TARGET_ABSPATH and TARGET_PATH to shorten PATH into something
+   relative to the target as necessary.
  */
 svn_error_t *
-svn_cl__print_status_xml(const char *cwd_abspath,
+svn_cl__print_status_xml(const char *target_abspath,
+                         const char *target_path,
                          const char *path,
                          const svn_client_status_t *status,
                          svn_client_ctx_t *ctx,
diff --git a/contrib/subversion/subversion/svn/status-cmd.c b/contrib/subversion/subversion/svn/status-cmd.c
index 0a73daccc71..12edd8e42a4 100644
--- a/contrib/subversion/subversion/svn/status-cmd.c
+++ b/contrib/subversion/subversion/svn/status-cmd.c
@@ -51,7 +51,8 @@ struct status_baton
 {
   /* These fields all correspond to the ones in the
      svn_cl__print_status() interface. */
-  const char *cwd_abspath;
+  const char *target_abspath;
+  const char *target_path;
   svn_boolean_t suppress_externals_placeholders;
   svn_boolean_t detailed;
   svn_boolean_t show_last_committed;
@@ -77,6 +78,8 @@ struct status_baton
 struct status_cache
 {
   const char *path;
+  const char *target_abspath;
+  const char *target_path;
   svn_client_status_t *status;
 };
 
@@ -152,10 +155,11 @@ print_status_normal_or_xml(void *baton,
   struct status_baton *sb = baton;
 
   if (sb->xml_mode)
-    return svn_cl__print_status_xml(sb->cwd_abspath, path, status,
-                                    sb->ctx, pool);
+    return svn_cl__print_status_xml(sb->target_abspath, sb->target_path,
+                                    path, status, sb->ctx, pool);
   else
-    return svn_cl__print_status(sb->cwd_abspath, path, status,
+    return svn_cl__print_status(sb->target_abspath, sb->target_path,
+                                path, status,
                                 sb->suppress_externals_placeholders,
                                 sb->detailed,
                                 sb->show_last_committed,
@@ -239,6 +243,8 @@ print_status(void *baton,
       const char *cl_key = apr_pstrdup(sb->cl_pool, status->changelist);
       struct status_cache *scache = apr_pcalloc(sb->cl_pool, sizeof(*scache));
       scache->path = apr_pstrdup(sb->cl_pool, path);
+      scache->target_abspath = apr_pstrdup(sb->cl_pool, sb->target_abspath);
+      scache->target_path = apr_pstrdup(sb->cl_pool, sb->target_path);
       scache->status = svn_client_status_dup(status, sb->cl_pool);
 
       path_array =
@@ -303,7 +309,6 @@ svn_cl__status(apr_getopt_t *os,
                                   "mode"));
     }
 
-  SVN_ERR(svn_dirent_get_absolute(&(sb.cwd_abspath), "", scratch_pool));
   sb.suppress_externals_placeholders = (opt_state->quiet
                                         && (! opt_state->verbose));
   sb.detailed = (opt_state->verbose || opt_state->update);
@@ -328,6 +333,10 @@ svn_cl__status(apr_getopt_t *os,
 
       svn_pool_clear(iterpool);
 
+      SVN_ERR(svn_dirent_get_absolute(&(sb.target_abspath), target,
+                                      scratch_pool));
+      sb.target_path = target;
+
       SVN_ERR(svn_cl__check_cancel(ctx->cancel_baton));
 
       if (opt_state->xml)
@@ -392,6 +401,8 @@ svn_cl__status(apr_getopt_t *os,
             {
               struct status_cache *scache =
                 APR_ARRAY_IDX(path_array, j, struct status_cache *);
+              sb.target_abspath = scache->target_abspath;
+              sb.target_path = scache->target_path;
               SVN_ERR(print_status_normal_or_xml(&sb, scache->path,
                                                  scache->status, scratch_pool));
             }
diff --git a/contrib/subversion/subversion/svn/status.c b/contrib/subversion/subversion/svn/status.c
index 3679bfff9f8..9f1ad341baf 100644
--- a/contrib/subversion/subversion/svn/status.c
+++ b/contrib/subversion/subversion/svn/status.c
@@ -137,69 +137,84 @@ generate_status_desc(enum svn_wc_status_kind status)
 }
 
 /* Make a relative path containing '..' elements as needed.
-   RELATIVE_TO_PATH must be the path to a directory (not a file!) and
-   TARGET_PATH must be the path to any file or directory. Both
-   RELATIVE_TO_PATH and TARGET_PATH must be based on the same parent path,
-   i.e. they can either both be absolute or they can both be relative to the
-   same parent directory. Both paths are expected to be canonical.
+   TARGET_ABSPATH shall be the absolute version of TARGET_PATH.
+   TARGET_ABSPATH, TARGET_PATH and PATH shall be canonical.
 
-   If above conditions are met, a relative path that leads to TARGET_ABSPATH
-   from RELATIVE_TO_PATH is returned, but there is no error checking involved.
+   If above conditions are met, a relative path that leads to PATH
+   from TARGET_PATH is returned, but there is no error checking involved.
 
-   The returned path is allocated from RESULT_POOL, all other allocations are
-   made in SCRATCH_POOL. */
+   The returned path is allocated from RESULT_POOL, all other
+   allocations are made in SCRATCH_POOL.  */
 static const char *
-make_relpath(const char *relative_to_path,
+make_relpath(const char *target_abspath,
              const char *target_path,
+             const char *path,
              apr_pool_t *result_pool,
              apr_pool_t *scratch_pool)
 {
   const char *la;
   const char *parent_dir_els = "";
+  const char *abspath, *relative;
+  svn_error_t *err = svn_dirent_get_absolute(&abspath, path, scratch_pool);
+
+  if (err)
+    {
+      /* We probably got passed some invalid path. */
+      svn_error_clear(err);
+      return apr_pstrdup(result_pool, path);
+    }
+
+  relative = svn_dirent_skip_ancestor(target_abspath, abspath);
+  if (relative)
+    {
+      return svn_dirent_join(target_path, relative, result_pool);
+    }
 
   /* An example:
    *  relative_to_path = /a/b/c
-   *  target_path      = /a/x/y/z
+   *  path             = /a/x/y/z
    *  result           = ../../x/y/z
    *
    * Another example (Windows specific):
    *  relative_to_path = F:/wc
-   *  target_path      = C:/wc
+   *  path             = C:/wc
    *  result           = C:/wc
    */
 
   /* Skip the common ancestor of both paths, here '/a'. */
-  la = svn_dirent_get_longest_ancestor(relative_to_path, target_path,
+  la = svn_dirent_get_longest_ancestor(target_abspath, abspath,
                                        scratch_pool);
   if (*la == '\0')
     {
       /* Nothing in common: E.g. C:/ vs F:/ on Windows */
-      return apr_pstrdup(result_pool, target_path);
+      return apr_pstrdup(result_pool, path);
     }
-  relative_to_path = svn_dirent_skip_ancestor(la, relative_to_path);
-  target_path = svn_dirent_skip_ancestor(la, target_path);
+  relative = svn_dirent_skip_ancestor(la, target_abspath);
+  path = svn_dirent_skip_ancestor(la, path);
 
   /* In above example, we'd now have:
    *  relative_to_path = b/c
-   *  target_path      = x/y/z */
+   *  path             = x/y/z */
 
   /* Count the elements of relative_to_path and prepend as many '..' elements
-   * to target_path. */
-  while (*relative_to_path)
+   * to path. */
+  while (*relative)
     {
-      svn_dirent_split(&relative_to_path, NULL, relative_to_path,
+      svn_dirent_split(&relative, NULL, relative,
                        scratch_pool);
       parent_dir_els = svn_dirent_join(parent_dir_els, "..", scratch_pool);
     }
 
-  return svn_dirent_join(parent_dir_els, target_path, result_pool);
+  return svn_dirent_join(parent_dir_els, path, result_pool);
 }
 
 
 /* Print STATUS and PATH in a format determined by DETAILED and
    SHOW_LAST_COMMITTED. */
 static svn_error_t *
-print_status(const char *cwd_abspath, const char *path,
+print_status(const char *target_abspath,
+             const char *target_path,
+             const char *path,
              svn_boolean_t detailed,
              svn_boolean_t show_last_committed,
              svn_boolean_t repos_locks,
@@ -217,7 +232,7 @@ print_status(const char *cwd_abspath, const char *path,
   const char *moved_from_line = "";
   const char *moved_to_line = "";
 
-  path = make_relpath(cwd_abspath, path, pool, pool);
+  path = make_relpath(target_abspath, target_path, path, pool, pool);
 
   /* For historic reasons svn ignores the property status for added nodes, even
      if these nodes were copied and have local property changes.
@@ -294,7 +309,8 @@ print_status(const char *cwd_abspath, const char *path,
     {
       const char *relpath;
 
-      relpath = make_relpath(cwd_abspath, status->moved_from_abspath,
+      relpath = make_relpath(target_abspath, target_path,
+                             status->moved_from_abspath,
                              pool, pool);
       relpath = svn_dirent_local_style(relpath, pool);
       moved_from_line = apr_pstrcat(pool, "\n        > ",
@@ -309,7 +325,8 @@ print_status(const char *cwd_abspath, const char *path,
 
       if (status->moved_from_abspath)
         {
-          relpath = make_relpath(cwd_abspath, status->moved_from_abspath,
+          relpath = make_relpath(target_abspath, target_path,
+                                 status->moved_from_abspath,
                                  pool, pool);
           relpath = svn_dirent_local_style(relpath, pool);
           moved_from_line = apr_pstrcat(pool, "\n        > ",
@@ -320,7 +337,8 @@ print_status(const char *cwd_abspath, const char *path,
 
       if (status->moved_to_abspath)
         {
-          relpath = make_relpath(cwd_abspath, status->moved_to_abspath,
+          relpath = make_relpath(target_abspath, target_path,
+                                 status->moved_to_abspath,
                                  pool, pool);
           relpath = svn_dirent_local_style(relpath, pool);
           moved_to_line = apr_pstrcat(pool, "\n        > ",
@@ -330,6 +348,8 @@ print_status(const char *cwd_abspath, const char *path,
         }
     }
 
+  path = svn_dirent_local_style(path, pool);
+
   if (detailed)
     {
       char ood_status, lock_status;
@@ -447,7 +467,8 @@ print_status(const char *cwd_abspath, const char *path,
 
 
 svn_error_t *
-svn_cl__print_status_xml(const char *cwd_abspath,
+svn_cl__print_status_xml(const char *target_abspath,
+                         const char *target_path,
                          const char *path,
                          const svn_client_status_t *status,
                          svn_client_ctx_t *ctx,
@@ -466,7 +487,7 @@ svn_cl__print_status_xml(const char *cwd_abspath,
     SVN_ERR(svn_wc_conflicted_p3(NULL, NULL, &tree_conflicted,
                                  ctx->wc_ctx, local_abspath, pool));
 
-  path = make_relpath(cwd_abspath, path, pool, pool);
+  path = make_relpath(target_abspath, target_path, path, pool, pool);
 
   svn_xml_make_open_tag(&sb, pool, svn_xml_normal, "entry",
                         "path", svn_dirent_local_style(path, pool), NULL);
@@ -499,14 +520,16 @@ svn_cl__print_status_xml(const char *cwd_abspath,
 
       if (status->moved_from_abspath)
         {
-          relpath = make_relpath(cwd_abspath, status->moved_from_abspath,
+          relpath = make_relpath(target_abspath, target_path,
+                                 status->moved_from_abspath,
                                  pool, pool);
           relpath = svn_dirent_local_style(relpath, pool);
           svn_hash_sets(att_hash, "moved-from", relpath);
         }
       if (status->moved_to_abspath)
         {
-          relpath = make_relpath(cwd_abspath, status->moved_to_abspath,
+          relpath = make_relpath(target_abspath, target_path,
+                                 status->moved_to_abspath,
                                  pool, pool);
           relpath = svn_dirent_local_style(relpath, pool);
           svn_hash_sets(att_hash, "moved-to", relpath);
@@ -551,7 +574,8 @@ svn_cl__print_status_xml(const char *cwd_abspath,
 
 /* Called by status-cmd.c */
 svn_error_t *
-svn_cl__print_status(const char *cwd_abspath,
+svn_cl__print_status(const char *target_abspath,
+                     const char *target_path,
                      const char *path,
                      const svn_client_status_t *status,
                      svn_boolean_t suppress_externals_placeholders,
@@ -600,7 +624,7 @@ svn_cl__print_status(const char *cwd_abspath,
         return SVN_NO_ERROR;
     }
 
-  return print_status(cwd_abspath, svn_dirent_local_style(path, pool),
+  return print_status(target_abspath, target_path, path,
                       detailed, show_last_committed, repos_locks, status,
                       text_conflicts, prop_conflicts, tree_conflicts,
                       ctx, pool);
diff --git a/contrib/subversion/subversion/svn/svn.c b/contrib/subversion/subversion/svn/svn.c
index 5432e8bac08..7ed7ed22041 100644
--- a/contrib/subversion/subversion/svn/svn.c
+++ b/contrib/subversion/subversion/svn/svn.c
@@ -56,6 +56,7 @@
 
 #include "private/svn_opt_private.h"
 #include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
 
 #include "svn_private_config.h"
 
@@ -1640,7 +1641,7 @@ check_lib_versions(void)
     };
   SVN_VERSION_DEFINE(my_version);
 
-  return svn_ver_check_list(&my_version, checklist);
+  return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
 }
 
 
diff --git a/contrib/subversion/subversion/svnadmin/svnadmin.c b/contrib/subversion/subversion/svnadmin/svnadmin.c
index 2a9d63ed65e..d40525ec9ea 100644
--- a/contrib/subversion/subversion/svnadmin/svnadmin.c
+++ b/contrib/subversion/subversion/svnadmin/svnadmin.c
@@ -140,7 +140,7 @@ check_lib_versions(void)
     };
   SVN_VERSION_DEFINE(my_version);
 
-  return svn_ver_check_list(&my_version, checklist);
+  return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
 }
 
 
@@ -756,39 +756,6 @@ subcommand_deltify(apr_getopt_t *os, void *baton, apr_pool_t *pool)
   return SVN_NO_ERROR;
 }
 
-static void
-cmdline_stream_printf(svn_stream_t *stream,
-                      apr_pool_t *pool,
-                      const char *fmt,
-                      ...)
-  __attribute__((format(printf, 3, 4)));
-
-static void
-cmdline_stream_printf(svn_stream_t *stream,
-                      apr_pool_t *pool,
-                      const char *fmt,
-                      ...)
-{
-  const char *message;
-  va_list ap;
-  svn_error_t *err;
-  const char *out;
-
-  va_start(ap, fmt);
-  message = apr_pvsprintf(pool, fmt, ap);
-  va_end(ap);
-
-  err = svn_cmdline_cstring_from_utf8(&out, message, pool);
-
-  if (err)
-    {
-      svn_error_clear(err);
-      out = svn_cmdline_cstring_from_utf8_fuzzy(message, pool);
-    }
-
-  svn_error_clear(svn_stream_puts(stream, out));
-}
-
 
 /* Implementation of svn_repos_notify_func_t to wrap the output to a
    response stream for svn_repos_dump_fs2() and svn_repos_verify_fs() */
@@ -798,35 +765,36 @@ repos_notify_handler(void *baton,
                      apr_pool_t *scratch_pool)
 {
   svn_stream_t *feedback_stream = baton;
+  apr_size_t len;
 
   switch (notify->action)
   {
     case svn_repos_notify_warning:
-      cmdline_stream_printf(feedback_stream, scratch_pool,
-                            "WARNING 0x%04x: %s\n", notify->warning,
-                            notify->warning_str);
+      svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                        "WARNING 0x%04x: %s\n", notify->warning,
+                                        notify->warning_str));
       return;
 
     case svn_repos_notify_dump_rev_end:
-      cmdline_stream_printf(feedback_stream, scratch_pool,
-                            _("* Dumped revision %ld.\n"),
-                            notify->revision);
+      svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                        _("* Dumped revision %ld.\n"),
+                                        notify->revision));
       return;
 
     case svn_repos_notify_verify_rev_end:
-      cmdline_stream_printf(feedback_stream, scratch_pool,
-                            _("* Verified revision %ld.\n"),
-                            notify->revision);
+      svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                        _("* Verified revision %ld.\n"),
+                                        notify->revision));
       return;
 
     case svn_repos_notify_verify_rev_structure:
       if (notify->revision == SVN_INVALID_REVNUM)
-        cmdline_stream_printf(feedback_stream, scratch_pool,
-                              _("* Verifying repository metadata ...\n"));
+        svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                _("* Verifying repository metadata ...\n")));
       else
-        cmdline_stream_printf(feedback_stream, scratch_pool,
-                              _("* Verifying metadata at revision %ld ...\n"),
-                              notify->revision);
+        svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                        _("* Verifying metadata at revision %ld ...\n"),
+                        notify->revision));
       return;
 
     case svn_repos_notify_pack_shard_start:
@@ -834,14 +802,14 @@ repos_notify_handler(void *baton,
         const char *shardstr = apr_psprintf(scratch_pool,
                                             "%" APR_INT64_T_FMT,
                                             notify->shard);
-        cmdline_stream_printf(feedback_stream, scratch_pool,
-                              _("Packing revisions in shard %s..."),
-                              shardstr);
+        svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                          _("Packing revisions in shard %s..."),
+                                          shardstr));
       }
       return;
 
     case svn_repos_notify_pack_shard_end:
-      cmdline_stream_printf(feedback_stream, scratch_pool, _("done.\n"));
+      svn_error_clear(svn_stream_puts(feedback_stream, _("done.\n")));
       return;
 
     case svn_repos_notify_pack_shard_start_revprop:
@@ -849,30 +817,30 @@ repos_notify_handler(void *baton,
         const char *shardstr = apr_psprintf(scratch_pool,
                                             "%" APR_INT64_T_FMT,
                                             notify->shard);
-        cmdline_stream_printf(feedback_stream, scratch_pool,
-                              _("Packing revprops in shard %s..."),
-                              shardstr);
+        svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                          _("Packing revprops in shard %s..."),
+                                          shardstr));
       }
       return;
 
     case svn_repos_notify_pack_shard_end_revprop:
-      cmdline_stream_printf(feedback_stream, scratch_pool, _("done.\n"));
+      svn_error_clear(svn_stream_puts(feedback_stream, _("done.\n")));
       return;
 
     case svn_repos_notify_load_txn_committed:
       if (notify->old_revision == SVN_INVALID_REVNUM)
         {
-          cmdline_stream_printf(feedback_stream, scratch_pool,
-                                _("\n------- Committed revision %ld >>>\n\n"),
-                                notify->new_revision);
+          svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                            _("\n------- Committed revision %ld >>>\n\n"),
+                            notify->new_revision));
         }
       else
         {
-          cmdline_stream_printf(feedback_stream, scratch_pool,
-                                _("\n------- Committed new rev %ld"
-                                  " (loaded from original rev %ld"
-                                  ") >>>\n\n"), notify->new_revision,
-                                notify->old_revision);
+          svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                            _("\n------- Committed new rev %ld"
+                              " (loaded from original rev %ld"
+                              ") >>>\n\n"), notify->new_revision,
+                              notify->old_revision));
         }
       return;
 
@@ -881,27 +849,27 @@ repos_notify_handler(void *baton,
         switch (notify->node_action)
         {
           case svn_node_action_change:
-            cmdline_stream_printf(feedback_stream, scratch_pool,
+            svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
                                   _("     * editing path : %s ..."),
-                                  notify->path);
+                                  notify->path));
             break;
 
           case svn_node_action_delete:
-            cmdline_stream_printf(feedback_stream, scratch_pool,
+            svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
                                   _("     * deleting path : %s ..."),
-                                  notify->path);
+                                  notify->path));
             break;
 
           case svn_node_action_add:
-            cmdline_stream_printf(feedback_stream, scratch_pool,
+            svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
                                   _("     * adding path : %s ..."),
-                                  notify->path);
+                                  notify->path));
             break;
 
           case svn_node_action_replace:
-            cmdline_stream_printf(feedback_stream, scratch_pool,
+            svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
                                   _("     * replacing path : %s ..."),
-                                  notify->path);
+                                  notify->path));
             break;
 
         }
@@ -909,30 +877,32 @@ repos_notify_handler(void *baton,
       return;
 
     case svn_repos_notify_load_node_done:
-      cmdline_stream_printf(feedback_stream, scratch_pool, _(" done.\n"));
+      svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                        "%s", _(" done.\n")));
       return;
 
     case svn_repos_notify_load_copied_node:
-      cmdline_stream_printf(feedback_stream, scratch_pool, "COPIED...");
+      len = 9;
+      svn_error_clear(svn_stream_write(feedback_stream, "COPIED...", &len));
       return;
 
     case svn_repos_notify_load_txn_start:
-      cmdline_stream_printf(feedback_stream, scratch_pool,
-                            _("<<< Started new transaction, based on "
-                              "original revision %ld\n"),
-                            notify->old_revision);
+      svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                _("<<< Started new transaction, based on "
+                                  "original revision %ld\n"),
+                                notify->old_revision));
       return;
 
     case svn_repos_notify_load_skipped_rev:
-      cmdline_stream_printf(feedback_stream, scratch_pool,
-                            _("<<< Skipped original revision %ld\n"),
-                            notify->old_revision);
+      svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                _("<<< Skipped original revision %ld\n"),
+                                notify->old_revision));
       return;
 
     case svn_repos_notify_load_normalized_mergeinfo:
-      cmdline_stream_printf(feedback_stream, scratch_pool,
-                            _(" removing '\\r' from %s ..."),
-                            SVN_PROP_MERGEINFO);
+      svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                                _(" removing '\\r' from %s ..."),
+                                SVN_PROP_MERGEINFO));
       return;
 
     case svn_repos_notify_mutex_acquired:
@@ -941,17 +911,17 @@ repos_notify_handler(void *baton,
       return;
 
     case svn_repos_notify_recover_start:
-      cmdline_stream_printf(feedback_stream, scratch_pool,
-                            _("Repository lock acquired.\n"
-                              "Please wait; recovering the"
-                              " repository may take some time...\n"));
+      svn_error_clear(svn_stream_printf(feedback_stream, scratch_pool,
+                             _("Repository lock acquired.\n"
+                               "Please wait; recovering the"
+                               " repository may take some time...\n")));
       return;
 
     case svn_repos_notify_upgrade_start:
-      cmdline_stream_printf(feedback_stream, scratch_pool,
-                            _("Repository lock acquired.\n"
-                              "Please wait; upgrading the"
-                              " repository may take some time...\n"));
+      svn_error_clear(svn_stream_puts(feedback_stream,
+                             _("Repository lock acquired.\n"
+                               "Please wait; upgrading the"
+                               " repository may take some time...\n")));
       return;
 
     default:
diff --git a/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c b/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
index dd4e4ab2cff..a2f3fe2b4f8 100644
--- a/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
+++ b/contrib/subversion/subversion/svndumpfilter/svndumpfilter.c
@@ -45,6 +45,7 @@
 
 #include "private/svn_mergeinfo_private.h"
 #include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
 
 #ifdef _WIN32
 typedef apr_status_t (__stdcall *open_fn_t)(apr_file_t **, apr_pool_t *);
@@ -1176,7 +1177,7 @@ check_lib_versions(void)
     };
   SVN_VERSION_DEFINE(my_version);
 
-  return svn_ver_check_list(&my_version, checklist);
+  return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
 }
 
 
diff --git a/contrib/subversion/subversion/svnlook/svnlook.c b/contrib/subversion/subversion/svnlook/svnlook.c
index 0006a8fef18..8162e414e46 100644
--- a/contrib/subversion/subversion/svnlook/svnlook.c
+++ b/contrib/subversion/subversion/svnlook/svnlook.c
@@ -58,6 +58,7 @@
 #include "private/svn_cmdline_private.h"
 #include "private/svn_fspath.h"
 #include "private/svn_io_private.h"
+#include "private/svn_subr_private.h"
 
 #include "svn_private_config.h"
 
@@ -397,7 +398,7 @@ check_lib_versions(void)
     };
   SVN_VERSION_DEFINE(my_version);
 
-  return svn_ver_check_list(&my_version, checklist);
+  return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
 }
 
 
diff --git a/contrib/subversion/subversion/svnmucc/svnmucc.c b/contrib/subversion/subversion/svnmucc/svnmucc.c
index 076a9ee922c..d53f18f6ff7 100644
--- a/contrib/subversion/subversion/svnmucc/svnmucc.c
+++ b/contrib/subversion/subversion/svnmucc/svnmucc.c
@@ -57,6 +57,7 @@
 #include "private/svn_cmdline_private.h"
 #include "private/svn_ra_private.h"
 #include "private/svn_string_private.h"
+#include "private/svn_subr_private.h"
 
 #include "svn_private_config.h"
 
@@ -85,7 +86,7 @@ init(const char *application)
   if (svn_cmdline_init(application, stderr))
     exit(EXIT_FAILURE);
 
-  err = svn_ver_check_list(&my_version, checklist);
+  err = svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
   if (err)
     handle_error(err, NULL);
 
@@ -1429,7 +1430,14 @@ main(int argc, const char **argv)
           if (! anchor)
             anchor = url;
           else
-            anchor = svn_uri_get_longest_ancestor(anchor, url, pool);
+            {
+              anchor = svn_uri_get_longest_ancestor(anchor, url, pool);
+              if (!anchor || !anchor[0])
+                handle_error(svn_error_createf(SVN_ERR_INCORRECT_PARAMS, NULL,
+                                               "URLs in the action list do not "
+                                               "share a common ancestor"),
+                             pool);
+            }
 
           if ((++i == action_args->nelts) && (j + 1 < num_url_args))
             insufficient(pool);
diff --git a/contrib/subversion/subversion/svnserve/svnserve.c b/contrib/subversion/subversion/svnserve/svnserve.c
index 7648ea8bca6..b6fa9057950 100644
--- a/contrib/subversion/subversion/svnserve/svnserve.c
+++ b/contrib/subversion/subversion/svnserve/svnserve.c
@@ -54,6 +54,7 @@
 #include "private/svn_dep_compat.h"
 #include "private/svn_cmdline_private.h"
 #include "private/svn_atomic.h"
+#include "private/svn_subr_private.h"
 
 #include "winservice.h"
 
@@ -439,8 +440,9 @@ static svn_error_t *write_pid_file(const char *filename, apr_pool_t *pool)
   const char *contents = apr_psprintf(pool, "%" APR_PID_T_FMT "\n",
                                              getpid());
 
+  SVN_ERR(svn_io_remove_file2(filename, TRUE, pool));
   SVN_ERR(svn_io_file_open(&file, filename,
-                           APR_WRITE | APR_CREATE | APR_TRUNCATE,
+                           APR_WRITE | APR_CREATE | APR_EXCL,
                            APR_OS_DEFAULT, pool));
   SVN_ERR(svn_io_file_write_full(file, contents, strlen(contents), NULL,
                                  pool));
@@ -465,7 +467,7 @@ check_lib_versions(void)
     };
   SVN_VERSION_DEFINE(my_version);
 
-  return svn_ver_check_list(&my_version, checklist);
+  return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
 }
 
 
diff --git a/contrib/subversion/subversion/svnsync/svnsync.c b/contrib/subversion/subversion/svnsync/svnsync.c
index 0bdc97696d0..621b782d6a5 100644
--- a/contrib/subversion/subversion/svnsync/svnsync.c
+++ b/contrib/subversion/subversion/svnsync/svnsync.c
@@ -38,6 +38,7 @@
 #include "private/svn_opt_private.h"
 #include "private/svn_ra_private.h"
 #include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
 
 #include "sync.h"
 
@@ -312,7 +313,7 @@ check_lib_versions(void)
     };
   SVN_VERSION_DEFINE(my_version);
 
-  return svn_ver_check_list(&my_version, checklist);
+  return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
 }
 
 
@@ -1297,7 +1298,7 @@ replay_rev_finished(svn_revnum_t revision,
   if (rb->sb->committed_rev != revision)
     return svn_error_createf
              (APR_EINVAL, NULL,
-              _("Commit created rev %ld but should have created %ld"),
+              _("Commit created r%ld but should have created r%ld"),
               rb->sb->committed_rev, revision);
 
   SVN_ERR(svn_ra_rev_proplist(rb->to_session, revision, &existing_props,
diff --git a/contrib/subversion/subversion/svnversion/svnversion.c b/contrib/subversion/subversion/svnversion/svnversion.c
index ffee60ca4f5..94ac588c43d 100644
--- a/contrib/subversion/subversion/svnversion/svnversion.c
+++ b/contrib/subversion/subversion/svnversion/svnversion.c
@@ -29,6 +29,7 @@
 
 #include "private/svn_opt_private.h"
 #include "private/svn_cmdline_private.h"
+#include "private/svn_subr_private.h"
 
 #include "svn_private_config.h"
 
@@ -110,7 +111,7 @@ check_lib_versions(void)
     };
   SVN_VERSION_DEFINE(my_version);
 
-  return svn_ver_check_list(&my_version, checklist);
+  return svn_ver_check_list2(&my_version, checklist, svn_ver_equal);
 }
 
 /*
diff --git a/contrib/tcp_wrappers/clean_exit.c b/contrib/tcp_wrappers/clean_exit.c
index cb9d4f5080d..41caaf03066 100644
--- a/contrib/tcp_wrappers/clean_exit.c
+++ b/contrib/tcp_wrappers/clean_exit.c
@@ -13,6 +13,7 @@ static char sccsid[] = "@(#) clean_exit.c 1.4 94/12/28 17:42:19";
 #endif
 
 #include <stdio.h>
+#include <unistd.h>
 
 extern void exit();
 
diff --git a/contrib/tcp_wrappers/hosts_access.c b/contrib/tcp_wrappers/hosts_access.c
index 03d305b7dc2..af0433b0391 100644
--- a/contrib/tcp_wrappers/hosts_access.c
+++ b/contrib/tcp_wrappers/hosts_access.c
@@ -44,6 +44,7 @@ static char sccsid[] = "@(#) hosts_access.c 1.21 97/02/12 02:13:22";
 #ifdef INET6
 #include <netdb.h>
 #endif
+#include <stdlib.h>
 
 extern char *fgets();
 extern int errno;
@@ -102,6 +103,11 @@ static int masked_match6();
 
 #define	BUFLEN 2048
 
+/* definition to be used from workarounds.c */
+#ifdef NETGROUP
+int     yp_get_default_domain(char  **);
+#endif
+
 /* hosts_access - host access control facility */
 
 int     hosts_access(request)
@@ -269,7 +275,7 @@ struct request_info *request;
 
 static int hostfile_match(path, host)
 char   *path;
-struct hosts_info *host;
+struct host_info *host;
 {
     char    tok[BUFSIZ];
     int     match = NO;
diff --git a/contrib/tcp_wrappers/options.c b/contrib/tcp_wrappers/options.c
index 97d31270392..04ae1743ead 100644
--- a/contrib/tcp_wrappers/options.c
+++ b/contrib/tcp_wrappers/options.c
@@ -50,6 +50,8 @@ static char sccsid[] = "@(#) options.c 1.17 96/02/11 17:01:31";
 #include <ctype.h>
 #include <setjmp.h>
 #include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 #ifndef MAXPATHNAMELEN
 #define MAXPATHNAMELEN  BUFSIZ
@@ -441,16 +443,21 @@ struct request_info *request;
 /* severity_map - lookup facility or severity value */
 
 static int severity_map(table, name)
-CODE   *table;
+const CODE   *table;
 char   *name;
 {
-    CODE *t;
+    const CODE *t;
+    int ret = -1;
 
     for (t = table; t->c_name; t++)
-	if (STR_EQ(t->c_name, name))
-	    return (t->c_val);
-    tcpd_jump("bad syslog facility or severity: \"%s\"", name);
-    /* NOTREACHED */
+	if (STR_EQ(t->c_name, name)) {
+	    ret = t->c_val;
+	    break;
+	}
+    if (ret == -1)
+    	tcpd_jump("bad syslog facility or severity: \"%s\"", name);
+
+    return (ret);
 }
 
 /* severity_option - change logging severity for this event (Dave Mitchell) */
diff --git a/contrib/tcp_wrappers/percent_x.c b/contrib/tcp_wrappers/percent_x.c
index c95a1ea4141..9b37329cf36 100644
--- a/contrib/tcp_wrappers/percent_x.c
+++ b/contrib/tcp_wrappers/percent_x.c
@@ -19,6 +19,7 @@ static char sccsid[] = "@(#) percent_x.c 1.4 94/12/28 17:42:37";
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
+#include <unistd.h>
 
 extern void exit();
 
diff --git a/contrib/tcp_wrappers/rfc931.c b/contrib/tcp_wrappers/rfc931.c
index e7fb3d1d129..924dac3efaf 100644
--- a/contrib/tcp_wrappers/rfc931.c
+++ b/contrib/tcp_wrappers/rfc931.c
@@ -25,6 +25,7 @@ static char sccsid[] = "@(#) rfc931.c 1.10 95/01/02 16:11:34";
 #include <setjmp.h>
 #include <signal.h>
 #include <string.h>
+#include <unistd.h>
 
 #ifndef SEEK_SET
 #define SEEK_SET 0
diff --git a/contrib/tcp_wrappers/shell_cmd.c b/contrib/tcp_wrappers/shell_cmd.c
index 62d31bc5240..49286367a0d 100644
--- a/contrib/tcp_wrappers/shell_cmd.c
+++ b/contrib/tcp_wrappers/shell_cmd.c
@@ -16,10 +16,13 @@ static char sccsid[] = "@(#) shell_cmd.c 1.5 94/12/28 17:42:44";
 
 #include <sys/types.h>
 #include <sys/param.h>
+#include <sys/wait.h>
 #include <signal.h>
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 extern void exit();
 
diff --git a/contrib/tcp_wrappers/update.c b/contrib/tcp_wrappers/update.c
index b612d5e0246..db7375313ad 100644
--- a/contrib/tcp_wrappers/update.c
+++ b/contrib/tcp_wrappers/update.c
@@ -24,6 +24,7 @@ static char sccsid[] = "@(#) update.c 1.1 94/12/28 17:42:56";
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
+#include <unistd.h>
 
 /* Local stuff. */
 
diff --git a/contrib/tcpdump/extract.h b/contrib/tcpdump/extract.h
index bab63f205d7..60ecd680363 100644
--- a/contrib/tcpdump/extract.h
+++ b/contrib/tcpdump/extract.h
@@ -51,13 +51,25 @@ typedef struct {
 	u_int32_t	val;
 } __attribute__((packed)) unaligned_u_int32_t;
 
-#define EXTRACT_16BITS(p) \
-	((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))->val))
-#define EXTRACT_32BITS(p) \
-	((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))->val))
-#define EXTRACT_64BITS(p) \
-	((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 0)->val)) << 32 | \
-		     ((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 1)->val)) << 0))
+static inline u_int16_t
+EXTRACT_16BITS(const void *p)
+{
+	return ((u_int16_t)ntohs(((const unaligned_u_int16_t *)(p))->val));
+}
+
+static inline u_int32_t
+EXTRACT_32BITS(const void *p)
+{
+	return ((u_int32_t)ntohl(((const unaligned_u_int32_t *)(p))->val));
+}
+
+static inline u_int64_t
+EXTRACT_64BITS(const void *p)
+{
+	return ((u_int64_t)(((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 0)->val)) << 32 | \
+		((u_int64_t)ntohl(((const unaligned_u_int32_t *)(p) + 1)->val)) << 0));
+
+}
 
 #else /* HAVE___ATTRIBUTE__ */
 /*
@@ -88,13 +100,26 @@ typedef struct {
  * The processor natively handles unaligned loads, so we can just
  * cast the pointer and fetch through it.
  */
-#define EXTRACT_16BITS(p) \
-	((u_int16_t)ntohs(*(const u_int16_t *)(p)))
-#define EXTRACT_32BITS(p) \
-	((u_int32_t)ntohl(*(const u_int32_t *)(p)))
-#define EXTRACT_64BITS(p) \
-	((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0))) << 32 | \
-		     ((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) << 0))
+static inline u_int16_t
+EXTRACT_16BITS(const void *p)
+{
+	return ((u_int16_t)ntohs(*(const u_int16_t *)(p)));
+}
+
+static inline u_int32_t
+EXTRACT_32BITS(const void *p)
+{
+	return ((u_int32_t)ntohl(*(const u_int32_t *)(p)));
+}
+
+static inline u_int64_t
+EXTRACT_64BITS(const void *p)
+{
+	return ((u_int64_t)(((u_int64_t)ntohl(*((const u_int32_t *)(p) + 0))) << 32 | \
+		((u_int64_t)ntohl(*((const u_int32_t *)(p) + 1))) << 0));
+
+}
+
 #endif /* LBL_ALIGN */
 
 #define EXTRACT_24BITS(p) \
diff --git a/contrib/tcpdump/print-ip.c b/contrib/tcpdump/print-ip.c
index bc6cbcca816..291901f0fc4 100644
--- a/contrib/tcpdump/print-ip.c
+++ b/contrib/tcpdump/print-ip.c
@@ -483,9 +483,11 @@ again:
 		pgm_print(ipds->cp, ipds->len, (const u_char *)ipds->ip);
 		break;
 
+#if defined(HAVE_NET_PFVAR_H)
 	case IPPROTO_PFSYNC:
 		pfsync_ip_print(ipds->cp, ipds->len);
 		break;
+#endif
 
 	default:
 		if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
diff --git a/contrib/telnet/telnetd/sys_term.c b/contrib/telnet/telnetd/sys_term.c
index 6d06b287e17..5a9421b1b15 100644
--- a/contrib/telnet/telnetd/sys_term.c
+++ b/contrib/telnet/telnetd/sys_term.c
@@ -1052,11 +1052,11 @@ start_login(char *host undef1, int autologin undef1, char *name undef1)
 	 */
 	if ((auth_level < 0) || (autologin != AUTH_VALID))
 # endif
+#endif /* AUTHENTICATION */
 	{
 		argv = addarg(argv, "-h");
 		argv = addarg(argv, host);
 	}
-#endif /* AUTHENTICATION */
 #endif
 #if	!defined(NO_LOGIN_P)
 	argv = addarg(argv, "-p");
diff --git a/contrib/tzdata/africa b/contrib/tzdata/africa
index a92d7f511f3..029e5c22467 100644
--- a/contrib/tzdata/africa
+++ b/contrib/tzdata/africa
@@ -451,6 +451,14 @@ Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
 # (either two days before them or five days after them, so as to fall on
 # lastFri instead of lastSun).
 
+# From Even Scharning (2013-10-25):
+# The scheduled end of DST in Libya on Friday, October 25, 2013 was
+# cancelled yesterday....
+# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
+#
+# From Paul Eggert (2013-10-25):
+# For now, assume they're reverting to the pre-2012 rules of permanent UTC+2.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
 Rule	Libya	1952	only	-	Jan	 1	0:00	0	-
@@ -467,8 +475,8 @@ Rule	Libya	1987	1989	-	Apr	 1	0:00	1:00	S
 Rule	Libya	1987	1989	-	Oct	 1	0:00	0	-
 Rule	Libya	1997	only	-	Apr	 4	0:00	1:00	S
 Rule	Libya	1997	only	-	Oct	 4	0:00	0	-
-Rule	Libya	2013	max	-	Mar	lastFri	1:00	1:00	S
-Rule	Libya	2013	max	-	Oct	lastFri	2:00	0	-
+Rule	Libya	2013	only	-	Mar	lastFri	1:00	1:00	S
+Rule	Libya	2013	only	-	Oct	lastFri	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			1:00	Libya	CE%sT	1959
@@ -479,7 +487,8 @@ Zone	Africa/Tripoli	0:52:44 -	LMT	1920
 			2:00	-	EET	1996 Sep 30
 			1:00	Libya	CE%sT	1997 Oct  4
 			2:00	-	EET	2012 Nov 10 2:00
-			1:00	Libya	CE%sT
+			1:00	Libya	CE%sT	2013 Oct 25 2:00
+			2:00	-	EET
 
 # Madagascar
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -684,15 +693,6 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 # http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
 # </a>
 
-# From Alex Krivenyshev (2008-05-09):
-# Is Western Sahara (part which administrated by Morocco) going to follow
-# Morocco DST changes?  Any information?  What about other part of
-# Western Sahara - under administration of POLISARIO Front (also named
-# SADR Saharawi Arab Democratic Republic)?
-
-# From Arthur David Olson (2008-05-09):
-# XXX--guess that it is only Morocco for now; guess only 2008 for now.
-
 # From Steffen Thorsen (2008-08-27):
 # Morocco will change the clocks back on the midnight between August 31
 # and September 1. They originally planned to observe DST to near the end
@@ -858,13 +858,23 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 # transitions would be 2013-07-07 and 2013-08-10; see:
 # http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
 
-# From Paul Eggert (2013-07-03):
+# From Steffen Thorsen (2013-09-28):
+# Morocco extends DST by one month, on very short notice, just 1 day
+# before it was going to end.  There is a new decree (2.13.781) for
+# this, where DST from now on goes from last Sunday of March at 02:00
+# to last Sunday of October at 03:00, similar to EU rules.  Official
+# source (French):
+# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
+# Another source (specifying the time for start and end in the decree):
+# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
+
+# From Paul Eggert (2013-10-03):
 # To estimate what the Moroccan government will do in future years,
-# transition dates for 2014 through 2021 were determined by running
+# transition dates for 2014 through 2038 were determined by running
 # the following program under GNU Emacs 24.3:
 #
 # (let ((islamic-year 1435))
-#   (while (< islamic-year 1444)
+#   (while (< islamic-year 1461)
 #     (let ((a
 #	     (calendar-gregorian-from-absolute
 #	      (calendar-islamic-to-absolute (list 9 1 islamic-year))))
@@ -879,13 +889,18 @@ Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul	# Mamoutzou
 #	  (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
 #     (setq islamic-year (+ 1 islamic-year))))
 #
-# with the results hand-edited for 2020-2022, when the normal spring-forward
-# date falls during the estimated Ramadan.
-#
-# From 2023 through 2038 Ramadan is not predicted to overlap with
-# daylight saving time.  Starting in 2039 there will be overlap again,
-# but 32-bit time_t values roll around in 2038 so for now do not worry
-# about dates after 2038.
+# with spring-forward transitions removed for 2023-2025, when the
+# normal spring-forward date falls during the estimated Ramadan; with
+# all transitions removed for 2026-2035, where the estimated Ramadan
+# falls entirely outside daylight-saving time; and with fall-back
+# transitions removed for 2036-2037, where the normal fall-back
+# date falls during the estimated Ramadan.  Normally, the table would
+# stop after 2037 because 32-bit time_t values roll around early in 2038,
+# but that would imply a prediction of perpetual DST after March 2038
+# due to the year-2037 glitches.  So, this table instead stops after
+# 2038, the first non-glitchy year after the 32-bit rollover.
+# An advantage of stopping after 2038 is that it lets zic guess
+# TZ='WET0WEST,M3.5.0,M10.5.0/3' for time stamps far in the future.
 
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 
@@ -912,12 +927,14 @@ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
 Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
 Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
 Rule	Morocco	2011	only	-	Jul	 31	 0	0	-
-Rule	Morocco	2012	2019	-	Apr	 lastSun 2:00	1:00	S
-Rule	Morocco	2012	max	-	Sep	 lastSun 3:00	0	-
+Rule	Morocco	2012	2013	-	Apr	 lastSun 2:00	1:00	S
+Rule	Morocco	2012	only	-	Sep	 30	 3:00	0	-
 Rule	Morocco	2012	only	-	Jul	 20	 3:00	0	-
 Rule	Morocco	2012	only	-	Aug	 20	 2:00	1:00	S
 Rule	Morocco	2013	only	-	Jul	  7	 3:00	0	-
 Rule	Morocco	2013	only	-	Aug	 10	 2:00	1:00	S
+Rule	Morocco	2013	2035	-	Oct	 lastSun 3:00	0	-
+Rule	Morocco	2014	2022	-	Mar	 lastSun 2:00	1:00	S
 Rule	Morocco	2014	only	-	Jun	 29	 3:00	0	-
 Rule	Morocco	2014	only	-	Jul	 29	 2:00	1:00	S
 Rule	Morocco	2015	only	-	Jun	 18	 3:00	0	-
@@ -930,20 +947,42 @@ Rule	Morocco	2018	only	-	May	 16	 3:00	0	-
 Rule	Morocco	2018	only	-	Jun	 15	 2:00	1:00	S
 Rule	Morocco	2019	only	-	May	  6	 3:00	0	-
 Rule	Morocco	2019	only	-	Jun	  5	 2:00	1:00	S
+Rule	Morocco	2020	only	-	Apr	 24	 3:00	0	-
 Rule	Morocco	2020	only	-	May	 24	 2:00	1:00	S
+Rule	Morocco	2021	only	-	Apr	 13	 3:00	0	-
 Rule	Morocco	2021	only	-	May	 13	 2:00	1:00	S
+Rule	Morocco	2022	only	-	Apr	  3	 3:00	0	-
 Rule	Morocco	2022	only	-	May	  3	 2:00	1:00	S
-Rule	Morocco	2023	max	-	Apr	 lastSun 2:00	1:00	S
+Rule	Morocco	2023	only	-	Apr	 22	 2:00	1:00	S
+Rule	Morocco	2024	only	-	Apr	 10	 2:00	1:00	S
+Rule	Morocco	2025	only	-	Mar	 31	 2:00	1:00	S
+Rule	Morocco	2026	max	-	Mar	 lastSun 2:00	1:00	S
+Rule	Morocco	2036	only	-	Oct	 21	 3:00	0	-
+Rule	Morocco	2037	only	-	Oct	 11	 3:00	0	-
+Rule	Morocco	2038	only	-	Sep	 30	 3:00	0	-
+Rule	Morocco	2038	only	-	Oct	 30	 2:00	1:00	S
+Rule	Morocco	2038	max	-	Oct	 lastSun 3:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
 			 1:00	-	CET	1986
 			 0:00	Morocco	WE%sT
+
 # Western Sahara
+#
+# From Gwillim Law (2013-10-22):
+# A correspondent who is usually well informed about time zone matters
+# ... says that Western Sahara observes daylight saving time, just as
+# Morocco does.
+#
+# From Paul Eggert (2013-10-23):
+# Assume that this has been true since Western Sahara switched to GMT,
+# since most of it was then controlled by Morocco.
+
 Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
 			-1:00	-	WAT	1976 Apr 14
-			 0:00	-	WET
+			 0:00	Morocco	WE%sT
 
 # Mozambique
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1100,9 +1139,7 @@ Zone	Africa/Khartoum	2:10:08 -	LMT	1931
 			3:00	-	EAT
 
 # South Sudan
-Zone	Africa/Juba	2:06:24 -	LMT	1931
-			2:00	Sudan	CA%sT	2000 Jan 15 12:00
-			3:00	-	EAT
+Link Africa/Khartoum Africa/Juba
 
 # Swaziland
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
diff --git a/contrib/tzdata/antarctica b/contrib/tzdata/antarctica
index 9bf2494ad19..5333b7b3d45 100644
--- a/contrib/tzdata/antarctica
+++ b/contrib/tzdata/antarctica
@@ -16,9 +16,9 @@
 #
 # Except for the French entries,
 # I made up all time zone abbreviations mentioned here; corrections welcome!
-# FORMAT is `zzz' and GMTOFF is 0 for locations while uninhabited.
+# FORMAT is 'zzz' and GMTOFF is 0 for locations while uninhabited.
 
-# These rules are stolen from the `southamerica' file.
+# These rules are stolen from the 'southamerica' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	ArgAQ	1964	1966	-	Mar	 1	0:00	0	-
 Rule	ArgAQ	1964	1966	-	Oct	15	0:00	1:00	S
@@ -228,9 +228,10 @@ Zone Antarctica/Syowa	0	-	zzz	1957 Jan 29
 # Scott Island (never inhabited)
 #
 # year-round base
-# Scott, Ross Island, since 1957-01, is like Antarctica/McMurdo.
+# Scott Base, Ross Island, since 1957-01.
+# See Pacific/Auckland.
 #
-# These rules for New Zealand are stolen from the `australasia' file.
+# These rules for New Zealand are stolen from the 'australasia' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	NZAQ	1974	only	-	Nov	 3	2:00s	1:00	D
 Rule	NZAQ	1975	1988	-	Oct	lastSun	2:00s	1:00	D
@@ -268,11 +269,11 @@ Rule	NZAQ	2008	max	-	Apr	Sun>=1	2:00s	0	S
 # From Lee Hotz (2001-03-08):
 # I queried the folks at Columbia who spent the summer at Vostok and this is
 # what they had to say about time there:
-# ``in the US Camp (East Camp) we have been on New Zealand (McMurdo)
+# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
 # time, which is 12 hours ahead of GMT. The Russian Station Vostok was
 # 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
 # of GMT). This is a time zone I think two hours east of Moscow. The
-# natural time zone is in between the two: 8 hours ahead of GMT.''
+# natural time zone is in between the two: 8 hours ahead of GMT."
 #
 # From Paul Eggert (2001-05-04):
 # This seems to be hopelessly confusing, so I asked Lee Hotz about it
@@ -337,16 +338,8 @@ Zone Antarctica/Palmer	0	-	zzz	1965
 			-4:00	ChileAQ	CL%sT
 #
 #
-# McMurdo, Ross Island, since 1955-12
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/McMurdo	0	-	zzz	1956
-			12:00	NZAQ	NZ%sT
-#
-# Amundsen-Scott, South Pole, continuously occupied since 1956-11-20
-#
-# From Paul Eggert (1996-09-03):
-# Normally it wouldn't have a separate entry, since it's like the
-# larger Antarctica/McMurdo since 1970, but it's too famous to omit.
+# McMurdo Station, Ross Island, since 1955-12
+# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
 #
 # From Chris Carrier (1996-06-27):
 # Siple, the first commander of the South Pole station,
@@ -368,4 +361,4 @@ Zone Antarctica/McMurdo	0	-	zzz	1956
 # we have to go around and set them back 5 minutes or so.
 # Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
 #
-Link	Antarctica/McMurdo	Antarctica/South_Pole
+# See 'australasia' for Antarctica/McMurdo.
diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia
index 79cfc4883b4..580a179776a 100644
--- a/contrib/tzdata/asia
+++ b/contrib/tzdata/asia
@@ -6,7 +6,7 @@
 # go ahead and edit the file (and please send any changes to
 # tz@iana.org for general use in the future).
 
-# From Paul Eggert (2013-02-21):
+# From Paul Eggert (2013-08-11):
 #
 # A good source for time zone historical data outside the U.S. is
 # Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -44,11 +44,11 @@
 #	4:00 GST	Gulf*
 #	5:30 IST	India
 #	7:00 ICT	Indochina*
-#	7:00 WIT	west Indonesia
-#	8:00 CIT	central Indonesia
+#	7:00 WIB	west Indonesia (Waktu Indonesia Barat)
+#	8:00 WITA	central Indonesia (Waktu Indonesia Tengah)
 #	8:00 CST	China
 #	9:00 CJT	Central Japanese Time (1896/1937)*
-#	9:00 EIT	east Indonesia
+#	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
 #	9:00 JST  JDT	Japan
 #	9:00 KST  KDT	Korea
 #	9:30 CST	(Australian) Central Standard Time
@@ -756,7 +756,7 @@ Zone	Asia/Dili	8:22:20 -	LMT	1912
 			8:00	-	TLT	1942 Feb 21 23:00 # E Timor Time
 			9:00	-	JST	1945 Sep 23
 			9:00	-	TLT	1976 May  3
-			8:00	-	CIT	2000 Sep 17 00:00
+			8:00	-	WITA	2000 Sep 17 00:00
 			9:00	-	TLT
 
 # India
@@ -793,36 +793,53 @@ Zone	Asia/Kolkata	5:53:28 -	LMT	1880	# Kolkata
 # (Hollandia).  For now, assume all Indonesian locations other than Jayapura
 # switched on 1945-09-23.
 #
+# From Paul Eggert (2013-08-11):
+# Normally the tz database uses English-language abbreviations, but in
+# Indonesia it's typical to use Indonesian-language abbreviations even
+# when writing in English.  For example, see the English-language
+# summary published by the Time and Frequency Laboratory of the
+# Research Center for Calibration, Instrumentation and Metrology,
+# Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
+# The abbreviations are:
+#
+# WIB  - UTC+7 - Waktu Indonesia Barat (Indonesia western time)
+# WITA - UTC+8 - Waktu Indonesia Tengah (Indonesia central time)
+# WIT  - UTC+9 - Waktu Indonesia Timur (Indonesia eastern time)
+#
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+# Java, Sumatra
 Zone Asia/Jakarta	7:07:12 -	LMT	1867 Aug 10
 # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
 # but this must be a typo.
-			7:07:12	-	JMT	1923 Dec 31 23:47:12 # Jakarta
+			7:07:12	-	BMT	1923 Dec 31 23:47:12 # Batavia
 			7:20	-	JAVT	1932 Nov	 # Java Time
-			7:30	-	WIT	1942 Mar 23
+			7:30	-	WIB	1942 Mar 23
 			9:00	-	JST	1945 Sep 23
-			7:30	-	WIT	1948 May
-			8:00	-	WIT	1950 May
-			7:30	-	WIT	1964
-			7:00	-	WIT
+			7:30	-	WIB	1948 May
+			8:00	-	WIB	1950 May
+			7:30	-	WIB	1964
+			7:00	-	WIB
+# west and central Borneo
 Zone Asia/Pontianak	7:17:20	-	LMT	1908 May
 			7:17:20	-	PMT	1932 Nov    # Pontianak MT
-			7:30	-	WIT	1942 Jan 29
+			7:30	-	WIB	1942 Jan 29
 			9:00	-	JST	1945 Sep 23
-			7:30	-	WIT	1948 May
-			8:00	-	WIT	1950 May
-			7:30	-	WIT	1964
-			8:00	-	CIT	1988 Jan  1
-			7:00	-	WIT
+			7:30	-	WIB	1948 May
+			8:00	-	WIB	1950 May
+			7:30	-	WIB	1964
+			8:00	-	WITA	1988 Jan  1
+			7:00	-	WIB
+# Sulawesi, Lesser Sundas, east and south Borneo
 Zone Asia/Makassar	7:57:36 -	LMT	1920
 			7:57:36	-	MMT	1932 Nov    # Macassar MT
-			8:00	-	CIT	1942 Feb  9
+			8:00	-	WITA	1942 Feb  9
 			9:00	-	JST	1945 Sep 23
-			8:00	-	CIT
+			8:00	-	WITA
+# Maluku Islands, West Papua, Papua
 Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
-			9:00	-	EIT	1944 Sep  1
+			9:00	-	WIT	1944 Sep  1
 			9:30	-	CST	1964
-			9:00	-	EIT
+			9:00	-	WIT
 
 # Iran
 
@@ -1364,9 +1381,11 @@ Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
 # until about the same time next year (at least).
 # http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
 #
-# From Paul Eggert (2012-10-25):
-# For now, assume this is just a one-year measure.  If it becomes
-# permanent, we should move Jordan from EET to AST effective tomorrow.
+# From Paul Eggert (2013-09-21):
+# It's looking like this change will be permanent; see
+# Petra News Agency, Cancelling winter saved Jordan $7 million (2013-02-20)
+# <http://www.albawaba.com/business/jordan-winter-electricity--472005>.
+# So move Jordan to UTC+3 as of the abovementioned date.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
@@ -1392,15 +1411,15 @@ Rule	Jordan	1995	1998	-	Sep	Fri>=15	0:00s	0	-
 Rule	Jordan	1999	only	-	Jul	 1	0:00s	1:00	S
 Rule	Jordan	1999	2002	-	Sep	lastFri	0:00s	0	-
 Rule	Jordan	2000	2001	-	Mar	lastThu	0:00s	1:00	S
-Rule	Jordan	2002	max	-	Mar	lastThu	24:00	1:00	S
+Rule	Jordan	2002	2012	-	Mar	lastThu	24:00	1:00	S
 Rule	Jordan	2003	only	-	Oct	24	0:00s	0	-
 Rule	Jordan	2004	only	-	Oct	15	0:00s	0	-
 Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
-Rule	Jordan	2006	2011	-	Oct	lastFri	0:00s	0	-
-Rule	Jordan	2013	max	-	Oct	lastFri	0:00s	0	-
+Rule	Jordan	2006	2012	-	Oct	lastFri	0:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Amman	2:23:44 -	LMT	1931
-			2:00	Jordan	EE%sT
+			2:00	Jordan	EE%sT	2012 Oct 26 0:00s
+			3:00	-	AST
 
 
 # Kazakhstan
@@ -2280,9 +2299,18 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
 # http://www.samanews.com/index.php?act=Show&id=154120
 # http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
 
-# From Paul Eggert (2013-04-15):
+# From Steffen Thorsen (2013-09-24):
+# The Gaza and West Bank are ending DST Thursday at midnight
+# (2013-09-27 00:00:00) (one hour earlier than last year...).
+# This source in English, says "that winter time will go into effect
+# at midnight on Thursday in the West Bank and Gaza Strip":
+# http://english.wafa.ps/index.php?action=detail&id=23246
+# official source...:
+# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
+
+# From Paul Eggert (2013-09-24):
 # For future dates, guess the last Thursday in March at 24:00 through
-# the first Friday on or after September 21 at 01:00.  This is consistent with
+# the first Friday on or after September 21 at 00:00.  This is consistent with
 # the predictions in today's editions of the following URLs,
 # which are for Gaza and Hebron respectively:
 # http://www.timeanddate.com/worldclock/timezone.html?n=702
@@ -2313,7 +2341,8 @@ Rule Palestine	2011	only	-	Aug	 1	0:00	0	-
 Rule Palestine	2011	only	-	Aug	30	0:00	1:00	S
 Rule Palestine	2011	only	-	Sep	30	0:00	0	-
 Rule Palestine	2012	max	-	Mar	lastThu	24:00	1:00	S
-Rule Palestine	2012	max	-	Sep	Fri>=21	1:00	0	-
+Rule Palestine	2012	only	-	Sep	21	1:00	0	-
+Rule Palestine	2013	max	-	Sep	Fri>=21	0:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
diff --git a/contrib/tzdata/australasia b/contrib/tzdata/australasia
index 797f81ce2aa..8685d004645 100644
--- a/contrib/tzdata/australasia
+++ b/contrib/tzdata/australasia
@@ -352,16 +352,25 @@ Zone	Indian/Cocos	6:27:40	-	LMT	1900
 # today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
 # October 2012 and end at 3 am on Sunday 20th January 2013.
 # http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
+
+# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
+# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
+# on Sunday 19th January, 2014....  move clocks forward by one hour from 2am
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
 #
-# From Paul Eggert (2012-08-31):
-# For now, guess a pattern of the penultimate Sundays in October and January.
+# From Paul Eggert (2013-09-09):
+# For now, guess that Fiji springs forward the Sunday before the fourth
+# Monday in October.  This matches both recent practice and
+# timeanddate.com's current spring-forward prediction.
+# For the January 2014 transition we guessed right while timeanddate.com
+# guessed wrong, so leave the fall-back prediction alone.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
 Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
 Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
 Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	max	-	Oct	Sun>=18	2:00	1:00	S
+Rule	Fiji	2010	max	-	Oct	Sun>=21	2:00	1:00	S
 Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
 Rule	Fiji	2012	max	-	Jan	Sun>=18	3:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -487,6 +496,7 @@ Zone Pacific/Auckland	11:39:04 -	LMT	1868 Nov  2
 Zone Pacific/Chatham	12:13:48 -	LMT	1957 Jan  1
 			12:45	Chatham	CHA%sT
 
+Link Pacific/Auckland Antarctica/McMurdo
 
 # Auckland Is
 # uninhabited; Maori and Moriori, colonial settlers, pastoralists, sealers,
@@ -736,7 +746,7 @@ Zone Pacific/Funafuti	11:56:52 -	LMT	1901
 # 1886-1891; Baker was similar but exact dates are not known.
 # Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
 # uninhabited thereafter.
-# Howland observed Hawaii Standard Time (UTC-10:30) in 1937;
+# Howland observed Hawaii Standard Time (UT-10:30) in 1937;
 # see page 206 of Elgen M. Long and Marie K. Long,
 # Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
 # So most likely Howland and Baker observed Hawaii Time from 1935
@@ -749,8 +759,17 @@ Zone Pacific/Funafuti	11:56:52 -	LMT	1901
 # no information; was probably like Pacific/Kiritimati
 
 # Johnston
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Johnston	-10:00	-	HST
+#
+# From Paul Eggert (2013-09-03):
+# In his memoirs of June 6th to October 4, 1945
+# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
+# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
+# Johnston time, 1:30 AM Kwajalein time."  This was in June 1945, and
+# confirms that Johnston kept the same time as Honolulu in summer 1945.
+# We have no better information, so for now, assume this has been true
+# indefinitely into the past.
+#
+# See 'northamerica' for Pacific/Johnston.
 
 # Kingman
 # uninhabited
diff --git a/contrib/tzdata/backward b/contrib/tzdata/backward
index dc7769fb1fc..06fb192eb17 100644
--- a/contrib/tzdata/backward
+++ b/contrib/tzdata/backward
@@ -22,15 +22,17 @@ Link	America/Kentucky/Louisville	America/Louisville
 Link	America/Argentina/Mendoza	America/Mendoza
 Link	America/Rio_Branco	America/Porto_Acre
 Link	America/Argentina/Cordoba	America/Rosario
-Link	America/St_Thomas	America/Virgin
+Link	America/Denver		America/Shiprock
+Link	America/Port_of_Spain	America/Virgin
+Link	Pacific/Auckland	Antarctica/South_Pole
 Link	Asia/Ashgabat		Asia/Ashkhabad
+Link	Asia/Kolkata		Asia/Calcutta
 Link	Asia/Chongqing		Asia/Chungking
 Link	Asia/Dhaka		Asia/Dacca
 Link	Asia/Kathmandu		Asia/Katmandu
-Link	Asia/Kolkata		Asia/Calcutta
 Link	Asia/Macau		Asia/Macao
-Link	Asia/Jerusalem		Asia/Tel_Aviv
 Link	Asia/Ho_Chi_Minh	Asia/Saigon
+Link	Asia/Jerusalem		Asia/Tel_Aviv
 Link	Asia/Thimphu		Asia/Thimbu
 Link	Asia/Makassar		Asia/Ujung_Pandang
 Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
@@ -88,10 +90,10 @@ Link	Pacific/Auckland	NZ
 Link	Pacific/Chatham		NZ-CHAT
 Link	America/Denver		Navajo
 Link	Asia/Shanghai		PRC
-Link	Pacific/Pago_Pago	Pacific/Samoa
-Link	Pacific/Chuuk		Pacific/Yap
-Link	Pacific/Chuuk		Pacific/Truk
 Link	Pacific/Pohnpei		Pacific/Ponape
+Link	Pacific/Pago_Pago	Pacific/Samoa
+Link	Pacific/Chuuk		Pacific/Truk
+Link	Pacific/Chuuk		Pacific/Yap
 Link	Europe/Warsaw		Poland
 Link	Europe/Lisbon		Portugal
 Link	Asia/Taipei		ROC
diff --git a/contrib/tzdata/etcetera b/contrib/tzdata/etcetera
index e5401b7bb39..0f9ac0f0c35 100644
--- a/contrib/tzdata/etcetera
+++ b/contrib/tzdata/etcetera
@@ -31,9 +31,9 @@ Link	Etc/GMT				Etc/GMT0
 # even though this is the opposite of what many people expect.
 # POSIX has positive signs west of Greenwich, but many people expect
 # positive signs east of Greenwich.  For example, TZ='Etc/GMT+4' uses
-# the abbreviation "GMT+4" and corresponds to 4 hours behind UTC
+# the abbreviation "GMT+4" and corresponds to 4 hours behind UT
 # (i.e. west of Greenwich) even though many people would expect it to
-# mean 4 hours ahead of UTC (i.e. east of Greenwich).
+# mean 4 hours ahead of UT (i.e. east of Greenwich).
 #
 # In the draft 5 of POSIX 1003.1-200x, the angle bracket notation allows for
 # TZ='<GMT-4>+4'; if you want time zone abbreviations conforming to
diff --git a/contrib/tzdata/europe b/contrib/tzdata/europe
index 0f429da8b94..a7b16765386 100644
--- a/contrib/tzdata/europe
+++ b/contrib/tzdata/europe
@@ -42,7 +42,7 @@
 #	</a> (1998-09-21, in Portuguese)
 
 #
-# I invented the abbreviations marked `*' in the following table;
+# I invented the abbreviations marked '*' in the following table;
 # the rest are from earlier versions of this file, or from other sources.
 # Corrections are welcome!
 #                   std dst  2dst
@@ -96,7 +96,7 @@
 # and a sketch map showing some of the sightlines involved. One paragraph
 # of the text said:
 #
-# `An old stone obelisk marking a forgotten terrestrial meridian stands
+# 'An old stone obelisk marking a forgotten terrestrial meridian stands
 # beside the river at Kew. In the 18th century, before time and longitude
 # was standardised by the Royal Observatory in Greenwich, scholars observed
 # this stone and the movement of stars from Kew Observatory nearby. They
@@ -140,7 +140,7 @@
 # From Paul Eggert (2003-09-27):
 # Summer Time was first seriously proposed by William Willett (1857-1915),
 # a London builder and member of the Royal Astronomical Society
-# who circulated a pamphlet ``The Waste of Daylight'' (1907)
+# who circulated a pamphlet "The Waste of Daylight" (1907)
 # that proposed advancing clocks 20 minutes on each of four Sundays in April,
 # and retarding them by the same amount on four Sundays in September.
 # A bill was drafted in 1909 and introduced in Parliament several times,
@@ -165,10 +165,10 @@
 #	</a>
 
 # From Paul Eggert (1996-09-03):
-# The OED Supplement says that the English originally said ``Daylight Saving''
+# The OED Supplement says that the English originally said "Daylight Saving"
 # when they were debating the adoption of DST in 1908; but by 1916 this
 # term appears only in quotes taken from DST's opponents, whereas the
-# proponents (who eventually won the argument) are quoted as using ``Summer''.
+# proponents (who eventually won the argument) are quoted as using "Summer".
 
 # From Arthur David Olson (1989-01-19):
 #
@@ -208,9 +208,9 @@
 # which could not be said to run counter to any official description.
 
 # From Paul Eggert (2000-10-02):
-# Howse writes (p 157) `DBST' too, but `BDST' seems to have been common
+# Howse writes (p 157) 'DBST' too, but 'BDST' seems to have been common
 # and follows the more usual convention of putting the location name first,
-# so we use `BDST'.
+# so we use 'BDST'.
 
 # Peter Ilieve (1998-04-19) described at length
 # the history of summer time legislation in the United Kingdom.
@@ -431,6 +431,8 @@ Rule	GB-Eire 1981	1989	-	Oct	Sun>=23	1:00u	0	GMT
 Rule	GB-Eire 1990	1995	-	Oct	Sun>=22	1:00u	0	GMT
 # Summer Time Order 1997 (S.I. 1997/2982)
 # See EU for rules starting in 1996.
+#
+# Use Europe/London for Jersey, Guernsey, and the Isle of Man.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1 0:00s
@@ -797,7 +799,7 @@ Zone	Europe/Brussels	0:17:30 -	LMT	1880
 			1:00	EU	CE%sT
 
 # Bosnia and Herzegovina
-# see Serbia
+# See Europe/Belgrade.
 
 # Bulgaria
 #
@@ -825,10 +827,10 @@ Zone	Europe/Sofia	1:33:16 -	LMT	1880
 			2:00	EU	EE%sT
 
 # Croatia
-# see Serbia
+# See Europe/Belgrade.
 
 # Cyprus
-# Please see the `asia' file for Asia/Nicosia.
+# Please see the 'asia' file for Asia/Nicosia.
 
 # Czech Republic
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -845,6 +847,7 @@ Zone	Europe/Prague	0:57:44 -	LMT	1850
 			1:00	C-Eur	CE%sT	1944 Sep 17 2:00s
 			1:00	Czech	CE%sT	1979
 			1:00	EU	CE%sT
+# Use Europe/Prague also for Slovakia.
 
 # Denmark, Faroe Islands, and Greenland
 
@@ -1008,12 +1011,12 @@ Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
 # From Peter Ilieve (1996-10-28):
 # [IATA SSIM (1992/1996) claims that the Baltic republics switch at 01:00s,
 # but a relative confirms that Estonia still switches at 02:00s, writing:]
-# ``I do not [know] exactly but there are some little different
+# "I do not [know] exactly but there are some little different
 # (confusing) rules for International Air and Railway Transport Schedules
 # conversion in Sunday connected with end of summer time in Estonia....
 # A discussion is running about the summer time efficiency and effect on
 # human physiology.  It seems that Estonia maybe will not change to
-# summer time next spring.''
+# summer time next spring."
 
 # From Peter Ilieve (1998-11-04), heavily edited:
 # <a href="http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390">
@@ -1068,7 +1071,7 @@ Zone	Europe/Tallinn	1:39:00	-	LMT	1880
 # Well, here in Helsinki we're just changing from summer time to regular one,
 # and it's supposed to change at 4am...
 
-# From Janne Snabb (2010-0715):
+# From Janne Snabb (2010-07-15):
 #
 # I noticed that the Finland data is not accurate for years 1981 and 1982.
 # During these two first trial years the DST adjustment was made one hour
@@ -1125,7 +1128,7 @@ Link	Europe/Helsinki	Europe/Mariehamn
 
 
 #
-# Shank & Pottenger seem to use `24:00' ambiguously; resolve it with Whitman.
+# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	France	1916	only	-	Jun	14	23:00s	1:00	S
 Rule	France	1916	1919	-	Oct	Sun>=1	23:00s	0	-
@@ -1415,7 +1418,7 @@ Zone Atlantic/Reykjavik	-1:27:24 -	LMT	1837
 # <a href="http://toi.iriti.cnr.it/uk/ienitlt.html">
 # Day-light Saving Time in Italy (2006-02-03)
 # </a>
-# (`FP' below), taken from an Italian National Electrotechnical Institute
+# ('FP' below), taken from an Italian National Electrotechnical Institute
 # publication. When the three sources disagree, guess who's right, as follows:
 #
 # year	FP	Shanks&P. (S)	Whitman (W)	Go with:
@@ -1561,10 +1564,22 @@ Zone	Europe/Riga	1:36:24	-	LMT	1880
 			2:00	EU	EE%sT
 
 # Liechtenstein
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Vaduz	0:38:04 -	LMT	1894 Jun
-			1:00	-	CET	1981
-			1:00	EU	CE%sT
+
+# From Paul Eggert (2013-09-09):
+# Shanks & Pottenger say Vaduz is like Zurich.
+
+# From Alois Treindl (2013-09-18):
+# http://www.eliechtensteinensia.li/LIJ/1978/1938-1978/1941.pdf
+# ... confirms on p. 6 that Liechtenstein followed Switzerland in 1941 and 1942.
+# I ... translate only the last two paragraphs:
+#    ... during second world war, in the years 1941 and 1942, Liechtenstein
+#    introduced daylight saving time, adapting to Switzerland.  From 1943 on
+#    central European time was in force throughout the year.
+#    From a report of the duke's government to the high council,
+#    regarding the introduction of a time law, of 31 May 1977.
+
+Link Europe/Zurich Europe/Vaduz
+
 
 # Lithuania
 
@@ -1652,7 +1667,7 @@ Zone Europe/Luxembourg	0:24:36 -	LMT	1904 Jun
 			1:00	EU	CE%sT
 
 # Macedonia
-# see Serbia
+# See Europe/Belgrade.
 
 # Malta
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -1745,7 +1760,7 @@ Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
 			1:00	EU	CE%sT
 
 # Montenegro
-# see Serbia
+# See Europe/Belgrade.
 
 # Netherlands
 
@@ -1860,7 +1875,7 @@ Zone	Europe/Oslo	0:43:00 -	LMT	1895 Jan  1
 # before 1895, and therefore probably changed the local time somewhere
 # between 1895 and 1925 (inclusive).
 
-# From Paul Eggert (2001-05-01):
+# From Paul Eggert (2013-09-04):
 #
 # Actually, Jan Mayen was never occupied by Germany during World War II,
 # so it must have diverged from Oslo time during the war, as Oslo was
@@ -1871,7 +1886,7 @@ Zone	Europe/Oslo	0:43:00 -	LMT	1895 Jan  1
 # 1941 with a small Norwegian garrison and continued operations despite
 # frequent air ttacks from Germans.  In 1943 the Americans established a
 # radiolocating station on the island, called "Atlantic City".  Possibly
-# the UTC offset changed during the war, but I think it unlikely that
+# the UT offset changed during the war, but I think it unlikely that
 # Jan Mayen used German daylight-saving rules.
 #
 # Svalbard is more complicated, as it was raided in August 1941 by an
@@ -1884,9 +1899,8 @@ Zone	Europe/Oslo	0:43:00 -	LMT	1895 Jan  1
 # the German armed forces at the Svalbard weather station code-named
 # Haudegen did not surrender to the Allies until September 1945.
 #
-# All these events predate our cutoff date of 1970.  Unless we can
-# come up with more definitive info about the timekeeping during the
-# war years it's probably best just do...the following for now:
+# All these events predate our cutoff date of 1970, so use Europe/Oslo
+# for these regions.
 Link	Europe/Oslo	Arctic/Longyearbyen
 
 # Poland
@@ -2144,7 +2158,7 @@ Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
 # so we (Novosibirsk) simply did not switch.
 #
 # From Andrey A. Chernov (1996-10-04):
-# `MSK' and `MSD' were born and used initially on Moscow computers with
+# 'MSK' and 'MSD' were born and used initially on Moscow computers with
 # UNIX-like OSes by several developer groups (e.g. Demos group, Kiae group)....
 # The next step was the UUCP network, the Relcom predecessor
 # (used mainly for mail), and MSK/MSD was actively used there.
@@ -2443,6 +2457,9 @@ Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
 			11:00	Russia	ANA%sT	2011 Mar 27 2:00s
 			12:00	-	ANAT
 
+# San Marino
+# See Europe/Rome.
+
 # Serbia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Belgrade	1:22:00	-	LMT	1884
@@ -2465,7 +2482,7 @@ Link Europe/Belgrade Europe/Zagreb	# Croatia
 Link Europe/Prague Europe/Bratislava
 
 # Slovenia
-# see Serbia
+# See Europe/Belgrade.
 
 # Spain
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
@@ -2599,7 +2616,7 @@ Zone Europe/Stockholm	1:12:12 -	LMT	1879 Jan  1
 # and their performance improved enormously.  Communities began to keep
 # mean time in preference to apparent time -- Geneva from 1780 ....
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# From Whitman (who writes ``Midnight?''):
+# From Whitman (who writes "Midnight?"):
 # Rule	Swiss	1940	only	-	Nov	 2	0:00	1:00	S
 # Rule	Swiss	1940	only	-	Dec	31	0:00	0	-
 # From Shanks & Pottenger:
@@ -2644,23 +2661,53 @@ Zone Europe/Stockholm	1:12:12 -	LMT	1879 Jan  1
 # The 1940 rules must be deleted.
 #
 # One further detail for Switzerland, which is probably out of scope for
-# most users of tzdata:
-# The zone file
-# Zone    Europe/Zurich   0:34:08 -       LMT     1848 Sep 12
-#                          0:29:44 -       BMT     1894 Jun #Bern Mean Time
-#                          1:00    Swiss   CE%sT   1981
-#                          1:00    EU      CE%sT
+# most users of tzdata: The [Europe/Zurich zone] ...
 # describes all of Switzerland correctly, with the exception of
 # the Cantone Geneve (Geneva, Genf). Between 1848 and 1894 Geneve did not
 # follow Bern Mean Time but kept its own local mean time.
 # To represent this, an extra zone would be needed.
+#
+# From Alois Treindl (2013-09-11):
+# The Federal regulations say
+# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html
+# ... the meridian for Bern mean time ... is 7 degrees 26'22.50".
+# Expressed in time, it is 0h29m45.5s.
+
+# From Pierre-Yves Berger (2013-09-11):
+# the "Circulaire du conseil federal" (December 11 1893)
+# <http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353> ...
+# clearly states that the [1894-06-01] change should be done at midnight
+# but if no one is present after 11 at night, could be postponed until one
+# hour before the beginning of service.
+
+# From Paul Eggert (2013-09-11):
+# Round BMT to the nearest even second, 0:29:46.
+#
+# We can find no reliable source for Shanks's assertion that all of Switzerland
+# except Geneva switched to Bern Mean Time at 00:00 on 1848-09-12.  This book:
+#
+#	Jakob Messerli. Gleichmassig, punktlich, schnell: Zeiteinteilung und
+#	Zeitgebrauch in der Schweiz im 19. Jahrhundert. Chronos, Zurich 1995,
+#	ISBN 3-905311-68-2, OCLC 717570797.
+#
+# suggests that the transition was more gradual, and that the Swiss did not
+# agree about civil time during the transition.  The timekeeping it gives the
+# most detail for is postal and telegraph time: here, federal legislation (the
+# "Bundesgesetz uber die Erstellung von elektrischen Telegraphen") passed on
+# 1851-11-23, and an official implementation notice was published 1853-07-16
+# (Bundesblatt 1853, Bd. II, S. 859).  On p 72 Messerli writes that in
+# practice since July 1853 Bernese time was used in "all postal and telegraph
+# offices in Switzerland from Geneva to St. Gallen and Basel to Chiasso"
+# (Google translation).  For now, model this transition as occurring on
+# 1853-07-16, though it probably occurred at some other date in Zurich, and
+# legal civil time probably changed at still some other transition date.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Swiss	1941	1942	-	May	Mon>=1	1:00	1:00	S
 Rule	Swiss	1941	1942	-	Oct	Mon>=1	2:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Zurich	0:34:08 -	LMT	1848 Sep 12
-			0:29:44	-	BMT	1894 Jun # Bern Mean Time
+Zone	Europe/Zurich	0:34:08 -	LMT	1853 Jul 16 # See above comment.
+			0:29:46	-	BMT	1894 Jun # Bern Mean Time
 			1:00	Swiss	CE%sT	1981
 			1:00	EU	CE%sT
 
@@ -2884,7 +2931,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
 # From Paul Eggert (2006-03-22):
 # The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
 # from Kiev to Moscow time sometime after the January 1994 elections.
-# Shanks (1999) says ``date of change uncertain'', but implies that it happened
+# Shanks (1999) says "date of change uncertain", but implies that it happened
 # sometime between the 1994 DST switches.  Shanks & Pottenger simply say
 # 1994-09-25 03:00, but that can't be right.  For now, guess it
 # changed in May.
@@ -2898,6 +2945,9 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
 			3:00	-	MSK	1997 Mar lastSun 1:00u
 			2:00	EU	EE%sT
 
+# Vatican City
+# See Europe/Rome.
+
 ###############################################################################
 
 # One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from
diff --git a/contrib/tzdata/leap-seconds.list b/contrib/tzdata/leap-seconds.list
new file mode 100644
index 00000000000..7df3de60484
--- /dev/null
+++ b/contrib/tzdata/leap-seconds.list
@@ -0,0 +1,231 @@
+#
+#	In the following text, the symbol '#' introduces
+#	a comment, which continues from that symbol until 
+#	the end of the line. A plain comment line has a
+#	whitespace character following the comment indicator.
+#	There are also special comment lines defined below. 
+#	A special comment will always have a non-whitespace 
+#	character in column 2.
+#
+#	A blank line should be ignored.
+#
+#	The following table shows the corrections that must
+#	be applied to compute International Atomic Time (TAI)
+#	from the Coordinated Universal Time (UTC) values that
+#	are transmitted by almost all time services.
+#
+#	The first column shows an epoch as a number of seconds
+#	since 1900.0 and the second column shows the number of
+#	seconds that must be added to UTC to compute TAI for
+#	any timestamp at or after that epoch. The value on 
+#	each line is valid from the indicated initial instant
+#	until the epoch given on the next one or indefinitely 
+#	into the future if there is no next line.
+#	(The comment on each line shows the representation of
+#	the corresponding initial epoch in the usual 
+#	day-month-year format. The epoch always begins at
+#	00:00:00 UTC on the indicated day. See Note 5 below.)
+#	
+#	Important notes:
+#
+#	1. Coordinated Universal Time (UTC) is often referred to
+#	as Greenwich Mean Time (GMT). The GMT time scale is no
+#	longer used, and the use of GMT to designate UTC is
+#	discouraged.
+#
+#	2. The UTC time scale is realized by many national 
+#	laboratories and timing centers. Each laboratory
+#	identifies its realization with its name: Thus
+#	UTC(NIST), UTC(USNO), etc. The differences among
+#	these different realizations are typically on the
+#	order of a few nanoseconds (i.e., 0.000 000 00x s)
+#	and can be ignored for many purposes. These differences
+#	are tabulated in Circular T, which is published monthly
+#	by the International Bureau of Weights and Measures
+#	(BIPM). See www.bipm.fr for more information.
+#
+#	3. The current defintion of the relationship between UTC 
+#	and TAI dates from 1 January 1972. A number of different 
+#	time scales were in use before than epoch, and it can be 
+#	quite difficult to compute precise timestamps and time 
+#	intervals in those "prehistoric" days. For more information,
+#	consult:
+#
+#		The Explanatory Supplement to the Astronomical
+#		Ephemeris.
+#	or
+#		Terry Quinn, "The BIPM and the Accurate Measurement
+#		of Time," Proc. of the IEEE, Vol. 79, pp. 894-905,
+#		July, 1991.
+#
+#	4.  The insertion of leap seconds into UTC is currently the
+#	responsibility of the International Earth Rotation Service,
+#	which is located at the Paris Observatory: 
+#
+#	Central Bureau of IERS
+#	61, Avenue de l'Observatoire
+#	75014 Paris, France.
+#
+#	Leap seconds are announced by the IERS in its Bulletin C
+#
+#	See hpiers.obspm.fr or www.iers.org for more details.
+#
+#	All national laboratories and timing centers use the
+#	data from the BIPM and the IERS to construct their
+#	local realizations of UTC.
+#
+#	Although the definition also includes the possibility
+#	of dropping seconds ("negative" leap seconds), this has 
+#	never been done and is unlikely to be necessary in the 
+#	foreseeable future.
+#
+#	5. If your system keeps time as the number of seconds since
+#	some epoch (e.g., NTP timestamps), then the algorithm for
+#	assigning a UTC time stamp to an event that happens during a positive
+#	leap second is not well defined. The official name of that leap 
+#	second is 23:59:60, but there is no way of representing that time 
+#	in these systems. 
+#	Many systems of this type effectively stop the system clock for 
+#	one second during the leap second and use a time that is equivalent 
+#	to 23:59:59 UTC twice. For these systems, the corresponding TAI 
+#	timestamp would be obtained by advancing to the next entry in the
+#	following table when the time equivalent to 23:59:59 UTC
+#	is used for the second time. Thus the leap second which
+#	occurred on 30 June 1972 at 23:59:59 UTC would have TAI
+#	timestamps computed as follows:
+#
+#	...
+#	30 June 1972 23:59:59 (2287785599, first time):	TAI= UTC + 10 seconds
+#	30 June 1972 23:59:60 (2287785599,second time):	TAI= UTC + 11 seconds
+#	1  July 1972 00:00:00 (2287785600)		TAI= UTC + 11 seconds
+#	...
+#
+#	If your system realizes the leap second by repeating 00:00:00 UTC twice
+#	(this is possible but not usual), then the advance to the next entry
+#	in the table must occur the second time that a time equivlent to 
+#	00:00:00 UTC is used. Thus, using the same example as above:
+#
+#	...
+#       30 June 1972 23:59:59 (2287785599):		TAI= UTC + 10 seconds
+#       30 June 1972 23:59:60 (2287785600, first time):	TAI= UTC + 10 seconds
+#       1  July 1972 00:00:00 (2287785600,second time):	TAI= UTC + 11 seconds
+#	...
+#
+#	in both cases the use of timestamps based on TAI produces a smooth
+#	time scale with no discontinuity in the time interval.
+#
+#	This complexity would not be needed for negative leap seconds (if they 
+#	are ever used). The UTC time would skip 23:59:59 and advance from 
+#	23:59:58 to 00:00:00 in that case.  The TAI offset would decrease by 
+#	1 second at the same instant.  This is a much easier situation to deal 
+#	with, since the difficulty of unambiguously representing the epoch 
+#	during the leap second does not arise.
+#
+#	Questions or comments to:
+#		Judah Levine
+#		Time and Frequency Division
+#		NIST
+#		Boulder, Colorado
+#		jlevine@boulder.nist.gov
+#
+#	Last Update of leap second values:   11 January 2012
+#
+#	The following line shows this last update date in NTP timestamp 
+#	format. This is the date on which the most recent change to
+#	the leap second data was added to the file. This line can
+#	be identified by the unique pair of characters in the first two 
+#	columns as shown below.
+#
+#$	 3535228800
+#
+#	The NTP timestamps are in units of seconds since the NTP epoch,
+#	which is 1900.0. The Modified Julian Day number corresponding
+#	to the NTP time stamp, X, can be computed as 
+#
+#	X/86400 + 15020
+#
+#	where the first term converts seconds to days and the second 
+#	term adds the MJD corresponding to 1900.0. The integer portion
+#	of the result is the integer MJD for that day, and any remainder
+#	is the time of day, expressed as the fraction of the day since 0 
+#	hours UTC. The conversion from day fraction to seconds or to
+#	hours, minutes, and seconds may involve rounding or truncation,
+#	depending on the method used in the computation.
+#
+#	The data in this file will be updated periodically as new leap 
+#	seconds are announced. In addition to being entered on the line
+#	above, the update time (in NTP format) will be added to the basic 
+#	file name leap-seconds to form the name leap-seconds.<NTP TIME>.
+#	In addition, the generic name leap-seconds.list will always point to 
+#	the most recent version of the file.
+#
+#	This update procedure will be performed only when a new leap second
+#	is announced. 
+#
+#	The following entry specifies the expiration date of the data
+#	in this file in units of seconds since 1900.0.  This expiration date 
+#	will be changed at least twice per year whether or not a new leap 
+#	second is announced. These semi-annual changes will be made no
+#	later than 1 June and 1 December of each year to indicate what
+#	action (if any) is to be taken on 30 June and 31 December, 
+#	respectively. (These are the customary effective dates for new
+#	leap seconds.) This expiration date will be identified by a
+#	unique pair of characters in columns 1 and 2 as shown below.
+#	In the unlikely event that a leap second is announced with an 
+#	effective date other than 30 June or 31 December, then this
+#	file will be edited to include that leap second as soon as it is
+#	announced or at least one month before the effective date
+#	(whichever is later). 
+#	If an announcement by the IERS specifies that no leap second is 
+#	scheduled, then only the expiration date of the file will 
+#	be advanced to show that the information in the file is still
+#	current -- the update time stamp, the data and the name of the file 
+#	will not change.
+#
+#	Updated through IERS Bulletin C46
+#	File expires on:  28 June 2014
+#
+#@	3612902400
+#
+2272060800	10	# 1 Jan 1972
+2287785600	11	# 1 Jul 1972
+2303683200	12	# 1 Jan 1973
+2335219200	13	# 1 Jan 1974
+2366755200	14	# 1 Jan 1975
+2398291200	15	# 1 Jan 1976
+2429913600	16	# 1 Jan 1977
+2461449600	17	# 1 Jan 1978
+2492985600	18	# 1 Jan 1979
+2524521600	19	# 1 Jan 1980
+2571782400	20	# 1 Jul 1981
+2603318400	21	# 1 Jul 1982
+2634854400	22	# 1 Jul 1983
+2698012800	23	# 1 Jul 1985
+2776982400	24	# 1 Jan 1988
+2840140800	25	# 1 Jan 1990
+2871676800	26	# 1 Jan 1991
+2918937600	27	# 1 Jul 1992
+2950473600	28	# 1 Jul 1993
+2982009600	29	# 1 Jul 1994
+3029443200	30	# 1 Jan 1996
+3076704000	31	# 1 Jul 1997
+3124137600	32	# 1 Jan 1999
+3345062400	33	# 1 Jan 2006
+3439756800	34	# 1 Jan 2009
+3550089600	35	# 1 Jul 2012
+#
+#	the following special comment contains the
+#	hash value of the data in this file computed
+#	use the secure hash algorithm as specified
+#	by FIPS 180-1. See the files in ~/pub/sha for
+#	the details of how this hash value is
+#	computed. Note that the hash computation
+#	ignores comments and whitespace characters
+#	in data lines. It includes the NTP values
+#	of both the last modification time and the 
+#	expiration time of the file, but not the
+#	white space on those lines.
+#	the hash line is also ignored in the
+#	computation.
+#
+#h	1151a8f e85a5069 9000fcdb 3d5e5365 1d505b37
diff --git a/contrib/tzdata/northamerica b/contrib/tzdata/northamerica
index 1964903ebb7..c3921d3857a 100644
--- a/contrib/tzdata/northamerica
+++ b/contrib/tzdata/northamerica
@@ -20,7 +20,7 @@
 # Howse writes (pp 121-125) that time zones were invented by
 # Professor Charles Ferdinand Dowd (1825-1904),
 # Principal of Temple Grove Ladies' Seminary (Saratoga Springs, NY).
-# His pamphlet ``A System of National Time for Railroads'' (1870)
+# His pamphlet "A System of National Time for Railroads" (1870)
 # was the result of his proposals at the Convention of Railroad Trunk Lines
 # in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
 # but in 1872-05 he moved the proposed origin to Greenwich.
@@ -40,8 +40,8 @@
 
 # From Paul Eggert (2001-03-06):
 # Daylight Saving Time was first suggested as a joke by Benjamin Franklin
-# in his whimsical essay ``An Economical Project for Diminishing the Cost
-# of Light'' published in the Journal de Paris (1784-04-26).
+# in his whimsical essay "An Economical Project for Diminishing the Cost
+# of Light" published in the Journal de Paris (1784-04-26).
 # Not everyone is happy with the results:
 #
 #	I don't really care how time is reckoned so long as there is some
@@ -167,8 +167,8 @@ Zone	PST8PDT		 -8:00	US	P%sT
 #    of the Aleutian islands.   No DST.
 
 # From Paul Eggert (1995-12-19):
-# The tables below use `NST', not `NT', for Nome Standard Time.
-# I invented `CAWT' for Central Alaska War Time.
+# The tables below use 'NST', not 'NT', for Nome Standard Time.
+# I invented 'CAWT' for Central Alaska War Time.
 
 # From U. S. Naval Observatory (1989-01-19):
 # USA  EASTERN       5 H  BEHIND UTC    NEW YORK, WASHINGTON
@@ -237,9 +237,9 @@ Zone	PST8PDT		 -8:00	US	P%sT
 # H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS.
 #   (a) Amendment- Section 3(a) of the Uniform Time Act of 1966 (15
 #   U.S.C. 260a(a)) is amended--
-#     (1) by striking `first Sunday of April' and inserting `second
+#     (1) by striking 'first Sunday of April' and inserting 'second
 #     Sunday of March'; and
-#     (2) by striking `last Sunday of October' and inserting `first
+#     (2) by striking 'last Sunday of October' and inserting 'first
 #     Sunday of November'.
 #   (b) Effective Date- Subsection (a) shall take effect 1 year after the
 #   date of enactment of this Act or March 1, 2007, whichever is later.
@@ -600,6 +600,8 @@ Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00 #Schmitt&Cox
 			-10:30	-	HST	1947 Jun  8 2:00 #Schmitt&Cox+2
 			-10:00	-	HST
 
+Link Pacific/Honolulu Pacific/Johnston
+
 # Now we turn to US areas that have diverged from the consensus since 1970.
 
 # Arizona mostly uses MST.
@@ -636,8 +638,9 @@ Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 11:31:42
 # Navajo Nation participates in the Daylight Saving Time policy, due to its
 # large size and location in three states."  (The "only" means that other
 # tribal nations don't use DST.)
-
-Link America/Denver America/Shiprock
+#
+# From Paul Eggert (2013-08-26):
+# See America/Denver for a zone appropriate for the Navajo Nation.
 
 # Southern Idaho (Ada, Adams, Bannock, Bear Lake, Bingham, Blaine,
 # Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark,
@@ -677,13 +680,13 @@ Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
 #   and Switzerland counties have their own time zone histories as noted below.
 #
 # Shanks partitioned Indiana into 345 regions, each with its own time history,
-# and wrote ``Even newspaper reports present contradictory information.''
+# and wrote "Even newspaper reports present contradictory information."
 # Those Hoosiers!  Such a flighty and changeable people!
 # Fortunately, most of the complexity occurred before our cutoff date of 1970.
 #
 # Other than Indianapolis, the Indiana place names are so nondescript
-# that they would be ambiguous if we left them at the `America' level.
-# So we reluctantly put them all in a subdirectory `America/Indiana'.
+# that they would be ambiguous if we left them at the 'America' level.
+# So we reluctantly put them all in a subdirectory 'America/Indiana'.
 
 # From Paul Eggert (2005-08-16):
 # http://www.mccsc.edu/time.html says that Indiana will use DST starting 2006.
@@ -947,8 +950,8 @@ Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 12:20:36
 # This story is too entertaining to be false, so go with Howse over Shanks.
 #
 # From Paul Eggert (2001-03-06):
-# Garland (1927) writes ``Cleveland and Detroit advanced their clocks
-# one hour in 1914.''  This change is not in Shanks.  We have no more
+# Garland (1927) writes "Cleveland and Detroit advanced their clocks
+# one hour in 1914."  This change is not in Shanks.  We have no more
 # info, so omit this for now.
 #
 # Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
@@ -988,7 +991,7 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 # occupied 1857/1900 by the Navassa Phosphate Co
 # US lighthouse 1917/1996-09
 # currently uninhabited
-# see Mark Fineman, ``An Isle Rich in Guano and Discord'',
+# see Mark Fineman, "An Isle Rich in Guano and Discord",
 # _Los Angeles Times_ (1998-11-10), A1, A10; it cites
 # Jimmy Skaggs, _The Great Guano Rush_ (1994).
 
@@ -1022,7 +1025,7 @@ Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
 #	Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
 #	<http://www.jstor.org/stable/1774359>.
 #
-# See the `europe' file for Greenland.
+# See the 'europe' file for Greenland.
 
 # Canada
 
@@ -1223,7 +1226,7 @@ Zone America/St_Johns	-3:30:52 -	LMT	1884
 
 # most of east Labrador
 
-# The name `Happy Valley-Goose Bay' is too long; use `Goose Bay'.
+# The name 'Happy Valley-Goose Bay' is too long; use 'Goose Bay'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
 			-3:30:52 -	NST	1918
@@ -1340,25 +1343,27 @@ Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
 
 # Quebec
 
-# From Paul Eggert (2006-07-09):
-# Shanks & Pottenger write that since 1970 most of Quebec has been
-# like Montreal.
+# From Paul Eggert (2013-08-30):
+# Since 1970 most of Quebec has been like Toronto.
+# However, because earlier versions of the tz database mistakenly relied on data
+# from Shanks & Pottenger saying that Quebec differed from Ontario after 1970,
+# a separate entry was created for most of Quebec.  We're loath to lose
+# its pre-1970 info, even though the tz database is normally limited to
+# zones that differ after 1970, so keep this otherwise out-of-scope entry.
 
-# From Paul Eggert (2006-06-27):
 # Matthews and Vincent (1998) also write that Quebec east of the -63
 # meridian is supposed to observe AST, but residents as far east as
 # Natashquan use EST/EDT, and residents east of Natashquan use AST.
-# In "Official time in Quebec" the Quebec department of justice writes in
-# http://www.justice.gouv.qc.ca/english/publications/generale/temps-regl-1-a.htm
-# that "The residents of the Municipality of the
-# Cote-Nord-du-Golfe-Saint-Laurent and the municipalities of Saint-Augustin,
-# Bonne-Esperance and Blanc-Sablon apply the Official Time Act as it is
-# written and use Atlantic standard time all year round. The same applies to
-# the residents of the Native facilities along the lower North Shore."
-# <http://www.assnat.qc.ca/eng/37legislature2/Projets-loi/Publics/06-a002.htm>
+# The Quebec department of justice writes in
+# "The situation in Minganie and Basse-Cote-Nord"
+# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
+# that the coastal strip from just east of Natashquan to Blanc-Sablon
+# observes Atlantic standard time all year round.
+# http://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
 # says this common practice was codified into law as of 2007.
 # For lack of better info, guess this practice began around 1970, contra to
 # Shanks & Pottenger who have this region observing AST/ADT.
+# for post-1970 data America/Puerto_Rico.
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
@@ -1402,7 +1407,6 @@ Zone America/Montreal	-4:54:16 -	LMT	1884
 			-5:00	Mont	E%sT	1974
 			-5:00	Canada	E%sT
 
-
 # Ontario
 
 # From Paul Eggert (2006-07-09):
@@ -1621,7 +1625,7 @@ Zone America/Thunder_Bay -5:57:00 -	LMT	1895
 			-6:00	-	CST	1910
 			-5:00	-	EST	1942
 			-5:00	Canada	E%sT	1970
-			-5:00	Mont	E%sT	1973
+			-5:00	Toronto	E%sT	1973
 			-5:00	-	EST	1974
 			-5:00	Canada	E%sT
 Zone America/Nipigon	-5:53:04 -	LMT	1895
@@ -2208,7 +2212,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
 # From Paul Eggert (1996-06-12):
 # For an English translation of the decree, see
 # <a href="http://mexico-travel.com/extra/timezone_eng.html">
-# ``Diario Oficial: Time Zone Changeover'' (1996-01-04).
+# "Diario Oficial: Time Zone Changeover" (1996-01-04).
 # </a>
 
 # From Rives McDow (1998-10-08):
@@ -2545,9 +2549,7 @@ Zone America/Santa_Isabel	-7:39:28 -	LMT	1922 Jan  1  0:20:32
 ###############################################################################
 
 # Anguilla
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Anguilla	-4:12:16 -	LMT	1912 Mar 2
-			-4:00	-	AST
+# See 'southamerica'.
 
 # Antigua and Barbuda
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -2616,13 +2618,13 @@ Zone	America/Belize	-5:52:48 -	LMT	1912 Apr
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1 2:00    # Hamilton
 			-4:00	-	AST	1974 Apr 28 2:00
-			-4:00	Bahamas	A%sT	1976
+			-4:00	Canada	A%sT	1976
 			-4:00	US	A%sT
 
 # Cayman Is
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Cayman	-5:25:32 -	LMT	1890		# Georgetown
-			-5:07:12 -	KMT	1912 Feb    # Kingston Mean Time
+			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
 			-5:00	-	EST
 
 # Costa Rica
@@ -2637,7 +2639,7 @@ Rule	CR	1991	1992	-	Jan	Sat>=15	0:00	1:00	D
 # go with Shanks & Pottenger.
 Rule	CR	1991	only	-	Jul	 1	0:00	0	S
 Rule	CR	1992	only	-	Mar	15	0:00	0	S
-# There are too many San Joses elsewhere, so we'll use `Costa Rica'.
+# There are too many San Joses elsewhere, so we'll use 'Costa Rica'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Costa_Rica	-5:36:13 -	LMT	1890		# San Jose
 			-5:36:13 -	SJMT	1921 Jan 15 # San Jose Mean Time
@@ -2869,9 +2871,7 @@ Zone	America/Havana	-5:29:28 -	LMT	1890
 			-5:00	Cuba	C%sT
 
 # Dominica
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Dominica	-4:05:36 -	LMT	1911 Jul 1 0:01		# Roseau
-			-4:00	-	AST
+# See 'southamerica'.
 
 # Dominican Republic
 
@@ -2920,18 +2920,10 @@ Zone America/El_Salvador -5:56:48 -	LMT	1921		# San Salvador
 			-6:00	Salv	C%sT
 
 # Grenada
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul	# St George's
-			-4:00	-	AST
-
 # Guadeloupe
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun 8	# Pointe a Pitre
-			-4:00	-	AST
 # St Barthelemy
-Link America/Guadeloupe	America/St_Barthelemy
 # St Martin (French part)
-Link America/Guadeloupe	America/Marigot
+# See 'southamerica'.
 
 # Guatemala
 #
@@ -3074,17 +3066,12 @@ Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
 # Great Swan I ceded by US to Honduras in 1972
 
 # Jamaica
-
-# From Bob Devine (1988-01-28):
-# Follows US rules.
-
-# From U. S. Naval Observatory (1989-01-19):
-# JAMAICA             5 H  BEHIND UTC
-
-# From Shanks & Pottenger:
+# Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
+# unspecified official document, and says "This time is used throughout the
+# island".  Go with Milne.  Round to the nearest second as required by zic.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Jamaica	-5:07:12 -	LMT	1890		# Kingston
-			-5:07:12 -	KMT	1912 Feb    # Kingston Mean Time
+Zone	America/Jamaica	-5:07:11 -	LMT	1890		# Kingston
+			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
 			-5:00	-	EST	1974 Apr 28 2:00
 			-5:00	US	E%sT	1984
 			-5:00	-	EST
@@ -3098,12 +3085,7 @@ Zone America/Martinique	-4:04:20 -      LMT	1890		# Fort-de-France
 			-4:00	-	AST
 
 # Montserrat
-# From Paul Eggert (2006-03-22):
-# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
-# world.gazetteer.com says Cork Hill is the most populous location now.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul 1 0:01   # Cork Hill
-			-4:00	-	AST
+# See 'southamerica'.
 
 # Nicaragua
 #
@@ -3177,7 +3159,7 @@ Zone	America/Panama	-5:18:08 -	LMT	1890
 			-5:00	-	EST
 
 # Puerto Rico
-# There are too many San Juans elsewhere, so we'll use `Puerto_Rico'.
+# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00    # San Juan
 			-4:00	-	AST	1942 May  3
@@ -3185,18 +3167,11 @@ Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00    # San Juan
 			-4:00	-	AST
 
 # St Kitts-Nevis
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar 2	# Basseterre
-			-4:00	-	AST
-
 # St Lucia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/St_Lucia	-4:04:00 -	LMT	1890		# Castries
-			-4:04:00 -	CMT	1912	    # Castries Mean Time
-			-4:00	-	AST
+# See 'southamerica'.
 
 # St Pierre and Miquelon
-# There are too many St Pierres elsewhere, so we'll use `Miquelon'.
+# There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15	# St Pierre
 			-4:00	-	AST	1980 May
@@ -3204,10 +3179,7 @@ Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15	# St Pierre
 			-3:00	Canada	PM%sT
 
 # St Vincent and the Grenadines
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/St_Vincent	-4:04:56 -	LMT	1890		# Kingstown
-			-4:04:56 -	KMT	1912	   # Kingstown Mean Time
-			-4:00	-	AST
+# See 'southamerica'.
 
 # Turks and Caicos
 #
@@ -3237,15 +3209,9 @@ Rule	TC	2007	max	-	Mar	Sun>=8	2:00	1:00	D
 Rule	TC	2007	max	-	Nov	Sun>=1	2:00	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone America/Grand_Turk	-4:44:32 -	LMT	1890
-			-5:07:12 -	KMT	1912 Feb    # Kingston Mean Time
+			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
 			-5:00	TC	E%sT
 
 # British Virgin Is
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Tortola	-4:18:28 -	LMT	1911 Jul    # Road Town
-			-4:00	-	AST
-
 # Virgin Is
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul    # Charlotte Amalie
-			-4:00	-	AST
+# See 'southamerica'.
diff --git a/contrib/tzdata/southamerica b/contrib/tzdata/southamerica
index 0d8ed7a33a8..2d77bf7b53a 100644
--- a/contrib/tzdata/southamerica
+++ b/contrib/tzdata/southamerica
@@ -451,6 +451,17 @@ Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
 # rules...San Luis is still using "Western ARgentina Time" and it got
 # stuck on Summer daylight savings time even though the summer is over.
 
+# From Paul Eggert (2013-09-05):
+# Perhaps San Luis operates on the legal fiction that it is at UTC-4
+# with perpetual summer time, but ordinary usage typically seems to
+# just say it's at UTC-3; see, for example,
+# <http://es.wikipedia.org/wiki/Hora_oficial_argentina>.
+# We've documented similar situations as being plain changes to
+# standard time, so let's do that here too.  This does not change UTC
+# offsets, only tm_isdst and the time zone abbreviations.  One minor
+# plus is that this silences a zic complaint that there's no POSIX TZ
+# setting for time stamps past 2038.
+
 # From Paul Eggert (2013-02-21):
 # Milne says Cordoba time was -4:16:48.2.  Round to the nearest second.
 
@@ -588,7 +599,7 @@ Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
 # San Luis (SL)
 
 Rule	SanLuis	2008	2009	-	Mar	Sun>=8	0:00	0	-
-Rule	SanLuis	2007	2009	-	Oct	Sun>=8	0:00	1:00	S
+Rule	SanLuis	2007	2008	-	Oct	Sun>=8	0:00	1:00	S
 
 Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
@@ -604,7 +615,8 @@ Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
 			-3:00	-	ART	2004 May 31
 			-4:00	-	WART	2004 Jul 25
 			-3:00	Arg	AR%sT	2008 Jan 21
-			-4:00	SanLuis	WAR%sT
+			-4:00	SanLuis	WAR%sT	2009 Oct 11
+			-3:00	-	ART
 #
 # Santa Cruz (SC)
 Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
@@ -631,10 +643,7 @@ Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
 			-3:00	-	ART
 
 # Aruba
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12	# Oranjestad
-			-4:30	-	ANT	1965 # Netherlands Antilles Time
-			-4:00	-	AST
+Link America/Curacao America/Aruba
 
 # Bolivia
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -836,6 +845,21 @@ Zone	America/La_Paz	-4:32:36 -	LMT	1890
 # Tocantins state will have DST.
 # http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
 
+# From Steffen Thorsen (2013-09-20):
+# Tocantins in Brazil is very likely not to observe DST from October....
+# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
+# We will keep this article updated when this is confirmed:
+# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
+
+# From Steffen Thorsen (2013-10-17):
+# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
+# Senator Jorge Viana announced that Acre will change time zone on November 10.
+# He did not specify the time of the change, nor if western parts of Amazonas
+# will change as well.
+#
+# From Paul Eggert (2013-10-17):
+# For now, assume western Amazonas will change as well.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree <a href="http://pcdsh01.on.br/HV20466.htm">20,466</a> (1931-10-01)
 # Decree <a href="http://pcdsh01.on.br/HV21896.htm">21,896</a> (1932-01-10)
@@ -1055,7 +1079,8 @@ Zone America/Araguaina	-3:12:48 -	LMT	1914
 			-3:00	-	BRT	1995 Sep 14
 			-3:00	Brazil	BR%sT	2003 Sep 24
 			-3:00	-	BRT	2012 Oct 21
-			-3:00	Brazil	BR%sT
+			-3:00	Brazil	BR%sT	2013 Sep
+			-3:00	-	BRT
 #
 # Alagoas (AL), Sergipe (SE)
 Zone America/Maceio	-2:22:52 -	LMT	1914
@@ -1123,13 +1148,15 @@ Zone America/Eirunepe	-4:39:28 -	LMT	1914
 			-5:00	-	ACT	1993 Sep 28
 			-5:00	Brazil	AC%sT	1994 Sep 22
 			-5:00	-	ACT	2008 Jun 24 00:00
-			-4:00	-	AMT
+			-4:00	-	AMT	2013 Nov 10
+			-5:00	-	ACT
 #
 # Acre (AC)
 Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 			-5:00	Brazil	AC%sT	1988 Sep 12
 			-5:00	-	ACT	2008 Jun 24 00:00
-			-4:00	-	AMT
+			-4:00	-	AMT	2013 Nov 10
+			-5:00	-	ACT
 
 # Chile
 
@@ -1350,12 +1377,12 @@ Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12	# Willemstad
 			-4:00	-	AST
 
 # From Arthur David Olson (2011-06-15):
-# At least for now, use links for places with new iso3166 codes.
+# use links for places with new iso3166 codes.
 # The name "Lower Prince's Quarter" is both longer than fourteen charaters
 # and contains an apostrophe; use "Lower_Princes" below.
 
-Link	America/Curacao	America/Lower_Princes # Sint Maarten
-Link	America/Curacao	America/Kralendijk # Bonaire, Sint Estatius and Saba
+Link	America/Curacao	America/Lower_Princes	# Sint Maarten
+Link	America/Curacao	America/Kralendijk	# Caribbean Netherlands
 
 # Ecuador
 #
@@ -1496,10 +1523,16 @@ Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar	# Georgetown
 			-4:00	-	GYT
 
 # Paraguay
+#
 # From Paul Eggert (2006-03-22):
 # Shanks & Pottenger say that spring transitions are from 01:00 -> 02:00,
 # and autumn transitions are from 00:00 -> 23:00.  Go with pre-1999
 # editions of Shanks, and with the IATA, who say transitions occur at 00:00.
+#
+# From Waldemar Villamayor-Venialbo (2013-09-20):
+# No time of the day is established for the adjustment, so people normally
+# adjust their clocks at 0 hour of the given dates.
+#
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Para	1975	1988	-	Oct	 1	0:00	1:00	S
 Rule	Para	1975	1978	-	Mar	 1	0:00	0	-
@@ -1633,6 +1666,19 @@ Zone America/Paramaribo	-3:40:40 -	LMT	1911
 Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
 			-4:00	-	AST
 
+Link America/Port_of_Spain America/Anguilla
+Link America/Port_of_Spain America/Dominica
+Link America/Port_of_Spain America/Grenada
+Link America/Port_of_Spain America/Guadeloupe
+Link America/Port_of_Spain America/Marigot
+Link America/Port_of_Spain America/Montserrat
+Link America/Port_of_Spain America/St_Barthelemy
+Link America/Port_of_Spain America/St_Kitts
+Link America/Port_of_Spain America/St_Lucia
+Link America/Port_of_Spain America/St_Thomas
+Link America/Port_of_Spain America/St_Vincent
+Link America/Port_of_Spain America/Tortola
+
 # Uruguay
 # From Paul Eggert (1993-11-18):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
@@ -1650,7 +1696,7 @@ Rule	Uruguay	1937	1941	-	Mar	lastSun	 0:00	0	-
 # Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
 Rule	Uruguay	1937	1940	-	Oct	lastSun	 0:00	0:30	HS
 # Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
-# and 1943 Apr 13 ``to present time''; go with Shanks & Pottenger.
+# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
 Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0:30	HS
 Rule	Uruguay	1942	only	-	Jan	 1	 0:00	0	-
 Rule	Uruguay	1942	only	-	Dec	14	 0:00	1:00	S
diff --git a/contrib/tzdata/zone.tab b/contrib/tzdata/zone.tab
index c6df3f70d98..ac4e5a70011 100644
--- a/contrib/tzdata/zone.tab
+++ b/contrib/tzdata/zone.tab
@@ -3,27 +3,31 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# From Paul Eggert (2013-05-27):
+# From Paul Eggert (2013-08-14):
 #
-# This file contains a table with the following columns:
-# 1.  ISO 3166 2-character country code.  See /usr/share/misc/iso3166.
-#     This identifies a country that overlaps the zone.  The country may
-#     overlap other zones and the zone may overlap other countries.
-# 2.  Latitude and longitude of the zone's principal location
+# This file contains a table where each row stands for an area that is
+# the intersection of a region identified by a country code and of a
+# zone where civil clocks have agreed since 1970.  The columns of the
+# table are as follows:
+#
+# 1.  ISO 3166 2-character country code.
+#     See the file '/usr/share/misc/iso3166.tab'.
+# 2.  Latitude and longitude of the area's principal location
 #     in ISO 6709 sign-degrees-minutes-seconds format,
 #     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
 #     first latitude (+ is north), then longitude (+ is east).
-#     This location need not lie within the column-1 country.
 # 3.  Zone name used in value of TZ environment variable.
 #     Please see the 'Theory' file for how zone names are chosen.
+#     If multiple zones overlap a country, each has a row in the
+#     table, with column 1 being duplicated.
 # 4.  Comments; present if and only if the country has multiple rows.
 #
 # Columns are separated by a single tab.
 # The table is sorted first by country, then an order within the country that
 # (1) makes some geographical sense, and
-# (2) puts the most populous zones first, where that does not contradict (1).
+# (2) puts the most populous areas first, where that does not contradict (1).
 #
-# Lines beginning with `#' are comments.
+# Lines beginning with '#' are comments.
 #
 # This table is intended as an aid for users, to help them select time
 # zone data appropriate for their practical needs.  It is not intended
@@ -39,8 +43,7 @@ AI	+1812-06304	America/Anguilla
 AL	+4120+01950	Europe/Tirane
 AM	+4011+04430	Asia/Yerevan
 AO	-0848+01314	Africa/Luanda
-AQ	-7750+16636	Antarctica/McMurdo	McMurdo Station, Ross Island
-AQ	-9000+00000	Antarctica/South_Pole	Amundsen-Scott Station, South Pole
+AQ	-7750+16636	Antarctica/McMurdo	McMurdo, South Pole, Scott (New Zealand time)
 AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
 AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
 AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
@@ -120,8 +123,7 @@ CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did n
 CA	+4606-06447	America/Moncton	Atlantic Time - New Brunswick
 CA	+5320-06025	America/Goose_Bay	Atlantic Time - Labrador - most locations
 CA	+5125-05707	America/Blanc-Sablon	Atlantic Standard Time - Quebec - Lower North Shore
-CA	+4531-07334	America/Montreal	Eastern Time - Quebec - most locations
-CA	+4339-07923	America/Toronto	Eastern Time - Ontario - most locations
+CA	+4339-07923	America/Toronto	Eastern Time - Ontario & Quebec - most locations
 CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
 CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
 CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut - most locations
@@ -232,7 +234,7 @@ IR	+3540+05126	Asia/Tehran
 IS	+6409-02151	Atlantic/Reykjavik
 IT	+4154+01229	Europe/Rome
 JE	+4912-00207	Europe/Jersey
-JM	+1800-07648	America/Jamaica
+JM	+175805-0764736	America/Jamaica
 JO	+3157+03556	Asia/Amman
 JP	+353916+1394441	Asia/Tokyo
 KE	-0117+03649	Africa/Nairobi
@@ -421,8 +423,7 @@ US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota -
 US	+471551-1014640	America/North_Dakota/Beulah	Central Time - North Dakota - Mercer County
 US	+394421-1045903	America/Denver	Mountain Time
 US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
-US	+364708-1084111	America/Shiprock	Mountain Time - Navajo
-US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona
+US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona (except Navajo)
 US	+340308-1181434	America/Los_Angeles	Pacific Time
 US	+611305-1495401	America/Anchorage	Alaska Time
 US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
diff --git a/contrib/wpa/src/utils/radiotap.h b/contrib/wpa/src/utils/radiotap.h
index 42d516ab21e..137288f9a1e 100644
--- a/contrib/wpa/src/utils/radiotap.h
+++ b/contrib/wpa/src/utils/radiotap.h
@@ -1,4 +1,4 @@
-/* $FreeBSD: head/contrib/wpa/src/utils/radiotap.h 214734 2010-11-03 10:43:38Z rpaulo $ */
+/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.5 2005/01/22 20:12:05 sam Exp $ */
 /* $NetBSD: ieee80211_radiotap.h,v 1.11 2005/06/22 06:16:02 dyoung Exp $ */
 
 /*-
diff --git a/crypto/openssh/ChangeLog b/crypto/openssh/ChangeLog
index 1a0d2545eee..6175764f5bf 100644
--- a/crypto/openssh/ChangeLog
+++ b/crypto/openssh/ChangeLog
@@ -1,3 +1,20 @@
+20131108
+ - (djm) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2013/11/06 16:52:11
+     [monitor_wrap.c]
+     fix rekeying for AES-GCM modes; ok deraadt
+   - djm@cvs.openbsd.org 2013/11/08 00:39:15
+     [auth-options.c auth2-chall.c authfd.c channels.c cipher-3des1.c]
+     [clientloop.c gss-genr.c monitor_mm.c packet.c schnorr.c umac.c]
+     [sftp-client.c sftp-glob.c]
+     use calloc for all structure allocations; from markus@
+ - (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
+   [contrib/suse/openssh.spec] update version numbers
+   - djm@cvs.openbsd.org 2013/11/08 01:38:11
+     [version.h]
+     openssh-6.4
+ - (djm) Release 6.4p1
+
 20130913
  - (djm) [channels.c] Fix unaligned access on sparc machines in SOCKS5 code;
    ok dtucker@
diff --git a/crypto/openssh/README b/crypto/openssh/README
index ece2dba19c2..0c52f137148 100644
--- a/crypto/openssh/README
+++ b/crypto/openssh/README
@@ -1,4 +1,4 @@
-See http://www.openssh.com/txt/release-6.3 for the release notes.
+See http://www.openssh.com/txt/release-6.4 for the release notes.
 
 - A Japanese translation of this document and of the OpenSSH FAQ is
 - available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@@ -62,4 +62,4 @@ References -
 [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
 [7] http://www.openssh.com/faq.html
 
-$Id: README,v 1.83 2013/07/25 02:34:00 djm Exp $
+$Id: README,v 1.83.4.1 2013/11/08 01:36:17 djm Exp $
diff --git a/crypto/openssh/auth-options.c b/crypto/openssh/auth-options.c
index 80d59ee95c5..12e2e1dcac9 100644
--- a/crypto/openssh/auth-options.c
+++ b/crypto/openssh/auth-options.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-options.c,v 1.59 2013/07/12 00:19:58 djm Exp $ */
+/* $OpenBSD: auth-options.c,v 1.61 2013/11/08 00:39:14 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -239,7 +239,7 @@ auth_parse_options(struct passwd *pw, char *opts, char *file, u_long linenum)
 			auth_debug_add("Adding to environment: %.900s", s);
 			debug("Adding to environment: %.900s", s);
 			opts++;
-			new_envstring = xmalloc(sizeof(struct envstring));
+			new_envstring = xcalloc(1, sizeof(struct envstring));
 			new_envstring->s = s;
 			new_envstring->next = custom_environment;
 			custom_environment = new_envstring;
diff --git a/crypto/openssh/auth2-chall.c b/crypto/openssh/auth2-chall.c
index 98f3093ce2f..031c2828c98 100644
--- a/crypto/openssh/auth2-chall.c
+++ b/crypto/openssh/auth2-chall.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-chall.c,v 1.38 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: auth2-chall.c,v 1.39 2013/11/08 00:39:14 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -111,7 +111,7 @@ kbdint_alloc(const char *devs)
 		remove_kbdint_device("pam");
 #endif
 
-	kbdintctxt = xmalloc(sizeof(KbdintAuthctxt));
+	kbdintctxt = xcalloc(1, sizeof(KbdintAuthctxt));
 	if (strcmp(devs, "") == 0) {
 		buffer_init(&b);
 		for (i = 0; devices[i]; i++) {
diff --git a/crypto/openssh/authfd.c b/crypto/openssh/authfd.c
index 775786bee13..5cce93b76a5 100644
--- a/crypto/openssh/authfd.c
+++ b/crypto/openssh/authfd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: authfd.c,v 1.87 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: authfd.c,v 1.88 2013/11/08 00:39:14 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -206,7 +206,7 @@ ssh_get_authentication_connection(void)
 	if (sock < 0)
 		return NULL;
 
-	auth = xmalloc(sizeof(*auth));
+	auth = xcalloc(1, sizeof(*auth));
 	auth->fd = sock;
 	buffer_init(&auth->identities);
 	auth->howmany = 0;
diff --git a/crypto/openssh/channels.c b/crypto/openssh/channels.c
index 4bd8b27c7d3..6c30b0ffa6f 100644
--- a/crypto/openssh/channels.c
+++ b/crypto/openssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.324 2013/07/12 00:19:58 djm Exp $ */
+/* $OpenBSD: channels.c,v 1.327 2013/11/08 00:39:15 djm Exp $ */
 /* $FreeBSD$ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -711,7 +711,7 @@ channel_register_status_confirm(int id, channel_confirm_cb *cb,
 	if ((c = channel_lookup(id)) == NULL)
 		fatal("channel_register_expect: %d: bad id", id);
 
-	cc = xmalloc(sizeof(*cc));
+	cc = xcalloc(1, sizeof(*cc));
 	cc->cb = cb;
 	cc->abandon_cb = abandon_cb;
 	cc->ctx = ctx;
diff --git a/crypto/openssh/cipher-3des1.c b/crypto/openssh/cipher-3des1.c
index c8a70244b09..56fc777862d 100644
--- a/crypto/openssh/cipher-3des1.c
+++ b/crypto/openssh/cipher-3des1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cipher-3des1.c,v 1.8 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: cipher-3des1.c,v 1.9 2013/11/08 00:39:15 djm Exp $ */
 /*
  * Copyright (c) 2003 Markus Friedl.  All rights reserved.
  *
@@ -67,7 +67,7 @@ ssh1_3des_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
 	u_char *k1, *k2, *k3;
 
 	if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) == NULL) {
-		c = xmalloc(sizeof(*c));
+		c = xcalloc(1, sizeof(*c));
 		EVP_CIPHER_CTX_set_app_data(ctx, c);
 	}
 	if (key == NULL)
diff --git a/crypto/openssh/clientloop.c b/crypto/openssh/clientloop.c
index ad390b1433e..186b78dfc8c 100644
--- a/crypto/openssh/clientloop.c
+++ b/crypto/openssh/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.253 2013/06/07 15:37:52 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.255 2013/11/08 00:39:15 djm Exp $ */
 /* $FreeBSD$ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -838,7 +838,7 @@ void
 client_expect_confirm(int id, const char *request,
     enum confirm_action action)
 {
-	struct channel_reply_ctx *cr = xmalloc(sizeof(*cr));
+	struct channel_reply_ctx *cr = xcalloc(1, sizeof(*cr));
 
 	cr->request_type = request;
 	cr->action = action;
@@ -861,7 +861,7 @@ client_register_global_confirm(global_confirm_cb *cb, void *ctx)
 		return;
 	}
 
-	gc = xmalloc(sizeof(*gc));
+	gc = xcalloc(1, sizeof(*gc));
 	gc->cb = cb;
 	gc->ctx = ctx;
 	gc->ref_count = 1;
@@ -1439,7 +1439,7 @@ client_new_escape_filter_ctx(int escape_char)
 {
 	struct escape_filter_ctx *ret;
 
-	ret = xmalloc(sizeof(*ret));
+	ret = xcalloc(1, sizeof(*ret));
 	ret->escape_pending = 0;
 	ret->escape_char = escape_char;
 	return (void *)ret;
diff --git a/crypto/openssh/contrib/caldera/openssh.spec b/crypto/openssh/contrib/caldera/openssh.spec
index b460bfff00f..d026b72d8e6 100644
--- a/crypto/openssh/contrib/caldera/openssh.spec
+++ b/crypto/openssh/contrib/caldera/openssh.spec
@@ -16,7 +16,7 @@
 
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable	1
-%define version 	6.3p1
+%define version 	6.4p1
 %if %{use_stable}
   %define cvs		%{nil}
   %define release 	1
@@ -363,4 +363,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.80 2013/07/25 02:34:00 djm Exp $
+$Id: openssh.spec,v 1.80.4.1 2013/11/08 01:36:19 djm Exp $
diff --git a/crypto/openssh/contrib/redhat/openssh.spec b/crypto/openssh/contrib/redhat/openssh.spec
index d1191f4e1a6..29a38dedc1f 100644
--- a/crypto/openssh/contrib/redhat/openssh.spec
+++ b/crypto/openssh/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 6.3p1
+%define ver 6.4p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
diff --git a/crypto/openssh/contrib/suse/openssh.spec b/crypto/openssh/contrib/suse/openssh.spec
index 2866039d1fc..3a612bd2382 100644
--- a/crypto/openssh/contrib/suse/openssh.spec
+++ b/crypto/openssh/contrib/suse/openssh.spec
@@ -13,7 +13,7 @@
 
 Summary:	OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name:		openssh
-Version:	6.3p1
+Version:	6.4p1
 URL:		http://www.openssh.com/
 Release:	1
 Source0:	openssh-%{version}.tar.gz
diff --git a/crypto/openssh/gss-genr.c b/crypto/openssh/gss-genr.c
index bf164a77b60..b39281bc1e6 100644
--- a/crypto/openssh/gss-genr.c
+++ b/crypto/openssh/gss-genr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-genr.c,v 1.21 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: gss-genr.c,v 1.22 2013/11/08 00:39:15 djm Exp $ */
 
 /*
  * Copyright (c) 2001-2007 Simon Wilkinson. All rights reserved.
@@ -62,7 +62,7 @@ ssh_gssapi_set_oid_data(Gssctxt *ctx, void *data, size_t len)
 		free(ctx->oid->elements);
 		free(ctx->oid);
 	}
-	ctx->oid = xmalloc(sizeof(gss_OID_desc));
+	ctx->oid = xcalloc(1, sizeof(gss_OID_desc));
 	ctx->oid->length = len;
 	ctx->oid->elements = xmalloc(len);
 	memcpy(ctx->oid->elements, data, len);
diff --git a/crypto/openssh/monitor_mm.c b/crypto/openssh/monitor_mm.c
index ee7bad4b454..d3e6aeee539 100644
--- a/crypto/openssh/monitor_mm.c
+++ b/crypto/openssh/monitor_mm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_mm.c,v 1.17 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: monitor_mm.c,v 1.18 2013/11/08 00:39:15 djm Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * All rights reserved.
@@ -65,7 +65,7 @@ mm_make_entry(struct mm_master *mm, struct mmtree *head,
 	struct mm_share *tmp, *tmp2;
 
 	if (mm->mmalloc == NULL)
-		tmp = xmalloc(sizeof(struct mm_share));
+		tmp = xcalloc(1, sizeof(struct mm_share));
 	else
 		tmp = mm_xmalloc(mm->mmalloc, sizeof(struct mm_share));
 	tmp->address = address;
@@ -88,7 +88,7 @@ mm_create(struct mm_master *mmalloc, size_t size)
 	struct mm_master *mm;
 
 	if (mmalloc == NULL)
-		mm = xmalloc(sizeof(struct mm_master));
+		mm = xcalloc(1, sizeof(struct mm_master));
 	else
 		mm = mm_xmalloc(mmalloc, sizeof(struct mm_master));
 
@@ -161,6 +161,7 @@ mm_xmalloc(struct mm_master *mm, size_t size)
 	address = mm_malloc(mm, size);
 	if (address == NULL)
 		fatal("%s: mm_malloc(%lu)", __func__, (u_long)size);
+	memset(address, 0, size);
 	return (address);
 }
 
diff --git a/crypto/openssh/monitor_wrap.c b/crypto/openssh/monitor_wrap.c
index 88ff68330ae..4ce46960568 100644
--- a/crypto/openssh/monitor_wrap.c
+++ b/crypto/openssh/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.76 2013/05/17 00:13:13 djm Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.77 2013/11/06 16:52:11 markus Exp $ */
 /*
  * Copyright 2002 Niels Provos <provos@citi.umich.edu>
  * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -482,7 +482,7 @@ mm_newkeys_from_blob(u_char *blob, int blen)
 	buffer_init(&b);
 	buffer_append(&b, blob, blen);
 
-	newkey = xmalloc(sizeof(*newkey));
+	newkey = xcalloc(1, sizeof(*newkey));
 	enc = &newkey->enc;
 	mac = &newkey->mac;
 	comp = &newkey->comp;
diff --git a/crypto/openssh/packet.c b/crypto/openssh/packet.c
index 3d8256fc23f..66c87a23207 100644
--- a/crypto/openssh/packet.c
+++ b/crypto/openssh/packet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.188 2013/07/12 00:19:58 djm Exp $ */
+/* $OpenBSD: packet.c,v 1.189 2013/11/08 00:39:15 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -999,7 +999,7 @@ packet_send2(void)
 		    (type == SSH2_MSG_SERVICE_REQUEST) ||
 		    (type == SSH2_MSG_SERVICE_ACCEPT)) {
 			debug("enqueue packet: %u", type);
-			p = xmalloc(sizeof(*p));
+			p = xcalloc(1, sizeof(*p));
 			p->type = type;
 			memcpy(&p->payload, &active_state->outgoing_packet,
 			    sizeof(Buffer));
diff --git a/crypto/openssh/schnorr.c b/crypto/openssh/schnorr.c
index 09e055292fc..c14ec94734b 100644
--- a/crypto/openssh/schnorr.c
+++ b/crypto/openssh/schnorr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: schnorr.c,v 1.7 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: schnorr.c,v 1.8 2013/11/08 00:39:15 djm Exp $ */
 /* $FreeBSD$ */
 /*
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -552,7 +552,7 @@ modp_group_from_g_and_safe_p(const char *grp_g, const char *grp_p)
 {
 	struct modp_group *ret;
 
-	ret = xmalloc(sizeof(*ret));
+	ret = xcalloc(1, sizeof(*ret));
 	ret->p = ret->q = ret->g = NULL;
 	if (BN_hex2bn(&ret->p, grp_p) == 0 ||
 	    BN_hex2bn(&ret->g, grp_g) == 0)
diff --git a/crypto/openssh/sftp-client.c b/crypto/openssh/sftp-client.c
index f4f1970b6c9..2f9793778f9 100644
--- a/crypto/openssh/sftp-client.c
+++ b/crypto/openssh/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.101 2013/07/25 00:56:51 djm Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.108 2013/11/08 00:39:15 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -471,7 +471,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag,
 
 	if (dir) {
 		ents = 0;
-		*dir = xmalloc(sizeof(**dir));
+		*dir = xcalloc(1, sizeof(**dir));
 		(*dir)[0] = NULL;
 	}
 
@@ -545,7 +545,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag,
 
 			if (dir) {
 				*dir = xrealloc(*dir, ents + 2, sizeof(**dir));
-				(*dir)[ents] = xmalloc(sizeof(***dir));
+				(*dir)[ents] = xcalloc(1, sizeof(***dir));
 				(*dir)[ents]->filename = xstrdup(filename);
 				(*dir)[ents]->longname = xstrdup(longname);
 				memcpy(&(*dir)[ents]->a, a, sizeof(*a));
@@ -564,7 +564,7 @@ do_lsreaddir(struct sftp_conn *conn, char *path, int printflag,
 	/* Don't return partial matches on interrupt */
 	if (interrupted && dir != NULL && *dir != NULL) {
 		free_sftp_dirents(*dir);
-		*dir = xmalloc(sizeof(**dir));
+		*dir = xcalloc(1, sizeof(**dir));
 		**dir = NULL;
 	}
 
@@ -1105,7 +1105,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
 			    (unsigned long long)offset,
 			    (unsigned long long)offset + buflen - 1,
 			    num_req, max_req);
-			req = xmalloc(sizeof(*req));
+			req = xcalloc(1, sizeof(*req));
 			req->id = conn->msg_id++;
 			req->len = buflen;
 			req->offset = offset;
@@ -1463,7 +1463,7 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
 			    strerror(errno));
 
 		if (len != 0) {
-			ack = xmalloc(sizeof(*ack));
+			ack = xcalloc(1, sizeof(*ack));
 			ack->id = ++id;
 			ack->offset = offset;
 			ack->len = len;
diff --git a/crypto/openssh/sftp-glob.c b/crypto/openssh/sftp-glob.c
index 79b7bdb2f4c..e1f5a6109d6 100644
--- a/crypto/openssh/sftp-glob.c
+++ b/crypto/openssh/sftp-glob.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-glob.c,v 1.24 2013/05/17 00:13:14 djm Exp $ */
+/* $OpenBSD: sftp-glob.c,v 1.25 2013/11/08 00:39:15 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -48,7 +48,7 @@ fudge_opendir(const char *path)
 {
 	struct SFTP_OPENDIR *r;
 
-	r = xmalloc(sizeof(*r));
+	r = xcalloc(1, sizeof(*r));
 
 	if (do_readdir(cur.conn, (char *)path, &r->dir)) {
 		free(r);
diff --git a/crypto/openssh/sftp-server.0 b/crypto/openssh/sftp-server.0
index bca318b386d..391f42736f6 100644
--- a/crypto/openssh/sftp-server.0
+++ b/crypto/openssh/sftp-server.0
@@ -61,9 +61,8 @@ DESCRIPTION
 SEE ALSO
      sftp(1), ssh(1), sshd_config(5), sshd(8)
 
-     T. Ylonen and S. Lehtinen, SSH File Transfer Protocol,
-     draft-ietf-secsh-filexfer-02.txt, October 2001, work in progress
-     material.
+     T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
+     filexfer-02.txt, October 2001, work in progress material.
 
 HISTORY
      sftp-server first appeared in OpenBSD 2.8.
diff --git a/crypto/openssh/sftp.0 b/crypto/openssh/sftp.0
index c5fa17892a7..8bfc8086bc8 100644
--- a/crypto/openssh/sftp.0
+++ b/crypto/openssh/sftp.0
@@ -342,8 +342,7 @@ SEE ALSO
      ftp(1), ls(1), scp(1), ssh(1), ssh-add(1), ssh-keygen(1), glob(3),
      ssh_config(5), sftp-server(8), sshd(8)
 
-     T. Ylonen and S. Lehtinen, SSH File Transfer Protocol,
-     draft-ietf-secsh-filexfer-00.txt, January 2001, work in progress
-     material.
+     T. Ylonen and S. Lehtinen, SSH File Transfer Protocol, draft-ietf-secsh-
+     filexfer-00.txt, January 2001, work in progress material.
 
 OpenBSD 5.4                      July 25, 2013                     OpenBSD 5.4
diff --git a/crypto/openssh/ssh_config b/crypto/openssh/ssh_config
index 8911749fe4e..39e1bad34c3 100644
--- a/crypto/openssh/ssh_config
+++ b/crypto/openssh/ssh_config
@@ -48,4 +48,4 @@
 #   ProxyCommand ssh -q -W %h:%p gateway.example.com
 #   RekeyLimit 1G 1h
 #   VerifyHostKeyDNS yes
-#   VersionAddendum FreeBSD-20130918
+#   VersionAddendum FreeBSD-20131111
diff --git a/crypto/openssh/ssh_config.5 b/crypto/openssh/ssh_config.5
index 930a025664c..2f2d1d0d812 100644
--- a/crypto/openssh/ssh_config.5
+++ b/crypto/openssh/ssh_config.5
@@ -1259,7 +1259,7 @@ See also VERIFYING HOST KEYS in
 Specifies a string to append to the regular version string to identify
 OS- or site-specific modifications.
 The default is
-.Dq FreeBSD-20130918 .
+.Dq FreeBSD-20131111 .
 .It Cm VisualHostKey
 If this flag is set to
 .Dq yes ,
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index 3e6ab57b6c2..6d0cf3821db 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -118,7 +118,7 @@
 #MaxStartups 10:30:100
 #PermitTunnel no
 #ChrootDirectory none
-#VersionAddendum FreeBSD-20130918
+#VersionAddendum FreeBSD-20131111
 
 # no default banner path
 #Banner none
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index efba4088a9d..ac9a8b688d3 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -1217,7 +1217,7 @@ restrictions.
 Optionally specifies additional text to append to the SSH protocol banner
 sent by the server upon connection.
 The default is
-.Dq FreeBSD-20130918 .
+.Dq FreeBSD-20131111 .
 .It Cm X11DisplayOffset
 Specifies the first display number available for
 .Xr sshd 8 Ns 's
diff --git a/crypto/openssh/umac.c b/crypto/openssh/umac.c
index 99416a5103a..0c62145fa01 100644
--- a/crypto/openssh/umac.c
+++ b/crypto/openssh/umac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umac.c,v 1.7 2013/07/22 05:00:17 djm Exp $ */
+/* $OpenBSD: umac.c,v 1.8 2013/11/08 00:39:15 djm Exp $ */
 /* -----------------------------------------------------------------------
  * 
  * umac.c -- C Implementation UMAC Message Authentication
@@ -1227,7 +1227,7 @@ struct umac_ctx *umac_new(const u_char key[])
     size_t bytes_to_add;
     aes_int_key prf_key;
     
-    octx = ctx = xmalloc(sizeof(*ctx) + ALLOC_BOUNDARY);
+    octx = ctx = xcalloc(1, sizeof(*ctx) + ALLOC_BOUNDARY);
     if (ctx) {
         if (ALLOC_BOUNDARY) {
             bytes_to_add = ALLOC_BOUNDARY -
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index 4064ed5f23d..d1816f745f5 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: version.h,v 1.67 2013/07/25 00:57:37 djm Exp $ */
+/* $OpenBSD: version.h,v 1.68 2013/11/08 01:38:11 djm Exp $ */
 /* $FreeBSD$ */
 
-#define SSH_VERSION	"OpenSSH_6.3"
+#define SSH_VERSION	"OpenSSH_6.4"
 
 #define SSH_PORTABLE	"p1"
 #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
 
-#define SSH_VERSION_FREEBSD	"FreeBSD-20130918"
+#define SSH_VERSION_FREEBSD	"FreeBSD-20131111"
 #define SSH_VERSION_HPN		"_hpn13v11"
diff --git a/etc/Makefile b/etc/Makefile
index ff8efc51291..bcccf829e16 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -139,6 +139,9 @@ BIN1+= regdomain.xml
 BIN2=	netstart pccard_ether rc.suspend rc.resume
 
 MTREE=	BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist
+.if ${MK_TESTS} != "no"
+MTREE+=	BSD.tests.dist
+.endif
 .if ${MK_SENDMAIL} != "no"
 MTREE+=	BSD.sendmail.dist
 .endif
@@ -215,16 +218,19 @@ distribution:
 		echo "./etc/spwd.db type=file mode=0600 uname=root gname=wheel"; \
 	) | ${METALOG.add}
 .endif
-.if ${MK_ATF} != "no"
-	${_+_}cd ${.CURDIR}/atf; ${MAKE} install
-.endif
 .if ${MK_BLUETOOTH} != "no"
 	${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
+.endif
+.if ${MK_CASPER} != "no"
+	${_+_}cd ${.CURDIR}/casper; ${MAKE} install
 .endif
 	${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
 	${_+_}cd ${.CURDIR}/devd; ${MAKE} install
 	${_+_}cd ${.CURDIR}/gss; ${MAKE} install
 	${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
+.if ${MK_PKGBOOTSTRAP} != "no"
+	${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
+.endif
 	${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
 	${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
 	${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
@@ -317,6 +323,9 @@ MTREES+=	mtree/BSD.debug.dist		/usr/lib
 .if ${MK_GROFF} != "no"
 MTREES+=	mtree/BSD.groff.dist		/usr
 .endif
+.if ${MK_TESTS} != "no"
+MTREES+=	mtree/BSD.tests.dist		/usr
+.endif
 .if ${MK_SENDMAIL} != "no"
 MTREES+=	mtree/BSD.sendmail.dist		/
 .endif
diff --git a/etc/atf/FreeBSD.conf b/etc/atf/FreeBSD.conf
deleted file mode 100644
index e90a6dc51be..00000000000
--- a/etc/atf/FreeBSD.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-Content-Type: application/X-atf-config; version="1"
-
-# $FreeBSD$
-#
-# Configuration file for the FreeBSD test suite.
-#
-# See atf-formats(5) for details on the syntax of this file and tests(7) for
-# details on the FreeBSD test suite.
-#
-
-#variable1 = value1
-#variable2 = value2
diff --git a/etc/atf/Makefile b/etc/atf/Makefile
deleted file mode 100644
index 5eaa8303bf9..00000000000
--- a/etc/atf/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#-
-# Copyright (c) 2011 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:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this 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$
-
-ATF=		${.CURDIR}/../../contrib/atf
-
-.PATH:		${ATF}/atf-run/sample
-
-NO_OBJ=
-
-FILESGROUPS=	ETC
-
-ETCDIR=		/etc/atf
-ETC=		FreeBSD.conf atf-run.hooks common.conf
-
-.include <bsd.prog.mk>
diff --git a/etc/atf/common.conf b/etc/atf/common.conf
deleted file mode 100644
index 392b57b0af6..00000000000
--- a/etc/atf/common.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-Content-Type: application/X-atf-config; version="1"
-
-# $FreeBSD$
-#
-# Sample configuration file for properties affecting all test suites.
-#
-
-# When running the test suite as root, some tests require to switch to
-# an unprivileged user to perform extra checks.  Set this variable to
-# the user you want to use in those cases.  If not set, those tests will
-# be skipped.
-unprivileged-user = "_atf"
diff --git a/etc/casper/Makefile b/etc/casper/Makefile
new file mode 100644
index 00000000000..d1cd9f4da4a
--- /dev/null
+++ b/etc/casper/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+FILES=	system.dns
+FILES+=	system.grp
+FILES+=	system.pwd
+FILES+=	system.random
+FILES+=	system.sysctl
+
+NO_OBJ=
+FILESDIR= /etc/casper
+
+.include <bsd.prog.mk>
diff --git a/etc/casper/system.dns b/etc/casper/system.dns
new file mode 100644
index 00000000000..b3c1ca06922
--- /dev/null
+++ b/etc/casper/system.dns
@@ -0,0 +1 @@
+/libexec/casper/dns
diff --git a/etc/casper/system.grp b/etc/casper/system.grp
new file mode 100644
index 00000000000..32eea2ca1d1
--- /dev/null
+++ b/etc/casper/system.grp
@@ -0,0 +1 @@
+/libexec/casper/grp
diff --git a/etc/casper/system.pwd b/etc/casper/system.pwd
new file mode 100644
index 00000000000..a5f7c2529a3
--- /dev/null
+++ b/etc/casper/system.pwd
@@ -0,0 +1 @@
+/libexec/casper/pwd
diff --git a/etc/casper/system.random b/etc/casper/system.random
new file mode 100644
index 00000000000..ac98b356b1c
--- /dev/null
+++ b/etc/casper/system.random
@@ -0,0 +1 @@
+/libexec/casper/random
diff --git a/etc/casper/system.sysctl b/etc/casper/system.sysctl
new file mode 100644
index 00000000000..9f80c5d8b53
--- /dev/null
+++ b/etc/casper/system.sysctl
@@ -0,0 +1 @@
+/libexec/casper/sysctl
diff --git a/etc/defaults/periodic.conf b/etc/defaults/periodic.conf
index 9fb68596b01..c8cb2fb1e72 100644
--- a/etc/defaults/periodic.conf
+++ b/etc/defaults/periodic.conf
@@ -137,10 +137,6 @@ daily_status_mail_rejects_enable="YES"			# Check mail rejects
 daily_status_mail_rejects_logs=3			# How many logs to check
 daily_status_mail_rejects_shorten="NO"			# Shorten output
 
-# 470.status-named
-daily_status_named_enable="YES"
-daily_status_named_usedns="YES"				# DNS lookups are ok
-
 # 480.status-ntpd
 daily_status_ntpd_enable="NO"				# Check NTP status
 
@@ -190,7 +186,7 @@ weekly_noid_dirs="/"					# Look here
 # 400.status-pkg
 weekly_status_pkg_enable="NO"				# Find out-of-date pkgs
 pkg_version=pkg_version					# Use this program
-pkg_version_index=/usr/ports/INDEX-10			# Use this index file
+pkg_version_index=/usr/ports/INDEX-11			# Use this index file
 
 # 450.status-security
 weekly_status_security_enable="YES"			# Security check
@@ -319,7 +315,7 @@ if [ -z "${source_periodic_confs_defined}" ]; then
 	security_daily_compat_var() {
 		local var=$1 dailyvar value
 
-		dailyvar=daily_status_security${#status_security}
+		dailyvar=daily_status_security${var#security_status}
 		periodvar=${var%enable}period
 		eval value=\"\$$dailyvar\"
 		[ -z "$value" ] && return
@@ -331,7 +327,7 @@ if [ -z "${source_periodic_confs_defined}" ]; then
 			$periodvar=daily
 			;;
 		*)
-			$var="$value"
+			eval $var=\"$value\"
 			;;
 		esac
 	}
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 80f279dbfcc..aa8a010549d 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -235,10 +235,6 @@ gif_interfaces=""		# List of GIF tunnels.
 				# Choose correct tunnel addrs.
 #gifconfig_gif0="10.1.1.1 10.1.2.1"	# Examples typically for a router.
 #gifconfig_gif1="10.1.1.2 10.1.2.2"	# Examples typically for a router.
-fec_interfaces=""		# List of Fast EtherChannels.
-#fec_interfaces="fec0 fec1"
-#fecconfig_fec0="fxp0 dc0"	# Examples typically for two NICs
-#fecconfig_fec1="em0 em1 bge0 bge1"	# Examples typically for four NICs
 
 # User ppp configuration.
 ppp_enable="NO"		# Start user-ppp (or NO).
@@ -260,6 +256,7 @@ hostapd_enable="NO"		# Run hostap daemon.
 syslogd_enable="YES"		# Run syslog daemon (or NO).
 syslogd_program="/usr/sbin/syslogd" # path to syslogd, if you want a different one.
 syslogd_flags="-s"		# Flags to syslogd (if enabled).
+altlog_proglist=""		# List of chrooted applicatioins in /var
 inetd_enable="NO"		# Run the network daemon dispatcher (YES/NO).
 inetd_program="/usr/sbin/inetd"	# path to inetd, if you want a different one.
 inetd_flags="-wW -C 60"		# Optional flags to inetd
@@ -271,23 +268,6 @@ hastd_program="/sbin/hastd"	# path to hastd, if you want a different one.
 hastd_flags=""			# Optional flags to hastd.
 ctld_enable="NO"		# CAM Target Layer / iSCSI target daemon.
 local_unbound_enable="NO"	# local caching resolver
-#
-# named.  It may be possible to run named in a sandbox, man security for
-# details.
-#
-named_enable="NO"		# Run named, the DNS server (or NO).
-named_program="/usr/sbin/named" # Path to named, if you want a different one.
-named_conf="/etc/namedb/named.conf" 	# Path to the configuration file
-#named_flags=""			# Use this for flags OTHER than -u and -c
-named_uid="bind" 		# User to run named as
-named_chrootdir="/var/named"	# Chroot directory (or "" not to auto-chroot it)
-named_chroot_autoupdate="YES"	# Automatically install/update chrooted
-				# components of named. See /etc/rc.d/named.
-named_symlink_enable="YES"	# Symlink the chrooted pid file
-named_wait="NO" 		# Wait for working name service before exiting
-named_wait_host="localhost" 	# Hostname to check if named_wait is enabled
-named_auto_forward="NO" 	# Set up forwarders from /etc/resolv.conf
-named_auto_forward_only="NO" 	# Do "forward only" instead of "forward first"
 
 #
 # kerberos. Do not run the admin daemons on slave servers
@@ -573,6 +553,8 @@ sendmail_enable="NO"	# Run the sendmail inbound daemon (YES/NO).
 sendmail_pidfile="/var/run/sendmail.pid"	# sendmail pid file
 sendmail_procname="/usr/sbin/sendmail"		# sendmail process name
 sendmail_flags="-L sm-mta -bd -q30m" # Flags to sendmail (as a server)
+sendmail_cert_create="YES"	# Create a server certificate if none (YES/NO)
+#sendmail_cert_cn="CN"   	# CN of the generate certificate
 sendmail_submit_enable="YES"	# Start a localhost-only MTA for mail submission
 sendmail_submit_flags="-L sm-mta -bd -q30m -ODaemonPortOptions=Addr=localhost"
 				# Flags for localhost-only MTA
@@ -619,6 +601,9 @@ quotacheck_flags="-a"	# Check all file system quotas (if enabled)
 accounting_enable="NO"	# Turn on process accounting (or NO).
 ibcs2_enable="NO"	# Ibcs2 (SCO) emulation loaded at startup (or NO).
 ibcs2_loaders="coff"	# List of additional Ibcs2 loaders (or NO).
+firstboot_sentinel="/firstboot"	# Scripts with "firstboot" keyword are run if
+			# this file exists.  Should be on a R/W filesystem so
+			# the file can be deleted after the boot completes.
 
 # Emulation/compatibility services provided by /etc/rc.d/abi
 sysvipc_enable="NO"	# Load System V IPC primitives at startup (or NO).
@@ -651,6 +636,7 @@ entropy_save_num="8"	# Number of entropy cache files to save.
 harvest_interrupt="YES"	# Entropy device harvests interrupt randomness
 harvest_ethernet="YES"	# Entropy device harvests ethernet randomness
 harvest_p_to_p="YES"	# Entropy device harvests point-to-point randomness
+harvest_swi="YES"	# Entropy device harvests internal SWI randomness
 dmesg_enable="YES"	# Save dmesg(8) to /var/run/dmesg.boot
 watchdogd_enable="NO"	# Start the software watchdog daemon
 watchdogd_flags=""	# Flags to watchdogd (if enabled)
@@ -674,44 +660,11 @@ mixer_enable="YES"	# Run the sound mixer.
 opensm_enable="NO"	# Opensm(8) for infiniband devices defaults to off
 
 ##############################################################
-### Jail Configuration #######################################
+### Jail Configuration (see rc.conf(5) manual page) ##########
 ##############################################################
 jail_enable="NO"	# Set to NO to disable starting of any jails
 jail_parallel_start="NO"	# Start jails in the background
 jail_list=""		# Space separated list of names of jails
-jail_set_hostname_allow="YES" # Allow root user in a jail to change its hostname
-jail_socket_unixiproute_only="YES" # Route only TCP/IP within a jail
-jail_sysvipc_allow="NO"	# Allow SystemV IPC use from within a jail
-
-#
-# To use rc's built-in jail infrastructure create entries for
-# each jail, specified in jail_list, with the following variables.
-# NOTES:
-# - replace 'example' with the jail's name.
-# - except rootdir, hostname, ip and the _multi<n> addresses,
-#   all of the following variables may be made global jail variables
-#   if you don't specify a jail name (ie. jail_interface, jail_devfs_ruleset).
-#
-#jail_example_rootdir="/usr/jail/default"	# Jail's root directory
-#jail_example_hostname="default.domain.com"	# Jail's hostname
-#jail_example_interface=""			# Jail's interface variable to create IP aliases on
-#jail_example_fib="0"				# Routing table for setfib(1)
-#jail_example_ip="192.0.2.10,2001:db8::17"	# Jail's primary IPv4 and IPv6 address
-#jail_example_ip_multi0="2001:db8::10"		#  and another IPv6 address
-#jail_example_exec_start="/bin/sh /etc/rc"		# command to execute in jail for starting
-#jail_example_exec_afterstart0="/bin/sh command"	# command to execute after the one for
-							# starting the jail. More than one can be
-							# specified using a trailing number
-#jail_example_exec_stop="/bin/sh /etc/rc.shutdown"	# command to execute in jail for stopping
-#jail_example_devfs_enable="NO"			# mount devfs in the jail
-#jail_example_devfs_ruleset="ruleset_name"	# devfs ruleset to apply to jail -
-						# usually you want "devfsrules_jail".
-#jail_example_fdescfs_enable="NO"		# mount fdescfs in the jail
-#jail_example_procfs_enable="NO"		# mount procfs in jail
-#jail_example_mount_enable="NO"			# mount/umount jail's fs
-#jail_example_fstab=""				# fstab(5) for mount/umount
-#jail_example_flags="-l -U root"		# flags for jail(8)
-#jail_example_parameters="allow.raw_sockets=1"	# extra parameters for this jail
 
 ##############################################################
 ### Define source_rc_confs, the mechanism used by /etc/rc.* ##
diff --git a/etc/devd/usb.conf b/etc/devd/usb.conf
index 449b20be2a4..1cfd51dacc9 100644
--- a/etc/devd/usb.conf
+++ b/etc/devd/usb.conf
@@ -1,7 +1,7 @@
 #
 # $FreeBSD$
 #
-# This file was automatically generated by "tools/bus_autoconf.sh".
+# This file was automatically generated by "tools/tools/bus_autoconf/bus_autoconf.sh".
 # Please do not edit!
 #
 
@@ -833,7 +833,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x050d";
-	match "product" "0x935a";
+	match "product" "(0x935a|0x935b)";
 	action "kldload -n if_run";
 };
 
@@ -1797,6 +1797,14 @@ nomatch 32 {
 	action "kldload -n if_axe";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0846";
+	match "product" "0x1100";
+	action "kldload -n uslcom";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -2185,7 +2193,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0af0";
-	match "product" "(0x7601|0xc031|0xd013|0xd031)";
+	match "product" "0x7601";
+	action "kldload -n uhso";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0af0";
+	match "product" "0x9000";
+	action "kldload -n u3g";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0af0";
+	match "product" "(0xc031|0xd013|0xd031)";
 	action "kldload -n uhso";
 };
 
@@ -2289,7 +2313,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b05";
-	match "product" "0x17b5";
+	match "product" "(0x17b5|0x17cb)";
 	action "kldload -n ng_ubt";
 };
 
@@ -2361,7 +2385,23 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0b95";
-	match "product" "(0x1720|0x1780|0x7720|0x772a|0x772b|0x7e2b)";
+	match "product" "(0x1720|0x1780)";
+	action "kldload -n if_axe";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0b95";
+	match "product" "(0x178a|0x1790)";
+	action "kldload -n if_axge";
+};
+
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0b95";
+	match "product" "(0x7720|0x772a|0x772b|0x7e2b)";
 	action "kldload -n if_axe";
 };
 
@@ -2433,7 +2473,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x0bda";
-	match "product" "(0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)";
+	match "product" "(0x8176|0x8176|0x8177|0x8178|0x817a|0x817b|0x817c|0x817d|0x817e)";
 	action "kldload -n if_urtwn";
 };
 
@@ -3101,6 +3141,14 @@ nomatch 32 {
 	action "kldload -n uftdi";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x0fde";
+	match "product" "0xca05";
+	action "kldload -n uslcom";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -3265,7 +3313,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x10c4";
-	match "product" "(0x8066|0x806f|0x807a|0x80c4|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x815f|0x818b|0x819f|0x81a6|0x81a9|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x83d8|0x8411|0x8418|0x846e|0x8477|0x85ea|0x85eb|0x8664|0x8665|0xea60|0xea61|0xea70|0xea71|0xea80|0xf001|0xf002|0xf003|0xf004)";
+	match "product" "(0x8066|0x806f|0x807a|0x80c4|0x80ca|0x80dd|0x80ed|0x80f6|0x8115|0x813d|0x813f|0x814a|0x814a|0x814b|0x8156|0x815e|0x815f|0x818b|0x819f|0x81a6|0x81a9|0x81ac|0x81ad|0x81c8|0x81e2|0x81e7|0x81e8|0x81f2|0x8218|0x822b|0x826b|0x8293|0x82f9|0x8341|0x8382|0x83a8|0x83d8|0x8411|0x8418|0x846e|0x8477|0x85ea|0x85eb|0x85f8|0x8664|0x8665|0x88a4|0x88a5|0xea60|0xea61|0xea70|0xea71|0xea80|0xf001|0xf002|0xf003|0xf004)";
 	action "kldload -n uslcom";
 };
 
@@ -3665,7 +3713,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|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|0x7042)";
 	action "kldload -n u3g";
 };
 
@@ -3777,7 +3825,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x148f";
-	match "product" "(0x2770|0x2870|0x3070|0x3071|0x3072|0x3370|0x3572|0x8070)";
+	match "product" "(0x2770|0x2870|0x3070|0x3071|0x3072|0x3370|0x3572|0x5370|0x5572|0x8070)";
 	action "kldload -n if_run";
 };
 
@@ -4373,6 +4421,14 @@ nomatch 32 {
 	action "kldload -n u3g";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x1adb";
+	match "product" "0x0001";
+	action "kldload -n uslcom";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -4509,6 +4565,14 @@ nomatch 32 {
 	action "kldload -n if_run";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x1fb9";
+	match "product" "(0x0100|0x0200|0x0201|0x0202|0x0203|0x0300|0x0301|0x0302|0x0303|0x0400|0x0401|0x0402|0x0403|0x0404|0x0600|0x0601|0x0602|0x0700|0x0701)";
+	action "kldload -n uslcom";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -4561,7 +4625,7 @@ nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
 	match "vendor" "0x2001";
-	match "product" "(0x3c09|0x3c0a)";
+	match "product" "(0x3c09|0x3c0a|0x3c15|0x3c1a|0x3c1b)";
 	action "kldload -n if_run";
 };
 
@@ -4765,6 +4829,14 @@ nomatch 32 {
 	action "kldload -n u3g";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "vendor" "0x2405";
+	match "product" "0x0003";
+	action "kldload -n uslcom";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -5117,6 +5189,15 @@ nomatch 32 {
 	action "kldload -n ng_ubt";
 };
 
+nomatch 32 {
+	match "bus" "uhub[0-9]+";
+	match "mode" "host";
+	match "intclass" "0x02";
+	match "intsubclass" "0x02";
+	match "intprotocol" "0x00";
+	action "kldload -n umodem";
+};
+
 nomatch 32 {
 	match "bus" "uhub[0-9]+";
 	match "mode" "host";
@@ -5260,5 +5341,5 @@ nomatch 32 {
 	action "kldload -n umass";
 };
 
-# 2537 USB entries processed
+# 2576 USB entries processed
 
diff --git a/etc/freebsd-update.conf b/etc/freebsd-update.conf
index 44109034b00..7f091705375 100644
--- a/etc/freebsd-update.conf
+++ b/etc/freebsd-update.conf
@@ -35,7 +35,7 @@ UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
 
 # When upgrading to a new FreeBSD release, files which match MergeChanges
 # will have any local changes merged into the version from the new release.
-MergeChanges /etc/ /var/named/etc/ /boot/device.hints
+MergeChanges /etc/ /boot/device.hints
 
 ### Default configuration options:
 
diff --git a/etc/ftpusers b/etc/ftpusers
index adb9dcf3bc9..e56e44ffdd7 100644
--- a/etc/ftpusers
+++ b/etc/ftpusers
@@ -13,7 +13,10 @@ games
 news
 man
 sshd
+smmsp
+mailnull
 bind
+unbound
 proxy
 _pflogd
 _dhcp
@@ -23,5 +26,3 @@ auditdistd
 www
 hast
 nobody
-mailnull
-smmsp
diff --git a/etc/gettytab b/etc/gettytab
index a5100a5ebcc..9ba2dcd2c43 100644
--- a/etc/gettytab
+++ b/etc/gettytab
@@ -214,6 +214,8 @@ al.115200:\
 	:al=root:tc=std.115200:
 al.230400:\
 	:al=root:tc=std.230400:
+al.Pc:\
+	:al=root:tc=Pc
 
 #
 # Entries for 3-wire serial terminals.  These don't supply carrier, so
diff --git a/etc/group b/etc/group
index 72b1ec4f941..5918ac1adb0 100644
--- a/etc/group
+++ b/etc/group
@@ -16,7 +16,6 @@ staff:*:20:
 sshd:*:22:
 smmsp:*:25:
 mailnull:*:26:
-_atf:*:27:
 guest:*:31:
 bind:*:53:
 unbound:*:59:
diff --git a/etc/login.conf b/etc/login.conf
index 67509f93ea0..ff98d1ce5be 100644
--- a/etc/login.conf
+++ b/etc/login.conf
@@ -42,6 +42,7 @@ default:\
 	:vmemoryuse=unlimited:\
 	:swapuse=unlimited:\
 	:pseudoterminals=unlimited:\
+	:kqueues=unlimited:\
 	:priority=0:\
 	:ignoretime@:\
 	:umask=022:
diff --git a/etc/master.passwd b/etc/master.passwd
index 758547113bd..af096dda423 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -13,7 +13,6 @@ man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
 sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
 smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
 mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
-_atf:*:27:27::0:0:& pseudo-user:/nonexistent:/usr/sbin/nologin
 bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
 unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
 proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 76cdf9488d4..806be951b2c 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -9,10 +9,6 @@
     ..
     arpa
     ..
-    atf-c
-    ..
-    atf-c++
-    ..
     bsm
     ..
     bsnmp
@@ -289,6 +285,10 @@
         sig
         ..
     ..
+    netpfil
+        pf
+        ..
+    ..
     netsmb
     ..
     nfs
@@ -329,6 +329,8 @@
     ..
     sys
     ..
+    teken
+    ..
     ufs
         ffs
         ..
diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist
index 352ac216803..5acd4b2adad 100644
--- a/etc/mtree/BSD.root.dist
+++ b/etc/mtree/BSD.root.dist
@@ -24,10 +24,10 @@
     etc
         X11
         ..
-        atf
-        ..
         bluetooth
         ..
+        casper
+        ..
         defaults
         ..
         devd
@@ -54,6 +54,8 @@
             weekly
             ..
         ..
+        pkg
+        ..
         ppp
         ..
         rc.d
@@ -74,6 +76,8 @@
         ..
     ..
     libexec
+        casper
+        ..
         resolvconf
         ..
     ..
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
new file mode 100644
index 00000000000..65f909023a9
--- /dev/null
+++ b/etc/mtree/BSD.tests.dist
@@ -0,0 +1,58 @@
+# $FreeBSD$
+#
+# Please see the file src/etc/mtree/README before making changes to this file.
+#
+
+/set type=dir uname=root gname=wheel mode=0755
+.
+    include
+        atf-c
+        ..
+        atf-c++
+        ..
+    ..
+    share
+        atf
+        ..
+        doc
+            atf
+            ..
+        ..
+    ..
+    tests
+        lib
+            atf
+                libatf-c
+                ..
+                libatf-c++
+                ..
+                test-programs
+                ..
+            ..
+            libcrypt
+            ..
+        ..
+        libexec
+            atf
+                atf-check
+                ..
+            ..
+        ..
+        share
+            examples
+                tests
+                    atf
+                    ..
+                    plain
+                    ..
+                ..
+            ..
+        ..
+        usr.bin
+            atf
+                atf-sh
+                ..
+            ..
+        ..
+    ..
+..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index c06d3e1af67..d70ca48ef0f 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -120,8 +120,6 @@
     sbin
     ..
     share
-        atf
-        ..
         bsdconfig
             media
             ..
@@ -165,16 +163,8 @@
         doc
             IPv6
             ..
-            atf
-            ..
             atm
             ..
-            bind9
-                arm
-                ..
-                misc
-                ..
-            ..
             legal
                 intel_ipw
                 ..
@@ -299,8 +289,6 @@
             ..
             IPv6
             ..
-            atf
-            ..
             bhyve
             ..
             bootforth
@@ -333,8 +321,6 @@
             ..
             ipfw
             ..
-            iscsi
-            ..
             jails
             ..
             kld
@@ -368,8 +354,6 @@
             mdoc
             ..
             netgraph
-                bluetooth
-                ..
             ..
             pc-sysinstall
             ..
@@ -490,6 +474,14 @@
         ..
         info
         ..
+        keys
+            pkg
+                revoked
+                ..
+                trusted
+                ..
+            ..
+        ..
         locale
             UTF-8
             ..
@@ -1410,14 +1402,6 @@
             catalog
             ..
         ..
-        xml
-            atf
-            ..
-        ..
-        xsl
-            atf
-            ..
-        ..
         zoneinfo
             Africa
             ..
@@ -1455,6 +1439,4 @@
     ..
     src             nochange
     ..
-    tests
-    ..
 ..
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index f4faeed7a0a..10a256c7d82 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -28,7 +28,7 @@
 /set gname=wheel
     backups
     ..
-    cache
+    cache		mode=0755
     ..
     crash
     ..
diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile
index 3228c6c242e..f24867b8ecf 100644
--- a/etc/mtree/Makefile
+++ b/etc/mtree/Makefile
@@ -6,6 +6,7 @@ FILES=	${_BSD.debug.dist} \
 	BSD.include.dist \
 	BSD.root.dist \
 	${_BSD.sendmail.dist} \
+	${_BSD.tests.dist} \
 	BSD.usr.dist \
 	BSD.var.dist
 
@@ -18,6 +19,9 @@ _BSD.groff.dist=	BSD.groff.dist
 .if ${MK_SENDMAIL} != "no"
 _BSD.sendmail.dist=	BSD.sendmail.dist
 .endif
+.if ${MK_TESTS} != "no"
+_BSD.tests.dist=	BSD.tests.dist
+.endif
 
 NO_OBJ=
 FILESDIR= /etc/mtree
diff --git a/etc/namedb/Makefile b/etc/namedb/Makefile
deleted file mode 100644
index 3a5e1f699a2..00000000000
--- a/etc/namedb/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-SUBDIR=	master
-
-FILES=	named.conf named.root
-
-NO_OBJ=
-FILESDIR=	/etc/namedb
-FILESMODE=	644
-
-.include <bsd.prog.mk>
diff --git a/etc/namedb/master/Makefile b/etc/namedb/master/Makefile
deleted file mode 100644
index 7907bf3bb5c..00000000000
--- a/etc/namedb/master/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-FILES=	empty.db localhost-forward.db localhost-reverse.db
-
-NO_OBJ=
-FILESDIR=	/etc/namedb/master
-FILESMODE=	644
-
-.include <bsd.prog.mk>
diff --git a/etc/namedb/master/empty.db b/etc/namedb/master/empty.db
deleted file mode 100644
index 070f6634825..00000000000
--- a/etc/namedb/master/empty.db
+++ /dev/null
@@ -1,11 +0,0 @@
-
-; $FreeBSD$
-
-$TTL 3h
-@ SOA @ nobody.localhost. 42 1d 12h 1w 3h
-	; Serial, Refresh, Retry, Expire, Neg. cache TTL
-
-@	NS	@
-
-; Silence a BIND warning
-@	A	127.0.0.1
diff --git a/etc/namedb/master/localhost-forward.db b/etc/namedb/master/localhost-forward.db
deleted file mode 100644
index 9156d2f0997..00000000000
--- a/etc/namedb/master/localhost-forward.db
+++ /dev/null
@@ -1,11 +0,0 @@
-
-; $FreeBSD$
-
-$TTL 3h
-localhost. SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
-	; Serial, Refresh, Retry, Expire, Neg. cache TTL
-
-	NS	localhost.
-
-	A	127.0.0.1
-	AAAA	::1
diff --git a/etc/namedb/master/localhost-reverse.db b/etc/namedb/master/localhost-reverse.db
deleted file mode 100644
index ceabe059ba7..00000000000
--- a/etc/namedb/master/localhost-reverse.db
+++ /dev/null
@@ -1,13 +0,0 @@
-
-; $FreeBSD$
-
-$TTL 3h
-@ SOA localhost. nobody.localhost. 42 1d 12h 1w 3h
-	; Serial, Refresh, Retry, Expire, Neg. cache TTL
-
-	NS	localhost.
-
-1.0.0	PTR	localhost.
-
-1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0 PTR localhost.
-
diff --git a/etc/namedb/named.conf b/etc/namedb/named.conf
deleted file mode 100644
index 5f011062c10..00000000000
--- a/etc/namedb/named.conf
+++ /dev/null
@@ -1,360 +0,0 @@
-// $FreeBSD$
-//
-// Refer to the named.conf(5) and named(8) man pages, and the documentation
-// in /usr/share/doc/bind9 for more details.
-//
-// If you are going to set up an authoritative server, make sure you
-// understand the hairy details of how DNS works.  Even with
-// simple mistakes, you can break connectivity for affected parties,
-// or cause huge amounts of useless Internet traffic.
-
-options {
-	// All file and path names are relative to the chroot directory,
-	// if any, and should be fully qualified.
-	directory	"/etc/namedb/working";
-	pid-file	"/var/run/named/pid";
-	dump-file	"/var/dump/named_dump.db";
-	statistics-file	"/var/stats/named.stats";
-
-// If named is being used only as a local resolver, this is a safe default.
-// For named to be accessible to the network, comment this option, specify
-// the proper IP address, or delete this option.
-	listen-on	{ 127.0.0.1; };
-
-// If you have IPv6 enabled on this system, uncomment this option for
-// use as a local resolver.  To give access to the network, specify
-// an IPv6 address, or the keyword "any".
-//	listen-on-v6	{ ::1; };
-
-// These zones are already covered by the empty zones listed below.
-// If you remove the related empty zones below, comment these lines out.
-	disable-empty-zone "255.255.255.255.IN-ADDR.ARPA";
-	disable-empty-zone "0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA";
-	disable-empty-zone "1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.IP6.ARPA";
-
-// If you've got a DNS server around at your upstream provider, enter
-// its IP address here, and enable the line below.  This will make you
-// benefit from its cache, thus reduce overall DNS traffic in the Internet.
-/*
-	forwarders {
-		127.0.0.1;
-	};
-*/
-
-// If the 'forwarders' clause is not empty the default is to 'forward first'
-// which will fall back to sending a query from your local server if the name
-// servers in 'forwarders' do not have the answer.  Alternatively you can
-// force your name server to never initiate queries of its own by enabling the
-// following line:
-//	forward only;
-
-// If you wish to have forwarding configured automatically based on
-// the entries in /etc/resolv.conf, uncomment the following line and
-// set named_auto_forward=yes in /etc/rc.conf.  You can also enable
-// named_auto_forward_only (the effect of which is described above).
-//	include "/etc/namedb/auto_forward.conf";
-
-	/*
-	   Modern versions of BIND use a random UDP port for each outgoing
-	   query by default in order to dramatically reduce the possibility
-	   of cache poisoning.  All users are strongly encouraged to utilize
-	   this feature, and to configure their firewalls to accommodate it.
-
-	   AS A LAST RESORT in order to get around a restrictive firewall
-	   policy you can try enabling the option below.  Use of this option
-	   will significantly reduce your ability to withstand cache poisoning
-	   attacks, and should be avoided if at all possible.
-
-	   Replace NNNNN in the example with a number between 49160 and 65530.
-	*/
-	// query-source address * port NNNNN;
-};
-
-// If you enable a local name server, don't forget to enter 127.0.0.1
-// first in your /etc/resolv.conf so this server will be queried.
-// Also, make sure to enable it in /etc/rc.conf.
-
-// The traditional root hints mechanism. Use this, OR the slave zones below.
-zone "." { type hint; file "/etc/namedb/named.root"; };
-
-/*	Slaving the following zones from the root name servers has some
-	significant advantages:
-	1. Faster local resolution for your users
-	2. No spurious traffic will be sent from your network to the roots
-	3. Greater resilience to any potential root server failure/DDoS
-
-	On the other hand, this method requires more monitoring than the
-	hints file to be sure that an unexpected failure mode has not
-	incapacitated your server.  Name servers that are serving a lot
-	of clients will benefit more from this approach than individual
-	hosts.  Use with caution.
-
-	To use this mechanism, uncomment the entries below, and comment
-	the hint zone above.
-
-	As documented at http://dns.icann.org/services/axfr/ these zones:
-	"." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET
-	are available for AXFR from these servers on IPv4 and IPv6:
-	xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org
-*/
-/*
-zone "." {
-	type slave;
-	file "/etc/namedb/slave/root.slave";
-	masters {
-		192.5.5.241;	// F.ROOT-SERVERS.NET.
-	};
-	notify no;
-};
-zone "arpa" {
-	type slave;
-	file "/etc/namedb/slave/arpa.slave";
-	masters {
-		192.5.5.241;	// F.ROOT-SERVERS.NET.
-	};
-	notify no;
-};
-*/
-
-/*	Serving the following zones locally will prevent any queries
-	for these zones leaving your network and going to the root
-	name servers.  This has two significant advantages:
-	1. Faster local resolution for your users
-	2. No spurious traffic will be sent from your network to the roots
-*/
-// RFCs 1912, 5735 and 6303 (and BCP 32 for localhost)
-zone "localhost"	{ type master; file "/etc/namedb/master/localhost-forward.db"; };
-zone "127.in-addr.arpa"	{ type master; file "/etc/namedb/master/localhost-reverse.db"; };
-zone "255.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-
-// RFC 1912-style zone for IPv6 localhost address (RFC 6303)
-zone "0.ip6.arpa"	{ type master; file "/etc/namedb/master/localhost-reverse.db"; };
-
-// "This" Network (RFCs 1912, 5735 and 6303)
-zone "0.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-
-// Private Use Networks (RFCs 1918, 5735 and 6303)
-zone "10.in-addr.arpa"	   { type master; file "/etc/namedb/master/empty.db"; };
-zone "16.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "17.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "18.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "19.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "20.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "21.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "22.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "23.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "24.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "25.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "26.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "27.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "28.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "29.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "30.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "31.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "168.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-
-// Shared Address Space (RFC 6598)
-zone "64.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "65.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "66.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "67.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "68.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "69.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "70.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "71.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "72.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "73.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "74.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "75.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "76.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "77.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "78.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "79.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "80.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "81.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "82.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "83.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "84.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "85.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "86.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "87.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "88.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "89.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "90.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "91.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "92.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "93.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "94.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "95.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "96.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "97.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "98.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "99.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "100.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "101.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "102.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "103.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "104.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "105.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "106.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "107.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "108.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "109.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "110.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "111.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "112.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "113.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "114.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "115.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "116.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "117.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "118.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "119.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "120.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "121.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "122.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "123.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "124.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "125.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "126.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "127.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-
-// Link-local/APIPA (RFCs 3927, 5735 and 6303)
-zone "254.169.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-
-// IETF protocol assignments (RFCs 5735 and 5736)
-zone "0.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-
-// TEST-NET-[1-3] for Documentation (RFCs 5735, 5737 and 6303)
-zone "2.0.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "100.51.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "113.0.203.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-
-// IPv6 Example Range for Documentation (RFCs 3849 and 6303)
-zone "8.b.d.0.1.0.0.2.ip6.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-
-// Domain Names for Documentation and Testing (BCP 32)
-zone "test" { type master; file "/etc/namedb/master/empty.db"; };
-zone "example" { type master; file "/etc/namedb/master/empty.db"; };
-zone "invalid" { type master; file "/etc/namedb/master/empty.db"; };
-zone "example.com" { type master; file "/etc/namedb/master/empty.db"; };
-zone "example.net" { type master; file "/etc/namedb/master/empty.db"; };
-zone "example.org" { type master; file "/etc/namedb/master/empty.db"; };
-
-// Router Benchmark Testing (RFCs 2544 and 5735)
-zone "18.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-zone "19.198.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
-
-// IANA Reserved - Old Class E Space (RFC 5735)
-zone "240.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "241.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "242.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "243.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "244.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "245.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "246.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "247.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "248.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "249.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "250.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "251.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "252.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "253.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "254.in-addr.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-
-// IPv6 Unassigned Addresses (RFC 4291)
-zone "1.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "3.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "4.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "5.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "6.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "7.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "8.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "9.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "a.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "b.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "c.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "d.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "e.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "0.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "1.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "2.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "3.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "4.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "5.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "6.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "7.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "8.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "9.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "a.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "b.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "0.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "1.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "2.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "3.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "4.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "5.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "6.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "7.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-
-// IPv6 ULA (RFCs 4193 and 6303)
-zone "c.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "d.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-
-// IPv6 Link Local (RFCs 4291 and 6303)
-zone "8.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "9.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "a.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "b.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-
-// IPv6 Deprecated Site-Local Addresses (RFCs 3879 and 6303)
-zone "c.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "d.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "e.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-zone "f.e.f.ip6.arpa"	{ type master; file "/etc/namedb/master/empty.db"; };
-
-// IP6.INT is Deprecated (RFC 4159)
-zone "ip6.int"		{ type master; file "/etc/namedb/master/empty.db"; };
-
-// NB: Do not use the IP addresses below, they are faked, and only
-// serve demonstration/documentation purposes!
-//
-// Example slave zone config entries.  It can be convenient to become
-// a slave at least for the zone your own domain is in.  Ask
-// your network administrator for the IP address of the responsible
-// master name server.
-//
-// Do not forget to include the reverse lookup zone!
-// This is named after the first bytes of the IP address, in reverse
-// order, with ".IN-ADDR.ARPA" appended, or ".IP6.ARPA" for IPv6.
-//
-// Before starting to set up a master zone, make sure you fully
-// understand how DNS and BIND work.  There are sometimes
-// non-obvious pitfalls.  Setting up a slave zone is usually simpler.
-//
-// NB: Don't blindly enable the examples below. :-)  Use actual names
-// and addresses instead.
-
-/* An example dynamic zone
-key "exampleorgkey" {
-	algorithm hmac-md5;
-	secret "sf87HJqjkqh8ac87a02lla==";
-};
-zone "example.org" {
-	type master;
-	allow-update {
-		key "exampleorgkey";
-	};
-	file "/etc/namedb/dynamic/example.org";
-};
-*/
-
-/* Example of a slave reverse zone
-zone "1.168.192.in-addr.arpa" {
-	type slave;
-	file "/etc/namedb/slave/1.168.192.in-addr.arpa";
-	masters {
-		192.168.1.1;
-	};
-};
-*/
diff --git a/etc/namedb/named.root b/etc/namedb/named.root
deleted file mode 100644
index adf5e792138..00000000000
--- a/etc/namedb/named.root
+++ /dev/null
@@ -1,92 +0,0 @@
-;
-; $FreeBSD$
-;
-
-;       This file holds the information on root name servers needed to
-;       initialize cache of Internet domain name servers
-;       (e.g. reference this file in the "cache  .  <file>"
-;       configuration file of BIND domain name servers).
-;
-;       This file is made available by InterNIC 
-;       under anonymous FTP as
-;           file                /domain/named.cache
-;           on server           FTP.INTERNIC.NET
-;       -OR-                    RS.INTERNIC.NET
-;
-;       last update:    Jan 3, 2013
-;       related version of root zone:   2013010300
-;
-; formerly NS.INTERNIC.NET
-;
-.                        3600000  IN  NS    A.ROOT-SERVERS.NET.
-A.ROOT-SERVERS.NET.      3600000      A     198.41.0.4
-A.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:BA3E::2:30
-;
-; FORMERLY NS1.ISI.EDU
-;
-.                        3600000      NS    B.ROOT-SERVERS.NET.
-B.ROOT-SERVERS.NET.      3600000      A     192.228.79.201
-;
-; FORMERLY C.PSI.NET
-;
-.                        3600000      NS    C.ROOT-SERVERS.NET.
-C.ROOT-SERVERS.NET.      3600000      A     192.33.4.12
-;
-; FORMERLY TERP.UMD.EDU
-;
-.                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
-D.ROOT-SERVERS.NET.	 3600000      AAAA  2001:500:2D::D
-;
-; FORMERLY NS.NASA.GOV
-;
-.                        3600000      NS    E.ROOT-SERVERS.NET.
-E.ROOT-SERVERS.NET.      3600000      A     192.203.230.10
-;
-; FORMERLY NS.ISC.ORG
-;
-.                        3600000      NS    F.ROOT-SERVERS.NET.
-F.ROOT-SERVERS.NET.      3600000      A     192.5.5.241
-F.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:2F::F
-;
-; FORMERLY NS.NIC.DDN.MIL
-;
-.                        3600000      NS    G.ROOT-SERVERS.NET.
-G.ROOT-SERVERS.NET.      3600000      A     192.112.36.4
-;
-; FORMERLY AOS.ARL.ARMY.MIL
-;
-.                        3600000      NS    H.ROOT-SERVERS.NET.
-H.ROOT-SERVERS.NET.      3600000      A     128.63.2.53
-H.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:1::803F:235
-;
-; FORMERLY NIC.NORDU.NET
-;
-.                        3600000      NS    I.ROOT-SERVERS.NET.
-I.ROOT-SERVERS.NET.      3600000      A     192.36.148.17
-I.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FE::53
-;
-; OPERATED BY VERISIGN, INC.
-;
-.                        3600000      NS    J.ROOT-SERVERS.NET.
-J.ROOT-SERVERS.NET.      3600000      A     192.58.128.30
-J.ROOT-SERVERS.NET.      3600000      AAAA  2001:503:C27::2:30
-;
-; OPERATED BY RIPE NCC
-;
-.                        3600000      NS    K.ROOT-SERVERS.NET.
-K.ROOT-SERVERS.NET.      3600000      A     193.0.14.129
-K.ROOT-SERVERS.NET.      3600000      AAAA  2001:7FD::1
-;
-; OPERATED BY ICANN
-;
-.                        3600000      NS    L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET.      3600000      A     199.7.83.42
-L.ROOT-SERVERS.NET.      3600000      AAAA  2001:500:3::42
-;
-; OPERATED BY WIDE
-;
-.                        3600000      NS    M.ROOT-SERVERS.NET.
-M.ROOT-SERVERS.NET.      3600000      A     202.12.27.33
-M.ROOT-SERVERS.NET.      3600000      AAAA  2001:DC3::35
-; End of File
diff --git a/etc/netstart b/etc/netstart
index 885932d11f7..44b8ab75bf5 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -59,6 +59,7 @@ _start=quietstart
 /etc/rc.d/route6d ${_start}
 /etc/rc.d/mrouted ${_start}
 /etc/rc.d/routed ${_start}
+/etc/rc.d/rtsold ${_start}
 /etc/rc.d/nisdomain ${_start}
 
 exit 0
diff --git a/etc/network.subr b/etc/network.subr
index 36e0140bff9..de9d997441d 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -82,6 +82,41 @@ ifn_stop()
 	return $cfg
 }
 
+# ifn_vnetup ifn
+#	Move ifn to the specified vnet jail.
+#
+ifn_vnetup()
+{
+
+	ifn_vnet0 $1 vnet
+}
+
+# ifn_vnetdown ifn
+#	Reclaim ifn from the specified vnet jail.
+#
+ifn_vnetdown()
+{
+
+	ifn_vnet0 $1 -vnet
+}
+
+# ifn_vnet0 ifn action
+#	Helper function for ifn_vnetup and ifn_vnetdown.
+#
+ifn_vnet0()
+{
+	local _ifn _cfg _action _vnet
+	_ifn="$1"
+	_action="$2"
+	_cfg=1
+
+	if _vnet=$(vnetif $_ifn); then
+		${IFCONFIG_CMD} $_ifn $_action $_vnet && _cfg=0
+	fi
+
+	return $_cfg
+}
+
 # ifconfig_up if
 #	Evaluate ifconfig(8) arguments for interface $if and
 #	run ifconfig(8) with those arguments. It returns 0 if
@@ -284,24 +319,27 @@ _ifconfig_getargs()
 #	args such as DHCP and WPA.
 ifconfig_getargs()
 {
-	local _tmpargs _arg _args
+	local _tmpargs _arg _args _vnet
 	_tmpargs=`_ifconfig_getargs $1 $2`
 	if [ $? -eq 1 ]; then
 		return 1
 	fi
 	_args=
+	_vnet=0
 
 	for _arg in $_tmpargs; do
-		case $_arg in
-		[Dd][Hh][Cc][Pp]) ;;
-		[Nn][Oo][Aa][Uu][Tt][Oo]) ;;
-		[Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
-		[Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;;
-		[Ww][Pp][Aa]) ;;
-		[Hh][Oo][Ss][Tt][Aa][Pp]) ;;
-		*)
+		case $_arg:$_vnet in
+		[Dd][Hh][Cc][Pp]:0) ;;
+		[Nn][Oo][Aa][Uu][Tt][Oo]:0) ;;
+		[Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]:0) ;;
+		[Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]:0) ;;
+		[Ww][Pp][Aa]:0) ;;
+		[Hh][Oo][Ss][Tt][Aa][Pp]:0) ;;
+		vnet:0)	_vnet=1 ;;
+		*:1)	_vnet=0 ;;
+		*:0)
 			_args="$_args $_arg"
-			;;
+		;;
 		esac
 	done
 
@@ -426,6 +464,25 @@ hostapif()
 	return 1
 }
 
+# vnetif if
+#	Returns 0 and echo jail if "vnet" keyword is specified on the
+#	interface, and 1 otherwise.
+vnetif()
+{
+	local _tmpargs _arg _vnet
+	_tmpargs=`_ifconfig_getargs $1`
+
+	_vnet=0
+	for _arg in $_tmpargs; do
+		case $_arg:$_vnet in
+		vnet:0)	_vnet=1 ;;
+		*:1)	echo $_arg; return 0 ;;
+		esac
+	done
+
+	return 1
+}
+
 # afexists af
 #	Returns 0 if the address family is enabled in the kernel
 #	1 otherwise.
@@ -1463,54 +1520,6 @@ ng_create_one()
 	done
 }
 
-# ng_fec_create ifn
-#	Configure Fast EtherChannel for interface $ifn. Returns 0 if
-#	FEC arguments were found and configured; returns !0 otherwise.
-ng_fec_create()
-{
-	 local req_iface iface bogus
-	 req_iface="$1"
-
-	 ngctl shutdown ${req_iface}: > /dev/null 2>&1
-
-	 bogus=""
-	 while true; do
-		 iface=`ng_create_one fec dummy fec`
-		 if [ -z "${iface}" ]; then
-			 exit 2
-		 fi
-		 if [ "${iface}" = "${req_iface}" ]; then
-			 break
-		 fi
-		 bogus="${bogus} ${iface}"
-	 done
-
-	 for iface in ${bogus}; do
-		 ngctl shutdown ${iface}:
-	 done
-}
-
-# fec_up
-#	Create Fast EtherChannel interfaces.
-fec_up()
-{
-	local i j
-
-	for i in ${fec_interfaces}; do
-		ng_fec_create $i
-		for j in `get_if_var $i fecconfig_IF`; do
-			case ${j} in
-			'')
-				continue
-				;;
-			*)
-				ngctl msg ${i}: add_iface "\"${j}\""
-				;;
-			esac
-		done
-	done
-}
-
 # ipx_up ifn
 #	Configure any IPX addresses for interface $ifn. Returns 0 if
 #	IPX arguments were found and configured; returns 1 otherwise.
diff --git a/etc/periodic/daily/220.backup-pkgdb b/etc/periodic/daily/220.backup-pkgdb
deleted file mode 100755
index 82bf0b3dce6..00000000000
--- a/etc/periodic/daily/220.backup-pkgdb
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-rc=0
-
-case "$daily_backup_pkgdb_enable" in
-    [Yy][Ee][Ss])
-	bak="${daily_backup_pkgdb_dir:-/var/backups}"
-	bak_file="${bak}/pkgdb.bak.tbz"
-
-	pkg_dbdir=`make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null` ||
-	  pkg_dbdir=/var/db/pkg
-
-	if [ ! -d "$bak" ]
-	then
-	    install -d -o root -g wheel -m 750 $bak || {
-		echo '$daily_backup_pkgdb_enable is enabled but' \
-		    "$daily_backup_pkgdb_dir doesn't exist" ;
-		exit 2 ; }
-	fi
-
-	echo ''
-	echo 'Backing up package db directory:'
-
-	new_bak_file=`mktemp ${bak_file}-XXXXX`
-
-	if tar -cjHf "${new_bak_file}" "$pkg_dbdir" 2>/dev/null; then
-	    chmod 644 "${new_bak_file}"
-
-	    if [ -e "${bak_file}.2" -a -e "${bak_file}" ]; then
-		unlink "${bak_file}.2"
-		mv "${bak_file}" "${bak_file}.2"
-	    fi
-	    [ -e "${bak_file}" ] && mv "${bak_file}" "${bak_file}.2"
-	    mv "${new_bak_file}" "${bak_file}"
-	else
-	    rc=3
-	fi ;;
-esac
-
-exit $rc
diff --git a/etc/periodic/daily/470.status-named b/etc/periodic/daily/470.status-named
deleted file mode 100755
index 987029e5c4f..00000000000
--- a/etc/periodic/daily/470.status-named
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-catmsgs() {
-	find /var/log -name 'messages.*' -mtime -2 |
-	    sort -t. -r -n -k 2,2 |
-	    while read f
-	    do
-		case $f in
-		    *.gz)	zcat -f $f;;
-		    *.bz2)	bzcat -f $f;;
-		esac
-	    done
-	[ -f /var/log/messages ] && cat /var/log/messages
-}
-
-case "$daily_status_named_enable" in
-    [Yy][Ee][Ss])
-	echo
-	echo 'Checking for denied zone transfers (AXFR and IXFR):'
-
-	start=`date -v-1d '+%b %e'`
-	rc=$(catmsgs |
-	    fgrep -E "^$start.*named\[[[:digit:]]+\]: transfer of .*failed .*: REFUSED" |
-	    sed -e "s/.*transfer of \'\(.*\)\/IN\' from \(.*\)#[0-9]*: .*/\1 from \2/" |
-	    sort -f | uniq -ic | (
-		usedns=0
-		case "$daily_status_named_usedns" in
-		'') ;;
-		[yY][eE][sS]) usedns=1 ;;
-		esac
-
-		while read line ;do
-			ipaddr=`echo "$line" | sed -e 's/^.*from //'`
-			if [ $usedns -eq 1 ]; then
-				name=`host "${ipaddr}" 2>/dev/null | \
-				   sed 's/.*domain name pointer \(.*\)\./\1/'`
-			fi
-			if [ -n "${name}" ]; then
-				echo "${line} (${name})"
-			else
-				echo "${line}"
-			fi
-		done ) | \
-		tee /dev/stderr | wc -l)
-	[ $rc -gt 0 ] && rc=1
-	;;
-
-    *)  rc=0;;
-esac
-
-exit $rc
diff --git a/etc/periodic/daily/490.status-pkg-changes b/etc/periodic/daily/490.status-pkg-changes
deleted file mode 100755
index 548e10add79..00000000000
--- a/etc/periodic/daily/490.status-pkg-changes
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]; then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-case "$daily_status_pkg_changes_enable" in
-    [Yy][Ee][Ss])
-	if [ ! -f /usr/sbin/pkg_info ]; then
-	    echo '$daily_status_pkg_changes_enable is enabled but' \
-		 "/usr/sbin/pkg_info doesn't exist"
-	    rc=2
-	else
-	    bak=/var/backups
-	    rc=0
-
-	    if [ -f $bak/pkg_info.bak ]; then
-	    	mv -f $bak/pkg_info.bak $bak/pkg_info.bak2
-	    fi
-	    ${pkg_info:-/usr/sbin/pkg_info} > $bak/pkg_info.bak
-
-	    cmp -sz $bak/pkg_info.bak $bak/pkg_info.bak2
-	    if [ $? -eq 1 ]; then
-		echo ""
-		echo "Changes in installed packages:"
-		diff -U 0 $bak/pkg_info.bak2 $bak/pkg_info.bak \
-		| grep '^[-+][^-+]' | sort -k 1.2
-	    fi
-	fi
-	;;
-
-    *)
-	rc=0
-	;;
-esac
-
-exit $rc
diff --git a/etc/periodic/daily/Makefile b/etc/periodic/daily/Makefile
index 6909e30d7de..aa28351ae2a 100644
--- a/etc/periodic/daily/Makefile
+++ b/etc/periodic/daily/Makefile
@@ -36,11 +36,6 @@ FILES+=	130.clean-msgs
 FILES+=	480.status-ntpd
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-FILES+=	220.backup-pkgdb \
-	490.status-pkg-changes
-.endif
-
 .if ${MK_RCMDS} != "no"
 FILES+=	140.clean-rwho \
 	430.status-rwho
diff --git a/etc/periodic/security/Makefile b/etc/periodic/security/Makefile
index fbcd45460d2..c5af2f85b01 100644
--- a/etc/periodic/security/Makefile
+++ b/etc/periodic/security/Makefile
@@ -29,8 +29,4 @@ FILES+=	500.ipfwdenied \
 FILES+=	520.pfdenied
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-FILES+=	460.chkportsum
-.endif
-
 .include <bsd.prog.mk>
diff --git a/etc/periodic/weekly/400.status-pkg b/etc/periodic/weekly/400.status-pkg
deleted file mode 100755
index 785c2fffd75..00000000000
--- a/etc/periodic/weekly/400.status-pkg
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh -
-#
-# $FreeBSD$
-#
-
-# If there is a global system configuration file, suck it in.
-#
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
-
-case "$weekly_status_pkg_enable" in
-    [Yy][Ee][Ss])
-	echo ""
-	echo "Check for out of date packages:"
-
-	rc=$(${pkg_version:-pkg_version} -v ${pkg_version_index} |
-	    sed -n -e 's/^\([^ ]*\)  *<  */  \1 /p' \
-		-e '/^[^ ]*-\([^ ]*\)  *\* *multiple versions.*[ ,]\1[,)].*/d' \
-		-e 's/^\([^ ]*\)  *\* *multiple versions.*\((.*\)/  \1 needs updating \2/p' \
-		-e 's/^\(bsdpan-[^ ]*\)  *? *unknown in index/  \1 may be outdated - check CPAN version manually/p' \
-		-e 's/^\([^ ]*-[^ ]*\)  *? *unknown in index/  \1 is obsolete/p' \
-		-e 's/^\([^ ]*-[^ ]*\)  *? *\(orphaned:.*\)$/  \1 was \2/p' |
-	    tee /dev/stderr |
-	    wc -l)
-	[ $rc -gt 1 ] && rc=1;;
-
-    *)  rc=0;;
-esac
-
-exit $rc
diff --git a/etc/periodic/weekly/Makefile b/etc/periodic/weekly/Makefile
index 057653d590f..b6f77c4f71d 100644
--- a/etc/periodic/weekly/Makefile
+++ b/etc/periodic/weekly/Makefile
@@ -16,8 +16,4 @@ FILES+=	310.locate
 FILES+=	320.whatis 330.catman
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-FILES+=	400.status-pkg
-.endif
-
 .include <bsd.prog.mk>
diff --git a/etc/pf.os b/etc/pf.os
index 699f19a6b61..78b70d6c1d7 100644
--- a/etc/pf.os
+++ b/etc/pf.os
@@ -315,6 +315,14 @@ S22:64:1:52:M*,N,N,S,N,W0:	Linux:2.2:ts:Linux 2.2 w/o timestamps
 16384:64:1:64:M*,N,N,S,N,W3,N,N,T:	OpenBSD:4.9::OpenBSD 4.9
 16384:64:0:64:M*,N,N,S,N,W3,N,N,T:	OpenBSD:4.9:no-df:OpenBSD 4.9 (scrub no-df)
 
+# ----------------- DragonFly BSD -----------------
+
+57344:64:1:60:M*,N,W0,N,N,T:		DragonFly:1.0:A:DragonFly 1.0A
+57344:64:0:64:M*,N,W0,N,N,S,N,N,T:	DragonFly:1.2-1.12::DragonFly 1.2-1.12
+5840:64:1:60:M*,S,T,N,W4:			DragonFly:2.0-2.1::DragonFly 2.0-2.1
+57344:64:0:64:M*,N,W0,N,N,S,N,N,T:	DragonFly:2.2-2.3::DragonFly 2.2-2.3
+57344:64:0:64:M*,N,W5,N,N,S,N,N,T:	DragonFly:2.4-2.7::DragonFly 2.4-2.7
+
 # ----------------- Solaris -----------------
 
 S17:64:1:64:N,W3,N,N,T0,N,N,S,M*:	Solaris:8:RFC1323:Solaris 8 RFC1323
diff --git a/etc/pkg/FreeBSD.conf b/etc/pkg/FreeBSD.conf
new file mode 100644
index 00000000000..7e56f3c130d
--- /dev/null
+++ b/etc/pkg/FreeBSD.conf
@@ -0,0 +1,8 @@
+# $FreeBSD$
+FreeBSD: {
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
+  mirror_type: "srv",
+  signature_type: "fingerprints",
+  fingerprints: "/usr/share/keys/pkg",
+  enabled: yes
+}
diff --git a/etc/pkg/Makefile b/etc/pkg/Makefile
new file mode 100644
index 00000000000..abc8c64ca5c
--- /dev/null
+++ b/etc/pkg/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILES=	FreeBSD.conf
+
+FILESDIR=	/etc/pkg
+FILESMODE=	644
+
+.include <bsd.prog.mk>
diff --git a/etc/rc b/etc/rc
index 59dece82205..21efc18c8a7 100644
--- a/etc/rc
+++ b/etc/rc
@@ -71,6 +71,11 @@ fi
 . /etc/rc.subr
 load_rc_config 'XXX'
 
+# If we receive a SIGALRM, re-source /etc/rc.conf; this allows rc.d
+# scripts to perform "boot-time configuration" including enabling and
+# disabling rc.d scripts which appear later in the boot order.
+trap "_rc_conf_loaded=false; load_rc_config 'XXX'" ALRM
+
 skip="-s nostart"
 if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then
 	skip="$skip -s nojail"
@@ -82,10 +87,15 @@ if [ `/sbin/sysctl -n security.jail.jailed` -eq 1 ]; then
 	fi
 fi
 
+# If the firstboot sentinel doesn't exist, we want to skip firstboot scripts.
+if ! [ -e ${firstboot_sentinel} ]; then
+	skip_firstboot="-s firstboot"
+fi
+
 # Do a first pass to get everything up to $early_late_divider so that
 # we can do a second pass that includes $local_startup directories
 #
-files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null`
+files=`rcorder ${skip} ${skip_firstboot} /etc/rc.d/* 2>/dev/null`
 
 _rc_elem_done=' '
 for _rc_elem in ${files}; do
@@ -107,7 +117,13 @@ case ${local_startup} in
 *)	find_local_scripts_new ;;
 esac
 
-files=`rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null`
+# The firstboot sentinel might be on a newly mounted filesystem; look for it
+# again and unset skip_firstboot if we find it.
+if [ -e ${firstboot_sentinel} ]; then
+	skip_firstboot=""
+fi
+
+files=`rcorder ${skip} ${skip_firstboot} /etc/rc.d/* ${local_rc} 2>/dev/null`
 for _rc_elem in ${files}; do
 	case "$_rc_elem_done" in
 	*" $_rc_elem "*)	continue ;;
@@ -116,6 +132,15 @@ for _rc_elem in ${files}; do
 	run_rc_script ${_rc_elem} ${_boot}
 done
 
+# Remove the firstboot sentinel, and reboot if it was requested.
+if [ -e ${firstboot_sentinel} ]; then
+	rm ${firstboot_sentinel}
+	if [ -e ${firstboot_sentinel}-reboot ]; then
+		rm ${firstboot_sentinel}-reboot
+		kill -INT 1
+	fi
+fi
+
 echo ''
 date
 exit 0
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index e51e2f8058a..375da6d131c 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -90,7 +90,6 @@ FILES=	DAEMON \
 	mroute6d \
 	mrouted \
 	msgs \
-	named \
 	natd \
 	netif \
 	netoptions \
diff --git a/etc/rc.d/ftp-proxy b/etc/rc.d/ftp-proxy
index 1bb89ddda9b..f97b76b06a6 100755
--- a/etc/rc.d/ftp-proxy
+++ b/etc/rc.d/ftp-proxy
@@ -14,4 +14,62 @@ rcvar="ftpproxy_enable"
 command="/usr/sbin/ftp-proxy"
 
 load_rc_config $name
-run_rc_command "$1"
+
+#
+# manage_pid argument
+#	Create or remove a pidfile manually, for daemons that can't be bothered
+#	to do it themselves. Takes one argument, which is the argument provided
+#	to the rc script. The pidfile will be named /var/run/<$name>.pid,
+#	unless $pidfile is defined.
+#
+#	The method used to determine the pid is rather hacky; grep ps output to
+#	find '$procname|$command', then grep for ${name}_flags. If at all
+#	possible, use another method if at all possible, to avoid that dirty-
+#	code feeling.
+#
+manage_pid() {
+	local search_string ps_pid
+	case $1 in
+		*start)
+			cmd_string=`basename ${procname:-${command}}`
+			eval flag_string=\"\$${name}_flags\"
+			# Determine the pid.
+			ps_pid=`ps ax -o pid= -o command= | grep $cmd_string | grep -e "$flag_string" | grep -v grep | awk '{ print $1 }'`
+			# Write the pidfile depending on $pidfile status.
+			echo $ps_pid > ${pidfile:-"/var/run/$name.pid"}
+	       		;;
+		stop)
+	       		rm $pidfile
+	       		;;
+	esac
+}
+
+# Allow ftp-proxy to start up in two different ways. The typical behavior
+# is to start up one instance of ftp-proxy by setting ftpproxy_enable and
+# ftpproxy_flags. The alternate behavior allows multiple instances of ftp-
+# proxy to be started, allowing different types of proxy behavior. To use the
+# new behavior, a list of instances must be defined, and a list of flags for
+# each instance. For example, if we want to start two instances of ftp-proxy,
+# foo and bar, we would set the following vars.
+#	ftpproxy_enable="YES"
+#	ftpproxy_instances="foo bar"
+#	ftpproxy_foo="<arguments for foo>"
+#	ftpproxy_bar="<arguments for bar>"
+#
+# Starting more than one ftp-proxy?
+if [ "$ftpproxy_instances" ] && [ -n "${ftpproxy_instances}" ]; then
+	# Iterate through instance list.
+	for i in $ftpproxy_instances; do
+		#eval ftpproxy_${i}_flags=\$ftpproxy_${i}
+		#eval name=ftpproxy_${i}
+		# Set flags for this instance.
+		eval ftpproxy_flags=\$ftpproxy_${i}
+		# Define a unique pid file name.
+		pidfile="/var/run/ftp-proxy.$i.pid"
+		run_rc_command "$1"
+		manage_pid $1
+	done
+else
+	# Traditional single-instance behavior
+	run_rc_command "$1"
+fi
diff --git a/etc/rc.d/initrandom b/etc/rc.d/initrandom
index 47838737806..907668b191c 100755
--- a/etc/rc.d/initrandom
+++ b/etc/rc.d/initrandom
@@ -14,26 +14,6 @@ name="initrandom"
 start_cmd="initrandom_start"
 stop_cmd=":"
 
-feed_dev_random()
-{
-	if [ -f "${1}" -a -r "${1}" -a -s "${1}" ]; then
-		cat "${1}" | dd of=/dev/random bs=8k 2>/dev/null
-	fi
-}
-
-better_than_nothing()
-{
-	# XXX temporary until we can improve the entropy
-	# harvesting rate.
-	# Entropy below is not great, but better than nothing.
-	# This unblocks the generator at startup
-	# Note: commands are ordered to cause the most variance across reboots.
-	( kenv; dmesg; df -ib; ps -fauxww; date; sysctl -a ) \
-	    | dd of=/dev/random bs=8k 2>/dev/null
-	/sbin/sha256 -q `sysctl -n kern.bootfile` \
-	    | dd of=/dev/random bs=8k 2>/dev/null
-}
-
 initrandom_start()
 {
 	soft_random_generator=`sysctl kern.random 2>/dev/null`
@@ -63,23 +43,15 @@ initrandom_start()
 			else
 				${SYSCTL} kern.random.sys.harvest.point_to_point=0 >/dev/null
 			fi
+
+			if checkyesno harvest_swi; then
+				${SYSCTL} kern.random.sys.harvest.swi=1 >/dev/null
+				echo -n ' swi'
+			else
+				${SYSCTL} kern.random.sys.harvest.swi=0 >/dev/null
+			fi
 		fi
 
-		# First pass at reseeding /dev/random.
-		#
-		case ${entropy_file} in
-		[Nn][Oo] | '')
-			;;
-		*)
-			if [ -w /dev/random ]; then
-				feed_dev_random "${entropy_file}"
-			fi
-			;;
-		esac
-
-		better_than_nothing
-
-		echo -n ' kickstart'
 	fi
 
 	echo '.'
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index f19983fab92..d8a88e438b7 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -8,81 +8,140 @@
 # BEFORE: securelevel
 # KEYWORD: nojail shutdown
 
-# WARNING: This script deals with untrusted data (the data and
-# processes inside the jails) and care must be taken when changing the
-# code related to this!  If you have any doubt whether a change is
-# correct and have security impact, please get the patch reviewed by
-# the FreeBSD Security Team prior to commit.
-
 . /etc/rc.subr
 
 name="jail"
 rcvar="jail_enable"
 
-start_precmd="jail_prestart"
 start_cmd="jail_start"
+start_postcmd="jail_warn"
 stop_cmd="jail_stop"
+config_cmd="jail_config"
+console_cmd="jail_console"
+status_cmd="jail_status"
+extra_commands="config console status"
+: ${jail_conf:=/etc/jail.conf}
+: ${jail_program:=/usr/sbin/jail}
+: ${jail_consolecmd:=/usr/bin/login -f root}
+: ${jail_jexec:=/usr/sbin/jexec}
+: ${jail_jls:=/usr/sbin/jls}
 
-# init_variables _j
-#	Initialize the various jail variables for jail _j.
-#
-init_variables()
+need_dad_wait=
+
+# extact_var jail name param num defval
+#	Extract value from ${jail_$jail_$name} or ${jail_$name} and
+#	set it to $param.  If not defined, $defval is used.
+#	When $num is [0-9]*, ${jail_$jail_$name$num} are looked up and
+#	$param is set by using +=.
+#	When $num is YN or NY, the value is interpret as boolean.
+extract_var()
 {
-	_j="$1"
+	local i _j _name _param _num _def _name1 _name2
+	_j=$1
+	_name=$2
+	_param=$3
+	_num=$4
+	_def=$5
 
+	case $_num in
+	YN)
+		_name1=jail_${_j}_${_name}
+		_name2=jail_${_name}
+		eval $_name1=\"\${$_name1:-\${$_name2:-$_def}}\"
+		if checkyesno $_name1; then
+			echo "	$_param = 1;"
+		else
+			echo "	$_param = 0;"
+		fi
+	;;
+	NY)
+		_name1=jail_${_j}_${_name}
+		_name2=jail_${_name}
+		eval $_name1=\"\${$_name1:-\${$_name2:-$_def}}\"
+		if checkyesno $_name1; then
+			echo "	$_param = 0;"
+		else
+			echo "	$_param = 1;"
+		fi
+	;;
+	[0-9]*)
+		i=$_num
+		while : ; do
+			_name1=jail_${_j}_${_name}${i}
+			_name2=jail_${_name}${i}
+			eval _tmpargs=\"\${$_name1:-\${$_name2:-$_def}}\"
+			if [ -n "$_tmpargs" ]; then 
+				echo "	$_param += \"$_tmpargs\";"
+			else
+				break;
+			fi
+			i=$(($i + 1))
+		done
+	;;
+	*)
+		_name1=jail_${_j}_${_name}
+		_name2=jail_${_name}
+		eval _tmpargs=\"\${$_name1:-\${$_name2:-$_def}}\"
+		if [ -n "$_tmpargs" ]; then
+			echo "	$_param = \"$_tmpargs\";"
+		fi
+	;;
+	esac
+}
+
+# parse_options _j
+#	Parse options and create a temporary configuration file if necessary.
+#
+parse_options()
+{
+	local _j _p
+	_j=$1
+
+	_confwarn=0
 	if [ -z "$_j" ]; then
-		warn "init_variables: you must specify a jail"
+		warn "parse_options: you must specify a jail"
 		return
 	fi
-
+	eval _jconf=\"\${jail_${_j}_conf:-/etc/jail.${_j}.conf}\"
 	eval _rootdir=\"\$jail_${_j}_rootdir\"
-	_devdir="${_rootdir}/dev"
-	_fdescdir="${_devdir}/fd"
-	_procdir="${_rootdir}/proc"
 	eval _hostname=\"\$jail_${_j}_hostname\"
+	if [ -z "$_rootdir" -o \
+	     -z "$_hostname" ]; then
+		if [ -r "$_jconf" ]; then
+			_conf="$_jconf"
+			return 0
+		elif [ -r "$jail_conf" ]; then
+			_conf="$jail_conf"
+			return 0
+		else
+			warn "Invalid configuration for $_j " \
+			    "(no jail.conf, no hostname, or no path).  " \
+			    "Jail $_j was ignored."
+		fi
+		return 1
+	fi
 	eval _ip=\"\$jail_${_j}_ip\"
-	eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\"
+	if [ -z "$_ip" ] && ! check_kern_features vimage; then
+		warn "no ipaddress specified and no vimage support.  " \
+		    "Jail $_j was ignored."
+		return 1
+	fi
+	_conf=/var/run/jail.${_j}.conf
+	#
+	# To relieve confusion, show a warning message.
+	#
+	_confwarn=1
+	if [ -r "$jail_conf" -o -r "$_jconf" ]; then
+		if ! checkyesno jail_parallel_start; then
+			warn "$_conf is created and used for jail $_j."
+		fi
+	fi
+	/usr/bin/install -m 0644 -o root -g wheel /dev/null $_conf || return 1
+
+	eval : \${jail_${_j}_flags:=${jail_flags}}
 	eval _exec=\"\$jail_${_j}_exec\"
-
-	i=0
-	while : ; do
-		eval _exec_prestart${i}=\"\${jail_${_j}_exec_prestart${i}:-\${jail_exec_prestart${i}}}\"
-		[ -z "$(eval echo \"\$_exec_prestart${i}\")" ] && break
-		i=$((i + 1))
-	done
-
-	eval _exec_start=\"\${jail_${_j}_exec_start:-${jail_exec_start}}\"
-
-	i=1
-	while : ; do
-		eval _exec_afterstart${i}=\"\${jail_${_j}_exec_afterstart${i}:-\${jail_exec_afterstart${i}}}\"
-		[ -z "$(eval echo \"\$_exec_afterstart${i}\")" ] &&  break
-		i=$((i + 1))
-	done
-
-	i=0
-	while : ; do
-		eval _exec_poststart${i}=\"\${jail_${_j}_exec_poststart${i}:-\${jail_exec_poststart${i}}}\"
-		[ -z "$(eval echo \"\$_exec_poststart${i}\")" ] && break
-		i=$((i + 1))
-	done
-
-	i=0
-	while : ; do
-		eval _exec_prestop${i}=\"\${jail_${_j}_exec_prestop${i}:-\${jail_exec_prestop${i}}}\"
-		[ -z "$(eval echo \"\$_exec_prestop${i}\")" ] && break
-		i=$((i + 1))
-	done
-
-	eval _exec_stop=\"\${jail_${_j}_exec_stop:-${jail_exec_stop}}\"
-
-	i=0
-	while : ; do
-		eval _exec_poststop${i}=\"\${jail_${_j}_exec_poststop${i}:-\${jail_exec_poststop${i}}}\"
-		[ -z "$(eval echo \"\$_exec_poststop${i}\")" ] && break
-		i=$((i + 1))
-	done
-
+	eval _exec_start=\"\$jail_${_j}_exec_start\"
+	eval _exec_stop=\"\$jail_${_j}_exec_stop\"
 	if [ -n "${_exec}" ]; then
 		#   simple/backward-compatible execution
 		_exec_start="${_exec}"
@@ -96,285 +155,105 @@ init_variables()
 			fi
 		fi
 	fi
-
-	# The default jail ruleset will be used by rc.subr if none is specified.
-	eval _ruleset=\"\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}\"
-	eval _devfs=\"\${jail_${_j}_devfs_enable:-${jail_devfs_enable}}\"
-	[ -z "${_devfs}" ] && _devfs="NO"
-	eval _fdescfs=\"\${jail_${_j}_fdescfs_enable:-${jail_fdescfs_enable}}\"
-	[ -z "${_fdescfs}" ] && _fdescfs="NO"
-	eval _procfs=\"\${jail_${_j}_procfs_enable:-${jail_procfs_enable}}\"
-	[ -z "${_procfs}" ] && _procfs="NO"
-
-	eval _mount=\"\${jail_${_j}_mount_enable:-${jail_mount_enable}}\"
-	[ -z "${_mount}" ] && _mount="NO"
-	# "/etc/fstab.${_j}" will be used for {,u}mount(8) if none is specified.
-	eval _fstab=\"\${jail_${_j}_fstab:-${jail_fstab}}\"
-	[ -z "${_fstab}" ] && _fstab="/etc/fstab.${_j}"
-	eval _flags=\"\${jail_${_j}_flags:-${jail_flags}}\"
-	[ -z "${_flags}" ] && _flags="-l -U root"
-	eval _consolelog=\"\${jail_${_j}_consolelog:-${jail_consolelog}}\"
-	[ -z "${_consolelog}" ] && _consolelog="/var/log/jail_${_j}_console.log"
+	eval _interface=\"\${jail_${_j}_interface:-${jail_interface}}\"
 	eval _parameters=\"\${jail_${_j}_parameters:-${jail_parameters}}\"
-	[ -z "${_parameters}" ] && _parameters=""
-	eval _fib=\"\${jail_${_j}_fib:-${jail_fib}}\"
+	eval _fstab=\"\${jail_${_j}_fstab:-${jail_fstab:-/etc/fstab.$_j}}\"
+	(
+		date +"# Generated by rc.d/jail at %Y-%m-%d %H:%M:%S"
+		echo "$_j {"
+		extract_var $_j hostname host.hostname - ""
+		extract_var $_j rootdir path - ""
+		if [ -n "$_ip" ]; then
+			extract_var $_j interface interface - ""
+			jail_handle_ips_option $_ip $_interface
+			alias=0
+			while : ; do
+				eval _x=\"\$jail_${_j}_ip_multi${alias}\"
+				[ -z "$_x" ] && break
 
-	# Debugging aid
-	#
-	debug "$_j devfs enable: $_devfs"
-	debug "$_j fdescfs enable: $_fdescfs"
-	debug "$_j procfs enable: $_procfs"
-	debug "$_j mount enable: $_mount"
-	debug "$_j hostname: $_hostname"
-	debug "$_j ip: $_ip"
-	jail_show_addresses ${_j}
-	debug "$_j interface: $_interface"
-	debug "$_j fib: $_fib"
-	debug "$_j root: $_rootdir"
-	debug "$_j devdir: $_devdir"
-	debug "$_j fdescdir: $_fdescdir"
-	debug "$_j procdir: $_procdir"
-	debug "$_j ruleset: $_ruleset"
-	debug "$_j fstab: $_fstab"
-
-	i=0
-	while : ; do
-		eval out=\"\${_exec_prestart${i}:-''}\"
-		if [ -z "$out" ]; then
-			break
-		fi
-		debug "$_j exec pre-start #${i}: ${out}"
-		i=$((i + 1))
-	done
-
-	debug "$_j exec start: $_exec_start"
-
-	i=1
-	while : ; do
-		eval out=\"\${_exec_afterstart${i}:-''}\"
-
-		if [ -z "$out" ]; then
-			break;
-		fi
-
-		debug "$_j exec after start #${i}: ${out}"
-		i=$((i + 1))
-	done
-
-	i=0
-	while : ; do
-		eval out=\"\${_exec_poststart${i}:-''}\"
-		if [ -z "$out" ]; then
-			break
-		fi
-		debug "$_j exec post-start #${i}: ${out}"
-		i=$((i + 1))
-	done
-
-	i=0
-	while : ; do
-		eval out=\"\${_exec_prestop${i}:-''}\"
-		if [ -z "$out" ]; then
-			break
-		fi
-		debug "$_j exec pre-stop #${i}: ${out}"
-		i=$((i + 1))
-	done
-
-	debug "$_j exec stop: $_exec_stop"
-
-	i=0
-	while : ; do
-		eval out=\"\${_exec_poststop${i}:-''}\"
-		if [ -z "$out" ]; then
-			break
-		fi
-		debug "$_j exec post-stop #${i}: ${out}"
-		i=$((i + 1))
-	done
-
-	debug "$_j flags: $_flags"
-	debug "$_j consolelog: $_consolelog"
-	debug "$_j parameters: $_parameters"
-
-	if [ -z "${_hostname}" ]; then
-		err 3 "$name: No hostname has been defined for ${_j}"
-	fi
-	if [ -z "${_rootdir}" ]; then
-		err 3 "$name: No root directory has been defined for ${_j}"
-	fi
-}
-
-# set_sysctl rc_knob mib msg
-#	If the mib sysctl is set according to what rc_knob
-#	specifies, this function does nothing. However if
-#	rc_knob is set differently than mib, then the mib
-#	is set accordingly and msg is displayed followed by
-#	an '=" sign and the word 'YES' or 'NO'.
-#
-set_sysctl()
-{
-	_knob="$1"
-	_mib="$2"
-	_msg="$3"
-
-	_current=`${SYSCTL} -n $_mib 2>/dev/null`
-	if checkyesno $_knob ; then
-		if [ "$_current" -ne 1 ]; then
-			echo -n " ${_msg}=YES"
-			${SYSCTL} 1>/dev/null ${_mib}=1
-		fi
-	else
-		if [ "$_current" -ne 0 ]; then
-			echo -n " ${_msg}=NO"
-			${SYSCTL} 1>/dev/null ${_mib}=0
-		fi
-	fi
-}
-
-# is_current_mountpoint()
-#	Is the directory mount point for a currently mounted file
-#	system?
-#
-is_current_mountpoint()
-{
-	local _dir _dir2
-
-	_dir=$1
-
-	_dir=`echo $_dir | sed -Ee 's#//+#/#g' -e 's#/$##'`
-	[ ! -d "${_dir}" ] && return 1
-	_dir2=`df ${_dir} | tail +2 | awk '{ print $6 }'`
-	[ "${_dir}" = "${_dir2}" ]
-	return $?
-}
-
-# is_symlinked_mountpoint()
-#	Is a mount point, or any of its parent directories, a symlink?
-#
-is_symlinked_mountpoint()
-{
-	local _dir
-
-	_dir=$1
-
-	[ -L "$_dir" ] && return 0
-	[ "$_dir" = "/" ] && return 1
-	is_symlinked_mountpoint `dirname $_dir`
-	return $?
-}
-
-# secure_umount
-#	Try to unmount a mount point without being vulnerable to
-#	symlink attacks.
-#
-secure_umount()
-{
-	local _dir
-
-	_dir=$1
-
-	if is_current_mountpoint ${_dir}; then
-		umount -f ${_dir} >/dev/null 2>&1
-	else
-		debug "Nothing mounted on ${_dir} - not unmounting"
-	fi
-}
-
-
-# jail_umount_fs
-#	This function unmounts certain special filesystems in the
-#	currently selected jail. The caller must call the init_variables()
-#	routine before calling this one.
-#
-jail_umount_fs()
-{
-	local _device _mountpt _rest
-
-	if checkyesno _fdescfs; then
-		if [ -d "${_fdescdir}" ] ; then
-			secure_umount ${_fdescdir}
-		fi
-	fi
-	if checkyesno _devfs; then
-		if [ -d "${_devdir}" ] ; then
-			secure_umount ${_devdir}
-		fi
-	fi
-	if checkyesno _procfs; then
-		if [ -d "${_procdir}" ] ; then
-			secure_umount ${_procdir}
-		fi
-	fi
-	if checkyesno _mount; then
-		[ -f "${_fstab}" ] || warn "${_fstab} does not exist"
-		tail -r ${_fstab} | while read _device _mountpt _rest; do
-			case ":${_device}" in
-			:#* | :)
-				continue
-				;;
-			esac
-			secure_umount ${_mountpt}
-		done
-	fi
-}
-
-# jail_mount_fstab()
-#	Mount file systems from a per jail fstab while trying to
-#	secure against symlink attacks at the mount points.
-#
-#	If we are certain we cannot secure against symlink attacks we
-#	do not mount all of the file systems (since we cannot just not
-#	mount the file system with the problematic mount point).
-#
-#	The caller must call the init_variables() routine before
-#	calling this one.
-#
-jail_mount_fstab()
-{
-	local _device _mountpt _rest
-
-	while read _device _mountpt _rest; do
-		case ":${_device}" in
-		:#* | :)
-			continue
+				jail_handle_ips_option $_x $_interface
+				alias=$(($alias + 1))
+			done
+			case $need_dad_wait in
+			1)
+				# Sleep to let DAD complete before
+				# starting services.
+				echo "	exec.start += \"sleep " \
+				$(($(${SYSCTL_N} net.inet6.ip6.dad_count) + 1)) \
+				"\";"
 			;;
-		esac
-		if is_symlinked_mountpoint ${_mountpt}; then
-			warn "${_mountpt} has symlink as parent - not mounting from ${_fstab}"
-			return
-		fi
-	done <${_fstab}
-	mount -a -F "${_fstab}"
-}
-
-# jail_show_addresses jail
-#	Debug print the input for the given _multi aliases
-#	for a jail for init_variables().
-#
-jail_show_addresses()
-{
-	local _j _type alias
-	_j="$1"
-	alias=0
-
-	if [ -z "${_j}" ]; then
-		warn "jail_show_addresses: you must specify a jail"
-		return
-	fi
-
-	while : ; do
-		eval _addr=\"\$jail_${_j}_ip_multi${alias}\"
-		if [ -n "${_addr}" ]; then
-			debug "${_j} ip_multi${alias}: $_addr"
-			alias=$((${alias} + 1))
+			esac
+			# These are applicable only to non-vimage jails. 
+			extract_var $_j fib exec.fib - ""
+			extract_var $_j socket_unixiproute_only \
+			    allow.raw_sockets NY YES
 		else
-			break
+			echo "	vnet;"
+			extract_var $_j vnet_interface vnet.interface - ""
 		fi
-	done
+
+		echo "	exec.clean;"
+		echo "	exec.system_user = \"root\";"
+		echo "	exec.jail_user = \"root\";"
+		extract_var $_j exec_prestart exec.prestart 0 ""
+		extract_var $_j exec_poststart exec.poststart 0 ""
+		extract_var $_j exec_prestop exec.prestop 0 ""
+		extract_var $_j exec_poststop exec.poststop 0 ""
+
+		echo "	exec.start += \"$_exec_start\";"
+		extract_var $_j exec_afterstart exec.start 1 ""
+		echo "	exec.stop = \"$_exec_stop\";"
+
+		extract_var $_j consolelog exec.consolelog - \
+		    /var/log/jail_${_j}_console.log
+
+		eval : \${jail_${_j}_devfs_enable:=${jail_devfs_enable:-NO}}
+		if checkyesno jail_${_j}_devfs_enable; then
+			echo "	mount.devfs;"
+			eval _ruleset=\${jail_${_j}_devfs_ruleset:-${jail_devfs_ruleset}}
+			case $_ruleset in
+			"")	;;
+			[0-9]*) echo "	devfs_ruleset = \"$_ruleset\";" ;;
+			devfsrules_jail)
+				# XXX: This is the default value,
+				# Let jail(8) to use the default because
+				# mount(8) only accepts an integer. 
+				# This should accept a ruleset name.
+			;;
+			*)	warn "devfs_ruleset must be an integer." ;;
+			esac
+			if [ -r $_fstab ]; then
+				echo "	mount.fstab = \"$_fstab\";"
+			fi
+		fi
+
+		eval : \${jail_${_j}_fdescfs_enable:=${jail_fdescfs_enable:-NO}}
+		if checkyesno jail_${_j}_fdescfs_enable; then
+			echo "	mount.fdescfs;"
+		fi
+		eval : \${jail_${_j}_procfs_enable:=${jail_procfs_enable:-NO}}
+		if checkyesno jail_${_j}_procfs_enable; then
+			echo "	mount += " \
+			    "\"procfs ${_rootdir%/}/proc procfs rw 0 0\";"
+		fi
+
+		eval : \${jail_${_j}_mount_enable:=${jail_mount_enable:-NO}}
+		if checkyesno jail_${_j}_mount_enable; then
+			echo "	allow.mount;" >> $_conf
+		fi
+
+		extract_var $_j set_hostname_allow allow.set_hostname YN NO
+		extract_var $_j sysvipc_allow allow.sysvipc YN NO
+		for _p in $_parameters; do
+			echo "	${_p%\;};"
+		done
+		echo "}"
+	) >> $_conf
+
+	return 0
 }
 
-# jail_extract_address argument
+# jail_extract_address argument iface
 #	The second argument is the string from one of the _ip
 #	or the _multi variables. In case of a comma separated list
 #	only one argument must be passed in at a time.
@@ -382,8 +261,9 @@ jail_show_addresses()
 #
 jail_extract_address()
 {
-	local _i
+	local _i _interface
 	_i=$1
+	_interface=$2
 
 	if [ -z "${_i}" ]; then
 		warn "jail_extract_address: called without input"
@@ -444,16 +324,16 @@ jail_extract_address()
 	fi
 }
 
-# jail_handle_ips_option {add,del} input
+# jail_handle_ips_option input iface
 #	Handle a single argument imput which can be a comma separated
 #	list of addresses (theoretically with an option interface and
 #	prefix/netmask/prefixlen).
 #
 jail_handle_ips_option()
 {
-	local _x _action _type _i
-	_action=$1
-	_x=$2
+	local _x _type _i _defif
+	_x=$1
+	_defif=$2
 
 	if [ -z "${_x}" ]; then
 		# No IP given. This can happen for the primary address
@@ -468,294 +348,228 @@ jail_handle_ips_option()
 		*,*)	# Extract the first argument and strip it off the list.
 			_i=`expr "${_x}" : '^\([^,]*\)'`
 			_x=`expr "${_x}" : "^[^,]*,\(.*\)"`
-			;;
+		;;
 		*)	_i=${_x}
 			_x=""
-			;;
+		;;
 		esac
 
 		_type=""
-		_iface=""
 		_addr=""
 		_mask=""
-		jail_extract_address "${_i}"
+		_iface=""
+		jail_extract_address $_i $_defif
 
 		# make sure we got an address.
-		case "${_addr}" in
+		case $_addr in
 		"")	continue ;;
 		*)	;;
 		esac
 
 		# Append address to list of addresses for the jail command.
-		case "${_type}" in
+		case $_type in
 		inet)
-			case "${_addrl}" in
-			"")	_addrl="${_addr}" ;;
-			*)	_addrl="${_addrl},${_addr}" ;;
-			esac
-			;;
+			echo "	ip4.addr += \"${_iface:+${_iface}|}${_addr}${_mask}\";"
+		;;
 		inet6)
-			case "${_addr6l}" in
-			"")	_addr6l="${_addr}" ;;
-			*)	_addr6l="${_addr6l},${_addr}" ;;
-			esac
-			;;
-		esac
-
-		# Configure interface alias if requested by a given interface
-		# and if we could correctly parse everything.
-		case "${_iface}" in
-		"")	continue ;;
-		esac
-		case "${_type}" in
-		inet)	;;
-		inet6)	ipv6_address_count=$((ipv6_address_count + 1)) ;;
-		*)	warn "Could not determine address family.  Not going" \
-			    "to ${_action} address '${_addr}' for ${_jail}."
-			continue
-			;;
-		esac
-		case "${_action}" in
-		add)	ifconfig ${_iface} ${_type} ${_addr}${_mask} alias
-			;;
-		del)	# When removing the IP, ignore the _mask.
-			ifconfig ${_iface} ${_type} ${_addr} -alias
-			;;
+			echo "	ip6.addr += \"${_iface:+${_iface}|}${_addr}${_mask}\";"
+			need_dad_wait=1
+		;;
 		esac
 	done
 }
 
-# jail_ips {add,del}
-#	Extract the comma separated list of addresses and return them
-#	for the jail command.
-#	Handle more than one address via the _multi option as well.
-#	If an interface is given also add/remove an alias for the
-#	address with an optional netmask.
-#
-jail_ips()
+jail_config()
 {
-	local _action
-	_action=$1
+	local _j
 
-	case "${_action}" in
-	add)	;;
-	del)	;;
-	*)	warn "jail_ips: invalid action '${_action}'"
-		return
-		;;
+	case $1 in
+	_ALL)	return ;;
 	esac
-
-	# Handle addresses.
-	ipv6_address_count=0
-	jail_handle_ips_option ${_action} "${_ip}"
-	# Handle jail_xxx_ip_multi<N>
-	alias=0
-	while : ; do
-		eval _x=\"\$jail_${_jail}_ip_multi${alias}\"
-		case "${_x}" in
-		"")	break ;;
-		*)	jail_handle_ips_option ${_action} "${_x}"
-			alias=$((${alias} + 1))
-			;;
-		esac
+	for _j in $@; do
+		_j=$(echo $_j | tr /. _)
+		if parse_options $_j; then 
+			echo "$_j: parameters are in $_conf."
+		fi
 	done
-	case ${ipv6_address_count} in
-	0)	;;
-	*)	# Sleep 1 second to let DAD complete before starting services.
-		sleep 1
-		;;
-	esac
 }
 
-jail_prestart()
+jail_console()
 {
-	if checkyesno jail_parallel_start; then
-		command_args='&'
-	fi
+	local _j _cmd
+
+	# One argument that is not _ALL.
+	case $#:$1 in
+	0:*|1:_ALL)	err 3 "Specify a jail name." ;;
+	1:*)		;;
+	esac
+	_j=$(echo $1 | tr /. _)
+	shift
+	case $# in
+	0)	eval _cmd=\${jail_${_j}_consolecmd:-$jail_consolecmd} ;;
+	*)	_cmd=$@ ;;
+	esac
+	$jail_jexec $_j $_cmd
+}
+
+jail_status()
+{
+
+	$jail_jls -N
 }
 
 jail_start()
 {
-	echo -n 'Configuring jails:'
-	set_sysctl jail_set_hostname_allow security.jail.set_hostname_allowed \
-	    set_hostname_allow
-	set_sysctl jail_socket_unixiproute_only \
-	    security.jail.socket_unixiproute_only unixiproute_only
-	set_sysctl jail_sysvipc_allow security.jail.sysvipc_allowed \
-	    sysvipc_allow
-	echo '.'
+	local _j _jid _jn _jl
 
+	if [ $# = 0 ]; then
+		return
+	fi
 	echo -n 'Starting jails:'
-	_tmp_dir=`mktemp -d /tmp/jail.XXXXXXXX` || \
-	    err 3 "$name: Can't create temp dir, exiting..."
-	for _jail in ${jail_list}
-	do
-		init_variables $_jail
-		if [ -f /var/run/jail_${_jail}.id ]; then
-			echo -n " [${_hostname} already running (/var/run/jail_${_jail}.id exists)]"
-			continue;
-		fi
-		_addrl=""
-		_addr6l=""
-		jail_ips "add"
-		if [ -n "${_fib}" ]; then
-			_setfib="setfib -F '${_fib}'"
+	case $1 in
+	_ALL)
+		command=$jail_program
+		rc_flags=$jail_flags
+		command_args="-f $jail_conf -c"
+		_tmp=`mktemp -t jail` || exit 3
+		if $command $rc_flags $command_args >> $_tmp 2>&1; then
+			$jail_jls -nq | while read IN; do
+				_jn=$(echo $IN | tr " " "\n" | grep ^name=)
+				_jid=$(echo $IN | tr " " "\n" | grep ^jid=)
+				echo -n " ${_jn#name=}"
+				echo "${_jid#jid=}" \
+				    > /var/run/jail_${_jn#name=}.id
+			done
 		else
-			_setfib=""
+			tail -1 $_tmp
 		fi
-		if checkyesno _mount; then
-			info "Mounting fstab for jail ${_jail} (${_fstab})"
-			if [ ! -f "${_fstab}" ]; then
-				err 3 "$name: ${_fstab} does not exist"
-			fi
-			jail_mount_fstab
-		fi
-		if checkyesno _devfs; then
-			# If devfs is already mounted here, skip it.
-			df -t devfs "${_devdir}" >/dev/null
-			if [ $? -ne 0 ]; then
-				if is_symlinked_mountpoint ${_devdir}; then
-					warn "${_devdir} has symlink as parent - not starting jail ${_jail}"
-					continue
-				fi
-				info "Mounting devfs on ${_devdir}"
-				devfs_mount_jail "${_devdir}" ${_ruleset}
-				# Transitional symlink for old binaries
-				if [ ! -L "${_devdir}/log" ]; then
-					ln -sf ../var/run/log "${_devdir}/log"
-				fi
-			fi
+		rm -f $_tmp
+		echo '.'
+		return
+	;;
+	esac
+	if checkyesno jail_parallel_start; then
+		#
+		# Start jails in parallel and then check jail id when
+		# jail_parallel_start is YES.
+		#
+		_jl=
+		for _j in $@; do
+			_j=$(echo $_j | tr /. _)
+			parse_options $_j || continue
 
-			# XXX - It seems symlinks don't work when there
-			#	is a devfs(5) device of the same name.
-			# Jail console output
-			#	__pwd="`pwd`"
-			#	cd "${_devdir}"
-			#	ln -sf ../var/log/console console
-			#	cd "$__pwd"
-		fi
-		if checkyesno _fdescfs; then
-			if is_symlinked_mountpoint ${_fdescdir}; then
-				warn "${_fdescdir} has symlink as parent, not mounting"
-			else
-				info "Mounting fdescfs on ${_fdescdir}"
-				mount -t fdescfs fdesc "${_fdescdir}"
-			fi
-		fi
-		if checkyesno _procfs; then
-			if is_symlinked_mountpoint ${_procdir}; then
-				warn "${_procdir} has symlink as parent, not mounting"
-			else
-				info "Mounting procfs onto ${_procdir}"
-				if [ -d "${_procdir}" ] ; then
-					mount -t procfs proc "${_procdir}"
-				fi
-			fi
-		fi
-		_tmp_jail=${_tmp_dir}/jail.$$
-
-		i=0
-		while : ; do
-			eval out=\"\${_exec_prestart${i}:-''}\"
-			[ -z "$out" ] && break
-			${out}
-			i=$((i + 1))
+			_jl="$_jl $_j"
+			eval rc_flags=\${jail_${_j}_flags:-$jail_flags}
+			eval command=\${jail_${_j}_program:-$jail_program}
+			command_args="-i -f $_conf -c $_j"
+			$command $rc_flags $command_args \
+			    >/dev/null 2>&1 </dev/null &
 		done
+		sleep 1
+		for _j in $_jl; do
+			echo -n " ${_hostname:-${_j}}"
+			if _jid=$($jail_jls -n -j $_j | tr " " "\n" | \
+			    grep ^jid=); then
+				echo "${_jid#jid=}" > /var/run/jail_${_j}.id
+			else
+				rm -f /var/run/jail_${_j}.id
+				echo " cannot start jail " \
+				    "\"${_hostname:-${_j}}\": "
+			fi
+		done
+	else
+		#
+		# Start jails one-by-one when jail_parallel_start is NO.
+		#
+		for _j in $@; do
+			_j=$(echo $_j | tr /. _)
+			parse_options $_j || continue
 
-		eval ${_setfib} jail -n ${_jail} ${_flags} -i -c path=${_rootdir} host.hostname=${_hostname} \
-			${_addrl:+ip4.addr=\"${_addrl}\"} ${_addr6l:+ip6.addr=\"${_addr6l}\"} \
-			${_parameters} command=${_exec_start} > ${_tmp_jail} 2>&1 \
-			</dev/null
-
-		if [ "$?" -eq 0 ] ; then
-			_jail_id=$(head -1 ${_tmp_jail})
-			i=1
-			while : ; do
-				eval out=\"\${_exec_afterstart${i}:-''}\"
-
-				if [ -z "$out" ]; then
-					break;
-				fi
-
-				jexec "${_jail_id}" ${out}
-				i=$((i + 1))
-			done
-
-			echo -n " $_hostname"
-			tail +2 ${_tmp_jail} >${_consolelog}
-			echo ${_jail_id} > /var/run/jail_${_jail}.id
-
-			i=0
-			while : ; do
-				eval out=\"\${_exec_poststart${i}:-''}\"
-				[ -z "$out" ] && break
-				${out}
-				i=$((i + 1))
-			done
-		else
-			jail_umount_fs
-			jail_ips "del"
-			echo " cannot start jail \"${_jail}\": "
-			tail +2 ${_tmp_jail}
-		fi
-		rm -f ${_tmp_jail}
-	done
-	rmdir ${_tmp_dir}
+			eval rc_flags=\${jail_${_j}_flags:-$jail_flags}
+			eval command=\${jail_${_j}_program:-$jail_program}
+			command_args="-i -f $_conf -c $_j"
+			_tmp=`mktemp -t jail` || exit 3
+			if $command $rc_flags $command_args \
+			    >> $_tmp 2>&1 </dev/null; then
+				echo -n " ${_hostname:-${_j}}"
+				_jid=$($jail_jls -n -j $_j | \
+				    tr " " "\n" | grep ^jid=)
+				echo "${_jid#jid=}" > /var/run/jail_${_j}.id
+			else
+				rm -f /var/run/jail_${_j}.id
+				echo " cannot start jail " \
+				    "\"${_hostname:-${_j}}\": "
+				cat $_tmp
+			fi
+			rm -f $_tmp
+		done
+	fi
 	echo '.'
 }
 
 jail_stop()
 {
+	local _j _jn
+
+	if [ $# = 0 ]; then
+		return
+	fi
 	echo -n 'Stopping jails:'
-	for _jail in ${jail_list}
-	do
-		if [ -f "/var/run/jail_${_jail}.id" ]; then
-			_jail_id=$(cat /var/run/jail_${_jail}.id)
-			if [ ! -z "${_jail_id}" ]; then
-				init_variables $_jail
-
-				i=0
-				while : ; do
-					eval out=\"\${_exec_prestop${i}:-''}\"
-					[ -z "$out" ] && break
-					${out}
-					i=$((i + 1))
-				done
-
-				if [ -n "${_exec_stop}" ]; then
-					eval env -i /usr/sbin/jexec ${_jail_id} ${_exec_stop} \
-						>> ${_consolelog} 2>&1
-				fi
-				killall -j ${_jail_id} -TERM > /dev/null 2>&1
-				sleep 1
-				killall -j ${_jail_id} -KILL > /dev/null 2>&1
-				jail_umount_fs
-				echo -n " $_hostname"
-
-				i=0
-				while : ; do
-					eval out=\"\${_exec_poststop${i}:-''}\"
-					[ -z "$out" ] && break
-					${out}
-					i=$((i + 1))
-				done
+	case $1 in
+	_ALL)
+		command=$jail_program
+		rc_flags=$jail_flags
+		command_args="-f $jail_conf -r"
+		$jail_jls -nq | while read IN; do
+			_jn=$(echo $IN | tr " " "\n" | grep ^name=)
+			echo -n " ${_jn#name=}"
+			_tmp=`mktemp -t jail` || exit 3
+			$command $rc_flags $command_args ${_jn#name=} \
+			    >> $_tmp 2>&1
+			if $jail_jls -j ${_jn#name=} > /dev/null 2>&1; then
+				tail -1 $_tmp
+			else
+				rm -f /var/run/jail_${_jn#name=}.id
 			fi
-			jail_ips "del"
-			rm /var/run/jail_${_jail}.id
-		else
-			echo " cannot stop jail ${_jail}. No jail id in /var/run"
+			rm -f $_tmp
+		done
+		echo '.'
+		return
+	;;
+	esac
+	for _j in $@; do
+		_j=$(echo $_j | tr /. _)
+		parse_options $_j || continue
+		if ! $jail_jls -j $_j > /dev/null 2>&1; then
+			continue
 		fi
+		eval command=\${jail_${_j}_program:-$jail_program}
+		echo -n " ${_hostname:-${_j}}"
+		_tmp=`mktemp -t jail` || exit 3
+		$command -q -f $_conf -r $_j >> $_tmp 2>&1
+		if $jail_jls -j $_j > /dev/null 2>&1; then
+			tail -1 $_tmp
+		else
+			rm -f /var/run/jail_${_j}.id
+		fi
+		rm -f $_tmp
 	done
 	echo '.'
 }
 
-load_rc_config $name
-cmd="$1"
-if [ $# -gt 0 ]; then
-	shift
-fi
-if [ -n "$*" ]; then
-	jail_list="$*"
-fi
+jail_warn()
+{
 
-run_rc_command "${cmd}"
+	# To relieve confusion, show a warning message.
+	case $_confwarn in
+	1)	warn "Per-jail configuration via jail_* variables " \
+		    "is obsolete.  Please consider to migrate to $jail_conf."
+	;;
+	esac
+}
+
+load_rc_config $name
+case $# in
+1)	run_rc_command $@ ${jail_list:-_ALL} ;;
+*)	run_rc_command $@ ;;
+esac
diff --git a/etc/rc.d/named b/etc/rc.d/named
deleted file mode 100755
index b55bde3a88a..00000000000
--- a/etc/rc.d/named
+++ /dev/null
@@ -1,301 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: named
-# REQUIRE: SERVERS FILESYSTEMS
-# KEYWORD: shutdown
-
-. /etc/rc.subr
-
-name="named"
-rcvar=named_enable
-
-extra_commands="reload"
-
-start_precmd="named_prestart"
-start_postcmd="named_poststart"
-reload_cmd="named_reload"
-stop_cmd="named_stop"
-stop_postcmd="named_poststop"
-
-# If running in a chroot cage, ensure that the appropriate files
-# exist inside the cage, as well as helper symlinks into the cage
-# from outside.
-#
-# As this is called after the is_running and required_dir checks
-# are made in run_rc_command(), we can safely assume ${named_chrootdir}
-# exists and named isn't running at this point (unless forcestart
-# is used).
-#
-chroot_autoupdate()
-{
-	local file
-
-	# Create (or update) the chroot directory structure
-	#
-	if [ -r /etc/mtree/BIND.chroot.dist ]; then
-		mtree -deU -f /etc/mtree/BIND.chroot.dist \
-		    -p ${named_chrootdir}
-	else
-		warn "/etc/mtree/BIND.chroot.dist missing,"
-		warn "chroot directory structure not updated"
-	fi
-
-	# Create (or update) the configuration directory symlink
-	#
-	if [ ! -L "${named_conf%/*}" ]; then
-		if [ -d "${named_conf%/*}" ]; then
-			warn "named chroot: ${named_conf%/*} is a directory!"
-		elif [ -e "${named_conf%/*}" ]; then
-			warn "named chroot: ${named_conf%/*} exists!"
-		else
-			ln -s ${named_confdir} ${named_conf%/*}
-		fi
-	else
-		# Make sure it points to the right place.
-		ln -shf ${named_confdir} ${named_conf%/*}
-	fi
-
-	# Mount a devfs in the chroot directory if needed
-	#
-	if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
-		umount ${named_chrootdir}/dev 2>/dev/null
-		devfs_domount ${named_chrootdir}/dev devfsrules_hide_all
-		devfs -m ${named_chrootdir}/dev rule apply path null unhide
-		devfs -m ${named_chrootdir}/dev rule apply path random unhide
-	else
-		if [ -c ${named_chrootdir}/dev/null -a \
-		    -c ${named_chrootdir}/dev/random ]; then
-			info "named chroot: using pre-mounted devfs."
-		else
-			err 1 "named chroot: devfs cannot be mounted from" \
-			    "within a jail. Thus a chrooted named cannot" \
-			    "be run from within a jail." \
-			    "To run named without chrooting it, set" \
-			    "named_chrootdir=\"\" in /etc/rc.conf."
-		fi
-	fi
-
-	# Copy and/or update key files to the chroot /etc
-	#
-	for file in localtime protocols services; do
-		if [ -r /etc/$file ]; then
-			cmp -s /etc/$file "${named_chrootdir}/etc/$file" ||
-			    cp -p /etc/$file "${named_chrootdir}/etc/$file"
-		fi
-	done
-}
-
-# Make symlinks to the correct pid file
-#
-make_symlinks()
-{
-	checkyesno named_symlink_enable &&
-	    ln -fs "${named_chrootdir}${pidfile}" ${pidfile}
-}
-
-named_poststart() {
-	make_symlinks
-
-	if checkyesno named_wait; then
-		until ${command%/sbin/named}/bin/host $named_wait_host >/dev/null 2>&1; do
-			echo "	Waiting for nameserver to resolve $named_wait_host"
-			sleep 1
-		done
-	fi
-}
-
-named_reload()
-{
-	${command%/named}/rndc reload
-}
-
-find_pidfile()
-{
-	if get_pidfile_from_conf pid-file $named_conf; then
-		pidfile="$_pidfile_from_conf"
-	else
-		pidfile="/var/run/named/pid"
-	fi
-}
-
-named_stop()
-{
-	find_pidfile
-
-	# This duplicates an undesirably large amount of code from the stop
-	# routine in rc.subr in order to use rndc to shut down the process,
-	# and to give it a second chance in case rndc fails.
-	rc_pid=$(check_pidfile $pidfile $command)
-	if [ -z "$rc_pid" ]; then
-		[ -n "$rc_fast" ] && return 0
-		_run_rc_notrunning
-		return 1
-	fi
-	echo 'Stopping named.'
-	if ${command%/named}/rndc stop 2>/dev/null; then
-		wait_for_pids $rc_pid
-	else
-		echo -n 'rndc failed, trying kill: '
-		kill -TERM $rc_pid
-		wait_for_pids $rc_pid
-  	fi
-}
-
-named_poststop()
-{
-	if [ -n "${named_chrootdir}" -a -c ${named_chrootdir}/dev/null ]; then
-		if [ `${SYSCTL_N} security.jail.jailed` -eq 0 ]; then
-			umount ${named_chrootdir}/dev 2>/dev/null || true
-		else
-			warn "named chroot:" \
-			    "cannot unmount devfs from inside jail!"
-		fi
-	fi
-}
-
-create_file() {
-	if [ -e "$1" ]; then
-		unlink $1
-	fi
-	> $1
-	chown root:wheel $1
-	chmod 644 $1
-}
-
-named_prestart()
-{
-	find_pidfile
-
-	if [ -n "$named_pidfile" ]; then
-		warn 'named_pidfile: now determined from the conf file'
-	fi
-
-	command_args="-u ${named_uid:=root}"
-
-	if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then
-		case "$named_flags" in
-		-c*|*' -c'*) ;;		# No need to add it
-		*) command_args="-c $named_conf $command_args" ;;
-		esac
-	fi
-
-	local line nsip firstns
-
-	# Is the user using a sandbox?
-	#
-	if [ -n "$named_chrootdir" ]; then
-		rc_flags="$rc_flags -t $named_chrootdir"
-		checkyesno named_chroot_autoupdate && chroot_autoupdate
-	else
-		named_symlink_enable=NO
-	fi
-
-	# Create an rndc.key file for the user if none exists
-	#
-	confgen_command="${command%/named}/rndc-confgen -a -b256 -u $named_uid \
-	    -c ${named_confdir}/rndc.key"
-	if [ -s "${named_confdir}/rndc.conf" ]; then
-		unset confgen_command
-	fi
-	if [ -s "${named_confdir}/rndc.key" ]; then
-		case `stat -f%Su ${named_confdir}/rndc.key` in
-		root|$named_uid) ;;
-		*) $confgen_command ;;
-		esac
-	else
-		$confgen_command
-	fi
-
-	local checkconf
-
-	checkconf="${command%/named}/named-checkconf"
-	if ! checkyesno named_chroot_autoupdate && [ -n "$named_chrootdir" ]; then
-		checkconf="$checkconf -t $named_chrootdir"
-	fi
-
-	# Create a forwarder configuration based on /etc/resolv.conf
-	if checkyesno named_auto_forward; then
-		if [ ! -s /etc/resolv.conf ]; then
-			warn "named_auto_forward enabled, but no /etc/resolv.conf"
-
-			# Empty the file in case it is included in named.conf
-			[ -s "${named_confdir}/auto_forward.conf" ] &&
-			    create_file ${named_confdir}/auto_forward.conf
-
-			$checkconf $named_conf ||
-			    err 3 'named-checkconf for $named_conf failed'
-			return
-		fi
-
-		create_file /var/run/naf-resolv.conf
-		create_file /var/run/auto_forward.conf
-
-		echo '	forwarders {' > /var/run/auto_forward.conf
-
-		while read line; do
-			case "$line" in
-			'nameserver '*|'nameserver	'*)
-				nsip=${line##nameserver[         ]}
-
-				if [ -z "$firstns" ]; then
-					if [ ! "$nsip" = '127.0.0.1' ]; then
-						echo 'nameserver 127.0.0.1'
-						echo "		${nsip};" >> /var/run/auto_forward.conf
-					fi
-
-					firstns=1
-				else
-					[ "$nsip" = '127.0.0.1' ] && continue
-					echo "		${nsip};" >> /var/run/auto_forward.conf
-				fi
-				;;
-			esac
-
-			echo $line
-		done < /etc/resolv.conf > /var/run/naf-resolv.conf
-
-		echo '	};' >> /var/run/auto_forward.conf
-		echo '' >> /var/run/auto_forward.conf
-		if checkyesno named_auto_forward_only; then
-			echo "	forward only;" >> /var/run/auto_forward.conf
-		else
-			echo "	forward first;" >> /var/run/auto_forward.conf
-		fi
-
-		if cmp -s /etc/resolv.conf /var/run/naf-resolv.conf; then
-			unlink /var/run/naf-resolv.conf
-		else
-			[ -e /etc/resolv.conf ] && unlink /etc/resolv.conf
-			mv /var/run/naf-resolv.conf /etc/resolv.conf
-		fi
-
-		if cmp -s ${named_confdir}/auto_forward.conf \
-		    /var/run/auto_forward.conf; then
-			unlink /var/run/auto_forward.conf
-		else
-			[ -e "${named_confdir}/auto_forward.conf" ] &&
-			    unlink ${named_confdir}/auto_forward.conf
-			mv /var/run/auto_forward.conf \
-			    ${named_confdir}/auto_forward.conf
-		fi
-	else
-		# Empty the file in case it is included in named.conf
-		[ -s "${named_confdir}/auto_forward.conf" ] &&
-		    create_file ${named_confdir}/auto_forward.conf
-	fi
-
-	$checkconf $named_conf || err 3 'named-checkconf for $named_conf failed'
-}
-
-load_rc_config $name
-
-# Updating the following variables requires that rc.conf be loaded first
-#
-required_dirs="$named_chrootdir"	# if it is set, it must exist
-
-named_confdir="${named_chrootdir}${named_conf%/*}"
-
-run_rc_command "$1"
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index 2cb7754b063..154f1ce704e 100755
--- a/etc/rc.d/netif
+++ b/etc/rc.d/netif
@@ -39,7 +39,9 @@ stop_cmd="network_stop"
 cloneup_cmd="clone_up"
 clonedown_cmd="clone_down"
 clear_cmd="doclear"
-extra_commands="cloneup clonedown clear"
+vnetup_cmd="vnet_up"
+vnetdown_cmd="vnet_down"
+extra_commands="cloneup clonedown clear vnetup vnetdown"
 cmdifn=
 
 set_rcvar_obsolete ipv6_enable ipv6_activate_all_interfaces
@@ -60,9 +62,6 @@ network_start()
 
 		# disable SIGINT (Ctrl-c) when running at startup
 		trap : 2
-
-		# Create Fast EtherChannel interfaces
-		fec_up
 	fi
 
 	# Create cloned interfaces
@@ -123,6 +122,20 @@ network_stop0()
 	fi
 }
 
+vnet_up()
+{
+	cmdifn=$*
+
+	network_common ifn_vnetup $cmdifn
+}
+
+vnet_down()
+{
+	cmdifn=$*
+
+	network_common ifn_vnetdown $cmdifn
+}
+
 # network_common routine
 #	Common configuration subroutine for network interfaces. This
 #	routine takes all the preparatory steps needed for configuriing
@@ -198,7 +211,7 @@ network_common()
 
 	# inet6 address configuration needs sleep for DAD.
 	case ${_func}:${_dadwait} in
-	ifn_start:1)
+	ifn_start:1|ifn_vnetup:1|ifn_vnetdown:1)
 		sleep `${SYSCTL_N} net.inet6.ip6.dad_count`
 		sleep 1
 	;;
@@ -209,12 +222,25 @@ network_common()
 		case ${_func} in
 		ifn_start)
 			_str='Starting'
-			;;
+		;;
 		ifn_stop)
 			_str='Stopping'
-			;;
+		;;
+		ifn_vnetup)
+			_str='Moving'
+		;;
+		ifn_vnetdown)
+			_str='Reclaiming'
+		;;
 		esac
 		echo "${_str} Network:${_ok}."
+		case ${_func} in
+		ifn_vnetup)
+			# Clear _ok not to do "ifconfig $ifn"
+			# because $ifn is no longer in the current vnet.
+			_ok=
+		;;
+		esac
 		if check_startmsgs; then
 			for ifn in ${_ok}; do
 				/sbin/ifconfig ${ifn}
diff --git a/etc/rc.d/ntpdate b/etc/rc.d/ntpdate
index 235e6c086dd..de7a1327158 100755
--- a/etc/rc.d/ntpdate
+++ b/etc/rc.d/ntpdate
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ntpdate
-# REQUIRE: NETWORKING syslogd named
+# REQUIRE: NETWORKING syslogd
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog
index a0e6876b435..7647ebf676e 100755
--- a/etc/rc.d/pflog
+++ b/etc/rc.d/pflog
@@ -24,25 +24,41 @@ pflog_prestart()
 {
 	load_kld pflog || return 1
 
-	# set pflog0 interface to up state
-	if ! ifconfig pflog0 up; then
-		warn 'could not bring up pflog0.'
+	# set pflog_dev interface to up state
+	if ! ifconfig $pflog_dev up; then
+		warn "could not bring up $pflog_dev."
 		return 1
 	fi
 
 	# prepare the command line for pflogd
-	rc_flags="-f $pflog_logfile $rc_flags"
+	rc_flags="-f $pflog_logfile -i $pflog_dev $rc_flags"
 
 	# report we're ready to run pflogd
 	return 0
 }
 
+pflog_poststart() {
+	# Allow child pflogd to settle
+	sleep 0.10
+	# More elegant(?) method for getting a unique pid
+	if [ -f /var/run/pflogd.pid ]; then
+		mv /var/run/pflogd.pid $pidfile
+	else
+		warn "/var/run/pflogd.pid does not exist. Too fast."
+	fi
+}
+
 pflog_poststop()
 {
-	if ! ifconfig pflog0 down; then
-		warn 'could not bring down pflog0.'
+	if ! ifconfig $pflog_dev down; then
+		warn "could not bring down $pflog_dev."
 		return 1
 	fi
+
+	if [ "$pflog_instances" ] && [ -n "$pflog_instances" ]; then
+		rm $pidfile
+	fi
+
 	return 0
 }
 
@@ -53,4 +69,33 @@ pflog_resync()
 }
 
 load_rc_config $name
-run_rc_command "$1"
+
+# Check if spawning multiple pflogd
+echo "Starting pflogd: $pflog_instances"
+if [ "$pflog_instances" ] && [ -n "$pflog_instances" ]; then
+	start_postcmd="pflog_poststart"
+	# Interate through requested instances.
+	for i in $pflog_instances; do
+		# Set required variables
+		eval pflog_dev=\$pflog_${i}_dev
+		eval pflog_logfile=\$pflog_${i}_logfile
+		eval pflog_flags=\$pflog_${i}_flags
+		# Check that required vars have non-zero length, warn if not.
+		if [ -z $pflog_dev ]; then
+			warn "pflog_dev not set"
+			continue
+		fi
+		if [ -z $pflog_logfile ]; then
+			warn "pflog_logfile not set"
+			continue
+		fi
+		# pflogd sets a pidfile, but the name is hardcoded. Concoct a
+		# unique pidfile name.
+		pidfile="/var/run/pflogd.$i.pid"
+		run_rc_command "$1"
+	done
+else
+	# Typical case, spawn single instance only.
+	pflog_dev=${pflog_dev:-"pflog0"}
+	run_rc_command "$1"
+fi
diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind
index 37a428a7191..60e23084b14 100755
--- a/etc/rc.d/rpcbind
+++ b/etc/rc.d/rpcbind
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: rpcbind
-# REQUIRE: NETWORKING ntpdate syslogd named
+# REQUIRE: NETWORKING ntpdate syslogd
 # KEYWORD: shutdown
 
 . /etc/rc.subr
diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd
index 562498c3c36..732e1279b22 100755
--- a/etc/rc.d/rtadvd
+++ b/etc/rc.d/rtadvd
@@ -14,6 +14,8 @@
 name="rtadvd"
 rcvar="rtadvd_enable"
 command="/usr/sbin/${name}"
+extra_commands="reload"
+reload_cmd="rtadvd_reload"
 start_precmd="rtadvd_precmd"
 
 rtadvd_precmd()
@@ -62,5 +64,9 @@ rtadvd_precmd()
 	return 0
 }
 
+rtadvd_reload() {
+	/usr/sbin/rtadvctl reload
+}
+
 load_rc_config $name
 run_rc_command "$1"
diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail
index 712bb3ec67b..82470970264 100755
--- a/etc/rc.d/sendmail
+++ b/etc/rc.d/sendmail
@@ -24,6 +24,8 @@ command=${sendmail_program:-/usr/sbin/${name}}
 pidfile=${sendmail_pidfile:-/var/run/${name}.pid}
 procname=${sendmail_procname:-/usr/sbin/${name}}
 
+CERTDIR=/etc/mail/certs
+
 case ${sendmail_enable} in
 [Nn][Oo][Nn][Ee])
 	sendmail_enable="NO"
@@ -44,6 +46,118 @@ if checkyesno sendmail_submit_enable; then
 	sendmail_outbound_enable="NO"
 fi
 
+sendmail_cert_create()
+{
+	cnname="${sendmail_cert_cn:-`hostname`}"
+	cnname="${cnname:-amnesiac}"
+
+	# based upon:
+	# http://www.sendmail.org/~ca/email/other/cagreg.html
+	CAdir=`mktemp -d` &&
+	certpass=`(date; ps ax ; hostname) | md5 -q`
+
+	# make certificate authority
+	( cd "$CAdir" &&
+	chmod 700 "$CAdir" &&
+	mkdir certs crl newcerts &&
+	echo "01" > serial &&
+	:> index.txt &&
+
+	cat <<-OPENSSL_CNF > openssl.cnf &&
+		RANDFILE	= $CAdir/.rnd
+		[ ca ]
+		default_ca	= CA_default
+		[ CA_default ]
+		dir		= .
+		certs		= \$dir/certs		# Where the issued certs are kept
+		crl_dir		= \$dir/crl		# Where the issued crl are kept
+		database	= \$dir/index.txt	# database index file.
+		new_certs_dir	= \$dir/newcerts	# default place for new certs.
+		certificate	= \$dir/cacert.pem 	# The CA certificate
+		serial		= \$dir/serial 		# The current serial number
+		crlnumber	= \$dir/crlnumber	# the current crl number
+		crl		= \$dir/crl.pem 	# The current CRL
+		private_key	= \$dir/cakey.pem
+		x509_extensions	= usr_cert		# The extentions to add to the cert
+		name_opt 	= ca_default		# Subject Name options
+		cert_opt 	= ca_default		# Certificate field options
+		default_days	= 365			# how long to certify for
+		default_crl_days= 30			# how long before next CRL
+		default_md	= default		# use public key default MD
+		preserve	= no			# keep passed DN ordering
+		policy		= policy_anything
+		[ policy_anything ]
+		countryName		= optional
+		stateOrProvinceName	= optional
+		localityName		= optional
+		organizationName	= optional
+		organizationalUnitName	= optional
+		commonName		= supplied
+		emailAddress		= optional
+		[ req ]
+		default_bits		= 2048
+		default_keyfile 	= privkey.pem
+		distinguished_name	= req_distinguished_name
+		attributes		= req_attributes
+		x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+		string_mask = utf8only
+		prompt = no
+		[ req_distinguished_name ]
+		countryName			= XX
+		stateOrProvinceName		= Some-state
+		localityName			= Some-city
+		0.organizationName		= Some-org
+		CN				= $cnname
+		[ req_attributes ]
+		challengePassword		= foobar
+		unstructuredName		= An optional company name
+		[ usr_cert ]
+		basicConstraints=CA:FALSE
+		nsComment			= "OpenSSL Generated Certificate"
+		subjectKeyIdentifier=hash
+		authorityKeyIdentifier=keyid,issuer
+		[ v3_req ]
+		basicConstraints = CA:FALSE
+		keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+		[ v3_ca ]
+		subjectKeyIdentifier=hash
+		authorityKeyIdentifier=keyid:always,issuer
+		basicConstraints = CA:true
+	OPENSSL_CNF
+
+	# though we use a password, the key is discarded and never used
+	openssl req -batch -passout pass:"$certpass" -new -x509 \
+	    -keyout cakey.pem -out cacert.pem -days 3650 \
+	    -config openssl.cnf -newkey rsa:2048 >/dev/null 2>&1 &&
+
+	# make new certificate
+	openssl req -batch -nodes -new -x509 -keyout newkey.pem \
+	    -out newreq.pem -days 365 -config openssl.cnf \
+	    -newkey rsa:2048 >/dev/null 2>&1 &&
+
+	# sign certificate
+	openssl x509 -x509toreq -in newreq.pem -signkey newkey.pem \
+	    -out tmp.pem >/dev/null 2>&1 &&
+	openssl ca -notext -config openssl.cnf \
+	    -out newcert.pem -keyfile cakey.pem -cert cacert.pem \
+	    -key "$certpass" -batch -infiles tmp.pem >/dev/null 2>&1 &&
+
+	mkdir -p "$CERTDIR" &&
+	chmod 0755 "$CERTDIR" &&
+	chmod 644 newcert.pem cacert.pem &&
+	chmod 600 newkey.pem &&
+	cp -p newcert.pem "$CERTDIR"/host.cert &&
+	cp -p cacert.pem "$CERTDIR"/cacert.pem &&
+	cp -p newkey.pem "$CERTDIR"/host.key &&
+	ln -s cacert.pem "$CERTDIR"/`openssl x509 -hash -noout \
+	    -in cacert.pem`.0)
+
+	retVal="$?"
+	rm -rf "$CAdir"
+
+	return "$retVal"
+}
+
 sendmail_precmd()
 {
 	# Die if there's pre-8.10 custom configuration file.  This check is
@@ -71,6 +185,17 @@ sendmail_precmd()
 				/usr/bin/newaliases
 		fi
 	fi
+
+	if checkyesno sendmail_cert_create && [ ! \( \
+	    -f "$CERTDIR/host.cert" -o -f "$CERTDIR/host.key" -o \
+	    -f "$CERTDIR/cacert.pem" \) ]; then
+		if ! openssl version >/dev/null 2>&1; then
+			warn "OpenSSL not available, but sendmail_cert_create is YES."
+		else
+			info Creating certificate for sendmail.
+			sendmail_cert_create
+		fi
+	fi
 }
 
 run_rc_command "$1"
diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd
index 01677894b7e..5ad1b100aff 100755
--- a/etc/rc.d/sshd
+++ b/etc/rc.d/sshd
@@ -53,7 +53,7 @@ sshd_keygen_alg()
 	fi
 
 	if [ -f "${keyfile}" ] ; then
-		echo "$ALG host key exists."
+		info "$ALG host key exists."
 	else
 		echo "Generating $ALG host key."
 		/usr/bin/ssh-keygen -q -t $alg -f "$keyfile" -N ""
diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd
index 87f7de24b19..2842b48fac9 100755
--- a/etc/rc.d/syslogd
+++ b/etc/rc.d/syslogd
@@ -21,7 +21,6 @@ extra_commands="reload"
 
 sockfile="/var/run/syslogd.sockets"
 evalargs="rc_flags=\"\`set_socketlist\` \$rc_flags\""
-altlog_proglist="named"
 
 syslogd_precmd()
 {
diff --git a/etc/rc.subr b/etc/rc.subr
index aee0c959051..152b70e6426 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -1463,28 +1463,6 @@ devfs_domount()
 	return 0
 }
 
-# devfs_mount_jail dir [ruleset]
-#	Mounts a devfs file system appropriate for jails
-#	on the directory dir. If ruleset is specified, the ruleset
-#	it names will be used instead.  If present, ruleset must
-#	be the name of a ruleset as defined in a devfs.rules(5) file.
-#	This function returns non-zero if an error occurs.
-#
-devfs_mount_jail()
-{
-	local jdev rs _me
-	jdev="$1"
-	[ -n "$2" ] && rs=$2 || rs="devfsrules_jail"
-	_me="devfs_mount_jail"
-
-	devfs_init_rulesets
-	if ! devfs_domount "$jdev" $rs; then
-		warn "$_me: devfs was not mounted on $jdev"
-		return 1
-	fi
-	return 0
-}
-
 # Provide a function for normalizing the mounting of memory
 # filesystems.  This should allow the rest of the code here to remain
 # as close as possible between 5-current and 4-stable.
diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc
index 6d756368dac..7ab7386fa2b 100644
--- a/etc/sendmail/freebsd.mc
+++ b/etc/sendmail/freebsd.mc
@@ -42,6 +42,11 @@ divert(-1)
 #  /usr/share/sendmail/cf/README or
 #  /usr/src/contrib/sendmail/cf/README
 # 
+#
+#  NOTE: If you enable RunAsUser, make sure that you adjust the permissions
+#  and owner of the SSL certificates and keys in /etc/mail/certs to be usable
+#  by that user.
+#
 
 divert(0)
 VERSIONID(`$FreeBSD$')
@@ -54,6 +59,16 @@ FEATURE(local_lmtp)
 FEATURE(mailertable, `hash -o /etc/mail/mailertable')
 FEATURE(virtusertable, `hash -o /etc/mail/virtusertable')
 
+dnl Enable STARTTLS for receiving email.
+define(`CERT_DIR', `/etc/mail/certs')dnl
+define(`confSERVER_CERT', `CERT_DIR/host.cert')dnl
+define(`confSERVER_KEY', `CERT_DIR/host.key')dnl
+define(`confCLIENT_CERT', `CERT_DIR/host.cert')dnl
+define(`confCLIENT_KEY', `CERT_DIR/host.key')dnl
+define(`confCACERT', `CERT_DIR/cacert.pem')dnl
+define(`confCACERT_PATH', `CERT_DIR')dnl
+define(`confDH_PARAMETERS', `CERT_DIR/dh.param')dnl
+
 dnl Uncomment to allow relaying based on your MX records.
 dnl NOTE: This can allow sites to use your server as a backup MX without
 dnl       your permission.
diff --git a/etc/services b/etc/services
index 6f254fa02fd..13ad4c820f6 100644
--- a/etc/services
+++ b/etc/services
@@ -2192,6 +2192,8 @@ ospf6d		2606/tcp   #OSPF6d vty
 dict		2628/tcp   #RFC 2229
 dict		2628/udp   #RFC 2229
 listen		2766/tcp   #System V listener port
+smpp		2775/tcp   #SMPP
+smpp		2775/udp   #SMPP
 www-dev		2784/tcp   #world wide web - development
 www-dev		2784/udp   #world wide web - development
 m2ua		2904/sctp  #M2UA
@@ -2462,6 +2464,8 @@ amidxtape	10083/tcp  #Amanda tape indexing
 wmereceiving	11997/sctp #WorldMailExpress
 wmedistribution	11998/sctp #WorldMailExpress
 wmereporting	11999/sctp #WorldMailExpress
+bpcd		13782/tcp  #Veritas NetBackup
+bpcd		13782/udp  #Veritas NetBackup
 sua		14001/sctp #SUA
 sua		14001/tcp  #SUA
 isode-dua	17007/tcp
diff --git a/games/fortune/datfiles/fortunes b/games/fortune/datfiles/fortunes
index c6928a885a1..c7d78a3aba9 100644
--- a/games/fortune/datfiles/fortunes
+++ b/games/fortune/datfiles/fortunes
@@ -46677,7 +46677,7 @@ they had just discovered that he lived in New Hampshire, not Vermont.
 taken another one of those damned Vermont winters!"
 %
 THE OLD POOL SHOOTER had won many a game in his life. But now it was time
-to hang up the cue. When he did, all the other cues came crashing go the
+to hang up the cue. When he did, all the other cues came crashing to the
 floor.
 
 "Sorry," he said with a smile.
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index d5ce1b9c80e..2fb2be0e249 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -486,7 +486,7 @@ add_file(int percent, const char *file, const char *dir, FILEDESC **head,
 		if (Offend) {
 			if (was_malloc)
 				free(tpath);
-			path = offensive;
+			path = tpath = offensive;
 			offensive = NULL;
 			was_malloc = TRUE;
 			DPRINTF(1, (stderr, "\ttrying \"%s\"\n", path));
@@ -508,7 +508,7 @@ over:
 		if (All_forts && offensive != NULL) {
 			if (was_malloc)
 				free(tpath);
-			path = offensive;
+			path = tpath = offensive;
 			offensive = NULL;
 			was_malloc = TRUE;
 			DPRINTF(1, (stderr, "\ttrying \"%s\"\n", path));
@@ -806,10 +806,6 @@ is_fortfile(const char *file, char **datp, char **posp, int check_for_offend)
 	strcat(datfile, ".dat");
 	if (access(datfile, R_OK) < 0) {
 		DPRINTF(2, (stderr, "FALSE (no readable \".dat\" file)\n"));
-#ifdef DEBUG
-		if (Debug < 2)
-			DPRINTF(0, (stderr, "Warning: file \"%s\" unreadable\n", datfile));
-#endif
 		free(datfile);
 		return (FALSE);
 	}
diff --git a/gnu/usr.bin/binutils/ld/Makefile b/gnu/usr.bin/binutils/ld/Makefile
index ef19afae07d..dff112169eb 100644
--- a/gnu/usr.bin/binutils/ld/Makefile
+++ b/gnu/usr.bin/binutils/ld/Makefile
@@ -31,7 +31,12 @@ CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
-CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\"
+CFLAGS+= -DBINDIR=\"${BINDIR}\"
+.if defined(TOOLS_PREFIX)
+CFLAGS+= -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\"
+.else
+CFLAGS+= -DTARGET_SYSTEM_ROOT=\"/\"
+.endif
 CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
diff --git a/gnu/usr.bin/binutils/ld/ld.1 b/gnu/usr.bin/binutils/ld/ld.1
index d1e29b8987a..a7cbdffd0cd 100644
--- a/gnu/usr.bin/binutils/ld/ld.1
+++ b/gnu/usr.bin/binutils/ld/ld.1
@@ -929,20 +929,6 @@ the default behaviour of the linker, before release 2.14.  The default
 behaviour from release 2.14 onwards is to reject such input files, and
 so the \fB\-\-accept\-unknown\-input\-arch\fR option has been added to
 restore the old behaviour.
-.IP "\fB\-\-as\-needed\fR" 4
-.IX Item "--as-needed"
-.PD 0
-.IP "\fB\-\-no\-as\-needed\fR" 4
-.IX Item "--no-as-needed"
-.PD
-This option affects \s-1ELF\s0 \s-1DT_NEEDED\s0 tags for dynamic libraries mentioned
-on the command line after the \fB\-\-as\-needed\fR option.  Normally,
-the linker will add a \s-1DT_NEEDED\s0 tag for each dynamic library mentioned
-on the command line, regardless of whether the library is actually
-needed.  \fB\-\-as\-needed\fR causes \s-1DT_NEEDED\s0 tags to only be emitted
-for libraries that satisfy some symbol reference from regular objects
-which is undefined at the point that the library was linked.
-\&\fB\-\-no\-as\-needed\fR restores the default behaviour.
 .IP "\fB\-\-add\-needed\fR" 4
 .IX Item "--add-needed"
 .PD 0
@@ -951,11 +937,25 @@ which is undefined at the point that the library was linked.
 .PD
 This option affects the treatment of dynamic libraries from \s-1ELF\s0
 \&\s-1DT_NEEDED\s0 tags in dynamic libraries mentioned on the command line after
-the \fB\-\-no\-add\-needed\fR option.  Normally, the linker will add
-a \s-1DT_NEEDED\s0 tag for each dynamic library from \s-1DT_NEEDED\s0 tags.
-\&\fB\-\-no\-add\-needed\fR causes \s-1DT_NEEDED\s0 tags will never be emitted
-for those libraries from \s-1DT_NEEDED\s0 tags. \fB\-\-add\-needed\fR restores
-the default behaviour.
+the \fB\-\-add\-needed\fR option.  Normally, the linker will not copy
+a \s-1DT_NEEDED\s0 tags from each dynamic library to the produced output object.
+\&\fB\-\-add\-needed\fR makes linker to copy \s-1DT_NEEDED\s0 tags from all
+dynamic libraries mentioned after this flag.
+\fB\-\-no\-add\-needed\fR restores the default behaviour.
+.IP "\fB\-\-as\-needed\fR" 4
+.IX Item "--as-needed"
+.PD 0
+.IP "\fB\-\-no\-as\-needed\fR" 4
+.IX Item "--no-as-needed"
+.PD
+This option affects \s-1ELF\s0 \s-1DT_NEEDED\s0 tags for dynamic
+libraries mentioned on the command line after the \fB\-\-as\-needed\fR
+option when \fB\-\-add\-needed\fR is in effect.
+In such a case \fB\-\-as\-needed\fR causes \s-1DT_NEEDED\s0 tags
+to only be emitted for libraries that satisfy some symbol reference
+from regular objects which is undefined at the point that the library
+was linked.
+\&\fB\-\-no\-as\-needed\fR restores the default behaviour.
 .IP "\fB\-assert\fR \fIkeyword\fR" 4
 .IX Item "-assert keyword"
 This option is ignored for SunOS compatibility.
diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index 030261720f8..39adc91308e 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -23,7 +23,7 @@ CFLAGS+=	-DPREFIX=\"${TOOLS_PREFIX}/usr\"
 CSTD?=	gnu89
 
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
-CFLAGS+=	-DCROSS_COMPILE
+CFLAGS+=	-DCROSS_DIRECTORY_STRUCTURE
 .endif
 
 .if ${TARGET_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index 86c1791907f..33808a53689 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -24,6 +24,7 @@ OBJS-common = \
  tree-outof-ssa.o tree-ssa-ccp.o tree-vn.o tree-ssa-uncprop.o		   \
  tree-ssa-dce.o  tree-ssa-copy.o tree-nrv.o tree-ssa-copyrename.o	   \
  tree-ssa-pre.o tree-ssa-live.o tree-ssa-operands.o tree-ssa-alias.o       \
+ tree-ssa-alias-warnings.o						   \
  tree-ssa-phiopt.o tree-ssa-forwprop.o tree-nested.o tree-ssa-dse.o	   \
  tree-ssa-dom.o domwalk.o tree-tailcall.o gimple-low.o tree-iterator.o	   \
  omp-low.o tree-phinodes.o tree-ssanames.o tree-sra.o tree-complex.o	   \
diff --git a/gnu/usr.bin/cc/cc_tools/freebsd-native.h b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
index 30cd9b1b2e3..9bf790ffb6a 100644
--- a/gnu/usr.bin/cc/cc_tools/freebsd-native.h
+++ b/gnu/usr.bin/cc/cc_tools/freebsd-native.h
@@ -7,8 +7,8 @@
 #define FREEBSD_NATIVE 1
 
 /* Fake out gcc/config/freebsd<version>.h.  */
-#define	FBSD_MAJOR	10
-#define	FBSD_CC_VER	1000001		/* form like __FreeBSD_version */
+#define	FBSD_MAJOR	11
+#define	FBSD_CC_VER	1100001		/* form like __FreeBSD_version */
 
 #undef SYSTEM_INCLUDE_DIR		/* We don't need one for now. */
 #undef TOOL_INCLUDE_DIR			/* We don't need one for now. */
@@ -18,7 +18,7 @@
 #define GPLUSPLUS_INCLUDE_DIR		PREFIX"/include/c++/"GCCVER
 #define	GPLUSPLUS_BACKWARD_INCLUDE_DIR	PREFIX"/include/c++/"GCCVER"/backward"
 #define GCC_INCLUDE_DIR			PREFIX"/include/gcc/"GCCVER
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 #define CROSS_INCLUDE_DIR		PREFIX"/include"
 #else
 #define STANDARD_INCLUDE_DIR		PREFIX"/include"
diff --git a/gnu/usr.bin/cc/libcpp/Makefile b/gnu/usr.bin/cc/libcpp/Makefile
index bfaea7d4ac8..d21bd8352bc 100644
--- a/gnu/usr.bin/cc/libcpp/Makefile
+++ b/gnu/usr.bin/cc/libcpp/Makefile
@@ -11,9 +11,9 @@ CFLAGS+=	-I${.CURDIR} -I.
 
 LIB=	cpp
 SRCS=	localedir.h
-SRCS+=	charset.c directives.c errors.c expr.c files.c \
-	identifiers.c init.c lex.c line-map.c macro.c mkdeps.c \
-	pch.c symtab.c traditional.c
+SRCS+=	charset.c directives.c directives-only.c errors.c expr.c \
+	files.c identifiers.c init.c lex.c line-map.c macro.c \
+	mkdeps.c pch.c symtab.c traditional.c
 INTERNALLIB=
 WARNS?=	1
 
diff --git a/gnu/usr.bin/groff/tmac/mdoc.local b/gnu/usr.bin/groff/tmac/mdoc.local
index b11f4b6d8da..180669fef28 100644
--- a/gnu/usr.bin/groff/tmac/mdoc.local
+++ b/gnu/usr.bin/groff/tmac/mdoc.local
@@ -45,7 +45,7 @@
 .ds doc-str-Lb-libstdthreads C11 Threads Library (libstdthreads, \-lstdthreads)
 .
 .\" Default .Os value
-.ds doc-default-operating-system FreeBSD\~10.0
+.ds doc-default-operating-system FreeBSD\~11.0
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-7.4    7.4
@@ -54,6 +54,7 @@
 .ds doc-operating-system-FreeBSD-9.1    9.1
 .ds doc-operating-system-FreeBSD-9.2    9.2
 .ds doc-operating-system-FreeBSD-10.0   10.0
+.ds doc-operating-system-FreeBSD-11.0   11.0
 .
 .\" Definitions not (yet) in doc-syms
 .
diff --git a/include/Makefile b/include/Makefile
index 1f55f4e1d09..5ec7af70dbc 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -83,15 +83,7 @@ _netipx=	netipx
 
 # Handle the #define aliases for libiconv
 .if ${MK_ICONV} == "yes"
-CLEANFILES+=	_libiconv_compat.h
-INCS+=		_libiconv_compat.h iconv.h
-_libiconv_compat.h:	${.CURDIR}/Makefile
-	echo "/* Indicate whether libiconv symbols are present */" > _libiconv_compat.h
-.if ${MK_LIBICONV_COMPAT} == "yes"
-	echo "#define __LIBICONV_COMPAT" >> _libiconv_compat.h
-.else
-	echo "#undef __LIBICONV_COMPAT" >> _libiconv_compat.h
-.endif
+INCS+=		iconv.h
 .endif
 	
 
@@ -194,6 +186,11 @@ copies:
 	cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 	    ${DESTDIR}${INCLUDEDIR}/netinet
+.endif
+.if ${MK_PF} != "no"
+	cd ${.CURDIR}/../sys/netpfil/pf; \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+	    ${DESTDIR}${INCLUDEDIR}/netpfil/pf
 .endif
 	cd ${.CURDIR}/../sys/crypto; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 rijndael/rijndael.h \
@@ -228,6 +225,9 @@ copies:
 	cd ${.CURDIR}/../sys/rpc; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 types.h \
 	    ${DESTDIR}${INCLUDEDIR}/rpc
+	cd ${.CURDIR}/../sys/teken; \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 teken.h \
+	    ${DESTDIR}${INCLUDEDIR}/teken
 
 symlinks:
 	@${ECHO} "Setting up symlinks to kernel source tree..."
@@ -287,6 +287,13 @@ symlinks:
 		ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \
 		    ${DESTDIR}${INCLUDEDIR}/netinet; \
 	done
+.endif
+.if ${MK_PF} != "no"
+	cd ${.CURDIR}/../sys/netpfil/pf; \
+	for h in *.h; do \
+		ln -fs ../../../../sys/netpfil/pf/$$h \
+		    ${DESTDIR}${INCLUDEDIR}/netpfil/pf; \
+	done
 .endif
 	cd ${.CURDIR}/../sys/crypto; \
 	for h in rijndael/rijndael.h; do \
diff --git a/include/iconv.h b/include/iconv.h
index 69cc2c7d16a..c07d02e02a0 100644
--- a/include/iconv.h
+++ b/include/iconv.h
@@ -40,13 +40,6 @@
 #include <sys/cdefs.h>
 #include <sys/types.h>
 
-#include <_libiconv_compat.h>
-#ifdef __LIBICONV_COMPAT
-#define libiconv_open		iconv_open
-#define libiconv_close		iconv_close
-#define libiconv		iconv
-#define libiconv_t		iconv_t
-#endif
 #ifdef __cplusplus
 typedef	bool	__iconv_bool;
 #elif __STDC_VERSION__ >= 199901L
@@ -76,29 +69,12 @@ size_t	__iconv(iconv_t, const char **, size_t *, char **,
 /*
  * GNU interfaces for iconv
  */
-#ifdef __LIBICONV_COMPAT
-#define libiconv_open_into		iconv_open_into
-#define libiconvctl			iconvctl
-#define libiconvlist			iconvlist
-#define libiconv_set_relocation_prefix	iconv_set_relocation_prefix
-#endif
-
-/* We have iconvctl() */
-#define _ICONV_VERSION	0x0108
-extern int _iconv_version;
-
-#ifdef __LIBICONV_COMPAT
-#define _libiconv_version		_iconv_version
-#define _LIBICONV_VERSION		_ICONV_VERSION
-#endif
-
 typedef struct {
 	void	*spaceholder[64];
 } iconv_allocation_t;
 
 int	 iconv_open_into(const char *, const char *, iconv_allocation_t *);
-void	 iconv_set_relocation_prefix(const char *orig_prefix,
-	     const char *curr_prefix);
+void	 iconv_set_relocation_prefix(const char *, const char *);
 
 /*
  * iconvctl() request macros
@@ -110,6 +86,8 @@ void	 iconv_set_relocation_prefix(const char *orig_prefix,
 #define ICONV_SET_DISCARD_ILSEQ	4
 #define ICONV_SET_HOOKS		5
 #define ICONV_SET_FALLBACKS	6
+#define ICONV_GET_ILSEQ_INVALID	128
+#define ICONV_SET_ILSEQ_INVALID	129
 
 typedef void (*iconv_unicode_char_hook) (unsigned int mbr, void *data);
 typedef void (*iconv_wide_char_hook) (wchar_t wc, void *data);
diff --git a/include/pthread.h b/include/pthread.h
index 40810f6e6a4..3b56dbdbf74 100644
--- a/include/pthread.h
+++ b/include/pthread.h
@@ -175,6 +175,7 @@ int		pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
 			{
 
 #define		pthread_cleanup_pop(execute)					\
+				(void)0;					\
 			}							\
 			__pthread_cleanup_pop_imp(execute);			\
 		}
diff --git a/include/rpc/auth.h b/include/rpc/auth.h
index b19addc87d6..5503762bb22 100644
--- a/include/rpc/auth.h
+++ b/include/rpc/auth.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: auth.h,v 1.15 2000/06/02 22:57:55 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
diff --git a/include/rpc/auth_des.h b/include/rpc/auth_des.h
index fff4ebfe300..58b34d776d7 100644
--- a/include/rpc/auth_des.h
+++ b/include/rpc/auth_des.h
@@ -1,32 +1,31 @@
 /*	@(#)auth_des.h	2.2 88/07/29 4.0 RPCSRC; from 1.3 88/02/08 SMI */
 /*	$FreeBSD$ */
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  * 
  *	from: @(#)auth_des.h 2.2 88/07/29 4.0 RPCSRC
  *	from: @(#)auth_des.h 1.14    94/04/25 SMI
diff --git a/include/rpc/auth_kerb.h b/include/rpc/auth_kerb.h
index 1dcfb0d4f4f..b6c5ae100e6 100644
--- a/include/rpc/auth_kerb.h
+++ b/include/rpc/auth_kerb.h
@@ -1,31 +1,30 @@
 /*	$FreeBSD$ */
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  */
 /*
  * auth_kerb.h, Protocol for Kerberos style authentication for RPC
diff --git a/include/rpc/auth_unix.h b/include/rpc/auth_unix.h
index b005bac8a51..fa47e8ba945 100644
--- a/include/rpc/auth_unix.h
+++ b/include/rpc/auth_unix.h
@@ -1,30 +1,29 @@
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)auth_unix.h 1.8 88/02/08 SMI
  *	from: @(#)auth_unix.h	2.2 88/07/29 4.0 RPCSRC
diff --git a/include/rpc/clnt.h b/include/rpc/clnt.h
index 1c85a4a7368..66533e24a7e 100644
--- a/include/rpc/clnt.h
+++ b/include/rpc/clnt.h
@@ -1,49 +1,31 @@
 /*	$NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $	*/
 
-/*
- * The contents of this file are subject to the Sun Standards
- * License Version 1.0 the (the "License";) You may not use
- * this file except in compliance with the License.  You may
- * obtain a copy of the License at lib/libc/rpc/LICENSE
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ * All rights reserved.
  *
- * Software distributed under the License is distributed on
- * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied.  See the License for the specific
- * language governing rights and limitations under the License.
+ * 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 the "Oracle America, Inc." nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * The Original Code is Copyright 1998 by Sun Microsystems, Inc
- *
- * The Initial Developer of the Original Code is:  Sun
- * Microsystems, Inc.
- *
- * All Rights Reserved.
- *
- * 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, MERCHANTABILITY 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
+ * 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.
  *
  *	from: @(#)clnt.h 1.31 94/04/29 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
@@ -52,9 +34,6 @@
 
 /*
  * clnt.h - Client side remote procedure call interface.
- *
- * Copyright (c) 1986-1991,1994-1999 by Sun Microsystems, Inc.
- * All rights reserved.
  */
 
 #ifndef _RPC_CLNT_H_
diff --git a/include/rpc/clnt_soc.h b/include/rpc/clnt_soc.h
index 1e7a0dea59e..6536a4bb16a 100644
--- a/include/rpc/clnt_soc.h
+++ b/include/rpc/clnt_soc.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: clnt_soc.h,v 1.1 2000/06/02 22:57:55 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1984 - 1991 by Sun Microsystems, Inc.
diff --git a/include/rpc/des.h b/include/rpc/des.h
index f920e22d24a..9400ccdfacb 100644
--- a/include/rpc/des.h
+++ b/include/rpc/des.h
@@ -1,32 +1,31 @@
 /*  @(#)des.h	2.2 88/08/10 4.0 RPCSRC; from 2.7 88/02/08 SMI  */
 /* $FreeBSD$ */
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Generic DES driver interface
diff --git a/include/rpc/des_crypt.h b/include/rpc/des_crypt.h
index a5df606e9e0..af33e9d670d 100644
--- a/include/rpc/des_crypt.h
+++ b/include/rpc/des_crypt.h
@@ -5,33 +5,32 @@
  * des_crypt.h, des library routine interface
  * Copyright (C) 1986, Sun Microsystems, Inc.
  */
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/include/rpc/nettype.h b/include/rpc/nettype.h
index 5e26268a68d..3ded892865d 100644
--- a/include/rpc/nettype.h
+++ b/include/rpc/nettype.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: nettype.h,v 1.2 2000/07/06 03:17:19 christos Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/include/rpc/pmap_clnt.h b/include/rpc/pmap_clnt.h
index 89f1614ab9c..e8314f6064c 100644
--- a/include/rpc/pmap_clnt.h
+++ b/include/rpc/pmap_clnt.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_clnt.h,v 1.9 2000/06/02 22:57:55 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)pmap_clnt.h 1.11 88/02/08 SMI 
  *	from: @(#)pmap_clnt.h	2.1 88/07/29 4.0 RPCSRC
diff --git a/include/rpc/pmap_prot.h b/include/rpc/pmap_prot.h
index 366832a7d3f..d880c40d849 100644
--- a/include/rpc/pmap_prot.h
+++ b/include/rpc/pmap_prot.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_prot.h,v 1.8 2000/06/02 22:57:55 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI 
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
diff --git a/include/rpc/pmap_rmt.h b/include/rpc/pmap_rmt.h
index 5c0806681e9..21eb5d1bf44 100644
--- a/include/rpc/pmap_rmt.h
+++ b/include/rpc/pmap_rmt.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_rmt.h,v 1.7 1998/02/11 23:01:23 lukem 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)pmap_rmt.h 1.2 88/02/08 SMI
  *	from: @(#)pmap_rmt.h	2.1 88/07/29 4.0 RPCSRC
diff --git a/include/rpc/raw.h b/include/rpc/raw.h
index 0fea4ad087a..a5c7d9352bc 100644
--- a/include/rpc/raw.h
+++ b/include/rpc/raw.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: raw.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/include/rpc/rpc.h b/include/rpc/rpc.h
index 725b542a8dd..e7a3dc8df1c 100644
--- a/include/rpc/rpc.h
+++ b/include/rpc/rpc.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc.h,v 1.13 2000/06/02 22:57:56 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
diff --git a/include/rpc/rpc_com.h b/include/rpc/rpc_com.h
index 122fe7e4bac..0996efc02bf 100644
--- a/include/rpc/rpc_com.h
+++ b/include/rpc/rpc_com.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 christos Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/include/rpc/rpc_msg.h b/include/rpc/rpc_msg.h
index 354b3414767..6e8d0745a0b 100644
--- a/include/rpc/rpc_msg.h
+++ b/include/rpc/rpc_msg.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_msg.h,v 1.11 2000/06/02 22:57:56 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
diff --git a/include/rpc/rpcb_clnt.h b/include/rpc/rpcb_clnt.h
index fa64a853f90..455278723ac 100644
--- a/include/rpc/rpcb_clnt.h
+++ b/include/rpc/rpcb_clnt.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: rpcb_clnt.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x
index c5748413cdf..a34bcc12502 100644
--- a/include/rpc/rpcb_prot.x
+++ b/include/rpc/rpcb_prot.x
@@ -1,32 +1,31 @@
-%/*
+%/*-
 % * $FreeBSD$
 % *
-% * 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.
+% * Copyright (c) 2009, Sun Microsystems, Inc.
+% * All rights reserved.
 % *
-% * 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.
+% * 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 Sun Microsystems, Inc. nor the names of its
+% *   contributors may be used to endorse or promote products derived
+% *   from this software without specific prior written permission.
 % *
-% * 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
+% * 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.
 % */
 %/*
 % * Copyright (c) 1988 by Sun Microsystems, Inc.
diff --git a/include/rpc/rpcent.h b/include/rpc/rpcent.h
index 876b488b2b1..405ba67804f 100644
--- a/include/rpc/rpcent.h
+++ b/include/rpc/rpcent.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: rpcent.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/include/rpc/svc.h b/include/rpc/svc.h
index 4a3833c7cad..f5652fcb164 100644
--- a/include/rpc/svc.h
+++ b/include/rpc/svc.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc.h,v 1.17 2000/06/02 22:57:56 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)svc.h 1.35 88/12/17 SMI
  *	from: @(#)svc.h      1.27    94/04/25 SMI
diff --git a/include/rpc/svc_auth.h b/include/rpc/svc_auth.h
index 41fc82b01f2..87b8efe74d9 100644
--- a/include/rpc/svc_auth.h
+++ b/include/rpc/svc_auth.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_auth.h,v 1.8 2000/06/02 22:57:57 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	@(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
diff --git a/include/rpc/svc_dg.h b/include/rpc/svc_dg.h
index e0d1f89a61c..313176ea8a6 100644
--- a/include/rpc/svc_dg.h
+++ b/include/rpc/svc_dg.h
@@ -1,35 +1,33 @@
 /*	$NetBSD: svc_dg.h,v 1.1 2000/06/02 23:11:16 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
-
 /*
  * XXX - this file exists only so that the rpcbind code can pull it in.
  * This should go away. It should only be include by svc_dg.c and
diff --git a/include/rpc/svc_soc.h b/include/rpc/svc_soc.h
index 6c528dbc95c..311c8322f83 100644
--- a/include/rpc/svc_soc.h
+++ b/include/rpc/svc_soc.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: svc_soc.h,v 1.1 2000/06/02 22:57:57 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/include/rpc/xdr.h b/include/rpc/xdr.h
index ada5c5bdb1b..9456f70c19d 100644
--- a/include/rpc/xdr.h
+++ b/include/rpc/xdr.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
+ * 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 Sun Microsystems, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * 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
+ * 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.
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x
index 78b0a157548..548d618755d 100644
--- a/include/rpcsvc/bootparam_prot.x
+++ b/include/rpcsvc/bootparam_prot.x
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/include/rpcsvc/key_prot.x b/include/rpcsvc/key_prot.x
index 7800a0781ec..1fccd957941 100644
--- a/include/rpcsvc/key_prot.x
+++ b/include/rpcsvc/key_prot.x
@@ -1,30 +1,32 @@
-%/*
-% * 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.
+%/*-
+% * Copyright (c) 2010, Oracle America, Inc.
 % *
-% * 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.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
 % *
-% * 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.
+% *     * 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 the "Oracle America, Inc." nor the names of its
+% *       contributors may be used to endorse or promote products derived
+% *       from this software without specific prior written permission.
 % *
-% * 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
+% *   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.
 % */
 /*
  * Key server protocol definition
diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x
index f820bdc1fc8..e0dfa82b199 100644
--- a/include/rpcsvc/klm_prot.x
+++ b/include/rpcsvc/klm_prot.x
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x
index b3b21f70ec7..9ebee835b27 100644
--- a/include/rpcsvc/mount.x
+++ b/include/rpcsvc/mount.x
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x
index 70b24fe2429..17791b6a18b 100644
--- a/include/rpcsvc/nfs_prot.x
+++ b/include/rpcsvc/nfs_prot.x
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 #ifndef RPC_HDR
diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x
index 758fcb733cc..7a12c85c35d 100644
--- a/include/rpcsvc/nis.x
+++ b/include/rpcsvc/nis.x
@@ -1,31 +1,32 @@
-%/*
-% * 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 or with the express written consent of
-% * Sun Microsystems, Inc.
+%/*-
+% * Copyright (c) 2010, Oracle America, Inc.
 % *
-% * 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.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
 % *
-% * 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.
+% *     * 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 the "Oracle America, Inc." nor the names of its
+% *       contributors may be used to endorse or promote products derived
+% *       from this software without specific prior written permission.
 % *
-% * 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
+% *   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.
 % */
 
 #ifndef RPC_HDR
diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x
index 3146ec30673..74a555b4f16 100644
--- a/include/rpcsvc/nis_callback.x
+++ b/include/rpcsvc/nis_callback.x
@@ -1,31 +1,32 @@
-%/*
-% * 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 or with the express written consent of
-% * Sun Microsystems, Inc.
+%/*-
+% * Copyright (c) 2010, Oracle America, Inc.
 % *
-% * 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.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
 % *
-% * 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.
+% *     * 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 the "Oracle America, Inc." nor the names of its
+% *       contributors may be used to endorse or promote products derived
+% *       from this software without specific prior written permission.
 % *
-% * 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
+% *   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.
 % */
 
 /*
diff --git a/include/rpcsvc/nis_object.x b/include/rpcsvc/nis_object.x
index 3156724f1ba..f63cf938571 100644
--- a/include/rpcsvc/nis_object.x
+++ b/include/rpcsvc/nis_object.x
@@ -1,31 +1,32 @@
-%/*
-% * 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 or with the express written consent of
-% * Sun Microsystems, Inc.
+%/*-
+% * Copyright (c) 2010, Oracle America, Inc.
 % *
-% * 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.
+% * Redistribution and use in source and binary forms, with or without
+% * modification, are permitted provided that the following conditions are
+% * met:
 % *
-% * 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.
+% *     * 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 the "Oracle America, Inc." nor the names of its
+% *       contributors may be used to endorse or promote products derived
+% *       from this software without specific prior written permission.
 % *
-% * 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
+% *   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.
 % */
 
 /*
@@ -35,6 +36,7 @@
  *	All Rights Reserved.
  */
 
+/* $FreeBSD$ */
 /* From: %#pragma ident	"@(#)nis_object.x	1.10	94/05/03 SMI" */
 
 #if RPC_HDR
diff --git a/include/rpcsvc/nis_tags.h b/include/rpcsvc/nis_tags.h
index 0eaee6d4422..7ee630e6db2 100644
--- a/include/rpcsvc/nis_tags.h
+++ b/include/rpcsvc/nis_tags.h
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
@@ -41,6 +43,7 @@
 #ifndef	_RPCSVC_NIS_TAGS_H
 #define	_RPCSVC_NIS_TAGS_H
 
+/* $FreeBSD$ */
 /* From: #pragma ident	"@(#)nis_tags.h	1.10	94/05/03 SMI" */
 /* from file: zns_tags.h	1.7 Copyright (c) 1990 Sun Microsystems */
 
diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x
index eabc4d5928e..4d4bda65f28 100644
--- a/include/rpcsvc/rex.x
+++ b/include/rpcsvc/rex.x
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x
index c554827a079..421a515ac72 100644
--- a/include/rpcsvc/rnusers.x
+++ b/include/rpcsvc/rnusers.x
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x
index 3f524ee4c81..a34456082af 100644
--- a/include/rpcsvc/rstat.x
+++ b/include/rpcsvc/rstat.x
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x
index c66287d7323..42a00915e8f 100644
--- a/include/rpcsvc/sm_inter.x
+++ b/include/rpcsvc/sm_inter.x
@@ -1,33 +1,35 @@
 /* @(#)sm_inter.x	2.2 88/08/01 4.0 RPCSRC */
 /* @(#)sm_inter.x 1.7 87/06/24 Copyr 1987 Sun Micro */
 
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x
index 0e7c44e92e7..b6a5b849a07 100644
--- a/include/rpcsvc/spray.x
+++ b/include/rpcsvc/spray.x
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x
index 212050fd7eb..62daee10f35 100644
--- a/include/rpcsvc/yp.x
+++ b/include/rpcsvc/yp.x
@@ -1,32 +1,34 @@
 /* @(#)yp.x	2.1 88/08/01 4.0 RPCSRC */
 
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x
index da0399d82db..1b39a632fa9 100644
--- a/include/rpcsvc/yppasswd.x
+++ b/include/rpcsvc/yppasswd.x
@@ -1,30 +1,32 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 
 /*
diff --git a/lib/Makefile b/lib/Makefile
index 9ac89450599..491225970bb 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -32,8 +32,13 @@
 
 SUBDIR_ORDERED=	${_csu} \
 	libc \
+	libc_nonshared \
 	libbsm \
 	libauditd \
+	libutil \
+	libpjdlog \
+	libnv \
+	${_libcapsicum} \
 	libcompiler_rt \
 	libcrypt \
 	libelf \
@@ -48,7 +53,6 @@ SUBDIR_ORDERED=	${_csu} \
 	librpcsvc \
 	libsbuf \
 	libtacplus \
-	libutil \
 	${_libypclnt} \
 	${_libcxxrt} \
 	${_libcplusplus}
@@ -68,6 +72,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libbz2 \
 	libcalendar \
 	libcam \
+	${_libcasper} \
 	libcompat \
 	libdevinfo \
 	libdevstat \
@@ -81,7 +86,6 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libgpib} \
 	${_libgssapi} \
 	${_librpcsec_gss} \
-	${_libiconv_compat} \
 	libipsec \
 	${_libipx} \
 	libjail \
@@ -95,6 +99,7 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	${_libnandfs} \
 	libnetbsd \
 	${_libngatm} \
+	libnv \
 	libopie \
 	libpam \
 	libpcap \
@@ -127,7 +132,8 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libyaml \
 	libz \
 	${_atf} \
-	${_clang}
+	${_clang} \
+	${_tests}
 
 .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
 _csu=csu/${MACHINE_ARCH}-elf
@@ -141,10 +147,6 @@ _csu=csu
 
 # NB: keep these sorted by MK_* knobs
 
-.if ${MK_ATF} != "no"
-_atf=		atf
-.endif
-
 .if ${MK_ATM} != "no"
 _libngatm=	libngatm
 .endif
@@ -158,6 +160,11 @@ _libsdp=	libsdp
 _libbsnmp=	libbsnmp
 .endif
 
+.if ${MK_CASPER} != "no"
+_libcapsicum=	libcapsicum
+_libcasper=	libcasper
+.endif
+
 .if ${MK_CLANG} != "no" && !defined(COMPAT_32BIT)
 _clang=		clang
 .endif
@@ -188,10 +195,6 @@ _libcxxrt=	libcxxrt
 _libcplusplus=	libc++
 .endif
 
-.if ${MK_LIBICONV_COMPAT} != "no"
-_libiconv_compat=	libiconv_compat
-.endif
-
 .if ${MK_LIBTHR} != "no"
 _libthr=	libthr
 .endif
@@ -258,6 +261,11 @@ _libsmutil=	libsmutil
 _libtelnet=	libtelnet
 .endif
 
+.if ${MK_TESTS} != "no"
+_atf=		atf
+_tests=		tests
+.endif
+
 .if ${MK_UNBOUND} != "no"
 _libunbound=	libunbound
 .endif
diff --git a/lib/atf/Makefile b/lib/atf/Makefile
index 0da9aa8a46a..a191f0da4d4 100644
--- a/lib/atf/Makefile
+++ b/lib/atf/Makefile
@@ -27,9 +27,13 @@
 
 .include <bsd.own.mk>
 
-SUBDIR=		\
-		libatf-c \
-		libatf-c++
+SUBDIR=		libatf-c \
+		libatf-c++ \
+                ${_tests}
+
+.if ${MK_TESTS} != "no"
+_tests= 	tests
+.endif
 
 .ORDER: ${SUBDIR}
 
diff --git a/lib/atf/Makefile.inc b/lib/atf/Makefile.inc
index 937187add1d..15e7517f0bc 100644
--- a/lib/atf/Makefile.inc
+++ b/lib/atf/Makefile.inc
@@ -25,8 +25,6 @@
 #
 # $FreeBSD$
 
-ATF=		${.CURDIR}/../../../contrib/atf
-
 _CFLAGS:=	${CFLAGS}
 _CPPFLAGS:=	${CPPFLAGS}
 _CXXFLAGS:=	${CXXFLAGS}
diff --git a/lib/atf/libatf-c++/Makefile b/lib/atf/libatf-c++/Makefile
index 37d6073dbb3..f1d9dcfb111 100644
--- a/lib/atf/libatf-c++/Makefile
+++ b/lib/atf/libatf-c++/Makefile
@@ -36,6 +36,7 @@ LDADD=		-latf-c
 
 LDFLAGS+=	-L${.OBJDIR}/../libatf-c
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c++
 .PATH:		${ATF}/atf-c++/detail
@@ -58,12 +59,14 @@ SRCS=		application.cpp \
 		process.cpp \
 		tests.cpp \
 		text.cpp \
-		ui.cpp
+		ui.cpp \
+		utils.cpp
 
 INCS=		build.hpp \
 		check.hpp \
 		config.hpp \
 		macros.hpp \
+		noncopyable.hpp \
 		tests.hpp \
 		utils.hpp
 INCSDIR=	${INCLUDEDIR}/atf-c++
@@ -73,4 +76,8 @@ INCSDIR_atf-c++.hpp= ${INCLUDEDIR}
 
 MAN=		atf-c++-api.3
 
+.if ${MK_TESTS} != "no"
+SUBDIR=		tests
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/atf/libatf-c++/Makefile.inc b/lib/atf/libatf-c++/Makefile.inc
new file mode 100644
index 00000000000..265f86d1ed5
--- /dev/null
+++ b/lib/atf/libatf-c++/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile
new file mode 100644
index 00000000000..db10fce8dce
--- /dev/null
+++ b/lib/atf/libatf-c++/tests/Makefile
@@ -0,0 +1,47 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c++
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-c++
+.PATH:		${ATF}/atf-c++/detail
+
+CFLAGS+=	-I${ATF}
+
+FILESDIR=	${TESTSDIR}
+FILES=		macros_hpp_test.cpp
+FILES+=		unused_test.cpp
+
+# Tests in atf-c++.
+.for _T in	atf_c++_test \
+		build_test \
+		check_test \
+		config_test \
+		macros_test \
+		tests_test \
+		utils_test
+ATF_TESTS_CXX+=	${_T}
+SRCS.${_T}=	${_T}.cpp test_helpers.cpp
+.endfor
+
+ATF_TESTS_SH=	pkg_config_test
+
+# Tests in atf-c++/detail.
+
+.for _T in	application_test \
+		env_test \
+		exceptions_test \
+		expand_test \
+		fs_test \
+		parser_test \
+		process_test \
+		sanity_test \
+		text_test \
+		ui_test
+ATF_TESTS_CXX+=	${_T}
+SRCS.${_T}=	${_T}.cpp test_helpers.cpp
+.endfor
+
+.include <atf.test.mk>
diff --git a/lib/atf/libatf-c/Makefile b/lib/atf/libatf-c/Makefile
index 26fba5c35c8..b197958c327 100644
--- a/lib/atf/libatf-c/Makefile
+++ b/lib/atf/libatf-c/Makefile
@@ -30,6 +30,7 @@
 LIB=		atf-c
 SHLIB_MAJOR=	1
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}
 .PATH:		${ATF}/atf-c
 .PATH:		${ATF}/atf-c/detail
@@ -73,4 +74,8 @@ INCSDIR_atf-c.h= ${INCLUDEDIR}
 
 MAN=		atf-c-api.3
 
+.if ${MK_TESTS} != "no"
+SUBDIR=		tests
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/atf/libatf-c/Makefile.inc b/lib/atf/libatf-c/Makefile.inc
new file mode 100644
index 00000000000..265f86d1ed5
--- /dev/null
+++ b/lib/atf/libatf-c/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile
new file mode 100644
index 00000000000..0d13d9ce50d
--- /dev/null
+++ b/lib/atf/libatf-c/tests/Makefile
@@ -0,0 +1,61 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf/libatf-c
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-c
+.PATH:		${ATF}/atf-c/detail
+
+CFLAGS+=	-I${ATF}
+
+.if ${COMPILER_TYPE} == "clang"
+# macros_test.c contains a double 'const const' which will be gone with
+# the import of atf-0.18.
+# TODO(jmmv): Remove this workaround once we do that update.
+CFLAGS+=	-Wno-duplicate-decl-specifier
+.endif
+
+FILESDIR=	${TESTSDIR}
+FILES=		macros_h_test.c
+FILES+=		unused_test.c
+
+# Tests in atf-c.
+
+.for _T in	atf_c_test \
+		build_test \
+		check_test \
+		config_test \
+		error_test \
+		macros_test \
+		tc_test \
+		tp_test \
+		utils_test
+ATF_TESTS_C+=	${_T}
+SRCS.${_T}=	${_T}.c test_helpers.c
+.endfor
+
+ATF_TESTS_SH=	pkg_config_test
+
+# Tests in atf-c/detail.
+
+.for _T in	dynstr_test \
+		env_test \
+		fs_test \
+		list_test \
+		map_test \
+		process_test \
+		sanity_test \
+		text_test \
+		user_test
+ATF_TESTS_C+=	${_T}
+SRCS.${_T}=	${_T}.c test_helpers.c
+.endfor
+
+PROGS+=		process_helpers
+SRCS.process_helpers=	process_helpers.c
+MAN.process_helpers=	# defined
+BINDIR.process_helpers=	${TESTSDIR}
+
+.include <atf.test.mk>
diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile
new file mode 100644
index 00000000000..7bc96c94b03
--- /dev/null
+++ b/lib/atf/tests/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+SUBDIR=		test-programs
+
+.include <bsd.test.mk>
diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile
new file mode 100644
index 00000000000..8ff33332b6f
--- /dev/null
+++ b/lib/atf/tests/test-programs/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/lib/atf/test-programs
+KYUAFILE=	yes
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/test-programs
+
+CFLAGS+=	-I${ATF}
+
+ATF_TESTS_C=		c_helpers
+
+ATF_TESTS_CXX=		cpp_helpers
+SRCS.cpp_helpers=	cpp_helpers.cpp
+
+ATF_TESTS_SH=		sh_helpers
+.for _T in config_test expect_test meta_data_test result_test srcdir_test
+ATF_TESTS_SH+=		${_T}
+ATF_TESTS_SH_SRC_${_T}=	common.sh ${_T}.sh
+.endfor
+
+.include <atf.test.mk>
diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 2cf1e5b8b86..e47b0a9e17d 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -27,8 +27,8 @@ TARGET_ABI=	gnueabi
 TARGET_ABI=	unknown
 .endif
 
-TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd10.0
-BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd10.0
+TARGET_TRIPLE?=	${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
+BUILD_TRIPLE?=	${BUILD_ARCH:C/amd64/x86_64/}-unknown-freebsd11.0
 CFLAGS+=	-DLLVM_DEFAULT_TARGET_TRIPLE=\"${TARGET_TRIPLE}\" \
 		-DLLVM_HOST_TRIPLE=\"${BUILD_TRIPLE}\" \
 		-DDEFAULT_SYSROOT=\"${TOOLS_PREFIX}\"
diff --git a/lib/clang/liblldbAPI/Makefile b/lib/clang/liblldbAPI/Makefile
index 275b26fa945..ed1b3b6ad8d 100644
--- a/lib/clang/liblldbAPI/Makefile
+++ b/lib/clang/liblldbAPI/Makefile
@@ -32,6 +32,7 @@ SRCS=	SBAddress.cpp \
 	SBListener.cpp \
 	SBModule.cpp \
 	SBModuleSpec.cpp \
+	SBPlatform.cpp \
 	SBProcess.cpp \
 	SBSection.cpp \
 	SBSourceManager.cpp \
diff --git a/lib/clang/liblldbCore/Makefile b/lib/clang/liblldbCore/Makefile
index 44575313a3e..f11aa58b524 100644
--- a/lib/clang/liblldbCore/Makefile
+++ b/lib/clang/liblldbCore/Makefile
@@ -55,6 +55,7 @@ SRCS=	Address.cpp \
 	StreamAsynchronousIO.cpp \
 	StreamCallback.cpp \
 	StreamFile.cpp \
+	StreamGDBRemote.cpp \
 	StreamString.cpp \
 	StringList.cpp \
 	Timer.cpp \
diff --git a/lib/clang/liblldbDataFormatters/Makefile b/lib/clang/liblldbDataFormatters/Makefile
index ca8a6c89155..b224215ba90 100644
--- a/lib/clang/liblldbDataFormatters/Makefile
+++ b/lib/clang/liblldbDataFormatters/Makefile
@@ -15,6 +15,7 @@ SRCS=	CF.cpp \
 	LibCxx.cpp \
 	LibCxxList.cpp \
 	LibCxxMap.cpp \
+	LibCxxUnorderedMap.cpp \
 	LibStdcpp.cpp \
 	NSArray.cpp \
 	NSDictionary.cpp \
@@ -23,7 +24,8 @@ SRCS=	CF.cpp \
 	TypeCategoryMap.cpp \
 	TypeFormat.cpp \
 	TypeSummary.cpp \
-	TypeSynthetic.cpp
+	TypeSynthetic.cpp \
+	ValueObjectPrinter.cpp
 
 TGHDRS=	DiagnosticCommonKinds \
 	DeclNodes \
diff --git a/lib/clang/liblldbHostCommon/Makefile b/lib/clang/liblldbHostCommon/Makefile
index e787cbcc3db..e2a01cdeac1 100644
--- a/lib/clang/liblldbHostCommon/Makefile
+++ b/lib/clang/liblldbHostCommon/Makefile
@@ -11,6 +11,8 @@ SRCS=	Condition.cpp \
 	FileSpec.cpp \
 	Host.cpp \
 	Mutex.cpp \
+	OptionParser.cpp \
+	ProcessRunLock.cpp \
 	SocketAddress.cpp \
 	Symbols.cpp \
 	Terminal.cpp \
diff --git a/lib/clang/liblldbPluginProcessElfCore/Makefile b/lib/clang/liblldbPluginProcessElfCore/Makefile
index 1d5dec38ec8..30198b591fb 100644
--- a/lib/clang/liblldbPluginProcessElfCore/Makefile
+++ b/lib/clang/liblldbPluginProcessElfCore/Makefile
@@ -10,8 +10,8 @@ CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Uti
 SRCDIR=	tools/lldb/source/Plugins/Process/elf-core
 SRCS=	ProcessElfCore.cpp \
 	ThreadElfCore.cpp \
-	RegisterContextCoreLinux_x86_64.cpp \
-	RegisterContextCoreFreeBSD_x86_64.cpp
+	RegisterContextPOSIXCore_mips64.cpp \
+	RegisterContextPOSIXCore_x86_64.cpp
 
 TGHDRS=	DiagnosticCommonKinds \
 	DeclNodes \
diff --git a/lib/clang/liblldbPluginProcessFreeBSD/Makefile b/lib/clang/liblldbPluginProcessFreeBSD/Makefile
index 80e668eccef..2002b7d2abf 100644
--- a/lib/clang/liblldbPluginProcessFreeBSD/Makefile
+++ b/lib/clang/liblldbPluginProcessFreeBSD/Makefile
@@ -9,7 +9,8 @@ CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/Fre
 CFLAGS+=-I${.CURDIR}/../../../contrib/llvm/tools/lldb/source/Plugins/Process/POSIX
 
 SRCDIR=	tools/lldb/source/Plugins/Process/FreeBSD
-SRCS=	ProcessFreeBSD.cpp \
+SRCS=	FreeBSDThread.cpp \
+	ProcessFreeBSD.cpp \
 	ProcessMonitor.cpp
 
 TGHDRS=	DiagnosticCommonKinds \
diff --git a/lib/clang/liblldbPluginProcessPOSIX/Makefile b/lib/clang/liblldbPluginProcessPOSIX/Makefile
index cee18c577b9..f681fd34326 100644
--- a/lib/clang/liblldbPluginProcessPOSIX/Makefile
+++ b/lib/clang/liblldbPluginProcessPOSIX/Makefile
@@ -15,10 +15,15 @@ SRCS=	POSIXStopInfo.cpp \
 	ProcessMessage.cpp \
 	ProcessPOSIX.cpp \
 	ProcessPOSIXLog.cpp \
+	RegisterContextFreeBSD_i386.cpp \
+	RegisterContextFreeBSD_mips64.cpp \
 	RegisterContextFreeBSD_x86_64.cpp \
-	RegisterContext_i386.cpp \
+	RegisterContextLinux_i386.cpp \
 	RegisterContextLinux_x86_64.cpp \
-	RegisterContext_x86_64.cpp
+	RegisterContextPOSIXProcessMonitor_mips64.cpp \
+	RegisterContextPOSIXProcessMonitor_x86.cpp \
+	RegisterContextPOSIX_mips64.cpp \
+	RegisterContextPOSIX_x86.cpp
 
 TGHDRS=	DiagnosticCommonKinds \
 	DeclNodes \
diff --git a/lib/clang/liblldbPluginProcessUtility/Makefile b/lib/clang/liblldbPluginProcessUtility/Makefile
index d0b221f4f87..14592546817 100644
--- a/lib/clang/liblldbPluginProcessUtility/Makefile
+++ b/lib/clang/liblldbPluginProcessUtility/Makefile
@@ -6,11 +6,14 @@ LIB=	lldbPluginProcessUtility
 
 SRCDIR=	tools/lldb/source/Plugins/Process/Utility
 SRCS=	DynamicRegisterInfo.cpp \
+	HistoryThread.cpp \
+	HistoryUnwind.cpp \
 	InferiorCallPOSIX.cpp \
 	RegisterContextDarwin_arm.cpp \
 	RegisterContextDarwin_i386.cpp \
 	RegisterContextDarwin_x86_64.cpp \
 	RegisterContextDummy.cpp \
+	RegisterContextHistory.cpp \
 	RegisterContextLLDB.cpp \
 	RegisterContextMach_arm.cpp \
 	RegisterContextMach_i386.cpp \
diff --git a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
index 92845e4153a..ac23199b67c 100644
--- a/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
+++ b/lib/clang/liblldbPluginSymbolFileDWARF/Makefile
@@ -7,6 +7,7 @@ LIB=	lldbPluginSymbolFileDWARF
 SRCDIR=	tools/lldb/source/Plugins/SymbolFile/DWARF
 SRCS=	DWARFAbbreviationDeclaration.cpp \
 	DWARFCompileUnit.cpp \
+	DWARFDataExtractor.cpp \
 	DWARFDebugAbbrev.cpp \
 	DWARFDebugAranges.cpp \
 	DWARFDebugArangeSet.cpp \
diff --git a/lib/clang/liblldbTarget/Makefile b/lib/clang/liblldbTarget/Makefile
index c6384be78a4..890663e1402 100644
--- a/lib/clang/liblldbTarget/Makefile
+++ b/lib/clang/liblldbTarget/Makefile
@@ -23,6 +23,7 @@ SRCS=	ABI.cpp \
 	StackFrameList.cpp \
 	StackID.cpp \
 	StopInfo.cpp \
+	SystemRuntime.cpp \
 	Target.cpp \
 	TargetList.cpp \
 	Thread.cpp \
diff --git a/lib/clang/liblldbUtility/Makefile b/lib/clang/liblldbUtility/Makefile
index 9c944e43de2..e5723b2fdad 100644
--- a/lib/clang/liblldbUtility/Makefile
+++ b/lib/clang/liblldbUtility/Makefile
@@ -9,7 +9,6 @@ SRCS=	ARM_DWARF_Registers.cpp \
 	KQueue.cpp \
 	PseudoTerminal.cpp \
 	Range.cpp \
-	RefCounter.cpp \
 	SharingPtr.cpp \
 	StringExtractor.cpp \
 	StringExtractorGDBRemote.cpp \
diff --git a/lib/csu/arm/crt1.c b/lib/csu/arm/crt1.c
index d9f8a2d07a5..d2fbab35c34 100644
--- a/lib/csu/arm/crt1.c
+++ b/lib/csu/arm/crt1.c
@@ -123,7 +123,7 @@ static const struct {
 	char	desc[sizeof(MACHINE_ARCH)];
 } archtag __attribute__ ((section (NOTE_SECTION), aligned(4))) __used = {
 	.namesz = sizeof(NOTE_FREEBSD_VENDOR),
-	.descsz = sizeof(int32_t),
+	.descsz = sizeof(MACHINE_ARCH),
 	.type = ARCH_NOTETYPE,
 	.name = NOTE_FREEBSD_VENDOR,
 	.desc = MACHINE_ARCH
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index 2806cc7083e..04235a255f3 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -50,6 +50,9 @@ LDADD+= -lgcc
 LDADD+= -lssp_nonshared
 .endif
 
+# Extras that live in either libc.a or libc_nonshared.a
+LIBC_NONSHARED_SRCS=
+
 # Define (empty) variables so that make doesn't give substitution
 # errors if the included makefiles don't change these:
 MDSRCS=
@@ -114,6 +117,8 @@ CFLAGS+= -DNS_CACHING
 CFLAGS+=-D_FREEFALL_CONFIG
 .endif
 
+STATICOBJS+=${LIBC_NONSHARED_SRCS:S/.c$/.o/}
+
 VERSION_DEF=${.CURDIR}/Versions.def
 SYMBOL_MAPS=${SYM_MAPS}
 CFLAGS+= -DSYMBOL_VERSIONING
diff --git a/lib/libc/amd64/SYS.h b/lib/libc/amd64/SYS.h
index a2323839f46..3d9108e062a 100644
--- a/lib/libc/amd64/SYS.h
+++ b/lib/libc/amd64/SYS.h
@@ -36,20 +36,17 @@
 #include <sys/syscall.h>
 #include <machine/asm.h>
 
-#define	RSYSCALL(x)	ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(x);					\
-			.set CNAME(x),CNAME(__CONCAT(__sys_,x));	\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL;		\
+#define	RSYSCALL(name)	ENTRY(__sys_##name);				\
+			WEAK_REFERENCE(__sys_##name, name);		\
+			WEAK_REFERENCE(__sys_##name, _##name);		\
+			mov $SYS_##name,%eax; KERNCALL;			\
 			jb HIDENAME(cerror); ret;			\
-			END(__CONCAT(__sys_,x))
+			END(__sys_##name)
 
-#define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL;		\
+#define	PSEUDO(name)	ENTRY(__sys_##name);				\
+			WEAK_REFERENCE(__sys_##name, _##name);		\
+			mov $SYS_##name,%eax; KERNCALL;			\
 			jb HIDENAME(cerror); ret;			\
-			END(__CONCAT(__sys_,x))
+			END(__sys_##name)
 
-#define KERNCALL	movq %rcx, %r10; syscall
+#define	KERNCALL	movq %rcx, %r10; syscall
diff --git a/lib/libc/amd64/gen/_setjmp.S b/lib/libc/amd64/gen/_setjmp.S
index 9035632b377..57079a1d4d8 100644
--- a/lib/libc/amd64/gen/_setjmp.S
+++ b/lib/libc/amd64/gen/_setjmp.S
@@ -63,8 +63,7 @@ ENTRY(_setjmp)
 	ret
 END(_setjmp)
 
-	.weak	CNAME(_longjmp)
-	.set	CNAME(_longjmp),CNAME(___longjmp)
+	WEAK_REFERENCE(___longjmp, _longjmp)
 ENTRY(___longjmp)
 	movq	%rdi,%rdx
 	/* Restore the mxcsr, but leave exception flags intact. */
diff --git a/lib/libc/amd64/gen/setjmp.S b/lib/libc/amd64/gen/setjmp.S
index 47772be88b7..c26f52f5b70 100644
--- a/lib/libc/amd64/gen/setjmp.S
+++ b/lib/libc/amd64/gen/setjmp.S
@@ -73,8 +73,7 @@ ENTRY(setjmp)
 	ret
 END(setjmp)
 
-	.weak CNAME(longjmp)
-	.set CNAME(longjmp),CNAME(__longjmp)
+	WEAK_REFERENCE(__longjmp, longjmp)
 ENTRY(__longjmp)
 	pushq	%rdi
 	pushq	%rsi
diff --git a/lib/libc/amd64/gen/sigsetjmp.S b/lib/libc/amd64/gen/sigsetjmp.S
index ef90bc6aa72..02b154ce5fa 100644
--- a/lib/libc/amd64/gen/sigsetjmp.S
+++ b/lib/libc/amd64/gen/sigsetjmp.S
@@ -80,8 +80,7 @@ ENTRY(sigsetjmp)
 	ret
 END(sigsetjmp)
 
-	.weak CNAME(siglongjmp)
-	.set CNAME(siglongjmp),CNAME(__siglongjmp)
+	WEAK_REFERENCE(__siglongjmp, siglongjmp)
 ENTRY(__siglongjmp)
 	cmpl	$0,88(%rdi)
 	jz	2f
diff --git a/lib/libc/amd64/sys/getcontext.S b/lib/libc/amd64/sys/getcontext.S
index 112879687da..b11e65caf58 100644
--- a/lib/libc/amd64/sys/getcontext.S
+++ b/lib/libc/amd64/sys/getcontext.S
@@ -34,10 +34,8 @@ __FBSDID("$FreeBSD$");
  * Otherwise, the setcontext() syscall will return here and we'll
  * pop off the return address and go to the *setcontext* call.
  */
-	.weak	_getcontext
-	.set	_getcontext,__sys_getcontext
-	.weak	getcontext
-	.set	getcontext,__sys_getcontext
+	WEAK_REFERENCE(__sys_getcontext, _getcontext)
+	WEAK_REFERENCE(__sys_getcontext, getcontext)
 ENTRY(__sys_getcontext)
 	movq	(%rsp),%rsi	/* save getcontext return address */
 	mov	$SYS_getcontext,%rax
diff --git a/lib/libc/amd64/sys/pipe.S b/lib/libc/amd64/sys/pipe.S
index 8d089db2639..806c9ae2d9e 100644
--- a/lib/libc/amd64/sys/pipe.S
+++ b/lib/libc/amd64/sys/pipe.S
@@ -38,10 +38,8 @@ __FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
-	.weak	_pipe
-	.set	_pipe,__sys_pipe
-	.weak	pipe
-	.set	pipe,__sys_pipe
+	WEAK_REFERENCE(__sys_pipe, _pipe)
+	WEAK_REFERENCE(__sys_pipe, pipe)
 ENTRY(__sys_pipe)
 	mov	$SYS_pipe,%rax
 	KERNCALL
diff --git a/lib/libc/amd64/sys/reboot.S b/lib/libc/amd64/sys/reboot.S
index fd04ef4b518..b9ad1c644b4 100644
--- a/lib/libc/amd64/sys/reboot.S
+++ b/lib/libc/amd64/sys/reboot.S
@@ -38,10 +38,8 @@ __FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
-	.weak	_reboot
-	.set	_reboot,__sys_reboot
-	.weak	reboot
-	.set	reboot,__sys_reboot
+	WEAK_REFERENCE(__sys_reboot, _reboot)
+	WEAK_REFERENCE(__sys_reboot, reboot)
 ENTRY(__sys_reboot)
 	mov	$SYS_reboot,%rax
 	KERNCALL
diff --git a/lib/libc/amd64/sys/setlogin.S b/lib/libc/amd64/sys/setlogin.S
index 73b53641ad7..a0d127de85c 100644
--- a/lib/libc/amd64/sys/setlogin.S
+++ b/lib/libc/amd64/sys/setlogin.S
@@ -40,10 +40,8 @@ __FBSDID("$FreeBSD$");
 
 .globl	CNAME(_logname_valid)		/* in _getlogin() */
 
-	.weak	_setlogin
-	.set	_setlogin,__sys_setlogin
-	.weak	setlogin
-	.set	setlogin,__sys_setlogin
+	WEAK_REFERENCE(__sys_setlogin, _setlogin)
+	WEAK_REFERENCE(__sys_setlogin, setlogin)
 ENTRY(__sys_setlogin)
 	mov	$SYS_setlogin,%rax
 	KERNCALL
diff --git a/lib/libc/amd64/sys/vfork.S b/lib/libc/amd64/sys/vfork.S
index 2afba5830d3..62dc71e83f3 100644
--- a/lib/libc/amd64/sys/vfork.S
+++ b/lib/libc/amd64/sys/vfork.S
@@ -38,10 +38,8 @@ __FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
-	.weak	_vfork
-	.set	_vfork,__sys_vfork
-	.weak	vfork
-	.set	vfork,__sys_vfork
+	WEAK_REFERENCE(__sys_vfork, _vfork)
+	WEAK_REFERENCE(__sys_vfork, vfork)
 ENTRY(__sys_vfork)
 	popq	%rsi		/* fetch return address (%rsi preserved) */
 	mov	$SYS_vfork,%rax
diff --git a/lib/libc/capability/Makefile.inc b/lib/libc/capability/Makefile.inc
index 934fc8b9176..85be56ab8b9 100644
--- a/lib/libc/capability/Makefile.inc
+++ b/lib/libc/capability/Makefile.inc
@@ -1,19 +1,18 @@
 # $FreeBSD$
 
 # capability sources
-.PATH: ${.CURDIR}/../../sys/kern
+.PATH: ${.CURDIR}/../../sys/kern ${.CURDIR}/capability
 
 SRCS+=	subr_capability.c
 
 SYM_MAPS+=	${.CURDIR}/capability/Symbol.map
 
-#MAN+=	cap_rights_init.3
-
-#MLINKS+=cap_rights_init.3 cap_rights_set.3
-#MLINKS+=cap_rights_init.3 cap_rights_clear.3
-#MLINKS+=cap_rights_init.3 cap_rights_is_set.3
-#MLINKS+=cap_rights_init.3 cap_rights_is_valid.3
-#MLINKS+=cap_rights_init.3 cap_rights_merge.3
-#MLINKS+=cap_rights_init.3 cap_rights_remove.3
-#MLINKS+=cap_rights_init.3 cap_rights_contains.3
+MAN+=	cap_rights_init.3
 
+MLINKS+=cap_rights_init.3 cap_rights_set.3
+MLINKS+=cap_rights_init.3 cap_rights_clear.3
+MLINKS+=cap_rights_init.3 cap_rights_is_set.3
+MLINKS+=cap_rights_init.3 cap_rights_is_valid.3
+MLINKS+=cap_rights_init.3 cap_rights_merge.3
+MLINKS+=cap_rights_init.3 cap_rights_remove.3
+MLINKS+=cap_rights_init.3 cap_rights_contains.3
diff --git a/lib/libc/capability/cap_rights_init.3 b/lib/libc/capability/cap_rights_init.3
new file mode 100644
index 00000000000..458e9d30f1c
--- /dev/null
+++ b/lib/libc/capability/cap_rights_init.3
@@ -0,0 +1,241 @@
+.\"
+.\" Copyright (c) 2013 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written by Pawel Jakub Dawidek 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$
+.\"
+.Dd September 23, 2013
+.Dt CAP_RIGHTS_INIT 3
+.Os
+.Sh NAME
+.Nm cap_rights_init ,
+.Nm cap_rights_set ,
+.Nm cap_rights_clear ,
+.Nm cap_rights_is_set ,
+.Nm cap_rights_is_valid ,
+.Nm cap_rights_merge ,
+.Nm cap_rights_remove ,
+.Nm cap_rights_contains
+.Nd manage cap_rights_t structure
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/capability.h
+.Ft cap_rights_t *
+.Fn cap_rights_init "cap_rights_t *rights" "..."
+.Ft cap_rights_t *
+.Fn cap_rights_set "cap_rights_t *rights" "..."
+.Ft cap_rights_t *
+.Fn cap_rights_clear "cap_rights_t *rights" "..."
+.Ft bool
+.Fn cap_rights_is_set "const cap_rights_t *rights" "..."
+.Ft bool
+.Fn cap_rights_is_valid "const cap_rights_t *rights"
+.Ft cap_rights_t *
+.Fn cap_rights_merge "cap_rights_t *dst" "const cap_rights_t *src"
+.Ft cap_rights_t *
+.Fn cap_rights_remove "cap_rights_t *dst" "const cap_rights_t *src"
+.Ft bool
+.Fn cap_rights_contains "const cap_rights_t *big" "const cap_rights_t *little"
+.Sh DESCRIPTION
+The functions documented here allow to manage the
+.Vt cap_rights_t
+structure.
+.Pp
+Capability rights should be separated with comma when passed to the
+.Fn cap_rights_init ,
+.Fn cap_rights_set ,
+.Fn cap_rights_clear
+and
+.Fn cap_rights_is_set
+functions.
+For example:
+.Bd -literal
+cap_rights_set(&rights, CAP_READ, CAP_WRITE, CAP_FSTAT, CAP_SEEK);
+.Ed
+.Pp
+The complete list of the capability rights can be found in the
+.Xr rights 4
+manual page.
+.Pp
+The
+.Fn cap_rights_init
+function initialize provided
+.Vt cap_rights_t
+structure.
+Only properly initialized structure can be passed to the remaining functions.
+For convenience the structure can be filled with capability rights instead of
+calling the
+.Fn cap_rights_set
+function later.
+For even more convenience pointer to the given structure is returned, so it can
+be directly passed to
+.Xr cap_rights_limit 2 :
+.Bd -literal
+cap_rights_t rights;
+
+if (cap_rights_limit(fd, cap_rights_init(&rights, CAP_READ, CAP_WRITE)) < 0)
+	err(1, "Unable to limit capability rights");
+.Ed
+.Pp
+The
+.Fn cap_rights_set
+function adds the given capability rights to the given
+.Vt cap_rights_t
+structure.
+.Pp
+The
+.Fn cap_rights_clear
+function removes the given capability rights from the given
+.Vt cap_rights_t
+structure.
+.Pp
+The
+.Fn cap_rights_is_set
+function checks if all the given capability rights are set for the given
+.Vt cap_rights_t
+structure.
+.Pp
+The
+.Fn cap_rights_is_valid
+function verifies if the given
+.Vt cap_rights_t
+structure is valid.
+.Pp
+The
+.Fn cap_rights_merge
+function merges all capability rights present in the
+.Fa src
+structure into the
+.Fa dst
+structure.
+.Pp
+The
+.Fn cap_rights_remove
+function removes all capability rights present in the
+.Fa src
+structure from the
+.Fa dst
+structure.
+.Pp
+The
+.Fn cap_rights_contains
+function checks if the
+.Fa big
+structure contains all capability rights present in the
+.Fa little
+structure.
+.Sh RETURN VALUES
+The functions never fail.
+In case an invalid capability right or an invalid
+.Vt cap_rights_t
+structure is given as an argument, the program will be aborted.
+.Pp
+The
+.Fn cap_rights_init ,
+.Fn cap_rights_set
+and
+.Fn cap_rights_clear
+functions return pointer to the
+.Vt cap_rights_t
+structure given in the
+.Fa rights
+argument.
+.Pp
+The
+.Fn cap_rights_merge
+and
+.Fn cap_rights_remove
+functions return pointer to the
+.Vt cap_rights_t
+structure given in the
+.Fa dst
+argument.
+.Pp
+The
+.Fn cap_rights_is_set
+returns
+.Va true
+if all the given capability rights are set in the
+.Fa rights
+argument.
+.Pp
+The
+.Fn cap_rights_is_valid
+function performs various checks to see if the given
+.Vt cap_rights_t
+structure is valid and returns
+.Va true
+if it is.
+.Pp
+The
+.Fn cap_rights_contains
+function returns
+.Va true
+if all capability rights set in the
+.Fa little
+structure are also present in the
+.Fa big
+structure.
+.Sh EXAMPLES
+The following example demonstrates how to prepare a
+.Vt cap_rights_t
+structure to be passed to the
+.Xr cap_rights_limit 2
+system call.
+.Bd -literal
+cap_rights_t rights;
+int fd;
+
+fd = open("/tmp/foo", O_RDWR);
+if (fd < 0)
+	err(1, "open() failed");
+
+cap_rights_init(&rights, CAP_FSTAT, CAP_READ);
+
+if (allow_write_and_seek)
+	cap_rights_set(&rights, CAP_WRITE, CAP_SEEK);
+
+if (dont_allow_seek)
+	cap_rights_clear(&rights, CAP_SEEK);
+
+if (cap_rights_limit(fd, &rights) < 0 && errno != ENOSYS)
+	err(1, "cap_rights_limit() failed");
+.Ed
+.Sh SEE ALSO
+.Xr cap_rights_limit 2 ,
+.Xr open 2 ,
+.Xr capsicum 4 ,
+.Xr rights 4
+.Sh HISTORY
+Support for capabilities and capabilities mode was developed as part of the
+.Tn TrustedBSD
+Project.
+.Sh AUTHORS
+This family of functions was created by
+.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc
index a88150c2035..7053d222e18 100644
--- a/lib/libc/gen/Makefile.inc
+++ b/lib/libc/gen/Makefile.inc
@@ -170,6 +170,7 @@ SYM_MAPS+=${.CURDIR}/gen/Symbol.map
 MAN+=	alarm.3 \
 	arc4random.3 \
 	basename.3 \
+	cap_rights_get.3 \
 	cap_sandboxed.3 \
 	check_utility_compat.3 \
 	clock.3 \
diff --git a/lib/libc/gen/cap_rights_get.3 b/lib/libc/gen/cap_rights_get.3
new file mode 100644
index 00000000000..78f0ba9bed5
--- /dev/null
+++ b/lib/libc/gen/cap_rights_get.3
@@ -0,0 +1,119 @@
+.\"
+.\" Copyright (c) 2013 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written by Pawel Jakub Dawidek 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$
+.\"
+.Dd September 23, 2013
+.Dt CAP_RIGHTS_GET 3
+.Os
+.Sh NAME
+.Nm cap_rights_get
+.Nd obtain capability rights
+.Sh LIBRARY
+.Lb libc
+.Sh SYNOPSIS
+.In sys/capability.h
+.Ft int
+.Fn cap_rights_get "int fd" "cap_rights_t *rights"
+.Sh DESCRIPTION
+The
+.Nm cap_rights_get
+function allows to obtain current capability rights for the given descriptor.
+The function will fill the
+.Fa rights
+argument with all capability rights if they were not limited or capability
+rights configured during the last successful call of
+.Xr cap_rights_limit 2
+on the given descriptor.
+.Pp
+The
+.Fa rights
+argument can be inspected using
+.Xr cap_rights_init 3
+family of functions.
+.Pp
+The complete list of the capability rights can be found in the
+.Xr rights 4
+manual page.
+.Sh RETURN VALUES
+.Rv -std
+.Sh EXAMPLES
+The following example demonstrates how to limit file descriptor capability
+rights and how to obtain them.
+.Bd -literal
+cap_rights_t setrights, getrights;
+int fd;
+
+memset(&setrights, 0, sizeof(setrights));
+memset(&getrights, 0, sizeof(getrights));
+
+fd = open("/tmp/foo", O_RDONLY);
+if (fd < 0)
+	err(1, "open() failed");
+
+cap_rights_init(&setrights, CAP_FSTAT, CAP_READ);
+if (cap_rights_limit(fd, &setrights) < 0 && errno != ENOSYS)
+	err(1, "cap_rights_limit() failed");
+
+if (cap_rights_get(fd, &getrights) < 0 && errno != ENOSYS)
+	err(1, "cap_rights_get() failed");
+
+assert(memcmp(&setrights, &getrights, sizeof(setrights)) == 0);
+.Ed
+.Sh ERRORS
+.Fn cap_rights_get
+succeeds unless:
+.Bl -tag -width Er
+.It Bq Er EBADF
+The
+.Fa fd
+argument is not a valid active descriptor.
+.It Bq Er EFAULT
+The
+.Fa rights
+argument points at an invalid address.
+.El
+.Sh SEE ALSO
+.Xr cap_rights_limit 2 ,
+.Xr cap_rights_init 3 ,
+.Xr errno 2 ,
+.Xr open 2 ,
+.Xr assert 3 ,
+.Xr err 3 ,
+.Xr memcmp 3 ,
+.Xr memset 3 ,
+.Xr capsicum 4 ,
+.Xr rights 4
+.Sh HISTORY
+Support for capabilities and capabilities mode was developed as part of the
+.Tn TrustedBSD
+Project.
+.Sh AUTHORS
+This function was created by
+.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+under sponsorship of the FreeBSD Foundation.
diff --git a/lib/libc/gen/getutxent.c b/lib/libc/gen/getutxent.c
index 20e8859f6cd..1679aa43d09 100644
--- a/lib/libc/gen/getutxent.c
+++ b/lib/libc/gen/getutxent.c
@@ -122,9 +122,20 @@ getfutxent(struct futx *fu)
 	if (udb == UTXDB_LOG) {
 		uint16_t len;
 
+retry:
 		if (fread(&len, sizeof(len), 1, uf) != 1)
 			return (-1);
 		len = be16toh(len);
+		if (len == 0) {
+			/*
+			 * XXX: Though zero-size records are valid in theory,
+			 * they can never occur in practice. Zero-size records
+			 * indicate file corruption. Seek one byte forward, to
+			 * see if we can find a record there.
+			 */
+			ungetc('\0', uf);
+			goto retry;
+		}
 		if (len > sizeof *fu) {
 			/* Forward compatibility. */
 			if (fread(fu, sizeof(*fu), 1, uf) != 1)
diff --git a/lib/libc/gen/popen.c b/lib/libc/gen/popen.c
index b0597c80783..e54bb5c668c 100644
--- a/lib/libc/gen/popen.c
+++ b/lib/libc/gen/popen.c
@@ -90,7 +90,7 @@ popen(command, type)
 		    (type[1] && (type[1] != 'e' || type[2])))
 			return (NULL);
 	}
-	if ((cloexec ? pipe2(pdes, O_CLOEXEC) : pipe(pdes)) < 0)
+	if (pipe2(pdes, O_CLOEXEC) < 0)
 		return (NULL);
 
 	if ((cur = malloc(sizeof(struct pid))) == NULL) {
@@ -123,29 +123,20 @@ popen(command, type)
 			 * the compiler is free to corrupt all the local
 			 * variables.
 			 */
-			if (!cloexec)
-				(void)_close(pdes[0]);
 			if (pdes[1] != STDOUT_FILENO) {
 				(void)_dup2(pdes[1], STDOUT_FILENO);
-				if (!cloexec)
-					(void)_close(pdes[1]);
 				if (twoway)
 					(void)_dup2(STDOUT_FILENO, STDIN_FILENO);
 			} else if (twoway && (pdes[1] != STDIN_FILENO)) {
 				(void)_dup2(pdes[1], STDIN_FILENO);
-				if (cloexec)
-					(void)_fcntl(pdes[1], F_SETFD, 0);
-			} else if (cloexec)
+				(void)_fcntl(pdes[1], F_SETFD, 0);
+			} else
 				(void)_fcntl(pdes[1], F_SETFD, 0);
 		} else {
 			if (pdes[0] != STDIN_FILENO) {
 				(void)_dup2(pdes[0], STDIN_FILENO);
-				if (!cloexec)
-					(void)_close(pdes[0]);
-			} else if (cloexec)
+			} else
 				(void)_fcntl(pdes[0], F_SETFD, 0);
-			if (!cloexec)
-				(void)_close(pdes[1]);
 		}
 		SLIST_FOREACH(p, &pidlist, next)
 			(void)_close(fileno(p->fp));
@@ -171,6 +162,14 @@ popen(command, type)
 	SLIST_INSERT_HEAD(&pidlist, cur, next);
 	THREAD_UNLOCK();
 
+	/*
+	 * To guard against undesired fd passing with concurrent calls,
+	 * only clear the close-on-exec flag after linking the file into
+	 * the list which will cause an explicit close.
+	 */
+	if (!cloexec)
+		(void)_fcntl(*type == 'r' ? pdes[0] : pdes[1], F_SETFD, 0);
+
 	return (iop);
 }
 
diff --git a/lib/libc/gen/syslog.c b/lib/libc/gen/syslog.c
index 6357761cad4..3a5cafec51c 100644
--- a/lib/libc/gen/syslog.c
+++ b/lib/libc/gen/syslog.c
@@ -341,9 +341,9 @@ connectlog(void)
 	struct sockaddr_un SyslogAddr;	/* AF_UNIX address of local logger */
 
 	if (LogFile == -1) {
-		if ((LogFile = _socket(AF_UNIX, SOCK_DGRAM, 0)) == -1)
+		if ((LogFile = _socket(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC,
+		    0)) == -1)
 			return;
-		(void)_fcntl(LogFile, F_SETFD, FD_CLOEXEC);
 	}
 	if (LogFile != -1 && status == NOCONN) {
 		SyslogAddr.sun_len = sizeof(SyslogAddr);
diff --git a/lib/libc/i386/SYS.h b/lib/libc/i386/SYS.h
index 355b117e947..9a4856a4d3e 100644
--- a/lib/libc/i386/SYS.h
+++ b/lib/libc/i386/SYS.h
@@ -36,22 +36,19 @@
 #include <sys/syscall.h>
 #include <machine/asm.h>
 
-#define	SYSCALL(x)	ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(x);					\
-			.set CNAME(x),CNAME(__CONCAT(__sys_,x));	\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL;		\
- 			jb HIDENAME(cerror)
+#define	SYSCALL(name)	ENTRY(__sys_##name);				\
+			WEAK_REFERENCE(__sys_##name, name);		\
+			WEAK_REFERENCE(__sys_##name, _##name);		\
+			mov $SYS_##name,%eax; KERNCALL;			\
+			jb HIDENAME(cerror)
 
-#define	RSYSCALL(x)	SYSCALL(x); ret; END(__CONCAT(__sys_,x))
+#define	RSYSCALL(name)	SYSCALL(name); ret; END(__sys_##name)
 
-#define	PSEUDO(x)	ENTRY(__CONCAT(__sys_,x));			\
-			.weak CNAME(__CONCAT(_,x));			\
-			.set CNAME(__CONCAT(_,x)),CNAME(__CONCAT(__sys_,x)); \
-			mov __CONCAT($SYS_,x),%eax; KERNCALL;		\
- 			jb HIDENAME(cerror); ret; \
-			END(__CONCAT(__sys_,x))
+#define	PSEUDO(name)	ENTRY(__sys_##name);				\
+			WEAK_REFERENCE(__sys_##name, _##name);		\
+			mov $SYS_##name,%eax; KERNCALL;			\
+			jb HIDENAME(cerror); ret;			\
+			END(__sys_##name)
 
 /* gas messes up offset -- although we don't currently need it, do for BCS */
 #define	LCALL(x,y)	.byte 0x9a ; .long y; .word x
diff --git a/lib/libc/i386/gen/_setjmp.S b/lib/libc/i386/gen/_setjmp.S
index 3d9fdb42c50..c5996c6029c 100644
--- a/lib/libc/i386/gen/_setjmp.S
+++ b/lib/libc/i386/gen/_setjmp.S
@@ -60,8 +60,7 @@ ENTRY(_setjmp)
 	ret
 END(_setjmp)
 
-	.weak	CNAME(_longjmp)
-	.set	CNAME(_longjmp),CNAME(___longjmp)
+	WEAK_REFERENCE(___longjmp, _longjmp)
 ENTRY(___longjmp)
 	movl	4(%esp),%edx
 	movl	8(%esp),%eax
diff --git a/lib/libc/i386/gen/setjmp.S b/lib/libc/i386/gen/setjmp.S
index a409e35e721..6e15868a190 100644
--- a/lib/libc/i386/gen/setjmp.S
+++ b/lib/libc/i386/gen/setjmp.S
@@ -78,8 +78,7 @@ ENTRY(setjmp)
 	ret
 END(setjmp)
 
-	.weak CNAME(longjmp)
-	.set CNAME(longjmp),CNAME(__longjmp)
+	WEAK_REFERENCE(__longjmp, longjmp)
 ENTRY(__longjmp)
 	movl	4(%esp),%edx
 	PIC_PROLOGUE
diff --git a/lib/libc/i386/gen/sigsetjmp.S b/lib/libc/i386/gen/sigsetjmp.S
index 936edbae338..0920b6da995 100644
--- a/lib/libc/i386/gen/sigsetjmp.S
+++ b/lib/libc/i386/gen/sigsetjmp.S
@@ -87,8 +87,7 @@ ENTRY(sigsetjmp)
 	ret
 END(sigsetjmp)
 
-	.weak CNAME(siglongjmp);
-	.set CNAME(siglongjmp),CNAME(__siglongjmp)
+	WEAK_REFERENCE(__siglongjmp, siglongjmp)
 ENTRY(__siglongjmp)
 	movl	4(%esp),%edx
 	cmpl	$0,44(%edx)
diff --git a/lib/libc/i386/string/strchr.S b/lib/libc/i386/string/strchr.S
index f57c2cd8abe..83aa87f1919 100644
--- a/lib/libc/i386/string/strchr.S
+++ b/lib/libc/i386/string/strchr.S
@@ -63,6 +63,6 @@ L2:
 	ret
 END(strchr)
 
-WEAK_ALIAS(index, strchr)
+WEAK_REFERENCE(strchr, index)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/i386/string/strrchr.S b/lib/libc/i386/string/strrchr.S
index 5ec5287a4c6..5e250b0c91a 100644
--- a/lib/libc/i386/string/strrchr.S
+++ b/lib/libc/i386/string/strrchr.S
@@ -64,6 +64,6 @@ L2:
 	ret
 END(strrchr)
 
-WEAK_ALIAS(rindex, strrchr)
+WEAK_REFERENCE(strrchr, rindex)
 
 	.section .note.GNU-stack,"",%progbits
diff --git a/lib/libc/i386/sys/Ovfork.S b/lib/libc/i386/sys/Ovfork.S
index 3ef71697694..b3649209880 100644
--- a/lib/libc/i386/sys/Ovfork.S
+++ b/lib/libc/i386/sys/Ovfork.S
@@ -38,10 +38,8 @@ __FBSDID("$FreeBSD$");
 
 #include "SYS.h"
 
-	.weak	_vfork
-	.set	_vfork,__sys_vfork
-	.weak	vfork
-	.set	vfork,__sys_vfork
+	WEAK_REFERENCE(__sys_vfork, _vfork)
+	WEAK_REFERENCE(__sys_vfork, vfork)
 ENTRY(__sys_vfork)
 	popl	%ecx		/* my rta into ecx */
 	mov	$SYS_vfork,%eax
diff --git a/lib/libc/i386/sys/getcontext.S b/lib/libc/i386/sys/getcontext.S
index 7114689866e..4923382e736 100644
--- a/lib/libc/i386/sys/getcontext.S
+++ b/lib/libc/i386/sys/getcontext.S
@@ -34,10 +34,8 @@ __FBSDID("$FreeBSD$");
  * Otherwise, the setcontext() syscall will return here and we'll
  * pop off the return address and go to the *setcontext* call.
  */
-	.weak	_getcontext
-	.set	_getcontext,__sys_getcontext
-	.weak	getcontext
-	.set	getcontext,__sys_getcontext
+	WEAK_REFERENCE(__sys_getcontext, _getcontext) 
+	WEAK_REFERENCE(__sys_getcontext, getcontext)
 ENTRY(__sys_getcontext)
 	movl	(%esp),%ecx	/* save getcontext return address */
 	mov	$SYS_getcontext,%eax
diff --git a/lib/libc/iconv/Makefile.inc b/lib/libc/iconv/Makefile.inc
index 8c43a20c744..98012edd7e1 100644
--- a/lib/libc/iconv/Makefile.inc
+++ b/lib/libc/iconv/Makefile.inc
@@ -14,5 +14,9 @@ SRCS+=	citrus_bcs.c citrus_bcs_strtol.c citrus_bcs_strtoul.c \
 	citrus_esdb.c citrus_hash.c citrus_iconv.c citrus_lookup.c \
 	citrus_lookup_factory.c citrus_mapper.c citrus_memstream.c \
 	citrus_mmap.c citrus_module.c citrus_none.c citrus_pivot_factory.c \
-	citrus_prop.c citrus_stdenc.c iconv.c
+	citrus_prop.c citrus_stdenc.c bsd_iconv.c iconv_compat.c
 SYM_MAPS+= ${.CURDIR}/iconv/Symbol.map
+
+.if ${MK_ICONV} == yes
+.include "${.CURDIR}/../libc_nonshared/Makefile.iconv"
+.endif
diff --git a/lib/libc/iconv/Symbol.map b/lib/libc/iconv/Symbol.map
index 05df2eac2f7..8a9a75d519e 100644
--- a/lib/libc/iconv/Symbol.map
+++ b/lib/libc/iconv/Symbol.map
@@ -2,30 +2,18 @@
  * $FreeBSD$
  */
 
-FBSD_1.2 {
-	__iconv;
-	__iconv_free_list;
-	__iconv_get_list;
-	_libiconv_version;
-	iconv_canonicalize;
-	libiconv;
-	libiconv_close;
-	libiconv_open;
-	libiconv_open_into;
-	libiconv_set_relocation_prefix;
-	libiconvctl;
-	libiconvlist;
-};
-
 FBSD_1.3 {
-	_iconv_version;
-	iconv;
-	iconv_open;
-	iconv_close;
-	iconv_open_into;
-	iconv_set_relocation_prefix;
-	iconvctl;
-	iconvlist;
+	__bsd___iconv;
+	__bsd___iconv_free_list;
+	__bsd___iconv_get_list;
+	__bsd_iconv;
+	__bsd_iconv_canonicalize;
+	__bsd_iconv_close;
+	__bsd_iconv_open;
+	__bsd_iconv_open_into;
+	__bsd_iconv_set_relocation_prefix;
+	__bsd_iconvctl;
+	__bsd_iconvlist;
 };
 
 FBSDprivate_1.0 {
diff --git a/lib/libc/iconv/__iconv.c b/lib/libc/iconv/__iconv.c
new file mode 100644
index 00000000000..c9bee3fee25
--- /dev/null
+++ b/lib/libc/iconv/__iconv.c
@@ -0,0 +1,38 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+size_t
+__iconv(iconv_t a, const char **b, size_t *c, char **d,
+     size_t *e, __uint32_t f, size_t *g)
+{
+	return __bsd___iconv(a, b, c, d, e, f, g);
+}
diff --git a/lib/libc/iconv/__iconv_free_list.c b/lib/libc/iconv/__iconv_free_list.c
new file mode 100644
index 00000000000..de9701e9924
--- /dev/null
+++ b/lib/libc/iconv/__iconv_free_list.c
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+void
+__iconv_free_list(char **a, size_t b)
+{
+	__bsd___iconv_free_list(a, b);
+}
diff --git a/lib/libc/iconv/__iconv_get_list.c b/lib/libc/iconv/__iconv_get_list.c
new file mode 100644
index 00000000000..437d413d98a
--- /dev/null
+++ b/lib/libc/iconv/__iconv_get_list.c
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+int
+__iconv_get_list(char ***a, size_t *b, __iconv_bool c)
+{
+	return __bsd___iconv_get_list(a, b, c);
+}
diff --git a/lib/libc/iconv/bsd_iconv.c b/lib/libc/iconv/bsd_iconv.c
new file mode 100644
index 00000000000..40a1a4e8890
--- /dev/null
+++ b/lib/libc/iconv/bsd_iconv.c
@@ -0,0 +1,318 @@
+/* $FreeBSD$ */
+/* $NetBSD: iconv.c,v 1.11 2009/03/03 16:22:33 explorer Exp $ */
+
+/*-
+ * Copyright (c) 2003 Citrus Project,
+ * Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@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>
+#include <sys/queue.h>
+#include <sys/types.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <iconv.h>
+#include <limits.h>
+#include <paths.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "citrus_types.h"
+#include "citrus_module.h"
+#include "citrus_esdb.h"
+#include "citrus_hash.h"
+#include "citrus_iconv.h"
+
+#include "iconv-internal.h"
+
+#define ISBADF(_h_)	(!(_h_) || (_h_) == (iconv_t)-1)
+
+static iconv_t
+__bsd___iconv_open(const char *out, const char *in, struct _citrus_iconv *handle)
+{
+	const char *out_slashes;
+	char *out_noslashes;
+	int ret;
+
+	/*
+	 * Remove anything following a //, as these are options (like
+	 * //ignore, //translate, etc) and we just don't handle them.
+	 * This is for compatibility with software that uses these
+	 * blindly.
+	 */
+	out_slashes = strstr(out, "//");
+	if (out_slashes != NULL) {
+		out_noslashes = strndup(out, out_slashes - out);
+		if (out_noslashes == NULL) {
+			errno = ENOMEM;
+			return ((iconv_t)-1);
+		}
+		ret = _citrus_iconv_open(&handle, in, out_noslashes);
+		free(out_noslashes);
+	} else {
+		ret = _citrus_iconv_open(&handle, in, out);
+	}
+
+	if (ret) {
+		errno = ret == ENOENT ? EINVAL : ret;
+		return ((iconv_t)-1);
+	}
+
+	handle->cv_shared->ci_discard_ilseq = strcasestr(out, "//IGNORE");
+	handle->cv_shared->ci_hooks = NULL;
+
+	return ((iconv_t)(void *)handle);
+}
+
+iconv_t
+__bsd_iconv_open(const char *out, const char *in)
+{
+
+	return (__bsd___iconv_open(out, in, NULL));
+}
+
+int
+__bsd_iconv_open_into(const char *out, const char *in, iconv_allocation_t *ptr)
+{
+	struct _citrus_iconv *handle;
+
+	handle = (struct _citrus_iconv *)ptr;
+	return ((__bsd___iconv_open(out, in, handle) == (iconv_t)-1) ? -1 : 0);
+}
+
+int
+__bsd_iconv_close(iconv_t handle)
+{
+
+	if (ISBADF(handle)) {
+		errno = EBADF;
+		return (-1);
+	}
+
+	_citrus_iconv_close((struct _citrus_iconv *)(void *)handle);
+
+	return (0);
+}
+
+size_t
+__bsd_iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout)
+{
+	size_t ret;
+	int err;
+
+	if (ISBADF(handle)) {
+		errno = EBADF;
+		return ((size_t)-1);
+	}
+
+	err = _citrus_iconv_convert((struct _citrus_iconv *)(void *)handle,
+	    in, szin, out, szout, 0, &ret);
+	if (err) {
+		errno = err;
+		ret = (size_t)-1;
+	}
+
+	return (ret);
+}
+
+size_t
+__bsd___iconv(iconv_t handle, const char **in, size_t *szin, char **out,
+    size_t *szout, uint32_t flags, size_t *invalids)
+{
+	size_t ret;
+	int err;
+
+	if (ISBADF(handle)) {
+		errno = EBADF;
+		return ((size_t)-1);
+	}
+
+	err = _citrus_iconv_convert((struct _citrus_iconv *)(void *)handle,
+	    in, szin, out, szout, flags, &ret);
+	if (invalids)
+		*invalids = ret;
+	if (err) {
+		errno = err;
+		ret = (size_t)-1;
+	}
+
+	return (ret);
+}
+
+int
+__bsd___iconv_get_list(char ***rlist, size_t *rsz, bool sorted)
+{
+	int ret;
+
+	ret = _citrus_esdb_get_list(rlist, rsz, sorted);
+	if (ret) {
+		errno = ret;
+		return (-1);
+	}
+
+	return (0);
+}
+
+void
+__bsd___iconv_free_list(char **list, size_t sz)
+{
+
+	_citrus_esdb_free_list(list, sz);
+}
+
+/*
+ * GNU-compatibile non-standard interfaces.
+ */
+static int
+qsort_helper(const void *first, const void *second)
+{
+	const char * const *s1;
+	const char * const *s2;
+
+	s1 = first;
+	s2 = second;
+	return (strcmp(*s1, *s2));
+}
+
+void
+__bsd_iconvlist(int (*do_one) (unsigned int, const char * const *,
+    void *), void *data)
+{
+	char **list, **names;
+	const char * const *np;
+	char *curitem, *curkey, *slashpos;
+	size_t sz;
+	unsigned int i, j;
+
+	i = 0;
+
+	if (__bsd___iconv_get_list(&list, &sz, true))
+		list = NULL;
+	qsort((void *)list, sz, sizeof(char *), qsort_helper);
+	while (i < sz) {
+		j = 0;
+		slashpos = strchr(list[i], '/');
+		curkey = (char *)malloc(slashpos - list[i] + 2);
+		names = (char **)malloc(sz * sizeof(char *));
+		if ((curkey == NULL) || (names == NULL)) {
+			__bsd___iconv_free_list(list, sz);
+			return;
+		}
+		strlcpy(curkey, list[i], slashpos - list[i] + 1);
+		names[j++] = strdup(curkey);
+		for (; (i < sz) && (memcmp(curkey, list[i], strlen(curkey)) == 0); i++) {
+			slashpos = strchr(list[i], '/');
+			curitem = (char *)malloc(strlen(slashpos) + 1);
+			if (curitem == NULL) {
+				__bsd___iconv_free_list(list, sz);
+				return;
+			}
+			strlcpy(curitem, &slashpos[1], strlen(slashpos) + 1);
+			if (strcmp(curkey, curitem) == 0) {
+				continue;
+			}
+			names[j++] = strdup(curitem);
+		}
+		np = (const char * const *)names;
+		do_one(j, np, data);
+		free(names);
+	}
+
+	__bsd___iconv_free_list(list, sz);
+}
+
+__inline const char *
+__bsd_iconv_canonicalize(const char *name)
+{
+
+	return (_citrus_iconv_canonicalize(name));
+}
+
+int
+__bsd_iconvctl(iconv_t cd, int request, void *argument)
+{
+	struct _citrus_iconv *cv;
+	struct iconv_hooks *hooks;
+	const char *convname;
+	char src[PATH_MAX], *dst;
+	int *i;
+
+	cv = (struct _citrus_iconv *)(void *)cd;
+	hooks = (struct iconv_hooks *)argument;
+	i = (int *)argument;
+
+	if (ISBADF(cd)) {
+		errno = EBADF;
+		return (-1);
+	}
+
+	switch (request) {
+	case ICONV_TRIVIALP:
+		convname = cv->cv_shared->ci_convname;
+		dst = strchr(convname, '/');
+
+		strlcpy(src, convname, dst - convname + 1);
+		dst++;
+		if ((convname == NULL) || (src == NULL) || (dst == NULL))
+			return (-1);
+		*i = strcmp(src, dst) == 0 ? 1 : 0;
+		return (0);
+	case ICONV_GET_TRANSLITERATE:
+		*i = 1;
+		return (0);
+	case ICONV_SET_TRANSLITERATE:
+		return  ((*i == 1) ? 0 : -1);
+	case ICONV_GET_DISCARD_ILSEQ:
+		*i = cv->cv_shared->ci_discard_ilseq ? 1 : 0;
+		return (0);
+	case ICONV_SET_DISCARD_ILSEQ:
+		cv->cv_shared->ci_discard_ilseq = *i;
+		return (0);
+	case ICONV_SET_HOOKS:
+		cv->cv_shared->ci_hooks = hooks;
+		return (0);
+	case ICONV_SET_FALLBACKS:
+		errno = EOPNOTSUPP;
+		return (-1);
+	case ICONV_GET_ILSEQ_INVALID:
+		*i = cv->cv_shared->ci_ilseq_invalid ? 1 : 0;
+		return (0);
+	case ICONV_SET_ILSEQ_INVALID:
+		cv->cv_shared->ci_ilseq_invalid = *i;
+		return (0);
+	default:
+		errno = EINVAL;
+		return (-1);
+	}
+}
+
+void
+__bsd_iconv_set_relocation_prefix(const char *orig_prefix __unused,
+    const char *curr_prefix __unused)
+{
+
+}
diff --git a/lib/libc/iconv/citrus_csmapper.h b/lib/libc/iconv/citrus_csmapper.h
index dd178da90cf..389ad431e17 100644
--- a/lib/libc/iconv/citrus_csmapper.h
+++ b/lib/libc/iconv/citrus_csmapper.h
@@ -28,7 +28,7 @@
  */
 
 #ifndef _CITRUS_CSMAPPER_H_
-#define _CITRUS_CSMAPPER_H
+#define _CITRUS_CSMAPPER_H_
 
 #define _citrus_csmapper		_citrus_mapper
 #define _citrus_csmapper_close		_citrus_mapper_close
diff --git a/lib/libc/iconv/citrus_iconv_local.h b/lib/libc/iconv/citrus_iconv_local.h
index e673c9a6afa..12d2fa33fa7 100644
--- a/lib/libc/iconv/citrus_iconv_local.h
+++ b/lib/libc/iconv/citrus_iconv_local.h
@@ -99,6 +99,7 @@ struct _citrus_iconv_shared {
 	char						*ci_convname;
 	bool						 ci_discard_ilseq;
 	struct iconv_hooks				*ci_hooks;
+	bool						 ci_ilseq_invalid;
 };
 
 struct _citrus_iconv {
diff --git a/lib/libc/iconv/citrus_mapper.c b/lib/libc/iconv/citrus_mapper.c
index b1ee8fbe7ec..43fa4b0cb92 100644
--- a/lib/libc/iconv/citrus_mapper.c
+++ b/lib/libc/iconv/citrus_mapper.c
@@ -381,7 +381,9 @@ _citrus_mapper_close(struct _citrus_mapper *cm)
 			_CITRUS_HASH_REMOVE(cm, cm_entry);
 			free(cm->cm_key);
 		}
+		UNLOCK(&cm_lock);
 		mapper_close(cm);
+		return;
 quit:
 		UNLOCK(&cm_lock);
 	}
diff --git a/lib/libc/iconv/iconv-internal.h b/lib/libc/iconv/iconv-internal.h
new file mode 100644
index 00000000000..9a6b3d91367
--- /dev/null
+++ b/lib/libc/iconv/iconv-internal.h
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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$
+ */
+
+/*
+ * Interal prototypes for our back-end functions.
+ */
+size_t	__bsd___iconv(iconv_t, const char **, size_t *, char **,
+		size_t *, __uint32_t, size_t *);
+void	__bsd___iconv_free_list(char **, size_t);
+int	__bsd___iconv_get_list(char ***, size_t *, __iconv_bool);
+size_t	__bsd_iconv(iconv_t, const char ** __restrict,
+		    size_t * __restrict, char ** __restrict,
+		    size_t * __restrict);
+const char *__bsd_iconv_canonicalize(const char *);
+int	__bsd_iconv_close(iconv_t);
+iconv_t	__bsd_iconv_open(const char *, const char *);
+int	__bsd_iconv_open_into(const char *, const char *, iconv_allocation_t *);
+void	__bsd_iconv_set_relocation_prefix(const char *, const char *);
+int	__bsd_iconvctl(iconv_t, int, void *);
+void	__bsd_iconvlist(int (*) (unsigned int, const char * const *, void *), void *);
diff --git a/lib/libc/iconv/iconv.c b/lib/libc/iconv/iconv.c
index f388e8b59d0..d13c1dfa337 100644
--- a/lib/libc/iconv/iconv.c
+++ b/lib/libc/iconv/iconv.c
@@ -1,9 +1,5 @@
-/* $FreeBSD$ */
-/* $NetBSD: iconv.c,v 1.11 2009/03/03 16:22:33 explorer Exp $ */
-
 /*-
- * Copyright (c) 2003 Citrus Project,
- * Copyright (c) 2009, 2010 Gabor Kovesdan <gabor@FreeBSD.org>,
+ * Copyright (c) 2013 Peter Wemm
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,302 +22,18 @@
  * LIABILITY, OR TORT (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/queue.h>
 #include <sys/types.h>
-
-#include <assert.h>
-#include <errno.h>
 #include <iconv.h>
-#include <limits.h>
-#include <paths.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "citrus_types.h"
-#include "citrus_module.h"
-#include "citrus_esdb.h"
-#include "citrus_hash.h"
-#include "citrus_iconv.h"
-
-#include <_libiconv_compat.h>
-#ifdef __LIBICONV_COMPAT
-__weak_reference(iconv, libiconv);
-__weak_reference(iconv_open, libiconv_open);
-__weak_reference(iconv_open_into, libiconv_open_into);
-__weak_reference(iconv_close, libiconv_close);
-__weak_reference(iconvlist, libiconvlist);
-__weak_reference(iconvctl, libiconvctl);
-__weak_reference(iconv_set_relocation_prefix, libiconv_set_relocation_prefix);
-__weak_reference(_iconv_version, _libiconv_version);
-#endif
-
-#define ISBADF(_h_)	(!(_h_) || (_h_) == (iconv_t)-1)
-
-int _iconv_version = _ICONV_VERSION;
-
-iconv_t		 _iconv_open(const char *out, const char *in,
-		    struct _citrus_iconv *prealloc);
-
-iconv_t
-_iconv_open(const char *out, const char *in, struct _citrus_iconv *handle)
-{
-	const char *out_slashes;
-	char *out_noslashes;
-	int ret;
-
-	/*
-	 * Remove anything following a //, as these are options (like
-	 * //ignore, //translate, etc) and we just don't handle them.
-	 * This is for compatibility with software that uses these
-	 * blindly.
-	 */
-	out_slashes = strstr(out, "//");
-	if (out_slashes != NULL) {
-		out_noslashes = strndup(out, out_slashes - out);
-		if (out_noslashes == NULL) {
-			errno = ENOMEM;
-			return ((iconv_t)-1);
-		}
-		ret = _citrus_iconv_open(&handle, in, out_noslashes);
-		free(out_noslashes);
-	} else {
-		ret = _citrus_iconv_open(&handle, in, out);
-	}
-
-	if (ret) {
-		errno = ret == ENOENT ? EINVAL : ret;
-		return ((iconv_t)-1);
-	}
-
-	handle->cv_shared->ci_discard_ilseq = strcasestr(out, "//IGNORE");
-	handle->cv_shared->ci_hooks = NULL;
-
-	return ((iconv_t)(void *)handle);
-}
-
-iconv_t
-iconv_open(const char *out, const char *in)
-{
-
-	return (_iconv_open(out, in, NULL));
-}
-
-int
-iconv_open_into(const char *out, const char *in, iconv_allocation_t *ptr)
-{
-	struct _citrus_iconv *handle;
-
-	handle = (struct _citrus_iconv *)ptr;
-	return ((_iconv_open(out, in, handle) == (iconv_t)-1) ? -1 : 0);
-}
-
-int
-iconv_close(iconv_t handle)
-{
-
-	if (ISBADF(handle)) {
-		errno = EBADF;
-		return (-1);
-	}
-
-	_citrus_iconv_close((struct _citrus_iconv *)(void *)handle);
-
-	return (0);
-}
+#include "iconv-internal.h"
 
 size_t
-iconv(iconv_t handle, const char **in, size_t *szin, char **out, size_t *szout)
+iconv(iconv_t a, const char ** __restrict b,
+      size_t * __restrict c, char ** __restrict d,
+      size_t * __restrict e)
 {
-	size_t ret;
-	int err;
-
-	if (ISBADF(handle)) {
-		errno = EBADF;
-		return ((size_t)-1);
-	}
-
-	err = _citrus_iconv_convert((struct _citrus_iconv *)(void *)handle,
-	    in, szin, out, szout, 0, &ret);
-	if (err) {
-		errno = err;
-		ret = (size_t)-1;
-	}
-
-	return (ret);
-}
-
-size_t
-__iconv(iconv_t handle, const char **in, size_t *szin, char **out,
-    size_t *szout, uint32_t flags, size_t *invalids)
-{
-	size_t ret;
-	int err;
-
-	if (ISBADF(handle)) {
-		errno = EBADF;
-		return ((size_t)-1);
-	}
-
-	err = _citrus_iconv_convert((struct _citrus_iconv *)(void *)handle,
-	    in, szin, out, szout, flags, &ret);
-	if (invalids)
-		*invalids = ret;
-	if (err) {
-		errno = err;
-		ret = (size_t)-1;
-	}
-
-	return (ret);
-}
-
-int
-__iconv_get_list(char ***rlist, size_t *rsz, bool sorted)
-{
-	int ret;
-
-	ret = _citrus_esdb_get_list(rlist, rsz, sorted);
-	if (ret) {
-		errno = ret;
-		return (-1);
-	}
-
-	return (0);
-}
-
-void
-__iconv_free_list(char **list, size_t sz)
-{
-
-	_citrus_esdb_free_list(list, sz);
-}
-
-/*
- * GNU-compatibile non-standard interfaces.
- */
-static int
-qsort_helper(const void *first, const void *second)
-{
-	const char * const *s1;
-	const char * const *s2;
-
-	s1 = first;
-	s2 = second;
-	return (strcmp(*s1, *s2));
-}
-
-void
-iconvlist(int (*do_one) (unsigned int, const char * const *,
-    void *), void *data)
-{
-	char **list, **names;
-	const char * const *np;
-	char *curitem, *curkey, *slashpos;
-	size_t sz;
-	unsigned int i, j;
-
-	i = 0;
-
-	if (__iconv_get_list(&list, &sz, true))
-		list = NULL;
-	qsort((void *)list, sz, sizeof(char *), qsort_helper);
-	while (i < sz) {
-		j = 0;
-		slashpos = strchr(list[i], '/');
-		curkey = (char *)malloc(slashpos - list[i] + 2);
-		names = (char **)malloc(sz * sizeof(char *));
-		if ((curkey == NULL) || (names == NULL)) {
-			__iconv_free_list(list, sz);
-			return;
-		}
-		strlcpy(curkey, list[i], slashpos - list[i] + 1);
-		names[j++] = strdup(curkey);
-		for (; (i < sz) && (memcmp(curkey, list[i], strlen(curkey)) == 0); i++) {
-			slashpos = strchr(list[i], '/');
-			curitem = (char *)malloc(strlen(slashpos) + 1);
-			if (curitem == NULL) {
-				__iconv_free_list(list, sz);
-				return;
-			}
-			strlcpy(curitem, &slashpos[1], strlen(slashpos) + 1);
-			if (strcmp(curkey, curitem) == 0) {
-				continue;
-			}
-			names[j++] = strdup(curitem);
-		}
-		np = (const char * const *)names;
-		do_one(j, np, data);
-		free(names);
-	}
-
-	__iconv_free_list(list, sz);
-}
-
-__inline const char
-*iconv_canonicalize(const char *name)
-{
-
-	return (_citrus_iconv_canonicalize(name));
-}
-
-int
-iconvctl(iconv_t cd, int request, void *argument)
-{
-	struct _citrus_iconv *cv;
-	struct iconv_hooks *hooks;
-	const char *convname;
-	char src[PATH_MAX], *dst;
-	int *i;
-
-	cv = (struct _citrus_iconv *)(void *)cd;
-	hooks = (struct iconv_hooks *)argument;
-	i = (int *)argument;
-
-	if (ISBADF(cd)) {
-		errno = EBADF;
-		return (-1);
-	}
-
-	switch (request) {
-	case ICONV_TRIVIALP:
-		convname = cv->cv_shared->ci_convname;
-		dst = strchr(convname, '/');
-
-		strlcpy(src, convname, dst - convname + 1);
-		dst++;
-		if ((convname == NULL) || (src == NULL) || (dst == NULL))
-			return (-1);
-		*i = strcmp(src, dst) == 0 ? 1 : 0;
-		return (0);
-	case ICONV_GET_TRANSLITERATE:
-		*i = 1;
-		return (0);
-	case ICONV_SET_TRANSLITERATE:
-		return  ((*i == 1) ? 0 : -1);
-	case ICONV_GET_DISCARD_ILSEQ:
-		*i = cv->cv_shared->ci_discard_ilseq ? 1 : 0;
-		return (0);
-	case ICONV_SET_DISCARD_ILSEQ:
-		cv->cv_shared->ci_discard_ilseq = *i;
-		return (0);
-	case ICONV_SET_HOOKS:
-		cv->cv_shared->ci_hooks = hooks;
-		return (0);
-	case ICONV_SET_FALLBACKS:
-		errno = EOPNOTSUPP;
-		return (-1);
-	default:
-		errno = EINVAL;
-		return (-1);
-	}
-}
-
-void
-iconv_set_relocation_prefix(const char *orig_prefix __unused,
-    const char *curr_prefix __unused)
-{
-
+	return __bsd_iconv(a, b, c, d, e);
 }
diff --git a/lib/libc/iconv/iconv_canonicalize.c b/lib/libc/iconv/iconv_canonicalize.c
new file mode 100644
index 00000000000..702a4168f29
--- /dev/null
+++ b/lib/libc/iconv/iconv_canonicalize.c
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+const char *
+iconv_canonicalize(const char *a)
+{
+	return __bsd_iconv_canonicalize(a);
+}
diff --git a/lib/libc/iconv/iconv_close.c b/lib/libc/iconv/iconv_close.c
new file mode 100644
index 00000000000..1adbb8c6eb6
--- /dev/null
+++ b/lib/libc/iconv/iconv_close.c
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+int
+iconv_close(iconv_t a)
+{
+	return __bsd_iconv_close(a);
+}
diff --git a/lib/libc/iconv/iconv_compat.c b/lib/libc/iconv/iconv_compat.c
new file mode 100644
index 00000000000..dea968f65f7
--- /dev/null
+++ b/lib/libc/iconv/iconv_compat.c
@@ -0,0 +1,121 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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$
+ */
+
+/*
+ * These are ABI implementations for when the raw iconv_* symbol
+ * space was exposed via libc.so.7 in its early life.  This is
+ * a transition aide, these wrappers will not normally ever be
+ * executed except via __sym_compat() references.
+ */
+#include <sys/types.h>
+#include <iconv.h>
+#include "iconv-internal.h"
+
+size_t
+__iconv_compat(iconv_t a, const char ** b, size_t * c, char ** d,
+     size_t * e, __uint32_t f, size_t *g)
+{
+	return __bsd___iconv(a, b, c, d, e, f, g);
+}
+
+void
+__iconv_free_list_compat(char ** a, size_t b)
+{
+	__bsd___iconv_free_list(a, b);
+}
+
+int
+__iconv_get_list_compat(char ***a, size_t *b, __iconv_bool c)
+{
+	return __bsd___iconv_get_list(a, b, c);
+}
+
+size_t
+iconv_compat(iconv_t a, const char ** __restrict b,
+      size_t * __restrict c, char ** __restrict d,
+      size_t * __restrict e)
+{
+	return __bsd_iconv(a, b, c, d, e);
+}
+
+const char *
+iconv_canonicalize_compat(const char *a)
+{
+	return __bsd_iconv_canonicalize(a);
+}
+
+int
+iconv_close_compat(iconv_t a)
+{
+	return __bsd_iconv_close(a);
+}
+
+iconv_t
+iconv_open_compat(const char *a, const char *b)
+{
+	return __bsd_iconv_open(a, b);
+}
+
+int
+iconv_open_into_compat(const char *a, const char *b, iconv_allocation_t *c)
+{
+	return __bsd_iconv_open_into(a, b, c);
+}
+
+void
+iconv_set_relocation_prefix_compat(const char *a, const char *b)
+{
+	return __bsd_iconv_set_relocation_prefix(a, b);
+}
+
+int
+iconvctl_compat(iconv_t a, int b, void *c)
+{
+	return __bsd_iconvctl(a, b, c);
+}
+
+void
+iconvlist_compat(int (*a) (unsigned int, const char * const *, void *), void *b)
+{
+	return __bsd_iconvlist(a, b);
+}
+
+int _iconv_version_compat = 0x0108;	/* Magic - not used */
+
+__sym_compat(__iconv, __iconv_compat, FBSD_1.2);
+__sym_compat(__iconv_free_list, __iconv_free_list_compat, FBSD_1.2);
+__sym_compat(__iconv_get_list, __iconv_get_list_compat, FBSD_1.2);
+__sym_compat(_iconv_version, _iconv_version_compat, FBSD_1.3);
+__sym_compat(iconv, iconv_compat, FBSD_1.3);
+__sym_compat(iconv_canonicalize, iconv_canonicalize_compat, FBSD_1.2);
+__sym_compat(iconv_close, iconv_close_compat, FBSD_1.3);
+__sym_compat(iconv_open, iconv_open_compat, FBSD_1.3);
+__sym_compat(iconv_open_into, iconv_open_into_compat, FBSD_1.3);
+__sym_compat(iconv_set_relocation_prefix, iconv_set_relocation_prefix_compat, FBSD_1.3);
+__sym_compat(iconvctl, iconvctl_compat, FBSD_1.3);
+__sym_compat(iconvlist, iconvlist_compat, FBSD_1.3);
diff --git a/lib/libc/iconv/iconv_open.c b/lib/libc/iconv/iconv_open.c
new file mode 100644
index 00000000000..f14925c446e
--- /dev/null
+++ b/lib/libc/iconv/iconv_open.c
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+iconv_t
+iconv_open(const char *a, const char *b)
+{
+	return __bsd_iconv_open(a, b);
+}
diff --git a/lib/libc/iconv/iconv_open_into.c b/lib/libc/iconv/iconv_open_into.c
new file mode 100644
index 00000000000..8a1278bad06
--- /dev/null
+++ b/lib/libc/iconv/iconv_open_into.c
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+int
+iconv_open_into(const char *a, const char *b, iconv_allocation_t *c)
+{
+	return __bsd_iconv_open_into(a, b, c);
+}
diff --git a/lib/libc/iconv/iconv_set_relocation_prefix.c b/lib/libc/iconv/iconv_set_relocation_prefix.c
new file mode 100644
index 00000000000..7615c942eba
--- /dev/null
+++ b/lib/libc/iconv/iconv_set_relocation_prefix.c
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+void
+iconv_set_relocation_prefix(const char *a, const char *b)
+{
+	return __bsd_iconv_set_relocation_prefix(a, b);
+}
diff --git a/lib/libc/iconv/iconvctl.3 b/lib/libc/iconv/iconvctl.3
index f0121573af9..5bd06ea122c 100644
--- a/lib/libc/iconv/iconvctl.3
+++ b/lib/libc/iconv/iconvctl.3
@@ -34,7 +34,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 7, 2009
+.Dd November 25, 2009
 .Dt ICONVCTL 3
 .Os
 .Sh NAME
@@ -110,6 +110,31 @@ variable, which is passed to
 via
 .Fa argument
 by its address.
+.It ICONV_GET_ILSEQ_INVALID
+Determines if a character in the input buffer that is valid,
+but for which an identical character does not exist in the target
+codeset returns
+.Er EILSEQ
+or not.
+The answer is stored in
+.Fa argument ,
+which is of
+.Ft int * .
+It will be set to 1 if this feature is enabled or set to 0 otherwise.
+.It ICONV_SET_ILSEQ_INVALID
+Sets whether a character in the input buffer that is valid,
+but for which an identical character does not exist in the target
+codeset returns
+.Er EILSEQ
+or not.
+If
+.Fa argument ,
+which is of
+.Ft int *
+is set to 1 it will be enabled,
+and if
+.Fa argument
+is set to 0 it will be disabled.
 .El
 .\" XXX: fallbacks are unimplemented and trying to set them will always
 .\"      return EOPNOTSUPP but definitions are provided for source-level
diff --git a/lib/libc/iconv/iconvctl.c b/lib/libc/iconv/iconvctl.c
new file mode 100644
index 00000000000..50c108cfd21
--- /dev/null
+++ b/lib/libc/iconv/iconvctl.c
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+int
+iconvctl(iconv_t a, int b, void *c)
+{
+	return __bsd_iconvctl(a, b, c);
+}
diff --git a/lib/libc/iconv/iconvlist.c b/lib/libc/iconv/iconvlist.c
new file mode 100644
index 00000000000..418b4a75970
--- /dev/null
+++ b/lib/libc/iconv/iconvlist.c
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <iconv.h>
+#include "iconv-internal.h"
+
+void
+iconvlist(int (*a) (unsigned int, const char * const *, void *), void *b)
+{
+	return __bsd_iconvlist(a, b);
+}
diff --git a/lib/libc/libc.ldscript b/lib/libc/libc.ldscript
index a5c8a274db7..02e4d962a31 100644
--- a/lib/libc/libc.ldscript
+++ b/lib/libc/libc.ldscript
@@ -1,2 +1,2 @@
 /* $FreeBSD$ */
-GROUP ( @@SHLIB@@ @@LIBDIR@@/libssp_nonshared.a )
+GROUP ( @@SHLIB@@ @@LIBDIR@@/libc_nonshared.a @@LIBDIR@@/libssp_nonshared.a )
diff --git a/lib/libc/posix1e/acl.3 b/lib/libc/posix1e/acl.3
index 717df6761eb..a39b736cfbc 100644
--- a/lib/libc/posix1e/acl.3
+++ b/lib/libc/posix1e/acl.3
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 25, 2009
+.Dd November 12, 2013
 .Dt ACL 3
 .Os
 .Sh NAME
@@ -131,6 +131,10 @@ This function is described in
 .Xr acl_from_text 3 ,
 and may be used to convert a text-form ACL into working ACL state, if
 the ACL has POSIX.1e or NFSv4 semantics.
+.It Fn acl_get_brand_np
+This function is described in
+.Xr acl_get_brand_np 3
+and may be used to determine whether the ACL has POSIX.1e or NFSv4 semantics.
 .It Fn acl_get_entry
 This function is described in
 .Xr acl_get_entry 3 ,
@@ -202,7 +206,7 @@ This function is described in
 .Xr acl_set_tag_type 3 ,
 and may be used to set the tag type of an ACL.
 .It Fn acl_strip_np
-This function is describe din
+This function is described in
 .Xr acl-strip_np 3 ,
 and may be used to remove extended entries from an ACL.
 .It Xo
@@ -248,6 +252,7 @@ library.
 .Xr acl_free 3 ,
 .Xr acl_from_text 3 ,
 .Xr acl_get 3 ,
+.Xr acl_get_brand_np 3 ,
 .Xr acl_get_entry_type_np 3 ,
 .Xr acl_get_flagset_np 3 ,
 .Xr acl_get_permset 3 ,
diff --git a/lib/libc/posix1e/acl_is_trivial_np.3 b/lib/libc/posix1e/acl_is_trivial_np.3
index a9cd4dfe354..4f5a22cd6dd 100644
--- a/lib/libc/posix1e/acl_is_trivial_np.3
+++ b/lib/libc/posix1e/acl_is_trivial_np.3
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 13, 2010
+.Dd November 12, 2013
 .Dt ACL_STRIP_NP 3
 .Os
 .Sh NAME
@@ -56,9 +56,8 @@ ACL is trivial if it can be fully expressed as a file mode without losing
 any access rules.
 For POSIX.1e ACLs, ACL is trivial if it has the three required entries,
 one for owner, one for owning group, and one for other.
-For NFSv4 ACLs, ACL is trivial if is identical to the ACL generated by
-.Fn acl_strip_np 3
-from the file mode.
+For NFSv4 ACLs, ACL is trivial if it is identical to the ACL generated by
+.Fn acl_strip_np 3 .
 Files that have non-trivial ACL have a plus sign appended after mode bits
 in "ls -l" output.
 .Sh RETURN VALUES
diff --git a/lib/libc/powerpc/SYS.h b/lib/libc/powerpc/SYS.h
index 0bd793f3353..f0665c09c14 100644
--- a/lib/libc/powerpc/SYS.h
+++ b/lib/libc/powerpc/SYS.h
@@ -36,24 +36,24 @@
 #define	_SYSCALL(name)						\
 	.text;							\
 	.align 2;						\
-	li	0,(__CONCAT(SYS_, name));			\
+	li	0,(SYS_##name);					\
 	sc
 
 #define	SYSCALL(name)						\
 	.text;							\
 	.align 2;						\
 2:	b	PIC_PLT(CNAME(HIDENAME(cerror)));		\
-ENTRY(__CONCAT(__sys_, name));				\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), name);		\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\
+ENTRY(__sys_##name);						\
+	WEAK_REFERENCE(__sys_##name, name);			\
+	WEAK_REFERENCE(__sys_##name, _##name);			\
 	_SYSCALL(name);						\
 	bso	2b
 
 #define	PSEUDO(name)						\
 	.text;							\
 	.align 2;						\
-ENTRY(__CONCAT(__sys_, name));				\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\
+ENTRY(__sys_##name);						\
+	WEAK_REFERENCE(__sys_##name, _##name);			\
 	_SYSCALL(name);						\
 	bnslr;							\
 	b	PIC_PLT(CNAME(HIDENAME(cerror)))
@@ -62,9 +62,9 @@ ENTRY(__CONCAT(__sys_, name));				\
 	.text;							\
 	.align 2;						\
 2:	b	PIC_PLT(CNAME(HIDENAME(cerror)));		\
-ENTRY(__CONCAT(__sys_, name));				\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), name);		\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\
+ENTRY(__sys_##name);						\
+	WEAK_REFERENCE(__sys_##name, name);			\
+	WEAK_REFERENCE(__sys_##name, _##name);			\
 	_SYSCALL(name);						\
 	bnslr;							\
 	b	PIC_PLT(CNAME(HIDENAME(cerror)))
diff --git a/lib/libc/powerpc64/SYS.h b/lib/libc/powerpc64/SYS.h
index 8b3281fb1a4..486e71bfeae 100644
--- a/lib/libc/powerpc64/SYS.h
+++ b/lib/libc/powerpc64/SYS.h
@@ -36,7 +36,7 @@
 #define	_SYSCALL(name)						\
 	.text;							\
 	.align 2;						\
-	li	0,(__CONCAT(SYS_, name));			\
+	li	0,(SYS_##name);					\
 	sc
 
 #define	SYSCALL(name)						\
@@ -51,17 +51,17 @@
 	ld	%r0,16(%r1);					\
 	mtlr	%r0;						\
 	blr;							\
-ENTRY(__CONCAT(__sys_, name));						\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), name);			\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name)); 	\
-	_SYSCALL(name);							\
+ENTRY(__sys_##name);						\
+	WEAK_REFERENCE(__sys_##name, name);			\
+	WEAK_REFERENCE(__sys_##name, _##name);			\
+	_SYSCALL(name);						\
 	bso	2b
 
 #define	PSEUDO(name)						\
 	.text;							\
 	.align 2;						\
-ENTRY(__CONCAT(__sys_, name));					\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));   \
+ENTRY(__sys_##name);						\
+	WEAK_REFERENCE(__sys_##name, _##name);			\
 	_SYSCALL(name);						\
 	bnslr;							\
 	mflr	%r0;						\
@@ -77,9 +77,9 @@ ENTRY(__CONCAT(__sys_, name));					\
 #define	RSYSCALL(name)						\
 	.text;							\
 	.align 2;						\
-ENTRY(__CONCAT(__sys_, name));					\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), name);		\
-	WEAK_REFERENCE(__CONCAT(__sys_, name), __CONCAT(_, name));\
+ENTRY(__sys_##name);						\
+	WEAK_REFERENCE(__sys_##name, name);			\
+	WEAK_REFERENCE(__sys_##name, _##name);			\
 	_SYSCALL(name);						\
 	bnslr;							\
 								\
diff --git a/lib/libc/rpc/DISCLAIMER b/lib/libc/rpc/DISCLAIMER
index 9a3a99161ae..d8dcb7ffd4a 100644
--- a/lib/libc/rpc/DISCLAIMER
+++ b/lib/libc/rpc/DISCLAIMER
@@ -1,31 +1,60 @@
 /*	$NetBSD: DISCLAIMER,v 1.2 1998/01/09 04:11:51 perry Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
+ */
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
diff --git a/lib/libc/rpc/LICENSE b/lib/libc/rpc/LICENSE
deleted file mode 100644
index 5f1205c7052..00000000000
--- a/lib/libc/rpc/LICENSE
+++ /dev/null
@@ -1,335 +0,0 @@
-$FreeBSD$
-
-Sun Industry Standards Source License 1.0
-
-DEFINITIONS
-
-1.1.  "Commercial Use" means distribution or otherwise
-making the Original Code available to a third party.
-
-1.2.  "Contributor Version" means the combination of the
-Original Code, and the Modifications made by that particular
-Contributor.
-
-1.3.  "Electronic Distribution Mechanism" means a mechanism
-generally accepted in the software development community for
-the electronic transfer of data.
-
-1.4.  "Executable" means Original Code in any form other
-than Source Code.
-
-1.5.  "Initial Developer" means the individual or entity
-identified as the Initial Developer in the Source Code
-notice required by 2 (Exhibit A)
-
-1.6.  "Larger Work" means a work which combines Original
-Code or portions thereof with code not governed by the terms
-of this License.
-
-1.7.  "License" means this document.
-
-1.8.  "Licensable" means having the right to grant, to the
-maximum extent possible, whether at the time of the initial
-grant or subsequently acquired, any and all of the rights
-conveyed herein.
-
-1.9.  "Modifications" means any addition to or deletion from
-the substance or structure of either the Original Code or
-any previous Modifications.  A Modification is:
-
-A.  Any addition to or deletion from the contents of a file
-containing Original Code or previous Modifications.
-
-B.  Any new file that contains any part of the Original Code
-or previous Modifications.  .
-
-1.10.  "Original Code" means Source Code of computer
-software code which is described in the Source Code notice
-required by Exhibit A as Original Code.
-
-1.11.  "Patent Claims" means any patent claims, now owned or
-hereafter acquired, including without limitation, method,
-process, and apparatus claims, in any patent Licensable by
-grantor.
-
-1.12.  "Source Code" means the preferred form of the
-Original Code for making modifications to it, including all
-modules it contains, plus any associated interface
-definition files, or scripts used to control compilation and
-installation of an Executable.
-
-1.13.  "Standards" means the standard identified in Exhibit
-B or a subsequent version of such standard.
-
-1.14.  "You" or "Your" means an individual or a legal entity
-exercising rights under, and complying with all of the terms
-of, this License or a future version of this License issued
-under Section 6.1.  For legal entities, "You" includes any
-entity which controls, is controlled by, or is under common
-control with You.  For purposes of this definition,
-"control" means (a) the power, direct or indirect, to cause
-the direction or management of such entity, whether by
-contract or otherwise, or (b) ownership of more than fifty
-percent (50%) of the outstanding shares or beneficial
-ownership of such entity.
-
-2.0 SOURCE CODE LICENSE
-
-2.1 The Initial Developer Grant:  The Initial Developer
-hereby grants You a world-wide, royalty-free, non-exclusive
-license, subject to third party intellectual property
-claims:
-
-a) under intellectual property rights (other than patent or
-trademark) Licensable by Initial Developer to use,
-reproduce, modify, display, perform, sub license and
-distribute the Original Code (or portions thereof )with or
-without Modifications, and/or as part of a Larger Work; and
-
-b) under Patents Claims infringed by the making, using or
-selling of Original Code, to make, have made, use, practice,
-sell, and offer for sale, and/or otherwise dispose of the
-Original Code (or portions thereof).
-
-c) the licenses granted in this Section 2.1(a ) and (b) are
-effective on the date Initial Developer first distributes
-Original Code under the terms of this License.
-
-d) Notwithstanding Section 2.1(b )above, no patent license
-is granted:  1) for code that You delete from the Original
-Code; 2) separate from the Original Code; or 3) for
-infringements caused by:  i) the modification of the
-Original Code or
-
-ii) the combination of the Original Code with other software
-or devices, including but not limited to Modifications.
-
-3.0 DISTRIBUTION OBLIGATIONS
-
-3.1 Application of License.  The Source Code version of
-Original Code may be distributed only under the terms of
-this License or a future version of this License released
-under Section 6.1, and You must include a copy of this
-License with every copy of the Source Code You distribute.
-You may not offer or impose any terms on any Source Code
-version that alters or restricts the applicable version of
-this License or the recipient's rights hereunder.  Your
-license for shipment of the Contributor Version is
-conditioned upon your full compliance with this Section.
-The Modifications which you create must comply with all
-requirements set out by the Standards body in effect 120
-days before You ship the Contributor Version.  In the event
-that the Modifications do not meet such requirements, You
-agree to publish (i) any deviation from the Standards
-protocol resulting from implementation of your Modifications
-and (ii) a reference implementation of Your Modifications,
-and to make any such deviation and reference implementation
-available to all third parties under the same terms as the
-license on a royalty free basis within thirty (30) days of
-Your first customer shipment of Your Modifications.
-
-3.2 Required Notices.  You must duplicate the notice in
-Exhibit A in each file of the Source Code.  If it is not
-possible to put such notice in a particular Source Code file
-due to its structure, then You must include such notice in a
-location (such as a relevant directory ) where a user would
-be likely to look for such a notice.  If You created one or
-more Modifications ) You may add your name as a Contributor
-to the notice described in Exhibit A.  You must also
-duplicate this License in any documentation for the Source
-Code where You describe recipients' rights or ownership
-rights relating to Initial Code.  You may choose to offer,
-and to charge a fee for, warranty, support, indemnity or
-liability obligations to one or more recipients of Your
-version of the Code.  However, You may do so only
-
-on Your own behalf, and not on behalf of the Initial
-Developer.  You must make it absolutely clear than any such
-warranty, support, indemnity or liability obligation is
-offered by You alone, and You hereby agree to indemnify the
-Initial Developer for any liability incurred by the Initial
-Developer as a result of warranty, support, indemnity or
-liability terms You offer.
-
-3.3 Distribution of Executable Versions.  You may distribute
-Original Code in Executable and Source form only if the
-requirements of Section 3.1 and 3.2 have been met for that
-Original Code, and if You include a notice stating that the
-Source Code version of the Original Code is available under
-the terms of this License.  The notice must be conspicuously
-included in any notice in an Executable or Source versions,
-related documentation or collateral in which You describe
-recipients' rights relating to the Original Code.  You may
-distribute the Executable and Source versions of Your
-version of the Code or ownership rights under a license of
-Your choice, which may contain terms different from this
-License, provided that You are in compliance with the terms
-of this License.  If You distribute the Executable and
-Source versions under a different license You must make it
-absolutely clear that any terms which differ from this
-License are offered by You alone, not by the Initial
-Developer .  You hereby agree to indemnify the Initial
-Developer for any liability incurred by the Initial
-Developer as a result of any such terms You offer .
-
-3.4 Larger Works.  You may create a Larger Work by combining
-Original Code with other code not governed by the terms of
-this License and distribute the Larger Work as a single
-product.  In such a case, You must make sure the
-requirements of this License are fulfilled for the Original
-Code.
-
-4.0 INABILITY TO COMPLY DUE TO STATUTE OR REGULATION
-
-If it is impossible for You to comply with any of the terms
-of this License with respect to some or all of the Original
-Code due to statute, judicial order, or regulation then You
-must:
-
-a) comply with the terms of this License to the maximum
-extent possible; and
-
-b) describe the limitations and the code they affect.  Such
-description must be included in the LEGAL file described in
-Section 3.2 and must be included with all distributions of
-the Source Code.  Except to the extent prohibited by statute
-or regulation, such description must be sufficiently
-detailed for a recipient of ordinary skill to be able to
-understand it.
-
-5.0 APPLICATION OF THIS LICENSE This License applies to code
-to which the Initial Developer has attached the notice in
-Exhibit A and to related Modifications as set out in Section
-3.1.
-
-6.0 VERSIONS OF THE LICENSE
-
-6.1 New Versions.  Sun Microsystems, Inc.  Sun may publish
-revised and/or new versions of the License from time to
-time.  Each version will be given a distinguishing version
-number .
-
-6.2 Effect of New Versions.  Once Original Code has been
-published under a particular version of the License, You may
-always continue to use it under the terms of that version.
-You may also choose to use such Original Code under the
-terms of any subsequent version of the License published by
-Sun.  No one other than Sun has the right to modify the
-terms applicable to Original Code.
-
-7.  DISCLAIMER OF W ARRANTY.  ORIGINAL CODE IS PROVIDED
-UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF
-ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT
-LIMITATION, WARRANTIES THAT THE ORIGINAL CODE IS FREE OF
-DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
-NON-INFRINGING.  THE ENTIRE RISK AS TO THE QUALITY AND
-PERFORMANCE OF THE ORIGINAL CODE IS WITH YOU.  SHOULD ANY
-ORIGINAL CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-INITIAL DEVELOPER )ASSUME THE COST OF ANY NECESSARY
-SERVICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF
-WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.  NO
-USE OF ANY ORIGINAL CODE IS AUTHORIZED HEREUNDER EXCEPT
-UNDER THIS DISCLAIMER.
-
-8.0 TERMINATION
-
-8.1 This License and the rights granted hereunder will
-terminate automatically if You fail to comply with terms
-herein and fail to cure such breach within 30 days of
-becoming aware of the breach.  All sublicenses to the
-Original Code which are properly granted shall survive any
-termination of this License.  Provisions which, by their
-nature, must remain in effect beyond the termination of this
-License shall survive.
-
-8.2 .In the event of termination under Section 8.1 above,
-all end user license agreements (excluding distributors and
-resellers) which have been validly granted by You or any
-distributor hereunder prior to termination shall survive
-termination.
-
-9.0 LIMIT OF LIABILITY UNDER NO CIRCUMSTANCES AND UNDER NO
-LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE) ,CONTRACT,
-OR OTHER WISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER
-CONTRIBUTOR, OR ANY DISTRIBUTOR OF ORIGINAL CODE, OR ANY
-SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
-OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR
-LOSS OF GOOD WILL, WORK STOPPAGE, COMPUTER FAILURE OR
-MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
-LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
-POSSIBILITY OF SUCH DAMAGES.  THIS LIMITATION OF LIABILITY
-SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT
-APPLICABLE LAW PROHIBITS SUCH LIMITATION.  SOME
-JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF
-INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND
-LIMITATION MAY NOT APPLY TO YOU.
-
-10.0 U .S.  GOVERNMENT END USERS U.S.  Government:  If this
-Software is being acquired by or on behalf of the U.S.
-Government or by a U.S.  Government prime contractor or
-subcontractor (at any tier), then the Government's rights in
-the Software and accompanying documentation shall be only as
-set forth in this license; this is in accordance with 48 C.F
-.R.  227.7201 through 227.7202-4 (for Department of Defense
-(DoD) acquisitions )and with 48 C.F.R.2.101 and 12.212( for
-non-DoD acquisitions).
-
-11.0 MISCELLANEOUS This License represents the complete
-agreement concerning subject matter hereof.  If any
-provision of this License is held to be unenforceable, such
-provision shall be reformed only to the extent necessary to
-make it enforceable.  This License shall be governed by
-California law provisions (except to the extent applicable
-law, if any, provides otherwise), excluding its
-conflict-of-law provisions.  With respect to disputes in
-which at least one party is a citizen of, or an entity
-chartered or registered to do business in the United States
-of America, any litigation relating to this License shall be
-subject to the jurisdiction of the Federal Courts of the
-Northern District of California, with venue lying in Santa
-Clara County, California, with the losing party responsible
-for costs, including without limitation, court costs and
-reasonable attorneys fees and expenses.  The application of
-the United Nations Convention on Contracts for the
-International Sale of Goods is expressly excluded.  Any law
-or regulation which provides that the language of a contract
-shall be construed against the drafter shall not apply to
-this License.
-
-EXHIBIT A - Sun Standards
-
-"The contents of this file are subject to the Sun Standards
-License Version 1.0 the (the "License";) You may not use
-this file except in compliance with the License.  You may
-obtain a copy of the License at
-_______________________________.
-
-    Software distributed under the License is distributed on
-an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
-express or implied.  See the License for the specific
-language governing rights and limitations under the License.
-
-The Original Code is Copyright 1998 by Sun Microsystems, Inc
-
-The Initial Developer of the Original Code is:  Sun
-Microsystems, Inc.
-
-Portions created by _____________________________ are
-Copyright ______________________________.
-
-All Rights Reserved.
-
-Contributors:  ______________________________________.
-
-EXHIBIT B - Sun Standards
-
-The Standard is defined as the following IETF RFCs:
-
-RFC1831:  RPC:  Remote Procedure Call Protocol Specification
-Version 2 RFC1832:  XDR:  External Data REpresentation
-Standard RFC1833:  Binding Protocols for ONC RPC Version 2
-RFC2078:  Generic Security Service Application Program
-Interface, Version 2 RFC2203:  RPCSEC_GSS Protocol
-Specification RFC2695:  Authentication Mechanisms for ONC RPC
diff --git a/lib/libc/rpc/auth_des.c b/lib/libc/rpc/auth_des.c
index 1b45c3bcbe9..1bc26615b5d 100644
--- a/lib/libc/rpc/auth_des.c
+++ b/lib/libc/rpc/auth_des.c
@@ -1,30 +1,29 @@
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1988 by Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/auth_none.c b/lib/libc/rpc/auth_none.c
index 01ad70139c7..311fa5581bb 100644
--- a/lib/libc/rpc/auth_none.c
+++ b/lib/libc/rpc/auth_none.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: auth_none.c,v 1.13 2000/01/22 22:19:17 mycroft 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/auth_unix.c b/lib/libc/rpc/auth_unix.c
index 5c138d02dc7..1ec543046d3 100644
--- a/lib/libc/rpc/auth_unix.c
+++ b/lib/libc/rpc/auth_unix.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: auth_unix.c,v 1.18 2000/07/06 03:03:30 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/authdes_prot.c b/lib/libc/rpc/authdes_prot.c
index 5be1f12bf2f..ae129737c4c 100644
--- a/lib/libc/rpc/authdes_prot.c
+++ b/lib/libc/rpc/authdes_prot.c
@@ -4,33 +4,32 @@ static char sccsid[] = 	"@(#)authdes_prot.c	2.1 88/07/29 4.0 RPCSRC; from 1.6 88
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc.
diff --git a/lib/libc/rpc/authunix_prot.c b/lib/libc/rpc/authunix_prot.c
index f80b17672da..42a5fad8021 100644
--- a/lib/libc/rpc/authunix_prot.c
+++ b/lib/libc/rpc/authunix_prot.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: authunix_prot.c,v 1.12 2000/01/22 22:19:17 mycroft 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/bindresvport.c b/lib/libc/rpc/bindresvport.c
index 75a1c8fd1c3..c8b164699af 100644
--- a/lib/libc/rpc/bindresvport.c
+++ b/lib/libc/rpc/bindresvport.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: bindresvport.c,v 1.19 2000/07/06 03:03:59 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/clnt_bcast.c b/lib/libc/rpc/clnt_bcast.c
index 612007ee2c9..6ee1f909270 100644
--- a/lib/libc/rpc/clnt_bcast.c
+++ b/lib/libc/rpc/clnt_bcast.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: clnt_bcast.c,v 1.3 2000/07/06 03:05:20 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/lib/libc/rpc/clnt_dg.c b/lib/libc/rpc/clnt_dg.c
index 9c52e1ef99d..5feab889154 100644
--- a/lib/libc/rpc/clnt_dg.c
+++ b/lib/libc/rpc/clnt_dg.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: clnt_dg.c,v 1.4 2000/07/14 08:40:41 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/lib/libc/rpc/clnt_generic.c b/lib/libc/rpc/clnt_generic.c
index 302a30e96c6..0c8a425750a 100644
--- a/lib/libc/rpc/clnt_generic.c
+++ b/lib/libc/rpc/clnt_generic.c
@@ -1,49 +1,31 @@
 /*	$NetBSD: clnt_generic.c,v 1.18 2000/07/06 03:10:34 christos Exp $	*/
 
-/*
- * The contents of this file are subject to the Sun Standards
- * License Version 1.0 the (the "License";) You may not use
- * this file except in compliance with the License.  You may
- * obtain a copy of the License at lib/libc/rpc/LICENSE
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ * All rights reserved.
  *
- * Software distributed under the License is distributed on
- * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied.  See the License for the specific
- * language governing rights and limitations under the License.
+ * 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 the "Oracle America, Inc." nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * The Original Code is Copyright 1998 by Sun Microsystems, Inc
- *
- * The Initial Developer of the Original Code is:  Sun
- * Microsystems, Inc.
- *
- * All Rights Reserved.
- *
- * 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
+ * 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.
  */
 
 /* #ident	"@(#)clnt_generic.c	1.40	99/04/21 SMI" */
diff --git a/lib/libc/rpc/clnt_perror.c b/lib/libc/rpc/clnt_perror.c
index efe9043c29a..5d87b0cbc14 100644
--- a/lib/libc/rpc/clnt_perror.c
+++ b/lib/libc/rpc/clnt_perror.c
@@ -1,33 +1,32 @@
 /*	$NetBSD: clnt_perror.c,v 1.24 2000/06/02 23:11:07 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/clnt_raw.c b/lib/libc/rpc/clnt_raw.c
index cd3a384ea3c..26e2856f282 100644
--- a/lib/libc/rpc/clnt_raw.c
+++ b/lib/libc/rpc/clnt_raw.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: clnt_raw.c,v 1.20 2000/12/10 04:12:03 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/clnt_simple.c b/lib/libc/rpc/clnt_simple.c
index ba21d2d8237..35412057256 100644
--- a/lib/libc/rpc/clnt_simple.c
+++ b/lib/libc/rpc/clnt_simple.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: clnt_simple.c,v 1.21 2000/07/06 03:10:34 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/lib/libc/rpc/clnt_vc.c b/lib/libc/rpc/clnt_vc.c
index 53e393eff75..7cd93b37e9d 100644
--- a/lib/libc/rpc/clnt_vc.c
+++ b/lib/libc/rpc/clnt_vc.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: clnt_vc.c,v 1.4 2000/07/14 08:40:42 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/des_crypt.c b/lib/libc/rpc/des_crypt.c
index 238d55af7b1..ace8ed6ce12 100644
--- a/lib/libc/rpc/des_crypt.c
+++ b/lib/libc/rpc/des_crypt.c
@@ -1,30 +1,29 @@
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * des_crypt.c, DES encryption library routines
diff --git a/lib/libc/rpc/des_soft.c b/lib/libc/rpc/des_soft.c
index daed2654e44..80d8c5241a0 100644
--- a/lib/libc/rpc/des_soft.c
+++ b/lib/libc/rpc/des_soft.c
@@ -1,30 +1,29 @@
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/getnetconfig.c b/lib/libc/rpc/getnetconfig.c
index 1310e361501..34be6e1dc37 100644
--- a/lib/libc/rpc/getnetconfig.c
+++ b/lib/libc/rpc/getnetconfig.c
@@ -1,33 +1,31 @@
 /*	$NetBSD: getnetconfig.c,v 1.3 2000/07/06 03:10:34 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 or with the express written consent of
- * Sun Microsystems, Inc.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/getnetpath.c b/lib/libc/rpc/getnetpath.c
index 92eae9552c4..29155c7afc7 100644
--- a/lib/libc/rpc/getnetpath.c
+++ b/lib/libc/rpc/getnetpath.c
@@ -1,33 +1,31 @@
 /*	$NetBSD: getnetpath.c,v 1.3 2000/07/06 03:10:34 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 or with the express written consent of
- * Sun Microsystems, Inc.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/getpublickey.c b/lib/libc/rpc/getpublickey.c
index 3c953388858..143c0fcaeb0 100644
--- a/lib/libc/rpc/getpublickey.c
+++ b/lib/libc/rpc/getpublickey.c
@@ -1,31 +1,29 @@
-/*
- * 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 or with the express written consent of
- * Sun Microsystems, Inc.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/getrpcent.c b/lib/libc/rpc/getrpcent.c
index 1f198fa9a0b..fa404d8c0d7 100644
--- a/lib/libc/rpc/getrpcent.c
+++ b/lib/libc/rpc/getrpcent.c
@@ -1,33 +1,31 @@
 /*	$NetBSD: getrpcent.c,v 1.17 2000/01/22 22:19:17 mycroft 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 or with the express written consent of
- * Sun Microsystems, Inc.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/getrpcport.c b/lib/libc/rpc/getrpcport.c
index 676a1f5ae14..1ceaa3f5ec2 100644
--- a/lib/libc/rpc/getrpcport.c
+++ b/lib/libc/rpc/getrpcport.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: getrpcport.c,v 1.16 2000/01/22 22:19:18 mycroft 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/key_call.c b/lib/libc/rpc/key_call.c
index afb11c83884..3864061c68b 100644
--- a/lib/libc/rpc/key_call.c
+++ b/lib/libc/rpc/key_call.c
@@ -1,30 +1,29 @@
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/lib/libc/rpc/key_prot_xdr.c b/lib/libc/rpc/key_prot_xdr.c
index bcead6ad802..19a2f6c188d 100644
--- a/lib/libc/rpc/key_prot_xdr.c
+++ b/lib/libc/rpc/key_prot_xdr.c
@@ -6,33 +6,32 @@
 #include "namespace.h"
 #include <rpc/key_prot.h>
 #include "un-namespace.h"
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 /* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
 
diff --git a/lib/libc/rpc/netname.c b/lib/libc/rpc/netname.c
index 72361ba9bd7..7b1661ebb2e 100644
--- a/lib/libc/rpc/netname.c
+++ b/lib/libc/rpc/netname.c
@@ -1,31 +1,29 @@
-/*
- * 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 or with the express written consent of
- * Sun Microsystems, Inc.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/netnamer.c b/lib/libc/rpc/netnamer.c
index 772160a8a6a..fce4b4d90f5 100644
--- a/lib/libc/rpc/netnamer.c
+++ b/lib/libc/rpc/netnamer.c
@@ -1,31 +1,29 @@
-/*
- * 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 or with the express written consent of
- * Sun Microsystems, Inc.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/pmap_clnt.c b/lib/libc/rpc/pmap_clnt.c
index a0db013d3a8..702d58d5bf4 100644
--- a/lib/libc/rpc/pmap_clnt.c
+++ b/lib/libc/rpc/pmap_clnt.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_clnt.c,v 1.16 2000/07/06 03:10:34 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/pmap_getmaps.c b/lib/libc/rpc/pmap_getmaps.c
index 42d3720b09d..34e254a70bd 100644
--- a/lib/libc/rpc/pmap_getmaps.c
+++ b/lib/libc/rpc/pmap_getmaps.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_getmaps.c,v 1.16 2000/07/06 03:10:34 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/pmap_getport.c b/lib/libc/rpc/pmap_getport.c
index ca0aafde9b2..e06f9585b4a 100644
--- a/lib/libc/rpc/pmap_getport.c
+++ b/lib/libc/rpc/pmap_getport.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_getport.c,v 1.16 2000/07/06 03:10:34 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/pmap_prot.c b/lib/libc/rpc/pmap_prot.c
index 2c01311815f..19674678359 100644
--- a/lib/libc/rpc/pmap_prot.c
+++ b/lib/libc/rpc/pmap_prot.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_prot.c,v 1.10 2000/01/22 22:19:18 mycroft 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/pmap_prot2.c b/lib/libc/rpc/pmap_prot2.c
index ae7c7c6fe4a..56a11985d2f 100644
--- a/lib/libc/rpc/pmap_prot2.c
+++ b/lib/libc/rpc/pmap_prot2.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_prot2.c,v 1.14 2000/07/06 03:10:34 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/pmap_rmt.c b/lib/libc/rpc/pmap_rmt.c
index ddcde2e0587..fe7b4323d84 100644
--- a/lib/libc/rpc/pmap_rmt.c
+++ b/lib/libc/rpc/pmap_rmt.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_rmt.c,v 1.29 2000/07/06 03:10:34 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/rpc_callmsg.c b/lib/libc/rpc/rpc_callmsg.c
index ad1bdb3d4d3..5b7ea490094 100644
--- a/lib/libc/rpc/rpc_callmsg.c
+++ b/lib/libc/rpc/rpc_callmsg.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_callmsg.c,v 1.16 2000/07/14 08:40:42 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/rpc_com.h b/lib/libc/rpc/rpc_com.h
index f2bf11f5bf2..770faf91559 100644
--- a/lib/libc/rpc/rpc_com.h
+++ b/lib/libc/rpc/rpc_com.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  *
  * $FreeBSD$
  */
diff --git a/lib/libc/rpc/rpc_commondata.c b/lib/libc/rpc/rpc_commondata.c
index 679233a9521..e63538d20c4 100644
--- a/lib/libc/rpc/rpc_commondata.c
+++ b/lib/libc/rpc/rpc_commondata.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_commondata.c,v 1.7 2000/06/02 23:11:13 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/rpc_dtablesize.c b/lib/libc/rpc/rpc_dtablesize.c
index 5e50ba8d847..4bcb71f5c94 100644
--- a/lib/libc/rpc/rpc_dtablesize.c
+++ b/lib/libc/rpc/rpc_dtablesize.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_dtablesize.c,v 1.14 1998/11/15 17:32:43 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/rpc_generic.c b/lib/libc/rpc/rpc_generic.c
index 0ac4597bc78..57ef267357e 100644
--- a/lib/libc/rpc/rpc_generic.c
+++ b/lib/libc/rpc/rpc_generic.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_generic.c,v 1.4 2000/09/28 09:07:04 kleink 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/lib/libc/rpc/rpc_prot.c b/lib/libc/rpc/rpc_prot.c
index 2a4b57594f3..20dc8fa3484 100644
--- a/lib/libc/rpc/rpc_prot.c
+++ b/lib/libc/rpc/rpc_prot.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_prot.c,v 1.16 2000/06/02 23:11:13 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/rpc_soc.c b/lib/libc/rpc/rpc_soc.c
index 2568d4373b2..d7702f5913b 100644
--- a/lib/libc/rpc/rpc_soc.c
+++ b/lib/libc/rpc/rpc_soc.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_soc.c,v 1.6 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 /* #ident	"@(#)rpc_soc.c	1.17	94/04/24 SMI" */
diff --git a/lib/libc/rpc/rpcb_clnt.c b/lib/libc/rpc/rpcb_clnt.c
index afef8061c67..a0d840e65f4 100644
--- a/lib/libc/rpc/rpcb_clnt.c
+++ b/lib/libc/rpc/rpcb_clnt.c
@@ -1,52 +1,31 @@
 /*	$NetBSD: rpcb_clnt.c,v 1.6 2000/07/16 06:41:43 itojun Exp $	*/
 
-/*
- * The contents of this file are subject to the Sun Standards
- * License Version 1.0 the (the "License";) You may not use
- * this file except in compliance with the License.  You may
- * obtain a copy of the License at lib/libc/rpc/LICENSE
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ * All rights reserved.
  *
- * Software distributed under the License is distributed on
- * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied.  See the License for the specific
- * language governing rights and limitations under the License.
+ * 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 the "Oracle America, Inc." nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * The Original Code is Copyright 1998 by Sun Microsystems, Inc
- *
- * The Initial Developer of the Original Code is:  Sun
- * Microsystems, Inc.
- *
- * All Rights Reserved.
- *
- * 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. 
+ * 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.
  */
 
 /* #ident	"@(#)rpcb_clnt.c	1.27	94/04/24 SMI" */
@@ -61,8 +40,6 @@ __FBSDID("$FreeBSD$");
 /*
  * rpcb_clnt.c
  * interface to rpcbind rpc service.
- *
- * Copyright (C) 1988, Sun Microsystems, Inc.
  */
 
 #include "namespace.h"
diff --git a/lib/libc/rpc/rpcb_prot.c b/lib/libc/rpc/rpcb_prot.c
index f7667497a96..f543aaf0a69 100644
--- a/lib/libc/rpc/rpcb_prot.c
+++ b/lib/libc/rpc/rpcb_prot.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpcb_prot.c,v 1.3 2000/07/14 08:40:42 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/lib/libc/rpc/rpcb_st_xdr.c b/lib/libc/rpc/rpcb_st_xdr.c
index cf1e227df92..8ffc5b6014f 100644
--- a/lib/libc/rpc/rpcb_st_xdr.c
+++ b/lib/libc/rpc/rpcb_st_xdr.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpcb_st_xdr.c,v 1.3 2000/07/14 08:40:42 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright 1991 Sun Microsystems, Inc.
diff --git a/lib/libc/rpc/rpcdname.c b/lib/libc/rpc/rpcdname.c
index d4455f4088c..d6a21c9a946 100644
--- a/lib/libc/rpc/rpcdname.c
+++ b/lib/libc/rpc/rpcdname.c
@@ -1,31 +1,29 @@
-/*
- * 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 or with the express written consent of
- * Sun Microsystems, Inc.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/rtime.c b/lib/libc/rpc/rtime.c
index 39ac19ba4a1..807b14c7240 100644
--- a/lib/libc/rpc/rtime.c
+++ b/lib/libc/rpc/rtime.c
@@ -1,30 +1,29 @@
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 /*
diff --git a/lib/libc/rpc/svc.c b/lib/libc/rpc/svc.c
index 78a8ae12dfc..fff04c01a72 100644
--- a/lib/libc/rpc/svc.c
+++ b/lib/libc/rpc/svc.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc.c,v 1.21 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/svc_auth.c b/lib/libc/rpc/svc_auth.c
index b3894e62628..20685298474 100644
--- a/lib/libc/rpc/svc_auth.c
+++ b/lib/libc/rpc/svc_auth.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_auth.c,v 1.12 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/lib/libc/rpc/svc_auth_des.c b/lib/libc/rpc/svc_auth_des.c
index bd45f20bf42..d6fb6afa60d 100644
--- a/lib/libc/rpc/svc_auth_des.c
+++ b/lib/libc/rpc/svc_auth_des.c
@@ -3,33 +3,32 @@
  * Copyright (c) 1988 by Sun Microsystems, Inc.
  */
 
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 /*
diff --git a/lib/libc/rpc/svc_auth_unix.c b/lib/libc/rpc/svc_auth_unix.c
index 20d4ecc5cf2..7e837d319df 100644
--- a/lib/libc/rpc/svc_auth_unix.c
+++ b/lib/libc/rpc/svc_auth_unix.c
@@ -1,30 +1,29 @@
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/svc_dg.c b/lib/libc/rpc/svc_dg.c
index a78b16095b0..980e39f1b89 100644
--- a/lib/libc/rpc/svc_dg.c
+++ b/lib/libc/rpc/svc_dg.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_dg.c,v 1.4 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 /*
diff --git a/lib/libc/rpc/svc_generic.c b/lib/libc/rpc/svc_generic.c
index 7f6cfb84eae..21569c04214 100644
--- a/lib/libc/rpc/svc_generic.c
+++ b/lib/libc/rpc/svc_generic.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_generic.c,v 1.3 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 /*
diff --git a/lib/libc/rpc/svc_raw.c b/lib/libc/rpc/svc_raw.c
index de95152a0b9..ffa912293d0 100644
--- a/lib/libc/rpc/svc_raw.c
+++ b/lib/libc/rpc/svc_raw.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_raw.c,v 1.14 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/lib/libc/rpc/svc_run.c b/lib/libc/rpc/svc_run.c
index b4627d65875..08c8a842705 100644
--- a/lib/libc/rpc/svc_run.c
+++ b/lib/libc/rpc/svc_run.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_run.c,v 1.17 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/rpc/svc_simple.c b/lib/libc/rpc/svc_simple.c
index cf00727c639..b97f974a299 100644
--- a/lib/libc/rpc/svc_simple.c
+++ b/lib/libc/rpc/svc_simple.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_simple.c,v 1.20 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/lib/libc/rpc/svc_vc.c b/lib/libc/rpc/svc_vc.c
index aded6b19bf7..f8304256000 100644
--- a/lib/libc/rpc/svc_vc.c
+++ b/lib/libc/rpc/svc_vc.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_vc.c,v 1.7 2000/08/03 00:01:53 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/lib/libc/sparc64/fpu/fpu.c b/lib/libc/sparc64/fpu/fpu.c
index 4e92788114d..431207f8a58 100644
--- a/lib/libc/sparc64/fpu/fpu.c
+++ b/lib/libc/sparc64/fpu/fpu.c
@@ -202,7 +202,7 @@ static const int opmask[] = {0, 0, 1, 3, 1};
  * Implement a move operation for all supported operand types. The additional
  * nand and xor parameters will be applied to the upper 32 bit word of the
  * source operand. This allows to implement fabs and fneg (for fp operands
- * only!) using this functions, too, by passing (1 << 31) for one of the
+ * only!) using this functions, too, by passing (1U << 31) for one of the
  * parameters, and 0 for the other.
  */
 static void
@@ -358,10 +358,10 @@ __fpu_execute(struct utrapframe *uf, struct fpemu *fe, u_int32_t insn,
 		__fpu_mov(fe, type, rd, rs2, 0, 0);
 		return (0);
 	case FOP(INS2_FPop1, INSFP1_FNEG):
-		__fpu_mov(fe, type, rd, rs2, 0, (1 << 31));
+		__fpu_mov(fe, type, rd, rs2, 0, (1U << 31));
 		return (0);
 	case FOP(INS2_FPop1, INSFP1_FABS):
-		__fpu_mov(fe, type, rd, rs2, (1 << 31), 0);
+		__fpu_mov(fe, type, rd, rs2, (1U << 31), 0);
 		return (0);
 	case FOP(INS2_FPop1, INSFP1_FSQRT):
 		__fpu_explode(fe, &fe->fe_f1, type, rs2);
diff --git a/lib/libc/sparc64/fpu/fpu_sqrt.c b/lib/libc/sparc64/fpu/fpu_sqrt.c
index 364384b41f6..52290f2b90c 100644
--- a/lib/libc/sparc64/fpu/fpu_sqrt.c
+++ b/lib/libc/sparc64/fpu/fpu_sqrt.c
@@ -257,7 +257,7 @@ __fpu_sqrt(fe)
 	 * double x correctly while doing the `known q=1.0'.
 	 *
 	 * We do this one mantissa-word at a time, as noted above, to
-	 * save work.  To avoid `(1 << 31) << 1', we also do the top bit
+	 * save work.  To avoid `(1U << 31) << 1', we also do the top bit
 	 * outside of each per-word loop.
 	 *
 	 * The calculation `t = y + bit' breaks down into `t0 = y0, ...,
diff --git a/lib/libc/stdio/printf_l.3 b/lib/libc/stdio/printf_l.3
index 20c855b0d53..312d110c297 100644
--- a/lib/libc/stdio/printf_l.3
+++ b/lib/libc/stdio/printf_l.3
@@ -43,6 +43,7 @@
 .Lb libc
 .Sh SYNOPSIS
 .In stdio.h
+.In xlocale.h
 .Ft int
 .Fn printf_l "locale_t loc" "const char * restrict format" "..."
 .Ft int
diff --git a/lib/libc/stdio/scanf_l.3 b/lib/libc/stdio/scanf_l.3
index 405601e1fcb..35a82418ec5 100644
--- a/lib/libc/stdio/scanf_l.3
+++ b/lib/libc/stdio/scanf_l.3
@@ -39,6 +39,7 @@
 .Lb libc
 .Sh SYNOPSIS
 .In stdio.h
+.In xlocale.h
 .Ft int
 .Fn scanf_l "locale_t loc" "const char * restrict format" "..."
 .Ft int
diff --git a/lib/libc/stdlib/atexit.c b/lib/libc/stdlib/atexit.c
index 18c31c3b1ff..01d09fede28 100644
--- a/lib/libc/stdlib/atexit.c
+++ b/lib/libc/stdlib/atexit.c
@@ -151,6 +151,8 @@ __cxa_atexit(void (*func)(void *), void *arg, void *dso)
 #pragma weak __pthread_cxa_finalize
 void __pthread_cxa_finalize(const struct dl_phdr_info *);
 
+static int global_exit;
+
 /*
  * Call all handlers registered with __cxa_atexit for the shared
  * object owning 'dso'.  Note: if 'dso' is NULL, then all remaining
@@ -164,10 +166,12 @@ __cxa_finalize(void *dso)
 	struct atexit_fn fn;
 	int n, has_phdr;
 
-	if (dso != NULL)
+	if (dso != NULL) {
 		has_phdr = _rtld_addr_phdr(dso, &phdr_info);
-	else
+	} else {
 		has_phdr = 0;
+		global_exit = 1;
+	}
 
 	_MUTEX_LOCK(&atexit_mutex);
 	for (p = __atexit; p; p = p->next) {
@@ -177,8 +181,9 @@ __cxa_finalize(void *dso)
 			fn = p->fns[n];
 			if (dso != NULL && dso != fn.fn_dso) {
 				/* wrong DSO ? */
-				if (!has_phdr || !__elf_phdr_match_addr(
-				    &phdr_info, fn.fn_ptr.cxa_func))
+				if (!has_phdr || global_exit ||
+				    !__elf_phdr_match_addr(&phdr_info,
+				    fn.fn_ptr.cxa_func))
 					continue;
 			}
 			/*
@@ -200,6 +205,6 @@ __cxa_finalize(void *dso)
 	if (dso == NULL)
 		_MUTEX_DESTROY(&atexit_mutex);
 
-	if (has_phdr && &__pthread_cxa_finalize != NULL)
+	if (has_phdr && !global_exit && &__pthread_cxa_finalize != NULL)
 		__pthread_cxa_finalize(&phdr_info);
 }
diff --git a/lib/libc/string/strcasecmp.3 b/lib/libc/string/strcasecmp.3
index 598f76f8074..1c8504214f4 100644
--- a/lib/libc/string/strcasecmp.3
+++ b/lib/libc/string/strcasecmp.3
@@ -50,7 +50,7 @@
 .Ft int
 .Fn strcasecmp_l "const char *s1" "const char *s2" "locale_t loc"
 .Ft int
-.Fn strncasecmp_l "const char *s1" "const char *s2" "site_t len" "locale_t loc"
+.Fn strncasecmp_l "const char *s1" "const char *s2" "size_t len" "locale_t loc"
 .Sh DESCRIPTION
 The
 .Fn strcasecmp
diff --git a/lib/libc/string/strlcpy.3 b/lib/libc/string/strlcpy.3
index 9ad663a23e8..76bf6b72ab5 100644
--- a/lib/libc/string/strlcpy.3
+++ b/lib/libc/string/strlcpy.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strlcpy.3,v 1.19 2007/05/31 19:19:32 jmc Exp $
+.\"	$OpenBSD: strlcpy.3,v 1.26 2013/09/30 12:02:35 millert Exp $
 .\"
 .\" Copyright (c) 1998, 2000 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 22, 1998
+.Dd November 4, 2013
 .Dt STRLCPY 3
 .Os
 .Sh NAME
@@ -47,69 +47,81 @@ The
 .Fn strlcpy
 and
 .Fn strlcat
-functions copy and concatenate strings respectively.
-They are designed
-to be safer, more consistent, and less error prone replacements for
+functions copy and concatenate strings with the
+same input parameters and output result as
+.Xr snprintf 3 .
+They are designed to be safer, more consistent, and less error
+prone replacements for the easily misused functions
 .Xr strncpy 3
 and
 .Xr strncat 3 .
-Unlike those functions,
-.Fn strlcpy
-and
-.Fn strlcat
-take the full size of the buffer (not just the length) and guarantee to
-NUL-terminate the result (as long as
-.Fa size
-is larger than 0 or, in the case of
-.Fn strlcat ,
-as long as there is at least one byte free in
-.Fa dst ) .
-Note that a byte for the NUL should be included in
-.Fa size .
-Also note that
-.Fn strlcpy
-and
-.Fn strlcat
-only operate on true
-.Dq C
-strings.
-This means that for
-.Fn strlcpy
-.Fa src
-must be NUL-terminated and for
-.Fn strlcat
-both
-.Fa src
-and
-.Fa dst
-must be NUL-terminated.
 .Pp
-The
 .Fn strlcpy
-function copies up to
-.Fa size
-- 1 characters from the NUL-terminated string
+and
+.Fn strlcat
+take the full size of the destination buffer and guarantee
+NUL-termination if there is room.
+Note that room for the NUL should be included in
+.Fa dstsize .
+.Pp
+.Fn strlcpy
+copies up to
+.Fa dstsize
+\- 1 characters from the string
 .Fa src
 to
 .Fa dst ,
-NUL-terminating the result.
+NUL-terminating the result if
+.Fa dstsize
+is not 0.
 .Pp
-The
 .Fn strlcat
-function appends the NUL-terminated string
+appends string
 .Fa src
 to the end of
 .Fa dst .
 It will append at most
-.Fa size
-- strlen(dst) - 1 bytes, NUL-terminating the result.
+.Fa dstsize
+\- strlen(dst) \- 1 characters.
+It will then NUL-terminate, unless
+.Fa dstsize
+is 0 or the original
+.Fa dst
+string was longer than
+.Fa dstsize
+(in practice this should not happen
+as it means that either
+.Fa dstsize
+is incorrect or that
+.Fa dst
+is not a proper string).
+.Pp
+If the
+.Fa src
+and
+.Fa dst
+strings overlap, the behavior is undefined.
 .Sh RETURN VALUES
-The
+Besides quibbles over the return type
+.Pf ( Va size_t
+versus
+.Va int )
+and signal handler safety
+.Pf ( Xr snprintf 3
+is not entirely safe on some systems), the
+following two are equivalent:
+.Bd -literal -offset indent
+n = strlcpy(dst, src, len);
+n = snprintf(dst, len, "%s", src);
+.Ed
+.Pp
+Like
+.Xr snprintf 3 ,
+the
 .Fn strlcpy
 and
 .Fn strlcat
-functions return the total length of the string they tried to
-create.
+functions return the total length of the string they tried to create.
 For
 .Fn strlcpy
 that means the length of
@@ -121,29 +133,12 @@ that means the initial length of
 plus
 the length of
 .Fa src .
-While this may seem somewhat confusing, it was done to make
-truncation detection simple.
 .Pp
-Note however, that if
-.Fn strlcat
-traverses
-.Fa size
-characters without finding a NUL, the length of the string is considered
-to be
-.Fa size
-and the destination string will not be NUL-terminated (since there was
-no space for the NUL).
-This keeps
-.Fn strlcat
-from running off the end of a string.
-In practice this should not happen (as it means that either
-.Fa size
-is incorrect or that
-.Fa dst
-is not a proper
-.Dq C
-string).
-The check exists to prevent potential security problems in incorrect code.
+If the return value is
+.Cm >=
+.Va dstsize ,
+the output string has been truncated.
+It is the caller's responsibility to handle this.
 .Sh EXAMPLES
 The following code fragment illustrates the simple case:
 .Bd -literal -offset indent
@@ -169,7 +164,7 @@ if (strlcat(pname, file, sizeof(pname)) >= sizeof(pname))
 .Ed
 .Pp
 Since it is known how many characters were copied the first time, things
-can be sped up a bit by using a copy instead of an append.
+can be sped up a bit by using a copy instead of an append:
 .Bd -literal -offset indent
 char *dir, *file, pname[MAXPATHLEN];
 size_t n;
@@ -201,5 +196,5 @@ and
 .Fn strlcat
 functions first appeared in
 .Ox 2.4 ,
-and made their appearance in
+and
 .Fx 3.3 .
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index ac5907b8254..5b05e23d64d 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -300,9 +300,9 @@ MLINKS+=execve.2 fexecve.2
 MLINKS+=extattr_get_file.2 extattr.2 \
 	extattr_get_file.2 extattr_delete_fd.2 \
 	extattr_get_file.2 extattr_delete_file.2 \
-	extattr_get_file.2 extattr_delete_list.2 \
+	extattr_get_file.2 extattr_delete_link.2 \
 	extattr_get_file.2 extattr_get_fd.2 \
-	extattr_get_file.2 extattr_get_list.2 \
+	extattr_get_file.2 extattr_get_link.2 \
 	extattr_get_file.2 extattr_list_fd.2 \
 	extattr_get_file.2 extattr_list_file.2 \
 	extattr_get_file.2 extattr_list_link.2 \
diff --git a/lib/libc/sys/cap_ioctls_limit.2 b/lib/libc/sys/cap_ioctls_limit.2
index 771736acebb..3d2645c32b2 100644
--- a/lib/libc/sys/cap_ioctls_limit.2
+++ b/lib/libc/sys/cap_ioctls_limit.2
@@ -58,7 +58,7 @@ argument is an array of
 commands and the
 .Fa ncmds
 argument specifies the number of elements in the array.
-There might be up to
+There can be up to
 .Va 256
 elements in the array.
 .Pp
@@ -92,7 +92,7 @@ system call was never called for this file descriptor), the
 .Fn cap_ioctls_get
 system call will return
 .Dv CAP_IOCTLS_ALL
-and won't modify the buffer pointed out by the
+and won't modify the buffer pointed to by the
 .Fa cmds
 argument.
 .Sh RETURN VALUES
@@ -100,7 +100,7 @@ argument.
 .Pp
 The
 .Fn cap_ioctls_get
-function, if successfull, returns the total number of allowed ioctl commands or
+function, if successful, returns the total number of allowed ioctl commands or
 the value
 .Dv CAP_IOCTLS_ALL
 if all ioctls commands are allowed.
diff --git a/lib/libc/sys/cap_rights_limit.2 b/lib/libc/sys/cap_rights_limit.2
index 225efad1df9..d17533fb2fc 100644
--- a/lib/libc/sys/cap_rights_limit.2
+++ b/lib/libc/sys/cap_rights_limit.2
@@ -36,19 +36,18 @@
 .Dt CAP_RIGHTS_LIMIT 2
 .Os
 .Sh NAME
-.Nm cap_rights_limit ,
-.Nm cap_rights_get
-.Nd manage capability rights
+.Nm cap_rights_limit
+.Nd limit capability rights
 .Sh LIBRARY
 .Lb libc
 .Sh SYNOPSIS
 .In sys/capability.h
 .Ft int
-.Fn cap_rights_limit "int fd" "cap_rights_t rights"
-.Ft int
-.Fn cap_rights_get "int fd" "cap_rights_t *rightsp"
+.Fn cap_rights_limit "int fd" "const cap_rights_t *rights"
 .Sh DESCRIPTION
 When a file descriptor is created by a function such as
+.Xr accept 2 ,
+.Xr accept4 2 ,
 .Xr fhopen 2 ,
 .Xr kqueue 2 ,
 .Xr mq_open 2 ,
@@ -57,7 +56,7 @@ When a file descriptor is created by a function such as
 .Xr pdfork 2 ,
 .Xr pipe 2 ,
 .Xr shm_open 2 ,
-.Xr socket 2 ,
+.Xr socket 2
 or
 .Xr socketpair 2 ,
 it is assigned all capability rights.
@@ -68,429 +67,48 @@ Once capability rights are reduced, operations on the file descriptor will be
 limited to those permitted by
 .Fa rights .
 .Pp
-A bitmask of capability rights assigned to a file descriptor can be obtained with
-the
-.Fn cap_rights_get
-system call.
-.Sh RIGHTS
-The following rights may be specified in a rights mask:
-.Bl -tag -width CAP_EXTATTR_DELETE
-.It Dv CAP_ACCEPT
-Permit
-.Xr accept 2
-and
-.Xr accept4 2 .
-.It Dv CAP_ACL_CHECK
-Permit checking of an ACL on a file descriptor; there is no cross-reference
-for this system call.
-.It Dv CAP_ACL_DELETE
-Permit
-.Xr acl_delete_fd_np 3 .
-.It Dv CAP_ACL_GET
-Permit
-.Xr acl_get_fd 3
-and
-.Xr acl_get_fd_np 3 .
-.It Dv CAP_ACL_SET
-Permit
-.Xr acl_set_fd 3
-and
-.Xr acl_set_fd_np 3 .
-.It Dv CAP_BIND
-Permit
-.Xr bind 2 .
-Note that sockets can also become bound implicitly as a result of
-.Xr connect 2
-or
-.Xr send 2 ,
-and that socket options set with
-.Xr setsockopt 2
-may also affect binding behavior.
-.It Dv CAP_BINDAT
-Permit
-.Xr bindat 2 .
-This right has to be present on the directory descriptor.
-.It Dv CAP_CONNECT
-Permit
-.Xr connect 2 ;
-also required for
-.Xr sendto 2
-with a non-NULL destination address.
-.It Dv CAP_CONNECTAT
-Permit
-.Xr connectat 2 .
-This right has to be present on the directory descriptor.
-.It Dv CAP_CREATE
-Permit
-.Xr openat 2
-with the
-.Dv O_CREAT
-flag.
-.\" XXXPJD: Doesn't exist anymore.
-.It Dv CAP_EVENT
-Permit
-.Xr select 2 ,
-.Xr poll 2 ,
-and
-.Xr kevent 2
-to be used in monitoring the file descriptor for events.
-.It Dv CAP_FEXECVE
-Permit
-.Xr fexecve 2
-and
-.Xr openat 2
-with the
-.Dv O_EXEC
-flag;
-.Dv CAP_READ
-will also be required.
-.It Dv CAP_EXTATTR_DELETE
-Permit
-.Xr extattr_delete_fd 2 .
-.It Dv CAP_EXTATTR_GET
-Permit
-.Xr extattr_get_fd 2 .
-.It Dv CAP_EXTATTR_LIST
-Permit
-.Xr extattr_list_fd 2 .
-.It Dv CAP_EXTATTR_SET
-Permit
-.Xr extattr_set_fd 2 .
-.It Dv CAP_FCHDIR
-Permit
-.Xr fchdir 2 .
-.It Dv CAP_FCHFLAGS
-Permit
-.Xr fchflags 2
-and
-.Xr chflagsat 2 .
-.It Dv CAP_CHFLAGSAT
-An alias to
-.Dv CAP_FCHFLAGS .
-.It Dv CAP_FCHMOD
-Permit
-.Xr fchmod 2
-and
-.Xr fchmodat 2 .
-.It Dv CAP_FCHMODAT
-An alias to
-.Dv CAP_FCHMOD .
-.It Dv CAP_FCHOWN
-Permit
-.Xr fchown 2
-and
-.Xr fchownat 2 .
-.It Dv CAP_FCHOWNAT
-An alias to
-.Dv CAP_FCHOWN .
-.It Dv CAP_FCNTL
-Permit
-.Xr fcntl 2 .
-Note that only the
-.Dv F_GETFL ,
-.Dv F_SETFL ,
-.Dv F_GETOWN
-and
-.Dv F_SETOWN
-commands require this capability right.
-Also note that the list of permitted commands can be further limited with the
-.Xr cap_fcntls_limit 2
-system call.
-.It Dv CAP_FLOCK
-Permit
-.Xr flock 2 ,
-.Xr fcntl 2
-(with
-.Dv F_GETLK ,
-.Dv F_SETLK
-or
-.Dv F_SETLKW
-flag) and
-.Xr openat 2
-(with
-.Dv O_EXLOCK
-or
-.Dv O_SHLOCK
-flag).
-.It Dv CAP_FPATHCONF
-Permit
-.Xr fpathconf 2 .
-.It Dv CAP_FSCK
-Permit UFS background-fsck operations on the descriptor.
-.It Dv CAP_FSTAT
-Permit
-.Xr fstat 2
-and
-.Xr fstatat 2 .
-.It Dv CAP_FSTATAT
-An alias to
-.Dv CAP_FSTAT .
-.It Dv CAP_FSTATFS
-Permit
-.Xr fstatfs 2 .
-.It Dv CAP_FSYNC
-Permit
-.Xr aio_fsync 2 ,
-.Xr fsync 2
-and
-.Xr openat 2
-with
-.Dv O_FSYNC
-or
-.Dv O_SYNC
-flag.
-.It Dv CAP_FTRUNCATE
-Permit
-.Xr ftruncate 2
-and
-.Xr openat 2
-with the
-.Dv O_TRUNC
-flag.
-.It Dv CAP_FUTIMES
-Permit
-.Xr futimes 2
-and
-.Xr futimesat 2 .
-.It Dv CAP_FUTIMESAT
-An alias to
-.Dv CAP_FUTIMES .
-.It Dv CAP_GETPEERNAME
-Permit
-.Xr getpeername 2 .
-.It Dv CAP_GETSOCKNAME
-Permit
-.Xr getsockname 2 .
-.It Dv CAP_GETSOCKOPT
-Permit
-.Xr getsockopt 2 .
-.It Dv CAP_IOCTL
-Permit
-.Xr ioctl 2 .
-Be aware that this system call has enormous scope, including potentially
-global scope for some objects.
-The list of permitted ioctl commands can be further limited with the
-.Xr cap_ioctls_limit 2
-system call.
-.\" XXXPJD: Doesn't exist anymore.
-.It Dv CAP_KEVENT
-Permit
-.Xr kevent 2 ;
-.Dv CAP_EVENT
-is also required on file descriptors that will be monitored using
-.Xr kevent 2 .
-.It Dv CAP_LINKAT
-Permit
-.Xr linkat 2
-and
-.Xr renameat 2 .
-This right is required for the destination directory descriptor.
-.It Dv CAP_LISTEN
-Permit
-.Xr listen 2 ;
-not much use (generally) without
-.Dv CAP_BIND .
-.It Dv CAP_LOOKUP
-Permit the file descriptor to be used as a starting directory for calls such as
-.Xr linkat 2 ,
-.Xr openat 2 ,
-and
-.Xr unlinkat 2 .
-.It Dv CAP_MAC_GET
-Permit
-.Xr mac_get_fd 3 .
-.It Dv CAP_MAC_SET
-Permit
-.Xr mac_set_fd 3 .
-.It Dv CAP_MKDIRAT
-Permit
-.Xr mkdirat 2 .
-.It Dv CAP_MKFIFOAT
-Permit
-.Xr mkfifoat 2 .
-.It Dv CAP_MKNODAT
-Permit
-.Xr mknodat 2 .
-.It Dv CAP_MMAP
-Permit
-.Xr mmap 2
-with the
-.Dv PROT_NONE
-protection.
-.It Dv CAP_MMAP_R
-Permit
-.Xr mmap 2
-with the
-.Dv PROT_READ
-protection.
-This also implies
-.Dv CAP_READ
-and
-.Dv CAP_SEEK
-rights.
-.It Dv CAP_MMAP_W
-Permit
-.Xr mmap 2
-with the
-.Dv PROT_WRITE
-protection.
-This also implies
-.Dv CAP_WRITE
-and
-.Dv CAP_SEEK
-rights.
-.It Dv CAP_MMAP_X
-Permit
-.Xr mmap 2
-with the
-.Dv PROT_EXEC
-protection.
-This also implies
-.Dv CAP_SEEK
-right.
-.It Dv CAP_MMAP_RW
-Implies
-.Dv CAP_MMAP_R
-and
-.Dv CAP_MMAP_W .
-.It Dv CAP_MMAP_RX
-Implies
-.Dv CAP_MMAP_R
-and
-.Dv CAP_MMAP_X .
-.It Dv CAP_MMAP_WX
-Implies
-.Dv CAP_MMAP_W
-and
-.Dv CAP_MMAP_X .
-.It Dv CAP_MMAP_RWX
-Implies
-.Dv CAP_MMAP_R ,
-.Dv CAP_MMAP_W
-and
-.Dv CAP_MMAP_X .
-.It Dv CAP_PDGETPID
-Permit
-.Xr pdgetpid 2 .
-.It Dv CAP_PDKILL
-Permit
-.Xr pdkill 2 .
-.It Dv CAP_PDWAIT
-Permit
-.Xr pdwait4 2 .
-.It Dv CAP_PEELOFF
-Permit
-.Xr sctp_peeloff 2 .
-.\" XXXPJD: Not documented.
-.It Dv CAP_POLL_EVENT
-.\" XXXPJD: Not documented.
-.It Dv CAP_POST_EVENT
-.It Dv CAP_PREAD
-Implies
-.Dv CAP_SEEK
-and
-.Dv CAP_READ .
-.It Dv CAP_PWRITE
-Implies
-.Dv CAP_SEEK
-and
-.Dv CAP_WRITE .
-.It Dv CAP_READ
-Allow
-.Xr aio_read 2 ,
-.Xr openat
-with the
-.Dv O_RDONLY flag,
-.Xr read 2 ,
-.Xr recv 2 ,
-.Xr recvfrom 2 ,
-.Xr recvmsg 2
-and related system calls.
-.It Dv CAP_RECV
-An alias to
-.Dv CAP_READ .
-.It Dv CAP_RENAMEAT
-Permit
-.Xr renameat 2 .
-This right is required for the source directory descriptor.
-.It Dv CAP_SEEK
-Permit operations that seek on the file descriptor, such as
-.Xr lseek 2 ,
-but also required for I/O system calls that can read or write at any position
-in the file, such as
-.Xr pread 2
-and
-.Xr pwrite 2 .
-.It Dv CAP_SEM_GETVALUE
-Permit
-.Xr sem_getvalue 3 .
-.It Dv CAP_SEM_POST
-Permit
-.Xr sem_post 3 .
-.It Dv CAP_SEM_WAIT
-Permit
-.Xr sem_wait 3
-and
-.Xr sem_trywait 3 .
-.It Dv CAP_SEND
-An alias to
-.Dv CAP_WRITE .
-.It Dv CAP_SETSOCKOPT
-Permit
-.Xr setsockopt 2 ;
-this controls various aspects of socket behavior and may affect binding,
-connecting, and other behaviors with global scope.
-.It Dv CAP_SHUTDOWN
-Permit explicit
-.Xr shutdown 2 ;
-closing the socket will also generally shut down any connections on it.
-.It Dv CAP_SYMLINKAT
-Permit
-.Xr symlinkat 2 .
-.It Dv CAP_TTYHOOK
-Allow configuration of TTY hooks, such as
-.Xr snp 4 ,
-on the file descriptor.
-.It Dv CAP_UNLINKAT
-Permit
-.Xr unlinkat 2
-and
-.Xr renameat 2 .
-This right is only required for
-.Xr renameat 2
-on the destination directory descriptor if the destination object already
-exists and will be removed by the rename.
-.It Dv CAP_WRITE
-Allow
-.Xr aio_write 2 ,
-.Xr openat 2
-with
-.Dv O_WRONLY
-and
-.Dv O_APPEND
-flags,
-.Xr send 2 ,
-.Xr sendmsg 2 ,
-.Xr sendto 2 ,
-.Xr write 2 ,
-and related system calls.
-For
-.Xr sendto 2
-with a non-NULL connection address,
-.Dv CAP_CONNECT
-is also required.
-For
-.Xr openat 2
-with the
-.Dv O_WRONLY
-flag, but without the
-.Dv O_APPEND
-flag,
-.Dv CAP_SEEK
-is also required.
-.El
+The
+.Fa rights
+argument should be prepared using
+.Xr cap_rights_init 3
+family of functions.
+.Pp
+Capability rights assigned to a file descriptor can be obtained with the
+.Xr cap_rights_get 3
+function.
+.Pp
+The complete list of the capability rights can be found in the
+.Xr rights 4
+manual page.
 .Sh RETURN VALUES
 .Rv -std
+.Sh EXAMPLES
+The following example demonstrates how to limit file descriptor capability
+rights to allow reading only.
+.Bd -literal
+cap_rights_t rights;
+char buf[1];
+int fd;
+
+fd = open("/tmp/foo", O_RDWR);
+if (fd < 0)
+	err(1, "open() failed");
+
+if (cap_enter() < 0)
+	err(1, "cap_enter() failed");
+
+cap_rights_init(&setrights, CAP_READ);
+if (cap_rights_limit(fd, &setrights) < 0)
+	err(1, "cap_rights_limit() failed");
+
+buf[0] = 'X';
+
+if (write(fd, buf, sizeof(buf)) > 0)
+	errx(1, "write() succeeded!");
+
+if (read(fd, buf, sizeof(buf)) < 0)
+	err(1, "read() failed");
+.Ed
 .Sh ERRORS
 .Fn cap_rights_limit
 succeeds unless:
@@ -503,106 +121,32 @@ argument is not a valid active descriptor.
 An invalid right has been requested in
 .Fa rights .
 .It Bq Er ENOTCAPABLE
+The
 .Fa rights
-contains requested rights not present in the current rights mask associated
-with the given file descriptor.
-.El
-.Pp
-.Fn cap_rights_get
-succeeds unless:
-.Bl -tag -width Er
-.It Bq Er EBADF
-The
-.Fa fd
-argument is not a valid active descriptor.
-.It Bq Er EFAULT
-The
-.Fa rightsp
-argument points at an invalid address.
+argument contains capability rights not present for the given file descriptor.
+Capability rights list can only be reduced, never expanded.
 .El
 .Sh SEE ALSO
 .Xr accept 2 ,
-.Xr aio_fsync 2 ,
-.Xr aio_read 2 ,
-.Xr aio_write 2 ,
-.Xr bind 2 ,
-.Xr bindat 2 ,
+.Xr accept4 2 ,
 .Xr cap_enter 2 ,
-.Xr cap_fcntls_limit 2 ,
-.Xr cap_ioctls_limit 2 ,
-.Xr cap_rights_limit 2 ,
-.Xr connect 2 ,
-.Xr connectat 2 ,
-.Xr dup 2 ,
-.Xr dup2 2 ,
-.Xr extattr_delete_fd 2 ,
-.Xr extattr_get_fd 2 ,
-.Xr extattr_list_fd 2 ,
-.Xr extattr_set_fd 2 ,
-.Xr fchflags 2 ,
-.Xr fchown 2 ,
-.Xr fcntl 2 ,
-.Xr fexecve 2 ,
 .Xr fhopen 2 ,
-.Xr flock 2 ,
-.Xr fpathconf 2 ,
-.Xr fstat 2 ,
-.Xr fstatfs 2 ,
-.Xr fsync 2 ,
-.Xr ftruncate 2 ,
-.Xr futimes 2 ,
-.Xr getpeername 2 ,
-.Xr getsockname 2 ,
-.Xr getsockopt 2 ,
-.Xr ioctl 2 ,
-.Xr kevent 2 ,
 .Xr kqueue 2 ,
-.Xr linkat 2 ,
-.Xr listen 2 ,
-.Xr mmap 2 ,
 .Xr mq_open 2 ,
 .Xr open 2 ,
 .Xr openat 2 ,
 .Xr pdfork 2 ,
-.Xr pdgetpid 2 ,
-.Xr pdkill 2 ,
-.Xr pdwait4 2 ,
 .Xr pipe 2 ,
-.Xr poll 2 ,
-.Xr pread 2 ,
-.Xr pwrite 2 ,
 .Xr read 2 ,
-.Xr recv 2 ,
-.Xr recvfrom 2 ,
-.Xr recvmsg 2 ,
-.Xr renameat 2 ,
-.Xr sctp_peeloff 2 ,
-.Xr select 2 ,
-.Xr send 2 ,
-.Xr sendmsg 2 ,
-.Xr sendto 2 ,
-.Xr setsockopt 2 ,
 .Xr shm_open 2 ,
-.Xr shutdown 2 ,
 .Xr socket 2 ,
 .Xr socketpair 2 ,
-.Xr symlinkat 2 ,
-.Xr unlinkat 2 ,
 .Xr write 2 ,
-.Xr acl_delete_fd_np 3 ,
-.Xr acl_get_fd 3 ,
-.Xr acl_get_fd_np 3 ,
-.Xr acl_set_fd_np 3 ,
-.Xr cap_limitfd 3 ,
-.Xr libcapsicum 3 ,
-.Xr mac_get_fd 3 ,
-.Xr mac_set_fd 3 ,
-.Xr sem_getvalue 3 ,
-.Xr sem_post 3 ,
-.Xr sem_trywait 3 ,
-.Xr sem_wait 3 ,
+.Xr cap_rights_get 3 ,
+.Xr cap_rights_init 3 ,
+.Xr err 3 ,
 .Xr capsicum 4 ,
-.Xr snp 4
+.Xr rights 4
 .Sh HISTORY
 Support for capabilities and capabilities mode was developed as part of the
 .Tn TrustedBSD
@@ -611,9 +155,3 @@ Project.
 This function was created by
 .An Pawel Jakub Dawidek Aq pawel@dawidek.net
 under sponsorship of the FreeBSD Foundation.
-.Sh BUGS
-This man page should list the set of permitted system calls more specifically
-for each capability right.
-.Pp
-Capability rights sometimes have unclear indirect impacts, which should be
-documented, or at least hinted at.
diff --git a/lib/libc/sys/chmod.2 b/lib/libc/sys/chmod.2
index 997df88e9a8..332cf3a132f 100644
--- a/lib/libc/sys/chmod.2
+++ b/lib/libc/sys/chmod.2
@@ -28,7 +28,7 @@
 .\"     @(#)chmod.2	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd April 10, 2008
+.Dd December 1, 2013
 .Dt CHMOD 2
 .Os
 .Sh NAME
@@ -139,21 +139,24 @@ defined in
 
 #define S_ISUID 0004000    /* set user id on execution */
 #define S_ISGID 0002000    /* set group id on execution */
-#ifndef __BSD_VISIBLE
-#define S_ISTXT 0001000    /* sticky bit */
-#endif
+#define S_ISVTX 0001000    /* sticky bit */
 .Ed
 .Pp
+The non-standard
+.Dv S_ISTXT
+is a synonym for
+.Dv S_ISVTX .
+.Pp
 The
 .Fx
 VM system totally ignores the sticky bit
-.Pq Dv ISTXT
+.Pq Dv S_ISVTX
 for executables.
 On UFS-based file systems (FFS, LFS) the sticky
 bit may only be set upon directories.
 .Pp
 If mode
-.Dv ISTXT
+.Dv S_ISVTX
 (the `sticky bit') is set on a directory,
 an unprivileged user may not delete or rename
 files of other users in that directory.
@@ -296,12 +299,15 @@ The
 system call is expected to conform to
 .St -p1003.1-90 ,
 except for the return of
-.Er EFTYPE
-and the use of
-.Dv S_ISTXT .
+.Er EFTYPE .
+The
+.Dv S_ISVTX
+bit on directories is expected to conform to
+.St -susv3 .
 The
 .Fn fchmodat
-system call follows The Open Group Extended API Set 2 specification.
+system call is expected to conform to
+.St -p1003.1-2008 .
 .Sh HISTORY
 The
 .Fn chmod
diff --git a/lib/libc/sys/getrlimit.2 b/lib/libc/sys/getrlimit.2
index 35198bce306..1f84bfb0f0e 100644
--- a/lib/libc/sys/getrlimit.2
+++ b/lib/libc/sys/getrlimit.2
@@ -108,6 +108,8 @@ Please see
 for a complete description of this sysctl.
 .It Dv RLIMIT_NPTS
 The maximum number of pseudo-terminals created by this user id.
+.It Dv RLIMIT_KQUEUES
+The maximum number of kqueues created by this user id.
 .El
 .Pp
 A resource limit is specified as a soft limit and a hard limit.
diff --git a/lib/libc/sys/kqueue.2 b/lib/libc/sys/kqueue.2
index ed3a8adfa73..75c8207e744 100644
--- a/lib/libc/sys/kqueue.2
+++ b/lib/libc/sys/kqueue.2
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 21, 2013
+.Dd November 4, 2013
 .Dt KQUEUE 2
 .Os
 .Sh NAME
@@ -532,6 +532,13 @@ system call fails if:
 .Bl -tag -width Er
 .It Bq Er ENOMEM
 The kernel failed to allocate enough memory for the kernel queue.
+.It Bq Er ENOMEM
+The
+.Dv RLIMIT_KQUEUES
+rlimit
+(see
+.Xr getrlimit 2 )
+for the current user would be exceeded.
 .It Bq Er EMFILE
 The per-process descriptor table is full.
 .It Bq Er ENFILE
diff --git a/lib/libc/sys/pdfork.2 b/lib/libc/sys/pdfork.2
index 26d0eb0fe36..8fb1f856403 100644
--- a/lib/libc/sys/pdfork.2
+++ b/lib/libc/sys/pdfork.2
@@ -125,12 +125,6 @@ is set; if the process is still alive and this is
 the last reference to the process descriptor, the process will be terminated
 with the signal
 .Dv SIGKILL .
-.Pp
-.Nm
-and associated functions depend on
-.Cd "options PROCDESC"
-described in
-.Xr procdesc 4 .
 .Sh RETURN VALUES
 .Fn pdfork
 returns a PID, 0 or -1, as
diff --git a/lib/libc/sys/wait.2 b/lib/libc/sys/wait.2
index cfa78e9fd83..84b2b1a9d77 100644
--- a/lib/libc/sys/wait.2
+++ b/lib/libc/sys/wait.2
@@ -28,7 +28,7 @@
 .\"     @(#)wait.2	8.2 (Berkeley) 4/19/94
 .\" $FreeBSD$
 .\"
-.Dd September 7, 2013
+.Dd December 3, 2013
 .Dt WAIT 2
 .Os
 .Sh NAME
@@ -48,7 +48,7 @@
 .Fn wait "int *status"
 .Ft pid_t
 .Fn waitpid "pid_t wpid" "int *status" "int options"
-.In sys/signal.h
+.In signal.h
 .Ft int
 .Fn waitid "idtype_t idtype" "id_t id" "siginfo_t *info" "int options"
 .In sys/time.h
@@ -62,63 +62,76 @@
 .Sh DESCRIPTION
 The
 .Fn wait
-function suspends execution of its calling process until
+function suspends execution of its calling thread until
 .Fa status
-information is available for a terminated child process,
+information is available for a child process
 or a signal is received.
 On return from a successful
 .Fn wait
 call,
 the
 .Fa status
-area contains termination information about the process that exited
+area contains information about the process that reported a status change
 as defined below.
-The
-.Fn wait
-call is the same as
-.Fn wait4
-with a
-.Fa wpid
-value of -1,
-with an
-.Fa options
-value of zero,
-and a
-.Fa rusage
-value of zero.
 .Pp
 The
 .Fn wait4
-system call provides a more general interface for programs
-that need to wait for certain child processes,
+and
+.Fn wait6
+system calls provide a more general interface for programs
+that need to wait for specific child processes,
 that need resource utilization statistics accumulated by child processes,
 or that require options.
-.Pp
-The broadest interface of all functions in this family is
-.Fn wait6
-which is otherwise very much like
+The other wait functions are implemented using either
 .Fn wait4
-but with a few very important distinctions.
-To wait for exited processes, the option flag
+or
+.Fn wait6 .
+.Pp
+The
+.Fn wait6
+function is the most general function in this family and its distinct
+features are:
+.Pp
+All of the desired process statuses to be waited on must be explicitly
+specified in
+.Fa options .
+The
+.Fn wait ,
+.Fn waitpid ,
+.Fn wait3 ,
+and
+.Fn wait4
+functions all implicitly wait for exited and trapped processes,
+but the
+.Fn waitid
+and
+.Fn wait6
+functions require the corresponding
 .Dv WEXITED
-need to be explicitly specified.
-This allows for waiting for processes which have experienced other
-status changes without having to handle also the exit status from
-the terminated processes.
-Instead of the traditional
-.Dv rusage
-argument, a pointer to a new structure
+and
+.Dv WTRAPPED
+flags to be explicitly specified.
+This allows waiting for processes which have experienced other
+status changes without having to also handle the exit status from
+terminated processes.
+.Pp
+The
+.Fn wait6
+function accepts a
+.Fa wrusage
+argument which points to a structure defined as:
 .Bd -literal
 struct __wrusage {
 	struct rusage   wru_self;
 	struct rusage   wru_children;
 };
 .Ed
-can be passed.
+.Pp
 This allows the calling process to collect resource usage statistics
 from both its own child process as well as from its grand children.
 When no resource usage statistics are needed this pointer can be
 .Dv NULL .
+.Pp
 The last argument
 .Fa infop
 must be either
@@ -126,11 +139,13 @@ must be either
 or a pointer to a
 .Fa siginfo_t
 structure.
-When specified, the structure is filled the same as for
-.Dv SIGNCHLD
-signal, delivered at the process state change.
-.br
-The process, which state is queried, is specified by two arguments
+If
+.Pf non- Dv NULL ,
+the structure is filled with the same data as for a
+.Dv SIGCHLD
+signal delivered when the process changed state.
+.Pp
+The set of child processes to be queried is specified by the arguments
 .Fa idtype
 and
 .Fa id .
@@ -138,8 +153,8 @@ The separate
 .Fa idtype
 and
 .Fa id
-arguments allows to support many other types of
-IDs  as well in addition to PID and PGID.
+arguments support many other types of
+identifers in addition to process IDs and process group IDs.
 .Bl -bullet -offset indent
 .It
 If
@@ -188,50 +203,33 @@ and
 wait for any child process in the same process group as the caller.
 .El
 .Pp
-Non-standard specifiers for the process to wait for, supported by this
+Non-standard identifier types supported by this
 implementation of
 .Fn waitid
 and
-.Fn wait6 ,
+.Fn wait6
 are:
-.Bl -bullet -offset indent
-.It
-The
-.Fa idtype
-value
-.Dv P_UID
-waits for processes which effective UID is equal to
-.Dv (uid_t)id .
-.It
-The
-.Fa idtype
-value
-.Dv P_GID
-waits for processes which effective GID is equal to
-.Dv (gid_t)id .
-.It
-The
-.Fa idtype
-value
-.Dv P_SID
-waits for processes which session ID is equal to
-.Dv id .
-In case the child process started its own new session,
-SID will be the same as its own PID.
-Otherwise the SID of a child process will match the caller's SID.
-.It
-The
-.Fa idtype
-value
-.Dv P_JAILID
-waits for processes within a jail which jail identifier is equal
-to
-.Dv id .
+.Bl -tag -width P_JAILID
+.It Dv P_UID
+Wait for processes whose effective user ID is equal to
+.Dv (uid_t) Fa id .
+.It Dv P_GID
+Wait for processes whose effective group ID is equal to
+.Dv (gid_t) Fa id .
+.It Dv P_SID
+Wait for processes whose session ID is equal to
+.Fa id .
+.\" This is just how sessions work, not sure this needs to be documented here
+If the child process started its own session,
+its session ID will be the same as its process ID.
+Otherwise the session ID of a child process will match the caller's session ID.
+.It Dv P_JAILID
+Waits for processes within a jail whose jail identifier is equal to
+.Fa id .
 .El
 .Pp
-For
-.Fn wait ,
-.Fn wait3 ,
+For the
+.Fn waitpid
 and
 .Fn wait4
 functions, the single
@@ -250,12 +248,12 @@ the call waits for any child process in the process group of the caller.
 .It
 If
 .Fa wpid
-is greater than zero, the call waits for the process with process id
+is greater than zero, the call waits for the process with process ID
 .Fa wpid .
 .It
 If
 .Fa wpid
-is less than -1, the call waits for any process whose process group id
+is less than -1, the call waits for any process whose process group ID
 equals the absolute value of
 .Fa wpid .
 .El
@@ -267,30 +265,28 @@ argument is defined below.
 The
 .Fa options
 argument contains the bitwise OR of any of the following options.
-.Bl -tag -width Ds
+.Bl -tag -width WCONTINUED
 .It Dv WCONTINUED
-indicates that children of the current process that
-have continued from a job control stop, by receiving a
+Report the status of selected processes that
+have continued from a job control stop by receiving a
 .Dv SIGCONT
-signal, should also have their status reported.
+signal.
 .It Dv WNOHANG
-is used to indicate that the call should not block when
+Do not block when
 there are no processes wishing to report status.
 .It Dv WUNTRACED
-indicates that children of the current process which are stopped
-due to a
+Report the status of selected processes which are stopped due to a
 .Dv SIGTTIN , SIGTTOU , SIGTSTP ,
 or
 .Dv SIGSTOP
-signal shall have their status reported.
+signal.
 .It Dv WSTOPPED
-is an alias for
+An alias for
 .Dv WUNTRACED .
 .It Dv WTRAPPED
-allows waiting for processes which have trapped or reached a breakpoint.
-.It Dv WEXITED
-indicates that the caller is wants to receive status reports from
-terminated processes.
+Report the status of selected processes which are being traced via
+.Xr ptrace 2
+and have trapped or reached a breakpoint.
 This flag is implicitly set for the functions
 .Fn wait ,
 .Fn waitpid ,
@@ -302,11 +298,27 @@ For the
 .Fn waitid
 and
 .Fn wait6
-functions, the flag has to be explicitly included in the
-.Fa options ,
+functions, the flag has to be explicitly included in
+.Fa options
+if status reports from trapped processes are expected.
+.It Dv WEXITED
+Report the status of selected processes which have terminated.
+This flag is implicitly set for the functions
+.Fn wait ,
+.Fn waitpid ,
+.Fn wait3 ,
+and
+.Fn wait4 .
+.br
+For the
+.Fn waitid
+and
+.Fn wait6
+functions, the flag has to be explicitly included in
+.Fa options
 if status reports from terminated processes are expected.
 .It Dv WNOWAIT
-keeps the process whose status is returned in a waitable state.
+Keep the process whose status is returned in a waitable state.
 The process may be waited for again after this call completes.
 .El
 .sp
@@ -336,50 +348,68 @@ process and all its children is returned.
 .Pp
 If
 .Fa wrusage
-argument is non-NULL, a resource usage statistics
-from both its own child process as well as from its grand children
-is returned.
+is non-NULL, separate summaries are returned for the resources used
+by the terminated process and the resources used by all its children.
 .Pp
 If
 .Fa infop
-is non-NULL, it must point to a
+is non-NULL, a
 .Dv siginfo_t
-structure which is filled on return such that the
-.Dv si_signo
-field is always
+structure is returned with the
+.Fa si_signo
+field set to
 .Dv SIGCHLD
-and the field
-.Dv si_pid
-if be non-zero, if there is a status change to report.
-If there are no status changes to report and WNOHANG is applied,
-both of these fields are returned zero.
-When using the
-.Fn waitid
-function with the
+and the
+.Fa si_pid
+field set to the process ID of the process reporting status.
+.Pp
+When the
 .Dv WNOHANG
-option set, checking these fields is the only way to know whether
-there were any status changes to report, because the return value
-from
+option is specified and no processes
+wish to report status,
 .Fn waitid
-is be zero as it is for any successful return from
-.Fn waitid .
+sets the
+.Fa si_signo
+and
+.Fa si_pid
+fields in
+.Fa infop
+to zero.
+Checking these fields is the only way to know if a status change was reported.
 .Pp
 When the
 .Dv WNOHANG
 option is specified and no processes
 wish to report status,
 .Fn wait4
-returns a
+and
+.Fn wait6
+return a
 process id
 of 0.
 .Pp
 The
+.Fn wait
+call is the same as
+.Fn wait4
+with a
+.Fa wpid
+value of -1,
+with an
+.Fa options
+value of zero,
+and a
+.Fa rusage
+value of
+.Dv NULL .
+The
 .Fn waitpid
 function is identical to
 .Fn wait4
 with an
 .Fa rusage
-value of zero.
+value of
+.Dv NULL .
 The older
 .Fn wait3
 call is the same as
@@ -388,29 +418,31 @@ with a
 .Fa wpid
 value of -1.
 The
+.Fn wait4
+function is identical to
 .Fn wait6
-call, with the bits
+with the flags
 .Dv WEXITED
 and
 .Dv WTRAPPED
-set in the
+set in
 .Fa options
-and with
+and
 .Fa infop
 set to
-.Dv NULL ,
-is similar to
-.Fn wait4 .
+.Dv NULL .
 .Pp
-The following macros may be used to test the manner of exit of the process.
-One of the first four macros will evaluate to a non-zero (true) value:
+The following macros may be used to test the current status of the process.
+Exactly one of the following four macros will evaluate to a non-zero
+.Pq true
+value:
 .Bl -tag -width Ds
 .It Fn WIFCONTINUED status
 True if the process has not terminated, and
 has continued after a job control stop.
 This macro can be true only if the wait call specified the
 .Dv WCONTINUED
-option).
+option.
 .It Fn WIFEXITED status
 True if the process terminated normally by a call to
 .Xr _exit 2
@@ -481,7 +513,7 @@ in
 The implementation queues one
 .Dv SIGCHLD
 signal for each child process whose
-status has changed, if
+status has changed; if
 .Fn wait
 returns because the status of a child process is available, the pending
 SIGCHLD signal associated with the process ID of the child process will
@@ -492,7 +524,7 @@ signals remain pending.
 .Pp
 If
 .Dv SIGCHLD
-is blocked,
+is blocked and
 .Fn wait
 returns because the status of a child process is available, the pending
 .Dv SIGCHLD
@@ -538,13 +570,23 @@ If
 .Fn waitid
 returns because one or more processes have a state change to report,
 0 is returned.
-To indicate an error, -1 will be returned and
-.Dv errno
-set to an appropriate value.
+If an error is detected,
+a value of -1
+is returned and
+.Va errno
+is set to indicate the error.
 If
 .Dv WNOHANG
-was used, 0 can be returned indicating no error, but no processes
-may have changed state either, if si_signo and/or si_pid are zero.
+is specified and there are
+no stopped, continued or exited children,
+0 is returned.
+The
+.Fa si_signo
+and
+.Fa si_pid
+fields of
+.Fa infop
+must be checked against zero to determine if a process reported status.
 .Sh ERRORS
 The
 .Fn wait
@@ -620,7 +662,7 @@ requires
 .Fn waitid
 to return the full 32 bits passed to
 .Xr _exit 2 ;
-this implementation only returns 8 bits like in the other calls.
+this implementation only returns 8 bits like the other calls.
 .Sh HISTORY
 The
 .Fn wait
diff --git a/lib/libc/xdr/xdr.c b/lib/libc/xdr/xdr.c
index 337cdc0da87..4435119bd53 100644
--- a/lib/libc/xdr/xdr.c
+++ b/lib/libc/xdr/xdr.c
@@ -1,32 +1,34 @@
 /*	$NetBSD: xdr.c,v 1.22 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * 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.
+ *     * 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 the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * 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
+ *   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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -39,8 +41,6 @@ __FBSDID("$FreeBSD$");
 /*
  * xdr.c, Generic XDR routines implementation.
  *
- * Copyright (C) 1986, Sun Microsystems, Inc.
- *
  * These are the "generic" xdr routines used to serialize and de-serialize
  * most common data items.  See xdr.h for more info on the interface to
  * xdr.
diff --git a/lib/libc/xdr/xdr_array.c b/lib/libc/xdr/xdr_array.c
index 6c35452612f..620155c7882 100644
--- a/lib/libc/xdr/xdr_array.c
+++ b/lib/libc/xdr/xdr_array.c
@@ -1,32 +1,34 @@
 /*	$NetBSD: xdr_array.c,v 1.12 2000/01/22 22:19:18 mycroft 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.
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * 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.
+ *     * 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 the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * 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
+ *   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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -39,8 +41,6 @@ __FBSDID("$FreeBSD$");
 /*
  * xdr_array.c, Generic XDR routines impelmentation.
  *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
  * These are the "non-trivial" xdr primitives used to serialize and de-serialize
  * arrays.  See xdr.h for more info on the interface to xdr.
  */
diff --git a/lib/libc/xdr/xdr_float.c b/lib/libc/xdr/xdr_float.c
index 0a4f09f05f0..8051649202d 100644
--- a/lib/libc/xdr/xdr_float.c
+++ b/lib/libc/xdr/xdr_float.c
@@ -1,32 +1,34 @@
 /*	$NetBSD: xdr_float.c,v 1.23 2000/07/17 04:59:51 matt 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.
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * 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.
+ *     * 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 the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * 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
+ *   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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -39,8 +41,6 @@ __FBSDID("$FreeBSD$");
 /*
  * xdr_float.c, Generic XDR routines implementation.
  *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
  * These are the "floating point" xdr routines used to (de)serialize
  * most common data items.  See xdr.h for more info on the interface to
  * xdr.
diff --git a/lib/libc/xdr/xdr_mem.c b/lib/libc/xdr/xdr_mem.c
index 138269c9d50..70f79c680d2 100644
--- a/lib/libc/xdr/xdr_mem.c
+++ b/lib/libc/xdr/xdr_mem.c
@@ -1,32 +1,34 @@
 /*	$NetBSD: xdr_mem.c,v 1.15 2000/01/22 22:19:18 mycroft 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.
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * 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.
+ *     * 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 the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * 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
+ *   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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -39,8 +41,6 @@ __FBSDID("$FreeBSD$");
 /*
  * xdr_mem.h, XDR implementation using memory buffers.
  *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
  * If you have some data to be interpreted as external data representation
  * or to be converted to external data representation in a memory buffer,
  * then this is the package for you.
diff --git a/lib/libc/xdr/xdr_rec.c b/lib/libc/xdr/xdr_rec.c
index dc4aa18f14b..3f63498f57b 100644
--- a/lib/libc/xdr/xdr_rec.c
+++ b/lib/libc/xdr/xdr_rec.c
@@ -1,32 +1,34 @@
 /*	$NetBSD: xdr_rec.c,v 1.18 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * 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.
+ *     * 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 the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * 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
+ *   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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint) 
@@ -40,8 +42,6 @@ __FBSDID("$FreeBSD$");
  * xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
  * layer above tcp (for rpc's use).
  *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
  * These routines interface XDRSTREAMS to a tcp/ip connection.
  * There is a record marking layer between the xdr stream
  * and the tcp transport level.  A record is composed on one or more
@@ -106,7 +106,7 @@ static const struct  xdr_ops xdrrec_ops = {
  * meet the needs of xdr and rpc based on tcp.
  */
 
-#define LAST_FRAG ((u_int32_t)(1 << 31))
+#define LAST_FRAG ((u_int32_t)(1U << 31))
 
 typedef struct rec_strm {
 	char *tcp_handle;
diff --git a/lib/libc/xdr/xdr_reference.c b/lib/libc/xdr/xdr_reference.c
index 5a497b6dc06..146dcf2035f 100644
--- a/lib/libc/xdr/xdr_reference.c
+++ b/lib/libc/xdr/xdr_reference.c
@@ -1,32 +1,34 @@
 /*	$NetBSD: xdr_reference.c,v 1.13 2000/01/22 22:19:18 mycroft 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.
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * 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.
+ *     * 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 the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * 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
+ *   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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint) 
@@ -39,8 +41,6 @@ __FBSDID("$FreeBSD$");
 /*
  * xdr_reference.c, Generic XDR routines impelmentation.
  *
- * Copyright (C) 1987, Sun Microsystems, Inc.
- *
  * These are the "non-trivial" xdr primitives used to serialize and de-serialize
  * "pointers".  See xdr.h for more info on the interface to xdr.
  */
diff --git a/lib/libc/xdr/xdr_sizeof.c b/lib/libc/xdr/xdr_sizeof.c
index f33c6131021..3daaa0c00b0 100644
--- a/lib/libc/xdr/xdr_sizeof.c
+++ b/lib/libc/xdr/xdr_sizeof.c
@@ -1,36 +1,36 @@
-/*
- * 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) 2010, Oracle America, Inc.
+ *
+ * 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 the "Oracle America, 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 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.
  */
 /*
  * xdr_sizeof.c
  *
- * Copyright 1990 Sun Microsystems, Inc.
- *
  * General purpose routine to see how much space something will use
  * when serialized using XDR.
  */
diff --git a/lib/libc/xdr/xdr_stdio.c b/lib/libc/xdr/xdr_stdio.c
index 8c1724dd50e..832b308079f 100644
--- a/lib/libc/xdr/xdr_stdio.c
+++ b/lib/libc/xdr/xdr_stdio.c
@@ -1,32 +1,34 @@
 /*	$NetBSD: xdr_stdio.c,v 1.14 2000/01/22 22:19:19 mycroft 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.
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
  *
- * 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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
  *
- * 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.
+ *     * 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 the "Oracle America, Inc." nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
  *
- * 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
+ *   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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -39,8 +41,6 @@ __FBSDID("$FreeBSD$");
 /*
  * xdr_stdio.c, XDR implementation on standard i/o file.
  *
- * Copyright (C) 1984, Sun Microsystems, Inc.
- *
  * This set of routines implements a XDR on a stdio stream.
  * XDR_ENCODE serializes onto the stream, XDR_DECODE de-serializes
  * from the stream.
diff --git a/lib/libc_nonshared/Makefile b/lib/libc_nonshared/Makefile
new file mode 100644
index 00000000000..4c2a94588a8
--- /dev/null
+++ b/lib/libc_nonshared/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+# We're actually creating a libc_noshared.a that is PIC along side libc.so.*
+# It is used exclusively with libc.so.* - there is no need for any other
+# compile modes.
+# bsd.lib.mk doesn't have an easy way to express that.
+NO_PROFILE?=
+.include <bsd.own.mk>
+NO_PIC=	
+# -fpic on some platforms, -fPIC on others.
+CFLAGS+=${PICFLAG} -DPIC -fvisibility=hidden
+
+LIB=	c_nonshared
+
+LIBC_NONSHARED_SRCS=
+
+# So that an empty .a file doesn't cause errors.
+SRCS=	__stub.c
+
+.if ${MK_ICONV} == "yes"
+.PATH: ${.CURDIR}/../libc/iconv
+.include "Makefile.iconv"
+CFLAGS+=-I${.CURDIR}/../libc/iconv
+.endif
+
+SRCS+=	${LIBC_NONSHARED_SRCS}
+
+.include <bsd.lib.mk>
diff --git a/lib/libc_nonshared/Makefile.iconv b/lib/libc_nonshared/Makefile.iconv
new file mode 100644
index 00000000000..8fb1ad95328
--- /dev/null
+++ b/lib/libc_nonshared/Makefile.iconv
@@ -0,0 +1,9 @@
+# $FreeBSD$
+
+.if ${MK_ICONV} == "yes"
+LIBC_NONSHARED_SRCS+=	\
+	__iconv.c __iconv_free_list.c __iconv_get_list.c \
+	iconv.c iconv_canonicalize.c iconv_close.c \
+	iconv_open.c iconv_open_into.c \
+	iconv_set_relocation_prefix.c iconvctl.c iconvlist.c
+.endif
diff --git a/lib/libc_nonshared/__stub.c b/lib/libc_nonshared/__stub.c
new file mode 100644
index 00000000000..495f0aa50a1
--- /dev/null
+++ b/lib/libc_nonshared/__stub.c
@@ -0,0 +1,31 @@
+/*-
+ * Copyright (c) 2013 Peter Wemm
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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$
+ */
+
+extern int __stub_N8TwezWFyocUB;
+
+int __stub_N8TwezWFyocUB;		/* 42 */
diff --git a/lib/libcam/camlib.c b/lib/libcam/camlib.c
index cd599228605..f3202470a0e 100644
--- a/lib/libcam/camlib.c
+++ b/lib/libcam/camlib.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -348,16 +349,16 @@ cam_open_btl(path_id_t path_id, target_id_t target_id, lun_id_t target_lun,
 	if (ccb.cdm.status == CAM_DEV_MATCH_MORE) {
 		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: CDM reported more than one"
-			 " passthrough device at %d:%d:%d!!\n",
-			 func_name, path_id, target_id, target_lun);
+			 " passthrough device at %d:%d:%jx!!\n",
+			 func_name, path_id, target_id, (uintmax_t)target_lun);
 		goto btl_bailout;
 	}
 
 	if (ccb.cdm.num_matches == 0) {
 		snprintf(cam_errbuf, CAM_ERRBUF_SIZE,
 			 "%s: no passthrough device found at"
-			 " %d:%d:%d", func_name, path_id, target_id,
-			 target_lun);
+			 " %d:%d:%jx", func_name, path_id, target_id,
+			 (uintmax_t)target_lun);
 		goto btl_bailout;
 	}
 
@@ -687,14 +688,14 @@ cam_path_string(struct cam_device *dev, char *str, int len)
 		return(str);
 	}
 
-	snprintf(str, len, "(%s%d:%s%d:%d:%d:%d): ",
+	snprintf(str, len, "(%s%d:%s%d:%d:%d:%jx): ",
 		 (dev->device_name[0] != '\0') ? dev->device_name : "pass",
 		 dev->dev_unit_num,
 		 (dev->sim_name[0] != '\0') ? dev->sim_name : "unknown",
 		 dev->sim_unit_number,
 		 dev->bus_id,
 		 dev->target_id,
-		 dev->target_lun);
+		 (uintmax_t)dev->target_lun);
 
 	return(str);
 }
diff --git a/lib/libcapsicum/Makefile b/lib/libcapsicum/Makefile
new file mode 100644
index 00000000000..061edfcb906
--- /dev/null
+++ b/lib/libcapsicum/Makefile
@@ -0,0 +1,47 @@
+# $FreeBSD$
+
+LIB=	capsicum
+
+SHLIB_MAJOR=	0
+SHLIBDIR?=	/lib
+
+SRCS=	libcapsicum.c
+SRCS+=	libcapsicum_dns.c
+SRCS+=	libcapsicum_grp.c
+SRCS+=	libcapsicum_pwd.c
+SRCS+=	libcapsicum_random.c
+SRCS+=	libcapsicum_service.c
+SRCS+=	libcapsicum_sysctl.c
+
+INCS=	libcapsicum.h
+INCS+=	libcapsicum_dns.h
+INCS+=	libcapsicum_grp.h
+INCS+=	libcapsicum_pwd.h
+INCS+=	libcapsicum_random.h
+INCS+=	libcapsicum_service.h
+INCS+=	libcapsicum_sysctl.h
+
+DPADD=	${LIBNV}
+LDADD=	-lnv
+
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../libnv
+
+WARNS?=	6
+
+MAN+=	libcapsicum.3
+
+MLINKS+=libcapsicum.3 cap_init.3
+MLINKS+=libcapsicum.3 cap_wrap.3
+MLINKS+=libcapsicum.3 cap_unwrap.3
+MLINKS+=libcapsicum.3 cap_sock.3
+MLINKS+=libcapsicum.3 cap_clone.3
+MLINKS+=libcapsicum.3 cap_close.3
+MLINKS+=libcapsicum.3 cap_limit_get.3
+MLINKS+=libcapsicum.3 cap_limit_set.3
+MLINKS+=libcapsicum.3 cap_send_nvlist.3
+MLINKS+=libcapsicum.3 cap_recv_nvlist.3
+MLINKS+=libcapsicum.3 cap_xfer_nvlist.3
+MLINKS+=libcapsicum.3 cap_service_open.3
+
+.include <bsd.lib.mk>
diff --git a/lib/libcapsicum/libcapsicum.3 b/lib/libcapsicum/libcapsicum.3
new file mode 100644
index 00000000000..6204a0eff12
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum.3
@@ -0,0 +1,288 @@
+.\" Copyright (c) 2013 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written by Pawel Jakub Dawidek 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 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 October 26, 2013
+.Dt LIBCAPSICUM 3
+.Os
+.Sh NAME
+.Nm cap_init ,
+.Nm cap_wrap ,
+.Nm cap_unwrap ,
+.Nm cap_sock ,
+.Nm cap_clone ,
+.Nm cap_close ,
+.Nm cap_limit_get ,
+.Nm cap_limit_set ,
+.Nm cap_send_nvlist ,
+.Nm cap_recv_nvlist ,
+.Nm cap_xfer_nvlist ,
+.Nm cap_service_open
+.Nd "library for handling application capabilities"
+.Sh LIBRARY
+.Lb libcapsicum
+.Sh SYNOPSIS
+.In libcapsicum.h
+.In nv.h
+.Ft "cap_channel_t *"
+.Fn cap_init "void"
+.Ft "cap_channel_t *"
+.Fn cap_wrap "int sock"
+.Ft "int"
+.Fn cap_unwrap "cap_channel_t *chan"
+.Ft "int"
+.Fn cap_sock "const cap_channel_t *chan"
+.Ft "cap_channel_t *"
+.Fn cap_clone "const cap_channel_t *chan"
+.Ft "void"
+.Fn cap_close "cap_channel_t *chan"
+.Ft "int"
+.Fn cap_limit_get "const cap_channel_t *chan" "nvlist_t **limitsp"
+.Ft "int"
+.Fn cap_limit_set "const cap_channel_t *chan" "nvlist_t *limits"
+.Ft "int"
+.Fn cap_send_nvlist "const cap_channel_t *chan" "const nvlist_t *nvl"
+.Ft "nvlist_t *"
+.Fn cap_recv_nvlist "const cap_channel_t *chan"
+.Ft "nvlist_t *"
+.Fn cap_xfer_nvlist "const cap_channel_t *chan" "nvlist_t *nvl"
+.In libcapsicum_service.h
+.Ft "cap_channel_t *"
+.Fn cap_service_open "const cap_channel_t *chan" "const char *name"
+.Sh DESCRIPTION
+The
+.Nm libcapsicum
+library allows to manage application capabilities through the
+.Xr casperd 8
+daemon.
+.Pp
+The application capability (represented by the
+.Vt cap_channel_t
+type) is a communication channel between the caller and the
+.Xr casperd 8
+daemon or an instance of one of its services.
+A capability to the
+.Xr casperd 8
+daemon obtained with the
+.Fn cap_init
+function allows to create capabilities to casper's services via the
+.Fn cap_service_open
+function.
+.Pp
+The
+.Fn cap_init
+function opens capability to the
+.Xr casperd 8
+daemon.
+.Pp
+The
+.Fn cap_wrap
+function creates
+.Vt cap_channel_t
+based on the given socket.
+The function is used when capability is inherited through
+.Xr execve 2
+or send over
+.Xr unix 4
+domain socket as a regular file descriptor and has to be represented as
+.Vt cap_channel_t
+again.
+.Pp
+The
+.Fn cap_unwrap
+function is the opposite of the
+.Fn cap_wrap
+function.
+It frees the
+.Vt cap_channel_t
+structure and returns
+.Xr unix 4
+domain socket associated with it.
+.Pp
+The
+.Fn cap_clone
+function clones the given capability.
+.Pp
+The
+.Fn cap_close
+function closes the given capability.
+.Pp
+The
+.Fn cap_sock
+function returns
+.Xr unix 4
+domain socket descriptor associated with the given capability for use with
+system calls like
+.Xr kevent 2 ,
+.Xr poll 2
+and
+.Xr select 2 .
+.Pp
+The
+.Fn cap_limit_get
+function stores current limits of the given capability in the
+.Fa limitsp
+argument.
+If the function return
+.Va 0
+and
+.Dv NULL
+is stored in
+.Fa limitsp
+it means there are no limits set.
+.Pp
+The
+.Fn cap_limit_set
+function sets limits for the given capability.
+The limits are provided as nvlist.
+The exact format depends on the service the capability represents.
+.Pp
+The
+.Fn cap_send_nvlist
+function sends the given nvlist over the given capability.
+This is low level interface to communicate with casper services.
+Most services should provide higher level API.
+.Pp
+The
+.Fn cap_recv_nvlist
+function receives the given nvlist over the given capability.
+.Pp
+The
+.Fn cap_xfer_nvlist
+function sends the given nvlist, destroys it and receives new nvlist in
+response over the given capability.
+It does not matter if the function succeeds or fails, the nvlist given
+for sending will always be destroyed once the function returns.
+.Pp
+The
+.Fn cap_service_open
+function opens casper service of the given name through casper capability
+obtained via the
+.Fn cap_init
+function.
+The function returns capability that provides access to opened service.
+.Sh RETURN VALUES
+The
+.Fn cap_clone ,
+.Fn cap_init ,
+.Fn cap_recv_nvlist ,
+.Fn cap_service_open ,
+.Fn cap_wrap
+and
+.Fn cap_xfer_nvlist
+functions return
+.Dv NULL
+and set the
+.Va errno
+variable on failure.
+.Pp
+The
+.Fn cap_limit_get ,
+.Fn cap_limit_set
+and
+.Fn cap_send_nvlist
+functions return
+.Dv -1
+and set the
+.Va errno
+variable on failure.
+.Pp
+The
+.Fn cap_close ,
+.Fn cap_sock
+and
+.Fn cap_unwrap
+functions always succeed.
+.Sh EXAMPLES
+The following example first opens capability to the
+.Xr casperd 8
+daemon, then using this capability creates new capability to the
+.Nm system.dns
+casper service and uses the latter capability to resolve IP address.
+.Bd -literal
+cap_channel_t *capcas, *capdns;
+nvlist_t *limits;
+const char *ipstr = "127.0.0.1";
+struct in_addr ip;
+struct hostent *hp;
+
+/* Open capability to the Casper daemon. */
+capcas = cap_init();
+if (capcas == NULL)
+	err(1, "Unable to contact Casper daemon");
+
+/* Enter capability mode sandbox. */
+if (cap_enter() < 0 && errno != ENOSYS)
+	err(1, "Unable to enter capability mode");
+
+/* Use Casper capability to create capability to the system.dns service. */
+capdns = cap_service_open(capcas, "system.dns");
+if (capdns == NULL)
+	err(1, "Unable to open system.dns service");
+
+/* Close Casper capability, we don't need it anymore. */
+cap_close(capcas);
+
+/* Limit system.dns to reverse DNS lookups and IPv4 addresses. */
+limits = nvlist_create(0);
+nvlist_add_string(limits, "type", "ADDR");
+nvlist_add_number(limits, "family", (uint64_t)AF_INET);
+if (cap_limit_set(capdns, limits) < 0)
+	err("Unable to limit access to the system.dns service");
+
+/* Convert IP address in C-string to in_addr. */
+if (!inet_aton(ipstr, &ip))
+	errx(1, "Unable to parse IP address %s.", ipstr);
+
+/* Find hostname for the given IP address. */
+hp = cap_gethostbyaddr(capdns, (const void *)&ip, sizeof(ip), AF_INET);
+if (hp == NULL)
+	errx(1, "No name associated with %s.", ipstr);
+
+printf("Name associated with %s is %s.\\n", ipstr, hp->h_name);
+.Ed
+.Sh SEE ALSO
+.Xr cap_enter 2 ,
+.Xr execve 2 ,
+.Xr kevent 2 ,
+.Xr poll 2 ,
+.Xr select 2 ,
+.Xr cap_gethostbyaddr 3 ,
+.Xr err 3 ,
+.Xr gethostbyaddr 3 ,
+.Xr inet_aton 3 ,
+.Xr nv 3 ,
+.Xr capsicum 4 ,
+.Xr unix 4 ,
+.Xr casperd 8
+.Sh AUTHORS
+The
+.Nm libcapsicum
+library was implemented by
+.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libcapsicum/libcapsicum.c b/lib/libcapsicum/libcapsicum.c
new file mode 100644
index 00000000000..79ca8716261
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum.c
@@ -0,0 +1,266 @@
+/*-
+ * Copyright (c) 2012-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "libcapsicum.h"
+#include "libcapsicum_impl.h"
+#include "nv.h"
+
+/*
+ * Structure describing communication channel between two separated processes.
+ */
+#define	CAP_CHANNEL_MAGIC	0xcac8a31
+struct cap_channel {
+	/*
+	 * Magic value helps to ensure that a pointer to the right structure is
+	 * passed to our functions.
+	 */
+	int	cch_magic;
+	/* Socket descriptor for IPC. */
+	int	cch_sock;
+};
+
+bool
+fd_is_valid(int fd)
+{
+
+	return (fcntl(fd, F_GETFL) != -1 || errno != EBADF);
+}
+
+cap_channel_t *
+cap_init(void)
+{
+	cap_channel_t *chan;
+	struct sockaddr_un sun;
+	int serrno, sock;
+
+	bzero(&sun, sizeof(sun));
+	sun.sun_family = AF_UNIX;
+	strlcpy(sun.sun_path, CASPER_SOCKPATH, sizeof(sun.sun_path));
+	sun.sun_len = SUN_LEN(&sun);
+
+	sock = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (sock == -1)
+		return (NULL);
+	if (connect(sock, (struct sockaddr *)&sun, sizeof(sun)) < 0) {
+		serrno = errno;
+		close(sock);
+		errno = serrno;
+		return (NULL);
+	}
+	chan = cap_wrap(sock);
+	if (chan == NULL) {
+		serrno = errno;
+		close(sock);
+		errno = serrno;
+		return (NULL);
+	}
+	return (chan);
+}
+
+cap_channel_t *
+cap_wrap(int sock)
+{
+	cap_channel_t *chan;
+
+	if (!fd_is_valid(sock))
+		return (NULL);
+
+	chan = malloc(sizeof(*chan));
+	if (chan != NULL) {
+		chan->cch_sock = sock;
+		chan->cch_magic = CAP_CHANNEL_MAGIC;
+	}
+
+	return (chan);
+}
+
+int
+cap_unwrap(cap_channel_t *chan)
+{
+	int sock;
+
+	assert(chan != NULL);
+	assert(chan->cch_magic == CAP_CHANNEL_MAGIC);
+
+	sock = chan->cch_sock;
+	chan->cch_magic = 0;
+	free(chan);
+
+	return (sock);
+}
+
+cap_channel_t *
+cap_clone(const cap_channel_t *chan)
+{
+	cap_channel_t *newchan;
+	nvlist_t *nvl;
+	int newsock;
+
+	assert(chan != NULL);
+	assert(chan->cch_magic == CAP_CHANNEL_MAGIC);
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "clone");
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL)
+		return (NULL);
+	if (nvlist_get_number(nvl, "error") != 0) {
+		errno = (int)nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		return (NULL);
+	}
+	newsock = nvlist_take_descriptor(nvl, "sock");
+	nvlist_destroy(nvl);
+	newchan = cap_wrap(newsock);
+	if (newchan == NULL) {
+		int serrno;
+
+		serrno = errno;
+		close(newsock);
+		errno = serrno;
+	}
+
+	return (newchan);
+}
+
+void
+cap_close(cap_channel_t *chan)
+{
+
+	assert(chan != NULL);
+	assert(chan->cch_magic == CAP_CHANNEL_MAGIC);
+
+	chan->cch_magic = 0;
+	close(chan->cch_sock);
+	free(chan);
+}
+
+int
+cap_sock(const cap_channel_t *chan)
+{
+
+	assert(chan != NULL);
+	assert(chan->cch_magic == CAP_CHANNEL_MAGIC);
+
+	return (chan->cch_sock);
+}
+
+int
+cap_limit_set(const cap_channel_t *chan, nvlist_t *limits)
+{
+	nvlist_t *nvlmsg;
+	int error;
+
+	nvlmsg = nvlist_create(0);
+	nvlist_add_string(nvlmsg, "cmd", "limit_set");
+	nvlist_add_nvlist(nvlmsg, "limits", limits);
+	nvlmsg = cap_xfer_nvlist(chan, nvlmsg);
+	if (nvlmsg == NULL) {
+		nvlist_destroy(limits);
+		return (-1);
+	}
+	error = (int)nvlist_get_number(nvlmsg, "error");
+	nvlist_destroy(nvlmsg);
+	nvlist_destroy(limits);
+	if (error != 0) {
+		errno = error;
+		return (-1);
+	}
+	return (0);
+}
+
+int
+cap_limit_get(const cap_channel_t *chan, nvlist_t **limitsp)
+{
+	nvlist_t *nvlmsg;
+	int error;
+
+	nvlmsg = nvlist_create(0);
+	nvlist_add_string(nvlmsg, "cmd", "limit_get");
+	nvlmsg = cap_xfer_nvlist(chan, nvlmsg);
+	if (nvlmsg == NULL)
+		return (-1);
+	error = (int)nvlist_get_number(nvlmsg, "error");
+	if (error != 0) {
+		nvlist_destroy(nvlmsg);
+		errno = error;
+		return (-1);
+	}
+	if (nvlist_exists_null(nvlmsg, "limits"))
+		*limitsp = NULL;
+	else
+		*limitsp = nvlist_take_nvlist(nvlmsg, "limits");
+	nvlist_destroy(nvlmsg);
+	return (0);
+}
+
+int
+cap_send_nvlist(const cap_channel_t *chan, const nvlist_t *nvl)
+{
+
+	assert(chan != NULL);
+	assert(chan->cch_magic == CAP_CHANNEL_MAGIC);
+
+	return (nvlist_send(chan->cch_sock, nvl));
+}
+
+nvlist_t *
+cap_recv_nvlist(const cap_channel_t *chan)
+{
+
+	assert(chan != NULL);
+	assert(chan->cch_magic == CAP_CHANNEL_MAGIC);
+
+	return (nvlist_recv(chan->cch_sock));
+}
+
+nvlist_t *
+cap_xfer_nvlist(const cap_channel_t *chan, nvlist_t *nvl)
+{
+
+	assert(chan != NULL);
+	assert(chan->cch_magic == CAP_CHANNEL_MAGIC);
+
+	return (nvlist_xfer(chan->cch_sock, nvl));
+}
diff --git a/lib/libcapsicum/libcapsicum.h b/lib/libcapsicum/libcapsicum.h
new file mode 100644
index 00000000000..4f8c59752ad
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum.h
@@ -0,0 +1,115 @@
+/*-
+ * Copyright (c) 2012-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCAPSICUM_H_
+#define	_LIBCAPSICUM_H_
+
+#ifndef	_NVLIST_T_DECLARED
+#define	_NVLIST_T_DECLARED
+struct nvlist;
+
+typedef struct nvlist nvlist_t;
+#endif
+
+#ifndef	_CAP_CHANNEL_T_DECLARED
+#define	_CAP_CHANNEL_T_DECLARED
+struct cap_channel;
+
+typedef struct cap_channel cap_channel_t;
+#endif
+
+/*
+ * The function opens unrestricted communication channel to Casper.
+ */
+cap_channel_t *cap_init(void);
+
+/*
+ * The function creates cap_channel_t based on the given socket.
+ */
+cap_channel_t *cap_wrap(int sock);
+
+/*
+ * The function returns communication socket and frees cap_channel_t.
+ */
+int	cap_unwrap(cap_channel_t *chan);
+
+/*
+ * The function clones the given capability.
+ */
+cap_channel_t *cap_clone(const cap_channel_t *chan);
+
+/*
+ * The function closes the given capability.
+ */
+void	cap_close(cap_channel_t *chan);
+
+/*
+ * The function returns socket descriptor associated with the given
+ * cap_channel_t for use with select(2)/kqueue(2)/etc.
+ */
+int	cap_sock(const cap_channel_t *chan);
+
+/*
+ * The function limits the given capability.
+ * It always destroys 'limits' on return.
+ */
+int	cap_limit_set(const cap_channel_t *chan, nvlist_t *limits);
+
+/*
+ * The function returns current limits of the given capability.
+ */
+int	cap_limit_get(const cap_channel_t *chan, nvlist_t **limitsp);
+
+#ifdef TODO
+/*
+ * The function registers a service within provided Casper's capability.
+ * It will run with the same privileges the process has at the time of
+ * calling this function.
+ */
+int	cap_service_register(cap_channel_t *chan, const char *name,
+	    cap_func_t *func);
+#endif
+
+/*
+ * Function sends nvlist over the given capability.
+ */
+int	cap_send_nvlist(const cap_channel_t *chan, const nvlist_t *nvl);
+/*
+ * Function receives nvlist over the given capability.
+ */
+nvlist_t *cap_recv_nvlist(const cap_channel_t *chan);
+/*
+ * Function sends the given nvlist, destroys it and receives new nvlist in
+ * response over the given capability.
+ */
+nvlist_t *cap_xfer_nvlist(const cap_channel_t *chan, nvlist_t *nvl);
+
+#endif	/* !_LIBCAPSICUM_H_ */
diff --git a/lib/libcapsicum/libcapsicum_dns.c b/lib/libcapsicum/libcapsicum_dns.c
new file mode 100644
index 00000000000..170e0d07d2d
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_dns.c
@@ -0,0 +1,346 @@
+/*-
+ * Copyright (c) 2012-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <netdb.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nv.h>
+
+#include "libcapsicum.h"
+#include "libcapsicum_dns.h"
+
+static struct hostent hent;
+
+static void
+hostent_free(struct hostent *hp)
+{
+	unsigned int ii;
+
+	free(hp->h_name);
+	hp->h_name = NULL;
+	if (hp->h_aliases != NULL) {
+		for (ii = 0; hp->h_aliases[ii] != NULL; ii++)
+			free(hp->h_aliases[ii]);
+		free(hp->h_aliases);
+		hp->h_aliases = NULL;
+	}
+	if (hp->h_addr_list != NULL) {
+		for (ii = 0; hp->h_addr_list[ii] != NULL; ii++)
+			free(hp->h_addr_list[ii]);
+		free(hp->h_addr_list);
+		hp->h_addr_list = NULL;
+	}
+}
+
+static struct hostent *
+hostent_unpack(const nvlist_t *nvl, struct hostent *hp)
+{
+	unsigned int ii, nitems;
+
+	hostent_free(hp);
+
+	hp->h_name = strdup(nvlist_get_string(nvl, "name"));
+	if (hp->h_name == NULL)
+		goto fail;
+	hp->h_addrtype = (int)nvlist_get_number(nvl, "addrtype");
+	hp->h_length = (int)nvlist_get_number(nvl, "length");
+
+	nitems = (unsigned int)nvlist_get_number(nvl, "naliases");
+	hp->h_aliases = calloc(sizeof(hp->h_aliases[0]), nitems + 1);
+	if (hp->h_aliases == NULL)
+		goto fail;
+	for (ii = 0; ii < nitems; ii++) {
+		hp->h_aliases[ii] =
+		    strdup(nvlist_getf_string(nvl, "alias%u", ii));
+		if (hp->h_aliases[ii] == NULL)
+			goto fail;
+	}
+	hp->h_aliases[ii] = NULL;
+
+	nitems = (unsigned int)nvlist_get_number(nvl, "naddrs");
+	hp->h_addr_list = calloc(sizeof(hp->h_addr_list[0]), nitems + 1);
+	if (hp->h_addr_list == NULL)
+		goto fail;
+	for (ii = 0; ii < nitems; ii++) {
+		hp->h_addr_list[ii] = malloc(hp->h_length);
+		if (hp->h_addr_list[ii] == NULL)
+			goto fail;
+		bcopy(nvlist_getf_binary(nvl, NULL, "addr%u", ii),
+		    hp->h_addr_list[ii], hp->h_length);
+	}
+	hp->h_addr_list[ii] = NULL;
+
+	return (hp);
+fail:
+	hostent_free(hp);
+	h_errno = NO_RECOVERY;
+	return (NULL);
+}
+
+struct hostent *
+cap_gethostbyname(cap_channel_t *chan, const char *name)
+{
+
+	return (cap_gethostbyname2(chan, name, AF_INET));
+}
+
+struct hostent *
+cap_gethostbyname2(cap_channel_t *chan, const char *name, int type)
+{
+	struct hostent *hp;
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "gethostbyname");
+	nvlist_add_number(nvl, "family", (uint64_t)type);
+	nvlist_add_string(nvl, "name", name);
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL) {
+		h_errno = NO_RECOVERY;
+		return (NULL);
+	}
+	if (nvlist_get_number(nvl, "error") != 0) {
+		h_errno = (int)nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		return (NULL);
+	}
+
+	hp = hostent_unpack(nvl, &hent);
+	nvlist_destroy(nvl);
+	return (hp);
+}
+
+struct hostent *
+cap_gethostbyaddr(cap_channel_t *chan, const void *addr, socklen_t len,
+    int type)
+{
+	struct hostent *hp;
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "gethostbyaddr");
+	nvlist_add_binary(nvl, "addr", addr, (size_t)len);
+	nvlist_add_number(nvl, "family", (uint64_t)type);
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL) {
+		h_errno = NO_RECOVERY;
+		return (NULL);
+	}
+	if (nvlist_get_number(nvl, "error") != 0) {
+		h_errno = (int)nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		return (NULL);
+	}
+	hp = hostent_unpack(nvl, &hent);
+	nvlist_destroy(nvl);
+	return (hp);
+}
+
+static struct addrinfo *
+addrinfo_unpack(const nvlist_t *nvl)
+{
+	struct addrinfo *ai;
+	const void *addr;
+	size_t addrlen;
+	const char *canonname;
+
+	addr = nvlist_get_binary(nvl, "ai_addr", &addrlen);
+	ai = malloc(sizeof(*ai) + addrlen);
+	if (ai == NULL)
+		return (NULL);
+	ai->ai_flags = (int)nvlist_get_number(nvl, "ai_flags");
+	ai->ai_family = (int)nvlist_get_number(nvl, "ai_family");
+	ai->ai_socktype = (int)nvlist_get_number(nvl, "ai_socktype");
+	ai->ai_protocol = (int)nvlist_get_number(nvl, "ai_protocol");
+	ai->ai_addrlen = (socklen_t)addrlen;
+	canonname = nvlist_get_string(nvl, "ai_canonname");
+	if (canonname != NULL) {
+		ai->ai_canonname = strdup(canonname);
+		if (ai->ai_canonname == NULL) {
+			free(ai);
+			return (NULL);
+		}
+	} else {
+		ai->ai_canonname = NULL;
+	}
+	ai->ai_addr = (void *)(ai + 1);
+	bcopy(addr, ai->ai_addr, addrlen);
+	ai->ai_next = NULL;
+
+	return (ai);
+}
+
+int
+cap_getaddrinfo(cap_channel_t *chan, const char *hostname, const char *servname,
+    const struct addrinfo *hints, struct addrinfo **res)
+{
+	struct addrinfo *firstai, *prevai, *curai;
+	unsigned int ii;
+	const nvlist_t *nvlai;
+	nvlist_t *nvl;
+	int error;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "getaddrinfo");
+	nvlist_add_string(nvl, "hostname", hostname);
+	nvlist_add_string(nvl, "servname", servname);
+	if (hints != NULL) {
+		nvlist_add_number(nvl, "hints.ai_flags",
+		    (uint64_t)hints->ai_flags);
+		nvlist_add_number(nvl, "hints.ai_family",
+		    (uint64_t)hints->ai_family);
+		nvlist_add_number(nvl, "hints.ai_socktype",
+		    (uint64_t)hints->ai_socktype);
+		nvlist_add_number(nvl, "hints.ai_protocol",
+		    (uint64_t)hints->ai_protocol);
+	}
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL)
+		return (EAI_MEMORY);
+	if (nvlist_get_number(nvl, "error") != 0) {
+		error = (int)nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		return (error);
+	}
+
+	nvlai = NULL;
+	firstai = prevai = curai = NULL;
+	for (ii = 0; ; ii++) {
+		if (!nvlist_existsf_nvlist(nvl, "res%u", ii))
+			break;
+		nvlai = nvlist_getf_nvlist(nvl, "res%u", ii);
+		curai = addrinfo_unpack(nvlai);
+		if (curai == NULL)
+			break;
+		if (prevai != NULL)
+			prevai->ai_next = curai;
+		else if (firstai == NULL)
+			firstai = curai;
+	}
+	nvlist_destroy(nvl);
+	if (curai == NULL && nvlai != NULL) {
+		if (firstai == NULL)
+			freeaddrinfo(firstai);
+		return (EAI_MEMORY);
+	}
+
+	*res = firstai;
+	return (0);
+}
+
+int
+cap_getnameinfo(cap_channel_t *chan, const struct sockaddr *sa, socklen_t salen,
+    char *host, size_t hostlen, char *serv, size_t servlen, int flags)
+{
+	nvlist_t *nvl;
+	int error;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "getnameinfo");
+	nvlist_add_number(nvl, "hostlen", (uint64_t)hostlen);
+	nvlist_add_number(nvl, "servlen", (uint64_t)servlen);
+	nvlist_add_binary(nvl, "sa", sa, (size_t)salen);
+	nvlist_add_number(nvl, "flags", (uint64_t)flags);
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL)
+		return (EAI_MEMORY);
+	if (nvlist_get_number(nvl, "error") != 0) {
+		error = (int)nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		return (error);
+	}
+
+	if (host != NULL)
+		strlcpy(host, nvlist_get_string(nvl, "host"), hostlen + 1);
+	if (serv != NULL)
+		strlcpy(serv, nvlist_get_string(nvl, "serv"), servlen + 1);
+	nvlist_destroy(nvl);
+	return (0);
+}
+
+static void
+limit_remove(nvlist_t *limits, const char *prefix)
+{
+	const char *name;
+	size_t prefixlen;
+	void *cookie;
+
+	prefixlen = strlen(prefix);
+again:
+	cookie = NULL;
+	while ((name = nvlist_next(limits, NULL, &cookie)) != NULL) {
+		if (strncmp(name, prefix, prefixlen) == 0) {
+			nvlist_free(limits, name);
+			goto again;
+		}
+	}
+}
+
+int
+cap_dns_type_limit(cap_channel_t *chan, const char * const *types,
+    size_t ntypes)
+{
+	nvlist_t *limits;
+	unsigned int i;
+
+	if (cap_limit_get(chan, &limits) < 0)
+		return (-1);
+	if (limits == NULL)
+		limits = nvlist_create(0);
+	else
+		limit_remove(limits, "type");
+	for (i = 0; i < ntypes; i++)
+		nvlist_addf_string(limits, types[i], "type%u", i);
+	return (cap_limit_set(chan, limits));
+}
+
+int
+cap_dns_family_limit(cap_channel_t *chan, const int *families,
+    size_t nfamilies)
+{
+	nvlist_t *limits;
+	unsigned int i;
+
+	if (cap_limit_get(chan, &limits) < 0)
+		return (-1);
+	if (limits == NULL)
+		limits = nvlist_create(0);
+	else
+		limit_remove(limits, "family");
+	for (i = 0; i < nfamilies; i++) {
+		nvlist_addf_number(limits, (uint64_t)families[i],
+		    "family%u", i);
+	}
+	return (cap_limit_set(chan, limits));
+}
diff --git a/lib/libcapsicum/libcapsicum_dns.h b/lib/libcapsicum/libcapsicum_dns.h
new file mode 100644
index 00000000000..02235107cec
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_dns.h
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2012 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCAPSICUM_DNS_H_
+#define	_LIBCAPSICUM_DNS_H_
+
+#include <sys/socket.h>	/* socklen_t */
+
+struct addrinfo;
+struct hostent;
+
+struct hostent *cap_gethostbyname(cap_channel_t *chan, const char *name);
+struct hostent *cap_gethostbyname2(cap_channel_t *chan, const char *name,
+    int type);
+struct hostent *cap_gethostbyaddr(cap_channel_t *chan, const void *addr,
+    socklen_t len, int type);
+
+int cap_getaddrinfo(cap_channel_t *chan, const char *hostname,
+    const char *servname, const struct addrinfo *hints, struct addrinfo **res);
+int cap_getnameinfo(cap_channel_t *chan, const struct sockaddr *sa,
+    socklen_t salen, char *host, size_t hostlen, char *serv, size_t servlen,
+    int flags);
+
+int cap_dns_type_limit(cap_channel_t *chan, const char * const *types,
+    size_t ntypes);
+int cap_dns_family_limit(cap_channel_t *chan, const int *families,
+    size_t nfamilies);
+
+#endif	/* !_LIBCAPSICUM_DNS_H_ */
diff --git a/lib/libcapsicum/libcapsicum_grp.c b/lib/libcapsicum/libcapsicum_grp.c
new file mode 100644
index 00000000000..c679ce9afbd
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_grp.c
@@ -0,0 +1,426 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <grp.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <dnv.h>
+#include <nv.h>
+
+#include "libcapsicum.h"
+#include "libcapsicum_grp.h"
+
+static struct group ggrp;
+static char *gbuffer;
+static size_t gbufsize;
+
+static int
+group_resize(void)
+{
+	char *buf;
+
+	if (gbufsize == 0)
+		gbufsize = 1024;
+	else
+		gbufsize *= 2;
+
+	buf = gbuffer;
+	gbuffer = realloc(buf, gbufsize);
+	if (gbuffer == NULL) {
+		free(buf);
+		gbufsize = 0;
+		return (ENOMEM);
+	}
+	memset(gbuffer, 0, gbufsize);
+
+	return (0);
+}
+
+static int
+group_unpack_string(const nvlist_t *nvl, const char *fieldname, char **fieldp,
+    char **bufferp, size_t *bufsizep)
+{
+	const char *str;
+	size_t len;
+
+	str = nvlist_get_string(nvl, fieldname);
+	len = strlcpy(*bufferp, str, *bufsizep);
+	if (len >= *bufsizep)
+		return (ERANGE);
+	*fieldp = *bufferp;
+	*bufferp += len + 1;
+	*bufsizep -= len + 1;
+
+	return (0);
+}
+
+static int
+group_unpack_members(const nvlist_t *nvl, char ***fieldp, char **bufferp,
+    size_t *bufsizep)
+{
+	const char *mem;
+	char **outstrs, *str;
+	size_t nmem, datasize, strsize;
+	unsigned int ii;
+
+	if (!nvlist_exists_number(nvl, "gr_nmem")) {
+		datasize = _ALIGNBYTES + sizeof(char *);
+		if (datasize >= *bufsizep)
+			return (ERANGE);
+		outstrs = (char **)_ALIGN(*bufferp);
+		outstrs[0] = NULL;
+		*fieldp = outstrs;
+		*bufferp += datasize;
+		*bufsizep -= datasize;
+		return (0);
+	}
+
+	nmem = (size_t)nvlist_get_number(nvl, "gr_nmem");
+	datasize = _ALIGNBYTES + sizeof(char *) * (nmem + 1);
+	for (ii = 0; ii < nmem; ii++) {
+		mem = dnvlist_getf_string(nvl, NULL, "gr_mem[%u]", ii);
+		if (mem == NULL)
+			return (EINVAL);
+		datasize += strlen(mem) + 1;
+	}
+
+	if (datasize >= *bufsizep)
+		return (ERANGE);
+
+	outstrs = (char **)_ALIGN(*bufferp);
+	str = (char *)outstrs + sizeof(char *) * (nmem + 1);
+	for (ii = 0; ii < nmem; ii++) {
+		mem = nvlist_getf_string(nvl, "gr_mem[%u]", ii);
+		strsize = strlen(mem) + 1;
+		memcpy(str, mem, strsize);
+		outstrs[ii] = str;
+		str += strsize;
+	}
+	assert(ii == nmem);
+	outstrs[ii] = NULL;
+
+	*fieldp = outstrs;
+	*bufferp += datasize;
+	*bufsizep -= datasize;
+
+	return (0);
+}
+
+static int
+group_unpack(const nvlist_t *nvl, struct group *grp, char *buffer,
+    size_t bufsize)
+{
+	int error;
+
+	if (!nvlist_exists_string(nvl, "gr_name"))
+		return (EINVAL);
+
+	memset(grp, 0, sizeof(*grp));
+
+	error = group_unpack_string(nvl, "gr_name", &grp->gr_name, &buffer,
+	    &bufsize);
+	if (error != 0)
+		return (error);
+	error = group_unpack_string(nvl, "gr_passwd", &grp->gr_passwd, &buffer,
+	    &bufsize);
+	if (error != 0)
+		return (error);
+	grp->gr_gid = (gid_t)nvlist_get_number(nvl, "gr_gid");
+	error = group_unpack_members(nvl, &grp->gr_mem, &buffer, &bufsize);
+	if (error != 0)
+		return (error);
+
+	return (0);
+}
+
+static int
+cap_getgrcommon_r(cap_channel_t *chan, const char *cmd, const char *name,
+    gid_t gid, struct group *grp, char *buffer, size_t bufsize,
+    struct group **result)
+{
+	nvlist_t *nvl;
+	bool getgr_r;
+	int error;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", cmd);
+	if (strcmp(cmd, "getgrent") == 0 || strcmp(cmd, "getgrent_r") == 0) {
+		/* Add nothing. */
+	} else if (strcmp(cmd, "getgrnam") == 0 ||
+	    strcmp(cmd, "getgrnam_r") == 0) {
+		nvlist_add_string(nvl, "name", name);
+	} else if (strcmp(cmd, "getgrgid") == 0 ||
+	    strcmp(cmd, "getgrgid_r") == 0) {
+		nvlist_add_number(nvl, "gid", (uint64_t)gid);
+	} else {
+		abort();
+	}
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL) {
+		assert(errno != 0);
+		*result = NULL;
+		return (errno);
+	}
+	error = (int)nvlist_get_number(nvl, "error");
+	if (error != 0) {
+		nvlist_destroy(nvl);
+		*result = NULL;
+		return (error);
+	}
+
+	if (!nvlist_exists_string(nvl, "gr_name")) {
+		/* Not found. */
+		nvlist_destroy(nvl);
+		*result = NULL;
+		return (0);
+	}
+
+	getgr_r = (strcmp(cmd, "getgrent_r") == 0 ||
+	    strcmp(cmd, "getgrnam_r") == 0 || strcmp(cmd, "getgrgid_r") == 0);
+
+	for (;;) {
+		error = group_unpack(nvl, grp, buffer, bufsize);
+		if (getgr_r || error != ERANGE)
+			break;
+		assert(buffer == gbuffer);
+		assert(bufsize == gbufsize);
+		error = group_resize();
+		if (error != 0)
+			break;
+		/* Update pointers after resize. */
+		buffer = gbuffer;
+		bufsize = gbufsize;
+	}
+
+	nvlist_destroy(nvl);
+
+	if (error == 0)
+		*result = grp;
+	else
+		*result = NULL;
+
+	return (error);
+}
+
+static struct group *
+cap_getgrcommon(cap_channel_t *chan, const char *cmd, const char *name,
+    gid_t gid)
+{
+	struct group *result;
+	int error, serrno;
+
+	serrno = errno;
+
+	error = cap_getgrcommon_r(chan, cmd, name, gid, &ggrp, gbuffer,
+	    gbufsize, &result);
+	if (error != 0) {
+		errno = error;
+		return (NULL);
+	}
+
+	errno = serrno;
+
+	return (result);
+}
+
+struct group *
+cap_getgrent(cap_channel_t *chan)
+{
+
+	return (cap_getgrcommon(chan, "getgrent", NULL, 0));
+}
+
+struct group *
+cap_getgrnam(cap_channel_t *chan, const char *name)
+{
+
+	return (cap_getgrcommon(chan, "getgrnam", name, 0));
+}
+
+struct group *
+cap_getgrgid(cap_channel_t *chan, gid_t gid)
+{
+
+	return (cap_getgrcommon(chan, "getgrgid", NULL, gid));
+}
+
+int
+cap_getgrent_r(cap_channel_t *chan, struct group *grp, char *buffer,
+    size_t bufsize, struct group **result)
+{
+
+	return (cap_getgrcommon_r(chan, "getgrent_r", NULL, 0, grp, buffer,
+	    bufsize, result));
+}
+
+int
+cap_getgrnam_r(cap_channel_t *chan, const char *name, struct group *grp,
+    char *buffer, size_t bufsize, struct group **result)
+{
+
+	return (cap_getgrcommon_r(chan, "getgrnam_r", name, 0, grp, buffer,
+	    bufsize, result));
+}
+
+int
+cap_getgrgid_r(cap_channel_t *chan, gid_t gid, struct group *grp, char *buffer,
+    size_t bufsize, struct group **result)
+{
+
+	return (cap_getgrcommon_r(chan, "getgrgid_r", NULL, gid, grp, buffer,
+	    bufsize, result));
+}
+
+int
+cap_setgroupent(cap_channel_t *chan, int stayopen)
+{
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "setgroupent");
+	nvlist_add_bool(nvl, "stayopen", stayopen != 0);
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL)
+		return (0);
+	if (nvlist_get_number(nvl, "error") != 0) {
+		errno = nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		return (0);
+	}
+	nvlist_destroy(nvl);
+
+	return (1);
+}
+
+int
+cap_setgrent(cap_channel_t *chan)
+{
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "setgrent");
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL)
+		return (0);
+	if (nvlist_get_number(nvl, "error") != 0) {
+		errno = nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		return (0);
+	}
+	nvlist_destroy(nvl);
+
+	return (1);
+}
+
+void
+cap_endgrent(cap_channel_t *chan)
+{
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "endgrent");
+	/* Ignore any errors, we have no way to report them. */
+	nvlist_destroy(cap_xfer_nvlist(chan, nvl));
+}
+
+int
+cap_grp_limit_cmds(cap_channel_t *chan, const char * const *cmds, size_t ncmds)
+{
+	nvlist_t *limits, *nvl;
+	unsigned int i;
+
+	if (cap_limit_get(chan, &limits) < 0)
+		return (-1);
+	if (limits == NULL) {
+		limits = nvlist_create(0);
+	} else {
+		if (nvlist_exists_nvlist(limits, "cmds"))
+			nvlist_free_nvlist(limits, "cmds");
+	}
+	nvl = nvlist_create(0);
+	for (i = 0; i < ncmds; i++)
+		nvlist_add_null(nvl, cmds[i]);
+	nvlist_move_nvlist(limits, "cmds", nvl);
+	return (cap_limit_set(chan, limits));
+}
+
+int
+cap_grp_limit_fields(cap_channel_t *chan, const char * const *fields,
+    size_t nfields)
+{
+	nvlist_t *limits, *nvl;
+	unsigned int i;
+
+	if (cap_limit_get(chan, &limits) < 0)
+		return (-1);
+	if (limits == NULL) {
+		limits = nvlist_create(0);
+	} else {
+		if (nvlist_exists_nvlist(limits, "fields"))
+			nvlist_free_nvlist(limits, "fields");
+	}
+	nvl = nvlist_create(0);
+	for (i = 0; i < nfields; i++)
+		nvlist_add_null(nvl, fields[i]);
+	nvlist_move_nvlist(limits, "fields", nvl);
+	return (cap_limit_set(chan, limits));
+}
+
+int
+cap_grp_limit_groups(cap_channel_t *chan, const char * const *names,
+    size_t nnames, gid_t *gids, size_t ngids)
+{
+	nvlist_t *limits, *groups;
+	unsigned int i;
+
+	if (cap_limit_get(chan, &limits) < 0)
+		return (-1);
+	if (limits == NULL) {
+		limits = nvlist_create(0);
+	} else {
+		if (nvlist_exists_nvlist(limits, "groups"))
+			nvlist_free_nvlist(limits, "groups");
+	}
+	groups = nvlist_create(0);
+	for (i = 0; i < ngids; i++)
+		nvlist_addf_number(groups, (uint64_t)gids[i], "gid%u", i);
+	for (i = 0; i < nnames; i++)
+		nvlist_addf_string(groups, names[i], "name%u", i);
+	nvlist_move_nvlist(limits, "groups", groups);
+	return (cap_limit_set(chan, limits));
+}
diff --git a/lib/libcapsicum/libcapsicum_grp.h b/lib/libcapsicum/libcapsicum_grp.h
new file mode 100644
index 00000000000..e0b44f0e199
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_grp.h
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCAPSICUM_GRP_H_
+#define	_LIBCAPSICUM_GRP_H_
+
+struct group *cap_getgrent(cap_channel_t *chan);
+struct group *cap_getgrnam(cap_channel_t *chan, const char *name);
+struct group *cap_getgrgid(cap_channel_t *chan, gid_t gid);
+
+int cap_getgrent_r(cap_channel_t *chan, struct group *grp, char *buffer,
+    size_t bufsize, struct group **result);
+int cap_getgrnam_r(cap_channel_t *chan, const char *name, struct group *grp,
+    char *buffer, size_t bufsize, struct group **result);
+int cap_getgrgid_r(cap_channel_t *chan, gid_t gid, struct group *grp,
+    char *buffer, size_t bufsize, struct group **result);
+
+int cap_setgroupent(cap_channel_t *chan, int stayopen);
+int cap_setgrent(cap_channel_t *chan);
+void cap_endgrent(cap_channel_t *chan);
+
+int cap_grp_limit_cmds(cap_channel_t *chan, const char * const *cmds,
+    size_t ncmds);
+int cap_grp_limit_fields(cap_channel_t *chan, const char * const *fields,
+    size_t nfields);
+int cap_grp_limit_groups(cap_channel_t *chan, const char * const *names,
+    size_t nnames, gid_t *gids, size_t ngids);
+
+#endif	/* !_LIBCAPSICUM_GRP_H_ */
diff --git a/lib/libcapsicum/libcapsicum_impl.h b/lib/libcapsicum/libcapsicum_impl.h
new file mode 100644
index 00000000000..ce6f49fdfcd
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_impl.h
@@ -0,0 +1,39 @@
+/*-
+ * Copyright (c) 2012-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCAPSICUM_IMPL_H_
+#define	_LIBCAPSICUM_IMPL_H_
+
+#define	CASPER_SOCKPATH	"/var/run/casper"
+
+bool	fd_is_valid(int fd);
+
+#endif	/* !_LIBCAPSICUM_IMPL_H_ */
diff --git a/lib/libcapsicum/libcapsicum_pwd.c b/lib/libcapsicum/libcapsicum_pwd.c
new file mode 100644
index 00000000000..792fb669812
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_pwd.c
@@ -0,0 +1,384 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nv.h>
+
+#include "libcapsicum.h"
+#include "libcapsicum_pwd.h"
+
+static struct passwd gpwd;
+static char *gbuffer;
+static size_t gbufsize;
+
+static int
+passwd_resize(void)
+{
+	char *buf;
+
+	if (gbufsize == 0)
+		gbufsize = 1024;
+	else
+		gbufsize *= 2;
+
+	buf = gbuffer;
+	gbuffer = realloc(buf, gbufsize);
+	if (gbuffer == NULL) {
+		free(buf);
+		gbufsize = 0;
+		return (ENOMEM);
+	}
+	memset(gbuffer, 0, gbufsize);
+
+	return (0);
+}
+
+static int
+passwd_unpack_string(const nvlist_t *nvl, const char *fieldname, char **fieldp,
+    char **bufferp, size_t *bufsizep)
+{
+	const char *str;
+	size_t len;
+
+	str = nvlist_get_string(nvl, fieldname);
+	len = strlcpy(*bufferp, str, *bufsizep);
+	if (len >= *bufsizep)
+		return (ERANGE);
+	*fieldp = *bufferp;
+	*bufferp += len + 1;
+	*bufsizep -= len + 1;
+
+	return (0);
+}
+
+static int
+passwd_unpack(const nvlist_t *nvl, struct passwd *pwd, char *buffer,
+    size_t bufsize)
+{
+	int error;
+
+	if (!nvlist_exists_string(nvl, "pw_name"))
+		return (EINVAL);
+
+	memset(pwd, 0, sizeof(*pwd));
+
+	error = passwd_unpack_string(nvl, "pw_name", &pwd->pw_name, &buffer,
+	    &bufsize);
+	if (error != 0)
+		return (error);
+	pwd->pw_uid = (uid_t)nvlist_get_number(nvl, "pw_uid");
+	pwd->pw_gid = (gid_t)nvlist_get_number(nvl, "pw_gid");
+	pwd->pw_change = (time_t)nvlist_get_number(nvl, "pw_change");
+	error = passwd_unpack_string(nvl, "pw_passwd", &pwd->pw_passwd, &buffer,
+	    &bufsize);
+	if (error != 0)
+		return (error);
+	error = passwd_unpack_string(nvl, "pw_class", &pwd->pw_class, &buffer,
+	    &bufsize);
+	if (error != 0)
+		return (error);
+	error = passwd_unpack_string(nvl, "pw_gecos", &pwd->pw_gecos, &buffer,
+	    &bufsize);
+	if (error != 0)
+		return (error);
+	error = passwd_unpack_string(nvl, "pw_dir", &pwd->pw_dir, &buffer,
+	    &bufsize);
+	if (error != 0)
+		return (error);
+	error = passwd_unpack_string(nvl, "pw_shell", &pwd->pw_shell, &buffer,
+	    &bufsize);
+	if (error != 0)
+		return (error);
+	pwd->pw_expire = (time_t)nvlist_get_number(nvl, "pw_expire");
+	pwd->pw_fields = (int)nvlist_get_number(nvl, "pw_fields");
+
+	return (0);
+}
+
+static int
+cap_getpwcommon_r(cap_channel_t *chan, const char *cmd, const char *login,
+    uid_t uid, struct passwd *pwd, char *buffer, size_t bufsize,
+    struct passwd **result)
+{
+	nvlist_t *nvl;
+	bool getpw_r;
+	int error;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", cmd);
+	if (strcmp(cmd, "getpwent") == 0 || strcmp(cmd, "getpwent_r") == 0) {
+		/* Add nothing. */
+	} else if (strcmp(cmd, "getpwnam") == 0 ||
+	    strcmp(cmd, "getpwnam_r") == 0) {
+		nvlist_add_string(nvl, "name", login);
+	} else if (strcmp(cmd, "getpwuid") == 0 ||
+	    strcmp(cmd, "getpwuid_r") == 0) {
+		nvlist_add_number(nvl, "uid", (uint64_t)uid);
+	} else {
+		abort();
+	}
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL) {
+		assert(errno != 0);
+		*result = NULL;
+		return (errno);
+	}
+	error = (int)nvlist_get_number(nvl, "error");
+	if (error != 0) {
+		nvlist_destroy(nvl);
+		*result = NULL;
+		return (error);
+	}
+
+	if (!nvlist_exists_string(nvl, "pw_name")) {
+		/* Not found. */
+		nvlist_destroy(nvl);
+		*result = NULL;
+		return (0);
+	}
+
+	getpw_r = (strcmp(cmd, "getpwent_r") == 0 ||
+	    strcmp(cmd, "getpwnam_r") == 0 || strcmp(cmd, "getpwuid_r") == 0);
+
+	for (;;) {
+		error = passwd_unpack(nvl, pwd, buffer, bufsize);
+		if (getpw_r || error != ERANGE)
+			break;
+		assert(buffer == gbuffer);
+		assert(bufsize == gbufsize);
+		error = passwd_resize();
+		if (error != 0)
+			break;
+		/* Update pointers after resize. */
+		buffer = gbuffer;
+		bufsize = gbufsize;
+	}
+
+	nvlist_destroy(nvl);
+
+	if (error == 0)
+		*result = pwd;
+	else
+		*result = NULL;
+
+	return (error);
+}
+
+static struct passwd *
+cap_getpwcommon(cap_channel_t *chan, const char *cmd, const char *login,
+    uid_t uid)
+{
+	struct passwd *result;
+	int error, serrno;
+
+	serrno = errno;
+
+	error = cap_getpwcommon_r(chan, cmd, login, uid, &gpwd, gbuffer,
+	    gbufsize, &result);
+	if (error != 0) {
+		errno = error;
+		return (NULL);
+	}
+
+	errno = serrno;
+
+	return (result);
+}
+
+struct passwd *
+cap_getpwent(cap_channel_t *chan)
+{
+
+	return (cap_getpwcommon(chan, "getpwent", NULL, 0));
+}
+
+struct passwd *
+cap_getpwnam(cap_channel_t *chan, const char *login)
+{
+
+	return (cap_getpwcommon(chan, "getpwnam", login, 0));
+}
+
+struct passwd *
+cap_getpwuid(cap_channel_t *chan, uid_t uid)
+{
+
+	return (cap_getpwcommon(chan, "getpwuid", NULL, uid));
+}
+
+int
+cap_getpwent_r(cap_channel_t *chan, struct passwd *pwd, char *buffer,
+    size_t bufsize, struct passwd **result)
+{
+
+	return (cap_getpwcommon_r(chan, "getpwent_r", NULL, 0, pwd, buffer,
+	    bufsize, result));
+}
+
+int
+cap_getpwnam_r(cap_channel_t *chan, const char *name, struct passwd *pwd,
+    char *buffer, size_t bufsize, struct passwd **result)
+{
+
+	return (cap_getpwcommon_r(chan, "getpwnam_r", name, 0, pwd, buffer,
+	    bufsize, result));
+}
+
+int
+cap_getpwuid_r(cap_channel_t *chan, uid_t uid, struct passwd *pwd, char *buffer,
+    size_t bufsize, struct passwd **result)
+{
+
+	return (cap_getpwcommon_r(chan, "getpwuid_r", NULL, uid, pwd, buffer,
+	    bufsize, result));
+}
+
+int
+cap_setpassent(cap_channel_t *chan, int stayopen)
+{
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "setpassent");
+	nvlist_add_bool(nvl, "stayopen", stayopen != 0);
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL)
+		return (0);
+	if (nvlist_get_number(nvl, "error") != 0) {
+		errno = nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		return (0);
+	}
+	nvlist_destroy(nvl);
+
+	return (1);
+}
+
+static void
+cap_set_end_pwent(cap_channel_t *chan, const char *cmd)
+{
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", cmd);
+	/* Ignore any errors, we have no way to report them. */
+	nvlist_destroy(cap_xfer_nvlist(chan, nvl));
+}
+
+void
+cap_setpwent(cap_channel_t *chan)
+{
+
+	cap_set_end_pwent(chan, "setpwent");
+}
+
+void
+cap_endpwent(cap_channel_t *chan)
+{
+
+	cap_set_end_pwent(chan, "endpwent");
+}
+
+int
+cap_pwd_limit_cmds(cap_channel_t *chan, const char * const *cmds, size_t ncmds)
+{
+	nvlist_t *limits, *nvl;
+	unsigned int i;
+
+	if (cap_limit_get(chan, &limits) < 0)
+		return (-1);
+	if (limits == NULL) {
+		limits = nvlist_create(0);
+	} else {
+		if (nvlist_exists_nvlist(limits, "cmds"))
+			nvlist_free_nvlist(limits, "cmds");
+	}
+	nvl = nvlist_create(0);
+	for (i = 0; i < ncmds; i++)
+		nvlist_add_null(nvl, cmds[i]);
+	nvlist_move_nvlist(limits, "cmds", nvl);
+	return (cap_limit_set(chan, limits));
+}
+
+int
+cap_pwd_limit_fields(cap_channel_t *chan, const char * const *fields,
+    size_t nfields)
+{
+	nvlist_t *limits, *nvl;
+	unsigned int i;
+
+	if (cap_limit_get(chan, &limits) < 0)
+		return (-1);
+	if (limits == NULL) {
+		limits = nvlist_create(0);
+	} else {
+		if (nvlist_exists_nvlist(limits, "fields"))
+			nvlist_free_nvlist(limits, "fields");
+	}
+	nvl = nvlist_create(0);
+	for (i = 0; i < nfields; i++)
+		nvlist_add_null(nvl, fields[i]);
+	nvlist_move_nvlist(limits, "fields", nvl);
+	return (cap_limit_set(chan, limits));
+}
+
+int
+cap_pwd_limit_users(cap_channel_t *chan, const char * const *names,
+    size_t nnames, uid_t *uids, size_t nuids)
+{
+	nvlist_t *limits, *users;
+	unsigned int i;
+
+	if (cap_limit_get(chan, &limits) < 0)
+		return (-1);
+	if (limits == NULL) {
+		limits = nvlist_create(0);
+	} else {
+		if (nvlist_exists_nvlist(limits, "users"))
+			nvlist_free_nvlist(limits, "users");
+	}
+	users = nvlist_create(0);
+	for (i = 0; i < nuids; i++)
+		nvlist_addf_number(users, (uint64_t)uids[i], "uid%u", i);
+	for (i = 0; i < nnames; i++)
+		nvlist_addf_string(users, names[i], "name%u", i);
+	nvlist_move_nvlist(limits, "users", users);
+	return (cap_limit_set(chan, limits));
+}
diff --git a/lib/libcapsicum/libcapsicum_pwd.h b/lib/libcapsicum/libcapsicum_pwd.h
new file mode 100644
index 00000000000..960a490faf8
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_pwd.h
@@ -0,0 +1,57 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCAPSICUM_PWD_H_
+#define	_LIBCAPSICUM_PWD_H_
+
+struct passwd *cap_getpwent(cap_channel_t *chan);
+struct passwd *cap_getpwnam(cap_channel_t *chan, const char *login);
+struct passwd *cap_getpwuid(cap_channel_t *chan, uid_t uid);
+
+int cap_getpwent_r(cap_channel_t *chan, struct passwd *pwd, char *buffer,
+    size_t bufsize, struct passwd **result);
+int cap_getpwnam_r(cap_channel_t *chan, const char *name, struct passwd *pwd,
+    char *buffer, size_t bufsize, struct passwd **result);
+int cap_getpwuid_r(cap_channel_t *chan, uid_t uid, struct passwd *pwd,
+    char *buffer, size_t bufsize, struct passwd **result);
+
+int cap_setpassent(cap_channel_t *chan, int stayopen);
+void cap_setpwent(cap_channel_t *chan);
+void cap_endpwent(cap_channel_t *chan);
+
+int cap_pwd_limit_cmds(cap_channel_t *chan, const char * const *cmds,
+    size_t ncmds);
+int cap_pwd_limit_fields(cap_channel_t *chan, const char * const *fields,
+    size_t nfields);
+int cap_pwd_limit_users(cap_channel_t *chan, const char * const *names,
+    size_t nnames, uid_t *uids, size_t nuids);
+
+#endif	/* !_LIBCAPSICUM_PWD_H_ */
diff --git a/lib/libcapsicum/libcapsicum_random.c b/lib/libcapsicum/libcapsicum_random.c
new file mode 100644
index 00000000000..eed97e287ac
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_random.c
@@ -0,0 +1,80 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+
+#include <nv.h>
+
+#include "libcapsicum.h"
+#include "libcapsicum_random.h"
+
+#define	MAXSIZE	(1024 * 1024)
+
+int
+cap_random_buf(cap_channel_t *chan, void *buf, size_t nbytes)
+{
+	nvlist_t *nvl;
+	const void *randbuf;
+	uint8_t *ptr;
+	size_t left, randbufsize;
+
+	left = nbytes;
+	ptr = buf;
+
+	while (left > 0) {
+		nvl = nvlist_create(0);
+		nvlist_add_string(nvl, "cmd", "generate");
+		nvlist_add_number(nvl, "size",
+		    (uint64_t)(left > MAXSIZE ? MAXSIZE : left));
+		nvl = cap_xfer_nvlist(chan, nvl);
+		if (nvl == NULL)
+			return (-1);
+		if (nvlist_get_number(nvl, "error") != 0) {
+			errno = (int)nvlist_get_number(nvl, "error");
+			nvlist_destroy(nvl);
+			return (-1);
+		}
+
+		randbuf = nvlist_get_binary(nvl, "data", &randbufsize);
+		memcpy(ptr, randbuf, randbufsize);
+
+		nvlist_destroy(nvl);
+
+		ptr += randbufsize;
+		assert(left >= randbufsize);
+		left -= randbufsize;
+	}
+
+	return (0);
+}
diff --git a/lib/libcapsicum/libcapsicum_random.h b/lib/libcapsicum/libcapsicum_random.h
new file mode 100644
index 00000000000..672afa04f29
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_random.h
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCAPSICUM_RANDOM_H_
+#define	_LIBCAPSICUM_RANDOM_H_
+
+int cap_random_buf(cap_channel_t *chan, void *buf, size_t nbytes);
+
+#endif	/* !_LIBCAPSICUM_RANDOM_H_ */
diff --git a/lib/libcapsicum/libcapsicum_service.c b/lib/libcapsicum/libcapsicum_service.c
new file mode 100644
index 00000000000..412766864d2
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_service.c
@@ -0,0 +1,96 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nv.h>
+#include "msgio.h"
+
+#include "libcapsicum.h"
+#include "libcapsicum_impl.h"
+#include "libcapsicum_service.h"
+
+cap_channel_t *
+cap_service_open(const cap_channel_t *chan, const char *name)
+{
+	cap_channel_t *newchan;
+	nvlist_t *nvl;
+	int sock, error;
+
+	sock = -1;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "open");
+	nvlist_add_string(nvl, "service", name);
+	if (fd_is_valid(STDERR_FILENO))
+		nvlist_add_descriptor(nvl, "stderrfd", STDERR_FILENO);
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL)
+		return (NULL);
+	error = (int)nvlist_get_number(nvl, "error");
+	if (error != 0) {
+		nvlist_destroy(nvl);
+		errno = error;
+		return (NULL);
+	}
+	sock = nvlist_take_descriptor(nvl, "chanfd");
+	assert(sock >= 0);
+	nvlist_destroy(nvl);
+	nvl = NULL;
+	if (cred_send(sock) == -1)
+		goto fail;
+	newchan = cap_wrap(sock);
+	if (newchan == NULL)
+		goto fail;
+	return (newchan);
+fail:
+	error = errno;
+	close(sock);
+	errno = error;
+	return (NULL);
+}
+
+int
+cap_service_limit(const cap_channel_t *chan, const char * const *names,
+    size_t nnames)
+{
+	nvlist_t *limits;
+	unsigned int i;
+
+	limits = nvlist_create(0);
+	for (i = 0; i < nnames; i++)
+		nvlist_add_null(limits, names[i]);
+	return (cap_limit_set(chan, limits));
+}
diff --git a/lib/libcapsicum/libcapsicum_service.h b/lib/libcapsicum/libcapsicum_service.h
new file mode 100644
index 00000000000..05c654f7bf1
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_service.h
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCAPSICUM_SERVICE_H_
+#define	_LIBCAPSICUM_SERVICE_H_
+
+cap_channel_t *cap_service_open(const cap_channel_t *chan, const char *name);
+
+int cap_service_limit(const cap_channel_t *chan, const char * const *names,
+    size_t nnames);
+
+#endif	/* !_LIBCAPSICUM_SERVICE_H_ */
diff --git a/lib/libcapsicum/libcapsicum_sysctl.c b/lib/libcapsicum/libcapsicum_sysctl.c
new file mode 100644
index 00000000000..6ea951bc27e
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_sysctl.c
@@ -0,0 +1,86 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <errno.h>
+#include <string.h>
+
+#include <nv.h>
+
+#include "libcapsicum.h"
+#include "libcapsicum_sysctl.h"
+
+int
+cap_sysctlbyname(cap_channel_t *chan, const char *name, void *oldp,
+    size_t *oldlenp, const void *newp, size_t newlen)
+{
+	nvlist_t *nvl;
+	const uint8_t *retoldp;
+	uint8_t operation;
+	size_t oldlen;
+
+	operation = 0;
+	if (oldp != NULL)
+		operation |= CAP_SYSCTL_READ;
+	if (newp != NULL)
+		operation |= CAP_SYSCTL_WRITE;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "cmd", "sysctl");
+	nvlist_add_string(nvl, "name", name);
+	nvlist_add_number(nvl, "operation", (uint64_t)operation);
+	if (oldp == NULL && oldlenp != NULL)
+		nvlist_add_null(nvl, "justsize");
+	else if (oldlenp != NULL)
+		nvlist_add_number(nvl, "oldlen", (uint64_t)*oldlenp);
+	if (newp != NULL)
+		nvlist_add_binary(nvl, "newp", newp, newlen);
+	nvl = cap_xfer_nvlist(chan, nvl);
+	if (nvl == NULL)
+		return (-1);
+	if (nvlist_get_number(nvl, "error") != 0) {
+		errno = (int)nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		return (-1);
+	}
+
+	if (oldp == NULL && oldlenp != NULL) {
+		*oldlenp = (size_t)nvlist_get_number(nvl, "oldlen");
+	} else if (oldp != NULL) {
+		retoldp = nvlist_get_binary(nvl, "oldp", &oldlen);
+		memcpy(oldp, retoldp, oldlen);
+		if (oldlenp != NULL)
+			*oldlenp = oldlen;
+	}
+	nvlist_destroy(nvl);
+
+	return (0);
+}
diff --git a/lib/libcapsicum/libcapsicum_sysctl.h b/lib/libcapsicum/libcapsicum_sysctl.h
new file mode 100644
index 00000000000..d0df1437cec
--- /dev/null
+++ b/lib/libcapsicum/libcapsicum_sysctl.h
@@ -0,0 +1,43 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCAPSICUM_SYSCTL_H_
+#define	_LIBCAPSICUM_SYSCTL_H_
+
+#define	CAP_SYSCTL_READ		0x01
+#define	CAP_SYSCTL_WRITE	0x02
+#define	CAP_SYSCTL_RDWR		(CAP_SYSCTL_READ | CAP_SYSCTL_WRITE)
+#define	CAP_SYSCTL_RECURSIVE	0x04
+
+int cap_sysctlbyname(cap_channel_t *chan, const char *name, void *oldp,
+    size_t *oldlenp, const void *newp, size_t newlen);
+
+#endif	/* !_LIBCAPSICUM_SYSCTL_H_ */
diff --git a/lib/libcasper/Makefile b/lib/libcasper/Makefile
new file mode 100644
index 00000000000..ddcfba5131b
--- /dev/null
+++ b/lib/libcasper/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+LIB=	casper
+
+SHLIB_MAJOR=	0
+SHLIBDIR?=	/lib
+
+SRCS=	libcasper.c
+INCS=	libcasper.h
+
+DPADD=	${LIBCAPSICUM} ${LIBNV} ${LIBPJDLOG}
+LDADD=	-lcapsicum -lnv -lpjdlog
+
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../libpjdlog
+CFLAGS+=-I${.CURDIR}/../../sbin/casper
+
+WARNS?=	6
+
+.include <bsd.lib.mk>
diff --git a/lib/libcasper/libcasper.c b/lib/libcasper/libcasper.c
new file mode 100644
index 00000000000..b279c466849
--- /dev/null
+++ b/lib/libcasper/libcasper.c
@@ -0,0 +1,441 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/capability.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+
+#include <libcapsicum.h>
+#include <libcasper.h>
+#include <libcasper_impl.h>
+#include <nv.h>
+#include <pjdlog.h>
+
+/*
+ * Currently there is only one service_connection per service.
+ * In the future we may want multiple connections from multiple clients
+ * per one service instance, but it has to be carefully designed.
+ * The problem is that we may restrict/sandbox service instance according
+ * to the limits provided. When new connection comes in with different
+ * limits we won't be able to access requested resources.
+ * Not to mention one process will serve to mutiple mutually untrusted
+ * clients and compromise of this service instance by one of its clients
+ * can lead to compromise of the other clients.
+ */
+
+/*
+ * Client connections to the given service.
+ */
+#define	SERVICE_CONNECTION_MAGIC	0x5e91c0ec
+struct service_connection {
+	int		 sc_magic;
+	cap_channel_t	*sc_chan;
+	nvlist_t	*sc_limits;
+	TAILQ_ENTRY(service_connection) sc_next;
+};
+
+#define	SERVICE_MAGIC	0x5e91ce
+struct service {
+	int			 s_magic;
+	char			*s_name;
+	service_limit_func_t	*s_limit;
+	service_command_func_t	*s_command;
+	TAILQ_HEAD(, service_connection) s_connections;
+};
+
+struct service *
+service_alloc(const char *name, service_limit_func_t *limitfunc,
+    service_command_func_t *commandfunc)
+{
+	struct service *service;
+
+	service = malloc(sizeof(*service));
+	if (service == NULL)
+		return (NULL);
+	service->s_name = strdup(name);
+	if (service->s_name == NULL) {
+		free(service);
+		return (NULL);
+	}
+	service->s_limit = limitfunc;
+	service->s_command = commandfunc;
+	TAILQ_INIT(&service->s_connections);
+	service->s_magic = SERVICE_MAGIC;
+
+	return (service);
+}
+
+void
+service_free(struct service *service)
+{
+	struct service_connection *sconn;
+
+	PJDLOG_ASSERT(service->s_magic == SERVICE_MAGIC);
+
+	service->s_magic = 0;
+	while ((sconn = service_connection_first(service)) != NULL)
+		service_connection_remove(service, sconn);
+	free(service->s_name);
+	free(service);
+}
+
+struct service_connection *
+service_connection_add(struct service *service, int sock,
+    const nvlist_t *limits)
+{
+	struct service_connection *sconn;
+	int serrno;
+
+	PJDLOG_ASSERT(service->s_magic == SERVICE_MAGIC);
+
+	sconn = malloc(sizeof(*sconn));
+	if (sconn == NULL) {
+		pjdlog_error("Unable to allocate memory for service connection.");
+		return (NULL);
+	}
+	sconn->sc_chan = cap_wrap(sock);
+	if (sconn->sc_chan == NULL) {
+		serrno = errno;
+		pjdlog_error("Unable to wrap communication channel.");
+		free(sconn);
+		errno = serrno;
+		return (NULL);
+	}
+	if (limits == NULL) {
+		sconn->sc_limits = NULL;
+	} else {
+		sconn->sc_limits = nvlist_clone(limits);
+		if (sconn->sc_limits == NULL) {
+			serrno = errno;
+			pjdlog_error("Unable to clone limits.");
+			(void)cap_unwrap(sconn->sc_chan);
+			free(sconn);
+			errno = serrno;
+			return (NULL);
+		}
+	}
+	sconn->sc_magic = SERVICE_CONNECTION_MAGIC;
+	TAILQ_INSERT_TAIL(&service->s_connections, sconn, sc_next);
+	return (sconn);
+}
+
+void
+service_connection_remove(struct service *service,
+    struct service_connection *sconn)
+{
+
+	PJDLOG_ASSERT(service->s_magic == SERVICE_MAGIC);
+	PJDLOG_ASSERT(sconn->sc_magic == SERVICE_CONNECTION_MAGIC);
+
+	TAILQ_REMOVE(&service->s_connections, sconn, sc_next);
+	sconn->sc_magic = 0;
+	nvlist_destroy(sconn->sc_limits);
+	cap_close(sconn->sc_chan);
+	free(sconn);
+}
+
+int
+service_connection_clone(struct service *service,
+    struct service_connection *sconn)
+{
+	struct service_connection *newsconn;
+	int serrno, sock[2];
+
+	if (socketpair(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, sock) < 0)
+		return (-1);
+
+	newsconn = service_connection_add(service, sock[0],
+	    service_connection_get_limits(sconn));
+	if (newsconn == NULL) {
+		serrno = errno;
+		close(sock[0]);
+		close(sock[1]);
+		errno = serrno;
+		return (-1);
+	}
+
+	return (sock[1]);
+}
+
+struct service_connection *
+service_connection_first(struct service *service)
+{
+	struct service_connection *sconn;
+
+	PJDLOG_ASSERT(service->s_magic == SERVICE_MAGIC);
+
+	sconn = TAILQ_FIRST(&service->s_connections);
+	PJDLOG_ASSERT(sconn == NULL ||
+	    sconn->sc_magic == SERVICE_CONNECTION_MAGIC);
+	return (sconn);
+}
+
+struct service_connection *
+service_connection_next(struct service_connection *sconn)
+{
+
+	PJDLOG_ASSERT(sconn->sc_magic == SERVICE_CONNECTION_MAGIC);
+
+	sconn = TAILQ_NEXT(sconn, sc_next);
+	PJDLOG_ASSERT(sconn == NULL ||
+	    sconn->sc_magic == SERVICE_CONNECTION_MAGIC);
+	return (sconn);
+}
+
+cap_channel_t *
+service_connection_get_chan(const struct service_connection *sconn)
+{
+
+	PJDLOG_ASSERT(sconn->sc_magic == SERVICE_CONNECTION_MAGIC);
+
+	return (sconn->sc_chan);
+}
+
+int
+service_connection_get_sock(const struct service_connection *sconn)
+{
+
+	PJDLOG_ASSERT(sconn->sc_magic == SERVICE_CONNECTION_MAGIC);
+
+	return (cap_sock(sconn->sc_chan));
+}
+
+const nvlist_t *
+service_connection_get_limits(const struct service_connection *sconn)
+{
+
+	PJDLOG_ASSERT(sconn->sc_magic == SERVICE_CONNECTION_MAGIC);
+
+	return (sconn->sc_limits);
+}
+
+void
+service_connection_set_limits(struct service_connection *sconn,
+    nvlist_t *limits)
+{
+
+	PJDLOG_ASSERT(sconn->sc_magic == SERVICE_CONNECTION_MAGIC);
+
+	nvlist_destroy(sconn->sc_limits);
+	sconn->sc_limits = limits;
+}
+
+#if 0
+static void
+casper_message_connection(struct service *service, const nvlist_t *nvl)
+{
+
+	service_connection_add(&service->s_connections,
+	    nvlist_get_descriptor(nvl, "sock"));
+}
+
+static void
+casper_message(const cap_channel_t *capcas, struct service *service)
+{
+	const char *cmd;
+	nvlist_t *nvl;
+
+	nvl = cap_recv_nvlist(capcas);
+	if (nvl == NULL)
+		pjdlog_exit(1, "Unable to receive message from Casper");
+	cmd = nvlist_get_string(nvl, "cmd");
+	if (strcmp(cmd, "connection") == 0)
+		casper_message_connection(service, nvl);
+	else
+		PJDLOG_ABORT("Unknown command from Casper: %s.", cmd);
+}
+#endif
+
+void
+service_message(struct service *service, struct service_connection *sconn)
+{
+	nvlist_t *nvlin, *nvlout;
+	const char *cmd;
+	int error;
+
+	nvlin = cap_recv_nvlist(service_connection_get_chan(sconn));
+	if (nvlin == NULL) {
+		if (errno == ENOTCONN) {
+			pjdlog_debug(1, "Connection closed by the client.");
+		} else {
+			pjdlog_errno(LOG_ERR,
+			    "Unable to receive message from client");
+		}
+		service_connection_remove(service, sconn);
+		return;
+	}
+
+	error = EDOOFUS;
+	nvlout = nvlist_create(0);
+
+	cmd = nvlist_get_string(nvlin, "cmd");
+	pjdlog_debug(1, "Command received from client: %s.", cmd);
+	if (pjdlog_debug_get() >= 2)
+		nvlist_fdump(nvlin, stderr);
+	if (strcmp(cmd, "limit_set") == 0) {
+		nvlist_t *nvllim;
+
+		nvllim = nvlist_take_nvlist(nvlin, "limits");
+		error = service->s_limit(service_connection_get_limits(sconn),
+		    nvllim);
+		if (error == 0) {
+			service_connection_set_limits(sconn, nvllim);
+			/* Function consumes nvllim. */
+		} else {
+			nvlist_destroy(nvllim);
+		}
+	} else if (strcmp(cmd, "limit_get") == 0) {
+		const nvlist_t *nvllim;
+
+		nvllim = service_connection_get_limits(sconn);
+		if (nvllim != NULL)
+			nvlist_add_nvlist(nvlout, "limits", nvllim);
+		else
+			nvlist_add_null(nvlout, "limits");
+		error = 0;
+	} else if (strcmp(cmd, "clone") == 0) {
+		int sock;
+
+		sock = service_connection_clone(service, sconn);
+		if (sock == -1) {
+			error = errno;
+		} else {
+			nvlist_add_descriptor(nvlout, "sock", sock);
+			error = 0;
+		}
+	} else {
+		nvlout = nvlist_create(0);
+		error = service->s_command(cmd,
+		    service_connection_get_limits(sconn), nvlin, nvlout);
+	}
+
+	nvlist_destroy(nvlin);
+	nvlist_add_number(nvlout, "error", (uint64_t)error);
+	pjdlog_debug(1, "Sending reply to client (error=%d).", error);
+	if (pjdlog_debug_get() >= 2)
+		nvlist_fdump(nvlout, stderr);
+
+	if (cap_send_nvlist(service_connection_get_chan(sconn), nvlout) == -1) {
+		pjdlog_errno(LOG_ERR, "Unable to send message to client");
+		service_connection_remove(service, sconn);
+		return;
+	}
+}
+
+static int
+fd_add(fd_set *fdsp, int maxfd, int fd)
+{
+
+	FD_SET(fd, fdsp);
+	return (fd > maxfd ? fd : maxfd);
+}
+
+int
+service_start(const char *name, int sock, service_limit_func_t *limitfunc,
+    service_command_func_t *commandfunc, int argc, char *argv[])
+{
+	struct service *service;
+	struct service_connection *sconn, *sconntmp;
+	fd_set fds;
+	int maxfd, nfds, serrno;
+
+	assert(argc == 2);
+
+	pjdlog_init(PJDLOG_MODE_STD);
+	pjdlog_debug_set(atoi(argv[1]));
+
+	service = service_alloc(name, limitfunc, commandfunc);
+	if (service == NULL)
+		return (errno);
+	if (service_connection_add(service, sock, NULL) == NULL) {
+		serrno = errno;
+		service_free(service);
+		return (serrno);
+	}
+
+	for (;;) {
+		FD_ZERO(&fds);
+		maxfd = -1;
+		for (sconn = service_connection_first(service); sconn != NULL;
+		    sconn = service_connection_next(sconn)) {
+			maxfd = fd_add(&fds, maxfd,
+			    service_connection_get_sock(sconn));
+		}
+
+		PJDLOG_ASSERT(maxfd >= 0);
+		PJDLOG_ASSERT(maxfd + 1 <= (int)FD_SETSIZE);
+		nfds = select(maxfd + 1, &fds, NULL, NULL, NULL);
+		if (nfds < 0) {
+			if (errno != EINTR)
+				pjdlog_errno(LOG_ERR, "select() failed");
+			continue;
+		} else if (nfds == 0) {
+			/* Timeout. */
+			PJDLOG_ABORT("select() timeout");
+			continue;
+		}
+
+		for (sconn = service_connection_first(service); sconn != NULL;
+		    sconn = sconntmp) {
+			/*
+			 * Prepare for connection to be removed from the list
+			 * on failure.
+			 */
+			sconntmp = service_connection_next(sconn);
+			if (FD_ISSET(service_connection_get_sock(sconn), &fds))
+				service_message(service, sconn);
+		}
+		if (service_connection_first(service) == NULL) {
+			/*
+			 * No connections left, exiting.
+			 */
+			break;
+		}
+	}
+
+	return (0);
+}
diff --git a/lib/libcasper/libcasper.h b/lib/libcasper/libcasper.h
new file mode 100644
index 00000000000..91d602737f9
--- /dev/null
+++ b/lib/libcasper/libcasper.h
@@ -0,0 +1,70 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCASPER_H_
+#define	_LIBCASPER_H_
+
+#ifndef	_NVLIST_T_DECLARED
+#define	_NVLIST_T_DECLARED
+struct nvlist;
+
+typedef struct nvlist nvlist_t;
+#endif
+
+#define	PARENT_FILENO		3
+#define	EXECUTABLE_FILENO	4
+#define	PROC_FILENO		5
+
+struct service;
+struct service_connection;
+
+typedef int service_limit_func_t(const nvlist_t *, const nvlist_t *);
+typedef int service_command_func_t(const char *cmd, const nvlist_t *,
+    nvlist_t *, nvlist_t *);
+
+struct service_connection *service_connection_add(struct service *service,
+    int sock, const nvlist_t *limits);
+void service_connection_remove(struct service *service,
+    struct service_connection *sconn);
+int service_connection_clone(struct service *service,
+    struct service_connection *sconn);
+struct service_connection *service_connection_first(struct service *service);
+struct service_connection *service_connection_next(struct service_connection *sconn);
+cap_channel_t *service_connection_get_chan(const struct service_connection *sconn);
+int service_connection_get_sock(const struct service_connection *sconn);
+const nvlist_t *service_connection_get_limits(const struct service_connection *sconn);
+void service_connection_set_limits(struct service_connection *sconn,
+    nvlist_t *limits);
+
+int service_start(const char *name, int sock, service_limit_func_t *limitfunc,
+    service_command_func_t *commandfunc, int argc, char *argv[]);
+
+#endif	/* !_LIBCASPER_H_ */
diff --git a/lib/libcasper/libcasper_impl.h b/lib/libcasper/libcasper_impl.h
new file mode 100644
index 00000000000..320f21abb60
--- /dev/null
+++ b/lib/libcasper/libcasper_impl.h
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_LIBCASPER_IMPL_H_
+#define	_LIBCASPER_IMPL_H_
+
+#include "libcasper.h"
+
+struct service;
+struct service_connection;
+
+struct service * service_alloc(const char *name,
+    service_limit_func_t *limitfunc, service_command_func_t *commandfunc);
+void service_free(struct service *service);
+
+void service_message(struct service *service, struct service_connection *sconn);
+
+#endif	/* !_LIBCASPER_IMPL_H_ */
diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile
index 7274e287bde..798b4b6350d 100644
--- a/lib/libcrypt/Makefile
+++ b/lib/libcrypt/Makefile
@@ -37,4 +37,9 @@ WARNS?=		2
 
 PRECIOUSLIB=
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.lib.mk>
+.include <bsd.subdir.mk>
diff --git a/lib/libcrypt/tests/Makefile b/lib/libcrypt/tests/Makefile
index 3190dbe9492..51adc2dccf5 100644
--- a/lib/libcrypt/tests/Makefile
+++ b/lib/libcrypt/tests/Makefile
@@ -2,7 +2,9 @@
 
 # exercise libcrypt
 
-TESTS_C= crypt_tests
+TESTSDIR= ${TESTSBASE}/lib/libcrypt
+
+ATF_TESTS_C= crypt_tests
 
 CFLAGS+= -I${.CURDIR:H}
 LDADD+= -L${.OBJDIR:H} -lcrypt
diff --git a/lib/libcrypt/tests/crypt_tests.c b/lib/libcrypt/tests/crypt_tests.c
index 3331d12d05f..426d10e271a 100644
--- a/lib/libcrypt/tests/crypt_tests.c
+++ b/lib/libcrypt/tests/crypt_tests.c
@@ -43,7 +43,7 @@ ATF_TC_BODY(invalid, tc)
 
 /*
  * This function must not do anything except enumerate
- * the test cases, else atf-run is likely to be upset.
+ * the test cases, per atf-c-api(3).
  */
 ATF_TP_ADD_TCS(tp)
 {
diff --git a/lib/libfetch/common.c b/lib/libfetch/common.c
index 15d5a25de83..49d268ce376 100644
--- a/lib/libfetch/common.c
+++ b/lib/libfetch/common.c
@@ -829,6 +829,16 @@ fetch_ssl(conn_t *conn, const struct url *URL, int verbose)
 		return (-1);
 	}
 	SSL_set_fd(conn->ssl, conn->sd);
+
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+	if (!SSL_set_tlsext_host_name(conn->ssl,
+	    __DECONST(struct url *, URL)->host)) {
+		fprintf(stderr,
+		    "TLS server name indication extension failed for host %s\n",
+		    URL->host);
+		return (-1);
+	}
+#endif
 	while ((ret = SSL_connect(conn->ssl)) == -1) {
 		ssl_err = SSL_get_error(conn->ssl, ret);
 		if (ssl_err != SSL_ERROR_WANT_READ &&
diff --git a/lib/libiconv_compat/Makefile b/lib/libiconv_compat/Makefile
deleted file mode 100644
index 3d4483ae02e..00000000000
--- a/lib/libiconv_compat/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# $FreeBSD$
-
-LIB=	iconv
-SHLIB_MAJOR= 3
-SRCS=	stub.c
-
-WARNS?=	0
-
-.include <bsd.lib.mk>
diff --git a/lib/libiconv_compat/stub.c b/lib/libiconv_compat/stub.c
deleted file mode 100644
index b4e56a2353e..00000000000
--- a/lib/libiconv_compat/stub.c
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Hacks to support things like the dlopen() in libkiconv.so or
- * ports that want to hard-code -liconv.
- *
- * $FreeBSD$
- */
-
-int __libiconv_stub__;
diff --git a/lib/libiconv_modules/UTF7/citrus_utf7.c b/lib/libiconv_modules/UTF7/citrus_utf7.c
index 925be6d228e..78af5fe0545 100644
--- a/lib/libiconv_modules/UTF7/citrus_utf7.c
+++ b/lib/libiconv_modules/UTF7/citrus_utf7.c
@@ -113,9 +113,9 @@ static const char base64[] =
 static const char direct[] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 	"abcdefghijklmnopqrstuvwxyz"
-	"0123456789(),-./:?";
+	"0123456789'(),-./:?";
 
-static const char option[] = "!\"#$%&';<=>@[]^_`{|}";
+static const char option[] = "!\"#$%&*;<=>@[]^_`{|}";
 static const char spaces[] = " \t\r\n";
 
 #define	BASE64_BIT	6
@@ -165,6 +165,7 @@ _citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei,
 				*nresult = (size_t)-2;
 				*s = s0;
 				sv.chlen = psenc->chlen;
+				memcpy(sv.ch, psenc->ch, sizeof(sv.ch));
 				*psenc = sv;
 				return (0);
 			}
@@ -202,6 +203,9 @@ _citrus_UTF7_mbtoutf16(_UTF7EncodingInfo * __restrict ei,
 						goto ilseq;
 					*u16 = (uint16_t)psenc->ch[i];
 					done = 1;
+				} else {
+					psenc->chlen--;
+					i--;
 				}
 			} else {
 				psenc->cache =
@@ -241,7 +245,6 @@ _citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei,
     wchar_t * __restrict pwc, const char ** __restrict s, size_t n,
     _UTF7State * __restrict psenc, size_t * __restrict nresult)
 {
-	const char *s0;
 	uint32_t u32;
 	uint16_t hi, lo;
 	size_t nr, siz;
@@ -252,14 +255,13 @@ _citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei,
 		*nresult = (size_t)_ENCODING_IS_STATE_DEPENDENT;
 		return (0);
 	}
-	s0 = *s;
 	if (psenc->surrogate) {
-		hi = (psenc->cache >> 2) & UTF16_MAX;
+		hi = (psenc->cache >> psenc->bits) & UTF16_MAX;
 		if (hi < HISRG_MIN || hi > HISRG_MAX)
 			return (EINVAL);
 		siz = 0;
 	} else {
-		err = _citrus_UTF7_mbtoutf16(ei, &hi, &s0, n, psenc, &nr);
+		err = _citrus_UTF7_mbtoutf16(ei, &hi, s, n, psenc, &nr);
 		if (nr == (size_t)-1 || nr == (size_t)-2) {
 			*nresult = nr;
 			return (err);
@@ -274,7 +276,7 @@ _citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei,
 		}
 		psenc->surrogate = 1;
 	}
-	err = _citrus_UTF7_mbtoutf16(ei, &lo, &s0, n, psenc, &nr);
+	err = _citrus_UTF7_mbtoutf16(ei, &lo, s, n, psenc, &nr);
 	if (nr == (size_t)-1 || nr == (size_t)-2) {
 		*nresult = nr;
 		return (err);
@@ -286,7 +288,6 @@ _citrus_UTF7_mbrtowc_priv(_UTF7EncodingInfo * __restrict ei,
 	u32 = (hi << 10 | lo) + SRG_BASE;
 	siz += nr;
 done:
-	*s = s0;
 	if (pwc != NULL)
 		*pwc = (wchar_t)u32;
 	if (u32 == (uint32_t)0) {
diff --git a/lib/libiconv_modules/iconv_std/citrus_iconv_std.c b/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
index b30f09928ae..54a00d0d56a 100644
--- a/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
+++ b/lib/libiconv_modules/iconv_std/citrus_iconv_std.c
@@ -543,6 +543,16 @@ _citrus_iconv_std_iconv_convert(struct _citrus_iconv * __restrict cv,
 		ret = do_conv(is, &csid, &idx);
 		if (ret) {
 			if (ret == E_NO_CORRESPONDING_CHAR) {
+				/*
+				 * GNU iconv returns EILSEQ when no
+				 * corresponding character in the output.
+				 * Some software depends on this behavior
+				 * though this is against POSIX specification.
+				 */
+				if (cv->cv_shared->ci_ilseq_invalid != 0) {
+					ret = EILSEQ;
+					goto err;
+				}
 				inval++;
 				szrout = 0;
 				if ((((flags & _CITRUS_ICONV_F_HIDE_INVALID) == 0) &&
diff --git a/lib/libkse/arch/i386/i386/thr_getcontext.S b/lib/libkse/arch/i386/i386/thr_getcontext.S
index d9d300f7da8..35ac9c4d689 100644
--- a/lib/libkse/arch/i386/i386/thr_getcontext.S
+++ b/lib/libkse/arch/i386/i386/thr_getcontext.S
@@ -50,8 +50,7 @@ __FBSDID("$FreeBSD$");
  *
  * Returns 0 if there are no errors; -1 otherwise
  */
-	.weak CNAME(_thr_setcontext)
-	.set CNAME(_thr_setcontext),CNAME(__thr_setcontext)
+	WEAK_REFERENCE(__thr_setcontext, _thr_setcontext)
 ENTRY(__thr_setcontext)
 	movl	4(%esp), %edx		/* get address of mcontext */
 	cmpl	$0, %edx		/* check for null pointer */
@@ -116,8 +115,7 @@ ENTRY(__thr_setcontext)
  * Returns -1 if there is an error, 0 no errors; 1 upon return
  * from a setcontext().
  */
-	.weak CNAME(_thr_getcontext)
-	.set CNAME(_thr_getcontext),CNAME(__thr_getcontext)
+	WEAK_REFERENCE(__thr_getcontext, _thr_getcontext)
 ENTRY(__thr_getcontext)
 	pushl	%edx			/* save edx */
 	movl	8(%esp), %edx		/* get address of mcontext */
diff --git a/lib/libnetgraph/debug.c b/lib/libnetgraph/debug.c
index dfc75f5268e..6d0579faef6 100644
--- a/lib/libnetgraph/debug.c
+++ b/lib/libnetgraph/debug.c
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
 #include <netgraph/ng_eiface.h>
 #include <netgraph/ng_etf.h>
 #include <netgraph/ng_ether.h>
-#include <netgraph/ng_fec.h>
 #include <netgraph/ng_frame_relay.h>
 #include <netgraph/ng_gif.h>
 #include <netgraph/ng_gif_demux.h>
@@ -136,7 +135,6 @@ static const struct ng_cookie cookies[] = {
 	COOKIE(EIFACE),
 	COOKIE(ETF),
 	COOKIE(ETHER),
-	COOKIE(FEC),
 	COOKIE(FRAMERELAY),
 	COOKIE(GIF),
 	COOKIE(GIF_DEMUX),
diff --git a/lib/libnetgraph/netgraph.3 b/lib/libnetgraph/netgraph.3
index d2ef8bd8c8f..bd557978f8a 100644
--- a/lib/libnetgraph/netgraph.3
+++ b/lib/libnetgraph/netgraph.3
@@ -35,7 +35,7 @@
 .\" $FreeBSD$
 .\" $Whistle: netgraph.3,v 1.7 1999/01/25 07:14:06 archie Exp $
 .\"
-.Dd January 27, 2004
+.Dd November 25, 2013
 .Dt NETGRAPH 3
 .Os
 .Sh NAME
@@ -57,7 +57,7 @@
 .Sh LIBRARY
 .Lb libnetgraph
 .Sh SYNOPSIS
-.In netgraph.h
+.In netgraph/netgraph.h
 .Ft int
 .Fn NgMkSockNode "const char *name" "int *csp" "int *dsp"
 .Ft int
diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile
new file mode 100644
index 00000000000..710c2950671
--- /dev/null
+++ b/lib/libnv/Makefile
@@ -0,0 +1,161 @@
+# $FreeBSD$
+
+LIB=	nv
+SHLIBDIR?= /lib
+SHLIB_MAJOR= 0
+
+SRCS=	dnvlist.c
+SRCS+=	msgio.c
+SRCS+=	nvlist.c
+SRCS+=	nvpair.c
+
+INCS=	dnv.h
+INCS+=	nv.h
+
+MAN+=	nv.3
+
+MLINKS+=nv.3 libnv.3 \
+	nv.3 nvlist.3
+MLINKS+=nv.3 nvlist_create.3 \
+	nv.3 nvlist_destroy.3 \
+	nv.3 nvlist_error.3 \
+	nv.3 nvlist_empty.3 \
+	nv.3 nvlist_clone.3 \
+	nv.3 nvlist_dump.3 \
+	nv.3 nvlist_fdump.3 \
+	nv.3 nvlist_size.3 \
+	nv.3 nvlist_pack.3 \
+	nv.3 nvlist_unpack.3 \
+	nv.3 nvlist_send.3 \
+	nv.3 nvlist_recv.3 \
+	nv.3 nvlist_xfer.3 \
+	nv.3 nvlist_next.3 \
+	nv.3 nvlist_exists.3 \
+	nv.3 nvlist_exists_type.3 \
+	nv.3 nvlist_exists_null.3 \
+	nv.3 nvlist_exists_bool.3 \
+	nv.3 nvlist_exists_number.3 \
+	nv.3 nvlist_exists_string.3 \
+	nv.3 nvlist_exists_nvlist.3 \
+	nv.3 nvlist_exists_descriptor.3 \
+	nv.3 nvlist_exists_binary.3 \
+	nv.3 nvlist_add_null.3 \
+	nv.3 nvlist_add_bool.3 \
+	nv.3 nvlist_add_number.3 \
+	nv.3 nvlist_add_string.3 \
+	nv.3 nvlist_add_stringf.3 \
+	nv.3 nvlist_add_stringv.3 \
+	nv.3 nvlist_add_nvlist.3 \
+	nv.3 nvlist_add_descriptor.3 \
+	nv.3 nvlist_add_binary.3 \
+	nv.3 nvlist_move_string.3 \
+	nv.3 nvlist_move_nvlist.3 \
+	nv.3 nvlist_move_descriptor.3 \
+	nv.3 nvlist_move_binary.3 \
+	nv.3 nvlist_get_bool.3 \
+	nv.3 nvlist_get_number.3 \
+	nv.3 nvlist_get_string.3 \
+	nv.3 nvlist_get_nvlist.3 \
+	nv.3 nvlist_get_descriptor.3 \
+	nv.3 nvlist_get_binary.3 \
+	nv.3 nvlist_take_bool.3 \
+	nv.3 nvlist_take_number.3 \
+	nv.3 nvlist_take_string.3 \
+	nv.3 nvlist_take_nvlist.3 \
+	nv.3 nvlist_take_descriptor.3 \
+	nv.3 nvlist_take_binary.3 \
+	nv.3 nvlist_free.3 \
+	nv.3 nvlist_free_type.3 \
+	nv.3 nvlist_free_null.3 \
+	nv.3 nvlist_free_bool.3 \
+	nv.3 nvlist_free_number.3 \
+	nv.3 nvlist_free_string.3 \
+	nv.3 nvlist_free_nvlist.3 \
+	nv.3 nvlist_free_descriptor.3 \
+	nv.3 nvlist_free_binary.3
+MLINKS+=nv.3 nvlist_existsf.3 \
+	nv.3 nvlist_existsf_type.3 \
+	nv.3 nvlist_existsf_null.3 \
+	nv.3 nvlist_existsf_bool.3 \
+	nv.3 nvlist_existsf_number.3 \
+	nv.3 nvlist_existsf_string.3 \
+	nv.3 nvlist_existsf_nvlist.3 \
+	nv.3 nvlist_existsf_descriptor.3 \
+	nv.3 nvlist_existsf_binary.3 \
+	nv.3 nvlist_addf_null.3 \
+	nv.3 nvlist_addf_bool.3 \
+	nv.3 nvlist_addf_number.3 \
+	nv.3 nvlist_addf_string.3 \
+	nv.3 nvlist_addf_nvlist.3 \
+	nv.3 nvlist_addf_descriptor.3 \
+	nv.3 nvlist_addf_binary.3 \
+	nv.3 nvlist_movef_string.3 \
+	nv.3 nvlist_movef_nvlist.3 \
+	nv.3 nvlist_movef_descriptor.3 \
+	nv.3 nvlist_movef_binary.3 \
+	nv.3 nvlist_getf_bool.3 \
+	nv.3 nvlist_getf_number.3 \
+	nv.3 nvlist_getf_string.3 \
+	nv.3 nvlist_getf_nvlist.3 \
+	nv.3 nvlist_getf_descriptor.3 \
+	nv.3 nvlist_getf_binary.3 \
+	nv.3 nvlist_takef_bool.3 \
+	nv.3 nvlist_takef_number.3 \
+	nv.3 nvlist_takef_string.3 \
+	nv.3 nvlist_takef_nvlist.3 \
+	nv.3 nvlist_takef_descriptor.3 \
+	nv.3 nvlist_takef_binary.3 \
+	nv.3 nvlist_freef.3 \
+	nv.3 nvlist_freef_type.3 \
+	nv.3 nvlist_freef_null.3 \
+	nv.3 nvlist_freef_bool.3 \
+	nv.3 nvlist_freef_number.3 \
+	nv.3 nvlist_freef_string.3 \
+	nv.3 nvlist_freef_nvlist.3 \
+	nv.3 nvlist_freef_descriptor.3 \
+	nv.3 nvlist_freef_binary.3
+MLINKS+=nv.3 nvlist_existsv.3 \
+	nv.3 nvlist_existsv_type.3 \
+	nv.3 nvlist_existsv_null.3 \
+	nv.3 nvlist_existsv_bool.3 \
+	nv.3 nvlist_existsv_number.3 \
+	nv.3 nvlist_existsv_string.3 \
+	nv.3 nvlist_existsv_nvlist.3 \
+	nv.3 nvlist_existsv_descriptor.3 \
+	nv.3 nvlist_existsv_binary.3 \
+	nv.3 nvlist_addv_null.3 \
+	nv.3 nvlist_addv_bool.3 \
+	nv.3 nvlist_addv_number.3 \
+	nv.3 nvlist_addv_string.3 \
+	nv.3 nvlist_addv_nvlist.3 \
+	nv.3 nvlist_addv_descriptor.3 \
+	nv.3 nvlist_addv_binary.3 \
+	nv.3 nvlist_movev_string.3 \
+	nv.3 nvlist_movev_nvlist.3 \
+	nv.3 nvlist_movev_descriptor.3 \
+	nv.3 nvlist_movev_binary.3 \
+	nv.3 nvlist_getv_bool.3 \
+	nv.3 nvlist_getv_number.3 \
+	nv.3 nvlist_getv_string.3 \
+	nv.3 nvlist_getv_nvlist.3 \
+	nv.3 nvlist_getv_descriptor.3 \
+	nv.3 nvlist_getv_binary.3 \
+	nv.3 nvlist_takev_bool.3 \
+	nv.3 nvlist_takev_number.3 \
+	nv.3 nvlist_takev_string.3 \
+	nv.3 nvlist_takev_nvlist.3 \
+	nv.3 nvlist_takev_descriptor.3 \
+	nv.3 nvlist_takev_binary.3 \
+	nv.3 nvlist_freef.3 \
+	nv.3 nvlist_freev_type.3 \
+	nv.3 nvlist_freev_null.3 \
+	nv.3 nvlist_freev_bool.3 \
+	nv.3 nvlist_freev_number.3 \
+	nv.3 nvlist_freev_string.3 \
+	nv.3 nvlist_freev_nvlist.3 \
+	nv.3 nvlist_freev_descriptor.3 \
+	nv.3 nvlist_freev_binary.3
+
+WARNS?=	6
+
+.include <bsd.lib.mk>
diff --git a/lib/libnv/common_impl.h b/lib/libnv/common_impl.h
new file mode 100644
index 00000000000..5af4db2b835
--- /dev/null
+++ b/lib/libnv/common_impl.h
@@ -0,0 +1,37 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_COMMON_IMPL_H_
+#define	_COMMON_IMPL_H_
+
+#define	fd_is_valid(fd)	(fcntl((fd), F_GETFL) != -1 || errno != EBADF)
+
+#endif	/* !_COMMON_IMPL_H_ */
diff --git a/lib/libnv/dnv.h b/lib/libnv/dnv.h
new file mode 100644
index 00000000000..ac1e57c2e84
--- /dev/null
+++ b/lib/libnv/dnv.h
@@ -0,0 +1,106 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_DNV_H_
+#define	_DNV_H_
+
+#include <sys/cdefs.h>
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#ifndef	_NVLIST_T_DECLARED
+#define	_NVLIST_T_DECLARED
+struct nvlist;
+
+typedef struct nvlist nvlist_t;
+#endif
+
+/*
+ * The dnvlist_get functions returns value associated with the given name.
+ * If it returns a pointer, the pointer represents internal buffer and should
+ * not be freed by the caller.
+ * If no element of the given name and type exists, the function will return
+ * provided default value.
+ */
+
+bool dnvlist_get_bool(const nvlist_t *nvl, const char *name, bool defval);
+uint64_t dnvlist_get_number(const nvlist_t *nvl, const char *name, uint64_t defval);
+const char *dnvlist_get_string(const nvlist_t *nvl, const char *name, const char *defval);
+const nvlist_t *dnvlist_get_nvlist(const nvlist_t *nvl, const char *name, const nvlist_t *defval);
+int dnvlist_get_descriptor(const nvlist_t *nvl, const char *name, int defval);
+const void *dnvlist_get_binary(const nvlist_t *nvl, const char *name, size_t *sizep, const void *defval, size_t defsize);
+
+bool dnvlist_getf_bool(const nvlist_t *nvl, bool defval, const char *namefmt, ...) __printflike(3, 4);
+uint64_t dnvlist_getf_number(const nvlist_t *nvl, uint64_t defval, const char *namefmt, ...) __printflike(3, 4);
+const char *dnvlist_getf_string(const nvlist_t *nvl, const char *defval, const char *namefmt, ...) __printflike(3, 4);
+const nvlist_t *dnvlist_getf_nvlist(const nvlist_t *nvl, const nvlist_t *defval, const char *namefmt, ...) __printflike(3, 4);
+int dnvlist_getf_descriptor(const nvlist_t *nvl, int defval, const char *namefmt, ...) __printflike(3, 4);
+const void *dnvlist_getf_binary(const nvlist_t *nvl, size_t *sizep, const void *defval, size_t defsize, const char *namefmt, ...) __printflike(5, 6);
+
+bool dnvlist_getv_bool(const nvlist_t *nvl, bool defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+uint64_t dnvlist_getv_number(const nvlist_t *nvl, uint64_t defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+const char *dnvlist_getv_string(const nvlist_t *nvl, const char *defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+const nvlist_t *dnvlist_getv_nvlist(const nvlist_t *nvl, const nvlist_t *defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+int dnvlist_getv_descriptor(const nvlist_t *nvl, int defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+const void *dnvlist_getv_binary(const nvlist_t *nvl, size_t *sizep, const void *defval, size_t defsize, const char *namefmt, va_list nameap) __printflike(5, 0);
+
+/*
+ * The dnvlist_take functions returns value associated with the given name and
+ * remove corresponding nvpair.
+ * If it returns a pointer, the caller has to free it.
+ * If no element of the given name and type exists, the function will return
+ * provided default value.
+ */
+
+bool dnvlist_take_bool(nvlist_t *nvl, const char *name, bool defval);
+uint64_t dnvlist_take_number(nvlist_t *nvl, const char *name, uint64_t defval);
+char *dnvlist_take_string(nvlist_t *nvl, const char *name, char *defval);
+nvlist_t *dnvlist_take_nvlist(nvlist_t *nvl, const char *name, nvlist_t *defval);
+int dnvlist_take_descriptor(nvlist_t *nvl, const char *name, int defval);
+void *dnvlist_take_binary(nvlist_t *nvl, const char *name, size_t *sizep, void *defval, size_t defsize);
+
+bool dnvlist_takef_bool(nvlist_t *nvl, bool defval, const char *namefmt, ...) __printflike(3, 4);
+uint64_t dnvlist_takef_number(nvlist_t *nvl, uint64_t defval, const char *namefmt, ...) __printflike(3, 4);
+char *dnvlist_takef_string(nvlist_t *nvl, char *defval, const char *namefmt, ...) __printflike(3, 4);
+nvlist_t *dnvlist_takef_nvlist(nvlist_t *nvl, nvlist_t *defval, const char *namefmt, ...) __printflike(3, 4);
+int dnvlist_takef_descriptor(nvlist_t *nvl, int defval, const char *namefmt, ...) __printflike(3, 4);
+void *dnvlist_takef_binary(nvlist_t *nvl, size_t *sizep, void *defval, size_t defsize, const char *namefmt, ...) __printflike(5, 6);
+
+bool dnvlist_takev_bool(nvlist_t *nvl, bool defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+uint64_t dnvlist_takev_number(nvlist_t *nvl, uint64_t defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+char *dnvlist_takev_string(nvlist_t *nvl, char *defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+nvlist_t *dnvlist_takev_nvlist(nvlist_t *nvl, nvlist_t *defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+int dnvlist_takev_descriptor(nvlist_t *nvl, int defval, const char *namefmt, va_list nameap) __printflike(3, 0);
+void *dnvlist_takev_binary(nvlist_t *nvl, size_t *sizep, void *defval, size_t defsize, const char *namefmt, va_list nameap) __printflike(5, 0);
+
+#endif	/* !_DNV_H_ */
diff --git a/lib/libnv/dnvlist.c b/lib/libnv/dnvlist.c
new file mode 100644
index 00000000000..b758bbf97d5
--- /dev/null
+++ b/lib/libnv/dnvlist.c
@@ -0,0 +1,252 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+
+#include "nv.h"
+#include "nv_impl.h"
+
+#include "dnv.h"
+
+#define	DNVLIST_GET(ftype, type)					\
+ftype									\
+dnvlist_get_##type(const nvlist_t *nvl, const char *name, ftype defval)	\
+{									\
+									\
+	return (dnvlist_getf_##type(nvl, defval, "%s", name));		\
+}
+
+DNVLIST_GET(bool, bool)
+DNVLIST_GET(uint64_t, number)
+DNVLIST_GET(const char *, string)
+DNVLIST_GET(const nvlist_t *, nvlist)
+DNVLIST_GET(int, descriptor)
+
+#undef	DNVLIST_GET
+
+const void *
+dnvlist_get_binary(const nvlist_t *nvl, const char *name, size_t *sizep,
+    const void *defval, size_t defsize)
+{
+
+	return (dnvlist_getf_binary(nvl, sizep, defval, defsize, "%s", name));
+}
+
+#define	DNVLIST_GETF(ftype, type)					\
+ftype									\
+dnvlist_getf_##type(const nvlist_t *nvl, ftype defval,			\
+    const char *namefmt, ...)						\
+{									\
+	va_list nameap;							\
+	ftype value;							\
+									\
+	va_start(nameap, namefmt);					\
+	value = dnvlist_getv_##type(nvl, defval, namefmt, nameap);	\
+	va_end(nameap);							\
+									\
+	return (value);							\
+}
+
+DNVLIST_GETF(bool, bool)
+DNVLIST_GETF(uint64_t, number)
+DNVLIST_GETF(const char *, string)
+DNVLIST_GETF(const nvlist_t *, nvlist)
+DNVLIST_GETF(int, descriptor)
+
+#undef	DNVLIST_GETF
+
+const void *
+dnvlist_getf_binary(const nvlist_t *nvl, size_t *sizep, const void *defval,
+    size_t defsize, const char *namefmt, ...)
+{
+	va_list nameap;
+	const void *value;
+
+	va_start(nameap, namefmt);
+	value = dnvlist_getv_binary(nvl, sizep, defval, defsize, namefmt,
+	    nameap);
+	va_end(nameap);
+
+	return (value);
+}
+
+#define	DNVLIST_GETV(ftype, type)					\
+ftype									\
+dnvlist_getv_##type(const nvlist_t *nvl, ftype defval,			\
+    const char *namefmt, va_list nameap)				\
+{									\
+	va_list cnameap;						\
+	ftype value;							\
+									\
+	va_copy(cnameap, nameap);					\
+	if (nvlist_existsv_##type(nvl, namefmt, cnameap))		\
+		value = nvlist_getv_##type(nvl, namefmt, nameap);	\
+	else								\
+		value = defval;						\
+	va_end(cnameap);						\
+	return (value);							\
+}
+
+DNVLIST_GETV(bool, bool)
+DNVLIST_GETV(uint64_t, number)
+DNVLIST_GETV(const char *, string)
+DNVLIST_GETV(const nvlist_t *, nvlist)
+DNVLIST_GETV(int, descriptor)
+
+#undef	DNVLIST_GETV
+
+const void *
+dnvlist_getv_binary(const nvlist_t *nvl, size_t *sizep, const void *defval,
+    size_t defsize, const char *namefmt, va_list nameap)
+{
+	va_list cnameap;
+	const void *value;
+
+	va_copy(cnameap, nameap);
+	if (nvlist_existsv_binary(nvl, namefmt, cnameap)) {
+		value = nvlist_getv_binary(nvl, sizep, namefmt, nameap);
+	} else {
+		if (sizep != NULL)
+			*sizep = defsize;
+		value = defval;
+	}
+	va_end(cnameap);
+	return (value);
+}
+
+#define	DNVLIST_TAKE(ftype, type)					\
+ftype									\
+dnvlist_take_##type(nvlist_t *nvl, const char *name, ftype defval)	\
+{									\
+									\
+	return (dnvlist_takef_##type(nvl, defval, "%s", name));		\
+}
+
+DNVLIST_TAKE(bool, bool)
+DNVLIST_TAKE(uint64_t, number)
+DNVLIST_TAKE(char *, string)
+DNVLIST_TAKE(nvlist_t *, nvlist)
+DNVLIST_TAKE(int, descriptor)
+
+#undef	DNVLIST_TAKE
+
+void *
+dnvlist_take_binary(nvlist_t *nvl, const char *name, size_t *sizep,
+    void *defval, size_t defsize)
+{
+
+	return (dnvlist_takef_binary(nvl, sizep, defval, defsize, "%s", name));
+}
+
+#define	DNVLIST_TAKEF(ftype, type)					\
+ftype									\
+dnvlist_takef_##type(nvlist_t *nvl, ftype defval,			\
+    const char *namefmt, ...)						\
+{									\
+	va_list nameap;							\
+	ftype value;							\
+									\
+	va_start(nameap, namefmt);					\
+	value = dnvlist_takev_##type(nvl, defval, namefmt, nameap);	\
+	va_end(nameap);							\
+									\
+	return (value);							\
+}
+
+DNVLIST_TAKEF(bool, bool)
+DNVLIST_TAKEF(uint64_t, number)
+DNVLIST_TAKEF(char *, string)
+DNVLIST_TAKEF(nvlist_t *, nvlist)
+DNVLIST_TAKEF(int, descriptor)
+
+#undef	DNVLIST_TAKEF
+
+void *
+dnvlist_takef_binary(nvlist_t *nvl, size_t *sizep, void *defval,
+    size_t defsize, const char *namefmt, ...)
+{
+	va_list nameap;
+	void *value;
+
+	va_start(nameap, namefmt);
+	value = dnvlist_takev_binary(nvl, sizep, defval, defsize, namefmt,
+	    nameap);
+	va_end(nameap);
+
+	return (value);
+}
+
+#define	DNVLIST_TAKEV(ftype, type)					\
+ftype									\
+dnvlist_takev_##type(nvlist_t *nvl, ftype defval, const char *namefmt,	\
+    va_list nameap)							\
+{									\
+	va_list cnameap;						\
+	ftype value;							\
+									\
+	va_copy(cnameap, nameap);					\
+	if (nvlist_existsv_##type(nvl, namefmt, cnameap))		\
+		value = nvlist_takev_##type(nvl, namefmt, nameap);	\
+	else								\
+		value = defval;						\
+	va_end(cnameap);						\
+	return (value);							\
+}
+
+DNVLIST_TAKEV(bool, bool)
+DNVLIST_TAKEV(uint64_t, number)
+DNVLIST_TAKEV(char *, string)
+DNVLIST_TAKEV(nvlist_t *, nvlist)
+DNVLIST_TAKEV(int, descriptor)
+
+#undef	DNVLIST_TAKEV
+
+void *
+dnvlist_takev_binary(nvlist_t *nvl, size_t *sizep, void *defval,
+    size_t defsize, const char *namefmt, va_list nameap)
+{
+	va_list cnameap;
+	void *value;
+
+	va_copy(cnameap, nameap);
+	if (nvlist_existsv_binary(nvl, namefmt, cnameap)) {
+		value = nvlist_takev_binary(nvl, sizep, namefmt, nameap);
+	} else {
+		if (sizep != NULL)
+			*sizep = defsize;
+		value = defval;
+	}
+	va_end(cnameap);
+	return (value);
+}
diff --git a/lib/libnv/msgio.c b/lib/libnv/msgio.c
new file mode 100644
index 00000000000..a37d1cd0bcf
--- /dev/null
+++ b/lib/libnv/msgio.c
@@ -0,0 +1,407 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * Copyright (c) 2013 Mariusz Zaborski <oshogbo@FreeBSD.org>
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef HAVE_PJDLOG
+#include <pjdlog.h>
+#endif
+
+#include "common_impl.h"
+#include "msgio.h"
+
+#ifndef	HAVE_PJDLOG
+#include <assert.h>
+#define	PJDLOG_ASSERT(...)		assert(__VA_ARGS__)
+#define	PJDLOG_RASSERT(expr, ...)	assert(expr)
+#define	PJDLOG_ABORT(...)		abort()
+#endif
+
+static int
+msghdr_add_fd(struct cmsghdr *cmsg, int fd)
+{
+
+	PJDLOG_ASSERT(fd >= 0);
+
+	if (!fd_is_valid(fd)) {
+		errno = EBADF;
+		return (-1);
+	}
+
+	cmsg->cmsg_level = SOL_SOCKET;
+	cmsg->cmsg_type = SCM_RIGHTS;
+	cmsg->cmsg_len = CMSG_LEN(sizeof(fd));
+	bcopy(&fd, CMSG_DATA(cmsg), sizeof(fd));
+
+	return (0);
+}
+
+static int
+msghdr_get_fd(struct cmsghdr *cmsg)
+{
+	int fd;
+
+	if (cmsg == NULL || cmsg->cmsg_level != SOL_SOCKET ||
+	    cmsg->cmsg_type != SCM_RIGHTS ||
+	    cmsg->cmsg_len != CMSG_LEN(sizeof(fd))) {
+		errno = EINVAL;
+		return (-1);
+	}
+
+	bcopy(CMSG_DATA(cmsg), &fd, sizeof(fd));
+#ifndef MSG_CMSG_CLOEXEC
+	/*
+	 * If the MSG_CMSG_CLOEXEC flag is not available we cannot set the
+	 * close-on-exec flag atomically, but we still want to set it for
+	 * consistency.
+	 */
+	(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
+#endif
+
+	return (fd);
+}
+
+static void
+fd_wait(int fd, bool doread)
+{
+	fd_set fds;
+
+	PJDLOG_ASSERT(fd >= 0);
+
+	FD_ZERO(&fds);
+	FD_SET(fd, &fds);
+	(void)select(fd + 1, doread ? &fds : NULL, doread ? NULL : &fds,
+	    NULL, NULL);
+}
+
+int
+msg_peek(int sock, void *buf, size_t size)
+{
+	ssize_t done;
+
+	PJDLOG_ASSERT(sock >= 0);
+	PJDLOG_ASSERT(size > 0);
+
+	do {
+		fd_wait(sock, true);
+		done = recv(sock, buf, size, MSG_PEEK | MSG_WAITALL);
+		if (done == -1) {
+			if (errno == EAGAIN || errno == EINTR)
+				continue;
+			return (-1);
+		} else if (done == 0) {
+			errno = ENOTCONN;
+			return (-1);
+		}
+	} while (done != (ssize_t)size);
+
+	return (0);
+}
+
+static int
+msg_recv(int sock, struct msghdr *msg)
+{
+	int flags;
+
+	PJDLOG_ASSERT(sock >= 0);
+
+#ifdef MSG_CMSG_CLOEXEC
+	flags = MSG_CMSG_CLOEXEC;
+#else
+	flags = 0;
+#endif
+
+	for (;;) {
+		fd_wait(sock, true);
+		if (recvmsg(sock, msg, flags) == -1) {
+			if (errno == EINTR)
+				continue;
+			return (-1);
+		}
+		break;
+	}
+
+	return (0);
+}
+
+static int
+msg_send(int sock, const struct msghdr *msg)
+{
+
+	PJDLOG_ASSERT(sock >= 0);
+
+	for (;;) {
+		fd_wait(sock, false);
+		if (sendmsg(sock, msg, 0) == -1) {
+			if (errno == EINTR)
+				continue;
+			return (-1);
+		}
+		break;
+	}
+
+	return (0);
+}
+
+int
+cred_send(int sock)
+{
+	unsigned char credbuf[CMSG_SPACE(sizeof(struct cmsgcred))];
+	struct msghdr msg;
+	struct cmsghdr *cmsg;
+	struct iovec iov;
+	uint8_t dummy;
+
+	bzero(credbuf, sizeof(credbuf));
+	bzero(&msg, sizeof(msg));
+	bzero(&iov, sizeof(iov));
+
+	/*
+	 * XXX: We send one byte along with the control message, because
+	 *      setting msg_iov to NULL only works if this is the first
+	 *      packet send over the socket. Once we send some data we
+	 *      won't be able to send credentials anymore. This is most
+	 *      likely a kernel bug.
+	 */
+	dummy = 0;
+	iov.iov_base = &dummy;
+	iov.iov_len = sizeof(dummy);
+
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
+	msg.msg_control = credbuf;
+	msg.msg_controllen = sizeof(credbuf);
+
+	cmsg = CMSG_FIRSTHDR(&msg);
+	cmsg->cmsg_len = CMSG_LEN(sizeof(struct cmsgcred));
+	cmsg->cmsg_level = SOL_SOCKET;
+	cmsg->cmsg_type = SCM_CREDS;
+
+	if (msg_send(sock, &msg) == -1)
+		return (-1);
+
+	return (0);
+}
+
+int
+cred_recv(int sock, struct cmsgcred *cred)
+{
+	unsigned char credbuf[CMSG_SPACE(sizeof(struct cmsgcred))];
+	struct msghdr msg;
+	struct cmsghdr *cmsg;
+	struct iovec iov;
+	uint8_t dummy;
+
+	bzero(credbuf, sizeof(credbuf));
+	bzero(&msg, sizeof(msg));
+	bzero(&iov, sizeof(iov));
+
+	iov.iov_base = &dummy;
+	iov.iov_len = sizeof(dummy);
+
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
+	msg.msg_control = credbuf;
+	msg.msg_controllen = sizeof(credbuf);
+
+	if (msg_recv(sock, &msg) == -1)
+		return (-1);
+
+	cmsg = CMSG_FIRSTHDR(&msg);
+	if (cmsg == NULL ||
+	    cmsg->cmsg_len != CMSG_LEN(sizeof(struct cmsgcred)) ||
+	    cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_CREDS) {
+		errno = EINVAL;
+		return (-1);
+	}
+	bcopy(CMSG_DATA(cmsg), cred, sizeof(*cred));
+
+	return (0);
+}
+
+int
+fd_send(int sock, const int *fds, size_t nfds)
+{
+	struct msghdr msg;
+	struct cmsghdr *cmsg;
+	unsigned int i;
+	int serrno, ret;
+
+	if (nfds == 0 || fds == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
+
+	bzero(&msg, sizeof(msg));
+	msg.msg_iov = NULL;
+	msg.msg_iovlen = 0;
+	msg.msg_controllen = nfds * CMSG_SPACE(sizeof(int));
+	msg.msg_control = calloc(1, msg.msg_controllen);
+	if (msg.msg_control == NULL)
+		return (-1);
+
+	ret = -1;
+
+	for (i = 0, cmsg = CMSG_FIRSTHDR(&msg); i < nfds && cmsg != NULL;
+	    i++, cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+		if (msghdr_add_fd(cmsg, fds[i]) == -1)
+			goto end;
+	}
+
+	if (msg_send(sock, &msg) == -1)
+		goto end;
+
+	ret = 0;
+end:
+	serrno = errno;
+	free(msg.msg_control);
+	errno = serrno;
+	return (ret);
+}
+
+int
+fd_recv(int sock, int *fds, size_t nfds)
+{
+	struct msghdr msg;
+	struct cmsghdr *cmsg;
+	unsigned int i;
+	int serrno, ret;
+
+	if (nfds == 0 || fds == NULL) {
+		errno = EINVAL;
+		return (-1);
+	}
+
+	bzero(&msg, sizeof(msg));
+	msg.msg_iov = NULL;
+	msg.msg_iovlen = 0;
+	msg.msg_controllen = nfds * CMSG_SPACE(sizeof(int));
+	msg.msg_control = calloc(1, msg.msg_controllen);
+	if (msg.msg_control == NULL)
+		return (-1);
+
+	ret = -1;
+
+	if (msg_recv(sock, &msg) == -1)
+		goto end;
+
+	for (i = 0, cmsg = CMSG_FIRSTHDR(&msg); i < nfds && cmsg != NULL;
+	    i++, cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+		fds[i] = msghdr_get_fd(cmsg);
+		if (fds[i] < 0)
+			break;
+	}
+
+	if (cmsg != NULL || i < nfds) {
+		int fd;
+
+		/*
+		 * We need to close all received descriptors, even if we have
+		 * different control message (eg. SCM_CREDS) in between.
+		 */
+		for (cmsg = CMSG_FIRSTHDR(&msg); cmsg != NULL;
+		    cmsg = CMSG_NXTHDR(&msg, cmsg)) {
+			fd = msghdr_get_fd(cmsg);
+			if (fd >= 0)
+				close(fd);
+		}
+		errno = EINVAL;
+		goto end;
+	}
+
+	ret = 0;
+end:
+	serrno = errno;
+	free(msg.msg_control);
+	errno = serrno;
+	return (ret);
+}
+
+int
+buf_send(int sock, void *buf, size_t size)
+{
+	ssize_t done;
+	unsigned char *ptr;
+
+	ptr = buf;
+	do {
+		fd_wait(sock, false);
+		done = send(sock, ptr, size, 0);
+		if (done == -1) {
+			if (errno == EINTR)
+				continue;
+			return (-1);
+		} else if (done == 0) {
+			errno = ENOTCONN;
+			return (-1);
+		}
+		size -= done;
+		ptr += done;
+	} while (size > 0);
+
+	return (0);
+}
+
+int
+buf_recv(int sock, void *buf, size_t size)
+{
+	ssize_t done;
+	unsigned char *ptr;
+
+	ptr = buf;
+	do {
+		fd_wait(sock, true);
+		done = recv(sock, ptr, size, 0);
+		if (done == -1) {
+			if (errno == EINTR)
+				continue;
+			return (-1);
+		} else if (done == 0) {
+			errno = ENOTCONN;
+			return (-1);
+		}
+		size -= done;
+		ptr += done;
+	} while (size > 0);
+
+	return (0);
+}
diff --git a/lib/libnv/msgio.h b/lib/libnv/msgio.h
new file mode 100644
index 00000000000..c6de92de10d
--- /dev/null
+++ b/lib/libnv/msgio.h
@@ -0,0 +1,52 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek under sponsorship from
+ * the FreeBSD Foundation.
+ *
+ * Copyright (c) 2013 Mariusz Zaborski <oshogbo@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 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$
+ */
+
+#ifndef	_MSGIO_H_
+#define	_MSGIO_H_
+
+struct cmsgcred;
+struct iovec;
+struct msghdr;
+
+int msg_peek(int sock, void *buf, size_t size);
+
+int cred_send(int sock);
+int cred_recv(int sock, struct cmsgcred *cred);
+
+int fd_send(int sock, const int *fds, size_t nfds);
+int fd_recv(int sock, int *fds, size_t nfds);
+
+int buf_send(int sock, void *buf, size_t size);
+int buf_recv(int sock, void *buf, size_t size);
+
+#endif	/* !_MSGIO_H_ */
diff --git a/lib/libnv/nv.3 b/lib/libnv/nv.3
new file mode 100644
index 00000000000..0da2af7054a
--- /dev/null
+++ b/lib/libnv/nv.3
@@ -0,0 +1,604 @@
+.\"
+.\" Copyright (c) 2013 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written by Pawel Jakub Dawidek under sponsorship
+.\" 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$
+.\"
+.Dd October 8, 2013
+.Dt NV 3
+.Os
+.Sh NAME
+.Nm nvlist_create ,
+.Nm nvlist_destroy ,
+.Nm nvlist_error ,
+.Nm nvlist_empty ,
+.Nm nvlist_exists ,
+.Nm nvlist_free ,
+.Nm nvlist_clone ,
+.Nm nvlist_dump ,
+.Nm nvlist_fdump ,
+.Nm nvlist_size ,
+.Nm nvlist_pack ,
+.Nm nvlist_unpack ,
+.Nm nvlist_send ,
+.Nm nvlist_recv ,
+.Nm nvlist_xfer ,
+.Nm nvlist_next ,
+.Nm nvlist_add ,
+.Nm nvlist_move ,
+.Nm nvlist_get ,
+.Nm nvlist_take
+.Nd "library for name/value pairs"
+.Sh LIBRARY
+.Lb libnv
+.Sh SYNOPSIS
+.In nv.h
+.Ft "nvlist_t *"
+.Fn nvlist_create "int flags"
+.Ft void
+.Fn nvlist_destroy "nvlist_t *nvl"
+.Ft int
+.Fn nvlist_error "const nvlist_t *nvl"
+.Ft bool
+.Fn nvlist_empty "const nvlist_t *nvl"
+.\"
+.Ft "nvlist_t *"
+.Fn nvlist_clone "const nvlist_t *nvl"
+.\"
+.Ft void
+.Fn nvlist_dump "const nvlist_t *nvl, int fd"
+.Ft void
+.Fn nvlist_fdump "const nvlist_t *nvl, FILE *fp"
+.\"
+.Ft size_t
+.Fn nvlist_size "const nvlist_t *nvl"
+.Ft "void *"
+.Fn nvlist_pack "const nvlist_t *nvl" "size_t *sizep"
+.Ft "nvlist_t *"
+.Fn nvlist_unpack "const void *buf" "size_t size"
+.\"
+.Ft int
+.Fn nvlist_send "int sock" "const nvlist_t *nvl"
+.Ft "nvlist_t *"
+.Fn nvlist_recv "int sock"
+.Ft "nvlist_t *"
+.Fn nvlist_xfer "int sock" "nvlist_t *nvl"
+.\"
+.Ft "const char *"
+.Fn nvlist_next "const nvlist_t *nvl" "int *typep" "void **cookiep"
+.\"
+.Ft bool
+.Fn nvlist_exists "const nvlist_t *nvl" "const char *name"
+.Ft bool
+.Fn nvlist_exists_type "const nvlist_t *nvl" "const char *name" "int type"
+.Ft bool
+.Fn nvlist_exists_null "const nvlist_t *nvl" "const char *name"
+.Ft bool
+.Fn nvlist_exists_bool "const nvlist_t *nvl" "const char *name"
+.Ft bool
+.Fn nvlist_exists_number "const nvlist_t *nvl" "const char *name"
+.Ft bool
+.Fn nvlist_exists_string "const nvlist_t *nvl" "const char *name"
+.Ft bool
+.Fn nvlist_exists_nvlist "const nvlist_t *nvl" "const char *name"
+.Ft bool
+.Fn nvlist_exists_descriptor "const nvlist_t *nvl" "const char *name"
+.Ft bool
+.Fn nvlist_exists_binary "const nvlist_t *nvl" "const char *name"
+.\"
+.Ft void
+.Fn nvlist_add_null "nvlist_t *nvl" "const char *name"
+.Ft void
+.Fn nvlist_add_bool "nvlist_t *nvl" "const char *name" "bool value"
+.Ft void
+.Fn nvlist_add_number "nvlist_t *nvl" "const char *name" "uint64_t value"
+.Ft void
+.Fn nvlist_add_string "nvlist_t *nvl" "const char *name" "const char *value"
+.Ft void
+.Fn nvlist_add_stringf "nvlist_t *nvl" "const char *name" "const char *valuefmt" "..."
+.Ft void
+.Fn nvlist_add_stringv "nvlist_t *nvl" "const char *name" "const char *valuefmt" "va_list valueap"
+.Ft void
+.Fn nvlist_add_nvlist "nvlist_t *nvl" "const char *name" "const nvlist_t *value"
+.Ft void
+.Fn nvlist_add_descriptor "nvlist_t *nvl" "const char *name" "int value"
+.Ft void
+.Fn nvlist_add_binary "nvlist_t *nvl" "const char *name" "const void *value" "size_t size"
+.\"
+.Ft void
+.Fn nvlist_move_string "nvlist_t *nvl" "const char *name" "char *value"
+.Ft void
+.Fn nvlist_move_nvlist "nvlist_t *nvl" "const char *name" "nvlist_t *value"
+.Ft void
+.Fn nvlist_move_descriptor "nvlist_t *nvl" "const char *name" "int value"
+.Ft void
+.Fn nvlist_move_binary "nvlist_t *nvl" "const char *name" "void *value" "size_t size"
+.\"
+.Ft bool
+.Fn nvlist_get_bool "const nvlist_t *nvl" "const char *name"
+.Ft uint64_t
+.Fn nvlist_get_number "const nvlist_t *nvl" "const char *name"
+.Ft "const char *"
+.Fn nvlist_get_string "const nvlist_t *nvl" "const char *name"
+.Ft "const nvlist_t *"
+.Fn nvlist_get_nvlist "const nvlist_t *nvl" "const char *name"
+.Ft int
+.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 bool
+.Fn nvlist_take_bool "nvlist_t *nvl" "const char *name"
+.Ft uint64_t
+.Fn nvlist_take_number "nvlist_t *nvl" "const char *name"
+.Ft "char *"
+.Fn nvlist_take_string "nvlist_t *nvl" "const char *name"
+.Ft "nvlist_t *"
+.Fn nvlist_take_nvlist "nvlist_t *nvl" "const char *name"
+.Ft int
+.Fn nvlist_take_descriptor "nvlist_t *nvl" "const char *name"
+.Ft "void *"
+.Fn nvlist_take_binary "nvlist_t *nvl" "const char *name" "size_t *sizep"
+.\"
+.Ft void
+.Fn nvlist_free "nvlist_t *nvl" "const char *name"
+.Ft void
+.Fn nvlist_free_type "nvlist_t *nvl" "const char *name" "int type"
+.\"
+.Ft void
+.Fn nvlist_free_null "nvlist_t *nvl" "const char *name"
+.Ft void
+.Fn nvlist_free_bool "nvlist_t *nvl" "const char *name"
+.Ft void
+.Fn nvlist_free_number "nvlist_t *nvl" "const char *name"
+.Ft void
+.Fn nvlist_free_string "nvlist_t *nvl" "const char *name"
+.Ft void
+.Fn nvlist_free_nvlist "nvlist_t *nvl" "const char *name"
+.Ft void
+.Fn nvlist_free_descriptor "nvlist_t *nvl" "const char *name"
+.Ft void
+.Fn nvlist_free_binary "nvlist_t *nvl" "const char *name"
+.Sh DESCRIPTION
+The
+.Nm libnv
+library allows to easily manage name value pairs as well as send and receive
+them over sockets.
+A group (list) of name value pairs is called an
+.Nm nvlist .
+The API supports the following data types:
+.Bl -ohang -offset indent
+.It Sy null ( NV_TYPE_NULL )
+There is no data associated with the name.
+.It Sy bool ( NV_TYPE_BOLL )
+The value can be either
+.Dv true
+or
+.Dv false .
+.It Sy number ( NV_TYPE_NUMBER )
+The value is a number stored as
+.Vt uint64_t .
+.It Sy string ( NV_TYPE_STRING )
+The value is a C string.
+.It Sy nvlist ( NV_TYPE_NVLIST )
+The value is a nested nvlist.
+.It Sy descriptor ( NV_TYPE_DESCRIPTOR )
+The value is a file descriptor.
+Note that file descriptors can be sent only over
+.Xr unix 4
+domain sockets.
+.It Sy binary ( NV_TYPE_BINARY )
+The value is a binary buffer.
+.El
+.Pp
+The
+.Fn nvlist_create
+function allocates memory and initializes an nvlist.
+.Pp
+The following flag can be provided:
+.Pp
+.Bl -tag -width "NV_FLAG_IGNORE_CASE" -compact -offset indent
+.It Dv NV_FLAG_IGNORE_CASE
+Perform case-insensitive lookups of provided names.
+.El
+.Pp
+The
+.Fn nvlist_destroy
+function destroys the given nvlist.
+Function does nothing if
+.Dv NULL
+nvlist is provided.
+Function never modifies the
+.Va errno
+global variable.
+.Pp
+The
+.Fn nvlist_error
+function returns any error value that the nvlist accumulated.
+If the given nvlist is
+.Dv NULL
+the
+.Er ENOMEM
+error will be returned.
+.Pp
+The
+.Fn nvlist_empty
+functions returns
+.Dv true
+if the given nvlist is empty and
+.Dv false
+otherwise.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_clone
+functions clones the given nvlist.
+The clone shares no resources with its origin.
+This also means that all file descriptors that are part of the nvlist will be
+duplicated with the
+.Xr dup 2
+system call before placing them in the clone.
+.Pp
+The
+.Fn nvlist_dump
+dumps nvlist content for debugging purposes to the given file descriptor
+.Fa fd .
+.Pp
+The
+.Fn nvlist_fdump
+dumps nvlist content for debugging purposes to the given file stream
+.Fa fp .
+.Pp
+The
+.Fn nvlist_size
+function returns the size of the given nvlist after converting it to binary
+buffer with the
+.Fn nvlist_pack
+function.
+.Pp
+The
+.Fn nvlist_pack
+function converts the given nvlist to a binary buffer.
+The function allocates memory for the buffer, which should be freed with the
+.Xr free 3
+function.
+If the
+.Fa sizep
+argument is not
+.Dv NULL ,
+the size of the buffer will be stored there.
+The function returns
+.Dv NULL
+in case of an error (allocation failure).
+If the nvlist contains any file descriptors
+.Dv NULL
+will be returned.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_unpack
+function converts the given buffer to the nvlist.
+The function returns
+.Dv NULL
+in case of an error.
+.Pp
+The
+.Fn nvlist_send
+function sends the given nvlist over the socket given by the
+.Fa sock
+argument.
+Note that nvlist that contains file descriptors can only be send over
+.Xr unix 4
+domain sockets.
+.Pp
+The
+.Fn nvlist_recv
+function receives nvlist over the socket given by the
+.Fa sock
+argument.
+.Pp
+The
+.Fn nvlist_xfer
+function sends the given nvlist over the socket given by the
+.Fa sock
+argument and receives nvlist over the same socket.
+The given nvlist is always destroyed.
+.Pp
+The
+.Fn nvlist_next
+function iterates over the given nvlist returning names and types of subsequent
+elements.
+The
+.Fa cookiep
+argument allows the function to figure out which element should be returned
+next.
+The
+.Va *cookiep
+should be set to
+.Dv NULL
+for the first call and should not be changed later.
+Returning
+.Dv NULL
+means there are no more elements on the nvlist.
+The
+.Fa typep
+argument can be NULL.
+Elements may not be removed from the nvlist while traversing it.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_exists
+function returns
+.Dv true
+if element of the given name exists (besides of its type) or
+.Dv false
+otherwise.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_exists_type
+function returns
+.Dv true
+if element of the given name and the given type exists or
+.Dv false
+otherwise.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_exists_null ,
+.Fn nvlist_exists_bool ,
+.Fn nvlist_exists_number ,
+.Fn nvlist_exists_string ,
+.Fn nvlist_exists_nvlist ,
+.Fn nvlist_exists_descriptor ,
+.Fn nvlist_exists_binary
+functions return
+.Dv true
+if element of the given name and the given type determined by the function name
+exists or
+.Dv false
+otherwise.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_add_null ,
+.Fn nvlist_add_bool ,
+.Fn nvlist_add_number ,
+.Fn nvlist_add_string ,
+.Fn nvlist_add_stringf ,
+.Fn nvlist_add_stringv ,
+.Fn nvlist_add_nvlist ,
+.Fn nvlist_add_descriptor ,
+.Fn nvlist_add_binary
+functions add element to the given nvlist.
+When adding string or binary buffor the functions will allocate memory
+and copy the data over.
+When adding nvlist, the nvlist will be cloned and clone will be added.
+When adding descriptor, the descriptor will be duplicated using the
+.Xr dup 2
+system call and the new descriptor will be added.
+If an error occurs while adding new element, internal error is set which can be
+examined using the
+.Fn nvlist_error
+function.
+.Pp
+The
+.Fn nvlist_move_string ,
+.Fn nvlist_move_nvlist ,
+.Fn nvlist_move_descriptor ,
+.Fn nvlist_move_binary
+functions add new element to the given nvlist, but unlike
+.Fn nvlist_add_<type>
+functions they will consume the given resource.
+If an error occurs while adding new element, the resource is destroyed and
+internal error is set which can be examined using the
+.Fn nvlist_error
+function.
+.Pp
+The
+.Fn nvlist_get_bool ,
+.Fn nvlist_get_number ,
+.Fn nvlist_get_string ,
+.Fn nvlist_get_nvlist ,
+.Fn nvlist_get_descriptor ,
+.Fn nvlist_get_binary
+functions allow to obtain value of the given name.
+In case of string, nvlist, descriptor or binary, returned resource should
+not be modified - it still belongs to the nvlist.
+If element of the given name does not exist, the program will be aborted.
+To avoid that the caller should check for existence before trying to obtain
+the value or use
+.Xr dnvlist 3
+extension, which allows to provide default value for a missing element.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_take_bool ,
+.Fn nvlist_take_number ,
+.Fn nvlist_take_string ,
+.Fn nvlist_take_nvlist ,
+.Fn nvlist_take_descriptor ,
+.Fn nvlist_take_binary
+functions return value associated with the given name and remove the element
+from the nvlist.
+In case of string and binary values, the caller is responsible for free returned
+memory using the
+.Xr free 3
+function.
+In case of nvlist, the caller is responsible for destroying returned nvlist
+using the
+.Fn nvlist_destroy
+function.
+In case of descriptor, the caller is responsible for closing returned descriptor
+using the
+.Fn close 2
+system call.
+If element of the given name does not exist, the program will be aborted.
+To avoid that the caller should check for existence before trying to obtain
+the value or use
+.Xr dnvlist 3
+extension, which allows to provide default value for a missing element.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_free
+function removes element of the given name from the nvlist (besides of its type)
+and frees all resources associated with it.
+If element of the given name does not exist, the program will be aborted.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_free_type
+function removes element of the given name and the given type from the nvlist
+and frees all resources associated with it.
+If element of the given name and the given type does not exist, the program
+will be aborted.
+The nvlist must not be in error state.
+.Pp
+The
+.Fn nvlist_free_null ,
+.Fn nvlist_free_bool ,
+.Fn nvlist_free_number ,
+.Fn nvlist_free_string ,
+.Fn nvlist_free_nvlist ,
+.Fn nvlist_free_descriptor ,
+.Fn nvlist_free_binary
+functions remove element of the given name and the given type determined by the
+function name from the nvlist and free all resources associated with it.
+If element of the given name and the given type does not exist, the program
+will be aborted.
+The nvlist must not be in error state.
+.Sh EXAMPLES
+The following example demonstrates how to prepare an nvlist and send it over
+.Xr unix 4
+domain socket.
+.Bd -literal
+nvlist_t *nvl;
+int fd;
+
+fd = open("/tmp/foo", O_RDONLY);
+if (fd < 0)
+        err(1, "open(\\"/tmp/foo\\") failed");
+
+nvl = nvlist_create(0);
+/*
+ * There is no need to check if nvlist_create() succeeded,
+ * as the nvlist_add_<type>() functions can cope.
+ * If it failed, nvlist_send() will fail.
+ */
+nvlist_add_string(nvl, "filename", "/tmp/foo");
+nvlist_add_number(nvl, "flags", O_RDONLY);
+/*
+ * We just want to send the descriptor, so we can give it
+ * for the nvlist to consume (that's why we use nvlist_move
+ * not nvlist_add).
+ */
+nvlist_move_descriptor(nvl, "fd", fd);
+if (nvlist_send(sock, nvl) < 0) {
+	nvlist_destroy(nvl);
+	err(1, "nvlist_send() failed");
+}
+nvlist_destroy(nvl);
+.Ed
+.Pp
+Receiving nvlist and getting data:
+.Bd -literal
+nvlist_t *nvl;
+const char *command;
+char *filename;
+int fd;
+
+nvl = nvlist_recv(sock);
+if (nvl == NULL)
+	err(1, "nvlist_recv() failed");
+
+/* For command we take pointer to nvlist's buffer. */
+command = nvlist_get_string(nvl, "command");
+/*
+ * For filename we remove it from the nvlist and take
+ * ownership of the buffer.
+ */
+filename = nvlist_take_string(nvl, "filename");
+/* The same for the descriptor. */
+fd = nvlist_take_descriptor(nvl, "fd");
+
+printf("command=%s filename=%s fd=%d\n", command, filename, fd);
+
+nvlist_destroy(nvl);
+free(filename);
+close(fd);
+/* command was freed by nvlist_destroy() */
+.Ed
+.Pp
+Iterating over nvlist:
+.Bd -literal
+nvlist_t *nvl;
+const char *name;
+void *cookie;
+int type;
+
+nvl = nvlist_recv(sock);
+if (nvl == NULL)
+	err(1, "nvlist_recv() failed");
+
+cookie = NULL;
+while ((name = nvlist_next(nvl, &type, &cookie)) != NULL) {
+	printf("%s=", name);
+	switch (type) {
+	case NV_TYPE_NUMBER:
+		printf("%ju", (uintmax_t)nvlist_get_number(nvl, name));
+		break;
+	case NV_TYPE_STRING:
+		printf("%s", nvlist_get_string(nvl, name));
+		break;
+	default:
+		printf("N/A");
+		break;
+	}
+	printf("\\n");
+}
+.Ed
+.Sh SEE ALSO
+.Xr close 2 ,
+.Xr dup 2 ,
+.Xr open 2 ,
+.Xr err 3 ,
+.Xr free 3 ,
+.Xr printf 3 ,
+.Xr unix 4
+.Sh HISTORY
+The
+.Nm libnv
+library appeared in
+.Fx 10.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm libnv
+library was implemented by
+.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+under sponsorship from the FreeBSD Foundation.
diff --git a/lib/libnv/nv.h b/lib/libnv/nv.h
new file mode 100644
index 00000000000..e2d7030f665
--- /dev/null
+++ b/lib/libnv/nv.h
@@ -0,0 +1,273 @@
+/*-
+ * Copyright (c) 2009-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_NV_H_
+#define	_NV_H_
+
+#include <sys/cdefs.h>
+
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#ifndef	_NVLIST_T_DECLARED
+#define	_NVLIST_T_DECLARED
+struct nvlist;
+
+typedef struct nvlist nvlist_t;
+#endif
+
+#define	NV_NAME_MAX	2048
+
+#define	NV_TYPE_NONE			0
+
+#define	NV_TYPE_NULL			1
+#define	NV_TYPE_BOOL			2
+#define	NV_TYPE_NUMBER			3
+#define	NV_TYPE_STRING			4
+#define	NV_TYPE_NVLIST			5
+#define	NV_TYPE_DESCRIPTOR		6
+#define	NV_TYPE_BINARY			7
+
+/*
+ * Perform case-insensitive lookups of provided names.
+ */
+#define	NV_FLAG_IGNORE_CASE		0x01
+
+nvlist_t	*nvlist_create(int flags);
+void		 nvlist_destroy(nvlist_t *nvl);
+int		 nvlist_error(const nvlist_t *nvl);
+bool		 nvlist_empty(const nvlist_t *nvl);
+
+nvlist_t *nvlist_clone(const nvlist_t *nvl);
+
+void nvlist_dump(const nvlist_t *nvl, int fd);
+void nvlist_fdump(const nvlist_t *nvl, FILE *fp);
+
+size_t		 nvlist_size(const nvlist_t *nvl);
+void		*nvlist_pack(const nvlist_t *nvl, size_t *sizep);
+nvlist_t	*nvlist_unpack(const void *buf, size_t size);
+
+int nvlist_send(int sock, const nvlist_t *nvl);
+nvlist_t *nvlist_recv(int sock);
+nvlist_t *nvlist_xfer(int sock, nvlist_t *nvl);
+
+const char *nvlist_next(const nvlist_t *nvl, int *typep, void **cookiep);
+
+/*
+ * The nvlist_exists functions check if the given name (optionally of the given
+ * type) exists on nvlist.
+ */
+
+bool nvlist_exists(const nvlist_t *nvl, const char *name);
+bool nvlist_exists_type(const nvlist_t *nvl, const char *name, int type);
+
+bool nvlist_exists_null(const nvlist_t *nvl, const char *name);
+bool nvlist_exists_bool(const nvlist_t *nvl, const char *name);
+bool nvlist_exists_number(const nvlist_t *nvl, const char *name);
+bool nvlist_exists_string(const nvlist_t *nvl, const char *name);
+bool nvlist_exists_nvlist(const nvlist_t *nvl, const char *name);
+bool nvlist_exists_descriptor(const nvlist_t *nvl, const char *name);
+bool nvlist_exists_binary(const nvlist_t *nvl, const char *name);
+
+/*
+ * The nvlist_add functions add the given name/value pair.
+ * If a pointer is provided, nvlist_add will internally allocate memory for the
+ * given data (in other words it won't consume provided buffer).
+ */
+
+void nvlist_add_null(nvlist_t *nvl, const char *name);
+void nvlist_add_bool(nvlist_t *nvl, const char *name, bool value);
+void nvlist_add_number(nvlist_t *nvl, const char *name, uint64_t value);
+void nvlist_add_string(nvlist_t *nvl, const char *name, const char *value);
+void nvlist_add_stringf(nvlist_t *nvl, const char *name, const char *valuefmt, ...) __printflike(3, 4);
+void nvlist_add_stringv(nvlist_t *nvl, const char *name, const char *valuefmt, va_list valueap) __printflike(3, 0);
+void nvlist_add_nvlist(nvlist_t *nvl, const char *name, const nvlist_t *value);
+void nvlist_add_descriptor(nvlist_t *nvl, const char *name, int value);
+void nvlist_add_binary(nvlist_t *nvl, const char *name, const void *value, size_t size);
+
+/*
+ * The nvlist_move functions add the given name/value pair.
+ * The functions consumes provided buffer.
+ */
+
+void nvlist_move_string(nvlist_t *nvl, const char *name, char *value);
+void nvlist_move_nvlist(nvlist_t *nvl, const char *name, nvlist_t *value);
+void nvlist_move_descriptor(nvlist_t *nvl, const char *name, int value);
+void nvlist_move_binary(nvlist_t *nvl, const char *name, void *value, size_t size);
+
+/*
+ * The nvlist_get functions returns value associated with the given name.
+ * If it returns a pointer, the pointer represents internal buffer and should
+ * not be freed by the caller.
+ */
+
+bool		 nvlist_get_bool(const nvlist_t *nvl, const char *name);
+uint64_t	 nvlist_get_number(const nvlist_t *nvl, const char *name);
+const char	*nvlist_get_string(const nvlist_t *nvl, const char *name);
+const nvlist_t	*nvlist_get_nvlist(const nvlist_t *nvl, const char *name);
+int		 nvlist_get_descriptor(const nvlist_t *nvl, const char *name);
+const void	*nvlist_get_binary(const nvlist_t *nvl, const char *name, size_t *sizep);
+
+/*
+ * The nvlist_take functions returns value associated with the given name and
+ * remove the given entry from the nvlist.
+ * The caller is responsible for freeing received data.
+ */
+
+bool		 nvlist_take_bool(nvlist_t *nvl, const char *name);
+uint64_t	 nvlist_take_number(nvlist_t *nvl, const char *name);
+char		*nvlist_take_string(nvlist_t *nvl, const char *name);
+nvlist_t	*nvlist_take_nvlist(nvlist_t *nvl, const char *name);
+int		 nvlist_take_descriptor(nvlist_t *nvl, const char *name);
+void		*nvlist_take_binary(nvlist_t *nvl, const char *name, size_t *sizep);
+
+/*
+ * The nvlist_free functions removes the given name/value pair from the nvlist
+ * and frees memory associated with it.
+ */
+
+void nvlist_free(nvlist_t *nvl, const char *name);
+void nvlist_free_type(nvlist_t *nvl, const char *name, int type);
+
+void nvlist_free_null(nvlist_t *nvl, const char *name);
+void nvlist_free_bool(nvlist_t *nvl, const char *name);
+void nvlist_free_number(nvlist_t *nvl, const char *name);
+void nvlist_free_string(nvlist_t *nvl, const char *name);
+void nvlist_free_nvlist(nvlist_t *nvl, const char *name);
+void nvlist_free_descriptor(nvlist_t *nvl, const char *name);
+void nvlist_free_binary(nvlist_t *nvl, const char *name);
+
+/*
+ * Below are the same functions, but which operate on format strings and
+ * variable argument lists.
+ */
+
+bool nvlist_existsf(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+bool nvlist_existsf_type(const nvlist_t *nvl, int type, const char *namefmt, ...) __printflike(3, 4);
+
+bool nvlist_existsf_null(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+bool nvlist_existsf_bool(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+bool nvlist_existsf_number(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+bool nvlist_existsf_string(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+bool nvlist_existsf_nvlist(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+bool nvlist_existsf_descriptor(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+bool nvlist_existsf_binary(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+
+bool nvlist_existsv(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+bool nvlist_existsv_type(const nvlist_t *nvl, int type, const char *namefmt, va_list nameap) __printflike(3, 0);
+
+bool nvlist_existsv_null(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+bool nvlist_existsv_bool(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+bool nvlist_existsv_number(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+bool nvlist_existsv_string(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+bool nvlist_existsv_nvlist(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+bool nvlist_existsv_descriptor(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+bool nvlist_existsv_binary(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+
+void nvlist_addf_null(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+void nvlist_addf_bool(nvlist_t *nvl, bool value, const char *namefmt, ...) __printflike(3, 4);
+void nvlist_addf_number(nvlist_t *nvl, uint64_t value, const char *namefmt, ...) __printflike(3, 4);
+void nvlist_addf_string(nvlist_t *nvl, const char *value, const char *namefmt, ...) __printflike(3, 4);
+void nvlist_addf_nvlist(nvlist_t *nvl, const nvlist_t *value, const char *namefmt, ...) __printflike(3, 4);
+void nvlist_addf_descriptor(nvlist_t *nvl, int value, const char *namefmt, ...) __printflike(3, 4);
+void nvlist_addf_binary(nvlist_t *nvl, const void *value, size_t size, const char *namefmt, ...) __printflike(4, 5);
+
+void nvlist_addv_null(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+void nvlist_addv_bool(nvlist_t *nvl, bool value, const char *namefmt, va_list nameap) __printflike(3, 0);
+void nvlist_addv_number(nvlist_t *nvl, uint64_t value, const char *namefmt, va_list nameap) __printflike(3, 0);
+void nvlist_addv_string(nvlist_t *nvl, const char *value, const char *namefmt, va_list nameap) __printflike(3, 0);
+void nvlist_addv_nvlist(nvlist_t *nvl, const nvlist_t *value, const char *namefmt, va_list nameap) __printflike(3, 0);
+void nvlist_addv_descriptor(nvlist_t *nvl, int value, const char *namefmt, va_list nameap) __printflike(3, 0);
+void nvlist_addv_binary(nvlist_t *nvl, const void *value, size_t size, const char *namefmt, va_list nameap) __printflike(4, 0);
+
+void nvlist_movef_string(nvlist_t *nvl, char *value, const char *namefmt, ...) __printflike(3, 4);
+void nvlist_movef_nvlist(nvlist_t *nvl, nvlist_t *value, const char *namefmt, ...) __printflike(3, 4);
+void nvlist_movef_descriptor(nvlist_t *nvl, int value, const char *namefmt, ...) __printflike(3, 4);
+void nvlist_movef_binary(nvlist_t *nvl, void *value, size_t size, const char *namefmt, ...) __printflike(4, 5);
+
+void nvlist_movev_string(nvlist_t *nvl, char *value, const char *namefmt, va_list nameap) __printflike(3, 0);
+void nvlist_movev_nvlist(nvlist_t *nvl, nvlist_t *value, const char *namefmt, va_list nameap) __printflike(3, 0);
+void nvlist_movev_descriptor(nvlist_t *nvl, int value, const char *namefmt, va_list nameap) __printflike(3, 0);
+void nvlist_movev_binary(nvlist_t *nvl, void *value, size_t size, const char *namefmt, va_list nameap) __printflike(4, 0);
+
+bool		 nvlist_getf_bool(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+uint64_t	 nvlist_getf_number(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+const char	*nvlist_getf_string(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+const nvlist_t	*nvlist_getf_nvlist(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+int		 nvlist_getf_descriptor(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+const void	*nvlist_getf_binary(const nvlist_t *nvl, size_t *sizep, const char *namefmt, ...) __printflike(3, 4);
+
+bool		 nvlist_getv_bool(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+uint64_t	 nvlist_getv_number(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+const char	*nvlist_getv_string(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+const nvlist_t	*nvlist_getv_nvlist(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+int		 nvlist_getv_descriptor(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+const void	*nvlist_getv_binary(const nvlist_t *nvl, size_t *sizep, const char *namefmt, va_list nameap) __printflike(3, 0);
+
+bool		 nvlist_takef_bool(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+uint64_t	 nvlist_takef_number(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+char		*nvlist_takef_string(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+nvlist_t	*nvlist_takef_nvlist(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+int		 nvlist_takef_descriptor(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+void		*nvlist_takef_binary(nvlist_t *nvl, size_t *sizep, const char *namefmt, ...) __printflike(3, 4);
+
+bool		 nvlist_takev_bool(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+uint64_t	 nvlist_takev_number(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+char		*nvlist_takev_string(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+nvlist_t	*nvlist_takev_nvlist(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+int		 nvlist_takev_descriptor(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+void		*nvlist_takev_binary(nvlist_t *nvl, size_t *sizep, const char *namefmt, va_list nameap) __printflike(3, 0);
+
+void nvlist_freef(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+void nvlist_freef_type(nvlist_t *nvl, int type, const char *namefmt, ...) __printflike(3, 4);
+
+void nvlist_freef_null(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+void nvlist_freef_bool(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+void nvlist_freef_number(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+void nvlist_freef_string(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+void nvlist_freef_nvlist(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+void nvlist_freef_descriptor(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+void nvlist_freef_binary(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+
+void nvlist_freev(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+void nvlist_freev_type(nvlist_t *nvl, int type, const char *namefmt, va_list nameap) __printflike(3, 0);
+
+void nvlist_freev_null(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+void nvlist_freev_bool(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+void nvlist_freev_number(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+void nvlist_freev_string(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+void nvlist_freev_nvlist(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+void nvlist_freev_descriptor(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+void nvlist_freev_binary(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+
+#endif	/* !_NV_H_ */
diff --git a/lib/libnv/nv_impl.h b/lib/libnv/nv_impl.h
new file mode 100644
index 00000000000..32060061f41
--- /dev/null
+++ b/lib/libnv/nv_impl.h
@@ -0,0 +1,130 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_NV_IMPL_H_
+#define	_NV_IMPL_H_
+
+#ifndef	_NVPAIR_T_DECLARED
+#define	_NVPAIR_T_DECLARED
+struct nvpair;
+
+typedef struct nvpair nvpair_t;
+#endif
+
+#define	NV_TYPE_FIRST		NV_TYPE_NULL
+#define	NV_TYPE_LAST		NV_TYPE_BINARY
+
+#define	NV_FLAG_BIG_ENDIAN		0x80
+
+int	*nvlist_descriptors(const nvlist_t *nvl, size_t *nitemsp);
+size_t	 nvlist_ndescriptors(const nvlist_t *nvl);
+
+nvpair_t *nvlist_first_nvpair(const nvlist_t *nvl);
+nvpair_t *nvlist_next_nvpair(const nvlist_t *nvl, const nvpair_t *nvp);
+nvpair_t *nvlist_prev_nvpair(const nvlist_t *nvl, const nvpair_t *nvp);
+
+void nvlist_add_nvpair(nvlist_t *nvl, const nvpair_t *nvp);
+
+void nvlist_move_nvpair(nvlist_t *nvl, nvpair_t *nvp);
+
+const nvpair_t *nvlist_get_nvpair(const nvlist_t *nvl, const char *name);
+
+nvpair_t *nvlist_take_nvpair(nvlist_t *nvl, const char *name);
+
+/* Function removes the given nvpair from the nvlist. */
+void nvlist_remove_nvpair(nvlist_t *nvl, nvpair_t *nvp);
+
+void nvlist_free_nvpair(nvlist_t *nvl, nvpair_t *nvp);
+
+int nvpair_type(const nvpair_t *nvp);
+const char *nvpair_name(const nvpair_t *nvp);
+
+nvpair_t *nvpair_clone(const nvpair_t *nvp);
+
+nvpair_t *nvpair_create_null(const char *name);
+nvpair_t *nvpair_create_bool(const char *name, bool value);
+nvpair_t *nvpair_create_number(const char *name, uint64_t value);
+nvpair_t *nvpair_create_string(const char *name, const char *value);
+nvpair_t *nvpair_create_stringf(const char *name, const char *valuefmt, ...) __printflike(2, 3);
+nvpair_t *nvpair_create_stringv(const char *name, const char *valuefmt, va_list valueap) __printflike(2, 0);
+nvpair_t *nvpair_create_nvlist(const char *name, const nvlist_t *value);
+nvpair_t *nvpair_create_descriptor(const char *name, int value);
+nvpair_t *nvpair_create_binary(const char *name, const void *value, size_t size);
+
+nvpair_t *nvpair_move_string(const char *name, char *value);
+nvpair_t *nvpair_move_nvlist(const char *name, nvlist_t *value);
+nvpair_t *nvpair_move_descriptor(const char *name, int value);
+nvpair_t *nvpair_move_binary(const char *name, void *value, size_t size);
+
+bool		 nvpair_get_bool(const nvpair_t *nvp);
+uint64_t	 nvpair_get_number(const nvpair_t *nvp);
+const char	*nvpair_get_string(const nvpair_t *nvp);
+const nvlist_t	*nvpair_get_nvlist(const nvpair_t *nvp);
+int		 nvpair_get_descriptor(const nvpair_t *nvp);
+const void	*nvpair_get_binary(const nvpair_t *nvp, size_t *sizep);
+
+void nvpair_free(nvpair_t *nvp);
+
+const nvpair_t *nvlist_getf_nvpair(const nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+
+const nvpair_t *nvlist_getv_nvpair(const nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+
+nvpair_t *nvlist_takef_nvpair(nvlist_t *nvl, const char *namefmt, ...) __printflike(2, 3);
+
+nvpair_t *nvlist_takev_nvpair(nvlist_t *nvl, const char *namefmt, va_list nameap) __printflike(2, 0);
+
+nvpair_t *nvpair_createf_null(const char *namefmt, ...) __printflike(1, 2);
+nvpair_t *nvpair_createf_bool(bool value, const char *namefmt, ...) __printflike(2, 3);
+nvpair_t *nvpair_createf_number(uint64_t value, const char *namefmt, ...) __printflike(2, 3);
+nvpair_t *nvpair_createf_string(const char *value, const char *namefmt, ...) __printflike(2, 3);
+nvpair_t *nvpair_createf_nvlist(const nvlist_t *value, const char *namefmt, ...) __printflike(2, 3);
+nvpair_t *nvpair_createf_descriptor(int value, const char *namefmt, ...) __printflike(2, 3);
+nvpair_t *nvpair_createf_binary(const void *value, size_t size, const char *namefmt, ...) __printflike(3, 4);
+
+nvpair_t *nvpair_createv_null(const char *namefmt, va_list nameap) __printflike(1, 0);
+nvpair_t *nvpair_createv_bool(bool value, const char *namefmt, va_list nameap) __printflike(2, 0);
+nvpair_t *nvpair_createv_number(uint64_t value, const char *namefmt, va_list nameap) __printflike(2, 0);
+nvpair_t *nvpair_createv_string(const char *value, const char *namefmt, va_list nameap) __printflike(2, 0);
+nvpair_t *nvpair_createv_nvlist(const nvlist_t *value, const char *namefmt, va_list nameap) __printflike(2, 0);
+nvpair_t *nvpair_createv_descriptor(int value, const char *namefmt, va_list nameap) __printflike(2, 0);
+nvpair_t *nvpair_createv_binary(const void *value, size_t size, const char *namefmt, va_list nameap) __printflike(3, 0);
+
+nvpair_t *nvpair_movef_string(char *value, const char *namefmt, ...) __printflike(2, 3);
+nvpair_t *nvpair_movef_nvlist(nvlist_t *value, const char *namefmt, ...) __printflike(2, 3);
+nvpair_t *nvpair_movef_descriptor(int value, const char *namefmt, ...) __printflike(2, 3);
+nvpair_t *nvpair_movef_binary(void *value, size_t size, const char *namefmt, ...) __printflike(3, 4);
+
+nvpair_t *nvpair_movev_string(char *value, const char *namefmt, va_list nameap) __printflike(2, 0);
+nvpair_t *nvpair_movev_nvlist(nvlist_t *value, const char *namefmt, va_list nameap) __printflike(2, 0);
+nvpair_t *nvpair_movev_descriptor(int value, const char *namefmt, va_list nameap) __printflike(2, 0);
+nvpair_t *nvpair_movev_binary(void *value, size_t size, const char *namefmt, va_list nameap) __printflike(3, 0);
+
+#endif	/* !_NV_IMPL_H_ */
diff --git a/lib/libnv/nvlist.c b/lib/libnv/nvlist.c
new file mode 100644
index 00000000000..323b2c8d630
--- /dev/null
+++ b/lib/libnv/nvlist.c
@@ -0,0 +1,1703 @@
+/*-
+ * Copyright (c) 2009-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/endian.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#define	_WITH_DPRINTF
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef HAVE_PJDLOG
+#include <pjdlog.h>
+#endif
+
+#include "msgio.h"
+#include "nv.h"
+#include "nv_impl.h"
+#include "nvlist_impl.h"
+#include "nvpair_impl.h"
+
+#ifndef	HAVE_PJDLOG
+#include <assert.h>
+#define	PJDLOG_ASSERT(...)		assert(__VA_ARGS__)
+#define	PJDLOG_RASSERT(expr, ...)	assert(expr)
+#define	PJDLOG_ABORT(...)		do {				\
+	fprintf(stderr, "%s:%u: ", __FILE__, __LINE__);			\
+	fprintf(stderr, __VA_ARGS__);					\
+	fprintf(stderr, "\n");						\
+	abort();							\
+} while (0)
+#endif
+
+#define	NV_FLAG_PRIVATE_MASK	(NV_FLAG_BIG_ENDIAN)
+#define	NV_FLAG_PUBLIC_MASK	(NV_FLAG_IGNORE_CASE)
+#define	NV_FLAG_ALL_MASK	(NV_FLAG_PRIVATE_MASK | NV_FLAG_PUBLIC_MASK)
+
+#define	NVLIST_MAGIC	0x6e766c	/* "nvl" */
+struct nvlist {
+	int		nvl_magic;
+	int		nvl_error;
+	int		nvl_flags;
+	struct nvl_head	nvl_head;
+};
+
+#define	NVLIST_ASSERT(nvl)	do {					\
+	PJDLOG_ASSERT((nvl) != NULL);					\
+	PJDLOG_ASSERT((nvl)->nvl_magic == NVLIST_MAGIC);		\
+} while (0)
+
+#define	NVPAIR_ASSERT(nvp)	nvpair_assert(nvp)
+
+#define	NVLIST_HEADER_MAGIC	0x6c
+#define	NVLIST_HEADER_VERSION	0x00
+struct nvlist_header {
+	uint8_t		nvlh_magic;
+	uint8_t		nvlh_version;
+	uint8_t		nvlh_flags;
+	uint64_t	nvlh_descriptors;
+	uint64_t	nvlh_size;
+} __packed;
+
+nvlist_t *
+nvlist_create(int flags)
+{
+	nvlist_t *nvl;
+
+	PJDLOG_ASSERT((flags & ~(NV_FLAG_PUBLIC_MASK)) == 0);
+
+	nvl = malloc(sizeof(*nvl));
+	nvl->nvl_error = 0;
+	nvl->nvl_flags = flags;
+	TAILQ_INIT(&nvl->nvl_head);
+	nvl->nvl_magic = NVLIST_MAGIC;
+
+	return (nvl);
+}
+
+void
+nvlist_destroy(nvlist_t *nvl)
+{
+	nvpair_t *nvp;
+	int serrno;
+
+	if (nvl == NULL)
+		return;
+
+	serrno = errno;
+
+	NVLIST_ASSERT(nvl);
+
+	while ((nvp = nvlist_first_nvpair(nvl)) != NULL)
+		nvlist_remove_nvpair(nvl, nvp);
+	nvl->nvl_magic = 0;
+	free(nvl);
+
+	errno = serrno;
+}
+
+int
+nvlist_error(const nvlist_t *nvl)
+{
+
+	if (nvl == NULL)
+		return (ENOMEM);
+
+	NVLIST_ASSERT(nvl);
+
+	return (nvl->nvl_error);
+}
+
+bool
+nvlist_empty(const nvlist_t *nvl)
+{
+
+	NVLIST_ASSERT(nvl);
+	PJDLOG_ASSERT(nvl->nvl_error == 0);
+
+	return (nvlist_first_nvpair(nvl) == NULL);
+}
+
+static void
+nvlist_report_missing(int type, const char *namefmt, va_list nameap)
+{
+	char *name;
+
+	vasprintf(&name, namefmt, nameap);
+	PJDLOG_ABORT("Element '%s' of type %s doesn't exist.",
+	    name != NULL ? name : "N/A", nvpair_type_string(type));
+}
+
+static nvpair_t *
+nvlist_findv(const nvlist_t *nvl, int type, const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+	char *name;
+
+	NVLIST_ASSERT(nvl);
+	PJDLOG_ASSERT(nvl->nvl_error == 0);
+	PJDLOG_ASSERT(type == NV_TYPE_NONE ||
+	    (type >= NV_TYPE_FIRST && type <= NV_TYPE_LAST));
+
+	if (vasprintf(&name, namefmt, nameap) < 0)
+		return (NULL);
+
+	for (nvp = nvlist_first_nvpair(nvl); nvp != NULL;
+	    nvp = nvlist_next_nvpair(nvl, nvp)) {
+		if (type != NV_TYPE_NONE && nvpair_type(nvp) != type)
+			continue;
+		if ((nvl->nvl_flags & NV_FLAG_IGNORE_CASE) != 0) {
+			if (strcasecmp(nvpair_name(nvp), name) != 0)
+				continue;
+		} else {
+			if (strcmp(nvpair_name(nvp), name) != 0)
+				continue;
+		}
+		break;
+	}
+
+	free(name);
+
+	if (nvp == NULL)
+		errno = ENOENT;
+
+	return (nvp);
+}
+
+bool
+nvlist_exists_type(const nvlist_t *nvl, const char *name, int type)
+{
+
+	return (nvlist_existsf_type(nvl, type, "%s", name));
+}
+
+bool
+nvlist_existsf_type(const nvlist_t *nvl, int type, const char *namefmt, ...)
+{
+	va_list nameap;
+	bool ret;
+
+	va_start(nameap, namefmt);
+	ret = nvlist_existsv_type(nvl, type, namefmt, nameap);
+	va_end(nameap);
+
+	return (ret);
+}
+
+bool
+nvlist_existsv_type(const nvlist_t *nvl, int type, const char *namefmt,
+    va_list nameap)
+{
+
+	NVLIST_ASSERT(nvl);
+	PJDLOG_ASSERT(nvl->nvl_error == 0);
+	PJDLOG_ASSERT(type == NV_TYPE_NONE ||
+	    (type >= NV_TYPE_FIRST && type <= NV_TYPE_LAST));
+
+	return (nvlist_findv(nvl, type, namefmt, nameap) != NULL);
+}
+
+void
+nvlist_free_type(nvlist_t *nvl, const char *name, int type)
+{
+
+	nvlist_freef_type(nvl, type, "%s", name);
+}
+
+void
+nvlist_freef_type(nvlist_t *nvl, int type, const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_freev_type(nvl, type, namefmt, nameap);
+	va_end(nameap);
+}
+
+void
+nvlist_freev_type(nvlist_t *nvl, int type, const char *namefmt, va_list nameap)
+{
+	va_list cnameap;
+	nvpair_t *nvp;
+
+	NVLIST_ASSERT(nvl);
+	PJDLOG_ASSERT(nvl->nvl_error == 0);
+	PJDLOG_ASSERT(type == NV_TYPE_NONE ||
+	    (type >= NV_TYPE_FIRST && type <= NV_TYPE_LAST));
+
+	va_copy(cnameap, nameap);
+	nvp = nvlist_findv(nvl, type, namefmt, cnameap);
+	va_end(cnameap);
+	if (nvp != NULL)
+		nvlist_free_nvpair(nvl, nvp);
+	else
+		nvlist_report_missing(type, namefmt, nameap);
+}
+
+nvlist_t *
+nvlist_clone(const nvlist_t *nvl)
+{
+	nvlist_t *newnvl;
+	nvpair_t *nvp, *newnvp;
+
+	NVLIST_ASSERT(nvl);
+
+	if (nvl->nvl_error != 0) {
+		errno = nvl->nvl_error;
+		return (NULL);
+	}
+
+	newnvl = nvlist_create(nvl->nvl_flags & NV_FLAG_PUBLIC_MASK);
+	for (nvp = nvlist_first_nvpair(nvl); nvp != NULL;
+	    nvp = nvlist_next_nvpair(nvl, nvp)) {
+		newnvp = nvpair_clone(nvp);
+		if (newnvp == NULL)
+			break;
+		nvlist_move_nvpair(newnvl, newnvp);
+	}
+	if (nvp != NULL) {
+		nvlist_destroy(newnvl);
+		return (NULL);
+	}
+	return (newnvl);
+}
+
+/*
+ * Dump content of nvlist.
+ */
+static void
+nvlist_xdump(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;
+	}
+
+	for (nvp = nvlist_first_nvpair(nvl); nvp != NULL;
+	    nvp = nvlist_next_nvpair(nvl, nvp)) {
+		dprintf(fd, "%*s%s (%s):", level * 4, "", nvpair_name(nvp),
+		    nvpair_type_string(nvpair_type(nvp)));
+		switch (nvpair_type(nvp)) {
+		case NV_TYPE_NULL:
+			dprintf(fd, " null\n");
+			break;
+		case NV_TYPE_BOOL:
+			dprintf(fd, " %s\n", nvpair_get_bool(nvp) ?
+			    "TRUE" : "FALSE");
+			break;
+		case NV_TYPE_NUMBER:
+			dprintf(fd, " %ju (%jd) (0x%jx)\n",
+			    (uintmax_t)nvpair_get_number(nvp),
+			    (intmax_t)nvpair_get_number(nvp),
+			    (uintmax_t)nvpair_get_number(nvp));
+			break;
+		case NV_TYPE_STRING:
+			dprintf(fd, " [%s]\n", nvpair_get_string(nvp));
+			break;
+		case NV_TYPE_NVLIST:
+			dprintf(fd, "\n");
+			nvlist_xdump(nvpair_get_nvlist(nvp), fd, level + 1);
+			break;
+		case NV_TYPE_DESCRIPTOR:
+			dprintf(fd, " %d\n", nvpair_get_descriptor(nvp));
+			break;
+		case NV_TYPE_BINARY:
+		    {
+			const unsigned char *binary;
+			unsigned int ii;
+			size_t size;
+
+			binary = nvpair_get_binary(nvp, &size);
+			dprintf(fd, " %zu ", size);
+			for (ii = 0; ii < size; ii++)
+				dprintf(fd, "%02hhx", binary[ii]);
+			dprintf(fd, "\n");
+			break;
+		    }
+		default:
+			PJDLOG_ABORT("Unknown type: %d.", nvpair_type(nvp));
+		}
+	}
+}
+
+void
+nvlist_dump(const nvlist_t *nvl, int fd)
+{
+
+	nvlist_xdump(nvl, fd, 0);
+}
+
+void
+nvlist_fdump(const nvlist_t *nvl, FILE *fp)
+{
+
+	fflush(fp);
+	nvlist_dump(nvl, fileno(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)
+{
+	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)) {
+		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
+			size += nvpair_size(nvp);
+	}
+
+	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)
+{
+	const nvpair_t *nvp;
+
+	NVLIST_ASSERT(nvl);
+	PJDLOG_ASSERT(nvl->nvl_error == 0);
+	PJDLOG_ASSERT(level < 3);
+
+	for (nvp = nvlist_first_nvpair(nvl); nvp != NULL;
+	    nvp = nvlist_next_nvpair(nvl, nvp)) {
+		switch (nvpair_type(nvp)) {
+		case NV_TYPE_DESCRIPTOR:
+			*descs = nvpair_get_descriptor(nvp);
+			descs++;
+			break;
+		case NV_TYPE_NVLIST:
+			descs = nvlist_xdescriptors(nvpair_get_nvlist(nvp),
+			    descs, level + 1);
+			break;
+		}
+	}
+
+	return (descs);
+}
+
+int *
+nvlist_descriptors(const nvlist_t *nvl, size_t *nitemsp)
+{
+	size_t nitems;
+	int *fds;
+
+	nitems = nvlist_ndescriptors(nvl);
+	fds = malloc(sizeof(fds[0]) * (nitems + 1));
+	if (fds == NULL)
+		return (NULL);
+	if (nitems > 0)
+		nvlist_xdescriptors(nvl, fds, 0);
+	fds[nitems] = -1;
+	if (nitemsp != NULL)
+		*nitemsp = nitems;
+	return (fds);
+}
+
+static size_t
+nvlist_xndescriptors(const nvlist_t *nvl, int level)
+{
+	const nvpair_t *nvp;
+	size_t ndescs;
+
+	NVLIST_ASSERT(nvl);
+	PJDLOG_ASSERT(nvl->nvl_error == 0);
+	PJDLOG_ASSERT(level < 3);
+
+	ndescs = 0;
+	for (nvp = nvlist_first_nvpair(nvl); nvp != NULL;
+	    nvp = nvlist_next_nvpair(nvl, nvp)) {
+		switch (nvpair_type(nvp)) {
+		case NV_TYPE_DESCRIPTOR:
+			ndescs++;
+			break;
+		case NV_TYPE_NVLIST:
+			ndescs += nvlist_xndescriptors(nvpair_get_nvlist(nvp),
+			    level + 1);
+			break;
+		}
+	}
+
+	return (ndescs);
+}
+
+size_t
+nvlist_ndescriptors(const nvlist_t *nvl)
+{
+
+	return (nvlist_xndescriptors(nvl, 0));
+}
+
+static unsigned char *
+nvlist_pack_header(const nvlist_t *nvl, unsigned char *ptr, size_t *leftp)
+{
+	struct nvlist_header nvlhdr;
+
+	NVLIST_ASSERT(nvl);
+
+	nvlhdr.nvlh_magic = NVLIST_HEADER_MAGIC;
+	nvlhdr.nvlh_version = NVLIST_HEADER_VERSION;
+	nvlhdr.nvlh_flags = nvl->nvl_flags;
+#if BYTE_ORDER == BIG_ENDIAN
+	nvlhdr.nvlh_flags |= NV_FLAG_BIG_ENDIAN;
+#endif
+	nvlhdr.nvlh_descriptors = nvlist_ndescriptors(nvl);
+	nvlhdr.nvlh_size = *leftp - sizeof(nvlhdr);
+	PJDLOG_ASSERT(*leftp >= sizeof(nvlhdr));
+	memcpy(ptr, &nvlhdr, sizeof(nvlhdr));
+	ptr += sizeof(nvlhdr);
+	*leftp -= sizeof(nvlhdr);
+
+	return (ptr);
+}
+
+void *
+nvlist_xpack(const nvlist_t *nvl, int64_t *fdidxp, size_t *sizep)
+{
+	unsigned char *buf, *ptr;
+	size_t left, size;
+	nvpair_t *nvp;
+
+	NVLIST_ASSERT(nvl);
+
+	if (nvl->nvl_error != 0) {
+		errno = nvl->nvl_error;
+		return (NULL);
+	}
+
+	size = nvlist_size(nvl);
+	buf = malloc(size);
+	if (buf == NULL)
+		return (NULL);
+
+	ptr = buf;
+	left = size;
+
+	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);
+		if (ptr == NULL) {
+			free(buf);
+			return (NULL);
+		}
+	}
+
+	if (sizep != NULL)
+		*sizep = size;
+	return (buf);
+}
+
+void *
+nvlist_pack(const nvlist_t *nvl, size_t *sizep)
+{
+
+	NVLIST_ASSERT(nvl);
+
+	if (nvl->nvl_error != 0) {
+		errno = nvl->nvl_error;
+		return (NULL);
+	}
+
+	if (nvlist_ndescriptors(nvl) > 0) {
+		errno = EOPNOTSUPP;
+		return (NULL);
+	}
+
+	return (nvlist_xpack(nvl, NULL, sizep));
+}
+
+static bool
+nvlist_check_header(struct nvlist_header *nvlhdrp)
+{
+
+	if (nvlhdrp->nvlh_magic != NVLIST_HEADER_MAGIC) {
+		errno = EINVAL;
+		return (false);
+	}
+	if ((nvlhdrp->nvlh_flags &= ~NV_FLAG_ALL_MASK) != 0) {
+		errno = EINVAL;
+		return (false);
+	}
+#if BYTE_ORDER == BIG_ENDIAN
+	if ((nvlhdrp->nvlh_flags & NV_FLAG_BIG_ENDIAN) == 0) {
+		nvlhdrp->nvlh_size = le64toh(nvlhdrp->nvlh_size);
+		nvlhdrp->nvlh_descriptors = le64toh(nvlhdrp->nvlh_descriptors);
+	}
+#else
+	if ((nvlhdrp->nvlh_flags & NV_FLAG_BIG_ENDIAN) != 0) {
+		nvlhdrp->nvlh_size = be64toh(nvlhdrp->nvlh_size);
+		nvlhdrp->nvlh_descriptors = be64toh(nvlhdrp->nvlh_descriptors);
+	}
+#endif
+	return (true);
+}
+
+static const unsigned char *
+nvlist_unpack_header(nvlist_t *nvl, const unsigned char *ptr, size_t nfds,
+    int *flagsp, size_t *leftp)
+{
+	struct nvlist_header nvlhdr;
+
+	if (*leftp < sizeof(nvlhdr))
+		goto failed;
+
+	memcpy(&nvlhdr, ptr, sizeof(nvlhdr));
+
+	if (!nvlist_check_header(&nvlhdr))
+		goto failed;
+
+	if (nvlhdr.nvlh_size != *leftp - sizeof(nvlhdr))
+		goto failed;
+
+	/*
+	 * nvlh_descriptors might be smaller than nfds in embedded nvlists.
+	 */
+	if (nvlhdr.nvlh_descriptors > nfds)
+		goto failed;
+
+	if ((nvlhdr.nvlh_flags & ~NV_FLAG_ALL_MASK) != 0)
+		goto failed;
+
+	nvl->nvl_flags = (nvlhdr.nvlh_flags & NV_FLAG_PUBLIC_MASK);
+
+	ptr += sizeof(nvlhdr);
+	*flagsp = (int)nvlhdr.nvlh_flags;
+	*leftp -= sizeof(nvlhdr);
+
+	return (ptr);
+failed:
+	errno = EINVAL;
+	return (NULL);
+}
+
+nvlist_t *
+nvlist_xunpack(const void *buf, size_t size, const int *fds, size_t nfds)
+{
+	const unsigned char *ptr;
+	nvlist_t *nvl;
+	nvpair_t *nvp;
+	size_t left;
+	int flags;
+
+	left = size;
+	ptr = buf;
+
+	nvl = nvlist_create(0);
+	if (nvl == NULL)
+		goto failed;
+
+	ptr = nvlist_unpack_header(nvl, ptr, nfds, &flags, &left);
+	if (ptr == NULL)
+		goto failed;
+
+	while (left > 0) {
+		ptr = nvpair_unpack(flags, ptr, &left, fds, nfds, &nvp);
+		if (ptr == NULL)
+			goto failed;
+		nvlist_move_nvpair(nvl, nvp);
+	}
+
+	return (nvl);
+failed:
+	nvlist_destroy(nvl);
+	return (NULL);
+}
+
+nvlist_t *
+nvlist_unpack(const void *buf, size_t size)
+{
+
+	return (nvlist_xunpack(buf, size, NULL, 0));
+}
+
+int
+nvlist_send(int sock, const nvlist_t *nvl)
+{
+	size_t datasize, nfds;
+	int *fds;
+	void *data;
+	int64_t fdidx;
+	int serrno, ret;
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return (-1);
+	}
+
+	fds = nvlist_descriptors(nvl, &nfds);
+	if (fds == NULL)
+		return (-1);
+
+	ret = -1;
+	data = NULL;
+	fdidx = 0;
+
+	data = nvlist_xpack(nvl, &fdidx, &datasize);
+	if (data == NULL)
+		goto out;
+
+	if (buf_send(sock, data, datasize) == -1)
+		goto out;
+
+	if (nfds > 0) {
+		if (fd_send(sock, fds, nfds) == -1)
+			goto out;
+	}
+
+	ret = 0;
+out:
+	serrno = errno;
+	free(fds);
+	free(data);
+	errno = serrno;
+	return (ret);
+}
+
+nvlist_t *
+nvlist_recv(int sock)
+{
+	struct nvlist_header nvlhdr;
+	nvlist_t *nvl, *ret;
+	size_t nfds, size;
+	void *buf;
+	int serrno, *fds;
+
+	if (msg_peek(sock, &nvlhdr, sizeof(nvlhdr)) == -1)
+		return (NULL);
+
+	if (!nvlist_check_header(&nvlhdr))
+		return (NULL);
+
+	nfds = (size_t)nvlhdr.nvlh_descriptors;
+	size = sizeof(nvlhdr) + (size_t)nvlhdr.nvlh_size;
+
+	buf = malloc(size);
+	if (buf == NULL)
+		return (NULL);
+
+	ret = NULL;
+	fds = NULL;
+
+	if (buf_recv(sock, buf, size) == -1)
+		goto out;
+
+	if (nfds > 0) {
+		fds = malloc(nfds * sizeof(fds[0]));
+		if (fds == NULL)
+			goto out;
+		if (fd_recv(sock, fds, nfds) == -1)
+			goto out;
+	}
+
+	nvl = nvlist_xunpack(buf, size, fds, nfds);
+	if (nvl == NULL)
+		goto out;
+
+	ret = nvl;
+out:
+	serrno = errno;
+	free(buf);
+	free(fds);
+	errno = serrno;
+
+	return (ret);
+}
+
+nvlist_t *
+nvlist_xfer(int sock, nvlist_t *nvl)
+{
+
+	if (nvlist_send(sock, nvl) < 0) {
+		nvlist_destroy(nvl);
+		return (NULL);
+	}
+	nvlist_destroy(nvl);
+	return (nvlist_recv(sock));
+}
+
+nvpair_t *
+nvlist_first_nvpair(const nvlist_t *nvl)
+{
+
+	NVLIST_ASSERT(nvl);
+
+	return (TAILQ_FIRST(&nvl->nvl_head));
+}
+
+nvpair_t *
+nvlist_next_nvpair(const nvlist_t *nvl, const nvpair_t *nvp)
+{
+	nvpair_t *retnvp;
+
+	NVLIST_ASSERT(nvl);
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvpair_nvlist(nvp) == nvl);
+
+	retnvp = nvpair_next(nvp);
+	PJDLOG_ASSERT(retnvp == NULL || nvpair_nvlist(retnvp) == nvl);
+
+	return (retnvp);
+
+}
+
+nvpair_t *
+nvlist_prev_nvpair(const nvlist_t *nvl, const nvpair_t *nvp)
+{
+	nvpair_t *retnvp;
+
+	NVLIST_ASSERT(nvl);
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvpair_nvlist(nvp) == nvl);
+
+	retnvp = nvpair_prev(nvp);
+	PJDLOG_ASSERT(nvpair_nvlist(retnvp) == nvl);
+
+	return (retnvp);
+}
+
+const char *
+nvlist_next(const nvlist_t *nvl, int *typep, void **cookiep)
+{
+	nvpair_t *nvp;
+
+	NVLIST_ASSERT(nvl);
+	PJDLOG_ASSERT(cookiep != NULL);
+
+	if (*cookiep == NULL)
+		nvp = nvlist_first_nvpair(nvl);
+	else
+		nvp = nvlist_next_nvpair(nvl, *cookiep);
+	if (nvp == NULL)
+		return (NULL);
+	if (typep != NULL)
+		*typep = nvpair_type(nvp);
+	*cookiep = nvp;
+	return (nvpair_name(nvp));
+}
+
+bool
+nvlist_exists(const nvlist_t *nvl, const char *name)
+{
+
+	return (nvlist_existsf(nvl, "%s", name));
+}
+
+#define	NVLIST_EXISTS(type)						\
+bool									\
+nvlist_exists_##type(const nvlist_t *nvl, const char *name)		\
+{									\
+									\
+	return (nvlist_existsf_##type(nvl, "%s", name));		\
+}
+
+NVLIST_EXISTS(null)
+NVLIST_EXISTS(bool)
+NVLIST_EXISTS(number)
+NVLIST_EXISTS(string)
+NVLIST_EXISTS(nvlist)
+NVLIST_EXISTS(descriptor)
+NVLIST_EXISTS(binary)
+
+#undef	NVLIST_EXISTS
+
+bool
+nvlist_existsf(const nvlist_t *nvl, const char *namefmt, ...)
+{
+	va_list nameap;
+	bool ret;
+
+	va_start(nameap, namefmt);
+	ret = nvlist_existsv(nvl, namefmt, nameap);
+	va_end(nameap);
+	return (ret);
+}
+
+#define	NVLIST_EXISTSF(type)						\
+bool									\
+nvlist_existsf_##type(const nvlist_t *nvl, const char *namefmt, ...)	\
+{									\
+	va_list nameap;							\
+	bool ret;							\
+									\
+	va_start(nameap, namefmt);					\
+	ret = nvlist_existsv_##type(nvl, namefmt, nameap);		\
+	va_end(nameap);							\
+	return (ret);							\
+}
+
+NVLIST_EXISTSF(null)
+NVLIST_EXISTSF(bool)
+NVLIST_EXISTSF(number)
+NVLIST_EXISTSF(string)
+NVLIST_EXISTSF(nvlist)
+NVLIST_EXISTSF(descriptor)
+NVLIST_EXISTSF(binary)
+
+#undef	NVLIST_EXISTSF
+
+bool
+nvlist_existsv(const nvlist_t *nvl, const char *namefmt, va_list nameap)
+{
+
+	return (nvlist_findv(nvl, NV_TYPE_NONE, namefmt, nameap) != NULL);
+}
+
+#define	NVLIST_EXISTSV(type, TYPE)					\
+bool									\
+nvlist_existsv_##type(const nvlist_t *nvl, const char *namefmt,		\
+    va_list nameap)							\
+{									\
+									\
+	return (nvlist_findv(nvl, NV_TYPE_##TYPE, namefmt, nameap) !=	\
+	    NULL);							\
+}
+
+NVLIST_EXISTSV(null, NULL)
+NVLIST_EXISTSV(bool, BOOL)
+NVLIST_EXISTSV(number, NUMBER)
+NVLIST_EXISTSV(string, STRING)
+NVLIST_EXISTSV(nvlist, NVLIST)
+NVLIST_EXISTSV(descriptor, DESCRIPTOR)
+NVLIST_EXISTSV(binary, BINARY)
+
+#undef	NVLIST_EXISTSV
+
+void
+nvlist_add_nvpair(nvlist_t *nvl, const nvpair_t *nvp)
+{
+	nvpair_t *newnvp;
+
+	NVPAIR_ASSERT(nvp);
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return;
+	}
+	if (nvlist_exists(nvl, nvpair_name(nvp))) {
+		nvl->nvl_error = errno = EEXIST;
+		return;
+	}
+
+	newnvp = nvpair_clone(nvp);
+	if (newnvp == NULL) {
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+		return;
+	}
+
+	nvpair_insert(&nvl->nvl_head, newnvp, nvl);
+}
+
+void
+nvlist_add_null(nvlist_t *nvl, const char *name)
+{
+
+	nvlist_addf_null(nvl, "%s", name);
+}
+
+void
+nvlist_add_bool(nvlist_t *nvl, const char *name, bool value)
+{
+
+	nvlist_addf_bool(nvl, value, "%s", name);
+}
+
+void
+nvlist_add_number(nvlist_t *nvl, const char *name, uint64_t value)
+{
+
+	nvlist_addf_number(nvl, value, "%s", name);
+}
+
+void
+nvlist_add_string(nvlist_t *nvl, const char *name, const char *value)
+{
+
+	nvlist_addf_string(nvl, value, "%s", name);
+}
+
+void
+nvlist_add_stringf(nvlist_t *nvl, const char *name, const char *valuefmt, ...)
+{
+	va_list valueap;
+
+	va_start(valueap, valuefmt);
+	nvlist_add_stringv(nvl, name, valuefmt, valueap);
+	va_end(valueap);
+}
+
+void
+nvlist_add_stringv(nvlist_t *nvl, const char *name, const char *valuefmt,
+    va_list valueap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_create_stringv(name, valuefmt, valueap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_add_nvlist(nvlist_t *nvl, const char *name, const nvlist_t *value)
+{
+
+	nvlist_addf_nvlist(nvl, value, "%s", name);
+}
+
+void
+nvlist_add_descriptor(nvlist_t *nvl, const char *name, int value)
+{
+
+	nvlist_addf_descriptor(nvl, value, "%s", name);
+}
+
+void
+nvlist_add_binary(nvlist_t *nvl, const char *name, const void *value,
+    size_t size)
+{
+
+	nvlist_addf_binary(nvl, value, size, "%s", name);
+}
+
+void
+nvlist_addf_null(nvlist_t *nvl, const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_addv_null(nvl, namefmt, nameap);
+	va_end(nameap);
+}
+
+void
+nvlist_addf_bool(nvlist_t *nvl, bool value, const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_addv_bool(nvl, value, namefmt, nameap);
+	va_end(nameap);
+}
+
+void
+nvlist_addf_number(nvlist_t *nvl, uint64_t value, const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_addv_number(nvl, value, namefmt, nameap);
+	va_end(nameap);
+}
+
+void
+nvlist_addf_string(nvlist_t *nvl, const char *value, const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_addv_string(nvl, value, namefmt, nameap);
+	va_end(nameap);
+}
+
+void
+nvlist_addf_nvlist(nvlist_t *nvl, const nvlist_t *value, const char *namefmt,
+    ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_addv_nvlist(nvl, value, namefmt, nameap);
+	va_end(nameap);
+}
+
+void
+nvlist_addf_descriptor(nvlist_t *nvl, int value, const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_addv_descriptor(nvl, value, namefmt, nameap);
+	va_end(nameap);
+}
+
+void
+nvlist_addf_binary(nvlist_t *nvl, const void *value, size_t size,
+    const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_addv_binary(nvl, value, size, namefmt, nameap);
+	va_end(nameap);
+}
+
+void
+nvlist_addv_null(nvlist_t *nvl, const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_createv_null(namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_addv_bool(nvlist_t *nvl, bool value, const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_createv_bool(value, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_addv_number(nvlist_t *nvl, uint64_t value, const char *namefmt,
+    va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_createv_number(value, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_addv_string(nvlist_t *nvl, const char *value, const char *namefmt,
+    va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_createv_string(value, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_addv_nvlist(nvlist_t *nvl, const nvlist_t *value, const char *namefmt,
+    va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_createv_nvlist(value, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_addv_descriptor(nvlist_t *nvl, int value, const char *namefmt,
+    va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_createv_descriptor(value, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_addv_binary(nvlist_t *nvl, const void *value, size_t size,
+    const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_createv_binary(value, size, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_move_nvpair(nvlist_t *nvl, nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvpair_nvlist(nvp) == NULL);
+
+	if (nvlist_error(nvl) != 0) {
+		nvpair_free(nvp);
+		errno = nvlist_error(nvl);
+		return;
+	}
+	if (nvlist_exists(nvl, nvpair_name(nvp))) {
+		nvpair_free(nvp);
+		nvl->nvl_error = errno = EEXIST;
+		return;
+	}
+
+	nvpair_insert(&nvl->nvl_head, nvp, nvl);
+}
+
+#define	NVLIST_MOVE(vtype, type)					\
+void									\
+nvlist_move_##type(nvlist_t *nvl, const char *name, vtype value)	\
+{									\
+									\
+	nvlist_movef_##type(nvl, value, "%s", name);			\
+}
+
+NVLIST_MOVE(char *, string)
+NVLIST_MOVE(nvlist_t *, nvlist)
+NVLIST_MOVE(int, descriptor)
+
+#undef	NVLIST_MOVE
+
+void
+nvlist_move_binary(nvlist_t *nvl, const char *name, void *value, size_t size)
+{
+
+	nvlist_movef_binary(nvl, value, size, "%s", name);
+}
+
+#define	NVLIST_MOVEF(vtype, type)					\
+void									\
+nvlist_movef_##type(nvlist_t *nvl, vtype value, const char *namefmt,	\
+    ...)								\
+{									\
+	va_list nameap;							\
+									\
+	va_start(nameap, namefmt);					\
+	nvlist_movev_##type(nvl, value, namefmt, nameap);		\
+	va_end(nameap);							\
+}
+
+NVLIST_MOVEF(char *, string)
+NVLIST_MOVEF(nvlist_t *, nvlist)
+NVLIST_MOVEF(int, descriptor)
+
+#undef	NVLIST_MOVEF
+
+void
+nvlist_movef_binary(nvlist_t *nvl, void *value, size_t size,
+    const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_movev_binary(nvl, value, size, namefmt, nameap);
+	va_end(nameap);
+}
+
+void
+nvlist_movev_string(nvlist_t *nvl, char *value, const char *namefmt,
+    va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		free(value);
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_movev_string(value, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_movev_nvlist(nvlist_t *nvl, nvlist_t *value, const char *namefmt,
+    va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		nvlist_destroy(value);
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_movev_nvlist(value, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_movev_descriptor(nvlist_t *nvl, int value, const char *namefmt,
+    va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		close(value);
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_movev_descriptor(value, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+void
+nvlist_movev_binary(nvlist_t *nvl, void *value, size_t size,
+    const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (nvlist_error(nvl) != 0) {
+		free(value);
+		errno = nvlist_error(nvl);
+		return;
+	}
+
+	nvp = nvpair_movev_binary(value, size, namefmt, nameap);
+	if (nvp == NULL)
+		nvl->nvl_error = errno = (errno != 0 ? errno : ENOMEM);
+	else
+		nvlist_move_nvpair(nvl, nvp);
+}
+
+#define	NVLIST_GET(ftype, type)						\
+ftype									\
+nvlist_get_##type(const nvlist_t *nvl, const char *name)		\
+{									\
+									\
+	return (nvlist_getf_##type(nvl, "%s", name));			\
+}
+
+NVLIST_GET(const nvpair_t *, nvpair)
+NVLIST_GET(bool, bool)
+NVLIST_GET(uint64_t, number)
+NVLIST_GET(const char *, string)
+NVLIST_GET(const nvlist_t *, nvlist)
+NVLIST_GET(int, descriptor)
+
+#undef	NVLIST_GET
+
+const void *
+nvlist_get_binary(const nvlist_t *nvl, const char *name, size_t *sizep)
+{
+
+	return (nvlist_getf_binary(nvl, sizep, "%s", name));
+}
+
+#define	NVLIST_GETF(ftype, type)					\
+ftype									\
+nvlist_getf_##type(const nvlist_t *nvl, const char *namefmt, ...)	\
+{									\
+	va_list nameap;							\
+	ftype value;							\
+									\
+	va_start(nameap, namefmt);					\
+	value = nvlist_getv_##type(nvl, namefmt, nameap);		\
+	va_end(nameap);							\
+									\
+	return (value);							\
+}
+
+NVLIST_GETF(const nvpair_t *, nvpair)
+NVLIST_GETF(bool, bool)
+NVLIST_GETF(uint64_t, number)
+NVLIST_GETF(const char *, string)
+NVLIST_GETF(const nvlist_t *, nvlist)
+NVLIST_GETF(int, descriptor)
+
+#undef	NVLIST_GETF
+
+const void *
+nvlist_getf_binary(const nvlist_t *nvl, size_t *sizep, const char *namefmt, ...)
+{
+	va_list nameap;
+	const void *value;
+
+	va_start(nameap, namefmt);
+	value = nvlist_getv_binary(nvl, sizep, namefmt, nameap);
+	va_end(nameap);
+
+	return (value);
+}
+
+const nvpair_t *
+nvlist_getv_nvpair(const nvlist_t *nvl, const char *namefmt, va_list nameap)
+{
+
+	return (nvlist_findv(nvl, NV_TYPE_NONE, namefmt, nameap));
+}
+
+#define	NVLIST_GETV(ftype, type, TYPE)					\
+ftype									\
+nvlist_getv_##type(const nvlist_t *nvl, const char *namefmt,		\
+    va_list nameap)							\
+{									\
+	va_list cnameap;						\
+	const nvpair_t *nvp;						\
+									\
+	va_copy(cnameap, nameap);					\
+	nvp = nvlist_findv(nvl, NV_TYPE_##TYPE, namefmt, cnameap);	\
+	va_end(cnameap);						\
+	if (nvp == NULL)						\
+		nvlist_report_missing(NV_TYPE_##TYPE, namefmt, nameap);	\
+	return (nvpair_get_##type(nvp));				\
+}
+
+NVLIST_GETV(bool, bool, BOOL)
+NVLIST_GETV(uint64_t, number, NUMBER)
+NVLIST_GETV(const char *, string, STRING)
+NVLIST_GETV(const nvlist_t *, nvlist, NVLIST)
+NVLIST_GETV(int, descriptor, DESCRIPTOR)
+
+#undef	NVLIST_GETV
+
+const void *
+nvlist_getv_binary(const nvlist_t *nvl, size_t *sizep, const char *namefmt,
+    va_list nameap)
+{
+	va_list cnameap;
+	const nvpair_t *nvp;
+
+	va_copy(cnameap, nameap);
+	nvp = nvlist_findv(nvl, NV_TYPE_BINARY, namefmt, cnameap);
+	va_end(cnameap);
+	if (nvp == NULL)
+		nvlist_report_missing(NV_TYPE_BINARY, namefmt, nameap);
+
+	return (nvpair_get_binary(nvp, sizep));
+}
+
+#define	NVLIST_TAKE(ftype, type)					\
+ftype									\
+nvlist_take_##type(nvlist_t *nvl, const char *name)			\
+{									\
+									\
+	return (nvlist_takef_##type(nvl, "%s", name));			\
+}
+
+NVLIST_TAKE(nvpair_t *, nvpair)
+NVLIST_TAKE(bool, bool)
+NVLIST_TAKE(uint64_t, number)
+NVLIST_TAKE(char *, string)
+NVLIST_TAKE(nvlist_t *, nvlist)
+NVLIST_TAKE(int, descriptor)
+
+#undef	NVLIST_TAKE
+
+void *
+nvlist_take_binary(nvlist_t *nvl, const char *name, size_t *sizep)
+{
+
+	return (nvlist_takef_binary(nvl, sizep, "%s", name));
+}
+
+#define	NVLIST_TAKEF(ftype, type)					\
+ftype									\
+nvlist_takef_##type(nvlist_t *nvl, const char *namefmt, ...)		\
+{									\
+	va_list nameap;							\
+	ftype value;							\
+									\
+	va_start(nameap, namefmt);					\
+	value = nvlist_takev_##type(nvl, namefmt, nameap);		\
+	va_end(nameap);							\
+									\
+	return (value);							\
+}
+
+NVLIST_TAKEF(nvpair_t *, nvpair)
+NVLIST_TAKEF(bool, bool)
+NVLIST_TAKEF(uint64_t, number)
+NVLIST_TAKEF(char *, string)
+NVLIST_TAKEF(nvlist_t *, nvlist)
+NVLIST_TAKEF(int, descriptor)
+
+#undef	NVLIST_TAKEF
+
+void *
+nvlist_takef_binary(nvlist_t *nvl, size_t *sizep, const char *namefmt, ...)
+{
+	va_list nameap;
+	void *value;
+
+	va_start(nameap, namefmt);
+	value = nvlist_takev_binary(nvl, sizep, namefmt, nameap);
+	va_end(nameap);
+
+	return (value);
+}
+
+nvpair_t *
+nvlist_takev_nvpair(nvlist_t *nvl, const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+
+	nvp = nvlist_findv(nvl, NV_TYPE_NONE, namefmt, nameap);
+	if (nvp != NULL)
+		nvlist_remove_nvpair(nvl, nvp);
+	return (nvp);
+}
+
+#define	NVLIST_TAKEV(ftype, type, TYPE)					\
+ftype									\
+nvlist_takev_##type(nvlist_t *nvl, const char *namefmt, va_list nameap)	\
+{									\
+	va_list cnameap;						\
+	nvpair_t *nvp;							\
+	ftype value;							\
+									\
+	va_copy(cnameap, nameap);					\
+	nvp = nvlist_findv(nvl, NV_TYPE_##TYPE, namefmt, cnameap);	\
+	va_end(cnameap);						\
+	if (nvp == NULL)						\
+		nvlist_report_missing(NV_TYPE_##TYPE, namefmt, nameap);	\
+	value = (ftype)(intptr_t)nvpair_get_##type(nvp);		\
+	nvlist_remove_nvpair(nvl, nvp);					\
+	nvpair_free_structure(nvp);					\
+	return (value);							\
+}
+
+NVLIST_TAKEV(bool, bool, BOOL)
+NVLIST_TAKEV(uint64_t, number, NUMBER)
+NVLIST_TAKEV(char *, string, STRING)
+NVLIST_TAKEV(nvlist_t *, nvlist, NVLIST)
+NVLIST_TAKEV(int, descriptor, DESCRIPTOR)
+
+#undef	NVLIST_TAKEV
+
+void *
+nvlist_takev_binary(nvlist_t *nvl, size_t *sizep, const char *namefmt,
+    va_list nameap)
+{
+	va_list cnameap;
+	nvpair_t *nvp;
+	void *value;
+
+	va_copy(cnameap, nameap);
+	nvp = nvlist_findv(nvl, NV_TYPE_BINARY, namefmt, cnameap);
+	va_end(cnameap);
+	if (nvp == NULL)
+		nvlist_report_missing(NV_TYPE_BINARY, namefmt, nameap);
+
+	value = (void *)(intptr_t)nvpair_get_binary(nvp, sizep);
+	nvlist_remove_nvpair(nvl, nvp);
+	nvpair_free_structure(nvp);
+	return (value);
+}
+
+void
+nvlist_remove_nvpair(nvlist_t *nvl, nvpair_t *nvp)
+{
+
+	NVLIST_ASSERT(nvl);
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvpair_nvlist(nvp) == nvl);
+
+	nvpair_remove(&nvl->nvl_head, nvp, nvl);
+}
+
+void
+nvlist_free(nvlist_t *nvl, const char *name)
+{
+
+	nvlist_freef(nvl, "%s", name);
+}
+
+#define	NVLIST_FREE(type)						\
+void									\
+nvlist_free_##type(nvlist_t *nvl, const char *name)			\
+{									\
+									\
+	nvlist_freef_##type(nvl, "%s", name);				\
+}
+
+NVLIST_FREE(null)
+NVLIST_FREE(bool)
+NVLIST_FREE(number)
+NVLIST_FREE(string)
+NVLIST_FREE(nvlist)
+NVLIST_FREE(descriptor)
+NVLIST_FREE(binary)
+
+#undef	NVLIST_FREE
+
+void
+nvlist_freef(nvlist_t *nvl, const char *namefmt, ...)
+{
+	va_list nameap;
+
+	va_start(nameap, namefmt);
+	nvlist_freev(nvl, namefmt, nameap);
+	va_end(nameap);
+}
+
+#define	NVLIST_FREEF(type)						\
+void									\
+nvlist_freef_##type(nvlist_t *nvl, const char *namefmt, ...)		\
+{									\
+	va_list nameap;							\
+									\
+	va_start(nameap, namefmt);					\
+	nvlist_freev_##type(nvl, namefmt, nameap);			\
+	va_end(nameap);							\
+}
+
+NVLIST_FREEF(null)
+NVLIST_FREEF(bool)
+NVLIST_FREEF(number)
+NVLIST_FREEF(string)
+NVLIST_FREEF(nvlist)
+NVLIST_FREEF(descriptor)
+NVLIST_FREEF(binary)
+
+#undef	NVLIST_FREEF
+
+void
+nvlist_freev(nvlist_t *nvl, const char *namefmt, va_list nameap)
+{
+
+	nvlist_freev_type(nvl, NV_TYPE_NONE, namefmt, nameap);
+}
+
+#define	NVLIST_FREEV(type, TYPE)					\
+void									\
+nvlist_freev_##type(nvlist_t *nvl, const char *namefmt, va_list nameap)	\
+{									\
+									\
+	nvlist_freev_type(nvl, NV_TYPE_##TYPE, namefmt, nameap);	\
+}
+
+NVLIST_FREEV(null, NULL)
+NVLIST_FREEV(bool, BOOL)
+NVLIST_FREEV(number, NUMBER)
+NVLIST_FREEV(string, STRING)
+NVLIST_FREEV(nvlist, NVLIST)
+NVLIST_FREEV(descriptor, DESCRIPTOR)
+NVLIST_FREEV(binary, BINARY)
+#undef	NVLIST_FREEV
+
+void
+nvlist_free_nvpair(nvlist_t *nvl, nvpair_t *nvp)
+{
+
+	NVLIST_ASSERT(nvl);
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvpair_nvlist(nvp) == nvl);
+
+	nvlist_remove_nvpair(nvl, nvp);
+	nvpair_free(nvp);
+}
diff --git a/lib/libnv/nvlist_impl.h b/lib/libnv/nvlist_impl.h
new file mode 100644
index 00000000000..43a7bb0a80c
--- /dev/null
+++ b/lib/libnv/nvlist_impl.h
@@ -0,0 +1,43 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_NVLIST_IMPL_H_
+#define	_NVLIST_IMPL_H_
+
+#include <stdint.h>
+
+#include "nv.h"
+
+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);
+
+#endif	/* !_NVLIST_IMPL_H_ */
diff --git a/lib/libnv/nvpair.c b/lib/libnv/nvpair.c
new file mode 100644
index 00000000000..916444f76a6
--- /dev/null
+++ b/lib/libnv/nvpair.c
@@ -0,0 +1,1333 @@
+/*-
+ * Copyright (c) 2009-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/endian.h>
+#include <sys/queue.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#ifdef HAVE_PJDLOG
+#include <pjdlog.h>
+#endif
+
+#include "common_impl.h"
+#include "nv.h"
+#include "nv_impl.h"
+#include "nvlist_impl.h"
+#include "nvpair_impl.h"
+
+#ifndef	HAVE_PJDLOG
+#include <assert.h>
+#define	PJDLOG_ASSERT(...)		assert(__VA_ARGS__)
+#define	PJDLOG_RASSERT(expr, ...)	assert(expr)
+#define	PJDLOG_ABORT(...)		abort()
+#endif
+
+#define	NVPAIR_MAGIC	0x6e7670	/* "nvp" */
+struct nvpair {
+	int		 nvp_magic;
+	char		*nvp_name;
+	int		 nvp_type;
+	uint64_t	 nvp_data;
+	size_t		 nvp_datasize;
+	nvlist_t	*nvp_list;	/* Used for sanity checks. */
+	TAILQ_ENTRY(nvpair) nvp_next;
+};
+
+#define	NVPAIR_ASSERT(nvp)	do {					\
+	PJDLOG_ASSERT((nvp) != NULL);					\
+	PJDLOG_ASSERT((nvp)->nvp_magic == NVPAIR_MAGIC);		\
+} while (0)
+
+struct nvpair_header {
+	uint8_t		nvph_type;
+	uint16_t	nvph_namesize;
+	uint64_t	nvph_datasize;
+} __packed;
+
+
+void
+nvpair_assert(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+}
+
+const nvlist_t *
+nvpair_nvlist(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+
+	return (nvp->nvp_list);
+}
+
+nvpair_t *
+nvpair_next(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_list != NULL);
+
+	return (TAILQ_NEXT(nvp, nvp_next));
+}
+
+nvpair_t *
+nvpair_prev(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_list != NULL);
+
+	return (TAILQ_PREV(nvp, nvl_head, nvp_next));
+}
+
+void
+nvpair_insert(struct nvl_head *head, nvpair_t *nvp, nvlist_t *nvl)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_list == NULL);
+	PJDLOG_ASSERT(!nvlist_exists(nvl, nvpair_name(nvp)));
+
+	TAILQ_INSERT_TAIL(head, nvp, nvp_next);
+	nvp->nvp_list = nvl;
+}
+
+void
+nvpair_remove(struct nvl_head *head, nvpair_t *nvp, const nvlist_t *nvl)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_list == nvl);
+
+	TAILQ_REMOVE(head, nvp, nvp_next);
+	nvp->nvp_list = NULL;
+}
+
+nvpair_t *
+nvpair_clone(const nvpair_t *nvp)
+{
+	nvpair_t *newnvp;
+	const char *name;
+	const void *data;
+	size_t datasize;
+
+	NVPAIR_ASSERT(nvp);
+
+	name = nvpair_name(nvp);
+
+	switch (nvpair_type(nvp)) {
+	case NV_TYPE_NULL:
+		newnvp = nvpair_create_null(name);
+		break;
+	case NV_TYPE_BOOL:
+		newnvp = nvpair_create_bool(name, nvpair_get_bool(nvp));
+		break;
+	case NV_TYPE_NUMBER:
+		newnvp = nvpair_create_number(name, nvpair_get_number(nvp));
+		break;
+	case NV_TYPE_STRING:
+		newnvp = nvpair_create_string(name, nvpair_get_string(nvp));
+		break;
+	case NV_TYPE_NVLIST:
+		newnvp = nvpair_create_nvlist(name, nvpair_get_nvlist(nvp));
+		break;
+	case NV_TYPE_DESCRIPTOR:
+		newnvp = nvpair_create_descriptor(name,
+		    nvpair_get_descriptor(nvp));
+		break;
+	case NV_TYPE_BINARY:
+		data = nvpair_get_binary(nvp, &datasize);
+		newnvp = nvpair_create_binary(name, data, datasize);
+		break;
+	default:
+		PJDLOG_ABORT("Unknown type: %d.", nvpair_type(nvp));
+	}
+
+	return (newnvp);
+}
+
+size_t
+nvpair_header_size(void)
+{
+
+	return (sizeof(struct nvpair_header));
+}
+
+size_t
+nvpair_size(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+
+	return (nvp->nvp_datasize);
+}
+
+static unsigned char *
+nvpair_pack_header(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
+{
+	struct nvpair_header nvphdr;
+	size_t namesize;
+
+	NVPAIR_ASSERT(nvp);
+
+	nvphdr.nvph_type = nvp->nvp_type;
+	namesize = strlen(nvp->nvp_name) + 1;
+	PJDLOG_ASSERT(namesize > 0 && namesize <= UINT16_MAX);
+	nvphdr.nvph_namesize = namesize;
+	nvphdr.nvph_datasize = nvp->nvp_datasize;
+	PJDLOG_ASSERT(*leftp >= sizeof(nvphdr));
+	memcpy(ptr, &nvphdr, sizeof(nvphdr));
+	ptr += sizeof(nvphdr);
+	*leftp -= sizeof(nvphdr);
+
+	PJDLOG_ASSERT(*leftp >= namesize);
+	memcpy(ptr, nvp->nvp_name, namesize);
+	ptr += namesize;
+	*leftp -= namesize;
+
+	return (ptr);
+}
+
+static unsigned char *
+nvpair_pack_null(const nvpair_t *nvp, unsigned char *ptr,
+    size_t *leftp __unused)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_NULL);
+
+	return (ptr);
+}
+
+static unsigned char *
+nvpair_pack_bool(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
+{
+	uint8_t value;
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_BOOL);
+
+	value = (uint8_t)nvp->nvp_data;
+
+	PJDLOG_ASSERT(*leftp >= sizeof(value));
+	memcpy(ptr, &value, sizeof(value));
+	ptr += sizeof(value);
+	*leftp -= sizeof(value);
+
+	return (ptr);
+}
+
+static unsigned char *
+nvpair_pack_number(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
+{
+	uint64_t value;
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_NUMBER);
+
+	value = (uint64_t)nvp->nvp_data;
+
+	PJDLOG_ASSERT(*leftp >= sizeof(value));
+	memcpy(ptr, &value, sizeof(value));
+	ptr += sizeof(value);
+	*leftp -= sizeof(value);
+
+	return (ptr);
+}
+
+static unsigned char *
+nvpair_pack_string(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_STRING);
+
+	PJDLOG_ASSERT(*leftp >= nvp->nvp_datasize);
+	memcpy(ptr, (const void *)(intptr_t)nvp->nvp_data, nvp->nvp_datasize);
+	ptr += nvp->nvp_datasize;
+	*leftp -= nvp->nvp_datasize;
+
+	return (ptr);
+}
+
+static unsigned char *
+nvpair_pack_nvlist(const nvpair_t *nvp, unsigned char *ptr, int64_t *fdidxp,
+    size_t *leftp)
+{
+	unsigned char *data;
+	size_t size;
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_NVLIST);
+
+	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;
+
+	return (ptr);
+}
+
+static unsigned char *
+nvpair_pack_descriptor(const nvpair_t *nvp, unsigned char *ptr, int64_t *fdidxp,
+    size_t *leftp)
+{
+	int64_t value;
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_DESCRIPTOR);
+
+	value = (int64_t)nvp->nvp_data;
+	if (value != -1) {
+		/*
+		 * If there is a real descriptor here, we change its number
+		 * to position in the array of descriptors send via control
+		 * message.
+		 */
+		PJDLOG_ASSERT(fdidxp != NULL);
+
+		value = *fdidxp;
+		(*fdidxp)++;
+	}
+
+	PJDLOG_ASSERT(*leftp >= sizeof(value));
+	memcpy(ptr, &value, sizeof(value));
+	ptr += sizeof(value);
+	*leftp -= sizeof(value);
+
+	return (ptr);
+}
+
+static unsigned char *
+nvpair_pack_binary(const nvpair_t *nvp, unsigned char *ptr, size_t *leftp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_BINARY);
+
+	PJDLOG_ASSERT(*leftp >= nvp->nvp_datasize);
+	memcpy(ptr, (const void *)(intptr_t)nvp->nvp_data, nvp->nvp_datasize);
+	ptr += nvp->nvp_datasize;
+	*leftp -= nvp->nvp_datasize;
+
+	return (ptr);
+}
+
+unsigned char *
+nvpair_pack(nvpair_t *nvp, unsigned char *ptr, int64_t *fdidxp, size_t *leftp)
+{
+
+	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;
+		} else {
+			nvp->nvp_datasize =
+			    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 *
+nvpair_unpack_header(int flags, nvpair_t *nvp, const unsigned char *ptr,
+    size_t *leftp)
+{
+	struct nvpair_header nvphdr;
+
+	if (*leftp < sizeof(nvphdr))
+		goto failed;
+
+	memcpy(&nvphdr, ptr, sizeof(nvphdr));
+	ptr += sizeof(nvphdr);
+	*leftp -= sizeof(nvphdr);
+
+#if NV_TYPE_FIRST > 0
+	if (nvphdr.nvph_type < NV_TYPE_FIRST)
+		goto failed;
+#endif
+	if (nvphdr.nvph_type > NV_TYPE_LAST)
+		goto failed;
+
+#if BYTE_ORDER == BIG_ENDIAN
+	if ((flags & NV_FLAG_BIG_ENDIAN) == 0) {
+		nvphdr.nvph_namesize = le16toh(nvphdr.nvph_namesize);
+		nvphdr.nvph_datasize = le64toh(nvphdr.nvph_datasize);
+	}
+#else
+	if ((flags & NV_FLAG_BIG_ENDIAN) != 0) {
+		nvphdr.nvph_namesize = be16toh(nvphdr.nvph_namesize);
+		nvphdr.nvph_datasize = be64toh(nvphdr.nvph_datasize);
+	}
+#endif
+
+	if (nvphdr.nvph_namesize > NV_NAME_MAX)
+		goto failed;
+	if (*leftp < nvphdr.nvph_namesize)
+		goto failed;
+	if (nvphdr.nvph_namesize < 1)
+		goto failed;
+	if (strnlen((const char *)ptr, nvphdr.nvph_namesize) !=
+	    (size_t)(nvphdr.nvph_namesize - 1)) {
+		goto failed;
+	}
+
+	memcpy(nvp->nvp_name, ptr, nvphdr.nvph_namesize);
+	ptr += nvphdr.nvph_namesize;
+	*leftp -= nvphdr.nvph_namesize;
+
+	if (*leftp < nvphdr.nvph_datasize)
+		goto failed;
+
+	nvp->nvp_type = nvphdr.nvph_type;
+	nvp->nvp_data = 0;
+	nvp->nvp_datasize = nvphdr.nvph_datasize;
+
+	return (ptr);
+failed:
+	errno = EINVAL;
+	return (NULL);
+}
+
+static const unsigned char *
+nvpair_unpack_null(int flags __unused, nvpair_t *nvp, const unsigned char *ptr,
+    size_t *leftp __unused)
+{
+
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_NULL);
+
+	if (nvp->nvp_datasize != 0) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	return (ptr);
+}
+
+static const unsigned char *
+nvpair_unpack_bool(int flags __unused, nvpair_t *nvp, const unsigned char *ptr,
+    size_t *leftp)
+{
+	uint8_t value;
+
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_BOOL);
+
+	if (nvp->nvp_datasize != sizeof(value)) {
+		errno = EINVAL;
+		return (NULL);
+	}
+	if (*leftp < sizeof(value)) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	memcpy(&value, ptr, sizeof(value));
+	ptr += sizeof(value);
+	*leftp -= sizeof(value);
+
+	if (value != 0 && value != 1) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	nvp->nvp_data = (uint64_t)value;
+
+	return (ptr);
+}
+
+static const unsigned char *
+nvpair_unpack_number(int flags, nvpair_t *nvp, const unsigned char *ptr,
+    size_t *leftp)
+{
+
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_NUMBER);
+
+	if (nvp->nvp_datasize != sizeof(uint64_t)) {
+		errno = EINVAL;
+		return (NULL);
+	}
+	if (*leftp < sizeof(uint64_t)) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	if ((flags & NV_FLAG_BIG_ENDIAN) != 0)
+		nvp->nvp_data = be64dec(ptr);
+	else
+		nvp->nvp_data = le64dec(ptr);
+	ptr += sizeof(uint64_t);
+	*leftp -= sizeof(uint64_t);
+
+	return (ptr);
+}
+
+static const unsigned char *
+nvpair_unpack_string(int flags __unused, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp)
+{
+
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_STRING);
+
+	if (*leftp < nvp->nvp_datasize || nvp->nvp_datasize == 0) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	if (strnlen((const char *)ptr, nvp->nvp_datasize) !=
+	    nvp->nvp_datasize - 1) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	nvp->nvp_data = (uint64_t)(uintptr_t)strdup((const char *)ptr);
+	if (nvp->nvp_data == 0)
+		return (NULL);
+
+	ptr += nvp->nvp_datasize;
+	*leftp -= nvp->nvp_datasize;
+
+	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)
+{
+	nvlist_t *value;
+
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_NVLIST);
+
+	if (*leftp < nvp->nvp_datasize || nvp->nvp_datasize == 0) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	value = nvlist_xunpack(ptr, nvp->nvp_datasize, fds, nfds);
+	if (value == NULL)
+		return (NULL);
+
+	nvp->nvp_data = (uint64_t)(uintptr_t)value;
+
+	ptr += nvp->nvp_datasize;
+	*leftp -= nvp->nvp_datasize;
+
+	return (ptr);
+}
+
+static const unsigned char *
+nvpair_unpack_descriptor(int flags, nvpair_t *nvp, const unsigned char *ptr,
+    size_t *leftp, const int *fds, size_t nfds)
+{
+	int64_t idx;
+
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_DESCRIPTOR);
+
+	if (nvp->nvp_datasize != sizeof(idx)) {
+		errno = EINVAL;
+		return (NULL);
+	}
+	if (*leftp < sizeof(idx)) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	if ((flags & NV_FLAG_BIG_ENDIAN) != 0)
+		idx = be64dec(ptr);
+	else
+		idx = le64dec(ptr);
+
+	if (idx < 0) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	if ((size_t)idx >= nfds) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	nvp->nvp_data = (uint64_t)fds[idx];
+
+	ptr += sizeof(idx);
+	*leftp -= sizeof(idx);
+
+	return (ptr);
+}
+
+static const unsigned char *
+nvpair_unpack_binary(int flags __unused, nvpair_t *nvp,
+    const unsigned char *ptr, size_t *leftp)
+{
+	void *value;
+
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_BINARY);
+
+	if (*leftp < nvp->nvp_datasize || nvp->nvp_datasize == 0) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	value = malloc(nvp->nvp_datasize);
+	if (value == NULL)
+		return (NULL);
+
+	memcpy(value, ptr, nvp->nvp_datasize);
+	ptr += nvp->nvp_datasize;
+	*leftp -= nvp->nvp_datasize;
+
+	nvp->nvp_data = (uint64_t)(uintptr_t)value;
+
+	return (ptr);
+}
+
+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 *nvp, *tmp;
+
+	nvp = calloc(1, sizeof(*nvp) + NV_NAME_MAX);
+	if (nvp == NULL)
+		return (NULL);
+	nvp->nvp_name = (char *)(nvp + 1);
+
+	ptr = nvpair_unpack_header(flags, nvp, ptr, leftp);
+	if (ptr == NULL)
+		goto failed;
+	tmp = realloc(nvp, sizeof(*nvp) + strlen(nvp->nvp_name) + 1);
+	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_magic = NVPAIR_MAGIC;
+	*nvpp = nvp;
+	return (ptr);
+failed:
+	free(nvp);
+	return (NULL);
+}
+
+int
+nvpair_type(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+
+	return (nvp->nvp_type);
+}
+
+const char *
+nvpair_name(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+
+	return (nvp->nvp_name);
+}
+
+static nvpair_t *
+nvpair_allocv(int type, uint64_t data, size_t datasize, const char *namefmt,
+    va_list nameap)
+{
+	nvpair_t *nvp;
+	char *name;
+	int namelen;
+
+	PJDLOG_ASSERT(type >= NV_TYPE_FIRST && type <= NV_TYPE_LAST);
+
+	namelen = vasprintf(&name, namefmt, nameap);
+	if (namelen < 0)
+		return (NULL);
+
+	PJDLOG_ASSERT(namelen > 0);
+	if (namelen >= NV_NAME_MAX) {
+		free(name);
+		errno = ENAMETOOLONG;
+		return (NULL);
+	}
+
+	nvp = calloc(1, sizeof(*nvp) + namelen + 1);
+	if (nvp != NULL) {
+		nvp->nvp_name = (char *)(nvp + 1);
+		memcpy(nvp->nvp_name, name, namelen + 1);
+		nvp->nvp_type = type;
+		nvp->nvp_data = data;
+		nvp->nvp_datasize = datasize;
+		nvp->nvp_magic = NVPAIR_MAGIC;
+	}
+	free(name);
+
+	return (nvp);
+};
+
+nvpair_t *
+nvpair_create_null(const char *name)
+{
+
+	return (nvpair_createf_null("%s", name));
+}
+
+nvpair_t *
+nvpair_create_bool(const char *name, bool value)
+{
+
+	return (nvpair_createf_bool(value, "%s", name));
+}
+
+nvpair_t *
+nvpair_create_number(const char *name, uint64_t value)
+{
+
+	return (nvpair_createf_number(value, "%s", name));
+}
+
+nvpair_t *
+nvpair_create_string(const char *name, const char *value)
+{
+
+	return (nvpair_createf_string(value, "%s", name));
+}
+
+nvpair_t *
+nvpair_create_stringf(const char *name, const char *valuefmt, ...)
+{
+	va_list valueap;
+	nvpair_t *nvp;
+
+	va_start(valueap, valuefmt);
+	nvp = nvpair_create_stringv(name, valuefmt, valueap);
+	va_end(valueap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_create_stringv(const char *name, const char *valuefmt, va_list valueap)
+{
+	nvpair_t *nvp;
+	char *str;
+	int len;
+
+	len = vasprintf(&str, valuefmt, valueap);
+	if (len < 0)
+		return (NULL);
+	nvp = nvpair_create_string(name, str);
+	if (nvp == NULL)
+		free(str);
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_create_nvlist(const char *name, const nvlist_t *value)
+{
+
+	return (nvpair_createf_nvlist(value, "%s", name));
+}
+
+nvpair_t *
+nvpair_create_descriptor(const char *name, int value)
+{
+
+	return (nvpair_createf_descriptor(value, "%s", name));
+}
+
+nvpair_t *
+nvpair_create_binary(const char *name, const void *value, size_t size)
+{
+
+	return (nvpair_createf_binary(value, size, "%s", name));
+}
+
+nvpair_t *
+nvpair_createf_null(const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_createv_null(namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createf_bool(bool value, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_createv_bool(value, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createf_number(uint64_t value, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_createv_number(value, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createf_string(const char *value, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_createv_string(value, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createf_nvlist(const nvlist_t *value, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_createv_nvlist(value, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createf_descriptor(int value, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_createv_descriptor(value, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createf_binary(const void *value, size_t size, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_createv_binary(value, size, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createv_null(const char *namefmt, va_list nameap)
+{
+
+	return (nvpair_allocv(NV_TYPE_NULL, 0, 0, namefmt, nameap));
+}
+
+nvpair_t *
+nvpair_createv_bool(bool value, const char *namefmt, va_list nameap)
+{
+
+	return (nvpair_allocv(NV_TYPE_BOOL, value ? 1 : 0, sizeof(uint8_t),
+	    namefmt, nameap));
+}
+
+nvpair_t *
+nvpair_createv_number(uint64_t value, const char *namefmt, va_list nameap)
+{
+
+	return (nvpair_allocv(NV_TYPE_NUMBER, value, sizeof(value), namefmt,
+	    nameap));
+}
+
+nvpair_t *
+nvpair_createv_string(const char *value, const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+	size_t size;
+	char *data;
+
+	if (value == NULL) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	data = strdup(value);
+	if (data == NULL)
+		return (NULL);
+	size = strlen(value) + 1;
+
+	nvp = nvpair_allocv(NV_TYPE_STRING, (uint64_t)(uintptr_t)data, size,
+	    namefmt, nameap);
+	if (nvp == NULL)
+		free(data);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createv_nvlist(const nvlist_t *value, const char *namefmt,
+    va_list nameap)
+{
+	nvlist_t *nvl;
+	nvpair_t *nvp;
+
+	if (value == NULL) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	nvl = nvlist_clone(value);
+	if (nvl == NULL)
+		return (NULL);
+
+	nvp = nvpair_allocv(NV_TYPE_NVLIST, (uint64_t)(uintptr_t)nvl, 0,
+	    namefmt, nameap);
+	if (nvp == NULL)
+		nvlist_destroy(nvl);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createv_descriptor(int value, const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (value < 0 || !fd_is_valid(value)) {
+		errno = EBADF;
+		return (NULL);
+	}
+
+	value = fcntl(value, F_DUPFD_CLOEXEC, 0);
+	if (value < 0)
+		return (NULL);
+
+	nvp = nvpair_allocv(NV_TYPE_DESCRIPTOR, (uint64_t)value,
+	    sizeof(int64_t), namefmt, nameap);
+	if (nvp == NULL)
+		close(value);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_createv_binary(const void *value, size_t size, const char *namefmt,
+    va_list nameap)
+{
+	nvpair_t *nvp;
+	void *data;
+
+	if (value == NULL || size == 0) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	data = malloc(size);
+	if (data == NULL)
+		return (NULL);
+	memcpy(data, value, size);
+
+	nvp = nvpair_allocv(NV_TYPE_BINARY, (uint64_t)(uintptr_t)data, size,
+	    namefmt, nameap);
+	if (nvp == NULL)
+		free(data);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_move_string(const char *name, char *value)
+{
+
+	return (nvpair_movef_string(value, "%s", name));
+}
+
+nvpair_t *
+nvpair_move_nvlist(const char *name, nvlist_t *value)
+{
+
+	return (nvpair_movef_nvlist(value, "%s", name));
+}
+
+nvpair_t *
+nvpair_move_descriptor(const char *name, int value)
+{
+
+	return (nvpair_movef_descriptor(value, "%s", name));
+}
+
+nvpair_t *
+nvpair_move_binary(const char *name, void *value, size_t size)
+{
+
+	return (nvpair_movef_binary(value, size, "%s", name));
+}
+
+nvpair_t *
+nvpair_movef_string(char *value, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_movev_string(value, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_movef_nvlist(nvlist_t *value, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_movev_nvlist(value, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_movef_descriptor(int value, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_movev_descriptor(value, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_movef_binary(void *value, size_t size, const char *namefmt, ...)
+{
+	va_list nameap;
+	nvpair_t *nvp;
+
+	va_start(nameap, namefmt);
+	nvp = nvpair_movev_binary(value, size, namefmt, nameap);
+	va_end(nameap);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_movev_string(char *value, const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (value == NULL) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	nvp = nvpair_allocv(NV_TYPE_STRING, (uint64_t)(uintptr_t)value,
+	    strlen(value) + 1, namefmt, nameap);
+	if (nvp == NULL)
+		free(value);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_movev_nvlist(nvlist_t *value, const char *namefmt, va_list nameap)
+{
+	nvpair_t *nvp;
+
+	if (value == NULL) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	nvp = nvpair_allocv(NV_TYPE_NVLIST, (uint64_t)(uintptr_t)value, 0,
+	    namefmt, nameap);
+	if (nvp == NULL)
+		nvlist_destroy(value);
+
+	return (nvp);
+}
+
+nvpair_t *
+nvpair_movev_descriptor(int value, const char *namefmt, va_list nameap)
+{
+
+	if (value < 0 || !fd_is_valid(value)) {
+		errno = EBADF;
+		return (NULL);
+	}
+
+	return (nvpair_allocv(NV_TYPE_DESCRIPTOR, (uint64_t)value,
+	    sizeof(int64_t), namefmt, nameap));
+}
+
+nvpair_t *
+nvpair_movev_binary(void *value, size_t size, const char *namefmt,
+    va_list nameap)
+{
+
+	if (value == NULL || size == 0) {
+		errno = EINVAL;
+		return (NULL);
+	}
+
+	return (nvpair_allocv(NV_TYPE_BINARY, (uint64_t)(uintptr_t)value, size,
+	    namefmt, nameap));
+}
+
+bool
+nvpair_get_bool(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+
+	return (nvp->nvp_data == 1);
+}
+
+uint64_t
+nvpair_get_number(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+
+	return (nvp->nvp_data);
+}
+
+const char *
+nvpair_get_string(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_STRING);
+
+	return ((const char *)(intptr_t)nvp->nvp_data);
+}
+
+const nvlist_t *
+nvpair_get_nvlist(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_NVLIST);
+
+	return ((const nvlist_t *)(intptr_t)nvp->nvp_data);
+}
+
+int
+nvpair_get_descriptor(const nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_DESCRIPTOR);
+
+	return ((int)nvp->nvp_data);
+}
+
+const void *
+nvpair_get_binary(const nvpair_t *nvp, size_t *sizep)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_type == NV_TYPE_BINARY);
+
+	if (sizep != NULL)
+		*sizep = nvp->nvp_datasize;
+	return ((const void *)(intptr_t)nvp->nvp_data);
+}
+
+void
+nvpair_free(nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_list == NULL);
+
+	nvp->nvp_magic = 0;
+	switch (nvp->nvp_type) {
+	case NV_TYPE_DESCRIPTOR:
+		close((int)nvp->nvp_data);
+		break;
+	case NV_TYPE_NVLIST:
+		nvlist_destroy((nvlist_t *)(intptr_t)nvp->nvp_data);
+		break;
+	case NV_TYPE_STRING:
+		free((char *)(intptr_t)nvp->nvp_data);
+		break;
+	case NV_TYPE_BINARY:
+		free((void *)(intptr_t)nvp->nvp_data);
+		break;
+	}
+	free(nvp);
+}
+
+void
+nvpair_free_structure(nvpair_t *nvp)
+{
+
+	NVPAIR_ASSERT(nvp);
+	PJDLOG_ASSERT(nvp->nvp_list == NULL);
+
+	nvp->nvp_magic = 0;
+	free(nvp);
+}
+
+const char *
+nvpair_type_string(int type)
+{
+
+	switch (type) {
+	case NV_TYPE_NULL:
+		return ("NULL");
+	case NV_TYPE_BOOL:
+		return ("BOOL");
+	case NV_TYPE_NUMBER:
+		return ("NUMBER");
+	case NV_TYPE_STRING:
+		return ("STRING");
+	case NV_TYPE_NVLIST:
+		return ("NVLIST");
+	case NV_TYPE_DESCRIPTOR:
+		return ("DESCRIPTOR");
+	case NV_TYPE_BINARY:
+		return ("BINARY");
+	default:
+		return ("<UNKNOWN>");
+	}
+}
diff --git a/lib/libnv/nvpair_impl.h b/lib/libnv/nvpair_impl.h
new file mode 100644
index 00000000000..aa4046c2c3b
--- /dev/null
+++ b/lib/libnv/nvpair_impl.h
@@ -0,0 +1,58 @@
+/*-
+ * Copyright (c) 2009-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_NVPAIR_IMPL_H_
+#define	_NVPAIR_IMPL_H_
+
+#include <sys/queue.h>
+
+#include <stdint.h>
+
+#include "nv.h"
+
+TAILQ_HEAD(nvl_head, nvpair);
+
+void nvpair_assert(const nvpair_t *nvp);
+const 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);
+void nvpair_free_structure(nvpair_t *nvp);
+const char *nvpair_type_string(int type);
+
+#endif	/* !_NVPAIR_IMPL_H_ */
diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile
index f5cd4cd214e..0d81f183d5f 100644
--- a/lib/libpam/libpam/Makefile
+++ b/lib/libpam/libpam/Makefile
@@ -154,7 +154,7 @@ MLINKS=	pam.conf.5 pam.d.5
 CSTD?= c99
 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include
 CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR}
-CFLAGS+= -DOPENPAM_MODULES_DIR='"${PAM_MOD_DIR:C/\/*$//}/"'
+CFLAGS+= -DOPENPAM_MODULES_DIRECTORY='"${PAM_MOD_DIR:C/\/*$//}/"'
 CFLAGS+= -DHAVE_DLFUNC=1
 CFLAGS+= -DHAVE_FDLOPEN=1
 CFLAGS+= -DHAVE_FPURGE=1
diff --git a/lib/libpjdlog/Makefile b/lib/libpjdlog/Makefile
new file mode 100644
index 00000000000..a80b6298eda
--- /dev/null
+++ b/lib/libpjdlog/Makefile
@@ -0,0 +1,21 @@
+#
+# $FreeBSD$
+#
+
+SHLIBDIR?=	/lib
+
+.include <bsd.own.mk>
+
+LIB=		pjdlog
+SRCS=		pjdlog.c
+
+SHLIB_MAJOR=	0
+
+CFLAGS+=-I${.CURDIR}
+
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
+
+WARNS?=	6
+
+.include <bsd.lib.mk>
diff --git a/lib/libpjdlog/pjdlog.c b/lib/libpjdlog/pjdlog.c
new file mode 100644
index 00000000000..84615faccd2
--- /dev/null
+++ b/lib/libpjdlog/pjdlog.c
@@ -0,0 +1,809 @@
+/*-
+ * Copyright (c) 2009-2010 The FreeBSD Foundation
+ * Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <libutil.h>
+#include <limits.h>
+#include <printf.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <syslog.h>
+#include <unistd.h>
+
+#ifdef notyet
+#include <robustio.h>
+#endif
+
+#include "pjdlog.h"
+
+#ifndef	MAX
+#define	MAX(a, b)	((a) > (b) ? (a) : (b))
+#endif
+
+#define	PJDLOG_MAX_MSGSIZE	4096
+
+#define	PJDLOG_PREFIX_STACK	4
+#define	PJDLOG_PREFIX_MAXSIZE	128
+
+#define	PJDLOG_NEVER_INITIALIZED	0
+#define	PJDLOG_NOT_INITIALIZED		1
+#define	PJDLOG_INITIALIZED		2
+
+static int pjdlog_initialized = PJDLOG_NEVER_INITIALIZED;
+static int pjdlog_mode, pjdlog_debug_level, pjdlog_sock;
+static int pjdlog_prefix_current;
+static char pjdlog_prefix[PJDLOG_PREFIX_STACK][PJDLOG_PREFIX_MAXSIZE];
+
+static int
+pjdlog_printf_arginfo_humanized_number(const struct printf_info *pi __unused,
+    size_t n, int *argt)
+{
+
+	assert(n >= 1);
+	argt[0] = PA_INT | PA_FLAG_INTMAX;
+	return (1);
+}
+
+static int
+pjdlog_printf_render_humanized_number(struct __printf_io *io,
+    const struct printf_info *pi, const void * const *arg)
+{
+	char buf[5];
+	intmax_t num;
+	int ret;
+
+	num = *(const intmax_t *)arg[0];
+	humanize_number(buf, sizeof(buf), (int64_t)num, "", HN_AUTOSCALE,
+	    HN_NOSPACE | HN_DECIMAL);
+	ret = __printf_out(io, pi, buf, strlen(buf));
+	__printf_flush(io);
+	return (ret);
+}
+
+static int
+pjdlog_printf_arginfo_sockaddr(const struct printf_info *pi __unused,
+    size_t n, int *argt)
+{
+
+	assert(n >= 1);
+	argt[0] = PA_POINTER;
+	return (1);
+}
+
+static int
+pjdlog_printf_render_sockaddr_ip(struct __printf_io *io,
+    const struct printf_info *pi, const void * const *arg)
+{
+	const struct sockaddr_storage *ss;
+	char addr[MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN)];
+	int ret;
+
+	ss = *(const struct sockaddr_storage * const *)arg[0];
+	switch (ss->ss_family) {
+	case AF_INET:
+	    {
+		const struct sockaddr_in *sin;
+
+		sin = (const struct sockaddr_in *)ss;
+		if (inet_ntop(ss->ss_family, &sin->sin_addr, addr,
+		    sizeof(addr)) == NULL) {
+			PJDLOG_ABORT("inet_ntop(AF_INET) failed: %s.",
+			    strerror(errno));
+		}
+		break;
+	    }
+	case AF_INET6:
+	    {
+		const struct sockaddr_in6 *sin;
+
+		sin = (const struct sockaddr_in6 *)ss;
+		if (inet_ntop(ss->ss_family, &sin->sin6_addr, addr,
+		    sizeof(addr)) == NULL) {
+			PJDLOG_ABORT("inet_ntop(AF_INET6) failed: %s.",
+			    strerror(errno));
+		}
+		break;
+	    }
+	default:
+		snprintf(addr, sizeof(addr), "[unsupported family %hhu]",
+		    ss->ss_family);
+		break;
+	}
+	ret = __printf_out(io, pi, addr, strlen(addr));
+	__printf_flush(io);
+	return (ret);
+}
+
+static int
+pjdlog_printf_render_sockaddr(struct __printf_io *io,
+    const struct printf_info *pi, const void * const *arg)
+{
+	const struct sockaddr_storage *ss;
+	char buf[PATH_MAX];
+	int ret;
+
+	ss = *(const struct sockaddr_storage * const *)arg[0];
+	switch (ss->ss_family) {
+	case AF_UNIX:
+	    {
+		const struct sockaddr_un *sun;
+
+		sun = (const struct sockaddr_un *)ss;
+		if (sun->sun_path[0] == '\0')
+			snprintf(buf, sizeof(buf), "N/A");
+		else
+			snprintf(buf, sizeof(buf), "%s", sun->sun_path);
+		break;
+	    }
+	case AF_INET:
+	    {
+		char addr[INET_ADDRSTRLEN];
+		const struct sockaddr_in *sin;
+		unsigned int port;
+
+		sin = (const struct sockaddr_in *)ss;
+		port = ntohs(sin->sin_port);
+		if (inet_ntop(ss->ss_family, &sin->sin_addr, addr,
+		    sizeof(addr)) == NULL) {
+			PJDLOG_ABORT("inet_ntop(AF_INET) failed: %s.",
+			    strerror(errno));
+		}
+		snprintf(buf, sizeof(buf), "%s:%u", addr, port);
+		break;
+	    }
+	case AF_INET6:
+	    {
+		char addr[INET6_ADDRSTRLEN];
+		const struct sockaddr_in6 *sin;
+		unsigned int port;
+
+		sin = (const struct sockaddr_in6 *)ss;
+		port = ntohs(sin->sin6_port);
+		if (inet_ntop(ss->ss_family, &sin->sin6_addr, addr,
+		    sizeof(addr)) == NULL) {
+			PJDLOG_ABORT("inet_ntop(AF_INET6) failed: %s.",
+			    strerror(errno));
+		}
+		snprintf(buf, sizeof(buf), "[%s]:%u", addr, port);
+		break;
+	    }
+	default:
+		snprintf(buf, sizeof(buf), "[unsupported family %hhu]",
+		    ss->ss_family);
+		break;
+	}
+	ret = __printf_out(io, pi, buf, strlen(buf));
+	__printf_flush(io);
+	return (ret);
+}
+
+void
+pjdlog_init(int mode)
+{
+	int saved_errno;
+
+	assert(pjdlog_initialized == PJDLOG_NEVER_INITIALIZED ||
+	    pjdlog_initialized == PJDLOG_NOT_INITIALIZED);
+#ifdef notyet
+	assert(mode == PJDLOG_MODE_STD || mode == PJDLOG_MODE_SYSLOG ||
+	    mode == PJDLOG_MODE_SOCK);
+#else
+	assert(mode == PJDLOG_MODE_STD || mode == PJDLOG_MODE_SYSLOG);
+#endif
+
+	saved_errno = errno;
+
+	if (pjdlog_initialized == PJDLOG_NEVER_INITIALIZED) {
+		__use_xprintf = 1;
+		register_printf_render_std("T");
+		register_printf_render('N',
+		    pjdlog_printf_render_humanized_number,
+		    pjdlog_printf_arginfo_humanized_number);
+		register_printf_render('I',
+		    pjdlog_printf_render_sockaddr_ip,
+		    pjdlog_printf_arginfo_sockaddr);
+		register_printf_render('S',
+		    pjdlog_printf_render_sockaddr,
+		    pjdlog_printf_arginfo_sockaddr);
+	}
+
+	if (mode == PJDLOG_MODE_SYSLOG)
+		openlog(NULL, LOG_PID | LOG_NDELAY, LOG_LOCAL0);
+	pjdlog_mode = mode;
+	pjdlog_debug_level = 0;
+	pjdlog_prefix_current = 0;
+	pjdlog_prefix[0][0] = '\0';
+
+	pjdlog_initialized = PJDLOG_INITIALIZED;
+	pjdlog_sock = -1;
+
+	errno = saved_errno;
+}
+
+void
+pjdlog_fini(void)
+{
+	int saved_errno;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	saved_errno = errno;
+
+	if (pjdlog_mode == PJDLOG_MODE_SYSLOG)
+		closelog();
+
+	pjdlog_initialized = PJDLOG_NOT_INITIALIZED;
+	pjdlog_sock = -1;
+
+	errno = saved_errno;
+}
+
+/*
+ * Configure where the logs should go.
+ * By default they are send to stdout/stderr, but after going into background
+ * (eg. by calling daemon(3)) application is responsible for changing mode to
+ * PJDLOG_MODE_SYSLOG, so logs will be send to syslog.
+ */
+void
+pjdlog_mode_set(int mode)
+{
+	int saved_errno;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+#ifdef notyet
+	assert(mode == PJDLOG_MODE_STD || mode == PJDLOG_MODE_SYSLOG ||
+	    mode == PJDLOG_MODE_SOCK);
+#else
+	assert(mode == PJDLOG_MODE_STD || mode == PJDLOG_MODE_SYSLOG);
+#endif
+
+	if (pjdlog_mode == mode)
+		return;
+
+	saved_errno = errno;
+
+	if (mode == PJDLOG_MODE_SYSLOG)
+		openlog(NULL, LOG_PID | LOG_NDELAY, LOG_DAEMON);
+	else if (mode == PJDLOG_MODE_STD)
+		closelog();
+
+	if (mode != PJDLOG_MODE_SOCK)
+		pjdlog_sock = -1;
+
+	pjdlog_mode = mode;
+
+	errno = saved_errno;
+}
+
+
+/*
+ * Return current mode.
+ */
+int
+pjdlog_mode_get(void)
+{
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	return (pjdlog_mode);
+}
+
+#ifdef notyet
+/*
+ * Sets socket number to use for PJDLOG_MODE_SOCK mode.
+ */
+void
+pjdlog_sock_set(int sock)
+{
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+	assert(pjdlog_mode == PJDLOG_MODE_SOCK);
+	assert(sock >= 0);
+
+	pjdlog_sock = sock;
+}
+#endif
+
+#ifdef notyet
+/*
+ * Returns socket number used for PJDLOG_MODE_SOCK mode.
+ */
+int
+pjdlog_sock_get(void)
+{
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+	assert(pjdlog_mode == PJDLOG_MODE_SOCK);
+	assert(pjdlog_sock >= 0);
+
+	return (pjdlog_sock);
+}
+#endif
+
+/*
+ * Set debug level. All the logs above the level specified here will be
+ * ignored.
+ */
+void
+pjdlog_debug_set(int level)
+{
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+	assert(level >= 0);
+	assert(level <= 127);
+
+	pjdlog_debug_level = level;
+}
+
+/*
+ * Return current debug level.
+ */
+int
+pjdlog_debug_get(void)
+{
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	return (pjdlog_debug_level);
+}
+
+/*
+ * Set prefix that will be used before each log.
+ */
+void
+pjdlog_prefix_set(const char *fmt, ...)
+{
+	va_list ap;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	va_start(ap, fmt);
+	pjdlogv_prefix_set(fmt, ap);
+	va_end(ap);
+}
+
+/*
+ * Set prefix that will be used before each log.
+ */
+void
+pjdlogv_prefix_set(const char *fmt, va_list ap)
+{
+	int saved_errno;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+	assert(fmt != NULL);
+
+	saved_errno = errno;
+
+	vsnprintf(pjdlog_prefix[pjdlog_prefix_current],
+	    sizeof(pjdlog_prefix[pjdlog_prefix_current]), fmt, ap);
+
+	errno = saved_errno;
+}
+
+/*
+ * Get current prefix.
+ */
+const char *
+pjdlog_prefix_get(void)
+{
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	return (pjdlog_prefix[pjdlog_prefix_current]);
+}
+
+/*
+ * Set new prefix and put the current one on the stack.
+ */
+void
+pjdlog_prefix_push(const char *fmt, ...)
+{
+	va_list ap;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	va_start(ap, fmt);
+	pjdlogv_prefix_push(fmt, ap);
+	va_end(ap);
+}
+
+/*
+ * Set new prefix and put the current one on the stack.
+ */
+void
+pjdlogv_prefix_push(const char *fmt, va_list ap)
+{
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+	assert(pjdlog_prefix_current < PJDLOG_PREFIX_STACK - 1);
+
+	pjdlog_prefix_current++;
+
+	pjdlogv_prefix_set(fmt, ap);
+}
+
+/*
+ * Removes current prefix and recovers previous one from the stack.
+ */
+void
+pjdlog_prefix_pop(void)
+{
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+	assert(pjdlog_prefix_current > 0);
+
+	pjdlog_prefix_current--;
+}
+
+/*
+ * Convert log level into string.
+ */
+static const char *
+pjdlog_level_to_string(int loglevel)
+{
+
+	switch (loglevel) {
+	case LOG_EMERG:
+		return ("EMERG");
+	case LOG_ALERT:
+		return ("ALERT");
+	case LOG_CRIT:
+		return ("CRIT");
+	case LOG_ERR:
+		return ("ERROR");
+	case LOG_WARNING:
+		return ("WARNING");
+	case LOG_NOTICE:
+		return ("NOTICE");
+	case LOG_INFO:
+		return ("INFO");
+	case LOG_DEBUG:
+		return ("DEBUG");
+	}
+	assert(!"Invalid log level.");
+	abort();	/* XXX: gcc */
+}
+
+static int
+vsnprlcat(char *str, size_t size, const char *fmt, va_list ap)
+{
+	size_t len;
+
+	len = strlen(str);
+	assert(len < size);
+	return (vsnprintf(str + len, size - len, fmt, ap));
+}
+
+static int
+snprlcat(char *str, size_t size, const char *fmt, ...)
+{
+	va_list ap;
+	int result;
+
+	va_start(ap, fmt);
+	result = vsnprlcat(str, size, fmt, ap);
+	va_end(ap);
+	return (result);
+}
+
+static void
+pjdlogv_common_single_line(const char *func, const char *file, int line,
+    int loglevel, int debuglevel, int error, const char *msg)
+{
+	static char log[2 * PJDLOG_MAX_MSGSIZE];
+	char *logp;
+	size_t logs;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+#ifdef notyet
+	assert(pjdlog_mode == PJDLOG_MODE_STD ||
+	    pjdlog_mode == PJDLOG_MODE_SYSLOG ||
+	    pjdlog_mode == PJDLOG_MODE_SOCK);
+#else
+	assert(pjdlog_mode == PJDLOG_MODE_STD ||
+	    pjdlog_mode == PJDLOG_MODE_SYSLOG);
+#endif
+	assert(pjdlog_mode != PJDLOG_MODE_SOCK || pjdlog_sock >= 0);
+	assert(loglevel == LOG_EMERG || loglevel == LOG_ALERT ||
+	    loglevel == LOG_CRIT || loglevel == LOG_ERR ||
+	    loglevel == LOG_WARNING || loglevel == LOG_NOTICE ||
+	    loglevel == LOG_INFO || loglevel == LOG_DEBUG);
+	assert(loglevel != LOG_DEBUG || debuglevel > 0);
+	assert(loglevel != LOG_DEBUG || debuglevel <= pjdlog_debug_level);
+	assert(debuglevel <= 127);
+	assert(error >= -1);
+	assert((file != NULL && line > 0) ||
+	    (func == NULL && file == NULL && line == 0));
+
+	switch (pjdlog_mode) {
+	case PJDLOG_MODE_STD:
+	case PJDLOG_MODE_SYSLOG:
+		logp = log;
+		logs = sizeof(log);
+		break;
+	case PJDLOG_MODE_SOCK:
+		logp = log + 4;
+		logs = sizeof(log) - 4;
+		break;
+	default:
+		assert(!"Invalid mode.");
+	}
+
+	*logp = '\0';
+
+	if (pjdlog_mode != PJDLOG_MODE_SOCK) {
+		if (loglevel == LOG_DEBUG) {
+			/* Attach debuglevel if this is debug log. */
+			snprlcat(logp, logs, "[%s%d] ",
+			    pjdlog_level_to_string(loglevel), debuglevel);
+		} else {
+			snprlcat(logp, logs, "[%s] ",
+			    pjdlog_level_to_string(loglevel));
+		}
+		if (pjdlog_mode != PJDLOG_MODE_SYSLOG &&
+		    pjdlog_debug_level >= 1) {
+			snprlcat(logp, logs, "(pid=%d) ", getpid());
+		}
+	}
+	/* Attach file, func, line if debuglevel is 2 or more. */
+	if (pjdlog_debug_level >= 2 && file != NULL) {
+		if (func == NULL)
+			snprlcat(logp, logs, "(%s:%d) ", file, line);
+		else
+			snprlcat(logp, logs, "(%s:%d:%s) ", file, line, func);
+	}
+
+	if (pjdlog_mode != PJDLOG_MODE_SOCK) {
+		snprlcat(logp, logs, "%s",
+		    pjdlog_prefix[pjdlog_prefix_current]);
+	}
+
+	strlcat(logp, msg, logs);
+
+	/* Attach error description. */
+	if (error != -1)
+		snprlcat(logp, logs, ": %s.", strerror(error));
+
+	switch (pjdlog_mode) {
+	case PJDLOG_MODE_STD:
+		fprintf(stderr, "%s\n", logp);
+		fflush(stderr);
+		break;
+	case PJDLOG_MODE_SYSLOG:
+		syslog(loglevel, "%s", logp);
+		break;
+#ifdef notyet
+	case PJDLOG_MODE_SOCK:
+	    {
+		char ack[2];
+		uint16_t dlen;
+
+		log[2] = loglevel;
+		log[3] = debuglevel;
+		dlen = strlen(logp) + 3;	/* +3 = loglevel, debuglevel and terminating \0 */
+		bcopy(&dlen, log, sizeof(dlen));
+		if (robust_send(pjdlog_sock, log, (size_t)dlen + 2) == -1)	/* +2 for size */
+			assert(!"Unable to send log.");
+		if (robust_recv(pjdlog_sock, ack, sizeof(ack)) == -1)
+			assert(!"Unable to send log.");
+		break;
+	    }
+#endif
+	default:
+		assert(!"Invalid mode.");
+	}
+}
+
+/*
+ * Common log routine, which can handle regular log level as well as debug
+ * level. We decide here where to send the logs (stdout/stderr or syslog).
+ */
+void
+_pjdlogv_common(const char *func, const char *file, int line, int loglevel,
+    int debuglevel, int error, const char *fmt, va_list ap)
+{
+	char log[PJDLOG_MAX_MSGSIZE];
+	char *logp, *curline;
+	const char *prvline;
+	int saved_errno;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+	assert(pjdlog_mode == PJDLOG_MODE_STD ||
+	    pjdlog_mode == PJDLOG_MODE_SYSLOG ||
+	    pjdlog_mode == PJDLOG_MODE_SOCK);
+	assert(pjdlog_mode != PJDLOG_MODE_SOCK || pjdlog_sock >= 0);
+	assert(loglevel == LOG_EMERG || loglevel == LOG_ALERT ||
+	    loglevel == LOG_CRIT || loglevel == LOG_ERR ||
+	    loglevel == LOG_WARNING || loglevel == LOG_NOTICE ||
+	    loglevel == LOG_INFO || loglevel == LOG_DEBUG);
+	assert(loglevel != LOG_DEBUG || debuglevel > 0);
+	assert(debuglevel <= 127);
+	assert(error >= -1);
+
+	/* Ignore debug above configured level. */
+	if (loglevel == LOG_DEBUG && debuglevel > pjdlog_debug_level)
+		return;
+
+	saved_errno = errno;
+
+	vsnprintf(log, sizeof(log), fmt, ap);
+	logp = log;
+	prvline = NULL;
+
+	while ((curline = strsep(&logp, "\n")) != NULL) {
+		if (*curline == '\0')
+			continue;
+		if (prvline != NULL) {
+			pjdlogv_common_single_line(func, file, line, loglevel,
+			    debuglevel, -1, prvline);
+		}
+		prvline = curline;
+	}
+	if (prvline == NULL)
+		prvline = "";
+	pjdlogv_common_single_line(func, file, line, loglevel, debuglevel,
+	    error, prvline);
+
+	errno = saved_errno;
+}
+
+/*
+ * Common log routine.
+ */
+void
+_pjdlog_common(const char *func, const char *file, int line, int loglevel,
+    int debuglevel, int error, const char *fmt, ...)
+{
+	va_list ap;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	va_start(ap, fmt);
+	_pjdlogv_common(func, file, line, loglevel, debuglevel, error, fmt, ap);
+	va_end(ap);
+}
+
+/*
+ * Log error, errno and exit.
+ */
+void
+_pjdlogv_exit(const char *func, const char *file, int line, int exitcode,
+    int error, const char *fmt, va_list ap)
+{
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	_pjdlogv_common(func, file, line, exitcode == 0 ? LOG_INFO : LOG_ERR, 0,
+	    error, fmt, ap);
+	exit(exitcode);
+	/* NOTREACHED */
+}
+
+/*
+ * Log error, errno and exit.
+ */
+void
+_pjdlog_exit(const char *func, const char *file, int line, int exitcode,
+    int error, const char *fmt, ...)
+{
+	va_list ap;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	va_start(ap, fmt);
+	_pjdlogv_exit(func, file, line, exitcode, error, fmt, ap);
+	/* NOTREACHED */
+	va_end(ap);
+}
+
+/*
+ * Log failure message and exit.
+ */
+void
+_pjdlog_abort(const char *func, const char *file, int line,
+    int error, const char *failedexpr, const char *fmt, ...)
+{
+	va_list ap;
+
+	assert(pjdlog_initialized == PJDLOG_INITIALIZED);
+
+	/*
+	 * Set pjdlog_debug_level to 2, so that file, line and func are
+	 * included in log. This is fine as we will exit anyway.
+	 */
+	if (pjdlog_debug_level < 2)
+		pjdlog_debug_level = 2;
+
+	/*
+	 * When there is no message we pass __func__ as 'fmt'.
+	 * It would be cleaner to pass NULL or "", but gcc generates a warning
+	 * for both of those.
+	 */
+	if (fmt != func) {
+		va_start(ap, fmt);
+		_pjdlogv_common(func, file, line, LOG_CRIT, 0, -1, fmt, ap);
+		va_end(ap);
+	}
+	if (failedexpr == NULL) {
+		_pjdlog_common(func, file, line, LOG_CRIT, 0, -1, "Aborted.");
+	} else {
+		_pjdlog_common(func, file, line, LOG_CRIT, 0, -1,
+		    "Assertion failed: (%s).", failedexpr);
+	}
+	if (error != -1)
+		_pjdlog_common(func, file, line, LOG_CRIT, 0, error, "Errno");
+	abort();
+}
+
+#ifdef notyet
+/*
+ * Receive log from the given socket.
+ */
+int
+pjdlog_receive(int sock)
+{
+	char log[PJDLOG_MAX_MSGSIZE];
+	int loglevel, debuglevel;
+	uint16_t dlen;
+
+	if (robust_recv(sock, &dlen, sizeof(dlen)) == -1)
+		return (-1);
+
+	PJDLOG_ASSERT(dlen > 0);
+	PJDLOG_ASSERT(dlen <= PJDLOG_MAX_MSGSIZE - 3);
+
+	if (robust_recv(sock, log, (size_t)dlen) == -1)
+		return (-1);
+
+	log[dlen - 1] = '\0';
+	loglevel = log[0];
+	debuglevel = log[1];
+	_pjdlog_common(NULL, NULL, 0, loglevel, debuglevel, -1, "%s", log + 2);
+
+	if (robust_send(sock, "ok", 2) == -1)
+		return (-1);
+
+	return (0);
+}
+#endif
diff --git a/lib/libpjdlog/pjdlog.h b/lib/libpjdlog/pjdlog.h
new file mode 100644
index 00000000000..3f38b108b5c
--- /dev/null
+++ b/lib/libpjdlog/pjdlog.h
@@ -0,0 +1,174 @@
+/*-
+ * Copyright (c) 2009-2010 The FreeBSD Foundation
+ * Copyright (c) 2011 Pawel Jakub Dawidek <pjd@FreeBSD.org>
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef	_PJDLOG_H_
+#define	_PJDLOG_H_
+
+#include <sys/cdefs.h>
+
+#include <errno.h>
+#include <stdarg.h>
+#include <sysexits.h>
+#include <syslog.h>
+
+#define	PJDLOG_MODE_STD		0
+#define	PJDLOG_MODE_SYSLOG	1
+#define	PJDLOG_MODE_SOCK	2
+
+void pjdlog_init(int mode);
+void pjdlog_fini(void);
+
+void pjdlog_mode_set(int mode);
+int pjdlog_mode_get(void);
+
+#ifdef notyet
+void pjdlog_sock_set(int sock);
+int pjdlog_sock_get(void);
+#endif
+
+void pjdlog_debug_set(int level);
+int pjdlog_debug_get(void);
+
+void pjdlog_prefix_set(const char *fmt, ...) __printflike(1, 2);
+void pjdlogv_prefix_set(const char *fmt, va_list ap) __printflike(1, 0);
+const char *pjdlog_prefix_get(void);
+void pjdlog_prefix_push(const char *fmt, ...) __printflike(1, 2);
+void pjdlogv_prefix_push(const char *fmt, va_list ap) __printflike(1, 0);
+void pjdlog_prefix_pop(void);
+
+void _pjdlogv_common(const char *func, const char *file, int line, int loglevel,
+    int debuglevel, int error, const char *fmt, va_list ap) __printflike(7, 0);
+void _pjdlog_common(const char *func, const char *file, int line, int loglevel,
+    int debuglevel, int error, const char *fmt, ...) __printflike(7, 8);
+
+void _pjdlogv_exit(const char *func, const char *file, int line, int exitcode,
+    int error, const char *fmt, va_list ap) __printflike(6, 0) __dead2;
+void _pjdlog_exit(const char *func, const char *file, int line, int exitcode,
+    int error, const char *fmt, ...) __printflike(6, 7) __dead2;
+
+void _pjdlog_abort(const char *func, const char *file, int line, int error,
+    const char *failedexpr, const char *fmt, ...) __printflike(6, 7) __dead2;
+
+#ifdef notyet
+int pjdlog_receive(int sock);
+#endif
+
+#define	pjdlogv_common(loglevel, debuglevel, error, fmt, ap)		\
+	_pjdlogv_common(__func__, __FILE__, __LINE__, (loglevel),	\
+	    (debuglevel), (error), (fmt), (ap))
+#define	pjdlog_common(loglevel, debuglevel, error, ...)			\
+	_pjdlog_common(__func__, __FILE__, __LINE__, (loglevel),	\
+	    (debuglevel), (error), __VA_ARGS__)
+
+#define	pjdlogv(loglevel, fmt, ap)					\
+	pjdlogv_common((loglevel), 0, -1, (fmt), (ap))
+#define	pjdlog(loglevel, ...)						\
+	pjdlog_common((loglevel), 0, -1, __VA_ARGS__)
+
+#define	pjdlogv_emergency(fmt, ap)	pjdlogv(LOG_EMERG, (fmt), (ap))
+#define	pjdlog_emergency(...)		pjdlog(LOG_EMERG, __VA_ARGS__)
+#define	pjdlogv_alert(fmt, ap)		pjdlogv(LOG_ALERT, (fmt), (ap))
+#define	pjdlog_alert(...)		pjdlog(LOG_ALERT, __VA_ARGS__)
+#define	pjdlogv_critical(fmt, ap)	pjdlogv(LOG_CRIT, (fmt), (ap))
+#define	pjdlog_critical(...)		pjdlog(LOG_CRIT, __VA_ARGS__)
+#define	pjdlogv_error(fmt, ap)		pjdlogv(LOG_ERR, (fmt), (ap))
+#define	pjdlog_error(...)		pjdlog(LOG_ERR, __VA_ARGS__)
+#define	pjdlogv_warning(fmt, ap)	pjdlogv(LOG_WARNING, (fmt), (ap))
+#define	pjdlog_warning(...)		pjdlog(LOG_WARNING, __VA_ARGS__)
+#define	pjdlogv_notice(fmt, ap)		pjdlogv(LOG_NOTICE, (fmt), (ap))
+#define	pjdlog_notice(...)		pjdlog(LOG_NOTICE, __VA_ARGS__)
+#define	pjdlogv_info(fmt, ap)		pjdlogv(LOG_INFO, (fmt), (ap))
+#define	pjdlog_info(...)		pjdlog(LOG_INFO, __VA_ARGS__)
+
+#define	pjdlog_debug(debuglevel, ...)					\
+	pjdlog_common(LOG_DEBUG, (debuglevel), -1, __VA_ARGS__)
+#define	pjdlogv_debug(debuglevel, fmt, ap)				\
+	pjdlogv_common(LOG_DEBUG, (debuglevel), -1, (fmt), (ap))
+
+#define	pjdlog_errno(loglevel, ...)					\
+	pjdlog_common((loglevel), 0, (errno), __VA_ARGS__)
+#define	pjdlogv_errno(loglevel, fmt, ap)				\
+	pjdlogv_common((loglevel), 0, (errno), (fmt), (ap))
+
+#define	pjdlogv_exit(exitcode, fmt, ap)					\
+	_pjdlogv_exit(__func__, __FILE__, __LINE__, (exitcode),		\
+	    (errno), (fmt), (ap))
+#define	pjdlog_exit(exitcode, ...)					\
+	_pjdlog_exit(__func__, __FILE__, __LINE__, (exitcode), (errno),	\
+	    __VA_ARGS__)
+
+#define	pjdlogv_exitx(exitcode, fmt, ap)				\
+	_pjdlogv_exit(__func__, __FILE__, __LINE__, (exitcode), -1,	\
+	    (fmt), (ap))
+#define	pjdlog_exitx(exitcode, ...)					\
+	_pjdlog_exit(__func__, __FILE__, __LINE__, (exitcode), -1,	\
+	    __VA_ARGS__)
+
+#define	PJDLOG_VERIFY(expr)	do {					\
+	if (!(expr)) {							\
+		_pjdlog_abort(__func__, __FILE__, __LINE__, -1, #expr,	\
+		    __func__);						\
+	}								\
+} while (0)
+#define	PJDLOG_RVERIFY(expr, ...)	do {				\
+	if (!(expr)) {							\
+		_pjdlog_abort(__func__, __FILE__, __LINE__, -1, #expr,	\
+		    __VA_ARGS__);					\
+	}								\
+} while (0)
+#define	PJDLOG_EVERIFY(expr)		do {				\
+	if (!(expr)) {							\
+		_pjdlog_abort(__func__, __FILE__, __LINE__, errno,	\
+		    #expr, __func__);					\
+	}								\
+} while (0)
+#define	PJDLOG_ABORT(...)	_pjdlog_abort(__func__, __FILE__,	\
+				    __LINE__, -1, NULL, __VA_ARGS__)
+#ifdef NDEBUG
+#define	PJDLOG_ASSERT(expr)	do { } while (0)
+#define	PJDLOG_RASSERT(...)	do { } while (0)
+#else
+#define	PJDLOG_ASSERT(expr)	do {					\
+	if (!(expr)) {							\
+		_pjdlog_abort(__func__, __FILE__, __LINE__, -1, #expr,	\
+		    __func__);						\
+	}								\
+} while (0)
+#define	PJDLOG_RASSERT(expr, ...)	do {				\
+	if (!(expr)) {							\
+		_pjdlog_abort(__func__, __FILE__, __LINE__, -1, #expr,	\
+		    __VA_ARGS__);					\
+	}								\
+} while (0)
+#endif
+
+#endif	/* !_PJDLOG_H_ */
diff --git a/lib/libpmc/pmc.h b/lib/libpmc/pmc.h
index e17a5840b4e..81672d21d56 100644
--- a/lib/libpmc/pmc.h
+++ b/lib/libpmc/pmc.h
@@ -30,6 +30,7 @@
 #define _PMC_H_
 
 #include <sys/cdefs.h>
+#include <sys/types.h>
 #include <sys/pmc.h>
 
 /*
diff --git a/lib/libproc/_libproc.h b/lib/libproc/_libproc.h
index aee1ac1f67f..8099ba1d917 100644
--- a/lib/libproc/_libproc.h
+++ b/lib/libproc/_libproc.h
@@ -49,7 +49,9 @@ struct proc_handle {
 };
 
 #ifdef DEBUG
-#define DPRINTF(fmt, ...) 	warn(fmt, __VA_ARGS__)
+#define	DPRINTF(...) 	warn(__VA_ARGS__)
+#define	DPRINTFX(...)	warnx(__VA_ARGS__)
 #else
-#define DPRINTF(fmt, ...)
+#define	DPRINTF(...)    do { } while (0)
+#define	DPRINTFX(...)   do { } while (0)
 #endif
diff --git a/lib/libproc/proc_bkpt.c b/lib/libproc/proc_bkpt.c
index c15e53ce38d..2c2761acc99 100644
--- a/lib/libproc/proc_bkpt.c
+++ b/lib/libproc/proc_bkpt.c
@@ -37,8 +37,9 @@ __FBSDID("$FreeBSD$");
 
 #include <assert.h>
 #include <err.h>
-#include <stdio.h>
 #include <errno.h>
+#include <signal.h>
+#include <stdio.h>
 #include "_libproc.h"
 
 #if defined(__i386__) || defined(__amd64__)
@@ -54,12 +55,39 @@ __FBSDID("$FreeBSD$");
 #error "Add support for your architecture"
 #endif
 
+static void
+proc_cont(struct proc_handle *phdl)
+{
+
+	ptrace(PT_CONTINUE, proc_getpid(phdl), (caddr_t)1, 0);
+}
+
+static int
+proc_stop(struct proc_handle *phdl)
+{
+	int status;
+
+	if (kill(proc_getpid(phdl), SIGSTOP) == -1) {
+		DPRINTF("kill %d", proc_getpid(phdl));
+		return (-1);
+	} else if (waitpid(proc_getpid(phdl), &status, WSTOPPED) == -1) {
+		DPRINTF("waitpid %d", proc_getpid(phdl));
+		return (-1);
+	} else if (!WIFSTOPPED(status)) {
+		DPRINTFX("waitpid: unexpected status 0x%x", status);
+		return (-1);
+	}
+
+	return (0);
+}
+
 int
 proc_bkptset(struct proc_handle *phdl, uintptr_t address,
     unsigned long *saved)
 {
 	struct ptrace_io_desc piod;
 	unsigned long paddr, caddr;
+	int ret = 0;
 
 	*saved = 0;
 	if (phdl->status == PS_DEAD || phdl->status == PS_UNDEAD ||
@@ -68,6 +96,12 @@ proc_bkptset(struct proc_handle *phdl, uintptr_t address,
 		return (-1);
 	}
 
+	DPRINTFX("adding breakpoint at 0x%lx", address);
+
+	if (phdl->status != PS_STOP)
+		if (proc_stop(phdl) != 0)
+			return (-1);
+
 	/*
 	 * Read the original instruction.
 	 */
@@ -78,9 +112,10 @@ proc_bkptset(struct proc_handle *phdl, uintptr_t address,
 	piod.piod_addr = &paddr;
 	piod.piod_len  = BREAKPOINT_INSTR_SZ;
 	if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
-		DPRINTF("ERROR: couldn't read instruction at address 0x%" PRIuPTR,
-		    address);
-		return (-1);
+		DPRINTF("ERROR: couldn't read instruction at address 0x%"
+		    PRIuPTR, address);
+		ret = -1;
+		goto done;
 	}
 	*saved = paddr;
 	/*
@@ -93,12 +128,18 @@ proc_bkptset(struct proc_handle *phdl, uintptr_t address,
 	piod.piod_addr = &paddr;
 	piod.piod_len  = BREAKPOINT_INSTR_SZ;
 	if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
-		warn("ERROR: couldn't write instruction at address 0x%" PRIuPTR,
-		    address);
-		return (-1);
+		DPRINTF("ERROR: couldn't write instruction at address 0x%"
+		    PRIuPTR, address);
+		ret = -1;
+		goto done;
 	}
 
-	return (0);
+done:
+	if (phdl->status != PS_STOP)
+		/* Restart the process if we had to stop it. */
+		proc_cont(phdl);
+
+	return (ret);
 }
 
 int
@@ -107,13 +148,20 @@ proc_bkptdel(struct proc_handle *phdl, uintptr_t address,
 {
 	struct ptrace_io_desc piod;
 	unsigned long paddr, caddr;
+	int ret = 0;
 
 	if (phdl->status == PS_DEAD || phdl->status == PS_UNDEAD ||
 	    phdl->status == PS_IDLE) {
 		errno = ENOENT;
 		return (-1);
 	}
-	DPRINTF("removing breakpoint at 0x%lx\n", address);
+
+	DPRINTFX("removing breakpoint at 0x%lx", address);
+
+	if (phdl->status != PS_STOP)
+		if (proc_stop(phdl) != 0)
+			return (-1);
+
 	/*
 	 * Overwrite the breakpoint instruction that we setup previously.
 	 */
@@ -124,12 +172,16 @@ proc_bkptdel(struct proc_handle *phdl, uintptr_t address,
 	piod.piod_addr = &paddr;
 	piod.piod_len  = BREAKPOINT_INSTR_SZ;
 	if (ptrace(PT_IO, proc_getpid(phdl), (caddr_t)&piod, 0) < 0) {
-		DPRINTF("ERROR: couldn't write instruction at address 0x%" PRIuPTR,
-		    address);
-		return (-1);
+		DPRINTF("ERROR: couldn't write instruction at address 0x%"
+		    PRIuPTR, address);
+		ret = -1;
 	}
+
+	if (phdl->status != PS_STOP)
+		/* Restart the process if we had to stop it. */
+		proc_cont(phdl);
  
-	return (0);
+	return (ret);
 }
 
 /*
@@ -153,12 +205,12 @@ proc_bkptexec(struct proc_handle *phdl, unsigned long saved)
 	int status;
 
 	if (proc_regget(phdl, REG_PC, &pc) < 0) {
-		warn("ERROR: couldn't get PC register");
+		DPRINTFX("ERROR: couldn't get PC register");
 		return (-1);
 	}
 	proc_bkptregadj(&pc);
 	if (proc_bkptdel(phdl, pc, saved) < 0) {
-		warn("ERROR: couldn't delete breakpoint");
+		DPRINTFX("ERROR: couldn't delete breakpoint");
 		return (-1);
 	}
 	/*
@@ -167,13 +219,13 @@ proc_bkptexec(struct proc_handle *phdl, unsigned long saved)
 	 */
 	proc_regset(phdl, REG_PC, pc);
 	if (ptrace(PT_STEP, proc_getpid(phdl), (caddr_t)1, 0) < 0) {
-		warn("ERROR: ptrace step failed");
+		DPRINTFX("ERROR: ptrace step failed");
 		return (-1);
 	}
 	proc_wstatus(phdl);
 	status = proc_getwstat(phdl);
 	if (!WIFSTOPPED(status)) {
-		warn("ERROR: don't know why process stopped");
+		DPRINTFX("ERROR: don't know why process stopped");
 		return (-1);
 	}
 	/*
@@ -181,7 +233,7 @@ proc_bkptexec(struct proc_handle *phdl, unsigned long saved)
 	 * the same as the one that we were passed in.
 	 */
 	if (proc_bkptset(phdl, pc, &samesaved) < 0) {
-		warn("ERROR: couldn't restore breakpoint");
+		DPRINTFX("ERROR: couldn't restore breakpoint");
 		return (-1);
 	}
 	assert(samesaved == saved);
diff --git a/lib/libproc/proc_create.c b/lib/libproc/proc_create.c
index 9bd24a232b2..d02eccf0d14 100644
--- a/lib/libproc/proc_create.c
+++ b/lib/libproc/proc_create.c
@@ -75,7 +75,7 @@ proc_attach(pid_t pid, int flags, struct proc_handle **pphdl)
 
 	/* Check for an unexpected status. */
 	if (WIFSTOPPED(status) == 0)
-		DPRINTF("ERROR: child process %d status 0x%x", pid, status);
+		DPRINTFX("ERROR: child process %d status 0x%x", pid, status);
 	else
 		phdl->status = PS_STOP;
 
@@ -130,14 +130,14 @@ proc_create(const char *file, char * const *argv, proc_child_func *pcf,
 		/* Wait for the child process to stop. */
 		if (waitpid(pid, &status, WUNTRACED) == -1) {
 			error = errno;
-                	DPRINTF("ERROR: child process %d didn't stop as expected", pid);
+			DPRINTF("ERROR: child process %d didn't stop as expected", pid);
 			goto bad;
 		}
 
 		/* Check for an unexpected status. */
 		if (WIFSTOPPED(status) == 0) {
 			error = errno;
-                	DPRINTF("ERROR: child process %d status 0x%x", pid, status);
+			DPRINTFX("ERROR: child process %d status 0x%x", pid, status);
 			goto bad;
 		} else
 			phdl->status = PS_STOP;
diff --git a/lib/libproc/proc_regs.c b/lib/libproc/proc_regs.c
index aac012555a4..145c8fe3fbb 100644
--- a/lib/libproc/proc_regs.c
+++ b/lib/libproc/proc_regs.c
@@ -76,7 +76,7 @@ proc_regget(struct proc_handle *phdl, proc_reg_t reg, unsigned long *regvalue)
 #endif
 		break;
 	default:
-		warn("ERROR: no support for reg number %d", reg);
+		DPRINTFX("ERROR: no support for reg number %d", reg);
 		return (-1);
 	}
 
@@ -119,7 +119,7 @@ proc_regset(struct proc_handle *phdl, proc_reg_t reg, unsigned long regvalue)
 #endif
 		break;
 	default:
-		warn("ERROR: no support for reg number %d", reg);
+		DPRINTFX("ERROR: no support for reg number %d", reg);
 		return (-1);
 	}
 	if (ptrace(PT_SETREGS, proc_getpid(phdl), (caddr_t)&regs, 0) < 0)
diff --git a/lib/libproc/proc_sym.c b/lib/libproc/proc_sym.c
index 2dd21fee564..f848040c7ee 100644
--- a/lib/libproc/proc_sym.c
+++ b/lib/libproc/proc_sym.c
@@ -238,16 +238,16 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
 
 	if ((map = proc_addr2map(p, addr)) == NULL)
 		return (-1);
-	if (!map->pr_mapname || (fd = open(map->pr_mapname, O_RDONLY, 0)) < 0) {
-		warn("ERROR: open %s failed", map->pr_mapname);
+	if ((fd = open(map->pr_mapname, O_RDONLY, 0)) < 0) {
+		DPRINTF("ERROR: open %s failed", map->pr_mapname);
 		goto err0;
 	}
 	if ((e = elf_begin(fd, ELF_C_READ, NULL)) == NULL) {
-		warn("ERROR: elf_begin() failed");
+		DPRINTFX("ERROR: elf_begin() failed: %s", elf_errmsg(-1));
 		goto err1;
 	}
 	if (gelf_getehdr(e, &ehdr) == NULL) {
-		warn("ERROR: gelf_getehdr() failed");
+		DPRINTFX("ERROR: gelf_getehdr() failed: %s", elf_errmsg(-1));
 		goto err2;
 	}
 	/*
@@ -275,7 +275,7 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
 	 * Then look up the string name in STRTAB (.dynstr)
 	 */
 	if ((data = elf_getdata(dynsymscn, NULL)) == NULL) {
-		DPRINTF("ERROR: elf_getdata() failed");
+		DPRINTFX("ERROR: elf_getdata() failed: %s", elf_errmsg(-1));
 		goto symtab;
 	}
 	i = 0;
@@ -284,8 +284,11 @@ proc_addr2sym(struct proc_handle *p, uintptr_t addr, char *name,
 		 * Calculate the address mapped to the virtual memory
 		 * by rtld.
 		 */
-		rsym = map->pr_vaddr + sym.st_value;
-		if (addr >= rsym && addr <= (rsym + sym.st_size)) {
+		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) {
 				if (s[0] == '_' && s[1] == 'Z' && s[2])
@@ -309,10 +312,8 @@ symtab:
 	 * Iterate over the Symbols Table to find the symbol.
 	 * Then look up the string name in STRTAB (.dynstr)
 	 */
-	if (symtabscn == NULL)
-		goto err2;
 	if ((data = elf_getdata(symtabscn, NULL)) == NULL) {
-		DPRINTF("ERROR: elf_getdata() failed");
+		DPRINTFX("ERROR: elf_getdata() failed: %s", elf_errmsg(-1));
 		goto err2;
 	}
 	i = 0;
@@ -325,7 +326,7 @@ symtab:
 			rsym = map->pr_vaddr + sym.st_value;
 		else
 			rsym = sym.st_value;
-		if (addr >= rsym && addr <= (rsym + sym.st_size)) {
+		if (addr >= rsym && addr < rsym + sym.st_size) {
 			s = elf_strptr(e, symtabstridx, sym.st_name);
 			if (s) {
 				if (s[0] == '_' && s[1] == 'Z' && s[2])
@@ -420,7 +421,7 @@ proc_name2sym(struct proc_handle *p, const char *object, const char *symbol,
 	unsigned long symtabstridx = 0, dynsymstridx = 0;
 
 	if ((map = proc_name2map(p, object)) == NULL) {
-		DPRINTF("ERROR: couldn't find object %s", object);
+		DPRINTFX("ERROR: couldn't find object %s", object);
 		goto err0;
 	}
 	if ((fd = open(map->pr_mapname, O_RDONLY, 0)) < 0) {
@@ -428,11 +429,11 @@ proc_name2sym(struct proc_handle *p, const char *object, const char *symbol,
 		goto err0;
 	}
 	if ((e = elf_begin(fd, ELF_C_READ, NULL)) == NULL) {
-		warn("ERROR: elf_begin() failed");
+		DPRINTFX("ERROR: elf_begin() failed: %s", elf_errmsg(-1));
 		goto err1;
 	}
 	if (gelf_getehdr(e, &ehdr) == NULL) {
-		warn("ERROR: gelf_getehdr() failed");
+		DPRINTFX("ERROR: gelf_getehdr() failed: %s", elf_errmsg(-1));
 		goto err2;
 	}
 	/*
@@ -460,13 +461,13 @@ proc_name2sym(struct proc_handle *p, const char *object, const char *symbol,
 	 * Then look up the string name in STRTAB (.dynstr)
 	 */
 	if ((data = elf_getdata(dynsymscn, NULL))) {
-		DPRINTF("ERROR: elf_getdata() failed");
 		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));
-				symcopy->st_value = map->pr_vaddr + sym.st_value;
+				if (ehdr.e_type != ET_EXEC)
+					symcopy->st_value += map->pr_vaddr;
 				error = 0;
 				goto out;
 			}
@@ -476,20 +477,21 @@ proc_name2sym(struct proc_handle *p, const char *object, const char *symbol,
 	 * Iterate over the Symbols Table to find the symbol.
 	 * Then look up the string name in STRTAB (.dynstr)
 	 */
-	if (symtabscn == NULL)
-		goto err2;
 	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;
 			}
 		}
 	}
 out:
+	DPRINTFX("found addr 0x%lx for %s", symcopy->st_value, symbol);
 err2:
 	elf_end(e);
 err1:
@@ -510,6 +512,7 @@ proc_iter_symbyaddr(struct proc_handle *p, const char *object, int which,
 	prmap_t *map;
 	Elf_Scn *scn, *foundscn = NULL;
 	Elf_Data *data;
+	GElf_Ehdr ehdr;
 	GElf_Shdr shdr;
 	GElf_Sym sym;
 	unsigned long stridx = -1;
@@ -519,13 +522,17 @@ proc_iter_symbyaddr(struct proc_handle *p, const char *object, int which,
 	if ((map = proc_name2map(p, object)) == NULL)
 		return (-1);
 	if ((fd = open(map->pr_mapname, O_RDONLY)) < 0) {
-		warn("ERROR: open %s failed", map->pr_mapname);
+		DPRINTF("ERROR: open %s failed", map->pr_mapname);
 		goto err0;
 	}
 	if ((e = elf_begin(fd, ELF_C_READ, NULL)) == NULL) {
-		warn("ERROR: elf_begin() failed");
+		DPRINTFX("ERROR: elf_begin() failed: %s", elf_errmsg(-1));
 		goto err1;
 	}
+	if (gelf_getehdr(e, &ehdr) == NULL) {
+		DPRINTFX("ERROR: gelf_getehdr() failed: %s", elf_errmsg(-1));
+		goto err2;
+	}
 	/*
 	 * Find the section we are looking for.
 	 */
@@ -546,7 +553,7 @@ proc_iter_symbyaddr(struct proc_handle *p, const char *object, int which,
 		return (-1);
 	stridx = shdr.sh_link;
 	if ((data = elf_getdata(foundscn, NULL)) == NULL) {
-		DPRINTF("ERROR: elf_getdata() failed");
+		DPRINTFX("ERROR: elf_getdata() failed: %s", elf_errmsg(-1));
 		goto err2;
 	}
 	i = 0;
@@ -576,7 +583,8 @@ proc_iter_symbyaddr(struct proc_handle *p, const char *object, int which,
 		    (mask & TYPE_FILE) == 0)
 			continue;
 		s = elf_strptr(e, stridx, sym.st_name);
-		sym.st_value += map->pr_vaddr;
+		if (ehdr.e_type != ET_EXEC)
+			sym.st_value += map->pr_vaddr;
 		(*func)(cd, &sym, s);
 	}
 	error = 0;
diff --git a/lib/libproc/proc_util.c b/lib/libproc/proc_util.c
index 089095e9ed5..1c3d5229c9f 100644
--- a/lib/libproc/proc_util.c
+++ b/lib/libproc/proc_util.c
@@ -146,7 +146,7 @@ proc_wstatus(struct proc_handle *phdl)
 		return (-1);
 	if (waitpid(phdl->pid, &status, WUNTRACED) < 0) {
 		if (errno != EINTR)
-			warn("waitpid");
+			DPRINTF("waitpid");
 		return (-1);
 	}
 	if (WIFSTOPPED(status))
diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c
index 9056151e2b4..e1ec7af0fb2 100644
--- a/lib/libprocstat/libprocstat.c
+++ b/lib/libprocstat/libprocstat.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/ksem.h>
 #include <sys/mman.h>
+#include <sys/capability.h>
 #define	_KERNEL
 #include <sys/mount.h>
 #include <sys/pipe.h>
@@ -395,7 +396,10 @@ filestat_new_entry(void *typedep, int type, int fd, int fflags, int uflags,
 	entry->fs_ref_count = refcount;
 	entry->fs_offset = offset;
 	entry->fs_path = path;
-	entry->fs_cap_rights = *cap_rightsp;
+	if (cap_rightsp != NULL)
+		entry->fs_cap_rights = *cap_rightsp;
+	else
+		cap_rights_init(&entry->fs_cap_rights);
 	return (entry);
 }
 
@@ -478,21 +482,21 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap
 	/* root directory vnode, if one. */
 	if (filed.fd_rdir) {
 		entry = filestat_new_entry(filed.fd_rdir, PS_FST_TYPE_VNODE, -1,
-		    PS_FST_FFLAG_READ, PS_FST_UFLAG_RDIR, 0, 0, NULL, 0);
+		    PS_FST_FFLAG_READ, PS_FST_UFLAG_RDIR, 0, 0, NULL, NULL);
 		if (entry != NULL)
 			STAILQ_INSERT_TAIL(head, entry, next);
 	}
 	/* current working directory vnode. */
 	if (filed.fd_cdir) {
 		entry = filestat_new_entry(filed.fd_cdir, PS_FST_TYPE_VNODE, -1,
-		    PS_FST_FFLAG_READ, PS_FST_UFLAG_CDIR, 0, 0, NULL, 0);
+		    PS_FST_FFLAG_READ, PS_FST_UFLAG_CDIR, 0, 0, NULL, NULL);
 		if (entry != NULL)
 			STAILQ_INSERT_TAIL(head, entry, next);
 	}
 	/* jail root, if any. */
 	if (filed.fd_jdir) {
 		entry = filestat_new_entry(filed.fd_jdir, PS_FST_TYPE_VNODE, -1,
-		    PS_FST_FFLAG_READ, PS_FST_UFLAG_JAIL, 0, 0, NULL, 0);
+		    PS_FST_FFLAG_READ, PS_FST_UFLAG_JAIL, 0, 0, NULL, NULL);
 		if (entry != NULL)
 			STAILQ_INSERT_TAIL(head, entry, next);
 	}
@@ -500,14 +504,14 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap
 	if (kp->ki_tracep) {
 		entry = filestat_new_entry(kp->ki_tracep, PS_FST_TYPE_VNODE, -1,
 		    PS_FST_FFLAG_READ | PS_FST_FFLAG_WRITE,
-		    PS_FST_UFLAG_TRACE, 0, 0, NULL, 0);
+		    PS_FST_UFLAG_TRACE, 0, 0, NULL, NULL);
 		if (entry != NULL)
 			STAILQ_INSERT_TAIL(head, entry, next);
 	}
 	/* text vnode, if one */
 	if (kp->ki_textvp) {
 		entry = filestat_new_entry(kp->ki_textvp, PS_FST_TYPE_VNODE, -1,
-		    PS_FST_FFLAG_READ, PS_FST_UFLAG_TEXT, 0, 0, NULL, 0);
+		    PS_FST_FFLAG_READ, PS_FST_UFLAG_TEXT, 0, 0, NULL, NULL);
 		if (entry != NULL)
 			STAILQ_INSERT_TAIL(head, entry, next);
 	}
@@ -515,7 +519,7 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap
 	if ((vp = getctty(kd, kp)) != NULL) {
 		entry = filestat_new_entry(vp, PS_FST_TYPE_VNODE, -1,
 		    PS_FST_FFLAG_READ | PS_FST_FFLAG_WRITE,
-		    PS_FST_UFLAG_CTTY, 0, 0, NULL, 0);
+		    PS_FST_UFLAG_CTTY, 0, 0, NULL, NULL);
 		if (entry != NULL)
 			STAILQ_INSERT_TAIL(head, entry, next);
 	}
@@ -578,7 +582,7 @@ procstat_getfiles_kvm(struct procstat *procstat, struct kinfo_proc *kp, int mmap
 		}
 		/* XXXRW: No capability rights support for kvm yet. */
 		entry = filestat_new_entry(data, type, i,
-		    to_filestat_flags(file.f_flag), 0, 0, 0, NULL, 0);
+		    to_filestat_flags(file.f_flag), 0, 0, 0, NULL, NULL);
 		if (entry != NULL)
 			STAILQ_INSERT_TAIL(head, entry, next);
 	}
@@ -637,7 +641,7 @@ do_mmapped:
 			 */
 			entry = filestat_new_entry(object.handle,
 			    PS_FST_TYPE_VNODE, -1, fflags,
-			    PS_FST_UFLAG_MMAP, 0, 0, NULL, 0);
+			    PS_FST_UFLAG_MMAP, 0, 0, NULL, NULL);
 			if (entry != NULL)
 				STAILQ_INSERT_TAIL(head, entry, next);
 		}
@@ -878,7 +882,7 @@ procstat_getfiles_sysctl(struct procstat *procstat, struct kinfo_proc *kp,
 				path = NULL;
 			entry = filestat_new_entry(kve, PS_FST_TYPE_VNODE, -1,
 			    fflags, PS_FST_UFLAG_MMAP, refcount, offset, path,
-			    0);
+			    NULL);
 			if (entry != NULL)
 				STAILQ_INSERT_TAIL(head, entry, next);
 		}
diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile
index 3a9a64da9ec..e464a8fd987 100644
--- a/lib/libsmb/Makefile
+++ b/lib/libsmb/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 CONTRIBDIR=	${.CURDIR}/../../contrib/smbfs
 .PATH: ${CONTRIBDIR}/lib/smb
 
@@ -16,4 +18,8 @@ SRCS=	rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \
 WARNS?=	1
 CFLAGS+= -DSMB_CFG_FILE=\"/etc/nsmb.conf\" -I${CONTRIBDIR}/include
 
+.if ${MK_ICONV} != "no"
+CFLAGS+= -DHAVE_ICONV=1
+.endif
+
 .include <bsd.lib.mk>
diff --git a/lib/libstand/libstand.3 b/lib/libstand/libstand.3
index 2938e2d90cb..2b28d7242de 100644
--- a/lib/libstand/libstand.3
+++ b/lib/libstand/libstand.3
@@ -674,3 +674,7 @@ the environment functions and this manpage were written by
 .An Mike Smith Aq msmith@FreeBSD.org .
 .Sh BUGS
 The lack of detailed memory usage data is unhelpful.
+.Pp
+On the amd64 and powerpc64 architectures
+.Nm
+is a 32-bit library.
diff --git a/lib/libstand/tftp.c b/lib/libstand/tftp.c
index aa331b3f600..e3983c3af45 100644
--- a/lib/libstand/tftp.c
+++ b/lib/libstand/tftp.c
@@ -400,10 +400,14 @@ tftp_open(const char *path, struct open_file *f)
 	struct iodesc  *io;
 	int             res;
 
-#ifndef __i386__
-	if (strcmp(f->f_dev->dv_name, "net") != 0)
+	if (strcmp(f->f_dev->dv_name, "net") != 0) {
+#ifdef __i386__
+		if (strcmp(f->f_dev->dv_name, "pxe") != 0)
+			return (EINVAL);
+#else
 		return (EINVAL);
 #endif
+	}
 
 	if (is_open)
 		return (EBUSY);
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h
index 83a02b554f1..c6651cd2dc7 100644
--- a/lib/libthr/thread/thr_private.h
+++ b/lib/libthr/thread/thr_private.h
@@ -433,6 +433,9 @@ struct pthread {
 	/* the sigaction should be used for deferred signal. */
 	struct sigaction	deferred_sigact;
 
+	/* deferred signal delivery is performed, do not reenter. */
+	int			deferred_run;
+
 	/* Force new thread to exit. */
 	int			force_exit;
 
diff --git a/lib/libthr/thread/thr_sig.c b/lib/libthr/thread/thr_sig.c
index 415ddb004da..57c94064a72 100644
--- a/lib/libthr/thread/thr_sig.c
+++ b/lib/libthr/thread/thr_sig.c
@@ -162,6 +162,7 @@ thr_sighandler(int sig, siginfo_t *info, void *_ucp)
 	act = _thr_sigact[sig-1].sigact;
 	_thr_rwl_unlock(&_thr_sigact[sig-1].lock);
 	errno = err;
+	curthread->deferred_run = 0;
 
 	/*
 	 * if a thread is in critical region, for example it holds low level locks,
@@ -320,14 +321,18 @@ check_deferred_signal(struct pthread *curthread)
 	siginfo_t info;
 	int uc_len;
 
-	if (__predict_true(curthread->deferred_siginfo.si_signo == 0))
+	if (__predict_true(curthread->deferred_siginfo.si_signo == 0 ||
+	    curthread->deferred_run))
 		return;
 
+	curthread->deferred_run = 1;
 	uc_len = __getcontextx_size();
 	uc = alloca(uc_len);
 	getcontext(uc);
-	if (curthread->deferred_siginfo.si_signo == 0)
+	if (curthread->deferred_siginfo.si_signo == 0) {
+		curthread->deferred_run = 0;
 		return;
+	}
 	__fillcontextx2((char *)uc);
 	act = curthread->deferred_sigact;
 	uc->uc_sigmask = curthread->deferred_sigmask;
diff --git a/lib/libutil/expand_number.3 b/lib/libutil/expand_number.3
index f78223b0a9d..2f5871f9bbf 100644
--- a/lib/libutil/expand_number.3
+++ b/lib/libutil/expand_number.3
@@ -51,12 +51,13 @@ argument.
 The
 .Fn expand_number
 function
+is case-insensitive and
 follows the SI power of two convention.
 .Pp
 The prefixes are:
 .Bl -column "Prefix" "Description" "1000000000000000000" -offset indent
 .It Sy "Prefix" Ta Sy "Description" Ta Sy "Multiplier"
-.It Li k Ta No kilo Ta 1024
+.It Li K Ta No kilo Ta 1024
 .It Li M Ta No mega Ta 1048576
 .It Li G Ta No giga Ta 1073741824
 .It Li T Ta No tera Ta 1099511627776
diff --git a/lib/libutil/humanize_number.3 b/lib/libutil/humanize_number.3
index 32df6f83853..3a883caf2e9 100644
--- a/lib/libutil/humanize_number.3
+++ b/lib/libutil/humanize_number.3
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd Apr 12, 2011
+.Dd October 7, 2013
 .Dt HUMANIZE_NUMBER 3
 .Os
 .Sh NAME
@@ -140,7 +140,7 @@ The following flags may be passed in
 .Fa flags :
 .Bl -tag -width ".Dv HN_DIVISOR_1000" -offset indent
 .It Dv HN_DECIMAL
-If the final result is less than 10, display it using one digit.
+If the final result is less than 10, display it using one decimal place.
 .It Dv HN_NOSPACE
 Do not put a space between
 .Fa number
@@ -160,13 +160,18 @@ This flag has no effect when
 is also specified.
 .El
 .Sh RETURN VALUES
-The
-.Fn humanize_number
-function returns the number of characters stored in
+Upon success, the
+.Nm
+function returns the number of characters that would have been stored in
 .Fa buf
 (excluding the terminating
 .Dv NUL )
-upon success, or \-1 upon failure.
+if
+.Fa buf
+was large enough, or \-1 upon failure.
+Even upon failure, the contents of
+.Fa buf
+may be modified.
 If
 .Dv HN_GETSCALE
 is specified, the prefix index number will be returned instead.
diff --git a/lib/libutil/humanize_number.c b/lib/libutil/humanize_number.c
index 1cad1cf7a21..b773422475b 100644
--- a/lib/libutil/humanize_number.c
+++ b/lib/libutil/humanize_number.c
@@ -2,6 +2,7 @@
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
+ * Copyright 2013 John-Mark Gurney <jmg@FreeBSD.org>
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -50,15 +51,26 @@ humanize_number(char *buf, size_t len, int64_t quotient,
 {
 	const char *prefixes, *sep;
 	int	i, r, remainder, s1, s2, sign;
+	int	divisordeccut;
 	int64_t	divisor, max;
 	size_t	baselen;
 
-	assert(buf != NULL);
-	assert(suffix != NULL);
-	assert(scale >= 0);
-	assert(scale < maxscale || (((scale & (HN_AUTOSCALE | HN_GETSCALE)) != 0)));
-	assert(!((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES)));
+	/* Since so many callers don't check -1, NUL terminate the buffer */
+	if (len > 0)
+		buf[0] = '\0';
 
+	/* validate args */
+	if (buf == NULL || suffix == NULL)
+		return (-1);
+	if (scale < 0)
+		return (-1);
+	else if (scale >= maxscale &&
+	    ((scale & ~(HN_AUTOSCALE|HN_GETSCALE)) != 0))
+		return (-1);
+	if ((flags & HN_DIVISOR_1000) && (flags & HN_IEC_PREFIXES))
+		return (-1);
+
+	/* setup parameters */
 	remainder = 0;
 
 	if (flags & HN_IEC_PREFIXES) {
@@ -73,34 +85,32 @@ humanize_number(char *buf, size_t len, int64_t quotient,
 		 * an assertion earlier).
 		 */
 		divisor = 1024;
+		divisordeccut = 973;	/* ceil(.95 * 1024) */
 		if (flags & HN_B)
 			prefixes = "B\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
 		else
 			prefixes = "\0\0\0Ki\0Mi\0Gi\0Ti\0Pi\0Ei";
 	} else {
 		baselen = 1;
-		if (flags & HN_DIVISOR_1000)
+		if (flags & HN_DIVISOR_1000) {
 			divisor = 1000;
-		else
+			divisordeccut = 950;
+			if (flags & HN_B)
+				prefixes = "B\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
+			else
+				prefixes = "\0\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
+		} else {
 			divisor = 1024;
-
-		if (flags & HN_B)
-			prefixes = "B\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
-		else
-			prefixes = "\0\0\0k\0\0M\0\0G\0\0T\0\0P\0\0E";
+			divisordeccut = 973;	/* ceil(.95 * 1024) */
+			if (flags & HN_B)
+				prefixes = "B\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E";
+			else
+				prefixes = "\0\0\0K\0\0M\0\0G\0\0T\0\0P\0\0E";
+		}
 	}
 
 #define	SCALE2PREFIX(scale)	(&prefixes[(scale) * 3])
 
-	if (scale < 0 || (scale >= maxscale &&
-	    (scale & (HN_AUTOSCALE | HN_GETSCALE)) == 0))
-		return (-1);
-
-	if (buf == NULL || suffix == NULL)
-		return (-1);
-
-	if (len > 0)
-		buf[0] = '\0';
 	if (quotient < 0) {
 		sign = -1;
 		quotient = -quotient;
@@ -132,8 +142,8 @@ humanize_number(char *buf, size_t len, int64_t quotient,
 		 * divide once more.
 		 */
 		for (i = 0;
-		    (quotient >= max || (quotient == max - 1 && remainder >= 950)) &&
-		    i < maxscale; i++) {
+		    (quotient >= max || (quotient == max - 1 &&
+		    remainder >= divisordeccut)) && i < maxscale; i++) {
 			remainder = quotient % divisor;
 			quotient /= divisor;
 		}
@@ -148,20 +158,22 @@ humanize_number(char *buf, size_t len, int64_t quotient,
 	}
 
 	/* If a value <= 9.9 after rounding and ... */
-	if (quotient <= 9 && remainder < 950 && i > 0 && flags & HN_DECIMAL) {
-		/* baselen + \0 + .N */
-		if (len < baselen + 1 + 2)
-			return (-1);
-		s1 = (int)quotient + ((remainder + 50) / 1000);
-		s2 = ((remainder + 50) / 100) % 10;
+	/*
+	 * XXX - should we make sure there is enough space for the decimal
+	 * place and if not, don't do HN_DECIMAL?
+	 */
+	if (((quotient == 9 && remainder < divisordeccut) || quotient < 9) &&
+	    i > 0 && flags & HN_DECIMAL) {
+		s1 = (int)quotient + ((remainder * 10 + divisor / 2) /
+		    divisor / 10);
+		s2 = ((remainder * 10 + divisor / 2) / divisor) % 10;
 		r = snprintf(buf, len, "%d%s%d%s%s%s",
 		    sign * s1, localeconv()->decimal_point, s2,
 		    sep, SCALE2PREFIX(i), suffix);
 	} else
 		r = snprintf(buf, len, "%" PRId64 "%s%s%s",
-		    sign * (quotient + (remainder + 50) / 1000),
+		    sign * (quotient + (remainder + divisor / 2) / divisor),
 		    sep, SCALE2PREFIX(i), suffix);
 
 	return (r);
 }
-
diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5
index a07e1f03e0d..e780940b764 100644
--- a/lib/libutil/login.conf.5
+++ b/lib/libutil/login.conf.5
@@ -50,9 +50,7 @@ non-root user without a valid login class in
 A user with a uid of 0 without a valid login class will use the record
 "root" if it exists, or "default" if not.
 .Pp
-In
-.Fx ,
-users may individually create a file called
+Users may individually create a file called
 .Pa .login_conf
 in their home directory using the same format, consisting of a single
 entry with a record id of "me".
@@ -132,6 +130,7 @@ tag being delimited from the value by '=' instead of '#').
 Whichever method is used, then all records in the database must use the
 same method to allow values to be correctly overridden in interpolated
 records.
+A numeric value may be infinite.
 .It size
 A number which expresses a size.
 The default interpretation of a value is the number of bytes, but a
@@ -150,6 +149,7 @@ represents terabytes.
 .El
 A size value is a numeric quantity and case of the suffix is not significant.
 Concatenated values are added together.
+A size value may be infinite.
 .It time
 A period of time, by default in seconds.
 A prefix may specify a different unit:
@@ -170,8 +170,16 @@ the number of seconds.
 Concatenated values are added together.
 For example, 2 hours and 40 minutes may be written either as
 9600s, 160m or 2h40m.
+A time value may be infinite.
 .El
 .Pp
+.Dq infinity ,
+.Dq inf ,
+.Dq unlimited ,
+.Dq unlimit,
+and -1
+are considered infinite values.
+.Pp
 The usual convention to interpolate capability entries using the special
 .Em tc=value
 notation may be used.
diff --git a/lib/libutil/login_class.3 b/lib/libutil/login_class.3
index 62a65f20c79..75f361481c8 100644
--- a/lib/libutil/login_class.3
+++ b/lib/libutil/login_class.3
@@ -118,6 +118,7 @@ sbsize           RLIMIT_SBSIZE
 vmemoryuse       RLIMIT_VMEM
 pseudoterminals  RLIMIT_NPTS
 swapuse          RLIMIT_SWAP
+kqueues          RLIMIT_KQUEUES
 .Ed
 .It LOGIN_SETPRIORITY
 Set the scheduling priority for the current process based on the
diff --git a/lib/libutil/login_class.c b/lib/libutil/login_class.c
index 263044f446a..39cce12f7f6 100644
--- a/lib/libutil/login_class.c
+++ b/lib/libutil/login_class.c
@@ -66,6 +66,7 @@ static struct login_res {
     { "vmemoryuse",      login_getcapsize, RLIMIT_VMEM    },
     { "pseudoterminals", login_getcapnum,  RLIMIT_NPTS    },
     { "swapuse",         login_getcapsize, RLIMIT_SWAP    },
+    { "kqueues",         login_getcapsize, RLIMIT_KQUEUES },
     { NULL,              0,                0              }
 };
 
diff --git a/lib/libvmmapi/vmmapi.c b/lib/libvmmapi/vmmapi.c
index 55598036d58..c2851a4cd6b 100644
--- a/lib/libvmmapi/vmmapi.c
+++ b/lib/libvmmapi/vmmapi.c
@@ -43,11 +43,14 @@ __FBSDID("$FreeBSD$");
 #include <fcntl.h>
 #include <unistd.h>
 
+#include <libutil.h>
+
 #include <machine/vmm.h>
 #include <machine/vmm_dev.h>
 
 #include "vmmapi.h"
 
+#define	MB	(1024 * 1024UL)
 #define	GB	(1024 * 1024 * 1024UL)
 
 struct vmctx {
@@ -123,6 +126,30 @@ vm_destroy(struct vmctx *vm)
 	free(vm);
 }
 
+int
+vm_parse_memsize(const char *optarg, size_t *ret_memsize)
+{
+	char *endptr;
+	size_t optval;
+	int error;
+
+	optval = strtoul(optarg, &endptr, 0);
+	if (*optarg != '\0' && *endptr == '\0') {
+		/*
+		 * For the sake of backward compatibility if the memory size
+		 * specified on the command line is less than a megabyte then
+		 * it is interpreted as being in units of MB.
+		 */
+		if (optval < MB)
+			optval *= MB;
+		*ret_memsize = optval;
+		error = 0;
+	} else
+		error = expand_number(optarg, ret_memsize);
+
+	return (error);
+}
+
 int
 vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len,
 		  int *wired)
@@ -369,6 +396,39 @@ vm_lapic_irq(struct vmctx *ctx, int vcpu, int vector)
 	return (ioctl(ctx->fd, VM_LAPIC_IRQ, &vmirq));
 }
 
+int
+vm_ioapic_assert_irq(struct vmctx *ctx, int irq)
+{
+	struct vm_ioapic_irq ioapic_irq;
+
+	bzero(&ioapic_irq, sizeof(struct vm_ioapic_irq));
+	ioapic_irq.irq = irq;
+
+	return (ioctl(ctx->fd, VM_IOAPIC_ASSERT_IRQ, &ioapic_irq));
+}
+
+int
+vm_ioapic_deassert_irq(struct vmctx *ctx, int irq)
+{
+	struct vm_ioapic_irq ioapic_irq;
+
+	bzero(&ioapic_irq, sizeof(struct vm_ioapic_irq));
+	ioapic_irq.irq = irq;
+
+	return (ioctl(ctx->fd, VM_IOAPIC_DEASSERT_IRQ, &ioapic_irq));
+}
+
+int
+vm_ioapic_pulse_irq(struct vmctx *ctx, int irq)
+{
+	struct vm_ioapic_irq ioapic_irq;
+
+	bzero(&ioapic_irq, sizeof(struct vm_ioapic_irq));
+	ioapic_irq.irq = irq;
+
+	return (ioctl(ctx->fd, VM_IOAPIC_PULSE_IRQ, &ioapic_irq));
+}
+
 int
 vm_inject_nmi(struct vmctx *ctx, int vcpu)
 {
@@ -388,6 +448,7 @@ static struct {
 	{ "mtrap_exit",		VM_CAP_MTRAP_EXIT },
 	{ "pause_exit",		VM_CAP_PAUSE_EXIT },
 	{ "unrestricted_guest",	VM_CAP_UNRESTRICTED_GUEST },
+	{ "enable_invpcid",	VM_CAP_ENABLE_INVPCID },
 	{ 0 }
 };
 
@@ -764,3 +825,16 @@ vm_get_gpa_pmap(struct vmctx *ctx, uint64_t gpa, uint64_t *pte, int *num)
 
 	return (error);
 }
+
+int
+vm_get_hpet_capabilities(struct vmctx *ctx, uint32_t *capabilities)
+{
+	int error;
+	struct vm_hpet_cap cap;
+
+	bzero(&cap, sizeof(struct vm_hpet_cap));
+	error = ioctl(ctx->fd, VM_GET_HPET_CAPABILITIES, &cap);
+	if (capabilities != NULL)
+		*capabilities = cap.capabilities;
+	return (error);
+}
diff --git a/lib/libvmmapi/vmmapi.h b/lib/libvmmapi/vmmapi.h
index 8b53ae0cd59..293c4311ed3 100644
--- a/lib/libvmmapi/vmmapi.h
+++ b/lib/libvmmapi/vmmapi.h
@@ -45,6 +45,7 @@ enum vm_mmap_style {
 int	vm_create(const char *name);
 struct vmctx *vm_open(const char *name);
 void	vm_destroy(struct vmctx *ctx);
+int	vm_parse_memsize(const char *optarg, size_t *memsize);
 int	vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len,
 			  int *wired);
 int	vm_setup_memory(struct vmctx *ctx, size_t len, enum vm_mmap_style s);
@@ -66,6 +67,9 @@ int	vm_inject_event(struct vmctx *ctx, int vcpu, enum vm_event_type type,
 int	vm_inject_event2(struct vmctx *ctx, int vcpu, enum vm_event_type type,
 			 int vector, int error_code);
 int	vm_lapic_irq(struct vmctx *ctx, int vcpu, int vector);
+int	vm_ioapic_assert_irq(struct vmctx *ctx, int irq);
+int	vm_ioapic_deassert_irq(struct vmctx *ctx, int irq);
+int	vm_ioapic_pulse_irq(struct vmctx *ctx, int irq);
 int	vm_inject_nmi(struct vmctx *ctx, int vcpu);
 int	vm_capability_name2type(const char *capname);
 const char *vm_capability_type2name(int type);
@@ -92,6 +96,8 @@ const char *vm_get_stat_desc(struct vmctx *ctx, int index);
 int	vm_get_x2apic_state(struct vmctx *ctx, int vcpu, enum x2apic_state *s);
 int	vm_set_x2apic_state(struct vmctx *ctx, int vcpu, enum x2apic_state s);
 
+int	vm_get_hpet_capabilities(struct vmctx *ctx, uint32_t *capabilities);
+
 /* Reset vcpu register state */
 int	vcpu_reset(struct vmctx *ctx, int vcpu);
 
diff --git a/lib/libyaml/Makefile b/lib/libyaml/Makefile
index 5ecec780b4d..113eaff2a23 100644
--- a/lib/libyaml/Makefile
+++ b/lib/libyaml/Makefile
@@ -2,15 +2,13 @@
 
 LIBYAML=	${.CURDIR}/../../contrib/libyaml
 
-LIB=		bsdyml
-SHLIB_MAJOR=	0
-INCS=		bsdyml.h
+LIB=		yaml
+PRIVATELIB=	true
+SHLIB_MAJOR=	1
 SRCS=		api.c dumper.c emitter.c loader.c \
 		parser.c reader.c scanner.c writer.c
-MAN=		libbsdyml.3
 
 .PATH:		${LIBYAML}/src ${LIBYAML}/include
-CLEANFILES=	bsdyml.h
 
 WARNS?=		1
 CFLAGS+=	-I${LIBYAML}/include \
@@ -18,7 +16,4 @@ CFLAGS+=	-I${LIBYAML}/include \
 		-I${.CURDIR} \
 		-DHAVE_CONFIG_H
 
-bsdyml.h: yaml.h
-	cp -f ${.ALLSRC} ${.TARGET}
-
 .include <bsd.lib.mk>
diff --git a/lib/libyaml/libbsdyml.3 b/lib/libyaml/libbsdyml.3
deleted file mode 100644
index 927c47c8c5f..00000000000
--- a/lib/libyaml/libbsdyml.3
+++ /dev/null
@@ -1,61 +0,0 @@
-.\" Copyright (c) 2013 Baptiste Daroussin <bapt@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 March 05, 2013
-.Dt LIBBSDYML 3
-.Os
-.Sh NAME
-.Nm libbsdyml
-.Nd LibYAML library for parsing and emitting YAML
-.Sh SYNOPSIS
-.In bsdyml.h
-.Sh DESCRIPTION
-The
-.Nm
-library is a verbatim copy of the LibYAML version 0.1.4
-.Pp
-The
-.Nm
-library is intended to be used within the
-.Fx
-base system only.
-Use of the
-.Nm
-library for other purposes is not supported and discouraged.
-.Pp
-To avoid version and autoconfiguration issues, the library has been
-renamed to
-.Nm
-rather than retain the original LibYAML library and include file names
-to prevent confusion and autoconfiguration issues for 3rd party
-software.
-.Sh SEE ALSO
-For full documentation, please see the LibYAML webpage at
-.Pa http://pyyaml.org/wiki/LibYAML .
-.Sh AUTHORS
-.An -nosplit
-The original LibYAML was written by
-.An Kirill Simonov Aq xi@resolvent.net .
diff --git a/lib/libz/FREEBSD-upgrade b/lib/libz/FREEBSD-upgrade
index d2d251b0cdf..4ee4eebedb6 100644
--- a/lib/libz/FREEBSD-upgrade
+++ b/lib/libz/FREEBSD-upgrade
@@ -1,4 +1,4 @@
-$FreeBSD: head/lib/libz/FREEBSD-upgrade 146082 2005-05-11 03:50:50Z kientzle $
+$FreeBSD$
 
 ZLib 1.2.2
 
diff --git a/lib/libz/Makefile b/lib/libz/Makefile
index 4ecb022c9a7..0148d2ccb98 100644
--- a/lib/libz/Makefile
+++ b/lib/libz/Makefile
@@ -1,5 +1,5 @@
 #
-# $FreeBSD: head/lib/libz/Makefile 232263 2012-02-28 18:30:18Z dim $
+# $FreeBSD$
 #
 
 LIB=		z
diff --git a/lib/libz/Symbol.map b/lib/libz/Symbol.map
index b117cdd1477..731ce0ab5ba 100644
--- a/lib/libz/Symbol.map
+++ b/lib/libz/Symbol.map
@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: head/lib/libz/Symbol.map 206709 2010-04-16 20:07:24Z delphij $
+ * $FreeBSD$
  */
 
 ZLIB_1.2.7.1 {
diff --git a/lib/libz/Versions.def b/lib/libz/Versions.def
index f8e642574d9..4651e776ab0 100644
--- a/lib/libz/Versions.def
+++ b/lib/libz/Versions.def
@@ -1,4 +1,4 @@
-# $FreeBSD: head/lib/libz/Versions.def 205486 2010-03-22 22:12:27Z delphij $
+# $FreeBSD$
 
 ZLIB_1.2.4.0 {
 };
diff --git a/lib/libz/zopen.c b/lib/libz/zopen.c
index 822a5e1c033..cde022dcf0e 100644
--- a/lib/libz/zopen.c
+++ b/lib/libz/zopen.c
@@ -3,7 +3,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/lib/libz/zopen.c 84228 2001-09-30 22:39:00Z dillon $");
+__FBSDID("$FreeBSD$");
 
 #include <stdio.h>
 #include <zlib.h>
@@ -29,6 +29,12 @@ xgzclose(void *cookie)
     return gzclose(cookie);
 }
 
+static fpos_t
+xgzseek(void *cookie,  fpos_t offset, int whence)
+{
+	return gzseek(cookie, (z_off_t)offset, whence);
+}
+
 FILE *
 zopen(const char *fname, const char *mode)
 {
@@ -37,7 +43,7 @@ zopen(const char *fname, const char *mode)
 	return NULL;
 
     if(*mode == 'r')
-	return (funopen(gz, xgzread, NULL, NULL, xgzclose));
+	return (funopen(gz, xgzread, NULL, xgzseek, xgzclose));
     else
-	return (funopen(gz, NULL, xgzwrite, NULL, xgzclose));
+	return (funopen(gz, NULL, xgzwrite, xgzseek, xgzclose));
 }
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 629d52300d8..3533dd233f9 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -71,7 +71,7 @@ COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \
 	s_lround.c s_lroundf.c s_lroundl.c s_modff.c \
 	s_nan.c s_nearbyint.c s_nextafter.c s_nextafterf.c \
 	s_nexttowardf.c s_remquo.c s_remquof.c \
-	s_rint.c s_rintf.c s_round.c s_roundf.c s_roundl.c \
+	s_rint.c s_rintf.c s_round.c s_roundf.c \
 	s_scalbln.c s_scalbn.c s_scalbnf.c s_signbit.c \
 	s_signgam.c s_significand.c s_significandf.c s_sin.c s_sinf.c \
 	s_tan.c s_tanf.c s_tanh.c s_tanhf.c s_tgammaf.c s_trunc.c s_truncf.c \
@@ -101,7 +101,7 @@ COMMON_SRCS+=	e_acoshl.c e_acosl.c e_asinl.c e_atan2l.c e_atanhl.c \
 	s_asinhl.c s_atanl.c s_cbrtl.c s_ceill.c s_cosl.c s_cprojl.c \
 	s_csqrtl.c s_exp2l.c s_expl.c s_floorl.c s_fmal.c \
 	s_frexpl.c s_logbl.c s_logl.c s_nanl.c s_nextafterl.c \
-	s_nexttoward.c s_remquol.c s_rintl.c s_scalbnl.c \
+	s_nexttoward.c s_remquol.c s_rintl.c  s_roundl.c s_scalbnl.c \
 	s_sinl.c s_tanl.c s_truncl.c w_cabsl.c
 .endif
 
diff --git a/lib/msun/arm/fenv.h b/lib/msun/arm/fenv.h
index e245fb0ca9a..07b05c8d0a6 100644
--- a/lib/msun/arm/fenv.h
+++ b/lib/msun/arm/fenv.h
@@ -44,14 +44,27 @@ typedef	__uint32_t	fexcept_t;
 #define	FE_OVERFLOW	0x0004
 #define	FE_UNDERFLOW	0x0008
 #define	FE_INEXACT	0x0010
+#ifdef __ARM_PCS_VFP
+#define	FE_DENORMAL	0x0080
+#define	FE_ALL_EXCEPT	(FE_DIVBYZERO | FE_INEXACT | \
+			 FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW | FE_DENORMAL)
+#else
 #define	FE_ALL_EXCEPT	(FE_DIVBYZERO | FE_INEXACT | \
 			 FE_INVALID | FE_OVERFLOW | FE_UNDERFLOW)
+#endif
 
 /* Rounding modes */
+#ifdef __ARM_PCS_VFP
+#define	FE_TONEAREST	0x00000000
+#define	FE_UPWARD	0x00400000
+#define	FE_DOWNWARD	0x00800000
+#define	FE_TOWARDZERO	0x00c00000
+#else
 #define	FE_TONEAREST	0x0000
 #define	FE_TOWARDZERO	0x0001
 #define	FE_UPWARD	0x0002
 #define	FE_DOWNWARD	0x0003
+#endif
 #define	_ROUND_MASK	(FE_TONEAREST | FE_DOWNWARD | \
 			 FE_UPWARD | FE_TOWARDZERO)
 __BEGIN_DECLS
@@ -61,10 +74,12 @@ extern const fenv_t	__fe_dfl_env;
 #define	FE_DFL_ENV	(&__fe_dfl_env)
 
 /* We need to be able to map status flag positions to mask flag positions */
-#define _FPUSW_SHIFT	16
+#ifndef __ARM_PCS_VFP
+#define	_FPUSW_SHIFT	16
 #define	_ENABLE_MASK	(FE_ALL_EXCEPT << _FPUSW_SHIFT)
+#endif
 
-#ifndef	ARM_HARD_FLOAT
+#ifndef __ARM_PCS_VFP
 
 int feclearexcept(int __excepts);
 int fegetexceptflag(fexcept_t *__flagp, int __excepts);
@@ -78,19 +93,19 @@ int feholdexcept(fenv_t *__envp);
 int fesetenv(const fenv_t *__envp);
 int feupdateenv(const fenv_t *__envp);
 
-#else	/* ARM_HARD_FLOAT */
+#else	/* __ARM_PCS_VFP */
 
-#define	__rfs(__fpsr)	__asm __volatile("rfs %0" : "=r" (*(__fpsr)))
-#define	__wfs(__fpsr)	__asm __volatile("wfs %0" : : "r" (__fpsr))
+#define	vmrs_fpscr(__r)	__asm __volatile("vmrs %0, fpscr" : "=&r"(__r))
+#define	vmsr_fpscr(__r)	__asm __volatile("vmsr fpscr, %0" : : "r"(__r))
 
 __fenv_static inline int
 feclearexcept(int __excepts)
 {
 	fexcept_t __fpsr;
 
-	__rfs(&__fpsr);
+	vmrs_fpscr(__fpsr);
 	__fpsr &= ~__excepts;
-	__wfs(__fpsr);
+	vmsr_fpscr(__fpsr);
 	return (0);
 }
 
@@ -99,7 +114,7 @@ fegetexceptflag(fexcept_t *__flagp, int __excepts)
 {
 	fexcept_t __fpsr;
 
-	__rfs(&__fpsr);
+	vmrs_fpscr(__fpsr);
 	*__flagp = __fpsr & __excepts;
 	return (0);
 }
@@ -109,10 +124,10 @@ fesetexceptflag(const fexcept_t *__flagp, int __excepts)
 {
 	fexcept_t __fpsr;
 
-	__rfs(&__fpsr);
+	vmrs_fpscr(__fpsr);
 	__fpsr &= ~__excepts;
 	__fpsr |= *__flagp & __excepts;
-	__wfs(__fpsr);
+	vmsr_fpscr(__fpsr);
 	return (0);
 }
 
@@ -130,34 +145,36 @@ fetestexcept(int __excepts)
 {
 	fexcept_t __fpsr;
 
-	__rfs(&__fpsr);
+	vmrs_fpscr(__fpsr);
 	return (__fpsr & __excepts);
 }
 
 __fenv_static inline int
 fegetround(void)
 {
+	fenv_t __fpsr;
 
-	/*
-	 * Apparently, the rounding mode is specified as part of the
-	 * instruction format on ARM, so the dynamic rounding mode is
-	 * indeterminate.  Some FPUs may differ.
-	 */
-	return (-1);
+	vmrs_fpscr(__fpsr);
+	return (__fpsr & _ROUND_MASK);
 }
 
 __fenv_static inline int
 fesetround(int __round)
 {
+	fenv_t __fpsr;
 
-	return (-1);
+	vmrs_fpscr(__fpsr);
+	__fpsr &= ~(_ROUND_MASK);
+	__fpsr |= __round;
+	vmsr_fpscr(__fpsr);
+	return (0);
 }
 
 __fenv_static inline int
 fegetenv(fenv_t *__envp)
 {
 
-	__rfs(__envp);
+	vmrs_fpscr(*__envp);
 	return (0);
 }
 
@@ -166,10 +183,10 @@ feholdexcept(fenv_t *__envp)
 {
 	fenv_t __env;
 
-	__rfs(&__env);
+	vmrs_fpscr(__env);
 	*__envp = __env;
-	__env &= ~(FE_ALL_EXCEPT | _ENABLE_MASK);
-	__wfs(__env);
+	__env &= ~(FE_ALL_EXCEPT);
+	vmsr_fpscr(__env);
 	return (0);
 }
 
@@ -177,7 +194,7 @@ __fenv_static inline int
 fesetenv(const fenv_t *__envp)
 {
 
-	__wfs(*__envp);
+	vmsr_fpscr(*__envp);
 	return (0);
 }
 
@@ -186,8 +203,8 @@ feupdateenv(const fenv_t *__envp)
 {
 	fexcept_t __fpsr;
 
-	__rfs(&__fpsr);
-	__wfs(*__envp);
+	vmrs_fpscr(__fpsr);
+	vmsr_fpscr(*__envp);
 	feraiseexcept(__fpsr & FE_ALL_EXCEPT);
 	return (0);
 }
@@ -201,10 +218,10 @@ feenableexcept(int __mask)
 {
 	fenv_t __old_fpsr, __new_fpsr;
 
-	__rfs(&__old_fpsr);
-	__new_fpsr = __old_fpsr | (__mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT;
-	__wfs(__new_fpsr);
-	return ((__old_fpsr >> _FPUSW_SHIFT) & FE_ALL_EXCEPT);
+	vmrs_fpscr(__old_fpsr);
+	__new_fpsr = __old_fpsr | (__mask & FE_ALL_EXCEPT);
+	vmsr_fpscr(__new_fpsr);
+	return (__old_fpsr & FE_ALL_EXCEPT);
 }
 
 static inline int
@@ -212,10 +229,10 @@ fedisableexcept(int __mask)
 {
 	fenv_t __old_fpsr, __new_fpsr;
 
-	__rfs(&__old_fpsr);
-	__new_fpsr = __old_fpsr & ~((__mask & FE_ALL_EXCEPT) << _FPUSW_SHIFT);
-	__wfs(__new_fpsr);
-	return ((__old_fpsr >> _FPUSW_SHIFT) & FE_ALL_EXCEPT);
+	vmrs_fpscr(__old_fpsr);
+	__new_fpsr = __old_fpsr & ~(__mask & FE_ALL_EXCEPT);
+	vmsr_fpscr(__new_fpsr);
+	return (__old_fpsr & FE_ALL_EXCEPT);
 }
 
 static inline int
@@ -223,13 +240,13 @@ fegetexcept(void)
 {
 	fenv_t __fpsr;
 
-	__rfs(&__fpsr);
-	return ((__fpsr & _ENABLE_MASK) >> _FPUSW_SHIFT);
+	vmrs_fpscr(__fpsr);
+	return (__fpsr & FE_ALL_EXCEPT);
 }
 
 #endif /* __BSD_VISIBLE */
 
-#endif	/* ARM_HARD_FLOAT */
+#endif	/* __ARM_PCS_VFP */
 
 __END_DECLS
 
diff --git a/lib/msun/src/s_round.c b/lib/msun/src/s_round.c
index 65de31b6373..fab3019b4ce 100644
--- a/lib/msun/src/s_round.c
+++ b/lib/msun/src/s_round.c
@@ -27,25 +27,34 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <math.h>
+#include <float.h>
+
+#include "math.h"
+#include "math_private.h"
 
 double
 round(double x)
 {
 	double t;
+	uint32_t hx;
 
-	if (!isfinite(x))
-		return (x);
+	GET_HIGH_WORD(hx, x);
+	if ((hx & 0x7fffffff) == 0x7ff00000)
+		return (x + x);
 
-	if (x >= 0.0) {
+	if (!(hx & 0x80000000)) {
 		t = floor(x);
 		if (t - x <= -0.5)
-			t += 1.0;
+			t += 1;
 		return (t);
 	} else {
 		t = floor(-x);
 		if (t + x <= -0.5)
-			t += 1.0;
+			t += 1;
 		return (-t);
 	}
 }
+
+#if (LDBL_MANT_DIG == 53)
+__weak_reference(round, roundl);
+#endif
diff --git a/lib/msun/src/s_roundf.c b/lib/msun/src/s_roundf.c
index 952e8e79549..e7e2eb928cf 100644
--- a/lib/msun/src/s_roundf.c
+++ b/lib/msun/src/s_roundf.c
@@ -27,25 +27,28 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <math.h>
+#include "math.h"
+#include "math_private.h"
 
 float
 roundf(float x)
 {
 	float t;
+	uint32_t hx;
 
-	if (!isfinite(x))
-		return (x);
+	GET_FLOAT_WORD(hx, x);
+	if ((hx & 0x7fffffff) == 0x7f800000)
+		return (x + x);
 
-	if (x >= 0.0) {
+	if (!(hx & 0x80000000)) {
 		t = floorf(x);
-		if (t - x <= -0.5)
-			t += 1.0;
+		if (t - x <= -0.5F)
+			t += 1;
 		return (t);
 	} else {
 		t = floorf(-x);
-		if (t + x <= -0.5)
-			t += 1.0;
+		if (t + x <= -0.5F)
+			t += 1;
 		return (-t);
 	}
 }
diff --git a/lib/msun/src/s_roundl.c b/lib/msun/src/s_roundl.c
index a70b617cf92..2d15e134f64 100644
--- a/lib/msun/src/s_roundl.c
+++ b/lib/msun/src/s_roundl.c
@@ -27,25 +27,36 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <math.h>
+#include <float.h>
+#ifdef __i386__
+#include <ieeefp.h>
+#endif
+
+#include "fpmath.h"
+#include "math.h"
+#include "math_private.h"
 
 long double
 roundl(long double x)
 {
 	long double t;
+	uint16_t hx;
 
-	if (!isfinite(x))
-		return (x);
+	GET_LDBL_EXPSIGN(hx, x);
+	if ((hx & 0x7fff) == 0x7fff)
+		return (x + x);
 
-	if (x >= 0.0) {
+	ENTERI();
+
+	if (!(hx & 0x8000)) {
 		t = floorl(x);
-		if (t - x <= -0.5)
-			t += 1.0;
-		return (t);
+		if (t - x <= -0.5L)
+			t += 1;
+		RETURNI(t);
 	} else {
 		t = floorl(-x);
-		if (t + x <= -0.5)
-			t += 1.0;
-		return (-t);
+		if (t + x <= -0.5L)
+			t += 1;
+		RETURNI(-t);
 	}
 }
diff --git a/lib/tests/Makefile b/lib/tests/Makefile
new file mode 100644
index 00000000000..935fd709df0
--- /dev/null
+++ b/lib/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/lib
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/libexec/Makefile b/libexec/Makefile
index 0b9c9618a1b..e4781b82a7e 100644
--- a/libexec/Makefile
+++ b/libexec/Makefile
@@ -6,6 +6,7 @@
 SUBDIR=	${_atf} \
 	${_atrun} \
 	bootpd \
+	${_casper} \
 	${_comsat} \
 	fingerd \
 	ftpd \
@@ -28,19 +29,20 @@ SUBDIR=	${_atf} \
 	talkd \
 	tcpd \
 	${_telnetd} \
+	${_tests} \
 	tftpd \
 	${_tftp-proxy} \
 	ulog-helper \
 	${_ypxfr}
 
-.if ${MK_ATF} != "no"
-_atf=		atf
-.endif
-
 .if ${MK_AT} != "no"
 _atrun=		atrun
 .endif
 
+.if ${MK_CASPER} != "no"
+_casper=	casper
+.endif
+
 .if ${MK_MAIL} != "no"
 _comsat=	comsat
 .endif
@@ -76,4 +78,9 @@ _smrsh=		smrsh
 _telnetd=	telnetd
 .endif
 
+.if ${MK_TESTS} != "no"
+_atf=		atf
+_tests=		tests
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/libexec/atf/Makefile b/libexec/atf/Makefile
index dc222c39332..6749db5fce9 100644
--- a/libexec/atf/Makefile
+++ b/libexec/atf/Makefile
@@ -25,6 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-check
+SUBDIR=	atf-check tests
 
 .include <bsd.subdir.mk>
diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc
index a28f5464557..392bbb23b23 100644
--- a/libexec/atf/Makefile.inc
+++ b/libexec/atf/Makefile.inc
@@ -25,8 +25,6 @@
 #
 # $FreeBSD$
 
-ATF = ${.CURDIR}/../../../contrib/atf
-
 CFLAGS+=	-DHAVE_CONFIG_H
 
 WARNS?=		3
diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile
index fafb1e40d65..0cfa8636491 100644
--- a/libexec/atf/atf-check/Makefile
+++ b/libexec/atf/atf-check/Makefile
@@ -27,6 +27,7 @@
 
 .include <bsd.init.mk>
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 BINDIR=		/usr/libexec
@@ -42,4 +43,8 @@ LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c++
 LDFLAGS+=	-L${.OBJDIR}/../../../lib/atf/libatf-c
 LDADD+=		-latf-c++ -latf-c
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/libexec/atf/atf-check/Makefile.inc b/libexec/atf/atf-check/Makefile.inc
new file mode 100644
index 00000000000..265f86d1ed5
--- /dev/null
+++ b/libexec/atf/atf-check/Makefile.inc
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+.include "../Makefile.inc"
diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile
new file mode 100644
index 00000000000..0f237e6d3f7
--- /dev/null
+++ b/libexec/atf/atf-check/tests/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/libexec/atf/atf-check
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-sh
+
+ATF_TESTS_SH=	atf-check_test
+
+.include <atf.test.mk>
diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile
new file mode 100644
index 00000000000..7aa96019367
--- /dev/null
+++ b/libexec/atf/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/libexec/atf
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/libexec/casper/Makefile b/libexec/casper/Makefile
new file mode 100644
index 00000000000..ed6bd7b42aa
--- /dev/null
+++ b/libexec/casper/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+SUBDIR=	dns
+SUBDIR+=grp
+SUBDIR+=pwd
+SUBDIR+=random
+SUBDIR+=sysctl
+
+.include <bsd.subdir.mk>
diff --git a/libexec/casper/dns/Makefile b/libexec/casper/dns/Makefile
new file mode 100644
index 00000000000..82bd4c045bc
--- /dev/null
+++ b/libexec/casper/dns/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
+
+PROG=	dns
+
+SRCS=	dns.c
+
+DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
+
+BINDIR=	/libexec/casper
+
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum
+CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
+CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
+CFLAGS+=-I${.CURDIR}/../../../sbin/casper
+
+NO_MAN=
+
+.include <bsd.prog.mk>
diff --git a/libexec/casper/dns/dns.c b/libexec/casper/dns/dns.c
new file mode 100644
index 00000000000..6be022ab656
--- /dev/null
+++ b/libexec/casper/dns/dns.c
@@ -0,0 +1,425 @@
+/*-
+ * Copyright (c) 2012-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <netinet/in.h>
+
+#include <errno.h>
+#include <netdb.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <libcapsicum.h>
+#include <libcapsicum_dns.h>
+#include <libcasper.h>
+#include <nv.h>
+#include <pjdlog.h>
+
+static bool
+dns_allowed_type(const nvlist_t *limits, const char *type)
+{
+	const char *name;
+	bool notypes;
+	void *cookie;
+
+	if (limits == NULL)
+		return (true);
+
+	notypes = true;
+	cookie = NULL;
+	while ((name = nvlist_next(limits, NULL, &cookie)) != NULL) {
+		if (strncmp(name, "type", sizeof("type") - 1) != 0)
+			continue;
+		notypes = false;
+		if (strcmp(nvlist_get_string(limits, name), type) == 0)
+			return (true);
+	}
+
+	/* If there are no types at all, allow any type. */
+	if (notypes)
+		return (true);
+
+	return (false);
+}
+
+static bool
+dns_allowed_family(const nvlist_t *limits, int family)
+{
+	const char *name;
+	bool nofamilies;
+	void *cookie;
+
+	if (limits == NULL)
+		return (true);
+
+	nofamilies = true;
+	cookie = NULL;
+	while ((name = nvlist_next(limits, NULL, &cookie)) != NULL) {
+		if (strncmp(name, "family", sizeof("family") - 1) != 0)
+			continue;
+		nofamilies = false;
+		if (family == AF_UNSPEC)
+			continue;
+		if (nvlist_get_number(limits, name) == (uint64_t)family)
+			return (true);
+	}
+
+	/* If there are no families at all, allow any family. */
+	if (nofamilies)
+		return (true);
+
+	return (false);
+}
+
+static void
+hostent_pack(const struct hostent *hp, nvlist_t *nvl)
+{
+	unsigned int ii;
+
+	nvlist_add_string(nvl, "name", hp->h_name);
+	nvlist_add_number(nvl, "addrtype", (uint64_t)hp->h_addrtype);
+	nvlist_add_number(nvl, "length", (uint64_t)hp->h_length);
+
+	if (hp->h_aliases == NULL) {
+		nvlist_add_number(nvl, "naliases", 0);
+	} else {
+		for (ii = 0; hp->h_aliases[ii] != NULL; ii++) {
+			nvlist_addf_string(nvl, hp->h_aliases[ii], "alias%u",
+			    ii);
+		}
+		nvlist_add_number(nvl, "naliases", (uint64_t)ii);
+	}
+
+	if (hp->h_addr_list == NULL) {
+		nvlist_add_number(nvl, "naddrs", 0);
+	} else {
+		for (ii = 0; hp->h_addr_list[ii] != NULL; ii++) {
+			nvlist_addf_binary(nvl, hp->h_addr_list[ii],
+			    (size_t)hp->h_length, "addr%u", ii);
+		}
+		nvlist_add_number(nvl, "naddrs", (uint64_t)ii);
+	}
+}
+
+static int
+dns_gethostbyname(const nvlist_t *limits, const nvlist_t *nvlin,
+    nvlist_t *nvlout)
+{
+	struct hostent *hp;
+	int family;
+
+	if (!dns_allowed_type(limits, "NAME"))
+		return (NO_RECOVERY);
+
+	family = (int)nvlist_get_number(nvlin, "family");
+
+	if (!dns_allowed_family(limits, family))
+		return (NO_RECOVERY);
+
+	hp = gethostbyname2(nvlist_get_string(nvlin, "name"), family);
+	if (hp == NULL)
+		return (h_errno);
+	hostent_pack(hp, nvlout);
+	return (0);
+}
+
+static int
+dns_gethostbyaddr(const nvlist_t *limits, const nvlist_t *nvlin,
+    nvlist_t *nvlout)
+{
+	struct hostent *hp;
+	const void *addr;
+	size_t addrsize;
+	int family;
+
+	if (!dns_allowed_type(limits, "ADDR"))
+		return (NO_RECOVERY);
+
+	family = (int)nvlist_get_number(nvlin, "family");
+
+	if (!dns_allowed_family(limits, family))
+		return (NO_RECOVERY);
+
+	addr = nvlist_get_binary(nvlin, "addr", &addrsize);
+	hp = gethostbyaddr(addr, (socklen_t)addrsize, family);
+	if (hp == NULL)
+		return (h_errno);
+	hostent_pack(hp, nvlout);
+	return (0);
+}
+
+static int
+dns_getnameinfo(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	struct sockaddr_storage sast;
+	const void *sabin;
+	char *host, *serv;
+	size_t sabinsize, hostlen, servlen;
+	socklen_t salen;
+	int error, flags;
+
+	if (!dns_allowed_type(limits, "NAME"))
+		return (NO_RECOVERY);
+
+	error = 0;
+	host = serv = NULL;
+	memset(&sast, 0, sizeof(sast));
+
+	hostlen = (size_t)nvlist_get_number(nvlin, "hostlen");
+	servlen = (size_t)nvlist_get_number(nvlin, "servlen");
+
+	if (hostlen > 0) {
+		host = calloc(1, hostlen + 1);
+		if (host == NULL) {
+			error = EAI_MEMORY;
+			goto out;
+		}
+	}
+	if (servlen > 0) {
+		serv = calloc(1, servlen + 1);
+		if (serv == NULL) {
+			error = EAI_MEMORY;
+			goto out;
+		}
+	}
+
+	sabin = nvlist_get_binary(nvlin, "sa", &sabinsize);
+	if (sabinsize > sizeof(sast)) {
+		error = EAI_FAIL;
+		goto out;
+	}
+
+	memcpy(&sast, sabin, sabinsize);
+	salen = (socklen_t)sabinsize;
+
+	if ((sast.ss_family != AF_INET ||
+	     salen != sizeof(struct sockaddr_in)) &&
+	    (sast.ss_family != AF_INET6 ||
+	     salen != sizeof(struct sockaddr_in6))) {
+		error = EAI_FAIL;
+		goto out;
+	}
+
+	if (!dns_allowed_family(limits, (int)sast.ss_family))
+		return (NO_RECOVERY);
+
+	flags = (int)nvlist_get_number(nvlin, "flags");
+
+	error = getnameinfo((struct sockaddr *)&sast, salen, host, hostlen,
+	    serv, servlen, flags);
+	if (error != 0)
+		goto out;
+
+	nvlist_move_string(nvlout, "host", host);
+	nvlist_move_string(nvlout, "serv", serv);
+out:
+	if (error != 0) {
+		free(host);
+		free(serv);
+	}
+	return (error);
+}
+
+static nvlist_t *
+addrinfo_pack(const struct addrinfo *ai)
+{
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+	nvlist_add_number(nvl, "ai_flags", (uint64_t)ai->ai_flags);
+	nvlist_add_number(nvl, "ai_family", (uint64_t)ai->ai_family);
+	nvlist_add_number(nvl, "ai_socktype", (uint64_t)ai->ai_socktype);
+	nvlist_add_number(nvl, "ai_protocol", (uint64_t)ai->ai_protocol);
+	nvlist_add_binary(nvl, "ai_addr", ai->ai_addr, (size_t)ai->ai_addrlen);
+	nvlist_add_string(nvl, "ai_canonname", ai->ai_canonname);
+
+	return (nvl);
+}
+
+static int
+dns_getaddrinfo(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	struct addrinfo hints, *hintsp, *res, *cur;
+	const char *hostname, *servname;
+	nvlist_t *elem;
+	unsigned int ii;
+	int error, family;
+
+	if (!dns_allowed_type(limits, "ADDR"))
+		return (NO_RECOVERY);
+
+	hostname = nvlist_get_string(nvlin, "hostname");
+	servname = nvlist_get_string(nvlin, "servname");
+	if (nvlist_exists_number(nvlin, "hints.ai_flags")) {
+		size_t addrlen;
+
+		hints.ai_flags = (int)nvlist_get_number(nvlin,
+		    "hints.ai_flags");
+		hints.ai_family = (int)nvlist_get_number(nvlin,
+		    "hints.ai_family");
+		hints.ai_socktype = (int)nvlist_get_number(nvlin,
+		    "hints.ai_socktype");
+		hints.ai_protocol = (int)nvlist_get_number(nvlin,
+		    "hints.ai_protocol");
+		hints.ai_addrlen = 0;
+		hints.ai_addr = NULL;
+		hints.ai_canonname = NULL;
+		hintsp = &hints;
+		family = hints.ai_family;
+	} else {
+		hintsp = NULL;
+		family = AF_UNSPEC;
+	}
+
+	if (!dns_allowed_family(limits, family))
+		return (NO_RECOVERY);
+
+	error = getaddrinfo(hostname, servname, hintsp, &res);
+	if (error != 0)
+		goto out;
+
+	for (cur = res, ii = 0; cur != NULL; cur = cur->ai_next, ii++) {
+		elem = addrinfo_pack(cur);
+		nvlist_movef_nvlist(nvlout, elem, "res%u", ii);
+	}
+
+	freeaddrinfo(res);
+	error = 0;
+out:
+	return (error);
+}
+
+static bool
+limit_has_entry(const nvlist_t *limits, const char *prefix)
+{
+	const char *name;
+	size_t prefixlen;
+	void *cookie;
+
+	if (limits == NULL)
+		return (false);
+
+	prefixlen = strlen(prefix);
+
+	cookie = NULL;
+	while ((name = nvlist_next(limits, NULL, &cookie)) != NULL) {
+		if (strncmp(name, prefix, prefixlen) == 0)
+			return (true);
+	}
+
+	return (false);
+}
+
+static int
+dns_limit(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const char *name;
+	void *cookie;
+	int nvtype;
+	bool hastype, hasfamily;
+
+	hastype = false;
+	hasfamily = false;
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &nvtype, &cookie)) != NULL) {
+		if (nvtype == NV_TYPE_STRING) {
+			const char *type;
+
+			if (strncmp(name, "type", sizeof("type") - 1) != 0)
+				return (EINVAL);
+			type = nvlist_get_string(newlimits, name);
+			if (strcmp(type, "ADDR") != 0 &&
+			    strcmp(type, "NAME") != 0) {
+				return (EINVAL);
+			}
+			if (!dns_allowed_type(oldlimits, type))
+				return (ENOTCAPABLE);
+			hastype = true;
+		} else if (nvtype == NV_TYPE_NUMBER) {
+			int family;
+
+			if (strncmp(name, "family", sizeof("family") - 1) != 0)
+				return (EINVAL);
+			family = (int)nvlist_get_number(newlimits, name);
+			if (!dns_allowed_family(oldlimits, family))
+				return (ENOTCAPABLE);
+			hasfamily = true;
+		} else {
+			return (EINVAL);
+		}
+	}
+
+	/*
+	 * If the new limit doesn't mention type or family we have to
+	 * check if the current limit does have those. Missing type or
+	 * family in the limit means that all types or families are
+	 * allowed.
+	 */
+	if (!hastype) {
+		if (limit_has_entry(oldlimits, "type"))
+			return (ENOTCAPABLE);
+	}
+	if (!hasfamily) {
+		if (limit_has_entry(oldlimits, "family"))
+			return (ENOTCAPABLE);
+	}
+
+	return (0);
+}
+
+static int
+dns_command(const char *cmd, const nvlist_t *limits, nvlist_t *nvlin,
+    nvlist_t *nvlout)
+{
+	int error;
+
+	if (strcmp(cmd, "gethostbyname") == 0)
+		error = dns_gethostbyname(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "gethostbyaddr") == 0)
+		error = dns_gethostbyaddr(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "getnameinfo") == 0)
+		error = dns_getnameinfo(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "getaddrinfo") == 0)
+		error = dns_getaddrinfo(limits, nvlin, nvlout);
+	else
+		error = NO_RECOVERY;
+
+	return (error);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	return (service_start("system.dns", PARENT_FILENO, dns_limit,
+	    dns_command, argc, argv));
+}
diff --git a/libexec/casper/grp/Makefile b/libexec/casper/grp/Makefile
new file mode 100644
index 00000000000..6f166b8ae6c
--- /dev/null
+++ b/libexec/casper/grp/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
+
+PROG=	grp
+
+SRCS=	grp.c
+
+DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
+
+BINDIR=	/libexec/casper
+
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum
+CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
+CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
+CFLAGS+=-I${.CURDIR}/../../../sbin/casper
+
+NO_MAN=
+
+.include <bsd.prog.mk>
diff --git a/libexec/casper/grp/grp.c b/libexec/casper/grp/grp.c
new file mode 100644
index 00000000000..ba22f62e59c
--- /dev/null
+++ b/libexec/casper/grp/grp.c
@@ -0,0 +1,384 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <errno.h>
+#include <grp.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <libcapsicum.h>
+#include <libcasper.h>
+#include <nv.h>
+#include <pjdlog.h>
+
+static bool
+grp_allowed_cmd(const nvlist_t *limits, const char *cmd)
+{
+
+	if (limits == NULL)
+		return (true);
+
+	/*
+	 * If no limit was set on allowed commands, then all commands
+	 * are allowed.
+	 */
+	if (!nvlist_exists_nvlist(limits, "cmds"))
+		return (true);
+
+	limits = nvlist_get_nvlist(limits, "cmds");
+	return (nvlist_exists_null(limits, cmd));
+}
+
+static int
+grp_allowed_cmds(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const char *name;
+	void *cookie;
+	int type;
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		if (type != NV_TYPE_NULL)
+			return (EINVAL);
+		if (!grp_allowed_cmd(oldlimits, name))
+			return (ENOTCAPABLE);
+	}
+
+	return (0);
+}
+
+static bool
+grp_allowed_group(const nvlist_t *limits, const char *gname, gid_t gid)
+{
+	const char *name;
+	void *cookie;
+	int type;
+
+	if (limits == NULL)
+		return (true);
+
+	/*
+	 * If no limit was set on allowed groups, then all groups are allowed.
+	 */
+	if (!nvlist_exists_nvlist(limits, "groups"))
+		return (true);
+
+	limits = nvlist_get_nvlist(limits, "groups");
+	cookie = NULL;
+	while ((name = nvlist_next(limits, &type, &cookie)) != NULL) {
+		switch (type) {
+		case NV_TYPE_NUMBER:
+			if (gid != (gid_t)-1 &&
+			    nvlist_get_number(limits, name) == (uint64_t)gid) {
+				return (true);
+			}
+			break;
+		case NV_TYPE_STRING:
+			if (gname != NULL &&
+			    strcmp(nvlist_get_string(limits, name),
+			    gname) == 0) {
+				return (true);
+			}
+			break;
+		default:
+			PJDLOG_ABORT("Unexpected type %d.", type);
+		}
+	}
+
+	return (false);
+}
+
+static int
+grp_allowed_groups(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const char *name, *gname;
+	void *cookie;
+	gid_t gid;
+	int type;
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		switch (type) {
+		case NV_TYPE_NUMBER:
+			gid = (gid_t)nvlist_get_number(newlimits, name);
+			gname = NULL;
+			break;
+		case NV_TYPE_STRING:
+			gid = (gid_t)-1;
+			gname = nvlist_get_string(newlimits, name);
+			break;
+		default:
+			return (EINVAL);
+		}
+		if (!grp_allowed_group(oldlimits, gname, gid))
+			return (ENOTCAPABLE);
+	}
+
+	return (0);
+}
+
+static bool
+grp_allowed_field(const nvlist_t *limits, const char *field)
+{
+
+	if (limits == NULL)
+		return (true);
+
+	/*
+	 * If no limit was set on allowed fields, then all fields are allowed.
+	 */
+	if (!nvlist_exists_nvlist(limits, "fields"))
+		return (true);
+
+	limits = nvlist_get_nvlist(limits, "fields");
+	return (nvlist_exists_null(limits, field));
+}
+
+static int
+grp_allowed_fields(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const char *name;
+	void *cookie;
+	int type;
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		if (type != NV_TYPE_NULL)
+			return (EINVAL);
+		if (!grp_allowed_field(oldlimits, name))
+			return (ENOTCAPABLE);
+	}
+
+	return (0);
+}
+
+static bool
+grp_pack(const nvlist_t *limits, const struct group *grp, nvlist_t *nvl)
+{
+
+	if (grp == NULL)
+		return (true);
+
+	/*
+	 * If either name or GID is allowed, we allow it.
+	 */
+	if (!grp_allowed_group(limits, grp->gr_name, grp->gr_gid))
+		return (false);
+
+	if (grp_allowed_field(limits, "gr_name"))
+		nvlist_add_string(nvl, "gr_name", grp->gr_name);
+	else
+		nvlist_add_string(nvl, "gr_name", "");
+	if (grp_allowed_field(limits, "gr_passwd"))
+		nvlist_add_string(nvl, "gr_passwd", grp->gr_passwd);
+	else
+		nvlist_add_string(nvl, "gr_passwd", "");
+	if (grp_allowed_field(limits, "gr_gid"))
+		nvlist_add_number(nvl, "gr_gid", (uint64_t)grp->gr_gid);
+	else
+		nvlist_add_number(nvl, "gr_gid", (uint64_t)-1);
+	if (grp_allowed_field(limits, "gr_mem") && grp->gr_mem[0] != NULL) {
+		unsigned int ngroups;
+
+		for (ngroups = 0; grp->gr_mem[ngroups] != NULL; ngroups++) {
+			nvlist_addf_string(nvl, grp->gr_mem[ngroups],
+			    "gr_mem[%u]", ngroups);
+		}
+		nvlist_add_number(nvl, "gr_nmem", (uint64_t)ngroups);
+	}
+
+	return (true);
+}
+
+static int
+grp_getgrent(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	struct group *grp;
+
+	for (;;) {
+		errno = 0;
+		grp = getgrent();
+		if (errno != 0)
+			return (errno);
+		if (grp_pack(limits, grp, nvlout))
+			return (0);
+	}
+
+	/* NOTREACHED */
+}
+
+static int
+grp_getgrnam(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	struct group *grp;
+	const char *name;
+
+	if (!nvlist_exists_string(nvlin, "name"))
+		return (EINVAL);
+	name = nvlist_get_string(nvlin, "name");
+	PJDLOG_ASSERT(name != NULL);
+
+	errno = 0;
+	grp = getgrnam(name);
+	if (errno != 0)
+		return (errno);
+
+	(void)grp_pack(limits, grp, nvlout);
+
+	return (0);
+}
+
+static int
+grp_getgrgid(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	struct group *grp;
+	gid_t gid;
+
+	if (!nvlist_exists_number(nvlin, "gid"))
+		return (EINVAL);
+
+	gid = (gid_t)nvlist_get_number(nvlin, "gid");
+
+	errno = 0;
+	grp = getgrgid(gid);
+	if (errno != 0)
+		return (errno);
+
+	(void)grp_pack(limits, grp, nvlout);
+
+	return (0);
+}
+
+static int
+grp_setgroupent(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	int stayopen;
+
+	if (!nvlist_exists_bool(nvlin, "stayopen"))
+		return (EINVAL);
+
+	stayopen = nvlist_get_bool(nvlin, "stayopen") ? 1 : 0;
+
+	return (setgroupent(stayopen) == 0 ? EFAULT : 0);
+}
+
+static int
+grp_setgrent(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+
+	return (setgrent() == 0 ? EFAULT : 0);
+}
+
+static int
+grp_endgrent(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+
+	endgrent();
+
+	return (0);
+}
+
+static int
+grp_limit(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const nvlist_t *limits;
+	const char *name;
+	void *cookie;
+	int error, type;
+
+	if (oldlimits != NULL && nvlist_exists_nvlist(oldlimits, "cmds") &&
+	    !nvlist_exists_nvlist(newlimits, "cmds")) {
+		return (ENOTCAPABLE);
+	}
+	if (oldlimits != NULL && nvlist_exists_nvlist(oldlimits, "fields") &&
+	    !nvlist_exists_nvlist(newlimits, "fields")) {
+		return (ENOTCAPABLE);
+	}
+	if (oldlimits != NULL && nvlist_exists_nvlist(oldlimits, "groups") &&
+	    !nvlist_exists_nvlist(newlimits, "groups")) {
+		return (ENOTCAPABLE);
+	}
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		if (type != NV_TYPE_NVLIST)
+			return (EINVAL);
+		limits = nvlist_get_nvlist(newlimits, name);
+		if (strcmp(name, "cmds") == 0)
+			error = grp_allowed_cmds(oldlimits, limits);
+		else if (strcmp(name, "fields") == 0)
+			error = grp_allowed_fields(oldlimits, limits);
+		else if (strcmp(name, "groups") == 0)
+			error = grp_allowed_groups(oldlimits, limits);
+		else
+			error = EINVAL;
+		if (error != 0)
+			return (error);
+	}
+
+	return (0);
+}
+
+static int
+grp_command(const char *cmd, const nvlist_t *limits, nvlist_t *nvlin,
+    nvlist_t *nvlout)
+{
+	int error;
+
+	if (!grp_allowed_cmd(limits, cmd))
+		return (ENOTCAPABLE);
+
+	if (strcmp(cmd, "getgrent") == 0 || strcmp(cmd, "getgrent_r") == 0)
+		error = grp_getgrent(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "getgrnam") == 0 || strcmp(cmd, "getgrnam_r") == 0)
+		error = grp_getgrnam(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "getgrgid") == 0 || strcmp(cmd, "getgrgid_r") == 0)
+		error = grp_getgrgid(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "setgroupent") == 0)
+		error = grp_setgroupent(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "setgrent") == 0)
+		error = grp_setgrent(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "endgrent") == 0)
+		error = grp_endgrent(limits, nvlin, nvlout);
+	else
+		error = EINVAL;
+
+	return (error);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	return (service_start("system.grp", PARENT_FILENO, grp_limit,
+	    grp_command, argc, argv));
+}
diff --git a/libexec/casper/pwd/Makefile b/libexec/casper/pwd/Makefile
new file mode 100644
index 00000000000..b2dcfec341e
--- /dev/null
+++ b/libexec/casper/pwd/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
+
+PROG=	pwd
+
+SRCS=	pwd.c
+
+DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
+
+BINDIR=	/libexec/casper
+
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum
+CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
+CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
+CFLAGS+=-I${.CURDIR}/../../../sbin/casper
+
+NO_MAN=
+
+.include <bsd.prog.mk>
diff --git a/libexec/casper/pwd/pwd.c b/libexec/casper/pwd/pwd.c
new file mode 100644
index 00000000000..be51ad0c221
--- /dev/null
+++ b/libexec/casper/pwd/pwd.c
@@ -0,0 +1,429 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <errno.h>
+#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <libcapsicum.h>
+#include <libcasper.h>
+#include <nv.h>
+#include <pjdlog.h>
+
+static bool
+pwd_allowed_cmd(const nvlist_t *limits, const char *cmd)
+{
+
+	if (limits == NULL)
+		return (true);
+
+	/*
+	 * If no limit was set on allowed commands, then all commands
+	 * are allowed.
+	 */
+	if (!nvlist_exists_nvlist(limits, "cmds"))
+		return (true);
+
+	limits = nvlist_get_nvlist(limits, "cmds");
+	return (nvlist_exists_null(limits, cmd));
+}
+
+static int
+pwd_allowed_cmds(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const char *name;
+	void *cookie;
+	int type;
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		if (type != NV_TYPE_NULL)
+			return (EINVAL);
+		if (!pwd_allowed_cmd(oldlimits, name))
+			return (ENOTCAPABLE);
+	}
+
+	return (0);
+}
+
+static bool
+pwd_allowed_user(const nvlist_t *limits, const char *uname, uid_t uid)
+{
+	const char *name;
+	void *cookie;
+	int type;
+
+	if (limits == NULL)
+		return (true);
+
+	/*
+	 * If no limit was set on allowed users, then all users are allowed.
+	 */
+	if (!nvlist_exists_nvlist(limits, "users"))
+		return (true);
+
+	limits = nvlist_get_nvlist(limits, "users");
+	cookie = NULL;
+	while ((name = nvlist_next(limits, &type, &cookie)) != NULL) {
+		switch (type) {
+		case NV_TYPE_NUMBER:
+			if (uid != (uid_t)-1 &&
+			    nvlist_get_number(limits, name) == (uint64_t)uid) {
+				return (true);
+			}
+			break;
+		case NV_TYPE_STRING:
+			if (uname != NULL &&
+			    strcmp(nvlist_get_string(limits, name),
+			    uname) == 0) {
+				return (true);
+			}
+			break;
+		default:
+			PJDLOG_ABORT("Unexpected type %d.", type);
+		}
+	}
+
+	return (false);
+}
+
+static int
+pwd_allowed_users(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const char *name, *uname;
+	void *cookie;
+	uid_t uid;
+	int type;
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		switch (type) {
+		case NV_TYPE_NUMBER:
+			uid = (uid_t)nvlist_get_number(newlimits, name);
+			uname = NULL;
+			break;
+		case NV_TYPE_STRING:
+			uid = (uid_t)-1;
+			uname = nvlist_get_string(newlimits, name);
+			break;
+		default:
+			return (EINVAL);
+		}
+		if (!pwd_allowed_user(oldlimits, uname, uid))
+			return (ENOTCAPABLE);
+	}
+
+	return (0);
+}
+
+static bool
+pwd_allowed_field(const nvlist_t *limits, const char *field)
+{
+
+	if (limits == NULL)
+		return (true);
+
+	/*
+	 * If no limit was set on allowed fields, then all fields are allowed.
+	 */
+	if (!nvlist_exists_nvlist(limits, "fields"))
+		return (true);
+
+	limits = nvlist_get_nvlist(limits, "fields");
+	return (nvlist_exists_null(limits, field));
+}
+
+static int
+pwd_allowed_fields(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const char *name;
+	void *cookie;
+	int type;
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		if (type != NV_TYPE_NULL)
+			return (EINVAL);
+		if (!pwd_allowed_field(oldlimits, name))
+			return (ENOTCAPABLE);
+	}
+
+	return (0);
+}
+
+static bool
+pwd_pack(const nvlist_t *limits, const struct passwd *pwd, nvlist_t *nvl)
+{
+	int fields;
+
+	if (pwd == NULL)
+		return (true);
+
+	/*
+	 * If either name or UID is allowed, we allow it.
+	 */
+	if (!pwd_allowed_user(limits, pwd->pw_name, pwd->pw_uid))
+		return (false);
+
+	fields = pwd->pw_fields;
+
+	if (pwd_allowed_field(limits, "pw_name")) {
+		nvlist_add_string(nvl, "pw_name", pwd->pw_name);
+	} else {
+		nvlist_add_string(nvl, "pw_name", "");
+		fields &= ~_PWF_NAME;
+	}
+	if (pwd_allowed_field(limits, "pw_uid")) {
+		nvlist_add_number(nvl, "pw_uid", (uint64_t)pwd->pw_uid);
+	} else {
+		nvlist_add_number(nvl, "pw_uid", (uint64_t)-1);
+		fields &= ~_PWF_UID;
+	}
+	if (pwd_allowed_field(limits, "pw_gid")) {
+		nvlist_add_number(nvl, "pw_gid", (uint64_t)pwd->pw_gid);
+	} else {
+		nvlist_add_number(nvl, "pw_gid", (uint64_t)-1);
+		fields &= ~_PWF_GID;
+	}
+	if (pwd_allowed_field(limits, "pw_change")) {
+		nvlist_add_number(nvl, "pw_change", (uint64_t)pwd->pw_change);
+	} else {
+		nvlist_add_number(nvl, "pw_change", (uint64_t)0);
+		fields &= ~_PWF_CHANGE;
+	}
+	if (pwd_allowed_field(limits, "pw_passwd")) {
+		nvlist_add_string(nvl, "pw_passwd", pwd->pw_passwd);
+	} else {
+		nvlist_add_string(nvl, "pw_passwd", "");
+		fields &= ~_PWF_PASSWD;
+	}
+	if (pwd_allowed_field(limits, "pw_class")) {
+		nvlist_add_string(nvl, "pw_class", pwd->pw_class);
+	} else {
+		nvlist_add_string(nvl, "pw_class", "");
+		fields &= ~_PWF_CLASS;
+	}
+	if (pwd_allowed_field(limits, "pw_gecos")) {
+		nvlist_add_string(nvl, "pw_gecos", pwd->pw_gecos);
+	} else {
+		nvlist_add_string(nvl, "pw_gecos", "");
+		fields &= ~_PWF_GECOS;
+	}
+	if (pwd_allowed_field(limits, "pw_dir")) {
+		nvlist_add_string(nvl, "pw_dir", pwd->pw_dir);
+	} else {
+		nvlist_add_string(nvl, "pw_dir", "");
+		fields &= ~_PWF_DIR;
+	}
+	if (pwd_allowed_field(limits, "pw_shell")) {
+		nvlist_add_string(nvl, "pw_shell", pwd->pw_shell);
+	} else {
+		nvlist_add_string(nvl, "pw_shell", "");
+		fields &= ~_PWF_SHELL;
+	}
+	if (pwd_allowed_field(limits, "pw_expire")) {
+		nvlist_add_number(nvl, "pw_expire", (uint64_t)pwd->pw_expire);
+	} else {
+		nvlist_add_number(nvl, "pw_expire", (uint64_t)0);
+		fields &= ~_PWF_EXPIRE;
+	}
+	nvlist_add_number(nvl, "pw_fields", (uint64_t)fields);
+
+	return (true);
+}
+
+static int
+pwd_getpwent(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	struct passwd *pwd;
+
+	for (;;) {
+		errno = 0;
+		pwd = getpwent();
+		if (errno != 0)
+			return (errno);
+		if (pwd_pack(limits, pwd, nvlout))
+			return (0);
+	}
+
+	/* NOTREACHED */
+}
+
+static int
+pwd_getpwnam(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	struct passwd *pwd;
+	const char *name;
+
+	if (!nvlist_exists_string(nvlin, "name"))
+		return (EINVAL);
+	name = nvlist_get_string(nvlin, "name");
+	PJDLOG_ASSERT(name != NULL);
+
+	errno = 0;
+	pwd = getpwnam(name);
+	if (errno != 0)
+		return (errno);
+
+	(void)pwd_pack(limits, pwd, nvlout);
+
+	return (0);
+}
+
+static int
+pwd_getpwuid(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	struct passwd *pwd;
+	uid_t uid;
+
+	if (!nvlist_exists_number(nvlin, "uid"))
+		return (EINVAL);
+
+	uid = (uid_t)nvlist_get_number(nvlin, "uid");
+
+	errno = 0;
+	pwd = getpwuid(uid);
+	if (errno != 0)
+		return (errno);
+
+	(void)pwd_pack(limits, pwd, nvlout);
+
+	return (0);
+}
+
+static int
+pwd_setpassent(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+	int stayopen;
+
+	if (!nvlist_exists_bool(nvlin, "stayopen"))
+		return (EINVAL);
+
+	stayopen = nvlist_get_bool(nvlin, "stayopen") ? 1 : 0;
+
+	return (setpassent(stayopen) == 0 ? EFAULT : 0);
+}
+
+static int
+pwd_setpwent(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+
+	setpwent();
+
+	return (0);
+}
+
+static int
+pwd_endpwent(const nvlist_t *limits, const nvlist_t *nvlin, nvlist_t *nvlout)
+{
+
+	endpwent();
+
+	return (0);
+}
+
+static int
+pwd_limit(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const nvlist_t *limits;
+	const char *name;
+	void *cookie;
+	int error, type;
+
+	if (oldlimits != NULL && nvlist_exists_nvlist(oldlimits, "cmds") &&
+	    !nvlist_exists_nvlist(newlimits, "cmds")) {
+		return (ENOTCAPABLE);
+	}
+	if (oldlimits != NULL && nvlist_exists_nvlist(oldlimits, "fields") &&
+	    !nvlist_exists_nvlist(newlimits, "fields")) {
+		return (ENOTCAPABLE);
+	}
+	if (oldlimits != NULL && nvlist_exists_nvlist(oldlimits, "users") &&
+	    !nvlist_exists_nvlist(newlimits, "users")) {
+		return (ENOTCAPABLE);
+	}
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		if (type != NV_TYPE_NVLIST)
+			return (EINVAL);
+		limits = nvlist_get_nvlist(newlimits, name);
+		if (strcmp(name, "cmds") == 0)
+			error = pwd_allowed_cmds(oldlimits, limits);
+		else if (strcmp(name, "fields") == 0)
+			error = pwd_allowed_fields(oldlimits, limits);
+		else if (strcmp(name, "users") == 0)
+			error = pwd_allowed_users(oldlimits, limits);
+		else
+			error = EINVAL;
+		if (error != 0)
+			return (error);
+	}
+
+	return (0);
+}
+
+static int
+pwd_command(const char *cmd, const nvlist_t *limits, nvlist_t *nvlin,
+    nvlist_t *nvlout)
+{
+	int error;
+
+	if (!pwd_allowed_cmd(limits, cmd))
+		return (ENOTCAPABLE);
+
+	if (strcmp(cmd, "getpwent") == 0 || strcmp(cmd, "getpwent_r") == 0)
+		error = pwd_getpwent(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "getpwnam") == 0 || strcmp(cmd, "getpwnam_r") == 0)
+		error = pwd_getpwnam(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "getpwuid") == 0 || strcmp(cmd, "getpwuid_r") == 0)
+		error = pwd_getpwuid(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "setpassent") == 0)
+		error = pwd_setpassent(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "setpwent") == 0)
+		error = pwd_setpwent(limits, nvlin, nvlout);
+	else if (strcmp(cmd, "endpwent") == 0)
+		error = pwd_endpwent(limits, nvlin, nvlout);
+	else
+		error = EINVAL;
+
+	return (error);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	return (service_start("system.pwd", PARENT_FILENO, pwd_limit,
+	    pwd_command, argc, argv));
+}
diff --git a/libexec/casper/random/Makefile b/libexec/casper/random/Makefile
new file mode 100644
index 00000000000..87efe212c36
--- /dev/null
+++ b/libexec/casper/random/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
+
+PROG=	random
+
+SRCS=	random.c
+
+DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
+
+BINDIR=	/libexec/casper
+
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum
+CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
+CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
+CFLAGS+=-I${.CURDIR}/../../../sbin/casper
+
+NO_MAN=
+
+.include <bsd.prog.mk>
diff --git a/libexec/casper/random/random.c b/libexec/casper/random/random.c
new file mode 100644
index 00000000000..56f1afbf035
--- /dev/null
+++ b/libexec/casper/random/random.c
@@ -0,0 +1,81 @@
+/*-
+ * Copyright (c) 2012-2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <libcapsicum.h>
+#include <libcasper.h>
+#include <nv.h>
+#include <pjdlog.h>
+
+#define	MAXSIZE	(1024 * 1024)
+
+static int
+random_command(const char *cmd, const nvlist_t *limits, nvlist_t *nvlin,
+    nvlist_t *nvlout)
+{
+	void *data;
+	size_t size;
+
+	if (strcmp(cmd, "generate") != 0)
+		return (EINVAL);
+	if (!nvlist_exists_number(nvlin, "size"))
+		return (EINVAL);
+
+	size = (size_t)nvlist_get_number(nvlin, "size");
+	if (size == 0 || size > MAXSIZE)
+		return (EINVAL);
+
+	data = malloc(size);
+	if (data == NULL)
+		return (ENOMEM);
+
+	arc4random_buf(data, size);
+
+	nvlist_move_binary(nvlout, "data", data, size);
+
+	return (0);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	/*
+	 * TODO: Sandbox this.
+	 */
+
+	return (service_start("system.random", PARENT_FILENO, NULL,
+	    random_command, argc, argv));
+}
diff --git a/libexec/casper/sysctl/Makefile b/libexec/casper/sysctl/Makefile
new file mode 100644
index 00000000000..dc15099bc1f
--- /dev/null
+++ b/libexec/casper/sysctl/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR} ${.CURDIR}/../../../sbin/casper
+
+PROG=	sysctl
+
+SRCS=	sysctl.c
+
+DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
+
+BINDIR=	/libexec/casper
+
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../../../lib/libcapsicum
+CFLAGS+=-I${.CURDIR}/../../../lib/libcasper
+CFLAGS+=-I${.CURDIR}/../../../lib/libpjdlog
+CFLAGS+=-I${.CURDIR}/../../../sbin/casper
+
+NO_MAN=
+
+.include <bsd.prog.mk>
diff --git a/libexec/casper/sysctl/sysctl.c b/libexec/casper/sysctl/sysctl.c
new file mode 100644
index 00000000000..8bb43b6b8bd
--- /dev/null
+++ b/libexec/casper/sysctl/sysctl.c
@@ -0,0 +1,249 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <libcapsicum.h>
+#include <libcapsicum_sysctl.h>
+#include <libcasper.h>
+#include <nv.h>
+#include <pjdlog.h>
+
+static int
+sysctl_check_one(const nvlist_t *nvl, bool islimit)
+{
+	const char *name;
+	void *cookie;
+	int type;
+	unsigned int fields;
+
+	/* NULL nvl is of course invalid. */
+	if (nvl == NULL)
+		return (EINVAL);
+	if (nvlist_error(nvl) != 0)
+		return (nvlist_error(nvl));
+
+#define	HAS_NAME	0x01
+#define	HAS_OPERATION	0x02
+
+	fields = 0;
+	cookie = NULL;
+	while ((name = nvlist_next(nvl, &type, &cookie)) != NULL) {
+		/* We accept only one 'name' and one 'operation' in nvl. */
+		if (strcmp(name, "name") == 0) {
+			if (type != NV_TYPE_STRING)
+				return (EINVAL);
+			/* Only one 'name' can be present. */
+			if ((fields & HAS_NAME) != 0)
+				return (EINVAL);
+			fields |= HAS_NAME;
+		} else if (strcmp(name, "operation") == 0) {
+			uint64_t operation;
+
+			if (type != NV_TYPE_NUMBER)
+				return (EINVAL);
+			/*
+			 * We accept only CAP_SYSCTL_READ and
+			 * CAP_SYSCTL_WRITE flags.
+			 */
+			operation = nvlist_get_number(nvl, name);
+			if ((operation & ~(CAP_SYSCTL_RDWR)) != 0)
+				return (EINVAL);
+			/* ...but there has to be at least one of them. */
+			if ((operation & (CAP_SYSCTL_RDWR)) == 0)
+				return (EINVAL);
+			/* Only one 'operation' can be present. */
+			if ((fields & HAS_OPERATION) != 0)
+				return (EINVAL);
+			fields |= HAS_OPERATION;
+		} else if (islimit) {
+			/* If this is limit, there can be no other fields. */
+			return (EINVAL);
+		}
+	}
+
+	/* Both fields has to be there. */
+	if (fields != (HAS_NAME | HAS_OPERATION))
+		return (EINVAL);
+
+#undef	HAS_OPERATION
+#undef	HAS_NAME
+
+	return (0);
+}
+
+static bool
+sysctl_allowed(const nvlist_t *limits, const char *chname, uint64_t choperation)
+{
+	uint64_t operation;
+	const char *name;
+	void *cookie;
+	int type;
+
+	if (limits == NULL)
+		return (true);
+
+	cookie = NULL;
+	while ((name = nvlist_next(limits, &type, &cookie)) != NULL) {
+		PJDLOG_ASSERT(type == NV_TYPE_NUMBER);
+
+		operation = nvlist_get_number(limits, name);
+		if ((operation & choperation) != choperation)
+			continue;
+
+		if ((operation & CAP_SYSCTL_RECURSIVE) == 0) {
+			if (strcmp(name, chname) != 0)
+				continue;
+		} else {
+			size_t namelen;
+
+			namelen = strlen(name);
+			if (strncmp(name, chname, namelen) != 0)
+				continue;
+			if (chname[namelen] != '.' && chname[namelen] != '\0')
+				continue;
+		}
+
+		return (true);
+	}
+
+	return (false);
+}
+
+static int
+sysctl_limit(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const nvlist_t *nvl;
+	const char *name;
+	void *cookie;
+	uint64_t operation;
+	int error, type;
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		if (type != NV_TYPE_NUMBER)
+			return (EINVAL);
+		operation = nvlist_get_number(newlimits, name);
+		if ((operation & ~(CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE)) != 0)
+			return (EINVAL);
+		if ((operation & (CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE)) == 0)
+			return (EINVAL);
+		if (!sysctl_allowed(oldlimits, name, operation))
+			return (ENOTCAPABLE);
+	}
+
+	return (0);
+}
+
+static int
+sysctl_command(const char *cmd, const nvlist_t *limits, nvlist_t *nvlin,
+    nvlist_t *nvlout)
+{
+	const char *name;
+	const void *newp;
+	void *oldp;
+	uint64_t operation;
+	size_t oldlen, newlen;
+	size_t *oldlenp;
+	int error;
+
+	if (strcmp(cmd, "sysctl") != 0)
+		return (EINVAL);
+	error = sysctl_check_one(nvlin, false);
+	if (error != 0)
+		return (error);
+
+	name = nvlist_get_string(nvlin, "name");
+	operation = nvlist_get_number(nvlin, "operation");
+	if (!sysctl_allowed(limits, name, operation))
+		return (ENOTCAPABLE);
+
+	if ((operation & CAP_SYSCTL_WRITE) != 0) {
+		if (!nvlist_exists_binary(nvlin, "newp"))
+			return (EINVAL);
+		newp = nvlist_get_binary(nvlin, "newp", &newlen);
+		PJDLOG_ASSERT(newp != NULL && newlen > 0);
+	} else {
+		newp = NULL;
+		newlen = 0;
+	}
+
+	if ((operation & CAP_SYSCTL_READ) != 0) {
+		if (nvlist_exists_null(nvlin, "justsize")) {
+			oldp = NULL;
+			oldlen = 0;
+			oldlenp = &oldlen;
+		} else {
+			if (!nvlist_exists_number(nvlin, "oldlen"))
+				return (EINVAL);
+			oldlen = (size_t)nvlist_get_number(nvlin, "oldlen");
+			if (oldlen == 0)
+				return (EINVAL);
+			oldp = calloc(1, oldlen);
+			if (oldp == NULL)
+				return (ENOMEM);
+			oldlenp = &oldlen;
+		}
+	} else {
+		oldp = NULL;
+		oldlen = 0;
+		oldlenp = NULL;
+	}
+
+	if (sysctlbyname(name, oldp, oldlenp, newp, newlen) == -1) {
+		error = errno;
+		free(oldp);
+		return (error);
+	}
+
+	if ((operation & CAP_SYSCTL_READ) != 0) {
+		if (nvlist_exists_null(nvlin, "justsize"))
+			nvlist_add_number(nvlout, "oldlen", (uint64_t)oldlen);
+		else
+			nvlist_move_binary(nvlout, "oldp", oldp, oldlen);
+	}
+
+	return (0);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	return (service_start("system.sysctl", PARENT_FILENO, sysctl_limit,
+	    sysctl_command, argc, argv));
+}
diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c
index ddd9cfbc2ae..2f6b64b68fc 100644
--- a/libexec/rbootd/bpf.c
+++ b/libexec/rbootd/bpf.c
@@ -237,19 +237,11 @@ BpfGetIntfName(char **errmsg)
 	ifc.ifc_len = sizeof ibuf;
 	ifc.ifc_buf = (caddr_t)ibuf;
 
-#ifdef OSIOCGIFCONF
-	if (ioctl(fd, OSIOCGIFCONF, (char *)&ifc) < 0 ||
-	    ifc.ifc_len < sizeof(struct ifreq)) {
-		(void) strcpy(errbuf, "bpf: ioctl(OSIOCGIFCONF): %m");
-		return(NULL);
-	}
-#else
 	if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0 ||
 	    ifc.ifc_len < sizeof(struct ifreq)) {
 		(void) strcpy(errbuf, "bpf: ioctl(SIOCGIFCONF): %m");
 		return(NULL);
 	}
-#endif
 	ifrp = ibuf;
 	ifend = (struct ifreq *)((char *)ibuf + ifc.ifc_len);
 
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index f690d75f134..24e56b76c00 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -116,6 +116,7 @@ static Objlist_Entry *objlist_find(Objlist *, const Obj_Entry *);
 static void objlist_init(Objlist *);
 static void objlist_push_head(Objlist *, Obj_Entry *);
 static void objlist_push_tail(Objlist *, Obj_Entry *);
+static void objlist_put_after(Objlist *, Obj_Entry *, Obj_Entry *);
 static void objlist_remove(Objlist *, Obj_Entry *);
 static void *path_enumerate(const char *, path_enum_proc, void *);
 static int relocate_object_dag(Obj_Entry *root, bool bind_now,
@@ -230,6 +231,7 @@ char **main_argv;
 size_t tls_last_offset;		/* Static TLS offset of last module */
 size_t tls_last_size;		/* Static TLS size of last module */
 size_t tls_static_space;	/* Static TLS space allocated */
+size_t tls_static_max_align;
 int tls_dtv_generation = 1;	/* Used to detect when dtv size changes  */
 int tls_max_index = 1;		/* Largest module index allocated */
 
@@ -323,6 +325,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
     Objlist_Entry *entry;
     Obj_Entry *obj;
     Obj_Entry **preload_tail;
+    Obj_Entry *last_interposer;
     Objlist initlist;
     RtldLockState lockstate;
     char *library_path_rpath;
@@ -537,8 +540,14 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp)
 	die();
 
     /* Make a list of all objects loaded at startup. */
+    last_interposer = obj_main;
     for (obj = obj_list;  obj != NULL;  obj = obj->next) {
-	objlist_push_tail(&list_main, obj);
+	if (obj->z_interpose && obj != obj_main) {
+	    objlist_put_after(&list_main, last_interposer, obj);
+	    last_interposer = obj;
+	} else {
+	    objlist_push_tail(&list_main, obj);
+	}
     	obj->refcount++;
     }
 
@@ -1128,6 +1137,8 @@ digest_dynamic1(Obj_Entry *obj, int early, const Elf_Dyn **dyn_rpath,
 		    obj->z_nodelete = true;
 		if (dynp->d_un.d_val & DF_1_LOADFLTR)
 		    obj->z_loadfltr = true;
+		if (dynp->d_un.d_val & DF_1_INTERPOSE)
+		    obj->z_interpose = true;
 		if (dynp->d_un.d_val & DF_1_NODEFLIB)
 		    obj->z_nodeflib = true;
 	    break;
@@ -1976,6 +1987,7 @@ static int
 load_preload_objects(void)
 {
     char *p = ld_preload;
+    Obj_Entry *obj;
     static const char delim[] = " \t:;";
 
     if (p == NULL)
@@ -1988,8 +2000,10 @@ load_preload_objects(void)
 
 	savech = p[len];
 	p[len] = '\0';
-	if (load_object(p, -1, NULL, 0) == NULL)
+	obj = load_object(p, -1, NULL, 0);
+	if (obj == NULL)
 	    return -1;	/* XXX - cleanup */
+	obj->z_interpose = true;
 	p[len] = savech;
 	p += len;
 	p += strspn(p, delim);
@@ -2377,6 +2391,23 @@ objlist_push_tail(Objlist *list, Obj_Entry *obj)
     STAILQ_INSERT_TAIL(list, elm, link);
 }
 
+static void
+objlist_put_after(Objlist *list, Obj_Entry *listobj, Obj_Entry *obj)
+{
+	Objlist_Entry *elm, *listelm;
+
+	STAILQ_FOREACH(listelm, list, link) {
+		if (listelm->obj == listobj)
+			break;
+	}
+	elm = NEW(Objlist_Entry);
+	elm->obj = obj;
+	if (listelm != NULL)
+		STAILQ_INSERT_AFTER(list, listelm, elm, link);
+	else
+		STAILQ_INSERT_TAIL(list, elm, link);
+}
+
 static void
 objlist_remove(Objlist *list, Obj_Entry *obj)
 {
@@ -3239,6 +3270,11 @@ dl_iterate_phdr(__dl_iterate_hdr_callback callback, void *param)
 		break;
 
     }
+    if (error == 0) {
+	rtld_fill_dl_phdr_info(&obj_rtld, &phdr_info);
+	error = callback(&phdr_info, sizeof(phdr_info), param);
+    }
+
     lock_release(rtld_bind_lock, &bind_lockstate);
     lock_release(rtld_phdr_lock, &phdr_lockstate);
 
@@ -4246,19 +4282,22 @@ void *
 allocate_tls(Obj_Entry *objs, void *oldtls, size_t tcbsize, size_t tcbalign)
 {
     Obj_Entry *obj;
-    size_t size;
+    size_t size, ralign;
     char *tls;
     Elf_Addr *dtv, *olddtv;
     Elf_Addr segbase, oldsegbase, addr;
     int i;
 
-    size = round(tls_static_space, tcbalign);
+    ralign = tcbalign;
+    if (tls_static_max_align > ralign)
+	    ralign = tls_static_max_align;
+    size = round(tls_static_space, ralign) + round(tcbsize, ralign);
 
     assert(tcbsize >= 2*sizeof(Elf_Addr));
-    tls = xcalloc(1, size + tcbsize);
+    tls = malloc_aligned(size, ralign);
     dtv = xcalloc(tls_max_index + 2, sizeof(Elf_Addr));
 
-    segbase = (Elf_Addr)(tls + size);
+    segbase = (Elf_Addr)(tls + round(tls_static_space, ralign));
     ((Elf_Addr*)segbase)[0] = segbase;
     ((Elf_Addr*)segbase)[1] = (Elf_Addr) dtv;
 
@@ -4310,8 +4349,8 @@ allocate_tls(Obj_Entry *objs, void *oldtls, size_t tcbsize, size_t tcbalign)
 void
 free_tls(void *tls, size_t tcbsize, size_t tcbalign)
 {
-    size_t size;
     Elf_Addr* dtv;
+    size_t size, ralign;
     int dtvsize, i;
     Elf_Addr tlsstart, tlsend;
 
@@ -4319,19 +4358,22 @@ free_tls(void *tls, size_t tcbsize, size_t tcbalign)
      * Figure out the size of the initial TLS block so that we can
      * find stuff which ___tls_get_addr() allocated dynamically.
      */
-    size = round(tls_static_space, tcbalign);
+    ralign = tcbalign;
+    if (tls_static_max_align > ralign)
+	    ralign = tls_static_max_align;
+    size = round(tls_static_space, ralign);
 
     dtv = ((Elf_Addr**)tls)[1];
     dtvsize = dtv[1];
     tlsend = (Elf_Addr) tls;
     tlsstart = tlsend - size;
     for (i = 0; i < dtvsize; i++) {
-	if (dtv[i+2] && (dtv[i+2] < tlsstart || dtv[i+2] > tlsend)) {
-	    free((void*) dtv[i+2]);
+	if (dtv[i + 2] != 0 && (dtv[i + 2] < tlsstart || dtv[i + 2] > tlsend)) {
+		free_aligned((void *)dtv[i + 2]);
 	}
     }
 
-    free((void*) tlsstart);
+    free_aligned((void *)tlsstart);
     free((void*) dtv);
 }
 
@@ -4355,11 +4397,7 @@ allocate_module_tls(int index)
 	die();
     }
 
-    p = malloc(obj->tlssize);
-    if (p == NULL) {
-	_rtld_error("Cannot allocate TLS block for index %d", index);
-	die();
-    }
+    p = malloc_aligned(obj->tlssize, obj->tlsalign);
     memcpy(p, obj->tlsinit, obj->tlsinitsize);
     memset(p + obj->tlsinitsize, 0, obj->tlssize - obj->tlsinitsize);
 
@@ -4391,9 +4429,11 @@ allocate_tls_offset(Obj_Entry *obj)
      * leave a small amount of space spare to be used for dynamically
      * loading modules which use static TLS.
      */
-    if (tls_static_space) {
+    if (tls_static_space != 0) {
 	if (calculate_tls_end(off, obj->tlssize) > tls_static_space)
 	    return false;
+    } else if (obj->tlsalign > tls_static_max_align) {
+	    tls_static_max_align = obj->tlsalign;
     }
 
     tls_last_offset = obj->tlsoffset = off;
diff --git a/libexec/rtld-elf/rtld.h b/libexec/rtld-elf/rtld.h
index 0aba7cdc2fb..d186dcc18dc 100644
--- a/libexec/rtld-elf/rtld.h
+++ b/libexec/rtld-elf/rtld.h
@@ -259,6 +259,7 @@ typedef struct Struct_Obj_Entry {
     bool z_nodelete : 1;	/* Do not unload the object and dependencies */
     bool z_noopen : 1;		/* Do not load on dlopen */
     bool z_loadfltr : 1;	/* Immediately load filtees */
+    bool z_interpose : 1;	/* Interpose all objects but main */
     bool z_nodeflib : 1;	/* Don't search default library path */
     bool ref_nodel : 1;		/* Refcount increased to prevent dlclose */
     bool init_scanned: 1;	/* Object is already on init list. */
@@ -351,6 +352,8 @@ Obj_Entry *map_object(int, const char *, const struct stat *);
 void *xcalloc(size_t, size_t);
 void *xmalloc(size_t);
 char *xstrdup(const char *);
+void *malloc_aligned(size_t size, size_t align);
+void free_aligned(void *ptr);
 extern Elf_Addr _GLOBAL_OFFSET_TABLE_[];
 extern Elf_Sym sym_zero;	/* For resolving undefined weak refs. */
 
diff --git a/libexec/rtld-elf/xmalloc.c b/libexec/rtld-elf/xmalloc.c
index 178f49bda0d..3b3408c4e62 100644
--- a/libexec/rtld-elf/xmalloc.c
+++ b/libexec/rtld-elf/xmalloc.c
@@ -67,3 +67,33 @@ xstrdup(const char *str)
 	memcpy(copy, str, len);
 	return (copy);
 }
+
+void *
+malloc_aligned(size_t size, size_t align)
+{
+	void *mem, *res;
+	uintptr_t x;
+	size_t asize, r;
+
+	r = round(sizeof(void *), align);
+	asize = round(size, align) + r;
+	mem = xmalloc(asize);
+	x = (uintptr_t)mem;
+	res = (void *)round(x, align);
+	*(void **)((uintptr_t)res - sizeof(void *)) = mem;
+	return (res);
+}
+
+void
+free_aligned(void *ptr)
+{
+	void *mem;
+	uintptr_t x;
+
+	if (ptr == NULL)
+		return;
+	x = (uintptr_t)ptr;
+	x -= sizeof(void *);
+	mem = *(void **)x;
+	free(mem);
+}
diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile
new file mode 100644
index 00000000000..665efab4275
--- /dev/null
+++ b/libexec/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/libexec
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/release/Makefile b/release/Makefile
index 4921a0c64b5..89f9066ebbb 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -4,7 +4,9 @@
 # 
 # User-driven targets:
 #  cdrom: Builds release CD-ROM media (disc1.iso)
+#  dvdrom: Builds release DVD-ROM media (dvd1.iso)
 #  memstick: Builds memory stick image (memstick.img)
+#  mini-memstick: Builds minimal memory stick image (mini-memstick.img)
 #  ftp: Sets up FTP distribution area (ftp)
 #  release: Build all media and FTP distribution area
 #  install: Copies all release media into ${DESTDIR}
@@ -14,9 +16,11 @@
 #            (by default, the directory above this one) 
 #  PORTSDIR: location of ports tree to distribute (default: /usr/ports)
 #  DOCDIR:   location of doc tree (default: /usr/doc)
+#  NOPKG:    if set, do not distribute third-party packages
 #  NOPORTS:  if set, do not distribute ports tree
 #  NOSRC:    if set, do not distribute source tree
 #  NODOC:    if set, do not generate release documentation
+#  WITH_DVD: if set, generate dvd1.iso
 #  TARGET/TARGET_ARCH: architecture of built release 
 #
 
@@ -25,11 +29,15 @@ PORTSDIR?=	/usr/ports
 DOCDIR?=	/usr/doc
 RELNOTES_LANG?= en_US.ISO8859-1
 
-TARGET?=	${MACHINE}
+.if !defined(TARGET) || empty(TARGET)
+TARGET=		${MACHINE}
+.endif
+.if !defined(TARGET_ARCH) || empty(TARGET_ARCH)
 .if ${TARGET} == ${MACHINE}
-TARGET_ARCH?=	${MACHINE_ARCH}
+TARGET_ARCH=	${MACHINE_ARCH}
 .else
-TARGET_ARCH?=	${TARGET}
+TARGET_ARCH=	${TARGET}
+.endif
 .endif
 IMAKE=		${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
 DISTDIR=	dist
@@ -71,13 +79,24 @@ IMAGES=
 .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
 RELEASE_TARGETS+= cdrom
 IMAGES+=	disc1.iso bootonly.iso
+. if defined(WITH_DVD) && !empty(WITH_DVD)
+RELEASE_TARGETS+= dvdrom
+IMAGES+=	dvd1.iso
+. endif
 .endif
 .if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
 RELEASE_TARGETS+= memstick.img
+RELEASE_TARGETS+= mini-memstick.img
 IMAGES+=	memstick.img
+IMAGES+=	mini-memstick.img
 .endif
 
+CLEANFILES=	packagesystem *.txz MANIFEST system ${IMAGES}
+CLEANDIRS=	dist ftp release bootonly dvd
+beforeclean:
+	chflags -R noschg .
 .include <bsd.obj.mk>
+clean: beforeclean
 
 base.txz:
 	mkdir -p ${DISTDIR}
@@ -122,7 +141,8 @@ system: packagesystem
 # Install system
 	mkdir -p release
 	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
-	    DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1
+		DESTDIR=${.OBJDIR}/release WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \
+		WITHOUT_PROFILE=1
 # Copy distfiles
 	mkdir -p release/usr/freebsd-dist
 	cp *.txz MANIFEST release/usr/freebsd-dist
@@ -160,10 +180,32 @@ bootonly: packagesystem
 	echo hostid_enable=\"NO\" >> bootonly/etc/rc.conf
 	cp ${.CURDIR}/rc.local bootonly/etc
 
+dvd:
+# Install system
+	mkdir -p ${.TARGET}
+	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
+		DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1
+# Copy distfiles
+	mkdir -p ${.TARGET}/usr/freebsd-dist
+	cp *.txz MANIFEST ${.TARGET}/usr/freebsd-dist
+# Copy documentation, if generated
+.if !defined(NODOC)
+	cp reldoc/* ${.TARGET}
+.endif
+# Set up installation environment
+	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
+	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
+	echo hostid_enable=\"NO\" >> ${.TARGET}/etc/rc.conf
+	cp ${.CURDIR}/rc.local ${.TARGET}/etc
+	touch ${.TARGET}
+
 release.iso: disc1.iso
 disc1.iso: system
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} release
 
+dvd1.iso: dvd pkg-stage
+	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} dvd
+
 bootonly.iso: bootonly
 	sh ${.CURDIR}/${TARGET}/mkisoimages.sh -b FreeBSD_Install ${.TARGET} bootonly
 
@@ -171,11 +213,22 @@ memstick: memstick.img
 memstick.img: system
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh release ${.TARGET}
 
+mini-memstick: mini-memstick.img
+mini-memstick.img: system
+	sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET}
+
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
 	touch ${.TARGET}
 
+pkg-stage:
+.if !defined(NOPKG) && exists(${.CURDIR}/${TARGET}/pkg-stage.conf)
+	sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
+		${REVISION}
+.endif
+
 cdrom: disc1.iso bootonly.iso
+dvdrom: dvd1.iso
 ftp: packagesystem
 	rm -rf ftp
 	mkdir -p ftp
@@ -185,15 +238,6 @@ release:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
 
-clean:
-	chflags -R noschg .
-	rm -rf dist ftp
-	rm -f packagesystem
-	rm -f *.txz MANIFEST
-	rm -f system
-	rm -rf release bootonly
-	rm -f disc1.iso bootonly.iso memstick.img
-
 install:
 .if defined(DESTDIR) && !empty(DESTDIR)
 	mkdir -p ${DESTDIR}
diff --git a/release/amd64/pkg-stage.conf b/release/amd64/pkg-stage.conf
new file mode 100755
index 00000000000..4ea7dc40e80
--- /dev/null
+++ b/release/amd64/pkg-stage.conf
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:64"
+export ASSUME_ALWAYS_YES=1
+export __PKG_CONF="/etc/pkg/FreeBSD.conf"
+export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/latest"
+export MIRROR_TYPE="SRV"
+export REPO_AUTOUPDATE="NO"
+export PKG_DBDIR="/tmp/pkg"
+export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
+export PERMISSIVE="YES"
+export PKGCMD="/usr/sbin/pkg -d -C ${__PKG_CONF}"
+
+DVD_PACKAGES="archivers/unzip
+devel/subversion
+devel/subversion-static
+emulators/linux_base-f10
+misc/freebsd-doc-all
+net/mpd5
+net/rsync
+ports-mgmt/pkg
+ports-mgmt/portaudit
+ports-mgmt/portmaster
+shells/bash
+shells/zsh
+security/sudo
+sysutils/screen
+www/firefox
+www/links
+x11-drivers/xf86-video-vmware
+x11/gnome2
+x11/kde4
+x11/xorg"
diff --git a/release/doc/de_DE.ISO8859-1/early-adopter/article.xml b/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
index ae4e1e8a2c1..52aa9250a5d 100644
--- a/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
+++ b/release/doc/de_DE.ISO8859-1/early-adopter/article.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 
-<!ENTITY release.4x "4.<replaceable>X</replaceable>">
-<!ENTITY release.5x "5.<replaceable>X</replaceable>">
+<!ENTITY release.4x "4.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
+<!ENTITY release.5x "5.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
 ]>
-
 <!--
   The FreeBSD Documentation Project
   The FreeBSD German Documentation Project
@@ -15,14 +14,13 @@
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/early-adopter/article.xml,v 1.24 2003/05/25 12:44:41 mheinen Exp $
   basiert auf: 1.15
 -->
-
-<article lang="de">
-  <articleinfo>
-    <title>Hinweise f&uuml;r die ersten Anwender von &os;
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
+  <info><title>Hinweise f&uuml;r die ersten Anwender von &os;
       &release.current;</title>
+    
 
     <authorgroup>
-      <corpauthor>The &os; Release Engineering Team</corpauthor>
+      <author><orgname>The &os; Release Engineering Team</orgname></author>
     </authorgroup>
 
     <pubdate>$FreeBSD$</pubdate>
@@ -48,9 +46,9 @@
 	ein paar Hinweise f&uuml;r die Aktualisierung bestehender
 	Systeme.</para>
     </abstract>
-  </articleinfo>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>Einf&uuml;hrung</title>
 
     <para>Nach &uuml;ber zwei Jahren steht mit &os; &release.5x;
@@ -101,7 +99,7 @@
       &release.4x; Systems auf 5.0 beachtet werden mu&szlig;.</para>
   </sect1>
 
-  <sect1 id="release-overview">
+  <sect1 xml:id="release-overview">
     <title>Ver&ouml;ffentlichung neuer &os;-Versionen</title>
 
     <para>Das Prinzip der &os;-Entwicklung ist die Verwendung mehrerer
@@ -157,17 +155,14 @@
 
     <para>Weitere Informationen &uuml;ber den Ablauf bei der
       Ver&ouml;ffentlichung einer neuen &os; Version finden Sie auf
-      den <ulink
-      url="http://www.FreeBSD.org/releng/index.html">Release
-      Engineering Web pages</ulink> und im Artikel <ulink
-      url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/index.html">&os;
-      Release Engineering</ulink>.  Informationen &uuml;ber den
-      geplanten Entwicklungszweig 5-STABLE finden Sie auf der <ulink
-      url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"><quote>The
-      Roadmap for 5-STABLE</quote></ulink>.</para>
+      den <link xlink:href="http://www.FreeBSD.org/releng/index.html">Release
+      Engineering Web pages</link> und im Artikel <link xlink:href="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/index.html">&os;
+      Release Engineering</link>.  Informationen &uuml;ber den
+      geplanten Entwicklungszweig 5-STABLE finden Sie auf der <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/5-roadmap/index.html"><quote>The
+      Roadmap for 5-STABLE</quote></link>.</para>
   </sect1>
 
-  <sect1 id="new">
+  <sect1 xml:id="new">
     <title>Neuerungen</title>
 
     <para>Die Glanzpunkte von &os; &release.5x; sind die vielen Neuerungen.
@@ -252,7 +247,7 @@
       f&uuml;r &os; &release.prev; und &release.current;.</para>
   </sect1>
 
-  <sect1 id="drawbacks">
+  <sect1 xml:id="drawbacks">
     <title>Nachteile f&uuml;r fr&uuml;he Anwender</title>
 
     <para>Ein Nachteil der Neuerungen in &os; &release.5x; ist,
@@ -334,10 +329,8 @@
       </listitem>
 
       <listitem>
-	<para>Die Dokumentation (wie z.B. das &os; <ulink
-	  url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/index.html">Handbuch</ulink>
-	  und der <ulink
-	  url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/faq/index.html">FAQ</ulink>)
+	<para>Die Dokumentation (wie z.B. das &os; <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/index.html">Handbuch</link>
+	  und der <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/faq/index.html">FAQ</link>)
 	  ist teilweise noch nicht auf dem Stand von
 	  &os; &release.5x;.</para>
       </listitem>
@@ -351,7 +344,7 @@
       geworden sind.</para>
   </sect1>
 
-  <sect1 id="plans-stable">
+  <sect1 xml:id="plans-stable">
     <title>Die Zukunft des Entwicklungszweiges 4-STABLE</title>
 
     <para>Die Ver&ouml;ffentlichung von &os; 5.0 bedeutete nicht das
@@ -380,9 +373,8 @@
     <para>Neue Versionen auf Basis des Entwicklungszweiges 4-STABLE
       werden vom &a.security-officer; im &uuml;blichen Rahmen
       unterst&uuml;tzt werden, genauere Informationen dazu finden Sie
-      auf der <ulink
-      url="http://www.FreeBSD.org/security/index.html">Security
-      page</ulink> auf der &os; Webseite.  In der Regel werden die
+      auf der <link xlink:href="http://www.FreeBSD.org/security/index.html">Security
+      page</link> auf der &os; Webseite.  In der Regel werden die
       letzten beiden Versionen jedes Entwicklungszweiges durch die
       Ver&ouml;ffentlichung von Sicherheitshinweisen und Patches
       unterst&uuml;tzt; dem Team ist es allerdings freigestellt, diese
@@ -390,7 +382,7 @@
       auszudehnen.</para>
   </sect1>
 
-  <sect1 id="upgrade">
+  <sect1 xml:id="upgrade">
     <title>Hinweise f&uuml;r die Aktualisierung von &os; &release.4x;</title>
 
     <para>Dieses Kapitel enth&auml;lt Hinweise f&uuml;r Anwender, die
@@ -498,7 +490,7 @@
 	<filename>/usr/include</filename> zu l&ouml;schen.  Im
 	allgemeinen ist es ausreichend, dieses Verzeichnis vor der
 	Installation bzw. vor dem
-	<maketarget>installworld</maketarget> zu entfernen.  Wird das
+	<buildtarget>installworld</buildtarget> zu entfernen.  Wird das
 	Verzeichnis nicht entfernt, kann es zu Problemen kommen
 	(speziell mit C++-Programmen), da der Compiler dann einen Mix
 	aus alten und neuen Headerdateien verwendet.</para>
@@ -527,7 +519,7 @@
     </sect2>
   </sect1>
 
-  <sect1 id="summary">
+  <sect1 xml:id="summary">
     <title>Zusammenfassung</title>
 
     <para>&os; &release.current; enth&auml;lt zwar viele interessante
diff --git a/release/doc/de_DE.ISO8859-1/errata/article.xml b/release/doc/de_DE.ISO8859-1/errata/article.xml
index 9d8ff3f276b..36c2630f4d5 100644
--- a/release/doc/de_DE.ISO8859-1/errata/article.xml
+++ b/release/doc/de_DE.ISO8859-1/errata/article.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
-
 <!--
 	FreeBSD errata document.  Unlike some of the other RELNOTESng
 	files, this file should remain as a single SGML file, so that
@@ -18,14 +17,13 @@
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/errata/article.xml,v 1.39 2003/05/24 13:23:46 ue Exp $
 	basiert auf: 1.38
 -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
+  <info><title>&os; &release; Errata</title>
 
-<article lang="de">
-  <articleinfo>
-
-    <title>&os; &release; Errata</title>
+    
 
     <authorgroup>
-      <corpauthor>Das &os; Projekt</corpauthor>
+      <author><orgname>Das &os; Projekt</orgname></author>
     </authorgroup>
 
     <pubdate>$FreeBSD$</pubdate>
@@ -44,7 +42,6 @@
       <year>2003</year>
       <holder role="mailto:de-bsd-translators@de.FreeBSD.org">The FreeBSD German Documentation Project</holder>
     </copyright>
-  </articleinfo>
 
   <abstract>
     <para>Dieses Dokument enth&auml;lt die Errata f&uuml;r &os; &release;,
@@ -61,8 +58,9 @@
       Erscheinen von &os; 5.1-RELEASE weiter aktualisiert
       werden.</para>
   </abstract>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>Einleitung</title>
 
     <para>Diese Errata enthalten <quote>brandhei&szlig;e</quote>
@@ -78,7 +76,7 @@
       CDROM) ist per Definition veraltet.  Allerdings sind im Internet
       aktualisierte Versionen verf&uuml;gbar, die die <quote>aktuellen
       Errata</quote> f&uuml;r diese Version sind.  Diese Versionen
-      sind bei <ulink url="http://www.FreeBSD.org/releases/"></ulink>
+      sind bei <uri xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>
       und allen aktuellen Mirrors dieser Webseite
       verf&uuml;gbar.</para>
 
@@ -89,19 +87,17 @@
       Dokumentes.</para>
 
     <para>Die Liste der &os; CERT security advisories finden Sie bei
-      <ulink url="http://www.FreeBSD.org/security/"></ulink> oder
-      <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink>.</para>
+      <uri xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri> oder
+      <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</uri>.</para>
   </sect1>
 
-  <sect1 id="security">
+  <sect1 xml:id="security">
     <title>Sicherheitshinweise</title>
 
     <para>Ein &uuml;ber das Netzwerk nutzbarer Fehler in
       <application>CVS</application> k&ouml;nnte dazu f&uuml;hren,
       da&szlig; ein Angreifer beliebige Programme auf dem CVS Server
-      ausf&uuml;hren kann.  Weitere Informationen finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:01.cvs.asc">FreeBSD-SA-03:01</ulink>.</para>
+      ausf&uuml;hren kann.  Weitere Informationen finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:01.cvs.asc">FreeBSD-SA-03:01</link>.</para>
 
     <para>Durch Auswertung der Antwortzeiten von
       <application>OpenSSL</application> w&auml;re es einem Angreifer
@@ -113,8 +109,7 @@
       den f&uuml;r Sicherheitsprobleme unterst&uuml;tzten
       Entwicklungszweigen wurde der Fehler durch die neue
       <application>OpenSSL</application> Version 0.9.6i behoben.
-      Weitere Informationen finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:02.openssl.asc">FreeBSD-SA-03:02</ulink></para>
+      Weitere Informationen finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:02.openssl.asc">FreeBSD-SA-03:02</link></para>
 
     <para>Es ist theoretisch m&ouml;glich, da&szlig; ein Angreifer den
       geheimen Schl&uuml;ssel ermittelt, der von der Erweiterung
@@ -122,8 +117,7 @@
       Effektivit&auml;t beim Schutz vor TCP SYN Flood
       Denial-of-Service Angriffen.  Hinweise, wie sie das Problem
       umgehen k&ouml;nnen und weitere Informationen finden Sie in
-      <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:03.syncookies.asc">FreeBSD-SA-03:03</ulink>.</para>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:03.syncookies.asc">FreeBSD-SA-03:03</link>.</para>
 
     <para>Durch diverse Puffer-&Uuml;berl&auml;ufe in den von
       <application>sendmail</application> genutzten Routinen zum
@@ -132,26 +126,22 @@
       und so beliebige Programme ausf&uuml;hren zu lassen.  Diese
       Programme verf&uuml;gten &uuml;ber die Rechte des Benutzers,
       unter dessen Kennung &man.sendmail.8; lief, also typischerweise
-      <username>root</username>.  Weitere Informationen und Verweise
-      auf Patches finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:04.sendmail.asc">FreeBSD-SA-03:04</ulink>
-      und <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:07.sendmail.asc">FreeBSD-SA-03:07</ulink>.</para>
+      <systemitem class="username">root</systemitem>.  Weitere Informationen und Verweise
+      auf Patches finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:04.sendmail.asc">FreeBSD-SA-03:04</link>
+      und <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:07.sendmail.asc">FreeBSD-SA-03:07</link>.</para>
 
     <para>Durch einen Puffer-&Uuml;berlauf im XDR Kodierer/Dekodierer
       war es einem Angreifer m&ouml;glich, den Service zum Absturz zu
       bringen.  Informationen, wie Sie den Fehler beheben, finden Sie
-      in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:05.xdr.asc">FreeBSD-SA-03:05</ulink>.</para>
+      in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:05.xdr.asc">FreeBSD-SA-03:05</link>.</para>
 
     <para><application>OpenSSL</application> enth&auml;lt zwei
       Schwachstellen, die erst vor kurzer Zeit bekannt gemacht wurden.
       Informationen, wie Sie die Probleme umgehen k&ouml;nnen und
-      weitere Informationen finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:06.openssl.asc">FreeBSD-SA-03:06</ulink>.</para>
+      weitere Informationen finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:06.openssl.asc">FreeBSD-SA-03:06</link>.</para>
   </sect1>
 
-  <sect1 id="late-news">
+  <sect1 xml:id="late-news">
     <title>Aktuelle Informationen</title>
 
     <bridgehead renderas="sect3">GEOM</bridgehead>
@@ -294,11 +284,11 @@
     <para>&os; &release.prev; enth&auml;lt einen kleinen Fehler im
       Bereich der Berechtigungen von <filename>/dev/tty</filename>.
       Dieser Fehler tritt auf, wenn sich ein Benutzer einloggt, der
-      weder <username>root</username> noch Mitglied der Gruppe
-      <groupname>tty</groupname> ist.  Wechselt dieser Benutzer nun mit
+      weder <systemitem class="username">root</systemitem> noch Mitglied der Gruppe
+      <systemitem class="groupname">tty</systemitem> ist.  Wechselt dieser Benutzer nun mit
       &man.su.1; zu einer anderen Benutzerkennung, die ebenfalls
-      weder <username>root</username> noch Mitglied der Gruppe
-      <groupname>tty</groupname> ist, kann er &man.ssh.1; nicht
+      weder <systemitem class="username">root</systemitem> noch Mitglied der Gruppe
+      <systemitem class="groupname">tty</systemitem> ist, kann er &man.ssh.1; nicht
       nutzen, da es <filename>/dev/tty</filename> nicht &ouml;ffnen
       kann.  Dieser Fehler wurde in &release.current; bereits
       behoben.</para>
@@ -364,8 +354,7 @@
 
     <para>Die &os; Mailinglisten werden jetzt mit Mailman und nicht
       mehr mit Majordomo verwaltet.  Weitere Informationen finden sie
-      auf der <ulink
-      url="http://www.FreeBSD.org/mailman/listinfo/">FreeBSD Mailman
-      Info Page</ulink>.</para>
+      auf der <link xlink:href="http://www.FreeBSD.org/mailman/listinfo/">FreeBSD Mailman
+      Info Page</link>.</para>
   </sect1>
 </article>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
index 1f6cb1f251f..c0380c0d7df 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -10,14 +10,12 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/article.xml,v 1.5 2002/10/12 18:02:21 ue Exp $
   basiert auf: 1.4
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &artheader;
   &sect.intro;
   &sect.proc.alpha;
diff --git a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
index 55df78a8584..b8df2738d6f 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml
@@ -4,21 +4,14 @@
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/alpha/proc-alpha.xml,v 1.35 2003/05/24 19:11:43 ue Exp $
   basiert auf: 1.60
 -->
-
-<sect1 id="support-proc">
-  <sect1info>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support-proc">
+  <info><title>Unterst&uuml;tzte Prozessoren und Mainboards</title>
     <authorgroup>
-      <author>
-	<firstname>Wilko</firstname>
-
-	<surname>Bulte</surname>
-
-	<contrib>Gepflegt von </contrib>
-      </author>
+      <author><personname><firstname>Wilko</firstname><surname>Bulte</surname></personname><contrib>Gepflegt von </contrib></author>
     </authorgroup>
-  </sect1info>
+  </info>
 
-  <title>Unterst&uuml;tzte Prozessoren und Mainboards</title>
+  
 
   <para>Wir freuen uns &uuml;ber Erg&auml;nzungen, Korrekturen und
     konstruktive Kritik.  Informationen &uuml;ber Fehlverhalten von
@@ -75,9 +68,8 @@
       <para>Compaq stellt auf seinen Webseiten Informationen f&uuml;r
 	Linux-Entwickler bereit.  Auch f&uuml;r &os; Anwender sind
 	diese durchaus n&uuml;tzlich.  Werfen Sie einmal einen Blick
-	auf <ulink
-	url="http://www.support.compaq.com/alpha-tools/">Linux Alpha
-	Power tools</ulink>.</para>
+	auf <link xlink:href="http://www.support.compaq.com/alpha-tools/">Linux Alpha
+	Power tools</link>.</para>
     </note>
   </sect2>
 
@@ -538,9 +530,8 @@
 	<quote>DIN</quote>-Variante sollte aber f&uuml;r &os;
 	ausreichend sein.</para>
 
-      <para>Lesen Sie nach M&ouml;glichkeit das <ulink
-	url="ftp://ftp.digital.com/pub/DEC/axppci/design_guide.ps">
-	OEM manual</ulink>.</para>
+      <para>Lesen Sie nach M&ouml;glichkeit das <link xlink:href="ftp://ftp.digital.com/pub/DEC/axppci/design_guide.ps">
+	OEM manual</link>.</para>
 
       <para>Die Konfigurationsdatei f&uuml;r den Kernel einer NoName
 	mu&szlig; die folgenden Zeilen enthalten:</para>
@@ -734,8 +725,7 @@ cpu     EV4</programlisting>
 	mit voller Drehzahl (und Lautst&auml;rke) betrieben.
 	H&uuml;ten Sie sich vor PCI-Karten, die sehr viel Strom
 	brauchen.  Falls Ihr System trotzdem sterben sollten,
-	k&ouml;nnten Ihnen die Multia-Heat-Death Seiten auf der <ulink
-	url="http://www.netbsd.org/">Website von NetBSD</ulink> bei
+	k&ouml;nnten Ihnen die Multia-Heat-Death Seiten auf der <link xlink:href="http://www.netbsd.org/">Website von NetBSD</link> bei
 	der Reparatur weiterhelfen.</para>
 
       <para>Die Intel 82378ZB PCI to ISA Bridge erm&ouml;glicht es,
@@ -779,11 +769,10 @@ cpu     EV4</programlisting>
       <programlisting>options   DEC_AXPPCI_33
 cpu     EV4</programlisting>
 
-      <para>Wichtige Informationen zur Multia finden Sie unter <ulink
-	url="http://www.netbsd.org/Ports/alpha/multiafaq.html">
-	http://www.netbsd.org/Ports/alpha/multiafaq.html</ulink> und
-	<ulink url="http://www.brouhaha.com/~eric/computers/udb.html">
-	http://www.brouhaha.com/~eric/computers/udb.html</ulink>.</para>
+      <para>Wichtige Informationen zur Multia finden Sie unter <link xlink:href="http://www.netbsd.org/Ports/alpha/multiafaq.html">
+	http://www.netbsd.org/Ports/alpha/multiafaq.html</link> und
+	<link xlink:href="http://www.brouhaha.com/~eric/computers/udb.html">
+	http://www.brouhaha.com/~eric/computers/udb.html</link>.</para>
     </sect3>
 
     <sect3>
@@ -959,7 +948,7 @@ cpu     EV4</programlisting>
 
       <para>Der vollst&auml;ndige Befehl lautet:</para>
 
-      <screen><prompt>&gt;&gt;&gt;</prompt> <userinput>SET PCI_DEVICE_OVERRIDE <replaceable>&lt;vendor_id&gt;</replaceable><replaceable>&lt;device_id&gt;</replaceable></userinput></screen>
+      <screen><prompt>&gt;&gt;&gt;</prompt> <userinput>SET PCI_DEVICE_OVERRIDE &lt;vendor_id&gt;&lt;device_id&gt;</userinput></screen>
 
       <para>Zum Beispiel:</para>
 
@@ -1078,8 +1067,7 @@ device  sbc</programlisting>
       <para>sollten Sie die SRM Firmware auf V7.2-1 (oder neuer)
 	aktualisieren.  Diese Version erschien zuerst auf der
 	<quote>Firmware Update CD V5.7</quote>, ist aber auch auf
-	<ulink
-	url="http://www.compaq.com/">http://www.compaq.com/</ulink>
+	<link xlink:href="http://www.compaq.com/">http://www.compaq.com/</link>
 	erh&auml;ltlich.  Damit wird dieser Fehler des SRM sowohl bei
 	der Miata MX5 als auch bei der Miata GL behoben.</para>
 
@@ -3771,7 +3759,7 @@ cpu     EV5</programlisting>
 
     <para>Um dieses Dokument zusammenzustellen, wurden viele Quellen
       genutzt; aber die wichtigste und wertvollste Quelle waren die
-      <ulink url="http://www.netbsd.org/">NetBSD Webseiten</ulink>.
+      <link xlink:href="http://www.netbsd.org/">NetBSD Webseiten</link>.
       Ohne NetBSD/alpha g&auml;be es kein &os;/alpha.</para>
 
     <para>Die folgenden Personen haben mich bei der Arbeit an diesem
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml
index d890400eb3e..b526e80528b 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/artheader.xml
@@ -3,11 +3,10 @@
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/artheader.xml,v 1.4 2003/01/09 12:14:47 ue Exp $
 	basiert auf: 1.4
 -->
+<info xmlns="http://docbook.org/ns/docbook" version="5.0"><title>&os;/&arch; &release.current; Hardware Information</title>
+  
 
-<articleinfo>
-  <title>&os;/&arch; &release.current; Hardware Information</title>
-
-  <corpauthor>The FreeBSD German Documentation Project</corpauthor>
+  <author><orgname>The FreeBSD German Documentation Project</orgname></author>
 
   <copyright>
     <year>2000</year>
@@ -30,4 +29,12 @@
     <holder role="mailto:de-bsd-translators@de.FreeBSD.org">The
       FreeBSD German Documentation Project</holder>
   </copyright>
-</articleinfo>
+
+<abstract xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <para>Dieser Artikel enth&auml;lt eine kurze Anleitung f&uuml;r die
+    Installation von &os;/&arch; &release.current;, dabei wird
+    besonderen Wert auf den Bezug einer &os; gelegt.  Au&szlig;erdem
+    enth&auml;lt er einige Tips zur Fehlersuche sowie Antworten zu
+    einigen h&auml;ufig gestellten Fragen.</para>
+</abstract>
+</info>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml b/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
index 0126f90dace..3e3985bb456 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/dev.xml
@@ -32,13 +32,12 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 -->
-
-<sect1 id="support">
-  <sect1info>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support">
+  <info><title>Unterst&uuml;tzte Ger&auml;te</title>
     <pubdate>$FreeBSD$</pubdate>
-  </sect1info>
+  </info>
 
-  <title>Unterst&uuml;tzte Ger&auml;te</title>
+  
 
   <para>Dieses Kapitel enth&auml;lt alle Ger&auml;te, die auf jeden
     Fall von &os; auf &arch; Systemen unterst&uuml;tzt werden.  Andere
@@ -1112,7 +1111,7 @@
     </para>
   </sect2>
 
-  <sect2 id="ethernet">
+  <sect2 xml:id="ethernet">
     <title>Netzwerkkarten</title>
 
     <para arch="i386,pc98,alpha">Adaptec Duralink PCI Fast Ethernet
@@ -3710,7 +3709,7 @@
       (&man.meteor.4; Treiber)</para>
   </sect2>
 
-  <sect2 id="usb">
+  <sect2 xml:id="usb">
     <title>USB Ger&auml;te</title>
 
     <para arch="alpha,i386,pc98">&os; unterst&uuml;tzt viele verschiedene Arten von
@@ -3724,8 +3723,7 @@
 
     <note arch="alpha,i386,pc98">
       <para>USB Netzwerkkarten finden Sie in einem eigenen Abschnitt
-	im Kapitel <link
-	linkend="ethernet">Netzwerkkarten</link>.</para>
+	im Kapitel <link linkend="ethernet">Netzwerkkarten</link>.</para>
     </note>
 
     <note arch="alpha,i386,pc98">
@@ -4227,7 +4225,7 @@
     </para>
   </sect2>
 
-  <sect2 id="firewire">
+  <sect2 xml:id="firewire">
     <title>IEEE 1394 (Firewire) Ger&auml;te</title>
 
     <para arch="i386,sparc64">Host Controller (&man.fwohci.4;
@@ -4269,7 +4267,7 @@
     </para>
   </sect2>
 
-  <sect2 id="bluetooth">
+  <sect2 xml:id="bluetooth">
     <title>Bluetooth Ger&auml;te</title>
 
     <para arch="i386,pc98">PCCARD Host Kontroller (&man.ng.bt3c.4;
@@ -4371,8 +4369,7 @@
       <note>
 	<para>Informationen &uuml;ber spezielle Grafikkarten und ihre
 	  Kompatibilit&auml;t mit <application>XFree86</application>
-	  k&ouml;nnen Sie bei <ulink
-	  url="http://www.xfree86.org/"></ulink> finden.</para>
+	  k&ouml;nnen Sie bei <uri xlink:href="http://www.xfree86.org/">http://www.xfree86.org/</uri> finden.</para>
       </note>
     </para>
 
@@ -4429,8 +4426,7 @@
 	<para>In &man.moused.8; finden Sie weitere Informationen zur
 	  Nutzung von M&auml;usen in &os;.  Informationen &uuml;ber
 	  die Nutzung von M&auml;usen in
-	  <application>XFree86</application> erhalten Sie bei <ulink
-	  url="http://www.xfree86.org/"></ulink>.</para>
+	  <application>XFree86</application> erhalten Sie bei <uri xlink:href="http://www.xfree86.org/">http://www.xfree86.org/</uri>.</para>
       </note>
     </para>
 
@@ -4463,8 +4459,8 @@
     </para>
 
     <para arch="i386">Karten auf Basis des Xilinx XC6200, die mit dem
-      HOT1 von <ulink url="http://www.vcc.com/">Virtual
-      Computers</ulink> kompatibel sind (xrpu Treiber).</para>
+      HOT1 von <link xlink:href="http://www.vcc.com/">Virtual
+      Computers</link> kompatibel sind (xrpu Treiber).</para>
 
     <para arch="pc98">Power Management Controller im NEC PC-98 Note
       (pmc Treiber)</para>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml b/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml
index c7813083d5a..b96c25ef297 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/common/intro.xml
@@ -3,8 +3,7 @@
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/common/intro.xml,v 1.6 2003/05/24 21:35:15 ue Exp $
   basiert auf: 1.6
 -->
-
-<sect1 id="intro">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="intro">
   <title>Einf&uuml;hrung</title>
 
   <para>Dieses Dokument enth&auml;lt die Liste der unterst&uuml;tzen
@@ -24,7 +23,6 @@
   </note>
 
   <para arch="ia64">Weitergehende Informationen &uuml;ber &os;/&arch;
-    finden Sie auf den Webseiten des <ulink
-    url="http://www.FreeBSD.org/platforms/ia64/index.html">&os;/&arch;
-    Project</ulink>.</para>
+    finden Sie auf den Webseiten des <link xlink:href="http://www.FreeBSD.org/platforms/ia64/index.html">&os;/&arch;
+    Project</link>.</para>
 </sect1>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml b/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
index 3d8babc79c7..d3b14a1bff3 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -10,14 +10,12 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/article.xml,v 1.5 2002/12/07 21:09:09 ue Exp $
   basiert auf: 1.4
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &artheader;
   &sect.intro;
   &sect.proc.i386;
diff --git a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml
index 889f38ccb09..1b3dee7a931 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/i386/proc-i386.xml
@@ -3,8 +3,7 @@
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/i386/proc-i386.xml,v 1.13 2003/05/24 21:49:22 ue Exp $
   basiert auf: 1.11
 -->
-
-<sect1 id="proc">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="proc">
   <title>Unterst&uuml;tzte Prozessoren und Mainboards</title>
 
   <para>&os;/i386 kann auf vielen <quote>IBM PC kompatiblen</quote>
@@ -107,10 +106,8 @@
     Descriptor Table (DSDT), die vom BIOS bereitgestellt wird.  Einige
     Systemen haben fehlerhafte oder unvollst&auml;ndige DSDTs, daher
     kann ACPI auf diesen Maschinen nicht korrekt funktionieren.
-    Korrigierte DSDTs f&uuml;r einige Maschinen sind im Bereich <ulink
-    url="http://acpi.sourceforge.net/dsdt/index.php">DSDT</ulink> der
-    Webseiten des <ulink
-    url="http://acpi.sourceforge.net/">ACPI4Linux</ulink> Projekts
+    Korrigierte DSDTs f&uuml;r einige Maschinen sind im Bereich <link xlink:href="http://acpi.sourceforge.net/dsdt/index.php">DSDT</link> der
+    Webseiten des <link xlink:href="http://acpi.sourceforge.net/">ACPI4Linux</link> Projekts
     verf&uuml;gbar.  &os; kann diese DSDTs an Stelle der vom BIOS
     bereitgestellten DSDT nutzen, weitere Informationen dazu finden
     Sie in der Onlinehilfe zu &man.acpi.4;</para>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
index e0f86ecb77e..ac7c7e74015 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -10,25 +10,13 @@
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/article.xml,v 1.6 2003/05/24 21:52:46 ue Exp $
   basiert auf: 1.3
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &artheader;
-
-  <abstract>
-    <para>Dieses Dokument befindet sich noch in einem sehr fr&uuml;hen
-      Stadium.  Die Angaben sind unvollst&auml;ndig und m&uuml;ssen
-      dringend erweitert werden.  Wenn Sie Informationen &uuml;ber
-      &os; &arch.print; Prozessoren, Mainboards und andere Ger&auml;te
-      haben, die mit &os; funktionieren, senden Sie sie bitte an die
-      &a.ia64; Mailingliste.</para>
-  </abstract>
-
   &sect.intro;
   &sect.proc.ia64;
   &sect.dev;
diff --git a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml
index 00c733aa91a..6a048d5d34a 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml
@@ -3,22 +3,19 @@
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/ia64/proc-ia64.xml,v 1.5 2003/05/24 22:16:24 ue Exp $
   basiert auf: 1.7
 -->
-<sect1 id="proc-ia64">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="proc-ia64">
   <title>Unterst&uuml;tzte Prozessoren und Mainboards</title>
 
-  <para>Zur Zeit werden die <ulink
-    url="http://www.intel.com/design/itanium/itanium/index.htm">Itanium</ulink>
-    und <ulink
-    url="http://www.intel.com/design/itanium2/index.htm">Itanium
-    2</ulink> Prozessoren unterst&uuml;tzt.  Die folgenden
+  <para>Zur Zeit werden die <link xlink:href="http://www.intel.com/design/itanium/itanium/index.htm">Itanium</link>
+    und <link xlink:href="http://www.intel.com/design/itanium2/index.htm">Itanium
+    2</link> Prozessoren unterst&uuml;tzt.  Die folgenden
     Mainboard-Chips&auml;tze werden unterst&uuml;tzt:</para>
 
   <itemizedlist>
     <listitem>
       <para>HP zx1 (nur auf dem Entwicklungszweig, weitere
-        Informationen finden Sie im <ulink
-        url="http://perforce.freebsd.org/">Perforce
-        repository</ulink>) </para>
+        Informationen finden Sie im <link xlink:href="http://perforce.freebsd.org/">Perforce
+        repository</link>) </para>
     </listitem>
 
     <listitem>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
index 870fd1ede86..7885a4f1d55 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -10,14 +10,12 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/article.xml,v 1.2 2002/10/12 18:02:22 ue Exp $
   basiert auf: 1.1
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &artheader;
   &sect.intro;
   &sect.proc.pc98;
diff --git a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml
index 22bc9715609..04ee936a41b 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml
@@ -3,8 +3,7 @@
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/pc98/proc-pc98.xml,v 1.3 2003/01/13 20:30:49 ue Exp $
   basiert auf: 1.4
 -->
-
-<sect1 id="support-sys">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support-sys">
   <title>Unterst&uuml;tzte Systeme</title>
 
   <para>NEC PC-9801/9821 Systeme mit fast allen i386-kompatiblen
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
index 7ec9f89b4c3..c079354d0e9 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -10,14 +10,12 @@
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
 ]>
-
 <!--
 	$FreeBSD$
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/article.xml,v 1.7 2003/01/09 12:46:28 ue Exp $
 	basiert auf: 1.3
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &artheader;
   &sect.intro;
   &sect.proc.sparc64;
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml
index 87d49bf518b..c2656ff45e2 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/dev-sparc64.xml
@@ -3,13 +3,12 @@
   $Id: dev-sparc64.xml,v 1.4 2002/03/10 15:37:16 ue Exp $
   basiert auf: 1.3
 -->
-
-<sect1 id="support-dev">
-  <sect1info>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support-dev">
+  <info><title>Unterst&uuml;tzte Ger&auml;te</title>
     <pubdate>$FreeBSD$</pubdate>
-  </sect1info>
+  </info>
 
-  <title>Unterst&uuml;tzte Ger&auml;te</title>
+  
 
   <para>Dieses Kapitel enth&auml;lt alle Ger&auml;te, die auf jeden
     Fall von &os; auf &arch; Systemen unterst&uuml;tzt werden.  Andere
@@ -50,13 +49,13 @@
       </listitem>
 
       <listitem>
-        <para>&man.ata.4;, <devicename>atadisk</devicename>,
-          <devicename>atapicd</devicename> (allerdings weder atapift
+        <para>&man.ata.4;, <filename>atadisk</filename>,
+          <filename>atapicd</filename> (allerdings weder atapift
           noch atapist)</para>
       </listitem>
 
       <listitem>
-        <para><devicename>gem</devicename> (Sun GEM/ERI Ethernet, ist
+        <para><filename>gem</filename> (Sun GEM/ERI Ethernet, ist
           in der Blade 100 eingebaut)</para>
       </listitem>
 
@@ -150,7 +149,7 @@
       <listitem>
         <para>Graphikkarten/Bildschirmspeicher, Tastatur (au&szlig;er
           der indirekten Unterst&uuml;tzung im Textmodus durch den
-          <devicename>ofw_console</devicename> Treiber)</para>
+          <filename>ofw_console</filename> Treiber)</para>
       </listitem>
 
       <listitem>
@@ -164,7 +163,7 @@
       <listitem>
         <para>serielle Tastaturen (au&szlig;er der indirekten
           Unterst&uuml;tzung durch den
-          <devicename>ofw_console</devicename> Treiber)</para>
+          <filename>ofw_console</filename> Treiber)</para>
       </listitem>
 
       <listitem>
diff --git a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml
index 363434fb074..f47b6ec0a67 100644
--- a/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml
@@ -3,15 +3,14 @@
 	$FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/hardware/sparc64/proc-sparc64.xml,v 1.10 2003/02/08 07:43:14 ue Exp $
 	basiert auf: 1.11
 -->
-<sect1 id="support-sys">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support-sys">
   <title>Unterst&uuml;tzte Systeme</title>
 
   <para>In diesem Kapitel sind alle Systeme aufgef&uuml;hrt, von denen
     wir wissen, da&szlig; sie von &os; f&uuml;r &arch.print;
     unterst&uuml;tzt werden.  Zus&auml;tzliche Informationen zu den
-    einzelnen Systemen finden Sie im <ulink
-    url="http://sunsolve.sun.com/handbook_pub/">Sun System
-    Handbook</ulink>.</para>
+    einzelnen Systemen finden Sie im <link xlink:href="http://sunsolve.sun.com/handbook_pub/">Sun System
+    Handbook</link>.</para>
 
   <para>SMP wird auf allen Systemen mit mehr als einem Prozessor
     unterst&uuml;tzt.</para>
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile b/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
index 78f1bc36944..3eec7c330d4 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/Makefile
@@ -13,7 +13,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+= ../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml b/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
index 94c82b658d9..7791e695cbb 100644
--- a/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,16 +10,13 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/alpha/article.xml,v 1.4 2002/10/12 18:02:23 ue Exp $
   basiert auf: 1.3
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &artheader;
-  &abstract;
   &sect.install;
   &sect.layout;
   &sect.upgrade;
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml b/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml
index 4d467dd094c..ecc5d1ae10e 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/abstract.xml
@@ -4,8 +4,7 @@
   $Id: abstract.xml,v 1.2 2002/03/10 15:37:17 ue Exp $
   basiert auf: 1.2
 -->
-
-<abstract>
+<abstract xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <para>Dieser Artikel enth&auml;lt eine kurze Anleitung f&uuml;r die
     Installation von &os;/&arch; &release.current;, dabei wird
     besonderen Wert auf den Bezug einer &os; gelegt.  Au&szlig;erdem
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml b/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml
index ea171f82664..741c506f4b9 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/artheader.xml
@@ -3,13 +3,12 @@
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/common/artheader.xml,v 1.3 2003/01/09 12:17:18 ue Exp $
   basiert auf: 1.4
 -->
+<info xmlns="http://docbook.org/ns/docbook" version="5.0"><title>&os;/&arch; &release.current; Installationsanleitung</title>
+  
 
-<articleinfo>
-  <title>&os;/&arch; &release.current; Installationsanleitung</title>
-
-  <corpauthor>
+  <author><orgname>
   The &os; Project
-  </corpauthor>
+  </orgname></author>
 
   <copyright>
     <year>2000</year>
@@ -24,4 +23,12 @@
     <year>2003</year>
     <holder role="mailto:doc@FreeBSD.org">The FreeBSD German Documentation Project</holder>
   </copyright>
-</articleinfo>
+
+<abstract>
+  <para>Dieser Artikel enth&auml;lt eine kurze Anleitung f&uuml;r die
+    Installation von &os;/&arch; &release.current;, dabei wird
+    besonderen Wert auf den Bezug einer &os; gelegt.  Au&szlig;erdem
+    enth&auml;lt er einige Tips zur Fehlersuche sowie Antworten zu
+    einigen h&auml;ufig gestellten Fragen.</para>
+</abstract>
+</info>
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/install.ent b/release/doc/de_DE.ISO8859-1/installation/common/install.ent
index 60f6fe96fe4..56a71ff4372 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/install.ent
+++ b/release/doc/de_DE.ISO8859-1/installation/common/install.ent
@@ -12,7 +12,6 @@
 <!-- Files to be included -->
 
 <!ENTITY artheader SYSTEM "artheader.xml">
-<!ENTITY abstract SYSTEM "abstract.xml">
 <!ENTITY sect.install SYSTEM "install.xml">
 <!ENTITY sect.layout SYSTEM "layout.xml">
 <!ENTITY sect.upgrade SYSTEM "upgrade.xml">
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/install.xml b/release/doc/de_DE.ISO8859-1/installation/common/install.xml
index 8f313f6c76f..8bc49c0b717 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/install.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/install.xml
@@ -10,18 +10,15 @@ This file has architecture-dependent installation instructions, culled
 from {alpha,i386}/INSTALL.TXT.
 
 -->
-
-<sect1 id="install">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="install">
   <title>Wie installiere ich &os;</title>
 
   <para>In diesem Kapitel erfahren Sie, wie Sie &os; installieren.
     Der Schwerpunkt liegt dabei auf dem Bezug der &os;
     &release.current; Distribution und dem Start der Installation.  Im
-    Kapitel <ulink
-    url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/install.html"><quote>Installing
-    FreeBSD</quote></ulink> des <ulink
-    url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">FreeBSD
-    Handbuch</ulink> finden Sie genauere Informationen &uuml;ber das
+    Kapitel <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/install.html"><quote>Installing
+    FreeBSD</quote></link> des <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">FreeBSD
+    Handbuch</link> finden Sie genauere Informationen &uuml;ber das
     Installationsprogramm, einschlie&szlig;lich einer
     ausf&uuml;hrlichen, bebilderten Installationsleitung.</para>
 
@@ -29,7 +26,7 @@ from {alpha,i386}/INSTALL.TXT.
     wollen, sollten Sie <xref linkend="upgrading"/>, Aktualisierung von
     FreeBSD, lesen.</para>
 
-  <sect2 id="getting-started">
+  <sect2 xml:id="getting-started">
     <title>Der Einstieg</title>
 
     <para>Bevor Sie mit der Installation beginnen, sollten Sie auf
@@ -43,12 +40,10 @@ from {alpha,i386}/INSTALL.TXT.
       Dokumentation des Installationsprogramms zur
       Verf&uuml;gung.</para>
 
-    <para>Die elektronischen Versionen des &os; <ulink
-      url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/faq/">FAQ</ulink>
-      und des <ulink
-      url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">Handbuchs</ulink>
-      sind auch auf der <ulink url="http://www.FreeBSD.org/">FreeBSD
-      Project Web site</ulink> erh&auml;ltlich, wenn Sie einen
+    <para>Die elektronischen Versionen des &os; <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/faq/">FAQ</link>
+      und des <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">Handbuchs</link>
+      sind auch auf der <link xlink:href="http://www.FreeBSD.org/">FreeBSD
+      Project Web site</link> erh&auml;ltlich, wenn Sie einen
       Internet-Zugang haben.</para>
 
     <para>Der Umfang der Dokumentation schreckt zwar im ersten Moment
@@ -59,8 +54,7 @@ from {alpha,i386}/INSTALL.TXT.
       sollte.</para>
 
     <para>Irgend etwas kann immer schiefgehen und wenn Ihnen das
-      passiert, sollten Sie einen Blick in <xref
-      linkend="trouble"/> werfen, wo Sie hilfreiche Informationen
+      passiert, sollten Sie einen Blick in <xref linkend="trouble"/> werfen, wo Sie hilfreiche Informationen
       finden k&ouml;nnen.  Sie sollten ebenfalls einen Blick auf die
       aktuelle Version von <filename>ERRATA.TXT</filename> werfen,
       bevor Sie mit der Installation beginnen, da Sie dort
@@ -138,7 +132,7 @@ from {alpha,i386}/INSTALL.TXT.
       werden.</para>
   </sect2>
 
-  <sect2 id="floppies">
+  <sect2 xml:id="floppies">
     <title>Erzeugung der Bootdisketten</title>
 
     <para arch="i386,alpha,pc98">In einigen F&auml;llen m&uuml;ssen Sie einen Satz Disketten
@@ -178,12 +172,10 @@ from {alpha,i386}/INSTALL.TXT.
       <replaceable>release</replaceable><filename>/floppies/mfsroot.flp</filename>
       und
       <replaceable>release</replaceable><filename>/floppies/drivers.flp</filename>
-      von <ulink url="&release.url;"></ulink> oder einem der vielen
+      von <uri xlink:href="&release.url;">&release.url;</uri> oder einem der vielen
       Mirrors beziehen.  Eine Liste aller Mirrors finden Sie im
-      Kapitel <ulink
-      url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">FTP
-      Sites</ulink> des Handbuchs oder auf dem Server <ulink
-      url="http://www.freebsdmirrors.org/"></ulink>.</para>
+      Kapitel <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">FTP
+      Sites</link> des Handbuchs oder auf dem Server <uri xlink:href="http://www.freebsdmirrors.org/">http://www.freebsdmirrors.org/</uri>.</para>
 
     <para arch="i386,alpha">Sie ben&ouml;tigen zwei leere, formatierte
       Disketten und &uuml;bertragen Sie das Image
@@ -215,8 +207,8 @@ from {alpha,i386}/INSTALL.TXT.
       &uuml;bertragen wollen und DOS benutzen, m&uuml;ssen Sie den
       folgenden Befehl verwenden:</para>
 
-    <screen arch="i386,alpha"><prompt>C></prompt> <userinput>fdimage kern.flp a:</userinput></screen>
-    <screen arch="pc98"><prompt>C></prompt> <userinput>rawrite kern.flp a:</userinput></screen>
+    <screen arch="i386,alpha"><prompt>C&gt;</prompt> <userinput>fdimage kern.flp a:</userinput></screen>
+    <screen arch="pc98"><prompt>C&gt;</prompt> <userinput>rawrite kern.flp a:</userinput></screen>
 
     <para arch="i386,alpha">Dazu m&uuml;ssen Sie
       <filename>fdimage.exe</filename> und
@@ -260,7 +252,7 @@ from {alpha,i386}/INSTALL.TXT.
       &man.mkisofs.8;.</para>
   </sect2>
 
-  <sect2 id="start-installation">
+  <sect2 xml:id="start-installation">
     <title>&os;-Installation von CD oder via Internet</title>
 
 <!-- i386/pc98 text starts here -->
@@ -286,8 +278,7 @@ from {alpha,i386}/INSTALL.TXT.
             <filename>floppies/</filename>.  Wenn Sie eine DOS-Shell
             benutzen, k&ouml;nnen Sie das Script
             <filename>makeflp.bat</filename> verwenden.  Weitere
-            Informationen zu diesem Thema finden Sie im Kapitel <xref
-            linkend="floppies"/>.  Danach m&uuml;ssen Sie nur noch von
+            Informationen zu diesem Thema finden Sie im Kapitel <xref linkend="floppies"/>.  Danach m&uuml;ssen Sie nur noch von
             der ersten Diskette booten, um die &os;-Installation zu
             starten.</para>
         </listitem>
@@ -306,8 +297,7 @@ from {alpha,i386}/INSTALL.TXT.
 	    <filename>floppies/</filename>.  Wenn Sie eine DOS-Shell
 	    benutzen, k&ouml;nnen Sie das Script
 	    <filename>makeflp.bat</filename> verwenden.  Weitere
-	    Informationen zu diesem Thema finden Sie im Kapitel <xref
-	    linkend="floppies"/>.  Danach m&uuml;ssen Sie nur noch von
+	    Informationen zu diesem Thema finden Sie im Kapitel <xref linkend="floppies"/>.  Danach m&uuml;ssen Sie nur noch von
 	    der ersten Diskette booten, um die &os;-Installation zu
 	    starten.</para>
 	</listitem>
@@ -325,8 +315,7 @@ from {alpha,i386}/INSTALL.TXT.
       Rechner von der Diskette mit <filename>kern.flp</filename>; und
       legen Sie die Diskette mit <filename>mfsroot.flp</filename> ein,
       sobald Sie dazu aufgefordert werden.  Weitere Informationen zu
-      dieser Art der Installation finden Sie in <xref
-      linkend="ftpnfs"/>.</para>
+      dieser Art der Installation finden Sie in <xref linkend="ftpnfs"/>.</para>
 
     <para arch="pc98">Wenn Ihr Rechner kein CDROM Laufwerk hat,
       k&ouml;nnen Sie &os;  auch direkt &uuml;ber das Internet
@@ -334,13 +323,11 @@ from {alpha,i386}/INSTALL.TXT.
       haben.  In diesem Fall m&uuml;ssen Sie ebenfalls die beiden &os;
       Bootdisketten aus den Dateien
       <filename>floppies/kern.flp</filename> und
-      <filename>floppies/mfsroot.flp</filename> erzeugen, wie in <xref
-      linkend="floppies"/> beschrieben.  Booten Sie Ihren Rechner von
+      <filename>floppies/mfsroot.flp</filename> erzeugen, wie in <xref linkend="floppies"/> beschrieben.  Booten Sie Ihren Rechner von
       der Diskette mit <filename>kern.flp</filename>;  und legen Sie
       die Diskette mit <filename>mfsroot.flp</filename> ein, sobald
       Sie dazu aufgefordert werden.  Weitere Informationen zu dieser
-      Art der Installation finden Sie in <xref
-      linkend="ftpnfs"/>.</para>
+      Art der Installation finden Sie in <xref linkend="ftpnfs"/>.</para>
 
 <!-- alpha text starts here -->
 
@@ -389,10 +376,8 @@ OpenBoot 4.2, 128 MB memory installed, Serial #51090132.
 Ethernet address 0:3:ba:b:92:d4, Host ID:  830b92d4.</screen>
 
     <para arch="sparc64">Wenn Ihr System jetzt von Festplatte startet,
-      m&uuml;ssen Sie die Tastenkombination <keycombo
-      action="simul"><keycap>L1</keycap><keycap>A</keycap></keycombo>
-      oder <keycombo
-      action="simul"><keycap>Stop</keycap><keycap>A</keycap></keycombo>
+      m&uuml;ssen Sie die Tastenkombination <keycombo action="simul"><keycap>L1</keycap><keycap>A</keycap></keycombo>
+      oder <keycombo action="simul"><keycap>Stop</keycap><keycap>A</keycap></keycombo>
       dr&uuml;cken.  Wenn Sie eine serielle Konsole verwenden,
       m&uuml;ssen Sie ein <command>BREAK</command> senden (z.B.  durch
       die Eingabe von <command>~#</command> in &man.tip.1;  oder
@@ -401,8 +386,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID:  830b92d4.</screen>
 
     <screenco arch="sparc64">
       <areaspec>
-	<area id="prompt-single" coords="1 5"/>
-	<area id="prompt-smp" coords="2 5"/>
+	<area xml:id="prompt-single" coords="1 5"/>
+	<area xml:id="prompt-smp" coords="2 5"/>
       </areaspec>
 
       <screen><prompt>ok </prompt>
@@ -485,9 +470,9 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
     <para arch="alpha">Die Ausgabe stammt von einer Digital Personal
       Workstation 433au und zeigt die drei an das System
       angeschlossenen Ger&auml;te.  Das erste Ger&auml;t ist ein CDROM
-      mit dem Namen <devicename>dka0</devicename>, die anderen beiden
-      sind Festplatten mit den Namen <devicename>dkc0</devicename> und
-      <devicename>dkc100</devicename>.</para>
+      mit dem Namen <filename>dka0</filename>, die anderen beiden
+      sind Festplatten mit den Namen <filename>dkc0</filename> und
+      <filename>dkc100</filename>.</para>
 
     <para arch="alpha">Mit den Schaltern <option>-file</option> und
       <option>-flags</option> k&ouml;nnen Sie angeben, welcher Kernel
@@ -532,7 +517,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
             <literal>FTP</literal> setzen.  In der Auswahl der
             FTP-Server w&auml;hlen Sie den Punkt <quote>URL</quote>
             und geben als Wert
-            <filename>ftp://<replaceable>machine</replaceable></filename>
+            <filename>ftp://machine</filename>
             an.</para>
 
           <warning>
@@ -551,7 +536,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
             dem System mit dem CDROM die Datei
             <filename>/etc/exports</filename> um einen Eintrag
             erweitert werden.  Dieser Eintrag erlaubt zum Beispiel der
-            Maschine <hostid role="hostname">ziggy.foo.com</hostid>,
+            Maschine <systemitem class="fqdomainname">ziggy.foo.com</systemitem>,
             das CDROM w&auml;hrend der Installation direkt per NFS zu
             mounten:</para>
 
@@ -564,7 +549,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
             sind, die Onlinehilfe zu &man.rc.conf.5; zu lesen und das
             System entsprechend zu konfigurieren.  Wenn das gelingt,
             sollten Sie in der Lage sein,
-            <filename><replaceable>cdrom-system</replaceable>:/cdrom</filename>
+            <filename>cdrom-system:/cdrom</filename>
             als Pfad f&uuml;r die NFS Installation anzugeben, also
             z.B.  <filename>wiggy:/cdrom</filename>.</para>
         </listitem>
@@ -583,8 +568,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       <para>Der erste Schritt ist die Erstellung der Bootdisketten,
         wie in <xref linkend="floppies"/> beschrieben.</para>
 
-      <para>Der zweite Schritt ist, einen Blick in <xref
-        linkend="layout"/> zu werfen.  Das Kapitel <quote>Distribution
+      <para>Der zweite Schritt ist, einen Blick in <xref linkend="layout"/> zu werfen.  Das Kapitel <quote>Distribution
         Format</quote> ist besonders wichtig, da Sie hier erfahren,
         welche Dateien Sie auf Diskette &uuml;bertragen m&uuml;ssen
         und welche Sie ignorieren k&ouml;nnen.</para>
@@ -657,7 +641,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	vorzubereiten, brauchen Sie nur die Dateien der Distribution
 	in ein Verzeichnis mit dem Namen <filename>FREEBSD</filename>
 	kopieren.  Dieses Verzeichnis mu&szlig; in der obersten Ebene
-	der prim&auml;ren DOS-Partition (<devicename>C:</devicename>)
+	der prim&auml;ren DOS-Partition (<filename>C:</filename>)
 	liegen.  Wenn Sie zum Beispiel die Dateien f&uuml;r eine
 	minimale Installation auf eine DOS-Partition kopieren wollen,
 	sollten Sie wie folgt vorgehen:</para>
@@ -666,18 +650,18 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	vorzubereiten, brauchen Sie nur die Dateien der Distribution
 	in ein Verzeichnis mit dem Namen <filename>FREEBSD</filename>
 	kopieren.  Dieses Verzeichnis mu&szlig; in der obersten Ebene
-	der prim&auml;ren DOS-Partition (<devicename>A:</devicename>)
+	der prim&auml;ren DOS-Partition (<filename>A:</filename>)
 	liegen.  Wenn Sie zum Beispiel die Dateien f&uuml;r eine
 	minimale Installation auf eine DOS-Partition kopieren wollen,
 	sollten Sie wie folgt vorgehen:</para>
 
-      <screen arch="i386"><prompt>C:\></prompt> <userinput>MD C:\FREEBSD</userinput>
-<prompt>C:\></prompt> <userinput>XCOPY /S E:\BASE C:\FREEBSD\BASE</userinput></screen>
+      <screen arch="i386"><prompt>C:\&gt;</prompt> <userinput>MD C:\FREEBSD</userinput>
+<prompt>C:\&gt;</prompt> <userinput>XCOPY /S E:\BASE C:\FREEBSD\BASE</userinput></screen>
 
-      <screen arch="pc98"><prompt>C:\></prompt> <userinput>MD A:\FREEBSD</userinput>
-<prompt>A:\></prompt> <userinput>XCOPY /S E:\BASE A:\FREEBSD\BASE</userinput></screen>
+      <screen arch="pc98"><prompt>C:\&gt;</prompt> <userinput>MD A:\FREEBSD</userinput>
+<prompt>A:\&gt;</prompt> <userinput>XCOPY /S E:\BASE A:\FREEBSD\BASE</userinput></screen>
 
-      <para>Wobei <devicename>E:</devicename> f&uuml;r den
+      <para>Wobei <filename>E:</filename> f&uuml;r den
         Laufwerksbuchstaben f&uuml;r das CDROM mit der &os;-CD
         steht.</para>
 
@@ -712,8 +696,8 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         dann mit &man.tar.1; auf Band schreiben, ungef&auml;hr
         so:</para>
 
-      <screen>&prompt.root; <userinput>cd <replaceable>/where/you/have/your/dists</replaceable></userinput>
-&prompt.root; <userinput>tar cvf /dev/rsa0 <replaceable>dist1</replaceable> .. <replaceable>dist2</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>cd /where/you/have/your/dists</userinput>
+&prompt.root; <userinput>tar cvf /dev/rsa0 dist1 .. dist2</userinput></screen>
 
       <para>Bei der eigentlichen Installation m&uuml;ssen Sie darauf
         achten, da&szlig; Sie in einem tempor&auml;ren Verzeichnis
@@ -737,11 +721,10 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         siehe <xref linkend="floppies"/>.</para>
     </sect3>
 
-    <sect3 id="ftpnfs">
+    <sect3 xml:id="ftpnfs">
       <title>Netzwerk-Installation mit FTP oder NFS</title>
 
-      <para>Wenn Sie die Bootdisketten erzeugt haben, wie in <xref
-        linkend="floppies"/> beschrieben, k&ouml;nnen Sie die restliche
+      <para>Wenn Sie die Bootdisketten erzeugt haben, wie in <xref linkend="floppies"/> beschrieben, k&ouml;nnen Sie die restliche
         Installation &uuml;ber eine Netzwerk-Verbindung
         durchf&uuml;hren, wobei drei Arten von Netzwerkverbindungen
         unterst&uuml;tzt werden: seriell, parallel, oder
@@ -790,9 +773,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
           benutzen, wenn Sie eine Punkt-zu-Punkt Verbindung &uuml;ber
           ein paralleles Kabel verwenden, verwenden Sie einfach die in
           RFC1918 definierten Adre&szlig;bereiche f&uuml;r die beiden
-          Seiten der Verbindung (z.B. <hostid
-          role="ipaddr">10.0.0.1</hostid>, <hostid
-          role="ipaddr">10.0.0.2</hostid>, etc).</para>
+          Seiten der Verbindung (z.B. <systemitem class="ipaddress">10.0.0.1</systemitem>, <systemitem class="ipaddress">10.0.0.2</systemitem>, etc).</para>
 
         <important>
           <para>Wenn Sie statt einem &os; System einen Linux-Rechner
@@ -870,7 +851,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
           mounts</quote> unterst&uuml;tzen mu&szlig;.  Wenn die &os;
           Distribution zum Beispiel im Verzeichnis
           <filename>wiggy:/usr/archive/stuff/FreeBSD</filename>, dann
-          mu&szlig;  <hostid role="hostname">wiggy</hostid> den
+          mu&szlig;  <systemitem class="fqdomainname">wiggy</systemitem> den
           direkten Zugriff auf
           <filename>/usr/archive/stuff/FreeBSD</filename> erlauben,
           nicht nur <filename>/usr</filename> oder
@@ -945,7 +926,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
               auf HTTP aufsetzt, sollten Sie die folgende URL wie
               folgt angeben:</para>
 
-            <screen><userinput>ftp://foo.bar.com:<replaceable>port</replaceable>/pub/FreeBSD</userinput></screen>
+            <screen><userinput>ftp://foo.bar.com:port/pub/FreeBSD</userinput></screen>
 
             <para>Dabei m&uuml;ssen Sie f&uuml;r
               <replaceable>port</replaceable> die Portnummer des
@@ -967,7 +948,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         <step>
           <para>Schlie&szlig;en Sie ein ANSI (vt100) kompatibles
             Terminal oder Terminalprogramm an die
-            <devicename>COM1</devicename> Schnittstelle des Systems
+            <filename>COM1</filename> Schnittstelle des Systems
             an, auf dem Sie &os; installieren wollen.</para>
         </step>
 
@@ -995,7 +976,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
             n&auml;chste Tonsignal zu warten.</para>
         </step>
 
-        <step id="hitspace">
+        <step xml:id="hitspace">
           <para>Dr&uuml;cken Sie die Leertaste und geben Sie</para>
 
 	  <screen><userinput>boot -h</userinput></screen>
@@ -1094,9 +1075,9 @@ scratch.
           <para>Ja.  Die logischen DOS-Laufwerke werden in &os; hinter
             allen anderen <quote>slices</quote> eingeblendet.
             Beispielsweise k&ouml;nnte Ihr Laufwerk
-            <devicename>D:</devicename> zu
+            <filename>D:</filename> zu
             <filename>/dev/da0s5</filename> werden, das Laufwerk
-            <devicename>E:</devicename> zu
+            <filename>E:</filename> zu
             <filename>/dev/da0s6</filename>, und so weiter.  Dieses
             Beispiel gilt nat&uuml;rlich nur, wenn Ihr logisches
             Laufwerk auf der ersten SCSI-Festplatte liegt.  Wenn Sie
@@ -1122,8 +1103,7 @@ scratch.
             sind, an diesem Programm mitzuarbeiten, schreiben Sie eine
             Mail an die Mailingliste &a.emulation;.</para>
 
-          <para>Sie k&ouml;nnen auch das Package <filename
-            role="package">emulators/pcemu</filename> aus der &os;
+          <para>Sie k&ouml;nnen auch das Package <package>emulators/pcemu</package> aus der &os;
             Ports Collection benutzen, das einen 8088 und die BIOS
             Funktionen f&uuml;r textbasierte DOS Programme emuliert.
             Allerdings braucht es zum Betrieb das X Window System
@@ -1173,8 +1153,7 @@ scratch.
 	</question>
 
         <answer>
-          <para>Wenn Sie den Port oder das Package <filename
-            role="package">emulators/osf1_base</filename>
+          <para>Wenn Sie den Port oder das Package <package>emulators/osf1_base</package>
             installieren, k&ouml;nnen Sie Tru64 Programme problemlos
             unter &os;  verwenden.</para>
         </answer>
@@ -1187,8 +1166,7 @@ scratch.
 
         <answer>
           <para>AlphaLinux Programm k&ouml;nnen in &os; benutzt
-            werden, wenn sie den Port/das Package <filename
-            role="package">emulators/linux_base</filename> installiert
+            werden, wenn sie den Port/das Package <package>emulators/linux_base</package> installiert
             werden.</para>
         </answer>
       </qandaentry>
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/layout.xml b/release/doc/de_DE.ISO8859-1/installation/common/layout.xml
index 73de4aa6325..6f9205b46a6 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/layout.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/layout.xml
@@ -5,7 +5,7 @@
 
 	This section contains the contents of the old LAYOUT.TXT file.
 -->
-<sect1 id="layout">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="layout">
   <title>Format der Distribution</title>
 
   <para>Ein Verzeichnis mit einer typischen &os; Distribution sieht
@@ -85,8 +85,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
     <listitem>
       <para>Das Verzeichnis <filename>floppies/</filename>
         enth&auml;lt die Images der Bootdisketten.  Informationen, wie
-        man diese Images benutzt, finden Sie in <xref
-        linkend="floppies"/>.</para>
+        man diese Images benutzt, finden Sie in <xref linkend="floppies"/>.</para>
     </listitem>
 
     <listitem>
@@ -105,8 +104,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
       <para>Die Ports Collection kann wie jede andere Distribution
         installiert werden und belegt dann rund 100 MByte
         Plattenplatz.  Weitere Informationen &uuml;ber die Ports
-        Collection finden Sie auf <ulink
-        url="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink>.
+        Collection finden Sie auf <link xlink:href="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</link>.
         Wenn Sie die <filename>doc</filename> Distribution installiert
         haben, sind diese Informationen auch unter
         <filename>/usr/share/doc/handbook</filename>
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml b/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml
index ee6284ec61b..d7d166bde42 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/trouble.xml
@@ -5,10 +5,10 @@
 
 	This file contains the comments of the old TROUBLE.TXT file.
 -->
-<sect1 id="trouble">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="trouble">
   <title>Erste Hilfe</title>
 
-  <sect2 id="repairing">
+  <sect2 xml:id="repairing">
     <title>Reparatur einer &os; Installation</title>
 
     <para>Bei &os; gibt es im Hauptmen&uuml; des
@@ -137,8 +137,8 @@
             konfiguriert sind und auf dem Sie &os; von der zweiten
             Platte booten wollen.  Das BIOS verwendet f&uuml;r die
             beiden Platten die Nummern 0 und 1, w&auml;hrend &os;
-            <devicename>ad0</devicename> und
-            <devicename>ad2</devicename> verwendet.</para>
+            <filename>ad0</filename> und
+            <filename>ad2</filename> verwendet.</para>
 
           <para>&os; liegt auf BIOS Platte 1, der Typ der Platte ist
             <literal>ad</literal>, und &os; vergibt die Nummer 2.  In
@@ -229,8 +229,8 @@
         <answer>
           <para>Benutzen Sie UserConfig (wie, steht in
             <filename>HARDWARE.TXT</filename>) und schalten die
-            Erkennung der Ger&auml;te <devicename>mcd0</devicename>
-            und <devicename>mcd1</devicename> ab.  Es ist immer
+            Erkennung der Ger&auml;te <filename>mcd0</filename>
+            und <filename>mcd1</filename> ab.  Es ist immer
             besser, wenn Sie nur die Treiber aktiv lassen, f&uuml;r
             die Sie auch passende Ger&auml;te haben, alle anderen
             Treiber sollten Sie aus dem Kernel entfernen oder
diff --git a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml
index e61129d8d18..7eabf1c087c 100644
--- a/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/common/upgrade.xml
@@ -6,7 +6,7 @@
 	This section contains the contents of the old UPGRADE.TXT
 	file.
 -->
-<sect1 id="upgrading">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="upgrading">
   <title>Aktualisierung einer &os;-Installation</title>
 
   <para>In diesem Abschnitt erfahren Sie, wie Sie Ihre
@@ -209,7 +209,7 @@
         waren.</para>
     </sect3>
 
-    <sect3 id="fstab">
+    <sect3 xml:id="fstab">
       <title>Nach der Installation</title>
 
       <para>Sobald die Installation abgeschlossen ist, werden Sie
@@ -226,9 +226,8 @@
 
     <para>Wenn Sie an einer flexibleren und ausgefeilteren
       M&ouml;glichkeit zur Aktualisierung Ihres Systems interessiert
-      sind, sollten Sie einen Blick in das Kapitel <ulink
-      url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/cutting-edge.html">The
-      Cutting Edge</ulink> des &os; Handbuchs werfen.  Bei dieser
+      sind, sollten Sie einen Blick in das Kapitel <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/cutting-edge.html">The
+      Cutting Edge</link> des &os; Handbuchs werfen.  Bei dieser
       Variante erzeugen Sie &os; aus dem Quellcode komplett neu.
       Diese Variante braucht eine verl&auml;&szlig;liche
       Netzwerkverbindung, mehr Plattenplatz und mehr Zeit, bietet aber
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/Makefile b/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
index 90a4029bab6..68e300eefde 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/Makefile
@@ -13,7 +13,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/de_DE.ISO8859-1/installation/i386/article.xml b/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
index 55bd1c5240c..17145a0e98a 100644
--- a/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,16 +10,13 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/i386/article.xml,v 1.5 2002/12/07 21:09:56 ue Exp $
   basiert auf: 1.4
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &artheader;
-  &abstract;
   &sect.install;
   &sect.layout;
   &sect.upgrade;
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile b/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
index addf11d5e44..cfa6e24c591 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/Makefile
@@ -12,7 +12,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml b/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
index e484e745c08..f23f3bcd908 100644
--- a/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/ia64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,16 +10,13 @@
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/ia64/article.xml,v 1.1 2002/11/09 20:07:25 ue Exp $
   basiert auf: 1.1
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile b/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
index e243d77f60e..d3444eaccd1 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/Makefile
@@ -12,7 +12,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml b/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
index 392bbf000e9..2e715ced7b5 100644
--- a/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,16 +10,13 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/pc98/article.xml,v 1.2 2002/10/12 18:02:23 ue Exp $
   basiert auf: 1.1
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
index ad21743f6dd..ee2708dd2c1 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,16 +10,13 @@
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/installation/sparc64/article.xml,v 1.3 2002/11/16 12:10:42 ue Exp $
   basiert auf: 1.4
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &artheader;
-  &abstract;
   &sect.install;
   &sect.layout;
   &sect.upgrade;
diff --git a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml
index 5fc8c79dec7..1094084ab6e 100644
--- a/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml
+++ b/release/doc/de_DE.ISO8859-1/installation/sparc64/install.xml
@@ -4,7 +4,7 @@
   basiert auf: 1.14
   This file contains sparc64-specific installation instructions.
 -->
-<sect1 id="install">
+<sect1 xml:id="install">
   <title>Installation von &os;</title>
 
   <para>Hier finden Sie Informationen, wie Sie die &arch; Version
@@ -67,7 +67,7 @@
       finden Sie hier noch keine Verweise auf deutsche Server.</para>
   </important>
 
-  <sect2 id="getting-to-prom-prompt">
+  <sect2 xml:id="getting-to-prom-prompt">
     <title>Start von OpenBoot</title>
 
     <para>Die meisten &arch; Systeme booten automatisch von
@@ -97,8 +97,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
     <screenco>
       <areaspec>
-	<area id="prompt-single" coords="1 5">
-	<area id="prompt-smp" coords="2 5">
+	<area xml:id="prompt-single" coords="1 5">
+	<area xml:id="prompt-smp" coords="2 5">
       </areaspec>
 
       <screen><prompt>ok   </prompt>
@@ -118,12 +118,12 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
     </screenco>
   </sect2>
 
-  <sect2 id="prepare-cd">
+  <sect2 xml:id="prepare-cd">
     <title>Vorbereitungen f&uuml;r die Installation von CD</title>
 
     <para>Wenn Sie von CD installieren wollen, finden Sie ein ISO
       Image mit einem Schnappschu&szlig; der aktuellen Version von
-      &os;/&arch; bei <ulink url="&release.url;"></ulink>.  Mit dieser
+      &os;/&arch; bei <link xlink:href="&release.url;"/>.  Mit dieser
       Datei k&ouml;nnen Sie eine bootf&auml;hige CD erzeugen, auf der
       sich alle notwendigen Dateien f&uuml;r den Systemstart und die
       Erzeugung einer minimalen &os;  Installation befinden.</para>
@@ -138,7 +138,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
       linkend="creating-root-filesystem"> beschrieben.</para>
   </sect2>
 
-  <sect2 id="prepare-network">
+  <sect2 xml:id="prepare-network">
     <title>Vorbereitungen f&uuml;r die Netzwerk-Installation</title>
 
     <para>Um den &os;/&arch; Kernel zu starten, mu&szlig; die Firmware
@@ -150,7 +150,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
       kann TFTP oder NFS nutzen, um den Kernel zu laden.  Weitere
       Informationen dazu finden Sie in den folgenden Kapiteln.</para>
 
-    <sect3 id="downloading">
+    <sect3 xml:id="downloading">
       <title>Download der ben&ouml;tigten Dateien</title>
 
       <para>Wenn Sie &uuml;ber ein Netzwerk installieren wollen,
@@ -164,25 +164,25 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
       <itemizedlist>
 	<listitem>
-	  <para><ulink
-	    url="&release.url;loader-tftp.gz"></ulink></para>
+	  <para><link
+	    xlink:href="&release.url;loader-tftp.gz"/></para>
 	</listitem>
 
 	<listitem>
-	  <para><ulink
-	    url="&release.url;loader-nfs.gz"></ulink></para>
+	  <para><link
+	    xlink:href="&release.url;loader-nfs.gz"/></para>
 	</listitem>
       </itemizedlist>
 
       <para>Die zweite Datei ist der Kernel, der dem bootenden System
 	zur Verf&uuml;gung gestellt wird.  Diese Datei finden Sie auf
-	<ulink url="&release.url;"></ulink>.</para>
+	<link xlink:href="&release.url;"/>.</para>
         <!-- XXX kernel filename?-->
 
       <para>Die dritte (und letzte) Datei ist das &man.tar.1;  Archiv
 	mit den Programmen und Konfigurationsdateien des Basissystems.
-	Dieses Archiv finden Sie hier:  <ulink
-	url="&release.url;distrib.tar.gz"></ulink>.</para>
+	Dieses Archiv finden Sie hier:  <link
+	xlink:href="&release.url;distrib.tar.gz"/>.</para>
     </sect3>
 
     <sect3>
@@ -406,7 +406,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
     </sect3>
   </sect2>
 
-  <sect2 id="creating-disk-label">
+  <sect2 xml:id="creating-disk-label">
     <title>Aufteilung der Festplatte</title>
 
     <para>Der Kernel unterst&uuml;tzt das von Sun f&uuml;r den
@@ -417,9 +417,9 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
     <para>Da es f&uuml;r &os;/&arch; noch kein &man.sysinstall.8;
       gibt, m&uuml;ssen Sie das Disk Label manuell erzeugen, wenn Sie
       &os;/&arch; &os; verwenden.  Weitere Informationen zu diesem
-      Thema k&ouml;nnen Sie dem <ulink
-      url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">FreeBSD
-      Handbuch</ulink> entnehmen.</para>
+      Thema k&ouml;nnen Sie dem <link
+      xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">FreeBSD
+      Handbuch</link> entnehmen.</para>
 
     <para>Bei &os;/&arch; mu&szlig; ein Sun-kompatibles Label in das
       &os; Label eingebettet werden, damit OpenBoot von der Platte
@@ -530,14 +530,14 @@ drivedata: 0
 	  ist es m&ouml;glich, den <application>Loader</application>
 	  wie oben beschrieben via TFTP zu starten und ihn dann den
 	  Kernel von Festplatte starten zu lassen.  Dazu brauchen Sie
-	  eine spezielle Version des Loaders, die bei <ulink
-	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/loader-ufs.gz"></ulink>
+	  eine spezielle Version des Loaders, die bei <link
+	  xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/loader-ufs.gz"/>
 	  erh&auml;ltlich ist.</para>
       </step>
     </procedure>
   </sect2>
 
-  <sect2 id="creating-root-filesystem">
+  <sect2 xml:id="creating-root-filesystem">
     <title>Erzeugung des Root Dateisystems</title>
 
     <para>Wenn Sie von der lokalen Platte booten wollen, brauchen Sie
@@ -593,7 +593,7 @@ drivedata: 0
       kann.</para>
   </sect2>
 
-  <sect2 id="installing-base-system">
+  <sect2 xml:id="installing-base-system">
     <title>Installation des Basissystems</title>
 
     <para>Wenn Sie &uuml;ber ein Netzwerk gebootet haben, haben Sie
diff --git a/release/doc/de_DE.ISO8859-1/readme/article.xml b/release/doc/de_DE.ISO8859-1/readme/article.xml
index 3728f993420..5b39dc98601 100644
--- a/release/doc/de_DE.ISO8859-1/readme/article.xml
+++ b/release/doc/de_DE.ISO8859-1/readme/article.xml
@@ -1,22 +1,20 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
-
 <!--
   The FreeBSD German Documentation Project
   The FreeBSD Documentation Project
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/readme/article.xml,v 1.18 2003/05/11 23:28:35 mheinen Exp $
   basiert auf: 1.26
 -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
+  <info><title>&os; &release.current; README</title>
+    
 
-<article lang="de">
-  <articleinfo>
-    <title>&os; &release.current; README</title>
-
-    <corpauthor>Das &os; Projekt</corpauthor>
+    <author><orgname>Das &os; Projekt</orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -41,7 +39,6 @@
       <holder role="mailto:de-bsd-translators@de.FreeBSD.org">The
         FreeBSD German Documentation Project</holder>
     </copyright>
-  </articleinfo>
 
   <abstract>
     <para>Dieses Dokument enth&auml;lt eine kurze Einf&uuml;hrung zu &os;
@@ -50,8 +47,9 @@
       k&ouml;nnen, sowie Verweise auf zus&auml;tzliche
       Informationsquellen.</para>
   </abstract>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>Einf&uuml;hrung</title>
 
     <para>Diese Ausgabe von &os; ist eine &release.type;-Version von
@@ -169,7 +167,7 @@
     </sect2>
   </sect1>
 
-  <sect1 id="obtain">
+  <sect1 xml:id="obtain">
     <title>Bezugsquellen f&uuml;r &os;</title>
 
     <para>&os; kann auf vielen verschiedenen Wegen bezogen werden.
@@ -190,24 +188,20 @@
         der &os; Ports Collection.</para>
 
       <para>Eine &Uuml;bersicht &uuml;ber die Firmen, die FreeBSD auf
-        CDROM oder DVD vertreiben, finden Sie im Anhang <ulink
-        url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/mirrors.html"><quote>Bezugsquellen
-        f&uuml;r FreeBSD</quote></ulink> des Handbuches.</para>
+        CDROM oder DVD vertreiben, finden Sie im Anhang <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/mirrors.html"><quote>Bezugsquellen
+        f&uuml;r FreeBSD</quote></link> des Handbuches.</para>
     </sect2>
 
     <sect2>
       <title>FTP</title>
 
       <para>Sie k&ouml;nnen &os; und/oder die optionalen Packages mit
-        FTP vom prim&auml;ren &os;-Server <ulink
-        url="ftp://ftp.FreeBSD.org/"></ulink> und allen seinen
+        FTP vom prim&auml;ren &os;-Server <uri xlink:href="ftp://ftp.FreeBSD.org/">ftp://ftp.FreeBSD.org/</uri> und allen seinen
         <quote>mirrors</quote> beziehen.</para>
 
       <para>Eine Liste von alternativen Bezugsquellen f&uuml;r &os;
-        finden Sie im Kapitel <ulink
-        url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">FTP
-        Server</ulink> des Handbuchs und auf unseren <ulink
-        url="http://www.freebsdmirrors.org/"></ulink> Webseiten.  Wir
+        finden Sie im Kapitel <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/mirrors-ftp.html">FTP
+        Server</link> des Handbuchs und auf unseren <uri xlink:href="http://www.freebsdmirrors.org/">http://www.freebsdmirrors.org/</uri> Webseiten.  Wir
         raten Ihnen dringend, einen Mirror in der n&auml;heren
         Umgebung (aus Netzwerksicht) zu verwenden.</para>
 
@@ -215,9 +209,8 @@
         Sie sich bitte an <email>freebsd-admin@FreeBSD.org</email>,
         wenn Sie an weiteren Informationen zu diesem Thema
         interessiert sind.  Zus&auml;tzliche Informationen zu diesem
-        Thema finden Sie im Artikel <ulink
-        url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/hubs/">Mirroring
-        FreeBSD</ulink>.</para>
+        Thema finden Sie im Artikel <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/hubs/">Mirroring
+        FreeBSD</link>.</para>
 
       <para>Sie finden die f&uuml;r den Start der Installation
         notwendigen Images der Bootdisketten und die Dateien der
@@ -228,7 +221,7 @@
     </sect2>
   </sect1>
 
-  <sect1 id="contacting">
+  <sect1 xml:id="contacting">
     <title>Kontaktinformation f&uuml;r das &os; Projekt</title>
 
     <sect2>
@@ -261,16 +254,14 @@
 
       <para>Alle Mailinglisten stehen f&uuml;r jeden offen, der sich
 	f&uuml;r das jeweilige Thema interessiert.  Besuchen Sie
-	einfach mal auf der <ulink
-	url="http://www.FreeBSD.org/mailman/listinfo">FreeBSD Mailman
-	Info Page</ulink>.  Dort erhalten Sie weitergehende
+	einfach mal auf der <link xlink:href="http://www.FreeBSD.org/mailman/listinfo">FreeBSD Mailman
+	Info Page</link>.  Dort erhalten Sie weitergehende
 	Informationen, wie Sie die diversen Mailinglisten abonnieren
 	k&ouml;nnen, wie Sie auf die Archive zugreifen k&ouml;nnen,
 	usw.  Es gibt viele Mailinglisten, die nur mit einem ganz
 	bestimmten Thema befassen und hier nicht aufgef&uuml;hrt sind.
 	Weitergehende Informationen finden Sie auf den Mailman Seiten
-	und im Bereich <ulink
-	url="http://www.FreeBSD.org/support.html#mailing-list">Mailinglisten</ulink>
+	und im Bereich <link xlink:href="http://www.FreeBSD.org/support.html#mailing-list">Mailinglisten</link>
 	der &os; Webseite.</para>
 
       <important>
@@ -294,9 +285,8 @@
 	Report</quote> (PRs) auf dieser Art und Weise absetzen, wird
 	er automatisch archiviert und weiterverfolgt.  Die Entwickler
 	von &os;  bem&uuml;hen sich, so schnell wie m&ouml;glich auf
-	alle gemeldeten Fehler zu reagieren.  <ulink
-	url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">Eine
-	&Uuml;bersicht &uuml;ber alle offenen PRs</ulink> ist auf dem
+	alle gemeldeten Fehler zu reagieren.  <link xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">Eine
+	&Uuml;bersicht &uuml;ber alle offenen PRs</link> ist auf dem
 	Webserver von &os; verf&uuml;gbar.  Diese Liste ist sehr
 	n&uuml;tzlich, wenn Sie wissen wollen, welche m&ouml;glichen
 	Probleme schon von anderen Benutzern gefunden wurden.</para>
@@ -309,15 +299,14 @@
         k&ouml;nnen, k&ouml;nnen Sie versuchen, Ihren Problem Report
         an die Mailingliste &a.bugs; zu senden.</para>
 
-      <para>Weitere Informationen finden Sie im Dokument <ulink
-        url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/problem-reports/"><quote>Writing
-        FreeBSD Problem Reports</quote></ulink> auf der Webseite von
+      <para>Weitere Informationen finden Sie im Dokument <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/problem-reports/"><quote>Writing
+        FreeBSD Problem Reports</quote></link> auf der Webseite von
         &os;.  Es enth&auml;lt viele n&uuml;tzliche Tips zum
         Verfassen und Versenden effektiver Fehlermeldungen.</para>
     </sect2>
   </sect1>
 
-  <sect1 id="seealso">
+  <sect1 xml:id="seealso">
     <title>Weiterf&uuml;hrende Dokumente</title>
 
     <para>Es gibt viele verschiedene Quellen f&uuml;r Informationen
@@ -325,7 +314,7 @@
       w&auml;hrend andere &uuml;ber das Internet oder in gedruckter
       Form verf&uuml;gbar sind.</para>
 
-    <sect2 id="release-docs">
+    <sect2 xml:id="release-docs">
       <title>Dokumentation zur Release</title>
 
       <para>Sie finden weitergehende &uuml;ber diese &release.type;
@@ -401,13 +390,13 @@
           geh&ouml;rt, steht immer am Anfang des Textes.</para>
       </note>
 
-      <para>Auf den Plattformen, auf denen &man.sysinstall.8; zur
+      <para>Auf den Plattformen, auf denen &man.bsdinstall.8; zur
 	Verf&uuml;gung steht (zur Zeit alpha, i386, ia64, pc98 und
 	sparc64) finden Sie diese Dokumente w&auml;hrend der
 	Installation normalerweise unter dem Men&uuml;punkt
 	Dokumentation.  Um nach der Installation des Systems dieses
 	Men&uuml;  zugreifen zu k&ouml;nnen, m&uuml;ssen Sie das
-	Programm &man.sysinstall.8;  erneut aufrufen.</para>
+	Programm &man.bsdinstall.8;  erneut aufrufen.</para>
 
       <note>
         <para>Sie sollten auf jeden Fall die Errata zur jeweiligen
@@ -419,8 +408,7 @@
           veraltet.  Allerdings sind im Internet aktualisierte
           Versionen verf&uuml;gbar, die die <quote>aktuellen
           Errata</quote> f&uuml;r diese Version sind.  Diese Versionen
-          sind bei <ulink
-          url="http://www.FreeBSD.org/releases/"></ulink> und allen
+          sind bei <uri xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri> und allen
           aktuellen Mirrors dieser Webseite verf&uuml;gbar.</para>
       </note>
     </sect2>
@@ -431,8 +419,8 @@
       <para>Wie bei fast jedem anderen &unix;-&auml;hnlichen System
         steht Ihnen auch bei &os; eine Onlinehilfe zur Verf&uuml;gung,
         die Sie &uuml;ber das Kommando &man.man.1; oder &uuml;ber das
-        <ulink url="http://www.FreeBSD.org/cgi/man.cgi">hypertext
-        manual pages gateway</ulink> auf dem Webserver von &os;
+        <link xlink:href="http://www.FreeBSD.org/cgi/man.cgi">hypertext
+        manual pages gateway</link> auf dem Webserver von &os;
         ansprechen k&ouml;nnen.  Die Onlinehilfe stellt den Benutzern
         von &os; Informationen zu einzelnen Befehlen und Interfaces
         zur Programmierung zur Verf&uuml;gung.</para>
@@ -452,13 +440,10 @@
       <para>Zwei extrem n&uuml;tzliche Sammlungen von Informationen
         &uuml;ber &os;, die vom &os; Project verwaltet werden, sind
         das &os; Handbuch und der &os; FAQ.  Die aktuellen Versionen
-        des <ulink
-        url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">Handbuches</ulink>
-        und der <ulink
-        url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/faq/">FAQ</ulink>
-        sind immer auf der Webseite <ulink
-        url="http://www.FreeBSD.org/docs.html">FreeBSD
-        Dokumentation</ulink> und allen Ihren Mirror-Sites
+        des <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">Handbuches</link>
+        und der <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/faq/">FAQ</link>
+        sind immer auf der Webseite <link xlink:href="http://www.FreeBSD.org/docs.html">FreeBSD
+        Dokumentation</link> und allen Ihren Mirror-Sites
         verf&uuml;gbar.  Wenn Sie die Distribution
         <filename>doc</filename> installiert haben, k&ouml;nnen Sie
         den FAQ und Handbuch mit einem Web-Browser direkt auf Ihrem
@@ -476,8 +461,7 @@
         verf&uuml;gbar.</para>
 
       <para>Eine Liste zus&auml;tzlicher B&uuml;cher und
-        Dokumentationen zu &os;  finden Sie im Kapitel <ulink
-        url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/bibliography.html">Bibliographie</ulink>
+        Dokumentationen zu &os;  finden Sie im Kapitel <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/bibliography.html">Bibliographie</link>
         des Handbuchs.  Da &os; ganz klar aus der &unix;-Welt stammt,
         enthalten auch andere Artikel und B&uuml;cher &uuml;ber
         &unix;-Systeme n&uuml;tzliche Informationen.  Eine Auswahl
@@ -486,15 +470,14 @@
     </sect2>
   </sect1>
 
-  <sect1 id="acknowledgements">
+  <sect1 xml:id="acknowledgements">
     <title>Danksagung</title>
 
     <para>&os; ist das Ergebnis der Arbeit vieler hundert, wenn nicht
       Tausender Personen aus der ganzen Welt, die ungez&auml;hlte
       Stunden investiert haben, um diese Version m&ouml;glich zu
       machen.  Die vollst&auml;ndige Liste aller Entwickler und Helfer
-      finden Sie auf der &os;-Webseite <ulink
-      url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/"><quote>Beteiligte</quote></ulink>
+      finden Sie auf der &os;-Webseite <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/articles/contributors/"><quote>Beteiligte</quote></link>
       und allen aktuellen Mirrors dieser Webseite.</para>
 
     <para>Wir m&ouml;chten uns speziell bei den vielen tausend
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
index c0b69a4152f..5ac7e8c3dce 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,13 +10,11 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/alpha/article.xml,v 1.4 2002/10/12 18:02:24 ue Exp $
   basiert auf: 1.3
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &art;
 </article>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml b/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
index b407464b2ba..d9f53d6f114 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/common/new.xml
@@ -2,10 +2,10 @@
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/common/new.xml,v 1.250 2003/05/24 22:38:23 ue Exp $
   basiert auf: 1.571
 -->
-<articleinfo>
-  <title>&os;/&arch; &release.current; Release Notes</title>
+<info><title>&os;/&arch; &release.current; Release Notes</title>
+  
 
-  <corpauthor>The FreeBSD Project</corpauthor>
+  <author><orgname>The FreeBSD Project</orgname></author>
 
   <pubdate>$FreeBSD$</pubdate>
 
@@ -42,9 +42,9 @@
       Kernel und an den Benutzerprogrammen.  Einige kurze Anmerkungen
       zum Thema Aktualisierung wurden ebenfalls aufgenommen.</para>
   </abstract>
-</articleinfo>
+</info>
 
-<sect1 id="intro">
+<sect1 xml:id="intro">
   <title>Einf&uuml;hrung</title>
 
   <para>Dieses Dokument enth&auml;lt die Release Notes f&uuml;r &os;
@@ -59,19 +59,16 @@
     &release.branch; zwischen &release.prev; und der zuk&uuml;nftigen
     Version &release.next;.  Sie k&ouml;nnen einige fertige
     &release.type; Distributionen, die in diesem Entwicklungszweig
-    entstanden sind, auf <ulink url="&release.url;"></ulink>
+    entstanden sind, auf <uri xlink:href="&release.url;">&release.url;</uri>
     finden.</para>
 
   <para releasetype="release">Diese Distribution von &os; &release.current; ist eine
-    &release.type; Distribution.  Sie k&ouml;nnen Sie von <ulink
-    url="&release.url;"></ulink> und allen seinen Mirrors erhalten.
+    &release.type; Distribution.  Sie k&ouml;nnen Sie von <uri xlink:href="&release.url;">&release.url;</uri> und allen seinen Mirrors erhalten.
     Weitere Informationen, wie Sie diese (oder andere) &release.type;
     Distributionen von &os; erhalten k&ouml;nnen, finden Sie im Anhang
-    <ulink
-    url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/mirrors.html"><quote>Obtaining
-    FreeBSD</quote></ulink> des <ulink
-    url="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">FreeBSD
-    Handbuchs</ulink>.</para>
+    <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/mirrors.html"><quote>Obtaining
+    FreeBSD</quote></link> des <link xlink:href="http://www.FreeBSD.org/doc/de_DE.ISO8859-1/books/handbook/">FreeBSD
+    Handbuchs</link>.</para>
 
   <para>Anwender, die noch keine Erfahrung mit einer &release.branch;
     Version eines &os; &release.type; haben, sollten auf jeden Fall die
@@ -94,7 +91,7 @@
     finden Sie auf den &os; Webseiten.</para>
 </sect1>
 
-<sect1 id="new">
+<sect1 xml:id="new">
   <title>Neuerungen</title>
 
   <para>In diesem Artikel finden Sie
@@ -119,14 +116,13 @@
     Anwender sichtbare &Auml;nderungen und die wichtigsten
     Verbesserungen der Infrastruktur.</para>
 
-  <sect2 id="security">
+  <sect2 xml:id="security">
     <title>Sicherheit</title>
 
     <para>Ein &uuml;ber das Netzwerk nutzbarer Fehler in
       <application>CVS</application> k&ouml;nnte dazu f&uuml;hren,
       da&szlig; ein Angreifer beliebige Programme auf dem CVS Server
-      ausf&uuml;hren kann.  Weitere Informationen finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:01.cvs.asc">FreeBSD-SA-03:01</ulink>.
+      ausf&uuml;hren kann.  Weitere Informationen finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:01.cvs.asc">FreeBSD-SA-03:01</link>.
       &merged;</para>
 
     <para>Durch Auswertung der Antwortzeiten von
@@ -135,41 +131,35 @@
       bestimmten Umst&auml;nden den Klartext der &uuml;bermittelten
       Daten zu erhalten.  Dieser Fehler durch die neue
       <application>OpenSSL</application> Version 0.9.7 behoben.
-      Weitere Informationen finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:02.openssl.asc">FreeBSD-SA-03:02</ulink>.
+      Weitere Informationen finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:02.openssl.asc">FreeBSD-SA-03:02</link>.
       &merged;</para>
 
     <para>Die Sicherheit und Leistung der Erweiterung
       <quote>syncookies</quote> wurde verbessert, damit Angreifer es
       schwerer haben, eine Verbindung zu f&auml;lschen.  Weitere
-      Informationen finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:03.syncookies.asc">FreeBSD-SA-03:03</ulink>.
+      Informationen finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:03.syncookies.asc">FreeBSD-SA-03:03</link>.
       &merged;</para>
 
     <para>Diverse &uuml;ber das Netzwerk nutzbare
       Puffer-&Uuml;berl&auml;ufe in <application>sendmail</application>
       wurden durch die Aktualisierung von
       <application>sendmail</application> behoben.  Weitere
-      Information finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:04.sendmail.asc">FreeBSD-SA-03:04</ulink>
-      und <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:07.sendmail.asc">FreeBSD-SA-03:07</ulink>.
+      Information finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:04.sendmail.asc">FreeBSD-SA-03:04</link>
+      und <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:07.sendmail.asc">FreeBSD-SA-03:07</link>.
       &merged;</para>
 
     <para>In der XDR-Implementierung wurde ein Fehler behoben, der es
       einem Angreifer m&ouml;glich machte, den Dienst abst&uuml;rzen
-      zu lassen.  Weitere Informationen finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:05.xdr.asc">FreeBSD-SA-03:05</ulink>.
+      zu lassen.  Weitere Informationen finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:05.xdr.asc">FreeBSD-SA-03:05</link>.
       &merged;</para>
 
     <para>In <application>OpenSSL</application> wurden zwei vor kurzem
       ver&ouml;ffentlichte Schwachstellen repariert.  Weitere
-      Informationen finden Sie in <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:06.openssl.asc">FreeBSD-SA-03:06</ulink>.
+      Informationen finden Sie in <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:06.openssl.asc">FreeBSD-SA-03:06</link>.
       &merged;</para>
   </sect2>
 
-  <sect2 id="kernel">
+  <sect2 xml:id="kernel">
     <title>&Auml;nderungen im Kernel</title>
 
     <para arch="pc98">Der Power Management Controller CanBe wird jetzt
@@ -240,7 +230,7 @@
       Zeile <literal>options&nbsp;LAZY_SWITCH</literal>
       stehen.</para>
 
-    <sect3 id="proc">
+    <sect3 xml:id="proc">
       <title>Unterst&uuml;tzung f&uuml;r Prozessoren und
 	Mainboards</title>
 
@@ -281,7 +271,7 @@
 	Product Data Stuktur ausgelesen werden.</para>
     </sect3>
 
-    <sect3 id="boot">
+    <sect3 xml:id="boot">
       <title>&Auml;nderungen im Bootloader</title>
 
       <para arch="alpha">Der Alpha Bootloader
@@ -322,7 +312,7 @@
 
     </sect3>
 
-    <sect3 id="net-if">
+    <sect3 xml:id="net-if">
       <title>Netzwerke und Netzwerkkarten</title>
 
       <para arch="i386,pc98">Der neue Treiber &man.axe.4;
@@ -349,7 +339,7 @@
 	Fehlern kommen konnte.</para>
     </sect3>
 
-    <sect3 id="net-proto">
+    <sect3 xml:id="net-proto">
       <title>Netzwerk-Protokolle</title>
 
       <para>Es ist jetzt wieder m&ouml;glich, bei &man.ipfw.4;
@@ -422,7 +412,7 @@
 	daf&uuml;r jetzt entfernt.</para>
     </sect3>
 
-    <sect3 id="disks">
+    <sect3 xml:id="disks">
       <title>Festplatten und Massenspeicher</title>
 
       <para>Der Treiber &man.aac.4; l&auml;uft jetzt v&ouml;llig
@@ -453,9 +443,7 @@
 	    aufnehmen, m&uuml;ssen alle Programme neu kompilieren, die
 	    &man.pass.4; oder &man.xpt.4; verwenden.  Dazu
 	    geh&ouml;ren unter anderem &man.camcontrol.8; aus dem
-	    Basissystem und die Ports <filename
-	    role="port">sysutils/cdrtools</filename> und <filename
-	    role="port">multimedia/xmms</filename>.</para>
+	    Basissystem und die Ports <package role="port">sysutils/cdrtools</package> und <package role="port">multimedia/xmms</package>.</para>
 	</note>
       </para>
 
@@ -498,7 +486,7 @@
 	entfernt.</para>
     </sect3>
 
-    <sect3 id="fs">
+    <sect3 xml:id="fs">
       <title>Dateisystem</title>
 
       <para>Mit der neuen Kernel-Option <literal>DIRECTIO</literal>
@@ -519,13 +507,13 @@
 	kommen;  diese Fehler wurden beseitigt.</para>
     </sect3>
 
-    <sect3 id="pccard">
+    <sect3 xml:id="pccard">
       <title>Unterst&uuml;tzung f&uuml;r PCCARD</title>
 
-      <para></para>
+      <para/>
     </sect3>
 
-    <sect3 id="mm">
+    <sect3 xml:id="mm">
       <title>Multimedia</title>
 
       <para arch="i386,pc98">Die f&uuml;r &man.speaker.4; genutzen
@@ -535,7 +523,7 @@
     </sect3>
   </sect2>
 
-  <sect2 id="userland">
+  <sect2 xml:id="userland">
     <title>Benutzerprogramme</title>
 
     <para>&man.adduser.8; geht jetzt korrekt mit Pa&szlig;w&ouml;rtern
@@ -567,7 +555,7 @@
       &Auml;nderung der UID und GID den alten und neuen Wert
       aus.</para>
 
-    <para>>&man.config.8; kennt jetzt das Schl&uuml;selwort
+    <para>&gt;&man.config.8; kennt jetzt das Schl&uuml;selwort
       <literal>nodevice</literal>, das bei der Konfiguration eines
       angepa&szlig;ten Kernels verwendet werden kann, um die Wirkung
       einer vorher gesetzten <literal>device</literal> Anweisung
@@ -698,8 +686,8 @@
 
     <para>Das neue Programm &man.mksnap.ffs.8; vereinfacht die
       Erzeugung von FFS Snapshots.  Das Programm ist SUID
-      <username>root</username> und soll von Mitgliedern der Gruppe
-      <groupname>operator</groupname> aufgerufen werden.</para>
+      <systemitem class="username">root</systemitem> und soll von Mitgliedern der Gruppe
+      <systemitem class="groupname">operator</systemitem> aufgerufen werden.</para>
 
     <para>Bei &man.mount.8; und &man.umount.8; kann jetzt mit
       <option>-F</option> eine andere Tabelle der Dateisysteme als
@@ -961,7 +949,7 @@
       Informationen finden Sie in &man.rc.subr.8;.</para>
   </sect2>
 
-  <sect2 id="contrib">
+  <sect2 xml:id="contrib">
     <title>Zus&auml;tzliche Software</title>
 
     <para>Die <application>ACPI-CA</application> Routinen wurden von
@@ -1029,12 +1017,11 @@
     <para><application>Kerberos IV</application> (in Form von
       <application>KTH eBones</application>) wird nicht mehr
       unterst&uuml;tzt.  Anwender, die diese Funktionalit&auml;t
-      ben&ouml;tigen, k&ouml;nnen den Port oder das Package <filename
-      role="port">security/krb4</filename> installieren.  Der Kerberos
+      ben&ouml;tigen, k&ouml;nnen den Port oder das Package <package role="port">security/krb4</package> installieren.  Der Kerberos
       IV Kompatibilit&auml;tsmodus wurde aus Kerberos 5 entfernt, und
       die Namen der Benutzerprogramme wurden von
-      <literal>k5<replaceable>program</replaceable></literal> in
-      <literal>k<replaceable>program</replaceable></literal>
+      <literal>k5program</literal> in
+      <literal>kprogram</literal>
       ge&auml;ndert.</para>
 
     <para><application>Kerberos 5</application> wird jetzt beim
@@ -1084,7 +1071,7 @@
       <filename>tzdata2003a</filename> aktualisiert.  &merged;</para>
   </sect2>
 
-  <sect2 id="ports">
+  <sect2 xml:id="ports">
     <title>Infrastruktur f&uuml;r Ports und Packages</title>
 
     <para>Die nur eine Zeile langen <filename>pkg-comment</filename>
@@ -1120,7 +1107,7 @@
       bearbeiteten Paketes ausgegeben.</para>
   </sect2>
 
-  <sect2 id="releng">
+  <sect2 xml:id="releng">
     <title>Erzeugung von Releases und Integration</title>
 
     <para><application>GNOME</application> steht jetzt in der Version
@@ -1151,7 +1138,7 @@
       4.<replaceable>X</replaceable> wurden entfernt.</para>
   </sect2>
 
-  <sect2 id="doc">
+  <sect2 xml:id="doc">
     <title>Dokumentation</title>
 
     <para>Die Dokumentation wurde um die beiden Artikel <quote>FreeBSD
@@ -1165,7 +1152,7 @@
   </sect2>
 </sect1>
 
-<sect1 id="upgrade">
+<sect1 xml:id="upgrade">
   <title>Aktualisierung einer &auml;lteren Version von &os;</title>
 
   <para>Anwender, die schon ein &os;-System im Einsatz haben, sollten
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
index 421e2be605c..626e048e711 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,14 +10,11 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
 ]>
-
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/i386/article.xml,v 1.6 2002/12/07 22:11:35 ue Exp $
   basiert auf: 1.4
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &art;
 </article>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
index 2a0b2a9e184..f67e598f605 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/ia64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -15,7 +15,6 @@
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/ia64/article.xml,v 1.2 2002/11/10 10:47:53 ue Exp $
   basiert auf: 1.1
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &art;
 </article>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
index 8493157cc2b..cae92f13c4c 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,14 +10,11 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/pc98/article.xml,v 1.2 2002/10/12 18:02:25 ue Exp $
   basiert auf: 1.1
 -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &art;
 </article>
diff --git a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
index 1c08cdfd00b..a0517a94eaf 100644
--- a/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
+++ b/release/doc/de_DE.ISO8859-1/relnotes/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,13 +10,11 @@
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
 ]>
-
 <!--
   $FreeBSD$
   $FreeBSDde: de-docproj/relnotes/de_DE.ISO8859-1/relnotes/sparc64/article.xml,v 1.4 2002/10/12 18:02:25 ue Exp $
   basiert auf: 1.3
   -->
-
-<article lang="de">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="de">
   &art;
 </article>
diff --git a/release/doc/en_US.ISO8859-1/errata/article.xml b/release/doc/en_US.ISO8859-1/errata/article.xml
index 818c93b3825..cad6fc7034b 100644
--- a/release/doc/en_US.ISO8859-1/errata/article.xml
+++ b/release/doc/en_US.ISO8859-1/errata/article.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
 %release;
 ]>
-
 <!--
 	FreeBSD errata document.  Unlike some of the other RELNOTESng
 	files, this file should remain as a single SGML file, so that
@@ -16,14 +15,13 @@
 	not be the one that received the last change in the document.)
 
 -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>&os; &release; Errata </title>
+    
 
-<article>
-  <articleinfo>
-    <title>&os; &release; Errata </title>
-
-    <corpauthor>
+    <author><orgname>
     The &os; Project
-    </corpauthor>
+    </orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -34,16 +32,23 @@
       <year>2003</year>
       <year>2004</year>
       <year>2005</year>
+      <year>2006</year>
+      <year>2007</year>
+      <year>2008</year>
+      <year>2009</year>
+      <year>2010</year>
+      <year>2011</year>
+      <year>2012</year>
+      <year>2013</year>
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 
-    <legalnotice id="trademarks" role="trademarks">
+    <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.intel;
       &tm-attrib.sparc;
       &tm-attrib.general;
     </legalnotice>
-  </articleinfo>
 
   <abstract>
     <para>This document lists errata items for &os; &release;,
@@ -59,8 +64,9 @@
     <para>This errata document for &os; &release;
       will be maintained until the release of &os; &release.next;.</para>
   </abstract>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>Introduction</title>
 
     <para>This errata document contains <quote>late-breaking news</quote>
@@ -74,21 +80,18 @@
       out of date by definition, but other copies are kept updated on
       the Internet and should be consulted as the <quote>current
       errata</quote> for this release.  These other copies of the
-      errata are located at <ulink
-      url="http://www.FreeBSD.org/releases/"></ulink>, plus any sites
+      errata are located at <uri xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>, plus any sites
       which keep up-to-date mirrors of this location.</para>
 
     <para>Source and binary snapshots of &os; &release.branch; also
       contain up-to-date copies of this document (as of the time of
       the snapshot).</para>
 
-    <para>For a list of all &os; CERT security advisories, see <ulink
-      url="http://www.FreeBSD.org/security/"></ulink> or <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink>.</para>
+    <para>For a list of all &os; CERT security advisories, see <uri xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri> or <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</uri>.</para>
 
   </sect1>
 
-  <sect1 id="security">
+  <sect1 xml:id="security">
     <title>Security Advisories</title>
 
     <para releasetype="current">No advisories.</para>
@@ -98,7 +101,7 @@
     <para releasetype="snapshot">No advisories.</para>
   </sect1>
 
-  <sect1 id="open-issues">
+  <sect1 xml:id="open-issues">
     <title>Open Issues</title>
 
     <para releasetype="current">No open issues.</para>
@@ -108,7 +111,7 @@
     <para releasetype="snapshot">No open issues.</para>
   </sect1>
 
-  <sect1 id="late-news">
+  <sect1 xml:id="late-news">
     <title>Late-Breaking News</title>
 
     <para releasetype="current">No news.</para>
diff --git a/release/doc/en_US.ISO8859-1/hardware/article.xml b/release/doc/en_US.ISO8859-1/hardware/article.xml
index cb11b02f917..6fac85c631d 100644
--- a/release/doc/en_US.ISO8859-1/hardware/article.xml
+++ b/release/doc/en_US.ISO8859-1/hardware/article.xml
@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
 %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "nonexistent">
 %devauto;
 ]>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>&os; &release.current; Hardware Notes</title>
+    
 
-<article>
-  <articleinfo>
-    <title>&os; &release.current; Hardware Notes</title>
-
-    <corpauthor>The &os; Documentation Project</corpauthor>
+    <author><orgname>The &os; Documentation Project</orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -33,7 +32,7 @@
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 
-    <legalnotice id="trademarks" role="trademarks">
+    <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.amd;
       &tm-attrib.fujitsu;
@@ -44,9 +43,9 @@
       &tm-attrib.general;
     </legalnotice>
 
-  </articleinfo>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>Introduction</title>
 
     <para>This document contains the hardware compatibility notes for
@@ -56,14 +55,14 @@
       along with known working instances of these devices.</para>
   </sect1>
 
-  <sect1 id="proc">
+  <sect1 xml:id="proc">
     <title>Supported Processors and System Boards</title>
 
     <para>This section provides some architecture-specific information
       about the specific processors and systems that are supported by
       each architecture.</para>
 
-    <sect2 id="proc-amd64">
+    <sect2 xml:id="proc-amd64">
       <title>amd64</title>
 
       <para>Since mid-2003 &os;/&arch.amd64; has supported the AMD64
@@ -121,8 +120,8 @@
 	<listitem>
 	  <para>Some &intel; &pentium; 4s and Celeron Ds using
 	    the <quote>Prescott</quote> core have EM64T support.  See
-	    the <ulink url="http://processorfinder.intel.com">Intel
-	    Processor Spec Finder</ulink> for the definitive answer about
+	    the <link xlink:href="http://processorfinder.intel.com">Intel
+	    Processor Spec Finder</link> for the definitive answer about
 	    EM64T support in Intel processors.</para>
 	</listitem>
 
@@ -144,7 +143,7 @@
 
     </sect2>
 
-    <sect2 id="proc-i386">
+    <sect2 xml:id="proc-i386">
       <title>i386</title>
 
       <para>&os;/&arch.i386; runs on a wide variety of <quote>IBM PC
@@ -178,18 +177,13 @@
 	bugs may generate some problems.  Perusal of the archives of
 	the &a.smp; may yield some clues.</para>
 
-      <para>&os; will take advantage of HyperThreading (HTT) support
-	on &intel; CPUs that support this feature.  A kernel with the
-	<literal>options&nbsp;SMP</literal> feature enabled will
-	automatically detect the additional logical processors.  The
-	default &os; scheduler treats the logical processors the same
-	as additional physical processors; in other words, no attempt
-	is made to optimize scheduling decisions given the shared
-	resources between logical processors within the same CPU.
-	Because this naive scheduling can result in suboptimal
-	performance, under certain circumstances it may be useful to
-	disable the logical processors with the
-	<varname>machdep.hyperthreading_allowed</varname> tunable.
+      <para>&os; will take advantage of SMT (Symmetric MultiThreading,
+	also known as HyperThreading on &intel; CPUs) on the supported
+	CPUs.  The <filename>GENERIC</filename> kernel which is
+	installed by default will automatically detect the additional
+	logical processors.  The default &os; scheduler recognizes
+	processor topology on the system and selects logical and
+	physical processors to obtain optimal performance.
 	The &man.smp.4; manual page has more details.</para>
 
       <para>&os; will take advantage of Physical Address Extensions
@@ -230,23 +224,19 @@
 	(DSDT) provided by each machine's BIOS.  Some machines have
 	bad or incomplete DSDTs, which prevents ACPI from functioning
 	correctly.  Replacement DSDTs for some machines can be found
-	at the <ulink
-	  url="http://acpi.sourceforge.net/dsdt/index.php">DSDT</ulink>
-	section of the <ulink
-	  url="http://acpi.sourceforge.net/">ACPI4Linux</ulink> project
+	at the <link xlink:href="http://acpi.sourceforge.net/dsdt/index.php">DSDT</link>
+	section of the <link xlink:href="http://acpi.sourceforge.net/">ACPI4Linux</link> project
 	Web site.  &os; can use these DSDTs to override the DSDT
 	provided by the BIOS; see the &man.acpi.4; manual page for
 	more information.</para>
     </sect2>
 
-    <sect2 id="proc-ia64">
+    <sect2 xml:id="proc-ia64">
       <title>ia64</title>
 
-      <para>Currently supported processors are the <ulink
-	  url="http://people.freebsd.org/~marcel/refs/ia64/itanium/24532003.pdf">&itanium;</ulink>
-	and the <ulink
-	  url="http://people.freebsd.org/~marcel/refs/ia64/itanium2/25111003.pdf">&itanium;
-	  2</ulink>.</para>
+      <para>Currently supported processors are the <link xlink:href="http://people.freebsd.org/~marcel/refs/ia64/itanium/24532003.pdf">&itanium;</link>
+	and the <link xlink:href="http://people.freebsd.org/~marcel/refs/ia64/itanium2/25111003.pdf">&itanium;
+	  2</link>.</para>
 
       <para>Supported chipsets include:</para>
 
@@ -276,7 +266,7 @@
 	and the use of a serial console is required.</para>
     </sect2>
 
-    <sect2 id="proc-pc98">
+    <sect2 xml:id="proc-pc98">
       <title>pc98</title>
 
       <para>NEC PC-9801/9821 series with almost all &i386;-compatible
@@ -305,77 +295,23 @@
 	FC-H98 series) is not supported.</para>
     </sect2>
 
-    <sect2 id="proc-powerpc">
+    <sect2 xml:id="proc-powerpc">
       <title>powerpc</title>
 
-      <para>This section describes the systems currently known to be
-	supported by &os; on the PowerPC platform. This list is not
-	exhaustive.</para>
+      <para>All Apple PowerPC machines with built-in USB are supported,
+	as well a limited selection of non-Apple machines,
+	including KVM on POWER7</para>
 
-      <para>In general, all New World architecture Apple hardware
-	is supported, as well a limited selection of non-Apple
-	machines.</para>
-
-      <para>All systems listed below are fully supported, with the
-	exception that software fan control is currently missing on
-	some Power Macintosh G5 models. SMP is supported on all systems
-	with more than 1 processor.</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>Apple iMac G3</para>
-	</listitem>
-	<listitem>
-	  <para>Apple iMac G4</para>
-	</listitem>
-	<listitem>
-	  <para>Apple iMac G5</para>
-	</listitem>
-	<listitem>
-	  <para>Apple Power Macintosh G3 (Blue &amp; White)</para>
-	</listitem>
-	<listitem>
-	  <para>Apple Power Macintosh G4</para>
-	</listitem>
-	<listitem>
-	  <para>Apple Power Macintosh G5</para>
-	</listitem>
-	<listitem>
-	  <para>Apple iBook G3</para>
-	</listitem>
-	<listitem>
-	  <para>Apple iBook G4</para>
-	</listitem>
-	<listitem>
-	  <para>Apple PowerBook G3 (Lombard and Pismo)</para>
-	</listitem>
-	<listitem>
-	  <para>Apple PowerBook G4</para>
-	</listitem>
-	<listitem>
-	  <para>Apple XServe G4</para>
-	</listitem>
-	<listitem>
-	  <para>Apple XServe G5</para>
-	</listitem>
-	<listitem>
-	  <para>Apple Mac Mini</para>
-	</listitem>
-	<listitem>
-	  <para>Embedded boards based on MPC85XX</para>
-	</listitem>
-      </itemizedlist>
+      <para>SMP is supported on all systems with more than
+	1 processor.</para>
     </sect2>
 
-    <sect2 id="proc-sparc64">
+    <sect2 xml:id="proc-sparc64">
       <title>sparc64</title>
 
       <para>This section describes the systems currently known to be
 	supported by &os; on the Fujitsu &sparc64; and Sun &ultrasparc;
-	platforms.  For
-	background information on the various hardware designs see the
-	<ulink url="http://sunsolve.sun.com/handbook_pub/">Sun System
-	  Handbook</ulink>.</para>
+	platforms.</para>
 
       <para>SMP is supported on all systems with more than 1
 	processor.</para>
@@ -689,7 +625,7 @@
   build.
   -->
 
-  <sect1 id="support">
+  <sect1 xml:id="support">
     <title>Supported Devices</title>
 
     <para>This section describes the devices currently known to be
@@ -711,7 +647,7 @@
 	multiple times.</para>
     </note>
 
-    <sect2 id="disk">
+    <sect2 xml:id="disk">
       <title>Disk Controllers</title>
 
       <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;,
@@ -835,8 +771,7 @@
 	support CD-ROM commands are supported for read-only access by
 	the CD-ROM drivers (such as &man.cd.4;).  WORM/CD-R/CD-RW
 	writing support is provided by &man.cdrecord.1;, which is a
-	part of the <filename
-	  role="package">sysutils/cdrtools</filename> port in the Ports
+	part of the <package>sysutils/cdrtools</package> port in the Ports
 	Collection.</para>
 
       <para>The following CD-ROM type systems are supported at this
@@ -868,7 +803,7 @@
       </itemizedlist>
     </sect2>
 
-    <sect2 id="ethernet">
+    <sect2 xml:id="ethernet">
       <title>Ethernet Interfaces</title>
 
       &hwlist.ae;
@@ -1009,7 +944,7 @@
 
     </sect2>
 
-    <sect2 id="fddi">
+    <sect2 xml:id="fddi">
       <title>FDDI Interfaces</title>
 
       <para>[&arch.i386;, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4;
@@ -1018,7 +953,7 @@
       <para>[&arch.i386;] DEC DEFEA EISA (&man.fpa.4; driver)</para>
     </sect2>
 
-    <sect2 id="atm">
+    <sect2 xml:id="atm">
       <title>ATM Interfaces</title>
 
       <para>[&arch.i386;, &arch.pc98;] Midway-based ATM interfaces
@@ -1039,7 +974,7 @@
 	(&man.patm.4; driver)</para>
     </sect2>
 
-    <sect2 id="wlan">
+    <sect2 xml:id="wlan">
       <title>Wireless Network Interfaces</title>
 
       <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Cisco/Aironet
@@ -1097,7 +1032,7 @@
       &hwlist.zyd;
     </sect2>
 
-    <sect2 id="misc-network">
+    <sect2 xml:id="misc-network">
       <title>Miscellaneous Networks</title>
 
       &hwlist.ce;
@@ -1111,7 +1046,7 @@
       &hwlist.cm;
     </sect2>
 
-    <sect2 id="serial">
+    <sect2 xml:id="serial">
       <title>Serial Interfaces</title>
 
       <para>[&arch.amd64;, &arch.i386;] <quote>PC standard</quote>
@@ -1370,7 +1305,7 @@
 
     </sect2>
 
-    <sect2 id="sound">
+    <sect2 xml:id="sound">
       <title>Sound Devices</title>
 
       &hwlist.snd.ad1816;
@@ -1464,7 +1399,7 @@
       </itemizedlist>
     </sect2>
 
-    <sect2 id="camera">
+    <sect2 xml:id="camera">
       <title>Camera and Video Capture Devices</title>
 
       &hwlist.bktr;
@@ -1472,7 +1407,7 @@
       <para>[&arch.i386;] Connectix QuickCam</para>
     </sect2>
 
-    <sect2 id="usb">
+    <sect2 xml:id="usb">
       <title>USB Devices</title>
 
       <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] A
@@ -1491,8 +1426,7 @@
 
       <note>
 	<para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
-	  USB Bluetooth adapters can be found in <link
-	    linkend="bluetooth">Bluetooth</link> section.</para>
+	  USB Bluetooth adapters can be found in <link linkend="bluetooth">Bluetooth</link> section.</para>
       </note>
 
       &hwlist.ohci;
@@ -1561,7 +1495,7 @@
       &hwlist.uvisor;
     </sect2>
 
-    <sect2 id="firewire">
+    <sect2 xml:id="firewire">
       <title>IEEE 1394 (Firewire) Devices</title>
 
       &hwlist.fwohci;
@@ -1570,7 +1504,7 @@
 	Protocol 2 (SBP-2) storage devices (&man.sbp.4; driver)</para>
     </sect2>
 
-    <sect2 id="bluetooth">
+    <sect2 xml:id="bluetooth">
       <title>Bluetooth Devices</title>
 
       &hwlist.ng.bt3c;
@@ -1578,7 +1512,7 @@
       &hwlist.ng.ubt;
     </sect2>
 
-    <sect2 id="crypto-accel">
+    <sect2 xml:id="crypto-accel">
       <title>Cryptographic Accelerators</title>
 
       &hwlist.hifn;
@@ -1588,7 +1522,7 @@
       &hwlist.ubsec;
     </sect2>
 
-    <sect2 id="misc">
+    <sect2 xml:id="misc">
       <title>Miscellaneous</title>
 
       <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
@@ -1614,7 +1548,7 @@
       <note>
 	<para>Information regarding specific video cards and
 	  compatibility with <application>Xorg</application> can be
-	  found at <ulink url="http://www.x.org/"></ulink>.</para>
+	  found at <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>
       </note>
 
       <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
@@ -1669,8 +1603,7 @@
       <note>
 	<para>&man.moused.8; has more information on using pointing
 	  devices with &os;.  Information on using pointing devices
-	  with <application>Xorg</application> can be found at <ulink
-	    url="http://www.x.org/"></ulink>.</para>
+	  with <application>Xorg</application> can be found at <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>
       </note>
 
       <para>[&arch.amd64;, &arch.i386;] <quote>PC standard</quote>
@@ -1703,8 +1636,7 @@
       </itemizedlist>
 
       <para>[&arch.i386;] Xilinx XC6200-based reconfigurable hardware
-	cards compatible with the HOT1 from <ulink
-	  url="http://www.vcc.com/">Virtual Computers</ulink> (xrpu
+	cards compatible with the HOT1 from <link xlink:href="http://www.vcc.com/">Virtual Computers</link> (xrpu
 	driver).</para>
 
       <para>[&arch.pc98;] Power Management Controller of NEC PC-98
diff --git a/release/doc/en_US.ISO8859-1/readme/article.xml b/release/doc/en_US.ISO8859-1/readme/article.xml
index 7467131c44f..73c6e46cf5d 100644
--- a/release/doc/en_US.ISO8859-1/readme/article.xml
+++ b/release/doc/en_US.ISO8859-1/readme/article.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
+<!-- 
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>&os; &release.current; README</title>
+    
 
-<article>
-  <articleinfo>
-    <title>&os; &release.current; README</title>
-
-    <corpauthor>The &os; Project</corpauthor>
+    <author><orgname>The &os; Project</orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -23,17 +30,21 @@
       <year>2006</year>
       <year>2007</year>
       <year>2008</year>
+      <year>2009</year>
+      <year>2010</year>
+      <year>2011</year>
+      <year>2012</year>
+      <year>2013</year>
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 
-    <legalnotice id="trademarks" role="trademarks">
+    <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.intel;
       &tm-attrib.opengroup;
       &tm-attrib.sparc;
       &tm-attrib.general;
     </legalnotice>
-  </articleinfo>
 
   <abstract>
     <para>This document gives a brief introduction to &os;
@@ -42,8 +53,9 @@
       Project, and pointers to some other sources of
       information.</para>
   </abstract>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>Introduction</title>
 
     <para>This distribution is a &release.type; of &os; &release.current;, the
@@ -133,7 +145,7 @@
     </sect2>
   </sect1>
 
-  <sect1 id="obtain">
+  <sect1 xml:id="obtain">
     <title>Obtaining &os;</title>
 
     <para>&os; may be obtained in a variety of ways.  This section
@@ -153,33 +165,29 @@
 	Collection, or other extra material.</para>
 
       <para>A list of the CDROM and DVD publishers known to the
-	project are listed in the <ulink
-	url="&url.books.handbook;/mirrors.html"><quote>Obtaining
-	&os;</quote></ulink> appendix to the Handbook.</para>
+	project are listed in the <link xlink:href="&url.books.handbook;/mirrors.html"><quote>Obtaining
+	&os;</quote></link> appendix to the Handbook.</para>
     </sect2>
 
     <sect2>
       <title>FTP</title>
 
       <para>You can use FTP to retrieve &os; and any or all of its
-	optional packages from <ulink
-	url="ftp://ftp.FreeBSD.org/"></ulink>, which is the official
+	optional packages from <uri xlink:href="ftp://ftp.FreeBSD.org/">ftp://ftp.FreeBSD.org/</uri>, which is the official
 	&os; release site, or any of its
 	<quote>mirrors</quote>.</para>
 
       <para>Lists of locations that mirror &os; can be found in the
-	<ulink
-	url="&url.books.handbook;/mirrors-ftp.html">FTP
-	Sites</ulink> section of the Handbook.
+	<link xlink:href="&url.books.handbook;/mirrors-ftp.html">FTP
+	Sites</link> section of the Handbook.
 	Finding a close (in networking terms) mirror from which to
 	download the distribution is highly recommended.</para>
 
       <para>Additional mirror sites are always welcome.  Contact
 	<email>freebsd-admin@FreeBSD.org</email> for more details on
 	becoming an official mirror site.  You can also find useful
-        information for mirror sites at the <ulink
-        url="&url.articles.hubs;/">Mirroring
-        &os;</ulink> article.</para>
+        information for mirror sites at the <link xlink:href="&url.articles.hubs;/">Mirroring
+        &os;</link> article.</para>
 
       <para>Mirrors generally contain the ISO images generally used to
 	create a CDROM of a &os; release.  They usually also contain
@@ -190,7 +198,7 @@
     </sect2>
   </sect1>
 
-  <sect1 id="contacting">
+  <sect1 xml:id="contacting">
     <title>Contacting the &os; Project</title>
 
     <sect2>
@@ -217,14 +225,13 @@
 	preferable to subscribe instead to the &a.announce;.</para>
 
       <para>All of the mailing lists can be freely joined by anyone
-	wishing to do so.  Visit the <ulink url="&url.base;/mailman/listinfo">
-	&os; Mailman Info Page</ulink>.  This will give you more
+	wishing to do so.  Visit the <link xlink:href="&url.base;/mailman/listinfo">
+	&os; Mailman Info Page</link>.  This will give you more
 	information on joining the various lists, accessing archives,
 	etc.  There are a number of mailing lists targeted at special
 	interest groups not mentioned here; more information can be
-	obtained either from the Mailman pages or the <ulink
-	url="&url.base;/support.html#mailing-list">mailing
-	lists section</ulink> of the &os; Web site.</para>
+	obtained either from the Mailman pages or the <link xlink:href="&url.base;/support.html#mailing-list">mailing
+	lists section</link> of the &os; Web site.</para>
 
       <important>
 	<para>Do <emphasis>not</emphasis> send email to the lists
@@ -247,9 +254,8 @@
 	<quote>Problem Reports</quote> (PRs) submitted in this way
 	will be filed and their progress tracked; the &os; developers
 	will do their best to respond to all reported bugs as soon as
-	possible.  <ulink
-	url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">A list
-	of all active PRs</ulink> is available on the &os; Web site;
+	possible.  <link xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">A list
+	of all active PRs</link> is available on the &os; Web site;
 	this list is useful to see what potential problems other users
 	have encountered.</para>
 
@@ -259,22 +265,21 @@
 	are unable to use &man.send-pr.1; to submit a bug report, you
 	can try to send it to the &a.bugs;.</para>
 
-      <para>For more information, <ulink
-	url="&url.articles.problem-reports;/"><quote>Writing
-	&os; Problem Reports</quote></ulink>, available on the &os; Web
+      <para>For more information, <link xlink:href="&url.articles.problem-reports;/"><quote>Writing
+	&os; Problem Reports</quote></link>, available on the &os; Web
 	site, has a number of helpful hints on writing and submitting
 	effective problem reports.</para>
     </sect2>
   </sect1>
 
-  <sect1 id="seealso">
+  <sect1 xml:id="seealso">
     <title>Further Reading</title>
 
     <para>There are many sources of information about &os;; some are
       included with this distribution, while others are available
       on-line or in print versions.</para>
 
-    <sect2 id="release-docs">
+    <sect2 xml:id="release-docs">
       <title>Release Documentation</title>
 
       <para>A number of other files provide more specific information
@@ -319,11 +324,11 @@
 	</itemizedlist>
       </para>
 
-      <para>On platforms that support &man.sysinstall.8; (currently
+      <para>On platforms that support &man.bsdinstall.8; (currently
 	&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;, and &arch.sparc64;), these documents are generally available via the
 	Documentation menu during installation.  Once the system is
 	installed, you can revisit this menu by re-running the
-	&man.sysinstall.8; utility.</para>
+	&man.bsdinstall.8; utility.</para>
 
       <note>
 	<para>It is extremely important to read the errata for any
@@ -334,7 +339,7 @@
 	  other copies are kept updated on the Internet and should be
 	  consulted as the <quote>current errata</quote> for this
 	  release.  These other copies of the errata are located at
-	  <ulink url="&url.base;/releases/"></ulink> (as
+	  <uri xlink:href="&url.base;/releases/">&url.base;/releases/</uri> (as
 	  well as any sites which keep up-to-date mirrors of this
 	  location).</para>
       </note>
@@ -345,9 +350,8 @@
 
       <para>As with almost all &unix; like operating systems, &os; comes
 	with a set of on-line manual pages, accessed through the
-	&man.man.1; command or through the <ulink
-	url="http://www.FreeBSD.org/cgi/man.cgi">hypertext manual
-	pages gateway</ulink> on the &os; Web site.  In general, the
+	&man.man.1; command or through the <link xlink:href="http://www.FreeBSD.org/cgi/man.cgi">hypertext manual
+	pages gateway</link> on the &os; Web site.  In general, the
 	manual pages provide information on the different commands and
 	APIs available to the &os; user.</para>
 
@@ -364,13 +368,10 @@
       <para>Two highly-useful collections of &os;-related information,
 	maintained by the &os; Project,
 	are the &os; Handbook and &os; FAQ (Frequently Asked
-	Questions document).  On-line versions of the <ulink
-	url="&url.books.handbook;/">Handbook</ulink>
-	and <ulink
-	url="&url.books.faq;/">FAQ</ulink>
-	are always available from the <ulink
-	url="&url.base;/docs.html">&os; Documentation
-	page</ulink> or its mirrors.  If you install the
+	Questions document).  On-line versions of the <link xlink:href="&url.books.handbook;/">Handbook</link>
+	and <link xlink:href="&url.books.faq;/">FAQ</link>
+	are always available from the <link xlink:href="&url.base;/docs.html">&os; Documentation
+	page</link> or its mirrors.  If you install the
 	<filename>doc</filename> distribution set, you can use a Web
 	browser to read the Handbook and FAQ locally.  In particular,
 	note that the Handbook contains a step-by-step guide to
@@ -386,8 +387,7 @@
         distribution set.</para>
 
       <para>A listing of other books and documents about &os; can be
-        found in the <ulink
-        url="&url.books.handbook;/bibliography.html">bibliography</ulink>
+        found in the <link xlink:href="&url.books.handbook;/bibliography.html">bibliography</link>
         of the &os; Handbook.  Because of &os;'s strong &unix; heritage,
         many other articles and books written for &unix; systems are
         applicable as well, some of which are also listed in the
@@ -395,16 +395,15 @@
     </sect2>
   </sect1>
 
-  <sect1 id="acknowledgements">
+  <sect1 xml:id="acknowledgements">
     <title>Acknowledgments</title>
 
     <para>&os; represents the cumulative work of many hundreds, if not
       thousands, of individuals from around the world who have worked
       countless hours to bring about this &release.type;.  For a
       complete list of &os; developers and contributors, please see
-      <ulink
-      url="&url.articles.contributors;/"><quote>Contributors
-      to &os;</quote></ulink> on the &os; Web site or any of its
+      <link xlink:href="&url.articles.contributors;/"><quote>Contributors
+      to &os;</quote></link> on the &os; Web site or any of its
       mirrors.</para>
 
     <para>Special thanks also go to the many thousands of &os; users
@@ -412,12 +411,3 @@
       simply would not have been possible.</para>
   </sect1>
 </article>
-
-<!-- 
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.xml b/release/doc/en_US.ISO8859-1/relnotes/article.xml
index 3b2dc0ebb09..4440bdd5a74 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.xml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<info><title>&os; &release.current; Release Notes</title>
+  
 
-<article>
-<articleinfo>
-  <title>&os; &release.current; Release Notes</title>
-
-  <corpauthor>The &os; Project</corpauthor>
+  <author><orgname>The &os; Project</orgname></author>
 
   <pubdate>$FreeBSD$</pubdate>
 
@@ -31,7 +30,7 @@
     <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
 
-  <legalnotice id="trademarks" role="trademarks">
+  <legalnotice xml:id="trademarks" role="trademarks">
     &tm-attrib.freebsd;
     &tm-attrib.ibm;
     &tm-attrib.ieee;
@@ -49,9 +48,9 @@
       kernel and userland.
       Some brief remarks on upgrading are also presented.</para>
   </abstract>
-</articleinfo>
+</info>
 
-<sect1 id="intro">
+<sect1 xml:id="intro">
   <title>Introduction</title>
 
   <para>This document contains the release notes for &os;
@@ -64,24 +63,21 @@
     apply represents the latest point along the &release.branch; development
     branch since &release.branch; was created.  Information regarding pre-built, binary
     &release.type; distributions along this branch
-    can be found at <ulink url="&release.url;"></ulink>.</para>
+    can be found at <uri xlink:href="&release.url;">&release.url;</uri>.</para>
 
   <para releasetype="snapshot">The &release.type; distribution to which these release notes
     apply represents a point along the &release.branch; development
     branch between &release.prev; and the future &release.next;.
     Information regarding
     pre-built, binary &release.type; distributions along this branch
-    can be found at <ulink url="&release.url;"></ulink>.</para>
+    can be found at <uri xlink:href="&release.url;">&release.url;</uri>.</para>
 
   <para releasetype="release">This distribution of &os; &release.current; is a
-    &release.type; distribution.  It can be found at <ulink
-    url="&release.url;"></ulink> or any of its mirrors.  More
+    &release.type; distribution.  It can be found at <uri xlink:href="&release.url;">&release.url;</uri> or any of its mirrors.  More
     information on obtaining this (or other) &release.type;
-    distributions of &os; can be found in the <ulink
-    url="&url.books.handbook;/mirrors.html"><quote>Obtaining
-    &os;</quote> appendix</ulink> to the <ulink
-    url="&url.books.handbook;/">&os;
-    Handbook</ulink>.</para>
+    distributions of &os; can be found in the <link xlink:href="&url.books.handbook;/mirrors.html"><quote>Obtaining
+    &os;</quote> appendix</link> to the <link xlink:href="&url.books.handbook;/">&os;
+    Handbook</link>.</para>
 
   <para>All users are encouraged to consult the release errata before
     installing &os;.  The errata document is updated with
@@ -93,7 +89,7 @@
 
 </sect1>
 
-<sect1 id="new">
+<sect1 xml:id="new">
   <title>What's New</title>
 
   <para>This section describes
@@ -114,16 +110,19 @@
     primarily on security advisories, user-visible changes, and major
     architectural improvements.</para>
 
-  <sect2 id="security">
+  <sect2 xml:id="security">
     <title>Security Advisories</title>
 
-    <para></para>
+    <para/>
 
   </sect2>
 
-  <sect2 id="kernel">
+  <sect2 xml:id="kernel">
     <title>Kernel Changes</title>
 
+    <para arch="amd64">The maximum amount of memory the &os; kernel
+      can address has been increased from 1TB to 4TB.</para>
+
     <para>A new &man.cpuset.2; API has been added
       for thread to CPU binding and CPU resource grouping and
       assignment.  The &man.cpuset.1; userland utility has been added
@@ -173,7 +172,7 @@
       scheduler is now the default process scheduler
       in <filename>GENERIC</filename> kernels.</para>
 
-    <sect3 id="boot">
+    <sect3 xml:id="boot">
       <title>Boot Loader Changes</title>
 
       <para arch="amd64,i386" role="merged">The BTX kernel used by the boot
@@ -190,7 +189,7 @@
 
     </sect3>
 
-    <sect3 id="proc">
+    <sect3 xml:id="proc">
       <title>Hardware Support</title>
 
       <para role="merged">The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
@@ -202,14 +201,16 @@
         Laboratories CP2101/CP2102-based USB serial adapters, has been
         imported from OpenBSD.</para>
 
-      <sect4 id="mm">
+      <sect4 xml:id="mm">
 	<title>Multimedia Support</title>
 
-	<para></para>
+        <para>Support for version 2.0 of the USB Audio reference design
+          has been added. New devices should support higher bandwidth,
+          increased sampling frequency and wider dynamic range.</para>
 
       </sect4>
 
-      <sect4 id="net-if">
+      <sect4 xml:id="net-if">
 	<title>Network Interface Support</title>
 
 	<para>The &man.ale.4; driver has been added to provide support
@@ -250,33 +251,30 @@
       </sect4>
     </sect3>
 
-    <sect3 id="net-proto">
+    <sect3 xml:id="net-proto">
       <title>Network Protocols</title>
 
-      <para>The &man.bpf.4; packet filter and capture facility now
-        supports a zero-copy mode of operation, in which buffers are
-        loaned from a user process to the kernel.  This feature can
-        be enabled by setting
-        the <varname>net.bpf.zerocopy_enable</varname> sysctl
-        variable to <literal>1</literal>.</para>
+      <para>&man.carp.4; has been rewritten to make addresses
+        more sane from the viewpoint of routing daemons such as
+        quagga/zebra. It also brings support for a single redundant
+        address on the subnet (carpdev), switching state with
+        ifconfig, better locking and using modern kernel
+        interfaces to allocate multicast memberships.</para>
 
-      <para>ISDN4BSD(I4B), <filename>netatm</filename>, and all
-        related subsystems have been removed due to lack of
-        multi-processor support.</para>
+      <para>The &man.pf.4; firewall now supports fine-grain locking
+        and better utilization on multi-cpu machines resulting in
+        significant improvements in performance.</para>
 
-      <para role="merged">A bug in TCP options padding, where the wrong padding
-        bytes were used, has been fixed.</para>
+      <para>Support for up to 65536 routing tables has been
+        introduced.</para>
 
-      <para role="merged">The IEEE 802.11s element identifiers have
-        been updated to reflect the final version of the amendment.  This
-        update breaks compatibility with older mesh setups but is necessary
-        as the previous IDs are used by another amendment leading to
-        unexpected results when trying to associate with an accesspoint
-        using the affected IDs.</para>
+      <para>Support for setting/matching differentiated services
+        codepoints (DSCP) in IP header has been added to
+        &man.ipfw.8;.</para>
 
     </sect3>
 
-    <sect3 id="disks">
+    <sect3 xml:id="disks">
       <title>Disks and Storage</title>
 
       <para role="merged">The &man.aac.4; driver now supports volumes larger than
@@ -294,25 +292,40 @@
 
     </sect3>
 
-    <sect3 id="fs">
+    <sect3 xml:id="fs">
       <title>File Systems</title>
 
-      <para>A problem with using &man.mmap.2; on ZFS filesystems has
-        been fixed.</para>
+      <para>A new kernel-based iSCSI target and initiator has been
+        added</para>
 
-      <para>A new kernel-mode NFS lock manager has been added,
-        improving performance and behavior of NFS locking.  A new
-        &man.clear.locks.8; command has been added to clear locks held
-        on behalf of an NFS client.</para>
+      <para>UFS filesystems can now be enlarged with &man.growfs.8; while
+        mounted read-write. This is especially useful for virtual
+        machines, allowing the addition of more harddrive space without
+        interruption of service.</para>
 
-      <para role="merged">The <application>ZFS</application> file system
-        has been upgraded to version 28.  Changes include Data
-        Deduplication, Triple parity RAIDZ, and zfs diff.</para>
+      <para>A state of the art FUSE implementation is now part of the
+        base system. It allows the use of nearly all fusefs file
+        systems</para>
+
+      <para>Support for the high performance LZ4 compression algorithm
+        has been added to ZFS. LZ4 is usually faster and can achieve a
+        higher compression ratio than LZJB, the default compression
+        algorithm</para>
+
+      <para>Support for L2ARC compression has been added to ZFS.</para>
+
+      <para>ZFS will now compare the checksums of incoming writes to
+        the checksum of the existing on-disk data and avoid issuing any
+        write I/O for data that has not changed. This will reduce I/O
+        as well as space usage because if the old block is referenced
+        by a snapshot, both copies of the block are kept even though
+        both contain the same data.</para>
 
     </sect3>
+
   </sect2>
 
-  <sect2 id="userland">
+  <sect2 xml:id="userland">
     <title>Userland Changes</title>
 
     <para role="merged">The &man.adduser.8; utility now supports
@@ -427,15 +440,15 @@
       to send probe packets with no upper-layer protocol, rather than
       the usual UDP probe packets.</para>
 
-    <sect3 id="rc-scripts">
+    <sect3 xml:id="rc-scripts">
       <title><filename>/etc/rc.d</filename> Scripts</title>
 
-      <para></para>
+      <para/>
 
     </sect3>
   </sect2>
 
-  <sect2 id="contrib">
+  <sect2 xml:id="contrib">
     <title>Contributed Software</title>
 
     <para role="merged"><application>AMD</application> has been updated from 6.0.10
@@ -447,8 +460,8 @@
     <para role="merged"><application>bzip2</application> has been updated from 1.0.4
       to 1.0.5.</para>
 
-    <para><application>CVS</application> has been updated from 1.11.17
-      to a post-1.11.22 snapshot from 10 March 2008.</para>
+    <para><application>CVS</application> has been removed from the
+    base system, but is still available from ports</para>
 
     <para><application>FILE</application> has been updated from 4.23
       to 5.03.</para>
@@ -493,7 +506,7 @@
 
   </sect2>
 
-  <sect2 id="ports">
+  <sect2 xml:id="ports">
     <title>Ports/Packages Collection Infrastructure</title>
 
     <para>The &man.pkg.create.1; utility now supports
@@ -511,25 +524,25 @@
 
   </sect2>
 
-  <sect2 id="releng">
+  <sect2 xml:id="releng">
     <title>Release Engineering and Integration</title>
 
     <para role="merged">The supported version of
       the <application>GNOME</application> desktop environment
-      (<filename role="package">x11/gnome2</filename>) has been
+      (<package>x11/gnome2</package>) has been
       updated from 2.20.1 to 2.22.</para>
 
   </sect2>
 
-  <sect2 id="doc">
+  <sect2 xml:id="doc">
     <title>Documentation</title>
 
-    <para></para>
+    <para/>
 
   </sect2>
 </sect1>
 
-<sect1 id="upgrade">
+<sect1 xml:id="upgrade">
   <title>Upgrading from previous releases of &os;</title>
 
   <para arch="amd64,i386">Beginning with &os; 6.2-RELEASE,
diff --git a/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml b/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
index 68af541a4ba..773abc18a39 100644
--- a/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/early-adopter/article.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 
-<!ENTITY release.4x "4.<replaceable>X</replaceable>">
-<!ENTITY release.5x "5.<replaceable>X</replaceable>">
+<!ENTITY release.4x "4.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
+<!ENTITY release.5x "5.<replaceable xmlns='http://docbook.org/ns/docbook'>X</replaceable>">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -16,13 +15,12 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-
-<article>
-  <articleinfo>
-    <title>Guide pour les testeurs des nouvelles fonctions &agrave; &release.current;</title>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>Guide pour les testeurs des nouvelles fonctions &agrave; &release.current;</title>
+    
 
     <authorgroup>
-      <corpauthor>L'&eacute;quipe de confection des versions de &os;</corpauthor>
+      <author><orgname>L'&eacute;quipe de confection des versions de &os;</orgname></author>
     </authorgroup>
 
     <pubdate>$FreeBSD$</pubdate>
@@ -33,9 +31,9 @@
       <holder role="mailto:re@FreeBSD.org">L'&eacute;quipe de confection des
       versions de &os;</holder>
     </copyright>
-  </articleinfo>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>Introduction</title>
 
     <para>&os; &release.5x; annonce une nouvelle version majeur de &os; depuis
@@ -128,10 +126,8 @@
     version 5.1-RELEASE ou 5.2-RELEASE.</para>
 
     <para>Plus d'informations sur le procesuss de version de &os; se
-    trouve &agrave; <ulink
-      url="http://www.FreeBSD.org/releng/index.html">la page Web de
-      confection des versions</ulink> et dans l'article sur <ulink
-      url="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/index.html">le m&eacute;canisme de versions </ulink>.</para>
+    trouve &agrave; <link xlink:href="http://www.FreeBSD.org/releng/index.html">la page Web de
+      confection des versions</link> et dans l'article sur <link xlink:href="http://www.freebsd.org/doc/en_US.ISO8859-1/articles/releng/index.html">le m&eacute;canisme de versions </link>.</para>
 
   </sect1>
 
@@ -306,9 +302,8 @@
 
     <para>&a.security-officer; continuera &agrave; supporter les futures
     version de la branche 4-STABLE en fonction de sa politique, qui
-    peut &ecirc;tre trouv&eacute;e &agrave;  <ulink
-      url="http://www.FreeBSD.org/security/index.html">la page sur la
-      s&eacute;curit&eacute;</ulink> sur le site web de  &os;. G&eacute;n&eacute;rallement les
+    peut &ecirc;tre trouv&eacute;e &agrave;  <link xlink:href="http://www.FreeBSD.org/security/index.html">la page sur la
+      s&eacute;curit&eacute;</link> sur le site web de  &os;. G&eacute;n&eacute;rallement les
       deux derni&egrave;res plus r&eacute;centes versions de toutes les branches
       sont support&eacute;es en respectant les avis de s&eacute;curit&eacute; et leur
       correctifs. L'&eacute;quipe peut aussi supporter d'autres versions &agrave; sa
diff --git a/release/doc/fr_FR.ISO8859-1/errata/article.xml b/release/doc/fr_FR.ISO8859-1/errata/article.xml
index 05ce10d5485..e6ee54e75ac 100644
--- a/release/doc/fr_FR.ISO8859-1/errata/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/errata/article.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -23,18 +22,17 @@
 	not be the one that received the last change in the document.)
 
 -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>&os; &release.current; Errata</title>
 
-<article>
-  <articleinfo>
 
-<!-- XXX Change release.current to release.prev when there's -->
-<!-- XXX a release on this branch. -->
 
-    <title>&os; &release.current; Errata</title>
 
-    <corpauthor>
+    
+
+    <author><orgname>
     Le projet &os;
-    </corpauthor>
+    </orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -45,7 +43,6 @@
       <year>2003</year>
       <holder role="mailto:doc@FreeBSD.org">Projet de Documentation &os;</holder>
     </copyright>
-  </articleinfo>
 
   <abstract>
 
@@ -80,6 +77,7 @@ propre pour les nouvelles branches cr&eacute;es. (Normalement cette
 note ne devrait apparaitre sur aucune version de branches)
 </para>
   </abstract>
+  </info>
 
   <sect1>
     <title>Introduction</title>
@@ -97,8 +95,7 @@ note ne devrait apparaitre sur aucune version de branches)
     obsol&egrave;te par d&eacute;finition, mais les autres copies sont
     gard&eacute;es et mises a jour sur Internet et peuvent etre
     consult&eacute;es comment <quote>errata</quote> pour cette version
-    finale. Les autres copies de cet errata se trouvent <ulink
-    url="http://www.FreeBSD.org/releases/">ici</ulink> et sur les
+    finale. Les autres copies de cet errata se trouvent <link xlink:href="http://www.FreeBSD.org/releases/">ici</link> et sur les
     autres sites mirroirs de ce site</para>
 
 
@@ -107,18 +104,16 @@ note ne devrait apparaitre sur aucune version de branches)
     de ce document (au moment de la creation du snapshot).</para>
 
     <para>Pour une liste de tous les avis de securit&eacute; du CERT 
-    sur &os;, voyez <ulink
-    url="http://www.FreeBSD.org/security/"></ulink> ou <ulink
-    url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink>.</para>
+    sur &os;, voyez <uri xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri> ou <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</uri>.</para>
   </sect1>
 
   <sect1>
     <title>Avis de securit&eacute;</title>
-    <para></para>
+    <para/>
   </sect1>
 
   <sect1>
     <title>Information de mise a jour du syst&egrave;me</title>
-    <para></para>
+    <para/>
   </sect1>
 </article>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
index 46ad91a2764..22725decc79 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -10,7 +10,6 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -19,8 +18,7 @@
      $FreeBSD$
      Original revision: 1.4
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   &sect.intro;
   &sect.proc.alpha;
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
index 7d96fc4c99c..d6c18fad33c 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/alpha/proc-alpha.xml
@@ -7,19 +7,14 @@
      $FreeBSD$
      Original revision: 1.43
 -->
-
-<sect1>
-  <sect1info>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>Processeurs et cartes m&egrave;res support&eacute;es</title>
     <authorgroup>
-      <author>
-	<firstname>Wilko</firstname>
-	<surname>Bulte</surname>
-	<contrib>Maintenu par </contrib>
-      </author>
+      <author><personname><firstname>Wilko</firstname><surname>Bulte</surname></personname><contrib>Maintenu par </contrib></author>
     </authorgroup>
-  </sect1info>
+  </info>
 
-  <title>Processeurs et cartes m&egrave;res support&eacute;es</title>
+  
 
   <para>Des retours, mises &agrave; jour et corrections a
   cette liste sont encourag&eacute;s.</para>
@@ -71,9 +66,8 @@
     <note>
       <para>Compaq a mis en ligne des informations pour les
       d&eacute;veloppeurs Linux, qui sont tr&egrave;s utiles aussi pour les
-      utilisateurs de &os;. Voyez la page des <ulink
-      url="http://www.support.compaq.com/alpha-tools/">Utilitaires
-      Linux pour Alpha</ulink>.</para>
+      utilisateurs de &os;. Voyez la page des <link xlink:href="http://www.support.compaq.com/alpha-tools/">Utilitaires
+      Linux pour Alpha</link>.</para>
 
     </note>
      
@@ -108,8 +102,8 @@
     la ROM syst&egrave;me, il suffit de le selectionner (via le menu ARC
     ou AlphaBIOS correspondant). Dans tous les autres cas vous devrez
     r&eacute;-inscrire le code SRM dans les ROMs. V&eacute;rifiez sur 
-    <ulink url="http://ftp.digital.com/pub/DEC/Alpha/firmware"> le site des
-    microcode Alpha</ulink> pour v&eacute;rifier si il est disponible pour
+    <link xlink:href="http://ftp.digital.com/pub/DEC/Alpha/firmware"> le site des
+    microcode Alpha</link> pour v&eacute;rifier si il est disponible pour
     votre syst&egrave;me. Dans tous les cas: <quote>no SRM</quote> veut
     dir qu'il n'existe pas pour &os; (ou NetBSD, OpenBSD, Tru64 Unix
     ou OpenVMS). Avec la d&eacute;convenue de WindowNT/alpha, un grand
@@ -504,9 +498,8 @@
       variante avec un connecteur <quote>DIN</quote> doit fonctionner
       correctement avec &os;.</para>
 
-      <para>La lecture du <ulink
-      url="ftp://ftp.digital.com/pub/DEC/axppci/design_guide.ps">
-      manuel OEM</ulink> est recommand&eacute;.</para>
+      <para>La lecture du <link xlink:href="ftp://ftp.digital.com/pub/DEC/axppci/design_guide.ps">
+      manuel OEM</link> est recommand&eacute;.</para>
 
       <para>Le fichier de configuration du noyau pour un noyau NoName
       doit contenir la ligne:</para>
@@ -683,7 +676,7 @@
       attention aux cartes PCI avec une forte consommation
       d'&eacute;nergie. Si votre syst&egrave;me Multia cesse de fonctionner
       suite &agrave; un probl&egrave;me de chaleur, consultez les pages du
-      <ulink url="http://www.netbsd.org/">site web de NetBSD</ulink>
+      <link xlink:href="http://www.netbsd.org/">site web de NetBSD</link>
       pour de l'aide sur la fa&ccedil;on de le remettre en marche.</para>
 
       <para>Le pont Intel 82378ZB PCI vers ISA permet d'utiliser un
@@ -723,12 +716,10 @@
 
       <programlisting>options DEC_AXPPCI_33 cpu EV4</programlisting>
 
-      <para>La lecture du document <ulink
-      url="http://www.netbsd.org/Ports/alpha/multiafaq.html">
-      http://www.netbsd.org/Ports/alpha/multiafaq.html</ulink> ou
-      <ulink
-      url="http://www.brouhaha.com/~eric/computers/udb.html">
-      http://www.brouhaha.com/~eric/computers/udb.html</ulink> est
+      <para>La lecture du document <link xlink:href="http://www.netbsd.org/Ports/alpha/multiafaq.html">
+      http://www.netbsd.org/Ports/alpha/multiafaq.html</link> ou
+      <link xlink:href="http://www.brouhaha.com/~eric/computers/udb.html">
+      http://www.brouhaha.com/~eric/computers/udb.html</link> est
       recommand&eacute;.</para>
 
     </sect3>
@@ -880,7 +871,7 @@
 
       <para>La commande exacte est:</para>
 
-      <screen><prompt>&gt;&gt;&gt;</prompt> <userinput>SET PCI_DEVICE_OVERRIDE <replaceable>&lt;vendor_id&gt;</replaceable><replaceable>&lt;device_id&gt;</replaceable></userinput></screen>
+      <screen><prompt>&gt;&gt;&gt;</prompt> <userinput>SET PCI_DEVICE_OVERRIDE &lt;vendor_id&gt;&lt;device_id&gt;</userinput></screen>
 
       <para>Par exemple:</para>
 
@@ -980,8 +971,7 @@ Jan  3 12:22:32 miata /kernel: pcib0: &lt;2117x PCI host bus adapter&gt; on cia0
       <para>apr&egrave;s avoir arr&eacute;ter &os;, vous devez mettre &agrave;
       jour votre micro-code SRM en version V7.2-1 ou sup&eacute;rieure. La
       premi&egrave;re version SRM disponible peut se trouver sur le CD de
-      mise &agrave; jour du micro-code V5.7, ou sur le site <ulink
-      url="http://www.compaq.com/">http://www.compaq.com/</ulink>. Ce
+      mise &agrave; jour du micro-code V5.7, ou sur le site <link xlink:href="http://www.compaq.com/">http://www.compaq.com/</link>. Ce
       probl&egrave;me SRM a &eacute;t&eacute; corrig&eacute; sur les
       mod&egrave;les Miata MX5 et Miata GL.</para>
 
@@ -2930,8 +2920,8 @@ cpu	EV5</programlisting>
     <title>Acknowledgments</title>
 
     <para>In compiling this file I used multiple information sources,
-    but <ulink url="http://www.netbsd.org/">the NetBSD Web
-    site</ulink> proved to be an invaluable source of information.  If
+    but <link xlink:href="http://www.netbsd.org/">the NetBSD Web
+    site</link> proved to be an invaluable source of information.  If
     it wasn't for NetBSD/alpha there probably would not be a
     &os;/alpha in the first place.</para>
 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml
index 35883b1d002..1caca956781 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/artheader.xml
@@ -6,13 +6,11 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-
-
-<articleinfo>
-  <title>&os;/&arch; &release.current; compatibilit&eacute; 
+<info xmlns="http://docbook.org/ns/docbook"><title>&os;/&arch; &release.current; compatibilit&eacute; 
   mat&eacute;rielle</title>
+  
 
-  <corpauthor>Le projet de documentation FreeBSD</corpauthor>
+  <author><orgname>Le projet de documentation FreeBSD</orgname></author>
 
   <copyright>
     <year>2000</year>
@@ -21,4 +19,4 @@
     <year>2003</year>
     <holder role="mailto:doc@FreeBSD.org">Le projet de documentation FreeBSD</holder>
   </copyright>
-</articleinfo>
+</info>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
index da960c95333..c51f8447d7d 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/dev.xml
@@ -37,13 +37,12 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 -->
-
-<sect1>
-  <sect1info>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>P&eacute;riph&eacute;riques support&eacute;s</title>
     <pubdate>$FreeBSD$</pubdate>
-  </sect1info>
+  </info>
 
-  <title>P&eacute;riph&eacute;riques support&eacute;s</title>
+  
 
   <para>Cette section d&eacute;crit les p&eacute;riph&eacute;riques
   actuellement connus pour fonctionner avec &os; sur la
@@ -162,7 +161,7 @@
           &man.ahb.4;)</para>
 	</listitem>
 	<listitem arch="i386">
-	  <para>>Contr&ocirc;leurs SCSI EISA Adaptec mod&egrave;le 274x,
+	  <para>&gt;Contr&ocirc;leurs SCSI EISA Adaptec mod&egrave;le 274x,
           incluant les variantes narrow et wide (gestionnaire
           &man.ahc.4;)</para>
 	</listitem>
@@ -870,7 +869,7 @@
     commandes des CD-ROM sont vu comme des lecteurs de CD-ROM en
     lecture seule (comme &man.cd.4;). Le support d'&eacute;criture des
     CD-R/CD-RW/WORM est founri par &man.cdrecord.1;, qui est un module
-    du port  <filename role="package">sysutils/cdrtools</filename>.</para>
+    du port  <package>sysutils/cdrtools</package>.</para>
 
     <para>Les type de CD-ROM suivant sont actuellement support&eacute;s:
       <itemizedlist>
@@ -928,7 +927,7 @@
     </para>
 
   </sect2>
-  <sect2 id="ethernet">
+  <sect2 xml:id="ethernet">
     <title>Cartes Ethernet</title>
 
     <para arch="i386,pc98,alpha">Cartes Adaptec Duralink PCI Fast
@@ -2928,7 +2927,7 @@
     &man.meteor.4;)</para>
   </sect2>
 
-  <sect2 id="usb">
+  <sect2 xml:id="usb">
     <title>P&eacute;riph&eacute;riques USB</title>
 
     <para>Certains p&eacute;riph&eacute;riques USB sont support&eacute;s; les
@@ -2941,8 +2940,7 @@
 
     <note>
       <para>Les cartes USB Ethernet peuvent &ecirc;tre trouv&eacute;s dans la
-      section<link
-      linkend="ethernet">Cartes Ethernet</link>.</para>
+      section<link linkend="ethernet">Cartes Ethernet</link>.</para>
     </note>
 
     <para arch="i386,pc98,alpha">Contr&ocirc;leurs machine (gestionnaires
@@ -3201,7 +3199,7 @@
  </sect2>
 
 
-  <sect2 id="firewire">
+  <sect2 xml:id="firewire">
     <title>P&eacute;riph&eacute;riques IEEE 1394 (Firewire)</title>
 
     <para arch="i386,pc98,powerpc">Controleurs hotes (gestionnaire
@@ -3303,8 +3301,7 @@
 	</listitem>
         <listitem arch="i386,pc98,alpha">
 	  <para>Claviers USB (les mat&eacute;riels sp&eacute;cifiques sont
-          list&eacute;s dans la section d&eacute;crivant les <link
-          linkend="usb">p&eacute;riph&eacute;riques USB</link>)</para>
+          list&eacute;s dans la section d&eacute;crivant les <link linkend="usb">p&eacute;riph&eacute;riques USB</link>)</para>
 	</listitem>
       </itemizedlist>
     </para>
@@ -3323,8 +3320,7 @@
 	</listitem>
         <listitem arch="i386,pc98,alpha">
 	  <para>Souris USB (les mat&eacute;riels sp&eacute;cifiques sont
-          list&eacute;s dans la section d&eacute;crivant les <link
-          linkend="usb">p&eacute;riph&eacute;riques USB</link>)</para>
+          list&eacute;s dans la section d&eacute;crivant les <link linkend="usb">p&eacute;riph&eacute;riques USB</link>)</para>
 	</listitem>
       </itemizedlist>
     </para>
@@ -3355,8 +3351,7 @@
     &man.tw.4;)</para>
 
     <para arch="i386">Mat&eacute;riel reconfigurable bas&eacute; sur les
-    cartes Xilinx XC6200 compatible avec HOT1 de <ulink
-    url="http://www.vcc.com/">Virtual Computers</ulink> (gestionnaire
+    cartes Xilinx XC6200 compatible avec HOT1 de <link xlink:href="http://www.vcc.com/">Virtual Computers</link> (gestionnaire
     xrpu).</para>
 
     <para arch="pc98">Contr&ocirc;leur de gestion d'&eacute;nergie des NEC PC-98
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml
index 0503345828d..e4b142c8523 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/common/intro.xml
@@ -6,8 +6,7 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-
-<sect1>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <title>Introduction</title>
 
   <para>Ce document contient la liste de mat&eacute;riel compatible avec 
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
index 72e5ab35206..3632f821eda 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -10,7 +10,6 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "IA-32">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -19,8 +18,7 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   &sect.intro;
   &sect.proc.i386;
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
index caf0006081a..960ce9e74c9 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/i386/proc-i386.xml
@@ -6,7 +6,7 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-<sect1>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <title>Processeurs et carte m&egrave;res support&eacute;es</title>
 
   <para>&os;/i386 fonctionne sur une large vari&eacute;t&eacute; de machines
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
index 8883182dd92..5da931645e6 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -10,7 +10,6 @@
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -19,8 +18,7 @@
      $FreeBSD$
      Original revision: 1.2
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   
   <abstract>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml
index 8319c1be9fd..9da24889405 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/ia64/proc-ia64.xml
@@ -6,7 +6,7 @@
      $FreeBSD$
      Original revision: 1.1
 -->
-<sect1>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <title>Processeurs et cartes m&egrave;res support&eacute;es</title>
 
   <para>Section a &eacute;crire.</para>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
index 620d4df27b7..9b6d6a667f2 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -10,7 +10,6 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -19,8 +18,7 @@
      $FreeBSD$
      Original revision: 1.1
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   &sect.intro;
   &sect.proc.pc98;
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
index 5f2686d1533..aee70c7f106 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/pc98/proc-pc98.xml
@@ -7,7 +7,7 @@
      $FreeBSD$
      Original revision: 1.1
 -->
-<sect1>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <title>Systèmes support&eacute;s</title>
 
   <para>Les machines NEC PC-98x1</para>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
index 6d0c34102b8..80595f1c5dd 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/hw.ent"> %sections;
@@ -9,11 +9,10 @@
 
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
-<!ENTITY unsupported "<emphasis>(non support&eacute;)</emphasis>">
-<!ENTITY perforce "<emphasis>(non encore commiter - dans l'arbre Perforce)</emphasis>">
+<!ENTITY unsupported "<emphasis xmlns='http://docbook.org/ns/docbook'>(non support{{{eacute}}})</emphasis>">
+<!ENTITY perforce "<emphasis xmlns='http://docbook.org/ns/docbook'>(non encore commiter - dans l'arbre Perforce)</emphasis>">
 <!ENTITY sect.dev.sparc64 SYSTEM "./dev-sparc64.xml">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -22,8 +21,7 @@
      $FreeBSD$
      Original revision: 1.2
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   &sect.intro;
   &sect.proc.sparc64;
@@ -34,6 +32,6 @@
     <para>Ce document est bas&eacute; en partie sur la documentation de 
     &os;/Alpha et NetBSD/sparc64. Les informations sur des mod&egrave;les 
     sp&eacute;cifiques ont &eacute;t&eacute; obtenues de 
-    <ulink url="http://www.sun.com">Sun</ulink>.</para>
+    <link xlink:href="http://www.sun.com">Sun</link>.</para>
   </sect1>
 </article>
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml
index b97cbf8a5a4..9686c4456d9 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/dev-sparc64.xml
@@ -6,12 +6,12 @@
      $FreeBSD$
      Original revision: 1.1
 -->
-<sect1>
-  <sect1info>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>P&eacute;riph&eacute;riques support&eacute;s</title>
     <pubdate>$FreeBSD$</pubdate>
-  </sect1info>
+  </info>
 
-  <title>P&eacute;riph&eacute;riques support&eacute;s</title>
+  
 
   <para>Cette section d&eacute;crit les p&eacute;riph&eacute;riques
   actuellement connus pour &ecirc;tre support&eacute;s avec &os; la
@@ -47,10 +47,10 @@
       <listitem><para>Les ponts g&eacute;n&eacute;riques
       PCI-PCI</para></listitem>
       <listitem><para>&man.ahc.4; (tr&egrave;s rapidement).</para></listitem>
-      <listitem><para>&man.ata.4;, <devicename>atadisk</devicename>,
-        <devicename>atapicd</devicename> (mais pas atapifd,
+      <listitem><para>&man.ata.4;, <filename>atadisk</filename>,
+        <filename>atapicd</filename> (mais pas atapifd,
         atapist)</para></listitem>
-      <listitem><para><devicename>gem</devicename> (Les cartes
+      <listitem><para><filename>gem</filename> (Les cartes
       ethernet des cartes m&egrave;res Blade 100, Sun
       GEM/ERI)</para></listitem>
       <listitem><para><literal>hme</literal> (Les cartes ethernet des
@@ -123,7 +123,7 @@
       <listitem><para>les p&eacute;riph&eacute;riques graphiques, claviers
       (except&eacute;s indirectement en mode texte via l'utilisation du
       p&eacute;riph&eacute;rique
-      <devicename>ofw_console</devicename>)</para></listitem>
+      <filename>ofw_console</filename>)</para></listitem>
 
       <listitem><para>Les ports s&eacute;ries Siemens sab82532 (Ultra
       5/10; les ports du clavier et de la souris sont
@@ -131,7 +131,7 @@
       est en cours de finalisation).</para></listitem>
 
       <listitem><para>les claviers s&eacute;ries(except&eacute;s indirectement
-      via le p&eacute;riph&eacute;rique <devicename>ofw_console</devicename>
+      via le p&eacute;riph&eacute;rique <filename>ofw_console</filename>
       device)</para></listitem>
 
       <listitem><para>Les ports s&eacute;ries Zilog z8530 (clavier et
diff --git a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
index 0435ae84234..f2c212cf81b 100644
--- a/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/fr_FR.ISO8859-1/hardware/sparc64/proc-sparc64.xml
@@ -7,7 +7,7 @@
      $FreeBSD$
      Original revision: 1.4
 -->
-<sect1>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <title>Syst&egrave;mes support&eacute;s</title>
 
   <para>Des ajouts, retours, mises &agrave; jour et corrections a
@@ -111,7 +111,7 @@
       pas &eacute;t&eacute; tr&egrave;s test&eacute;es avec &os;. Ces
       syst&egrave;mes ne sont pas tr&egrave;s bien support&eacute;s,
       mais il est possible d'installer &os; sur une Ultra-1e disposant
-      d'une interface Ethernet <devicename>hme</devicename>.</para>
+      d'une interface Ethernet <filename>hme</filename>.</para>
     </sect3>
 
     <sect3>
@@ -123,7 +123,7 @@
       <itemizedlist>
         <listitem><para>1 ou 2 processeurs UltraSPARC II</para></listitem>
         <listitem><para>Carte Ethernet int&eacute;gr&eacute;e
-          (compatible <devicename>hme</devicename>)</para></listitem>
+          (compatible <filename>hme</filename>)</para></listitem>
         <listitem><para>4 emplacements SBus</para></listitem>
         <listitem><para>1 emplacement UPA</para></listitem>
         <listitem><para>Ports s&eacute;rie et
@@ -143,7 +143,7 @@
         <listitem><para>Processeur UltraSPARC IIi</para></listitem>
         <listitem><para>Trois bus PCI</para></listitem>
         <listitem><para>Carte Ethernet int&eacute;gr&eacute;e
-          (compatible <devicename>hme</devicename>)</para></listitem>
+          (compatible <filename>hme</filename>)</para></listitem>
         <listitem><para>Controleur PCI-IDE int&eacute;gr&eacute;
         &perforce;</para></listitem> 
         <listitem><para>2 ports de communication de type PC-AT pour
@@ -175,7 +175,7 @@
         <listitem><para>Un controleur UltraSCSI bas&eacute; sur
         &man.sym.4;</para></listitem>
         <listitem><para>Carte Ethernet int&eacute;gr&eacute;e (compatible
-        <devicename>hme</devicename>)</para></listitem>
+        <filename>hme</filename>)</para></listitem>
         <listitem><para>Ports s&eacute;rie et
         parall&egrave;le</para></listitem>
         <listitem><para>Son 16-bit</para></listitem>
@@ -194,7 +194,7 @@
         <listitem><para>Processeur UltraSPARC IIe</para></listitem>
         <listitem><para>Trois bus PCI</para></listitem>
         <listitem><para>Carte Ethernet int&eacute;gr&eacute;e (compatible
-        <devicename>gem</devicename>)</para></listitem>
+        <filename>gem</filename>)</para></listitem>
         <listitem><para>Deux ports USB &unsupported;</para></listitem>
         <listitem><para>2 ports Firewire &unsupported;</para></listitem>
         <listitem><para>Controleur PCI-IDE int&eacute;gr&eacute;
@@ -256,8 +256,8 @@
     par la console OpenBoot.</para>
 
     <para>P&eacute;riph&eacute;riques r&eacute;seaux bas&eacute;es sur
-    <devicename>hme</devicename>, <devicename>gem</devicename>, et
-    <devicename>eri</devicename>.</para>
+    <filename>hme</filename>, <filename>gem</filename>, et
+    <filename>eri</filename>.</para>
 
     <para>Les ports s&eacute;ries <quote>PC standard</quote> trouv&eacute;s
     sur la plupart des stations de travail Sun sont support&eacute;s.</para>
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile b/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
index 06dfd252486..0c5283b940d 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/Makefile
@@ -16,7 +16,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
index b01afae4e27..c00b9834a12 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,7 +10,6 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -19,10 +18,8 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml b/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml
deleted file mode 100644
index 34e7da3e629..00000000000
--- a/release/doc/fr_FR.ISO8859-1/installation/common/abstract.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<!--
-     The FreeBSD Documentation Project
-     The FreeBSD French Documentation Project
-
-     $Id$
-     $FreeBSD$
-     Original revision: 1.2
--->
-
-
-<abstract>
-  <para>Cet article d&eacute;vrit bri&egrave;vement les instructions
-  pour installer &os;/&arch; &release.current;, en mettant un accent
-  particulier sur la fa&ccedil;on d'obtenir une distribution de &os;. Il y
-  a aussi quelques notes sur la gestion des probl&egrave;mes et les
-  questions les plus fr&eacute;quentes pos&eacute;es.</para>
-</abstract>
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml
index 8573012b061..07c2a5a9c47 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/artheader.xml
@@ -6,14 +6,12 @@
      $FreeBSD$
      Original revision: 1.3
 -->
+<info xmlns="http://docbook.org/ns/docbook"><title>Instructions pour l'installation de &os;/&arch; &release.current; </title>
+  
 
-
-<articleinfo>
-  <title>Instructions pour l'installation de &os;/&arch; &release.current; </title>
-
-  <corpauthor>
+  <author><orgname>
   Le projet  &os;
-  </corpauthor>
+  </orgname></author>
 
   <copyright>
     <year>2000</year>
@@ -22,4 +20,12 @@
     <year>2003</year>
     <holder role="mailto:doc@FreeBSD.org">Projet de documentation de FreeBSD</holder>
   </copyright>
-</articleinfo>
+
+<abstract>
+  <para>Cet article d&eacute;vrit bri&egrave;vement les instructions
+  pour installer &os;/&arch; &release.current;, en mettant un accent
+  particulier sur la fa&ccedil;on d'obtenir une distribution de &os;. Il y
+  a aussi quelques notes sur la gestion des probl&egrave;mes et les
+  questions les plus fr&eacute;quentes pos&eacute;es.</para>
+</abstract>
+</info>
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.ent b/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
index d125f400e54..cabeb0126a4 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.ent
@@ -14,7 +14,6 @@
 <!-- Files to be included -->
 
 <!ENTITY artheader SYSTEM "artheader.xml">
-<!ENTITY abstract SYSTEM "abstract.xml">
 <!ENTITY sect.install SYSTEM "install.xml">
 <!ENTITY sect.layout SYSTEM "layout.xml">
 <!ENTITY sect.upgrade SYSTEM "upgrade.xml">
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/install.xml b/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
index 0cd62a01fa3..36f516f1b22 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/install.xml
@@ -11,30 +11,26 @@
 from {alpha,i386}/INSTALL.TXT.
 
 -->
-
-<sect1>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <title>Installation de &os;</title>
 
   <para>Cette sections documente le processus pour l'installation 
   d'une nouvelle version de &os;. Ces instructions mettent un accent
   particulier sur la fa&ccedil;on d'obtenir la distribution &os;
   &release.current; de commencer la proc&eacute;dure d'installation. Le
-  chapitre <ulink
-  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html">
-  <quote>Installation de &os;</quote></ulink> du 
-  <ulink
-  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">
-  guide de r&eacute;f&eacute;rence de &os;</ulink> vous fournit plus
+  chapitre <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html">
+  <quote>Installation de &os;</quote></link> du 
+  <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">
+  guide de r&eacute;f&eacute;rence de &os;</link> vous fournit plus
   d'informations sur le programme d'installation lui m&ecirc;me, et
   une explication pas &agrave; pas de l'installation ponctu&eacute;e
   de copies d'&eacute;crans</para>
 
 
   <para>Si vous effectuez une mise &agrave; jour depuis une version
-  pr&eacute;cedente de &os;, r&eacute;f&eacute;rez vous aux, <xref
-  linkend="upgrading"/>, instructions sur la mise &agrave; jour.</para>
+  pr&eacute;cedente de &os;, r&eacute;f&eacute;rez vous aux, <xref linkend="upgrading"/>, instructions sur la mise &agrave; jour.</para>
 
-  <sect2 id="getting-started">
+  <sect2 xml:id="getting-started">
     <title>Pour commencer</title>
 
     <para>Probablement l'&eacute;tape la plus importante avant
@@ -47,12 +43,9 @@ from {alpha,i386}/INSTALL.TXT.
     sont aussi accessible dans le menu Documentation du programme
     d'installation. </para>
 
-    <para>Notez que les versions en ligne de &os; <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/">FAQ</ulink> 
-    et <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">Handbook</ulink>
-     sont aussi disponibles sur le <ulink
-     url="http://www.FreeBSD.org/">site Web du projet FreeBSD</ulink>,
+    <para>Notez que les versions en ligne de &os; <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/">FAQ</link> 
+    et <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">Handbook</link>
+     sont aussi disponibles sur le <link xlink:href="http://www.FreeBSD.org/">site Web du projet FreeBSD</link>,
      si vous disposez d'une connection Internet.</para>
 
     <para>Cette liste de documents peut vous para&icirc;tre &eacute;norme,
@@ -61,8 +54,7 @@ from {alpha,i386}/INSTALL.TXT.
     peut &ecirc;tre interessant lors de probl&egrave;mes au moment de
     l'installation.</para>
 
-    <para>Si vous avez des probl&egrave;mes, voyez la <xref
-    linkend="trouble"/>, qui contient certaines informations
+    <para>Si vous avez des probl&egrave;mes, voyez la <xref linkend="trouble"/>, qui contient certaines informations
     interessantes. Vous pouvez aussi lire une copie &agrave; jour du
     fichier <filename>ERRATA.TXT</filename> avant l'installation, qui
     vous alertera sur les probl&egrave;mes rencontr&eacute;s depuis la mise
@@ -116,7 +108,7 @@ from {alpha,i386}/INSTALL.TXT.
     informations sur le mat&eacute;riel support&eacute; par &os;.</para>
   </sect2>
 
-  <sect2 id="floppies">
+  <sect2 xml:id="floppies">
   <title>Installation depuis une disquette image</title>
 
   <para>Suivant la fa&ccedil;on choisie pour l'installation de &os; vous
@@ -139,12 +131,10 @@ from {alpha,i386}/INSTALL.TXT.
   <replaceable>release</replaceable><filename>/floppies/kern.flp</filename>
   et
   <replaceable>release</replaceable><filename>/floppies/mfsroot.flp</filename>
-  fichiers depuis <ulink
-  url="&release.url;"></ulink>
-  ou un des sites mirroirs list&eacute; &agrave; la section  <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">sites FTP
-    </ulink> du guide de r&eacute;gerence ou depuis les pages Web 
-    <ulink url="http://www.freebsdmirrors.org/"></ulink>.
+  fichiers depuis <uri xlink:href="&release.url;">&release.url;</uri>
+  ou un des sites mirroirs list&eacute; &agrave; la section  <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html">sites FTP
+    </link> du guide de r&eacute;gerence ou depuis les pages Web 
+    <uri xlink:href="http://www.freebsdmirrors.org/">http://www.freebsdmirrors.org/</uri>.
   </para>
 
   <para>Obtenez des disquette vierges formatt&eacute;es et copiez l'
@@ -161,7 +151,7 @@ from {alpha,i386}/INSTALL.TXT.
   <para>Par exemple, pour cr&eacute;er la disquette image du noyau depuis
   DOS, vous devrez taper quelque chose comme:</para>
 
-  <screen><prompt>C></prompt> <userinput>fdimage kern.flp a:</userinput></screen>
+  <screen><prompt>C&gt;</prompt> <userinput>fdimage kern.flp a:</userinput></screen>
 
   <para>En assumant que vous avez copi&eacute;
   <filename>fdimage.exe</filename> et <filename>kern.flp</filename>
@@ -195,7 +185,7 @@ from {alpha,i386}/INSTALL.TXT.
 
   </sect2>
 
-  <sect2 id="start-installation">
+  <sect2 xml:id="start-installation">
       <title>Installation de &os; depuis un CDROM ou Internet</title>
 
       <para arch="i386">La fa&ccedil;on la plus simple d'effectuer
@@ -238,8 +228,7 @@ from {alpha,i386}/INSTALL.TXT.
       <xref linkend="floppies"/>. Red&eacute;marrez votre ordinateur en utilisant
       la disquette <filename>kern.flp</filename> et lorsqu'on vous le
       demande, inserez alors la disquette
-      <filename>mfsroot.flp</filename>. Allez &agrave; la <xref
-      linkend="ftpnfs"/> pour plus d'information sur l'installation
+      <filename>mfsroot.flp</filename>. Allez &agrave; la <xref linkend="ftpnfs"/> pour plus d'information sur l'installation
       via FTP ou NFS.</para>
 
       <para arch="alpha">La fa&ccedil;on la plus simple d'effectuer
@@ -257,8 +246,7 @@ from {alpha,i386}/INSTALL.TXT.
       l'installation en cr&eacute;eant un jeu de disquette de d&eacute;marrage
       de &os; depuis les fichiers <filename>floppies/kern.flp</filename> et
       <filename>floppies/mfsroot.flp</filename> en suivant les
-      instructions que vous trouverez &agrave; la  <xref
-      linkend="floppies"/>. Depuis l'invite de console SRM
+      instructions que vous trouverez &agrave; la  <xref linkend="floppies"/>. Depuis l'invite de console SRM
       (<literal>&gt;&gt;&gt;</literal>), inserez la disquette
       <filename>kern.flp</filename> et tapez la commande suivante pour
       d&eacute;marrer l'installation:</para>
@@ -327,9 +315,9 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
     <para arch="alpha">Cet exemple est extrait d'une Digital Personal
     Workstation 433au et montre trois disques attach&eacute;s &agrave; cette
     machine. Le premier est un CDROM appel&eacute;
-    <devicename>dka0</devicename> et les deux autres sont des disques
-    appel&eacute;s respectivement <devicename>dkc0</devicename> et
-    <devicename>dkc100</devicename>.</para>
+    <filename>dka0</filename> et les deux autres sont des disques
+    appel&eacute;s respectivement <filename>dkc0</filename> et
+    <filename>dkc100</filename>.</para>
 
     <para arch="alpha">Vous pouvez sp&eacute;cifier le noyau &agrave; charger
     et quelles options de d&eacute;marrage utiliser via les options
@@ -368,7 +356,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
           le menu Options et mettez le Release Name &agrave;
           <literal>any</literal>. Vous pouvez alors choisir comme type
           de m&eacute;dia  <literal>FTP</literal> et taper
-          <filename>ftp://<replaceable>machine</replaceable></filename>
+          <filename>ftp://machine</filename>
           apr&egrave;s avoir choisi <quote>URL</quote> dans le menu des
           sites ftp.</para>
 
@@ -386,7 +374,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
           premier ajouter une ligne au fichier
           <filename>/etc/exports</filename> (sur la machine disposant
           du lecteur de CDROM). L'exemple ci-dessous autorise la
-          machine <hostid role="hostname">ziggy.foo.com</hostid> &agrave;
+          machine <systemitem class="fqdomainname">ziggy.foo.com</systemitem> &agrave;
           monter le CDROM via NFS lors de l'installation:</para>
 
 	  <screen>/cdrom          -ro             ziggy.foo.com</screen>
@@ -397,7 +385,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
           choix, sauf si vous voulez lire &man.rc.conf.5; et
           configurer les choses correctement. En assumant que cette
           partie se passe bien, vous devriez &ecirc;tre capable d'entrer:
-          <filename><replaceable>cdrom-host</replaceable>:/cdrom</filename> 
+          <filename>cdrom-host:/cdrom</filename> 
           comme r&eacute;pertoire d'installation NFS pour la machine &agrave;
           installer, e.g. <filename>wiggy:/cdrom</filename>.</para>
 	</listitem>
@@ -485,15 +473,15 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       <para>Pour pr&eacute;parer une installation depuis une partition
       MS-DOS, vous devez simplement copier les fichiers de la
       distribution dans le r&eacute;pertoire <filename>FREEBSD</filename>
-      sur la partition DOS primaire (<devicename>C:</devicename>). Par
+      sur la partition DOS primaire (<filename>C:</filename>). Par
       exemple, pour installation une distribution minimal de &os;
       sous DOS depuis les fichiers se trouvant sur le CDROM, vous
       devriez taper les commandes suivantes :</para>
 
-      <screen><prompt>C:\></prompt> <userinput>MD C:\FREEBSD</userinput>
-<prompt>C:\></prompt> <userinput>XCOPY /S E:\BIN C:\FREEBSD\BIN</userinput></screen>
+      <screen><prompt>C:\&gt;</prompt> <userinput>MD C:\FREEBSD</userinput>
+<prompt>C:\&gt;</prompt> <userinput>XCOPY /S E:\BIN C:\FREEBSD\BIN</userinput></screen>
 
-      <para>En assumant que <devicename>E:</devicename> est le nom du
+      <para>En assumant que <filename>E:</filename> est le nom du
       lecteur CDROM.</para>
 
       <para>Pour toutes les distributions n&eacute;cessaires &agrave;
@@ -518,8 +506,8 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       n&eacute;cessaires, utilisez simplement la commande &man.tar.1; pour
       les mettre sur la bande, comme cela :</para>
 
-      <screen>&prompt.root; <userinput>cd <replaceable>/where/you/have/your/dists</replaceable></userinput>
-&prompt.root; <userinput>tar cvf /dev/rsa0 <replaceable>dist1</replaceable> .. <replaceable>dist2</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>cd /where/you/have/your/dists</userinput>
+&prompt.root; <userinput>tar cvf /dev/rsa0 dist1 .. dist2</userinput></screen>
 
       <para>Lorsque vous d&eacute;butez l'installation, assurez vous
       d'avoir assez de place dans un r&eacute;pertoire temporaire (que
@@ -543,7 +531,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       &agrave; l'installation.</para>
     </sect3>
 
-    <sect3 id="ftpnfs">
+    <sect3 xml:id="ftpnfs">
       <title>Installation via le r&eacute;seau en utilisant FTP ou NFS</title>
 
       <para>Apr&egrave;s avoir cr&eacute;er les disquettes de d&eacute;marrage
@@ -590,9 +578,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         l'utilisation d'un cable parall&egrave;le pour une installation
         point &agrave; point, car vous pouvez utiliser g&eacute;n&eacute;ralement
         des adresses de style RFC1918 pour les extr&eacute;mit&eacute;s du
-        lien (e.g. <hostid
-        role="ipaddr">10.0.0.1</hostid>, <hostid
-        role="ipaddr">10.0.0.2</hostid>,etc).</para>
+        lien (e.g. <systemitem class="ipaddress">10.0.0.1</systemitem>, <systemitem class="ipaddress">10.0.0.2</systemitem>,etc).</para>
 
         <important>
 	  <para>Si vous utilisez une machine Linux plutôt qu'une
@@ -670,7 +656,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
         sous-r&eacute;pertoires</quote>, e.g. si votre r&eacute;pertoire de la
         distribution de &os; r&eacute;side dans
         <filename>wiggy:/usr/archive/stuff/FreeBSD</filename>, alors
-        <hostid role="hostname">wiggy</hostid> doit autoriser le
+        <systemitem class="fqdomainname">wiggy</systemitem> doit autoriser le
         montage direct de
         <filename>/usr/archive/stuff/FreeBSD</filename> et non pas
         seulement <filename>/usr</filename> ou
@@ -735,7 +721,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
               d'un proxy FTP, mais qui ne supporte pas les requ&egrave;tes
               HTTP, vous pouvez sp&eacute;cifier l'URL comme ceci:</para>
 
-              <screen><userinput>ftp://foo.bar.com:<replaceable>port</replaceable>/pub/FreeBSD</userinput></screen>
+              <screen><userinput>ftp://foo.bar.com:port/pub/FreeBSD</userinput></screen>
 
               <para>Dans l'URL ci-dessus, <replaceable>port</replaceable>
               correspond au num&eacute;ro du port du serveur FTP proxy.</para>
@@ -756,7 +742,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	<step>
 	  <para>Connectez un terminal compatible ANSI (vt100) ou un
           programme d'&eacute;mulation de terminal sur le port
-          <devicename>COM1</devicename> du PC sur lequel vous d&eacute;sirez
+          <filename>COM1</filename> du PC sur lequel vous d&eacute;sirez
           installer &os;.</para>
 	</step>
 	<step>
@@ -768,8 +754,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	<step>
 	  <para>Si vous n'obtenez aucun caract&egrave;re sur votre console
           s&eacute;rie, branchez le clavier et attendez des sonneries. Si
-          vous d&eacute;marrez depuis le CDROM, allez &agrave; <xref
-	  linkend="hitspace"/> aussi vite que possible.</para>
+          vous d&eacute;marrez depuis le CDROM, allez &agrave; <xref linkend="hitspace"/> aussi vite que possible.</para>
 	</step>
 	<step>
 	  <para>Pour une installation via des disquettes, la premi&egrave;re
@@ -778,7 +763,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
           <filename>mfsroot.flp</filename> puis appuyez sur la touche
           <keycap>Enter</keycap> et attendez une autre sonnerie.</para>
 	</step>
-	<step id="hitspace">
+	<step xml:id="hitspace">
 	  <para>Appuyez sur la barre d'espace et entrez</para>
 
 	  <screen><userinput>boot -h</userinput></screen>
@@ -874,9 +859,9 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	<answer>
 	  <para>Oui. Les partitions DOS étendues sont mappées à la fin
           des autres <quote>slices</quote> dans &os;, e.g. votre
-          disque <devicename>D:</devicename> peut être
+          disque <filename>D:</filename> peut être
           <filename>/dev/da0s5</filename>, votre disque
-          <devicename>E:</devicename> <filename>/dev/da0s6</filename>,
+          <filename>E:</filename> <filename>/dev/da0s6</filename>,
           etc... Cet exemple assume que votre partition étendue se
           trouve sur le disque SCSI 0. Pour les disques IDE,
           substituez <literal>da</literal> par
@@ -898,8 +883,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
           dessus, envoyez un mail à la liste &a.emulation; et indiquez
           votre intérêt à joindre l'effort d'émulation DOS!</para>
 
-	  <para>La pacquetage/port <filename
-          role="package">emulators/pcemu</filename> de la collection
+	  <para>La pacquetage/port <package>emulators/pcemu</package> de la collection
           des ports de &os; qui émule un 8088 et pas mal de services
           du BIOS permet de faire fonctionner les applications DOS en
           mode texte. Il nécessite le système X Windows (Xfree86) pour
@@ -949,7 +933,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	<answer>
 	  <para>&os; peut faire tourner les applications Tru64 en
           utilisant le port/pacquetage
-	  <filename role="package">emulators/osf1_base</filename>.</para>
+	  <package>emulators/osf1_base</package>.</para>
 	</answer>
       </qandaentry>
 
@@ -960,8 +944,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 
 	<answer>
 	  <para>&os; peut faire fonctionner les binaires AlphaLinux en
-          utilisant le pacquetage/port <filename
-          role="package">emulators/linux_base</filename>.</para>
+          utilisant le pacquetage/port <package>emulators/linux_base</package>.</para>
 	</answer>
       </qandaentry>
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml b/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
index 7c4e1d43a17..26b85cd905b 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/layout.xml
@@ -10,7 +10,7 @@
      This section contains the contents of the old LAYOUT.TXT file.
 
 -->
-<sect1 id="layout">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="layout">
   <title>Format de la distribution</title>
 
   <para>Le r&eacute;pertoire d'une distribution typique de &os;
@@ -94,8 +94,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
       <listitem>
 	<para>Le sous-r&eacute;pertoire <filename>floppies/</filename>
         contient les images de la disquette d'installation. Plus
-        d'informations sur son utilisation dans <xref
-        linkend="floppies"/>.</para>
+        d'informations sur son utilisation dans <xref linkend="floppies"/>.</para>
       </listitem>
       <listitem>
 
@@ -115,8 +114,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
 	<para>La collection des ports peut s'installer comme toute 
 	partie de la distribution et n&eacute;cessite a peu pr&egrave;s 100Mb. 
 	Plus d'informations sur la collection des ports peut etre obtenu 
-	a <ulink
-        url="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</ulink> ou localement depuis <filename>/usr/share/doc/handbook</filename> 	
+	a <link xlink:href="http://www.FreeBSD.org/ports/">http://www.FreeBSD.org/ports/</link> ou localement depuis <filename>/usr/share/doc/handbook</filename> 	
         si vous avez install&eacute; la distribution
         <filename>doc</filename>.</para>
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml
index c248227aa7f..817329e7f2a 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/trouble.xml
@@ -8,10 +8,10 @@
 
 	This file contains the comments of the old TROUBLE.TXT file.
 -->
-<sect1 id="trouble">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="trouble">
   <title>***Non traduit***Troubleshooting</title>
 
-  <sect2 id="repairing">
+  <sect2 xml:id="repairing">
     <title>Repairing an Existing &os; Installation</title>
 
     <para>&os; features a
@@ -68,8 +68,8 @@
           each configured as the master on their respective IDE
           busses, and wish to boot &os; from the second disk.  The
           BIOS sees these as disk 0 and disk 1, while &os; sees
-          them as <devicename>wd0</devicename> and
-          <devicename>wd2</devicename>.</para>
+          them as <filename>wd0</filename> and
+          <filename>wd2</filename>.</para>
 
           <para>&os; is on BIOS disk 1, of type
           <literal>wd</literal> and the &os; disk number is 2, so
@@ -158,8 +158,8 @@
 	<answer>
 	  <para>Use the UserConfig utility (see
           <filename>HARDWARE.TXT</filename>) and disable the probing
-          of the <devicename>mcd0</devicename> and
-          <devicename>mcd1</devicename> devices.  Generally speaking,
+          of the <filename>mcd0</filename> and
+          <filename>mcd1</filename> devices.  Generally speaking,
           you should only leave the devices that you will be using
           enabled in your kernel.</para>
 	</answer>
@@ -297,7 +297,7 @@
           <para>As soon as you see this message, hit the space bar,
 	  and you will see the prompt:</para>
 
-<screen>>> FreeBSD/i386 BOOT
+<screen>&gt;&gt; FreeBSD/i386 BOOT
 Default: x:xx(x,x)/boot/loader 
 boot:</screen>
 
diff --git a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml
index 54dd0728e3b..c65567e982c 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/common/upgrade.xml
@@ -8,7 +8,7 @@
 	This section contains the contents of the old UPGRADE.TXT
 	file.
 -->
-<sect1 id="upgrading">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="upgrading">
   <title>***Non traduit ***Upgrading &os;</title>
 
   <para>These instructions describe a procedure for doing a binary
@@ -181,7 +181,7 @@
       functionality.</para>
     </sect3>
 
-    <sect3 id="fstab">
+    <sect3 xml:id="fstab">
       <title>After Installation</title>
 
       <para>Once the installation procedure has completed, the
@@ -198,9 +198,8 @@
 
     <para>Those interested in an upgrade method that allows more
     flexibility and sophistication should take a look at
-    <ulink
-    url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/cutting-edge.html">The
-    Cutting Edge</ulink> in the &os; Handbook.  This procedure involves
+    <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/cutting-edge.html">The
+    Cutting Edge</link> in the &os; Handbook.  This procedure involves
     rebuilding all of &os; from source code.  It requires reliable
     network connectivity, extra disk space, and time, but has
     advantages for networks and other more complex
@@ -212,4 +211,4 @@
     various issues resulting from changes in &os; that may affect an
     upgrade.</para>
   </sect2>
-</sect1>  
+</sect1>
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile b/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
index 49e6c23358b..70d142eacad 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/Makefile
@@ -17,7 +17,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml b/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
index cfa22e5106c..a444fdc713c 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,7 +10,6 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "IA-32">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -19,10 +18,8 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile b/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
index f191fbc8651..2ab9680a058 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/Makefile
@@ -18,7 +18,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
index 1b646b2f330..d52fa32b7d0 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -10,7 +10,6 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -19,10 +18,8 @@
      $FreeBSD$
      Original revision: 1.1
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
index fe76d81cf4c..d016283f828 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent"> %sections;
@@ -11,7 +11,6 @@
 <!ENTITY arch.print "UltraSPARC">
 <!ENTITY sect.sparc64.install SYSTEM "./install.xml">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -20,15 +19,7 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 &artheader;
-<abstract>
-  <para>Ce document donne de brèves instructions sur l'installation
-  de &os;/&arch; &release.current;. Gardez bien à l'esprit que ce
-  portage est en cours, et que en conséquence, la procédure
-  d'installation demande beaucoup plus de travail que pour &os;/i386
-  ou &os;/alpha.</para>
-</abstract>
 &sect.sparc64.install;
 </article>
diff --git a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml
index e4d8f5b1a34..b42e57f0ed2 100644
--- a/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml
+++ b/release/doc/fr_FR.ISO8859-1/installation/sparc64/install.xml
@@ -9,8 +9,7 @@
      specifique aux systemes sparc64.
 
 -->
-
-<sect1>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   <title>***Non traduit***Installing &os;</title>
 
   <para>This text describes how to install and boot the &arch; port.
@@ -61,7 +60,7 @@
       more permanent URLs have been determined.</para>
   </important>
 
-  <sect2 id="getting-to-prom-prompt">
+  <sect2 xml:id="getting-to-prom-prompt">
     <title>Getting to the PROM Prompt</title>
 
     <para>Most &arch; systems are set up to boot automatically from
@@ -79,10 +78,8 @@ OpenBoot 4.2, 128 MB memory installed, Serial #51090132.
 Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
     <para>If your system proceeds to boot from disk at this point, you
-      need to press <keycombo
-      action="simul"><keycap>L1</keycap><keycap>A</keycap></keycombo>
-      or <keycombo
-      action="simul"><keycap>Stop</keycap><keycap>A</keycap></keycombo>
+      need to press <keycombo action="simul"><keycap>L1</keycap><keycap>A</keycap></keycombo>
+      or <keycombo action="simul"><keycap>Stop</keycap><keycap>A</keycap></keycombo>
       on the keyboard, or send a <command>BREAK</command> over the
       serial console (using for example <command>~#</command> in
       &man.tip.1; or &man.cu.1;) to get to the PROM prompt.  It looks
@@ -90,8 +87,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
     <screenco>
       <areaspec>
-	<area id="prompt-single" coords="1 5"/>
-	<area id="prompt-smp" coords="2 5"/>
+	<area xml:id="prompt-single" coords="1 5"/>
+	<area xml:id="prompt-smp" coords="2 5"/>
       </areaspec>
 
       <screen><prompt>ok     </prompt>
@@ -111,12 +108,11 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
     </screenco>
   </sect2>
 
-  <sect2 id="prepare-cd">
+  <sect2 xml:id="prepare-cd">
     <title>Preparing for a CDROM Installation</title>
 
     <para>If you want to do a CDROM installation, an ISO image with a
-      snapshot of &os;/&arch; can be found at <ulink
-      url="&release.url;"></ulink>.  This file can be used to create a
+      snapshot of &os;/&arch; can be found at <uri xlink:href="&release.url;">&release.url;</uri>.  This file can be used to create a
       bootable CDROM which contains everything necessary to boot and
       load at least a minimal &os; installation.</para>
 
@@ -125,12 +121,10 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
       described above.  On the PROM prompt, type <command>boot
       cdrom</command>.  The system should boot into single-user mode
       now, and you can create the disk label and install the base
-      system archive as described in <xref
-      linkend="creating-disk-label"/> and <xref
-      linkend="creating-root-filesystem"/>.</para>
+      system archive as described in <xref linkend="creating-disk-label"/> and <xref linkend="creating-root-filesystem"/>.</para>
   </sect2>
 
-  <sect2 id="prepare-network">
+  <sect2 xml:id="prepare-network">
     <title>Preparing for a Network Installation</title>
 
     <para>A &os;/&arch; kernel is booted by having the firmware
@@ -142,7 +136,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
       The loader can fetch a kernel using TFTP or NFS.  All of this is
       covered in detail below.</para>
 
-    <sect3 id="downloading">
+    <sect3 xml:id="downloading">
       <title>Getting the Required Files</title>
 
       <para>For a network installation, you will need several files.
@@ -156,25 +150,22 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
       <itemizedlist>
 	<listitem>
-	  <para><ulink
-	    url="&release.url;loader-tftp.gz"></ulink></para>
+	  <para><uri xlink:href="&release.url;loader-tftp.gz">&release.url;loader-tftp.gz</uri></para>
 	</listitem>
 
 	<listitem>
-	  <para><ulink
-	    url="&release.url;loader-nfs.gz"></ulink></para>
+	  <para><uri xlink:href="&release.url;loader-nfs.gz">&release.url;loader-nfs.gz</uri></para>
 	</listitem>
       </itemizedlist>
 
       <para>A network installation also requires a kernel to be served
 	to the netboot client.  A suitable kernel can be found at
-	<ulink url="&release.url;"></ulink>.</para>
+	<uri xlink:href="&release.url;">&release.url;</uri>.</para>
 <!-- XXX kernel filename?-->
 
       <para>Finally, you will need a &man.tar.1; archive which
 	contains the binaries and configuration files from the base
-	system.  This file is available from <ulink
-	url="&release.url;distrib.tar.gz"></ulink>.</para>
+	system.  This file is available from <uri xlink:href="&release.url;distrib.tar.gz">&release.url;distrib.tar.gz</uri>.</para>
     </sect3>
 
 <!-- put the words "netboot server" in here -->
@@ -190,7 +181,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
       <para>The Ethernet address is usually displayed in the boot
 	message.</para>
 
-      <para>Make sure <hostid>your.host.name</hostid> is in
+      <para>Make sure <systemitem>your.host.name</systemitem> is in
 	<filename>/etc/hosts</filename> or has a valid DNS entry (or
 	use an IP address).  Then, start &man.rarpd.8; on a network
 	interface that is on the same subnet as the &os;/&arch;
@@ -212,9 +203,9 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	&os;/&arch; host's IP address in upper-case hexadecimal
 	notation without dots (or use appropriately-named symbolic
 	links).  For example, your setup may look like this, for an IP
-	address of <hostid>192.168.0.16</hostid>:</para>
+	address of <systemitem>192.168.0.16</systemitem>:</para>
 
-      <screen>  lrwx------  1 tmm users       9 Jul 24 17:05 /tftpboot/C0A80010 -> boot/loader
+      <screen>  lrwx------  1 tmm users       9 Jul 24 17:05 /tftpboot/C0A80010 -&gt; boot/loader
   -rw-r--r--  1 tmm users 1643021 Oct 20 18:04 /tftpboot/boot/loader</screen>
 
       <para>If you have trouble booting, it is very helpful to use
@@ -270,8 +261,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
       <para>For a DHCP server, add an entry similar to the following
 	to your <filename>dhcpd.conf</filename> file.  An example
 	entry for <application>ISC DHCP</application> version 2
-	(available in the &os; Ports Collection as <filename
-	role="package">net/isc-dhcp2</filename>) is shown
+	(available in the &os; Ports Collection as <package>net/isc-dhcp2</package>) is shown
 	below:</para>
 
       <programlisting>host <replaceable>name-of-entry</replaceable> {
@@ -354,15 +344,14 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 	server, you probably will want to edit the &arch;'s
 	<filename>/etc/fstab</filename> and
 	<filename>/etc/rc.conf</filename> and set a
-	<username>root</username> password.</para>
+	<systemitem class="username">root</systemitem> password.</para>
     </sect3>
 
     <sect3>
       <title>Booting</title>
 
       <para>If all goes well, you can now boot the &os; on your &arch;
-	machine by dropping into the PROM prompt as described in <xref
-	linkend="getting-to-prom-prompt"/>.  Now, just type
+	machine by dropping into the PROM prompt as described in <xref linkend="getting-to-prom-prompt"/>.  Now, just type
 	<command>boot net</command> and the system should boot.
 	Specifically, the loader is retrieved via TFTP, it then does a
 	BOOTP request and will proceed to load the kernel (either
@@ -372,8 +361,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
       <para>If something does not work in between, and you suspect
 	TFTP/NFS/BOOTP problems, <application>Ethereal</application>
-	(available in the &os; Ports Collection as <filename
-	role="package"> net/ethereal</filename>) is usually helpful.
+	(available in the &os; Ports Collection as <package> net/ethereal</package>) is usually helpful.
 	The most common problems are related to bad file permissions.
 	Also note that &man.rarpd.8; will not answer to packets under
 	some circumstances, refer to the manual page for
@@ -381,7 +369,7 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
     </sect3>
   </sect2>
 
-  <sect2 id="creating-disk-label">
+  <sect2 xml:id="creating-disk-label">
     <title>Creating a Disk Label</title>
 
     <para>The kernel supports the Sun disk label format, so you can
@@ -389,9 +377,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
     <para>&os; disk labels must currently be created by hand, as
       &man.sysinstall.8; is not yet available on &os;/&arch;.  Please
-      refer to the <ulink
-      url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD
-      Handbook</ulink> for more information about labels and special
+      refer to the <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD
+      Handbook</link> for more information about labels and special
       partitions.</para>
 
     <para>On &os;/&arch;, a Sun compatibility label is embedded in the
@@ -405,16 +392,16 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
     <procedure>
       <step>
 	<para>Run <command>disklabel -w -r
-	  <replaceable>device</replaceable> auto</command> to create a
+	  device auto</command> to create a
 	  basic disk label.  The third argument you need specify here
 	  is just the name of the device, not the complete path to the
-	  device node (e.g. <devicename>ad0</devicename> for the first
+	  device node (e.g. <filename>ad0</filename> for the first
 	  ATA disk).</para>
       </step>
 
       <step>
 	<para> Use <command>disklabel -e
-	  <replaceable>device</replaceable></command> to open an
+	  device</command> to open an
 	  editor in which you can edit the disk label.  The
 	  information presented to you should look like:</para>
 
@@ -466,7 +453,7 @@ drivedata: 0
 
 	<para>If you want to double-check that your partitions end on
 	  cylinder boundaries, run <command>disklabel -e
-	  <replaceable>device</replaceable></command> again.  The
+	  device</command> again.  The
 	  editor will display the cylinders used by a particular
 	  partition on the right hand side of the output.  If any of
 	  the partitions you defined (i.e. anything except partition
@@ -491,13 +478,12 @@ drivedata: 0
 	  possible to load the <application>loader</application> via
 	  TFTP as described above, but have it boot the kernel from
 	  disk.  This requires a special loader binary, which is
-	  available at <ulink
-	  url="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/loader-ufs.gz"></ulink></para>
+	  available at <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/loader-ufs.gz">ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/loader-ufs.gz</uri></para>
       </step>
     </procedure>
   </sect2>
 
-  <sect2 id="creating-root-filesystem">
+  <sect2 xml:id="creating-root-filesystem">
     <title>Creating the Root Fileystem</title>
 
     <para>If you want to boot from a local disk, you will need to
@@ -525,7 +511,7 @@ drivedata: 0
       root partition into <filename>/etc/fstab</filename> yet, you may
       need to specify your root partition on the mountroot prompt when
       booting (use a format like
-      <command>ufs:<replaceable>disk</replaceable><replaceable>partition</replaceable></command>,
+      <command>ufs:diskpartition</command>,
       i.e. leave the slice specification out).  If the kernel does
       automatically attempt to boot from another filesystem, press a
       key other than <keycap>Enter</keycap> on the
@@ -545,7 +531,7 @@ drivedata: 0
       the root filesystem via NFS.</para>
   </sect2>
 
-  <sect2 id="installing-base-system">
+  <sect2 xml:id="installing-base-system">
     <title>Installing the Base System</title>
 
     <para>If you booted the kernel from the network, you downloaded a
@@ -560,7 +546,7 @@ drivedata: 0
     <para>Before booting the system stand-alone, you will want to edit
       <filename>/etc/fstab</filename> and
       <filename>/etc/rc.conf</filename> and set a
-      <username>root</username> password.</para>
+      <systemitem class="username">root</systemitem> password.</para>
 
     <para>Note that some programs from the base system may not be
       present in the archive, or may not work properly yet.</para>
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
index 5ee926997a3..c811859f7d6 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,7 +10,6 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -19,7 +18,6 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &art;
 </article>
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
index 20ae05ae5bb..5f6822ba608 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/common/new.xml
@@ -7,12 +7,12 @@
      $FreeBSD$
      Original revision: 1.423
 -->
-<articleinfo>
-  <title>&os;/&arch; &release.current; notes de version</title>
+<info xmlns="http://docbook.org/ns/docbook"><title>&os;/&arch; &release.current; notes de version</title>
+  
 
   <pubdate>$FreeBSD$</pubdate>
 
-  <corpauthor>Le Projet FreeBSD</corpauthor>
+  <author><orgname>Le Projet FreeBSD</orgname></author>
 
   <copyright>
     <year>2000</year>
@@ -34,7 +34,7 @@
   contiennent &eacute;galement quelques br&egrave;ves remarques sur la
   mise &agrave; jour.</para>
   </abstract>
-</articleinfo>
+</info>
 
 <sect1>
   <title>Introduction</title>
@@ -50,18 +50,16 @@ de version repr&eacute;sente une &eacute;tape sur la branche de
 d&eacute;veloppement &release.branch; entre &release.prev; et la
 future	&release.next;. Quelques distributions binaires
 pr&eacute;-compil&eacute;es de la version snapshot pour cette branche
-sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
+sont pr&eacute;sentes sur <uri xlink:href="&release.url;">&release.url;</uri>.</para>
 
   <para releasetype="release">Cette distribution de &os; &release.current; est une distribution
-  de type &release.type;. Elle est disponible &agrave; <ulink
-  url="&release.url;"></ulink> 
+  de type &release.type;. Elle est disponible &agrave; <uri xlink:href="&release.url;">&release.url;</uri> 
   ou sur un des mirroirs. Pour plus d'informations sur la façon d'obtenir 
   cette (ou une autre) distribution &release.type;  de &os; voyez 
-  le chapitre <ulink
-  url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors.html">
-  <quote>Obtenir FreeBSD</quote></ulink> du 
-  <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">
-  guide de r&eacute;f&eacute;rence de FreeBSD</ulink>.</para>
+  le chapitre <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors.html">
+  <quote>Obtenir FreeBSD</quote></link> du 
+  <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">
+  guide de r&eacute;f&eacute;rence de FreeBSD</link>.</para>
 
 </sect1>
 
@@ -107,7 +105,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
   corrig&eacute; et le code source a &eacute;t&eacute; remis au
   propre.</para>
 
-  <sect2 id="kernel">
+  <sect2 xml:id="kernel">
     <title>Changements concernant le noyau</title>
 
     <para arch="i386">L'&eacute;x&eacute;cution des programmes en
@@ -220,7 +218,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     accessible (de façon ind&eacute;pendante de l'architecture) via
     la variable sysctl <varname>kern.msgbuf</varname>; &man.dmesg.8;
     n'a plus besoin d'&ecirc;tre SGID
-    <groupname>kmem</groupname>.&merged;</para>
+    <systemitem class="groupname">kmem</systemitem>.&merged;</para>
 
     <para>L'environnement du noyau est maintenant dynamique, et peut
     &ecirc;tre chang&eacute; via l'appel syst&egrave;me
@@ -250,7 +248,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
     <para role="historic">L'&eacute;mulation Linux supporte maintenant
     les fonctionnalit&eacute;s noyau n&eacute;cessaires au port
-    <filename role="package">emulators/linux_base-7</filename>
+    <package>emulators/linux_base-7</package>
     (&eacute;mulation RedHat 7.X). &merged;</para>
 
     <para role="historic">L'&eacute;mulation linux n&eacute;cessite
@@ -450,8 +448,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     <para arch="i386,pc98" role="historic">Un gestionnaire de
     p&eacute;riph&eacute;riques &man.uscanner.4; permettant le support
     basique de scanner USB utilisant SANE a &eacute;t&eacute;
-    ajout&eacute;. R&eacute;f&eacute;rez vous a <ulink
-    url="http://www.mostang.com/sane/">la page SANE</ulink> pour la
+    ajout&eacute;. R&eacute;f&eacute;rez vous a <link xlink:href="http://www.mostang.com/sane/">la page SANE</link> pour la
     liste des scanners support&eacute;s Les scanners HP ScanJet 4100C,
     5200C et 6300C sont support&eacute;s. &merged;</para>
     
@@ -503,13 +500,13 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     &eacute;t&eacute; ajout&eacute;.</para>
 
     <para role="historic">La cible
-    <maketarget>buildkernel</maketarget> prend en compte la variable
+    <buildtarget>buildkernel</buildtarget> prend en compte la variable
     <varname>KERNCONF</varname> et non plus <varname>KERNEL</varname>
     pour savoir quel fichier du noyau cr&eacute;er. Il n'est plus
     n&eacute;cessaire, dans certains cas, de faire
-    pr&eacute;c&eacute;der un <maketarget>buildkernel</maketarget> par
-    un <maketarget>buildworld</maketarget>. (Un
-    <maketarget>buildworld</maketarget> est n&eacute;cessaire pour la
+    pr&eacute;c&eacute;der un <buildtarget>buildkernel</buildtarget> par
+    un <buildtarget>buildworld</buildtarget>. (Un
+    <buildtarget>buildworld</buildtarget> est n&eacute;cessaire pour la
     mise &agrave; jour lors des version majeures, ou de la mise
     &agrave; jour de <application>binutil</application> et lors de
     changements dans &man.config.8;.) &merged;</para>
@@ -1001,8 +998,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
       <para arch="i386" role="historic">Le gestionnaire de
       p&eacute;riph&eacute;riques sbni, permettant de supporter les
       interfaces de comunications Granch SBNI12,  point a point ISA et
-      PCI a &eacute;t&eacute; ajout&eacute;. Le port <filename
-      role="package">sysutils/sbniconfig</filename> contenu dans la
+      PCI a &eacute;t&eacute; ajout&eacute;. Le port <package>sysutils/sbniconfig</package> contenu dans la
       collection des ports de &os; peut etre utilis&eacute; pour
       configurer ces p&eacute;riph&eacute;riques.&merged;</para>
 
@@ -1408,7 +1404,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
       a acc&egrave;s en &eacute;criture al&eacute;atoire, et pas les p&eacute;riph&eacute;riques a acc&egrave;s
       en &eacute;criture s&eacute;quentielle comme les lecteurs CD-R, qui sont eux 
       support&eacute;s par &man.cdrecord.1; (via 
-      <filename role="package">sysutils/cdrtools</filename> de la 
+      <package>sysutils/cdrtools</package> de la 
       collection des Ports. &merged;</para>
 
       <para arch="i386">Le gestionnaire ciss, pour les p&eacute;riph&eacute;riques
@@ -1477,7 +1473,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
       des gestionnaires de p&eacute;riph&eacute;riques &man.ata.4;. &merged;</para>
 
 
-      <para></para>
+      <para/>
     </sect3>
 
     <sect3>
@@ -1518,7 +1514,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
       <para>Le syst&egrave;me de fichiers ISO-9660 dispose maintenant
       d'une routine chargeable a la demande de convertion de
-      caract&egrave;res. Le port <filename role="package">sysutils/cd9660_unicode</filename>
+      caract&egrave;res. Le port <package>sysutils/cd9660_unicode</package>
       comporte un ensemble de base de conversions.</para>
 
       <para>&man.kernfs.5; est obsol&egrave;te et a &eacute;t&eacute; retir&eacute;.</para>
@@ -1693,7 +1689,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
     <sect3>
       <title>Logiciels externes</title>
-      <para></para>
+      <para/>
 
       <para>Le language de commande inspir&eacute; sur Forth
       (<application>FICL</application>) du gestionnaire de 
@@ -1765,7 +1761,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 	 num&eacute;rique d'un PABX &merged;</para>
       </sect4>
 
-      <sect4 id="kame-kernel">
+      <sect4 xml:id="kame-kernel">
         <title>KAME</title>
 
         <para>La couche IPv6 est maintenant bas&eacute;e sur la snapshot
@@ -1803,7 +1799,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
      </sect4>
    </sect3>
   </sect2>
-  <sect2 id="security">
+  <sect2 xml:id="security">
     <title>Changements li&eacute;s a la s&eacute;curit&eacute;</title>
 
     <para>&man.sysinstall.8; permet maintenant a un utilisateur de choisir
@@ -1882,7 +1878,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
     <para>La vuln&eacute;rabilit&eacute; dans &man.inetd.8; permettant l'acc&egrave;s
     en lecture aux 16 bytes initiaux des fichiers accessibles 
-    par le groupe <groupname>wheel</groupname> a &eacute;t&eacute; corrig&eacute;(voir
+    par le groupe <systemitem class="groupname">wheel</systemitem> a &eacute;t&eacute; corrig&eacute;(voir
     l'avis de s&eacute;crurit&eacute; FreeBSD-SA-01:11). &merged;</para>
 
     <para>Un bogue dans &man.periodic.8; qui utilisait des fichiers
@@ -2010,15 +2006,15 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
     <para>Un bogue dans <application>UUCP</application> a &eacute;t&eacute;
     corrig&eacute; (voyez l'avis de s&eacute;curit&eacute; FreeBSD-SA-01:62). Tous
-    les binaires n'appartenant pas a <username>root</username>
+    les binaires n'appartenant pas a <systemitem class="username">root</systemitem>
     dans les "path" syst&egrave;me standard ont maintenant le drapeau
     <literal>schg</literal> permettant d'empecher l'exploitation
-    de bogues via &man.cron.8;, par <username>root</username>,
+    de bogues via &man.cron.8;, par <systemitem class="username">root</systemitem>,
     ou par un utilisateur autre que celui auquel appartient
     le binaire. De plus &man.uustat.1; est lanc&eacute; maintenant
     via <filename>/etc/periodic/daily/410.status-uucp</filename> 
-    sous l'utilisateur <username>uucp</username>, et non
-    plus <username>root</username>. Dans &os; -CURRENT, 
+    sous l'utilisateur <systemitem class="username">uucp</systemitem>, et non
+    plus <systemitem class="username">root</systemitem>. Dans &os; -CURRENT, 
     <application>UUCP</application> ne fait plus partie des binaires
     syst&egrave;mes, et a &eacute;t&eacute; d&eacute;plac&eacute; dans la collection des Ports. &merged;</para>
 
@@ -2049,7 +2045,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
   </sect2>
 
 
-  <sect2 id="userland">
+  <sect2 xml:id="userland">
     <title>Changements dans les programmes utilisateurs</title>
 
     <para>Si le premier argument de  &man.ancontrol.8; ou de 
@@ -2537,14 +2533,14 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     via <varname>CFLAGS</varname> de façon neutre. &merged;</para>
 
     <para>&man.man.1; n'est plus install&eacute; SUID
-    <username>man</username>, dans le but de r&eacute;duire les vuln&eacute;rabilit&eacute;s
+    <systemitem class="username">man</systemitem>, dans le but de r&eacute;duire les vuln&eacute;rabilit&eacute;s
     associ&eacute;es lors de la g&eacute;n&eacute;ration de <quote>catpages</quote>
     (les pages de manuel cach&eacute;es pour leur lecture r&eacute;p&eacute;t&eacute;es). 
     Comme r&eacute;sultat &man.man.1; ne peut plus cr&eacute;er des pages de manuels
     cach&eacute;es pour un utilisateur. Il peut continuer a le faire si l'utilisateur
     &agrave; la possibilit&eacute; d'&eacute;crire dans le r&eacute;pertoire des catpages (
     par ex une page de manuel lui appartenant) ou si l'utilisateur le lancant est 
-    <username>root</username>.</para>
+    <systemitem class="username">root</systemitem>.</para>
 
     <para>La commande &man.mdmfs.8; a &eacute;t&eacute; ajout&eacute;e; c'est un wrapper
     de &man.mdconfig.8;, &man.disklabel.8;, &man.newfs.8; et &man.mount.8; qui
@@ -2600,7 +2596,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     fix&eacute;e &agrave; 16. Cela augmente les performances de &man.fsck.8; tout en 
     r&eacute;duisant la fragmentation. &merged;</para>
 
-    <para><anchor id="newfs-block-frag-sizes"/>La taille des blocs et des fragments
+    <para><anchor xml:id="newfs-block-frag-sizes"/>La taille des blocs et des fragments
     lors de la cr&eacute;ation de syst&egrave;mes de fichiers par &man.newfs.8; sont 
     respectivement de 16384 bytes et 2048 bytes (les anciennes valeurs
     &eacute;taient de 8192 bytes et 1024 bytes). Ce changement augmente la performance
@@ -2669,7 +2665,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
     <para>&man.pppd.8; (le programme controlant au niveau noyau PPP) est maintenant
     install&eacute; en mode <literal>4550</literal> et 
-    <username>root</username><literal>:</literal><groupname>dialer</groupname>,
+    <systemitem class="username">root</systemitem><literal>:</literal><systemitem class="groupname">dialer</systemitem>,
     plutot que en mode <literal>4555</literal> (en d'autre termes, cela veut dire
     qu'il n'est plus executable par tout le monde.) Les utilisateurs de &man.pppd.8; 
     doivent donc changer leur configuration de groupes. &merged;</para>
@@ -2699,7 +2695,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
     <para>&man.rdist.1; a &eacute;t&eacute; retir&eacute; du syst&egrave;me de base, mais reste
     disponible dans la collection des Ports sous 
-    <filename role="package">net/44bsd-rdist</filename>.</para>
+    <package>net/44bsd-rdist</package>.</para>
 
     <para>Le &man.resolver.3; de &os; impl&eacute;mente maintenant le support
     EDNS0, qui est n&eacute;cessaire lorsque l'on utilise des serveurs DNS/resolveurs
@@ -2718,9 +2714,9 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     la meme que la route existante. &merged;</para>
 
     <para>&man.route.8; utilise maintenant la syntax 
-    <literal><replaceable>host</replaceable>/<replaceable>bits</replaceable></literal>
+    <literal>host/bits</literal>
     plutot que la syntaxe
-    <literal><replaceable>net</replaceable>/<replaceable>bits</replaceable></literal>
+    <literal>net/bits</literal>
     syntax, pour la compatibilit&eacute; avec &man.netstat.1;. &merged;</para>
 
     <para>&man.route.8; peut maintenant cr&eacute;er des entr&eacute;e ARP 
@@ -2743,7 +2739,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     <para>RSA Security a lib&eacute;r&eacute; les droits sur l'algorithme 
     <application>RSA</application>. Cela permet d'activer par d&eacute;faut
     dans <application>OpenSSL</application> l'algorithme RSA. Cela permet
-    de lib&eacute;rer le port <filename role="package">security/rsaref</filename>
+    de lib&eacute;rer le port <package>security/rsaref</package>
     des d&eacute;pendences des librairies <filename>librsaUSA</filename> et
     <filename>librsaINTL</filename> repectivement pour les r&eacute;sidents am&eacute;ricains
     et non am&eacute;ricains. &merged;</para>
@@ -2937,7 +2933,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 
     <para><application>UUCP</application> a &eacute;t&eacute; retir&eacute; du syst&egrave;me
     de base. Il se trouve maintenant dans la collection des Ports, 
-    dans <filename role="package">net/freebsd-uucp</filename>.</para>
+    dans <package>net/freebsd-uucp</package>.</para>
 
     <para>&man.units.1; a reçu diff&eacute;rentes corrections de bogues 
     et mise &agrave; jour. &merged;</para>
@@ -2960,7 +2956,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
     <para>&man.vidcontrol.1; dispose de l'option <option>-p</option>
     permettant d'obtenir une copie du tampon vid&eacute;o de &man.syscons.4;.
     Ces copies peuvent ensuite etre utilis&eacute;es avec l'utilitaire 
-    <filename role="package">graphics/scr2png</filename> de la collection
+    <package>graphics/scr2png</package> de la collection
     des Ports. &merged;</para>
 
     <para>&man.vidcontrol.1; dispose maintenant de l'option
@@ -3217,15 +3213,15 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 	<para><application>CVSup</application>, un utilitaire fr&eacute;quemment 
 	utilis&eacute; dans la collection des ports de &os;, &eacute;tait 
 	installable pr&eacute;cedemment via plusieurs ports et pacquetages. Les 
-	ports ou pacquetages <filename role="package">net/cvsup-bin</filename> et 
-	<filename role="package">net/cvsupd-bin</filename> ne sont plus 
+	ports ou pacquetages <package>net/cvsup-bin</package> et 
+	<package>net/cvsupd-bin</package> ne sont plus 
 	n&eacute;cessaires ou plus disponibles; il faut utilis&eacute; le port 
-	<filename role="package">net/cvsup</filename> &agrave; la place. 
+	<package>net/cvsup</package> &agrave; la place. 
 	&merged;</para>
 
 	<para><application>CVSup</application> a &eacute;t&eacute; mis &agrave; 
 	jour en version 16.1_3, qui est disponible dans la collection des ports de 
-	&os; sous <filename role="package">net/cvsup</filename>. Cette mise 
+	&os; sous <package>net/cvsup</package>. Cette mise 
 	&agrave; jour fixe le tr&egrave;s vieux bogue (mais rencontr&eacute; que 
 	tr&egrave;s r&eacute;cemment) qui affecte les marquages de temps 
 	apr&egrave;s le dimanche 9 Septembre 2001 01:46:40 UTC 
@@ -3233,7 +3229,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
       </sect4>
 
 
-      <sect4 id="kame-userland">
+      <sect4 xml:id="kame-userland">
         <title>KAME</title>
 	
 	 <para>La couche IPv6 est maintenant bas&eacute;e sur la snapshot
@@ -3259,8 +3255,8 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
         <para>&man.pim6dd.8; et &man.pim6sd.8; ont &eacute;t&eacute; 
 	retir&eacute;s du a des conditions de restrictions de license.  Ces 
 	progrgammes sont disponibles dans la collections des ports sous 
-	<filename role="package">net/pim6dd</filename> et
-        <filename role="package">net/pim6sd</filename>. &merged;</para>
+	<package>net/pim6dd</package> et
+        <package>net/pim6sd</package>. &merged;</para>
 
 	<para>&man.route6d.8; dispose maintenant d'une option 
 	<option>-n</option> permettant d'emp&eacute;cher de mettre &agrave; 
@@ -3269,7 +3265,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 	<para>L'option <option>-R</option> (num&eacute;rotation de router) de 
 	&man.rtadvd.8; est actuellement ignor&eacute;e. &merged;</para>
 
-      <para></para>
+      <para/>
       </sect4>
 
       <sect4>
@@ -3357,7 +3353,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 	<para><application>sendmail</application> a &eacute;t&eacute; mis 
 	&agrave; jour de la version 8.9.3 vers la version 8.12.2. Les 
 	changements importants incluent : &man.sendmail.8; n'est plus 
-	install&eacute; set-user-ID <username>root</username> (mais en 
+	install&eacute; set-user-ID <systemitem class="username">root</systemitem> (mais en 
 	set-group-ID smmsp); un nouveau r&eacute;pertoire où se trouvent les 
 	fichiers par d&eacute;faut (voir 
 	<filename>/usr/src/contrib/sendmail/cf/README</filename>); 
@@ -3368,7 +3364,7 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 	plus d'informations. &merged;</para>
 
 	<para>&man.mail.local.8; n'est plus install&eacute; par d&eacute;faut 
-	set-user-ID  <username>bin</username>. Si vous utilisez un fichier 
+	set-user-ID  <systemitem class="username">bin</systemitem>. Si vous utilisez un fichier 
 	<filename>/etc/mail/sendmail.cf</filename> de la configuration par 
 	d&eacute;faut <filename>sendmail.cf</filename> inclue avec &os; d'une 
 	version sup&eacute;rieure &agrave; 3.1.0, tout va bien. Si vous 
@@ -3415,22 +3411,22 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
 	  d&eacute;marrer ou relancer  <application>sendmail</application>. 
 	  &merged;</para>
 
-	<para>Les utilisateurs <username>smmsp</username> et 
-	<username>mailnull</username> ont &eacute;t&eacute; ajout&eacute;s 
+	<para>Les utilisateurs <systemitem class="username">smmsp</systemitem> et 
+	<systemitem class="username">mailnull</systemitem> ont &eacute;t&eacute; ajout&eacute;s 
 	dans <filename>/etc/master.passwd</filename>. En l'absence de valeur 
 	<literal>confDEF_USER_ID</literal>, l'utilisateur 
-	<username>mailnull</username> sera utilis&eacute; par d&eacute;faut 
+	<systemitem class="username">mailnull</systemitem> sera utilis&eacute; par d&eacute;faut 
 	pour augmenter le niveau de s&eacute;curit&eacute;. 
 	Pr&eacute;c&eacute;demment, si l'utilisateur 
-	<username>mailnull</username> &eacute;tait inexistant, l'utilisateur 
-	<username>daemon</username> &eacute;tait utilis&eacute;. Cette 
+	<systemitem class="username">mailnull</systemitem> &eacute;tait inexistant, l'utilisateur 
+	<systemitem class="username">daemon</systemitem> &eacute;tait utilis&eacute;. Cette 
 	modification peut g&eacute;n&eacute;rer des probl&egrave;mes de 
 	droits lors de l'envoi de courrier a des programmes (comme pour 
-	<filename role="package">mail/majordomo</filename>).&merged; 
+	<package>mail/majordomo</package>).&merged; 
 	L'ancienne  fonctionnalit&eacute; peut &ecirc;tre 
 	r&eacute;activ&eacute;e en ajoutant la ligne 
 	<programlisting>define(`confDEF_USER_ID', `daemon')</programlisting> 
-	aux fichiers <filename><replaceable>*</replaceable>.mc</filename> de 
+	aux fichiers <filename>*.mc</filename> de 
 	configuration.</para>
       </sect4>
 
@@ -3575,9 +3571,9 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
         <para>Enfin, si vous d&eacute;sirez utiliser un des moyens de suivre
         les branches -STABLE ou -CURRENT de &os;, veuillez
         consulter la section 
-       <ulink url="http://www.FreeBSD.org/handbook/current-stable.html"><quote>-CURRENT
-       vs. -STABLE</quote></ulink>  <ulink url="http://www.FreeBSD.org/handbook/">du manuel 
-       de r&eacute;f&eacute;rence de FreeBSD</ulink>.
+       <link xlink:href="http://www.FreeBSD.org/handbook/current-stable.html"><quote>-CURRENT
+       vs. -STABLE</quote></link>  <link xlink:href="http://www.FreeBSD.org/handbook/">du manuel 
+       de r&eacute;f&eacute;rence de FreeBSD</link>.
        </para>
 
         <important>
@@ -3588,4 +3584,3 @@ sont pr&eacute;sentes sur <ulink url="&release.url;"></ulink>.</para>
         </important>
 
 </sect1>
-
diff --git a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
index ca1297f2881..56890274184 100644
--- a/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
+++ b/release/doc/fr_FR.ISO8859-1/relnotes/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent"> %sections;
@@ -10,7 +10,6 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "IA-32">
 ]>
-
 <!--
      The FreeBSD Documentation Project
      The FreeBSD French Documentation Project
@@ -19,7 +18,6 @@
      $FreeBSD$
      Original revision: 1.3
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/errata/article.xml b/release/doc/ja_JP.eucJP/errata/article.xml
index 75f334fed7c..83409339f3b 100644
--- a/release/doc/ja_JP.eucJP/errata/article.xml
+++ b/release/doc/ja_JP.eucJP/errata/article.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY release.bugfix "5.2.1-RELEASE">
 ]>
-
 <!--
     FreeBSD Japanese Documentation Project
 
     $FreeBSD$
     Original revision: 1.73
 -->
-
 <!--
 	FreeBSD errata document.  Unlike some of the other RELNOTESng
 	files, this file should remain as a single SGML file, so that
@@ -24,13 +22,12 @@
 	not be the one that received the last change in the document.)
 
 -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>&os; &release; Errata</title>
 
-<article>
-  <articleinfo>
+    
 
-    <title>&os; &release; Errata</title>
-
-    <corpauthor>&os; ¥×¥í¥¸¥§¥¯¥È</corpauthor>
+    <author><orgname>&os; ¥×¥í¥¸¥§¥¯¥È</orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -44,13 +41,12 @@
       <holder role="mailto:doc@FreeBSD.org">&os; ¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó¥×¥í¥¸¥§¥¯¥È</holder>
     </copyright>
 
-    <legalnotice id="trademarks" role="trademarks">
+    <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.intel;
       &tm-attrib.sparc;
       &tm-attrib.general;
     </legalnotice>
-  </articleinfo>
 
   <abstract>
 
@@ -76,8 +72,9 @@
       (ÅöÁ³¤Ê¤¬¤é¡¢¤³¤ÎÃí°Õ½ñ¤­¤Ï¾¤Î¥Ö¥é¥ó¥Á¤Ë¤¢¤ë errata
       ʸ½ñ¤Ë¤Ï¸ºß¤·¤Þ¤»¤ó)¡£</para>
   </abstract>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>¤Ï¤¸¤á¤Ë</title>
 
     <para>¤³¤Î errata ʸ½ñ¤Ë¤Ï &os; &release;
@@ -94,7 +91,7 @@
       ¥¤¥ó¥¿¡¼¥Í¥Ã¥È¾å¤ËÃÖ¤«¤ì¤Æ¤¤¤ë
       ¤³¤Î¥ê¥ê¡¼¥¹¤ËÂбþ¤·¤¿ <quote>errata ʸ½ñ¤ÎºÇ¿·ÈÇ</quote>
       ¤ò»²¾È¤¹¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£
-      errata ʸ½ñ¤Ï <ulink url="http://www.FreeBSD.org/releases/"></ulink>
+      errata ʸ½ñ¤Ï <uri xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>
       ¤ò¤Ï¤¸¤á¡¢ºÇ¿·¤Î¾õÂÖ¤ò°Ý»ý¤·¤Æ¤¤¤ë³Æ¥ß¥é¡¼¥µ¥¤¥È¤ËÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>&os; &release.branch; ¤Î¥½¡¼¥¹¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¡¢
@@ -103,13 +100,13 @@
       errata ʸ½ñ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>&os; CERT ¥»¥­¥å¥ê¥Æ¥£´«¹ð¤ÎÁ´¥ê¥¹¥È¤Ï¡¢
-      <ulink url="http://www.FreeBSD.org/security/"></ulink>
+      <uri xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri>
       ¤â¤·¤¯¤Ï
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink>
+      <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</uri>
       ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
   </sect1>
 
-  <sect1 id="security">
+  <sect1 xml:id="security">
     <title>¥»¥­¥å¥ê¥Æ¥£´«¹ð</title>
 
     <para releasetype="release">¥»¥­¥å¥ê¥Æ¥£´«¹ð¤Ïȯ¹Ô¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£</para>
@@ -120,7 +117,7 @@
 
   </sect1>
 
-  <sect1 id="open-issues">
+  <sect1 xml:id="open-issues">
     <title>̤²ò·è¤ÎÌäÂê</title>
 
     <para releasetype="release">̤²ò·è¤ÎÌäÂê¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
@@ -130,7 +127,7 @@
     <para releasetype="snapshot">̤²ò·è¤ÎÌäÂê¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
   </sect1>
 
-  <sect1 id="late-news">
+  <sect1 xml:id="late-news">
     <title>ºÇ¿·¾ðÊó</title>
 
     <para releasetype="release">¾ðÊó¤Ï¤¢¤ê¤Þ¤»¤ó¡£</para>
diff --git a/release/doc/ja_JP.eucJP/hardware/alpha/article.xml b/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
index 8ef0b4cf94d..66e82e5cbd8 100644
--- a/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 
@@ -15,13 +15,11 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
     $FreeBSD$
     Original revision: 1.6
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   &sect.intro;
 <!--  &sect.proc.alpha; -->
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/article.xml b/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
index 8f7910c69d0..7b963dac55a 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
@@ -14,11 +14,9 @@
 <!ENTITY arch "amd64">
 <!ENTITY arch.print "AMD64">
 ]>
-
 <!-- $FreeBSD$ -->
 <!-- Original revision: 1.3 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   &sect.intro;
   &sect.proc.amd64;
diff --git a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
index 6f20cbea214..bdc660a7606 100644
--- a/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
+++ b/release/doc/ja_JP.eucJP/hardware/amd64/proc-amd64.xml
@@ -3,8 +3,7 @@
     $FreeBSD$
     Original revision: 1.5
 -->
-
-<sect1 id="proc">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="proc">
   <title>Âбþ¥×¥í¥»¥Ã¥µ¤ª¤è¤Ó¥Þ¥¶¡¼¥Ü¡¼¥É</title>
 
   <para>&os;/&arch; ¤Ï 2003 ǯ¤ÎȾ¤Ð¤ËÃÂÀ¸¤·¤¿¤â¤Î¤Ç¡¢&arch.print;
diff --git a/release/doc/ja_JP.eucJP/hardware/common/artheader.xml b/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
index b49250dcc49..a6253c54c1b 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
+++ b/release/doc/ja_JP.eucJP/hardware/common/artheader.xml
@@ -3,11 +3,10 @@
     $FreeBSD$
     Original revision: 1.7
 -->
+<info xmlns="http://docbook.org/ns/docbook"><title>&os;/&arch; &release.current; ¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</title>
+  
 
-<articleinfo>
-  <title>&os;/&arch; &release.current; ¥Ï¡¼¥É¥¦¥§¥¢¥Î¡¼¥È</title>
-
-  <corpauthor>The &os; Documentation Project</corpauthor>
+  <author><orgname>The &os; Documentation Project</orgname></author>
 
   <copyright>
     <year>2000</year>
@@ -18,4 +17,12 @@
     <year>2005</year>
     <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
-</articleinfo>
+
+  <abstract>
+    <para>¤³¤ì¤Ï¤Þ¤À½àÈ÷Ãæ¤Îʸ½ñ¤Ç¤¹¡£
+      ̤´°À®¤Ç¤¢¤ë¤¿¤á¡¢ÆâÍƤòÄɵ­¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
+      &os; ¤ÇÆ°ºî¤¹¤ë
+      &arch.print; ¥×¥í¥»¥Ã¥µ¡¢¥Þ¥¶¡¼¥Ü¡¼¥É¡¢¥Ç¥Ð¥¤¥¹¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤ò
+      &a.ia64; ¤ØÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤!</para>
+  </abstract>
+</info>
diff --git a/release/doc/ja_JP.eucJP/hardware/common/dev.xml b/release/doc/ja_JP.eucJP/hardware/common/dev.xml
index 324c2fa8a14..4ff6428b093 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/dev.xml
+++ b/release/doc/ja_JP.eucJP/hardware/common/dev.xml
@@ -30,13 +30,12 @@
         $FreeBSD$
         Original revision: 1.282
 -->
-
-<sect1 id="support">
-  <sect1info>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support">
+  <info><title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
     <pubdate>$FreeBSD$</pubdate>
-  </sect1info>
+  </info>
 
-  <title>Âбþ¥Ï¡¼¥É¥¦¥§¥¢</title>
+  
 
   <para>¤³¤ÎÀá¤Ë¤Ï¡¢¸½ºß &arch.print; ÈÇ &os;
     ¤ÇÆ°ºî¤¬³Îǧ¤µ¤ì¤Æ¤¤¤ëµ¡´ï¤¬¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£
@@ -58,7 +57,7 @@
       ¤½¤Î¥Ç¥Ð¥¤¥¹¤¬Ê£¿ô²ó¡¢½ÅÊ£¤·¤Æ¥ê¥¹¥È¤ËÅо줷¤Þ¤¹¡£</para>
   </note>
   
-  <sect2 id="disk">
+  <sect2 xml:id="disk">
     <title>¥Ç¥£¥¹¥¯¥³¥ó¥È¥í¡¼¥é</title>
 
     <para arch="i386,alpha,sparc64,ia64,pc98,amd64">IDE/ATA ¥³¥ó¥È¥í¡¼¥é
@@ -174,7 +173,7 @@
       CD-ROM ¥³¥Þ¥ó¥É¤ËÂбþ¤·¤Æ¤¤¤ë WORM ¥Ç¥Ð¥¤¥¹¤ÎÆɤ߹þ¤ßÀìÍѤΥ¢¥¯¥»¥¹¤Ï
       (&man.cd.4; ¤Î¤è¤¦¤Ê) CD-ROM ¥É¥é¥¤¥Ð¤¬Âбþ¤·¤Æ¤ª¤ê¡¢
       WORM/CD-R/CD-RW ¤Î½ñ¤­¹þ¤ß¤Ï¡¢Ports Collection ¤Ë¤¢¤ë
-      <filename role="package">sysutils/cdrtools</filename> ¤È¤¤¤¦ port
+      <package>sysutils/cdrtools</package> ¤È¤¤¤¦ port
       ¤Ë´Þ¤Þ¤ì¤ë &man.cdrecord.1; ¤¬Âбþ¤·¤Æ¤¤¤Þ¤¹¡£</para>
 
     <para>¸½»þÅÀ¤Ç¡¢°Ê²¼¤Î CD-ROM ·¿¥·¥¹¥Æ¥à¤ËÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
@@ -209,7 +208,7 @@
     </para>
 
   </sect2>
-  <sect2 id="ethernet">
+  <sect2 xml:id="ethernet">
     <title>Ethernet ¥¤¥ó¥¿¥Õ¥§¡¼¥¹</title>
 
     &hwlist.sf;
@@ -305,13 +304,13 @@
 
   </sect2>
 
-  <sect2 id="fddi">
+  <sect2 xml:id="fddi">
     <title>FDDI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹</title>
     <para arch="i386,pc98,alpha">DEC DEFPA PCI (&man.fpa.4; ¥É¥é¥¤¥Ð)</para>
     <para arch="i386">DEC DEFEA EISA (&man.fpa.4; ¥É¥é¥¤¥Ð)</para>
   </sect2>
 
-  <sect2 id="atm">
+  <sect2 xml:id="atm">
     <title>ATM ¥¤¥ó¥¿¥Õ¥§¡¼¥¹</title>
 
     <para arch="i386,pc98">Midway ¥Ù¡¼¥¹¤Î ATM ¥¤¥ó¥¿¥Õ¥§¡¼¥¹ (&man.en.4;
@@ -330,7 +329,7 @@
       (&man.patm.4; ¥É¥é¥¤¥Ð)</para>
   </sect2>
 
-  <sect2 id="wlan">
+  <sect2 xml:id="wlan">
     <title>̵Àþ¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¥Õ¥§¡¼¥¹</title>
     
     <para arch="i386">NCR / AT&amp;T / Lucent Technologies WaveLan T1-speed
@@ -350,7 +349,7 @@
     &hwlist.ath;
   </sect2>
 
-  <sect2 id="misc-network">
+  <sect2 xml:id="misc-network">
     <title>¤½¤Î¾¤Î¥Í¥Ã¥È¥ï¡¼¥¯µ¡´ï</title>
 
     &hwlist.cx;
@@ -369,7 +368,7 @@
 
   </sect2>
 
-  <sect2 id="isdn">
+  <sect2 xml:id="isdn">
     <title>ISDN ¥¤¥ó¥¿¥Õ¥§¡¼¥¹</title>
     <para arch="i386">AcerISDN P10 ISA PnP (¼Â¸³Ãʳ¬)</para>
     <para arch="i386">Asuscom ISDNlink 128K ISA</para>
@@ -463,7 +462,7 @@
     <para arch="i386">Winbond W6692 ¥Ù¡¼¥¹¤Î PCI ¥«¡¼¥É</para>
   </sect2>
 
-  <sect2 id="serial">
+  <sect2 xml:id="serial">
     <title>¥·¥ê¥¢¥ë¥¤¥ó¥¿¥Õ¥§¡¼¥¹</title>
     <para arch="i386,alpha,ia64,amd64"><quote>PC ¤Ëɸ½à¤ÇÅëºÜ¤µ¤ì¤Æ¤¤¤ë</quote>
       8250, 16450, 16550 ¥Ù¡¼¥¹¤Î¥·¥ê¥¢¥ë¥Ý¡¼¥È (&man.sio.4; ¥É¥é¥¤¥Ð)</para>
@@ -656,7 +655,7 @@
 
   </sect2>
 
-  <sect2 id="sound">
+  <sect2 xml:id="sound">
     <title>¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹</title>
 
     &hwlist.snd.ad1816;
@@ -728,7 +727,7 @@
     </para>
   </sect2>
 
-  <sect2 id="camera">
+  <sect2 xml:id="camera">
     <title>¥«¥á¥é¤ª¤è¤Ó¥Ó¥Ç¥ª¥­¥ã¥×¥Á¥ã¥Ç¥Ð¥¤¥¹</title>
 
     &hwlist.bktr;
@@ -736,7 +735,7 @@
     <para arch="i386">Connectix QuickCam</para>
   </sect2>
 
-  <sect2 id="usb">
+  <sect2 xml:id="usb">
     <title>USB ¥Ç¥Ð¥¤¥¹</title>
 
     <para arch="alpha,i386,pc98,amd64">¤³¤ÎÀá¤Ç¤Ï¡¢Âбþ¤·¤Æ¤¤¤ë¤¤¤¯¤Ä¤«¤Î¼ïÎà¤Î USB ¼þÊÕµ¡´ï¤Î¤¦¤Á¡¢
@@ -753,8 +752,7 @@
     </note>
 
     <note arch="alpha,i386,pc98,amd64">
-      <para>USB Bluetooth ¥¢¥À¥×¥¿¤Ï <link
-      linkend="bluetooth">Bluetooth</link> ¤ÎÀá¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
+      <para>USB Bluetooth ¥¢¥À¥×¥¿¤Ï <link linkend="bluetooth">Bluetooth</link> ¤ÎÀá¤Ë¤Þ¤È¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£</para>
     </note>
 
     &hwlist.ohci;
@@ -814,7 +812,7 @@
 
  </sect2>
 
-  <sect2 id="firewire">
+  <sect2 xml:id="firewire">
     <title>IEEE 1394 (FireWire) ¥Ç¥Ð¥¤¥¹</title>
 
     &hwlist.fwohci;
@@ -823,7 +821,7 @@
       ¥¹¥È¥ì¡¼¥¸¥Ç¥Ð¥¤¥¹ (&man.sbp.4; ¥É¥é¥¤¥Ð)</para>
   </sect2>
 
-  <sect2 id="bluetooth">
+  <sect2 xml:id="bluetooth">
     <title>Bluetooth ¥Ç¥Ð¥¤¥¹</title>
 
     &hwlist.ng.bt3c;
@@ -832,7 +830,7 @@
  
    </sect2>
 
-  <sect2 id="crypto-accel">
+  <sect2 xml:id="crypto-accel">
     <title>°Å¹æ½èÍý¥¢¥¯¥»¥é¥ì¡¼¥¿</title>
 
     &hwlist.hifn;
@@ -843,7 +841,7 @@
 
   </sect2>
 
-  <sect2 id="misc">
+  <sect2 xml:id="misc">
     <title>¤½¤Î¾¤Î¥Ç¥Ð¥¤¥¹</title>
 
     <para arch="i386,pc98,amd64">FAX ¥â¥Ç¥à/PCCARD
@@ -864,8 +862,7 @@
 
       <note>
         <para>ÆÃÄê¤Î¥Ó¥Ç¥ª¥«¡¼¥É¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤È
-          <application>Xorg</application> ¤È¤Î¸ß´¹À­¤Ï <ulink
-            url="http://www.x.org/"></ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+          <application>Xorg</application> ¤È¤Î¸ß´¹À­¤Ï <uri xlink:href="http://www.x.org/">http://www.x.org/</uri> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
       </note>
     </para>
 
@@ -907,7 +904,7 @@
        <para>&os; ¤Ç¥Ý¥¤¥ó¥Æ¥£¥ó¥°¥Ç¥Ð¥¤¥¹¤òÍøÍѤ¹¤ëºÝ¤Î¾Ü¤·¤¤¾ðÊó¤Ï
          ¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸ &man.moused.8; ¤Ëµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
          <application>Xorg</application> ¤ÇÍøÍѤ¹¤ëºÝ¤Î¾ðÊó¤Ï
-         <ulink url="http://www.x.org/"></ulink> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+         <uri xlink:href="http://www.x.org/">http://www.x.org/</uri> ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
       </note>
 
     </para>
@@ -937,7 +934,7 @@
       </itemizedlist>
     </para>
 
-    <para arch="i386"><ulink url="http://www.vcc.com/">Virtual Computers</ulink> À½ HOT1 ¤È¸ß´¹À­¤Î¤¢¤ë
+    <para arch="i386"><link xlink:href="http://www.vcc.com/">Virtual Computers</link> À½ HOT1 ¤È¸ß´¹À­¤Î¤¢¤ë
       Xilinx XC6200 ¥Ù¡¼¥¹¤ÎºÆ¹½À®²Äǽ¥Ï¡¼¥É¥¦¥§¥¢¥«¡¼¥É
       (xrpu ¥É¥é¥¤¥Ð).</para>
 
diff --git a/release/doc/ja_JP.eucJP/hardware/common/intro.xml b/release/doc/ja_JP.eucJP/hardware/common/intro.xml
index 21b066a5eb7..d74d1621c1c 100644
--- a/release/doc/ja_JP.eucJP/hardware/common/intro.xml
+++ b/release/doc/ja_JP.eucJP/hardware/common/intro.xml
@@ -3,8 +3,7 @@
     $FreeBSD$
     Original revision: 1.7
 -->
-
-<sect1 id="intro">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="intro">
   <title>¤Ï¤¸¤á¤Ë</title>
 
   <para>¤³¤Îʸ½ñ¤Ï &arch.print; ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈÇ &os; &release.current;
@@ -22,7 +21,7 @@
   </note>
 
   <para arch="ia64">&os;/&arch; ¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤Ï
-    <ulink url="&url.base;/platforms/ia64/index.html">&os;/&arch;
-      ¥×¥í¥¸¥§¥¯¥È</ulink>¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
+    <link xlink:href="&url.base;/platforms/ia64/index.html">&os;/&arch;
+      ¥×¥í¥¸¥§¥¯¥È</link>¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
 
 </sect1>
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/article.xml b/release/doc/ja_JP.eucJP/hardware/i386/article.xml
index 708d52cef27..1e82ad4a9ef 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
@@ -14,13 +14,11 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
 ]>
-
 <!--
     $FreeBSD$
     Original revision: 1.6
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   &sect.intro;
   &sect.proc.i386;
diff --git a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
index 1c3570c86a8..a5201781ab3 100644
--- a/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
+++ b/release/doc/ja_JP.eucJP/hardware/i386/proc-i386.xml
@@ -3,8 +3,7 @@
     $FreeBSD$
     Original revision: 1.14
 -->
-
-<sect1 id="proc">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="proc">
   <title>Âбþ¥×¥í¥»¥Ã¥µ¤ª¤è¤Ó¥Þ¥¶¡¼¥Ü¡¼¥É</title>
 
   <para>&os;/i386 ¤Ï¡¢¤µ¤Þ¤¶¤Þ¤Ê <quote>IBM PC ¸ß´¹µ¡</quote>¾å¤ÇÆ°ºî¤·¤Þ¤¹¡£
@@ -92,9 +91,9 @@
     DSDT (Differentiated System Descriptor Table) ¤Ë°Í¸¤·¤Æ¤¤¤Þ¤¹¡£
     ¤¤¤¯¤Ä¤«¤Î¥Þ¥·¥ó¤Ç¤Ï DSDT ¼«ÂΤ¬°­±Æ¶Á¤òµÚ¤Ü¤·¤¿¤êÉÔ½½Ê¬¤Ç¤¢¤ë¤¿¤á¡¢
     ¤½¤Î·ë²Ì ACPI ¤¬Àµ¾ï¤Ëµ¡Ç½¤¹¤ë¤Î¤¬Ë¸¤²¤é¤ì¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
-    <ulink url="http://acpi.sourceforge.net/">ACPI4Linux</ulink>
+    <link xlink:href="http://acpi.sourceforge.net/">ACPI4Linux</link>
     ¥×¥í¥¸¥§¥¯¥È¤Î¥¦¥§¥Ö¥µ¥¤¥È¤Î
-    <ulink url="http://acpi.sourceforge.net/dsdt/index.php">DSDT</ulink>
+    <link xlink:href="http://acpi.sourceforge.net/dsdt/index.php">DSDT</link>
     ¥»¥¯¥·¥ç¥ó¤ËÂåÂØ DSDT ¤¬¸«¤Ä¤«¤ë¤Ç¤·¤ç¤¦¡£
     &os; ¤Ï¤³¤Î DSDT ¤òÍøÍѤ·¤Æ
     BIOS ¤¬Ä󶡤¹¤ë DSDT ¤ò¾å½ñ¤­¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/article.xml b/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
index 8c6f4fca811..a82eb7d9508 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
@@ -14,23 +14,12 @@
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
 ]>
-
 <!--
     $FreeBSD$
     Original revision: 1.5
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
-
-  <abstract>
-    <para>¤³¤ì¤Ï¤Þ¤À½àÈ÷Ãæ¤Îʸ½ñ¤Ç¤¹¡£
-      ̤´°À®¤Ç¤¢¤ë¤¿¤á¡¢ÆâÍƤòÄɵ­¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
-      &os; ¤ÇÆ°ºî¤¹¤ë
-      &arch.print; ¥×¥í¥»¥Ã¥µ¡¢¥Þ¥¶¡¼¥Ü¡¼¥É¡¢¥Ç¥Ð¥¤¥¹¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤ò
-      &a.ia64; ¤ØÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤!</para>
-  </abstract>
-
   &sect.intro;
   &sect.proc.ia64;
   &sect.dev;
diff --git a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
index d605c70dbb7..f05d201a69d 100644
--- a/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
+++ b/release/doc/ja_JP.eucJP/hardware/ia64/proc-ia64.xml
@@ -3,18 +3,18 @@
     $FreeBSD$
     Original revision: 1.9
 -->
-<sect1 id="proc-ia64">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="proc-ia64">
   <title>Âбþ¥×¥í¥»¥Ã¥µ¤ª¤è¤Ó¥Þ¥¶¡¼¥Ü¡¼¥É</title>
 
   <para>¸½ºßÂбþ¤·¤Æ¤¤¤ë¥×¥í¥»¥Ã¥µ¤Ï
-    <ulink url="http://www.intel.com/design/itanium/itanium/index.htm">Itanium</ulink>
-    ¤È <ulink url="http://www.intel.com/design/itanium2/index.htm">Itanium 2</ulink> ¤Ç¤¹¡£</para>
+    <link xlink:href="http://www.intel.com/design/itanium/itanium/index.htm">Itanium</link>
+    ¤È <link xlink:href="http://www.intel.com/design/itanium2/index.htm">Itanium 2</link> ¤Ç¤¹¡£</para>
 
   <para>Âбþ¤·¤Æ¤¤¤ë¥Á¥Ã¥×¥»¥Ã¥È¤Ï°Ê²¼¤Î¤È¤ª¤ê¤Ç¤¹¡£</para>
    <itemizedlist>
      <listitem>
        <para>HP zx1 (³«È¯¥Ö¥é¥ó¥Á¤Ç¤Î¤ßÂбþ¤·¤Æ¤¤¤Þ¤¹¡£
-         <ulink url="http://perforce.FreeBSD.org/">Perforce ¥ì¥Ý¥¸¥È¥ê</ulink>
+         <link xlink:href="http://perforce.FreeBSD.org/">Perforce ¥ì¥Ý¥¸¥È¥ê</link>
          ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£)</para>
      </listitem>
      <listitem>
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/article.xml b/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
index 188fa76c480..63fe7e0f8e6 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
@@ -14,13 +14,11 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
 <!--
     $FreeBSD$
     Original revision: 1.3
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   &sect.intro;
   &sect.proc.pc98;
diff --git a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
index b376f6041d7..6894a6c468a 100644
--- a/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
+++ b/release/doc/ja_JP.eucJP/hardware/pc98/proc-pc98.xml
@@ -3,7 +3,7 @@
     $FreeBSD$
     Original revision: 1.5
 -->
-<sect1 id="support-sys">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support-sys">
   <title>Âбþ¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à</title>
 
   <para>80486, Pentium, Pentium Pro, Pentium II ¤ò¤Ï¤¸¤á¤È¤¹¤ë
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml b/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
index c3557359c2f..62e63b83f3b 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ja PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" "devauto.ja.ent">
@@ -14,13 +14,11 @@
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
 ]>
-
 <!--
     $FreeBSD$
     Original revision: 1.5
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &artheader;
   &sect.intro;
   &sect.proc.sparc64;
diff --git a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
index 4e599af0495..f5877a2fdb1 100644
--- a/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/ja_JP.eucJP/hardware/sparc64/proc-sparc64.xml
@@ -3,13 +3,13 @@
     $FreeBSD$
     Original revision: 1.12
 -->
-<sect1 id="support-sys">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support-sys">
   <title>Âбþ¥·¥¹¥Æ¥à</title>
 
   <para>¤³¤ÎÀá¤Ë¤Ï¡¢&arch.print; ¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÈÇ &os;
     ¤Ç¡¢¸½ºßÆ°ºî¤¹¤ë¤³¤È¤¬³Îǧ¤µ¤ì¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
     ¥Ï¡¼¥É¥¦¥§¥¢¹½À®¤ÎͽÈ÷Ãμ±¤Ë¤Ä¤¤¤Æ¤Ï
-    <ulink url="http://sunsolve.sun.com/handbook_pub/">Sun System Handbook</ulink>
+    <link xlink:href="http://sunsolve.sun.com/handbook_pub/">Sun System Handbook</link>
     ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
   <para>Ê£¿ô¤Î¥×¥í¥»¥Ã¥µ¤òÅëºÜ¤·¤¿¤¹¤Ù¤Æ¤Î¥·¥¹¥Æ¥à¤Ë¤ª¤±¤ë
diff --git a/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml b/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
index e4592cf3907..8625784e9aa 100644
--- a/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
     FreeBSD Japanese Documentation Project
 
@@ -19,7 +18,6 @@
 
     Original revision: 1.6
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml b/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
index 4439825e8fc..06392495c2e 100644
--- a/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/amd64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 
@@ -12,12 +12,10 @@
 <!ENTITY arch "amd64">
 <!ENTITY arch.print "AMD64">
 ]>
-
 <!--
     $FreeBSD$
     Original revision: 1.4
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/common/new.xml b/release/doc/ja_JP.eucJP/relnotes/common/new.xml
index 3637367b398..0f81847c779 100644
--- a/release/doc/ja_JP.eucJP/relnotes/common/new.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/common/new.xml
@@ -6,11 +6,16 @@
 
     Original revision: 1.663.2.5
 -->
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-parent-document: ("../i386/article.xml" "article" "articleinfo")
+     End:
+-->
+<info xmlns="http://docbook.org/ns/docbook"><title>&os;/&arch; &release.current; ¥ê¥ê¡¼¥¹¥Î¡¼¥È</title>
+  
 
-<articleinfo>
-  <title>&os;/&arch; &release.current; ¥ê¥ê¡¼¥¹¥Î¡¼¥È</title>
-
-  <corpauthor>FreeBSD ¥×¥í¥¸¥§¥¯¥È</corpauthor>
+  <author><orgname>FreeBSD ¥×¥í¥¸¥§¥¯¥È</orgname></author>
 
   <pubdate>$FreeBSD$</pubdate>
 
@@ -32,9 +37,9 @@
       Á°¤Î¥ê¥ê¡¼¥¹°Ê¹ß¤Ëȯ¹Ô¤µ¤ì¤¿¥»¥­¥å¥ê¥Æ¥£´«¹ð¤¬½ñ¤«¤ì¤Æ¤¤¤Þ¤¹¡£
       ¤Þ¤¿¡¢¥¢¥Ã¥×¥°¥ì¡¼¥É¤ÎºÝ¤ÎÃí°ÕÅÀ¤âºÜ¤»¤Æ¤¢¤ê¤Þ¤¹¡£</para>
   </abstract>
-</articleinfo>
+</info>
 
-<sect1 id="intro">
+<sect1 xml:id="intro">
   <title>¤Ï¤¸¤á¤Ë</title>
 
   <para>¤³¤Îʸ½ñ¤Ï &arch.print; ¥Ï¡¼¥É¥¦¥§¥¢¥×¥é¥Ã¥È¥Õ¥©¡¼¥àÍÑ
@@ -46,18 +51,18 @@
     &release.branch; ³«È¯¥Ö¥é¥ó¥Á¤Î &release.prev; ¤«¤é
     ¾­Íè¤Î &release.next; ¤Î´Ö¤Ë°ÌÃÖ¤·¤Þ¤¹¡£
     ¤³¤Î¥Ö¥é¥ó¥Á¤Î¤¢¤é¤«¤¸¤á¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¥Ð¥¤¥Ê¥ê &release.type;
-    ÇÛÉÛʪ¤Ï <ulink url="&release.url;"></ulink> ¤Ë¸ø³«¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+    ÇÛÉÛʪ¤Ï <uri xlink:href="&release.url;">&release.url;</uri> ¤Ë¸ø³«¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
   </para>
 
   <para releasetype="release">¤³¤Î &os; &release.current; ÇÛÉÛʪ¤Ï &release.type; ÇÛÉÛʪ¤Ç¤¹¡£
-    ¤³¤ÎÇÛÉÛʪ¤Ï¤¢¤é¤æ¤ë¥ß¥é¡¼¤Î <ulink url="&release.url;"></ulink>
+    ¤³¤ÎÇÛÉÛʪ¤Ï¤¢¤é¤æ¤ë¥ß¥é¡¼¤Î <uri xlink:href="&release.url;">&release.url;</uri>
     ¤Ç¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
     ¤³¤Î (¤â¤·¤¯¤Ï¾¤Î) &os; ¤Î &release.type; ÇÛÉÛʪ¤ò¼èÆÀ¤¹¤ëÊýË¡
     ¤Ï
-    <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯</ulink>
+    <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/">FreeBSD ¥Ï¥ó¥É¥Ö¥Ã¥¯</link>
     ¤Î
-    <ulink url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors.html">
-      ÉÕÏ¿ <quote>FreeBSD ¤ò¼èÆÀ¤¹¤ë</quote></ulink>
+    <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors.html">
+      ÉÕÏ¿ <quote>FreeBSD ¤ò¼èÆÀ¤¹¤ë</quote></link>
     ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£</para>
 
   <para>&os; &release.type; ¤Î &release.branch;
@@ -81,7 +86,7 @@
 
 </sect1>
 
-<sect1 id="new">
+<sect1 xml:id="new">
   <title>¹¹¿·¾ðÊó</title>
 
   <para>¤³¤ÎÀá¤Ç¤Ï
@@ -109,7 +114,7 @@
     ´Æºº¤Ç¸«¤Ä¤«¤Ã¤¿¥»¥­¥å¥ê¥Æ¥£¾å¹¥¤Þ¤·¤¯¤Ê¤¤¥¹¥¿¥¤¥ë¤Ç½ñ¤«¤ì¤¿¥³¡¼¥É¤Î½¤Àµ¡¢
     ¥½¡¼¥¹¥³¡¼¥É¤ÎÀ°Íý¤Ê¤É¤Ç¤¹¡£</para>
 
-  <sect2 id="security">
+  <sect2 xml:id="security">
     <title>¥»¥­¥å¥ê¥Æ¥£´«¹ð</title>
 
     <para>&man.realpath.3; ´Ø¿ô¤Î¼ÂÁõ¤Ë¤¢¤Ã¤¿
@@ -118,7 +123,7 @@
       (¤·¤¿¤¬¤Ã¤Æ¡¢&release.prev; ¤Ë¤Ï±Æ¶Á¤¬¤¢¤ê¤Þ¤»¤ó)
       ¤¬¡¢¥ê¥ê¡¼¥¹Ê¸½ñ¤Ë¤Ïµ­ºÜ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¤Ç¤·¤¿¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:08.realpath.asc">FreeBSD-SA-03:08</ulink>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:08.realpath.asc">FreeBSD-SA-03:08</link>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
@@ -126,7 +131,7 @@
       ¤³¤Î¥Ð¥°¤Ï¡¢¥«¡¼¥Í¥ë¥Ñ¥Ë¥Ã¥¯¤ò°ú¤­µ¯¤³¤·¤¿¤ê¡¢
       ÆÃÄê¤Î¾õ¶·¤Ç¤Ï¥«¡¼¥Í¥ë¥á¥â¥ê¤òÉÔÀµ¤Ë²þÊѤǤ­¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:09.signal.asc">FreeBSD-SA-03:09</ulink>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:09.signal.asc">FreeBSD-SA-03:09</link>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
@@ -134,28 +139,28 @@
       iBCS2 ¥¨¥ß¥å¥ì¡¼¥·¥ç¥ó¥â¥¸¥å¡¼¥ë¤Î¥Ð¥°¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
       ¤Ê¤ª¡¢¤³¤Î¥â¥¸¥å¡¼¥ë¤Ï¥Ç¥Õ¥©¥ë¥È¤Ç¤ÏÍ­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤»¤ó¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:10.ibcs2.asc">FreeBSD-SA-03:10</ulink>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:10.ibcs2.asc">FreeBSD-SA-03:10</link>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
     <para><application>OpenSSH</application> ¤Î¥Ð¥Ã¥Õ¥¡¤ò´ÉÍý¤¹¤ë
       ¥³¡¼¥É¤Ë¤¢¤Ã¤¿¥¯¥é¥Ã¥·¥å¤ò°ú¤­µ¯¤³¤¹²ÄǽÀ­¤¬¤¢¤ë¥Ð¥°¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:12.openssh.asc">FreeBSD-SA-03:12</ulink>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:12.openssh.asc">FreeBSD-SA-03:12</link>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
     <para><application>sendmail</application>
       ¤Î¥Ð¥Ã¥Õ¥¡¥ª¡¼¥Ð¥Õ¥í¡¼ÌäÂ꤬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:13.sendmail.asc">FreeBSD-SA-03:13</ulink>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:13.sendmail.asc">FreeBSD-SA-03:13</link>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
     <para>ARP ¥­¥ã¥Ã¥·¥å¥³¡¼¥É¤Ë¤¢¤Ã¤¿¡¢¥«¡¼¥Í¥ë»ñ¸»¤ò¸Ï³é¤µ¤»¡¢
       ¥·¥¹¥Æ¥à¥Ñ¥Ë¥Ã¥¯¤òȯÀ¸¤µ¤»¤ë²ÄǽÀ­¤¬¤¢¤ë¥Ð¥°¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:14.arp.asc">FreeBSD-SA-03:14</ulink>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:14.arp.asc">FreeBSD-SA-03:14</link>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
@@ -163,14 +168,14 @@
       PAM ¥Á¥ã¥ì¥ó¥¸/¥ì¥¹¥Ý¥ó¥¹Ç§¾Ú¥µ¥Ö¥·¥¹¥Æ¥à¤Ë¤¢¤Ã¤¿¤¤¤¯¤Ä¤«¤Î¸í¤ê¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
       ¤³¤ì¤é¤Î¥Ð¥°¤Î±Æ¶Á¤Ë¤Ï¡¢¤µ¤Þ¤¶¤Þ¤Ê¤â¤Î¤¬Â¸ºß¤·¤Þ¤¹¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:15.openssh.asc">FreeBSD-SA-03:15</ulink>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:15.openssh.asc">FreeBSD-SA-03:15</link>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
     <para>¥«¡¼¥Í¥ë¥á¥â¥ê¤ÎÆâÍƤ¬Ï³±Ì¤¹¤ë²ÄǽÀ­¤¬¤¢¤ë
       &man.procfs.5; ¤È &man.linprocfs.5; ¤Î¥Ð¥°¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:17.procfs.asc">FreeBSD-SA-03:17</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:17.procfs.asc">FreeBSD-SA-03:17</link>.
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
@@ -180,19 +185,19 @@
       ¤òÍøÍѤ¹¤ë¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ò¥¯¥é¥Ã¥·¥å¤µ¤»¤¿¤ê¡¢
       ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¸¢¸Â¤ÇǤ°Õ¤Î¥³¡¼¥É¤ò¼Â¹Ô¤Ç¤­¤ë²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:18.openssl.asc">FreeBSD-SA-03:18</ulink>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:18.openssl.asc">FreeBSD-SA-03:18</link>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
 
     <para><application>BIND</application>
       ¤Ë¤ª¤¤¤Æ¡¢¥µ¡¼¥Ó¥¹Ë¸³²¤Î²ÄǽÀ­¤¬¤¢¤Ã¤¿¥Ð¥°¤¬½¤Àµ¤µ¤ì¤Þ¤·¤¿¡£
       ¾ÜºÙ¤Ï¥»¥­¥å¥ê¥Æ¥£´«¹ð
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:19.bind.asc">FreeBSD-SA-03:19</ulink>
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-03:19.bind.asc">FreeBSD-SA-03:19</link>
       ¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
       &merged;</para>
   </sect2>
 
-  <sect2 id="kernel">
+  <sect2 xml:id="kernel">
     <title>¥«¡¼¥Í¥ë¤ÎÊѹ¹ÅÀ</title>
 
     <para arch="i386,ia64,amd64">&man.acpi.4; ¥É¥é¥¤¥Ð¤Î CPU
@@ -289,7 +294,7 @@
       ¥³¥ó¥Ñ¥¤¥ë»þ¤Ë»ØÄꤷ¤Æ¤¤¤¿¥¹¥ï¥Ã¥×¥Ç¥Ð¥¤¥¹¿ô¤Î¾å¸Â¤¬¤Ê¤¯¤Ê¤Ã¤¿¤³¤È¡¢
       ¥á¥â¥ê¥ª¡¼¥Ð¥Ø¥Ã¥É¤¬¸º¾¯¤·¤¿¤³¤È¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</para>
 
-    <sect3 id="proc">
+    <sect3 xml:id="proc">
       <title>¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¸ÇÍ­¤Î¥Ï¡¼¥É¥¦¥§¥¢¤ÎÂбþ¾õ¶·</title>
 
       <para arch="i386">³ä¤ê¹þ¤ß·ÐÏ©¤ÎÀ©¸æ¤È SMP Âбþ¤ò²þÎɤ¹¤ë¤¿¤á¡¢
@@ -319,16 +324,16 @@
 	ÌÀ¼¨Åª¤ËÍ­¸ú¤Ë¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤·¤¿)¡£</para>
     </sect3>
 
-    <sect3 id="boot">
+    <sect3 xml:id="boot">
       <title>¥Ö¡¼¥È¥í¡¼¥À¤ÎÊѹ¹</title>
 
-      <para></para>
+      <para/>
 
        <!-- Above this line, order bootloader changes by keyword-->
 
     </sect3>
 
-    <sect3 id="net-if">
+    <sect3 xml:id="net-if">
       <title>¥Í¥Ã¥È¥ï¡¼¥¯¥¤¥ó¥¿¡¼¥Õ¥§¥¤¥¹¤ÎÂбþ¾õ¶·</title>
 
       <para>&man.ath.4; ¤ª¤è¤Ó &man.ath.hal.4; ¥É¥é¥¤¥Ð¤¬¿·¤·¤¯Äɲ䵤ì¤Þ¤·¤¿¡£
@@ -404,7 +409,7 @@
 	&man.wi.4;, &man.sis.4; ¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</para>
     </sect3>
 
-    <sect3 id="net-proto">
+    <sect3 xml:id="net-proto">
       <title>¥Í¥Ã¥È¥ï¡¼¥¯¥×¥í¥È¥³¥ë</title>
 
       <para>IPv4 ¥×¥í¥È¥³¥ë¼ÂÁõ¤Ë¤ª¤±¤ë <literal>ip_flow</literal> µ¡Ç½¤¬¡¢
@@ -526,7 +531,7 @@
 	·Ðϩɽ¤Ë³ÊǼ¤µ¤ì¤Æ¤¤¤¿¡¢Æ±¤¸¤è¤¦¤Ê¾ðÊó¤Ïºï½ü¤µ¤ì¤Þ¤·¤¿¡£</para>
    </sect3>
 
-    <sect3 id="disks">
+    <sect3 xml:id="disks">
       <title>¥Ç¥£¥¹¥¯¡¦µ­²±ÁõÃÖ</title>
 
       <para>&man.amr.4; ¥É¥é¥¤¥Ð¤¬¥¯¥é¥Ã¥·¥å¥À¥ó¥×µ¡¹½¤ËÂбþ¤·¤Þ¤·¤¿¡£&merged;</para>
@@ -571,7 +576,7 @@
 	&merged;</para>
     </sect3>
 
-    <sect3 id="fs">
+    <sect3 xml:id="fs">
       <title>¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à</title>
 
       <para>cd9660¡¢msdosfs¡¢ntfs, udf ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤¬
@@ -608,9 +613,9 @@
         <listitem>
 	  <para>&man.statfs.2; ¤ò»È¤Ã¤Æ¤¤¤ë¥×¥í¥°¥é¥à¤Ï¡¢
 	    ºÆ¹½ÃÛ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ºÆ¹½ÃÛ¤¬É¬ÍפÀ¤ÈȽÌÀ¤·¤Æ¤¤¤ë¤â¤Î¤Ë¤Ï¡¢
-	    <filename role="package">devel/gnomevfs2</filename>,
-	    <filename role="package">mail/postfix</filename>,
-	    <filename role="package">security/cfg</filename>
+	    <package>devel/gnomevfs2</package>,
+	    <package>mail/postfix</package>,
+	    <package>security/cfg</package>
 	    ¤Ê¤É¤¬¤¢¤ê¤Þ¤¹¡£</para>
 	</listitem>
       </itemizedlist>
@@ -621,14 +626,14 @@
 	&man.idmapd.8; ¤Î¥Þ¥Ë¥å¥¢¥ë¥Ú¡¼¥¸¤ò¤´Í÷¤¯¤À¤µ¤¤¡£</para>
     </sect3>
 
-    <sect3 id="mm">
+    <sect3 xml:id="mm">
       <title>¥Þ¥ë¥Á¥á¥Ç¥£¥¢¤Ø¤ÎÂбþ¾õ¶·</title>
 
-      <para></para>
+      <para/>
     </sect3>
   </sect2>
 
-  <sect2 id="userland">
+  <sect2 xml:id="userland">
     <title>¥æ¡¼¥¶¥é¥ó¥É¤ÎÊѹ¹ÅÀ</title>
 
     <para arch="i386,pc98">i386 ÀìÍѤΠa.out
@@ -676,12 +681,12 @@
 
     <para>&man.fsck.ffs.8; ¤ª¤è¤Ó &man.newfs.8; ¤¬¡¢
       ³Æ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ë
-      <groupname>operator</groupname> ¥°¥ë¡¼¥×¤Ç
+      <systemitem class="groupname">operator</systemitem> ¥°¥ë¡¼¥×¤Ç
       <filename>.snap</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
       &man.fsck.ffs.8;, &man.mksnap.ffs.8;, &man.dump.8; ¤Ï¡¢
       ¤½¤ì¤¾¤ì¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ò¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë½ñ¤­¹þ¤ß¤Þ¤¹¡£
       ¤³¤ÎÊѹ¹¤Ï¡¢¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤ÎºîÀ®Ãæ¤Ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Î¥ë¡¼¥È¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î
-      ¥¢¥¯¥»¥¹¤ò¥í¥Ã¥¯¤·¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤¿¤á¡¢¤Þ¤¿¡¢<username>root</username>
+      ¥¢¥¯¥»¥¹¤ò¥í¥Ã¥¯¤·¤Ê¤¤¤è¤¦¤Ë¤¹¤ë¤¿¤á¡¢¤Þ¤¿¡¢<systemitem class="username">root</systemitem>
       °Ê³°¤Î¥æ¡¼¥¶¤¬¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¤òºîÀ®¤Ç¤­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤Î¤â¤Î¤Ç¤¹¡£</para>
 
     <para>&man.ffsinfo.8; ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤¬
@@ -858,7 +863,7 @@
       <filename>/rescue</filename> ¥Ç¥£¥ì¥¯¥È¥ê¤ËÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡£</para>
   </sect2>
 
-  <sect2 id="contrib">
+  <sect2 xml:id="contrib">
     <title>´ó£¥½¥Õ¥È¥¦¥§¥¢</title>
 
     <para><application>ACPI-CA</application> ¥³¡¼¥É¤¬¡¢
@@ -923,20 +928,20 @@
   </sect2>
 
 
-  <sect2 id="ports">
+  <sect2 xml:id="ports">
     <title>Ports/Packages Collection ¥¤¥ó¥Õ¥é¥¹¥È¥é¥¯¥Á¥ã</title>
 
-    <para><makevar>GNU_CONFIGURE</makevar> ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
-      <filename><makevar>WRKDIR</makevar></filename> °Ê²¼¤Ë¤¢¤ë
+    <para><varname>GNU_CONFIGURE</varname> ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢
+      <filename>WRKDIR</filename> °Ê²¼¤Ë¤¢¤ë
       ¤¹¤Ù¤Æ¤Î <filename>config.guess</filename> ¤ª¤è¤Ó
       <filename>config.sub</filename> ¥Õ¥¡¥¤¥ë¤¬¡¢
-      <filename><makevar>PORTSDIR</makevar>/Template</filename>
+      <filename>PORTSDIR/Template</filename>
       ¤Ë¤¢¤ë¤â¤Î¤ÈÃÖ¤­´¹¤¨¤é¤ì¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡£
       ¤³¤ì¤Ï¡¢¸Å¤¤¥Ð¡¼¥¸¥ç¥ó¤Î¥¹¥¯¥ê¥×¥È¤ò´Þ¤à ports ¤¬¡¢ia64 ¤ä amd64
       ¤Ê¤É¤Î¿·¤·¤¤¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç¹½ÃۤǤ­¤ë¤è¤¦¤Ë¤¹¤ë¤¿¤á¤ÎÁ¼Ã֤Ǥ¹¡£</para>
   </sect2>
 
-  <sect2 id="releng">
+  <sect2 xml:id="releng">
     <title>¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢¥ê¥ó¥°¤ÈÅý¹ç</title>
 
     <para arch="alpha,amd64,ia64">¥¤¥ó¥¹¥È¡¼¥ëÍѤΥեí¥Ã¥Ô¥Ç¥£¥¹¥¯¥¤¥á¡¼¥¸¤¬
@@ -951,7 +956,7 @@
       &merged;</para>
   </sect2>
 
-  <sect2 id="doc">
+  <sect2 xml:id="doc">
     <title>¥É¥­¥å¥á¥ó¥Æ¡¼¥·¥ç¥ó</title>
 
     <para>¾ðÊó¤Î½ÅÊ£¤ò¤Ê¤¯¤·¡¢ÆâÍÆ´ÉÍý¤Î¸úΨ²½¤ò¤Ï¤«¤ë¤¿¤á¡¢
@@ -963,7 +968,7 @@
   </sect2>
 </sect1>
 
-<sect1 id="upgrade">
+<sect1 xml:id="upgrade">
   <title>Á°¤Î¥ê¥ê¡¼¥¹¤Î &os; ¤«¤é¤Î¥¢¥Ã¥×¥°¥ì¡¼¥É</title>
 
   <para>¸½Â¸¤¹¤ë &os; ¥·¥¹¥Æ¥à¤«¤é¥¢¥Ã¥×¥°¥ì¡¼¥É¤¹¤ë¥æ¡¼¥¶¤Ï
@@ -984,10 +989,3 @@
       ¥Ð¥Ã¥¯¥¢¥Ã¥×¤·¤Æ¤«¤é¤Î¤ß¹Ô¤¦¤Ù¤­¤Ç¤¹¡£</para>
   </important>
 </sect1>
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-parent-document: ("../i386/article.xml" "article" "articleinfo")
-     End:
--->
diff --git a/release/doc/ja_JP.eucJP/relnotes/i386/article.xml b/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
index 2d083611f1f..c6a1ae6d845 100644
--- a/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 
@@ -12,7 +12,6 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
 ]>
-
 <!--
     FreeBSD Japanese Documentation Project
 
@@ -20,7 +19,6 @@
 
     Original revision: 1.7
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml b/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
index c403e0e262b..9216f771f94 100644
--- a/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/ia64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
 ]>
-
 <!--
     FreeBSD Japanese Documentation Project
 
@@ -19,7 +18,6 @@
 
     Original revision: 1.4
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml b/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
index 047f3049435..a43a770ed2f 100644
--- a/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -11,10 +11,8 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
 <!-- $FreeBSD$ -->
 <!-- Original revision: 1.4 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
index 7c5d0cb8027..3097756ef36 100644
--- a/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
+++ b/release/doc/ja_JP.eucJP/relnotes/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="euc-jp"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -12,7 +12,6 @@
 <!ENTITY arch.print "UltraSPARC">
 <!ENTITY release.url "ftp://ftp.FreeBSD.org/pub/FreeBSD/development/sparc64/">
 ]>
-
 <!--
     FreeBSD Japanese Documentation Project
 
@@ -20,7 +19,6 @@
 
     Original revision: 1.6
 -->
-
-<article>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
   &art;
 </article>
diff --git a/release/doc/ja_JP.eucJP/share/xml/catalog.xml b/release/doc/ja_JP.eucJP/share/xml/catalog.xml
index 5bc1960d3a4..e116f26a5b1 100644
--- a/release/doc/ja_JP.eucJP/share/xml/catalog.xml
+++ b/release/doc/ja_JP.eucJP/share/xml/catalog.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
-        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
 <!-- $FreeBSD$ -->
-
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <public
-        publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//JA"
-        uri="dev-auto-ja.ent"/>
+  <public publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//JA" uri="dev-auto-ja.ent"/>
 </catalog>
diff --git a/release/doc/ru_RU.KOI8-R/errata/article.xml b/release/doc/ru_RU.KOI8-R/errata/article.xml
index 44d41f1fd88..914634324cb 100644
--- a/release/doc/ru_RU.KOI8-R/errata/article.xml
+++ b/release/doc/ru_RU.KOI8-R/errata/article.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY release.bugfix "5.2.1-RELEASE">
 ]>
-
 <!--
    The FreeBSD Russian Documentation Project
 
@@ -14,14 +13,13 @@
 
    Original revision: 1.72
 -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
+  <info><title>óÐÉÓÏË ÐÒÏÂÌÅÍ &os; &release;</title>
+    
 
-<article lang="ru">
-  <articleinfo>
-    <title>óÐÉÓÏË ÐÒÏÂÌÅÍ &os; &release;</title>
-
-    <corpauthor>
+    <author><orgname>
     ðÒÏÅËÔ &os;
-    </corpauthor>
+    </orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -34,13 +32,12 @@
       <holder role="mailto:doc@FreeBSD.org">ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</holder>
     </copyright>
 
-    <legalnotice id="trademarks" role="trademarks">
+    <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.intel;
       &tm-attrib.sparc;
       &tm-attrib.general;
     </legalnotice>
-  </articleinfo>
 
   <abstract>
     <para>÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÎÁÈÏÄÉÔÓÑ ÓÐÉÓÏË ÐÒÏÂÌÅÍ &os; &release;,
@@ -54,8 +51,9 @@
     <para>üÔÏÔ ÓÐÉÓÏË ÐÒÏÂÌÅÍ &os; &release;.
       ÂÕÄÅÔ ÐÏÄÄÅÒÖÉ×ÁÔØÓÑ ÄÏ &os; &release.next;.</para>
   </abstract>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>÷×ÅÄÅÎÉÅ</title>
 
     <para>üÔÏÔ ÄÏËÕÍÅÎÔ ÓÏÄÅÒÖÉÔ ÐÏÓÌÅÄÎÉÅ ÎÏ×ÏÓÔÉ Ï &os; &release;.
@@ -68,21 +66,18 @@
       (ÎÁÐÒÉÍÅÒ, ÎÁ CDROM ÄÉÓÔÒÉÂÕÔÉ×Å), ÕÖÅ ÕÓÔÁÒÅÌÁ ÐÏ ÏÐÒÅÄÅÌÅÎÉÀ,
       ÎÏ ÄÒÕÇÉÅ ËÏÐÉÉ ÏÂÎÏ×ÌÑÀÔÓÑ × ÉÎÔÅÒÎÅÔ É ÉÈ ÎÅÏÂÈÏÄÉÍÏ ÐÒÏÞÅÓÔØ
       ËÁË <quote>ÔÅËÕÝÉÅ ÓÏÏÂÝÅÎÉÑ Ï ÐÒÏÂÌÅÍÁÈ</quote> ÜÔÏÇÏ ÒÅÌÉÚÁ.
-      üÔÉ ËÏÐÉÉ ÎÁÈÏÄÑÔÓÑ ÎÁ <ulink
-      url="http://www.FreeBSD.org/ru/releases/"></ulink> É ÎÁ ÌÀÂÙÈ
+      üÔÉ ËÏÐÉÉ ÎÁÈÏÄÑÔÓÑ ÎÁ <uri xlink:href="http://www.FreeBSD.org/ru/releases/">http://www.FreeBSD.org/ru/releases/</uri> É ÎÁ ÌÀÂÙÈ
       ÓÁÊÔÁÈ, ÐÏÄÄÅÒÖÉ×ÁÀÝÉÈ ÏÂÎÏ×ÌÑÅÍÙÅ ÚÅÒËÁÌÁ ÜÔÏÊ ÓÔÒÁÎÉÃÙ.</para>
 
     <para>óÎÜÐÛÏÔÙ × ÉÓÈÏÄÎÙÈ ÔÅËÓÔÁÈ É ÂÉÎÁÒÎÙÅ ÓÎÜÐÛÏÔÙ &os;
       &release.branch; ÔÁËÖÅ ÓÏÄÅÒÖÁÔ ÏÂÎÏ×ÌÅÎÎÙÅ ËÏÐÉÉ ÜÔÏÇÏ ÄÏËÕÍÅÎÔÁ
       (ÎÁ ×ÒÅÍÑ ÓÏÚÄÁÎÉÑ ÓÎÜÐÛÏÔÁ).</para>
 
-    <para>úÁ ÓÐÉÓËÏÍ ×ÓÅÈ ÓÏÏÂÝÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ &os; CERT ÏÂÒÁÝÁÊÔÅÓØ Ë <ulink
-      url="http://www.FreeBSD.org/ru/security/"></ulink> ÉÌÉ <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink>.</para>
+    <para>úÁ ÓÐÉÓËÏÍ ×ÓÅÈ ÓÏÏÂÝÅÎÉÊ ÂÅÚÏÐÁÓÎÏÓÔÉ &os; CERT ÏÂÒÁÝÁÊÔÅÓØ Ë <uri xlink:href="http://www.FreeBSD.org/ru/security/">http://www.FreeBSD.org/ru/security/</uri> ÉÌÉ <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</uri>.</para>
 
   </sect1>
 
-  <sect1 id="security">
+  <sect1 xml:id="security">
     <title>óÏÏÂÝÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ</title>
 
     <para releasetype="current">îÅÔ ÓÏÏÂÝÅÎÉÊ.</para>
@@ -93,7 +88,7 @@
 
   </sect1>
 
-  <sect1 id="open-issues">
+  <sect1 xml:id="open-issues">
     <title>áËÔÕÁÌØÎÙÅ ÐÒÏÂÌÅÍÙ</title>
 
     <para releasetype="current">îÅÔ ÁËÔÕÁÌØÎÙÈ ÐÒÏÂÌÅÍ.</para>
@@ -104,7 +99,7 @@
 
   </sect1>
 
-  <sect1 id="late-news">
+  <sect1 xml:id="late-news">
     <title>ðÏÓÌÅÄÎÉÅ ÎÏ×ÏÓÔÉ</title>
 
     <para releasetype="current">îÅÔ ÎÏ×ÏÓÔÅÊ.</para>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
index 16913213afc..ce8df72e521 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
@@ -14,7 +14,6 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -23,8 +22,7 @@
 
      Original revision: 1.6
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &artheader;
   &sect.intro;
   &sect.proc.alpha;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
index 68505861f6a..1f93e3b8df0 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
@@ -14,7 +14,6 @@
 <!ENTITY arch "amd64">
 <!ENTITY arch.print "AMD64">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -23,8 +22,7 @@
 
      Original revision: 1.3
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &artheader;
   &sect.intro;
   &sect.proc.amd64;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
index 9e6b349607f..4682726619d 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.xml
@@ -7,8 +7,7 @@
 
      Original revision: 1.5
 -->
-
-<sect1 id="proc">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="proc">
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÐÒÏÃÅÓÓÏÒÙ É ÍÁÔÅÒÉÎÓËÉÅ ÐÌÁÔÙ</title>
 
   <para>îÁÞÉÎÁÑ Ó ÓÅÒÅÄÉÎÙ 2003 &os;/&arch; ÐÏÄÄÅÒÖÉ×ÁÅÔ ÁÒÈÉÔÅËÔÕÒÙ
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
index 4edc33b6fd3..a0f9feed434 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/artheader.xml
@@ -7,11 +7,10 @@
 
      Original revision: 1.7
 -->
+<info xmlns="http://docbook.org/ns/docbook"><title>éÎÆÏÒÍÁÃÉÑ Ï ÏÂÏÒÕÄÏ×ÁÎÉÉ &os;/&arch; &release.current;</title>
+  
 
-<articleinfo>
-  <title>éÎÆÏÒÍÁÃÉÑ Ï ÏÂÏÒÕÄÏ×ÁÎÉÉ &os;/&arch; &release.current;</title>
-
-  <corpauthor>ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</corpauthor>
+  <author><orgname>ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</orgname></author>
 
   <copyright>
     <year>2000</year>
@@ -22,4 +21,12 @@
     <year>2005</year>
     <holder role="mailto:doc@FreeBSD.org">ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</holder>
   </copyright>
-</articleinfo>
+
+<abstract>
+  <para>üÔÁ ÓÔÁÔØÑ ÄÁÅÔ ËÒÁÔËÉÅ ÉÎÓÔÒÕËÃÉÉ ÐÏ ÕÓÔÁÎÏ×ËÅ
+  &os;/&arch; &release.current;, ÏÓÏÂÏÅ ×ÎÉÍÁÎÉÅ ÕÄÅÌÅÎÏ
+  ÐÏÌÕÞÅÎÉÀ ÄÉÓÔÒÉÂÕÔÉ×Á &os;.  ðÒÅÄÓÔÁ×ÌÅÎÙ ÔÁËÖÅ
+  ÏÔÄÅÌØÎÙÅ ÚÁÍÅÔËÉ ÐÏ ÒÅÛÅÎÉÀ ÐÒÏÂÌÅÍ É ÞÁÓÔÏ ÚÁÄÁ×ÁÅÍÙÅ
+  ×ÏÐÒÏÓÙ.</para>
+</abstract>
+</info>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml b/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
index 1580d048926..fa90bae047c 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/dev.xml
@@ -7,7 +7,6 @@
 
      Original revision: 1.282
 -->
-
 <!--
 	The "Supported Devices" section of the release notes.
 	Generally processor-independent, with conditional text
@@ -35,13 +34,12 @@
 	this file to fix "missed" conversions are likely to break the
 	build.
 -->
-
-<sect1 id="support">
-  <sect1info>
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support">
+  <info><title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
     <pubdate>$FreeBSD$</pubdate>
-  </sect1info>
+  </info>
 
-  <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
+  
 
   <para>÷ ÜÔÏÍ ÒÁÚÄÅÌÅ ÏÐÉÓÁÎÙ ÕÓÔÒÏÊÓÔ×Á, ÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ &os; ÎÁ ÐÌÁÔÆÏÒÍÅ
     &arch.print;.  äÒÕÇÉÅ ËÏÎÆÉÇÕÒÁÃÉÉ ÔÁËÖÅ ÍÏÇÕÔ ÒÁÂÏÔÁÔØ, ÏÎÉ ÐÒÏÓÔÏ ÅÝÅ
@@ -62,7 +60,7 @@
       ÐÏÑ×ÌÑÔØÓÑ ÎÅÓËÏÌØËÏ ÒÁÚ.</para>
   </note>
 
-  <sect2 id="disk">
+  <sect2 xml:id="disk">
     <title>ëÏÎÔÒÏÌÌÅÒÙ ÄÉÓËÏ×</title>
 
     <para arch="i386,alpha,sparc64,ia64,pc98,amd64">IDE/ATA ËÏÎÔÒÏÌÌÅÒÙ
@@ -176,7 +174,7 @@
       CD-ROM, ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ Ó ÄÏÓÔÕÐÏÍ ÔÏÌØËÏ ÄÌÑ ÞÔÅÎÉÑ ÐÒÉ×ÏÄÁÍÉ CD-ROM
       (ÔÁËÉÍÉ ËÁË &man.cd.4;).  ðÏÄÄÅÒÖËÁ ÚÁÐÉÓÉ WORM/CD-R/CD-RW
       ÐÒÅÄÏÓÔÁ×ÌÑÅÔÓÑ &man.cdrecord.1;, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÞÁÓÔØÀ ÐÏÒÔÁ
-      <filename role="package">sysutils/cdrtools</filename> ÉÚ ËÏÌÌÅËÃÉÉ
+      <package>sysutils/cdrtools</package> ÉÚ ËÏÌÌÅËÃÉÉ
       ÐÏÒÔÏ×.</para>
 
     <para>îÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÓÌÅÄÕÀÝÉÅ ÓÉÓÔÅÍÙ CD-ROM
@@ -213,7 +211,7 @@
     </para>
 
   </sect2>
-  <sect2 id="ethernet">
+  <sect2 xml:id="ethernet">
     <title>Ethernet ÉÎÔÅÒÆÅÊÓÙ</title>
 
     &hwlist.sf;
@@ -311,13 +309,13 @@
 
   </sect2>
 
-  <sect2 id="fddi">
+  <sect2 xml:id="fddi">
     <title>FDDI ÉÎÔÅÒÆÅÊÓÙ</title>
     <para arch="i386,pc98,alpha">DEC DEFPA PCI (ÄÒÁÊ×ÅÒ &man.fpa.4;)</para>
     <para arch="i386">DEC DEFEA EISA (ÄÒÁÊ×ÅÒ &man.fpa.4;)</para>
   </sect2>
 
-  <sect2 id="atm">
+  <sect2 xml:id="atm">
     <title>ATM ÉÎÔÅÒÆÅÊÓÙ</title>
 
     <para arch="i386,pc98">Midway ATM ÉÎÔÅÒÆÅÊÓÙ (ÄÒÁÊ×ÅÒ &man.en.4;)</para>
@@ -335,7 +333,7 @@
       &man.patm.4;)</para>
 
   </sect2>
-  <sect2 id="wlan">
+  <sect2 xml:id="wlan">
     <title>âÅÓÐÒÏ×ÏÄÎÙÅ ÓÅÔÅ×ÙÅ ÉÎÔÅÒÆÅÊÓÙ</title>
 
     <para arch="i386">NCR / AT&amp;T / Lucent Technologies WaveLan T1-speed
@@ -359,7 +357,7 @@
 
   </sect2>
 
-  <sect2 id="misc-network">
+  <sect2 xml:id="misc-network">
     <title>òÁÚÌÉÞÎÙÅ ÓÅÔÅ×ÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
 
     &hwlist.cx;
@@ -378,7 +376,7 @@
 
   </sect2>
 
-  <sect2 id="isdn">
+  <sect2 xml:id="isdn">
     <title>ISDN ÉÎÔÅÒÆÅÊÓÙ</title>
     <para arch="i386">AcerISDN P10 ISA PnP (ÜËÓÐÅÒÉÍÅÎÔÁÌØÎÙÊ)</para>
     <para arch="i386">Asuscom ISDNlink 128K ISA</para>
@@ -472,7 +470,7 @@
     <para arch="i386">Winbond W6692 based PCI ËÁÒÔÙ</para>
   </sect2>
 
-  <sect2 id="serial">
+  <sect2 xml:id="serial">
     <title>ðÏÓÌÅÄÏ×ÁÔÅÌØÎÙÅ ÉÎÔÅÒÆÅÊÓÙ</title>
 
     <para arch="i386,alpha,ia64,amd64"><quote>PC standard</quote> 8250, 16450,
@@ -672,7 +670,7 @@
       </note>
 
   </sect2>
-  <sect2 id="sound">
+  <sect2 xml:id="sound">
     <title>ú×ÕËÏ×ÙÅ ÕÓÔÒÏÊÓÔ×Á</title>
 
     &hwlist.snd.ad1816;
@@ -744,7 +742,7 @@
     </para>
   </sect2>
 
-  <sect2 id="camera">
+  <sect2 xml:id="camera">
     <title>ëÁÍÅÒÙ É ÕÓÔÒÏÊÓÔ×Á ×ÉÄÅÏÚÁÈ×ÁÔÁ</title>
 
     &hwlist.bktr;
@@ -752,7 +750,7 @@
     <para arch="i386">Connectix QuickCam</para>
   </sect2>
 
-  <sect2 id="usb">
+  <sect2 xml:id="usb">
     <title>õÓÔÒÏÊÓÔ×Á USB</title>
 
     <para arch="alpha,i386,pc98,amd64">ðÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÂÏÌØÛÏÊ ÄÉÁÐÁÚÏÎ USB
@@ -762,13 +760,11 @@
       ÒÁÂÏÔÁÔØ, ÄÁÖÅ ÅÓÌÉ ÏÎÏ Ñ×ÎÏ ÎÅ ÐÒÉ×ÅÄÅÎÏ ÚÄÅÓØ.</para>
 
     <note arch="alpha,i386,pc98,amd64">
-      <para>USB Ethernet ÁÄÁÐÔÅÒÙ ÍÏÇÕÔ ÂÙÔØ ÎÁÊÄÅÎÙ × ÒÁÚÄÅÌÅ <link
-      linkend="ethernet">Ethernet ÉÎÔÅÒÆÅÊÓÙ</link>.</para>
+      <para>USB Ethernet ÁÄÁÐÔÅÒÙ ÍÏÇÕÔ ÂÙÔØ ÎÁÊÄÅÎÙ × ÒÁÚÄÅÌÅ <link linkend="ethernet">Ethernet ÉÎÔÅÒÆÅÊÓÙ</link>.</para>
     </note>
 
     <note arch="alpha,i386,pc98,amd64">
-      <para>USB Bluetooth ÁÄÁÐÔÅÒÙ ÍÏÇÕÔ ÂÙÔØ ÎÁÊÄÅÎÙ × ÒÁÚÄÅÌÅ <link
-      linkend="bluetooth">Bluetooth</link>.</para>
+      <para>USB Bluetooth ÁÄÁÐÔÅÒÙ ÍÏÇÕÔ ÂÙÔØ ÎÁÊÄÅÎÙ × ÒÁÚÄÅÌÅ <link linkend="bluetooth">Bluetooth</link>.</para>
     </note>
 
     &hwlist.ohci;
@@ -830,7 +826,7 @@
 
  </sect2>
 
-  <sect2 id="firewire">
+  <sect2 xml:id="firewire">
     <title>IEEE 1394 (Firewire) ÕÓÔÒÏÊÓÔ×Á</title>
 
     &hwlist.fwohci;
@@ -840,7 +836,7 @@
 
   </sect2>
 
-  <sect2 id="bluetooth">
+  <sect2 xml:id="bluetooth">
     <title>Bluetooth ÕÓÔÒÏÊÓÔ×Á</title>
 
     &hwlist.ng.bt3c;
@@ -849,7 +845,7 @@
 
   </sect2>
 
-  <sect2 id="crypto-accel">
+  <sect2 xml:id="crypto-accel">
     <title>ëÒÉÐÔÏÇÒÁÆÉÞÅÓËÉÅ ÁËÓÅÌÅÒÁÔÏÒÙ</title>
 
     &hwlist.hifn;
@@ -860,7 +856,7 @@
 
   </sect2>
 
-  <sect2 id="misc">
+  <sect2 xml:id="misc">
     <title>äÒÕÇÉÅ ÕÓÔÒÏÊÓÔ×Á</title>
 
     <para arch="i386,pc98,amd64">æÁËÓ-ÍÏÄÅÍ/PCCARD
@@ -882,8 +878,7 @@
       <note>
 	<para>éÎÆÏÒÍÁÃÉÑ, ÏÔÎÏÓÑÝÁÑÓÑ Ë ÏÔÄÅÌØÎÙÍ ×ÉÄÅÏËÁÒÔÁÍ É
 	  ÓÏ×ÍÅÓÔÉÍÏÓÔÉ Ó <application>Xorg</application>, ÍÏÖÅÔ ÂÙÔØ
-	  ÎÁÊÄÅÎÁ ÎÁ <ulink
-	  url="http://www.x.org/"></ulink>.</para>
+	  ÎÁÊÄÅÎÁ ÎÁ <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>
       </note>
 
       </para>
@@ -927,7 +922,7 @@
 	  ÉÎÆÏÒÍÁÃÉÑ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ËÕÒÓÏÒÎÙÈ ÕÓÔÒÏÊÓÔ× × &os;.
 	  éÎÆÏÒÍÁÃÉÑ ÐÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ËÕÒÓÏÒÎÙÈ ÕÓÔÒÏÊÓÔ× Ó
 	  <application>Xorg</application> ÍÏÖÅÔ ÂÙÔØ ÎÁÊÄÅÎÁ ÐÏ
-	  ÁÄÒÅÓÕ <ulink url="http://www.x.org/"></ulink>.</para>
+	  ÁÄÒÅÓÕ <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>
       </note>
     </para>
 
@@ -955,8 +950,8 @@
     </para>
 
     <para arch="i386">Xilinx XC6200 ÐÅÒÅÎÁÓÔÒÁÉ×ÁÅÍÙÅ ÁÐÐÁÒÁÔÎÙÅ ËÁÒÔÙ,
-      ÓÏ×ÍÅÓÔÉÍÙÅ Ó HOT1 ÏÔ <ulink url="http://www.vcc.com/">Virtual
-      Computers</ulink> (ÄÒÁÊ×ÅÒ xrpu).</para>
+      ÓÏ×ÍÅÓÔÉÍÙÅ Ó HOT1 ÏÔ <link xlink:href="http://www.vcc.com/">Virtual
+      Computers</link> (ÄÒÁÊ×ÅÒ xrpu).</para>
 
     <para arch="pc98">Power Management Controller ÎÁ NEC PC-98 Note (ÄÒÁÊ×ÅÒ
       pmc)</para>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml b/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
index 55fe779e1bb..0a5c9ae7488 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/common/intro.xml
@@ -7,8 +7,7 @@
 
      Original revision: 1.7
 -->
-
-<sect1 id="intro">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="intro">
   <title>÷×ÅÄÅÎÉÅ</title>
 
   <para>÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÎÁÈÏÄÉÔÓÑ ÉÎÆÏÒÍÁÃÉÑ Ï ÁÐÐÁÒÁÔÎÏÊ ÓÏ×ÍÅÓÔÉÍÏÓÔÉ
@@ -26,7 +25,7 @@
 
   <para arch="ia64">äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÐÏ &os;/&arch; ÎÁÈÏÄÉÔÓÑ ÎÁ
     ÓÔÒÁÎÉÃÅ
-    <ulink url="&url.base;/platforms/ia64/index.html">&os;/&arch; 
-    Project</ulink>.</para>
+    <link xlink:href="&url.base;/platforms/ia64/index.html">&os;/&arch; 
+    Project</link>.</para>
 
 </sect1>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml b/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
index ad5bf8e0801..65023fdaa7a 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
@@ -14,7 +14,6 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -23,8 +22,7 @@
 
      Original revision: 1.6
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &artheader;
   &sect.intro;
   &sect.proc.i386;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
index d7961b7c3e4..a696cf680d5 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/i386/proc-i386.xml
@@ -7,8 +7,7 @@
 
      Original revision: 1.14
 -->
-
-<sect1 id="proc">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="proc">
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÐÒÏÃÅÓÓÏÒÙ É ÍÁÔÅÒÉÎÓËÉÅ ÐÌÁÔÙ</title>
 
   <para>&os;/i386 ÒÁÂÏÔÁÅÔ ÎÁ ÓÁÍÙÈ ÒÁÚÎÏÏÂÒÁÚÎÙÈ <quote>IBM PC
@@ -92,10 +91,8 @@
   <para>ACPI ÚÁ×ÉÓÉÔ ÏÔ Differentiated System Descriptor Table
     (DSDT), ÎÁÈÏÄÑÝÅÊÓÑ × BIOS ËÁÖÄÏÇÏ ËÏÍÐØÀÔÅÒÁ.  DSDT ÎÅËÏÔÏÒÙÈ
     ËÏÍÐØÀÔÅÒÏ× ÎÅÐÏÌÎÁ, ÞÔÏ ÎÅ ÐÏÚ×ÏÌÑÅÔ ACPI ÒÁÂÏÔÁÔØ ÐÒÁ×ÉÌØÎÏ.
-    úÁÍÅÎÕ DSDT ÄÌÑ ÎÅËÏÔÏÒÙÈ ËÏÍÐØÀÔÅÒÏ× ÍÏÖÎÏ ÎÁÊÔÉ × ÒÁÚÄÅÌÅ <ulink
-    url="http://acpi.sourceforge.net/dsdt/index.php">DSDT</ulink>
-    ÓÁÊÔÁ ÐÒÏÅËÔÁ <ulink
-    url="http://acpi.sourceforge.net/">ACPI4Linux</ulink>.
+    úÁÍÅÎÕ DSDT ÄÌÑ ÎÅËÏÔÏÒÙÈ ËÏÍÐØÀÔÅÒÏ× ÍÏÖÎÏ ÎÁÊÔÉ × ÒÁÚÄÅÌÅ <link xlink:href="http://acpi.sourceforge.net/dsdt/index.php">DSDT</link>
+    ÓÁÊÔÁ ÐÒÏÅËÔÁ <link xlink:href="http://acpi.sourceforge.net/">ACPI4Linux</link>.
     &os; ÍÏÖÅÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÜÔÉ DSDT ÄÌÑ ÐÅÒÅÚÁÐÉÓÉ DSDT, ÎÁÈÏÄÑÝÉÈÓÑ
     × BIOS; ÏÂÒÁÔÉÔÅÓØ Ë ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ÏÞÎÉËÁ &man.acpi.4; ÚÁ ÂÏÌÅÅ
     ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÅÊ.</para>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
index 45f1c185940..e82a53f19f4 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
@@ -14,7 +14,6 @@
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -23,17 +22,9 @@
 
      Original revision: 1.5
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &artheader;
 
-  <abstract>
-    <para>üÔÏ ÐÒÅÄ×ÁÒÉÔÅÌØÎÙÊ ÄÏËÕÍÅÎÔ.  ïÎ ÎÅÐÏÌÏÎ É ÎÕÖÄÁÅÔÓÑ ×
-      ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ.  ðÏÖÁÌÕÊÓÔÁ, ÏÔÐÒÁ×ÌÑÊÔÅ ÄÏÐÏÌÎÉÔÅÌØÎÕÀ
-      ÉÎÆÏÒÍÁÃÉÀ ÐÏ &arch.print; ÐÒÏÃÅÓÓÏÒÁÍ, ÍÁÔÅÒÉÎÓËÉÍ ÐÌÁÔÁÍ, É ÒÁÚÌÉÞÎÙÍ
-      ÕÓÔÒÏÊÓÔ×ÁÍ, ÒÁÂÏÔÁÀÝÉÍ × &os; × &a.ia64;.</para>
-  </abstract>
-
   &sect.intro;
   &sect.proc.ia64;
   &sect.dev;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
index ca70a047e03..116b3c9b0b2 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/ia64/proc-ia64.xml
@@ -7,19 +7,18 @@
 
      Original revision: 1.9
 -->
-
-<sect1 id="proc-ia64">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="proc-ia64">
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÐÒÏÃÅÓÓÏÒÙ É ÍÁÔÅÒÉÎÓËÉÅ ÐÌÁÔÙ</title>
 
   <para>÷ ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ ÐÏÄÄÅÒÖÉ×ÁÀÔÓÑ ÐÒÏÃÅÓÓÏÒÙ 
-    <ulink url="http://www.intel.com/design/itanium/itanium/index.htm">Itanium</ulink>
-    É <ulink url="http://www.intel.com/design/itanium2/index.htm">Itanium 2</ulink>.</para>
+    <link xlink:href="http://www.intel.com/design/itanium/itanium/index.htm">Itanium</link>
+    É <link xlink:href="http://www.intel.com/design/itanium2/index.htm">Itanium 2</link>.</para>
 
   <para>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÞÉÐÓÅÔÙ ×ËÌÀÞÁÀÔ:</para>
    <itemizedlist>
      <listitem>
        <para>HP zx1 (ÔÏÌØËÏ × ×ÅÔ×É ÒÁÚÒÁÂÏÔËÉ, ÓÍÏÔÒÉÔÅ 
-         <ulink url="http://perforce.FreeBSD.org/">Perforce repository</ulink>)</para>
+         <link xlink:href="http://perforce.FreeBSD.org/">Perforce repository</link>)</para>
      </listitem>
      <listitem>
        <para>HP i2000</para>
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
index 8caed9b18cf..cd9250aa042 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
@@ -14,7 +14,6 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -23,8 +22,7 @@
 
      Original revision: 1.3
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &artheader;
   &sect.intro;
   &sect.proc.pc98;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
index 493101f46a2..6159da09ced 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/pc98/proc-pc98.xml
@@ -7,8 +7,7 @@
 
      Original revision: 1.5
 -->
-
-<sect1 id="support-sys">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support-sys">
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÓÉÓÔÅÍÙ</title>
 
   <para>NEC PC-9801/9821 series Ó ÐÏÞÔÉ ×ÓÅÍÉ i386-ÓÏ×ÍÅÓÔÉÍÙÍÉ ÐÒÏÃÅÓÓÏÒÁÍÉ,
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
index 377ac93663e..9a5d5886295 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto-ru PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" "devauto.ru.ent">
@@ -14,7 +14,6 @@
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -23,8 +22,7 @@
 
      Original revision: 1.5
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &artheader;
   &sect.intro;
   &sect.proc.sparc64;
diff --git a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
index 6022026bca6..1d279b61220 100644
--- a/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
+++ b/release/doc/ru_RU.KOI8-R/hardware/sparc64/proc-sparc64.xml
@@ -7,15 +7,13 @@
 
      Original revision: 1.12
 -->
-
-<sect1 id="support-sys">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="support-sys">
   <title>ðÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÓÉÓÔÅÍÙ</title>
 
   <para>÷ ÜÔÏÍ ÒÁÚÄÅÌÅ ÏÐÉÓÁÎÙ ÓÉÓÔÅÍÙ, ÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ ÎÁ ÄÁÎÎÙÊ ÍÏÍÅÎÔ
     &os; ÎÁ ÐÌÁÔÆÏÒÍÅ &arch.print;.  úÁ ÉÎÆÏÒÍÁÃÉÅÊ Ï ÒÁÚÌÉÞÎÙÈ ÁÐÐÁÒÁÔÎÙÈ
-    ÁÒÈÉÔÅËÔÕÒÁÈ ÏÂÒÁÝÁÊÔÅÓØ Ë <ulink
-    url="http://sunsolve.sun.com/handbook_pub/">Sun System
-    Handbook</ulink>.</para>
+    ÁÒÈÉÔÅËÔÕÒÁÈ ÏÂÒÁÝÁÊÔÅÓØ Ë <link xlink:href="http://sunsolve.sun.com/handbook_pub/">Sun System
+    Handbook</link>.</para>
 
   <para>SMP ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ÎÁ ×ÓÅÈ ÓÉÓÔÅÍÁÈ Ó ÂÏÌÅÅ ÞÅÍ 1 ÐÒÏÃÅÓÓÏÒÏÍ.</para>
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile b/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
index e6ebc349c01..7f9ac6bb408 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/Makefile
@@ -16,7 +16,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml b/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
index 18130d7f630..6be520f9237 100644
--- a/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,10 +19,8 @@
 
      Original revision: 1.4
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile b/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
index e3180497050..95db89a6465 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/Makefile
@@ -16,7 +16,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml b/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
index 886693cb952..5d43615ea63 100644
--- a/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/amd64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "amd64">
 <!ENTITY arch.print "AMD64">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,10 +19,8 @@
 
      Original revision: 1.2
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml b/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
deleted file mode 100644
index a60e98f72bb..00000000000
--- a/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="koi8-r"?>
-<!--
-     The FreeBSD Russian Documentation Project
-
-     $FreeBSD$
-     $FreeBSDru: frdp/release/doc/ru_RU.KOI8-R/installation/common/abstract.xml,v 1.1 2004/06/24 07:21:47 den Exp $
-
-     Original revision: 1.2
--->
-
-<abstract>
-  <para>üÔÁ ÓÔÁÔØÑ ÄÁÅÔ ËÒÁÔËÉÅ ÉÎÓÔÒÕËÃÉÉ ÐÏ ÕÓÔÁÎÏ×ËÅ
-  &os;/&arch; &release.current;, ÏÓÏÂÏÅ ×ÎÉÍÁÎÉÅ ÕÄÅÌÅÎÏ
-  ÐÏÌÕÞÅÎÉÀ ÄÉÓÔÒÉÂÕÔÉ×Á &os;.  ðÒÅÄÓÔÁ×ÌÅÎÙ ÔÁËÖÅ
-  ÏÔÄÅÌØÎÙÅ ÚÁÍÅÔËÉ ÐÏ ÒÅÛÅÎÉÀ ÐÒÏÂÌÅÍ É ÞÁÓÔÏ ÚÁÄÁ×ÁÅÍÙÅ
-  ×ÏÐÒÏÓÙ.</para>
-</abstract>
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml b/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
index 97ff87fad99..040179491e8 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/artheader.xml
@@ -7,13 +7,12 @@
 
      Original revision: 1.7
 -->
+<info xmlns="http://docbook.org/ns/docbook"><title>éÎÓÔÒÕËÃÉÉ ÐÏ ÕÓÔÁÎÏ×ËÅ &os;/&arch; &release.current;</title>
+  
 
-<articleinfo>
-  <title>éÎÓÔÒÕËÃÉÉ ÐÏ ÕÓÔÁÎÏ×ËÅ &os;/&arch; &release.current;</title>
-
-  <corpauthor>
+  <author><orgname>
   ðÒÏÅËÔ &os;
-  </corpauthor>
+  </orgname></author>
 
   <copyright>
     <year>2000</year>
@@ -24,4 +23,12 @@
     <year>2005</year>
     <holder role="mailto:doc@FreeBSD.org">ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</holder>
   </copyright>
-</articleinfo>
+
+<abstract>
+  <para>üÔÁ ÓÔÁÔØÑ ÄÁÅÔ ËÒÁÔËÉÅ ÉÎÓÔÒÕËÃÉÉ ÐÏ ÕÓÔÁÎÏ×ËÅ
+  &os;/&arch; &release.current;, ÏÓÏÂÏÅ ×ÎÉÍÁÎÉÅ ÕÄÅÌÅÎÏ
+  ÐÏÌÕÞÅÎÉÀ ÄÉÓÔÒÉÂÕÔÉ×Á &os;.  ðÒÅÄÓÔÁ×ÌÅÎÙ ÔÁËÖÅ
+  ÏÔÄÅÌØÎÙÅ ÚÁÍÅÔËÉ ÐÏ ÒÅÛÅÎÉÀ ÐÒÏÂÌÅÍ É ÞÁÓÔÏ ÚÁÄÁ×ÁÅÍÙÅ
+  ×ÏÐÒÏÓÙ.</para>
+</abstract>
+</info>
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.ent b/release/doc/ru_RU.KOI8-R/installation/common/install.ent
index 46281d19db0..5900b794050 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.ent
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.ent
@@ -14,7 +14,6 @@
 <!-- Files to be included -->
 
 <!ENTITY artheader SYSTEM "artheader.xml">
-<!ENTITY abstract SYSTEM "abstract.xml">
 <!ENTITY sect.install SYSTEM "install.xml">
 <!ENTITY sect.layout SYSTEM "layout.xml">
 <!ENTITY sect.upgrade SYSTEM "upgrade.xml">
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/install.xml b/release/doc/ru_RU.KOI8-R/installation/common/install.xml
index d376a164f87..488d9ad8cc5 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/install.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/install.xml
@@ -13,17 +13,14 @@ This file has architecture-dependent installation instructions, culled
 from {alpha,i386}/INSTALL.TXT.
 
 -->
-
-<sect1 id="install">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="install">
   <title>õÓÔÁÎÏ×ËÁ &os;</title>
 
   <para>üÔÏÔ ÒÁÚÄÅÌ ÏÐÉÓÙ×ÁÅÔ ÐÒÏÃÅÓÓ ÕÓÔÁÎÏ×ËÉ ÎÏ×ÏÊ ÓÉÓÔÅÍÙ &os;.
     ïÓÏÂÏÅ ×ÎÉÍÁÎÉÅ ÕÄÅÌÅÎÏ ÐÏÌÕÞÅÎÉÀ ÄÉÓÔÒÉÂÕÔÉ×Á &os; &release.current;
-    É ÎÁÞÁÌÕ ÐÒÏÃÅÄÕÒÙ ÕÓÔÁÎÏ×ËÉ.  çÌÁ×Á <ulink
-    url="&url.books.handbook;/install.html"><quote>õÓÔÁÎÏ×ËÁ
-    FreeBSD</quote></ulink> <ulink
-    url="&url.books.handbook;/">òÕËÏ×ÏÄÓÔ×Á
-    FreeBSD</ulink> ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÂÏÌÅÅ ÐÏÄÒÏÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÁÍÏÊ
+    É ÎÁÞÁÌÕ ÐÒÏÃÅÄÕÒÙ ÕÓÔÁÎÏ×ËÉ.  çÌÁ×Á <link xlink:href="&url.books.handbook;/install.html"><quote>õÓÔÁÎÏ×ËÁ
+    FreeBSD</quote></link> <link xlink:href="&url.books.handbook;/">òÕËÏ×ÏÄÓÔ×Á
+    FreeBSD</link> ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÂÏÌÅÅ ÐÏÄÒÏÂÎÕÀ ÉÎÆÏÒÍÁÃÉÀ Ï ÓÁÍÏÊ
     ÐÒÏÇÒÁÍÍÅ ÕÓÔÁÎÏ×ËÅ, ×ËÌÀÞÁÑ ÐÏÛÁÇÏ×ÕÀ ÉÎÓÔÒÕËÃÉÀ ÐÏ ÕÓÔÁÎÏ×ËÅ
     Ó ÉÌÌÀÓÔÒÁÃÉÑÍÉ.</para>
 
@@ -31,7 +28,7 @@ from {alpha,i386}/INSTALL.TXT.
     <xref linkend="upgrading"/>, ÇÄÅ ÎÁÈÏÄÑÔÓÑ ÉÎÓÔÒÕËÃÉÉ ÐÏ
     ÏÂÎÏ×ÌÅÎÉÀ.</para>
 
-  <sect2 id="getting-started">
+  <sect2 xml:id="getting-started">
     <title>ðÅÒÅÄ ÕÓÔÁÎÏ×ËÏÊ</title>
 
     <para>÷ÏÚÍÏÖÎÏ ÎÁÉÂÏÌÅÅ ×ÁÖÎÙÍ ÄÅÊÓÔ×ÉÅÍ, ËÏÔÏÒÏÅ ÄÏÌÖÎÏ ÂÙÔØ ×ÙÐÏÌÎÅÎÏ
@@ -42,12 +39,10 @@ from {alpha,i386}/INSTALL.TXT.
       Ï ÒÅÌÉÚÅ, ÓÐÉÓÏË ÓÏ×ÍÅÓÔÉÍÏÇÏ ÏÂÏÒÕÄÏ×ÁÎÉÑ) ÄÏÓÔÕÐÎÙ ÔÁËÖÅ ÉÚ ÍÅÎÀ
       Documentation ÐÒÏÇÒÁÍÍÙ ÕÓÔÁÎÏ×ËÉ.</para>
 
-    <para>ïÎ-ÌÁÊÎ ×ÅÒÓÉÉ &os; <ulink
-      url="&url.books.faq;/">FAQ</ulink> É
-      <ulink
-      url="&url.books.handbook;/">Handbook</ulink>
-      ÄÏÓÔÕÐÎÙ ÔÁËÖÅ Ó <ulink url="&url.base;/ru/">×Å ÓÁÊÔÁ
-      ðÒÏÅËÔÁ FreeBSD</ulink>, ÅÓÌÉ Õ ×ÁÓ ÅÓÔØ ÐÏÄËÌÀÞÅÎÉÅ Ë ÉÎÔÅÒÎÅÔ.</para>
+    <para>ïÎ-ÌÁÊÎ ×ÅÒÓÉÉ &os; <link xlink:href="&url.books.faq;/">FAQ</link> É
+      <link xlink:href="&url.books.handbook;/">Handbook</link>
+      ÄÏÓÔÕÐÎÙ ÔÁËÖÅ Ó <link xlink:href="&url.base;/ru/">×Å ÓÁÊÔÁ
+      ðÒÏÅËÔÁ FreeBSD</link>, ÅÓÌÉ Õ ×ÁÓ ÅÓÔØ ÐÏÄËÌÀÞÅÎÉÅ Ë ÉÎÔÅÒÎÅÔ.</para>
 
     <para>üÔÏÔ ÎÁÂÏÒ ÄÏËÕÍÅÎÔÏ× ÍÏÖÅÔ ÐÏËÁÚÁÔØÓÑ ÓÌÏÖÎÙÍ, ÎÏ ×ÒÅÍÑ,
       ÐÏÔÒÁÞÅÎÎÏÅ ÎÁ ÉÈ ÞÔÅÎÉÅ, ÏËÕÐÉÔÓÑ ÍÎÏÇÏËÒÁÔÎÏ.  ïÚÎÁËÏÍÌÅÎÉÅ Ó
@@ -130,7 +125,7 @@ from {alpha,i386}/INSTALL.TXT.
       &os;.</para>
   </sect2>
 
-  <sect2 id="floppies">
+  <sect2 xml:id="floppies">
     <title>éÎÓÔÒÕËÃÉÉ ÐÏ ÓÏÚÄÁÎÉÀ ÄÉÓËÅÔ</title>
 
     <para arch="i386,alpha,pc98">÷ ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÓÐÏÓÏÂÁ ÕÓÔÁÎÏ×ËÉ &os;,
@@ -143,12 +138,12 @@ from {alpha,i386}/INSTALL.TXT.
 
     <para arch="i386,alpha">äÌÑ ÂÏÌØÛÉÎÓÔ×Á ÕÓÔÁÎÏ×ÏË Ó CDROM ÉÌÉ ÐÏ ÓÅÔÉ,
       ×ÁÍ ÐÏÔÒÅÂÕÀÔÓÑ ÓËÏÐÉÒÏ×ÁÔØ ÏÂÒÁÚÙ ÄÉÓËÅÔ
-      <filename>boot.flp</filename> É <filename>kern<replaceable>X</replaceable>.flp</filename>
+      <filename>boot.flp</filename> É <filename>kernX.flp</filename>
       ÉÚ ËÁÔÁÌÏÇÁ <filename>floppies/</filename> (ÄÌÑ 1.44MB ÄÉÓËÅÔ).</para>
 
     <para arch="pc98">äÌÑ ÏÂÙÞÎÏÊ ÕÓÔÁÎÏ×ËÉ Ó CDROM ÉÌÉ ÐÏ ÓÅÔÉ, ×ÁÍ
       ÐÏÔÒÅÂÕÅÔÓÑ ÓËÏÐÉÒÏ×ÁÔØ ÏÂÒÁÚÙ ÄÉÓËÅÔ <filename>boot.flp</filename>
-      É <filename>kern<replaceable>X</replaceable>.flp</filename> ÉÚ ËÁÔÁÌÏÇÁ
+      É <filename>kernX.flp</filename> ÉÚ ËÁÔÁÌÏÇÁ
       <filename>floppies/</filename> (ÄÌÑ 1.44MB ÄÉÓËÅÔ) ÉÌÉ
       <filename>boot-small.flp</filename> É
       <filename>kern-small.flp</filename> (ÄÌÑ 1.2MB ÄÉÓËÅÔ).</para>
@@ -157,17 +152,16 @@ from {alpha,i386}/INSTALL.TXT.
       úÁÇÒÕÚÉÔÅ
       <replaceable>release</replaceable><filename>/floppies/boot.flp</filename>
       É ×ÓÅ
-      <replaceable>release</replaceable><filename>/floppies/kern<replaceable>X</replaceable>.flp</filename>
-      Ó <ulink url="&release.url;"></ulink> ÉÌÉ Ó ÏÄÎÏÇÏ ÉÚ ÚÅÒËÁÌ,
-      ÐÅÒÅÞÉÓÌÅÎÎÙÈ × ÒÁÚÄÅÌÅ <ulink
-      url="&url.books.handbook;/mirrors-ftp.html">FTP
-      ÚÅÒËÁÌÁ</ulink> òÕËÏ×ÏÄÓÔ×Á ÉÌÉ, ÉÌÉ ÎÁ ÓÔÒÁÎÉÃÁÈ
-      <ulink url="http://mirrorlist.FreeBSD.org/"></ulink>.</para>
+      <replaceable>release</replaceable><filename>/floppies/kernX.flp</filename>
+      Ó <uri xlink:href="&release.url;">&release.url;</uri> ÉÌÉ Ó ÏÄÎÏÇÏ ÉÚ ÚÅÒËÁÌ,
+      ÐÅÒÅÞÉÓÌÅÎÎÙÈ × ÒÁÚÄÅÌÅ <link xlink:href="&url.books.handbook;/mirrors-ftp.html">FTP
+      ÚÅÒËÁÌÁ</link> òÕËÏ×ÏÄÓÔ×Á ÉÌÉ, ÉÌÉ ÎÁ ÓÔÒÁÎÉÃÁÈ
+      <uri xlink:href="http://mirrorlist.FreeBSD.org/">http://mirrorlist.FreeBSD.org/</uri>.</para>
 
     <para arch="i386,alpha">÷ÏÚØÍÉÔÅ ÎÅÓËÏÌØËÏ ÞÉÓÔÙÈ,
       ÔÏÌØËÏ ÞÔÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎÎÙÈ
       ÄÉÓËÅÔ É ÐÏÍÅÓÔÉÔÅ ÏÂÒÁÚ <filename>boot.flp</filename> ÎÁ ÐÅÒ×ÕÀ,
-      Á <filename>kern<replaceable>X</replaceable>.flp</filename> ÎÁ ÏÓÔÁÌØÎÙÅ.  üÔÉ ÏÂÒÁÚÙ
+      Á <filename>kernX.flp</filename> ÎÁ ÏÓÔÁÌØÎÙÅ.  üÔÉ ÏÂÒÁÚÙ
       <emphasis>ÎÅ</emphasis> DOS ÆÁÊÌÙ.  ÷Ù ÎÅ ÍÏÖÅÔÅ ÐÒÏÓÔÏ ÓËÏÐÉÒÏ×ÁÔØ
       ÉÈ ÎÁ DOS ÉÌÉ UFS ÄÉÓËÅÔÕ ËÁË ÏÂÙÞÎÙÅ ÆÁÊÌÙ, ÐÏÔÒÅÂÕÅÔÓÑ
       ÒÁÚÍÅÝÅÎÉÅ ÏÂÒÁÚÏ× ÎÁ ÄÉÓËÅ Ó ÐÏÍÏÝØÀ <filename>fdimage.exe</filename>
@@ -178,7 +172,7 @@ from {alpha,i386}/INSTALL.TXT.
     <para arch="pc98">÷ÏÚØÍÉÔÅ ÎÅÓËÏÌØËÏ ÞÉÓÔÙÈ,
       ÔÏÌØËÏ ÞÔÏ ÏÔÆÏÒÍÁÔÉÒÏ×ÁÎÎÙÈ
       ÄÉÓËÅÔ É ÐÏÍÅÓÔÉÔÅ ÏÂÒÁÚ <filename>boot.flp</filename> ÎÁ ÐÅÒ×ÕÀ,
-      Á <filename>kern<replaceable>X</replaceable>.flp</filename> ÎÁ ÏÓÔÁÌØÎÙÅ.  üÔÉ ÏÂÒÁÚÙ
+      Á <filename>kernX.flp</filename> ÎÁ ÏÓÔÁÌØÎÙÅ.  üÔÉ ÏÂÒÁÚÙ
       <emphasis>ÎÅ</emphasis> DOS ÆÁÊÌÙ.  ÷Ù ÎÅ ÍÏÖÅÔÅ ÐÒÏÓÔÏ ÓËÏÐÉÒÏ×ÁÔØ
       ÉÈ ÎÁ DOS ÉÌÉ UFS ÄÉÓËÅÔÕ ËÁË ÏÂÙÞÎÙÅ ÆÁÊÌÙ, ÐÏÔÒÅÂÕÅÔÓÑ
       ÒÁÚÍÅÝÅÎÉÅ ÏÂÒÁÚÏ× ÎÁ ÄÉÓËÅ Ó ÐÏÍÏÝØÀ <filename>rawrite.exe</filename>
@@ -189,17 +183,17 @@ from {alpha,i386}/INSTALL.TXT.
     <para arch="i386,alpha,pc98">îÁÐÒÉÍÅÒ, ÄÌÑ ÓÏÚÄÁÎÉÑ ÄÉÓËÅÔÙ Ó ÏÂÒÁÚÏÍ ÑÄÒÁ
       ÐÏÄ DOS, ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ×ÙÐÏÌÎÉÔØ ÐÒÉÍÅÒÎÏ ÔÁËÕÀ ËÏÍÁÎÄÕ:</para>
 
-    <screen arch="i386,alpha"><prompt>C></prompt> <userinput>fdimage boot.flp a:</userinput></screen>
-    <screen arch="pc98"><prompt>A></prompt> <userinput>rawrite</userinput></screen>
+    <screen arch="i386,alpha"><prompt>C&gt;</prompt> <userinput>fdimage boot.flp a:</userinput></screen>
+    <screen arch="pc98"><prompt>A&gt;</prompt> <userinput>rawrite</userinput></screen>
 
     <para arch="i386,alpha">ðÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ×Ù ÓËÏÐÉÒÏ×ÁÌÉ
       <filename>fdimage.exe</filename> É <filename>boot.flp</filename>
-      × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ.  äÌÑ ÆÁÊÌÏ× <filename>kern<replaceable>X</replaceable>.flp</filename>
+      × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ.  äÌÑ ÆÁÊÌÏ× <filename>kernX.flp</filename>
       ÄÅÊÓÔ×ÉÑ ÂÕÄÕÔ ÁÎÁÌÏÇÉÞÎÙ.</para>
 
     <para arch="pc98">ðÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ×Ù ÓËÏÐÉÒÏ×ÁÌÉ
       <filename>rawrite.exe</filename> É <filename>boot.flp</filename>
-      × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ.  äÌÑ ÆÁÊÌÏ× <filename>kern<replaceable>X</replaceable>.flp</filename>
+      × ÏÔÄÅÌØÎÙÊ ËÁÔÁÌÏÇ.  äÌÑ ÆÁÊÌÏ× <filename>kernX.flp</filename>
       ÄÅÊÓÔ×ÉÑ ÂÕÄÕÔ ÁÎÁÌÏÇÉÞÎÙ.</para>
 
     <para arch="i386,alpha,pc98">åÓÌÉ ×Ù ÓÏÚÄÁÅÔÅ ÚÁÇÒÕÚÏÞÎÕÀ ÄÉÓËÅÔÕ ÎÁ
@@ -225,7 +219,7 @@ from {alpha,i386}/INSTALL.TXT.
       &os;/&arch;.</para>
   </sect2>
 
-  <sect2 id="start-installation">
+  <sect2 xml:id="start-installation">
     <title>õÓÔÁÎÏ×ËÁ &os; Ó CDROM ÉÌÉ ÞÅÒÅÚ ÉÎÔÅÒÎÅÔ</title>
 
 <!-- i386/pc98 text starts here -->
@@ -272,7 +266,7 @@ from {alpha,i386}/INSTALL.TXT.
       ÞÅÒÅÚ ÓÅÔØ, ÉÓÐÏÌØÚÕÑ PPP, SLIP ÉÌÉ ×ÙÄÅÌÅÎÎÏÅ ÓÏÅÄÉÎÅÎÉÅ.
       îÁÞÎÉÔÅ ÕÓÔÁÎÏ×ËÕ, ÓÏÚÄÁ× ÎÁÂÏÒ ÚÁÇÒÕÚÏÞÎÙÈ ÄÉÓËÅÔ &os;
       ÉÚ ÆÁÊÌÏ× <filename>floppies/boot.flp</filename> É
-      <filename>floppies/kern<replaceable>X</replaceable>.flp</filename>, ÉÓÐÏÌØÚÕÑ ÉÎÓÔÒÕËÃÉÉ
+      <filename>floppies/kernX.flp</filename>, ÉÓÐÏÌØÚÕÑ ÉÎÓÔÒÕËÃÉÉ
       × <xref linkend="floppies"/>.  ðÅÒÅÚÁÇÒÕÚÉÔÅ ËÏÍÐØÀÔÅÒ,
       ÄÉÓË <filename>boot.flp</filename>; ÐÏÓÌÅ ÚÁÐÒÏÓÁ ×ÓÔÁ×ØÔÅ
       ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏ ÏÓÔÁÌØÎÙÅ ÄÉÓËÉ.  ðÒÏÞÔÉÔÅ
@@ -304,7 +298,7 @@ from {alpha,i386}/INSTALL.TXT.
     <para arch="alpha">÷ ËÁÞÅÓÔ×Å ÁÌØÔÅÒÎÁÔÉ×Ù ×Ù ÍÏÖÅÔÅ ÎÁÞÁÔØ ÕÓÔÁÎÏ×ËÕ
       Ó ÄÉÓËÅÔÙ.  äÌÑ ÎÁÞÁÌÁ ×ÁÍ ÐÏÔÒÅÂÕÅÔÓÑ ÓÏÚÄÁÔØ ÎÁÂÏÒ ÚÁÇÒÕÚÏÞÎÙÈ
       ÄÉÓËÅÔ ÉÚ <filename>floppies/boot.flp</filename> É ÆÁÊÌÏ×
-      <filename>floppies/kern<replaceable>X</replaceable>.flp</filename>, ÉÓÐÏÌØÚÕÑ ÉÎÓÔÒÕËÃÉÉ ÉÚ
+      <filename>floppies/kernX.flp</filename>, ÉÓÐÏÌØÚÕÑ ÉÎÓÔÒÕËÃÉÉ ÉÚ
       <xref linkend="floppies"/>.  ÷ÓÔÁ×ØÔÅ <filename>boot.flp</filename>,
       ÄÌÑ ÚÁÐÕÓËÁ ÕÓÔÁÎÏ×ËÉ ÉÚ ÐÒÉÇÌÁÛÅÎÉÑ SRM ËÏÎÓÏÌÉ
       (<literal>&gt;&gt;&gt;</literal>) ÎÁÂÅÒÉÔÅ ÓÌÅÄÕÀÝÕÀ ËÏÍÁÎÄÕ:</para>
@@ -332,10 +326,8 @@ OpenBoot 4.2, 128 MB memory installed, Serial #51090132.
 Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
     <para arch="sparc64">åÓÌÉ ÐÏÓÌÅ ÜÔÏÇÏ ÓÏÏÂÝÅÎÉÑ ×ÁÛÁ ÓÉÓÔÅÍÁ ÎÁÞÉÎÁÅÔ
-      ÚÁÇÒÕÚËÕ, ÐÏÔÒÅÂÕÅÔÓÑ ÎÁÖÁÔØ <keycombo
-      action="simul"><keycap>L1</keycap><keycap>A</keycap></keycombo>
-      ÉÌÉ <keycombo
-      action="simul"><keycap>Stop</keycap><keycap>A</keycap></keycombo>
+      ÚÁÇÒÕÚËÕ, ÐÏÔÒÅÂÕÅÔÓÑ ÎÁÖÁÔØ <keycombo action="simul"><keycap>L1</keycap><keycap>A</keycap></keycombo>
+      ÉÌÉ <keycombo action="simul"><keycap>Stop</keycap><keycap>A</keycap></keycombo>
       ÎÁ ËÌÁ×ÉÁÔÕÒÅ, ÉÌÉ ÏÔÐÒÁ×ÉÔØ <command>BREAK</command> ÞÅÒÅÚ
       ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÕÀ ËÏÎÓÏÌØ (ÎÁÐÒÉÍÅÒ, ÉÓÐÏÌØÚÕÑ <command>~#</command>
       × &man.tip.1; ÉÌÉ &man.cu.1;) ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÐÒÉÇÌÁÛÅÎÉÑ PROM.
@@ -343,8 +335,8 @@ Ethernet address 0:3:ba:b:92:d4, Host ID: 830b92d4.</screen>
 
     <screenco arch="sparc64">
       <areaspec>
-	<area id="prompt-single" coords="1 5"/>
-	<area id="prompt-smp" coords="2 5"/>
+	<area xml:id="prompt-single" coords="1 5"/>
+	<area xml:id="prompt-smp" coords="2 5"/>
       </areaspec>
 
       <screen><prompt>ok     </prompt>
@@ -420,9 +412,9 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 
     <para arch="alpha">üÔÏÔ ÐÒÉÍÅÒ ×ÚÑÔ Ó Digital Personal Workstation 433au
       É ÐÏËÁÚÙ×ÁÅÔ ÔÒÉ ÄÉÓËÁ, ÐÏÄËÌÀÞÅÎÎÙÈ Ë ÍÁÛÉÎÅ.  ðÅÒ×ÙÊ ÜÔÏ CDROM,
-      ÎÁÚÙ×ÁÀÝÉÊÓÑ <devicename>dka0</devicename>, Á ÄÒÕÇÉÅ Ä×Á ÄÉÓËÁ
-      ÎÁÚÙ×ÁÀÔÓÑ <devicename>dkc0</devicename> É
-      <devicename>dkc100</devicename> ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ.</para>
+      ÎÁÚÙ×ÁÀÝÉÊÓÑ <filename>dka0</filename>, Á ÄÒÕÇÉÅ Ä×Á ÄÉÓËÁ
+      ÎÁÚÙ×ÁÀÔÓÑ <filename>dkc0</filename> É
+      <filename>dkc100</filename> ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ.</para>
 
     <para arch="alpha">÷Ù ÍÏÖÅÔÅ ÕËÁÚÁÔØ ËÁËÏÊ ÆÁÊÌ ÑÄÒÁ ÚÁÇÒÕÖÁÔØ É ËÁËÉÅ
       ÐÁÒÁÍÅÔÒÙ ÚÁÇÒÕÚËÉ ÉÓÐÏÌØÚÏ×ÁÔØ ÐÁÒÁÍÅÔÒÁÍÉ <option>-file</option>
@@ -458,7 +450,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	  <para>îÁ ËÏÍÐØÀÔÅÒÅ, ÇÄÅ ×Ù ÐÒÏÉÚ×ÏÄÉÔÅ ÕÓÔÁÎÏ×ËÕ, ÐÅÒÅÊÄÉÔÅ
 	    Ë ÍÅÎÀ Options É ÕÓÔÁÎÏ×ÉÔÅ ÉÍÑ ÒÅÌÉÚÁ × <literal>any</literal>.
 	    úÁÔÅÍ ×Ù ÍÏÖÅÔÅ ×ÙÂÒÁÔØ ÔÉÐ ÎÏÓÉÔÅÌÑ <literal>FTP</literal>,
-	    <filename>ftp://<replaceable>machine</replaceable></filename>
+	    <filename>ftp://machine</filename>
 	    ÐÏÓÌÅ ×ÙÂÏÒÁ <quote>URL</quote> × ÍÅÎÀ ftp ÓÁÊÔÏ×.</para>
 
 	  <warning>
@@ -474,8 +466,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	    Ó ËÏÔÏÒÏÇÏ ÂÕÄÅÔ ×ÅÓÔÉÓØ ÕÓÔÁÎÏ×ËÁ, ÓÎÁÞÁÌÁ ÐÏÔÒÅÂÕÅÔÓÑ
 	    ÄÏÂÁ×ÉÔØ ÚÁÐÉÓØ × ÆÁÊÌ <filename>/etc/exports</filename>
 	    (ÎÁ ËÏÍÐØÀÔÅÒÅ, ÇÄÅ ÎÁÈÏÄÉÔÓÑ ÐÒÉ×ÏÄ CDROM).  ðÒÉÍÅÒ ÎÉÖÅ
-	    ÐÏÚ×ÏÌÑÅÔ ËÏÍÐØÀÔÅÒÕ <hostid
-	    role="hostname">ziggy.foo.com</hostid> ÓÍÏÎÔÉÒÏ×ÁÔØ CDROM
+	    ÐÏÚ×ÏÌÑÅÔ ËÏÍÐØÀÔÅÒÕ <systemitem class="fqdomainname">ziggy.foo.com</systemitem> ÓÍÏÎÔÉÒÏ×ÁÔØ CDROM
 	    ×Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏ ÞÅÒÅÚ NFS:</para>
 
 	  <screen>/cdrom          -ro             ziggy.foo.com</screen>
@@ -485,7 +476,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	    NFS ×ÅÒÏÑÔÎÏ ÎÅ ÌÕÞÛÉÊ ×ÙÂÏÒ ÄÌÑ ×ÁÓ, ÐÏËÁ ×Ù ÎÅ ÐÒÏÞÔÅÔÅ
 	    &man.rc.conf.5; É ÎÅ ÎÁÓÔÒÏÉÔÅ ×ÓÅ ÐÒÁ×ÉÌØÎÏ.  ðÒÅÄÐÏÌÁÇÁÑ,
 	    ÞÔÏ ÜÔÁ ÞÁÓÔØ ÐÒÏÛÌÁ ÎÏÒÍÁÌØÎÏ, ×Ù ÄÏÌÖÎÙ ××ÅÓÔÉ:
-	    <filename><replaceable>cdrom-host</replaceable>:/cdrom</filename>
+	    <filename>cdrom-host:/cdrom</filename>
 	    × ËÁÞÅÓÔ×Å ÐÕÔÉ Ë NFS ËÏÍÐØÀÔÅÒÕ, ÇÄÅ ÎÁÈÏÄÉÔÓÑ ÄÉÓÔÒÉÂÕÔÉ×,
 	    ÎÁÐÒÉÍÅÒ <filename>wiggy:/cdrom</filename>.</para>
 	</listitem>
@@ -566,16 +557,16 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       <para arch="i386,amd64">äÌÑ ÐÏÄÇÏÔÏ×ËÅ Ë ÕÓÔÁÎÏ×ËÅ Ó ÒÁÚÄÅÌÁ MS-DOS
 	×Ù ÄÏÌÖÎÙ ÐÒÏÓÔÏ ÓËÏÐÉÒÏ×ÁÔØ ÆÁÊÌÙ ÉÚ ÄÉÓÔÒÉÂÕÔÉ×Á × ËÁÔÁÌÏÇ
 	<filename>FREEBSD</filename> ÎÁ ÏÓÎÏ×ÎÏÍ ÒÁÚÄÅÌÅ DOS
-	(<devicename>C:</devicename>).  îÁÐÒÉÍÅÒ, ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ
+	(<filename>C:</filename>).  îÁÐÒÉÍÅÒ, ÄÌÑ ×ÙÐÏÌÎÅÎÉÑ
 	ÍÉÎÉÍÁÌØÎÏÊ ÕÓÔÁÎÏ×ËÉ &os; Ó ÒÁÚÄÅÌÁ DOS, ÉÓÐÏÌØÚÕÑ ÆÁÊÌÙ,
 	ÓËÏÐÉÒÏ×ÁÎÎÙÅ Ó CDROM, ×Ù ÍÏÖÅÔÅ ÓÄÅÌÁÔØ ÐÒÉÍÅÒÎÏ ÓÌÅÄÕÀÝÅÅ:</para>
 
-      <screen arch="i386,amd64"><prompt>C:\></prompt> <userinput>MD C:\FREEBSD</userinput>
-<prompt>C:\></prompt> <userinput>XCOPY /S E:\BASE C:\FREEBSD\BASE</userinput></screen>
-      <screen arch="pc98"><prompt>A:\></prompt> <userinput>MD A:\FREEBSD</userinput>
-<prompt>A:\></prompt> <userinput>XCOPY /S E:\BASE A:\FREEBSD\BASE</userinput></screen>
+      <screen arch="i386,amd64"><prompt>C:\&gt;</prompt> <userinput>MD C:\FREEBSD</userinput>
+<prompt>C:\&gt;</prompt> <userinput>XCOPY /S E:\BASE C:\FREEBSD\BASE</userinput></screen>
+      <screen arch="pc98"><prompt>A:\&gt;</prompt> <userinput>MD A:\FREEBSD</userinput>
+<prompt>A:\&gt;</prompt> <userinput>XCOPY /S E:\BASE A:\FREEBSD\BASE</userinput></screen>
 
-      <para>ðÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ÎÁ <devicename>E:</devicename> ÓÍÏÎÔÉÒÏ×ÁÎ
+      <para>ðÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ÎÁ <filename>E:</filename> ÓÍÏÎÔÉÒÏ×ÁÎ
 	CD.</para>
 
       <para arch="i386,amd64">äÌÑ ×ÓÅÈ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÈ ÎÁÂÏÒÏ×, ËÏÔÏÒÙÅ
@@ -604,8 +595,8 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	ËÏÔÏÒÙÅ ×ÁÍ ÎÕÖÎÙ, ÉÓÐÏÌØÚÕÊÔÅ <command>tar</command> ÄÌÑ
 	ÐÏÍÅÝÅÎÉÑ ÉÈ ÎÁ ÌÅÎÔÕ Ó ÐÏÍÏÝØÀ ÐÒÉÍÅÒÎÏ ÔÁËÏÊ ËÏÍÁÎÄÙ:</para>
 
-      <screen>&prompt.root; <userinput>cd <replaceable>/where/you/have/your/dists</replaceable></userinput>
-&prompt.root; <userinput>tar cvf /dev/sa0 <replaceable>dist1</replaceable> .. <replaceable>dist2</replaceable></userinput></screen>
+      <screen>&prompt.root; <userinput>cd /where/you/have/your/dists</userinput>
+&prompt.root; <userinput>tar cvf /dev/sa0 dist1 .. dist2</userinput></screen>
 
       <para>ðÒÉ ÕÓÔÁÎÏ×ËÅ ×Ù ÔÁËÖÅ ÄÏÌÖÎÙ ÕÂÅÄÉÔØÓÑ, ÞÔÏ ÏÓÔÁ×ÌÅÎÏ
 	ÄÏÓÔÁÔÏÞÎÏ ÍÅÓÔÁ ×Ï ×ÒÅÍÅÎÎÏÍ ËÁÔÁÌÏÇÅ (ËÏÔÏÒÙÊ ×ÁÍ ÂÕÄÅÔ ÐÒÅÄÌÏÖÅÎÏ
@@ -625,7 +616,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	<xref linkend="floppies"/> É ÐÒÉÓÔÕÐÁÊÔÅ Ë ÕÓÔÁÎÏ×ËÅ.</para>
     </sect3>
 
-    <sect3 id="ftpnfs">
+    <sect3 xml:id="ftpnfs">
       <title>õÓÔÁÎÏ×ËÁ ÐÏ ÓÅÔÉ ÞÅÒÅÚ FTP ÉÌÉ NFS</title>
 
       <para>ðÏÓÌÅ ÓÏÚÄÁÎÉÑ ÚÁÇÒÕÚÏÞÎÙÈ ÄÉÓËÅÔ, ËÁË ÏÐÉÓÁÎÏ × ÐÅÒ×ÏÍ
@@ -669,8 +660,8 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	  ÐÒÏÈÏÄÉÔ ÂÙÓÔÒÅÅ.  ïÂÙÞÎÏ ÎÅ ÔÒÅÂÕÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ
 	  <quote>ÎÁÓÔÏÑÝÉÊ</quote> IP ÁÄÒÅÓ ÐÒÉ PPP ÓÏÅÄÉÎÅÎÉÉ ÔÁËÉÍ ÓÐÏÓÏÂÏÍ
 	  É ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÁÄÒÅÓÁ RFC 1918 ÄÌÑ ËÏÎÃÏ× ÓÏÅÄÉÎÅÎÉÑ
-	  (ÎÁÐÒÉÍÅÒ <hostid role="ipaddr">10.0.0.1</hostid>,
-	  <hostid role="ipaddr">10.0.0.2</hostid>, É Ô.Ä.).</para>
+	  (ÎÁÐÒÉÍÅÒ <systemitem class="ipaddress">10.0.0.1</systemitem>,
+	  <systemitem class="ipaddress">10.0.0.2</systemitem>, É Ô.Ä.).</para>
 
 	<important>
 	  <para>åÓÌÉ ×Ù ÉÓÐÏÌØÚÕÅÔÅ ËÏÍÐØÀÔÅÒ Ó Linux, Á ÎÅ Ó &os; ×
@@ -740,7 +731,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	  <quote>subdir mounts</quote>, Ô.Å. ÅÓÌÉ ËÁÔÁÌÏÇ ×ÁÛÅÇÏ ÄÉÓÔÒÉÂÕÔÉ×Á
 	  &os; ÎÁÈÏÄÉÔÓÑ ×
 	  <filename>wiggy:/usr/archive/stuff/FreeBSD</filename>,
-	  <hostid role="hostname">wiggy</hostid> ÄÏÌÖÅÎ ÐÏÚ×ÏÌÑÔØ
+	  <systemitem class="fqdomainname">wiggy</systemitem> ÄÏÌÖÅÎ ÐÏÚ×ÏÌÑÔØ
 	  ÎÅÐÏÓÒÅÄÓÔ×ÅÎÎÏÅ ÍÏÎÔÉÒÏ×ÁÎÉÅ
 	  <filename>/usr/archive/stuff/FreeBSD</filename>,
 	  Á ÎÅ ÔÏÌØËÏ <filename>/usr</filename> ÉÌÉ
@@ -801,7 +792,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	      <para>÷ ÒÅÄËÉÈ ÓÌÕÞÁÑÈ, ËÏÇÄÁ FTP ÐÒÏËÓÉ ÎÅ ÒÁÂÏÔÁÅÔ ÞÅÒÅÚ
 		HTTP, ×Ù ÍÏÖÅÔÅ ÕËÁÚÁÔØ URL ÐÒÉÍÅÒÎÏ ÔÁË:</para>
 
-	      <screen><userinput>ftp://foo.bar.com:<replaceable>port</replaceable>/pub/FreeBSD</userinput></screen>
+	      <screen><userinput>ftp://foo.bar.com:port/pub/FreeBSD</userinput></screen>
 
 	      <para>÷ URL ×ÙÛÅ, <replaceable>port</replaceable>
 		ÜÔÏ ÎÏÍÅÒ ÐÏÒÔÁ FTP ÐÒÏËÓÉ ÓÅÒ×ÅÒÁ.</para>
@@ -821,7 +812,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
       <procedure>
 	<step>
 	  <para>ðÏÄËÌÀÞÉÔÅ ÌÀÂÏÊ ANSI (vt100) ÓÏ×ÍÅÓÔÉÍÙÊ ÔÅÒÍÉÎÁÌ ÉÌÉ
-	    ÐÒÏÇÒÁÍÍÕ ÜÍÕÌÑÃÉÉ ÔÅÒÍÉÎÁÌÁ Ë <devicename>COM1</devicename>
+	    ÐÒÏÇÒÁÍÍÕ ÜÍÕÌÑÃÉÉ ÔÅÒÍÉÎÁÌÁ Ë <filename>COM1</filename>
 	    ÐÏÒÔÕ PC, ÎÁ ËÏÔÏÒÙÊ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ &os;.</para>
 	</step>
 	<step>
@@ -833,20 +824,19 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	<step>
 	  <para>åÓÌÉ ×Ù ÎÅ ×ÉÄÉÔÅ ÎÉÞÅÇÏ ÎÁ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÊ ËÏÎÓÏÌÉ,
 	    ÐÏÄËÌÀÞÉÔÅ ËÌÁ×ÉÁÔÕÒÕ ÏÐÑÔØ.
-	    åÓÌÉ ×Ù ÚÁÇÒÕÖÁÅÔÅÓØ Ó CDROM, ×ÙÐÏÌÎÉÔÅ <xref
-	    linkend="hitspace"/> ÐÏÓÌÅ ÐÏÌÕÞÅÎÉÑ ÓÉÇÎÁÌÏ×.</para>
+	    åÓÌÉ ×Ù ÚÁÇÒÕÖÁÅÔÅÓØ Ó CDROM, ×ÙÐÏÌÎÉÔÅ <xref linkend="hitspace"/> ÐÏÓÌÅ ÐÏÌÕÞÅÎÉÑ ÓÉÇÎÁÌÏ×.</para>
 	</step>
 	<step>
 	  <para>ðÒÉ ÚÁÇÒÕÚËÅ Ó ÄÉÓËÅÔ, ÐÏÓÌÅ ÏÓÔÁÎÏ×ËÉ ÞÔÅÎÉÑ Ó ÄÉÓËÁ
-	    ×ÓÔÁ×ØÔÅ ÐÅÒ×ÙÊ ÄÉÓË <filename>kern<replaceable>X</replaceable>.flp</filename> É ÎÁÖÍÉÔÅ
+	    ×ÓÔÁ×ØÔÅ ÐÅÒ×ÙÊ ÄÉÓË <filename>kernX.flp</filename> É ÎÁÖÍÉÔÅ
 	    <keycap>Enter</keycap>.  ðÏÓÌÅ ÏÓÔÁÎÏ×ËÉ ÞÔÅÎÉÑ Ó ÄÉÓËÁ
-	    ×ÓÔÁ×ØÔÅ ÓÌÅÄÕÀÝÉÊ ÄÉÓË <filename>kern<replaceable>X</replaceable>.flp</filename> É ÎÁÖÍÉÔÅ
+	    ×ÓÔÁ×ØÔÅ ÓÌÅÄÕÀÝÉÊ ÄÉÓË <filename>kernX.flp</filename> É ÎÁÖÍÉÔÅ
 	    <keycap>Enter</keycap>, É ÔÁË ÄÁÌÅÅ ÄÌÑ ×ÓÅÈ ÄÉÓËÏ×
-	    <filename>kern<replaceable>X</replaceable>.flp</filename>.  ëÏÇÄÁ ÚÁÇÒÕÚËÁ ÚÁ×ÅÒÛÉÔÓÑ,
+	    <filename>kernX.flp</filename>.  ëÏÇÄÁ ÚÁÇÒÕÚËÁ ÚÁ×ÅÒÛÉÔÓÑ,
 	    ×ÓÔÁ×ØÔÅ ÏÐÑÔØ <filename>boot.flp</filename> É ÎÁÖÍÉÔÅ
 	    <keycap>Enter</keycap>.</para>
 	</step>
-	<step id="hitspace">
+	<step xml:id="hitspace">
 	  <para>ðÏÓÌÅ Ú×ÕËÏ×ÏÇÏ ÓÉÇÎÁÌÁ ÎÁÖÍÉÔÅ ÃÉÆÒÕ <keycap>6</keycap>,
 	    ÚÁÔÅÍ ××ÅÄÉÔÅ</para>
 
@@ -935,9 +925,9 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 
 	<answer>
 	  <para>äÁ.  òÁÓÛÉÒÅÎÎÙÅ ÒÁÚÄÅÌÙ DOS ÉÍÅÎÕÀÔÓÑ ÐÏÓÌÅ ÄÒÕÇÉÈ
-	    <quote>ÓÌÁÊÓÏ×</quote> &os;, Ô.Å. <devicename>D:</devicename>
+	    <quote>ÓÌÁÊÓÏ×</quote> &os;, Ô.Å. <filename>D:</filename>
 	    ÍÏÖÅÔ ÓÔÁÔØ <filename>/dev/da0s5</filename>,
-	    <devicename>E:</devicename> &mdash; <filename>/dev/da0s6</filename>
+	    <filename>E:</filename> &mdash; <filename>/dev/da0s6</filename>
 	    É Ô.Ä.  ÷ ÜÔÏÍ ÐÒÉÍÅÒÅ ÐÒÅÄÐÏÌÁÇÁÅÔÓÑ, ÞÔÏ ÒÁÓÛÉÒÅÎÎÙÊ ÒÁÚÄÅÌ
 	    ÎÁÈÏÄÉÔÓÑ ÎÁ ÄÉÓËÅ SCSI 0.  äÌÑ ÄÉÓËÏ× IDE ÚÁÍÅÎÉÔÅ
 	    <literal>da</literal> ÎÁ <literal>ad</literal> ÓÏÏÔ×ÅÔÓÔ×ÅÎÎÏ.
@@ -956,14 +946,13 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	<answer>
 	  <para>èÏÔÑ ÅÝÅ ÉÍÅÀÔÓÑ ÎÅËÏÔÏÒÙÅ ÏÓÔÒÙÅ ÕÇÌÙ, ×Ï ÍÎÏÇÉÈ ÓÌÕÞÁÑÈ
 	    ÍÏÖÅÔ ÐÏÄÏÊÔÉ ÕÔÉÌÉÔÁ &man.doscmd.1;, ÒÁÂÏÔÁ ÎÁÄ ËÏÔÏÒÏÊ
-	    ÐÒÏÄÏÌÖÁÅÔÓÑ.  ðÏÒÔ/ÐÁËÅÔ <filename
-	    role="package">emulators/doscmd</filename> ÍÏÖÎÏ ÎÁÊÔÉ ×
+	    ÐÒÏÄÏÌÖÁÅÔÓÑ.  ðÏÒÔ/ÐÁËÅÔ <package>emulators/doscmd</package> ÍÏÖÎÏ ÎÁÊÔÉ ×
 	    ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ× &os;.  åÓÌÉ ×Ù ÚÁÉÎÔÅÒÅÓÏ×ÁÎÙ × ÒÁÂÏÔÅ ÎÁÄ
 	    ÜÔÏÊ ÕÔÉÌÉÔÏÊ,
 	    ÏÔÐÒÁ×ØÔÅ ÐÉÓØÍÏ × &a.emulation; É ÕËÁÖÉÔÅ, ÞÔÏ ×Ù
 	    ÚÁÉÎÔÅÒÅÓÏ×ÁÎÙ × ÜÔÏÊ ÐÒÏÄÏÌÖÁÀÝÅÊÓÑ ÒÁÂÏÔÅ!</para>
 
-	  <para>ðÏÒÔ/ÐÁËÅÔ <filename role="package">emulators/pcemu</filename>
+	  <para>ðÏÒÔ/ÐÁËÅÔ <package>emulators/pcemu</package>
 	    × ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ× &os; ÜÍÕÌÉÒÕÅÔ 8088 É BIOS ÓÅÒ×ÉÓÙ ÄÌÑ
 	    ÚÁÐÕÓËÁ ÔÅËÓÔÏ×ÙÈ ÐÒÉÌÏÖÅÎÉÊ DOS.  äÌÑ ÒÁÂÏÔÙ ÅÍÕ ÔÒÅÂÕÅÔÓÑ
 	    X Window System (XFree86).</para>
@@ -979,8 +968,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	<answer>
 	  <para>óÕÝÅÓÔ×ÕÀÔ ÎÅÓËÏÌØËÏ ÐÏÒÔÏ×/ÐÁËÅÔÏ× × ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×
 	    &os;, ËÏÔÏÒÙÅ ÍÏÇÕÔ ÓÄÅÌÁÔØ ×ÏÚÍÏÖÎÙÍ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÍÎÏÇÉÈ
-	    ÐÒÉÌÏÖÅÎÉÊ &windows;.  ðÏÒÔ/ÐÁËÅÔ <filename
-	    role="package">emulators/wine</filename> ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÕÒÏ×ÅÎØ
+	    ÐÒÉÌÏÖÅÎÉÊ &windows;.  ðÏÒÔ/ÐÁËÅÔ <package>emulators/wine</package> ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÕÒÏ×ÅÎØ
 	    ÓÏ×ÍÅÓÔÉÍÏÓÔÉ ÎÁÄ &os;, ËÏÔÏÒÙÊ ÐÏÚ×ÏÌÑÅÔ ÍÎÏÇÉÍ
 	    &windows; ÐÒÉÌÏÖÅÎÉÑÍ ÒÁÂÏÔÁÔØ × X Windows (XFree86).</para>
 	</answer>
@@ -995,11 +983,9 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 	  <para>÷ ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ× ÎÁÈÏÄÑÔÓÑ ÎÅÓËÏÌØËÏ ÐÏÒÔÏ×/ÐÁËÅÔÏ×, ËÏÔÏÒÙÅ
 	    ÉÍÉÔÉÒÕÀÔ <quote>×ÉÒÔÕÁÌØÎÙÅ ÍÁÛÉÎÙ</quote> É ÐÏÚ×ÏÌÑÀÔ ÄÒÕÇÉÍ
 	    ÏÐÅÒÁÃÉÏÎÎÙÍ ÓÉÓÔÅÍÁÍ ÒÁÂÏÔÁÔØ ÐÏ×ÅÒÈ &os;.  ðÏÒÔ/ÐÁËÅÔ
-	    <filename role="package">emulators/bochs</filename> ÐÏÚ×ÏÌÑÅÔ
+	    <package>emulators/bochs</package> ÐÏÚ×ÏÌÑÅÔ
 	    &microsoft.windows;, Linux É ÄÁÖÅ ÄÒÕÇÉÍ ËÏÐÉÑÍ &os; ÒÁÂÏÔÁÔØ
-	    ×ÎÕÔÒÉ ÏËÎÁ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ &os;.  ðÏÒÔÙ/ÐÁËÅÔÙ <filename
-	    role="package">emulators/vmware2</filename> É <filename
-	    role="package">emulators/vmware3</filename> ÐÏÚ×ÏÌÑÀÔ ÚÁÐÕÓËÁÔØ
+	    ×ÎÕÔÒÉ ÏËÎÁ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ &os;.  ðÏÒÔÙ/ÐÁËÅÔÙ <package>emulators/vmware2</package> É <package>emulators/vmware3</package> ÐÏÚ×ÏÌÑÀÔ ÚÁÐÕÓËÁÔØ
 	    × &os; ËÏÍÍÅÒÞÅÓËÉÅ ×ÉÒÔÕÁÌØÎÙÅ ÍÁÛÉÎÙ VMware.</para>
 	</answer>
       </qandaentry>
@@ -1047,8 +1033,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 
 	<answer>
 	  <para>&os; ÏÞÅÎØ ÈÏÒÏÛÏ ÚÁÐÕÓËÁÅÔ ÐÒÉÌÏÖÅÎÉÑ Tru64 Ó ÐÏÍÏÝØÀ
-	    ÐÁËÅÔÁ/ÐÏÒÔÁ <filename
-	    role="package">emulators/osf1_base</filename>.</para>
+	    ÐÁËÅÔÁ/ÐÏÒÔÁ <package>emulators/osf1_base</package>.</para>
 	</answer>
       </qandaentry>
 
@@ -1059,8 +1044,7 @@ pqb0.0.1.4.0               PQB0                       PCI EIDE</screen>
 
 	<answer>
 	  <para>&os; ÍÏÖÅÔ ×ÙÐÏÌÎÑÔØ ÂÉÎÁÒÎÙÅ ÆÁÊÌÙ AlphaLinux Ó ÐÏÍÏÝØÀ
-	    ÐÏÒÔÁ/ÐÁËÅÔÁ <filename
-	    role="package">emulators/linux_base</filename>.</para>
+	    ÐÏÒÔÁ/ÐÁËÅÔÁ <package>emulators/linux_base</package>.</para>
 	</answer>
       </qandaentry>
 
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/layout.xml b/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
index f214261b11b..0eaac7ef1f7 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/layout.xml
@@ -9,7 +9,7 @@
 
 	This section contains the contents of the old LAYOUT.TXT file.
 -->
-<sect1 id="layout">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="layout">
   <title>óÏÄÅÒÖÉÍÏÅ ÄÉÓÔÒÉÂÕÔÉ×Á</title>
 
   <para>ôÉÐÉÞÎÙÊ ËÁÔÁÌÏÇ ÄÉÓÔÒÉÂÕÔÉ×Á &os; ×ÙÇÌÑÄÉÔ ÐÒÉÍÅÒÎÏ ÔÁË
@@ -29,8 +29,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
     ÎÏ ÒÁÓÐÏÌÏÖÅÎÙ ÔÁÍ ÎÅÍÎÏÇÏ ÐÏ-ÄÒÕÇÏÍÕ.  äÌÑ ÂÏÌØÛÉÎÓÔ×Á ÁÒÈÉÔÅËÔÕÒ
     ÎÁ ÄÉÓËÅ Ó ÕÓÔÁÎÏ×ËÏÊ ÎÁÈÏÄÉÔÓÑ ÔÁËÖÅ <quote>live filesystem</quote>.
     ïÎÁ ÐÏÌÅÚÎÁ ÐÒÉ ×ÏÓÓÔÁÎÏ×ÌÅÎÉÉ ÉÌÉ ÒÅÛÅÎÉÉ ÐÒÏÂÌÅÍ Ó ÓÕÝÅÓÔ×ÕÀÝÅÊ
-    ÕÓÔÁÎÏ×ËÏÊ &os; (ÏÂÒÁÔÉÔÅÓØ Ë <xref
-    linkend="trouble"/> ÚÁ ÉÎÓÔÒÕËÃÉÑÍÉ ÐÏ ÅÅ ÉÓÐÏÌØÚÏ×ÁÎÉÀ).</para>
+    ÕÓÔÁÎÏ×ËÏÊ &os; (ÏÂÒÁÔÉÔÅÓØ Ë <xref linkend="trouble"/> ÚÁ ÉÎÓÔÒÕËÃÉÑÍÉ ÐÏ ÅÅ ÉÓÐÏÌØÚÏ×ÁÎÉÀ).</para>
 
   <para>ëÁÔÁÌÏÇ <filename>floppies</filename> ÐÒÅÄÓÔÁ×ÌÑÅÔ ÏÐÒÅÄÅÌÅÎÎÙÊ
     ÉÎÔÅÒÅÓ ÄÌÑ ÐÏÌØÚÏ×ÁÔÅÌÅÊ, ËÏÔÏÒÙÅ ÎÅ ÍÏÇÕÔ ×ÙÐÏÌÎÉÔØ ÚÁÇÒÕÚËÕ Ó
@@ -111,7 +110,7 @@ README.HTM      cdrom.inf       crypto          info            tools</screen>
 	<para>ëÏÌÌÅËÃÉÑ ÐÏÒÔÏ× ÍÏÖÅÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÁ ËÁË ÌÀÂÏÊ ÄÒÕÇÏÊ
 	  ÄÉÓÔÒÉÂÕÔÉ×ÎÙÊ ÎÁÂÏÒ É ÔÒÅÂÕÅÔ ÏËÏÌÏ 190MB ÍÅÓÔÁ.  äÁÌØÎÅÊÛÁÑ
 	  ÉÎÆÏÒÍÁÃÉÑ ÐÏ ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ× ÍÏÖÅÔ ÂÙÔØ ÐÏÌÕÞÅÎÁ Ó
-	  <ulink url="&url.base;/ru/ports/"></ulink>
+	  <uri xlink:href="&url.base;/ru/ports/">&url.base;/ru/ports/</uri>
 	  ÉÌÉ ÌÏËÁÌØÎÏ ÉÚ <filename>/usr/share/doc/handbook</filename>
 	  ÅÓÌÉ ×Ù ÕÓÔÁÎÏ×ÉÌÉ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÊ ÎÁÂÏÒ
 	  <filename>doc</filename>.</para>
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml b/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
index aebf96bd73b..0000bebc1fc 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/trouble.xml
@@ -9,10 +9,10 @@
 
 	This file contains the comments of the old TROUBLE.TXT file.
 -->
-<sect1 id="trouble">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="trouble">
   <title>òÅÛÅÎÉÅ ÐÒÏÂÌÅÍ</title>
 
-  <sect2 id="repairing">
+  <sect2 xml:id="repairing">
     <title>÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÓÕÝÅÓÔ×ÕÀÝÅÊ ÕÓÔÁÎÏ×ËÉ &os;</title>
 
     <para>&os; ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÏÐÃÉÀ <quote>fixit</quote> × ÇÌÁ×ÎÏÍ ÍÅÎÀ
@@ -37,7 +37,7 @@
     <para>ðÏÌØÚÏ×ÁÔÅÌÑÍ, ËÏÔÏÒÙÅ ÎÅ ÍÏÇÕÔ ÚÁÇÒÕÚÉÔØÓÑ Ó ËÏÍÐÁËÔ-ÄÉÓËÁ,
       ÎÏ ÍÏÇÕÔ ÚÁÇÒÕÚÉÔØÓÑ Ó ÄÉÓËÅÔ, ÐÏÔÒÅÂÕÅÔÓÑ ×ÙÐÏÌÎÉÔØ ÎÅÓËÏÌØËÏ ÂÏÌØÛÅ
       ÛÁÇÏ×.  ÷ ÄÏÐÏÌÎÅÎÉÅ Ë ÄÉÓËÅÔÁÍ <filename>boot.flp</filename> É
-      <filename>kern<replaceable>X</replaceable>.flp</filename>,
+      <filename>kernX.flp</filename>,
       ÎÅÏÂÈÏÄÉÍÙÍ ÄÌÑ ÕÓÔÁÎÏ×ËÉ, ÓÏÚÄÁÊÔÅ ÄÉÓËÅÔÕ
       <filename>fixit.flp</filename>, ÔÅÍ ÖÅ ÓÐÏÓÏÂÏÍ, ÞÔÏ É ÄÒÕÇÉÅ
       ÄÉÓËÅÔÙ.  óÌÅÄÕÊÔÅ ÉÎÓÔÒÕËÃÉÑÍ ÐÏ ÚÁÇÒÕÚËÅ ÐÒÏÇÒÁÍÍÙ ÕÓÔÁÎÏ×ËÉ
@@ -146,8 +146,8 @@
 	  <para>÷ ÐÅÒ×ÏÊ ÓÉÔÕÁÃÉÉ ÉÍÅÀÔÓÑ Ä×Á IDE ÄÉÓËÁ, ËÁÖÄÙÊ ÎÁÓÔÒÏÅÎ
 	    ËÁË ÏÓÎÏ×ÎÏÊ ÎÁ Ó×ÏÅÊ ÛÉÎÅ IDE, É ÚÁÇÒÕÖÁÔØ &os; ÎÕÖÎÏ ÓÏ ×ÔÏÒÏÇÏ
 	    ÄÉÓËÁ.  BIOS ×ÉÄÉÔ ÉÈ ËÁË ÄÉÓË 0 É ÄÉÓË 1, Á &os; ×ÉÄÉÔ ÉÈ
-	    ËÁË <devicename>ad0</devicename>
-	    <devicename>ad2</devicename>.</para>
+	    ËÁË <filename>ad0</filename>
+	    <filename>ad2</filename>.</para>
 
 	  <para>&os; ÎÁÈÏÄÉÔÓÑ ÎÁ ÄÉÓËÅ 1 ÐÏ ÎÕÍÅÒÁÃÉÉ BIOS, ÔÉÐ
 	    <literal>ad</literal> É &os; ÎÕÍÅÒÁÃÉÑ ÄÉÓËÁ 2, ÎÁÂÅÒÉÔÅ:</para>
@@ -225,8 +225,8 @@
 	  <para>õÓÔÁÎÏ×ÉÔÅ ÐÅÒÅÍÅÎÎÙÅ <quote>hint.mcd.0.disabled="1"</quote>
 	    É <quote>hint.mcd.1.disabled="1"</quote> ÎÁ ÔÒÅÔØÅÊ ÓÔÁÄÉÉ
 	    ÚÁÇÒÕÚÞÉËÁ ÄÌÑ ÏÔÍÅÎÙ ÔÅÓÔÉÒÏ×ÁÎÉÑ
-	    ÕÓÔÒÏÊÓÔ× <devicename>mcd0</devicename> É
-	    <devicename>mcd1</devicename>.  ÷ÏÏÂÝÅ ÇÏ×ÏÒÑ, ×Ù ÄÏÌÖÎÙ
+	    ÕÓÔÒÏÊÓÔ× <filename>mcd0</filename> É
+	    <filename>mcd1</filename>.  ÷ÏÏÂÝÅ ÇÏ×ÏÒÑ, ×Ù ÄÏÌÖÎÙ
 	    ÏÓÔÁ×ÉÔØ ×ËÌÀÞÅÎÎÙÍÉ ÔÏÌØËÏ ÔÅ ÕÓÔÒÏÊÓÔ×Á, ËÏÔÏÒÙÅ
 	    ×Ù ÂÕÄÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ.</para>
 	</answer>
diff --git a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
index a414f0af4c0..936ef2495a6 100644
--- a/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/common/upgrade.xml
@@ -10,7 +10,7 @@
 	This section contains the contents of the old UPGRADE.TXT
 	file.
 -->
-<sect1 id="upgrading">
+<sect1 xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:id="upgrading">
   <title>ïÂÎÏ×ÌÅÎÉÅ &os;</title>
 
   <para>üÔÁ ÉÎÓÔÒÕËÃÉÑ ÏÐÉÓÙ×ÁÅÔ ÐÒÏÃÅÄÕÒÕ ÂÉÎÁÒÎÏÇÏ ÏÂÎÏ×ÌÅÎÉÑ Ó
@@ -192,7 +192,7 @@
 	ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ×ÏÚÍÏÖÎÏÓÔÉ.</para>
     </sect3>
 
-    <sect3 id="fstab">
+    <sect3 xml:id="fstab">
       <title>ðÏÓÌÅ ÕÓÔÁÎÏ×ËÉ</title>
 
       <para>ðÏÓÌÅ ÚÁ×ÅÒÛÅÎÉÑ ÐÒÏÃÅÄÕÒÙ ÕÓÔÁÎÏ×ËÉ ÁÄÍÉÎÉÓÔÒÁÔÏÒÕ ÐÒÅÄÌÁÇÁÅÔÓÑ
@@ -208,9 +208,8 @@
 
     <para>äÌÑ ÔÅÈ, ËÔÏ ÉÎÔÅÒÅÓÕÅÔÓÑ ÂÏÌÅÅ ÇÉÂËÉÍ É
       <quote>ÉÎÔÅÌÌÅËÔÕÁÌØÎÙÍ</quote> ÍÅÔÏÄÏÍ ÏÂÎÏ×ÌÅÎÉÑ, ÓÕÝÅÓÔ×ÕÅÔ ÇÌÁ×Á
-      òÕËÏ×ÏÄÓÔ×Á &os; <ulink
-      url="&url.books.handbook;/cutting-edge.html">îÁ
-      ÐÅÒÅÄÎÅÍ ËÒÁÅ ÒÁÚÒÁÂÏÔÏË</ulink>.  üÔÁ ÐÒÏÃÅÄÕÒÁ ÏÔÎÏÓÉÔÓÑ Ë
+      òÕËÏ×ÏÄÓÔ×Á &os; <link xlink:href="&url.books.handbook;/cutting-edge.html">îÁ
+      ÐÅÒÅÄÎÅÍ ËÒÁÅ ÒÁÚÒÁÂÏÔÏË</link>.  üÔÁ ÐÒÏÃÅÄÕÒÁ ÏÔÎÏÓÉÔÓÑ Ë
       ÐÅÒÅÓÂÏÒËÅ &os; ÉÚ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×.  ïÎÁ ÔÒÅÂÕÅÔ ÈÏÒÏÛÅÇÏ
       ÓÅÔÅ×ÏÇÏ ÐÏÄËÌÀÞÅÎÉÑ, Ó×ÏÂÏÄÎÏÇÏ ÍÅÓÔÁ ÎÁ ÄÉÓËÅ É ×ÒÅÍÅÎÉ,
       ÎÏ ÉÍÅÅÔ ÐÒÅÉÍÕÝÅÓÔ×Á ÐÒÉ ÓÅÔÅ×ÙÈ É ÄÒÕÇÉÈ ÂÏÌÅÅ ÓÌÏÖÎÙÈ ÕÓÔÁÎÏ×ËÁÈ.
diff --git a/release/doc/ru_RU.KOI8-R/installation/i386/Makefile b/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
index bb21c10d84b..33b3b9cb11b 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/Makefile
@@ -16,7 +16,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/ru_RU.KOI8-R/installation/i386/article.xml b/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
index 6b2dbee8582..6c4210997f5 100644
--- a/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,10 +19,8 @@
 
      Original revision: 1.5
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile b/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
index e4223135aef..19a2d0cfcfe 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/Makefile
@@ -16,7 +16,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml b/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
index 7f59c3cca49..a60c86b3a79 100644
--- a/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/ia64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,10 +19,8 @@
 
      Original revision: 1.2
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile b/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
index ba113856a7a..14685b2daae 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/Makefile
@@ -16,7 +16,6 @@ INSTALL_ONLY_COMPRESSED?=
 # SGML content
 SRCS+=	article.xml
 SRCS+=	../common/artheader.xml
-SRCS+=	../common/abstract.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
 SRCS+=	../common/trouble.xml
diff --git a/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml b/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
index b57503ba5aa..bbabe4c2209 100644
--- a/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,10 +19,8 @@
 
      Original revision: 1.2
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile b/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
index 646c2783274..8b904d6d16d 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/Makefile
@@ -15,7 +15,6 @@ INSTALL_ONLY_COMPRESSED?=
 
 # SGML content
 SRCS+=	article.xml
-SRCS+=	../../../en_US.ISO8859-1/installation/sparc64/install.xml
 SRCS+=	../common/artheader.xml
 SRCS+=	../common/install.xml
 SRCS+=	../common/layout.xml
diff --git a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
index 27380d1a1dd..56c2e2e9654 100644
--- a/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/installation/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/install.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,10 +19,8 @@
 
      Original revision: 1.5
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
 &artheader;
-&abstract;
 &sect.install;
 &sect.layout;
 &sect.upgrade;
diff --git a/release/doc/ru_RU.KOI8-R/readme/article.xml b/release/doc/ru_RU.KOI8-R/readme/article.xml
index e7bf567dd33..6eece361703 100644
--- a/release/doc/ru_RU.KOI8-R/readme/article.xml
+++ b/release/doc/ru_RU.KOI8-R/readme/article.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
-
 <!--
    The FreeBSD Russian Documentation Project
 
@@ -13,12 +12,19 @@
 
    Original revision: 1.37
 -->
+<!--
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
+  <info><title>&os; &release.current; README</title>
+    
 
-<article lang="ru">
-  <articleinfo>
-    <title>&os; &release.current; README</title>
-
-    <corpauthor>ðÒÏÅËÔ &os;</corpauthor>
+    <author><orgname>ðÒÏÅËÔ &os;</orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -32,14 +38,13 @@
       <holder role="mailto:doc@FreeBSD.org">ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</holder>
     </copyright>
 
-    <legalnotice id="trademarks" role="trademarks">
+    <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.intel;
       &tm-attrib.opengroup;
       &tm-attrib.sparc;
       &tm-attrib.general;
     </legalnotice>
-  </articleinfo>
 
   <abstract>
     <para>üÔÏÔ ÄÏËÕÍÅÎÔ ÄÁÅÔ ËÒÁÔËÏÅ ××ÅÄÅÎÉÅ × &os;
@@ -47,8 +52,9 @@
       &os;, ÏÂÚÏÒ ÒÁÚÌÉÞÎÙÈ ÓÐÏÓÏÂÏ× ÏÂÒÁÔÎÏÊ Ó×ÑÚÉ Ó ðÒÏÅËÔÏÍ &os;
       É ÓÓÙÌËÉ ÎÁ ÎÅËÏÔÏÒÙÅ ÄÒÕÇÉÅ ÉÓÔÏÞÎÉËÉ ÉÎÆÏÒÍÁÃÉÉ.</para>
   </abstract>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>÷×ÅÄÅÎÉÅ</title>
 
     <para>üÔÏ ÄÉÓÔÒÉÂÕÔÉ× &os; &release.current;
@@ -138,7 +144,7 @@
     </sect2>
   </sect1>
 
-  <sect1 id="obtain">
+  <sect1 xml:id="obtain">
     <title>ðÏÌÕÞÅÎÉÅ &os;</title>
 
     <para>&os; ÍÏÖÅÔ ÂÙÔØ ÐÏÌÕÞÅÎÁ ÍÎÏÖÅÓÔ×ÏÍ ÒÁÚÌÉÞÎÙÈ ÓÐÏÓÏÂÏ×.
@@ -158,25 +164,21 @@
 	&os;.</para>
 
       <para>óÐÉÓÏË ÐÏÓÔÁ×ÝÉËÏ× CDROM É DVD, ÉÚ×ÅÓÔÎÙÈ ðÒÏÅËÔÕ,
-	ÎÁÈÏÄÉÔÓÑ ÎÁ ÓÔÒÁÎÉÃÅ ÐÒÉÌÏÖÅÎÉÑ òÕËÏ×ÏÄÓÔ×Á <ulink
-	url="&url.books.handbook;/mirrors.html"><quote>ðÏÌÕÞÅÎÉÅ
-	&os;</quote></ulink>.</para>
+	ÎÁÈÏÄÉÔÓÑ ÎÁ ÓÔÒÁÎÉÃÅ ÐÒÉÌÏÖÅÎÉÑ òÕËÏ×ÏÄÓÔ×Á <link xlink:href="&url.books.handbook;/mirrors.html"><quote>ðÏÌÕÞÅÎÉÅ
+	&os;</quote></link>.</para>
     </sect2>
 
     <sect2>
       <title>FTP</title>
 
       <para>÷Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ FTP ÄÌÑ ÐÏÌÕÞÅÎÉÑ &os; É ÌÀÂÏÇÏ ÉÌÉ ×ÓÅÈ
-	ÐÁËÅÔÏ× Ó <ulink
-	url="ftp://ftp.FreeBSD.org/"></ulink>, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÏÆÉÃÉÁÌØÎÙÍ
+	ÐÁËÅÔÏ× Ó <uri xlink:href="ftp://ftp.FreeBSD.org/">ftp://ftp.FreeBSD.org/</uri>, ËÏÔÏÒÙÊ Ñ×ÌÑÅÔÓÑ ÏÆÉÃÉÁÌØÎÙÍ
 	ÓÁÊÔÏÍ ÒÅÌÉÚÏ× &os;, ÉÌÉ Ó ÌÀÂÏÇÏ ÉÚ ÅÇÏ
 	<quote>ÚÅÒËÁÌ</quote>.</para>
 
       <para>óÐÉÓËÉ ÓÁÊÔÏ×, ÚÅÒËÁÌÉÒÕÀÝÉÈ &os;, ÍÏÖÎÏ ÎÁÊÔÉ × ÒÁÚÄÅÌÅ
-	òÕËÏ×ÏÄÓÔ×Á <ulink
-	url="&url.books.handbook;/mirrors-ftp.html">FTP
-	ÓÁÊÔÙ</ulink>, ÉÌÉ ÎÁ ÓÔÒÁÎÉÃÁÈ <ulink
-	url="http://mirrorlist.FreeBSD.org/"></ulink>.
+	òÕËÏ×ÏÄÓÔ×Á <link xlink:href="&url.books.handbook;/mirrors-ftp.html">FTP
+	ÓÁÊÔÙ</link>, ÉÌÉ ÎÁ ÓÔÒÁÎÉÃÁÈ <uri xlink:href="http://mirrorlist.FreeBSD.org/">http://mirrorlist.FreeBSD.org/</uri>.
 	ðÏÉÓË ÂÌÉÖÁÊÛÅÇÏ (× ÔÅÒÍÉÎÁÈ ÓÅÔÉ) ÚÅÒËÁÌÁ ÄÌÑ ÚÁÇÒÕÚËÉ
 	ÄÉÓÔÒÉÂÕÔÉ×Á ÎÁÓÔÏÑÔÅÌØÎÏ ÒÅËÏÍÅÎÄÕÅÔÓÑ.</para>
 
@@ -184,9 +186,8 @@
 	Ó <email>freebsd-admin@FreeBSD.org</email> ÚÁ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ
 	ÉÎÆÏÒÍÁÃÉÅÊ Ï ÔÏÍ, ËÁË ÓÄÅÌÁÔØ ÏÆÉÃÉÁÌØÎÏÅ ÚÅÒËÁÌÏ.  ÷Ù ÔÁËÖÅ
 	ÍÏÖÅÔÅ ÎÁÊÔÉ ÐÏÌÅÚÎÕÀ ÉÎÆÏÒÍÁÃÉÀ ÐÏ ÚÅÒËÁÌÉÒÏ×ÁÎÉÀ × ÓÔÁÔØÅ
-	<ulink
-	url="&url.articles.hubs;/">úÅÒËÁÌÉÒÏ×ÁÎÉÅ
-	&os;</ulink>.</para>
+	<link xlink:href="&url.articles.hubs;/">úÅÒËÁÌÉÒÏ×ÁÎÉÅ
+	&os;</link>.</para>
 
       <para>úÅÒËÁÌÁ ÏÂÙÞÎÏ ÓÏÄÅÒÖÁÔ ÏÂÒÁÚÙ ÄÉÓËÅÔ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÎÁÞÁÌÁ
 	ÕÓÔÁÎÏ×ËÉ, Á ÔÁËÖÅ ÄÉÓÔÒÉÂÕÔÉ×ÎÙÅ ÆÁÊÌÙ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÓÁÍÏÇÏ
@@ -196,7 +197,7 @@
     </sect2>
   </sect1>
 
-  <sect1 id="contacting">
+  <sect1 xml:id="contacting">
     <title>ïÂÒÁÔÎÁÑ Ó×ÑÚØ Ó ðÒÏÅËÔÏÍ &os;</title>
 
     <sect2>
@@ -230,14 +231,13 @@
 	ÔÏÌØËÏ ÎÁ &a.announce;.</para>
 
       <para>îÁ ×ÓÅ ÓÐÉÓËÉ ÒÁÓÓÙÌËÉ ÍÏÖÅÔ Ó×ÏÂÏÄÎÏ ÐÏÄÐÉÓÁÔØÓÑ ÌÀÂÏÊ ÖÅÌÁÀÝÉÊ.
-	ðÏÓÅÔÉÔÅ <ulink url="&url.base;/mailman/listinfo">&os;
-	Mailman Info Page</ulink>.  ôÁÍ ÎÁÈÏÄÉÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
+	ðÏÓÅÔÉÔÅ <link xlink:href="&url.base;/mailman/listinfo">&os;
+	Mailman Info Page</link>.  ôÁÍ ÎÁÈÏÄÉÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
 	ÐÏ ÐÏÄÐÉÓËÅ ÎÁ ÒÁÚÌÉÞÎÙÅ ÓÐÉÓËÉ ÒÁÓÓÙÌËÉ, ÄÏÓÔÕÐ Ë ÁÒÈÉ×ÁÍ, É Ô.Ä.
 	óÕÝÅÓÔ×ÕÅÔ ÍÎÏÖÅÓÔ×Ï ÎÅ ÕÐÏÍÑÎÕÔÙÈ ÚÄÅÓØ ÓÐÉÓËÏ× ÒÁÓÓÙÌËÉ,
 	ÐÒÅÄÎÁÚÎÁÞÅÎÎÙÈ ÄÌÑ ÏÓÏÂÙÈ ÃÅÌÅÊ; ÄÏÐÏÌÎÉÔÅÌØÎÕÀ ÉÎÆÏÒÍÁÃÉÀ ÍÏÖÎÏ
-	ÎÁÊÔÉ ÉÌÉ ÎÁ ÓÔÒÁÎÉÃÁÈ Mailman ÉÌÉ × <ulink
-	url="&url.base;/ru/support.html#mailing-list">ÒÁÚÄÅÌÅ
-	ÓÐÉÓËÏ× ÒÁÓÓÙÌËÉ</ulink> ÎÁ ×Å ÓÁÊÔÅ &os;.</para>
+	ÎÁÊÔÉ ÉÌÉ ÎÁ ÓÔÒÁÎÉÃÁÈ Mailman ÉÌÉ × <link xlink:href="&url.base;/ru/support.html#mailing-list">ÒÁÚÄÅÌÅ
+	ÓÐÉÓËÏ× ÒÁÓÓÙÌËÉ</link> ÎÁ ×Å ÓÁÊÔÅ &os;.</para>
 
       <important>
 	<para><emphasis>îÅ</emphasis> ÏÔÐÒÁ×ÌÑÊÔÅ × ÒÁÓÓÙÌËÉ ÐÉÓØÍÁ Ó ÐÒÏÓØÂÏÊ
@@ -260,9 +260,8 @@
 	ÄÁÎÎÙÈ, ÇÄÅ ÏÔÓÌÅÖÉ×ÁÅÔÓÑ ÉÈ ÓÏÓÔÏÑÎÉÅ; ÒÁÚÒÁÂÏÔÞÉËÉ &os;
 	ÐÒÉÌÁÇÁÀÔ ÍÁËÓÉÍÕÍ ÕÓÉÌÉÊ Ë ÔÏÍÕ, ÞÔÏÂÙ ÍÁËÓÉÍÁÌØÎÏ ÂÙÓÔÒÏ
 	ÒÅÁÇÉÒÏ×ÁÔØ ÎÁ ×ÓÅ ÓÏÏÂÝÅÎÉÑ Ï ÐÒÏÂÌÅÍÁÈ.  îÁ ×Å ÓÁÊÔÅ
-	&os; ÄÏÓÔÕÐÅÎ <ulink
-	url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">ÓÐÉÓÏË
-	×ÓÅÈ ÁËÔÉ×ÎÙÈ PR</ulink>; ÜÔÏÔ ÓÐÉÓÏË ÐÏÌÅÚÅÎ ÄÌÑ ÐÒÏÓÍÏÔÒÁ
+	&os; ÄÏÓÔÕÐÅÎ <link xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">ÓÐÉÓÏË
+	×ÓÅÈ ÁËÔÉ×ÎÙÈ PR</link>; ÜÔÏÔ ÓÐÉÓÏË ÐÏÌÅÚÅÎ ÄÌÑ ÐÒÏÓÍÏÔÒÁ
 	×ÓÅÈ ÐÏÔÅÎÃÉÁÌØÎÙÈ ÐÒÏÂÌÅÍ, ËÏÔÏÒÙÅ ÍÏÇÌÉ ×ÓÔÒÅÔÉÔØÓÑ ÄÒÕÇÉÍ
 	ÐÏÌØÚÏ×ÁÔÅÌÑÍ.</para>
 
@@ -273,22 +272,21 @@
 	&man.send-pr.1; ÄÌÑ ÏÔÐÒÁ×ËÉ ÓÏÏÂÝÅÎÉÑ Ï ÐÒÏÂÌÅÍÅ, ÐÏÐÒÏÂÕÊÔÅ
 	ÏÔÐÒÁ×ÉÔØ ÅÇÏ × &a.bugs;.</para>
 
-      <para>úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÔÁÔØÅ <ulink
-	url="&url.articles.problem-reports;/"><quote>óÏÓÔÁ×ÌÅÎÉÅ
-	óÏÏÂÝÅÎÉÊ Ï ÐÒÏÂÌÅÍÁÈ × &os;</quote></ulink>, ÄÏÓÔÕÐÎÏÊ ÎÁ
+      <para>úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÔÁÔØÅ <link xlink:href="&url.articles.problem-reports;/"><quote>óÏÓÔÁ×ÌÅÎÉÅ
+	óÏÏÂÝÅÎÉÊ Ï ÐÒÏÂÌÅÍÁÈ × &os;</quote></link>, ÄÏÓÔÕÐÎÏÊ ÎÁ
 	×Å ÓÁÊÔÅ &os;.  ÷ ÜÔÏÊ ÓÔÁÔØÅ ÐÒÅÄÓÔÁ×ÌÅÎÙ ÍÎÏÖÅÓÔ×Ï ÓÏ×ÅÔÏ× ÐÏ
 	ÓÏÓÔÁ×ÌÅÎÉÀ É ÏÔÐÒÁ×ËÅ ÜÆÆÅËÔÉ×ÎÙÈ ÓÏÏÂÝÅÎÉÊ Ï ÐÒÏÂÌÅÍÁÈ.</para>
     </sect2>
   </sect1>
 
-  <sect1 id="seealso">
+  <sect1 xml:id="seealso">
     <title>éÓÔÏÞÎÉËÉ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ</title>
 
     <para>óÕÝÅÓÔ×ÕÅÔ ÍÎÏÖÅÓÔ×Ï ÉÓÔÏÞÎÉËÏ× ÉÎÆÏÒÍÁÃÉÉ ÐÏ &os;; ÎÅËÏÔÏÒÙÅ
       ×ËÌÀÞÅÎÙ × ÄÉÓÔÒÉÂÕÔÉ×, ÄÒÕÇÉÅ ÄÏÓÔÕÐÎÙ ÏÎ-ÌÁÊÎ ÉÌÉ × ÂÕÍÁÖÎÏÊ
       ×ÅÒÓÉÉ.</para>
 
-    <sect2 id="release-docs">
+    <sect2 xml:id="release-docs">
       <title>äÏËÕÍÅÎÔÁÃÉÑ ÎÁ ÒÅÌÉÚ</title>
 
       <para>âÏÌÅÅ ÓÐÅÃÉÆÉÞÅÓËÁÑ ÉÎÆÏÒÍÁÃÉÑ ÐÏ ÄÉÓÔÒÉÂÕÔÉ×Õ
@@ -349,12 +347,12 @@
 
       </para>
 
-      <para>îÁ ÐÌÁÔÆÏÒÍÁÈ, ËÏÔÏÒÙÅ ÐÏÄÄÅÒÖÉ×ÁÀÔ &man.sysinstall.8; (×
+      <para>îÁ ÐÌÁÔÆÏÒÍÁÈ, ËÏÔÏÒÙÅ ÐÏÄÄÅÒÖÉ×ÁÀÔ &man.bsdinstall.8; (×
 	ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ alpha, &i386;, ia64, pc98, É &sparc64;),
 	ÜÔÉ ÄÏËÕÍÅÎÔÙ ÏÂÙÞÎÏ ÄÏÓÔÕÐÎÙ ÞÅÒÅÚ ÍÅÎÀ
 	Documentation ×Ï ×ÒÅÍÑ ÕÓÔÁÎÏ×ËÉ.  ëÁË ÔÏÌØËÏ ÓÉÓÔÅÍÁ ÂÕÄÅÔ
 	ÕÓÔÁÎÏ×ÌÅÎÁ, ×Ù ÍÏÖÅÔÅ ÐÏ×ÔÏÒÎÏ ×ÏÊÔÉ × ÜÔÏ ÍÅÎÀ, ÐÏ×ÔÏÒÎÏ ÚÁÐÕÓÔÉ×
-	&man.sysinstall.8;.</para>
+	&man.bsdinstall.8;.</para>
 
       <note>
 	<para>ëÒÁÊÎÅ ×ÁÖÎÏ ÐÒÏÞÅÓÔØ ÓÐÉÓÏË ÐÒÏÂÌÅÍ ÌÀÂÏÇÏ ÓÕÝÅÓÔ×ÕÀÝÅÇÏ
@@ -364,7 +362,7 @@
 	  ÕÖÅ ÕÓÔÁÒÅÌ ÐÏ ÏÐÒÅÄÅÌÅÎÉÀ, ÎÏ ÄÒÕÇÉÅ ËÏÐÉÉ ÏÂÎÏ×ÌÑÀÔÓÑ
 	  É ÎÅÏÂÈÏÄÉÍÏ ÐÒÏÞÅÓÔØ <quote>ÔÅËÕÝÉÅ ÓÏÏÂÝÅÎÉÑ Ï ÐÒÏÂÌÅÍÁÈ</quote>
 	  ÄÌÑ ÄÁÎÎÏÇÏ ÒÅÌÉÚÁ.  üÔÉ ËÏÐÉÉ ÎÁÈÏÄÑÔÓÑ ÎÁ
-	  <ulink url="&url.base;/ru/releases/"></ulink>
+	  <uri xlink:href="&url.base;/ru/releases/">&url.base;/ru/releases/</uri>
 	  (Á ÔÁËÖÅ ÎÁ ÌÀÂÏÍ ÓÁÊÔÅ, ÐÏÄÄÅÒÖÉ×ÁÀÝÅÍ ÏÂÎÏ×ÌÑÅÍÏÅ ÚÅÒËÁÌÏ
 	  ÜÔÏÇÏ ÒÅÓÕÒÓÁ).</para>
       </note>
@@ -375,9 +373,8 @@
 
       <para>ëÁË É ÐÒÁËÔÉÞÅÓËÉ ×ÓÅ &unix; ÐÏÄÏÂÎÙÅ ÓÉÓÔÅÍÙ, &os; ÐÏÓÔÁ×ÌÑÅÔÓÑ
 	Ó ÎÁÂÏÒÏÍ ÓÔÒÁÎÉà ÓÐÒÁ×ÏÞÎÉËÁ, ÄÏÓÔÕÐÎÙÈ ÞÅÒÅÚ ËÏÍÁÎÄÕ &man.man.1;
-	ÉÌÉ ÞÅÒÅÚ <ulink
-	url="http://www.FreeBSD.org/cgi/man.cgi">ÇÉÐÅÒÔÅËÓÔÏ×ÙÊ
-	ÛÌÀÚ ÓÔÒÁÎÉà ÓÐÒÁ×ÏÞÎÉËÁ</ulink> ÎÁ ×Å ÓÁÊÔÅ &os;.  óÔÒÁÎÉÃÙ
+	ÉÌÉ ÞÅÒÅÚ <link xlink:href="http://www.FreeBSD.org/cgi/man.cgi">ÇÉÐÅÒÔÅËÓÔÏ×ÙÊ
+	ÛÌÀÚ ÓÔÒÁÎÉà ÓÐÒÁ×ÏÞÎÉËÁ</link> ÎÁ ×Å ÓÁÊÔÅ &os;.  óÔÒÁÎÉÃÙ
 	ÓÐÒÁ×ÏÞÎÉËÁ ÄÁÀÔ ÉÎÆÏÒÍÁÃÉÀ ÐÏ ÒÁÚÌÉÞÎÙÍ ËÏÍÁÎÄÁÍ É API,
 	ÄÏÓÔÕÐÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÀ &os;.</para>
 
@@ -394,13 +391,10 @@
       <para>ä×Å ÏÞÅÎØ ÐÏÌÅÚÎÙÅ ËÏÌÌÅËÃÉÉ ÏÔÎÏÓÑÝÅÊÓÑ Ë &os; ÉÎÆÏÒÍÁÃÉÉ,
 	ÐÏÄÄÅÒÖÉ×ÁÅÍÙÅ ðÒÏÅËÔÏÍ &os;, ÜÔÏ òÕËÏ×ÏÄÓÔ×Ï &os; É FAQ ÐÏ &os;
 	(Frequently Asked Questions, ÞÁÓÔÏ ÚÁÄÁ×ÁÅÍÙÅ ×ÏÐÒÏÓÙ).
-	ïÎÌÁÊÎ ×ÅÒÓÉÉ <ulink
-	url="&url.books.handbook;/">òÕËÏ×ÏÄÓÔ×Á</ulink>
-	É <ulink
-	url="&url.books.faq;/">FAQ</ulink>
-	×ÓÅÇÄÁ ÄÏÓÔÕÐÎÙ ÓÏ <ulink
-	url="&url.base;/ru/docs.html">ÓÔÒÁÎÉÃÙ
-	ÄÏËÕÍÅÎÔÁÃÉÉ &os;</ulink> É ×ÓÅÈ ÚÅÒËÁÌ.  åÓÌÉ ×Ù ÕÓÔÁÎÏ×ÉÌÉ
+	ïÎÌÁÊÎ ×ÅÒÓÉÉ <link xlink:href="&url.books.handbook;/">òÕËÏ×ÏÄÓÔ×Á</link>
+	É <link xlink:href="&url.books.faq;/">FAQ</link>
+	×ÓÅÇÄÁ ÄÏÓÔÕÐÎÙ ÓÏ <link xlink:href="&url.base;/ru/docs.html">ÓÔÒÁÎÉÃÙ
+	ÄÏËÕÍÅÎÔÁÃÉÉ &os;</link> É ×ÓÅÈ ÚÅÒËÁÌ.  åÓÌÉ ×Ù ÕÓÔÁÎÏ×ÉÌÉ
 	ÄÉÓÔÒÉÂÕÔÉ×ÎÙÊ ÎÁÂÏÒ <filename>doc</filename>, òÕËÏ×ÏÄÓÔ×Ï
 	É FAQ ÍÏÖÎÏ ÐÒÏÞÅÓÔØ ÌÏËÁÌØÎÏ.</para>
 
@@ -413,8 +407,7 @@
 	ÜÔÉ ÄÏËÕÍÅÎÔÙ ÄÏÓÔÕÐÎÙ ÓÏ ÓÔÒÁÎÉÃÙ ÄÏËÕÍÅÎÔÁÃÉÉ &os; ÉÌÉ
 	ÉÚ ÄÉÓÔÒÉÂÕÔÉ×ÎÏÇÏ ÎÁÂÏÒÁ <filename>doc</filename>.</para>
 
-      <para>óÐÉÓÏË ÄÒÕÇÉÈ ËÎÉÇ É ÄÏËÕÍÅÎÔÏ× ÐÏ &os; ÍÏÖÎÏ ÎÁÊÔÉ × <ulink
-	url="&url.books.handbook;/bibliography.html">ÂÉÂÌÉÏÇÒÁÆÉÉ</ulink>
+      <para>óÐÉÓÏË ÄÒÕÇÉÈ ËÎÉÇ É ÄÏËÕÍÅÎÔÏ× ÐÏ &os; ÍÏÖÎÏ ÎÁÊÔÉ × <link xlink:href="&url.books.handbook;/bibliography.html">ÂÉÂÌÉÏÇÒÁÆÉÉ</link>
 	òÕËÏ×ÏÄÓÔ×Á &os;.  ðÏÓËÏÌØËÕ &os; ×Ï ×ÓÅÍ ÎÁÓÌÅÄÕÅÔ &unix;,
 	ÍÎÏÇÉÅ ÄÒÕÇÉÅ ÓÔÁÔØÉ É ËÎÉÇÉ, ÎÁÐÉÓÁÎÎÙÅ ÄÌÑ ÓÉÓÔÅÍ &unix;,
 	ÔÁËÖÅ ÐÏÄÈÏÄÑÔ É ÄÌÑ &os;, É ÎÅËÏÔÏÒÙÅ ÉÚ ÎÉÈ ÐÒÉ×ÅÄÅÎÙ ×
@@ -422,15 +415,14 @@
     </sect2>
   </sect1>
 
-  <sect1 id="acknowledgements">
+  <sect1 xml:id="acknowledgements">
     <title>âÌÁÇÏÄÁÒÎÏÓÔÉ</title>
 
     <para>&os; ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÏÂÏÊ ÒÅÚÕÌØÔÁÔ ÒÁÂÏÔÙ ÍÎÏÇÉÈ ÓÏÔÅÎ, ÅÓÌÉ ÎÅ ÔÙÓÑÞ
       ÌÀÄÅÊ ÐÏ ×ÓÅÍÕ ÍÉÒÕ, ÒÁÂÏÔÁ×ÛÉÈ ÂÅÓÞÉÓÌÅÎÎÏÅ ËÏÌÉÞÅÓÔ×Ï ×ÒÅÍÅÎÉ
       ÄÌÑ ÓÏÚÄÁÎÉÑ ÜÔÏÇÏ ÄÉÓÔÒÉÂÕÔÉ×Á.  úÁ ÐÏÌÎÙÍ ÓÐÉÓËÏÍ ÒÁÚÒÁÂÏÔÞÉËÏ× É
-      ÕÞÁÓÔÎÉËÏ× ðÒÏÅËÔÁ &os; ÏÂÒÁÝÁÊÔÅÓØ Ë <ulink
-      url="&url.articles.contributors;/"><quote>óÐÉÓËÕ
-      ËÏÎÔÒÉÂØÀÔÏÒÏ× ðÒÏÅËÔÁ &os;</quote></ulink> ÎÁ ×Å ÓÁÊÔÅ &os; ÉÌÉ
+      ÕÞÁÓÔÎÉËÏ× ðÒÏÅËÔÁ &os; ÏÂÒÁÝÁÊÔÅÓØ Ë <link xlink:href="&url.articles.contributors;/"><quote>óÐÉÓËÕ
+      ËÏÎÔÒÉÂØÀÔÏÒÏ× ðÒÏÅËÔÁ &os;</quote></link> ÎÁ ×Å ÓÁÊÔÅ &os; ÉÌÉ
       ÌÀÂÏÍ ÉÚ ÅÇÏ ÚÅÒËÁÌ.</para>
 
     <para>ïÓÏÂÙÅ ÂÌÁÇÏÄÁÒÎÏÓÔÉ ×ÙÒÁÖÁÀÔÓÑ ÍÎÏÇÉÍ ÔÙÓÑÞÁÍ ÐÏÌØÚÏ×ÁÔÅÌÅÊ
@@ -438,12 +430,3 @@
       ÐÒÏÓÔÏ ÎÅ ÂÙÌ ÂÙ ×ÏÚÍÏÖÅÎ.</para>
   </sect1>
 </article>
-
-<!--
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
index 04611351e92..ee3daaad12f 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/alpha/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "alpha">
 <!ENTITY arch.print "Alpha/AXP">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,7 +19,6 @@
 
      Original revision: 1.6
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
index 76fcd79401f..77fb7c5657b 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/amd64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "amd64">
 <!ENTITY arch.print "AMD64">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,7 +19,6 @@
 
      Original revision: 1.4
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml b/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
index f2c8b23419d..957448bb95b 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/common/new.xml
@@ -6,11 +6,10 @@
 
      Original revision: 1.880
 -->
+<info xmlns="http://docbook.org/ns/docbook"><title>éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ &os;/&arch; &release.current;</title>
+  
 
-<articleinfo>
-  <title>éÎÆÏÒÍÁÃÉÑ Ï ÒÅÌÉÚÅ &os;/&arch; &release.current;</title>
-
-  <corpauthor>ðÒÏÅËÔ &os;</corpauthor>
+  <author><orgname>ðÒÏÅËÔ &os;</orgname></author>
 
   <pubdate>$FreeBSD$</pubdate>
 
@@ -24,7 +23,7 @@
     <holder role="mailto:doc@FreeBSD.org">ðÒÏÅËÔ ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÉÑ &os;</holder>
   </copyright>
 
-  <legalnotice id="trademarks" role="trademarks">
+  <legalnotice xml:id="trademarks" role="trademarks">
     &tm-attrib.freebsd;
     &tm-attrib.ibm;
     &tm-attrib.ieee;
@@ -42,9 +41,9 @@
       × ÑÄÒÏ É ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÅ ÐÒÏÇÒÁÍÍÙ &os;.  ðÒÅÄÓÔÁ×ÌÅÎÙ ÔÁËÖÅ
       ËÒÁÔËÉÅ ÚÁÍÅÔËÉ ÐÏ ÏÂÎÏ×ÌÅÎÉÀ ÓÉÓÔÅÍÙ.</para>
   </abstract>
-</articleinfo>
+</info>
 
-<sect1 id="intro">
+<sect1 xml:id="intro">
   <title>÷×ÅÄÅÎÉÅ</title>
 
   <para>üÔÏÔ ÄÏËÕÍÅÎÔ ÓÏÄÅÒÖÉÔ ÉÎÆÏÒÍÁÃÉÀ Ï ÒÅÌÉÚÅ &os;
@@ -56,26 +55,21 @@
   <para releasetype="current">äÉÓÔÒÉÂÕÔÉ× (&release.type;), ÄÌÑ ËÏÔÏÒÏÇÏ ÐÒÅÄÏÓÔÁ×ÌÅÎÁ ÜÔÁ
     ÉÎÆÏÒÍÁÃÉÑ, ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÏÂÏÊ ÐÏÓÌÅÄÎÀÀ ÔÏÞËÕ ÎÁ ×ÅÔ×É ÒÁÚÒÁÂÏÔËÉ
     Ó ÍÏÍÅÎÔÁ ÓÏÚÄÁÎÉÑ &release.branch;.  éÎÆÏÒÍÁÃÉÀ Ï ÓÏÂÒÁÎÎÙÈ ÂÉÎÁÒÎÙÈ ÄÉÓÔÒÉÂÕÔÉ×ÁÈ
-    (&release.type;) ÉÚ ÜÔÏÊ ×ÅÔ×É ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ <ulink
-    url="&release.url;"></ulink>.</para>
+    (&release.type;) ÉÚ ÜÔÏÊ ×ÅÔ×É ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ <uri xlink:href="&release.url;">&release.url;</uri>.</para>
 
   <para releasetype="snapshot">äÉÓÔÒÉÂÕÔÉ× (&release.type;), ÄÌÑ ËÏÔÏÒÏÇÏ ÐÒÅÄÏÓÔÁ×ÌÅÎÁ ÜÔÁ
     ÉÎÆÏÒÍÁÃÉÑ, ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÏÂÏÊ ÔÏÞËÕ ÎÁ ×ÅÔ×É ÒÁÚÒÁÂÏÔËÉ ÍÅÖÄÕ
     &release.prev; É ÂÕÄÕÝÉÍ ÒÅÌÉÚÏÍ &release.next;.   éÎÆÏÒÍÁÃÉÀ Ï
     ÓÏÂÒÁÎÎÙÈ ÂÉÎÁÒÎÙÈ ÄÉÓÔÒÉÂÕÔÉ×ÁÈ (&release.type;) ÉÚ ÜÔÏÊ ×ÅÔ×É
-    ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ <ulink url="&release.url;"></ulink>.</para>
+    ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ <uri xlink:href="&release.url;">&release.url;</uri>.</para>
 
   <para releasetype="release">üÔÏÔ ÄÉÓÔÒÉÂÕÔÉ× &os; &release.current; ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÏÂÏÊ
-    &release.type;.  åÇÏ ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ <ulink
-    url="&release.url;"></ulink> ÉÌÉ ÎÁ ÌÀÂÏÍ ÉÚ ÚÅÒËÁÌ.  äÏÐÏÌÎÉÔÅÌØÎÁÑ
+    &release.type;.  åÇÏ ÍÏÖÎÏ ÎÁÊÔÉ ÎÁ <uri xlink:href="&release.url;">&release.url;</uri> ÉÌÉ ÎÁ ÌÀÂÏÍ ÉÚ ÚÅÒËÁÌ.  äÏÐÏÌÎÉÔÅÌØÎÁÑ
     ÉÎÆÏÒÍÁÃÉÑ ÐÏ ÐÏÌÕÞÅÎÉÀ ÜÔÏÇÏ (ÉÌÉ ÄÒÕÇÏÇÏ) &release.type;
     ÄÉÓÔÒÉÂÕÔÉ×Á &os; ÍÏÖÅÔ ÂÙÔØ ÎÁÊÄÅÎÁ ×
-    <ulink
-    url="&url.books.handbook;/mirrors.html"
->ÐÒÉÌÏÖÅÎÉÉ
-    <quote>ðÏÌÕÞÅÎÉÅ &os;</quote></ulink> <ulink
-    url="&url.books.handbook;/">òÕËÏ×ÏÄÓÔ×Á
-    &os;</ulink>.</para>
+    <link xlink:href="&url.books.handbook;/mirrors.html">ÐÒÉÌÏÖÅÎÉÉ
+    <quote>ðÏÌÕÞÅÎÉÅ &os;</quote></link> <link xlink:href="&url.books.handbook;/">òÕËÏ×ÏÄÓÔ×Á
+    &os;</link>.</para>
 
   <para>÷ÓÅÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÒÅËÏÍÅÎÄÕÅÔÓÑ ÏÚÎÁËÏÍÉÔØÓÑ Ó ÓÏÏÂÝÅÎÉÑÍÉ Ï
     ÐÒÏÂÌÅÍÁÈ ÐÅÒÅÄ ÕÓÔÁÎÏ×ËÏÊ &os;.  ÷ ÜÔÏÔ ÄÏËÕÍÅÎÔ ×ÎÏÓÑÔÓÑ
@@ -87,7 +81,7 @@
 
 </sect1>
 
-<sect1 id="new">
+<sect1 xml:id="new">
   <title>þÔÏ ÎÏ×ÏÇÏ</title>
 
   <para>÷ ÜÔÏÍ ÒÁÚÄÅÌÅ ÏÐÉÓÁÎÙ
@@ -108,20 +102,20 @@
     ÂÅÚÏÐÁÓÎÏÓÔÉ, ×ÉÄÉÍÙÈ ÐÏÌØÚÏ×ÁÔÅÌÀ ÉÚÍÅÎÅÎÉÑÈ, É ÏÓÎÏ×ÎÙÈ ÁÒÈÉÔÅËÔÕÒÎÙÈ
     ÕÌÕÞÛÅÎÉÑÈ.</para>
 
-  <sect2 id="security">
+  <sect2 xml:id="security">
     <title>óÏÏÂÝÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ</title>
 
     <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × ÕÔÉÌÉÔÅ &man.fetch.1;, ÐÏÚ×ÏÌÑ×ÛÁÑ
       ÚÌÏÎÁÍÅÒÅÎÎÏÍÕ HTTP ÓÅÒ×ÅÒÕ ÐÅÒÅÚÁÐÉÓØ ÐÒÏÉÚ×ÏÌØÎÙÈ ÕÞÁÓÔËÏ× ÐÁÍÑÔÉ
       ËÌÉÅÎÔÁ.  úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:16.fetch.asc">FreeBSD-SA-04:16.fetch</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:16.fetch.asc">FreeBSD-SA-04:16.fetch</link>.
       &merged;</para>
 
     <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × &man.procfs.5; É &man.linprocfs.5;,
       ÐÏÚ×ÏÌÑ×ÛÁÑ ÚÌÏÎÁÍÅÒÅÎÎÏÍÕ ÌÏËÁÌØÎÏÍÕ ÐÏÌØÚÏ×ÁÔÅÌÀ ÞÉÔÁÔØ ÞÁÓÔÉ
       ÐÁÍÑÔÉ ÑÄÒÁ ÉÌÉ ×ÙÐÏÌÎÑÔØ ÌÏËÁÌØÎÕÀ DoS ÁÔÁËÕ ÐÕÔÅÍ ×ÙÚÏ×Á ÐÁÎÉËÉ
       ÓÉÓÔÅÍÙ.  úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:17.procfs.asc">FreeBSD-SA-04:17.procfs</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-04:17.procfs.asc">FreeBSD-SA-04:17.procfs</link>.
       &merged;</para>
 
     <para>÷ ËÌÉÅÎÔÅ TELNET ÂÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ Ä×Å ÏÛÉÂËÉ ÐÅÒÅÐÏÌÎÅÎÉÑ ÂÕÆÅÒÁ.
@@ -130,14 +124,14 @@
       &man.telnet.1; ×ÙÐÏÌÎÉÔØ ÐÒÏÉÚ×ÏÌØÎÙÊ ËÏÄ Ó ÐÒÉ×ÉÌÅÇÉÑÍÉ ÐÏÌØÚÏ×ÁÔÅÌÑ,
       ÚÁÐÕÓÔÉ×ÛÅÇÏ ËÌÉÅÎÔ.
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:01.telnet.asc">FreeBSD-SA-05:01.telnet</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:01.telnet.asc">FreeBSD-SA-05:01.telnet</link>.
       &merged;</para>
 
     <para>÷ ÓÉÓÔÅÍÎÏÍ ×ÙÚÏ×Å &man.sendfile.2; ÂÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ,
       Ó×ÑÚÁÎÎÁÑ Ó ÒÁÓËÒÙÔÉÅÍ ÉÎÆÏÒÍÁÃÉÉ, ËÏÔÏÒÁÑ ÍÏÇÌÁ ÐÏÚ×ÏÌÉÔØ ÐÅÒÅÄÁÞÕ
       ÐÒÏÉÚ×ÏÌØÎÙÈ ÞÁÓÔÅÊ ÐÁÍÑÔÉ ÑÄÒÁ.
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:02.sendfile.asc">FreeBSD-SA-05:02.sendfile</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:02.sendfile.asc">FreeBSD-SA-05:02.sendfile</link>.
       &merged;</para>
 
     <para arch="amd64">âÙÌÏ ÉÓÐÒÁ×ÌÅÎÏ ×ÏÚÍÏÖÎÏÅ ÒÁÓÛÉÒÅÎÉÅ ÐÒÉ×ÉÌÅÇÉÊ × &os;/amd64.
@@ -145,42 +139,41 @@
       ÄÏÓÔÕÐ Ë ÎÅËÏÔÏÒÏÍÕ ÏÂÏÒÕÄÏ×ÁÎÉÀ, ÄÏÓÔÕÐ Ë ËÏÔÏÒÏÍÕ ÎÅ ÍÏÇ ÂÙÔØ
       ÐÏÌÕÞÅÎ ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÕÒÏ×ÎÑ ÐÒÉ×ÉÌÅÇÉÊ.
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:03.amd64.asc">FreeBSD-SA-05:03.amd64</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:03.amd64.asc">FreeBSD-SA-05:03.amd64</link>.
       &merged;</para>
 
     <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × <literal>SIOCGIFCONF</literal> &man.ioctl.2;,
       ÐÒÉ×ÏÄÉ×ÛÁÑ Ë ÕÔÅÞËÅ ÉÎÆÏÒÍÁÃÉÉ, ÉÚ-ÚÁ ËÏÔÏÒÏÊ ÐÏÄ×ÅÒÇÁÌÉÓØ ÕÔÅÞËÅ 12
       ÂÁÊÔ ÐÁÍÑÔÉ ÑÄÒÁ.
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:04.ifconf.asc">FreeBSD-SA-05:04.ifconf</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:04.ifconf.asc">FreeBSD-SA-05:04.ifconf</link>.
       &merged;</para>
  
     <para>âÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ ÎÅÓËÏÌØËÏ ÐÒÏÇÒÁÍÍÎÙÈ ÏÛÉÂÏË × &man.cvs.1;,
       ËÏÔÏÒÙÅ ÐÏÔÅÎÃÉÁÌØÎÏ ÍÏÇÌÉ ÐÒÉ×ÏÄÉÔØ Ë ×ÙÐÏÌÎÅÎÉÀ ÐÒÏÉÚ×ÏÌØÎÏÇÏ
       ËÏÄÁ ÎÁ ÓÅÒ×ÅÒÁÈ CVS.  äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ ×
       ÓÏÏÂÝÅÎÉÉ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:05.cvs.asc">FreeBSD-SA-05:05.cvs</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:05.cvs.asc">FreeBSD-SA-05:05.cvs</link>.
       &merged;</para>
 
-    <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ÐÒÁ× ÎÁ ÆÁÊÌ ÕÓÔÒÏÊÓÔ×Á <filename
-	class="devicefile">/dev/iir</filename>, ËÏÔÏÒÁÑ ÐÏÚ×ÏÌÑÌÁ
+    <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ ÕÓÔÁÎÏ×ËÉ ÐÒÁ× ÎÁ ÆÁÊÌ ÕÓÔÒÏÊÓÔ×Á <filename>/dev/iir</filename>, ËÏÔÏÒÁÑ ÐÏÚ×ÏÌÑÌÁ
       ÎÅÐÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÍ ÌÏËÁÌØÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ ÏÔÐÒÁ×ÌÑÔØ ËÏÍÁÎÄÙ
       ÏÂÏÒÕÄÏ×ÁÎÉÀ, ÐÏÄÄÅÒÖÉ×ÁÅÍÏÍÕ ÄÒÁÊ×ÅÒÏÍ &man.iir.4;.
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:06.iir.asc">FreeBSD-SA-05:06.iir</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:06.iir.asc">FreeBSD-SA-05:06.iir</link>.
       &merged;</para>
 
    <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × ÐÒÏ×ÅÒËÅ ÁÒÇÕÍÅÎÔÏ× ÓÉÓÔÅÍÎÏÇÏ ×ÙÚÏ×Á
      &man.i386.get.ldt.2;, ËÏÔÏÒÁÑ ÐÏÚ×ÏÌÑÌÁ ÒÁÓËÒÙÔÉÅ ÉÎÆÏÒÍÁÃÉÉ × ÐÁÍÑÔÉ
      ÑÄÒÁ ÐÏÌØÚÏ×ÁÔÅÌØÓËÉÍ ÐÒÏÃÅÓÓÁÍ.  úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ
      Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-     <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:07.ldt.asc">FreeBSD-SA-05:07.ldt</ulink>.
+     <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:07.ldt.asc">FreeBSD-SA-05:07.ldt</link>.
      &merged;</para>
 
     <para>âÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ ÎÅÓËÏÌØËÏ ÏÛÉÂÏË, ÐÏÚ×ÏÌÑ×ÛÉÈ ÒÁÓËÒÙÔÉÅ ÉÎÆÏÒÍÁÃÉÉ
       × ÒÁÚÌÉÞÎÙÈ ÏÂÌÁÓÔÑÈ ÐÁÍÑÔÉ ÑÄÒÁ.  úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ
       Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:08.kmem.asc">FreeBSD-SA-05:08.kmem</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:08.kmem.asc">FreeBSD-SA-05:08.kmem</link>.
       &merged;</para>
 
     <para arch="i386,amd64">÷ÓÌÅÄÓÔ×ÉÅ ÏÂÎÁÒÕÖÅÎÉÑ × ÐÒÏÃÅÓÓÏÒÁÈ Ó
@@ -192,14 +185,14 @@
       × ×ÅÔ×ÑÈ ÒÁÚÒÁÂÏÔËÉ 4-STABLE É 5-STABLE É × ÐÏÄÄÅÒÖÉ×ÁÅÍÙÈ
       ×ÅÔ×ÑÈ Ó ÉÓÐÒÁ×ÌÅÎÉÑÍÉ ÂÅÚÏÐÁÓÎÏÓÔÉ.  äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
       ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:09.htt.asc">FreeBSD-SA-05:09.htt</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:09.htt.asc">FreeBSD-SA-05:09.htt</link>.
       &merged;</para>
 
     <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × ÕÔÉÌÉÔÅ &man.tcpdump.1;, ÐÏÚ×ÏÌÑ×ÛÁÑ
       ÚÌÏÎÁÍÅÒÅÎÎÏÍÕ ÕÄÁÌÅÎÎÏÍÕ ÐÏÌØÚÏ×ÁÔÅÌÀ ×ÙÐÏÌÎÅÎÉÅ DoS ÁÔÁËÉ
       ÐÕÔÅÍ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÓÆÏÒÍÉÒÏ×ÁÎÎÙÈ ÓÐÅÃÉÁÌØÎÏ ÄÌÑ ÜÔÏÇÏ ÐÁËÅÔÏ×.
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:10.tcpdump.asc">FreeBSD-SA-05:10.tcpdump</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:10.tcpdump.asc">FreeBSD-SA-05:10.tcpdump</link>.
       &merged;</para>
 
     <para>âÙÌÏ ÉÓÐÒÁ×ÌÅÎÏ Ä×Å ÐÒÏÂÌÅÍÙ × ÕÔÉÌÉÔÅ &man.gzip.1;.
@@ -207,7 +200,7 @@
       ÐÒÏÉÚ×ÏÌØÎÙÈ ÆÁÊÌÏ× É ÐÅÒÅÚÁÐÉÓÁÔØ ÐÒÏÉÚ×ÏÌØÎÙÅ ÌÏËÁÌØÎÙÅ ÆÁÊÌÙ
       ÐÒÉ ÒÁÓÐÁËÏ×ËÅ ÆÁÊÌÁ.
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:11.gzip.asc">FreeBSD-SA-05:11.gzip</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:11.gzip.asc">FreeBSD-SA-05:11.gzip</link>.
       &merged;</para>
 
     <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × <application>BIND 9</application> DNSSEC.
@@ -215,7 +208,7 @@
       ÚÁ×ÅÒÛÅÎÉÅ ÒÁÂÏÔÙ &man.named.8; ÐÕÔÅÍ ÏÔÐÒÁ×ËÉ ÅÍÕ ÓÐÅÃÉÁÌØÎÏ
       ÓÆÏÒÍÉÒÏ×ÁÎÎÙÈ ÐÁËÅÔÏ×.
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:12.bind9.asc">FreeBSD-SA-05:12.bind9</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:12.bind9.asc">FreeBSD-SA-05:12.bind9</link>.
       &merged;</para>
 
     <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ × &man.ipfw.4;, ËÏÔÏÒÁÑ ÍÏÇÌÁ
@@ -224,26 +217,26 @@
       ÏÄÎÏÐÒÏÃÅÓÓÏÒÎÙÈ ËÏÍÐØÀÔÅÒÁÈ Ó ×ËÌÀÞÅÎÎÙÍ ÐÁÒÁÍÅÔÒÏÍ ÑÄÒÁ
       <literal>PREEMPTION</literal>.  âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
       ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:13.ipfw.asc">FreeBSD-SA-05:13.ipfw</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:13.ipfw.asc">FreeBSD-SA-05:13.ipfw</link>.
       &merged;</para>
 
     <para>÷ &man.bzip2.1; ÂÙÌÉ ÒÅÛÅÎÙ Ä×Å ÐÒÏÂÌÅÍÙ, Ó×ÑÚÁÎÎÙÅ Ó
       ÂÅÚÏÐÁÓÎÏÓÔØÀ.  ïÎÉ ×ËÌÀÞÁÌÉ ÐÏÔÅÎÃÉÁÌØÎÕÀ ×ÏÚÍÏÖÎÏÓÔØ DoS
       É ÎÅÁ×ÔÏÒÉÚÏ×ÁÎÎÏÅ ÉÚÍÅÎÅÎÉÅ ÐÒÁ× ÎÁ ÆÁÊÌÙ.
       úÁ ÄÁÌØÎÅÊÛÅÊ ÉÎÆÏÒÍÁÃÉÅÊ ÏÂÒÁÝÁÊÔÅÓØ Ë ÓÏÏÂÝÅÎÉÀ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:14.bzip2.asc">FreeBSD-SA-05:14.bzip2</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:14.bzip2.asc">FreeBSD-SA-05:14.bzip2</link>.
       &merged;</para>
 
     <para>âÙÌÉ ÉÓÐÒÁ×ÌÅÎÙ Ä×Å ÐÒÏÂÌÅÍÙ × TCP ÓÔÅËÅ &os;.  ïÎÉ ÍÏÇÕÔ
       ÐÏÚ×ÏÌÑÔØ ÁÔÁËÕÀÝÅÍÕ ÚÁÄÅÒÖÉ×ÁÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ TCP ÓÏÅÄÉÎÅÎÉÑ,
       ÞÔÏ ÐÒÉ×ÏÄÉÔ Ë ÓÏÚÄÁÎÉÀ DoS.  âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ
       ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ ÂÅÚÏÐÁÓÎÏÓÔÉ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:15.tcp.asc">FreeBSD-SA-05:15.tcp</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-05:15.tcp.asc">FreeBSD-SA-05:15.tcp</link>.
       &merged;</para>
 
   </sect2>
 
-  <sect2 id="kernel">
+  <sect2 xml:id="kernel">
     <title>éÚÍÅÎÅÎÉÑ × ÑÄÒÅ</title>
 
     <para arch="i386">ðÏÄÄÅÒÖËÁ ÐÒÏÃÅÓÓÏÒÏ× 80386 (ÏÐÃÉÑ ÑÄÒÁ
@@ -263,10 +256,10 @@
       <varname>security.jail.chflags_allowed</varname>, ËÏÔÏÒÁÑ ËÏÎÔÒÏÌÉÒÕÅÔ
       ÐÏ×ÅÄÅÎÉÅ &man.chflags.1; ×ÎÕÔÒÉ jail.
       åÓÌÉ ÐÅÒÅÍÅÎÎÁÑ ÕÓÔÁÎÏ×ÌÅÎÁ × <literal>0</literal> (ÚÎÁÞÅÎÉÅ ÐÏ
-      ÕÍÏÌÞÁÎÉÀ), ×ÎÕÔÒÉ jail <username>root</username> ÓÞÉÔÁÅÔÓÑ
+      ÕÍÏÌÞÁÎÉÀ), ×ÎÕÔÒÉ jail <systemitem class="username">root</systemitem> ÓÞÉÔÁÅÔÓÑ
       ÎÅÐÒÉ×ÉÌÅÇÉÒÏ×ÁÎÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÅÍ; ÅÓÌÉ ÏÎÁ ÕÓÔÁÎÏ×ÌÅÎÁ ×
       <literal>1</literal>, ÒÁÚÌÉÞÉÊ ÍÅÖÄÕ ÐÏÌØÚÏ×ÁÔÅÌÅÍ
-      <username>root</username> ×ÎÕÔÒÉ jail É ×ÎÅ jail ÎÅ ÄÅÌÁÅÔÓÑ.
+      <systemitem class="username">root</systemitem> ×ÎÕÔÒÉ jail É ×ÎÅ jail ÎÅ ÄÅÌÁÅÔÓÑ.
       &merged;</para>
 
     <para>ðÅÒÅÍÅÎÎÁÑ sysctl
@@ -340,7 +333,7 @@
       Interrupt (IPI), ËÏÔÏÒÁÑ ÍÏÇÌÁ ×ÙÚ×ÁÔØ ËÒÁÈ SMP ÓÉÓÔÅÍ ÐÏÄ ×ÙÓÏËÏÊ
       ÎÁÇÒÕÚËÏÊ.  âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÏÐÕÂÌÉËÏ×ÁÎÁ × ÓÏÏÂÝÅÎÉÉ Ï
       ÐÒÏÂÌÅÍÅ
-      <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-05:03.ipi.asc">FreeBSD-EN-05:03.ipi</ulink>.
+      <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-05:03.ipi.asc">FreeBSD-EN-05:03.ipi</link>.
       &merged;</para>
 
     <para>ïÂßÅËÔÙ System V IPC (ÏÞÅÒÅÄÉ ÓÏÏÂÝÅÎÉÊ, ÓÅÍÁÆÏÒÙ, É ÒÁÚÄÅÌÑÅÍÁÑ
@@ -409,7 +402,7 @@
       ÂÕÄÕÔ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ ÓÉÓÔÅÍÏÊ ×ÉÒÔÕÁÌØÎÏÊ ÐÁÍÑÔÉ &os;.  æÉÚÉÞÅÓËÉÅ
       ÁÄÒÅÓÁ ÉÇÎÏÒÉÒÕÅÍÙÈ ÓÔÒÁÎÉÃ ÔÁËÖÅ ÐÏÐÁÄÕÔ × ÂÕÆÅÒ ÓÏÏÂÝÅÎÉÊ.</para>
 
-    <sect3 id="boot">
+    <sect3 xml:id="boot">
       <title>éÚÍÅÎÅÎÉÑ × ÚÁÇÒÕÚÞÉËÅ</title>
 
       <para arch="i386">äÏÂÁ×ÌÅÎÁ ×ÅÒÓÉÑ <filename>boot0</filename> ÄÌÑ
@@ -441,7 +434,7 @@
 
     </sect3>
 
-    <sect3 id="proc">
+    <sect3 xml:id="proc">
       <title>ðÏÄÄÅÒÖËÁ ÏÂÏÒÕÄÏ×ÁÎÉÑ</title>
 
       <para arch="i386,amd64">äÒÁÊ×ÅÒ &man.acpi.4; ×ÙËÌÀÞÁÅÔ
@@ -557,7 +550,7 @@
       <para arch="sparc64">äÒÁÊ×ÅÒ zs ÂÙÌ ÕÄÁÌÅÎ, ×ÍÅÓÔÏ ÎÅÇÏ ÄÏÌÖÅÎ
 	ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÄÒÁÊ×ÅÒ &man.uart.4;.</para>
 
-      <sect4 id="mm">
+      <sect4 xml:id="mm">
 	<title>ðÏÄÄÅÒÖËÁ ÍÕÌØÔÉÍÅÄÉÁ</title>
 
 	<para arch="sparc64">âÙÌ ÄÏÂÁ×ÌÅÎ ÄÒÁÊ×ÅÒ &man.snd.audiocs.4; ÄÌÑ
@@ -570,7 +563,7 @@
 
       </sect4>
 
-      <sect4 id="net-if">
+      <sect4 xml:id="net-if">
 	<title>ðÏÄÄÅÒÖËÁ ÓÅÔÅ×ÙÈ ÉÎÔÅÒÆÅÊÓÏ×</title>
 
 	<para>äÒÁÊ×ÅÒ &man.ath.4; ÂÙÌ ÏÂÎÏ×ÌÅÎ, ÞÔÏÂÙ ×ÙÄÅÌÉÔØ ÁÌÇÏÒÉÔÍ
@@ -650,7 +643,7 @@
 	  É ÍÏÇÌÉ ÐÒÉ×ÏÄÉÔØ Ë ÐÁÎÉËÅ, ÏÛÉÂËÁÍ page fault, ÏÂÒÙ×Õ ÓÏÅÄÉÎÅÎÉÊ
 	  SSH ÉÌÉ ÏÛÉÂËÁÍ ÐÒÉ ÐÅÒÅÄÁÞÅ ÆÁÊÌÏ×.  âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ
 	  ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ Ï ÐÒÏÂÌÅÍÅ
-	  <ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-05:02.sk.asc">FreeBSD-EN-05:02.sk</ulink>.
+	  <link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-05:02.sk.asc">FreeBSD-EN-05:02.sk</link>.
 	  &merged;</para>
 
 	<para>äÒÁÊ×ÅÒ &man.sk.4; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ &man.altq.4;.
@@ -675,7 +668,7 @@
       </sect4>
     </sect3>
 
-    <sect3 id="net-proto">
+    <sect3 xml:id="net-proto">
       <title>óÅÔÅ×ÙÅ ÐÒÏÔÏËÏÌÙ</title>
 
       <para>MTU feedback × IPv6 ×ÙËÌÀÞÁÅÔÓÑ ÐÒÉ ÏÔÐÒÁ×ËÅ ÄÁÎÎÙÈ,
@@ -827,7 +820,7 @@
 	ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ ÎÁ ÓÔÒÁÎÉÃÅ ÓÐÒÁ×ÏÞÎÉËÁ &man.unix.4;.</para>
     </sect3>
 
-    <sect3 id="disks">
+    <sect3 xml:id="disks">
       <title>äÉÓËÉ É ÕÓÔÒÏÊÓÔ×Á ÈÒÁÎÅÎÉÑ</title>
 
       <para>äÒÁÊ×ÅÒ &man.amr.4; ÔÅÐÅÒØ ÍÏÖÅÔ ÂÅÚÏÐÁÓÎÏ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ
@@ -890,7 +883,7 @@
 
     </sect3>
 
-    <sect3 id="fs">
+    <sect3 xml:id="fs">
       <title>æÁÊÌÏ×ÙÅ ÓÉÓÔÅÍÙ</title>
 
       <para>÷ÙÞÉÓÌÅÎÉÅ ÓÕÍÍÁÒÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÄÌÑ ÎÅ ÒÁÚÍÏÎÔÉÒÏ×ÁÎÎÙÈ
@@ -904,7 +897,7 @@
 
       <para>âÙÌÁ ÉÓÐÒÁ×ÌÅÎÁ ÏÛÉÂËÁ NFS ÓÅÒ×ÅÒÁ, ÐÒÉ×ÏÄÉ×ÛÁÑ Ë ÐÁÎÉËÅ ÑÄÒÁ.
 	âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ × ÓÏÏÂÝÅÎÉÉ Ï ÐÒÏÂÌÅÍÅ
-	<ulink url="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-05:01.nfs.asc">FreeBSD-EN-05:01.nfs</ulink>.
+	<link xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/ERRATA/notices/FreeBSD-EN-05:01.nfs.asc">FreeBSD-EN-05:01.nfs</link>.
 	&merged;</para>
 
       <para arch="i386,pc98">âÙÌÁ ÄÏÂÁ×ÌÅÎÁ ÐÏÄÄÅÒÖËÁ ÞÔÅÎÉÑ ReiserFS
@@ -921,7 +914,7 @@
     </sect3>
   </sect2>
 
-  <sect2 id="userland">
+  <sect2 xml:id="userland">
     <title>éÚÍÅÎÅÎÉÑ × ÐÒÏÇÒÁÍÍÁÈ ÐÏÌØÚÏ×ÁÔÅÌÑ</title>
 
     <para>õÔÉÌÉÔÁ &man.burncd.8; ÔÅÐÅÒØ ÐÏÚ×ÏÌÑÅÔ ÚÁÄÁÎÉÅ ËÏÍÁÎÄ,
@@ -961,7 +954,7 @@
       <literal>AAAA</literal> ÐÒÉ×ÏÄÉÔ Ë ÔÏÍÕ, ÞÔÏ ÚÁÐÒÁÛÉ×ÁÀÝÉÊ ÓÅÒ×ÅÒ
       ÎÅ ÐÙÔÁÅÔÓÑ ÒÁÚÒÅÛÉÔØ ÚÁÐÉÓØ <literal>A</literal>.  ëÒÏÍÅ ÔÏÇÏ,
       ÔÁËÏÅ ÐÏ×ÅÄÅÎÉÅ ÐÏÔÅÎÃÉÁÌØÎÏ ÍÏÖÅÔ ÐÒÉ×ÅÓÔÉ Ë DoS ÁÔÁËÅ
-      (ÓÍ. <ulink url="http://www.kb.cert.org/vuls/id/714121"></ulink>
+      (ÓÍ. <uri xlink:href="http://www.kb.cert.org/vuls/id/714121">http://www.kb.cert.org/vuls/id/714121</uri>
       Ó ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÅÊ).
       ïÂÒÁÔÉÔÅ ×ÎÉÍÁÎÉÅ, ÞÔÏ ÈÏÔÑ ÐÏÒÑÄÏË ÚÁÐÒÏÓÁ ÂÙÌ ÉÚÍÅÎÅÎ, ×ÏÚ×ÒÁÝÁÅÍÙÊ
       ÒÅÚÕÌØÔÁÔ ×ÓÅ ÅÝÅ ×ËÌÀÞÁÅÔ ÚÁÐÉÓØ <literal>AF_INET6</literal>
@@ -1087,7 +1080,7 @@
 
     <para>äÌÑ ÄÉÎÁÍÉÞÅÓËÉÈ ÚÏÎ &man.named.8; ÂÙÌ ÄÏÂÁ×ÌÅÎ ÏÔÄÅÌØÎÙÊ
       ËÁÔÁÌÏÇ, ×ÌÁÄÅÌØÃÅÍ ËÏÔÏÒÏÇÏ Ñ×ÌÑÅÔÓÑ ÐÏÌØÚÏ×ÁÔÅÌØ
-      <username>bind</username> (ÄÌÑ ÓÏÚÄÁÎÉÑ ÖÕÒÎÁÌØÎÏÇÏ ÆÁÊÌÁ ÚÏÎÙ).
+      <systemitem class="username">bind</systemitem> (ÄÌÑ ÓÏÚÄÁÎÉÑ ÖÕÒÎÁÌØÎÏÇÏ ÆÁÊÌÁ ÚÏÎÙ).
       âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ ÎÁÈÏÄÉÔÓÑ × ÐÒÉÍÅÒÅ ÄÉÎÁÍÉÞÅÓËÏÊ
       ÚÏÎÙ ÆÁÊÌÁ &man.named.conf.5;.  &merged;</para>
 
@@ -1282,7 +1275,7 @@
       ÕËÁÚÙ×ÁÅÔ ×Ù×ÏÄÉÔØ ÔÅËÓÔ, ÎÏ ÎÅ ÆÏÒÍÁÔÉÒÏ×ÁÔØ ÅÇÏ.</para>
 
     <para>&man.whois.1; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÆÌÁÇ <option>-k</option>
-      ÄÌÑ ÚÁÐÒÏÓÁ <hostid role="fqdn">whois.krnic.net</hostid>
+      ÄÌÑ ÚÁÐÒÏÓÁ <systemitem class="fqdomainname">whois.krnic.net</systemitem>
       (the National Internet Development Agency of Korea),
       ÓÏÄÅÒÖÁÝÅÇÏ ÉÎÆÏÒÍÁÃÉÀ Ï IP ÁÄÒÅÓÁÈ × ëÏÒÅÅ. &merged;</para>
 
@@ -1295,10 +1288,10 @@
       ÎÅ ÚÁËÁÎÞÉ×ÁÌÉÓØ ÓÉÍ×ÏÌÏÍ ÎÏ×ÏÊ ÓÔÒÏËÉ. &merged;</para>
 
     <para>âÙÌÉ ÄÏÂÁ×ÌÅÎÙ ÎÏ×ÙÅ ÓÉÓÔÅÍÎÙÅ ÐÏÌØÚÏ×ÁÔÅÌØ/ÇÒÕÐÐÁ
-      <username>_dhcp</username> ÄÌÑ ÐÏÄÄÅÒÖËÉ &man.dhclient.8; ÉÚ
+      <systemitem class="username">_dhcp</systemitem> ÄÌÑ ÐÏÄÄÅÒÖËÉ &man.dhclient.8; ÉÚ
       OpenBSD.</para>
 
-    <sect3 id="rc-scripts">
+    <sect3 xml:id="rc-scripts">
       <title>óËÒÉÐÔÙ <filename>/etc/rc.d</filename></title>
 
       <para>âÙÌ ÄÏÂÁ×ÌÅÎ ÓÔÁÒÔÏ×ÙÊ ÓËÒÉÐÔ <filename>rc.d/bsnmpd</filename>
@@ -1369,7 +1362,7 @@ moused_ums0_port="/dev/ums0"</programlisting>
     </sect3>
   </sect2>
 
-  <sect2 id="contrib">
+  <sect2 xml:id="contrib">
     <title>óÔÏÒÏÎÎÅÅ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ</title>
 
     <para><application>awk</application> ÂÙÌ ÏÂÎÏ×ÌÅÎ Ó ÒÅÌÉÚÁ ÏÔ 7
@@ -1479,7 +1472,7 @@ moused_ums0_port="/dev/ums0"</programlisting>
 
   </sect2>
 
-  <sect2 id="ports">
+  <sect2 xml:id="ports">
     <title>éÎÆÒÁÓÔÒÕËÔÕÒÁ ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ×/ÐÁËÅÔÏ×</title>
 
     <para>õÔÉÌÉÔÁ &man.pkg.create.1; ÔÅÐÅÒØ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÆÌÁÇ
@@ -1497,7 +1490,7 @@ moused_ums0_port="/dev/ums0"</programlisting>
       ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÏÐÒÅÄÅÌÅÎÉÑ ÔÏÇÏ, Ñ×ÌÑÅÔÓÑ ÌÉ ÐÁËÅÔ ÕÓÔÁÒÅ×ÛÉÍ.</para>
 
     <para>æÁÊÌÙ
-      <filename>ports/INDEX<replaceable>*</replaceable></filename>,
+      <filename>ports/INDEX*</filename>,
       × ËÏÔÏÒÙÈ ÎÁÈÏÄÉÔÓÑ ÉÎÄÅËÓ ×ÓÅÈ ÐÏÒÔÏ× ËÏÌÌÅËÃÉÉ,
       ÂÙÌ ÕÄÁÌÅÎ ÉÚ ÒÅÐÏÚÉÔÏÒÉÑ CVS. &merged;
       üÔÏÔ ÆÁÊÌ ÇÅÎÅÒÉÒÏ×ÁÌÓÑ ÎÅ ÞÁÓÔÏ, É ÓÌÅÄÏ×ÁÔÅÌØÎÏ ÏÂÙÞÎÏ ÂÙÌ
@@ -1523,7 +1516,7 @@ moused_ums0_port="/dev/ums0"</programlisting>
 
   </sect2>
 
-  <sect2 id="releng">
+  <sect2 xml:id="releng">
     <title>ðÏÄÇÏÔÏ×ËÁ ÒÅÌÉÚÏ× É ÉÎÔÅÇÒÁÃÉÑ</title>
 
     <para>÷ ÐÒÅÄÙÄÕÝÉÈ ÒÅÌÉÚÁÈ &os;, CD-ROM (ÉÌÉ ÏÂÒÁÚ ISO)
@@ -1548,23 +1541,23 @@ moused_ums0_port="/dev/ums0"</programlisting>
       <application>GNOME</application> ÂÙÌÁ ÏÂÎÏ×ÌÅÎÁ Ó
       2.6.2 ÄÏ 2.10.1.  âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï ÒÁÂÏÔÅ
       <application>GNOME</application> × &os; ÎÁÈÏÄÉÔÓÑ ÎÁ ×Å ÓÔÒÁÎÉÃÅ
-      <ulink url="&url.base;/gnome/">FreeBSD GNOME Project</ulink>.
+      <link xlink:href="&url.base;/gnome/">FreeBSD GNOME Project</link>.
       &merged;
 
       <note>
 	<para>ðÏÌØÚÏ×ÁÔÅÌÉ ÐÒÅÄÙÄÕÝÉÈ ×ÅÒÓÉÊ
 	  <application>GNOME</application>
-	  (<filename role="package">x11/gnome2</filename>)
+	  (<package>x11/gnome2</package>)
 	  ÄÏÌÖÎÙ ÐÏÄÏÊÔÉ Ë ÏÂÎÏ×ÌÅÎÉÀ Ó ÏÐÒÅÄÅÌÅÎÎÏÊ ÏÓÔÏÒÏÖÎÏÓÔØÀ.
 	  ðÒÏÓÔÏÅ ÏÂÎÏ×ÌÅÎÉÅ ÉÚ ËÏÌÌÅËÃÉÉ ÐÏÒÔÏ× &os; Ó ÐÏÍÏÝØÀ
 	  &man.portupgrade.1;
-	  (<filename role="package">sysutils/portupgrade</filename>)
+	  (<package>sysutils/portupgrade</package>)
 	  ×ÙÚÏ×ÅÔ ÓÅÒØÅÚÎÙÅ ÐÒÏÂÌÅÍÙ.  ðÏÌØÚÏ×ÁÔÅÌÉ
 	  <application>GNOME</application> ÄÏÌÖÎÙ ×ÎÉÍÁÔÅÌØÎÏ ÐÒÏÞÅÓÔØ
 	  ÉÎÓÔÒÕËÃÉÉ
-	  <ulink url="&url.base;/gnome/docs/faq210.html"></ulink>
+	  <uri xlink:href="&url.base;/gnome/docs/faq210.html">&url.base;/gnome/docs/faq210.html</uri>
 	  É ÉÓÐÏÌØÚÏ×ÁÔØ ÓËÒÉÐÔ
-	  <ulink url="&url.base;/gnome/gnome_upgrade.sh"><filename>gnome_upgrade.sh</filename></ulink>
+	  <link xlink:href="&url.base;/gnome/gnome_upgrade.sh"><filename>gnome_upgrade.sh</filename></link>
 	  ÄÌÑ ÏÂÎÏ×ÌÅÎÉÑ ÄÏ
 	  <application>GNOME</application> 2.10.</para>
 	</note>
@@ -1573,14 +1566,14 @@ moused_ums0_port="/dev/ums0"</programlisting>
     <para>ðÏÄÄÅÒÖÉ×ÁÅÍÁÑ ×ÅÒÓÉÑ <application>KDE</application>
       ÂÙÌÁ ÏÂÎÏ×ÌÅÎÁ Ó 3.3.0 ÄÏ 3.4.0.  âÏÌÅÅ ÐÏÄÒÏÂÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï ÒÁÂÏÔÅ
       <application>KDE</application> × &os; ÎÁÈÏÄÉÔÓÑ ÎÁ ×Å ÓÔÒÁÎÉÃÅ
-      <ulink url="http://freebsd.kde.org/">KDE × FreeBSD</ulink>.
+      <link xlink:href="http://freebsd.kde.org/">KDE × FreeBSD</link>.
       &merged;
 
       <note>
 	<para>ðÏÌØÚÏ×ÁÔÅÌÑÍ ÂÏÌÅÅ ÓÔÁÒÙÈ ×ÅÒÓÉÊ
 	  <application>KDE</application> ÐÒÅÄÌÁÇÁÅÔÓÑ ÓÌÅÄÏ×ÁÔØ ÐÒÏÃÅÄÕÒÅ
 	  ÏÂÎÏ×ÌÅÎÉÑ, ÄÏËÕÍÅÎÔÉÒÏ×ÁÎÎÏÊ ÎÁ ×Å ÓÔÒÁÎÉÃÅ
-	  <ulink url="http://freebsd.kde.org/">KDE on FreeBSD</ulink>
+	  <link xlink:href="http://freebsd.kde.org/">KDE on FreeBSD</link>
 	  ÉÄÉ × ÆÁÊÌÅ <filename>ports/UPDATING</filename>.</para>
 	</note>
     </para>
@@ -1590,7 +1583,7 @@ moused_ums0_port="/dev/ums0"</programlisting>
 
   </sect2>
 
-  <sect2 id="doc">
+  <sect2 xml:id="doc">
     <title>äÏËÕÍÅÎÔÁÃÉÑ</title>
 
     <para>äÏËÕÍÅÎÔÁÃÉÑ ÓÕÝÅÓÔ×ÕÀÝÅÊ ÆÕÎËÃÉÏÎÁÌØÎÏÓÔÉ ÂÙÌÁ ÕÌÕÞÛÅÎÁ ÐÕÔÅÍ
@@ -1625,7 +1618,7 @@ moused_ums0_port="/dev/ums0"</programlisting>
 
 </sect1>
 
-<sect1 id="upgrade">
+<sect1 xml:id="upgrade">
   <title>ïÂÎÏ×ÌÅÎÉÅ Ó ÐÒÅÄÙÄÕÝÉÈ ÒÅÌÉÚÏ× &os;</title>
 
   <para>ïÂÎÏ×ÌÅÎÉÅ ÉÚ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ× ÄÏ &os; &release.current;
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
index 6f4a97f1ad0..3ace6317d88 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/i386/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "i386">
 <!ENTITY arch.print "i386">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,7 +19,6 @@
 
      Original revision: 1.7
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
index 5943cadc50e..8f5935b4075 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/ia64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "ia64">
 <!ENTITY arch.print "IA-64">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,7 +19,6 @@
 
      Original revision: 1.4
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
index 3750e277bf9..26f10fd2159 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/pc98/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "pc98">
 <!ENTITY arch.print "NEC PC-98x1">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,7 +19,6 @@
 
      Original revision: 1.4
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
index 989d486edda..de6d461b630 100644
--- a/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
+++ b/release/doc/ru_RU.KOI8-R/relnotes/sparc64/article.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="koi8-r"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % sections SYSTEM "../common/relnotes.ent">
@@ -11,7 +11,6 @@
 <!ENTITY arch "sparc64">
 <!ENTITY arch.print "UltraSPARC">
 ]>
-
 <!--
      The FreeBSD Russian Documentation Project
 
@@ -20,7 +19,6 @@
 
      Original revision: 1.6
 -->
-
-<article lang="ru">
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ru">
   &art;
 </article>
diff --git a/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml b/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
index f10f2736048..39c1fd17e86 100644
--- a/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
+++ b/release/doc/ru_RU.KOI8-R/share/xml/catalog.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
-        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
 <!-- $FreeBSD$ -->
-
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <public
-        publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//RU"
-        uri="dev-auto-ru.ent"/>
+  <public publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//RU" uri="dev-auto-ru.ent"/>
 </catalog>
diff --git a/release/doc/share/misc/man2hwnotes.pl b/release/doc/share/misc/man2hwnotes.pl
index aa8d023020f..a64aae87291 100644
--- a/release/doc/share/misc/man2hwnotes.pl
+++ b/release/doc/share/misc/man2hwnotes.pl
@@ -200,7 +200,7 @@ sub parse {
 		    $found_hwlist = 1;
 		    add_sgmltag(\%mdocvars, "<!ENTITY hwlist.".$mdocvars{cur_manname}." '");
 		    if ($only_list_out) {
-			add_sgmltag("<para>&hwlist.preamble.pre; " .
+			add_sgmltag("<para xmlns=\"http://docbook.org/ns/docbook\">&hwlist.preamble.pre; " .
 				    "&man.".$mdocvars{EntNm}.".$cur_mansection; " .
 				    "&hwlist.preamble.post;</para>");
 		    }
@@ -260,7 +260,7 @@ sub parse {
 	    } elsif (/^Bl/) {
 		$mdocvars{isin_list} = 1;
 		flush_out(\%mdocvars);
-		add_sgmltag(\%mdocvars, "<itemizedlist>");
+		add_sgmltag(\%mdocvars, "<itemizedlist xmlns=\"http://docbook.org/ns/docbook\">");
 
 		if (/-tag/) {
 		    $mdocvars{listtype} = "tag";
@@ -302,7 +302,7 @@ sub parse {
 		my ($txt, $punct_str) = split_punct_chars($1);
 
 		parabuf_addline(\%mdocvars,
-				normalize("<quote>$txt</quote>$punct_str"));
+				normalize("<quote xmlns=\"http://docbook.org/ns/docbook\">$txt</quote>$punct_str"));
 	    } elsif (/^Sx (.+)$/) {
 		if ($mdocvars{isin_hwlist}) {
 		    dlog(1, "Warning: Reference to another section in the " .
@@ -328,7 +328,7 @@ sub parse {
 		my ($txt, $punct_str) = split_punct_chars($1);
 
 		parabuf_addline(\%mdocvars,
-				normalize("<emphasis>$txt</emphasis>$punct_str"));
+				normalize("<emphasis xmlns=\"http://docbook.org/ns/docbook\">$txt</emphasis>$punct_str"));
 	    } else {
 		# Ignore all other commands.
 		dlog(3, "Ignoring unknown command $cmd");
@@ -397,12 +397,12 @@ sub flush_out {
 	}
     }
     if ($compat_mode) {
-	$out = "<para".$para_arch.">&".$entity_name.";</para>";
+	$out = "<para xmlns=\"http://docbook.org/ns/docbook\"".$para_arch.">&".$entity_name.";</para>";
     } else {
 	if (${$mdocvars}{first_para}) {
-	    $out = "<para>".$para_arch."&".$entity_name.";</para>";
+	    $out = "<para xmlns=\"http://docbook.org/ns/docbook\">".$para_arch."&".$entity_name.";</para>";
 	} else {
-	    $out = "<para>&".$entity_name.";</para>";
+	    $out = "<para xmlns=\"http://docbook.org/ns/docbook\">&".$entity_name.";</para>";
 	}
 	${$mdocvars}{first_para} = 0;
     }
@@ -527,7 +527,7 @@ sub split_punct_chars {
 sub make_ulink {
     my ($str) = (@_);
 
-    $str =~ s,(http://[^ ]+),<ulink url="$1"></ulink>,;
+    $str =~ s,(http://[^ ]+),<link xmlns=\"http://docbook.org/ns/docbook\" xlink:href="$1"></link>,;
 
     return $str;
 }
diff --git a/release/doc/share/xml/catalog.xml b/release/doc/share/xml/catalog.xml
index b2a322fa400..6eee6d9c85b 100644
--- a/release/doc/share/xml/catalog.xml
+++ b/release/doc/share/xml/catalog.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
-        "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
 <!-- $FreeBSD$ -->
-
 <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-  <public
-        publicId="-//FreeBSD//ENTITIES Release Specification//EN"
-        uri="release.ent"/>
-  <public
-	publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN"
-	uri="dev-auto.ent"/>
+  <public publicId="-//FreeBSD//ENTITIES Release Specification//EN" uri="release.ent"/>
+  <public publicId="-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" uri="dev-auto.ent"/>
 </catalog>
diff --git a/release/doc/zh_CN.GB2312/errata/article.xml b/release/doc/zh_CN.GB2312/errata/article.xml
index 7d02ae964d6..8c4e90faf7c 100644
--- a/release/doc/zh_CN.GB2312/errata/article.xml
+++ b/release/doc/zh_CN.GB2312/errata/article.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
-
 <!--
 	FreeBSD errata document.  Unlike some of the other RELNOTESng
 	files, this file should remain as a single SGML file, so that
@@ -19,14 +18,13 @@
 
 	Original Revision: 145264
 -->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>&os; &release; ·¢Ðа濱Îó</title>
+    
 
-<article>
-  <articleinfo>
-    <title>&os; &release; ·¢Ðа濱Îó</title>
-
-    <corpauthor>
+    <author><orgname>
     The &os; Project
-    </corpauthor>
+    </orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -40,13 +38,12 @@
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 
-    <legalnotice id="trademarks" role="trademarks">
+    <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.intel;
       &tm-attrib.sparc;
       &tm-attrib.general;
     </legalnotice>
-  </articleinfo>
 
   <abstract>
     <para>Õâ·ÝÎĵµÁгöÁË &os; &release;
@@ -61,8 +58,9 @@
       µÄ¿±ÎóÎĵµ½«³ÖÐøµØά»¤£¬
       Ö±µ½ &os; &release.next; ·¢²¼ÎªÖ¹¡£</para>
   </abstract>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>½éÉÜ</title>
 
     <para>Õâ·Ý¿±ÎóÎĵµ°üº¬Á˹ØÓÚ &os; &release;.
@@ -73,20 +71,17 @@
     <para>Ëæ·¢Ðа汾¶ø·¢²¼µÄÕâ·ÝÎĵµ (ÀýÈ磬 ÔÚ CDROM Éϸ½´øµÄ)
       Ò»°ãÀ´ËµÒѾ­¹ýʱÁË£¬ µ«ÔÚ Internet ÉϵÄÆäËû¸±±¾»á±»³ÖÐø¸üУ¬
       Òò´ËÓ¦×÷ΪÕâÒ»·¢ÐаæµÄ <quote>×îп±Îó</quote> À´¿´´ý¡£
-      ÕâЩ¿±ÎóÎĵµµÄ¸±±¾£¬ ¿ÉÒÔÔÚ <ulink
-      url="http://www.FreeBSD.org/releases/"></ulink>£¬
+      ÕâЩ¿±ÎóÎĵµµÄ¸±±¾£¬ ¿ÉÒÔÔÚ <uri xlink:href="http://www.FreeBSD.org/releases/">http://www.FreeBSD.org/releases/</uri>£¬
       ÒÔ¼°ËùÓÐÆäËû±£³ÖÓëÆäͬ²½µÄ¾µÏñÉÏÕÒµ½¡£</para>
 
     <para>&os; &release.branch; µÄÔ´´úÂëºÍÔ¤±àÒëÐÎʽµÄ¿ìÕÕÖУ¬
       Ò²»á°üº¬±¾Îĵµ (ÔÚÖÆ×÷¿ìÕÕʱ) µÄ×îа汾¡£</para>
 
-    <para>È«²¿ &os; CERT °²È«¹«¸æµÄÁÐ±í£¬ ¿ÉÒÔÔÚ <ulink
-      url="http://www.FreeBSD.org/security/"></ulink> »ò <ulink
-      url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink> ÕÒµ½¡£</para>
+    <para>È«²¿ &os; CERT °²È«¹«¸æµÄÁÐ±í£¬ ¿ÉÒÔÔÚ <uri xlink:href="http://www.FreeBSD.org/security/">http://www.FreeBSD.org/security/</uri> »ò <uri xlink:href="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/">ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/</uri> ÕÒµ½¡£</para>
 
   </sect1>
 
-  <sect1 id="security">
+  <sect1 xml:id="security">
     <title>°²È«¹«¸æ</title>
 
     <para releasetype="release">ÔÝÎÞ°²È«¹«¸æ¡£</para>
@@ -96,7 +91,7 @@
     <para releasetype="snapshot">ÔÝÎÞ°²È«¹«¸æ¡£</para>
   </sect1>
 
-  <sect1 id="open-issues">
+  <sect1 xml:id="open-issues">
     <title>δ½â¾öµÄÎÊÌâ</title>
 
     <para releasetype="release">ÔÝÎÞδ½â¾öµÄÎÊÌâ¡£</para>
@@ -106,7 +101,7 @@
     <para releasetype="snapshot">ÔÝÎÞδ½â¾öµÄÎÊÌâ¡£</para>
   </sect1>
 
-  <sect1 id="late-news">
+  <sect1 xml:id="late-news">
     <title>×îÐÂÏûÏ¢</title>
 
     <para releasetype="release">ÎÞÐÂÎÅ¡£</para>
diff --git a/release/doc/zh_CN.GB2312/hardware/article.xml b/release/doc/zh_CN.GB2312/hardware/article.xml
index dcb37f4960a..f810fcad1a9 100644
--- a/release/doc/zh_CN.GB2312/hardware/article.xml
+++ b/release/doc/zh_CN.GB2312/hardware/article.xml
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 <!ENTITY % devauto PUBLIC "-//FreeBSD//ENTITIES Auto Generated Device Lists//EN" "devauto.ent">
 %devauto;
 ]>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
 
-<article>
+<info><title>&os; &release.current; ¼æÈÝÓ²¼þ˵Ã÷</title>
+  
 
-<articleinfo>
-  <title>&os; &release.current; ¼æÈÝÓ²¼þ˵Ã÷</title>
-
-  <corpauthor>The &os; Documentation Project</corpauthor>
+  <author><orgname>The &os; Documentation Project</orgname></author>
 
   <pubdate>$FreeBSD$</pubdate>
 
@@ -28,7 +27,7 @@
     <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
 
-  <legalnotice id="trademarks" role="trademarks">
+  <legalnotice xml:id="trademarks" role="trademarks">
     &tm-attrib.freebsd;
     &tm-attrib.amd;
     &tm-attrib.ibm;
@@ -38,9 +37,9 @@
     &tm-attrib.general;
   </legalnotice>
 
-</articleinfo>
+</info>
 
-<sect1 id="intro">
+<sect1 xml:id="intro">
   <title>½éÉÜ</title>
 
   <para>Õâ·ÝÎĵµÊÇ
@@ -51,13 +50,13 @@
 
 </sect1>
 
-<sect1 id="proc">
+<sect1 xml:id="proc">
   <title>Ö§³ÖµÄ´¦ÀíÆ÷ºÍÖ÷°å</title>
 
   <para>ÕâÒ»½ÚÖÐÁгöÁËһЩÓë¾ßÌåÓ²¼þ¼Ü¹¹Ïà¹ØµÄ£¬
     ÔÚÕâЩӲ¼þ¼Ü¹¹ÉÏÄܹ»Ö§³ÖµÄ´¦ÀíÆ÷ºÍϵͳÓйصÄÐÅÏ¢¡£</para>
 
-<sect2 id="proc-amd64">
+<sect2 xml:id="proc-amd64">
   <title>amd64</title>
 
   <para>´Ó 2003 ÄêÖпªÊ¼£¬ &os;/&arch.amd64; ÌṩÁ˶ÔÓÚ AMD64
@@ -117,7 +116,7 @@
 
 </sect2>
 
-<sect2 id="proc-i386">
+<sect2 xml:id="proc-i386">
   <title>i386</title>
 
   <para>&os;/&arch.i386; Äܹ»ÔÚ¸÷ʽ¸÷ÑùµÄ <quote>IBM PC
@@ -186,21 +185,19 @@
   <para>ACPI ÒÀÀµÓÚÓɼÆËã»úµÄ BIOS ÌṩµÄ ϵͳ²îÒìÃèÊö±í (Differentiated System Descriptor Table,
     DSDT) À´¹¤×÷¡£ һЩ¼ÆËã»úÉ쵀 DSDT ¿ÉÄܲ»ÍêÕû»òÕßÓÐÎÊÌ⣬
     Õâ»áµ¼Ö ACPI ¹¤×÷²»Õý³£¡£ Õë¶ÔһЩ¼ÆËã»úµÄÌæ»» DSDT£¬
-    ¿ÉÒÔÔÚ <ulink
-    url="http://acpi.sourceforge.net/">ACPI4Linux</ulink> ÏîÄ¿ÍøÕ¾É쵀 <ulink
-    url="http://acpi.sourceforge.net/dsdt/index.php">DSDT</ulink>
+    ¿ÉÒÔÔÚ <link xlink:href="http://acpi.sourceforge.net/">ACPI4Linux</link> ÏîÄ¿ÍøÕ¾É쵀 <link xlink:href="http://acpi.sourceforge.net/dsdt/index.php">DSDT</link>
     »·½ÚÖÐÕÒµ½¡£ &os; ¿ÉÒÔÀûÓÃÕâЩ DSDT À´¸²¸Ç BIOS ÌṩµÄ DSDT£»
     Çë²ÎÔÄÁª»úÊÖ²á &man.acpi.4; ÒÔÁ˽â¾ßÌåµÄϸ½Ú¡£</para>
 </sect2>
 
-<sect2 id="proc-ia64">
+<sect2 xml:id="proc-ia64">
   <title>ia64</title>
 
   <para>Ä¿Ç°Ö§³ÖµÄ´¦ÀíÆ÷ÊÇ
-    <ulink url="http://people.freebsd.org/~marcel/refs/ia64/itanium/24532003.pdf">
-    &itanium;</ulink> ºÍ
-    <ulink url="http://people.freebsd.org/~marcel/refs/ia64/itanium2/25111003.pdf">
-    &itanium; 2</ulink>¡£</para>
+    <link xlink:href="http://people.freebsd.org/~marcel/refs/ia64/itanium/24532003.pdf">
+    &itanium;</link> ºÍ
+    <link xlink:href="http://people.freebsd.org/~marcel/refs/ia64/itanium2/25111003.pdf">
+    &itanium; 2</link>¡£</para>
 
   <para>Ö§³ÖµÄоƬ×é°üÀ¨£º</para>
    <itemizedlist>
@@ -226,7 +223,7 @@
 
 </sect2>
 
-<sect2 id="proc-pc98">
+<sect2 xml:id="proc-pc98">
   <title>pc98</title>
 
   <para>Ö§³Ö²ÉÓü¸ºõËùÓÐ &i386; ¼æÈÝ´¦ÀíÆ÷µÄ NEC PC-9801/9821 ϵÁмÆËã»ú£¬
@@ -254,18 +251,18 @@
 
 </sect2>
 
-<sect2 id="proc-powerpc">
+<sect2 xml:id="proc-powerpc">
   <title>powerpc</title>
 
   <para>ÕâÒ»½ÚÄÚÈÝ»¹Óдý׫д¡£</para>
 
 </sect2>
 
-<sect2 id="proc-sparc64">
+<sect2 xml:id="proc-sparc64">
   <title>sparc64</title>
 
   <para>ÕâÒ»½Ú½éÉÜÒÑÖªµÄΪ &os; Ö§³ÖµÄ &ultrasparc; ƽ̨µÄ¼ÆËã»úϵͳ¡£
-    ¹ØÓÚ¸÷ÀàÓ²¼þµÄÉè¼Æϸ½Ú£¬ Çë²Î¼û <ulink url="http://sunsolve.sun.com/handbook_pub/">Sun System Handbook</ulink>¡£</para>
+    ¹ØÓÚ¸÷ÀàÓ²¼þµÄÉè¼Æϸ½Ú£¬ Çë²Î¼û <link xlink:href="http://sunsolve.sun.com/handbook_pub/">Sun System Handbook</link>¡£</para>
 
   <para>ÔÚËùÓаüº¬ 1 ¸öÒÔÉÏ´¦ÀíÆ÷µÄϵͳÉÏ£¬ ¾ùÖ§³Ö SMP¡£</para>
 
@@ -419,7 +416,7 @@
 	build.
 -->
 
-<sect1 id="support">
+<sect1 xml:id="support">
   <title>Ö§³ÖµÄÓ²¼þ</title>
 
   <para>ÕâÒ»½ÚÃèÊöÁËÄ¿Ç°ÒÑÖªµÄ &os; Ö§³ÖµÄÓ²¼þ¡£
@@ -436,7 +433,7 @@
       Èç¹ûËüÃDZ»¶àÖÖ²»Í¬µÄÇý¶¯³ÌÐòÖ§³ÖµÄ»°£¬ ¿ÉÄÜ»áÏàÓ¦µØ³öÏÖ¶à´Î¡£</para>
   </note>
 
-  <sect2 id="disk">
+  <sect2 xml:id="disk">
     <title>´ÅÅÌ¿ØÖÆÆ÷</title>
 
     <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;, &arch.sparc64;] IDE/ATA ¿ØÖÆÆ÷ (&man.ata.4; Çý¶¯³ÌÐò)</para>
@@ -544,7 +541,7 @@
     WORM É豸ÔòÌṩÁËÖ»¶ÁµÄÖ§³Ö
     (ÀýÈç &man.cd.4;)¡£  WORM/CD-R/CD-RW д²Ù×÷µÄÖ§³ÖÓÉ
     &man.cdrecord.1; Ìṩ£¬ ËüÊÇ Ports Collection ÖÐ
-    <filename role="package">sysutils/cdrtools</filename> port
+    <package>sysutils/cdrtools</package> port
     µÄÒ»²¿·Ö¡£</para>
 
     <para>Ä¿Ç°£¬ ¶ÔÒÔÏ CD-ROM ÎļþϵͳÀàÐÍÌṩ֧³Ö£º
@@ -573,7 +570,7 @@
     </para>
 
   </sect2>
-  <sect2 id="ethernet">
+  <sect2 xml:id="ethernet">
     <title>ÒÔÌ«Íø½Ó¿Ú</title>
 
     &hwlist.aue;
@@ -686,13 +683,13 @@
 
   </sect2>
 
-  <sect2 id="fddi">
+  <sect2 xml:id="fddi">
     <title>FDDI ½Ó¿Ú</title>
     <para>[&arch.i386;, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4; Çý¶¯³ÌÐò)</para>
     <para>[&arch.i386;] DEC DEFEA EISA (&man.fpa.4; Çý¶¯³ÌÐò)</para>
   </sect2>
 
-  <sect2 id="atm">
+  <sect2 xml:id="atm">
     <title>ATM ½Ó¿Ú</title>
 
     <para>[&arch.i386;, &arch.pc98;] »ùÓÚ Midway µÄ ATM ½Ó¿Ú (&man.en.4;
@@ -711,7 +708,7 @@
       Çý¶¯³ÌÐò)</para>
 
   </sect2>
-  <sect2 id="wlan">
+  <sect2 xml:id="wlan">
     <title>ÎÞÏßÍøÂç½Ó¿Ú</title>
 
     <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Cisco/Aironet 802.11b ÎÞÏßÊÊÅäÆ÷ (&man.an.4; Çý¶¯³ÌÐò)
@@ -747,7 +744,7 @@
 
   </sect2>
 
-  <sect2 id="misc-network">
+  <sect2 xml:id="misc-network">
     <title>ÆäËûÍøÂçÉ豸</title>
 
     &hwlist.ce;
@@ -762,7 +759,7 @@
 
   </sect2>
 
-  <sect2 id="isdn">
+  <sect2 xml:id="isdn">
     <title>ISDN ½Ó¿Ú</title>
     <para>[&arch.i386;] AcerISDN P10 ISA PnP (ʵÑéÐÔµÄ)</para>
     <para>[&arch.i386;] Asuscom ISDNlink 128K ISA</para>
@@ -856,7 +853,7 @@
     <para>[&arch.i386;] »ùÓÚ Winbond W6692 µÄ PCI ¿¨</para>
   </sect2>
 
-  <sect2 id="serial">
+  <sect2 xml:id="serial">
     <title>´®¿Ú</title>
 
     <para>[&arch.amd64; &arch.i386;] <quote>PC ±ê×¼</quote> »ùÓÚ 8250¡¢ 16450£¬ ÒÔ¼°»ùÓÚ 16550 µÄ´®¿Ú (&man.sio.4; Çý¶¯³ÌÐò)</para>
@@ -1046,7 +1043,7 @@
       </note>
 
   </sect2>
-  <sect2 id="sound">
+  <sect2 xml:id="sound">
     <title>ÉùÒôÉ豸</title>
 
     &hwlist.snd.ad1816;
@@ -1134,7 +1131,7 @@
     </para>
   </sect2>
 
-  <sect2 id="camera">
+  <sect2 xml:id="camera">
     <title>ÕÕÏà»úºÍÊÓƵ²¶×½É豸</title>
 
     &hwlist.bktr;
@@ -1142,7 +1139,7 @@
     <para>[&arch.i386;] Connectix QuickCam</para>
   </sect2>
 
-  <sect2 id="usb">
+  <sect2 xml:id="usb">
     <title>USB É豸</title>
 
     <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] &os; Äܹ»Ö§³ÖһϵÁÐ USB ÍâÉ裻
@@ -1151,13 +1148,11 @@
     ¼´Ê¹ÔÚÕâÀïûÓÐÃ÷È·µØÁгö¡£</para>
 
     <note>
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] USB ÒÔÌ«ÍøÊÊÅäÆ÷¿ÉÒÔÔÚ <link
-      linkend="ethernet">ÒÔÌ«Íø½Ó¿Ú</link> Ò»½ÚÕÒµ½¡£</para>
+      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] USB ÒÔÌ«ÍøÊÊÅäÆ÷¿ÉÒÔÔÚ <link linkend="ethernet">ÒÔÌ«Íø½Ó¿Ú</link> Ò»½ÚÕÒµ½¡£</para>
     </note>
 
     <note>
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] USB À¶ÑÀÊÊÅäÆ÷¿ÉÒÔÔÚ <link
-      linkend="bluetooth">À¶ÑÀ</link> Ò»½ÚÕÒµ½¡£</para>
+      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] USB À¶ÑÀÊÊÅäÆ÷¿ÉÒÔÔÚ <link linkend="bluetooth">À¶ÑÀ</link> Ò»½ÚÕÒµ½¡£</para>
     </note>
 
     &hwlist.ohci;
@@ -1219,7 +1214,7 @@
 
  </sect2>
 
-  <sect2 id="firewire">
+  <sect2 xml:id="firewire">
     <title>IEEE 1394 (»ðÏß) É豸</title>
 
     &hwlist.fwohci;
@@ -1229,7 +1224,7 @@
 
   </sect2>
 
-  <sect2 id="bluetooth">
+  <sect2 xml:id="bluetooth">
     <title>À¶ÑÀÉ豸</title>
 
     &hwlist.ng.bt3c;
@@ -1238,7 +1233,7 @@
 
   </sect2>
 
-  <sect2 id="crypto-accel">
+  <sect2 xml:id="crypto-accel">
     <title>ÃÜÂëѧ¼ÓËÙÆ÷</title>
 
     &hwlist.hifn;
@@ -1248,7 +1243,7 @@
     &hwlist.ubsec;
   </sect2>
 
-  <sect2 id="misc">
+  <sect2 xml:id="misc">
     <title>ÆäËû</title>
 
     <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] FAX-Modem/PCCARD
@@ -1269,8 +1264,7 @@
 
       <note>
 	<para>¹ØÓÚÌض¨ÏÔ¿¨Óë <application>Xorg</application> µÄ¼æÈÝÐÅÏ¢£¬
-	  ¿ÉÒÔÔÚ <ulink
-	  url="http://www.x.org/"></ulink> ÕÒµ½¡£</para>
+	  ¿ÉÒÔÔÚ <uri xlink:href="http://www.x.org/">http://www.x.org/</uri> ÕÒµ½¡£</para>
       </note>
 
       </para>
@@ -1312,7 +1306,7 @@
       <note>
 	<para>&man.moused.8; ÌṩÁËÈçºÎÔÚ &os; ÖÐʹÓö¨µãÉ豸µÄ½øÒ»²½ÐÅÏ¢¡£
 	  ¹ØÓÚÈçºÎÔÚ <application>Xorg</application> ÖÐʹÓÃÕâÀàÉ豸µÄÐÅÏ¢£¬ ¿ÉÒÔÔÚ
-	  <ulink url="http://www.x.org/"></ulink> ÕÒµ½¡£</para>
+	  <uri xlink:href="http://www.x.org/">http://www.x.org/</uri> ÕÒµ½¡£</para>
       </note>
     </para>
 
@@ -1339,8 +1333,8 @@
     </para>
 
     <para>[&arch.i386;] »ùÓÚ Xilinx XC6200 µÄ¿ÉÖØÅäÖÃÓ²¼þ¿¨£¬ Óë
-    <ulink url="http://www.vcc.com/">Virtual
-    Computers</ulink> µÄ HOT1 ¼æÈÝ (xrpu Çý¶¯³ÌÐò)¡£</para>
+    <link xlink:href="http://www.vcc.com/">Virtual
+    Computers</link> µÄ HOT1 ¼æÈÝ (xrpu Çý¶¯³ÌÐò)¡£</para>
 
     <para>[&arch.pc98;] NEC PC-98 ±Ê¼Ç±¾µÄµçÔ´¹ÜÀí¿ØÖÆÆ÷ (pmc
     Çý¶¯³ÌÐò)</para>
diff --git a/release/doc/zh_CN.GB2312/readme/article.xml b/release/doc/zh_CN.GB2312/readme/article.xml
index b76e4a99de7..8e3ffa4fc49 100644
--- a/release/doc/zh_CN.GB2312/readme/article.xml
+++ b/release/doc/zh_CN.GB2312/readme/article.xml
@@ -1,22 +1,28 @@
 <?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
-
 <!--
 	The FreeBSD Documentation Project
 	The FreeBSD Simplified Chinese Project
 
 	Original Revision: 179456
 -->
+<!-- 
+     Local Variables:
+     mode: sgml
+     sgml-indent-data: t
+     sgml-omittag: nil
+     sgml-always-quote-attributes: t
+     End:
+-->
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+  <info><title>&os; &release.current; ×ÔÊö</title>
+    
 
-<article>
-  <articleinfo>
-    <title>&os; &release.current; ×ÔÊö</title>
-
-    <corpauthor>The &os; Project</corpauthor>
+    <author><orgname>The &os; Project</orgname></author>
 
     <pubdate>$FreeBSD$</pubdate>
 
@@ -33,14 +39,13 @@
       <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 
-    <legalnotice id="trademarks" role="trademarks">
+    <legalnotice xml:id="trademarks" role="trademarks">
       &tm-attrib.freebsd;
       &tm-attrib.intel;
       &tm-attrib.opengroup;
       &tm-attrib.sparc;
       &tm-attrib.general;
     </legalnotice>
-  </articleinfo>
 
   <abstract>
     <para>Õâ·ÝÎĵµ¶Ô &os;
@@ -48,8 +53,9 @@
       &os;¡¢&os;
       ÏîÄ¿ÁªÏµµÄ¶àÖÖ·½Ê½£¬ ÒÔ¼°Ò»Ð©ÆäËûµÄÐÅÏ¢À´Ô´¡£</para>
   </abstract>
+  </info>
 
-  <sect1 id="intro">
+  <sect1 xml:id="intro">
     <title>½éÉÜ</title>
 
     <para>Õâ¸ö·¢Ðа汾ÊÇ &os; &release.current; µÄÒ»¸ö &release.type;£¬
@@ -140,7 +146,7 @@
     </sect2>
   </sect1>
 
-  <sect1 id="obtain">
+  <sect1 xml:id="obtain">
     <title>»ñÈ¡ &os;</title>
 
     <para>&os; ¿ÉÒÔͨ¹ý¸÷ÖÖ·½Ê½µÃµ½¡£
@@ -157,31 +163,26 @@
 	Ô¤±àÒëµÄ <quote>package</quote> ÒÔ¼°ÆäËû×ÊÁÏ¡£</para>
 
       <para>Ò»¸öÒÑÖªµÄ CDROM ºÍ DVD
-	·¢ÐÐÉÌÁбíÁÐÔÚʹÓÃÊÖ²áµÄ <ulink
-	url="&url.books.handbook;/mirrors.html"><quote>Obtaining
-	&os;</quote></ulink> ÖС£</para>
+	·¢ÐÐÉÌÁбíÁÐÔÚʹÓÃÊÖ²áµÄ <link xlink:href="&url.books.handbook;/mirrors.html"><quote>Obtaining
+	&os;</quote></link> ÖС£</para>
     </sect2>
 
     <sect2>
       <title>FTP</title>
 
-      <para>Äú¿ÉÒÔʹÓà FTP À´´Ó <ulink
-	url="ftp://ftp.FreeBSD.org/"></ulink> ÏÂÔØ &os;
+      <para>Äú¿ÉÒÔʹÓà FTP À´´Ó <uri xlink:href="ftp://ftp.FreeBSD.org/">ftp://ftp.FreeBSD.org/</uri> ÏÂÔØ &os;
 	ÒÔ¼°ËùÓеĿÉÑ¡Èí¼þ°ü£¬ÕâÊǹٷ½µÄ &os; ·¢ÐÐÕ¾µã£¬»òÕß´ÓÈκÎÒ»¸ö
 	<quote>¾µÏñ</quote> ÏÂÔØ¡£</para>
 
       <para>&os; µÄ¾µÏñÁбí¿ÉÒÔÔÚʹÓÃÊÖ²áµÄ
-	<ulink
-	url="&url.books.handbook;/mirrors-ftp.html">FTP
-	Õ¾µã</ulink>Ò»½Ú£¬ »òÕßÔÚ <ulink
-	url="http://mirrorlist.FreeBSD.org/"></ulink> ÍøÒ³ÉÏÕÒµ½¡£
+	<link xlink:href="&url.books.handbook;/mirrors-ftp.html">FTP
+	Õ¾µã</link>Ò»½Ú£¬ »òÕßÔÚ <uri xlink:href="http://mirrorlist.FreeBSD.org/">http://mirrorlist.FreeBSD.org/</uri> ÍøÒ³ÉÏÕÒµ½¡£
 	Ç¿ÁÒÍƼöÄú´ÓÆäÖÐÀëÄú×î½ü (ÒÔÍøÂçµÄ¹Ûµã)
 	µÄ¾µÏñÀ´ÏÂÔØ·¢Ðа汾¡£</para>
 
       <para>ÎÒÃǷdz£»¶Ó­Äú½¨Á¢ÐµľµÏñÕ¾µã¡£ ÁªÏµ
 	<email>freebsd-admin@FreeBSD.org</email> Á˽â³ÉΪ¹Ù·½¾µÏñÕ¾µãµÄ¸ü¶àϸ½Ú¡£
-	Ò²¿ÉÒÔÔÚ<ulink
-        url="&url.articles.hubs;/">ÈçºÎΪ &os; ×ö¾µÏñÕ¾µã</ulink>
+	Ò²¿ÉÒÔÔÚ<link xlink:href="&url.articles.hubs;/">ÈçºÎΪ &os; ×ö¾µÏñÕ¾µã</link>
         ÕâƪÎÄÕÂÖÐÕÒµ½¹ØÓÚ¾µÏñÕ¾µãµÄ¸ü¶àÓÐÓõÄÐÅÏ¢¡£</para>
 
       <para>¾µÏñÕ¾µãͨ³£»áÌṩÓÃÓڿ̼ &os; ·¢Ðа汾µÄ CDROM
@@ -191,7 +192,7 @@
     </sect2>
   </sect1>
 
-  <sect1 id="contacting">
+  <sect1 xml:id="contacting">
     <title>ÁªÏµ &os; ÏîÄ¿</title>
 
     <sect2>
@@ -217,12 +218,11 @@
 	&a.announce; ¿ÉÄܸüºÏÊÊ¡£</para>
 
       <para>ËùÓеÄÓʼþÁÐ±í¶¼¿ÉÒÔÈçÈËÃÇÏ£ÍûµÄÄÇÑù×ÔÓɼÓÈë¡£
-	Çë·ÃÎÊ <ulink url="&url.base;/mailman/listinfo">
-	FreeBSD Mailman ÐÅÏ¢Ò³</ulink>¡£ÕâÀï»áÌṩÓйؼÓÈë¸÷ÖÖÁÐ±í¡¢
+	Çë·ÃÎÊ <link xlink:href="&url.base;/mailman/listinfo">
+	FreeBSD Mailman ÐÅÏ¢Ò³</link>¡£ÕâÀï»áÌṩÓйؼÓÈë¸÷ÖÖÁÐ±í¡¢
 	·ÃÎÊ´æµµµÈµÈµÄ¸ü¶àÐÅÏ¢¡£
 	»¹ÓкܶàÕë¶ÔÌض¨µÄÐËȤȺÌåµÄÓʼþÁбíÔÚÕâÀïûÓÐÌá¼°£¬
-	¿ÉÒÔ´Ó Mailman Ò³Ãæ»òÕß &os; Web Õ¾µãµÄ <ulink
-	url="&url.base;/support.html#mailing-list">ÓʼþÁбí</ulink>
+	¿ÉÒÔ´Ó Mailman Ò³Ãæ»òÕß &os; Web Õ¾µãµÄ <link xlink:href="&url.base;/support.html#mailing-list">ÓʼþÁбí</link>
 	Ò»½Ú»ñµÃ¸ü¶àÐÅÏ¢¡£</para>
 
       <important>
@@ -241,9 +241,8 @@
       <para>´Óһ̨Äܹ»ÊÕ·¢ Internet ÓʼþµÄÖ÷»úÌá½» bug
 	±¨¸æµÄÊ×Ñ¡·½·¨ÊÇʹÓà &man.send-pr.1; ÃüÁî¡£
 	ÓÃÕâÖÖ·½Ê½Ìá½»µÄ<quote>ÎÊÌⱨ¸æ</quote>(PR)»á±»¹éµµ²¢¸ú×Ù½ø¶È£¬
-	&os; ¿ª·¢Õ߻ᾡ×î´óŬÁ¦¾¡¿ìµØ¶ÔËùÓб¨¸æµÄ bug ×ö³ö·´Ó¦¡£<ulink
-	url="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">
-	ËùÓÐÉÐδÍêÈ«½â¾öµÄ PR Áбí</ulink>¿ÉÒÔÔÚ &os; Web Õ¾µãÉÏÕÒµ½£¬
+	&os; ¿ª·¢Õ߻ᾡ×î´óŬÁ¦¾¡¿ìµØ¶ÔËùÓб¨¸æµÄ bug ×ö³ö·´Ó¦¡£<link xlink:href="http://www.FreeBSD.org/cgi/query-pr-summary.cgi">
+	ËùÓÐÉÐδÍêÈ«½â¾öµÄ PR Áбí</link>¿ÉÒÔÔÚ &os; Web Õ¾µãÉÏÕÒµ½£¬
 	Õâ¸öÁбí¿ÉÒÔÓÃÓڲ鿴ÆäËüÓû§¿ÉÄÜÔâÓöµÄÎÊÌâ¡£</para>
 
       <para>×¢Òâ &man.send-pr.1; ±¾ÉíÊÇÒ»¸ö shell ½Å±¾£¬
@@ -252,19 +251,18 @@
 	&man.send-pr.1; À´Ìá½» bug ±¨¸æ£¬Äú¿ÉÒÔ³¢ÊÔ°ÑËü·¢Ë͵½
 	&a.bugs;¡£</para>
 
-      <para>ÒªÁ˽â¸ü¶àµÄÐÅÏ¢£¬&os; Web Õ¾µãÉϵÄ<ulink
-	url="&url.articles.problem-reports;/"><quote>
-	׫д FreeBSD ÎÊÌⱨ¸æ</quote></ulink>¶Ô׫д²¢Ìá½»ÓÐЧµÄ´íÎ󱨸æÓкܶàÓÐÓõÄÌáʾ¡£</para>
+      <para>ÒªÁ˽â¸ü¶àµÄÐÅÏ¢£¬&os; Web Õ¾µãÉϵÄ<link xlink:href="&url.articles.problem-reports;/"><quote>
+	׫д FreeBSD ÎÊÌⱨ¸æ</quote></link>¶Ô׫д²¢Ìá½»ÓÐЧµÄ´íÎ󱨸æÓкܶàÓÐÓõÄÌáʾ¡£</para>
     </sect2>
   </sect1>
 
-  <sect1 id="seealso">
+  <sect1 xml:id="seealso">
     <title>½øÒ»²½ÔĶÁ</title>
 
     <para>Óкܶà¹ØÓÚ &os; µÄÐÅÏ¢×ÊÔ´£¬Ò»Ð©°üº¬ÔÚ·¢ÐаæÖУ¬
       ÁíһЩÔòÒÔÔÚÏß»òÓ¡Ë¢°æ±¾µÄ·½Ê½Ìṩ¡£</para>
 
-    <sect2 id="release-docs">
+    <sect2 xml:id="release-docs">
       <title>·¢ÐÐÎĵµ</title>
 
       <para>Ðí¶àÆäËüµÄÎĵµÌṩÁËÓйØÕâ¸ö &release.type;
@@ -304,11 +302,11 @@
 	</itemizedlist>
       </para>
 
-      <para>ÔÚÖ§³Ö &man.sysinstall.8; µÄƽ̨ÉÏ (Ä¿Ç°ÓÐ
+      <para>ÔÚÖ§³Ö &man.bsdinstall.8; µÄƽ̨ÉÏ (Ä¿Ç°ÓÐ
 	&arch.amd64;¡¢ &arch.i386;¡¢ &arch.ia64;¡¢ &arch.pc98; ÒÔ¼° &arch.sparc64;)£¬
 	ÕâЩÎĵµÔÚ°²×°Ê±¶¼¿ÉÒÔͨ¹ý Documentation ²Ëµ¥·ÃÎÊ¡£
 	Ò»µ©ÏµÍ³ÒѾ­°²×°£¬Äú¿ÉÒÔͨ¹ýÖØÐÂÔËÐÐ
-	&man.sysinstall.8; ¹¤¾ßÀ´ÖØзÃÎʲ˵¥¡£</para>
+	&man.bsdinstall.8; ¹¤¾ßÀ´ÖØзÃÎʲ˵¥¡£</para>
 
       <note>
 	<para>ÔÚ°²×°ÄúÄõ½µÄÈκη¢Ðаæ֮ǰÔĶÁ¿±ÎóÊǷdz£ÖØÒªµÄ£¬
@@ -318,7 +316,7 @@
 	  µ«ÊÇÆäËüµÄ¸±±¾»áͨ¹ý Internet ±£³Ö¸üв¢×÷Ϊ
 	  Õâ¸ö·¢ÐÐµÄ <quote>×îп±Îó</quote> ²Î¿¼¡£
 	  ÕâЩÆäËüµÄ¿±Î󸱱¾·ÅÔÚ
-	  <ulink url="&url.base;/releases/"></ulink>
+	  <uri xlink:href="&url.base;/releases/">&url.base;/releases/</uri>
 	  (»¹Óб£³Ö¸üеÄÈκξµÏñÕ¾µãµÄͬһλÖÃ)¡£</para>
       </note>
     </sect2>
@@ -327,9 +325,8 @@
       <title>Áª»úÊÖ²á</title>
 
       <para>ÏñËùÓеÄÀà &unix; ²Ù×÷ϵͳһÑù£¬&os; ¸½´øÒ»Ì×ÔÚÏßÁª»úÊֲᣬ
-	¿ÉÒÔͨ¹ý &man.man.1; ÃüÁî»òÕßͨ¹ý &os; Web Õ¾µãÉϵÄ<ulink
-	url="http://www.FreeBSD.org/cgi/man.cgi">³¬Îı¾Áª»úÊÖ²áÍø¹Ø
-	</ulink>·ÃÎÊ¡£ Ò»°ãÇé¿öÏ£¬Áª»úÊÖ²áΪ &os;
+	¿ÉÒÔͨ¹ý &man.man.1; ÃüÁî»òÕßͨ¹ý &os; Web Õ¾µãÉϵÄ<link xlink:href="http://www.FreeBSD.org/cgi/man.cgi">³¬Îı¾Áª»úÊÖ²áÍø¹Ø
+	</link>·ÃÎÊ¡£ Ò»°ãÇé¿öÏ£¬Áª»úÊÖ²áΪ &os;
 	Óû§Ìṩ²»Í¬ÃüÁîºÍ API µÄÐÅÏ¢¡£</para>
 
       <para>ÓÐʱ£¬Áª»úÊֲỹÌṩÌض¨Ö÷ÌâµÄÐÅÏ¢¡£
@@ -342,13 +339,10 @@
       <title>Êé¼®ºÍÎÄÕÂ</title>
 
       <para>Á½¸öÓÉ &os; ÏîĿά»¤µÄ·Ç³£ÓÐÓÃµÄ &os; Ïà¹ØµÄÐÅÏ¢¼¯ºÏ£¬
-	ÊÇ &os; ʹÓÃÊÖ²áºÍ &os; FAQ (Ƶ·±±»Îʵ½µÄÎÊÌâ)¡£ <ulink
-	url="&url.books.handbook;/">ʹÓÃÊÖ²á</ulink>
-	ºÍ <ulink
-	url="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/">FAQ</ulink>
-	µÄÔÚÏß°æ±¾¿ÉÒÔ´Ó <ulink
-	url="&url.books.faq;/">FreeBSD
-	ÎĵµÒ³Ãæ</ulink> »òÕßËüµÄ¾µÏñÉϵõ½¡£ Èç¹û°²×°ÁË
+	ÊÇ &os; ʹÓÃÊÖ²áºÍ &os; FAQ (Ƶ·±±»Îʵ½µÄÎÊÌâ)¡£ <link xlink:href="&url.books.handbook;/">ʹÓÃÊÖ²á</link>
+	ºÍ <link xlink:href="http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/faq/">FAQ</link>
+	µÄÔÚÏß°æ±¾¿ÉÒÔ´Ó <link xlink:href="&url.books.faq;/">FreeBSD
+	ÎĵµÒ³Ãæ</link> »òÕßËüµÄ¾µÏñÉϵõ½¡£ Èç¹û°²×°ÁË
 	<filename>doc</filename> ·¢Ðм¯£¬ Ôò¿ÉÒÔÔÚ±¾µØʹÓà Web
 	ä¯ÀÀÆ÷À´ÔĶÁʹÓÃÊÖ²áºÍ FAQ¡£ ÖµµÃÒ»ÌáµÄÊÇ£¬
 	ÔÚʹÓÃÊÖ²áÖÐÌṩÁËÈçºÎ°²×° &os; µÄÏêϸ˵Ã÷¡£</para>
@@ -360,33 +354,22 @@
         ÎĵµÒ³Ãæ»òÕß <filename>doc</filename>
         ·ÖÀàÖеõ½¡£</para>
 
-      <para>ÓÐ¹Ø &os; µÄÆäËüÊé¼®ºÍÎĵµµÄÁбí¿ÉÒÔÔÚ &os; ʹÓÃÊÖ²áµÄ<ulink
-        url="&url.books.handbook;/bibliography.html">²Î¿¼ÊéÄ¿</ulink>
+      <para>ÓÐ¹Ø &os; µÄÆäËüÊé¼®ºÍÎĵµµÄÁбí¿ÉÒÔÔÚ &os; ʹÓÃÊÖ²áµÄ<link xlink:href="&url.books.handbook;/bibliography.html">²Î¿¼ÊéÄ¿</link>
         Ò»ÕÂÕÒµ½¡£ÓÉÓÚ &os; ¹ÌÓÐµÄ &unix; ´«Í³£¬
         Ðí¶àΪ &unix; ϵͳ׫дµÄÎÄÕºÍÊé¼®Ò²ÊÇÊÊÓõģ¬
         ÆäÖÐһЩҲ±»ÁÐÔڲο¼ÊéÄ¿ÖС£</para>
     </sect2>
   </sect1>
 
-  <sect1 id="acknowledgements">
+  <sect1 xml:id="acknowledgements">
     <title>¸Ðл</title>
 
     <para>&os; ÓÐÈ«ÊÀ½çµÄ³É°ÙÉÏǧµÄÈ˹¤×÷ÎÞÊý¸öСʱ²Å´øÀ´Õâ¸ö
       &release.type;¡£Òª²é¿´ &os; ¿ª·¢Õߺ;èÏ×ÕßµÄÍêÕûÁÐ±í£¬Çë²é¿´
-      &os; Web Õ¾µã»òÕßÈκÎÒ»¸ö¾µÏñÕ¾µãÉ쵀 <ulink
-      url="&url.articles.contributors;/"><quote>&os;
-      ¾èÏ×Õß</quote></ulink>¡£</para>
+      &os; Web Õ¾µã»òÕßÈκÎÒ»¸ö¾µÏñÕ¾µãÉ쵀 <link xlink:href="&url.articles.contributors;/"><quote>&os;
+      ¾èÏ×Õß</quote></link>¡£</para>
 
     <para>ÔÚ´ËÒ²ÒªÌرð¸ÐлÖÚ¶àµÄ &os; Óû§ºÍÈ«ÊÀ½çµÄ²âÊÔÈËÔ±£¬
       ûÓÐËûÃǾ͸ù±¾²»»áÓÐÕâ¸ö &release.type;¡£</para>
   </sect1>
 </article>
-
-<!-- 
-     Local Variables:
-     mode: sgml
-     sgml-indent-data: t
-     sgml-omittag: nil
-     sgml-always-quote-attributes: t
-     End:
--->
diff --git a/release/doc/zh_CN.GB2312/relnotes/article.xml b/release/doc/zh_CN.GB2312/relnotes/article.xml
index ce6a2bded9e..c97acb9d609 100644
--- a/release/doc/zh_CN.GB2312/relnotes/article.xml
+++ b/release/doc/zh_CN.GB2312/relnotes/article.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="gb2312"?>
-<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V4.5-Based Extension//EN"
-        "../../../share/xml/freebsd45.dtd" [
+<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook XML V5.0-Based Extension//EN"
+        "../../../share/xml/freebsd50.dtd" [
 <!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN" "release.ent">
  %release;
 ]>
+<article xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" version="5.0">
+<info><title>&os; &release.current; ·¢ÐÐ˵Ã÷</title>
+  
 
-<article>
-<articleinfo>
-  <title>&os; &release.current; ·¢ÐÐ˵Ã÷</title>
-
-  <corpauthor>The &os; Project</corpauthor>
+  <author><orgname>The &os; Project</orgname></author>
 
   <pubdate>$FreeBSD$</pubdate>
 
@@ -26,7 +25,7 @@
     <holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
 
-  <legalnotice id="trademarks" role="trademarks">
+  <legalnotice xml:id="trademarks" role="trademarks">
     &tm-attrib.freebsd;
     &tm-attrib.ibm;
     &tm-attrib.ieee;
@@ -42,9 +41,9 @@
       &os; ÄÚºËÒÔ¼°ÏµÍ³¸½´øµÄÓ¦ÓóÌÐòËù×öµÄÖØÒªÐ޸ġ£
       ¶ÔÔÚÉý¼¶Ê±ÐèҪעÒâµÄһЩÎÊÌ⣬ Ò²½øÐÐÁ˼òÂԵĽéÉÜ¡£</para>
   </abstract>
-</articleinfo>
+</info>
 
-<sect1 id="intro">
+<sect1 xml:id="intro">
   <title>¼ò½é</title>
 
   <para>ÕâƪÎĵµ°üÀ¨ÁË &os;
@@ -55,21 +54,20 @@
   <para releasetype="current">ÕâƪÎĵµËù½éÉÜµÄ &release.type; Èí¼þ°ü£¬
     ½éÉÜÁË &release.branch; ¿ª·¢·ÖÖ§×Ô &release.branch;
     ´´½¨ÒÔÀ´µÄ½øÕ¹¡£ ¹ØÓÚÕâÒ»·ÖÖ§ÉÏÔ¤±àÒëµÄ¡¢ ¶þ½øÖÆ°æ±¾µÄ
-    &release.type; Èí¼þ°ü£¬ ¿ÉÒÔÔÚ <ulink url="&release.url;"></ulink>
+    &release.type; Èí¼þ°ü£¬ ¿ÉÒÔÔÚ <uri xlink:href="&release.url;">&release.url;</uri>
     ÕÒµ½¡£</para>
 
   <para releasetype="snapshot">Õâ·Ý˵Ã÷Ëù˵µÄ &release.type; °æ±¾£¬
     ÊÇÔÚ &release.branch; ¿ª·¢·ÖÖ§ÉÏ &release.prev; µ½Î´À´µÄ &release.next;
     ÉϵÄÒ»µã¡£ ÕâÒ»¿ª·¢·ÖÖ§ÉÏÔ¤±àÒëµÄ¶þ½øÖÆÐÎʽµÄ &release.type;
-    °²×°°ü£¬ ¿ÉÒÔÔÚ <ulink url="&release.url;"></ulink> ÕÒµ½¡£</para>
+    °²×°°ü£¬ ¿ÉÒÔÔÚ <uri xlink:href="&release.url;">&release.url;</uri> ÕÒµ½¡£</para>
 
   <para releasetype="release">ÕâÊÇÒ»·Ý &os; &release.current; µÄ
-    &release.type; ·¢²¼°ü¡£ Äú¿ÉÒÔ´Ó <ulink
-    url="&release.url;"></ulink> »òÆäËû¾µÏñÄÇÀïµÃµ½ËüµÄ¸±±¾¡£
+    &release.type; ·¢²¼°ü¡£ Äú¿ÉÒÔ´Ó <uri xlink:href="&release.url;">&release.url;</uri> »òÆäËû¾µÏñÄÇÀïµÃµ½ËüµÄ¸±±¾¡£
     ¹ØÓÚÕâ¸ö (»òÆäËû) &release.type; ·¢²¼°üµÄ¸ü¶àÐÅÏ¢£¬¿ÉÒÔÔÚ
-    <ulink url="&url.books.handbook;/">&os; ÊÖ²á</ulink>
-    ÖÐµÄ <ulink url="&url.books.handbook;/mirrors.html"><quote>ÈçºÎ»ñµÃ
-    &os;</quote>¸½Â¼</ulink> ÖÐÕÒµ½¡£</para>
+    <link xlink:href="&url.books.handbook;/">&os; ÊÖ²á</link>
+    ÖÐµÄ <link xlink:href="&url.books.handbook;/mirrors.html"><quote>ÈçºÎ»ñµÃ
+    &os;</quote>¸½Â¼</link> ÖÐÕÒµ½¡£</para>
 
   <para>ÎÒÃǹÄÀøËùÓеÄÓû§ÔÚ¿ªÊ¼°²×° &os;
     ֮ǰÊ×ÏȲο¼ÕâÒ»°æ±¾Ëù¶ÔÓ¦µÄ¿±ÎóÐÅÏ¢¡£
@@ -80,7 +78,7 @@
 
 </sect1>
 
-<sect1 id="new">
+<sect1 xml:id="new">
   <title>×îб䶯</title>
 
   <para>ÕâÒ»½ÚÃèÊöÁË
@@ -97,14 +95,14 @@
     ÕâƪÎĵµÖ÷Òª¹Ø×¢µÄ£¬ÈÔÈ»ÊÇ°²È«¹«¸æ£¬Óû§¿ÉÒÔ²ì¾õµÄÐ޸ģ¬
     ÒÔ¼°ÖØÒªµÄ¼Ü¹¹¸ÄÁ¼¡£</para>
 
-  <sect2 id="security">
+  <sect2 xml:id="security">
     <title>°²È«¹«¸æ</title>
 
-    <para></para>
+    <para/>
 
   </sect2>
 
-  <sect2 id="kernel">
+  <sect2 xml:id="kernel">
     <title>¶ÔÄں˵ĸĶ¯</title>
     
     <para>&man.acpi.4; ÌṩÁË¶Ô HPET ʱÖÓ¼ÆÊýÆ÷µÄ»ù±¾Ö§³Ö¡£&merged;</para>
@@ -146,7 +144,7 @@
     <para arch="amd64,i386,ia64,powerpc" role="merged">ULE
       µ÷¶ÈÆ÷³ÉΪÁË <filename>GENERIC</filename> Äں˵ÄĬÈϽø³Ìµ÷¶ÈÆ÷¡£</para>
 
-    <sect3 id="boot">
+    <sect3 xml:id="boot">
       <title>Òýµ¼¼ÓÔØÆ÷±ä¶¯</title>
 
       <para arch="amd64,i386" role="merged">¶ÔÒýµ¼¼ÓÔØÆ÷ʹÓÃµÄ BTX Äں˽øÐÐÁËÐ޸ģ¬
@@ -161,7 +159,7 @@
 
     </sect3>
 
-    <sect3 id="proc">
+    <sect3 xml:id="proc">
       <title>Ó²¼þÖ§³Ö</title>
 
       <para role="merged">ÐÂÔöÁËÓÃÓÚÖ§³Ö Omnikey CardMan 4040
@@ -172,14 +170,14 @@
       <para role="merged">´Ó OpenBSD ÒýÈëÁËÓÃÓÚÖ§³Ö»ùÓÚ Silicon
         Laboratories CP2101/CP2102 USB ´®¿ÚÊÊÅäÆ÷µÄ &man.uslcom.4; Çý¶¯¡£</para>
 
-      <sect4 id="mm">
+      <sect4 xml:id="mm">
 	<title>¶àýÌåÖ§³Ö</title>
 
-	<para></para>
+	<para/>
 
       </sect4>
 
-      <sect4 id="net-if">
+      <sect4 xml:id="net-if">
 	<title>ÍøÂç½Ó¿ÚÖ§³Ö</title>
 
 	<para>½« &man.em.4; Çý¶¯³ÌÐò²ð·Ö³ÉÁ˲¿·Ö´úÂë¹²ÓõÄÁ½¸öÇý¶¯³ÌÐò¡£
@@ -211,7 +209,7 @@
       </sect4>
     </sect3>
 
-    <sect3 id="net-proto">
+    <sect3 xml:id="net-proto">
       <title>ÍøÂçЭÒé</title>
 
       <para>Ϊ &man.bpf.4; °ü¹ýÂ˼°²¶×½»úÖÆÐÂÔöÁËÃ⸴ÖÆ (zero-copy) ²Ù×÷ģʽ£¬
@@ -226,7 +224,7 @@
 
     </sect3>
 
-    <sect3 id="disks">
+    <sect3 xml:id="disks">
       <title>´ÅÅ̺ʹ洢</title>
 
       <para role="merged">&man.aac.4; Çý¶¯³ÌÐòÖ§³Ö³ß´ç³¬¹ý
@@ -243,7 +241,7 @@
 
     </sect3>
 
-    <sect3 id="fs">
+    <sect3 xml:id="fs">
       <title>Îļþϵͳ</title>
 
       <para>ÐÞÕýÁËÔÚ ZFS ÉÏʹÓà &man.mmap.2; ʱµÄÒ»¸öÎÊÌâ¡£</para>
@@ -254,7 +252,7 @@
     </sect3>
   </sect2>
 
-  <sect2 id="userland">
+  <sect2 xml:id="userland">
     <title>Óû§Ì¬»·¾³±ä¶¯</title>
 
     <para role="merged">&man.adduser.8; ¹¤¾ßÐÂÔöÁËÓÃÓÚÖ¸¶¨ÐÂÓû§Ö÷Ŀ¼µÄ
@@ -334,15 +332,15 @@
     <para>&man.traceroute6.8; ÐÂÔöÁËÓë³£¼ûµÄ UDP ̽²â°ü²»Í¬µÄ¡¢
       ²»²ÉÓÃÉϲãЭÒéµÄ̽²â°ü½øÐÐ̽²âµÄ <option>-U</option> Ñ¡Ïî¡£</para>
 
-    <sect3 id="rc-scripts">
+    <sect3 xml:id="rc-scripts">
       <title><filename>/etc/rc.d</filename> ½Å±¾</title>
 
-      <para></para>
+      <para/>
 
     </sect3>
   </sect2>
 
-  <sect2 id="contrib">
+  <sect2 xml:id="contrib">
     <title>»ù±¾ÏµÍ³ÖеĵÚÈý·½Èí¼þ</title>
 
     <para role="merged"><application>AMD</application> ´Ó 6.0.10
@@ -382,7 +380,7 @@
 
   </sect2>
 
-  <sect2 id="ports">
+  <sect2 xml:id="ports">
     <title>Ports/Packages Ì×¼þ»ù´¡½á¹¹</title>
 
     <para>&man.pkg.create.1; ¹¤¾ßÐÂÔöÁË
@@ -396,26 +394,26 @@
 
   </sect2>
 
-  <sect2 id="releng">
+  <sect2 xml:id="releng">
     <title>·¢²¼¹¤³ÌÓëϵͳ¼¯³É</title>
 
 
     <para role="merged">Ö§³ÖµÄ
       <application>GNOME</application> ×ÀÃæ»·¾³
-      (<filename role="package">x11/gnome2</filename>)
+      (<package>x11/gnome2</package>)
       °æ±¾´Ó 2.20.1 Éý¼¶µ½ÁË 2.22¡£</para>
 
   </sect2>
 
-  <sect2 id="doc">
+  <sect2 xml:id="doc">
     <title>Îĵµ</title>
 
-    <para></para>
+    <para/>
 
   </sect2>
 </sect1>
 
-<sect1 id="upgrade">
+<sect1 xml:id="upgrade">
   <title>´ÓÏÈÇ°°æ±¾µÄ &os; Éý¼¶</title>
 
   <para arch="amd64,i386">´Ó &os; 6.2-RELEASE ¿ªÊ¼£¬
diff --git a/release/generate-release.sh b/release/generate-release.sh
deleted file mode 100755
index b9b5f202039..00000000000
--- a/release/generate-release.sh
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this 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$
-#
-
-# generate-release.sh: check out source trees, and build release components with
-#  totally clean, fresh trees.
-#
-#  Usage: generate-release.sh svn-branch[@revision] scratch-dir
-#
-# Environment variables:
-#  SVNROOTBASE: SVN base URL to FreeBSD repository (svn://svn.freebsd.org)
-#  SVNROOTSRC:  URL to FreeBSD src tree (${SVNROOTBASE}/base)
-#  SVNROOTDOC:  URL to FreeBSD doc tree (${SVNROOTBASE}/doc)
-#  SVNROOTPORTS:URL to FreeBSD ports tree (${SVNROOTBASE}/ports)
-#  BRANCHSRC:   branch name of src (svn-branch[@revision])
-#  BRANCHDOC:   branch name of doc (head)
-#  BRANCHPORTS: branch name of ports (head)
-#  WORLD_FLAGS: optional flags to pass to buildworld (e.g. -j)
-#  KERNEL_FLAGS: optional flags to pass to buildkernel (e.g. -j)
-#
-
-usage()
-{
-	echo "Usage: $0 svn-branch[@revision] scratch-dir" 2>&1
-	exit 1
-}
-
-if [ $# -lt 2 ]; then
-	usage
-fi
-
-: ${SVNROOTBASE:=svn://svn.freebsd.org}
-: ${SVNROOTSRC:=${SVNROOTBASE}/base}
-: ${SVNROOTDOC:=${SVNROOTBASE}/doc}
-: ${SVNROOTPORTS:=${SVNROOTBASE}/ports}
-: ${SVNROOT:=${SVNROOTSRC}} # for backward compatibility
-: ${SVN_CMD:=/usr/local/bin/svn}
-BRANCHSRC=$1
-: ${BRANCHDOC:=head}
-: ${BRANCHPORTS:=head}
-: ${WORLD_FLAGS:=${MAKE_FLAGS}}
-: ${KERNEL_FLAGS:=${MAKE_FLAGS}}
-: ${CHROOTDIR:=$2}
- 
-if [ ! -r "${CHROOTDIR}" ]; then
-	echo "${CHROOTDIR}: scratch dir not found."
-	exit 1
-fi
-
-CHROOT_CMD="/usr/sbin/chroot ${CHROOTDIR}"
-case ${TARGET} in
-"")	;;
-*)	SETENV_TARGET="TARGET=$TARGET" ;;
-esac
-case ${TARGET_ARCH} in
-"")	;;
-*)	SETENV_TARGET_ARCH="TARGET_ARCH=$TARGET_ARCH" ;;
-esac
-SETENV="env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin"
-CROSSENV="${SETENV_TARGET} ${SETENV_TARGET_ARCH}"
-WMAKE="make -C /usr/src ${WORLD_FLAGS}"
-NWMAKE="${WMAKE} __MAKE_CONF=/dev/null SRCCONF=/dev/null"
-KMAKE="make -C /usr/src ${KERNEL_FLAGS}"
-RMAKE="make -C /usr/src/release"
-
-if [ $(id -u) -ne 0 ]; then
-	echo "Needs to be run as root."
-	exit 1
-fi
-
-set -e # Everything must succeed
-
-mkdir -p ${CHROOTDIR}/usr/src
-${SVN_CMD} co ${SVNROOT}/${BRANCHSRC} ${CHROOTDIR}/usr/src
-${SVN_CMD} co ${SVNROOTDOC}/${BRANCHDOC} ${CHROOTDIR}/usr/doc
-${SVN_CMD} co ${SVNROOTPORTS}/${BRANCHPORTS} ${CHROOTDIR}/usr/ports
-
-${SETENV} ${NWMAKE} -C ${CHROOTDIR}/usr/src ${WORLD_FLAGS} buildworld
-${SETENV} ${NWMAKE} -C ${CHROOTDIR}/usr/src installworld distribution DESTDIR=${CHROOTDIR}
-mount -t devfs devfs ${CHROOTDIR}/dev
-trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit
-
-if [ -d ${CHROOTDIR}/usr/doc ]; then 
-	cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
-
-	# Install docproj to build release documentation
-	${CHROOT_CMD} /bin/sh -c \
-		'make -C /usr/ports/textproc/docproj \
-			BATCH=yes \
-			WITHOUT_SVN=yes \
-			WITHOUT_JADETEX=yes \
-			WITHOUT_X11=yes \
-			WITHOUT_PYTHON=yes \
-			install'
-fi
-
-${CHROOT_CMD} ${SETENV} ${CROSSENV} ${WMAKE} buildworld
-${CHROOT_CMD} ${SETENV} ${CROSSENV} ${KMAKE} buildkernel
-${CHROOT_CMD} ${SETENV} ${CROSSENV} ${RMAKE} release
-${CHROOT_CMD} ${SETENV} ${CROSSENV} ${RMAKE} install DESTDIR=/R
diff --git a/release/i386/pkg-stage.conf b/release/i386/pkg-stage.conf
new file mode 100755
index 00000000000..6d9e8efdd37
--- /dev/null
+++ b/release/i386/pkg-stage.conf
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:32"
+export ASSUME_ALWAYS_YES=1
+export __PKG_CONF="/etc/pkg/FreeBSD.conf"
+export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/latest"
+export MIRROR_TYPE="SRV"
+export REPO_AUTOUPDATE="NO"
+export PKG_DBDIR="/tmp/pkg"
+export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
+export PERMISSIVE="YES"
+export PKGCMD="/usr/sbin/pkg -d -C ${__PKG_CONF}"
+
+DVD_PACKAGES="archivers/unzip
+devel/subversion
+devel/subversion-static
+emulators/linux_base-f10
+misc/freebsd-doc-all
+net/mpd5
+net/rsync
+ports-mgmt/pkg
+ports-mgmt/portaudit
+ports-mgmt/portmaster
+shells/bash
+shells/zsh
+security/sudo
+sysutils/screen
+www/firefox
+www/links
+x11-drivers/xf86-video-vmware
+x11/gnome2
+x11/kde4
+x11/xorg"
diff --git a/release/picobsd/build/picobsd b/release/picobsd/build/picobsd
index 1bebc8701a2..8d5caa8d7c2 100755
--- a/release/picobsd/build/picobsd
+++ b/release/picobsd/build/picobsd
@@ -166,7 +166,7 @@ create_includes_and_libraries2() { # opt_dir opt_target
     log "create_includes_and_libraries2() for ${SRC} $1"
     if [ ${OSVERSION} -ge 600000 ] ; then
 	no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITHOUT_CDDL=1"
-	no="$no -DWITHOUT_CLANG -DMALLOC_PRODUCTION"
+	no="$no -DMALLOC_PRODUCTION"
     else
 	no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R"
     fi
@@ -437,7 +437,7 @@ do_kernel() {		# OK
 	[ "${o_do_modules}" = "yes" ] && export MODULES=""
 	# kernel build not parallelizable yet
 	${BINMAKE} KERNCONF=${l_kernconf}	\
-		-v -f ${PICO_TREE}/build/Makefile.conf ) || \
+		-f ${PICO_TREE}/build/Makefile.conf ) || \
 	    fail $? missing_kernel
 }
 
@@ -677,7 +677,7 @@ populate_mfs_tree() {
     a=${BUILDDIR}/crunch1.conf
     ( export BUILDDIR SRC MY_TREE PICO_OBJ ;
 	${BINMAKE} \
-		-v -f ${PICO_TREE}/build/Makefile.conf ${BUILDDIR}/crunch.mk )
+		-f ${PICO_TREE}/build/Makefile.conf ${BUILDDIR}/crunch.mk )
     log "Libs are ${LIBS} "
     export SRC # used by crunch.mk
     # export LIBS CFLAGS
@@ -881,7 +881,7 @@ fill_floppy_image() {
     else
     	log "not loading mfs, size ${mfs_size} img ${imgsize}"
     fi
-    log "Compress with kgzip and copy to floppy image"
+    log "Compress with gzip and copy to floppy image"
 
     mkdir -p  ${dst}/boot/kernel
     # XXX loader.conf does not work unless we also load the .4th files
@@ -974,10 +974,17 @@ set_build_parameters() {
     if [ ${OSVERSION} -ge 500035 ] ; then
 	export MAKEOBJDIRPREFIX=${l_objtree}
 	export TARGET_ARCH=${o_arch} TARGET=${o_arch}
-	export WITHOUT_CLANG_IS_CC=1
+	# XXX 20131001 see if CLANG fixes the build
+	export WITHOUT_CLANG_IS_CC=yes
+	export WITH_GCC=yes
+	export WITH_GNUCXX=yes
+	export WITHOUT_CLANG=yes
+	export WITHOUT_ICONV=yes
+
 	# XXX why change machine_arch ?
 	#-- export MACHINE_ARCH=`uname -m` MACHINE=`uname -m`
 	# export CWARNFLAGS="-Wextra -Wno-sign-compare -Wno-missing-field-initializers"
+	# XXX BINMAKE does not really exist anymore
 	eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V BINMAKE`\""
 	[ "$BINMAKE" = "" ] && \
 	   eval "export BINMAKE=\"`cd ${SRC}; make -f Makefile -V SUB_MAKE`\""
diff --git a/release/picobsd/floppy.tree/etc/rc1 b/release/picobsd/floppy.tree/etc/rc1
index 00b12ea961f..a4a0798344f 100644
--- a/release/picobsd/floppy.tree/etc/rc1
+++ b/release/picobsd/floppy.tree/etc/rc1
@@ -52,8 +52,11 @@ pwd_mkdb -p ./master.passwd
 [ "${inetd_enable}" = "YES" -a -f /stand/inetd ] && \
 	{ echo "Starting inetd."; inetd ${inetd_flags} ; }
 
-[ "${sshd_enable}" = "YES" -a -f /stand/sshd ] && \
-	{ echo "Starting sshd..." ; sshd -f /etc/sshd_config ; }
+if [ "${sshd_enable}" = "YES" -a -f /usr/sbin/sshd ] ; then
+	echo "Starting sshd..."
+	chmod 600 /etc/ssh_host*key
+	/usr/sbin/sshd -f /etc/sshd_config
+fi
 
 echo ''
 cat /etc/motd
diff --git a/release/picobsd/floppy.tree/etc/ssh/sshd_config b/release/picobsd/floppy.tree/etc/ssh/sshd_config
index 5e9688791d4..4529c416fff 100644
--- a/release/picobsd/floppy.tree/etc/ssh/sshd_config
+++ b/release/picobsd/floppy.tree/etc/ssh/sshd_config
@@ -1,24 +1,23 @@
+# $FreeBSD$
+# minimal config for sshd on picobsd
 Port 22
 ListenAddress 0.0.0.0
 HostKey  /etc/ssh_host_key
-RandomSeed /etc/ssh_random_seed
+#RandomSeed /etc/ssh_random_seed
 ServerKeyBits 768
 LoginGraceTime 600
 KeyRegenerationInterval 3600
 PermitRootLogin yes
 IgnoreRhosts no
 StrictModes yes
-QuietMode no
 X11Forwarding no
 X11DisplayOffset 10
-FascistLogging no
 PrintMotd yes
 KeepAlive yes
 SyslogFacility AUTH
-RhostsAuthentication no
 RhostsRSAAuthentication yes
 RSAAuthentication yes
-PasswordAuthentication no
+PasswordAuthentication yes
 PermitEmptyPasswords no
 UseLogin no
 # CheckMail no
diff --git a/release/release.conf.sample b/release/release.conf.sample
index 5f30b4b9e38..882f911b31f 100644
--- a/release/release.conf.sample
+++ b/release/release.conf.sample
@@ -39,3 +39,4 @@ PORTBRANCH="ports/head@rHEAD"
 #NODOC=
 #NOPORTS=
 #RELSTRING=
+#WITH_DVD=
diff --git a/release/release.sh b/release/release.sh
index c02790914a2..1389ce341e3 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -72,6 +72,9 @@ KERNEL="GENERIC"
 NODOC=
 NOPORTS=
 
+# Set to non-empty value to build dvd1.iso as part of the release.
+WITH_DVD=
+
 usage() {
 	echo "Usage: $0 [-c release.conf]"
 	exit 1
@@ -108,10 +111,10 @@ fi
 # instead of their values.
 DOCPORTS=
 if [ "x${NOPORTS}" != "x" ]; then
- DOCPORTS="NOPORTS=yes "
+	DOCPORTS="NOPORTS=yes "
 fi
 if [ "x${NODOC}" != "x" ]; then
- DOCPORTS="${DOCPORTS}NODOC=yes"
+	DOCPORTS="${DOCPORTS}NODOC=yes"
 fi
 
 # The aggregated build-time flags based upon variables defined within
@@ -129,12 +132,12 @@ 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}"
+	${DOCPORTS} WITH_DVD=${WITH_DVD}"
 
 # Force src checkout if configured
 FORCE_SRC_KEY=
 if [ "x${SRC_FORCE_CHECKOUT}" != "x" ]; then
- FORCE_SRC_KEY="--force"
+	FORCE_SRC_KEY="--force"
 fi
 
 if [ ! ${CHROOTDIR} ]; then
@@ -159,6 +162,7 @@ if [ "x${NOPORTS}" = "x" ]; then
 	svn co ${SVNROOT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports
 fi
 
+cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
 cd ${CHROOTDIR}/usr/src
 make ${CHROOT_WMAKEFLAGS} buildworld
 make ${CHROOT_IMAKEFLAGS} installworld DESTDIR=${CHROOTDIR}
@@ -167,12 +171,17 @@ mount -t devfs devfs ${CHROOTDIR}/dev
 trap "umount ${CHROOTDIR}/dev" EXIT # Clean up devfs mount on exit
 
 build_doc_ports() {
+	# Run ldconfig(8) in the chroot directory so /var/run/ld-elf*.so.hints
+	# is created.  This is needed by ports-mgmt/pkg.
+	chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart
+
 	## Trick the ports 'run-autotools-fixup' target to do the right thing.
 	_OSVERSION=$(sysctl -n kern.osreldate)
 	if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then
-		PBUILD_FLAGS="OSVERSION=${_OSVERSION} WITHOUT_JADETEX=yes WITHOUT_X11=yes BATCH=yes"
+		PBUILD_FLAGS="OSVERSION=${_OSVERSION} BATCH=yes"
+		PBUILD_FLAGS="${PBUILD_FLAGS}"
 		chroot ${CHROOTDIR} make -C /usr/ports/textproc/docproj \
-			${PBUILD_FLAGS} install clean distclean
+			${PBUILD_FLAGS} OPTIONS_UNSET="FOP IGOR" install clean distclean
 	fi
 }
 
@@ -188,7 +197,6 @@ if [ -e ${SRC_CONF} ] && [ ! -c ${SRC_CONF} ]; then
 fi
 
 if [ -d ${CHROOTDIR}/usr/ports ]; then
-	cp /etc/resolv.conf ${CHROOTDIR}/etc/resolv.conf
 	build_doc_ports ${CHROOTDIR}
 fi
 
@@ -202,8 +210,3 @@ eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
 	release RELSTRING=${RELSTRING}
 eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
 	install DESTDIR=/R RELSTRING=${RELSTRING}
-
-cd ${CHROOTDIR}/R
-
-sha256 FreeBSD-* > CHECKSUM.SHA256
-md5 FreeBSD-* > CHECKSUM.MD5
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
new file mode 100755
index 00000000000..93768fffa8d
--- /dev/null
+++ b/release/scripts/pkg-stage.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+set -e
+
+usage() {
+	echo "$(basename ${0}) /path/to/pkg-stage.conf revision"
+	exit 1
+}
+
+if [ ! -e "${1}" ]; then
+	echo "Configuration file not specified."
+	echo
+	usage
+fi
+
+if [ "$#" -lt 2 ]; then
+	usage
+fi
+
+# Source config file for this architecture.
+REVISION="${2}"
+. "${1}" || exit 1
+
+if [ ! -x /usr/local/sbin/pkg ]; then
+	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
+fi
+
+/bin/mkdir -p ${PKG_CACHEDIR}
+
+${PKGCMD} update -f
+${PKGCMD} fetch -d ${DVD_PACKAGES}
+
+${PKGCMD} repo ${PKG_CACHEDIR}
+
+# Always exit '0', even if pkg(8) complains about conflicts.
+exit 0
diff --git a/sbin/Makefile b/sbin/Makefile
index 47728449ba4..9ee8ea37e52 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -72,12 +72,16 @@ SUBDIR=adjkerntz \
 	swapon \
 	sysctl \
 	tunefs \
-	umount \
+	umount
 
 .if ${MK_ATM} != "no"
 SUBDIR+=	atm
 .endif
 
+.if ${MK_CASPER} != "no"
+SUBDIR+=	casperd
+.endif
+
 .if ${MK_CXX} != "no"
 SUBDIR+=	devd
 .endif
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c
index e80c549cf96..f3e10112cac 100644
--- a/sbin/camcontrol/camcontrol.c
+++ b/sbin/camcontrol/camcontrol.c
@@ -566,11 +566,11 @@ getdevtree(void)
 				}
 
 				fprintf(stdout, "%-33s  at scbus%d "
-					"target %d lun %d (",
+					"target %d lun %jx (",
 					tmpstr,
 					dev_result->path_id,
 					dev_result->target_id,
-					dev_result->target_lun);
+					(uintmax_t)dev_result->target_lun);
 
 				need_close = 1;
 
@@ -2748,7 +2748,7 @@ atasecurity(struct cam_device *device, int retry_count, int timeout,
 			if (strcasecmp(optarg, "user") == 0) {
 				pwd.ctrl |= ATA_SECURITY_PASSWORD_USER;
 				pwd.ctrl &= ~ATA_SECURITY_PASSWORD_MASTER;
-			} else if (strcasecmp(optarg, "master") != 0) {
+			} else if (strcasecmp(optarg, "master") == 0) {
 				pwd.ctrl |= ATA_SECURITY_PASSWORD_MASTER;
 				pwd.ctrl &= ~ATA_SECURITY_PASSWORD_USER;
 			} else {
diff --git a/sbin/camcontrol/fwdownload.c b/sbin/camcontrol/fwdownload.c
index 7e57d320772..181c2344a63 100644
--- a/sbin/camcontrol/fwdownload.c
+++ b/sbin/camcontrol/fwdownload.c
@@ -224,6 +224,7 @@ fw_read_img(const char *fw_img_path, const struct fw_vendor *vp, int *num_bytes)
 		goto bailout;
 	}
 	*num_bytes = img_size;
+	close(fd);
 	return (buf);
 bailout:
 	free(buf);
@@ -286,6 +287,7 @@ fw_download_img(struct cam_device *cam_dev, const struct fw_vendor *vp,
 		ata_28bit_cmd(&ccb->ataio, ATA_ATA_IDENTIFY, 0, 0, 0);
 	} else {
 		warnx("weird disk type '%s'", type);
+		cam_freeccb(ccb);
 		return 1;
 	}
 	/* Disable freezing the device queue. */
diff --git a/sbin/camcontrol/modeedit.c b/sbin/camcontrol/modeedit.c
index 8504208cfcc..00ab97404c4 100644
--- a/sbin/camcontrol/modeedit.c
+++ b/sbin/camcontrol/modeedit.c
@@ -886,12 +886,12 @@ mode_list(struct cam_device *device, int page_control, int dbd,
 	    timeout, data, sizeof(data));
 
 	mh = (struct scsi_mode_header_6 *)data;
-	len = mh->blk_desc_len;		/* Skip block descriptors. */
+	len = sizeof(*mh) + mh->blk_desc_len;	/* Skip block descriptors. */
 	/* Iterate through the pages in the reply. */
 	while (len < mh->data_length) {
 		/* Locate the next mode page header. */
 		mph = (struct scsi_mode_page_header *)
-		    ((intptr_t)mh + sizeof(*mh) + len);
+		    ((intptr_t)mh + len);
 
 		mph->page_code &= SMS_PAGE_CODE;
 		nameentry = nameentry_lookup(mph->page_code);
diff --git a/sbin/casperd/Makefile b/sbin/casperd/Makefile
new file mode 100644
index 00000000000..d436ce8f115
--- /dev/null
+++ b/sbin/casperd/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PROG=	casperd
+
+SRCS=	casperd.c zygote.c
+
+DPADD=	${LIBCAPSICUM} ${LIBCASPER} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL}
+LDADD=	-lcapsicum -lcasper -lnv -lpjdlog -lutil
+
+MAN=	casperd.8
+
+CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${.CURDIR}/../../lib/libcapsicum
+CFLAGS+=-I${.CURDIR}/../../lib/libcasper
+CFLAGS+=-I${.CURDIR}/../../lib/libnv
+CFLAGS+=-I${.CURDIR}/../../lib/libpjdlog
+
+.include <bsd.prog.mk>
diff --git a/sbin/casperd/casperd.8 b/sbin/casperd/casperd.8
new file mode 100644
index 00000000000..ccf9a3d7bd3
--- /dev/null
+++ b/sbin/casperd/casperd.8
@@ -0,0 +1,124 @@
+.\" Copyright (c) 2013 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This documentation was written by Pawel Jakub Dawidek 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 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 October 26, 2013
+.Dt CASPERD 8
+.Os
+.Sh NAME
+.Nm casperd
+.Nd "Capability Services friendly daemon"
+.Sh SYNOPSIS
+.Nm
+[-Fhv] [-D servconfdir] [-P pidfile] [-S sockpath]
+.Op Fl Fhv
+.Op Fl D Ar servconfdir
+.Op Fl P Ar pidfile
+.Op Fl S Ar sockpath
+.Sh DESCRIPTION
+The
+.Nm
+daemon hosts various services that can be accessed through
+libcapsicum's capabilities by programs running in sandboxes.
+For example it is prohibited to send UDP packets to arbitrary destinations
+when operating in capability mode, which makes DNS resolution impossible.
+To make it possible the
+.Nm
+daemon provides the
+.Nm system.dns
+service that proxies DNS resolution requests through a dedicated,
+non-sandboxed process provided by
+.Nm .
+.Pp
+The
+.Nm
+daemon can be started with the following command line arguments:
+.Bl -tag -width ".Fl D Ar servconfdir"
+.It Fl D Ar servconfdir
+Specify alternative location of the service configuration directory.
+The default location is
+.Pa /etc/casper/ .
+.It Fl F
+Start the
+.Nm
+daemon in the foreground.
+By default
+.Nm
+starts in the background.
+.It Fl h
+Print the
+.Nm
+usage message.
+.It Fl P Ar pidfile
+Specify alternative location of a file where main process PID will be
+stored.
+The default location is
+.Pa /var/run/casperd.pid .
+.It Fl S Ar sockpath
+Specify alternative location of the
+.Xr unix 4
+domain socket used to connect to the
+.Nm
+daemon.
+The default location is
+.Pa /var/run/casper .
+.It Fl v
+Print or log verbose/debugging information.
+This option can be specified multiple times to raise the verbosity
+level.
+.El
+.Sh FILES
+.Bl -tag -width ".Pa /var/run/casperd.pid" -compact
+.It Pa /etc/casper/
+The configuration directory for
+.Nm
+services.
+.It Pa /var/run/casper
+.Xr unix 4
+domain socket used to connect to the
+.Nm
+daemon.
+.It Pa /var/run/casperd.pid
+The default location of the
+.Nm
+PID file.
+.El
+.Sh EXIT STATUS
+Exit status is 0 on success, and > 0 of an error occurs.
+.Sh SEE ALSO
+.Xr cap_enter 2 ,
+.Xr libcapsicum 3 ,
+.Xr pidfile 3 ,
+.Xr capsicum 4 ,
+.Xr unix 4
+.Sh AUTHORS
+The
+.Nm
+was implemented by
+.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+under sponsorship from the FreeBSD Foundation.
diff --git a/sbin/casperd/casperd.c b/sbin/casperd/casperd.c
new file mode 100644
index 00000000000..d0e63762769
--- /dev/null
+++ b/sbin/casperd/casperd.c
@@ -0,0 +1,712 @@
+/*-
+ * Copyright (c) 2012 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/capability.h>
+#include <sys/queue.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+
+#include <assert.h>
+#include <dirent.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <libutil.h>
+#include <paths.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <unistd.h>
+
+#include <libcapsicum.h>
+#include <libcapsicum_impl.h>
+#include <libcasper.h>
+#include <libcasper_impl.h>
+#include <msgio.h>
+#include <nv.h>
+#include <pjdlog.h>
+
+#include "msgio.h"
+
+#include "zygote.h"
+
+#define	CASPERD_PIDFILE		"/var/run/casperd.pid"
+#define	CASPERD_SERVCONFDIR	"/etc/casper"
+#define	CASPERD_SOCKPATH	"/var/run/casper"
+
+typedef void service_function_t(struct service_connection *, const nvlist_t *,
+    nvlist_t *);
+
+struct casper_service {
+	const char	*cs_name;
+	const char	*cs_execpath;
+	struct service	*cs_service;
+	nvlist_t	*cs_attrs;
+	TAILQ_ENTRY(casper_service) cs_next;
+};
+
+static TAILQ_HEAD(, casper_service) casper_services =
+    TAILQ_HEAD_INITIALIZER(casper_services);
+
+#define	SERVICE_IS_CORE(service)	((service)->cs_execpath == NULL)
+
+static void service_external_execute(int chanfd);
+
+#define KEEP_ERRNO(work)	do {					\
+	int _serrno;							\
+									\
+	_serrno = errno;						\
+	work;								\
+	errno = _serrno;						\
+} while (0)
+
+static struct casper_service *
+service_find(const char *name)
+{
+	struct casper_service *casserv;
+
+	TAILQ_FOREACH(casserv, &casper_services, cs_next) {
+		if (strcmp(casserv->cs_name, name) == 0)
+			break;
+	}
+	return (casserv);
+}
+
+/*
+ * Function always consumes the given attrs.
+ */
+static void
+service_register(nvlist_t *attrs)
+{
+	struct casper_service *casserv;
+	const char *name;
+
+	PJDLOG_ASSERT(nvlist_exists_string(attrs, "name"));
+	PJDLOG_ASSERT(nvlist_exists_string(attrs, "execpath") ||
+	    (nvlist_exists_number(attrs, "commandfunc") &&
+	     nvlist_exists_number(attrs, "limitfunc")));
+
+	name = nvlist_get_string(attrs, "name");
+	PJDLOG_ASSERT(name != NULL);
+	if (name[0] == '\0') {
+		pjdlog_error("Unable to register service with an empty name.");
+		nvlist_destroy(attrs);
+		return;
+	}
+	if (service_find(name) != NULL) {
+		pjdlog_error("Service \"%s\" is already registered.", name);
+		nvlist_destroy(attrs);
+		return;
+	}
+
+	casserv = malloc(sizeof(*casserv));
+	if (casserv == NULL) {
+		pjdlog_errno(LOG_ERR, "Unable to register service \"%s\"",
+		    name);
+		nvlist_destroy(attrs);
+		return;
+	}
+	casserv->cs_name = name;
+	if (nvlist_exists_string(attrs, "execpath")) {
+		struct stat sb;
+
+		PJDLOG_ASSERT(!nvlist_exists_number(attrs, "commandfunc"));
+		PJDLOG_ASSERT(!nvlist_exists_number(attrs, "limitfunc"));
+
+		casserv->cs_service = NULL;
+
+		casserv->cs_execpath = nvlist_get_string(attrs, "execpath");
+		if (casserv->cs_execpath == NULL ||
+		    casserv->cs_execpath[0] == '\0') {
+			pjdlog_error("Unable to register service with an empty execpath.");
+			free(casserv);
+			nvlist_destroy(attrs);
+			return;
+		}
+		if (stat(casserv->cs_execpath, &sb) == -1) {
+			pjdlog_errno(LOG_ERR,
+			    "Unable to register service \"%s\", problem with executable \"%s\"",
+			    name, casserv->cs_execpath);
+			free(casserv);
+			nvlist_destroy(attrs);
+			return;
+		}
+	} else /* if (nvlist_exists_number(attrs, "commandfunc")) */ {
+		PJDLOG_ASSERT(!nvlist_exists_string(attrs, "execpath"));
+
+		casserv->cs_execpath = NULL;
+
+		casserv->cs_service = service_alloc(name,
+		    (void *)(uintptr_t)nvlist_get_number(attrs, "limitfunc"),
+		    (void *)(uintptr_t)nvlist_get_number(attrs, "commandfunc"));
+		if (casserv->cs_service == NULL) {
+			pjdlog_errno(LOG_ERR,
+			    "Unable to register service \"%s\"", name);
+			free(casserv);
+			nvlist_destroy(attrs);
+			return;
+		}
+	}
+	casserv->cs_attrs = attrs;
+	TAILQ_INSERT_TAIL(&casper_services, casserv, cs_next);
+	pjdlog_debug(1, "Service %s successfully registered.",
+	    casserv->cs_name);
+}
+
+static bool
+casper_allowed_service(const nvlist_t *limits, const char *service)
+{
+
+	if (limits == NULL)
+		return (true);
+
+	if (nvlist_exists_null(limits, service))
+		return (true);
+
+	return (false);
+}
+
+static int
+casper_limit(const nvlist_t *oldlimits, const nvlist_t *newlimits)
+{
+	const char *name;
+	int type;
+	void *cookie;
+
+	cookie = NULL;
+	while ((name = nvlist_next(newlimits, &type, &cookie)) != NULL) {
+		if (type != NV_TYPE_NULL)
+			return (EINVAL);
+		if (!casper_allowed_service(oldlimits, name))
+			return (ENOTCAPABLE);
+	}
+
+	return (0);
+}
+
+static int
+casper_command(const char *cmd, const nvlist_t *limits, nvlist_t *nvlin,
+    nvlist_t *nvlout)
+{
+	struct casper_service *casserv;
+	const char *servname;
+	nvlist_t *nvl;
+	int chanfd, execfd, procfd, error;
+
+	if (strcmp(cmd, "open") != 0)
+		return (EINVAL);
+	if (!nvlist_exists_string(nvlin, "service"))
+		return (EINVAL);
+
+	servname = nvlist_get_string(nvlin, "service");
+
+	casserv = service_find(servname);
+	if (casserv == NULL)
+		return (ENOENT);
+
+	if (!casper_allowed_service(limits, servname))
+		return (ENOTCAPABLE);
+
+#ifdef O_EXEC_WORKING
+	execfd = open(casserv->cs_execpath, O_EXEC);
+#else
+	execfd = open(casserv->cs_execpath, O_RDONLY);
+#endif
+	if (execfd < -1) {
+		error = errno;
+		pjdlog_errno(LOG_ERR,
+		    "Unable to open executable '%s' of service '%s'",
+		    casserv->cs_execpath, casserv->cs_name);
+		return (error);
+	}
+
+	if (zygote_clone(service_external_execute, 0, &chanfd, &procfd) == -1) {
+		error = errno;
+		close(execfd);
+		return (error);
+	}
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "service", casserv->cs_name);
+	if (nvlist_exists_descriptor(nvlin, "stderrfd")) {
+		nvlist_move_descriptor(nvl, "stderrfd",
+		    nvlist_take_descriptor(nvlin, "stderrfd"));
+	}
+	nvlist_move_descriptor(nvl, "execfd", execfd);
+	nvlist_move_descriptor(nvl, "procfd", procfd);
+	if (nvlist_send(chanfd, nvl) == -1) {
+		error = errno;
+		pjdlog_errno(LOG_ERR, "Unable to send nvlist");
+		nvlist_destroy(nvl);
+		close(chanfd);
+		return (error);
+	}
+	nvlist_destroy(nvl);
+
+	nvlist_move_descriptor(nvlout, "chanfd", chanfd);
+
+	return (0);
+}
+
+static void
+fdswap(int *fd0, int *fd1)
+{
+	int tmpfd;
+
+	PJDLOG_VERIFY((tmpfd = dup(*fd0)) != -1);
+	PJDLOG_VERIFY(dup2(*fd1, *fd0) != -1);
+	PJDLOG_VERIFY(dup2(tmpfd, *fd1) != -1);
+	close(tmpfd);
+	tmpfd = *fd0;
+	*fd0 = *fd1;
+	*fd1 = tmpfd;
+}
+
+static void
+fdmove(int *oldfdp, int newfd)
+{
+
+	if (*oldfdp != newfd) {
+		PJDLOG_VERIFY(dup2(*oldfdp, newfd) != -1);
+		close(*oldfdp);
+		*oldfdp = newfd;
+	}
+}
+
+static void
+fdcloexec(int fd)
+{
+	int flags;
+
+	flags = fcntl(fd, F_GETFD);
+	PJDLOG_ASSERT(flags != -1);
+	if ((flags & FD_CLOEXEC) != 0)
+		PJDLOG_VERIFY(fcntl(fd, F_SETFD, flags & ~FD_CLOEXEC) != -1);
+}
+
+static void
+service_register_core(void)
+{
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "name", "core.casper");
+	nvlist_add_number(nvl, "limitfunc", (uint64_t)(uintptr_t)casper_limit);
+	nvlist_add_number(nvl, "commandfunc",
+	    (uint64_t)(uintptr_t)casper_command);
+	service_register(nvl);
+}
+
+static int
+setup_creds(int sock)
+{
+	struct cmsgcred cred;
+
+	if (cred_recv(sock, &cred) == -1)
+		return (-1);
+
+	if (setgroups((int)cred.cmcred_ngroups, cred.cmcred_groups) == -1)
+		return (-1);
+
+	if (setgid(cred.cmcred_groups[0]) == -1)
+		return (-1);
+
+	if (setuid(cred.cmcred_euid) == -1)
+		return (-1);
+
+	return (0);
+}
+
+static void
+service_external_execute(int chanfd)
+{
+	char *service, *argv[3];
+	int stderrfd, execfd, procfd;
+	nvlist_t *nvl;
+
+	nvl = nvlist_recv(chanfd);
+	if (nvl == NULL)
+		pjdlog_exit(1, "Unable to receive nvlist");
+	service = nvlist_take_string(nvl, "service");
+	PJDLOG_ASSERT(service != NULL);
+	if (nvlist_exists_descriptor(nvl, "stderrfd")) {
+		stderrfd = nvlist_take_descriptor(nvl, "stderrfd");
+	} else {
+		stderrfd = open(_PATH_DEVNULL, O_RDWR);
+		if (stderrfd < 0)
+			pjdlog_exit(1, "Unable to open %s", _PATH_DEVNULL);
+	}
+	execfd = nvlist_take_descriptor(nvl, "execfd");
+	procfd = nvlist_take_descriptor(nvl, "procfd");
+	nvlist_destroy(nvl);
+
+	/*
+	 * Move all descriptors into right slots.
+	 */
+
+	if (stderrfd != STDERR_FILENO) {
+		if (chanfd == STDERR_FILENO)
+			fdswap(&stderrfd, &chanfd);
+		else if (execfd == STDERR_FILENO)
+			fdswap(&stderrfd, &execfd);
+		else if (procfd == STDERR_FILENO)
+			fdswap(&stderrfd, &procfd);
+		fdmove(&stderrfd, STDERR_FILENO);
+	}
+	fdcloexec(stderrfd);
+
+	if (chanfd != PARENT_FILENO) {
+		if (execfd == PARENT_FILENO)
+			fdswap(&chanfd, &execfd);
+		else if (procfd == PARENT_FILENO)
+			fdswap(&chanfd, &procfd);
+		fdmove(&chanfd, PARENT_FILENO);
+	}
+	fdcloexec(chanfd);
+
+	if (execfd != EXECUTABLE_FILENO) {
+		if (procfd == EXECUTABLE_FILENO)
+			fdswap(&execfd, &procfd);
+		fdmove(&execfd, EXECUTABLE_FILENO);
+	}
+	fdcloexec(execfd);
+
+	if (procfd != PROC_FILENO)
+		fdmove(&procfd, PROC_FILENO);
+	fdcloexec(procfd);
+
+	/*
+	 * Use credentials of the caller process.
+	 */
+	setup_creds(chanfd);
+
+	argv[0] = service;
+	asprintf(&argv[1], "%d", pjdlog_debug_get());
+	argv[2] = NULL;
+
+	fexecve(execfd, argv, NULL);
+	pjdlog_exit(1, "Unable to execute service %s", service);
+}
+
+static void
+service_register_external_one(const char *dirpath, int dfd,
+    const char *filename)
+{
+	char execpath[FILENAME_MAX];
+	nvlist_t *nvl;
+	ssize_t done;
+	int fd;
+
+	fd = openat(dfd, filename, O_RDONLY);
+	if (fd == -1) {
+		pjdlog_errno(LOG_ERR, "Unable to open \"%s/%s\"", dirpath,
+		    filename);
+		return;
+	}
+
+	done = read(fd, execpath, sizeof(execpath));
+	if (done == -1) {
+		pjdlog_errno(LOG_ERR, "Unable to read content of \"%s/%s\"",
+		    dirpath, filename);
+		close(fd);
+		return;
+	}
+	close(fd);
+	if (done == sizeof(execpath)) {
+		pjdlog_error("Executable path too long in \"%s/%s\".", dirpath,
+		    filename);
+		return;
+	}
+	execpath[done] = '\0';
+	while (done > 0) {
+		if (execpath[--done] == '\n')
+			execpath[done] = '\0';
+	}
+
+	nvl = nvlist_create(0);
+	nvlist_add_string(nvl, "name", filename);
+	nvlist_add_string(nvl, "execpath", execpath);
+	if (nvlist_error(nvl) != 0) {
+		pjdlog_common(LOG_ERR, 0, nvlist_error(nvl),
+		    "Unable to allocate attributes for service \"%s/%s\"",
+		    dirpath, filename);
+		nvlist_destroy(nvl);
+		return;
+	}
+
+	service_register(nvl);
+	/* service_register() consumed nvl. */
+}
+
+static uint8_t
+file_type(int dfd, const char *filename)
+{
+	struct stat sb;
+
+	if (fstatat(dfd, filename, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
+		pjdlog_errno(LOG_ERR, "Unable to stat \"%s\"", filename);
+		return (DT_UNKNOWN);
+	}
+	return (IFTODT(sb.st_mode));
+}
+
+static void
+service_register_external(const char *dirpath)
+{
+	DIR *dirp;
+	struct dirent *dp;
+	int dfd;
+
+	dirp = opendir(dirpath);
+	if (dirp == NULL) {
+		pjdlog_errno(LOG_WARNING, "Unable to open \"%s\"", dirpath);
+		return;
+	}
+	dfd = dirfd(dirp);
+	PJDLOG_ASSERT(dfd >= 0);
+	while ((dp = readdir(dirp)) != NULL) {
+		dp->d_type = file_type(dfd, dp->d_name);
+		/* We are only interested in regular files, skip the rest. */
+		if (dp->d_type != DT_REG) {
+			pjdlog_debug(1,
+			    "File \"%s/%s\" is not a regular file, skipping.",
+			    dirpath, dp->d_name);
+			continue;
+		}
+		service_register_external_one(dirpath, dfd, dp->d_name);
+	}
+	closedir(dirp);
+}
+
+static void
+casper_accept(int lsock)
+{
+	struct casper_service *casserv;
+	struct service_connection *sconn;
+	int sock;
+
+	sock = accept(lsock, NULL, NULL);
+	if (sock == -1) {
+		pjdlog_errno(LOG_ERR, "Unable to accept casper connection");
+		return;
+	}
+	casserv = service_find("core.casper");
+	PJDLOG_ASSERT(casserv != NULL);
+
+	sconn = service_connection_add(casserv->cs_service, sock, NULL);
+	if (sconn == NULL) {
+		close(sock);
+		return;
+	}
+}
+
+static void
+main_loop(const char *sockpath, struct pidfh *pfh)
+{
+	fd_set fds;
+	struct sockaddr_un sun;
+	struct casper_service *casserv;
+	struct service_connection *sconn, *sconntmp;
+	int lsock, sock, maxfd, ret;
+
+	lsock = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (lsock == -1)
+		pjdlog_exit(1, "Unable to create socket");
+
+	(void)unlink(sockpath);
+
+	bzero(&sun, sizeof(sun));
+	sun.sun_family = AF_UNIX;
+	PJDLOG_VERIFY(strlcpy(sun.sun_path, sockpath, sizeof(sun.sun_path)) <
+	    sizeof(sun.sun_path));
+	sun.sun_len = SUN_LEN(&sun);
+
+	if (bind(lsock, (struct sockaddr *)&sun, sizeof(sun)) == -1)
+		pjdlog_exit(1, "Unable to bind to %s", sockpath);
+	if (listen(lsock, 8) == -1)
+		pjdlog_exit(1, "Unable to listen on %s", sockpath);
+
+	for (;;) {
+		FD_ZERO(&fds);
+		FD_SET(lsock, &fds);
+		maxfd = lsock;
+		TAILQ_FOREACH(casserv, &casper_services, cs_next) {
+			/* We handle only core services. */
+			if (!SERVICE_IS_CORE(casserv))
+				continue;
+			for (sconn = service_connection_first(casserv->cs_service);
+			    sconn != NULL;
+			    sconn = service_connection_next(sconn)) {
+				sock = service_connection_get_sock(sconn);
+				FD_SET(sock, &fds);
+				maxfd = sock > maxfd ? sock : maxfd;
+			}
+		}
+		maxfd++;
+
+		PJDLOG_ASSERT(maxfd <= (int)FD_SETSIZE);
+		ret = select(maxfd, &fds, NULL, NULL, NULL);
+		PJDLOG_ASSERT(ret == -1 || ret > 0);	/* select() cannot timeout */
+		if (ret == -1) {
+			if (errno == EINTR)
+				continue;
+			KEEP_ERRNO((void)pidfile_remove(pfh));
+			pjdlog_exit(1, "select() failed");
+		}
+
+		if (FD_ISSET(lsock, &fds))
+			casper_accept(lsock);
+		TAILQ_FOREACH(casserv, &casper_services, cs_next) {
+			/* We handle only core services. */
+			if (!SERVICE_IS_CORE(casserv))
+				continue;
+			for (sconn = service_connection_first(casserv->cs_service);
+			    sconn != NULL; sconn = sconntmp) {
+				/*
+				 * Prepare for connection to be removed from
+				 * the list on failure.
+				 */
+				sconntmp = service_connection_next(sconn);
+				sock = service_connection_get_sock(sconn);
+				if (FD_ISSET(sock, &fds)) {
+					service_message(casserv->cs_service,
+					    sconn);
+				}
+			}
+		}
+	}
+}
+
+static void
+usage(void)
+{
+
+	pjdlog_exitx(1,
+	    "usage: casperd [-Fhv] [-D servconfdir] [-P pidfile] [-S sockpath]");
+}
+
+int
+main(int argc, char *argv[])
+{
+	struct pidfh *pfh;
+	const char *pidfile, *servconfdir, *sockpath;
+	pid_t otherpid;
+	int ch, debug;
+	bool foreground;
+
+	pjdlog_init(PJDLOG_MODE_STD);
+
+	debug = 0;
+	foreground = false;
+	pidfile = CASPERD_PIDFILE;
+	servconfdir = CASPERD_SERVCONFDIR;
+	sockpath = CASPERD_SOCKPATH;
+
+	while ((ch = getopt(argc, argv, "D:FhP:S:v")) != -1) {
+		switch (ch) {
+		case 'D':
+			servconfdir = optarg;
+			break;
+		case 'F':
+			foreground = true;
+			break;
+		case 'P':
+			pidfile = optarg;
+			break;
+		case 'S':
+			sockpath = optarg;
+			break;
+		case 'v':
+			debug++;
+			break;
+		case 'h':
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 0)
+		usage();
+
+	if (!foreground)
+		pjdlog_mode_set(PJDLOG_MODE_SYSLOG);
+	pjdlog_prefix_set("(casperd) ");
+	pjdlog_debug_set(debug);
+
+	if (zygote_init() < 0)
+		pjdlog_exit(1, "Unable to create zygote process");
+
+	pfh = pidfile_open(pidfile, 0600, &otherpid);
+	if (pfh == NULL) {
+		if (errno == EEXIST) {
+			pjdlog_exitx(1, "casperd already running, pid: %jd.",
+			    (intmax_t)otherpid);
+		}
+		pjdlog_errno(LOG_WARNING, "Cannot open or create pidfile %s",
+		    pidfile);
+	}
+
+	if (!foreground) {
+		if (daemon(0, 0) == -1) {
+			KEEP_ERRNO((void)pidfile_remove(pfh));
+			pjdlog_exit(1, "Unable to go into background");
+		}
+	}
+
+	/* Write PID to a file. */
+	if (pidfile_write(pfh) == -1) {
+		pjdlog_errno(LOG_WARNING, "Unable to write to pidfile %s",
+		    pidfile);
+	} else {
+		pjdlog_debug(1, "PID stored in %s.", pidfile);
+	}
+
+	/*
+	 * Register core services.
+	 */
+	service_register_core();
+	/*
+	 * Register external services.
+	 */
+	service_register_external(servconfdir);
+
+	/*
+	 * Wait for connections.
+	 */
+	main_loop(sockpath, pfh);
+}
diff --git a/sbin/casperd/zygote.c b/sbin/casperd/zygote.c
new file mode 100644
index 00000000000..70594ced1c6
--- /dev/null
+++ b/sbin/casperd/zygote.c
@@ -0,0 +1,219 @@
+/*-
+ * Copyright (c) 2012 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/capability.h>
+#include <sys/procdesc.h>
+#include <sys/socket.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <paths.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <unistd.h>
+
+#include <libcapsicum.h>
+#include <libcapsicum_impl.h>
+#include <nv.h>
+#include <pjdlog.h>
+
+#include "zygote.h"
+
+/* Zygote info. */
+static int	zygote_sock = -1;
+
+static void
+stdnull(void)
+{
+	int fd;
+
+	fd = open(_PATH_DEVNULL, O_RDWR);
+	if (fd == -1)
+		errx(1, "Unable to open %s", _PATH_DEVNULL);
+
+	if (dup2(fd, STDIN_FILENO) == -1)
+		errx(1, "Unable to cover stdin");
+	if (dup2(fd, STDOUT_FILENO) == -1)
+		errx(1, "Unable to cover stdout");
+	if (dup2(fd, STDERR_FILENO) == -1)
+		errx(1, "Unable to cover stderr");
+
+	close(fd);
+}
+
+int
+zygote_clone(zygote_func_t *func, int flags, int *chanfdp, int *procfdp)
+{
+	nvlist_t *nvl;
+	int error;
+
+	if (zygote_sock == -1) {
+		/* Zygote didn't start. */
+		errno = ENXIO;
+		return (-1);
+	}
+
+	nvl = nvlist_create(0);
+	nvlist_add_number(nvl, "func", (uint64_t)(uintptr_t)func);
+	nvlist_add_number(nvl, "flags", (uint64_t)flags);
+	nvl = nvlist_xfer(zygote_sock, nvl);
+	if (nvl == NULL)
+		return (-1);
+	if (nvlist_exists_number(nvl, "error")) {
+		error = (int)nvlist_get_number(nvl, "error");
+		nvlist_destroy(nvl);
+		errno = error;
+		return (-1);
+	}
+
+	*chanfdp = nvlist_take_descriptor(nvl, "chanfd");
+	*procfdp = nvlist_take_descriptor(nvl, "procfd");
+
+	nvlist_destroy(nvl);
+	return (0);
+}
+
+/*
+ * This function creates sandboxes on-demand whoever has access to it via
+ * 'sock' socket. Function sends two descriptors to the caller: process
+ * descriptor of the sandbox and socket pair descriptor for communication
+ * between sandbox and its owner.
+ */
+static void
+zygote_main(int sock)
+{
+	int error, fd, flags, procfd;
+	int chanfd[2];
+	nvlist_t *nvlin, *nvlout;
+	zygote_func_t *func;
+	pid_t pid;
+
+	assert(sock > STDERR_FILENO);
+
+	if (pjdlog_mode_get() != PJDLOG_MODE_STD)
+		stdnull();
+	for (fd = STDERR_FILENO + 1; fd < sock; fd++)
+		close(fd);
+	closefrom(sock + 1);
+
+	for (;;) {
+		nvlin = nvlist_recv(sock);
+		if (nvlin == NULL)
+			continue;
+		func = (zygote_func_t *)(uintptr_t)nvlist_get_number(nvlin,
+		    "func");
+		flags = (int)nvlist_get_number(nvlin, "flags");
+		nvlist_destroy(nvlin);
+
+		/*
+		 * Someone is requesting a new process, create one.
+		 */
+		procfd = -1;
+		chanfd[0] = -1;
+		chanfd[1] = -1;
+		error = 0;
+		if (socketpair(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0,
+		    chanfd) == -1) {
+			error = errno;
+			goto send;
+		}
+		pid = pdfork(&procfd, 0);
+		switch (pid) {
+		case -1:
+			/* Failure. */
+			error = errno;
+			break;
+		case 0:
+			/* Child. */
+			close(sock);
+			close(chanfd[0]);
+			func(chanfd[1]);
+			/* NOTREACHED */
+			exit(1);
+		default:
+			/* Parent. */
+			close(chanfd[1]);
+			break;
+		}
+send:
+		nvlout = nvlist_create(0);
+		if (error != 0) {
+			nvlist_add_number(nvlout, "error", (uint64_t)error);
+			if (chanfd[0] >= 0)
+				close(chanfd[0]);
+			if (procfd >= 0)
+				close(procfd);
+		} else {
+			nvlist_move_descriptor(nvlout, "chanfd", chanfd[0]);
+			nvlist_move_descriptor(nvlout, "procfd", procfd);
+		}
+		(void)nvlist_send(sock, nvlout);
+		nvlist_destroy(nvlout);
+	}
+	/* NOTREACHED */
+}
+
+int
+zygote_init(void)
+{
+	int serrno, sp[2];
+	pid_t pid;
+
+	if (socketpair(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0, sp) == -1)
+		return (-1);
+
+	pid = fork();
+	switch (pid) {
+	case -1:
+		/* Failure. */
+		serrno = errno;
+		close(sp[0]);
+		close(sp[1]);
+		errno = serrno;
+		return (-1);
+	case 0:
+		/* Child. */
+		close(sp[0]);
+		zygote_main(sp[1]);
+		/* NOTREACHED */
+		abort();
+	default:
+		/* Parent. */
+		zygote_sock = sp[0];
+		close(sp[1]);
+		return (0);
+	}
+	/* NOTREACHED */
+}
diff --git a/sbin/casperd/zygote.h b/sbin/casperd/zygote.h
new file mode 100644
index 00000000000..75ef2efda48
--- /dev/null
+++ b/sbin/casperd/zygote.h
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2012 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#ifndef _ZYGOTE_H_
+#define	_ZYGOTE_H_
+
+typedef void zygote_func_t(int);
+
+int zygote_init(void);
+int zygote_clone(zygote_func_t *func, int flags, int *chanfdp, int *procfdp);
+
+#endif	/* !_ZYGOTE_H_ */
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc
index 447ab87e2aa..21816e59c58 100644
--- a/sbin/devd/devd.cc
+++ b/sbin/devd/devd.cc
@@ -248,7 +248,7 @@ bool
 action::do_action(config &c)
 {
 	string s = c.expand_string(_cmd.c_str());
-	devdlog(LOG_NOTICE, "Executing '%s'\n", s.c_str());
+	devdlog(LOG_INFO, "Executing '%s'\n", s.c_str());
 	my_system(s.c_str());
 	return (true);
 }
@@ -1111,7 +1111,7 @@ siginfohand(int)
 }
 
 /*
- * Local logging function.  Prints to syslog if we're daemonized; syslog
+ * Local logging function.  Prints to syslog if we're daemonized; stderr
  * otherwise.
  */
 static void
diff --git a/sbin/fdisk/fdisk.c b/sbin/fdisk/fdisk.c
index da5af0c482f..34b96efd286 100644
--- a/sbin/fdisk/fdisk.c
+++ b/sbin/fdisk/fdisk.c
@@ -75,7 +75,8 @@ static int secsize = 0;		/* the sensed sector size */
 
 static char *disk;
 
-static int cyls, sectors, heads, cylsecs, disksecs;
+static int cyls, sectors, heads, cylsecs;
+static u_int32_t disksecs;
 
 struct mboot {
 	unsigned char *bootinst;  /* boot code */
@@ -873,10 +874,13 @@ get_params()
 	o = g_mediasize(fd);
 	if (o < 0)
 		return (-1);
-	disksecs = o / u;
+	if (o / u <= NO_DISK_SECTORS)
+		disksecs = o / u;
+	else
+		disksecs = NO_DISK_SECTORS;
 	cyls = dos_cyls = o / (u * dos_heads * dos_sectors);
 
-	return (disksecs);
+	return (0);
 }
 
 static int
diff --git a/sbin/fsck_ffs/ea.c b/sbin/fsck_ffs/ea.c
index 35170117a2f..e9c3fced57a 100644
--- a/sbin/fsck_ffs/ea.c
+++ b/sbin/fsck_ffs/ea.c
@@ -65,7 +65,7 @@ eascan(struct inodesc *idesc, struct ufs2_dinode *dp)
 	char dbuf[DIRBLKSIZ];
 
 	printf("Inode %ju extsize %ju\n",
-	   (intmax_t)idesc->id_number, (intmax_t)dp->di_extsize);
+	   (intmax_t)idesc->id_number, (uintmax_t)dp->di_extsize);
 	if (dp->di_extsize == 0)
 		return 0;
 	if (dp->di_extsize <= sblock.fs_fsize)
diff --git a/sbin/geom/class/mirror/geom_mirror.c b/sbin/geom/class/mirror/geom_mirror.c
index 9f0acc67aea..17cfccbd31b 100644
--- a/sbin/geom/class/mirror/geom_mirror.c
+++ b/sbin/geom/class/mirror/geom_mirror.c
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <err.h>
 #include <errno.h>
 #include <paths.h>
 #include <stdio.h>
@@ -53,6 +54,7 @@ static void mirror_activate(struct gctl_req *req);
 static void mirror_clear(struct gctl_req *req);
 static void mirror_dump(struct gctl_req *req);
 static void mirror_label(struct gctl_req *req);
+static void mirror_resize(struct gctl_req *req, unsigned flags);
 
 struct g_command class_commands[] = {
 	{ "activate", G_FLAG_VERBOSE, mirror_main, G_NULL_OPTS,
@@ -112,6 +114,13 @@ struct g_command class_commands[] = {
 	{ "remove", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
 	    "[-v] name prov ..."
 	},
+	{ "resize", G_FLAG_VERBOSE, mirror_resize,
+	    {
+		{ 's', "size", "*", G_TYPE_STRING },
+		G_OPT_SENTINEL
+	    },
+	    "[-s size] [-v] name"
+	},
 	{ "stop", G_FLAG_VERBOSE, NULL,
 	    {
 		{ 'f', "force", NULL, G_TYPE_BOOL },
@@ -376,3 +385,96 @@ mirror_activate(struct gctl_req *req)
 			printf("Provider %s activated.\n", path);
 	}
 }
+
+static struct gclass *
+find_class(struct gmesh *mesh, const char *name)
+{
+	struct gclass *classp;
+
+	LIST_FOREACH(classp, &mesh->lg_class, lg_class) {
+		if (strcmp(classp->lg_name, name) == 0)
+			return (classp);
+	}
+	return (NULL);
+}
+
+static struct ggeom *
+find_geom(struct gclass *classp, const char *name)
+{
+	struct ggeom *gp;
+
+	LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
+		if (strcmp(gp->lg_name, name) == 0)
+			return (gp);
+	}
+	return (NULL);
+}
+
+static void
+mirror_resize(struct gctl_req *req, unsigned flags __unused)
+{
+	struct gmesh mesh;
+	struct gclass *classp;
+	struct ggeom *gp;
+	struct gprovider *pp;
+	struct gconsumer *cp;
+	off_t size;
+	int error, nargs;
+	const char *name;
+	char ssize[30];
+
+	nargs = gctl_get_int(req, "nargs");
+	if (nargs < 1) {
+		gctl_error(req, "Too few arguments.");
+		return;
+	}
+	error = geom_gettree(&mesh);
+	if (error)
+		errc(EXIT_FAILURE, error, "Cannot get GEOM tree");
+	name = gctl_get_ascii(req, "class");
+	if (name == NULL)
+		abort();
+	classp = find_class(&mesh, name);
+	if (classp == NULL)
+		errx(EXIT_FAILURE, "Class %s not found.", name);
+	name = gctl_get_ascii(req, "arg0");
+	if (name == NULL)
+		abort();
+	gp = find_geom(classp, name);
+	if (gp == NULL)
+		errx(EXIT_FAILURE, "No such geom: %s.", name);
+	pp = LIST_FIRST(&gp->lg_provider);
+	if (pp == NULL)
+		errx(EXIT_FAILURE, "Provider of geom %s not found.", name);
+	size = pp->lg_mediasize;
+	name = gctl_get_ascii(req, "size");
+	if (name == NULL)
+		errx(EXIT_FAILURE, "The size is not specified.");
+	if (*name == '*') {
+#define	CSZ(c)	((c)->lg_provider->lg_mediasize - \
+    (c)->lg_provider->lg_sectorsize)
+		/* Find the maximum possible size */
+		LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) {
+			if (CSZ(cp) > size)
+				size = CSZ(cp);
+		}
+		LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) {
+			if (CSZ(cp) < size)
+				size = CSZ(cp);
+		}
+#undef CSZ
+		if (size == pp->lg_mediasize)
+			errx(EXIT_FAILURE,
+			    "Cannot expand provider %s\n",
+			    pp->lg_name);
+	} else {
+		error = g_parse_lba(name, pp->lg_sectorsize, &size);
+		if (error)
+			errc(EXIT_FAILURE, error, "Invalid size param");
+		size *= pp->lg_sectorsize;
+	}
+	snprintf(ssize, sizeof(ssize), "%ju", (uintmax_t)size);
+	gctl_change_param(req, "size", -1, ssize);
+	geom_deletetree(&mesh);
+	gctl_issue(req);
+}
diff --git a/sbin/geom/class/mirror/gmirror.8 b/sbin/geom/class/mirror/gmirror.8
index 58ff8afcbc4..cabeac6c485 100644
--- a/sbin/geom/class/mirror/gmirror.8
+++ b/sbin/geom/class/mirror/gmirror.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 8, 2009
+.Dd November 20, 2013
 .Dt GMIRROR 8
 .Os
 .Sh NAME
@@ -60,6 +60,11 @@
 .Ar name
 .Ar prov ...
 .Nm
+.Cm resize
+.Op Fl v
+.Op Fl s Ar size
+.Ar name
+.Nm
 .Cm insert
 .Op Fl hiv
 .Op Fl p Ar priority
@@ -193,6 +198,16 @@ balance algorithm.
 Rebuild the given mirror components forcibly.
 If autosynchronization was not turned off for the given device, this command
 should be unnecessary.
+.It Cm resize
+Change the size of the given mirror.
+.Pp
+Additional options include:
+.Bl -tag -width ".Fl s Ar size"
+.It Fl s Ar size
+New size of the mirror is expressed in logical block numbers.
+This option can be omitted, then it will be automatically calculated to
+maximum available size.
+.El
 .It Cm insert
 Add the given component(s) to the existing mirror.
 .Pp
diff --git a/sbin/geom/class/part/geom_part.c b/sbin/geom/class/part/geom_part.c
index 9b3e0e5e451..604e65970a2 100644
--- a/sbin/geom/class/part/geom_part.c
+++ b/sbin/geom/class/part/geom_part.c
@@ -364,7 +364,11 @@ gpart_autofill_resize(struct gctl_req *req)
 	}
 
 	offset = (pp->lg_stripeoffset / pp->lg_sectorsize) % alignment;
-	last = (off_t)strtoimax(find_geomcfg(gp, "last"), NULL, 0);
+	s = find_geomcfg(gp, "last");
+	if (s == NULL)
+		errx(EXIT_FAILURE, "Final block not found for geom %s",
+		    gp->lg_name);
+	last = (off_t)strtoimax(s, NULL, 0);
 	LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
 		s = find_provcfg(pp, "index");
 		if (s == NULL)
@@ -502,8 +506,16 @@ gpart_autofill(struct gctl_req *req)
 	if (size > alignment)
 		size = ALIGNDOWN(size, alignment);
 
-	first = (off_t)strtoimax(find_geomcfg(gp, "first"), NULL, 0);
-	last = (off_t)strtoimax(find_geomcfg(gp, "last"), NULL, 0);
+	s = find_geomcfg(gp, "first");
+	if (s == NULL)
+		errx(EXIT_FAILURE, "Starting block not found for geom %s",
+		    gp->lg_name);
+	first = (off_t)strtoimax(s, NULL, 0);
+	s = find_geomcfg(gp, "last");
+	if (s == NULL)
+		errx(EXIT_FAILURE, "Final block not found for geom %s",
+		    gp->lg_name);
+	last = (off_t)strtoimax(s, NULL, 0);
 	grade = ~0ULL;
 	a_first = ALIGNUP(first + offset, alignment);
 	last = ALIGNDOWN(last + offset, alignment);
@@ -587,12 +599,22 @@ gpart_show_geom(struct ggeom *gp, const char *element, int show_providers)
 	int idx, wblocks, wname, wmax;
 
 	scheme = find_geomcfg(gp, "scheme");
+	if (scheme == NULL)
+		errx(EXIT_FAILURE, "Scheme not found for geom %s", gp->lg_name);
 	s = find_geomcfg(gp, "first");
+	if (s == NULL)
+		errx(EXIT_FAILURE, "Starting block not found for geom %s",
+		    gp->lg_name);
 	first = (off_t)strtoimax(s, NULL, 0);
 	s = find_geomcfg(gp, "last");
+	if (s == NULL)
+		errx(EXIT_FAILURE, "Final block not found for geom %s",
+		    gp->lg_name);
 	last = (off_t)strtoimax(s, NULL, 0);
 	wblocks = strlen(s);
 	s = find_geomcfg(gp, "state");
+	if (s == NULL)
+		errx(EXIT_FAILURE, "State not found for geom %s", gp->lg_name);
 	if (s != NULL && *s != 'C')
 		s = NULL;
 	wmax = strlen(gp->lg_name);
@@ -748,6 +770,8 @@ gpart_backup(struct gctl_req *req, unsigned int fl __unused)
 		abort();
 	pp = LIST_FIRST(&gp->lg_consumer)->lg_provider;
 	s = find_geomcfg(gp, "last");
+	if (s == NULL)
+		abort();
 	wblocks = strlen(s);
 	wtype = 0;
 	LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
@@ -757,6 +781,8 @@ gpart_backup(struct gctl_req *req, unsigned int fl __unused)
 			wtype = i;
 	}
 	s = find_geomcfg(gp, "entries");
+	if (s == NULL)
+		abort();
 	windex = strlen(s);
 	printf("%s %s\n", scheme, s);
 	LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
@@ -1177,6 +1203,8 @@ gpart_bootcode(struct gctl_req *req, unsigned int fl)
 	if (gp == NULL)
 		errx(EXIT_FAILURE, "No such geom: %s.", s);
 	s = find_geomcfg(gp, "scheme");
+	if (s == NULL)
+		errx(EXIT_FAILURE, "Scheme not found for geom %s", gp->lg_name);
 	vtoc8 = 0;
 	if (strcmp(s, "VTOC8") == 0)
 		vtoc8 = 1;
diff --git a/sbin/growfs/debug.c b/sbin/growfs/debug.c
index 26a566839b5..55e2b133cbe 100644
--- a/sbin/growfs/debug.c
+++ b/sbin/growfs/debug.c
@@ -765,7 +765,7 @@ dbg_dump_ufs2_ino(struct fs *sb, const char *comment, struct ufs2_dinode *ino)
 	fprintf(dbg_log, "gen        int32_t        0x%08x\n", ino->di_gen);
 	fprintf(dbg_log, "kernflags  u_int32_t      0x%08x\n", ino->di_kernflags);
 	fprintf(dbg_log, "flags      u_int32_t      0x%08x\n", ino->di_flags);
-	fprintf(dbg_log, "extsize    int32_t        0x%08x\n", ino->di_extsize);
+	fprintf(dbg_log, "extsize    u_int32_t      0x%08x\n", ino->di_extsize);
 
 	/* XXX: What do we do with di_extb[NXADDR]? */
 
diff --git a/sbin/growfs/growfs.8 b/sbin/growfs/growfs.8
index 664e7234dfe..cff105f648d 100644
--- a/sbin/growfs/growfs.8
+++ b/sbin/growfs/growfs.8
@@ -37,7 +37,7 @@
 .\" $TSHeader: src/sbin/growfs/growfs.8,v 1.3 2000/12/12 19:31:00 tomsoft Exp $
 .\" $FreeBSD$
 .\"
-.Dd April 30, 2012
+.Dd November 26, 2013
 .Dt GROWFS 8
 .Os
 .Sh NAME
@@ -116,7 +116,7 @@ The
 utility first appeared in
 .Fx 4.4 .
 The ability to resize mounted filesystems was added in
-.Fx 10.0 .
+.Fx 9.2 .
 .Sh AUTHORS
 .An Christoph Herrmann Aq chm@FreeBSD.org
 .An Thomas-Henning von Kamptz Aq tomsoft@FreeBSD.org
diff --git a/sbin/gvinum/gvinum.c b/sbin/gvinum/gvinum.c
index bb4b47d0511..5760d2b8bb2 100644
--- a/sbin/gvinum/gvinum.c
+++ b/sbin/gvinum/gvinum.c
@@ -421,6 +421,7 @@ create_drive(char *device)
 	const char *errstr;
 	char *drivename, *dname;
 	int drives, i, flags, volumes, subdisks, plexes;
+	int found = 0;
 
 	flags = plexes = subdisks = volumes = 0;
 	drives = 1;
@@ -448,10 +449,8 @@ create_drive(char *device)
 	errstr = gctl_issue(req);
 	if (errstr != NULL) {
 		warnx("error creating drive: %s", errstr);
-		gctl_free(req);
-		return (NULL);
+		drivename = NULL;
 	} else {
-		gctl_free(req);
 		/* XXX: This is needed because we have to make sure the drives
 		 * are created before we return. */
 		/* Loop until it's in the config. */
@@ -461,14 +460,18 @@ create_drive(char *device)
 			/* If we got a different name, quit. */
 			if (dname == NULL)
 				continue;
-			if (strcmp(dname, drivename)) {
-				free(dname);
-				return (drivename);
-			}
+			if (strcmp(dname, drivename))
+				found = 1;
 			free(dname);
 			dname = NULL;
+			if (found)
+				break;
 			usleep(100000); /* Sleep for 0.1s */
 		}
+		if (found == 0) {
+			warnx("error creating drive");
+			drivename = NULL;
+		}
 	}
 	gctl_free(req);
 	return (drivename);
diff --git a/sbin/hastctl/hastctl.c b/sbin/hastctl/hastctl.c
index 11b5b8d8722..474f1b24cea 100644
--- a/sbin/hastctl/hastctl.c
+++ b/sbin/hastctl/hastctl.c
@@ -355,6 +355,13 @@ control_list(struct nv *nv)
 		    (uintmax_t)nv_get_uint64(nv, "stat_write_error%u", ii),
 		    (uintmax_t)nv_get_uint64(nv, "stat_delete_error%u", ii),
 		    (uintmax_t)nv_get_uint64(nv, "stat_flush_error%u", ii));
+		printf("    queues: "
+		    "local: %ju, send: %ju, recv: %ju, done: %ju, idle: %ju\n",
+		    (uintmax_t)nv_get_uint64(nv, "local_queue_size%u", ii),
+		    (uintmax_t)nv_get_uint64(nv, "send_queue_size%u", ii),
+		    (uintmax_t)nv_get_uint64(nv, "recv_queue_size%u", ii),
+		    (uintmax_t)nv_get_uint64(nv, "done_queue_size%u", ii),
+		    (uintmax_t)nv_get_uint64(nv, "idle_queue_size%u", ii));
 	}
 	return (ret);
 }
diff --git a/sbin/hastd/control.c b/sbin/hastd/control.c
index 922f5073975..364225bb6df 100644
--- a/sbin/hastd/control.c
+++ b/sbin/hastd/control.c
@@ -215,6 +215,16 @@ control_status_worker(struct hast_resource *res, struct nv *nvout,
 	    "stat_delete_error%u", no);
 	nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_flush_error"),
 	    "stat_flush_error%u", no);
+	nv_add_uint64(nvout, nv_get_uint64(cnvin, "idle_queue_size"),
+	    "idle_queue_size%u", no);
+	nv_add_uint64(nvout, nv_get_uint64(cnvin, "local_queue_size"),
+	    "local_queue_size%u", no);
+	nv_add_uint64(nvout, nv_get_uint64(cnvin, "send_queue_size"),
+	    "send_queue_size%u", no);
+	nv_add_uint64(nvout, nv_get_uint64(cnvin, "recv_queue_size"),
+	    "recv_queue_size%u", no);
+	nv_add_uint64(nvout, nv_get_uint64(cnvin, "done_queue_size"),
+	    "done_queue_size%u", no);
 end:
 	if (cnvin != NULL)
 		nv_free(cnvin);
@@ -478,6 +488,7 @@ ctrl_thread(void *arg)
 			nv_add_uint64(nvout, res->hr_stat_flush_error +
 			    res->hr_stat_activemap_flush_error,
 			    "stat_flush_error");
+			res->output_status_aux(nvout);
 			nv_add_int16(nvout, 0, "error");
 			break;
 		case CONTROL_RELOAD:
diff --git a/sbin/hastd/hast.h b/sbin/hastd/hast.h
index 65c24f87baf..c529de59631 100644
--- a/sbin/hastd/hast.h
+++ b/sbin/hastd/hast.h
@@ -137,6 +137,8 @@ struct hastd_config {
 #define	HAST_CHECKSUM_CRC32	1
 #define	HAST_CHECKSUM_SHA256	2
 
+struct nv;
+
 /*
  * Structure that describes single resource.
  */
@@ -254,6 +256,9 @@ struct hast_resource {
 	/* Number of activemap flush errors. */
 	uint64_t	hr_stat_activemap_flush_error;
 
+	/* Function to output worker specific info on control status request. */
+	void	(*output_status_aux)(struct nv *);
+
 	/* Next resource. */
 	TAILQ_ENTRY(hast_resource) hr_next;
 };
diff --git a/sbin/hastd/hastd.8 b/sbin/hastd/hastd.8
index 017e895fd85..68c98cbc6ff 100644
--- a/sbin/hastd/hastd.8
+++ b/sbin/hastd/hastd.8
@@ -171,7 +171,7 @@ The default location is
 .Pa /var/run/hastd.pid .
 .El
 .Sh FILES
-.Bl -tag -width ".Pa /var/run/hastctl" -compact
+.Bl -tag -width ".Pa /var/run/hastd.pid" -compact
 .It Pa /etc/hast.conf
 The configuration file for
 .Nm
diff --git a/sbin/hastd/hastd.c b/sbin/hastd/hastd.c
index 06b38e91331..bac390ae7ab 100644
--- a/sbin/hastd/hastd.c
+++ b/sbin/hastd/hastd.c
@@ -806,12 +806,6 @@ listen_accept(struct hastd_listen *lst)
 		 */
 		version = 1;
 	}
-	if (version > HAST_PROTO_VERSION) {
-		pjdlog_info("Remote protocol version %hhu is not supported, falling back to version %hhu.",
-		    version, (unsigned char)HAST_PROTO_VERSION);
-		version = HAST_PROTO_VERSION;
-	}
-	pjdlog_debug(1, "Negotiated protocol version %hhu.", version);
 	token = nv_get_uint8_array(nvin, &size, "token");
 	/*
 	 * NULL token means that this is first connection.
@@ -925,6 +919,12 @@ listen_accept(struct hastd_listen *lst)
 	 */
 
 	if (token == NULL) {
+		if (version > HAST_PROTO_VERSION) {
+			pjdlog_info("Remote protocol version %hhu is not supported, falling back to version %hhu.",
+			    version, (unsigned char)HAST_PROTO_VERSION);
+			version = HAST_PROTO_VERSION;
+		}
+		pjdlog_debug(1, "Negotiated protocol version %hhu.", version);
 		res->hr_version = version;
 		arc4random_buf(res->hr_token, sizeof(res->hr_token));
 		nvout = nv_alloc();
diff --git a/sbin/hastd/nv.c b/sbin/hastd/nv.c
index 8dcf6976911..fefc2dfbdf8 100644
--- a/sbin/hastd/nv.c
+++ b/sbin/hastd/nv.c
@@ -566,7 +566,7 @@ nv_get_string(struct nv *nv, const char *namefmt, ...)
 		return (NULL);
 	PJDLOG_ASSERT((nvh->nvh_type & NV_ORDER_MASK) == NV_ORDER_HOST);
 	PJDLOG_ASSERT(nvh->nvh_dsize >= 1);
-	str = NVH_DATA(nvh);
+	str = (char *)NVH_DATA(nvh);
 	PJDLOG_ASSERT(str[nvh->nvh_dsize - 1] == '\0');
 	PJDLOG_ASSERT(strlen(str) == nvh->nvh_dsize - 1);
 	return (str);
diff --git a/sbin/hastd/primary.c b/sbin/hastd/primary.c
index 09ae17bd98c..385a52a6f8a 100644
--- a/sbin/hastd/primary.c
+++ b/sbin/hastd/primary.c
@@ -93,6 +93,15 @@ struct hio {
 	 * Request was already confirmed to GEOM Gate.
 	 */
 	bool			 hio_done;
+	/*
+	 * Number of components we are still waiting before sending write
+	 * completion ack to GEOM Gate. Used for memsync.
+	 */
+	refcnt_t		 hio_writecount;
+	/*
+	 * Memsync request was acknowleged by remote.
+	 */
+	bool			 hio_memsyncacked;
 	/*
 	 * Remember replication from the time the request was initiated,
 	 * so we won't get confused when replication changes on reload.
@@ -108,6 +117,7 @@ struct hio {
  * until some in-progress requests are freed.
  */
 static TAILQ_HEAD(, hio) hio_free_list;
+static size_t hio_free_list_size;
 static pthread_mutex_t hio_free_list_lock;
 static pthread_cond_t hio_free_list_cond;
 /*
@@ -116,20 +126,26 @@ static pthread_cond_t hio_free_list_cond;
  * responsible for managing his own send list.
  */
 static TAILQ_HEAD(, hio) *hio_send_list;
+static size_t *hio_send_list_size;
 static pthread_mutex_t *hio_send_list_lock;
 static pthread_cond_t *hio_send_list_cond;
+#define	hio_send_local_list_size	hio_send_list_size[0]
+#define	hio_send_remote_list_size	hio_send_list_size[1]
 /*
  * There is one recv list for every component, although local components don't
  * use recv lists as local requests are done synchronously.
  */
 static TAILQ_HEAD(, hio) *hio_recv_list;
+static size_t *hio_recv_list_size;
 static pthread_mutex_t *hio_recv_list_lock;
 static pthread_cond_t *hio_recv_list_cond;
+#define	hio_recv_remote_list_size	hio_recv_list_size[1]
 /*
  * Request is placed on done list by the slowest component (the one that
  * decreased hio_countdown from 1 to 0).
  */
 static TAILQ_HEAD(, hio) hio_done_list;
+static size_t hio_done_list_size;
 static pthread_mutex_t hio_done_list_lock;
 static pthread_cond_t hio_done_list_cond;
 /*
@@ -164,25 +180,21 @@ static pthread_mutex_t metadata_lock;
 	((res)->hr_remotein != NULL && (res)->hr_remoteout != NULL)
 
 #define	QUEUE_INSERT1(hio, name, ncomp)	do {				\
-	bool _wakeup;							\
-									\
 	mtx_lock(&hio_##name##_list_lock[(ncomp)]);			\
-	_wakeup = TAILQ_EMPTY(&hio_##name##_list[(ncomp)]);		\
+	if (TAILQ_EMPTY(&hio_##name##_list[(ncomp)]))			\
+		cv_broadcast(&hio_##name##_list_cond[(ncomp)]);		\
 	TAILQ_INSERT_TAIL(&hio_##name##_list[(ncomp)], (hio),		\
 	    hio_next[(ncomp)]);						\
-	mtx_unlock(&hio_##name##_list_lock[ncomp]);			\
-	if (_wakeup)							\
-		cv_broadcast(&hio_##name##_list_cond[(ncomp)]);		\
+	hio_##name##_list_size[(ncomp)]++;				\
+	mtx_unlock(&hio_##name##_list_lock[(ncomp)]);			\
 } while (0)
 #define	QUEUE_INSERT2(hio, name)	do {				\
-	bool _wakeup;							\
-									\
 	mtx_lock(&hio_##name##_list_lock);				\
-	_wakeup = TAILQ_EMPTY(&hio_##name##_list);			\
-	TAILQ_INSERT_TAIL(&hio_##name##_list, (hio), hio_##name##_next);\
-	mtx_unlock(&hio_##name##_list_lock);				\
-	if (_wakeup)							\
+	if (TAILQ_EMPTY(&hio_##name##_list))				\
 		cv_broadcast(&hio_##name##_list_cond);			\
+	TAILQ_INSERT_TAIL(&hio_##name##_list, (hio), hio_##name##_next);\
+	hio_##name##_list_size++;					\
+	mtx_unlock(&hio_##name##_list_lock);				\
 } while (0)
 #define	QUEUE_TAKE1(hio, name, ncomp, timeout)	do {			\
 	bool _last;							\
@@ -196,6 +208,8 @@ static pthread_mutex_t metadata_lock;
 			_last = true;					\
 	}								\
 	if (hio != NULL) {						\
+		PJDLOG_ASSERT(hio_##name##_list_size[(ncomp)] != 0);	\
+		hio_##name##_list_size[(ncomp)]--;			\
 		TAILQ_REMOVE(&hio_##name##_list[(ncomp)], (hio),	\
 		    hio_next[(ncomp)]);					\
 	}								\
@@ -207,10 +221,16 @@ static pthread_mutex_t metadata_lock;
 		cv_wait(&hio_##name##_list_cond,			\
 		    &hio_##name##_list_lock);				\
 	}								\
+	PJDLOG_ASSERT(hio_##name##_list_size != 0);			\
+	hio_##name##_list_size--;					\
 	TAILQ_REMOVE(&hio_##name##_list, (hio), hio_##name##_next);	\
 	mtx_unlock(&hio_##name##_list_lock);				\
 } while (0)
 
+#define ISFULLSYNC(hio)	((hio)->hio_replication == HAST_REPLICATION_FULLSYNC)
+#define ISMEMSYNC(hio)	((hio)->hio_replication == HAST_REPLICATION_MEMSYNC)
+#define ISASYNC(hio)	((hio)->hio_replication == HAST_REPLICATION_ASYNC)
+
 #define	SYNCREQ(hio)		do {					\
 	(hio)->hio_ggio.gctl_unit = -1;					\
 	(hio)->hio_ggio.gctl_seq = 1;					\
@@ -219,6 +239,9 @@ static pthread_mutex_t metadata_lock;
 #define	SYNCREQDONE(hio)	do { (hio)->hio_ggio.gctl_unit = -2; } while (0)
 #define	ISSYNCREQDONE(hio)	((hio)->hio_ggio.gctl_unit == -2)
 
+#define ISMEMSYNCWRITE(hio)	(ISMEMSYNC(hio) &&			\
+	    (hio)->hio_ggio.gctl_cmd == BIO_WRITE && !ISSYNCREQ(hio))
+
 static struct hast_resource *gres;
 
 static pthread_mutex_t range_lock;
@@ -238,6 +261,22 @@ static void *ggate_send_thread(void *arg);
 static void *sync_thread(void *arg);
 static void *guard_thread(void *arg);
 
+static void
+output_status_aux(struct nv *nvout)
+{
+
+	nv_add_uint64(nvout, (uint64_t)hio_free_list_size,
+	    "idle_queue_size");
+	nv_add_uint64(nvout, (uint64_t)hio_send_local_list_size,
+	    "local_queue_size");
+	nv_add_uint64(nvout, (uint64_t)hio_send_remote_list_size,
+	    "send_queue_size");
+	nv_add_uint64(nvout, (uint64_t)hio_recv_remote_list_size,
+	    "recv_queue_size");
+	nv_add_uint64(nvout, (uint64_t)hio_done_list_size,
+	    "done_queue_size");
+}
+
 static void
 cleanup(struct hast_resource *res)
 {
@@ -355,6 +394,12 @@ init_environment(struct hast_resource *res __unused)
 		    "Unable to allocate %zu bytes of memory for send lists.",
 		    sizeof(hio_send_list[0]) * ncomps);
 	}
+	hio_send_list_size = malloc(sizeof(hio_send_list_size[0]) * ncomps);
+	if (hio_send_list_size == NULL) {
+		primary_exitx(EX_TEMPFAIL,
+		    "Unable to allocate %zu bytes of memory for send list counters.",
+		    sizeof(hio_send_list_size[0]) * ncomps);
+	}
 	hio_send_list_lock = malloc(sizeof(hio_send_list_lock[0]) * ncomps);
 	if (hio_send_list_lock == NULL) {
 		primary_exitx(EX_TEMPFAIL,
@@ -373,6 +418,12 @@ init_environment(struct hast_resource *res __unused)
 		    "Unable to allocate %zu bytes of memory for recv lists.",
 		    sizeof(hio_recv_list[0]) * ncomps);
 	}
+	hio_recv_list_size = malloc(sizeof(hio_recv_list_size[0]) * ncomps);
+	if (hio_recv_list_size == NULL) {
+		primary_exitx(EX_TEMPFAIL,
+		    "Unable to allocate %zu bytes of memory for recv list counters.",
+		    sizeof(hio_recv_list_size[0]) * ncomps);
+	}
 	hio_recv_list_lock = malloc(sizeof(hio_recv_list_lock[0]) * ncomps);
 	if (hio_recv_list_lock == NULL) {
 		primary_exitx(EX_TEMPFAIL,
@@ -393,16 +444,18 @@ init_environment(struct hast_resource *res __unused)
 	}
 
 	/*
-	 * Initialize lists, their locks and theirs condition variables.
+	 * Initialize lists, their counters, locks and condition variables.
 	 */
 	TAILQ_INIT(&hio_free_list);
 	mtx_init(&hio_free_list_lock);
 	cv_init(&hio_free_list_cond);
 	for (ii = 0; ii < HAST_NCOMPONENTS; ii++) {
 		TAILQ_INIT(&hio_send_list[ii]);
+		hio_send_list_size[ii] = 0;
 		mtx_init(&hio_send_list_lock[ii]);
 		cv_init(&hio_send_list_cond[ii]);
 		TAILQ_INIT(&hio_recv_list[ii]);
+		hio_recv_list_size[ii] = 0;
 		mtx_init(&hio_recv_list_lock[ii]);
 		cv_init(&hio_recv_list_cond[ii]);
 		rw_init(&hio_remote_lock[ii]);
@@ -445,6 +498,7 @@ init_environment(struct hast_resource *res __unused)
 		hio->hio_ggio.gctl_length = MAXPHYS;
 		hio->hio_ggio.gctl_error = 0;
 		TAILQ_INSERT_HEAD(&hio_free_list, hio, hio_free_next);
+		hio_free_list_size++;
 	}
 }
 
@@ -781,6 +835,7 @@ init_remote(struct hast_resource *res, struct proto_conn **inp,
 			free(map);
 			goto close;
 		}
+		mtx_lock(&res->hr_amp_lock);
 		/*
 		 * Merge local and remote bitmaps.
 		 */
@@ -790,7 +845,6 @@ init_remote(struct hast_resource *res, struct proto_conn **inp,
 		 * Now that we merged bitmaps from both nodes, flush it to the
 		 * disk before we start to synchronize.
 		 */
-		mtx_lock(&res->hr_amp_lock);
 		(void)hast_activemap_flush(res);
 	}
 	nv_free(nvin);
@@ -963,6 +1017,7 @@ hastd_primary(struct hast_resource *res)
 	}
 
 	gres = res;
+	res->output_status_aux = output_status_aux;
 	mode = pjdlog_mode_get();
 	debuglevel = pjdlog_debug_get();
 
@@ -1299,6 +1354,10 @@ ggate_recv_thread(void *arg)
 			} else {
 				mtx_unlock(&res->hr_amp_lock);
 			}
+			if (ISMEMSYNC(hio)) {
+				hio->hio_memsyncacked = false;
+				refcnt_init(&hio->hio_writecount, ncomps);
+			}
 			break;
 		case BIO_DELETE:
 			res->hr_stat_delete++;
@@ -1309,13 +1368,7 @@ ggate_recv_thread(void *arg)
 		}
 		pjdlog_debug(2,
 		    "ggate_recv: (%p) Moving request to the send queues.", hio);
-		if (hio->hio_replication == HAST_REPLICATION_MEMSYNC &&
-		    ggio->gctl_cmd == BIO_WRITE) {
-			/* Each remote request needs two responses in memsync. */
-			refcnt_init(&hio->hio_countdown, ncomps + 1);
-		} else {
-			refcnt_init(&hio->hio_countdown, ncomps);
-		}
+		refcnt_init(&hio->hio_countdown, ncomps);
 		for (ii = ncomp; ii < ncomps; ii++)
 			QUEUE_INSERT1(hio, send, ii);
 	}
@@ -1386,8 +1439,7 @@ local_send_thread(void *arg)
 				    ret, (intmax_t)ggio->gctl_length);
 			} else {
 				hio->hio_errors[ncomp] = 0;
-				if (hio->hio_replication ==
-				    HAST_REPLICATION_ASYNC) {
+				if (ISASYNC(hio)) {
 					ggio->gctl_error = 0;
 					write_complete(res, hio);
 				}
@@ -1425,42 +1477,13 @@ local_send_thread(void *arg)
 			}
 			break;
 		}
-
-		if (hio->hio_replication != HAST_REPLICATION_MEMSYNC ||
-		    ggio->gctl_cmd != BIO_WRITE || ISSYNCREQ(hio)) {
-			if (refcnt_release(&hio->hio_countdown) > 0)
-				continue;
-		} else {
-			/*
-			 * Depending on hio_countdown value, requests finished
-			 * in the following order:
-			 * 0: remote memsync, remote final, local write
-			 * 1: remote memsync, local write, (remote final)
-			 * 2: local write, (remote memsync), (remote final)
-			 */
-			switch (refcnt_release(&hio->hio_countdown)) {
-			case 0:
-				/*
-				 * Local write finished as last.
-				 */
-				break;
-			case 1:
-				/*
-				 * Local write finished after remote memsync
-				 * reply arrvied. We can complete the write now.
-				 */
-				if (hio->hio_errors[0] == 0)
-					write_complete(res, hio);
-				continue;
-			case 2:
-				/*
-				 * Local write finished as first.
-				 */
-				continue;
-			default:
-				PJDLOG_ABORT("Invalid hio_countdown.");
+		if (ISMEMSYNCWRITE(hio)) {
+			if (refcnt_release(&hio->hio_writecount) == 0) {
+				write_complete(res, hio);
 			}
 		}
+		if (refcnt_release(&hio->hio_countdown) > 0)
+			continue;
 		if (ISSYNCREQ(hio)) {
 			mtx_lock(&sync_lock);
 			SYNCREQDONE(hio);
@@ -1582,10 +1605,8 @@ remote_send_thread(void *arg)
 		nv_add_uint64(nv, (uint64_t)ggio->gctl_seq, "seq");
 		nv_add_uint64(nv, offset, "offset");
 		nv_add_uint64(nv, length, "length");
-		if (hio->hio_replication == HAST_REPLICATION_MEMSYNC &&
-		    ggio->gctl_cmd == BIO_WRITE && !ISSYNCREQ(hio)) {
+		if (ISMEMSYNCWRITE(hio))
 			nv_add_uint8(nv, 1, "memsync");
-		}
 		if (nv_error(nv) != 0) {
 			hio->hio_errors[ncomp] = nv_error(nv);
 			pjdlog_debug(2,
@@ -1617,6 +1638,7 @@ remote_send_thread(void *arg)
 		mtx_lock(&hio_recv_list_lock[ncomp]);
 		wakeup = TAILQ_EMPTY(&hio_recv_list[ncomp]);
 		TAILQ_INSERT_TAIL(&hio_recv_list[ncomp], hio, hio_next[ncomp]);
+		hio_recv_list_size[ncomp]++;
 		mtx_unlock(&hio_recv_list_lock[ncomp]);
 		if (hast_proto_send(res, res->hr_remoteout, nv, data,
 		    data != NULL ? length : 0) == -1) {
@@ -1628,17 +1650,9 @@ remote_send_thread(void *arg)
 			    "Unable to send request (%s): ",
 			    strerror(hio->hio_errors[ncomp]));
 			remote_close(res, ncomp);
-			/*
-			 * Take request back from the receive queue and move
-			 * it immediately to the done queue.
-			 */
-			mtx_lock(&hio_recv_list_lock[ncomp]);
-			TAILQ_REMOVE(&hio_recv_list[ncomp], hio,
-			    hio_next[ncomp]);
-			mtx_unlock(&hio_recv_list_lock[ncomp]);
-			goto done_queue;
+		} else {
+			rw_unlock(&hio_remote_lock[ncomp]);
 		}
-		rw_unlock(&hio_remote_lock[ncomp]);
 		nv_free(nv);
 		if (wakeup)
 			cv_signal(&hio_recv_list_cond[ncomp]);
@@ -1662,8 +1676,12 @@ done_queue:
 			} else {
 				mtx_unlock(&res->hr_amp_lock);
 			}
-			if (hio->hio_replication == HAST_REPLICATION_MEMSYNC)
-				(void)refcnt_release(&hio->hio_countdown);
+			if (ISMEMSYNCWRITE(hio)) {
+				if (refcnt_release(&hio->hio_writecount) == 0) {
+					if (hio->hio_errors[0] == 0)
+						write_complete(res, hio);
+				}
+			}
 		}
 		if (refcnt_release(&hio->hio_countdown) > 0)
 			continue;
@@ -1719,7 +1737,9 @@ remote_recv_thread(void *arg)
 			PJDLOG_ASSERT(hio != NULL);
 			TAILQ_REMOVE(&hio_recv_list[ncomp], hio,
 			    hio_next[ncomp]);
+			hio_recv_list_size[ncomp]--;
 			mtx_unlock(&hio_recv_list_lock[ncomp]);
+			hio->hio_errors[ncomp] = ENOTCONN;
 			goto done_queue;
 		}
 		if (hast_proto_recv_hdr(res->hr_remotein, &nv) == -1) {
@@ -1742,6 +1762,7 @@ remote_recv_thread(void *arg)
 			if (hio->hio_ggio.gctl_seq == seq) {
 				TAILQ_REMOVE(&hio_recv_list[ncomp], hio,
 				    hio_next[ncomp]);
+				hio_recv_list_size[ncomp]--;
 				break;
 			}
 		}
@@ -1792,80 +1813,34 @@ remote_recv_thread(void *arg)
 		hio->hio_errors[ncomp] = 0;
 		nv_free(nv);
 done_queue:
-		if (hio->hio_replication != HAST_REPLICATION_MEMSYNC ||
-		    hio->hio_ggio.gctl_cmd != BIO_WRITE || ISSYNCREQ(hio)) {
-			if (refcnt_release(&hio->hio_countdown) > 0)
-				continue;
-		} else {
-			/*
-			 * Depending on hio_countdown value, requests finished
-			 * in the following order:
-			 *
-			 * 0: local write, remote memsync, remote final
-			 * or
-			 * 0: remote memsync, local write, remote final
-			 *
-			 * 1: local write, remote memsync, (remote final)
-			 * or
-			 * 1: remote memsync, remote final, (local write)
-			 *
-			 * 2: remote memsync, (local write), (remote final)
-			 * or
-			 * 2: remote memsync, (remote final), (local write)
-			 */
-			switch (refcnt_release(&hio->hio_countdown)) {
-			case 0:
-				/*
-				 * Remote final reply arrived.
-				 */
-				PJDLOG_ASSERT(!memsyncack);
-				break;
-			case 1:
-				if (memsyncack) {
-					/*
-					 * Local request already finished, so we
-					 * can complete the write.
-					 */
+		if (ISMEMSYNCWRITE(hio)) {
+			if (!hio->hio_memsyncacked) {
+				PJDLOG_ASSERT(memsyncack ||
+				    hio->hio_errors[ncomp] != 0);
+				/* Remote ack arrived. */
+				if (refcnt_release(&hio->hio_writecount) == 0) {
 					if (hio->hio_errors[0] == 0)
 						write_complete(res, hio);
-					/*
-					 * We still need to wait for final
-					 * remote reply.
-					 */
+				}
+				hio->hio_memsyncacked = true;
+				if (hio->hio_errors[ncomp] == 0) {
 					pjdlog_debug(2,
-					    "remote_recv: (%p) Moving request back to the recv queue.",
-					    hio);
+					    "remote_recv: (%p) Moving request "
+					    "back to the recv queue.", hio);
 					mtx_lock(&hio_recv_list_lock[ncomp]);
 					TAILQ_INSERT_TAIL(&hio_recv_list[ncomp],
 					    hio, hio_next[ncomp]);
+					hio_recv_list_size[ncomp]++;
 					mtx_unlock(&hio_recv_list_lock[ncomp]);
-				} else {
-					/*
-					 * Remote final reply arrived before
-					 * local write finished.
-					 * Nothing to do in such case.
-					 */
+					continue;
 				}
-				continue;
-			case 2:
-				/*
-				 * We received remote memsync reply even before
-				 * local write finished.
-				 */
-				PJDLOG_ASSERT(memsyncack);
-
-				pjdlog_debug(2,
-				    "remote_recv: (%p) Moving request back to the recv queue.",
-				    hio);
-				mtx_lock(&hio_recv_list_lock[ncomp]);
-				TAILQ_INSERT_TAIL(&hio_recv_list[ncomp], hio,
-				    hio_next[ncomp]);
-				mtx_unlock(&hio_recv_list_lock[ncomp]);
-				continue;
-			default:
-				PJDLOG_ABORT("Invalid hio_countdown.");
+			} else {
+				PJDLOG_ASSERT(!memsyncack);
+				/* Remote final reply arrived. */
 			}
 		}
+		if (refcnt_release(&hio->hio_countdown) > 0)
+			continue;
 		if (ISSYNCREQ(hio)) {
 			mtx_lock(&sync_lock);
 			SYNCREQDONE(hio);
diff --git a/sbin/hastd/proto.c b/sbin/hastd/proto.c
index 73487c0d631..53bbf7a3632 100644
--- a/sbin/hastd/proto.c
+++ b/sbin/hastd/proto.c
@@ -298,8 +298,8 @@ proto_connection_send(const struct proto_conn *conn, struct proto_conn *mconn)
 	protoname = mconn->pc_proto->prt_name;
 	PJDLOG_ASSERT(protoname != NULL);
 
-	ret = conn->pc_proto->prt_send(conn->pc_ctx, protoname,
-	    strlen(protoname) + 1, fd);
+	ret = conn->pc_proto->prt_send(conn->pc_ctx,
+	    (const unsigned char *)protoname, strlen(protoname) + 1, fd);
 	proto_close(mconn);
 	if (ret != 0) {
 		errno = ret;
@@ -325,7 +325,7 @@ proto_connection_recv(const struct proto_conn *conn, bool client,
 
 	bzero(protoname, sizeof(protoname));
 
-	ret = conn->pc_proto->prt_recv(conn->pc_ctx, protoname,
+	ret = conn->pc_proto->prt_recv(conn->pc_ctx, (unsigned char *)protoname,
 	    sizeof(protoname) - 1, &fd);
 	if (ret != 0) {
 		errno = ret;
diff --git a/sbin/hastd/secondary.c b/sbin/hastd/secondary.c
index 067c5d93639..5e1207a3567 100644
--- a/sbin/hastd/secondary.c
+++ b/sbin/hastd/secondary.c
@@ -82,18 +82,21 @@ static struct hast_resource *gres;
  * until some in-progress requests are freed.
  */
 static TAILQ_HEAD(, hio) hio_free_list;
+static size_t hio_free_list_size;
 static pthread_mutex_t hio_free_list_lock;
 static pthread_cond_t hio_free_list_cond;
 /*
  * Disk thread (the one that does I/O requests) takes requests from this list.
  */
 static TAILQ_HEAD(, hio) hio_disk_list;
+static size_t hio_disk_list_size;
 static pthread_mutex_t hio_disk_list_lock;
 static pthread_cond_t hio_disk_list_cond;
 /*
  * Thread that sends requests back to primary takes requests from this list.
  */
 static TAILQ_HEAD(, hio) hio_send_list;
+static size_t hio_send_list_size;
 static pthread_mutex_t hio_send_list_lock;
 static pthread_cond_t hio_send_list_cond;
 
@@ -107,14 +110,12 @@ static void *disk_thread(void *arg);
 static void *send_thread(void *arg);
 
 #define	QUEUE_INSERT(name, hio)	do {					\
-	bool _wakeup;							\
-									\
 	mtx_lock(&hio_##name##_list_lock);				\
-	_wakeup = TAILQ_EMPTY(&hio_##name##_list);			\
-	TAILQ_INSERT_TAIL(&hio_##name##_list, (hio), hio_next);		\
-	mtx_unlock(&hio_##name##_list_lock);				\
-	if (_wakeup)							\
+	if (TAILQ_EMPTY(&hio_##name##_list))				\
 		cv_broadcast(&hio_##name##_list_cond);			\
+	TAILQ_INSERT_TAIL(&hio_##name##_list, (hio), hio_next);		\
+	hio_##name##_list_size++;					\
+	mtx_unlock(&hio_##name##_list_lock);				\
 } while (0)
 #define	QUEUE_TAKE(name, hio)	do {					\
 	mtx_lock(&hio_##name##_list_lock);				\
@@ -122,10 +123,21 @@ static void *send_thread(void *arg);
 		cv_wait(&hio_##name##_list_cond,			\
 		    &hio_##name##_list_lock);				\
 	}								\
+	PJDLOG_ASSERT(hio_##name##_list_size != 0);			\
+	hio_##name##_list_size--;					\
 	TAILQ_REMOVE(&hio_##name##_list, (hio), hio_next);		\
 	mtx_unlock(&hio_##name##_list_lock);				\
 } while (0)
 
+static void
+output_status_aux(struct nv *nvout)
+{
+
+	nv_add_uint64(nvout, (uint64_t)hio_free_list_size, "idle_queue_size");
+	nv_add_uint64(nvout, (uint64_t)hio_disk_list_size, "local_queue_size");
+	nv_add_uint64(nvout, (uint64_t)hio_send_list_size, "send_queue_size");
+}
+
 static void
 hio_clear(struct hio *hio)
 {
@@ -190,6 +202,7 @@ init_environment(void)
 		}
 		hio_clear(hio);
 		TAILQ_INSERT_HEAD(&hio_free_list, hio, hio_next);
+		hio_free_list_size++;
 	}
 }
 
@@ -441,6 +454,7 @@ hastd_secondary(struct hast_resource *res, struct nv *nvin)
 	}
 
 	gres = res;
+	res->output_status_aux = output_status_aux;
 	mode = pjdlog_mode_get();
 	debuglevel = pjdlog_debug_get();
 
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index a98840dde30..a10d1fbc460 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -40,7 +40,9 @@ LDADD+=	-lbsdxml -lsbuf
 
 SRCS+=	carp.c			# SIOC[GS]VH support
 SRCS+=	ifgroup.c		# ...
+.if ${MK_PF} != "no"
 SRCS+=	ifpfsync.c		# pfsync(4) support
+.endif
 
 SRCS+=	ifbridge.c		# bridge support
 SRCS+=	iflagg.c		# lagg support
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index d0d8671943c..83065f1b768 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 January 10, 2013
+.Dd October 21, 2013
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -2690,7 +2690,7 @@ as a synonym for the canonical form of the option
 .Pp
 Configure a single CARP redundant address on igb0, and then switch it
 to be master:
-.Dl # ifconfig igb0 vhid 1 10.0.0.1/24 pass foobar
+.Dl # ifconfig igb0 vhid 1 10.0.0.1/24 pass foobar up
 .Dl # ifconfig igb0 vhid 1 state master
 .Pp
 Configure the interface
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 983e21fc040..eb16aece987 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -909,7 +909,7 @@ unsetifdescr(const char *val, int value, int s, const struct afswtch *afp)
 }
 
 #define	IFFBITS \
-"\020\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\6SMART\7RUNNING" \
+"\020\1UP\2BROADCAST\3DEBUG\4LOOPBACK\5POINTOPOINT\7RUNNING" \
 "\10NOARP\11PROMISC\12ALLMULTI\13OACTIVE\14SIMPLEX\15LINK0\16LINK1\17LINK2" \
 "\20MULTICAST\22PPROMISC\23MONITOR\24STATICARP"
 
diff --git a/sbin/ifconfig/ifgroup.c b/sbin/ifconfig/ifgroup.c
index 9eaac3b699b..f8b18b4a983 100644
--- a/sbin/ifconfig/ifgroup.c
+++ b/sbin/ifconfig/ifgroup.c
@@ -57,7 +57,7 @@ setifgroup(const char *group_name, int d, int s, const struct afswtch *rafp)
 
 	if (strlcpy(ifgr.ifgr_group, group_name, IFNAMSIZ) >= IFNAMSIZ)
 		errx(1, "setifgroup: group name too long");
-	if (ioctl(s, SIOCAIFGROUP, (caddr_t)&ifgr) == -1)
+	if (ioctl(s, SIOCAIFGROUP, (caddr_t)&ifgr) == -1 && errno != EEXIST)
 		err(1," SIOCAIFGROUP");
 }
 
@@ -75,7 +75,7 @@ unsetifgroup(const char *group_name, int d, int s, const struct afswtch *rafp)
 
 	if (strlcpy(ifgr.ifgr_group, group_name, IFNAMSIZ) >= IFNAMSIZ)
 		errx(1, "unsetifgroup: group name too long");
-	if (ioctl(s, SIOCDIFGROUP, (caddr_t)&ifgr) == -1)
+	if (ioctl(s, SIOCDIFGROUP, (caddr_t)&ifgr) == -1 && errno != ENOENT)
 		err(1, "SIOCDIFGROUP");
 }
 
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c
index 577d6444de1..98b25b320c0 100644
--- a/sbin/ipfw/ipfw2.c
+++ b/sbin/ipfw/ipfw2.c
@@ -60,6 +60,8 @@ int resvd_set_number = RESVD_SET;
 
 int ipfw_socket = -1;
 
+uint32_t ipfw_tables_max = 0; /* Number of tables supported by kernel */
+
 #ifndef s6_addr32
 #define s6_addr32 __u6_addr.__u6_addr32
 #endif
@@ -2203,6 +2205,7 @@ fill_ip(ipfw_insn_ip *cmd, char *av, int cblen)
 {
 	int len = 0;
 	uint32_t *d = ((ipfw_insn_u32 *)cmd)->d;
+	uint32_t tables_max;
 
 	cmd->o.len &= ~F_LEN_MASK;	/* zero len */
 
@@ -2221,6 +2224,10 @@ fill_ip(ipfw_insn_ip *cmd, char *av, int cblen)
 			*p++ = '\0';
 		cmd->o.opcode = O_IP_DST_LOOKUP;
 		cmd->o.arg1 = strtoul(av + 6, NULL, 0);
+		tables_max = ipfw_get_tables_max();
+		if (cmd->o.arg1 > tables_max)
+			errx(EX_USAGE, "The table number exceeds the maximum "
+			    "allowed value (%u)", tables_max - 1);
 		if (p) {
 			cmd->o.len |= F_INSN_SIZE(ipfw_insn_u32);
 			d[0] = strtoul(p, NULL, 0);
@@ -4118,6 +4125,33 @@ ipfw_flush(int force)
 static void table_list(uint16_t num, int need_header);
 static void table_fill_xentry(char *arg, ipfw_table_xentry *xent);
 
+/*
+ * Retrieve maximum number of tables supported by ipfw(4) module.
+ */
+uint32_t
+ipfw_get_tables_max()
+{
+	size_t len;
+	uint32_t tables_max;
+
+	if (ipfw_tables_max != 0)
+		return (ipfw_tables_max);
+
+	len = sizeof(tables_max);
+	if (sysctlbyname("net.inet.ip.fw.tables_max", &tables_max, &len,
+	    NULL, 0) == -1) {
+		if (co.test_only)
+			tables_max = 128; /* Old conservative default */
+		else
+			errx(1, "Can't determine maximum number of ipfw tables."
+			    " Perhaps you forgot to load ipfw module?");
+	}
+
+	ipfw_tables_max = tables_max;
+
+	return (ipfw_tables_max);
+}
+
 /*
  * This one handles all table-related commands
  * 	ipfw table N add addr[/masklen] [value]
@@ -4131,19 +4165,10 @@ ipfw_table_handler(int ac, char *av[])
 	ipfw_table_xentry xent;
 	int do_add;
 	int is_all;
-	size_t len;
 	uint32_t a;
 	uint32_t tables_max;
 
-	len = sizeof(tables_max);
-	if (sysctlbyname("net.inet.ip.fw.tables_max", &tables_max, &len,
-	    NULL, 0) == -1) {
-		if (co.test_only)
-			tables_max = 128; /* Old conservative default */
-		else
-			errx(1, "Can't determine maximum number of ipfw tables."
-			    " Perhaps you forgot to load ipfw module?");
-	}
+	tables_max = ipfw_get_tables_max();
 
 	memset(&xent, 0, sizeof(xent));
 
@@ -4274,13 +4299,24 @@ table_fill_xentry(char *arg, ipfw_table_xentry *xent)
 			addrlen = sizeof(struct in6_addr);
 		} else {
 			/* Port or any other key */
-			key = strtol(arg, &p, 10);
 			/* Skip non-base 10 entries like 'fa1' */
-			if (p != arg) {
+			key = strtol(arg, &p, 10);
+			if (*p == '\0') {
 				pkey = (uint32_t *)paddr;
 				*pkey = htonl(key);
 				type = IPFW_TABLE_CIDR;
+				masklen = 32;
 				addrlen = sizeof(uint32_t);
+			} else if ((p != arg) && (*p == '.')) {
+				/*
+				 * Warn on IPv4 address strings
+				 * which are "valid" for inet_aton() but not
+				 * in inet_pton().
+				 *
+				 * Typical examples: '10.5' or '10.0.0.05'
+				 */
+				errx(EX_DATAERR,
+				    "Invalid IPv4 address: %s", arg);
 			}
 		}
 	}
diff --git a/sbin/ipfw/ipfw2.h b/sbin/ipfw/ipfw2.h
index d592930338f..2c70bbd6f72 100644
--- a/sbin/ipfw/ipfw2.h
+++ b/sbin/ipfw/ipfw2.h
@@ -228,6 +228,8 @@ char const *match_value(struct _s_x *p, int value);
 
 int do_cmd(int optname, void *optval, uintptr_t optlen);
 
+uint32_t ipfw_get_tables_max(void);
+
 struct in6_addr;
 void n2mask(struct in6_addr *mask, int n);
 int contigmask(uint8_t *p, int len);
diff --git a/sbin/iscontrol/fsm.c b/sbin/iscontrol/fsm.c
index a4660bb21af..eebde7ce1c0 100644
--- a/sbin/iscontrol/fsm.c
+++ b/sbin/iscontrol/fsm.c
@@ -199,6 +199,7 @@ tcpConnect(isess_t *sess)
      perror("connect");
      switch(sv_errno) {
      case ECONNREFUSED:
+     case EHOSTUNREACH:
      case ENETUNREACH:
      case ETIMEDOUT:
 	  if((sess->flags & SESS_REDIRECT) == 0) {
diff --git a/sbin/iscontrol/iscsi.conf.5 b/sbin/iscontrol/iscsi.conf.5
index 0a72d510441..f87fef6e89c 100644
--- a/sbin/iscontrol/iscsi.conf.5
+++ b/sbin/iscontrol/iscsi.conf.5
@@ -24,18 +24,20 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 5, 2007
+.Dd October 10, 2013
 .Dt ISCSI.CONF 5
 .Os
 .Sh NAME
 .Nm iscsi.conf
-.Nd key options to be negotiated in an iSCSI session
+.Nd iSCSI initiator configuration file
 .Sh DESCRIPTION
 The file
 .Nm ,
-is read by the
+is used by the
+.Xr iscsictl 8
+and
 .Xr iscontrol 8
-program.
+utilities.
 It contains declarations and parameter/key-options.
 The syntax is very simple,
 .D1 Li variable = value;
@@ -69,9 +71,6 @@ Default is none.
 .It Cm DataDigest
 same as for HeaderDigest, but on the data part of the iSCSI PDU.
 (not yet tested)
-.It Cm MaxConnections
-is the number of simultaneous connections per session,
-currently only 1.
 .It Cm TargetName
 is the name by which the target is known, not to be confused with
 target address, either obtained via the target administrator, or
@@ -81,8 +80,6 @@ from a
 if not specified, defaults to
 .Sy iqn.2005-01.il.ac.huji.cs:
 .Aq hostname .
-.It Cm TargetAlias / InitiatorAlias
-not implemented.
 .It Cm TargetAddress
 is of the form
 .Sy domainname[:port][,portal-group-tag]
@@ -93,35 +90,16 @@ dotted-decimal IPv4 address, or a bracketed IPv6 address as specified
 in [RFC2732].
 .Ed
 Note: portal-group-tag is unused at the moment.
-.It Cm TargetPortalGroupTag
-.Em not implemented yet.
-.It Cm InitialR2T
-.Em not implemented yet.
-.It Cm ImmediateData
 .Em not implemented yet.
 .It Cm MaxRecvDataSegmentLength
 the maximum data segment length in
 bytes it can receive in an iSCSI PDU, default is 8192.
-.It Cm MaxBurstLength
-.Em not implemented yet.
-.It Cm FirstBurstLength
-.Em not implemented yet.
-.It Cm DefaultTime2Wait
-.Em not implemented yet.
-.It Cm DefaultTime2Retain
-.Em not implemented yet.
 .It Cm MaxOutstandingR2T
 is used to calculate/negotiate the
 .Em tag opening ,
 can be overridden by the
 .Sy tag
 option.
-.It Cm DataPDUInOrder
-.Em not implemented yet.
-.It Cm DataSequenceInOrder
-.Em not implemented yet.
-.It Cm ErrorRecoveryLevel
-Only level 0 is supported.
 .It Cm SessionType
 either Discovery or Normal, default is Normal, see the
 .Fl d
@@ -196,9 +174,6 @@ chaptest {
    tags		= 256
 }
 .Ed
-.Sh ERRORS
-The parsing is very primitive, so do not expect - at the moment - any
-error messages.
 .Sh SEE ALSO
 .Xr iscsi_initiator 4 ,
 .Xr iscsictl 8 ,
diff --git a/sbin/mdconfig/mdconfig.8 b/sbin/mdconfig/mdconfig.8
index 9e3089655ca..1faba2b3e08 100644
--- a/sbin/mdconfig/mdconfig.8
+++ b/sbin/mdconfig/mdconfig.8
@@ -41,7 +41,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 20, 2013
+.Dd November 30, 2013
 .Dt MDCONFIG 8
 .Os
 .Sh NAME
@@ -89,6 +89,9 @@ Options indicate an action to be performed:
 Attach a memory disk.
 This will configure and attach a memory disk with the
 parameters specified and attach it to the system.
+If the
+.Fl u Ar unit
+option is not provided, the newly created device name will be printed on stdout.
 .It Fl d
 Detach a memory disk from the system and release all resources.
 .It Fl r
@@ -119,6 +122,8 @@ Using
 backing is generally preferred instead of using
 .Cm malloc
 backing.
+.It Cm null
+Bitsink; all writes do nothing, all reads return zeroes.
 .El
 .It Fl f Ar file
 Filename to use for the vnode type memory disk.
@@ -209,9 +214,12 @@ that might adversely affect the system.
 Enable/disable readonly mode.
 .El
 .It Fl u Ar unit
-Request a specific unit number for the
+Request a specific unit number or device name for the
 .Xr md 4
 device instead of automatic allocation.
+If a device name is specified, it must be start with
+.Dq md
+followed by the unit number.
 .El
 .Pp
 The last form,
@@ -237,19 +245,19 @@ with
 .Pa /tmp/boot.flp
 as backing storage:
 .Pp
-.Dl mdconfig -a -t vnode -f /tmp/boot.flp -u 4
+.Dl mdconfig -a -t vnode -f /tmp/boot.flp -u md4
 .Pp
 Detach and free all resources used by
 .Pa /dev/md4 :
 .Pp
-.Dl mdconfig -d -u 4
+.Dl mdconfig -d -u md4
 .Pp
 Create a 128MByte swap backed disk, initialize an
 .Xr ffs 7
 file system on it, and mount it on
 .Pa /tmp :
 .Bd -literal -offset indent
-mdconfig -a -t swap -s 128M -u 10
+mdconfig -a -t swap -s 128M -u md10
 newfs -U /dev/md10
 mount /dev/md10 /tmp
 chmod 1777 /tmp
@@ -263,7 +271,7 @@ are implied
 .Pc :
 .Bd -literal -offset indent
 dd if=/dev/zero of=somebackingfile bs=1k count=5k
-mdconfig -f somebackingfile -u 0
+mdconfig -f somebackingfile -u md0
 bsdlabel -w md0 auto
 newfs md0c
 mount /dev/md0c /mnt
@@ -290,7 +298,7 @@ is used to skip over the header information, positioning
 .Pa md1.nop
 to the start of the filesystem in the image.
 .Bd -literal -offset indent
-mdconfig -f diskimage.img -u 1
+mdconfig -f diskimage.img -u md1
 gnop create -o 512K md1
 mount /dev/md1.nop /mnt
 .Ed
diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c
index 233058d5d66..d741c7770cf 100644
--- a/sbin/mdconfig/mdconfig.c
+++ b/sbin/mdconfig/mdconfig.c
@@ -155,6 +155,9 @@ main(int argc, char **argv)
 			} else if (!strcmp(optarg, "swap")) {
 				mdio.md_type = MD_SWAP;
 				mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS;
+			} else if (!strcmp(optarg, "null")) {
+				mdio.md_type = MD_NULL;
+				mdio.md_options |= MD_CLUSTER | MD_AUTOUNIT | MD_COMPRESS;
 			} else
 				errx(1, "unknown type: %s", optarg);
 			break;
@@ -287,9 +290,10 @@ main(int argc, char **argv)
 			}
 		}
 
-		if ((mdio.md_type == MD_MALLOC || mdio.md_type == MD_SWAP) &&
-		    sflag == NULL)
-			errx(1, "must specify -s for -t malloc or -t swap");
+		if ((mdio.md_type == MD_MALLOC || mdio.md_type == MD_SWAP ||
+		    mdio.md_type == MD_NULL) && sflag == NULL)
+			errx(1, "must specify -s for -t malloc, -t swap, "
+			    "or -t null");
 		if (mdio.md_type == MD_VNODE && mdio.md_file[0] == '\0')
 			errx(1, "must specify -f for -t vnode");
 	} else {
@@ -481,12 +485,18 @@ md_list(const char *units, int opt, const char *fflag)
 		printf("\n");
 	/* XXX: Check if it's enough to clean everything. */
 	geom_stats_snapshot_free(sq);
-	if (((opt & OPT_UNIT) && (fflag == NULL) && ufound) ||
-	    ((opt & OPT_UNIT) == 0 && (fflag != NULL) && ffound) ||
-	    ((opt & OPT_UNIT) && (fflag != NULL) && ufound && ffound))
-		return (0);
-	else
-		return (-1);
+	if (opt & OPT_UNIT) {
+		if (((fflag == NULL) && ufound) ||
+		    ((fflag == NULL) && (units != NULL) && ufound) ||
+		    ((fflag != NULL) && ffound) ||
+		    ((fflag != NULL) && (units != NULL) && ufound && ffound))
+			return (0);
+	} else if (opt & OPT_LIST) {
+		if ((fflag == NULL) ||
+		    ((fflag != NULL) && ffound))
+			return (0);
+	}
+	return (-1);
 }
 
 /*
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 216b24845fb..da11c29eeaa 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -28,7 +28,7 @@
 .\"	@(#)mount_nfs.8	8.3 (Berkeley) 3/29/95
 .\" $FreeBSD$
 .\"
-.Dd July 8, 2013
+.Dd December 7, 2013
 .Dt MOUNT_NFS 8
 .Os
 .Sh NAME
@@ -257,6 +257,19 @@ servers on the client.
 Note that this option will only be honored when performing the
 initial mount, it will be silently ignored if used while updating
 the mount options.
+.It Cm noncontigwr
+This mount option allows the NFS client to
+combine non-contiguous byte ranges being written
+such that the dirty byte range becomes a superset of the bytes
+that are dirty.
+This reduces the number of writes significantly for software
+builds.
+The merging of byte ranges isn't done if the file has been file
+locked, since most applications modifying a file from multiple
+clients will use file locking.
+As such, this option could result in a corrupted file for the
+rare case of an application modifying the file from multiple
+clients concurrently without using file locking.
 .It Cm principal
 For the RPCSEC_GSS security flavors, such as krb5, krb5i and krb5p,
 this option sets the name of the host based principal name expected
diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c
index a4cfa8dd759..8bcd56fb39a 100644
--- a/sbin/newfs/mkfs.c
+++ b/sbin/newfs/mkfs.c
@@ -134,12 +134,10 @@ mkfs(struct partition *pp, char *fsys)
 	 */
 	disk.d_bsize = sectorsize;
 	disk.d_ufs = Oflag;
-	if (Rflag) {
+	if (Rflag)
 		utime = 1000000000;
-	} else {
+	else
 		time(&utime);
-		arc4random_stir();
-	}
 	sblock.fs_old_flags = FS_FLAGS_UPDATED;
 	sblock.fs_flags = 0;
 	if (Uflag)
diff --git a/sbin/nos-tun/nos-tun.c b/sbin/nos-tun/nos-tun.c
index 83e7144944c..ee0fc4ce0b7 100644
--- a/sbin/nos-tun/nos-tun.c
+++ b/sbin/nos-tun/nos-tun.c
@@ -96,7 +96,7 @@ Set_address(char *addr, struct sockaddr_in *sin)
 
   bzero((char *)sin, sizeof(struct sockaddr));
   sin->sin_family = AF_INET;
-  if((sin->sin_addr.s_addr = inet_addr(addr)) == (in_addr_t)-1) {
+  if((sin->sin_addr.s_addr = inet_addr(addr)) == INADDR_NONE) {
     hp = gethostbyname(addr);
     if (!hp) {
       syslog(LOG_ERR,"unknown host %s", addr);
diff --git a/sbin/nvmecontrol/firmware.c b/sbin/nvmecontrol/firmware.c
index cb7fb0f9d55..281fabe5a03 100644
--- a/sbin/nvmecontrol/firmware.c
+++ b/sbin/nvmecontrol/firmware.c
@@ -141,7 +141,7 @@ update_firmware(int fd, uint8_t *payload, int32_t payload_size)
 	}
 }
 
-static void
+static int
 activate_firmware(int fd, int slot, int activate_action)
 {
 	struct nvme_pt_command	pt;
@@ -154,8 +154,14 @@ activate_firmware(int fd, int slot, int activate_action)
 	if (ioctl(fd, NVME_PASSTHROUGH_CMD, &pt) < 0)
 		err(1, "firmware activate request failed");
 
+	if (pt.cpl.status.sct == NVME_SCT_COMMAND_SPECIFIC &&
+	    pt.cpl.status.sc == NVME_SC_FIRMWARE_REQUIRES_RESET)
+		return 1;
+
 	if (nvme_completion_is_error(&pt.cpl))
 		errx(1, "firmware activate request returned error");
+
+	return 0;
 }
 
 static void
@@ -171,6 +177,7 @@ firmware(int argc, char *argv[])
 {
 	int				fd = -1, slot = 0;
 	int				a_flag, s_flag, f_flag;
+	int				activate_action, reboot_required;
 	char				ch, *p, *image = NULL;
 	char				*controller = NULL, prompt[64];
 	void				*buf = NULL;
@@ -287,21 +294,27 @@ firmware(int argc, char *argv[])
 	if (f_flag) {
 		update_firmware(fd, buf, size);
 		if (a_flag)
-			activate_firmware(fd, slot,
-			    NVME_AA_REPLACE_ACTIVATE);
+			activate_action = NVME_AA_REPLACE_ACTIVATE;
 		else
-			activate_firmware(fd, slot,
-			    NVME_AA_REPLACE_NO_ACTIVATE);
+			activate_action = NVME_AA_REPLACE_NO_ACTIVATE;
 	} else {
-		activate_firmware(fd, slot, NVME_AA_ACTIVATE);
+		activate_action = NVME_AA_ACTIVATE;
 	}
 
+	reboot_required = activate_firmware(fd, slot, activate_action);
+
 	if (a_flag) {
-		printf("New firmware image activated and will take "
-		       "effect after next controller reset.\n"
-		       "Controller reset can be initiated via "
-		       "'nvmecontrol reset %s'\n",
-		       controller);
+		if (reboot_required) {
+			printf("New firmware image activated but requires "
+			       "conventional reset (i.e. reboot) to "
+			       "complete activation.\n");
+		} else {
+			printf("New firmware image activated and will take "
+			       "effect after next controller reset.\n"
+			       "Controller reset can be initiated via "
+			       "'nvmecontrol reset %s'\n",
+			       controller);
+		}
 	}
 
 	close(fd);
diff --git a/sbin/nvmecontrol/perftest.c b/sbin/nvmecontrol/perftest.c
index a7339bf29d4..cc9119826f7 100644
--- a/sbin/nvmecontrol/perftest.c
+++ b/sbin/nvmecontrol/perftest.c
@@ -33,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <ctype.h>
 #include <err.h>
 #include <fcntl.h>
+#include <inttypes.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>
@@ -45,7 +46,8 @@ __FBSDID("$FreeBSD$");
 static void
 print_perftest(struct nvme_io_test *io_test, bool perthread)
 {
-	uint32_t i, io_completed = 0, iops, mbps;
+	uint64_t	io_completed = 0, iops, mbps;
+	uint32_t	i;
 
 	for (i = 0; i < io_test->num_threads; i++)
 		io_completed += io_test->io_completed[i];
@@ -53,17 +55,15 @@ print_perftest(struct nvme_io_test *io_test, bool perthread)
 	iops = io_completed/io_test->time;
 	mbps = iops * io_test->size / (1024*1024);
 
-	printf("Threads: %2d Size: %6d %5s Time: %3d IO/s: %7d MB/s: %4d\n",
+	printf("Threads: %2d Size: %6d %5s Time: %3d IO/s: %7ju MB/s: %4ju\n",
 	    io_test->num_threads, io_test->size,
 	    io_test->opc == NVME_OPC_READ ? "READ" : "WRITE",
-	    io_test->time, iops, mbps);
+	    io_test->time, (uintmax_t)iops, (uintmax_t)mbps);
 
 	if (perthread)
 		for (i = 0; i < io_test->num_threads; i++)
-			printf("\t%3d: %8d IO/s\n", i,
-			    io_test->io_completed[i]/io_test->time);
-
-	exit(1);
+			printf("\t%3d: %8ju IO/s\n", i,
+			    (uintmax_t)io_test->io_completed[i]/io_test->time);
 }
 
 static void
diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c
index d4a2c1d2939..46d4523373d 100644
--- a/sbin/pfctl/pf_print_state.c
+++ b/sbin/pfctl/pf_print_state.c
@@ -285,8 +285,13 @@ print_state(struct pfsync_state *s, int opts)
 		const char *states[] = PFUDPS_NAMES;
 
 		printf("   %s:%s\n", states[src->state], states[dst->state]);
+#ifndef INET6
 	} else if (s->proto != IPPROTO_ICMP && src->state < PFOTHERS_NSTATES &&
 	    dst->state < PFOTHERS_NSTATES) {
+#else
+	} else if (s->proto != IPPROTO_ICMP && s->proto != IPPROTO_ICMPV6 &&
+	    src->state < PFOTHERS_NSTATES && dst->state < PFOTHERS_NSTATES) {
+#endif
 		/* XXX ICMP doesn't really have state levels */
 		const char *states[] = PFOTHERS_NAMES;
 
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 90a2bb5b7c7..cb70e7ff0f5 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -38,10 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
-
-#ifdef __FreeBSD__
 #include <sys/endian.h>
-#endif
 
 #include <net/if.h>
 #include <netinet/in.h>
@@ -234,13 +231,13 @@ usage(void)
 {
 	extern char *__progname;
 
-	fprintf(stderr, "usage: %s [-AdeghmNnOPqRrvz] ", __progname);
-	fprintf(stderr, "[-a anchor] [-D macro=value] [-F modifier]\n");
-	fprintf(stderr, "\t[-f file] [-i interface] [-K host | network]\n");
-	fprintf(stderr, "\t[-k host | network | label | id] ");
-	fprintf(stderr, "[-o level] [-p device]\n");
-	fprintf(stderr, "\t[-s modifier] ");
-	fprintf(stderr, "[-t table -T command [address ...]] [-x level]\n");
+	fprintf(stderr,
+"usage: %s [-AdeghmNnOPqRrvz] [-a anchor] [-D macro=value] [-F modifier]\n"
+	"\t[-f file] [-i interface] [-K host | network]\n"
+	"\t[-k host | network | label | id] [-o level] [-p device]\n"
+	"\t[-s modifier] [-t table -T command [address ...]] [-x level]\n",
+	    __progname);
+
 	exit(1);
 }
 
@@ -250,10 +247,8 @@ pfctl_enable(int dev, int opts)
 	if (ioctl(dev, DIOCSTART)) {
 		if (errno == EEXIST)
 			errx(1, "pf already enabled");
-#ifdef __FreeBSD__
 		else if (errno == ESRCH)
 			errx(1, "pfil registeration failed");
-#endif
 		else
 			err(1, "DIOCSTART");
 	}
@@ -2185,7 +2180,7 @@ main(int argc, char *argv[])
 		/* turn off options */
 		opts &= ~ (PF_OPT_DISABLE | PF_OPT_ENABLE);
 		clearopt = showopt = debugopt = NULL;
-#if defined(__FreeBSD__) && !defined(ENABLE_ALTQ)
+#if !defined(ENABLE_ALTQ)
 		altqsupport = 0;
 #else
 		altqsupport = 1;
diff --git a/sbin/route/keywords b/sbin/route/keywords
index adfba7cf111..f3fd1d8e005 100644
--- a/sbin/route/keywords
+++ b/sbin/route/keywords
@@ -39,6 +39,7 @@ osi
 prefixlen
 proto1
 proto2
+proto3
 proxy
 recvpipe
 reject
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index b7861068bac..ea41cb6c1da 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -28,7 +28,7 @@
 .\"     @(#)route.8	8.3 (Berkeley) 3/19/94
 .\" $FreeBSD$
 .\"
-.Dd November 17, 2012
+.Dd October 17, 2013
 .Dt ROUTE 8
 .Os
 .Sh NAME
@@ -301,6 +301,7 @@ by indicating the following corresponding modifiers:
 -blackhole RTF_BLACKHOLE  - silently discard pkts (during updates)
 -proto1    RTF_PROTO1     - set protocol specific routing flag #1
 -proto2    RTF_PROTO2     - set protocol specific routing flag #2
+-proto3    RTF_PROTO3     - set protocol specific routing flag #3
 .Ed
 .Pp
 The optional modifiers
@@ -324,6 +325,17 @@ specify that all ensuing metrics may be locked by the
 .Fl lockrest
 meta-modifier.
 .Pp
+Note that
+.Fl expire
+accepts expiration time of the route as the number of seconds since the
+Epoch
+.Pq see Xr time 3 .
+When the first character of the number is
+.Dq +
+or
+.Dq - ,
+it is interpreted as a value relative to the current time.
+.Pp
 The optional modifier
 .Fl fib Ar number
 specifies that the command will be applied to a non-default FIB.
diff --git a/sbin/route/route.c b/sbin/route/route.c
index e575c711329..5fad87535b0 100644
--- a/sbin/route/route.c
+++ b/sbin/route/route.c
@@ -63,17 +63,29 @@ __FBSDID("$FreeBSD$");
 #include <err.h>
 #include <errno.h>
 #include <paths.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sysexits.h>
+#include <time.h>
 #include <unistd.h>
 #include <ifaddrs.h>
 
+#define ATALK_BUF_SIZE 20
+
+struct fibl {
+	TAILQ_ENTRY(fibl)	fl_next;
+
+	int	fl_num;
+	int	fl_error;
+	int	fl_errno;
+};
+
 static struct keytab {
 	const char	*kt_cp;
 	int	kt_i;
-} keywords[] = {
+} const keywords[] = {
 #include "keywords.h"
 	{0, 0}
 };
@@ -89,9 +101,21 @@ static u_long  rtm_inits;
 static uid_t	uid;
 static int	defaultfib;
 static int	numfibs;
+static char	domain[MAXHOSTNAMELEN + 1];
+static bool	domain_initialized;
+static int	rtm_seq;
+static char	rt_line[NI_MAXHOST];
+static char	net_line[MAXHOSTNAMELEN + 1];
+
+static struct {
+	struct	rt_msghdr m_rtm;
+	char	m_space[512];
+} m_rtmsg;
+
+static TAILQ_HEAD(fibl_head_t, fibl) fibl_head;
 
 static int	atalk_aton(const char *, struct at_addr *);
-static char	*atalk_ntoa(struct at_addr);
+static char	*atalk_ntoa(struct at_addr, char [ATALK_BUF_SIZE]);
 static void	printb(int, const char *);
 static void	flushroutes(int argc, char *argv[]);
 static int	flushroutes_fib(int);
@@ -120,16 +144,6 @@ static void	set_metric(char *, int);
 static int	set_sofib(int);
 static void	sockaddr(char *, struct sockaddr *, size_t);
 static void	sodump(struct sockaddr *, const char *);
-
-struct fibl {
-	TAILQ_ENTRY(fibl)	fl_next;
-
-	int	fl_num;
-	int	fl_error;
-	int	fl_errno;
-};
-static TAILQ_HEAD(fibl_head_t, fibl) fibl_head;
-
 static int	fiboptlist_csv(const char *, struct fibl_head_t *);
 static int	fiboptlist_range(const char *, struct fibl_head_t *);
 
@@ -494,12 +508,11 @@ routename(struct sockaddr *sa)
 {
 	struct sockaddr_dl *sdl;
 	const char *cp;
-	static char line[NI_MAXHOST];
-	static char domain[MAXHOSTNAMELEN + 1];
-	static int first = 1, n;
+	char atalk_buf[ATALK_BUF_SIZE];
+	int n;
 
-	if (first) {
-		first = 0;
+	if (!domain_initialized) {
+		domain_initialized = true;
 		if (gethostname(domain, MAXHOSTNAMELEN) == 0 &&
 		    (cp = strchr(domain, '.'))) {
 			domain[MAXHOSTNAMELEN] = '\0';
@@ -557,25 +570,26 @@ routename(struct sockaddr *sa)
 		else if (sa->sa_family == AF_INET6)
 			ss.ss_len = sizeof(struct sockaddr_in6);
 		error = getnameinfo((struct sockaddr *)&ss, ss.ss_len,
-		    line, sizeof(line), NULL, 0,
+		    rt_line, sizeof(rt_line), NULL, 0,
 		    (nflag == 0) ? 0 : NI_NUMERICHOST);
 		if (error) {
 			warnx("getnameinfo(): %s", gai_strerror(error));
-			strncpy(line, "invalid", sizeof(line));
+			strncpy(rt_line, "invalid", sizeof(rt_line));
 		}
 
 		/* Remove the domain part if any. */
-		p = strchr(line, '.');
+		p = strchr(rt_line, '.');
 		if (p != NULL && strcmp(p + 1, domain) == 0)
 			*p = '\0';
 
-		return (line);
+		return (rt_line);
 		break;
 	}
 #endif
 	case AF_APPLETALK:
-		(void)snprintf(line, sizeof(line), "atalk %s",
-		    atalk_ntoa(((struct sockaddr_at *)(void *)sa)->sat_addr));
+		(void)snprintf(rt_line, sizeof(rt_line), "atalk %s",
+		    atalk_ntoa(((struct sockaddr_at *)(void *)sa)->sat_addr,
+		    atalk_buf));
 		break;
 
 	case AF_LINK:
@@ -584,11 +598,11 @@ routename(struct sockaddr *sa)
 		if (sdl->sdl_nlen == 0 &&
 		    sdl->sdl_alen == 0 &&
 		    sdl->sdl_slen == 0) {
-			n = snprintf(line, sizeof(line), "link#%d",
+			n = snprintf(rt_line, sizeof(rt_line), "link#%d",
 			    sdl->sdl_index);
-			if (n > (int)sizeof(line))
-			    line[0] = '\0';
-			return (line);
+			if (n > (int)sizeof(rt_line))
+			    rt_line[0] = '\0';
+			return (rt_line);
 		} else
 			return (link_ntoa(sdl));
 		break;
@@ -597,8 +611,8 @@ routename(struct sockaddr *sa)
 	    {
 		u_short *sp = (u_short *)(void *)sa;
 		u_short *splim = sp + ((sa->sa_len + 1) >> 1);
-		char *cps = line + sprintf(line, "(%d)", sa->sa_family);
-		char *cpe = line + sizeof(line);
+		char *cps = rt_line + sprintf(rt_line, "(%d)", sa->sa_family);
+		char *cpe = rt_line + sizeof(rt_line);
 
 		while (++sp < splim && cps < cpe) /* start with sa->sa_data */
 			if ((n = snprintf(cps, cpe - cps, " %x", *sp)) > 0)
@@ -608,7 +622,7 @@ routename(struct sockaddr *sa)
 		break;
 	    }
 	}
-	return (line);
+	return (rt_line);
 }
 
 /*
@@ -619,7 +633,7 @@ static const char *
 netname(struct sockaddr *sa)
 {
 	struct sockaddr_dl *sdl;
-	static char line[MAXHOSTNAMELEN + 1];
+	char atalk_buf[ATALK_BUF_SIZE];
 	int n;
 #ifdef INET
 	struct netent *np = NULL;
@@ -644,17 +658,17 @@ netname(struct sockaddr *sa)
 		}
 #define C(x)	(unsigned)((x) & 0xff)
 		if (cp != NULL)
-			strncpy(line, cp, sizeof(line));
+			strncpy(net_line, cp, sizeof(net_line));
 		else if ((in.s_addr & 0xffffff) == 0)
-			(void)sprintf(line, "%u", C(in.s_addr >> 24));
+			(void)sprintf(net_line, "%u", C(in.s_addr >> 24));
 		else if ((in.s_addr & 0xffff) == 0)
-			(void)sprintf(line, "%u.%u", C(in.s_addr >> 24),
+			(void)sprintf(net_line, "%u.%u", C(in.s_addr >> 24),
 			    C(in.s_addr >> 16));
 		else if ((in.s_addr & 0xff) == 0)
-			(void)sprintf(line, "%u.%u.%u", C(in.s_addr >> 24),
+			(void)sprintf(net_line, "%u.%u.%u", C(in.s_addr >> 24),
 			    C(in.s_addr >> 16), C(in.s_addr >> 8));
 		else
-			(void)sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),
+			(void)sprintf(net_line, "%u.%u.%u.%u", C(in.s_addr >> 24),
 			    C(in.s_addr >> 16), C(in.s_addr >> 8),
 			    C(in.s_addr));
 #undef C
@@ -674,16 +688,17 @@ netname(struct sockaddr *sa)
 		if (nflag)
 			niflags |= NI_NUMERICHOST;
 		if (getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len,
-		    line, sizeof(line), NULL, 0, niflags) != 0)
-			strncpy(line, "invalid", sizeof(line));
+		    net_line, sizeof(net_line), NULL, 0, niflags) != 0)
+			strncpy(net_line, "invalid", sizeof(net_line));
 
-		return(line);
+		return(net_line);
 	}
 #endif
 
 	case AF_APPLETALK:
-		(void)snprintf(line, sizeof(line), "atalk %s",
-		    atalk_ntoa(((struct sockaddr_at *)(void *)sa)->sat_addr));
+		(void)snprintf(net_line, sizeof(net_line), "atalk %s",
+		    atalk_ntoa(((struct sockaddr_at *)(void *)sa)->sat_addr,
+		    atalk_buf));
 		break;
 
 	case AF_LINK:
@@ -692,11 +707,11 @@ netname(struct sockaddr *sa)
 		if (sdl->sdl_nlen == 0 &&
 		    sdl->sdl_alen == 0 &&
 		    sdl->sdl_slen == 0) {
-			n = snprintf(line, sizeof(line), "link#%d",
+			n = snprintf(net_line, sizeof(net_line), "link#%d",
 			    sdl->sdl_index);
-			if (n > (int)sizeof(line))
-			    line[0] = '\0';
-			return (line);
+			if (n > (int)sizeof(net_line))
+			    net_line[0] = '\0';
+			return (net_line);
 		} else
 			return (link_ntoa(sdl));
 		break;
@@ -705,8 +720,8 @@ netname(struct sockaddr *sa)
 	    {
 		u_short *sp = (u_short *)(void *)sa->sa_data;
 		u_short *splim = sp + ((sa->sa_len + 1)>>1);
-		char *cps = line + sprintf(line, "af %d:", sa->sa_family);
-		char *cpe = line + sizeof(line);
+		char *cps = net_line + sprintf(net_line, "af %d:", sa->sa_family);
+		char *cpe = net_line + sizeof(net_line);
 
 		while (sp < splim && cps < cpe)
 			if ((n = snprintf(cps, cpe - cps, " %x", *sp++)) > 0)
@@ -716,13 +731,14 @@ netname(struct sockaddr *sa)
 		break;
 	    }
 	}
-	return (line);
+	return (net_line);
 }
 
 static void
 set_metric(char *value, int key)
 {
 	int flag = 0;
+	char *endptr;
 	u_long noval, *valp = &noval;
 
 	switch (key) {
@@ -742,7 +758,18 @@ set_metric(char *value, int key)
 		rt_metrics.rmx_locks |= flag;
 	if (locking)
 		locking = 0;
-	*valp = atoi(value);
+	errno = 0;
+	*valp = strtol(value, &endptr, 0);
+	if (errno == 0 && *endptr != '\0')
+		errno = EINVAL;
+	if (errno)
+		err(EX_USAGE, "%s", value);
+	if (flag & RTV_EXPIRE && (value[0] == '+' || value[0] == '-')) {
+		struct timespec ts;
+
+		clock_gettime(CLOCK_REALTIME_FAST, &ts);
+		*valp += ts.tv_sec;
+	}
 }
 
 #define	F_ISHOST	0x01
@@ -827,6 +854,9 @@ newroute(int argc, char **argv)
 			case K_PROTO2:
 				flags |= RTF_PROTO2;
 				break;
+			case K_PROTO3:
+				flags |= RTF_PROTO3;
+				break;
 			case K_PROXY:
 				nrflags |= F_PROXY;
 				break;
@@ -928,6 +958,11 @@ newroute(int argc, char **argv)
 		}
 	}
 
+	if (so[RTAX_DST].ss_len == 0) {
+		warnx("destination parameter required");
+		usage(NULL);
+	}
+
 	if (nrflags & F_FORCEHOST) {
 		nrflags |= F_ISHOST;
 #ifdef INET6
@@ -1453,15 +1488,9 @@ monitor(int argc, char *argv[])
 	}
 }
 
-static struct {
-	struct	rt_msghdr m_rtm;
-	char	m_space[512];
-} m_rtmsg;
-
 static int
 rtmsg(int cmd, int flags, int fib)
 {
-	static int seq;
 	int rlen;
 	char *cp = m_rtmsg.m_space;
 	int l;
@@ -1497,7 +1526,7 @@ rtmsg(int cmd, int flags, int fib)
 	rtm.rtm_type = cmd;
 	rtm.rtm_flags = flags;
 	rtm.rtm_version = RTM_VERSION;
-	rtm.rtm_seq = ++seq;
+	rtm.rtm_seq = ++rtm_seq;
 	rtm.rtm_addrs = rtm_addrs;
 	rtm.rtm_rmx = rt_metrics;
 	rtm.rtm_inits = rtm_inits;
@@ -1522,7 +1551,7 @@ rtmsg(int cmd, int flags, int fib)
 	if (cmd == RTM_GET) {
 		do {
 			l = read(s, (char *)&m_rtmsg, sizeof(m_rtmsg));
-		} while (l > 0 && (rtm.rtm_seq != seq || rtm.rtm_pid != pid));
+		} while (l > 0 && (rtm.rtm_seq != rtm_seq || rtm.rtm_pid != pid));
 		if (l < 0)
 			warn("read from routing socket");
 		else
@@ -1532,7 +1561,7 @@ rtmsg(int cmd, int flags, int fib)
 	return (0);
 }
 
-static const char *msgtypes[] = {
+static const char *const msgtypes[] = {
 	"",
 	"RTM_ADD: Add Route",
 	"RTM_DELETE: Delete Route",
@@ -1676,6 +1705,7 @@ static void
 print_getmsg(struct rt_msghdr *rtm, int msglen, int fib)
 {
 	struct sockaddr *sp[RTAX_MAX];
+	struct timespec ts;
 	char *cp;
 	int i;
 
@@ -1728,15 +1758,18 @@ print_getmsg(struct rt_msghdr *rtm, int msglen, int fib)
 #define msec(u)	(((u) + 500) / 1000)		/* usec to msec */
 	printf("\n%9s %9s %9s %9s %9s %10s %9s\n", "recvpipe",
 	    "sendpipe", "ssthresh", "rtt,msec", "mtu   ", "weight", "expire");
-	printf("%8ld%c ", rtm->rtm_rmx.rmx_recvpipe, lock(RPIPE));
-	printf("%8ld%c ", rtm->rtm_rmx.rmx_sendpipe, lock(SPIPE));
-	printf("%8ld%c ", rtm->rtm_rmx.rmx_ssthresh, lock(SSTHRESH));
-	printf("%8ld%c ", msec(rtm->rtm_rmx.rmx_rtt), lock(RTT));
-	printf("%8ld%c ", rtm->rtm_rmx.rmx_mtu, lock(MTU));
-	printf("%8ld%c ", rtm->rtm_rmx.rmx_weight, lock(WEIGHT));
-	if (rtm->rtm_rmx.rmx_expire)
-		rtm->rtm_rmx.rmx_expire -= time(0);
-	printf("%8ld%c\n", rtm->rtm_rmx.rmx_expire, lock(EXPIRE));
+	printf("%8lu%c ", rtm->rtm_rmx.rmx_recvpipe, lock(RPIPE));
+	printf("%8lu%c ", rtm->rtm_rmx.rmx_sendpipe, lock(SPIPE));
+	printf("%8lu%c ", rtm->rtm_rmx.rmx_ssthresh, lock(SSTHRESH));
+	printf("%8lu%c ", msec(rtm->rtm_rmx.rmx_rtt), lock(RTT));
+	printf("%8lu%c ", rtm->rtm_rmx.rmx_mtu, lock(MTU));
+	printf("%8lu%c ", rtm->rtm_rmx.rmx_weight, lock(WEIGHT));
+	if (rtm->rtm_rmx.rmx_expire > 0)
+		clock_gettime(CLOCK_REALTIME_FAST, &ts);
+	else
+		ts.tv_sec = 0;
+	printf("%8ld%c\n", (long)(rtm->rtm_rmx.rmx_expire - ts.tv_sec),
+	    lock(EXPIRE));
 #undef lock
 #undef msec
 #define	RTA_IGN	(RTA_DST|RTA_GATEWAY|RTA_NETMASK|RTA_IFP|RTA_IFA|RTA_BRD)
@@ -1822,7 +1855,7 @@ printb(int b, const char *str)
 int
 keyword(const char *cp)
 {
-	struct keytab *kt = keywords;
+	const struct keytab *kt = keywords;
 
 	while (kt->kt_cp != NULL && strcmp(kt->kt_cp, cp) != 0)
 		kt++;
@@ -1832,6 +1865,7 @@ keyword(const char *cp)
 static void
 sodump(struct sockaddr *sa, const char *which)
 {
+	char atalk_buf[ATALK_BUF_SIZE];
 #ifdef INET6
 	char nbuf[INET6_ADDRSTRLEN];
 #endif
@@ -1856,7 +1890,8 @@ sodump(struct sockaddr *sa, const char *which)
 #endif
 	case AF_APPLETALK:
 		(void)printf("%s: atalk %s; ", which,
-		    atalk_ntoa(((struct sockaddr_at *)(void *)sa)->sat_addr));
+		    atalk_ntoa(((struct sockaddr_at *)(void *)sa)->sat_addr,
+		    atalk_buf));
 		break;
 	}
 	(void)fflush(stdout);
@@ -1926,11 +1961,9 @@ atalk_aton(const char *text, struct at_addr *addr)
 }
 
 static char *
-atalk_ntoa(struct at_addr at)
+atalk_ntoa(struct at_addr at, char buf[ATALK_BUF_SIZE])
 {
-	static char buf[20];
-
-	(void)snprintf(buf, sizeof(buf), "%u.%u", ntohs(at.s_net), at.s_node);
-	buf[sizeof(buf) - 1] = '\0';
+	(void)snprintf(buf, ATALK_BUF_SIZE, "%u.%u", ntohs(at.s_net), at.s_node);
+	buf[ATALK_BUF_SIZE - 1] = '\0';
 	return(buf);
 }
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index ec2ad726513..c4286d7be17 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -28,7 +28,7 @@
 .\"     @(#)swapon.8	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd June 21, 2013
+.Dd November 22, 2013
 .Dt SWAPON 8
 .Os
 .Sh NAME
@@ -60,9 +60,7 @@ At boot time all swap entries in
 .Pa /etc/fstab
 are added automatically when the system goes multi-user.
 Swap devices use a fixed interleave; the maximum number of devices
-is specified by the kernel configuration option
-.Dv NSWAPDEV ,
-which is typically set to 4.
+is unlimited.
 There is no priority mechanism.
 .Pp
 The
@@ -193,8 +191,8 @@ overridden.
 512 byte blocks are used by default.
 .El
 .Sh FILES
-.Bl -tag -width ".Pa /dev/{ad,da}?s?b" -compact
-.It Pa /dev/{ad,da}?s?b
+.Bl -tag -width ".Pa /dev/{ada,da}?s?b" -compact
+.It Pa /dev/{ada,da}?s?b
 standard paging devices
 .It Pa /dev/md?
 memory disk devices
diff --git a/sbin/sysctl/sysctl.8 b/sbin/sysctl/sysctl.8
index fe0a75a971c..b81de6e8a31 100644
--- a/sbin/sysctl/sysctl.8
+++ b/sbin/sysctl/sysctl.8
@@ -130,7 +130,7 @@ to standard error.
 .It Fl T
 Display only variables that are setable via loader (CTLFLAG_TUN).
 .It Fl W
-Display only wriable variables that are not statistical.
+Display only writable variables that are not statistical.
 Useful for determining the set of runtime tunable sysctls.
 .It Fl X
 Equivalent to
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 43592b3081c..a86d659cb04 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -201,7 +201,7 @@ parse(const char *string, int lineno)
 
 	cp = buf;
 	if (snprintf(buf, BUFSIZ, "%s", string) >= BUFSIZ) {
-		warn("oid too long: '%s'%s", string, line);
+		warnx("oid too long: '%s'%s", string, line);
 		return (1);
 	}
 	bufp = strsep(&cp, "=:");
@@ -260,7 +260,7 @@ parse(const char *string, int lineno)
 		}
 	} else {
 		if ((kind & CTLTYPE) == CTLTYPE_NODE) {
-			warn("oid '%s' isn't a leaf node%s", bufp, line);
+			warnx("oid '%s' isn't a leaf node%s", bufp, line);
 			return (1);
 		}
 
diff --git a/share/Makefile b/share/Makefile
index 075f116851e..8ac47504483 100644
--- a/share/Makefile
+++ b/share/Makefile
@@ -5,13 +5,13 @@
 
 # Do not include `info' in the SUBDIR list, it is handled separately.
 
-SUBDIR=	${_atf} \
-	${_colldef} \
+SUBDIR=	${_colldef} \
 	${_dict} \
 	${_doc} \
 	dtrace \
 	${_examples} \
 	${_i18n} \
+	keys \
 	${_man} \
 	${_me} \
 	misc \
@@ -26,17 +26,12 @@ SUBDIR=	${_atf} \
 	${_syscons} \
 	tabset \
 	termcap \
+	${_tests} \
 	${_timedef} \
-	xml \
-	xsl \
 	${_zoneinfo}
 
 # NB: keep these sorted by MK_* knobs
 
-.if ${MK_ATF} != "no"
-_atf=		atf
-.endif
-
 .if ${MK_BSNMP} != "no"
 _snmp=		snmp
 .endif
@@ -86,6 +81,10 @@ _doc=		doc
 _syscons=	syscons
 .endif
 
+.if ${MK_TESTS} != "no"
+_tests=		tests
+.endif
+
 .if ${MK_ZONEINFO} != "no"
 _zoneinfo=	zoneinfo
 .endif
diff --git a/share/atf/Makefile b/share/atf/Makefile
deleted file mode 100644
index f5318c427d2..00000000000
--- a/share/atf/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#-
-# Copyright (c) 2012 EMC 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 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$
-
-ATF=		${.CURDIR}/../../contrib/atf
-
-.PATH:		${ATF}/atf-run/sample
-
-NO_OBJ=
-
-FILESDIR=	${SHAREDIR}/atf
-FILES=		atf-run.hooks
-
-.include <bsd.prog.mk>
diff --git a/share/dict/README b/share/dict/README
index 1a51c20a95a..35f8b722220 100644
--- a/share/dict/README
+++ b/share/dict/README
@@ -10,12 +10,6 @@ noun and adverbial phrases.  The wordlist makes a dandy 'grep' victim.
 
      -- James A. Woods    {ihnp4,hplabs}!ames!jaw    (or jaw@riacs)
 
-Dictionaries for other languages, e.g. Afrikaans, American, Aussie,
-Chinese, Croatian, Czech, Danish, Dutch, Esperanto, Finnish, French,
-German, Hindi, Hungarian, Italian, Japanese, Latin, Norwegian, Polish,
-Russian, Spanish, Swahili, Swedish, Yiddish, are available
-at ftp://ftp.ox.ac.uk/pub/wordlists.
-
 Country names are stored in the file /usr/share/misc/iso3166.
 
 
diff --git a/share/doc/Makefile b/share/doc/Makefile
index 1ec57e86da4..a4fe61d6c47 100644
--- a/share/doc/Makefile
+++ b/share/doc/Makefile
@@ -9,7 +9,7 @@ SUBDIR=	${_IPv6} \
 	${_llvm} \
 	${_roffdocs}
 
-.if ${MK_ATF} != "no"
+.if ${MK_TESTS} != "no"
 _atf= atf
 .endif
 
diff --git a/share/examples/Makefile b/share/examples/Makefile
index 04f53d683a2..37f3d31066a 100644
--- a/share/examples/Makefile
+++ b/share/examples/Makefile
@@ -107,8 +107,8 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	kld/syscall/test/call.c \
 	libusb20/Makefile \
 	libusb20/README \
-	libusb20/aux.c \
-	libusb20/aux.h \
+	libusb20/util.c \
+	libusb20/util.h \
 	libusb20/bulk.c \
 	libusb20/control.c \
 	libvgl/Makefile \
@@ -241,9 +241,6 @@ etc-examples:
 
 .if ${SHARED} != "symlinks"
 SUBDIR=	smbfs
-.if ${MK_ATF} != "no"
-SUBDIR+=atf
-.endif
 .if ${MK_IPFILTER} != "no"
 SUBDIR+=ipfilter
 .endif
@@ -252,4 +249,8 @@ SUBDIR+=pf
 .endif
 .endif
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=tests
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/share/examples/atf/Makefile b/share/examples/atf/Makefile
deleted file mode 100644
index 774502a43bd..00000000000
--- a/share/examples/atf/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#-
-# Copyright (c) 2011 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:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this 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$
-
-ATF=		${.CURDIR}/../../../contrib/atf
-
-.PATH:		${ATF}/atf-report
-.PATH:		${ATF}/atf-run/sample
-
-NO_OBJ=
-
-FILESDIR=	${SHAREDIR}/examples/atf
-FILES=		atf-run.hooks \
-		tests-results.css
-
-.include <bsd.prog.mk>
diff --git a/share/examples/bhyve/vmrun.sh b/share/examples/bhyve/vmrun.sh
index 73a716298e4..4ed69165b90 100755
--- a/share/examples/bhyve/vmrun.sh
+++ b/share/examples/bhyve/vmrun.sh
@@ -31,7 +31,7 @@ LOADER=/usr/sbin/bhyveload
 BHYVECTL=/usr/sbin/bhyvectl
 FBSDRUN=/usr/sbin/bhyve
 
-DEFAULT_MEMSIZE=512
+DEFAULT_MEMSIZE=512M
 DEFAULT_CPUS=2
 DEFAULT_TAPDEV=tap0
 
@@ -39,15 +39,16 @@ DEFAULT_VIRTIO_DISK="./diskdev"
 DEFAULT_ISOFILE="./release.iso"
 
 usage() {
-	echo "Usage: vmrun.sh [-hai][-g <gdbport>][-m <memsize>][-d <disk file>][-I <location of installation iso>][-t <tapdev>] <vmname>"
+	echo "Usage: vmrun.sh [-hai][-g <gdbport>][-m <memsize>][-d <disk file>][-e <name=value>][-I <location of installation iso>][-t <tapdev>] <vmname>"
 	echo "       -h: display this help message"
 	echo "       -a: force memory mapped local apic access"
 	echo "       -c: number of virtual cpus (default is ${DEFAULT_CPUS})"
 	echo "       -d: virtio diskdev file (default is ${DEFAULT_VIRTIO_DISK})"
+	echo "       -e: set FreeBSD loader environment variable"
 	echo "       -g: listen for connection from kgdb at <gdbport>"
 	echo "       -i: force boot of the Installation CDROM image"
 	echo "       -I: Installation CDROM image location (default is ${DEFAULT_ISOFILE})"
-	echo "       -m: memory size in MB (default is ${DEFAULT_MEMSIZE}MB)"
+	echo "       -m: memory size (default is ${DEFAULT_MEMSIZE})"
 	echo "       -t: tap device for virtio-net (default is $DEFAULT_TAPDEV)"
 	echo ""
 	echo "       This script needs to be executed with superuser privileges"
@@ -73,8 +74,9 @@ virtio_diskdev=${DEFAULT_VIRTIO_DISK}
 tapdev=${DEFAULT_TAPDEV}
 apic_opt=""
 gdbport=0
+env_opt=""
 
-while getopts haic:g:I:m:d:t: c ; do
+while getopts haic:e:g:I:m:d:t: c ; do
 	case $c in
 	h)
 		usage
@@ -85,6 +87,9 @@ while getopts haic:g:I:m:d:t: c ; do
 	d)
 		virtio_diskdev=${OPTARG}
 		;;
+	e)
+		env_opt="${env_opt} -e ${OPTARG}"
+		;;
 	g)	gdbport=${OPTARG}
 		;;
 	i)
@@ -157,24 +162,25 @@ while [ 1 ]; do
 			exit 1
 		fi
 		BOOTDISK=${isofile}
-		installer_opt="-s 3:0,virtio-blk,${BOOTDISK}"
+		installer_opt="-s 31:0,virtio-blk,${BOOTDISK}"
 	else
 		BOOTDISK=${virtio_diskdev}
 		installer_opt=""
 	fi
 
-	${LOADER} -m ${memsize} -d ${BOOTDISK} ${vmname}
+	${LOADER} -m ${memsize} -d ${BOOTDISK} ${env_opt} ${vmname}
 	if [ $? -ne 0 ]; then
 		break
 	fi
 
-	${FBSDRUN} -c ${cpus} -m ${memsize} ${apic_opt} -AI -H -P	\
+	${FBSDRUN} -c ${cpus} -m ${memsize} ${apic_opt} -A -H -P	\
 		-g ${gdbport}						\
 		-s 0:0,hostbridge					\
-		-s 1:0,virtio-net,${tapdev}				\
-		-s 2:0,virtio-blk,${virtio_diskdev}			\
+		-s 1:0,lpc						\
+		-s 2:0,virtio-net,${tapdev}				\
+		-s 3:0,virtio-blk,${virtio_diskdev}			\
+		-l com1,stdio						\
 		${installer_opt}					\
-		-S 31,uart,stdio					\
 		${vmname}
 	if [ $? -ne 0 ]; then
 		break
diff --git a/share/examples/kld/random_adaptor/random_adaptor_example.c b/share/examples/kld/random_adaptor/random_adaptor_example.c
index c0ab10a83fc..da588a87fe5 100644
--- a/share/examples/kld/random_adaptor/random_adaptor_example.c
+++ b/share/examples/kld/random_adaptor/random_adaptor_example.c
@@ -30,32 +30,29 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
-#include <sys/selinfo.h>
+#include <sys/random.h>
 #include <sys/systm.h>
 
+#include <dev/random/live_entropy_sources.h>
 #include <dev/random/random_adaptors.h>
 #include <dev/random/randomdev.h>
 
-#define RNG_NAME "example"
-
 static int random_example_read(void *, int);
 
 struct random_adaptor random_example = {
 	.ident = "Example RNG",
-	.init = (random_init_func_t *)random_null_func,
-	.deinit = (random_deinit_func_t *)random_null_func,
+	.source = RANDOM_PURE_BOGUS,	/* Make sure this is in
+					 * sys/random.h and is unique */
 	.read = random_example_read,
-	.write = (random_write_func_t *)random_null_func,
-	.reseed = (random_reseed_func_t *)random_null_func,
-	.seeded = 1,
 };
 
 /*
  * Used under the license provided @ http://xkcd.com/221/
  * http://creativecommons.org/licenses/by-nc/2.5/
  */
-static u_char
+static uint8_t
 getRandomNumber(void)
 {
 	return 4;   /* chosen by fair dice roll, guaranteed to be random */
@@ -64,14 +61,13 @@ getRandomNumber(void)
 static int
 random_example_read(void *buf, int c)
 {
-	u_char *b;
+	uint8_t *b;
 	int count;
 
 	b = buf;
 
-	for (count = 0; count < c; count++) {
+	for (count = 0; count < c; count++)
 		b[count] = getRandomNumber();
-	}
 
 	printf("returning %d bytes of pure randomness\n", c);
 	return (c);
@@ -80,15 +76,26 @@ random_example_read(void *buf, int c)
 static int
 random_example_modevent(module_t mod, int type, void *unused)
 {
+	int error = 0;
 
 	switch (type) {
 	case MOD_LOAD:
-		random_adaptor_register(RNG_NAME, &random_example);
-		EVENTHANDLER_INVOKE(random_adaptor_attach, &random_example);
-		return (0);
+		live_entropy_source_register(&random_example);
+		break;
+
+	case MOD_UNLOAD:
+		live_entropy_source_deregister(&random_example);
+		break;
+
+	case MOD_SHUTDOWN:
+		break;
+
+	default:
+		error = EOPNOTSUPP;
+		break;
 	}
 
-	return (EINVAL);
+	return (error);
 }
 
-RANDOM_ADAPTOR_MODULE(random_example, random_example_modevent, 1);
+LIVE_ENTROPY_SRC_MODULE(live_entropy_source_example, random_example_modevent, 1);
diff --git a/share/examples/libusb20/Makefile b/share/examples/libusb20/Makefile
index 6f870a19294..f0da6bf527a 100644
--- a/share/examples/libusb20/Makefile
+++ b/share/examples/libusb20/Makefile
@@ -1,13 +1,14 @@
 # $FreeBSD$
 TARGETS=	bulk control
+CFLAGS+=	-Wall
 
 all: $(TARGETS)
 
-bulk: bulk.o aux.o
-	$(CC) $(CFLAGS) -o bulk bulk.o aux.o -lusb
+bulk: bulk.o util.o
+	$(CC) $(CFLAGS) -o bulk bulk.o util.o -lusb
 
-control: control.o aux.o
-	$(CC) $(CFLAGS) -o control control.o aux.o -lusb
+control: control.o util.o
+	$(CC) $(CFLAGS) -o control control.o util.o -lusb
 
 clean:
 	rm -f $(TARGETS) *.o *~
diff --git a/share/examples/libusb20/aux.c b/share/examples/libusb20/aux.c
deleted file mode 100644
index 434972aa736..00000000000
--- a/share/examples/libusb20/aux.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/* ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp):
- * <joerg@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.        Joerg Wunsch
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD$
- */
-
-/*
- * Helper functions common to all examples
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <libusb20.h>
-#include <libusb20_desc.h>
-
-#include "aux.h"
-
-/*
- * Return a textual description for error "r".
- */
-const char *
-usb_error(enum libusb20_error r)
-{
-  const char *msg = "UNKNOWN";
-
-  switch (r)
-    {
-    case LIBUSB20_SUCCESS:
-      msg = "success";
-      break;
-
-    case LIBUSB20_ERROR_IO:
-      msg = "IO error";
-      break;
-
-    case LIBUSB20_ERROR_INVALID_PARAM:
-      msg = "Invalid parameter";
-      break;
-
-    case LIBUSB20_ERROR_ACCESS:
-      msg = "Access denied";
-      break;
-
-    case LIBUSB20_ERROR_NO_DEVICE:
-      msg = "No such device";
-      break;
-
-    case LIBUSB20_ERROR_NOT_FOUND:
-      msg = "Entity not found";
-      break;
-
-    case LIBUSB20_ERROR_BUSY:
-      msg = "Resource busy";
-      break;
-
-    case LIBUSB20_ERROR_TIMEOUT:
-      msg = "Operation timed out";
-      break;
-
-    case LIBUSB20_ERROR_OVERFLOW:
-      msg = "Overflow";
-      break;
-
-    case LIBUSB20_ERROR_PIPE:
-      msg = "Pipe error";
-      break;
-
-    case LIBUSB20_ERROR_INTERRUPTED:
-      msg = "System call interrupted";
-      break;
-
-    case LIBUSB20_ERROR_NO_MEM:
-      msg = "Insufficient memory";
-      break;
-
-    case LIBUSB20_ERROR_NOT_SUPPORTED:
-      msg = "Operation not supported";
-      break;
-
-    case LIBUSB20_ERROR_OTHER:
-      msg = "Other error";
-      break;
-    }
-
-  return msg;
-}
-
-/*
- * Print "len" bytes from "buf" in hex, followed by an ASCII
- * representation (somewhat resembling the output of hd(1)).
- */
-void
-print_formatted(uint8_t *buf, uint32_t len)
-{
-  int i, j;
-
-  for (j = 0; j < len; j += 16)
-    {
-      printf("%02x: ", j);
-
-      for (i = 0; i < 16 && i + j < len; i++)
-	printf("%02x ", buf[i + j]);
-      printf("  ");
-      for (i = 0; i < 16 && i + j < len; i++)
-	{
-	  uint8_t c = buf[i + j];
-	  if(c >= ' ' && c <= '~')
-	    printf("%c", (char)c);
-	  else
-	    putchar('.');
-	}
-      putchar('\n');
-    }
-}
diff --git a/share/examples/libusb20/bulk.c b/share/examples/libusb20/bulk.c
index 7b6b02c005b..08ba029c081 100644
--- a/share/examples/libusb20/bulk.c
+++ b/share/examples/libusb20/bulk.c
@@ -41,7 +41,7 @@
 #include <libusb20.h>
 #include <libusb20_desc.h>
 
-#include "aux.h"
+#include "util.h"
 
 /*
  * If you want to see the details of the internal datastructures
@@ -74,7 +74,7 @@ doit(struct libusb20_device *dev)
    */
   if ((rv = libusb20_dev_open(dev, 2)) != 0)
     {
-      fprintf(stderr, "libusb20_dev_open: %s\n", usb_error(rv));
+      fprintf(stderr, "libusb20_dev_open: %s\n", libusb20_strerror(rv));
       return;
     }
 
@@ -84,7 +84,7 @@ doit(struct libusb20_device *dev)
    */
   if ((rv = libusb20_dev_set_config_index(dev, 0)) != 0)
     {
-      fprintf(stderr, "libusb20_dev_set_config_index: %s\n", usb_error(rv));
+      fprintf(stderr, "libusb20_dev_set_config_index: %s\n", libusb20_strerror(rv));
       return;
     }
 
@@ -97,7 +97,7 @@ doit(struct libusb20_device *dev)
 
   if (xfr_in == NULL || xfr_out == NULL)
     {
-      fprintf(stderr, "libusb20_tr_get_pointer: %s\n", usb_error(rv));
+      fprintf(stderr, "libusb20_tr_get_pointer: %s\n", libusb20_strerror(rv));
       return;
     }
 
@@ -107,12 +107,12 @@ doit(struct libusb20_device *dev)
    */
   if ((rv = libusb20_tr_open(xfr_out, 0, 1, out_ep)) != 0)
     {
-      fprintf(stderr, "libusb20_tr_open: %s\n", usb_error(rv));
+      fprintf(stderr, "libusb20_tr_open: %s\n", libusb20_strerror(rv));
       return;
     }
   if ((rv = libusb20_tr_open(xfr_in, 0, 1, in_ep)) != 0)
     {
-      fprintf(stderr, "libusb20_tr_open: %s\n", usb_error(rv));
+      fprintf(stderr, "libusb20_tr_open: %s\n", libusb20_strerror(rv));
       return;
     }
 
@@ -124,7 +124,7 @@ doit(struct libusb20_device *dev)
       if ((rv = libusb20_tr_bulk_intr_sync(xfr_out, out_buf, out_len, &rlen, TIMEOUT))
 	  != 0)
 	{
-	  fprintf(stderr, "libusb20_tr_bulk_intr_sync (OUT): %s\n", usb_error(rv));
+	  fprintf(stderr, "libusb20_tr_bulk_intr_sync (OUT): %s\n", libusb20_strerror(rv));
 	}
       printf("sent %d bytes\n", rlen);
     }
@@ -132,7 +132,7 @@ doit(struct libusb20_device *dev)
   if ((rv = libusb20_tr_bulk_intr_sync(xfr_in, in_buf, BUFLEN, &rlen, TIMEOUT))
       != 0)
     {
-      fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", usb_error(rv));
+      fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", libusb20_strerror(rv));
     }
       printf("received %d bytes\n", rlen);
       if (rlen > 0)
diff --git a/share/examples/libusb20/control.c b/share/examples/libusb20/control.c
index 0a9d152068a..724ef5979ed 100644
--- a/share/examples/libusb20/control.c
+++ b/share/examples/libusb20/control.c
@@ -11,8 +11,6 @@
 /*
  * Simple demo program to illustrate the handling of FreeBSD's
  * libusb20.
- *
- * XXX
  */
 
 /*
@@ -38,12 +36,15 @@
 #include <stdlib.h>
 #include <sysexits.h>
 #include <unistd.h>
+#include <string.h>
 
 #include <libusb20.h>
 #include <libusb20_desc.h>
 
 #include <sys/queue.h>
 
+#include "util.h"
+
 /*
  * If you want to see the details of the internal datastructures
  * in the debugger, unifdef the following.
@@ -86,7 +87,7 @@ doit(struct libusb20_device *dev)
    */
   if ((rv = libusb20_dev_open(dev, 1)) != 0)
     {
-      fprintf(stderr, "libusb20_dev_open: %s\n", usb_error(rv));
+      fprintf(stderr, "libusb20_dev_open: %s\n", libusb20_strerror(rv));
       return;
     }
 
@@ -96,7 +97,7 @@ doit(struct libusb20_device *dev)
    */
   if ((rv = libusb20_dev_set_config_index(dev, 0)) != 0)
     {
-      fprintf(stderr, "libusb20_dev_set_config_index: %s\n", usb_error(rv));
+      fprintf(stderr, "libusb20_dev_set_config_index: %s\n", libusb20_strerror(rv));
       return;
     }
 
@@ -126,7 +127,7 @@ doit(struct libusb20_device *dev)
 					  0 /* flags */)) != 0)
 	{
 	  fprintf(stderr,
-		  "libusb20_dev_request_sync: %s\n", usb_error(rv));
+		  "libusb20_dev_request_sync: %s\n", libusb20_strerror(rv));
 	}
       printf("sent %d bytes\n", actlen);
       if ((setup.bmRequestType & 0x80) != 0)
@@ -146,7 +147,7 @@ doit(struct libusb20_device *dev)
 
       if (xfr_intr == NULL)
 	{
-	  fprintf(stderr, "libusb20_tr_get_pointer: %s\n", usb_error(rv));
+	  fprintf(stderr, "libusb20_tr_get_pointer: %s\n", libusb20_strerror(rv));
 	  return;
 	}
 
@@ -155,7 +156,7 @@ doit(struct libusb20_device *dev)
        */
       if ((rv = libusb20_tr_open(xfr_intr, 0, 1, intr_ep)) != 0)
 	{
-	  fprintf(stderr, "libusb20_tr_open: %s\n", usb_error(rv));
+	  fprintf(stderr, "libusb20_tr_open: %s\n", libusb20_strerror(rv));
 	  return;
 	}
 
@@ -165,7 +166,7 @@ doit(struct libusb20_device *dev)
       if ((rv = libusb20_tr_bulk_intr_sync(xfr_intr, in_buf, BUFLEN, &rlen, TIMEOUT))
 	  != 0)
 	{
-	  fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", usb_error(rv));
+	  fprintf(stderr, "libusb20_tr_bulk_intr_sync: %s\n", libusb20_strerror(rv));
 	}
       printf("received %d bytes\n", rlen);
       if (rlen > 0)
diff --git a/share/examples/libusb20/util.c b/share/examples/libusb20/util.c
new file mode 100644
index 00000000000..4a24ee0cf8c
--- /dev/null
+++ b/share/examples/libusb20/util.c
@@ -0,0 +1,50 @@
+/* ----------------------------------------------------------------------------
+ * "THE BEER-WARE LICENSE" (Revision 42) (by Poul-Henning Kamp):
+ * <joerg@FreeBSD.ORG> wrote this file.  As long as you retain this notice you
+ * can do whatever you want with this stuff. If we meet some day, and you think
+ * this stuff is worth it, you can buy me a beer in return.        Joerg Wunsch
+ * ----------------------------------------------------------------------------
+ *
+ * $FreeBSD$
+ */
+
+/*
+ * Helper functions common to all examples
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <libusb20.h>
+#include <libusb20_desc.h>
+
+#include "util.h"
+
+/*
+ * Print "len" bytes from "buf" in hex, followed by an ASCII
+ * representation (somewhat resembling the output of hd(1)).
+ */
+void
+print_formatted(uint8_t *buf, uint32_t len)
+{
+  int i, j;
+
+  for (j = 0; j < len; j += 16)
+    {
+      printf("%02x: ", j);
+
+      for (i = 0; i < 16 && i + j < len; i++)
+	printf("%02x ", buf[i + j]);
+      printf("  ");
+      for (i = 0; i < 16 && i + j < len; i++)
+	{
+	  uint8_t c = buf[i + j];
+	  if(c >= ' ' && c <= '~')
+	    printf("%c", (char)c);
+	  else
+	    putchar('.');
+	}
+      putchar('\n');
+    }
+}
diff --git a/share/examples/libusb20/aux.h b/share/examples/libusb20/util.h
similarity index 92%
rename from share/examples/libusb20/aux.h
rename to share/examples/libusb20/util.h
index d43ea4e571f..5fd2a6e09c2 100644
--- a/share/examples/libusb20/aux.h
+++ b/share/examples/libusb20/util.h
@@ -11,5 +11,4 @@
 #include <stdint.h>
 #include <libusb20.h>
 
-const char *usb_error(enum libusb20_error r);
 void print_formatted(uint8_t *buf, uint32_t len);
diff --git a/share/examples/tests/Makefile b/share/examples/tests/Makefile
new file mode 100644
index 00000000000..387b8068b1f
--- /dev/null
+++ b/share/examples/tests/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/share/examples
+
+SUBDIR=		tests
+
+KYUAFILE=	yes
+.PATH:		${.CURDIR:H:H:H}/tests
+
+.include <bsd.test.mk>
diff --git a/share/examples/tests/README b/share/examples/tests/README
new file mode 100644
index 00000000000..0465cbe7988
--- /dev/null
+++ b/share/examples/tests/README
@@ -0,0 +1,37 @@
+$FreeBSD$
+
+This directory contains sample test programs along the Makefile and
+Kyuafile logic to get them build and installed.
+
+The goal of these test programs is to illustrate, via simple and
+heaviliy-commented code, how to construct test programs using all the
+supported interfaces in the system.
+
+If you use any files in here as templates for your own code, please
+remove all comments while doing so and then write your own if necessary.
+
+The subdirectories here contain:
+
+* tests/: Regular directory containing the tests code.  Note that the
+  apparently-redundant tests/tests/ path component here is expected for
+  consistency reasons and required to get the right layout under
+  /usr/tests/.
+
+* tests/atf/: Tests that use the ATF libraries, including atf-c, atf-c++
+  and atf-sh.  See kyua-atf-interface(1) for details.
+
+* tests/plain/: Tests that do not use any testing framework.  See
+  kyua-plain-interface(1) for details.
+
+To inspect the available sample test cases from an installed system:
+
+    $ kyua list -k /usr/tests/share/examples/tests/Kyuafile
+
+To run the full suite of sample test cases:
+
+    $ kyua test -k /usr/tests/share/examples/tests/Kyuafile
+
+And to debug a specific failing test case, if any:
+
+    $ kyua debug -k /usr/tests/share/examples/tests/Kyuafile \
+      atf/cp_test:simple
diff --git a/share/examples/tests/tests/Makefile b/share/examples/tests/tests/Makefile
new file mode 100644
index 00000000000..9f7b5a4729c
--- /dev/null
+++ b/share/examples/tests/tests/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+# Directory into which the Kyuafile provided by this directory will be
+# installed.
+#
+# This is always a subdirectory of ${TESTSBASE}/.  The remainder of the
+# path has to match the relative path within the source tree in which
+# these files are found modulo the tests/ component at the end.
+#
+# For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR
+# would point at ${TESTSBASE}/bin/cp/.
+TESTSDIR=	${TESTSBASE}/share/examples/tests
+
+# List of subdirectories into which we want to recurse during the build
+# of the system.  We use TESTS_SUBDIRS instead of SUBDIR because we want
+# the auto-generated Kyuafile to recurse into these directories.
+TESTS_SUBDIRS=	atf plain
+
+# We leave KYUAFILE unset so that bsd.test.mk auto-generates a Kyuafile
+# for us based on the contents of the TESTS_SUBDIRS line above.  The
+# generated file will tell the tests run-time engine to recurse into the
+# directories listed above.
+#KYUAFILE=	auto
+
+.include <bsd.test.mk>
diff --git a/share/examples/tests/tests/atf/Kyuafile b/share/examples/tests/tests/atf/Kyuafile
new file mode 100644
index 00000000000..8c60947d108
--- /dev/null
+++ b/share/examples/tests/tests/atf/Kyuafile
@@ -0,0 +1,46 @@
+-- $FreeBSD$
+--
+-- Copyright 2013 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.
+
+syntax(2)
+
+-- All tests provided by the FreeBSD base system should set the test_suite
+-- property to FreeBSD.  This creates a namespace in the configuration file
+-- in which specific run-time properties can be passed to the tests below.
+test_suite('FreeBSD')
+
+-- Register the various test programs into the test suite defined in this
+-- directory.
+--
+-- Note that, while Kyua supports overriding the test case metadata
+-- properties (e.g. their timeout) along the test program definition, you
+-- should not do so for ATF test programs.  The ATF test cases themselves
+-- encode the right values.
+atf_test_program{name='cp_test'}
+atf_test_program{name='printf_test'}
diff --git a/share/examples/tests/tests/atf/Makefile b/share/examples/tests/tests/atf/Makefile
new file mode 100644
index 00000000000..d93813dabfb
--- /dev/null
+++ b/share/examples/tests/tests/atf/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+# Directory into which the Kyuafile provided by this directory will be
+# installed.
+#
+# This is always a subdirectory of ${TESTSBASE}/.  The remainder of the
+# path has to match the relative path within the source tree in which
+# these files are found modulo the tests/ component at the end.
+#
+# For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR
+# would point at ${TESTSBASE}/bin/cp/.
+TESTSDIR=	${TESTSBASE}/share/examples/tests/atf
+
+# List of test programs to build.  Note that we can build more than one
+# test from a single directory, and this is expected.
+ATF_TESTS_C=	printf_test
+ATF_TESTS_SH=	cp_test
+
+# Tell bsd.test.mk that we are providing a hand-crafted Kyuafile in this
+# directory.  We do so because the file in this directory exists for
+# documentation purposes.
+#
+# In general, however, you should NOT define KYUAFILE at all to allow
+# bsd.test.mk auto-generate one for you based on the ATF_TESTS_*
+# definitions from above.
+KYUAFILE=	yes
+
+.include <atf.test.mk>
diff --git a/share/examples/tests/tests/atf/cp_test.sh b/share/examples/tests/tests/atf/cp_test.sh
new file mode 100755
index 00000000000..83d691460d0
--- /dev/null
+++ b/share/examples/tests/tests/atf/cp_test.sh
@@ -0,0 +1,119 @@
+# $FreeBSD$
+#
+# Copyright 2013 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.
+
+#
+# INTRODUCTION
+#
+# This sample test program implements various test cases for the cp(1)
+# utility in order to demonstrate the usage of the ATF shell API (see
+# atf-sh-api(3)).
+#
+
+#
+# Auxiliary function to compare two files for equality.
+#
+verify_copy() {
+	if ! cmp -s "${1}" "${2}"; then
+		echo "${1} and ${2} differ, but they should be equal"
+		diff -u "${1}" "${2}"
+		atf_fail "Original and copy do not match"
+	fi
+}
+
+#
+# This is the simplest form of a test case definition: a test case
+# without a header.
+#
+# In most cases, this is the definition you will want to use.  However,
+# make absolutely sure that the test case name is descriptive enough.
+# Multi-word test case names are encouraged.  Keep in mind that these
+# are exposed to the reader in the test reports, and the goal is for
+# the combination of the test program plus the name of the test case to
+# give a pretty clear idea of what specific condition the test is
+# validating.
+#
+atf_test_case simple
+simple_body() {
+	echo 'File 1' >file1
+
+	# The atf_check function is a very powerful function of atf-sh.
+	# It allows you to define checkers for the exit status, the
+	# stdout and the stderr of any command you execute.  If the
+	# result of the command does not match the expectations defined
+	# in the checkers, the test fails and verbosely reports data
+	# behind the problem.
+	#
+	# See atf-check(1) for details.
+	atf_check -s exit:0 -o empty -e empty cp file1 file2
+
+	verify_copy file1 file2
+
+	# Of special note here is that we are NOT deleting the temporary
+	# files we created in this test.  Kyua takes care of this
+	# cleanup automatically and tests can (and should) rely on this
+	# behavior.
+}
+
+#
+# This is a more complex form of a test case definition: a test case
+# with a header and a body.  You should always favor the simpler
+# definition above unless you have to override specific metadata
+# variables.
+#
+# See atf-test-case(4) and kyua-atf-interface(1) for details on all
+# available properties.
+#
+atf_test_case force
+force_head() {
+	# In this specific case, we define a textual description for
+	# the test case, which is later exported to the reports for
+	# documentation purposes.
+	#
+	# However, note again that you should favor highly descriptive
+	# test case names to textual descriptions.
+	atf_set "descr" "Tests that the -f flag causes cp to forcibly" \
+	    "override the destination file"
+}
+force_body() {
+	echo 'File 1' >file1
+	echo 'File 2' >file2
+	chmod 400 file2
+	atf_check cp -f file1 file2
+	verify_copy file1 file2
+}
+
+#
+# Lastly, we tell ATF which test cases exist in this program.  This
+# function should not do anything other than this registration.
+#
+atf_init_test_cases() {
+	atf_add_test_case simple
+	atf_add_test_case force
+}
diff --git a/share/examples/tests/tests/atf/printf_test.c b/share/examples/tests/tests/atf/printf_test.c
new file mode 100644
index 00000000000..04a5665cdd8
--- /dev/null
+++ b/share/examples/tests/tests/atf/printf_test.c
@@ -0,0 +1,155 @@
+/* $FreeBSD$
+ *
+ * Copyright 2013 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. */
+
+/*
+ * INTRODUCTION
+ *
+ * This sample test program implements various test cases for the printf(3)
+ * family of functions in order to demonstrate the usage of the ATF C API
+ * (see atf-c-api(3)).
+ *
+ * Note that this test program is called printf_test because it is intended
+ * to validate various functions of the printf(3) family.  For this reason,
+ * each test is prefixed with the name of the function under test followed
+ * by a description of the specific condition being validated.  You should
+ * use a similar naming scheme for your own tests.
+ */
+
+#include <atf-c.h>
+#include <stdio.h>
+#include <string.h>
+
+/*
+ * This is the simplest form of a test case definition: a test case
+ * without a header.
+ *
+ * In most cases, this is the definition you will want to use.  However,
+ * make absolutely sure that the test case name is descriptive enough.
+ * Multi-word test case names are encouraged.  Keep in mind that these
+ * are exposed to the reader in the test reports, and the goal is for
+ * the combination of the test program plus the name of the test case to
+ * give a pretty clear idea of what specific condition the test is
+ * validating.
+ */
+ATF_TC_WITHOUT_HEAD(snprintf__two_formatters);
+ATF_TC_BODY(snprintf__two_formatters, tc)
+{
+	char buffer[128];
+
+	/* This first require-style check invokes the function we are
+	 * interested in testing.  This will cause the test to fail if
+	 * the condition provided to ATF_REQUIRE is not met. */
+	ATF_REQUIRE(snprintf(buffer, sizeof(buffer), "%s, %s!",
+	    "Hello", "tests") > 0);
+
+	/* This second check-style check compares that the result of the
+	 * snprintf call we performed above is correct.  We use a check
+	 * instead of a require. */
+	ATF_CHECK_STREQ("Hello, tests!", buffer);
+}
+
+/*
+ * This is a more complex form of a test case definition: a test case
+ * with a header and a body.  You should always favor the simpler
+ * definition above unless you have to override specific metadata
+ * variables.
+ *
+ * See atf-test-case(4) and kyua-atf-interface(1) for details on all
+ * available properties.
+ */
+ATF_TC(snprintf__overflow);
+ATF_TC_HEAD(snprintf__overflow, tc)
+{
+	/* In this specific case, we define a textual description for
+	 * the test case, which is later exported to the reports for
+	 * documentation purposes.
+	 *
+	 * However, note again that you should favor highly descriptive
+	 * test case names to textual descriptions.  */
+	atf_tc_set_md_var(tc, "descr", "This test case validates the proper "
+	    "truncation of the output string from snprintf when it does not "
+	    "fit the provided buffer.");
+}
+ATF_TC_BODY(snprintf__overflow, tc)
+{
+	char buffer[10];
+
+	/* This is a similar test to the above, but in this case we do the
+	 * test ourselves and forego the ATF_* macros.  Note that we use the
+	 * atf_tc_fail() function instead of exit(2) or similar because we
+	 * want Kyua to have access to the failure message.
+	 *
+	 * In general, prefer using the ATF_* macros wherever possible.  Only
+	 * resort to manual tests when the macros are unsuitable (and consider
+	 * filing a feature request to get a new macro if you think your case
+	 * is generic enough). */
+	if (snprintf(buffer, sizeof(buffer), "0123456789abcdef") != 16)
+		atf_tc_fail("snprintf did not return the expected number "
+		    "of characters");
+
+	ATF_CHECK(strcmp(buffer, "012345678") == 0);
+}
+
+/*
+ * Another simple test case, but this time with side-effects.  This
+ * particular test case modifies the contents of the current directory
+ * and does not clean up after itself, which is perfectly fine.
+ */
+ATF_TC_WITHOUT_HEAD(fprintf__simple_string);
+ATF_TC_BODY(fprintf__simple_string, tc)
+{
+	const char *contents = "This is a message\n";
+
+	FILE *output = fopen("test.txt", "w");
+	ATF_REQUIRE(fprintf(output, "%s", contents) > 0);
+	fclose(output);
+
+	/* The ATF C library provides more than just macros to verify the
+	 * outcome of expressions.  It also includes various helper functions
+	 * to work with files and processes.  Here is just a simple
+	 * example. */
+	ATF_REQUIRE(atf_utils_compare_file("test.txt", contents));
+
+	/* Of special note here is that we are NOT deleting the
+	 * temporary files we created in this test.  Kyua takes care of
+	 * this cleanup automatically and tests can (and should) rely on
+	 * this behavior. */
+}
+
+/*
+ * Lastly, we tell ATF which test cases exist in this program.  This
+ * function should not do anything other than this registration.
+ */
+ATF_TP_ADD_TCS(tp)
+{
+	ATF_TP_ADD_TC(tp, snprintf__two_formatters);
+	ATF_TP_ADD_TC(tp, snprintf__overflow);
+	ATF_TP_ADD_TC(tp, fprintf__simple_string);
+}
diff --git a/share/examples/tests/tests/plain/Kyuafile b/share/examples/tests/tests/plain/Kyuafile
new file mode 100644
index 00000000000..c9301b0ef97
--- /dev/null
+++ b/share/examples/tests/tests/plain/Kyuafile
@@ -0,0 +1,47 @@
+-- $FreeBSD$
+--
+-- Copyright 2013 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.
+
+syntax(2)
+
+-- All tests provided by the FreeBSD base system should set the test_suite
+-- property to FreeBSD.  This creates a namespace in the configuration file
+-- in which specific run-time properties can be passed to the tests below.
+test_suite('FreeBSD')
+
+-- Register the various test programs into the test suite defined in this
+-- directory.
+--
+-- Because plain test programs cannot define metadata in their code (they
+-- have no mechanism to communicate that to Kyua), we can instead define
+-- any metadata properties in here.  These have the exact same meaning as
+-- their ATF counterparts.  These properties are often useful to define
+-- prerequisites for the execution of the tests.
+plain_test_program{name='cp_test', required_programs='/bin/cp'}
+plain_test_program{name='printf_test'}
diff --git a/share/examples/tests/tests/plain/Makefile b/share/examples/tests/tests/plain/Makefile
new file mode 100644
index 00000000000..309dbefbea5
--- /dev/null
+++ b/share/examples/tests/tests/plain/Makefile
@@ -0,0 +1,30 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+# Directory into which the Kyuafile provided by this directory will be
+# installed.
+#
+# This is always a subdirectory of ${TESTSBASE}/.  The remainder of the
+# path has to match the relative path within the source tree in which
+# these files are found modulo the tests/ component at the end.
+#
+# For example: if this Makefile were in src/bin/cp/tests/, its TESTSDIR
+# would point at ${TESTSBASE}/bin/cp/.
+TESTSDIR=	${TESTSBASE}/share/examples/tests/plain
+
+# List of test programs to build.  Note that we can build more than one
+# test from a single directory, and this is expected.
+PLAIN_TESTS_C=	printf_test
+PLAIN_TESTS_SH=	cp_test
+
+# Tell bsd.test.mk that we are providing a hand-crafted Kyuafile in this
+# directory.  We do so because the file in this directory exists for
+# documentation purposes.
+#
+# In general, however, you should NOT define KYUAFILE at all to allow
+# bsd.test.mk auto-generate one for you based on the PLAIN_TESTS_*
+# definitions from above.
+KYUAFILE=	yes
+
+.include <plain.test.mk>
diff --git a/share/examples/tests/tests/plain/cp_test.sh b/share/examples/tests/tests/plain/cp_test.sh
new file mode 100644
index 00000000000..ea6470518cd
--- /dev/null
+++ b/share/examples/tests/tests/plain/cp_test.sh
@@ -0,0 +1,84 @@
+# $FreeBSD$
+#
+# Copyright 2013 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.
+
+#
+# INTRODUCTION
+#
+# This plain test program mimics the structure and contents of its
+# ATF-based counterpart.  It attempts to represent various test cases
+# in different separate functions and just calls them all from main.
+#
+# In reality, plain test programs can be much simpler.  All they have
+# to do is return 0 on success and non-0 otherwise.
+#
+
+set -e
+
+# Prints an error message and exits.
+err() {
+	echo "${@}" 1>&2
+	exit 1
+}
+
+# Auxiliary function to compare two files for equality.
+verify_copy() {
+	if ! cmp -s "${1}" "${2}"; then
+		diff -u "${1}" "${2}"
+		err "${1} and ${2} differ, but they should be equal"
+	fi
+}
+
+simple_test() {
+	echo 'File 1' >file1
+	cp file1 file2 || err "cp failed"
+	verify_copy file1 file2
+}
+
+force_test() {
+	echo 'File 1' >file1
+	echo 'File 2' >file2
+	chmod 400 file2
+	cp -f file1 file2 || err "cp failed"
+	verify_copy file1 file2
+}
+
+# If you have read the cp_test.sh counterpart in the atf/ directory, you
+# may think that the sequencing of tests below and the exposed behavior
+# to the user is very similar.  But you'd be wrong.
+#
+# There are two major differences with this and the ATF version.  The
+# first is that the code below has no provisions to detect failures in
+# one test and continue running the other tests: the first failure
+# causes the whole test program to exit.  The second is that this
+# particular "main" has no arguments: without ATF, all test programs may
+# expose a different command-line interface, and this is an issue for
+# consistency purposes.
+simple_test
+force_test
diff --git a/share/examples/tests/tests/plain/printf_test.c b/share/examples/tests/tests/plain/printf_test.c
new file mode 100644
index 00000000000..c43269b2a73
--- /dev/null
+++ b/share/examples/tests/tests/plain/printf_test.c
@@ -0,0 +1,119 @@
+/* $FreeBSD$
+ *
+ * Copyright 2013 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. */
+
+/*
+ * INTRODUCTION
+ *
+ * This plain test program mimics the structure and contents of its
+ * ATF-based counterpart.  It attempts to represent various test cases
+ * in different separate functions and just calls them all from main().
+ *
+ * In reality, plain test programs can be much simpler.  All they have
+ * to do is return 0 on success and non-0 otherwise.
+ */
+
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void
+snprintf__two_formatters(void)
+{
+	char buffer[128];
+
+	if (snprintf(buffer, sizeof(buffer), "%s, %s!", "Hello",
+	    "tests") <= 0)
+		errx(EXIT_FAILURE, "snprintf with two formatters failed");
+
+	if (strcmp(buffer, "Hello, tests!") != 0)
+		errx(EXIT_FAILURE, "Bad formatting: got %s", buffer);
+}
+
+static void
+snprintf__overflow(void)
+{
+	char buffer[10];
+
+	if (snprintf(buffer, sizeof(buffer), "0123456789abcdef") != 16)
+		errx(EXIT_FAILURE, "snprintf did not return the expected "
+		    "number of characters");
+
+	if (strcmp(buffer, "012345678") != 0)
+		errx(EXIT_FAILURE, "Bad formatting: got %s", buffer);
+}
+
+static void
+fprintf__simple_string(void)
+{
+	FILE *file;
+	char buffer[128];
+	size_t length;
+	const char *contents = "This is a message\n";
+
+	file = fopen("test.txt", "w+");
+	if (fprintf(file, "%s", contents) <= 0)
+		err(EXIT_FAILURE, "fprintf failed to write to file");
+	rewind(file);
+	length = fread(buffer, 1, sizeof(buffer) - 1, file);
+	if (length != strlen(contents))
+		err(EXIT_FAILURE, "fread failed");
+	buffer[length] = '\0';
+	fclose(file);
+
+	if (strcmp(buffer, contents) != 0)
+		errx(EXIT_FAILURE, "Written and read data differ");
+
+	/* Of special note here is that we are NOT deleting the temporary
+	 * files we created in this test.  Kyua takes care of this cleanup
+	 * automatically and tests can (and should) rely on this behavior. */
+}
+
+int
+main(void)
+{
+	/* If you have read the printf_test.c counterpart in the atf/
+	 * directory, you may think that the sequencing of tests below and
+	 * the exposed behavior to the user is very similar.  But you'd be
+	 * wrong.
+	 *
+	 * There are two major differences with this and the ATF version.
+	 * The first is that the code below has no provisions to detect
+	 * failures in one test and continue running the other tests: the
+	 * first failure causes the whole test program to exit.  The second
+	 * is that this particular main() has no arguments: without ATF,
+	 * all test programs may expose a different command-line interface,
+	 * and this is an issue for consistency purposes. */
+	snprintf__two_formatters();
+	snprintf__overflow();
+	fprintf__simple_string();
+
+	return EXIT_SUCCESS;
+}
diff --git a/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src b/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src
index 535116011ad..c55ee822548 100644
--- a/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src
+++ b/share/i18n/csmapper/JIS/JISX0201-KANA%UCS.src
@@ -3,7 +3,7 @@
 
 TYPE		ROWCOL
 NAME		JISX0201-KANA/UCS
-SRC_ZONE	0x00-0xDF
+SRC_ZONE	0x21-0x5F
 OOB_MODE	ILSEQ
 DST_ILSEQ	0xFFFE
 DST_UNIT_BITS	16
@@ -62,10 +62,67 @@ BEGIN_MAP
 #	The entries are in JIS order
 #
 #
-0x00 - 0x5B = 0x0000 -
-0x5C = 0x00A5
-0x5D - 0x7D = 0x005D -
-0x7E = 0x203E
-0x7F = 0x007F
-0xA1 - 0xDF = 0xFF61 -
+0x21 = 0xFF61
+0x22 = 0xFF62
+0x23 = 0xFF63
+0x24 = 0xFF64
+0x25 = 0xFF65
+0x26 = 0xFF66
+0x27 = 0xFF67
+0x28 = 0xFF68
+0x29 = 0xFF69
+0x2A = 0xFF6A
+0x2B = 0xFF6B
+0x2C = 0xFF6C
+0x2D = 0xFF6D
+0x2E = 0xFF6E
+0x2F = 0xFF6F
+0x30 = 0xFF70
+0x31 = 0xFF71
+0x32 = 0xFF72
+0x33 = 0xFF73
+0x34 = 0xFF74
+0x35 = 0xFF75
+0x36 = 0xFF76
+0x37 = 0xFF77
+0x38 = 0xFF78
+0x39 = 0xFF79
+0x3A = 0xFF7A
+0x3B = 0xFF7B
+0x3C = 0xFF7C
+0x3D = 0xFF7D
+0x3E = 0xFF7E
+0x3F = 0xFF7F
+0x40 = 0xFF80
+0x41 = 0xFF81
+0x42 = 0xFF82
+0x43 = 0xFF83
+0x44 = 0xFF84
+0x45 = 0xFF85
+0x46 = 0xFF86
+0x47 = 0xFF87
+0x48 = 0xFF88
+0x49 = 0xFF89
+0x4A = 0xFF8A
+0x4B = 0xFF8B
+0x4C = 0xFF8C
+0x4D = 0xFF8D
+0x4E = 0xFF8E
+0x4F = 0xFF8F
+0x50 = 0xFF90
+0x51 = 0xFF91
+0x52 = 0xFF92
+0x53 = 0xFF93
+0x54 = 0xFF94
+0x55 = 0xFF95
+0x56 = 0xFF96
+0x57 = 0xFF97
+0x58 = 0xFF98
+0x59 = 0xFF99
+0x5A = 0xFF9A
+0x5B = 0xFF9B
+0x5C = 0xFF9C
+0x5D = 0xFF9D
+0x5E = 0xFF9E
+0x5F = 0xFF9F
 END_MAP
diff --git a/share/i18n/csmapper/JIS/JISX0208@1990%UCS.src b/share/i18n/csmapper/JIS/JISX0208@1990%UCS.src
index 7cb608b9478..880b4932849 100644
--- a/share/i18n/csmapper/JIS/JISX0208@1990%UCS.src
+++ b/share/i18n/csmapper/JIS/JISX0208@1990%UCS.src
@@ -119,7 +119,7 @@ BEGIN_MAP
 0x213A = 0x3006
 0x213B = 0x3007
 0x213C = 0x30FC
-0x213D = 0x2015
+0x213D = 0x2014
 0x213E = 0x2010
 0x213F = 0xFF0F
 0x2140 = 0xFF3C
diff --git a/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src b/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src
index 5f47995e182..e7075091781 100644
--- a/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src
+++ b/share/i18n/csmapper/JIS/UCS%JISX0201-KANA.src
@@ -3,10 +3,10 @@
 
 TYPE		ROWCOL
 NAME		"UCS/JISX0201-KANA"
-SRC_ZONE	0x0000 - 0xFFEC
+SRC_ZONE	0xFF60 - 0xFF9F
 OOB_MODE	INVALID
 DST_INVALID	0xFF
-DST_UNIT_BITS	32
+DST_UNIT_BITS	8
 
 BEGIN_MAP
 #
@@ -62,1094 +62,67 @@ BEGIN_MAP
 #	The entries are in JIS order
 #
 #
-
-0x0000 = 0x00
-0x0001 = 0x01
-0x0002 = 0x02
-0x0003 = 0x03
-0x0004 = 0x04
-0x0005 = 0x05
-0x0006 = 0x06
-0x0007 = 0x07
-0x0008 = 0x08
-0x0009 = 0x09
-0x000A = 0x0A
-0x000B = 0x0B
-0x000C = 0x0C
-0x000D = 0x0D
-0x000E = 0x0E
-0x000F = 0x0F
-0x0010 = 0x10
-0x0011 = 0x11
-0x0012 = 0x12
-0x0013 = 0x13
-0x0014 = 0x14
-0x0015 = 0x15
-0x0016 = 0x16
-0x0017 = 0x17
-0x0018 = 0x18
-0x0019 = 0x19
-0x001A = 0x1A
-0x001B = 0x1B
-0x001C = 0x1C
-0x001D = 0x1D
-0x001E = 0x1E
-0x001F = 0x1F
-0x0020 = 0x20
-0x0021 = 0x21
-0x0022 = 0x22
-0x0023 = 0x23
-0x0024 = 0x24
-0x0025 = 0x25
-0x0026 = 0x26
-0x0027 = 0x27
-0x0028 = 0x28
-0x0029 = 0x29
-0x002A = 0x2A
-0x002B = 0x2B
-0x002C = 0x2C
-0x002D = 0x2D
-0x002E = 0x2E
-0x002F = 0x2F
-0x0030 = 0x30
-0x0031 = 0x31
-0x0032 = 0x32
-0x0033 = 0x33
-0x0034 = 0x34
-0x0035 = 0x35
-0x0036 = 0x36
-0x0037 = 0x37
-0x0038 = 0x38
-0x0039 = 0x39
-0x003A = 0x3A
-0x003B = 0x3B
-0x003C = 0x3C
-0x003D = 0x3D
-0x003E = 0x3E
-0x003F = 0x3F
-0x0040 = 0x40
-0x0041 = 0x41
-0x0042 = 0x42
-0x0043 = 0x43
-0x0044 = 0x44
-0x0045 = 0x45
-0x0046 = 0x46
-0x0047 = 0x47
-0x0048 = 0x48
-0x0049 = 0x49
-0x004A = 0x4A
-0x004B = 0x4B
-0x004C = 0x4C
-0x004D = 0x4D
-0x004E = 0x4E
-0x004F = 0x4F
-0x0050 = 0x50
-0x0051 = 0x51
-0x0052 = 0x52
-0x0053 = 0x53
-0x0054 = 0x54
-0x0055 = 0x55
-0x0056 = 0x56
-0x0057 = 0x57
-0x0058 = 0x58
-0x0059 = 0x59
-0x005A = 0x5A
-0x005B = 0x5B
-0x005D = 0x5D
-0x005E = 0x5E
-0x005F = 0x5F
-0x0060 = 0x60
-0x0061 = 0x61
-0x0062 = 0x62
-0x0063 = 0x63
-0x0064 = 0x64
-0x0065 = 0x65
-0x0066 = 0x66
-0x0067 = 0x67
-0x0068 = 0x68
-0x0069 = 0x69
-0x006A = 0x6A
-0x006B = 0x6B
-0x006C = 0x6C
-0x006D = 0x6D
-0x006E = 0x6E
-0x006F = 0x6F
-0x0070 = 0x70
-0x0071 = 0x71
-0x0072 = 0x72
-0x0073 = 0x73
-0x0074 = 0x74
-0x0075 = 0x75
-0x0076 = 0x76
-0x0077 = 0x77
-0x0078 = 0x78
-0x0079 = 0x79
-0x007A = 0x7A
-0x007B = 0x7B
-0x007C = 0x7C
-0x007D = 0x7D
-0x007F = 0x7F
-0x00A0 = 0x20
-0x00A1 = 0x21
-0x00A2 = 0x63
-0x00A3 = 0x626C
-0x00A5 = 0x5C
-0x00A6 = 0x7C
-0x00A7 = 0x5353
-0x00A8 = 0x22
-0x00A9 = 0x296328
-0x00AA = 0x61
-0x00AB = 0x3C3C
-0x00AC = 0x746F6E
-0x00AD = 0x2D
-0x00AE = 0x295228
-0x00B0 = 0x305E
-0x00B1 = 0x2D2F2B
-0x00B2 = 0x325E
-0x00B3 = 0x335E
-0x00B4 = 0x27
-0x00B5 = 0x75
-0x00B6 = 0x50
-0x00B7 = 0x2E
-0x00B8 = 0x2C
-0x00B9 = 0x315E
-0x00BA = 0x6F
-0x00BB = 0x3E3E
-0x00BF = 0x3F
-0x00C0 = 0x4160
-0x00C1 = 0x4127
-0x00C2 = 0x415E
-0x00C4 = 0x4122
-0x00C5 = 0x41
-0x00C6 = 0x4541
-0x00C7 = 0x43
-0x00C8 = 0x4560
-0x00C9 = 0x4527
-0x00CA = 0x455E
-0x00CB = 0x4522
-0x00CC = 0x4960
-0x00CD = 0x4927
-0x00CE = 0x495E
-0x00CF = 0x4922
-0x00D0 = 0x44
-0x00D2 = 0x4F60
-0x00D3 = 0x4F27
-0x00D4 = 0x4F5E
-0x00D6 = 0x4F22
-0x00D7 = 0x78
-0x00D8 = 0x4F
-0x00D9 = 0x5560
-0x00DA = 0x5527
-0x00DB = 0x555E
-0x00DC = 0x5522
-0x00DD = 0x5927
-0x00DE = 0x6854
-0x00DF = 0x7373
-0x00E0 = 0x6160
-0x00E1 = 0x6127
-0x00E2 = 0x615E
-0x00E4 = 0x6122
-0x00E5 = 0x61
-0x00E6 = 0x6561
-0x00E7 = 0x63
-0x00E8 = 0x6560
-0x00E9 = 0x6527
-0x00EA = 0x655E
-0x00EB = 0x6522
-0x00EC = 0x6960
-0x00ED = 0x6927
-0x00EE = 0x695E
-0x00EF = 0x6922
-0x00F0 = 0x64
-0x00F2 = 0x6F60
-0x00F3 = 0x6F27
-0x00F4 = 0x6F5E
-0x00F6 = 0x6F22
-0x00F7 = 0x3A
-0x00F8 = 0x6F
-0x00F9 = 0x7560
-0x00FA = 0x7527
-0x00FB = 0x755E
-0x00FC = 0x7522
-0x00FD = 0x7927
-0x00FE = 0x6874
-0x00FF = 0x7922
-0x0100 = 0x41
-0x0101 = 0x61
-0x0102 = 0x41
-0x0103 = 0x61
-0x0104 = 0x41
-0x0105 = 0x61
-0x0106 = 0x4327
-0x0107 = 0x6327
-0x0108 = 0x435E
-0x0109 = 0x635E
-0x010A = 0x43
-0x010B = 0x63
-0x010C = 0x43
-0x010D = 0x63
-0x010E = 0x44
-0x010F = 0x64
-0x0110 = 0x44
-0x0111 = 0x64
-0x0112 = 0x45
-0x0113 = 0x65
-0x0114 = 0x45
-0x0115 = 0x65
-0x0116 = 0x45
-0x0117 = 0x65
-0x0118 = 0x45
-0x0119 = 0x65
-0x011A = 0x45
-0x011B = 0x65
-0x011C = 0x475E
-0x011D = 0x675E
-0x011E = 0x47
-0x011F = 0x67
-0x0120 = 0x47
-0x0121 = 0x67
-0x0122 = 0x47
-0x0123 = 0x67
-0x0124 = 0x485E
-0x0125 = 0x685E
-0x0126 = 0x48
-0x0127 = 0x68
-0x012A = 0x49
-0x012B = 0x69
-0x012C = 0x49
-0x012D = 0x69
-0x012E = 0x49
-0x012F = 0x69
-0x0130 = 0x49
-0x0131 = 0x69
-0x0132 = 0x4A49
-0x0133 = 0x6A69
-0x0134 = 0x4A5E
-0x0135 = 0x6A5E
-0x0136 = 0x4B
-0x0137 = 0x6B
-0x0139 = 0x4C
-0x013A = 0x6C
-0x013B = 0x4C
-0x013C = 0x6C
-0x013D = 0x4C
-0x013E = 0x6C
-0x013F = 0x4C
-0x0140 = 0x6C
-0x0141 = 0x4C
-0x0142 = 0x6C
-0x0143 = 0x4E27
-0x0144 = 0x6E27
-0x0145 = 0x4E
-0x0146 = 0x6E
-0x0147 = 0x4E
-0x0148 = 0x6E
-0x0149 = 0x6E27
-0x014C = 0x4F
-0x014D = 0x6F
-0x014E = 0x4F
-0x014F = 0x6F
-0x0150 = 0x4F22
-0x0151 = 0x6F22
-0x0152 = 0x454F
-0x0153 = 0x656F
-0x0154 = 0x5227
-0x0155 = 0x7227
-0x0156 = 0x52
-0x0157 = 0x72
-0x0158 = 0x52
-0x0159 = 0x72
-0x015A = 0x5327
-0x015B = 0x7327
-0x015C = 0x535E
-0x015D = 0x735E
-0x015E = 0x53
-0x015F = 0x73
-0x0160 = 0x53
-0x0161 = 0x73
-0x0162 = 0x54
-0x0163 = 0x74
-0x0164 = 0x54
-0x0165 = 0x74
-0x0166 = 0x54
-0x0167 = 0x74
-0x016A = 0x55
-0x016B = 0x75
-0x016C = 0x55
-0x016D = 0x75
-0x016E = 0x55
-0x016F = 0x75
-0x0170 = 0x5522
-0x0171 = 0x7522
-0x0172 = 0x55
-0x0173 = 0x75
-0x0174 = 0x575E
-0x0175 = 0x775E
-0x0176 = 0x595E
-0x0177 = 0x795E
-0x0178 = 0x5922
-0x0179 = 0x5A27
-0x017A = 0x7A27
-0x017B = 0x5A
-0x017C = 0x7A
-0x017D = 0x5A
-0x017E = 0x7A
-0x017F = 0x73
-0x0192 = 0x66
-0x01C4 = 0x5A44
-0x01C5 = 0x7A44
-0x01C6 = 0x7A64
-0x01C7 = 0x4A4C
-0x01C8 = 0x6A4C
-0x01C9 = 0x6A6C
-0x01CA = 0x4A4E
-0x01CB = 0x6A4E
-0x01CC = 0x6A6E
-0x01F1 = 0x5A44
-0x01F2 = 0x7A44
-0x01F3 = 0x7A64
-0x0218 = 0x53
-0x0219 = 0x73
-0x021A = 0x54
-0x021B = 0x74
-0x02B9 = 0x27
-0x02BA = 0x2727
-0x02BB = 0x27
-0x02BC = 0x27
-0x02BD = 0x27
-0x02C6 = 0x5E
-0x02C8 = 0x27
-0x02CA = 0x27
-0x02CB = 0x60
-0x02CD = 0x5F
-0x02DD = 0x22
-0x1E02 = 0x42
-0x1E03 = 0x62
-0x1E0A = 0x44
-0x1E0B = 0x64
-0x1E1E = 0x46
-0x1E1F = 0x66
-0x1E40 = 0x4D
-0x1E41 = 0x6D
-0x1E56 = 0x50
-0x1E57 = 0x70
-0x1E60 = 0x53
-0x1E61 = 0x73
-0x1E6A = 0x54
-0x1E6B = 0x74
-0x1E80 = 0x5760
-0x1E81 = 0x7760
-0x1E82 = 0x5727
-0x1E83 = 0x7727
-0x1E84 = 0x5722
-0x1E85 = 0x7722
-0x1EF2 = 0x5960
-0x1EF3 = 0x7960
-0x2002 = 0x20
-0x2003 = 0x20
-0x2004 = 0x20
-0x2005 = 0x20
-0x2006 = 0x20
-0x2008 = 0x20
-0x2009 = 0x20
-0x200A = 0x20
-0x2010 = 0x2D
-0x2011 = 0x2D
-0x2012 = 0x2D
-0x2013 = 0x2D
-0x2014 = 0x2D
-0x2015 = 0x2D
-0x2018 = 0x27
-0x2019 = 0x27
-0x201A = 0x27
-0x201B = 0x27
-0x201C = 0x22
-0x201D = 0x22
-0x201E = 0x22
-0x201F = 0x22
-0x2020 = 0x2B
-0x2022 = 0x6F
-0x2024 = 0x2E
-0x2025 = 0x2E2E
-0x2026 = 0x2E2E2E
-0x2030 = 0x6F6F2F6F
-0x2032 = 0x27
-0x2033 = 0x2727
-0x2034 = 0x272727
-0x2039 = 0x3C
-0x203A = 0x3E
-0x203C = 0x2121
-0x203E = 0x7E
-0x2044 = 0x2F
-0x2047 = 0x3F3F
-0x2048 = 0x213F
-0x2049 = 0x3F21
-0x2057 = 0x27272727
-0x20A8 = 0x7352
-0x20AC = 0x525545
-0x2100 = 0x632F61
-0x2101 = 0x732F61
-0x2102 = 0x43
-0x2103 = 0x43305E
-0x2105 = 0x6F2F63
-0x2106 = 0x752F63
-0x2109 = 0x46305E
-0x210A = 0x67
-0x210B = 0x48
-0x210C = 0x48
-0x210D = 0x48
-0x210E = 0x68
-0x210F = 0x68
-0x2110 = 0x49
-0x2111 = 0x49
-0x2112 = 0x4C
-0x2113 = 0x6C
-0x2115 = 0x4E
-0x2116 = 0x6F4E
-0x2119 = 0x50
-0x211A = 0x51
-0x211B = 0x52
-0x211C = 0x52
-0x211D = 0x52
-0x2121 = 0x4C4554
-0x2122 = 0x4D54
-0x2124 = 0x5A
-0x2126 = 0x6D684F
-0x2128 = 0x5A
-0x212C = 0x42
-0x212D = 0x43
-0x212E = 0x65
-0x212F = 0x65
-0x2130 = 0x45
-0x2131 = 0x46
-0x2133 = 0x4D
-0x2134 = 0x6F
-0x2139 = 0x69
-0x213B = 0x584146
-0x2145 = 0x44
-0x2146 = 0x64
-0x2147 = 0x65
-0x2148 = 0x69
-0x2149 = 0x6A
-0x215F = 0x2F3120
-0x2160 = 0x49
-0x2161 = 0x4949
-0x2162 = 0x494949
-0x2163 = 0x5649
-0x2164 = 0x56
-0x2165 = 0x4956
-0x2166 = 0x494956
-0x2167 = 0x49494956
-0x2168 = 0x5849
-0x2169 = 0x58
-0x216A = 0x4958
-0x216B = 0x494958
-0x216C = 0x4C
-0x216D = 0x43
-0x216E = 0x44
-0x216F = 0x4D
-0x2170 = 0x69
-0x2171 = 0x6969
-0x2172 = 0x696969
-0x2173 = 0x7669
-0x2174 = 0x76
-0x2175 = 0x6976
-0x2176 = 0x696976
-0x2177 = 0x69696976
-0x2178 = 0x7869
-0x2179 = 0x78
-0x217A = 0x6978
-0x217B = 0x696978
-0x217C = 0x6C
-0x217D = 0x63
-0x217E = 0x64
-0x217F = 0x6D
-0x2190 = 0x2D3C
-0x2191 = 0x5E
-0x2192 = 0x3E2D
-0x2193 = 0x56
-0x2194 = 0x3E2D3C
-0x21D0 = 0x3D3C
-0x21D2 = 0x3E3D
-0x21D4 = 0x3E3D3C
-0x2212 = 0x2D
-0x2215 = 0x2F
-0x2217 = 0x2A
-0x2219 = 0x6F
-0x2223 = 0x7C
-0x2236 = 0x3A
-0x2260 = 0x3D2F
-0x2264 = 0x3D3C
-0x2265 = 0x3D3E
-0x226A = 0x3C3C
-0x226B = 0x3E3E
-0x22C5 = 0x2E
-0x22D8 = 0x3C3C3C
-0x22D9 = 0x3E3E3E
-0x22EF = 0x2E2E2E
-0x2408 = 0x5D53425B
-0x2409 = 0x5D54485B
-0x240A = 0x5D464C5B
-0x240B = 0x5D54565B
-0x240C = 0x5D46465B
-0x240D = 0x5D52435B
-0x240E = 0x5D4F535B
-0x240F = 0x5D49535B
-0x2419 = 0x5D4D455B
-0x241C = 0x5D53465B
-0x241D = 0x5D53475B
-0x241E = 0x5D53525B
-0x241F = 0x5D53555B
-0x2420 = 0x5D50535B
-0x2424 = 0x5D4C4E5B
-0x2460 = 0x293128
-0x2461 = 0x293228
-0x2462 = 0x293328
-0x2463 = 0x293428
-0x2464 = 0x293528
-0x2465 = 0x293628
-0x2466 = 0x293728
-0x2467 = 0x293828
-0x2468 = 0x293928
-0x2469 = 0x29303128
-0x246A = 0x29313128
-0x246B = 0x29323128
-0x246C = 0x29333128
-0x246D = 0x29343128
-0x246E = 0x29353128
-0x246F = 0x29363128
-0x2470 = 0x29373128
-0x2471 = 0x29383128
-0x2472 = 0x29393128
-0x2473 = 0x29303228
-0x2474 = 0x293128
-0x2475 = 0x293228
-0x2476 = 0x293328
-0x2477 = 0x293428
-0x2478 = 0x293528
-0x2479 = 0x293628
-0x247A = 0x293728
-0x247B = 0x293828
-0x247C = 0x293928
-0x247D = 0x29303128
-0x247E = 0x29313128
-0x247F = 0x29323128
-0x2480 = 0x29333128
-0x2481 = 0x29343128
-0x2482 = 0x29353128
-0x2483 = 0x29363128
-0x2484 = 0x29373128
-0x2485 = 0x29383128
-0x2486 = 0x29393128
-0x2487 = 0x29303228
-0x2488 = 0x2E31
-0x2489 = 0x2E32
-0x248A = 0x2E33
-0x248B = 0x2E34
-0x248C = 0x2E35
-0x248D = 0x2E36
-0x248E = 0x2E37
-0x248F = 0x2E38
-0x2490 = 0x2E39
-0x2491 = 0x2E3031
-0x2492 = 0x2E3131
-0x2493 = 0x2E3231
-0x2494 = 0x2E3331
-0x2495 = 0x2E3431
-0x2496 = 0x2E3531
-0x2497 = 0x2E3631
-0x2498 = 0x2E3731
-0x2499 = 0x2E3831
-0x249A = 0x2E3931
-0x249B = 0x2E3032
-0x249C = 0x296128
-0x249D = 0x296228
-0x249E = 0x296328
-0x249F = 0x296428
-0x24A0 = 0x296528
-0x24A1 = 0x296628
-0x24A2 = 0x296728
-0x24A3 = 0x296828
-0x24A4 = 0x296928
-0x24A5 = 0x296A28
-0x24A6 = 0x296B28
-0x24A7 = 0x296C28
-0x24A8 = 0x296D28
-0x24A9 = 0x296E28
-0x24AA = 0x296F28
-0x24AB = 0x297028
-0x24AC = 0x297128
-0x24AD = 0x297228
-0x24AE = 0x297328
-0x24AF = 0x297428
-0x24B0 = 0x297528
-0x24B1 = 0x297628
-0x24B2 = 0x297728
-0x24B3 = 0x297828
-0x24B4 = 0x297928
-0x24B5 = 0x297A28
-0x24B6 = 0x294128
-0x24B7 = 0x294228
-0x24B8 = 0x294328
-0x24B9 = 0x294428
-0x24BA = 0x294528
-0x24BB = 0x294628
-0x24BC = 0x294728
-0x24BD = 0x294828
-0x24BE = 0x294928
-0x24BF = 0x294A28
-0x24C0 = 0x294B28
-0x24C1 = 0x294C28
-0x24C2 = 0x294D28
-0x24C3 = 0x294E28
-0x24C4 = 0x294F28
-0x24C5 = 0x295028
-0x24C6 = 0x295128
-0x24C7 = 0x295228
-0x24C8 = 0x295328
-0x24C9 = 0x295428
-0x24CA = 0x295528
-0x24CB = 0x295628
-0x24CC = 0x295728
-0x24CD = 0x295828
-0x24CE = 0x295928
-0x24CF = 0x295A28
-0x24D0 = 0x296128
-0x24D1 = 0x296228
-0x24D2 = 0x296328
-0x24D3 = 0x296428
-0x24D4 = 0x296528
-0x24D5 = 0x296628
-0x24D6 = 0x296728
-0x24D7 = 0x296828
-0x24D8 = 0x296928
-0x24D9 = 0x296A28
-0x24DA = 0x296B28
-0x24DB = 0x296C28
-0x24DC = 0x296D28
-0x24DD = 0x296E28
-0x24DE = 0x296F28
-0x24DF = 0x297028
-0x24E0 = 0x297128
-0x24E1 = 0x297228
-0x24E2 = 0x297328
-0x24E3 = 0x297428
-0x24E4 = 0x297528
-0x24E5 = 0x297628
-0x24E6 = 0x297728
-0x24E7 = 0x297828
-0x24E8 = 0x297928
-0x24E9 = 0x297A28
-0x24EA = 0x293028
-0x2500 = 0x2D
-0x2502 = 0x7C
-0x250C = 0x2B
-0x2510 = 0x2B
-0x2514 = 0x2B
-0x2518 = 0x2B
-0x251C = 0x2B
-0x2524 = 0x2B
-0x252C = 0x2B
-0x2534 = 0x2B
-0x253C = 0x2B
-0x25E6 = 0x6F
-0x2A74 = 0x3D3A3A
-0x2A75 = 0x3D3D
-0x2A76 = 0x3D3D3D
-0x3000 = 0x20
-0x30A0 = 0x3D
-0x3250 = 0x455450
-0x3251 = 0x29313228
-0x3252 = 0x29323228
-0x3253 = 0x29333228
-0x3254 = 0x29343228
-0x3255 = 0x29353228
-0x3256 = 0x29363228
-0x3257 = 0x29373228
-0x3258 = 0x29383228
-0x3259 = 0x29393228
-0x325A = 0x29303328
-0x325B = 0x29313328
-0x325C = 0x29323328
-0x325D = 0x29333328
-0x325E = 0x29343328
-0x325F = 0x29353328
-0x32B1 = 0x29363328
-0x32B2 = 0x29373328
-0x32B3 = 0x29383328
-0x32B4 = 0x29393328
-0x32B5 = 0x29303428
-0x32B6 = 0x29313428
-0x32B7 = 0x29323428
-0x32B8 = 0x29333428
-0x32B9 = 0x29343428
-0x32BA = 0x29353428
-0x32BB = 0x29363428
-0x32BC = 0x29373428
-0x32BD = 0x29383428
-0x32BE = 0x29393428
-0x32BF = 0x29303528
-0x32CC = 0x6748
-0x32CD = 0x677265
-0x32CE = 0x5665
-0x32CF = 0x44544C
-0x3371 = 0x615068
-0x3372 = 0x6164
-0x3373 = 0x5541
-0x3374 = 0x726162
-0x3375 = 0x566F
-0x3376 = 0x6370
-0x3377 = 0x6D64
-0x3378 = 0x325E6D64
-0x3379 = 0x335E6D64
-0x337A = 0x5549
-0x3380 = 0x4170
-0x3381 = 0x416E
-0x3383 = 0x416D
-0x3384 = 0x416B
-0x3385 = 0x424B
-0x3386 = 0x424D
-0x3387 = 0x4247
-0x3388 = 0x6C6163
-0x3389 = 0x6C61636B
-0x338A = 0x4670
-0x338B = 0x466E
-0x338E = 0x676D
-0x338F = 0x676B
-0x3390 = 0x7A48
-0x3391 = 0x7A486B
-0x3392 = 0x7A484D
-0x3393 = 0x7A4847
-0x3394 = 0x7A4854
-0x3396 = 0x6C6D
-0x3397 = 0x6C64
-0x3398 = 0x6C6B
-0x3399 = 0x6D66
-0x339A = 0x6D6E
-0x339C = 0x6D6D
-0x339D = 0x6D63
-0x339E = 0x6D6B
-0x339F = 0x325E6D6D
-0x33A0 = 0x325E6D63
-0x33A1 = 0x325E6D
-0x33A2 = 0x325E6D6B
-0x33A3 = 0x335E6D6D
-0x33A4 = 0x335E6D63
-0x33A5 = 0x335E6D
-0x33A6 = 0x335E6D6B
-0x33A7 = 0x732F6D
-0x33A9 = 0x6150
-0x33AA = 0x61506B
-0x33AB = 0x61504D
-0x33AC = 0x615047
-0x33AD = 0x646172
-0x33B0 = 0x7370
-0x33B1 = 0x736E
-0x33B3 = 0x736D
-0x33B4 = 0x5670
-0x33B5 = 0x566E
-0x33B7 = 0x566D
-0x33B8 = 0x566B
-0x33B9 = 0x564D
-0x33BA = 0x5770
-0x33BB = 0x576E
-0x33BD = 0x576D
-0x33BE = 0x576B
-0x33BF = 0x574D
-0x33C2 = 0x2E6D2E61
-0x33C3 = 0x7142
-0x33C4 = 0x6363
-0x33C5 = 0x6463
-0x33C6 = 0x676B2F43
-0x33C7 = 0x2E6F43
-0x33C8 = 0x4264
-0x33C9 = 0x7947
-0x33CA = 0x6168
-0x33CB = 0x5048
-0x33CC = 0x6E69
-0x33CD = 0x4B4B
-0x33CE = 0x4D4B
-0x33CF = 0x746B
-0x33D0 = 0x6D6C
-0x33D1 = 0x6E6C
-0x33D2 = 0x676F6C
-0x33D3 = 0x786C
-0x33D4 = 0x626D
-0x33D5 = 0x6C696D
-0x33D6 = 0x6C6F6D
-0x33D7 = 0x4850
-0x33D8 = 0x2E6D2E70
-0x33D9 = 0x4D5050
-0x33DA = 0x5250
-0x33DB = 0x7273
-0x33DC = 0x7653
-0x33DD = 0x6257
-0x33DE = 0x6D2F56
-0x33DF = 0x6D2F41
-0x33FF = 0x6C6167
-0xFB00 = 0x6666
-0xFB01 = 0x6966
-0xFB02 = 0x6C66
-0xFB03 = 0x696666
-0xFB04 = 0x6C6666
-0xFB05 = 0x7473
-0xFB06 = 0x7473
-0xFB29 = 0x2B
-0xFE49 = 0x7E
-0xFE4A = 0x7E
-0xFE4B = 0x7E
-0xFE4C = 0x7E
-0xFE4D = 0x5F
-0xFE4E = 0x5F
-0xFE4F = 0x5F
-0xFE50 = 0x2C
-0xFE52 = 0x2E
-0xFE54 = 0x3B
-0xFE55 = 0x3A
-0xFE56 = 0x3F
-0xFE57 = 0x21
-0xFE58 = 0x2D
-0xFE59 = 0x28
-0xFE5A = 0x29
-0xFE5B = 0x7B
-0xFE5C = 0x7D
-0xFE5F = 0x23
-0xFE60 = 0x26
-0xFE61 = 0x2A
-0xFE62 = 0x2B
-0xFE63 = 0x2D
-0xFE64 = 0x3C
-0xFE65 = 0x3E
-0xFE66 = 0x3D
-0xFE69 = 0x24
-0xFE6A = 0x25
-0xFE6B = 0x40
-0xFF01 = 0x21
-0xFF02 = 0x22
-0xFF03 = 0x23
-0xFF04 = 0x24
-0xFF05 = 0x25
-0xFF06 = 0x26
-0xFF07 = 0x27
-0xFF08 = 0x28
-0xFF09 = 0x29
-0xFF0A = 0x2A
-0xFF0B = 0x2B
-0xFF0C = 0x2C
-0xFF0D = 0x2D
-0xFF0E = 0x2E
-0xFF0F = 0x2F
-0xFF10 = 0x30
-0xFF11 = 0x31
-0xFF12 = 0x32
-0xFF13 = 0x33
-0xFF14 = 0x34
-0xFF15 = 0x35
-0xFF16 = 0x36
-0xFF17 = 0x37
-0xFF18 = 0x38
-0xFF19 = 0x39
-0xFF1A = 0x3A
-0xFF1B = 0x3B
-0xFF1C = 0x3C
-0xFF1D = 0x3D
-0xFF1E = 0x3E
-0xFF1F = 0x3F
-0xFF20 = 0x40
-0xFF21 = 0x41
-0xFF22 = 0x42
-0xFF23 = 0x43
-0xFF24 = 0x44
-0xFF25 = 0x45
-0xFF26 = 0x46
-0xFF27 = 0x47
-0xFF28 = 0x48
-0xFF29 = 0x49
-0xFF2A = 0x4A
-0xFF2B = 0x4B
-0xFF2C = 0x4C
-0xFF2D = 0x4D
-0xFF2E = 0x4E
-0xFF2F = 0x4F
-0xFF30 = 0x50
-0xFF31 = 0x51
-0xFF32 = 0x52
-0xFF33 = 0x53
-0xFF34 = 0x54
-0xFF35 = 0x55
-0xFF36 = 0x56
-0xFF37 = 0x57
-0xFF38 = 0x58
-0xFF39 = 0x59
-0xFF3A = 0x5A
-0xFF3B = 0x5B
-0xFF3D = 0x5D
-0xFF3E = 0x5E
-0xFF3F = 0x5F
-0xFF40 = 0x60
-0xFF41 = 0x61
-0xFF42 = 0x62
-0xFF43 = 0x63
-0xFF44 = 0x64
-0xFF45 = 0x65
-0xFF46 = 0x66
-0xFF47 = 0x67
-0xFF48 = 0x68
-0xFF49 = 0x69
-0xFF4A = 0x6A
-0xFF4B = 0x6B
-0xFF4C = 0x6C
-0xFF4D = 0x6D
-0xFF4E = 0x6E
-0xFF4F = 0x6F
-0xFF50 = 0x70
-0xFF51 = 0x71
-0xFF52 = 0x72
-0xFF53 = 0x73
-0xFF54 = 0x74
-0xFF55 = 0x75
-0xFF56 = 0x76
-0xFF57 = 0x77
-0xFF58 = 0x78
-0xFF59 = 0x79
-0xFF5A = 0x7A
-0xFF5B = 0x7B
-0xFF5C = 0x7C
-0xFF5D = 0x7D
 0xFF61 = 0x21
-0xFF61 = 0xA1
 0xFF62 = 0x22
-0xFF62 = 0xA2
 0xFF63 = 0x23
-0xFF63 = 0xA3
 0xFF64 = 0x24
-0xFF64 = 0xA4
 0xFF65 = 0x25
-0xFF65 = 0xA5
 0xFF66 = 0x26
-0xFF66 = 0xA6
 0xFF67 = 0x27
-0xFF67 = 0xA7
 0xFF68 = 0x28
-0xFF68 = 0xA8
 0xFF69 = 0x29
-0xFF69 = 0xA9
 0xFF6A = 0x2A
-0xFF6A = 0xAA
 0xFF6B = 0x2B
-0xFF6B = 0xAB
 0xFF6C = 0x2C
-0xFF6C = 0xAC
 0xFF6D = 0x2D
-0xFF6D = 0xAD
 0xFF6E = 0x2E
-0xFF6E = 0xAE
 0xFF6F = 0x2F
-0xFF6F = 0xAF
 0xFF70 = 0x30
-0xFF70 = 0xB0
 0xFF71 = 0x31
-0xFF71 = 0xB1
 0xFF72 = 0x32
-0xFF72 = 0xB2
 0xFF73 = 0x33
-0xFF73 = 0xB3
 0xFF74 = 0x34
-0xFF74 = 0xB4
 0xFF75 = 0x35
-0xFF75 = 0xB5
 0xFF76 = 0x36
-0xFF76 = 0xB6
 0xFF77 = 0x37
-0xFF77 = 0xB7
 0xFF78 = 0x38
-0xFF78 = 0xB8
 0xFF79 = 0x39
-0xFF79 = 0xB9
 0xFF7A = 0x3A
-0xFF7A = 0xBA
 0xFF7B = 0x3B
-0xFF7B = 0xBB
 0xFF7C = 0x3C
-0xFF7C = 0xBC
 0xFF7D = 0x3D
-0xFF7D = 0xBD
 0xFF7E = 0x3E
-0xFF7E = 0xBE
 0xFF7F = 0x3F
-0xFF7F = 0xBF
 0xFF80 = 0x40
-0xFF80 = 0xC0
 0xFF81 = 0x41
-0xFF81 = 0xC1
 0xFF82 = 0x42
-0xFF82 = 0xC2
 0xFF83 = 0x43
-0xFF83 = 0xC3
 0xFF84 = 0x44
-0xFF84 = 0xC4
 0xFF85 = 0x45
-0xFF85 = 0xC5
 0xFF86 = 0x46
-0xFF86 = 0xC6
 0xFF87 = 0x47
-0xFF87 = 0xC7
 0xFF88 = 0x48
-0xFF88 = 0xC8
 0xFF89 = 0x49
-0xFF89 = 0xC9
 0xFF8A = 0x4A
-0xFF8A = 0xCA
 0xFF8B = 0x4B
-0xFF8B = 0xCB
 0xFF8C = 0x4C
-0xFF8C = 0xCC
 0xFF8D = 0x4D
-0xFF8D = 0xCD
 0xFF8E = 0x4E
-0xFF8E = 0xCE
 0xFF8F = 0x4F
-0xFF8F = 0xCF
 0xFF90 = 0x50
-0xFF90 = 0xD0
 0xFF91 = 0x51
-0xFF91 = 0xD1
 0xFF92 = 0x52
-0xFF92 = 0xD2
 0xFF93 = 0x53
-0xFF93 = 0xD3
 0xFF94 = 0x54
-0xFF94 = 0xD4
 0xFF95 = 0x55
-0xFF95 = 0xD5
 0xFF96 = 0x56
-0xFF96 = 0xD6
 0xFF97 = 0x57
-0xFF97 = 0xD7
 0xFF98 = 0x58
-0xFF98 = 0xD8
 0xFF99 = 0x59
-0xFF99 = 0xD9
 0xFF9A = 0x5A
-0xFF9A = 0xDA
 0xFF9B = 0x5B
-0xFF9B = 0xDB
 0xFF9C = 0x5C
-0xFF9C = 0xDC
 0xFF9D = 0x5D
-0xFF9D = 0xDD
 0xFF9E = 0x5E
-0xFF9E = 0xDE
 0xFF9F = 0x5F
-0xFF9F = 0xDF
-0xFFE0 = 0x63
-0xFFE1 = 0x626C
-0xFFE2 = 0x746F6E
-0xFFE4 = 0x7C
-0xFFE5 = 0x5C
-0xFFE8 = 0x7C
-0xFFE9 = 0x2D3C
-0xFFEA = 0x5E
-0xFFEB = 0x3E2D
-0xFFEC = 0x56
 END_MAP
diff --git a/share/i18n/csmapper/JIS/UCS%JISX0208@1990.src b/share/i18n/csmapper/JIS/UCS%JISX0208@1990.src
index f30b32977c1..16cd55a9b82 100644
--- a/share/i18n/csmapper/JIS/UCS%JISX0208@1990.src
+++ b/share/i18n/csmapper/JIS/UCS%JISX0208@1990.src
@@ -3,10 +3,10 @@
 
 TYPE		ROWCOL
 NAME		"UCS/JISX0208:1990"
-SRC_ZONE	0x005C - 0xFFEE
+SRC_ZONE	0x005C - 0xFFE5
 OOB_MODE	INVALID
 DST_INVALID	0xFFFF
-DST_UNIT_BITS	32
+DST_UNIT_BITS	16
 
 BEGIN_MAP
 #
@@ -6970,7469 +6970,4 @@ BEGIN_MAP
 0xFF5D = 0x2151
 0xFFE3 = 0x2131
 0xFFE5 = 0x216F
-0x00A2 = 0x7121
-0x00A3 = 0x7221
-0x00A7 = 0x7821
-0x00A8 = 0x2F21
-0x00AC = 0x4C22
-0x00B0 = 0x6B21
-0x00B1 = 0x5E21
-0x00B4 = 0x2D21
-0x00B6 = 0x7922
-0x00D7 = 0x5F21
-0x00F7 = 0x6021
-0x02B9 = 0x6C21
-0x02BA = 0x6D21
-0x02BB = 0x4621
-0x02BC = 0x4721
-0x02CA = 0x2D21
-0x0391 = 0x2126
-0x0392 = 0x2226
-0x0393 = 0x2326
-0x0394 = 0x2426
-0x0395 = 0x2526
-0x0397 = 0x2726
-0x0398 = 0x2826
-0x0399 = 0x2926
-0x039A = 0x2A26
-0x039B = 0x2B26
-0x039C = 0x2C26
-0x039D = 0x2D26
-0x039E = 0x2E26
-0x039F = 0x2F26
-0x03A0 = 0x3026
-0x03A1 = 0x3126
-0x03A3 = 0x3226
-0x03A4 = 0x3326
-0x03A5 = 0x3426
-0x03A6 = 0x3526
-0x03A7 = 0x3626
-0x03A8 = 0x3726
-0x03A9 = 0x3826
-0x03B1 = 0x4126
-0x03B2 = 0x4226
-0x03B3 = 0x4326
-0x03B4 = 0x4426
-0x03B5 = 0x4526
-0x03B6 = 0x4626
-0x03B7 = 0x4726
-0x03B8 = 0x4826
-0x03B9 = 0x4926
-0x03BA = 0x4A26
-0x03BB = 0x4B26
-0x03BC = 0x4C26
-0x03BD = 0x4D26
-0x03BE = 0x4E26
-0x03BF = 0x4F26
-0x03C0 = 0x5026
-0x03C1 = 0x5126
-0x03C3 = 0x5226
-0x03C4 = 0x5326
-0x03C5 = 0x5426
-0x03C6 = 0x5526
-0x03C7 = 0x5626
-0x03C8 = 0x5726
-0x03C9 = 0x5826
-0x03D0 = 0x4226
-0x03D1 = 0x4826
-0x03D2 = 0x3426
-0x03D5 = 0x5526
-0x03D6 = 0x5026
-0x03F0 = 0x4A26
-0x03F1 = 0x5126
-0x03F4 = 0x2826
-0x03F5 = 0x4526
-0x03F9 = 0x3226
-0x0410 = 0x2127
-0x0411 = 0x2227
-0x0412 = 0x2327
-0x0413 = 0x2427
-0x0414 = 0x2527
-0x0415 = 0x2627
-0x0416 = 0x2827
-0x0417 = 0x2927
-0x0418 = 0x2A27
-0x0419 = 0x2B27
-0x041A = 0x2C27
-0x041B = 0x2D27
-0x041C = 0x2E27
-0x041D = 0x2F27
-0x041E = 0x3027
-0x041F = 0x3127
-0x0420 = 0x3227
-0x0421 = 0x3327
-0x0422 = 0x3427
-0x0423 = 0x3527
-0x0424 = 0x3627
-0x0425 = 0x3727
-0x0426 = 0x3827
-0x0427 = 0x3927
-0x0428 = 0x3A27
-0x0429 = 0x3B27
-0x042A = 0x3C27
-0x042B = 0x3D27
-0x042C = 0x3E27
-0x042D = 0x3F27
-0x042E = 0x4027
-0x042F = 0x4127
-0x0430 = 0x5127
-0x0431 = 0x5227
-0x0432 = 0x5327
-0x0433 = 0x5427
-0x0434 = 0x5527
-0x0435 = 0x5627
-0x0436 = 0x5827
-0x0437 = 0x5927
-0x0438 = 0x5A27
-0x0439 = 0x5B27
-0x043A = 0x5C27
-0x043B = 0x5D27
-0x043C = 0x5E27
-0x043D = 0x5F27
-0x043E = 0x6027
-0x043F = 0x6127
-0x0440 = 0x6227
-0x0441 = 0x6327
-0x0442 = 0x6427
-0x0443 = 0x6527
-0x0444 = 0x6627
-0x0445 = 0x6727
-0x0446 = 0x6827
-0x0447 = 0x6927
-0x0448 = 0x6A27
-0x0449 = 0x6B27
-0x044A = 0x6C27
-0x044B = 0x6D27
-0x044C = 0x6E27
-0x044D = 0x6F27
-0x044E = 0x7027
-0x044F = 0x7127
-0x0451 = 0x5727
-0x2010 = 0x3E21
-0x2015 = 0x3D21
-0x2016 = 0x4221
-0x2018 = 0x4621
-0x2019 = 0x4721
-0x201A = 0x4621
-0x201C = 0x4821
-0x201D = 0x4921
-0x2020 = 0x7722
-0x2021 = 0x7822
-0x2025 = 0x4521
-0x2026 = 0x4421
-0x2030 = 0x7322
-0x2032 = 0x6C21
-0x2033 = 0x6D21
-0x203B = 0x2822
-0x2103 = 0x6E21
-0x212B = 0x7222
-0x213D = 0x4326
-0x213E = 0x2326
-0x213F = 0x3026
-0x2190 = 0x2B22
-0x2191 = 0x2C22
-0x2192 = 0x2A22
-0x2193 = 0x2D22
-0x21D2 = 0x4D22
-0x21D4 = 0x4E22
-0x2200 = 0x4F22
-0x2202 = 0x5F22
-0x2203 = 0x5022
-0x2207 = 0x6022
-0x2208 = 0x3A22
-0x220B = 0x3B22
-0x2212 = 0x5D21
-0x221A = 0x6522
-0x221D = 0x6722
-0x221E = 0x6721
-0x2220 = 0x5C22
-0x2227 = 0x4A22
-0x2228 = 0x4B22
-0x2229 = 0x4122
-0x222A = 0x4022
-0x222B = 0x6922
-0x222C = 0x6A22
-0x2234 = 0x6821
-0x2235 = 0x6822
-0x223D = 0x6622
-0x2252 = 0x6222
-0x2260 = 0x6221
-0x2261 = 0x6122
-0x2266 = 0x6521
-0x2267 = 0x6621
-0x226A = 0x6322
-0x226B = 0x6422
-0x2282 = 0x3E22
-0x2283 = 0x3F22
-0x2286 = 0x3C22
-0x2287 = 0x3D22
-0x22A5 = 0x5D22
-0x2312 = 0x5E22
-0x2500 = 0x2128
-0x2501 = 0x2C28
-0x2502 = 0x2228
-0x2503 = 0x2D28
-0x250C = 0x2328
-0x250F = 0x2E28
-0x2510 = 0x2428
-0x2513 = 0x2F28
-0x2514 = 0x2628
-0x2517 = 0x3128
-0x2518 = 0x2528
-0x251B = 0x3028
-0x251C = 0x2728
-0x251D = 0x3C28
-0x2520 = 0x3728
-0x2523 = 0x3228
-0x2524 = 0x2928
-0x2525 = 0x3E28
-0x2528 = 0x3928
-0x252B = 0x3428
-0x252F = 0x3828
-0x2530 = 0x3D28
-0x2533 = 0x3328
-0x2534 = 0x2A28
-0x2537 = 0x3A28
-0x2538 = 0x3F28
-0x253B = 0x3528
-0x253C = 0x2B28
-0x253F = 0x3B28
-0x2542 = 0x4028
-0x254B = 0x3628
-0x25A0 = 0x2322
-0x25B2 = 0x2522
-0x25B3 = 0x2422
-0x25BC = 0x2722
-0x25BD = 0x2622
-0x25C6 = 0x2122
-0x25C7 = 0x7E21
-0x25CB = 0x7B21
-0x25CE = 0x7D21
-0x25CF = 0x7C21
-0x25EF = 0x7E22
-0x2605 = 0x7A21
-0x2606 = 0x7921
-0x2640 = 0x6A21
-0x2642 = 0x6921
-0x266A = 0x7622
-0x266D = 0x7522
-0x266F = 0x7422
-0x2E9F = 0x6C4A
-0x2F00 = 0x6C30
-0x2F02 = 0x2650
-0x2F03 = 0x2850
-0x2F04 = 0x3532
-0x2F05 = 0x2D50
-0x2F06 = 0x7346
-0x2F07 = 0x3550
-0x2F08 = 0x4D3F
-0x2F09 = 0x3951
-0x2F0A = 0x7E46
-0x2F0B = 0x2C48
-0x2F0C = 0x4451
-0x2F0D = 0x4C51
-0x2F0E = 0x5251
-0x2F0F = 0x5C51
-0x2F10 = 0x6151
-0x2F11 = 0x6145
-0x2F12 = 0x4F4E
-0x2F13 = 0x3152
-0x2F14 = 0x3852
-0x2F15 = 0x3952
-0x2F16 = 0x3E52
-0x2F17 = 0x3D3D
-0x2F18 = 0x4E4B
-0x2F19 = 0x4752
-0x2F1A = 0x4C52
-0x2F1B = 0x5352
-0x2F1C = 0x744B
-0x2F1D = 0x7D38
-0x2F1E = 0x7853
-0x2F1F = 0x5A45
-0x2F20 = 0x4E3B
-0x2F21 = 0x6954
-0x2F22 = 0x6A54
-0x2F23 = 0x3C4D
-0x2F24 = 0x6742
-0x2F25 = 0x773D
-0x2F26 = 0x523B
-0x2F27 = 0x5F55
-0x2F28 = 0x2340
-0x2F29 = 0x2E3E
-0x2F2A = 0x7755
-0x2F2B = 0x7955
-0x2F2C = 0x2556
-0x2F2D = 0x333B
-0x2F2E = 0x5F56
-0x2F2F = 0x2939
-0x2F30 = 0x4A38
-0x2F31 = 0x5236
-0x2F32 = 0x3334
-0x2F33 = 0x7656
-0x2F34 = 0x7856
-0x2F35 = 0x2E57
-0x2F36 = 0x3057
-0x2F37 = 0x3557
-0x2F38 = 0x5D35
-0x2F3A = 0x4457
-0x2F3B = 0x4657
-0x2F3C = 0x343F
-0x2F3D = 0x7958
-0x2F3F = 0x6A3C
-0x2F40 = 0x593B
-0x2F41 = 0x3D5A
-0x2F42 = 0x384A
-0x2F43 = 0x4D45
-0x2F44 = 0x5436
-0x2F45 = 0x7D4A
-0x2F46 = 0x5B5A
-0x2F47 = 0x7C46
-0x2F48 = 0x295B
-0x2F49 = 0x6E37
-0x2F4A = 0x5A4C
-0x2F4B = 0x6737
-0x2F4C = 0x5F3B
-0x2F4D = 0x465D
-0x2F4E = 0x555D
-0x2F4F = 0x595D
-0x2F50 = 0x6648
-0x2F51 = 0x534C
-0x2F52 = 0x613B
-0x2F53 = 0x635D
-0x2F54 = 0x653F
-0x2F55 = 0x5032
-0x2F56 = 0x5E44
-0x2F57 = 0x6349
-0x2F58 = 0x2B60
-0x2F59 = 0x2D60
-0x2F5A = 0x524A
-0x2F5B = 0x6732
-0x2F5C = 0x6D35
-0x2F5D = 0x2438
-0x2F5E = 0x3C38
-0x2F5F = 0x4C36
-0x2F60 = 0x3B31
-0x2F61 = 0x2434
-0x2F62 = 0x4534
-0x2F63 = 0x3840
-0x2F64 = 0x514D
-0x2F65 = 0x4445
-0x2F66 = 0x2549
-0x2F68 = 0x2262
-0x2F69 = 0x7247
-0x2F6A = 0x6948
-0x2F6B = 0x2E3B
-0x2F6C = 0x5C4C
-0x2F6D = 0x374C
-0x2F6E = 0x704C
-0x2F6F = 0x5040
-0x2F70 = 0x283C
-0x2F72 = 0x5332
-0x2F73 = 0x6A37
-0x2F74 = 0x294E
-0x2F75 = 0x5D43
-0x2F76 = 0x464A
-0x2F77 = 0x653B
-0x2F78 = 0x4C34
-0x2F79 = 0x2666
-0x2F7A = 0x534D
-0x2F7B = 0x2931
-0x2F7C = 0x374F
-0x2F7D = 0x293C
-0x2F7E = 0x5066
-0x2F7F = 0x2A3C
-0x2F80 = 0x6666
-0x2F81 = 0x7946
-0x2F82 = 0x433F
-0x2F83 = 0x2B3C
-0x2F84 = 0x6A3B
-0x2F85 = 0x3131
-0x2F86 = 0x6540
-0x2F87 = 0x2441
-0x2F88 = 0x2E3D
-0x2F89 = 0x313A
-0x2F8A = 0x273F
-0x2F8B = 0x6767
-0x2F8C = 0x4869
-0x2F8D = 0x6E43
-0x2F8E = 0x6C37
-0x2F8F = 0x5439
-0x2F90 = 0x6130
-0x2F91 = 0x286B
-0x2F92 = 0x2B38
-0x2F93 = 0x5133
-0x2F94 = 0x4038
-0x2F95 = 0x2B43
-0x2F96 = 0x2646
-0x2F97 = 0x356C
-0x2F98 = 0x386C
-0x2F99 = 0x2D33
-0x2F9A = 0x5640
-0x2F9B = 0x7641
-0x2F9C = 0x2D42
-0x2F9D = 0x483F
-0x2F9E = 0x563C
-0x2F9F = 0x493F
-0x2FA0 = 0x2443
-0x2FA2 = 0x384D
-0x2FA3 = 0x5346
-0x2FA4 = 0x5048
-0x2FA5 = 0x244E
-0x2FA6 = 0x6236
-0x2FA7 = 0x3944
-0x2FA8 = 0x674C
-0x2FA9 = 0x6C49
-0x2FAA = 0x3070
-0x2FAB = 0x3270
-0x2FAC = 0x2B31
-0x2FAE = 0x7348
-0x2FAF = 0x4C4C
-0x2FB0 = 0x5733
-0x2FB1 = 0x6A70
-0x2FB2 = 0x6C70
-0x2FB3 = 0x3B32
-0x2FB4 = 0x474A
-0x2FB5 = 0x7749
-0x2FB6 = 0x7448
-0x2FB7 = 0x293F
-0x2FB8 = 0x733C
-0x2FB9 = 0x6139
-0x2FBA = 0x4F47
-0x2FBB = 0x7C39
-0x2FBC = 0x6239
-0x2FBD = 0x7571
-0x2FBE = 0x2872
-0x2FBF = 0x2E72
-0x2FC0 = 0x2F72
-0x2FC1 = 0x3435
-0x2FC2 = 0x7B35
-0x2FC3 = 0x3B44
-0x2FC4 = 0x4373
-0x2FC5 = 0x2F3C
-0x2FC6 = 0x4E73
-0x2FC7 = 0x634B
-0x2FC9 = 0x5035
-0x2FCB = 0x6373
-0x2FCC = 0x6673
-0x2FCD = 0x2445
-0x2FCE = 0x5D38
-0x2FCF = 0x4D41
-0x2FD0 = 0x2149
-0x2FD1 = 0x6E73
-0x2FD2 = 0x6F73
-0x2FD3 = 0x364E
-0x2FD4 = 0x7D73
-0x2FD5 = 0x7E73
-0x3001 = 0x2221
-0x3002 = 0x2321
-0x3003 = 0x3721
-0x3005 = 0x3921
-0x3006 = 0x3A21
-0x3007 = 0x3B21
-0x3008 = 0x5221
-0x3009 = 0x5321
-0x300A = 0x5421
-0x300B = 0x5521
-0x300C = 0x5621
-0x300D = 0x5721
-0x300E = 0x5821
-0x300F = 0x5921
-0x3010 = 0x5A21
-0x3011 = 0x5B21
-0x3012 = 0x2922
-0x3013 = 0x2E22
-0x3014 = 0x4C21
-0x3015 = 0x4D21
-0x301C = 0x4121
-0x3036 = 0x2922
-0x3038 = 0x3D3D
-0x303A = 0x4152
-0x3041 = 0x2124
-0x3042 = 0x2224
-0x3043 = 0x2324
-0x3045 = 0x2524
-0x3046 = 0x2624
-0x3047 = 0x2724
-0x3048 = 0x2824
-0x3049 = 0x2924
-0x304A = 0x2A24
-0x304B = 0x2B24
-0x304C = 0x2C24
-0x304D = 0x2D24
-0x304E = 0x2E24
-0x304F = 0x2F24
-0x3050 = 0x3024
-0x3051 = 0x3124
-0x3052 = 0x3224
-0x3053 = 0x3324
-0x3054 = 0x3424
-0x3055 = 0x3524
-0x3056 = 0x3624
-0x3057 = 0x3724
-0x3058 = 0x3824
-0x3059 = 0x3924
-0x305A = 0x3A24
-0x305B = 0x3B24
-0x305C = 0x3C24
-0x305D = 0x3D24
-0x305E = 0x3E24
-0x305F = 0x3F24
-0x3060 = 0x4024
-0x3061 = 0x4124
-0x3062 = 0x4224
-0x3063 = 0x4324
-0x3064 = 0x4424
-0x3065 = 0x4524
-0x3066 = 0x4624
-0x3067 = 0x4724
-0x3068 = 0x4824
-0x3069 = 0x4924
-0x306A = 0x4A24
-0x306B = 0x4B24
-0x306C = 0x4C24
-0x306D = 0x4D24
-0x306E = 0x4E24
-0x306F = 0x4F24
-0x3070 = 0x5024
-0x3071 = 0x5124
-0x3072 = 0x5224
-0x3073 = 0x5324
-0x3074 = 0x5424
-0x3075 = 0x5524
-0x3076 = 0x5624
-0x3077 = 0x5724
-0x3078 = 0x5824
-0x3079 = 0x5924
-0x307A = 0x5A24
-0x307B = 0x5B24
-0x307C = 0x5C24
-0x307D = 0x5D24
-0x307E = 0x5E24
-0x307F = 0x5F24
-0x3080 = 0x6024
-0x3081 = 0x6124
-0x3082 = 0x6224
-0x3083 = 0x6324
-0x3084 = 0x6424
-0x3085 = 0x6524
-0x3086 = 0x6624
-0x3087 = 0x6724
-0x3088 = 0x6824
-0x3089 = 0x6924
-0x308A = 0x6A24
-0x308B = 0x6B24
-0x308C = 0x6C24
-0x308D = 0x6D24
-0x308E = 0x6E24
-0x308F = 0x6F24
-0x3090 = 0x7024
-0x3091 = 0x7124
-0x3092 = 0x7224
-0x3093 = 0x7324
-0x3095 = 0x2B24
-0x3096 = 0x3124
-0x309B = 0x2B21
-0x309C = 0x2C21
-0x309D = 0x3521
-0x309E = 0x3621
-0x30A1 = 0x2125
-0x30A2 = 0x2225
-0x30A3 = 0x2325
-0x30A4 = 0x2425
-0x30A6 = 0x2625
-0x30A7 = 0x2725
-0x30A8 = 0x2825
-0x30A9 = 0x2925
-0x30AA = 0x2A25
-0x30AB = 0x2B25
-0x30AC = 0x2C25
-0x30AD = 0x2D25
-0x30AE = 0x2E25
-0x30AF = 0x2F25
-0x30B0 = 0x3025
-0x30B1 = 0x3125
-0x30B2 = 0x3225
-0x30B3 = 0x3325
-0x30B4 = 0x3425
-0x30B5 = 0x3525
-0x30B6 = 0x3625
-0x30B7 = 0x3725
-0x30B8 = 0x3825
-0x30B9 = 0x3925
-0x30BA = 0x3A25
-0x30BB = 0x3B25
-0x30BC = 0x3C25
-0x30BD = 0x3D25
-0x30BE = 0x3E25
-0x30BF = 0x3F25
-0x30C0 = 0x4025
-0x30C1 = 0x4125
-0x30C2 = 0x4225
-0x30C3 = 0x4325
-0x30C4 = 0x4425
-0x30C5 = 0x4525
-0x30C6 = 0x4625
-0x30C7 = 0x4725
-0x30C8 = 0x4825
-0x30C9 = 0x4925
-0x30CA = 0x4A25
-0x30CB = 0x4B25
-0x30CC = 0x4C25
-0x30CD = 0x4D25
-0x30CE = 0x4E25
-0x30CF = 0x4F25
-0x30D0 = 0x5025
-0x30D1 = 0x5125
-0x30D2 = 0x5225
-0x30D3 = 0x5325
-0x30D4 = 0x5425
-0x30D5 = 0x5525
-0x30D6 = 0x5625
-0x30D7 = 0x5725
-0x30D8 = 0x5825
-0x30D9 = 0x5925
-0x30DA = 0x5A25
-0x30DB = 0x5B25
-0x30DC = 0x5C25
-0x30DD = 0x5D25
-0x30DE = 0x5E25
-0x30DF = 0x5F25
-0x30E0 = 0x6025
-0x30E1 = 0x6125
-0x30E2 = 0x6225
-0x30E3 = 0x6325
-0x30E4 = 0x6425
-0x30E5 = 0x6525
-0x30E6 = 0x6625
-0x30E7 = 0x6725
-0x30E8 = 0x6825
-0x30E9 = 0x6925
-0x30EA = 0x6A25
-0x30EB = 0x6B25
-0x30EC = 0x6C25
-0x30ED = 0x6D25
-0x30EE = 0x6E25
-0x30EF = 0x6F25
-0x30F0 = 0x7025
-0x30F1 = 0x7125
-0x30F2 = 0x7225
-0x30F3 = 0x7325
-0x30F4 = 0x7425
-0x30F5 = 0x7525
-0x30F6 = 0x7625
-0x30FB = 0x2621
-0x30FC = 0x3C21
-0x30FD = 0x3321
-0x30FE = 0x3421
-0x31F0 = 0x2F25
-0x31F1 = 0x3725
-0x31F2 = 0x3925
-0x31F3 = 0x4825
-0x31F4 = 0x4C25
-0x31F5 = 0x4F25
-0x31F6 = 0x5225
-0x31F7 = 0x5525
-0x31F8 = 0x5825
-0x31F9 = 0x5B25
-0x31FA = 0x6025
-0x31FB = 0x6925
-0x31FC = 0x6A25
-0x31FD = 0x6B25
-0x31FE = 0x6C25
-0x31FF = 0x6D25
-0x3310 = 0x2C252E25
-0x3314 = 0x6D252D25
-0x3325 = 0x37254725
-0x3326 = 0x6B254925
-0x3327 = 0x73254825
-0x3328 = 0x4E254A25
-0x3330 = 0x33255425
-0x3331 = 0x6B255325
-0x3337 = 0x3D255A25
-0x333F = 0x73255B25
-0x3349 = 0x6A255F25
-0x334B = 0x2C256125
-0x3352 = 0x69256A25
-0x3355 = 0x60256C25
-0x337B = 0x2E403F4A
-0x337C = 0x424F3C3E
-0x337D = 0x35406742
-0x337E = 0x233C404C
-0x4E00 = 0x6C30
-0x4E01 = 0x7A43
-0x4E03 = 0x373C
-0x4E07 = 0x7C4B
-0x4E08 = 0x663E
-0x4E09 = 0x303B
-0x4E0A = 0x653E
-0x4E0B = 0x3C32
-0x4E0D = 0x5449
-0x4E0E = 0x3F4D
-0x4E10 = 0x2250
-0x4E11 = 0x2F31
-0x4E14 = 0x6E33
-0x4E15 = 0x2350
-0x4E16 = 0x2440
-0x4E17 = 0x4252
-0x4E18 = 0x5635
-0x4E19 = 0x3A4A
-0x4E1E = 0x673E
-0x4E21 = 0x3E4E
-0x4E26 = 0x424A
-0x4E2A = 0x2450
-0x4E2D = 0x6643
-0x4E31 = 0x2550
-0x4E32 = 0x7A36
-0x4E36 = 0x2650
-0x4E38 = 0x5D34
-0x4E39 = 0x3043
-0x4E3B = 0x673C
-0x4E3C = 0x2750
-0x4E3F = 0x2850
-0x4E42 = 0x2950
-0x4E43 = 0x3547
-0x4E45 = 0x5735
-0x4E4B = 0x3747
-0x4E4D = 0x6346
-0x4E4E = 0x4338
-0x4E4F = 0x334B
-0x4E55 = 0x4969
-0x4E56 = 0x2A50
-0x4E57 = 0x683E
-0x4E58 = 0x2B50
-0x4E59 = 0x3532
-0x4E5D = 0x6536
-0x4E5E = 0x7038
-0x4E5F = 0x694C
-0x4E62 = 0x2656
-0x4E71 = 0x704D
-0x4E73 = 0x7D46
-0x4E7E = 0x2534
-0x4E82 = 0x2C50
-0x4E85 = 0x2D50
-0x4E86 = 0x3B4E
-0x4E88 = 0x3D4D
-0x4E89 = 0x6841
-0x4E8A = 0x2F50
-0x4E8B = 0x763B
-0x4E8C = 0x7346
-0x4E8E = 0x3250
-0x4E91 = 0x3E31
-0x4E92 = 0x5F38
-0x4E94 = 0x5E38
-0x4E95 = 0x6630
-0x4E98 = 0x4B4F
-0x4E99 = 0x4A4F
-0x4E9B = 0x333A
-0x4E9C = 0x2130
-0x4E9E = 0x3350
-0x4E9F = 0x3450
-0x4EA0 = 0x3550
-0x4EA1 = 0x344B
-0x4EA2 = 0x3650
-0x4EA4 = 0x7238
-0x4EA5 = 0x6730
-0x4EA6 = 0x724B
-0x4EA8 = 0x7C35
-0x4EAB = 0x7D35
-0x4EAC = 0x7E35
-0x4EAD = 0x6244
-0x4EAE = 0x3C4E
-0x4EB0 = 0x3750
-0x4EB3 = 0x3850
-0x4EB6 = 0x3950
-0x4EBA = 0x4D3F
-0x4EC0 = 0x3A3D
-0x4EC1 = 0x4E3F
-0x4EC2 = 0x3E50
-0x4EC4 = 0x3C50
-0x4EC6 = 0x3D50
-0x4EC7 = 0x5835
-0x4ECA = 0x233A
-0x4ECB = 0x7032
-0x4ECD = 0x3B50
-0x4ECE = 0x3A50
-0x4ECF = 0x294A
-0x4ED4 = 0x463B
-0x4ED5 = 0x453B
-0x4ED6 = 0x3E42
-0x4ED7 = 0x3F50
-0x4ED8 = 0x5549
-0x4ED9 = 0x6740
-0x4EDD = 0x3821
-0x4EDE = 0x4050
-0x4EDF = 0x4250
-0x4EE3 = 0x6542
-0x4EE4 = 0x614E
-0x4EE5 = 0x4A30
-0x4EED = 0x4150
-0x4EEE = 0x3E32
-0x4EF0 = 0x4436
-0x4EF2 = 0x6743
-0x4EF6 = 0x6F37
-0x4EF7 = 0x4350
-0x4EFB = 0x2447
-0x4F01 = 0x6B34
-0x4F09 = 0x4450
-0x4F0A = 0x4B30
-0x4F0D = 0x6038
-0x4F0E = 0x6C34
-0x4F0F = 0x7A49
-0x4F10 = 0x3248
-0x4F11 = 0x5935
-0x4F1A = 0x7132
-0x4F1C = 0x6750
-0x4F1D = 0x4145
-0x4F2F = 0x6C47
-0x4F30 = 0x4650
-0x4F34 = 0x3C48
-0x4F36 = 0x624E
-0x4F38 = 0x2D3F
-0x4F3A = 0x473B
-0x4F3C = 0x773B
-0x4F3D = 0x4032
-0x4F43 = 0x5144
-0x4F46 = 0x2243
-0x4F47 = 0x4A50
-0x4F4D = 0x4C30
-0x4F4E = 0x6344
-0x4F4F = 0x3B3D
-0x4F50 = 0x343A
-0x4F51 = 0x244D
-0x4F53 = 0x4E42
-0x4F55 = 0x3F32
-0x4F57 = 0x4950
-0x4F59 = 0x3E4D
-0x4F5A = 0x4550
-0x4F5B = 0x4750
-0x4F5C = 0x6E3A
-0x4F5D = 0x4850
-0x4F5E = 0x2455
-0x4F6F = 0x5350
-0x4F70 = 0x5150
-0x4F73 = 0x4232
-0x4F75 = 0x3B4A
-0x4F76 = 0x4B50
-0x4F7B = 0x4F50
-0x4F7C = 0x7338
-0x4F7F = 0x483B
-0x4F83 = 0x2634
-0x4F86 = 0x5450
-0x4F88 = 0x4C50
-0x4F8B = 0x634E
-0x4F8D = 0x783B
-0x4F8F = 0x4D50
-0x4F91 = 0x5250
-0x4F96 = 0x5550
-0x4F98 = 0x4E50
-0x4F9B = 0x2136
-0x4F9D = 0x4D30
-0x4FA0 = 0x2236
-0x4FA1 = 0x4132
-0x4FAB = 0x2555
-0x4FAD = 0x794B
-0x4FAE = 0x6E49
-0x4FAF = 0x7438
-0x4FB5 = 0x2F3F
-0x4FB6 = 0x374E
-0x4FBF = 0x584A
-0x4FC2 = 0x3837
-0x4FC3 = 0x2542
-0x4FC4 = 0x6432
-0x4FCA = 0x533D
-0x4FCE = 0x5950
-0x4FD0 = 0x5E50
-0x4FD1 = 0x5C50
-0x4FD4 = 0x5750
-0x4FD7 = 0x2F42
-0x4FD8 = 0x5A50
-0x4FDA = 0x5D50
-0x4FDB = 0x5B50
-0x4FDD = 0x5D4A
-0x4FDF = 0x5850
-0x4FE1 = 0x2E3F
-0x4FE3 = 0x734B
-0x4FE4 = 0x5F50
-0x4FE5 = 0x6050
-0x4FEE = 0x243D
-0x4FEF = 0x6D50
-0x4FF3 = 0x5047
-0x4FF5 = 0x3649
-0x4FF6 = 0x6850
-0x4FF8 = 0x704A
-0x4FFA = 0x3632
-0x4FFE = 0x6C50
-0x5005 = 0x6650
-0x5006 = 0x6F50
-0x5009 = 0x5241
-0x500B = 0x4438
-0x500D = 0x5C47
-0x500F = 0x4760
-0x5011 = 0x6E50
-0x5012 = 0x5D45
-0x5014 = 0x6350
-0x5016 = 0x7638
-0x5019 = 0x7538
-0x501A = 0x6150
-0x501F = 0x5A3C
-0x5021 = 0x6950
-0x5023 = 0x6F4A
-0x5024 = 0x4D43
-0x5025 = 0x6550
-0x5026 = 0x7137
-0x5028 = 0x6250
-0x5029 = 0x6A50
-0x502A = 0x6450
-0x502B = 0x514E
-0x502C = 0x6B50
-0x502D = 0x414F
-0x5036 = 0x6636
-0x5039 = 0x7037
-0x5043 = 0x7050
-0x5047 = 0x7150
-0x5048 = 0x7550
-0x5049 = 0x4E30
-0x504F = 0x504A
-0x5050 = 0x7450
-0x5055 = 0x7350
-0x5056 = 0x7750
-0x505A = 0x7650
-0x505C = 0x6444
-0x5065 = 0x7237
-0x506C = 0x7850
-0x5072 = 0x453C
-0x5074 = 0x2642
-0x5075 = 0x6544
-0x5076 = 0x7636
-0x5078 = 0x7950
-0x507D = 0x3635
-0x5080 = 0x7A50
-0x5085 = 0x7C50
-0x508D = 0x354B
-0x5091 = 0x6637
-0x5098 = 0x313B
-0x5099 = 0x7748
-0x509A = 0x7B50
-0x50AC = 0x453A
-0x50AD = 0x434D
-0x50B2 = 0x7E50
-0x50B3 = 0x2351
-0x50B4 = 0x7D50
-0x50B5 = 0x443A
-0x50B7 = 0x7D3D
-0x50BE = 0x3937
-0x50C2 = 0x2451
-0x50C5 = 0x4F36
-0x50C9 = 0x2151
-0x50CA = 0x2251
-0x50CD = 0x2F46
-0x50CF = 0x7C41
-0x50D1 = 0x2336
-0x50D5 = 0x4D4B
-0x50D6 = 0x2551
-0x50DA = 0x3D4E
-0x50DE = 0x2651
-0x50E3 = 0x2951
-0x50E5 = 0x2751
-0x50E7 = 0x4E41
-0x50ED = 0x2851
-0x50EE = 0x2A51
-0x50F5 = 0x2C51
-0x50F9 = 0x2B51
-0x50FB = 0x484A
-0x5100 = 0x3735
-0x5101 = 0x2E51
-0x5102 = 0x2F51
-0x5104 = 0x2F32
-0x5109 = 0x2D51
-0x5112 = 0x743C
-0x5114 = 0x3251
-0x5115 = 0x3151
-0x5116 = 0x3051
-0x5118 = 0x5650
-0x511A = 0x3351
-0x511F = 0x7E3D
-0x5121 = 0x3451
-0x512A = 0x254D
-0x5132 = 0x594C
-0x5137 = 0x3651
-0x513A = 0x3551
-0x513B = 0x3851
-0x513C = 0x3751
-0x513F = 0x3951
-0x5140 = 0x3A51
-0x5141 = 0x7430
-0x5143 = 0x3538
-0x5144 = 0x3B37
-0x5145 = 0x3C3D
-0x5146 = 0x7B43
-0x5147 = 0x2436
-0x5148 = 0x6840
-0x5149 = 0x7738
-0x514B = 0x6E39
-0x514C = 0x3C51
-0x514D = 0x484C
-0x514E = 0x4645
-0x5150 = 0x793B
-0x5152 = 0x3B51
-0x5154 = 0x3D51
-0x515A = 0x5E45
-0x515C = 0x7533
-0x5162 = 0x3E51
-0x5165 = 0x7E46
-0x5168 = 0x3441
-0x5169 = 0x4051
-0x516A = 0x4151
-0x516B = 0x2C48
-0x516C = 0x7838
-0x516D = 0x3B4F
-0x516E = 0x4251
-0x5171 = 0x2636
-0x5175 = 0x3C4A
-0x5176 = 0x3642
-0x5177 = 0x7136
-0x5178 = 0x3545
-0x517C = 0x7337
-0x5180 = 0x4351
-0x5182 = 0x4451
-0x5185 = 0x6246
-0x5186 = 0x5F31
-0x5189 = 0x4751
-0x518A = 0x7D3A
-0x518C = 0x4651
-0x518D = 0x463A
-0x518F = 0x4851
-0x5190 = 0x6E66
-0x5191 = 0x4951
-0x5192 = 0x414B
-0x5193 = 0x4A51
-0x5195 = 0x4B51
-0x5196 = 0x4C51
-0x5197 = 0x693E
-0x5199 = 0x4C3C
-0x51A0 = 0x2734
-0x51A2 = 0x4F51
-0x51A4 = 0x4D51
-0x51A5 = 0x3D4C
-0x51A6 = 0x4E51
-0x51A8 = 0x5A49
-0x51A9 = 0x5051
-0x51AB = 0x5251
-0x51AC = 0x5F45
-0x51B0 = 0x5651
-0x51B1 = 0x5451
-0x51B2 = 0x5551
-0x51B3 = 0x5351
-0x51B4 = 0x633A
-0x51B5 = 0x5751
-0x51B6 = 0x6A4C
-0x51B7 = 0x644E
-0x51BD = 0x5851
-0x51C4 = 0x2840
-0x51C5 = 0x5951
-0x51C6 = 0x5A3D
-0x51C9 = 0x5A51
-0x51CB = 0x7C43
-0x51CC = 0x3F4E
-0x51CD = 0x6045
-0x51D6 = 0x4552
-0x51DB = 0x5B51
-0x51DC = 0x2574
-0x51DD = 0x4536
-0x51E0 = 0x5C51
-0x51E1 = 0x5E4B
-0x51E6 = 0x683D
-0x51E7 = 0x7C42
-0x51E9 = 0x5E51
-0x51EA = 0x6446
-0x51ED = 0x5F51
-0x51F0 = 0x6051
-0x51F1 = 0x2E33
-0x51F5 = 0x6151
-0x51F6 = 0x2736
-0x51F8 = 0x4C46
-0x51F9 = 0x7A31
-0x51FA = 0x503D
-0x51FD = 0x2148
-0x51FE = 0x6251
-0x5200 = 0x6145
-0x5203 = 0x4F3F
-0x5204 = 0x6351
-0x5206 = 0x2C4A
-0x5207 = 0x5A40
-0x5208 = 0x2234
-0x520A = 0x2934
-0x520B = 0x6451
-0x520E = 0x6651
-0x5211 = 0x3A37
-0x5214 = 0x6551
-0x5217 = 0x734E
-0x521D = 0x693D
-0x5224 = 0x3D48
-0x5225 = 0x4C4A
-0x5227 = 0x6751
-0x5229 = 0x784D
-0x522A = 0x6851
-0x522E = 0x6951
-0x5230 = 0x7E45
-0x5233 = 0x6A51
-0x5236 = 0x2940
-0x5237 = 0x7E3A
-0x5238 = 0x7437
-0x5239 = 0x6B51
-0x523A = 0x493B
-0x523B = 0x6F39
-0x5243 = 0x6644
-0x5244 = 0x6D51
-0x5247 = 0x2742
-0x524A = 0x6F3A
-0x524B = 0x6E51
-0x524C = 0x6F51
-0x524D = 0x3041
-0x524F = 0x6C51
-0x5254 = 0x7151
-0x5256 = 0x364B
-0x525B = 0x6439
-0x525E = 0x7051
-0x5263 = 0x7537
-0x5264 = 0x5E3A
-0x5265 = 0x6D47
-0x5269 = 0x7451
-0x526A = 0x7251
-0x526F = 0x7B49
-0x5270 = 0x6A3E
-0x5271 = 0x7B51
-0x5272 = 0x6433
-0x5273 = 0x7551
-0x5274 = 0x7351
-0x5275 = 0x4F41
-0x527D = 0x7751
-0x527F = 0x7651
-0x5283 = 0x4433
-0x5287 = 0x6037
-0x5288 = 0x7C51
-0x5289 = 0x2D4E
-0x528D = 0x7851
-0x5291 = 0x7D51
-0x5292 = 0x7A51
-0x5294 = 0x7951
-0x529B = 0x4F4E
-0x529F = 0x7938
-0x52A0 = 0x4332
-0x52A3 = 0x744E
-0x52A9 = 0x753D
-0x52AA = 0x5845
-0x52AB = 0x6539
-0x52AC = 0x2252
-0x52AD = 0x2352
-0x52B1 = 0x654E
-0x52B4 = 0x2B4F
-0x52B5 = 0x2552
-0x52B9 = 0x7A38
-0x52BC = 0x2452
-0x52BE = 0x2F33
-0x52C1 = 0x2652
-0x52C3 = 0x564B
-0x52C5 = 0x3C44
-0x52C7 = 0x264D
-0x52C9 = 0x594A
-0x52CD = 0x2752
-0x52D2 = 0x5570
-0x52D5 = 0x3046
-0x52D7 = 0x2852
-0x52D8 = 0x2A34
-0x52D9 = 0x334C
-0x52DD = 0x213E
-0x52DE = 0x2952
-0x52DF = 0x674A
-0x52E0 = 0x2D52
-0x52E2 = 0x2A40
-0x52E3 = 0x2A52
-0x52E4 = 0x5036
-0x52E6 = 0x2B52
-0x52E7 = 0x2B34
-0x52F2 = 0x2E37
-0x52F3 = 0x2E52
-0x52F5 = 0x2F52
-0x52F8 = 0x3052
-0x52F9 = 0x3152
-0x52FA = 0x5B3C
-0x52FE = 0x7B38
-0x52FF = 0x5E4C
-0x5301 = 0x684C
-0x5302 = 0x7746
-0x5305 = 0x714A
-0x5306 = 0x3252
-0x5308 = 0x3352
-0x530D = 0x3552
-0x530F = 0x3752
-0x5310 = 0x3652
-0x5315 = 0x3852
-0x5316 = 0x3D32
-0x5317 = 0x4C4B
-0x5319 = 0x7C3A
-0x531A = 0x3952
-0x531D = 0x5941
-0x5320 = 0x223E
-0x5321 = 0x2936
-0x5323 = 0x3A52
-0x532A = 0x5B48
-0x532F = 0x3B52
-0x5331 = 0x3C52
-0x5333 = 0x3D52
-0x5338 = 0x3E52
-0x5339 = 0x2449
-0x533A = 0x6836
-0x533B = 0x6530
-0x533F = 0x3F46
-0x5340 = 0x3F52
-0x5343 = 0x6940
-0x5345 = 0x4152
-0x5346 = 0x4052
-0x5347 = 0x233E
-0x5348 = 0x6138
-0x5349 = 0x4352
-0x534A = 0x3E48
-0x534D = 0x4452
-0x5351 = 0x5C48
-0x5352 = 0x3442
-0x5353 = 0x6E42
-0x5354 = 0x2836
-0x5357 = 0x6E46
-0x5358 = 0x3143
-0x535A = 0x6E47
-0x535C = 0x4E4B
-0x535E = 0x4652
-0x5360 = 0x6A40
-0x5366 = 0x3537
-0x5369 = 0x4752
-0x536E = 0x4852
-0x536F = 0x2C31
-0x5370 = 0x7530
-0x5371 = 0x6D34
-0x5373 = 0x2842
-0x5374 = 0x5135
-0x5375 = 0x714D
-0x5377 = 0x4B52
-0x5378 = 0x3732
-0x537B = 0x4A52
-0x537F = 0x2A36
-0x5382 = 0x4C52
-0x5384 = 0x714C
-0x5396 = 0x4D52
-0x5398 = 0x524E
-0x539A = 0x7C38
-0x539F = 0x3638
-0x53A0 = 0x4E52
-0x53A5 = 0x5052
-0x53A6 = 0x4F52
-0x53A8 = 0x5F3F
-0x53A9 = 0x3931
-0x53AD = 0x5E31
-0x53AE = 0x5152
-0x53B3 = 0x3738
-0x53B6 = 0x5352
-0x53BB = 0x6E35
-0x53C2 = 0x323B
-0x53C3 = 0x5452
-0x53C8 = 0x744B
-0x53C9 = 0x353A
-0x53CA = 0x5A35
-0x53CB = 0x274D
-0x53CC = 0x5041
-0x53CD = 0x3F48
-0x53CE = 0x7D3C
-0x53D4 = 0x473D
-0x53D6 = 0x683C
-0x53D7 = 0x753C
-0x53D9 = 0x763D
-0x53DB = 0x4048
-0x53DF = 0x5752
-0x53E1 = 0x4331
-0x53E2 = 0x5141
-0x53E3 = 0x7D38
-0x53E4 = 0x4538
-0x53E5 = 0x6736
-0x53E8 = 0x5B52
-0x53E9 = 0x2143
-0x53EA = 0x7E42
-0x53EB = 0x2B36
-0x53EC = 0x243E
-0x53ED = 0x5C52
-0x53EE = 0x5A52
-0x53EF = 0x4432
-0x53F0 = 0x6642
-0x53F1 = 0x383C
-0x53F2 = 0x4B3B
-0x53F3 = 0x2631
-0x53F6 = 0x7033
-0x53F7 = 0x6639
-0x53F8 = 0x4A3B
-0x53FA = 0x5D52
-0x5401 = 0x5E52
-0x5403 = 0x4935
-0x5404 = 0x4633
-0x5408 = 0x6739
-0x5409 = 0x4835
-0x540A = 0x5F44
-0x540B = 0x2531
-0x540C = 0x3146
-0x540D = 0x3E4C
-0x540E = 0x2139
-0x540F = 0x794D
-0x5410 = 0x4745
-0x5411 = 0x7E38
-0x541B = 0x2F37
-0x541D = 0x6752
-0x541F = 0x6336
-0x5420 = 0x4A4B
-0x5426 = 0x5D48
-0x5429 = 0x6652
-0x542B = 0x5E34
-0x542C = 0x6152
-0x542D = 0x6252
-0x542E = 0x6452
-0x5436 = 0x6552
-0x5438 = 0x5B35
-0x5439 = 0x613F
-0x543B = 0x2D4A
-0x543C = 0x6352
-0x543D = 0x5F52
-0x543E = 0x6338
-0x5440 = 0x6052
-0x5442 = 0x244F
-0x5446 = 0x724A
-0x5448 = 0x6844
-0x5449 = 0x6238
-0x544A = 0x7039
-0x544E = 0x6852
-0x5451 = 0x5D46
-0x545F = 0x6C52
-0x5468 = 0x7E3C
-0x546A = 0x763C
-0x5470 = 0x6F52
-0x5471 = 0x6D52
-0x5473 = 0x234C
-0x5475 = 0x6A52
-0x5476 = 0x7352
-0x5477 = 0x6E52
-0x547B = 0x7152
-0x547C = 0x4638
-0x547D = 0x3F4C
-0x5480 = 0x7252
-0x5484 = 0x7452
-0x5486 = 0x7652
-0x548B = 0x703A
-0x548C = 0x424F
-0x548E = 0x6B52
-0x548F = 0x6952
-0x5490 = 0x7552
-0x5492 = 0x7052
-0x54A2 = 0x7852
-0x54A4 = 0x2353
-0x54A5 = 0x7A52
-0x54A8 = 0x7E52
-0x54AB = 0x2153
-0x54AC = 0x7B52
-0x54AF = 0x3E53
-0x54B2 = 0x693A
-0x54B3 = 0x3133
-0x54B8 = 0x7952
-0x54BC = 0x2553
-0x54BD = 0x7630
-0x54BE = 0x2453
-0x54C0 = 0x2530
-0x54C1 = 0x4A49
-0x54C2 = 0x2253
-0x54C4 = 0x7C52
-0x54C7 = 0x7752
-0x54C8 = 0x7D52
-0x54C9 = 0x483A
-0x54D8 = 0x2653
-0x54E1 = 0x7730
-0x54E2 = 0x2F53
-0x54E5 = 0x2753
-0x54E6 = 0x2853
-0x54E8 = 0x253E
-0x54E9 = 0x694B
-0x54ED = 0x2D53
-0x54EE = 0x2C53
-0x54F2 = 0x2F45
-0x54FA = 0x2E53
-0x54FD = 0x2B53
-0x5504 = 0x3431
-0x5506 = 0x363A
-0x5507 = 0x303F
-0x550F = 0x2953
-0x5510 = 0x6245
-0x5514 = 0x2A53
-0x5516 = 0x2230
-0x552E = 0x3453
-0x552F = 0x234D
-0x5531 = 0x273E
-0x5533 = 0x3A53
-0x5538 = 0x3953
-0x5539 = 0x3053
-0x553E = 0x4342
-0x5540 = 0x3153
-0x5544 = 0x6F42
-0x5545 = 0x3653
-0x5546 = 0x263E
-0x554C = 0x3353
-0x554F = 0x644C
-0x5553 = 0x3C37
-0x5556 = 0x3753
-0x5557 = 0x3853
-0x555C = 0x3553
-0x555D = 0x3B53
-0x5563 = 0x3253
-0x557B = 0x4153
-0x557C = 0x4653
-0x557E = 0x4253
-0x5580 = 0x3D53
-0x5583 = 0x4753
-0x5584 = 0x3141
-0x5587 = 0x4953
-0x5589 = 0x2239
-0x558A = 0x3F53
-0x558B = 0x7D43
-0x5598 = 0x4353
-0x5599 = 0x3C53
-0x559A = 0x2D34
-0x559C = 0x6E34
-0x559D = 0x6533
-0x559E = 0x4453
-0x559F = 0x4053
-0x55A7 = 0x7637
-0x55A8 = 0x4A53
-0x55A9 = 0x4853
-0x55AA = 0x5341
-0x55AB = 0x4A35
-0x55AC = 0x2C36
-0x55AE = 0x4553
-0x55B0 = 0x7436
-0x55B6 = 0x4431
-0x55C4 = 0x4E53
-0x55C5 = 0x4C53
-0x55C7 = 0x2754
-0x55D4 = 0x5153
-0x55DA = 0x4B53
-0x55DC = 0x4F53
-0x55DF = 0x4D53
-0x55E3 = 0x4C3B
-0x55E4 = 0x5053
-0x55F9 = 0x5853
-0x55FD = 0x5653
-0x55FE = 0x5553
-0x5606 = 0x3243
-0x5609 = 0x4532
-0x5614 = 0x5253
-0x5616 = 0x5453
-0x5617 = 0x283E
-0x5618 = 0x3331
-0x561B = 0x5753
-0x5629 = 0x5E32
-0x562F = 0x6253
-0x5631 = 0x7C3E
-0x5632 = 0x5E53
-0x5634 = 0x5C53
-0x5636 = 0x5D53
-0x5638 = 0x5F53
-0x5642 = 0x3D31
-0x564C = 0x3941
-0x564E = 0x5953
-0x5650 = 0x5A53
-0x565B = 0x7A33
-0x5664 = 0x6153
-0x5668 = 0x6F34
-0x566A = 0x6453
-0x566B = 0x6053
-0x566C = 0x6353
-0x5674 = 0x2E4A
-0x5678 = 0x5546
-0x567A = 0x3848
-0x5680 = 0x6653
-0x5686 = 0x6553
-0x5687 = 0x4533
-0x568A = 0x6753
-0x568F = 0x6A53
-0x5694 = 0x6953
-0x56A0 = 0x6853
-0x56A2 = 0x3947
-0x56A5 = 0x6B53
-0x56AE = 0x6C53
-0x56B4 = 0x6E53
-0x56B6 = 0x6D53
-0x56BC = 0x7053
-0x56C0 = 0x7353
-0x56C1 = 0x7153
-0x56C2 = 0x6F53
-0x56C3 = 0x7253
-0x56C8 = 0x7453
-0x56CE = 0x7553
-0x56D1 = 0x7653
-0x56D3 = 0x7753
-0x56D7 = 0x7853
-0x56D8 = 0x4551
-0x56DA = 0x7C3C
-0x56DB = 0x4D3B
-0x56DE = 0x7332
-0x56E0 = 0x7830
-0x56E3 = 0x4443
-0x56EE = 0x7953
-0x56F0 = 0x243A
-0x56F2 = 0x4F30
-0x56F3 = 0x5E3F
-0x56F9 = 0x7A53
-0x56FA = 0x4738
-0x56FD = 0x7139
-0x56FF = 0x7C53
-0x5700 = 0x7B53
-0x5703 = 0x604A
-0x5704 = 0x7D53
-0x5708 = 0x2154
-0x5709 = 0x7E53
-0x570B = 0x2254
-0x570D = 0x2354
-0x570F = 0x7737
-0x5712 = 0x6031
-0x5713 = 0x2454
-0x5716 = 0x2654
-0x5718 = 0x2554
-0x571C = 0x2854
-0x571F = 0x5A45
-0x5726 = 0x2954
-0x5727 = 0x3530
-0x5728 = 0x5F3A
-0x572D = 0x3D37
-0x5730 = 0x4F43
-0x5737 = 0x2A54
-0x5738 = 0x2B54
-0x573B = 0x2D54
-0x5740 = 0x2E54
-0x5742 = 0x643A
-0x5747 = 0x5136
-0x574A = 0x374B
-0x574E = 0x2C54
-0x574F = 0x2F54
-0x5750 = 0x413A
-0x5751 = 0x2339
-0x5761 = 0x3354
-0x5764 = 0x253A
-0x5766 = 0x3343
-0x5769 = 0x3054
-0x576A = 0x5A44
-0x577F = 0x3454
-0x5782 = 0x623F
-0x5788 = 0x3254
-0x5789 = 0x3554
-0x578B = 0x3F37
-0x5793 = 0x3654
-0x57A0 = 0x3754
-0x57A2 = 0x2439
-0x57A3 = 0x4033
-0x57A4 = 0x3954
-0x57AA = 0x3A54
-0x57B0 = 0x3B54
-0x57B3 = 0x3854
-0x57C0 = 0x3154
-0x57C3 = 0x3C54
-0x57C6 = 0x3D54
-0x57CB = 0x644B
-0x57CE = 0x6B3E
-0x57D2 = 0x3F54
-0x57D3 = 0x4054
-0x57D4 = 0x3E54
-0x57D6 = 0x4254
-0x57DC = 0x3847
-0x57DF = 0x6830
-0x57E0 = 0x5649
-0x57E3 = 0x4354
-0x57F4 = 0x7D3E
-0x57F7 = 0x393C
-0x57F9 = 0x5D47
-0x57FA = 0x7034
-0x57FC = 0x6B3A
-0x5800 = 0x594B
-0x5802 = 0x3246
-0x5805 = 0x7837
-0x5806 = 0x4F42
-0x580A = 0x4154
-0x580B = 0x4454
-0x5815 = 0x4442
-0x5819 = 0x4554
-0x581D = 0x4654
-0x5821 = 0x4854
-0x5824 = 0x6944
-0x582A = 0x2E34
-0x582F = 0x2174
-0x5830 = 0x6131
-0x5831 = 0x734A
-0x5834 = 0x6C3E
-0x5835 = 0x4845
-0x583A = 0x663A
-0x583D = 0x4E54
-0x5840 = 0x3D4A
-0x5841 = 0x5D4E
-0x584A = 0x7432
-0x584B = 0x4A54
-0x5851 = 0x3A41
-0x5852 = 0x4D54
-0x5854 = 0x6345
-0x5857 = 0x4945
-0x5858 = 0x6445
-0x5859 = 0x3948
-0x585A = 0x4D44
-0x585E = 0x493A
-0x5862 = 0x4954
-0x5869 = 0x7631
-0x586B = 0x3645
-0x5870 = 0x4B54
-0x5872 = 0x4754
-0x5875 = 0x503F
-0x5879 = 0x4F54
-0x587E = 0x4E3D
-0x5883 = 0x2D36
-0x5885 = 0x5054
-0x5893 = 0x684A
-0x5897 = 0x7D41
-0x589C = 0x4644
-0x589F = 0x5254
-0x58A8 = 0x4F4B
-0x58AB = 0x5354
-0x58AE = 0x5854
-0x58B3 = 0x2F4A
-0x58B8 = 0x5754
-0x58B9 = 0x5154
-0x58BB = 0x5654
-0x58BE = 0x263A
-0x58C1 = 0x494A
-0x58C5 = 0x5954
-0x58C7 = 0x4543
-0x58CA = 0x7532
-0x58CC = 0x6D3E
-0x58D1 = 0x5B54
-0x58D3 = 0x5A54
-0x58D5 = 0x6839
-0x58D7 = 0x5C54
-0x58D8 = 0x5E54
-0x58D9 = 0x5D54
-0x58DC = 0x6054
-0x58DE = 0x5554
-0x58DF = 0x6254
-0x58E4 = 0x6154
-0x58E5 = 0x5F54
-0x58EB = 0x4E3B
-0x58EC = 0x513F
-0x58EE = 0x5441
-0x58EF = 0x6354
-0x58F0 = 0x3C40
-0x58F1 = 0x6D30
-0x58F2 = 0x6447
-0x58F7 = 0x5B44
-0x58F9 = 0x6554
-0x58FA = 0x6454
-0x58FB = 0x6654
-0x58FC = 0x6754
-0x58FD = 0x6854
-0x5902 = 0x6954
-0x5909 = 0x514A
-0x590A = 0x6A54
-0x590F = 0x4632
-0x5910 = 0x6B54
-0x5915 = 0x3C4D
-0x5916 = 0x3033
-0x5918 = 0x4952
-0x5919 = 0x483D
-0x591A = 0x3F42
-0x591B = 0x6C54
-0x591C = 0x6B4C
-0x5922 = 0x344C
-0x5925 = 0x6E54
-0x5927 = 0x6742
-0x5929 = 0x3745
-0x592A = 0x4042
-0x592B = 0x5749
-0x592C = 0x6F54
-0x592D = 0x7054
-0x592E = 0x7B31
-0x5931 = 0x3A3C
-0x5932 = 0x7154
-0x5937 = 0x5030
-0x5938 = 0x7254
-0x593E = 0x7354
-0x5944 = 0x6231
-0x5947 = 0x7134
-0x5948 = 0x6046
-0x5949 = 0x744A
-0x594E = 0x7754
-0x594F = 0x5541
-0x5950 = 0x7654
-0x5951 = 0x4037
-0x5954 = 0x5B4B
-0x5955 = 0x7554
-0x5957 = 0x6545
-0x5958 = 0x7954
-0x595A = 0x7854
-0x5960 = 0x7B54
-0x5962 = 0x7A54
-0x5965 = 0x7C31
-0x5967 = 0x7C54
-0x5968 = 0x293E
-0x5969 = 0x7E54
-0x596A = 0x2543
-0x596C = 0x7D54
-0x596E = 0x334A
-0x5973 = 0x773D
-0x5974 = 0x5B45
-0x5978 = 0x2155
-0x597D = 0x2539
-0x5981 = 0x2255
-0x5982 = 0x2147
-0x5983 = 0x5E48
-0x5984 = 0x514C
-0x598A = 0x2547
-0x598D = 0x2B55
-0x5993 = 0x3835
-0x5996 = 0x454D
-0x5999 = 0x2F4C
-0x599B = 0x2C56
-0x599D = 0x2355
-0x59A3 = 0x2655
-0x59A5 = 0x4542
-0x59A8 = 0x384B
-0x59AC = 0x4A45
-0x59B2 = 0x2755
-0x59B9 = 0x654B
-0x59BB = 0x4A3A
-0x59BE = 0x2A3E
-0x59C6 = 0x2855
-0x59C9 = 0x503B
-0x59CB = 0x4F3B
-0x59D0 = 0x3930
-0x59D1 = 0x4838
-0x59D3 = 0x2B40
-0x59D4 = 0x5130
-0x59D9 = 0x2C55
-0x59DA = 0x2D55
-0x59DC = 0x2A55
-0x59E5 = 0x3831
-0x59E6 = 0x2F34
-0x59E8 = 0x2955
-0x59EA = 0x454C
-0x59EB = 0x3149
-0x59F6 = 0x2830
-0x59FB = 0x7930
-0x59FF = 0x513B
-0x5A01 = 0x5230
-0x5A03 = 0x2330
-0x5A09 = 0x3255
-0x5A11 = 0x3055
-0x5A18 = 0x3C4C
-0x5A1A = 0x3355
-0x5A1C = 0x3155
-0x5A1F = 0x2F55
-0x5A20 = 0x313F
-0x5A25 = 0x2E55
-0x5A29 = 0x5A4A
-0x5A2F = 0x6438
-0x5A35 = 0x3755
-0x5A36 = 0x3855
-0x5A3C = 0x2B3E
-0x5A40 = 0x3455
-0x5A41 = 0x2C4F
-0x5A46 = 0x4C47
-0x5A49 = 0x3655
-0x5A5A = 0x273A
-0x5A62 = 0x3955
-0x5A66 = 0x5849
-0x5A6A = 0x3A55
-0x5A6C = 0x3555
-0x5A7F = 0x3B4C
-0x5A92 = 0x5E47
-0x5A9A = 0x3B55
-0x5A9B = 0x3249
-0x5ABC = 0x3C55
-0x5ABD = 0x4055
-0x5ABE = 0x3D55
-0x5AC1 = 0x4732
-0x5AC2 = 0x3F55
-0x5AC9 = 0x3B3C
-0x5ACB = 0x3E55
-0x5ACC = 0x7937
-0x5AD0 = 0x4C55
-0x5AD6 = 0x4555
-0x5AD7 = 0x4255
-0x5AE1 = 0x6443
-0x5AE3 = 0x4155
-0x5AE6 = 0x4355
-0x5AE9 = 0x4455
-0x5AFA = 0x4655
-0x5AFB = 0x4755
-0x5B09 = 0x7234
-0x5B0B = 0x4955
-0x5B0C = 0x4855
-0x5B16 = 0x4A55
-0x5B22 = 0x6E3E
-0x5B2A = 0x4D55
-0x5B2C = 0x5C44
-0x5B30 = 0x4531
-0x5B32 = 0x4B55
-0x5B36 = 0x4E55
-0x5B3E = 0x4F55
-0x5B40 = 0x5255
-0x5B43 = 0x5055
-0x5B45 = 0x5155
-0x5B50 = 0x523B
-0x5B51 = 0x5355
-0x5B54 = 0x2639
-0x5B55 = 0x5455
-0x5B57 = 0x7A3B
-0x5B58 = 0x3842
-0x5B5B = 0x5655
-0x5B5C = 0x5A3B
-0x5B5D = 0x2739
-0x5B5F = 0x524C
-0x5B63 = 0x2835
-0x5B64 = 0x4938
-0x5B65 = 0x5755
-0x5B66 = 0x5833
-0x5B69 = 0x5855
-0x5B6B = 0x3942
-0x5B70 = 0x5955
-0x5B71 = 0x2356
-0x5B73 = 0x5A55
-0x5B75 = 0x5B55
-0x5B78 = 0x5C55
-0x5B7A = 0x5E55
-0x5B80 = 0x5F55
-0x5B83 = 0x6055
-0x5B85 = 0x7042
-0x5B87 = 0x2731
-0x5B88 = 0x693C
-0x5B89 = 0x4230
-0x5B8B = 0x5741
-0x5B8C = 0x3034
-0x5B8D = 0x353C
-0x5B8F = 0x2839
-0x5B95 = 0x6645
-0x5B97 = 0x213D
-0x5B98 = 0x3134
-0x5B99 = 0x6843
-0x5B9A = 0x6A44
-0x5B9B = 0x3830
-0x5B9C = 0x3935
-0x5B9D = 0x754A
-0x5B9F = 0x423C
-0x5BA2 = 0x5235
-0x5BA3 = 0x6B40
-0x5BA5 = 0x284D
-0x5BA6 = 0x6155
-0x5BAE = 0x5C35
-0x5BB0 = 0x4B3A
-0x5BB3 = 0x3233
-0x5BB4 = 0x6331
-0x5BB5 = 0x2C3E
-0x5BB6 = 0x4832
-0x5BB8 = 0x6255
-0x5BB9 = 0x464D
-0x5BBF = 0x493D
-0x5BC2 = 0x643C
-0x5BC3 = 0x6355
-0x5BC4 = 0x7334
-0x5BC5 = 0x5246
-0x5BC6 = 0x294C
-0x5BC7 = 0x6455
-0x5BC9 = 0x6555
-0x5BCC = 0x5949
-0x5BD0 = 0x6755
-0x5BD2 = 0x2834
-0x5BD3 = 0x7736
-0x5BD4 = 0x6655
-0x5BDB = 0x3234
-0x5BDD = 0x323F
-0x5BDE = 0x6B55
-0x5BDF = 0x213B
-0x5BE1 = 0x4932
-0x5BE2 = 0x6A55
-0x5BE4 = 0x6855
-0x5BE5 = 0x6C55
-0x5BE6 = 0x6955
-0x5BE7 = 0x2B47
-0x5BE8 = 0x4D5C
-0x5BE9 = 0x333F
-0x5BEB = 0x6D55
-0x5BEE = 0x404E
-0x5BF0 = 0x6E55
-0x5BF3 = 0x7055
-0x5BF5 = 0x7E43
-0x5BF6 = 0x6F55
-0x5BF8 = 0x2340
-0x5BFA = 0x7B3B
-0x5BFE = 0x5042
-0x5BFF = 0x773C
-0x5C01 = 0x7549
-0x5C02 = 0x6C40
-0x5C04 = 0x4D3C
-0x5C05 = 0x7155
-0x5C06 = 0x2D3E
-0x5C07 = 0x7255
-0x5C08 = 0x7355
-0x5C09 = 0x5330
-0x5C0A = 0x3A42
-0x5C0B = 0x523F
-0x5C0D = 0x7455
-0x5C0E = 0x3346
-0x5C0F = 0x2E3E
-0x5C11 = 0x2F3E
-0x5C13 = 0x7555
-0x5C16 = 0x6D40
-0x5C1A = 0x303E
-0x5C20 = 0x7655
-0x5C22 = 0x7755
-0x5C24 = 0x604C
-0x5C28 = 0x7855
-0x5C2D = 0x4636
-0x5C31 = 0x223D
-0x5C38 = 0x7955
-0x5C39 = 0x7A55
-0x5C3A = 0x5C3C
-0x5C3B = 0x2C3F
-0x5C3C = 0x7446
-0x5C3D = 0x543F
-0x5C3E = 0x7848
-0x5C3F = 0x2247
-0x5C40 = 0x4936
-0x5C41 = 0x7B55
-0x5C45 = 0x6F35
-0x5C46 = 0x7C55
-0x5C48 = 0x7E36
-0x5C4A = 0x4F46
-0x5C4B = 0x3032
-0x5C4D = 0x533B
-0x5C4E = 0x7D55
-0x5C4F = 0x2256
-0x5C50 = 0x2156
-0x5C51 = 0x7D36
-0x5C53 = 0x7E55
-0x5C55 = 0x3845
-0x5C5E = 0x3042
-0x5C60 = 0x4B45
-0x5C61 = 0x483C
-0x5C64 = 0x5841
-0x5C65 = 0x7A4D
-0x5C6C = 0x2456
-0x5C6E = 0x2556
-0x5C6F = 0x5646
-0x5C71 = 0x333B
-0x5C76 = 0x2756
-0x5C79 = 0x2856
-0x5C8C = 0x2956
-0x5C90 = 0x7434
-0x5C91 = 0x2A56
-0x5C94 = 0x2B56
-0x5CA1 = 0x2C32
-0x5CA8 = 0x3B41
-0x5CA9 = 0x6434
-0x5CAB = 0x2D56
-0x5CAC = 0x284C
-0x5CB1 = 0x5242
-0x5CB3 = 0x5933
-0x5CB6 = 0x2F56
-0x5CB7 = 0x3156
-0x5CB8 = 0x5F34
-0x5CBB = 0x2E56
-0x5CBC = 0x3056
-0x5CBE = 0x3356
-0x5CC5 = 0x3256
-0x5CC7 = 0x3456
-0x5CD9 = 0x3556
-0x5CE0 = 0x3D46
-0x5CE1 = 0x2E36
-0x5CE8 = 0x6532
-0x5CE9 = 0x3656
-0x5CEA = 0x3B56
-0x5CED = 0x3956
-0x5CEF = 0x774A
-0x5CF0 = 0x764A
-0x5CF6 = 0x6745
-0x5CFA = 0x3856
-0x5CFB = 0x543D
-0x5CFD = 0x3756
-0x5D07 = 0x723F
-0x5D0B = 0x3C56
-0x5D0E = 0x6A3A
-0x5D11 = 0x4256
-0x5D14 = 0x4356
-0x5D15 = 0x3D56
-0x5D17 = 0x3E56
-0x5D18 = 0x4756
-0x5D19 = 0x4656
-0x5D1A = 0x4556
-0x5D1B = 0x4156
-0x5D1F = 0x4056
-0x5D22 = 0x4456
-0x5D29 = 0x784A
-0x5D4B = 0x4B56
-0x5D4C = 0x4856
-0x5D4E = 0x4A56
-0x5D50 = 0x724D
-0x5D52 = 0x4956
-0x5D5C = 0x3F56
-0x5D69 = 0x733F
-0x5D6C = 0x4C56
-0x5D6F = 0x373A
-0x5D73 = 0x4D56
-0x5D76 = 0x4E56
-0x5D82 = 0x5156
-0x5D84 = 0x5056
-0x5D87 = 0x4F56
-0x5D8B = 0x6845
-0x5D8C = 0x3A56
-0x5D90 = 0x5756
-0x5D9D = 0x5356
-0x5DA2 = 0x5256
-0x5DAC = 0x5456
-0x5DAE = 0x5556
-0x5DB7 = 0x5856
-0x5DBA = 0x664E
-0x5DBC = 0x5956
-0x5DC9 = 0x5A56
-0x5DCC = 0x6034
-0x5DCD = 0x5B56
-0x5DD2 = 0x5D56
-0x5DD3 = 0x5C56
-0x5DD6 = 0x5E56
-0x5DDB = 0x5F56
-0x5DDD = 0x6E40
-0x5DDE = 0x233D
-0x5DE1 = 0x643D
-0x5DE3 = 0x6341
-0x5DE5 = 0x2939
-0x5DE6 = 0x383A
-0x5DE7 = 0x2A39
-0x5DE8 = 0x7035
-0x5DEB = 0x6056
-0x5DEE = 0x393A
-0x5DF1 = 0x4A38
-0x5DF2 = 0x6156
-0x5DF3 = 0x264C
-0x5DF4 = 0x4347
-0x5DF5 = 0x6256
-0x5DF7 = 0x2B39
-0x5DFB = 0x2C34
-0x5DFD = 0x2743
-0x5DFE = 0x5236
-0x5E02 = 0x543B
-0x5E03 = 0x5B49
-0x5E06 = 0x4148
-0x5E0B = 0x6356
-0x5E0C = 0x7534
-0x5E11 = 0x6656
-0x5E16 = 0x2144
-0x5E19 = 0x6556
-0x5E1A = 0x6456
-0x5E1B = 0x6756
-0x5E1D = 0x6B44
-0x5E25 = 0x633F
-0x5E2B = 0x553B
-0x5E2D = 0x4A40
-0x5E2F = 0x5342
-0x5E30 = 0x2235
-0x5E33 = 0x2244
-0x5E36 = 0x6856
-0x5E37 = 0x6956
-0x5E38 = 0x6F3E
-0x5E3D = 0x394B
-0x5E40 = 0x6C56
-0x5E43 = 0x6B56
-0x5E44 = 0x6A56
-0x5E45 = 0x7D49
-0x5E47 = 0x7356
-0x5E4C = 0x5A4B
-0x5E4E = 0x6D56
-0x5E54 = 0x6F56
-0x5E55 = 0x6B4B
-0x5E57 = 0x6E56
-0x5E5F = 0x7056
-0x5E61 = 0x2848
-0x5E62 = 0x7156
-0x5E63 = 0x3E4A
-0x5E64 = 0x7256
-0x5E72 = 0x3334
-0x5E73 = 0x3F4A
-0x5E74 = 0x2F47
-0x5E75 = 0x7456
-0x5E76 = 0x7556
-0x5E78 = 0x2C39
-0x5E7A = 0x7656
-0x5E7C = 0x444D
-0x5E7D = 0x294D
-0x5E7E = 0x7634
-0x5E7F = 0x7856
-0x5E81 = 0x2344
-0x5E83 = 0x2D39
-0x5E84 = 0x313E
-0x5E87 = 0x5F48
-0x5E8A = 0x323E
-0x5E8F = 0x783D
-0x5E95 = 0x6C44
-0x5E96 = 0x794A
-0x5E97 = 0x3945
-0x5E9A = 0x2E39
-0x5E9C = 0x5C49
-0x5EA0 = 0x7956
-0x5EA6 = 0x5945
-0x5EA7 = 0x423A
-0x5EAB = 0x4B38
-0x5EAD = 0x6D44
-0x5EB5 = 0x4330
-0x5EB6 = 0x6E3D
-0x5EB7 = 0x2F39
-0x5EB8 = 0x474D
-0x5EC1 = 0x7A56
-0x5EC2 = 0x7B56
-0x5EC3 = 0x5147
-0x5EC8 = 0x7C56
-0x5EC9 = 0x774E
-0x5ECA = 0x2D4F
-0x5ECF = 0x7E56
-0x5ED0 = 0x7D56
-0x5ED3 = 0x4733
-0x5ED6 = 0x2157
-0x5EDA = 0x2457
-0x5EDB = 0x2557
-0x5EDD = 0x2357
-0x5EDF = 0x4049
-0x5EE0 = 0x333E
-0x5EE1 = 0x2757
-0x5EE2 = 0x2657
-0x5EE3 = 0x2257
-0x5EE8 = 0x2857
-0x5EE9 = 0x2957
-0x5EEC = 0x2A57
-0x5EF0 = 0x2D57
-0x5EF1 = 0x2B57
-0x5EF3 = 0x2C57
-0x5EF4 = 0x2E57
-0x5EF6 = 0x6431
-0x5EF7 = 0x6E44
-0x5EF8 = 0x2F57
-0x5EFA = 0x7A37
-0x5EFB = 0x7632
-0x5EFC = 0x3647
-0x5EFE = 0x3057
-0x5EFF = 0x7B46
-0x5F01 = 0x5B4A
-0x5F03 = 0x3157
-0x5F04 = 0x2E4F
-0x5F09 = 0x3257
-0x5F0A = 0x404A
-0x5F0B = 0x3557
-0x5F0C = 0x2150
-0x5F0D = 0x3150
-0x5F0F = 0x303C
-0x5F10 = 0x7546
-0x5F11 = 0x3657
-0x5F13 = 0x5D35
-0x5F14 = 0x2444
-0x5F15 = 0x7A30
-0x5F16 = 0x3757
-0x5F17 = 0x264A
-0x5F18 = 0x3039
-0x5F1B = 0x5043
-0x5F1F = 0x6F44
-0x5F25 = 0x6F4C
-0x5F26 = 0x3938
-0x5F27 = 0x4C38
-0x5F29 = 0x3857
-0x5F2D = 0x3957
-0x5F2F = 0x3F57
-0x5F31 = 0x653C
-0x5F35 = 0x2544
-0x5F37 = 0x2F36
-0x5F38 = 0x3A57
-0x5F3C = 0x2B49
-0x5F3E = 0x4643
-0x5F41 = 0x3B57
-0x5F48 = 0x3C57
-0x5F4A = 0x3036
-0x5F4C = 0x3D57
-0x5F4E = 0x3E57
-0x5F51 = 0x4057
-0x5F53 = 0x7645
-0x5F56 = 0x4157
-0x5F57 = 0x4257
-0x5F59 = 0x4357
-0x5F5C = 0x3457
-0x5F5D = 0x3357
-0x5F61 = 0x4457
-0x5F62 = 0x4137
-0x5F66 = 0x2749
-0x5F69 = 0x4C3A
-0x5F6A = 0x3749
-0x5F6B = 0x2644
-0x5F6C = 0x4B49
-0x5F6D = 0x4557
-0x5F70 = 0x343E
-0x5F71 = 0x4631
-0x5F73 = 0x4657
-0x5F77 = 0x4757
-0x5F79 = 0x724C
-0x5F7C = 0x6048
-0x5F7F = 0x4A57
-0x5F80 = 0x7D31
-0x5F81 = 0x2C40
-0x5F82 = 0x4957
-0x5F83 = 0x4857
-0x5F84 = 0x4237
-0x5F85 = 0x5442
-0x5F87 = 0x4E57
-0x5F88 = 0x4C57
-0x5F8A = 0x4B57
-0x5F8B = 0x274E
-0x5F8C = 0x6538
-0x5F90 = 0x793D
-0x5F91 = 0x4D57
-0x5F92 = 0x4C45
-0x5F93 = 0x3E3D
-0x5F97 = 0x4046
-0x5F98 = 0x5157
-0x5F99 = 0x5057
-0x5F9E = 0x4F57
-0x5FA0 = 0x5257
-0x5FA1 = 0x6638
-0x5FA8 = 0x5357
-0x5FA9 = 0x7C49
-0x5FAA = 0x5B3D
-0x5FAD = 0x5457
-0x5FAE = 0x7948
-0x5FB3 = 0x4146
-0x5FB4 = 0x2744
-0x5FB9 = 0x3045
-0x5FBC = 0x5557
-0x5FBD = 0x2B35
-0x5FC3 = 0x343F
-0x5FC5 = 0x2C49
-0x5FCC = 0x7734
-0x5FCD = 0x2647
-0x5FD6 = 0x5657
-0x5FD7 = 0x563B
-0x5FD8 = 0x3A4B
-0x5FD9 = 0x3B4B
-0x5FDC = 0x7E31
-0x5FDD = 0x5B57
-0x5FE0 = 0x6943
-0x5FE4 = 0x5857
-0x5FEB = 0x7732
-0x5FF0 = 0x2D58
-0x5FF1 = 0x5A57
-0x5FF5 = 0x3047
-0x5FF8 = 0x5957
-0x5FFD = 0x7A39
-0x5FFF = 0x5D57
-0x600E = 0x6357
-0x600F = 0x6957
-0x6010 = 0x6157
-0x6012 = 0x5C45
-0x6015 = 0x6657
-0x6016 = 0x5D49
-0x6019 = 0x6057
-0x601B = 0x6557
-0x601C = 0x674E
-0x601D = 0x573B
-0x6020 = 0x5542
-0x6021 = 0x5E57
-0x6025 = 0x5E35
-0x6026 = 0x6857
-0x6027 = 0x2D40
-0x6028 = 0x6531
-0x6029 = 0x6257
-0x602A = 0x7832
-0x602B = 0x6757
-0x602F = 0x3136
-0x6031 = 0x6457
-0x603A = 0x6A57
-0x6041 = 0x6C57
-0x6042 = 0x7657
-0x6043 = 0x7457
-0x6046 = 0x7157
-0x604A = 0x7057
-0x604B = 0x784E
-0x604D = 0x7257
-0x6050 = 0x3236
-0x6052 = 0x3139
-0x6055 = 0x7A3D
-0x6059 = 0x7957
-0x605A = 0x6B57
-0x605F = 0x6F57
-0x6060 = 0x5F57
-0x6062 = 0x7A32
-0x6063 = 0x7357
-0x6064 = 0x7557
-0x6065 = 0x5143
-0x6068 = 0x283A
-0x6069 = 0x3832
-0x606A = 0x6D57
-0x606B = 0x7857
-0x606C = 0x7757
-0x606D = 0x3336
-0x606F = 0x2942
-0x6070 = 0x6633
-0x6075 = 0x4337
-0x6077 = 0x6E57
-0x6081 = 0x7A57
-0x6083 = 0x7D57
-0x6084 = 0x2158
-0x6089 = 0x3D3C
-0x608B = 0x2758
-0x608C = 0x7044
-0x608D = 0x7B57
-0x6092 = 0x2558
-0x6094 = 0x7932
-0x6096 = 0x2358
-0x6097 = 0x2458
-0x609A = 0x7E57
-0x609B = 0x2258
-0x609F = 0x6738
-0x60A0 = 0x2A4D
-0x60A3 = 0x3534
-0x60A6 = 0x5931
-0x60A7 = 0x2658
-0x60A9 = 0x3A47
-0x60AA = 0x2D30
-0x60B2 = 0x6148
-0x60B3 = 0x5C57
-0x60B4 = 0x2C58
-0x60B5 = 0x3058
-0x60B6 = 0x654C
-0x60B8 = 0x2958
-0x60BC = 0x6945
-0x60BD = 0x2E58
-0x60C5 = 0x703E
-0x60C6 = 0x2F58
-0x60C7 = 0x5746
-0x60D1 = 0x474F
-0x60D3 = 0x2B58
-0x60D8 = 0x3158
-0x60DA = 0x7B39
-0x60DC = 0x4B40
-0x60DF = 0x5430
-0x60E0 = 0x2A58
-0x60E1 = 0x2858
-0x60E3 = 0x5A41
-0x60E7 = 0x7C57
-0x60E8 = 0x343B
-0x60F0 = 0x4642
-0x60F1 = 0x3D58
-0x60F3 = 0x5B41
-0x60F4 = 0x3858
-0x60F6 = 0x3558
-0x60F7 = 0x3658
-0x60F9 = 0x663C
-0x60FA = 0x3958
-0x60FB = 0x3C58
-0x6100 = 0x3758
-0x6101 = 0x253D
-0x6103 = 0x3A58
-0x6106 = 0x3458
-0x6108 = 0x7C4C
-0x6109 = 0x7B4C
-0x610D = 0x3E58
-0x610E = 0x3F58
-0x610F = 0x5530
-0x6115 = 0x3358
-0x611A = 0x7236
-0x611B = 0x2630
-0x611F = 0x3634
-0x6121 = 0x3B58
-0x6127 = 0x4358
-0x6128 = 0x4258
-0x612C = 0x4758
-0x6134 = 0x4858
-0x613C = 0x4658
-0x613D = 0x4958
-0x613E = 0x4158
-0x613F = 0x4558
-0x6142 = 0x4A58
-0x6144 = 0x4B58
-0x6147 = 0x4058
-0x6148 = 0x7C3B
-0x614A = 0x4458
-0x614B = 0x5642
-0x614C = 0x3239
-0x614D = 0x3258
-0x614E = 0x353F
-0x6155 = 0x694A
-0x6158 = 0x4E58
-0x6159 = 0x4F58
-0x615A = 0x5058
-0x615D = 0x5758
-0x615F = 0x5658
-0x6162 = 0x7D4B
-0x6163 = 0x3734
-0x6165 = 0x5458
-0x6167 = 0x4537
-0x6168 = 0x3433
-0x616B = 0x5158
-0x616E = 0x384E
-0x616F = 0x5358
-0x6170 = 0x5630
-0x6171 = 0x5558
-0x6173 = 0x4C58
-0x6174 = 0x5258
-0x6175 = 0x5958
-0x6176 = 0x4437
-0x6177 = 0x4D58
-0x617E = 0x5D4D
-0x6182 = 0x2B4D
-0x6187 = 0x5C58
-0x618A = 0x6058
-0x618E = 0x7E41
-0x6190 = 0x794E
-0x6191 = 0x6158
-0x6194 = 0x5E58
-0x6196 = 0x5B58
-0x6199 = 0x5A58
-0x619A = 0x5F58
-0x61A4 = 0x304A
-0x61A7 = 0x3446
-0x61A9 = 0x4637
-0x61AB = 0x6258
-0x61AC = 0x5D58
-0x61AE = 0x6358
-0x61B2 = 0x7B37
-0x61B6 = 0x3132
-0x61BA = 0x6B58
-0x61BE = 0x3834
-0x61C3 = 0x6958
-0x61C6 = 0x6A58
-0x61C7 = 0x293A
-0x61C8 = 0x6858
-0x61C9 = 0x6658
-0x61CA = 0x6558
-0x61CB = 0x6C58
-0x61CC = 0x6458
-0x61CD = 0x6E58
-0x61D0 = 0x7B32
-0x61E3 = 0x7058
-0x61E6 = 0x6F58
-0x61F2 = 0x2844
-0x61F4 = 0x7358
-0x61F6 = 0x7158
-0x61F7 = 0x6758
-0x61F8 = 0x7C37
-0x61FA = 0x7258
-0x61FC = 0x7658
-0x61FD = 0x7558
-0x61FE = 0x7758
-0x61FF = 0x7458
-0x6200 = 0x7858
-0x6208 = 0x7958
-0x6209 = 0x7A58
-0x620A = 0x6A4A
-0x620C = 0x7C58
-0x620D = 0x7B58
-0x620E = 0x3F3D
-0x6210 = 0x2E40
-0x6211 = 0x6632
-0x6212 = 0x7C32
-0x6214 = 0x7D58
-0x6216 = 0x3F30
-0x621A = 0x4C40
-0x621B = 0x7E58
-0x621D = 0x436C
-0x621E = 0x2159
-0x621F = 0x6137
-0x6221 = 0x2259
-0x6226 = 0x6F40
-0x622A = 0x2359
-0x622E = 0x2459
-0x622F = 0x3A35
-0x6230 = 0x2559
-0x6232 = 0x2659
-0x6233 = 0x2759
-0x6234 = 0x5742
-0x6238 = 0x4D38
-0x623B = 0x614C
-0x623F = 0x3C4B
-0x6240 = 0x6A3D
-0x6241 = 0x2859
-0x6247 = 0x7040
-0x6248 = 0x3D6E
-0x6249 = 0x6248
-0x624B = 0x6A3C
-0x624D = 0x4D3A
-0x624E = 0x2959
-0x6253 = 0x4742
-0x6255 = 0x274A
-0x6258 = 0x7142
-0x625B = 0x2C59
-0x625E = 0x2A59
-0x6260 = 0x2D59
-0x6263 = 0x2B59
-0x6268 = 0x2E59
-0x626E = 0x314A
-0x6271 = 0x3730
-0x6276 = 0x5E49
-0x6279 = 0x6348
-0x627C = 0x2F59
-0x627E = 0x3259
-0x627F = 0x353E
-0x6280 = 0x3B35
-0x6282 = 0x3059
-0x6283 = 0x3759
-0x6284 = 0x363E
-0x6289 = 0x3159
-0x628A = 0x4447
-0x6291 = 0x5E4D
-0x6292 = 0x3359
-0x6293 = 0x3459
-0x6294 = 0x3859
-0x6295 = 0x6A45
-0x6296 = 0x3559
-0x6297 = 0x3339
-0x6298 = 0x5E40
-0x629B = 0x4659
-0x629C = 0x3448
-0x629E = 0x7242
-0x62AB = 0x6448
-0x62AC = 0x2D5A
-0x62B1 = 0x7A4A
-0x62B5 = 0x7144
-0x62B9 = 0x754B
-0x62BB = 0x3B59
-0x62BC = 0x2132
-0x62BD = 0x6A43
-0x62C2 = 0x4459
-0x62C5 = 0x3443
-0x62C6 = 0x3E59
-0x62C7 = 0x4559
-0x62C8 = 0x4059
-0x62C9 = 0x4759
-0x62CA = 0x4359
-0x62CC = 0x4259
-0x62CD = 0x6F47
-0x62CF = 0x3C59
-0x62D0 = 0x7D32
-0x62D1 = 0x3A59
-0x62D2 = 0x7135
-0x62D3 = 0x7342
-0x62D4 = 0x3659
-0x62D7 = 0x3959
-0x62D8 = 0x3439
-0x62D9 = 0x5B40
-0x62DB = 0x373E
-0x62DC = 0x4159
-0x62DD = 0x5247
-0x62E0 = 0x7235
-0x62E1 = 0x4833
-0x62EC = 0x6733
-0x62ED = 0x213F
-0x62EE = 0x4959
-0x62EF = 0x4E59
-0x62F1 = 0x4A59
-0x62F3 = 0x7D37
-0x62F5 = 0x4F59
-0x62F6 = 0x223B
-0x62F7 = 0x6939
-0x62FE = 0x263D
-0x62FF = 0x3D59
-0x6301 = 0x7D3B
-0x6302 = 0x4C59
-0x6307 = 0x583B
-0x6308 = 0x4D59
-0x6309 = 0x4430
-0x630C = 0x4859
-0x6311 = 0x2944
-0x6319 = 0x7335
-0x631F = 0x3436
-0x6327 = 0x4B59
-0x6328 = 0x2730
-0x632B = 0x433A
-0x632F = 0x363F
-0x633A = 0x7244
-0x633D = 0x5448
-0x633E = 0x5159
-0x633F = 0x5E41
-0x6349 = 0x2A42
-0x634C = 0x2B3B
-0x634D = 0x5259
-0x634F = 0x5459
-0x6350 = 0x5059
-0x6355 = 0x614A
-0x6357 = 0x3D44
-0x635C = 0x5C41
-0x6367 = 0x7B4A
-0x6368 = 0x4E3C
-0x6369 = 0x6059
-0x636B = 0x5F59
-0x636E = 0x783F
-0x6372 = 0x7E37
-0x6377 = 0x393E
-0x637A = 0x6846
-0x637B = 0x3147
-0x6380 = 0x5759
-0x6383 = 0x5D41
-0x6388 = 0x783C
-0x6389 = 0x5C59
-0x638C = 0x383E
-0x638E = 0x5659
-0x638F = 0x5B59
-0x6392 = 0x5347
-0x6396 = 0x5559
-0x6398 = 0x2137
-0x639B = 0x5D33
-0x639F = 0x5D59
-0x63A0 = 0x2B4E
-0x63A1 = 0x4E3A
-0x63A2 = 0x3543
-0x63A3 = 0x5A59
-0x63A5 = 0x5C40
-0x63A7 = 0x3539
-0x63A8 = 0x643F
-0x63A9 = 0x6631
-0x63AA = 0x3C41
-0x63AB = 0x5859
-0x63AC = 0x4535
-0x63B2 = 0x4737
-0x63B4 = 0x4F44
-0x63B5 = 0x5E59
-0x63BB = 0x5F41
-0x63BE = 0x6159
-0x63C0 = 0x6359
-0x63C3 = 0x3742
-0x63C4 = 0x6959
-0x63C6 = 0x6459
-0x63C9 = 0x6659
-0x63CF = 0x4149
-0x63D0 = 0x7344
-0x63D2 = 0x6759
-0x63D6 = 0x2C4D
-0x63DA = 0x484D
-0x63DB = 0x3934
-0x63E1 = 0x2E30
-0x63E3 = 0x6559
-0x63E9 = 0x6259
-0x63EE = 0x7834
-0x63F4 = 0x6731
-0x63F6 = 0x6859
-0x63FA = 0x494D
-0x6406 = 0x6C59
-0x640D = 0x3B42
-0x640F = 0x7359
-0x6413 = 0x6D59
-0x6416 = 0x6A59
-0x6417 = 0x7159
-0x641C = 0x5359
-0x6426 = 0x6E59
-0x6428 = 0x7259
-0x642C = 0x4248
-0x642D = 0x6B45
-0x6434 = 0x6B59
-0x6436 = 0x6F59
-0x643A = 0x4837
-0x643E = 0x713A
-0x6442 = 0x5D40
-0x644E = 0x7759
-0x6458 = 0x2645
-0x6467 = 0x7459
-0x6469 = 0x604B
-0x646F = 0x7559
-0x6476 = 0x7659
-0x6478 = 0x4E4C
-0x647A = 0x2240
-0x6483 = 0x6237
-0x6488 = 0x7D59
-0x6492 = 0x353B
-0x6493 = 0x7A59
-0x6495 = 0x7959
-0x649A = 0x3247
-0x649E = 0x3546
-0x64A4 = 0x3145
-0x64A5 = 0x7B59
-0x64A9 = 0x7C59
-0x64AB = 0x6F49
-0x64AD = 0x4547
-0x64AE = 0x233B
-0x64B0 = 0x7140
-0x64B2 = 0x504B
-0x64B9 = 0x4933
-0x64BB = 0x255A
-0x64BC = 0x7E59
-0x64C1 = 0x4A4D
-0x64C2 = 0x275A
-0x64C5 = 0x235A
-0x64C7 = 0x245A
-0x64CD = 0x6041
-0x64D2 = 0x225A
-0x64D4 = 0x3F59
-0x64D8 = 0x265A
-0x64DA = 0x215A
-0x64E0 = 0x2B5A
-0x64E1 = 0x2C5A
-0x64E2 = 0x2745
-0x64E3 = 0x2E5A
-0x64E6 = 0x243B
-0x64E7 = 0x295A
-0x64EC = 0x3C35
-0x64EF = 0x2F5A
-0x64F1 = 0x285A
-0x64F2 = 0x335A
-0x64F4 = 0x325A
-0x64F6 = 0x315A
-0x64FA = 0x345A
-0x64FD = 0x365A
-0x64FE = 0x713E
-0x6500 = 0x355A
-0x6505 = 0x395A
-0x6518 = 0x375A
-0x651C = 0x385A
-0x651D = 0x7059
-0x6523 = 0x3B5A
-0x6524 = 0x3A5A
-0x652A = 0x7859
-0x652B = 0x3C5A
-0x652C = 0x305A
-0x652F = 0x593B
-0x6534 = 0x3D5A
-0x6535 = 0x3E5A
-0x6536 = 0x405A
-0x6537 = 0x3F5A
-0x6538 = 0x415A
-0x6539 = 0x7E32
-0x653B = 0x3639
-0x653E = 0x7C4A
-0x653F = 0x2F40
-0x6545 = 0x4E38
-0x6548 = 0x435A
-0x654D = 0x465A
-0x654F = 0x5249
-0x6551 = 0x5F35
-0x6555 = 0x455A
-0x6556 = 0x445A
-0x6557 = 0x5447
-0x6558 = 0x475A
-0x6559 = 0x3536
-0x655D = 0x495A
-0x655E = 0x485A
-0x6562 = 0x3A34
-0x6563 = 0x363B
-0x6566 = 0x5846
-0x656C = 0x4937
-0x6570 = 0x743F
-0x6572 = 0x4A5A
-0x6574 = 0x3040
-0x6575 = 0x2845
-0x6577 = 0x5F49
-0x6578 = 0x4B5A
-0x6582 = 0x4C5A
-0x6583 = 0x4D5A
-0x6587 = 0x384A
-0x6588 = 0x5D55
-0x6589 = 0x4640
-0x658C = 0x4C49
-0x658E = 0x583A
-0x6590 = 0x6548
-0x6591 = 0x4348
-0x6597 = 0x4D45
-0x6599 = 0x414E
-0x659B = 0x4F5A
-0x659C = 0x503C
-0x659F = 0x505A
-0x65A1 = 0x3630
-0x65A4 = 0x5436
-0x65A5 = 0x4D40
-0x65A7 = 0x6049
-0x65AB = 0x515A
-0x65AC = 0x423B
-0x65AD = 0x4743
-0x65AF = 0x5B3B
-0x65B0 = 0x373F
-0x65B7 = 0x525A
-0x65B9 = 0x7D4A
-0x65BC = 0x7731
-0x65BD = 0x5C3B
-0x65C1 = 0x555A
-0x65C3 = 0x535A
-0x65C4 = 0x565A
-0x65C5 = 0x394E
-0x65C6 = 0x545A
-0x65CB = 0x7B40
-0x65CC = 0x575A
-0x65CF = 0x3242
-0x65D2 = 0x585A
-0x65D7 = 0x7A34
-0x65DB = 0x595A
-0x65E0 = 0x5B5A
-0x65E1 = 0x5C5A
-0x65E2 = 0x7B34
-0x65E5 = 0x7C46
-0x65E6 = 0x3643
-0x65E7 = 0x6C35
-0x65E8 = 0x5D3B
-0x65E9 = 0x6141
-0x65EC = 0x5C3D
-0x65F1 = 0x5D5A
-0x65FA = 0x2232
-0x65FB = 0x615A
-0x6602 = 0x3739
-0x6603 = 0x605A
-0x6606 = 0x2B3A
-0x6607 = 0x3A3E
-0x660A = 0x5F5A
-0x660C = 0x3B3E
-0x660E = 0x404C
-0x660F = 0x2A3A
-0x6613 = 0x5730
-0x6614 = 0x4E40
-0x661C = 0x665A
-0x661F = 0x3140
-0x6620 = 0x4731
-0x6625 = 0x553D
-0x6627 = 0x664B
-0x6628 = 0x723A
-0x662D = 0x3C3E
-0x662F = 0x2740
-0x6634 = 0x655A
-0x6635 = 0x635A
-0x6636 = 0x645A
-0x663C = 0x6B43
-0x663F = 0x265B
-0x6641 = 0x6A5A
-0x6642 = 0x7E3B
-0x6643 = 0x3839
-0x6644 = 0x685A
-0x6649 = 0x695A
-0x664B = 0x383F
-0x664F = 0x675A
-0x6652 = 0x2F3B
-0x665D = 0x6C5A
-0x665E = 0x6B5A
-0x665F = 0x705A
-0x6662 = 0x715A
-0x6664 = 0x6D5A
-0x6666 = 0x2233
-0x6667 = 0x6E5A
-0x6668 = 0x6F5A
-0x6669 = 0x5548
-0x666E = 0x6149
-0x666F = 0x4A37
-0x6670 = 0x725A
-0x6674 = 0x3240
-0x6676 = 0x3D3E
-0x667A = 0x5243
-0x6681 = 0x4736
-0x6683 = 0x735A
-0x6684 = 0x775A
-0x6687 = 0x4B32
-0x6688 = 0x745A
-0x6689 = 0x765A
-0x668E = 0x755A
-0x6691 = 0x6B3D
-0x6696 = 0x4843
-0x6697 = 0x4530
-0x6698 = 0x785A
-0x669D = 0x795A
-0x66A2 = 0x2A44
-0x66A6 = 0x714E
-0x66AB = 0x433B
-0x66AE = 0x6B4A
-0x66B4 = 0x3D4B
-0x66B8 = 0x225B
-0x66B9 = 0x7B5A
-0x66BC = 0x7E5A
-0x66BE = 0x7D5A
-0x66C1 = 0x7A5A
-0x66C4 = 0x215B
-0x66C7 = 0x5E46
-0x66C9 = 0x7C5A
-0x66D6 = 0x235B
-0x66D9 = 0x6C3D
-0x66DA = 0x245B
-0x66DC = 0x4B4D
-0x66DD = 0x7847
-0x66E0 = 0x255B
-0x66E6 = 0x275B
-0x66E9 = 0x285B
-0x66F0 = 0x295B
-0x66F2 = 0x4A36
-0x66F3 = 0x4831
-0x66F5 = 0x2A5B
-0x66F7 = 0x2B5B
-0x66F8 = 0x713D
-0x66F9 = 0x6241
-0x66FC = 0x5852
-0x66FD = 0x3E41
-0x66FE = 0x3D41
-0x66FF = 0x5842
-0x6700 = 0x473A
-0x6703 = 0x7250
-0x6708 = 0x6E37
-0x6709 = 0x2D4D
-0x670B = 0x7E4A
-0x670D = 0x7E49
-0x670F = 0x2C5B
-0x6714 = 0x733A
-0x6715 = 0x3F44
-0x6716 = 0x2D5B
-0x6717 = 0x2F4F
-0x671B = 0x3E4B
-0x671D = 0x2B44
-0x671E = 0x2E5B
-0x671F = 0x7C34
-0x6726 = 0x2F5B
-0x6727 = 0x305B
-0x6728 = 0x5A4C
-0x672A = 0x244C
-0x672B = 0x764B
-0x672C = 0x5C4B
-0x672D = 0x253B
-0x672E = 0x325B
-0x6731 = 0x6B3C
-0x6734 = 0x514B
-0x6736 = 0x345B
-0x6737 = 0x375B
-0x6738 = 0x365B
-0x673A = 0x7934
-0x673D = 0x6035
-0x673F = 0x335B
-0x6741 = 0x355B
-0x6746 = 0x385B
-0x6749 = 0x793F
-0x674E = 0x7B4D
-0x674F = 0x4930
-0x6750 = 0x603A
-0x6751 = 0x3C42
-0x6753 = 0x5D3C
-0x6756 = 0x733E
-0x6759 = 0x3B5B
-0x675C = 0x4E45
-0x675E = 0x395B
-0x675F = 0x2B42
-0x6760 = 0x3A5B
-0x6761 = 0x723E
-0x6762 = 0x5D4C
-0x6763 = 0x3C5B
-0x6764 = 0x3D5B
-0x6765 = 0x684D
-0x676A = 0x425B
-0x676D = 0x3A39
-0x676F = 0x5547
-0x6770 = 0x3F5B
-0x6771 = 0x6C45
-0x6772 = 0x5E5A
-0x6773 = 0x625A
-0x6775 = 0x4F35
-0x677C = 0x415B
-0x677F = 0x4448
-0x6785 = 0x475B
-0x6787 = 0x7A48
-0x6789 = 0x3E5B
-0x678B = 0x445B
-0x678C = 0x435B
-0x6790 = 0x4F40
-0x6795 = 0x6D4B
-0x6797 = 0x534E
-0x679A = 0x674B
-0x679C = 0x4C32
-0x679D = 0x5E3B
-0x67A0 = 0x484F
-0x67A1 = 0x465B
-0x67A2 = 0x753F
-0x67A6 = 0x455B
-0x67A9 = 0x405B
-0x67AF = 0x4F38
-0x67B3 = 0x4C5B
-0x67B4 = 0x4A5B
-0x67B6 = 0x4D32
-0x67B7 = 0x485B
-0x67B8 = 0x4E5B
-0x67B9 = 0x545B
-0x67C1 = 0x4842
-0x67C4 = 0x414A
-0x67C6 = 0x565B
-0x67CA = 0x2249
-0x67CE = 0x555B
-0x67CF = 0x7047
-0x67D0 = 0x3F4B
-0x67D1 = 0x3B34
-0x67D3 = 0x7740
-0x67D4 = 0x403D
-0x67D8 = 0x5344
-0x67DA = 0x2E4D
-0x67DD = 0x515B
-0x67DE = 0x505B
-0x67E2 = 0x525B
-0x67E4 = 0x4F5B
-0x67E7 = 0x575B
-0x67E9 = 0x4D5B
-0x67EC = 0x4B5B
-0x67EE = 0x535B
-0x67EF = 0x495B
-0x67F1 = 0x6C43
-0x67F3 = 0x784C
-0x67F4 = 0x463C
-0x67F5 = 0x743A
-0x67FE = 0x6F4B
-0x67FF = 0x4133
-0x6802 = 0x4E44
-0x6803 = 0x4A46
-0x6804 = 0x4931
-0x6813 = 0x7240
-0x6816 = 0x3440
-0x6817 = 0x2A37
-0x681E = 0x595B
-0x6821 = 0x3B39
-0x6822 = 0x7C33
-0x682A = 0x7433
-0x682B = 0x615B
-0x6832 = 0x5E5B
-0x6834 = 0x7340
-0x6838 = 0x4B33
-0x6839 = 0x2C3A
-0x683C = 0x4A33
-0x683D = 0x4F3A
-0x6840 = 0x5C5B
-0x6841 = 0x6537
-0x6842 = 0x4B37
-0x6843 = 0x6D45
-0x6846 = 0x5A5B
-0x6848 = 0x4630
-0x684D = 0x5D5B
-0x684E = 0x5F5B
-0x6850 = 0x4D36
-0x6851 = 0x2C37
-0x6853 = 0x3C34
-0x6854 = 0x4B35
-0x6859 = 0x625B
-0x685C = 0x793A
-0x685D = 0x714B
-0x685F = 0x373B
-0x6863 = 0x635B
-0x6867 = 0x3049
-0x6874 = 0x6F5B
-0x6876 = 0x3332
-0x6877 = 0x645B
-0x687E = 0x755B
-0x687F = 0x655B
-0x6881 = 0x424E
-0x6883 = 0x6C5B
-0x6885 = 0x5F47
-0x688D = 0x745B
-0x688F = 0x675B
-0x6893 = 0x3430
-0x6894 = 0x695B
-0x6897 = 0x3C39
-0x689B = 0x6B5B
-0x689D = 0x6A5B
-0x689F = 0x665B
-0x68A0 = 0x715B
-0x68A2 = 0x3F3E
-0x68A6 = 0x6D54
-0x68A7 = 0x6838
-0x68A8 = 0x7C4D
-0x68AD = 0x685B
-0x68AF = 0x7444
-0x68B0 = 0x2333
-0x68B1 = 0x2D3A
-0x68B3 = 0x605B
-0x68B5 = 0x705B
-0x68B6 = 0x6133
-0x68B9 = 0x6E5B
-0x68BA = 0x725B
-0x68BC = 0x6E45
-0x68C4 = 0x7E34
-0x68C6 = 0x325C
-0x68C9 = 0x494C
-0x68CA = 0x775B
-0x68CB = 0x7D34
-0x68CD = 0x7E5B
-0x68D2 = 0x404B
-0x68D4 = 0x215C
-0x68D5 = 0x235C
-0x68D7 = 0x275C
-0x68D8 = 0x795B
-0x68DA = 0x2A43
-0x68DF = 0x6F45
-0x68E0 = 0x2B5C
-0x68E1 = 0x7C5B
-0x68E3 = 0x285C
-0x68E7 = 0x225C
-0x68EE = 0x393F
-0x68EF = 0x2C5C
-0x68F2 = 0x3340
-0x68F9 = 0x2A5C
-0x68FA = 0x3D34
-0x6900 = 0x504F
-0x6901 = 0x765B
-0x6904 = 0x265C
-0x6905 = 0x5830
-0x6908 = 0x785B
-0x690B = 0x3A4C
-0x690C = 0x7D5B
-0x690D = 0x223F
-0x690E = 0x4744
-0x690F = 0x735B
-0x6912 = 0x255C
-0x6919 = 0x7A3F
-0x691A = 0x2F5C
-0x691B = 0x7133
-0x691C = 0x2138
-0x6921 = 0x315C
-0x6922 = 0x7A5B
-0x6923 = 0x305C
-0x6925 = 0x295C
-0x6926 = 0x7B5B
-0x6928 = 0x2D5C
-0x692A = 0x2E5C
-0x6930 = 0x3F5C
-0x6934 = 0x4E46
-0x6936 = 0x245C
-0x6939 = 0x3B5C
-0x693D = 0x3D5C
-0x693F = 0x5844
-0x694A = 0x4C4D
-0x6953 = 0x7649
-0x6954 = 0x385C
-0x6955 = 0x4A42
-0x6959 = 0x3E5C
-0x695A = 0x3F41
-0x695C = 0x355C
-0x695D = 0x425C
-0x695E = 0x415C
-0x6960 = 0x6F46
-0x6961 = 0x405C
-0x6962 = 0x6A46
-0x696A = 0x445C
-0x696B = 0x375C
-0x696D = 0x4836
-0x696E = 0x3A5C
-0x696F = 0x5D3D
-0x6973 = 0x6047
-0x6974 = 0x3C5C
-0x6975 = 0x4B36
-0x6977 = 0x345C
-0x6978 = 0x365C
-0x6979 = 0x335C
-0x697C = 0x304F
-0x697D = 0x5A33
-0x697E = 0x395C
-0x6981 = 0x435C
-0x6982 = 0x3533
-0x698A = 0x673A
-0x698E = 0x5D31
-0x6991 = 0x545C
-0x6994 = 0x314F
-0x6995 = 0x575C
-0x699B = 0x3A3F
-0x699C = 0x565C
-0x69A0 = 0x555C
-0x69A7 = 0x525C
-0x69AE = 0x465C
-0x69B1 = 0x635C
-0x69B2 = 0x455C
-0x69B4 = 0x585C
-0x69BB = 0x505C
-0x69BE = 0x4B5C
-0x69BF = 0x485C
-0x69C1 = 0x495C
-0x69C3 = 0x515C
-0x69C7 = 0x2274
-0x69CA = 0x4E5C
-0x69CB = 0x3D39
-0x69CC = 0x4844
-0x69CD = 0x6441
-0x69CE = 0x4C5C
-0x69D0 = 0x475C
-0x69D3 = 0x4A5C
-0x69D9 = 0x6A4B
-0x69DD = 0x4F5C
-0x69DE = 0x595C
-0x69E7 = 0x615C
-0x69E8 = 0x5A5C
-0x69EB = 0x675C
-0x69ED = 0x655C
-0x69F2 = 0x605C
-0x69F9 = 0x5F5C
-0x69FB = 0x5044
-0x69FD = 0x6541
-0x69FF = 0x5D5C
-0x6A02 = 0x5B5C
-0x6A05 = 0x625C
-0x6A0A = 0x685C
-0x6A0B = 0x7548
-0x6A0C = 0x6E5C
-0x6A12 = 0x695C
-0x6A13 = 0x6C5C
-0x6A14 = 0x665C
-0x6A17 = 0x7443
-0x6A19 = 0x3849
-0x6A1E = 0x645C
-0x6A1F = 0x403E
-0x6A21 = 0x4F4C
-0x6A22 = 0x785C
-0x6A23 = 0x6B5C
-0x6A29 = 0x2238
-0x6A2A = 0x2332
-0x6A2B = 0x5F33
-0x6A2E = 0x535C
-0x6A35 = 0x413E
-0x6A36 = 0x705C
-0x6A38 = 0x775C
-0x6A39 = 0x793C
-0x6A3A = 0x7233
-0x6A3D = 0x2E43
-0x6A44 = 0x6D5C
-0x6A47 = 0x725C
-0x6A48 = 0x765C
-0x6A58 = 0x4C35
-0x6A59 = 0x745C
-0x6A5F = 0x2135
-0x6A61 = 0x4B46
-0x6A62 = 0x735C
-0x6A66 = 0x755C
-0x6A72 = 0x6F5C
-0x6A78 = 0x715C
-0x6A7F = 0x6033
-0x6A80 = 0x4943
-0x6A84 = 0x7C5C
-0x6A8D = 0x7A5C
-0x6A8E = 0x6938
-0x6A90 = 0x795C
-0x6A97 = 0x215D
-0x6A9C = 0x585B
-0x6AA0 = 0x7B5C
-0x6AA2 = 0x7D5C
-0x6AA3 = 0x7E5C
-0x6AAA = 0x2C5D
-0x6AAC = 0x285D
-0x6AAE = 0x6D5B
-0x6AB3 = 0x275D
-0x6AB8 = 0x265D
-0x6ABB = 0x235D
-0x6AC1 = 0x6A5C
-0x6AC2 = 0x255D
-0x6AC3 = 0x245D
-0x6AD1 = 0x2A5D
-0x6AD3 = 0x264F
-0x6ADA = 0x2D5D
-0x6ADB = 0x7B36
-0x6ADE = 0x295D
-0x6ADF = 0x2B5D
-0x6AE8 = 0x2748
-0x6AEA = 0x2E5D
-0x6AFA = 0x325D
-0x6AFB = 0x2F5D
-0x6B04 = 0x734D
-0x6B05 = 0x305D
-0x6B0A = 0x5E5C
-0x6B12 = 0x335D
-0x6B16 = 0x345D
-0x6B1D = 0x3531
-0x6B1F = 0x365D
-0x6B20 = 0x6737
-0x6B21 = 0x213C
-0x6B23 = 0x5536
-0x6B27 = 0x2432
-0x6B32 = 0x5F4D
-0x6B37 = 0x385D
-0x6B38 = 0x375D
-0x6B39 = 0x3A5D
-0x6B3A = 0x3D35
-0x6B3D = 0x5636
-0x6B3E = 0x3E34
-0x6B43 = 0x3D5D
-0x6B47 = 0x3C5D
-0x6B49 = 0x3E5D
-0x6B4C = 0x4E32
-0x6B4E = 0x3743
-0x6B50 = 0x3F5D
-0x6B53 = 0x3F34
-0x6B54 = 0x415D
-0x6B59 = 0x405D
-0x6B5B = 0x425D
-0x6B5F = 0x435D
-0x6B61 = 0x445D
-0x6B62 = 0x5F3B
-0x6B63 = 0x3540
-0x6B64 = 0x213A
-0x6B66 = 0x7049
-0x6B69 = 0x624A
-0x6B6A = 0x444F
-0x6B6F = 0x753B
-0x6B73 = 0x503A
-0x6B74 = 0x724E
-0x6B78 = 0x455D
-0x6B79 = 0x465D
-0x6B7B = 0x603B
-0x6B7F = 0x475D
-0x6B80 = 0x485D
-0x6B83 = 0x4A5D
-0x6B84 = 0x495D
-0x6B86 = 0x584B
-0x6B89 = 0x5E3D
-0x6B8A = 0x6C3C
-0x6B8B = 0x443B
-0x6B8D = 0x4B5D
-0x6B95 = 0x4D5D
-0x6B96 = 0x233F
-0x6B98 = 0x4C5D
-0x6B9E = 0x4E5D
-0x6BA4 = 0x4F5D
-0x6BAA = 0x505D
-0x6BAB = 0x515D
-0x6BAF = 0x525D
-0x6BB1 = 0x545D
-0x6BB2 = 0x535D
-0x6BB3 = 0x555D
-0x6BB4 = 0x2532
-0x6BB5 = 0x4A43
-0x6BB7 = 0x565D
-0x6BBA = 0x263B
-0x6BBB = 0x4C33
-0x6BBC = 0x575D
-0x6BBF = 0x4245
-0x6BC0 = 0x4C54
-0x6BC5 = 0x2335
-0x6BC6 = 0x585D
-0x6BCB = 0x595D
-0x6BCD = 0x6C4A
-0x6BCE = 0x684B
-0x6BD2 = 0x4746
-0x6BD3 = 0x5A5D
-0x6BD4 = 0x6648
-0x6BD8 = 0x7B48
-0x6BDB = 0x534C
-0x6BDF = 0x5B5D
-0x6BEC = 0x5C5D
-0x6BEF = 0x5F5D
-0x6BF3 = 0x5E5D
-0x6C08 = 0x615D
-0x6C0F = 0x613B
-0x6C11 = 0x314C
-0x6C13 = 0x625D
-0x6C14 = 0x635D
-0x6C17 = 0x2435
-0x6C1B = 0x645D
-0x6C23 = 0x665D
-0x6C24 = 0x655D
-0x6C34 = 0x653F
-0x6C37 = 0x3949
-0x6C38 = 0x4A31
-0x6C3E = 0x4548
-0x6C40 = 0x7544
-0x6C41 = 0x413D
-0x6C42 = 0x6135
-0x6C4E = 0x4648
-0x6C50 = 0x2E3C
-0x6C55 = 0x685D
-0x6C57 = 0x4034
-0x6C5A = 0x7831
-0x6C5D = 0x7246
-0x6C5E = 0x675D
-0x6C5F = 0x3E39
-0x6C60 = 0x5343
-0x6C62 = 0x695D
-0x6C68 = 0x715D
-0x6C6A = 0x6A5D
-0x6C70 = 0x4142
-0x6C72 = 0x6235
-0x6C73 = 0x725D
-0x6C7A = 0x6837
-0x6C7D = 0x2535
-0x6C7E = 0x705D
-0x6C81 = 0x6E5D
-0x6C82 = 0x6B5D
-0x6C83 = 0x604D
-0x6C88 = 0x4044
-0x6C8C = 0x5946
-0x6C8D = 0x6C5D
-0x6C90 = 0x745D
-0x6C92 = 0x735D
-0x6C93 = 0x2337
-0x6C96 = 0x2D32
-0x6C99 = 0x3B3A
-0x6C9A = 0x6D5D
-0x6C9B = 0x6F5D
-0x6CA1 = 0x574B
-0x6CA2 = 0x7442
-0x6CAB = 0x774B
-0x6CAE = 0x7C5D
-0x6CB1 = 0x7D5D
-0x6CB3 = 0x4F32
-0x6CB8 = 0x284A
-0x6CB9 = 0x7D4C
-0x6CBA = 0x215E
-0x6CBB = 0x233C
-0x6CBC = 0x423E
-0x6CBD = 0x785D
-0x6CBE = 0x7E5D
-0x6CBF = 0x6831
-0x6CC1 = 0x3736
-0x6CC4 = 0x755D
-0x6CC5 = 0x7A5D
-0x6CC9 = 0x7440
-0x6CCA = 0x7147
-0x6CCC = 0x6748
-0x6CD3 = 0x775D
-0x6CD5 = 0x214B
-0x6CD7 = 0x795D
-0x6CD9 = 0x245E
-0x6CDB = 0x225E
-0x6CDD = 0x7B5D
-0x6CE1 = 0x224B
-0x6CE2 = 0x4847
-0x6CE3 = 0x6335
-0x6CE5 = 0x2545
-0x6CE8 = 0x6D43
-0x6CEA = 0x255E
-0x6CEF = 0x235E
-0x6CF0 = 0x5942
-0x6CF1 = 0x765D
-0x6CF3 = 0x4B31
-0x6D0B = 0x4E4D
-0x6D0C = 0x305E
-0x6D12 = 0x2F5E
-0x6D17 = 0x7640
-0x6D19 = 0x2C5E
-0x6D1B = 0x6C4D
-0x6D1E = 0x3646
-0x6D1F = 0x265E
-0x6D25 = 0x4544
-0x6D29 = 0x4C31
-0x6D2A = 0x3F39
-0x6D2B = 0x295E
-0x6D32 = 0x273D
-0x6D33 = 0x2E5E
-0x6D35 = 0x2D5E
-0x6D36 = 0x285E
-0x6D38 = 0x2B5E
-0x6D3B = 0x6833
-0x6D3D = 0x2A5E
-0x6D3E = 0x4947
-0x6D41 = 0x2E4E
-0x6D44 = 0x743E
-0x6D45 = 0x7540
-0x6D59 = 0x365E
-0x6D5A = 0x345E
-0x6D5C = 0x4D49
-0x6D63 = 0x315E
-0x6D64 = 0x335E
-0x6D66 = 0x3A31
-0x6D69 = 0x4039
-0x6D6A = 0x324F
-0x6D6C = 0x3D33
-0x6D6E = 0x6249
-0x6D74 = 0x614D
-0x6D77 = 0x2433
-0x6D78 = 0x3B3F
-0x6D79 = 0x355E
-0x6D85 = 0x3A5E
-0x6D88 = 0x433E
-0x6D8C = 0x304D
-0x6D8E = 0x375E
-0x6D93 = 0x325E
-0x6D95 = 0x385E
-0x6D99 = 0x5E4E
-0x6D9B = 0x7345
-0x6D9C = 0x4246
-0x6DAF = 0x3633
-0x6DB2 = 0x5531
-0x6DB5 = 0x3E5E
-0x6DB8 = 0x415E
-0x6DBC = 0x434E
-0x6DC0 = 0x644D
-0x6DC5 = 0x485E
-0x6DC6 = 0x425E
-0x6DC7 = 0x3F5E
-0x6DCB = 0x544E
-0x6DCC = 0x455E
-0x6DD1 = 0x4A3D
-0x6DD2 = 0x475E
-0x6DD5 = 0x4C5E
-0x6DD8 = 0x7145
-0x6DD9 = 0x4A5E
-0x6DDE = 0x445E
-0x6DE1 = 0x3843
-0x6DE4 = 0x4B5E
-0x6DE6 = 0x405E
-0x6DE8 = 0x465E
-0x6DEA = 0x4D5E
-0x6DEB = 0x7C30
-0x6DEC = 0x435E
-0x6DEE = 0x4E5E
-0x6DF1 = 0x3C3F
-0x6DF3 = 0x5F3D
-0x6DF5 = 0x254A
-0x6DF7 = 0x2E3A
-0x6DF9 = 0x3B5E
-0x6DFA = 0x495E
-0x6DFB = 0x3A45
-0x6E05 = 0x3640
-0x6E07 = 0x6933
-0x6E08 = 0x513A
-0x6E09 = 0x443E
-0x6E0A = 0x3D5E
-0x6E0B = 0x423D
-0x6E13 = 0x4C37
-0x6E15 = 0x3C5E
-0x6E19 = 0x525E
-0x6E1A = 0x6D3D
-0x6E1B = 0x3A38
-0x6E1D = 0x615E
-0x6E1F = 0x5B5E
-0x6E20 = 0x7435
-0x6E21 = 0x4F45
-0x6E23 = 0x565E
-0x6E24 = 0x5F5E
-0x6E25 = 0x2F30
-0x6E26 = 0x3231
-0x6E29 = 0x3932
-0x6E2B = 0x585E
-0x6E2C = 0x2C42
-0x6E2D = 0x4F5E
-0x6E2E = 0x515E
-0x6E2F = 0x4139
-0x6E38 = 0x625E
-0x6E3A = 0x5D5E
-0x6E3E = 0x555E
-0x6E43 = 0x5C5E
-0x6E4A = 0x2B4C
-0x6E4D = 0x5A5E
-0x6E56 = 0x5038
-0x6E58 = 0x453E
-0x6E5B = 0x3943
-0x6E5F = 0x545E
-0x6E67 = 0x2F4D
-0x6E6B = 0x575E
-0x6E6E = 0x505E
-0x6E6F = 0x7245
-0x6E72 = 0x535E
-0x6E76 = 0x595E
-0x6E7E = 0x514F
-0x6E7F = 0x3E3C
-0x6E80 = 0x7E4B
-0x6E82 = 0x635E
-0x6E8C = 0x2E48
-0x6E8F = 0x6F5E
-0x6E90 = 0x3B38
-0x6E96 = 0x603D
-0x6E98 = 0x655E
-0x6E9C = 0x2F4E
-0x6E9D = 0x4239
-0x6E9F = 0x725E
-0x6EA2 = 0x6E30
-0x6EA5 = 0x705E
-0x6EAA = 0x645E
-0x6EAF = 0x6A5E
-0x6EB2 = 0x6C5E
-0x6EB6 = 0x4F4D
-0x6EB7 = 0x675E
-0x6EBA = 0x2E45
-0x6EBD = 0x695E
-0x6EC2 = 0x715E
-0x6EC4 = 0x6B5E
-0x6EC5 = 0x474C
-0x6EC9 = 0x665E
-0x6ECB = 0x223C
-0x6ECC = 0x7E5E
-0x6ED1 = 0x6A33
-0x6ED3 = 0x685E
-0x6ED4 = 0x6D5E
-0x6ED5 = 0x6E5E
-0x6EDD = 0x6C42
-0x6EDE = 0x5A42
-0x6EEC = 0x765E
-0x6EEF = 0x7C5E
-0x6EF2 = 0x7A5E
-0x6EF4 = 0x2945
-0x6EF7 = 0x235F
-0x6EF8 = 0x775E
-0x6EFE = 0x785E
-0x6EFF = 0x605E
-0x6F01 = 0x7935
-0x6F02 = 0x3A49
-0x6F06 = 0x3F3C
-0x6F09 = 0x7739
-0x6F0F = 0x334F
-0x6F11 = 0x745E
-0x6F13 = 0x225F
-0x6F14 = 0x6931
-0x6F15 = 0x6641
-0x6F20 = 0x7947
-0x6F22 = 0x4134
-0x6F23 = 0x7A4E
-0x6F2B = 0x214C
-0x6F2C = 0x5244
-0x6F31 = 0x7B5E
-0x6F32 = 0x7D5E
-0x6F38 = 0x3241
-0x6F3E = 0x215F
-0x6F3F = 0x795E
-0x6F41 = 0x735E
-0x6F45 = 0x4334
-0x6F54 = 0x6937
-0x6F58 = 0x2F5F
-0x6F5B = 0x2A5F
-0x6F5C = 0x7840
-0x6F5F = 0x6333
-0x6F64 = 0x613D
-0x6F66 = 0x335F
-0x6F6D = 0x2C5F
-0x6F6E = 0x2C44
-0x6F6F = 0x295F
-0x6F70 = 0x5944
-0x6F74 = 0x4C5F
-0x6F78 = 0x265F
-0x6F7A = 0x255F
-0x6F7C = 0x2E5F
-0x6F80 = 0x285F
-0x6F81 = 0x275F
-0x6F82 = 0x2D5F
-0x6F84 = 0x2140
-0x6F86 = 0x245F
-0x6F8E = 0x305F
-0x6F91 = 0x315F
-0x6F97 = 0x4234
-0x6FA1 = 0x365F
-0x6FA3 = 0x355F
-0x6FA4 = 0x375F
-0x6FAA = 0x3A5F
-0x6FB1 = 0x4345
-0x6FB3 = 0x345F
-0x6FB9 = 0x385F
-0x6FC0 = 0x6337
-0x6FC1 = 0x7942
-0x6FC2 = 0x325F
-0x6FC3 = 0x3B47
-0x6FC6 = 0x395F
-0x6FD4 = 0x3E5F
-0x6FD5 = 0x3C5F
-0x6FD8 = 0x3F5F
-0x6FDB = 0x425F
-0x6FDF = 0x3B5F
-0x6FE0 = 0x6A39
-0x6FE1 = 0x2847
-0x6FE4 = 0x395E
-0x6FEB = 0x744D
-0x6FEC = 0x3D5F
-0x6FEE = 0x415F
-0x6FEF = 0x7542
-0x6FF1 = 0x405F
-0x6FF3 = 0x2B5F
-0x6FF6 = 0x696F
-0x6FFA = 0x455F
-0x6FFE = 0x495F
-0x7001 = 0x475F
-0x7009 = 0x435F
-0x700B = 0x445F
-0x700F = 0x485F
-0x7011 = 0x465F
-0x7015 = 0x4E49
-0x7018 = 0x4E5F
-0x701A = 0x4B5F
-0x701B = 0x4A5F
-0x701D = 0x4D5F
-0x701E = 0x5446
-0x701F = 0x4F5F
-0x7026 = 0x7543
-0x7027 = 0x6D42
-0x702C = 0x2540
-0x7030 = 0x505F
-0x7032 = 0x525F
-0x703E = 0x515F
-0x704C = 0x755E
-0x7051 = 0x535F
-0x7058 = 0x6746
-0x7063 = 0x545F
-0x706B = 0x5032
-0x706F = 0x7445
-0x7070 = 0x2533
-0x7078 = 0x6435
-0x707C = 0x5E3C
-0x707D = 0x523A
-0x7089 = 0x274F
-0x708A = 0x663F
-0x708E = 0x6A31
-0x7092 = 0x565F
-0x7099 = 0x555F
-0x70AC = 0x595F
-0x70AD = 0x3A43
-0x70AE = 0x5C5F
-0x70AF = 0x575F
-0x70B3 = 0x5B5F
-0x70B8 = 0x5A5F
-0x70B9 = 0x4045
-0x70BA = 0x5930
-0x70C8 = 0x754E
-0x70CB = 0x5E5F
-0x70CF = 0x2831
-0x70D9 = 0x605F
-0x70DF = 0x5D5F
-0x70F1 = 0x585F
-0x70F9 = 0x234B
-0x70FD = 0x625F
-0x7109 = 0x615F
-0x7114 = 0x6B31
-0x7119 = 0x645F
-0x711A = 0x324A
-0x711C = 0x635F
-0x7121 = 0x354C
-0x7126 = 0x473E
-0x7136 = 0x3341
-0x713C = 0x463E
-0x7149 = 0x7B4E
-0x714C = 0x6A5F
-0x714E = 0x7940
-0x7155 = 0x665F
-0x7156 = 0x6B5F
-0x7159 = 0x6C31
-0x7162 = 0x695F
-0x7164 = 0x6147
-0x7165 = 0x655F
-0x7166 = 0x685F
-0x7167 = 0x483E
-0x7169 = 0x5148
-0x716C = 0x6C5F
-0x716E = 0x513C
-0x717D = 0x7A40
-0x7184 = 0x6F5F
-0x7188 = 0x675F
-0x718A = 0x2737
-0x718F = 0x6D5F
-0x7194 = 0x504D
-0x7195 = 0x705F
-0x7199 = 0x2674
-0x719F = 0x4F3D
-0x71A8 = 0x715F
-0x71AC = 0x725F
-0x71B1 = 0x2E47
-0x71B9 = 0x745F
-0x71BE = 0x755F
-0x71C3 = 0x3347
-0x71C8 = 0x7545
-0x71C9 = 0x775F
-0x71CE = 0x795F
-0x71D0 = 0x554E
-0x71D2 = 0x765F
-0x71D4 = 0x785F
-0x71D5 = 0x6D31
-0x71D7 = 0x735F
-0x71DF = 0x5B53
-0x71E0 = 0x7A5F
-0x71E5 = 0x6741
-0x71E6 = 0x383B
-0x71E7 = 0x7C5F
-0x71EC = 0x7B5F
-0x71ED = 0x243F
-0x71EE = 0x5952
-0x71F5 = 0x7D5F
-0x71F9 = 0x2160
-0x71FB = 0x6E5F
-0x71FC = 0x7E5F
-0x71FF = 0x2260
-0x7206 = 0x7A47
-0x720D = 0x2360
-0x7210 = 0x2460
-0x721B = 0x2560
-0x7228 = 0x2660
-0x722A = 0x5E44
-0x722C = 0x2860
-0x722D = 0x2760
-0x7230 = 0x2960
-0x7232 = 0x2A60
-0x7235 = 0x5F3C
-0x7236 = 0x6349
-0x723A = 0x6C4C
-0x723B = 0x2B60
-0x723C = 0x2C60
-0x723D = 0x5641
-0x723E = 0x243C
-0x723F = 0x2D60
-0x7240 = 0x2E60
-0x7246 = 0x2F60
-0x7247 = 0x524A
-0x7248 = 0x4748
-0x724B = 0x3060
-0x724C = 0x5747
-0x7252 = 0x2D44
-0x7258 = 0x3160
-0x7259 = 0x6732
-0x725B = 0x6D35
-0x725D = 0x464C
-0x725F = 0x364C
-0x7261 = 0x3432
-0x7262 = 0x344F
-0x7267 = 0x524B
-0x7269 = 0x2A4A
-0x7272 = 0x3740
-0x7274 = 0x3260
-0x7279 = 0x4346
-0x727D = 0x2338
-0x727E = 0x3360
-0x7280 = 0x543A
-0x7281 = 0x3560
-0x7282 = 0x3460
-0x7287 = 0x3660
-0x7292 = 0x3760
-0x7296 = 0x3860
-0x72A0 = 0x3E35
-0x72A2 = 0x3960
-0x72A7 = 0x3A60
-0x72AC = 0x2438
-0x72B2 = 0x3C60
-0x72B6 = 0x753E
-0x72B9 = 0x3B60
-0x72C2 = 0x3836
-0x72C3 = 0x3D60
-0x72C4 = 0x3F60
-0x72C6 = 0x3E60
-0x72CE = 0x4060
-0x72D0 = 0x5138
-0x72D2 = 0x4160
-0x72D7 = 0x6936
-0x72D9 = 0x4041
-0x72DB = 0x7D39
-0x72E0 = 0x4360
-0x72E1 = 0x4460
-0x72E2 = 0x4260
-0x72E9 = 0x6D3C
-0x72EC = 0x4846
-0x72ED = 0x3936
-0x72F7 = 0x4660
-0x72F8 = 0x2C43
-0x72F9 = 0x4560
-0x72FC = 0x354F
-0x72FD = 0x6247
-0x730A = 0x4960
-0x7316 = 0x4B60
-0x7317 = 0x4860
-0x731B = 0x544C
-0x731C = 0x4A60
-0x731D = 0x4C60
-0x731F = 0x444E
-0x7325 = 0x5060
-0x7329 = 0x4F60
-0x732A = 0x7643
-0x732B = 0x2D47
-0x732E = 0x2538
-0x732F = 0x4E60
-0x7334 = 0x4D60
-0x7336 = 0x314D
-0x7337 = 0x324D
-0x733E = 0x5160
-0x733F = 0x6E31
-0x7344 = 0x7639
-0x7345 = 0x623B
-0x734E = 0x5260
-0x734F = 0x5360
-0x7357 = 0x5560
-0x7363 = 0x433D
-0x7368 = 0x5760
-0x736A = 0x5660
-0x7370 = 0x5860
-0x7372 = 0x4D33
-0x7375 = 0x5A60
-0x7378 = 0x5960
-0x737A = 0x5C60
-0x737B = 0x5B60
-0x7384 = 0x3C38
-0x7387 = 0x284E
-0x7389 = 0x4C36
-0x738B = 0x2632
-0x7396 = 0x6A36
-0x73A9 = 0x6134
-0x73B2 = 0x684E
-0x73B3 = 0x5E60
-0x73C0 = 0x6160
-0x73C2 = 0x5132
-0x73C8 = 0x5D60
-0x73CA = 0x393B
-0x73CD = 0x4144
-0x73CE = 0x5F60
-0x73DE = 0x6460
-0x73E0 = 0x6E3C
-0x73E5 = 0x6260
-0x73EA = 0x3E37
-0x73ED = 0x4948
-0x73EE = 0x6360
-0x73F1 = 0x7E60
-0x73F8 = 0x6960
-0x73FE = 0x3D38
-0x7403 = 0x6535
-0x7405 = 0x6660
-0x7406 = 0x7D4D
-0x7409 = 0x304E
-0x7422 = 0x7642
-0x7425 = 0x6860
-0x7432 = 0x6A60
-0x7433 = 0x564E
-0x7434 = 0x5736
-0x7435 = 0x7C48
-0x7436 = 0x4A47
-0x743A = 0x6B60
-0x743F = 0x6D60
-0x7441 = 0x7060
-0x7455 = 0x6C60
-0x7459 = 0x6F60
-0x745A = 0x6A38
-0x745B = 0x4D31
-0x745C = 0x7160
-0x745E = 0x703F
-0x745F = 0x6E60
-0x7460 = 0x5C4E
-0x7463 = 0x7460
-0x7464 = 0x2474
-0x7469 = 0x7260
-0x746A = 0x7560
-0x746F = 0x6760
-0x7470 = 0x7360
-0x7473 = 0x3C3A
-0x7476 = 0x7660
-0x747E = 0x7760
-0x7483 = 0x7E4D
-0x748B = 0x7860
-0x749E = 0x7960
-0x74A2 = 0x6560
-0x74A7 = 0x7A60
-0x74B0 = 0x4434
-0x74BD = 0x253C
-0x74CA = 0x7B60
-0x74CF = 0x7C60
-0x74D4 = 0x7D60
-0x74DC = 0x3B31
-0x74E0 = 0x2161
-0x74E2 = 0x3B49
-0x74E3 = 0x2261
-0x74E6 = 0x2434
-0x74E7 = 0x2361
-0x74E9 = 0x2461
-0x74EE = 0x2561
-0x74F0 = 0x2761
-0x74F1 = 0x2861
-0x74F2 = 0x2661
-0x74F6 = 0x5349
-0x74F7 = 0x2A61
-0x74F8 = 0x2961
-0x7503 = 0x2C61
-0x7504 = 0x2B61
-0x7505 = 0x2D61
-0x750C = 0x2E61
-0x750D = 0x3061
-0x750E = 0x2F61
-0x7511 = 0x7939
-0x7513 = 0x3261
-0x7515 = 0x3161
-0x7518 = 0x4534
-0x751A = 0x533F
-0x751C = 0x3C45
-0x751E = 0x3361
-0x751F = 0x3840
-0x7523 = 0x3A3B
-0x7525 = 0x7931
-0x7526 = 0x3461
-0x7528 = 0x514D
-0x752B = 0x634A
-0x752C = 0x3561
-0x7530 = 0x4445
-0x7531 = 0x334D
-0x7532 = 0x4339
-0x7533 = 0x3D3F
-0x7537 = 0x4B43
-0x7538 = 0x3452
-0x753A = 0x2E44
-0x753B = 0x6832
-0x753C = 0x3661
-0x7544 = 0x3761
-0x7546 = 0x3C61
-0x7549 = 0x3A61
-0x754A = 0x3961
-0x754B = 0x425A
-0x754C = 0x2633
-0x754D = 0x3861
-0x754F = 0x5A30
-0x7551 = 0x2A48
-0x7554 = 0x4A48
-0x7559 = 0x314E
-0x755A = 0x3D61
-0x755B = 0x3B61
-0x755C = 0x5C43
-0x755D = 0x2640
-0x7560 = 0x2B48
-0x7562 = 0x2D49
-0x7564 = 0x3F61
-0x7565 = 0x2C4E
-0x7566 = 0x4D37
-0x7567 = 0x4061
-0x7569 = 0x3E61
-0x756A = 0x5648
-0x756B = 0x4161
-0x756D = 0x4261
-0x7570 = 0x5B30
-0x7573 = 0x763E
-0x7574 = 0x4761
-0x7576 = 0x4461
-0x7577 = 0x6D46
-0x7578 = 0x4361
-0x757F = 0x2635
-0x7582 = 0x4A61
-0x7586 = 0x4561
-0x7587 = 0x4661
-0x7589 = 0x4961
-0x758A = 0x4861
-0x758B = 0x2549
-0x758E = 0x4241
-0x7591 = 0x3F35
-0x7594 = 0x4B61
-0x759A = 0x4C61
-0x759D = 0x4D61
-0x75A3 = 0x4F61
-0x75A5 = 0x4E61
-0x75AB = 0x5631
-0x75B1 = 0x5761
-0x75B2 = 0x6848
-0x75B3 = 0x5161
-0x75B5 = 0x5361
-0x75B8 = 0x5561
-0x75B9 = 0x3E3F
-0x75BC = 0x5661
-0x75BD = 0x5461
-0x75BE = 0x403C
-0x75C2 = 0x5061
-0x75C3 = 0x5261
-0x75C5 = 0x4249
-0x75C7 = 0x493E
-0x75CA = 0x5961
-0x75CD = 0x5861
-0x75D2 = 0x5A61
-0x75D4 = 0x263C
-0x75D5 = 0x2F3A
-0x75D8 = 0x7745
-0x75D9 = 0x5B61
-0x75DB = 0x4B44
-0x75DE = 0x5D61
-0x75E2 = 0x214E
-0x75E3 = 0x5C61
-0x75E9 = 0x6941
-0x75F0 = 0x6261
-0x75F2 = 0x6461
-0x75F3 = 0x6561
-0x75F4 = 0x5443
-0x75FA = 0x6361
-0x75FC = 0x6061
-0x75FE = 0x5E61
-0x75FF = 0x5F61
-0x7609 = 0x6861
-0x760B = 0x6661
-0x760D = 0x6761
-0x761F = 0x6961
-0x7620 = 0x6B61
-0x7621 = 0x6C61
-0x7622 = 0x6D61
-0x7624 = 0x6E61
-0x7627 = 0x6A61
-0x7630 = 0x7061
-0x7634 = 0x6F61
-0x763B = 0x7161
-0x7642 = 0x454E
-0x7646 = 0x7461
-0x7647 = 0x7261
-0x7648 = 0x7361
-0x764C = 0x6234
-0x7652 = 0x7E4C
-0x7658 = 0x7661
-0x765C = 0x7561
-0x7661 = 0x7761
-0x7662 = 0x7861
-0x7667 = 0x7C61
-0x7668 = 0x7961
-0x7669 = 0x7A61
-0x766A = 0x7B61
-0x766C = 0x7D61
-0x7670 = 0x7E61
-0x7672 = 0x2162
-0x7676 = 0x2262
-0x7678 = 0x2362
-0x767A = 0x2F48
-0x767B = 0x5045
-0x767C = 0x2462
-0x767D = 0x7247
-0x767E = 0x3449
-0x7680 = 0x2562
-0x7683 = 0x2662
-0x7684 = 0x2A45
-0x7686 = 0x2733
-0x7687 = 0x4439
-0x7688 = 0x2762
-0x768B = 0x2862
-0x768E = 0x2962
-0x7690 = 0x293B
-0x7693 = 0x2B62
-0x7696 = 0x2A62
-0x7699 = 0x2C62
-0x769A = 0x2D62
-0x76AE = 0x6948
-0x76B0 = 0x2E62
-0x76B4 = 0x2F62
-0x76B7 = 0x6973
-0x76B8 = 0x3062
-0x76B9 = 0x3162
-0x76BA = 0x3262
-0x76BF = 0x2E3B
-0x76C2 = 0x3362
-0x76C3 = 0x5647
-0x76C6 = 0x5F4B
-0x76C8 = 0x4E31
-0x76CA = 0x5731
-0x76CD = 0x3462
-0x76D2 = 0x3662
-0x76D6 = 0x3562
-0x76D7 = 0x7045
-0x76DB = 0x3940
-0x76DC = 0x395D
-0x76DE = 0x3762
-0x76DF = 0x414C
-0x76E1 = 0x3862
-0x76E3 = 0x4634
-0x76E4 = 0x5748
-0x76E5 = 0x3962
-0x76E7 = 0x3A62
-0x76EA = 0x3B62
-0x76EE = 0x5C4C
-0x76F2 = 0x554C
-0x76F4 = 0x3E44
-0x76F8 = 0x6A41
-0x76FB = 0x3D62
-0x76FE = 0x623D
-0x7701 = 0x4A3E
-0x7704 = 0x4062
-0x7707 = 0x3F62
-0x7708 = 0x3E62
-0x7709 = 0x7D48
-0x770B = 0x4734
-0x770C = 0x2938
-0x771B = 0x4662
-0x771E = 0x4362
-0x7720 = 0x324C
-0x7724 = 0x4262
-0x7725 = 0x4462
-0x7726 = 0x4562
-0x7729 = 0x4162
-0x7737 = 0x4762
-0x7738 = 0x4862
-0x773A = 0x2F44
-0x773C = 0x6334
-0x7740 = 0x6543
-0x7747 = 0x4962
-0x775A = 0x4A62
-0x775B = 0x4D62
-0x7761 = 0x673F
-0x7763 = 0x4446
-0x7765 = 0x4E62
-0x7766 = 0x534B
-0x7768 = 0x4B62
-0x776B = 0x4C62
-0x7779 = 0x5162
-0x777E = 0x5062
-0x777F = 0x4F62
-0x778B = 0x5362
-0x778E = 0x5262
-0x7791 = 0x5462
-0x779E = 0x5662
-0x77A0 = 0x5562
-0x77A5 = 0x4D4A
-0x77AC = 0x563D
-0x77AD = 0x464E
-0x77B0 = 0x5762
-0x77B3 = 0x3746
-0x77B6 = 0x5862
-0x77B9 = 0x5962
-0x77BB = 0x5D62
-0x77BC = 0x5B62
-0x77BD = 0x5C62
-0x77BF = 0x5A62
-0x77C7 = 0x5E62
-0x77CD = 0x5F62
-0x77D7 = 0x6062
-0x77DA = 0x6162
-0x77DB = 0x374C
-0x77E2 = 0x704C
-0x77E3 = 0x6362
-0x77E5 = 0x4E43
-0x77E7 = 0x6A47
-0x77E9 = 0x6B36
-0x77ED = 0x3B43
-0x77EE = 0x6462
-0x77EF = 0x3A36
-0x77F3 = 0x5040
-0x77FC = 0x6562
-0x7802 = 0x3D3A
-0x780C = 0x6662
-0x7812 = 0x6762
-0x7814 = 0x2638
-0x7815 = 0x553A
-0x7820 = 0x6962
-0x7825 = 0x5645
-0x7826 = 0x563A
-0x7827 = 0x4E35
-0x7832 = 0x244B
-0x7834 = 0x4B47
-0x783A = 0x5745
-0x783F = 0x5C39
-0x7845 = 0x6B62
-0x785D = 0x4B3E
-0x786B = 0x324E
-0x786C = 0x4539
-0x786F = 0x2738
-0x7872 = 0x2348
-0x7874 = 0x6D62
-0x787C = 0x6F62
-0x7881 = 0x6B38
-0x7886 = 0x6E62
-0x7887 = 0x7644
-0x788C = 0x7162
-0x788D = 0x3733
-0x788E = 0x6C62
-0x7891 = 0x6A48
-0x7893 = 0x3031
-0x7895 = 0x6C3A
-0x7897 = 0x524F
-0x789A = 0x7062
-0x78A3 = 0x7262
-0x78A7 = 0x4B4A
-0x78A9 = 0x5940
-0x78AA = 0x7462
-0x78AF = 0x7562
-0x78B5 = 0x7362
-0x78BA = 0x4E33
-0x78BC = 0x7B62
-0x78BE = 0x7A62
-0x78C1 = 0x273C
-0x78C5 = 0x7C62
-0x78C6 = 0x7762
-0x78CA = 0x7D62
-0x78CB = 0x7862
-0x78D0 = 0x5848
-0x78D1 = 0x7662
-0x78D4 = 0x7962
-0x78DA = 0x2263
-0x78E7 = 0x2163
-0x78E8 = 0x614B
-0x78EC = 0x7E62
-0x78EF = 0x6B30
-0x78F4 = 0x2463
-0x78FD = 0x2363
-0x7901 = 0x4C3E
-0x7907 = 0x2563
-0x790E = 0x4341
-0x7911 = 0x2763
-0x7912 = 0x2663
-0x7919 = 0x2863
-0x7926 = 0x6862
-0x792A = 0x6A62
-0x792B = 0x2A63
-0x792C = 0x2963
-0x793A = 0x283C
-0x793C = 0x694E
-0x793E = 0x523C
-0x7940 = 0x2B63
-0x7947 = 0x4035
-0x7948 = 0x2735
-0x7949 = 0x633B
-0x7950 = 0x344D
-0x7953 = 0x3163
-0x7955 = 0x3063
-0x7956 = 0x4441
-0x7957 = 0x2D63
-0x795A = 0x2F63
-0x795D = 0x4B3D
-0x795E = 0x403F
-0x795F = 0x2E63
-0x7960 = 0x2C63
-0x7962 = 0x2A47
-0x7965 = 0x4D3E
-0x7968 = 0x3C49
-0x796D = 0x573A
-0x7977 = 0x7845
-0x797A = 0x3263
-0x797F = 0x3363
-0x7980 = 0x4963
-0x7981 = 0x5836
-0x7984 = 0x3D4F
-0x7985 = 0x3541
-0x798A = 0x3463
-0x798D = 0x5232
-0x798E = 0x7744
-0x798F = 0x214A
-0x799D = 0x3563
-0x79A6 = 0x7A35
-0x79A7 = 0x3663
-0x79AA = 0x3863
-0x79AE = 0x3963
-0x79B0 = 0x2947
-0x79B3 = 0x3A63
-0x79B9 = 0x3B63
-0x79BA = 0x3C63
-0x79BD = 0x5936
-0x79BE = 0x5332
-0x79BF = 0x4546
-0x79C0 = 0x283D
-0x79C1 = 0x643B
-0x79C9 = 0x3D63
-0x79CB = 0x293D
-0x79D1 = 0x4A32
-0x79D2 = 0x4349
-0x79D5 = 0x3E63
-0x79D8 = 0x6B48
-0x79DF = 0x4541
-0x79E1 = 0x4163
-0x79E3 = 0x4263
-0x79E4 = 0x6947
-0x79E6 = 0x413F
-0x79E7 = 0x3F63
-0x79E9 = 0x6143
-0x79EC = 0x4063
-0x79F0 = 0x4E3E
-0x79FB = 0x5C30
-0x7A00 = 0x2935
-0x7A08 = 0x4363
-0x7A0B = 0x7844
-0x7A0D = 0x4463
-0x7A0E = 0x4740
-0x7A14 = 0x2D4C
-0x7A17 = 0x2349
-0x7A18 = 0x4563
-0x7A19 = 0x4663
-0x7A1A = 0x5543
-0x7A1C = 0x474E
-0x7A1F = 0x4863
-0x7A20 = 0x4763
-0x7A2E = 0x6F3C
-0x7A31 = 0x4A63
-0x7A32 = 0x7030
-0x7A37 = 0x4D63
-0x7A3B = 0x4B63
-0x7A3C = 0x5432
-0x7A3D = 0x4E37
-0x7A3E = 0x4C63
-0x7A3F = 0x4639
-0x7A40 = 0x7239
-0x7A42 = 0x664A
-0x7A43 = 0x4E63
-0x7A46 = 0x544B
-0x7A49 = 0x5063
-0x7A4D = 0x5140
-0x7A4E = 0x4F31
-0x7A4F = 0x3A32
-0x7A50 = 0x2C30
-0x7A57 = 0x4F63
-0x7A61 = 0x5163
-0x7A62 = 0x5263
-0x7A63 = 0x773E
-0x7A69 = 0x5363
-0x7A6B = 0x4F33
-0x7A70 = 0x5563
-0x7A74 = 0x6A37
-0x7A76 = 0x6635
-0x7A79 = 0x5663
-0x7A7A = 0x7536
-0x7A7D = 0x5763
-0x7A7F = 0x7C40
-0x7A81 = 0x4D46
-0x7A83 = 0x6040
-0x7A84 = 0x753A
-0x7A88 = 0x5863
-0x7A92 = 0x6243
-0x7A93 = 0x6B41
-0x7A95 = 0x5A63
-0x7A96 = 0x5C63
-0x7A97 = 0x5963
-0x7A98 = 0x5B63
-0x7A9F = 0x2237
-0x7AA9 = 0x5D63
-0x7AAA = 0x2637
-0x7AAE = 0x6735
-0x7AAF = 0x524D
-0x7AB0 = 0x5F63
-0x7AB6 = 0x6063
-0x7ABA = 0x2E31
-0x7AC3 = 0x7633
-0x7AC4 = 0x6263
-0x7AC5 = 0x6163
-0x7AC7 = 0x6563
-0x7AC8 = 0x5E63
-0x7ACA = 0x6663
-0x7ACB = 0x294E
-0x7ACD = 0x6763
-0x7ACF = 0x6863
-0x7AD2 = 0x7454
-0x7AD3 = 0x6A63
-0x7AD5 = 0x6963
-0x7AD9 = 0x6B63
-0x7ADA = 0x6C63
-0x7ADC = 0x354E
-0x7ADD = 0x6D63
-0x7ADF = 0x6F70
-0x7AE0 = 0x4F3E
-0x7AE1 = 0x6E63
-0x7AE2 = 0x6F63
-0x7AE3 = 0x573D
-0x7AE5 = 0x3846
-0x7AE6 = 0x7063
-0x7AEA = 0x2843
-0x7AED = 0x7163
-0x7AEF = 0x3C43
-0x7AF0 = 0x7263
-0x7AF6 = 0x2536
-0x7AF8 = 0x3F51
-0x7AF9 = 0x5D43
-0x7AFA = 0x333C
-0x7AFF = 0x4834
-0x7B02 = 0x7363
-0x7B04 = 0x2264
-0x7B06 = 0x7663
-0x7B08 = 0x6835
-0x7B0A = 0x7563
-0x7B0B = 0x2464
-0x7B0F = 0x7463
-0x7B11 = 0x503E
-0x7B18 = 0x7863
-0x7B19 = 0x7963
-0x7B1B = 0x2B45
-0x7B1E = 0x7A63
-0x7B20 = 0x5E33
-0x7B25 = 0x5A3F
-0x7B26 = 0x6449
-0x7B28 = 0x7C63
-0x7B2C = 0x6842
-0x7B33 = 0x7763
-0x7B35 = 0x7B63
-0x7B36 = 0x7D63
-0x7B39 = 0x7B3A
-0x7B45 = 0x2664
-0x7B46 = 0x2E49
-0x7B48 = 0x2648
-0x7B49 = 0x7945
-0x7B4B = 0x5A36
-0x7B4C = 0x2564
-0x7B4D = 0x2364
-0x7B4F = 0x3548
-0x7B50 = 0x7E63
-0x7B51 = 0x5E43
-0x7B52 = 0x7B45
-0x7B54 = 0x7A45
-0x7B56 = 0x763A
-0x7B5D = 0x3864
-0x7B65 = 0x2864
-0x7B67 = 0x2A64
-0x7B6C = 0x2D64
-0x7B6E = 0x2E64
-0x7B70 = 0x2B64
-0x7B71 = 0x2C64
-0x7B74 = 0x2964
-0x7B75 = 0x2764
-0x7B7A = 0x2164
-0x7B86 = 0x4F4A
-0x7B87 = 0x5532
-0x7B8B = 0x3564
-0x7B8D = 0x3264
-0x7B8F = 0x3764
-0x7B92 = 0x3664
-0x7B94 = 0x7347
-0x7B95 = 0x274C
-0x7B98 = 0x3064
-0x7B99 = 0x3964
-0x7B9A = 0x3464
-0x7B9C = 0x3364
-0x7B9D = 0x2F64
-0x7B9F = 0x3164
-0x7BA1 = 0x4934
-0x7BAA = 0x3D43
-0x7BAD = 0x7D40
-0x7BB1 = 0x2248
-0x7BB4 = 0x3E64
-0x7BB8 = 0x2448
-0x7BC0 = 0x6140
-0x7BC1 = 0x3B64
-0x7BC4 = 0x4F48
-0x7BC6 = 0x3F64
-0x7BC7 = 0x534A
-0x7BC9 = 0x5B43
-0x7BCB = 0x3A64
-0x7BCC = 0x3C64
-0x7BCF = 0x3D64
-0x7BDD = 0x4064
-0x7BE0 = 0x443C
-0x7BE5 = 0x4564
-0x7BE6 = 0x4464
-0x7BE9 = 0x4164
-0x7BED = 0x364F
-0x7BF3 = 0x4A64
-0x7BF6 = 0x4E64
-0x7BF7 = 0x4B64
-0x7C00 = 0x4764
-0x7C07 = 0x4864
-0x7C0D = 0x4D64
-0x7C11 = 0x4264
-0x7C12 = 0x5552
-0x7C13 = 0x4964
-0x7C14 = 0x4364
-0x7C17 = 0x4C64
-0x7C1F = 0x5264
-0x7C21 = 0x4A34
-0x7C23 = 0x4F64
-0x7C27 = 0x5064
-0x7C2A = 0x5164
-0x7C2B = 0x5464
-0x7C37 = 0x5364
-0x7C38 = 0x7648
-0x7C3D = 0x5564
-0x7C3E = 0x7C4E
-0x7C3F = 0x6D4A
-0x7C40 = 0x5A64
-0x7C43 = 0x5764
-0x7C4C = 0x5664
-0x7C4D = 0x5240
-0x7C4F = 0x5964
-0x7C50 = 0x5B64
-0x7C54 = 0x5864
-0x7C56 = 0x5F64
-0x7C58 = 0x5C64
-0x7C5F = 0x5D64
-0x7C60 = 0x4664
-0x7C64 = 0x5E64
-0x7C65 = 0x6064
-0x7C6C = 0x6164
-0x7C73 = 0x464A
-0x7C75 = 0x6264
-0x7C7E = 0x624C
-0x7C81 = 0x4E36
-0x7C82 = 0x2937
-0x7C83 = 0x6364
-0x7C89 = 0x344A
-0x7C8B = 0x683F
-0x7C8D = 0x304C
-0x7C92 = 0x334E
-0x7C95 = 0x7447
-0x7C97 = 0x4641
-0x7C98 = 0x3447
-0x7C9B = 0x4D3D
-0x7C9F = 0x4030
-0x7CA1 = 0x6964
-0x7CA2 = 0x6764
-0x7CA4 = 0x6564
-0x7CA5 = 0x2134
-0x7CA7 = 0x513E
-0x7CA8 = 0x6A64
-0x7CAB = 0x6864
-0x7CAD = 0x6664
-0x7CAE = 0x6E64
-0x7CB1 = 0x6D64
-0x7CB2 = 0x6C64
-0x7CB3 = 0x6B64
-0x7CB9 = 0x6F64
-0x7CBD = 0x7064
-0x7CBE = 0x3A40
-0x7CC0 = 0x7164
-0x7CC2 = 0x7364
-0x7CC5 = 0x7264
-0x7CCA = 0x5238
-0x7CCE = 0x3841
-0x7CD2 = 0x7564
-0x7CD6 = 0x7C45
-0x7CD8 = 0x7464
-0x7CDC = 0x7664
-0x7CDE = 0x354A
-0x7CDF = 0x6C41
-0x7CE0 = 0x4739
-0x7CE2 = 0x7764
-0x7CE7 = 0x484E
-0x7CEF = 0x7964
-0x7CF2 = 0x7A64
-0x7CF4 = 0x7B64
-0x7CF6 = 0x7C64
-0x7CF8 = 0x653B
-0x7CFA = 0x7D64
-0x7CFB = 0x4F37
-0x7CFE = 0x6A35
-0x7D00 = 0x2A35
-0x7D02 = 0x2165
-0x7D04 = 0x734C
-0x7D05 = 0x4839
-0x7D06 = 0x7E64
-0x7D0A = 0x2465
-0x7D0B = 0x664C
-0x7D0D = 0x3C47
-0x7D10 = 0x3349
-0x7D14 = 0x633D
-0x7D15 = 0x2365
-0x7D17 = 0x533C
-0x7D18 = 0x4939
-0x7D19 = 0x663B
-0x7D1A = 0x6935
-0x7D1B = 0x364A
-0x7D1C = 0x2265
-0x7D20 = 0x4741
-0x7D21 = 0x424B
-0x7D22 = 0x773A
-0x7D2B = 0x673B
-0x7D2C = 0x5D44
-0x7D2E = 0x2765
-0x7D2F = 0x5F4E
-0x7D30 = 0x593A
-0x7D32 = 0x2865
-0x7D33 = 0x423F
-0x7D35 = 0x2A65
-0x7D39 = 0x523E
-0x7D3A = 0x303A
-0x7D3F = 0x2965
-0x7D42 = 0x2A3D
-0x7D43 = 0x3E38
-0x7D44 = 0x4841
-0x7D45 = 0x2565
-0x7D46 = 0x2B65
-0x7D4B = 0x2665
-0x7D4C = 0x5037
-0x7D4E = 0x2E65
-0x7D4F = 0x3265
-0x7D50 = 0x6B37
-0x7D56 = 0x2D65
-0x7D5B = 0x3665
-0x7D5E = 0x4A39
-0x7D61 = 0x6D4D
-0x7D62 = 0x3C30
-0x7D63 = 0x3365
-0x7D66 = 0x6B35
-0x7D68 = 0x3065
-0x7D6E = 0x3165
-0x7D71 = 0x7D45
-0x7D72 = 0x2F65
-0x7D73 = 0x2C65
-0x7D75 = 0x2833
-0x7D76 = 0x6440
-0x7D79 = 0x2838
-0x7D7D = 0x3865
-0x7D89 = 0x3565
-0x7D8F = 0x3765
-0x7D93 = 0x3465
-0x7D99 = 0x5137
-0x7D9A = 0x3342
-0x7D9B = 0x3965
-0x7D9C = 0x6E41
-0x7D9F = 0x4665
-0x7DA2 = 0x4265
-0x7DA3 = 0x3C65
-0x7DAB = 0x4065
-0x7DAC = 0x7A3C
-0x7DAD = 0x5D30
-0x7DAE = 0x3B65
-0x7DAF = 0x4365
-0x7DB0 = 0x4765
-0x7DB1 = 0x4B39
-0x7DB2 = 0x564C
-0x7DB4 = 0x5644
-0x7DB5 = 0x3D65
-0x7DB8 = 0x4565
-0x7DBA = 0x3A65
-0x7DBB = 0x3E43
-0x7DBD = 0x3F65
-0x7DBE = 0x3D30
-0x7DBF = 0x4A4C
-0x7DC7 = 0x3E65
-0x7DCA = 0x5B36
-0x7DCB = 0x6C48
-0x7DCF = 0x6D41
-0x7DD1 = 0x504E
-0x7DD2 = 0x6F3D
-0x7DD5 = 0x6E65
-0x7DD8 = 0x4865
-0x7DDA = 0x7E40
-0x7DDC = 0x4465
-0x7DDD = 0x4965
-0x7DDE = 0x4B65
-0x7DE0 = 0x7944
-0x7DE1 = 0x4E65
-0x7DE4 = 0x4A65
-0x7DE8 = 0x544A
-0x7DE9 = 0x4B34
-0x7DEC = 0x4B4C
-0x7DEF = 0x5E30
-0x7DF2 = 0x4D65
-0x7DF4 = 0x7D4E
-0x7DFB = 0x4C65
-0x7E01 = 0x6F31
-0x7E04 = 0x6C46
-0x7E05 = 0x4F65
-0x7E09 = 0x5665
-0x7E0A = 0x5065
-0x7E0B = 0x5765
-0x7E12 = 0x5365
-0x7E1B = 0x7B47
-0x7E1E = 0x4A3C
-0x7E1F = 0x5565
-0x7E21 = 0x5265
-0x7E22 = 0x5865
-0x7E23 = 0x5165
-0x7E26 = 0x443D
-0x7E2B = 0x254B
-0x7E2E = 0x4C3D
-0x7E31 = 0x5465
-0x7E32 = 0x6065
-0x7E35 = 0x5C65
-0x7E37 = 0x5F65
-0x7E39 = 0x5D65
-0x7E3A = 0x6165
-0x7E3B = 0x5B65
-0x7E3D = 0x4165
-0x7E3E = 0x5340
-0x7E41 = 0x4B48
-0x7E43 = 0x5E65
-0x7E46 = 0x5965
-0x7E4A = 0x2141
-0x7E4B = 0x5237
-0x7E4D = 0x2B3D
-0x7E54 = 0x253F
-0x7E55 = 0x3641
-0x7E56 = 0x6465
-0x7E59 = 0x6665
-0x7E5A = 0x6765
-0x7E5D = 0x6365
-0x7E66 = 0x5A65
-0x7E67 = 0x6265
-0x7E69 = 0x6A65
-0x7E6A = 0x6965
-0x7E6D = 0x7A4B
-0x7E70 = 0x2B37
-0x7E79 = 0x6865
-0x7E7B = 0x6C65
-0x7E7C = 0x6B65
-0x7E7D = 0x6F65
-0x7E7F = 0x7165
-0x7E82 = 0x3C3B
-0x7E83 = 0x6D65
-0x7E88 = 0x7265
-0x7E89 = 0x7365
-0x7E8C = 0x7465
-0x7E8E = 0x7A65
-0x7E8F = 0x3B45
-0x7E90 = 0x7665
-0x7E92 = 0x7565
-0x7E93 = 0x7765
-0x7E94 = 0x7865
-0x7E96 = 0x7965
-0x7E9B = 0x7B65
-0x7E9C = 0x7C65
-0x7F36 = 0x4C34
-0x7F38 = 0x7D65
-0x7F3A = 0x7E65
-0x7F45 = 0x2166
-0x7F4C = 0x2266
-0x7F4D = 0x2366
-0x7F4E = 0x2466
-0x7F50 = 0x2566
-0x7F51 = 0x2666
-0x7F54 = 0x2866
-0x7F55 = 0x2766
-0x7F58 = 0x2966
-0x7F5F = 0x2A66
-0x7F60 = 0x2B66
-0x7F67 = 0x2E66
-0x7F68 = 0x2C66
-0x7F69 = 0x2D66
-0x7F6A = 0x613A
-0x7F6B = 0x5337
-0x7F6E = 0x5643
-0x7F70 = 0x3348
-0x7F72 = 0x703D
-0x7F75 = 0x4D47
-0x7F77 = 0x6D48
-0x7F78 = 0x2F66
-0x7F79 = 0x6D58
-0x7F82 = 0x3066
-0x7F83 = 0x3266
-0x7F85 = 0x654D
-0x7F86 = 0x3166
-0x7F87 = 0x3466
-0x7F88 = 0x3366
-0x7F8A = 0x534D
-0x7F8C = 0x3566
-0x7F8E = 0x7E48
-0x7F94 = 0x3666
-0x7F9A = 0x3966
-0x7F9D = 0x3866
-0x7F9E = 0x3766
-0x7FA3 = 0x3A66
-0x7FA4 = 0x3237
-0x7FA8 = 0x2241
-0x7FA9 = 0x4135
-0x7FAE = 0x3E66
-0x7FAF = 0x3B66
-0x7FB2 = 0x3C66
-0x7FB6 = 0x3F66
-0x7FB8 = 0x4066
-0x7FB9 = 0x3D66
-0x7FBD = 0x2931
-0x7FC1 = 0x2732
-0x7FC5 = 0x4266
-0x7FC6 = 0x4366
-0x7FCA = 0x4466
-0x7FCC = 0x624D
-0x7FD2 = 0x2C3D
-0x7FD4 = 0x4666
-0x7FD5 = 0x4566
-0x7FE0 = 0x693F
-0x7FE1 = 0x4766
-0x7FE6 = 0x4866
-0x7FE9 = 0x4966
-0x7FEB = 0x6534
-0x7FF0 = 0x4D34
-0x7FF3 = 0x4A66
-0x7FF9 = 0x4B66
-0x7FFB = 0x5D4B
-0x7FFC = 0x634D
-0x8000 = 0x544D
-0x8001 = 0x374F
-0x8003 = 0x4D39
-0x8004 = 0x4E66
-0x8005 = 0x543C
-0x8006 = 0x4D66
-0x800B = 0x4F66
-0x800C = 0x293C
-0x8010 = 0x5142
-0x8012 = 0x5066
-0x8015 = 0x4C39
-0x8017 = 0x574C
-0x8018 = 0x5166
-0x8019 = 0x5266
-0x801C = 0x5366
-0x8021 = 0x5466
-0x8028 = 0x5566
-0x8033 = 0x2A3C
-0x8036 = 0x6D4C
-0x803B = 0x5766
-0x803D = 0x3F43
-0x803F = 0x5666
-0x8046 = 0x5966
-0x804A = 0x5866
-0x8052 = 0x5A66
-0x8056 = 0x3B40
-0x8058 = 0x5B66
-0x805A = 0x5C66
-0x805E = 0x394A
-0x805F = 0x5D66
-0x8061 = 0x6F41
-0x8062 = 0x5E66
-0x8068 = 0x5F66
-0x806F = 0x7E4E
-0x8070 = 0x6266
-0x8072 = 0x6166
-0x8073 = 0x6066
-0x8074 = 0x3044
-0x8076 = 0x6366
-0x8077 = 0x263F
-0x8079 = 0x6466
-0x807D = 0x6566
-0x807E = 0x384F
-0x8084 = 0x6766
-0x8085 = 0x6966
-0x8086 = 0x6866
-0x8087 = 0x2548
-0x8089 = 0x7946
-0x808B = 0x3E4F
-0x808C = 0x2948
-0x8093 = 0x6B66
-0x8096 = 0x533E
-0x8098 = 0x2A49
-0x809A = 0x6C66
-0x809B = 0x6A66
-0x809D = 0x4E34
-0x80A1 = 0x5438
-0x80A2 = 0x683B
-0x80A5 = 0x6E48
-0x80A9 = 0x2A38
-0x80AA = 0x434B
-0x80AC = 0x6F66
-0x80AD = 0x6D66
-0x80AF = 0x4E39
-0x80B1 = 0x4F39
-0x80B2 = 0x6930
-0x80B4 = 0x683A
-0x80BA = 0x5947
-0x80C3 = 0x5F30
-0x80C4 = 0x7466
-0x80C6 = 0x4043
-0x80CC = 0x5847
-0x80CE = 0x5B42
-0x80D6 = 0x7666
-0x80D9 = 0x7266
-0x80DA = 0x7566
-0x80DB = 0x7066
-0x80DD = 0x7366
-0x80DE = 0x264B
-0x80E1 = 0x5538
-0x80E4 = 0x7D30
-0x80E5 = 0x7166
-0x80EF = 0x7866
-0x80F1 = 0x7966
-0x80F4 = 0x3946
-0x80F8 = 0x3B36
-0x80FC = 0x2667
-0x80FD = 0x3D47
-0x8102 = 0x693B
-0x8105 = 0x3C36
-0x8106 = 0x4840
-0x8107 = 0x464F
-0x8108 = 0x2E4C
-0x8109 = 0x7766
-0x810A = 0x5440
-0x811A = 0x5335
-0x811B = 0x7A66
-0x8123 = 0x7C66
-0x8129 = 0x7B66
-0x812F = 0x7D66
-0x8131 = 0x2643
-0x8133 = 0x3E47
-0x8139 = 0x3144
-0x813E = 0x2367
-0x8146 = 0x2267
-0x814B = 0x7E66
-0x814E = 0x553F
-0x8150 = 0x6549
-0x8151 = 0x2567
-0x8153 = 0x2467
-0x8154 = 0x5039
-0x8155 = 0x534F
-0x815F = 0x3567
-0x8165 = 0x2967
-0x8166 = 0x2A67
-0x816B = 0x703C
-0x816E = 0x2867
-0x8170 = 0x7839
-0x8171 = 0x2767
-0x8174 = 0x2B67
-0x8178 = 0x3244
-0x8179 = 0x224A
-0x817A = 0x2341
-0x817F = 0x5C42
-0x8180 = 0x2F67
-0x8182 = 0x3067
-0x8183 = 0x2C67
-0x8188 = 0x2D67
-0x818A = 0x2E67
-0x818F = 0x5139
-0x8193 = 0x3667
-0x8195 = 0x3267
-0x819A = 0x6649
-0x819C = 0x6C4B
-0x819D = 0x2849
-0x81A0 = 0x3167
-0x81A3 = 0x3467
-0x81A4 = 0x3367
-0x81A8 = 0x444B
-0x81A9 = 0x3767
-0x81B0 = 0x3867
-0x81B3 = 0x3741
-0x81B5 = 0x3967
-0x81B8 = 0x3B67
-0x81BA = 0x3F67
-0x81BD = 0x3C67
-0x81BE = 0x3A67
-0x81BF = 0x3F47
-0x81C0 = 0x3D67
-0x81C2 = 0x3E67
-0x81C8 = 0x4567
-0x81C9 = 0x4067
-0x81CD = 0x4167
-0x81D1 = 0x4267
-0x81D3 = 0x2142
-0x81D8 = 0x4467
-0x81D9 = 0x4367
-0x81DA = 0x4667
-0x81DF = 0x4767
-0x81E0 = 0x4867
-0x81E3 = 0x433F
-0x81E5 = 0x6932
-0x81E7 = 0x4967
-0x81E8 = 0x574E
-0x81EA = 0x2B3C
-0x81ED = 0x2D3D
-0x81F3 = 0x6A3B
-0x81F4 = 0x5743
-0x81FA = 0x4A67
-0x81FB = 0x4B67
-0x81FE = 0x4C67
-0x8201 = 0x4D67
-0x8202 = 0x4E67
-0x8205 = 0x4F67
-0x8207 = 0x5067
-0x8208 = 0x3D36
-0x8209 = 0x2A5A
-0x820A = 0x5167
-0x820C = 0x6540
-0x820D = 0x5267
-0x820E = 0x4B3C
-0x8210 = 0x5367
-0x8212 = 0x3050
-0x8216 = 0x5467
-0x8217 = 0x5E4A
-0x8218 = 0x5C34
-0x821B = 0x2441
-0x821C = 0x583D
-0x821E = 0x7149
-0x821F = 0x2E3D
-0x8229 = 0x5567
-0x822A = 0x5239
-0x822B = 0x5667
-0x822C = 0x4C48
-0x822E = 0x6467
-0x8233 = 0x5867
-0x8235 = 0x4942
-0x8236 = 0x7547
-0x8237 = 0x3F38
-0x8238 = 0x5767
-0x8239 = 0x2541
-0x8240 = 0x5967
-0x8247 = 0x7A44
-0x8258 = 0x5B67
-0x8259 = 0x5A67
-0x825A = 0x5D67
-0x825D = 0x5C67
-0x825F = 0x5E67
-0x8262 = 0x6067
-0x8264 = 0x5F67
-0x8266 = 0x4F34
-0x8268 = 0x6167
-0x826A = 0x6267
-0x826B = 0x6367
-0x826E = 0x313A
-0x826F = 0x494E
-0x8271 = 0x6567
-0x8272 = 0x273F
-0x8276 = 0x7031
-0x8277 = 0x6667
-0x827E = 0x6867
-0x828B = 0x7230
-0x828D = 0x6967
-0x8292 = 0x6A67
-0x8299 = 0x6749
-0x829D = 0x473C
-0x829F = 0x6C67
-0x82A5 = 0x2933
-0x82A6 = 0x3230
-0x82AB = 0x6B67
-0x82AC = 0x6E67
-0x82AD = 0x4E47
-0x82AF = 0x443F
-0x82B1 = 0x5632
-0x82B3 = 0x274B
-0x82B8 = 0x5D37
-0x82B9 = 0x5C36
-0x82BB = 0x6D67
-0x82BD = 0x6A32
-0x82C5 = 0x2334
-0x82D1 = 0x7131
-0x82D2 = 0x7267
-0x82D3 = 0x6A4E
-0x82D4 = 0x5D42
-0x82D7 = 0x4449
-0x82D9 = 0x7E67
-0x82DB = 0x5732
-0x82DC = 0x7C67
-0x82DE = 0x7A67
-0x82DF = 0x7167
-0x82E1 = 0x6F67
-0x82E3 = 0x7067
-0x82E5 = 0x633C
-0x82E6 = 0x6C36
-0x82E7 = 0x7743
-0x82EB = 0x5146
-0x82F1 = 0x5131
-0x82F3 = 0x7467
-0x82F4 = 0x7367
-0x82F9 = 0x7967
-0x82FA = 0x7567
-0x82FB = 0x7867
-0x8302 = 0x504C
-0x8303 = 0x7767
-0x8304 = 0x5832
-0x8305 = 0x7D33
-0x8306 = 0x7B67
-0x8309 = 0x7D67
-0x830E = 0x5437
-0x8316 = 0x2368
-0x8317 = 0x2C68
-0x8318 = 0x2D68
-0x831C = 0x2B30
-0x8323 = 0x3468
-0x8328 = 0x7130
-0x832B = 0x2B68
-0x832F = 0x2A68
-0x8331 = 0x2568
-0x8332 = 0x2468
-0x8334 = 0x2268
-0x8335 = 0x2168
-0x8336 = 0x6343
-0x8338 = 0x7B42
-0x8339 = 0x2768
-0x8340 = 0x2668
-0x8345 = 0x2968
-0x8349 = 0x7041
-0x834A = 0x5537
-0x834F = 0x4131
-0x8350 = 0x2868
-0x8352 = 0x5339
-0x8358 = 0x7141
-0x8373 = 0x3A68
-0x8375 = 0x3B68
-0x8377 = 0x5932
-0x837B = 0x2E32
-0x837C = 0x3868
-0x8385 = 0x2E68
-0x8387 = 0x3668
-0x8389 = 0x3D68
-0x838A = 0x3768
-0x838E = 0x3568
-0x8393 = 0x7667
-0x8396 = 0x3368
-0x839A = 0x2F68
-0x839E = 0x5034
-0x839F = 0x3168
-0x83A0 = 0x3C68
-0x83A2 = 0x3268
-0x83A8 = 0x3E68
-0x83AA = 0x3068
-0x83AB = 0x7C47
-0x83B1 = 0x694D
-0x83B5 = 0x3968
-0x83BD = 0x4F68
-0x83C1 = 0x4768
-0x83C5 = 0x7B3F
-0x83CA = 0x4635
-0x83CC = 0x5D36
-0x83CE = 0x4268
-0x83D3 = 0x5B32
-0x83D6 = 0x543E
-0x83D8 = 0x4568
-0x83DC = 0x5A3A
-0x83DF = 0x5145
-0x83E0 = 0x4A68
-0x83E9 = 0x6E4A
-0x83EB = 0x4168
-0x83EF = 0x5A32
-0x83F0 = 0x5638
-0x83F1 = 0x2949
-0x83F2 = 0x4B68
-0x83F4 = 0x3F68
-0x83F7 = 0x4868
-0x83FB = 0x5268
-0x83FD = 0x4368
-0x8403 = 0x4468
-0x8404 = 0x3A46
-0x8407 = 0x4968
-0x840B = 0x4668
-0x840C = 0x284B
-0x840D = 0x4C68
-0x840E = 0x6030
-0x8413 = 0x4068
-0x8420 = 0x4E68
-0x8422 = 0x4D68
-0x8429 = 0x6B47
-0x842A = 0x5468
-0x842C = 0x5F68
-0x8431 = 0x7E33
-0x8435 = 0x6268
-0x8438 = 0x5068
-0x843C = 0x5568
-0x843D = 0x6E4D
-0x8446 = 0x5E68
-0x8449 = 0x554D
-0x844E = 0x2A4E
-0x8457 = 0x7843
-0x845B = 0x6B33
-0x8461 = 0x7249
-0x8462 = 0x6468
-0x8463 = 0x2146
-0x8466 = 0x3130
-0x8469 = 0x5D68
-0x846B = 0x5968
-0x846C = 0x7241
-0x846D = 0x5368
-0x846E = 0x5B68
-0x846F = 0x6068
-0x8471 = 0x2C47
-0x8475 = 0x2A30
-0x8477 = 0x5868
-0x8479 = 0x6168
-0x847A = 0x7849
-0x8482 = 0x5C68
-0x8484 = 0x5768
-0x848B = 0x553E
-0x8490 = 0x2F3D
-0x8494 = 0x2C3C
-0x8499 = 0x584C
-0x849C = 0x4749
-0x849F = 0x6768
-0x84A1 = 0x7068
-0x84AD = 0x5A68
-0x84B2 = 0x7733
-0x84B8 = 0x783E
-0x84B9 = 0x6568
-0x84BB = 0x6A68
-0x84BC = 0x7341
-0x84BF = 0x6668
-0x84C1 = 0x6D68
-0x84C4 = 0x5F43
-0x84C6 = 0x6E68
-0x84C9 = 0x564D
-0x84CA = 0x6368
-0x84CB = 0x3833
-0x84CD = 0x6968
-0x84D0 = 0x6C68
-0x84D1 = 0x2C4C
-0x84D6 = 0x6F68
-0x84DA = 0x6B68
-0x84EC = 0x294B
-0x84EE = 0x214F
-0x84F4 = 0x7368
-0x84FC = 0x7A68
-0x84FF = 0x7268
-0x8500 = 0x433C
-0x8506 = 0x5168
-0x8511 = 0x4E4A
-0x8513 = 0x224C
-0x8514 = 0x7968
-0x8515 = 0x7868
-0x8517 = 0x7468
-0x8518 = 0x7568
-0x851A = 0x3631
-0x851F = 0x7768
-0x8521 = 0x7168
-0x8526 = 0x5544
-0x852C = 0x7668
-0x852D = 0x7E30
-0x8535 = 0x2242
-0x853D = 0x434A
-0x8540 = 0x7B68
-0x8541 = 0x2169
-0x8543 = 0x5948
-0x8548 = 0x7E68
-0x8549 = 0x563E
-0x854A = 0x493C
-0x854B = 0x2369
-0x854E = 0x3E36
-0x8555 = 0x2469
-0x8557 = 0x7949
-0x8558 = 0x7D68
-0x855A = 0x5668
-0x8563 = 0x7C68
-0x8569 = 0x2246
-0x856A = 0x7349
-0x856D = 0x2B69
-0x8577 = 0x3169
-0x857E = 0x3269
-0x8580 = 0x2569
-0x8584 = 0x7647
-0x8587 = 0x2F69
-0x8588 = 0x2769
-0x858A = 0x2969
-0x8590 = 0x3369
-0x8591 = 0x2869
-0x8594 = 0x2C69
-0x8597 = 0x7231
-0x8599 = 0x6546
-0x859B = 0x2D69
-0x859C = 0x3069
-0x85A4 = 0x2669
-0x85A6 = 0x2641
-0x85A8 = 0x2A69
-0x85A9 = 0x273B
-0x85AA = 0x453F
-0x85AB = 0x3037
-0x85AC = 0x744C
-0x85AE = 0x794C
-0x85AF = 0x723D
-0x85B9 = 0x3769
-0x85BA = 0x3569
-0x85C1 = 0x4E4F
-0x85C9 = 0x3469
-0x85CD = 0x754D
-0x85CF = 0x3669
-0x85D0 = 0x3869
-0x85D5 = 0x3969
-0x85DC = 0x3C69
-0x85DD = 0x3A69
-0x85E4 = 0x2346
-0x85E5 = 0x3B69
-0x85E9 = 0x4D48
-0x85EA = 0x2E69
-0x85F7 = 0x733D
-0x85F9 = 0x3D69
-0x85FA = 0x4269
-0x85FB = 0x7441
-0x85FE = 0x4169
-0x8602 = 0x2269
-0x8606 = 0x4369
-0x8607 = 0x4941
-0x860A = 0x3E69
-0x860B = 0x4069
-0x8613 = 0x3F69
-0x8616 = 0x315D
-0x8617 = 0x225D
-0x861A = 0x4569
-0x8622 = 0x4469
-0x862D = 0x764D
-0x862F = 0x3C62
-0x8630 = 0x4669
-0x863F = 0x4769
-0x864D = 0x4869
-0x864E = 0x5738
-0x8650 = 0x5435
-0x8654 = 0x4A69
-0x8655 = 0x5D51
-0x865A = 0x7535
-0x865C = 0x3A4E
-0x865E = 0x7336
-0x865F = 0x4B69
-0x8667 = 0x4C69
-0x866B = 0x6E43
-0x8671 = 0x4D69
-0x8679 = 0x7A46
-0x867B = 0x3A30
-0x868A = 0x6332
-0x868B = 0x5269
-0x868C = 0x5369
-0x8693 = 0x4E69
-0x8695 = 0x3D3B
-0x86A3 = 0x4F69
-0x86A4 = 0x4247
-0x86A9 = 0x5069
-0x86AA = 0x5169
-0x86AB = 0x5B69
-0x86AF = 0x5569
-0x86B0 = 0x5869
-0x86B6 = 0x5469
-0x86C4 = 0x5669
-0x86C6 = 0x5769
-0x86C7 = 0x583C
-0x86C9 = 0x5969
-0x86CB = 0x4143
-0x86CD = 0x5637
-0x86CE = 0x4233
-0x86D4 = 0x5C69
-0x86D9 = 0x3F33
-0x86DB = 0x6169
-0x86DE = 0x5D69
-0x86DF = 0x6069
-0x86E4 = 0x3A48
-0x86E9 = 0x5E69
-0x86EC = 0x5F69
-0x86ED = 0x4849
-0x86EE = 0x5A48
-0x86EF = 0x6269
-0x86F8 = 0x7D42
-0x86F9 = 0x6C69
-0x86FB = 0x6869
-0x86FE = 0x6B32
-0x8700 = 0x6669
-0x8702 = 0x2A4B
-0x8703 = 0x6769
-0x8706 = 0x6469
-0x8708 = 0x6569
-0x8709 = 0x6A69
-0x870A = 0x6D69
-0x870D = 0x6B69
-0x8712 = 0x6369
-0x8718 = 0x5843
-0x871A = 0x7469
-0x871C = 0x2A4C
-0x8725 = 0x7269
-0x8729 = 0x7369
-0x8734 = 0x6E69
-0x8737 = 0x7069
-0x873B = 0x7169
-0x873F = 0x6F69
-0x8749 = 0x6640
-0x874B = 0x394F
-0x874C = 0x7869
-0x874E = 0x7969
-0x8753 = 0x216A
-0x8755 = 0x2A3F
-0x8757 = 0x7B69
-0x8759 = 0x7E69
-0x875F = 0x7669
-0x8760 = 0x7569
-0x8763 = 0x226A
-0x8766 = 0x5C32
-0x8768 = 0x7C69
-0x876A = 0x236A
-0x876E = 0x7D69
-0x8774 = 0x7A69
-0x8776 = 0x3344
-0x8778 = 0x7769
-0x877F = 0x6847
-0x8782 = 0x276A
-0x878D = 0x3B4D
-0x879F = 0x266A
-0x87A2 = 0x256A
-0x87AB = 0x2E6A
-0x87AF = 0x286A
-0x87B3 = 0x306A
-0x87BA = 0x664D
-0x87BB = 0x336A
-0x87BD = 0x2A6A
-0x87C0 = 0x2B6A
-0x87C4 = 0x2F6A
-0x87C6 = 0x326A
-0x87C7 = 0x316A
-0x87CB = 0x296A
-0x87D0 = 0x2C6A
-0x87D2 = 0x3D6A
-0x87E0 = 0x366A
-0x87EF = 0x346A
-0x87F2 = 0x356A
-0x87F6 = 0x3A6A
-0x87F7 = 0x3B6A
-0x87F9 = 0x2A33
-0x87FB = 0x4235
-0x87FE = 0x396A
-0x8805 = 0x246A
-0x880D = 0x386A
-0x880E = 0x3C6A
-0x880F = 0x376A
-0x8811 = 0x3E6A
-0x8815 = 0x406A
-0x8816 = 0x3F6A
-0x8821 = 0x426A
-0x8822 = 0x416A
-0x8823 = 0x5A69
-0x8827 = 0x466A
-0x8831 = 0x436A
-0x8836 = 0x446A
-0x8839 = 0x456A
-0x883B = 0x476A
-0x8840 = 0x6C37
-0x8842 = 0x496A
-0x8844 = 0x486A
-0x8846 = 0x303D
-0x884C = 0x5439
-0x884D = 0x275E
-0x8852 = 0x4A6A
-0x8853 = 0x513D
-0x8857 = 0x3933
-0x8859 = 0x4B6A
-0x885B = 0x5231
-0x885D = 0x573E
-0x885E = 0x4C6A
-0x8861 = 0x5539
-0x8862 = 0x4D6A
-0x8863 = 0x6130
-0x8868 = 0x3D49
-0x886B = 0x4E6A
-0x8870 = 0x6A3F
-0x8872 = 0x556A
-0x8875 = 0x526A
-0x8877 = 0x6F43
-0x887D = 0x536A
-0x887E = 0x506A
-0x887F = 0x5E36
-0x8881 = 0x4F6A
-0x8882 = 0x566A
-0x8888 = 0x3637
-0x888B = 0x5E42
-0x888D = 0x5C6A
-0x8892 = 0x586A
-0x8896 = 0x3542
-0x8897 = 0x576A
-0x8899 = 0x5A6A
-0x889E = 0x516A
-0x88A2 = 0x5B6A
-0x88A4 = 0x5D6A
-0x88AB = 0x6F48
-0x88AE = 0x596A
-0x88B0 = 0x5E6A
-0x88B1 = 0x606A
-0x88B4 = 0x5338
-0x88B5 = 0x546A
-0x88B7 = 0x4130
-0x88BF = 0x5F6A
-0x88C1 = 0x5B3A
-0x88C2 = 0x764E
-0x88C3 = 0x616A
-0x88C4 = 0x626A
-0x88C5 = 0x7541
-0x88CF = 0x224E
-0x88D4 = 0x636A
-0x88D5 = 0x354D
-0x88D8 = 0x646A
-0x88D9 = 0x656A
-0x88DC = 0x644A
-0x88DD = 0x666A
-0x88DF = 0x403A
-0x88E1 = 0x234E
-0x88E8 = 0x6B6A
-0x88F2 = 0x6C6A
-0x88F3 = 0x583E
-0x88F8 = 0x674D
-0x88F9 = 0x676A
-0x88FC = 0x696A
-0x88FD = 0x3D40
-0x88FE = 0x7E3F
-0x8902 = 0x686A
-0x8904 = 0x6D6A
-0x8907 = 0x234A
-0x890A = 0x6F6A
-0x890C = 0x6E6A
-0x8910 = 0x6C33
-0x8912 = 0x2B4B
-0x8913 = 0x706A
-0x891D = 0x7C6A
-0x891E = 0x726A
-0x8925 = 0x736A
-0x892A = 0x746A
-0x892B = 0x756A
-0x8936 = 0x796A
-0x8938 = 0x7A6A
-0x893B = 0x786A
-0x8941 = 0x766A
-0x8943 = 0x716A
-0x8944 = 0x776A
-0x894C = 0x7B6A
-0x894D = 0x3770
-0x8956 = 0x2832
-0x895E = 0x7E6A
-0x895F = 0x5F36
-0x8960 = 0x7D6A
-0x8964 = 0x226B
-0x8966 = 0x216B
-0x896A = 0x246B
-0x896D = 0x236B
-0x896F = 0x256B
-0x8972 = 0x313D
-0x8974 = 0x266B
-0x8977 = 0x276B
-0x897E = 0x286B
-0x897F = 0x3E40
-0x8981 = 0x574D
-0x8983 = 0x296B
-0x8986 = 0x244A
-0x8987 = 0x4647
-0x8988 = 0x2A6B
-0x898A = 0x2B6B
-0x898B = 0x2B38
-0x898F = 0x2C35
-0x8993 = 0x2C6B
-0x8996 = 0x6B3B
-0x8997 = 0x4147
-0x8998 = 0x2D6B
-0x899A = 0x5033
-0x89A1 = 0x2E6B
-0x89A6 = 0x306B
-0x89A7 = 0x774D
-0x89A9 = 0x2F6B
-0x89AA = 0x463F
-0x89AC = 0x316B
-0x89AF = 0x326B
-0x89B2 = 0x336B
-0x89B3 = 0x5134
-0x89BA = 0x346B
-0x89BD = 0x356B
-0x89BF = 0x366B
-0x89C0 = 0x376B
-0x89D2 = 0x5133
-0x89DA = 0x386B
-0x89DC = 0x396B
-0x89DD = 0x3A6B
-0x89E3 = 0x7232
-0x89E6 = 0x283F
-0x89E7 = 0x3B6B
-0x89F4 = 0x3C6B
-0x89F8 = 0x3D6B
-0x8A00 = 0x4038
-0x8A02 = 0x7B44
-0x8A03 = 0x3E6B
-0x8A08 = 0x5737
-0x8A0A = 0x563F
-0x8A0C = 0x416B
-0x8A0E = 0x2446
-0x8A10 = 0x406B
-0x8A13 = 0x3137
-0x8A16 = 0x3F6B
-0x8A17 = 0x7742
-0x8A18 = 0x2D35
-0x8A1B = 0x426B
-0x8A1D = 0x436B
-0x8A1F = 0x593E
-0x8A23 = 0x6D37
-0x8A25 = 0x446B
-0x8A2A = 0x2C4B
-0x8A2D = 0x5F40
-0x8A31 = 0x7635
-0x8A33 = 0x754C
-0x8A34 = 0x4A41
-0x8A36 = 0x456B
-0x8A3A = 0x473F
-0x8A3B = 0x7043
-0x8A3C = 0x5A3E
-0x8A41 = 0x466B
-0x8A46 = 0x496B
-0x8A48 = 0x4A6B
-0x8A50 = 0x3E3A
-0x8A52 = 0x486B
-0x8A54 = 0x5B3E
-0x8A55 = 0x3E49
-0x8A5B = 0x476B
-0x8A5E = 0x6C3B
-0x8A60 = 0x5331
-0x8A62 = 0x4E6B
-0x8A63 = 0x5837
-0x8A66 = 0x6E3B
-0x8A69 = 0x6D3B
-0x8A6B = 0x4D4F
-0x8A6C = 0x4D6B
-0x8A6D = 0x4C6B
-0x8A6E = 0x2741
-0x8A70 = 0x4D35
-0x8A71 = 0x434F
-0x8A72 = 0x3A33
-0x8A73 = 0x5C3E
-0x8A7C = 0x4B6B
-0x8A82 = 0x506B
-0x8A84 = 0x516B
-0x8A85 = 0x4F6B
-0x8A87 = 0x5838
-0x8A89 = 0x404D
-0x8A8C = 0x6F3B
-0x8A8D = 0x2747
-0x8A91 = 0x546B
-0x8A95 = 0x4243
-0x8A98 = 0x364D
-0x8A9A = 0x576B
-0x8A9E = 0x6C38
-0x8AA0 = 0x3F40
-0x8AA1 = 0x536B
-0x8AA3 = 0x586B
-0x8AA4 = 0x6D38
-0x8AA5 = 0x556B
-0x8AA6 = 0x566B
-0x8AA8 = 0x526B
-0x8AAC = 0x6240
-0x8AAD = 0x4946
-0x8AB0 = 0x2F43
-0x8AB2 = 0x5D32
-0x8AB9 = 0x7048
-0x8ABC = 0x4335
-0x8ABF = 0x3444
-0x8AC2 = 0x5B6B
-0x8AC4 = 0x596B
-0x8AC7 = 0x4C43
-0x8ACB = 0x4140
-0x8ACC = 0x5234
-0x8ACD = 0x5A6B
-0x8ACF = 0x5B3F
-0x8AD2 = 0x4A4E
-0x8AD6 = 0x404F
-0x8ADA = 0x5C6B
-0x8ADB = 0x676B
-0x8ADC = 0x3544
-0x8ADE = 0x666B
-0x8AE0 = 0x636B
-0x8AE2 = 0x646B
-0x8AE4 = 0x606B
-0x8AE6 = 0x7C44
-0x8AE7 = 0x5F6B
-0x8AEB = 0x5D6B
-0x8AED = 0x214D
-0x8AEE = 0x703B
-0x8AF1 = 0x616B
-0x8AF3 = 0x5E6B
-0x8AF7 = 0x656B
-0x8AF8 = 0x743D
-0x8AFA = 0x4138
-0x8AFE = 0x7A42
-0x8B00 = 0x454B
-0x8B01 = 0x5A31
-0x8B02 = 0x6230
-0x8B04 = 0x2546
-0x8B07 = 0x696B
-0x8B0C = 0x686B
-0x8B0E = 0x6646
-0x8B10 = 0x6D6B
-0x8B14 = 0x626B
-0x8B16 = 0x6C6B
-0x8B17 = 0x6E6B
-0x8B19 = 0x2C38
-0x8B1A = 0x6A6B
-0x8B1B = 0x5639
-0x8B1D = 0x553C
-0x8B20 = 0x6F6B
-0x8B21 = 0x584D
-0x8B26 = 0x726B
-0x8B28 = 0x756B
-0x8B2B = 0x736B
-0x8B2C = 0x3549
-0x8B33 = 0x706B
-0x8B39 = 0x6036
-0x8B3E = 0x746B
-0x8B41 = 0x766B
-0x8B49 = 0x7A6B
-0x8B4C = 0x776B
-0x8B4E = 0x796B
-0x8B4F = 0x786B
-0x8B56 = 0x7B6B
-0x8B58 = 0x313C
-0x8B5A = 0x7D6B
-0x8B5B = 0x7C6B
-0x8B5C = 0x6849
-0x8B5F = 0x216C
-0x8B66 = 0x5937
-0x8B6B = 0x7E6B
-0x8B6C = 0x226C
-0x8B6F = 0x236C
-0x8B70 = 0x4435
-0x8B71 = 0x4166
-0x8B72 = 0x793E
-0x8B74 = 0x246C
-0x8B77 = 0x6E38
-0x8B7D = 0x256C
-0x8B80 = 0x266C
-0x8B83 = 0x3E3B
-0x8B8A = 0x4E5A
-0x8B8C = 0x276C
-0x8B8E = 0x286C
-0x8B90 = 0x323D
-0x8B92 = 0x296C
-0x8B93 = 0x2A6C
-0x8B96 = 0x2B6C
-0x8B99 = 0x2C6C
-0x8B9A = 0x2D6C
-0x8C37 = 0x2B43
-0x8C3A = 0x2E6C
-0x8C3F = 0x306C
-0x8C41 = 0x2F6C
-0x8C46 = 0x2646
-0x8C48 = 0x316C
-0x8C4A = 0x2D4B
-0x8C4C = 0x326C
-0x8C4E = 0x336C
-0x8C50 = 0x346C
-0x8C55 = 0x356C
-0x8C5A = 0x5A46
-0x8C61 = 0x5D3E
-0x8C62 = 0x366C
-0x8C6A = 0x6B39
-0x8C6B = 0x2E50
-0x8C6C = 0x376C
-0x8C78 = 0x386C
-0x8C79 = 0x3F49
-0x8C7A = 0x396C
-0x8C7C = 0x416C
-0x8C82 = 0x3A6C
-0x8C85 = 0x3C6C
-0x8C89 = 0x3B6C
-0x8C8A = 0x3D6C
-0x8C8C = 0x464B
-0x8C8D = 0x3E6C
-0x8C8E = 0x3F6C
-0x8C94 = 0x406C
-0x8C98 = 0x426C
-0x8C9D = 0x2D33
-0x8C9E = 0x6744
-0x8CA0 = 0x6949
-0x8CA1 = 0x623A
-0x8CA2 = 0x5739
-0x8CA7 = 0x4F49
-0x8CA8 = 0x5F32
-0x8CA9 = 0x4E48
-0x8CAA = 0x456C
-0x8CAB = 0x5334
-0x8CAC = 0x5540
-0x8CAD = 0x446C
-0x8CAE = 0x496C
-0x8CAF = 0x7943
-0x8CB0 = 0x634C
-0x8CB2 = 0x476C
-0x8CB3 = 0x486C
-0x8CB4 = 0x2E35
-0x8CB6 = 0x4A6C
-0x8CB7 = 0x6347
-0x8CB8 = 0x5F42
-0x8CBB = 0x7148
-0x8CBC = 0x3D45
-0x8CBD = 0x466C
-0x8CBF = 0x474B
-0x8CC0 = 0x6C32
-0x8CC1 = 0x4C6C
-0x8CC2 = 0x284F
-0x8CC3 = 0x4244
-0x8CC4 = 0x454F
-0x8CC7 = 0x713B
-0x8CC8 = 0x4B6C
-0x8CCA = 0x3142
-0x8CCD = 0x5C6C
-0x8CCE = 0x2841
-0x8CD1 = 0x7846
-0x8CD3 = 0x5049
-0x8CDA = 0x4F6C
-0x8CDB = 0x3F3B
-0x8CDC = 0x723B
-0x8CDE = 0x5E3E
-0x8CE0 = 0x6547
-0x8CE2 = 0x2D38
-0x8CE3 = 0x4E6C
-0x8CE4 = 0x4D6C
-0x8CE6 = 0x6A49
-0x8CEA = 0x413C
-0x8CED = 0x5245
-0x8CFA = 0x516C
-0x8CFB = 0x526C
-0x8CFC = 0x5839
-0x8CFD = 0x506C
-0x8D04 = 0x536C
-0x8D05 = 0x546C
-0x8D07 = 0x566C
-0x8D08 = 0x2342
-0x8D0A = 0x556C
-0x8D0B = 0x6634
-0x8D0D = 0x586C
-0x8D0F = 0x576C
-0x8D10 = 0x596C
-0x8D13 = 0x5B6C
-0x8D14 = 0x5D6C
-0x8D16 = 0x5E6C
-0x8D64 = 0x5640
-0x8D66 = 0x4F3C
-0x8D67 = 0x5F6C
-0x8D6B = 0x5233
-0x8D6D = 0x606C
-0x8D70 = 0x7641
-0x8D71 = 0x616C
-0x8D73 = 0x626C
-0x8D74 = 0x6B49
-0x8D77 = 0x2F35
-0x8D81 = 0x636C
-0x8D85 = 0x3644
-0x8D8A = 0x5B31
-0x8D99 = 0x646C
-0x8DA3 = 0x713C
-0x8DA8 = 0x763F
-0x8DB3 = 0x2D42
-0x8DBA = 0x676C
-0x8DBE = 0x666C
-0x8DC2 = 0x656C
-0x8DCB = 0x6D6C
-0x8DCC = 0x6B6C
-0x8DCF = 0x686C
-0x8DD6 = 0x6A6C
-0x8DDA = 0x696C
-0x8DDD = 0x7735
-0x8DDF = 0x706C
-0x8DE1 = 0x5740
-0x8DE3 = 0x716C
-0x8DE8 = 0x5938
-0x8DEA = 0x6E6C
-0x8DEB = 0x6F6C
-0x8DEF = 0x294F
-0x8DF3 = 0x3744
-0x8DF5 = 0x2941
-0x8DFC = 0x726C
-0x8DFF = 0x756C
-0x8E08 = 0x736C
-0x8E09 = 0x746C
-0x8E0A = 0x594D
-0x8E0F = 0x2746
-0x8E10 = 0x786C
-0x8E1D = 0x766C
-0x8E1E = 0x776C
-0x8E1F = 0x796C
-0x8E2A = 0x296D
-0x8E30 = 0x7C6C
-0x8E34 = 0x7D6C
-0x8E35 = 0x7B6C
-0x8E42 = 0x7A6C
-0x8E44 = 0x7D44
-0x8E47 = 0x216D
-0x8E48 = 0x256D
-0x8E49 = 0x226D
-0x8E4A = 0x7E6C
-0x8E4C = 0x236D
-0x8E50 = 0x246D
-0x8E55 = 0x2B6D
-0x8E59 = 0x266D
-0x8E5F = 0x5840
-0x8E60 = 0x286D
-0x8E63 = 0x2A6D
-0x8E64 = 0x276D
-0x8E72 = 0x2D6D
-0x8E74 = 0x333D
-0x8E76 = 0x2C6D
-0x8E7C = 0x2E6D
-0x8E81 = 0x2F6D
-0x8E84 = 0x326D
-0x8E85 = 0x316D
-0x8E87 = 0x306D
-0x8E8A = 0x346D
-0x8E8B = 0x336D
-0x8E8D = 0x764C
-0x8E91 = 0x366D
-0x8E93 = 0x356D
-0x8E94 = 0x376D
-0x8E99 = 0x386D
-0x8EA1 = 0x3A6D
-0x8EAA = 0x396D
-0x8EAB = 0x483F
-0x8EAC = 0x3B6D
-0x8EAF = 0x6D36
-0x8EB0 = 0x3C6D
-0x8EB1 = 0x3E6D
-0x8EBE = 0x3F6D
-0x8EC5 = 0x406D
-0x8EC6 = 0x3D6D
-0x8EC8 = 0x416D
-0x8ECA = 0x563C
-0x8ECB = 0x426D
-0x8ECC = 0x3035
-0x8ECD = 0x3337
-0x8ED2 = 0x2E38
-0x8EDB = 0x436D
-0x8EDF = 0x7046
-0x8EE2 = 0x3E45
-0x8EE3 = 0x446D
-0x8EEB = 0x476D
-0x8EF8 = 0x343C
-0x8EFB = 0x466D
-0x8EFC = 0x456D
-0x8EFD = 0x5A37
-0x8EFE = 0x486D
-0x8F03 = 0x5333
-0x8F05 = 0x4A6D
-0x8F09 = 0x5C3A
-0x8F0A = 0x496D
-0x8F0C = 0x526D
-0x8F12 = 0x4C6D
-0x8F13 = 0x4E6D
-0x8F14 = 0x654A
-0x8F15 = 0x4B6D
-0x8F19 = 0x4D6D
-0x8F1B = 0x516D
-0x8F1C = 0x4F6D
-0x8F1D = 0x3135
-0x8F1F = 0x506D
-0x8F26 = 0x536D
-0x8F29 = 0x5A47
-0x8F2A = 0x584E
-0x8F2F = 0x343D
-0x8F33 = 0x546D
-0x8F38 = 0x224D
-0x8F39 = 0x566D
-0x8F3B = 0x556D
-0x8F3E = 0x596D
-0x8F3F = 0x414D
-0x8F42 = 0x586D
-0x8F44 = 0x6D33
-0x8F45 = 0x576D
-0x8F46 = 0x5C6D
-0x8F49 = 0x5B6D
-0x8F4C = 0x5A6D
-0x8F4D = 0x3245
-0x8F4E = 0x5D6D
-0x8F57 = 0x5E6D
-0x8F5C = 0x5F6D
-0x8F5F = 0x6C39
-0x8F61 = 0x2537
-0x8F62 = 0x606D
-0x8F63 = 0x616D
-0x8F64 = 0x626D
-0x8F9B = 0x493F
-0x8F9C = 0x636D
-0x8F9E = 0x2D3C
-0x8F9F = 0x646D
-0x8FA3 = 0x656D
-0x8FA7 = 0x2152
-0x8FA8 = 0x7E51
-0x8FAD = 0x666D
-0x8FAE = 0x7065
-0x8FAF = 0x676D
-0x8FB0 = 0x2443
-0x8FB1 = 0x2B3F
-0x8FB2 = 0x4047
-0x8FB7 = 0x686D
-0x8FBA = 0x554A
-0x8FBB = 0x5444
-0x8FBC = 0x7E39
-0x8FBF = 0x2943
-0x8FC2 = 0x2A31
-0x8FC4 = 0x784B
-0x8FC5 = 0x573F
-0x8FCE = 0x5E37
-0x8FD1 = 0x6136
-0x8FD4 = 0x564A
-0x8FDA = 0x696D
-0x8FE2 = 0x6B6D
-0x8FE5 = 0x6A6D
-0x8FE6 = 0x6032
-0x8FE9 = 0x7646
-0x8FEA = 0x6C6D
-0x8FEB = 0x7747
-0x8FED = 0x3345
-0x8FF0 = 0x523D
-0x8FF4 = 0x6F6D
-0x8FF7 = 0x424C
-0x8FF8 = 0x7E6D
-0x8FF9 = 0x716D
-0x8FFA = 0x726D
-0x8FFD = 0x4944
-0x9000 = 0x6042
-0x9001 = 0x7741
-0x9003 = 0x2846
-0x9005 = 0x706D
-0x9006 = 0x5535
-0x900B = 0x796D
-0x900D = 0x766D
-0x900E = 0x256E
-0x900F = 0x2946
-0x9010 = 0x6043
-0x9011 = 0x736D
-0x9013 = 0x7E44
-0x9014 = 0x5345
-0x9015 = 0x746D
-0x9016 = 0x786D
-0x9017 = 0x603F
-0x9019 = 0x6747
-0x901A = 0x4C44
-0x901D = 0x4240
-0x901E = 0x776D
-0x901F = 0x2E42
-0x9020 = 0x2442
-0x9021 = 0x756D
-0x9022 = 0x2930
-0x9023 = 0x224F
-0x9027 = 0x7A6D
-0x902E = 0x6142
-0x9031 = 0x353D
-0x9032 = 0x4A3F
-0x9035 = 0x7C6D
-0x9036 = 0x7B6D
-0x9038 = 0x6F30
-0x9039 = 0x7D6D
-0x903C = 0x2F49
-0x903E = 0x276E
-0x9041 = 0x5B46
-0x9042 = 0x6B3F
-0x9045 = 0x5943
-0x9047 = 0x7836
-0x9049 = 0x266E
-0x904A = 0x374D
-0x904B = 0x3F31
-0x904D = 0x574A
-0x904E = 0x6132
-0x904F = 0x216E
-0x9050 = 0x226E
-0x9051 = 0x236E
-0x9052 = 0x246E
-0x9053 = 0x3B46
-0x9054 = 0x2343
-0x9055 = 0x6330
-0x9056 = 0x286E
-0x9058 = 0x296E
-0x9059 = 0x2374
-0x905C = 0x3D42
-0x905E = 0x2A6E
-0x9060 = 0x7331
-0x9061 = 0x4C41
-0x9063 = 0x2F38
-0x9065 = 0x5A4D
-0x9068 = 0x2B6E
-0x9069 = 0x2C45
-0x906D = 0x7841
-0x906E = 0x573C
-0x906F = 0x2C6E
-0x9072 = 0x2F6E
-0x9075 = 0x653D
-0x9076 = 0x2D6E
-0x9077 = 0x2B41
-0x9078 = 0x2A41
-0x907A = 0x6430
-0x907C = 0x4B4E
-0x907D = 0x316E
-0x907F = 0x7248
-0x9080 = 0x336E
-0x9081 = 0x326E
-0x9082 = 0x306E
-0x9083 = 0x6463
-0x9084 = 0x5434
-0x9087 = 0x6E6D
-0x9089 = 0x356E
-0x908A = 0x346E
-0x908F = 0x366E
-0x9091 = 0x384D
-0x90A3 = 0x6146
-0x90A6 = 0x2E4B
-0x90A8 = 0x376E
-0x90AA = 0x593C
-0x90AF = 0x386E
-0x90B1 = 0x396E
-0x90B5 = 0x3A6E
-0x90B8 = 0x2145
-0x90C1 = 0x6A30
-0x90CA = 0x5939
-0x90CE = 0x3A4F
-0x90DB = 0x3E6E
-0x90E1 = 0x3437
-0x90E2 = 0x3B6E
-0x90E4 = 0x3C6E
-0x90E8 = 0x7449
-0x90ED = 0x5433
-0x90F5 = 0x394D
-0x90F7 = 0x3F36
-0x90FD = 0x5445
-0x9102 = 0x3F6E
-0x9112 = 0x406E
-0x9119 = 0x416E
-0x912D = 0x2245
-0x9130 = 0x436E
-0x9132 = 0x426E
-0x9149 = 0x5346
-0x914A = 0x446E
-0x914B = 0x363D
-0x914C = 0x603C
-0x914D = 0x5B47
-0x914E = 0x7143
-0x9152 = 0x723C
-0x9154 = 0x6C3F
-0x9156 = 0x456E
-0x9158 = 0x466E
-0x9162 = 0x5D3F
-0x9163 = 0x476E
-0x9165 = 0x486E
-0x9169 = 0x496E
-0x916A = 0x6F4D
-0x916C = 0x373D
-0x9172 = 0x4B6E
-0x9173 = 0x4A6E
-0x9175 = 0x5A39
-0x9177 = 0x7339
-0x9178 = 0x403B
-0x9182 = 0x4E6E
-0x9187 = 0x663D
-0x9189 = 0x4D6E
-0x918B = 0x4C6E
-0x918D = 0x6942
-0x9190 = 0x6F38
-0x9192 = 0x4340
-0x9197 = 0x3048
-0x919C = 0x393D
-0x91A2 = 0x4F6E
-0x91A4 = 0x5F3E
-0x91AA = 0x526E
-0x91AB = 0x506E
-0x91AF = 0x516E
-0x91B4 = 0x546E
-0x91B5 = 0x536E
-0x91B8 = 0x7A3E
-0x91BA = 0x556E
-0x91C0 = 0x566E
-0x91C1 = 0x576E
-0x91C6 = 0x5048
-0x91C7 = 0x533A
-0x91C8 = 0x613C
-0x91C9 = 0x586E
-0x91CB = 0x596E
-0x91CC = 0x244E
-0x91CD = 0x453D
-0x91CE = 0x6E4C
-0x91CF = 0x4C4E
-0x91D0 = 0x5A6E
-0x91D1 = 0x6236
-0x91D6 = 0x5B6E
-0x91D8 = 0x2345
-0x91DB = 0x5E6E
-0x91DC = 0x7833
-0x91DD = 0x4B3F
-0x91DF = 0x5C6E
-0x91E1 = 0x5D6E
-0x91E3 = 0x6044
-0x91E6 = 0x554B
-0x91E7 = 0x7C36
-0x91F5 = 0x606E
-0x91F6 = 0x616E
-0x91FC = 0x5F6E
-0x91FF = 0x636E
-0x920D = 0x5F46
-0x920E = 0x4333
-0x9211 = 0x676E
-0x9214 = 0x646E
-0x9215 = 0x666E
-0x921E = 0x626E
-0x9229 = 0x4F6F
-0x922C = 0x656E
-0x9234 = 0x6B4E
-0x9237 = 0x5A38
-0x923F = 0x6F6E
-0x9244 = 0x3445
-0x9245 = 0x6A6E
-0x9248 = 0x6D6E
-0x9249 = 0x6B6E
-0x924B = 0x706E
-0x9250 = 0x716E
-0x9257 = 0x696E
-0x925A = 0x766E
-0x925B = 0x7431
-0x925E = 0x686E
-0x9262 = 0x2D48
-0x9264 = 0x6C6E
-0x9266 = 0x603E
-0x9271 = 0x5B39
-0x927E = 0x484B
-0x9280 = 0x6436
-0x9283 = 0x463D
-0x9285 = 0x3C46
-0x9291 = 0x2D41
-0x9293 = 0x746E
-0x9296 = 0x736E
-0x9298 = 0x434C
-0x929A = 0x3844
-0x929B = 0x756E
-0x929C = 0x726E
-0x92AD = 0x2C41
-0x92B7 = 0x796E
-0x92B9 = 0x786E
-0x92CF = 0x776E
-0x92D2 = 0x2F4B
-0x92E4 = 0x7B3D
-0x92E9 = 0x7A6E
-0x92EA = 0x5F4A
-0x92ED = 0x5431
-0x92F2 = 0x4649
-0x92F3 = 0x7243
-0x92F8 = 0x7835
-0x92FA = 0x7C6E
-0x92FC = 0x5D39
-0x9306 = 0x2C3B
-0x930F = 0x7B6E
-0x9310 = 0x6D3F
-0x9318 = 0x6E3F
-0x9319 = 0x216F
-0x931A = 0x236F
-0x9320 = 0x7B3E
-0x9322 = 0x226F
-0x9323 = 0x246F
-0x9326 = 0x5336
-0x9328 = 0x4549
-0x932B = 0x623C
-0x932C = 0x234F
-0x932E = 0x7E6E
-0x932F = 0x783A
-0x9332 = 0x3F4F
-0x9335 = 0x266F
-0x933A = 0x256F
-0x933B = 0x276F
-0x9344 = 0x7D6E
-0x934B = 0x6946
-0x934D = 0x5545
-0x9354 = 0x5744
-0x9356 = 0x2C6F
-0x935C = 0x286F
-0x9360 = 0x296F
-0x936C = 0x2D37
-0x936E = 0x2B6F
-0x9375 = 0x3038
-0x937C = 0x2A6F
-0x937E = 0x613E
-0x938C = 0x7933
-0x9394 = 0x306F
-0x9396 = 0x3F3A
-0x9397 = 0x7941
-0x939A = 0x4A44
-0x93A7 = 0x3B33
-0x93AC = 0x2E6F
-0x93AD = 0x2F6F
-0x93AE = 0x4344
-0x93B0 = 0x2D6F
-0x93B9 = 0x316F
-0x93C3 = 0x376F
-0x93C8 = 0x3A6F
-0x93D0 = 0x396F
-0x93D1 = 0x2D45
-0x93D6 = 0x326F
-0x93D7 = 0x336F
-0x93D8 = 0x366F
-0x93DD = 0x386F
-0x93E1 = 0x4036
-0x93E4 = 0x3B6F
-0x93E5 = 0x356F
-0x93E8 = 0x346F
-0x9403 = 0x3F6F
-0x9407 = 0x406F
-0x9410 = 0x416F
-0x9413 = 0x3E6F
-0x9414 = 0x3D6F
-0x9418 = 0x623E
-0x9419 = 0x2A46
-0x941A = 0x3C6F
-0x9421 = 0x456F
-0x942B = 0x436F
-0x9435 = 0x446F
-0x9436 = 0x426F
-0x9438 = 0x7842
-0x943A = 0x466F
-0x9441 = 0x476F
-0x9444 = 0x496F
-0x9451 = 0x5534
-0x9452 = 0x486F
-0x9453 = 0x7A4C
-0x945A = 0x546F
-0x945B = 0x4A6F
-0x945E = 0x4D6F
-0x9460 = 0x4B6F
-0x9462 = 0x4C6F
-0x946A = 0x4E6F
-0x9470 = 0x506F
-0x9475 = 0x516F
-0x9477 = 0x526F
-0x947C = 0x556F
-0x947D = 0x536F
-0x947E = 0x566F
-0x947F = 0x586F
-0x9481 = 0x576F
-0x9577 = 0x3944
-0x9580 = 0x674C
-0x9582 = 0x596F
-0x9583 = 0x2E41
-0x9587 = 0x5A6F
-0x9589 = 0x444A
-0x958A = 0x5B6F
-0x958B = 0x2B33
-0x958F = 0x3C31
-0x9591 = 0x5734
-0x9593 = 0x5634
-0x9594 = 0x5C6F
-0x9596 = 0x5D6F
-0x9598 = 0x5E6F
-0x9599 = 0x5F6F
-0x95A0 = 0x606F
-0x95A2 = 0x5834
-0x95A3 = 0x5533
-0x95A4 = 0x5E39
-0x95A5 = 0x3648
-0x95A7 = 0x626F
-0x95A8 = 0x616F
-0x95AD = 0x636F
-0x95B2 = 0x5C31
-0x95B9 = 0x666F
-0x95BB = 0x656F
-0x95BC = 0x646F
-0x95BE = 0x676F
-0x95C3 = 0x6A6F
-0x95C7 = 0x4730
-0x95CA = 0x686F
-0x95CC = 0x6C6F
-0x95CD = 0x6B6F
-0x95D4 = 0x6E6F
-0x95D5 = 0x6D6F
-0x95D8 = 0x2E46
-0x95DC = 0x706F
-0x95E1 = 0x716F
-0x95E2 = 0x736F
-0x95E5 = 0x726F
-0x961C = 0x6C49
-0x9621 = 0x746F
-0x9628 = 0x756F
-0x962A = 0x653A
-0x962E = 0x766F
-0x962F = 0x776F
-0x9632 = 0x494B
-0x963B = 0x4B41
-0x963F = 0x2430
-0x9640 = 0x4B42
-0x9642 = 0x786F
-0x9644 = 0x6D49
-0x964B = 0x7B6F
-0x964C = 0x796F
-0x964D = 0x5F39
-0x964F = 0x7A6F
-0x9650 = 0x4238
-0x965B = 0x454A
-0x965C = 0x7D6F
-0x965D = 0x2170
-0x965E = 0x7E6F
-0x965F = 0x2270
-0x9662 = 0x2131
-0x9663 = 0x583F
-0x9664 = 0x7C3D
-0x9665 = 0x5934
-0x9666 = 0x2370
-0x966A = 0x6647
-0x966C = 0x2570
-0x9670 = 0x2231
-0x9672 = 0x2470
-0x9675 = 0x4D4E
-0x9676 = 0x2B46
-0x9677 = 0x7C6F
-0x9678 = 0x264E
-0x967A = 0x3138
-0x967D = 0x5B4D
-0x9685 = 0x7936
-0x9686 = 0x344E
-0x9688 = 0x2837
-0x968A = 0x6242
-0x968B = 0x2167
-0x968D = 0x2670
-0x968E = 0x2C33
-0x968F = 0x6F3F
-0x9694 = 0x5633
-0x9695 = 0x2870
-0x9697 = 0x2970
-0x9698 = 0x2770
-0x9699 = 0x6437
-0x969B = 0x5D3A
-0x969C = 0x633E
-0x96A0 = 0x2331
-0x96A3 = 0x594E
-0x96A7 = 0x2B70
-0x96A8 = 0x2E6E
-0x96AA = 0x2A70
-0x96B0 = 0x2E70
-0x96B1 = 0x2C70
-0x96B2 = 0x2D70
-0x96B4 = 0x2F70
-0x96B6 = 0x3070
-0x96B7 = 0x6C4E
-0x96B8 = 0x3170
-0x96B9 = 0x3270
-0x96BB = 0x4940
-0x96BC = 0x3B48
-0x96C0 = 0x7D3F
-0x96C1 = 0x6734
-0x96C4 = 0x3A4D
-0x96C5 = 0x6D32
-0x96C6 = 0x383D
-0x96C7 = 0x5B38
-0x96C9 = 0x3570
-0x96CB = 0x3470
-0x96CC = 0x733B
-0x96CD = 0x3670
-0x96CE = 0x3370
-0x96D1 = 0x283B
-0x96D5 = 0x3A70
-0x96D6 = 0x2D6A
-0x96D9 = 0x5652
-0x96DB = 0x773F
-0x96DC = 0x3870
-0x96E2 = 0x254E
-0x96E3 = 0x7146
-0x96E8 = 0x2B31
-0x96EA = 0x6340
-0x96EB = 0x363C
-0x96F0 = 0x374A
-0x96F2 = 0x4031
-0x96F6 = 0x6D4E
-0x96F7 = 0x6B4D
-0x96F9 = 0x3B70
-0x9700 = 0x7B3C
-0x9704 = 0x3C70
-0x9706 = 0x3D70
-0x9707 = 0x4C3F
-0x9708 = 0x3E70
-0x970A = 0x6E4E
-0x970D = 0x3970
-0x970E = 0x4070
-0x970F = 0x4270
-0x9711 = 0x4170
-0x9713 = 0x3F70
-0x9716 = 0x4370
-0x9719 = 0x4470
-0x971C = 0x7A41
-0x971E = 0x6232
-0x9724 = 0x4570
-0x9727 = 0x384C
-0x972A = 0x4670
-0x9730 = 0x4770
-0x9732 = 0x2A4F
-0x9738 = 0x315B
-0x9739 = 0x4870
-0x973D = 0x4970
-0x973E = 0x4A70
-0x9742 = 0x4E70
-0x9744 = 0x4B70
-0x9746 = 0x4C70
-0x9748 = 0x4D70
-0x9749 = 0x4F70
-0x9752 = 0x4440
-0x9756 = 0x774C
-0x9759 = 0x4540
-0x975C = 0x5070
-0x975E = 0x7348
-0x9760 = 0x5170
-0x9761 = 0x5373
-0x9764 = 0x5270
-0x9766 = 0x5370
-0x9768 = 0x5470
-0x9769 = 0x5733
-0x976B = 0x5670
-0x976D = 0x593F
-0x9771 = 0x5770
-0x9774 = 0x2437
-0x9779 = 0x5870
-0x977A = 0x5C70
-0x977C = 0x5A70
-0x9781 = 0x5B70
-0x9784 = 0x7333
-0x9785 = 0x5970
-0x9786 = 0x5D70
-0x978B = 0x5E70
-0x978D = 0x4830
-0x978F = 0x5F70
-0x9790 = 0x6070
-0x9798 = 0x643E
-0x979C = 0x6170
-0x97A0 = 0x4735
-0x97A3 = 0x6470
-0x97A6 = 0x6370
-0x97A8 = 0x6270
-0x97AB = 0x716B
-0x97AD = 0x5C4A
-0x97B3 = 0x6570
-0x97B4 = 0x6670
-0x97C3 = 0x6770
-0x97C6 = 0x6870
-0x97C8 = 0x6970
-0x97CB = 0x6A70
-0x97D3 = 0x5A34
-0x97DC = 0x6B70
-0x97ED = 0x6C70
-0x97EE = 0x2347
-0x97F2 = 0x6E70
-0x97F3 = 0x3B32
-0x97F5 = 0x7170
-0x97FB = 0x2431
-0x97FF = 0x4136
-0x9801 = 0x474A
-0x9802 = 0x3A44
-0x9803 = 0x223A
-0x9805 = 0x6039
-0x9806 = 0x673D
-0x9808 = 0x5C3F
-0x980C = 0x7370
-0x980F = 0x7270
-0x9810 = 0x424D
-0x9811 = 0x6834
-0x9812 = 0x5248
-0x9813 = 0x5C46
-0x9817 = 0x7C3F
-0x981A = 0x5B37
-0x9821 = 0x7670
-0x9824 = 0x7570
-0x982D = 0x2C46
-0x9834 = 0x5031
-0x9837 = 0x7770
-0x9838 = 0x7470
-0x983B = 0x5149
-0x983C = 0x6A4D
-0x983D = 0x7870
-0x9846 = 0x7970
-0x984B = 0x7B70
-0x984C = 0x6A42
-0x984D = 0x5B33
-0x984E = 0x5C33
-0x984F = 0x7A70
-0x9854 = 0x6934
-0x9855 = 0x3238
-0x9858 = 0x6A34
-0x985B = 0x3F45
-0x985E = 0x604E
-0x9867 = 0x5C38
-0x986B = 0x7C70
-0x986F = 0x7D70
-0x9870 = 0x7E70
-0x9871 = 0x2171
-0x9873 = 0x2371
-0x9874 = 0x2271
-0x98A8 = 0x7749
-0x98AA = 0x2471
-0x98AF = 0x2571
-0x98B1 = 0x2671
-0x98B6 = 0x2771
-0x98C3 = 0x2971
-0x98C4 = 0x2871
-0x98C6 = 0x2A71
-0x98DB = 0x7448
-0x98DC = 0x4C66
-0x98DF = 0x293F
-0x98E2 = 0x3235
-0x98E9 = 0x2B71
-0x98EB = 0x2C71
-0x98ED = 0x2C52
-0x98EE = 0x3B5D
-0x98EF = 0x5348
-0x98F2 = 0x7B30
-0x98F4 = 0x3B30
-0x98FC = 0x743B
-0x98FD = 0x304B
-0x98FE = 0x7E3E
-0x9903 = 0x2D71
-0x9905 = 0x5F4C
-0x9909 = 0x2E71
-0x990A = 0x5C4D
-0x990C = 0x4231
-0x9910 = 0x413B
-0x9912 = 0x2F71
-0x9913 = 0x6E32
-0x9914 = 0x3071
-0x9918 = 0x3171
-0x991D = 0x3371
-0x991E = 0x3471
-0x9920 = 0x3671
-0x9921 = 0x3271
-0x9924 = 0x3571
-0x9928 = 0x5B34
-0x992C = 0x3771
-0x992E = 0x3871
-0x993D = 0x3971
-0x993E = 0x3A71
-0x9942 = 0x3B71
-0x9945 = 0x3D71
-0x9949 = 0x3C71
-0x994B = 0x3F71
-0x994C = 0x4271
-0x9950 = 0x3E71
-0x9951 = 0x4071
-0x9952 = 0x4171
-0x9955 = 0x4371
-0x9957 = 0x4236
-0x9996 = 0x733C
-0x9997 = 0x4471
-0x9998 = 0x4571
-0x9999 = 0x6139
-0x99A5 = 0x4671
-0x99A8 = 0x3E33
-0x99AC = 0x4F47
-0x99AD = 0x4771
-0x99AE = 0x4871
-0x99B3 = 0x5A43
-0x99B4 = 0x6B46
-0x99BC = 0x4971
-0x99C1 = 0x7D47
-0x99C4 = 0x4C42
-0x99C5 = 0x5831
-0x99C6 = 0x6E36
-0x99C8 = 0x6F36
-0x99D0 = 0x7343
-0x99D1 = 0x4E71
-0x99D2 = 0x7036
-0x99D5 = 0x6F32
-0x99D8 = 0x4D71
-0x99DB = 0x4B71
-0x99DD = 0x4C71
-0x99DF = 0x4A71
-0x99E2 = 0x5871
-0x99ED = 0x4F71
-0x99EE = 0x5071
-0x99F1 = 0x5171
-0x99F2 = 0x5271
-0x99F8 = 0x5471
-0x99FB = 0x5371
-0x99FF = 0x593D
-0x9A01 = 0x5571
-0x9A05 = 0x5771
-0x9A0E = 0x3335
-0x9A0F = 0x5671
-0x9A12 = 0x7B41
-0x9A13 = 0x3338
-0x9A19 = 0x5971
-0x9A28 = 0x4D42
-0x9A2B = 0x5A71
-0x9A30 = 0x2D46
-0x9A37 = 0x5B71
-0x9A3E = 0x6071
-0x9A40 = 0x5E71
-0x9A42 = 0x5D71
-0x9A43 = 0x5F71
-0x9A45 = 0x5C71
-0x9A4D = 0x6271
-0x9A55 = 0x6171
-0x9A57 = 0x6471
-0x9A5A = 0x4336
-0x9A5B = 0x6371
-0x9A5F = 0x6571
-0x9A62 = 0x6671
-0x9A64 = 0x6871
-0x9A65 = 0x6771
-0x9A69 = 0x6971
-0x9A6A = 0x6B71
-0x9A6B = 0x6A71
-0x9AA8 = 0x7C39
-0x9AAD = 0x6C71
-0x9AB0 = 0x6D71
-0x9AB8 = 0x3C33
-0x9ABC = 0x6E71
-0x9AC0 = 0x6F71
-0x9AC4 = 0x713F
-0x9ACF = 0x7071
-0x9AD3 = 0x7271
-0x9AD4 = 0x7371
-0x9AD8 = 0x6239
-0x9ADE = 0x7471
-0x9ADF = 0x7571
-0x9AE2 = 0x7671
-0x9AE3 = 0x7771
-0x9AE6 = 0x7871
-0x9AEA = 0x3148
-0x9AEB = 0x7A71
-0x9AED = 0x2649
-0x9AEE = 0x7B71
-0x9AEF = 0x7971
-0x9AF1 = 0x7D71
-0x9AF4 = 0x7C71
-0x9AF7 = 0x7E71
-0x9AFB = 0x2172
-0x9B06 = 0x2272
-0x9B18 = 0x2372
-0x9B1A = 0x2472
-0x9B1F = 0x2572
-0x9B22 = 0x2672
-0x9B23 = 0x2772
-0x9B25 = 0x2872
-0x9B27 = 0x2972
-0x9B28 = 0x2A72
-0x9B29 = 0x2B72
-0x9B2A = 0x2C72
-0x9B2E = 0x2D72
-0x9B2F = 0x2E72
-0x9B31 = 0x355D
-0x9B32 = 0x2F72
-0x9B3B = 0x7864
-0x9B3C = 0x3435
-0x9B41 = 0x2133
-0x9B42 = 0x323A
-0x9B43 = 0x3172
-0x9B44 = 0x3072
-0x9B45 = 0x254C
-0x9B4D = 0x3372
-0x9B4E = 0x3472
-0x9B4F = 0x3272
-0x9B51 = 0x3572
-0x9B54 = 0x624B
-0x9B58 = 0x3672
-0x9B5A = 0x7B35
-0x9B6F = 0x254F
-0x9B74 = 0x3772
-0x9B83 = 0x3972
-0x9B8E = 0x3E30
-0x9B91 = 0x3A72
-0x9B92 = 0x2B4A
-0x9B93 = 0x3872
-0x9B96 = 0x3B72
-0x9B97 = 0x3C72
-0x9B9F = 0x3D72
-0x9BA0 = 0x3E72
-0x9BA8 = 0x3F72
-0x9BAA = 0x6E4B
-0x9BAB = 0x2D3B
-0x9BAD = 0x7A3A
-0x9BAE = 0x2F41
-0x9BB4 = 0x4072
-0x9BB9 = 0x4372
-0x9BC0 = 0x4172
-0x9BC6 = 0x4472
-0x9BC9 = 0x7138
-0x9BCA = 0x4272
-0x9BCF = 0x4572
-0x9BD1 = 0x4672
-0x9BD2 = 0x4772
-0x9BD4 = 0x4B72
-0x9BD6 = 0x2A3B
-0x9BDB = 0x6442
-0x9BE1 = 0x4C72
-0x9BE2 = 0x4972
-0x9BE3 = 0x4872
-0x9BE4 = 0x4A72
-0x9BE8 = 0x5F37
-0x9BF0 = 0x5072
-0x9BF1 = 0x4F72
-0x9BF2 = 0x4E72
-0x9BF5 = 0x3330
-0x9C04 = 0x5A72
-0x9C06 = 0x5672
-0x9C08 = 0x5772
-0x9C09 = 0x5372
-0x9C0A = 0x5972
-0x9C0C = 0x5572
-0x9C0D = 0x6233
-0x9C10 = 0x4C4F
-0x9C12 = 0x5872
-0x9C13 = 0x5472
-0x9C14 = 0x5272
-0x9C15 = 0x5172
-0x9C1B = 0x5C72
-0x9C21 = 0x5F72
-0x9C24 = 0x5E72
-0x9C25 = 0x5D72
-0x9C2E = 0x5B72
-0x9C2F = 0x7330
-0x9C30 = 0x6072
-0x9C32 = 0x6272
-0x9C39 = 0x6F33
-0x9C3A = 0x4D72
-0x9C3B = 0x3731
-0x9C3E = 0x6472
-0x9C46 = 0x6372
-0x9C47 = 0x6172
-0x9C48 = 0x2D43
-0x9C52 = 0x704B
-0x9C57 = 0x5A4E
-0x9C5A = 0x6572
-0x9C60 = 0x6672
-0x9C67 = 0x6772
-0x9C76 = 0x6872
-0x9C78 = 0x6972
-0x9CE5 = 0x3B44
-0x9CE7 = 0x6A72
-0x9CE9 = 0x3748
-0x9CEB = 0x6F72
-0x9CEC = 0x6B72
-0x9CF0 = 0x6C72
-0x9CF3 = 0x314B
-0x9CF4 = 0x444C
-0x9CF6 = 0x5046
-0x9D03 = 0x7072
-0x9D06 = 0x7172
-0x9D07 = 0x3E46
-0x9D08 = 0x6E72
-0x9D09 = 0x6D72
-0x9D0E = 0x2A32
-0x9D12 = 0x7972
-0x9D15 = 0x7872
-0x9D1B = 0x7531
-0x9D1F = 0x7672
-0x9D23 = 0x7572
-0x9D26 = 0x7372
-0x9D28 = 0x7B33
-0x9D2B = 0x323C
-0x9D2C = 0x2932
-0x9D3B = 0x6339
-0x9D3E = 0x7C72
-0x9D3F = 0x7B72
-0x9D41 = 0x7A72
-0x9D44 = 0x7772
-0x9D46 = 0x7D72
-0x9D48 = 0x7E72
-0x9D50 = 0x2573
-0x9D51 = 0x2473
-0x9D59 = 0x2673
-0x9D5C = 0x2D31
-0x9D5D = 0x2173
-0x9D5E = 0x2273
-0x9D60 = 0x7439
-0x9D61 = 0x394C
-0x9D64 = 0x2373
-0x9D6C = 0x324B
-0x9D6F = 0x2B73
-0x9D72 = 0x2773
-0x9D7A = 0x2C73
-0x9D87 = 0x2973
-0x9D89 = 0x2873
-0x9D8F = 0x5C37
-0x9D9A = 0x2D73
-0x9DA4 = 0x2E73
-0x9DA9 = 0x2F73
-0x9DAB = 0x2A73
-0x9DAF = 0x7472
-0x9DB2 = 0x3073
-0x9DB4 = 0x6144
-0x9DB8 = 0x3473
-0x9DBA = 0x3573
-0x9DBB = 0x3373
-0x9DC1 = 0x3273
-0x9DC2 = 0x3873
-0x9DC4 = 0x3173
-0x9DC6 = 0x3673
-0x9DCF = 0x3773
-0x9DD3 = 0x3A73
-0x9DD9 = 0x3973
-0x9DE6 = 0x3C73
-0x9DED = 0x3D73
-0x9DEF = 0x3E73
-0x9DF2 = 0x494F
-0x9DF8 = 0x3B73
-0x9DF9 = 0x6B42
-0x9DFA = 0x6D3A
-0x9DFD = 0x3F73
-0x9E1A = 0x4073
-0x9E1B = 0x4173
-0x9E1E = 0x4273
-0x9E75 = 0x4373
-0x9E78 = 0x3438
-0x9E79 = 0x4473
-0x9E7D = 0x4573
-0x9E7F = 0x2F3C
-0x9E81 = 0x4673
-0x9E88 = 0x4773
-0x9E8B = 0x4873
-0x9E8C = 0x4973
-0x9E91 = 0x4C73
-0x9E92 = 0x4A73
-0x9E93 = 0x3C4F
-0x9E95 = 0x4B73
-0x9E97 = 0x6F4E
-0x9E9D = 0x4D73
-0x9E9F = 0x5B4E
-0x9EA5 = 0x4E73
-0x9EA6 = 0x7E47
-0x9EA9 = 0x4F73
-0x9EAA = 0x5173
-0x9EAD = 0x5273
-0x9EB8 = 0x5073
-0x9EB9 = 0x6D39
-0x9EBA = 0x4D4C
-0x9EBB = 0x634B
-0x9EBC = 0x7756
-0x9EBE = 0x605D
-0x9EBF = 0x7B4B
-0x9EC4 = 0x2B32
-0x9ECC = 0x5473
-0x9ECD = 0x5035
-0x9ECE = 0x5573
-0x9ECF = 0x5673
-0x9ED0 = 0x5773
-0x9ED2 = 0x7539
-0x9ED4 = 0x5873
-0x9ED8 = 0x5460
-0x9ED9 = 0x5B4C
-0x9EDB = 0x6342
-0x9EDC = 0x5973
-0x9EDD = 0x5B73
-0x9EDE = 0x5A73
-0x9EE0 = 0x5C73
-0x9EE5 = 0x5D73
-0x9EE8 = 0x5E73
-0x9EEF = 0x5F73
-0x9EF4 = 0x6073
-0x9EF6 = 0x6173
-0x9EF7 = 0x6273
-0x9EF9 = 0x6373
-0x9EFB = 0x6473
-0x9EFC = 0x6573
-0x9EFD = 0x6673
-0x9F07 = 0x6773
-0x9F08 = 0x6873
-0x9F0E = 0x2445
-0x9F13 = 0x5D38
-0x9F15 = 0x6A73
-0x9F20 = 0x4D41
-0x9F21 = 0x6B73
-0x9F2C = 0x6C73
-0x9F3B = 0x2149
-0x9F3E = 0x6D73
-0x9F4A = 0x6E73
-0x9F4B = 0x3763
-0x9F4E = 0x5A6C
-0x9F4F = 0x6D70
-0x9F52 = 0x6F73
-0x9F54 = 0x7073
-0x9F5F = 0x7273
-0x9F61 = 0x7473
-0x9F62 = 0x704E
-0x9F63 = 0x7173
-0x9F66 = 0x7573
-0x9F67 = 0x7673
-0x9F6A = 0x7873
-0x9F6C = 0x7773
-0x9F72 = 0x7A73
-0x9F76 = 0x7B73
-0x9F77 = 0x7973
-0x9F8D = 0x364E
-0x9F95 = 0x7C73
-0x9F9C = 0x7D73
-0x9F9D = 0x5463
-0x9FA0 = 0x7E73
-0xF900 = 0x316C
-0xF901 = 0x3939
-0xF902 = 0x563C
-0xF903 = 0x4B6C
-0xF904 = 0x6A33
-0xF905 = 0x7A36
-0xF906 = 0x6736
-0xF907 = 0x7D73
-0xF908 = 0x7D73
-0xF909 = 0x4037
-0xF90A = 0x6236
-0xF90B = 0x4953
-0xF90C = 0x6046
-0xF90D = 0x7158
-0xF90E = 0x7A61
-0xF90F = 0x654D
-0xF910 = 0x4769
-0xF911 = 0x664D
-0xF912 = 0x674D
-0xF913 = 0x366E
-0xF914 = 0x5B5C
-0xF915 = 0x6C4D
-0xF916 = 0x605F
-0xF917 = 0x6460
-0xF918 = 0x6E4D
-0xF919 = 0x6F4D
-0xF91A = 0x5171
-0xF91B = 0x2C50
-0xF91C = 0x714D
-0xF91D = 0x734D
-0xF91E = 0x2560
-0xF91F = 0x764D
-0xF920 = 0x4273
-0xF921 = 0x724D
-0xF922 = 0x744D
-0xF923 = 0x754D
-0xF924 = 0x226B
-0xF925 = 0x4759
-0xF926 = 0x4467
-0xF928 = 0x2D4F
-0xF929 = 0x2F4F
-0xF92A = 0x324F
-0xF92B = 0x354F
-0xF92C = 0x3A4F
-0xF92D = 0x5450
-0xF92E = 0x644E
-0xF92F = 0x2952
-0xF931 = 0x264F
-0xF932 = 0x2460
-0xF933 = 0x3A62
-0xF934 = 0x374F
-0xF935 = 0x4369
-0xF936 = 0x3A4E
-0xF937 = 0x294F
-0xF938 = 0x2A4F
-0xF939 = 0x254F
-0xF93A = 0x6D3A
-0xF93B = 0x7162
-0xF93C = 0x3363
-0xF940 = 0x2F3C
-0xF941 = 0x404F
-0xF942 = 0x6254
-0xF943 = 0x2E4F
-0xF944 = 0x4664
-0xF945 = 0x384F
-0xF946 = 0x344F
-0xF947 = 0x7D62
-0xF948 = 0x284F
-0xF949 = 0x6B4D
-0xF94A = 0x5E54
-0xF94C = 0x6C5C
-0xF94E = 0x334F
-0xF94F = 0x5F4E
-0xF950 = 0x5F65
-0xF951 = 0x7B6F
-0xF952 = 0x5570
-0xF953 = 0x3E4F
-0xF954 = 0x2574
-0xF955 = 0x3F4E
-0xF956 = 0x474E
-0xF957 = 0x3D30
-0xF958 = 0x2949
-0xF959 = 0x4D4E
-0xF95A = 0x266C
-0xF95B = 0x3C59
-0xF95C = 0x5B5C
-0xF95D = 0x7A42
-0xF95E = 0x3043
-0xF95F = 0x2B47
-0xF960 = 0x5C45
-0xF961 = 0x284E
-0xF962 = 0x5B30
-0xF963 = 0x4C4B
-0xF965 = 0x584A
-0xF966 = 0x7C49
-0xF967 = 0x5449
-0xF968 = 0x6748
-0xF969 = 0x4B5A
-0xF96A = 0x773A
-0xF96B = 0x5452
-0xF96C = 0x493A
-0xF96D = 0x4A3E
-0xF96E = 0x554D
-0xF970 = 0x263B
-0xF971 = 0x2443
-0xF972 = 0x4044
-0xF973 = 0x263D
-0xF974 = 0x633C
-0xF975 = 0x2B4E
-0xF976 = 0x2C4E
-0xF977 = 0x3C4E
-0xF978 = 0x4051
-0xF979 = 0x5A51
-0xF97A = 0x424E
-0xF97B = 0x484E
-0xF97C = 0x494E
-0xF97D = 0x4A4E
-0xF97E = 0x4C4E
-0xF97F = 0x2F52
-0xF980 = 0x244F
-0xF981 = 0x773D
-0xF982 = 0x2A57
-0xF983 = 0x394E
-0xF984 = 0x495F
-0xF985 = 0x6A62
-0xF986 = 0x636F
-0xF987 = 0x6B71
-0xF988 = 0x6F4E
-0xF989 = 0x5573
-0xF98A = 0x4F4E
-0xF98D = 0x606D
-0xF98E = 0x2F47
-0xF98F = 0x794E
-0xF990 = 0x7858
-0xF991 = 0x3247
-0xF992 = 0x7A4E
-0xF993 = 0x7B4E
-0xF996 = 0x7D4E
-0xF997 = 0x7E4E
-0xF998 = 0x536D
-0xF999 = 0x214F
-0xF99A = 0x224F
-0xF99C = 0x734E
-0xF99D = 0x744E
-0xF99E = 0x7630
-0xF99F = 0x754E
-0xF9A0 = 0x764E
-0xF9A2 = 0x774E
-0xF9A3 = 0x3047
-0xF9A4 = 0x3147
-0xF9A6 = 0x7C4E
-0xF9A7 = 0x5A60
-0xF9A8 = 0x614E
-0xF9A9 = 0x7A53
-0xF9AA = 0x2B47
-0xF9AB = 0x664E
-0xF9AC = 0x674E
-0xF9AD = 0x684E
-0xF9AE = 0x7260
-0xF9AF = 0x3966
-0xF9B0 = 0x5966
-0xF9B1 = 0x6B4E
-0xF9B2 = 0x6D4E
-0xF9B3 = 0x4D70
-0xF9B4 = 0x4E4E
-0xF9B5 = 0x634E
-0xF9B6 = 0x3963
-0xF9B7 = 0x546E
-0xF9B8 = 0x3170
-0xF9B9 = 0x2858
-0xF9BA = 0x3B4E
-0xF9BB = 0x3D4E
-0xF9BC = 0x404E
-0xF9BD = 0x2247
-0xF9BE = 0x414E
-0xF9BF = 0x5B5C
-0xF9C0 = 0x795F
-0xF9C1 = 0x454E
-0xF9C2 = 0x7A68
-0xF9C3 = 0x4B4E
-0xF9C4 = 0x364E
-0xF9C5 = 0x745A
-0xF9C6 = 0x766F
-0xF9C7 = 0x2D4E
-0xF9C9 = 0x784C
-0xF9CA = 0x2E4E
-0xF9CB = 0x2F4E
-0xF9CC = 0x304E
-0xF9CD = 0x314E
-0xF9CE = 0x324E
-0xF9CF = 0x3349
-0xF9D0 = 0x604E
-0xF9D1 = 0x3B4F
-0xF9D2 = 0x2459
-0xF9D3 = 0x264E
-0xF9D4 = 0x514E
-0xF9D5 = 0x4656
-0xF9D6 = 0x4D5E
-0xF9D7 = 0x584E
-0xF9D8 = 0x274E
-0xF9D9 = 0x4B58
-0xF9DA = 0x2A37
-0xF9DB = 0x284E
-0xF9DC = 0x344E
-0xF9DD = 0x784D
-0xF9DE = 0x794D
-0xF9DF = 0x7A4D
-0xF9E0 = 0x5730
-0xF9E1 = 0x7B4D
-0xF9E2 = 0x7C4D
-0xF9E3 = 0x2545
-0xF9E4 = 0x7D4D
-0xF9E5 = 0x214E
-0xF9E6 = 0x6D58
-0xF9E7 = 0x224E
-0xF9E8 = 0x234E
-0xF9E9 = 0x244E
-0xF9EA = 0x254E
-0xF9EB = 0x3F46
-0xF9EC = 0x2E45
-0xF9ED = 0x6752
-0xF9EE = 0x554E
-0xF9F0 = 0x4269
-0xF9F1 = 0x594E
-0xF9F2 = 0x5A4E
-0xF9F3 = 0x5B4E
-0xF9F4 = 0x534E
-0xF9F5 = 0x544E
-0xF9F6 = 0x574E
-0xF9F7 = 0x294E
-0xF9F8 = 0x5E33
-0xF9F9 = 0x334E
-0xF9FB = 0x555F
-0xF9FC = 0x313C
-0xF9FD = 0x3A3D
-0xF9FE = 0x6343
-0xF9FF = 0x493B
-0xFA00 = 0x5A40
-0xFA01 = 0x5945
-0xFA02 = 0x7342
-0xFA03 = 0x7C45
-0xFA04 = 0x7042
-0xFA05 = 0x3646
-0xFA06 = 0x3D4B
-0xFA07 = 0x556D
-0xFA08 = 0x5439
-0xFA09 = 0x5F39
-0xFA0A = 0x2B38
-0xFA0B = 0x4733
-0xFA0C = 0x3A51
-0xFA10 = 0x4D44
-0xFA12 = 0x3240
-0xFA16 = 0x7643
-0xFA17 = 0x5731
-0xFA18 = 0x694E
-0xFA19 = 0x403F
-0xFA1A = 0x4D3E
-0xFA1B = 0x214A
-0xFA1C = 0x774C
-0xFA1D = 0x3A40
-0xFA1E = 0x2931
-0xFA22 = 0x743D
-0xFA25 = 0x6F30
-0xFA26 = 0x5445
-0xFA2A = 0x5348
-0xFA2B = 0x743B
-0xFA2C = 0x5B34
-0xFA2D = 0x6144
-0xFA30 = 0x6E49
-0xFA31 = 0x4E41
-0xFA32 = 0x484C
-0xFA33 = 0x594A
-0xFA34 = 0x5036
-0xFA35 = 0x5C48
-0xFA36 = 0x6533
-0xFA37 = 0x3243
-0xFA38 = 0x6F34
-0xFA39 = 0x3D4A
-0xFA3A = 0x4F4B
-0xFA3B = 0x5841
-0xFA3C = 0x2556
-0xFA3D = 0x7932
-0xFA3E = 0x3433
-0xFA3F = 0x7E41
-0xFA40 = 0x2844
-0xFA41 = 0x5249
-0xFA42 = 0x7B34
-0xFA43 = 0x6B3D
-0xFA44 = 0x5F47
-0xFA45 = 0x2433
-0xFA46 = 0x6D3D
-0xFA47 = 0x4134
-0xFA48 = 0x513C
-0xFA4A = 0x7642
-0xFA4B = 0x6A48
-0xFA4C = 0x523C
-0xFA4D = 0x633B
-0xFA4E = 0x2735
-0xFA4F = 0x344D
-0xFA50 = 0x4441
-0xFA51 = 0x4B3D
-0xFA52 = 0x5232
-0xFA53 = 0x7744
-0xFA54 = 0x7239
-0xFA55 = 0x4D46
-0xFA56 = 0x6140
-0xFA57 = 0x7D4E
-0xFA58 = 0x5665
-0xFA59 = 0x4B48
-0xFA5A = 0x703D
-0xFA5B = 0x543C
-0xFA5C = 0x2D3D
-0xFA5F = 0x7843
-0xFA60 = 0x6C33
-0xFA61 = 0x6B3B
-0xFA62 = 0x5A31
-0xFA63 = 0x6036
-0xFA64 = 0x5049
-0xFA65 = 0x2342
-0xFA67 = 0x6F30
-0xFA68 = 0x7146
-0xFA69 = 0x4136
-0xFA6A = 0x5149
-0xFE51 = 0x2221
-0xFE5D = 0x4C21
-0xFE5E = 0x4D21
-0xFF01 = 0x2A21
-0xFF03 = 0x7421
-0xFF04 = 0x7021
-0xFF05 = 0x7321
-0xFF06 = 0x7521
-0xFF08 = 0x4A21
-0xFF09 = 0x4B21
-0xFF0A = 0x7621
-0xFF0B = 0x5C21
-0xFF0C = 0x2421
-0xFF0E = 0x2521
-0xFF0F = 0x3F21
-0xFF10 = 0x3023
-0xFF11 = 0x3123
-0xFF12 = 0x3223
-0xFF13 = 0x3323
-0xFF14 = 0x3423
-0xFF15 = 0x3523
-0xFF16 = 0x3623
-0xFF17 = 0x3723
-0xFF18 = 0x3823
-0xFF19 = 0x3923
-0xFF1A = 0x2721
-0xFF1B = 0x2821
-0xFF1C = 0x6321
-0xFF1D = 0x6121
-0xFF1E = 0x6421
-0xFF1F = 0x2921
-0xFF20 = 0x7721
-0xFF21 = 0x4123
-0xFF22 = 0x4223
-0xFF23 = 0x4323
-0xFF24 = 0x4423
-0xFF25 = 0x4523
-0xFF26 = 0x4623
-0xFF27 = 0x4723
-0xFF28 = 0x4823
-0xFF29 = 0x4923
-0xFF2A = 0x4A23
-0xFF2B = 0x4B23
-0xFF2C = 0x4C23
-0xFF2D = 0x4D23
-0xFF2E = 0x4E23
-0xFF2F = 0x4F23
-0xFF30 = 0x5023
-0xFF31 = 0x5123
-0xFF32 = 0x5223
-0xFF33 = 0x5323
-0xFF34 = 0x5423
-0xFF35 = 0x5523
-0xFF36 = 0x5623
-0xFF37 = 0x5723
-0xFF38 = 0x5823
-0xFF39 = 0x5923
-0xFF3A = 0x5A23
-0xFF3B = 0x4E21
-0xFF3C = 0x4021
-0xFF3D = 0x4F21
-0xFF3E = 0x3021
-0xFF3F = 0x3221
-0xFF40 = 0x2E21
-0xFF41 = 0x6123
-0xFF42 = 0x6223
-0xFF43 = 0x6323
-0xFF44 = 0x6423
-0xFF45 = 0x6523
-0xFF46 = 0x6623
-0xFF47 = 0x6723
-0xFF48 = 0x6823
-0xFF49 = 0x6923
-0xFF4A = 0x6A23
-0xFF4B = 0x6B23
-0xFF4C = 0x6C23
-0xFF4D = 0x6D23
-0xFF4E = 0x6E23
-0xFF4F = 0x6F23
-0xFF50 = 0x7023
-0xFF51 = 0x7123
-0xFF52 = 0x7223
-0xFF53 = 0x7323
-0xFF54 = 0x7423
-0xFF55 = 0x7523
-0xFF56 = 0x7623
-0xFF57 = 0x7723
-0xFF58 = 0x7823
-0xFF59 = 0x7923
-0xFF5A = 0x7A23
-0xFF5B = 0x5021
-0xFF5C = 0x4321
-0xFF5D = 0x5121
-0xFF61 = 0x2321
-0xFF62 = 0x5621
-0xFF63 = 0x5721
-0xFF64 = 0x2221
-0xFF65 = 0x2621
-0xFF66 = 0x7225
-0xFF67 = 0x2125
-0xFF68 = 0x2325
-0xFF69 = 0x2525
-0xFF6A = 0x2725
-0xFF6B = 0x2925
-0xFF6C = 0x6325
-0xFF6D = 0x6525
-0xFF6E = 0x6725
-0xFF6F = 0x4325
-0xFF70 = 0x3C21
-0xFF71 = 0x2225
-0xFF72 = 0x2425
-0xFF73 = 0x2625
-0xFF74 = 0x2825
-0xFF75 = 0x2A25
-0xFF76 = 0x2B25
-0xFF77 = 0x2D25
-0xFF78 = 0x2F25
-0xFF79 = 0x3125
-0xFF7A = 0x3325
-0xFF7B = 0x3525
-0xFF7C = 0x3725
-0xFF7D = 0x3925
-0xFF7E = 0x3B25
-0xFF7F = 0x3D25
-0xFF80 = 0x3F25
-0xFF81 = 0x4125
-0xFF82 = 0x4425
-0xFF83 = 0x4625
-0xFF84 = 0x4825
-0xFF85 = 0x4A25
-0xFF86 = 0x4B25
-0xFF87 = 0x4C25
-0xFF88 = 0x4D25
-0xFF89 = 0x4E25
-0xFF8A = 0x4F25
-0xFF8B = 0x5225
-0xFF8C = 0x5525
-0xFF8D = 0x5825
-0xFF8E = 0x5B25
-0xFF8F = 0x5E25
-0xFF90 = 0x5F25
-0xFF91 = 0x6025
-0xFF92 = 0x6125
-0xFF93 = 0x6225
-0xFF94 = 0x6425
-0xFF95 = 0x6625
-0xFF96 = 0x6825
-0xFF97 = 0x6925
-0xFF98 = 0x6A25
-0xFF99 = 0x6B25
-0xFF9A = 0x6C25
-0xFF9B = 0x6D25
-0xFF9C = 0x6F25
-0xFF9D = 0x7325
-0xFFE0 = 0x7121
-0xFFE1 = 0x7221
-0xFFE2 = 0x4C22
-0xFFE3 = 0x3121
-0xFFE5 = 0x6F21
-0xFFE8 = 0x2228
-0xFFE9 = 0x2B22
-0xFFEA = 0x2C22
-0xFFEB = 0x2A22
-0xFFEC = 0x2D22
-0xFFED = 0x2322
-0xFFEE = 0x7B21
 END_MAP
diff --git a/share/i18n/csmapper/JIS/charset.pivot.JIS.src b/share/i18n/csmapper/JIS/charset.pivot.JIS.src
index a96e47486a0..b97b3f360e5 100644
--- a/share/i18n/csmapper/JIS/charset.pivot.JIS.src
+++ b/share/i18n/csmapper/JIS/charset.pivot.JIS.src
@@ -4,7 +4,6 @@
 JISX0201-KANA		UCS			1
 JISX0208:1978		UCS			1
 JISX0208:1990		UCS			1
-JISX0208:EUC		UCS			1
 JISX0208:EUCMSSET	UCS			1
 JISX0212		UCS			1
 JISX0212:EUCMSSET	UCS			1
@@ -14,7 +13,6 @@ JISX0212+0213-2		UCS			1
 UCS			JISX0201-KANA		1
 UCS			JISX0208:1978		1
 UCS			JISX0208:1990		1
-UCS			JISX0208:EUC		1
 UCS			JISX0208:EUCMSSET	1
 UCS			JISX0212		1
 UCS			JISX0212:EUCMSSET	1
diff --git a/share/i18n/csmapper/JIS/mapper.dir.JIS.src b/share/i18n/csmapper/JIS/mapper.dir.JIS.src
index eefc8b9a5b1..6f778e3d531 100644
--- a/share/i18n/csmapper/JIS/mapper.dir.JIS.src
+++ b/share/i18n/csmapper/JIS/mapper.dir.JIS.src
@@ -7,7 +7,6 @@ JISX0208:1990/UCS		mapper_std	JIS/JISX0208@1990%UCS.mps
 JISX0208:MS/UCS			mapper_std	JIS/JISX0208@MS%UCS.mps
 JISX0208VDC:NEC/UCS		mapper_std	JIS/JISX0208VDC@NEC%UCS.mps
 JISX0208UDC/UCS			mapper_std	JIS/JISX0208UDC%UCS.mps
-JISX0208:EUC/UCS		mapper_parallel	JISX0208UDC/UCS,JISX0208:1990/UCS
 JISX0208:EUCMSSET/UCS		mapper_parallel	JISX0208VDC:NEC/UCS,JISX0208UDC/UCS,JISX0208:MS/UCS
 JISX0212/UCS			mapper_std	JIS/JISX0212%UCS.mps
 JISX0212:MS/UCS			mapper_std	JIS/JISX0212@MS%UCS.mps
@@ -16,10 +15,12 @@ JISX0212UDC/UCS			mapper_std	JIS/JISX0212UDC%UCS.mps
 JISX0212:EUCMSSET/UCS		mapper_parallel	JISX0212VDC:IBM/UCS,JISX0212UDC/UCS,JISX0212:MS/UCS
 JISX0213-1/UCS:BMP		mapper_std	JIS/JISX0213-1%UCS@BMP.mps
 JISX0213-1/UCS:SIP		mapper_std	JIS/JISX0213-1%UCS@SIP.mps
-JISX0213-1/UCS			mapper_parallel	JISX0213-1/UCS:BMP,JISX0213-1/UCS:SIP,JISX0208:1990/UCS
+JISX0213-1/UCS:SIPx		mapper_serial	JISX0213-1/UCS:SIP,UCS:SIP/UCS
+JISX0213-1/UCS			mapper_parallel	JISX0213-1/UCS:BMP,JISX0213-1/UCS:SIPx,JISX0208:1990/UCS
 JISX0213-2/UCS:BMP		mapper_std	JIS/JISX0213-2%UCS@BMP.mps
 JISX0213-2/UCS:SIP		mapper_std	JIS/JISX0213-2%UCS@SIP.mps
-JISX0213-2/UCS			mapper_parallel	JISX0213-2/UCS:BMP,JISX0213-2/UCS:SIP
+JISX0213-2/UCS:SIPx		mapper_serial	JISX0213-2/UCS:SIP,UCS:SIP/UCS
+JISX0213-2/UCS			mapper_parallel	JISX0213-2/UCS:BMP,JISX0213-2/UCS:SIPx
 JISX0212+0213-2/UCS		mapper_parallel	JISX0213-2/UCS,JISX0212/UCS
 UCS/JISX0201-KANA		mapper_std	JIS/UCS%JISX0201-KANA.mps
 UCS/JISX0208:1978		mapper_std	JIS/UCS%JISX0208@1978.mps
@@ -27,7 +28,6 @@ UCS/JISX0208:1990		mapper_std	JIS/UCS%JISX0208@1990.mps
 UCS/JISX0208:MS			mapper_std	JIS/UCS%JISX0208@MS.mps
 UCS/JISX0208VDC:NEC		mapper_std	JIS/UCS%JISX0208VDC@NEC.mps
 UCS/JISX0208UDC			mapper_std	JIS/UCS%JISX0208UDC.mps
-UCS/JISX0208:EUC		mapper_parallel	UCS/JISX0208:1990,UCS/JISX0208UDC
 UCS/JISX0208:EUCMSSET		mapper_parallel	UCS/JISX0208:MS,UCS/JISX0208VDC:NEC,UCS/JISX0208UDC
 UCS/JISX0212			mapper_std	JIS/UCS%JISX0212.mps
 UCS/JISX0212:MS			mapper_std	JIS/UCS%JISX0212@MS.mps
@@ -36,8 +36,10 @@ UCS/JISX0212UDC			mapper_std	JIS/UCS%JISX0212UDC.mps
 UCS/JISX0212:EUCMSSET		mapper_parallel	UCS/JISX0212VDC:IBM,UCS/JISX0212UDC,UCS/JISX0212:MS
 UCS:BMP/JISX0213-1		mapper_std	JIS/UCS@BMP%JISX0213-1.mps
 UCS:SIP/JISX0213-1		mapper_std	JIS/UCS@SIP%JISX0213-1.mps
-UCS/JISX0213-1			mapper_parallel	UCS/JISX0208:1990,UCS:BMP/JISX0213-1,UCS:SIP/JISX0213-1
+UCS:SIPx/JISX0213-1		mapper_serial	UCS/UCS:SIP,UCS:SIP/JISX0213-1
+UCS/JISX0213-1			mapper_parallel	UCS/JISX0208:1990,UCS:BMP/JISX0213-1,UCS:SIPx/JISX0213-1
 UCS:BMP/JISX0213-2		mapper_std	JIS/UCS@BMP%JISX0213-2.mps
 UCS:SIP/JISX0213-2		mapper_std	JIS/UCS@SIP%JISX0213-2.mps
-UCS/JISX0213-2			mapper_parallel	UCS:BMP/JISX0213-2,UCS:SIP/JISX0213-2
+UCS:SIPx/JISX0213-2		mapper_serial	UCS/UCS:SIP,UCS:SIP/JISX0213-2
+UCS/JISX0213-2			mapper_parallel	UCS:BMP/JISX0213-2,UCS:SIPx/JISX0213-2
 UCS/JISX0212+0213-2		mapper_parallel	UCS/JISX0213-2,UCS/JISX0212
diff --git a/share/i18n/esdb/EUC/EUC-JP.src b/share/i18n/esdb/EUC/EUC-JP.src
index e36cc05a2e4..f0766eb98f1 100644
--- a/share/i18n/esdb/EUC/EUC-JP.src
+++ b/share/i18n/esdb/EUC/EUC-JP.src
@@ -5,7 +5,7 @@ NAME		"EUC-JP"
 ENCODING	"EUC"
 VARIABLE	"1 0x0000 2 0x8080 2 0x0080 3 0x8000 0x8080"
 DEFCSID		"ISO646-US"		0
-DEFCSID		"JISX0208:EUC"		0x8080
+DEFCSID		"JISX0208:1990"		0x8080
 DEFCSID		"JISX0201-KANA"		0x0080
 DEFCSID		"JISX0212"		0x8000
 INVALID		0xA2AE	# GETA
diff --git a/share/i18n/esdb/UTF/UTF.alias b/share/i18n/esdb/UTF/UTF.alias
index 5bfafe91503..f4d44129c2b 100644
--- a/share/i18n/esdb/UTF/UTF.alias
+++ b/share/i18n/esdb/UTF/UTF.alias
@@ -28,6 +28,7 @@
 16LE		utf16le
 
 32-INTERNAL	ucs-4-internal
+32-INTERNAL	wchar_t
 
 32-SWAPPED	ucs-4-swapped
 
diff --git a/share/keys/Makefile b/share/keys/Makefile
new file mode 100644
index 00000000000..d685b064ccd
--- /dev/null
+++ b/share/keys/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR= pkg
+
+.include <bsd.subdir.mk>
diff --git a/share/keys/pkg/Makefile b/share/keys/pkg/Makefile
new file mode 100644
index 00000000000..1d83caf9bfe
--- /dev/null
+++ b/share/keys/pkg/Makefile
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=	trusted
+
+.include <bsd.subdir.mk>
diff --git a/share/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile
new file mode 100644
index 00000000000..ee0d4c9224c
--- /dev/null
+++ b/share/keys/pkg/trusted/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILES=	pkg.freebsd.org.2013102301
+
+FILESDIR=	/usr/share/keys/pkg/trusted
+FILESMODE=	644
+
+.include <bsd.prog.mk>
diff --git a/share/keys/pkg/trusted/pkg.freebsd.org.2013102301 b/share/keys/pkg/trusted/pkg.freebsd.org.2013102301
new file mode 100644
index 00000000000..587f5dd87b3
--- /dev/null
+++ b/share/keys/pkg/trusted/pkg.freebsd.org.2013102301
@@ -0,0 +1,5 @@
+# $FreeBSD$
+# This key is for testing purposes only and will be revoked before 10.0-RELEASE
+
+function: "sha256"
+fingerprint: "b0170035af3acc5f3f3ae1859dc717101b4e6c1d0a794ad554928ca0cbb2f438"
diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile
index 23bc1d8aeb5..97885a6a8b8 100644
--- a/share/man/man1/Makefile
+++ b/share/man/man1/Makefile
@@ -5,7 +5,7 @@
 
 MAN=	builtin.1 intro.1
 
-.if ${MK_ATF} != "no"
+.if ${MK_TESTS} != "no"
 ATF=	${.CURDIR}/../../../contrib/atf
 .PATH:	${ATF}/doc
 MAN+=	atf-test-program.1
diff --git a/share/man/man3/tree.3 b/share/man/man3/tree.3
index 351e935418c..2e9c63cf751 100644
--- a/share/man/man3/tree.3
+++ b/share/man/man3/tree.3
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 27, 2007
+.Dd November 10, 2013
 .Dt TREE 3
 .Os
 .Sh NAME
@@ -70,7 +70,11 @@
 .Nm RB_RIGHT ,
 .Nm RB_PARENT ,
 .Nm RB_FOREACH ,
+.Nm RB_FOREACH_FROM ,
+.Nm RB_FOREACH_SAFE ,
 .Nm RB_FOREACH_REVERSE ,
+.Nm RB_FOREACH_REVERSE_FROM ,
+.Nm RB_FOREACH_REVERSE_SAFE ,
 .Nm RB_INIT ,
 .Nm RB_INSERT ,
 .Nm RB_REMOVE
@@ -135,7 +139,11 @@
 .Ft "struct TYPE *"
 .Fn RB_PARENT "struct TYPE *elm" "RB_ENTRY NAME"
 .Fn RB_FOREACH VARNAME NAME "RB_HEAD *head"
+.Fn RB_FOREACH_FROM "VARNAME" "NAME" "POS_VARNAME"
+.Fn RB_FOREACH_SAFE "VARNAME" "NAME" "RB_HEAD *head" "TEMP_VARNAME"
 .Fn RB_FOREACH_REVERSE VARNAME NAME "RB_HEAD *head"
+.Fn RB_FOREACH_REVERSE_FROM "VARNAME" "NAME" "POS_VARNAME"
+.Fn RB_FOREACH_REVERSE_SAFE "VARNAME" "NAME" "RB_HEAD *head" "TEMP_VARNAME"
 .Ft void
 .Fn RB_INIT "RB_HEAD *head"
 .Ft "struct TYPE *"
@@ -454,6 +462,29 @@ macro:
 .Fn RB_FOREACH np NAME head
 .Ed
 .Pp
+The macros
+.Fn RB_FOREACH_SAFE
+and
+.Fn RB_FOREACH_REVERSE_SAFE
+traverse the tree referenced by head
+in a forward or reverse direction respectively,
+assigning each element in turn to np.
+However, unlike their unsafe counterparts,
+they permit both the removal of np
+as well as freeing it from within the loop safely
+without interfering with the traversal.
+.Pp
+Both
+.Fn RB_FOREACH_FROM
+and
+.Fn RB_FOREACH_REVERSE_FROM
+may be used to continue an interrupted traversal
+in a forward or reverse direction respectively.
+The head pointer is not required.
+The pointer to the node from where to resume the traversal
+should be passed as their last argument,
+and will be overwritten to provide safe traversal.
+.Pp
 The
 .Fn RB_EMPTY
 macro should be used to check whether a red-black tree is empty.
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index e2217954679..98bf247c08d 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -35,6 +35,7 @@ MAN=	aac.4 \
 	alc.4 \
 	ale.4 \
 	alpm.4 \
+	altera_atse.4 \
 	altera_avgen.4 \
 	altera_jtag_uart.4 \
 	altera_sdcard.4 \
@@ -66,6 +67,7 @@ MAN=	aac.4 \
 	auditpipe.4 \
 	aue.4 \
 	axe.4 \
+	axge.4 \
 	bce.4 \
 	bfe.4 \
 	bge.4 \
@@ -155,6 +157,8 @@ MAN=	aac.4 \
 	gif.4 \
 	gpib.4 \
 	gpio.4 \
+	gpioiic.4 \
+	gpioled.4 \
 	gre.4 \
 	h_ertt.4 \
 	hatm.4 \
@@ -195,7 +199,6 @@ MAN=	aac.4 \
 	ipwfw.4 \
 	isci.4 \
 	iscsi_initiator.4 \
-	isf.4 \
 	isp.4 \
 	ispfw.4 \
 	iwi.4 \
@@ -295,7 +298,6 @@ MAN=	aac.4 \
 	ng_etf.4 \
 	ng_ether.4 \
 	ng_ether_echo.4 \
-	ng_fec.4 \
 	ng_frame_relay.4 \
 	ng_gif.4 \
 	ng_gif_demux.4 \
@@ -383,6 +385,7 @@ MAN=	aac.4 \
 	rc.4 \
 	re.4 \
 	rgephy.4 \
+	rights.4 \
 	rl.4 \
 	rndtest.4 \
 	route.4 \
@@ -524,6 +527,7 @@ MAN=	aac.4 \
 	urio.4 \
 	${_urtw.4} \
 	urtwn.4 \
+	urtwnfw.4 \
 	usb.4 \
 	usb_quirk.4 \
 	uslcom.4 \
@@ -574,6 +578,7 @@ MLINKS+=age.4 if_age.4
 MLINKS+=agp.4 agpgart.4
 MLINKS+=alc.4 if_alc.4
 MLINKS+=ale.4 if_ale.4
+MLINKS+=altera_atse.4 atse.4
 MLINKS+=altera_sdcard.4 altera_sdcardc.4
 MLINKS+=altq.4 ALTQ.4
 MLINKS+=ath.4 if_ath.4
@@ -827,7 +832,7 @@ _nvram2env.4=	nvram2env.4
 SUBDIR=	man4.${MACHINE_CPUARCH}
 .endif
 
-.if ${MK_ATF} != "no"
+.if ${MK_TESTS} != "no"
 ATF=            ${.CURDIR}/../../../contrib/atf
 .PATH:          ${ATF}/doc
 _atf_test_case.4=	atf-test-case.4
diff --git a/share/man/man4/ahci.4 b/share/man/man4/ahci.4
index 23c457419a9..1019e6dc270 100644
--- a/share/man/man4/ahci.4
+++ b/share/man/man4/ahci.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2009-2012 Alexander Motin <mav@FreeBSD.org>
+.\" Copyright (c) 2009-2013 Alexander Motin <mav@FreeBSD.org>
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 25, 2012
+.Dd October 22, 2013
 .Dt AHCI 4
 .Os
 .Sh NAME
@@ -57,9 +57,9 @@ controls Message Signaled Interrupts (MSI) usage by the specified controller.
 .It 0
 MSI disabled;
 .It 1
-single MSI vector used, if supported (default);
+single MSI vector used, if supported;
 .It 2
-multiple MSI vectors used, if supported;
+multiple MSI vectors used, if supported (default);
 .El
 .It Va hint.ahci. Ns Ar X Ns Va .ccc
 controls Command Completion Coalescing (CCC) usage by the specified controller.
@@ -68,6 +68,11 @@ for interrupt, if there are some more requests present on controller queue.
 CCC reduces number of context switches on systems with many parallel requests,
 but it can decrease disk performance on some workloads due to additional
 command latency.
+.It Va hint.ahci. Ns Ar X Ns Va .direct
+controls whether the driver should use direct command completion from
+interrupt thread(s), or queue them to CAM completion threads.
+Default value depends on number of MSI interrupts supported and number of
+implemented SATA ports.
 .It Va hint.ahcich. Ns Ar X Ns Va .pm_level
 controls SATA interface Power Management for the specified channel,
 allowing some power to be saved at the cost of additional command
diff --git a/usr.sbin/isfctl/isfctl.8 b/share/man/man4/altera_atse.4
similarity index 56%
rename from usr.sbin/isfctl/isfctl.8
rename to share/man/man4/altera_atse.4
index 06b2f3a1a25..d3d96ffe1e1 100644
--- a/usr.sbin/isfctl/isfctl.8
+++ b/share/man/man4/altera_atse.4
@@ -1,5 +1,5 @@
 .\"-
-.\" Copyright (c) 2012 SRI International
+.\" Copyright (c) 2013 SRI International
 .\" All rights reserved.
 .\"
 .\" This software was developed by SRI International and the University of
@@ -29,61 +29,72 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 3, 2012
-.Dt ISFCTL 8
+.Dd October 18, 2013
+.Dt ALTERA_ATSE 4
 .Os
 .Sh NAME
-.Nm isfctl
-.Nd Intel StrataFlash device control program
+.Nm atse
+.Nd driver for the Altera Triple-Speed Ethernet MegaCore
 .Sh SYNOPSIS
-.Nm
-.Ar device
-.Ic erase
-.Ar offset
-.Ar size
+.Cd "device atse"
+.Cd "options ATSE_CFI_HACK"
+.Pp
+In
+.Pa /boot/device.hints :
+.Cd hint.atse.0.at="nexus0"
+.Cd hint.atse.0.maddr=0x7f007000
+.Cd hint.atse.0.msize=0x540
+.Cd hint.atse.0.rc_irq=1
+.Cd hint.atse.0.rx_maddr=0x7f007500
+.Cd hint.atse.0.rx_msize=0x8
+.Cd hint.atse.0.rxc_maddr=0x7f007520
+.Cd hint.atse.0.rxc_msize=0x20
+.Cd hint.atse.0.tx_irq=2
+.Cd hint.atse.0.tx_maddr=0x7f007400
+.Cd hint.atse.0.tx_msize=0x8
+.Cd hint.atse.0.txc_maddr=0x7f007420
+.Cd hint.atse.0.txc_msize=0x20
+.Cd hint.e1000phy.0.at="miibus0"
+.Cd hint.e1000phy.0.phyno=0
 .Sh DESCRIPTION
 The
 .Nm
-utility provides a way for administrators to control aspects of
-.Xr isf 4
-devices that can not be managed though the
-.Xr disk 9
-interface.
-.Pp
-The
+device driver provides support for the Altera Triple-Speed Ethernet
+MegaCore.
+.Sh HARDWARE
+The current version of the
 .Nm
-utility takes a device name as its first argument followed by a command.
-Currently supported commands are:
-.Bl -tag -width erase
-.It Ic erase
-Erase blocks beginning at
-.Ar offset
-covering a total of
-.Ar size
-bytes.
-The
-.Ar offset
-argument must be a multiple of 128K.
-The
-.Ar size
-argument must either be a multiple of 128K or a number less than 32K in
-which case it is treated as a number of 128K blocks to erase.
-.El
-.Sh EXAMPLES
-.Dl isfctl isf0 erase 0 0x20000
-.Pp
-Erase the first block of the isf0 device.
+driver supports the Ethernet MegaCore as described in version 11.1 of
+Altera's documentation when the device is configured with internal FIFOs.
 .Sh SEE ALSO
-.Xr isf 4
+.Xr miibus 4 ,
+.Xr netintro 4 ,
+.Xr ifconfig 8
+.Rs
+.%T Triple-Speed Ethernet MegaCore Function User Guide
+.%D November 2011
+.%I Altera Corporation
+.Re
 .Sh HISTORY
 The
 .Nm
-utility first appeared in
+device driver first appeared in
 .Fx 10.0 .
 .Sh AUTHORS
-This software and this manual page were
+The
+.Nm
+device driver and this manual page were
 developed by SRI International and the University of Cambridge Computer
 Laboratory under DARPA/AFRL contract
 .Pq FA8750-10-C-0237
 .Pq Do CTSRD Dc ,
 as part of the DARPA CRASH research programme.
+This device driver was written by
+.An Bjoern A. Zeeb .
+.Sh BUGS
+The
+.Nm
+driver only supports a single configuration of the MegaCore as installed
+on the Terasic Technologies Altera DE4 Development and Education Board.
+.Pp
+Only gigabit Ethernet speeds are currently supported.
diff --git a/share/man/man4/altera_avgen.4 b/share/man/man4/altera_avgen.4
index fee8f54fd81..2ba9360b7fc 100644
--- a/share/man/man4/altera_avgen.4
+++ b/share/man/man4/altera_avgen.4
@@ -56,11 +56,11 @@ entries configure the address, size, I/O disposition, and
 .Pa /dev
 device node name that will be used.
 The
-.Xr open ,
-.Xr read ,
-.Xr write ,
+.Xr open 2 ,
+.Xr read 2 ,
+.Xr write 2 ,
 and
-.Xr mmap
+.Xr mmap 2
 system calls (and variations) may be used on
 .Nm
 device nodes, subject to constraints imposed using
diff --git a/share/man/man4/axge.4 b/share/man/man4/axge.4
new file mode 100644
index 00000000000..33f7db3188f
--- /dev/null
+++ b/share/man/man4/axge.4
@@ -0,0 +1,150 @@
+.\" Copyright (c) 1997, 1998, 1999, 2000-2003
+.\"     Bill Paul <wpaul@windriver.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.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by Bill Paul.
+.\" 4. 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 Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (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 November 22, 2013
+.Dt AXGE 4
+.Os
+.Sh NAME
+.Nm axge
+.Nd "ASIX Electronics AX88178A/AX88179 USB 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 xhci"
+.Cd "device ehci"
+.Cd "device uhci"
+.Cd "device ohci"
+.Cd "device usb"
+.Cd "device miibus"
+.Cd "device axge"
+.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
+if_axge_load="YES"
+.Ed
+.Sh DESCRIPTION
+The
+.Nm
+driver provides support for USB Gigabit Ethernet adapters based on the ASIX
+Electronics AX88179 USB 3.0 and AX88178A USB 2.0 chipsets.
+.Pp
+The AX88179 and AX88178A contain a 10/100/1000 Ethernet MAC with a GMII
+interface for interfacing with the Gigabit Ethernet PHY.
+.Pp
+These devices will operate with both USB 1.x and USB 2.0 controllers, and the
+AX88179 will operate with USB 3.0 controllers.
+Packets are received and transmitted over separate USB bulk transfer endpoints.
+.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 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 (AX88178 only).
+The
+.Xr ifconfig 8
+.Cm mediaopt
+option can also be used to select either
+.Cm full-duplex
+or
+.Cm half-duplex
+modes.
+.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
+For more information on configuring this device, see
+.Xr ifconfig 8 .
+.Sh SEE ALSO
+.Xr altq 4 ,
+.Xr arp 4 ,
+.Xr miibus 4 ,
+.Xr netintro 4 ,
+.Xr ng_ether 4 ,
+.Xr rgephy 4 ,
+.Xr vlan 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Fx 10.1 .
+.Sh AUTHORS
+The
+.Nm
+driver was written by
+.An Kevin Lo Aq kevlo@FreeBSD.org
+and
+.An Li-Wen Hsu Aq lwhsu@FreeBSD.org .
+This manual page was adapted by
+.An Mark Johnston Aq markj@FreeBSD.org
+from the
+.Xr axe 4
+manual page.
diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4
index 4095f5e6294..072f8e099f4 100644
--- a/share/man/man4/bpf.4
+++ b/share/man/man4/bpf.4
@@ -697,9 +697,11 @@ is used when the time stamp is set to
 .Dv BPF_T_MICROTIME_MONOTONIC_FAST ,
 or
 .Dv BPF_T_NONE
-for backward compatibility reasons.  Otherwise,
+for backward compatibility reasons.
+Otherwise,
 .Vt bpf_xhdr
-is used.  However,
+is used.
+However,
 .Vt bpf_hdr
 may be deprecated in the near future.
 Suitable precautions
@@ -962,19 +964,23 @@ subsystem
 .It Va net.bpf.optimize_writers: No 0
 Various programs use BPF to send (but not receive) raw packets
 (cdpd, lldpd, dhcpd, dhcp relays, etc. are good examples of such programs).
-They do not need incoming packets to be send to them. Turning this option on
+They do not need incoming packets to be send to them.
+Turning this option on
 makes new BPF users to be attached to write-only interface list until program
 explicitly specifies read filter via
-.Cm pcap_set_filter() .
+.Fn pcap_set_filter .
 This removes any performance degradation for high-speed interfaces.
 .It Va net.bpf.stats:
 Binary interface for retrieving general statistics.
 .It Va net.bpf.zerocopy_enable: No 0
-Permits zero-copy to be used with net BPF readers. Use with caution.
+Permits zero-copy to be used with net BPF readers.
+Use with caution.
 .It Va net.bpf.maxinsns: No 512
-Maximum number of instructions that BPF program can contain. Use
+Maximum number of instructions that BPF program can contain.
+Use
 .Xr tcpdump 1
--d option to determine approximate number of instruction for any filter.
+.Fl d
+option to determine approximate number of instruction for any filter.
 .It Va net.bpf.maxbufsize: No 524288
 Maximum buffer size to allocate for packets buffer.
 .It Va net.bpf.bufsize: No 4096
diff --git a/share/man/man4/capsicum.4 b/share/man/man4/capsicum.4
index b2a157d6f88..4a617b77654 100644
--- a/share/man/man4/capsicum.4
+++ b/share/man/man4/capsicum.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 17, 2013
+.Dd October 19, 2013
 .Dt CAPSICUM 4
 .Os
 .Sh NAME
@@ -35,7 +35,6 @@
 .Sh SYNOPSIS
 .Cd "options CAPABILITY_MODE"
 .Cd "options CAPABILITIES"
-.Cd "options PROCDESC"
 .Sh DESCRIPTION
 .Nm
 is a lightweight OS capability and sandbox framework implementing a hybrid
@@ -58,8 +57,8 @@ memory mappings or file descriptors, may be used.
 Once set, the flag is inherited by future children processes, and may not be
 cleared.
 .It capabilities
-File descriptors that wrap other file descriptors, masking operations that can
-be called on them; for example, a file descriptor returned by
+Limit operations that can be called on file descriptors.
+For example, a file descriptor returned by
 .Xr open 2
 may be refined using
 .Xr cap_rights_limit 2
@@ -69,6 +68,9 @@ and
 .Xr write 2
 can be called, but not
 .Xr fchmod 2 .
+The complete list of the capability rights can be found in the
+.Xr rights 4
+manual page.
 .El
 .Pp
 In some cases,
@@ -88,8 +90,9 @@ associated with file descriptors; described in greater detail in
 .El
 .Sh SEE ALSO
 .Xr cap_enter 2 ,
+.Xr cap_fcntls_limit 2 ,
 .Xr cap_getmode 2 ,
-.Xr cap_rights_get 2 ,
+.Xr cap_ioctls_limit 2 ,
 .Xr cap_rights_limit 2 ,
 .Xr fchmod 2 ,
 .Xr open 2 ,
@@ -100,6 +103,7 @@ associated with file descriptors; described in greater detail in
 .Xr read 2 ,
 .Xr shm_open 2 ,
 .Xr write 2 ,
+.Xr cap_rights_get 3 ,
 .Xr procdesc 4
 .Sh HISTORY
 .Nm
@@ -117,7 +121,8 @@ at the University of Cambridge, and
 .An "Ben Laurie" Aq benl@FreeBSD.org
 and
 .An "Kris Kennaway" Aq kris@FreeBSD.org
-at Google, Inc.
+at Google, Inc., and
+.An "Pawel Jakub Dawidek" Aq pawel@dawidek.net .
 .Sh BUGS
 .Nm
 is considered experimental in
diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4
index 452e1c2282c..01f5135f58e 100644
--- a/share/man/man4/ddb.4
+++ b/share/man/man4/ddb.4
@@ -251,19 +251,7 @@ The location is also displayed in hex at the beginning of each line.
 display as an instruction
 .It Cm I
 display as an instruction with possible alternate formats depending on the
-machine:
-.Bl -tag -width ".Tn powerpc" -compact
-.It Tn amd64
-No alternate format.
-.It Tn i386
-No alternate format.
-.It Tn ia64
-No alternate format.
-.It Tn powerpc
-No alternate format.
-.It Tn sparc64
-No alternate format.
-.El
+machine, but none of the supported architectures have an alternate format.
 .It Cm S
 display a symbol name for the pointer stored at the address
 .El
diff --git a/share/man/man4/gpio.4 b/share/man/man4/gpio.4
index 614a722c4d2..f0bd8a34b20 100644
--- a/share/man/man4/gpio.4
+++ b/share/man/man4/gpio.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 13, 2013
+.Dd November 5, 2013
 .Dt GPIO 4
 .Os
 .Sh NAME
@@ -34,10 +34,9 @@
 To compile these devices into your kernel and use the device hints, place the
 following lines in your kernel configuration file:
 .Bd -ragged -offset indent
-.Cd "device gpiobus"
-.Cd "device gpioiic"
 .Cd "device gpio"
 .Cd "device gpioc"
+.Cd "device gpioiic"
 .Cd "device gpioled"
 .Ed
 .Pp
@@ -76,8 +75,9 @@ architecure include:
 .Sh DESCRIPTION
 The
 .Em gpiobus
-system provides a simple interface to the bit banging style GPIO bus
-found on embedded architectures.
+system provides a simple interface to the GPIO pins that are usually
+available on embedded architectures and can provide bit banging style
+devices to the system.
 .Pp
 The acronym
 .Li GPIO
@@ -88,36 +88,20 @@ The BUS physically consists of multiple pins that can be configured
 for input/output, IRQ delivery, SDA/SCL
 .Em iicbus
 use, etc.
-On most embedded architechtures (mips/arm), discovery of the bus and
+.Pp
+On some embedded architechtures (like MIPS), discovery of the bus and
 configuration of the pins is done via
 .Xr device.hints 5
 in the platform's kernel
 .Xr config 5
 file.
 .Pp
-Assignment of
-.Xr gpioiic 4
-bus variables is done via:
-.Bl -tag -width ".Va hint.gpioiic.%d.atXXX"
-.It Va hint.gpioiic.%d.at
-Normally just gpiobus0.
-.It Va hint.gpioiic.%d.pins
-This is a bitmask of the pins on the gpio board that are to be used for
-SCLOCK and SDATA from the IIC bus.
-To configure pin 0 and 7, use the bitmask of
-10000001 and convert it to a hexadecimal value of 0x0081.
-Should only ever have two bits set in mask.
-.It Va hint.gpioiic.%d.scl
-Indicates which bit in the
-.Va hint.gpioiic.%d.pins
-should be used as the SCLOCK
-source.
-.It Va hint.gpioiic.%d.sda
-Indicates which bit in the
-.Va hint.gpioiic.%d.pins
-should be used as the SDATA
-source.
-.El
+On some others (like ARM), where
+.Xr FDT 4
+is used to describe the device tree, the bus discovery is done via the DTS
+passed to the kernel, being either statically compiled in, or by a variety
+of ways where the boot loader (or Open Firmware enabled system) passes the
+DTS blob to kernel at boot.
 .Pp
 The following are only provided by the
 .Cd ar71xx_gpio
@@ -141,28 +125,11 @@ This is mainly used to set/clear functions that we need when they are setup or
 not setup by uBoot.
 .El
 .Pp
-These values are configureable from the
-.Xr gpioled 4
-interface and help create
-.Xr led 4
-compatible devices in
-.Pa /dev/led/<name> .
-.Bl -tag -width ".Va hint.gpioiic.%d.atXXX"
-.It Va hint.gpioled.%d.at
-Normally assigned to gpiobus0.
-.It Va hint.gpioled.%d.name
-Arbitrary name of device in
-.Pa /dev/led/
-to create for
-.Xr led 4
-interfaces.
-.It Va hint.gpioled.%d.pins
-Which pin on the GPIO interface to map to this instance.
-.El
-.Pp
 Simply put, each pin of the GPIO interface is connected to an input/output
 of some device in a system.
 .Sh SEE ALSO
+.Xr gpioiic 4 ,
+.Xr gpioled 4 ,
 .Xr iicbus 4 ,
 .Xr gpioctl 8
 .Sh HISTORY
diff --git a/share/man/man4/gpioiic.4 b/share/man/man4/gpioiic.4
new file mode 100644
index 00000000000..cbcaec9ccc1
--- /dev/null
+++ b/share/man/man4/gpioiic.4
@@ -0,0 +1,96 @@
+.\" Copyright (c) 2013, Luiz Otavio O Souza <loos@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 November 5, 2013
+.Dt GPIOIIC 4
+.Os
+.Sh NAME
+.Nm gpioiic
+.Nd GPIO I2C bit-banging device driver
+.Sh SYNOPSIS
+.Cd "device gpio"
+.Cd "device gpioiic"
+.Cd "device iic"
+.Cd "device iicbb"
+.Cd "device iicbus"
+.Sh DESCRIPTION
+The
+.Em gpioiic
+driver provides an IIC bit-banging interface using two GPIO pins for the
+SCL and SDA on the
+.Em gpiobus .
+.Nm
+implements an open colector kind of output, as recommended by the standard,
+when driving the pins on the
+.Em gpiobus ,
+i.e, they are never switched to the logical value of '1',
+or they are '0' or simply open (Hi-Z/tri-state).
+So the pullup resistors are required so
+.Nm
+can work.
+.Pp
+On a hint based system, like
+.Li MIPS , these values are configureable for the
+.Nm gpioiic :
+.Bl -tag -width ".Va hint.gpioiic.%d.atXXX"
+.It Va hint.gpioiic.%d.at
+The gpiobus you are attaching to.
+Normally just gpiobus0.
+.It Va hint.gpioiic.%d.pins
+This is a bitmask of the pins on the
+.Em gpiobus
+that are to be used for SCLOCK and SDATA from the GPIO IIC
+bit-banging bus.
+To configure pin 0 and 7, use the bitmask of
+10000001 and convert it to a hexadecimal value of 0x0081.
+Please note that this mask should only ever have two bits set
+(any others bits - i.e., pins - will be ignored).
+.It Va hint.gpioiic.%d.scl
+Indicates which bit in the
+.Va hint.gpioiic.%d.pins
+should be used as the SCLOCK
+source.
+.It Va hint.gpioiic.%d.sda
+Indicates which bit in the
+.Va hint.gpioiic.%d.pins
+should be used as the SDATA
+source.
+.El
+.Sh SEE ALSO
+.Xr gpio 4 ,
+.Xr gpioled 4 ,
+.Xr iic 4 ,
+.Xr iicbb 4 ,
+.Xr iicbus 4
+.Sh HISTORY
+The
+.Nm
+manual page first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+This
+manual page was written by
+.An Luiz Otavio O Souza .
diff --git a/share/man/man4/gpioled.4 b/share/man/man4/gpioled.4
new file mode 100644
index 00000000000..76f59fa8824
--- /dev/null
+++ b/share/man/man4/gpioled.4
@@ -0,0 +1,83 @@
+.\" Copyright (c) 2013, Luiz Otavio O Souza <loos@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 November 5, 2013
+.Dt GPIOLED 4
+.Os
+.Sh NAME
+.Nm gpioled
+.Nd GPIO led generic device driver
+.Sh SYNOPSIS
+.Cd "device gpio"
+.Cd "device gpioled"
+.Pp
+This driver attaches a
+.Xr led 4
+device to a GPIO pin.
+.Sh DESCRIPTION
+The
+.Em gpioled
+driver provides a glue to attach a
+.Xr led 4
+compatible device to a GPIO pin.
+Each led on the system has a
+.Pa name
+which is used to export a device in
+.Pa /dev/led/<name> .
+The GPIO pin can then be controlled by writing to this device as described
+on
+.Xr led 4 .
+.Pp
+On a hint based system, like
+.Li MIPS , these values are configureable for
+.Nm :
+.Bl -tag -width ".Va hint.gpioiic.%d.atXXX"
+.It Va hint.gpioled.%d.at
+The gpiobus you are attaching to.
+Normally assigned to gpiobus0.
+.It Va hint.gpioled.%d.name
+Arbitrary name of device in
+.Pa /dev/led/
+to create for
+.Xr led 4 .
+.It Va hint.gpioled.%d.pins
+Which pin on the GPIO interface to map to this instance.
+Please note that this mask should only ever have one bit set
+(any others bits - i.e., pins - will be ignored).
+.El
+.Sh SEE ALSO
+.Xr gpio 4 ,
+.Xr led 4 ,
+.Xr gpioiic 4
+.Sh HISTORY
+The
+.Nm
+manual page first appeared in
+.Fx 11.0 .
+.Sh AUTHORS
+This
+manual page was written by
+.An Luiz Otavio O Souza .
diff --git a/share/man/man4/isf.4 b/share/man/man4/isf.4
deleted file mode 100644
index f8637203b47..00000000000
--- a/share/man/man4/isf.4
+++ /dev/null
@@ -1,135 +0,0 @@
-.\"-
-.\" Copyright (c) 2012 SRI International
-.\" 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$
-.\"
-.Dd August 3, 2012
-.Dt ISF 4
-.Os
-.Sh NAME
-.Nm isf
-.Nd driver for Intel StrataFlash NOR flash devices
-.Sh SYNOPSIS
-.Cd "device isf"
-.Pp
-In
-.Pa /boot/device.hints :
-.Cd hint.isf.0.at="nexus0"
-.Cd hint.isf.0.maddr=0x74000000
-.Cd hint.isf.0.msize=0x2000000
-.Sh DESCRIPTION
-The
-.Nm
-device driver provides support for Intel StrataFlash NOR flash devices.
-Devices are presented as
-.Xr disk 9
-devices and read access is supported along with limited write support.
-Erasing blocks is supported the
-.Dv ISF_ERASE
-ioctl.
-.Pp
-The erase block size of
-.Nm
-devices is 128K.
-NOR flash blocks contains all 1's after an erase cycle.
-Writes to
-.Nm
-devices are allowed to succeed if and only if they all bits in the write
-block (512-bytes) remain the same or transition from 1 to 0.
-.Sh HARDWARE
-The current version of the
-.Nm
-driver is known to support the 64MB part found on the Altera DE4 board.
-It attempts to support other StrataFlash parts documented in the
-datasheet, but those are untested.
-.Sh IOCTLS
-The
-.Nm device
-supports the
-.Xr ioctl 2
-command codes:
-.Bl -tag -width ISF_ERASE
-.It Dv ISF_ERASE
-Erase one or more blocks.
-.Dv ISF_ERASE is defined as follows:
-.Bd -literal
-	struct isf_range {
-		off_t	ir_off;
-		size_t	ir_size;
-	};
-
-	#define ISF_ERASE       _IOW('I', 1, struct isf_range)
-.Ed
-.Pp
-The
-.Li ir_off
-member marks the beginning of the area to be erased and must fall on at 128K
-boundary.
-The
-.Li ir_size
-member indicates the size of the area to be erased and must a multiple
-of 128K.
-.El
-.Sh SEE ALSO
-.Xr isfctl 4 ,
-.Xr disk 9
-.Rs
-.%T Intel StrataFlash Embedded Memory (P30)
-.%D November 1, 2005
-.%I Intel Corporation
-.%U http://www.xilinx.com/products/boards/ml505/datasheets/30666604.pdf
-.Re
-.Sh HISTORY
-The
-.Nm
-device driver first appeared in
-.Fx 10.0 .
-.Sh AUTHORS
-The
-.Nm
-device driver and this manual page were
-developed by SRI International and the University of Cambridge Computer
-Laboratory under DARPA/AFRL contract
-.Pq FA8750-10-C-0237
-.Pq Do CTSRD Dc ,
-as part of the DARPA CRASH research programme.
-.Sh BUGS
-While an erase is in progress, all read and write operations return
-.Er EBUSY .
-In principle, reads could be allowed outside the programming region the
-blocked currently being erased resides in and writes could be allowed by
-suspending the erase, but neither of these is currently implemented.
-.Pp
-Depending on the flash part ether the top or bottom 128K of the flash
-address space is divided into 4 32K erase blocks.
-The
-.Nm
-driver hides this from the user requiring that all erase requests be
-multiples of 128K in size and erasing the individual blocks as needed at
-the top or bottom.
diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4
index 006f7f69f3d..0e0ba41baa6 100644
--- a/share/man/man4/iwn.4
+++ b/share/man/man4/iwn.4
@@ -87,9 +87,18 @@ driver provides support for:
 .It Intel Centrino Advanced-N 6230
 .It Intel Centrino Advanced-N + WiMAX 6250
 .It Intel Centrino Ultimate-N 6300
+.It Intel Centrino Wireless-N 100
 .It Intel Centrino Wireless-N 130
 .It Intel Centrino Wireless-N 1000
 .It Intel Centrino Wireless-N 1030
+.It Intel Centrino Wireless-N 2200
+.It Intel Centrino Wireless-N 2230
+.It Intel Centrino Wireless-N 4965
+.It Intel Centrino Wireless-N 5100
+.It Intel Centrino Wireless-N 6150
+.It Intel Centrino Wireless-N 6200
+.It Intel Centrino Wireless-N 6250
+.It Intel Centrino Wireless-N 6250
 .It Intel Centrino Wireless-N + WiMAX 6150
 .It Intel Ultimate N WiFi Link 5300
 .It Intel Wireless WiFi Link 4965
diff --git a/share/man/man4/lagg.4 b/share/man/man4/lagg.4
index aec7b7eda46..bb2cfc6c016 100644
--- a/share/man/man4/lagg.4
+++ b/share/man/man4/lagg.4
@@ -175,7 +175,6 @@ device will be used:
 (Note the mac address of the wireless device is forced to match the wired
 device as a workaround.)
 .Sh SEE ALSO
-.Xr ng_fec 4 ,
 .Xr ng_one2many 4 ,
 .Xr sysctl 8 ,
 .Xr ifconfig 8
diff --git a/share/man/man4/natm.4 b/share/man/man4/natm.4
index a553f6ebd9e..ce9fe606d63 100644
--- a/share/man/man4/natm.4
+++ b/share/man/man4/natm.4
@@ -14,6 +14,7 @@ ATM software comes with a
 which provides socket level access to AAL0 and AAL5 virtual circuits.
 To enable this protocol layer, add
 .Dl options NATM
+.Dl device atm
 to your kernel configuration file and re-make the kernel (do not forget
 to do
 .Dq make clean ) .
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index 6783973eac5..2fafb6869a1 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -36,7 +36,7 @@
 .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $
 .\" $FreeBSD$
 .\"
-.Dd May 25, 2008
+.Dd November 25, 2013
 .Dt NETGRAPH 4
 .Os
 .Sh NAME
@@ -292,7 +292,7 @@ unless specifically declared to be a reader in their definition.
 (See
 .Dv NGM_READONLY
 in
-.In ng_message.h . )
+.In netgraph/ng_message.h . )
 .Pp
 While this mode of operation
 results in good performance, it has a few implications for node
@@ -840,26 +840,27 @@ and should be used as a starting point for new node writers.
 .Ss Netgraph Message Structure
 Control messages have the following structure:
 .Bd -literal
-#define NG_CMDSTRSIZ    32      /* Max command string (including nul) */
+#define NG_CMDSTRSIZ    32      /* Max command string (including null) */
 
 struct ng_mesg {
   struct ng_msghdr {
     u_char      version;        /* Must equal NG_VERSION */
-    u_char      spare;          /* Pad to 2 bytes */
-    u_short     arglen;         /* Length of cmd/resp data */
-    u_long      flags;          /* Message status flags */
-    u_long      token;          /* Reply should have the same token */
-    u_long      typecookie;     /* Node type understanding this message */
-    u_long      cmd;            /* Command identifier */
-    u_char      cmdstr[NG_CMDSTRSIZ]; /* Cmd string (for debug) */
+    u_char      spare;          /* Pad to 4 bytes */
+    uint16_t    spare2;
+    uint32_t    arglen;         /* Length of cmd/resp data */
+    uint32_t    cmd;            /* Command identifier */
+    uint32_t    flags;          /* Message status flags */
+    uint32_t    token;          /* Reply should have the same token */
+    uint32_t    typecookie;     /* Node type understanding this message */
+    u_char      cmdstr[NG_CMDSTRSIZ];  /* cmd string + \0 */
   } header;
-  char  data[0];                /* Start of cmd/resp data */
+  char  data[];                 /* placeholder for actual data */
 };
 
-#define NG_ABI_VERSION  5               /* Netgraph kernel ABI version */
-#define NG_VERSION      4               /* Netgraph message version */
-#define NGF_ORIG        0x0000          /* Command */
-#define NGF_RESP        0x0001          /* Response */
+#define NG_ABI_VERSION  12              /* Netgraph kernel ABI version */
+#define NG_VERSION      8               /* Netgraph message version */
+#define NGF_ORIG        0x00000000      /* The msg is the original request */
+#define NGF_RESP        0x00000001      /* The message is a response */
 .Ed
 .Pp
 Control messages have the fixed header shown above, followed by a
@@ -1296,7 +1297,7 @@ Used in conjunction with
 either
 .Xr ppp 8
 or the
-.Pa net/mpd
+.Pa net/mpd5
 port.
 .It BRIDGE
 This node, together with the Ethernet nodes, allows a very flexible
@@ -1430,7 +1431,6 @@ common networking problems, solved using
 .Xr ng_eiface 4 ,
 .Xr ng_etf 4 ,
 .Xr ng_ether 4 ,
-.Xr ng_fec 4 ,
 .Xr ng_frame_relay 4 ,
 .Xr ng_gif 4 ,
 .Xr ng_gif_demux 4 ,
diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4
index 3b72417e2f3..7975572b1e8 100644
--- a/share/man/man4/netmap.4
+++ b/share/man/man4/netmap.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2011 Matteo Landi, Luigi Rizzo, Universita` di Pisa
+.\" Copyright (c) 2011-2013 Matteo Landi, Luigi Rizzo, Universita` di Pisa
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -21,14 +21,13 @@
 .\" LIABILITY, OR TORT (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 document is derived in part from the enet man page (enet.4)
 .\" distributed with 4.3BSD Unix.
 .\"
 .\" $FreeBSD$
-.\" $Id: netmap.4 11563 2012-08-02 08:59:12Z luigi $: stable/8/share/man/man4/bpf.4 181694 2008-08-13 17:45:06Z ed $
 .\"
-.Dd September 23, 2013
+.Dd October 18, 2013
 .Dt NETMAP 4
 .Os
 .Sh NAME
@@ -38,101 +37,227 @@
 .Cd device netmap
 .Sh DESCRIPTION
 .Nm
-is a framework for fast and safe access to network devices
-(reaching 14.88 Mpps at less than 1 GHz).
+is a framework for extremely fast and efficient packet I/O
+(reaching 14.88 Mpps with a single core at less than 1 GHz)
+for both userspace and kernel clients.
+Userspace clients can use the netmap API
+to send and receive raw packets through physical interfaces
+or ports of the
+.Xr VALE 4
+switch.
+.Pp
+.Nm VALE
+is a very fast (reaching 20 Mpps per port)
+and modular software switch,
+implemented within the kernel, which can interconnect
+virtual ports, physical devices, and the native host stack.
+.Pp
 .Nm
-uses memory mapped buffers and metadata
-(buffer indexes and lengths) to communicate with the kernel,
-which is in charge of validating information through
-.Pa ioctl()
-and
-.Pa select()/poll().
+uses a memory mapped region to share packet buffers,
+descriptors and queues with the kernel.
+Simple
+.Pa ioctl()s
+are used to bind interfaces/ports to file descriptors and
+implement non-blocking I/O, whereas blocking I/O uses
+.Pa select()/poll() .
 .Nm
 can exploit the parallelism in multiqueue devices and
 multicore systems.
 .Pp
+For the best performance,
 .Nm
-requires explicit support in device drivers.
-For a list of supported devices, see the end of this manual page.
-.Sh OPERATION
+requires explicit support in device drivers;
+a generic emulation layer is available to implement the
 .Nm
-clients must first open the
+API on top of unmodified device drivers,
+at the price of reduced performance
+(but still better than what can be achieved with
+sockets or BPF/pcap).
+.Pp
+For a list of devices with native
+.Nm
+support, see the end of this manual page.
+.Sh OPERATION - THE NETMAP API
+.Nm
+clients must first
 .Pa open("/dev/netmap") ,
 and then issue an
-.Pa ioctl(...,NIOCREGIF,...)
-to bind the file descriptor to a network device.
-.Pp
-When a device is put in
+.Pa ioctl(fd, NIOCREGIF, (struct nmreq *)arg)
+to bind the file descriptor to a specific interface or port.
 .Nm
-mode, its data path is disconnected from the host stack.
-The processes owning the file descriptor
-can exchange packets with the device, or with the host stack,
-through an mmapped memory region that contains pre-allocated
-buffers and metadata.
+has multiple modes of operation controlled by the
+content of the
+.Pa struct nmreq
+passed to the
+.Pa ioctl() .
+In particular, the
+.Em nr_name
+field specifies whether the client operates on a physical network
+interface or on a port of a
+.Nm VALE
+switch, as indicated below. Additional fields in the
+.Pa struct nmreq
+control the details of operation.
+.Bl -tag -width XXXX
+.It Dv Interface name (e.g. 'em0', 'eth1', ... )
+The data path of the interface is disconnected from the host stack.
+Depending on additional arguments,
+the file descriptor is bound to the NIC (one or all queues),
+or to the host stack.
+.It Dv valeXXX:YYY (arbitrary XXX and YYY)
+The file descriptor is bound to port YYY of a VALE switch called XXX,
+where XXX and YYY are arbitrary alphanumeric strings.
+The string cannot exceed IFNAMSIZ characters, and YYY cannot
+matching the name of any existing interface.
 .Pp
+The switch and the port are created if not existing.
+.It Dv valeXXX:ifname (ifname is an existing interface)
+Flags in the argument control whether the physical interface
+(and optionally the corrisponding host stack endpoint)
+are connected or disconnected from the VALE switch named XXX.
+.Pp
+In this case the
+.Pa ioctl()
+is used only for configuring the VALE switch, typically through the
+.Nm vale-ctl
+command.
+The file descriptor cannot be used for I/O, and should be
+.Pa close()d
+after issuing the
+.Pa ioctl().
+.El
+.Pp
+The binding can be removed (and the interface returns to
+regular operation, or the virtual port destroyed) with a
+.Pa close()
+on the file descriptor.
+.Pp
+The processes owning the file descriptor can then
+.Pa mmap()
+the memory region that contains pre-allocated
+buffers, descriptors and queues, and use them to
+read/write raw packets.
 Non blocking I/O is done with special
 .Pa ioctl()'s ,
 whereas the file descriptor can be passed to
 .Pa select()/poll()
 to be notified about incoming packet or available transmit buffers.
-.Ss Data structures
-All data structures for all devices in
+.Ss DATA STRUCTURES
+The data structures in the mmapped memory are described below
+(see
+.Xr sys/net/netmap.h
+for reference).
+All physical devices operating in
 .Nm
-mode are in a memory
-region shared by the kernel and all processes
-who open
+mode use the same memory region,
+shared by the kernel and all processes who own
 .Pa /dev/netmap
+descriptors bound to those devices
 (NOTE: visibility may be restricted in future implementations).
+Virtual ports instead use separate memory regions,
+shared only with the kernel.
+.Pp
 All references between the shared data structure
 are relative (offsets or indexes). Some macros help converting
 them into actual pointers.
-.Pp
-The data structures in shared memory are the following:
 .Bl -tag -width XXX
 .It Dv struct netmap_if (one per interface)
 indicates the number of rings supported by an interface, their
 sizes, and the offsets of the
 .Pa netmap_rings
 associated to the interface.
-The offset of a
+.Pp
 .Pa struct netmap_if
-in the shared memory region is indicated by the
+is at offset
 .Pa nr_offset
+in the shared memory region is indicated by the
 field in the structure returned by the
 .Pa NIOCREGIF
 (see below).
 .Bd -literal
 struct netmap_if {
-    char ni_name[IFNAMSIZ]; /* name of the interface. */
-    const u_int ni_num_queues; /* number of hw ring pairs */
-    const ssize_t   ring_ofs[]; /* offset of tx and rx rings */
+    char          ni_name[IFNAMSIZ]; /* name of the interface.    */
+    const u_int   ni_version;        /* API version               */
+    const u_int   ni_rx_rings;       /* number of rx ring pairs   */
+    const u_int   ni_tx_rings;       /* if 0, same as ni_rx_rings */
+    const ssize_t ring_ofs[];        /* offset of tx and rx rings */
 };
 .Ed
 .It Dv struct netmap_ring (one per ring)
-contains the index of the current read or write slot (cur),
-the number of slots available for reception or transmission (avail),
+Contains the positions in the transmit and receive rings to
+synchronize the kernel and the application,
 and an array of
 .Pa slots
 describing the buffers.
-There is one ring pair for each of the N hardware ring pairs
-supported by the card (numbered 0..N-1), plus
-one ring pair (numbered N) for packets from/to the host stack.
+'reserved' is used in receive rings to tell the kernel the
+number of slots after 'cur' that are still in usr
+indicates how many slots starting from 'cur'
+the
+.Pp
+Each physical interface has one
+.Pa netmap_ring
+for each hardware transmit and receive ring,
+plus one extra transmit and one receive structure
+that connect to the host stack.
 .Bd -literal
 struct netmap_ring {
-    const ssize_t buf_ofs;
-    const uint32_t num_slots; /* number of slots in the ring. */
-    uint32_t avail;           /* number of usable slots */
-    uint32_t cur;             /* 'current' index for the user side */
-    uint32_t reserved;        /* not refilled before current */
+    const ssize_t  buf_ofs;   /* see details */
+    const uint32_t num_slots; /* number of slots in the ring */
+    uint32_t       avail;     /* number of usable slots      */
+    uint32_t       cur;       /* 'current' read/write index  */
+    uint32_t       reserved;  /* not refilled before current */
 
     const uint16_t nr_buf_size;
-    uint16_t flags;
-    struct netmap_slot slot[0]; /* array of slots. */
+    uint16_t       flags;
+#define NR_TIMESTAMP 0x0002   /* set timestamp on *sync()    */
+#define NR_FORWARD   0x0004   /* enable NS_FORWARD for ring  */
+#define NR_RX_TSTMP  0x0008   /* set rx timestamp in slots   */
+    struct timeval ts;
+    struct netmap_slot slot[0]; /* array of slots            */
 }
+.Ed
+.Pp
+In transmit rings, after a system call 'cur' indicates
+the first slot that can be used for transmissions,
+and 'avail' reports how many of them are available.
+Before the next netmap-related system call on the file
+descriptor, the application should fill buffers and
+slots with data, and update 'cur' and 'avail'
+accordingly, as shown in the figure below:
+.Bd -literal
+
+              cur
+               |----- avail ---|   (after syscall)
+               v
+     TX  [*****aaaaaaaaaaaaaaaaa**]
+     TX  [*****TTTTTaaaaaaaaaaaa**]
+                    ^
+                    |-- avail --|   (before syscall)
+                   cur
+.Ed
+In receive rings, after a system call 'cur' indicates
+the first slot that contains a valid packet,
+and 'avail' reports how many of them are available.
+Before the next netmap-related system call on the file
+descriptor, the application can process buffers and
+release them to the kernel updating
+'cur' and 'avail' accordingly, as shown in the figure below.
+Receive rings have an additional field called 'reserved'
+to indicate how many buffers before 'cur' are still
+under processing and cannot be released.
+.Bd -literal
+                 cur
+            |-res-|-- avail --|   (after syscall)
+                  v
+     RX  [**rrrrrrRRRRRRRRRRRR******]
+     RX  [**...........rrrrRRR******]
+                       |res|--|<avail (before syscall)
+                           ^
+                          cur
+
 .Ed
 .It Dv struct netmap_slot (one per packet)
-contains the metadata for a packet: a buffer index (buf_idx),
-a buffer length (len), and some flags.
+contains the metadata for a packet:
 .Bd -literal
 struct netmap_slot {
     uint32_t buf_idx; /* buffer index */
@@ -142,23 +267,92 @@ struct netmap_slot {
 #define NS_REPORT       0x0002  /* tell hw to report results
                                  * e.g. by generating an interrupt
                                  */
+#define NS_FORWARD      0x0004  /* pass packet to the other endpoint
+                                 * (host stack or device)
+                                 */
+#define NS_NO_LEARN     0x0008
+#define NS_INDIRECT     0x0010
+#define NS_MOREFRAG     0x0020
+#define NS_PORT_SHIFT   8
+#define NS_PORT_MASK    (0xff << NS_PORT_SHIFT)
+#define NS_RFRAGS(_slot)        ( ((_slot)->flags >> 8) & 0xff)
+    uint64_t ptr;   /* buffer address (indirect buffers) */
 };
 .Ed
+The flags control how the the buffer associated to the slot
+should be managed.
 .It Dv packet buffers
-are fixed size (approximately 2k) buffers allocated by the kernel
+are normally fixed size (2 Kbyte) buffers allocated by the kernel
 that contain packet data. Buffers addresses are computed through
 macros.
 .El
-.Pp
+.Bl -tag -width XXX
 Some macros support the access to objects in the shared memory
-region. In particular:
-.Bd -literal
-struct netmap_if *nifp;
-struct netmap_ring *txring = NETMAP_TXRING(nifp, i);
-struct netmap_ring *rxring = NETMAP_RXRING(nifp, i);
-int i = txring->slot[txring->cur].buf_idx;
-char *buf = NETMAP_BUF(txring, i);
-.Ed
+region. In particular,
+.It NETMAP_TXRING(nifp, i)
+.It NETMAP_RXRING(nifp, i)
+return the address of the i-th transmit and receive ring,
+respectively, whereas
+.It NETMAP_BUF(ring, buf_idx)
+returns the address of the buffer with index buf_idx
+(which can be part of any ring for the given interface).
+.El
+.Pp
+Normally, buffers are associated to slots when interfaces are bound,
+and one packet is fully contained in a single buffer.
+Clients can however modify the mapping using the
+following flags:
+.Ss FLAGS
+.Bl -tag -width XXX
+.It NS_BUF_CHANGED
+indicates that the buf_idx in the slot has changed.
+This can be useful if the client wants to implement
+some form of zero-copy forwarding (e.g. by passing buffers
+from an input interface to an output interface), or
+needs to process packets out of order.
+.Pp
+The flag MUST be used whenever the buffer index is changed.
+.It NS_REPORT
+indicates that we want to be woken up when this buffer
+has been transmitted. This reduces performance but insures
+a prompt notification when a buffer has been sent.
+Normally,
+.Nm
+notifies transmit completions in batches, hence signals
+can be delayed indefinitely. However, we need such notifications
+before closing a descriptor.
+.It NS_FORWARD
+When the device is open in 'transparent' mode,
+the client can mark slots in receive rings with this flag.
+For all marked slots, marked packets are forwarded to
+the other endpoint at the next system call, thus restoring
+(in a selective way) the connection between the NIC and the
+host stack.
+.It NS_NO_LEARN
+tells the forwarding code that the SRC MAC address for this
+packet should not be used in the learning bridge
+.It NS_INDIRECT
+indicates that the packet's payload is not in the netmap
+supplied buffer, but in a user-supplied buffer whose
+user virtual address is in the 'ptr' field of the slot.
+The size can reach 65535 bytes.
+.Em This is only supported on the transmit ring of virtual ports
+.It NS_MOREFRAG
+indicates that the packet continues with subsequent buffers;
+the last buffer in a packet must have the flag clear.
+The maximum length of a chain is 64 buffers.
+.Em This is only supported on virtual ports
+.It NS_RFRAGS(slot)
+on receive rings, returns the number of remaining buffers
+in a packet, including this one.
+Slots with a value greater than 1 also have NS_MOREFRAG set.
+The length refers to the individual buffer, there is no
+field for the total length.
+.Pp
+On transmit rings, if NS_DST is set, it is passed to the lookup
+function, which can use it e.g. as the index of the destination
+port instead of doing an address lookup.
+.El
 .Sh IOCTLS
 .Nm
 supports some ioctl() to synchronize the state of the rings
@@ -166,13 +360,13 @@ between the kernel and the user processes, plus some
 to query and configure the interface.
 The former do not require any argument, whereas the latter
 use a
-.Pa struct netmap_req
+.Pa struct nmreq
 defined as follows:
 .Bd -literal
 struct nmreq {
         char      nr_name[IFNAMSIZ];
         uint32_t  nr_version;     /* API version */
-#define NETMAP_API      3         /* current version */
+#define NETMAP_API      4         /* current version */
         uint32_t  nr_offset;      /* nifp offset in the shared region */
         uint32_t  nr_memsize;     /* size of the shared region */
         uint32_t  nr_tx_slots;    /* slots in tx rings */
@@ -184,8 +378,14 @@ struct nmreq {
 #define NETMAP_SW_RING  0x2000    /* we process the sw ring */
 #define NETMAP_NO_TX_POLL 0x1000  /* no gratuitous txsync on poll */
 #define NETMAP_RING_MASK 0xfff    /* the actual ring number */
-        uint16_t        spare1;
-        uint32_t        spare2[4];
+        uint16_t        nr_cmd;
+#define NETMAP_BDG_ATTACH       1       /* attach the NIC */
+#define NETMAP_BDG_DETACH       2       /* detach the NIC */
+#define NETMAP_BDG_LOOKUP_REG   3       /* register lookup function */
+#define NETMAP_BDG_LIST         4       /* get bridge's info */
+	uint16_t	nr_arg1;
+	uint16_t	nr_arg2;
+        uint32_t        spare2[3];
 };
 
 .Ed
@@ -200,15 +400,27 @@ command codes below are defined in
 and are:
 .Bl -tag -width XXXX
 .It Dv NIOCGINFO
-returns information about the interface named in nr_name.
-On return, nr_memsize indicates the size of the shared netmap
-memory region (this is device-independent),
-nr_tx_slots and nr_rx_slots indicates how many buffers are in a
-transmit and receive ring,
-nr_tx_rings and nr_rx_rings indicates the number of transmit
-and receive rings supported by the hardware.
+returns EINVAL if the named device does not support netmap.
+Otherwise, it returns 0 and (advisory) information
+about the interface.
+Note that all the information below can change before the
+interface is actually put in netmap mode.
 .Pp
-If the device does not support netmap, the ioctl returns EINVAL.
+.Pa nr_memsize
+indicates the size of the netmap
+memory region. Physical devices all share the same memory region,
+whereas VALE ports may have independent regions for each port.
+These sizes can be set through system-wise sysctl variables.
+.Pa nr_tx_slots, nr_rx_slots
+indicate the size of transmit and receive rings.
+.Pa nr_tx_rings, nr_rx_rings
+indicate the number of transmit
+and receive rings.
+Both ring number and sizes may be configured at runtime
+using interface-specific functions (e.g.
+.Pa sysctl
+or
+.Pa ethtool .
 .It Dv NIOCREGIF
 puts the interface named in nr_name into netmap mode, disconnecting
 it from the host stack, and/or defines which rings are controlled
@@ -243,8 +455,11 @@ or the send queue is full.
 .Pa NIOCREGIF
 can be used multiple times to change the association of a
 file descriptor to a ring pair, always within the same device.
-.It Dv NIOCUNREGIF
-brings an interface back to normal mode.
+.Pp
+When registering a virtual interface that is dynamically created to a
+.Xr vale 4
+switch, we can specify the desired number of rings (1 by default,
+and currently up to 16) on it using nr_tx_rings and nr_rx_rings fields.
 .It Dv NIOCTXSYNC
 tells the hardware of new packets to transmit, and updates the
 number of slots available for transmission.
@@ -255,10 +470,20 @@ packets.
 .Sh SYSTEM CALLS
 .Nm
 uses
-.Nm select
+.Xr select 2
 and
-.Nm poll
-to wake up processes when significant events occur.
+.Xr poll 2
+to wake up processes when significant events occur, and
+.Xr mmap 2
+to map memory.
+.Pp
+Applications may need to create threads and bind them to
+specific cores to improve performance, using standard
+OS primitives, see
+.Xr pthread 3 .
+In particular,
+.Xr pthread_setaffinity_np 3
+may be of use.
 .Sh EXAMPLES
 The following code implements a traffic generator
 .Pp
@@ -272,10 +497,10 @@ struct nmreq nmr;
 fd = open("/dev/netmap", O_RDWR);
 bzero(&nmr, sizeof(nmr));
 strcpy(nmr.nr_name, "ix0");
-nmr.nr_version = NETMAP_API;
-ioctl(fd, NIOCREG, &nmr);
+nmr.nm_version = NETMAP_API;
+ioctl(fd, NIOCREGIF, &nmr);
 p = mmap(0, nmr.nr_memsize, fd);
-nifp = NETMAP_IF(p, nmr.offset);
+nifp = NETMAP_IF(p, nmr.nr_offset);
 ring = NETMAP_TXRING(nifp, 0);
 fds.fd = fd;
 fds.events = POLLOUT;
@@ -312,13 +537,17 @@ Usenix ATC'12, June 2012, Boston
 .An -nosplit
 The
 .Nm
-framework has been designed and implemented at the
+framework has been originally designed and implemented at the
 Universita` di Pisa in 2011 by
 .An Luigi Rizzo ,
-with help from
+and further extended with help from
 .An Matteo Landi ,
 .An Gaetano Catalli ,
-.An Giuseppe Lettieri .
+.An Giuseppe Lettieri ,
+.An Vincenzo Maffione .
 .Pp
 .Nm
-has been funded by the European Commission within FP7 Project CHANGE (257422).
+and
+.Nm VALE
+have been funded by the European Commission within FP7 Projects
+CHANGE (257422) and OPENLAB (287581).
diff --git a/share/man/man4/ng_fec.4 b/share/man/man4/ng_fec.4
deleted file mode 100644
index f9759cbc020..00000000000
--- a/share/man/man4/ng_fec.4
+++ /dev/null
@@ -1,109 +0,0 @@
-.\" Copyright (c) 2004 Gleb Smirnoff
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this 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 July 22, 2004
-.Dt NG_FEC 4
-.Os
-.Sh NAME
-.Nm ng_fec
-.Nd netgraph Fast EtherChannel node
-.Sh SYNOPSIS
-.In netgraph/ng_fec.h
-.Sh DESCRIPTION
-The
-.Nm fec
-node implements Ethernet port trunking using the
-.Dq Cisco Fast EtherChannel
-protocol.
-Upon creation, a
-.Nm fec
-node creates a network interface associated with it.
-Interfaces are named
-.Dq Li fec0 ,
-.Dq Li fec1 ,
-etc.
-New nodes take the first available unit.
-.Sh HOOKS
-The
-.Nm fec
-node accepts any hooks.
-However it does not use them.
-Under normal operation, a
-.Nm fec
-node should not have any hooks.
-.Sh CONTROL MESSAGES
-Interface membership in the FEC group is configured with the following
-control messages:
-.Bl -tag -width foo
-.It Dv NGM_FEC_ADD_IFACE Pq Ic add_iface
-Attach interface to the FEC group.
-The target interface name is passed as a string argument.
-.It Dv NGM_FEC_DEL_IFACE Pq Ic del_iface
-Remove interface from the trunk.
-The target interface name is passed as a string argument.
-.El
-.Pp
-The following control messages define the forwarding method for a node:
-.Bl -tag -width foo
-.It Dv NGM_FEC_SET_MODE_MAC Pq Ic set_mode_mac
-Forwarding decisions will be based on the link-layer MAC address of the destination.
-.It Dv NGM_FEC_SET_MODE_INET Pq Ic set_mode_inet
-Forwarding decisions will be based on the IP address of the destination.
-.El
-.Sh SHUTDOWN
-This node shuts down upon receipt of a
-.Dv NGM_SHUTDOWN
-control message.
-.Sh EXAMPLES
-The following example script creates an
-.Nm fec
-node, attaches four Ethernet interfaces to it and
-sets the forwarding method to be IP-address based:
-.Bd -literal -offset indent
-/usr/sbin/ngctl -f- << SEQ
-	mkpeer fec dummy fec
-	msg fec0: add_iface "dc0"
-	msg fec0: add_iface "dc1"
-	msg fec0: add_iface "dc2"
-	msg fec0: add_iface "dc3"
-	msg fec0: set_mode_inet
-SEQ
-.Ed
-.Sh SEE ALSO
-.Xr netgraph 4
-.Sh HISTORY
-The
-.Nm fec
-node type was implemented in
-.Fx 5.0 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm fec
-node was written by
-.An "Bill Paul" Aq wpaul@FreeBSD.org .
-This manual page was written by
-.An "Gleb Smirnoff" Aq glebius@FreeBSD.org .
diff --git a/share/man/man4/pf.4 b/share/man/man4/pf.4
index f290a9b6d26..b7b504d45e1 100644
--- a/share/man/man4/pf.4
+++ b/share/man/man4/pf.4
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 18 2012
+.Dd November 14, 2013
 .Dt PF 4
 .Os
 .Sh NAME
@@ -1181,5 +1181,8 @@ packet filtering mechanism first appeared in
 and then
 .Fx 5.2 .
 .Pp
-This implementation matches
+This implementation is derived from
 .Ox 4.5 .
+It has been heavily modified to be capable of running in multithreaded
+.Fx
+kernel and scale its performance on multiple CPUs.
diff --git a/share/man/man4/procdesc.4 b/share/man/man4/procdesc.4
index 9bd310200c2..01464c0217b 100644
--- a/share/man/man4/procdesc.4
+++ b/share/man/man4/procdesc.4
@@ -35,8 +35,6 @@
 .Sh NAME
 .Nm procdesc
 .Nd process descriptor facility
-.Sh SYNOPSIS
-.Cd "options PROCDESC"
 .Sh DESCRIPTION
 .Nm
 is a file-descriptor-oriented interface to process signalling and control,
diff --git a/share/man/man4/random.4 b/share/man/man4/random.4
index 5e73bc0aa6b..a87a2ed7bbc 100644
--- a/share/man/man4/random.4
+++ b/share/man/man4/random.4
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2001	Mark R V Murray.  All rights reserved.
+.\" Copyright (c) 2001-2013	Mark R V Murray.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 7, 2013
+.Dd October 12, 2013
 .Dt RANDOM 4
 .Os
 .Sh NAME
@@ -43,35 +43,48 @@ The device will probe for
 certain hardware entropy sources,
 and use these in preference to the fallback,
 which is a generator implemented in software.
-If the kernel environment MIB's
-.Va hw.nehemiah_rng_enable
-or
-.Va hw.ivy_rng_enable
-are set to
-.Dq Li 0 ,
-the associated hardware entropy source will be ignored.
 .Pp
-If the device is using
-the software generator,
-writing data to
+The software generator will start in an
+.Em unseeded
+state, and will block reads until
+it is (re)seeded.
+This may cause trouble at system boot
+when keys and the like
+are generated from
+/dev/random
+so steps should be taken to ensure a
+reseed as soon as possible.
+The
+.Xr sysctl 8
+controlling the
+.Em seeded
+status (see below) may be used
+if security is not an issue
+or for convenience
+during setup or development.
+.Pp
+This initial seeding
+of random number generators
+is a bootstrapping problem
+that needs very careful attention.
+In some cases,
+it may be difficult
+to find enough randomness
+to seed a random number generator
+until a system is fully operational,
+but the system requires random numbers
+to become fully operational.
+It is (or more accurately should be)
+critically important that the
 .Nm
-would perturb the internal state.
-This perturbation of the internal state
-is the only userland method of introducing
-extra entropy into the device.
-If the writer has superuser privilege,
-then closing the device after writing
-will make the software generator reseed itself.
-This can be used for extra security,
-as it immediately introduces any/all new entropy
-into the PRNG.
-The hardware generators will generate
-sufficient quantities of entropy,
-and will therefore ignore user-supplied input.
-The software
-.Nm
-device may be controlled with
-.Xr sysctl 8 .
+device is seeded
+before the first time it is used.
+In the case where a dummy or "blocking-only"
+device is used,
+it is the responsibility
+of the system architect
+to ensure that no blocking reads
+hold up critical processes.
 .Pp
 To see the current settings of the software
 .Nm
@@ -81,22 +94,20 @@ device, use the command line:
 .Pp
 which results in something like:
 .Bd -literal -offset indent
-kern.random.adaptors: yarrow
+kern.random.adaptors: yarrow,dummy
+kern.random.active_adaptor: yarrow
+kern.random.yarrow.gengateinterval: 10
+kern.random.yarrow.bins: 10
+kern.random.yarrow.fastthresh: 96
+kern.random.yarrow.slowthresh: 128
+kern.random.yarrow.slowoverthresh: 2
 kern.random.sys.seeded: 1
 kern.random.sys.harvest.ethernet: 1
 kern.random.sys.harvest.point_to_point: 1
 kern.random.sys.harvest.interrupt: 1
-kern.random.sys.harvest.swi: 0
-kern.random.yarrow.gengateinterval: 10
-kern.random.yarrow.bins: 10
-kern.random.yarrow.fastthresh: 192
-kern.random.yarrow.slowthresh: 256
-kern.random.yarrow.slowoverthresh: 2
+kern.random.sys.harvest.swi: 1
 .Ed
 .Pp
-(These would not be seen if a
-hardware generator is present.)
-.Pp
 Other than
 .Dl kern.random.adaptors
 all settings are read/write.
@@ -107,9 +118,10 @@ variable indicates whether or not the
 .Nm
 device is in an acceptably secure state
 as a result of reseeding.
-If set to 0, the device will block (on read) until the next reseed
-(which can be from an explicit write,
-or as a result of entropy harvesting).
+If set to 0,
+the device will block (on read)
+until the next reseed
+as a result of entropy harvesting.
 A reseed will set the value to 1 (non-blocking).
 .Pp
 The
@@ -276,19 +288,6 @@ the generator produce independent sequences.
 However, the guessability or reproducibility of the sequence is unimportant,
 unlike the previous cases.
 .Pp
-One final consideration for the seeding of random number generators
-is a bootstrapping problem.
-In some cases, it may be difficult to find enough randomness to
-seed a random number generator until a system is fully operational,
-but the system requires random numbers to become fully operational.
-There is no substitute for careful thought here,
-but the
-.Fx
-.Nm
-device,
-which is based on the Yarrow system,
-should be of some help in this area.
-.Pp
 .Fx
 does also provide the traditional
 .Xr rand 3
@@ -325,17 +324,7 @@ and is an implementation of the
 .Em Yarrow
 algorithm by Bruce Schneier,
 .Em et al .
-The only hardware implementations
-currently are for the
-.Tn VIA C3 Nehemiah
-(stepping 3 or greater)
-CPU
-and the
-.Tn Intel
-.Dq Bull Mountain
-.Em RdRand
-instruction and underlying random number generator (RNG).
-More will be added in the future.
+Significant infrastructure work was done by Arthur Mesh.
 .Pp
 The author gratefully acknowledges
 significant assistance from VIA Technologies, Inc.
diff --git a/share/man/man4/rights.4 b/share/man/man4/rights.4
new file mode 100644
index 00000000000..239c9a68ce9
--- /dev/null
+++ b/share/man/man4/rights.4
@@ -0,0 +1,673 @@
+.\"
+.\" Copyright (c) 2008-2010 Robert N. M. Watson
+.\" Copyright (c) 2012-2013 The FreeBSD Foundation
+.\" All rights reserved.
+.\"
+.\" This software was developed at the University of Cambridge Computer
+.\" Laboratory with support from a grant from Google, Inc.
+.\"
+.\" Portions of this documentation were written by Pawel Jakub Dawidek
+.\" 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$
+.\"
+.Dd September 23, 2013
+.Dt RIGHTS 4
+.Os
+.Sh NAME
+.Nm Capability rights
+.Nd Capsicum capability rights for file descriptors
+.Sh DESCRIPTION
+When a file descriptor is created by a function such as
+.Xr accept 2 ,
+.Xr accept4 2 ,
+.Xr fhopen 2 ,
+.Xr kqueue 2 ,
+.Xr mq_open 2 ,
+.Xr open 2 ,
+.Xr openat 2 ,
+.Xr pdfork 2 ,
+.Xr pipe 2 ,
+.Xr shm_open 2 ,
+.Xr socket 2
+or
+.Xr socketpair 2 ,
+it is assigned all capability rights.
+Those rights can be reduced (but never expanded) by using the
+.Xr cap_rights_limit 2 ,
+.Xr cap_fcntls_limit 2 and
+.Xr cap_ioctls_limit 2
+system calls.
+Once capability rights are reduced, operations on the file descriptor will be
+limited to those permitted by rights.
+.Pp
+The complete list of capability rights is provided below.
+The
+.Vt cap_rights_t
+type is used to store list of capability rights.
+The
+.Xr cap_rights_init 3
+family of functions should be used to manage the structure.
+.Sh RIGHTS
+The following rights may be specified in a rights mask:
+.Bl -tag -width CAP_EXTATTR_DELETE
+.It Dv CAP_ACCEPT
+Permit
+.Xr accept 2
+and
+.Xr accept4 2 .
+.It Dv CAP_ACL_CHECK
+Permit
+.Xr acl_valid_fd_np 3 .
+.It Dv CAP_ACL_DELETE
+Permit
+.Xr acl_delete_fd_np 3 .
+.It Dv CAP_ACL_GET
+Permit
+.Xr acl_get_fd 3
+and
+.Xr acl_get_fd_np 3 .
+.It Dv CAP_ACL_SET
+Permit
+.Xr acl_set_fd 3
+and
+.Xr acl_set_fd_np 3 .
+.It Dv CAP_BIND
+Permit
+.Xr bind 2 .
+Note that sockets can also become bound implicitly as a result of
+.Xr connect 2
+or
+.Xr send 2 ,
+and that socket options set with
+.Xr setsockopt 2
+may also affect binding behavior.
+.It Dv CAP_BINDAT
+Permit
+.Xr bindat 2 .
+This right has to be present on the directory descriptor.
+This right includes the
+.Dv CAP_LOOKUP
+right.
+.It Dv CAP_CHFLAGSAT
+An alias to
+.Dv CAP_FCHFLAGS
+and
+.Dv CAP_LOOKUP .
+.It Dv CAP_CONNECT
+Permit
+.Xr connect 2 ;
+also required for
+.Xr sendto 2
+with a non-NULL destination address.
+.It Dv CAP_CONNECTAT
+Permit
+.Xr connectat 2 .
+This right has to be present on the directory descriptor.
+This right includes the
+.Dv CAP_LOOKUP
+right.
+.It Dv CAP_CREATE
+Permit
+.Xr openat 2
+with the
+.Dv O_CREAT
+flag.
+.It Dv CAP_EVENT
+Permit
+.Xr select 2 ,
+.Xr poll 2 ,
+and
+.Xr kevent 2
+to be used in monitoring the file descriptor for events.
+.It Dv CAP_EXTATTR_DELETE
+Permit
+.Xr extattr_delete_fd 2 .
+.It Dv CAP_EXTATTR_GET
+Permit
+.Xr extattr_get_fd 2 .
+.It Dv CAP_EXTATTR_LIST
+Permit
+.Xr extattr_list_fd 2 .
+.It Dv CAP_EXTATTR_SET
+Permit
+.Xr extattr_set_fd 2 .
+.It Dv CAP_FCHDIR
+Permit
+.Xr fchdir 2 .
+.It Dv CAP_FCHFLAGS
+Permit
+.Xr fchflags 2
+and
+.Xr chflagsat 2
+if the
+.Dv CAP_LOOKUP
+right is also present.
+.It Dv CAP_FCHMOD
+Permit
+.Xr fchmod 2
+and
+.Xr fchmodat 2
+if the
+.Dv CAP_LOOKUP
+right is also present.
+.It Dv CAP_FCHMODAT
+An alias to
+.Dv CAP_FCHMOD
+and
+.Dv CAP_LOOKUP .
+.It Dv CAP_FCHOWN
+Permit
+.Xr fchown 2
+and
+.Xr fchownat 2
+if the
+.Dv CAP_LOOKUP
+right is also present.
+.It Dv CAP_FCHOWNAT
+An alias to
+.Dv CAP_FCHOWN
+and
+.Dv CAP_LOOKUP .
+.It Dv CAP_FCNTL
+Permit
+.Xr fcntl 2 .
+Note that only the
+.Dv F_GETFL ,
+.Dv F_SETFL ,
+.Dv F_GETOWN
+and
+.Dv F_SETOWN
+commands require this capability right.
+Also note that the list of permitted commands can be further limited with the
+.Xr cap_fcntls_limit 2
+system call.
+.It Dv CAP_FEXECVE
+Permit
+.Xr fexecve 2
+and
+.Xr openat 2
+with the
+.Dv O_EXEC
+flag;
+.Dv CAP_READ
+is also be required.
+.It Dv CAP_FLOCK
+Permit
+.Xr flock 2 ,
+.Xr fcntl 2
+(with
+.Dv F_GETLK ,
+.Dv F_SETLK ,
+.Dv F_SETLKW
+or
+.Dv F_SETLK_REMOTE
+flag) and
+.Xr openat 2
+(with
+.Dv O_EXLOCK
+or
+.Dv O_SHLOCK
+flag).
+.It Dv CAP_FPATHCONF
+Permit
+.Xr fpathconf 2 .
+.It Dv CAP_FSCK
+Permit UFS background-fsck operations on the descriptor.
+.It Dv CAP_FSTAT
+Permit
+.Xr fstat 2
+and
+.Xr fstatat 2
+if the
+.Dv CAP_LOOKUP
+right is also present.
+.It Dv CAP_FSTATAT
+An alias to
+.Dv CAP_FSTAT
+and
+.Dv CAP_LOOKUP .
+.It Dv CAP_FSTATFS
+Permit
+.Xr fstatfs 2 .
+.It Dv CAP_FSYNC
+Permit
+.Xr aio_fsync 2 ,
+.Xr fsync 2
+and
+.Xr openat 2
+with
+.Dv O_FSYNC
+or
+.Dv O_SYNC
+flag.
+.It Dv CAP_FTRUNCATE
+Permit
+.Xr ftruncate 2
+and
+.Xr openat 2
+with the
+.Dv O_TRUNC
+flag.
+.It Dv CAP_FUTIMES
+Permit
+.Xr futimes 2
+and
+.Xr futimesat 2
+if the
+.Dv CAP_LOOKUP
+right is also present.
+.It Dv CAP_FUTIMESAT
+An alias to
+.Dv CAP_FUTIMES
+and
+.Dv CAP_LOOKUP .
+.It Dv CAP_GETPEERNAME
+Permit
+.Xr getpeername 2 .
+.It Dv CAP_GETSOCKNAME
+Permit
+.Xr getsockname 2 .
+.It Dv CAP_GETSOCKOPT
+Permit
+.Xr getsockopt 2 .
+.It Dv CAP_IOCTL
+Permit
+.Xr ioctl 2 .
+Be aware that this system call has enormous scope, including potentially
+global scope for some objects.
+The list of permitted ioctl commands can be further limited with the
+.Xr cap_ioctls_limit 2
+system call.
+.It Dv CAP_KQUEUE
+An alias to
+.Dv CAP_KQUEUE_CHANGE
+and
+.Dv CAP_KQUEUE_EVENT .
+.It Dv CAP_KQUEUE_CHANGE
+Permit
+.Xr kevent 2
+on a
+.Xr kqueue 2
+descriptor that modifies list of monitored events (the
+.Fa changelist
+argument is non-NULL).
+.It Dv CAP_KQUEUE_EVENT
+Permit
+.Xr kevent 2
+on a
+.Xr kqueue 2
+descriptor that monitors events (the
+.Fa eventlist
+argument is non-NULL).
+.Dv CAP_EVENT
+is also required on file descriptors that will be monitored using
+.Xr kevent 2 .
+.It Dv CAP_LINKAT
+Permit
+.Xr linkat 2
+and
+.Xr renameat 2
+on the destination directory descriptor.
+This right includes the
+.Dv CAP_LOOKUP
+right.
+.It Dv CAP_LISTEN
+Permit
+.Xr listen 2 ;
+not much use (generally) without
+.Dv CAP_BIND .
+.It Dv CAP_LOOKUP
+Permit the file descriptor to be used as a starting directory for calls such as
+.Xr linkat 2 ,
+.Xr openat 2 ,
+and
+.Xr unlinkat 2 .
+.It Dv CAP_MAC_GET
+Permit
+.Xr mac_get_fd 3 .
+.It Dv CAP_MAC_SET
+Permit
+.Xr mac_set_fd 3 .
+.It Dv CAP_MKDIRAT
+Permit
+.Xr mkdirat 2 .
+This right includes the
+.Dv CAP_LOOKUP
+right.
+.It Dv CAP_MKFIFOAT
+Permit
+.Xr mkfifoat 2 .
+This right includes the
+.Dv CAP_LOOKUP
+right.
+.It Dv CAP_MKNODAT
+Permit
+.Xr mknodat 2 .
+This right includes the
+.Dv CAP_LOOKUP
+right.
+.It Dv CAP_MMAP
+Permit
+.Xr mmap 2
+with the
+.Dv PROT_NONE
+protection.
+.It Dv CAP_MMAP_R
+Permit
+.Xr mmap 2
+with the
+.Dv PROT_READ
+protection.
+This right includes the
+.Dv CAP_READ
+and
+.Dv CAP_SEEK
+rights.
+.It Dv CAP_MMAP_RW
+An alias to
+.Dv CAP_MMAP_R
+and
+.Dv CAP_MMAP_W .
+.It Dv CAP_MMAP_RWX
+An alias to
+.Dv CAP_MMAP_R ,
+.Dv CAP_MMAP_W
+and
+.Dv CAP_MMAP_X .
+.It Dv CAP_MMAP_RX
+An alias to
+.Dv CAP_MMAP_R
+and
+.Dv CAP_MMAP_X .
+.It Dv CAP_MMAP_W
+Permit
+.Xr mmap 2
+with the
+.Dv PROT_WRITE
+protection.
+This right includes the
+.Dv CAP_WRITE
+and
+.Dv CAP_SEEK
+rights.
+.It Dv CAP_MMAP_WX
+An alias to
+.Dv CAP_MMAP_W
+and
+.Dv CAP_MMAP_X .
+.It Dv CAP_MMAP_X
+Permit
+.Xr mmap 2
+with the
+.Dv PROT_EXEC
+protection.
+This right includes the
+.Dv CAP_SEEK
+right.
+.It Dv CAP_PDGETPID
+Permit
+.Xr pdgetpid 2 .
+.It Dv CAP_PDKILL
+Permit
+.Xr pdkill 2 .
+.It Dv CAP_PDWAIT
+Permit
+.Xr pdwait4 2 .
+.It Dv CAP_PEELOFF
+Permit
+.Xr sctp_peeloff 2 .
+.It Dv CAP_PREAD
+An alias to
+.Dv CAP_READ
+and
+.Dv CAP_SEEK .
+.It Dv CAP_PWRITE
+An alias to
+.Dv CAP_SEEK
+and
+.Dv CAP_WRITE .
+.It Dv CAP_READ
+Permit
+.Xr aio_read 2
+.Dv ( CAP_SEEK
+is also required),
+.Xr openat 2
+with the
+.Dv O_RDONLY flag,
+.Xr read 2 ,
+.Xr readv 2 ,
+.Xr recv 2 ,
+.Xr recvfrom 2 ,
+.Xr recvmsg 2 ,
+.Xr pread 2
+.Dv ( CAP_SEEK
+is also required),
+.Xr preadv 2
+.Dv ( CAP_SEEK
+is also required) and related system calls.
+.It Dv CAP_RECV
+An alias to
+.Dv CAP_READ .
+.It Dv CAP_RENAMEAT
+Permit
+.Xr renameat 2 .
+This right is required on the source directory descriptor.
+This right includes the
+.Dv CAP_LOOKUP
+right.
+.It Dv CAP_SEEK
+Permit operations that seek on the file descriptor, such as
+.Xr lseek 2 ,
+but also required for I/O system calls that can read or write at any position
+in the file, such as
+.Xr pread 2
+and
+.Xr pwrite 2 .
+.It Dv CAP_SEM_GETVALUE
+Permit
+.Xr sem_getvalue 3 .
+.It Dv CAP_SEM_POST
+Permit
+.Xr sem_post 3 .
+.It Dv CAP_SEM_WAIT
+Permit
+.Xr sem_wait 3
+and
+.Xr sem_trywait 3 .
+.It Dv CAP_SEND
+An alias to
+.Dv CAP_WRITE .
+.It Dv CAP_SETSOCKOPT
+Permit
+.Xr setsockopt 2 ;
+this controls various aspects of socket behavior and may affect binding,
+connecting, and other behaviors with global scope.
+.It Dv CAP_SHUTDOWN
+Permit explicit
+.Xr shutdown 2 ;
+closing the socket will also generally shut down any connections on it.
+.It Dv CAP_SYMLINKAT
+Permit
+.Xr symlinkat 2 .
+This right includes the
+.Dv CAP_LOOKUP
+right.
+.It Dv CAP_TTYHOOK
+Allow configuration of TTY hooks, such as
+.Xr snp 4 ,
+on the file descriptor.
+.It Dv CAP_UNLINKAT
+Permit
+.Xr unlinkat 2
+and
+.Xr renameat 2 .
+This right is only required for
+.Xr renameat 2
+on the destination directory descriptor if the destination object already
+exists and will be removed by the rename.
+This right includes the
+.Dv CAP_LOOKUP
+right.
+.It Dv CAP_WRITE
+Allow
+.Xr aio_write 2 ,
+.Xr openat 2
+with
+.Dv O_WRONLY
+and
+.Dv O_APPEND
+flags set,
+.Xr send 2 ,
+.Xr sendmsg 2 ,
+.Xr sendto 2 ,
+.Xr write 2 ,
+.Xr writev 2 ,
+.Xr pwrite 2 ,
+.Xr pwritev 2
+and related system calls.
+For
+.Xr sendto 2
+with a non-NULL connection address,
+.Dv CAP_CONNECT
+is also required.
+For
+.Xr openat 2
+with the
+.Dv O_WRONLY
+flag, but without the
+.Dv O_APPEND
+flag,
+.Dv CAP_SEEK
+is also required.
+For
+.Xr aio_write 2 ,
+.Xr pwrite 2
+and
+.Xr pwritev 2
+.Dv CAP_SEEK
+is also required.
+.El
+.Sh SEE ALSO
+.Xr accept 2 ,
+.Xr accept4 2 ,
+.Xr aio_fsync 2 ,
+.Xr aio_read 2 ,
+.Xr aio_write 2 ,
+.Xr bind 2 ,
+.Xr bindat 2 ,
+.Xr cap_enter 2 ,
+.Xr cap_fcntls_limit 2 ,
+.Xr cap_ioctls_limit 2 ,
+.Xr cap_rights_limit 2 ,
+.Xr chflagsat 2 ,
+.Xr connect 2 ,
+.Xr connectat 2 ,
+.Xr extattr_delete_fd 2 ,
+.Xr extattr_get_fd 2 ,
+.Xr extattr_list_fd 2 ,
+.Xr extattr_set_fd 2 ,
+.Xr fchflags 2 ,
+.Xr fchmod 2 ,
+.Xr fchmodat 2 ,
+.Xr fchown 2 ,
+.Xr fchownat 2 ,
+.Xr fcntl 2 ,
+.Xr fexecve 2 ,
+.Xr fhopen 2 ,
+.Xr flock 2 ,
+.Xr fpathconf 2 ,
+.Xr fstat 2 ,
+.Xr fstatat 2 ,
+.Xr fstatfs 2 ,
+.Xr fsync 2 ,
+.Xr ftruncate 2 ,
+.Xr futimes 2 ,
+.Xr getpeername 2 ,
+.Xr getsockname 2 ,
+.Xr getsockopt 2 ,
+.Xr ioctl 2 ,
+.Xr kevent 2 ,
+.Xr kqueue 2 ,
+.Xr linkat 2 ,
+.Xr listen 2 ,
+.Xr mmap 2 ,
+.Xr mq_open 2 ,
+.Xr open 2 ,
+.Xr openat 2 ,
+.Xr pdfork 2 ,
+.Xr pdgetpid 2 ,
+.Xr pdkill 2 ,
+.Xr pdwait4 2 ,
+.Xr pipe 2 ,
+.Xr poll 2 ,
+.Xr pread 2 ,
+.Xr preadv 2 ,
+.Xr pwrite 2 ,
+.Xr pwritev 2 ,
+.Xr read 2 ,
+.Xr readv 2 ,
+.Xr recv 2 ,
+.Xr recvfrom 2 ,
+.Xr recvmsg 2 ,
+.Xr renameat 2 ,
+.Xr sctp_peeloff 2 ,
+.Xr select 2 ,
+.Xr send 2 ,
+.Xr sendmsg 2 ,
+.Xr sendto 2 ,
+.Xr setsockopt 2 ,
+.Xr shm_open 2 ,
+.Xr shutdown 2 ,
+.Xr socket 2 ,
+.Xr socketpair 2 ,
+.Xr symlinkat 2 ,
+.Xr unlinkat 2 ,
+.Xr write 2 ,
+.Xr writev 2 ,
+.Xr acl_delete_fd_np 3 ,
+.Xr acl_get_fd 3 ,
+.Xr acl_get_fd_np 3 ,
+.Xr acl_set_fd 3 ,
+.Xr acl_set_fd_np 3 ,
+.Xr acl_valid_fd_np 3 ,
+.Xr mac_get_fd 3 ,
+.Xr mac_set_fd 3 ,
+.Xr sem_getvalue 3 ,
+.Xr sem_post 3 ,
+.Xr sem_trywait 3 ,
+.Xr sem_wait 3 ,
+.Xr capsicum 4 ,
+.Xr snp 4
+.Sh HISTORY
+Support for capabilities and capabilities mode was developed as part of the
+.Tn TrustedBSD
+Project.
+.Sh AUTHORS
+This manual page was created by
+.An Pawel Jakub Dawidek Aq pawel@dawidek.net
+under sponsorship from the FreeBSD Foundation based on the
+.Xr cap_new 2
+manual page by
+.An "Robert Watson" Aq rwatson@FreeBSD.org .
diff --git a/share/man/man4/rsu.4 b/share/man/man4/rsu.4
index fa9767a540a..5d5c56c3006 100644
--- a/share/man/man4/rsu.4
+++ b/share/man/man4/rsu.4
@@ -35,9 +35,9 @@ place the following lines in your kernel configuration file:
 .Pp
 Alternatively, to load the driver as a module at boot time,
 place the following line in
-.Xr loader.conf 5:
+.Xr loader.conf 5 :
 .Bd -literal -offset indent
-.Xr if_rsu_load="YES"
+if_rsu_load="YES"
 .Ed
 .Pp
 After you have read the license in /usr/share/doc/legal/realtek
diff --git a/share/man/man4/run.4 b/share/man/man4/run.4
index 06d9604fe97..1e2e91029b1 100644
--- a/share/man/man4/run.4
+++ b/share/man/man4/run.4
@@ -16,7 +16,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 9, 2012
+.Dd November 11, 2013
 .Dt RUN 4
 .Os
 .Sh NAME
@@ -52,7 +52,7 @@ runfw_load="YES"
 The
 .Nm
 driver supports USB 2.0 wireless adapters based on the Ralink RT2700U,
-RT2800U and RT3000U chipsets.
+RT2800U, RT3000U and RT3900E chipsets.
 .Pp
 The RT2700U chipset consists of two integrated chips, an RT2770 MAC/BBP and
 an RT2720 (1T2R) or RT2750 (dual-band 1T2R) radio transceiver.
@@ -64,6 +64,9 @@ The RT3000U is a single-chip solution based on an RT3070 MAC/BBP and
 an RT3020 (1T1R), RT3021 (1T2R) or RT3022 (2T2R) single-band radio
 transceiver.
 .Pp
+The RT3900E is a single-chip solution based on an RT5390 MAC/BBP and
+an RT5370 (1T1R) or RT5372 (2T2R) single-band radio transceiver.
+.Pp
 These are the modes the
 .Nm
 driver can operate in:
@@ -129,7 +132,8 @@ driver supports the following wireless adapters:
 .It Corega CG-WLUSB300AGN
 .It Corega CG-WLUSB300GNM
 .It D-Link DWA-130 rev B1
-.It D-Link DWA-140 rev B1, B2
+.It D-Link DWA-140 rev B1, B2, B3
+.It D-Link DWA-160 rev B2
 .It DrayTek Vigor N61
 .It Edimax EW-7711UAn
 .It Edimax EW-7711UTn
@@ -156,6 +160,8 @@ driver supports the following wireless adapters:
 .It SMC SMCWUSBS-N2
 .It Sweex LW303
 .It Sweex LW313
+.It TP-LINK TL-WDN3200
+.It TP-LINK TL-WN727N v3
 .It Unex DNUR-81
 .It Unex DNUR-82
 .It ZyXEL NWD210N
diff --git a/share/man/man4/runfw.4 b/share/man/man4/runfw.4
index 6bb86c74227..127a0443136 100644
--- a/share/man/man4/runfw.4
+++ b/share/man/man4/runfw.4
@@ -18,7 +18,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 12, 2011
+.Dd November 11, 2013
 .Dt RUNFW 4
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@ runfw_load="YES"
 .Ed
 .Sh DESCRIPTION
 This module provides firmware sets for the Ralink RT2700U,
-RT2800U and RT3000U chip based USB WiFi adapters.
+RT2800U, RT3000U and RT3900E chip based USB WiFi adapters.
 Please read Ralink's license, src/sys/contrib/dev/run/LICENSE.
 .Sh SEE ALSO
 .Xr run 4 ,
diff --git a/share/man/man4/tcp.4 b/share/man/man4/tcp.4
index aa2755eca00..1a445420ee7 100644
--- a/share/man/man4/tcp.4
+++ b/share/man/man4/tcp.4
@@ -38,7 +38,7 @@
 .\"     From: @(#)tcp.4	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd March 7, 2012
+.Dd November 8, 2013
 .Dt TCP 4
 .Os
 .Sh NAME
@@ -48,6 +48,7 @@
 .In sys/types.h
 .In sys/socket.h
 .In netinet/in.h
+.In netinet/tcp.h
 .Ft int
 .Fn socket AF_INET SOCK_STREAM 0
 .Sh DESCRIPTION
@@ -147,7 +148,7 @@ See
 .Xr mod_cc 4
 for details.
 .It Dv TCP_KEEPINIT
-This write-only
+This
 .Xr setsockopt 2
 option accepts a per-socket timeout argument of
 .Vt "u_int"
@@ -160,7 +161,7 @@ in the
 .Sx MIB Variables
 section further down.
 .It Dv TCP_KEEPIDLE
-This write-only
+This
 .Xr setsockopt 2
 option accepts an argument of
 .Vt "u_int"
@@ -176,7 +177,7 @@ in the
 .Sx MIB Variables
 section further down.
 .It Dv TCP_KEEPINTVL
-This write-only
+This
 .Xr setsockopt 2
 option accepts an argument of
 .Vt "u_int"
@@ -191,7 +192,7 @@ in the
 .Sx MIB Variables
 section further down.
 .It Dv TCP_KEEPCNT
-This write-only
+This
 .Xr setsockopt 2
 option accepts an argument of
 .Vt "u_int"
diff --git a/share/man/man4/u3g.4 b/share/man/man4/u3g.4
index db560441bed..d83f1575a31 100644
--- a/share/man/man4/u3g.4
+++ b/share/man/man4/u3g.4
@@ -18,7 +18,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 8, 2012
+.Dd November 26, 2013
 .Dt U3G 4
 .Os
 .Sh NAME
@@ -40,6 +40,9 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 u3g_load="YES"
 .Ed
+.Pp
+If neither of the above is done, the driver will automatically be loaded
+by devd(8) when the device is connected.
 .Sh DESCRIPTION
 The
 .Nm
@@ -98,6 +101,7 @@ and
 .Xr ucom 4 ,
 .Xr usb 4 ,
 .Xr usb_quirk 4 ,
+.Xr devd 8 ,
 .Xr usbconfig 8
 .Sh HISTORY
 The
@@ -117,3 +121,7 @@ driver was written by
 and
 .An Nick Hibma Aq n_hibma@FreeBSD.org .
 Hardware for testing was provided by AnyWi Technologies, Leiden, NL.
+.Sh BUGS
+The automatic mode switch from disk mode to modem mode does not work unless
+the driver is either built into the kernel or loaded before the device is
+connected.
diff --git a/share/man/man4/urtwn.4 b/share/man/man4/urtwn.4
index c6dfa29ed5a..8643092b42a 100644
--- a/share/man/man4/urtwn.4
+++ b/share/man/man4/urtwn.4
@@ -1,6 +1,3 @@
-.\" $OpenBSD: urtwn.4,v 1.20 2013/05/16 10:02:59 sthen Exp $
-.\" $FreeBSD$
-.\"
 .\" Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
 .\"
 .\" Permission to use, copy, modify, and distribute this software for any
@@ -15,7 +12,9 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd July 7, 2013
+.\" $FreeBSD$
+.\"
+.Dd October 31, 2013
 .Dt URTWN 4
 .Os
 .Sh NAME
@@ -40,6 +39,13 @@ module at boot time, place the following line in
 .Bd -literal -offset indent
 if_urtwn_load="YES"
 .Ed
+.Pp
+In both cases, place the following line in
+.Xr loader.conf 5
+to acknowledge the firmware license (see below):
+.Bd -literal -offset indent
+legal.realtek.license_ack=1
+.Ed
 .Sh DESCRIPTION
 The
 .Nm
@@ -58,17 +64,21 @@ The RTL8192CU is a highly integrated multiple-in, multiple-out (MIMO)
 RF in a single chip.
 It operates in the 2GHz spectrum only.
 .Pp
-The driver needs at least version 1.1p0 of the following firmware files,
-which are loaded when an interface is attached:
+This driver requires the firmware built with the
+.Nm urtwnfw
+module to work.
+For the loaded firmware to be enabled for use the license at
+.Pa /usr/share/doc/legal/realtek
+must be agreed by adding the following line to
+.Xr loader.conf 5 :
 .Pp
-.Bl -tag -width Ds -offset indent -compact
-.It urtwn-rtl8192cfwT
-.It urtwn-rtl8192cfwU
-.It urtwn-rtl8723fw
+.Dl "legal.realtek.license_ack=1"
+.Sh FILES
+.Bl -tag -width ".Pa /usr/share/doc/legal/realtek" -compact
+.It Pa /usr/share/doc/legal/realtek
+.Nm
+firmware license
 .El
-.Pp
-The firmware is available as part of the FreeBSD Ports collection in
-net/urtwn-firmware-kmod.
 .Sh HARDWARE
 The following adapters should work:
 .Pp
@@ -109,6 +119,7 @@ The driver will reset the hardware.
 This should not happen.
 .El
 .Sh SEE ALSO
+.Xr urtwnfw 4 ,
 .Xr intro 4 ,
 .Xr netintro 4 ,
 .Xr usb 4 ,
diff --git a/share/man/man4/urtwnfw.4 b/share/man/man4/urtwnfw.4
new file mode 100644
index 00000000000..0ea2c84dc3a
--- /dev/null
+++ b/share/man/man4/urtwnfw.4
@@ -0,0 +1,75 @@
+.\" Copyright (c) 2013 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. 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.
+.\"
+.\" $FreeBSD$
+.\"
+.Dd October 31, 2013
+.Dt URTWNFW 4
+.Os
+.Sh NAME
+.Nm urtwnfw
+.Nd "Firmware Module for Realtek Wireless driver"
+.Sh SYNOPSIS
+To compile this module into the kernel,
+place the following line in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device urtwnfw"
+.Ed
+.Pp
+This will include three firmware images inside the kernel.
+If you want to pick only the firmware image for your network adapter choose one
+of the following:
+.Bd -ragged -offset indent
+.Cd "device urtwn-rtl8192cfwT"
+.Cd "device urtwn-rtl8192cfwU"
+.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
+urtwn-rtl8192cfwT_load="YES"
+urtwn-rtl8192cfwU_load="YES"
+.Ed
+.Sh DESCRIPTION
+This module provides access to firmware sets for the
+Realtek RTL8188CUS, RTL8188CE-VAU, RTL8188RU and RTL8192CU
+chip based USB WiFi adapters.
+It may be
+statically linked into the kernel, or loaded as a module.
+.Pp
+For the loaded firmware to be enabled for use the license at
+.Pa /usr/share/doc/legal/realtek
+must be agreed to by adding the following line to
+.Xr loader.conf 5 :
+.Pp
+.Dl "legal.realtek.license_ack=1"
+.Sh FILES
+.Bl -tag -width ".Pa /usr/share/doc/legal/realtek" -compact
+.It Pa /usr/share/doc/legal/realtek
+.Nm
+firmware license
+.El
+.Sh SEE ALSO
+.Xr urtwn 4 ,
+.Xr firmware 9
diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4
index d3a236fa13a..f64d8b8c810 100644
--- a/share/man/man4/usb.4
+++ b/share/man/man4/usb.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 20, 2009
+.Dd November 26, 2013
 .Dt USB 4
 .Os
 .Sh NAME
@@ -147,6 +147,7 @@ specifications can be found at:
 .Xr usbdi 4 ,
 .Xr aue 4 ,
 .Xr axe 4 ,
+.Xr axge 4 ,
 .Xr cue 4 ,
 .Xr ehci 4 ,
 .Xr kue 4 ,
diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile
index 6e4aa84375a..e0bd22247d4 100644
--- a/share/man/man5/Makefile
+++ b/share/man/man5/Makefile
@@ -6,7 +6,6 @@
 #MISSING: dump.5 plot.5
 MAN=	acct.5 \
 	ar.5 \
-	${_atf_formats.5} \
 	a.out.5 \
 	bluetooth.device.conf.5 \
 	bluetooth.hosts.5 \
@@ -80,12 +79,6 @@ MLINKS+=quota.user.5 quota.group.5
 MLINKS+=rc.conf.5 rc.conf.local.5
 MLINKS+=resolver.5 resolv.conf.5
 
-.if ${MK_ATF} != "no"
-ATF=			${.CURDIR}/../../../contrib/atf
-.PATH:			${ATF}/doc
-_atf_formats.5=		atf-formats.5
-.endif
-
 .if ${MK_FREEBSD_UPDATE} != "no"
 MAN+=	freebsd-update.conf.5
 .endif
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 4f14c7fd7e6..327ef52ae01 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 23, 2013
+.Dd October 28, 2013
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -917,6 +917,33 @@ Empty by default.
 This variable contains additional flags passed to the
 .Xr pflogd 8
 program.
+.It Va pflog_instances
+.Pq Vt str
+If logging to more than one
+.Xr pflog 4
+interface is desired,
+.Va pflog_instances
+is set to the list of
+.Xr pflogd 8
+instances that should be started at system boot time. If
+.Va pflog_instances
+is set, for each whitespace-seperated
+.Ar element
+in the list,
+.Ao Ar element Ac Ns Va _dev
+and
+.Ao Ar element Ac Ns Va _logfile
+elements are assumed to exist.
+.Ao Ar element Ac Ns Va _dev
+must contain the
+.Xr pflog 4
+interface to be watched by the named
+.Xr pflogd 8
+instance.
+.Ao Ar element Ac Ns Va _logfile
+must contain the name of the logfile that will be used by the
+.Xr pflogd 8
+instance.
 .It Va ftpproxy_enable
 .Pq Vt bool
 Set to
@@ -935,6 +962,19 @@ Empty by default.
 This variable contains additional flags passed to the
 .Xr ftp-proxy 8
 program.
+.It Va ftpproxy_instances
+.Pq Vt str
+Empty by default. If multiple instances of
+.Xr ftp-proxy 8
+are desired at boot time,
+.Va ftpproxy_instances
+should contain a whitespace-seperated list of instance names. For each
+.Ar element
+in the list, a variable named
+.Ao Ar element Ac Ns Va _flags
+should be defined, containing the command-line flags to be passed to the
+.Xr ftp-proxy 8
+instance.
 .It Va pfsync_enable
 .Pq Vt bool
 Set to
@@ -1676,33 +1716,6 @@ Even if this variable is specified to
 .Dq YES ,
 .Dq :nosticky
 keyword can be used to override it on per interface basis.
-.It Va fec_interfaces
-.Pq Vt str
-Set to the list of
-.Xr ng_fec 4
-Fast EtherChannel interfaces to configure on this host.
-A
-.Va fecconfig_ Ns Aq Ar interface
-variable is assumed to exist for each value of
-.Ar interface .
-The value of this variable is used to configure link aggregated interfaces
-according to the syntax of the
-.Cm NGM_FEC_ADD_IFACE
-to
-.Xr ngctl 8
-msg.
-Additionally, this option ensures that each listed interface is created
-via the
-.Cm mkpeer
-command to
-.Xr ngctl 8
-before attempting to configure it.
-For example:
-.Bd -literal
-fec_interfaces="fec0"
-fecconfig_fec0="em0 em1"
-ifconfig_fec0="DHCP"
-.Ed
 .It Va gif_interfaces
 .Pq Vt str
 This variable is deprecated in favor of
@@ -3675,6 +3688,23 @@ and if
 is set to
 .Dq Li YES ,
 this specifies a list of additional iBCS2 loaders to enable.
+.It Va firstboot_sentinel
+.Pq Vt str
+This variable specifies the full path to a
+.Dq first boot
+sentinel file.
+If a file exists with this path,
+.Pa rc.d
+scripts with the
+.Dq firstboot
+keyword will be run on startup and the sentinel file will be deleted
+after the boot process completes.
+The sentinel file must be located on a writable file system which is
+mounted no later than
+.Va early_late_divider
+to function properly.
+The default is
+.Pa /firstboot .
 .It Va linux_enable
 .Pq Vt bool
 Set to
@@ -3891,14 +3921,32 @@ indicates that the highest frequency (less power savings) should be used.
 If set to
 .Dq Li NO ,
 any configured jails will not be started.
+.It Va jail_conf
+.Pq Vt str
+The configuration filename used by
+.Xr jail 8
+utility.
+The default value is
+.Pa /etc/jail.conf .
 .It Va jail_parallel_start
 .Pq Vt bool
 If set to
 .Dq Li YES ,
 all configured jails will be started in the background (in parallel).
+.It Va jail_flags
+.Pq Vt str
+Unset by default.
+When set, use as default value for
+.Va jail_ Ns Ao Ar jname Ac Ns Va _flags
+for every jail in
+.Va jail_list .
 .It Va jail_list
 .Pq Vt str
 A space separated list of names for jails.
+If this variable is empty,
+all of
+.Xr jail 8
+instances in the configuration file will be configured.
 This is purely a configuration aid to help identify and
 configure multiple jails.
 The names specified in this list will be used to
@@ -3908,171 +3956,41 @@ The literal jail name of
 .Dq Li 0
 .Pq zero
 is not allowed.
-.Pp
-Assuming that the jail in question was named
-.Li vjail ,
-you would have the following dependent variables:
-.Bd -literal
-jail_vjail_hostname="jail.example.com"
-jail_vjail_ip="192.0.2.100"
-jail_vjail_rootdir="/var/jails/vjail/root"
-.Ed
-.Pp
-.It Va jail_flags
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _flags
-for every jail in
-.Va jail_list .
-.It Va jail_interface
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _interface
-for every jail in
-.Va jail_list .
-.It Va jail_fstab
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
-for every jail in
-.Va jail_list .
-.It Va jail_mount_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _mount_enable
-to
-.Dq Li YES
-by default for every jail in
-.Va jail_list .
-.It Va jail_devfs_ruleset
-.Pq Vt str
-Unset by default.
-When set, sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_ruleset
-to given value for every jail in
-.Va jail_list .
-.It Va jail_devfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_enable
-to
-.Dq Li YES
-by default for every jail in
-.Va jail_list .
-.It Va jail_fdescfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
-to
-.Dq Li YES
-by default for every jail in
-.Va jail_list .
-.It Va jail_procfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-sets
-.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
-to
-.Dq Li YES
-by default for every jail in
-.Va jail_list .
-.It Va jail_exec_prestart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestart Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_exec_start
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start
-for every jail in
-.Va jail_list .
-.It Va jail_exec_afterstart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_afterstart Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_exec_poststart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststart Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_exec_prestop Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestop Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_exec_stop
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop
-for every jail in
-.Va jail_list .
-.It Va jail_exec_poststop Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-When set, use as default value for
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststop Ns Aq Ar N
-for every jail in
-.Va jail_list .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _rootdir
-.Pq Vt str
-Unset by default.
-Set to the root directory used by jail
-.Va jname .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _hostname
-.Pq Vt str
-Unset by default.
-Set to the fully qualified domain name (FQDN) assigned to jail
-.Va jname .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _parameters
-.Pq Vt str
-Unset by default.
-Set extra parameters for jail
-.Va jname ,
-such as
-.Dq Li allow.chflags
-or
-.Dq Li children.max .
-See
+.It Va jail_* variables
+Note that older releases supported per-jail configuration via
+.Xr rc.conf 5
+variables.
+For example,
+hostname of a jail named
+.Li vjail
+was able to be set by
+.Li jail_vjail_hostname .
+These per-jail configuration variables are now obsolete in favor of
 .Xr jail 8
-for a list of available parameters.
-Note that the following parameters are already defined by
+configuration file.
+For backward compatibility,
+when per-jail configuration variables are defined,
+.Xr jail 8
+configuration files are created as
+.Pa /var/run/jail. Ns Ao Ar jname Ac Ns Pa .conf
+and used.
+.Pp
+The following per-jail parameters are handled by
 .Pa rc.d/jail
 script out of their corresponding
 .Nm
-variables:
+variables.
+In addition to them, parameters in
+.Va jail_ Ns Ao Ar jname Ac Ns Va _parameters
+will be added to the configuration file.
+They must be a semi-colon
+.Pq Ql \&;
+delimited list of
+.Dq key=value .
+For more details,
+see
+.Xr jail 8
+manual page.
 .Bl  -tag -width "host.hostname" -offset indent
 .It Li path
 set from
@@ -4080,202 +3998,91 @@ set from
 .It Li host.hostname
 set from
 .Va jail_ Ns Ao Ar jname Ac Ns Va _hostname
-.It Li command
+.It Li exec.consolelog
 set from
-.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start
+.Va jail_ Ns Ao Ar jname Ac Ns Va _consolelog .
+The default value is
+.Pa /var/log/jail_ Ao Ar jname Ac Pa _console.log .
+.It Li interface
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _interface .
+.It Li vnet.interface
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _vnet_interface .
+This implies
+.Li vnet
+parameter will be enabled and cannot be specified with
+.Va jail_ Ns Ao Ar jname Ac Ns Va _interface ,
+.Va jail_ Ns Ao Ar jname Ac Ns Va _ip
+and/or
+.Va jail_ Ns Ao Ar jname Ac Ns Va _ip_multi Ns Aq Ar n
+at the same time.
+.It Li fstab
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
+.It Li mount
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _procfs_enable .
+.It Li exec.fib
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fib
+.It Li exec.start
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start .
+The parameter name was
+.Li command
+in some older releases.
+.It Li exec.prestart
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestart
+.It Li exec.poststart
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststart
+.It Li exec.stop
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop
+.It Li exec.prestop
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestop
+.It Li exec.poststop
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststop
 .It Li ip4.addr
 set if
 .Va jail_ Ns Ao Ar jname Ac Ns Va _ip
-contains IPv4 addresses
+or
+.Va jail_ Ns Ao Ar jname Ac Ns Va _ip_multi Ns Aq Ar n
+contain IPv4 addresses
 .It Li ip6.addr
 set if
-.Va jail_ Ns Ao Ar jname Ac Ns Va _ip6
-contains IPv6 addresses
-.El
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _ip
-.Pq Vt str
-Unset by default.
-Set to the (primary) IPv4 and/or IPv6 address(es) assigned to the jail.
-The argument can be a sole address or a comma separated list of addresses.
-Additionally each address can be prefixed by the name of an interface
-followed by a pipe to overwrite
-.Va jail_ Ns Ao Ar jname Ac Ns Va _interface
-or
-.Va jail_interface
-and/or suffixed by a netmask, prefixlen or prefix.
-In case no netmask, prefixlen or prefix is given,
-.Sq /32
-will be used for IPv4 and
-.Sq /128
-will be used for an IPv6 address.
-If no address is given for the jail then the jail will be started with
-no networking support.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _ip_multi Ns Aq Ar n
-.Pq Vt str
-Unset by default.
-Set additional IPv4 and/or IPv6 address(es) assigned to the jail.
-The sequence starts with
-.Dq Li _multi0
-and the numbers have to be strictly ascending.
-These entries follow the same syntax as their primary
 .Va jail_ Ns Ao Ar jname Ac Ns Va _ip
-entry.
-The order of the entries can be important as the first address for
-each address family found will be the primary address of the jail.
-See
-.Va ip-addresses
-option in
-.Xr jail 8
-for more details.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _flags
-.Pq Vt str
-Set to
-.Dq Li -l -U root
-by default.
-These are flags to pass to
-.Xr jail 8 .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _interface
-.Pq Vt str
-Unset by default.
-When set, sets the interface to use when setting IP address alias.
-Note that the alias is created at jail startup and removed at jail shutdown.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _fib
-.Pq Vt str
-Unset by default.
-When set, the jail is started with the specified forwarding table (sometimes
-referred to as a routing table) via
-.Xr setfib 1 .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
-.Pq Vt str
-Set to
-.Pa /etc/fstab. Ns Aq Ar jname
-by default.
-This is the file system information file to use for jail
-.Va jname .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _mount_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-mount all file systems from
-.Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
-at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_ruleset
-.Pq Vt str
-Unset by default.
-When set, defines the device file system ruleset file to use for jail
-.Va jname .
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-mount the device file system inside jail
-.Ar jname
-at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-mount the file-descriptor file system inside jail
-.Ar jname
-at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _procfs_enable
-.Pq Vt bool
-Set to
-.Dq Li NO
-by default.
-When set to
-.Dq Li YES ,
-mount the process file system inside jail
-.Ar jname
-at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-before jail startup, where
-.Ar N
-is 0, 1, and so on.
-It is run outside the jail.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start
-.Pq Vt str
-Set to
-.Dq Li /bin/sh /etc/rc
-by default.
-This is the command executed in a jail at jail startup.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_afterstart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-in a jail
-after jail startup, where
-.Ar N
-is 1, 2, and so on.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststart Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-after jail startup, where
-.Ar N
-is 0, 1, and so on.
-It is run outside the jail.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_prestop Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-before jail shutdown, where
-.Ar N
-is 0, 1, and so on.
-It is run outside the jail.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop
-.Pq Vt str
-Set to
-.Dq Li /bin/sh /etc/rc.shutdown
-by default.
-This is the command executed in a jail at jail shutdown.
-.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_poststop Ns Aq Ar N
-.Pq Vt str
-Unset by default.
-This is the command run as
-.Ar N Ns
-th command
-after jail shutdown, where
-.Ar N
-is 0, 1, and so on.
-It is run outside the jail.
-.It Va jail_set_hostname_allow
-.Pq Vt bool
-If set to
-.Dq Li NO ,
-do not allow the root user in a jail to set its hostname.
-.It Va jail_socket_unixiproute_only
-.Pq Vt bool
-If set to
-.Dq Li YES ,
-do not allow any sockets,
-besides UNIX/IP/route sockets,
-to be used within a jail.
-.It Va jail_sysvipc_allow
-.Pq Vt bool
-If set to
-.Dq Li YES ,
-allow applications within a jail to use System V IPC.
+or
+.Va jail_ Ns Ao Ar jname Ac Ns Va _ip_multi Ns Aq Ar n
+contain IPv6 addresses
+.It Li allow.mount
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _mount_enable
+.It Li mount.devfs
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_enable
+.It Li devfs_ruleset
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_ruleset .
+This must be an integer,
+not a string.
+.It Li mount.fdescfs
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
+.It Li allow.set_hostname
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _set_hostname_allow
+.It Li allow.rawsocket
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _socket_unixiproute_only
+.It Li allow.sysvipc
+set from
+.Va jail_ Ns Ao Ar jname Ac Ns Va _sysvipc_allow
+.El
 .\" -----------------------------------------------------
 .It Va harvest_interrupt
 .Pq Vt bool
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 78dfc679624..e7402444f6a 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 253304 2013-07-12 23:08:44Z bapt
+.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd September 30, 2013
+.Dd December 4, 2013
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -184,6 +184,9 @@ Set to not build
 .It Va WITHOUT_CAPSICUM
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CAPSICUM 229319 2012-01-02 21:57:58Z rwatson
 Set to not build Capsicum support into system programs.
+.It Va WITHOUT_CASPER
+.\" from FreeBSD: head/tools/build/options/WITHOUT_CASPER 258838 2013-12-02 08:21:28Z pjd
+Set to not build Casper program and related libraries.
 .It Va WITHOUT_CDDL
 .\" from FreeBSD: head/tools/build/options/WITHOUT_CDDL 163861 2006-11-01 09:02:11Z jb
 Set to not build code licensed under Sun's CDDL.
@@ -200,7 +203,7 @@ When set, it also enforces the following options:
 Set to not build the Clang C/C++ compiler.
 .Pp
 It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
 When set, it also enforces the following options:
 .Pp
 .Bl -item -compact
@@ -208,10 +211,6 @@ When set, it also enforces the following options:
 .Va WITHOUT_CLANG_EXTRAS
 .It
 .Va WITHOUT_CLANG_FULL
-.It
-.Va WITHOUT_CLANG_IS_CC
-.It
-.Va WITHOUT_LLDB
 .El
 .It Va WITH_CLANG
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG 221730 2011-05-10 11:14:40Z ru
@@ -228,7 +227,7 @@ Set to avoid building the ARCMigrate, Rewriter and StaticAnalyzer components of
 the Clang C/C++ compiler.
 .Pp
 It is a default setting on
-arm/arm, arm/armeb, arm/armv6, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
+arm/arm, arm/armeb, arm/armv6, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64.
 .It Va WITH_CLANG_FULL
 .\" from FreeBSD: head/tools/build/options/WITH_CLANG_FULL 246259 2013-02-02 22:28:29Z dim
 Set to build the ARCMigrate, Rewriter and StaticAnalyzer components of the
@@ -245,7 +244,7 @@ and
 .Pa /usr/bin/cpp .
 .Pp
 It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 When set, it also enforces the following options:
 .Pp
 .Bl -item -compact
@@ -323,11 +322,7 @@ When set, it also enforces the following options:
 .It
 .Va WITHOUT_CLANG_FULL
 .It
-.Va WITHOUT_CLANG_IS_CC
-.It
 .Va WITHOUT_GROFF
-.It
-.Va WITHOUT_LLDB
 .El
 .It Va WITH_DEBUG_FILES
 .\" from FreeBSD: head/tools/build/options/WITH_DEBUG_FILES 251512 2013-06-07 21:40:02Z emaste
@@ -369,7 +364,7 @@ Set to build Flattened Device Tree support as part of the base system.
 This includes the device tree compiler (dtc) and libfdt support library.
 .Pp
 It is a default setting on
-arm/arm, arm/armeb, arm/armv6, arm/armv6eb, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64.
+arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64.
 .It Va WITHOUT_FLOPPY
 .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru
 Set to not build or install programs
@@ -406,7 +401,7 @@ amd64/amd64, arm/arm, arm/armv6 and i386/i386.
 Set to build and install gcc and g++.
 .Pp
 It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, pc98/i386, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .It Va WITHOUT_GCOV
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GCOV 156932 2006-03-21 07:50:50Z ru
 Set to not build the
@@ -443,7 +438,7 @@ Build the GNU C++ stack (g++, libstdc++).
 This is the default on platforms where gcc is the system compiler.
 .Pp
 It is a default setting on
-arm/armeb, arm/armv6eb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
+arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc, powerpc/powerpc64 and sparc64/sparc64.
 .It Va WITHOUT_GNU_SUPPORT
 .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_SUPPORT 156932 2006-03-21 07:50:50Z ru
 Set to build some programs without optional GNU support.
@@ -479,12 +474,6 @@ Set to not build HTML docs.
 .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.
-When set, it also enforces the following options:
-.Pp
-.Bl -item -compact
-.It
-.Va WITHOUT_LIBICONV_COMPAT
-.El
 .It Va WITHOUT_INET
 .\" from FreeBSD: head/tools/build/options/WITHOUT_INET 221266 2011-04-30 17:58:28Z bz
 Set to not build programs and libraries related to IPv4 networking.
@@ -641,9 +630,6 @@ runtime linker.
 .It Va WITHOUT_LIBCPLUSPLUS
 .\" from FreeBSD: head/tools/build/options/WITHOUT_LIBCPLUSPLUS 246262 2013-02-02 22:42:46Z dim
 Set to avoid building libcxxrt and libc++.
-.It Va WITH_LIBICONV_COMPAT
-.\" from FreeBSD: head/tools/build/options/WITH_LIBICONV_COMPAT 254919 2013-08-26 17:15:56Z antoine
-Set to build libiconv API and link time compatibility.
 .It Va WITHOUT_LIBPTHREAD
 .\" from FreeBSD: head/tools/build/options/WITHOUT_LIBPTHREAD 188848 2009-02-20 11:09:55Z mtm
 Set to not build the
@@ -772,14 +758,14 @@ Set to not build NLS catalogs.
 .\" from FreeBSD: head/tools/build/options/WITHOUT_NLS_CATALOGS 156932 2006-03-21 07:50:50Z ru
 Set to not build NLS catalog support for
 .Xr csh 1 .
-.It Va WITH_NMTREE
-.\" from FreeBSD: head/tools/build/options/WITH_NMTREE 245435 2013-01-14 20:38:32Z brooks
+.It Va WITHOUT_NMTREE
+.\" from FreeBSD: head/tools/build/options/WITHOUT_NMTREE 257138 2013-10-25 22:45:18Z brooks
 Set to install
-.Xr nmtree 8
+.Xr fmtree 8
 as
 .Xr mtree 8 .
 By default
-.Xr fmtree 8
+.Xr nmtree 8
 is installed as
 .Xr mtree 8 .
 .It Va WITHOUT_NS_CACHING
@@ -868,15 +854,10 @@ When set, it also enforces the following options:
 .Va WITHOUT_AUTHPF
 .El
 .It Va WITHOUT_PKGBOOTSTRAP
-.\" from FreeBSD: head/tools/build/options/WITHOUT_PKGBOOTSTRAP 238023 2012-07-02 20:26:11Z marcel
+.\" from FreeBSD: head/tools/build/options/WITHOUT_PKGBOOTSTRAP 258924 2013-12-04 15:58:42Z bdrewery
 Set to not build
-.Xr pkg 1
-bootstrap tool
-.It Va WITH_PKGTOOLS
-.\" from FreeBSD: head/tools/build/options/WITH_PKGTOOLS 253305 2013-07-12 23:11:17Z bapt
-Set to build
-.Xr pkg_add 8
-and related programs.
+.Xr pkg 7
+bootstrap tool.
 .It Va WITHOUT_PMC
 .\" from FreeBSD: head/tools/build/options/WITHOUT_PMC 183242 2008-09-21 22:02:26Z sam
 Set to not build
@@ -910,7 +891,7 @@ This includes
 .Xr rsh 1 ,
 etc.
 .It Va WITHOUT_RCS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 156932 2006-03-21 07:50:50Z ru
+.\" from FreeBSD: head/tools/build/options/WITHOUT_RCS 256198 2013-10-09 17:07:20Z gjb
 Set to not build
 .Xr rcs 1
 and related utilities.
@@ -1000,6 +981,9 @@ Set to not build and install
 Set to not build
 .Xr telnet 8
 and related programs.
+.It Va WITH_TESTS
+.\" from FreeBSD: head/tools/build/options/WITH_TESTS 258014 2013-11-11 21:13:14Z gjb
+Set to install the Kyua test suite.
 .It Va WITHOUT_TEXTPROC
 .\" from FreeBSD: head/tools/build/options/WITHOUT_TEXTPROC 183242 2008-09-21 22:02:26Z sam
 Set to not build
@@ -1030,13 +1014,9 @@ When set, it also enforces the following options:
 .It
 .Va WITHOUT_CLANG_FULL
 .It
-.Va WITHOUT_CLANG_IS_CC
-.It
 .Va WITHOUT_GCC
 .It
 .Va WITHOUT_GDB
-.It
-.Va WITHOUT_LLDB
 .El
 .It Va WITHOUT_UNBOUND
 .\" from FreeBSD: head/tools/build/options/WITHOUT_UNBOUND 255597 2013-09-15 14:51:23Z des
diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile
index 8417934b713..6b9402c4cd9 100644
--- a/share/man/man7/Makefile
+++ b/share/man/man7/Makefile
@@ -29,6 +29,10 @@ MAN=	adding_user.7 \
 	sticky.7 \
 	tuning.7
 
+.if ${MK_TESTS} != "no"
+MAN+=	tests.7
+.endif
+
 MLINKS=	intro.7 miscellaneous.7
 MLINKS+= security.7 securelevel.7
 MLINKS+= c99.7 c.7
@@ -36,17 +40,4 @@ MLINKS+= c99.7 c78.7
 MLINKS+= c99.7 c89.7
 MLINKS+= c99.7 c90.7
 
-.if ${MK_ATF} != "no"
-ATF=            ${.CURDIR}/../../../contrib/atf
-.PATH:          ${ATF}/doc
-MAN+=		atf.7
-
-CLEANFILES+=	atf.7 atf.7.tmp
-atf.7: atf.7.in
-	sed -e 's,__DOCDIR__,${DOCDIR}/atf,g' \
-	    -e 's,__TESTSDIR__,${TESTSBASE},g' \
-	    < ${.ALLSRC} > ${.TARGET}.tmp
-	mv ${.TARGET}.tmp ${.TARGET}
-.endif
-
 .include <bsd.prog.mk>
diff --git a/share/man/man7/development.7 b/share/man/man7/development.7
index 58e6892213f..18b98131fc4 100644
--- a/share/man/man7/development.7
+++ b/share/man/man7/development.7
@@ -454,8 +454,6 @@ This is a good time to also remind you that most of the
 .Xr svn 1
 operations you do will be done as
 .Dq Li root .
-.Pp
-.Xr cron 8 .
 .Sh SEE ALSO
 .Xr crontab 1 ,
 .Xr crontab 5 ,
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 328f88d1f9e..b1137877331 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -32,7 +32,7 @@
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD$
 .\"
-.Dd January 21, 2010
+.Dd October 29, 2013
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -547,6 +547,16 @@ ASCII text files used by various games
 device description file for device name
 .It Pa info/
 GNU Info hypertext system
+.It Pa keys/
+known trusted and revoked keys.
+.Bl -tag -width ".Pa keys/pkg/" -compact
+.It Pa keys/pkg/
+fingerprints for
+.Xr pkg 7
+and
+.Xr pkg 8
+.El
+.Pp
 .It Pa locale/
 localization files;
 see
@@ -692,6 +702,12 @@ source code for files in
 source code for files in
 .Pa /usr/sbin
 .El
+.Pp
+.It Pa tests/
+The
+.Fx
+test suite.
+See tests(7) for more details.
 .El
 .It Pa /var/
 multi-purpose log, temporary, transient, and spool files
@@ -720,6 +736,14 @@ directory containing output spool files
 .Pp
 .It Pa backups/
 miscellaneous backup files
+.It Pa cache/
+miscellaneous cached files
+.Bl -tag -width ".Pa pkg/" -compact
+.It Pa pkg/
+cached packages for
+.Xr pkg 8
+.El
+.Pp
 .It Pa crash/
 default directory to store kernel crash dumps; see
 .Xr crash 8
diff --git a/share/man/man7/release.7 b/share/man/man7/release.7
index b126cd79608..481d4f9a2af 100644
--- a/share/man/man7/release.7
+++ b/share/man/man7/release.7
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 14, 2013
+.Dd December 2, 2013
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -241,6 +241,10 @@ will prevent the
 distribution package from being created.
 Setting this also sets
 .Va NODOC .
+.It Va WITH_DVD
+Set to a non-empty value to include the
+.Cm dvdrom
+target.
 .El
 .Sh MAKEFILE TARGETS
 The release makefile
@@ -270,6 +274,15 @@ This target produces files called
 and
 .Pa bootonly.iso
 as its output.
+.It Cm dvdrom
+Builds installation DVD-ROM images.
+This may require the
+.Xr md 4
+(memory disk) device driver be present in the kernel
+(either by being compiled in or available as a module).
+This target produces the
+.Pa dvd1.iso
+file as its output.
 .It Cm memstick
 Builds an installation memory stick image named
 .Pa memstick.img .
@@ -279,6 +292,11 @@ Requires that the
 .Pq memory disk
 device driver be present in the kernel
 .Pq either by being compiled in or available as a module .
+.It Cm mini-memstick
+Similar to
+.Cm memstick ,
+with the exception that the installation distribution sets
+are not included.
 .It Cm ftp
 Creates a directory named
 .Pa ftp
@@ -297,7 +315,8 @@ Builds a bootable installation system containing all the distribution files
 packaged by the
 .Cm packagesystem
 target, and suitable for imaging by the
-.Cm cdrom
+.Cm cdrom ,
+.Cm dvdrom
 and
 .Cm memstick
 targets.
diff --git a/share/man/man7/tests.7 b/share/man/man7/tests.7
new file mode 100644
index 00000000000..1570d505544
--- /dev/null
+++ b/share/man/man7/tests.7
@@ -0,0 +1,199 @@
+.\"	$FreeBSD$
+.\"	$NetBSD: tests.kyua.7,v 1.2 2013/07/20 21:39:59 wiz 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.
+.\"
+.Dd October 19, 2013
+.Dt TESTS 7
+.Os
+.Sh NAME
+.Nm tests
+.Nd introduction to the FreeBSD test suite
+.Sh DESCRIPTION
+The
+.Fx
+test suite provides a collection of automated tests for two major purposes.
+On the one hand, the test suite aids
+.Em developers
+in catching bugs and regressions in the code when they performing modifications
+to the source tree.
+On the other hand, the test suite allows
+.Em end users
+(and, in particular, system administrators) to verify that fresh installations
+of the
+.Fx
+operating system behave correctly in their hardware platform and also to ensure
+that the system does not suffer from regressions during regular system
+operation and maintenance.
+.Pp
+The
+.Fx
+test suite is installed under the
+.Pa /usr/tests
+hierarchy.
+.Pp
+This manual page describes how to execute the test suite and how to configure
+some of its optional features.
+.Ss When to run the tests?
+Before diving into the details of how to run the test suite, here are some
+scenarios in which you should be running them:
+.Bl -bullet -offset indent
+.It
+After a fresh installation of
+.Fx
+to ensure that the system works correctly on your hardware platform.
+.It
+After an upgrade of
+.Fx
+to a different version to ensure that the new code works well on your
+hardware platform and that the upgrade did not introduce regressions in your
+configuration.
+.It
+After performing changes to the source tree to catch any bugs and/or regressions
+introduced by the modifications.
+.It
+Periodically, maybe from a
+.Xr cron 8
+job, to ensure that any changes to the system (such as the installation of
+third-party packages or manual modifications to configuration files) do not
+introduce unexpected failures.
+.El
+.Ss Running the tests
+First of all, you will need to install the
+.Sq ports/devel/kyua
+package.
+.Pp
+Use the following command to run the whole test suite:
+.Bd -literal -offset indent
+$ kyua test -k /usr/tests/Kyuafile
+.Ed
+.Pp
+The above will go through all test programs in
+.Pa /usr/tests
+recursively, execute them, store their results and debugging data in Kyua
+database (by default in
+.Pa ~/.kyua/store.db ) ,
+and print a summary of the results.
+This summary includes a brief count of all total tests run and how many of
+them failed.
+.Pp
+It is possible to restrict which tests to run by providing their names in
+the command line.
+For example, this would execute the tests for the
+.Xr cp 1
+and
+.Xr cut 1
+utilities:
+.Bd -literal -offset indent
+$ kyua test -k /usr/tests/Kyuafile bin/cp usr.bin/cut
+.Ed
+.Ss Obtaining reports of the tests execution
+Additional information of the results of the execution can be later extracted
+from the database by using the various reporting commands of Kyua.
+For example, the following would extract a plain-text report of the executed
+tests and show which ones failed:
+.Bd -literal -offset indent
+$ kyua report
+.Ed
+.Pp
+This other example would generate an HTML report ready to be published on a
+web server:
+.Bd -literal -offset indent
+$ kyua report-html --output ~/public_html/tests
+.Ed
+.Pp
+For further details on the command-line interface of Kyua, please refer
+to its manual page
+.Xr kyua 1 .
+.\".Ss Configuring the tests
+.\"Some test cases in the
+.\".Fx
+.\"test suite require the administrator to manually set up some configuration
+.\"properties before they can run.
+.\"Unless these properties are defined, the tests that require them will be marked
+.\"as skipped and thus they will not be really executed.
+.\".Pp
+.\"Test suites are configured by defining the values to their configuration
+.\"variables in
+.\".Pa /usr/local/etc/kyua/kyua.conf .
+.\"The format of this file is detailed in
+.\".Xr kyua.conf 5 .
+.\".Pp
+.\"The following configuration variables are available in the
+.\".Fx
+.\"test suite:
+.\".Bl -tag
+.\".It NONE REGISTERED YET
+.\"TBD.
+.Ss What to do if something fails?
+If there is
+.Em any failure
+during the execution of the test suite, please considering reporting it to the
+.Fx
+developers so that the failure can be analyzed and fixed.
+To do so, either send a message to the appropriate mailing list or file a
+problem report.
+For more details please refer to:
+.Bl -bullet -offset indent -compact
+.It
+.Lk http://lists.freebsd.org/ "FreeBSD Mailing Lists"
+.It
+.Lk http://www.freebsd.org/send-pr.html "Submit a FreeBSD Problem Report"
+.El
+.Sh FILES
+.Bl -tag -compact -width usrXlocalXetcXkyuaXkyuaXconfXX
+.It Pa /usr/local/etc/kyua/kyua.conf
+System-wide configuration file for
+.Xr kyua 1 .
+.It Pa ~/.kyua/kyua.conf
+User-specific configuration file for
+.Xr kyua 1 ;
+overrides the system file.
+.It Pa ~/.kyua/store.db
+Default database used by Kyua to maintain the data of the executed tests.
+.It Pa /usr/tests/
+Location of the
+.Fx
+test suite.
+.It Pa /usr/tests/Kyuafile
+Top-level test suite definition file.
+.El
+.Sh SEE ALSO
+.Xr kyua 1 .
+.Sh HISTORY
+The collection of test programs in
+.Pa /usr/tests
+first appeared in
+.Fx 11.0 .
+.Pp
+The
+.Nm
+manual page first appeared in
+.Nx 6.0
+and was later ported to
+.Fx 11.0 .
+.Sh AUTHORS
+.An Julio Merino Aq Mt jmmv@google.com
diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8
index d1d8c46c296..e117fe447e8 100644
--- a/share/man/man8/picobsd.8
+++ b/share/man/man8/picobsd.8
@@ -20,7 +20,7 @@ utility is a script which produces a minimal implementation of
 which typically fits on a small media such as a floppy disk,
 or can be downloaded as a
 single image file from some media such as CDROM, flash memory, or through
-.Xr etherboot .
+etherboot.
 .Pp
 The
 .Nm
@@ -64,7 +64,7 @@ kernel.
 This is the default behaviour, and is
 extremely useful as the kernel itself can be loaded,
 using
-.Xr etherboot
+etherboot
 or
 .Xr pxeboot 8 ,
 .\"
@@ -378,9 +378,7 @@ If the build is successful, the directory
 .Pa build_dir-bridge/
 will contain a
 .Pa kernel
-that can be downloaded with
-.Xr etherboot ,
-a floppy image called
+that can be downloaded with etherboot, a floppy image called
 .Pa picobsd.bin ,
 plus the products of the compilation in other directories.
 If you want to modify the source tree in
@@ -480,9 +478,7 @@ Booting from a floppy is normally rather slow (in the order of 1-2
 minutes), things are much faster if you store your image on
 a hard disk, Compact Flash, or CDROM.
 .Pp
-You can also use
-.Xr etherboot
-to load the preloaded, uncompressed kernel image
+You can also use etherboot to load the preloaded, uncompressed kernel image
 which is a byproduct of the
 .Nm
 build.
diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8
index 32d0adeea2b..cfeb0e6dff1 100644
--- a/share/man/man8/rc.8
+++ b/share/man/man8/rc.8
@@ -35,7 +35,7 @@
 .\"     @(#)rc.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd September 23, 2013
+.Dd October 19, 2013
 .Dt RC 8
 .Os
 .Sh NAME
@@ -129,6 +129,13 @@ and add
 (only allow vnet-enabled jails) to the list of KEYWORDS to skip in
 .Xr rcorder 8 .
 .It
+If the file
+.Va ${firstboot_sentinel}
+does not exist, add
+.Dq Li firstboot
+to the list of KEYWORDS to skip in
+.Xr rcorder 8 .
+.It
 Invoke
 .Xr rcorder 8
 to order the files in
@@ -156,6 +163,11 @@ Stop processing when the script that is the value of the
 .Va $early_late_divider
 has been run.
 .It
+Check again to see if the file
+.Va ${firstboot_sentinel}
+exists (in case it is located on a newly mounted file system)
+and adjust the list of KEYWORDs to skip appropriately.
+.It
 Re-run
 .Xr rcorder 8 ,
 this time including the scripts in the
@@ -164,6 +176,13 @@ directories.
 Ignore everything up to the
 .Va $early_late_divider ,
 then start executing the scripts as described above.
+.It
+If the file
+.Va ${firstboot_sentinel}
+exists, delete it.
+If the file
+.Va ${firstboot_sentinel}-reboot
+also exists (because it was created by a script), then delete it and reboot.
 .El
 .Ss Operation of Nm rc.shutdown
 .Bl -enum
diff --git a/share/man/man8/rc.sendmail.8 b/share/man/man8/rc.sendmail.8
index 14a30e4a737..d8dff43fdbe 100644
--- a/share/man/man8/rc.sendmail.8
+++ b/share/man/man8/rc.sendmail.8
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 30, 2002
+.Dd October 19, 2013
 .Dt RC.SENDMAIL 8
 .Os
 .Sh NAME
@@ -119,6 +119,42 @@ The
 .Dq Li NONE
 option is deprecated and should not be used.
 It will be removed in a future release.
+.It Va sendmail_cert_create
+.Pq Vt str
+If
+.Va sendmail_enable
+is set to
+.Dq Li YES ,
+create a signed certificate
+.Pa /etc/mail/certs/host.cert
+representing
+.Pa /etc/mail/certs/host.key
+by the CA certificate in
+.Pa /etc/mail/certs/cacert.pem .
+This will enable connecting hosts to negotiate STARTTLS allowing incoming
+email to be encrypted in transit.
+.Xr sendmail 8
+needs to be configured to use these generated files.
+The default configuration in
+.Pa /etc/mail/freebsd.mc
+has the required options in it.
+.It Va sendmail_cert_cn
+.Pq Vt str
+If
+.Va sendmail_enable
+is set to
+.Dq Li YES
+and
+.Va sendmail_cert_create
+is set to
+.Dq Li YES ,
+this is the Common Name (CN) of the certificate that will be created.
+If
+.Va sendmail_cert_cn
+is not set, the system's hostname will be used.
+If there is no hostname set,
+.Dq Li amnesiac
+will be used.
 .It Va sendmail_flags
 .Pq Vt str
 If
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 8ce940f9055..902dcac5796 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -118,6 +118,7 @@ MAN=	accept_filter.9 \
 	g_consumer.9 \
 	g_data.9 \
 	get_cyclecount.9 \
+	getenv.9 \
 	getnewvnode.9 \
 	g_event.9 \
 	g_geom.9 \
@@ -343,7 +344,9 @@ MAN=	accept_filter.9 \
 	vnode.9 \
 	VOP_ACCESS.9 \
 	VOP_ACLCHECK.9 \
+	VOP_ADVISE.9 \
 	VOP_ADVLOCK.9 \
+	VOP_ALLOCATE.9 \
 	VOP_ATTRIB.9 \
 	VOP_BWRITE.9 \
 	VOP_CREATE.9 \
@@ -675,6 +678,14 @@ MLINKS+=g_consumer.9 g_destroy_consumer.9 \
 	g_consumer.9 g_new_consumer.9
 MLINKS+=g_data.9 g_read_data.9 \
 	g_data.9 g_write_data.9
+MLINKS+=getenv.9 freeenv.9 \
+	getenv.9 getenv_int.9 \
+	getenv.9 getenv_long.9 \
+	getenv.9 getenv_string.9 \
+	getenv.9 getenv_quad.9 \
+	getenv.9 getenv_uint.9 \
+	getenv.9 getenv_ulong.9 \
+	getenv.9 testenv.9
 MLINKS+=g_event.9 g_cancel_event.9 \
 	g_event.9 g_post_event.9 \
 	g_event.9 g_waitfor_event.9
@@ -1132,11 +1143,14 @@ MLINKS+=sbuf.9 sbuf_bcat.9 \
 	sbuf.9 sbuf_finish.9 \
 	sbuf.9 sbuf_len.9 \
 	sbuf.9 sbuf_new.9 \
+	sbuf.9 sbuf_new_auto.9 \
 	sbuf.9 sbuf_new_for_sysctl.9 \
 	sbuf.9 sbuf_printf.9 \
 	sbuf.9 sbuf_putc.9 \
 	sbuf.9 sbuf_set_drain.9 \
 	sbuf.9 sbuf_setpos.9 \
+	sbuf.9 sbuf_start_section.9 \
+	sbuf.9 sbuf_end_section.9  \
 	sbuf.9 sbuf_trim.9 \
 	sbuf.9 sbuf_vprintf.9
 MLINKS+=scheduler.9 curpriority_cmp.9 \
diff --git a/share/man/man9/SDT.9 b/share/man/man9/SDT.9
index 39fbdeb846a..9b8af2ab2ac 100644
--- a/share/man/man9/SDT.9
+++ b/share/man/man9/SDT.9
@@ -35,28 +35,28 @@
 .Fn SDT_PROVIDER_DECLARE prov
 .Fn SDT_PROVIDER_DEFINE prov
 .Fn SDT_PROBE_DECLARE prov mod func name
-.Fn SDT_PROBE_DEFINE prov mod func name sname
-.Fn SDT_PROBE_DEFINE0 prov mod func name sname
-.Fn SDT_PROBE_DEFINE1 prov mod func name sname arg0
-.Fn SDT_PROBE_DEFINE2 prov mod func name sname arg0 arg1
-.Fn SDT_PROBE_DEFINE3 prov mod func name sname arg0 arg1 arg2
-.Fn SDT_PROBE_DEFINE4 prov mod func name sname arg0 arg1 arg2 arg3
-.Fn SDT_PROBE_DEFINE5 prov mod func name sname arg0 arg1 arg2 arg3 arg4
-.Fn SDT_PROBE_DEFINE6 prov mod func name sname arg0 arg1 arg2 arg3 arg4 arg5
-.Fn SDT_PROBE_DEFINE7 prov mod func name sname arg0 arg1 arg2 arg3 arg4 arg5   \
+.Fn SDT_PROBE_DEFINE prov mod func name
+.Fn SDT_PROBE_DEFINE0 prov mod func name
+.Fn SDT_PROBE_DEFINE1 prov mod func name arg0
+.Fn SDT_PROBE_DEFINE2 prov mod func name arg0 arg1
+.Fn SDT_PROBE_DEFINE3 prov mod func name arg0 arg1 arg2
+.Fn SDT_PROBE_DEFINE4 prov mod func name arg0 arg1 arg2 arg3
+.Fn SDT_PROBE_DEFINE5 prov mod func name arg0 arg1 arg2 arg3 arg4
+.Fn SDT_PROBE_DEFINE6 prov mod func name arg0 arg1 arg2 arg3 arg4 arg5
+.Fn SDT_PROBE_DEFINE7 prov mod func name arg0 arg1 arg2 arg3 arg4 arg5   \
     arg6
-.Fn SDT_PROBE_DEFINE0_XLATE prov mod func name sname
-.Fn SDT_PROBE_DEFINE1_XLATE prov mod func name sname arg0 xarg0
-.Fn SDT_PROBE_DEFINE2_XLATE prov mod func name sname arg0 xarg0 arg1 xarg1
-.Fn SDT_PROBE_DEFINE3_XLATE prov mod func name sname arg0 xarg0 arg1 xarg1 \
+.Fn SDT_PROBE_DEFINE0_XLATE prov mod func name
+.Fn SDT_PROBE_DEFINE1_XLATE prov mod func name arg0 xarg0
+.Fn SDT_PROBE_DEFINE2_XLATE prov mod func name arg0 xarg0 arg1 xarg1
+.Fn SDT_PROBE_DEFINE3_XLATE prov mod func name arg0 xarg0 arg1 xarg1 \
     arg2 xarg2
-.Fn SDT_PROBE_DEFINE4_XLATE prov mod func name sname arg0 xarg0 arg1 xarg1 \
+.Fn SDT_PROBE_DEFINE4_XLATE prov mod func name arg0 xarg0 arg1 xarg1 \
     arg2 xarg2 arg3 xarg3
-.Fn SDT_PROBE_DEFINE5_XLATE prov mod func name sname arg0 xarg0 arg1 xarg1 \
+.Fn SDT_PROBE_DEFINE5_XLATE prov mod func name arg0 xarg0 arg1 xarg1 \
     arg2 xarg2 arg3 xarg3 arg4 xarg4
-.Fn SDT_PROBE_DEFINE6_XLATE prov mod func name sname arg0 xarg0 arg1 xarg1 \
+.Fn SDT_PROBE_DEFINE6_XLATE prov mod func name arg0 xarg0 arg1 xarg1 \
     arg2 xarg2 arg3 xarg3 arg4 xarg4 arg5 xarg5
-.Fn SDT_PROBE_DEFINE7_XLATE prov mod func name sname arg0 xarg0 arg1 xarg1 \
+.Fn SDT_PROBE_DEFINE7_XLATE prov mod func name arg0 xarg0 arg1 xarg1 \
     arg2 xarg2 arg3 xarg3 arg4 xarg4 arg5 xarg5 arg6 xarg6
 .Fn SDT_PROBE0 prov mod func name
 .Fn SDT_PROBE1 prov mod func name arg0
@@ -136,20 +136,19 @@ See the
 section.
 Note in particular that probes must not be defined across multiple kernel
 modules.
-The
-.Fn SDT_PROBE_DEFINE*
-macros also take an extra
-.Ar sname
-parameter.
-This is used to allow the creation of probes with names containing the
+.Pp
+If
 .Ql -
-character.
-Specifically, the
+character (dash) is wanted in a probe name,
+then it should be represented as
+.Ql __
+(double underscore) in the probe
 .Ar name
-argument should contain the probe name with all dashes converted to underscores,
-and the
-.Ar sname
-argument should be the probe name as it will be referenced by D scripts.
+parameter passed to various
+.Fn SDT_*
+macros,
+because of technical reasons
+(a dash is not valid in C identifiers).
 .Pp
 The
 .Fn SDT_PROBE_DEFINE*
diff --git a/share/man/man9/VOP_ADVISE.9 b/share/man/man9/VOP_ADVISE.9
new file mode 100644
index 00000000000..250be5209ae
--- /dev/null
+++ b/share/man/man9/VOP_ADVISE.9
@@ -0,0 +1,88 @@
+.\" -*- nroff -*-
+.\"
+.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Written by: John H. Baldwin <jhb@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 October 3, 2013
+.Dt VOP_ADVISE 9
+.Os
+.Sh NAME
+.Nm VOP_ADVISE
+.Nd apply advice about use of file data
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/vnode.h
+.Ft int
+.Fn VOP_ADVISE "struct vnode *vp" "off_t start" "off_t end" "int advice"
+.Sh DESCRIPTION
+This call applies advice for a range of a file's data.
+It is used to implement the
+.Xr posix_fadvise
+system call.
+.Pp
+Its arguments are:
+.Bl -tag -width offset
+.It Fa vp
+The vnode of the file.
+.It Fa start
+The start of the range of file data.
+.It Fa end
+The end of the range of file data.
+.It Fa advice
+The type of operation to apply to the file data.
+Possible values are:
+.Bl -tag -width POSIX_FADV_WILLNEED
+.It Dv POSIX_FADV_WILLNEED
+Initiate an asynchronous read of the file data if it is not already resident.
+.It Dv POSIX_FADV_DONTNEED
+Decrease the in-memory priority of clean file data or discard clean file data.
+.El
+.El
+.Pp
+If the
+.Fa start
+and
+.Fa end
+offsets are both zero,
+then the operation should be applied to the entire file.
+Note that this call is advisory only and may perform the requested
+operation on a subset of the requested range
+.Pq including not performing it at all
+and still return success.
+.Sh LOCKS
+The file should be unlocked on entry.
+.Sh RETURN VALUES
+Zero is returned if the call is successful, otherwise an appropriate
+error code is returned.
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er EINVAL
+An invalid value was given for
+.Fa advice .
+.El
+.Sh SEE ALSO
+.Xr vnode 9
diff --git a/share/man/man9/VOP_ALLOCATE.9 b/share/man/man9/VOP_ALLOCATE.9
new file mode 100644
index 00000000000..314410d3e68
--- /dev/null
+++ b/share/man/man9/VOP_ALLOCATE.9
@@ -0,0 +1,84 @@
+.\" -*- nroff -*-
+.\"
+.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Written by: John H. Baldwin <jhb@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 October 3, 2013
+.Dt VOP_ALLOCATE 9
+.Os
+.Sh NAME
+.Nm VOP_ALLOCATE
+.Nd allocate storage for a file
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/vnode.h
+.Ft int
+.Fn VOP_ALLOCATE "struct vnode *vp" "off_t *offset" "off_t *len"
+.Sh DESCRIPTION
+This call allocates storage for a range of offsets in a file.
+It is used to implement the
+.Xr posix_fallocate
+system call.
+.Pp
+Its arguments are:
+.Bl -tag -width offset
+.It Fa vp
+The vnode of the file.
+.It Fa offset
+The start of the range to allocate storage for in the file.
+.It Fa len
+The length of the range to allocate storage for in the file.
+.El
+.Pp
+The
+.Fa offset
+and
+.Fa len
+arguments are updated to reflect the portion of the range that
+still needs to be allocated on return.
+A partial allocation is considered a successful operation.
+The file's contents are not changed.
+.Sh LOCKS
+The file should be exclusively locked on entry and will still be locked on exit.
+.Sh RETURN VALUES
+Zero is returned if the call is successful, otherwise an appropriate
+error code is returned.
+.Sh ERRORS
+.Bl -tag -width Er
+.It Bq Er EFBIG
+An attempt was made to write a file that exceeds the process's file size
+limit or the maximum file size.
+.It Bq Er ENOSPC
+The file system is full.
+.It Bq Er EPERM
+An append-only flag is set on the file, but the caller is attempting to
+write before the current end of file.
+.El
+.Sh SEE ALSO
+.Xr vnode 9 ,
+.Xr VOP_READ 9 ,
+.Xr VOP_WRITE 9
diff --git a/share/man/man9/VOP_FSYNC.9 b/share/man/man9/VOP_FSYNC.9
index e457f846640..76e114ff609 100644
--- a/share/man/man9/VOP_FSYNC.9
+++ b/share/man/man9/VOP_FSYNC.9
@@ -65,15 +65,6 @@ Push data not written by file system syncer.
 .It Fa td
 The calling thread.
 .El
-.Pp
-The argument
-.Fa waitfor
-is either
-.Dv MNT_WAIT
-or
-.Dv MNT_NOWAIT
-and specifies whether or not the function should wait for the writes
-to finish before returning.
 .Sh LOCKS
 The file should be locked on entry.
 .Sh RETURN VALUES
diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9
index 659a40dc549..c0eb2e5381d 100644
--- a/share/man/man9/disk.9
+++ b/share/man/man9/disk.9
@@ -106,8 +106,6 @@ and may not be subsequently changed:
 Optional flags indicating to the storage framework what optional features
 or descriptions the storage device driver supports.
 Currently supported flags are
-.Dv DISKFLAG_NEEDSGIANT
-(maintained by device driver),
 .Dv DISKFLAG_OPEN
 (maintained by storage framework),
 .Dv DISKFLAG_CANDELETE
diff --git a/share/man/man9/firmware.9 b/share/man/man9/firmware.9
index 807099d50a7..48119213e23 100644
--- a/share/man/man9/firmware.9
+++ b/share/man/man9/firmware.9
@@ -254,8 +254,8 @@ IxNpeMicrocode.dat                      optional npe_fw                 \\
 .Pp
 Note that generating the firmware modules in this way requires
 the availability of the following tools:
-.Xr awk ,
-.Xr make ,
+.Xr awk 1 ,
+.Xr make 1 ,
 the compiler and the linker.
 .Sh SEE ALSO
 .Xr kld 4 ,
diff --git a/share/man/man9/getenv.9 b/share/man/man9/getenv.9
new file mode 100644
index 00000000000..a20c5e81e31
--- /dev/null
+++ b/share/man/man9/getenv.9
@@ -0,0 +1,210 @@
+.\" -*- nroff -*-
+.\"
+.\" Copyright (c) 2013 Advanced Computing Technologies LLC
+.\" Written by: John H. Baldwin <jhb@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 October 22, 2013
+.Dt GETENV 9
+.Os
+.Sh NAME
+.Nm freeenv ,
+.Nm getenv ,
+.Nm getenv_int ,
+.Nm getenv_long ,
+.Nm getenv_string ,
+.Nm getenv_quad ,
+.Nm getenv_uint ,
+.Nm getenv_ulong ,
+.Nm setenv ,
+.Nm testenv ,
+.Nm unsetenv
+.Nd kernel environment variable functions
+.Sh SYNOPSIS
+.In sys/param.h
+.In sys/systm.h
+.Ft void
+.Fn freeenv "char *env"
+.Ft char *
+.Fn getenv "const char *name"
+.Ft int
+.Fn getenv_int "const char *name" "int *data"
+.Ft int
+.Fn getenv_long "const char *name" "long *data"
+.Ft int
+.Fn getenv_string "const char *name" "char *data" "int size"
+.Ft int
+.Fn getenv_quad "const char *name" "quad_t *data"
+.Ft int
+.Fn getenv_uint "const char *name" "unsigned int *data"
+.Ft int
+.Fn getenv_ulong "const char *name" "unsigned long *data"
+.Ft int
+.Fn setenv "const char *name" "const char *value"
+.Ft int
+.Fn testenv "const char *name"
+.Ft int
+.Fn unsetenv "const char *name"
+.Sh DESCRIPTION
+These functions set, unset, fetch, and parse variables from the kernel's
+environment.
+.Pp
+The
+.Fn getenv
+function obtains the current value of the kernel environment variable
+.Fa name
+and returns a pointer to the string value.
+The caller should not modify the string pointed to by the return value.
+.Pp
+The
+.Fn getenv
+function may allocate temporary storage,
+so the
+.Fn freeenv
+function must be called to release any allocated resources when the value
+returned by
+.Fn getenv
+is no longer needed.
+The
+.Fa env
+argument passed to
+.Fn freeenv
+is the pointer returned by the earlier call to
+.Fn getenv .
+.Pp
+The
+.Fn setenv
+function inserts or resets the kernel environment variable
+.Fa name
+to
+.Fa value .
+If the variable
+.Fa name
+already exists,
+its value is replaced.
+This function can fail if an internal limit on the number of environment
+variables is exceeded.
+.Pp
+The
+.Fn unsetenv
+function deletes the kernel environment variable
+.Fa name .
+.Pp
+The
+.Fn testenv
+function is used to determine if a kernel environment variable exists.
+It returns a non-zero value if the variable
+.Fa name
+exists and zero if it does not.
+.Pp
+The
+.Fn getenv_int ,
+.Fn getenv_long ,
+.Fn getenv_quad ,
+.Fn getenv_uint ,
+and
+.Fn getenv_ulong
+functions look for a kernel environment variable
+.Fa name
+and parse it as a signed integer,
+long integer,
+signed 64-bit integer,
+unsigned integer,
+or an unsigned long integer,
+respectively.
+These functions fail and return zero if
+.Fa name
+does not exist or if any invalid characters are present in its value.
+On success,
+these function store the parsed value in the integer variable pointed to
+by
+.Fa data .
+If the parsed value overflows the integer type,
+a truncated value is stored in
+.Fa data
+and zero is returned.
+If the value begins with a prefix of
+.Dq 0x
+it is interpreted as hexadecimal.
+If it begins with a prefix of
+.Dq 0
+it is interpreted as octal.
+Otherwise,
+the value is interpreted as decimal.
+The value may contain a single character suffix specifying a unit for
+the value.
+The interpreted value is multipled by the unit's magnitude before being returned.
+The following unit suffixes are supported:
+.Bl -column -offset indent ".Sy Unit" ".Sy Magnitude"
+.It Sy Unit Ta Sy Magnitude
+.It k Ta 2^10
+.It m Ta 2^20
+.It g Ta 2^30
+.It t Ta 2^40
+.El
+.Pp
+The
+.Fn getenv_string
+function stores a copy of the kernel environment variable
+.Fa name
+in the buffer described by
+.Fa data
+and
+.Fa size.
+If the variable does not exist,
+zero is returned.
+If the variable exists,
+up to
+.Fa size - 1
+characters of it's value are copied to the buffer pointed to by
+.Fa data
+followed by a null character and a non-zero value is returned.
+.Sh RETURN VALUES
+The
+.Fn getenv
+function returns a pointer to an environment variable's value on success or
+.Dv NULL
+if the variable does not exist.
+.Pp
+The
+.Fn setenv
+and
+.Fn unsetenv
+functions return zero on success and -1 on failure.
+.Pp
+The
+.Fn testenv
+function returns zero if the specified environment variable does not exist and
+a non-zero value if it does exist.
+The
+.Fn getenv_int ,
+.Fn getenv_long ,
+.Fn getenv_string ,
+.Fn getenv_quad ,
+.Fn getenv_uint ,
+and
+.Fn getenv_ulong
+functions return a non-zero value on success and zero on failure.
diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9
index 8cb436f75ea..f1d3e471bc6 100644
--- a/share/man/man9/ifnet.9
+++ b/share/man/man9/ifnet.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 26, 2013
+.Dd November 5, 2013
 .Dt IFNET 9
 .Os
 .Sh NAME
@@ -583,14 +583,6 @@ The interface is a loopback device.
 The interface is point-to-point;
 .Dq broadcast
 address is actually the address of the other end.
-.It Dv IFF_SMART
-.Aq S*
-The interface manages its own routes, rather than using the generic
-code in
-.Fn if_up
-and
-.Fn if_down .
-This is probably useful for serial lines.
 .It Dv IFF_DRV_RUNNING
 .Aq D*
 The interface has been configured and dynamic resources were
@@ -1284,9 +1276,8 @@ further interpretation.
 The following commands are handled by
 .Fn ifioctl :
 .Pp
-.Bl -tag -width ".Dv OSIOCGIFNETMASK" -offset indent -compact
+.Bl -tag -width ".Dv SIOCGIFNETMASK" -offset indent -compact
 .It Dv SIOCGIFCONF
-.It Dv OSIOCGIFCONF
 Get interface configuration.
 (No call-down to driver.)
 .Pp
@@ -1380,17 +1371,6 @@ function is called to perform the operation; qq.v.
 The socket's protocol control routine is called to implement the
 requested action.
 .Pp
-.It Dv OSIOCGIFADDR
-.It Dv OSIOCGIFDSTADDR
-.It Dv OSIOCGIFBRDADDR
-.It Dv OSIOCGIFNETMASK
-The socket's protocol control routine is called to implement the
-requested action.
-On return,
-.Vt sockaddr
-structures are converted into old-style (no
-.Va sa_len
-member).
 .El
 .El
 .Pp
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index fd608d40ecb..cb77686140b 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 16, 2011
+.Dd October 6, 2013
 .Dt LOCK 9
 .Os
 .Sh NAME
@@ -164,11 +164,17 @@ If an exclusive lock has been recursed, the system will
 .Xr panic 9 .
 .It Dv LK_UPGRADE
 Upgrade a shared lock to an exclusive lock.
-If this call fails, the shared lock is lost.
+If this call fails, the shared lock is lost, even if the
+.Dv LK_NOWAIT
+flag is specified.
 During the upgrade, the shared lock could
 be temporarily dropped.
 Attempts to upgrade an exclusive lock will cause a
 .Xr panic 9 .
+.It Dv LK_TRYUPGRADE
+Try to upgrade a shared lock to an exclusive lock.
+The failure to upgrade does not result in the dropping
+of the shared lock ownership.
 .It Dv LK_RELEASE
 Release the lock.
 Releasing a lock that is not held can cause a
@@ -333,7 +339,9 @@ fail if:
 was requested and another thread had already requested a lock upgrade.
 .It Bq Er EBUSY
 .Dv LK_NOWAIT
-was set, and a sleep would have been required.
+was set, and a sleep would have been required, or
+.Dv LK_TRYUPGRADE
+operation was not able to upgrade the lock.
 .It Bq Er ENOLCK
 .Dv LK_SLEEPFAIL
 was set and
diff --git a/share/man/man9/rtentry.9 b/share/man/man9/rtentry.9
index d7e6953f5f8..38b6fd85d77 100644
--- a/share/man/man9/rtentry.9
+++ b/share/man/man9/rtentry.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 11, 2008
+.Dd October 16, 2013
 .Dt RTENTRY 9
 .Os
 .Sh NAME
@@ -154,8 +154,7 @@ Protocol-specific.
 .It Dv RTF_PRCLONING
 This flag is obsolete and simply ignored by facility.
 .It Dv RTF_PINNED
-(Reserved for future use to indicate routes which are not to be
-modified by a routing protocol.)
+Indicates that this route is immutable to a routing protocol.
 .It Dv RTF_LOCAL
 Indicates that the destination of this route is an address configured
 as belonging to this system.
diff --git a/share/man/man9/vm_page_grab.9 b/share/man/man9/vm_page_grab.9
index cfab9def326..ff9aae902de 100644
--- a/share/man/man9/vm_page_grab.9
+++ b/share/man/man9/vm_page_grab.9
@@ -64,7 +64,7 @@ function sleeps for any reason, the object lock is temporary dropped.
 The
 .Fn vm_page_grab
 supports all of the flags supported by
-.Xr vm_page_alloc .
+.Xr vm_page_alloc 9 .
 In addition,
 .Fn vm_page_grab
 supports the following flags:
diff --git a/share/man/man9/vnode.9 b/share/man/man9/vnode.9
index eba208f0638..652d9728ac5 100644
--- a/share/man/man9/vnode.9
+++ b/share/man/man9/vnode.9
@@ -163,7 +163,9 @@ intertwining of VM Objects and Vnodes.
 .Xr malloc 9 ,
 .Xr VOP_ACCESS 9 ,
 .Xr VOP_ACLCHECK 9 ,
+.Xr VOP_ADVISE 9 ,
 .Xr VOP_ADVLOCK 9 ,
+.Xr VOP_ALLOCATE 9 ,
 .Xr VOP_ATTRIB 9 ,
 .Xr VOP_BWRITE 9 ,
 .Xr VOP_CREATE 9 ,
diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree
index 7d0ae943808..b02351e0cbf 100644
--- a/share/misc/bsd-family-tree
+++ b/share/misc/bsd-family-tree
@@ -270,16 +270,24 @@ FreeBSD 5.2           |      |                 |                       |
  |     |       |      |      | |  \            |                       |
  |     |       |      |      | |   NetBSD      |                       |
  |     |       |      |      | |    6.0.1      |                       |
- |     |       |      |      | |      |   OpenBSD 5.3          DragonFly 3.4.1
+ |     |       |      |      | |      |        |                       |
  |     |       |      |      | |   NetBSD      |                       |
  |     |       |      |      | |    6.0.2      |                       |
+ |     |       |      |      | |      |   OpenBSD 5.3          DragonFly 3.4.1
+ |     |       |      |      | |   NetBSD      |                       |
+ |     |       |      |      | |    6.0.3      |                       |
  |     |       |      |      | |               |                       |
- |     |       |      |      |  `-NetBSD 6.1   |                       |
- |     |    FreeBSD   |      |                 |                       |
- |     |      8.4     |      |                 |                       |
- |     |              |      |                 |                       |
- |  FreeBSD           |      |                 |                       |
- |    9.2             |      |                 |                       |
+ |     |       |      |      | |`-NetBSD 6.1   |                       |
+ |     |    FreeBSD   |      |       |         |                       |
+ |     |      8.4     |      |    NetBSD 6.1.1 |                       |
+ |     |              |      |       |         |                       |
+ |  FreeBSD           |      |    NetBSD 6.1.2 |                       |
+ |    9.2          Mac OS X  |                 |                       |
+ |                   10.9    |            OpenBSD 5.4                  |
+ |                    |      |                 |               DragonFly 3.6.0
+ |                    |      |                 |                       |
+ |                    |      |                 |                       |
+ |                    |      |                 |                       |
  |                    |      |                 |                       |
 FreeBSD 10 -current   |  NetBSD -current  OpenBSD -current             |
  |                    |      |                 |                       |
@@ -588,9 +596,15 @@ OpenBSD 5.3		2013-05-01 [OBD]
 NetBSD 6.0.2		2013-05-18 [NBD] (security/critical release)
 NetBSD 6.1		2013-05-18 [NBD]
 FreeBSD 8.4		2013-06-07 [FBD]
+NetBSD 6.1.1		2013-08-22 [NBD]
 NetBSD 5.1.3		2013-09-29 [NBD]
 NetBSD 5.2.1		2013-09-29 [NBD]
 FreeBSD 9.2		2013-09-30 [FBD]
+NetBSD 6.0.3		2013-09-30 [NBD]
+NetBSD 6.1.2		2013-09-30 [NBD]
+Mac OS X 10.9		2013-10-22 [APL]
+OpenBSD 5.4		2013-11-01 [OBD]
+DragonFly 3.6.0 	2013-11-25 [DFB]
 
 Bibliography
 ------------------------
diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot
index c727cd72413..6367237cc37 100644
--- a/share/misc/committers-ports.dot
+++ b/share/misc/committers-ports.dot
@@ -49,6 +49,7 @@ ak [label="Alex Kozlov\nak@FreeBSD.org\n2012/02/29"]
 ale [label="Alex Dupre\nale@FreeBSD.org\n2004/01/12"]
 alepulver [label="Alejandro Pulver\nalepulver@FreeBSD.org\n2006/04/01"]
 alexbl [label="Alexander Botero-Lowry\nalexbl@FreeBSD.org\n2006/09/11"]
+alexey [label="Alexey Degtyarev\nalexey@FreeBSD.org\n2013/11/09"]
 amdmi3 [label="Dmitry Marakasov\namdmi3@FreeBSD.org\n2008/06/19"]
 anray [label="Andrey Slusar\nanray@FreeBSD.org\n2005/12/11"]
 antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2013/04/03"]
@@ -207,6 +208,7 @@ tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15"]
 tota [label="TAKATSU Tomonari\ntota@FreeBSD.org\n2009/03/30"]
 trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12"]
 trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/06"]
+trociny [label="Mikolaj Golub\ntrociny@FreeBSD.org\n2013/10/17"]
 uqs [label="Ulrich Spoerlein\nuqs@FreeBSD.org\n2012/01/19"]
 vd [label="Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"]
 vg [label="Veniamin Gvozdikov\nvg@FreeBSD.org\n2013/06/11"]
@@ -246,6 +248,7 @@ avilla -> jhale
 avilla -> rakuco
 
 bdrewery -> dbn
+bdrewery -> trociny
 
 bapt -> bdrewery
 bapt -> eadler
@@ -534,6 +537,7 @@ wen -> cs
 wen -> culot
 wen -> pawel
 
+wg -> alexey
 wg -> danilo
 wg -> nemysis
 
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index a273cf9b3b9..e352a9c24a0 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -145,6 +145,7 @@ dumbbell [label="Jean-Sebastien Pedron\ndumbbell@FreeBSD.org\n2004/11/29"]
 dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"]
 eadler [label="Eitan Adler\neadler@FreeBSD.org\n2012/01/18"]
 ed [label="Ed Schouten\ned@FreeBSD.org\n2008/05/22"]
+edavis [label="Eric Davis\nedavis@FreeBSD.org\n2013/10/09"]
 edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2007/06/25"]
 eivind [label="Eivind Eklund\neivind@FreeBSD.org\n1997/02/02"]
 emaste [label="Ed Maste\nemaste@FreeBSD.org\n2005/10/04"]
@@ -189,6 +190,7 @@ jkoshy [label="A. Joseph Koshy\njkoshy@FreeBSD.org\n1998/05/13"]
 jlh [label="Jeremie Le Hen\njlh@FreeBSD.org\n2012/04/22"]
 jls [label="Jordan Sissel\njls@FreeBSD.org\n2006/12/06"]
 jmg [label="John-Mark Gurney\njmg@FreeBSD.org\n1997/02/13"]
+jmmv [label="Julio Merino\njmmv@FreeBSD.org\n2013/11/02"]
 joerg [label="Joerg Wunsch\njoerg@FreeBSD.org\n1993/11/14"]
 jon [label="Jonathan Chen\njon@FreeBSD.org\n2000/10/17"]
 jonathan [label="Jonathan Anderson\njonathan@FreeBSD.org\n2010/10/07"]
@@ -221,6 +223,7 @@ mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"]
 mjg [label="Mateusz Guzik\nmjg@FreeBSD.org\n2012/06/04"]
 mlaier [label="Max Laier\nmlaier@FreeBSD.org\n2004/02/10"]
 monthadar [label="Monthadar Al Jaberi\nmonthadar@FreeBSD.org\n2012/04/02"]
+mp [label="Mark Peek\nmp@FreeBSD.org\n2001/07/27"]
 mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"]
 neel [label="Neel Natu\nneel@FreeBSD.org\n2009/09/20"]
 netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2005/03/31"]
@@ -248,6 +251,7 @@ rmacklem [label="Rick Macklem\nrmacklem@FreeBSD.org\n2009/03/27"]
 rmh [label="Robert Millan\nrmh@FreeBSD.org\n2011/09/18"]
 rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/09/15"]
 roberto [label="Ollivier Robert\nroberto@FreeBSD.org\n1995/02/22"]
+royger [label="Roger Pau Monne\nroyger@FreeBSD.org\n2013/11/26"]
 rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2007/09/25"]
 rrs [label="Randall R Stewart\nrrs@FreeBSD.org\n2007/02/08"]
 rse [label="Ralf S. Engelschall\nrse@FreeBSD.org\n1997/07/31"]
@@ -260,6 +264,7 @@ sbruno [label="Sean Bruno\nsbruno@FreeBSD.org\n2008/08/02"]
 scf [label="Sean C. Farley\nscf@FreeBSD.org\n2007/06/24"]
 schweikh [label="Jens Schweikhardt\nschweikh@FreeBSD.org\n2001/04/06"]
 scottl [label="Scott Long\nscottl@FreeBSD.org\n2000/09/28"]
+se [label="Stefan Esser\nse@FreeBSD.org\n1994/08/26"]
 sephe [label="Sepherosa Ziehau\nsephe@FreeBSD.org\n2007/03/28"]
 sepotvin [label="Stephane E. Potvin\nsepotvin@FreeBSD.org\n2007/02/15"]
 simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2006/03/07"]
@@ -413,6 +418,7 @@ gavin -> versus
 
 gibbs -> mjacob
 gibbs -> njl
+gibbs -> royger
 
 glebius -> mav
 
@@ -510,6 +516,7 @@ julian -> davidxu
 julian -> archie
 julian -> adrian
 julian -> zec
+julian -> mp
 
 kan -> kib
 
@@ -606,6 +613,7 @@ rmacklem -> jwd
 rpaulo -> avg
 rpaulo -> bschmidt
 rpaulo -> dim
+rpaulo -> jmmv
 
 rrs -> brucec
 rrs -> jchandra
diff --git a/share/mk/Makefile b/share/mk/Makefile
index 2110b26ba3d..d854cca705b 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -43,8 +43,9 @@ FILES=	\
 NO_OBJ=
 FILESDIR=	${BINDIR}/mk
 
-.if ${MK_ATF} != "no"
+.if ${MK_TESTS} != "no"
 FILES+=	atf.test.mk
+FILES+=	plain.test.mk
 .endif
 
 .include <bsd.prog.mk>
diff --git a/share/mk/atf.test.mk b/share/mk/atf.test.mk
index 7e19087a4ff..3ffb2cb9d85 100644
--- a/share/mk/atf.test.mk
+++ b/share/mk/atf.test.mk
@@ -1,49 +1,99 @@
-# $NetBSD$
 # $FreeBSD$
 #
+# Logic to build and install ATF test programs; i.e. test programs linked
+# against the ATF libraries.
 
 .include <bsd.init.mk>
 
-ATF_TESTS:=
+# List of C, C++ and shell test programs to build.
+#
+# Programs listed here are built using PROGS, PROGS_CXX and SCRIPTS,
+# respectively, from bsd.prog.mk.  However, the build rules are tweaked to
+# require the ATF libraries.
+#
+# Test programs registered in this manner are set to be installed into TESTSDIR
+# (which should be overriden by the Makefile) and are not required to provide a
+# manpage.
+ATF_TESTS_C?=
+ATF_TESTS_CXX?=
+ATF_TESTS_SH?=
 
-.if make(*test)
-TESTSDIR?= .
-.endif
+# Whether to allow using the deprecated ATF tools or not.
+#
+# If 'yes', this file will generate Atffiles when requested and will also
+# support using the deprecated atf-run tool to execute the tests.
+ALLOW_DEPRECATED_ATF_TOOLS?= no
 
-.if defined(ATF_TESTS_SUBDIRS)
-# Only visit subdirs when building, etc because ATF does this it on its own.
-.if !make(atf-test)
-SUBDIR+= ${ATF_TESTS_SUBDIRS}
-.endif
-ATF_TESTS+= ${ATF_TESTS_SUBDIRS}
+# Knob to control the handling of the Atffile for this Makefile.
+#
+# If 'yes', an Atffile exists in the source tree and is installed into
+# TESTSDIR.
+#
+# If 'auto', an Atffile is automatically generated based on the list of test
+# programs built by the Makefile and is installed into TESTSDIR.  This is the
+# default and is sufficient in the majority of the cases.
+#
+# If 'no', no Atffile is installed.
+ATFFILE?= auto
 
-.include <bsd.subdir.mk>
-.endif
+# Path to the prefix of the installed ATF tools, if any.
+#
+# If atf-run and atf-report are installed from ports, we automatically define a
+# realtest target below to run the tests using these tools.  The tools are
+# searched for in the hierarchy specified by this variable.
+ATF_PREFIX?= /usr/local
 
-.if defined(TESTS_C)
-ATF_TESTS+= ${TESTS_C}
-.for _T in ${TESTS_C}
+# C compiler passed to ATF tests that need to build code.
+ATF_BUILD_CC?= ${DESTDIR}/usr/bin/cc
+TESTS_ENV+= ATF_BUILD_CC=${ATF_BUILD_CC}
+
+# C preprocessor passed to ATF tests that need to build code.
+ATF_BUILD_CPP?= ${DESTDIR}/usr/bin/cpp
+TESTS_ENV+= ATF_BUILD_CPP=${ATF_BUILD_CPP}
+
+# C++ compiler passed to ATF tests that need to build code.
+ATF_BUILD_CXX?= ${DESTDIR}/usr/bin/c++
+TESTS_ENV+= ATF_BUILD_CXX=${ATF_BUILD_CXX}
+
+# Shell interpreter used to run atf-sh(1) based tests.
+ATF_SHELL?= ${DESTDIR}/bin/sh
+TESTS_ENV+= ATF_SHELL=${ATF_SHELL}
+
+.if !empty(ATF_TESTS_C)
+PROGS+= ${ATF_TESTS_C}
+_TESTS+= ${ATF_TESTS_C}
+.for _T in ${ATF_TESTS_C}
+BINDIR.${_T}= ${TESTSDIR}
+MAN.${_T}?= # empty
 SRCS.${_T}?= ${_T}.c
 DPADD.${_T}+= ${LIBATF_C}
 LDADD.${_T}+= -latf-c
+TEST_INTERFACE.${_T}= atf
 .endfor
 .endif
 
-.if defined(TESTS_CXX)
-ATF_TESTS+= ${TESTS_CXX}
-.for _T in ${TESTS_CXX}
+.if !empty(ATF_TESTS_CXX)
+PROGS_CXX+= ${ATF_TESTS_CXX}
+_TESTS+= ${ATF_TESTS_CXX}
+.for _T in ${ATF_TESTS_CXX}
+BINDIR.${_T}= ${TESTSDIR}
+MAN.${_T}?= # empty
 SRCS.${_T}?= ${_T}${CXX_SUFFIX:U.cc}
 DPADD.${_T}+= ${LIBATF_CXX} ${LIBATF_C}
 LDADD.${_T}+= -latf-c++ -latf-c
+TEST_INTERFACE.${_T}= atf
 .endfor
 .endif
 
-.if defined(TESTS_SH)
-ATF_TESTS+= ${TESTS_SH}
-.for _T in ${TESTS_SH}
+.if !empty(ATF_TESTS_SH)
+SCRIPTS+= ${ATF_TESTS_SH}
+_TESTS+= ${ATF_TESTS_SH}
+.for _T in ${ATF_TESTS_SH}
+SCRIPTSDIR_${_T}= ${TESTSDIR}
+TEST_INTERFACE.${_T}= atf
 CLEANFILES+= ${_T} ${_T}.tmp
-TESTS_SH_SRC_${_T}?= ${_T}.sh
-${_T}: ${TESTS_SH_SRC_${_T}}
+ATF_TESTS_SH_SRC_${_T}?= ${_T}.sh
+${_T}: ${ATF_TESTS_SH_SRC_${_T}}
 	echo '#! /usr/bin/atf-sh' > ${.TARGET}.tmp
 	cat ${.ALLSRC} >> ${.TARGET}.tmp
 	chmod +x ${.TARGET}.tmp
@@ -51,7 +101,7 @@ ${_T}: ${TESTS_SH_SRC_${_T}}
 .endfor
 .endif
 
-ATFFILE?= auto
+.if ${ALLOW_DEPRECATED_ATF_TOOLS} != "no"
 
 .if ${ATFFILE:tl} != "no"
 FILES+=	Atffile
@@ -65,72 +115,38 @@ Atffile: Makefile
 	echo; \
 	echo '# Automatically generated by atf-test.mk.'; \
 	echo; \
-	echo 'prop: test-suite = "'`uname -o`'"'; \
+	echo 'prop: test-suite = "'${TESTSUITE}'"'; \
 	echo; \
-	for tp in ${ATF_TESTS}; do \
+	for tp in ${ATF_TESTS_C} ${ATF_TESTS_CXX} ${ATF_TESTS_SH} \
+	    ${TESTS_SUBDIRS}; \
+	do \
 	    echo "tp: $${tp}"; \
 	done; } >Atffile.tmp
 	@mv Atffile.tmp Atffile
 .endif
 .endif
 
-# Generate support variables for atf-test.
+ATF_REPORT?= ${ATF_PREFIX}/bin/atf-report
+ATF_RUN?= ${ATF_PREFIX}/bin/atf-run
+.if exists(${ATF_RUN}) && exists(${ATF_REPORT})
+# Definition of the "make test" target and supporting variables.
 #
-# atf-test can only work for native builds, i.e. a build host of a particular
-# OS building a release for the same OS version and architecture. The target
-# runs ATF, which is on the build host, and the tests execute code built for
-# the target host.
+# This target, by necessity, can only work for native builds (i.e. a freeBSD
+# host building a release for the same system).  The target runs ATF, which is
+# not in the toolchain, and the tests execute code built for the target host.
 #
 # Due to the dependencies of the binaries built by the source tree and how they
 # are used by tests, it is highly possible for a execution of "make test" to
 # report bogus results unless the new binaries are put in place.
-
-# XXX (gcooper): Executing ATF from outside the source tree is improper; it
-# should be built as part of the OS toolchain build for the host OS and
-# executed from there.
-ATF_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin
-TESTS_ENV+= PATH=${ATF_PATH:ts:}:${PATH}
-
-ATF_BUILD_CC?= ${DESTDIR}/usr/bin/cc
-ATF_BUILD_CPP?= ${DESTDIR}/usr/bin/cpp
-ATF_BUILD_CXX?= ${DESTDIR}/usr/bin/c++
-ATF_CONFDIR?= ${DESTDIR}/etc
-ATF_INCLUDEDIR?= ${DESTDIR}/usr/include
-ATF_LIBDIR?= ${DESTDIR}/usr/lib
-ATF_LIBEXECDIR?= ${DESTDIR}/usr/libexec
-ATF_PKGDATADIR?= ${DESTDIR}/usr/share/atf
-ATF_SHELL?= ${DESTDIR}/bin/sh
-LD_LIBRARY_PATH?= ${TESTS_LD_LIBRARY_PATH:tW:S/ /:/g}
-
-ATF_ENV_VARS= \
-	ATF_BUILD_CC \
-	ATF_BUILD_CPP \
-	ATF_BUILD_CXX \
-	ATF_CONFDIR \
-	ATF_INCLUDEDIR \
-	ATF_LIBDIR \
-	ATF_LIBEXECDIR \
-	ATF_PKGDATADIR \
-	ATF_SHELL \
-
-.for v in ${ATF_ENV_VARS}
-.if !empty($v)
-TESTS_ENV+= $v=${$v}
-.endif
-.endfor
-
 _TESTS_FIFO= ${.OBJDIR}/atf-run.fifo
 _TESTS_LOG= ${.OBJDIR}/atf-run.log
 CLEANFILES+= ${_TESTS_FIFO} ${_TESTS_LOG}
-
-ATF_BIN?= ${DESTDIR}/usr/bin
-ATF_REPORT?= ${ATF_BIN}/atf-report
-ATF_RUN?= ${ATF_BIN}/atf-run
-
-.PHONY: realtest
-realtest:
-.if defined(TESTSDIR)
+realtest: .PHONY
 	@set -e; \
+	if [ -z "${TESTSDIR}" ]; then \
+	    echo "*** No TESTSDIR defined; nothing to do."; \
+	    exit 0; \
+	fi; \
 	cd ${DESTDIR}${TESTSDIR}; \
 	rm -f ${_TESTS_FIFO}; \
 	mkfifo ${_TESTS_FIFO}; \
@@ -142,7 +158,11 @@ realtest:
 	rm -f ${_TESTS_FIFO}; \
 	echo; \
 	echo "*** The verbatim output of atf-run has been saved to ${_TESTS_LOG}"; \
+	echo "***"; \
+	echo "*** WARNING: atf-run is deprecated; please install kyua instead"; \
 	exit $${result}
 .endif
 
+.endif
+
 .include <bsd.test.mk>
diff --git a/share/mk/bsd.files.mk b/share/mk/bsd.files.mk
index 240f958f1a9..2397005e947 100644
--- a/share/mk/bsd.files.mk
+++ b/share/mk/bsd.files.mk
@@ -14,9 +14,9 @@ buildfiles: ${${group}}
 
 all: buildfiles
 
-.if !target(installfiles)
 .for group in ${FILESGROUPS}
 .if defined(${group}) && !empty(${group})
+installfiles: installfiles-${group}
 
 ${group}OWN?=	${SHAREOWN}
 ${group}GRP?=	${SHAREGRP}
@@ -37,7 +37,7 @@ ${group}NAME_${file:T}?=	${${group}NAME}
 .else
 ${group}NAME_${file:T}?=	${file:T}
 .endif
-installfiles: _${group}INS_${file:T}
+installfiles-${group}: _${group}INS_${file:T}
 _${group}INS_${file:T}: ${file}
 	${INSTALL} -o ${${group}OWN_${.ALLSRC:T}} \
 	    -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
@@ -48,7 +48,7 @@ _${group}FILES+= ${file}
 .endif
 .endfor
 .if !empty(_${group}FILES)
-installfiles: _${group}INS
+installfiles-${group}: _${group}INS
 _${group}INS: ${_${group}FILES}
 .if defined(${group}NAME)
 	${INSTALL} -o ${${group}OWN} -g ${${group}GRP} \
@@ -63,7 +63,5 @@ _${group}INS: ${_${group}FILES}
 .endif # defined(${group}) && !empty(${group})
 .endfor
 
-.endif # !target(installfiles)
-
 realinstall: installfiles
 .ORDER: beforeinstall installfiles
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 8ef6e7a9f13..4f32e590fd6 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -21,7 +21,6 @@ LIBAVL?=	${DESTDIR}${LIBDIR}/libavl.a
 LIBBEGEMOT?=	${DESTDIR}${LIBDIR}/libbegemot.a
 LIBBLUETOOTH?=	${DESTDIR}${LIBDIR}/libbluetooth.a
 LIBBSDXML?=	${DESTDIR}${LIBDIR}/libbsdxml.a
-LIBBSDYML?=	${DESTDIR}${LIBDIR}/libbsdyml.a
 LIBBSM?=	${DESTDIR}${LIBDIR}/libbsm.a
 LIBBSNMP?=	${DESTDIR}${LIBDIR}/libbsnmp.a
 LIBBZ2?=	${DESTDIR}${LIBDIR}/libbz2.a
@@ -33,6 +32,8 @@ LIBC?=		${DESTDIR}${LIBDIR}/libc.a
 LIBC_PIC?=	${DESTDIR}${LIBDIR}/libc_pic.a
 LIBCALENDAR?=	${DESTDIR}${LIBDIR}/libcalendar.a
 LIBCAM?=	${DESTDIR}${LIBDIR}/libcam.a
+LIBCAPSICUM?=	${DESTDIR}${LIBDIR}/libcapsicum.a
+LIBCASPER?=	${DESTDIR}${LIBDIR}/libcasper.a
 LIBCOM_ERR?=	${DESTDIR}${LIBDIR}/libcom_err.a
 LIBCOMPAT?=	${DESTDIR}${LIBDIR}/libcompat.a
 LIBCRYPT?=	${DESTDIR}${LIBDIR}/libcrypt.a
@@ -98,6 +99,7 @@ LIBNCURSES?=	${DESTDIR}${LIBDIR}/libncurses.a
 LIBNCURSESW?=	${DESTDIR}${LIBDIR}/libncursesw.a
 LIBNETGRAPH?=	${DESTDIR}${LIBDIR}/libnetgraph.a
 LIBNGATM?=	${DESTDIR}${LIBDIR}/libngatm.a
+LIBNV?=		${DESTDIR}${LIBDIR}/libnv.a
 LIBNVPAIR?=	${DESTDIR}${LIBDIR}/libnvpair.a
 LIBOPIE?=	${DESTDIR}${LIBDIR}/libopie.a
 
@@ -127,6 +129,7 @@ MINUSLPAM+=	-lypclnt
 
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
+LIBPJDLOG?=	${DESTDIR}${LIBDIR}/libpjdlog.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
 LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
 LIBPROCSTAT?=	${DESTDIR}${LIBDIR}/libprocstat.a
@@ -166,6 +169,7 @@ LIBWIND?=	${DESTDIR}${LIBDIR}/libwind.a
 LIBWRAP?=	${DESTDIR}${LIBDIR}/libwrap.a
 LIBXPG4?=	${DESTDIR}${LIBDIR}/libxpg4.a
 LIBY?=		${DESTDIR}${LIBDIR}/liby.a
+LIBYAML?=	${DESTDIR}${LIBPRIVATEDIR}/libyaml.a
 LIBYPCLNT?=	${DESTDIR}${LIBDIR}/libypclnt.a
 LIBZ?=		${DESTDIR}${LIBDIR}/libz.a
 LIBZFS?=	${DESTDIR}${LIBDIR}/libzfs.a
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index a1b6c4412c8..c99ab84a72f 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -264,6 +264,7 @@ __DEFAULT_YES_OPTIONS = \
     BZIP2 \
     CALENDAR \
     CAPSICUM \
+    CASPER \
     CDDL \
     CPP \
     CROSS_COMPILER \
@@ -320,6 +321,7 @@ __DEFAULT_YES_OPTIONS = \
     NIS \
     NLS \
     NLS_CATALOGS \
+    NMTREE \
     NS_CACHING \
     NTP \
     OPENSSH \
@@ -367,16 +369,14 @@ __DEFAULT_NO_OPTIONS = \
     DEBUG_FILES \
     GPL_DTC \
     HESIOD \
-    LIBICONV_COMPAT \
     INSTALL_AS_USER \
     LLDB \
-    NMTREE \
     NAND \
     OFED \
     OPENSSH_NONE_CIPHER \
-    PKGTOOLS \
     SHARED_TOOLCHAIN \
     SVN \
+    TESTS \
     USB_GADGET_EXAMPLES
 
 #
@@ -491,10 +491,6 @@ MK_${var}:=	no
 MK_LIBTHR:=	no
 .endif
 
-.if ${MK_ICONV} == "no"
-MK_LIBICONV_COMPAT:=	no
-.endif
-
 .if ${MK_LDNS} == "no"
 MK_LDNS_UTILS:=	no
 MK_UNBOUND:= no
@@ -554,13 +550,26 @@ MK_GDB:=	no
 .if ${MK_CLANG} == "no"
 MK_CLANG_EXTRAS:= no
 MK_CLANG_FULL:= no
-MK_CLANG_IS_CC:= no
 .endif
 
 .if ${MK_CLANG_IS_CC} == "no"
 MK_LLDB:= no
 .endif
 
+.if defined(NO_TESTS)
+# This should be handled above along the handling of all other NO_*  options.
+# However, the above is broken when WITH_*=yes are passed to make(1) as
+# command line arguments.  See PR bin/183762.
+#
+# Because the TESTS option is new and it will default to yes, it's likely
+# that people will pass WITHOUT_TESTS=yes to make(1) directly and get a broken
+# build.  So, just in case, it's better to explicitly handle this case here.
+#
+# TODO(jmmv): Either fix make to allow us putting this override where it
+# belongs above or fix this file to cope with the make bug.
+MK_TESTS:= no
+.endif
+
 #
 # Set defaults for the MK_*_SUPPORT variables.
 #
@@ -665,4 +674,8 @@ $xGRP=	${_gid}
 
 .endif # !_WITHOUT_SRCCONF
 
+# Pointer to the top directory into which tests are installed.  Should not be
+# overriden by Makefiles, but the user may choose to set this in src.conf(5).
+TESTSBASE?= /usr/tests
+
 .endif	# !target(__<bsd.own.mk>__)
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 22ddfb53843..2c196d612c1 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -172,7 +172,7 @@ _EXTRADEPEND:
 .endif
 .else
 	echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE}
-.if defined(PROG_CXX)
+.if defined(PROG_CXX) && !defined(EARLY_BUILD)
 .if ${MK_CLANG_IS_CC} != "no" && empty(CXXFLAGS:M-stdlib=libstdc++)
 	echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE}
 .else
diff --git a/share/mk/bsd.progs.mk b/share/mk/bsd.progs.mk
index 3262004297b..2f3e9c68af3 100644
--- a/share/mk/bsd.progs.mk
+++ b/share/mk/bsd.progs.mk
@@ -16,14 +16,20 @@
 
 .MAIN: all
 
-.if defined(PROGS)
+.if defined(PROGS) || defined(PROGS_CXX)
+# we really only use PROGS below...
+PROGS += ${PROGS_CXX}
 
 # In meta mode, we can capture dependenices for _one_ of the progs.
 # if makefile doesn't nominate one, we use the first.
+.if defined(.PARSEDIR)
 .ifndef UPDATE_DEPENDFILE_PROG
 UPDATE_DEPENDFILE_PROG = ${PROGS:[1]}
 .export UPDATE_DEPENDFILE_PROG
 .endif
+.else
+UPDATE_DEPENDFILE_PROG?= no
+.endif
 
 .ifndef PROG
 # They may have asked us to build just one
@@ -38,13 +44,15 @@ PROG ?= $t
 # just one of many
 PROG_VARS += BINDIR CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD MAN SRCS
 .for v in ${PROG_VARS:O:u}
-.if defined(${v}.${PROG})
+.if defined(${v}.${PROG}) || defined(${v}_${PROG})
 $v += ${${v}_${PROG}:U${${v}.${PROG}}}
+.else
+$v ?=
 .endif
 .endfor
 
 # for meta mode, there can be only one!
-.if ${PROG} == ${UPDATE_DEPENDFILE_PROG:Uno}
+.if ${PROG} == ${UPDATE_DEPENDFILE_PROG}
 UPDATE_DEPENDFILE ?= yes
 .endif
 UPDATE_DEPENDFILE ?= NO
@@ -63,7 +71,7 @@ UPDATE_DEPENDFILE = NO
 .endif
 
 # handle being called [bsd.]progs.mk
-.include <${.PARSEFILE:S,progs,prog,}>
+.include <bsd.prog.mk>
 
 .ifndef PROG
 # tell progs.mk we might want to install things
@@ -76,11 +84,11 @@ x.$p= PROG_CXX=$p
 .endif
 
 $p ${p}_p: .PHONY .MAKE
-	(cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} PROG=$p ${x.$p})
+	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} PROG=$p ${x.$p})
 
 .for t in ${PROGS_TARGETS:O:u}
 $p.$t: .PHONY .MAKE
-	(cd ${.CURDIR} && ${.MAKE} -f ${MAKEFILE} PROG=$p ${x.$p} ${@:E})
+	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} PROG=$p ${x.$p} ${@:E})
 .endfor
 .endfor
 
diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk
index 72dfa618923..e297115b2be 100644
--- a/share/mk/bsd.sys.mk
+++ b/share/mk/bsd.sys.mk
@@ -73,7 +73,7 @@ CWARNFLAGS+=	-Wno-empty-body -Wno-string-plus-int
 .endif # WARNS <= 6
 .if ${WARNS} <= 3
 CWARNFLAGS+=	-Wno-tautological-compare -Wno-unused-value\
-		-Wno-parentheses-equality -Wno-unused-function -Wno-conversion
+		-Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion
 .endif # WARNS <= 3
 .if ${WARNS} <= 2
 CWARNFLAGS+=	-Wno-switch -Wno-switch-enum -Wno-knr-promoted-parameter
diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk
index a75298f42d6..8cdf91448e3 100644
--- a/share/mk/bsd.test.mk
+++ b/share/mk/bsd.test.mk
@@ -1,33 +1,73 @@
-# $NetBSD: bsd.test.mk,v 1.21 2012/08/25 22:21:16 jmmv Exp $
 # $FreeBSD$
+#
+# Generic build infrastructure for test programs.
+#
+# The code in this file is independent of the implementation of the test
+# programs being built; this file just provides generic infrastructure for the
+# build and the definition of various helper variables and targets.
+#
+# Makefiles should never include this file directly.  Instead, they should
+# include one of the various *.test.mk depending on the specific test programs
+# being built.
 
 .include <bsd.init.mk>
 
-.if defined(TESTS_C)
-PROGS+=	${TESTS_C}
-.for _T in ${TESTS_C}
-BINDIR.${_T}= ${TESTSDIR}
-MAN.${_T}?= # empty
-.endfor
-.endif
+# Directory in which to install tests defined by the current Makefile.
+# Makefiles have to override this to point to a subdirectory of TESTSBASE.
+TESTSDIR?= .
 
-.if defined(TESTS_CXX)
-PROGS_CXX+= ${TESTS_CXX}
-PROGS+= ${TESTS_CXX}
-.for _T in ${TESTS_CXX}
-BINDIR.${_T}= ${TESTSDIR}
-MAN.${_T}?= # empty
-.endfor
-.endif
+# Name of the test suite these tests belong to.  Should rarely be changed for
+# Makefiles built into the FreeBSD src tree.
+TESTSUITE?= FreeBSD
 
-.if defined(TESTS_SH)
-SCRIPTS+= ${TESTS_SH}
-.for _T in ${TESTS_SH}
-SCRIPTSDIR_${_T}= ${TESTSDIR}
-.endfor
-.endif
+# List of subdirectories containing tests into which to recurse.  This has the
+# same semantics as SUBDIR at build-time.  However, the directories listed here
+# get registered into the run-time test suite definitions so that the test
+# engines know to recurse into these directories.
+#
+# In other words: list here any directories that contain test programs but use
+# SUBDIR for directories that may contain helper binaries and/or data files.
+TESTS_SUBDIRS?=
 
-TESTSBASE?= ${DESTDIR}/usr/tests
+# Knob to control the handling of the Kyuafile for this Makefile.
+#
+# If 'yes', a Kyuafile exists in the source tree and is installed into
+# TESTSDIR.
+#
+# If 'auto', a Kyuafile is automatically generated based on the list of test
+# programs built by the Makefile and is installed into TESTSDIR.  This is the
+# default and is sufficient in the majority of the cases.
+#
+# If 'no', no Kyuafile is installed.
+KYUAFILE?= auto
+
+# List of variables to pass to the tests at run-time via the environment.
+TESTS_ENV?=
+
+# Ordered list of directories to construct the PATH for the tests.
+TESTS_PATH+= ${DESTDIR}/bin ${DESTDIR}/sbin \
+             ${DESTDIR}/usr/bin ${DESTDIR}/usr/sbin
+TESTS_ENV+= PATH=${TESTS_PATH:tW:C/ +/:/g}
+
+# Ordered list of directories to construct the LD_LIBRARY_PATH for the tests.
+TESTS_LD_LIBRARY_PATH+= ${DESTDIR}/lib ${DESTDIR}/usr/lib
+TESTS_ENV+= LD_LIBRARY_PATH=${TESTS_LD_LIBRARY_PATH:tW:C/ +/:/g}
+
+# List of all tests being built.  This variable is internal should not be
+# defined by the Makefile.  The various *.test.mk modules extend this variable
+# as needed.
+_TESTS?=
+
+# Path to the prefix of the installed Kyua CLI, if any.
+#
+# If kyua is installed from ports, we automatically define a realtest target
+# below to run the tests using this tool.  The tools are searched for in the
+# hierarchy specified by this variable.
+KYUA_PREFIX?= /usr/local
+
+.if !empty(TESTS_SUBDIRS)
+SUBDIR+= ${TESTS_SUBDIRS}
+.endif
 
 # it is rare for test cases to have man pages
 .if !defined(MAN)
@@ -39,8 +79,57 @@ WITHOUT_MAN=yes
 PROG_VARS+= BINDIR
 PROGS_TARGETS+= install
 
-.if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS)
-.include <bsd.progs.mk>
+.if ${KYUAFILE:tl} != "no"
+FILES+=	Kyuafile
+FILESDIR_Kyuafile= ${TESTSDIR}
+
+.if ${KYUAFILE:tl} == "auto"
+CLEANFILES+= Kyuafile Kyuafile.tmp
+
+Kyuafile: Makefile
+	@{ \
+	    echo '-- Automatically generated by bsd.test.mk.'; \
+	    echo; \
+	    echo 'syntax(2)'; \
+	    echo; \
+	    echo 'test_suite("${TESTSUITE}")'; \
+            echo; \
+	} >Kyuafile.tmp
+.for _T in ${_TESTS}
+	@echo "${TEST_INTERFACE.${_T}}_test_program{name=\"${_T}\"}" \
+	    >>Kyuafile.tmp
+.endfor
+.for _T in ${TESTS_SUBDIRS:N.WAIT}
+	@echo "include(\"${_T}/Kyuafile\")" >>Kyuafile.tmp
+.endfor
+	@mv Kyuafile.tmp Kyuafile
+.endif
+.endif
+
+KYUA?= ${KYUA_PREFIX}/bin/kyua
+.if exists(${KYUA})
+# Definition of the "make test" target and supporting variables.
+#
+# This target, by necessity, can only work for native builds (i.e. a FreeBSD
+# host building a release for the same system).  The target runs Kyua, which is
+# not in the toolchain, and the tests execute code built for the target host.
+#
+# Due to the dependencies of the binaries built by the source tree and how they
+# are used by tests, it is highly possible for a execution of "make test" to
+# report bogus results unless the new binaries are put in place.
+realtest: .PHONY
+	@echo "*** WARNING: make test is experimental"
+	@echo "***"
+	@echo "*** Using this test does not preclude you from running the tests"
+	@echo "*** installed in ${TESTSBASE}.  This test run may raise false"
+	@echo "*** positives and/or false negatives."
+	@echo
+	@set -e; \
+	${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile; \
+	result=0; \
+	echo; \
+	echo "*** Once again, note that "make test" is unsupported."; \
+	test $${result} -eq 0
 .endif
 
 beforetest: .PHONY
@@ -76,4 +165,14 @@ test: beforetest realtest
 test: aftertest
 .endif
 
+.if !empty(SUBDIR)
+.include <bsd.subdir.mk>
+.endif
+
+.if !empty(PROGS) || !empty(PROGS_CXX) || !empty(SCRIPTS)
+.include <bsd.progs.mk>
+.elif !empty(FILES)
+.include <bsd.files.mk>
+.endif
+
 .include <bsd.obj.mk>
diff --git a/share/mk/plain.test.mk b/share/mk/plain.test.mk
new file mode 100644
index 00000000000..2e2752db7fa
--- /dev/null
+++ b/share/mk/plain.test.mk
@@ -0,0 +1,62 @@
+# $FreeBSD$
+#
+# Logic to build and install plain test programs.  A plain test programs it not
+# supposed to use any specific testing framework: all it does is run some code
+# and report the test's pass or fail status via a 0 or 1 exit code.
+
+.include <bsd.init.mk>
+
+# List of C, C++ and shell test programs to build.
+#
+# Programs listed here are built according to the semantics of bsd.prog.mk for
+# PROGS, PROGS_CXX and SCRIPTS, respectively.
+#
+# Test programs registered in this manner are set to be installed into TESTSDIR
+# (which should be overriden by the Makefile) and are not required to provide a
+# manpage.
+PLAIN_TESTS_C?=
+PLAIN_TESTS_CXX?=
+PLAIN_TESTS_SH?=
+
+.if !empty(PLAIN_TESTS_C)
+PROGS+= ${PLAIN_TESTS_C}
+_TESTS+= ${PLAIN_TESTS_C}
+.for _T in ${PLAIN_TESTS_C}
+BINDIR.${_T}= ${TESTSDIR}
+MAN.${_T}?= # empty
+SRCS.${_T}?= ${_T}.c
+TEST_INTERFACE.${_T}= plain
+.endfor
+.endif
+
+.if !empty(PLAIN_TESTS_CXX)
+PROGS_CXX+= ${PLAIN_TESTS_CXX}
+_TESTS+= ${PLAIN_TESTS_CXX}
+.for _T in ${PLAIN_TESTS_CXX}
+BINDIR.${_T}= ${TESTSDIR}
+MAN.${_T}?= # empty
+SRCS.${_T}?= ${_T}.cc
+TEST_INTERFACE.${_T}= plain
+.endfor
+.endif
+
+.if !empty(PLAIN_TESTS_SH)
+SCRIPTS+= ${PLAIN_TESTS_SH}
+_TESTS+= ${PLAIN_TESTS_SH}
+.for _T in ${PLAIN_TESTS_SH}
+SCRIPTSDIR_${_T}= ${TESTSDIR}
+TEST_INTERFACE.${_T}= plain
+CLEANFILES+= ${_T} ${_T}.tmp
+# TODO(jmmv): It seems to me that this SED and SRC functionality should
+# exist in bsd.prog.mk along the support for SCRIPTS.  Move it there if
+# this proves to be useful within the tests.
+PLAIN_TESTS_SH_SED_${_T}?= # empty
+PLAIN_TESTS_SH_SRC_${_T}?= ${_T}.sh
+${_T}: ${PLAIN_TESTS_SH_SRC_${_T}}
+	cat ${.ALLSRC} | sed ${PLAIN_TESTS_SH_SED_${_T}} >${.TARGET}.tmp
+	chmod +x ${.TARGET}.tmp
+	mv ${.TARGET}.tmp ${.TARGET}
+.endfor
+.endif
+
+.include <bsd.test.mk>
diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps
index 70bfd4e5c34..1ecfa74ee60 100644
--- a/share/syscons/keymaps/INDEX.keymaps
+++ b/share/syscons/keymaps/INDEX.keymaps
@@ -117,7 +117,7 @@ danish.cp865.kbd:fr:Danois Code page 865
 danish.cp865.kbd:pt:Dinamarquês Codepage 865
 danish.cp865.kbd:es:Danés Codepage 865
 
-danish.iso.macbook.kbd:Danish ISO-8859-1 (macbook)
+danish.iso.macbook.kbd:da:Danish ISO-8859-1 (macbook)
 
 dutch.iso.acc.kbd:en:Dutch ISO keymap (accent keys)
 
diff --git a/share/tests/Makefile b/share/tests/Makefile
new file mode 100644
index 00000000000..2c6362193ab
--- /dev/null
+++ b/share/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/share
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/share/xml/Makefile b/share/xml/Makefile
deleted file mode 100644
index 0fb02253cf5..00000000000
--- a/share/xml/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#-
-# Copyright (c) 2012 EMC 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 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 <bsd.own.mk>
-
-SUBDIR+=	${_atf}
-
-.if ${MK_ATF} != "no"
-_atf=		atf
-.endif
-
-.include <bsd.subdir.mk>
diff --git a/share/xsl/Makefile b/share/xsl/Makefile
deleted file mode 100644
index 0fb02253cf5..00000000000
--- a/share/xsl/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-#-
-# Copyright (c) 2012 EMC 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 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 <bsd.own.mk>
-
-SUBDIR+=	${_atf}
-
-.if ${MK_ATF} != "no"
-_atf=		atf
-.endif
-
-.include <bsd.subdir.mk>
diff --git a/share/xsl/atf/Makefile b/share/xsl/atf/Makefile
deleted file mode 100644
index 73e84f20bc3..00000000000
--- a/share/xsl/atf/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#-
-# Copyright (c) 2011 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:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this 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$
-
-ATF=		${.CURDIR}/../../../contrib/atf
-
-.PATH:		${ATF}/atf-report
-
-NO_OBJ=
-
-FILESGROUPS=    XSL
-
-XSLDIR=		${SHAREDIR}/xsl/atf
-XSL=		tests-results.xsl
-
-.include <bsd.prog.mk>
diff --git a/sys/amd64/amd64/bpf_jit_machdep.c b/sys/amd64/amd64/bpf_jit_machdep.c
index fe861d29227..ff5ca5f90e9 100644
--- a/sys/amd64/amd64/bpf_jit_machdep.c
+++ b/sys/amd64/amd64/bpf_jit_machdep.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <net/if.h>
 #else
 #include <stdlib.h>
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index a71428153d4..d4e58b1cecb 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -37,7 +37,6 @@
 #include "opt_atpic.h"
 #include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 
 #include <machine/asmacros.h>
 #include <machine/psl.h>
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 27ea9a6d22c..3712fc0170b 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -366,18 +366,18 @@ printcpuinfo(void)
 				"\017<b14>"
 				"\020LWP"	/* Lightweight Profiling */
 				"\021FMA4"	/* 4-operand FMA instructions */
-				"\022<b17>"
+				"\022TCE"	/* Translation Cache Extension */
 				"\023<b18>"
 				"\024NodeId"	/* NodeId MSR support */
 				"\025<b20>"
 				"\026TBM"	/* Trailing Bit Manipulation */
 				"\027Topology"	/* Topology Extensions */
-				"\030<b23>"
-				"\031<b24>"
+				"\030PCXC"	/* Core perf count */
+				"\031PNXC"	/* NB perf count */
 				"\032<b25>"
-				"\033<b26>"
-				"\034<b27>"
-				"\035<b28>"
+				"\033DBE"	/* Data Breakpoint extension */
+				"\034PTSC"	/* Performance TSC */
+				"\035PL2I"	/* L2I perf count */
 				"\036<b29>"
 				"\037<b30>"
 				"\040<b31>"
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 2b2e47f0054..eae657b877c 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_perfmon.h"
 #include "opt_platform.h"
 #include "opt_sched.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -256,7 +255,6 @@ cpu_startup(dummy)
 #ifdef PERFMON
 	perfmon_init();
 #endif
-	realmem = Maxmem;
 
 	/*
 	 * Display physical memory if SMBIOS reports reasonable amount.
@@ -270,6 +268,7 @@ cpu_startup(dummy)
 	if (memsize < ptoa((uintmax_t)cnt.v_free_count))
 		memsize = ptoa((uintmax_t)Maxmem);
 	printf("real memory  = %ju (%ju MB)\n", memsize, memsize >> 20);
+	realmem = atop(memsize);
 
 	/*
 	 * Display any holes after the first chunk of extended memory.
@@ -486,17 +485,7 @@ sys_sigreturn(td, uap)
 	/*
 	 * Don't allow users to change privileged or reserved flags.
 	 */
-	/*
-	 * XXX do allow users to change the privileged flag PSL_RF.
-	 * The cpu sets PSL_RF in tf_rflags for faults.  Debuggers
-	 * should sometimes set it there too.  tf_rflags is kept in
-	 * the signal context during signal handling and there is no
-	 * other place to remember it, so the PSL_RF bit may be
-	 * corrupted by the signal handler without us knowing.
-	 * Corruption of the PSL_RF bit at worst causes one more or
-	 * one less debugger trap, so allowing it is fairly harmless.
-	 */
-	if (!EFL_SECURE(rflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) {
+	if (!EFL_SECURE(rflags, regs->tf_rflags)) {
 		uprintf("pid %d (%s): sigreturn rflags = 0x%lx\n", p->p_pid,
 		    td->td_name, rflags);
 		return (EINVAL);
@@ -844,7 +833,7 @@ cpu_idle(int busy)
 	/* Call main idle method. */
 	cpu_idle_fn(sbt);
 
-	/* Switch timers mack into active mode. */
+	/* Switch timers back into active mode. */
 	if (!busy) {
 		cpu_activeclock();
 		critical_exit();
@@ -1338,30 +1327,24 @@ isa_irq_pending(void)
 u_int basemem;
 
 static int
-add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp)
+add_physmap_entry(uint64_t base, uint64_t length, vm_paddr_t *physmap,
+    int *physmap_idxp)
 {
 	int i, insert_idx, physmap_idx;
 
 	physmap_idx = *physmap_idxp;
 
-	if (boothowto & RB_VERBOSE)
-		printf("SMAP type=%02x base=%016lx len=%016lx\n",
-		    smap->type, smap->base, smap->length);
-
-	if (smap->type != SMAP_TYPE_MEMORY)
+	if (length == 0)
 		return (1);
 
-	if (smap->length == 0)
-		return (0);
-
 	/*
 	 * Find insertion point while checking for overlap.  Start off by
 	 * assuming the new entry will be added to the end.
 	 */
 	insert_idx = physmap_idx + 2;
 	for (i = 0; i <= physmap_idx; i += 2) {
-		if (smap->base < physmap[i + 1]) {
-			if (smap->base + smap->length <= physmap[i]) {
+		if (base < physmap[i + 1]) {
+			if (base + length <= physmap[i]) {
 				insert_idx = i;
 				break;
 			}
@@ -1373,15 +1356,14 @@ add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp)
 	}
 
 	/* See if we can prepend to the next entry. */
-	if (insert_idx <= physmap_idx &&
-	    smap->base + smap->length == physmap[insert_idx]) {
-		physmap[insert_idx] = smap->base;
+	if (insert_idx <= physmap_idx && base + length == physmap[insert_idx]) {
+		physmap[insert_idx] = base;
 		return (1);
 	}
 
 	/* See if we can append to the previous entry. */
-	if (insert_idx > 0 && smap->base == physmap[insert_idx - 1]) {
-		physmap[insert_idx - 1] += smap->length;
+	if (insert_idx > 0 && base == physmap[insert_idx - 1]) {
+		physmap[insert_idx - 1] += length;
 		return (1);
 	}
 
@@ -1403,11 +1385,42 @@ add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp)
 	}
 
 	/* Insert the new entry. */
-	physmap[insert_idx] = smap->base;
-	physmap[insert_idx + 1] = smap->base + smap->length;
+	physmap[insert_idx] = base;
+	physmap[insert_idx + 1] = base + length;
 	return (1);
 }
 
+static void
+add_smap_entries(struct bios_smap *smapbase, vm_paddr_t *physmap,
+    int *physmap_idx)
+{
+	struct bios_smap *smap, *smapend;
+	u_int32_t smapsize;
+
+	/*
+	 * Memory map from INT 15:E820.
+	 *
+	 * subr_module.c says:
+	 * "Consumer may safely assume that size value precedes data."
+	 * ie: an int32_t immediately precedes smap.
+	 */
+	smapsize = *((u_int32_t *)smapbase - 1);
+	smapend = (struct bios_smap *)((uintptr_t)smapbase + smapsize);
+
+	for (smap = smapbase; smap < smapend; smap++) {
+		if (boothowto & RB_VERBOSE)
+			printf("SMAP type=%02x base=%016lx len=%016lx\n",
+			    smap->type, smap->base, smap->length);
+
+		if (smap->type != SMAP_TYPE_MEMORY)
+			continue;
+
+		if (!add_physmap_entry(smap->base, smap->length, physmap,
+		    physmap_idx))
+			break;
+	}
+}
+
 /*
  * Populate the (physmap) array with base/bound pairs describing the
  * available physical memory in the system, then test this memory and
@@ -1425,32 +1438,19 @@ getmemsize(caddr_t kmdp, u_int64_t first)
 	vm_paddr_t pa, physmap[PHYSMAP_SIZE];
 	u_long physmem_start, physmem_tunable, memtest;
 	pt_entry_t *pte;
-	struct bios_smap *smapbase, *smap, *smapend;
-	u_int32_t smapsize;
+	struct bios_smap *smapbase;
 	quad_t dcons_addr, dcons_size;
 
 	bzero(physmap, sizeof(physmap));
 	basemem = 0;
 	physmap_idx = 0;
 
-	/*
-	 * get memory map from INT 15:E820, kindly supplied by the loader.
-	 *
-	 * subr_module.c says:
-	 * "Consumer may safely assume that size value precedes data."
-	 * ie: an int32_t immediately precedes smap.
-	 */
 	smapbase = (struct bios_smap *)preload_search_info(kmdp,
 	    MODINFO_METADATA | MODINFOMD_SMAP);
 	if (smapbase == NULL)
 		panic("No BIOS smap info from loader!");
 
-	smapsize = *((u_int32_t *)smapbase - 1);
-	smapend = (struct bios_smap *)((uintptr_t)smapbase + smapsize);
-
-	for (smap = smapbase; smap < smapend; smap++)
-		if (!add_smap_entry(smap, physmap, &physmap_idx))
-			break;
+	add_smap_entries(smapbase, physmap, &physmap_idx);
 
 	/*
 	 * Find the 'base memory' segment for SMP
@@ -1486,13 +1486,15 @@ getmemsize(caddr_t kmdp, u_int64_t first)
 		Maxmem = atop(physmem_tunable);
 
 	/*
-	 * By default enable the memory test on real hardware, and disable
-	 * it if we appear to be running in a VM.  This avoids touching all
-	 * pages unnecessarily, which doesn't matter on real hardware but is
-	 * bad for shared VM hosts.  Use a general name so that
-	 * one could eventually do more with the code than just disable it.
+	 * The boot memory test is disabled by default, as it takes a
+	 * significant amount of time on large-memory systems, and is
+	 * unfriendly to virtual machines as it unnecessarily touches all
+	 * pages.
+	 *
+	 * A general name is used as the code may be extended to support
+	 * additional tests beyond the current "page present" test.
 	 */
-	memtest = (vm_guest > VM_GUEST_NO) ? 0 : 1;
+	memtest = 0;
 	TUNABLE_ULONG_FETCH("hw.memtest.tests", &memtest);
 
 	/*
diff --git a/sys/amd64/amd64/minidump_machdep.c b/sys/amd64/amd64/minidump_machdep.c
index f14c5393c41..0ee8bcfba6e 100644
--- a/sys/amd64/amd64/minidump_machdep.c
+++ b/sys/amd64/amd64/minidump_machdep.c
@@ -127,8 +127,9 @@ report_progress(size_t progress, size_t dumpsize)
 	int sofar, i;
 
 	sofar = 100 - ((progress * 100) / dumpsize);
-	for (i = 0; i < 10; i++) {
-		if (sofar < progress_track[i].min_per || sofar > progress_track[i].max_per)
+	for (i = 0; i < nitems(progress_track); i++) {
+		if (sofar < progress_track[i].min_per ||
+		    sofar > progress_track[i].max_per)
 			continue;
 		if (progress_track[i].visited)
 			return;
@@ -157,8 +158,8 @@ blk_write(struct dumperinfo *di, char *ptr, vm_paddr_t pa, size_t sz)
 		printf("cant have both va and pa!\n");
 		return (EINVAL);
 	}
-	if (pa != 0 && (((uintptr_t)ptr) % PAGE_SIZE) != 0) {
-		printf("address not page aligned\n");
+	if ((((uintptr_t)pa) % PAGE_SIZE) != 0) {
+		printf("address not page aligned %p\n", ptr);
 		return (EINVAL);
 	}
 	if (ptr != NULL) {
@@ -230,6 +231,8 @@ minidumpsys(struct dumperinfo *di)
  retry:
 	retry_count++;
 	counter = 0;
+	for (i = 0; i < nitems(progress_track); i++)
+		progress_track[i].visited = 0;
 	/* Walk page table pages, set bits in vm_page_dump */
 	pmapsize = 0;
 	for (va = VM_MIN_KERNEL_ADDRESS; va < MAX(KERNBASE + nkpt * NBPDR,
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 7724327d1c6..3f6a4d3b175 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -383,6 +383,8 @@ int pmap_pcid_enabled = 1;
 SYSCTL_INT(_vm_pmap, OID_AUTO, pcid_enabled, CTLFLAG_RDTUN, &pmap_pcid_enabled,
     0, "Is TLB Context ID enabled ?");
 int invpcid_works = 0;
+SYSCTL_INT(_vm_pmap, OID_AUTO, invpcid_works, CTLFLAG_RD, &invpcid_works, 0,
+    "Is the invpcid instruction available ?");
 
 static int
 pmap_pcid_save_cnt_proc(SYSCTL_HANDLER_ARGS)
@@ -2733,6 +2735,7 @@ reclaim_pv_chunk(pmap_t locked_pmap, struct rwlock **lockp)
 	KASSERT(lockp != NULL, ("reclaim_pv_chunk: lockp is NULL"));
 	pmap = NULL;
 	m_pc = NULL;
+	PG_G = PG_A = PG_M = PG_RW = 0;
 	SLIST_INIT(&free);
 	TAILQ_INIT(&new_tail);
 	mtx_lock(&pv_chunks_mutex);
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 4691014fbcd..f7d0afdad58 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
 #include "opt_kdb.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -114,9 +113,8 @@ dtrace_doubletrap_func_t	dtrace_doubletrap_func;
 systrace_probe_func_t	systrace_probe_func;
 
 /*
- * These hooks are necessary for the pid, usdt and fasttrap providers.
+ * These hooks are necessary for the pid and usdt providers.
  */
-dtrace_fasttrap_probe_ptr_t	dtrace_fasttrap_probe_ptr;
 dtrace_pid_probe_ptr_t		dtrace_pid_probe_ptr;
 dtrace_return_probe_ptr_t	dtrace_return_probe_ptr;
 #endif
@@ -128,7 +126,7 @@ void dblfault_handler(struct trapframe *frame);
 static int trap_pfault(struct trapframe *, int);
 static void trap_fatal(struct trapframe *, vm_offset_t);
 
-#define MAX_TRAP_MSG		33
+#define MAX_TRAP_MSG		32
 static char *trap_msg[] = {
 	"",					/*  0 unused */
 	"privileged instruction fault",		/*  1 T_PRIVINFLT */
@@ -163,7 +161,6 @@ static char *trap_msg[] = {
 	"reserved (unknown) fault",		/* 30 T_RESERVED */
 	"",					/* 31 unused (reserved) */
 	"DTrace pid return trap",		/* 32 T_DTRACE_RET */
-	"DTrace fasttrap probe trap",		/* 33 T_DTRACE_PROBE */
 };
 
 #ifdef KDB
@@ -255,16 +252,11 @@ trap(struct trapframe *frame)
 	 * handled the trap and modified the trap frame so that this
 	 * function can return normally.
 	 */
-	if (type == T_DTRACE_PROBE || type == T_DTRACE_RET ||
-	    type == T_BPTFLT) {
+	if (type == T_DTRACE_RET || type == T_BPTFLT) {
 		struct reg regs;
 
 		fill_frame_regs(frame, &regs);
-		if (type == T_DTRACE_PROBE &&
-		    dtrace_fasttrap_probe_ptr != NULL &&
-		    dtrace_fasttrap_probe_ptr(&regs) == 0)
-			goto out;
-		else if (type == T_BPTFLT &&
+		if (type == T_BPTFLT &&
 		    dtrace_pid_probe_ptr != NULL &&
 		    dtrace_pid_probe_ptr(&regs) == 0)
 			goto out;
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index ed9958ea961..5c326d23f41 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -66,13 +66,11 @@ 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 	PROCDESC		# Support for process descriptors
 options 	MAC			# TrustedBSD MAC Framework
 options 	KDTRACE_FRAME		# Ensure frames are compiled in
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-options 	XENHVM			# Include Xen support
 
 # Debugging support.  Always need this:
 options 	KDB			# Enable kernel debugger support.
@@ -95,6 +93,7 @@ device		cpufreq
 
 # Bus support.
 device		acpi
+options 	ACPI_DMAR
 device		pci
 
 # Floppy drives
@@ -345,8 +344,10 @@ device		virtio_balloon	# VirtIO Memory Balloon device
 # HyperV drivers
 device		hyperv		# HyperV drivers 
 
-# Xen support
-device		xenpci		# Generic Xen bus
+# Xen HVM Guest Optimizations
+# NOTE: XENHVM depends on xenpci.  They must be added or removed together.
+options 	XENHVM		# Xen HVM kernel infrastructure
+device		xenpci		# Xen HVM Hypervisor services driver
 
 # VMware support
 device		vmx		# VMware VMXNET3 Ethernet
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index ad010886b82..f774d2668a3 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -473,6 +473,12 @@ device		virtio_blk	# VirtIO Block device
 device		virtio_scsi	# VirtIO SCSI device
 device		virtio_balloon	# VirtIO Memory Balloon device
 
+device 		hyperv		# HyperV drivers
+
+# Xen HVM Guest Optimizations
+options 	XENHVM		# Xen HVM kernel infrastructure 
+device 		xenpci		# Xen HVM Hypervisor services driver
+
 #####################################################################
 
 #
diff --git a/sys/amd64/ia32/ia32_signal.c b/sys/amd64/ia32/ia32_signal.c
index cff57f6243f..75a0511480a 100644
--- a/sys/amd64/ia32/ia32_signal.c
+++ b/sys/amd64/ia32/ia32_signal.c
@@ -719,7 +719,7 @@ ofreebsd32_sigreturn(struct thread *td, struct ofreebsd32_sigreturn_args *uap)
 		return (error);
 	scp = &sc;
 	eflags = scp->sc_eflags;
-	if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) {
+	if (!EFL_SECURE(eflags, regs->tf_rflags)) {
 		return (EINVAL);
 	}
 	if (!CS_SECURE(scp->sc_cs)) {
@@ -787,17 +787,7 @@ freebsd4_freebsd32_sigreturn(td, uap)
 	/*
 	 * Don't allow users to change privileged or reserved flags.
 	 */
-	/*
-	 * XXX do allow users to change the privileged flag PSL_RF.
-	 * The cpu sets PSL_RF in tf_eflags for faults.  Debuggers
-	 * should sometimes set it there too.  tf_eflags is kept in
-	 * the signal context during signal handling and there is no
-	 * other place to remember it, so the PSL_RF bit may be
-	 * corrupted by the signal handler without us knowing.
-	 * Corruption of the PSL_RF bit at worst causes one more or
-	 * one less debugger trap, so allowing it is fairly harmless.
-	 */
-	if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) {
+	if (!EFL_SECURE(eflags, regs->tf_rflags)) {
 		uprintf("pid %d (%s): freebsd4_freebsd32_sigreturn eflags = 0x%x\n",
 		    td->td_proc->p_pid, td->td_name, eflags);
 		return (EINVAL);
@@ -873,17 +863,7 @@ freebsd32_sigreturn(td, uap)
 	/*
 	 * Don't allow users to change privileged or reserved flags.
 	 */
-	/*
-	 * XXX do allow users to change the privileged flag PSL_RF.
-	 * The cpu sets PSL_RF in tf_eflags for faults.  Debuggers
-	 * should sometimes set it there too.  tf_eflags is kept in
-	 * the signal context during signal handling and there is no
-	 * other place to remember it, so the PSL_RF bit may be
-	 * corrupted by the signal handler without us knowing.
-	 * Corruption of the PSL_RF bit at worst causes one more or
-	 * one less debugger trap, so allowing it is fairly harmless.
-	 */
-	if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) {
+	if (!EFL_SECURE(eflags, regs->tf_rflags)) {
 		uprintf("pid %d (%s): freebsd32_sigreturn eflags = 0x%x\n",
 		    td->td_proc->p_pid, td->td_name, eflags);
 		return (EINVAL);
diff --git a/sys/amd64/include/apicvar.h b/sys/amd64/include/apicvar.h
index 9cd4c95aff8..e7423a30bf2 100644
--- a/sys/amd64/include/apicvar.h
+++ b/sys/amd64/include/apicvar.h
@@ -136,15 +136,6 @@
  */
 #define	APIC_SPURIOUS_INT 255
 
-#define	LVT_LINT0	0
-#define	LVT_LINT1	1
-#define	LVT_TIMER	2
-#define	LVT_ERROR	3
-#define	LVT_PMC		4
-#define	LVT_THERMAL	5
-#define	LVT_CMCI	6
-#define	LVT_MAX		LVT_CMCI
-
 #ifndef LOCORE
 
 #define	APIC_IPI_DEST_SELF	-1
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h
index 078da03e513..87272f76fdd 100644
--- a/sys/amd64/include/asm.h
+++ b/sys/amd64/include/asm.h
@@ -77,6 +77,15 @@
 #endif
 
 #define	END(x)		.size x, . - x
+/*
+ * WEAK_REFERENCE(): create a weak reference alias from sym. 
+ * The macro is not a general asm macro that takes arbitrary names,
+ * but one that takes only C names. It does the non-null name
+ * translation inside the macro.
+ */
+#define	WEAK_REFERENCE(sym, alias)					\
+	.weak CNAME(alias);						\
+	.equ CNAME(alias),CNAME(sym)
 
 #define RCSID(x)	.text; .asciz x
 
diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h
index c106edc9305..80aff86eb68 100644
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -43,6 +43,7 @@
 #include <machine/fpu.h>
 #include <machine/segments.h>
 
+#ifdef __amd64__
 struct pcb {
 	register_t	pcb_r15;
 	register_t	pcb_r14;
@@ -105,6 +106,7 @@ struct pcb {
 
 	uint64_t	pcb_pad[3];
 };
+#endif
 
 #ifdef _KERNEL
 struct trapframe;
diff --git a/sys/amd64/include/pcpu.h b/sys/amd64/include/pcpu.h
index 3d51512316a..fe898e983b8 100644
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
@@ -62,7 +62,8 @@
 	u_int	pc_cmci_mask;		/* MCx banks for CMCI */	\
 	uint64_t pc_dbreg[16];		/* ddb debugging regs */	\
 	int pc_dbreg_cmd;		/* ddb debugging reg cmd */	\
-	char	__pad[161]		/* be divisor of PAGE_SIZE	\
+	u_int	pc_vcpu_id;		/* Xen vCPU ID */		\
+	char	__pad[157]		/* be divisor of PAGE_SIZE	\
 					   after cache alignment */
 
 #define	PC_DBREG_CMD_NONE	0
diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h
index d9f4280c437..6bcadc7621e 100644
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
@@ -82,8 +82,8 @@ struct	soft_segment_descriptor {
  * region descriptors, used to load gdt/idt tables before segments yet exist.
  */
 struct region_descriptor {
-	unsigned long rd_limit:16;		/* segment extent */
-	unsigned long rd_base:64 __packed;	/* base address  */
+	uint64_t rd_limit:16;		/* segment extent */
+	uint64_t rd_base:64 __packed;	/* base address  */
 } __packed;
 
 #ifdef _KERNEL
diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h
index 64dbc5847f2..201647cfd4e 100644
--- a/sys/amd64/include/vmm.h
+++ b/sys/amd64/include/vmm.h
@@ -38,6 +38,8 @@ struct vm_memory_segment;
 struct seg_desc;
 struct vm_exit;
 struct vm_run;
+struct vhpet;
+struct vioapic;
 struct vlapic;
 struct vmspace;
 struct vm_object;
@@ -116,10 +118,13 @@ int vm_nmi_pending(struct vm *vm, int vcpuid);
 void vm_nmi_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);
 int vm_get_capability(struct vm *vm, int vcpu, int type, int *val);
 int vm_set_capability(struct vm *vm, int vcpu, int type, int val);
 int vm_get_x2apic_state(struct vm *vm, int vcpu, enum x2apic_state *state);
 int vm_set_x2apic_state(struct vm *vm, int vcpu, enum x2apic_state state);
+int vm_apicid2vcpuid(struct vm *vm, int apicid);
 void vm_activate_cpu(struct vm *vm, int vcpu);
 cpuset_t vm_active_cpus(struct vm *vm);
 struct vm_exit *vm_exitinfo(struct vm *vm, int vcpuid);
@@ -151,7 +156,7 @@ vcpu_is_running(struct vm *vm, int vcpu, int *hostcpu)
 }
 
 void *vcpu_stats(struct vm *vm, int vcpu);
-void vm_interrupt_hostcpu(struct vm *vm, int vcpu);
+void vcpu_notify_event(struct vm *vm, int vcpuid);
 struct vmspace *vm_get_vmspace(struct vm *vm);
 int vm_assign_pptdev(struct vm *vm, int bus, int slot, int func);
 int vm_unassign_pptdev(struct vm *vm, int bus, int slot, int func);
@@ -223,6 +228,7 @@ enum vm_cap_type {
 	VM_CAP_MTRAP_EXIT,
 	VM_CAP_PAUSE_EXIT,
 	VM_CAP_UNRESTRICTED_GUEST,
+	VM_CAP_ENABLE_INVPCID,
 	VM_CAP_MAX
 };
 
@@ -258,6 +264,7 @@ enum vm_exitcode {
 	VM_EXITCODE_PAGING,
 	VM_EXITCODE_INST_EMUL,
 	VM_EXITCODE_SPINUP_AP,
+	VM_EXITCODE_SPINDOWN_CPU,
 	VM_EXITCODE_MAX
 };
 
@@ -277,7 +284,6 @@ struct vm_exit {
 		struct {
 			uint64_t	gpa;
 			int		fault_type;
-			int		protection;
 		} paging;
 		struct {
 			uint64_t	gpa;
@@ -302,6 +308,9 @@ struct vm_exit {
 			int		vcpu;
 			uint64_t	rip;
 		} spinup_ap;
+		struct {
+			uint64_t	rflags;
+		} hlt;
 	} u;
 };
 
diff --git a/sys/amd64/include/vmm_dev.h b/sys/amd64/include/vmm_dev.h
index bf014cc20a7..19a5b022162 100644
--- a/sys/amd64/include/vmm_dev.h
+++ b/sys/amd64/include/vmm_dev.h
@@ -71,6 +71,10 @@ struct vm_lapic_irq {
 	int		vector;
 };
 
+struct vm_ioapic_irq {
+	int		irq;
+};
+
 struct vm_capability {
 	int		cpuid;
 	enum vm_cap_type captype;
@@ -142,6 +146,10 @@ struct vm_gpa_pte {
 	int		ptenum;
 };
 
+struct vm_hpet_cap {
+	uint32_t	capabilities;	/* lower 32 bits of HPET capabilities */
+};
+
 enum {
 	/* general routines */
 	IOCNUM_ABIVERS = 0,
@@ -164,6 +172,9 @@ enum {
 	IOCNUM_INJECT_EVENT = 30,
 	IOCNUM_LAPIC_IRQ = 31,
 	IOCNUM_INJECT_NMI = 32,
+	IOCNUM_IOAPIC_ASSERT_IRQ = 33,
+	IOCNUM_IOAPIC_DEASSERT_IRQ = 34,
+	IOCNUM_IOAPIC_PULSE_IRQ = 35,
 
 	/* PCI pass-thru */
 	IOCNUM_BIND_PPTDEV = 40,
@@ -179,6 +190,7 @@ enum {
 	/* kernel device state */
 	IOCNUM_SET_X2APIC_STATE = 60,
 	IOCNUM_GET_X2APIC_STATE = 61,
+	IOCNUM_GET_HPET_CAPABILITIES = 62,
 };
 
 #define	VM_RUN		\
@@ -199,6 +211,12 @@ enum {
 	_IOW('v', IOCNUM_INJECT_EVENT, struct vm_event)
 #define	VM_LAPIC_IRQ 		\
 	_IOW('v', IOCNUM_LAPIC_IRQ, struct vm_lapic_irq)
+#define	VM_IOAPIC_ASSERT_IRQ	\
+	_IOW('v', IOCNUM_IOAPIC_ASSERT_IRQ, struct vm_ioapic_irq)
+#define	VM_IOAPIC_DEASSERT_IRQ	\
+	_IOW('v', IOCNUM_IOAPIC_DEASSERT_IRQ, struct vm_ioapic_irq)
+#define	VM_IOAPIC_PULSE_IRQ	\
+	_IOW('v', IOCNUM_IOAPIC_PULSE_IRQ, struct vm_ioapic_irq)
 #define	VM_SET_CAPABILITY \
 	_IOW('v', IOCNUM_SET_CAPABILITY, struct vm_capability)
 #define	VM_GET_CAPABILITY \
@@ -223,6 +241,8 @@ enum {
 	_IOW('v', IOCNUM_SET_X2APIC_STATE, struct vm_x2apic)
 #define	VM_GET_X2APIC_STATE \
 	_IOWR('v', IOCNUM_GET_X2APIC_STATE, struct vm_x2apic)
+#define	VM_GET_HPET_CAPABILITIES \
+	_IOR('v', IOCNUM_GET_HPET_CAPABILITIES, struct vm_hpet_cap)
 #define	VM_GET_GPA_PMAP \
 	_IOWR('v', IOCNUM_GET_GPA_PMAP, struct vm_gpa_pte)
 #endif
diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h
index 474ea4bd856..bda972213c8 100644
--- a/sys/amd64/include/vmparam.h
+++ b/sys/amd64/include/vmparam.h
@@ -178,23 +178,16 @@
 #define	PHYS_TO_DMAP(x)		((x) | DMAP_MIN_ADDRESS)
 #define	DMAP_TO_PHYS(x)		((x) & ~DMAP_MIN_ADDRESS)
 
-/* virtual sizes (bytes) for various kernel submaps */
-#ifndef VM_KMEM_SIZE
-#define	VM_KMEM_SIZE		(12 * 1024 * 1024)
-#endif
-
 /*
- * How many physical pages per KVA page allocated.
- * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE),
- *     VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
- * is the total KVA space allocated for kmem_map.
+ * How many physical pages per kmem arena virtual page.
  */
 #ifndef VM_KMEM_SIZE_SCALE
 #define	VM_KMEM_SIZE_SCALE	(1)
 #endif
 
 /*
- * Ceiling on amount of kmem_map kva space.
+ * Optional ceiling (in bytes) on the size of the kmem arena: 60% of the
+ * kernel map.
  */
 #ifndef VM_KMEM_SIZE_MAX
 #define	VM_KMEM_SIZE_MAX	((VM_MAX_KERNEL_ADDRESS - \
diff --git a/sys/amd64/linux32/linux32_dummy.c b/sys/amd64/linux32/linux32_dummy.c
index 95bf3ec88e9..411c4d556fc 100644
--- a/sys/amd64/linux32/linux32_dummy.c
+++ b/sys/amd64/linux32/linux32_dummy.c
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index c4b66deb1a3..c06ce1198f8 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -587,17 +587,7 @@ linux_sigreturn(struct thread *td, struct linux_sigreturn_args *args)
 	 */
 #define	EFLAGS_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
 	eflags = frame.sf_sc.sc_eflags;
-	/*
-	 * XXX do allow users to change the privileged flag PSL_RF.  The
-	 * cpu sets PSL_RF in tf_eflags for faults.  Debuggers should
-	 * sometimes set it there too.  tf_eflags is kept in the signal
-	 * context during signal handling and there is no other place
-	 * to remember it, so the PSL_RF bit may be corrupted by the
-	 * signal handler without us knowing.  Corruption of the PSL_RF
-	 * bit at worst causes one more or one less debugger trap, so
-	 * allowing it is fairly harmless.
-	 */
-	if (!EFLAGS_SECURE(eflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF))
+	if (!EFLAGS_SECURE(eflags, regs->tf_rflags))
 		return(EINVAL);
 
 	/*
@@ -689,17 +679,7 @@ linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args)
 	 */
 #define	EFLAGS_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
 	eflags = context->sc_eflags;
-	/*
-	 * XXX do allow users to change the privileged flag PSL_RF.  The
-	 * cpu sets PSL_RF in tf_eflags for faults.  Debuggers should
-	 * sometimes set it there too.  tf_eflags is kept in the signal
-	 * context during signal handling and there is no other place
-	 * to remember it, so the PSL_RF bit may be corrupted by the
-	 * signal handler without us knowing.  Corruption of the PSL_RF
-	 * bit at worst causes one more or one less debugger trap, so
-	 * allowing it is fairly harmless.
-	 */
-	if (!EFLAGS_SECURE(eflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF))
+	if (!EFLAGS_SECURE(eflags, regs->tf_rflags))
 		return(EINVAL);
 
 	/*
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 90d90871ff7..706fdd381ac 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -184,7 +184,7 @@ pci_cfgenable(unsigned bus, unsigned slot, unsigned func, int reg, int bytes)
 	if (bus <= PCI_BUSMAX && slot <= PCI_SLOTMAX && func <= PCI_FUNCMAX &&
 	    (unsigned)reg <= PCI_REGMAX && bytes != 3 &&
 	    (unsigned)bytes <= 4 && (reg & (bytes - 1)) == 0) {
-		outl(CONF1_ADDR_PORT, (1 << 31) | (bus << 16) | (slot << 11) 
+		outl(CONF1_ADDR_PORT, (1U << 31) | (bus << 16) | (slot << 11) 
 		    | (func << 8) | (reg & ~0x03));
 		dataport = CONF1_DATA_PORT + (reg & 0x03);
 	}
diff --git a/sys/amd64/vmm/intel/vmcs.c b/sys/amd64/vmm/intel/vmcs.c
index f8b3f954d80..5b30accc796 100644
--- a/sys/amd64/vmm/intel/vmcs.c
+++ b/sys/amd64/vmm/intel/vmcs.c
@@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/segments.h>
-#include <machine/pmap.h>
-
 #include <machine/vmm.h>
 #include "vmm_host.h"
 #include "vmcs.h"
diff --git a/sys/amd64/vmm/intel/vmcs.h b/sys/amd64/vmm/intel/vmcs.h
index be16b852649..a915c409557 100644
--- a/sys/amd64/vmm/intel/vmcs.h
+++ b/sys/amd64/vmm/intel/vmcs.h
@@ -318,7 +318,7 @@ uint64_t vmcs_read(uint32_t encoding);
 /*
  * VMCS IDT-Vectoring information fields
  */
-#define	VMCS_IDT_VEC_VALID		(1 << 31)
+#define	VMCS_IDT_VEC_VALID		(1U << 31)
 #define	VMCS_IDT_VEC_ERRCODE_VALID	(1 << 11)
 
 /*
diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index 5b65de6e8a2..1877598f10f 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/psl.h>
 #include <machine/cpufunc.h>
 #include <machine/md_var.h>
-#include <machine/pmap.h>
 #include <machine/segments.h>
 #include <machine/specialreg.h>
 #include <machine/vmparam.h>
@@ -164,6 +163,7 @@ static int cap_halt_exit;
 static int cap_pause_exit;
 static int cap_unrestricted_guest;
 static int cap_monitor_trap;
+static int cap_invpcid;
  
 static struct unrhdr *vpid_unr;
 static u_int vpid_alloc_failed;
@@ -307,8 +307,8 @@ vmx_setjmp_rc2str(int rc)
 	}
 }
 
-#define	SETJMP_TRACE(vmx, vcpu, vmxctx, regname)			  \
-	VMM_CTR1((vmx)->vm, (vcpu), "setjmp trace " #regname " 0x%016lx", \
+#define	SETJMP_TRACE(vmx, vcpu, vmxctx, regname)			    \
+	VCPU_CTR1((vmx)->vm, (vcpu), "setjmp trace " #regname " 0x%016lx",  \
 		 (vmxctx)->regname)
 
 static void
@@ -320,14 +320,14 @@ vmx_setjmp_trace(struct vmx *vmx, int vcpu, struct vmxctx *vmxctx, int rc)
 		panic("vmx_setjmp_trace: invalid vmxctx %p; should be %p",
 			vmxctx, &vmx->ctx[vcpu]);
 
-	VMM_CTR1((vmx)->vm, (vcpu), "vmxctx = %p", vmxctx);
-	VMM_CTR2((vmx)->vm, (vcpu), "setjmp return code %s(%d)",
+	VCPU_CTR1((vmx)->vm, (vcpu), "vmxctx = %p", vmxctx);
+	VCPU_CTR2((vmx)->vm, (vcpu), "setjmp return code %s(%d)",
 		 vmx_setjmp_rc2str(rc), rc);
 
 	host_rsp = host_rip = ~0;
 	vmread(VMCS_HOST_RIP, &host_rip);
 	vmread(VMCS_HOST_RSP, &host_rsp);
-	VMM_CTR2((vmx)->vm, (vcpu), "vmcs host_rip 0x%016lx, host_rsp 0x%016lx",
+	VCPU_CTR2((vmx)->vm, (vcpu), "vmcs host_rip 0x%016lx, host_rsp %#lx",
 		 host_rip, host_rsp);
 
 	SETJMP_TRACE(vmx, vcpu, vmxctx, host_r15);
@@ -660,6 +660,11 @@ vmx_init(void)
 					PROCBASED2_UNRESTRICTED_GUEST, 0,
 				        &tmp) == 0);
 
+	cap_invpcid = (vmx_set_ctlreg(MSR_VMX_PROCBASED_CTLS2,
+	    MSR_VMX_PROCBASED_CTLS2, PROCBASED2_ENABLE_INVPCID, 0,
+	    &tmp) == 0);
+
+
 	/* Initialize EPT */
 	error = ept_init();
 	if (error) {
@@ -828,6 +833,7 @@ vmx_vminit(struct vm *vm, pmap_t pmap)
 
 		vmx->cap[i].set = 0;
 		vmx->cap[i].proc_ctls = procbased_ctls;
+		vmx->cap[i].proc_ctls2 = procbased_ctls2;
 
 		vmx->state[i].lastcpu = -1;
 		vmx->state[i].vpid = vpid[i];
@@ -880,7 +886,7 @@ static __inline void
 vmx_run_trace(struct vmx *vmx, int vcpu)
 {
 #ifdef KTR
-	VMM_CTR1(vmx->vm, vcpu, "Resume execution at 0x%0lx", vmcs_guest_rip());
+	VCPU_CTR1(vmx->vm, vcpu, "Resume execution at %#lx", vmcs_guest_rip());
 #endif
 }
 
@@ -889,7 +895,7 @@ vmx_exit_trace(struct vmx *vmx, int vcpu, uint64_t rip, uint32_t exit_reason,
 	       int handled)
 {
 #ifdef KTR
-	VMM_CTR3(vmx->vm, vcpu, "%s %s vmexit at 0x%0lx",
+	VCPU_CTR3(vmx->vm, vcpu, "%s %s vmexit at 0x%0lx",
 		 handled ? "handled" : "unhandled",
 		 exit_reason_to_str(exit_reason), rip);
 #endif
@@ -899,7 +905,7 @@ static __inline void
 vmx_astpending_trace(struct vmx *vmx, int vcpu, uint64_t rip)
 {
 #ifdef KTR
-	VMM_CTR1(vmx->vm, vcpu, "astpending vmexit at 0x%0lx", rip);
+	VCPU_CTR1(vmx->vm, vcpu, "astpending vmexit at 0x%0lx", rip);
 #endif
 }
 
@@ -1048,7 +1054,7 @@ vmx_inject_nmi(struct vmx *vmx, int vcpu)
 	if (error)
 		panic("vmx_inject_nmi: vmwrite(intrinfo) %d", error);
 
-	VMM_CTR0(vmx->vm, vcpu, "Injecting vNMI");
+	VCPU_CTR0(vmx->vm, vcpu, "Injecting vNMI");
 
 	/* Clear the request */
 	vm_nmi_clear(vmx->vm, vcpu);
@@ -1061,7 +1067,7 @@ nmiblocked:
 	 */
 	vmx_set_nmi_window_exiting(vmx, vcpu);
 
-	VMM_CTR0(vmx->vm, vcpu, "Enabling NMI window exiting");
+	VCPU_CTR0(vmx->vm, vcpu, "Enabling NMI window exiting");
 	return (1);
 }
 
@@ -1127,7 +1133,7 @@ vmx_inject_interrupts(struct vmx *vmx, int vcpu)
 	/* Update the Local APIC ISR */
 	lapic_intr_accepted(vmx->vm, vcpu, vector);
 
-	VMM_CTR1(vmx->vm, vcpu, "Injecting hwintr at vector %d", vector);
+	VCPU_CTR1(vmx->vm, vcpu, "Injecting hwintr at vector %d", vector);
 
 	return;
 
@@ -1138,7 +1144,7 @@ cantinject:
 	 */
 	vmx_set_int_window_exiting(vmx, vcpu);
 
-	VMM_CTR0(vmx->vm, vcpu, "Enabling interrupt window exiting");
+	VCPU_CTR0(vmx->vm, vcpu, "Enabling interrupt window exiting");
 }
 
 static int
@@ -1295,21 +1301,6 @@ ept_fault_type(uint64_t ept_qual)
 	return (fault_type);
 }
 
-static int
-ept_protection(uint64_t ept_qual)
-{
-	int prot = 0;
-
-	if (ept_qual & EPT_VIOLATION_GPA_READABLE)
-		prot |= VM_PROT_READ;
-	if (ept_qual & EPT_VIOLATION_GPA_WRITEABLE)
-		prot |= VM_PROT_WRITE;
-	if (ept_qual & EPT_VIOLATION_GPA_EXECUTABLE)
-		prot |= VM_PROT_EXECUTE;
-
-	return (prot);
-}
-
 static boolean_t
 ept_emulation_fault(uint64_t ept_qual)
 {
@@ -1345,7 +1336,8 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 	struct vmcs *vmcs;
 	struct vmxctx *vmxctx;
 	uint32_t eax, ecx, edx, idtvec_info, idtvec_err, reason;
-	uint64_t qual, gpa;
+	uint64_t qual, gpa, rflags;
+	bool retu;
 
 	handled = 0;
 	vmcs = &vmx->vmcs[vcpu];
@@ -1391,31 +1383,46 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 		break;
 	case EXIT_REASON_RDMSR:
 		vmm_stat_incr(vmx->vm, vcpu, VMEXIT_RDMSR, 1);
+		retu = false;
 		ecx = vmxctx->guest_rcx;
-		error = emulate_rdmsr(vmx->vm, vcpu, ecx);
+		error = emulate_rdmsr(vmx->vm, vcpu, ecx, &retu);
 		if (error) {
 			vmexit->exitcode = VM_EXITCODE_RDMSR;
 			vmexit->u.msr.code = ecx;
-		} else
+		} else if (!retu) {
 			handled = 1;
+		} else {
+			/* Return to userspace with a valid exitcode */
+			KASSERT(vmexit->exitcode != VM_EXITCODE_BOGUS,
+			    ("emulate_wrmsr retu with bogus exitcode"));
+		}
 		break;
 	case EXIT_REASON_WRMSR:
 		vmm_stat_incr(vmx->vm, vcpu, VMEXIT_WRMSR, 1);
+		retu = false;
 		eax = vmxctx->guest_rax;
 		ecx = vmxctx->guest_rcx;
 		edx = vmxctx->guest_rdx;
 		error = emulate_wrmsr(vmx->vm, vcpu, ecx,
-					(uint64_t)edx << 32 | eax);
+		    (uint64_t)edx << 32 | eax, &retu);
 		if (error) {
 			vmexit->exitcode = VM_EXITCODE_WRMSR;
 			vmexit->u.msr.code = ecx;
 			vmexit->u.msr.wval = (uint64_t)edx << 32 | eax;
-		} else
+		} else if (!retu) {
 			handled = 1;
+		} else {
+			/* Return to userspace with a valid exitcode */
+			KASSERT(vmexit->exitcode != VM_EXITCODE_BOGUS,
+			    ("emulate_wrmsr retu with bogus exitcode"));
+		}
 		break;
 	case EXIT_REASON_HLT:
 		vmm_stat_incr(vmx->vm, vcpu, VMEXIT_HLT, 1);
+		if ((error = vmread(VMCS_GUEST_RFLAGS, &rflags)) != 0)
+			panic("vmx_exit_process: vmread(rflags) %d", error);
 		vmexit->exitcode = VM_EXITCODE_HLT;
+		vmexit->u.hlt.rflags = rflags;
 		break;
 	case EXIT_REASON_MTF:
 		vmm_stat_incr(vmx->vm, vcpu, VMEXIT_MTRAP, 1);
@@ -1428,7 +1435,7 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 	case EXIT_REASON_INTR_WINDOW:
 		vmm_stat_incr(vmx->vm, vcpu, VMEXIT_INTR_WINDOW, 1);
 		vmx_clear_int_window_exiting(vmx, vcpu);
-		VMM_CTR0(vmx->vm, vcpu, "Disabling interrupt window exiting");
+		VCPU_CTR0(vmx->vm, vcpu, "Disabling interrupt window exiting");
 		return (1);
 	case EXIT_REASON_EXT_INTR:
 		/*
@@ -1451,7 +1458,7 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 		/* Exit to allow the pending virtual NMI to be injected */
 		vmm_stat_incr(vmx->vm, vcpu, VMEXIT_NMI_WINDOW, 1);
 		vmx_clear_nmi_window_exiting(vmx, vcpu);
-		VMM_CTR0(vmx->vm, vcpu, "Disabling NMI window exiting");
+		VCPU_CTR0(vmx->vm, vcpu, "Disabling NMI window exiting");
 		return (1);
 	case EXIT_REASON_INOUT:
 		vmm_stat_incr(vmx->vm, vcpu, VMEXIT_INOUT, 1);
@@ -1479,7 +1486,6 @@ vmx_exit_process(struct vmx *vmx, int vcpu, struct vm_exit *vmexit)
 			vmexit->exitcode = VM_EXITCODE_PAGING;
 			vmexit->u.paging.gpa = gpa;
 			vmexit->u.paging.fault_type = ept_fault_type(qual);
-			vmexit->u.paging.protection = ept_protection(qual);
 		} else if (ept_emulation_fault(qual)) {
 			vmexit->exitcode = VM_EXITCODE_INST_EMUL;
 			vmexit->u.inst_emul.gpa = gpa;
@@ -1570,7 +1576,6 @@ vmx_run(void *arg, int vcpu, register_t rip, pmap_t pmap)
 		panic("vmx_run: error %d setting up pcpu defaults", error);
 
 	do {
-		lapic_timer_tick(vmx->vm, vcpu);
 		vmx_inject_interrupts(vmx, vcpu);
 		vmx_run_trace(vmx, vcpu);
 		rc = vmx_setjmp(vmxctx);
@@ -1652,7 +1657,7 @@ vmx_run(void *arg, int vcpu, register_t rip, pmap_t pmap)
 	if (!handled)
 		vmm_stat_incr(vmx->vm, vcpu, VMEXIT_USERSPACE, 1);
 
-	VMM_CTR1(vmx->vm, vcpu, "goto userland: exitcode %d",vmexit->exitcode);
+	VCPU_CTR1(vmx->vm, vcpu, "goto userland: exitcode %d",vmexit->exitcode);
 
 	/*
 	 * XXX
@@ -1932,6 +1937,10 @@ vmx_getcap(void *arg, int vcpu, int type, int *retval)
 		if (cap_unrestricted_guest)
 			ret = 0;
 		break;
+	case VM_CAP_ENABLE_INVPCID:
+		if (cap_invpcid)
+			ret = 0;
+		break;
 	default:
 		break;
 	}
@@ -1988,11 +1997,21 @@ vmx_setcap(void *arg, int vcpu, int type, int val)
 	case VM_CAP_UNRESTRICTED_GUEST:
 		if (cap_unrestricted_guest) {
 			retval = 0;
-			baseval = procbased_ctls2;
+			pptr = &vmx->cap[vcpu].proc_ctls2;
+			baseval = *pptr;
 			flag = PROCBASED2_UNRESTRICTED_GUEST;
 			reg = VMCS_SEC_PROC_BASED_CTLS;
 		}
 		break;
+	case VM_CAP_ENABLE_INVPCID:
+		if (cap_invpcid) {
+			retval = 0;
+			pptr = &vmx->cap[vcpu].proc_ctls2;
+			baseval = *pptr;
+			flag = PROCBASED2_ENABLE_INVPCID;
+			reg = VMCS_SEC_PROC_BASED_CTLS;
+		}
+		break;
 	default:
 		break;
 	}
diff --git a/sys/amd64/vmm/intel/vmx.h b/sys/amd64/vmm/intel/vmx.h
index 8e577649e36..450bb662dfc 100644
--- a/sys/amd64/vmm/intel/vmx.h
+++ b/sys/amd64/vmm/intel/vmx.h
@@ -84,6 +84,7 @@ struct vmxctx {
 struct vmxcap {
 	int	set;
 	uint32_t proc_ctls;
+	uint32_t proc_ctls2;
 };
 
 struct vmxstate {
diff --git a/sys/amd64/vmm/intel/vmx_controls.h b/sys/amd64/vmm/intel/vmx_controls.h
index 31f29f8e6bb..3cd2eff62e1 100644
--- a/sys/amd64/vmm/intel/vmx_controls.h
+++ b/sys/amd64/vmm/intel/vmx_controls.h
@@ -56,7 +56,7 @@
 #define	PROCBASED_MSR_BITMAPS		(1 << 28)
 #define	PROCBASED_MONITOR_EXITING	(1 << 29)
 #define	PROCBASED_PAUSE_EXITING		(1 << 30)
-#define	PROCBASED_SECONDARY_CONTROLS	(1 << 31)
+#define	PROCBASED_SECONDARY_CONTROLS	(1U << 31)
 
 /* Secondary Processor-Based VM-Execution Controls */
 #define	PROCBASED2_VIRTUALIZE_APIC	(1 << 0)
@@ -68,6 +68,7 @@
 #define	PROCBASED2_WBINVD_EXITING	(1 << 6)
 #define	PROCBASED2_UNRESTRICTED_GUEST	(1 << 7)
 #define	PROCBASED2_PAUSE_LOOP_EXITING	(1 << 10)
+#define	PROCBASED2_ENABLE_INVPCID	(1 << 12)
 
 /* VM Exit Controls */
 #define	VM_EXIT_SAVE_DEBUG_CONTROLS	(1 << 2)
diff --git a/sys/amd64/vmm/intel/vmx_genassym.c b/sys/amd64/vmm/intel/vmx_genassym.c
index 9dcfcfb2eee..8775f504adc 100644
--- a/sys/amd64/vmm/intel/vmx_genassym.c
+++ b/sys/amd64/vmm/intel/vmx_genassym.c
@@ -38,8 +38,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/pmap.h>
-
 #include <machine/vmm.h>
 #include "vmx.h"
 #include "vmx_cpufunc.h"
diff --git a/sys/amd64/vmm/intel/vtd.c b/sys/amd64/vmm/intel/vtd.c
index 3d7b4954343..ca76ea82ce6 100644
--- a/sys/amd64/vmm/intel/vtd.c
+++ b/sys/amd64/vmm/intel/vtd.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/pci/pcireg.h>
 
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 #include <contrib/dev/acpica/include/acpi.h>
 
@@ -74,11 +73,11 @@ struct vtdmap {
 
 #define	VTD_GCR_WBF		(1 << 27)
 #define	VTD_GCR_SRTP		(1 << 30)
-#define	VTD_GCR_TE		(1 << 31)
+#define	VTD_GCR_TE		(1U << 31)
 
 #define	VTD_GSR_WBFS		(1 << 27)
 #define	VTD_GSR_RTPS		(1 << 30)
-#define	VTD_GSR_TES		(1 << 31)
+#define	VTD_GSR_TES		(1U << 31)
 
 #define	VTD_CCR_ICC		(1UL << 63)	/* invalidate context cache */
 #define	VTD_CCR_CIRG_GLOBAL	(1UL << 61)	/* global invalidation */
diff --git a/sys/amd64/vmm/io/ppt.c b/sys/amd64/vmm/io/ppt.c
index a6061e9c980..fce4bbd34ad 100644
--- a/sys/amd64/vmm/io/ppt.c
+++ b/sys/amd64/vmm/io/ppt.c
@@ -421,7 +421,7 @@ pptintr(void *arg)
 	vec = pptarg->vec;
 
 	if (ppt->vm != NULL)
-		(void) lapic_set_intr(ppt->vm, pptarg->vcpu, vec);
+		lapic_intr_edge(ppt->vm, pptarg->vcpu, vec);
 	else {
 		/*
 		 * XXX
diff --git a/sys/amd64/vmm/io/vdev.c b/sys/amd64/vmm/io/vdev.c
deleted file mode 100644
index cd6c5d1b39c..00000000000
--- a/sys/amd64/vmm/io/vdev.c
+++ /dev/null
@@ -1,270 +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/kernel.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-
-#include "vdev.h"
-
-struct vdev {
-	SLIST_ENTRY(vdev) 	 entry;
-	struct vdev_ops 	*ops;
-	void			*dev;
-};
-static SLIST_HEAD(, vdev)	vdev_head;
-static int 		  	vdev_count;
-
-struct vdev_region {
-	SLIST_ENTRY(vdev_region) 	 entry;
-	struct vdev_ops 		*ops;
-	void				*dev;
-	struct io_region		*io;
-};
-static SLIST_HEAD(, vdev_region)	 region_head;
-static int 		  		 region_count;
-
-static MALLOC_DEFINE(M_VDEV, "vdev", "vdev");
-
-#define VDEV_INIT 	(0)
-#define VDEV_RESET	(1)
-#define VDEV_HALT	(2)
-
-// static const char* vdev_event_str[] = {"VDEV_INIT", "VDEV_RESET", "VDEV_HALT"};
-
-static int
-vdev_system_event(int event)
-{
-	struct vdev 	*vd;
-	int		 rc;
-
-	// TODO: locking
-	SLIST_FOREACH(vd, &vdev_head, entry) {
-		// printf("%s : %s Device %s\n", __func__, vdev_event_str[event], vd->ops->name);
-		switch (event) {
-			case VDEV_INIT:
-				rc = vd->ops->init(vd->dev);
-				break;
-			case VDEV_RESET:
-				rc = vd->ops->reset(vd->dev);
-				break;
-			case VDEV_HALT:
-				rc = vd->ops->halt(vd->dev);
-				break;
-			default:
-				break;
-		}
-		if (rc) {
-			printf("vdev %s init failed rc=%d\n",
-			    vd->ops->name, rc);
-			return rc;
-		}
-	}
-	return 0;
-}
-
-int
-vdev_init(void)
-{
-	return vdev_system_event(VDEV_INIT);
-}
-
-int
-vdev_reset(void)
-{
-	return vdev_system_event(VDEV_RESET);
-}
-
-int
-vdev_halt(void)
-{
-	return vdev_system_event(VDEV_HALT);
-}
-
-void
-vdev_vm_init(void)
-{
-	SLIST_INIT(&vdev_head);
-	vdev_count = 0;
-
-	SLIST_INIT(&region_head);
-	region_count = 0;
-}
-void
-vdev_vm_cleanup(void)
-{
-	struct vdev *vd;
-     
-	// TODO: locking
-	while (!SLIST_EMPTY(&vdev_head)) {
-		vd = SLIST_FIRST(&vdev_head);
-		SLIST_REMOVE_HEAD(&vdev_head, entry);
-		free(vd, M_VDEV);
-		vdev_count--;
-	}
-}
-
-int
-vdev_register(struct vdev_ops *ops, void *dev)
-{
-	struct vdev *vd;
-	vd = malloc(sizeof(*vd), M_VDEV, M_WAITOK | M_ZERO); 
-	vd->ops = ops;
-	vd->dev = dev;
-	
-	// TODO: locking
-	SLIST_INSERT_HEAD(&vdev_head, vd, entry); 
-	vdev_count++;
-	return 0;
-}
-
-void
-vdev_unregister(void *dev)
-{
-	struct vdev 	*vd, *found;
-
-	found = NULL;
-	// TODO: locking
-	SLIST_FOREACH(vd, &vdev_head, entry) {
-		if (vd->dev == dev) {
-			found = vd;
-		}
-	}
-
-	if (found) {
-		SLIST_REMOVE(&vdev_head, found, vdev, entry);
-		free(found, M_VDEV);
-	}
-}
-
-#define IN_RANGE(val, start, end)	\
-    (((val) >= (start)) && ((val) < (end)))
-
-static struct vdev_region*
-vdev_find_region(struct io_region *io, void *dev) 
-{
-	struct 		vdev_region *region, *found;
-	uint64_t	region_base;
-	uint64_t	region_end;
-
-	found = NULL;
-
-	// TODO: locking
-	// FIXME: we should verify we are in the context the current
-	// 	  vcpu here as well.
-	SLIST_FOREACH(region, &region_head, entry) {
-		region_base = region->io->base;
-		region_end = region_base + region->io->len;
-		if (IN_RANGE(io->base, region_base, region_end) &&
-		    IN_RANGE(io->base+io->len, region_base, region_end+1) &&
-		    (dev && dev == region->dev)) {
-			found = region;
-			break;
-		}
-	}
-	return found;
-}
-
-int
-vdev_register_region(struct vdev_ops *ops, void *dev, struct io_region *io)
-{
-	struct vdev_region *region;
-
-	region = vdev_find_region(io, dev);
-	if (region) {
-		return -EEXIST;
-	}
-
-	region = malloc(sizeof(*region), M_VDEV, M_WAITOK | M_ZERO);
-	region->io = io;
-	region->ops = ops;
-	region->dev = dev;
-
-	// TODO: locking
-	SLIST_INSERT_HEAD(&region_head, region, entry); 
-	region_count++;
-
-	return 0;
-}
-
-void
-vdev_unregister_region(void *dev, struct io_region *io)
-{
-	struct vdev_region *region;
-
-	region = vdev_find_region(io, dev);
-	
-	if (region) {
-		SLIST_REMOVE(&region_head, region, vdev_region, entry);
-		free(region, M_VDEV);
-		region_count--;
-	}
-}
-
-static int
-vdev_memrw(uint64_t gpa, opsize_t size, uint64_t *data, int read)
-{
-	struct vdev_region 	*region;
-	struct io_region	 io;
-	region_attr_t		 attr;
-	int			 rc;
-
-	io.base = gpa;
-	io.len = size;
-
-	region = vdev_find_region(&io, NULL);
-	if (!region)
-		return -EINVAL;
-	
-	attr = (read) ? MMIO_READ : MMIO_WRITE;
-	if (!(region->io->attr & attr))
-		return -EPERM;
-
-	if (read)
-		rc = region->ops->memread(region->dev, gpa, size, data);
-	else 
-		rc = region->ops->memwrite(region->dev, gpa, size, *data);
-
-	return rc;
-}
-
-int
-vdev_memread(uint64_t gpa, opsize_t size, uint64_t *data)
-{
-	return vdev_memrw(gpa, size, data, 1);
-}
-
-int
-vdev_memwrite(uint64_t gpa, opsize_t size, uint64_t data)
-{
-	return vdev_memrw(gpa, size, &data, 0);
-}
diff --git a/sys/amd64/vmm/io/vhpet.c b/sys/amd64/vmm/io/vhpet.c
new file mode 100644
index 00000000000..112480ee859
--- /dev/null
+++ b/sys/amd64/vmm/io/vhpet.c
@@ -0,0 +1,783 @@
+/*-
+ * Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
+ * Copyright (c) 2013 Neel Natu <neel@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 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/lock.h>
+#include <sys/mutex.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
+#include <sys/cpuset.h>
+
+#include <dev/acpica/acpi_hpet.h>
+
+#include <machine/vmm.h>
+#include <machine/vmm_dev.h>
+
+#include "vmm_lapic.h"
+#include "vioapic.h"
+#include "vhpet.h"
+
+#include "vmm_ktr.h"
+
+static MALLOC_DEFINE(M_VHPET, "vhpet", "bhyve virtual hpet");
+
+#define	HPET_FREQ	10000000		/* 10.0 Mhz */
+#define	FS_PER_S	1000000000000000ul
+
+/* Timer N Configuration and Capabilities Register */
+#define	HPET_TCAP_RO_MASK	(HPET_TCAP_INT_ROUTE 	|		\
+				 HPET_TCAP_FSB_INT_DEL	|		\
+				 HPET_TCAP_SIZE		|		\
+				 HPET_TCAP_PER_INT)
+/*
+ * HPET requires at least 3 timers and up to 32 timers per block.
+ */
+#define	VHPET_NUM_TIMERS	8
+CTASSERT(VHPET_NUM_TIMERS >= 3 && VHPET_NUM_TIMERS <= 32);
+
+struct vhpet_callout_arg {
+	struct vhpet *vhpet;
+	int timer_num;
+};
+
+struct vhpet {
+	struct vm	*vm;
+	struct mtx	mtx;
+	sbintime_t	freq_sbt;
+
+	uint64_t	config;		/* Configuration */
+	uint64_t	isr;		/* Interrupt Status */
+	uint32_t	counter;	/* HPET Counter */
+	sbintime_t	counter_sbt;
+
+	struct {
+		uint64_t	cap_config;	/* Configuration */
+		uint64_t	msireg;		/* FSB interrupt routing */
+		uint32_t	compval;	/* Comparator */
+		uint32_t	comprate;
+		struct callout	callout;
+		struct vhpet_callout_arg arg;
+	} timer[VHPET_NUM_TIMERS];
+};
+
+#define	VHPET_LOCK(vhp)		mtx_lock(&((vhp)->mtx))
+#define	VHPET_UNLOCK(vhp)	mtx_unlock(&((vhp)->mtx))
+
+static uint64_t
+vhpet_capabilities(void)
+{
+	uint64_t cap = 0;
+
+	cap |= 0x8086 << 16;			/* vendor id */
+	cap |= HPET_CAP_LEG_RT;			/* legacy routing capable */
+	cap |= (VHPET_NUM_TIMERS - 1) << 8;	/* number of timers */
+	cap |= 1;				/* revision */
+	cap &= ~HPET_CAP_COUNT_SIZE;		/* 32-bit timer */
+
+	cap &= 0xffffffff;
+	cap |= (FS_PER_S / HPET_FREQ) << 32;	/* tick period in fs */
+
+	return (cap);
+}
+
+static __inline bool
+vhpet_counter_enabled(struct vhpet *vhpet)
+{
+
+	return ((vhpet->config & HPET_CNF_ENABLE) ? true : false);
+}
+
+static __inline bool
+vhpet_timer_msi_enabled(struct vhpet *vhpet, int n)
+{
+	const uint64_t msi_enable = HPET_TCAP_FSB_INT_DEL | HPET_TCNF_FSB_EN;
+
+	/*
+	 * LegacyReplacement Route configuration takes precedence over MSI
+	 * for timers 0 and 1.
+	 */
+	if (n == 0 || n == 1) {
+		if (vhpet->config & HPET_CNF_LEG_RT)
+			return (false);
+	}
+
+	if ((vhpet->timer[n].cap_config & msi_enable) == msi_enable)
+		return (true);
+	else
+		return (false);
+}
+
+static __inline int
+vhpet_timer_ioapic_pin(struct vhpet *vhpet, int n)
+{
+	/*
+	 * If the timer is configured to use MSI then treat it as if the
+	 * timer is not connected to the ioapic.
+	 */
+	if (vhpet_timer_msi_enabled(vhpet, n))
+		return (0);
+
+	if (vhpet->config & HPET_CNF_LEG_RT) {
+		/*
+		 * In "legacy routing" timers 0 and 1 are connected to
+		 * ioapic pins 2 and 8 respectively.
+		 */
+		switch (n) {
+		case 0:
+			return (2);
+		case 1:
+			return (8);
+		}
+	}
+
+	return ((vhpet->timer[n].cap_config & HPET_TCNF_INT_ROUTE) >> 9);
+}
+
+static uint32_t
+vhpet_counter(struct vhpet *vhpet, bool latch)
+{
+	uint32_t val;
+	sbintime_t cur_sbt, delta_sbt;
+
+	val = vhpet->counter;
+	if (vhpet_counter_enabled(vhpet)) {
+		cur_sbt = sbinuptime();
+		delta_sbt = cur_sbt - vhpet->counter_sbt;
+		KASSERT(delta_sbt >= 0,
+		    ("vhpet counter went backwards: %#lx to %#lx",
+		    vhpet->counter_sbt, cur_sbt));
+		val += delta_sbt / vhpet->freq_sbt;
+
+		/*
+		 * Keep track of the last value of the main counter that
+		 * was read by the guest.
+		 */
+		if (latch) {
+			vhpet->counter = val;
+			vhpet->counter_sbt = cur_sbt;
+		}
+	}
+
+	return (val);
+}
+
+static void
+vhpet_timer_clear_isr(struct vhpet *vhpet, int n)
+{
+	int pin;
+
+	if (vhpet->isr & (1 << n)) {
+		pin = vhpet_timer_ioapic_pin(vhpet, n);
+		KASSERT(pin != 0, ("vhpet timer %d irq incorrectly routed", n));
+		vioapic_deassert_irq(vhpet->vm, pin);
+		vhpet->isr &= ~(1 << n);
+	}
+}
+
+static __inline bool
+vhpet_periodic_timer(struct vhpet *vhpet, int n)
+{
+
+	return ((vhpet->timer[n].cap_config & HPET_TCNF_TYPE) != 0);
+}
+
+static __inline bool
+vhpet_timer_interrupt_enabled(struct vhpet *vhpet, int n)
+{
+
+	return ((vhpet->timer[n].cap_config & HPET_TCNF_INT_ENB) != 0);
+}
+
+static __inline bool
+vhpet_timer_edge_trig(struct vhpet *vhpet, int n)
+{
+
+	KASSERT(!vhpet_timer_msi_enabled(vhpet, n), ("vhpet_timer_edge_trig: "
+	    "timer %d is using MSI", n));
+
+	/* The legacy replacement interrupts are always edge triggered */
+	if (vhpet->config & HPET_CNF_LEG_RT) {
+		if (n == 0 || n == 1)
+			return (true);
+	}
+
+	if ((vhpet->timer[n].cap_config & HPET_TCNF_INT_TYPE) == 0)
+		return (true);
+	else
+		return (false);
+}
+
+static void
+vhpet_timer_interrupt(struct vhpet *vhpet, int n)
+{
+	int apicid, vector, vcpuid, pin;
+	cpuset_t dmask;
+
+	/* If interrupts are not enabled for this timer then just return. */
+	if (!vhpet_timer_interrupt_enabled(vhpet, n))
+		return;
+
+	/*
+	 * If a level triggered interrupt is already asserted then just return.
+	 */
+	if ((vhpet->isr & (1 << n)) != 0) {
+		VM_CTR1(vhpet->vm, "hpet t%d intr is already asserted", n);
+		return;
+	}
+
+	if (vhpet_timer_msi_enabled(vhpet, n)) {
+		/*
+		 * XXX should have an API 'vlapic_deliver_msi(vm, addr, data)'
+		 * - assuming physical delivery mode
+		 * - no need to interpret contents of 'msireg' here
+		 */
+		vector = vhpet->timer[n].msireg & 0xff;
+		apicid = (vhpet->timer[n].msireg >> (32 + 12)) & 0xff;
+		if (apicid != 0xff) {
+			/* unicast */
+			vcpuid = vm_apicid2vcpuid(vhpet->vm, apicid);
+			lapic_intr_edge(vhpet->vm, vcpuid, vector);
+		} else {
+			/* broadcast */
+			dmask = vm_active_cpus(vhpet->vm);
+			while ((vcpuid = CPU_FFS(&dmask)) != 0) {
+				vcpuid--;
+				CPU_CLR(vcpuid, &dmask);
+				lapic_intr_edge(vhpet->vm, vcpuid, vector);
+			}
+		}
+		return;
+	}	
+
+	pin = vhpet_timer_ioapic_pin(vhpet, n);
+	if (pin == 0) {
+		VM_CTR1(vhpet->vm, "hpet t%d intr is not routed to ioapic", n);
+		return;
+	}
+
+	if (vhpet_timer_edge_trig(vhpet, n)) {
+		vioapic_pulse_irq(vhpet->vm, pin);
+	} else {
+		vhpet->isr |= 1 << n;
+		vioapic_assert_irq(vhpet->vm, pin);
+	}
+}
+
+static void
+vhpet_adjust_compval(struct vhpet *vhpet, int n, uint32_t counter)
+{
+	uint32_t compval, comprate, compnext;
+
+	KASSERT(vhpet->timer[n].comprate != 0, ("hpet t%d is not periodic", n));
+
+	compval = vhpet->timer[n].compval;
+	comprate = vhpet->timer[n].comprate;
+
+	/*
+	 * Calculate the comparator value to be used for the next periodic
+	 * interrupt.
+	 *
+	 * This function is commonly called from the callout handler.
+	 * In this scenario the 'counter' is ahead of 'compval'. To find
+	 * the next value to program into the accumulator we divide the
+	 * number space between 'compval' and 'counter' into 'comprate'
+	 * sized units. The 'compval' is rounded up such that is "ahead"
+	 * of 'counter'.
+	 */
+	compnext = compval + ((counter - compval) / comprate + 1) * comprate;
+
+	vhpet->timer[n].compval = compnext;
+}
+
+static void
+vhpet_handler(void *a)
+{
+	int n;
+	uint32_t counter;
+	sbintime_t sbt;
+	struct vhpet *vhpet;
+	struct callout *callout;
+	struct vhpet_callout_arg *arg;
+
+	arg = a;
+	vhpet = arg->vhpet;
+	n = arg->timer_num;
+	callout = &vhpet->timer[n].callout;
+
+	VM_CTR1(vhpet->vm, "hpet t%d fired", n);
+
+	VHPET_LOCK(vhpet);
+
+	if (callout_pending(callout))		/* callout was reset */
+		goto done;
+
+	if (!callout_active(callout))		/* callout was stopped */
+		goto done;
+
+	callout_deactivate(callout);
+
+	if (!vhpet_counter_enabled(vhpet))
+		panic("vhpet(%p) callout with counter disabled", vhpet);
+
+	counter = vhpet_counter(vhpet, false);
+
+	/* Update the accumulator for periodic timers */
+	if (vhpet->timer[n].comprate != 0)
+		vhpet_adjust_compval(vhpet, n, counter);
+
+	sbt = (vhpet->timer[n].compval - counter) * vhpet->freq_sbt;
+	callout_reset_sbt(callout, sbt, 0, vhpet_handler, arg, 0);
+	vhpet_timer_interrupt(vhpet, n);
+done:
+	VHPET_UNLOCK(vhpet);
+	return;
+}
+
+static void
+vhpet_stop_timer(struct vhpet *vhpet, int n)
+{
+
+	callout_stop(&vhpet->timer[n].callout);
+	vhpet_timer_clear_isr(vhpet, n);
+}
+
+static void
+vhpet_start_timer(struct vhpet *vhpet, int n)
+{
+	uint32_t counter, delta, delta2;
+	sbintime_t sbt;
+
+	counter = vhpet_counter(vhpet, false);
+
+	if (vhpet->timer[n].comprate != 0)
+		vhpet_adjust_compval(vhpet, n, counter);
+
+	delta = vhpet->timer[n].compval - counter;
+
+	/*
+	 * In one-shot mode the guest will typically read the main counter
+	 * before programming the comparator. We can use this heuristic to
+	 * figure out whether the expiration time is in the past. If this
+	 * is the case we schedule the callout to fire immediately.
+	 */
+	if (!vhpet_periodic_timer(vhpet, n)) {
+		delta2 = vhpet->timer[n].compval - vhpet->counter;
+		if (delta > delta2) {
+			VM_CTR3(vhpet->vm, "hpet t%d comparator value is in "
+			    "the past: %u/%u/%u", counter,
+			    vhpet->timer[n].compval, vhpet->counter);
+			delta = 0;
+		}
+	}
+
+	sbt = delta * vhpet->freq_sbt;
+	callout_reset_sbt(&vhpet->timer[n].callout, sbt, 0, vhpet_handler,
+	    &vhpet->timer[n].arg, 0);
+}
+
+static void
+vhpet_start_counting(struct vhpet *vhpet)
+{
+	int i;
+
+	vhpet->counter_sbt = sbinuptime();
+	for (i = 0; i < VHPET_NUM_TIMERS; i++)
+		vhpet_start_timer(vhpet, i);
+}
+
+static void
+vhpet_stop_counting(struct vhpet *vhpet)
+{
+	int i;
+
+	for (i = 0; i < VHPET_NUM_TIMERS; i++)
+		vhpet_stop_timer(vhpet, i);
+}
+
+static __inline void
+update_register(uint64_t *regptr, uint64_t data, uint64_t mask)
+{
+
+	*regptr &= ~mask;
+	*regptr |= (data & mask);
+}
+
+static void
+vhpet_timer_update_config(struct vhpet *vhpet, int n, uint64_t data,
+    uint64_t mask)
+{
+	bool clear_isr;
+	int old_pin, new_pin;
+	uint32_t allowed_irqs;
+	uint64_t oldval, newval;
+
+	if (vhpet_timer_msi_enabled(vhpet, n) ||
+	    vhpet_timer_edge_trig(vhpet, n)) {
+		if (vhpet->isr & (1 << n))
+			panic("vhpet timer %d isr should not be asserted", n);
+	}
+	old_pin = vhpet_timer_ioapic_pin(vhpet, n);
+	oldval = vhpet->timer[n].cap_config;
+
+	newval = oldval;
+	update_register(&newval, data, mask);
+	newval &= ~(HPET_TCAP_RO_MASK | HPET_TCNF_32MODE);
+	newval |= oldval & HPET_TCAP_RO_MASK;
+
+	if (newval == oldval)
+		return;
+
+	vhpet->timer[n].cap_config = newval;
+	VM_CTR2(vhpet->vm, "hpet t%d cap_config set to 0x%016x", n, newval);
+
+	/*
+	 * Validate the interrupt routing in the HPET_TCNF_INT_ROUTE field.
+	 * If it does not match the bits set in HPET_TCAP_INT_ROUTE then set
+	 * it to the default value of 0.
+	 */
+	allowed_irqs = vhpet->timer[n].cap_config >> 32;
+	new_pin = vhpet_timer_ioapic_pin(vhpet, n);
+	if (new_pin != 0 && (allowed_irqs & (1 << new_pin)) == 0) {
+		VM_CTR3(vhpet->vm, "hpet t%d configured invalid irq %d, "
+		    "allowed_irqs 0x%08x", n, new_pin, allowed_irqs);
+		new_pin = 0;
+		vhpet->timer[n].cap_config &= ~HPET_TCNF_INT_ROUTE;
+	}
+
+	if (!vhpet_periodic_timer(vhpet, n))
+		vhpet->timer[n].comprate = 0;
+
+	/*
+	 * If the timer's ISR bit is set then clear it in the following cases:
+	 * - interrupt is disabled
+	 * - interrupt type is changed from level to edge or fsb.
+	 * - interrupt routing is changed
+	 *
+	 * This is to ensure that this timer's level triggered interrupt does
+	 * not remain asserted forever.
+	 */
+	if (vhpet->isr & (1 << n)) {
+		KASSERT(old_pin != 0, ("timer %d isr asserted to ioapic pin %d",
+		    n, old_pin));
+		if (!vhpet_timer_interrupt_enabled(vhpet, n))
+			clear_isr = true;
+		else if (vhpet_timer_msi_enabled(vhpet, n))
+			clear_isr = true;
+		else if (vhpet_timer_edge_trig(vhpet, n))
+			clear_isr = true;
+		else if (vhpet_timer_ioapic_pin(vhpet, n) != old_pin)
+			clear_isr = true;
+		else
+			clear_isr = false;
+
+		if (clear_isr) {
+			VM_CTR1(vhpet->vm, "hpet t%d isr cleared due to "
+			    "configuration change", n);
+			vioapic_deassert_irq(vhpet->vm, old_pin);
+			vhpet->isr &= ~(1 << n);
+		}
+	}
+}
+
+int
+vhpet_mmio_write(void *vm, int vcpuid, uint64_t gpa, uint64_t val, int size,
+    void *arg)
+{
+	struct vhpet *vhpet;
+	uint64_t data, mask, oldval, val64;
+	uint32_t isr_clear_mask, old_compval, old_comprate;
+	int i, offset;
+
+	vhpet = vm_hpet(vm);
+	offset = gpa - VHPET_BASE;
+
+	VHPET_LOCK(vhpet);
+
+	/* Accesses to the HPET should be 4 or 8 bytes wide */
+	switch (size) {
+	case 8:
+		mask = 0xffffffffffffffff;
+		data = val;
+		break;
+	case 4:
+		mask = 0xffffffff;
+		data = val;
+		if ((offset & 0x4) != 0) {
+			mask <<= 32;
+			data <<= 32;
+		} 
+		break;
+	default:
+		VM_CTR2(vhpet->vm, "hpet invalid mmio write: "
+		    "offset 0x%08x, size %d", offset, size);
+		goto done;
+	}
+
+	/* Access to the HPET should be naturally aligned to its width */
+	if (offset & (size - 1)) {
+		VM_CTR2(vhpet->vm, "hpet invalid mmio write: "
+		    "offset 0x%08x, size %d", offset, size);
+		goto done;
+	}
+
+	if (offset == HPET_CONFIG || offset == HPET_CONFIG + 4) {
+		oldval = vhpet->config;
+		update_register(&vhpet->config, data, mask);
+		if ((oldval ^ vhpet->config) & HPET_CNF_ENABLE) {
+			if (vhpet_counter_enabled(vhpet)) {
+				vhpet_start_counting(vhpet);
+				VM_CTR0(vhpet->vm, "hpet enabled");
+			} else {
+				vhpet_stop_counting(vhpet);
+				VM_CTR0(vhpet->vm, "hpet disabled");
+			}
+		}
+		goto done;
+	}
+
+	if (offset == HPET_ISR || offset == HPET_ISR + 4) {
+		isr_clear_mask = vhpet->isr & data;
+		for (i = 0; i < VHPET_NUM_TIMERS; i++) {
+			if ((isr_clear_mask & (1 << i)) != 0) {
+				VM_CTR1(vhpet->vm, "hpet t%d isr cleared", i);
+				vhpet_timer_clear_isr(vhpet, i);
+			}
+		}
+		goto done;
+	}
+
+	if (offset == HPET_MAIN_COUNTER || offset == HPET_MAIN_COUNTER + 4) {
+		/* Zero-extend the counter to 64-bits before updating it */
+		val64 = vhpet->counter;
+		update_register(&val64, data, mask);
+		vhpet->counter = val64;
+		if (vhpet_counter_enabled(vhpet))
+			vhpet_start_counting(vhpet);
+		goto done;
+	}
+
+	for (i = 0; i < VHPET_NUM_TIMERS; i++) {
+		if (offset == HPET_TIMER_CAP_CNF(i) ||
+		    offset == HPET_TIMER_CAP_CNF(i) + 4) {
+			vhpet_timer_update_config(vhpet, i, data, mask);
+			break;
+		}
+
+		if (offset == HPET_TIMER_COMPARATOR(i) ||
+		    offset == HPET_TIMER_COMPARATOR(i) + 4) {
+			old_compval = vhpet->timer[i].compval;
+			old_comprate = vhpet->timer[i].comprate;
+			if (vhpet_periodic_timer(vhpet, i)) {
+				/*
+				 * In periodic mode writes to the comparator
+				 * change the 'compval' register only if the
+				 * HPET_TCNF_VAL_SET bit is set in the config
+				 * register.
+				 */
+				val64 = vhpet->timer[i].comprate;
+				update_register(&val64, data, mask);
+				vhpet->timer[i].comprate = val64;
+				if ((vhpet->timer[i].cap_config &
+				    HPET_TCNF_VAL_SET) != 0) {
+					vhpet->timer[i].compval = val64;
+				}
+			} else {
+				KASSERT(vhpet->timer[i].comprate == 0,
+				    ("vhpet one-shot timer %d has invalid "
+				    "rate %u", i, vhpet->timer[i].comprate));
+				val64 = vhpet->timer[i].compval;
+				update_register(&val64, data, mask);
+				vhpet->timer[i].compval = val64;
+			}
+			vhpet->timer[i].cap_config &= ~HPET_TCNF_VAL_SET;
+
+			if (vhpet->timer[i].compval != old_compval ||
+			    vhpet->timer[i].comprate != old_comprate) {
+				if (vhpet_counter_enabled(vhpet))
+					vhpet_start_timer(vhpet, i);
+			}
+			break;
+		}
+
+		if (offset == HPET_TIMER_FSB_VAL(i) ||
+		    offset == HPET_TIMER_FSB_ADDR(i)) {
+			update_register(&vhpet->timer[i].msireg, data, mask);
+			break;
+		}
+	}
+done:
+	VHPET_UNLOCK(vhpet);
+	return (0);
+}
+
+int
+vhpet_mmio_read(void *vm, int vcpuid, uint64_t gpa, uint64_t *rval, int size,
+    void *arg)
+{
+	int i, offset;
+	struct vhpet *vhpet;
+	uint64_t data;
+
+	vhpet = vm_hpet(vm);
+	offset = gpa - VHPET_BASE;
+
+	VHPET_LOCK(vhpet);
+
+	/* Accesses to the HPET should be 4 or 8 bytes wide */
+	if (size != 4 && size != 8) {
+		VM_CTR2(vhpet->vm, "hpet invalid mmio read: "
+		    "offset 0x%08x, size %d", offset, size);
+		data = 0;
+		goto done;
+	}
+
+	/* Access to the HPET should be naturally aligned to its width */
+	if (offset & (size - 1)) {
+		VM_CTR2(vhpet->vm, "hpet invalid mmio read: "
+		    "offset 0x%08x, size %d", offset, size);
+		data = 0;
+		goto done;
+	}
+
+	if (offset == HPET_CAPABILITIES || offset == HPET_CAPABILITIES + 4) {
+		data = vhpet_capabilities();
+		goto done;	
+	}
+
+	if (offset == HPET_CONFIG || offset == HPET_CONFIG + 4) {
+		data = vhpet->config;
+		goto done;
+	}
+
+	if (offset == HPET_ISR || offset == HPET_ISR + 4) {
+		data = vhpet->isr;
+		goto done;
+	}
+
+	if (offset == HPET_MAIN_COUNTER || offset == HPET_MAIN_COUNTER + 4) {
+		data = vhpet_counter(vhpet, true);
+		goto done;
+	}
+
+	for (i = 0; i < VHPET_NUM_TIMERS; i++) {
+		if (offset == HPET_TIMER_CAP_CNF(i) ||
+		    offset == HPET_TIMER_CAP_CNF(i) + 4) {
+			data = vhpet->timer[i].cap_config;
+			break;
+		}
+
+		if (offset == HPET_TIMER_COMPARATOR(i) ||
+		    offset == HPET_TIMER_COMPARATOR(i) + 4) {
+			data = vhpet->timer[i].compval;
+			break;
+		}
+
+		if (offset == HPET_TIMER_FSB_VAL(i) ||
+		    offset == HPET_TIMER_FSB_ADDR(i)) {
+			data = vhpet->timer[i].msireg;
+			break;
+		}
+	}
+
+	if (i >= VHPET_NUM_TIMERS)
+		data = 0;
+done:
+	VHPET_UNLOCK(vhpet);
+
+	if (size == 4) {
+		if (offset & 0x4)
+			data >>= 32;
+	}
+	*rval = data;
+	return (0);
+}
+
+struct vhpet *
+vhpet_init(struct vm *vm)
+{
+	int i, pincount;
+	struct vhpet *vhpet;
+	uint64_t allowed_irqs;
+	struct vhpet_callout_arg *arg;
+	struct bintime bt;
+
+	vhpet = malloc(sizeof(struct vhpet), M_VHPET, M_WAITOK | M_ZERO);
+        vhpet->vm = vm;
+	mtx_init(&vhpet->mtx, "vhpet lock", NULL, MTX_DEF);
+
+	FREQ2BT(HPET_FREQ, &bt);
+	vhpet->freq_sbt = bttosbt(bt);
+
+	pincount = vioapic_pincount(vm);
+	if (pincount >= 24)
+		allowed_irqs = 0x00f00000;	/* irqs 20, 21, 22 and 23 */
+	else
+		allowed_irqs = 0;
+
+	/*
+	 * Initialize HPET timer hardware state.
+	 */
+	for (i = 0; i < VHPET_NUM_TIMERS; i++) {
+		vhpet->timer[i].cap_config = allowed_irqs << 32;
+		vhpet->timer[i].cap_config |= HPET_TCAP_PER_INT;
+		vhpet->timer[i].cap_config |= HPET_TCAP_FSB_INT_DEL;
+
+		vhpet->timer[i].compval = 0xffffffff;
+		callout_init(&vhpet->timer[i].callout, 1);
+
+		arg = &vhpet->timer[i].arg;
+		arg->vhpet = vhpet;
+		arg->timer_num = i;
+	}
+
+	return (vhpet);
+}
+
+void
+vhpet_cleanup(struct vhpet *vhpet)
+{
+	int i;
+
+	for (i = 0; i < VHPET_NUM_TIMERS; i++)
+		callout_drain(&vhpet->timer[i].callout);
+
+	free(vhpet, M_VHPET);
+}
+
+int
+vhpet_getcap(struct vm_hpet_cap *cap)
+{
+
+	cap->capabilities = vhpet_capabilities();
+	return (0);
+}
diff --git a/sys/amd64/vmm/io/vhpet.h b/sys/amd64/vmm/io/vhpet.h
new file mode 100644
index 00000000000..330e01739a0
--- /dev/null
+++ b/sys/amd64/vmm/io/vhpet.h
@@ -0,0 +1,44 @@
+/*-
+ * Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
+ * Copyright (c) 2013 Neel Natu <neel@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 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$
+ */
+
+#ifndef _VHPET_H_
+#define	_VHPET_H_
+
+#define	VHPET_BASE	0xfed00000
+#define	VHPET_SIZE	1024
+
+struct vhpet *vhpet_init(struct vm *vm);
+void 	vhpet_cleanup(struct vhpet *vhpet);
+int	vhpet_mmio_write(void *vm, int vcpuid, uint64_t gpa, uint64_t val,
+	    int size, void *arg);
+int	vhpet_mmio_read(void *vm, int vcpuid, uint64_t gpa, uint64_t *val,
+	    int size, void *arg);
+int	vhpet_getcap(struct vm_hpet_cap *cap);
+
+#endif	/* _VHPET_H_ */
diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c
new file mode 100644
index 00000000000..167e8ab9a1b
--- /dev/null
+++ b/sys/amd64/vmm/io/vioapic.c
@@ -0,0 +1,475 @@
+/*-
+ * Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
+ * Copyright (c) 2013 Neel Natu <neel@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 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/queue.h>
+#include <sys/cpuset.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+
+#include <x86/apicreg.h>
+#include <machine/vmm.h>
+
+#include "vmm_ktr.h"
+#include "vmm_lapic.h"
+#include "vioapic.h"
+
+#define	IOREGSEL	0x00
+#define	IOWIN		0x10
+
+#define	REDIR_ENTRIES	24
+#define	RTBL_RO_BITS	((uint64_t)(IOART_REM_IRR | IOART_DELIVS))
+
+struct vioapic {
+	struct vm	*vm;
+	struct mtx	mtx;
+	uint32_t	id;
+	uint32_t	ioregsel;
+	struct {
+		uint64_t reg;
+		int	 acnt;	/* sum of pin asserts (+1) and deasserts (-1) */
+	} rtbl[REDIR_ENTRIES];
+};
+
+#define	VIOAPIC_LOCK(vioapic)		mtx_lock(&((vioapic)->mtx))
+#define	VIOAPIC_UNLOCK(vioapic)		mtx_unlock(&((vioapic)->mtx))
+#define	VIOAPIC_LOCKED(vioapic)		mtx_owned(&((vioapic)->mtx))
+
+static MALLOC_DEFINE(M_VIOAPIC, "vioapic", "bhyve virtual ioapic");
+
+#define	VIOAPIC_CTR1(vioapic, fmt, a1)					\
+	VM_CTR1((vioapic)->vm, fmt, a1)
+
+#define	VIOAPIC_CTR2(vioapic, fmt, a1, a2)				\
+	VM_CTR2((vioapic)->vm, fmt, a1, a2)
+
+#define	VIOAPIC_CTR3(vioapic, fmt, a1, a2, a3)				\
+	VM_CTR3((vioapic)->vm, fmt, a1, a2, a3)
+
+#define	VIOAPIC_CTR4(vioapic, fmt, a1, a2, a3, a4)			\
+	VM_CTR4((vioapic)->vm, fmt, a1, a2, a3, a4)
+
+#ifdef KTR
+static const char *
+pinstate_str(bool asserted)
+{
+
+	if (asserted)
+		return ("asserted");
+	else
+		return ("deasserted");
+}
+
+static const char *
+trigger_str(bool level)
+{
+
+	if (level)
+		return ("level");
+	else
+		return ("edge");
+}
+#endif
+
+static void
+vioapic_send_intr(struct vioapic *vioapic, int pin)
+{
+	int vector, apicid, vcpuid;
+	uint32_t low, high;
+	cpuset_t dmask;
+	bool level;
+
+	KASSERT(pin >= 0 && pin < REDIR_ENTRIES,
+	    ("vioapic_set_pinstate: invalid pin number %d", pin));
+
+	KASSERT(VIOAPIC_LOCKED(vioapic),
+	    ("vioapic_set_pinstate: vioapic is not locked"));
+
+	low = vioapic->rtbl[pin].reg;
+	high = vioapic->rtbl[pin].reg >> 32;
+
+	/*
+	 * XXX We only deal with:
+	 * - physical destination
+	 * - fixed delivery mode
+	 */
+	if ((low & IOART_DESTMOD) != IOART_DESTPHY) {
+		VIOAPIC_CTR2(vioapic, "ioapic pin%d: unsupported dest mode "
+		    "0x%08x", pin, low);
+		return;
+	}
+
+	if ((low & IOART_DELMOD) != IOART_DELFIXED) {
+		VIOAPIC_CTR2(vioapic, "ioapic pin%d: unsupported delivery mode "
+		    "0x%08x", pin, low);
+		return;
+	}
+
+	if ((low & IOART_INTMASK) == IOART_INTMSET) {
+		VIOAPIC_CTR1(vioapic, "ioapic pin%d: masked", pin);
+		return;
+	}
+
+	level = low & IOART_TRGRLVL ? true : false;
+	if (level)
+		vioapic->rtbl[pin].reg |= IOART_REM_IRR;
+
+	vector = low & IOART_INTVEC;
+	apicid = high >> APIC_ID_SHIFT;
+	if (apicid != 0xff) {
+		/* unicast */
+		vcpuid = vm_apicid2vcpuid(vioapic->vm, apicid);
+		VIOAPIC_CTR4(vioapic, "ioapic pin%d: %s triggered intr "
+		    "vector %d on vcpuid %d", pin, trigger_str(level),
+		    vector, vcpuid);
+		lapic_set_intr(vioapic->vm, vcpuid, vector, level);
+	} else {
+		/* broadcast */
+		VIOAPIC_CTR3(vioapic, "ioapic pin%d: %s triggered intr "
+		    "vector %d on all vcpus", pin, trigger_str(level), vector);
+		dmask = vm_active_cpus(vioapic->vm);
+		while ((vcpuid = CPU_FFS(&dmask)) != 0) {
+			vcpuid--;
+			CPU_CLR(vcpuid, &dmask);
+			lapic_set_intr(vioapic->vm, vcpuid, vector, level);
+		}
+	}
+}
+
+static void
+vioapic_set_pinstate(struct vioapic *vioapic, int pin, bool newstate)
+{
+	int oldcnt, newcnt;
+	bool needintr;
+
+	KASSERT(pin >= 0 && pin < REDIR_ENTRIES,
+	    ("vioapic_set_pinstate: invalid pin number %d", pin));
+
+	KASSERT(VIOAPIC_LOCKED(vioapic),
+	    ("vioapic_set_pinstate: vioapic is not locked"));
+
+	oldcnt = vioapic->rtbl[pin].acnt;
+	if (newstate)
+		vioapic->rtbl[pin].acnt++;
+	else
+		vioapic->rtbl[pin].acnt--;
+	newcnt = vioapic->rtbl[pin].acnt;
+
+	if (newcnt < 0) {
+		VIOAPIC_CTR2(vioapic, "ioapic pin%d: bad acnt %d",
+		    pin, newcnt);
+	}
+
+	needintr = false;
+	if (oldcnt == 0 && newcnt == 1) {
+		needintr = true;
+		VIOAPIC_CTR1(vioapic, "ioapic pin%d: asserted", pin);
+	} else if (oldcnt == 1 && newcnt == 0) {
+		VIOAPIC_CTR1(vioapic, "ioapic pin%d: deasserted", pin);
+	} else {
+		VIOAPIC_CTR3(vioapic, "ioapic pin%d: %s, ignored, acnt %d",
+		    pin, pinstate_str(newstate), newcnt);
+	}
+
+	if (needintr)
+		vioapic_send_intr(vioapic, pin);
+}
+
+enum irqstate {
+	IRQSTATE_ASSERT,
+	IRQSTATE_DEASSERT,
+	IRQSTATE_PULSE
+};
+
+static int
+vioapic_set_irqstate(struct vm *vm, int irq, enum irqstate irqstate)
+{
+	struct vioapic *vioapic;
+
+	if (irq < 0 || irq >= REDIR_ENTRIES)
+		return (EINVAL);
+
+	vioapic = vm_ioapic(vm);
+
+	VIOAPIC_LOCK(vioapic);
+	switch (irqstate) {
+	case IRQSTATE_ASSERT:
+		vioapic_set_pinstate(vioapic, irq, true);
+		break;
+	case IRQSTATE_DEASSERT:
+		vioapic_set_pinstate(vioapic, irq, false);
+		break;
+	case IRQSTATE_PULSE:
+		vioapic_set_pinstate(vioapic, irq, true);
+		vioapic_set_pinstate(vioapic, irq, false);
+		break;
+	default:
+		panic("vioapic_set_irqstate: invalid irqstate %d", irqstate);
+	}
+	VIOAPIC_UNLOCK(vioapic);
+
+	return (0);
+}
+
+int
+vioapic_assert_irq(struct vm *vm, int irq)
+{
+
+	return (vioapic_set_irqstate(vm, irq, IRQSTATE_ASSERT));
+}
+
+int
+vioapic_deassert_irq(struct vm *vm, int irq)
+{
+
+	return (vioapic_set_irqstate(vm, irq, IRQSTATE_DEASSERT));
+}
+
+int
+vioapic_pulse_irq(struct vm *vm, int irq)
+{
+
+	return (vioapic_set_irqstate(vm, irq, IRQSTATE_PULSE));
+}
+
+static uint32_t
+vioapic_read(struct vioapic *vioapic, uint32_t addr)
+{
+	int regnum, pin, rshift;
+
+	regnum = addr & 0xff;
+	switch (regnum) {
+	case IOAPIC_ID:
+		return (vioapic->id);
+		break;
+	case IOAPIC_VER:
+		return (((REDIR_ENTRIES - 1) << MAXREDIRSHIFT) | 0x11);
+		break;
+	case IOAPIC_ARB:
+		return (vioapic->id);
+		break;
+	default:
+		break;
+	}
+
+	/* redirection table entries */
+	if (regnum >= IOAPIC_REDTBL &&
+	    regnum < IOAPIC_REDTBL + REDIR_ENTRIES * 2) {
+		pin = (regnum - IOAPIC_REDTBL) / 2;
+		if ((regnum - IOAPIC_REDTBL) % 2)
+			rshift = 32;
+		else
+			rshift = 0;
+
+		return (vioapic->rtbl[pin].reg >> rshift);
+	}
+
+	return (0);
+}
+
+static void
+vioapic_write(struct vioapic *vioapic, uint32_t addr, uint32_t data)
+{
+	uint64_t data64, mask64;
+	int regnum, pin, lshift;
+
+	regnum = addr & 0xff;
+	switch (regnum) {
+	case IOAPIC_ID:
+		vioapic->id = data & APIC_ID_MASK;
+		break;
+	case IOAPIC_VER:
+	case IOAPIC_ARB:
+		/* readonly */
+		break;
+	default:
+		break;
+	}
+
+	/* redirection table entries */
+	if (regnum >= IOAPIC_REDTBL &&
+	    regnum < IOAPIC_REDTBL + REDIR_ENTRIES * 2) {
+		pin = (regnum - IOAPIC_REDTBL) / 2;
+		if ((regnum - IOAPIC_REDTBL) % 2)
+			lshift = 32;
+		else
+			lshift = 0;
+
+		data64 = (uint64_t)data << lshift;
+		mask64 = (uint64_t)0xffffffff << lshift;
+		vioapic->rtbl[pin].reg &= ~mask64 | RTBL_RO_BITS;
+		vioapic->rtbl[pin].reg |= data64 & ~RTBL_RO_BITS;
+
+		VIOAPIC_CTR2(vioapic, "ioapic pin%d: redir table entry %#lx",
+		    pin, vioapic->rtbl[pin].reg);
+
+		/*
+		 * Generate an interrupt if the following conditions are met:
+		 * - pin is not masked
+		 * - previous interrupt has been EOIed
+		 * - pin level is asserted
+		 */
+		if ((vioapic->rtbl[pin].reg & IOART_INTMASK) == IOART_INTMCLR &&
+		    (vioapic->rtbl[pin].reg & IOART_REM_IRR) == 0 &&
+		    (vioapic->rtbl[pin].acnt > 0)) {
+			VIOAPIC_CTR2(vioapic, "ioapic pin%d: asserted at rtbl "
+			    "write, acnt %d", pin, vioapic->rtbl[pin].acnt);
+			vioapic_send_intr(vioapic, pin);
+		}
+	}
+}
+
+static int
+vioapic_mmio_rw(struct vioapic *vioapic, uint64_t gpa, uint64_t *data,
+    int size, bool doread)
+{
+	uint64_t offset;
+
+	offset = gpa - VIOAPIC_BASE;
+
+	/*
+	 * The IOAPIC specification allows 32-bit wide accesses to the
+	 * IOREGSEL (offset 0) and IOWIN (offset 16) registers.
+	 */
+	if (size != 4 || (offset != IOREGSEL && offset != IOWIN)) {
+		if (doread)
+			*data = 0;
+		return (0);
+	}
+
+	VIOAPIC_LOCK(vioapic);
+	if (offset == IOREGSEL) {
+		if (doread)
+			*data = vioapic->ioregsel;
+		else
+			vioapic->ioregsel = *data;
+	} else {
+		if (doread)
+			*data = vioapic_read(vioapic, vioapic->ioregsel);
+		else
+			vioapic_write(vioapic, vioapic->ioregsel, *data);
+	}
+	VIOAPIC_UNLOCK(vioapic);
+
+	return (0);
+}
+
+int
+vioapic_mmio_read(void *vm, int vcpuid, uint64_t gpa, uint64_t *rval,
+    int size, void *arg)
+{
+	int error;
+	struct vioapic *vioapic;
+
+	vioapic = vm_ioapic(vm);
+	error = vioapic_mmio_rw(vioapic, gpa, rval, size, true);
+	return (error);
+}
+
+int
+vioapic_mmio_write(void *vm, int vcpuid, uint64_t gpa, uint64_t wval,
+    int size, void *arg)
+{
+	int error;
+	struct vioapic *vioapic;
+
+	vioapic = vm_ioapic(vm);
+	error = vioapic_mmio_rw(vioapic, gpa, &wval, size, false);
+	return (error);
+}
+
+void
+vioapic_process_eoi(struct vm *vm, int vcpuid, int vector)
+{
+	struct vioapic *vioapic;
+	int pin;
+
+	KASSERT(vector >= 0 && vector < 256,
+	    ("vioapic_process_eoi: invalid vector %d", vector));
+
+	vioapic = vm_ioapic(vm);
+	VIOAPIC_CTR1(vioapic, "ioapic processing eoi for vector %d", vector);
+
+	/*
+	 * XXX keep track of the pins associated with this vector instead
+	 * of iterating on every single pin each time.
+	 */
+	VIOAPIC_LOCK(vioapic);
+	for (pin = 0; pin < REDIR_ENTRIES; pin++) {
+		if ((vioapic->rtbl[pin].reg & IOART_REM_IRR) == 0)
+			continue;
+		if ((vioapic->rtbl[pin].reg & IOART_INTVEC) != vector)
+			continue;
+		vioapic->rtbl[pin].reg &= ~IOART_REM_IRR;
+		if (vioapic->rtbl[pin].acnt > 0) {
+			VIOAPIC_CTR2(vioapic, "ioapic pin%d: asserted at eoi, "
+			    "acnt %d", pin, vioapic->rtbl[pin].acnt);
+			vioapic_send_intr(vioapic, pin);
+		}
+	}
+	VIOAPIC_UNLOCK(vioapic);
+}
+
+struct vioapic *
+vioapic_init(struct vm *vm)
+{
+	int i;
+	struct vioapic *vioapic;
+
+	vioapic = malloc(sizeof(struct vioapic), M_VIOAPIC, M_WAITOK | M_ZERO);
+
+	vioapic->vm = vm;
+	mtx_init(&vioapic->mtx, "vioapic lock", NULL, MTX_DEF);
+
+	/* Initialize all redirection entries to mask all interrupts */
+	for (i = 0; i < REDIR_ENTRIES; i++)
+		vioapic->rtbl[i].reg = 0x0001000000010000UL;
+
+	return (vioapic);
+}
+
+void
+vioapic_cleanup(struct vioapic *vioapic)
+{
+
+	free(vioapic, M_VIOAPIC);
+}
+
+int
+vioapic_pincount(struct vm *vm)
+{
+
+	return (REDIR_ENTRIES);
+}
diff --git a/sys/amd64/vmm/io/vioapic.h b/sys/amd64/vmm/io/vioapic.h
new file mode 100644
index 00000000000..65176b3d6de
--- /dev/null
+++ b/sys/amd64/vmm/io/vioapic.h
@@ -0,0 +1,50 @@
+/*-
+ * Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.com>
+ * Copyright (c) 2013 Neel Natu <neel@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 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$
+ */
+
+#ifndef _VIOAPIC_H_
+#define	_VIOAPIC_H_
+
+#define	VIOAPIC_BASE	0xFEC00000
+#define	VIOAPIC_SIZE	4096
+
+struct vioapic *vioapic_init(struct vm *vm);
+void	vioapic_cleanup(struct vioapic *vioapic);
+
+int	vioapic_assert_irq(struct vm *vm, int irq);
+int	vioapic_deassert_irq(struct vm *vm, int irq);
+int	vioapic_pulse_irq(struct vm *vm, int irq);
+
+int	vioapic_mmio_write(void *vm, int vcpuid, uint64_t gpa,
+	    uint64_t wval, int size, void *arg);
+int	vioapic_mmio_read(void *vm, int vcpuid, uint64_t gpa,
+	    uint64_t *rval, int size, void *arg);
+
+int	vioapic_pincount(struct vm *vm);
+void	vioapic_process_eoi(struct vm *vm, int vcpuid, int vector);
+#endif
diff --git a/sys/amd64/vmm/io/vlapic.c b/sys/amd64/vmm/io/vlapic.c
index 6bfd034a8b2..f0306e2eb30 100644
--- a/sys/amd64/vmm/io/vlapic.c
+++ b/sys/amd64/vmm/io/vlapic.c
@@ -30,8 +30,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/smp.h>
 
@@ -44,14 +46,17 @@ __FBSDID("$FreeBSD$");
 #include "vmm_stat.h"
 #include "vmm_lapic.h"
 #include "vmm_ktr.h"
-#include "vdev.h"
 #include "vlapic.h"
+#include "vioapic.h"
 
 #define	VLAPIC_CTR0(vlapic, format)					\
-	VMM_CTR0((vlapic)->vm, (vlapic)->vcpuid, format)
+	VCPU_CTR0((vlapic)->vm, (vlapic)->vcpuid, format)
 
 #define	VLAPIC_CTR1(vlapic, format, p1)					\
-	VMM_CTR1((vlapic)->vm, (vlapic)->vcpuid, format, p1)
+	VCPU_CTR1((vlapic)->vm, (vlapic)->vcpuid, format, p1)
+
+#define	VLAPIC_CTR2(vlapic, format, p1, p2)				\
+	VCPU_CTR2((vlapic)->vm, (vlapic)->vcpuid, format, p1, p2)
 
 #define	VLAPIC_CTR_IRR(vlapic, msg)					\
 do {									\
@@ -100,14 +105,15 @@ struct vlapic {
 	struct vm		*vm;
 	int			vcpuid;
 
-	struct io_region	*mmio;
-	struct vdev_ops		*ops;
-	struct LAPIC		 apic;
+	struct LAPIC		apic;
 
 	int			 esr_update;
 
-	int			 divisor;
-	int			 ccr_ticks;
+	struct callout	callout;	/* vlapic timer */
+	struct bintime	timer_fire_bt;	/* callout expiry time */
+	struct bintime	timer_freq_bt;	/* timer frequency */
+	struct bintime	timer_period_bt; /* timer period */
+	struct mtx	timer_mtx;
 
 	/*
 	 * The 'isrvec_stk' is a stack of vectors injected by the local apic.
@@ -122,6 +128,21 @@ struct vlapic {
 	enum boot_state		boot_state;
 };
 
+/*
+ * The 'vlapic->timer_mtx' is used to provide mutual exclusion between the
+ * vlapic_callout_handler() and vcpu accesses to the following registers:
+ * - initial count register aka icr_timer
+ * - current count register aka ccr_timer
+ * - divide config register aka dcr_timer
+ * - timer LVT register
+ *
+ * Note that the vlapic_callout_handler() does not write to any of these
+ * registers so they can be safely read from the vcpu context without locking.
+ */
+#define	VLAPIC_TIMER_LOCK(vlapic)	mtx_lock_spin(&((vlapic)->timer_mtx))
+#define	VLAPIC_TIMER_UNLOCK(vlapic)	mtx_unlock_spin(&((vlapic)->timer_mtx))
+#define	VLAPIC_TIMER_LOCKED(vlapic)	mtx_owned(&((vlapic)->timer_mtx))
+
 #define VLAPIC_BUS_FREQ	tsc_freq
 
 static int
@@ -169,11 +190,62 @@ vlapic_dump_lvt(uint32_t offset, uint32_t *lvt)
 }
 #endif
 
-static uint64_t
+static uint32_t
 vlapic_get_ccr(struct vlapic *vlapic)
 {
-	struct LAPIC    *lapic = &vlapic->apic;
-	return lapic->ccr_timer;
+	struct bintime bt_now, bt_rem;
+	struct LAPIC *lapic;
+	uint32_t ccr;
+	
+	ccr = 0;
+	lapic = &vlapic->apic;
+
+	VLAPIC_TIMER_LOCK(vlapic);
+	if (callout_active(&vlapic->callout)) {
+		/*
+		 * If the timer is scheduled to expire in the future then
+		 * compute the value of 'ccr' based on the remaining time.
+		 */
+		binuptime(&bt_now);
+		if (bintime_cmp(&vlapic->timer_fire_bt, &bt_now, >)) {
+			bt_rem = vlapic->timer_fire_bt;
+			bintime_sub(&bt_rem, &bt_now);
+			ccr += bt_rem.sec * BT2FREQ(&vlapic->timer_freq_bt);
+			ccr += bt_rem.frac / vlapic->timer_freq_bt.frac;
+		}
+	}
+	KASSERT(ccr <= lapic->icr_timer, ("vlapic_get_ccr: invalid ccr %#x, "
+	    "icr_timer is %#x", ccr, lapic->icr_timer));
+	VLAPIC_CTR2(vlapic, "vlapic ccr_timer = %#x, icr_timer = %#x",
+	    ccr, lapic->icr_timer);
+	VLAPIC_TIMER_UNLOCK(vlapic);
+	return (ccr);
+}
+
+static void
+vlapic_set_dcr(struct vlapic *vlapic, uint32_t dcr)
+{
+	struct LAPIC *lapic;
+	int divisor;
+	
+	lapic = &vlapic->apic;
+	VLAPIC_TIMER_LOCK(vlapic);
+
+	lapic->dcr_timer = dcr;
+	divisor = vlapic_timer_divisor(dcr);
+	VLAPIC_CTR2(vlapic, "vlapic dcr_timer=%#x, divisor=%d", dcr, divisor);
+
+	/*
+	 * Update the timer frequency and the timer period.
+	 *
+	 * XXX changes to the frequency divider will not take effect until
+	 * the timer is reloaded.
+	 */
+	FREQ2BT(VLAPIC_BUS_FREQ / divisor, &vlapic->timer_freq_bt);
+	vlapic->timer_period_bt = vlapic->timer_freq_bt;
+	bintime_mul(&vlapic->timer_period_bt, lapic->icr_timer);
+
+	VLAPIC_TIMER_UNLOCK(vlapic);
 }
 
 static void
@@ -195,15 +267,14 @@ vlapic_init_ipi(struct vlapic *vlapic)
 }
 
 static int
-vlapic_op_reset(void* dev)
+vlapic_reset(struct vlapic *vlapic)
 {
-	struct vlapic 	*vlapic = (struct vlapic*)dev;
 	struct LAPIC	*lapic = &vlapic->apic;
 
 	memset(lapic, 0, sizeof(*lapic));
 	lapic->apr = vlapic->vcpuid;
 	vlapic_init_ipi(vlapic);
-	vlapic->divisor = vlapic_timer_divisor(lapic->dcr_timer);
+	vlapic_set_dcr(vlapic, 0);
 
 	if (vlapic->vcpuid == 0)
 		vlapic->boot_state = BS_RUNNING;	/* BSP */
@@ -214,63 +285,44 @@ vlapic_op_reset(void* dev)
 
 }
 
-static int
-vlapic_op_init(void* dev)
-{
-	struct vlapic *vlapic = (struct vlapic*)dev;
-	vdev_register_region(vlapic->ops, vlapic, vlapic->mmio);
-	return vlapic_op_reset(dev);
-}
-
-static int
-vlapic_op_halt(void* dev)
-{
-	struct vlapic *vlapic = (struct vlapic*)dev;
-	vdev_unregister_region(vlapic, vlapic->mmio);
-	return 0;
-
-}
-
 void
-vlapic_set_intr_ready(struct vlapic *vlapic, int vector)
+vlapic_set_intr_ready(struct vlapic *vlapic, int vector, bool level)
 {
 	struct LAPIC	*lapic = &vlapic->apic;
-	uint32_t	*irrptr;
+	uint32_t	*irrptr, *tmrptr, mask;
 	int		idx;
 
 	if (vector < 0 || vector >= 256)
 		panic("vlapic_set_intr_ready: invalid vector %d\n", vector);
 
+	if (!(lapic->svr & APIC_SVR_ENABLE)) {
+		VLAPIC_CTR1(vlapic, "vlapic is software disabled, ignoring "
+		    "interrupt %d", vector);
+		return;
+	}
+
 	idx = (vector / 32) * 4;
+	mask = 1 << (vector % 32);
+
 	irrptr = &lapic->irr0;
-	atomic_set_int(&irrptr[idx], 1 << (vector % 32));
+	atomic_set_int(&irrptr[idx], mask);
+
+	/*
+	 * Upon acceptance of an interrupt into the IRR the corresponding
+	 * TMR bit is cleared for edge-triggered interrupts and set for
+	 * level-triggered interrupts.
+	 */
+	tmrptr = &lapic->tmr0;
+	if (level)
+		atomic_set_int(&tmrptr[idx], mask);
+	else
+		atomic_clear_int(&tmrptr[idx], mask);
+
 	VLAPIC_CTR_IRR(vlapic, "vlapic_set_intr_ready");
 }
 
-static void
-vlapic_start_timer(struct vlapic *vlapic, uint32_t elapsed)
-{
-	uint32_t icr_timer;
-
-	icr_timer = vlapic->apic.icr_timer;
-
-	vlapic->ccr_ticks = ticks;
-	if (elapsed < icr_timer)
-		vlapic->apic.ccr_timer = icr_timer - elapsed;
-	else {
-		/*
-		 * This can happen when the guest is trying to run its local
-		 * apic timer higher that the setting of 'hz' in the host.
-		 *
-		 * We deal with this by running the guest local apic timer
-		 * at the rate of the host's 'hz' setting.
-		 */
-		vlapic->apic.ccr_timer = 0;
-	}
-}
-
 static __inline uint32_t *
-vlapic_get_lvt(struct vlapic *vlapic, uint32_t offset)
+vlapic_get_lvtptr(struct vlapic *vlapic, uint32_t offset)
 {
 	struct LAPIC	*lapic = &vlapic->apic;
 	int 		 i;
@@ -282,6 +334,33 @@ vlapic_get_lvt(struct vlapic *vlapic, uint32_t offset)
 	return ((&lapic->lvt_timer) + i);;
 }
 
+static __inline uint32_t
+vlapic_get_lvt(struct vlapic *vlapic, uint32_t offset)
+{
+
+	return (*vlapic_get_lvtptr(vlapic, offset));
+}
+
+static void
+vlapic_set_lvt(struct vlapic *vlapic, uint32_t offset, uint32_t val)
+{
+	uint32_t *lvtptr;
+	struct LAPIC *lapic;
+	
+	lapic = &vlapic->apic;
+	lvtptr = vlapic_get_lvtptr(vlapic, offset);	
+
+	if (offset == APIC_OFFSET_TIMER_LVT)
+		VLAPIC_TIMER_LOCK(vlapic);
+
+	if (!(lapic->svr & APIC_SVR_ENABLE))
+		val |= APIC_LVT_M;
+	*lvtptr = val;
+
+	if (offset == APIC_OFFSET_TIMER_LVT)
+		VLAPIC_TIMER_UNLOCK(vlapic);
+}
+
 #if 1
 static void
 dump_isrvec_stk(struct vlapic *vlapic)
@@ -371,10 +450,11 @@ static void
 vlapic_process_eoi(struct vlapic *vlapic)
 {
 	struct LAPIC	*lapic = &vlapic->apic;
-	uint32_t	*isrptr;
-	int		i, idx, bitpos;
+	uint32_t	*isrptr, *tmrptr;
+	int		i, idx, bitpos, vector;
 
 	isrptr = &lapic->isr0;
+	tmrptr = &lapic->tmr0;
 
 	/*
 	 * The x86 architecture reserves the the first 32 vectors for use
@@ -383,30 +463,36 @@ vlapic_process_eoi(struct vlapic *vlapic)
 	for (i = 7; i > 0; i--) {
 		idx = i * 4;
 		bitpos = fls(isrptr[idx]);
-		if (bitpos != 0) {
+		if (bitpos-- != 0) {
 			if (vlapic->isrvec_stk_top <= 0) {
 				panic("invalid vlapic isrvec_stk_top %d",
 				      vlapic->isrvec_stk_top);
 			}
-			isrptr[idx] &= ~(1 << (bitpos - 1));
+			isrptr[idx] &= ~(1 << bitpos);
 			VLAPIC_CTR_ISR(vlapic, "vlapic_process_eoi");
 			vlapic->isrvec_stk_top--;
 			vlapic_update_ppr(vlapic);
+			if ((tmrptr[idx] & (1 << bitpos)) != 0) {
+				vector = i * 32 + bitpos;
+				vioapic_process_eoi(vlapic->vm, vlapic->vcpuid,
+				    vector);
+			}
 			return;
 		}
 	}
 }
 
 static __inline int
-vlapic_get_lvt_field(uint32_t *lvt, uint32_t mask)
+vlapic_get_lvt_field(uint32_t lvt, uint32_t mask)
 {
-	return (*lvt & mask);
+
+	return (lvt & mask);
 }
 
 static __inline int
 vlapic_periodic_timer(struct vlapic *vlapic)
 {
-	uint32_t *lvt;
+	uint32_t lvt;
 	
 	lvt = vlapic_get_lvt(vlapic, APIC_OFFSET_TIMER_LVT);
 
@@ -419,21 +505,115 @@ static void
 vlapic_fire_timer(struct vlapic *vlapic)
 {
 	int vector;
-	uint32_t *lvt;
+	uint32_t lvt;
+
+	KASSERT(VLAPIC_TIMER_LOCKED(vlapic), ("vlapic_fire_timer not locked"));
 	
 	lvt = vlapic_get_lvt(vlapic, APIC_OFFSET_TIMER_LVT);
 
 	if (!vlapic_get_lvt_field(lvt, APIC_LVTT_M)) {
 		vmm_stat_incr(vlapic->vm, vlapic->vcpuid, VLAPIC_INTR_TIMER, 1);
-		vector = vlapic_get_lvt_field(lvt,APIC_LVTT_VECTOR);
-		vlapic_set_intr_ready(vlapic, vector);
+		vector = vlapic_get_lvt_field(lvt, APIC_LVTT_VECTOR);
+		vlapic_set_intr_ready(vlapic, vector, false);
+		vcpu_notify_event(vlapic->vm, vlapic->vcpuid);
 	}
 }
 
+static void
+vlapic_callout_handler(void *arg)
+{
+	struct vlapic *vlapic;
+	struct bintime bt, btnow;
+	sbintime_t rem_sbt;
+
+	vlapic = arg;
+
+	VLAPIC_TIMER_LOCK(vlapic);
+	if (callout_pending(&vlapic->callout))	/* callout was reset */
+		goto done;
+
+	if (!callout_active(&vlapic->callout))	/* callout was stopped */
+		goto done;
+
+	callout_deactivate(&vlapic->callout);
+
+	KASSERT(vlapic->apic.icr_timer != 0, ("vlapic timer is disabled"));
+
+	vlapic_fire_timer(vlapic);
+
+	if (vlapic_periodic_timer(vlapic)) {
+		binuptime(&btnow);
+		KASSERT(bintime_cmp(&btnow, &vlapic->timer_fire_bt, >=),
+		    ("vlapic callout at %#lx.%#lx, expected at %#lx.#%lx",
+		    btnow.sec, btnow.frac, vlapic->timer_fire_bt.sec,
+		    vlapic->timer_fire_bt.frac));
+
+		/*
+		 * Compute the delta between when the timer was supposed to
+		 * fire and the present time.
+		 */
+		bt = btnow;
+		bintime_sub(&bt, &vlapic->timer_fire_bt);
+
+		rem_sbt = bttosbt(vlapic->timer_period_bt);
+		if (bintime_cmp(&bt, &vlapic->timer_period_bt, <)) {
+			/*
+			 * Adjust the time until the next countdown downward
+			 * to account for the lost time.
+			 */
+			rem_sbt -= bttosbt(bt);
+		} else {
+			/*
+			 * If the delta is greater than the timer period then
+			 * just reset our time base instead of trying to catch
+			 * up.
+			 */
+			vlapic->timer_fire_bt = btnow;
+			VLAPIC_CTR2(vlapic, "vlapic timer lagging by %lu "
+			    "usecs, period is %lu usecs - resetting time base",
+			    bttosbt(bt) / SBT_1US,
+			    bttosbt(vlapic->timer_period_bt) / SBT_1US);
+		}
+
+		bintime_add(&vlapic->timer_fire_bt, &vlapic->timer_period_bt);
+		callout_reset_sbt(&vlapic->callout, rem_sbt, 0,
+		    vlapic_callout_handler, vlapic, 0);
+	}
+done:
+	VLAPIC_TIMER_UNLOCK(vlapic);
+}
+
+static void
+vlapic_set_icr_timer(struct vlapic *vlapic, uint32_t icr_timer)
+{
+	struct LAPIC *lapic;
+	sbintime_t sbt;
+
+	VLAPIC_TIMER_LOCK(vlapic);
+
+	lapic = &vlapic->apic;
+	lapic->icr_timer = icr_timer;
+
+	vlapic->timer_period_bt = vlapic->timer_freq_bt;
+	bintime_mul(&vlapic->timer_period_bt, icr_timer);
+
+	if (icr_timer != 0) {
+		binuptime(&vlapic->timer_fire_bt);
+		bintime_add(&vlapic->timer_fire_bt, &vlapic->timer_period_bt);
+
+		sbt = bttosbt(vlapic->timer_period_bt);
+		callout_reset_sbt(&vlapic->callout, sbt, 0,
+		    vlapic_callout_handler, vlapic, 0);
+	} else
+		callout_stop(&vlapic->callout);
+
+	VLAPIC_TIMER_UNLOCK(vlapic);
+}
+
 static VMM_STAT_ARRAY(IPIS_SENT, VM_MAXCPU, "ipis sent to vcpu");
 
 static int
-lapic_process_icr(struct vlapic *vlapic, uint64_t icrval)
+lapic_process_icr(struct vlapic *vlapic, uint64_t icrval, bool *retu)
 {
 	int i;
 	cpuset_t dmask;
@@ -472,7 +652,7 @@ lapic_process_icr(struct vlapic *vlapic, uint64_t icrval)
 			i--;
 			CPU_CLR(i, &dmask);
 			if (mode == APIC_DELMODE_FIXED) {
-				lapic_set_intr(vlapic->vm, i, vec);
+				lapic_intr_edge(vlapic->vm, i, vec);
 				vmm_stat_array_incr(vlapic->vm, vlapic->vcpuid,
 						    IPIS_SENT, i, 1);
 			} else
@@ -508,17 +688,18 @@ lapic_process_icr(struct vlapic *vlapic, uint64_t icrval)
 			if (vlapic2->boot_state != BS_SIPI)
 				return (0);
 
-			vmexit = vm_exitinfo(vlapic->vm, vlapic->vcpuid);
-			vmexit->exitcode = VM_EXITCODE_SPINUP_AP;
-			vmexit->u.spinup_ap.vcpu = dest;
-			vmexit->u.spinup_ap.rip = vec << PAGE_SHIFT;
-
 			/*
 			 * XXX this assumes that the startup IPI always succeeds
 			 */
 			vlapic2->boot_state = BS_RUNNING;
 			vm_activate_cpu(vlapic2->vm, dest);
 
+			*retu = true;
+			vmexit = vm_exitinfo(vlapic->vm, vlapic->vcpuid);
+			vmexit->exitcode = VM_EXITCODE_SPINUP_AP;
+			vmexit->u.spinup_ap.vcpu = dest;
+			vmexit->u.spinup_ap.rip = vec << PAGE_SHIFT;
+
 			return (0);
 		}
 	}
@@ -555,7 +736,6 @@ vlapic_pending_intr(struct vlapic *vlapic)
 				break;
 		}
 	}
-	VLAPIC_CTR0(vlapic, "no pending intr");
 	return (-1);
 }
 
@@ -593,18 +773,47 @@ vlapic_intr_accepted(struct vlapic *vlapic, int vector)
 	vlapic_update_ppr(vlapic);
 }
 
-int
-vlapic_op_mem_read(void* dev, uint64_t gpa, opsize_t size, uint64_t *data)
+static void
+lapic_set_svr(struct vlapic *vlapic, uint32_t new)
+{
+	struct LAPIC *lapic;
+	uint32_t old, changed;
+
+	lapic = &vlapic->apic;
+	old = lapic->svr;
+	changed = old ^ new;
+	if ((changed & APIC_SVR_ENABLE) != 0) {
+		if ((new & APIC_SVR_ENABLE) == 0) {
+			/*
+			 * The apic is now disabled so stop the apic timer.
+			 */
+			VLAPIC_CTR0(vlapic, "vlapic is software-disabled");
+			VLAPIC_TIMER_LOCK(vlapic);
+			callout_stop(&vlapic->callout);
+			VLAPIC_TIMER_UNLOCK(vlapic);
+		} else {
+			/*
+			 * The apic is now enabled so restart the apic timer
+			 * if it is configured in periodic mode.
+			 */
+			VLAPIC_CTR0(vlapic, "vlapic is software-enabled");
+			if (vlapic_periodic_timer(vlapic))
+				vlapic_set_icr_timer(vlapic, lapic->icr_timer);
+		}
+	}
+	lapic->svr = new;
+}
+
+int
+vlapic_read(struct vlapic *vlapic, uint64_t offset, uint64_t *data, bool *retu)
 {
-	struct vlapic 	*vlapic = (struct vlapic*)dev;
 	struct LAPIC	*lapic = &vlapic->apic;
-	uint64_t	 offset = gpa & ~(PAGE_SIZE);
 	uint32_t	*reg;
 	int		 i;
 
 	if (offset > sizeof(*lapic)) {
 		*data = 0;
-		return 0;
+		goto done;
 	}
 	
 	offset &= ~3;
@@ -665,8 +874,7 @@ vlapic_op_mem_read(void* dev, uint64_t gpa, opsize_t size, uint64_t *data)
 			*data = lapic->icr_hi;
 			break;
 		case APIC_OFFSET_TIMER_LVT ... APIC_OFFSET_ERROR_LVT:
-			reg = vlapic_get_lvt(vlapic, offset);	
-			*data = *(reg);
+			*data = vlapic_get_lvt(vlapic, offset);	
 			break;
 		case APIC_OFFSET_ICR:
 			*data = lapic->icr_timer;
@@ -682,18 +890,19 @@ vlapic_op_mem_read(void* dev, uint64_t gpa, opsize_t size, uint64_t *data)
 			*data = 0;
 			break;
 	}
+done:
+	VLAPIC_CTR2(vlapic, "vlapic read offset %#x, data %#lx", offset, *data);
 	return 0;
 }
 
 int
-vlapic_op_mem_write(void* dev, uint64_t gpa, opsize_t size, uint64_t data)
+vlapic_write(struct vlapic *vlapic, uint64_t offset, uint64_t data, bool *retu)
 {
-	struct vlapic 	*vlapic = (struct vlapic*)dev;
 	struct LAPIC	*lapic = &vlapic->apic;
-	uint64_t	 offset = gpa & ~(PAGE_SIZE);
-	uint32_t	*reg;
 	int		retval;
 
+	VLAPIC_CTR2(vlapic, "vlapic write offset %#x, data %#lx", offset, data);
+
 	if (offset > sizeof(*lapic)) {
 		return 0;
 	}
@@ -716,14 +925,14 @@ vlapic_op_mem_write(void* dev, uint64_t gpa, opsize_t size, uint64_t data)
 		case APIC_OFFSET_DFR:
 			break;
 		case APIC_OFFSET_SVR:
-			lapic->svr = data;
+			lapic_set_svr(vlapic, data);
 			break;
 		case APIC_OFFSET_ICR_LOW: 
 			if (!x2apic(vlapic)) {
 				data &= 0xffffffff;
 				data |= (uint64_t)lapic->icr_hi << 32;
 			}
-			retval = lapic_process_icr(vlapic, data);
+			retval = lapic_process_icr(vlapic, data, retu);
 			break;
 		case APIC_OFFSET_ICR_HI:
 			if (!x2apic(vlapic)) {
@@ -732,21 +941,14 @@ vlapic_op_mem_write(void* dev, uint64_t gpa, opsize_t size, uint64_t data)
 			}
 			break;
 		case APIC_OFFSET_TIMER_LVT ... APIC_OFFSET_ERROR_LVT:
-			reg = vlapic_get_lvt(vlapic, offset);	
-			if (!(lapic->svr & APIC_SVR_ENABLE)) {
-				data |= APIC_LVT_M;
-			}
-			*reg = data;
-			// vlapic_dump_lvt(offset, reg);
+			vlapic_set_lvt(vlapic, offset, data);
 			break;
 		case APIC_OFFSET_ICR:
-			lapic->icr_timer = data;
-			vlapic_start_timer(vlapic, 0);
+			vlapic_set_icr_timer(vlapic, data);
 			break;
 
 		case APIC_OFFSET_DCR:
-			lapic->dcr_timer = data;
-			vlapic->divisor = vlapic_timer_divisor(data);
+			vlapic_set_dcr(vlapic, data);
 			break;
 
 		case APIC_OFFSET_ESR:
@@ -768,80 +970,6 @@ vlapic_op_mem_write(void* dev, uint64_t gpa, opsize_t size, uint64_t data)
 	return (retval);
 }
 
-int
-vlapic_timer_tick(struct vlapic *vlapic)
-{
-	int curticks, delta, periodic, fired;
-	uint32_t ccr;
-	uint32_t decrement, leftover;
-
-restart:
-	curticks = ticks;
-	delta = curticks - vlapic->ccr_ticks;
-
-	/* Local APIC timer is disabled */
-	if (vlapic->apic.icr_timer == 0)
-		return (-1);
-
-	/* One-shot mode and timer has already counted down to zero */
-	periodic = vlapic_periodic_timer(vlapic);
-	if (!periodic && vlapic->apic.ccr_timer == 0)
-		return (-1);
-	/*
-	 * The 'curticks' and 'ccr_ticks' are out of sync by more than
-	 * 2^31 ticks. We deal with this by restarting the timer.
-	 */
-	if (delta < 0) {
-		vlapic_start_timer(vlapic, 0);
-		goto restart;
-	}
-
-	fired = 0;
-	decrement = (VLAPIC_BUS_FREQ / vlapic->divisor) / hz;
-
-	vlapic->ccr_ticks = curticks;
-	ccr = vlapic->apic.ccr_timer;
-
-	while (delta-- > 0) {
-		if (ccr > decrement) {
-			ccr -= decrement;
-			continue;
-		}
-
-		/* Trigger the local apic timer interrupt */
-		vlapic_fire_timer(vlapic);
-		if (periodic) {
-			leftover = decrement - ccr;
-			vlapic_start_timer(vlapic, leftover);
-			ccr = vlapic->apic.ccr_timer;
-		} else {
-			/*
-			 * One-shot timer has counted down to zero.
-			 */
-			ccr = 0;
-		}
-		fired = 1;
-		break;
-	}
-
-	vlapic->apic.ccr_timer = ccr;
-
-	if (!fired)
-		return ((ccr / decrement) + 1);
-	else
-		return (0);
-}
-
-struct vdev_ops vlapic_dev_ops = {
-	.name = "vlapic",
-	.init = vlapic_op_init,
-	.reset = vlapic_op_reset,
-	.halt = vlapic_op_halt,
-	.memread = vlapic_op_mem_read,
-	.memwrite = vlapic_op_mem_write,
-};
-static struct io_region vlapic_mmio[VM_MAXCPU];
-
 struct vlapic *
 vlapic_init(struct vm *vm, int vcpuid)
 {
@@ -851,22 +979,22 @@ vlapic_init(struct vm *vm, int vcpuid)
 	vlapic->vm = vm;
 	vlapic->vcpuid = vcpuid;
 
+	/*
+	 * If the vlapic is configured in x2apic mode then it will be
+	 * accessed in the critical section via the MSR emulation code.
+	 *
+	 * Therefore the timer mutex must be a spinlock because blockable
+	 * mutexes cannot be acquired in a critical section.
+	 */
+	mtx_init(&vlapic->timer_mtx, "vlapic timer mtx", NULL, MTX_SPIN);
+	callout_init(&vlapic->callout, 1);
+
 	vlapic->msr_apicbase = DEFAULT_APIC_BASE | APICBASE_ENABLED;
 
 	if (vcpuid == 0)
 		vlapic->msr_apicbase |= APICBASE_BSP;
 
-	vlapic->ops = &vlapic_dev_ops;
-
-	vlapic->mmio = vlapic_mmio + vcpuid;
-	vlapic->mmio->base = DEFAULT_APIC_BASE;
-	vlapic->mmio->len = PAGE_SIZE;
-	vlapic->mmio->attr = MMIO_READ|MMIO_WRITE;
-	vlapic->mmio->vcpu = vcpuid;
-
-	vdev_register(&vlapic_dev_ops, vlapic);
-
-	vlapic_op_init(vlapic);
+	vlapic_reset(vlapic);
 
 	return (vlapic);
 }
@@ -874,8 +1002,8 @@ vlapic_init(struct vm *vm, int vcpuid)
 void
 vlapic_cleanup(struct vlapic *vlapic)
 {
-	vlapic_op_halt(vlapic);
-	vdev_unregister(vlapic);
+
+	callout_drain(&vlapic->callout);
 	free(vlapic, M_VLAPIC);
 }
 
@@ -912,3 +1040,15 @@ vlapic_set_x2apic_state(struct vm *vm, int vcpuid, enum x2apic_state state)
 	if (state == X2APIC_DISABLED)
 		vlapic->msr_apicbase &= ~APICBASE_X2APIC;
 }
+
+bool
+vlapic_enabled(struct vlapic *vlapic)
+{
+	struct LAPIC *lapic = &vlapic->apic;
+
+	if ((vlapic->msr_apicbase & APICBASE_ENABLED) != 0 &&
+	    (lapic->svr & APIC_SVR_ENABLE) != 0)
+		return (true);
+	else
+		return (false);
+}
diff --git a/sys/amd64/vmm/io/vlapic.h b/sys/amd64/vmm/io/vlapic.h
index 00de019742a..d88fa71dd7e 100644
--- a/sys/amd64/vmm/io/vlapic.h
+++ b/sys/amd64/vmm/io/vlapic.h
@@ -29,10 +29,8 @@
 #ifndef _VLAPIC_H_
 #define	_VLAPIC_H_
 
-#include "vdev.h"
-
 struct vm;
-  
+ 
 /*
  * Map of APIC Registers:       Offset  Description          		 	Access
  */
@@ -92,20 +90,17 @@ enum x2apic_state;
 
 struct vlapic *vlapic_init(struct vm *vm, int vcpuid);
 void vlapic_cleanup(struct vlapic *vlapic);
-
-int vlapic_op_mem_write(void* dev, uint64_t gpa,
-    			opsize_t size, uint64_t data);
-
-int vlapic_op_mem_read(void* dev, uint64_t gpa,
-    			opsize_t size, uint64_t *data);
-
+int vlapic_write(struct vlapic *vlapic, uint64_t offset, uint64_t data,
+    bool *retu);
+int vlapic_read(struct vlapic *vlapic, uint64_t offset, uint64_t *data,
+    bool *retu);
 int vlapic_pending_intr(struct vlapic *vlapic);
 void vlapic_intr_accepted(struct vlapic *vlapic, int vector);
-void vlapic_set_intr_ready(struct vlapic *vlapic, int vector);
-int vlapic_timer_tick(struct vlapic *vlapic);
+void vlapic_set_intr_ready(struct vlapic *vlapic, int vector, bool level);
 
 uint64_t vlapic_get_apicbase(struct vlapic *vlapic);
 void vlapic_set_apicbase(struct vlapic *vlapic, uint64_t val);
 void vlapic_set_x2apic_state(struct vm *vm, int vcpuid, enum x2apic_state s);
+bool vlapic_enabled(struct vlapic *vlapic);
 
 #endif	/* _VLAPIC_H_ */
diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c
index bbf8f23bf5b..3ea7681895d 100644
--- a/sys/amd64/vmm/vmm.c
+++ b/sys/amd64/vmm/vmm.c
@@ -55,16 +55,19 @@ __FBSDID("$FreeBSD$");
 #include <machine/vm.h>
 #include <machine/pcb.h>
 #include <machine/smp.h>
+#include <x86/psl.h>
 #include <x86/apicreg.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 
 #include <machine/vmm.h>
+#include <machine/vmm_dev.h>
+
 #include "vmm_ktr.h"
 #include "vmm_host.h"
 #include "vmm_mem.h"
 #include "vmm_util.h"
-#include <machine/vmm_dev.h>
+#include "vhpet.h"
+#include "vioapic.h"
 #include "vlapic.h"
 #include "vmm_msr.h"
 #include "vmm_ipi.h"
@@ -107,6 +110,8 @@ struct mem_seg {
 struct vm {
 	void		*cookie;	/* processor-specific data */
 	void		*iommu;		/* iommu-specific data */
+	struct vhpet	*vhpet;		/* virtual HPET */
+	struct vioapic	*vioapic;	/* virtual ioapic */
 	struct vmspace	*vmspace;	/* guest's address space */
 	struct vcpu	vcpu[VM_MAXCPU];
 	int		num_mem_segs;
@@ -301,6 +306,8 @@ vm_create(const char *name, struct vm **retvm)
 	vm = malloc(sizeof(struct vm), M_VM, M_WAITOK | M_ZERO);
 	strcpy(vm->name, name);
 	vm->cookie = VMINIT(vm, vmspace_pmap(vmspace));
+	vm->vioapic = vioapic_init(vm);
+	vm->vhpet = vhpet_init(vm);
 
 	for (i = 0; i < VM_MAXCPU; i++) {
 		vcpu_init(vm, i);
@@ -334,6 +341,9 @@ vm_destroy(struct vm *vm)
 	if (vm->iommu != NULL)
 		iommu_destroy_domain(vm->iommu);
 
+	vhpet_cleanup(vm->vhpet);
+	vioapic_cleanup(vm->vioapic);
+
 	for (i = 0; i < vm->num_mem_segs; i++)
 		vm_free_mem_seg(vm, &vm->mem_segs[i]);
 
@@ -850,28 +860,16 @@ vcpu_require_state_locked(struct vcpu *vcpu, enum vcpu_state newstate)
  * Emulate a guest 'hlt' by sleeping until the vcpu is ready to run.
  */
 static int
-vm_handle_hlt(struct vm *vm, int vcpuid, boolean_t *retu)
+vm_handle_hlt(struct vm *vm, int vcpuid, bool intr_disabled, bool *retu)
 {
+	struct vm_exit *vmexit;
 	struct vcpu *vcpu;
-	int sleepticks, t;
+	int t, timo;
 
 	vcpu = &vm->vcpu[vcpuid];
 
 	vcpu_lock(vcpu);
 
-	/*
-	 * Figure out the number of host ticks until the next apic
-	 * timer interrupt in the guest.
-	 */
-	sleepticks = lapic_timer_tick(vm, vcpuid);
-
-	/*
-	 * If the guest local apic timer is disabled then sleep for
-	 * a long time but not forever.
-	 */
-	if (sleepticks < 0)
-		sleepticks = hz;
-
 	/*
 	 * Do a final check for pending NMI or interrupts before
 	 * really putting this thread to sleep.
@@ -879,12 +877,27 @@ vm_handle_hlt(struct vm *vm, int vcpuid, boolean_t *retu)
 	 * These interrupts could have happened any time after we
 	 * returned from VMRUN() and before we grabbed the vcpu lock.
 	 */
-	if (!vm_nmi_pending(vm, vcpuid) && lapic_pending_intr(vm, vcpuid) < 0) {
-		if (sleepticks <= 0)
-			panic("invalid sleepticks %d", sleepticks);
+	if (!vm_nmi_pending(vm, vcpuid) &&
+	    (intr_disabled || vlapic_pending_intr(vcpu->vlapic) < 0)) {
 		t = ticks;
 		vcpu_require_state_locked(vcpu, VCPU_SLEEPING);
-		msleep_spin(vcpu, &vcpu->mtx, "vmidle", sleepticks);
+		if (vlapic_enabled(vcpu->vlapic)) {
+			/*
+			 * XXX msleep_spin() is not interruptible so use the
+			 * 'timo' to put an upper bound on the sleep time.
+			 */
+			timo = hz;
+			msleep_spin(vcpu, &vcpu->mtx, "vmidle", timo);
+		} else {
+			/*
+			 * Spindown the vcpu if the apic is disabled and it
+			 * had entered the halted state.
+			 */
+			*retu = true;
+			vmexit = vm_exitinfo(vm, vcpuid);
+			vmexit->exitcode = VM_EXITCODE_SPINDOWN_CPU;
+			VCPU_CTR0(vm, vcpuid, "spinning down cpu");
+		}
 		vcpu_require_state_locked(vcpu, VCPU_FROZEN);
 		vmm_stat_incr(vm, vcpuid, VCPU_IDLE_TICKS, ticks - t);
 	}
@@ -894,7 +907,7 @@ vm_handle_hlt(struct vm *vm, int vcpuid, boolean_t *retu)
 }
 
 static int
-vm_handle_paging(struct vm *vm, int vcpuid, boolean_t *retu)
+vm_handle_paging(struct vm *vm, int vcpuid, bool *retu)
 {
 	int rv, ftype;
 	struct vm_map *map;
@@ -919,8 +932,8 @@ vm_handle_paging(struct vm *vm, int vcpuid, boolean_t *retu)
 	map = &vm->vmspace->vm_map;
 	rv = vm_fault(map, vme->u.paging.gpa, ftype, VM_FAULT_NORMAL);
 
-	VMM_CTR3(vm, vcpuid, "vm_handle_paging rv = %d, gpa = %#lx, ftype = %d",
-		 rv, vme->u.paging.gpa, ftype);
+	VCPU_CTR3(vm, vcpuid, "vm_handle_paging rv = %d, gpa = %#lx, "
+	    "ftype = %d", rv, vme->u.paging.gpa, ftype);
 
 	if (rv != KERN_SUCCESS)
 		return (EFAULT);
@@ -932,13 +945,15 @@ done:
 }
 
 static int
-vm_handle_inst_emul(struct vm *vm, int vcpuid, boolean_t *retu)
+vm_handle_inst_emul(struct vm *vm, int vcpuid, bool *retu)
 {
 	struct vie *vie;
 	struct vcpu *vcpu;
 	struct vm_exit *vme;
 	int error, inst_length;
 	uint64_t rip, gla, gpa, cr3;
+	mem_region_read_t mread;
+	mem_region_write_t mwrite;
 
 	vcpu = &vm->vcpu[vcpuid];
 	vme = &vcpu->exitinfo;
@@ -969,18 +984,23 @@ vm_handle_inst_emul(struct vm *vm, int vcpuid, boolean_t *retu)
 	if (vme->inst_length == VIE_INST_SIZE) 
 		vme->inst_length = vie->num_processed;
  
-	/* return to userland unless this is a local apic access */
-	if (gpa < DEFAULT_APIC_BASE || gpa >= DEFAULT_APIC_BASE + PAGE_SIZE) {
-		*retu = TRUE;
+	/* return to userland unless this is an in-kernel emulated device */
+	if (gpa >= DEFAULT_APIC_BASE && gpa < DEFAULT_APIC_BASE + PAGE_SIZE) {
+		mread = lapic_mmio_read;
+		mwrite = lapic_mmio_write;
+	} else if (gpa >= VIOAPIC_BASE && gpa < VIOAPIC_BASE + VIOAPIC_SIZE) {
+		mread = vioapic_mmio_read;
+		mwrite = vioapic_mmio_write;
+	} else if (gpa >= VHPET_BASE && gpa < VHPET_BASE + VHPET_SIZE) {
+		mread = vhpet_mmio_read;
+		mwrite = vhpet_mmio_write;
+	} else {
+		*retu = true;
 		return (0);
 	}
 
-	error = vmm_emulate_instruction(vm, vcpuid, gpa, vie,
-					lapic_mmio_read, lapic_mmio_write, 0);
-
-	/* return to userland to spin up the AP */
-	if (error == 0 && vme->exitcode == VM_EXITCODE_SPINUP_AP)
-		*retu = TRUE;
+	error = vmm_emulate_instruction(vm, vcpuid, gpa, vie, mread, mwrite,
+	    retu);
 
 	return (error);
 }
@@ -993,7 +1013,7 @@ vm_run(struct vm *vm, struct vm_run *vmrun)
 	struct pcb *pcb;
 	uint64_t tscval, rip;
 	struct vm_exit *vme;
-	boolean_t retu;
+	bool retu, intr_disabled;
 	pmap_t pmap;
 
 	vcpuid = vmrun->cpuid;
@@ -1033,10 +1053,11 @@ restart:
 	critical_exit();
 
 	if (error == 0) {
-		retu = FALSE;
+		retu = false;
 		switch (vme->exitcode) {
 		case VM_EXITCODE_HLT:
-			error = vm_handle_hlt(vm, vcpuid, &retu);
+			intr_disabled = ((vme->u.hlt.rflags & PSL_I) == 0);
+			error = vm_handle_hlt(vm, vcpuid, intr_disabled, &retu);
 			break;
 		case VM_EXITCODE_PAGING:
 			error = vm_handle_paging(vm, vcpuid, &retu);
@@ -1045,12 +1066,12 @@ restart:
 			error = vm_handle_inst_emul(vm, vcpuid, &retu);
 			break;
 		default:
-			retu = TRUE;	/* handled in userland */
+			retu = true;	/* handled in userland */
 			break;
 		}
 	}
 
-	if (error == 0 && retu == FALSE) {
+	if (error == 0 && retu == false) {
 		rip = vme->rip + vme->inst_length;
 		goto restart;
 	}
@@ -1089,7 +1110,7 @@ vm_inject_nmi(struct vm *vm, int vcpuid)
 	vcpu = &vm->vcpu[vcpuid];
 
 	vcpu->nmi_pending = 1;
-	vm_interrupt_hostcpu(vm, vcpuid);
+	vcpu_notify_event(vm, vcpuid);
 	return (0);
 }
 
@@ -1159,6 +1180,20 @@ vm_lapic(struct vm *vm, int cpu)
 	return (vm->vcpu[cpu].vlapic);
 }
 
+struct vioapic *
+vm_ioapic(struct vm *vm)
+{
+
+	return (vm->vioapic);
+}
+
+struct vhpet *
+vm_hpet(struct vm *vm)
+{
+
+	return (vm->vhpet);
+}
+
 boolean_t
 vmm_is_pptdev(int bus, int slot, int func)
 {
@@ -1295,8 +1330,15 @@ vm_set_x2apic_state(struct vm *vm, int vcpuid, enum x2apic_state state)
 	return (0);
 }
 
+/*
+ * This function is called to ensure that a vcpu "sees" a pending event
+ * as soon as possible:
+ * - If the vcpu thread is sleeping then it is woken up.
+ * - If the vcpu is running on a different host_cpu then an IPI will be directed
+ *   to the host_cpu to cause the vcpu to trap into the hypervisor.
+ */
 void
-vm_interrupt_hostcpu(struct vm *vm, int vcpuid)
+vcpu_notify_event(struct vm *vm, int vcpuid)
 {
 	int hostcpu;
 	struct vcpu *vcpu;
@@ -1323,3 +1365,12 @@ vm_get_vmspace(struct vm *vm)
 
 	return (vm->vmspace);
 }
+
+int
+vm_apicid2vcpuid(struct vm *vm, int apicid)
+{
+	/*
+	 * XXX apic id is assumed to be numerically identical to vcpu id
+	 */
+	return (apicid);
+}
diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c
index 2f57f822d58..f248f685bb8 100644
--- a/sys/amd64/vmm/vmm_dev.c
+++ b/sys/amd64/vmm/vmm_dev.c
@@ -46,21 +46,25 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 #include <vm/vm_map.h>
 
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
-
 #include <machine/vmm.h>
+#include <machine/vmm_dev.h>
+
 #include "vmm_lapic.h"
 #include "vmm_stat.h"
 #include "vmm_mem.h"
 #include "io/ppt.h"
-#include <machine/vmm_dev.h>
+#include "io/vioapic.h"
+#include "io/vhpet.h"
 
 struct vmmdev_softc {
 	struct vm	*vm;		/* vm instance cookie */
 	struct cdev	*cdev;
 	SLIST_ENTRY(vmmdev_softc) link;
+	int		flags;
 };
+#define	VSC_LINKED		0x01
+
 static SLIST_HEAD(, vmmdev_softc) head;
 
 static struct mtx vmmdev_mtx;
@@ -104,7 +108,6 @@ vmmdev_rw(struct cdev *cdev, struct uio *uio, int flags)
 	static char zerobuf[PAGE_SIZE];
 
 	error = 0;
-	mtx_lock(&vmmdev_mtx);
 	sc = vmmdev_lookup2(cdev);
 	if (sc == NULL)
 		error = ENXIO;
@@ -134,8 +137,6 @@ vmmdev_rw(struct cdev *cdev, struct uio *uio, int flags)
 			vm_gpa_release(cookie);
 		}
 	}
-
-	mtx_unlock(&vmmdev_mtx);
 	return (error);
 }
 
@@ -147,10 +148,11 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag,
 	struct vmmdev_softc *sc;
 	struct vm_memory_segment *seg;
 	struct vm_register *vmreg;
-	struct vm_seg_desc* vmsegdesc;
+	struct vm_seg_desc *vmsegdesc;
 	struct vm_run *vmrun;
 	struct vm_event *vmevent;
 	struct vm_lapic_irq *vmirq;
+	struct vm_ioapic_irq *ioapic_irq;
 	struct vm_capability *vmcap;
 	struct vm_pptdev *pptdev;
 	struct vm_pptdev_mmio *pptmmio;
@@ -292,7 +294,19 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag,
 		break;
 	case VM_LAPIC_IRQ:
 		vmirq = (struct vm_lapic_irq *)data;
-		error = lapic_set_intr(sc->vm, vmirq->cpuid, vmirq->vector);
+		error = lapic_intr_edge(sc->vm, vmirq->cpuid, vmirq->vector);
+		break;
+	case VM_IOAPIC_ASSERT_IRQ:
+		ioapic_irq = (struct vm_ioapic_irq *)data;
+		error = vioapic_assert_irq(sc->vm, ioapic_irq->irq);
+		break;
+	case VM_IOAPIC_DEASSERT_IRQ:
+		ioapic_irq = (struct vm_ioapic_irq *)data;
+		error = vioapic_deassert_irq(sc->vm, ioapic_irq->irq);
+		break;
+	case VM_IOAPIC_PULSE_IRQ:
+		ioapic_irq = (struct vm_ioapic_irq *)data;
+		error = vioapic_pulse_irq(sc->vm, ioapic_irq->irq);
 		break;
 	case VM_MAP_MEMORY:
 		seg = (struct vm_memory_segment *)data;
@@ -354,6 +368,9 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag,
 				 gpapte->gpa, gpapte->pte, &gpapte->ptenum);
 		error = 0;
 		break;
+	case VM_GET_HPET_CAPABILITIES:
+		error = vhpet_getcap((struct vm_hpet_cap *)data);
+		break;
 	default:
 		error = ENOTTY;
 		break;
@@ -379,34 +396,28 @@ vmmdev_mmap_single(struct cdev *cdev, vm_ooffset_t *offset,
 	int error;
 	struct vmmdev_softc *sc;
 
-	mtx_lock(&vmmdev_mtx);
-
 	sc = vmmdev_lookup2(cdev);
 	if (sc != NULL && (nprot & PROT_EXEC) == 0)
 		error = vm_get_memobj(sc->vm, *offset, size, offset, object);
 	else
 		error = EINVAL;
 
-	mtx_unlock(&vmmdev_mtx);
-
 	return (error);
 }
 
 static void
-vmmdev_destroy(struct vmmdev_softc *sc, boolean_t unlink)
+vmmdev_destroy(void *arg)
 {
 
-	/*
-	 * XXX must stop virtual machine instances that may be still
-	 * running and cleanup their state.
-	 */
-	if (sc->cdev)
+	struct vmmdev_softc *sc = arg;
+
+	if (sc->cdev != NULL)
 		destroy_dev(sc->cdev);
 
-	if (sc->vm)
+	if (sc->vm != NULL)
 		vm_destroy(sc->vm);
 
-	if (unlink) {
+	if ((sc->flags & VSC_LINKED) != 0) {
 		mtx_lock(&vmmdev_mtx);
 		SLIST_REMOVE(&head, sc, vmmdev_softc, link);
 		mtx_unlock(&vmmdev_mtx);
@@ -421,27 +432,38 @@ sysctl_vmm_destroy(SYSCTL_HANDLER_ARGS)
 	int error;
 	char buf[VM_MAX_NAMELEN];
 	struct vmmdev_softc *sc;
+	struct cdev *cdev;
 
 	strlcpy(buf, "beavis", sizeof(buf));
 	error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
 	if (error != 0 || req->newptr == NULL)
 		return (error);
 
-	/*
-	 * XXX TODO if any process has this device open then fail
-	 */
-
 	mtx_lock(&vmmdev_mtx);
 	sc = vmmdev_lookup(buf);
-	if (sc == NULL) {
+	if (sc == NULL || sc->cdev == NULL) {
 		mtx_unlock(&vmmdev_mtx);
 		return (EINVAL);
 	}
 
-	sc->cdev->si_drv1 = NULL;
+	/*
+	 * The 'cdev' will be destroyed asynchronously when 'si_threadcount'
+	 * goes down to 0 so we should not do it again in the callback.
+	 */
+	cdev = sc->cdev;
+	sc->cdev = NULL;		
 	mtx_unlock(&vmmdev_mtx);
 
-	vmmdev_destroy(sc, TRUE);
+	/*
+	 * Schedule the 'cdev' to be destroyed:
+	 *
+	 * - any new operations on this 'cdev' will return an error (ENXIO).
+	 *
+	 * - when the 'si_threadcount' dwindles down to zero the 'cdev' will
+	 *   be destroyed and the callback will be invoked in a taskqueue
+	 *   context.
+	 */
+	destroy_dev_sched_cb(cdev, vmmdev_destroy, sc);
 
 	return (0);
 }
@@ -462,6 +484,7 @@ sysctl_vmm_create(SYSCTL_HANDLER_ARGS)
 {
 	int error;
 	struct vm *vm;
+	struct cdev *cdev;
 	struct vmmdev_softc *sc, *sc2;
 	char buf[VM_MAX_NAMELEN];
 
@@ -489,22 +512,28 @@ sysctl_vmm_create(SYSCTL_HANDLER_ARGS)
 	 */
 	mtx_lock(&vmmdev_mtx);
 	sc2 = vmmdev_lookup(buf);
-	if (sc2 == NULL)
+	if (sc2 == NULL) {
 		SLIST_INSERT_HEAD(&head, sc, link);
+		sc->flags |= VSC_LINKED;
+	}
 	mtx_unlock(&vmmdev_mtx);
 
 	if (sc2 != NULL) {
-		vmmdev_destroy(sc, FALSE);
+		vmmdev_destroy(sc);
 		return (EEXIST);
 	}
 
-	error = make_dev_p(MAKEDEV_CHECKNAME, &sc->cdev, &vmmdevsw, NULL,
+	error = make_dev_p(MAKEDEV_CHECKNAME, &cdev, &vmmdevsw, NULL,
 			   UID_ROOT, GID_WHEEL, 0600, "vmm/%s", buf);
 	if (error != 0) {
-		vmmdev_destroy(sc, TRUE);
+		vmmdev_destroy(sc);
 		return (error);
 	}
+
+	mtx_lock(&vmmdev_mtx);
+	sc->cdev = cdev;
 	sc->cdev->si_drv1 = sc;
+	mtx_unlock(&vmmdev_mtx);
 
 	return (0);
 }
diff --git a/sys/amd64/vmm/vmm_instruction_emul.c b/sys/amd64/vmm/vmm_instruction_emul.c
index a02cf933939..62eacbd2c3f 100644
--- a/sys/amd64/vmm/vmm_instruction_emul.c
+++ b/sys/amd64/vmm/vmm_instruction_emul.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 #include <machine/vmm.h>
 #else	/* !_KERNEL */
diff --git a/sys/amd64/vmm/vmm_ktr.h b/sys/amd64/vmm/vmm_ktr.h
index e691c61af68..9fb46d80beb 100644
--- a/sys/amd64/vmm/vmm_ktr.h
+++ b/sys/amd64/vmm/vmm_ktr.h
@@ -32,20 +32,34 @@
 #include <sys/ktr.h>
 #include <sys/pcpu.h>
 
+#ifndef KTR_VMM
 #define	KTR_VMM	KTR_GEN
-
-#define	VMM_CTR0(vm, vcpuid, format)					\
-CTR3(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu)
-
-#define	VMM_CTR1(vm, vcpuid, format, p1)				\
-CTR4(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \
-			(p1))
-
-#define	VMM_CTR2(vm, vcpuid, format, p1, p2)				\
-CTR5(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \
-			(p1), (p2))
-
-#define	VMM_CTR3(vm, vcpuid, format, p1, p2, p3)			\
-CTR6(KTR_VMM, "vm %s-%d(%d): " format, vm_name((vm)), (vcpuid), curcpu, \
-			(p1), (p2), (p3))
+#endif
+
+#define	VCPU_CTR0(vm, vcpuid, format)					\
+CTR2(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid))
+
+#define	VCPU_CTR1(vm, vcpuid, format, p1)				\
+CTR3(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), (p1))
+
+#define	VCPU_CTR2(vm, vcpuid, format, p1, p2)				\
+CTR4(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), (p1), (p2))
+
+#define	VCPU_CTR3(vm, vcpuid, format, p1, p2, p3)			\
+CTR5(KTR_VMM, "vm %s[%d]: " format, vm_name((vm)), (vcpuid), (p1), (p2), (p3))
+
+#define	VM_CTR0(vm, format)						\
+CTR1(KTR_VMM, "vm %s: " format, vm_name((vm)))
+
+#define	VM_CTR1(vm, format, p1)						\
+CTR2(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1))
+
+#define	VM_CTR2(vm, format, p1, p2)					\
+CTR3(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1), (p2))
+
+#define	VM_CTR3(vm, format, p1, p2, p3)					\
+CTR4(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1), (p2), (p3))
+
+#define	VM_CTR4(vm, format, p1, p2, p3, p4)				\
+CTR5(KTR_VMM, "vm %s: " format, vm_name((vm)), (p1), (p2), (p3), (p4))
 #endif
diff --git a/sys/amd64/vmm/vmm_lapic.c b/sys/amd64/vmm/vmm_lapic.c
index d024b7198b1..13fab8cb1c2 100644
--- a/sys/amd64/vmm/vmm_lapic.c
+++ b/sys/amd64/vmm/vmm_lapic.c
@@ -62,7 +62,7 @@ lapic_intr_accepted(struct vm *vm, int cpu, int vector)
 }
 
 int
-lapic_set_intr(struct vm *vm, int cpu, int vector)
+lapic_set_intr(struct vm *vm, int cpu, int vector, bool level)
 {
 	struct vlapic *vlapic;
 
@@ -73,23 +73,13 @@ lapic_set_intr(struct vm *vm, int cpu, int vector)
 		return (EINVAL);
 
 	vlapic = vm_lapic(vm, cpu);
-	vlapic_set_intr_ready(vlapic, vector);
+	vlapic_set_intr_ready(vlapic, vector, level);
 
-	vm_interrupt_hostcpu(vm, cpu);
+	vcpu_notify_event(vm, cpu);
 
 	return (0);
 }
 
-int
-lapic_timer_tick(struct vm *vm, int cpu)
-{
-	struct vlapic *vlapic;
-
-	vlapic = vm_lapic(vm, cpu);
-
-	return (vlapic_timer_tick(vlapic));
-}
-
 static boolean_t
 x2apic_msr(u_int msr)
 {
@@ -117,7 +107,7 @@ lapic_msr(u_int msr)
 }
 
 int
-lapic_rdmsr(struct vm *vm, int cpu, u_int msr, uint64_t *rval)
+lapic_rdmsr(struct vm *vm, int cpu, u_int msr, uint64_t *rval, bool *retu)
 {
 	int error;
 	u_int offset;
@@ -130,14 +120,14 @@ lapic_rdmsr(struct vm *vm, int cpu, u_int msr, uint64_t *rval)
 		error = 0;
 	} else {
 		offset = x2apic_msr_to_regoff(msr);
-		error = vlapic_op_mem_read(vlapic, offset, DWORD, rval);
+		error = vlapic_read(vlapic, offset, rval, retu);
 	}
 
 	return (error);
 }
 
 int
-lapic_wrmsr(struct vm *vm, int cpu, u_int msr, uint64_t val)
+lapic_wrmsr(struct vm *vm, int cpu, u_int msr, uint64_t val, bool *retu)
 {
 	int error;
 	u_int offset;
@@ -150,7 +140,7 @@ lapic_wrmsr(struct vm *vm, int cpu, u_int msr, uint64_t val)
 		error = 0;
 	} else {
 		offset = x2apic_msr_to_regoff(msr);
-		error = vlapic_op_mem_write(vlapic, offset, DWORD, val);
+		error = vlapic_write(vlapic, offset, val, retu);
 	}
 
 	return (error);
@@ -174,7 +164,7 @@ lapic_mmio_write(void *vm, int cpu, uint64_t gpa, uint64_t wval, int size,
 		return (EINVAL);
 
 	vlapic = vm_lapic(vm, cpu);
-	error = vlapic_op_mem_write(vlapic, off, DWORD, wval);
+	error = vlapic_write(vlapic, off, wval, arg);
 	return (error);
 }
 
@@ -196,6 +186,6 @@ lapic_mmio_read(void *vm, int cpu, uint64_t gpa, uint64_t *rval, int size,
 		return (EINVAL);
 
 	vlapic = vm_lapic(vm, cpu);
-	error = vlapic_op_mem_read(vlapic, off, DWORD, rval);
+	error = vlapic_read(vlapic, off, rval, arg);
 	return (error);
 }
diff --git a/sys/amd64/vmm/vmm_lapic.h b/sys/amd64/vmm/vmm_lapic.h
index a79912e7b18..09b7f57145a 100644
--- a/sys/amd64/vmm/vmm_lapic.h
+++ b/sys/amd64/vmm/vmm_lapic.h
@@ -32,16 +32,16 @@
 struct vm;
 
 boolean_t lapic_msr(u_int num);
-int	lapic_rdmsr(struct vm *vm, int cpu, u_int msr, uint64_t *rval);
-int	lapic_wrmsr(struct vm *vm, int cpu, u_int msr, uint64_t wval);
+int	lapic_rdmsr(struct vm *vm, int cpu, u_int msr, uint64_t *rval,
+	    bool *retu);
+int	lapic_wrmsr(struct vm *vm, int cpu, u_int msr, uint64_t wval,
+	    bool *retu);
 
 int	lapic_mmio_read(void *vm, int cpu, uint64_t gpa,
 			uint64_t *rval, int size, void *arg);
 int	lapic_mmio_write(void *vm, int cpu, uint64_t gpa,
 			 uint64_t wval, int size, void *arg);
 
-int	lapic_timer_tick(struct vm *vm, int cpu);
-
 /*
  * Returns a vector between 32 and 255 if an interrupt is pending in the
  * IRR that can be delivered based on the current state of ISR and TPR.
@@ -66,6 +66,22 @@ void	lapic_intr_accepted(struct vm *vm, int cpu, int vector);
  * Signals to the LAPIC that an interrupt at 'vector' needs to be generated
  * to the 'cpu', the state is recorded in IRR.
  */
-int	lapic_set_intr(struct vm *vm, int cpu, int vector);
+int	lapic_set_intr(struct vm *vm, int cpu, int vector, bool trig);
+
+#define	LAPIC_TRIG_LEVEL	true
+#define	LAPIC_TRIG_EDGE		false
+static __inline int
+lapic_intr_level(struct vm *vm, int cpu, int vector)
+{
+
+	return (lapic_set_intr(vm, cpu, vector, LAPIC_TRIG_LEVEL));
+}
+
+static __inline int
+lapic_intr_edge(struct vm *vm, int cpu, int vector)
+{
+
+	return (lapic_set_intr(vm, cpu, vector, LAPIC_TRIG_EDGE));
+}
 
 #endif
diff --git a/sys/amd64/vmm/vmm_msr.c b/sys/amd64/vmm/vmm_msr.c
index 1d22ad0bdb2..b4abc90f555 100644
--- a/sys/amd64/vmm/vmm_msr.c
+++ b/sys/amd64/vmm/vmm_msr.c
@@ -162,13 +162,13 @@ msr_num_to_idx(u_int num)
 }
 
 int
-emulate_wrmsr(struct vm *vm, int cpu, u_int num, uint64_t val)
+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));
+		return (lapic_wrmsr(vm, cpu, num, val, retu));
 
 	idx = msr_num_to_idx(num);
 	if (idx < 0 || invalid_msr(idx))
@@ -189,14 +189,14 @@ emulate_wrmsr(struct vm *vm, int cpu, u_int num, uint64_t val)
 }
 
 int
-emulate_rdmsr(struct vm *vm, int cpu, u_int num)
+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);
+		error = lapic_rdmsr(vm, cpu, num, &result, retu);
 		goto done;
 	}
 
diff --git a/sys/amd64/vmm/vmm_msr.h b/sys/amd64/vmm/vmm_msr.h
index 8a1fda36ca4..e07003771f2 100644
--- a/sys/amd64/vmm/vmm_msr.h
+++ b/sys/amd64/vmm/vmm_msr.h
@@ -33,8 +33,9 @@
 struct vm;
 
 void	vmm_msr_init(void);
-int	emulate_wrmsr(struct vm *vm, int vcpu, u_int msr, uint64_t val);
-int	emulate_rdmsr(struct vm *vm, int vcpu, u_int msr);
+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);
diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c
index c23f1fce021..c1fc006e592 100644
--- a/sys/amd64/vmm/x86.c
+++ b/sys/amd64/vmm/x86.c
@@ -53,7 +53,7 @@ int
 x86_emulate_cpuid(struct vm *vm, int vcpu_id,
 		  uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
 {
-	int error;
+	int error, enable_invpcid;
 	unsigned int 	func, regs[4];
 	enum x2apic_state x2apic_state;
 
@@ -202,8 +202,22 @@ x86_emulate_cpuid(struct vm *vm, int vcpu_id,
 			regs[0] |= 0x04008000;
 			break;
 
-		case CPUID_0000_0006:
 		case CPUID_0000_0007:
+			regs[0] = 0;
+			regs[1] = 0;
+			regs[2] = 0;
+			regs[3] = 0;
+
+			/* leaf 0 */
+			if (*ecx == 0) {
+				error = vm_get_capability(vm, vcpu_id,
+				    VM_CAP_ENABLE_INVPCID, &enable_invpcid);
+				if (error == 0 && enable_invpcid)
+					regs[1] |= CPUID_STDEXT_INVPCID;
+			}
+			break;
+
+		case CPUID_0000_0006:
 		case CPUID_0000_000A:
 		case CPUID_0000_000D:
 			/*
diff --git a/sys/arm/allwinner/a10_clk.c b/sys/arm/allwinner/a10_clk.c
index 64251fb44cd..8518c742b78 100644
--- a/sys/arm/allwinner/a10_clk.c
+++ b/sys/arm/allwinner/a10_clk.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/allwinner/a10_gpio.c b/sys/arm/allwinner/a10_gpio.c
index 0ccea4fe1ca..c14f2284546 100644
--- a/sys/arm/allwinner/a10_gpio.c
+++ b/sys/arm/allwinner/a10_gpio.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
 #include <machine/fdt.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/allwinner/a10_machdep.c b/sys/arm/allwinner/a10_machdep.c
index 528201341f3..c77a2a5b973 100644
--- a/sys/arm/allwinner/a10_machdep.c
+++ b/sys/arm/allwinner/a10_machdep.c
@@ -43,9 +43,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/fdt/fdt_common.h>
 
@@ -59,7 +58,13 @@ vm_offset_t
 initarm_lastaddr(void)
 {
 
-	return (DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE);
+	return (DEVMAP_BOOTSTRAP_MAP_START);
+}
+
+void
+initarm_early_init(void)
+{
+
 }
 
 void
@@ -73,7 +78,7 @@ initarm_late_init(void)
 }
 
 #define FDT_DEVMAP_MAX		(1 + 2 + 1 + 1)
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
+static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
 	{ 0, 0, 0, 0, 0, }
 };
 
@@ -81,7 +86,7 @@ static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
  * Construct pmap_devmap[] with DT-derived config data.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 	int i = 0;
 
@@ -93,7 +98,7 @@ platform_devmap_init(void)
 
 	i++;
 
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
+	arm_devmap_register_table(&fdt_devmap[0]);
 
 	return (0);
 }
diff --git a/sys/arm/allwinner/a10_wdog.c b/sys/arm/allwinner/a10_wdog.c
index 05636015a7c..f9519361dd3 100644
--- a/sys/arm/allwinner/a10_wdog.c
+++ b/sys/arm/allwinner/a10_wdog.c
@@ -150,6 +150,18 @@ a10wd_watchdog_fn(void *private, u_int cmd, int *error)
 			    (wd_intervals[i].value << WDOG_MODE_INTVL_SHIFT) |
 			    WDOG_MODE_EN | WDOG_MODE_RST_EN);
 			WRITE(sc, WDOG_CTRL, WDOG_CTRL_RESTART);
+			*error = 0;
+		}
+		else {
+			/* 
+			 * Can't arm
+			 * disable watchdog as watchdog(9) requires
+			 */
+			device_printf(sc->dev,
+			    "Can't arm, timeout is more than 16 sec\n");
+			mtx_unlock(&sc->mtx);
+			WRITE(sc, WDOG_MODE, 0);
+			return;
 		}
 	}
 	else
diff --git a/sys/arm/allwinner/a20/a20_cpu_cfg.c b/sys/arm/allwinner/a20/a20_cpu_cfg.c
index 6b6345c39ff..4e6395b2681 100644
--- a/sys/arm/allwinner/a20/a20_cpu_cfg.c
+++ b/sys/arm/allwinner/a20/a20_cpu_cfg.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/allwinner/a20/files.a20 b/sys/arm/allwinner/a20/files.a20
index c2188b6a9ae..b20169fcd2d 100644
--- a/sys/arm/allwinner/a20/files.a20
+++ b/sys/arm/allwinner/a20/files.a20
@@ -16,6 +16,6 @@ arm/allwinner/a10_gpio.c		optional	gpio
 arm/allwinner/a10_ehci.c		optional	ehci
 arm/allwinner/a10_wdog.c		standard
 arm/allwinner/timer.c			standard
-arm/allwinner/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 arm/allwinner/common.c			standard
 arm/allwinner/a10_machdep.c		standard
diff --git a/sys/arm/allwinner/bus_space.c b/sys/arm/allwinner/bus_space.c
deleted file mode 100644
index 4cce8203abc..00000000000
--- a/sys/arm/allwinner/bus_space.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (C) 2012 FreeBSD Foundation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 MARVELL nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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 <machine/bus.h>
-
-/* Prototypes for all the bus_space structure functions */
-bs_protos(generic);
-bs_protos(generic_armv4);
-
-struct bus_space _base_tag = {
-	/* cookie */
-	.bs_cookie	= (void *) 0,
-	
-	/* mapping/unmapping */
-	.bs_map		= generic_bs_map,
-	.bs_unmap	= generic_bs_unmap,
-	.bs_subregion	= generic_bs_subregion,
-	
-	/* allocation/deallocation */
-	.bs_alloc	= generic_bs_alloc,
-	.bs_free	= generic_bs_free,
-	
-	/* barrier */
-	.bs_barrier	= generic_bs_barrier,
-	
-	/* read (single) */
-	.bs_r_1		= generic_bs_r_1,
-	.bs_r_2		= generic_armv4_bs_r_2,
-	.bs_r_4		= generic_bs_r_4,
-	.bs_r_8		= NULL,
-	
-	/* read multiple */
-	.bs_rm_1	= generic_bs_rm_1,
-	.bs_rm_2	= generic_armv4_bs_rm_2,
-	.bs_rm_4	= generic_bs_rm_4,
-	.bs_rm_8	= NULL,
-	
-	/* read region */
-	.bs_rr_1	= generic_bs_rr_1,
-	.bs_rr_2	= generic_armv4_bs_rr_2,
-	.bs_rr_4	= generic_bs_rr_4,
-	.bs_rr_8	= NULL,
-	
-	/* write (single) */
-	.bs_w_1		= generic_bs_w_1,
-	.bs_w_2		= generic_armv4_bs_w_2,
-	.bs_w_4		= generic_bs_w_4,
-	.bs_w_8		= NULL,
-	
-	/* write multiple */
-	.bs_wm_1	= generic_bs_wm_1,
-	.bs_wm_2	= generic_armv4_bs_wm_2,
-	.bs_wm_4	= generic_bs_wm_4,
-	.bs_wm_8	= NULL,
-	
-	/* write region */
-	.bs_wr_1	= generic_bs_wr_1,
-	.bs_wr_2	= generic_armv4_bs_wr_2,
-	.bs_wr_4	= generic_bs_wr_4,
-	.bs_wr_8	= NULL,
-	
-	/* set multiple */
-	/* XXX not implemented */
-	
-	/* set region */
-	.bs_sr_1	= NULL,
-	.bs_sr_2	= generic_armv4_bs_sr_2,
-	.bs_sr_4	= generic_bs_sr_4,
-	.bs_sr_8	= NULL,
-	
-	/* copy */
-	.bs_c_1		= NULL,
-	.bs_c_2		= generic_armv4_bs_c_2,
-	.bs_c_4		= NULL,
-	.bs_c_8		= NULL,
-};
-
-bus_space_tag_t fdtbus_bs_tag = &_base_tag;
diff --git a/sys/arm/allwinner/files.a10 b/sys/arm/allwinner/files.a10
index 3e25bb44965..b2a3d760136 100644
--- a/sys/arm/allwinner/files.a10
+++ b/sys/arm/allwinner/files.a10
@@ -16,7 +16,7 @@ arm/allwinner/a10_ehci.c		optional	ehci
 arm/allwinner/a10_wdog.c		standard
 arm/allwinner/timer.c			standard
 arm/allwinner/aintc.c			standard
-arm/allwinner/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 arm/allwinner/common.c			standard
 #arm/allwinner/console.c			standard
 arm/allwinner/a10_machdep.c		standard
diff --git a/sys/arm/allwinner/timer.c b/sys/arm/allwinner/timer.c
index fb1d9246746..4668026f327 100644
--- a/sys/arm/allwinner/timer.c
+++ b/sys/arm/allwinner/timer.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/samsung/exynos/bus_space.c b/sys/arm/arm/bus_space-v6.c
similarity index 84%
rename from sys/arm/samsung/exynos/bus_space.c
rename to sys/arm/arm/bus_space-v6.c
index 8d21f559c89..d91306e1a1d 100644
--- a/sys/arm/samsung/exynos/bus_space.c
+++ b/sys/arm/arm/bus_space-v6.c
@@ -1,7 +1,9 @@
 /*-
- * Copyright (c) 2012 Damjan Marion <damjan.marion@gmail.com>
+ * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
  * All rights reserved.
  *
+ * Developed by Semihalf.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -10,11 +12,14 @@
  * 2. Redistributions in binary form must 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 MARVELL nor the names of 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
+ * THIS SOFTWARE IS PROVIDED BY 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
+ * ARE DISCLAIMED.  IN NO EVENT SHALL 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)
@@ -90,9 +95,9 @@ static struct bus_space _base_tag = {
 	NULL,
 
 	/* write region */
-	NULL,
-	NULL,
-	NULL,
+	generic_bs_wr_1,
+	generic_armv4_bs_wr_2,
+	generic_bs_wr_4,
 	NULL,
 
 	/* set multiple */
@@ -102,14 +107,14 @@ static struct bus_space _base_tag = {
 	NULL,
 
 	/* set region */
-	NULL,
-	NULL,
-	NULL,
+	generic_bs_sr_1,
+	generic_armv4_bs_sr_2,
+	generic_bs_sr_4,
 	NULL,
 
 	/* copy */
 	NULL,
-	NULL,
+	generic_armv4_bs_c_2,
 	NULL,
 	NULL,
 
diff --git a/sys/arm/arm/bus_space_generic.c b/sys/arm/arm/bus_space_generic.c
index 19ba73bb943..551d956255d 100644
--- a/sys/arm/arm/bus_space_generic.c
+++ b/sys/arm/arm/bus_space_generic.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 
 #include <machine/bus.h>
+#include <machine/devmap.h>
 
 /* Prototypes for all the bus_space structure functions */
 bs_protos(generic);
@@ -58,36 +59,20 @@ int
 generic_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
     bus_space_handle_t *bshp)
 {
-	const struct pmap_devmap *pd;
-	vm_paddr_t startpa, endpa, pa, offset;
-	vm_offset_t va;
-	pt_entry_t *pte;
-
-	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
-		/* Device was statically mapped. */
-		*bshp = pd->pd_va + (bpa - pd->pd_pa);
-		return (0);
-	}
-
-	endpa = round_page(bpa + size);
-	offset = bpa & PAGE_MASK;
-	startpa = trunc_page(bpa);
-
-	va = kva_alloc(endpa - startpa);
-	if (va == 0)
-		return (ENOMEM);
-
-	*bshp = va + offset;
-
-	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter(va, pa);
-		pte = vtopte(va);
-		if (!(flags & BUS_SPACE_MAP_CACHEABLE)) {
-			*pte &= ~L2_S_CACHE_MASK;
-			PTE_SYNC(pte);
-		}
-	}
+	void *va;
 
+	/*
+	 * Look up the address in the static device mappings.  If it's not
+	 * there, establish a new dynamic mapping.
+	 *
+	 * We don't even examine the passed-in flags.  For ARM, the CACHEABLE
+	 * flag doesn't make sense (we create PTE_DEVICE mappings), and the
+	 * LINEAR flag is just implied because we use kva_alloc(size).
+	 */
+	if ((va = arm_devmap_ptov(bpa, size)) == NULL)
+		if ((va = pmap_mapdev(bpa, size)) == NULL)
+			return (ENOMEM);
+	*bshp = (bus_space_handle_t)va;
 	return (0);
 }
 
@@ -104,21 +89,13 @@ generic_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend, bus_size_t size,
 void
 generic_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size)
 {
-	vm_offset_t va, endva, origva;
 
-	if (pmap_devmap_find_va((vm_offset_t)h, size) != NULL) {
-		/* Device was statically mapped; nothing to do. */
-		return;
-	}
-
-	endva = round_page((vm_offset_t)h + size);
-	origva = va = trunc_page((vm_offset_t)h);
-
-	while (va < endva) {
-		pmap_kremove(va);
-		va += PAGE_SIZE;
-	}
-	kva_free(origva, endva - origva);
+	/*
+	 * If the region is static-mapped do nothing, otherwise remove the
+	 * dynamic mapping.
+	 */
+	if (arm_devmap_vtop((void*)h, size) == DEVMAP_PADDR_NOTFOUND)
+		pmap_unmapdev((vm_offset_t)h, size);
 }
 
 void
diff --git a/sys/arm/arm/busdma_machdep-v6.c b/sys/arm/arm/busdma_machdep-v6.c
index b4f41101e6b..e7f01c44743 100644
--- a/sys/arm/arm/busdma_machdep-v6.c
+++ b/sys/arm/arm/busdma_machdep-v6.c
@@ -425,14 +425,21 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
 	if (_bus_dma_can_bounce(newtag->lowaddr, newtag->highaddr)
 	 || newtag->alignment > 1)
 		newtag->flags |= BUS_DMA_COULD_BOUNCE;
-	else
-		maxsize = 2; /* Need at most 2 bounce pages for unaligned access on cache line boundaries */
 
+	/*
+	 * Any request can auto-bounce due to cacheline alignment, in addition
+	 * to any alignment or boundary specifications in the tag, so if the
+	 * ALLOCNOW flag is set, there's always work to do.
+	 */
 	if ((flags & BUS_DMA_ALLOCNOW) != 0) {
 		struct bounce_zone *bz;
-
-		/* Must bounce */
-
+		/*
+		 * Round size up to a full page, and add one more page because
+		 * there can always be one more boundary crossing than the
+		 * number of pages in a transfer.
+		 */
+		maxsize = roundup2(maxsize, PAGE_SIZE) + PAGE_SIZE;
+		
 		if ((error = alloc_bounce_zone(newtag)) != 0) {
 			free(newtag, M_DEVBUF);
 			return (error);
@@ -518,20 +525,22 @@ static int allocate_bz_and_pages(bus_dma_tag_t dmat, bus_dmamap_t mapp)
 	STAILQ_INIT(&(mapp->bpages));
 
 	/*
-	 * Attempt to add pages to our pool on a per-instance
-	 * basis up to a sane limit.
+	 * Attempt to add pages to our pool on a per-instance basis up to a sane
+	 * limit.  Even if the tag isn't flagged as COULD_BOUNCE due to
+	 * alignment and boundary constraints, it could still auto-bounce due to
+	 * cacheline alignment, which requires at most two bounce pages.
 	 */
 	if (dmat->flags & BUS_DMA_COULD_BOUNCE)
 		maxpages = MAX_BPAGES;
 	else
-		maxpages = 2 * bz->map_count; /* Only need at most 2 pages for buffers unaligned on cache line boundaries */
+		maxpages = 2 * bz->map_count;
 	if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0
 	    || (bz->map_count > 0 && bz->total_bpages < maxpages)) {
 		int pages;
 		
-		pages = MAX(atop(dmat->maxsize), 1);
+		pages = atop(roundup2(dmat->maxsize, PAGE_SIZE)) + 1;
 		pages = MIN(maxpages - bz->total_bpages, pages);
-		pages = MAX(pages, 1);
+		pages = MAX(pages, 2);
 		if (alloc_bounce_pages(dmat, pages) < pages)
 			return (ENOMEM);
 		
@@ -966,6 +975,16 @@ _bus_dmamap_load_phys(bus_dma_tag_t dmat,
 	return (0);
 }
 
+int
+_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
+    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+    bus_dma_segment_t *segs, int *segp)
+{
+
+	return (bus_dmamap_load_ma_triv(dmat, map, ma, tlen, ma_offs, flags,
+	    segs, segp));
+}
+
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
@@ -1273,7 +1292,12 @@ _bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
 			}
 			break;
 
+		case BUS_DMASYNC_POSTREAD:
+		case BUS_DMASYNC_POSTWRITE:
+		case BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE:
+			break;
 		default:
+			panic("unsupported combination of sync operations: 0x%08x\n", op);
 			break;
 		}
 	}
diff --git a/sys/arm/arm/busdma_machdep.c b/sys/arm/arm/busdma_machdep.c
index 6181d353b57..8ef8e03e7d8 100644
--- a/sys/arm/arm/busdma_machdep.c
+++ b/sys/arm/arm/busdma_machdep.c
@@ -122,7 +122,6 @@ struct bus_dma_tag {
 
 struct bounce_page {
 	vm_offset_t	vaddr;		/* kva of bounce buffer */
-	vm_offset_t	vaddr_nocache;	/* kva of bounce buffer uncached */
 	bus_addr_t	busaddr;	/* Physical address */
 	vm_offset_t	datavaddr;	/* kva of client data */
 	bus_addr_t	dataaddr;	/* client physical address */
@@ -808,7 +807,7 @@ _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
 	bus_addr_t curaddr;
 	bus_size_t sgsize;
 
-	if ((map->pagesneeded == 0)) {
+	if (map->pagesneeded == 0) {
 		CTR3(KTR_BUSDMA, "lowaddr= %d, boundary= %d, alignment= %d",
 		    dmat->lowaddr, dmat->boundary, dmat->alignment);
 		CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d",
@@ -839,7 +838,7 @@ _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
 	vm_offset_t vendaddr;
 	bus_addr_t paddr;
 
-	if ((map->pagesneeded == 0)) {
+	if (map->pagesneeded == 0) {
 		CTR3(KTR_BUSDMA, "lowaddr= %d, boundary= %d, alignment= %d",
 		    dmat->lowaddr, dmat->boundary, dmat->alignment);
 		CTR2(KTR_BUSDMA, "map= %p, pagesneeded= %d",
@@ -993,6 +992,17 @@ _bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
 	}
 	return (0);
 }
+
+int
+_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
+    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+    bus_dma_segment_t *segs, int *segp)
+{
+
+	return (bus_dmamap_load_ma_triv(dmat, map, ma, tlen, ma_offs, flags,
+	    segs, segp));
+}
+
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrance, and the ending segment on exit.
@@ -1196,39 +1206,23 @@ _bus_dmamap_sync_bp(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
 	STAILQ_FOREACH(bpage, &map->bpages, links) {
 		if (op & BUS_DMASYNC_PREWRITE) {
 			if (bpage->datavaddr != 0)
-				bcopy((void *)bpage->datavaddr,
-				    (void *)(bpage->vaddr_nocache != 0 ?
-					     bpage->vaddr_nocache :
-					     bpage->vaddr),
-				    bpage->datacount);
+				bcopy((void *)bpage->datavaddr, 
+				    (void *)bpage->vaddr, bpage->datacount);
 			else
 				physcopyout(bpage->dataaddr,
-				    (void *)(bpage->vaddr_nocache != 0 ?
-					     bpage->vaddr_nocache :
-					     bpage->vaddr),
-				    bpage->datacount);
-			if (bpage->vaddr_nocache == 0) {
-				cpu_dcache_wb_range(bpage->vaddr,
-				    bpage->datacount);
-				cpu_l2cache_wb_range(bpage->vaddr,
-				    bpage->datacount);
-			}
+				    (void *)bpage->vaddr,bpage->datacount);
+			cpu_dcache_wb_range(bpage->vaddr, bpage->datacount);
+			cpu_l2cache_wb_range(bpage->vaddr, bpage->datacount);
 			dmat->bounce_zone->total_bounced++;
 		}
 		if (op & BUS_DMASYNC_POSTREAD) {
-			if (bpage->vaddr_nocache == 0) {
-				cpu_dcache_inv_range(bpage->vaddr,
-				    bpage->datacount);
-				cpu_l2cache_inv_range(bpage->vaddr,
-				    bpage->datacount);
-			}
+			cpu_dcache_inv_range(bpage->vaddr, bpage->datacount);
+			cpu_l2cache_inv_range(bpage->vaddr, bpage->datacount);
 			if (bpage->datavaddr != 0)
-				bcopy((void *)(bpage->vaddr_nocache != 0 ?
-				    bpage->vaddr_nocache : bpage->vaddr),
+				bcopy((void *)bpage->vaddr,
 				    (void *)bpage->datavaddr, bpage->datacount);
 			else
-				physcopyin((void *)(bpage->vaddr_nocache != 0 ?
-				    bpage->vaddr_nocache : bpage->vaddr),
+				physcopyin((void *)bpage->vaddr,
 				    bpage->dataaddr, bpage->datacount);
 			dmat->bounce_zone->total_bounced++;
 		}
@@ -1385,8 +1379,6 @@ alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages)
 			break;
 		}
 		bpage->busaddr = pmap_kextract(bpage->vaddr);
-		bpage->vaddr_nocache = (vm_offset_t)arm_remap_nocache(
-		    (void *)bpage->vaddr, PAGE_SIZE);
 		mtx_lock(&bounce_lock);
 		STAILQ_INSERT_TAIL(&bz->bounce_page_list, bpage, links);
 		total_bpages++;
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index da2328389cc..e25454599fd 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -541,65 +541,6 @@ struct cpu_functions pj4bv7_cpufuncs = {
 
 	pj4bv7_setup			/* cpu setup		*/
 };
-
-struct cpu_functions pj4bv6_cpufuncs = {
-	/* CPU functions */
-
-	cpufunc_id,			/* id			*/
-	arm11_drain_writebuf,		/* cpwait		*/
-
-	/* MMU functions */
-
-	cpufunc_control,		/* control		*/
-	cpufunc_domains,		/* Domain		*/
-	pj4b_setttb,			/* Setttb		*/
-	cpufunc_faultstatus,		/* Faultstatus		*/
-	cpufunc_faultaddress,		/* Faultaddress		*/
-
-	/* TLB functions */
-
-	arm11_tlb_flushID,		/* tlb_flushID		*/
-	arm11_tlb_flushID_SE,		/* tlb_flushID_SE	*/
-	arm11_tlb_flushI,		/* tlb_flushI		*/
-	arm11_tlb_flushI_SE,		/* tlb_flushI_SE	*/
-	arm11_tlb_flushD,		/* tlb_flushD		*/
-	arm11_tlb_flushD_SE,		/* tlb_flushD_SE	*/
-
-	/* Cache operations */
-	armv6_icache_sync_all,		/* icache_sync_all	*/
-	pj4b_icache_sync_range,		/* icache_sync_range	*/
-
-	armv6_dcache_wbinv_all,		/* dcache_wbinv_all	*/
-	pj4b_dcache_wbinv_range,	/* dcache_wbinv_range	*/
-	pj4b_dcache_inv_range,		/* dcache_inv_range	*/
-	pj4b_dcache_wb_range,		/* dcache_wb_range	*/
-
-	armv6_idcache_wbinv_all,	/* idcache_wbinv_all	*/
-	pj4b_idcache_wbinv_range,	/* idcache_wbinv_all	*/
-
-	(void *)cpufunc_nullop,		/* l2cache_wbinv_all	*/
-	(void *)cpufunc_nullop,		/* l2cache_wbinv_range	*/
-	(void *)cpufunc_nullop,		/* l2cache_inv_range	*/
-	(void *)cpufunc_nullop,		/* l2cache_wb_range	*/
-
-	/* Other functions */
-
-	pj4b_drain_readbuf,		/* flush_prefetchbuf	*/
-	arm11_drain_writebuf,		/* drain_writebuf	*/
-	pj4b_flush_brnchtgt_all,	/* flush_brnchtgt_C	*/
-	pj4b_flush_brnchtgt_va,		/* flush_brnchtgt_E	*/
-
-	(void *)cpufunc_nullop,		/* sleep		*/
-
-	/* Soft functions */
-
-	cpufunc_null_fixup,		/* dataabt_fixup	*/
-	cpufunc_null_fixup,		/* prefetchabt_fixup	*/
-
-	arm11_context_switch,		/* context_switch	*/
-
-	pj4bv6_setup			/* cpu setup		*/
-};
 #endif /* CPU_MV_PJ4B */
 
 #ifdef CPU_SA110
@@ -1476,7 +1417,8 @@ set_cpufuncs()
 	}
 #endif /* CPU_ARM1136 || CPU_ARM1176 */
 #ifdef CPU_CORTEXA
-	if (cputype == CPU_ID_CORTEXA7 ||
+	if (cputype == CPU_ID_CORTEXA5 ||
+	    cputype == CPU_ID_CORTEXA7 ||
 	    cputype == CPU_ID_CORTEXA8R1 ||
 	    cputype == CPU_ID_CORTEXA8R2 ||
 	    cputype == CPU_ID_CORTEXA8R3 ||
@@ -1496,27 +1438,14 @@ set_cpufuncs()
 #endif /* CPU_CORTEXA */
 		
 #if defined(CPU_MV_PJ4B)
-	if (cputype == CPU_ID_MV88SV581X_V6 ||
-	    cputype == CPU_ID_MV88SV581X_V7 ||
+	if (cputype == CPU_ID_MV88SV581X_V7 ||
 	    cputype == CPU_ID_MV88SV584X_V7 ||
-	    cputype == CPU_ID_ARM_88SV581X_V6 ||
 	    cputype == CPU_ID_ARM_88SV581X_V7) {
-		if (cpu_pfr(0) & ARM_PFR0_THUMBEE_MASK)
-			cpufuncs = pj4bv7_cpufuncs;
-		else
-			cpufuncs = pj4bv6_cpufuncs;
-
-		get_cachetype_cp15();
-		pmap_pte_init_mmu_v6();
-		goto out;
-	} else if (cputype == CPU_ID_ARM_88SV584X_V6 ||
-	    cputype == CPU_ID_MV88SV584X_V6) {
-		cpufuncs = pj4bv6_cpufuncs;
+		cpufuncs = pj4bv7_cpufuncs;
 		get_cachetype_cp15();
 		pmap_pte_init_mmu_v6();
 		goto out;
 	}
-
 #endif /* CPU_MV_PJ4B */
 #ifdef CPU_SA110
 	if (cputype == CPU_ID_SA110) {
@@ -1720,7 +1649,7 @@ int
 early_abort_fixup(arg)
 	void *arg;
 {
-	trapframe_t *frame = arg;
+	struct trapframe *frame = arg;
 	u_int fault_pc;
 	u_int fault_instruction;
 	int saved_lr = 0;
@@ -1861,7 +1790,7 @@ int
 late_abort_fixup(arg)
 	void *arg;
 {
-	trapframe_t *frame = arg;
+	struct trapframe *frame = arg;
 	u_int fault_pc;
 	u_int fault_instruction;
 	int saved_lr = 0;
@@ -2445,44 +2374,6 @@ arm11x6_setup(char *args)
 #endif  /* CPU_ARM1136 || CPU_ARM1176 */
 
 #ifdef CPU_MV_PJ4B
-void
-pj4bv6_setup(char *args)
-{
-	int cpuctrl;
-
-	pj4b_config();
-
-	cpuctrl = CPU_CONTROL_MMU_ENABLE;
-#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
-	cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
-#endif
-	cpuctrl |= CPU_CONTROL_DC_ENABLE;
-	cpuctrl |= (0xf << 3);
-#ifdef __ARMEB__
-	cpuctrl |= CPU_CONTROL_BEND_ENABLE;
-#endif
-	cpuctrl |= CPU_CONTROL_SYST_ENABLE;
-	cpuctrl |= CPU_CONTROL_BPRD_ENABLE;
-	cpuctrl |= CPU_CONTROL_IC_ENABLE;
-	if (vector_page == ARM_VECTORS_HIGH)
-		cpuctrl |= CPU_CONTROL_VECRELOC;
-	cpuctrl |= (0x5 << 16);
-	cpuctrl |= CPU_CONTROL_V6_EXTPAGE;
-	/* XXX not yet */
-	/* cpuctrl |= CPU_CONTROL_L2_ENABLE; */
-
-	/* Make sure caches are clean.  */
-	cpu_idcache_wbinv_all();
-	cpu_l2cache_wbinv_all();
-
-	/* Set the control register */
-	ctrl = cpuctrl;
-	cpu_control(0xffffffff, cpuctrl);
-
-	cpu_idcache_wbinv_all();
-	cpu_l2cache_wbinv_all();
-}
-
 void
 pj4bv7_setup(args)
 	char *args;
diff --git a/sys/arm/arm/cpufunc_asm_armv7.S b/sys/arm/arm/cpufunc_asm_armv7.S
index 2b4be8545b4..bc28f82e4a3 100644
--- a/sys/arm/arm/cpufunc_asm_armv7.S
+++ b/sys/arm/arm/cpufunc_asm_armv7.S
@@ -57,9 +57,9 @@ __FBSDID("$FreeBSD$");
 #define PT_OUTER_WBWA	(1 << 3)
 	
 #ifdef SMP
-#define PT_ATTR	(PT_S|PT_INNER_WT|PT_OUTER_WT|PT_NOS)
+#define PT_ATTR	(PT_S|PT_INNER_WBWA|PT_OUTER_WBWA|PT_NOS)
 #else
-#define PT_ATTR	(PT_INNER_WT|PT_OUTER_WT)
+#define PT_ATTR	(PT_INNER_WBWA|PT_OUTER_WBWA)
 #endif
 
 ENTRY(armv7_setttb)
@@ -98,7 +98,7 @@ ENTRY(armv7_tlb_flushID_SE)
 	ldr	r1, .Lpage_mask
 	bic	r0, r0, r1
 #ifdef SMP
-	mcr	p15, 0, r0, c8, c3, 1	/* flush D tlb single entry Inner Shareable*/
+	mcr	p15, 0, r0, c8, c3, 3	/* flush D tlb single entry Inner Shareable*/
 	mcr	p15, 0, r0, c7, c1, 6	/* flush BTB Inner Shareable */
 #else
 	mcr	p15, 0, r0, c8, c7, 1	/* flush D tlb single entry */
diff --git a/sys/arm/arm/cpufunc_asm_pj4b.S b/sys/arm/arm/cpufunc_asm_pj4b.S
index e6182fb04ec..d8d400c856c 100644
--- a/sys/arm/arm/cpufunc_asm_pj4b.S
+++ b/sys/arm/arm/cpufunc_asm_pj4b.S
@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/param.h>
 
-.Lpj4b_cache_line_size:
-	.word	_C_LABEL(arm_pdcache_line_size)
-
 .Lpj4b_sf_ctrl_reg:
 	.word	0xf1021820
 
@@ -52,135 +49,6 @@ ENTRY(pj4b_setttb)
 	RET
 END(pj4b_setttb)
 
-ENTRY_NP(armv6_icache_sync_all)
-	/*
-	 * We assume that the code here can never be out of sync with the
-	 * dcache, so that we can safely flush the Icache and fall through
-	 * into the Dcache cleaning code.
-	 */
-	mov	r0, #0
-	mcr	p15, 0, r0, c7, c5, 0	/* Invalidate ICache */
-	mcr	p15, 0, r0, c7, c10, 0	/* Clean (don't invalidate) DCache */
-	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
-	RET
-END(armv6_icache_sync_all)
-
-ENTRY(pj4b_icache_sync_range)
-	sub	r1, r1, #1
-	add	r1, r0, r1
-	mcrr	p15, 0, r1, r0, c5	/* invalidate IC range */
-	mcrr	p15, 0, r1, r0, c12	/* clean DC range */
-	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
-	RET
-END(pj4b_icache_sync_range)
-
-ENTRY(pj4b_dcache_inv_range)
-	ldr	ip, .Lpj4b_cache_line_size
-	ldr	ip, [ip]
-	sub	r1, r1, #1		/* Don't overrun */
-	sub	r3, ip, #1
-	and	r2, r0, r3
-	add	r1, r1, r2
-	bic	r0, r0, r3
-
-	mcr	p15, 0, r0, c7, c10, 5  /* Data Memory Barrier err:4413 */
-1:
-	mcr	p15, 0, r0, c7, c6, 1
-	add	r0, r0, ip
-	subs	r1, r1, ip
-	bpl	1b
-	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
-	RET
-END(pj4b_dcache_inv_range)
-
-ENTRY(armv6_idcache_wbinv_all)
-	mov	r0, #0
-	mcr	p15, 0, r0, c7, c5, 0	/* invalidate ICache */
-	mcr	p15, 0, r0, c7, c14, 0	/* clean and invalidate DCache */
-	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
-	RET
-END(armv6_idcache_wbinv_all)
-
-ENTRY(armv6_dcache_wbinv_all)
-	mov	r0, #0
-	mcr	p15, 0, r0, c7, c14, 0	/* clean and invalidate DCache */
-	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
-	RET
-END(armv6_dcache_wbinv_all)
-
-ENTRY(pj4b_idcache_wbinv_range)
-	ldr	ip, .Lpj4b_cache_line_size
-	ldr	ip, [ip]
-	sub	r1, r1, #1		/* Don't overrun */
-	sub	r3, ip, #1
-	and	r2, r0, r3
-	add	r1, r1, r2
-	bic	r0, r0, r3
-
-	mcr	p15, 0, r0, c7, c10, 5  /* Data Memory Barrier err:4611 */
-1:
-#ifdef SMP
-	/* Request for ownership */
-	ldr	r2, [r0]
-	str	r2, [r0]
-#endif
-	mcr	p15, 0, r0, c7, c5, 1
-	mcr	p15, 0, r0, c7, c14, 1	/* L2C clean and invalidate entry */
-	add	r0, r0, ip
-	subs	r1, r1, ip
-	bpl	1b
-	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
-	RET
-END(pj4b_idcache_wbinv_range)
-
-ENTRY(pj4b_dcache_wbinv_range)
-	ldr	ip, .Lpj4b_cache_line_size
-	ldr	ip, [ip]
-	sub	r1, r1, #1		/* Don't overrun */
-	sub	r3, ip, #1
-	and	r2, r0, r3
-	add	r1, r1, r2
-	bic	r0, r0, r3
-
-	mcr	p15, 0, r0, c7, c10, 5  /* Data Memory Barrier err:4611 */
-1:
-#ifdef SMP
-	/* Request for ownership */
-	ldr	r2, [r0]
-	str	r2, [r0]
-#endif
-	mcr	p15, 0, r0, c7, c14, 1
-	add	r0, r0, ip
-	subs	r1, r1, ip
-	bpl	1b
-	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
-	RET
-END(pj4b_dcache_wbinv_range)
-
-ENTRY(pj4b_dcache_wb_range)
-	ldr	ip, .Lpj4b_cache_line_size
-	ldr	ip, [ip]
-	sub	r1, r1, #1		/* Don't overrun */
-	sub	r3, ip, #1
-	and	r2, r0, r3
-	add	r1, r1, r2
-	bic	r0, r0, r3
-
-	mcr	p15, 0, r0, c7, c10, 5  /* Data Memory Barrier err:4611 */
-1:
-#ifdef SMP
-	/* Request for ownership */
-	ldr	r2, [r0]
-	str	r2, [r0]
-#endif
-	mcr	p15, 0, r0, c7, c10, 1	/* L2C clean single entry by MVA */
-	add	r0, r0, ip
-	subs	r1, r1, ip
-	bpl	1b
-	mcr	p15, 0, r0, c7, c10, 4	/* drain the write buffer */
-	RET
-END(pj4b_dcache_wb_range)
-
 ENTRY(pj4b_drain_readbuf)
 	mcr	p15, 0, r0, c7, c5, 4	/* flush prefetch buffers */
 	RET
diff --git a/sys/arm/arm/db_trace.c b/sys/arm/arm/db_trace.c
index 99c27fcda30..57119dac47d 100644
--- a/sys/arm/arm/db_trace.c
+++ b/sys/arm/arm/db_trace.c
@@ -376,7 +376,7 @@ db_stack_trace_cmd(struct unwind_state *state)
 		index = db_find_index(state->start_pc);
 
 		if (index->insn != EXIDX_CANTUNWIND) {
-			if (index->insn & (1 << 31)) {
+			if (index->insn & (1U << 31)) {
 				/* The data is within the instruction */
 				state->insn = &index->insn;
 			} else {
diff --git a/sys/arm/arm/devmap.c b/sys/arm/arm/devmap.c
new file mode 100644
index 00000000000..e02e295a9c5
--- /dev/null
+++ b/sys/arm/arm/devmap.c
@@ -0,0 +1,257 @@
+/*-
+ * Copyright (c) 2013 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Routines for mapping device memory.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/pmap.h>
+#include <machine/armreg.h>
+#include <machine/devmap.h>
+
+static const struct arm_devmap_entry *devmap_table;
+static boolean_t devmap_bootstrap_done = false;
+
+/*
+ * The allocated-kva (akva) devmap table and metadata.  Platforms can call
+ * arm_devmap_add_entry() to add static device mappings to this table using
+ * automatically allocated virtual addresses carved out of the top of kva space.
+ * Allocation begins immediately below the ARM_VECTORS_HIGH address.
+ */
+#define	AKVA_DEVMAP_MAX_ENTRIES	32
+static struct arm_devmap_entry	akva_devmap_entries[AKVA_DEVMAP_MAX_ENTRIES];
+static u_int			akva_devmap_idx;
+static vm_offset_t		akva_devmap_vaddr = ARM_VECTORS_HIGH;
+
+/*
+ * Return the "last" kva address used by the registered devmap table.  It's
+ * actually the lowest address used by the static mappings, i.e., the address of
+ * the first unusable byte of KVA.
+ */
+vm_offset_t
+arm_devmap_lastaddr()
+{
+	const struct arm_devmap_entry *pd;
+	vm_offset_t lowaddr;
+
+	if (akva_devmap_idx > 0)
+		return (akva_devmap_vaddr);
+
+	if (devmap_table == NULL)
+		panic("arm_devmap_lastaddr(): No devmap table registered.");
+
+	lowaddr = ARM_VECTORS_HIGH;
+	for (pd = devmap_table; pd->pd_size != 0; ++pd) {
+		if (lowaddr > pd->pd_va)
+			lowaddr = pd->pd_va;
+	}
+
+	return (lowaddr);
+}
+
+/*
+ * Add an entry to the internal "akva" static devmap table using the given
+ * physical address and size and a virtual address allocated from the top of
+ * kva.  This automatically registers the akva table on the first call, so all a
+ * platform has to do is call this routine to install as many mappings as it
+ * needs and when initarm() calls arm_devmap_bootstrap() it will pick up all the
+ * entries in the akva table automatically.
+ */
+void
+arm_devmap_add_entry(vm_paddr_t pa, vm_size_t sz)
+{
+	struct arm_devmap_entry *m;
+
+	if (devmap_bootstrap_done)
+		panic("arm_devmap_add_entry() after arm_devmap_bootstrap()");
+
+	if (akva_devmap_idx == (AKVA_DEVMAP_MAX_ENTRIES - 1))
+		panic("AKVA_DEVMAP_MAX_ENTRIES is too small");
+
+	if (akva_devmap_idx == 0)
+		arm_devmap_register_table(akva_devmap_entries);
+
+	/*
+	 * Allocate virtual address space from the top of kva downwards.  If the
+	 * range being mapped is aligned and sized to 1MB boundaries then also
+	 * align the virtual address to the next-lower 1MB boundary so that we
+	 * end up with a nice efficient section mapping.
+	 */
+	if ((pa & 0x000fffff) == 0 && (sz & 0x000fffff) == 0) {
+		akva_devmap_vaddr = trunc_1mpage(akva_devmap_vaddr - sz);
+	} else {
+		akva_devmap_vaddr = trunc_page(akva_devmap_vaddr - sz);
+	}
+	m = &akva_devmap_entries[akva_devmap_idx++];
+	m->pd_va    = akva_devmap_vaddr;
+	m->pd_pa    = pa;
+	m->pd_size  = sz;
+	m->pd_prot  = VM_PROT_READ | VM_PROT_WRITE;
+	m->pd_cache = PTE_DEVICE;
+}
+
+/*
+ * Register the given table as the one to use in arm_devmap_bootstrap().
+ */
+void
+arm_devmap_register_table(const struct arm_devmap_entry *table)
+{
+
+	devmap_table = table;
+}
+
+/*
+ * Map all of the static regions in the devmap table, and remember the devmap
+ * table so the mapdev, ptov, and vtop functions can do lookups later.
+ *
+ * If a non-NULL table pointer is given it is used unconditionally, otherwise
+ * the previously-registered table is used.  This smooths transition from legacy
+ * code that fills in a local table then calls this function passing that table,
+ * and newer code that uses arm_devmap_register_table() in platform-specific
+ * code, then lets the common initarm() call this function with a NULL pointer.
+ */
+void
+arm_devmap_bootstrap(vm_offset_t l1pt, const struct arm_devmap_entry *table)
+{
+	const struct arm_devmap_entry *pd;
+
+	/*
+	 * If given a table pointer, use it, else ensure a table was previously
+	 * registered.  This happens early in boot, and there's a good chance
+	 * the panic message won't be seen, but there's not much we can do.
+	 */
+	if (table != NULL)
+		devmap_table = table;
+	else if (devmap_table == NULL)
+		panic("arm_devmap_bootstrap(): No devmap table registered");
+
+	for (pd = devmap_table; pd->pd_size != 0; ++pd) {
+		pmap_map_chunk(l1pt, pd->pd_va, pd->pd_pa, pd->pd_size,
+		    pd->pd_prot,pd->pd_cache);
+	}
+
+	devmap_bootstrap_done = true;
+}
+
+/*
+ * Look up the given physical address in the static mapping data and return the
+ * corresponding virtual address, or NULL if not found.
+ */
+void *
+arm_devmap_ptov(vm_paddr_t pa, vm_size_t size)
+{
+	const struct arm_devmap_entry *pd;
+
+	if (devmap_table == NULL)
+		return (NULL);
+
+	for (pd = devmap_table; pd->pd_size != 0; ++pd) {
+		if (pa >= pd->pd_pa && pa + size <= pd->pd_pa + pd->pd_size)
+			return ((void *)(pd->pd_va + (pa - pd->pd_pa)));
+	}
+
+	return (NULL);
+}
+
+/*
+ * Look up the given virtual address in the static mapping data and return the
+ * corresponding physical address, or DEVMAP_PADDR_NOTFOUND if not found.
+ */
+vm_paddr_t
+arm_devmap_vtop(void * vpva, vm_size_t size)
+{
+	const struct arm_devmap_entry *pd;
+	vm_offset_t va;
+
+	if (devmap_table == NULL)
+		return (DEVMAP_PADDR_NOTFOUND);
+
+	va = (vm_offset_t)vpva;
+	for (pd = devmap_table; pd->pd_size != 0; ++pd) {
+		if (va >= pd->pd_va && va + size <= pd->pd_va + pd->pd_size)
+			return ((vm_paddr_t)(pd->pd_pa + (va - pd->pd_va)));
+	}
+
+	return (DEVMAP_PADDR_NOTFOUND);
+}
+
+/*
+ * Map a set of physical memory pages into the kernel virtual address space.
+ * Return a pointer to where it is mapped. This routine is intended to be used
+ * for mapping device memory, NOT real memory.
+ */
+void *
+pmap_mapdev(vm_offset_t pa, vm_size_t size)
+{
+	vm_offset_t va, tmpva, offset;
+	
+	offset = pa & PAGE_MASK;
+	pa = trunc_page(pa);
+	size = round_page(size + offset);
+	
+	va = kva_alloc(size);
+	if (!va)
+		panic("pmap_mapdev: Couldn't alloc kernel virtual memory");
+
+	for (tmpva = va; size > 0;) {
+		pmap_kenter_device(tmpva, pa);
+		size -= PAGE_SIZE;
+		tmpva += PAGE_SIZE;
+		pa += PAGE_SIZE;
+	}
+	
+	return ((void *)(va + offset));
+}
+
+/*
+ * Unmap device memory and free the kva space.
+ */
+void
+pmap_unmapdev(vm_offset_t va, vm_size_t size)
+{
+	vm_offset_t tmpva, offset;
+	vm_size_t origsize = size;
+	
+	offset = va & PAGE_MASK;
+	va = trunc_page(va);
+	size = round_page(size + offset);
+
+	for (tmpva = va; size > 0;) {
+		pmap_kremove(tmpva);
+		size -= PAGE_SIZE;
+		tmpva += PAGE_SIZE;
+	}
+
+	kva_free(va, origsize);
+}
+
diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S
index 443ca211c42..f298bc485e1 100644
--- a/sys/arm/arm/fusu.S
+++ b/sys/arm/arm/fusu.S
@@ -67,11 +67,27 @@ ENTRY(casuword)
 	stmfd	sp!, {r4, r5}
 	adr	r4, .Lcasuwordfault
 	str	r4, [r3, #PCB_ONFAULT]
+#ifdef _ARM_ARCH_6
+1:    
+	cmp     r0, #KERNBASE
+	mvnhs   r0, #0
+	bhs     2f
+	
+	ldrex   r5, [r0]
+	cmp     r5, r1
+	movne   r0, r5
+	bne     2f
+	strex   r5, r2, [r0]
+	cmp     r5, #0
+	bne     1b
+#else
 	ldrt	r5, [r0]
 	cmp	r5, r1
 	movne	r0, r5
 	streqt	r2, [r0]
+#endif
 	moveq	r0, r1
+2:
 	ldmfd	sp!, {r4, r5}
 	mov	r1, #0x00000000
 	str	r1, [r3, #PCB_ONFAULT]
diff --git a/sys/arm/arm/genassym.c b/sys/arm/arm/genassym.c
index 0a7399de3d1..beae19005bb 100644
--- a/sys/arm/arm/genassym.c
+++ b/sys/arm/arm/genassym.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <machine/vmparam.h>
 #include <machine/armreg.h>
+#include <machine/frame.h>
 #include <machine/pcb.h>
 #include <machine/cpu.h>
 #include <machine/proc.h>
diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c
index 7517b24fc93..1b8fd1f718a 100644
--- a/sys/arm/arm/generic_timer.c
+++ b/sys/arm/arm/generic_timer.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/arm/gic.c b/sys/arm/arm/gic.c
index a73011f177f..d11c600afb7 100644
--- a/sys/arm/arm/gic.c
+++ b/sys/arm/arm/gic.c
@@ -271,7 +271,6 @@ arm_get_next_irq(int last_irq)
 			printf("Spurious interrupt detected [0x%08x]\n", active_irq);
 		return -1;
 	}
-	gic_c_write_4(GICC_EOIR, active_irq);
 
 	return active_irq;
 }
@@ -279,14 +278,15 @@ arm_get_next_irq(int last_irq)
 void
 arm_mask_irq(uintptr_t nb)
 {
+
 	gic_d_write_4(GICD_ICENABLER(nb >> 5), (1UL << (nb & 0x1F)));
+	gic_c_write_4(GICC_EOIR, nb);
 }
 
 void
 arm_unmask_irq(uintptr_t nb)
 {
 
-	gic_c_write_4(GICC_EOIR, nb);
 	gic_d_write_4(GICD_ISENABLER(nb >> 5), (1UL << (nb & 0x1F)));
 }
 
diff --git a/sys/arm/arm/identcpu.c b/sys/arm/arm/identcpu.c
index fd3266674f7..219d49cee74 100644
--- a/sys/arm/arm/identcpu.c
+++ b/sys/arm/arm/identcpu.c
@@ -236,6 +236,8 @@ const struct cpuidtab cpuids[] = {
 	{ CPU_ID_ARM1026EJS,	CPU_CLASS_ARM10EJ,	"ARM1026EJ-S",
 	  generic_steppings },
 
+	{ CPU_ID_CORTEXA5,	CPU_CLASS_CORTEXA,	"Cortex A5",
+	  generic_steppings },
 	{ CPU_ID_CORTEXA7,	CPU_CLASS_CORTEXA,	"Cortex A7",
 	  generic_steppings },
 	{ CPU_ID_CORTEXA8R1,	CPU_CLASS_CORTEXA,	"Cortex A8-r1",
@@ -321,18 +323,10 @@ const struct cpuidtab cpuids[] = {
 
 	{ CPU_ID_MV88FR571_VD,	CPU_CLASS_MARVELL,	"Feroceon 88FR571-VD",
 	  generic_steppings },
-	{ CPU_ID_MV88SV581X_V6,	CPU_CLASS_MARVELL,	"Sheeva 88SV581x",
-	  generic_steppings },
-	{ CPU_ID_ARM_88SV581X_V6, CPU_CLASS_MARVELL,	"Sheeva 88SV581x",
-	  generic_steppings },
 	{ CPU_ID_MV88SV581X_V7,	CPU_CLASS_MARVELL,	"Sheeva 88SV581x",
 	  generic_steppings },
 	{ CPU_ID_ARM_88SV581X_V7, CPU_CLASS_MARVELL,	"Sheeva 88SV581x",
 	  generic_steppings },
-	{ CPU_ID_MV88SV584X_V6,	CPU_CLASS_MARVELL,	"Sheeva 88SV584x",
-	  generic_steppings },
-	{ CPU_ID_ARM_88SV584X_V6, CPU_CLASS_MARVELL,	"Sheeva 88SV584x",
-	  generic_steppings },
 	{ CPU_ID_MV88SV584X_V7,	CPU_CLASS_MARVELL,	"Sheeva 88SV584x",
 	  generic_steppings },
 
diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S
index f17ab8e6875..e74d5ad305f 100644
--- a/sys/arm/arm/locore.S
+++ b/sys/arm/arm/locore.S
@@ -187,7 +187,7 @@ Lunmapped:
 	mrc	p15, 0, r0, c1, c0, 0
 #ifdef _ARM_ARCH_6
 	orr	r0, r0, #(CPU_CONTROL_V6_EXTPAGE | CPU_CONTROL_UNAL_ENABLE)
-	orr	r2, r2, #(CPU_CONTROL_AFLT_ENABLE)
+	orr	r0, r0, #(CPU_CONTROL_AFLT_ENABLE)
 	orr	r0, r0, #(CPU_CONTROL_AF_ENABLE)
 #endif
 	orr	r0, r0, #(CPU_CONTROL_MMU_ENABLE)
@@ -266,10 +266,6 @@ mmu_init_table:
 	/* map VA 0xc0000000..0xc3ffffff to PA */
 	MMU_INIT(KERNBASE, PHYSADDR, 64, L1_TYPE_S|L1_SHARED|L1_S_C|L1_S_AP(AP_KRW))
 	MMU_INIT(0x48000000, 0x48000000, 1, L1_TYPE_S|L1_SHARED|L1_S_C|L1_S_AP(AP_KRW))
-#if defined(CPU_MV_PJ4B)
-	/* map VA 0xf1000000..0xf1100000 to PA 0xd0000000 */
-	MMU_INIT(0xf1000000, 0xd0000000, 1, L1_TYPE_S|L1_SHARED|L1_S_B|L1_S_AP(AP_KRW))
-#endif /* CPU_MV_PJ4B */
 #endif /* SMP */
 	.word 0	/* end of table */
 #endif
@@ -395,6 +391,7 @@ Ltag:
 	mrc	p15, 0, r0, c1, c0, 0
 #if defined(CPU_ARM1136) || defined(CPU_ARM1176) || defined(CPU_MV_PJ4B) || defined(CPU_CORTEXA)
 	orr	r0, r0, #CPU_CONTROL_V6_EXTPAGE
+	orr	r0, r0, #CPU_CONTROL_AF_ENABLE
 #endif
 	orr	r0, r0, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE)
 	mcr	p15, 0, r0, c1, c0, 0
diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c
index 27a34c827e5..00a3820efd2 100644
--- a/sys/arm/arm/machdep.c
+++ b/sys/arm/arm/machdep.c
@@ -90,11 +90,12 @@ __FBSDID("$FreeBSD$");
 #include <machine/armreg.h>
 #include <machine/atags.h>
 #include <machine/cpu.h>
+#include <machine/devmap.h>
+#include <machine/frame.h>
 #include <machine/machdep.h>
 #include <machine/md_var.h>
 #include <machine/metadata.h>
 #include <machine/pcb.h>
-#include <machine/pmap.h>
 #include <machine/reg.h>
 #include <machine/trap.h>
 #include <machine/undefined.h>
@@ -158,7 +159,6 @@ struct pv_addr undstack;
 struct pv_addr abtstack;
 static struct pv_addr kernelstack;
 
-const struct pmap_devmap *pmap_devmap_bootstrap_table;
 #endif
 
 #if defined(LINUX_BOOT_ABI)
@@ -361,7 +361,6 @@ cpu_startup(void *dummy)
 #endif
 #endif
 
-	cpu_setup("");
 	identify_arm_cpu();
 
 	printf("real memory  = %ju (%ju MB)\n", (uintmax_t)ptoa(physmem),
@@ -1169,11 +1168,15 @@ physmap_init(struct mem_region *availmem_regions, int availmem_regions_sz)
 		 */
 		if (availmem_regions[i].mr_start > 0 ||
 		    availmem_regions[i].mr_size > PAGE_SIZE) {
+			vm_size_t size;
 			phys_avail[j] = availmem_regions[i].mr_start;
-			if (phys_avail[j] == 0)
+
+			size = availmem_regions[i].mr_size;
+			if (phys_avail[j] == 0) {
 				phys_avail[j] += PAGE_SIZE;
-			phys_avail[j + 1] = availmem_regions[i].mr_start +
-			    availmem_regions[i].mr_size;
+				size -= PAGE_SIZE;
+			}
+			phys_avail[j + 1] = availmem_regions[i].mr_start + size;
 		} else
 			j -= 2;
 	}
@@ -1299,7 +1302,7 @@ initarm(struct arm_boot_params *abp)
 	availmem_regions_sz = curr;
 
 	/* Platform-specific initialisation */
-	vm_max_kernel_address = initarm_lastaddr();
+	initarm_early_init();
 
 	pcpu0_init();
 
@@ -1415,9 +1418,10 @@ initarm(struct arm_boot_params *abp)
 	pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa,
 	    VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE, PTE_CACHE);
 
-	/* Map pmap_devmap[] entries */
-	err_devmap = platform_devmap_init();
-	pmap_devmap_bootstrap(l1pagetable, pmap_devmap_bootstrap_table);
+	/* Establish static device mappings. */
+	err_devmap = initarm_devmap_init();
+	arm_devmap_bootstrap(l1pagetable, NULL);
+	vm_max_kernel_address = initarm_lastaddr();
 
 	cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | DOMAIN_CLIENT);
 	pmap_pa = kernel_l1pt.pv_pa;
@@ -1425,6 +1429,12 @@ initarm(struct arm_boot_params *abp)
 	cpu_tlb_flushID();
 	cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2));
 
+	/*
+	 * Now that proper page tables are installed, call cpu_setup() to enable
+	 * instruction and data caches and other chip-specific features.
+	 */
+	cpu_setup("");
+
 	/*
 	 * Only after the SOC registers block is mapped we can perform device
 	 * tree fixups, as they may attempt to read parameters from hardware.
diff --git a/sys/arm/arm/minidump_machdep.c b/sys/arm/arm/minidump_machdep.c
index a8587098b51..69c82f84c26 100644
--- a/sys/arm/arm/minidump_machdep.c
+++ b/sys/arm/arm/minidump_machdep.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #endif
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 #include <machine/atomic.h>
 #include <machine/elf.h>
 #include <machine/md_var.h>
diff --git a/sys/arm/arm/mp_machdep.c b/sys/arm/arm/mp_machdep.c
index 2e5e1d31e3b..c62e311b1f1 100644
--- a/sys/arm/arm/mp_machdep.c
+++ b/sys/arm/arm/mp_machdep.c
@@ -52,6 +52,10 @@ __FBSDID("$FreeBSD$");
 #ifdef VFP
 #include <machine/vfp.h>
 #endif
+#ifdef CPU_MV_PJ4B
+#include <arm/mv/mvwin.h>
+#include <dev/fdt/fdt_common.h>
+#endif
 
 #include "opt_smp.h"
 
@@ -131,8 +135,8 @@ cpu_mp_start(void)
 
 #if defined(CPU_MV_PJ4B)
 	/* Add ARMADAXP registers required for snoop filter initialization */
-	((int *)(temp_pagetable_va))[0xf1000000 >> L1_S_SHIFT] =
-	    L1_TYPE_S|L1_SHARED|L1_S_B|L1_S_AP(AP_KRW)|0xd0000000;
+	((int *)(temp_pagetable_va))[MV_BASE >> L1_S_SHIFT] =
+	    L1_TYPE_S|L1_SHARED|L1_S_B|L1_S_AP(AP_KRW)|fdt_immr_pa;
 #endif
 
 	temp_pagetable = (void*)(vtophys(temp_pagetable_va));
diff --git a/sys/arm/arm/mpcore_timer.c b/sys/arm/arm/mpcore_timer.c
index 42ba289265f..e2f6fbd4e82 100644
--- a/sys/arm/arm/mpcore_timer.c
+++ b/sys/arm/arm/mpcore_timer.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/arm/nexus.c b/sys/arm/arm/nexus.c
index 93643d5cc9e..a5f9022e8a4 100644
--- a/sys/arm/arm/nexus.c
+++ b/sys/arm/arm/nexus.c
@@ -56,11 +56,16 @@ __FBSDID("$FreeBSD$");
 #include <machine/pcb.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 
 #include <machine/resource.h>
 #include <machine/intr.h>
 
+#include "opt_platform.h"
+
+#ifdef FDT
+#include <dev/ofw/ofw_nexus.h>
+#include <machine/fdt.h>
+#else
 static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device");
 
 struct nexus_device {
@@ -77,13 +82,18 @@ static	int nexus_print_child(device_t, device_t);
 static	device_t nexus_add_child(device_t, u_int, const char *, int);
 static	struct resource *nexus_alloc_resource(device_t, device_t, int, int *,
     u_long, u_long, u_long, u_int);
+#endif
 static	int nexus_activate_resource(device_t, device_t, int, int,
     struct resource *);
+static	int nexus_deactivate_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);
 static int nexus_teardown_intr(device_t, device_t, struct resource *, void *);
 
 static device_method_t nexus_methods[] = {
+#ifndef FDT
 	/* Device interface */
 	DEVMETHOD(device_probe,		nexus_probe),
 	DEVMETHOD(device_attach,	nexus_attach),
@@ -91,19 +101,28 @@ static device_method_t nexus_methods[] = {
 	DEVMETHOD(bus_print_child,	nexus_print_child),
 	DEVMETHOD(bus_add_child,	nexus_add_child),
 	DEVMETHOD(bus_alloc_resource,	nexus_alloc_resource),
+#endif
 	DEVMETHOD(bus_activate_resource,	nexus_activate_resource),
+	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
 	DEVMETHOD(bus_setup_intr,	nexus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	nexus_teardown_intr),
 	{ 0, 0 }
 };
 
+static devclass_t nexus_devclass;
+#ifndef FDT
 static driver_t nexus_driver = {
 	"nexus",
 	nexus_methods,
 	1			/* no softc */
 };
-static devclass_t nexus_devclass;
+#else
+DEFINE_CLASS_1(nexus, nexus_driver, nexus_methods,
+    sizeof(struct ofw_nexus_softc), ofw_nexus_driver);
+#endif
+DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
 
+#ifndef FDT
 static int
 nexus_probe(device_t dev)
 {
@@ -113,30 +132,6 @@ nexus_probe(device_t dev)
 	return (BUS_PROBE_DEFAULT);
 }
 
-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)
-{
-	int irq;
-
-	if ((rman_get_flags(res) & RF_SHAREABLE) == 0)
-		flags |= INTR_EXCL;
-
-	for (irq = rman_get_start(res); irq <= rman_get_end(res); irq++) {
-		arm_setup_irqhandler(device_get_nameunit(child),
-		    filt, intr, arg, irq, flags, cookiep);
-		arm_unmask_irq(irq);
-	}
-	return (0);
-}
-
-static int
-nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
-{
-
-	return (arm_remove_irqhandler(rman_get_start(r), ih));
-}
-
 static int
 nexus_attach(device_t dev)
 {
@@ -157,7 +152,6 @@ nexus_attach(device_t dev)
 	return (0);
 }
 
-
 static int
 nexus_print_child(device_t bus, device_t child)
 {
@@ -194,7 +188,6 @@ nexus_add_child(device_t bus, u_int order, const char *name, int unit)
  * child of one of our descendants, not a direct child of nexus0.
  * (Exceptions include footbridge.)
  */
-#define ARM_BUS_SPACE_MEM 1
 static struct resource *
 nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
@@ -205,6 +198,7 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 
 	switch (type) {
 	case SYS_RES_MEMORY:
+	case SYS_RES_IOPORT:
 		rm = &mem_rman;
 		break;
 
@@ -217,7 +211,6 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 		return (0);
 
 	rman_set_rid(rv, *rid);
-	rman_set_bustag(rv, (void*)ARM_BUS_SPACE_MEM);
 	rman_set_bushandle(rv, rman_get_start(rv));
 
 	if (needactivate) {
@@ -229,6 +222,31 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 
 	return (rv);
 }
+#endif
+
+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)
+{
+	int irq;
+
+	if ((rman_get_flags(res) & RF_SHAREABLE) == 0)
+		flags |= INTR_EXCL;
+
+	for (irq = rman_get_start(res); irq <= rman_get_end(res); irq++) {
+		arm_setup_irqhandler(device_get_nameunit(child),
+		    filt, intr, arg, irq, flags, cookiep);
+		arm_unmask_irq(irq);
+	}
+	return (0);
+}
+
+static int
+nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
+{
+
+	return (arm_remove_irqhandler(rman_get_start(r), ih));
+}
 
 
 static int
@@ -238,7 +256,7 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid,
 	/*
 	 * If this is a memory resource, map it into the kernel.
 	 */
-	if (rman_get_bustag(r) == (void*)ARM_BUS_SPACE_MEM) {
+	if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
 		caddr_t vaddr = 0;
 		u_int32_t paddr;
 		u_int32_t psize;
@@ -249,9 +267,21 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid,
 		poffs = paddr - trunc_page(paddr);
 		vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs;
 		rman_set_virtual(r, vaddr);
+#ifdef FDT
+		rman_set_bustag(r, fdtbus_bs_tag);
+#else
+		rman_set_bustag(r, (void *)1);
+#endif
 		rman_set_bushandle(r, (bus_space_handle_t) vaddr);
 	}
 	return (rman_activate_resource(r));
 }
 
-DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
+static int
+nexus_deactivate_resource(device_t bus, device_t child, int type, int rid,
+    struct resource *res)
+{
+
+	return (rman_deactivate_resource(res));
+}
+
diff --git a/sys/arm/arm/pl190.c b/sys/arm/arm/pl190.c
index 3e3807385fe..3e0671c9758 100644
--- a/sys/arm/arm/pl190.c
+++ b/sys/arm/arm/pl190.c
@@ -113,7 +113,7 @@ pl190_intc_attach(device_t dev)
 	/* Disable all interrupts */
 	intc_vic_write_4(VICINTENCLEAR, 0xffffffff);
 	/* Enable INT31, SIC IRQ */
-	intc_vic_write_4(VICINTENABLE, (1 << 31));
+	intc_vic_write_4(VICINTENABLE, (1U << 31));
 
 	id = 0;
 	for (i = 3; i >= 0; i--) {
diff --git a/sys/arm/arm/pl310.c b/sys/arm/arm/pl310.c
index 758b5e5f61d..11ea5c7f214 100644
--- a/sys/arm/arm/pl310.c
+++ b/sys/arm/arm/pl310.c
@@ -341,8 +341,13 @@ pl310_attach(device_t dev)
 	ctrl_value = pl310_read4(sc, PL310_CTRL);
 
 	if (sc->sc_enabled && !(ctrl_value & CTRL_ENABLED)) {
+		/* invalidate current content */
+		pl310_write4(pl310_softc, PL310_INV_WAY, 0xffff);
+		pl310_wait_background_op(PL310_INV_WAY, 0xffff);
+
 		/* Enable the L2 cache if disabled */
 		platform_pl310_write_ctrl(sc, CTRL_ENABLED);
+		device_printf(dev, "L2 Cache enabled\n");
 	} 
 
 	if (!sc->sc_enabled && (ctrl_value & CTRL_ENABLED)) {
@@ -375,6 +380,7 @@ pl310_attach(device_t dev)
 		    EVENT_COUNTER_CTRL_C0_RESET | 
 		    EVENT_COUNTER_CTRL_C1_RESET);
 
+		device_printf(dev, "L2 Cache disabled\n");
 	}
 
 	if (sc->sc_enabled)
diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c
index 14ba2e0076b..b9b26ab6256 100644
--- a/sys/arm/arm/pmap-v6.c
+++ b/sys/arm/arm/pmap-v6.c
@@ -137,7 +137,9 @@
 /*
  * Special compilation symbols
  * PMAP_DEBUG           - Build in pmap_debug_level code
- */
+ *
+ * Note that pmap_mapdev() and pmap_unmapdev() are implemented in arm/devmap.c
+*/
 /* Include header files */
 
 #include "opt_vm.h"
@@ -1517,10 +1519,10 @@ pmap_fault_fixup(pmap_t pmap, vm_offset_t va, vm_prot_t ftype, int user)
 		vm_page_dirty(m);
 
 		/* Re-enable write permissions for the page */
-		pmap_set_prot(ptep, VM_PROT_WRITE, *ptep & L2_S_PROT_U);
-		CTR1(KTR_PMAP, "pmap_fault_fix: new pte:0x%x", pte);
+		*ptep = (pte & ~L2_APX);
 		PTE_SYNC(ptep);
 		rv = 1;
+		CTR1(KTR_PMAP, "pmap_fault_fix: new pte:0x%x", *ptep);
 	} else if (!L2_S_REFERENCED(pte)) {
 		/*
 		 * This looks like a good candidate for "page referenced"
@@ -1543,6 +1545,7 @@ pmap_fault_fixup(pmap_t pmap, vm_offset_t va, vm_prot_t ftype, int user)
 		*ptep = pte | L2_S_REF;
 		PTE_SYNC(ptep);
 		rv = 1;
+		CTR1(KTR_PMAP, "pmap_fault_fix: new pte:0x%x", *ptep);
 	}
 
 	/*
@@ -1951,7 +1954,6 @@ pmap_bootstrap(vm_offset_t firstaddr, struct pv_addr *l1pt)
 	virtual_avail = round_page(virtual_avail);
 	virtual_end = vm_max_kernel_address;
 	kernel_vm_end = pmap_curmaxkvaddr;
-	arm_nocache_startaddr = vm_max_kernel_address;
 	mtx_init(&cmtx, "TMP mappings mtx", NULL, MTX_DEF);
 
 	pmap_set_pcb_pagedir(kernel_pmap, thread0.td_pcb);
@@ -2424,6 +2426,17 @@ pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa)
 	pmap_kenter_internal(va, pa, 0);
 }
 
+void
+pmap_kenter_device(vm_offset_t va, vm_paddr_t pa)
+{
+
+	/*
+	 * XXX - Need a way for kenter_internal to handle PTE_DEVICE mapping as
+	 * a potentially different thing than PTE_NOCACHE.
+	 */
+	pmap_kenter_internal(va, pa, 0);
+}
+
 void
 pmap_kenter_user(vm_offset_t va, vm_paddr_t pa)
 {
@@ -2441,6 +2454,8 @@ vm_paddr_t
 pmap_kextract(vm_offset_t va)
 {
 
+	if (kernel_vm_end == 0)
+		return (0);
 	return (pmap_extract_locked(kernel_pmap, va));
 }
 
@@ -3064,36 +3079,38 @@ validate:
 	 * then continue setting mapping parameters
 	 */
 	if (m != NULL) {
-		if (prot & (VM_PROT_ALL)) {
-			if ((m->oflags & VPO_UNMANAGED) == 0)
+		if ((m->oflags & VPO_UNMANAGED) == 0) {
+			if (prot & (VM_PROT_ALL)) {
 				vm_page_aflag_set(m, PGA_REFERENCED);
-		} else {
-			/*
-			 * Need to do page referenced emulation.
-			 */
-			npte &= ~L2_S_REF;
+			} else {
+				/*
+				 * Need to do page referenced emulation.
+				 */
+				npte &= ~L2_S_REF;
+			}
 		}
 
 		if (prot & VM_PROT_WRITE) {
-			/*
-			 * Enable write permission if the access type
-			 * indicates write intention. Emulate modified
-			 * bit otherwise.
-			 */
-			if ((access & VM_PROT_WRITE) != 0)
-				npte &= ~(L2_APX);
-
 			if ((m->oflags & VPO_UNMANAGED) == 0) {
 				vm_page_aflag_set(m, PGA_WRITEABLE);
 				/*
-				 * The access type and permissions indicate 
-				 * that the page will be written as soon as
-				 * returned from fault service.
-				 * Mark it dirty from the outset.
+				 * Enable write permission if the access type
+				 * indicates write intention. Emulate modified
+				 * bit otherwise.
 				 */
-				if ((access & VM_PROT_WRITE) != 0)
+				if ((access & VM_PROT_WRITE) != 0) {
+					npte &= ~(L2_APX);
+					/*
+					 * The access type and permissions
+					 * indicate that the page will be
+					 * written as soon as returned from
+					 * fault service.
+					 * Mark it dirty from the outset.
+					 */
 					vm_page_dirty(m);
-			}
+				}
+			} else
+				npte &= ~(L2_APX);
 		}
 		if (!(prot & VM_PROT_EXECUTE))
 			npte |= L2_XN;
@@ -3310,7 +3327,7 @@ pmap_extract_locked(pmap_t pmap, vm_offset_t va)
 	vm_paddr_t pa;
 	u_int l1idx;
 
-	if (pmap != kernel_pmap)
+	if (kernel_vm_end != 0 && pmap != kernel_pmap)
 		PMAP_ASSERT_LOCKED(pmap);
 	l1idx = L1_IDX(va);
 	l1pd = pmap->pm_l1->l1_kva[l1idx];
@@ -5007,36 +5024,20 @@ void
 pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
     vm_offset_t *addr, vm_size_t size)
 {
-}
+	vm_offset_t superpage_offset;
 
-
-/*
- * Map a set of physical memory pages into the kernel virtual
- * address space. Return a pointer to where it is mapped. This
- * routine is intended to be used for mapping device memory,
- * NOT real memory.
- */
-void *
-pmap_mapdev(vm_offset_t pa, vm_size_t size)
-{
-	vm_offset_t va, tmpva, offset;
-
-	offset = pa & PAGE_MASK;
-	size = roundup(size, PAGE_SIZE);
-
-	GIANT_REQUIRED;
-
-	va = kva_alloc(size);
-	if (!va)
-		panic("pmap_mapdev: Couldn't alloc kernel virtual memory");
-	for (tmpva = va; size > 0;) {
-		pmap_kenter_internal(tmpva, pa, 0);
-		size -= PAGE_SIZE;
-		tmpva += PAGE_SIZE;
-		pa += PAGE_SIZE;
-	}
-
-	return ((void *)(va + offset));
+	if (size < NBPDR)
+		return;
+	if (object != NULL && (object->flags & OBJ_COLORED) != 0)
+		offset += ptoa(object->pg_color);
+	superpage_offset = offset & PDRMASK;
+	if (size - ((NBPDR - superpage_offset) & PDRMASK) < NBPDR ||
+	    (*addr & PDRMASK) == superpage_offset)
+		return;
+	if ((*addr & PDRMASK) < superpage_offset)
+		*addr = (*addr & ~PDRMASK) + superpage_offset;
+	else
+		*addr = ((*addr + PDRMASK) & ~PDRMASK) + superpage_offset;
 }
 
 /*
@@ -5221,86 +5222,6 @@ pmap_map_chunk(vm_offset_t l1pt, vm_offset_t va, vm_offset_t pa,
 
 }
 
-/********************** Static device map routines ***************************/
-
-static const struct pmap_devmap *pmap_devmap_table;
-
-/*
- * Register the devmap table.  This is provided in case early console
- * initialization needs to register mappings created by bootstrap code
- * before pmap_devmap_bootstrap() is called.
- */
-void
-pmap_devmap_register(const struct pmap_devmap *table)
-{
-
-	pmap_devmap_table = table;
-}
-
-/*
- * Map all of the static regions in the devmap table, and remember
- * the devmap table so other parts of the kernel can look up entries
- * later.
- */
-void
-pmap_devmap_bootstrap(vm_offset_t l1pt, const struct pmap_devmap *table)
-{
-	int i;
-
-	pmap_devmap_table = table;
-
-	for (i = 0; pmap_devmap_table[i].pd_size != 0; i++) {
-#ifdef VERBOSE_INIT_ARM
-		printf("devmap: %08x -> %08x @ %08x\n",
-		    pmap_devmap_table[i].pd_pa,
-		    pmap_devmap_table[i].pd_pa +
-			pmap_devmap_table[i].pd_size - 1,
-		    pmap_devmap_table[i].pd_va);
-#endif
-		pmap_map_chunk(l1pt, pmap_devmap_table[i].pd_va,
-		    pmap_devmap_table[i].pd_pa,
-		    pmap_devmap_table[i].pd_size,
-		    pmap_devmap_table[i].pd_prot,
-		    pmap_devmap_table[i].pd_cache);
-	}
-}
-
-const struct pmap_devmap *
-pmap_devmap_find_pa(vm_paddr_t pa, vm_size_t size)
-{
-	int i;
-
-	if (pmap_devmap_table == NULL)
-		return (NULL);
-
-	for (i = 0; pmap_devmap_table[i].pd_size != 0; i++) {
-		if (pa >= pmap_devmap_table[i].pd_pa &&
-		    pa + size <= pmap_devmap_table[i].pd_pa +
-				 pmap_devmap_table[i].pd_size)
-			return (&pmap_devmap_table[i]);
-	}
-
-	return (NULL);
-}
-
-const struct pmap_devmap *
-pmap_devmap_find_va(vm_offset_t va, vm_size_t size)
-{
-	int i;
-
-	if (pmap_devmap_table == NULL)
-		return (NULL);
-
-	for (i = 0; pmap_devmap_table[i].pd_size != 0; i++) {
-		if (va >= pmap_devmap_table[i].pd_va &&
-		    va + size <= pmap_devmap_table[i].pd_va +
-				 pmap_devmap_table[i].pd_size)
-			return (&pmap_devmap_table[i]);
-	}
-
-	return (NULL);
-}
-
 int
 pmap_dmap_iscurrent(pmap_t pmap)
 {
diff --git a/sys/arm/arm/pmap.c b/sys/arm/arm/pmap.c
index c72effd6c6f..c4a4aac8825 100644
--- a/sys/arm/arm/pmap.c
+++ b/sys/arm/arm/pmap.c
@@ -134,6 +134,8 @@
 /*
  * Special compilation symbols
  * PMAP_DEBUG           - Build in pmap_debug_level code
+ *
+ * Note that pmap_mapdev() and pmap_unmapdev() are implemented in arm/devmap.c
  */
 /* Include header files */
 
@@ -2391,9 +2393,6 @@ pmap_bootstrap(vm_offset_t firstaddr, struct pv_addr *l1pt)
 	 * Reserve some special page table entries/VA space for temporary
 	 * mapping of pages.
 	 */
-#define SYSMAP(c, p, v, n)						\
-    v = (c)va; va += ((n)*PAGE_SIZE); p = pte; pte += (n);
-
 	pmap_alloc_specials(&virtual_avail, 1, &csrcp, &csrc_pte);
 	pmap_set_pt_cache_mode(kernel_l1pt, (vm_offset_t)csrc_pte);
 	pmap_alloc_specials(&virtual_avail, 1, &cdstp, &cdst_pte);
@@ -2423,7 +2422,6 @@ pmap_bootstrap(vm_offset_t firstaddr, struct pv_addr *l1pt)
 	virtual_avail = round_page(virtual_avail);
 	virtual_end = vm_max_kernel_address;
 	kernel_vm_end = pmap_curmaxkvaddr;
-	arm_nocache_startaddr = vm_max_kernel_address;
 	mtx_init(&cmtx, "TMP mappings mtx", NULL, MTX_DEF);
 
 #ifdef ARM_USE_SMALL_ALLOC
@@ -2842,6 +2840,17 @@ pmap_kenter_nocache(vm_offset_t va, vm_paddr_t pa)
 	pmap_kenter_internal(va, pa, 0);
 }
 
+void
+pmap_kenter_device(vm_offset_t va, vm_paddr_t pa)
+{
+
+	/*
+	 * XXX - Need a way for kenter_internal to handle PTE_DEVICE mapping as
+	 * a potentially different thing than PTE_NOCACHE.
+	 */
+	pmap_kenter_internal(va, pa, 0);
+}
+
 void
 pmap_kenter_user(vm_offset_t va, vm_paddr_t pa)
 {
@@ -4691,36 +4700,6 @@ pmap_align_superpage(vm_object_t object, vm_ooffset_t offset,
 {
 }
 
-
-/*
- * Map a set of physical memory pages into the kernel virtual
- * address space. Return a pointer to where it is mapped. This
- * routine is intended to be used for mapping device memory,
- * NOT real memory.
- */
-void *
-pmap_mapdev(vm_offset_t pa, vm_size_t size)
-{
-	vm_offset_t va, tmpva, offset;
-	
-	offset = pa & PAGE_MASK;
-	size = roundup(size, PAGE_SIZE);
-	
-	GIANT_REQUIRED;
-	
-	va = kva_alloc(size);
-	if (!va)
-		panic("pmap_mapdev: Couldn't alloc kernel virtual memory");
-	for (tmpva = va; size > 0;) {
-		pmap_kenter_internal(tmpva, pa, 0);
-		size -= PAGE_SIZE;
-		tmpva += PAGE_SIZE;
-		pa += PAGE_SIZE;
-	}
-	
-	return ((void *)(va + offset));
-}
-
 #define BOOTSTRAP_DEBUG
 
 /*
@@ -4941,86 +4920,6 @@ pmap_map_chunk(vm_offset_t l1pt, vm_offset_t va, vm_offset_t pa,
 
 }
 
-/********************** Static device map routines ***************************/
-
-static const struct pmap_devmap *pmap_devmap_table;
-
-/*
- * Register the devmap table.  This is provided in case early console
- * initialization needs to register mappings created by bootstrap code
- * before pmap_devmap_bootstrap() is called.
- */
-void
-pmap_devmap_register(const struct pmap_devmap *table)
-{
-
-	pmap_devmap_table = table;
-}
-
-/*
- * Map all of the static regions in the devmap table, and remember
- * the devmap table so other parts of the kernel can look up entries
- * later.
- */
-void
-pmap_devmap_bootstrap(vm_offset_t l1pt, const struct pmap_devmap *table)
-{
-	int i;
-
-	pmap_devmap_table = table;
-
-	for (i = 0; pmap_devmap_table[i].pd_size != 0; i++) {
-#ifdef VERBOSE_INIT_ARM
-		printf("devmap: %08x -> %08x @ %08x\n",
-		    pmap_devmap_table[i].pd_pa,
-		    pmap_devmap_table[i].pd_pa +
-			pmap_devmap_table[i].pd_size - 1,
-		    pmap_devmap_table[i].pd_va);
-#endif
-		pmap_map_chunk(l1pt, pmap_devmap_table[i].pd_va,
-		    pmap_devmap_table[i].pd_pa,
-		    pmap_devmap_table[i].pd_size,
-		    pmap_devmap_table[i].pd_prot,
-		    pmap_devmap_table[i].pd_cache);
-	}
-}
-
-const struct pmap_devmap *
-pmap_devmap_find_pa(vm_paddr_t pa, vm_size_t size)
-{
-	int i;
-
-	if (pmap_devmap_table == NULL)
-		return (NULL);
-
-	for (i = 0; pmap_devmap_table[i].pd_size != 0; i++) {
-		if (pa >= pmap_devmap_table[i].pd_pa &&
-		    pa + size <= pmap_devmap_table[i].pd_pa +
-				 pmap_devmap_table[i].pd_size)
-			return (&pmap_devmap_table[i]);
-	}
-
-	return (NULL);
-}
-
-const struct pmap_devmap *
-pmap_devmap_find_va(vm_offset_t va, vm_size_t size)
-{
-	int i;
-
-	if (pmap_devmap_table == NULL)
-		return (NULL);
-
-	for (i = 0; pmap_devmap_table[i].pd_size != 0; i++) {
-		if (va >= pmap_devmap_table[i].pd_va &&
-		    va + size <= pmap_devmap_table[i].pd_va +
-				 pmap_devmap_table[i].pd_size)
-			return (&pmap_devmap_table[i]);
-	}
-
-	return (NULL);
-}
-
 void
 pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma)
 {
diff --git a/sys/arm/arm/stack_machdep.c b/sys/arm/arm/stack_machdep.c
index 36a776a5b0c..f1708f5bf58 100644
--- a/sys/arm/arm/stack_machdep.c
+++ b/sys/arm/arm/stack_machdep.c
@@ -43,13 +43,16 @@ __FBSDID("$FreeBSD$");
  * APCS where it lays out the stack incorrectly. Because of this we disable
  * this when building for ARM EABI or when building with clang.
  */
+
+extern vm_offset_t kernel_vm_end;
+
 static void
 stack_capture(struct stack *st, u_int32_t *frame)
 {
 #if !defined(__ARM_EABI__) && !defined(__clang__)
 	vm_offset_t callpc;
 
-	while (INKERNEL(frame)) {
+	while (INKERNEL(frame) && (vm_offset_t)frame < kernel_vm_end) {
 		callpc = frame[FR_SCP];
 		if (stack_put(st, callpc) == -1)
 			break;
diff --git a/sys/arm/arm/trap.c b/sys/arm/arm/trap.c
index 761169cac14..5021eec928e 100644
--- a/sys/arm/arm/trap.c
+++ b/sys/arm/arm/trap.c
@@ -123,8 +123,8 @@ __FBSDID("$FreeBSD$");
 #endif
 
 
-void swi_handler(trapframe_t *);
-void undefinedinstruction(trapframe_t *);
+void swi_handler(struct trapframe *);
+void undefinedinstruction(struct trapframe *);
 
 #include <machine/disassem.h>
 #include <machine/machdep.h>
@@ -145,13 +145,17 @@ struct ksig {
 	u_long code;
 };
 struct data_abort {
-	int (*func)(trapframe_t *, u_int, u_int, struct thread *, struct ksig *);
+	int (*func)(struct trapframe *, u_int, u_int, struct thread *, 
+	    struct ksig *);
 	const char *desc;
 };
 
-static int dab_fatal(trapframe_t *, u_int, u_int, struct thread *, struct ksig *);
-static int dab_align(trapframe_t *, u_int, u_int, struct thread *, struct ksig *);
-static int dab_buserr(trapframe_t *, u_int, u_int, struct thread *, struct ksig *);
+static int dab_fatal(struct trapframe *, u_int, u_int, struct thread *,
+    struct ksig *);
+static int dab_align(struct trapframe *, u_int, u_int, struct thread *,
+    struct ksig *);
+static int dab_buserr(struct trapframe *, u_int, u_int, struct thread *,
+    struct ksig *);
 
 static const struct data_abort data_aborts[] = {
 	{dab_fatal,	"Vector Exception"},
@@ -196,7 +200,8 @@ call_trapsignal(struct thread *td, int sig, u_long code)
 }
 
 static __inline int
-data_abort_fixup(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig *ksig)
+data_abort_fixup(struct trapframe *tf, u_int fsr, u_int far, struct thread *td,
+    struct ksig *ksig)
 {
 #ifdef CPU_ABORT_FIXUP_REQUIRED
 	int error;
@@ -226,7 +231,7 @@ data_abort_fixup(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struc
 }
 
 void
-data_abort_handler(trapframe_t *tf)
+data_abort_handler(struct trapframe *tf)
 {
 	struct vm_map *map;
 	struct pcb *pcb;
@@ -482,7 +487,8 @@ out:
  * Note: If 'l' is NULL, we assume we're dealing with a prefetch abort.
  */
 static int
-dab_fatal(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig *ksig)
+dab_fatal(struct trapframe *tf, u_int fsr, u_int far, struct thread *td,
+    struct ksig *ksig)
 {
 	const char *mode;
 
@@ -522,7 +528,8 @@ dab_fatal(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig
 
 #ifdef KDB
 	if (debugger_on_panic || kdb_active)
-		kdb_trap(fsr, 0, tf);
+		if (kdb_trap(fsr, 0, tf))
+			return (0);
 #endif
 	panic("Fatal abort");
 	/*NOTREACHED*/
@@ -538,7 +545,8 @@ dab_fatal(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig
  * deliver a bus error to the process.
  */
 static int
-dab_align(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig *ksig)
+dab_align(struct trapframe *tf, u_int fsr, u_int far, struct thread *td,
+    struct ksig *ksig)
 {
 
 	/* Alignment faults are always fatal if they occur in kernel mode */
@@ -586,7 +594,8 @@ dab_align(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig
  * In all other cases, these data aborts are considered fatal.
  */
 static int
-dab_buserr(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig *ksig)
+dab_buserr(struct trapframe *tf, u_int fsr, u_int far, struct thread *td,
+    struct ksig *ksig)
 {
 	struct pcb *pcb = td->td_pcb;
 
@@ -607,7 +616,7 @@ dab_buserr(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig
 		 * If the current trapframe is at the top of the kernel stack,
 		 * the fault _must_ have come from user mode.
 		 */
-		if (tf != ((trapframe_t *)pcb->un_32.pcb32_sp) - 1) {
+		if (tf != ((struct trapframe *)pcb->un_32.pcb32_sp) - 1) {
 			/*
 			 * Kernel mode. We're either about to die a
 			 * spectacular death, or pcb_onfault will come
@@ -660,7 +669,7 @@ dab_buserr(trapframe_t *tf, u_int fsr, u_int far, struct thread *td, struct ksig
 }
 
 static __inline int
-prefetch_abort_fixup(trapframe_t *tf, struct ksig *ksig)
+prefetch_abort_fixup(struct trapframe *tf, struct ksig *ksig)
 {
 #ifdef CPU_ABORT_FIXUP_REQUIRED
 	int error;
@@ -691,7 +700,7 @@ prefetch_abort_fixup(trapframe_t *tf, struct ksig *ksig)
 }
 
 /*
- * void prefetch_abort_handler(trapframe_t *tf)
+ * void prefetch_abort_handler(struct trapframe *tf)
  *
  * Abort handler called when instruction execution occurs at
  * a non existent or restricted (access permissions) memory page.
@@ -702,7 +711,7 @@ prefetch_abort_fixup(trapframe_t *tf, struct ksig *ksig)
  * Otherwise fault the page in and try again.
  */
 void
-prefetch_abort_handler(trapframe_t *tf)
+prefetch_abort_handler(struct trapframe *tf)
 {
 	struct thread *td;
 	struct proc * p;
@@ -907,7 +916,7 @@ cpu_fetch_syscall_args(struct thread *td, struct syscall_args *sa)
 #include "../../kern/subr_syscall.c"
 
 static void
-syscall(struct thread *td, trapframe_t *frame)
+syscall(struct thread *td, struct trapframe *frame)
 {
 	struct syscall_args sa;
 	int error;
@@ -932,7 +941,7 @@ syscall(struct thread *td, trapframe_t *frame)
 }
 
 void
-swi_handler(trapframe_t *frame)
+swi_handler(struct trapframe *frame)
 {
 	struct thread *td = curthread;
 
diff --git a/sys/arm/arm/undefined.c b/sys/arm/arm/undefined.c
index 476dd601a8b..7829ecea5f6 100644
--- a/sys/arm/arm/undefined.c
+++ b/sys/arm/arm/undefined.c
@@ -166,7 +166,7 @@ undefined_init()
 
 
 void
-undefinedinstruction(trapframe_t *frame)
+undefinedinstruction(struct trapframe *frame)
 {
 	struct thread *td;
 	u_int fault_pc;
diff --git a/sys/arm/arm/vfp.c b/sys/arm/arm/vfp.c
index 8e8dbadb09d..b78371a0e45 100644
--- a/sys/arm/arm/vfp.c
+++ b/sys/arm/arm/vfp.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/kernel.h>
 
+#include <machine/frame.h>
 #include <machine/fp.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index d7c25161155..58cb1945ecf 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysent.h>
 #include <sys/unistd.h>
 #include <machine/cpu.h>
+#include <machine/frame.h>
 #include <machine/pcb.h>
 #include <machine/sysarch.h>
 #include <sys/lock.h>
@@ -294,7 +295,7 @@ done:
 void
 cpu_set_syscall_retval(struct thread *td, int error)
 {
-	trapframe_t *frame;
+	struct trapframe *frame;
 	int fixup;
 #ifdef __ARMEB__
 	uint32_t insn;
@@ -481,80 +482,6 @@ cpu_exit(struct thread *td)
 {
 }
 
-#define BITS_PER_INT	(8 * sizeof(int))
-vm_offset_t arm_nocache_startaddr;
-static int arm_nocache_allocated[ARM_NOCACHE_KVA_SIZE / (PAGE_SIZE *
-    BITS_PER_INT)];
-
-/*
- * Functions to map and unmap memory non-cached into KVA the kernel won't try
- * to allocate. The goal is to provide uncached memory to busdma, to honor
- * BUS_DMA_COHERENT.
- * We can allocate at most ARM_NOCACHE_KVA_SIZE bytes.
- * The allocator is rather dummy, each page is represented by a bit in
- * a bitfield, 0 meaning the page is not allocated, 1 meaning it is.
- * As soon as it finds enough contiguous pages to satisfy the request,
- * it returns the address.
- */
-void *
-arm_remap_nocache(void *addr, vm_size_t size)
-{
-	int i, j;
-
-	size = round_page(size);
-	for (i = 0; i < ARM_NOCACHE_KVA_SIZE / PAGE_SIZE; i++) {
-		if (!(arm_nocache_allocated[i / BITS_PER_INT] & (1 << (i %
-		    BITS_PER_INT)))) {
-			for (j = i; j < i + (size / (PAGE_SIZE)); j++)
-				if (arm_nocache_allocated[j / BITS_PER_INT] &
-				    (1 << (j % BITS_PER_INT)))
-					break;
-			if (j == i + (size / (PAGE_SIZE)))
-				break;
-		}
-	}
-	if (i < ARM_NOCACHE_KVA_SIZE / PAGE_SIZE) {
-		vm_offset_t tomap = arm_nocache_startaddr + i * PAGE_SIZE;
-		void *ret = (void *)tomap;
-		vm_paddr_t physaddr = vtophys((vm_offset_t)addr);
-		vm_offset_t vaddr = (vm_offset_t) addr;
-		
-		vaddr = vaddr & ~PAGE_MASK;
-		for (; tomap < (vm_offset_t)ret + size; tomap += PAGE_SIZE,
-		    vaddr += PAGE_SIZE, physaddr += PAGE_SIZE, i++) {
-			cpu_idcache_wbinv_range(vaddr, PAGE_SIZE);
-#ifdef ARM_L2_PIPT
-			cpu_l2cache_wbinv_range(physaddr, PAGE_SIZE);
-#else
-			cpu_l2cache_wbinv_range(vaddr, PAGE_SIZE);
-#endif
-			pmap_kenter_nocache(tomap, physaddr);
-			cpu_tlb_flushID_SE(vaddr);
-			arm_nocache_allocated[i / BITS_PER_INT] |= 1 << (i %
-			    BITS_PER_INT);
-		}
-		return (ret);
-	}
-
-	return (NULL);
-}
-
-void
-arm_unmap_nocache(void *addr, vm_size_t size)
-{
-	vm_offset_t raddr = (vm_offset_t)addr;
-	int i;
-
-	size = round_page(size);
-	i = (raddr - arm_nocache_startaddr) / (PAGE_SIZE);
-	for (; size > 0; size -= PAGE_SIZE, i++) {
-		arm_nocache_allocated[i / BITS_PER_INT] &= ~(1 << (i %
-		    BITS_PER_INT));
-		pmap_kremove(raddr);
-		raddr += PAGE_SIZE;
-	}
-}
-
 #ifdef ARM_USE_SMALL_ALLOC
 
 static TAILQ_HEAD(,arm_small_page) pages_normal =
diff --git a/sys/arm/at91/at91.c b/sys/arm/at91/at91.c
index a3f9556f5a0..583d1ab4a5b 100644
--- a/sys/arm/at91/at91.c
+++ b/sys/arm/at91/at91.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <machine/bus.h>
+#include <machine/devmap.h>
 #include <machine/intr.h>
 
 #include <arm/at91/at91var.h>
@@ -52,7 +53,7 @@ static struct at91_softc *at91_softc;
 
 static void at91_eoi(void *);
 
-extern const struct pmap_devmap at91_devmap[];
+extern const struct arm_devmap_entry at91_devmap[];
 
 uint32_t at91_master_clock;
 
@@ -231,8 +232,7 @@ at91_probe(device_t dev)
 {
 
 	device_set_desc(dev, "AT91 device bus");
-	arm_post_filter = at91_eoi;
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static void
@@ -258,9 +258,11 @@ static int
 at91_attach(device_t dev)
 {
 	struct at91_softc *sc = device_get_softc(dev);
-	const struct pmap_devmap *pdevmap;
+	const struct arm_devmap_entry *pdevmap;
 	int i;
 
+	arm_post_filter = at91_eoi;
+
 	at91_softc = sc;
 	sc->sc_st = &at91_bs_tag;
 	sc->sc_sh = AT91_BASE;
diff --git a/sys/arm/at91/at91_machdep.c b/sys/arm/at91/at91_machdep.c
index f4a931653f6..2eb00a1da2c 100644
--- a/sys/arm/at91/at91_machdep.c
+++ b/sys/arm/at91/at91_machdep.c
@@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <machine/devmap.h>
 #include <machine/vmparam.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
@@ -128,7 +129,7 @@ struct pv_addr abtstack;
 struct pv_addr kernelstack;
 
 /* Static device mappings. */
-const struct pmap_devmap at91_devmap[] = {
+const struct arm_devmap_entry at91_devmap[] = {
 	/*
 	 * Map the on-board devices VA == PA so that we can access them
 	 * with the MMU on or off.
@@ -566,7 +567,7 @@ initarm(struct arm_boot_params *abp)
 		    VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE);
 	}
 
-	pmap_devmap_bootstrap(l1pagetable, at91_devmap);
+	arm_devmap_bootstrap(l1pagetable, at91_devmap);
 	cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL * 2)) | DOMAIN_CLIENT);
 	setttb(kernel_l1pt.pv_pa);
 	cpu_tlb_flushID();
@@ -603,6 +604,7 @@ initarm(struct arm_boot_params *abp)
 	 * of the stack memory.
 	 */
 	cpu_control(CPU_CONTROL_MMU_ENABLE, CPU_CONTROL_MMU_ENABLE);
+	cpu_setup("");
 
 	set_stackptrs(0);
 
@@ -631,7 +633,8 @@ initarm(struct arm_boot_params *abp)
 
 	pmap_curmaxkvaddr = afterkern + L1_S_SIZE * (KERNEL_PT_KERN_NUM - 1);
 	arm_dump_avail_init(memsize, sizeof(dump_avail)/sizeof(dump_avail[0]));
-	vm_max_kernel_address = KERNVIRTADDR + 3 * memsize;
+	/* Always use the 256MB of KVA we have available between the kernel and devices */
+	vm_max_kernel_address = KERNVIRTADDR + (256 << 20);
 	pmap_bootstrap(freemempos, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
diff --git a/sys/arm/at91/at91_mci.c b/sys/arm/at91/at91_mci.c
index c4cf9b48413..0026c3bdf82 100644
--- a/sys/arm/at91/at91_mci.c
+++ b/sys/arm/at91/at91_mci.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <arm/at91/at91var.h>
diff --git a/sys/arm/at91/at91_pioreg.h b/sys/arm/at91/at91_pioreg.h
index 3d7a5cc48f4..7869d9d05a3 100644
--- a/sys/arm/at91/at91_pioreg.h
+++ b/sys/arm/at91/at91_pioreg.h
@@ -164,5 +164,69 @@
 #define AT91C_PIO_PC29       ((unsigned int) 1 << 29) // Pin Controlled by PC29
 #define AT91C_PIO_PC30       ((unsigned int) 1 << 30) // Pin Controlled by PC30
 #define AT91C_PIO_PC31       ((unsigned int) 1 << 31) // Pin Controlled by PC31
+#define AT91C_PIO_PD0        ((unsigned int) 1 <<  0) // Pin Controlled by PD0
+#define AT91C_PIO_PD1        ((unsigned int) 1 <<  1) // Pin Controlled by PD1
+#define AT91C_PIO_PD2        ((unsigned int) 1 <<  2) // Pin Controlled by PD2
+#define AT91C_PIO_PD3        ((unsigned int) 1 <<  3) // Pin Controlled by PD3
+#define AT91C_PIO_PD4        ((unsigned int) 1 <<  4) // Pin Controlled by PD4
+#define AT91C_PIO_PD5        ((unsigned int) 1 <<  5) // Pin Controlled by PD5
+#define AT91C_PIO_PD6        ((unsigned int) 1 <<  6) // Pin Controlled by PD6
+#define AT91C_PIO_PD7        ((unsigned int) 1 <<  7) // Pin Controlled by PD7
+#define AT91C_PIO_PD8        ((unsigned int) 1 <<  8) // Pin Controlled by PD8
+#define AT91C_PIO_PD9        ((unsigned int) 1 <<  9) // Pin Controlled by PD9
+#define AT91C_PIO_PD10       ((unsigned int) 1 << 10) // Pin Controlled by PD10
+#define AT91C_PIO_PD11       ((unsigned int) 1 << 11) // Pin Controlled by PD11
+#define AT91C_PIO_PD12       ((unsigned int) 1 << 12) // Pin Controlled by PD12
+#define AT91C_PIO_PD13       ((unsigned int) 1 << 13) // Pin Controlled by PD13
+#define AT91C_PIO_PD14       ((unsigned int) 1 << 14) // Pin Controlled by PD14
+#define AT91C_PIO_PD15       ((unsigned int) 1 << 15) // Pin Controlled by PD15
+#define AT91C_PIO_PD16       ((unsigned int) 1 << 16) // Pin Controlled by PD16
+#define AT91C_PIO_PD17       ((unsigned int) 1 << 17) // Pin Controlled by PD17
+#define AT91C_PIO_PD18       ((unsigned int) 1 << 18) // Pin Controlled by PD18
+#define AT91C_PIO_PD19       ((unsigned int) 1 << 19) // Pin Controlled by PD19
+#define AT91C_PIO_PD20       ((unsigned int) 1 << 20) // Pin Controlled by PD20
+#define AT91C_PIO_PD21       ((unsigned int) 1 << 21) // Pin Controlled by PD21
+#define AT91C_PIO_PD22       ((unsigned int) 1 << 22) // Pin Controlled by PD22
+#define AT91C_PIO_PD23       ((unsigned int) 1 << 23) // Pin Controlled by PD23
+#define AT91C_PIO_PD24       ((unsigned int) 1 << 24) // Pin Controlled by PD24
+#define AT91C_PIO_PD25       ((unsigned int) 1 << 25) // Pin Controlled by PD25
+#define AT91C_PIO_PD26       ((unsigned int) 1 << 26) // Pin Controlled by PD26
+#define AT91C_PIO_PD27       ((unsigned int) 1 << 27) // Pin Controlled by PD27
+#define AT91C_PIO_PD28       ((unsigned int) 1 << 28) // Pin Controlled by PD28
+#define AT91C_PIO_PD29       ((unsigned int) 1 << 29) // Pin Controlled by PD29
+#define AT91C_PIO_PD30       ((unsigned int) 1 << 30) // Pin Controlled by PD30
+#define AT91C_PIO_PD31       ((unsigned int) 1 << 31) // Pin Controlled by PD31
+#define AT91C_PIO_PE0        ((unsigned int) 1 <<  0) // Pin Controlled by PE0
+#define AT91C_PIO_PE1        ((unsigned int) 1 <<  1) // Pin Controlled by PE1
+#define AT91C_PIO_PE2        ((unsigned int) 1 <<  2) // Pin Controlled by PE2
+#define AT91C_PIO_PE3        ((unsigned int) 1 <<  3) // Pin Controlled by PE3
+#define AT91C_PIO_PE4        ((unsigned int) 1 <<  4) // Pin Controlled by PE4
+#define AT91C_PIO_PE5        ((unsigned int) 1 <<  5) // Pin Controlled by PE5
+#define AT91C_PIO_PE6        ((unsigned int) 1 <<  6) // Pin Controlled by PE6
+#define AT91C_PIO_PE7        ((unsigned int) 1 <<  7) // Pin Controlled by PE7
+#define AT91C_PIO_PE8        ((unsigned int) 1 <<  8) // Pin Controlled by PE8
+#define AT91C_PIO_PE9        ((unsigned int) 1 <<  9) // Pin Controlled by PE9
+#define AT91C_PIO_PE10       ((unsigned int) 1 << 10) // Pin Controlled by PE10
+#define AT91C_PIO_PE11       ((unsigned int) 1 << 11) // Pin Controlled by PE11
+#define AT91C_PIO_PE12       ((unsigned int) 1 << 12) // Pin Controlled by PE12
+#define AT91C_PIO_PE13       ((unsigned int) 1 << 13) // Pin Controlled by PE13
+#define AT91C_PIO_PE14       ((unsigned int) 1 << 14) // Pin Controlled by PE14
+#define AT91C_PIO_PE15       ((unsigned int) 1 << 15) // Pin Controlled by PE15
+#define AT91C_PIO_PE16       ((unsigned int) 1 << 16) // Pin Controlled by PE16
+#define AT91C_PIO_PE17       ((unsigned int) 1 << 17) // Pin Controlled by PE17
+#define AT91C_PIO_PE18       ((unsigned int) 1 << 18) // Pin Controlled by PE18
+#define AT91C_PIO_PE19       ((unsigned int) 1 << 19) // Pin Controlled by PE19
+#define AT91C_PIO_PE20       ((unsigned int) 1 << 20) // Pin Controlled by PE20
+#define AT91C_PIO_PE21       ((unsigned int) 1 << 21) // Pin Controlled by PE21
+#define AT91C_PIO_PE22       ((unsigned int) 1 << 22) // Pin Controlled by PE22
+#define AT91C_PIO_PE23       ((unsigned int) 1 << 23) // Pin Controlled by PE23
+#define AT91C_PIO_PE24       ((unsigned int) 1 << 24) // Pin Controlled by PE24
+#define AT91C_PIO_PE25       ((unsigned int) 1 << 25) // Pin Controlled by PE25
+#define AT91C_PIO_PE26       ((unsigned int) 1 << 26) // Pin Controlled by PE26
+#define AT91C_PIO_PE27       ((unsigned int) 1 << 27) // Pin Controlled by PE27
+#define AT91C_PIO_PE28       ((unsigned int) 1 << 28) // Pin Controlled by PE28
+#define AT91C_PIO_PE29       ((unsigned int) 1 << 29) // Pin Controlled by PE29
+#define AT91C_PIO_PE30       ((unsigned int) 1 << 30) // Pin Controlled by PE30
+#define AT91C_PIO_PE31       ((unsigned int) 1 << 31) // Pin Controlled by PE31
 
 #endif /* ARM_AT91_AT91_PIOREG_H */
diff --git a/sys/arm/at91/at91_pmc.c b/sys/arm/at91/at91_pmc.c
index e001b5c7cf5..d811d383378 100644
--- a/sys/arm/at91/at91_pmc.c
+++ b/sys/arm/at91/at91_pmc.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 #include <arm/at91/at91reg.h>
 #include <arm/at91/at91var.h>
diff --git a/sys/arm/at91/files.at91 b/sys/arm/at91/files.at91
index 0030e23a6a2..a83aa7a7b2c 100644
--- a/sys/arm/at91/files.at91
+++ b/sys/arm/at91/files.at91
@@ -5,7 +5,7 @@ arm/at91/at91_machdep.c		standard
 arm/at91/at91.c			standard
 arm/at91/at91_cfata.c		optional	at91_cfata
 arm/at91/at91_mci.c		optional	at91_mci
-arm/at91/at91_nand.c		optional	nand
+dev/nand/nfc_at91.c		optional	nand
 arm/at91/at91_pio.c		standard
 arm/at91/at91_pmc.c		standard
 arm/at91/at91_pit.c		optional	at91sam9
diff --git a/sys/arm/at91/if_ate.c b/sys/arm/at91/if_ate.c
index d7c10194a0c..ea3d791f464 100644
--- a/sys/arm/at91/if_ate.c
+++ b/sys/arm/at91/if_ate.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>
 #include <net/if_mib.h>
 #include <net/if_types.h>
+#include <net/if_var.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/arm/at91/if_macbvar.h b/sys/arm/at91/if_macbvar.h
index 9a187aed8b8..4469b03cc48 100644
--- a/sys/arm/at91/if_macbvar.h
+++ b/sys/arm/at91/if_macbvar.h
@@ -18,7 +18,7 @@
 struct eth_tx_desc {
 	uint32_t		addr;
 	uint32_t		flags;
-#define TD_OWN		(1 << 31)
+#define TD_OWN		(1U << 31)
 #define TD_LAST		(1 << 15)
 #define	TD_WRAP_MASK		(1 << 30)
 };
@@ -30,7 +30,7 @@ struct eth_rx_desc {
 #define	RD_OWN			0x00000001
 
 	uint32_t		flags;
-#define RD_BROADCAST		(1 << 31)
+#define RD_BROADCAST		(1U << 31)
 #define RD_MULTICAST		(1 << 30)
 #define RD_UNICAST		(1 << 29)
 #define RD_EXTERNAL		(1 << 28)
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bsc.c b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
new file mode 100644
index 00000000000..9ee97b7416c
--- /dev/null
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bsc.c
@@ -0,0 +1,490 @@
+/*-
+ * Copyright (c) 2001 Tsubai Masanari.
+ * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * Copyright (c) 2013 Luiz Otavio O Souza <loos@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/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/bus.h>
+#include <machine/resource.h>
+#include <machine/bus.h>
+#include <sys/rman.h>
+#include <sys/sysctl.h>
+
+#include <dev/iicbus/iicbus.h>
+#include <dev/iicbus/iiconf.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <arm/broadcom/bcm2835/bcm2835_gpio.h>
+#include <arm/broadcom/bcm2835/bcm2835_bscreg.h>
+#include <arm/broadcom/bcm2835/bcm2835_bscvar.h>
+
+#include "iicbus_if.h"
+
+static void bcm_bsc_intr(void *);
+
+static void
+bcm_bsc_modifyreg(struct bcm_bsc_softc *sc, uint32_t off, uint32_t mask,
+	uint32_t value)
+{
+	uint32_t reg;
+
+	mtx_assert(&sc->sc_mtx, MA_OWNED);        
+	reg = BCM_BSC_READ(sc, off);
+	reg &= ~mask;
+	reg |= value;
+	BCM_BSC_WRITE(sc, off, reg);
+}
+
+static int
+bcm_bsc_clock_proc(SYSCTL_HANDLER_ARGS)
+{
+	struct bcm_bsc_softc *sc;
+	uint32_t clk;
+	int error;
+
+	sc = (struct bcm_bsc_softc *)arg1;
+
+	BCM_BSC_LOCK(sc);
+	clk = BCM_BSC_READ(sc, BCM_BSC_CLOCK);
+	BCM_BSC_UNLOCK(sc);
+	clk &= 0xffff;
+	if (clk == 0)
+		clk = 32768;
+	clk = BCM_BSC_CORE_CLK / clk;
+	error = sysctl_handle_int(oidp, &clk, sizeof(clk), req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	clk = BCM_BSC_CORE_CLK / clk;
+	if (clk % 2)
+		clk--;
+	if (clk > 0xffff)
+		clk = 0xffff;
+	BCM_BSC_LOCK(sc);
+	BCM_BSC_WRITE(sc, BCM_BSC_CLOCK, clk);
+	BCM_BSC_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+bcm_bsc_clkt_proc(SYSCTL_HANDLER_ARGS)
+{
+	struct bcm_bsc_softc *sc;
+	uint32_t clkt;
+	int error;
+
+	sc = (struct bcm_bsc_softc *)arg1;
+
+	BCM_BSC_LOCK(sc);
+	clkt = BCM_BSC_READ(sc, BCM_BSC_CLKT);
+	BCM_BSC_UNLOCK(sc);
+	clkt &= 0xffff;
+	error = sysctl_handle_int(oidp, &clkt, sizeof(clkt), req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	BCM_BSC_LOCK(sc);
+	BCM_BSC_WRITE(sc, BCM_BSC_CLKT, clkt & 0xffff);
+	BCM_BSC_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+bcm_bsc_fall_proc(SYSCTL_HANDLER_ARGS)
+{
+	struct bcm_bsc_softc *sc;
+	uint32_t clk, reg;
+	int error;
+
+	sc = (struct bcm_bsc_softc *)arg1;
+
+	BCM_BSC_LOCK(sc);
+	reg = BCM_BSC_READ(sc, BCM_BSC_DELAY);
+	BCM_BSC_UNLOCK(sc);
+	reg >>= 16;
+	error = sysctl_handle_int(oidp, &reg, sizeof(reg), req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	BCM_BSC_LOCK(sc);
+	clk = BCM_BSC_READ(sc, BCM_BSC_CLOCK);
+	clk = BCM_BSC_CORE_CLK / clk;
+	if (reg > clk / 2)
+		reg = clk / 2 - 1;
+	bcm_bsc_modifyreg(sc, BCM_BSC_DELAY, 0xffff0000, reg << 16);
+	BCM_BSC_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+bcm_bsc_rise_proc(SYSCTL_HANDLER_ARGS)
+{
+	struct bcm_bsc_softc *sc;
+	uint32_t clk, reg;
+	int error;
+
+	sc = (struct bcm_bsc_softc *)arg1;
+
+	BCM_BSC_LOCK(sc);
+	reg = BCM_BSC_READ(sc, BCM_BSC_DELAY);
+	BCM_BSC_UNLOCK(sc);
+	reg &= 0xffff;
+	error = sysctl_handle_int(oidp, &reg, sizeof(reg), req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	BCM_BSC_LOCK(sc);
+	clk = BCM_BSC_READ(sc, BCM_BSC_CLOCK);
+	clk = BCM_BSC_CORE_CLK / clk;
+	if (reg > clk / 2)
+		reg = clk / 2 - 1;
+	bcm_bsc_modifyreg(sc, BCM_BSC_DELAY, 0xffff, reg);
+	BCM_BSC_UNLOCK(sc);
+
+	return (0);
+}
+
+static void
+bcm_bsc_sysctl_init(struct bcm_bsc_softc *sc)
+{
+	struct sysctl_ctx_list *ctx;
+	struct sysctl_oid *tree_node;
+	struct sysctl_oid_list *tree;
+
+	/*
+	 * Add system sysctl tree/handlers.
+	 */
+	ctx = device_get_sysctl_ctx(sc->sc_dev);
+	tree_node = device_get_sysctl_tree(sc->sc_dev);
+	tree = SYSCTL_CHILDREN(tree_node);
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "clock",
+	    CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc),
+	    bcm_bsc_clock_proc, "IU", "I2C BUS clock frequency");
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "clock_stretch",
+	    CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc),
+	    bcm_bsc_clkt_proc, "IU", "I2C BUS clock stretch timeout");
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "fall_edge_delay",
+	    CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc),
+	    bcm_bsc_fall_proc, "IU", "I2C BUS falling edge delay");
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "rise_edge_delay",
+	    CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc),
+	    bcm_bsc_rise_proc, "IU", "I2C BUS rising edge delay");
+}
+
+static void
+bcm_bsc_reset(struct bcm_bsc_softc *sc)
+{
+
+	/* Clear pending interrupts. */
+	BCM_BSC_WRITE(sc, BCM_BSC_STATUS, BCM_BSC_STATUS_CLKT |
+	    BCM_BSC_STATUS_ERR | BCM_BSC_STATUS_DONE);
+	/* Clear the FIFO. */
+	bcm_bsc_modifyreg(sc, BCM_BSC_CTRL, BCM_BSC_CTRL_CLEAR0,
+	    BCM_BSC_CTRL_CLEAR0);
+}
+
+static int
+bcm_bsc_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-bsc"))
+		return (ENXIO);
+
+	device_set_desc(dev, "BCM2708/2835 BSC controller");
+
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+bcm_bsc_attach(device_t dev)
+{
+	struct bcm_bsc_softc *sc;
+	unsigned long start;
+	device_t gpio;
+	int i, rid;
+
+	sc = device_get_softc(dev);
+	sc->sc_dev = dev;
+
+	rid = 0;
+	sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (!sc->sc_mem_res) {
+		device_printf(dev, "cannot allocate memory window\n");
+		return (ENXIO);
+	}
+
+	sc->sc_bst = rman_get_bustag(sc->sc_mem_res);
+	sc->sc_bsh = rman_get_bushandle(sc->sc_mem_res);
+
+	/* Check the unit we are attaching by its base address. */
+	start = rman_get_start(sc->sc_mem_res);
+	for (i = 0; i < nitems(bcm_bsc_pins); i++) {
+		if (bcm_bsc_pins[i].start == start)
+			break;
+	}
+	if (i == nitems(bcm_bsc_pins)) {
+		device_printf(dev, "only bsc0 and bsc1 are supported\n");
+		return (ENXIO);
+	}
+
+	/*
+	 * Configure the GPIO pins to ALT0 function to enable BSC control
+	 * over the pins.
+	 */
+	gpio = devclass_get_device(devclass_find("gpio"), 0);
+	if (!gpio) {
+		device_printf(dev, "cannot find gpio0\n");
+		return (ENXIO);
+	}
+	bcm_gpio_set_alternate(gpio, bcm_bsc_pins[i].sda, BCM_GPIO_ALT0);
+	bcm_gpio_set_alternate(gpio, bcm_bsc_pins[i].scl, BCM_GPIO_ALT0);
+
+	rid = 0;
+	sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE | RF_SHAREABLE);
+	if (!sc->sc_irq_res) {
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+		device_printf(dev, "cannot allocate interrupt\n");
+		return (ENXIO);
+	}
+
+	/* Hook up our interrupt handler. */
+	if (bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
+	    NULL, bcm_bsc_intr, sc, &sc->sc_intrhand)) {
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res);
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+		device_printf(dev, "cannot setup the interrupt handler\n");
+		return (ENXIO);
+	}
+
+	mtx_init(&sc->sc_mtx, "bcm_bsc", NULL, MTX_DEF);
+
+	bcm_bsc_sysctl_init(sc);
+
+	/* Enable the BSC controller.  Flush the FIFO. */
+	BCM_BSC_LOCK(sc);
+	BCM_BSC_WRITE(sc, BCM_BSC_CTRL, BCM_BSC_CTRL_I2CEN);
+	bcm_bsc_reset(sc);
+	BCM_BSC_UNLOCK(sc);
+
+	device_add_child(dev, "iicbus", -1);
+
+	return (bus_generic_attach(dev));
+}
+
+static int
+bcm_bsc_detach(device_t dev)
+{
+	struct bcm_bsc_softc *sc;
+
+	bus_generic_detach(dev);
+
+	sc = device_get_softc(dev);
+	mtx_destroy(&sc->sc_mtx);
+	if (sc->sc_intrhand)
+		bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intrhand);
+	if (sc->sc_irq_res)
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res);
+	if (sc->sc_mem_res)
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+
+	return (0);
+}
+
+static void
+bcm_bsc_intr(void *arg)
+{
+	struct bcm_bsc_softc *sc;
+	uint32_t status;
+
+	sc = (struct bcm_bsc_softc *)arg;
+
+	BCM_BSC_LOCK(sc);
+
+	/* The I2C interrupt is shared among all the BSC controllers. */
+	if ((sc->sc_flags & BCM_I2C_BUSY) == 0) {
+		BCM_BSC_UNLOCK(sc);
+		return;
+	}
+
+	status = BCM_BSC_READ(sc, BCM_BSC_STATUS);
+
+	/* Check for errors. */
+	if (status & (BCM_BSC_STATUS_CLKT | BCM_BSC_STATUS_ERR)) {
+		/* Disable interrupts. */
+		BCM_BSC_WRITE(sc, BCM_BSC_CTRL, BCM_BSC_CTRL_I2CEN);
+		sc->sc_flags |= BCM_I2C_ERROR;
+		bcm_bsc_reset(sc);
+		wakeup(sc->sc_dev);
+		BCM_BSC_UNLOCK(sc);
+		return;
+	}
+
+	if (sc->sc_flags & BCM_I2C_READ) {
+		while (sc->sc_resid > 0 && (status & BCM_BSC_STATUS_RXD)) {
+			*sc->sc_data++ = BCM_BSC_READ(sc, BCM_BSC_DATA);
+			sc->sc_resid--;
+			status = BCM_BSC_READ(sc, BCM_BSC_STATUS);
+		}
+	} else {
+		while (sc->sc_resid > 0 && (status & BCM_BSC_STATUS_TXD)) {
+			BCM_BSC_WRITE(sc, BCM_BSC_DATA, *sc->sc_data++);
+			sc->sc_resid--;
+			status = BCM_BSC_READ(sc, BCM_BSC_STATUS);
+		}
+	}
+
+	if (status & BCM_BSC_STATUS_DONE) {
+		/* Disable interrupts. */
+		BCM_BSC_WRITE(sc, BCM_BSC_CTRL, BCM_BSC_CTRL_I2CEN);
+		bcm_bsc_reset(sc);
+		wakeup(sc->sc_dev);
+	}
+
+	BCM_BSC_UNLOCK(sc);
+}
+
+static int
+bcm_bsc_transfer(device_t dev, struct iic_msg *msgs, uint32_t nmsgs)
+{
+	struct bcm_bsc_softc *sc;
+	uint32_t intr, read, status;
+	int i, err;
+
+	sc = device_get_softc(dev);
+	BCM_BSC_LOCK(sc);
+
+	/* If the controller is busy wait until it is available. */
+	while (sc->sc_flags & BCM_I2C_BUSY)
+		mtx_sleep(dev, &sc->sc_mtx, 0, "bcm_bsc", 0);
+
+	/* Now we have control over the BSC controller. */
+	sc->sc_flags = BCM_I2C_BUSY;
+
+	/* Clear the FIFO and the pending interrupts. */
+	bcm_bsc_reset(sc);
+
+	err = 0;
+	for (i = 0; i < nmsgs; i++) {
+
+		/* Write the slave address. */
+		BCM_BSC_WRITE(sc, BCM_BSC_SLAVE, msgs[i].slave);
+
+		/* Write the data length. */
+		BCM_BSC_WRITE(sc, BCM_BSC_DLEN, msgs[i].len);
+
+		sc->sc_data = msgs[i].buf;
+		sc->sc_resid = msgs[i].len;
+		if ((msgs[i].flags & IIC_M_RD) == 0) {
+			/* Fill up the TX FIFO. */
+			status = BCM_BSC_READ(sc, BCM_BSC_STATUS);
+			while (sc->sc_resid > 0 &&
+			    (status & BCM_BSC_STATUS_TXD)) {
+				BCM_BSC_WRITE(sc, BCM_BSC_DATA, *sc->sc_data);
+				sc->sc_data++;
+				sc->sc_resid--;
+				status = BCM_BSC_READ(sc, BCM_BSC_STATUS);
+			}
+			read = 0;
+			intr = BCM_BSC_CTRL_INTT;
+			sc->sc_flags &= ~BCM_I2C_READ;
+		} else {
+			sc->sc_flags |= BCM_I2C_READ;
+			read = BCM_BSC_CTRL_READ;
+			intr = BCM_BSC_CTRL_INTR;
+		}
+		intr |= BCM_BSC_CTRL_INTD;
+
+		/* Start the transfer. */
+		BCM_BSC_WRITE(sc, BCM_BSC_CTRL, BCM_BSC_CTRL_I2CEN |
+		    BCM_BSC_CTRL_ST | read | intr);
+
+		/* Wait for the transaction to complete. */
+		err = mtx_sleep(dev, &sc->sc_mtx, 0, "bcm_bsc", hz);
+
+		/* Check if we have a timeout or an I2C error. */
+		if ((sc->sc_flags & BCM_I2C_ERROR) || err == EWOULDBLOCK) {
+			device_printf(sc->sc_dev, "I2C error\n");
+			err = EIO;
+			break;
+		}
+	}
+
+	/* Clean the controller flags. */
+	sc->sc_flags = 0;
+
+	BCM_BSC_UNLOCK(sc);
+
+	return (err);
+}
+
+static phandle_t
+bcm_bsc_get_node(device_t bus, device_t dev)
+{
+
+	/* We only have one child, the I2C bus, which needs our own node. */
+	return (ofw_bus_get_node(bus));
+}
+
+static device_method_t bcm_bsc_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		bcm_bsc_probe),
+	DEVMETHOD(device_attach,	bcm_bsc_attach),
+	DEVMETHOD(device_detach,	bcm_bsc_detach),
+
+	/* iicbus interface */
+	DEVMETHOD(iicbus_callback,	iicbus_null_callback),
+	DEVMETHOD(iicbus_transfer,	bcm_bsc_transfer),
+
+	/* ofw_bus interface */
+	DEVMETHOD(ofw_bus_get_node,	bcm_bsc_get_node),
+
+	DEVMETHOD_END
+};
+
+static devclass_t bcm_bsc_devclass;
+
+static driver_t bcm_bsc_driver = {
+	"iichb",
+	bcm_bsc_methods,
+	sizeof(struct bcm_bsc_softc),
+};
+
+DRIVER_MODULE(iicbus, bcm2835_bsc, iicbus_driver, iicbus_devclass, 0, 0);
+DRIVER_MODULE(bcm2835_bsc, simplebus, bcm_bsc_driver, bcm_bsc_devclass, 0, 0);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h b/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
new file mode 100644
index 00000000000..d48ce378a8e
--- /dev/null
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bscreg.h
@@ -0,0 +1,61 @@
+/*-
+ * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * Copyright (c) 2013 Luiz Otavio O Souza <loos@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	_BCM2835_BSCREG_H_
+#define	_BCM2835_BSCREG_H_
+
+#define	BCM_BSC_CORE_CLK	150000000U
+#define	BCM_BSC_CTRL		0x00
+#define	BCM_BSC_CTRL_I2CEN		(1 << 15)
+#define	BCM_BSC_CTRL_INTR		(1 << 10)
+#define	BCM_BSC_CTRL_INTT		(1 << 9)
+#define	BCM_BSC_CTRL_INTD		(1 << 8)
+#define	BCM_BSC_CTRL_ST			(1 << 7)
+#define	BCM_BSC_CTRL_CLEAR1		(1 << 5)
+#define	BCM_BSC_CTRL_CLEAR0		(1 << 4)
+#define	BCM_BSC_CTRL_READ		(1 << 0)
+#define	BCM_BSC_STATUS		0x04
+#define	BCM_BSC_STATUS_CLKT		(1 << 9)
+#define	BCM_BSC_STATUS_ERR		(1 << 8)
+#define	BCM_BSC_STATUS_RXF		(1 << 7)
+#define	BCM_BSC_STATUS_TXE		(1 << 6)
+#define	BCM_BSC_STATUS_RXD		(1 << 5)
+#define	BCM_BSC_STATUS_TXD		(1 << 4)
+#define	BCM_BSC_STATUS_RXR		(1 << 3)
+#define	BCM_BSC_STATUS_TXW		(1 << 2)
+#define	BCM_BSC_STATUS_DONE		(1 << 1)
+#define	BCM_BSC_STATUS_TA		(1 << 0)
+#define	BCM_BSC_DLEN		0x08
+#define	BCM_BSC_SLAVE		0x0c
+#define	BCM_BSC_DATA		0x10
+#define	BCM_BSC_CLOCK		0x14
+#define	BCM_BSC_DELAY		0x18
+#define	BCM_BSC_CLKT		0x1c
+
+#endif	/* _BCM2835_BSCREG_H_ */
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h b/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
new file mode 100644
index 00000000000..3fef35b4423
--- /dev/null
+++ b/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h
@@ -0,0 +1,69 @@
+/*-
+ * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * Copyright (c) 2013 Luiz Otavio O Souza <loos@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 _BCM2835_BSCVAR_H
+#define _BCM2835_BSCVAR_H
+
+struct {
+	uint32_t	sda;
+	uint32_t	scl;
+	unsigned long	start;
+} bcm_bsc_pins[] = {
+	{ 0, 1, 0x20205000 },	/* BSC0 GPIO pins and base address. */
+	{ 2, 3, 0x20804000 }	/* BSC1 GPIO pins and base address. */
+};
+
+struct bcm_bsc_softc {
+	device_t		sc_dev;
+	struct mtx		sc_mtx;
+	struct resource *	sc_mem_res;
+	struct resource *	sc_irq_res;
+	bus_space_tag_t		sc_bst;
+	bus_space_handle_t	sc_bsh;
+	uint16_t		sc_resid;
+	uint8_t			*sc_data;
+	uint8_t			sc_flags;
+	void *			sc_intrhand;
+};
+
+#define	BCM_I2C_BUSY		0x01
+#define	BCM_I2C_READ		0x02
+#define	BCM_I2C_ERROR		0x04
+
+#define	BCM_BSC_WRITE(_sc, _off, _val)		\
+    bus_space_write_4(_sc->sc_bst, _sc->sc_bsh, _off, _val)
+#define	BCM_BSC_READ(_sc, _off)			\
+    bus_space_read_4(_sc->sc_bst, _sc->sc_bsh, _off)
+
+#define	BCM_BSC_LOCK(_sc)			\
+    mtx_lock(&(_sc)->sc_mtx)
+#define	BCM_BSC_UNLOCK(_sc)			\
+    mtx_unlock(&(_sc)->sc_mtx)
+
+#endif	/* _BCM2835_BSCVAR_H_ */
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
index 08f3835f198..e86cc11d2b9 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/pmap.h>
 
 #include "bcm2835_dma.h"
 #include "bcm2835_vcbus.h"
@@ -75,7 +74,7 @@ __FBSDID("$FreeBSD$");
 #define		CS_WAITWRT		(1 << 28)
 #define		CS_DISDBG		(1 << 29)
 #define		CS_ABORT		(1 << 30)
-#define		CS_RESET		(1 << 31)
+#define		CS_RESET		(1U << 31)
 #define	BCM_DMA_CBADDR(n)	(0x100*(n) + 0x04)
 #define	BCM_DMA_INFO(n)		(0x100*(n) + 0x08)
 #define		INFO_INT_EN		(1 << 0)
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_fb.c b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
index 879f278776a..5dd5f992656 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_fb.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_fb.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
@@ -362,7 +361,7 @@ static driver_t bcm_fb_driver = {
 	sizeof(struct bcmsc_softc),
 };
 
-DRIVER_MODULE(bcm2835fb, fdtbus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
+DRIVER_MODULE(bcm2835fb, nexus, bcm_fb_driver, bcm_fb_devclass, 0, 0);
 
 /*
  * Video driver routines and glue.
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
index 26d23592c6d..6da218a7380 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
 #include <machine/fdt.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
@@ -56,8 +55,6 @@ __FBSDID("$FreeBSD$");
 
 #include "gpio_if.h"
 
-#undef	DEBUG
-
 #ifdef DEBUG
 #define dprintf(fmt, args...) do { printf("%s(): ", __func__);   \
     printf(fmt,##args); } while (0)
@@ -592,7 +589,7 @@ bcm_gpio_sysctl_init(struct bcm_gpio_softc *sc)
  	tree_node = device_get_sysctl_tree(sc->sc_dev);
  	tree = SYSCTL_CHILDREN(tree_node);
 	pin_node = SYSCTL_ADD_NODE(ctx, tree, OID_AUTO, "pin",
-	    CTLFLAG_RW, NULL, "GPIO Pins");
+	    CTLFLAG_RD, NULL, "GPIO Pins");
 	pin_tree = SYSCTL_CHILDREN(pin_node);
 
 	for (i = 0; i < sc->sc_gpio_npins; i++) {
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
index 7eff61c0fa9..a203e12e11b 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
@@ -52,9 +52,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/fdt/fdt_common.h>
 
@@ -67,7 +66,13 @@ vm_offset_t
 initarm_lastaddr(void)
 {
 
-	return (DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE);
+	return (DEVMAP_BOOTSTRAP_MAP_START);
+}
+
+void
+initarm_early_init(void)
+{
+
 }
 
 void
@@ -95,7 +100,7 @@ initarm_late_init(void)
 }
 
 #define FDT_DEVMAP_MAX	(2)		// FIXME
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
+static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
 	{ 0, 0, 0, 0, 0, }
 };
 
@@ -104,7 +109,7 @@ static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
  * Construct pmap_devmap[] with DT-derived config data.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 	int i = 0;
 
@@ -115,7 +120,7 @@ platform_devmap_init(void)
 	fdt_devmap[i].pd_cache = PTE_DEVICE;
 	i++;
 
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
+	arm_devmap_register_table(&fdt_devmap[0]);
 	return (0);
 }
 
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
index 4278742ddf5..b94a030dd26 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_mbox.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
index 90a5725551f..eb8df2a406d 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
@@ -53,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spi.c b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
new file mode 100644
index 00000000000..47a7d9804dc
--- /dev/null
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spi.c
@@ -0,0 +1,520 @@
+/*-
+ * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * Copyright (c) 2013 Luiz Otavio O Souza <loos@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/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/sysctl.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/cpufunc.h>
+#include <machine/resource.h>
+#include <machine/fdt.h>
+#include <machine/intr.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/spibus/spi.h>
+#include <dev/spibus/spibusvar.h>
+
+#include <arm/broadcom/bcm2835/bcm2835_gpio.h>
+#include <arm/broadcom/bcm2835/bcm2835_spireg.h>
+#include <arm/broadcom/bcm2835/bcm2835_spivar.h>
+
+#include "spibus_if.h"
+
+static void bcm_spi_intr(void *);
+
+#ifdef	BCM_SPI_DEBUG
+static void
+bcm_spi_printr(device_t dev)
+{
+	struct bcm_spi_softc *sc;
+	uint32_t reg;
+
+	sc = device_get_softc(dev);
+	reg = BCM_SPI_READ(sc, SPI_CS);
+	device_printf(dev, "CS=%b\n", reg,
+	    "\20\1CS0\2CS1\3CPHA\4CPOL\7CSPOL"
+	    "\10TA\11DMAEN\12INTD\13INTR\14ADCS\15REN\16LEN"
+	    "\21DONE\22RXD\23TXD\24RXR\25RXF\26CSPOL0\27CSPOL1"
+	    "\30CSPOL2\31DMA_LEN\32LEN_LONG");
+	reg = BCM_SPI_READ(sc, SPI_CLK) & SPI_CLK_MASK;
+	if (reg % 2)
+		reg--;
+	if (reg == 0)
+		reg = 65536;
+	device_printf(dev, "CLK=%uMhz/%d=%luhz\n",
+	    SPI_CORE_CLK / 1000000, reg, SPI_CORE_CLK / reg);
+	reg = BCM_SPI_READ(sc, SPI_DLEN) & SPI_DLEN_MASK;
+	device_printf(dev, "DLEN=%d\n", reg);
+	reg = BCM_SPI_READ(sc, SPI_LTOH) & SPI_LTOH_MASK;
+	device_printf(dev, "LTOH=%d\n", reg);
+	reg = BCM_SPI_READ(sc, SPI_DC);
+	device_printf(dev, "DC=RPANIC=%#x RDREQ=%#x TPANIC=%#x TDREQ=%#x\n",
+	    (reg & SPI_DC_RPANIC_MASK) >> SPI_DC_RPANIC_SHIFT,
+	    (reg & SPI_DC_RDREQ_MASK) >> SPI_DC_RDREQ_SHIFT,
+	    (reg & SPI_DC_TPANIC_MASK) >> SPI_DC_TPANIC_SHIFT,
+	    (reg & SPI_DC_TDREQ_MASK) >> SPI_DC_TDREQ_SHIFT);
+}
+#endif
+
+static void
+bcm_spi_modifyreg(struct bcm_spi_softc *sc, uint32_t off, uint32_t mask,
+	uint32_t value)
+{
+	uint32_t reg;
+
+	mtx_assert(&sc->sc_mtx, MA_OWNED);
+	reg = BCM_SPI_READ(sc, off);
+	reg &= ~mask;
+	reg |= value;
+	BCM_SPI_WRITE(sc, off, reg);
+}
+
+static int
+bcm_spi_clock_proc(SYSCTL_HANDLER_ARGS)
+{
+	struct bcm_spi_softc *sc;
+	uint32_t clk;
+	int error;
+
+	sc = (struct bcm_spi_softc *)arg1;
+
+	BCM_SPI_LOCK(sc);
+	clk = BCM_SPI_READ(sc, SPI_CLK);
+	BCM_SPI_UNLOCK(sc);
+	clk &= 0xffff;
+	if (clk == 0)
+		clk = 65536;
+	clk = SPI_CORE_CLK / clk;
+
+	error = sysctl_handle_int(oidp, &clk, sizeof(clk), req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	clk = SPI_CORE_CLK / clk;
+	if (clk <= 1)
+		clk = 2;
+	else if (clk % 2)
+		clk--;
+	if (clk > 0xffff)
+		clk = 0;
+	BCM_SPI_LOCK(sc);
+	BCM_SPI_WRITE(sc, SPI_CLK, clk);
+	BCM_SPI_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+bcm_spi_cs_bit_proc(SYSCTL_HANDLER_ARGS, uint32_t bit)
+{
+	struct bcm_spi_softc *sc;
+	uint32_t reg;
+	int error;
+
+	sc = (struct bcm_spi_softc *)arg1;
+	BCM_SPI_LOCK(sc);
+	reg = BCM_SPI_READ(sc, SPI_CS);
+	BCM_SPI_UNLOCK(sc);
+	reg = (reg & bit) ? 1 : 0;
+
+	error = sysctl_handle_int(oidp, &reg, sizeof(reg), req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	if (reg)
+		reg = bit;
+	BCM_SPI_LOCK(sc);
+	bcm_spi_modifyreg(sc, SPI_CS, bit, reg);
+	BCM_SPI_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+bcm_spi_cpol_proc(SYSCTL_HANDLER_ARGS)
+{
+
+	return (bcm_spi_cs_bit_proc(oidp, arg1, arg2, req, SPI_CS_CPOL));
+}
+
+static int
+bcm_spi_cpha_proc(SYSCTL_HANDLER_ARGS)
+{
+
+	return (bcm_spi_cs_bit_proc(oidp, arg1, arg2, req, SPI_CS_CPHA));
+}
+
+static int
+bcm_spi_cspol0_proc(SYSCTL_HANDLER_ARGS)
+{
+
+	return (bcm_spi_cs_bit_proc(oidp, arg1, arg2, req, SPI_CS_CSPOL0));
+}
+
+static int
+bcm_spi_cspol1_proc(SYSCTL_HANDLER_ARGS)
+{
+
+	return (bcm_spi_cs_bit_proc(oidp, arg1, arg2, req, SPI_CS_CSPOL1));
+}
+
+static void
+bcm_spi_sysctl_init(struct bcm_spi_softc *sc)
+{
+	struct sysctl_ctx_list *ctx;
+	struct sysctl_oid *tree_node;
+	struct sysctl_oid_list *tree;
+
+	/*
+	 * Add system sysctl tree/handlers.
+	 */
+	ctx = device_get_sysctl_ctx(sc->sc_dev);
+	tree_node = device_get_sysctl_tree(sc->sc_dev);
+	tree = SYSCTL_CHILDREN(tree_node);
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "clock",
+	    CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc),
+	    bcm_spi_clock_proc, "IU", "SPI BUS clock frequency");
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "cpol",
+	    CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc),
+	    bcm_spi_cpol_proc, "IU", "SPI BUS clock polarity");
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "cpha",
+	    CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc),
+	    bcm_spi_cpha_proc, "IU", "SPI BUS clock phase");
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "cspol0",
+	    CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc),
+	    bcm_spi_cspol0_proc, "IU", "SPI BUS chip select 0 polarity");
+	SYSCTL_ADD_PROC(ctx, tree, OID_AUTO, "cspol1",
+	    CTLFLAG_RW | CTLTYPE_UINT, sc, sizeof(*sc),
+	    bcm_spi_cspol1_proc, "IU", "SPI BUS chip select 1 polarity");
+}
+
+static int
+bcm_spi_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "broadcom,bcm2835-spi"))
+		return (ENXIO);
+
+	device_set_desc(dev, "BCM2708/2835 SPI controller");
+
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+bcm_spi_attach(device_t dev)
+{
+	struct bcm_spi_softc *sc;
+	device_t gpio;
+	int i, rid;
+
+	if (device_get_unit(dev) != 0) {
+		device_printf(dev, "only one SPI controller supported\n");
+		return (ENXIO);
+	}
+
+	sc = device_get_softc(dev);
+	sc->sc_dev = dev;
+
+	/* Configure the GPIO pins to ALT0 function to enable SPI the pins. */
+	gpio = devclass_get_device(devclass_find("gpio"), 0);
+	if (!gpio) {
+		device_printf(dev, "cannot find gpio0\n");
+		return (ENXIO);
+	}
+	for (i = 0; i < nitems(bcm_spi_pins); i++)
+		bcm_gpio_set_alternate(gpio, bcm_spi_pins[i], BCM_GPIO_ALT0);
+
+	rid = 0;
+	sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (!sc->sc_mem_res) {
+		device_printf(dev, "cannot allocate memory window\n");
+		return (ENXIO);
+	}
+
+	sc->sc_bst = rman_get_bustag(sc->sc_mem_res);
+	sc->sc_bsh = rman_get_bushandle(sc->sc_mem_res);
+
+	rid = 0;
+	sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE);
+	if (!sc->sc_irq_res) {
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+		device_printf(dev, "cannot allocate interrupt\n");
+		return (ENXIO);
+	}
+
+	/* Hook up our interrupt handler. */
+	if (bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
+	    NULL, bcm_spi_intr, sc, &sc->sc_intrhand)) {
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res);
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+		device_printf(dev, "cannot setup the interrupt handler\n");
+		return (ENXIO);
+	}
+
+	mtx_init(&sc->sc_mtx, "bcm_spi", NULL, MTX_DEF);
+
+	/* Add sysctl nodes. */
+	bcm_spi_sysctl_init(sc);
+
+#ifdef	BCM_SPI_DEBUG
+	bcm_spi_printr(dev);
+#endif
+
+	/*
+	 * Enable the SPI controller.  Clear the rx and tx FIFO.
+	 * Defaults to SPI mode 0.
+	 */
+	BCM_SPI_WRITE(sc, SPI_CS, SPI_CS_CLEAR_RXFIFO | SPI_CS_CLEAR_TXFIFO);
+
+	/* Set the SPI clock to 500Khz. */
+	BCM_SPI_WRITE(sc, SPI_CLK, SPI_CORE_CLK / 500000);
+
+#ifdef	BCM_SPI_DEBUG
+	bcm_spi_printr(dev);
+#endif
+
+	device_add_child(dev, "spibus", -1);
+
+	return (bus_generic_attach(dev));
+}
+
+static int
+bcm_spi_detach(device_t dev)
+{
+	struct bcm_spi_softc *sc;
+
+	bus_generic_detach(dev);
+
+	sc = device_get_softc(dev);
+	mtx_destroy(&sc->sc_mtx);
+	if (sc->sc_intrhand)
+		bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intrhand);
+	if (sc->sc_irq_res)
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res);
+	if (sc->sc_mem_res)
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+
+	return (0);
+}
+
+static void
+bcm_spi_fill_fifo(struct bcm_spi_softc *sc)
+{
+	struct spi_command *cmd;
+	uint32_t cs, written;
+	uint8_t *data;
+
+	cmd = sc->sc_cmd;
+	cs = BCM_SPI_READ(sc, SPI_CS) & (SPI_CS_TA | SPI_CS_TXD);
+	while (sc->sc_written < sc->sc_len &&
+	    cs == (SPI_CS_TA | SPI_CS_TXD)) {
+		data = (uint8_t *)cmd->tx_cmd;
+		written = sc->sc_written++;
+		if (written >= cmd->tx_cmd_sz) {
+			data = (uint8_t *)cmd->tx_data;
+			written -= cmd->tx_cmd_sz;
+		}
+		BCM_SPI_WRITE(sc, SPI_FIFO, data[written]);
+		cs = BCM_SPI_READ(sc, SPI_CS) & (SPI_CS_TA | SPI_CS_TXD);
+	}
+}
+
+static void
+bcm_spi_drain_fifo(struct bcm_spi_softc *sc)
+{
+	struct spi_command *cmd;
+	uint32_t cs, read;
+	uint8_t *data;
+
+	cmd = sc->sc_cmd;
+	cs = BCM_SPI_READ(sc, SPI_CS) & SPI_CS_RXD;
+	while (sc->sc_read < sc->sc_len && cs == SPI_CS_RXD) {
+		data = (uint8_t *)cmd->rx_cmd;
+		read = sc->sc_read++;
+		if (read >= cmd->rx_cmd_sz) {
+			data = (uint8_t *)cmd->rx_data;
+			read -= cmd->rx_cmd_sz;
+		}
+		data[read] = BCM_SPI_READ(sc, SPI_FIFO) & 0xff;
+		cs = BCM_SPI_READ(sc, SPI_CS) & SPI_CS_RXD;
+	}
+}
+
+static void
+bcm_spi_intr(void *arg)
+{
+	struct bcm_spi_softc *sc;
+
+	sc = (struct bcm_spi_softc *)arg;
+	BCM_SPI_LOCK(sc);
+
+	/* Filter stray interrupts. */
+	if ((sc->sc_flags & BCM_SPI_BUSY) == 0) {
+		BCM_SPI_UNLOCK(sc);
+		return;
+	}
+
+	/* TX - Fill up the FIFO. */
+	bcm_spi_fill_fifo(sc);
+
+	/* RX - Drain the FIFO. */
+	bcm_spi_drain_fifo(sc);
+
+	/* Check for end of transfer. */
+	if (sc->sc_written == sc->sc_len && sc->sc_read == sc->sc_len) {
+		/* Disable interrupts and the SPI engine. */
+		bcm_spi_modifyreg(sc, SPI_CS,
+		    SPI_CS_TA | SPI_CS_INTR | SPI_CS_INTD, 0);
+		wakeup(sc->sc_dev);
+	}
+
+	BCM_SPI_UNLOCK(sc);
+}
+
+static int
+bcm_spi_transfer(device_t dev, device_t child, struct spi_command *cmd)
+{
+	struct bcm_spi_softc *sc;
+	int cs, err;
+
+	sc = device_get_softc(dev);
+
+	KASSERT(cmd->tx_cmd_sz == cmd->rx_cmd_sz, 
+	    ("TX/RX command sizes should be equal"));
+	KASSERT(cmd->tx_data_sz == cmd->rx_data_sz, 
+	    ("TX/RX data sizes should be equal"));
+
+	BCM_SPI_LOCK(sc);
+
+	/* If the controller is in use wait until it is available. */
+	while (sc->sc_flags & BCM_SPI_BUSY)
+		mtx_sleep(dev, &sc->sc_mtx, 0, "bcm_spi", 0);
+
+	/* Now we have control over SPI controller. */
+	sc->sc_flags = BCM_SPI_BUSY;
+
+	/* Clear the FIFO. */
+	bcm_spi_modifyreg(sc, SPI_CS,
+	    SPI_CS_CLEAR_RXFIFO | SPI_CS_CLEAR_TXFIFO,
+	    SPI_CS_CLEAR_RXFIFO | SPI_CS_CLEAR_TXFIFO);
+
+	/* Get the proper chip select for this child. */
+	spibus_get_cs(child, &cs);
+	if (cs < 0 || cs > 2) {
+		device_printf(dev,
+		    "Invalid chip select %d requested by %s\n", cs,
+		    device_get_nameunit(child));
+		BCM_SPI_UNLOCK(sc);
+		return (EINVAL);
+	}
+
+	/* Save a pointer to the SPI command. */
+	sc->sc_cmd = cmd;
+	sc->sc_read = 0;
+	sc->sc_written = 0;
+	sc->sc_len = cmd->tx_cmd_sz + cmd->tx_data_sz;
+
+	/*
+	 * Set the CS for this transaction, enable interrupts and announce
+	 * we're ready to tx.  This will kick off the first interrupt.
+	 */
+	bcm_spi_modifyreg(sc, SPI_CS,
+	    SPI_CS_MASK | SPI_CS_TA | SPI_CS_INTR | SPI_CS_INTD,
+	    cs | SPI_CS_TA | SPI_CS_INTR | SPI_CS_INTD);
+
+	/* Wait for the transaction to complete. */
+	err = mtx_sleep(dev, &sc->sc_mtx, 0, "bcm_spi", hz * 2);
+
+	/* Make sure the SPI engine and interrupts are disabled. */
+	bcm_spi_modifyreg(sc, SPI_CS, SPI_CS_TA | SPI_CS_INTR | SPI_CS_INTD, 0);
+
+	/* Clear the controller flags. */
+	sc->sc_flags = 0;
+
+	/*
+	 * Check for transfer timeout.  The SPI controller doesn't
+	 * return errors.
+	 */
+	if (err == EWOULDBLOCK) {
+		device_printf(sc->sc_dev, "SPI error\n");
+		err = EIO;
+	}
+
+	BCM_SPI_UNLOCK(sc);
+
+	return (err);
+}
+
+static phandle_t
+bcm_spi_get_node(device_t bus, device_t dev)
+{
+
+	/* We only have one child, the SPI bus, which needs our own node. */
+	return (ofw_bus_get_node(bus));
+}
+
+static device_method_t bcm_spi_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		bcm_spi_probe),
+	DEVMETHOD(device_attach,	bcm_spi_attach),
+	DEVMETHOD(device_detach,	bcm_spi_detach),
+
+	/* SPI interface */
+	DEVMETHOD(spibus_transfer,	bcm_spi_transfer),
+
+	/* ofw_bus interface */
+	DEVMETHOD(ofw_bus_get_node,	bcm_spi_get_node),
+
+	DEVMETHOD_END
+};
+
+static devclass_t bcm_spi_devclass;
+
+static driver_t bcm_spi_driver = {
+	"spi",
+	bcm_spi_methods,
+	sizeof(struct bcm_spi_softc),
+};
+
+DRIVER_MODULE(bcm2835_spi, simplebus, bcm_spi_driver, bcm_spi_devclass, 0, 0);
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spireg.h b/sys/arm/broadcom/bcm2835/bcm2835_spireg.h
new file mode 100644
index 00000000000..6a0350c8b57
--- /dev/null
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spireg.h
@@ -0,0 +1,75 @@
+/*-
+ * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * Copyright (c) 2013 Luiz Otavio O Souza <loos@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	_BCM2835_SPIREG_H_
+#define	_BCM2835_SPIREG_H_
+
+#define	SPI_CORE_CLK	250000000U
+#define	SPI_CS		0x00
+#define	SPI_CS_LEN_LONG		(1 << 25)
+#define	SPI_CS_DMA_LEN		(1 << 24)
+#define	SPI_CS_CSPOL2		(1 << 23)
+#define	SPI_CS_CSPOL1		(1 << 22)
+#define	SPI_CS_CSPOL0		(1 << 21)
+#define	SPI_CS_RXF		(1 << 20)
+#define	SPI_CS_RXR		(1 << 19)
+#define	SPI_CS_TXD		(1 << 18)
+#define	SPI_CS_RXD		(1 << 17)
+#define	SPI_CS_DONE		(1 << 16)
+#define	SPI_CS_LEN		(1 << 13)
+#define	SPI_CS_REN		(1 << 12)
+#define	SPI_CS_ADCS		(1 << 11)
+#define	SPI_CS_INTR		(1 << 10)
+#define	SPI_CS_INTD		(1 << 9)
+#define	SPI_CS_DMAEN		(1 << 8)
+#define	SPI_CS_TA		(1 << 7)
+#define	SPI_CS_CSPOL		(1 << 6)
+#define	SPI_CS_CLEAR_RXFIFO	(1 << 5)
+#define	SPI_CS_CLEAR_TXFIFO	(1 << 4)
+#define	SPI_CS_CPOL		(1 << 3)
+#define	SPI_CS_CPHA		(1 << 2)
+#define	SPI_CS_MASK		0x3
+#define	SPI_FIFO	0x04
+#define	SPI_CLK		0x08
+#define	SPI_CLK_MASK		0xffff
+#define	SPI_DLEN	0x0c
+#define	SPI_DLEN_MASK		0xffff
+#define	SPI_LTOH	0x10
+#define	SPI_LTOH_MASK		0xf
+#define	SPI_DC		0x14
+#define	SPI_DC_RPANIC_SHIFT	24
+#define	SPI_DC_RPANIC_MASK	(0xff << SPI_DC_RPANIC_SHIFT)
+#define	SPI_DC_RDREQ_SHIFT	16
+#define	SPI_DC_RDREQ_MASK	(0xff << SPI_DC_RDREQ_SHIFT)
+#define	SPI_DC_TPANIC_SHIFT	8
+#define	SPI_DC_TPANIC_MASK	(0xff << SPI_DC_TPANIC_SHIFT)
+#define	SPI_DC_TDREQ_SHIFT	0
+#define	SPI_DC_TDREQ_MASK	0xff
+
+#endif	/* _BCM2835_SPIREG_H_ */
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_spivar.h b/sys/arm/broadcom/bcm2835/bcm2835_spivar.h
new file mode 100644
index 00000000000..6a32f9229b9
--- /dev/null
+++ b/sys/arm/broadcom/bcm2835/bcm2835_spivar.h
@@ -0,0 +1,72 @@
+/*-
+ * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * Copyright (c) 2013 Luiz Otavio O Souza <loos@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	_BCM2835_SPIVAR_H_
+#define	_BCM2835_SPIVAR_H_
+
+/*
+ * Only the available pins are listed here.
+ * i.e. CS2 isn't available.
+ */
+uint32_t bcm_spi_pins[] = {
+	7,	/* CS1 */
+	8,	/* CS0 */
+	9,	/* MISO */
+	10,	/* MOSI */
+	11	/* SCLK */
+};
+
+struct bcm_spi_softc {
+	device_t		sc_dev;
+	struct mtx		sc_mtx;
+	struct resource *	sc_mem_res;
+	struct resource *	sc_irq_res;
+	struct spi_command	*sc_cmd;
+	bus_space_tag_t		sc_bst;
+	bus_space_handle_t	sc_bsh;
+	uint32_t		sc_len;
+	uint32_t		sc_read;
+	uint32_t		sc_flags;
+	uint32_t		sc_written;
+	void *			sc_intrhand;
+};
+
+#define	BCM_SPI_BUSY		0x1
+
+#define BCM_SPI_WRITE(_sc, _off, _val)		\
+    bus_space_write_4(_sc->sc_bst, _sc->sc_bsh, _off, _val)
+#define BCM_SPI_READ(_sc, _off)			\
+    bus_space_read_4(_sc->sc_bst, _sc->sc_bsh, _off)
+
+#define BCM_SPI_LOCK(_sc)			\
+    mtx_lock(&(_sc)->sc_mtx)
+#define BCM_SPI_UNLOCK(_sc)			\
+    mtx_unlock(&(_sc)->sc_mtx)
+
+#endif	/* _BCM2835_SPIVAR_H_ */
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
index 6ecdb348cbf..a72736654ed 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
index c8570cb57b9..fbe3beded63 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
@@ -76,11 +76,10 @@ struct bcmwd_softc {
 	int			wdog_armed;
 	int			wdog_period;
 	char			wdog_passwd;
+	struct mtx		mtx;
 };
 
-#ifdef notyet
 static void bcmwd_watchdog_fn(void *private, u_int cmd, int *error);
-#endif
 
 static int
 bcmwd_probe(device_t dev)
@@ -120,19 +119,59 @@ bcmwd_attach(device_t dev)
 	sc->bsh = rman_get_bushandle(sc->res);
 
 	bcmwd_lsc = sc;
-#ifdef notyet
+	mtx_init(&sc->mtx, "BCM2835 Watchdog", "bcmwd", MTX_DEF);
 	EVENTHANDLER_REGISTER(watchdog_list, bcmwd_watchdog_fn, sc, 0);
-#endif
+
 	return (0);
 }
 
-#ifdef notyet
 static void
 bcmwd_watchdog_fn(void *private, u_int cmd, int *error)
 {
-	/* XXX: not yet */
+	struct bcmwd_softc *sc;
+	uint64_t sec;
+	uint32_t ticks, reg;
+
+	sc = private;
+	mtx_lock(&sc->mtx);
+
+	cmd &= WD_INTERVAL;
+
+	if (cmd > 0) {
+		sec = ((uint64_t)1 << (cmd & WD_INTERVAL)) / 1000000000;
+		ticks = (sec << 16) & BCM2835_WDOG_TIME_MASK;
+		if (ticks == 0) {
+			/* 
+			 * Can't arm
+			 * disable watchdog as watchdog(9) requires
+			 */
+			device_printf(sc->dev,
+			    "Can't arm, timeout is less than 1 second\n");
+			WRITE(sc, BCM2835_RSTC_REG, 
+			    (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) |
+			    BCM2835_RSTC_RESET);
+			mtx_unlock(&sc->mtx);
+			return;
+		}
+
+		reg = (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | ticks;
+		WRITE(sc, BCM2835_WDOG_REG, reg);
+
+		reg = READ(sc, BCM2835_RSTC_REG);
+		reg &= BCM2835_RSTC_WRCFG_CLR;
+		reg |= BCM2835_RSTC_WRCFG_FULL_RESET;
+		reg |= (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT);
+		WRITE(sc, BCM2835_RSTC_REG, reg);
+
+		*error = 0;
+	}
+	else
+		WRITE(sc, BCM2835_RSTC_REG, 
+		    (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) |
+		    BCM2835_RSTC_RESET);
+
+	mtx_unlock(&sc->mtx);
 }
-#endif
 
 void
 bcmwd_watchdog_reset()
diff --git a/sys/arm/broadcom/bcm2835/bus_space.c b/sys/arm/broadcom/bcm2835/bus_space.c
deleted file mode 100644
index 4cce8203abc..00000000000
--- a/sys/arm/broadcom/bcm2835/bus_space.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (C) 2012 FreeBSD Foundation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 MARVELL nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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 <machine/bus.h>
-
-/* Prototypes for all the bus_space structure functions */
-bs_protos(generic);
-bs_protos(generic_armv4);
-
-struct bus_space _base_tag = {
-	/* cookie */
-	.bs_cookie	= (void *) 0,
-	
-	/* mapping/unmapping */
-	.bs_map		= generic_bs_map,
-	.bs_unmap	= generic_bs_unmap,
-	.bs_subregion	= generic_bs_subregion,
-	
-	/* allocation/deallocation */
-	.bs_alloc	= generic_bs_alloc,
-	.bs_free	= generic_bs_free,
-	
-	/* barrier */
-	.bs_barrier	= generic_bs_barrier,
-	
-	/* read (single) */
-	.bs_r_1		= generic_bs_r_1,
-	.bs_r_2		= generic_armv4_bs_r_2,
-	.bs_r_4		= generic_bs_r_4,
-	.bs_r_8		= NULL,
-	
-	/* read multiple */
-	.bs_rm_1	= generic_bs_rm_1,
-	.bs_rm_2	= generic_armv4_bs_rm_2,
-	.bs_rm_4	= generic_bs_rm_4,
-	.bs_rm_8	= NULL,
-	
-	/* read region */
-	.bs_rr_1	= generic_bs_rr_1,
-	.bs_rr_2	= generic_armv4_bs_rr_2,
-	.bs_rr_4	= generic_bs_rr_4,
-	.bs_rr_8	= NULL,
-	
-	/* write (single) */
-	.bs_w_1		= generic_bs_w_1,
-	.bs_w_2		= generic_armv4_bs_w_2,
-	.bs_w_4		= generic_bs_w_4,
-	.bs_w_8		= NULL,
-	
-	/* write multiple */
-	.bs_wm_1	= generic_bs_wm_1,
-	.bs_wm_2	= generic_armv4_bs_wm_2,
-	.bs_wm_4	= generic_bs_wm_4,
-	.bs_wm_8	= NULL,
-	
-	/* write region */
-	.bs_wr_1	= generic_bs_wr_1,
-	.bs_wr_2	= generic_armv4_bs_wr_2,
-	.bs_wr_4	= generic_bs_wr_4,
-	.bs_wr_8	= NULL,
-	
-	/* set multiple */
-	/* XXX not implemented */
-	
-	/* set region */
-	.bs_sr_1	= NULL,
-	.bs_sr_2	= generic_armv4_bs_sr_2,
-	.bs_sr_4	= generic_bs_sr_4,
-	.bs_sr_8	= NULL,
-	
-	/* copy */
-	.bs_c_1		= NULL,
-	.bs_c_2		= generic_armv4_bs_c_2,
-	.bs_c_4		= NULL,
-	.bs_c_8		= NULL,
-};
-
-bus_space_tag_t fdtbus_bs_tag = &_base_tag;
diff --git a/sys/arm/broadcom/bcm2835/files.bcm2835 b/sys/arm/broadcom/bcm2835/files.bcm2835
index 9c0ff055507..6aa7c027eb5 100644
--- a/sys/arm/broadcom/bcm2835/files.bcm2835
+++ b/sys/arm/broadcom/bcm2835/files.bcm2835
@@ -1,5 +1,6 @@
 # $FreeBSD$
 
+arm/broadcom/bcm2835/bcm2835_bsc.c		optional bcm2835_bsc
 arm/broadcom/bcm2835/bcm2835_dma.c		standard
 arm/broadcom/bcm2835/bcm2835_fb.c		optional sc
 arm/broadcom/bcm2835/bcm2835_gpio.c		optional gpio
@@ -7,12 +8,13 @@ arm/broadcom/bcm2835/bcm2835_intr.c		standard
 arm/broadcom/bcm2835/bcm2835_machdep.c		standard
 arm/broadcom/bcm2835/bcm2835_mbox.c		standard
 arm/broadcom/bcm2835/bcm2835_sdhci.c		optional sdhci
+arm/broadcom/bcm2835/bcm2835_spi.c		optional bcm2835_spi
 arm/broadcom/bcm2835/bcm2835_systimer.c		standard
 arm/broadcom/bcm2835/bcm2835_wdog.c		standard
-arm/broadcom/bcm2835/bus_space.c		optional fdt
 arm/broadcom/bcm2835/common.c			optional fdt
-arm/broadcom/bcm2835/dwc_otg_brcm.c		optional dwcotg
+dev/usb/controller/dwc_otg_fdt.c		optional dwcotg
 
+arm/arm/bus_space-v6.c				standard
 arm/arm/bus_space_generic.c                     standard
 arm/arm/bus_space_asm_generic.S                 standard
 arm/arm/cpufunc_asm_arm11.S                     standard
diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP
index 50ed7edc9d5..2b4945971e2 100644
--- a/sys/arm/conf/ARMADAXP
+++ b/sys/arm/conf/ARMADAXP
@@ -76,8 +76,7 @@ device		pass
 device		da
 
 # SATA
-device		ata
-#device		mvs
+device		mvs
 
 # Serial ports
 device		uart
diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index 272d3e82f50..3c6bebb25ea 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -104,6 +104,7 @@ device		gpio
 
 # USB support
 device		usb
+options 	USB_HOST_ALIGN=64	# Cacheline size is 64 on AM335x.
 options 	USB_DEBUG
 #options 	USB_REQ_DEBUG
 #options 	USB_VERBOSE
diff --git a/sys/arm/conf/COSMIC b/sys/arm/conf/COSMIC
new file mode 100644
index 00000000000..409895cb67c
--- /dev/null
+++ b/sys/arm/conf/COSMIC
@@ -0,0 +1,139 @@
+# Kernel configuration for Cosmic Board (Freescale Vybrid Family development board).
+#
+# 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		COSMIC
+
+include		"../freescale/vybrid/std.vybrid"
+
+makeoptions	MODULES_OVERRIDE=""
+makeoptions	WITHOUT_MODULES="ahc"
+
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions	WERROR="-Werror"
+
+options		HZ=100 ##
+options		SCHED_4BSD		#4BSD scheduler
+options		INET			#InterNETworking
+options		INET6			#IPv6 communications protocols
+options		FFS			#Berkeley Fast Filesystem
+options		SOFTUPDATES
+options		UFS_ACL			#Support for access control lists
+options		UFS_DIRHASH		#Improve performance on big directories
+options		MSDOSFS			#MSDOS Filesystem
+options		CD9660			#ISO 9660 Filesystem
+options		PROCFS			#Process filesystem (requires PSEUDOFS)
+options		PSEUDOFS		#Pseudo-filesystem framework
+#options		NANDFS			#NAND Filesystem
+options		TMPFS
+options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
+options		SCSI_DELAY=5000		#Delay (in ms) before probing SCSI
+options		KTRACE
+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		KBD_INSTALL_CDEV
+options		PREEMPTION
+options		FREEBSD_BOOT_LOADER
+options 	VFP		# vfp/neon
+
+# Debugging
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+options		BREAK_TO_DEBUGGER
+#options	VERBOSE_SYSINIT		#Enable verbose sysinit messages
+options		KDB
+options		DDB			#Enable the kernel debugger
+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
+#options	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+options		DIAGNOSTIC
+
+# NFS support
+options		NFSCL			#Network Filesystem Client
+options		NFSLOCKD		#Network Lock Manager
+options		NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+
+# Uncomment this for NFS root
+#options	NFS_ROOT		#NFS usable as /, requires NFSCL
+#options	BOOTP_NFSROOT
+#options	BOOTP_COMPAT
+#options	BOOTP
+#options	BOOTP_NFSV3
+#options	BOOTP_WIRED_TO=ffec0
+
+device		mmc			# mmc/sd bus
+device		mmcsd			# mmc/sd flash cards
+device		sdhci			# generic sdhci
+
+#options		ROOTDEVNAME=\"nfs:10.5.0.1:/tftpboot/cosmic\"
+#options		ROOTDEVNAME=\"nandfs:/dev/gnand0s.root\"
+options		ROOTDEVNAME=\"ufs:/dev/da0\"
+
+#options	SMP
+
+# Pseudo devices
+
+device		loop
+device		random
+device		pty
+device		md
+device		gpio
+
+# USB support
+device		usb
+options		USB_DEBUG
+#options	USB_REQ_DEBUG
+#options	USB_VERBOSE
+#device		musb
+device		ehci
+#device		ohci
+
+device		umass
+device		scbus			# SCSI bus (required for SCSI)
+device		da			# Direct Access (disks)
+device		pass
+
+# SATA
+#device		ata
+#device		atadisk
+#device		mvs
+
+device		nand
+
+# Serial ports
+device		uart
+
+# I2C (TWSI)
+#device		iic
+#device		iicbus
+
+# Ethernet
+device		ether
+device		ffec
+
+# USB ethernet support, requires miibus
+device		miibus
+device		axe			# ASIX Electronics USB Ethernet
+device		bpf			# Berkeley packet filter
+
+#FDT
+options		FDT
+options		FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=vybrid-cosmic.dts
diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53
index 5aec9fe3e56..8a44844e39f 100644
--- a/sys/arm/conf/DIGI-CCWMX53
+++ b/sys/arm/conf/DIGI-CCWMX53
@@ -65,7 +65,7 @@ options 	VFP			# vfp/neon
 #options 	BOOTP_COMPAT
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=ue0
+#options 	BOOTP_WIRED_TO=ffec0
 
 #options 	ROOTDEVNAME=\"ufs:ada0s2a\"
 
@@ -105,8 +105,12 @@ device		ether		# Ethernet support
 #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
+device		uart		# Multi-uart driver
 options 	ALT_BREAK_TO_DEBUGGER
 
 device		ata
@@ -130,13 +134,13 @@ device		cd		# CD
 device		pass		# Passthrough device (direct SCSI access)
 
 # USB support
-#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"
+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
+device		ums
 
 # USB Ethernet, requires miibus
 #device		miibus
diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB
new file mode 100644
index 00000000000..ab226e83b20
--- /dev/null
+++ b/sys/arm/conf/IMX53-QSB
@@ -0,0 +1,179 @@
+# Kernel configuration for Freescale i.MX53 Quick Start Board
+#
+# 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-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 	MSDOSFS			# MSDOS Filesystem
+options 	CD9660			# ISO 9660 Filesystem
+#options 	PROCFS			# Process filesystem (requires PSEUDOFS)
+options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	TMPFS			# TMP Memory Filesystem
+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
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=ue0
+
+#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		iomux		# IO Multiplexor
+
+device		gpio
+device		gpioled
+
+device		fsliic
+device		iic
+device		iicbus
+
+# SCSI peripherals
+device		scbus		# SCSI bus (required for SCSI)
+device		da		# Direct Access (disks)
+device		cd		# CD
+device		pass		# Passthrough device (direct SCSI access)
+
+# USB support
+#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/RADXA b/sys/arm/conf/RADXA
new file mode 100644
index 00000000000..d62f1552154
--- /dev/null
+++ b/sys/arm/conf/RADXA
@@ -0,0 +1,119 @@
+# RADXA -- Custom configuration for the RADXA ARM development
+# platform, check out http://www.radxa.com
+#
+# For more information on this file, please read 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		RADXA
+
+include		"../rockchip/std.rk30xx"
+
+makeoptions	MODULES_OVERRIDE=""
+makeoptions	WITHOUT_MODULES="ahc"
+
+options		HZ=100
+options		SCHED_4BSD		#4BSD scheduler
+options		INET			#InterNETworking
+options		INET6			#IPv6 communications protocols
+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		MSDOSFS			#MSDOS Filesystem
+options		CD9660			#ISO 9660 Filesystem
+options		PROCFS			#Process filesystem (requires PSEUDOFS)
+options		PSEUDOFS		#Pseudo-filesystem framework
+options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
+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		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options		PREEMPTION
+options		FREEBSD_BOOT_LOADER
+options		VFP		# vfp/neon
+
+# Debugging
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+options		BREAK_TO_DEBUGGER
+#options	VERBOSE_SYSINIT		#Enable verbose sysinit messages
+options		KDB
+options		DDB			#Enable the kernel debugger
+#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
+options		WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+options		DIAGNOSTIC
+
+# NFS support
+#options	NFSCL
+#options	NFSSERVER		#Network Filesystem Server
+#options	NFSCLIENT		#Network Filesystem Client
+
+# MMC/SD/SDIO card slot support
+#device		mmc			# mmc/sd bus
+#device		mmcsd			# mmc/sd flash cards
+
+# Boot device is 2nd slice on MMC/SD card
+options		ROOTDEVNAME=\"ufs:/dev/da0s2\"
+
+# Console and misc
+device		uart
+device		uart_ns8250
+device		pty
+device		snp
+device		md
+device		random			# Entropy device
+
+# I2C support
+#device		iicbus
+#device		iic
+
+# GPIO
+device		gpio
+
+device		scbus			# SCSI bus (required for SCSI)
+device		da			# Direct Access (disks)
+device		pass
+
+# USB support
+device		usb
+options		USB_DEBUG
+#options	USB_REQ_DEBUG
+#options	USB_VERBOSE
+device		dwcotg			#DWC OTG controller
+
+device		umass
+
+# Ethernet
+device		loop
+device		ether
+device		mii
+device		smscphy
+device		bpf
+
+# USB ethernet support, requires miibus
+device		miibus
+device		udav
+
+# Flattened Device Tree
+options		FDT
+options		FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=rk3188-radxa.dts
+
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 20f119840df..f0498eaac4c 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -79,6 +79,11 @@ device		mmcsd
 device		gpio
 device		gpioled
 
+# I2C
+device		iic
+device		iicbus
+device		bcm2835_bsc
+
 options 	KDB
 options 	DDB			#Enable the kernel debugger
 options 	INVARIANTS		#Enable calls of extra sanity checking
@@ -102,6 +107,10 @@ device		smcphy
 device		mii
 device		smsc
 
+# SPI
+device		spibus
+device		bcm2835_spi
+
 # Flattened Device Tree
 options         FDT
 # Note:  DTB is normally loaded and modified by RPi boot loader, then
diff --git a/sys/arm/conf/WANDBOARD-DUAL b/sys/arm/conf/WANDBOARD-DUAL
new file mode 100644
index 00000000000..75fd9165c4c
--- /dev/null
+++ b/sys/arm/conf/WANDBOARD-DUAL
@@ -0,0 +1,27 @@
+# Kernel configuration for Wandboard-Dual
+#
+# 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$
+
+include  	"WANDBOARD.common"
+ident		WANDBOARD-DUAL
+
+# Flattened Device Tree
+options  	FDT
+options  	FDT_DTB_STATIC
+makeoptions  	FDT_DTS_FILE=wandboard-dual.dts
+
diff --git a/sys/arm/conf/WANDBOARD-QUAD b/sys/arm/conf/WANDBOARD-QUAD
new file mode 100644
index 00000000000..6b5c5f88744
--- /dev/null
+++ b/sys/arm/conf/WANDBOARD-QUAD
@@ -0,0 +1,27 @@
+# Kernel configuration for Wandboard-Quad
+#
+# 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$
+
+include  	"WANDBOARD.common"
+ident		WANDBOARD-QUAD
+
+# Flattened Device Tree
+options  	FDT
+options  	FDT_DTB_STATIC
+makeoptions  	FDT_DTS_FILE=wandboard-quad.dts
+
diff --git a/sys/arm/conf/WANDBOARD-SOLO b/sys/arm/conf/WANDBOARD-SOLO
new file mode 100644
index 00000000000..bb8a0422c28
--- /dev/null
+++ b/sys/arm/conf/WANDBOARD-SOLO
@@ -0,0 +1,27 @@
+# Kernel configuration for Wandboard-Solo
+#
+# 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$
+
+include  	"WANDBOARD.common"
+ident		WANDBOARD-SOLO
+
+# Flattened Device Tree
+options  	FDT
+options  	FDT_DTB_STATIC
+makeoptions  	FDT_DTS_FILE=wandboard-solo.dts
+
diff --git a/sys/arm/conf/WANDBOARD.common b/sys/arm/conf/WANDBOARD.common
new file mode 100644
index 00000000000..c63ef85cba2
--- /dev/null
+++ b/sys/arm/conf/WANDBOARD.common
@@ -0,0 +1,155 @@
+# Kernel configuration for Wandboard
+#
+# 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$
+
+include 	"../freescale/imx/std.imx6"
+
+options  	HZ=250			# Scheduling quantum is 4 milliseconds.
+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  	MSDOSFS			# MSDOS Filesystem
+options  	CD9660			# ISO 9660 Filesystem
+#options  	PROCFS			# Process filesystem (requires PSEUDOFS)
+options  	PSEUDOFS		# Pseudo-filesystem framework
+options  	TMPFS			# TMP Memory Filesystem
+options  	GEOM_PART_GPT		# GUID Partition Tables.
+options  	GEOM_LABEL		# Provides labelization
+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
+
+# Debugging support.  Always need this:
+options  	KDB			# Enable kernel debugger support.
+# For minimum debugger support use KDB_TRACE, for interactive use DDB.
+#options  	KDB_TRACE		# Print a stack trace for a panic.
+options  	DDB			# Support DDB.
+# For full debugger support use this instead:
+#options  	GDB			# Support remote GDB.
+# Other debugging options...
+makeoptions  	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+options  	ALT_BREAK_TO_DEBUGGER	# Use <CR><tilde><ctrl-b> to enter debugger.
+#options  	DEBUG
+#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
+
+# Note that 'bpf' is required for DHCP.
+device  	bpf		# Berkeley packet filter
+
+# Pseudo devices.
+device  	loop		# Network loopback
+device  	random		# Entropy device
+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  	ether		# Ethernet support
+device  	miibus		# Required for ethernet
+
+# Serial (COM) ports
+device  	uart		# Multi-uart driver
+
+#device  	iomux		# IO Multiplexor
+
+# SCSI peripherals
+device  	scbus		# SCSI bus (required for SCSI)
+device  	da		# Direct Access (disks)
+device  	cd		# CD
+device  	pass		# Passthrough device (direct SCSI access)
+
+# USB support
+#options  	USB_DEBUG	# enable debug msgs
+options  USB_HOST_ALIGN=32	# Required for ARM, set to cache line size.
+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  	u3g		# USB modems
+
+# USB Ethernet, requires 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
+
+# NOTE: serial console will be disabled if syscons enabled
+# Uncomment following lines for framebuffer/syscons support
+# Wandboard has no video console support yet.
+#device  	sc
+#device  	kbdmux
+#options  	SC_DFLT_FONT    # compile font in
+#makeoptions  	SC_DFLT_FONT=cp437
+#device  	ukbd		# Allow keyboard like HIDs to control console
+#device  	ums
+
+# required for netbooting
+#options  	BOOTP
+#options  	BOOTP_COMPAT
+#options  	BOOTP_NFSROOT
+#options  	BOOTP_NFSV3
+#options  	BOOTP_WIRED_TO=ffec0
+
+# U-Boot stuff lives on slice 1, FreeBSD on slice 2.
+options  	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
+
+#device  	fsliic		# Freescale i2c/iic (not ready yet)
+#device  	iic		# iic protocol
+#device  	iicbus		# iic bus
+
+device  	sdhci		# SD controller
+device  	mmc		# SD/MMC protocol
+device  	mmcsd		# SDCard disk device
+
+device  	ffec		# Freescale Fast Ethernet Controller
+
diff --git a/sys/arm/econa/econa.c b/sys/arm/econa/econa.c
index 9f29a7f868e..f9492b6d822 100644
--- a/sys/arm/econa/econa.c
+++ b/sys/arm/econa/econa.c
@@ -172,7 +172,7 @@ econa_probe(device_t dev)
 {
 
 	device_set_desc(dev, "ECONA device bus");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static void
diff --git a/sys/arm/econa/econa_machdep.c b/sys/arm/econa/econa_machdep.c
index d64e826d1e7..04fd208640e 100644
--- a/sys/arm/econa/econa_machdep.c
+++ b/sys/arm/econa/econa_machdep.c
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <machine/devmap.h>
 #include <machine/vmparam.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
@@ -108,7 +109,7 @@ struct pv_addr abtstack;
 struct pv_addr kernelstack;
 
 /* Static device mappings. */
-static const struct pmap_devmap econa_devmap[] = {
+static const struct arm_devmap_entry econa_devmap[] = {
 	{
 		/*
 		 * This maps DDR SDRAM
@@ -275,7 +276,7 @@ initarm(struct arm_boot_params *abp)
 		    VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE);
 	}
 
-	pmap_devmap_bootstrap(l1pagetable, econa_devmap);
+	arm_devmap_bootstrap(l1pagetable, econa_devmap);
 	cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT);
 	setttb(kernel_l1pt.pv_pa);
 	cpu_tlb_flushID();
@@ -308,6 +309,7 @@ initarm(struct arm_boot_params *abp)
 	 * this problem will not occur after initarm().
 	 */
 	cpu_idcache_wbinv_all();
+	cpu_setup("");
 
 	/* Set stack for exception handlers */
 	data_abort_handler_address = (u_int)data_abort_handler;
diff --git a/sys/arm/econa/if_ece.c b/sys/arm/econa/if_ece.c
index cafc2f92061..faccabb383e 100644
--- a/sys/arm/econa/if_ece.c
+++ b/sys/arm/econa/if_ece.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #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>
 
 #ifdef INET
@@ -1242,7 +1243,7 @@ configure_cpu_port(struct ece_softc *sc)
 	/* SA learning Disable */
 	cpu_port_config |= (SA_LEARNING_DISABLE);
 	/* set data offset + 2 */
-	cpu_port_config &= ~(1 << 31);
+	cpu_port_config &= ~(1U << 31);
 
 	write_4(sc, CPU_PORT_CONFIG, cpu_port_config);
 
diff --git a/sys/arm/econa/timer.c b/sys/arm/econa/timer.c
index e7cca790d2d..e79a70ad0a4 100644
--- a/sys/arm/econa/timer.c
+++ b/sys/arm/econa/timer.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include "econa_reg.h"
diff --git a/sys/arm/econa/uart_bus_ec.c b/sys/arm/econa/uart_bus_ec.c
index 1a40e7f1be3..90d5b07a9a5 100644
--- a/sys/arm/econa/uart_bus_ec.c
+++ b/sys/arm/econa/uart_bus_ec.c
@@ -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 MARVELL nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/sys/arm/econa/uart_cpu_ec.c b/sys/arm/econa/uart_cpu_ec.c
index 3d42cda0f9e..a6416a2bcc6 100644
--- a/sys/arm/econa/uart_cpu_ec.c
+++ b/sys/arm/econa/uart_cpu_ec.c
@@ -12,9 +12,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 MARVELL nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/sys/arm/freescale/imx/bus_space.c b/sys/arm/freescale/imx/bus_space.c
deleted file mode 100644
index be2871ad47a..00000000000
--- a/sys/arm/freescale/imx/bus_space.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*-
- * Copyright (C) 2012, 2013 FreeBSD Foundation
- * All rights reserved.
- *
- * This software was developed by Oleksandr Tymoshenko under sponsorship
- * from the FreeBSD Foundation.
- * 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.
- * 3. Neither the name of MARVELL nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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 <machine/bus.h>
-
-/* Prototypes for all the bus_space structure functions */
-bs_protos(generic);
-bs_protos(generic_armv4);
-
-struct bus_space _base_tag = {
-	/* cookie */
-	.bs_cookie	= (void *) 0,
-
-	/* mapping/unmapping */
-	.bs_map		= generic_bs_map,
-	.bs_unmap	= generic_bs_unmap,
-	.bs_subregion	= generic_bs_subregion,
-
-	/* allocation/deallocation */
-	.bs_alloc	= generic_bs_alloc,
-	.bs_free	= generic_bs_free,
-
-	/* barrier */
-	.bs_barrier	= generic_bs_barrier,
-
-	/* read (single) */
-	.bs_r_1		= generic_bs_r_1,
-	.bs_r_2		= generic_armv4_bs_r_2,
-	.bs_r_4		= generic_bs_r_4,
-	.bs_r_8		= NULL,
-
-	/* read multiple */
-	.bs_rm_1	= generic_bs_rm_1,
-	.bs_rm_2	= generic_armv4_bs_rm_2,
-	.bs_rm_4	= generic_bs_rm_4,
-	.bs_rm_8	= NULL,
-
-	/* read region */
-	.bs_rr_1	= generic_bs_rr_1,
-	.bs_rr_2	= generic_armv4_bs_rr_2,
-	.bs_rr_4	= generic_bs_rr_4,
-	.bs_rr_8	= NULL,
-
-	/* write (single) */
-	.bs_w_1		= generic_bs_w_1,
-	.bs_w_2		= generic_armv4_bs_w_2,
-	.bs_w_4		= generic_bs_w_4,
-	.bs_w_8		= NULL,
-
-	/* write multiple */
-	.bs_wm_1	= generic_bs_wm_1,
-	.bs_wm_2	= generic_armv4_bs_wm_2,
-	.bs_wm_4	= generic_bs_wm_4,
-	.bs_wm_8	= NULL,
-
-	/* write region */
-	.bs_wr_1	= generic_bs_wr_1,
-	.bs_wr_2	= generic_armv4_bs_wr_2,
-	.bs_wr_4	= generic_bs_wr_4,
-	.bs_wr_8	= NULL,
-
-	/* read multiple stream */
-	.bs_rm_1_s 	= generic_bs_rm_1,
-	.bs_rm_2_s 	= generic_armv4_bs_rm_2,
-	.bs_rm_4_s 	= generic_bs_rm_4,
-	.bs_rm_8_s 	= NULL,
-
-	/* write multiple stream */
-	.bs_wm_1_s 	= generic_bs_wm_1,
-	.bs_wm_2_s 	= generic_armv4_bs_wm_2,
-	.bs_wm_4_s 	= generic_bs_wm_4,
-	.bs_wm_8_s 	= NULL,
-
-	/* set multiple */
-	/* XXX not implemented */
-
-	/* set region */
-	.bs_sr_1	= NULL,
-	.bs_sr_2	= generic_armv4_bs_sr_2,
-	.bs_sr_4	= generic_bs_sr_4,
-	.bs_sr_8	= NULL,
-
-	/* copy */
-	.bs_c_1		= NULL,
-	.bs_c_2		= generic_armv4_bs_c_2,
-	.bs_c_4		= NULL,
-	.bs_c_8		= NULL,
-};
-
-bus_space_tag_t fdtbus_bs_tag = &_base_tag;
diff --git a/sys/arm/freescale/imx/files.imx51 b/sys/arm/freescale/imx/files.imx51
index f4920c6b5cc..756e1b047f0 100644
--- a/sys/arm/freescale/imx/files.imx51
+++ b/sys/arm/freescale/imx/files.imx51
@@ -8,9 +8,10 @@ arm/arm/irq_dispatch.S			standard
 kern/kern_clocksource.c			standard
 
 # Init
+arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx51_machdep.c	standard
 arm/freescale/imx/common.c		standard
-arm/freescale/imx/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 
 # Dummy serial console
 #arm/freescale/imx/console.c		standard
@@ -36,7 +37,8 @@ dev/ata/chipsets/ata-fsl.c		optional imxata
 # UART driver
 dev/uart/uart_dev_imx.c			optional uart
 
-# USB join controller (1 OTG, 3 EHCI)
+# USB OH3 controller (1 OTG, 3 EHCI)
+arm/freescale/imx/imx_nop_usbphy.c	optional echi
 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 5d709ed5b82..56a58902ade 100644
--- a/sys/arm/freescale/imx/files.imx53
+++ b/sys/arm/freescale/imx/files.imx53
@@ -8,12 +8,16 @@ arm/arm/irq_dispatch.S			standard
 kern/kern_clocksource.c			standard
 
 # Init
+arm/freescale/imx/imx_machdep.c		standard
 arm/freescale/imx/imx53_machdep.c	standard
 arm/freescale/imx/common.c		standard
-arm/freescale/imx/bus_space.c		standard
+arm/arm/bus_space-v6.c			standard
 
-# Dummy serial console
-arm/freescale/imx/console.c		standard
+# Special serial console for debuging early boot code
+#arm/freescale/imx/console.c		standard
+
+# UART driver (includes serial console support)
+dev/uart/uart_dev_imx.c 		optional uart
 
 # TrustZone Interrupt Controller
 arm/freescale/imx/tzic.c		standard
@@ -33,10 +37,8 @@ arm/freescale/imx/imx51_ccm.c		standard
 # i.MX5xx PATA controller
 dev/ata/chipsets/ata-fsl.c		optional imxata
 
-# UART driver
-#dev/uart/uart_dev_imx.c			optional uart
-
-# USB join controller (1 OTG, 3 EHCI)
+# USB OH3 controller (1 OTG, 3 EHCI)
+arm/freescale/imx/imx_nop_usbphy.c	optional ehci
 dev/usb/controller/ehci_imx.c		optional ehci
 
 # Watchdog
@@ -49,3 +51,6 @@ dev/ofw/ofw_iicbus.c			optional fsliic
 # IPU - Image Processing Unit (frame buffer also)
 arm/freescale/imx/imx51_ipuv3.c		optional sc
 
+# Fast Ethernet Controller
+dev/ffec/if_ffec.c 			optional ffec
+
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
new file mode 100644
index 00000000000..cda896786ee
--- /dev/null
+++ b/sys/arm/freescale/imx/files.imx6
@@ -0,0 +1,56 @@
+# $FreeBSD$
+
+#
+# Standard ARM support.
+#
+arm/arm/bus_space_asm_generic.S		standard
+arm/arm/bus_space_generic.c		standard
+arm/arm/cpufunc_asm_arm11.S		standard
+arm/arm/cpufunc_asm_armv5.S		standard
+arm/arm/cpufunc_asm_armv7.S		standard
+arm/arm/irq_dispatch.S			standard
+kern/kern_clocksource.c			standard
+
+#
+# Standard imx6 devices and support.
+#
+arm/arm/gic.c				standard
+arm/arm/pl310.c				standard
+arm/arm/bus_space-v6.c			standard
+arm/freescale/imx/common.c		standard
+arm/freescale/imx/imx6_anatop.c		standard
+arm/freescale/imx/imx6_ccm.c		standard
+arm/freescale/imx/imx6_machdep.c	standard
+arm/freescale/imx/imx6_pl310.c		standard
+arm/freescale/imx/imx_machdep.c		standard
+arm/freescale/imx/imx_gpt.c		standard
+
+#
+# Optional devices.
+#
+arm/freescale/imx/imx_sdhci.c		optional sdhci
+
+arm/freescale/imx/imx_wdog.c		optional imxwdt
+
+dev/ffec/if_ffec.c			optional ffec
+
+dev/uart/uart_dev_imx.c			optional uart
+
+dev/usb/controller/ehci_imx.c		optional ehci
+arm/freescale/imx/imx6_usbphy.c		optional ehci
+
+#
+# Low-level serial console for debugging early kernel startup.
+#
+#arm/freescale/imx/console.c  		standard
+
+#
+# Not ready yet...
+#
+#arm/freescale/imx/imx51_iomux.c  	optional iomux
+#arm/freescale/imx/imx51_gpio.c  	optional gpio
+#dev/ata/chipsets/ata-fsl.c  		optional imxata
+#arm/freescale/imx/i2c.c  		optional fsliic
+#dev/ofw/ofw_iicbus.c  			optional fsliic
+#arm/freescale/imx/imx51_ipuv3.c  	optional sc
+
diff --git a/sys/arm/freescale/imx/imx51_ccm.c b/sys/arm/freescale/imx/imx51_ccm.c
index e8b46999dc7..86cf87ab22c 100644
--- a/sys/arm/freescale/imx/imx51_ccm.c
+++ b/sys/arm/freescale/imx/imx51_ccm.c
@@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/freescale/imx/imx51_ccmvar.h>
 #include <arm/freescale/imx/imx51_ccmreg.h>
 #include <arm/freescale/imx/imx51_dpllreg.h>
+#include <arm/freescale/imx/imx_machdep.h>
 
 #define	IMXCCMDEBUG
 #undef	IMXCCMDEBUG
@@ -278,8 +279,8 @@ imx51_get_clock(enum imx51_clock clk)
 	case IMX51CLK_MAIN_BUS_CLK:
 		freq = imx51_get_clock(IMX51CLK_MAIN_BUS_CLK_SRC);
 		cdcr = bus_read_4(ccm_softc->res[0], CCMC_CDCR);
-		return freq / (cdcr & CDCR_PERIPH_CLK_DVFS_PODF_MASK) >>
-			CDCR_PERIPH_CLK_DVFS_PODF_SHIFT;
+		return freq / (1 + ((cdcr & CDCR_PERIPH_CLK_DVFS_PODF_MASK) >>
+			CDCR_PERIPH_CLK_DVFS_PODF_SHIFT));
 	case IMX51CLK_AHB_CLK_ROOT:
 		freq = imx51_get_clock(IMX51CLK_MAIN_BUS_CLK);
 		cbcdr = bus_read_4(ccm_softc->res[0], CCMC_CBCDR);
@@ -473,3 +474,78 @@ imx51_get_clk_gating(int clk_src)
 	return ((reg >> (clk_src % CCMR_CCGR_NSOURCE) * 2) & 0x03);
 }
 
+/*
+ * Code from here down is temporary, in lieu of a SoC-independent clock API.
+ */
+
+void
+imx_ccm_usb_enable(device_t dev)
+{
+	uint32_t regval;
+
+	/*
+	 * Select PLL2 as the source for the USB clock.
+	 * The default is PLL3, but U-boot changes it to PLL2.
+	 */
+	regval = bus_read_4(ccm_softc->res[0], CCMC_CSCMR1);
+	regval &= ~CSCMR1_USBOH3_CLK_SEL_MASK;
+	regval |= 1 << CSCMR1_USBOH3_CLK_SEL_SHIFT;
+	bus_write_4(ccm_softc->res[0], CCMC_CSCMR1, regval);
+
+	/*
+	 * Set the USB clock pre-divider to div-by-5, post-divider to div-by-2.
+	 */
+	regval = bus_read_4(ccm_softc->res[0], CCMC_CSCDR1);
+	regval &= ~CSCDR1_USBOH3_CLK_PODF_MASK;
+	regval &= ~CSCDR1_USBOH3_CLK_PRED_MASK;
+	regval |= 4 << CSCDR1_USBOH3_CLK_PRED_SHIFT;
+	regval |= 1 << CSCDR1_USBOH3_CLK_PODF_SHIFT;
+	bus_write_4(ccm_softc->res[0], CCMC_CSCDR1, regval);
+
+	/*
+	 * The same two clocks gates are used on imx51 and imx53.
+	 */
+	imx51_clk_gating(CCGR_USBOH3_IPG_AHB_CLK, CCGR_CLK_MODE_ALWAYS);
+	imx51_clk_gating(CCGR_USBOH3_60M_CLK, CCGR_CLK_MODE_ALWAYS);
+}
+
+void
+imx_ccm_usbphy_enable(device_t dev)
+{
+	uint32_t regval;
+
+	/*
+	 * Select PLL3 as the source for the USBPHY clock.  U-boot does this 
+	 * only for imx53, but the bit exists on imx51.  That seems a bit
+	 * strange, but we'll go with it until more is known.
+	 */
+	if (imx_soc_type() == IMXSOC_53) {
+		regval = bus_read_4(ccm_softc->res[0], CCMC_CSCMR1);
+		regval |= 1 << CSCMR1_USBPHY_CLK_SEL_SHIFT;
+		bus_write_4(ccm_softc->res[0], CCMC_CSCMR1, regval);
+	}
+
+	/*
+	 * For the imx51 there's just one phy gate control, enable it.
+	 */
+	if (imx_soc_type() == IMXSOC_51) {
+		imx51_clk_gating(CCGR_USB_PHY_CLK, CCGR_CLK_MODE_ALWAYS);
+		return;
+	}
+
+	/*
+	 * For imx53 we don't have a full set of clock defines yet, but the
+	 * datasheet says:
+	 *   gate reg 4, bits 13-12 usb ph2 clock (usb_phy2_clk_enable)
+	 *   gate reg 4, bits 11-10 usb ph1 clock (usb_phy1_clk_enable)
+	 *
+	 * We should use the fdt data for the device to figure out which of
+	 * the two we're working on, but for now just turn them both on.
+	 */
+	if (imx_soc_type() == IMXSOC_53) {
+		imx51_clk_gating(__CCGR_NUM(4, 5), CCGR_CLK_MODE_ALWAYS);
+		imx51_clk_gating(__CCGR_NUM(4, 6), CCGR_CLK_MODE_ALWAYS);
+		return;
+	}
+}
+
diff --git a/sys/arm/freescale/imx/imx51_ccmreg.h b/sys/arm/freescale/imx/imx51_ccmreg.h
index df0ed5badbf..61b9fa2cb56 100644
--- a/sys/arm/freescale/imx/imx51_ccmreg.h
+++ b/sys/arm/freescale/imx/imx51_ccmreg.h
@@ -114,12 +114,20 @@
 #define	CCMC_CSCMR1	0x001c
 #define		CSCMR1_UART_CLK_SEL_SHIFT	24
 #define		CSCMR1_UART_CLK_SEL_MASK	0x03000000
+#define		CSCMR1_USBPHY_CLK_SEL_SHIFT	26
+#define		CSCMR1_USBPHY_CLK_SEL_MASK	0x04000000
+#define		CSCMR1_USBOH3_CLK_SEL_SHIFT	22
+#define		CSCMR1_USBOH3_CLK_SEL_MASK	0x00c00000
 #define	CCMC_CSCMR2	0x0020
 #define	CCMC_CSCDR1	0x0024
 #define		CSCDR1_UART_CLK_PRED_SHIFT	3
 #define		CSCDR1_UART_CLK_PRED_MASK	0x00000038
 #define		CSCDR1_UART_CLK_PODF_SHIFT	0
 #define		CSCDR1_UART_CLK_PODF_MASK	0x00000007
+#define		CSCDR1_USBOH3_CLK_PRED_SHIFT	8
+#define		CSCDR1_USBOH3_CLK_PRED_MASK	0x00000700
+#define		CSCDR1_USBOH3_CLK_PODF_SHIFT	6
+#define		CSCDR1_USBOH3_CLK_PODF_MASK	0x000000c0
 #define	CCMC_CS1CDR	0x0028
 #define	CCMC_CS2CDR	0x002c
 #define	CCMC_CDCDR	0x0030
diff --git a/sys/arm/freescale/imx/imx51_ipuv3.c b/sys/arm/freescale/imx/imx51_ipuv3.c
index 18e7dced990..e2b05aab339 100644
--- a/sys/arm/freescale/imx/imx51_ipuv3.c
+++ b/sys/arm/freescale/imx/imx51_ipuv3.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/freescale/imx/imx51_machdep.c b/sys/arm/freescale/imx/imx51_machdep.c
index 640fe6fb1b4..53a722ada30 100644
--- a/sys/arm/freescale/imx/imx51_machdep.c
+++ b/sys/arm/freescale/imx/imx51_machdep.c
@@ -1,14 +1,7 @@
 /*-
- * Copyright (c) 1994-1998 Mark Brinicombe.
- * Copyright (c) 1994 Brini.
- * Copyright (c) 2012, 2013 The FreeBSD Foundation
+ * Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
  * All rights reserved.
  *
- *
- * This code is derived from software written for Brini by Mark Brinicombe
- * 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:
@@ -17,26 +10,18 @@
  * 2. Redistributions in binary form must 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)
+ * 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.
- *
- * from: FreeBSD: //depot/projects/arm/src/sys/arm/at91/kb920x_machdep.c, rev 45
  */
 
 #include "opt_platform.h"
@@ -44,40 +29,35 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/reboot.h>
 
 #include <vm/vm.h>
-#include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 
-#include <dev/fdt/fdt_common.h>
+#include <arm/freescale/imx/imx_machdep.h>
 
-#define	IMX51_DEV_VIRT_BASE	0xe0000000
 vm_offset_t
 initarm_lastaddr(void)
 {
 
-	boothowto |= RB_VERBOSE|RB_MULTIPLE;
-	bootverbose = 1;
-
-	if (fdt_immr_addr(IMX51_DEV_VIRT_BASE) != 0)
-		while (1);
-
-	/* Platform-specific initialisation */
-	return (fdt_immr_va - ARM_NOCACHE_KVA_SIZE);
+	return (arm_devmap_lastaddr());
+}
+
+void
+initarm_early_init(void)
+{
+
+	/* XXX - Get rid of this stuff soon. */
+	boothowto |= RB_VERBOSE|RB_MULTIPLE;
+	bootverbose = 1;
 }
 
-/*
- * Set initial values of GPIO output ports
- */
 void
 initarm_gpio_init(void)
 {
@@ -90,42 +70,20 @@ initarm_late_init(void)
 
 }
 
-#define FDT_DEVMAP_MAX	2
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
-	{ 0, 0, 0, 0, 0, },
-	{ 0, 0, 0, 0, 0, }
-};
-
 /*
- * Construct pmap_devmap[] with DT-derived config data.
+ * Set up static device mappings.  This is hand-optimized platform-specific
+ * config data which covers most of the common on-chip devices with a few 1MB
+ * section mappings.
+ *
+ * Notably missing are entries for GPU, IPU, in general anything video related.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 
-	/*
-	 * Map segment where UART1 and UART2 located.
-	 */
-	fdt_devmap[0].pd_va = IMX51_DEV_VIRT_BASE + 0x03f00000;
-	fdt_devmap[0].pd_pa = 0x73f00000;
-	fdt_devmap[0].pd_size = 0x00100000;
-	fdt_devmap[0].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
-	fdt_devmap[0].pd_cache = PTE_NOCACHE;
-
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
-	return (0);
-}
-
-struct arm32_dma_range *
-bus_dma_get_range(void)
-{
-
-	return (NULL);
-}
-
-int
-bus_dma_get_range_nb(void)
-{
+	arm_devmap_add_entry(0x70000000, 0x00100000);
+	arm_devmap_add_entry(0x73f00000, 0x00100000);
+	arm_devmap_add_entry(0x83f00000, 0x00100000);
 
 	return (0);
 }
@@ -134,9 +92,11 @@ void
 cpu_reset(void)
 {
 
-	printf("Reset ...\n");
-	/* Clear n_reset flag */
-	*((volatile u_int16_t *)(IMX51_DEV_VIRT_BASE + 0x03f98000)) =
-	    (u_int16_t)0;
-	while (1);
+	imx_wdog_cpu_reset(0x73F98000);
 }
+
+u_int imx_soc_type()
+{
+	return (IMXSOC_51);
+}
+
diff --git a/sys/arm/freescale/imx/imx53_machdep.c b/sys/arm/freescale/imx/imx53_machdep.c
index 0c0a1a63a1a..50d8d5240ba 100644
--- a/sys/arm/freescale/imx/imx53_machdep.c
+++ b/sys/arm/freescale/imx/imx53_machdep.c
@@ -1,13 +1,7 @@
 /*-
- * Copyright (c) 1994-1998 Mark Brinicombe.
- * Copyright (c) 1994 Brini.
- * Copyright (c) 2012, 2013 The FreeBSD Foundation
+ * Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
  * All rights reserved.
  *
- * This code is derived from software written for Brini by Mark Brinicombe
- * 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:
@@ -16,20 +10,14 @@
  * 2. Redistributions in binary form must 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)
+ * 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
@@ -41,41 +29,34 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#define _ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/reboot.h>
 
 #include <vm/vm.h>
-#include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
-
-#include <dev/fdt/fdt_common.h>
-
-#define	IMX53_DEV_VIRT_BASE	0xe0000000
+#include <arm/freescale/imx/imx_machdep.h>
 
 vm_offset_t
 initarm_lastaddr(void)
 {
 
-	boothowto |= RB_VERBOSE|RB_MULTIPLE;
-	bootverbose = 1;
-
-	if (fdt_immr_addr(IMX53_DEV_VIRT_BASE) != 0)
-		while (1);
-
-	/* Platform-specific initialisation */
-	return (fdt_immr_va - ARM_NOCACHE_KVA_SIZE);
+	return (arm_devmap_lastaddr());
+}
+
+void
+initarm_early_init(void)
+{
+
+	/* XXX - Get rid of this stuff soon. */
+	boothowto |= RB_VERBOSE|RB_MULTIPLE;
+	bootverbose = 1;
 }
 
-/*
- * Set initial values of GPIO output ports
- */
 void
 initarm_gpio_init(void)
 {
@@ -88,43 +69,20 @@ initarm_late_init(void)
 
 }
 
-#define FDT_DEVMAP_MAX	2
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
-	{ 0, 0, 0, 0, 0, },
-	{ 0, 0, 0, 0, 0, }
-};
-
 /*
- * Construct pmap_devmap[] with DT-derived config data.
+ * Set up static device mappings.  This is hand-optimized platform-specific
+ * config data which covers most of the common on-chip devices with a few 1MB
+ * section mappings.
+ *
+ * Notably missing are entries for GPU, IPU, in general anything video related.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 
-	/*
-	 * Map segment where UART1 and UART2 located.
-	 */
-	fdt_devmap[0].pd_va = IMX53_DEV_VIRT_BASE + 0x03f00000;
-	fdt_devmap[0].pd_pa = 0x53f00000;
-	fdt_devmap[0].pd_size = 0x00100000;
-	fdt_devmap[0].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
-	fdt_devmap[0].pd_cache = PTE_NOCACHE;
-
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
-
-	return (0);
-}
-
-struct arm32_dma_range *
-bus_dma_get_range(void)
-{
-
-	return (NULL);
-}
-
-int
-bus_dma_get_range_nb(void)
-{
+	arm_devmap_add_entry(0x50000000, 0x00100000);
+	arm_devmap_add_entry(0x53f00000, 0x00100000);
+	arm_devmap_add_entry(0x63f00000, 0x00100000);
 
 	return (0);
 }
@@ -133,9 +91,12 @@ void
 cpu_reset(void)
 {
 
-	printf("Reset ...\n");
-	/* Clear n_reset flag */
-	*((volatile u_int16_t *)(IMX53_DEV_VIRT_BASE + 0x03f98000)) =
-	    (u_int16_t)0;
-	while (1);
+	imx_wdog_cpu_reset(0x53F98000);
 }
+
+u_int imx_soc_type()
+{
+	return (IMXSOC_53);
+}
+
+
diff --git a/sys/arm/freescale/imx/imx6_anatop.c b/sys/arm/freescale/imx/imx6_anatop.c
new file mode 100644
index 00000000000..d50bab2bef0
--- /dev/null
+++ b/sys/arm/freescale/imx/imx6_anatop.c
@@ -0,0 +1,155 @@
+/*-
+ * Copyright (c) 2013 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Analog PLL and power regulator driver for Freescale i.MX6 family of SoCs.
+ *
+ * We don't really do anything with analog PLLs, but the registers for
+ * controlling them belong to the same block as the power regulator registers.
+ * Since the newbus hierarchy makes it hard for anyone other than us to get at
+ * them, we just export a couple public functions to allow the imx6 CCM clock
+ * driver to read and write those registers.
+ *
+ * We also don't do anything about power regulation yet, but when the need
+ * arises, this would be the place for that code to live.
+ *
+ * I have no idea where the "anatop" name comes from.  It's in the standard DTS
+ * source describing i.MX6 SoCs, and in the linux and u-boot code which comes
+ * from Freescale, but it's not in the SoC manual.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <machine/bus.h>
+
+#include <arm/freescale/imx/imx6_anatopreg.h>
+#include <arm/freescale/imx/imx6_anatopvar.h>
+
+struct imx6_anatop_softc {
+	device_t	dev;
+	struct resource	*mem_res;
+};
+
+static struct imx6_anatop_softc *imx6_anatop_sc;
+
+uint32_t
+imx6_anatop_read_4(bus_size_t offset)
+{
+
+	return (bus_read_4(imx6_anatop_sc->mem_res, offset));
+}
+
+void
+imx6_anatop_write_4(bus_size_t offset, uint32_t value)
+{
+
+	bus_write_4(imx6_anatop_sc->mem_res, offset, value);
+}
+
+static int
+imx6_anatop_detach(device_t dev)
+{
+	struct imx6_anatop_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	if (sc->mem_res != NULL)
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
+
+	return (0);
+}
+
+static int
+imx6_anatop_attach(device_t dev)
+{
+	struct imx6_anatop_softc *sc;
+	int err, rid;
+
+	sc = device_get_softc(dev);
+
+	/* Allocate bus_space resources. */
+	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");
+		err = ENXIO;
+		goto out;
+	}
+
+	imx6_anatop_sc = sc;
+	err = 0;
+
+out:
+
+	if (err != 0)
+		imx6_anatop_detach(dev);
+
+	return (err);
+}
+
+static int
+imx6_anatop_probe(device_t dev)
+{
+
+        if (ofw_bus_is_compatible(dev, "fsl,imx6q-anatop") == 0)
+		return (ENXIO);
+
+	device_set_desc(dev, "Freescale i.MX6 Analog PLLs and Power");
+
+	return (BUS_PROBE_DEFAULT);
+}
+
+static device_method_t imx6_anatop_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,  imx6_anatop_probe),
+	DEVMETHOD(device_attach, imx6_anatop_attach),
+	DEVMETHOD(device_detach, imx6_anatop_detach),
+
+	DEVMETHOD_END
+};
+
+static driver_t imx6_anatop_driver = {
+	"imx6_anatop",
+	imx6_anatop_methods,
+	sizeof(struct imx6_anatop_softc)
+};
+
+static devclass_t imx6_anatop_devclass;
+
+DRIVER_MODULE(imx6_anatop, simplebus, imx6_anatop_driver, imx6_anatop_devclass, 0, 0);
+
diff --git a/sys/arm/freescale/imx/imx6_anatopreg.h b/sys/arm/freescale/imx/imx6_anatopreg.h
new file mode 100644
index 00000000000..bcff8080e48
--- /dev/null
+++ b/sys/arm/freescale/imx/imx6_anatopreg.h
@@ -0,0 +1,141 @@
+/*-
+ * Copyright (c) 2013 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$
+ */
+
+#ifndef	IMX6_ANATOPREG_H
+#define	IMX6_ANATOPREG_H
+
+#define	IMX6_ANALOG_CCM_PLL_ARM				0x000
+#define	IMX6_ANALOG_CCM_PLL_ARM_SET			0x004
+#define	IMX6_ANALOG_CCM_PLL_ARM_CLR			0x008
+#define	IMX6_ANALOG_CCM_PLL_ARM_TOG			0x00C
+#define	IMX6_ANALOG_CCM_PLL_USB1			0x010
+#define	IMX6_ANALOG_CCM_PLL_USB1_SET			0x014
+#define	IMX6_ANALOG_CCM_PLL_USB1_CLR			0x018
+#define	IMX6_ANALOG_CCM_PLL_USB1_TOG			0x01C
+#define	   IMX6_ANALOG_CCM_PLL_USB_LOCK			  (1U << 31)
+#define	   IMX6_ANALOG_CCM_PLL_USB_BYPASS		  (1 << 16)
+#define	   IMX6_ANALOG_CCM_PLL_USB_ENABLE		  (1 << 13)
+#define	   IMX6_ANALOG_CCM_PLL_USB_POWER		  (1 << 12)
+#define	   IMX6_ANALOG_CCM_PLL_USB_EN_USB_CLKS		  (1 <<  6)
+#define	IMX6_ANALOG_CCM_PLL_USB2			0x020
+#define	IMX6_ANALOG_CCM_PLL_USB2_SET			0x024
+#define	IMX6_ANALOG_CCM_PLL_USB2_CLR			0x028
+#define	IMX6_ANALOG_CCM_PLL_USB2_TOG			0x02C
+#define	IMX6_ANALOG_CCM_PLL_SYS				0x030
+#define	IMX6_ANALOG_CCM_PLL_SYS_SET			0x034
+#define	IMX6_ANALOG_CCM_PLL_SYS_CLR			0x038
+#define	IMX6_ANALOG_CCM_PLL_SYS_TOG			0x03C
+#define	IMX6_ANALOG_CCM_PLL_SYS_SS			0x040
+#define	IMX6_ANALOG_CCM_PLL_SYS_NUM			0x050
+#define	IMX6_ANALOG_CCM_PLL_SYS_DENOM			0x060
+#define	IMX6_ANALOG_CCM_PLL_AUDIO			0x070
+#define	IMX6_ANALOG_CCM_PLL_AUDIO_SET			0x074
+#define	IMX6_ANALOG_CCM_PLL_AUDIO_CLR			0x078
+#define	IMX6_ANALOG_CCM_PLL_AUDIO_TOG			0x07C
+#define	IMX6_ANALOG_CCM_PLL_AUDIO_NUM			0x080
+#define	IMX6_ANALOG_CCM_PLL_AUDIO_DENOM			0x090
+#define	IMX6_ANALOG_CCM_PLL_VIDEO			0x0A0
+#define	IMX6_ANALOG_CCM_PLL_VIDEO_SET			0x0A4
+#define	IMX6_ANALOG_CCM_PLL_VIDEO_CLR			0x0A8
+#define	IMX6_ANALOG_CCM_PLL_VIDEO_TOG			0x0AC
+#define	IMX6_ANALOG_CCM_PLL_VIDEO_NUM			0x0B0
+#define	IMX6_ANALOG_CCM_PLL_VIDEO_DENOM			0x0C0
+#define	IMX6_ANALOG_CCM_PLL_MLB				0x0D0
+#define	IMX6_ANALOG_CCM_PLL_MLB_SET			0x0D4
+#define	IMX6_ANALOG_CCM_PLL_MLB_CLR			0x0D8
+#define	IMX6_ANALOG_CCM_PLL_MLB_TOG			0x0DC
+#define	IMX6_ANALOG_CCM_PLL_ENET			0x0E0
+#define	IMX6_ANALOG_CCM_PLL_ENET_SET			0x0E4
+#define	IMX6_ANALOG_CCM_PLL_ENET_CLR			0x0E8
+#define	IMX6_ANALOG_CCM_PLL_ENET_TOG			0x0EC
+#define	IMX6_ANALOG_CCM_PFD_480				0x0F0
+#define	IMX6_ANALOG_CCM_PFD_480_SET			0x0F4
+#define	IMX6_ANALOG_CCM_PFD_480_CLR			0x0F8
+#define	IMX6_ANALOG_CCM_PFD_480_TOG			0x0FC
+#define	IMX6_ANALOG_CCM_PFD_528				0x100
+#define	IMX6_ANALOG_CCM_PFD_528_SET			0x104
+#define	IMX6_ANALOG_CCM_PFD_528_CLR			0x108
+#define	IMX6_ANALOG_CCM_PFD_528_TOG			0x10C
+#define	IMX6_ANALOG_PMU_REG_CORE			0x140
+#define	  IMX6_ANALOG_PMU_REG2_TARG_SHIFT		  18
+#define	  IMX6_ANALOG_PMU_REG2_TARG_MASK		   \
+    (0x1f << IMX6_ANALOG_PMU_REG2_TARG_SHIFT)
+#define	  IMX6_ANALOG_PMU_REG1_TARG_SHIFT		   9
+#define	  IMX6_ANALOG_PMU_REG1_TARG_MASK		   \
+    (0x1f << IMX6_ANALOG_PMU_REG1_TARG_SHIFT)
+#define	  IMX6_ANALOG_PMU_REG0_TARG_SHIFT		   0
+#define	  IMX6_ANALOG_PMU_REG0_TARG_MASK		   \
+    (0x1f << IMX6_ANALOG_PMU_REG0_TARG_SHIFT)
+
+#define	IMX6_ANALOG_CCM_MISC0				0x150
+#define	IMX6_ANALOG_CCM_MISC0_SET			0x154
+#define	IMX6_ANALOG_CCM_MISC0_CLR			0x158
+#define	IMX6_ANALOG_CCM_MISC0_TOG			0x15C
+#define	IMX6_ANALOG_CCM_MISC2				0x170
+#define	IMX6_ANALOG_CCM_MISC2_SET			0x174
+#define	IMX6_ANALOG_CCM_MISC2_CLR			0x178
+#define	IMX6_ANALOG_CCM_MISC2_TOG			0x17C
+
+#define	IMX6_ANALOG_USB1_VBUS_DETECT			0x1A0
+#define	IMX6_ANALOG_USB1_VBUS_DETECT_SET		0x1A4
+#define	IMX6_ANALOG_USB1_VBUS_DETECT_CLR		0x1A8
+#define	IMX6_ANALOG_USB1_VBUS_DETECT_TOG		0x1AC
+#define	IMX6_ANALOG_USB1_CHRG_DETECT			0x1B0
+#define	IMX6_ANALOG_USB1_CHRG_DETECT_SET		0x1B4
+#define	IMX6_ANALOG_USB1_CHRG_DETECT_CLR		0x1B8
+#define	IMX6_ANALOG_USB1_CHRG_DETECT_TOG		0x1BC
+#define	  IMX6_ANALOG_USB_CHRG_DETECT_N_ENABLE		  (1 << 20) /* EN_B */
+#define	  IMX6_ANALOG_USB_CHRG_DETECT_N_CHK_CHRG	  (1 << 19) /* CHK_CHRG_B */
+#define	  IMX6_ANALOG_USB_CHRG_DETECT_CHK_CONTACT	  (1 << 18)
+#define	IMX6_ANALOG_USB1_VBUS_DETECT_STAT		0x1C0
+#define	IMX6_ANALOG_USB1_CHRG_DETECT_STAT		0x1D0
+#define	IMX6_ANALOG_USB1_MISC				0x1F0
+#define	IMX6_ANALOG_USB1_MISC_SET			0x1F4
+#define	IMX6_ANALOG_USB1_MISC_CLR			0x1F8
+#define	IMX6_ANALOG_USB1_MISC_TOG			0x1FC
+#define	IMX6_ANALOG_USB2_VBUS_DETECT			0x200
+#define	IMX6_ANALOG_USB2_VBUS_DETECT_SET		0x204
+#define	IMX6_ANALOG_USB2_VBUS_DETECT_CLR		0x208
+#define	IMX6_ANALOG_USB2_VBUS_DETECT_TOG		0x20C
+#define	IMX6_ANALOG_USB2_CHRG_DETECT			0x210
+#define	IMX6_ANALOG_USB2_CHRG_DETECT_SET		0x214
+#define	IMX6_ANALOG_USB2_CHRG_DETECT_CLR		0x218
+#define	IMX6_ANALOG_USB2_CHRG_DETECT_TOG		0x21C
+#define	IMX6_ANALOG_USB2_VBUS_DETECT_STAT		0x220
+#define	IMX6_ANALOG_USB2_CHRG_DETECT_STAT		0x230
+#define	IMX6_ANALOG_USB2_MISC				0x250
+#define	IMX6_ANALOG_USB2_MISC_SET			0x254
+#define	IMX6_ANALOG_USB2_MISC_CLR			0x258
+#define	IMX6_ANALOG_USB2_MISC_TOG			0x25C
+#define	IMX6_ANALOG_DIGPROG				0x260
+#define	IMX6_ANALOG_DIGPROG_SL				0x280
+#define	  IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT		  16
+#define	  IMX6_ANALOG_DIGPROG_SOCTYPE_MASK		  \
+    (0xff << IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT)
+
+#endif
diff --git a/sys/arm/freescale/imx/imx6_anatopvar.h b/sys/arm/freescale/imx/imx6_anatopvar.h
new file mode 100644
index 00000000000..1974089dee8
--- /dev/null
+++ b/sys/arm/freescale/imx/imx6_anatopvar.h
@@ -0,0 +1,43 @@
+/*-
+ * Copyright (c) 2013 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$
+ */
+
+#ifndef	IMX6_ANATOPVAR_H
+#define	IMX6_ANATOPVAR_H
+
+/*
+ * All registers controlling various analog aspects of the SoC (such as PLLs or
+ * voltage regulators or USB VBUS detection) are gathered together under the
+ * anatop device (because of newbus hierarchical resource management), but other
+ * drivers such as CMM or USBPHY need access to these registers.  These
+ * functions let them have at the hardware directly.  No effort is made by these
+ * functions to mediate concurrent access.
+ */
+uint32_t imx6_anatop_read_4(bus_size_t _offset);
+void imx6_anatop_write_4(bus_size_t _offset, uint32_t _value);
+
+#endif
diff --git a/sys/arm/freescale/imx/imx6_ccm.c b/sys/arm/freescale/imx/imx6_ccm.c
new file mode 100644
index 00000000000..0f1c610d0ae
--- /dev/null
+++ b/sys/arm/freescale/imx/imx6_ccm.c
@@ -0,0 +1,225 @@
+/*-
+ * Copyright (c) 2013 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Clocks and power control driver for Freescale i.MX6 family of SoCs.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <machine/bus.h>
+
+#include <arm/freescale/imx/imx6_anatopreg.h>
+#include <arm/freescale/imx/imx6_anatopvar.h>
+#include <arm/freescale/imx/imx_machdep.h>
+#include <arm/freescale/imx/imx6_ccmreg.h>
+
+
+/* XXX temp kludge for imx51_get_clock. */
+#include <arm/freescale/imx/imx51_ccmvar.h>
+#include <arm/freescale/imx/imx51_ccmreg.h>
+
+struct ccm_softc {
+	device_t	dev;
+	struct resource	*mem_res;
+};
+
+static struct ccm_softc *ccm_sc;
+
+static inline uint32_t
+RD4(struct ccm_softc *sc, bus_size_t off)
+{
+
+	return (bus_read_4(sc->mem_res, off));
+}
+
+static inline void
+WR4(struct ccm_softc *sc, bus_size_t off, uint32_t val)
+{
+
+	bus_write_4(sc->mem_res, off, val);
+}
+
+static int
+ccm_detach(device_t dev)
+{
+	struct ccm_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	if (sc->mem_res != NULL)
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
+
+	return (0);
+}
+
+static int
+ccm_attach(device_t dev)
+{
+	struct ccm_softc *sc;
+	int err, rid;
+
+	sc = device_get_softc(dev);
+	err = 0;
+
+	/* Allocate bus_space resources. */
+	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");
+		err = ENXIO;
+		goto out;
+	}
+
+	ccm_sc = sc;
+	err = 0;
+
+out:
+
+	if (err != 0)
+		ccm_detach(dev);
+
+	return (err);
+}
+
+static int
+ccm_probe(device_t dev)
+{
+
+        if (ofw_bus_is_compatible(dev, "fsl,imx6q-ccm") == 0)
+		return (ENXIO);
+
+	device_set_desc(dev, "Freescale i.MX6 Clock Control Module");
+
+	return (BUS_PROBE_DEFAULT);
+}
+
+void
+imx_ccm_usb_enable(device_t _usbdev)
+{
+
+	/*
+	 * For imx6, the USBOH3 clock gate is bits 0-1 of CCGR6, so no need for
+	 * shifting and masking here, just set the low-order two bits to ALWAYS.
+	 */
+	WR4(ccm_sc, CCM_CCGR6, RD4(ccm_sc, CCM_CCGR6) | CCGR_CLK_MODE_ALWAYS);
+}
+
+void
+imx_ccm_usbphy_enable(device_t _phydev)
+{
+        /*
+         * XXX Which unit?
+         * Right now it's not clear how to figure from fdt data which phy unit
+         * we're supposed to operate on.  Until this is worked out, just enable
+         * both PHYs.
+         */
+#if 0
+	int phy_num, regoff;
+
+	phy_num = 0; /* XXX */
+
+	switch (phy_num) {
+	case 0:
+		regoff = 0;
+		break;
+	case 1:
+		regoff = 0x10;
+		break;
+	default:
+		device_printf(ccm_sc->dev, "Bad PHY number %u,\n", 
+		    phy_num);
+		return;
+	}
+
+	imx6_anatop_write_4(IMX6_ANALOG_CCM_PLL_USB1 + regoff, 
+	    IMX6_ANALOG_CCM_PLL_USB_ENABLE | 
+	    IMX6_ANALOG_CCM_PLL_USB_POWER |
+	    IMX6_ANALOG_CCM_PLL_USB_EN_USB_CLKS);
+#else
+	imx6_anatop_write_4(IMX6_ANALOG_CCM_PLL_USB1 + 0,
+	    IMX6_ANALOG_CCM_PLL_USB_ENABLE | 
+	    IMX6_ANALOG_CCM_PLL_USB_POWER |
+	    IMX6_ANALOG_CCM_PLL_USB_EN_USB_CLKS);
+
+	imx6_anatop_write_4(IMX6_ANALOG_CCM_PLL_USB1 + 0x10, 
+	    IMX6_ANALOG_CCM_PLL_USB_ENABLE | 
+	    IMX6_ANALOG_CCM_PLL_USB_POWER |
+	    IMX6_ANALOG_CCM_PLL_USB_EN_USB_CLKS);
+#endif
+}
+
+
+
+
+
+// XXX Fix this.  This has to be here for other code to link,
+// but it doesn't have to return anything useful for imx6 right now.
+u_int
+imx51_get_clock(enum imx51_clock clk)
+{
+	switch (clk)
+	{
+	case IMX51CLK_IPG_CLK_ROOT:
+		return 66000000;
+	default:
+		printf("imx51_get_clock() on imx6 doesn't know about clock %d\n", clk);
+		break;
+	}
+	return 0;
+}
+
+static device_method_t ccm_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,  ccm_probe),
+	DEVMETHOD(device_attach, ccm_attach),
+	DEVMETHOD(device_detach, ccm_detach),
+
+	DEVMETHOD_END
+};
+
+static driver_t ccm_driver = {
+	"ccm",
+	ccm_methods,
+	sizeof(struct ccm_softc)
+};
+
+static devclass_t ccm_devclass;
+
+DRIVER_MODULE(ccm, simplebus, ccm_driver, ccm_devclass, 0, 0);
+
diff --git a/sys/arm/freescale/imx/imx6_ccmreg.h b/sys/arm/freescale/imx/imx6_ccmreg.h
new file mode 100644
index 00000000000..3c651dceec4
--- /dev/null
+++ b/sys/arm/freescale/imx/imx6_ccmreg.h
@@ -0,0 +1,41 @@
+/*-
+ * Copyright (c) 2013 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$
+ */
+
+#ifndef	IMX6_CCMREG_H
+#define	IMX6_CCMREG_H
+
+#define	CCM_CCGR1		0x06C
+#define	CCM_CCGR2		0x070
+#define	CCM_CCGR3		0x074
+#define	CCM_CCGR4		0x078
+#define	CCM_CCGR5		0x07C
+#define	CCM_CCGR6		0x080
+#define	CCM_CMEOR		0x088
+                  
+
+#endif
diff --git a/sys/arm/freescale/imx/imx6_machdep.c b/sys/arm/freescale/imx/imx6_machdep.c
new file mode 100644
index 00000000000..9f738a5c054
--- /dev/null
+++ b/sys/arm/freescale/imx/imx6_machdep.c
@@ -0,0 +1,192 @@
+/*-
+ * Copyright (c) 2013 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.
+ */
+
+#include "opt_platform.h"
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/reboot.h>
+
+#include <vm/vm.h>
+
+#include <machine/bus.h>
+#include <machine/devmap.h>
+#include <machine/machdep.h>
+
+#include <arm/freescale/imx/imx6_anatopreg.h>
+#include <arm/freescale/imx/imx6_anatopvar.h>
+#include <arm/freescale/imx/imx_machdep.h>
+
+vm_offset_t
+initarm_lastaddr(void)
+{
+
+	return (arm_devmap_lastaddr());
+}
+
+void
+initarm_early_init(void)
+{
+
+	/* XXX - Get rid of this stuff soon. */
+	boothowto |= RB_VERBOSE|RB_MULTIPLE;
+	bootverbose = 1;
+}
+
+void
+initarm_gpio_init(void)
+{
+
+}
+
+void
+initarm_late_init(void)
+{
+
+}
+
+/*
+ * Set up static device mappings.
+ *
+ * This attempts to cover the most-used devices with 1MB section mappings, which
+ * is good for performance (uses fewer TLB entries for device access).
+ *
+ * ARMMP covers the interrupt controller, MPCore timers, global timer, and the
+ * L2 cache controller.  Most of the 1MB range is unused reserved space.
+ *
+ * AIPS1/AIPS2 cover most of the on-chip devices such as uart, spi, i2c, etc.
+ *
+ * Notably not mapped right now are HDMI, GPU, and other devices below ARMMP in
+ * the memory map.  When we get support for graphics it might make sense to
+ * static map some of that area.  Be careful with other things in that area such
+ * as OCRAM that probably shouldn't be mapped as PTE_DEVICE memory.
+ */
+int
+initarm_devmap_init(void)
+{
+	const uint32_t IMX6_ARMMP_PHYS = 0x00a00000;
+	const uint32_t IMX6_ARMMP_SIZE = 0x00100000;
+	const uint32_t IMX6_AIPS1_PHYS = 0x02000000;
+	const uint32_t IMX6_AIPS1_SIZE = 0x00100000;
+	const uint32_t IMX6_AIPS2_PHYS = 0x02100000;
+	const uint32_t IMX6_AIPS2_SIZE = 0x00100000;
+
+	arm_devmap_add_entry(IMX6_ARMMP_PHYS, IMX6_ARMMP_SIZE);
+	arm_devmap_add_entry(IMX6_AIPS1_PHYS, IMX6_AIPS1_SIZE);
+	arm_devmap_add_entry(IMX6_AIPS2_PHYS, IMX6_AIPS2_SIZE);
+
+	return (0);
+}
+
+void
+cpu_reset(void)
+{
+	const uint32_t IMX6_WDOG_CR_PHYS = 0x020bc000;
+
+	imx_wdog_cpu_reset(IMX6_WDOG_CR_PHYS);
+}
+
+/*
+ * Determine what flavor of imx6 we're running on.
+ *
+ * This code is based on the way u-boot does it.  Information found on the web
+ * indicates that Freescale themselves were the original source of this logic,
+ * including the strange check for number of CPUs in the SCU configuration
+ * register, which is apparently needed on some revisions of the SOLO.
+ *
+ * According to the documentation, there is such a thing as an i.MX6 Dual
+ * (non-lite flavor).  However, Freescale doesn't seem to have assigned it a
+ * number or provided any logic to handle it in their detection code.
+ *
+ * Note that the ANALOG_DIGPROG and SCU configuration registers are not
+ * documented in the chip reference manual.  (SCU configuration is mentioned,
+ * but not mapped out in detail.)  I think the bottom two bits of the scu config
+ * register may be ncpu-1.
+ *
+ * This hasn't been tested yet on a dual[-lite].
+ *
+ * On a solo:
+ *      digprog    = 0x00610001
+ *      hwsoc      = 0x00000062
+ *      scu config = 0x00000500
+ * On a quad:
+ *      digprog    = 0x00630002
+ *      hwsoc      = 0x00000063
+ *      scu config = 0x00005503
+ */
+u_int imx_soc_type()
+{
+	uint32_t digprog, hwsoc;
+	uint32_t *pcr;
+	const vm_offset_t SCU_CONFIG_PHYSADDR = 0x00a00004;
+#define	HWSOC_MX6SL	0x60
+#define	HWSOC_MX6DL	0x61
+#define	HWSOC_MX6SOLO	0x62
+#define	HWSOC_MX6Q	0x63
+
+	digprog = imx6_anatop_read_4(IMX6_ANALOG_DIGPROG_SL);
+	hwsoc = (digprog >> IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT) & 
+	    IMX6_ANALOG_DIGPROG_SOCTYPE_MASK;
+
+	if (hwsoc != HWSOC_MX6SL) {
+		digprog = imx6_anatop_read_4(IMX6_ANALOG_DIGPROG);
+		hwsoc = (digprog & IMX6_ANALOG_DIGPROG_SOCTYPE_MASK) >>
+		    IMX6_ANALOG_DIGPROG_SOCTYPE_SHIFT;
+		/*printf("digprog = 0x%08x\n", digprog);*/
+		if (hwsoc == HWSOC_MX6DL) {
+			pcr = arm_devmap_ptov(SCU_CONFIG_PHYSADDR, 4);
+			if (pcr != NULL) {
+				/*printf("scu config = 0x%08x\n", *pcr);*/
+				if ((*pcr & 0x03) == 0) {
+					hwsoc = HWSOC_MX6SOLO;
+				}
+			}
+		}
+	}
+	/* printf("hwsoc 0x%08x\n", hwsoc); */
+
+	switch (hwsoc) {
+	case HWSOC_MX6SL:
+		return (IMXSOC_6SL);
+	case HWSOC_MX6SOLO:
+		return (IMXSOC_6S);
+	case HWSOC_MX6DL:
+		return (IMXSOC_6DL);
+	case HWSOC_MX6Q :
+		return (IMXSOC_6Q);
+	default:
+		printf("imx_soc_type: Don't understand hwsoc 0x%02x, "
+		    "digprog 0x%08x; assuming IMXSOC_6Q\n", hwsoc, digprog);
+		break;
+	}
+
+	return (IMXSOC_6Q);
+}
+
diff --git a/sys/arm/freescale/imx/imx6_pl310.c b/sys/arm/freescale/imx/imx6_pl310.c
new file mode 100644
index 00000000000..f2d1c274f74
--- /dev/null
+++ b/sys/arm/freescale/imx/imx6_pl310.c
@@ -0,0 +1,98 @@
+/*-
+ * Copyright (c) 2012 Olivier Houchard.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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>
+__FBSDID("$FreeBSD$");
+
+/*
+ * The machine-dependent part of the arm/pl310 driver for imx6 SoCs.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+
+#include <machine/bus.h>
+#include <machine/pl310.h>
+
+void
+platform_pl310_init(struct pl310_softc *sc)
+{
+	uint32_t aux, prefetch;
+
+	aux = pl310_read4(sc, PL310_AUX_CTRL);
+	prefetch = pl310_read4(sc, PL310_PREFETCH_CTRL);
+
+	if (bootverbose) {
+		device_printf(sc->sc_dev, "Early BRESP response: %s\n",
+			(aux & AUX_CTRL_EARLY_BRESP) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Instruction prefetch: %s\n",
+			(aux & AUX_CTRL_INSTR_PREFETCH) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Data prefetch: %s\n",
+			(aux & AUX_CTRL_DATA_PREFETCH) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Non-secure interrupt control: %s\n",
+			(aux & AUX_CTRL_NS_INT_CTRL) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Non-secure lockdown: %s\n",
+			(aux & AUX_CTRL_NS_LOCKDOWN) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Share override: %s\n",
+			(aux & AUX_CTRL_SHARE_OVERRIDE) ? "enabled" : "disabled");
+
+		device_printf(sc->sc_dev, "Double linefil: %s\n",
+			(prefetch & PREFETCH_CTRL_DL) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Instruction prefetch: %s\n",
+			(prefetch & PREFETCH_CTRL_INSTR_PREFETCH) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Data prefetch: %s\n",
+			(prefetch & PREFETCH_CTRL_DATA_PREFETCH) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Double linefill on WRAP request: %s\n",
+			(prefetch & PREFETCH_CTRL_DL_ON_WRAP) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Prefetch drop: %s\n",
+			(prefetch & PREFETCH_CTRL_PREFETCH_DROP) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Incr double Linefill: %s\n",
+			(prefetch & PREFETCH_CTRL_INCR_DL) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Not same ID on exclusive sequence: %s\n",
+			(prefetch & PREFETCH_CTRL_NOTSAMEID) ? "enabled" : "disabled");
+		device_printf(sc->sc_dev, "Prefetch offset: %d\n",
+			(prefetch & PREFETCH_CTRL_OFFSET_MASK));
+	}
+}
+
+void
+platform_pl310_write_ctrl(struct pl310_softc *sc, uint32_t val)
+{
+
+	pl310_write4(sc, PL310_CTRL, val);
+}
+
+void
+platform_pl310_write_debug(struct pl310_softc *sc, uint32_t val)
+{
+
+	pl310_write4(sc, PL310_DEBUG_CTRL, val);
+}
+
diff --git a/sys/arm/freescale/imx/imx6_usbphy.c b/sys/arm/freescale/imx/imx6_usbphy.c
new file mode 100644
index 00000000000..a1841909a3d
--- /dev/null
+++ b/sys/arm/freescale/imx/imx6_usbphy.c
@@ -0,0 +1,189 @@
+/*-
+ * Copyright (c) 2013 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * USBPHY driver for Freescale i.MX6 family of SoCs.
+ */
+
+#include "opt_bus.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <machine/bus.h>
+
+#include <arm/freescale/imx/imx_machdep.h>
+#include <arm/freescale/imx/imx6_anatopreg.h>
+#include <arm/freescale/imx/imx6_anatopvar.h>
+
+/*
+ * Hardware register defines.
+ */
+#define	PWD_REG				0x0000
+#define	CTRL_STATUS_REG			0x0030
+#define	CTRL_SET_REG			0x0034
+#define	CTRL_CLR_REG			0x0038
+#define	CTRL_TOGGLE_REG			0x003c
+#define	  CTRL_SFTRST			  (1U << 31)
+#define	  CTRL_CLKGATE			  (1 << 30)
+#define	  CTRL_ENUTMILEVEL3		  (1 << 15)
+#define	  CTRL_ENUTMILEVEL2		  (1 << 14)
+
+struct usbphy_softc {
+	device_t	dev;
+	struct resource	*mem_res;
+	u_int		phy_num;
+};
+
+static int
+usbphy_detach(device_t dev)
+{
+	struct usbphy_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	if (sc->mem_res != NULL)
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
+
+	return (0);
+}
+
+static int
+usbphy_attach(device_t dev)
+{
+	struct usbphy_softc *sc;
+	int err, regoff, rid;
+
+	sc = device_get_softc(dev);
+	err = 0;
+
+	/* Allocate bus_space resources. */
+	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");
+		err = ENXIO;
+		goto out;
+	}
+
+	/*
+	 * XXX Totally lame way to get the unit number (but not quite as lame as
+	 * adding an ad-hoc property to the fdt data).  This works as long as
+	 * this driver is used for imx6 only.
+	 */
+	const uint32_t PWD_PHY1_REG_PHYSADDR = 0x020c9000;
+	if (BUS_SPACE_PHYSADDR(sc->mem_res, 0) == PWD_PHY1_REG_PHYSADDR) {
+		sc->phy_num = 0;
+		regoff = 0;
+	} else {
+		sc->phy_num = 1;
+		regoff = 0x60;
+	}
+
+	/*
+	 * Based on a note in the u-boot source code, disable charger detection
+	 * to avoid degrading the differential signaling on the DP line.  Note
+	 * that this disables (by design) both charger detection and contact
+	 * detection, because of the screwball mix of active-high and active-low
+	 * bits in this register.
+	 */
+	imx6_anatop_write_4(IMX6_ANALOG_USB1_CHRG_DETECT + regoff, 
+	    IMX6_ANALOG_USB_CHRG_DETECT_N_ENABLE | 
+	    IMX6_ANALOG_USB_CHRG_DETECT_N_CHK_CHRG);
+
+	imx6_anatop_write_4(IMX6_ANALOG_USB1_CHRG_DETECT + regoff, 
+	    IMX6_ANALOG_USB_CHRG_DETECT_N_ENABLE | 
+	    IMX6_ANALOG_USB_CHRG_DETECT_N_CHK_CHRG);
+
+	/* XXX Configure the overcurrent detection here. */
+
+	/*
+	 * Turn on the phy clocks.
+	 */
+	imx_ccm_usbphy_enable(dev);
+
+	/*
+	 * Set the software reset bit, then clear both it and the clock gate bit
+	 * to bring the device out of reset with the clock running.
+	 */
+	bus_write_4(sc->mem_res, CTRL_SET_REG, CTRL_SFTRST);
+	bus_write_4(sc->mem_res, CTRL_CLR_REG, CTRL_SFTRST | CTRL_CLKGATE);
+
+	/* Power up: clear all bits in the powerdown register. */
+	bus_write_4(sc->mem_res, PWD_REG, 0);
+
+	err = 0;
+
+out:
+
+	if (err != 0)
+		usbphy_detach(dev);
+
+	return (err);
+}
+
+static int
+usbphy_probe(device_t dev)
+{
+
+	if (ofw_bus_is_compatible(dev, "fsl,imx6q-usbphy") == 0)
+		return (ENXIO);
+
+	device_set_desc(dev, "Freescale i.MX6 USB PHY");
+
+	return (BUS_PROBE_DEFAULT);
+}
+
+static device_method_t usbphy_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,  usbphy_probe),
+	DEVMETHOD(device_attach, usbphy_attach),
+	DEVMETHOD(device_detach, usbphy_detach),
+
+	DEVMETHOD_END
+};
+
+static driver_t usbphy_driver = {
+	"usbphy",
+	usbphy_methods,
+	sizeof(struct usbphy_softc)
+};
+
+static devclass_t usbphy_devclass;
+
+DRIVER_MODULE(usbphy, simplebus, usbphy_driver, usbphy_devclass, 0, 0);
+
diff --git a/sys/arm/freescale/imx/imx_gpt.c b/sys/arm/freescale/imx/imx_gpt.c
index de726d08c15..9b4f6a5190a 100644
--- a/sys/arm/freescale/imx/imx_gpt.c
+++ b/sys/arm/freescale/imx/imx_gpt.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <machine/fdt.h>
@@ -96,7 +95,7 @@ struct imx_gpt_softc *imx_gpt_sc = NULL;
 static const int imx_gpt_delay_count = 78;
 
 /* Try to divide down an available fast clock to this frequency. */
-#define	TARGET_FREQUENCY	1000000
+#define	TARGET_FREQUENCY	10000000
 
 /* Don't try to set an event timer period smaller than this. */
 #define	MIN_ET_PERIOD		10LLU
@@ -108,16 +107,26 @@ static struct resource_spec imx_gpt_spec[] = {
 	{ -1, 0 }
 };
 
+static struct ofw_compat_data compat_data[] = {
+	{"fsl,imx6q-gpt",  1},
+	{"fsl,imx53-gpt",  1},
+	{"fsl,imx51-gpt",  1},
+	{"fsl,imx31-gpt",  1},
+	{"fsl,imx27-gpt",  1},
+	{"fsl,imx25-gpt",  1},
+	{NULL,             0}
+};
+
 static int
 imx_gpt_probe(device_t dev)
 {
 
-	if (!ofw_bus_is_compatible(dev, "fsl,imx51-gpt") &&
-	    !ofw_bus_is_compatible(dev, "fsl,imx53-gpt"))
-		return (ENXIO);
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) {
+		device_set_desc(dev, "Freescale i.MX GPT timer");
+		return (BUS_PROBE_DEFAULT);
+	}
 
-	device_set_desc(dev, "Freescale i.MX GPT timer");
-	return (BUS_PROBE_DEFAULT);
+	return (ENXIO);
 }
 
 static int
@@ -143,10 +152,7 @@ imx_gpt_attach(device_t dev)
 	 * we're running on.  Eventually we could allow selection from the fdt;
 	 * the code in this driver will cope with any clock frequency.
 	 */
-	if (ofw_bus_is_compatible(dev, "fsl,imx6-gpt"))
-		sc->sc_clksrc = GPT_CR_CLKSRC_24M;
-	else
-		sc->sc_clksrc = GPT_CR_CLKSRC_IPG;
+	sc->sc_clksrc = GPT_CR_CLKSRC_IPG;
 
 	ctlreg = 0;
 
@@ -271,14 +277,9 @@ imx_gpt_timer_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
 		WRITE4(sc, IMX_GPT_OCR2, READ4(sc, IMX_GPT_CNT) + sc->sc_period);
 		/* Enable compare register 2 Interrupt */
 		SET4(sc, IMX_GPT_IR, GPT_IR_OF2);
+		return (0);
 	} else if (first != 0) {
 		ticks = ((uint32_t)et->et_frequency * first) >> 32;
-
-		/*
-		 * TODO: setupt second compare reg with time which will save
-		 * us in case correct one lost, f.e. if period to short and
-		 * setup done later than counter reach target value.
-		 */
 		/* Do not disturb, otherwise event will be lost */
 		spinlock_enter();
 		/* Set expected value */
@@ -287,7 +288,6 @@ imx_gpt_timer_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
 		SET4(sc, IMX_GPT_IR, GPT_IR_OF1);
 		/* Now everybody can relax */
 		spinlock_exit();
-
 		return (0);
 	}
 
@@ -335,27 +335,32 @@ imx_gpt_intr(void *arg)
 
 	sc = (struct imx_gpt_softc *)arg;
 
-	/* Sometime we not get staus bit when interrupt arrive.  Cache? */
-	while (!(status = READ4(sc, IMX_GPT_SR)))
-		;
+	status = READ4(sc, IMX_GPT_SR);
 
+	/*
+	* Clear interrupt status before invoking event callbacks.  The callback
+	* often sets up a new one-shot timer event and if the interval is short
+	* enough it can fire before we get out of this function.  If we cleared
+	* at the bottom we'd miss the interrupt and hang until the clock wraps.
+	*/
+	WRITE4(sc, IMX_GPT_SR, status);
+
+	/* Handle one-shot timer events. */
 	if (status & GPT_IR_OF1) {
 		if (sc->et.et_active) {
 			sc->et.et_event_cb(&sc->et, sc->et.et_arg);
 		}
 	}
+
+	/* Handle periodic timer events. */
 	if (status & GPT_IR_OF2) {
-		if (sc->et.et_active) {
+		if (sc->et.et_active)
 			sc->et.et_event_cb(&sc->et, sc->et.et_arg);
-			/* Set expected value */
+		if (sc->sc_period != 0)
 			WRITE4(sc, IMX_GPT_OCR2, READ4(sc, IMX_GPT_CNT) +
 			    sc->sc_period);
-		}
 	}
 
-	/* ACK */
-	WRITE4(sc, IMX_GPT_SR, status);
-
 	return (FILTER_HANDLED);
 }
 
diff --git a/sys/arm/freescale/imx/imx_gptreg.h b/sys/arm/freescale/imx/imx_gptreg.h
index 5f0169cb153..21bb69afbe7 100644
--- a/sys/arm/freescale/imx/imx_gptreg.h
+++ b/sys/arm/freescale/imx/imx_gptreg.h
@@ -32,7 +32,7 @@
 /* Registers definition for Freescale i.MX515 Generic Periodic Timer */
 
 #define	IMX_GPT_CR	0x0000 /* Control Register          R/W */
-#define		GPT_CR_FO3		(1 << 31)
+#define		GPT_CR_FO3		(1U << 31)
 #define		GPT_CR_FO2		(1 << 30)
 #define		GPT_CR_FO1		(1 << 29)
 #define		GPT_CR_OM3_SHIFT	26
diff --git a/sys/arm/freescale/imx/imx_machdep.c b/sys/arm/freescale/imx/imx_machdep.c
new file mode 100644
index 00000000000..36186375b17
--- /dev/null
+++ b/sys/arm/freescale/imx/imx_machdep.c
@@ -0,0 +1,96 @@
+/*-
+ * Copyright (c) 2013 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.
+ */
+
+#include "opt_platform.h"
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#define _ARM32_BUS_DMA_PRIVATE
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/reboot.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <machine/armreg.h>
+#include <machine/bus.h>
+#include <machine/devmap.h>
+#include <machine/machdep.h>
+
+#include <arm/freescale/imx/imx_machdep.h>
+#include <arm/freescale/imx/imx_wdogreg.h>
+
+struct arm32_dma_range *
+bus_dma_get_range(void)
+{
+
+	return (NULL);
+}
+
+int
+bus_dma_get_range_nb(void)
+{
+
+	return (0);
+}
+
+/*
+ * This code which manipulates the watchdog hardware is here to implement
+ * cpu_reset() because the watchdog is the only way for software to reset the
+ * chip.  Why here and not in imx_wdog.c?  Because there's no requirement that
+ * the watchdog driver be compiled in, but it's nice to be able to reboot even
+ * if it's not.
+ */
+void
+imx_wdog_cpu_reset(vm_offset_t wdcr_physaddr)
+{
+	volatile uint16_t * pcr;
+
+	/*
+	 * The deceptively simple write of WDOG_CR_WDE enables the watchdog,
+	 * sets the timeout to its minimum value (half a second), and also
+	 * clears the SRS bit which results in the SFTW (software-requested
+	 * reset) bit being set in the watchdog status register after the reset.
+	 * This is how software can distinguish a reset from a wdog timeout.
+	 */
+	if ((pcr = arm_devmap_ptov(wdcr_physaddr, sizeof(*pcr))) == NULL) {
+		printf("cpu_reset() can't find its control register... locking up now.");
+	} else {
+		*pcr = WDOG_CR_WDE;
+	}
+	for (;;)
+		continue;
+}
+
+u_int
+imx_soc_family(void)
+{
+	return (imx_soc_type() >> IMXSOC_FAMSHIFT);
+}
+
+
diff --git a/sys/arm/freescale/imx/imx_machdep.h b/sys/arm/freescale/imx/imx_machdep.h
new file mode 100644
index 00000000000..bb99111a212
--- /dev/null
+++ b/sys/arm/freescale/imx/imx_machdep.h
@@ -0,0 +1,79 @@
+/*-
+ * Copyright (c) 2013 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$
+ */
+
+#ifndef	IMX_MACHDEP_H
+#define	IMX_MACHDEP_H
+
+#include <sys/types.h>
+
+/* Common functions, implemented in imx_machdep.c. */
+
+void imx_devmap_addentry(vm_paddr_t _pa, vm_size_t _sz);
+void imx_wdog_cpu_reset(vm_offset_t _wdcr_phys)  __attribute__((__noreturn__));
+
+/* From here down, routines are implemented in imxNN_machdep.c. */
+
+/*
+ * SoC identity.
+ * According to the documentation, there is such a thing as an i.MX6 Dual
+ * (non-lite flavor).  However, Freescale doesn't seem to have assigned it a
+ * number in their code for determining the SoC type in u-boot.
+ *
+ * To-do: put silicon revision numbers into the low-order bits somewhere.
+ */
+#define	IMXSOC_51	0x51000000
+#define	IMXSOC_53	0x53000000
+#define	IMXSOC_6SL	0x60000000
+#define	IMXSOC_6DL	0x61000000
+#define	IMXSOC_6S	0x62000000
+#define	IMXSOC_6Q	0x63000000
+#define	IMXSOC_FAMSHIFT	28
+
+u_int imx_soc_type(void);
+u_int imx_soc_family(void);
+
+void imx_devmap_init(void);
+
+/*
+ * We need a clock management system that works across unrelated SoCs and
+ * devices.  For now, to keep imx development moving, define some barebones
+ * functionality that can be shared within the imx family by having each SoC
+ * implement functions with a common name.
+ *
+ * The usb enable functions are best-effort.  They turn on the usb otg, host,
+ * and phy clocks in a SoC-specific manner, but it may take a lot more than that
+ * to make usb work on a given board.  In particular, it can require specific
+ * pinmux setup of gpio pins connected to external phy parts, voltage regulators
+ * and overcurrent detectors, and so on.  On such boards, u-boot or other early
+ * board setup code has to handle those things.
+ */
+void imx_ccm_usb_enable(device_t _usbdev);
+void imx_ccm_usbphy_enable(device_t _phydev);
+
+#endif
+
diff --git a/sys/arm/freescale/imx/imx_nop_usbphy.c b/sys/arm/freescale/imx/imx_nop_usbphy.c
new file mode 100644
index 00000000000..50d9f59a0ec
--- /dev/null
+++ b/sys/arm/freescale/imx/imx_nop_usbphy.c
@@ -0,0 +1,118 @@
+/*-
+ * Copyright (c) 2013 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * USBPHY "no-op" driver for Freescale family of SoCs.  This driver is used on
+ * SoCs which have usbphy hardware whose clocks need to be enabled, but no other
+ * action has to be taken to make the hardware work.
+ */
+
+#include "opt_bus.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <machine/bus.h>
+
+#include <arm/freescale/imx/imx_machdep.h>
+
+/*
+ * Table of supported FDT compat strings.
+ */
+static struct ofw_compat_data compat_data[] = {
+	{"nop-usbphy",		true},
+	{"usb-nop-xceiv",	true},
+	{NULL,		 	false},
+};
+
+struct usbphy_softc {
+	device_t	dev;
+	u_int		phy_num;
+};
+
+static int
+usbphy_detach(device_t dev)
+{
+
+	return (0);
+}
+
+static int
+usbphy_attach(device_t dev)
+{
+	struct usbphy_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	/*
+         * Turn on the phy clocks.
+         */
+	imx_ccm_usbphy_enable(dev);
+
+	return (0);
+}
+
+static int
+usbphy_probe(device_t dev)
+{
+
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) {
+		device_set_desc(dev, "Freescale USB PHY");
+		return (BUS_PROBE_DEFAULT);
+	}
+
+	return (ENXIO);
+}
+
+static device_method_t usbphy_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,  usbphy_probe),
+	DEVMETHOD(device_attach, usbphy_attach),
+	DEVMETHOD(device_detach, usbphy_detach),
+
+	DEVMETHOD_END
+};
+
+static driver_t usbphy_driver = {
+	"usbphy",
+	usbphy_methods,
+	sizeof(struct usbphy_softc)
+};
+
+static devclass_t usbphy_devclass;
+
+DRIVER_MODULE(usbphy, simplebus, usbphy_driver, usbphy_devclass, 0, 0);
+
diff --git a/sys/arm/freescale/imx/imx_sdhci.c b/sys/arm/freescale/imx/imx_sdhci.c
new file mode 100644
index 00000000000..ff30d14801e
--- /dev/null
+++ b/sys/arm/freescale/imx/imx_sdhci.c
@@ -0,0 +1,700 @@
+/*-
+ * Copyright (c) 2013 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.
+ *
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * SDHCI driver glue for Freescale i.MX SoC family.
+ *
+ * This supports both eSDHC (earlier SoCs) and uSDHC (more recent SoCs).
+ */
+
+#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/resource.h>
+#include <sys/rman.h>
+#include <sys/taskqueue.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <machine/intr.h>
+
+#include <arm/freescale/imx/imx51_ccmvar.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/mmc/bridge.h>
+#include <dev/mmc/mmcreg.h>
+#include <dev/mmc/mmcbrvar.h>
+
+#include <dev/sdhci/sdhci.h>
+#include "sdhci_if.h"
+
+struct imx_sdhci_softc {
+	device_t		dev;
+	struct resource *	mem_res;
+	struct resource *	irq_res;
+	void *			intr_cookie;
+	struct sdhci_slot	slot;
+	uint32_t		baseclk_hz;
+	uint32_t		sdclockreg_freq_bits;
+	uint32_t		cmd_and_mode;
+	uint32_t		r1bfix_intmask;
+	uint8_t			r1bfix_type;
+	uint8_t			hwtype;
+};
+
+#define	R1BFIX_NONE	0	/* No fix needed at next interrupt. */
+#define	R1BFIX_NODATA	1	/* Synthesize DATA_END for R1B w/o data. */
+#define	R1BFIX_AC12	2	/* Wait for busy after auto command 12. */
+
+#define	HWTYPE_NONE	0	/* Hardware not recognized/supported. */
+#define	HWTYPE_ESDHC	1	/* imx5x and earlier. */
+#define	HWTYPE_USDHC	2	/* imx6. */
+
+#define	SDHC_WTMK_LVL		0x44	/* Watermark Level register. */
+#define	USDHC_MIX_CONTROL	0x48	/* Mix(ed) Control register. */
+#define	SDHC_VEND_SPEC		0xC0	/* Vendor-specific register. */
+#define	 SDHC_VEND_FRC_SDCLK_ON	(1 <<  8)
+#define	 SDHC_VEND_IPGEN	(1 << 11)
+#define	 SDHC_VEND_HCKEN	(1 << 12)
+#define	 SDHC_VEND_PEREN	(1 << 13)
+
+#define	SDHC_PROT_CTRL		0x28
+#define	 SDHC_PROT_LED		(1 << 0)
+#define	 SDHC_PROT_WIDTH_1BIT	(0 << 1)
+#define	 SDHC_PROT_WIDTH_4BIT	(1 << 1)
+#define	 SDHC_PROT_WIDTH_8BIT	(2 << 1)
+#define	 SDHC_PROT_WIDTH_MASK	(3 << 1)
+#define	 SDHC_PROT_D3CD		(1 << 3)
+#define	 SDHC_PROT_EMODE_BIG	(0 << 4)
+#define	 SDHC_PROT_EMODE_HALF	(1 << 4)
+#define	 SDHC_PROT_EMODE_LITTLE	(2 << 4)
+#define	 SDHC_PROT_EMODE_MASK	(3 << 4)
+#define	 SDHC_PROT_SDMA		(0 << 8)
+#define	 SDHC_PROT_ADMA1	(1 << 8)
+#define	 SDHC_PROT_ADMA2	(2 << 8)
+#define	 SDHC_PROT_ADMA264	(3 << 8)
+#define	 SDHC_PROT_DMA_MASK	(3 << 8)
+#define	 SDHC_PROT_CDTL		(1 << 6)
+#define	 SDHC_PROT_CDSS		(1 << 7)
+
+#define	SDHC_CLK_IPGEN		(1 << 0)
+#define	SDHC_CLK_HCKEN		(1 << 1)
+#define	SDHC_CLK_PEREN		(1 << 2)
+#define	SDHC_CLK_DIVISOR_MASK	0x000000f0
+#define	SDHC_CLK_DIVISOR_SHIFT	4
+#define	SDHC_CLK_PRESCALE_MASK	0x0000ff00
+#define	SDHC_CLK_PRESCALE_SHIFT	8
+
+static struct ofw_compat_data compat_data[] = {
+	{"fsl,imx6q-usdhc",	HWTYPE_USDHC},
+	{"fsl,imx6sl-usdhc",	HWTYPE_USDHC},
+	{"fsl,imx53-esdhc",	HWTYPE_ESDHC},
+	{"fsl,imx51-esdhc",	HWTYPE_ESDHC},
+	{NULL,			HWTYPE_NONE},
+};;
+
+static void imx_sdhc_set_clock(struct imx_sdhci_softc *sc, int enable);
+
+static inline uint32_t
+RD4(struct imx_sdhci_softc *sc, bus_size_t off)
+{
+
+	return (bus_read_4(sc->mem_res, off));
+}
+
+static inline void
+WR4(struct imx_sdhci_softc *sc, bus_size_t off, uint32_t val)
+{
+
+	bus_write_4(sc->mem_res, off, val);
+}
+
+static uint8_t
+imx_sdhci_read_1(device_t dev, struct sdhci_slot *slot, bus_size_t off)
+{
+	struct imx_sdhci_softc *sc = device_get_softc(dev);
+	uint32_t val32, wrk32;
+
+	/*
+	 * Most of the things in the standard host control register are in the
+	 * hardware's wider protocol control register, but some of the bits are
+	 * moved around.
+	 */
+	if (off == SDHCI_HOST_CONTROL) {
+		wrk32 = RD4(sc, SDHC_PROT_CTRL);
+                val32 = wrk32 & (SDHCI_CTRL_LED | SDHCI_CTRL_CARD_DET |
+		    SDHCI_CTRL_FORCE_CARD);
+		switch (wrk32 & SDHC_PROT_WIDTH_MASK) {
+		case SDHC_PROT_WIDTH_1BIT:
+			/* Value is already 0. */
+			break;
+		case SDHC_PROT_WIDTH_4BIT:
+			val32 |= SDHCI_CTRL_4BITBUS;
+			break;
+		case SDHC_PROT_WIDTH_8BIT:
+			val32 |= SDHCI_CTRL_8BITBUS;
+			break;
+		}
+		switch (wrk32 & SDHC_PROT_DMA_MASK) {
+		case SDHC_PROT_SDMA:
+			/* Value is already 0. */
+			break;
+		case SDHC_PROT_ADMA1:
+                        /* This value is deprecated, should never appear. */
+			break;
+		case SDHC_PROT_ADMA2:
+			val32 |= SDHCI_CTRL_ADMA2;
+			break;
+		case SDHC_PROT_ADMA264:
+			val32 |= SDHCI_CTRL_ADMA264;
+			break;
+		}
+		return val32;
+	}
+
+	/*
+	 * XXX can't find the bus power on/off knob.  For now we have to say the
+	 * power is always on and always set to the same voltage.
+	 */
+	if (off == SDHCI_POWER_CONTROL) {
+                return (SDHCI_POWER_ON | SDHCI_POWER_300);
+	}
+
+
+	return ((RD4(sc, off & ~3) >> (off & 3) * 8) & 0xff);
+}
+
+static uint16_t
+imx_sdhci_read_2(device_t dev, struct sdhci_slot *slot, bus_size_t off)
+{
+	struct imx_sdhci_softc *sc = device_get_softc(dev);
+	uint32_t val32, wrk32;
+
+	if (sc->hwtype == HWTYPE_USDHC) {
+		/*
+		 * The USDHC hardware has nothing in the version register, but
+		 * it's v3 compatible with all our translation code.
+		 */
+		if (off == SDHCI_HOST_VERSION) {
+			return (SDHCI_SPEC_300 << SDHCI_SPEC_VER_SHIFT);
+		}
+		/*
+		 * The USDHC hardware moved the transfer mode bits to the mixed
+		 * control register, fetch them from there.
+		 */
+		if (off == SDHCI_TRANSFER_MODE)
+			return (RD4(sc, USDHC_MIX_CONTROL) & 0x37);
+
+	} else if (sc->hwtype == HWTYPE_ESDHC) {
+
+		/*
+		 * The ESDHC hardware has the typical 32-bit combined "command
+		 * and mode" register that we have to cache so that command
+		 * isn't written until after mode.  On a read, just retrieve the
+		 * cached values last written.
+		 */
+		if (off == SDHCI_TRANSFER_MODE) {
+			return (sc->cmd_and_mode >> 16);
+		} else if (off == SDHCI_COMMAND_FLAGS) {
+			return (sc->cmd_and_mode & 0x0000ffff);
+		}
+	}
+
+	/*
+	 * This hardware only manages one slot.  Synthesize a slot interrupt
+	 * status register... if there are any enabled interrupts active they
+	 * must be coming from our one and only slot.
+	 */
+	if (off == SDHCI_SLOT_INT_STATUS) {
+		val32  = RD4(sc, SDHCI_INT_STATUS);
+		val32 &= RD4(sc, SDHCI_SIGNAL_ENABLE);
+		return (val32 ? 1 : 0);
+	}
+
+	/*
+	 * The clock enable bit is in the vendor register and the clock-stable
+	 * bit is in the present state register.  Transcribe them as if they
+	 * were in the clock control register where they should be.
+	 * XXX Is it important that we distinguish between "internal" and "card"
+	 * clocks?  Probably not; transcribe the card clock status to both bits.
+	 */
+	if (off == SDHCI_CLOCK_CONTROL) {
+		val32 = 0;
+		wrk32 = RD4(sc, SDHC_VEND_SPEC);
+		if (wrk32 & SDHC_VEND_FRC_SDCLK_ON)
+			val32 |= SDHCI_CLOCK_INT_EN | SDHCI_CLOCK_CARD_EN;
+		wrk32 = RD4(sc, SDHCI_PRESENT_STATE);
+		if (wrk32 & 0x08)
+			val32 |= SDHCI_CLOCK_INT_STABLE;
+		val32 |= sc->sdclockreg_freq_bits;
+		return (val32);
+	}
+
+	return ((RD4(sc, off & ~3) >> (off & 3) * 8) & 0xffff);
+}
+
+static uint32_t
+imx_sdhci_read_4(device_t dev, struct sdhci_slot *slot, bus_size_t off)
+{
+	struct imx_sdhci_softc *sc = device_get_softc(dev);
+	uint32_t val32;
+
+	/*
+	 * The hardware leaves the base clock frequency out of the capabilities
+	 * register; fill it in.  The timeout clock is the same as the active
+	 * output sdclock; we indicate that with a quirk setting so don't
+	 * populate the timeout frequency bits.
+	 *
+	 * XXX Turn off (for now) features the hardware can do but this driver
+	 * doesn't yet handle (1.8v, suspend/resume, etc).
+	 */
+	if (off == SDHCI_CAPABILITIES) {
+		val32 = RD4(sc, off);
+		val32 &= ~SDHCI_CAN_VDD_180;
+		val32 &= ~SDHCI_CAN_DO_SUSPEND;
+		val32 |= SDHCI_CAN_DO_8BITBUS;
+		val32 |= (sc->baseclk_hz / 1000000) << SDHCI_CLOCK_BASE_SHIFT;
+		return (val32);
+	}
+	
+	val32 = RD4(sc, off);
+
+	/*
+	 * imx_sdhci_intr() can synthesize a DATA_END interrupt following a
+	 * command with an R1B response, mix it into the hardware status.
+	 */
+	if (off == SDHCI_INT_STATUS) {
+		val32 |= sc->r1bfix_intmask;
+	}
+
+	return val32;
+}
+
+static void
+imx_sdhci_read_multi_4(device_t dev, struct sdhci_slot *slot, bus_size_t off,
+    uint32_t *data, bus_size_t count)
+{
+	struct imx_sdhci_softc *sc = device_get_softc(dev);
+
+	bus_read_multi_4(sc->mem_res, off, data, count);
+}
+
+static void
+imx_sdhci_write_1(device_t dev, struct sdhci_slot *slot, bus_size_t off, uint8_t val)
+{
+	struct imx_sdhci_softc *sc = device_get_softc(dev);
+	uint32_t val32;
+
+	/*
+	 * Most of the things in the standard host control register are in the
+	 * hardware's wider protocol control register, but some of the bits are
+	 * moved around.
+	 */
+	if (off == SDHCI_HOST_CONTROL) {
+		val32 = RD4(sc, SDHC_PROT_CTRL);
+		val32 &= ~(SDHC_PROT_LED | SDHC_PROT_DMA_MASK |
+		    SDHC_PROT_WIDTH_MASK | SDHC_PROT_CDTL | SDHC_PROT_CDSS);
+		val32 |= (val & SDHCI_CTRL_LED);
+		if (val & SDHCI_CTRL_8BITBUS)
+			val32 |= SDHC_PROT_WIDTH_8BIT;
+		else
+			val32 |= (val & SDHCI_CTRL_4BITBUS);
+		val32 |= (val & (SDHCI_CTRL_SDMA | SDHCI_CTRL_ADMA2)) << 4;
+		val32 |= (val & (SDHCI_CTRL_CARD_DET | SDHCI_CTRL_FORCE_CARD));
+		WR4(sc, SDHC_PROT_CTRL, val32);
+		return;
+	}
+
+	/* XXX I can't find the bus power on/off knob; do nothing. */
+	if (off == SDHCI_POWER_CONTROL) {
+		return;
+	}
+
+	val32 = RD4(sc, off & ~3);
+	val32 &= ~(0xff << (off & 3) * 8);
+	val32 |= (val << (off & 3) * 8);
+
+	WR4(sc, off & ~3, val32);
+}
+
+static void
+imx_sdhci_write_2(device_t dev, struct sdhci_slot *slot, bus_size_t off, uint16_t val)
+{
+	struct imx_sdhci_softc *sc = device_get_softc(dev);
+	uint32_t val32;
+
+	/* The USDHC hardware moved the transfer mode bits to mixed control. */
+	if (sc->hwtype == HWTYPE_USDHC) {
+		if (off == SDHCI_TRANSFER_MODE) {
+			val32 = RD4(sc, USDHC_MIX_CONTROL);
+			val32 &= ~0x3f;
+			val32 |= val & 0x37;
+			// XXX acmd23 not supported here (or by sdhci driver)
+			WR4(sc, USDHC_MIX_CONTROL, val32);
+			return;
+		}
+	} 
+
+	/*
+	 * The clock control stuff is complex enough to have its own routine
+	 * that can both change speeds and en/disable the clock output. Also,
+	 * save the register bits in SDHCI format so that we can play them back
+	 * in the read2 routine without complex decoding.
+	 */
+	if (off == SDHCI_CLOCK_CONTROL) {
+		sc->sdclockreg_freq_bits = val & 0xffc0;
+		if (val & SDHCI_CLOCK_CARD_EN) {
+			imx_sdhc_set_clock(sc, true);
+		} else {
+			imx_sdhc_set_clock(sc, false);
+		}
+	}
+
+	/*
+	 * Figure out whether we need to check the DAT0 line for busy status at
+	 * interrupt time.  The controller should be doing this, but for some
+	 * reason it doesn't.  There are two cases:
+	 *  - R1B response with no data transfer should generate a DATA_END (aka
+	 *    TRANSFER_COMPLETE) interrupt after waiting for busy, but if
+	 *    there's no data transfer there's no DATA_END interrupt.  This is
+	 *    documented; they seem to think it's a feature.
+	 *  - R1B response after Auto-CMD12 appears to not work, even though
+	 *    there's a control bit for it (bit 3) in the vendor register.
+	 * When we're starting a command that needs a manual DAT0 line check at
+	 * interrupt time, we leave ourselves a note in r1bfix_type so that we
+	 * can do the extra work in imx_sdhci_intr().
+	 */
+	if (off == SDHCI_COMMAND_FLAGS) {
+		if (val & SDHCI_CMD_DATA) {
+			const uint32_t MBAUTOCMD = SDHCI_TRNS_ACMD12 | SDHCI_TRNS_MULTI;
+			val32 = RD4(sc, USDHC_MIX_CONTROL);
+			if ((val32 & MBAUTOCMD) == MBAUTOCMD)
+				sc->r1bfix_type = R1BFIX_AC12;
+		} else {
+			if ((val & SDHCI_CMD_RESP_MASK) == SDHCI_CMD_RESP_SHORT_BUSY) {
+				WR4(sc, SDHCI_INT_ENABLE, slot->intmask | SDHCI_INT_RESPONSE);
+				WR4(sc, SDHCI_SIGNAL_ENABLE, slot->intmask | SDHCI_INT_RESPONSE);
+				sc->r1bfix_type = R1BFIX_NODATA;
+			}
+		}
+	}
+
+	val32 = RD4(sc, off & ~3);
+	val32 &= ~(0xffff << (off & 3) * 8);
+	val32 |= ((val & 0xffff) << (off & 3) * 8);
+	WR4(sc, off & ~3, val32);	
+}
+
+static void
+imx_sdhci_write_4(device_t dev, struct sdhci_slot *slot, bus_size_t off, uint32_t val)
+{
+	struct imx_sdhci_softc *sc = device_get_softc(dev);
+
+	/* Clear synthesized interrupts, then pass the value to the hardware. */
+	if (off == SDHCI_INT_STATUS) {
+		sc->r1bfix_intmask &= ~val;
+	}
+
+	WR4(sc, off, val);
+}
+
+static void
+imx_sdhci_write_multi_4(device_t dev, struct sdhci_slot *slot, bus_size_t off,
+    uint32_t *data, bus_size_t count)
+{
+	struct imx_sdhci_softc *sc = device_get_softc(dev);
+
+	bus_write_multi_4(sc->mem_res, off, data, count);
+}
+
+static void 
+imx_sdhc_set_clock(struct imx_sdhci_softc *sc, int enable)
+{
+	uint32_t divisor, enable_bits, enable_reg, freq, prescale, val32;
+
+	if (sc->hwtype == HWTYPE_ESDHC) {
+		divisor = (sc->sdclockreg_freq_bits >> SDHCI_DIVIDER_SHIFT) &
+		    SDHCI_DIVIDER_MASK;
+		enable_reg = SDHCI_CLOCK_CONTROL;
+		enable_bits = SDHC_CLK_IPGEN | SDHC_CLK_HCKEN |
+		    SDHC_CLK_PEREN;
+	} else {
+		divisor = (sc->sdclockreg_freq_bits >> SDHCI_DIVIDER_SHIFT) &
+		    SDHCI_DIVIDER_MASK;
+		divisor |= ((sc->sdclockreg_freq_bits >> 
+		    SDHCI_DIVIDER_HI_SHIFT) &
+		    SDHCI_DIVIDER_HI_MASK) << SDHCI_DIVIDER_MASK_LEN;
+		enable_reg = SDHCI_CLOCK_CONTROL;
+		enable_bits = SDHC_VEND_IPGEN | SDHC_VEND_HCKEN |
+		   SDHC_VEND_PEREN;
+	}
+
+	WR4(sc, SDHC_VEND_SPEC, 
+	    RD4(sc, SDHC_VEND_SPEC) & ~SDHC_VEND_FRC_SDCLK_ON);
+	WR4(sc, enable_reg, RD4(sc, enable_reg) & ~enable_bits);
+
+	if (!enable)
+		return;
+
+	if (divisor == 0)
+		freq = sc->baseclk_hz;
+	else
+		freq = sc->baseclk_hz / (2 * divisor);
+
+	for (prescale = 2; prescale < freq / prescale / 16;)
+		prescale <<= 1;
+
+	for (divisor = 1; freq < freq / prescale / divisor;)
+		++divisor;
+
+	prescale >>= 1;
+	divisor -= 1;
+
+	val32 = RD4(sc, SDHCI_CLOCK_CONTROL);
+	val32 &= ~SDHC_CLK_DIVISOR_MASK;
+	val32 |= divisor << SDHC_CLK_DIVISOR_SHIFT;
+	val32 &= ~SDHC_CLK_PRESCALE_MASK;
+	val32 |= prescale << SDHC_CLK_PRESCALE_SHIFT;
+	WR4(sc, SDHCI_CLOCK_CONTROL, val32);
+
+	WR4(sc, enable_reg, RD4(sc, enable_reg) | enable_bits);
+	WR4(sc, SDHC_VEND_SPEC, 
+	    RD4(sc, SDHC_VEND_SPEC) | SDHC_VEND_FRC_SDCLK_ON);
+}
+
+static void
+imx_sdhci_intr(void *arg)
+{
+	struct imx_sdhci_softc *sc = arg;
+	uint32_t intmask;
+
+	intmask = RD4(sc, SDHCI_INT_STATUS);
+
+	/*
+	 * Manually check the DAT0 line for R1B response types that the
+	 * controller fails to handle properly.
+	 *
+	 * To do the NODATA fix, when the RESPONSE (COMMAND_COMPLETE) interrupt
+	 * occurs, we have to wait for the DAT0 line to be released, then
+	 * synthesize a DATA_END (TRANSFER_COMPLETE) interrupt, which we do by
+	 * storing SDHCI_INT_DATA_END into a variable that gets ORed into the
+	 * return value when the SDHCI_INT_STATUS register is read.
+	 *
+	 * For the AC12 fix, when the DATA_END interrupt occurs we wait for the
+	 * DAT0 line to be released, and the waiting is all the fix we need.
+	 */
+	if ((sc->r1bfix_type == R1BFIX_NODATA && 
+	    (intmask & SDHCI_INT_RESPONSE)) || 
+	    (sc->r1bfix_type == R1BFIX_AC12 && 
+	    (intmask & SDHCI_INT_DATA_END))) {
+		uint32_t count;
+		count = 0;
+		/* XXX use a callout or something instead of busy-waiting. */
+		while (count < 250000 && 
+		       (RD4(sc, SDHCI_PRESENT_STATE) & SDHCI_DAT_ACTIVE)) {
+			++count;
+			DELAY(1);
+		}
+		if (count >= 250000)
+			sc->r1bfix_intmask = SDHCI_INT_DATA_TIMEOUT;
+		else if (sc->r1bfix_type == R1BFIX_NODATA)
+			sc->r1bfix_intmask = SDHCI_INT_DATA_END;
+		sc->r1bfix_type = R1BFIX_NONE;
+	}
+
+	sdhci_generic_intr(&sc->slot);
+}
+
+static int
+imx_sdhci_get_ro(device_t bus, device_t child)
+{
+
+	return (false);
+}
+
+static int
+imx_sdhci_detach(device_t dev)
+{
+
+	return (EBUSY);
+}
+
+static int
+imx_sdhci_attach(device_t dev)
+{
+	struct imx_sdhci_softc *sc = device_get_softc(dev);
+	int rid, err;
+
+	sc->dev = dev;
+
+	sc->hwtype = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
+	if (sc->hwtype == HWTYPE_NONE)
+		panic("Impossible: not compatible in imx_sdhci_attach()");
+
+	rid = 0;
+	sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (!sc->mem_res) {
+		device_printf(dev, "cannot allocate memory window\n");
+		err = ENXIO;
+		goto fail;
+	}
+
+	rid = 0;
+	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE);
+	if (!sc->irq_res) {
+		device_printf(dev, "cannot allocate interrupt\n");
+		err = ENXIO;
+		goto fail;
+	}
+
+	if (bus_setup_intr(dev, sc->irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
+	    NULL, imx_sdhci_intr, sc, &sc->intr_cookie)) {
+		device_printf(dev, "cannot setup interrupt handler\n");
+		err = ENXIO;
+		goto fail;
+	}
+
+	sc->slot.quirks |= SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK;
+
+	/*
+	 * DMA is not really broken, I just haven't implemented it yet.
+	 */
+	sc->slot.quirks |= SDHCI_QUIRK_BROKEN_DMA;
+
+	/*
+	 * Set the buffer watermark level to 128 words (512 bytes) for both read
+	 * and write.  The hardware has a restriction that when the read or
+	 * write ready status is asserted, that means you can read exactly the
+	 * number of words set in the watermark register before you have to
+	 * re-check the status and potentially wait for more data.  The main
+	 * sdhci driver provides no hook for doing status checking on less than
+	 * a full block boundary, so we set the watermark level to be a full
+	 * block.  Reads and writes where the block size is less than the
+	 * watermark size will work correctly too, no need to change the
+	 * watermark for different size blocks.  However, 128 is the maximum
+	 * allowed for the watermark, so PIO is limitted to 512 byte blocks
+	 * (which works fine for SD cards, may be a problem for SDIO some day).
+	 *
+	 * XXX need named constants for this stuff.
+	 */
+	WR4(sc, SDHC_WTMK_LVL, 0x08800880);
+
+	/* XXX get imx6 clock frequency from CCM */
+	if (sc->hwtype == HWTYPE_USDHC) {
+		sc->baseclk_hz = 200000000;
+	} else if (sc->hwtype == HWTYPE_ESDHC) {
+		sc->baseclk_hz = imx51_get_clock(IMX51CLK_PERCLK_ROOT);
+	}
+
+	sdhci_init_slot(dev, &sc->slot, 0);
+
+	bus_generic_probe(dev);
+	bus_generic_attach(dev);
+
+	sdhci_start_slot(&sc->slot);
+
+	return (0);
+
+fail:
+	if (sc->intr_cookie)
+		bus_teardown_intr(dev, sc->irq_res, sc->intr_cookie);
+	if (sc->irq_res)
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res);
+	if (sc->mem_res)
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
+
+	return (err);
+}
+
+static int
+imx_sdhci_probe(device_t dev)
+{
+
+	switch (ofw_bus_search_compatible(dev, compat_data)->ocd_data) {
+	case HWTYPE_ESDHC:
+		device_set_desc(dev, "Freescale eSDHC controller");
+		return (BUS_PROBE_DEFAULT);
+	case HWTYPE_USDHC:
+		device_set_desc(dev, "Freescale uSDHC controller");
+		return (BUS_PROBE_DEFAULT);
+	default:
+		break;
+	}
+	return (ENXIO);
+}
+
+static device_method_t imx_sdhci_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		imx_sdhci_probe),
+	DEVMETHOD(device_attach,	imx_sdhci_attach),
+	DEVMETHOD(device_detach,	imx_sdhci_detach),
+
+	/* Bus interface */
+	DEVMETHOD(bus_read_ivar,	sdhci_generic_read_ivar),
+	DEVMETHOD(bus_write_ivar,	sdhci_generic_write_ivar),
+	DEVMETHOD(bus_print_child,	bus_generic_print_child),
+
+	/* MMC bridge interface */
+	DEVMETHOD(mmcbr_update_ios,	sdhci_generic_update_ios),
+	DEVMETHOD(mmcbr_request,	sdhci_generic_request),
+	DEVMETHOD(mmcbr_get_ro,		imx_sdhci_get_ro),
+	DEVMETHOD(mmcbr_acquire_host,	sdhci_generic_acquire_host),
+	DEVMETHOD(mmcbr_release_host,	sdhci_generic_release_host),
+
+	/* SDHCI registers accessors */
+	DEVMETHOD(sdhci_read_1,		imx_sdhci_read_1),
+	DEVMETHOD(sdhci_read_2,		imx_sdhci_read_2),
+	DEVMETHOD(sdhci_read_4,		imx_sdhci_read_4),
+	DEVMETHOD(sdhci_read_multi_4,	imx_sdhci_read_multi_4),
+	DEVMETHOD(sdhci_write_1,	imx_sdhci_write_1),
+	DEVMETHOD(sdhci_write_2,	imx_sdhci_write_2),
+	DEVMETHOD(sdhci_write_4,	imx_sdhci_write_4),
+	DEVMETHOD(sdhci_write_multi_4,	imx_sdhci_write_multi_4),
+
+	{ 0, 0 }
+};
+
+static devclass_t imx_sdhci_devclass;
+
+static driver_t imx_sdhci_driver = {
+	"sdhci_imx",
+	imx_sdhci_methods,
+	sizeof(struct imx_sdhci_softc),
+};
+
+DRIVER_MODULE(sdhci_imx, simplebus, imx_sdhci_driver, imx_sdhci_devclass, 0, 0);
+MODULE_DEPEND(sdhci_imx, sdhci, 1, 1, 1);
+
diff --git a/sys/arm/freescale/imx/std.imx6 b/sys/arm/freescale/imx/std.imx6
new file mode 100644
index 00000000000..abe09e99d8a
--- /dev/null
+++ b/sys/arm/freescale/imx/std.imx6
@@ -0,0 +1,15 @@
+# $FreeBSD$
+machine		arm	armv6
+cpu 		CPU_CORTEXA
+makeoptions	ARM_LITTLE_ENDIAN
+options		ARM_L2_PIPT
+
+options		KERNVIRTADDR		= 0xc2000000
+makeoptions	KERNVIRTADDR		= 0xc2000000
+options		KERNPHYSADDR		= 0x12000000
+makeoptions	KERNPHYSADDR		= 0x12000000
+options		PHYSADDR		= 0x10000000
+options		STARTUP_PAGETABLE_ADDR	= 0x11f00000
+
+files "../freescale/imx/files.imx6"
+
diff --git a/sys/arm/freescale/imx/tzic.c b/sys/arm/freescale/imx/tzic.c
index 69d84de5690..b1a3b07f18a 100644
--- a/sys/arm/freescale/imx/tzic.c
+++ b/sys/arm/freescale/imx/tzic.c
@@ -142,9 +142,9 @@ static devclass_t tzic_devclass;
 
 /*
  * Memory space of controller located outside of device range, so let him to
- * attach not only to simplebus, but fdtbus also.
+ * attach not only to simplebus, but nexus also.
  */
-EARLY_DRIVER_MODULE(tzic, fdtbus, tzic_driver, tzic_devclass, 0, 0,
+EARLY_DRIVER_MODULE(tzic, nexus, tzic_driver, tzic_devclass, 0, 0,
     BUS_PASS_INTERRUPT);
 EARLY_DRIVER_MODULE(tzic, simplebus, tzic_driver, tzic_devclass, 0, 0,
     BUS_PASS_INTERRUPT);
@@ -163,7 +163,7 @@ arm_get_next_irq(int last_irq)
 
 	for (i = 0; i < 4; i++) {
 		pending = tzic_read_4(TZIC_PND(i));
-		for (b = 0; b < 32; b++)
+		for (b = 0; pending != 0 && b < 32; b++)
 			if (pending & (1 << b)) {
 				return (i * 32 + b);
 			}
diff --git a/sys/arm/freescale/vybrid/files.vybrid b/sys/arm/freescale/vybrid/files.vybrid
new file mode 100644
index 00000000000..4f700d0ea79
--- /dev/null
+++ b/sys/arm/freescale/vybrid/files.vybrid
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+kern/kern_clocksource.c				standard
+
+arm/arm/bus_space_generic.c			standard
+arm/arm/bus_space_asm_generic.S			standard
+arm/arm/cpufunc_asm_armv5.S			standard
+arm/arm/cpufunc_asm_arm10.S			standard
+arm/arm/cpufunc_asm_arm11.S			standard
+arm/arm/cpufunc_asm_armv7.S			standard
+arm/arm/irq_dispatch.S				standard
+
+arm/arm/bus_space-v6.c				standard
+arm/arm/gic.c					standard
+arm/arm/mpcore_timer.c				standard
+
+arm/freescale/vybrid/vf_machdep.c		standard
+arm/freescale/vybrid/vf_common.c		standard
+arm/freescale/vybrid/vf_ccm.c			standard
+arm/freescale/vybrid/vf_anadig.c		standard
+arm/freescale/vybrid/vf_iomuxc.c		standard
+arm/freescale/vybrid/vf_mscm.c			standard
+arm/freescale/vybrid/vf_src.c			standard
+arm/freescale/vybrid/vf_nfc.c			optional	nand
+arm/freescale/vybrid/vf_ehci.c			optional	ehci
+arm/freescale/vybrid/vf_gpio.c			optional	gpio
+arm/freescale/vybrid/vf_uart.c			optional	uart
+dev/ffec/if_ffec.c				optional	ffec
diff --git a/sys/arm/freescale/vybrid/std.vybrid b/sys/arm/freescale/vybrid/std.vybrid
new file mode 100644
index 00000000000..92d5a46d45a
--- /dev/null
+++ b/sys/arm/freescale/vybrid/std.vybrid
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+makeoption	ARM_LITTLE_ENDIAN
+
+cpu		CPU_CORTEXA
+machine		arm armv6
+
+options		PHYSADDR=0x80000000
+
+makeoptions	KERNPHYSADDR=0x80100000
+options		KERNPHYSADDR=0x80100000
+
+makeoptions	KERNVIRTADDR=0xc0100000
+options		KERNVIRTADDR=0xc0100000
+
+options		STARTUP_PAGETABLE_ADDR=0x81000000
+
+options		ARM_L2_PIPT
+
+files		"../freescale/vybrid/files.vybrid"
diff --git a/sys/arm/freescale/vybrid/vf_anadig.c b/sys/arm/freescale/vybrid/vf_anadig.c
new file mode 100644
index 00000000000..49964bcc353
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_anadig.c
@@ -0,0 +1,214 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ */
+
+/*
+ * Vybrid Family Analog components control digital interface (ANADIG)
+ * Chapter 11, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#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/watchdog.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/freescale/vybrid/vf_common.h>
+
+#define	ANADIG_PLL3_CTRL	0x010	/* PLL3 Control */
+#define	ANADIG_PLL7_CTRL	0x020	/* PLL7 Control */
+#define	ANADIG_PLL2_CTRL	0x030	/* PLL2 Control */
+#define	ANADIG_PLL2_SS		0x040	/* PLL2 Spread Spectrum */
+#define	ANADIG_PLL2_NUM		0x050	/* PLL2 Numerator */
+#define	ANADIG_PLL2_DENOM	0x060	/* PLL2 Denominator */
+#define	ANADIG_PLL4_CTRL	0x070	/* PLL4 Control */
+#define	ANADIG_PLL4_NUM		0x080	/* PLL4 Numerator */
+#define	ANADIG_PLL4_DENOM	0x090	/* PLL4 Denominator */
+#define	ANADIG_PLL6_CTRL	0x0A0	/* PLL6 Control */
+#define	ANADIG_PLL6_NUM		0x0B0	/* PLL6 Numerator */
+#define	ANADIG_PLL6_DENOM	0x0C0	/* PLL6 Denominator */
+#define	ANADIG_PLL5_CTRL	0x0E0	/* PLL5 Control */
+#define	ANADIG_PLL3_PFD		0x0F0	/* PLL3 PFD */
+#define	ANADIG_PLL2_PFD		0x100	/* PLL2 PFD */
+#define	ANADIG_REG_1P1		0x110	/* Regulator 1P1 */
+#define	ANADIG_REG_3P0		0x120	/* Regulator 3P0 */
+#define	ANADIG_REG_2P5		0x130	/* Regulator 2P5 */
+#define	ANADIG_ANA_MISC0	0x150	/* Analog Miscellaneous */
+#define	ANADIG_ANA_MISC1	0x160	/* Analog Miscellaneous */
+#define	ANADIG_ANADIG_DIGPROG	0x260	/* Digital Program */
+#define	ANADIG_PLL1_CTRL	0x270	/* PLL1 Control */
+#define	ANADIG_PLL1_SS		0x280	/* PLL1 Spread Spectrum */
+#define	ANADIG_PLL1_NUM		0x290	/* PLL1 Numerator */
+#define	ANADIG_PLL1_DENOM	0x2A0	/* PLL1 Denominator */
+#define	ANADIG_PLL1_PFD		0x2B0	/* PLL1_PFD */
+#define	ANADIG_PLL_LOCK		0x2C0	/* PLL Lock */
+
+#define	USB_VBUS_DETECT(n)		(0x1A0 + 0x60 * n)
+#define	USB_CHRG_DETECT(n)		(0x1B0 + 0x60 * n)
+#define	USB_VBUS_DETECT_STATUS(n)	(0x1C0 + 0x60 * n)
+#define	USB_CHRG_DETECT_STATUS(n)	(0x1D0 + 0x60 * n)
+#define	USB_LOOPBACK(n)			(0x1E0 + 0x60 * n)
+#define	USB_MISC(n)			(0x1F0 + 0x60 * n)
+
+#define	ANADIG_PLL_LOCKED	(1U << 31)
+#define	ENABLE_LINREG		(1 << 0)
+#define	EN_CLK_TO_UTMI		(1 << 30)
+
+#define	CTRL_BYPASS		(1 << 16)
+#define	CTRL_PWR		(1 << 12)
+#define	CTRL_PLL_EN		(1 << 13)
+#define	EN_USB_CLKS		(1 << 6)
+
+struct anadig_softc {
+	struct resource		*res[1];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+};
+
+static struct resource_spec anadig_spec[] = {
+	{ SYS_RES_MEMORY,       0,      RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+anadig_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "fsl,mvf600-anadig"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family ANADIG Unit");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+enable_pll(struct anadig_softc *sc, int pll_ctrl)
+{
+	int reg;
+
+	reg = READ4(sc, pll_ctrl);
+	reg &= ~(CTRL_BYPASS | CTRL_PWR);
+	if (pll_ctrl == ANADIG_PLL3_CTRL || pll_ctrl == ANADIG_PLL7_CTRL) {
+		/* It is USB PLL. Power bit logic is reversed */
+		reg |= (CTRL_PWR | EN_USB_CLKS);
+	}
+	WRITE4(sc, pll_ctrl, reg);
+
+	/* Wait for PLL lock */
+	while (!(READ4(sc, pll_ctrl) & ANADIG_PLL_LOCKED))
+		;
+
+	reg = READ4(sc, pll_ctrl);
+	reg |= (CTRL_PLL_EN);
+	WRITE4(sc, pll_ctrl, reg);
+
+	return (0);
+}
+
+static int
+anadig_attach(device_t dev)
+{
+	struct anadig_softc *sc;
+	int reg;
+
+	sc = device_get_softc(dev);
+
+	if (bus_alloc_resources(dev, anadig_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]);
+
+	/* Enable USB PLLs */
+	enable_pll(sc, ANADIG_PLL3_CTRL);
+	enable_pll(sc, ANADIG_PLL7_CTRL);
+
+	/* Enable other */
+	enable_pll(sc, ANADIG_PLL1_CTRL);
+	enable_pll(sc, ANADIG_PLL2_CTRL);
+	enable_pll(sc, ANADIG_PLL4_CTRL);
+	enable_pll(sc, ANADIG_PLL5_CTRL);
+	enable_pll(sc, ANADIG_PLL6_CTRL);
+
+	/* Enable USB voltage regulator */
+	reg = READ4(sc, ANADIG_REG_3P0);
+	reg |= (ENABLE_LINREG);
+	WRITE4(sc, ANADIG_REG_3P0, reg);
+
+	/* Give clocks to USB */
+	reg = READ4(sc, USB_MISC(0));
+	reg |= (EN_CLK_TO_UTMI);
+	WRITE4(sc, USB_MISC(0), reg);
+
+	reg = READ4(sc, USB_MISC(1));
+	reg |= (EN_CLK_TO_UTMI);
+	WRITE4(sc, USB_MISC(1), reg);
+
+#if 0
+	printf("USB_ANALOG_USB_MISC(0) == 0x%08x\n",
+	    READ4(sc, USB_ANALOG_USB_MISC(0)));
+	printf("USB_ANALOG_USB_MISC(1) == 0x%08x\n",
+	    READ4(sc, USB_ANALOG_USB_MISC(1)));
+#endif
+
+	return (0);
+}
+
+static device_method_t anadig_methods[] = {
+	DEVMETHOD(device_probe,		anadig_probe),
+	DEVMETHOD(device_attach,	anadig_attach),
+	{ 0, 0 }
+};
+
+static driver_t anadig_driver = {
+	"anadig",
+	anadig_methods,
+	sizeof(struct anadig_softc),
+};
+
+static devclass_t anadig_devclass;
+
+DRIVER_MODULE(anadig, simplebus, anadig_driver, anadig_devclass, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_ccm.c b/sys/arm/freescale/vybrid/vf_ccm.c
new file mode 100644
index 00000000000..9a4ad2c1c35
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_ccm.c
@@ -0,0 +1,188 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ */
+
+/*
+ * Vybrid Family Clock Controller Module (CCM)
+ * Chapter 10, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#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/watchdog.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/freescale/vybrid/vf_common.h>
+
+#define	CCM_CCR		0x00	/* Control Register */
+#define	CCM_CSR		0x04	/* Status Register */
+#define	CCM_CCSR	0x08	/* Clock Switcher Register */
+#define	CCM_CACRR	0x0C	/* ARM Clock Root Register */
+#define	CCM_CSCMR1	0x10	/* Serial Clock Multiplexer Register 1 */
+#define	CCM_CSCDR1	0x14	/* Serial Clock Divider Register 1 */
+#define	CCM_CSCDR2	0x18	/* Serial Clock Divider Register 2 */
+#define	CCM_CSCDR3	0x1C	/* Serial Clock Divider Register 3 */
+#define	CCM_CSCMR2	0x20	/* Serial Clock Multiplexer Register 2 */
+#define	CCM_CTOR	0x28	/* Testing Observability Register */
+#define	CCM_CLPCR	0x2C	/* Low Power Control Register */
+#define	CCM_CISR	0x30	/* Interrupt Status Register */
+#define	CCM_CIMR	0x34	/* Interrupt Mask Register */
+#define	CCM_CCOSR	0x38	/* Clock Output Source Register */
+#define	CCM_CGPR	0x3C	/* General Purpose Register */
+
+#define	CCM_CCGRN	12
+#define	CCM_CCGR(n)	(0x40 + (n * 0x04))	/* Clock Gating Register */
+#define	CCM_CMEOR(n)	(0x70 + (n * 0x70))	/* Module Enable Override Reg */
+#define	CCM_CCPGR(n)	(0x90 + (n * 0x04))	/* Platform Clock Gating Reg */
+
+#define	CCM_CPPDSR	0x88	/* PLL PFD Disable Status Register */
+#define	CCM_CCOWR	0x8C	/* CORE Wakeup Register */
+
+#define	PLL3_PFD4_EN	(1U << 31)
+#define	PLL3_PFD3_EN	(1 << 30)
+#define	PLL3_PFD2_EN	(1 << 29)
+#define	PLL3_PFD1_EN	(1 << 28)
+#define	PLL2_PFD4_EN	(1 << 15)
+#define	PLL2_PFD3_EN	(1 << 14)
+#define	PLL2_PFD2_EN	(1 << 13)
+#define	PLL2_PFD1_EN	(1 << 12)
+#define	PLL1_PFD4_EN	(1 << 11)
+#define	PLL1_PFD3_EN	(1 << 10)
+#define	PLL1_PFD2_EN	(1 << 9)
+#define	PLL1_PFD1_EN	(1 << 8)
+
+/* CCM_CCR */
+#define	FIRC_EN		(1 << 16)
+#define	FXOSC_EN	(1 << 12)
+#define	FXOSC_RDY	(1 << 5)
+
+/* CCM_CSCDR1 */
+#define	ENET_TS_EN	(1 << 23)
+#define	RMII_CLK_EN	(1 << 24)
+
+struct ccm_softc {
+	struct resource		*res[1];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+	device_t		dev;
+};
+
+static struct resource_spec ccm_spec[] = {
+	{ SYS_RES_MEMORY,       0,      RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+ccm_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "fsl,mvf600-ccm"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family CCM Unit");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+ccm_attach(device_t dev)
+{
+	struct ccm_softc *sc;
+	int reg;
+	int i;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	if (bus_alloc_resources(dev, ccm_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]);
+
+	/* Enable oscillator */
+	reg = READ4(sc, CCM_CCR);
+	reg |= (FIRC_EN | FXOSC_EN);
+	WRITE4(sc, CCM_CCR, reg);
+
+	/* Wait 10 times */
+	for (i = 0; i < 10; i++) {
+		if (READ4(sc, CCM_CSR) & FXOSC_RDY) {
+			device_printf(sc->dev, "On board oscillator is ready.\n");
+			break;
+		}
+
+		cpufunc_nullop();
+	}
+
+	/* Clock is on during all modes, except stop mode. */
+	for (i = 0; i < CCM_CCGRN; i++) {
+		WRITE4(sc, CCM_CCGR(i), 0xffffffff);
+	}
+
+	/* Enable ENET clocks */
+	reg = READ4(sc, CCM_CSCDR1);
+	reg |= (ENET_TS_EN | RMII_CLK_EN);
+	WRITE4(sc, CCM_CSCDR1, reg);
+
+	return (0);
+}
+
+static device_method_t ccm_methods[] = {
+	DEVMETHOD(device_probe,		ccm_probe),
+	DEVMETHOD(device_attach,	ccm_attach),
+	{ 0, 0 }
+};
+
+static driver_t ccm_driver = {
+	"ccm",
+	ccm_methods,
+	sizeof(struct ccm_softc),
+};
+
+static devclass_t ccm_devclass;
+
+DRIVER_MODULE(ccm, simplebus, ccm_driver, ccm_devclass, 0, 0);
diff --git a/sys/powerpc/powerpc/openpic_fdt.c b/sys/arm/freescale/vybrid/vf_common.c
similarity index 52%
rename from sys/powerpc/powerpc/openpic_fdt.c
rename to sys/arm/freescale/vybrid/vf_common.c
index 1cd93695628..ffec9a3951c 100644
--- a/sys/powerpc/powerpc/openpic_fdt.c
+++ b/sys/arm/freescale/vybrid/vf_common.c
@@ -1,10 +1,7 @@
 /*-
- * Copyright (c) 2009-2010 The FreeBSD Foundation
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
- * This software was developed by Semihalf 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:
@@ -31,63 +28,59 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
+#include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/kernel.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
-#include <machine/intr_machdep.h>
+#include <machine/fdt.h>
 
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
+#include <arm/freescale/vybrid/vf_src.h>
 
-#include <machine/openpicvar.h>
+void
+cpu_reset(void)
+{
+	phandle_t src;
+	uint32_t addr, paddr;
+	bus_addr_t vaddr;
 
-#include "pic_if.h"
+	if (src_swreset() == 0)
+		goto end;
 
-static int openpic_fdt_probe(device_t);
-static int openpic_fdt_attach(device_t);
+	src = OF_finddevice("src");
+	if ((src != 0) && (OF_getprop(src, "reg", &paddr, sizeof(paddr))) > 0) {
+		addr = fdt32_to_cpu(paddr);
+		if (bus_space_map(fdtbus_bs_tag, addr, 0x10, 0, &vaddr) == 0) {
+			bus_space_write_4(fdtbus_bs_tag, vaddr, 0x00, SW_RST);
+		}
+	}
 
-static device_method_t openpic_fdt_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		openpic_fdt_probe),
-	DEVMETHOD(device_attach,	openpic_fdt_attach),
+end:
+	while (1);
+}
 
-	/* PIC interface */
-	DEVMETHOD(pic_bind,		openpic_bind),
-	DEVMETHOD(pic_config,		openpic_config),
-	DEVMETHOD(pic_dispatch,		openpic_dispatch),
-	DEVMETHOD(pic_enable,		openpic_enable),
-	DEVMETHOD(pic_eoi,		openpic_eoi),
-	DEVMETHOD(pic_ipi,		openpic_ipi),
-	DEVMETHOD(pic_mask,		openpic_mask),
-	DEVMETHOD(pic_unmask,		openpic_unmask),
-
-	{ 0, 0 },
+struct fdt_fixup_entry fdt_fixup_table[] = {
+	{ NULL, NULL }
 };
 
-static driver_t openpic_fdt_driver = {
-	"openpic",
-	openpic_fdt_methods,
-	sizeof(struct openpic_softc)
-};
-
-DRIVER_MODULE(openpic, simplebus, openpic_fdt_driver, openpic_devclass, 0, 0);
-
 static int
-openpic_fdt_probe(device_t dev)
+fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
+    int *pol)
 {
 
-	if (!ofw_bus_is_compatible(dev, "chrp,open-pic"))
+	if (!fdt_is_compatible(node, "arm,gic"))
 		return (ENXIO);
-		
-	device_set_desc(dev, OPENPIC_DEVSTR);
-	return (BUS_PROBE_DEFAULT);
+
+	*interrupt = fdt32_to_cpu(intr[0]);
+	*trig = INTR_TRIGGER_CONFORM;
+	*pol = INTR_POLARITY_CONFORM;
+	return (0);
 }
 
-static int
-openpic_fdt_attach(device_t dev)
-{
-
-	return (openpic_common_attach(dev, ofw_bus_get_node(dev)));
-}
+fdt_pic_decode_t fdt_pic_table[] = {
+	&fdt_pic_decode_ic,
+	NULL
+};
diff --git a/sys/arm/freescale/vybrid/vf_common.h b/sys/arm/freescale/vybrid/vf_common.h
new file mode 100644
index 00000000000..d11f000c130
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_common.h
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ *
+ * $FreeBSD$
+ */
+
+#define	READ4(_sc, _reg)	\
+	bus_space_read_4(_sc->bst, _sc->bsh, _reg)
+#define	WRITE4(_sc, _reg, _val)	\
+	bus_space_write_4(_sc->bst, _sc->bsh, _reg, _val)
+#define	READ2(_sc, _reg)	\
+	bus_space_read_2(_sc->bst, _sc->bsh, _reg)
+#define	WRITE2(_sc, _reg, _val)	\
+	bus_space_write_2(_sc->bst, _sc->bsh, _reg, _val)
+#define	READ1(_sc, _reg)	\
+	bus_space_read_1(_sc->bst, _sc->bsh, _reg)
+#define	WRITE1(_sc, _reg, _val)	\
+	bus_space_write_1(_sc->bst, _sc->bsh, _reg, _val)
diff --git a/sys/arm/freescale/vybrid/vf_ehci.c b/sys/arm/freescale/vybrid/vf_ehci.c
new file mode 100644
index 00000000000..47639db7344
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_ehci.c
@@ -0,0 +1,416 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ */
+
+/*
+ * Vybrid Family Universal Serial Bus (USB) Controller
+ * Chapter 44-45, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_bus.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <sys/condvar.h>
+#include <sys/rman.h>
+#include <sys/gpio.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usb_busdma.h>
+#include <dev/usb/usb_process.h>
+#include <dev/usb/usb_controller.h>
+#include <dev/usb/usb_bus.h>
+#include <dev/usb/controller/ehci.h>
+#include <dev/usb/controller/ehcireg.h>
+
+#include <dev/fdt/fdt_common.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+#include "gpio_if.h"
+#include "opt_platform.h"
+
+#define	ENUTMILEVEL3	(1 << 15)
+#define	ENUTMILEVEL2	(1 << 14)
+
+#define	GPIO_USB_PWR	134
+
+#define	USB_ID		0x000	/* Identification register */
+#define	USB_HWGENERAL	0x004	/* Hardware General */
+#define	USB_HWHOST	0x008	/* Host Hardware Parameters */
+#define	USB_HWDEVICE	0x00C	/* Device Hardware Parameters */
+#define	USB_HWTXBUF	0x010	/* TX Buffer Hardware Parameters */
+#define	USB_HWRXBUF	0x014	/* RX Buffer Hardware Parameters */
+#define	USB_HCSPARAMS	0x104	/* Host Controller Structural Parameters */
+
+#define	USBPHY_PWD		0x00	/* PHY Power-Down Register */
+#define	USBPHY_PWD_SET		0x04	/* PHY Power-Down Register */
+#define	USBPHY_PWD_CLR		0x08	/* PHY Power-Down Register */
+#define	USBPHY_PWD_TOG		0x0C	/* PHY Power-Down Register */
+#define	USBPHY_TX		0x10	/* PHY Transmitter Control Register */
+#define	USBPHY_RX		0x20	/* PHY Receiver Control Register */
+#define	USBPHY_RX_SET		0x24	/* PHY Receiver Control Register */
+#define	USBPHY_RX_CLR		0x28	/* PHY Receiver Control Register */
+#define	USBPHY_RX_TOG		0x2C	/* PHY Receiver Control Register */
+#define	USBPHY_CTRL		0x30	/* PHY General Control Register */
+#define	USBPHY_CTRL_SET		0x34	/* PHY General Control Register */
+#define	USBPHY_CTRL_CLR		0x38	/* PHY General Control Register */
+#define	USBPHY_CTRL_TOG		0x3C	/* PHY General Control Register */
+#define	USBPHY_STATUS		0x40	/* PHY Status Register */
+#define	USBPHY_DEBUG		0x50	/* PHY Debug Register */
+#define	USBPHY_DEBUG_SET	0x54	/* PHY Debug Register */
+#define	USBPHY_DEBUG_CLR	0x58	/* PHY Debug Register */
+#define	USBPHY_DEBUG_TOG	0x5C	/* PHY Debug Register */
+#define	USBPHY_DEBUG0_STATUS	0x60	/* UTMI Debug Status Register 0 */
+#define	USBPHY_DEBUG1		0x70	/* UTMI Debug Status Register 1 */
+#define	USBPHY_DEBUG1_SET	0x74	/* UTMI Debug Status Register 1 */
+#define	USBPHY_DEBUG1_CLR	0x78	/* UTMI Debug Status Register 1 */
+#define	USBPHY_DEBUG1_TOG	0x7C	/* UTMI Debug Status Register 1 */
+#define	USBPHY_VERSION		0x80	/* UTMI RTL Version */
+#define	USBPHY_IP		0x90	/* PHY IP Block Register */
+#define	USBPHY_IP_SET		0x94	/* PHY IP Block Register */
+#define	USBPHY_IP_CLR		0x98	/* PHY IP Block Register */
+#define	USBPHY_IP_TOG		0x9C	/* PHY IP Block Register */
+
+#define	USBPHY_CTRL_SFTRST	(1U << 31)
+#define	USBPHY_CTRL_CLKGATE	(1 << 30)
+#define	USBPHY_DEBUG_CLKGATE	(1 << 30)
+
+#define	PHY_READ4(_sc, _reg)		\
+	bus_space_read_4(_sc->bst_phy, _sc->bsh_phy, _reg)
+#define	PHY_WRITE4(_sc, _reg, _val)	\
+	bus_space_write_4(_sc->bst_phy, _sc->bsh_phy, _reg, _val)
+
+#define	USBC_READ4(_sc, _reg)		\
+	bus_space_read_4(_sc->bst_usbc, _sc->bsh_usbc, _reg)
+#define	USBC_WRITE4(_sc, _reg, _val)	\
+	bus_space_write_4(_sc->bst_usbc, _sc->bsh_usbc, _reg, _val)
+
+/* Forward declarations */
+static int	vybrid_ehci_attach(device_t dev);
+static int	vybrid_ehci_detach(device_t dev);
+static int	vybrid_ehci_probe(device_t dev);
+
+struct vybrid_ehci_softc {
+	ehci_softc_t		base;
+	device_t		dev;
+	struct resource		*res[6];
+	bus_space_tag_t		bst_phy;
+	bus_space_handle_t      bsh_phy;
+	bus_space_tag_t		bst_usbc;
+	bus_space_handle_t      bsh_usbc;
+};
+
+static struct resource_spec vybrid_ehci_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_MEMORY,	1,	RF_ACTIVE },
+	{ SYS_RES_MEMORY,	2,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static device_method_t ehci_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe, vybrid_ehci_probe),
+	DEVMETHOD(device_attach, vybrid_ehci_attach),
+	DEVMETHOD(device_detach, vybrid_ehci_detach),
+	DEVMETHOD(device_suspend, bus_generic_suspend),
+	DEVMETHOD(device_resume, bus_generic_resume),
+	DEVMETHOD(device_shutdown, bus_generic_shutdown),
+
+	/* Bus interface */
+	DEVMETHOD(bus_print_child, bus_generic_print_child),
+
+	{ 0, 0 }
+};
+
+/* kobj_class definition */
+static driver_t ehci_driver = {
+	"ehci",
+	ehci_methods,
+	sizeof(ehci_softc_t)
+};
+
+static devclass_t ehci_devclass;
+
+DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
+MODULE_DEPEND(ehci, usb, 1, 1, 1);
+
+/*
+ * Public methods
+ */
+static int
+vybrid_ehci_probe(device_t dev)
+{
+
+	if (ofw_bus_is_compatible(dev, "fsl,mvf600-usb-ehci") == 0)
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family integrated USB controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+phy_init(struct vybrid_ehci_softc *esc)
+{
+	device_t sc_gpio_dev;
+	int reg;
+
+	/* Reset phy */
+	reg = PHY_READ4(esc, USBPHY_CTRL);
+	reg |= (USBPHY_CTRL_SFTRST);
+	PHY_WRITE4(esc, USBPHY_CTRL, reg);
+
+	/* Minimum reset time */
+	DELAY(10000);
+
+	reg &= ~(USBPHY_CTRL_SFTRST | USBPHY_CTRL_CLKGATE);
+	PHY_WRITE4(esc, USBPHY_CTRL, reg);
+
+	reg = (ENUTMILEVEL2 | ENUTMILEVEL3);
+	PHY_WRITE4(esc, USBPHY_CTRL_SET, reg);
+
+	/* Get the GPIO device, we need this to give power to USB */
+	sc_gpio_dev = devclass_get_device(devclass_find("gpio"), 0);
+	if (sc_gpio_dev == NULL) {
+		device_printf(esc->dev, "Error: failed to get the GPIO dev\n");
+		return (1);
+	}
+
+	/* Give power to USB */
+	GPIO_PIN_SETFLAGS(sc_gpio_dev, GPIO_USB_PWR, GPIO_PIN_OUTPUT);
+	GPIO_PIN_SET(sc_gpio_dev, GPIO_USB_PWR, GPIO_PIN_HIGH);
+
+	/* Power up PHY */
+	PHY_WRITE4(esc, USBPHY_PWD, 0x00);
+
+	/* Ungate clocks */
+	reg = PHY_READ4(esc, USBPHY_DEBUG);
+	reg &= ~(USBPHY_DEBUG_CLKGATE);
+	PHY_WRITE4(esc, USBPHY_DEBUG, reg);
+
+#if 0
+	printf("USBPHY_CTRL == 0x%08x\n",
+	    PHY_READ4(esc, USBPHY_CTRL));
+	printf("USBPHY_IP == 0x%08x\n",
+	    PHY_READ4(esc, USBPHY_IP));
+	printf("USBPHY_STATUS == 0x%08x\n",
+	    PHY_READ4(esc, USBPHY_STATUS));
+	printf("USBPHY_DEBUG == 0x%08x\n",
+	    PHY_READ4(esc, USBPHY_DEBUG));
+	printf("USBPHY_DEBUG0_STATUS == 0x%08x\n",
+	    PHY_READ4(esc, USBPHY_DEBUG0_STATUS));
+	printf("USBPHY_DEBUG1 == 0x%08x\n",
+	    PHY_READ4(esc, USBPHY_DEBUG1));
+#endif
+
+	return (0);
+}
+
+static int
+vybrid_ehci_attach(device_t dev)
+{
+	struct vybrid_ehci_softc *esc;
+	ehci_softc_t *sc;
+	bus_space_handle_t bsh;
+	int err;
+	int reg;
+
+	esc = device_get_softc(dev);
+	esc->dev = dev;
+
+	sc = &esc->base;
+	sc->sc_bus.parent = dev;
+	sc->sc_bus.devices = sc->sc_devices;
+	sc->sc_bus.devices_max = EHCI_MAX_DEVICES;
+
+	if (bus_alloc_resources(dev, vybrid_ehci_spec, esc->res)) {
+		device_printf(dev, "could not allocate resources\n");
+		return (ENXIO);
+	}
+
+	/* EHCI registers */
+	sc->sc_io_tag = rman_get_bustag(esc->res[0]);
+	bsh = rman_get_bushandle(esc->res[0]);
+	sc->sc_io_size = rman_get_size(esc->res[0]);
+
+	esc->bst_usbc = rman_get_bustag(esc->res[1]);
+	esc->bsh_usbc = rman_get_bushandle(esc->res[1]);
+
+	esc->bst_phy = rman_get_bustag(esc->res[2]);
+	esc->bsh_phy = rman_get_bushandle(esc->res[2]);
+
+	/* get all DMA memory */
+	if (usb_bus_mem_alloc_all(&sc->sc_bus, USB_GET_DMA_TAG(dev),
+		&ehci_iterate_hw_softc))
+		return (ENXIO);
+
+#if 0
+	printf("USBx_HCSPARAMS is 0x%08x\n",
+	    bus_space_read_4(sc->sc_io_tag, bsh, USB_HCSPARAMS));
+	printf("USB_ID == 0x%08x\n",
+	    bus_space_read_4(sc->sc_io_tag, bsh, USB_ID));
+	printf("USB_HWGENERAL == 0x%08x\n",
+	    bus_space_read_4(sc->sc_io_tag, bsh, USB_HWGENERAL));
+	printf("USB_HWHOST == 0x%08x\n",
+	    bus_space_read_4(sc->sc_io_tag, bsh, USB_HWHOST));
+	printf("USB_HWDEVICE == 0x%08x\n",
+	    bus_space_read_4(sc->sc_io_tag, bsh, USB_HWDEVICE));
+	printf("USB_HWTXBUF == 0x%08x\n",
+	    bus_space_read_4(sc->sc_io_tag, bsh, USB_HWTXBUF));
+	printf("USB_HWRXBUF == 0x%08x\n",
+	    bus_space_read_4(sc->sc_io_tag, bsh, USB_HWRXBUF));
+#endif
+
+	if (phy_init(esc)) {
+		device_printf(dev, "Could not setup PHY\n");
+		return (1);
+	}
+
+	/*
+	 * Set handle to USB related registers subregion used by
+	 * generic EHCI driver.
+	 */
+	err = bus_space_subregion(sc->sc_io_tag, bsh, 0x100,
+	    sc->sc_io_size, &sc->sc_io_hdl);
+	if (err != 0)
+		return (ENXIO);
+
+	/* Setup interrupt handler */
+	err = bus_setup_intr(dev, esc->res[3], INTR_TYPE_BIO | INTR_MPSAFE,
+	    NULL, (driver_intr_t *)ehci_interrupt, sc,
+	    &sc->sc_intr_hdl);
+	if (err) {
+		device_printf(dev, "Could not setup irq, "
+		    "%d\n", err);
+		return (1);
+	}
+
+	/* Add USB device */
+	sc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
+	if (!sc->sc_bus.bdev) {
+		device_printf(dev, "Could not add USB device\n");
+		err = bus_teardown_intr(dev, esc->res[5],
+		    sc->sc_intr_hdl);
+		if (err)
+			device_printf(dev, "Could not tear down irq,"
+			    " %d\n", err);
+		return (1);
+	}
+	device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
+
+	strlcpy(sc->sc_vendor, "Freescale", sizeof(sc->sc_vendor));
+
+	/* Set host mode */
+	reg = bus_space_read_4(sc->sc_io_tag, sc->sc_io_hdl, 0xA8);
+	reg |= 0x3;
+	bus_space_write_4(sc->sc_io_tag, sc->sc_io_hdl, 0xA8, reg);
+
+	/* Set flags */
+	sc->sc_flags |= EHCI_SCFLG_SETMODE | EHCI_SCFLG_NORESTERM;
+
+	err = ehci_init(sc);
+	if (!err) {
+		sc->sc_flags |= EHCI_SCFLG_DONEINIT;
+		err = device_probe_and_attach(sc->sc_bus.bdev);
+	} else {
+		device_printf(dev, "USB init failed err=%d\n", err);
+
+		device_delete_child(dev, sc->sc_bus.bdev);
+		sc->sc_bus.bdev = NULL;
+
+		err = bus_teardown_intr(dev, esc->res[5],
+		    sc->sc_intr_hdl);
+		if (err)
+			device_printf(dev, "Could not tear down irq,"
+			    " %d\n", err);
+		return (1);
+	}
+	return (0);
+}
+
+static int
+vybrid_ehci_detach(device_t dev)
+{
+	struct vybrid_ehci_softc *esc;
+	ehci_softc_t *sc;
+	int err;
+
+	esc = device_get_softc(dev);
+	sc = &esc->base;
+
+	if (sc->sc_flags & EHCI_SCFLG_DONEINIT)
+		return (0);
+
+	/*
+	 * only call ehci_detach() after ehci_init()
+	 */
+	if (sc->sc_flags & EHCI_SCFLG_DONEINIT) {
+		ehci_detach(sc);
+		sc->sc_flags &= ~EHCI_SCFLG_DONEINIT;
+	}
+
+	/*
+	 * Disable interrupts that might have been switched on in
+	 * ehci_init.
+	 */
+	if (sc->sc_io_tag && sc->sc_io_hdl)
+		bus_space_write_4(sc->sc_io_tag, sc->sc_io_hdl,
+		    EHCI_USBINTR, 0);
+
+	if (esc->res[5] && sc->sc_intr_hdl) {
+		err = bus_teardown_intr(dev, esc->res[5],
+		    sc->sc_intr_hdl);
+		if (err) {
+			device_printf(dev, "Could not tear down irq,"
+			    " %d\n", err);
+			return (err);
+		}
+		sc->sc_intr_hdl = NULL;
+	}
+
+	if (sc->sc_bus.bdev) {
+		device_delete_child(dev, sc->sc_bus.bdev);
+		sc->sc_bus.bdev = NULL;
+	}
+
+	/* During module unload there are lots of children leftover */
+	device_delete_children(dev);
+
+	bus_release_resources(dev, vybrid_ehci_spec, esc->res);
+
+	return (0);
+}
diff --git a/sys/arm/freescale/vybrid/vf_gpio.c b/sys/arm/freescale/vybrid/vf_gpio.c
new file mode 100644
index 00000000000..8a7b9b197dc
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_gpio.c
@@ -0,0 +1,403 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ */
+
+/*
+ * Vybrid Family General-Purpose Input/Output (GPIO)
+ * Chapter 7, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#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/watchdog.h>
+#include <sys/mutex.h>
+#include <sys/gpio.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 "gpio_if.h"
+
+#include <arm/freescale/vybrid/vf_common.h>
+
+#define	GPIO_PDOR(n)	(0x00 + 0x40 * (n >> 5))
+#define	GPIO_PSOR(n)	(0x04 + 0x40 * (n >> 5))
+#define	GPIO_PCOR(n)	(0x08 + 0x40 * (n >> 5))
+#define	GPIO_PTOR(n)	(0x0C + 0x40 * (n >> 5))
+#define	GPIO_PDIR(n)	(0x10 + 0x40 * (n >> 5))
+
+#define	GPIO_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
+#define	GPIO_UNLOCK(_sc)	mtx_unlock(&(_sc)->sc_mtx)
+
+#define	NPORTS		5
+#define	NGPIO		(NPORTS * 32)
+#define	DEFAULT_CAPS	(GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)
+
+/*
+ * GPIO interface
+ */
+static int vf_gpio_pin_max(device_t, int *);
+static int vf_gpio_pin_getcaps(device_t, uint32_t, uint32_t *);
+static int vf_gpio_pin_getname(device_t, uint32_t, char *);
+static int vf_gpio_pin_getflags(device_t, uint32_t, uint32_t *);
+static int vf_gpio_pin_setflags(device_t, uint32_t, uint32_t);
+static int vf_gpio_pin_set(device_t, uint32_t, unsigned int);
+static int vf_gpio_pin_get(device_t, uint32_t, unsigned int *);
+static int vf_gpio_pin_toggle(device_t, uint32_t pin);
+
+struct vf_gpio_softc {
+	struct resource		*res[6];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+
+	struct mtx		sc_mtx;
+	int			gpio_npins;
+	struct gpio_pin		gpio_pins[NGPIO];
+	void			*gpio_ih[NPORTS];
+};
+
+struct vf_gpio_softc *gpio_sc;
+
+static struct resource_spec vf_gpio_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		1,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		2,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		3,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		4,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+vf_gpio_intr(void *arg)
+{
+	struct vf_gpio_softc *sc;
+	sc = arg;
+
+	/* TODO: interrupt handling */
+
+	return (FILTER_HANDLED);
+}
+
+
+static int
+vf_gpio_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "fsl,mvf600-gpio"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family GPIO Unit");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+vf_gpio_attach(device_t dev)
+{
+	struct vf_gpio_softc *sc;
+	int irq, i;
+
+	sc = device_get_softc(dev);
+	mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
+
+	if (bus_alloc_resources(dev, vf_gpio_spec, sc->res)) {
+		device_printf(dev, "could not allocate resources\n");
+		return (ENXIO);
+	}
+
+	gpio_sc = sc;
+
+	/* Memory interface */
+	sc->bst = rman_get_bustag(sc->res[0]);
+	sc->bsh = rman_get_bushandle(sc->res[0]);
+
+	sc->gpio_npins = NGPIO;
+
+	for (irq = 0; irq < NPORTS; irq ++) {
+		if ((bus_setup_intr(dev, sc->res[1 + irq], INTR_TYPE_MISC,
+		    vf_gpio_intr, NULL, sc, &sc->gpio_ih[irq]))) {
+			device_printf(dev,
+			    "WARNING: unable to register interrupt handler\n");
+			return (ENXIO);
+		}
+	}
+
+	for (i = 0; i < sc->gpio_npins; i++) {
+		sc->gpio_pins[i].gp_pin = i;
+		sc->gpio_pins[i].gp_caps = DEFAULT_CAPS;
+		sc->gpio_pins[i].gp_flags =
+		    (READ4(sc, GPIO_PDOR(i)) & (1 << (i % 32))) ?
+		    GPIO_PIN_OUTPUT: GPIO_PIN_INPUT;
+		snprintf(sc->gpio_pins[i].gp_name, GPIOMAXNAME,
+		    "vf_gpio%d.%d", device_get_unit(dev), i);
+	}
+
+	device_add_child(dev, "gpioc", device_get_unit(dev));
+	device_add_child(dev, "gpiobus", device_get_unit(dev));
+
+	return (bus_generic_attach(dev));
+}
+
+static int
+vf_gpio_pin_max(device_t dev, int *maxpin)
+{
+
+	*maxpin = NGPIO - 1;
+	return (0);
+}
+
+static int
+vf_gpio_pin_getname(device_t dev, uint32_t pin, char *name)
+{
+	struct vf_gpio_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+	for (i = 0; i < sc->gpio_npins; i++) {
+		if (sc->gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->gpio_npins)
+		return (EINVAL);
+
+	GPIO_LOCK(sc);
+	memcpy(name, sc->gpio_pins[i].gp_name, GPIOMAXNAME);
+	GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+vf_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps)
+{
+	struct vf_gpio_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+	for (i = 0; i < sc->gpio_npins; i++) {
+		if (sc->gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->gpio_npins)
+		return (EINVAL);
+
+	GPIO_LOCK(sc);
+	*caps = sc->gpio_pins[i].gp_caps;
+	GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+vf_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags)
+{
+	struct vf_gpio_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+	for (i = 0; i < sc->gpio_npins; i++) {
+		if (sc->gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->gpio_npins)
+		return (EINVAL);
+
+	GPIO_LOCK(sc);
+	*flags = sc->gpio_pins[i].gp_flags;
+	GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+vf_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val)
+{
+	struct vf_gpio_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+	for (i = 0; i < sc->gpio_npins; i++) {
+		if (sc->gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->gpio_npins)
+		return (EINVAL);
+
+	GPIO_LOCK(sc);
+	*val = (READ4(sc, GPIO_PDOR(i)) & (1 << (i % 32)));
+	GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+vf_gpio_pin_toggle(device_t dev, uint32_t pin)
+{
+	struct vf_gpio_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+	for (i = 0; i < sc->gpio_npins; i++) {
+		if (sc->gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->gpio_npins)
+		return (EINVAL);
+
+	GPIO_LOCK(sc);
+	WRITE4(sc, GPIO_PTOR(i), (1 << (i % 32)));
+	GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+
+static void
+vf_gpio_pin_configure(struct vf_gpio_softc *sc, struct gpio_pin *pin,
+    unsigned int flags)
+{
+
+	GPIO_LOCK(sc);
+
+	/*
+	 * Manage input/output
+	 */
+	if (flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
+		pin->gp_flags &= ~(GPIO_PIN_INPUT|GPIO_PIN_OUTPUT);
+		if (flags & GPIO_PIN_OUTPUT) {
+			pin->gp_flags |= GPIO_PIN_OUTPUT;
+
+		} else {
+			pin->gp_flags |= GPIO_PIN_INPUT;
+			WRITE4(sc, GPIO_PCOR(pin->gp_pin),
+			    (1 << (pin->gp_pin % 32)));
+		}
+	}
+
+	GPIO_UNLOCK(sc);
+}
+
+
+static int
+vf_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags)
+{
+	struct vf_gpio_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+	for (i = 0; i < sc->gpio_npins; i++) {
+		if (sc->gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->gpio_npins)
+		return (EINVAL);
+
+	/* Check for unwanted flags. */
+	if ((flags & sc->gpio_pins[i].gp_caps) != flags)
+		return (EINVAL);
+
+	/* Can't mix input/output together */
+	if ((flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) ==
+	    (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT))
+		return (EINVAL);
+
+	vf_gpio_pin_configure(sc, &sc->gpio_pins[i], flags);
+
+	return (0);
+}
+
+static int
+vf_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value)
+{
+	struct vf_gpio_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+	for (i = 0; i < sc->gpio_npins; i++) {
+		if (sc->gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->gpio_npins)
+		return (EINVAL);
+
+	GPIO_LOCK(sc);
+	if (value)
+		WRITE4(sc, GPIO_PSOR(i), (1 << (i % 32)));
+	else
+		WRITE4(sc, GPIO_PCOR(i), (1 << (i % 32)));
+	GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static device_method_t vf_gpio_methods[] = {
+	DEVMETHOD(device_probe,		vf_gpio_probe),
+	DEVMETHOD(device_attach,	vf_gpio_attach),
+
+	/* GPIO protocol */
+	DEVMETHOD(gpio_pin_max,		vf_gpio_pin_max),
+	DEVMETHOD(gpio_pin_getname,	vf_gpio_pin_getname),
+	DEVMETHOD(gpio_pin_getcaps,	vf_gpio_pin_getcaps),
+	DEVMETHOD(gpio_pin_getflags,	vf_gpio_pin_getflags),
+	DEVMETHOD(gpio_pin_get,		vf_gpio_pin_get),
+	DEVMETHOD(gpio_pin_toggle,	vf_gpio_pin_toggle),
+	DEVMETHOD(gpio_pin_setflags,	vf_gpio_pin_setflags),
+	DEVMETHOD(gpio_pin_set,		vf_gpio_pin_set),
+	{ 0, 0 }
+};
+
+static driver_t vf_gpio_driver = {
+	"gpio",
+	vf_gpio_methods,
+	sizeof(struct vf_gpio_softc),
+};
+
+static devclass_t vf_gpio_devclass;
+
+DRIVER_MODULE(vf_gpio, simplebus, vf_gpio_driver, vf_gpio_devclass, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_iomuxc.c b/sys/arm/freescale/vybrid/vf_iomuxc.c
new file mode 100644
index 00000000000..08daf5ee126
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.c
@@ -0,0 +1,171 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ */
+
+/*
+ * Vybrid Family Input/Output Multiplexer Controller (IOMUXC)
+ * Chapter 5, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#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/watchdog.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/freescale/vybrid/vf_iomuxc.h>
+#include <arm/freescale/vybrid/vf_common.h>
+
+#define	IBE		(1 << 0) /* Input Buffer Enable Field */
+#define	OBE		(1 << 1) /* Output Buffer Enable Field. */
+#define	PUE		(1 << 2) /* Pull / Keep Select Field. */
+#define	PKE		(1 << 3) /* Pull / Keep Enable Field. */
+#define	PUS_MASK	(3 << 4) /* Pull Up / Down Config Field. */
+#define	DSE_MASK	(7 << 6) /* Drive Strength Field. */
+#define	HYS		(1 << 9) /* Hysteresis Enable Field */
+
+#define	MUX_MODE_MASK		7
+#define	MUX_MODE_SHIFT		20
+#define	MUX_MODE_GPIO		0
+#define	MUX_MODE_RMII		1
+#define	MUX_MODE_RMII_CLKIN	2
+#define	MUX_MODE_VBUS_EN_OTG	2
+
+#define	PUS_22_KOHM_PULL_UP	(3 << 4)
+#define	DSE_25_OHM		(6 << 6)
+
+#define	NET0_PAD_START	45
+#define	NET1_PAD_START	54
+#define	NET_PAD_N	9
+
+struct iomuxc_softc {
+	struct resource		*tmr_res[1];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+	device_t		dev;
+};
+
+static struct resource_spec iomuxc_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int
+iomuxc_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "fsl,mvf600-iomuxc"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family IOMUXC Unit");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+configure_pad(struct iomuxc_softc *sc, int pad, int mux_mode)
+{
+	int reg;
+
+	reg = READ4(sc, pad);
+	reg &= ~(MUX_MODE_MASK << MUX_MODE_SHIFT);
+	reg |= (mux_mode << MUX_MODE_SHIFT);
+	WRITE4(sc, pad, reg);
+
+	return (0);
+}
+
+static int
+iomuxc_attach(device_t dev)
+{
+	struct iomuxc_softc *sc;
+	int reg;
+	int i;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	if (bus_alloc_resources(dev, iomuxc_spec, sc->tmr_res)) {
+		device_printf(dev, "could not allocate resources\n");
+		return (ENXIO);
+	}
+
+	/* Memory interface */
+	sc->bst = rman_get_bustag(sc->tmr_res[0]);
+	sc->bsh = rman_get_bushandle(sc->tmr_res[0]);
+
+	/* USB */
+	configure_pad(sc, IOMUXC_PTA17, MUX_MODE_VBUS_EN_OTG);
+	reg = (PKE | PUE | PUS_22_KOHM_PULL_UP | DSE_25_OHM | OBE);
+	WRITE4(sc, IOMUXC_PTA7, reg);
+
+	/* NET */
+	configure_pad(sc, IOMUXC_PTA6, MUX_MODE_RMII_CLKIN);
+
+	/* NET0 */
+	for (i = NET0_PAD_START; i <= (NET0_PAD_START + NET_PAD_N); i++) {
+		configure_pad(sc, IOMUXC(i), MUX_MODE_RMII);
+	}
+
+	/* NET1 */
+	for (i = NET1_PAD_START; i <= (NET1_PAD_START + NET_PAD_N); i++) {
+		configure_pad(sc, IOMUXC(i), MUX_MODE_RMII);
+	}
+
+	return (0);
+}
+
+static device_method_t iomuxc_methods[] = {
+	DEVMETHOD(device_probe,		iomuxc_probe),
+	DEVMETHOD(device_attach,	iomuxc_attach),
+	{ 0, 0 }
+};
+
+static driver_t iomuxc_driver = {
+	"iomuxc",
+	iomuxc_methods,
+	sizeof(struct iomuxc_softc),
+};
+
+static devclass_t iomuxc_devclass;
+
+DRIVER_MODULE(iomuxc, simplebus, iomuxc_driver, iomuxc_devclass, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_iomuxc.h b/sys/arm/freescale/vybrid/vf_iomuxc.h
new file mode 100644
index 00000000000..98b98b3c79b
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_iomuxc.h
@@ -0,0 +1,165 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ *
+ * $FreeBSD$
+ */
+
+#define	IOMUXC(n)	(n * 0x04)
+#define	IOMUXCN		135
+#define	IOMUXC_PTA6	0x000	/* Software MUX Pad Control Register 0 */
+#define	IOMUXC_PTA8	0x004	/* Software MUX Pad Control Register 1 */
+#define	IOMUXC_PTA9	0x008	/* Software MUX Pad Control Register 2 */
+#define	IOMUXC_PTA10	0x00C	/* Software MUX Pad Control Register 3 */
+#define	IOMUXC_PTA11	0x010	/* Software MUX Pad Control Register 4 */
+#define	IOMUXC_PTA12	0x014	/* Software MUX Pad Control Register 5 */
+#define	IOMUXC_PTA16	0x018	/* Software MUX Pad Control Register 6 */
+#define	IOMUXC_PTA17	0x01C	/* Software MUX Pad Control Register 7 */
+#define	IOMUXC_PTA18	0x020	/* Software MUX Pad Control Register 8 */
+#define	IOMUXC_PTA19	0x024	/* Software MUX Pad Control Register 9 */
+#define	IOMUXC_PTA20	0x028	/* Software MUX Pad Control Register 10 */
+#define	IOMUXC_PTA21	0x02C	/* Software MUX Pad Control Register 11 */
+#define	IOMUXC_PTA22	0x030	/* Software MUX Pad Control Register 12 */
+#define	IOMUXC_PTA23	0x034	/* Software MUX Pad Control Register 13 */
+#define	IOMUXC_PTA24	0x038	/* Software MUX Pad Control Register 14 */
+#define	IOMUXC_PTA25	0x03C	/* Software MUX Pad Control Register 15 */
+#define	IOMUXC_PTA26	0x040	/* Software MUX Pad Control Register 16 */
+#define	IOMUXC_PTA27	0x044	/* Software MUX Pad Control Register 17 */
+#define	IOMUXC_PTA28	0x048	/* Software MUX Pad Control Register 18 */
+#define	IOMUXC_PTA29	0x04C	/* Software MUX Pad Control Register 19 */
+#define	IOMUXC_PTA30	0x050	/* Software MUX Pad Control Register 20 */
+#define	IOMUXC_PTA31	0x054	/* Software MUX Pad Control Register 21 */
+#define	IOMUXC_PTB0	0x058	/* Software MUX Pad Control Register 22 */
+#define	IOMUXC_PTB1	0x05C	/* Software MUX Pad Control Register 23 */
+#define	IOMUXC_PTB2	0x060	/* Software MUX Pad Control Register 24 */
+#define	IOMUXC_PTB3	0x064	/* Software MUX Pad Control Register 25 */
+#define	IOMUXC_PTB4	0x068	/* Software MUX Pad Control Register 26 */
+#define	IOMUXC_PTB5	0x06C	/* Software MUX Pad Control Register 27 */
+#define	IOMUXC_PTB6	0x070	/* Software MUX Pad Control Register 28 */
+#define	IOMUXC_PTB7	0x074	/* Software MUX Pad Control Register 29 */
+#define	IOMUXC_PTB8	0x078	/* Software MUX Pad Control Register 30 */
+#define	IOMUXC_PTB9	0x07C	/* Software MUX Pad Control Register 31 */
+#define	IOMUXC_PTB10	0x080	/* Software MUX Pad Control Register 32 */
+#define	IOMUXC_PTB11	0x084	/* Software MUX Pad Control Register 33 */
+#define	IOMUXC_PTB12	0x088	/* Software MUX Pad Control Register 34 */
+#define	IOMUXC_PTB13	0x08C	/* Software MUX Pad Control Register 35 */
+#define	IOMUXC_PTB14	0x090	/* Software MUX Pad Control Register 36 */
+#define	IOMUXC_PTB15	0x094	/* Software MUX Pad Control Register 37 */
+#define	IOMUXC_PTB16	0x098	/* Software MUX Pad Control Register 38 */
+#define	IOMUXC_PTB17	0x09C	/* Software MUX Pad Control Register 39 */
+#define	IOMUXC_PTB18	0x0A0	/* Software MUX Pad Control Register 40 */
+#define	IOMUXC_PTB19	0x0A4	/* Software MUX Pad Control Register 41 */
+#define	IOMUXC_PTB20	0x0A8	/* Software MUX Pad Control Register 42 */
+#define	IOMUXC_PTB21	0x0AC	/* Software MUX Pad Control Register 43 */
+#define	IOMUXC_PTB22	0x0B0	/* Software MUX Pad Control Register 44 */
+#define	IOMUXC_PTC0	0x0B4	/* Software MUX Pad Control Register 45 */
+#define	IOMUXC_PTC1	0x0B8	/* Software MUX Pad Control Register 46 */
+#define	IOMUXC_PTC2	0x0BC	/* Software MUX Pad Control Register 47 */
+#define	IOMUXC_PTC3	0x0C0	/* Software MUX Pad Control Register 48 */
+#define	IOMUXC_PTC4	0x0C4	/* Software MUX Pad Control Register 49 */
+#define	IOMUXC_PTC5	0x0C8	/* Software MUX Pad Control Register 50 */
+#define	IOMUXC_PTC6	0x0CC	/* Software MUX Pad Control Register 51 */
+#define	IOMUXC_PTC7	0x0D0	/* Software MUX Pad Control Register 52 */
+#define	IOMUXC_PTC8	0x0D4	/* Software MUX Pad Control Register 53 */
+#define	IOMUXC_PTC9	0x0D8	/* Software MUX Pad Control Register 54 */
+#define	IOMUXC_PTC10	0x0DC	/* Software MUX Pad Control Register 55 */
+#define	IOMUXC_PTC11	0x0E0	/* Software MUX Pad Control Register 56 */
+#define	IOMUXC_PTC12	0x0E4	/* Software MUX Pad Control Register 57 */
+#define	IOMUXC_PTC13	0x0E8	/* Software MUX Pad Control Register 58 */
+#define	IOMUXC_PTC14	0x0EC	/* Software MUX Pad Control Register 59 */
+#define	IOMUXC_PTC15	0x0F0	/* Software MUX Pad Control Register 60 */
+#define	IOMUXC_PTC16	0x0F4	/* Software MUX Pad Control Register 61 */
+#define	IOMUXC_PTC17	0x0F8	/* Software MUX Pad Control Register 62 */
+#define	IOMUXC_PTD31	0x0FC	/* Software MUX Pad Control Register 63 */
+#define	IOMUXC_PTD30	0x100	/* Software MUX Pad Control Register 64 */
+#define	IOMUXC_PTD29	0x104	/* Software MUX Pad Control Register 65 */
+#define	IOMUXC_PTD28	0x108	/* Software MUX Pad Control Register 66 */
+#define	IOMUXC_PTD27	0x10C	/* Software MUX Pad Control Register 67 */
+#define	IOMUXC_PTD26	0x110	/* Software MUX Pad Control Register 68 */
+#define	IOMUXC_PTD25	0x114	/* Software MUX Pad Control Register 69 */
+#define	IOMUXC_PTD24	0x118	/* Software MUX Pad Control Register 70 */
+#define	IOMUXC_PTD23	0x11C	/* Software MUX Pad Control Register 71 */
+#define	IOMUXC_PTD22	0x120	/* Software MUX Pad Control Register 72 */
+#define	IOMUXC_PTD21	0x124	/* Software MUX Pad Control Register 73 */
+#define	IOMUXC_PTD20	0x128	/* Software MUX Pad Control Register 74 */
+#define	IOMUXC_PTD19	0x12C	/* Software MUX Pad Control Register 75 */
+#define	IOMUXC_PTD18	0x130	/* Software MUX Pad Control Register 76 */
+#define	IOMUXC_PTD17	0x134	/* Software MUX Pad Control Register 77 */
+#define	IOMUXC_PTD16	0x138	/* Software MUX Pad Control Register 78 */
+#define	IOMUXC_PTD0	0x13C	/* Software MUX Pad Control Register 79 */
+#define	IOMUXC_PTD1	0x140	/* Software MUX Pad Control Register 80 */
+#define	IOMUXC_PTD2	0x144	/* Software MUX Pad Control Register 81 */
+#define	IOMUXC_PTD3	0x148	/* Software MUX Pad Control Register 82 */
+#define	IOMUXC_PTD4	0x14C	/* Software MUX Pad Control Register 83 */
+#define	IOMUXC_PTD5	0x150	/* Software MUX Pad Control Register 84 */
+#define	IOMUXC_PTD6	0x154	/* Software MUX Pad Control Register 85 */
+#define	IOMUXC_PTD7	0x158	/* Software MUX Pad Control Register 86 */
+#define	IOMUXC_PTD8	0x15C	/* Software MUX Pad Control Register 87 */
+#define	IOMUXC_PTD9	0x160	/* Software MUX Pad Control Register 88 */
+#define	IOMUXC_PTD10	0x164	/* Software MUX Pad Control Register 89 */
+#define	IOMUXC_PTD11	0x168	/* Software MUX Pad Control Register 90 */
+#define	IOMUXC_PTD12	0x16C	/* Software MUX Pad Control Register 91 */
+#define	IOMUXC_PTD13	0x170	/* Software MUX Pad Control Register 92 */
+#define	IOMUXC_PTB23	0x174	/* Software MUX Pad Control Register 93 */
+#define	IOMUXC_PTB24	0x178	/* Software MUX Pad Control Register 94 */
+#define	IOMUXC_PTB25	0x17C	/* Software MUX Pad Control Register 95 */
+#define	IOMUXC_PTB26	0x180	/* Software MUX Pad Control Register 96 */
+#define	IOMUXC_PTB27	0x184	/* Software MUX Pad Control Register 97 */
+#define	IOMUXC_PTB28	0x188	/* Software MUX Pad Control Register 98 */
+#define	IOMUXC_PTC26	0x18C	/* Software MUX Pad Control Register 99 */
+#define	IOMUXC_PTC27	0x190	/* Software MUX Pad Control Register 100 */
+#define	IOMUXC_PTC28	0x194	/* Software MUX Pad Control Register 101 */
+#define	IOMUXC_PTC29	0x198	/* Software MUX Pad Control Register 102 */
+#define	IOMUXC_PTC30	0x19C	/* Software MUX Pad Control Register 103 */
+#define	IOMUXC_PTC31	0x1A0	/* Software MUX Pad Control Register 104 */
+#define	IOMUXC_PTE0	0x1A4	/* Software MUX Pad Control Register 105 */
+#define	IOMUXC_PTE1	0x1A8	/* Software MUX Pad Control Register 106 */
+#define	IOMUXC_PTE2	0x1AC	/* Software MUX Pad Control Register 107 */
+#define	IOMUXC_PTE3	0x1B0	/* Software MUX Pad Control Register 108 */
+#define	IOMUXC_PTE4	0x1B4	/* Software MUX Pad Control Register 109 */
+#define	IOMUXC_PTE5	0x1B8	/* Software MUX Pad Control Register 110 */
+#define	IOMUXC_PTE6	0x1BC	/* Software MUX Pad Control Register 111 */
+#define	IOMUXC_PTE7	0x1C0	/* Software MUX Pad Control Register 112 */
+#define	IOMUXC_PTE8	0x1C4	/* Software MUX Pad Control Register 113 */
+#define	IOMUXC_PTE9	0x1C8	/* Software MUX Pad Control Register 114 */
+#define	IOMUXC_PTE10	0x1CC	/* Software MUX Pad Control Register 115 */
+#define	IOMUXC_PTE11	0x1D0	/* Software MUX Pad Control Register 116 */
+#define	IOMUXC_PTE12	0x1D4	/* Software MUX Pad Control Register 117 */
+#define	IOMUXC_PTE13	0x1D8	/* Software MUX Pad Control Register 118 */
+#define	IOMUXC_PTE14	0x1DC	/* Software MUX Pad Control Register 119 */
+#define	IOMUXC_PTE15	0x1E0	/* Software MUX Pad Control Register 120 */
+#define	IOMUXC_PTE16	0x1E4	/* Software MUX Pad Control Register 121 */
+#define	IOMUXC_PTE17	0x1E8	/* Software MUX Pad Control Register 122 */
+#define	IOMUXC_PTE18	0x1EC	/* Software MUX Pad Control Register 123 */
+#define	IOMUXC_PTE19	0x1F0	/* Software MUX Pad Control Register 124 */
+#define	IOMUXC_PTE20	0x1F4	/* Software MUX Pad Control Register 125 */
+#define	IOMUXC_PTE21	0x1F8	/* Software MUX Pad Control Register 126 */
+#define	IOMUXC_PTE22	0x1FC	/* Software MUX Pad Control Register 127 */
+#define	IOMUXC_PTE23	0x200	/* Software MUX Pad Control Register 128 */
+#define	IOMUXC_PTE24	0x204	/* Software MUX Pad Control Register 129 */
+#define	IOMUXC_PTE25	0x208	/* Software MUX Pad Control Register 130 */
+#define	IOMUXC_PTE26	0x20C	/* Software MUX Pad Control Register 131 */
+#define	IOMUXC_PTE27	0x210	/* Software MUX Pad Control Register 132 */
+#define	IOMUXC_PTE28	0x214	/* Software MUX Pad Control Register 133 */
+#define	IOMUXC_PTA7	0x218	/* Software MUX Pad Control Register 134 */
diff --git a/usr.sbin/pkg_install/lib/pkgng.c b/sys/arm/freescale/vybrid/vf_machdep.c
similarity index 62%
rename from usr.sbin/pkg_install/lib/pkgng.c
rename to sys/arm/freescale/vybrid/vf_machdep.c
index 3aba3833e7a..29e7355ada1 100644
--- a/usr.sbin/pkg_install/lib/pkgng.c
+++ b/sys/arm/freescale/vybrid/vf_machdep.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012 Eitan Adler
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -22,40 +22,72 @@
  * LIABILITY, OR TORT (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 "opt_ddb.h"
+#include "opt_platform.h"
+
 #include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
-#include "lib.h"
-#include <err.h>
+#define	_ARM32_BUS_DMA_PRIVATE
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
 
-static const char message[] = "You appear to be using the newer pkg(1) tool on \
-this system for package management, rather than the legacy package \
-management tools (pkg_*).  The legacy tools should no longer be used on \
-this system.";
+#include <vm/vm.h>
 
-void warnpkgng(void)
+#include <machine/armreg.h>
+#include <machine/bus.h>
+#include <machine/devmap.h>
+#include <machine/machdep.h>
+
+#include <dev/fdt/fdt_common.h>
+
+vm_offset_t
+initarm_lastaddr(void)
 {
-	char pkgngpath[MAXPATHLEN + 1];
-	char *pkgngdir;
-	char *dontwarn;
-	int rc;
 
-	dontwarn = getenv("PKG_OLD_NOWARN");
-	if (dontwarn != NULL)
-		return;
-	pkgngdir = getenv("PKG_DBDIR");
-	if (pkgngdir == NULL)
-		pkgngdir = "/var/db/pkg";
-
-	rc = snprintf(pkgngpath, sizeof(pkgngpath), "%s/local.sqlite", pkgngdir);
-	if ((size_t)rc >= sizeof(pkgngpath)) {
-		warnx("path too long: %s/local.sqlite", pkgngdir);
-		return;
-	}
-
-	if (access(pkgngpath, F_OK) == 0)
-		warnx(message);
+	return (arm_devmap_lastaddr());
+}
+
+void
+initarm_early_init(void)
+{
+
+}
+
+void
+initarm_gpio_init(void)
+{
+
+}
+
+void
+initarm_late_init(void)
+{
+
+}
+
+int
+initarm_devmap_init(void)
+{
+
+	arm_devmap_add_entry(0x40000000, 0x100000);
+
+	return (0);
+}
+
+struct arm32_dma_range *
+bus_dma_get_range(void)
+{
+
+	return (NULL);
+}
+
+int
+bus_dma_get_range_nb(void)
+{
+
+	return (0);
 }
diff --git a/sys/dev/isf/isf_fdt.c b/sys/arm/freescale/vybrid/vf_mscm.c
similarity index 50%
rename from sys/dev/isf/isf_fdt.c
rename to sys/arm/freescale/vybrid/vf_mscm.c
index f4c20a29c8e..57416276237 100644
--- a/sys/dev/isf/isf_fdt.c
+++ b/sys/arm/freescale/vybrid/vf_mscm.c
@@ -1,12 +1,7 @@
 /*-
- * Copyright (c) 2012 Robert N. M. Watson
- * Copyright (c) 2012 SRI International
+ * Copyright (c) 2013 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:
@@ -29,96 +24,100 @@
  * SUCH DAMAGE.
  */
 
+/*
+ * Vybrid Family Miscellaneous System Control Module (MSCM)
+ * Chapter 66, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/condvar.h>
-#include <sys/conf.h>
-#include <sys/bio.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/mutex.h>
-#include <sys/rman.h>
 #include <sys/systm.h>
-#include <sys/taskqueue.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-
-#include <geom/geom_disk.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/watchdog.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 <dev/isf/isf.h>
+#include <machine/bus.h>
+#include <machine/fdt.h>
+#include <machine/cpu.h>
+#include <machine/intr.h>
+
+#include <arm/freescale/vybrid/vf_common.h>
+
+#define	VF_NINT	112	/* Total number of interrupts */
+
+/* Int Router Shared Peripheral Routing Control */
+#define	MSCM_IRSPRC(n)	(0x880 + 2 * n)
+
+struct mscm_softc {
+	struct resource		*res[1];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+};
+
+static struct resource_spec mscm_spec[] = {
+	{ SYS_RES_MEMORY,       0,      RF_ACTIVE },
+	{ -1, 0 }
+};
 
-/*
- * FDT bus attachment for the Intel Strata Flash devices.
- */
 static int
-isf_fdt_probe(device_t dev)
+mscm_probe(device_t dev)
 {
 
-	if (ofw_bus_is_compatible(dev, "intel,strataflash")) {
-		device_set_desc(dev, "Intel StrataFlash NOR flash device");
-		return (BUS_PROBE_DEFAULT);
-	}
-	return (ENXIO);
+	if (!ofw_bus_is_compatible(dev, "fsl,mvf600-mscm"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family Miscellaneous System Control Module");
+	return (BUS_PROBE_DEFAULT);
 }
 
 static int
-isf_fdt_attach(device_t dev)
+mscm_attach(device_t dev)
 {
-	int			 error;
-	struct isf_softc	*sc;
+	struct mscm_softc *sc;
+	int i;
 
 	sc = device_get_softc(dev);
-	sc->isf_dev = dev;
-	sc->isf_unit = device_get_unit(dev);
-	sc->isf_rid = 0;
-	sc->isf_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-	    &sc->isf_rid, RF_ACTIVE);
-	if (sc->isf_res == NULL) {
-		device_printf(dev, "couldn't map memory\n");
+
+	if (bus_alloc_resources(dev, mscm_spec, sc->res)) {
+		device_printf(dev, "could not allocate resources\n");
 		return (ENXIO);
 	}
-	error = isf_attach(sc);
-	if (error)
-		bus_release_resource(dev, SYS_RES_MEMORY, sc->isf_rid,
-		    sc->isf_res);
-	return (error);
-}
 
-static int
-isf_fdt_detach(device_t dev)
-{
-	struct isf_softc *sc;
+	/* Memory interface */
+	sc->bst = rman_get_bustag(sc->res[0]);
+	sc->bsh = rman_get_bushandle(sc->res[0]);
+
+	/* Route all the interrupts to CP0 */
+	for (i = 0; i < VF_NINT; i++)
+		WRITE2(sc, MSCM_IRSPRC(i), 1);
 
-	sc = device_get_softc(dev);
-	KASSERT(sc->isf_res != NULL, ("%s: resources not allocated",
-	    __func__));
-	isf_detach(sc);
-	bus_release_resource(dev, SYS_RES_MEMORY, sc->isf_rid, sc->isf_res);
 	return (0);
 }
 
-static device_method_t isf_fdt_methods[] = {
-	DEVMETHOD(device_probe,		isf_fdt_probe),
-	DEVMETHOD(device_attach,	isf_fdt_attach),
-	DEVMETHOD(device_detach,	isf_fdt_detach),
+static device_method_t mscm_methods[] = {
+	DEVMETHOD(device_probe,		mscm_probe),
+	DEVMETHOD(device_attach,	mscm_attach),
 	{ 0, 0 }
 };
 
-static driver_t isf_fdt_driver = {
-	"isf",
-	isf_fdt_methods,
-	sizeof(struct isf_softc),
+static driver_t mscm_driver = {
+	"mscm",
+	mscm_methods,
+	sizeof(struct mscm_softc),
 };
 
-DRIVER_MODULE(isf, simplebus, isf_fdt_driver, isf_devclass, 0, 0);
+static devclass_t mscm_devclass;
+
+DRIVER_MODULE(mscm, simplebus, mscm_driver, mscm_devclass, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_nfc.c b/sys/arm/freescale/vybrid/vf_nfc.c
new file mode 100644
index 00000000000..8132200c16d
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_nfc.c
@@ -0,0 +1,524 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ */
+
+/*
+ * Vybrid Family NAND Flash Controller (NFC)
+ * Chapter 31, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/rman.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/time.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/nand/nand.h>
+#include <dev/nand/nandbus.h>
+
+#include <machine/bus.h>
+#include <machine/fdt.h>
+
+#include "nfc_if.h"
+
+#include <arm/freescale/vybrid/vf_common.h>
+
+enum addr_type {
+	ADDR_NONE,
+	ADDR_ID,
+	ADDR_ROW,
+	ADDR_ROWCOL
+};
+
+struct fsl_nfc_fcm {
+	uint32_t	addr_bits;
+	enum addr_type  addr_type;
+	uint32_t	col_addr_bits;
+	uint32_t	row_addr_bits;
+	u_int		read_ptr;
+	u_int		addr_ptr;
+	u_int		command;
+	u_int		code;
+};
+
+struct vf_nand_softc {
+	struct nand_softc 	nand_dev;
+	bus_space_handle_t 	bsh;
+	bus_space_tag_t		bst;
+	struct resource		*res[2];
+	struct fsl_nfc_fcm	fcm;
+};
+
+static struct resource_spec nfc_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
+	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
+	{ -1, 0 }
+};
+
+static int	vf_nand_attach(device_t);
+static int	vf_nand_probe(device_t);
+static int	vf_nand_send_command(device_t, uint8_t);
+static int	vf_nand_send_address(device_t, uint8_t);
+static int	vf_nand_start_command(device_t);
+static uint8_t	vf_nand_read_byte(device_t);
+static void	vf_nand_read_buf(device_t, void *, uint32_t);
+static void	vf_nand_write_buf(device_t, void *, uint32_t);
+static int	vf_nand_select_cs(device_t, uint8_t);
+static int	vf_nand_read_rnb(device_t);
+
+#define	CMD_READ_PAGE		0x7EE0
+#define	CMD_PROG_PAGE		0x7FC0
+#define	CMD_PROG_PAGE_DMA	0xFFC8
+#define	CMD_ERASE		0x4EC0
+#define	CMD_READ_ID		0x4804
+#define	CMD_READ_STATUS		0x4068
+#define	CMD_RESET		0x4040
+#define	CMD_RANDOM_IN		0x7140
+#define	CMD_RANDOM_OUT		0x70E0
+
+#define	CMD_BYTE2_PROG_PAGE	0x10
+#define	CMD_BYTE2_PAGE_READ	0x30
+#define	CMD_BYTE2_ERASE		0xD0
+
+#define	NFC_CMD1	0x3F00	/* Flash command 1 */
+#define	NFC_CMD2	0x3F04	/* Flash command 2 */
+#define	NFC_CAR		0x3F08	/* Column address */
+#define	NFC_RAR		0x3F0C	/* Row address */
+#define	NFC_RPT		0x3F10	/* Flash command repeat */
+#define	NFC_RAI		0x3F14	/* Row address increment */
+#define	NFC_SR1		0x3F18	/* Flash status 1 */
+#define	NFC_SR2		0x3F1C	/* Flash status 2 */
+#define	NFC_DMA_CH1	0x3F20	/* DMA channel 1 address */
+#define	NFC_DMACFG	0x3F24	/* DMA configuration */
+#define	NFC_SWAP	0x3F28	/* Cach swap */
+#define	NFC_SECSZ	0x3F2C	/* Sector size */
+#define	NFC_CFG		0x3F30	/* Flash configuration */
+#define	NFC_DMA_CH2	0x3F34	/* DMA channel 2 address */
+#define	NFC_ISR		0x3F38	/* Interrupt status */
+
+#define	ECCMODE_SHIFT		17
+#define	AIAD_SHIFT		5
+#define	AIBN_SHIFT		4
+#define	PAGECOUNT_SHIFT		0
+#define	BITWIDTH_SHIFT		7
+#define	BITWIDTH8		0
+#define	BITWIDTH16		1
+#define	PAGECOUNT_MASK		0xf
+
+#define	CMD2_BYTE1_SHIFT	24
+#define	CMD2_CODE_SHIFT		8
+#define	CMD2_BUFNO_SHIFT	1
+#define	CMD2_START_SHIFT	0
+
+static device_method_t vf_nand_methods[] = {
+	DEVMETHOD(device_probe,		vf_nand_probe),
+	DEVMETHOD(device_attach,	vf_nand_attach),
+	DEVMETHOD(nfc_start_command,	vf_nand_start_command),
+	DEVMETHOD(nfc_send_command,	vf_nand_send_command),
+	DEVMETHOD(nfc_send_address,	vf_nand_send_address),
+	DEVMETHOD(nfc_read_byte,	vf_nand_read_byte),
+	DEVMETHOD(nfc_read_buf,		vf_nand_read_buf),
+	DEVMETHOD(nfc_write_buf,	vf_nand_write_buf),
+	DEVMETHOD(nfc_select_cs,	vf_nand_select_cs),
+	DEVMETHOD(nfc_read_rnb,		vf_nand_read_rnb),
+	{ 0, 0 },
+};
+
+static driver_t vf_nand_driver = {
+	"nand",
+	vf_nand_methods,
+	sizeof(struct vf_nand_softc),
+};
+
+static devclass_t vf_nand_devclass;
+DRIVER_MODULE(vf_nand, simplebus, vf_nand_driver, vf_nand_devclass, 0, 0);
+
+static int
+vf_nand_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "fsl,mvf600-nand"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family NAND controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+vf_nand_attach(device_t dev)
+{
+	struct vf_nand_softc *sc;
+	int err;
+	int reg;
+
+	sc = device_get_softc(dev);
+	if (bus_alloc_resources(dev, nfc_spec, sc->res)) {
+		device_printf(dev, "could not allocate resources!\n");
+		return (ENXIO);
+	}
+
+	sc->bst = rman_get_bustag(sc->res[0]);
+	sc->bsh = rman_get_bushandle(sc->res[0]);
+
+	/* Size in bytes of one elementary transfer unit */
+	WRITE4(sc, NFC_SECSZ, 2048);
+
+	/* Flash mode width */
+	reg = READ4(sc, NFC_CFG);
+	reg |= (BITWIDTH16 << BITWIDTH_SHIFT);
+
+	/* No correction, ECC bypass */
+	reg &= ~(0x7 << ECCMODE_SHIFT);
+
+	/* Disable Auto-incrementing of flash row address */
+	reg &= ~(0x1 << AIAD_SHIFT);
+
+	/* Disable Auto-incrementing of buffer numbers */
+	reg &= ~(0x1 << AIBN_SHIFT);
+
+	/*
+	 * Number of virtual pages (in one physical flash page)
+	 * to be programmed or read, etc.
+	 */
+	reg &= ~(PAGECOUNT_MASK);
+	reg |= (1 << PAGECOUNT_SHIFT);
+	WRITE4(sc, NFC_CFG, reg);
+
+	nand_init(&sc->nand_dev, dev, NAND_ECC_NONE, 0, 0, NULL, NULL);
+	err = nandbus_create(dev);
+	return (err);
+}
+
+static int
+vf_nand_start_command(device_t dev)
+{
+	struct vf_nand_softc *sc;
+	struct fsl_nfc_fcm *fcm;
+	int reg;
+
+	sc = device_get_softc(dev);
+	fcm = &sc->fcm;
+
+	nand_debug(NDBG_DRV,"vf_nand: start command %x", fcm->command);
+
+	/* CMD2 */
+	reg = READ4(sc, NFC_CMD2);
+	reg &= ~(0xff << CMD2_BYTE1_SHIFT);
+	reg |= (fcm->command << CMD2_BYTE1_SHIFT);
+	WRITE4(sc, NFC_CMD2, reg);
+
+	/* CMD1 */
+	if ((fcm->command == NAND_CMD_READ) ||
+	    (fcm->command == NAND_CMD_PROG) ||
+	    (fcm->command == NAND_CMD_ERASE)) {
+		reg = READ4(sc, NFC_CMD1);
+		reg &= ~(0xff << 24);
+
+		if (fcm->command == NAND_CMD_READ)
+			reg |= (CMD_BYTE2_PAGE_READ << 24);
+		else if (fcm->command == NAND_CMD_PROG)
+			reg |= (CMD_BYTE2_PROG_PAGE << 24);
+		else if (fcm->command == NAND_CMD_ERASE)
+			reg |= (CMD_BYTE2_ERASE << 24);
+
+		WRITE4(sc, NFC_CMD1, reg);
+	}
+
+	/* We work with 1st buffer */
+	reg = READ4(sc, NFC_CMD2);
+	reg &= ~(0xf << CMD2_BUFNO_SHIFT);
+	reg |= (0 << CMD2_BUFNO_SHIFT);
+	WRITE4(sc, NFC_CMD2, reg);
+
+	/* Cmd CODE */
+	reg = READ4(sc, NFC_CMD2);
+	reg &= ~(0xffff << CMD2_CODE_SHIFT);
+	reg |= (fcm->code << CMD2_CODE_SHIFT);
+	WRITE4(sc, NFC_CMD2, reg);
+
+	/* Col */
+	if (fcm->addr_type == ADDR_ROWCOL) {
+		reg = READ4(sc, NFC_CAR);
+		reg &= ~(0xffff);
+		reg |= fcm->col_addr_bits;
+		nand_debug(NDBG_DRV,"setting CAR to 0x%08x\n", reg);
+		WRITE4(sc, NFC_CAR, reg);
+	}
+
+	/* Row */
+	reg = READ4(sc, NFC_RAR);
+	reg &= ~(0xffffff);
+	if (fcm->addr_type == ADDR_ID)
+		reg |= fcm->addr_bits;
+	else
+		reg |= fcm->row_addr_bits;
+	WRITE4(sc, NFC_RAR, reg);
+
+	/* Start */
+	reg = READ4(sc, NFC_CMD2);
+	reg |= (1 << CMD2_START_SHIFT);
+	WRITE4(sc, NFC_CMD2, reg);
+
+	/* Wait command completion */
+	while (READ4(sc, NFC_CMD2) & (1 << CMD2_START_SHIFT))
+		;
+
+	return (0);
+}
+
+static int
+vf_nand_send_command(device_t dev, uint8_t command)
+{
+	struct vf_nand_softc *sc;
+	struct fsl_nfc_fcm *fcm;
+
+	nand_debug(NDBG_DRV,"vf_nand: send command %x", command);
+
+	sc = device_get_softc(dev);
+	fcm = &sc->fcm;
+
+	if ((command == NAND_CMD_READ_END) ||
+	    (command == NAND_CMD_PROG_END) ||
+	    (command == NAND_CMD_ERASE_END)) {
+		return (0);
+	}
+
+	fcm->command = command;
+
+	fcm->code = 0;
+	fcm->read_ptr = 0;
+	fcm->addr_type = 0;
+	fcm->addr_bits = 0;
+
+	fcm->addr_ptr = 0;
+	fcm->col_addr_bits = 0;
+	fcm->row_addr_bits = 0;
+
+	switch (command) {
+	case NAND_CMD_READ:
+		fcm->code = CMD_READ_PAGE;
+		fcm->addr_type = ADDR_ROWCOL;
+		break;
+	case NAND_CMD_PROG:
+		fcm->code = CMD_PROG_PAGE;
+		fcm->addr_type = ADDR_ROWCOL;
+		break;
+	case NAND_CMD_PROG_END:
+		break;
+	case NAND_CMD_ERASE_END:
+		break;
+	case NAND_CMD_RESET:
+		fcm->code = CMD_RESET;
+		break;
+	case NAND_CMD_READ_ID:
+		fcm->code = CMD_READ_ID;
+		fcm->addr_type = ADDR_ID;
+		break;
+	case NAND_CMD_READ_PARAMETER:
+		fcm->code = CMD_READ_PAGE;
+		fcm->addr_type = ADDR_ID;
+		break;
+	case NAND_CMD_STATUS:
+		fcm->code = CMD_READ_STATUS;
+		break;
+	case NAND_CMD_ERASE:
+		fcm->code = CMD_ERASE;
+		fcm->addr_type = ADDR_ROW;
+		break;
+	default:
+		nand_debug(NDBG_DRV, "unknown command %d\n", command);
+		return (1);
+	}
+
+	return (0);
+}
+
+static int
+vf_nand_send_address(device_t dev, uint8_t addr)
+{
+	struct vf_nand_softc *sc;
+	struct fsl_nfc_fcm *fcm;
+
+	nand_debug(NDBG_DRV,"vf_nand: send address %x", addr);
+	sc = device_get_softc(dev);
+	fcm = &sc->fcm;
+
+	nand_debug(NDBG_DRV, "setting addr #%d to 0x%02x\n", fcm->addr_ptr, addr);
+
+	if (fcm->addr_type == ADDR_ID) {
+		fcm->addr_bits = addr;
+	} else if (fcm->addr_type == ADDR_ROWCOL) {
+
+		if (fcm->addr_ptr < 2)
+			fcm->col_addr_bits |= (addr << (fcm->addr_ptr * 8));
+		else
+			fcm->row_addr_bits |= (addr << ((fcm->addr_ptr - 2) * 8));
+
+	} else if (fcm->addr_type == ADDR_ROW)
+		fcm->row_addr_bits |= (addr << (fcm->addr_ptr * 8));
+
+	fcm->addr_ptr += 1;
+
+	return (0);
+}
+
+static uint8_t
+vf_nand_read_byte(device_t dev)
+{
+	struct vf_nand_softc *sc;
+	struct fsl_nfc_fcm *fcm;
+	uint8_t data;
+	int sr1, sr2;
+	int b;
+
+	sc = device_get_softc(dev);
+	fcm = &sc->fcm;
+
+	sr1 = READ4(sc, NFC_SR1);
+	sr2 = READ4(sc, NFC_SR2);
+
+	data = 0;
+	if (fcm->addr_type == ADDR_ID) {
+		b = 32 - ((fcm->read_ptr + 1) * 8);
+		data = (sr1 >> b) & 0xff;
+		fcm->read_ptr++;
+	} else if (fcm->command == NAND_CMD_STATUS) {
+		data = sr2 & 0xff;
+	}
+
+	nand_debug(NDBG_DRV,"vf_nand: read %x", data);
+	return (data);
+}
+
+static void
+vf_nand_read_buf(device_t dev, void* buf, uint32_t len)
+{
+	struct vf_nand_softc *sc;
+	struct fsl_nfc_fcm *fcm;
+	uint16_t *tmp;
+	uint8_t *b;
+	int i;
+
+	b = (uint8_t*)buf;
+	sc = device_get_softc(dev);
+	fcm = &sc->fcm;
+
+	nand_debug(NDBG_DRV, "vf_nand: read_buf len %d", len);
+
+	if (fcm->command == NAND_CMD_READ_PARAMETER) {
+		tmp = malloc(len, M_DEVBUF, M_NOWAIT);
+		bus_read_region_2(sc->res[0], 0x0, tmp, len);
+
+		for (i = 0; i < len; i += 2) {
+			b[i] = tmp[i+1];
+			b[i+1] = tmp[i];
+		}
+
+		free(tmp, M_DEVBUF);
+
+#ifdef NAND_DEBUG
+		for (i = 0; i < len; i++) {
+			if (!(i % 16))
+				printf("%s", i == 0 ? "vf_nand:\n" : "\n");
+			printf(" %x", b[i]);
+			if (i == len - 1)
+				printf("\n");
+		}
+#endif
+
+	} else {
+
+		for (i = 0; i < len; i++) {
+			b[i] = READ1(sc, i);
+
+#ifdef NAND_DEBUG
+			if (!(i % 16))
+				printf("%s", i == 0 ? "vf_nand:\n" : "\n");
+			printf(" %x", b[i]);
+			if (i == len - 1)
+				printf("\n");
+#endif
+		}
+
+	}
+}
+
+static void
+vf_nand_write_buf(device_t dev, void* buf, uint32_t len)
+{
+	struct vf_nand_softc *sc;
+	struct fsl_nfc_fcm *fcm;
+	uint8_t *b;
+	int i;
+
+	b = (uint8_t*)buf;
+	sc = device_get_softc(dev);
+	fcm = &sc->fcm;
+
+	nand_debug(NDBG_DRV,"vf_nand: write_buf len %d", len);
+
+	for (i = 0; i < len; i++) {
+		WRITE1(sc, i, b[i]);
+
+#ifdef NAND_DEBUG
+		if (!(i % 16))
+			printf("%s", i == 0 ? "vf_nand:\n" : "\n");
+		printf(" %x", b[i]);
+		if (i == len - 1)
+			printf("\n");
+#endif
+
+	}
+}
+
+static int
+vf_nand_select_cs(device_t dev, uint8_t cs)
+{
+
+	if (cs > 0)
+		return (ENODEV);
+
+	return (0);
+}
+
+static int
+vf_nand_read_rnb(device_t dev)
+{
+
+	/* no-op */
+	return (0); /* ready */
+}
diff --git a/sys/arm/freescale/vybrid/vf_src.c b/sys/arm/freescale/vybrid/vf_src.c
new file mode 100644
index 00000000000..0fe6f3b3f15
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_src.c
@@ -0,0 +1,147 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ */
+
+/*
+ * Vybrid Family System Reset Controller (SRC)
+ * Chapter 18, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#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/watchdog.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/freescale/vybrid/vf_src.h>
+#include <arm/freescale/vybrid/vf_common.h>
+
+#define	SRC_SCR		0x00	/* SRC Control Register */
+#define	SRC_SBMR1	0x04	/* SRC Boot Mode Register 1 */
+#define	SRC_SRSR	0x08	/* SRC Status Register */
+#define	SRC_SECR	0x0C	/* SRC_SECR */
+#define	SRC_SICR	0x14	/* SRC Reset Interrupt Configuration Register */
+#define	SRC_SIMR	0x18	/* SRC Interrupt Masking Register */
+#define	SRC_SBMR2	0x1C	/* SRC Boot Mode Register 2 */
+#define	SRC_GPR0	0x20	/* General Purpose Register */
+#define	SRC_GPR1	0x24	/* General Purpose Register */
+#define	SRC_GPR2	0x28	/* General Purpose Register */
+#define	SRC_GPR3	0x2C	/* General Purpose Register */
+#define	SRC_GPR4	0x30	/* General Purpose Register */
+#define	SRC_MISC0	0x4C	/* MISC0 */
+#define	SRC_MISC1	0x50	/* MISC1 */
+#define	SRC_MISC2	0x54	/* MISC2 */
+#define	SRC_MISC3	0x58	/* MISC3 */
+
+struct src_softc {
+	struct resource		*res[1];
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+};
+
+struct src_softc *src_sc;
+
+static struct resource_spec src_spec[] = {
+	{ SYS_RES_MEMORY,       0,      RF_ACTIVE },
+	{ -1, 0 }
+};
+
+int
+src_swreset(void)
+{
+
+	if (src_sc == NULL)
+		return (1);
+
+	WRITE4(src_sc, SRC_SCR, SW_RST);
+
+	return (0);
+}
+
+static int
+src_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "fsl,mvf600-src"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Vybrid Family System Reset Controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+src_attach(device_t dev)
+{
+	struct src_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	if (bus_alloc_resources(dev, src_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]);
+
+	src_sc = sc;
+
+	return (0);
+}
+
+static device_method_t src_methods[] = {
+	DEVMETHOD(device_probe,		src_probe),
+	DEVMETHOD(device_attach,	src_attach),
+	{ 0, 0 }
+};
+
+static driver_t src_driver = {
+	"src",
+	src_methods,
+	sizeof(struct src_softc),
+};
+
+static devclass_t src_devclass;
+
+DRIVER_MODULE(src, simplebus, src_driver, src_devclass, 0, 0);
diff --git a/sys/arm/freescale/vybrid/vf_src.h b/sys/arm/freescale/vybrid/vf_src.h
new file mode 100644
index 00000000000..8e50b058a83
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_src.h
@@ -0,0 +1,30 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ *
+ * $FreeBSD$
+ */
+
+#define	SW_RST	(1 << 12)	/* Software reset */
+int src_swreset(void);
diff --git a/sys/arm/freescale/vybrid/vf_uart.c b/sys/arm/freescale/vybrid/vf_uart.c
new file mode 100644
index 00000000000..d1814326eb3
--- /dev/null
+++ b/sys/arm/freescale/vybrid/vf_uart.c
@@ -0,0 +1,509 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ */
+
+/*
+ * Vybrid Family Universal Asynchronous Receiver/Transmitter
+ * Chapter 49, Vybrid Reference Manual, Rev. 5, 07/2013
+ */
+
+#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 "uart_if.h"
+
+#define	UART_BDH	0x00	/* Baud Rate Registers: High */
+#define	UART_BDL	0x01	/* Baud Rate Registers: Low */
+#define	UART_C1		0x02	/* Control Register 1 */
+#define	UART_C2		0x03	/* Control Register 2 */
+#define	UART_S1		0x04	/* Status Register 1 */
+#define	UART_S2		0x05	/* Status Register 2 */
+#define	UART_C3		0x06	/* Control Register 3 */
+#define	UART_D		0x07	/* Data Register */
+#define	UART_MA1	0x08	/* Match Address Registers 1 */
+#define	UART_MA2	0x09	/* Match Address Registers 2 */
+#define	UART_C4		0x0A	/* Control Register 4 */
+#define	UART_C5		0x0B	/* Control Register 5 */
+#define	UART_ED		0x0C	/* Extended Data Register */
+#define	UART_MODEM	0x0D	/* Modem Register */
+#define	UART_IR		0x0E	/* Infrared Register */
+#define	UART_PFIFO	0x10	/* FIFO Parameters */
+#define	UART_CFIFO	0x11	/* FIFO Control Register */
+#define	UART_SFIFO	0x12	/* FIFO Status Register */
+#define	UART_TWFIFO	0x13	/* FIFO Transmit Watermark */
+#define	UART_TCFIFO	0x14	/* FIFO Transmit Count */
+#define	UART_RWFIFO	0x15	/* FIFO Receive Watermark */
+#define	UART_RCFIFO	0x16	/* FIFO Receive Count */
+#define	UART_C7816	0x18	/* 7816 Control Register */
+#define	UART_IE7816	0x19	/* 7816 Interrupt Enable Register */
+#define	UART_IS7816	0x1A	/* 7816 Interrupt Status Register */
+#define	UART_WP7816T0	0x1B	/* 7816 Wait Parameter Register */
+#define	UART_WP7816T1	0x1B	/* 7816 Wait Parameter Register */
+#define	UART_WN7816	0x1C	/* 7816 Wait N Register */
+#define	UART_WF7816	0x1D	/* 7816 Wait FD Register */
+#define	UART_ET7816	0x1E	/* 7816 Error Threshold Register */
+#define	UART_TL7816	0x1F	/* 7816 Transmit Length Register */
+#define	UART_C6		0x21	/* CEA709.1-B Control Register 6 */
+#define	UART_PCTH	0x22	/* CEA709.1-B Packet Cycle Time Counter High */
+#define	UART_PCTL	0x23	/* CEA709.1-B Packet Cycle Time Counter Low */
+#define	UART_B1T	0x24	/* CEA709.1-B Beta1 Timer */
+#define	UART_SDTH	0x25	/* CEA709.1-B Secondary Delay Timer High */
+#define	UART_SDTL	0x26	/* CEA709.1-B Secondary Delay Timer Low */
+#define	UART_PRE	0x27	/* CEA709.1-B Preamble */
+#define	UART_TPL	0x28	/* CEA709.1-B Transmit Packet Length */
+#define	UART_IE		0x29	/* CEA709.1-B Interrupt Enable Register */
+#define	UART_WB		0x2A	/* CEA709.1-B WBASE */
+#define	UART_S3		0x2B	/* CEA709.1-B Status Register */
+#define	UART_S4		0x2C	/* CEA709.1-B Status Register */
+#define	UART_RPL	0x2D	/* CEA709.1-B Received Packet Length */
+#define	UART_RPREL	0x2E	/* CEA709.1-B Received Preamble Length */
+#define	UART_CPW	0x2F	/* CEA709.1-B Collision Pulse Width */
+#define	UART_RIDT	0x30	/* CEA709.1-B Receive Indeterminate Time */
+#define	UART_TIDT	0x31	/* CEA709.1-B Transmit Indeterminate Time */
+
+#define	UART_C2_TE	(1 << 3)	/* Transmitter Enable */
+#define	UART_C2_TIE	(1 << 7)	/* Transmitter Interrupt Enable */
+#define	UART_C2_RE	(1 << 2)	/* Receiver Enable */
+#define	UART_C2_RIE	(1 << 5)	/* Receiver Interrupt Enable */
+#define	UART_S1_TDRE	(1 << 7)	/* Transmit Data Register Empty Flag */
+#define	UART_S1_RDRF	(1 << 5)	/* Receive Data Register Full Flag */
+#define	UART_S2_LBKDIF	(1 << 7)	/* LIN Break Detect Interrupt Flag */
+
+#define	UART_C4_BRFA	0x1f	/* Baud Rate Fine Adjust */
+#define	UART_BDH_SBR	0x1f	/* UART Baud Rate Bits */
+
+/*
+ * Low-level UART interface.
+ */
+static int vf_uart_probe(struct uart_bas *bas);
+static void vf_uart_init(struct uart_bas *bas, int, int, int, int);
+static void vf_uart_term(struct uart_bas *bas);
+static void vf_uart_putc(struct uart_bas *bas, int);
+static int vf_uart_rxready(struct uart_bas *bas);
+static int vf_uart_getc(struct uart_bas *bas, struct mtx *);
+
+void uart_reinit(struct uart_softc *,int,int);
+
+static struct uart_ops uart_vybrid_ops = {
+	.probe = vf_uart_probe,
+	.init = vf_uart_init,
+	.term = vf_uart_term,
+	.putc = vf_uart_putc,
+	.rxready = vf_uart_rxready,
+	.getc = vf_uart_getc,
+};
+
+static int
+vf_uart_probe(struct uart_bas *bas)
+{
+
+	return (0);
+}
+
+static void
+vf_uart_init(struct uart_bas *bas, int baudrate, int databits,
+    int stopbits, int parity)
+{
+
+}
+
+static void
+vf_uart_term(struct uart_bas *bas)
+{
+
+}
+
+static void
+vf_uart_putc(struct uart_bas *bas, int c)
+{
+
+	while (!(uart_getreg(bas, UART_S1) & UART_S1_TDRE))
+		;
+
+	uart_setreg(bas, UART_D, c);
+}
+
+static int
+vf_uart_rxready(struct uart_bas *bas)
+{
+	int usr1;
+
+	usr1 = uart_getreg(bas, UART_S1);
+	if (usr1 & UART_S1_RDRF) {
+		return (1);
+	}
+
+	return (0);
+}
+
+static int
+vf_uart_getc(struct uart_bas *bas, struct mtx *hwmtx)
+{
+	int c;
+
+	uart_lock(hwmtx);
+
+	while (!(uart_getreg(bas, UART_S1) & UART_S1_RDRF))
+		;
+
+	c = uart_getreg(bas, UART_D);
+	uart_unlock(hwmtx);
+
+	return (c & 0xff);
+}
+
+/*
+ * High-level UART interface.
+ */
+struct vf_uart_softc {
+	struct uart_softc base;
+};
+
+void
+uart_reinit(struct uart_softc *sc, int clkspeed, int baud)
+{
+	struct uart_bas *bas;
+	int sbr;
+	int brfa;
+	int reg;
+
+	bas = &sc->sc_bas;
+	if (!bas) {
+		printf("Error: cant reconfigure bas\n");
+		return;
+	}
+
+	uart_setreg(bas, UART_MODEM, 0x00);
+
+	/*
+	 * Disable transmitter and receiver
+	 * for a while.
+	 */
+	reg = uart_getreg(bas, UART_C2);
+	reg &= ~(UART_C2_RE | UART_C2_TE);
+	uart_setreg(bas, UART_C2, 0x00);
+
+	uart_setreg(bas, UART_C1, 0x00);
+
+	sbr = (uint16_t) (clkspeed / (baud * 16));
+	brfa = (clkspeed / baud) - (sbr * 16);
+
+	reg = uart_getreg(bas, UART_BDH);
+	reg &= ~UART_BDH_SBR;
+	reg |= ((sbr & 0x1f00) >> 8);
+	uart_setreg(bas, UART_BDH, reg);
+
+	reg = sbr & 0x00ff;
+	uart_setreg(bas, UART_BDL, reg);
+
+	reg = uart_getreg(bas, UART_C4);
+	reg &= ~UART_C4_BRFA;
+	reg |= (brfa & UART_C4_BRFA);
+	uart_setreg(bas, UART_C4, reg);
+
+	reg = uart_getreg(bas, UART_C2);
+	reg |= (UART_C2_RE | UART_C2_TE);
+	uart_setreg(bas, UART_C2, reg);
+
+}
+
+static int vf_uart_bus_attach(struct uart_softc *);
+static int vf_uart_bus_detach(struct uart_softc *);
+static int vf_uart_bus_flush(struct uart_softc *, int);
+static int vf_uart_bus_getsig(struct uart_softc *);
+static int vf_uart_bus_ioctl(struct uart_softc *, int, intptr_t);
+static int vf_uart_bus_ipend(struct uart_softc *);
+static int vf_uart_bus_param(struct uart_softc *, int, int, int, int);
+static int vf_uart_bus_probe(struct uart_softc *);
+static int vf_uart_bus_receive(struct uart_softc *);
+static int vf_uart_bus_setsig(struct uart_softc *, int);
+static int vf_uart_bus_transmit(struct uart_softc *);
+
+static kobj_method_t vf_uart_methods[] = {
+	KOBJMETHOD(uart_attach,		vf_uart_bus_attach),
+	KOBJMETHOD(uart_detach,		vf_uart_bus_detach),
+	KOBJMETHOD(uart_flush,		vf_uart_bus_flush),
+	KOBJMETHOD(uart_getsig,		vf_uart_bus_getsig),
+	KOBJMETHOD(uart_ioctl,		vf_uart_bus_ioctl),
+	KOBJMETHOD(uart_ipend,		vf_uart_bus_ipend),
+	KOBJMETHOD(uart_param,		vf_uart_bus_param),
+	KOBJMETHOD(uart_probe,		vf_uart_bus_probe),
+	KOBJMETHOD(uart_receive,	vf_uart_bus_receive),
+	KOBJMETHOD(uart_setsig,		vf_uart_bus_setsig),
+	KOBJMETHOD(uart_transmit,	vf_uart_bus_transmit),
+	{ 0, 0 }
+};
+
+struct uart_class uart_vybrid_class = {
+	"vybrid",
+	vf_uart_methods,
+	sizeof(struct vf_uart_softc),
+	.uc_ops = &uart_vybrid_ops,
+	.uc_range = 0x100,
+	.uc_rclk = 24000000 /* TODO: get value from CCM */
+};
+
+static int
+vf_uart_bus_attach(struct uart_softc *sc)
+{
+	struct uart_bas *bas;
+	int reg;
+
+	bas = &sc->sc_bas;
+
+	sc->sc_hwiflow = 0;
+	sc->sc_hwoflow = 0;
+
+	uart_reinit(sc, 66000000, 115200);
+
+	reg = uart_getreg(bas, UART_C2);
+	if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
+		reg &= ~UART_C2_RIE;
+	} else {
+		reg |= UART_C2_RIE;
+	}
+	uart_setreg(bas, UART_C2, reg);
+
+	return (0);
+}
+
+static int
+vf_uart_bus_detach(struct uart_softc *sc)
+{
+
+	/* TODO */
+	return (0);
+}
+
+static int
+vf_uart_bus_flush(struct uart_softc *sc, int what)
+{
+
+	/* TODO */
+	return (0);
+}
+
+static int
+vf_uart_bus_getsig(struct uart_softc *sc)
+{
+
+	/* TODO */
+	return (0);
+}
+
+static int
+vf_uart_bus_ioctl(struct uart_softc *sc, int request, intptr_t data)
+{
+	struct uart_bas *bas;
+	int error;
+
+	bas = &sc->sc_bas;
+	error = 0;
+	uart_lock(sc->sc_hwmtx);
+	switch (request) {
+	case UART_IOCTL_BREAK:
+	/* TODO */
+		break;
+	case UART_IOCTL_BAUD:
+	/* TODO */
+		*(int*)data = 115200;
+		break;
+	default:
+		error = EINVAL;
+		break;
+	}
+	uart_unlock(sc->sc_hwmtx);
+
+	return (error);
+}
+
+static int
+vf_uart_bus_ipend(struct uart_softc *sc)
+{
+	struct uart_bas *bas;
+	int ipend;
+	uint32_t usr1, usr2;
+	int reg;
+	int sfifo;
+
+	bas = &sc->sc_bas;
+	ipend = 0;
+
+	uart_lock(sc->sc_hwmtx);
+
+	usr1 = uart_getreg(bas, UART_S1);
+	usr2 = uart_getreg(bas, UART_S2);
+	sfifo = uart_getreg(bas, UART_SFIFO);
+
+	/* ack usr2 */
+	uart_setreg(bas, UART_S2, usr2);
+
+	if (usr1 & UART_S1_TDRE) {
+		reg = uart_getreg(bas, UART_C2);
+		reg &= ~(UART_C2_TIE);
+		uart_setreg(bas, UART_C2, reg);
+
+		if (sc->sc_txbusy != 0) {
+			ipend |= SER_INT_TXIDLE;
+		}
+	}
+
+	if (usr1 & UART_S1_RDRF) {
+		reg = uart_getreg(bas, UART_C2);
+		reg &= ~(UART_C2_RIE);
+		uart_setreg(bas, UART_C2, reg);
+
+		ipend |= SER_INT_RXREADY;
+	}
+
+	if (usr2 & UART_S2_LBKDIF) {
+		ipend |= SER_INT_BREAK;
+	}
+
+	uart_unlock(sc->sc_hwmtx);
+
+	return (ipend);
+}
+
+static int
+vf_uart_bus_param(struct uart_softc *sc, int baudrate, int databits,
+    int stopbits, int parity)
+{
+
+	uart_lock(sc->sc_hwmtx);
+	vf_uart_init(&sc->sc_bas, baudrate, databits, stopbits, parity);
+	uart_unlock(sc->sc_hwmtx);
+
+	return (0);
+}
+
+static int
+vf_uart_bus_probe(struct uart_softc *sc)
+{
+	int error;
+
+	error = vf_uart_probe(&sc->sc_bas);
+	if (error)
+		return (error);
+
+	sc->sc_rxfifosz = 1;
+	sc->sc_txfifosz = 1;
+
+	device_set_desc(sc->sc_dev, "Vybrid Family UART");
+	return (0);
+}
+
+static int
+vf_uart_bus_receive(struct uart_softc *sc)
+{
+	struct uart_bas *bas;
+	int reg;
+	int c;
+
+	bas = &sc->sc_bas;
+	uart_lock(sc->sc_hwmtx);
+
+	/* Read FIFO */
+	while (uart_getreg(bas, UART_S1) & UART_S1_RDRF) {
+		if (uart_rx_full(sc)) {
+		/* No space left in input buffer */
+			sc->sc_rxbuf[sc->sc_rxput] = UART_STAT_OVERRUN;
+			break;
+		}
+
+		c = uart_getreg(bas, UART_D);
+		uart_rx_put(sc, c);
+	}
+
+	/* Reenable Data Ready interrupt */
+	reg = uart_getreg(bas, UART_C2);
+	reg |= (UART_C2_RIE);
+	uart_setreg(bas, UART_C2, reg);
+
+	uart_unlock(sc->sc_hwmtx);
+	return (0);
+}
+
+static int
+vf_uart_bus_setsig(struct uart_softc *sc, int sig)
+{
+	struct uart_bas *bas;
+	int reg;
+
+	/* TODO: implement (?) */
+
+	/* XXX workaround to have working console on mount prompt */
+	/* Enable RX interrupt */
+	bas = &sc->sc_bas;
+	if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE) {
+		reg = uart_getreg(bas, UART_C2);
+		reg |= (UART_C2_RIE);
+		uart_setreg(bas, UART_C2, reg);
+	}
+
+	return (0);
+}
+
+static int
+vf_uart_bus_transmit(struct uart_softc *sc)
+{
+	struct uart_bas *bas = &sc->sc_bas;
+	int i;
+	int reg;
+
+	bas = &sc->sc_bas;
+	uart_lock(sc->sc_hwmtx);
+
+	/* Fill TX FIFO */
+	for (i = 0; i < sc->sc_txdatasz; i++) {
+		uart_setreg(bas, UART_D, sc->sc_txbuf[i] & 0xff);
+		uart_barrier(&sc->sc_bas);
+	}
+
+	sc->sc_txbusy = 1;
+
+	/* Call me when ready */
+	reg = uart_getreg(bas, UART_C2);
+	reg |= (UART_C2_TIE);
+	uart_setreg(bas, UART_C2, reg);
+
+	uart_unlock(sc->sc_hwmtx);
+
+	return (0);
+}
diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h
index 1ee3dd1fbce..ebc1f08ed2c 100644
--- a/sys/arm/include/armreg.h
+++ b/sys/arm/include/armreg.h
@@ -147,6 +147,7 @@
 #define CPU_ID_ARM1136JS	0x4107b360
 #define CPU_ID_ARM1136JSR1	0x4117b360
 #define CPU_ID_ARM1176JZS	0x410fb760
+#define CPU_ID_CORTEXA5 	0x410fc050
 #define CPU_ID_CORTEXA7 	0x410fc070
 #define CPU_ID_CORTEXA8R1	0x411fc080
 #define CPU_ID_CORTEXA8R2	0x412fc080
@@ -172,14 +173,10 @@
 #define CPU_ID_MV88FR571_41	0x41159260 /* Marvell Feroceon 88FR571-VD Core (actual ID from CPU reg) */
 #endif
 
-#define CPU_ID_MV88SV581X_V6		0x560F5810 /* Marvell Sheeva 88SV581x v6 Core */
 #define CPU_ID_MV88SV581X_V7		0x561F5810 /* Marvell Sheeva 88SV581x v7 Core */
-#define CPU_ID_MV88SV584X_V6		0x561F5840 /* Marvell Sheeva 88SV584x v6 Core */
 #define CPU_ID_MV88SV584X_V7		0x562F5840 /* Marvell Sheeva 88SV584x v7 Core */
 /* Marvell's CPUIDs with ARM ID in implementor field */
-#define CPU_ID_ARM_88SV581X_V6		0x410fb760 /* Marvell Sheeva 88SV581x v6 Core */
 #define CPU_ID_ARM_88SV581X_V7		0x413FC080 /* Marvell Sheeva 88SV581x v7 Core */
-#define CPU_ID_ARM_88SV584X_V6		0x410FB020 /* Marvell Sheeva 88SV584x v6 Core */
 
 #define	CPU_ID_FA526		0x66015260
 #define	CPU_ID_FA626TE		0x66056260
@@ -363,7 +360,7 @@
 
 #define	CPU_CT_ARMV7		0x4
 /* ARM v7 Cache type definitions */
-#define	CPUV7_CT_CTYPE_WT	(1 << 31)
+#define	CPUV7_CT_CTYPE_WT	(1U << 31)
 #define	CPUV7_CT_CTYPE_WB	(1 << 30)
 #define	CPUV7_CT_CTYPE_RA	(1 << 29)
 #define	CPUV7_CT_CTYPE_WA	(1 << 28)
diff --git a/sys/arm/include/atomic.h b/sys/arm/include/atomic.h
index 2bd08c16419..0db31c73f1e 100644
--- a/sys/arm/include/atomic.h
+++ b/sys/arm/include/atomic.h
@@ -198,7 +198,7 @@ atomic_cmpset_32(volatile u_int32_t *p, volatile u_int32_t cmpval, volatile u_in
 	
 	__asm __volatile("1: ldrex %0, [%1]\n"
 	                 "cmp %0, %2\n"
-	                 "it ne\n"
+	                 "itt ne\n"
 			 "movne %0, #0\n"
 			 "bne 2f\n"
 			 "strex %0, %3, [%1]\n"
diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h
index 9dae977c27f..95779e1d9a5 100644
--- a/sys/arm/include/cpu.h
+++ b/sys/arm/include/cpu.h
@@ -5,6 +5,7 @@
 #define MACHINE_CPU_H
 
 #include <machine/armreg.h>
+#include <machine/frame.h>
 
 void	cpu_halt(void);
 void	swi_vm(void *);
diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h
index 07c82581f90..d3e9ebecc1c 100644
--- a/sys/arm/include/cpufunc.h
+++ b/sys/arm/include/cpufunc.h
@@ -188,7 +188,7 @@ extern u_int cputype;
 #else
 void tlb_broadcast(int);
 
-#ifdef CPU_CORTEXA
+#if defined(CPU_CORTEXA) || defined(CPU_MV_PJ4B)
 #define TLB_BROADCAST	/* No need to explicitely send an IPI */
 #else
 #define TLB_BROADCAST	tlb_broadcast(7)
@@ -482,14 +482,6 @@ void	arm11_drain_writebuf	(void);
 
 void	pj4b_setttb			(u_int);
 
-void	pj4b_icache_sync_range		(vm_offset_t, vm_size_t);
-
-void	pj4b_dcache_wbinv_range		(vm_offset_t, vm_size_t);
-void	pj4b_dcache_inv_range		(vm_offset_t, vm_size_t);
-void	pj4b_dcache_wb_range		(vm_offset_t, vm_size_t);
-
-void	pj4b_idcache_wbinv_range	(vm_offset_t, vm_size_t);
-
 void	pj4b_drain_readbuf		(void);
 void	pj4b_flush_brnchtgt_all		(void);
 void	pj4b_flush_brnchtgt_va		(u_int);
@@ -523,7 +515,6 @@ void	armv7_drain_writebuf		(void);
 void	armv7_sev			(void);
 u_int	armv7_auxctrl			(u_int, u_int);
 void	pj4bv7_setup			(char *string);
-void	pj4bv6_setup			(char *string);
 void	pj4b_config			(void);
 
 int	get_core_id			(void);
diff --git a/sys/arm/include/devmap.h b/sys/arm/include/devmap.h
new file mode 100644
index 00000000000..028f40d7af1
--- /dev/null
+++ b/sys/arm/include/devmap.h
@@ -0,0 +1,90 @@
+/*-
+ * Copyright (c) 2013 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$
+ */
+
+#ifndef	_MACHINE_DEVMAP_H_
+#define	_MACHINE_DEVMAP_H_
+
+/*
+ * This structure is used by MD code to describe static mappings of devices
+ * which are established as part of bringing up the MMU early in the boot.
+ */
+struct arm_devmap_entry {
+	vm_offset_t	pd_va;		/* virtual address */
+	vm_paddr_t	pd_pa;		/* physical address */
+	vm_size_t	pd_size;	/* size of region */
+	vm_prot_t	pd_prot;	/* protection code */
+	int		pd_cache;	/* cache attributes */
+};
+
+/*
+ * Return the lowest KVA address used in any entry in the registered devmap
+ * table.  This works with whatever table is registered, including the internal
+ * table used by arm_devmap_add_entry() if that routine was used. Platforms can
+ * implement initarm_lastaddr() by calling this if static device mappings are
+ * their only use of high KVA space.
+ */
+vm_offset_t arm_devmap_lastaddr(void);
+
+/*
+ * Automatically allocate KVA (from the top of the address space downwards) and
+ * make static device mapping entries in an internal table.  The internal table
+ * is automatically registered on the first call to this.
+ */
+void arm_devmap_add_entry(vm_paddr_t pa, vm_size_t sz);
+
+/*
+ * Register a platform-local table to be bootstrapped by the generic
+ * initarm() in arm/machdep.c.  This is used by newer code that allocates and
+ * fills in its own local table but does not have its own initarm() routine.
+ */
+void arm_devmap_register_table(const struct arm_devmap_entry * _table);
+
+/*
+ * Establish mappings for all the entries in the table.  This is called
+ * automatically from the common initarm() in arm/machdep.c, and also from the
+ * custom initarm() routines in older code.  If the table pointer is NULL, this
+ * will use the table installed previously by arm_devmap_register_table().
+ */
+void arm_devmap_bootstrap(vm_offset_t _l1pt, 
+    const struct arm_devmap_entry *_table);
+
+/*
+ * Translate between virtual and physical addresses within a region that is
+ * static-mapped by the devmap code.  If the given address range isn't
+ * static-mapped, then ptov returns NULL and vtop returns DEVMAP_PADDR_NOTFOUND.
+ * The latter implies that you can't vtop just the last byte of physical address
+ * space.  This is not as limiting as it might sound, because even if a device
+ * occupies the end of the physical address space, you're only prevented from
+ * doing vtop for that single byte.  If you vtop a size bigger than 1 it works.
+ */
+#define	DEVMAP_PADDR_NOTFOUND	((vm_paddr_t)(-1))
+
+void *     arm_devmap_ptov(vm_paddr_t _pa, vm_size_t _sz);
+vm_paddr_t arm_devmap_vtop(void * _va, vm_size_t _sz);
+
+#endif
diff --git a/sys/arm/include/fdt.h b/sys/arm/include/fdt.h
index 7285e977def..0be9927d9be 100644
--- a/sys/arm/include/fdt.h
+++ b/sys/arm/include/fdt.h
@@ -38,7 +38,6 @@
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/pmap.h>
 #include <machine/intr.h>
 
 /* Max interrupt number */
@@ -57,8 +56,10 @@ struct mem_region {
 	vm_size_t	mr_size;
 };
 
-int fdt_localbus_devmap(phandle_t, struct pmap_devmap *, int, int *);
-int fdt_pci_devmap(phandle_t, struct pmap_devmap *devmap, vm_offset_t,
+struct arm_devmap_entry;
+
+int fdt_localbus_devmap(phandle_t, struct arm_devmap_entry *, int, int *);
+int fdt_pci_devmap(phandle_t, struct arm_devmap_entry *devmap, vm_offset_t,
     vm_offset_t);
 
 #endif /* _MACHINE_FDT_H_ */
diff --git a/sys/arm/include/frame.h b/sys/arm/include/frame.h
index cd6a8970693..1e6f43a5b54 100644
--- a/sys/arm/include/frame.h
+++ b/sys/arm/include/frame.h
@@ -59,7 +59,7 @@
  * Trap frame.  Pushed onto the kernel stack on a trap (synchronous exception).
  */
 
-typedef struct trapframe {
+struct trapframe {
 	register_t tf_spsr; /* Zero on arm26 */
 	register_t tf_r0;
 	register_t tf_r1;
@@ -80,7 +80,7 @@ typedef struct trapframe {
 	register_t tf_svc_lr; /* Not used on arm26 */
 	register_t tf_pc;
 	register_t tf_pad;
-} trapframe_t;
+};
 
 /* Register numbers */
 #define tf_r13 tf_usr_sp
diff --git a/sys/arm/include/machdep.h b/sys/arm/include/machdep.h
index c48b0a3a557..1ea4d211c0c 100644
--- a/sys/arm/include/machdep.h
+++ b/sys/arm/include/machdep.h
@@ -33,19 +33,44 @@ vm_offset_t linux_parse_boot_param(struct arm_boot_params *abp);
 vm_offset_t fake_preload_metadata(struct arm_boot_params *abp);
 vm_offset_t parse_boot_param(struct arm_boot_params *abp);
 
-/* Called by initarm */
+/*
+ * Initialization functions called by the common initarm() function in
+ * arm/machdep.c (but not necessarily from the custom initarm() functions of
+ * older code).
+ *
+ *  - initarm_early_init() is called very early, after parsing the boot params
+ *    and after physical memory has been located and sized.
+ *
+ *  - initarm_devmap_init() is called as one of the last steps of early virtual
+ *    memory initialization, shortly before the new page tables are installed.
+ *
+ *  - initarm_lastaddr() is called after initarm_devmap_init(), and must return
+ *    the address of the first byte of unusable KVA space.  This allows a
+ *    platform to carve out of the top of the KVA space whatever reserves it
+ *    needs for things like static device mapping, and this is called to get the
+ *    value before calling pmap_bootstrap() which uses the value to size the
+ *    available KVA.
+ *
+ *  - initarm_gpio_init() is called after the static device mappings are
+ *    established and just before cninit().  The intention is that the routine
+ *    can do any hardware setup (such as gpio or pinmux) necessary to make the
+ *    console functional.
+ *
+ *  - initarm_late_init() is called just after cninit().  This is the first of
+ *    the init routines that can use printf() and expect the output to appear on
+ *    a standard console.
+ *
+ */
+void initarm_early_init(void);
+int initarm_devmap_init(void);
 vm_offset_t initarm_lastaddr(void);
 void initarm_gpio_init(void);
 void initarm_late_init(void);
-int platform_devmap_init(void);
 
 /* Board-specific attributes */
 void board_set_serial(uint64_t);
 void board_set_revision(uint32_t);
 
-/* Needs to be initialised by platform_devmap_init */
-extern const struct pmap_devmap *pmap_devmap_bootstrap_table;
-
 /* Setup standard arrays */
 void arm_dump_avail_init( vm_offset_t memsize, size_t max);
 
diff --git a/sys/arm/include/pcb.h b/sys/arm/include/pcb.h
index e6f0a419477..8d98f2efa0e 100644
--- a/sys/arm/include/pcb.h
+++ b/sys/arm/include/pcb.h
@@ -38,7 +38,6 @@
 #ifndef	_MACHINE_PCB_H_
 #define	_MACHINE_PCB_H_
 
-#include <machine/frame.h>
 #include <machine/fp.h>
 
 
@@ -82,7 +81,11 @@ struct pcb {
 	struct	pcb_arm32 un_32;
 	struct vfp_state pcb_vfpstate;          /* VP/NEON state */
 	u_int pcb_vfpcpu;                       /* VP/NEON last cpu */
-};
+} __aligned(8); /* 
+		 * We need the PCB to be aligned on 8 bytes, as we may
+		 * access it using ldrd/strd, and some CPUs require it
+		 * to by aligned on 8 bytes.
+		 */
 
 /*
  * No additional data for core dumps.
diff --git a/sys/arm/include/pcpu.h b/sys/arm/include/pcpu.h
index 19950304341..6e0eb06dcb8 100644
--- a/sys/arm/include/pcpu.h
+++ b/sys/arm/include/pcpu.h
@@ -33,7 +33,6 @@
 #ifdef _KERNEL
 
 #include <machine/cpuconf.h>
-#include <machine/frame.h>
 
 #define	ALT_STACK_SIZE	128
 
diff --git a/sys/arm/include/pmap.h b/sys/arm/include/pmap.h
index 207abd0a0c1..d796c461b45 100644
--- a/sys/arm/include/pmap.h
+++ b/sys/arm/include/pmap.h
@@ -63,10 +63,11 @@
 #endif
 #define PTE_CACHE	6
 #define PTE_DEVICE	2
-#define PTE_PAGETABLE	4
+#define PTE_PAGETABLE	6
 #else
 #define PTE_NOCACHE	1
 #define PTE_CACHE	2
+#define PTE_DEVICE	PTE_NOCACHE
 #define PTE_PAGETABLE	3
 #endif
 
@@ -254,6 +255,7 @@ void	pmap_bootstrap(vm_offset_t firstaddr, struct pv_addr *l1pt);
 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_user(vm_offset_t va, vm_paddr_t pa);
 vm_paddr_t pmap_kextract(vm_offset_t va);
@@ -489,7 +491,7 @@ extern int pmap_needs_pte_sync;
 #if (ARM_MMU_SA1 == 1) && (ARM_NMMUS == 1)
 #define	PMAP_NEEDS_PTE_SYNC	1
 #define	PMAP_INCLUDE_PTE_SYNC
-#elif defined(CPU_XSCALE_81342)
+#elif defined(CPU_XSCALE_81342) || ARM_ARCH_6 || ARM_ARCH_7A
 #define PMAP_NEEDS_PTE_SYNC	1
 #define PMAP_INCLUDE_PTE_SYNC
 #elif (ARM_MMU_SA1 == 0)
@@ -559,11 +561,18 @@ extern int pmap_needs_pte_sync;
 #define	PMAP_INCLUDE_PTE_SYNC
 #endif
 
+#ifdef ARM_L2_PIPT
+#define _sync_l2(pte, size) 	cpu_l2cache_wb_range(vtophys(pte), size)
+#else
+#define _sync_l2(pte, size) 	cpu_l2cache_wb_range(pte, size)
+#endif
+
 #define	PTE_SYNC(pte)							\
 do {									\
 	if (PMAP_NEEDS_PTE_SYNC) {					\
 		cpu_dcache_wb_range((vm_offset_t)(pte), sizeof(pt_entry_t));\
-		cpu_l2cache_wb_range((vm_offset_t)(pte), sizeof(pt_entry_t));\
+		cpu_drain_writebuf();					\
+		_sync_l2((vm_offset_t)(pte), sizeof(pt_entry_t));\
 	} else								\
 		cpu_drain_writebuf();					\
 } while (/*CONSTCOND*/0)
@@ -573,7 +582,8 @@ do {									\
 	if (PMAP_NEEDS_PTE_SYNC) {					\
 		cpu_dcache_wb_range((vm_offset_t)(pte),			\
 		    (cnt) << 2); /* * sizeof(pt_entry_t) */		\
-		cpu_l2cache_wb_range((vm_offset_t)(pte), 		\
+		cpu_drain_writebuf();					\
+		_sync_l2((vm_offset_t)(pte),		 		\
 		    (cnt) << 2); /* * sizeof(pt_entry_t) */		\
 	} else								\
 		cpu_drain_writebuf();					\
@@ -687,24 +697,6 @@ void	pmap_use_minicache(vm_offset_t, vm_size_t);
 
 void vector_page_setprot(int);
 
-/*
- * This structure is used by machine-dependent code to describe
- * static mappings of devices, created at bootstrap time.
- */
-struct pmap_devmap {
-	vm_offset_t	pd_va;		/* virtual address */
-	vm_paddr_t	pd_pa;		/* physical address */
-	vm_size_t	pd_size;	/* size of region */
-	vm_prot_t	pd_prot;	/* protection code */
-	int		pd_cache;	/* cache attributes */
-};
-
-const struct pmap_devmap *pmap_devmap_find_pa(vm_paddr_t, vm_size_t);
-const struct pmap_devmap *pmap_devmap_find_va(vm_offset_t, vm_size_t);
-
-void	pmap_devmap_bootstrap(vm_offset_t, const struct pmap_devmap *);
-void	pmap_devmap_register(const struct pmap_devmap *);
-
 #define SECTION_CACHE	0x1
 #define SECTION_PT	0x2
 void	pmap_kenter_section(vm_offset_t, vm_paddr_t, int flags);
@@ -727,11 +719,6 @@ struct arm_small_page {
 
 #endif
 
-#define ARM_NOCACHE_KVA_SIZE 0x1000000
-extern vm_offset_t arm_nocache_startaddr;
-void *arm_remap_nocache(void *, vm_size_t);
-void arm_unmap_nocache(void *, vm_size_t);
-
 extern vm_paddr_t dump_avail[];
 #endif	/* _KERNEL */
 
diff --git a/sys/arm/include/undefined.h b/sys/arm/include/undefined.h
index 6b64d1d2fe2..8a673f4f598 100644
--- a/sys/arm/include/undefined.h
+++ b/sys/arm/include/undefined.h
@@ -52,7 +52,9 @@
 
 #include <sys/queue.h>
 
-typedef int (*undef_handler_t) (unsigned int, unsigned int, trapframe_t *, int);
+struct trapframe;
+
+typedef int (*undef_handler_t) (unsigned int, unsigned int, struct trapframe *, int);
 
 #define FP_COPROC	1
 #define FP_COPROC2	2
diff --git a/sys/arm/include/vmparam.h b/sys/arm/include/vmparam.h
index 93d7587b226..a93a92680a3 100644
--- a/sys/arm/include/vmparam.h
+++ b/sys/arm/include/vmparam.h
@@ -82,15 +82,21 @@
 #define	VM_PHYSSEG_DENSE
 
 /*
- * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool
- * from which physical pages are allocated and VM_FREEPOOL_DIRECT is
- * the pool from which physical pages for small UMA objects are
- * allocated.
+ * Create two or three free page pools depending on the existence of a direct
+ * map: VM_FREEPOOL_DEFAULT is the default pool from which physical pages are
+ * allocated, and VM_FREEPOOL_DIRECT is the pool from which physical pages for
+ * small UMA objects are allocated.
  */
+#ifdef ARM_USE_SMALL_ALLOC
 #define	VM_NFREEPOOL		3
 #define	VM_FREEPOOL_CACHE	2
-#define	VM_FREEPOOL_DEFAULT	0
 #define	VM_FREEPOOL_DIRECT	1
+#else
+#define	VM_NFREEPOOL		2
+#define	VM_FREEPOOL_CACHE	1
+#define	VM_FREEPOOL_DIRECT	0
+#endif
+#define	VM_FREEPOOL_DEFAULT	0
 
 /*
  * we support 2 free lists:
@@ -159,17 +165,22 @@
 #define	VM_MAX_KERNEL_ADDRESS	(vm_max_kernel_address)
 
 /*
- * Virtual size (bytes) for various kernel submaps.
+ * How many physical pages per kmem arena virtual page.
  */
-#ifndef VM_KMEM_SIZE
-#define VM_KMEM_SIZE		(12*1024*1024)
-#endif
 #ifndef VM_KMEM_SIZE_SCALE
-#define VM_KMEM_SIZE_SCALE	(3)
+#define	VM_KMEM_SIZE_SCALE	(3)
 #endif
 
 /*
- * Ceiling on the size of the kmem submap: 40% of the kernel map.
+ * Optional floor (in bytes) on the size of the kmem arena.
+ */
+#ifndef VM_KMEM_SIZE_MIN
+#define	VM_KMEM_SIZE_MIN	(12 * 1024 * 1024)
+#endif
+
+/*
+ * Optional ceiling (in bytes) on the size of the kmem arena: 40% of the
+ * kernel map.
  */
 #ifndef VM_KMEM_SIZE_MAX
 #define	VM_KMEM_SIZE_MAX	((vm_max_kernel_address - \
diff --git a/sys/arm/lpc/if_lpe.c b/sys/arm/lpc/if_lpe.c
index 025aa72545c..f8a8659ec11 100644
--- a/sys/arm/lpc/if_lpe.c
+++ b/sys/arm/lpc/if_lpe.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
+#include <net/if_var.h>
 
 #include <net/bpf.h>
 
@@ -64,9 +65,6 @@ __FBSDID("$FreeBSD$");
 
 #include "miibus_if.h"
 
-#define	DEBUG
-#undef	DEBUG
-
 #ifdef DEBUG
 #define debugf(fmt, args...) do { printf("%s(): ", __func__);   \
     printf(fmt,##args); } while (0)
diff --git a/sys/arm/lpc/if_lpereg.h b/sys/arm/lpc/if_lpereg.h
index 8d166eaf0da..8e1512be0d4 100644
--- a/sys/arm/lpc/if_lpereg.h
+++ b/sys/arm/lpc/if_lpereg.h
@@ -169,7 +169,7 @@ struct lpe_hwstatus {
 
 /* These are valid for both Rx and Tx descriptors */
 #define	LPE_HWDESC_SIZE_MASK	(1 << 10)
-#define	LPE_HWDESC_INTERRUPT	(1 << 31)
+#define	LPE_HWDESC_INTERRUPT	(1U << 31)
 
 /* These are valid for Tx descriptors */
 #define	LPE_HWDESC_LAST		(1 << 30)
@@ -186,7 +186,7 @@ struct lpe_hwstatus {
 #define	LPE_HWDESC_LATECOLL	(1 << 28)
 #define	LPE_HWDESC_UNDERRUN	(1 << 29)
 #define	LPE_HWDESC_TXNODESCR	(1 << 30)
-#define	LPE_HWDESC_ERROR	(1 << 31)
+#define	LPE_HWDESC_ERROR	(1U << 31)
 
 /* These are valid for Rx status descriptors */
 #define	LPE_HWDESC_CONTROL	(1 << 18)
@@ -202,7 +202,7 @@ struct lpe_hwstatus {
 #define	LPE_HWDESC_OVERRUN	(1 << 28)
 #define	LPE_HWDESC_RXNODESCR	(1 << 29)
 #define	LPE_HWDESC_LASTFLAG	(1 << 30)
-#define	LPE_HWDESC_ERROR	(1 << 31)
+#define	LPE_HWDESC_ERROR	(1U << 31)
 
 
 #endif	/* _ARM_LPC_IF_LPEREG_H */
diff --git a/sys/arm/lpc/lpc_fb.c b/sys/arm/lpc/lpc_fb.c
index 5143645fa5b..0cc92b5f82f 100644
--- a/sys/arm/lpc/lpc_fb.c
+++ b/sys/arm/lpc/lpc_fb.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/lpc/lpc_gpio.c b/sys/arm/lpc/lpc_gpio.c
index a7ef028d914..0b97b07712c 100644
--- a/sys/arm/lpc/lpc_gpio.c
+++ b/sys/arm/lpc/lpc_gpio.c
@@ -76,7 +76,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 #include <machine/fdt.h>
 
diff --git a/sys/arm/lpc/lpc_machdep.c b/sys/arm/lpc/lpc_machdep.c
index 5fdc9d77b5b..a900997e07d 100644
--- a/sys/arm/lpc/lpc_machdep.c
+++ b/sys/arm/lpc/lpc_machdep.c
@@ -50,9 +50,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 
 #include <arm/lpc/lpcreg.h>
 #include <arm/lpc/lpcvar.h>
@@ -62,13 +61,17 @@ __FBSDID("$FreeBSD$");
 
 vm_offset_t
 initarm_lastaddr(void)
+{
+
+	return (fdt_immr_va);
+}
+
+void
+initarm_early_init(void)
 {
 
 	if (fdt_immr_addr(LPC_DEV_BASE) != 0)
 		while (1);
-
-	/* Platform-specific initialisation */
-	return (fdt_immr_va - ARM_NOCACHE_KVA_SIZE);
 }
 
 void
@@ -87,7 +90,7 @@ initarm_late_init(void)
 }
 
 #define FDT_DEVMAP_MAX	(1 + 2 + 1 + 1)
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
+static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
 	{ 0, 0, 0, 0, 0, }
 };
 
@@ -95,7 +98,7 @@ static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
  * Construct pmap_devmap[] with DT-derived config data.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 
 	/*
@@ -107,7 +110,7 @@ platform_devmap_init(void)
 	fdt_devmap[0].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
 	fdt_devmap[0].pd_cache = PTE_NOCACHE;
 	
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
+	arm_devmap_register_table(&fdt_devmap[0]);
 	return (0);
 }
 
diff --git a/sys/arm/lpc/lpc_mmc.c b/sys/arm/lpc/lpc_mmc.c
index 5a789f6e2e3..3aa6d470d2d 100644
--- a/sys/arm/lpc/lpc_mmc.c
+++ b/sys/arm/lpc/lpc_mmc.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/ofw/ofw_bus.h>
@@ -65,9 +64,6 @@ __FBSDID("$FreeBSD$");
 #include <arm/lpc/lpcreg.h>
 #include <arm/lpc/lpcvar.h>
 
-#define	DEBUG
-#undef	DEBUG
-
 #ifdef DEBUG
 #define debugf(fmt, args...) do { printf("%s(): ", __func__);   \
     printf(fmt,##args); } while (0)
diff --git a/sys/arm/lpc/lpc_spi.c b/sys/arm/lpc/lpc_spi.c
index db4c09abc23..96a0e2673ed 100644
--- a/sys/arm/lpc/lpc_spi.c
+++ b/sys/arm/lpc/lpc_spi.c
@@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/spibus/spi.h>
diff --git a/sys/arm/lpc/lpc_timer.c b/sys/arm/lpc/lpc_timer.c
index 8572e1a09fe..0ceee9e3a0e 100644
--- a/sys/arm/lpc/lpc_timer.c
+++ b/sys/arm/lpc/lpc_timer.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/timeet.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/lpc/lpcreg.h b/sys/arm/lpc/lpcreg.h
index 1803c6f7f3b..557d9b79c92 100644
--- a/sys/arm/lpc/lpcreg.h
+++ b/sys/arm/lpc/lpcreg.h
@@ -604,7 +604,7 @@
 #define	LPC_DMAC_CH_LLI			0x08
 #define	LPC_DMAC_CH_LLI_AHB1		(1 << 0)
 #define	LPC_DMAC_CH_CONTROL		0x0c
-#define	LPC_DMAC_CH_CONTROL_I		(1 << 31)
+#define	LPC_DMAC_CH_CONTROL_I		(1U << 31)
 #define	LPC_DMAC_CH_CONTROL_DI		(1 << 27)
 #define	LPC_DMAC_CH_CONTROL_SI		(1 << 26)
 #define	LPC_DMAC_CH_CONTROL_D		(1 << 25)
diff --git a/sys/arm/mv/armadaxp/std.armadaxp b/sys/arm/mv/armadaxp/std.armadaxp
index bf2a5f6af9b..d731ad354aa 100644
--- a/sys/arm/mv/armadaxp/std.armadaxp
+++ b/sys/arm/mv/armadaxp/std.armadaxp
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
-# kernel gets loaded at 0x00f00000 by the loader, but runs at virtual address
-# 0xc0f00000.  RAM starts at 0.  We put the pagetable at a reasonable place
+# kernel gets loaded at 0x00200000 by the loader, but runs at virtual address
+# 0xc0200000.  RAM starts at 0.  We put the pagetable at a reasonable place
 # in memory, but may need to bounce it higher if there's a problem with this.
 # We could paper over this by loading the kernel at 0xc0000000 virtual, but
 # that leads to other complications, so we'll just reclaim the lower region of
 # ram after we're loaded.  Put the page tables for startup at 1MB.
-makeoptions	KERNPHYSADDR=0x00f00000
-makeoptions	KERNVIRTADDR=0xc0f00000
+makeoptions	KERNPHYSADDR=0x00200000
+makeoptions	KERNVIRTADDR=0xc0200000
 
-options		KERNPHYSADDR=0x00f00000
-options		KERNVIRTADDR=0xc0f00000
+options		KERNPHYSADDR=0x00200000
+options		KERNVIRTADDR=0xc0200000
 options		PHYSADDR=0x00000000
 options		STARTUP_PAGETABLE_ADDR=0x00100000
 
diff --git a/sys/arm/mv/common.c b/sys/arm/mv/common.c
index d4bee6406bc..44c22cb2089 100644
--- a/sys/arm/mv/common.c
+++ b/sys/arm/mv/common.c
@@ -153,8 +153,11 @@ struct fdt_pm_mask_entry fdt_pm_mask_table[] = {
 static __inline int
 pm_is_disabled(uint32_t mask)
 {
-
+#if defined(SOC_MV_KIRKWOOD)
+	return (soc_power_ctrl_get(mask) == mask);
+#else
 	return (soc_power_ctrl_get(mask) == mask ? 0 : 1);
+#endif
 }
 
 /*
@@ -221,7 +224,16 @@ fdt_pm(phandle_t node)
 			continue;
 
 		compat = fdt_is_compatible(node, fdt_pm_mask_table[i].compat);
-
+#if defined(SOC_MV_KIRKWOOD)
+		if (compat && (cpu_pm_ctrl & fdt_pm_mask_table[i].mask)) {
+			dev_mask |= (1 << i);
+			ena = 0;
+			break;
+		} else if (compat) {
+			dev_mask |= (1 << i);
+			break;
+		}
+#else
 		if (compat && (~cpu_pm_ctrl & fdt_pm_mask_table[i].mask)) {
 			dev_mask |= (1 << i);
 			ena = 0;
@@ -230,6 +242,7 @@ fdt_pm(phandle_t node)
 			dev_mask |= (1 << i);
 			break;
 		}
+#endif
 	}
 
 	return (ena);
@@ -2078,9 +2091,79 @@ fdt_fixup_busfreq(phandle_t root)
 		OF_setprop(sb, "bus-frequency", (void *)&freq, sizeof(freq));
 }
 
+static void
+fdt_fixup_ranges(phandle_t root)
+{
+	phandle_t node;
+	pcell_t par_addr_cells, addr_cells, size_cells;
+	pcell_t ranges[3], reg[2], *rangesptr;
+	int len, tuple_size, tuples_count;
+	uint32_t base;
+
+	/* Fix-up SoC ranges according to real fdt_immr_pa */
+	if ((node = fdt_find_compatible(root, "simple-bus", 1)) != 0) {
+		if (fdt_addrsize_cells(node, &addr_cells, &size_cells) == 0 &&
+		    (par_addr_cells = fdt_parent_addr_cells(node) <= 2)) {
+			tuple_size = sizeof(pcell_t) * (par_addr_cells +
+			   addr_cells + size_cells);
+			len = OF_getprop(node, "ranges", ranges,
+			    sizeof(ranges));
+			tuples_count = len / tuple_size;
+			/* Unexpected settings are not supported */
+			if (tuples_count != 1)
+				goto fixup_failed;
+
+			rangesptr = &ranges[0];
+			rangesptr += par_addr_cells;
+			base = fdt_data_get((void *)rangesptr, addr_cells);
+			*rangesptr = cpu_to_fdt32(fdt_immr_pa);
+			if (OF_setprop(node, "ranges", (void *)&ranges[0],
+			    sizeof(ranges)) < 0)
+				goto fixup_failed;
+		}
+	}
+
+	/* Fix-up PCIe reg according to real PCIe registers' PA */
+	if ((node = fdt_find_compatible(root, "mrvl,pcie", 1)) != 0) {
+		if (fdt_addrsize_cells(OF_parent(node), &par_addr_cells,
+		    &size_cells) == 0) {
+			tuple_size = sizeof(pcell_t) * (par_addr_cells +
+			    size_cells);
+			len = OF_getprop(node, "reg", reg, sizeof(reg));
+			tuples_count = len / tuple_size;
+			/* Unexpected settings are not supported */
+			if (tuples_count != 1)
+				goto fixup_failed;
+
+			base = fdt_data_get((void *)&reg[0], par_addr_cells);
+			base &= ~0xFF000000;
+			base |= fdt_immr_pa;
+			reg[0] = cpu_to_fdt32(base);
+			if (OF_setprop(node, "reg", (void *)&reg[0],
+			    sizeof(reg)) < 0)
+				goto fixup_failed;
+		}
+	}
+	/* Fix-up succeeded. May return and continue */
+	return;
+
+fixup_failed:
+	while (1) {
+		/*
+		 * In case of any error while fixing ranges just hang.
+		 *	1. No message can be displayed yet since console
+		 *	   is not initialized.
+		 *	2. Going further will cause failure on bus_space_map()
+		 *	   relying on the wrong ranges or data abort when
+		 *	   accessing PCIe registers.
+		 */
+	}
+}
+
 struct fdt_fixup_entry fdt_fixup_table[] = {
 	{ "mrvl,DB-88F6281", &fdt_fixup_busfreq },
 	{ "mrvl,DB-78460", &fdt_fixup_busfreq },
+	{ "mrvl,DB-78460", &fdt_fixup_ranges },
 	{ NULL, NULL }
 };
 
diff --git a/sys/arm/mv/gpio.c b/sys/arm/mv/gpio.c
index c87bfd59025..5f79bef5a15 100644
--- a/sys/arm/mv/gpio.c
+++ b/sys/arm/mv/gpio.c
@@ -605,7 +605,6 @@ int
 platform_gpio_init(void)
 {
 	phandle_t child, parent, root, ctrl;
-	ihandle_t ctrl_ihandle;
 	pcell_t gpios[MAX_PINS_PER_NODE * GPIOS_PROP_CELLS];
 	struct gpio_ctrl_entry *e;
 	int len, rv;
@@ -639,9 +638,7 @@ platform_gpio_init(void)
 				 * contain a ref. to a node defining GPIO
 				 * controller.
 				 */
-				ctrl_ihandle = (ihandle_t)gpios[0];
-				ctrl_ihandle = fdt32_to_cpu(ctrl_ihandle);
-				ctrl = OF_instance_to_package(ctrl_ihandle);
+				ctrl = OF_xref_phandle(fdt32_to_cpu(gpios[0]));
 
 				if (fdt_is_compatible(ctrl, e->compat))
 					/* Call a handler. */
diff --git a/sys/arm/mv/mv_localbus.c b/sys/arm/mv/mv_localbus.c
index 09f9348ba8d..717209645d4 100644
--- a/sys/arm/mv/mv_localbus.c
+++ b/sys/arm/mv/mv_localbus.c
@@ -37,6 +37,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 #include <sys/malloc.h>
 
+#include <vm/vm.h>
+
+#include <machine/devmap.h>
 #include <machine/fdt.h>
 
 #include <dev/ofw/ofw_bus.h>
@@ -153,7 +156,7 @@ static struct localbus_bank localbus_banks[MV_LOCALBUS_MAX_BANKS];
 
 devclass_t localbus_devclass;
 
-DRIVER_MODULE(localbus, fdtbus, localbus_driver, localbus_devclass, 0, 0);
+DRIVER_MODULE(localbus, nexus, localbus_driver, localbus_devclass, 0, 0);
 
 static int
 fdt_localbus_reg_decode(phandle_t node, struct localbus_softc *sc,
@@ -380,7 +383,7 @@ localbus_get_devinfo(device_t bus, device_t child)
 }
 
 int
-fdt_localbus_devmap(phandle_t dt_node, struct pmap_devmap *fdt_devmap,
+fdt_localbus_devmap(phandle_t dt_node, struct arm_devmap_entry *fdt_devmap,
     int banks_max_num, int *banks_added)
 {
 	pcell_t ranges[MV_LOCALBUS_MAX_BANKS * MV_LOCALBUS_MAX_BANK_CELLS];
@@ -431,7 +434,7 @@ fdt_localbus_devmap(phandle_t dt_node, struct pmap_devmap *fdt_devmap,
 		bank = fdt_data_get((void *)rangesptr, 1);
 		rangesptr += 1;
 
-		if (bank < 0 || bank > MV_LOCALBUS_MAX_BANKS) {
+		if (bank > MV_LOCALBUS_MAX_BANKS) {
 			/* Bank out of range */
 			rangesptr += ((addr_cells - 1) + par_addr_cells +
 			    size_cells);
diff --git a/sys/arm/mv/mv_machdep.c b/sys/arm/mv/mv_machdep.c
index 58d183e3480..6fb6db6bc04 100644
--- a/sys/arm/mv/mv_machdep.c
+++ b/sys/arm/mv/mv_machdep.c
@@ -50,9 +50,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 
 #include <arm/mv/mvreg.h>	/* XXX */
 #include <arm/mv/mvvar.h>	/* XXX eventually this should be eliminated */
@@ -202,13 +201,17 @@ moveon:
 
 vm_offset_t
 initarm_lastaddr(void)
+{
+
+	return (fdt_immr_va);
+}
+
+void
+initarm_early_init(void)
 {
 
 	if (fdt_immr_addr(MV_BASE) != 0)
 		while (1);
-
-	/* Platform-specific initialisation */
-	return (fdt_immr_va - ARM_NOCACHE_KVA_SIZE);
 }
 
 void
@@ -247,12 +250,12 @@ initarm_late_init(void)
 }
 
 #define FDT_DEVMAP_MAX	(MV_WIN_CPU_MAX + 2)
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
+static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
 	{ 0, 0, 0, 0, 0, }
 };
 
 static int
-platform_sram_devmap(struct pmap_devmap *map)
+platform_sram_devmap(struct arm_devmap_entry *map)
 {
 #if !defined(SOC_MV_ARMADAXP)
 	phandle_t child, root;
@@ -293,14 +296,14 @@ out:
  * Supply a default do-nothing implementation of fdt_pci_devmap() via a weak
  * alias.  Many Marvell platforms don't support a PCI interface, but to support
  * those that do, we end up with a reference to this function below, in
- * platform_devmap_init().  If "device pci" appears in the kernel config, the
+ * initarm_devmap_init().  If "device pci" appears in the kernel config, the
  * real implementation of this function in dev/fdt/fdt_pci.c overrides the weak
  * alias defined here.
  */
-int mv_default_fdt_pci_devmap(phandle_t node, struct pmap_devmap *devmap,
+int mv_default_fdt_pci_devmap(phandle_t node, struct arm_devmap_entry *devmap,
     vm_offset_t io_va, vm_offset_t mem_va);
 int
-mv_default_fdt_pci_devmap(phandle_t node, struct pmap_devmap *devmap,
+mv_default_fdt_pci_devmap(phandle_t node, struct arm_devmap_entry *devmap,
     vm_offset_t io_va, vm_offset_t mem_va)
 {
 
@@ -317,15 +320,28 @@ __weak_reference(mv_default_fdt_pci_devmap, fdt_pci_devmap);
  * Construct pmap_devmap[] with DT-derived config data.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 	phandle_t root, child;
 	pcell_t bank_count;
 	int i, num_mapped;
 
 	i = 0;
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
+	arm_devmap_register_table(&fdt_devmap[0]);
 
+#ifdef SOC_MV_ARMADAXP
+	vm_paddr_t cur_immr_pa;
+
+	/*
+	 * Acquire SoC registers' base passed by u-boot and fill devmap
+	 * accordingly. DTB is going to be modified basing on this data
+	 * later.
+	 */
+	__asm __volatile("mrc p15, 4, %0, c15, c0, 0" : "=r" (cur_immr_pa));
+	cur_immr_pa = (cur_immr_pa << 13) & 0xff000000;
+	if (cur_immr_pa != 0)
+		fdt_immr_pa = cur_immr_pa;
+#endif
 	/*
 	 * IMMR range.
 	 */
diff --git a/sys/arm/mv/mv_pci.c b/sys/arm/mv/mv_pci.c
index 8a96389c741..f708b90ec9c 100644
--- a/sys/arm/mv/mv_pci.c
+++ b/sys/arm/mv/mv_pci.c
@@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$");
 #define debugf(fmt, args...)
 #endif
 
-#define PCI_CFG_ENA		(1 << 31)
+#define PCI_CFG_ENA		(1U << 31)
 #define PCI_CFG_BUS(bus)	(((bus) & 0xff) << 16)
 #define PCI_CFG_DEV(dev)	(((dev) & 0x1f) << 11)
 #define PCI_CFG_FUN(fun)	(((fun) & 0x7) << 8)
@@ -230,7 +230,7 @@ static driver_t mv_pcib_driver = {
 
 devclass_t pcib_devclass;
 
-DRIVER_MODULE(pcib, fdtbus, mv_pcib_driver, pcib_devclass, 0, 0);
+DRIVER_MODULE(pcib, nexus, mv_pcib_driver, pcib_devclass, 0, 0);
 
 static struct mtx pcicfg_mtx;
 
diff --git a/sys/arm/mv/mv_sata.c b/sys/arm/mv/mv_sata.c
index 28c641f97d5..87b3823857c 100644
--- a/sys/arm/mv/mv_sata.c
+++ b/sys/arm/mv/mv_sata.c
@@ -200,6 +200,7 @@ sata_probe(device_t dev)
 	case MV_DEV_88F6282:
 	case MV_DEV_MV78100:
 	case MV_DEV_MV78100_Z0:
+	case MV_DEV_MV78460:
 		sc->sc_version = 2;
 		sc->sc_edma_qlen = 32;
 		break;
diff --git a/sys/arm/mv/mvreg.h b/sys/arm/mv/mvreg.h
index 79398d9119b..1d6efed1361 100644
--- a/sys/arm/mv/mvreg.h
+++ b/sys/arm/mv/mvreg.h
@@ -142,7 +142,11 @@
 /*
  * Power Control
  */
+#if defined(SOC_MV_KIRKWOOD)
+#define CPU_PM_CTRL		0x18
+#else
 #define CPU_PM_CTRL		0x1C
+#endif
 #define CPU_PM_CTRL_NONE	0
 #define CPU_PM_CTRL_ALL		~0x0
 
diff --git a/sys/arm/mv/mvvar.h b/sys/arm/mv/mvvar.h
index c85539a5750..54abf4634b8 100644
--- a/sys/arm/mv/mvvar.h
+++ b/sys/arm/mv/mvvar.h
@@ -44,7 +44,6 @@
 #include <machine/bus.h>
 #include <vm/vm.h>
 #include <vm/pmap.h>
-#include <machine/pmap.h>
 #include <machine/vm.h>
 
 #define	MV_TYPE_PCI		0
@@ -67,7 +66,6 @@ struct decode_win {
 	vm_paddr_t	remap;
 };
 
-extern const struct pmap_devmap pmap_devmap[];
 extern const struct gpio_config mv_gpio_config[];
 extern const struct decode_win *cpu_wins;
 extern const struct decode_win *idma_wins;
diff --git a/sys/arm/mv/orion/db88f5xxx.c b/sys/arm/mv/orion/db88f5xxx.c
index 5bef2f28e4f..0762df50985 100644
--- a/sys/arm/mv/orion/db88f5xxx.c
+++ b/sys/arm/mv/orion/db88f5xxx.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/intr.h>
 #include <machine/pte.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 
 #include <arm/mv/mvreg.h>
diff --git a/sys/arm/mv/timer.c b/sys/arm/mv/timer.c
index aec9a34330d..91305b08482 100644
--- a/sys/arm/mv/timer.c
+++ b/sys/arm/mv/timer.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <arm/mv/mvreg.h>
diff --git a/sys/arm/rockchip/common.c b/sys/arm/rockchip/common.c
new file mode 100644
index 00000000000..065318489a0
--- /dev/null
+++ b/sys/arm/rockchip/common.c
@@ -0,0 +1,64 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.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 <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+
+#include <machine/bus.h>
+#include <machine/fdt.h>
+#include <machine/vmparam.h>
+
+struct fdt_fixup_entry fdt_fixup_table[] = {
+	{ NULL, NULL }
+};
+
+static int
+fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
+    int *pol)
+{
+
+	if (!fdt_is_compatible(node, "arm,gic"))
+		return (ENXIO);
+
+	*interrupt = fdt32_to_cpu(intr[0]);
+	*trig = INTR_TRIGGER_CONFORM;
+	*pol = INTR_POLARITY_CONFORM;
+
+	return (0);
+}
+
+fdt_pic_decode_t fdt_pic_table[] = {
+	&fdt_aintc_decode_ic,
+	NULL
+};
diff --git a/sys/arm/rockchip/files.rk30xx b/sys/arm/rockchip/files.rk30xx
new file mode 100644
index 00000000000..dcb5d3f1579
--- /dev/null
+++ b/sys/arm/rockchip/files.rk30xx
@@ -0,0 +1,22 @@
+# $FreeBSD$
+kern/kern_clocksource.c			standard
+
+arm/arm/bus_space_asm_generic.S		standard
+arm/arm/bus_space_generic.c		standard
+arm/arm/cpufunc_asm_armv5.S		standard
+arm/arm/cpufunc_asm_arm10.S		standard
+arm/arm/cpufunc_asm_arm11.S		standard
+arm/arm/cpufunc_asm_armv7.S		standard
+arm/arm/irq_dispatch.S			standard
+
+arm/arm/gic.c				standard
+arm/arm/mpcore_timer.c			standard
+
+arm/arm/bus_space-v6.c			standard
+arm/rockchip/common.c			standard
+arm/rockchip/rk30xx_machdep.c		standard
+arm/rockchip/rk30xx_pmu.c		standard
+arm/rockchip/rk30xx_grf.c		standard
+arm/rockchip/rk30xx_wdog.c		standard
+arm/rockchip/rk30xx_gpio.c		optional	gpio
+dev/usb/controller/dwc_otg_fdt.c	optional	dwcotg
diff --git a/sys/arm/rockchip/rk30xx_gpio.c b/sys/arm/rockchip/rk30xx_gpio.c
new file mode 100644
index 00000000000..fd8223ad920
--- /dev/null
+++ b/sys/arm/rockchip/rk30xx_gpio.c
@@ -0,0 +1,673 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.com>
+ * Copyright (c) 2012 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * Copyright (c) 2012 Luiz Otavio O Souza.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/rman.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/gpio.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/cpufunc.h>
+#include <machine/resource.h>
+#include <machine/fdt.h>
+#include <machine/intr.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include "gpio_if.h"
+
+#include "rk30xx_grf.h"
+#include "rk30xx_pmu.h"
+
+/*
+ * RK3188 has 4 banks of gpio.
+ * 32 pins per bank
+ * PA0 - PA7 | PB0 - PB7
+ * PC0 - PC7 | PD0 - PD7
+ */
+
+#define	RK30_GPIO_PINS		128
+#define	RK30_GPIO_DEFAULT_CAPS	(GPIO_PIN_INPUT | GPIO_PIN_OUTPUT | \
+    GPIO_PIN_PULLUP | GPIO_PIN_PULLDOWN)
+
+#define	RK30_GPIO_NONE			0
+#define	RK30_GPIO_PULLUP		1
+#define	RK30_GPIO_PULLDOWN		2
+
+#define	RK30_GPIO_INPUT			0
+#define	RK30_GPIO_OUTPUT		1
+
+struct rk30_gpio_softc {
+	device_t		sc_dev;
+	struct mtx		sc_mtx;
+	struct resource *	sc_mem_res;
+	struct resource *	sc_irq_res;
+	bus_space_tag_t		sc_bst;
+	bus_space_handle_t	sc_bsh;
+	void *			sc_intrhand;
+	int			sc_gpio_npins;
+	struct gpio_pin		sc_gpio_pins[RK30_GPIO_PINS];
+};
+
+static struct rk30_gpio_softc *rk30_gpio_sc = NULL;
+
+typedef int (*gpios_phandler_t)(phandle_t, pcell_t *, int);
+
+struct gpio_ctrl_entry {
+	const char		*compat;
+	gpios_phandler_t	handler;
+};
+
+int rk30_gpios_prop_handle(phandle_t ctrl, pcell_t *gpios, int len);
+int platform_gpio_init(void);
+
+struct gpio_ctrl_entry gpio_controllers[] = {
+	{ "rockchip,rk30xx-gpio", &rk30_gpios_prop_handle },
+	{ "rockchip,rk30xx-gpio", &rk30_gpios_prop_handle },
+	{ "rockchip,rk30xx-gpio", &rk30_gpios_prop_handle },
+	{ "rockchip,rk30xx-gpio", &rk30_gpios_prop_handle },
+	{ NULL, NULL }
+};
+
+#define	RK30_GPIO_LOCK(_sc)		mtx_lock(&_sc->sc_mtx)
+#define	RK30_GPIO_UNLOCK(_sc)		mtx_unlock(&_sc->sc_mtx)
+#define	RK30_GPIO_LOCK_ASSERT(_sc)	mtx_assert(&_sc->sc_mtx, MA_OWNED)
+
+#define	RK30_GPIO_SWPORT_DR		0x00
+#define	RK30_GPIO_SWPORT_DDR		0x04
+#define	RK30_GPIO_INTEN			0x30
+#define	RK30_GPIO_INTMASK		0x34
+#define	RK30_GPIO_INTTYPE_LEVEL		0x38
+#define	RK30_GPIO_INT_POLARITY		0x3c
+#define	RK30_GPIO_INT_STATUS		0x40
+#define	RK30_GPIO_INT_RAWSTATUS		0x44
+#define	RK30_GPIO_DEBOUNCE		0x48
+#define	RK30_GPIO_PORTS_EOI		0x4c
+#define	RK30_GPIO_EXT_PORT		0x50
+#define	RK30_GPIO_LS_SYNC		0x60
+
+#define	RK30_GPIO_WRITE(_sc, _off, _val)		\
+    bus_space_write_4(_sc->sc_bst, _sc->sc_bsh, _off, _val)
+#define	RK30_GPIO_READ(_sc, _off)			\
+    bus_space_read_4(_sc->sc_bst, _sc->sc_bsh, _off)
+
+static uint32_t
+rk30_gpio_get_function(struct rk30_gpio_softc *sc, uint32_t pin)
+{
+	uint32_t bank, func, offset;
+
+	bank = pin / 32;
+	pin = pin % 32;
+	offset = 1 << pin;
+
+	func = RK30_GPIO_READ(sc, RK30_GPIO_SWPORT_DDR);
+	func &= offset;
+
+	return (func);
+}
+
+static uint32_t
+rk30_gpio_func_flag(uint32_t nfunc)
+{
+
+	switch (nfunc) {
+	case RK30_GPIO_INPUT:
+		return (GPIO_PIN_INPUT);
+	case RK30_GPIO_OUTPUT:
+		return (GPIO_PIN_OUTPUT);
+	}
+	return (0);
+}
+
+static void
+rk30_gpio_set_function(struct rk30_gpio_softc *sc, uint32_t pin, uint32_t f)
+{
+	uint32_t bank, data, offset;
+
+	/* Must be called with lock held. */
+	RK30_GPIO_LOCK_ASSERT(sc);
+
+	bank = pin / 32;
+	pin = pin % 32;
+	offset = 1 << pin;
+
+	data = RK30_GPIO_READ(sc, RK30_GPIO_SWPORT_DDR);
+	if (f)
+		data |= offset;
+	else
+		data &= ~offset;
+	RK30_GPIO_WRITE(sc, RK30_GPIO_SWPORT_DDR, data);
+}
+
+static void
+rk30_gpio_set_pud(struct rk30_gpio_softc *sc, uint32_t pin, uint32_t state)
+{
+	uint32_t bank;
+
+	bank = pin / 32;
+
+	/* Must be called with lock held. */
+	RK30_GPIO_LOCK_ASSERT(sc);
+
+	if (bank == 0 && pin < 12)
+		rk30_pmu_gpio_pud(pin, state);
+	else
+		rk30_grf_gpio_pud(bank, pin, state);
+}
+
+static void
+rk30_gpio_pin_configure(struct rk30_gpio_softc *sc, struct gpio_pin *pin,
+    unsigned int flags)
+{
+
+	RK30_GPIO_LOCK(sc);
+
+	/*
+	 * Manage input/output.
+	 */
+	if (flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) {
+		pin->gp_flags &= ~(GPIO_PIN_INPUT|GPIO_PIN_OUTPUT);
+		if (flags & GPIO_PIN_OUTPUT) {
+			pin->gp_flags |= GPIO_PIN_OUTPUT;
+			rk30_gpio_set_function(sc, pin->gp_pin,
+			    RK30_GPIO_OUTPUT);
+		} else {
+			pin->gp_flags |= GPIO_PIN_INPUT;
+			rk30_gpio_set_function(sc, pin->gp_pin,
+			    RK30_GPIO_INPUT);
+		}
+	}
+
+	/* Manage Pull-up/pull-down. */
+	pin->gp_flags &= ~(GPIO_PIN_PULLUP|GPIO_PIN_PULLDOWN);
+	if (flags & (GPIO_PIN_PULLUP|GPIO_PIN_PULLDOWN)) {
+		if (flags & GPIO_PIN_PULLUP) {
+			pin->gp_flags |= GPIO_PIN_PULLUP;
+			rk30_gpio_set_pud(sc, pin->gp_pin, 
+			    RK30_GPIO_PULLUP);
+		} else {
+			pin->gp_flags |= GPIO_PIN_PULLDOWN;
+			rk30_gpio_set_pud(sc, pin->gp_pin, 
+			    RK30_GPIO_PULLDOWN);
+		}
+	} else
+		rk30_gpio_set_pud(sc, pin->gp_pin, RK30_GPIO_NONE);
+
+	RK30_GPIO_UNLOCK(sc);
+}
+
+static int
+rk30_gpio_pin_max(device_t dev, int *maxpin)
+{
+
+	*maxpin = RK30_GPIO_PINS - 1;
+	return (0);
+}
+
+static int
+rk30_gpio_pin_getcaps(device_t dev, uint32_t pin, uint32_t *caps)
+{
+	struct rk30_gpio_softc *sc = device_get_softc(dev);
+	int i;
+
+	for (i = 0; i < sc->sc_gpio_npins; i++) {
+		if (sc->sc_gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->sc_gpio_npins)
+		return (EINVAL);
+
+	RK30_GPIO_LOCK(sc);
+	*caps = sc->sc_gpio_pins[i].gp_caps;
+	RK30_GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+rk30_gpio_pin_getflags(device_t dev, uint32_t pin, uint32_t *flags)
+{
+	struct rk30_gpio_softc *sc = device_get_softc(dev);
+	int i;
+
+	for (i = 0; i < sc->sc_gpio_npins; i++) {
+		if (sc->sc_gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->sc_gpio_npins)
+		return (EINVAL);
+
+	RK30_GPIO_LOCK(sc);
+	*flags = sc->sc_gpio_pins[i].gp_flags;
+	RK30_GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+rk30_gpio_pin_getname(device_t dev, uint32_t pin, char *name)
+{
+	struct rk30_gpio_softc *sc = device_get_softc(dev);
+	int i;
+
+	for (i = 0; i < sc->sc_gpio_npins; i++) {
+		if (sc->sc_gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->sc_gpio_npins)
+		return (EINVAL);
+
+	RK30_GPIO_LOCK(sc);
+	memcpy(name, sc->sc_gpio_pins[i].gp_name, GPIOMAXNAME);
+	RK30_GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+rk30_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags)
+{
+	struct rk30_gpio_softc *sc = device_get_softc(dev);
+	int i;
+
+	for (i = 0; i < sc->sc_gpio_npins; i++) {
+		if (sc->sc_gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->sc_gpio_npins)
+		return (EINVAL);
+
+	/* Check for unwanted flags. */
+	if ((flags & sc->sc_gpio_pins[i].gp_caps) != flags)
+		return (EINVAL);
+
+	/* Can't mix input/output together. */
+	if ((flags & (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT)) ==
+	    (GPIO_PIN_INPUT|GPIO_PIN_OUTPUT))
+		return (EINVAL);
+
+	/* Can't mix pull-up/pull-down together. */
+	if ((flags & (GPIO_PIN_PULLUP|GPIO_PIN_PULLDOWN)) ==
+	    (GPIO_PIN_PULLUP|GPIO_PIN_PULLDOWN))
+		return (EINVAL);
+
+	rk30_gpio_pin_configure(sc, &sc->sc_gpio_pins[i], flags);
+
+	return (0);
+}
+
+static int
+rk30_gpio_pin_set(device_t dev, uint32_t pin, unsigned int value)
+{
+	struct rk30_gpio_softc *sc = device_get_softc(dev);
+	uint32_t bank, offset, data;
+	int i;
+
+	for (i = 0; i < sc->sc_gpio_npins; i++) {
+		if (sc->sc_gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->sc_gpio_npins)
+		return (EINVAL);
+
+	bank = pin / 32;
+	pin = pin % 32;
+	offset = 1 << pin;
+
+	RK30_GPIO_LOCK(sc);
+	data = RK30_GPIO_READ(sc, RK30_GPIO_SWPORT_DDR);
+	data |= offset;
+	RK30_GPIO_WRITE(sc, RK30_GPIO_SWPORT_DDR, data);
+
+	data = RK30_GPIO_READ(sc, RK30_GPIO_SWPORT_DR);
+	if (value)
+		data |= offset;
+	else
+		data &= ~offset;
+	RK30_GPIO_WRITE(sc, RK30_GPIO_SWPORT_DR, data);
+	RK30_GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+rk30_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *val)
+{
+	struct rk30_gpio_softc *sc = device_get_softc(dev);
+	uint32_t bank, offset, reg_data;
+	int i;
+
+	for (i = 0; i < sc->sc_gpio_npins; i++) {
+		if (sc->sc_gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->sc_gpio_npins)
+		return (EINVAL);
+
+	bank = pin / 32;
+	pin = pin % 32;
+	offset = 1 << pin;
+
+	RK30_GPIO_LOCK(sc);
+	reg_data = RK30_GPIO_READ(sc, RK30_GPIO_EXT_PORT);
+	RK30_GPIO_UNLOCK(sc);
+	*val = (reg_data & offset) ? 1 : 0;
+
+	return (0);
+}
+
+static int
+rk30_gpio_pin_toggle(device_t dev, uint32_t pin)
+{
+	struct rk30_gpio_softc *sc = device_get_softc(dev);
+	uint32_t bank, data, offset;
+	int i;
+
+	for (i = 0; i < sc->sc_gpio_npins; i++) {
+		if (sc->sc_gpio_pins[i].gp_pin == pin)
+			break;
+	}
+
+	if (i >= sc->sc_gpio_npins)
+		return (EINVAL);
+
+	bank = pin / 32;
+	pin = pin % 32;
+	offset = 1 << pin;
+
+	RK30_GPIO_LOCK(sc);
+	data = RK30_GPIO_READ(sc, RK30_GPIO_SWPORT_DDR);
+	if (data & offset)
+		data &= ~offset;
+	else
+		data |= offset;
+	RK30_GPIO_WRITE(sc, RK30_GPIO_SWPORT_DDR, data);
+
+	data = RK30_GPIO_READ(sc, RK30_GPIO_SWPORT_DR);
+	if (data & offset)
+		data &= ~offset;
+	else
+		data |= offset;
+	RK30_GPIO_WRITE(sc, RK30_GPIO_SWPORT_DR, data);
+	RK30_GPIO_UNLOCK(sc);
+
+	return (0);
+}
+
+static int
+rk30_gpio_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "rockchip,rk30xx-gpio"))
+		return (ENXIO);
+
+	device_set_desc(dev, "Rockchip RK30XX GPIO controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+rk30_gpio_attach(device_t dev)
+{
+	struct rk30_gpio_softc *sc = device_get_softc(dev);
+	uint32_t func;
+	int i, rid;
+	phandle_t gpio;
+
+	if (rk30_gpio_sc)
+		return (ENXIO);
+
+	sc->sc_dev = dev;
+
+	mtx_init(&sc->sc_mtx, "rk30 gpio", "gpio", MTX_DEF);
+
+	rid = 0;
+	sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (!sc->sc_mem_res) {
+		device_printf(dev, "cannot allocate memory window\n");
+		return (ENXIO);
+	}
+
+	sc->sc_bst = rman_get_bustag(sc->sc_mem_res);
+	sc->sc_bsh = rman_get_bushandle(sc->sc_mem_res);
+
+	rid = 0;
+	sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE);
+	if (!sc->sc_irq_res) {
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+		device_printf(dev, "cannot allocate interrupt\n");
+		return (ENXIO);
+	}
+
+	/* Find our node. */
+	gpio = ofw_bus_get_node(sc->sc_dev);
+
+	if (!OF_hasprop(gpio, "gpio-controller"))
+		/* Node is not a GPIO controller. */
+		goto fail;
+
+	/* Initialize the software controlled pins. */
+	for (i = 0; i < RK30_GPIO_PINS; i++) {
+		snprintf(sc->sc_gpio_pins[i].gp_name, GPIOMAXNAME,
+		    "pin %d", i);
+		func = rk30_gpio_get_function(sc, i);
+		sc->sc_gpio_pins[i].gp_pin = i;
+		sc->sc_gpio_pins[i].gp_caps = RK30_GPIO_DEFAULT_CAPS;
+		sc->sc_gpio_pins[i].gp_flags = rk30_gpio_func_flag(func);
+	}
+	sc->sc_gpio_npins = i;
+
+	device_add_child(dev, "gpioc", device_get_unit(dev));
+	device_add_child(dev, "gpiobus", device_get_unit(dev));
+
+	rk30_gpio_sc = sc;
+
+	platform_gpio_init();
+	
+	return (bus_generic_attach(dev));
+
+fail:
+	if (sc->sc_irq_res)
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_irq_res);
+	if (sc->sc_mem_res)
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+	return (ENXIO);
+}
+
+static int
+rk30_gpio_detach(device_t dev)
+{
+
+	return (EBUSY);
+}
+
+static device_method_t rk30_gpio_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		rk30_gpio_probe),
+	DEVMETHOD(device_attach,	rk30_gpio_attach),
+	DEVMETHOD(device_detach,	rk30_gpio_detach),
+
+	/* GPIO protocol */
+	DEVMETHOD(gpio_pin_max,		rk30_gpio_pin_max),
+	DEVMETHOD(gpio_pin_getname,	rk30_gpio_pin_getname),
+	DEVMETHOD(gpio_pin_getflags,	rk30_gpio_pin_getflags),
+	DEVMETHOD(gpio_pin_getcaps,	rk30_gpio_pin_getcaps),
+	DEVMETHOD(gpio_pin_setflags,	rk30_gpio_pin_setflags),
+	DEVMETHOD(gpio_pin_get,		rk30_gpio_pin_get),
+	DEVMETHOD(gpio_pin_set,		rk30_gpio_pin_set),
+	DEVMETHOD(gpio_pin_toggle,	rk30_gpio_pin_toggle),
+
+	DEVMETHOD_END
+};
+
+static devclass_t rk30_gpio_devclass;
+
+static driver_t rk30_gpio_driver = {
+	"gpio",
+	rk30_gpio_methods,
+	sizeof(struct rk30_gpio_softc),
+};
+
+DRIVER_MODULE(rk30_gpio, simplebus, rk30_gpio_driver, rk30_gpio_devclass, 0, 0);
+
+int
+rk30_gpios_prop_handle(phandle_t ctrl, pcell_t *gpios, int len)
+{
+	struct rk30_gpio_softc *sc;
+	pcell_t gpio_cells;
+	int inc, t, tuples, tuple_size;
+	int dir, flags, pin, i;
+	u_long gpio_ctrl, size;
+
+	sc = rk30_gpio_sc;
+	if (sc == NULL)
+		return ENXIO;
+
+	if (OF_getprop(ctrl, "#gpio-cells", &gpio_cells, sizeof(pcell_t)) < 0)
+		return (ENXIO);
+
+	gpio_cells = fdt32_to_cpu(gpio_cells);
+	if (gpio_cells != 2)
+		return (ENXIO);
+
+	tuple_size = gpio_cells * sizeof(pcell_t) + sizeof(phandle_t);
+	tuples = len / tuple_size;
+
+	if (fdt_regsize(ctrl, &gpio_ctrl, &size))
+		return (ENXIO);
+
+	/*
+	 * Skip controller reference, since controller's phandle is given
+	 * explicitly (in a function argument).
+	 */
+	inc = sizeof(ihandle_t) / sizeof(pcell_t);
+	gpios += inc;
+	for (t = 0; t < tuples; t++) {
+		pin = fdt32_to_cpu(gpios[0]);
+		dir = fdt32_to_cpu(gpios[1]);
+		flags = fdt32_to_cpu(gpios[2]);
+
+		for (i = 0; i < sc->sc_gpio_npins; i++) {
+			if (sc->sc_gpio_pins[i].gp_pin == pin)
+				break;
+		}
+		if (i >= sc->sc_gpio_npins)
+			return (EINVAL);
+
+		rk30_gpio_pin_configure(sc, &sc->sc_gpio_pins[i], flags);
+
+		if (dir == 1) {
+			/* Input. */
+			rk30_gpio_pin_set(sc->sc_dev, pin, RK30_GPIO_INPUT);
+		} else {
+			/* Output. */
+			rk30_gpio_pin_set(sc->sc_dev, pin, RK30_GPIO_OUTPUT);
+		}
+		gpios += gpio_cells + inc;
+	}
+
+	return (0);
+}
+
+#define	MAX_PINS_PER_NODE	5
+#define	GPIOS_PROP_CELLS	4
+
+int
+platform_gpio_init(void)
+{
+	phandle_t child, parent, root, ctrl;
+	pcell_t gpios[MAX_PINS_PER_NODE * GPIOS_PROP_CELLS];
+	struct gpio_ctrl_entry *e;
+	int len, rv;
+
+	root = OF_finddevice("/");
+	len = 0;
+	parent = root;
+
+	/* Traverse through entire tree to find nodes with 'gpios' prop */
+	for (child = OF_child(parent); child != 0; child = OF_peer(child)) {
+
+		/* Find a 'leaf'. Start the search from this node. */
+		while (OF_child(child)) {
+			parent = child;
+			child = OF_child(child);
+		}
+		if ((len = OF_getproplen(child, "gpios")) > 0) {
+
+			if (len > sizeof(gpios))
+				return (ENXIO);
+
+			/* Get 'gpios' property. */
+			OF_getprop(child, "gpios", &gpios, len);
+
+			e = (struct gpio_ctrl_entry *)&gpio_controllers;
+
+			/* Find and call a handler. */
+			for (; e->compat; e++) {
+				/*
+				 * First cell of 'gpios' property should
+				 * contain a ref. to a node defining GPIO
+				 * controller.
+				 */
+				ctrl = OF_xref_phandle(fdt32_to_cpu(gpios[0]));
+
+				if (fdt_is_compatible(ctrl, e->compat))
+					/* Call a handler. */
+					if ((rv = e->handler(ctrl,
+					    (pcell_t *)&gpios, len)))
+						return (rv);
+			}
+		}
+
+		if (OF_peer(child) == 0) {
+			/* No more siblings. */
+			child = parent;
+			parent = OF_parent(child);
+		}
+	}
+	return (0);
+}
diff --git a/sys/arm/rockchip/rk30xx_grf.c b/sys/arm/rockchip/rk30xx_grf.c
new file mode 100644
index 00000000000..a2ff38a0603
--- /dev/null
+++ b/sys/arm/rockchip/rk30xx_grf.c
@@ -0,0 +1,129 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.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.
+ */
+
+/* General Register File for Rockchip RK30xx */
+
+#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/watchdog.h>
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/intr.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 "rk30xx_grf.h"
+
+struct rk30_grf_softc {
+	struct resource		*res;
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+};
+
+static struct rk30_grf_softc *rk30_grf_sc = NULL;
+
+#define	grf_read_4(sc, reg)		\
+	bus_space_read_4((sc)->bst, (sc)->bsh, (reg))
+#define	grf_write_4(sc, reg, val)	\
+	bus_space_write_4((sc)->bst, (sc)->bsh, (reg), (val))
+
+static int
+rk30_grf_probe(device_t dev)
+{
+
+	if (ofw_bus_is_compatible(dev, "rockchip,rk30xx-grf")) {
+		device_set_desc(dev, "RK30XX General Register File");
+		return(BUS_PROBE_DEFAULT);
+	}
+
+	return (ENXIO);
+}
+
+static int
+rk30_grf_attach(device_t dev)
+{
+	struct rk30_grf_softc *sc = device_get_softc(dev);
+	int rid = 0;
+
+	if (rk30_grf_sc)
+		return (ENXIO);
+
+	sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+	if (!sc->res) {
+		device_printf(dev, "could not allocate resource\n");
+		return (ENXIO);
+	}
+
+	sc->bst = rman_get_bustag(sc->res);
+	sc->bsh = rman_get_bushandle(sc->res);
+
+	rk30_grf_sc = sc;
+
+	return (0);
+}
+
+static device_method_t rk30_grf_methods[] = {
+	DEVMETHOD(device_probe,		rk30_grf_probe),
+	DEVMETHOD(device_attach,	rk30_grf_attach),
+	{ 0, 0 }
+};
+
+static driver_t rk30_grf_driver = {
+	"rk30_grf",
+	rk30_grf_methods,
+	sizeof(struct rk30_grf_softc),
+};
+
+static devclass_t rk30_grf_devclass;
+
+DRIVER_MODULE(rk30_grf, simplebus, rk30_grf_driver, rk30_grf_devclass, 0, 0);
+
+void
+rk30_grf_gpio_pud(uint32_t bank, uint32_t pin, uint32_t state)
+{
+	uint32_t offset;
+
+	offset = GRF_GPIO0B_PULL - 4 + (bank * 16) + ((pin / 8) * 4);
+	pin = (7 - (pin % 8)) * 2;
+	grf_write_4(rk30_grf_sc, offset, (0x3 << (16 + pin)) | (state << pin));
+}
+
diff --git a/sys/arm/rockchip/rk30xx_grf.h b/sys/arm/rockchip/rk30xx_grf.h
new file mode 100644
index 00000000000..a26716bc454
--- /dev/null
+++ b/sys/arm/rockchip/rk30xx_grf.h
@@ -0,0 +1,141 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _RK30_GRF_H_
+#define	_RK30_GRF_H_
+
+#define	RK30_GRF_BASE		0xF0008000
+
+#define	GRF_GPIO0L_DIR		0x0000
+#define	GRF_GPIO0H_DIR		0x0004
+#define	GRF_GPIO1L_DIR		0x0008
+#define	GRF_GPIO1H_DIR		0x000c
+#define	GRF_GPIO2L_DIR		0x0010
+#define	GRF_GPIO2H_DIR		0x0014
+#define	GRF_GPIO3L_DIR		0x0018
+#define	GRF_GPIO3H_DIR		0x001c
+#define	GRF_GPIO0L_DO		0x0020
+#define	GRF_GPIO0H_DO		0x0024
+#define	GRF_GPIO1L_DO		0x0028
+#define	GRF_GPIO1H_DO		0x002c
+#define	GRF_GPIO2L_DO		0x0030
+#define	GRF_GPIO2H_DO		0x0034
+#define	GRF_GPIO3L_DO		0x0038
+#define	GRF_GPIO3H_DO		0x003c
+#define	GRF_GPIO0L_EN		0x0040
+#define	GRF_GPIO0H_EN		0x0044
+#define	GRF_GPIO1L_EN		0x0048
+#define	GRF_GPIO1H_EN		0x004c
+#define	GRF_GPIO2L_EN		0x0050
+#define	GRF_GPIO2H_EN		0x0054
+#define	GRF_GPIO3L_EN		0x0058
+#define	GRF_GPIO3H_EN		0x005c
+
+#define	GRF_GPIO0C_IOMUX	0x0068
+#define	GRF_GPIO0D_IOMUX	0x006c
+#define	GRF_GPIO1A_IOMUX	0x0070
+#define	GRF_GPIO1B_IOMUX	0x0074
+#define	GRF_GPIO1C_IOMUX	0x0078
+#define	GRF_GPIO1D_IOMUX	0x007c
+#define	GRF_GPIO2A_IOMUX	0x0080
+#define	GRF_GPIO2B_IOMUX	0x0084
+#define	GRF_GPIO2C_IOMUX	0x0088
+#define	GRF_GPIO2D_IOMUX	0x008c
+#define	GRF_GPIO3A_IOMUX	0x0090
+#define	GRF_GPIO3B_IOMUX	0x0094
+#define	GRF_GPIO3C_IOMUX	0x0098
+#define	GRF_GPIO3D_IOMUX	0x009c
+#define	GRF_SOC_CON0		0x00a0
+#define	GRF_SOC_CON1		0x00a4
+#define	GRF_SOC_CON2		0x00a8
+#define	GRF_SOC_STATUS0		0x00ac
+#define	GRF_DMAC1_CON0		0x00b0
+#define	GRF_DMAC1_CON1		0x00b4
+#define	GRF_DMAC1_CON2		0x00b8
+#define	GRF_DMAC2_CON0		0x00bc
+#define	GRF_DMAC2_CON1		0x00c0
+#define	GRF_DMAC2_CON2		0x00c4
+#define	GRF_DMAC2_CON3		0x00c8
+#define	GRF_CPU_CON0		0x00cc
+#define	GRF_CPU_CON1		0x00d0
+#define	GRF_CPU_CON2		0x00d4
+#define	GRF_CPU_CON3		0x00d8
+#define	GRF_CPU_CON4		0x00dc
+#define	GRF_CPU_CON5		0x00e0
+
+#define	GRF_DDRC_CON0		0x00ec
+#define	GRF_DDRC_STAT		0x00f0
+#define	GRF_IO_CON0		0x00f4
+#define	GRF_IO_CON1		0x00f8
+#define	GRF_IO_CON2		0x00fc
+#define	GRF_IO_CON3		0x0100
+#define	GRF_IO_CON4		0x0104
+#define	GRF_SOC_STATUS1		0x0108
+#define	GRF_UOC0_CON0		0x010c
+#define	GRF_UOC0_CON1		0x0110
+#define	GRF_UOC0_CON2		0x0114
+#define	GRF_UOC0_CON3		0x0118
+#define	GRF_UOC1_CON0		0x011c
+#define	GRF_UOC1_CON1		0x0120
+#define	GRF_UOC1_CON2		0x0124
+#define	GRF_UOC1_CON3		0x0128
+#define	GRF_UOC2_CON0		0x012c
+#define	GRF_UOC2_CON1		0x0130
+
+#define	GRF_UOC3_CON0		0x0138
+#define	GRF_UOC3_CON1		0x013c
+#define	GRF_HSIC_STAT		0x0140
+#define	GRF_OS_REG0		0x0144
+#define	GRF_OS_REG1		0x0148
+#define	GRF_OS_REG2		0x014c
+#define	GRF_OS_REG3		0x0150
+#define	GRF_OS_REG4		0x0154
+#define	GRF_OS_REG5		0x0158
+#define	GRF_OS_REG6		0x015c
+#define	GRF_OS_REG7		0x0160
+#define	GRF_GPIO0B_PULL		0x0164
+#define	GRF_GPIO0C_PULL		0x0168
+#define	GRF_GPIO0D_PULL		0x016c
+#define	GRF_GPIO1A_PULL		0x0170
+#define	GRF_GPIO1B_PULL		0x0174
+#define	GRF_GPIO1C_PULL		0x0178
+#define	GRF_GPIO1D_PULL		0x017c
+#define	GRF_GPIO2A_PULL		0x0180
+#define	GRF_GPIO2B_PULL		0x0184
+#define	GRF_GPIO2C_PULL		0x0188
+#define	GRF_GPIO2D_PULL		0x018c
+#define	GRF_GPIO3A_PULL		0x0190
+#define	GRF_GPIO3B_PULL		0x0194
+#define	GRF_GPIO3C_PULL		0x0198
+#define	GRF_GPIO3D_PULL		0x019c
+#define	GRF_FLASH_DATA_PULL	0x01a0
+#define	GRF_FLASH_CMD_PULL	0x01a4
+
+void rk30_grf_gpio_pud(uint32_t bank, uint32_t pin, uint32_t state);
+
+#endif /* _RK30_GRF_H_ */
diff --git a/sys/arm/rockchip/rk30xx_machdep.c b/sys/arm/rockchip/rk30xx_machdep.c
new file mode 100644
index 00000000000..31a296f85f2
--- /dev/null
+++ b/sys/arm/rockchip/rk30xx_machdep.c
@@ -0,0 +1,130 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.com>
+ * 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.
+ *
+ * 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.
+ *
+ * from: FreeBSD: //depot/projects/arm/src/sys/arm/ti/ti_machdep.c
+ */
+
+#include "opt_ddb.h"
+#include "opt_platform.h"
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#define _ARM32_BUS_DMA_PRIVATE
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <machine/armreg.h>
+#include <machine/bus.h>
+#include <machine/devmap.h>
+#include <machine/machdep.h>
+
+#include <dev/fdt/fdt_common.h>
+
+#include <arm/rockchip/rk30xx_wdog.h>
+
+/* Start of address space used for bootstrap map */
+#define DEVMAP_BOOTSTRAP_MAP_START	0xF0000000
+
+vm_offset_t
+initarm_lastaddr(void)
+{
+
+	return (DEVMAP_BOOTSTRAP_MAP_START);
+}
+
+void
+initarm_early_init(void)
+{
+
+}
+
+void
+initarm_gpio_init(void)
+{
+}
+
+void
+initarm_late_init(void)
+{
+
+	/* Enable cache */
+	cpufunc_control(CPU_CONTROL_DC_ENABLE|CPU_CONTROL_IC_ENABLE,
+	    CPU_CONTROL_DC_ENABLE|CPU_CONTROL_IC_ENABLE);
+}
+
+#define FDT_DEVMAP_MAX		(1 + 2 + 1 + 1)
+static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
+	{ 0, 0, 0, 0, 0, }
+};
+
+/*
+ * Construct pmap_devmap[] with DT-derived config data.
+ */
+int
+initarm_devmap_init(void)
+{
+	int i = 0;
+
+	fdt_devmap[i].pd_va = 0xF0000000;
+	fdt_devmap[i].pd_pa = 0x20000000;
+	fdt_devmap[i].pd_size = 0x100000;
+	fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
+	fdt_devmap[i].pd_cache = PTE_DEVICE;
+	i++;
+
+	arm_devmap_register_table(&fdt_devmap[0]);
+	
+	return (0);
+}
+
+struct arm32_dma_range *
+bus_dma_get_range(void)
+{
+
+	return (NULL);
+}
+
+int
+bus_dma_get_range_nb(void)
+{
+
+	return (0);
+}
+
+void
+cpu_reset()
+{
+
+	rk30_wd_watchdog_reset();
+	printf("Reset failed!\n");
+	while (1);
+}
diff --git a/sys/arm/rockchip/rk30xx_pmu.c b/sys/arm/rockchip/rk30xx_pmu.c
new file mode 100644
index 00000000000..72f104dc27b
--- /dev/null
+++ b/sys/arm/rockchip/rk30xx_pmu.c
@@ -0,0 +1,129 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.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.
+ */
+
+/* PMU for Rockchip RK30xx */
+
+#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/watchdog.h>
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/intr.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 "rk30xx_pmu.h"
+
+struct rk30_pmu_softc {
+	struct resource		*res;
+	bus_space_tag_t		bst;
+	bus_space_handle_t	bsh;
+};
+
+static struct rk30_pmu_softc *rk30_pmu_sc = NULL;
+
+#define	pmu_read_4(sc, reg)		\
+	bus_space_read_4((sc)->bst, (sc)->bsh, (reg))
+#define	pmu_write_4(sc, reg, val)	\
+	bus_space_write_4((sc)->bst, (sc)->bsh, (reg), (val))
+
+static int
+rk30_pmu_probe(device_t dev)
+{
+
+	if (ofw_bus_is_compatible(dev, "rockchip,rk30xx-pmu")) {
+		device_set_desc(dev, "RK30XX PMU");
+		return(BUS_PROBE_DEFAULT);
+	}
+
+	return (ENXIO);
+}
+
+static int
+rk30_pmu_attach(device_t dev)
+{
+	struct rk30_pmu_softc *sc = device_get_softc(dev);
+	int rid = 0;
+
+	if (rk30_pmu_sc)
+		return (ENXIO);
+
+	sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+	if (!sc->res) {
+		device_printf(dev, "could not allocate resource\n");
+		return (ENXIO);
+	}
+
+	sc->bst = rman_get_bustag(sc->res);
+	sc->bsh = rman_get_bushandle(sc->res);
+
+	rk30_pmu_sc = sc;
+
+	return (0);
+}
+
+static device_method_t rk30_pmu_methods[] = {
+	DEVMETHOD(device_probe,		rk30_pmu_probe),
+	DEVMETHOD(device_attach,	rk30_pmu_attach),
+	{ 0, 0 }
+};
+
+static driver_t rk30_pmu_driver = {
+	"rk30_pmu",
+	rk30_pmu_methods,
+	sizeof(struct rk30_pmu_softc),
+};
+
+static devclass_t rk30_pmu_devclass;
+
+DRIVER_MODULE(rk30_pmu, simplebus, rk30_pmu_driver, rk30_pmu_devclass, 0, 0);
+
+void
+rk30_pmu_gpio_pud(uint32_t pin, uint32_t state)
+{
+	uint32_t offset;
+
+	offset = PMU_GPIO0A_PULL + ((pin / 8) * 4);
+	pin = (pin % 8) * 2;
+	pmu_write_4(rk30_pmu_sc, offset, (0x3 << (16 + pin)) | (state << pin));
+}
+
diff --git a/sys/arm/rockchip/rk30xx_pmu.h b/sys/arm/rockchip/rk30xx_pmu.h
new file mode 100644
index 00000000000..7bdec945439
--- /dev/null
+++ b/sys/arm/rockchip/rk30xx_pmu.h
@@ -0,0 +1,60 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _RK30_PMU_H_
+#define	_RK30_PMU_H_
+
+#define	RK30_PMU_BASE			0xF0004000
+
+#define	PMU_WAKEUP_CFG0			0x00
+#define	PMU_WAKEUP_CFG1			0x04
+#define	PMU_PWRDN_CON			0x08
+#define	PMU_PWRDN_ST			0x0c
+#define	PMU_INT_CON			0x10
+#define	PMU_INT_ST			0x14
+#define	PMU_MISC_CON			0x18
+#define	PMU_OSC_CNT			0x1c
+#define	PMU_PLL_CNT			0x20
+#define	PMU_PMU_CNT			0x24
+#define	PMU_DDRIO_PWRON_CNT		0x28
+#define	PMU_WAKEUP_RST_CLR_CNT		0x2c
+#define	PMU_SCU_PWRDWN_CNT		0x30
+#define	PMU_SCU_PWRUP_CNT		0x34
+#define	PMU_MISC_CON1			0x38
+#define	PMU_GPIO0_CON			0x3c
+#define	PMU_SYS_REG0			0x40
+#define	PMU_SYS_REG1			0x44
+#define	PMU_SYS_REG2			0x48
+#define	PMU_SYS_REG3			0x4c
+#define	PMU_STOP_INT_DLY		0x60
+#define	PMU_GPIO0A_PULL			0x64
+#define	PMU_GPIO0B_PULL			0x68
+
+void rk30_pmu_gpio_pud(uint32_t pin, uint32_t state);
+
+#endif /* _RK30_PMU_H_ */
diff --git a/sys/arm/rockchip/rk30xx_wdog.c b/sys/arm/rockchip/rk30xx_wdog.c
new file mode 100644
index 00000000000..f5761c97d58
--- /dev/null
+++ b/sys/arm/rockchip/rk30xx_wdog.c
@@ -0,0 +1,198 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.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/watchdog.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 <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/cpufunc.h>
+#include <machine/machdep.h>
+#include <machine/fdt.h>
+
+#include <arm/rockchip/rk30xx_wdog.h>
+
+#ifndef	RK30_WDT_BASE
+#define	RK30_WDT_BASE		0x2004c000
+#define	RK30_WDT_PSIZE		0x100
+#endif
+
+#define	RK30_WDT_READ(_sc, _r)		bus_read_4((_sc)->res, (_r))
+#define	RK30_WDT_WRITE(_sc, _r, _v)	bus_write_4((_sc)->res, (_r), (_v))
+
+#define	WDOG_CTRL		0x00
+#define	WDOG_CTRL_EN		(1 << 0)
+#define	WDOG_CTRL_RSP_MODE	(1 << 1)
+#define	WDOG_CTRL_RST_PULSE	(4 << 2)
+#define	WDOG_CTRL_RST		0xa
+#define	WDOG_TORR		0x04
+#define	WDOG_TORR_INTVL_SHIFT	0
+#define	WDOG_CCVR		0x08
+#define	WDOG_CRR		0x0c
+#define	WDOG_CRR_PWD		0x76
+#define	WDOG_STAT		0x10
+#define	WDOG_EOI		0x14
+
+static struct rk30_wd_softc *rk30_wd_sc = NULL;
+
+struct rk30_wd_softc {
+	device_t		dev;
+	struct resource		*res;
+	struct mtx		mtx;
+	int			freq;
+};
+
+static void rk30_wd_watchdog_fn(void *private, u_int cmd, int *error);
+
+static int
+rk30_wd_probe(device_t dev)
+{
+
+	if (ofw_bus_is_compatible(dev, "rockchip,rk30xx-wdt")) {
+		device_set_desc(dev, "Rockchip RK30XX Watchdog");
+		return (BUS_PROBE_DEFAULT);
+	}
+
+	return (ENXIO);
+}
+
+static int
+rk30_wd_attach(device_t dev)
+{
+	struct rk30_wd_softc *sc;
+	int rid;
+	phandle_t node;
+	pcell_t cell;
+
+	if (rk30_wd_sc != NULL)
+		return (ENXIO);
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	node = ofw_bus_get_node(sc->dev);
+	if (OF_getencprop(node, "clock-frequency", &cell, sizeof(cell)) > 0)
+		sc->freq = cell / 1000000;
+	else
+		return (ENXIO);
+
+	rid = 0;
+	sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+	if (sc->res == NULL) {
+		device_printf(dev, "could not allocate memory resource\n");
+		return (ENXIO);
+	}
+
+	rk30_wd_sc = sc;
+	mtx_init(&sc->mtx, "RK30XX Watchdog", "rk30_wd", MTX_DEF);
+	EVENTHANDLER_REGISTER(watchdog_list, rk30_wd_watchdog_fn, sc, 0);
+
+	return (0);
+}
+
+static void
+rk30_wd_watchdog_fn(void *private, u_int cmd, int *error)
+{
+	struct rk30_wd_softc *sc;
+	uint64_t ms, m, max;
+	int i;
+
+	sc = private;
+	mtx_lock(&sc->mtx);
+
+	cmd &= WD_INTERVAL;
+
+	if (cmd > 0) {
+		ms = ((uint64_t)1 << (cmd & WD_INTERVAL)) / 1000000;
+		m = 0xffff / sc->freq;
+		max = 0x7fffffff / sc->freq + 1;
+		i = 0;
+		while (m < max && m < ms) {
+			m <<= 1;
+			i++;
+		}
+		if (m < max) {
+			RK30_WDT_WRITE(sc, WDOG_TORR,
+			    i << WDOG_TORR_INTVL_SHIFT);
+			RK30_WDT_WRITE(sc, WDOG_CTRL,
+			    WDOG_CTRL_EN | WDOG_CTRL_RSP_MODE |
+			    WDOG_CTRL_RST_PULSE);
+			RK30_WDT_WRITE(sc, WDOG_CRR, WDOG_CRR_PWD);
+			*error = 0;
+		} else {
+			device_printf(sc->dev, "Can not be disabled\n");
+			mtx_unlock(&sc->mtx);
+			RK30_WDT_WRITE(sc, WDOG_CTRL, WDOG_CTRL_RST);
+			return;
+		}
+	}
+	else
+		RK30_WDT_WRITE(sc, WDOG_CTRL, WDOG_CTRL_RST);
+
+	mtx_unlock(&sc->mtx);
+}
+
+void
+rk30_wd_watchdog_reset()
+{
+	bus_space_handle_t bsh;
+
+	bus_space_map(fdtbus_bs_tag, RK30_WDT_BASE, RK30_WDT_PSIZE, 0, &bsh);
+	bus_space_write_4(fdtbus_bs_tag, bsh, WDOG_TORR, 0);
+	bus_space_write_4(fdtbus_bs_tag, bsh, WDOG_CTRL,
+	    WDOG_CTRL_EN | WDOG_CTRL_RSP_MODE | WDOG_CTRL_RST_PULSE);
+
+	while (1);
+}
+
+static device_method_t rk30_wd_methods[] = {
+	DEVMETHOD(device_probe, rk30_wd_probe),
+	DEVMETHOD(device_attach, rk30_wd_attach),
+
+	DEVMETHOD_END
+};
+
+static driver_t rk30_wd_driver = {
+	"rk30_wd",
+	rk30_wd_methods,
+	sizeof(struct rk30_wd_softc),
+};
+static devclass_t rk30_wd_devclass;
+
+DRIVER_MODULE(rk30_wd, simplebus, rk30_wd_driver, rk30_wd_devclass, 0, 0);
diff --git a/sys/arm/rockchip/rk30xx_wdog.h b/sys/arm/rockchip/rk30xx_wdog.h
new file mode 100644
index 00000000000..e7a33eb439f
--- /dev/null
+++ b/sys/arm/rockchip/rk30xx_wdog.h
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.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.
+ *
+ * $FreeBSD$
+ *
+ */
+#ifndef	__RK30XX_WDOG_H__
+#define	__RK30XX_WDOG_H__
+
+void rk30_wd_watchdog_reset(void);
+
+#endif /*__RK30XX_WDOG_H__*/
+
diff --git a/sys/arm/rockchip/std.rk30xx b/sys/arm/rockchip/std.rk30xx
new file mode 100644
index 00000000000..7b714bb9ca1
--- /dev/null
+++ b/sys/arm/rockchip/std.rk30xx
@@ -0,0 +1,27 @@
+# Rockchip rk30xx common options
+#$FreeBSD$
+
+cpu		CPU_CORTEXA
+machine		arm armv6
+makeoption	ARM_LITTLE_ENDIAN
+
+# Physical memory starts at 0x60400000.  We assume images are loaded at
+# 0x60400000.
+#
+#
+options		PHYSADDR=0x60000000
+
+makeoptions	KERNPHYSADDR=0x60400000
+options		KERNPHYSADDR=0x60400000
+
+makeoptions	KERNVIRTADDR=0xc0400000
+options		KERNVIRTADDR=0xc0400000
+
+options		STARTUP_PAGETABLE_ADDR=0x60200000
+
+options		ARM_L2_PIPT
+
+options		IPI_IRQ_START=0
+options		IPI_IRQ_END=15
+
+files		"../rockchip/files.rk30xx"
diff --git a/sys/arm/s3c2xx0/files.s3c2xx0 b/sys/arm/s3c2xx0/files.s3c2xx0
index 7a19c50b47e..0e82b390465 100644
--- a/sys/arm/s3c2xx0/files.s3c2xx0
+++ b/sys/arm/s3c2xx0/files.s3c2xx0
@@ -1,4 +1,6 @@
 # $FreeBSD$
+arm/arm/bus_space_asm_generic.S	standard
+arm/arm/bus_space_generic.c	standard
 arm/arm/cpufunc_asm_arm9.S	standard
 arm/arm/irq_dispatch.S		standard
 arm/s3c2xx0/board_ln2410sbc.c	optional	board_ln2410sbc
diff --git a/sys/arm/s3c2xx0/s3c24x0.c b/sys/arm/s3c2xx0/s3c24x0.c
index f90c15dbcbd..14e6f82ad02 100644
--- a/sys/arm/s3c2xx0/s3c24x0.c
+++ b/sys/arm/s3c2xx0/s3c24x0.c
@@ -429,7 +429,7 @@ s3c24x0_identify(driver_t *driver, device_t parent)
 int
 s3c24x0_probe(device_t dev)
 {
-	return 0;
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 int
diff --git a/sys/arm/s3c2xx0/s3c24x0_machdep.c b/sys/arm/s3c2xx0/s3c24x0_machdep.c
index 1811b520189..e5e49686196 100644
--- a/sys/arm/s3c2xx0/s3c24x0_machdep.c
+++ b/sys/arm/s3c2xx0/s3c24x0_machdep.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <machine/devmap.h>
 #include <machine/vmparam.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
@@ -126,7 +127,7 @@ struct pv_addr kernelstack;
 #define	_S(s)	(((s) + L1_S_SIZE - 1) & ~(L1_S_SIZE-1))
 
 /* Static device mappings. */
-static const struct pmap_devmap s3c24x0_devmap[] = {
+static const struct arm_devmap_entry s3c24x0_devmap[] = {
 	/*
 	 * Map the devices we need early on.
 	 */
@@ -324,7 +325,7 @@ initarm(struct arm_boot_params *abp)
 		    VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE);
 	}
 
-	pmap_devmap_bootstrap(l1pagetable, s3c24x0_devmap);
+	arm_devmap_bootstrap(l1pagetable, s3c24x0_devmap);
 
 	cpu_domains((DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT);
 	setttb(kernel_l1pt.pv_pa);
@@ -350,10 +351,11 @@ initarm(struct arm_boot_params *abp)
 	 * but since we are boot strapping the addresses used for the read
 	 * may have just been remapped and thus the cache could be out
 	 * of sync. A re-clean after the switch will cure this.
-	 * After booting there are no gross reloations of the kernel thus
+	 * After booting there are no gross relocations of the kernel thus
 	 * this problem will not occur after initarm().
 	 */
 	cpu_idcache_wbinv_all();
+	cpu_setup("");
 
 	/* Disable all peripheral interrupts */
 	ioreg_write32(S3C24X0_INTCTL_BASE + INTCTL_INTMSK, ~0);
diff --git a/sys/arm/s3c2xx0/s3c2xx0_space.c b/sys/arm/s3c2xx0/s3c2xx0_space.c
index 76e191e5b90..fe01d2b389c 100644
--- a/sys/arm/s3c2xx0/s3c2xx0_space.c
+++ b/sys/arm/s3c2xx0/s3c2xx0_space.c
@@ -89,7 +89,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 /* Prototypes for all the bus_space structure functions */
-bs_protos(s3c2xx0);
 bs_protos(generic);
 bs_protos(generic_armv4);
 
@@ -98,16 +97,16 @@ struct bus_space s3c2xx0_bs_tag = {
 	(void *) 0,
 
 	/* mapping/unmapping */
-	s3c2xx0_bs_map,
-	s3c2xx0_bs_unmap,
-	s3c2xx0_bs_subregion,
+	generic_bs_map,
+	generic_bs_unmap,
+	generic_bs_subregion,
 
 	/* allocation/deallocation */
-	s3c2xx0_bs_alloc,	/* not implemented */
-	s3c2xx0_bs_free,	/* not implemented */
+	generic_bs_alloc,	/* not implemented */
+	generic_bs_free,	/* not implemented */
 
 	/* barrier */
-	s3c2xx0_bs_barrier,
+	generic_bs_barrier,
 
 	/* read (single) */
 	generic_bs_r_1,
@@ -164,87 +163,3 @@ struct bus_space s3c2xx0_bs_tag = {
 	NULL,
 };
 
-int
-s3c2xx0_bs_map(void *t, bus_addr_t bpa, bus_size_t size,
-	       int flag, bus_space_handle_t * bshp)
-{
-	u_long startpa, endpa, pa;
-	vm_offset_t va;
-	pt_entry_t *pte;
-	const struct pmap_devmap *pd;
-
-	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
-		/* Device was statically mapped. */
-		*bshp = pd->pd_va + (bpa - pd->pd_pa);
-		return 0;
-	}
-
-	startpa = trunc_page(bpa);
-	endpa = round_page(bpa + size);
-
-	va = kva_alloc(endpa - startpa);
-	if (!va)
-		return (ENOMEM);
-
-	*bshp = (bus_space_handle_t) (va + (bpa - startpa));
-
-	for (pa = startpa; pa < endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
-		pmap_kenter(va, pa);
-		pte = vtopte(va);
-		if ((flag & BUS_SPACE_MAP_CACHEABLE) == 0)
-			*pte &= ~L2_S_CACHE_MASK;
-	}
-	return (0);
-}
-
-void
-s3c2xx0_bs_unmap(void *t, bus_space_handle_t h, bus_size_t size)
-{
-	vm_offset_t va, endva, origva;
-
-	if (pmap_devmap_find_va((vm_offset_t)h, size) != NULL) {
-		/* Device was statically mapped; nothing to do. */
-		return;
-	}
-
-	endva = round_page((vm_offset_t)h + size);
-	origva = va = trunc_page((vm_offset_t)h);
-
-	while (va < endva) {
-		pmap_kremove(va);
-		va += PAGE_SIZE;
-	}
-	kva_free(origva, endva - origva);
-}
-
-int
-s3c2xx0_bs_subregion(void *t, bus_space_handle_t bsh, bus_size_t offset,
-		     bus_size_t size, bus_space_handle_t * nbshp)
-{
-
-	*nbshp = bsh + offset;
-	return (0);
-}
-
-void
-s3c2xx0_bs_barrier(void *t, bus_space_handle_t bsh, bus_size_t offset,
-		   bus_size_t len, int flags)
-{
-
-	/* Nothing to do. */
-}
-
-int
-s3c2xx0_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
-		 bus_size_t size, bus_size_t alignment, bus_size_t boundary,
-    		 int flags, bus_addr_t * bpap, bus_space_handle_t * bshp)
-{
-
-	panic("s3c2xx0_io_bs_alloc(): not implemented\n");
-}
-
-void
-s3c2xx0_bs_free(void *t, bus_space_handle_t bsh, bus_size_t size)
-{
-	panic("s3c2xx0_io_bs_free(): not implemented\n");
-}
diff --git a/sys/arm/s3c2xx0/uart_bus_s3c2410.c b/sys/arm/s3c2xx0/uart_bus_s3c2410.c
index 974b3d939e5..41c750afb5c 100644
--- a/sys/arm/s3c2xx0/uart_bus_s3c2410.c
+++ b/sys/arm/s3c2xx0/uart_bus_s3c2410.c
@@ -35,7 +35,6 @@ static driver_t uart_s3c2410_driver = {
 	sizeof(struct uart_softc),
 };
 
-extern struct uart_class uart_s3c2410_class;
 extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs;
 static int
 uart_s3c2410_probe(device_t dev)
diff --git a/sys/arm/s3c2xx0/uart_cpu_s3c2410.c b/sys/arm/s3c2xx0/uart_cpu_s3c2410.c
index 835604be1fc..2ed036b48ad 100644
--- a/sys/arm/s3c2xx0/uart_cpu_s3c2410.c
+++ b/sys/arm/s3c2xx0/uart_cpu_s3c2410.c
@@ -47,8 +47,6 @@ extern struct uart_ops uart_s3c2410_ops;
 vm_offset_t s3c2410_uart_vaddr;
 unsigned int s3c2410_pclk;
 
-extern struct uart_class uart_s3c2410_class;
-
 int
 uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
 {
diff --git a/sys/arm/sa11x0/assabet_machdep.c b/sys/arm/sa11x0/assabet_machdep.c
index 0808798106a..56b0f302438 100644
--- a/sys/arm/sa11x0/assabet_machdep.c
+++ b/sys/arm/sa11x0/assabet_machdep.c
@@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <machine/devmap.h>
 #include <machine/vmparam.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
@@ -134,7 +135,7 @@ struct pv_addr abtstack;
 struct pv_addr kernelstack;
 
 /* Static device mappings. */
-static const struct pmap_devmap assabet_devmap[] = {
+static const struct arm_devmap_entry assabet_devmap[] = {
 	/*
 	 * Map the on-board devices VA == PA so that we can access them
 	 * with the MMU on or off.
@@ -324,7 +325,7 @@ initarm(struct arm_boot_params *abp)
 	pmap_map_entry(l1pagetable, vector_page, systempage.pv_pa,
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	/* Map the statically mapped devices. */
-	pmap_devmap_bootstrap(l1pagetable, assabet_devmap);
+	arm_devmap_bootstrap(l1pagetable, assabet_devmap);
 	pmap_map_chunk(l1pagetable, sa1_cache_clean_addr, 0xf0000000,
 	    CPU_SA110_CACHE_CLEAN_SIZE, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 
@@ -370,6 +371,7 @@ initarm(struct arm_boot_params *abp)
 
 	cpufunc_control(0x337f, 0x107d);
 	arm_vector_init(ARM_VECTORS_LOW, ARM_VEC_ALL);
+	cpu_setup("");
 
 	pmap_curmaxkvaddr = freemempos + KERNEL_PT_VMDATA_NUM * 0x400000;
 
diff --git a/sys/arm/sa11x0/sa11x0.c b/sys/arm/sa11x0/sa11x0.c
index cae7873ff7a..975c08d41aa 100644
--- a/sys/arm/sa11x0/sa11x0.c
+++ b/sys/arm/sa11x0/sa11x0.c
@@ -139,7 +139,7 @@ extern vm_offset_t saipic_base;
 int
 sa11x0_probe(device_t dev)
 {
-	return 0;
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 void
diff --git a/sys/arm/sa11x0/sa11x0_io.c b/sys/arm/sa11x0/sa11x0_io.c
index ceeaffae747..573159964c8 100644
--- a/sys/arm/sa11x0/sa11x0_io.c
+++ b/sys/arm/sa11x0/sa11x0_io.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_kern.h>
 
 #include <machine/bus.h>
-#include <machine/pmap.h>
 
 /* Proto types for all the bus_space structure functions */
 
diff --git a/sys/arm/samsung/exynos/arch_timer.c b/sys/arm/samsung/exynos/arch_timer.c
index e5970b6f4ba..86bb6f33738 100644
--- a/sys/arm/samsung/exynos/arch_timer.c
+++ b/sys/arm/samsung/exynos/arch_timer.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/samsung/exynos/ehci_exynos5.c b/sys/arm/samsung/exynos/ehci_exynos5.c
index ada0405754a..71c43d8b611 100644
--- a/sys/arm/samsung/exynos/ehci_exynos5.c
+++ b/sys/arm/samsung/exynos/ehci_exynos5.c
@@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$");
 #define	HOST_CTRL_SUSPEND	(1 << 4)
 #define	HOST_CTRL_RESET_LINK	(1 << 1)
 #define	HOST_CTRL_RESET_PHY	(1 << 0)
-#define	HOST_CTRL_RESET_PHY_ALL	(1 << 31)
+#define	HOST_CTRL_RESET_PHY_ALL	(1U << 31)
 
 /* Forward declarations */
 static int	exynos_ehci_attach(device_t dev);
diff --git a/sys/arm/samsung/exynos/exynos5_machdep.c b/sys/arm/samsung/exynos/exynos5_machdep.c
index 176009a6b45..c10ccab809e 100644
--- a/sys/arm/samsung/exynos/exynos5_machdep.c
+++ b/sys/arm/samsung/exynos/exynos5_machdep.c
@@ -30,62 +30,52 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#define _ARM32_BUS_DMA_PRIVATE
+#define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
 
 #include <vm/vm.h>
-#include <vm/pmap.h>
 
+#include <machine/armreg.h>
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/fdt/fdt_common.h>
 
-#define	DEVMAP_BOOTSTRAP_MAP_START 0xF0000000
-
 vm_offset_t
 initarm_lastaddr(void)
 {
 
-	return (DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE);
+	return (arm_devmap_lastaddr());
+}
+
+void
+initarm_early_init(void)
+{
+
 }
 
 void
 initarm_gpio_init(void)
 {
+
 }
 
 void
 initarm_late_init(void)
 {
+
 }
 
-#define FDT_DEVMAP_MAX	(1 + 2 + 1 + 1)	/* FIXME */
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
-	{ 0, 0, 0, 0, 0, }
-};
-
-/*
- * Construct pmap_devmap[] with DT-derived config data.
- */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
-	int i;
 
-	i = 0;
-	fdt_devmap[i].pd_va = 0xf2C00000;
-	fdt_devmap[i].pd_pa = 0x12C00000;
-	fdt_devmap[i].pd_size = 0x100000;
-	fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
-	fdt_devmap[i].pd_cache = PTE_NOCACHE;
-	i++;
+	/* UART */
+	arm_devmap_add_entry(0x12C00000, 0x100000);
 
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
 	return (0);
 }
 
diff --git a/sys/arm/samsung/exynos/files.exynos5 b/sys/arm/samsung/exynos/files.exynos5
index e0b74074d1e..1d90415e6c0 100644
--- a/sys/arm/samsung/exynos/files.exynos5
+++ b/sys/arm/samsung/exynos/files.exynos5
@@ -10,12 +10,12 @@ arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 arm/arm/irq_dispatch.S				standard
 
+arm/arm/bus_space-v6.c				standard
 arm/arm/gic.c					standard
 arm/arm/generic_timer.c				standard
 
 arm/samsung/exynos/arch_timer.c			standard
 arm/samsung/exynos/exynos5_mp.c			optional	smp
-arm/samsung/exynos/bus_space.c			standard
 arm/samsung/exynos/common.c			standard
 arm/samsung/exynos/exynos5_machdep.c		standard
 arm/samsung/exynos/uart.c			optional	uart
diff --git a/sys/arm/tegra/tegra2_machdep.c b/sys/arm/tegra/tegra2_machdep.c
index a3b1d987868..8904250fb37 100644
--- a/sys/arm/tegra/tegra2_machdep.c
+++ b/sys/arm/tegra/tegra2_machdep.c
@@ -45,9 +45,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/fdt/fdt_common.h>
 
@@ -106,12 +105,17 @@ tegra2_osc_freq_detect(void)
 
 vm_offset_t
 initarm_lastaddr(void)
+{
+
+	return (fdt_immr_va);
+}
+
+void
+initarm_early_init(void)
 {
 
 	if (fdt_immr_addr(TEGRA2_BASE) != 0)				/* FIXME ???? */
 		while (1);
-
-	return (fdt_immr_va - ARM_NOCACHE_KVA_SIZE);
 }
 
 void
@@ -125,7 +129,7 @@ initarm_late_init(void)
 }
 
 #define FDT_DEVMAP_MAX	(1 + 2 + 1 + 1)	/* FIXME */
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
+static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
 	{ 0, 0, 0, 0, 0, }
 };
 
@@ -133,7 +137,7 @@ static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
  * Construct pmap_devmap[] with DT-derived config data.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 	int i = 0;
 	fdt_devmap[i].pd_va = 0xe0000000;
@@ -143,7 +147,7 @@ platform_devmap_init(void)
 	fdt_devmap[i].pd_cache = PTE_NOCACHE;
 	i++;
 
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
+	arm_devmap_register_table(&fdt_devmap[0]);
 	return (0);
 }
 
diff --git a/sys/arm/ti/am335x/am335x_dmtimer.c b/sys/arm/ti/am335x/am335x_dmtimer.c
index 93911f24f18..9691fcfad13 100644
--- a/sys/arm/ti/am335x/am335x_dmtimer.c
+++ b/sys/arm/ti/am335x/am335x_dmtimer.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
@@ -360,7 +359,7 @@ DELAY(int usec)
 	}
 
 	/* Get the number of times to count */
-	counts = usec * ((am335x_dmtimer_tc.tc_frequency / 1000000) + 1);
+	counts = usec * (am335x_dmtimer_tc.tc_frequency / 1000000) + 1;
 
 	first = am335x_dmtimer_tc_read_4(DMTIMER_TCRR);
 
diff --git a/sys/arm/ti/am335x/am335x_lcd_syscons.c b/sys/arm/ti/am335x/am335x_lcd_syscons.c
index 7684c25def2..12b6366e96f 100644
--- a/sys/arm/ti/am335x/am335x_lcd_syscons.c
+++ b/sys/arm/ti/am335x/am335x_lcd_syscons.c
@@ -47,7 +47,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/ti/am335x/am335x_prcm.c b/sys/arm/ti/am335x/am335x_prcm.c
index 5cfdf2ee753..a62b2e10306 100644
--- a/sys/arm/ti/am335x/am335x_prcm.c
+++ b/sys/arm/ti/am335x/am335x_prcm.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <arm/ti/tivar.h>
diff --git a/sys/arm/ti/am335x/am335x_scm_padconf.c b/sys/arm/ti/am335x/am335x_scm_padconf.c
index 6bb89f52009..7d4a9866d78 100644
--- a/sys/arm/ti/am335x/am335x_scm_padconf.c
+++ b/sys/arm/ti/am335x/am335x_scm_padconf.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
 #include <sys/gpio.h>
@@ -171,8 +170,8 @@ const struct ti_scm_padconf ti_padconf_devmap[] = {
 	_PIN(0x948, "MDIO",		0, 7, "mdio_data", "timer6", "uart5_rxd", "uart3_ctsn", "mmc0_sdcd","mmc1_cmd", "mmc2_cmd","gpio0_0"),
 	_PIN(0x94c, "MDC",		1, 7, "mdio_clk", "timer5", "uart5_txd", "uart3_rtsn", "mmc0_sdwp", "mmc1_clk", "mmc2_clk", "gpio0_1"),
 	_PIN(0x950, "SPI0_SCLK",	2, 7, "spi0_sclk", "uart2_rxd", "I2C2_SDA", "ehrpwm0A", "pr1_uart0_cts_n", "pr1_edio_sof", "EMU2", "gpio0_2"),
-	_PIN(0x954, "SPI0_D0",		3, 7, "spi0_d0", "uart2_txd", "i2C2_SCL", "ehrpwm0B", "pr1_uart0_rts_n", "pr1_edio_latch_in", "EMU3", "gpio0_3"),
-	_PIN(0x958, "SPIO_D1",		4, 7, "spi0_d1", "mmc1_sdwp", "I2C1_SDA", "ehrpwm0_tripzone_input", "pr1_uart0_rxd", "pr1_edio_data_in0", "pr1_edio_data_out0", "gpio0_4"),
+	_PIN(0x954, "SPI0_D0",		3, 7, "spi0_d0", "uart2_txd", "I2C2_SCL", "ehrpwm0B", "pr1_uart0_rts_n", "pr1_edio_latch_in", "EMU3", "gpio0_3"),
+	_PIN(0x958, "SPI0_D1",		4, 7, "spi0_d1", "mmc1_sdwp", "I2C1_SDA", "ehrpwm0_tripzone_input", "pr1_uart0_rxd", "pr1_edio_data_in0", "pr1_edio_data_out0", "gpio0_4"),
 	_PIN(0x95c, "SPI0_CS0",		5, 7, "spi0_cs0", "mmc2_sdwp", "I2C1_SCL", "ehrpwm0_synci", "pr1_uart0_txd", "pr1_edio_data_in1", "pr1_edio_data_out1", "gpio0_5"),
 	_PIN(0x960, "SPI0_CS1",		6, 7, "spi0_cs1", "uart3_rxd", "eCAP1_in_PWM1_out", "mcc0_pow", "xdm_event_intr2", "mmc0_sdcd", "EMU4", "gpio0_6"),
 	_PIN(0x964, "ECAP0_IN_PWM0_OUT",7, 7, "eCAP0_in_PWM0_out", "uart3_txd", "spi1_cs1", "pr1_ecap0_ecap_capin_apwm_o", "spi1_sclk", "mmc0_sdwp", "xdma_event_intr2", "gpio0_7"),
@@ -181,7 +180,7 @@ const struct ti_scm_padconf ti_padconf_devmap[] = {
 	_PIN(0x970, "UART0_rxd",	42, 7, "uart0_rxd", "spi1_cs0", "dcan0_tx", "I2C2_SDA", "eCAP2_in_PWM2_out", "pr1_pru1_pru_r30_14", "pr1_pru1_pru_r31_14", "gpio1_10"),
 	_PIN(0x974, "UART0_txd",	43, 7, "uart0_txd", "spi1_cs1", "dcan0_rx", "I2C2_SCL", "eCAP1_in_PWM1_out", "pr1_pru1_pru_r30_15", "pr1_pru1_pru_r31_15", "gpio1_11"),
 	_PIN(0x978, "UART1_CTSn",	12, 7, "uart1_ctsn", "timer6_mux1", "dcan0_tx", "I2C2_SDA", "spi1_cs0", "pr1_uart0_cts_n", "pr1_edc_latch0_in", "gpio0_12"),
-	_PIN(0x97c, "UART1_RTSn",	13, 7, "uart1_rtsn", "timer5_mux1", "dcan0_rx", "I2C2_SCL", "spi1_cs1", "pr1_uart0_rts_n	", "pr1_edc_latch1_in", "gpio0_13"),
+	_PIN(0x97c, "UART1_RTSn",	13, 7, "uart1_rtsn", "timer5_mux1", "dcan0_rx", "I2C2_SCL", "spi1_cs1", "pr1_uart0_rts_n", "pr1_edc_latch1_in", "gpio0_13"),
 	_PIN(0x980, "UART1_RXD",	14, 7, "uart1_rxd", "mmc1_sdwp", "dcan1_tx", "I2C1_SDA", NULL, "pr1_uart0_rxd", "pr1_pru1_pru_r31_16", "gpio0_14"),
 	_PIN(0x984, "UART1_TXD",	15, 7, "uart1_txd", "mmc2_sdwp", "dcan1_rx", "I2C1_SCL", NULL, "pr1_uart0_txd", "pr1_pru0_pru_r31_16", "gpio0_15"),
 	_PIN(0x988, "I2C0_SDA",		101, 7, "I2C0_SDA", "timer4", "uart2_ctsn", "eCAP2_in_PWM2_out", NULL, NULL, NULL, "gpio3_5"),
diff --git a/sys/arm/ti/bus_space.c b/sys/arm/ti/bus_space.c
deleted file mode 100644
index 4cce8203abc..00000000000
--- a/sys/arm/ti/bus_space.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * Copyright (C) 2012 FreeBSD Foundation
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 MARVELL nor the names of contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY 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 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 <machine/bus.h>
-
-/* Prototypes for all the bus_space structure functions */
-bs_protos(generic);
-bs_protos(generic_armv4);
-
-struct bus_space _base_tag = {
-	/* cookie */
-	.bs_cookie	= (void *) 0,
-	
-	/* mapping/unmapping */
-	.bs_map		= generic_bs_map,
-	.bs_unmap	= generic_bs_unmap,
-	.bs_subregion	= generic_bs_subregion,
-	
-	/* allocation/deallocation */
-	.bs_alloc	= generic_bs_alloc,
-	.bs_free	= generic_bs_free,
-	
-	/* barrier */
-	.bs_barrier	= generic_bs_barrier,
-	
-	/* read (single) */
-	.bs_r_1		= generic_bs_r_1,
-	.bs_r_2		= generic_armv4_bs_r_2,
-	.bs_r_4		= generic_bs_r_4,
-	.bs_r_8		= NULL,
-	
-	/* read multiple */
-	.bs_rm_1	= generic_bs_rm_1,
-	.bs_rm_2	= generic_armv4_bs_rm_2,
-	.bs_rm_4	= generic_bs_rm_4,
-	.bs_rm_8	= NULL,
-	
-	/* read region */
-	.bs_rr_1	= generic_bs_rr_1,
-	.bs_rr_2	= generic_armv4_bs_rr_2,
-	.bs_rr_4	= generic_bs_rr_4,
-	.bs_rr_8	= NULL,
-	
-	/* write (single) */
-	.bs_w_1		= generic_bs_w_1,
-	.bs_w_2		= generic_armv4_bs_w_2,
-	.bs_w_4		= generic_bs_w_4,
-	.bs_w_8		= NULL,
-	
-	/* write multiple */
-	.bs_wm_1	= generic_bs_wm_1,
-	.bs_wm_2	= generic_armv4_bs_wm_2,
-	.bs_wm_4	= generic_bs_wm_4,
-	.bs_wm_8	= NULL,
-	
-	/* write region */
-	.bs_wr_1	= generic_bs_wr_1,
-	.bs_wr_2	= generic_armv4_bs_wr_2,
-	.bs_wr_4	= generic_bs_wr_4,
-	.bs_wr_8	= NULL,
-	
-	/* set multiple */
-	/* XXX not implemented */
-	
-	/* set region */
-	.bs_sr_1	= NULL,
-	.bs_sr_2	= generic_armv4_bs_sr_2,
-	.bs_sr_4	= generic_bs_sr_4,
-	.bs_sr_8	= NULL,
-	
-	/* copy */
-	.bs_c_1		= NULL,
-	.bs_c_2		= generic_armv4_bs_c_2,
-	.bs_c_4		= NULL,
-	.bs_c_8		= NULL,
-};
-
-bus_space_tag_t fdtbus_bs_tag = &_base_tag;
diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
index 4b01a749e60..cb322a66eee 100644
--- a/sys/arm/ti/cpsw/if_cpsw.c
+++ b/sys/arm/ti/cpsw/if_cpsw.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #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 <netinet/in_systm.h>
diff --git a/sys/arm/ti/files.ti b/sys/arm/ti/files.ti
index 0277edbba90..a176305f4fb 100644
--- a/sys/arm/ti/files.ti
+++ b/sys/arm/ti/files.ti
@@ -2,6 +2,7 @@
 
 kern/kern_clocksource.c				standard
 
+arm/arm/bus_space-v6.c				standard
 arm/arm/bus_space_generic.c			standard
 arm/arm/bus_space_asm_generic.S			standard
 arm/arm/cpufunc_asm_armv5.S			standard
@@ -10,12 +11,14 @@ arm/arm/cpufunc_asm_arm11.S			standard
 arm/arm/cpufunc_asm_armv7.S			standard
 arm/arm/irq_dispatch.S				standard
 
-arm/ti/bus_space.c				standard
 arm/ti/common.c					standard
 arm/ti/ti_cpuid.c				standard
 arm/ti/ti_machdep.c				standard
 arm/ti/ti_prcm.c				standard
 arm/ti/ti_scm.c					standard
+dev/mbox/mbox_if.m				standard
+arm/ti/ti_mbox.c				standard
+arm/ti/ti_pruss.c				standard
 
 arm/ti/ti_gpio.c				optional	gpio
 arm/ti/ti_i2c.c					optional	ti_i2c
diff --git a/sys/arm/ti/omap4/omap4_prcm_clks.c b/sys/arm/ti/omap4/omap4_prcm_clks.c
index 8217bf12111..034e6155491 100644
--- a/sys/arm/ti/omap4/omap4_prcm_clks.c
+++ b/sys/arm/ti/omap4/omap4_prcm_clks.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
 
diff --git a/sys/arm/ti/omap4/omap4_scm_padconf.c b/sys/arm/ti/omap4/omap4_scm_padconf.c
index 4cd3a564d46..fce5ba2d52a 100644
--- a/sys/arm/ti/omap4/omap4_scm_padconf.c
+++ b/sys/arm/ti/omap4/omap4_scm_padconf.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
 #include <sys/gpio.h>
diff --git a/sys/arm/ti/omap4/pandaboard/pandaboard.c b/sys/arm/ti/omap4/pandaboard/pandaboard.c
index 043f2a0a65e..e48013212fd 100644
--- a/sys/arm/ti/omap4/pandaboard/pandaboard.c
+++ b/sys/arm/ti/omap4/pandaboard/pandaboard.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/pte.h>
-#include <machine/pmap.h>
 #include <machine/vmparam.h>
 #include <machine/fdt.h>
 
diff --git a/sys/arm/ti/ti_cpuid.c b/sys/arm/ti/ti_cpuid.c
index 027dd6d0a3d..078757d852d 100644
--- a/sys/arm/ti/ti_cpuid.c
+++ b/sys/arm/ti/ti_cpuid.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/fdt.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
 
diff --git a/sys/arm/ti/ti_gpio.c b/sys/arm/ti/ti_gpio.c
index 4edb10e8f51..5469d8b6fad 100644
--- a/sys/arm/ti/ti_gpio.c
+++ b/sys/arm/ti/ti_gpio.c
@@ -543,9 +543,9 @@ ti_gpio_pin_get(device_t dev, uint32_t pin, unsigned int *value)
 
 	/* Read the value on the pin */
 	if (val & mask)
-		*value = (ti_gpio_read_4(sc, bank, TI_GPIO_DATAOUT) & mask) ? 1 : 0;
-	else
 		*value = (ti_gpio_read_4(sc, bank, TI_GPIO_DATAIN) & mask) ? 1 : 0;
+	else
+		*value = (ti_gpio_read_4(sc, bank, TI_GPIO_DATAOUT) & mask) ? 1 : 0;
 
 	TI_GPIO_UNLOCK(sc);
 
diff --git a/sys/arm/ti/ti_i2c.c b/sys/arm/ti/ti_i2c.c
index 28bf3cadd04..f23a8ea9b66 100644
--- a/sys/arm/ti/ti_i2c.c
+++ b/sys/arm/ti/ti_i2c.c
@@ -1076,20 +1076,20 @@ ti_i2c_attach(device_t dev)
 		goto out;
 	}
 
-	/* XXXOMAP3: FIXME get proper revision here */
-	/* First read the version number of the I2C module */
-	sc->sc_rev = ti_i2c_read_2(sc, I2C_REG_REVNB_HI) & 0xff;
-
-	device_printf(dev, "I2C revision %d.%d\n", sc->sc_rev >> 4,
-	    sc->sc_rev & 0xf);
-
-	/* Activate the H/W */
+	/* First we _must_ activate the H/W */
 	err = ti_i2c_activate(dev);
 	if (err) {
 		device_printf(dev, "ti_i2c_activate failed\n");
 		goto out;
 	}
 
+	/* XXXOMAP3: FIXME get proper revision here */
+	/* Read the version number of the I2C module */
+	sc->sc_rev = ti_i2c_read_2(sc, I2C_REG_REVNB_HI) & 0xff;
+
+	device_printf(dev, "I2C revision %d.%d\n", sc->sc_rev >> 4,
+	    sc->sc_rev & 0xf);
+
 	/* activate the interrupt */
 	err = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
 				NULL, ti_i2c_intr, sc, &sc->sc_irq_h);
diff --git a/sys/arm/ti/ti_machdep.c b/sys/arm/ti/ti_machdep.c
index 170c253e6b6..2f78a488d8c 100644
--- a/sys/arm/ti/ti_machdep.c
+++ b/sys/arm/ti/ti_machdep.c
@@ -49,9 +49,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 
 #include <arm/ti/omap4/omap4_reg.h>
 
@@ -62,10 +61,16 @@ void (*ti_cpu_reset)(void);
 
 vm_offset_t
 initarm_lastaddr(void)
+{
+
+	return (DEVMAP_BOOTSTRAP_MAP_START);
+}
+
+void
+initarm_early_init(void)
 {
 
 	ti_cpu_reset = NULL;
-	return (DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE);
 }
 
 void
@@ -79,7 +84,7 @@ initarm_late_init(void)
 }
 
 #define FDT_DEVMAP_MAX	(2)		// FIXME
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
+static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
 	{ 0, 0, 0, 0, 0, }
 };
 
@@ -88,7 +93,7 @@ static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
  * Construct pmap_devmap[] with DT-derived config data.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 	int i = 0;
 #if defined(SOC_OMAP4)
@@ -109,7 +114,7 @@ platform_devmap_init(void)
 #error "Unknown SoC"
 #endif
 
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
+	arm_devmap_register_table(&fdt_devmap[0]);
 	return (0);
 }
 
diff --git a/sys/arm/ti/ti_mbox.c b/sys/arm/ti/ti_mbox.c
new file mode 100644
index 00000000000..b7c9327e24a
--- /dev/null
+++ b/sys/arm/ti/ti_mbox.c
@@ -0,0 +1,262 @@
+/*-
+ * Copyright (c) 2013 Rui Paulo <rpaulo@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.
+ */
+#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/watchdog.h>
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/frame.h>
+#include <machine/intr.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 <arm/ti/ti_mbox.h>
+#include <arm/ti/ti_prcm.h>
+
+#include "mbox_if.h"
+
+#define DEBUG
+#ifdef DEBUG
+#define	DPRINTF(fmt, ...)	do {	\
+	printf("%s: ", __func__);	\
+	printf(fmt, __VA_ARGS__);	\
+} while (0)
+#else
+#define	DPRINTF(fmt, ...)
+#endif
+
+static device_probe_t		ti_mbox_probe;
+static device_attach_t		ti_mbox_attach;
+static device_detach_t		ti_mbox_detach;
+static void			ti_mbox_intr(void *);
+static int			ti_mbox_read(device_t, int, uint32_t *);
+static int			ti_mbox_write(device_t, int, uint32_t);
+
+struct ti_mbox_softc {
+	struct mtx		sc_mtx;
+	struct resource		*sc_mem_res;
+	struct resource		*sc_irq_res;
+	void			*sc_intr;
+	bus_space_tag_t		sc_bt;
+	bus_space_handle_t	sc_bh;
+};
+
+#define	TI_MBOX_LOCK(sc)	mtx_lock(&(sc)->sc_mtx)
+#define	TI_MBOX_UNLOCK(sc)	mtx_unlock(&(sc)->sc_mtx)
+
+static device_method_t ti_mbox_methods[] = {
+	DEVMETHOD(device_probe,		ti_mbox_probe),
+	DEVMETHOD(device_attach,	ti_mbox_attach),
+	DEVMETHOD(device_detach,	ti_mbox_detach),
+
+	DEVMETHOD(mbox_read,		ti_mbox_read),
+	DEVMETHOD(mbox_write,		ti_mbox_write),
+
+	DEVMETHOD_END
+};
+
+static driver_t ti_mbox_driver = {
+	"ti_mbox",
+	ti_mbox_methods,
+	sizeof(struct ti_mbox_softc)
+};
+
+static devclass_t ti_mbox_devclass;
+
+DRIVER_MODULE(ti_mbox, simplebus, ti_mbox_driver, ti_mbox_devclass, 0, 0);
+
+static __inline uint32_t
+ti_mbox_reg_read(struct ti_mbox_softc *sc, uint16_t reg)
+{
+	return (bus_space_read_4(sc->sc_bt, sc->sc_bh, reg));
+}
+
+static __inline void
+ti_mbox_reg_write(struct ti_mbox_softc *sc, uint16_t reg, uint32_t val)
+{
+	bus_space_write_4(sc->sc_bt, sc->sc_bh, reg, val);
+}
+
+static int
+ti_mbox_probe(device_t dev)
+{
+	if (ofw_bus_is_compatible(dev, "ti,system-mbox")) {
+		device_set_desc(dev, "TI System Mailbox");
+		return (BUS_PROBE_DEFAULT);
+	}
+
+	return (ENXIO);
+}
+
+static int
+ti_mbox_attach(device_t dev)
+{
+	struct ti_mbox_softc *sc;
+	int rid, delay, chan;
+	uint32_t rev, sysconfig;
+
+	if (ti_prcm_clk_enable(MAILBOX0_CLK) != 0) {
+		device_printf(dev, "could not enable MBOX clock\n");
+		return (ENXIO);
+	}
+	sc = device_get_softc(dev);
+	rid = 0;
+	mtx_init(&sc->sc_mtx, "TI mbox", MTX_DEF, 0);
+	sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (sc->sc_mem_res == NULL) {
+		device_printf(dev, "could not allocate memory resource\n");
+		return (ENXIO);
+	}
+	sc->sc_bt = rman_get_bustag(sc->sc_mem_res);
+	sc->sc_bh = rman_get_bushandle(sc->sc_mem_res);
+	rid = 0;
+	sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE);
+	if (sc->sc_irq_res == NULL) {
+		device_printf(dev, "could not allocate interrupt resource\n");
+		ti_mbox_detach(dev);
+		return (ENXIO);
+	}
+	if (bus_setup_intr(dev, sc->sc_irq_res, INTR_MPSAFE | INTR_TYPE_MISC,
+	    NULL, ti_mbox_intr, sc, &sc->sc_intr) != 0) {
+		device_printf(dev, "unable to setup the interrupt handler\n");
+		ti_mbox_detach(dev);
+		return (ENXIO);
+	}
+	/*
+	 * Reset the controller.
+	 */
+	sysconfig = ti_mbox_reg_read(sc, TI_MBOX_SYSCONFIG);
+	DPRINTF("initial sysconfig %d\n", sysconfig);
+	sysconfig |= TI_MBOX_SYSCONFIG_SOFTRST;
+	delay = 100;
+	while (ti_mbox_reg_read(sc, TI_MBOX_SYSCONFIG) & 
+	    TI_MBOX_SYSCONFIG_SOFTRST) {
+		delay--;
+		DELAY(10);
+	}
+	if (delay == 0) {
+		device_printf(dev, "controller reset failed\n");
+		ti_mbox_detach(dev);
+		return (ENXIO);
+	}
+	/*
+	 * Enable smart idle mode.
+	 */
+	ti_mbox_reg_write(sc, TI_MBOX_SYSCONFIG,
+	    ti_mbox_reg_read(sc, TI_MBOX_SYSCONFIG) | TI_MBOX_SYSCONFIG_SMARTIDLE);
+	rev = ti_mbox_reg_read(sc, TI_MBOX_REVISION);
+	DPRINTF("rev %d\n", rev);
+	device_printf(dev, "revision %d.%d\n", (rev >> 8) & 0x4, rev & 0x40);
+	/*
+	 * Enable message interrupts.
+	 */
+	for (chan = 0; chan < 8; chan++)
+		ti_mbox_reg_write(sc, TI_MBOX_IRQENABLE_SET(chan), 1);
+
+	return (0);
+}
+
+static int
+ti_mbox_detach(device_t dev)
+{
+	struct ti_mbox_softc *sc;
+
+	sc = device_get_softc(dev);
+	if (sc->sc_intr)
+		bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_intr);
+	if (sc->sc_irq_res)
+		bus_release_resource(dev, SYS_RES_IRQ, rman_get_rid(sc->sc_irq_res),
+		    sc->sc_irq_res);
+	if (sc->sc_mem_res)
+		bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->sc_mem_res),
+		    sc->sc_mem_res);
+
+	return (0);
+}
+
+static void
+ti_mbox_intr(void *arg)
+{
+	struct ti_mbox_softc *sc;
+
+	sc = arg;
+	DPRINTF("interrupt %p", sc);
+}
+
+static int
+ti_mbox_read(device_t dev, int chan, uint32_t *data)
+{
+	struct ti_mbox_softc *sc;
+
+	if (chan < 0 || chan > 7)
+		return (EINVAL);
+	sc = device_get_softc(dev);
+
+	return (ti_mbox_reg_read(sc, TI_MBOX_MESSAGE(chan)));
+}
+
+static int
+ti_mbox_write(device_t dev, int chan, uint32_t data)
+{
+	int limit = 500;
+	struct ti_mbox_softc *sc;
+
+	if (chan < 0 || chan > 7)
+		return (EINVAL);
+	sc = device_get_softc(dev);
+	TI_MBOX_LOCK(sc);
+	/* XXX implement interrupt method */
+	while (ti_mbox_reg_read(sc, TI_MBOX_FIFOSTATUS(chan)) == 1 && 
+	    limit--) {
+		DELAY(10);
+	}
+	if (limit == 0) {
+		device_printf(dev, "FIFOSTAUS%d stuck\n", chan);
+		TI_MBOX_UNLOCK(sc);
+		return (EAGAIN);
+	}
+	ti_mbox_reg_write(sc, TI_MBOX_MESSAGE(chan), data);
+
+	return (0);
+}
diff --git a/sys/arm/ti/ti_mbox.h b/sys/arm/ti/ti_mbox.h
new file mode 100644
index 00000000000..48ea3caecf2
--- /dev/null
+++ b/sys/arm/ti/ti_mbox.h
@@ -0,0 +1,44 @@
+/*-
+ * Copyright (c) 2013 Rui Paulo <rpaulo@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 _TI_MBOX_H_
+#define _TI_MBOX_H_
+
+#define	TI_MBOX_REVISION		0x00
+#define	TI_MBOX_SYSCONFIG		0x10
+#define	TI_MBOX_SYSCONFIG_SOFTRST	0x01
+#define	TI_MBOX_SYSCONFIG_SMARTIDLE	(0x02 << 2)
+#define	TI_MBOX_MESSAGE(n)		(0x40 + (n) * 0x4)
+#define	TI_MBOX_FIFOSTATUS(n)		(0x80 + (n) * 0x4)
+#define	TI_MBOX_MSGSTATUS(n)		(0xc0 + (n) * 0x4)
+#define	TI_MBOX_IRQSTATUS_RAW(n)	(0x100 + (n) * 0x10)
+#define	TI_MBOX_IRQSTATUS_CLR(n)	(0x104 + (n) * 0x10)
+#define	TI_MBOX_IRQENABLE_SET(n)	(0x108 + (n) * 0x10)
+#define	TI_MBOX_IRQENABLE_CLR(n)	(0x10c + (n) * 0x10)
+
+#endif /* _TI_MBOX_H_ */
diff --git a/sys/arm/ti/ti_mmchs.c b/sys/arm/ti/ti_mmchs.c
index 25c7d06b6e3..281d1cd771d 100644
--- a/sys/arm/ti/ti_mmchs.c
+++ b/sys/arm/ti/ti_mmchs.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/resource.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/mmc/bridge.h>
diff --git a/sys/arm/ti/ti_prcm.c b/sys/arm/ti/ti_prcm.c
index 57709ade62d..89a23772711 100644
--- a/sys/arm/ti/ti_prcm.c
+++ b/sys/arm/ti/ti_prcm.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
 
diff --git a/sys/arm/ti/ti_pruss.c b/sys/arm/ti/ti_pruss.c
new file mode 100644
index 00000000000..f70e8ef59ac
--- /dev/null
+++ b/sys/arm/ti/ti_pruss.c
@@ -0,0 +1,320 @@
+/*-
+ * Copyright (c) 2013 Rui Paulo <rpaulo@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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/rman.h>
+#include <sys/event.h>
+#include <sys/selinfo.h>
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/frame.h>
+#include <machine/intr.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 <arm/ti/ti_prcm.h>
+#include <arm/ti/ti_pruss.h>
+
+#define DEBUG
+#ifdef DEBUG
+#define	DPRINTF(fmt, ...)	do {	\
+	printf("%s: ", __func__);	\
+	printf(fmt, __VA_ARGS__);	\
+} while (0)
+#else
+#define	DPRINTF(fmt, ...)
+#endif
+
+static device_probe_t		ti_pruss_probe;
+static device_attach_t		ti_pruss_attach;
+static device_detach_t		ti_pruss_detach;
+static void			ti_pruss_intr(void *);
+static d_open_t			ti_pruss_open;
+static d_close_t		ti_pruss_close;
+static d_mmap_t			ti_pruss_mmap;
+static void 			ti_pruss_kq_read_detach(struct knote *);
+static int 			ti_pruss_kq_read_event(struct knote *, long);
+static d_kqfilter_t		ti_pruss_kqfilter;
+
+#define	TI_PRUSS_IRQS	8
+struct ti_pruss_softc {
+	struct mtx		sc_mtx;
+	struct resource 	*sc_mem_res;
+	struct resource 	*sc_irq_res[TI_PRUSS_IRQS];
+	void            	*sc_intr[TI_PRUSS_IRQS];
+	bus_space_tag_t		sc_bt;
+	bus_space_handle_t	sc_bh;
+	struct cdev		*sc_pdev;
+	struct selinfo		sc_selinfo;
+	uint32_t		sc_inuse;
+};
+
+static struct cdevsw ti_pruss_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_name =	"ti_pruss",
+	.d_open =	ti_pruss_open,
+	.d_close =	ti_pruss_close,
+	.d_mmap =	ti_pruss_mmap,
+	.d_kqfilter =	ti_pruss_kqfilter,
+};
+
+static device_method_t ti_pruss_methods[] = {
+	DEVMETHOD(device_probe,		ti_pruss_probe),
+	DEVMETHOD(device_attach,	ti_pruss_attach),
+	DEVMETHOD(device_detach,	ti_pruss_detach),
+
+	DEVMETHOD_END
+};
+
+static driver_t ti_pruss_driver = {
+	"ti_pruss",
+	ti_pruss_methods,
+	sizeof(struct ti_pruss_softc)
+};
+
+static devclass_t ti_pruss_devclass;
+
+DRIVER_MODULE(ti_pruss, simplebus, ti_pruss_driver, ti_pruss_devclass, 0, 0);
+
+static struct resource_spec ti_pruss_irq_spec[] = {
+	{ SYS_RES_IRQ,	    0,  RF_ACTIVE },
+	{ SYS_RES_IRQ,	    1,  RF_ACTIVE },
+	{ SYS_RES_IRQ,	    2,  RF_ACTIVE },
+	{ SYS_RES_IRQ,	    3,  RF_ACTIVE },
+	{ SYS_RES_IRQ,	    4,  RF_ACTIVE },
+	{ SYS_RES_IRQ,	    5,  RF_ACTIVE },
+	{ SYS_RES_IRQ,	    6,  RF_ACTIVE },
+	{ SYS_RES_IRQ,	    7,  RF_ACTIVE },
+	{ -1,               0,  0 }
+};
+
+static struct ti_pruss_irq_arg {
+	int 		       irq;
+	struct ti_pruss_softc *sc;
+} ti_pruss_irq_args[TI_PRUSS_IRQS];
+
+static __inline uint32_t
+ti_pruss_reg_read(struct ti_pruss_softc *sc, uint32_t reg)
+{
+	return (bus_space_read_4(sc->sc_bt, sc->sc_bh, reg));
+}
+
+static __inline void
+ti_pruss_reg_write(struct ti_pruss_softc *sc, uint32_t reg, uint32_t val)
+{
+	bus_space_write_4(sc->sc_bt, sc->sc_bh, reg, val);
+}
+
+static int
+ti_pruss_probe(device_t dev)
+{
+	if (ofw_bus_is_compatible(dev, "ti,pruss-v1") ||
+	    ofw_bus_is_compatible(dev, "ti,pruss-v2")) {
+		device_set_desc(dev, "TI Programmable Realtime Unit Subsystem");
+		return (BUS_PROBE_DEFAULT);
+	}
+
+	return (ENXIO);
+}
+
+static int
+ti_pruss_attach(device_t dev)
+{
+	struct ti_pruss_softc *sc;
+	int rid, i;
+
+	if (ti_prcm_clk_enable(PRUSS_CLK) != 0) {
+		device_printf(dev, "could not enable PRUSS clock\n");
+		return (ENXIO);
+	}
+	sc = device_get_softc(dev);
+	rid = 0;
+	mtx_init(&sc->sc_mtx, "TI PRUSS", MTX_DEF, 0);
+	sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (sc->sc_mem_res == NULL) {
+		device_printf(dev, "could not allocate memory resource\n");
+		return (ENXIO);
+	}
+	sc->sc_bt = rman_get_bustag(sc->sc_mem_res);
+	sc->sc_bh = rman_get_bushandle(sc->sc_mem_res);
+	if (bus_alloc_resources(dev, ti_pruss_irq_spec, sc->sc_irq_res) != 0) {
+		device_printf(dev, "could not allocate interrupt resource\n");
+		ti_pruss_detach(dev);
+		return (ENXIO);
+	}
+	for (i = 0; i < TI_PRUSS_IRQS; i++) {
+		ti_pruss_irq_args[i].irq = i;
+		ti_pruss_irq_args[i].sc = sc;
+		if (bus_setup_intr(dev, sc->sc_irq_res[i], 
+		    INTR_MPSAFE | INTR_TYPE_MISC,
+		    NULL, ti_pruss_intr, &ti_pruss_irq_args[i], 
+		    &sc->sc_intr[i]) != 0) {
+			device_printf(dev, 
+			    "unable to setup the interrupt handler\n");
+			ti_pruss_detach(dev);
+			return (ENXIO);
+		}
+	}
+	if (ti_pruss_reg_read(sc, PRUSS_AM18XX_INTC) == PRUSS_AM18XX_REV)
+		device_printf(dev, "AM18xx PRU-ICSS\n");
+	else if (ti_pruss_reg_read(sc, PRUSS_AM33XX_INTC) == PRUSS_AM33XX_REV)
+		device_printf(dev, "AM33xx PRU-ICSS\n");
+
+	sc->sc_pdev = make_dev(&ti_pruss_cdevsw, 0, UID_ROOT, GID_WHEEL,
+	    0600, "pruss%d", device_get_unit(dev));
+	sc->sc_pdev->si_drv1 = dev;
+
+	return (0);
+}
+
+static int
+ti_pruss_detach(device_t dev)
+{
+	struct ti_pruss_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+	for (i = 0; i < TI_PRUSS_IRQS; i++) {
+		if (sc->sc_intr[i])
+			bus_teardown_intr(dev, sc->sc_irq_res[i], sc->sc_intr[i]);
+		if (sc->sc_irq_res[i])
+			bus_release_resource(dev, SYS_RES_IRQ, 
+			    rman_get_rid(sc->sc_irq_res[i]),
+			    sc->sc_irq_res[i]);
+	}
+	if (sc->sc_mem_res)
+		bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->sc_mem_res),
+		    sc->sc_mem_res);
+	if (sc->sc_pdev)
+		destroy_dev(sc->sc_pdev);
+
+	return (0);
+}
+
+static void
+ti_pruss_intr(void *arg)
+{
+	struct ti_pruss_irq_arg *iap;
+	struct ti_pruss_softc *sc;
+
+	iap = arg;
+	sc = iap->sc;
+	DPRINTF("interrupt %p", sc);
+	KNOTE_UNLOCKED(&sc->sc_selinfo.si_note, iap->irq);
+}
+
+static int
+ti_pruss_open(struct cdev *cdev, int oflags, int devtype, struct thread *td)
+{
+	device_t dev = cdev->si_drv1;
+	struct ti_pruss_softc *sc = device_get_softc(dev);
+
+	if (atomic_cmpset_32(&sc->sc_inuse, 0, 1) == 0)
+		return (EBUSY);
+	else
+		return (0);
+}
+
+static int
+ti_pruss_close(struct cdev *cdev, int fflag, int devtype, struct thread *td)
+{
+	device_t dev = cdev->si_drv1;
+	struct ti_pruss_softc *sc = device_get_softc(dev);
+
+	sc->sc_inuse = 0;
+
+	return (0);
+}
+
+static int
+ti_pruss_mmap(struct cdev *cdev, vm_ooffset_t offset, vm_paddr_t *paddr,
+    int nprot, vm_memattr_t *memattr)
+{
+	device_t dev = cdev->si_drv1;
+	struct ti_pruss_softc *sc = device_get_softc(dev);
+
+	if (offset > rman_get_size(sc->sc_mem_res))
+		return (-1);
+	*paddr = rman_get_start(sc->sc_mem_res) + offset;
+
+	return (0);
+}
+
+static struct filterops ti_pruss_kq_read = {
+	.f_isfd = 1,
+	.f_detach = ti_pruss_kq_read_detach,
+	.f_event = ti_pruss_kq_read_event,
+};
+
+static void
+ti_pruss_kq_read_detach(struct knote *kn)
+{
+	struct ti_pruss_softc *sc = kn->kn_hook;
+
+	knlist_remove(&sc->sc_selinfo.si_note, kn, 0);
+}
+
+static int
+ti_pruss_kq_read_event(struct knote *kn, long hint)
+{
+	kn->kn_data = hint;
+
+	return (hint);
+}
+
+static int
+ti_pruss_kqfilter(struct cdev *cdev, struct knote *kn)
+{
+	device_t dev = cdev->si_drv1;
+	struct ti_pruss_softc *sc = device_get_softc(dev);
+
+	switch (kn->kn_filter) {
+	case EVFILT_READ:
+		kn->kn_hook = sc;
+		kn->kn_fop = &ti_pruss_kq_read;
+		knlist_add(&sc->sc_selinfo.si_note, kn, 1);
+		break;
+	default:
+		return (EINVAL);
+	}
+
+	return (0);
+}
diff --git a/sys/arm/ti/ti_pruss.h b/sys/arm/ti/ti_pruss.h
new file mode 100644
index 00000000000..9b05addf60c
--- /dev/null
+++ b/sys/arm/ti/ti_pruss.h
@@ -0,0 +1,36 @@
+/*-
+ * Copyright (c) 2013 Rui Paulo <rpaulo@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 _TI_PRUSS_H_
+#define _TI_PRUSS_H_
+
+#define	PRUSS_AM18XX_INTC	0x04000
+#define	PRUSS_AM18XX_REV	0x4e825900
+#define	PRUSS_AM33XX_REV	0x4e82A900
+#define	PRUSS_AM33XX_INTC	0x20000
+
+#endif /* _TI_PRUSS_H_ */
diff --git a/sys/arm/ti/ti_scm.c b/sys/arm/ti/ti_scm.c
index 12532e0a25d..aafcf2dfe09 100644
--- a/sys/arm/ti/ti_scm.c
+++ b/sys/arm/ti/ti_scm.c
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/ti/ti_sdhci.c b/sys/arm/ti/ti_sdhci.c
index 1bd2c790c33..218983bac86 100644
--- a/sys/arm/ti/ti_sdhci.c
+++ b/sys/arm/ti/ti_sdhci.c
@@ -74,6 +74,21 @@ struct ti_sdhci_softc {
 	uint32_t		sdhci_clkdiv;
 };
 
+/*
+ * Table of supported FDT compat strings.
+ *
+ * Note that "ti,mmchs" is our own invention, and should be phased out in favor
+ * of the documented names.
+ *
+ * Note that vendor Beaglebone dtsi files use "ti,omap3-hsmmc" for the am335x.
+ */
+static struct ofw_compat_data compat_data[] = {
+	{"ti,omap3-hsmmc",	1},
+	{"ti,omap4-hsmmc",	1},
+	{"ti,mmchs",		1},
+	{NULL,		 	0},
+};
+
 /*
  * The MMCHS hardware has a few control and status registers at the beginning of
  * the device's memory map, followed by the standard sdhci register block.
@@ -93,6 +108,10 @@ struct ti_sdhci_softc {
 #define	MMCHS_CON			0x02C
 #define	  MMCHS_CON_DW8			  (1 << 5)
 #define	  MMCHS_CON_DVAL_8_4MS		  (3 << 9)
+#define	MMCHS_SD_CAPA			0x140
+#define	  MMCHS_SD_CAPA_VS18		  (1 << 26)
+#define	  MMCHS_SD_CAPA_VS30		  (1 << 25)
+#define	  MMCHS_SD_CAPA_VS33		  (1 << 24)
 
 static inline uint32_t
 ti_mmchs_read_4(struct ti_sdhci_softc *sc, bus_size_t off)
@@ -320,6 +339,7 @@ ti_sdhci_hw_init(device_t dev)
 {
 	struct ti_sdhci_softc *sc = device_get_softc(dev);
 	clk_ident_t clk;
+	uint32_t regval;
 	unsigned long timeout;
 
 	/* Enable the controller and interface/functional clocks */
@@ -357,6 +377,21 @@ ti_sdhci_hw_init(device_t dev)
 		DELAY(100);
 	}
 
+	/*
+	 * The attach() routine has examined fdt data and set flags in
+	 * slot.host.caps to reflect what voltages we can handle.  Set those
+	 * values in the CAPA register.  The manual says that these values can
+	 * only be set once, "before initialization" whatever that means, and
+	 * that they survive a reset.  So maybe doing this will be a no-op if
+	 * u-boot has already initialized the hardware.
+	 */
+	regval = ti_mmchs_read_4(sc, MMCHS_SD_CAPA);
+	if (sc->slot.host.caps & MMC_OCR_LOW_VOLTAGE)
+		regval |= MMCHS_SD_CAPA_VS18;
+	if (sc->slot.host.caps & (MMC_OCR_290_300 | MMC_OCR_300_310))
+		regval |= MMCHS_SD_CAPA_VS30;
+	ti_mmchs_write_4(sc, MMCHS_SD_CAPA, regval);
+
 	/* Set initial host configuration (1-bit, std speed, pwr off). */
 	ti_sdhci_write_1(dev, NULL, SDHCI_HOST_CONTROL, 0);
 	ti_sdhci_write_1(dev, NULL, SDHCI_POWER_CONTROL, 0);
@@ -378,7 +413,8 @@ ti_sdhci_attach(device_t dev)
 	/*
 	 * Get the MMCHS device id from FDT.  If it's not there use the newbus
 	 * unit number (which will work as long as the devices are in order and
-	 * none are skipped in the fdt).
+	 * none are skipped in the fdt).  Note that this is a property we made
+	 * up and added in freebsd, it doesn't exist in the published bindings.
 	 */
 	node = ofw_bus_get_node(dev);
 	if ((OF_getprop(node, "mmchs-device-id", &prop, sizeof(prop))) <= 0) {
@@ -388,7 +424,23 @@ ti_sdhci_attach(device_t dev)
 	} else
 		sc->mmchs_device_id = fdt32_to_cpu(prop);
 
-	/* See if we've got a GPIO-based write detect pin. */
+	/*
+	 * The hardware can inherently do dual-voltage (1p8v, 3p0v) on the first
+	 * device, and only 1p8v on other devices unless an external transceiver
+	 * is used.  The only way we could know about a transceiver is fdt data.
+	 * Note that we have to do this before calling ti_sdhci_hw_init() so
+	 * that it can set the right values in the CAPA register, which can only
+	 * be done once and never reset.
+	 */
+	sc->slot.host.caps |= MMC_OCR_LOW_VOLTAGE;
+	if (sc->mmchs_device_id == 0 || OF_hasprop(node, "ti,dual-volt")) {
+		sc->slot.host.caps |= MMC_OCR_290_300 | MMC_OCR_300_310;
+	}
+
+	/*
+	 * See if we've got a GPIO-based write detect pin.  This is not the
+	 * standard documented property for this, we added it in freebsd.
+	 */
 	if ((OF_getprop(node, "mmchs-wp-gpio-pin", &prop, sizeof(prop))) <= 0)
 		sc->wp_gpio_pin = 0xffffffff;
 	else
@@ -406,10 +458,6 @@ ti_sdhci_attach(device_t dev)
 
 	/*
 	 * Set the offset from the device's memory start to the MMCHS registers.
-	 *
-	 * XXX A better way to handle this would be to have separate memory
-	 * resources for the sdhci registers and the mmchs registers.  That
-	 * requires changing everyone's DTS files.
 	 */
 	if (ti_chip() == CHIP_OMAP_3)
 		sc->mmchs_reg_off = OMAP3_MMCHS_REG_OFFSET;
@@ -482,14 +530,35 @@ ti_sdhci_attach(device_t dev)
 	 */
 	sc->slot.quirks |= SDHCI_QUIRK_BROKEN_DMA;
 
-	/* Set up the hardware and go. */
+	/*
+	 *  Set up the hardware and go.  Note that this sets many of the
+	 *  slot.host.* fields, so we have to do this before overriding any of
+	 *  those values based on fdt data, below.
+	 */
 	sdhci_init_slot(dev, &sc->slot, 0);
 
 	/*
-	 * The SDHCI controller doesn't realize it, but we support 8-bit even
-	 * though we're not a v3.0 controller.  Advertise the ability.
+	 * The SDHCI controller doesn't realize it, but we can support 8-bit
+	 * even though we're not a v3.0 controller.  If there's an fdt bus-width
+	 * property, honor it.
 	 */
-	sc->slot.host.caps |= MMC_CAP_8_BIT_DATA;
+	if (OF_getencprop(node, "bus-width", &prop, sizeof(prop)) > 0) {
+		sc->slot.host.caps &= ~(MMC_CAP_4_BIT_DATA | 
+		    MMC_CAP_8_BIT_DATA);
+		switch (prop) {
+		case 8:
+			sc->slot.host.caps |= MMC_CAP_8_BIT_DATA;
+			/* FALLTHROUGH */
+		case 4:
+			sc->slot.host.caps |= MMC_CAP_4_BIT_DATA;
+			break;
+		case 1:
+			break;
+		default:
+			device_printf(dev, "Bad bus-width value %u\n", prop);
+			break;
+		}
+	}
 
 	bus_generic_probe(dev);
 	bus_generic_attach(dev);
@@ -513,13 +582,12 @@ static int
 ti_sdhci_probe(device_t dev)
 {
 
-	if (!ofw_bus_is_compatible(dev, "ti,mmchs")) {
-		return (ENXIO);
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) {
+		device_set_desc(dev, "TI MMCHS (SDHCI 2.0)");
+		return (BUS_PROBE_DEFAULT);
 	}
 
-	device_set_desc(dev, "TI MMCHS (SDHCI 2.0)");
-
-	return (BUS_PROBE_DEFAULT);
+	return (ENXIO);
 }
 
 static device_method_t ti_sdhci_methods[] = {
diff --git a/sys/arm/ti/twl/twl.c b/sys/arm/ti/twl/twl.c
index 8edaf2fea18..387ca1be539 100644
--- a/sys/arm/ti/twl/twl.c
+++ b/sys/arm/ti/twl/twl.c
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
 
diff --git a/sys/arm/ti/twl/twl_clks.c b/sys/arm/ti/twl/twl_clks.c
index d78a7335142..a042e4323c3 100644
--- a/sys/arm/ti/twl/twl_clks.c
+++ b/sys/arm/ti/twl/twl_clks.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
 
diff --git a/sys/arm/ti/twl/twl_vreg.c b/sys/arm/ti/twl/twl_vreg.c
index 26c2e2690f2..b4ebc59e979 100644
--- a/sys/arm/ti/twl/twl_vreg.c
+++ b/sys/arm/ti/twl/twl_vreg.c
@@ -65,7 +65,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
 
diff --git a/sys/arm/versatile/bus_space.c b/sys/arm/versatile/bus_space.c
index 4cce8203abc..375c5514c40 100644
--- a/sys/arm/versatile/bus_space.c
+++ b/sys/arm/versatile/bus_space.c
@@ -1,7 +1,9 @@
 /*-
- * Copyright (C) 2012 FreeBSD Foundation
+ * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
  * All rights reserved.
  *
+ * Developed by Semihalf.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arm/versatile/if_smc_fdt.c b/sys/arm/versatile/if_smc_fdt.c
index f61f18ad338..8334c27103c 100644
--- a/sys/arm/versatile/if_smc_fdt.c
+++ b/sys/arm/versatile/if_smc_fdt.c
@@ -28,11 +28,12 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-
-#include <sys/module.h>
 #include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/taskqueue.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/arm/versatile/pl050.c b/sys/arm/versatile/pl050.c
index f6662b1fd58..72569dce01a 100644
--- a/sys/arm/versatile/pl050.c
+++ b/sys/arm/versatile/pl050.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/versatile/sp804.c b/sys/arm/versatile/sp804.c
index 000ccb64380..395d70ac9b3 100644
--- a/sys/arm/versatile/sp804.c
+++ b/sys/arm/versatile/sp804.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/versatile/versatile_clcd.c b/sys/arm/versatile/versatile_clcd.c
index 34d29fae403..daa09e75b01 100644
--- a/sys/arm/versatile/versatile_clcd.c
+++ b/sys/arm/versatile/versatile_clcd.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/versatile/versatile_machdep.c b/sys/arm/versatile/versatile_machdep.c
index cd29a5abd8c..0be0ad51027 100644
--- a/sys/arm/versatile/versatile_machdep.c
+++ b/sys/arm/versatile/versatile_machdep.c
@@ -49,9 +49,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/pmap.h>
 
 #include <machine/bus.h>
-#include <machine/frame.h> /* For trapframe_t, used in <machine/machdep.h> */
+#include <machine/devmap.h>
 #include <machine/machdep.h>
-#include <machine/pmap.h>
 
 #include <dev/fdt/fdt_common.h>
 
@@ -62,7 +61,13 @@ vm_offset_t
 initarm_lastaddr(void)
 {
 
-	return (DEVMAP_BOOTSTRAP_MAP_START - ARM_NOCACHE_KVA_SIZE);
+	return (DEVMAP_BOOTSTRAP_MAP_START);
+}
+
+void
+initarm_early_init(void)
+{
+
 }
 
 void
@@ -76,7 +81,7 @@ initarm_late_init(void)
 }
 
 #define FDT_DEVMAP_MAX	(2)		/* FIXME */
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
+static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_MAX] = {
 	{ 0, 0, 0, 0, 0, },
 	{ 0, 0, 0, 0, 0, }
 };
@@ -86,7 +91,7 @@ static struct pmap_devmap fdt_devmap[FDT_DEVMAP_MAX] = {
  * Construct pmap_devmap[] with DT-derived config data.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 	int i = 0;
 	fdt_devmap[i].pd_va = 0xf0100000;
@@ -95,7 +100,7 @@ platform_devmap_init(void)
 	fdt_devmap[i].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
 	fdt_devmap[i].pd_cache = PTE_DEVICE;
 
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
+	arm_devmap_register_table(&fdt_devmap[0]);
 	return (0);
 }
 
diff --git a/sys/arm/versatile/versatile_pci.c b/sys/arm/versatile/versatile_pci.c
index 131209a3822..bc5424513bb 100644
--- a/sys/arm/versatile/versatile_pci.c
+++ b/sys/arm/versatile/versatile_pci.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/pci/pcivar.h>
@@ -360,6 +359,9 @@ versatile_pci_activate_resource(device_t bus, device_t child, int type, int rid,
 		res = (BUS_ACTIVATE_RESOURCE(device_get_parent(bus),
 		    child, type, rid, r));
 		break;
+	default:
+		res = ENXIO;
+		break;
 	}
 
 	return (res);
diff --git a/sys/arm/versatile/versatile_timer.c b/sys/arm/versatile/versatile_timer.c
index ab46a0a45e5..5231ef1cb2d 100644
--- a/sys/arm/versatile/versatile_timer.c
+++ b/sys/arm/versatile/versatile_timer.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/watchdog.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
-#include <machine/frame.h>
 #include <machine/intr.h>
 
 #include <dev/fdt/fdt_common.h>
diff --git a/sys/arm/xilinx/zy7_bus_space.c b/sys/arm/xilinx/zy7_bus_space.c
index 4cce8203abc..375c5514c40 100644
--- a/sys/arm/xilinx/zy7_bus_space.c
+++ b/sys/arm/xilinx/zy7_bus_space.c
@@ -1,7 +1,9 @@
 /*-
- * Copyright (C) 2012 FreeBSD Foundation
+ * Copyright (C) 2008 MARVELL INTERNATIONAL LTD.
  * All rights reserved.
  *
+ * Developed by Semihalf.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arm/xilinx/zy7_machdep.c b/sys/arm/xilinx/zy7_machdep.c
index 2731d53687a..8461fca906b 100644
--- a/sys/arm/xilinx/zy7_machdep.c
+++ b/sys/arm/xilinx/zy7_machdep.c
@@ -49,8 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/fdt/fdt_common.h>
 
 #include <machine/bus.h>
-#include <machine/pmap.h>
-#include <machine/frame.h>
+#include <machine/devmap.h>
 #include <machine/machdep.h>
 
 #include <arm/xilinx/zy7_reg.h>
@@ -61,7 +60,13 @@ vm_offset_t
 initarm_lastaddr(void)
 {
 
-	return (ZYNQ7_PSIO_VBASE - ARM_NOCACHE_KVA_SIZE);
+	return (ZYNQ7_PSIO_VBASE);
+}
+
+void
+initarm_early_init(void)
+{
+
 }
 
 void
@@ -75,13 +80,13 @@ initarm_late_init(void)
 }
 
 #define FDT_DEVMAP_SIZE 3
-static struct pmap_devmap fdt_devmap[FDT_DEVMAP_SIZE];
+static struct arm_devmap_entry fdt_devmap[FDT_DEVMAP_SIZE];
 
 /*
  * Construct pmap_devmap[] with DT-derived config data.
  */
 int
-platform_devmap_init(void)
+initarm_devmap_init(void)
 {
 	int i = 0;
 
@@ -106,7 +111,7 @@ platform_devmap_init(void)
 	fdt_devmap[i].pd_prot = 0;
 	fdt_devmap[i].pd_cache = 0;
 
-	pmap_devmap_bootstrap_table = &fdt_devmap[0];
+	arm_devmap_register_table(&fdt_devmap[0]);
 	return (0);
 }
 
diff --git a/sys/arm/xscale/i80321/ep80219_machdep.c b/sys/arm/xscale/i80321/ep80219_machdep.c
index ff2f1c3151a..3c52d550c55 100644
--- a/sys/arm/xscale/i80321/ep80219_machdep.c
+++ b/sys/arm/xscale/i80321/ep80219_machdep.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <machine/devmap.h>
 #include <machine/vmparam.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
@@ -125,7 +126,7 @@ struct pv_addr minidataclean;
 /* #define IQ80321_OBIO_SIZE 0x00100000UL */
 
 /* Static device mappings. */
-static const struct pmap_devmap ep80219_devmap[] = {
+static const struct arm_devmap_entry ep80219_devmap[] = {
 	/*
 	 * Map the on-board devices VA == PA so that we can access them
 	 * with the MMU on or off.
@@ -300,7 +301,7 @@ initarm(struct arm_boot_params *abp)
 	/* Map the vector page. */
 	pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa,
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
-	pmap_devmap_bootstrap(l1pagetable, ep80219_devmap);
+	arm_devmap_bootstrap(l1pagetable, ep80219_devmap);
 	/*
 	 * Give the XScale global cache clean code an appropriately
 	 * sized chunk of unmapped VA space starting at 0xff000000
@@ -333,6 +334,8 @@ initarm(struct arm_boot_params *abp)
 	 * this problem will not occur after initarm().
 	 */
 	cpu_idcache_wbinv_all();
+	cpu_setup("");
+
 	/*
 	 * Fetch the SDRAM start/size from the i80321 SDRAM configration
 	 * registers.
@@ -365,7 +368,7 @@ initarm(struct arm_boot_params *abp)
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
 					
-	vm_max_kernel_address = 0xd0000000;
+	vm_max_kernel_address = 0xe0000000;
 	pmap_bootstrap(pmap_curmaxkvaddr, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
diff --git a/sys/arm/xscale/i80321/i80321_pci.c b/sys/arm/xscale/i80321/i80321_pci.c
index dfb4c468116..4e281483000 100644
--- a/sys/arm/xscale/i80321/i80321_pci.c
+++ b/sys/arm/xscale/i80321/i80321_pci.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
-#include <machine/pmap.h>
 
 #include <arm/xscale/i80321/i80321reg.h>
 #include <arm/xscale/i80321/i80321var.h>
diff --git a/sys/arm/xscale/i80321/iq31244_machdep.c b/sys/arm/xscale/i80321/iq31244_machdep.c
index 1412635c295..b9af11a9e7d 100644
--- a/sys/arm/xscale/i80321/iq31244_machdep.c
+++ b/sys/arm/xscale/i80321/iq31244_machdep.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <machine/devmap.h>
 #include <machine/vmparam.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
@@ -123,7 +124,7 @@ struct pv_addr minidataclean;
 #define IQ80321_OBIO_BASE 0xfe800000UL
 #define IQ80321_OBIO_SIZE 0x00100000UL
 /* Static device mappings. */
-static const struct pmap_devmap iq80321_devmap[] = {
+static const struct arm_devmap_entry iq80321_devmap[] = {
 	/*
 	 * Map the on-board devices VA == PA so that we can access them
 	 * with the MMU on or off.
@@ -301,7 +302,7 @@ initarm(struct arm_boot_params *abp)
 	/* Map the vector page. */
 	pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa,
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
-	pmap_devmap_bootstrap(l1pagetable, iq80321_devmap);
+	arm_devmap_bootstrap(l1pagetable, iq80321_devmap);
 	/*
 	 * Give the XScale global cache clean code an appropriately
 	 * sized chunk of unmapped VA space starting at 0xff000000
@@ -334,6 +335,8 @@ initarm(struct arm_boot_params *abp)
 	 * this problem will not occur after initarm().
 	 */
 	cpu_idcache_wbinv_all();
+	cpu_setup("");
+
 	/*
 	 * Fetch the SDRAM start/size from the i80321 SDRAM configration
 	 * registers.
@@ -366,7 +369,7 @@ initarm(struct arm_boot_params *abp)
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
 					
-	vm_max_kernel_address = 0xd0000000;
+	vm_max_kernel_address = 0xe0000000;
 	pmap_bootstrap(pmap_curmaxkvaddr, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
diff --git a/sys/arm/xscale/i80321/iq80321.c b/sys/arm/xscale/i80321/iq80321.c
index f43f8e40995..72300f13c0e 100644
--- a/sys/arm/xscale/i80321/iq80321.c
+++ b/sys/arm/xscale/i80321/iq80321.c
@@ -72,7 +72,7 @@ int
 iq80321_probe(device_t dev)
 {
 	device_set_desc(dev, "Intel 80321");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 void
diff --git a/sys/arm/xscale/i8134x/crb_machdep.c b/sys/arm/xscale/i8134x/crb_machdep.c
index 4ae836bb80c..6d6a6cce22f 100644
--- a/sys/arm/xscale/i8134x/crb_machdep.c
+++ b/sys/arm/xscale/i8134x/crb_machdep.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <machine/devmap.h>
 #include <machine/vmparam.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
@@ -123,7 +124,7 @@ struct pv_addr abtstack;
 struct pv_addr kernelstack;
 
 /* Static device mappings. */
-static const struct pmap_devmap iq81342_devmap[] = {
+static const struct arm_devmap_entry iq81342_devmap[] = {
 	    {
 		    IOP34X_VADDR,
 		    IOP34X_HWADDR,
@@ -285,7 +286,7 @@ initarm(struct arm_boot_params *abp)
 	/* Map the vector page. */
 	pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa,
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
-	pmap_devmap_bootstrap(l1pagetable, iq81342_devmap);
+	arm_devmap_bootstrap(l1pagetable, iq81342_devmap);
 	/*
 	 * Give the XScale global cache clean code an appropriately
 	 * sized chunk of unmapped VA space starting at 0xff000000
@@ -319,6 +320,8 @@ initarm(struct arm_boot_params *abp)
 	 * this problem will not occur after initarm().
 	 */
 	cpu_idcache_wbinv_all();
+	cpu_setup("");
+
 	i80321_calibrate_delay();
 	i81342_sdram_bounds(&obio_bs_tag, IOP34X_VADDR, &memstart, &memsize);
 	physmem = memsize / PAGE_SIZE;
@@ -344,7 +347,7 @@ initarm(struct arm_boot_params *abp)
 	dump_avail[2] = 0;
 	dump_avail[3] = 0;
 					
-	vm_max_kernel_address = 0xd0000000;
+	vm_max_kernel_address = 0xe0000000;
 	pmap_bootstrap(pmap_curmaxkvaddr, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
diff --git a/sys/arm/xscale/i8134x/i81342_pci.c b/sys/arm/xscale/i8134x/i81342_pci.c
index 8bbcdba3bc5..68d2fbf4ea1 100644
--- a/sys/arm/xscale/i8134x/i81342_pci.c
+++ b/sys/arm/xscale/i8134x/i81342_pci.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
-#include <machine/pmap.h>
 
 #include <arm/xscale/i8134x/i81342reg.h>
 #include <arm/xscale/i8134x/i81342var.h>
diff --git a/sys/arm/xscale/i8134x/i81342reg.h b/sys/arm/xscale/i8134x/i81342reg.h
index c3429703ddf..fd087ce3700 100644
--- a/sys/arm/xscale/i8134x/i81342reg.h
+++ b/sys/arm/xscale/i8134x/i81342reg.h
@@ -83,7 +83,7 @@
 #define IOP34X_ADMA_PQTE	(1 << 18) /* P+Q Transfer Enable */
 #define IOP34X_ADMA_PTD		(1 << 19) /* P Transfer Disable */
 #define IOP34X_ADMA_ROE		(1 << 30) /* Relaxed Ordering Enable */
-#define IOP34X_ADMA_NSE		(1 << 31) /* No Snoop Enable */
+#define IOP34X_ADMA_NSE		(1U << 31) /* No Snoop Enable */
 
 #define IOP34X_PBBAR0		0x81588 /* PBI Base Address Register 0 */
 #define IOP34X_PBBAR0_ADDRMASK	0xfffff000
@@ -113,7 +113,7 @@
 #define SMC_SDBR		0x8180c /* Base Register */
 #define SMC_SDBR_BASEADDR	(1 << 27)
 #define SMC_SDBR_BASEADDR_MASK	((1 << 27) | (1 << 28) | (1 << 29) | (1 << 30) \
-    				| (1 << 31))
+    				| (1U << 31))
 #define SMC_SDUBR		0x81810 /* Upper Base Register */
 #define SMC_SBSR		0x81814 /* SDRAM Bank Size Register */
 #define SMC_SBSR_BANK_NB	(1 << 2) /* Number of DDR Banks
@@ -128,7 +128,7 @@
 					   0x01000 1GB
 					   */
 #define SMC_SBSR_BANK_SZ_MASK	((1 << 27) | (1 << 28) | (1 << 29) | (1 << 30) \
-    				| (1 << 31))
+    				| (1U << 31))
 
 
 /* Two possible addresses for ATUe depending on configuration. */
@@ -190,7 +190,7 @@
 #define ATU_CR_OUT_EN	(1 << 1)
 #define ATU_PCSR	0x0074 /* PCI Configuration and Status Register */
 #define PCIE_BUSNO(x)	((x & 0xff000000) >> 24)
-#define ATUX_CORE_RST	((1 << 30) | (1 << 31)) /* Core Processor Reset */
+#define ATUX_CORE_RST	((1 << 30) | (1U << 31)) /* Core Processor Reset */
 #define ATUX_P_RSTOUT	(1 << 21) /* Central Resource PCI Bus Reset */
 #define ATUE_CORE_RST	((1 << 9) | (1 << 8)) /* Core Processor Reset */
 #define ATU_ISR		0x0078 /* ATU Interrupt Status Register */
@@ -250,7 +250,7 @@
 #define ATU_OIOWTVR	0x0304 /* Outbound I/O Window Translate Value Reg */
 #define ATU_OUMBAR0	0x0308 /* Outbound Upper Memory Window base addr reg 0*/
 #define ATU_OUMBAR_FUNC	(28)
-#define ATU_OUMBAR_EN	(1 << 31)
+#define ATU_OUMBAR_EN	(1U << 31)
 #define ATU_OUMWTVR0	0x030c /* Outbound Upper 32bit Memory Window Translate Value Register 0 */
 #define ATU_OUMBAR1	0x0310 /* Outbound Upper Memory Window base addr reg1*/
 #define ATU_OUMWTVR1	0x0314 /* Outbound Upper 32bit Memory Window Translate Value Register 1 */
diff --git a/sys/arm/xscale/ixp425/avila_machdep.c b/sys/arm/xscale/ixp425/avila_machdep.c
index 82e1aab004c..6583cde00ca 100644
--- a/sys/arm/xscale/ixp425/avila_machdep.c
+++ b/sys/arm/xscale/ixp425/avila_machdep.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <machine/devmap.h>
 #include <machine/vmparam.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
@@ -125,7 +126,7 @@ struct pv_addr kernelstack;
 struct pv_addr minidataclean;
 
 /* Static device mappings. */
-static const struct pmap_devmap ixp425_devmap[] = {
+static const struct arm_devmap_entry ixp425_devmap[] = {
 	/* Physical/Virtual address for I/O space */
     { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE,
       VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, },
@@ -158,7 +159,7 @@ static const struct pmap_devmap ixp425_devmap[] = {
 };
 
 /* Static device mappings. */
-static const struct pmap_devmap ixp435_devmap[] = {
+static const struct arm_devmap_entry ixp435_devmap[] = {
 	/* Physical/Virtual address for I/O space */
     { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE,
       VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, },
@@ -368,9 +369,9 @@ initarm(struct arm_boot_params *abp)
 	pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa,
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 	if (cpu_is_ixp43x())
-		pmap_devmap_bootstrap(l1pagetable, ixp435_devmap);
+		arm_devmap_bootstrap(l1pagetable, ixp435_devmap);
 	else
-		pmap_devmap_bootstrap(l1pagetable, ixp425_devmap);
+		arm_devmap_bootstrap(l1pagetable, ixp425_devmap);
 	/*
 	 * Give the XScale global cache clean code an appropriately
 	 * sized chunk of unmapped VA space starting at 0xff000000
@@ -404,6 +405,8 @@ initarm(struct arm_boot_params *abp)
 	 * this problem will not occur after initarm().
 	 */
 	cpu_idcache_wbinv_all();
+	cpu_setup("");
+
 	/* ready to setup the console (XXX move earlier if possible) */
 	cninit();
 	/*
@@ -429,7 +432,7 @@ initarm(struct arm_boot_params *abp)
 
 	pmap_curmaxkvaddr = afterkern + PAGE_SIZE;
 	arm_dump_avail_init(memsize, sizeof(dump_avail) / sizeof(dump_avail[0]));
-	vm_max_kernel_address = 0xd0000000;
+	vm_max_kernel_address = 0xe0000000;
 	pmap_bootstrap(pmap_curmaxkvaddr, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
diff --git a/sys/arm/xscale/ixp425/if_npe.c b/sys/arm/xscale/ixp425/if_npe.c
index 21e39267fbe..aae31a009eb 100644
--- a/sys/arm/xscale/ixp425/if_npe.c
+++ b/sys/arm/xscale/ixp425/if_npe.c
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>
 #include <net/if_mib.h>
 #include <net/if_types.h>
+#include <net/if_var.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -507,7 +508,6 @@ npe_dma_setup(struct npe_softc *sc, struct npedma *dma,
 		    dma->name, error);
 		return error;
 	}
-	/* XXX COHERENT for now */
 	if (bus_dmamem_alloc(dma->buf_tag, (void **)&dma->hwbuf,
 	    BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT,
 	    &dma->buf_map) != 0) {
@@ -1073,6 +1073,7 @@ npe_rxbuf_init(struct npe_softc *sc, struct npebuf *npe, struct mbuf *m)
 	m->m_pkthdr.len = m->m_len = 1536;
 	/* backload payload and align ip hdr */
 	m->m_data = m->m_ext.ext_buf + (m->m_ext.ext_size - (1536+ETHER_ALIGN));
+	bus_dmamap_unload(dma->mtag, npe->ix_map);
 	error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, m,
 			segs, &nseg, 0);
 	if (error != 0) {
@@ -1085,6 +1086,8 @@ npe_rxbuf_init(struct npe_softc *sc, struct npebuf *npe, struct mbuf *m)
 	/* NB: buffer length is shifted in word */
 	hw->ix_ne[0].len = htobe32(segs[0].ds_len << 16);
 	hw->ix_ne[0].next = 0;
+	bus_dmamap_sync(dma->buf_tag, dma->buf_map, 
+	    BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
 	npe->ix_m = m;
 	/* Flush the memory in the mbuf */
 	bus_dmamap_sync(dma->mtag, npe->ix_map, BUS_DMASYNC_PREREAD);
@@ -1110,6 +1113,8 @@ npe_rxdone(int qid, void *arg)
 		struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry), dma);
 		struct mbuf *m;
 
+		bus_dmamap_sync(dma->buf_tag, dma->buf_map,
+		    BUS_DMASYNC_POSTREAD);
 		DPRINTF(sc, "%s: entry 0x%x neaddr 0x%x ne_len 0x%x\n",
 		    __func__, entry, npe->ix_neaddr, npe->ix_hw->ix_ne[0].len);
 		/*
@@ -1130,7 +1135,6 @@ npe_rxdone(int qid, void *arg)
 			bus_dmamap_sync(dma->mtag, npe->ix_map,
 			    BUS_DMASYNC_POSTREAD);
 
-			/* XXX flush hw buffer; works now 'cuz coherent */
 			/* set m_len etc. per rx frame size */
 			mrx->m_len = be32toh(hw->ix_ne[0].len) & 0xffff;
 			mrx->m_pkthdr.len = mrx->m_len;
@@ -1313,6 +1317,7 @@ npestart_locked(struct ifnet *ifp)
 			return;
 		}
 		npe = sc->tx_free;
+		bus_dmamap_unload(dma->mtag, npe->ix_map);
 		error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map,
 		    m, segs, &nseg, 0);
 		if (error == EFBIG) {
@@ -1355,7 +1360,8 @@ npestart_locked(struct ifnet *ifp)
 			next += sizeof(hw->ix_ne[0]);
 		}
 		hw->ix_ne[i-1].next = 0;	/* zero last in chain */
-		/* XXX flush descriptor instead of using uncached memory */
+		bus_dmamap_sync(dma->buf_tag, dma->buf_map,
+		    BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
 
 		DPRINTF(sc, "%s: qwrite(%u, 0x%x) ne_data %x ne_len 0x%x\n",
 		    __func__, sc->tx_qid, npe->ix_neaddr,
diff --git a/sys/arm/xscale/ixp425/ixp425_mem.c b/sys/arm/xscale/ixp425/ixp425_mem.c
index 0458a839704..12a553b8b8f 100644
--- a/sys/arm/xscale/ixp425/ixp425_mem.c
+++ b/sys/arm/xscale/ixp425/ixp425_mem.c
@@ -76,7 +76,7 @@ ixp425_sdram_size(void)
 		size = sdram_other[MCU_SDR_CONFIG_MCONF(sdr_config)];
 
 	if (size == 0) {
-		printf("** SDR_CONFIG retuns unknown value, using 32M\n");
+		printf("** SDR_CONFIG returns unknown value, using 32M\n");
 		size = 32 * 1024 * 1024;
 	}
 
diff --git a/sys/arm/xscale/ixp425/ixp425_pci.c b/sys/arm/xscale/ixp425/ixp425_pci.c
index c17eb1e45b0..9495ede5eea 100644
--- a/sys/arm/xscale/ixp425/ixp425_pci.c
+++ b/sys/arm/xscale/ixp425/ixp425_pci.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_extern.h>
-#include <machine/pmap.h>
 
 #include <arm/xscale/ixp425/ixp425reg.h>
 #include <arm/xscale/ixp425/ixp425var.h>
diff --git a/sys/arm/xscale/ixp425/ixp425_wdog.c b/sys/arm/xscale/ixp425/ixp425_wdog.c
index 156378dc08d..3e64fb39c48 100644
--- a/sys/arm/xscale/ixp425/ixp425_wdog.c
+++ b/sys/arm/xscale/ixp425/ixp425_wdog.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
-#include <machine/frame.h>
 #include <machine/resource.h>
 #include <machine/intr.h>
 
diff --git a/sys/arm/xscale/ixp425/ixp425reg.h b/sys/arm/xscale/ixp425/ixp425reg.h
index a0d14728d35..f353d4449fb 100644
--- a/sys/arm/xscale/ixp425/ixp425reg.h
+++ b/sys/arm/xscale/ixp425/ixp425reg.h
@@ -400,7 +400,7 @@
 #define EXP_CNFG0_PCI_HOST         (1 << 1)
 #define EXP_CNFG0_PCI_ARB          (1 << 2)
 #define EXP_CNFG0_PCI_66MHZ        (1 << 4)
-#define EXP_CNFG0_MEM_MAP          (1 << 31)
+#define EXP_CNFG0_MEM_MAP          (1U << 31)
 
 /* EXP_CNFG1 bits */
 #define EXP_CNFG1_SW_INT0          (1 << 0)
diff --git a/sys/arm/xscale/pxa/if_smc_smi.c b/sys/arm/xscale/pxa/if_smc_smi.c
index d7350413999..2274ffb30ca 100644
--- a/sys/arm/xscale/pxa/if_smc_smi.c
+++ b/sys/arm/xscale/pxa/if_smc_smi.c
@@ -28,11 +28,12 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-
-#include <sys/module.h>
 #include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+#include <sys/taskqueue.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/arm/xscale/pxa/pxa_machdep.c b/sys/arm/xscale/pxa/pxa_machdep.c
index 5640622aef3..cf4825b1ce4 100644
--- a/sys/arm/xscale/pxa/pxa_machdep.c
+++ b/sys/arm/xscale/pxa/pxa_machdep.c
@@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
+#include <machine/devmap.h>
 #include <machine/vmparam.h>
 #include <machine/pcb.h>
 #include <machine/undefined.h>
@@ -124,7 +125,7 @@ static void	pxa_probe_sdram(bus_space_tag_t, bus_space_handle_t,
 		    uint32_t *, uint32_t *);
 
 /* Static device mappings. */
-static const struct pmap_devmap pxa_devmap[] = {
+static const struct arm_devmap_entry pxa_devmap[] = {
 	/*
 	 * Map the on-board devices up into the KVA region so we don't muck
 	 * up user-space.
@@ -281,7 +282,7 @@ initarm(struct arm_boot_params *abp)
 	/* Map the vector page. */
 	pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa,
 	    VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
-	pmap_devmap_bootstrap(l1pagetable, pxa_devmap);
+	arm_devmap_bootstrap(l1pagetable, pxa_devmap);
 
 	/*
 	 * Give the XScale global cache clean code an appropriately
@@ -316,6 +317,7 @@ initarm(struct arm_boot_params *abp)
 	 * this problem will not occur after initarm().
 	 */
 	cpu_idcache_wbinv_all();
+	cpu_setup("");
 
 	/*
 	 * Sort out bus_space for on-board devices.
@@ -362,7 +364,7 @@ initarm(struct arm_boot_params *abp)
 	}
 	dump_avail[i] = 0;
 	dump_avail[i] = 0;
-	vm_max_kernel_address = 0xd0000000;
+	vm_max_kernel_address = 0xe0000000;
 	pmap_bootstrap(pmap_curmaxkvaddr, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);
diff --git a/sys/arm/xscale/pxa/pxa_obio.c b/sys/arm/xscale/pxa/pxa_obio.c
index 5cbb9c38ec2..8b3591093ad 100644
--- a/sys/arm/xscale/pxa/pxa_obio.c
+++ b/sys/arm/xscale/pxa/pxa_obio.c
@@ -92,7 +92,7 @@ pxa_probe(device_t dev)
 {
 
 	device_set_desc(dev, "XScale PXA On-board IO");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 int
diff --git a/sys/boot/arm/at91/libat91/mci_device.h b/sys/boot/arm/at91/libat91/mci_device.h
index eeff0c9da2e..903454c2c0f 100644
--- a/sys/boot/arm/at91/libat91/mci_device.h
+++ b/sys/boot/arm/at91/libat91/mci_device.h
@@ -306,7 +306,7 @@ typedef struct _AT91S_MciDevice
 #define AT91C_VDD_33_34					(1 << 21)
 #define AT91C_VDD_34_35					(1 << 22)
 #define AT91C_VDD_35_36					(1 << 23)
-#define AT91C_CARD_POWER_UP_BUSY		(1 << 31)
+#define AT91C_CARD_POWER_UP_BUSY		(1U << 31)
 
 #define AT91C_MMC_HOST_VOLTAGE_RANGE	(AT91C_VDD_27_28 | AT91C_VDD_28_29  | \
     AT91C_VDD_29_30 | AT91C_VDD_30_31 | AT91C_VDD_31_32 | AT91C_VDD_32_33)
diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile
index 236e3f34dc1..3402e02e2ed 100644
--- a/sys/boot/arm/uboot/Makefile
+++ b/sys/boot/arm/uboot/Makefile
@@ -90,7 +90,7 @@ CFLAGS+=	-I.
 
 CLEANFILES+=	vers.c loader.help
 
-CFLAGS+=	-ffreestanding
+CFLAGS+=	-ffreestanding -msoft-float
 
 LDFLAGS=	-nostdlib -static
 LDFLAGS+=	-T ldscript.generated
diff --git a/sys/boot/arm/uboot/start.S b/sys/boot/arm/uboot/start.S
index 8af47f3afc0..6e8f1172831 100644
--- a/sys/boot/arm/uboot/start.S
+++ b/sys/boot/arm/uboot/start.S
@@ -39,9 +39,10 @@ _start:
 	ldr	ip, =uboot_address
 	str	sp, [ip]
 
-	/* Save U-Boot's r8 */
+	/* Save U-Boot's r8 and r9 */
 	ldr	ip, =saved_regs
 	str	r8, [ip, #0]
+	str	r9, [ip, #4]
 
 #ifdef _ARM_ARCH_6
 	mrc     p15, 0, r2, c1, c0, 0
@@ -57,21 +58,24 @@ _start:
  * syscall()
  */
 ENTRY(syscall)
-	/* Save caller's lr and r8 */
+	/* Save caller's lr, r8 and r9 */
 	ldr	ip, =saved_regs
-	str	lr, [ip, #4]
 	str	r8, [ip, #8]
-	/* Restore U-Boot's r8 */
+	str	r9, [ip, #12]
+	str	lr, [ip, #16]
+	/* Restore U-Boot's r8 and r9 */
 	ldr	r8, [ip, #0]
+	ldr	r9, [ip, #4]
 	/* Call into U-Boot */
 	ldr	lr, =return_from_syscall
 	ldr	ip, =syscall_ptr
 	ldr	pc, [ip]
 return_from_syscall:
-	/* Restore loader's r8 and lr */
+	/* Restore loader's r8, r9 and lr */
 	ldr	ip, =saved_regs
+	ldr	lr, [ip, #16]
+	ldr	r9, [ip, #12]
 	ldr	r8, [ip, #8]
-	ldr	lr, [ip, #4]
 	/* Return to caller */
 	mov	pc, lr
 
@@ -90,5 +94,7 @@ uboot_address:
 
 saved_regs:
 	.long	0	/* U-Boot's r8 */
+	.long	0	/* U-Boot's r9 */
 	.long	0	/* Loader's r8 */
+	.long	0	/* Loader's r9 */
 	.long	0	/* Loader's lr */
diff --git a/sys/boot/fdt/dts/am335x.dtsi b/sys/boot/fdt/dts/am335x.dtsi
index 8374d70fb16..c16f039be9f 100644
--- a/sys/boot/fdt/dts/am335x.dtsi
+++ b/sys/boot/fdt/dts/am335x.dtsi
@@ -163,16 +163,17 @@
 		};
 
 		mmchs0@48060000 {
-			compatible = "ti,mmchs";
+			compatible = "ti,omap3-hsmmc", "ti,mmchs";
 			reg =<0x48060000 0x1000 >;
 			interrupts = <64>;
 			interrupt-parent = <&AINTC>;
 			mmchs-device-id = <0>;
 			mmchs-wp-gpio-pin = <0xffffffff>;
+			ti,dual-volt;
 		};
 
 		mmchs1@481D8000 {
-			compatible = "ti,mmchs";
+			compatible = "ti,omap3-hsmmc", "ti,mmchs";
 			reg =<0x481D8000 0x1000 >;
 			interrupts = <28>;
 			interrupt-parent = <&AINTC>;
diff --git a/sys/boot/fdt/dts/bcm2835.dtsi b/sys/boot/fdt/dts/bcm2835.dtsi
index 8078ee413c3..bb302484427 100644
--- a/sys/boot/fdt/dts/bcm2835.dtsi
+++ b/sys/boot/fdt/dts/bcm2835.dtsi
@@ -396,6 +396,30 @@
 			};
 		};
 
+		bsc0 {
+			compatible = "broadcom,bcm2835-bsc",
+				     "broadcom,bcm2708-bsc";
+			reg = <0x205000 0x20>;
+			interrupts = <61>;
+			interrupt-parent = <&intc>;
+		};
+
+		bsc1 {
+			compatible = "broadcom,bcm2835-bsc",
+				     "broadcom,bcm2708-bsc";
+			reg = <0x804000 0x20>;
+			interrupts = <61>;
+			interrupt-parent = <&intc>;
+		};
+
+		spi0 {
+			compatible = "broadcom,bcm2835-spi",
+				     "broadcom,bcm2708-spi";
+			reg = <0x204000 0x20>;
+			interrupts = <62>;
+			interrupt-parent = <&intc>;
+		};
+
 		dma: dma {
 			compatible = "broadcom,bcm2835-dma", 
 				     "broadcom,bcm2708-dma";
diff --git a/sys/boot/fdt/dts/beaglebone-black.dts b/sys/boot/fdt/dts/beaglebone-black.dts
index 04460f5903c..026363eb0dc 100644
--- a/sys/boot/fdt/dts/beaglebone-black.dts
+++ b/sys/boot/fdt/dts/beaglebone-black.dts
@@ -134,6 +134,7 @@
  		};
 
 		mmchs1@481D8000 {
+                	bus-width = <8>;
 			status = "okay";
 		};
 
diff --git a/sys/boot/fdt/dts/beri-sim.dts b/sys/boot/fdt/dts/beri-sim.dts
new file mode 100644
index 00000000000..4148bb9a564
--- /dev/null
+++ b/sys/boot/fdt/dts/beri-sim.dts
@@ -0,0 +1,144 @@
+/*-
+ * Copyright (c) 2012-2013 Robert N. M. Watson
+ * Copyright (c) 2013 SRI International
+ * 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$
+ */
+
+/dts-v1/;
+
+/*
+ * Device names here have been largely made up on the spot, especially for the
+ * "compatible" strings, and might want to be revised.
+ *
+ * For now, use 32-bit addressing as our Avalon bus is 32-bit.  However, in
+ * the future, we should likely change to 64-bit.
+ */
+
+/ {
+	model = "SRI/Cambridge BERI simulation";
+	compatible = "sri-cambridge,beri-sim";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/*
+		 * Secondary CPUs all start disabled and use the
+		 * spin-table enable method.  cpu-release-addr must be
+		 * specified for each cpu other than cpu@0.  Values of
+		 * cpu-release-addr grow down from 0x100000 (kernel).
+		 */
+		status = "disabled";
+		enable-method = "spin-table";
+
+		cpu@0 {
+			device-type = "cpu";
+			compatible = "sri-cambridge,beri";
+
+			reg = <0>;
+			status = "okay";
+		};
+
+/*
+		cpu@1 {
+			device-type = "cpu";
+			compatible = "sri-cambridge,beri";
+
+			reg = <1>;
+			// XXX: should we need cached prefix?
+			cpu-release-addr = <0xffffffff 0x800fffe0>;
+		};
+*/
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		#interrupt-cells = <1>;
+
+		/*
+		 * Declare mips,mips4k since BERI doesn't (yet) have a PIC, so
+		 * we use mips4k coprocessor 0 interrupt management directly.
+		 */
+		compatible = "simple-bus", "mips,mips4k";
+		ranges = <>;
+
+		memory {
+			device_type = "memory";
+			reg = <0x0 0x4000000>;		// 64M at 0x0
+		};
+
+		beripic: beripic@7f804000 {
+			compatible = "sri-cambridge,beri-pic";
+			interrupt-controller;
+			#address-cells = <0>;
+			#interrupt-cells = <1>;
+			reg = <0x7f804000 0x400
+			       0x7f806000 0x10
+			       0x7f806080 0x10
+			       0x7f806100 0x10>;
+			interrupts = <0 1 2 3 4>;
+			hard-interrupt-sources = <64>;
+			soft-interrupt-sources = <64>;
+		};
+
+		serial@7f000000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f000000 0x40>;
+			interrupts = <0>;
+			interrupt-parent = <&beripic>;
+		};
+
+		serial@7f001000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f001000 0x40>;
+		};
+
+		serial@7f002000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f002000 0x40>;
+		};
+
+		sdcard@7f008000 {
+			compatible = "altera,sdcard_11_2011";
+			reg = <0x7f008000 0x400>;
+		};
+
+		avgen@0x7f00a000 {
+			compatible = "sri-cambridge,avgen";
+			reg = <0x7f00a000 0x14>;
+			sri-cambridge,width = <4>;
+			sri-cambridge,fileio = "rw";
+			sri-cambridge,devname = "berirom";
+		};
+	};
+};
diff --git a/sys/boot/fdt/dts/beripad-de4.dts b/sys/boot/fdt/dts/beripad-de4.dts
new file mode 100644
index 00000000000..4d4126c38db
--- /dev/null
+++ b/sys/boot/fdt/dts/beripad-de4.dts
@@ -0,0 +1,266 @@
+/*-
+ * Copyright (c) 2012-2013 Robert N. M. Watson
+ * Copyright (c) 2013 SRI International
+ * 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$
+ */
+
+/dts-v1/;
+
+/*
+ * Device names here have been largely made up on the spot, especially for the
+ * "compatible" strings, and might want to be revised.
+ *
+ * For now, use 32-bit addressing as our Avalon bus is 32-bit.  However, in
+ * the future, we should likely change to 64-bit.
+ */
+
+/ {
+	model = "SRI/Cambridge BeriPad (DE4)";
+	compatible = "sri-cambridge,beripad-de4";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		/*
+		 * Secondary CPUs all start disabled and use the
+		 * spin-table enable method.  cpu-release-addr must be
+		 * specified for each cpu other than cpu@0.  Values of
+		 * cpu-release-addr grow down from 0x100000 (kernel).
+		 */
+		status = "disabled";
+		enable-method = "spin-table";
+
+		cpu@0 {
+			device-type = "cpu";
+			compatible = "sri-cambridge,beri";
+
+			reg = <0>;
+			status = "okay";
+		};
+
+/*
+		cpu@1 {
+			device-type = "cpu";
+			compatible = "sri-cambridge,beri";
+
+			reg = <1>;
+			// XXX: should we need cached prefix?
+			cpu-release-addr = <0xffffffff 0x800fffe0>;
+		};
+*/
+	};
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		#interrupt-cells = <1>;
+
+		/*
+		 * Declare mips,mips4k since BERI doesn't (yet) have a PIC, so
+		 * we use mips4k coprocessor 0 interrupt management directly.
+		 */
+		compatible = "simple-bus", "mips,mips4k";
+		ranges = <>;
+
+		memory {
+			device_type = "memory";
+			reg = <0x0 0x40000000>;		// 1G at 0x0
+		};
+
+		beripic: beripic@7f804000 {
+			compatible = "sri-cambridge,beri-pic";
+			interrupt-controller;
+			#address-cells = <0>;
+			#interrupt-cells = <1>;
+			reg = <0x7f804000 0x400
+			       0x7f806000 0x10
+			       0x7f806080 0x10
+			       0x7f806100 0x10>;
+			interrupts = <0 1 2 3 4>;
+			hard-interrupt-sources = <64>;
+			soft-interrupt-sources = <64>;
+		};
+
+		serial@7f002100 {
+			compatible = "ns16550";
+			reg = <0x7f002100 0x20>;
+			reg-shift = <2>;
+			clock-frequency = <50000000>;
+			interrupts = <6>;
+			interrupt-parent = <&beripic>;
+		};
+
+		serial@7f000000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f000000 0x40>;
+			interrupts = <0>;
+			interrupt-parent = <&beripic>;
+		};
+
+		serial@7f001000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f001000 0x40>;
+		};
+
+		serial@7f002000 {
+			compatible = "altera,jtag_uart-11_0";
+			reg = <0x7f002000 0x40>;
+		};
+
+		sdcard@7f008000 {
+			compatible = "altera,sdcard_11_2011";
+			reg = <0x7f008000 0x400>;
+		};
+
+		led@7f006000 {
+			compatible = "sri-cambridge,de4led";
+			reg = <0x7f006000 0x1>;
+		};
+
+		/*
+		 * XXX-BZ keep flash before ethernet so that atse can read the
+		 * Ethernet addresses for now.
+		 */
+		flash@74000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "cfi-flash";
+			reg = <0x74000000 0x4000000>;
+
+			/* Board configuration */
+			partition@0 {
+				reg = <0x0 0x20000>;
+				label = "config";
+			};
+
+			/* Power up FPGA image */
+			partition@20000 {
+				reg = <0x20000 0xc00000>;
+				label = "fpga0";
+			};
+
+			/* Secondary FPGA image (on RE_CONFIGn button) */
+			partition@C20000 {
+				reg = <0xc20000 0xc00000>;
+				label = "fpga1";
+			};
+
+			/* Space for operating system use */
+			partition@1820000 {
+				reg = <0x1820000 0x027c0000>;
+				label = "os";
+			};
+
+			/* Second stage bootloader */
+			parition@3fe0000 {
+				reg = <0x3fe0000 0x20000>;
+				label = "boot";
+			};
+		};
+
+		ethernet@7f007000 {
+			compatible = "altera,atse";
+			// MAC, RX+RXC, TX+TXC.
+			reg = <0x7f007000 0x400
+			       0x7f007500 0x8
+			       0x7f007520 0x20
+			       0x7f007400 0x8
+			       0x7f007420 0x20>;
+			// RX, TX
+			interrupts = <1 2>;
+			interrupt-parent = <&beripic>;
+		};
+
+		ethernet@7f005000 {
+			compatible = "altera,atse";
+			// MAC, RX+RXC, TX+TXC.
+			reg = <0x7f005000 0x400
+			       0x7f005500 0x8
+			       0x7f005520 0x20
+			       0x7f005400 0x8
+			       0x7f005420 0x20>;
+			// RX, TX
+			interrupts = <11 12>;
+			interrupt-parent = <&beripic>;
+		};
+
+		touchscreen@70400000 {
+			compatible = "sri-cambridge,mtl";
+			reg = <0x70400000 0x1000
+			       0x70000000 0x177000
+			       0x70177000 0x2000>;
+		};
+
+		usb@0x7f100000 {
+			compatible = "philips,isp1761";
+			reg = <0x7f100000 0x40000
+			       0x7f140000 0x4>;
+			// IRQ 4 is DC, IRQ 5 is HC.
+			interrupts = <4 5>;
+			interrupt-parent = <&beripic>;
+		};
+
+		avgen@0x7f009000 {
+			compatible = "sri-cambridge,avgen";
+			reg = <0x7f009000 0x2>;	
+			sri-cambridge,width = <1>;
+			sri-cambridge,fileio = "r";
+			sri-cambridge,devname = "de4bsw";
+		};
+
+		avgen@0x7f00a000 {
+			compatible = "sri-cambridge,avgen";
+			reg = <0x7f00a000 0x14>;
+			sri-cambridge,width = <4>;
+			sri-cambridge,fileio = "rw";
+			sri-cambridge,devname = "berirom";
+		};
+
+		avgen@0x7f00c000 {
+			compatible = "sri-cambridge,avgen";
+			reg = <0x7f00c000 0x8>;
+			sri-cambridge,width = <4>;
+			sri-cambridge,fileio = "rw";
+			sri-cambridge,devname = "de4tempfan";
+		};
+
+		avgen@0x7f100000 {
+			compatible = "sri-cambridge,avgen";
+			reg = <0x7f100000 0x40000>;
+			sri-cambridge,width = <4>;
+			sri-cambridge,fileio = "r";
+			sri-cambridge,devname = "usbmem";
+		};
+
+	};
+};
diff --git a/sys/boot/fdt/dts/db78460.dts b/sys/boot/fdt/dts/db78460.dts
index 30e795eea0f..1407f62daec 100644
--- a/sys/boot/fdt/dts/db78460.dts
+++ b/sys/boot/fdt/dts/db78460.dts
@@ -116,6 +116,7 @@
 			reg-shift = <2>;
 			current-speed = <115200>;
 			clock-frequency = <0>;
+			busy-detect = <1>;
 			interrupts = <41>;
 			interrupt-parent = <&MPIC>;
 		};
@@ -126,6 +127,7 @@
 			reg-shift = <2>;
 			current-speed = <115200>;
 			clock-frequency = <0>;
+			busy-detect = <1>;
 			interrupts = <42>;
 			interrupt-parent = <&MPIC>;
 		};
@@ -136,6 +138,7 @@
 			reg-shift = <2>;
 			current-speed = <115200>;
 			clock-frequency = <0>;
+			busy-detect = <1>;
 			interrupts = <43>;
 			interrupt-parent = <&MPIC>;
 		};
@@ -146,6 +149,7 @@
 			reg-shift = <2>;
 			current-speed = <115200>;
 			clock-frequency = <0>;
+			busy-detect = <1>;
 			interrupts = <44>;
 			interrupt-parent = <&MPIC>;
 		};
@@ -279,6 +283,13 @@
 				};
 			};
 		};
+
+		sata@A0000 {
+			compatible = "mrvl,sata";
+			reg = <0xA0000 0x6000>;
+			interrupts = <55>;
+			interrupt-parent = <&MPIC>;
+		};
 	};
 
 	pci0: pcie@d0040000 {
diff --git a/sys/boot/fdt/dts/digi-ccwmx53.dts b/sys/boot/fdt/dts/digi-ccwmx53.dts
index e71262a10e8..898ffbb55c7 100644
--- a/sys/boot/fdt/dts/digi-ccwmx53.dts
+++ b/sys/boot/fdt/dts/digi-ccwmx53.dts
@@ -70,9 +70,9 @@
 			};
 
 			/* UART1, console */
-			UART1: serial@53fbc000 {
+			console: serial@53fbc000 {
 				status = "okay";
-				clock-frequency = <3000000>; /* XXX */
+				clock-frequency = <0>; /* won't load w/o this */
 			};
 
 			clock@53fd4000 {
@@ -90,11 +90,21 @@
 			gpio@53f90000 {
 				status = "okay";
 			};
+			usb@53f80000 /* OTG */ {
+				status = "okay";
+			};
+			usb@53f80200 /* Host 1 */ {
+				status = "okay";
+			};
 			wdog@53f98000 {
 				status = "okay";
 			};
 		};
 		aips@60000000 {
+			ethernet@63fec000 {
+				status = "okay";
+				phy-mode = "rmii";
+			};
 			i2c@63fc4000 {
 				status = "okay";
 			};
@@ -111,13 +121,12 @@
 	};
 
 	aliases {
-		UART1 = &UART1;
 		SSI2 = &SSI2;
 	};
 
 	chosen {
 		bootargs = "-v";
-		stdin = "UART1";
-		stdout = "UART1";
+		stdin  = &console;
+		stdout = &console;
 	};
 };
diff --git a/sys/boot/fdt/dts/efikamx.dts b/sys/boot/fdt/dts/efikamx.dts
index 120d1f4ec1d..22b455b5a53 100644
--- a/sys/boot/fdt/dts/efikamx.dts
+++ b/sys/boot/fdt/dts/efikamx.dts
@@ -89,6 +89,12 @@
 			gpio@73f90000 {
 				status = "okay";
 			};
+			usb@73f80000 /* OTG */ {
+				status = "okay";
+			};
+			usb@73f80200 /* Host 1 */ {
+				status = "okay";
+			};
 			wdog@73f98000 {
 				status = "okay";
 			};
diff --git a/sys/boot/fdt/dts/imx51x.dtsi b/sys/boot/fdt/dts/imx51x.dtsi
index 19f281e0b63..cc06f0f355e 100644
--- a/sys/boot/fdt/dts/imx51x.dtsi
+++ b/sys/boot/fdt/dts/imx51x.dtsi
@@ -246,16 +246,48 @@
 				/* 7003C000 0x4000 SPBA */
 			};
 
-			/* 73F80000 0x4000 USBOH3 */
-			/* irq14 USBOH3 USB Host 1 */
-			/* irq16 USBOH3 USB Host 2 */
-			/* irq17 USBOH3 USB Host 3 */
-			/* irq18 USBOH3 USB OTG */
-			usb1: usb@73F80000 {
-				compatible = "fsl,usb-4core";
-				reg = <0x73f80000 0x4000>;
-				interrupt-parent = <&tzic>;
-				interrupts = <18 14 16 17>;
+			usbphy0: usbphy@0 {
+				compatible = "usb-nop-xceiv";
+				status = "okay";
+			};
+
+			usbotg: usb@73f80000 {
+				compatible = "fsl,imx51-usb", "fsl,imx27-usb";
+				reg = <0x73f80000 0x0200>;
+				interrupts = <18>;
+				fsl,usbmisc = <&usbmisc 0>;
+				fsl,usbphy = <&usbphy0>;
+				status = "disabled";
+			};
+
+			usbh1: usb@73f80200 {
+				compatible = "fsl,imx51-usb", "fsl,imx27-usb";
+				reg = <0x73f80200 0x0200>;
+				interrupts = <14>;
+				fsl,usbmisc = <&usbmisc 1>;
+				status = "disabled";
+			};
+
+			usbh2: usb@73f80400 {
+				compatible = "fsl,imx51-usb", "fsl,imx27-usb";
+				reg = <0x73f80400 0x0200>;
+				interrupts = <16>;
+				fsl,usbmisc = <&usbmisc 2>;
+				status = "disabled";
+			};
+
+			usbh3: usb@73f80600 {
+				compatible = "fsl,imx51-usb", "fsl,imx27-usb";
+				reg = <0x73f80600 0x0200>;
+				interrupts = <17>;
+				fsl,usbmisc = <&usbmisc 3>;
+				status = "disabled";
+			};
+
+			usbmisc: usbmisc@73f80800 {
+				#index-cells = <1>;
+				compatible = "fsl,imx51-usbmisc";
+				reg = <0x73f80800 0x200>;
 			};
 
 			/* 73F98000 0x4000 WDOG1 */
diff --git a/sys/boot/fdt/dts/imx53-qsb.dts b/sys/boot/fdt/dts/imx53-qsb.dts
new file mode 100644
index 00000000000..1184cb39e57
--- /dev/null
+++ b/sys/boot/fdt/dts/imx53-qsb.dts
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2012 The FreeBSD Foundation
+ * Copyright (c) 2013 Rui Paulo
+ * All rights reserved.
+ *
+ * This software was developed by Semihalf 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.
+ *
+ * Freescale i.MX53 Quick Start Board
+ * In u-boot, this board is known as "MX53LOCO" for some reason.
+ *
+ * $FreeBSD$
+ */
+
+/dts-v1/;
+/include/ "imx53x.dtsi"
+
+/ {
+        model = "Freescale i.MX53 Quick Start Board";
+        compatible = "fsl,imx53-qsb", "fsl,imx53";
+
+	memory {
+		/* RAM 512M */
+		reg = <0x70000000 0x20000000>;
+	};
+
+	localbus@18000000 {
+		ipu3@18000000 {
+			status = "okay";
+		};
+	};
+
+	soc@50000000 {
+		aips@50000000 {
+			spba@50000000 {
+				esdhc@50004000 {
+					clock-frequency = <216000000>;
+					status = "okay";
+				};
+				esdhc@50008000 {
+					clock-frequency = <216000000>;
+					status = "okay";
+				};
+				SSI2: ssi@50014000 {
+					status = "okay";
+				};
+			};
+			timer@53fa0000 {
+				status = "okay";
+			};
+
+			/* UART1, console */
+			console: serial@53fbc000 {
+				status = "okay";
+				clock-frequency = <0>; /* won't load w/o this */
+			};
+
+			clock@53fd4000 {
+				status = "okay";
+			};
+			gpio@53f84000 {
+				status = "okay";
+			};
+			gpio@53f88000 {
+				status = "okay";
+			};
+			gpio@53f8c000 {
+				status = "okay";
+			};
+			gpio@53f90000 {
+				status = "okay";
+			};
+			usb@53f80000 /* OTG */ {
+				status = "okay";
+			};
+			usb@53f80200 /* Host 1 */ {
+				status = "okay";
+			};
+			wdog@53f98000 {
+				status = "okay";
+			};
+		};
+		aips@60000000 {
+			ethernet@63fec000 {
+				status = "okay";
+				phy-mode = "rmii";
+			}
+			i2c@63fc4000 {
+				status = "okay";
+			};
+			i2c@63fc8000 {
+				status = "okay";
+			};
+			audmux@63fd4000 {
+				status = "okay";
+			};
+			ide@63fe0000 {
+				status = "okay";
+			};
+		};
+	};
+
+	aliases {
+		SSI2 = &SSI2;
+	};
+
+	chosen {
+		bootargs = "-v";
+		stdin = &console;
+		stdout = &console;
+	};
+};
diff --git a/sys/boot/fdt/dts/imx53x.dtsi b/sys/boot/fdt/dts/imx53x.dtsi
index f8675ee6fef..eafabcb5191 100644
--- a/sys/boot/fdt/dts/imx53x.dtsi
+++ b/sys/boot/fdt/dts/imx53x.dtsi
@@ -290,16 +290,50 @@
 				/* 5003C000 0x4000 SPBA */
 			};
 
-			/* 73F80000 0x4000 USBOH3 */
-			/* irq14 USBOH3 USB Host 1 */
-			/* irq16 USBOH3 USB Host 2 */
-			/* irq17 USBOH3 USB Host 3 */
-			/* irq18 USBOH3 USB OTG */
-			usb1: usb@53F80000 {
-				compatible = "fsl,usb-4core";
-				reg = <0x53f80000 0x4000>;
-				interrupt-parent = <&tzic>;
-				interrupts = <18 14 16 17>;
+			usbphy0: usbphy@0 {
+				compatible = "usb-nop-xceiv";
+				status = "okay";
+			};
+
+			usbphy1: usbphy@1 {
+				compatible = "usb-nop-xceiv";
+				status = "okay";
+			};
+
+			usbotg: usb@53f80000 {
+				compatible = "fsl,imx53-usb", "fsl,imx27-usb";
+				reg = <0x53f80000 0x0200>;
+				interrupts = <18>;
+				fsl,usbphy = <&usbphy0>;
+				status = "disabled";
+			};
+
+			usbh1: usb@53f80200 {
+				compatible = "fsl,imx53-usb", "fsl,imx27-usb";
+				reg = <0x53f80200 0x0200>;
+				interrupts = <14>;
+				fsl,usbphy = <&usbphy1>;
+				status = "disabled";
+			};
+
+			usbh2: usb@53f80400 {
+				compatible = "fsl,imx53-usb", "fsl,imx27-usb";
+				reg = <0x53f80400 0x0200>;
+				interrupts = <16>;
+				status = "disabled";
+			};
+
+			usbh3: usb@53f80600 {
+				compatible = "fsl,imx53-usb", "fsl,imx27-usb";
+				reg = <0x53f80600 0x0200>;
+				interrupts = <17>;
+				status = "disabled";
+			};
+
+			usbmisc: usbmisc@53f80800 {
+				#index-cells = <1>;
+				compatible = "fsl,imx53-usbmisc";
+				reg = <0x53f80800 0x200>;
 			};
 
 			/* 53F98000 0x4000 WDOG1 */
@@ -419,18 +453,6 @@
 				status = "disabled";
 			};
 
-
-
-			/* 53FC4000 0x4000 USBOH3 */
-			/* NOTYET
-			usb@53fc4000 {
-				compatible = "fsl,imx53-otg";
-				reg = <0x53fc4000 0x4000>;
-				interrupt-parent = <&tzic>;
-				interrupts = <>;
-				status = "disabled";
-			};
-			*/
 			/* 53FD0000 0x4000 SRC */
 			reset@53fd0000 {
 				compatible = "fsl,imx53-src";
diff --git a/sys/boot/fdt/dts/imx6.dtsi b/sys/boot/fdt/dts/imx6.dtsi
new file mode 100644
index 00000000000..a1aeaf2ae6d
--- /dev/null
+++ b/sys/boot/fdt/dts/imx6.dtsi
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2013 Ian Lepore
+ * Copyright (c) 2012 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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.
+ *
+ * Freescale i.MX6 Common Device Tree Source.
+ * There are enough differences between the Solo, Dual, Quad, and *-lite
+ * flavors of this SoC that eventually we will need a finer-grained breakdown
+ * of some of this stuff.  For now this file works for all of them.  I think.
+ *
+ * $FreeBSD$
+ */
+
+/ {
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		cpu@0 {
+			device_type = "cpu";
+			compatible = "ARM,MCIMX6";
+			reg = <0x0>;
+			d-cache-line-size = <32>;
+			i-cache-line-size = <32>;
+			d-cache-size = <0x8000>;
+			i-cache-size = <0x8000>;
+			/* TODO: describe L2 cache also */
+			timebase-frequency = <0>;
+			bus-frequency = <0>;
+			clock-frequency = <0>;
+		};
+	};
+
+	aliases {
+		soc = &SOC;
+	};
+
+	SOC: soc@00000000 {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <1>;
+		interrupt-parent = <&gic>;
+		ranges = <0x00000000 0x00000000 0x10000000>;
+
+		gic: generic-interrupt-controller@00a00100 {
+			compatible = "arm,gic";
+			interrupt-controller;
+			#interrupt-cells = <1>;
+			reg = <0x00a01000 0x00001000
+			       0x00a00100 0x00000100>;
+		};
+
+		l2-cache@00a02000 {
+			compatible = "arm,pl310-cache", "arm,pl310";
+			reg = <0xa02000 0x1000>;
+			interrupts = <124>;
+			cache-level = <0x2>;
+			interrupt-parent = < &gic >;
+		};
+
+		aips@02000000 { /* AIPS1 */
+			compatible = "fsl,aips-bus", "simple-bus";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			interrupt-parent = <&gic>;
+			reg = <0x02000000 0x00100000>;
+			ranges;
+
+			/* Required by many devices, so better to stay first */
+			clks: ccm@020c4000 {
+				compatible = "fsl,imx6q-ccm";
+				reg = <0x020c4000 0x4000>;
+				interrupts = <119 120>;
+			};
+
+			anatop: anatop@020c8000 {
+				compatible = "fsl,imx6q-anatop";
+				reg = <0x020c8000 0x1000>;
+			}
+
+			gpt: timer@02098000 {
+				compatible = "fsl,imx6q-gpt", "fsl,imx51-gpt";
+				reg = <0x02098000 0x4000>;
+				interrupt-parent = <&gic>; interrupts = <87>;
+			};
+
+//			iomux@73fa8000 {
+//				compatible = "fsl,imx51-iomux";
+//				reg = <0x73fa8000 0x4000>;
+//				interrupt-parent = <&gic>; interrupts = <7>;
+//				status = "disabled";
+//			};
+
+//			/*
+//			 * GPIO modules moved up - to have it attached for
+//			 * drivers which rely on GPIO
+//			 */
+//			gpio1: gpio@0209C000 {
+//				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
+//				reg = <0x0209C000 0x4000>;
+//				interrupt-parent = <&gic>;
+//				interrupts = <50 51 42 43 44 45 46 47 48 49>;
+//				/* TODO: use <> also */
+//				gpio-controller;
+//				#gpio-cells = <2>;
+//				interrupt-controller;
+//				#interrupt-cells = <1>;
+//				status = "disabled";
+//			};
+//
+//			gpio2: gpio@020A0000 {
+//				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
+//				reg = <0x020A0000 0x4000>;
+//				interrupt-parent = <&gic>;
+//				interrupts = <52 53>;
+//				gpio-controller;
+//				#gpio-cells = <2>;
+//				interrupt-controller;
+//				#interrupt-cells = <1>;
+//				status = "disabled";
+//			};
+//
+//			gpio3: gpio@020A4000 {
+//				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
+//				reg = <0x020A4000 0x4000>;
+//				interrupt-parent = <&gic>;
+//				interrupts = <54 55>;
+//				gpio-controller;
+//				#gpio-cells = <2>;
+//				interrupt-controller;
+//				#interrupt-cells = <1>;
+//				status = "disabled";
+//			};
+//
+//			gpio4: gpio@020A8000 {
+//				compatible = "fsl,imx51-gpio", "fsl,imx31-gpio";
+//				reg = <0x020A8000 0x4000>;
+//				interrupt-parent = <&gic>;
+//				interrupts = <56 57>;
+//				gpio-controller;
+//				#gpio-cells = <2>;
+//				interrupt-controller;
+//				#interrupt-cells = <1>;
+//				status = "disabled";
+//			};
+
+			uart1: serial@02020000 {
+				compatible = "fsl,imx6q-uart";
+				reg = <0x02020000 0x4000>;
+				interrupt-parent = <&gic>; 
+				interrupts = <58>;
+				clock-frequency = <80000000>;
+				status = "disabled";
+			};
+
+			uart2: serial@021e8000 {
+				compatible = "fsl,imx6q-uart";
+				reg = <0x021e8000 0x4000>;
+				interrupt-parent = <&gic>; 
+				interrupts = <59>;
+				clock-frequency = <80000000>;
+				status = "disabled";
+			};
+
+			uart3: serial@021ec000 {
+				compatible = "fsl,imx6q-uart";
+				reg = <0x021ec000 0x4000>;
+				interrupt-parent = <&gic>; 
+				interrupts = <60>;
+				clock-frequency = <80000000>;
+				status = "disabled";
+			};
+
+			uart4: serial@021f0000 {
+				compatible = "fsl,imx6q-uart";
+				reg = <0x021f0000 0x4000>;
+				interrupt-parent = <&gic>; 
+				interrupts = <61>;
+				clock-frequency = <80000000>;
+				status = "disabled";
+			};
+
+			uart5: serial@021f4000 {
+				compatible = "fsl,imx6q-uart";
+				reg = <0x021f4000 0x4000>;
+				interrupt-parent = <&gic>; 
+				interrupts = <62>;
+				clock-frequency = <80000000>;
+				status = "disabled";
+			};
+
+			usbphy1: usbphy@020c9000 {
+				compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
+				reg = <0x020c9000 0x1000>;
+				interrupts = <44>;
+				status = "disabled";
+			};
+			
+			usbphy2: usbphy@020ca000 {
+				compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
+				reg = <0x020ca000 0x1000>;
+				interrupts = <45>;
+				status = "disabled";
+			};
+			
+		};
+
+		aips@02100000 { /* AIPS2 */
+			compatible = "fsl,aips-bus", "simple-bus";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			interrupt-parent = <&gic>;
+			reg = <0x02100000 0x00100000>;
+			ranges;
+
+			fec1: ethernet@02188000 {
+				compatible = "fsl,imx6q-fec";
+				reg = <0x02188000 0x4000>;
+				interrupts = <150 151>;
+				status = "disabled";
+			};
+			
+			usbotg1: usb@02184000 {
+				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+				reg = <0x02184000 0x200>;
+				interrupts = <75>;
+				fsl,usbphy = <&usbphy1>;
+				fsl,usbmisc = <&usbmisc 0>;
+				status = "disabled";
+			};
+			
+			usbh1: usb@02184200 {
+				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+				reg = <0x02184200 0x200>;
+				interrupts = <72>;
+				fsl,usbphy = <&usbphy2>;
+				fsl,usbmisc = <&usbmisc 1>;
+				status = "disabled";
+			};
+			
+			usbh2: usb@02184400 {
+				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+				reg = <0x02184400 0x200>;
+				interrupts = <73>;
+				fsl,usbmisc = <&usbmisc 2>;
+				status = "disabled";
+			};
+			
+			usbh3: usb@02184600 {
+				compatible = "fsl,imx6q-usb", "fsl,imx27-usb";
+				reg = <0x02184600 0x200>;
+				interrupts = <74>;
+				fsl,usbmisc = <&usbmisc 3>;
+				status = "disabled";
+			};
+			
+			usbmisc: usbmisc@02184800 {
+				#index-cells = <1>;
+				compatible = "fsl,imx6q-usbmisc";
+				reg = <0x02184800 0x200>;
+				// Not disabled on purpose.
+			};
+
+			usdhc1: usdhc@02190000 {
+				compatible = "fsl,imx6q-usdhc";
+				reg = <0x02190000 0x4000>;
+				interrupt-parent = <&gic>;
+				interrupts = <54>;
+				bus-width = <0x4>;
+				status ="disabled";
+			};
+
+			usdhc2: usdhc@02194000 {
+				compatible = "fsl,imx6q-usdhc";
+				reg = <0x02194000 0x4000>;
+				interrupt-parent = <&gic>;
+				interrupts = <55>;
+				bus-width = <0x4>;
+				status ="disabled";
+			};
+
+			usdhc3: usdhc@02198000 {
+				compatible = "fsl,imx6q-usdhc";
+				reg = <0x02198000 0x4000>;
+				interrupt-parent = <&gic>;
+				interrupts = <56>;
+				bus-width = <0x4>;
+				status ="disabled";
+			};
+
+			usdhc4: usdhc@0219c000 {
+				compatible = "fsl,imx6q-usdhc";
+				reg = <0x0219c000 0x4000>;
+				interrupt-parent = <&gic>;
+				interrupts = <57>;
+				bus-width = <0x4>;
+				status ="disabled";
+			};
+		};
+	};
+};
diff --git a/sys/boot/fdt/dts/rk3188-radxa.dts b/sys/boot/fdt/dts/rk3188-radxa.dts
new file mode 100644
index 00000000000..7fc8ec53254
--- /dev/null
+++ b/sys/boot/fdt/dts/rk3188-radxa.dts
@@ -0,0 +1,59 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.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.
+ *
+ * $FreeBSD$
+ */
+
+/dts-v1/;
+
+/include/ "rk3188.dtsi"
+
+/ {
+	model = "Radxa RadxaRock";
+
+	memory {
+		device_type = "memory";
+		reg = < 0x60000000 0x80000000 >;	/* 2GB RAM */
+	};
+
+	aliases {
+		soc = &SOC;
+	};
+
+	SOC: rk3188 {
+
+		uart2: serial@20064000 {
+			status = "okay";
+		};
+
+	};
+
+	chosen {
+		bootargs = "-v";
+		stdin = &uart2;
+		stdout = &uart2;
+	};
+};
+
diff --git a/sys/boot/fdt/dts/rk3188.dtsi b/sys/boot/fdt/dts/rk3188.dtsi
new file mode 100644
index 00000000000..ca04159464d
--- /dev/null
+++ b/sys/boot/fdt/dts/rk3188.dtsi
@@ -0,0 +1,253 @@
+/*-
+ * Copyright (c) 2013 Ganbold Tsagaankhuu <ganbold@gmail.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.
+ *
+ * $FreeBSD$
+ */
+
+/ {
+	compatible = "rockchip,rk3188";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	aliases {
+		soc = &SOC;
+	};
+
+	SOC: rk3188 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+		bus-frequency = <0>;
+
+		GIC: interrupt-controller@1013d000 {
+			compatible = "arm,gic";
+			reg =	<0x1013d000 0x1000>,	/* Distributor Registers */
+				<0x1013c100 0x0100>;	/* CPU Interface Registers */
+			interrupt-controller;
+			#interrupt-cells = <1>;
+		};
+
+		pmu@20004000 {
+			compatible = "rockchip,rk30xx-pmu";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			reg = <0x20004000 0x100>;
+		};
+
+		grf@20008000 {
+			compatible = "rockchip,rk30xx-grf";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			reg = < 0x20008000 0x2000 >;
+		};
+
+		mp_tmr@1013c600 {
+			compatible = "arm,mpcore-timers";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			clock-frequency = < 148500000 >;
+			reg =	<0x1013c200 0x100>,	/* Global Timer Regs */
+				<0x1013c600 0x20>;	/* Private Timer Regs */
+			interrupts = < 27 29 >;
+			interrupt-parent = <&GIC>;
+		};
+
+		timer@20038000 {
+			compatible = "rockchip,rk30xx-timer";
+			compatible = "rockchip,rk3188-dw-apb-timer-osc";
+			reg = <0x20038000 0x20>;
+			interrupts = <76>;
+			clock-frequency = <24000000>;
+			status = "disabled";
+		};
+
+		timer@20038020 {
+			compatible = "rockchip,rk30xx-timer";
+			reg = <0x20038020 0x20>;
+			interrupts = <77>;
+			clock-frequency = <24000000>;
+			status = "disabled";
+		};
+
+		timer@20038060 {
+			compatible = "rockchip,rk30xx-timer";
+			reg = <0x20038060 0x20>;
+			interrupts = <91>;
+			clock-frequency = <24000000>;
+			status = "disabled";
+		};
+
+		timer@20038080 {
+			compatible = "rockchip,rk30xx-timer";
+			reg = <0x20038080 0x20>;
+			interrupts = <92>;
+			clock-frequency = <24000000>;
+			status = "disabled";
+		};
+
+		timer@200380a0 {
+			compatible = "rockchip,rk30xx-timer";
+			reg = <0x200380a0 0x20>;
+			interrupts = <96>;
+			clock-frequency = <24000000>;
+			status = "disabled";
+		};
+
+		watchdog@2004c000 {
+			compatible = "rockchip,rk30xx-wdt";
+			reg = <0x2004c000 0x100>;
+			clock-frequency = < 66000000 >;
+		};
+
+		gpio0: gpio@2000a000 {
+			compatible = "rockchip,rk30xx-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x2000a000 0x100>;
+			interrupts = <86>;
+			interrupt-parent = <&GIC>;
+		};
+
+		gpio1: gpio@2003c000 {
+			compatible = "rockchip,rk30xx-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x2003c000 0x100>;
+			interrupts = <87>;
+			interrupt-parent = <&GIC>;
+		};
+
+		gpio2: gpio@2003e000 {
+			compatible = "rockchip,rk30xx-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x2003e000 0x100>;
+			interrupts = <88>;
+			interrupt-parent = <&GIC>;
+		};
+
+		gpio3: gpio@20080000 {
+			compatible = "rockchip,rk30xx-gpio";
+			gpio-controller;
+			#gpio-cells = <2>;
+			reg = <0x20080000 0x100>;
+			interrupts = <89>;
+			interrupt-parent = <&GIC>;
+		};
+
+		usb0: usb@10180000 {
+			compatible = "synopsys,designware-hs-otg2";
+			reg = <0x10180000 0x40000>;
+			interrupts = <48>;
+			interrupt-parent = <&GIC>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		usb1: usb@101c0000 {
+			compatible = "synopsys,designware-hs-otg2";
+			reg = <0x101c0000 0x40000>;
+			interrupts = < 49 >;
+			interrupt-parent = <&GIC>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			gpios = <&gpio0 3 2 2>;
+		};
+
+		uart0: serial@10124000 {
+			compatible = "ns16550";
+			reg = <0x10124000 0x400>;
+			reg-shift = <2>;
+			interrupts = <66>;
+			interrupt-parent = <&GIC>;
+			current-speed = <115200>;
+			clock-frequency = < 24000000 >;
+			busy-detect = <1>;
+			broken-txfifo = <1>;
+			status = "disabled";
+		};
+
+		uart1: serial@10126000 {
+			compatible = "ns16550";
+			reg = <0x10126000 0x400>;
+			reg-shift = <2>;
+			interrupts = <67>;
+			interrupt-parent = <&GIC>;
+			current-speed = <115200>;
+			clock-frequency = < 24000000 >;
+			busy-detect = <1>;
+			broken-txfifo = <1>;
+			status = "disabled";
+		};
+
+		uart2: serial@20064000 {
+			compatible = "ns16550";
+			reg = <0x20064000 0x400>;
+			reg-shift = <2>;
+			interrupts = <68>;
+			interrupt-parent = <&GIC>;
+			current-speed = <115200>;
+			clock-frequency = < 24000000 >;
+			busy-detect = <1>;
+			broken-txfifo = <1>;
+			status = "disabled";
+		};
+
+		uart3: serial@20068000 {
+			compatible = "ns16550";
+			reg = <0x20068000 0x400>;
+			reg-shift = <2>;
+			interrupts = <69>;
+			interrupt-parent = <&GIC>;
+			current-speed = <115200>;
+			clock-frequency = < 24000000 >;
+			busy-detect = <1>;
+			broken-txfifo = <1>;
+			status = "disabled";
+		};
+
+		mmc@10214000 {
+			compatible = "rockchip,rk30xx-mmc";
+			reg = <0x10214000 0x1000>;
+			interrupts = <55>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			clock-frequency = <24000000>;	/* TODO: verify freq */
+			status = "disabled";
+		};
+
+		mmc@10218000 {
+			compatible = "rockchip,rk30xx-mmc";
+			reg = <0x10218000 0x1000>;
+			interrupts = <56>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			clock-frequency = <24000000>;	/* TODO: verify freq */
+			status = "disabled";
+		};
+	};
+};
+
diff --git a/sys/boot/fdt/dts/rpi.dts b/sys/boot/fdt/dts/rpi.dts
index bdcee00dcb5..318591a571f 100644
--- a/sys/boot/fdt/dts/rpi.dts
+++ b/sys/boot/fdt/dts/rpi.dts
@@ -316,7 +316,7 @@
 
 		ok {
 			label = "ok";
-			gpios = <&gpio 16 1>;
+			gpios = <&gpio 16 2 0>;
 
 			/* Don't change this - it configures
 			 * how the led driver determines if
diff --git a/sys/boot/fdt/dts/vybrid-cosmic.dts b/sys/boot/fdt/dts/vybrid-cosmic.dts
new file mode 100644
index 00000000000..79b49f7e61b
--- /dev/null
+++ b/sys/boot/fdt/dts/vybrid-cosmic.dts
@@ -0,0 +1,56 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ *
+ * $FreeBSD$
+ */
+
+/dts-v1/;
+
+/include/ "vybrid.dtsi"
+
+/ {
+	model = "Cosmic Board";
+
+	memory {
+		device_type = "memory";
+		reg = < 0x80000000 0x10000000 >;	/* 256MB RAM */
+	};
+
+	SOC: vybrid {
+		serial0: serial@40027000 {
+			status = "disabled";
+		};
+
+		fec0: ethernet@400D0000 {
+			status = "disabled";
+		};
+	};
+
+	chosen {
+		bootargs = "-v";
+		stdin = "serial1";
+		stdout = "serial1";
+	};
+};
diff --git a/sys/boot/fdt/dts/vybrid.dtsi b/sys/boot/fdt/dts/vybrid.dtsi
new file mode 100644
index 00000000000..004b1a1c322
--- /dev/null
+++ b/sys/boot/fdt/dts/vybrid.dtsi
@@ -0,0 +1,223 @@
+/*-
+ * Copyright (c) 2013 Ruslan Bukin <br@bsdpad.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.
+ *
+ * $FreeBSD$
+ */
+
+/ {
+	model = "Freescale Vybrid Family";
+	compatible = "freescale,vybrid", "fsl,vf";
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	interrupt-parent = <&GIC>;
+
+	aliases {
+		soc = &SOC;
+		serial0 = &serial0;
+		serial1 = &serial1;
+		src = &SRC;
+	};
+
+	SOC: vybrid {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "simple-bus";
+		ranges;
+		bus-frequency = <0>;
+
+		SRC: src@4006E000 {
+			compatible = "fsl,mvf600-src";
+			reg = <0x4006E000 0x100>;
+		};
+
+		mscm@40001000 {
+			compatible = "fsl,mvf600-mscm";
+			reg = <0x40001000 0x1000>;
+		};
+
+		GIC: interrupt-controller@01c81000 {
+			compatible = "arm,gic";
+			reg = 	<0x40003000 0x1000>,	/* Distributor Registers */
+				<0x40002100 0x100>;	/* CPU Interface Registers */
+			interrupt-controller;
+			#interrupt-cells = <1>;
+		};
+
+		anadig@40050000 {
+			compatible = "fsl,mvf600-anadig";
+			reg = <0x40050000 0x300>;
+		};
+
+		ccm@4006b000 {
+			compatible = "fsl,mvf600-ccm";
+			reg = <0x4006b000 0x1000>;
+		};
+
+		mp_tmr@40002100 {
+			compatible = "arm,mpcore-timers";
+			clock-frequency = <133000000>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = < 0x40002200 0x100 >, /* Global Timer Registers */
+			      < 0x40002600 0x100 >; /* Private Timer Registers */
+			interrupts = < 27 29 >;
+			interrupt-parent = < &GIC >;
+		};
+
+		pit@40037000 {
+			compatible = "fsl,mvf600-pit";
+			reg = <0x40037000 0x1000>;
+			interrupts = < 71 >;
+			interrupt-parent = <&GIC>;
+			clock-frequency = < 24000000 >;
+		};
+
+		lptmr@40040000 {
+			compatible = "fsl,mvf600-lptmr";
+			reg = <0x40040000 0x1000>;
+			interrupts = < 72 >;
+			interrupt-parent = <&GIC>;
+			clock-frequency = < 24000000 >;
+		};
+
+		iomuxc@40048000 {
+			compatible = "fsl,mvf600-iomuxc";
+			reg = <0x40048000 0x1000>;
+		};
+
+		gpio@400FF000 {
+			compatible = "fsl,mvf600-gpio";
+			reg = <0x400FF000 0x200>;
+			#gpio-cells = <3>;
+			gpio-controller;
+			interrupts = < 139 140 141 142 143 >;
+			interrupt-parent = <&GIC>;
+
+		};
+
+		nand@400E0000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "fsl,mvf600-nand";
+			reg = <0x400E0000 0x10000>;
+			interrupts = < 115 >;
+			interrupt-parent = <&GIC>;
+
+			partition@40000 {
+				reg = <0x40000 0x200000>; /* 2MB */
+				label =	"u-boot";
+				read-only;
+			};
+
+			partition@240000 {
+				reg = <0x240000 0x200000>; /* 2MB */
+				label =	"test";
+			};
+
+			partition@440000 {
+				reg = <0x440000 0xa00000>; /* 10MB */
+				label =	"kernel";
+			};
+
+			partition@e40000 {
+				reg = <0xe40000 0x1e000000>; /* 480MB */
+				label =	"root";
+			};
+
+		};
+
+		sdhci0: sdhci@400B1000 {
+			compatible = "fsl,mvf600-sdhci";
+			reg = <0x400B1000 0x1000>;
+			interrupts = < 59 >;
+			interrupt-parent = <&GIC>;
+			clock-frequency = <50000000>;
+		};
+
+		sdhci1: sdhci@400B2000 {
+			compatible = "fsl,mvf600-sdhci";
+			reg = <0x400B2000 0x1000>;
+			interrupts = < 60 >;
+			interrupt-parent = <&GIC>;
+			clock-frequency = <50000000>;
+		};
+
+		serial0: serial@40027000 {
+			compatible = "fsl,mvf600-uart";
+			reg = <0x40027000 0x1000>;
+			interrupts = <93>;
+			interrupt-parent = <&GIC>;
+			current-speed = <115200>;
+			clock-frequency = < 24000000 >;
+		};
+
+		serial1: serial@40028000 {
+			compatible = "fsl,mvf600-uart";
+			reg = <0x40028000 0x1000>;
+			interrupts = <94>;
+			interrupt-parent = <&GIC>;
+			current-speed = <115200>;
+			clock-frequency = < 24000000 >;
+		};
+
+		usb@40034000 {
+			compatible = "fsl,mvf600-usb-ehci", "usb-ehci";
+			reg = < 0x40034000 0x1000 >, /* ehci */
+			      < 0x40035000 0x1000 >, /* usbc */
+			      < 0x40050800 0x100 >; /* phy */
+			interrupts = < 107 >;
+			interrupt-parent = <&GIC>;
+		};
+
+		usb@400b4000 {
+			compatible = "fsl,mvf600-usb-ehci", "usb-ehci";
+			reg = < 0x400b4000 0x1000 >, /* ehci */
+			      < 0x400b5000 0x1000 >, /* usbc */
+			      < 0x40050C00 0x100 >; /* phy */
+			interrupts = < 108 >;
+			interrupt-parent = <&GIC>;
+		};
+
+		fec0: ethernet@400D0000 {
+			compatible = "fsl,mvf600-fec";
+			reg = <0x400D0000 0x1000>;
+			interrupts = < 110 >;
+			interrupt-parent = <&GIC>;
+			phy-mode = "rmii";
+			phy-disable-preamble;
+		};
+
+		fec1: ethernet@400D1000 {
+			compatible = "fsl,mvf600-fec";
+			reg = <0x400D1000 0x1000>;
+			interrupts = < 111 >;
+			interrupt-parent = <&GIC>;
+			phy-mode = "rmii";
+			phy-disable-preamble;
+		};
+
+	};
+};
diff --git a/sys/boot/fdt/dts/wandboard-dual.dts b/sys/boot/fdt/dts/wandboard-dual.dts
new file mode 100644
index 00000000000..3ffdd69a85b
--- /dev/null
+++ b/sys/boot/fdt/dts/wandboard-dual.dts
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2013 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.
+ *
+ * Wandboard Dual.
+ *
+ * $FreeBSD$
+ */
+
+/dts-v1/;
+/include/ "imx6.dtsi"
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	model = "Wandboard Dual";
+	compatible = "wand,imx6d-wandboard", "fsl,imx6d";
+
+	memory {
+		reg = <0x10000000 0x40000000>; /* RAM 1GB */
+	};
+
+	SOC: soc@00000000 {
+		aips@02000000 { /* AIPS1 */
+//			iomux@73fa8000		{ status = "disabled"; };
+//			gpio@0209C000		{ status = "disabled"; };
+//			gpio@020A0000		{ status = "disabled"; };
+//			gpio@020A4000		{ status = "disabled"; };
+//			gpio@020A8000		{ status = "disabled"; };
+			console:serial@02020000 { status = "okay"; };
+			serial@021e8000		{ status = "disabled"; };
+			serial@021ec000		{ status = "disabled"; };
+			serial@021f0000		{ status = "disabled"; };
+			serial@021f4000		{ status = "disabled"; };
+			usbphy@020c9000		{ status = "okay"; };
+			usbphy@020ca000		{ status = "okay"; };
+		};
+		aips@02100000 { /* AIPS2 */
+			ethernet@02188000	{ 
+				status = "okay";
+				phy-mode = "rgmii";
+				phy-disable-preamble;
+			};
+			usb@02184000		{ status = "okay"; };
+			usb@02184200		{ status = "okay"; };
+			usb@02184400		{ status = "disabled"; };
+			usb@02184600		{ status = "disabled"; };
+			usdhc@02190000		{ status = "disabled"; };
+			usdhc@02194000		{ status = "okay"; };
+			usdhc@02198000		{ status = "okay"; };
+			usdhc@0219c000		{ status = "disabled"; };
+		};
+	};
+
+	chosen {
+		stdin = &console;
+		stdout = &console;
+	};
+};
diff --git a/sys/boot/fdt/dts/wandboard-quad.dts b/sys/boot/fdt/dts/wandboard-quad.dts
new file mode 100644
index 00000000000..9b447ac437e
--- /dev/null
+++ b/sys/boot/fdt/dts/wandboard-quad.dts
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2013 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.
+ *
+ * Wandboard Quad.
+ *
+ * $FreeBSD$
+ */
+
+/dts-v1/;
+/include/ "imx6.dtsi"
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	model = "Wandboard Quad";
+	compatible = "wand,imx6q-wandboard", "fsl,imx6q";
+
+	memory {
+		reg = <0x10000000 0x80000000>; /* RAM 2GB */
+	};
+
+	SOC: soc@00000000 {
+		aips@02000000 { /* AIPS1 */
+//			iomux@73fa8000		{ status = "disabled"; };
+//			gpio@0209C000		{ status = "disabled"; };
+//			gpio@020A0000		{ status = "disabled"; };
+//			gpio@020A4000		{ status = "disabled"; };
+//			gpio@020A8000		{ status = "disabled"; };
+			console:serial@02020000 { status = "okay"; };
+			serial@021e8000		{ status = "disabled"; };
+			serial@021ec000		{ status = "disabled"; };
+			serial@021f0000		{ status = "disabled"; };
+			serial@021f4000		{ status = "disabled"; };
+			usbphy@020c9000		{ status = "okay"; };
+			usbphy@020ca000		{ status = "okay"; };
+		};
+		aips@02100000 { /* AIPS2 */
+			ethernet@02188000	{ 
+				status = "okay";
+				phy-mode = "rgmii";
+				phy-disable-preamble;
+			};
+			usb@02184000		{ status = "okay"; };
+			usb@02184200		{ status = "okay"; };
+			usb@02184400		{ status = "disabled"; };
+			usb@02184600		{ status = "disabled"; };
+			usdhc@02190000		{ status = "disabled"; };
+			usdhc@02194000		{ status = "okay"; };
+			usdhc@02198000		{ status = "okay"; };
+			usdhc@0219c000		{ status = "disabled"; };
+		};
+	};
+
+	chosen {
+		stdin = &console;
+		stdout = &console;
+	};
+};
diff --git a/sys/boot/fdt/dts/wandboard-solo.dts b/sys/boot/fdt/dts/wandboard-solo.dts
new file mode 100644
index 00000000000..21e1ad8a993
--- /dev/null
+++ b/sys/boot/fdt/dts/wandboard-solo.dts
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2013 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.
+ *
+ * Wandboard Solo.
+ *
+ * $FreeBSD$
+ */
+
+/dts-v1/;
+/include/ "imx6.dtsi"
+
+/ {
+	#address-cells = <1>;
+	#size-cells = <1>;
+
+	model = "Wandboard Solo";
+	compatible = "wand,imx6s-wandboard", "fsl,imx6s";
+
+	memory {
+		reg = <0x10000000 0x20000000>; /* RAM 512M */
+	};
+
+	SOC: soc@00000000 {
+		aips@02000000 { /* AIPS1 */
+//			iomux@73fa8000		{ status = "disabled"; };
+//			gpio@0209C000		{ status = "disabled"; };
+//			gpio@020A0000		{ status = "disabled"; };
+//			gpio@020A4000		{ status = "disabled"; };
+//			gpio@020A8000		{ status = "disabled"; };
+			console:serial@02020000 { status = "okay"; };
+			serial@021e8000		{ status = "disabled"; };
+			serial@021ec000		{ status = "disabled"; };
+			serial@021f0000		{ status = "disabled"; };
+			serial@021f4000		{ status = "disabled"; };
+			usbphy@020c9000		{ status = "okay"; };
+			usbphy@020ca000		{ status = "okay"; };
+		};
+		aips@02100000 { /* AIPS2 */
+			ethernet@02188000	{ 
+				status = "okay";
+				phy-mode = "rgmii";
+				phy-disable-preamble;
+			};
+			usb@02184000		{ status = "okay"; };
+			usb@02184200		{ status = "okay"; };
+			usb@02184400		{ status = "disabled"; };
+			usb@02184600		{ status = "disabled"; };
+			usdhc@02190000		{ status = "disabled"; };
+			usdhc@02194000		{ status = "okay"; };
+			usdhc@02198000		{ status = "okay"; };
+			usdhc@0219c000		{ status = "disabled"; };
+		};
+	};
+
+	chosen {
+		stdin = &console;
+		stdout = &console;
+	};
+};
diff --git a/sys/boot/forth/beastie.4th b/sys/boot/forth/beastie.4th
index 240730cb489..7a2cbb094b3 100644
--- a/sys/boot/forth/beastie.4th
+++ b/sys/boot/forth/beastie.4th
@@ -28,7 +28,7 @@
 
 marker task-beastie.4th
 
-include /boot/delay.4th
+only forth definitions also support-functions
 
 variable logoX
 variable logoY
@@ -202,56 +202,26 @@ variable logoY
 		drop
 	then
 
-	s" loader_logo" getenv dup -1 = if
-		logoX @ logoY @
+	s" loader_logo" getenv dup -1 <> if
+		dup 5 + allocate if ENOMEM throw then
+		0 2swap strcat s" -logo" strcat
+		over -rot ( a-addr/u -- a-addr a-addr/u )
+		sfind     ( a-addr a-addr/u -- a-addr xt bool )
+		rot       ( a-addr xt bool -- xt bool a-addr )
+		free      ( xt bool a-addr -- xt bool ior )
+		if EFREE throw then
+	else
+		0 ( cruft -- cruft bool ) \ load the default below
+	then
+	0= if
+		drop ( cruft -- )
 		loader_color? if
-			orb-logo
+			['] orb-logo
 		else
-			orbbw-logo
+			['] orbbw-logo
 		then
-		drop exit
 	then
-
-	2dup s" beastie" compare-insensitive 0= if
-		logoX @ logoY @ beastie-logo
-		2drop exit
-	then
-	2dup s" beastiebw" compare-insensitive 0= if
-		logoX @ logoY @ beastiebw-logo
-		2drop exit
-	then
-	2dup s" fbsdbw" compare-insensitive 0= if
-		logoX @ logoY @ fbsdbw-logo
-		2drop exit
-	then
-	2dup s" orb" compare-insensitive 0= if
-		logoX @ logoY @ orb-logo
-		2drop exit
-	then
-	2dup s" orbbw" compare-insensitive 0= if
-		logoX @ logoY @ orbbw-logo
-		2drop exit
-	then
-	2dup s" tribute" compare-insensitive 0= if
-		logoX @ logoY @
-		s" tribute-logo" sfind if
-			execute
-		else
-			drop orb-logo
-		then
-		2drop exit
-	then
-	2dup s" tributebw" compare-insensitive 0= if
-		logoX @ logoY @
-		s" tributebw-logo" sfind if
-			execute
-		else
-			drop orbbw-logo
-		then
-		2drop exit
-	then
-
-	2drop
+	logoX @ logoY @ rot execute
 ;
 
 : clear-beastie ( -- ) \ clears beastie from the screen
@@ -275,7 +245,11 @@ variable logoY
 	s" beastie_disable" getenv
 	dup -1 <> if
 		s" YES" compare-insensitive 0= if
-			exit
+			any_conf_read? if
+				load_kernel
+				load_modules
+			then
+			exit \ to autoboot (default)
 		then
 	else
 		drop
@@ -292,3 +266,5 @@ variable logoY
 		delay_execute
 	then
 ;
+
+only forth also
diff --git a/sys/boot/forth/loader.4th b/sys/boot/forth/loader.4th
index c701b3c0829..55778ff4b37 100644
--- a/sys/boot/forth/loader.4th
+++ b/sys/boot/forth/loader.4th
@@ -41,9 +41,18 @@ s" arch-i386" environment? [if] [if]
 
 include /boot/support.4th
 include /boot/color.4th
+include /boot/delay.4th
 
 only forth also support-functions also builtins definitions
 
+: bootmsg ( -- )
+  loader_color? if
+    ." Booting..." cr
+  else
+    ." Booting..." cr
+  then
+;
+
 : try-menu-unset
   \ menu-unset may not be present
   s" beastie_disable" getenv
@@ -71,12 +80,6 @@ only forth also support-functions also builtins definitions
 : boot
   0= if ( interpreted ) get_arguments then
 
-  loader_color? if
-    ." Booting..." cr
-  else
-    ." Booting..." cr
-  then
-
   \ Unload only if a path was passed
   dup if
     >r over r> swap
@@ -85,25 +88,25 @@ only forth also support-functions also builtins definitions
     else
       s" kernelname" getenv? if ( a kernel has been loaded )
         try-menu-unset
-        1 boot exit
+        bootmsg 1 boot exit
       then
       load_kernel_and_modules
       ?dup if exit then
       try-menu-unset
-      0 1 boot exit
+      bootmsg 0 1 boot exit
     then
   else
     s" kernelname" getenv? if ( a kernel has been loaded )
       try-menu-unset
-      1 boot exit
+      bootmsg 1 boot exit
     then
     load_kernel_and_modules
     ?dup if exit then
     try-menu-unset
-    0 1 boot exit
+    bootmsg 0 1 boot exit
   then
   load_kernel_and_modules
-  ?dup 0= if 0 1 boot then
+  ?dup 0= if bootmsg 0 1 boot then
 ;
 
 \ ***** boot-conf
@@ -129,8 +132,8 @@ include /boot/check-password.4th
 \ ***** start
 \
 \       Initializes support.4th global variables, sets loader_conf_files,
-\       process conf files, and, if any one such file was succesfully
-\       read to the end, load kernel and modules.
+\       processes conf files, and, if any one such file was succesfully
+\       read to the end, loads kernel and modules.
 
 : start  ( -- ) ( throws: abort & user-defined )
   s" /boot/defaults/loader.conf" initialize
@@ -139,8 +142,17 @@ include /boot/check-password.4th
   \ Will *NOT* try to load kernel and modules if no configuration file
   \ was succesfully loaded!
   any_conf_read? if
-    load_kernel
-    load_modules
+    s" loader_delay" getenv -1 = if
+      load_kernel
+      load_modules
+    else
+      drop
+      ." Loading Kernel and Modules (Ctrl-C to Abort)" cr
+      s" also support-functions" evaluate
+      s" set delay_command='load_kernel load_modules'" evaluate
+      s" set delay_showdots" evaluate
+      delay_execute
+    then
   then
 ;
 
@@ -221,7 +233,16 @@ include /boot/check-password.4th
   s" disable-module" s" disable loading of a module" .?
   s" toggle-module" s" toggle loading of a module" .?
   s" show-module" s" show module load data" .?
+  s" try-include" s" try to load/interpret files" .?
 ;
 
+: try-include ( -- ) \ see loader.4th(8)
+  ['] include ( -- xt ) \ get the execution token of `include'
+  catch ( xt -- exception# | 0 ) if \ failed
+    LF parse ( c -- s-addr/u ) 2drop \ advance >in to EOL (drop data)
+    \ ... prevents words unused by `include' from being interpreted
+  then
+; immediate \ interpret immediately for access to `source' (aka tib)
+
 only forth also
 
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 612036455aa..b689077058d 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 30, 2004
+.Dd November 13, 2013
 .Dt LOADER.4TH 8
 .Os
 .Sh NAME
@@ -94,31 +94,35 @@ Reads
 .Pa /boot/defaults/loader.conf ,
 all other
 .Xr loader.conf 5
-files specified in it, and then proceeds to boot as specified in them.
-This
+files specified in it, then loads the desired kernel and modules
+.Pq if not already loaded .
+After which you can use the
+.Ic boot
+or
+.Ic autoboot
+commmands or simply exit (provided
+.Va autoboot_delay
+is not set to NO) to boot the system.
+.Ic start
 is the command used in the default
 .Pa /boot/loader.rc
-file, and it uses the
-.Ic autoboot
-command (see
-.Xr loader 8 ) ,
-so it can be stopped for further interaction with
-.Xr loader 8 .
+file
+.Pq see Xr loader 8 .
 .Pp
 .It Ic initialize
-Initialize the supporting library so commands can be used without
-executing
+Initialize the support library so commands can be used without executing
 .Ic start
 first.
 Like
 .Ic start ,
-reads
+it reads
 .Pa /boot/defaults/loader.conf
 and all other
 .Xr loader.conf 5
-files specified in it.
+files specified in it
+.Pq but does not load kernel or modules .
 Returns a flag on the stack to indicate
-if any configuration file was successfully loaded.
+if any configuration files were successfully loaded.
 .Pp
 .It Ic read-conf Ar filename
 Reads and processes a
@@ -154,6 +158,13 @@ files to specify the action after a module loading fails.
 Used inside
 .Xr loader.conf 5
 files to specify the action after a module loading fails.
+.It Ic try-include Ar file Op Ar
+Process script files if they exist.
+Each file, in turn, is completely read into memory,
+and then each of its lines is passed to the command line interpreter.
+If any error is returned by the interpreter, the try-include
+command aborts immediately, without reading any other files, and
+silently returns without error.
 .El
 .Sh FILES
 .Bl -tag -width /boot/loader.4th -compact
diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf
index 76f40c4df9a..169d7ab1937 100644
--- a/sys/boot/forth/loader.conf
+++ b/sys/boot/forth/loader.conf
@@ -38,16 +38,30 @@ bitmap_name="splash.bmp"	# Set this to the name of the file
 bitmap_type="splash_image_data" # and place it on the module_path
 
 
+##############################################################
+###  Random number generator configuration ###################
+##############################################################
+
+entropy_cache_load="NO"			# Set this to YES to load entropy at boot time
+entropy_cache_name="/boot/entropy"	# Set this to the name of the file
+entropy_cache_type="/boot/entropy"	
+#kern.random.sys.seeded="0"		# Set this to 1 to start /dev/random
+					# without waiting for a (re)seed.
+
+
 ##############################################################
 ###  Loader settings  ########################################
 ##############################################################
 
+#loader_delay="3"		# Delay in seconds before loading anything.
+				# Default is unset and disabled (no delay).
 #autoboot_delay="10"		# Delay in seconds before autobooting,
 				# set to -1 if you don't want user to be
 				# allowed to interrupt autoboot process and
 				# escape to the loader prompt, set to
 				# "NO" to disable autobooting
 #beastie_disable="NO"		# Turn the beastie boot menu on and off
+#kernels="kernel kernel.old"	# Kernels to display in the boot menu
 #loader_logo="orbbw"		# Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none
 #comconsole_speed="9600"	# Set the current serial console speed
 #console="vidconsole"		# A comma separated list of console(s)
@@ -364,7 +378,6 @@ ng_echo_load="NO"		# Netgraph echo node type
 ng_eiface_load="NO"		# generic Ethernet interface netgraph node type
 ng_etf_load="NO"		# Ethertype filtering netgraph node type
 ng_ether_load="NO"		# Ethernet netgraph node type
-ng_fec_load="NO"		# netgraph Fast EtherChannel node
 ng_frame_relay_load="NO"	# frame relay netgraph node type
 ng_gif_load="NO"		# generic tunnel interface netgraph node type
 ng_gif_demux_load="NO"		# demultiplexer for packets from ng_gif(4) nodes
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 110e068859d..d63890957aa 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd August 6, 2013
+.Dd October 18, 2013
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -209,6 +209,9 @@ replacing it with
 character (useful for embedded products and such).
 .It Va kernel
 .Pq Dq kernel
+.It Va kernels
+.Pq Dq kernel kernel.old
+Space or comma separated list of kernels to present in the boot menu.
 .It Va loader_conf_files
 .Pq Dq Pa /boot/loader.conf /boot/loader.conf.local
 .It Va splash_bmp_load
diff --git a/sys/boot/forth/loader.rc b/sys/boot/forth/loader.rc
index 1130cc97ffe..b4a6d51c4c4 100644
--- a/sys/boot/forth/loader.rc
+++ b/sys/boot/forth/loader.rc
@@ -3,8 +3,10 @@
 \
 \ Includes additional commands
 include /boot/loader.4th
+try-include /boot/loader.rc.local
 
 \ Reads and processes loader.conf variables
+\ NOTE: Change to `initialize' if you enable the below boot menu
 start
 
 \ Tests for password -- executes autoboot first if a password was defined
diff --git a/sys/boot/forth/menu-commands.4th b/sys/boot/forth/menu-commands.4th
index baee0b1b27d..70ae9d80620 100644
--- a/sys/boot/forth/menu-commands.4th
+++ b/sys/boot/forth/menu-commands.4th
@@ -1,4 +1,4 @@
-\ Copyright (c) 2006-2012 Devin Teske <dteske@FreeBSD.org>
+\ Copyright (c) 2006-2013 Devin Teske <dteske@FreeBSD.org>
 \ All rights reserved.
 \ 
 \ Redistribution and use in source and binary forms, with or without
@@ -30,6 +30,8 @@ include /boot/menusets.4th
 
 variable kernel_state
 variable root_state
+0 kernel_state !
+0 root_state !
 
 \ 
 \ Boot
@@ -279,21 +281,21 @@ variable root_state
 	init_cyclestate ( n k -- n )
 ;
 
-: cycle_kernel ( N -- N TRUE )
-	cycle_menuitem
-	menu-redraw
-
-	\ Now we're going to make the change effective
-
-	dup cycle_stateN @
-	dup kernel_state !       \ save a copy for re-initialization
-	48 +                     \ convert to ASCII numeral
+: activate_kernel ( N -- N )
+	dup cycle_stateN @	( n -- n n2 )
+	dup kernel_state !	( n n2 -- n n2 )  \ copy for re-initialization
+	48 +			( n n2 -- n n2' ) \ kernel_state to ASCII num
 
 	s" set kernel=${kernel_prefix}${kernel[N]}${kernel_suffix}"
-	36 +c!   \ replace 'N' with ASCII numeral
-	evaluate \ sets $kernel to full kernel-path
+	36 +c!		( n n2 c-addr/u -- n c-addr/u ) \ 'N' to ASCII num
+	evaluate	( n c-addr/u -- n ) \ sets $kernel to full kernel-path
+;
 
-	TRUE \ loop menu again
+: cycle_kernel ( N -- N TRUE )
+	cycle_menuitem	\ cycle cycle_stateN to next value
+	activate_kernel \ apply current cycle_stateN
+	menu-redraw	\ redraw menu
+	TRUE		\ loop menu again
 ;
 
 \ 
@@ -305,21 +307,21 @@ variable root_state
 	init_cyclestate ( n k -- n )
 ;
 
-: cycle_root ( N -- N TRUE )
-	cycle_menuitem
-	menu-redraw
-
-	\ Now we're going to make the change effective
-
-	dup cycle_stateN @
-	dup root_state !         \ save a copy for re-initialization
-	48 +                     \ convert to ASCII numeral
+: activate_root ( N -- N )
+	dup cycle_stateN @	( n -- n n2 )
+	dup root_state !	( n n2 -- n n2 )  \ copy for re-initialization
+	48 +			( n n2 -- n n2' ) \ root_state to ASCII num
 
 	s" set root=${root_prefix}${root[N]}${root_suffix}"
-	30 +c!   \ replace 'N' with ASCII numeral
-	evaluate \ sets $root to full root-path
+	30 +c!		( n n2 c-addr/u -- n c-addr/u ) \ 'N' to ASCII num
+	evaluate	( n c-addr/u -- n ) \ sets $root to full kernel-path
+;
 
-	TRUE \ loop menu again
+: cycle_root ( N -- N TRUE )
+	cycle_menuitem	\ cycle cycle_stateN to next value
+	activate_root	\ apply current cycle_stateN
+	menu-redraw	\ redraw menu
+	TRUE		\ loop menu again
 ;
 
 \ 
diff --git a/sys/boot/forth/menu.4th b/sys/boot/forth/menu.4th
index 6614a9f7ea4..0239115b1cc 100644
--- a/sys/boot/forth/menu.4th
+++ b/sys/boot/forth/menu.4th
@@ -70,6 +70,12 @@ variable menureboot
 variable menurebootadded
 variable menuacpi
 variable menuoptions
+variable menukernel
+
+\ Parsing of kernels into menu-items
+variable kernidx
+variable kernlen
+variable kernmenuidx
 
 \ Menu timer [count-down] variables
 variable menu_timeout_enabled \ timeout state (internal use only)
@@ -109,14 +115,19 @@ variable cycle_state7
 variable cycle_state8
 
 \ Containers for storing the initial caption text
-create init_text1 255 allot
-create init_text2 255 allot
-create init_text3 255 allot
-create init_text4 255 allot
-create init_text5 255 allot
-create init_text6 255 allot
-create init_text7 255 allot
-create init_text8 255 allot
+create init_text1 64 allot
+create init_text2 64 allot
+create init_text3 64 allot
+create init_text4 64 allot
+create init_text5 64 allot
+create init_text6 64 allot
+create init_text7 64 allot
+create init_text8 64 allot
+
+\ Containers for parsing kernels into menu-items
+create kerncapbuf 64 allot
+create kerndefault 64 allot
+create kernelsbuf 256 allot
 
 : +c! ( N C-ADDR/U K -- C-ADDR/U )
 	3 pick 3 pick	( n c-addr/u k -- n c-addr/u k n c-addr )
@@ -124,45 +135,31 @@ create init_text8 255 allot
 	rot drop	( n c-addr/u -- c-addr/u )
 ;
 
+: delim? ( C -- BOOL )
+	dup  32 =		( c -- c bool )		\ [sp] space
+	over  9 = or		( c bool -- c bool )	\ [ht] horizontal tab
+	over 10 = or		( c bool -- c bool )	\ [nl] newline
+	over 13 = or		( c bool -- c bool )	\ [cr] carriage return
+	over [char] , =	or	( c bool -- c bool )	\ comma
+	swap drop		( c bool -- bool )	\ return boolean
+;
+
 : menukeyN      ( N -- ADDR )   s" menukeyN"       7 +c! evaluate ;
 : init_stateN   ( N -- ADDR )   s" init_stateN"   10 +c! evaluate ;
 : toggle_stateN ( N -- ADDR )   s" toggle_stateN" 12 +c! evaluate ;
 : cycle_stateN  ( N -- ADDR )   s" cycle_stateN"  11 +c! evaluate ;
 : init_textN    ( N -- C-ADDR ) s" init_textN"     9 +c! evaluate ;
 
-: str_loader_menu_frame       ( -- C-ADDR/U ) s" loader_menu_frame" ;
-: str_loader_menu_title       ( -- C-ADDR/U ) s" loader_menu_title" ;
-: str_loader_menu_title_align ( -- C-ADDR/U ) s" loader_menu_title_align" ;
-: str_loader_menu_x           ( -- C-ADDR/U ) s" loader_menu_x" ;
-: str_loader_menu_y           ( -- C-ADDR/U ) s" loader_menu_y" ;
-: str_loader_menu_timeout_x   ( -- C-ADDR/U ) s" loader_menu_timeout_x" ;
-: str_loader_menu_timeout_y   ( -- C-ADDR/U ) s" loader_menu_timeout_y" ;
-: str_menu_init               ( -- C-ADDR/U ) s" menu_init" ;
-: str_menu_timeout_command    ( -- C-ADDR/U ) s" menu_timeout_command" ;
-: str_menu_reboot             ( -- C-ADDR/U ) s" menu_reboot" ;
-: str_menu_acpi               ( -- C-ADDR/U ) s" menu_acpi" ;
-: str_menu_options            ( -- C-ADDR/U ) s" menu_options" ;
-: str_menu_optionstext        ( -- C-ADDR/U ) s" menu_optionstext" ;
-
-: str_menu_init[x]          ( -- C-ADDR/U ) s" menu_init[x]" ;
-: str_menu_command[x]       ( -- C-ADDR/U ) s" menu_command[x]" ;
-: str_menu_caption[x]       ( -- C-ADDR/U ) s" menu_caption[x]" ;
-: str_ansi_caption[x]       ( -- C-ADDR/U ) s" ansi_caption[x]" ;
-: str_menu_keycode[x]       ( -- C-ADDR/U ) s" menu_keycode[x]" ;
-: str_toggled_text[x]       ( -- C-ADDR/U ) s" toggled_text[x]" ;
-: str_toggled_ansi[x]       ( -- C-ADDR/U ) s" toggled_ansi[x]" ;
-: str_menu_caption[x][y]    ( -- C-ADDR/U ) s" menu_caption[x][y]" ;
-: str_ansi_caption[x][y]    ( -- C-ADDR/U ) s" ansi_caption[x][y]" ;
-
-: menu_init[x]       ( N -- C-ADDR/U )   str_menu_init[x]       10 +c! ;
-: menu_command[x]    ( N -- C-ADDR/U )   str_menu_command[x]    13 +c! ;
-: menu_caption[x]    ( N -- C-ADDR/U )   str_menu_caption[x]    13 +c! ;
-: ansi_caption[x]    ( N -- C-ADDR/U )   str_ansi_caption[x]    13 +c! ;
-: menu_keycode[x]    ( N -- C-ADDR/U )   str_menu_keycode[x]    13 +c! ;
-: toggled_text[x]    ( N -- C-ADDR/U )   str_toggled_text[x]    13 +c! ;
-: toggled_ansi[x]    ( N -- C-ADDR/U )   str_toggled_ansi[x]    13 +c! ;
-: menu_caption[x][y] ( N M -- C-ADDR/U ) str_menu_caption[x][y] 16 +c! 13 +c! ;
-: ansi_caption[x][y] ( N M -- C-ADDR/U ) str_ansi_caption[x][y] 16 +c! 13 +c! ;
+: kernel[x]          ( N -- C-ADDR/U )   s" kernel[x]"           7 +c! ;
+: menu_init[x]       ( N -- C-ADDR/U )   s" menu_init[x]"       10 +c! ;
+: menu_command[x]    ( N -- C-ADDR/U )   s" menu_command[x]"    13 +c! ;
+: menu_caption[x]    ( N -- C-ADDR/U )   s" menu_caption[x]"    13 +c! ;
+: ansi_caption[x]    ( N -- C-ADDR/U )   s" ansi_caption[x]"    13 +c! ;
+: menu_keycode[x]    ( N -- C-ADDR/U )   s" menu_keycode[x]"    13 +c! ;
+: toggled_text[x]    ( N -- C-ADDR/U )   s" toggled_text[x]"    13 +c! ;
+: toggled_ansi[x]    ( N -- C-ADDR/U )   s" toggled_ansi[x]"    13 +c! ;
+: menu_caption[x][y] ( N M -- C-ADDR/U ) s" menu_caption[x][y]" 16 +c! 13 +c! ;
+: ansi_caption[x][y] ( N M -- C-ADDR/U ) s" ansi_caption[x][y]" 16 +c! 13 +c! ;
 
 : arch-i386? ( -- BOOL ) \ Returns TRUE (-1) on i386, FALSE (0) otherwise.
 	s" arch-i386" environment? dup if
@@ -355,12 +352,9 @@ create init_text8 255 allot
 		then
 		( n addr 0 n 48 -- n addr 0 c-addr/u )
 		getenv dup -1 = if
-			\ This is highly unlikely to occur, but to make
-			\ sure that things move along smoothly, allocate
-			\ a temporary NULL string
-
-			drop ( n addr 0 -1 -- n addr 0 ) \ getenv cruft
-			s" " ( n addr 0 -- n addr 0 c-addr/u )
+			\ Highly unlikely to occur, but to ensure things move
+			\ along smoothly, allocate a temporary NULL string
+			drop ( cruft ) s" "
 		then
 	then
 
@@ -418,15 +412,15 @@ create init_text8 255 allot
 		acpipresent? if
 			acpienabled? if
 				loader_color? if
-					str_toggled_ansi[x]
+					s" toggled_ansi[x]"
 				else
-					str_toggled_text[x]
+					s" toggled_text[x]"
 				then
 			else
 				loader_color? if
-					str_ansi_caption[x]
+					s" ansi_caption[x]"
 				else
-					str_menu_caption[x]
+					s" menu_caption[x]"
 				then
 			then
 		else
@@ -438,17 +432,198 @@ create init_text8 255 allot
 	then
 ;
 
+\ This function parses $kernels into variables that are used by the menu to
+\ display wich kernel to boot when the [overloaded] `boot' word is interpreted.
+\ Used internally by menu-create, you need not (nor should you) call this
+\ directly.
+\ 
+: parse-kernels ( N -- ) \ kernidx
+	kernidx ! ( n -- )	\ store provided `x' value
+	[char] 0 kernmenuidx !	\ initialize `y' value for menu_caption[x][y]
+
+	\ Attempt to get a list of kernels, fall back to sensible default
+	s" kernels" getenv dup -1 = if
+		drop ( cruft )
+		s" kernel kernel.old"
+	then ( -- c-addr/u )
+
+	\ Check to see if the user has altered $kernel by comparing it against
+	\ $kernel[N] where N is kernel_state (the actively displayed kernel).
+	s" kernel_state" evaluate @ 48 + s" kernel[N]" 7 +c! getenv
+	dup -1 <> if
+		s" kernel" getenv dup -1 = if
+			drop ( cruft ) s" "
+		then
+		2swap 2over compare 0= if
+			2drop FALSE ( skip below conditional )
+		else \ User has changed $kernel
+			TRUE ( slurp in new value )
+		then
+	else \ We haven't yet parsed $kernels into $kernel[N]
+		drop ( getenv cruft )
+		s" kernel" getenv dup -1 = if
+			drop ( cruft ) s" "
+		then
+		TRUE ( slurp in initial value )
+	then ( c-addr/u -- c-addr/u c-addr/u,-1 | 0 )
+	if \ slurp new value into kerndefault
+		kerndefault 1+ 0 2swap strcat swap 1- c!
+	then
+
+	\ Clear out existing parsed-kernels
+	kernidx @ [char] 0
+	begin
+		dup kernel[x] unsetenv
+		2dup menu_caption[x][y] unsetenv
+		2dup ansi_caption[x][y] unsetenv
+		1+ dup [char] 8 >
+	until
+	2drop
+
+	\ Step through the string until we find the end
+	begin
+		0 kernlen ! \ initialize length of value
+
+		\ Skip leading whitespace and/or comma delimiters
+		begin
+			dup 0<> if
+				over c@ delim? ( c-addr/u -- c-addr/u bool )
+			else
+				false ( c-addr/u -- c-addr/u bool )
+			then
+		while
+			1- swap 1+ swap ( c-addr/u -- c-addr'/u' )
+		repeat
+		( c-addr/u -- c-addr'/u' )
+
+		dup 0= if \ end of string while eating whitespace
+			2drop ( c-addr/u -- )
+			kernmenuidx @ [char] 0 <> if \ found at least one
+				exit \ all done
+			then
+
+			\ No entries in $kernels; use $kernel instead
+			s" kernel" getenv dup -1 = if
+				drop ( cruft ) s" "
+			then ( -- c-addr/u )
+			dup kernlen ! \ store entire value length as kernlen
+		else
+			\ We're still within $kernels parsing toward the end;
+			\ find delimiter/end to determine kernlen
+			2dup ( c-addr/u -- c-addr/u c-addr/u )
+			begin dup 0<> while
+				over c@ delim? if
+					drop 0 ( break ) \ found delimiter
+				else
+					kernlen @ 1+ kernlen ! \ incrememnt
+					1- swap 1+ swap \ c-addr++ u--
+				then
+			repeat
+			2drop ( c-addr/u c-addr'/u' -- c-addr/u )
+
+			\ If this is the first entry, compare it to $kernel
+			\ If different, then insert $kernel beforehand
+			kernmenuidx @ [char] 0 = if
+				over kernlen @ kerndefault count compare if
+					kernelsbuf 0 kerndefault count strcat
+					s" ," strcat 2swap strcat
+					kerndefault count swap drop kernlen !
+				then
+			then
+		then
+		( c-addr/u -- c-addr'/u' )
+
+		\ At this point, we should have something on the stack to store
+		\ as the next kernel menu option; start assembling variables
+
+		over kernlen @ ( c-addr/u -- c-addr/u c-addr/u2 )
+
+		\ Assign first to kernel[x]
+		2dup kernmenuidx @ kernel[x] setenv
+
+		\ Assign second to menu_caption[x][y]
+		kerncapbuf 0 s" [K]ernel: " strcat
+		2over strcat
+		kernidx @ kernmenuidx @ menu_caption[x][y]
+		setenv
+
+		\ Assign third to ansi_caption[x][y]
+		kerncapbuf 0 s" Kernel: " strcat
+		kernmenuidx @ [char] 0 = if
+			s" default/"
+		else
+			s" "
+		then strcat
+		2over strcat
+		s" " strcat
+		kernidx @ kernmenuidx @ ansi_caption[x][y]
+		setenv
+
+		2drop ( c-addr/u c-addr/u2 -- c-addr/u )
+
+		kernmenuidx @ 1+ dup kernmenuidx ! [char] 8 > if
+			2drop ( c-addr/u -- ) exit
+		then
+
+		kernlen @ - swap kernlen @ + swap ( c-addr/u -- c-addr'/u' )
+	again
+;
+
+\ This function goes through the kernels that were discovered by the
+\ parse-kernels function [above], adding " (# of #)" text to the end of each
+\ caption.
+\ 
+: tag-kernels ( -- )
+	kernidx @ ( -- x ) dup 0= if exit then
+	[char] 0 s"  (Y of Z)" ( x -- x y c-addr/u )
+	kernmenuidx @ -rot 7 +c! \ Replace 'Z' with number of kernels parsed
+	begin
+		2 pick 1+ -rot 2 +c! \ Replace 'Y' with current ASCII num
+
+		2over menu_caption[x][y] getenv dup -1 <> if
+			2dup + 1- c@ [char] ) = if
+				2drop \ Already tagged
+			else
+				kerncapbuf 0 2swap strcat
+				2over strcat
+				5 pick 5 pick menu_caption[x][y] setenv
+			then
+		else
+			drop ( getenv cruft )
+		then
+
+		2over ansi_caption[x][y] getenv dup -1 <> if
+			2dup + 1- c@ [char] ) = if
+				2drop \ Already tagged
+			else
+				kerncapbuf 0 2swap strcat
+				2over strcat
+				5 pick 5 pick ansi_caption[x][y] setenv
+			then
+		else
+			drop ( getenv cruft )
+		then
+
+		rot 1+ dup [char] 8 > if
+			-rot 2drop TRUE ( break )
+		else
+			-rot FALSE
+		then
+	until
+	2drop ( x y -- )
+;
+
 \ This function creates the list of menu items. This function is called by the
 \ menu-display function. You need not be call it directly.
 \ 
 : menu-create ( -- )
 
 	\ Print the frame caption at (x,y)
-	str_loader_menu_title getenv dup -1 = if
+	s" loader_menu_title" getenv dup -1 = if
 		drop s" Welcome to FreeBSD"
 	then
 	TRUE ( use default alignment )
-	str_loader_menu_title_align getenv dup -1 <> if
+	s" loader_menu_title_align" getenv dup -1 <> if
 		2dup s" left" compare-insensitive 0= if ( 1 )
 			2drop ( c-addr/u ) drop ( bool )
 			menuX @ menuY @ 1-
@@ -470,7 +645,7 @@ create init_text8 255 allot
 	\ constructed dynamically -- as this function could conceivably set
 	\ the remaining environment variables to construct the menu entirely).
 	\ 
-	str_menu_init getenv dup -1 <> if
+	s" menu_init" getenv dup -1 <> if
 		evaluate
 	else
 		drop
@@ -495,7 +670,7 @@ create init_text8 255 allot
 	\ Initialize the ACPI option status.
 	\ 
 	0 menuacpi !
-	str_menu_acpi getenv -1 <> if
+	s" menu_acpi" getenv -1 <> if
 		c@ dup 48 > over 57 < and if ( '1' <= c1 <= '8' )
 			menuacpi !
 			arch-i386? if acpipresent? if
@@ -510,11 +685,52 @@ create init_text8 255 allot
 		then
 	then
 
+	\ 
+	\ Initialize kernel captions after parsing $kernels
+	\ 
+	0 menukernel !
+	s" menu_kernel" getenv -1 <> if
+		c@ dup 48 > over 57 < and if ( '1' <= c1 <= '8' )
+			dup menukernel !
+			dup parse-kernels tag-kernels
+
+			\ Get the current cycle state (entry to use)
+			s" kernel_state" evaluate @ 48 + ( n -- n y )
+
+			\ If state is invalid, reset
+			dup kernmenuidx @ 1- > if
+				drop [char] 0 ( n y -- n 48 )
+				0 s" kernel_state" evaluate !
+				over s" init_kernel" evaluate drop
+			then
+
+			\ Set the current non-ANSI caption
+			2dup swap dup ( n y -- n y y n n )
+			s" set menu_caption[x]=$menu_caption[x][y]"
+			17 +c! 34 +c! 37 +c! evaluate
+			( n y y n n c-addr/u -- n y  )
+
+			\ Set the current ANSI caption
+			2dup swap dup ( n y -- n y y n n )
+			s" set ansi_caption[x]=$ansi_caption[x][y]"
+			17 +c! 34 +c! 37 +c! evaluate
+			( n y y n n c-addr/u -- n y )
+
+			\ Initialize cycle state from stored value
+			48 - ( n y -- n k )
+			s" init_cyclestate" evaluate ( n k -- n )
+
+			\ Set $kernel to $kernel[y]
+			s" activate_kernel" evaluate ( n -- n )
+		then
+		drop
+	then
+
 	\ 
 	\ Initialize the menu_options visual separator.
 	\ 
 	0 menuoptions !
-	str_menu_options getenv -1 <> if
+	s" menu_options" getenv -1 <> if
 		c@ dup 48 > over 57 < and if ( '1' <= c1 <= '8' )
 			menuoptions !
 		else
@@ -534,7 +750,7 @@ create init_text8 255 allot
 		\ If the "Options:" separator, print it.
 		dup menuoptions @ = if
 			\ Optionally add a reboot option to the menu
-			str_menu_reboot getenv -1 <> if
+			s" menu_reboot" getenv -1 <> if
 				drop
 				s" Reboot" printmenuitem menureboot !
 				true menurebootadded !
@@ -544,7 +760,7 @@ create init_text8 255 allot
 			menurow @ 2 + menurow !
 			menurow @ menuY @ +
 			at-xy
-			str_menu_optionstext getenv dup -1 <> if
+			s" menu_optionstext" getenv dup -1 <> if
 				type
 			else
 				drop ." Options:"
@@ -603,7 +819,7 @@ create init_text8 255 allot
 
 	\ Optionally add a reboot option to the menu
 	menurebootadded @ true <> if
-		str_menu_reboot getenv -1 <> if
+		s" menu_reboot" getenv -1 <> if
 			drop       \ no need for the value
 			s" Reboot" \ menu caption (required by printmenuitem)
 
@@ -684,7 +900,7 @@ create init_text8 255 allot
 					\ (user did not cancel by pressing ANY
 					\ key)
 
-					str_menu_timeout_command getenv dup
+					s" menu_timeout_command"  getenv dup
 					-1 = if
 						drop \ clean-up
 					else
@@ -758,7 +974,7 @@ create init_text8 255 allot
 	0 menurow !     \ Initialize the starting position for the menu
 
 	\ Assign configuration values
-	str_loader_menu_y getenv dup -1 = if
+	s" loader_menu_y" getenv dup -1 = if
 		drop \ no custom row position
 		menu_default_y
 	else
@@ -768,7 +984,7 @@ create init_text8 255 allot
 		then
 	then
 	menuY !
-	str_loader_menu_x getenv dup -1 = if
+	s" loader_menu_x" getenv dup -1 = if
 		drop \ no custom column position
 		menu_default_x
 	else
@@ -781,7 +997,7 @@ create init_text8 255 allot
 
 	\ Interpret a custom frame type for the menu
 	TRUE ( draw a box? default yes, but might be altered below )
-	str_loader_menu_frame getenv dup -1 = if ( 1 )
+	s" loader_menu_frame" getenv dup -1 = if ( 1 )
 		drop \ no custom frame type
 	else ( 1 )  2dup s" single" compare-insensitive 0= if ( 2 )
 		f_single ( see frames.4th )
@@ -804,7 +1020,7 @@ create init_text8 255 allot
 	0 menu_timeout_enabled ! \ start with automatic timeout disabled
 
 	\ check indication that automatic execution after delay is requested
-	str_menu_timeout_command getenv -1 <> if ( Addr C -1 -- | Addr )
+	s" menu_timeout_command" getenv -1 <> if ( Addr C -1 -- | Addr )
 		drop ( just testing existence right now: Addr -- )
 
 		\ initialize state variables
@@ -840,7 +1056,7 @@ create init_text8 255 allot
 
 		menu_timeout_enabled @ 1 = if
 			\ read custom column position (if set)
-			str_loader_menu_timeout_x getenv dup -1 = if
+			s" loader_menu_timeout_x" getenv dup -1 = if
 				drop \ no custom column position
 				menu_timeout_default_x \ use default setting
 			else
@@ -852,7 +1068,7 @@ create init_text8 255 allot
 			menu_timeout_x ! ( store value on stack from above )
         
 			\ read custom row position (if set)
-			str_loader_menu_timeout_y getenv dup -1 = if
+			s" loader_menu_timeout_y" getenv dup -1 = if
 				drop \ no custom row position
 				menu_timeout_default_y \ use default setting
 			else
@@ -1005,12 +1221,13 @@ create init_text8 255 allot
 	until
 	drop \ iterator
 
-	str_menu_timeout_command unsetenv	\ menu timeout command
-	str_menu_reboot          unsetenv	\ Reboot menu option flag
-	str_menu_acpi            unsetenv	\ ACPI menu option flag
-	str_menu_options         unsetenv	\ Options separator flag
-	str_menu_optionstext     unsetenv	\ separator display text
-	str_menu_init            unsetenv	\ menu initializer
+	s" menu_timeout_command" unsetenv	\ menu timeout command
+	s" menu_reboot"          unsetenv	\ Reboot menu option flag
+	s" menu_acpi"            unsetenv	\ ACPI menu option flag
+	s" menu_kernel"          unsetenv	\ Kernel menu option flag
+	s" menu_options"         unsetenv	\ Options separator flag
+	s" menu_optionstext"     unsetenv	\ separator display text
+	s" menu_init"            unsetenv	\ menu initializer
 
 	0 menureboot !
 	0 menuacpi !
diff --git a/sys/boot/forth/menu.rc b/sys/boot/forth/menu.rc
index 3e345f71e3c..e49f5676f54 100644
--- a/sys/boot/forth/menu.rc
+++ b/sys/boot/forth/menu.rc
@@ -55,10 +55,14 @@ set mainmenu_reboot
 \ 
 set mainmenu_options=5
 
-set mainmenu_caption[5]="Configure Boot [O]ptions..."
-set mainmenu_command[5]="2 goto_menu"
-set mainmenu_keycode[5]=111
-set mainansi_caption[5]="Configure Boot Options..."
+set mainmenu_kernel=5
+set mainmenu_command[5]="cycle_kernel"
+set mainmenu_keycode[5]=107
+
+set mainmenu_caption[6]="Configure Boot [O]ptions..."
+set mainmenu_command[6]="2 goto_menu"
+set mainmenu_keycode[6]=111
+set mainansi_caption[6]="Configure Boot Options..."
 
 \ 
 \ BOOT OPTIONS MENU
@@ -116,6 +120,10 @@ set optionstoggled_ansi[6]="Verbose..... On"
 \ 
 set menu_timeout_command="boot"
 
+\ Include optional elements defined in a local file
+\ 
+try-include /boot/menu.rc.local
+
 \ Display the main menu (see `menu.4th')
 set menuset_initial=1
 menuset-loadinitial
diff --git a/sys/boot/forth/menusets.4th b/sys/boot/forth/menusets.4th
index 630239fa1d3..edee35680ed 100644
--- a/sys/boot/forth/menusets.4th
+++ b/sys/boot/forth/menusets.4th
@@ -366,6 +366,7 @@ create menuset_y        1   allot
 	\ 	menuset1_command[x]		-> menu_command[x]
 	\ 	menuset1_init			-> ``evaluated''
 	\ 	menuset1_init[x]		-> menu_init[x]
+	\ 	menuset1_kernel			-> menu_kernel
 	\ 	menuset1_keycode[x]		-> menu_keycode[x]
 	\ 	menuset1_options		-> menu_options
 	\ 	menuset1_optionstext		-> menu_optionstext
@@ -382,6 +383,7 @@ create menuset_y        1   allot
 	\ 	{name}menu_command[x]		-> menu_command[x]
 	\ 	{name}menu_init			-> ``evaluated''
 	\ 	{name}menu_init[x]		-> menu_init[x]
+	\ 	{name}menu_kernel		-> menu_kernel
 	\ 	{name}menu_keycode[x]		-> menu_keycode[x]
 	\ 	{name}menu_options		-> menu_options
 	\ 	{name}menu_optionstext		-> menu_optionstext
@@ -520,6 +522,10 @@ create menuset_y        1   allot
 	s" set var=acpi" evaluate
 	menuset-loadmenuvar
 
+	\ ... menu_kernel ...
+	s" set var=kernel" evaluate
+	menuset-loadmenuvar
+
 	\ ... menu_options ...
 	s" set var=options" evaluate
 	menuset-loadmenuvar
@@ -597,6 +603,7 @@ create menuset_y        1   allot
 
 		s" set var=acpi"        evaluate menuset-unloadmenuvar
 		s" set var=init"        evaluate menuset-unloadmenuvar
+		s" set var=kernel"      evaluate menuset-unloadmenuvar
 		s" set var=options"     evaluate menuset-unloadmenuvar
 		s" set var=optionstext" evaluate menuset-unloadmenuvar
 		s" set var=reboot"      evaluate menuset-unloadmenuvar
diff --git a/sys/boot/i386/btx/btx/btx.S b/sys/boot/i386/btx/btx/btx.S
index ef3d0c763b9..87d09a5a1e1 100644
--- a/sys/boot/i386/btx/btx/btx.S
+++ b/sys/boot/i386/btx/btx/btx.S
@@ -41,6 +41,8 @@
 		.set PSL_RESERVED_DEFAULT,0x00000002
 		.set PSL_T,0x00000100		# Trap flag
 		.set PSL_I,0x00000200		# Interrupt enable flag
+		.set PSL_D,0x00000400		# String instruction direction
+		.set PSL_NT,0x00004000		# Nested task flag
 		.set PSL_VM,0x00020000		# Virtual 8086 mode flag
 		.set PSL_AC,0x00040000		# Alignment check flag
 /*
@@ -611,8 +613,8 @@ rret_tramp:	movw $MEM_ESPR-0x08,%sp		# Reset stack pointer
 		pushl %ds			#  regs
 		pushl %es
 		pushfl				# Save %eflags
-		cli				# Disable interrupts
-		std				# String ops dec
+		pushl $PSL_RESERVED_DEFAULT|PSL_D # Use clean %eflags with
+		popfl				#  string ops dec
 		xorw %ax,%ax			# Reset seg 
 		movw %ax,%ds			#  regs
 		movw %ax,%es			#  (%ss is already 0)
@@ -675,6 +677,7 @@ rret_tramp.1:	xorl %ecx,%ecx			# Zero
 		testl $V86F_FLAGS,%edx		# User wants flags?
 		jz rret_tramp.3			# No
 		movl MEM_ESPR-0x3c,%eax		# Read real mode flags
+		andl $~(PSL_T|PSL_NT),%eax	# Clear unsafe flags
 		movw %ax,-0x08(%esi)		# Update user flags (low 16)
 /*
  * Return to the user task
diff --git a/sys/boot/i386/efi/reloc.c b/sys/boot/i386/efi/reloc.c
index 22c6642e3bf..98bcf8e2d02 100644
--- a/sys/boot/i386/efi/reloc.c
+++ b/sys/boot/i386/efi/reloc.c
@@ -61,8 +61,8 @@ _reloc(unsigned long ImageBase, ElfW_Dyn *dynamic, EFI_HANDLE image_handle,
 	relent = 0;
 	for (dynp = dynamic; dynp->d_tag != DT_NULL; dynp++) {
 		switch (dynp->d_tag) {
-		case DT_RELA:
 		case DT_REL:
+		case DT_RELA:
 			rel = (ElfW_Rel *) ((unsigned long) dynp->d_un.d_ptr +
 			    ImageBase);
 			break;
diff --git a/sys/boot/i386/libfirewire/fwohci.h b/sys/boot/i386/libfirewire/fwohci.h
index fc20043d927..4a93220b31a 100644
--- a/sys/boot/i386/libfirewire/fwohci.h
+++ b/sys/boot/i386/libfirewire/fwohci.h
@@ -76,7 +76,7 @@ void fwohci_poll(struct fwohci_softc *);
 #define	OHCI_CROMHDR		0x18
 #define OHCI_BUS_ID		0x1c
 #define	OHCI_BUS_OPT		0x20
-#define	OHCI_BUSIRMC		(1 << 31)
+#define	OHCI_BUSIRMC		(1U << 31)
 #define	OHCI_BUSCMC		(1 << 30)
 #define	OHCI_BUSISC		(1 << 29)
 #define	OHCI_BUSBMC		(1 << 28)
@@ -102,7 +102,7 @@ void fwohci_poll(struct fwohci_softc *);
 
 #define	OHCI_SID_BUF		0x64
 #define	OHCI_SID_CNT		0x68
-#define OHCI_SID_ERR		(1 << 31)
+#define OHCI_SID_ERR		(1U << 31)
 #define OHCI_SID_CNT_MASK	0xffc
 
 #define	OHCI_IT_STAT		0x90
diff --git a/sys/boot/i386/libfirewire/fwohcireg.h b/sys/boot/i386/libfirewire/fwohcireg.h
index 27786e8b981..d24f6585831 100644
--- a/sys/boot/i386/libfirewire/fwohcireg.h
+++ b/sys/boot/i386/libfirewire/fwohcireg.h
@@ -239,7 +239,7 @@ struct ohci_registers {
 	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 */
-#define	OHCI_HCC_BIBIV	(1 << 31)	/* BIBimage Valid */
+#define	OHCI_HCC_BIBIV	(1U << 31)	/* BIBimage Valid */
 #define	OHCI_HCC_BIGEND	(1 << 30)	/* noByteSwapData */
 #define	OHCI_HCC_PRPHY	(1 << 23)	/* programPhyEnable */
 #define	OHCI_HCC_PHYEN	(1 << 22)	/* aPhyEnhanceEnable */
@@ -278,7 +278,7 @@ struct ohci_registers {
 	fwohcireg_t	link_cntl_clr;	/* Chip control clear 0xe4*/
 #define FWOHCI_NODEID	0xe8
 	fwohcireg_t	node;		/* Node ID 0xe8 */
-#define	OHCI_NODE_VALID	(1 << 31)
+#define	OHCI_NODE_VALID	(1U << 31)
 #define	OHCI_NODE_ROOT	(1 << 30)
 
 #define	OHCI_ASYSRCBUS	1
diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
index 20ed02c737b..e40f8b6bb1b 100644
--- a/sys/boot/i386/libi386/Makefile
+++ b/sys/boot/i386/libi386/Makefile
@@ -36,6 +36,9 @@ CFLAGS+= -DSMBIOS_SERIAL_NUMBERS
 .if defined(BOOT_LITTLE_ENDIAN_UUID)
 # Use little-endian UUID format as defined in SMBIOS 2.6.
 CFLAGS+= -DSMBIOS_LITTLE_ENDIAN_UUID
+.elif defined(BOOT_NETWORK_ENDIAN_UUID)
+# Use network-endian UUID format for backward compatibility.
+CFLAGS+= -DSMBIOS_NETWORK_ENDIAN_UUID
 .endif
 .endif
 
diff --git a/sys/boot/i386/libi386/smbios.c b/sys/boot/i386/libi386/smbios.c
index 51044d65701..08abe1a8239 100644
--- a/sys/boot/i386/libi386/smbios.c
+++ b/sys/boot/i386/libi386/smbios.c
@@ -122,7 +122,7 @@ static void
 smbios_setuuid(const char *name, const caddr_t addr, const int ver)
 {
 	char		uuid[37];
-	int		i, ones, zeros;
+	int		byteorder, i, ones, zeros;
 	UUID_TYPE	n;
 	uint32_t	f1;
 	uint16_t	f2, f3;
@@ -152,14 +152,18 @@ smbios_setuuid(const char *name, const caddr_t addr, const int ver)
 		 * Note: We use network byte order for backward compatibility
 		 * unless SMBIOS version is 2.6+ or little-endian is forced.
 		 */
-#ifndef SMBIOS_LITTLE_ENDIAN_UUID
-		if (ver < 0x0206) {
+#if defined(SMBIOS_LITTLE_ENDIAN_UUID)
+		byteorder = LITTLE_ENDIAN;
+#elif defined(SMBIOS_NETWORK_ENDIAN_UUID)
+		byteorder = BIG_ENDIAN;
+#else
+		byteorder = ver < 0x0206 ? BIG_ENDIAN : LITTLE_ENDIAN;
+#endif
+		if (byteorder != LITTLE_ENDIAN) {
 			f1 = ntohl(SMBIOS_GET32(addr, 0));
 			f2 = ntohs(SMBIOS_GET16(addr, 4));
 			f3 = ntohs(SMBIOS_GET16(addr, 6));
-		} else
-#endif
-		{
+		} else {
 			f1 = le32toh(SMBIOS_GET32(addr, 0));
 			f2 = le16toh(SMBIOS_GET16(addr, 4));
 			f3 = le16toh(SMBIOS_GET16(addr, 6));
diff --git a/sys/boot/i386/loader/loader.rc b/sys/boot/i386/loader/loader.rc
index 6443f3fd79b..287c05efdfe 100644
--- a/sys/boot/i386/loader/loader.rc
+++ b/sys/boot/i386/loader/loader.rc
@@ -3,9 +3,10 @@
 \
 \ Includes additional commands
 include /boot/loader.4th
+try-include /boot/loader.rc.local
 
 \ Reads and processes loader.conf variables
-start
+initialize
 
 \ Tests for password -- executes autoboot first if a password was defined
 check-password
diff --git a/sys/boot/powerpc/ps3/start.S b/sys/boot/powerpc/ps3/start.S
index 865019c6689..570b3f52cc6 100644
--- a/sys/boot/powerpc/ps3/start.S
+++ b/sys/boot/powerpc/ps3/start.S
@@ -27,7 +27,7 @@
 
 #define LOCORE
 
-#include <machine/trap_aim.h>
+#include <machine/trap.h>
 
 /*
  * KBoot and simulators will start this program from the _start symbol, with
diff --git a/sys/boot/uboot/lib/disk.c b/sys/boot/uboot/lib/disk.c
index e861bc08881..62b31328f01 100644
--- a/sys/boot/uboot/lib/disk.c
+++ b/sys/boot/uboot/lib/disk.c
@@ -45,9 +45,6 @@ __FBSDID("$FreeBSD$");
 #include "glue.h"
 #include "libuboot.h"
 
-#define DEBUG
-#undef DEBUG
-
 #define stor_printf(fmt, args...) do {			\
     printf("%s%d: ", dev->d_dev->dv_name, dev->d_unit);	\
     printf(fmt, ##args);				\
diff --git a/sys/boot/uboot/lib/glue.c b/sys/boot/uboot/lib/glue.c
index df12a7db01e..f389f1128ba 100644
--- a/sys/boot/uboot/lib/glue.c
+++ b/sys/boot/uboot/lib/glue.c
@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
 #include "api_public.h"
 #include "glue.h"
 
-#define DEBUG
-#undef DEBUG
-
 #ifdef DEBUG
 #define	debugf(fmt, args...) do { printf("%s(): ", __func__); printf(fmt,##args); } while (0)
 #else
diff --git a/sys/cam/ata/ata_all.c b/sys/cam/ata/ata_all.c
index 940b5729666..b88fcd13517 100644
--- a/sys/cam/ata/ata_all.c
+++ b/sys/cam/ata/ata_all.c
@@ -296,6 +296,18 @@ ata_print_ident(struct ata_params *ident_data)
 	printf(" device\n");
 }
 
+void
+ata_print_ident_short(struct ata_params *ident_data)
+{
+	char product[48], revision[16];
+
+	cam_strvis(product, ident_data->model, sizeof(ident_data->model),
+		   sizeof(product));
+	cam_strvis(revision, ident_data->revision, sizeof(ident_data->revision),
+		   sizeof(revision));
+	printf("<%s %s>", product, revision);
+}
+
 void
 semb_print_ident(struct sep_identify_data *ident_data)
 {
@@ -311,6 +323,18 @@ semb_print_ident(struct sep_identify_data *ident_data)
 	    vendor, product, revision, fw, in, ins);
 }
 
+void
+semb_print_ident_short(struct sep_identify_data *ident_data)
+{
+	char vendor[9], product[17], revision[5], fw[5];
+
+	cam_strvis(vendor, ident_data->vendor_id, 8, sizeof(vendor));
+	cam_strvis(product, ident_data->product_id, 16, sizeof(product));
+	cam_strvis(revision, ident_data->product_rev, 4, sizeof(revision));
+	cam_strvis(fw, ident_data->firmware_rev, 4, sizeof(fw));
+	printf("<%s %s %s %s>", vendor, product, revision, fw);
+}
+
 uint32_t
 ata_logical_sector_size(struct ata_params *ident_data)
 {
diff --git a/sys/cam/ata/ata_all.h b/sys/cam/ata/ata_all.h
index 25732b60575..91e941c8f75 100644
--- a/sys/cam/ata/ata_all.h
+++ b/sys/cam/ata/ata_all.h
@@ -109,6 +109,7 @@ int	ata_status_sbuf(struct ccb_ataio *ataio, struct sbuf *sb);
 int	ata_res_sbuf(struct ccb_ataio *ataio, struct sbuf *sb);
 
 void	ata_print_ident(struct ata_params *ident_data);
+void	ata_print_ident_short(struct ata_params *ident_data);
 
 uint32_t	ata_logical_sector_size(struct ata_params *ident_data);
 uint64_t	ata_physical_sector_size(struct ata_params *ident_data);
@@ -143,6 +144,7 @@ int	ata_identify_match(caddr_t identbuffer, caddr_t table_entry);
 int	ata_static_identify_match(caddr_t identbuffer, caddr_t table_entry);
 
 void	semb_print_ident(struct sep_identify_data *ident_data);
+void	semb_print_ident_short(struct sep_identify_data *ident_data);
 
 void semb_receive_diagnostic_results(struct ccb_ataio *ataio,
 	u_int32_t retries, void (*cbfcnp)(struct cam_periph *, union ccb*),
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
index c8ed6895af6..c30be2d8113 100644
--- a/sys/cam/ata/ata_da.c
+++ b/sys/cam/ata/ata_da.c
@@ -80,7 +80,7 @@ typedef enum {
 	ADA_FLAG_CAN_NCQ	= 0x0008,
 	ADA_FLAG_CAN_DMA	= 0x0010,
 	ADA_FLAG_NEED_OTAG	= 0x0020,
-	ADA_FLAG_WENT_IDLE	= 0x0040,
+	ADA_FLAG_WAS_OTAG	= 0x0040,
 	ADA_FLAG_CAN_TRIM	= 0x0080,
 	ADA_FLAG_OPEN		= 0x0100,
 	ADA_FLAG_SCTX_INIT	= 0x0200,
@@ -103,7 +103,6 @@ typedef enum {
 	ADA_CCB_RAHEAD		= 0x01,
 	ADA_CCB_WCACHE		= 0x02,
 	ADA_CCB_BUFFER_IO	= 0x03,
-	ADA_CCB_WAITING		= 0x04,
 	ADA_CCB_DUMP		= 0x05,
 	ADA_CCB_TRIM		= 0x06,
 	ADA_CCB_TYPE_MASK	= 0x0F,
@@ -123,21 +122,20 @@ struct disk_params {
 
 #define TRIM_MAX_BLOCKS	8
 #define TRIM_MAX_RANGES	(TRIM_MAX_BLOCKS * ATA_DSM_BLK_RANGES)
-#define TRIM_MAX_BIOS	(TRIM_MAX_RANGES * 4)
 struct trim_request {
 	uint8_t		data[TRIM_MAX_RANGES * ATA_DSM_RANGE_SIZE];
-	struct bio	*bps[TRIM_MAX_BIOS];
+	TAILQ_HEAD(, bio) bps;
 };
 
 struct ada_softc {
 	struct	 bio_queue_head bio_queue;
 	struct	 bio_queue_head trim_queue;
+	int	 outstanding_cmds;	/* Number of active commands */
+	int	 refcount;		/* Active xpt_action() calls */
 	ada_state state;
-	ada_flags flags;	
+	ada_flags flags;
 	ada_quirks quirks;
 	int	 sort_io_queue;
-	int	 ordered_tag_count;
-	int	 outstanding_cmds;
 	int	 trim_max_ranges;
 	int	 trim_running;
 	int	 read_ahead;
@@ -291,6 +289,14 @@ static struct ada_quirk_entry ada_quirk_table[] =
 		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force 3*", "*" },
 		/*quirks*/ADA_Q_4K
 	},
+	{
+		/*
+		 * Corsair Neutron GTX SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Neutron GTX*", "*" },
+		/*quirks*/ADA_Q_4K
+	},
 	{
 		/*
 		 * Corsair Force GT SSDs
@@ -630,14 +636,8 @@ adaclose(struct disk *dp)
 	int error;
 
 	periph = (struct cam_periph *)dp->d_drv1;
-	cam_periph_lock(periph);
-	if (cam_periph_hold(periph, PRIBIO) != 0) {
-		cam_periph_unlock(periph);
-		cam_periph_release(periph);
-		return (0);
-	}
-
 	softc = (struct ada_softc *)periph->softc;
+	cam_periph_lock(periph);
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE | CAM_DEBUG_PERIPH,
 	    ("adaclose\n"));
@@ -645,7 +645,8 @@ adaclose(struct disk *dp)
 	/* We only sync the cache if the drive is capable of it. */
 	if ((softc->flags & ADA_FLAG_DIRTY) != 0 &&
 	    (softc->flags & ADA_FLAG_CAN_FLUSHCACHE) != 0 &&
-	    (periph->flags & CAM_PERIPH_INVALID) == 0) {
+	    (periph->flags & CAM_PERIPH_INVALID) == 0 &&
+	    cam_periph_hold(periph, PRIBIO) == 0) {
 
 		ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
 		cam_fill_ataio(&ccb->ataio,
@@ -669,10 +670,13 @@ adaclose(struct disk *dp)
 		else
 			softc->flags &= ~ADA_FLAG_DIRTY;
 		xpt_release_ccb(ccb);
+		cam_periph_unhold(periph);
 	}
 
 	softc->flags &= ~ADA_FLAG_OPEN;
-	cam_periph_unhold(periph);
+
+	while (softc->refcount != 0)
+		cam_periph_sleep(periph, &softc->refcount, PRIBIO, "adaclose", 1);
 	cam_periph_unlock(periph);
 	cam_periph_release(periph);
 	return (0);	
@@ -682,23 +686,15 @@ static void
 adaschedule(struct cam_periph *periph)
 {
 	struct ada_softc *softc = (struct ada_softc *)periph->softc;
-	uint32_t prio;
 
 	if (softc->state != ADA_STATE_NORMAL)
 		return;
 
-	/* Check if cam_periph_getccb() was called. */
-	prio = periph->immediate_priority;
-
 	/* Check if we have more work to do. */
 	if (bioq_first(&softc->bio_queue) ||
 	    (!softc->trim_running && bioq_first(&softc->trim_queue))) {
-		prio = CAM_PRIORITY_NORMAL;
+		xpt_schedule(periph, CAM_PRIORITY_NORMAL);
 	}
-
-	/* Schedule CCB if any of above is true. */
-	if (prio != CAM_PRIORITY_NONE)
-		xpt_schedule(periph, prio);
 }
 
 /*
@@ -907,7 +903,6 @@ adaoninvalidate(struct cam_periph *periph)
 	bioq_flush(&softc->trim_queue, NULL, ENXIO);
 
 	disk_gone(softc->disk);
-	xpt_print(periph->path, "lost device\n");
 }
 
 static void
@@ -917,7 +912,6 @@ adacleanup(struct cam_periph *periph)
 
 	softc = (struct ada_softc *)periph->softc;
 
-	xpt_print(periph->path, "removing device entry\n");
 	cam_periph_unlock(periph);
 
 	/*
@@ -964,7 +958,7 @@ adaasync(void *callback_arg, u_int32_t code,
 		status = cam_periph_alloc(adaregister, adaoninvalidate,
 					  adacleanup, adastart,
 					  "ada", CAM_PERIPH_BIO,
-					  cgd->ccb_h.path, adaasync,
+					  path, adaasync,
 					  AC_FOUND_DEVICE, cgd);
 
 		if (status != CAM_REQ_CMP
@@ -1040,8 +1034,10 @@ adaasync(void *callback_arg, u_int32_t code,
 			softc->state = ADA_STATE_WCACHE;
 		else
 		    break;
-		cam_periph_acquire(periph);
-		xpt_schedule(periph, CAM_PRIORITY_DEV);
+		if (cam_periph_acquire(periph) != CAM_REQ_CMP)
+			softc->state = ADA_STATE_NORMAL;
+		else
+			xpt_schedule(periph, CAM_PRIORITY_DEV);
 	}
 	default:
 		cam_periph_async(periph, code, path, arg);
@@ -1225,12 +1221,13 @@ adaregister(struct cam_periph *periph, void *arg)
 	    "kern.cam.ada.%d.write_cache", periph->unit_number);
 	TUNABLE_INT_FETCH(announce_buf, &softc->write_cache);
 	/* Disable queue sorting for non-rotational media by default. */
-	if (cgd->ident_data.media_rotation_rate == 1)
+	if (cgd->ident_data.media_rotation_rate == ATA_RATE_NON_ROTATING)
 		softc->sort_io_queue = 0;
 	else
 		softc->sort_io_queue = -1;
 	adagetparams(periph, cgd);
 	softc->disk = disk_alloc();
+	softc->disk->d_rotation_rate = cgd->ident_data.media_rotation_rate;
 	softc->disk->d_devstat = devstat_new_entry(periph->periph_name,
 			  periph->unit_number, softc->params.secsize,
 			  DEVSTAT_ALL_SUPPORTED,
@@ -1256,7 +1253,7 @@ adaregister(struct cam_periph *periph, void *arg)
 		maxio = min(maxio, 256 * softc->params.secsize);
 	softc->disk->d_maxsize = maxio;
 	softc->disk->d_unit = periph->unit_number;
-	softc->disk->d_flags = 0;
+	softc->disk->d_flags = DISKFLAG_DIRECT_COMPLETION;
 	if (softc->flags & ADA_FLAG_CAN_FLUSHCACHE)
 		softc->disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
 	if (softc->flags & ADA_FLAG_CAN_TRIM) {
@@ -1348,8 +1345,8 @@ adaregister(struct cam_periph *periph, void *arg)
 	 * Create our sysctl variables, now that we know
 	 * we have successfully attached.
 	 */
-	cam_periph_acquire(periph);
-	taskqueue_enqueue(taskqueue_thread, &softc->sysctl_task);
+	if (cam_periph_acquire(periph) == CAM_REQ_CMP)
+		taskqueue_enqueue(taskqueue_thread, &softc->sysctl_task);
 
 	/*
 	 * Add async callbacks for bus reset and
@@ -1367,7 +1364,7 @@ adaregister(struct cam_periph *periph, void *arg)
 	 * Schedule a periodic event to occasionally send an
 	 * ordered tag to a device.
 	 */
-	callout_init_mtx(&softc->sendordered_c, periph->sim->mtx, 0);
+	callout_init_mtx(&softc->sendordered_c, cam_periph_mtx(periph), 0);
 	callout_reset(&softc->sendordered_c,
 	    (ada_default_timeout * hz) / ADA_ORDEREDTAG_INTERVAL,
 	    adasendorderedtag, softc);
@@ -1375,16 +1372,17 @@ adaregister(struct cam_periph *periph, void *arg)
 	if (ADA_RA >= 0 &&
 	    cgd->ident_data.support.command1 & ATA_SUPPORT_LOOKAHEAD) {
 		softc->state = ADA_STATE_RAHEAD;
-		cam_periph_acquire(periph);
-		xpt_schedule(periph, CAM_PRIORITY_DEV);
 	} else if (ADA_WC >= 0 &&
 	    cgd->ident_data.support.command1 & ATA_SUPPORT_WRITECACHE) {
 		softc->state = ADA_STATE_WCACHE;
-		cam_periph_acquire(periph);
-		xpt_schedule(periph, CAM_PRIORITY_DEV);
-	} else
+	} else {
 		softc->state = ADA_STATE_NORMAL;
-
+		return(CAM_REQ_CMP);
+	}
+	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
+		softc->state = ADA_STATE_NORMAL;
+	else
+		xpt_schedule(periph, CAM_PRIORITY_DEV);
 	return(CAM_REQ_CMP);
 }
 
@@ -1402,29 +1400,17 @@ adastart(struct cam_periph *periph, union ccb *start_ccb)
 		struct bio *bp;
 		u_int8_t tag_code;
 
-		/* Execute immediate CCB if waiting. */
-		if (periph->immediate_priority <= periph->pinfo.priority) {
-			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE,
-					("queuing for immediate ccb\n"));
-			start_ccb->ccb_h.ccb_state = ADA_CCB_WAITING;
-			SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-					  periph_links.sle);
-			periph->immediate_priority = CAM_PRIORITY_NONE;
-			wakeup(&periph->ccb_list);
-			/* Have more work to do, so ensure we stay scheduled */
-			adaschedule(periph);
-			break;
-		}
 		/* Run TRIM if not running yet. */
 		if (!softc->trim_running &&
 		    (bp = bioq_first(&softc->trim_queue)) != 0) {
 			struct trim_request *req = &softc->trim_req;
 			struct bio *bp1;
 			uint64_t lastlba = (uint64_t)-1;
-			int bps = 0, c, lastcount = 0, off, ranges = 0;
+			int c, lastcount = 0, off, ranges = 0;
 
 			softc->trim_running = 1;
 			bzero(req, sizeof(*req));
+			TAILQ_INIT(&req->bps);
 			bp1 = bp;
 			do {
 				uint64_t lba = bp1->bio_pblkno;
@@ -1467,10 +1453,9 @@ adastart(struct cam_periph *periph, union ccb *start_ccb)
 					 */
 				}
 				lastlba = lba;
-				req->bps[bps++] = bp1;
+				TAILQ_INSERT_TAIL(&req->bps, bp1, bio_queue);
 				bp1 = bioq_first(&softc->trim_queue);
-				if (bps >= TRIM_MAX_BIOS ||
-				    bp1 == NULL ||
+				if (bp1 == NULL ||
 				    bp1->bio_bcount / softc->params.secsize >
 				    (softc->trim_max_ranges - ranges) *
 				    ATA_DSM_RANGE_MAX)
@@ -1489,6 +1474,7 @@ adastart(struct cam_periph *periph, union ccb *start_ccb)
 			    ATA_DSM_TRIM, 0, (ranges + ATA_DSM_BLK_RANGES -
 			    1) / ATA_DSM_BLK_RANGES);
 			start_ccb->ccb_h.ccb_state = ADA_CCB_TRIM;
+			start_ccb->ccb_h.flags |= CAM_UNLOCKED;
 			goto out;
 		}
 		/* Run regular command. */
@@ -1502,7 +1488,7 @@ adastart(struct cam_periph *periph, union ccb *start_ccb)
 		if ((bp->bio_flags & BIO_ORDERED) != 0
 		 || (softc->flags & ADA_FLAG_NEED_OTAG) != 0) {
 			softc->flags &= ~ADA_FLAG_NEED_OTAG;
-			softc->ordered_tag_count++;
+			softc->flags |= ADA_FLAG_WAS_OTAG;
 			tag_code = 0;
 		} else {
 			tag_code = 1;
@@ -1657,10 +1643,15 @@ adastart(struct cam_periph *periph, union ccb *start_ccb)
 			break;
 		}
 		start_ccb->ccb_h.ccb_state = ADA_CCB_BUFFER_IO;
+		start_ccb->ccb_h.flags |= CAM_UNLOCKED;
 out:
 		start_ccb->ccb_h.ccb_bp = bp;
 		softc->outstanding_cmds++;
+		softc->refcount++;
+		cam_periph_unlock(periph);
 		xpt_action(start_ccb);
+		cam_periph_lock(periph);
+		softc->refcount--;
 
 		/* May have more work to do, so ensure we stay scheduled */
 		adaschedule(periph);
@@ -1669,13 +1660,6 @@ out:
 	case ADA_STATE_RAHEAD:
 	case ADA_STATE_WCACHE:
 	{
-		if ((periph->flags & CAM_PERIPH_INVALID) != 0) {
-			softc->state = ADA_STATE_NORMAL;
-			xpt_release_ccb(start_ccb);
-			cam_periph_release_locked(periph);
-			return;
-		}
-
 		cam_fill_ataio(ataio,
 		    1,
 		    adadone,
@@ -1724,10 +1708,12 @@ adadone(struct cam_periph *periph, union ccb *done_ccb)
 		struct bio *bp;
 		int error;
 
+		cam_periph_lock(periph);
 		if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
 			error = adaerror(done_ccb, 0, 0);
 			if (error == ERESTART) {
 				/* A retry was scheduled, so just return. */
+				cam_periph_unlock(periph);
 				return;
 			}
 			if ((done_ccb->ccb_h.status & CAM_DEV_QFRZN) != 0)
@@ -1756,29 +1742,32 @@ adadone(struct cam_periph *periph, union ccb *done_ccb)
 		}
 		softc->outstanding_cmds--;
 		if (softc->outstanding_cmds == 0)
-			softc->flags |= ADA_FLAG_WENT_IDLE;
+			softc->flags |= ADA_FLAG_WAS_OTAG;
+		xpt_release_ccb(done_ccb);
 		if (state == ADA_CCB_TRIM) {
-			struct trim_request *req =
-			    (struct trim_request *)ataio->data_ptr;
-			int i;
+			TAILQ_HEAD(, bio) queue;
+			struct bio *bp1;
 
-			for (i = 1; i < TRIM_MAX_BIOS && req->bps[i]; i++) {
-				struct bio *bp1 = req->bps[i];
-
-				bp1->bio_error = bp->bio_error;
-				if (bp->bio_flags & BIO_ERROR) {
+			TAILQ_INIT(&queue);
+			TAILQ_CONCAT(&queue, &softc->trim_req.bps, bio_queue);
+			softc->trim_running = 0;
+			adaschedule(periph);
+			cam_periph_unlock(periph);
+			while ((bp1 = TAILQ_FIRST(&queue)) != NULL) {
+				TAILQ_REMOVE(&queue, bp1, bio_queue);
+				bp1->bio_error = error;
+				if (error != 0) {
 					bp1->bio_flags |= BIO_ERROR;
 					bp1->bio_resid = bp1->bio_bcount;
 				} else
 					bp1->bio_resid = 0;
 				biodone(bp1);
 			}
-			softc->trim_running = 0;
+		} else {
+			cam_periph_unlock(periph);
 			biodone(bp);
-			adaschedule(periph);
-		} else
-			biodone(bp);
-		break;
+		}
+		return;
 	}
 	case ADA_CCB_RAHEAD:
 	{
@@ -1854,12 +1843,6 @@ out:
 		cam_periph_release_locked(periph);
 		return;
 	}
-	case ADA_CCB_WAITING:
-	{
-		/* Caller will release the CCB */
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
-	}
 	case ADA_CCB_DUMP:
 		/* No-op.  We're polling */
 		return;
@@ -1921,14 +1904,11 @@ adasendorderedtag(void *arg)
 	struct ada_softc *softc = arg;
 
 	if (ada_send_ordered) {
-		if ((softc->ordered_tag_count == 0) 
-		 && ((softc->flags & ADA_FLAG_WENT_IDLE) == 0)) {
-			softc->flags |= ADA_FLAG_NEED_OTAG;
+		if (softc->outstanding_cmds > 0) {
+			if ((softc->flags & ADA_FLAG_WAS_OTAG) == 0)
+				softc->flags |= ADA_FLAG_NEED_OTAG;
+			softc->flags &= ~ADA_FLAG_WAS_OTAG;
 		}
-		if (softc->outstanding_cmds > 0)
-			softc->flags &= ~ADA_FLAG_WENT_IDLE;
-
-		softc->ordered_tag_count = 0;
 	}
 	/* Queue us up again */
 	callout_reset(&softc->sendordered_c,
diff --git a/sys/cam/ata/ata_pmp.c b/sys/cam/ata/ata_pmp.c
index 8d4e185ad93..bd4d25a67de 100644
--- a/sys/cam/ata/ata_pmp.c
+++ b/sys/cam/ata/ata_pmp.c
@@ -241,7 +241,6 @@ pmponinvalidate(struct cam_periph *periph)
 		}
 	}
 	pmprelease(periph, -1);
-	xpt_print(periph->path, "lost device\n");
 }
 
 static void
@@ -251,7 +250,6 @@ pmpcleanup(struct cam_periph *periph)
 
 	softc = (struct pmp_softc *)periph->softc;
 
-	xpt_print(periph->path, "removing device entry\n");
 	cam_periph_unlock(periph);
 
 	/*
@@ -295,7 +293,7 @@ pmpasync(void *callback_arg, u_int32_t code,
 		status = cam_periph_alloc(pmpregister, pmponinvalidate,
 					  pmpcleanup, pmpstart,
 					  "pmp", CAM_PERIPH_BIO,
-					  cgd->ccb_h.path, pmpasync,
+					  path, pmpasync,
 					  AC_FOUND_DEVICE, cgd);
 
 		if (status != CAM_REQ_CMP
@@ -320,13 +318,17 @@ pmpasync(void *callback_arg, u_int32_t code,
 		if (code == AC_SENT_BDR || code == AC_BUS_RESET)
 			softc->found = 0; /* We have to reset everything. */
 		if (softc->state == PMP_STATE_NORMAL) {
-			if (softc->pm_pid == 0x37261095 ||
-			    softc->pm_pid == 0x38261095)
-				softc->state = PMP_STATE_PM_QUIRKS_1;
-			else
-				softc->state = PMP_STATE_PRECONFIG;
-			cam_periph_acquire(periph);
-			xpt_schedule(periph, CAM_PRIORITY_DEV);
+			if (cam_periph_acquire(periph) == CAM_REQ_CMP) {
+				if (softc->pm_pid == 0x37261095 ||
+				    softc->pm_pid == 0x38261095)
+					softc->state = PMP_STATE_PM_QUIRKS_1;
+				else
+					softc->state = PMP_STATE_PRECONFIG;
+				xpt_schedule(periph, CAM_PRIORITY_DEV);
+			} else {
+				pmprelease(periph, softc->found);
+				xpt_release_boot();
+			}
 		} else
 			softc->restart = 1;
 		break;
diff --git a/sys/cam/ata/ata_xpt.c b/sys/cam/ata/ata_xpt.c
index 2d9b05d5adf..867b2fe0b97 100644
--- a/sys/cam/ata/ata_xpt.c
+++ b/sys/cam/ata/ata_xpt.c
@@ -182,7 +182,7 @@ static struct cam_ed *
 static void	 ata_device_transport(struct cam_path *path);
 static void	 ata_get_transfer_settings(struct ccb_trans_settings *cts);
 static void	 ata_set_transfer_settings(struct ccb_trans_settings *cts,
-					    struct cam_ed *device,
+					    struct cam_path *path,
 					    int async_update);
 static void	 ata_dev_async(u_int32_t async_code,
 				struct cam_eb *bus,
@@ -249,6 +249,7 @@ proberegister(struct cam_periph *periph, void *arg)
 		return (status);
 	}
 	CAM_DEBUG(periph->path, CAM_DEBUG_PROBE, ("Probe started\n"));
+	ata_device_transport(periph->path);
 	probeschedule(periph);
 	return(CAM_REQ_CMP);
 }
@@ -1320,6 +1321,7 @@ ata_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 	struct	cam_path *path;
 	ata_scan_bus_info *scan_info;
 	union	ccb *work_ccb, *reset_ccb;
+	struct mtx *mtx;
 	cam_status status;
 
 	CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE,
@@ -1395,11 +1397,14 @@ ata_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 			xpt_done(request_ccb);
 			break;
 		}
+		mtx = xpt_path_mtx(scan_info->request_ccb->ccb_h.path);
 		goto scan_next;
 	case XPT_SCAN_LUN:
 		work_ccb = request_ccb;
 		/* Reuse the same CCB to query if a device was really found */
 		scan_info = (ata_scan_bus_info *)work_ccb->ccb_h.ppriv_ptr0;
+		mtx = xpt_path_mtx(scan_info->request_ccb->ccb_h.path);
+		mtx_lock(mtx);
 		/* If there is PMP... */
 		if ((scan_info->cpi->hba_inquiry & PI_SATAPM) &&
 		    (scan_info->counter == scan_info->cpi->max_target)) {
@@ -1428,6 +1433,7 @@ ata_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 		    ((scan_info->cpi->hba_inquiry & PI_SATAPM) ?
 		    0 : scan_info->cpi->max_target)) {
 done:
+			mtx_unlock(mtx);
 			xpt_free_ccb(work_ccb);
 			xpt_free_ccb((union ccb *)scan_info->cpi);
 			request_ccb = scan_info->request_ccb;
@@ -1444,6 +1450,8 @@ scan_next:
 		    scan_info->request_ccb->ccb_h.path_id,
 		    scan_info->counter, 0);
 		if (status != CAM_REQ_CMP) {
+			if (request_ccb->ccb_h.func_code == XPT_SCAN_LUN)
+				mtx_unlock(mtx);
 			printf("xpt_scan_bus: xpt_create_path failed"
 			    " with status %#x, bus scan halted\n",
 			    status);
@@ -1459,9 +1467,15 @@ scan_next:
 		    scan_info->request_ccb->ccb_h.pinfo.priority);
 		work_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 		work_ccb->ccb_h.cbfcnp = ata_scan_bus;
+		work_ccb->ccb_h.flags |= CAM_UNLOCKED;
 		work_ccb->ccb_h.ppriv_ptr0 = scan_info;
 		work_ccb->crcn.flags = scan_info->request_ccb->crcn.flags;
+		mtx_unlock(mtx);
+		if (request_ccb->ccb_h.func_code == XPT_SCAN_LUN)
+			mtx = NULL;
 		xpt_action(work_ccb);
+		if (mtx != NULL)
+			mtx_lock(mtx);
 		break;
 	default:
 		break;
@@ -1476,6 +1490,7 @@ ata_scan_lun(struct cam_periph *periph, struct cam_path *path,
 	cam_status status;
 	struct cam_path *new_path;
 	struct cam_periph *old_periph;
+	int lock;
 
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_scan_lun\n"));
 
@@ -1510,10 +1525,14 @@ ata_scan_lun(struct cam_periph *periph, struct cam_path *path,
 		}
 		xpt_setup_ccb(&request_ccb->ccb_h, new_path, CAM_PRIORITY_XPT);
 		request_ccb->ccb_h.cbfcnp = xptscandone;
+		request_ccb->ccb_h.flags |= CAM_UNLOCKED;
 		request_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 		request_ccb->crcn.flags = flags;
 	}
 
+	lock = (xpt_path_owned(path) == 0);
+	if (lock)
+		xpt_path_lock(path);
 	if ((old_periph = cam_periph_find(path, "aprobe")) != NULL) {
 		if ((old_periph->flags & CAM_PERIPH_INVALID) == 0) {
 			probe_softc *softc;
@@ -1540,6 +1559,8 @@ ata_scan_lun(struct cam_periph *periph, struct cam_path *path,
 			xpt_done(request_ccb);
 		}
 	}
+	if (lock)
+		xpt_path_unlock(path);
 }
 
 static void
@@ -1553,7 +1574,6 @@ xptscandone(struct cam_periph *periph, union ccb *done_ccb)
 static struct cam_ed *
 ata_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 {
-	struct cam_path path;
 	struct ata_quirk_entry *quirk;
 	struct cam_ed *device;
 
@@ -1574,22 +1594,6 @@ ata_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 	device->queue_flags = 0;
 	device->serial_num = NULL;
 	device->serial_num_len = 0;
-
-	/*
-	 * XXX should be limited by number of CCBs this bus can
-	 * do.
-	 */
-	bus->sim->max_ccbs += device->ccbq.devq_openings;
-	if (lun_id != CAM_LUN_WILDCARD) {
-		xpt_compile_path(&path,
-				 NULL,
-				 bus->path_id,
-				 target->target_id,
-				 lun_id);
-		ata_device_transport(&path);
-		xpt_release_path(&path);
-	}
-
 	return (device);
 }
 
@@ -1712,15 +1716,8 @@ ata_dev_advinfo(union ccb *start_ccb)
 	start_ccb->ccb_h.status = CAM_REQ_CMP;
 
 	if (cdai->flags & CDAI_FLAG_STORE) {
-		int owned;
-
-		owned = mtx_owned(start_ccb->ccb_h.path->bus->sim->mtx);
-		if (owned == 0)
-			mtx_lock(start_ccb->ccb_h.path->bus->sim->mtx);
 		xpt_async(AC_ADVINFO_CHANGED, start_ccb->ccb_h.path,
 			  (void *)(uintptr_t)cdai->buftype);
-		if (owned == 0)
-			mtx_unlock(start_ccb->ccb_h.path->bus->sim->mtx);
 	}
 }
 
@@ -1732,7 +1729,7 @@ ata_action(union ccb *start_ccb)
 	case XPT_SET_TRAN_SETTINGS:
 	{
 		ata_set_transfer_settings(&start_ccb->cts,
-					   start_ccb->ccb_h.path->device,
+					   start_ccb->ccb_h.path,
 					   /*async_update*/FALSE);
 		break;
 	}
@@ -1791,11 +1788,9 @@ ata_get_transfer_settings(struct ccb_trans_settings *cts)
 	struct	ccb_trans_settings_ata *ata;
 	struct	ccb_trans_settings_scsi *scsi;
 	struct	cam_ed *device;
-	struct	cam_sim *sim;
 
 	device = cts->ccb_h.path->device;
-	sim = cts->ccb_h.path->bus->sim;
-	(*(sim->sim_action))(sim, (union ccb *)cts);
+	xpt_action_default((union ccb *)cts);
 
 	if (cts->protocol == PROTO_UNKNOWN ||
 	    cts->protocol == PROTO_UNSPECIFIED) {
@@ -1832,17 +1827,17 @@ ata_get_transfer_settings(struct ccb_trans_settings *cts)
 }
 
 static void
-ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device,
+ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_path *path,
 			   int async_update)
 {
 	struct	ccb_pathinq cpi;
 	struct	ccb_trans_settings_ata *ata;
 	struct	ccb_trans_settings_scsi *scsi;
-	struct	cam_sim *sim;
 	struct	ata_params *ident_data;
 	struct	scsi_inquiry_data *inq_data;
+	struct	cam_ed *device;
 
-	if (device == NULL) {
+	if (path == NULL || (device = path->device) == NULL) {
 		cts->ccb_h.status = CAM_PATH_INVALID;
 		xpt_done((union ccb *)cts);
 		return;
@@ -1859,14 +1854,14 @@ ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device,
 		cts->protocol_version = device->protocol_version;
 
 	if (cts->protocol != device->protocol) {
-		xpt_print(cts->ccb_h.path, "Uninitialized Protocol %x:%x?\n",
+		xpt_print(path, "Uninitialized Protocol %x:%x?\n",
 		       cts->protocol, device->protocol);
 		cts->protocol = device->protocol;
 	}
 
 	if (cts->protocol_version > device->protocol_version) {
 		if (bootverbose) {
-			xpt_print(cts->ccb_h.path, "Down reving Protocol "
+			xpt_print(path, "Down reving Protocol "
 			    "Version from %d to %d?\n", cts->protocol_version,
 			    device->protocol_version);
 		}
@@ -1884,21 +1879,20 @@ ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device,
 		cts->transport_version = device->transport_version;
 
 	if (cts->transport != device->transport) {
-		xpt_print(cts->ccb_h.path, "Uninitialized Transport %x:%x?\n",
+		xpt_print(path, "Uninitialized Transport %x:%x?\n",
 		    cts->transport, device->transport);
 		cts->transport = device->transport;
 	}
 
 	if (cts->transport_version > device->transport_version) {
 		if (bootverbose) {
-			xpt_print(cts->ccb_h.path, "Down reving Transport "
+			xpt_print(path, "Down reving Transport "
 			    "Version from %d to %d?\n", cts->transport_version,
 			    device->transport_version);
 		}
 		cts->transport_version = device->transport_version;
 	}
 
-	sim = cts->ccb_h.path->bus->sim;
 	ident_data = &device->ident_data;
 	inq_data = &device->inq_data;
 	if (cts->protocol == PROTO_ATA)
@@ -1909,7 +1903,7 @@ ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device,
 		scsi = &cts->proto_specific.scsi;
 	else
 		scsi = NULL;
-	xpt_setup_ccb(&cpi.ccb_h, cts->ccb_h.path, CAM_PRIORITY_NONE);
+	xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NONE);
 	cpi.ccb_h.func_code = XPT_PATH_INQ;
 	xpt_action((union ccb *)&cpi);
 
@@ -1953,11 +1947,11 @@ ata_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device,
 			device->tag_delay_count = CAM_TAG_DELAY_COUNT;
 			device->flags |= CAM_DEV_TAG_AFTER_COUNT;
 		} else if (nowt && !newt)
-			xpt_stop_tags(cts->ccb_h.path);
+			xpt_stop_tags(path);
 	}
 
 	if (async_update == FALSE)
-		(*(sim->sim_action))(sim, (union ccb *)cts);
+		xpt_action_default((union ccb *)cts);
 }
 
 /*
@@ -2014,10 +2008,14 @@ ata_dev_async(u_int32_t async_code, struct cam_eb *bus, struct cam_et *target,
 		xpt_release_device(device);
 	} else if (async_code == AC_TRANSFER_NEG) {
 		struct ccb_trans_settings *settings;
+		struct cam_path path;
 
 		settings = (struct ccb_trans_settings *)async_arg;
-		ata_set_transfer_settings(settings, device,
+		xpt_compile_path(&path, NULL, bus->path_id, target->target_id,
+				 device->lun_id);
+		ata_set_transfer_settings(settings, &path,
 					  /*async_update*/TRUE);
+		xpt_release_path(&path);
 	}
 }
 
@@ -2030,7 +2028,7 @@ ata_announce_periph(struct cam_periph *periph)
 	u_int	speed;
 	u_int	mb;
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
+	cam_periph_assert(periph, MA_OWNED);
 
 	xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
 	cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
diff --git a/sys/cam/cam.h b/sys/cam/cam.h
index 09103b6e42d..20fd3cc0825 100644
--- a/sys/cam/cam.h
+++ b/sys/cam/cam.h
@@ -50,6 +50,12 @@ typedef union {
 #define	CAM_TARGET_WILDCARD ((target_id_t)~0)
 #define	CAM_LUN_WILDCARD ((lun_id_t)~0)
 
+#define CAM_EXTLUN_BYTE_SWIZZLE(lun) (	\
+	((((u_int64_t)lun) & 0xffff000000000000L) >> 48) | \
+	((((u_int64_t)lun) & 0x0000ffff00000000L) >> 16) | \
+	((((u_int64_t)lun) & 0x00000000ffff0000L) << 16) | \
+	((((u_int64_t)lun) & 0x000000000000ffffL) << 48))
+
 /*
  * Maximum length for a CAM CDB.  
  */
diff --git a/sys/cam/cam_ccb.h b/sys/cam/cam_ccb.h
index 127246b9abc..139bd505ee5 100644
--- a/sys/cam/cam_ccb.h
+++ b/sys/cam/cam_ccb.h
@@ -104,7 +104,9 @@ typedef enum {
 	CAM_SEND_SENSE		= 0x08000000,/* Send sense data with status   */
 	CAM_TERM_IO		= 0x10000000,/* Terminate I/O Message sup.    */
 	CAM_DISCONNECT		= 0x20000000,/* Disconnects are mandatory     */
-	CAM_SEND_STATUS		= 0x40000000 /* Send status after data phase  */
+	CAM_SEND_STATUS		= 0x40000000,/* Send status after data phase  */
+
+	CAM_UNLOCKED		= 0x80000000 /* Call callback without lock.   */
 } ccb_flags;
 
 typedef enum {
@@ -151,6 +153,9 @@ typedef enum {
 				/* Device statistics (error counts, etc.) */
 	XPT_DEV_ADVINFO		= 0x0e,
 				/* Get/Set Device advanced information */
+	XPT_ASYNC		= 0x0f | XPT_FC_QUEUED | XPT_FC_USER_CCB
+				       | XPT_FC_XPT_ONLY,
+				/* Asynchronous event */
 /* SCSI Control Functions: 0x10->0x1F */
 	XPT_ABORT		= 0x10,
 				/* Abort the specified CCB */
@@ -1153,6 +1158,16 @@ struct ccb_dev_advinfo {
 	uint8_t *buf;			/* IN/OUT: Buffer for requested data */
 };
 
+/*
+ * CCB for sending async events
+ */
+struct ccb_async {
+	struct ccb_hdr ccb_h;
+	uint32_t async_code;
+	off_t async_arg_size;
+	void *async_arg_ptr;
+};
+
 /*
  * Union of all CCB types for kernel space allocation.  This union should
  * never be used for manipulating CCBs - its only use is for the allocation
@@ -1192,6 +1207,7 @@ union ccb {
 	struct  ccb_debug		cdbg;
 	struct	ccb_ataio		ataio;
 	struct	ccb_dev_advinfo		cdai;
+	struct	ccb_async		casync;
 };
 
 __BEGIN_DECLS
diff --git a/sys/cam/cam_periph.c b/sys/cam/cam_periph.c
index b230c6c5416..1c636cbda02 100644
--- a/sys/cam/cam_periph.c
+++ b/sys/cam/cam_periph.c
@@ -196,12 +196,12 @@ cam_periph_alloc(periph_ctor_t *periph_ctor,
 	path_id = xpt_path_path_id(path);
 	target_id = xpt_path_target_id(path);
 	lun_id = xpt_path_lun_id(path);
-	cam_init_pinfo(&periph->pinfo);
 	periph->periph_start = periph_start;
 	periph->periph_dtor = periph_dtor;
 	periph->periph_oninval = periph_oninvalidate;
 	periph->type = type;
 	periph->periph_name = name;
+	periph->scheduled_priority = CAM_PRIORITY_NONE;
 	periph->immediate_priority = CAM_PRIORITY_NONE;
 	periph->refcount = 1;		/* Dropped by invalidation. */
 	periph->sim = sim;
@@ -298,7 +298,7 @@ cam_periph_find(struct cam_path *path, char *name)
 		TAILQ_FOREACH(periph, &(*p_drv)->units, unit_links) {
 			if (xpt_path_comp(periph->path, path) == 0) {
 				xpt_unlock_buses();
-				mtx_assert(periph->sim->mtx, MA_OWNED);
+				cam_periph_assert(periph, MA_OWNED);
 				return(periph);
 			}
 		}
@@ -379,7 +379,7 @@ void
 cam_periph_release_locked_buses(struct cam_periph *periph)
 {
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
+	cam_periph_assert(periph, MA_OWNED);
 	KASSERT(periph->refcount >= 1, ("periph->refcount >= 1"));
 	if (--periph->refcount == 0)
 		camperiphfree(periph);
@@ -400,16 +400,16 @@ cam_periph_release_locked(struct cam_periph *periph)
 void
 cam_periph_release(struct cam_periph *periph)
 {
-	struct cam_sim *sim;
+	struct mtx *mtx;
 
 	if (periph == NULL)
 		return;
 	
-	sim = periph->sim;
-	mtx_assert(sim->mtx, MA_NOTOWNED);
-	mtx_lock(sim->mtx);
+	cam_periph_assert(periph, MA_NOTOWNED);
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 	cam_periph_release_locked(periph);
-	mtx_unlock(sim->mtx);
+	mtx_unlock(mtx);
 }
 
 int
@@ -427,10 +427,10 @@ cam_periph_hold(struct cam_periph *periph, int priority)
 	if (cam_periph_acquire(periph) != CAM_REQ_CMP)
 		return (ENXIO);
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
+	cam_periph_assert(periph, MA_OWNED);
 	while ((periph->flags & CAM_PERIPH_LOCKED) != 0) {
 		periph->flags |= CAM_PERIPH_LOCK_WANTED;
-		if ((error = mtx_sleep(periph, periph->sim->mtx, priority,
+		if ((error = cam_periph_sleep(periph, periph, priority,
 		    "caplck", 0)) != 0) {
 			cam_periph_release_locked(periph);
 			return (error);
@@ -449,7 +449,7 @@ void
 cam_periph_unhold(struct cam_periph *periph)
 {
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
+	cam_periph_assert(periph, MA_OWNED);
 
 	periph->flags &= ~CAM_PERIPH_LOCKED;
 	if ((periph->flags & CAM_PERIPH_LOCK_WANTED) != 0) {
@@ -577,7 +577,7 @@ void
 cam_periph_invalidate(struct cam_periph *periph)
 {
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
+	cam_periph_assert(periph, MA_OWNED);
 	/*
 	 * We only call this routine the first time a peripheral is
 	 * invalidated.
@@ -586,6 +586,8 @@ cam_periph_invalidate(struct cam_periph *periph)
 		return;
 
 	CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph invalidated\n"));
+	if (periph->flags & CAM_PERIPH_ANNOUNCED)
+		xpt_denounce_periph(periph);
 	periph->flags |= CAM_PERIPH_INVALID;
 	periph->flags &= ~CAM_PERIPH_NEW_DEV_FOUND;
 	if (periph->periph_oninval != NULL)
@@ -598,7 +600,9 @@ camperiphfree(struct cam_periph *periph)
 {
 	struct periph_driver **p_drv;
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
+	cam_periph_assert(periph, MA_OWNED);
+	KASSERT(periph->periph_allocating == 0, ("%s%d: freed while allocating",
+	    periph->periph_name, periph->unit_number));
 	for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) {
 		if (strcmp((*p_drv)->driver_name, periph->periph_name) == 0)
 			break;
@@ -648,7 +652,10 @@ camperiphfree(struct cam_periph *periph)
 	xpt_remove_periph(periph);
 
 	xpt_unlock_buses();
-	CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph destroyed\n"));
+	if (periph->flags & CAM_PERIPH_ANNOUNCED) {
+		xpt_print(periph->path, "Periph destroyed\n");
+	} else
+		CAM_DEBUG(periph->path, CAM_DEBUG_INFO, ("Periph destroyed\n"));
 
 	if (periph->flags & CAM_PERIPH_NEW_DEV_FOUND) {
 		union ccb ccb;
@@ -942,40 +949,14 @@ cam_periph_unmapmem(union ccb *ccb, struct cam_periph_map_info *mapinfo)
 	PRELE(curproc);
 }
 
-union ccb *
-cam_periph_getccb(struct cam_periph *periph, u_int32_t priority)
-{
-	struct ccb_hdr *ccb_h;
-
-	mtx_assert(periph->sim->mtx, MA_OWNED);
-	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("entering cdgetccb\n"));
-
-	while (SLIST_FIRST(&periph->ccb_list) == NULL) {
-		if (periph->immediate_priority > priority)
-			periph->immediate_priority = priority;
-		xpt_schedule(periph, priority);
-		if ((SLIST_FIRST(&periph->ccb_list) != NULL)
-		 && (SLIST_FIRST(&periph->ccb_list)->pinfo.priority == priority))
-			break;
-		mtx_assert(periph->sim->mtx, MA_OWNED);
-		mtx_sleep(&periph->ccb_list, periph->sim->mtx, PRIBIO, "cgticb",
-		    0);
-	}
-
-	ccb_h = SLIST_FIRST(&periph->ccb_list);
-	SLIST_REMOVE_HEAD(&periph->ccb_list, periph_links.sle);
-	return ((union ccb *)ccb_h);
-}
-
 void
 cam_periph_ccbwait(union ccb *ccb)
 {
-	struct cam_sim *sim;
 
-	sim = xpt_path_sim(ccb->ccb_h.path);
 	if ((ccb->ccb_h.pinfo.index != CAM_UNQUEUED_INDEX)
 	 || ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG))
-		mtx_sleep(&ccb->ccb_h.cbfcnp, sim->mtx, PRIBIO, "cbwait", 0);
+		xpt_path_sleep(ccb->ccb_h.path, &ccb->ccb_h.cbfcnp, PRIBIO,
+		    "cbwait", 0);
 }
 
 int
@@ -1040,6 +1021,14 @@ cam_periph_ioctl(struct cam_periph *periph, u_long cmd, caddr_t addr,
 	return(error);
 }
 
+static void
+cam_periph_done(struct cam_periph *periph, union ccb *done_ccb)
+{
+
+	/* Caller will release the CCB */
+	wakeup(&done_ccb->ccb_h.cbfcnp);
+}
+
 int
 cam_periph_runccb(union ccb *ccb,
 		  int (*error_routine)(union ccb *ccb,
@@ -1048,12 +1037,9 @@ cam_periph_runccb(union ccb *ccb,
 		  cam_flags camflags, u_int32_t sense_flags,
 		  struct devstat *ds)
 {
-	struct cam_sim *sim;
 	int error;
  
-	error = 0;
-	sim = xpt_path_sim(ccb->ccb_h.path);
-	mtx_assert(sim->mtx, MA_OWNED);
+	xpt_path_assert(ccb->ccb_h.path, MA_OWNED);
 
 	/*
 	 * If the user has supplied a stats structure, and if we understand
@@ -1063,6 +1049,7 @@ cam_periph_runccb(union ccb *ccb,
 	    ccb->ccb_h.func_code == XPT_ATA_IO))
 		devstat_start_transaction(ds, NULL);
 
+	ccb->ccb_h.cbfcnp = cam_periph_done;
 	xpt_action(ccb);
  
 	do {
@@ -1781,9 +1768,11 @@ cam_periph_error(union ccb *ccb, cam_flags camflags,
 				scan_ccb->ccb_h.func_code = XPT_SCAN_TGT;
 				scan_ccb->crcn.flags = 0;
 				xpt_rescan(scan_ccb);
-			} else
+			} else {
 				xpt_print(newpath,
 				    "Can't allocate CCB to rescan target\n");
+				xpt_free_path(newpath);
+			}
 		}
 	}
 
diff --git a/sys/cam/cam_periph.h b/sys/cam/cam_periph.h
index 274537eb0ca..b9a04d98d7a 100644
--- a/sys/cam/cam_periph.h
+++ b/sys/cam/cam_periph.h
@@ -35,6 +35,7 @@
 #include <cam/cam_sim.h>
 
 #ifdef _KERNEL
+#include <sys/taskqueue.h>
 
 #include <cam/cam_xpt.h>
 
@@ -103,7 +104,6 @@ typedef cam_status	periph_ctor_t (struct cam_periph *periph,
 typedef void		periph_oninv_t (struct cam_periph *periph);
 typedef void		periph_dtor_t (struct cam_periph *periph);
 struct cam_periph {
-	cam_pinfo		 pinfo;
 	periph_start_t		*periph_start;
 	periph_oninv_t		*periph_oninval;
 	periph_dtor_t		*periph_dtor;
@@ -120,14 +120,20 @@ struct cam_periph {
 #define CAM_PERIPH_INVALID		0x08
 #define CAM_PERIPH_NEW_DEV_FOUND	0x10
 #define CAM_PERIPH_RECOVERY_INPROG	0x20
+#define CAM_PERIPH_RUN_TASK		0x40
 #define CAM_PERIPH_FREE			0x80
-	u_int32_t		 immediate_priority;
+#define CAM_PERIPH_ANNOUNCED		0x100
+	uint32_t		 scheduled_priority;
+	uint32_t		 immediate_priority;
+	int			 periph_allocating;
+	int			 periph_allocated;
 	u_int32_t		 refcount;
 	SLIST_HEAD(, ccb_hdr)	 ccb_list;	/* For "immediate" requests */
 	SLIST_ENTRY(cam_periph)  periph_links;
 	TAILQ_ENTRY(cam_periph)  unit_links;
 	ac_callback_t		*deferred_callback; 
 	ac_code			 deferred_ac;
+	struct task		 periph_run_task;
 };
 
 #define CAM_PERIPH_MAXMAPS	2
@@ -184,30 +190,26 @@ void		cam_periph_freeze_after_event(struct cam_periph *periph,
 int		cam_periph_error(union ccb *ccb, cam_flags camflags,
 				 u_int32_t sense_flags, union ccb *save_ccb);
 
-static __inline void
-cam_periph_lock(struct cam_periph *periph)
+static __inline struct mtx *
+cam_periph_mtx(struct cam_periph *periph)
 {
-	mtx_lock(periph->sim->mtx);
+	return (xpt_path_mtx(periph->path));
 }
 
-static __inline void
-cam_periph_unlock(struct cam_periph *periph)
-{
-	mtx_unlock(periph->sim->mtx);
-}
+#define cam_periph_owned(periph)					\
+	mtx_owned(xpt_path_mtx((periph)->path))
 
-static __inline int
-cam_periph_owned(struct cam_periph *periph)
-{
-	return (mtx_owned(periph->sim->mtx));
-}
+#define cam_periph_lock(periph)						\
+	mtx_lock(xpt_path_mtx((periph)->path))
 
-static __inline int
-cam_periph_sleep(struct cam_periph *periph, void *chan, int priority,
-		 const char *wmesg, int timo)
-{
-	return (msleep(chan, periph->sim->mtx, priority, wmesg, timo));
-}
+#define cam_periph_unlock(periph)					\
+	mtx_unlock(xpt_path_mtx((periph)->path))
+
+#define cam_periph_assert(periph, what)					\
+	mtx_assert(xpt_path_mtx((periph)->path), (what))
+
+#define cam_periph_sleep(periph, chan, priority, wmesg, timo)		\
+	xpt_path_sleep((periph)->path, (chan), (priority), (wmesg), (timo))
 
 static inline struct cam_periph *
 cam_periph_acquire_first(struct periph_driver *driver)
@@ -229,7 +231,7 @@ cam_periph_acquire_next(struct cam_periph *pperiph)
 {
 	struct cam_periph *periph = pperiph;
 
-	mtx_assert(pperiph->sim->mtx, MA_NOTOWNED);
+	cam_periph_assert(pperiph, MA_NOTOWNED);
 	xpt_lock_buses();
 	do {
 		periph = TAILQ_NEXT(periph, unit_links);
diff --git a/sys/cam/cam_queue.c b/sys/cam/cam_queue.c
index daaa9b3f7e9..f6624f30f06 100644
--- a/sys/cam/cam_queue.c
+++ b/sys/cam/cam_queue.c
@@ -220,27 +220,30 @@ cam_devq_alloc(int devices, int openings)
 	}
 	if (cam_devq_init(devq, devices, openings) != 0) {
 		free(devq, M_CAMDEVQ);
-		return (NULL);		
+		return (NULL);
 	}
-	
 	return (devq);
 }
 
 int
 cam_devq_init(struct cam_devq *devq, int devices, int openings)
 {
+
 	bzero(devq, sizeof(*devq));
+	mtx_init(&devq->send_mtx, "CAM queue lock", NULL, MTX_DEF);
 	if (camq_init(&devq->send_queue, devices) != 0)
 		return (1);
 	devq->send_openings = openings;
-	devq->send_active = 0;	
-	return (0);	
+	devq->send_active = 0;
+	return (0);
 }
 
 void
 cam_devq_free(struct cam_devq *devq)
 {
+
 	camq_fini(&devq->send_queue);
+	mtx_destroy(&devq->send_mtx);
 	free(devq, M_CAMDEVQ);
 }
 
@@ -286,6 +289,7 @@ cam_ccbq_resize(struct cam_ccbq *ccbq, int new_size)
 	int delta;
 
 	delta = new_size - (ccbq->dev_active + ccbq->dev_openings);
+	ccbq->total_openings += delta;
 	ccbq->devq_openings += delta;
 	ccbq->dev_openings += delta;
 
@@ -303,6 +307,7 @@ cam_ccbq_init(struct cam_ccbq *ccbq, int openings)
 	if (camq_init(&ccbq->queue,
 	    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 0bb44911766..0f74e8241a4 100644
--- a/sys/cam/cam_queue.h
+++ b/sys/cam/cam_queue.h
@@ -33,6 +33,8 @@
 
 #ifdef _KERNEL
 
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/queue.h>
 #include <cam/cam.h>
 
@@ -59,8 +61,8 @@ struct cam_ccbq {
 	struct	camq queue;
 	struct ccb_hdr_tailq	queue_extra_head;
 	int	queue_extra_entries;
+	int	total_openings;
 	int	devq_openings;
-	int	devq_allocating;
 	int	dev_openings;
 	int	dev_active;
 	int	held;
@@ -69,9 +71,10 @@ struct cam_ccbq {
 struct cam_ed;
 
 struct cam_devq {
-	struct	camq send_queue;
-	int	send_openings;
-	int	send_active;
+	struct mtx	 send_mtx;
+	struct camq	 send_queue;
+	int		 send_openings;
+	int		 send_active;
 };
 
 
diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c
index 530e16074c1..9a8c6665f58 100644
--- a/sys/cam/cam_sim.c
+++ b/sys/cam/cam_sim.c
@@ -87,7 +87,6 @@ cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll,
 	sim->flags = 0;
 	sim->refcount = 1;
 	sim->devq = queue;
-	sim->max_ccbs = 8;	/* Reserve for management purposes. */
 	sim->mtx = mtx;
 	if (mtx == &Giant) {
 		sim->flags |= 0;
@@ -96,17 +95,12 @@ cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll,
 		sim->flags |= CAM_SIM_MPSAFE;
 		callout_init(&sim->callout, 1);
 	}
-
-	SLIST_INIT(&sim->ccb_freeq);
-	TAILQ_INIT(&sim->sim_doneq);
-
 	return (sim);
 }
 
 void
 cam_sim_free(struct cam_sim *sim, int free_devq)
 {
-	union ccb *ccb;
 	int error;
 
 	mtx_assert(sim->mtx, MA_OWNED);
@@ -118,10 +112,6 @@ cam_sim_free(struct cam_sim *sim, int free_devq)
 
 	KASSERT(sim->refcount == 0, ("sim->refcount == 0"));
 
-	while ((ccb = (union ccb *)SLIST_FIRST(&sim->ccb_freeq)) != NULL) {
-		SLIST_REMOVE_HEAD(&sim->ccb_freeq, xpt_links.sle);
-		xpt_free_ccb(ccb);
-	}
 	if (free_devq)
 		cam_simq_free(sim->devq);
 	free(sim, M_CAMSIM);
@@ -130,21 +120,31 @@ cam_sim_free(struct cam_sim *sim, int free_devq)
 void
 cam_sim_release(struct cam_sim *sim)
 {
-	KASSERT(sim->refcount >= 1, ("sim->refcount >= 1"));
-	mtx_assert(sim->mtx, MA_OWNED);
+	int lock;
 
+	lock = (mtx_owned(sim->mtx) == 0);
+	if (lock)
+		CAM_SIM_LOCK(sim);
+	KASSERT(sim->refcount >= 1, ("sim->refcount >= 1"));
 	sim->refcount--;
 	if (sim->refcount == 0)
 		wakeup(sim);
+	if (lock)
+		CAM_SIM_UNLOCK(sim);
 }
 
 void
 cam_sim_hold(struct cam_sim *sim)
 {
-	KASSERT(sim->refcount >= 1, ("sim->refcount >= 1"));
-	mtx_assert(sim->mtx, MA_OWNED);
+	int lock;
 
+	lock = (mtx_owned(sim->mtx) == 0);
+	if (lock)
+		CAM_SIM_LOCK(sim);
+	KASSERT(sim->refcount >= 1, ("sim->refcount >= 1"));
 	sim->refcount++;
+	if (lock)
+		CAM_SIM_UNLOCK(sim);
 }
 
 void
diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h
index 58127ba5310..4232650338c 100644
--- a/sys/cam/cam_sim.h
+++ b/sys/cam/cam_sim.h
@@ -104,23 +104,9 @@ struct cam_sim {
 	u_int32_t		flags;
 #define	CAM_SIM_REL_TIMEOUT_PENDING	0x01
 #define	CAM_SIM_MPSAFE			0x02
-#define	CAM_SIM_ON_DONEQ		0x04
-#define	CAM_SIM_POLLED			0x08
-#define	CAM_SIM_BATCH			0x10
 	struct callout		callout;
 	struct cam_devq 	*devq;	/* Device Queue to use for this SIM */
 	int			refcount; /* References to the SIM. */
-
-	/* "Pool" of inactive ccbs managed by xpt_get_ccb and xpt_release_ccb */
-	SLIST_HEAD(,ccb_hdr)	ccb_freeq;
-	/*
-	 * Maximum size of ccb pool.  Modified as devices are added/removed
-	 * or have their * opening counts changed.
-	 */
-	u_int			max_ccbs;
-	/* Current count of allocated ccbs */
-	u_int			ccb_count;
-
 };
 
 #define CAM_SIM_LOCK(sim)	mtx_lock((sim)->mtx)
diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index 142195be574..86e2f5e6660 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -40,7 +40,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/fcntl.h>
 #include <sys/interrupt.h>
+#include <sys/proc.h>
 #include <sys/sbuf.h>
+#include <sys/smp.h>
 #include <sys/taskqueue.h>
 
 #include <sys/lock.h>
@@ -90,14 +92,9 @@ struct xpt_task {
 	uintptr_t	data2;
 };
 
-typedef enum {
-	XPT_FLAG_OPEN		= 0x01
-} xpt_flags;
-
 struct xpt_softc {
-	xpt_flags		flags;
-
 	/* number of high powered commands that can go through right now */
+	struct mtx		xpt_highpower_lock;
 	STAILQ_HEAD(highpowerlist, cam_ed)	highpowerq;
 	int			num_highpower;
 
@@ -117,6 +114,7 @@ struct xpt_softc {
 
 	struct mtx		xpt_topo_lock;
 	struct mtx		xpt_lock;
+	struct taskqueue	*xpt_taskq;
 };
 
 typedef enum {
@@ -155,14 +153,19 @@ TUNABLE_INT("kern.cam.boot_delay", &xsoftc.boot_delay);
 SYSCTL_INT(_kern_cam, OID_AUTO, boot_delay, CTLFLAG_RDTUN,
            &xsoftc.boot_delay, 0, "Bus registration wait time");
 
-/* Queues for our software interrupt handler */
-typedef TAILQ_HEAD(cam_isrq, ccb_hdr) cam_isrq_t;
-typedef TAILQ_HEAD(cam_simq, cam_sim) cam_simq_t;
-static cam_simq_t cam_simq;
-static struct mtx cam_simq_lock;
+struct cam_doneq {
+	struct mtx_padalign	cam_doneq_mtx;
+	STAILQ_HEAD(, ccb_hdr)	cam_doneq;
+	int			cam_doneq_sleep;
+};
 
-/* Pointers to software interrupt handlers */
-static void *cambio_ih;
+static struct cam_doneq cam_doneqs[MAXCPU];
+static int cam_num_doneqs;
+static struct proc *cam_proc;
+
+TUNABLE_INT("kern.cam.num_doneqs", &cam_num_doneqs);
+SYSCTL_INT(_kern_cam, OID_AUTO, num_doneqs, CTLFLAG_RDTUN,
+           &cam_num_doneqs, 0, "Number of completion queues/threads");
 
 struct cam_periph *xpt_periph;
 
@@ -223,16 +226,21 @@ static void		xpt_async_bcast(struct async_list *async_head,
 					void *async_arg);
 static path_id_t xptnextfreepathid(void);
 static path_id_t xptpathid(const char *sim_name, int sim_unit, int sim_bus);
-static union ccb *xpt_get_ccb(struct cam_ed *device);
-static void	 xpt_run_dev_allocq(struct cam_ed *device);
+static union ccb *xpt_get_ccb(struct cam_periph *periph);
+static union ccb *xpt_get_ccb_nowait(struct cam_periph *periph);
+static void	 xpt_run_allocq(struct cam_periph *periph, int sleep);
+static void	 xpt_run_allocq_task(void *context, int pending);
 static void	 xpt_run_devq(struct cam_devq *devq);
 static timeout_t xpt_release_devq_timeout;
 static void	 xpt_release_simq_timeout(void *arg) __unused;
+static void	 xpt_acquire_bus(struct cam_eb *bus);
 static void	 xpt_release_bus(struct cam_eb *bus);
-static void	 xpt_release_devq_device(struct cam_ed *dev, u_int count,
+static uint32_t	 xpt_freeze_devq_device(struct cam_ed *dev, u_int count);
+static int	 xpt_release_devq_device(struct cam_ed *dev, u_int count,
 		    int run_queue);
 static struct cam_et*
 		 xpt_alloc_target(struct cam_eb *bus, target_id_t target_id);
+static void	 xpt_acquire_target(struct cam_et *target);
 static void	 xpt_release_target(struct cam_et *target);
 static struct cam_eb*
 		 xpt_find_bus(path_id_t path_id);
@@ -241,11 +249,14 @@ static struct cam_et*
 static struct cam_ed*
 		 xpt_find_device(struct cam_et *target, lun_id_t lun_id);
 static void	 xpt_config(void *arg);
+static int	 xpt_schedule_dev(struct camq *queue, cam_pinfo *dev_pinfo,
+				 u_int32_t new_priority);
 static xpt_devicefunc_t xptpassannouncefunc;
 static void	 xptaction(struct cam_sim *sim, union ccb *work_ccb);
 static void	 xptpoll(struct cam_sim *sim);
-static void	 camisr(void *);
-static void	 camisr_runqueue(struct cam_sim *);
+static void	 camisr_runqueue(void);
+static void	 xpt_done_process(struct ccb_hdr *ccb_h);
+static void	 xpt_done_td(void *);
 static dev_match_ret	xptbusmatch(struct dev_match_pattern *patterns,
 				    u_int num_patterns, struct cam_eb *bus);
 static dev_match_ret	xptdevicematch(struct dev_match_pattern *patterns,
@@ -296,7 +307,6 @@ static xpt_devicefunc_t	xptsetasyncfunc;
 static xpt_busfunc_t	xptsetasyncbusfunc;
 static cam_status	xptregister(struct cam_periph *periph,
 				    void *arg);
-static __inline int periph_is_queued(struct cam_periph *periph);
 static __inline int device_is_queued(struct cam_ed *device);
 
 static __inline int
@@ -304,6 +314,7 @@ xpt_schedule_devq(struct cam_devq *devq, struct cam_ed *dev)
 {
 	int	retval;
 
+	mtx_assert(&devq->send_mtx, MA_OWNED);
 	if ((dev->ccbq.queue.entries > 0) &&
 	    (dev->ccbq.dev_openings > 0) &&
 	    (dev->ccbq.queue.qfrozen_cnt == 0)) {
@@ -314,7 +325,7 @@ xpt_schedule_devq(struct cam_devq *devq, struct cam_ed *dev)
 		 */
 		retval =
 		    xpt_schedule_dev(&devq->send_queue,
-				     &dev->devq_entry.pinfo,
+				     &dev->devq_entry,
 				     CAMQ_GET_PRIO(&dev->ccbq.queue));
 	} else {
 		retval = 0;
@@ -322,16 +333,10 @@ xpt_schedule_devq(struct cam_devq *devq, struct cam_ed *dev)
 	return (retval);
 }
 
-static __inline int
-periph_is_queued(struct cam_periph *periph)
-{
-	return (periph->pinfo.index != CAM_UNQUEUED_INDEX);
-}
-
 static __inline int
 device_is_queued(struct cam_ed *device)
 {
-	return (device->devq_entry.pinfo.index != CAM_UNQUEUED_INDEX);
+	return (device->devq_entry.index != CAM_UNQUEUED_INDEX);
 }
 
 static void
@@ -340,13 +345,6 @@ xpt_periph_init()
 	make_dev(&xpt_cdevsw, 0, UID_ROOT, GID_OPERATOR, 0600, "xpt0");
 }
 
-static void
-xptdone(struct cam_periph *periph, union ccb *done_ccb)
-{
-	/* Caller will release the CCB */
-	wakeup(&done_ccb->ccb_h.cbfcnp);
-}
-
 static int
 xptopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 {
@@ -365,11 +363,6 @@ xptopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 		return(ENODEV);
 	}
 
-	/* Mark ourselves open */
-	mtx_lock(&xsoftc.xpt_lock);
-	xsoftc.flags |= XPT_FLAG_OPEN;
-	mtx_unlock(&xsoftc.xpt_lock);
-
 	return(0);
 }
 
@@ -377,11 +370,6 @@ static int
 xptclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
 
-	/* Mark ourselves closed */
-	mtx_lock(&xsoftc.xpt_lock);
-	xsoftc.flags &= ~XPT_FLAG_OPEN;
-	mtx_unlock(&xsoftc.xpt_lock);
-
 	return(0);
 }
 
@@ -457,8 +445,6 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *
 
 			ccb = xpt_alloc_ccb();
 
-			CAM_SIM_LOCK(bus->sim);
-
 			/*
 			 * Create a path using the bus, target, and lun the
 			 * user passed in.
@@ -469,7 +455,6 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *
 					    inccb->ccb_h.target_lun) !=
 					    CAM_REQ_CMP){
 				error = EINVAL;
-				CAM_SIM_UNLOCK(bus->sim);
 				xpt_free_ccb(ccb);
 				break;
 			}
@@ -477,12 +462,12 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *
 			xpt_setup_ccb(&ccb->ccb_h, ccb->ccb_h.path,
 				      inccb->ccb_h.pinfo.priority);
 			xpt_merge_ccb(ccb, inccb);
-			ccb->ccb_h.cbfcnp = xptdone;
+			xpt_path_lock(ccb->ccb_h.path);
 			cam_periph_runccb(ccb, NULL, 0, 0, NULL);
+			xpt_path_unlock(ccb->ccb_h.path);
 			bcopy(ccb, inccb, sizeof(union ccb));
 			xpt_free_path(ccb->ccb_h.path);
 			xpt_free_ccb(ccb);
-			CAM_SIM_UNLOCK(bus->sim);
 			break;
 
 		case XPT_DEBUG: {
@@ -493,8 +478,6 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *
 			 * allocate it on the stack.
 			 */
 
-			CAM_SIM_LOCK(bus->sim);
-
 			/*
 			 * Create a path using the bus, target, and lun the
 			 * user passed in.
@@ -505,18 +488,15 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *
 					    inccb->ccb_h.target_lun) !=
 					    CAM_REQ_CMP){
 				error = EINVAL;
-				CAM_SIM_UNLOCK(bus->sim);
 				break;
 			}
 			/* Ensure all of our fields are correct */
 			xpt_setup_ccb(&ccb.ccb_h, ccb.ccb_h.path,
 				      inccb->ccb_h.pinfo.priority);
 			xpt_merge_ccb(&ccb, inccb);
-			ccb.ccb_h.cbfcnp = xptdone;
 			xpt_action(&ccb);
 			bcopy(&ccb, inccb, sizeof(union ccb));
 			xpt_free_path(ccb.ccb_h.path);
-			CAM_SIM_UNLOCK(bus->sim);
 			break;
 
 		}
@@ -564,9 +544,7 @@ xptdoioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *
 			/*
 			 * This is an immediate CCB, we can send it on directly.
 			 */
-			CAM_SIM_LOCK(xpt_path_sim(xpt_periph->path));
 			xpt_action(inccb);
-			CAM_SIM_UNLOCK(xpt_path_sim(xpt_periph->path));
 
 			/*
 			 * Map the buffers back into user space.
@@ -784,7 +762,7 @@ static void
 xpt_scanner_thread(void *dummy)
 {
 	union ccb	*ccb;
-	struct cam_sim	*sim;
+	struct cam_path	 path;
 
 	xpt_lock_buses();
 	for (;;) {
@@ -795,10 +773,16 @@ xpt_scanner_thread(void *dummy)
 			TAILQ_REMOVE(&xsoftc.ccb_scanq, &ccb->ccb_h, sim_links.tqe);
 			xpt_unlock_buses();
 
-			sim = ccb->ccb_h.path->bus->sim;
-			CAM_SIM_LOCK(sim);
+			/*
+			 * Since lock can be dropped inside and path freed
+			 * by completion callback even before return here,
+			 * take our own path copy for reference.
+			 */
+			xpt_copy_path(&path, ccb->ccb_h.path);
+			xpt_path_lock(&path);
 			xpt_action(ccb);
-			CAM_SIM_UNLOCK(sim);
+			xpt_path_unlock(&path);
+			xpt_release_path(&path);
 
 			xpt_lock_buses();
 		}
@@ -857,16 +841,18 @@ xpt_init(void *dummy)
 	struct cam_path *path;
 	struct cam_devq *devq;
 	cam_status status;
+	int error, i;
 
 	TAILQ_INIT(&xsoftc.xpt_busses);
-	TAILQ_INIT(&cam_simq);
 	TAILQ_INIT(&xsoftc.ccb_scanq);
 	STAILQ_INIT(&xsoftc.highpowerq);
 	xsoftc.num_highpower = CAM_MAX_HIGHPOWER;
 
-	mtx_init(&cam_simq_lock, "CAM SIMQ lock", NULL, MTX_DEF);
 	mtx_init(&xsoftc.xpt_lock, "XPT lock", NULL, MTX_DEF);
+	mtx_init(&xsoftc.xpt_highpower_lock, "XPT highpower lock", NULL, MTX_DEF);
 	mtx_init(&xsoftc.xpt_topo_lock, "XPT topology lock", NULL, MTX_DEF);
+	xsoftc.xpt_taskq = taskqueue_create("CAM XPT task", M_WAITOK,
+	    taskqueue_thread_enqueue, /*context*/&xsoftc.xpt_taskq);
 
 #ifdef CAM_BOOT_DELAY
 	/*
@@ -901,6 +887,7 @@ xpt_init(void *dummy)
 		       " failing attach\n", status);
 		return (EINVAL);
 	}
+	mtx_unlock(&xsoftc.xpt_lock);
 
 	/*
 	 * Looking at the XPT from the SIM layer, the XPT is
@@ -915,13 +902,32 @@ xpt_init(void *dummy)
 		       " failing attach\n", status);
 		return (EINVAL);
 	}
-
+	xpt_path_lock(path);
 	cam_periph_alloc(xptregister, NULL, NULL, NULL, "xpt", CAM_PERIPH_BIO,
 			 path, NULL, 0, xpt_sim);
+	xpt_path_unlock(path);
 	xpt_free_path(path);
-	mtx_unlock(&xsoftc.xpt_lock);
-	/* Install our software interrupt handlers */
-	swi_add(NULL, "cambio", camisr, NULL, SWI_CAMBIO, INTR_MPSAFE, &cambio_ih);
+
+	if (cam_num_doneqs < 1)
+		cam_num_doneqs = 1 + mp_ncpus / 6;
+	else if (cam_num_doneqs > MAXCPU)
+		cam_num_doneqs = MAXCPU;
+	for (i = 0; i < cam_num_doneqs; i++) {
+		mtx_init(&cam_doneqs[i].cam_doneq_mtx, "CAM doneq", NULL,
+		    MTX_DEF);
+		STAILQ_INIT(&cam_doneqs[i].cam_doneq);
+		error = kproc_kthread_add(xpt_done_td, &cam_doneqs[i],
+		    &cam_proc, NULL, 0, 0, "cam", "doneq%d", i);
+		if (error != 0) {
+			cam_num_doneqs = i;
+			break;
+		}
+	}
+	if (cam_num_doneqs < 1) {
+		printf("xpt_init: Cannot init completion queues "
+		       "- failing attach\n");
+		return (ENOMEM);
+	}
 	/*
 	 * Register a callback for when interrupts are enabled.
 	 */
@@ -966,28 +972,15 @@ xpt_add_periph(struct cam_periph *periph)
 {
 	struct cam_ed *device;
 	int32_t	 status;
-	struct periph_list *periph_head;
-
-	mtx_assert(periph->sim->mtx, MA_OWNED);
 
+	TASK_INIT(&periph->periph_run_task, 0, xpt_run_allocq_task, periph);
 	device = periph->path->device;
-
-	periph_head = &device->periphs;
-
 	status = CAM_REQ_CMP;
-
 	if (device != NULL) {
-		/*
-		 * Make room for this peripheral
-		 * so it will fit in the queue
-		 * when it's scheduled to run
-		 */
-		status = camq_resize(&device->drvq,
-				     device->drvq.array_size + 1);
-
+		mtx_lock(&device->target->bus->eb_mtx);
 		device->generation++;
-
-		SLIST_INSERT_HEAD(periph_head, periph, periph_links);
+		SLIST_INSERT_HEAD(&device->periphs, periph, periph_links);
+		mtx_unlock(&device->target->bus->eb_mtx);
 	}
 
 	return (status);
@@ -998,21 +991,12 @@ xpt_remove_periph(struct cam_periph *periph)
 {
 	struct cam_ed *device;
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
-
 	device = periph->path->device;
-
 	if (device != NULL) {
-		struct periph_list *periph_head;
-
-		periph_head = &device->periphs;
-
-		/* Release the slot for this peripheral */
-		camq_resize(&device->drvq, device->drvq.array_size - 1);
-
+		mtx_lock(&device->target->bus->eb_mtx);
 		device->generation++;
-
-		SLIST_REMOVE(periph_head, periph, cam_periph, periph_links);
+		SLIST_REMOVE(&device->periphs, periph, cam_periph, periph_links);
+		mtx_unlock(&device->target->bus->eb_mtx);
 	}
 }
 
@@ -1022,16 +1006,17 @@ xpt_announce_periph(struct cam_periph *periph, char *announce_string)
 {
 	struct	cam_path *path = periph->path;
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
+	cam_periph_assert(periph, MA_OWNED);
+	periph->flags |= CAM_PERIPH_ANNOUNCED;
 
-	printf("%s%d at %s%d bus %d scbus%d target %d lun %d\n",
+	printf("%s%d at %s%d bus %d scbus%d target %d lun %jx\n",
 	       periph->periph_name, periph->unit_number,
 	       path->bus->sim->sim_name,
 	       path->bus->sim->unit_number,
 	       path->bus->sim->bus_id,
 	       path->bus->path_id,
 	       path->target->target_id,
-	       path->device->lun_id);
+	       (uintmax_t)path->device->lun_id);
 	printf("%s%d: ", periph->periph_name, periph->unit_number);
 	if (path->device->protocol == PROTO_SCSI)
 		scsi_print_inquiry(&path->device->inq_data);
@@ -1043,7 +1028,7 @@ xpt_announce_periph(struct cam_periph *periph, char *announce_string)
 		    (struct sep_identify_data *)&path->device->ident_data);
 	else
 		printf("Unknown protocol device\n");
-	if (bootverbose && path->device->serial_num_len > 0) {
+	if (path->device->serial_num_len > 0) {
 		/* Don't wrap the screen  - print only the first 60 chars */
 		printf("%s%d: Serial Number %.60s\n", periph->periph_name,
 		       periph->unit_number, path->device->serial_num);
@@ -1071,6 +1056,37 @@ xpt_announce_quirks(struct cam_periph *periph, int quirks, char *bit_string)
 	}
 }
 
+void
+xpt_denounce_periph(struct cam_periph *periph)
+{
+	struct	cam_path *path = periph->path;
+
+	cam_periph_assert(periph, MA_OWNED);
+	printf("%s%d at %s%d bus %d scbus%d target %d lun %jx\n",
+	       periph->periph_name, periph->unit_number,
+	       path->bus->sim->sim_name,
+	       path->bus->sim->unit_number,
+	       path->bus->sim->bus_id,
+	       path->bus->path_id,
+	       path->target->target_id,
+	       (uintmax_t)path->device->lun_id);
+	printf("%s%d: ", periph->periph_name, periph->unit_number);
+	if (path->device->protocol == PROTO_SCSI)
+		scsi_print_inquiry_short(&path->device->inq_data);
+	else if (path->device->protocol == PROTO_ATA ||
+	    path->device->protocol == PROTO_SATAPM)
+		ata_print_ident_short(&path->device->ident_data);
+	else if (path->device->protocol == PROTO_SEMB)
+		semb_print_ident_short(
+		    (struct sep_identify_data *)&path->device->ident_data);
+	else
+		printf("Unknown protocol device");
+	if (path->device->serial_num_len > 0)
+		printf(" s/n %.60s", path->device->serial_num);
+	printf(" detached\n");
+}
+
+
 int
 xpt_getattr(char *buf, size_t len, const char *attr, struct cam_path *path)
 {
@@ -1078,7 +1094,7 @@ xpt_getattr(char *buf, size_t len, const char *attr, struct cam_path *path)
 	struct ccb_dev_advinfo cdai;
 	struct scsi_vpd_id_descriptor *idd;
 
-	mtx_assert(path->bus->sim->mtx, MA_OWNED);
+	xpt_path_assert(path, MA_OWNED);
 
 	memset(&cdai, 0, sizeof(cdai));
 	xpt_setup_ccb(&cdai.ccb_h, path, CAM_PRIORITY_NORMAL);
@@ -1499,6 +1515,7 @@ static int
 xptedtbusfunc(struct cam_eb *bus, void *arg)
 {
 	struct ccb_dev_match *cdm;
+	struct cam_et *target;
 	dev_match_ret retval;
 
 	cdm = (struct ccb_dev_match *)arg;
@@ -1570,71 +1587,72 @@ xptedtbusfunc(struct cam_eb *bus, void *arg)
 	 * If there is a target generation recorded, check it to
 	 * make sure the target list hasn't changed.
 	 */
-	if ((cdm->pos.position_type & CAM_DEV_POS_BUS)
-	 && (bus == cdm->pos.cookie.bus)
-	 && (cdm->pos.position_type & CAM_DEV_POS_TARGET)
-	 && (cdm->pos.generations[CAM_TARGET_GENERATION] != 0)
-	 && (cdm->pos.generations[CAM_TARGET_GENERATION] !=
-	     bus->generation)) {
-		cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
-		return(0);
-	}
-
+	mtx_lock(&bus->eb_mtx);
 	if ((cdm->pos.position_type & CAM_DEV_POS_BUS)
 	 && (cdm->pos.cookie.bus == bus)
 	 && (cdm->pos.position_type & CAM_DEV_POS_TARGET)
-	 && (cdm->pos.cookie.target != NULL))
-		return(xpttargettraverse(bus,
-					(struct cam_et *)cdm->pos.cookie.target,
-					 xptedttargetfunc, arg));
-	else
-		return(xpttargettraverse(bus, NULL, xptedttargetfunc, arg));
+	 && (cdm->pos.cookie.target != NULL)) {
+		if ((cdm->pos.generations[CAM_TARGET_GENERATION] !=
+		    bus->generation)) {
+			mtx_unlock(&bus->eb_mtx);
+			cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
+			return (0);
+		}
+		target = (struct cam_et *)cdm->pos.cookie.target;
+		target->refcount++;
+	} else
+		target = NULL;
+	mtx_unlock(&bus->eb_mtx);
+
+	return (xpttargettraverse(bus, target, xptedttargetfunc, arg));
 }
 
 static int
 xptedttargetfunc(struct cam_et *target, void *arg)
 {
 	struct ccb_dev_match *cdm;
+	struct cam_eb *bus;
+	struct cam_ed *device;
 
 	cdm = (struct ccb_dev_match *)arg;
+	bus = target->bus;
 
 	/*
 	 * If there is a device list generation recorded, check it to
 	 * make sure the device list hasn't changed.
 	 */
+	mtx_lock(&bus->eb_mtx);
 	if ((cdm->pos.position_type & CAM_DEV_POS_BUS)
-	 && (cdm->pos.cookie.bus == target->bus)
+	 && (cdm->pos.cookie.bus == bus)
 	 && (cdm->pos.position_type & CAM_DEV_POS_TARGET)
 	 && (cdm->pos.cookie.target == target)
 	 && (cdm->pos.position_type & CAM_DEV_POS_DEVICE)
-	 && (cdm->pos.generations[CAM_DEV_GENERATION] != 0)
-	 && (cdm->pos.generations[CAM_DEV_GENERATION] !=
-	     target->generation)) {
-		cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
-		return(0);
-	}
+	 && (cdm->pos.cookie.device != NULL)) {
+		if (cdm->pos.generations[CAM_DEV_GENERATION] !=
+		    target->generation) {
+			mtx_unlock(&bus->eb_mtx);
+			cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
+			return(0);
+		}
+		device = (struct cam_ed *)cdm->pos.cookie.device;
+		device->refcount++;
+	} else
+		device = NULL;
+	mtx_unlock(&bus->eb_mtx);
 
-	if ((cdm->pos.position_type & CAM_DEV_POS_BUS)
-	 && (cdm->pos.cookie.bus == target->bus)
-	 && (cdm->pos.position_type & CAM_DEV_POS_TARGET)
-	 && (cdm->pos.cookie.target == target)
-	 && (cdm->pos.position_type & CAM_DEV_POS_DEVICE)
-	 && (cdm->pos.cookie.device != NULL))
-		return(xptdevicetraverse(target,
-					(struct cam_ed *)cdm->pos.cookie.device,
-					 xptedtdevicefunc, arg));
-	else
-		return(xptdevicetraverse(target, NULL, xptedtdevicefunc, arg));
+	return (xptdevicetraverse(target, device, xptedtdevicefunc, arg));
 }
 
 static int
 xptedtdevicefunc(struct cam_ed *device, void *arg)
 {
-
+	struct cam_eb *bus;
+	struct cam_periph *periph;
 	struct ccb_dev_match *cdm;
 	dev_match_ret retval;
 
 	cdm = (struct ccb_dev_match *)arg;
+	bus = device->target->bus;
 
 	/*
 	 * If our position is for something deeper in the tree, that means
@@ -1724,33 +1742,31 @@ xptedtdevicefunc(struct cam_ed *device, void *arg)
 	 * If there is a peripheral list generation recorded, make sure
 	 * it hasn't changed.
 	 */
+	xpt_lock_buses();
+	mtx_lock(&bus->eb_mtx);
 	if ((cdm->pos.position_type & CAM_DEV_POS_BUS)
-	 && (device->target->bus == cdm->pos.cookie.bus)
-	 && (cdm->pos.position_type & CAM_DEV_POS_TARGET)
-	 && (device->target == cdm->pos.cookie.target)
-	 && (cdm->pos.position_type & CAM_DEV_POS_DEVICE)
-	 && (device == cdm->pos.cookie.device)
-	 && (cdm->pos.position_type & CAM_DEV_POS_PERIPH)
-	 && (cdm->pos.generations[CAM_PERIPH_GENERATION] != 0)
-	 && (cdm->pos.generations[CAM_PERIPH_GENERATION] !=
-	     device->generation)){
-		cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
-		return(0);
-	}
-
-	if ((cdm->pos.position_type & CAM_DEV_POS_BUS)
-	 && (cdm->pos.cookie.bus == device->target->bus)
+	 && (cdm->pos.cookie.bus == bus)
 	 && (cdm->pos.position_type & CAM_DEV_POS_TARGET)
 	 && (cdm->pos.cookie.target == device->target)
 	 && (cdm->pos.position_type & CAM_DEV_POS_DEVICE)
 	 && (cdm->pos.cookie.device == device)
 	 && (cdm->pos.position_type & CAM_DEV_POS_PERIPH)
-	 && (cdm->pos.cookie.periph != NULL))
-		return(xptperiphtraverse(device,
-				(struct cam_periph *)cdm->pos.cookie.periph,
-				xptedtperiphfunc, arg));
-	else
-		return(xptperiphtraverse(device, NULL, xptedtperiphfunc, arg));
+	 && (cdm->pos.cookie.periph != NULL)) {
+		if (cdm->pos.generations[CAM_PERIPH_GENERATION] !=
+		    device->generation) {
+			mtx_unlock(&bus->eb_mtx);
+			xpt_unlock_buses();
+			cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
+			return(0);
+		}
+		periph = (struct cam_periph *)cdm->pos.cookie.periph;
+		periph->refcount++;
+	} else
+		periph = NULL;
+	mtx_unlock(&bus->eb_mtx);
+	xpt_unlock_buses();
+
+	return (xptperiphtraverse(device, periph, xptedtperiphfunc, arg));
 }
 
 static int
@@ -1826,6 +1842,7 @@ xptedtperiphfunc(struct cam_periph *periph, void *arg)
 static int
 xptedtmatch(struct ccb_dev_match *cdm)
 {
+	struct cam_eb *bus;
 	int ret;
 
 	cdm->num_matches = 0;
@@ -1834,19 +1851,22 @@ xptedtmatch(struct ccb_dev_match *cdm)
 	 * Check the bus list generation.  If it has changed, the user
 	 * needs to reset everything and start over.
 	 */
+	xpt_lock_buses();
 	if ((cdm->pos.position_type & CAM_DEV_POS_BUS)
-	 && (cdm->pos.generations[CAM_BUS_GENERATION] != 0)
-	 && (cdm->pos.generations[CAM_BUS_GENERATION] != xsoftc.bus_generation)) {
-		cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
-		return(0);
-	}
+	 && (cdm->pos.cookie.bus != NULL)) {
+		if (cdm->pos.generations[CAM_BUS_GENERATION] !=
+		    xsoftc.bus_generation) {
+			xpt_unlock_buses();
+			cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
+			return(0);
+		}
+		bus = (struct cam_eb *)cdm->pos.cookie.bus;
+		bus->refcount++;
+	} else
+		bus = NULL;
+	xpt_unlock_buses();
 
-	if ((cdm->pos.position_type & CAM_DEV_POS_BUS)
-	 && (cdm->pos.cookie.bus != NULL))
-		ret = xptbustraverse((struct cam_eb *)cdm->pos.cookie.bus,
-				     xptedtbusfunc, cdm);
-	else
-		ret = xptbustraverse(NULL, xptedtbusfunc, cdm);
+	ret = xptbustraverse(bus, xptedtbusfunc, cdm);
 
 	/*
 	 * If we get back 0, that means that we had to stop before fully
@@ -1863,29 +1883,29 @@ xptedtmatch(struct ccb_dev_match *cdm)
 static int
 xptplistpdrvfunc(struct periph_driver **pdrv, void *arg)
 {
+	struct cam_periph *periph;
 	struct ccb_dev_match *cdm;
 
 	cdm = (struct ccb_dev_match *)arg;
 
+	xpt_lock_buses();
 	if ((cdm->pos.position_type & CAM_DEV_POS_PDPTR)
 	 && (cdm->pos.cookie.pdrv == pdrv)
 	 && (cdm->pos.position_type & CAM_DEV_POS_PERIPH)
-	 && (cdm->pos.generations[CAM_PERIPH_GENERATION] != 0)
-	 && (cdm->pos.generations[CAM_PERIPH_GENERATION] !=
-	     (*pdrv)->generation)) {
-		cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
-		return(0);
-	}
+	 && (cdm->pos.cookie.periph != NULL)) {
+		if (cdm->pos.generations[CAM_PERIPH_GENERATION] !=
+		    (*pdrv)->generation) {
+			xpt_unlock_buses();
+			cdm->status = CAM_DEV_MATCH_LIST_CHANGED;
+			return(0);
+		}
+		periph = (struct cam_periph *)cdm->pos.cookie.periph;
+		periph->refcount++;
+	} else
+		periph = NULL;
+	xpt_unlock_buses();
 
-	if ((cdm->pos.position_type & CAM_DEV_POS_PDPTR)
-	 && (cdm->pos.cookie.pdrv == pdrv)
-	 && (cdm->pos.position_type & CAM_DEV_POS_PERIPH)
-	 && (cdm->pos.cookie.periph != NULL))
-		return(xptpdperiphtraverse(pdrv,
-				(struct cam_periph *)cdm->pos.cookie.periph,
-				xptplistperiphfunc, arg));
-	else
-		return(xptpdperiphtraverse(pdrv, NULL,xptplistperiphfunc, arg));
+	return (xptpdperiphtraverse(pdrv, periph, xptplistperiphfunc, arg));
 }
 
 static int
@@ -2034,35 +2054,31 @@ xptbustraverse(struct cam_eb *start_bus, xpt_busfunc_t *tr_func, void *arg)
 	int retval;
 
 	retval = 1;
-
-	xpt_lock_buses();
-	for (bus = (start_bus ? start_bus : TAILQ_FIRST(&xsoftc.xpt_busses));
-	     bus != NULL;
-	     bus = next_bus) {
-
+	if (start_bus)
+		bus = start_bus;
+	else {
+		xpt_lock_buses();
+		bus = TAILQ_FIRST(&xsoftc.xpt_busses);
+		if (bus == NULL) {
+			xpt_unlock_buses();
+			return (retval);
+		}
 		bus->refcount++;
-
-		/*
-		 * XXX The locking here is obviously very complex.  We
-		 * should work to simplify it.
-		 */
 		xpt_unlock_buses();
-		CAM_SIM_LOCK(bus->sim);
+	}
+	for (; bus != NULL; bus = next_bus) {
 		retval = tr_func(bus, arg);
-		CAM_SIM_UNLOCK(bus->sim);
-
+		if (retval == 0) {
+			xpt_release_bus(bus);
+			break;
+		}
 		xpt_lock_buses();
 		next_bus = TAILQ_NEXT(bus, links);
+		if (next_bus)
+			next_bus->refcount++;
 		xpt_unlock_buses();
-
 		xpt_release_bus(bus);
-
-		if (retval == 0)
-			return(retval);
-		xpt_lock_buses();
 	}
-	xpt_unlock_buses();
-
 	return(retval);
 }
 
@@ -2073,24 +2089,32 @@ xpttargettraverse(struct cam_eb *bus, struct cam_et *start_target,
 	struct cam_et *target, *next_target;
 	int retval;
 
-	mtx_assert(bus->sim->mtx, MA_OWNED);
 	retval = 1;
-	for (target = (start_target ? start_target :
-		       TAILQ_FIRST(&bus->et_entries));
-	     target != NULL; target = next_target) {
-
+	if (start_target)
+		target = start_target;
+	else {
+		mtx_lock(&bus->eb_mtx);
+		target = TAILQ_FIRST(&bus->et_entries);
+		if (target == NULL) {
+			mtx_unlock(&bus->eb_mtx);
+			return (retval);
+		}
 		target->refcount++;
-
-		retval = tr_func(target, arg);
-
-		next_target = TAILQ_NEXT(target, links);
-
-		xpt_release_target(target);
-
-		if (retval == 0)
-			return(retval);
+		mtx_unlock(&bus->eb_mtx);
+	}
+	for (; target != NULL; target = next_target) {
+		retval = tr_func(target, arg);
+		if (retval == 0) {
+			xpt_release_target(target);
+			break;
+		}
+		mtx_lock(&bus->eb_mtx);
+		next_target = TAILQ_NEXT(target, links);
+		if (next_target)
+			next_target->refcount++;
+		mtx_unlock(&bus->eb_mtx);
+		xpt_release_target(target);
 	}
-
 	return(retval);
 }
 
@@ -2098,36 +2122,39 @@ static int
 xptdevicetraverse(struct cam_et *target, struct cam_ed *start_device,
 		  xpt_devicefunc_t *tr_func, void *arg)
 {
+	struct cam_eb *bus;
 	struct cam_ed *device, *next_device;
 	int retval;
 
-	mtx_assert(target->bus->sim->mtx, MA_OWNED);
 	retval = 1;
-	for (device = (start_device ? start_device :
-		       TAILQ_FIRST(&target->ed_entries));
-	     device != NULL;
-	     device = next_device) {
-
-		/*
-		 * Hold a reference so the current device does not go away
-		 * on us.
-		 */
+	bus = target->bus;
+	if (start_device)
+		device = start_device;
+	else {
+		mtx_lock(&bus->eb_mtx);
+		device = TAILQ_FIRST(&target->ed_entries);
+		if (device == NULL) {
+			mtx_unlock(&bus->eb_mtx);
+			return (retval);
+		}
 		device->refcount++;
-
-		retval = tr_func(device, arg);
-
-		/*
-		 * Grab our next pointer before we release the current
-		 * device.
-		 */
-		next_device = TAILQ_NEXT(device, links);
-
-		xpt_release_device(device);
-
-		if (retval == 0)
-			return(retval);
+		mtx_unlock(&bus->eb_mtx);
+	}
+	for (; device != NULL; device = next_device) {
+		mtx_lock(&device->device_mtx);
+		retval = tr_func(device, arg);
+		mtx_unlock(&device->device_mtx);
+		if (retval == 0) {
+			xpt_release_device(device);
+			break;
+		}
+		mtx_lock(&bus->eb_mtx);
+		next_device = TAILQ_NEXT(device, links);
+		if (next_device)
+			next_device->refcount++;
+		mtx_unlock(&bus->eb_mtx);
+		xpt_release_device(device);
 	}
-
 	return(retval);
 }
 
@@ -2135,56 +2162,48 @@ static int
 xptperiphtraverse(struct cam_ed *device, struct cam_periph *start_periph,
 		  xpt_periphfunc_t *tr_func, void *arg)
 {
+	struct cam_eb *bus;
 	struct cam_periph *periph, *next_periph;
 	int retval;
 
 	retval = 1;
 
-	mtx_assert(device->sim->mtx, MA_OWNED);
-	xpt_lock_buses();
-	for (periph = (start_periph ? start_periph :
-		       SLIST_FIRST(&device->periphs));
-	     periph != NULL;
-	     periph = next_periph) {
-
-
-		/*
-		 * In this case, we want to show peripherals that have been
-		 * invalidated, but not peripherals that are scheduled to
-		 * be freed.  So instead of calling cam_periph_acquire(),
-		 * which will fail if the periph has been invalidated, we
-		 * just check for the free flag here.  If it is in the
-		 * process of being freed, we skip to the next periph.
-		 */
-		if (periph->flags & CAM_PERIPH_FREE) {
-			next_periph = SLIST_NEXT(periph, periph_links);
-			continue;
+	bus = device->target->bus;
+	if (start_periph)
+		periph = start_periph;
+	else {
+		xpt_lock_buses();
+		mtx_lock(&bus->eb_mtx);
+		periph = SLIST_FIRST(&device->periphs);
+		while (periph != NULL && (periph->flags & CAM_PERIPH_FREE) != 0)
+			periph = SLIST_NEXT(periph, periph_links);
+		if (periph == NULL) {
+			mtx_unlock(&bus->eb_mtx);
+			xpt_unlock_buses();
+			return (retval);
 		}
-
-		/*
-		 * Acquire a reference to this periph while we call the
-		 * traversal function, so it can't go away.
-		 */
 		periph->refcount++;
-
-		retval = tr_func(periph, arg);
-
-		/*
-		 * Grab the next peripheral before we release this one, so
-		 * our next pointer is still valid.
-		 */
-		next_periph = SLIST_NEXT(periph, periph_links);
-
-		cam_periph_release_locked_buses(periph);
-
-		if (retval == 0)
-			goto bailout_done;
+		mtx_unlock(&bus->eb_mtx);
+		xpt_unlock_buses();
+	}
+	for (; periph != NULL; periph = next_periph) {
+		retval = tr_func(periph, arg);
+		if (retval == 0) {
+			cam_periph_release_locked(periph);
+			break;
+		}
+		xpt_lock_buses();
+		mtx_lock(&bus->eb_mtx);
+		next_periph = SLIST_NEXT(periph, periph_links);
+		while (next_periph != NULL &&
+		    (next_periph->flags & CAM_PERIPH_FREE) != 0)
+			next_periph = SLIST_NEXT(periph, periph_links);
+		if (next_periph)
+			next_periph->refcount++;
+		mtx_unlock(&bus->eb_mtx);
+		xpt_unlock_buses();
+		cam_periph_release_locked(periph);
 	}
-
-bailout_done:
-
-	xpt_unlock_buses();
-
 	return(retval);
 }
 
@@ -2222,57 +2241,42 @@ xptpdperiphtraverse(struct periph_driver **pdrv,
 		    xpt_periphfunc_t *tr_func, void *arg)
 {
 	struct cam_periph *periph, *next_periph;
-	struct cam_sim *sim;
 	int retval;
 
 	retval = 1;
 
-	xpt_lock_buses();
-	for (periph = (start_periph ? start_periph :
-	     TAILQ_FIRST(&(*pdrv)->units)); periph != NULL;
-	     periph = next_periph) {
-
-
-		/*
-		 * In this case, we want to show peripherals that have been
-		 * invalidated, but not peripherals that are scheduled to
-		 * be freed.  So instead of calling cam_periph_acquire(),
-		 * which will fail if the periph has been invalidated, we
-		 * just check for the free flag here.  If it is free, we
-		 * skip to the next periph.
-		 */
-		if (periph->flags & CAM_PERIPH_FREE) {
-			next_periph = TAILQ_NEXT(periph, unit_links);
-			continue;
-		}
-
-		/*
-		 * Acquire a reference to this periph while we call the
-		 * traversal function, so it can't go away.
-		 */
-		periph->refcount++;
-		sim = periph->sim;
-		xpt_unlock_buses();
-		CAM_SIM_LOCK(sim);
+	if (start_periph)
+		periph = start_periph;
+	else {
 		xpt_lock_buses();
-		retval = tr_func(periph, arg);
-
-		/*
-		 * Grab the next peripheral before we release this one, so
-		 * our next pointer is still valid.
-		 */
-		next_periph = TAILQ_NEXT(periph, unit_links);
-
-		cam_periph_release_locked_buses(periph);
-		CAM_SIM_UNLOCK(sim);
-
-		if (retval == 0)
-			goto bailout_done;
+		periph = TAILQ_FIRST(&(*pdrv)->units);
+		while (periph != NULL && (periph->flags & CAM_PERIPH_FREE) != 0)
+			periph = TAILQ_NEXT(periph, unit_links);
+		if (periph == NULL) {
+			xpt_unlock_buses();
+			return (retval);
+		}
+		periph->refcount++;
+		xpt_unlock_buses();
+	}
+	for (; periph != NULL; periph = next_periph) {
+		cam_periph_lock(periph);
+		retval = tr_func(periph, arg);
+		cam_periph_unlock(periph);
+		if (retval == 0) {
+			cam_periph_release(periph);
+			break;
+		}
+		xpt_lock_buses();
+		next_periph = TAILQ_NEXT(periph, unit_links);
+		while (next_periph != NULL &&
+		    (next_periph->flags & CAM_PERIPH_FREE) != 0)
+			next_periph = TAILQ_NEXT(periph, unit_links);
+		if (next_periph)
+			next_periph->refcount++;
+		xpt_unlock_buses();
+		cam_periph_release(periph);
 	}
-bailout_done:
-
-	xpt_unlock_buses();
-
 	return(retval);
 }
 
@@ -2415,15 +2419,17 @@ xptsetasyncbusfunc(struct cam_eb *bus, void *arg)
 	struct ccb_setasync *csa = (struct ccb_setasync *)arg;
 
 	xpt_compile_path(&path, /*periph*/NULL,
-			 bus->sim->path_id,
+			 bus->path_id,
 			 CAM_TARGET_WILDCARD,
 			 CAM_LUN_WILDCARD);
+	xpt_path_lock(&path);
 	xpt_setup_ccb(&cpi.ccb_h, &path, CAM_PRIORITY_NORMAL);
 	cpi.ccb_h.func_code = XPT_PATH_INQ;
 	xpt_action((union ccb *)&cpi);
 	csa->callback(csa->callback_arg,
 			    AC_PATH_REGISTERED,
 			    &path, &cpi);
+	xpt_path_unlock(&path);
 	xpt_release_path(&path);
 
 	return(1);
@@ -2443,6 +2449,8 @@ void
 xpt_action_default(union ccb *start_ccb)
 {
 	struct cam_path *path;
+	struct cam_sim *sim;
+	int lock;
 
 	path = start_ccb->ccb_h.path;
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_action_default\n"));
@@ -2491,14 +2499,18 @@ xpt_action_default(union ccb *start_ccb)
 	case XPT_RESET_DEV:
 	case XPT_ENG_EXEC:
 	case XPT_SMP_IO:
-		cam_ccbq_insert_ccb(&path->device->ccbq, start_ccb);
-		if (xpt_schedule_devq(path->bus->sim->devq, path->device))
-			xpt_run_devq(path->bus->sim->devq);
-		break;
-	case XPT_CALC_GEOMETRY:
 	{
-		struct cam_sim *sim;
+		struct cam_devq *devq;
 
+		devq = path->bus->sim->devq;
+		mtx_lock(&devq->send_mtx);
+		cam_ccbq_insert_ccb(&path->device->ccbq, start_ccb);
+		if (xpt_schedule_devq(devq, path->device) != 0)
+			xpt_run_devq(devq);
+		mtx_unlock(&devq->send_mtx);
+		break;
+	}
+	case XPT_CALC_GEOMETRY:
 		/* Filter out garbage */
 		if (start_ccb->ccg.block_size == 0
 		 || start_ccb->ccg.volume_size == 0) {
@@ -2526,10 +2538,7 @@ xpt_action_default(union ccb *start_ccb)
 			break;
 		}
 #endif
-		sim = path->bus->sim;
-		(*(sim->sim_action))(sim, start_ccb);
-		break;
-	}
+		goto call_sim;
 	case XPT_ABORT:
 	{
 		union ccb* abort_ccb;
@@ -2590,21 +2599,18 @@ xpt_action_default(union ccb *start_ccb)
 	case XPT_NOTIFY_ACKNOWLEDGE:
 	case XPT_GET_SIM_KNOB:
 	case XPT_SET_SIM_KNOB:
-	{
-		struct cam_sim *sim;
-
-		sim = path->bus->sim;
-		(*(sim->sim_action))(sim, start_ccb);
-		break;
-	}
+	case XPT_GET_TRAN_SETTINGS:
+	case XPT_SET_TRAN_SETTINGS:
 	case XPT_PATH_INQ:
-	{
-		struct cam_sim *sim;
-
+call_sim:
 		sim = path->bus->sim;
+		lock = (mtx_owned(sim->mtx) == 0);
+		if (lock)
+			CAM_SIM_LOCK(sim);
 		(*(sim->sim_action))(sim, start_ccb);
+		if (lock)
+			CAM_SIM_UNLOCK(sim);
 		break;
-	}
 	case XPT_PATH_STATS:
 		start_ccb->cpis.last_reset = path->bus->last_reset;
 		start_ccb->ccb_h.status = CAM_REQ_CMP;
@@ -2766,11 +2772,6 @@ xpt_action_default(union ccb *start_ccb)
 				position_type = CAM_DEV_POS_PDRV;
 		}
 
-		/*
-		 * Note that we drop the SIM lock here, because the EDT
-		 * traversal code needs to do its own locking.
-		 */
-		CAM_SIM_UNLOCK(xpt_path_sim(cdm->ccb_h.path));
 		switch(position_type & CAM_DEV_POS_TYPEMASK) {
 		case CAM_DEV_POS_EDT:
 			xptedtmatch(cdm);
@@ -2782,7 +2783,6 @@ xpt_action_default(union ccb *start_ccb)
 			cdm->status = CAM_DEV_MATCH_ERROR;
 			break;
 		}
-		CAM_SIM_LOCK(xpt_path_sim(cdm->ccb_h.path));
 
 		if (cdm->status == CAM_DEV_MATCH_ERROR)
 			start_ccb->ccb_h.status = CAM_REQ_CMP_ERR;
@@ -2837,6 +2837,8 @@ xpt_action_default(union ccb *start_ccb)
 				break;
 			}
 			cur_entry->event_enable = csa->event_enable;
+			cur_entry->event_lock =
+			    mtx_owned(path->bus->sim->mtx) ? 1 : 0;
 			cur_entry->callback_arg = csa->callback_arg;
 			cur_entry->callback = csa->callback;
 			SLIST_INSERT_HEAD(async_head, cur_entry, links);
@@ -2871,6 +2873,7 @@ xpt_action_default(union ccb *start_ccb)
 			}
 		}
 
+		mtx_lock(&dev->sim->devq->send_mtx);
 		if ((crs->release_flags & RELSIM_RELEASE_AFTER_TIMEOUT) != 0) {
 
 			if ((dev->flags & CAM_DEV_REL_TIMEOUT_PENDING) != 0) {
@@ -2923,6 +2926,7 @@ xpt_action_default(union ccb *start_ccb)
 				start_ccb->ccb_h.flags |= CAM_DEV_QFREEZE;
 			}
 		}
+		mtx_unlock(&dev->sim->devq->send_mtx);
 
 		if ((start_ccb->ccb_h.flags & CAM_DEV_QFREEZE) == 0)
 			xpt_release_devq(path, /*count*/1, /*run_queue*/TRUE);
@@ -2932,7 +2936,6 @@ xpt_action_default(union ccb *start_ccb)
 	}
 	case XPT_DEBUG: {
 		struct cam_path *oldpath;
-		struct cam_sim *oldsim;
 
 		/* Check that all request bits are supported. */
 		if (start_ccb->cdbg.flags & ~(CAM_DEBUG_COMPILE)) {
@@ -2942,15 +2945,9 @@ xpt_action_default(union ccb *start_ccb)
 
 		cam_dflags = CAM_DEBUG_NONE;
 		if (cam_dpath != NULL) {
-			/* To release the old path we must hold proper lock. */
 			oldpath = cam_dpath;
 			cam_dpath = NULL;
-			oldsim = xpt_path_sim(oldpath);
-			CAM_SIM_UNLOCK(xpt_path_sim(start_ccb->ccb_h.path));
-			CAM_SIM_LOCK(oldsim);
 			xpt_free_path(oldpath);
-			CAM_SIM_UNLOCK(oldsim);
-			CAM_SIM_LOCK(xpt_path_sim(start_ccb->ccb_h.path));
 		}
 		if (start_ccb->cdbg.flags != CAM_DEBUG_NONE) {
 			if (xpt_create_path(&cam_dpath, NULL,
@@ -2997,39 +2994,41 @@ xpt_polled_action(union ccb *start_ccb)
 	struct	  cam_devq *devq;
 	struct	  cam_ed *dev;
 
-
 	timeout = start_ccb->ccb_h.timeout * 10;
 	sim = start_ccb->ccb_h.path->bus->sim;
 	devq = sim->devq;
 	dev = start_ccb->ccb_h.path->device;
 
-	mtx_assert(sim->mtx, MA_OWNED);
-
-	/* Don't use ISR for this SIM while polling. */
-	sim->flags |= CAM_SIM_POLLED;
+	mtx_unlock(&dev->device_mtx);
 
 	/*
 	 * Steal an opening so that no other queued requests
 	 * can get it before us while we simulate interrupts.
 	 */
+	mtx_lock(&devq->send_mtx);
 	dev->ccbq.devq_openings--;
 	dev->ccbq.dev_openings--;
-
-	while(((devq != NULL && devq->send_openings <= 0) ||
-	   dev->ccbq.dev_openings < 0) && (--timeout > 0)) {
+	while((devq->send_openings <= 0 || dev->ccbq.dev_openings < 0) &&
+	    (--timeout > 0)) {
+		mtx_unlock(&devq->send_mtx);
 		DELAY(100);
+		CAM_SIM_LOCK(sim);
 		(*(sim->sim_poll))(sim);
-		camisr_runqueue(sim);
+		CAM_SIM_UNLOCK(sim);
+		camisr_runqueue();
+		mtx_lock(&devq->send_mtx);
 	}
-
 	dev->ccbq.devq_openings++;
 	dev->ccbq.dev_openings++;
+	mtx_unlock(&devq->send_mtx);
 
 	if (timeout != 0) {
 		xpt_action(start_ccb);
 		while(--timeout > 0) {
+			CAM_SIM_LOCK(sim);
 			(*(sim->sim_poll))(sim);
-			camisr_runqueue(sim);
+			CAM_SIM_UNLOCK(sim);
+			camisr_runqueue();
 			if ((start_ccb->ccb_h.status  & CAM_STATUS_MASK)
 			    != CAM_REQ_INPROG)
 				break;
@@ -3048,8 +3047,7 @@ xpt_polled_action(union ccb *start_ccb)
 		start_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
 	}
 
-	/* We will use CAM ISR for this SIM again. */
-	sim->flags &= ~CAM_SIM_POLLED;
+	mtx_lock(&dev->device_mtx);
 }
 
 /*
@@ -3057,38 +3055,14 @@ xpt_polled_action(union ccb *start_ccb)
  * target device has space for more transactions.
  */
 void
-xpt_schedule(struct cam_periph *perph, u_int32_t new_priority)
+xpt_schedule(struct cam_periph *periph, u_int32_t new_priority)
 {
-	struct cam_ed *device;
-	int runq = 0;
 
-	mtx_assert(perph->sim->mtx, MA_OWNED);
-
-	CAM_DEBUG(perph->path, CAM_DEBUG_TRACE, ("xpt_schedule\n"));
-	device = perph->path->device;
-	if (periph_is_queued(perph)) {
-		/* Simply reorder based on new priority */
-		CAM_DEBUG(perph->path, CAM_DEBUG_SUBTRACE,
-			  ("   change priority to %d\n", new_priority));
-		if (new_priority < perph->pinfo.priority) {
-			camq_change_priority(&device->drvq,
-					     perph->pinfo.index,
-					     new_priority);
-			runq = 1;
-		}
-	} else {
-		/* New entry on the queue */
-		CAM_DEBUG(perph->path, CAM_DEBUG_SUBTRACE,
-			  ("   added periph to queue\n"));
-		perph->pinfo.priority = new_priority;
-		perph->pinfo.generation = ++device->drvq.generation;
-		camq_insert(&device->drvq, &perph->pinfo);
-		runq = 1;
-	}
-	if (runq != 0) {
-		CAM_DEBUG(perph->path, CAM_DEBUG_SUBTRACE,
-			  ("   calling xpt_run_dev_allocq\n"));
-		xpt_run_dev_allocq(device);
+	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("xpt_schedule\n"));
+	cam_periph_assert(periph, MA_OWNED);
+	if (new_priority < periph->scheduled_priority) {
+		periph->scheduled_priority = new_priority;
+		xpt_run_allocq(periph, 0);
 	}
 }
 
@@ -3101,7 +3075,7 @@ xpt_schedule(struct cam_periph *perph, u_int32_t new_priority)
  * started the queue, return 0 so the caller doesn't attempt
  * to run the queue.
  */
-int
+static int
 xpt_schedule_dev(struct camq *queue, cam_pinfo *pinfo,
 		 u_int32_t new_priority)
 {
@@ -3141,51 +3115,79 @@ xpt_schedule_dev(struct camq *queue, cam_pinfo *pinfo,
 }
 
 static void
-xpt_run_dev_allocq(struct cam_ed *device)
+xpt_run_allocq_task(void *context, int pending)
 {
-	struct camq	*drvq;
+	struct cam_periph *periph = context;
 
-	if (device->ccbq.devq_allocating)
+	cam_periph_lock(periph);
+	periph->flags &= ~CAM_PERIPH_RUN_TASK;
+	xpt_run_allocq(periph, 1);
+	cam_periph_unlock(periph);
+	cam_periph_release(periph);
+}
+
+static void
+xpt_run_allocq(struct cam_periph *periph, int sleep)
+{
+	struct cam_ed	*device;
+	union ccb	*ccb;
+	uint32_t	 prio;
+
+	cam_periph_assert(periph, MA_OWNED);
+	if (periph->periph_allocating)
 		return;
-	device->ccbq.devq_allocating = 1;
-	CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_run_dev_allocq(%p)\n", device));
-	drvq = &device->drvq;
-	while ((drvq->entries > 0) &&
-	    (device->ccbq.devq_openings > 0 ||
-	     CAMQ_GET_PRIO(drvq) <= CAM_PRIORITY_OOB) &&
-	    (device->ccbq.queue.qfrozen_cnt == 0)) {
-		union	ccb *work_ccb;
-		struct	cam_periph *drv;
+	periph->periph_allocating = 1;
+	CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_run_allocq(%p)\n", periph));
+	device = periph->path->device;
+	ccb = NULL;
+restart:
+	while ((prio = min(periph->scheduled_priority,
+	    periph->immediate_priority)) != CAM_PRIORITY_NONE &&
+	    (periph->periph_allocated - (ccb != NULL ? 1 : 0) <
+	     device->ccbq.total_openings || prio <= CAM_PRIORITY_OOB)) {
 
-		KASSERT(drvq->entries > 0, ("xpt_run_dev_allocq: "
-		    "Device on queue without any work to do"));
-		if ((work_ccb = xpt_get_ccb(device)) != NULL) {
-			drv = (struct cam_periph*)camq_remove(drvq, CAMQ_HEAD);
-			xpt_setup_ccb(&work_ccb->ccb_h, drv->path,
-				      drv->pinfo.priority);
-			CAM_DEBUG_PRINT(CAM_DEBUG_XPT,
-					("calling periph start\n"));
-			drv->periph_start(drv, work_ccb);
-		} else {
-			/*
-			 * Malloc failure in alloc_ccb
-			 */
-			/*
-			 * XXX add us to a list to be run from free_ccb
-			 * if we don't have any ccbs active on this
-			 * device queue otherwise we may never get run
-			 * again.
-			 */
+		if (ccb == NULL &&
+		    (ccb = xpt_get_ccb_nowait(periph)) == NULL) {
+			if (sleep) {
+				ccb = xpt_get_ccb(periph);
+				goto restart;
+			}
+			if (periph->flags & CAM_PERIPH_RUN_TASK)
+				break;
+			xpt_lock_buses();
+			periph->refcount++;	/* Unconditionally acquire */
+			xpt_unlock_buses();
+			periph->flags |= CAM_PERIPH_RUN_TASK;
+			taskqueue_enqueue(xsoftc.xpt_taskq,
+			    &periph->periph_run_task);
 			break;
 		}
+		xpt_setup_ccb(&ccb->ccb_h, periph->path, prio);
+		if (prio == periph->immediate_priority) {
+			periph->immediate_priority = CAM_PRIORITY_NONE;
+			CAM_DEBUG_PRINT(CAM_DEBUG_XPT,
+					("waking cam_periph_getccb()\n"));
+			SLIST_INSERT_HEAD(&periph->ccb_list, &ccb->ccb_h,
+					  periph_links.sle);
+			wakeup(&periph->ccb_list);
+		} else {
+			periph->scheduled_priority = CAM_PRIORITY_NONE;
+			CAM_DEBUG_PRINT(CAM_DEBUG_XPT,
+					("calling periph_start()\n"));
+			periph->periph_start(periph, ccb);
+		}
+		ccb = NULL;
 	}
-	device->ccbq.devq_allocating = 0;
+	if (ccb != NULL)
+		xpt_release_ccb(ccb);
+	periph->periph_allocating = 0;
 }
 
 static void
 xpt_run_devq(struct cam_devq *devq)
 {
 	char cdb_str[(SCSI_MAX_CDBLEN * 3) + 1];
+	int lock;
 
 	CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_run_devq\n"));
 
@@ -3193,14 +3195,12 @@ xpt_run_devq(struct cam_devq *devq)
 	while ((devq->send_queue.entries > 0)
 	    && (devq->send_openings > 0)
 	    && (devq->send_queue.qfrozen_cnt <= 1)) {
-		struct	cam_ed_qinfo *qinfo;
 		struct	cam_ed *device;
 		union ccb *work_ccb;
 		struct	cam_sim *sim;
 
-		qinfo = (struct cam_ed_qinfo *)camq_remove(&devq->send_queue,
+		device = (struct cam_ed *)camq_remove(&devq->send_queue,
 							   CAMQ_HEAD);
-		device = qinfo->device;
 		CAM_DEBUG_PRINT(CAM_DEBUG_XPT,
 				("running device %p\n", device));
 
@@ -3212,7 +3212,7 @@ xpt_run_devq(struct cam_devq *devq)
 
 		if ((work_ccb->ccb_h.flags & CAM_HIGH_POWER) != 0) {
 
-			mtx_lock(&xsoftc.xpt_lock);
+			mtx_lock(&xsoftc.xpt_highpower_lock);
 		 	if (xsoftc.num_highpower <= 0) {
 				/*
 				 * We got a high power command, but we
@@ -3220,12 +3220,11 @@ xpt_run_devq(struct cam_devq *devq)
 				 * the device queue until we have a slot
 				 * available.
 				 */
-				xpt_freeze_devq(work_ccb->ccb_h.path, 1);
-				STAILQ_INSERT_TAIL(&xsoftc.highpowerq,
-						   work_ccb->ccb_h.path->device,
+				xpt_freeze_devq_device(device, 1);
+				STAILQ_INSERT_TAIL(&xsoftc.highpowerq, device,
 						   highpowerq_entry);
 
-				mtx_unlock(&xsoftc.xpt_lock);
+				mtx_unlock(&xsoftc.xpt_highpower_lock);
 				continue;
 			} else {
 				/*
@@ -3234,15 +3233,14 @@ xpt_run_devq(struct cam_devq *devq)
 				 */
 				xsoftc.num_highpower--;
 			}
-			mtx_unlock(&xsoftc.xpt_lock);
+			mtx_unlock(&xsoftc.xpt_highpower_lock);
 		}
 		cam_ccbq_remove_ccb(&device->ccbq, work_ccb);
 		cam_ccbq_send_ccb(&device->ccbq, work_ccb);
-
 		devq->send_openings--;
 		devq->send_active++;
-
 		xpt_schedule_devq(devq, device);
+		mtx_unlock(&devq->send_mtx);
 
 		if ((work_ccb->ccb_h.flags & CAM_DEV_QFREEZE) != 0) {
 			/*
@@ -3286,13 +3284,18 @@ xpt_run_devq(struct cam_devq *devq)
 		}
 
 		/*
-		 * Device queues can be shared among multiple sim instances
-		 * that reside on different busses.  Use the SIM in the queue
-		 * CCB's path, rather than the one in the bus that was passed
-		 * into this function.
+		 * Device queues can be shared among multiple SIM instances
+		 * that reside on different busses.  Use the SIM from the
+		 * queued device, rather than the one from the calling bus.
 		 */
-		sim = work_ccb->ccb_h.path->bus->sim;
+		sim = device->sim;
+		lock = (mtx_owned(sim->mtx) == 0);
+		if (lock)
+			CAM_SIM_LOCK(sim);
 		(*(sim->sim_action))(sim, work_ccb);
+		if (lock)
+			CAM_SIM_UNLOCK(sim);
+		mtx_lock(&devq->send_mtx);
 	}
 	devq->send_queue.qfrozen_cnt--;
 }
@@ -3368,26 +3371,9 @@ xpt_create_path_unlocked(struct cam_path **new_path_ptr,
 			 struct cam_periph *periph, path_id_t path_id,
 			 target_id_t target_id, lun_id_t lun_id)
 {
-	struct	   cam_path *path;
-	struct	   cam_eb *bus = NULL;
-	cam_status status;
 
-	path = (struct cam_path *)malloc(sizeof(*path), M_CAMPATH, M_WAITOK);
-
-	bus = xpt_find_bus(path_id);
-	if (bus != NULL)
-		CAM_SIM_LOCK(bus->sim);
-	status = xpt_compile_path(path, periph, path_id, target_id, lun_id);
-	if (bus != NULL) {
-		CAM_SIM_UNLOCK(bus->sim);
-		xpt_release_bus(bus);
-	}
-	if (status != CAM_REQ_CMP) {
-		free(path, M_CAMPATH);
-		path = NULL;
-	}
-	*new_path_ptr = path;
-	return (status);
+	return (xpt_create_path(new_path_ptr, periph, path_id, target_id,
+	    lun_id));
 }
 
 cam_status
@@ -3411,6 +3397,8 @@ xpt_compile_path(struct cam_path *new_path, struct cam_periph *perph,
 	if (bus == NULL) {
 		status = CAM_PATH_INVALID;
 	} else {
+		xpt_lock_buses();
+		mtx_lock(&bus->eb_mtx);
 		target = xpt_find_target(bus, target_id);
 		if (target == NULL) {
 			/* Create one */
@@ -3423,6 +3411,7 @@ xpt_compile_path(struct cam_path *new_path, struct cam_periph *perph,
 				target = new_target;
 			}
 		}
+		xpt_unlock_buses();
 		if (target != NULL) {
 			device = xpt_find_device(target, lun_id);
 			if (device == NULL) {
@@ -3440,6 +3429,7 @@ xpt_compile_path(struct cam_path *new_path, struct cam_periph *perph,
 				}
 			}
 		}
+		mtx_unlock(&bus->eb_mtx);
 	}
 
 	/*
@@ -3462,6 +3452,32 @@ xpt_compile_path(struct cam_path *new_path, struct cam_periph *perph,
 	return (status);
 }
 
+cam_status
+xpt_clone_path(struct cam_path **new_path_ptr, struct cam_path *path)
+{
+	struct	   cam_path *new_path;
+
+	new_path = (struct cam_path *)malloc(sizeof(*path), M_CAMPATH, M_NOWAIT);
+	if (new_path == NULL)
+		return(CAM_RESRC_UNAVAIL);
+	xpt_copy_path(new_path, path);
+	*new_path_ptr = new_path;
+	return (CAM_REQ_CMP);
+}
+
+void
+xpt_copy_path(struct cam_path *new_path, struct cam_path *path)
+{
+
+	*new_path = *path;
+	if (path->bus != NULL)
+		xpt_acquire_bus(path->bus);
+	if (path->target != NULL)
+		xpt_acquire_target(path->target);
+	if (path->device != NULL)
+		xpt_acquire_device(path->device);
+}
+
 void
 xpt_release_path(struct cam_path *path)
 {
@@ -3620,7 +3636,7 @@ xpt_print_path(struct cam_path *path)
 			printf("X:");
 
 		if (path->device != NULL)
-			printf("%d): ", path->device->lun_id);
+			printf("%jx): ", (uintmax_t)path->device->lun_id);
 		else
 			printf("X): ");
 	}
@@ -3633,11 +3649,11 @@ xpt_print_device(struct cam_ed *device)
 	if (device == NULL)
 		printf("(nopath): ");
 	else {
-		printf("(noperiph:%s%d:%d:%d:%d): ", device->sim->sim_name,
+		printf("(noperiph:%s%d:%d:%d:%jx): ", device->sim->sim_name,
 		       device->sim->unit_number,
 		       device->sim->bus_id,
 		       device->target->target_id,
-		       device->lun_id);
+		       (uintmax_t)device->lun_id);
 	}
 }
 
@@ -3656,11 +3672,6 @@ xpt_path_string(struct cam_path *path, char *str, size_t str_len)
 {
 	struct sbuf sb;
 
-#ifdef INVARIANTS
-	if (path != NULL && path->bus != NULL)
-		mtx_assert(path->bus->sim->mtx, MA_OWNED);
-#endif
-
 	sbuf_new(&sb, str, str_len, 0);
 
 	if (path == NULL)
@@ -3685,7 +3696,8 @@ xpt_path_string(struct cam_path *path, char *str, size_t str_len)
 			sbuf_printf(&sb, "X:");
 
 		if (path->device != NULL)
-			sbuf_printf(&sb, "%d): ", path->device->lun_id);
+			sbuf_printf(&sb, "%jx): ",
+			    (uintmax_t)path->device->lun_id);
 		else
 			sbuf_printf(&sb, "X): ");
 	}
@@ -3728,7 +3740,6 @@ xpt_path_sim(struct cam_path *path)
 struct cam_periph*
 xpt_path_periph(struct cam_path *path)
 {
-	mtx_assert(path->bus->sim->mtx, MA_OWNED);
 
 	return (path->periph);
 }
@@ -3781,28 +3792,18 @@ xpt_path_legacy_ata_id(struct cam_path *path)
 void
 xpt_release_ccb(union ccb *free_ccb)
 {
-	struct	 cam_path *path;
 	struct	 cam_ed *device;
-	struct	 cam_eb *bus;
-	struct   cam_sim *sim;
+	struct	 cam_periph *periph;
 
 	CAM_DEBUG_PRINT(CAM_DEBUG_XPT, ("xpt_release_ccb\n"));
-	path = free_ccb->ccb_h.path;
-	device = path->device;
-	bus = path->bus;
-	sim = bus->sim;
-
-	mtx_assert(sim->mtx, MA_OWNED);
+	xpt_path_assert(free_ccb->ccb_h.path, MA_OWNED);
+	device = free_ccb->ccb_h.path->device;
+	periph = free_ccb->ccb_h.path->periph;
 
+	xpt_free_ccb(free_ccb);
+	periph->periph_allocated--;
 	cam_ccbq_release_opening(&device->ccbq);
-	if (sim->ccb_count > sim->max_ccbs) {
-		xpt_free_ccb(free_ccb);
-		sim->ccb_count--;
-	} else {
-		SLIST_INSERT_HEAD(&sim->ccb_freeq, &free_ccb->ccb_h,
-		    xpt_links.sle);
-	}
-	xpt_run_dev_allocq(device);
+	xpt_run_allocq(periph, 0);
 }
 
 /* Functions accessed by SIM drivers */
@@ -3835,18 +3836,14 @@ xpt_bus_register(struct cam_sim *sim, device_t parent, u_int32_t bus)
 
 	sim->bus_id = bus;
 	new_bus = (struct cam_eb *)malloc(sizeof(*new_bus),
-					  M_CAMXPT, M_NOWAIT);
+					  M_CAMXPT, M_NOWAIT|M_ZERO);
 	if (new_bus == NULL) {
 		/* Couldn't satisfy request */
 		return (CAM_RESRC_UNAVAIL);
 	}
-	if (strcmp(sim->sim_name, "xpt") != 0) {
-		sim->path_id =
-		    xptpathid(sim->sim_name, sim->unit_number, sim->bus_id);
-	}
 
+	mtx_init(&new_bus->eb_mtx, "CAM bus lock", NULL, MTX_DEF);
 	TAILQ_INIT(&new_bus->et_entries);
-	new_bus->path_id = sim->path_id;
 	cam_sim_hold(sim);
 	new_bus->sim = sim;
 	timevalclear(&new_bus->last_reset);
@@ -3855,6 +3852,8 @@ xpt_bus_register(struct cam_sim *sim, device_t parent, u_int32_t bus)
 	new_bus->generation = 0;
 
 	xpt_lock_buses();
+	sim->path_id = new_bus->path_id =
+	    xptpathid(sim->sim_name, sim->unit_number, sim->bus_id);
 	old_bus = TAILQ_FIRST(&xsoftc.xpt_busses);
 	while (old_bus != NULL
 	    && old_bus->path_id < new_bus->path_id)
@@ -3958,8 +3957,8 @@ xptnextfreepathid(void)
 	path_id_t pathid;
 	const char *strval;
 
+	mtx_assert(&xsoftc.xpt_topo_lock, MA_OWNED);
 	pathid = 0;
-	xpt_lock_buses();
 	bus = TAILQ_FIRST(&xsoftc.xpt_busses);
 retry:
 	/* Find an unoccupied pathid */
@@ -3968,7 +3967,6 @@ retry:
 			pathid++;
 		bus = TAILQ_NEXT(bus, links);
 	}
-	xpt_unlock_buses();
 
 	/*
 	 * Ensure that this pathid is not reserved for
@@ -3977,7 +3975,6 @@ retry:
 	if (resource_string_value("scbus", pathid, "at", &strval) == 0) {
 		++pathid;
 		/* Start the search over */
-		xpt_lock_buses();
 		goto retry;
 	}
 	return (pathid);
@@ -3993,6 +3990,8 @@ xptpathid(const char *sim_name, int sim_unit, int sim_bus)
 
 	pathid = CAM_XPT_PATH_ID;
 	snprintf(buf, sizeof(buf), "%s%d", sim_name, sim_unit);
+	if (strcmp(buf, "xpt0") == 0 && sim_bus == 0)
+		return (pathid);
 	i = 0;
 	while ((resource_find_match(&i, &dname, &dunit, "at", buf)) == 0) {
 		if (strcmp(dname, "scbus")) {
@@ -4049,24 +4048,111 @@ xpt_async_string(u_int32_t async_code)
 	return ("AC_UNKNOWN");
 }
 
-void
-xpt_async(u_int32_t async_code, struct cam_path *path, void *async_arg)
+static int
+xpt_async_size(u_int32_t async_code)
 {
-	struct cam_eb *bus;
-	struct cam_et *target, *next_target;
-	struct cam_ed *device, *next_device;
 
-	mtx_assert(path->bus->sim->mtx, MA_OWNED);
-	CAM_DEBUG(path, CAM_DEBUG_TRACE | CAM_DEBUG_INFO,
-	    ("xpt_async(%s)\n", xpt_async_string(async_code)));
+	switch (async_code) {
+	case AC_BUS_RESET: return (0);
+	case AC_UNSOL_RESEL: return (0);
+	case AC_SCSI_AEN: return (0);
+	case AC_SENT_BDR: return (0);
+	case AC_PATH_REGISTERED: return (sizeof(struct ccb_pathinq));
+	case AC_PATH_DEREGISTERED: return (0);
+	case AC_FOUND_DEVICE: return (sizeof(struct ccb_getdev));
+	case AC_LOST_DEVICE: return (0);
+	case AC_TRANSFER_NEG: return (sizeof(struct ccb_trans_settings));
+	case AC_INQ_CHANGED: return (0);
+	case AC_GETDEV_CHANGED: return (0);
+	case AC_CONTRACT: return (sizeof(struct ac_contract));
+	case AC_ADVINFO_CHANGED: return (-1);
+	case AC_UNIT_ATTENTION: return (sizeof(struct ccb_scsiio));
+	}
+	return (0);
+}
+
+static int
+xpt_async_process_dev(struct cam_ed *device, void *arg)
+{
+	union ccb *ccb = arg;
+	struct cam_path *path = ccb->ccb_h.path;
+	void *async_arg = ccb->casync.async_arg_ptr;
+	u_int32_t async_code = ccb->casync.async_code;
+	int relock;
+
+	if (path->device != device
+	 && path->device->lun_id != CAM_LUN_WILDCARD
+	 && device->lun_id != CAM_LUN_WILDCARD)
+		return (1);
 
 	/*
-	 * Most async events come from a CAM interrupt context.  In
-	 * a few cases, the error recovery code at the peripheral layer,
-	 * which may run from our SWI or a process context, may signal
-	 * deferred events with a call to xpt_async.
+	 * The async callback could free the device.
+	 * If it is a broadcast async, it doesn't hold
+	 * device reference, so take our own reference.
 	 */
+	xpt_acquire_device(device);
 
+	/*
+	 * If async for specific device is to be delivered to
+	 * the wildcard client, take the specific device lock.
+	 * XXX: We may need a way for client to specify it.
+	 */
+	if ((device->lun_id == CAM_LUN_WILDCARD &&
+	     path->device->lun_id != CAM_LUN_WILDCARD) ||
+	    (device->target->target_id == CAM_TARGET_WILDCARD &&
+	     path->target->target_id != CAM_TARGET_WILDCARD) ||
+	    (device->target->bus->path_id == CAM_BUS_WILDCARD &&
+	     path->target->bus->path_id != CAM_BUS_WILDCARD)) {
+		mtx_unlock(&device->device_mtx);
+		xpt_path_lock(path);
+		relock = 1;
+	} else
+		relock = 0;
+
+	(*(device->target->bus->xport->async))(async_code,
+	    device->target->bus, device->target, device, async_arg);
+	xpt_async_bcast(&device->asyncs, async_code, path, async_arg);
+
+	if (relock) {
+		xpt_path_unlock(path);
+		mtx_lock(&device->device_mtx);
+	}
+	xpt_release_device(device);
+	return (1);
+}
+
+static int
+xpt_async_process_tgt(struct cam_et *target, void *arg)
+{
+	union ccb *ccb = arg;
+	struct cam_path *path = ccb->ccb_h.path;
+
+	if (path->target != target
+	 && path->target->target_id != CAM_TARGET_WILDCARD
+	 && target->target_id != CAM_TARGET_WILDCARD)
+		return (1);
+
+	if (ccb->casync.async_code == AC_SENT_BDR) {
+		/* Update our notion of when the last reset occurred */
+		microtime(&target->last_reset);
+	}
+
+	return (xptdevicetraverse(target, NULL, xpt_async_process_dev, ccb));
+}
+
+static void
+xpt_async_process(struct cam_periph *periph, union ccb *ccb)
+{
+	struct cam_eb *bus;
+	struct cam_path *path;
+	void *async_arg;
+	u_int32_t async_code;
+
+	path = ccb->ccb_h.path;
+	async_code = ccb->casync.async_code;
+	async_arg = ccb->casync.async_arg_ptr;
+	CAM_DEBUG(path, CAM_DEBUG_TRACE | CAM_DEBUG_INFO,
+	    ("xpt_async(%s)\n", xpt_async_string(async_code)));
 	bus = path->bus;
 
 	if (async_code == AC_BUS_RESET) {
@@ -4074,55 +4160,26 @@ xpt_async(u_int32_t async_code, struct cam_path *path, void *async_arg)
 		microtime(&bus->last_reset);
 	}
 
-	for (target = TAILQ_FIRST(&bus->et_entries);
-	     target != NULL;
-	     target = next_target) {
-
-		next_target = TAILQ_NEXT(target, links);
-
-		if (path->target != target
-		 && path->target->target_id != CAM_TARGET_WILDCARD
-		 && target->target_id != CAM_TARGET_WILDCARD)
-			continue;
-
-		if (async_code == AC_SENT_BDR) {
-			/* Update our notion of when the last reset occurred */
-			microtime(&path->target->last_reset);
-		}
-
-		for (device = TAILQ_FIRST(&target->ed_entries);
-		     device != NULL;
-		     device = next_device) {
-
-			next_device = TAILQ_NEXT(device, links);
-
-			if (path->device != device
-			 && path->device->lun_id != CAM_LUN_WILDCARD
-			 && device->lun_id != CAM_LUN_WILDCARD)
-				continue;
-			/*
-			 * The async callback could free the device.
-			 * If it is a broadcast async, it doesn't hold
-			 * device reference, so take our own reference.
-			 */
-			xpt_acquire_device(device);
-			(*(bus->xport->async))(async_code, bus,
-					       target, device,
-					       async_arg);
-
-			xpt_async_bcast(&device->asyncs, async_code,
-					path, async_arg);
-			xpt_release_device(device);
-		}
-	}
+	xpttargettraverse(bus, NULL, xpt_async_process_tgt, ccb);
 
 	/*
 	 * If this wasn't a fully wildcarded async, tell all
 	 * clients that want all async events.
 	 */
-	if (bus != xpt_periph->path->bus)
-		xpt_async_bcast(&xpt_periph->path->device->asyncs, async_code,
-				path, async_arg);
+	if (bus != xpt_periph->path->bus) {
+		xpt_path_lock(xpt_periph->path);
+		xpt_async_process_dev(xpt_periph->path->device, ccb);
+		xpt_path_unlock(xpt_periph->path);
+	}
+
+	if (path->device != NULL && path->device->lun_id != CAM_LUN_WILDCARD)
+		xpt_release_devq(path, 1, TRUE);
+	else
+		xpt_release_simq(path->bus->sim, TRUE);
+	if (ccb->casync.async_arg_size > 0)
+		free(async_arg, M_CAMXPT);
+	xpt_free_path(path);
+	xpt_free_ccb(ccb);
 }
 
 static void
@@ -4131,6 +4188,7 @@ xpt_async_bcast(struct async_list *async_head,
 		struct cam_path *path, void *async_arg)
 {
 	struct async_node *cur_entry;
+	int lock;
 
 	cur_entry = SLIST_FIRST(async_head);
 	while (cur_entry != NULL) {
@@ -4141,72 +4199,163 @@ xpt_async_bcast(struct async_list *async_head,
 		 * can delete its async callback entry.
 		 */
 		next_entry = SLIST_NEXT(cur_entry, links);
-		if ((cur_entry->event_enable & async_code) != 0)
+		if ((cur_entry->event_enable & async_code) != 0) {
+			lock = cur_entry->event_lock;
+			if (lock)
+				CAM_SIM_LOCK(path->device->sim);
 			cur_entry->callback(cur_entry->callback_arg,
 					    async_code, path,
 					    async_arg);
+			if (lock)
+				CAM_SIM_UNLOCK(path->device->sim);
+		}
 		cur_entry = next_entry;
 	}
 }
 
+void
+xpt_async(u_int32_t async_code, struct cam_path *path, void *async_arg)
+{
+	union ccb *ccb;
+	int size;
+
+	ccb = xpt_alloc_ccb_nowait();
+	if (ccb == NULL) {
+		xpt_print(path, "Can't allocate CCB to send %s\n",
+		    xpt_async_string(async_code));
+		return;
+	}
+
+	if (xpt_clone_path(&ccb->ccb_h.path, path) != CAM_REQ_CMP) {
+		xpt_print(path, "Can't allocate path to send %s\n",
+		    xpt_async_string(async_code));
+		xpt_free_ccb(ccb);
+		return;
+	}
+	ccb->ccb_h.path->periph = NULL;
+	ccb->ccb_h.func_code = XPT_ASYNC;
+	ccb->ccb_h.cbfcnp = xpt_async_process;
+	ccb->ccb_h.flags |= CAM_UNLOCKED;
+	ccb->casync.async_code = async_code;
+	ccb->casync.async_arg_size = 0;
+	size = xpt_async_size(async_code);
+	if (size > 0 && async_arg != NULL) {
+		ccb->casync.async_arg_ptr = malloc(size, M_CAMXPT, M_NOWAIT);
+		if (ccb->casync.async_arg_ptr == NULL) {
+			xpt_print(path, "Can't allocate argument to send %s\n",
+			    xpt_async_string(async_code));
+			xpt_free_path(ccb->ccb_h.path);
+			xpt_free_ccb(ccb);
+			return;
+		}
+		memcpy(ccb->casync.async_arg_ptr, async_arg, size);
+		ccb->casync.async_arg_size = size;
+	} else if (size < 0)
+		ccb->casync.async_arg_size = size;
+	if (path->device != NULL && path->device->lun_id != CAM_LUN_WILDCARD)
+		xpt_freeze_devq(path, 1);
+	else
+		xpt_freeze_simq(path->bus->sim, 1);
+	xpt_done(ccb);
+}
+
 static void
 xpt_dev_async_default(u_int32_t async_code, struct cam_eb *bus,
 		      struct cam_et *target, struct cam_ed *device,
 		      void *async_arg)
 {
+
+	/*
+	 * We only need to handle events for real devices.
+	 */
+	if (target->target_id == CAM_TARGET_WILDCARD
+	 || device->lun_id == CAM_LUN_WILDCARD)
+		return;
+
 	printf("%s called\n", __func__);
 }
 
+static uint32_t
+xpt_freeze_devq_device(struct cam_ed *dev, u_int count)
+{
+	struct cam_devq	*devq;
+	uint32_t freeze;
+
+	devq = dev->sim->devq;
+	mtx_assert(&devq->send_mtx, MA_OWNED);
+	CAM_DEBUG_DEV(dev, CAM_DEBUG_TRACE,
+	    ("xpt_freeze_devq_device(%d) %u->%u\n", count,
+	    dev->ccbq.queue.qfrozen_cnt, dev->ccbq.queue.qfrozen_cnt + count));
+	freeze = (dev->ccbq.queue.qfrozen_cnt += count);
+	/* Remove frozen device from sendq. */
+	if (device_is_queued(dev))
+		camq_remove(&devq->send_queue, dev->devq_entry.index);
+	return (freeze);
+}
+
 u_int32_t
 xpt_freeze_devq(struct cam_path *path, u_int count)
 {
-	struct cam_ed *dev = path->device;
+	struct cam_ed	*dev = path->device;
+	struct cam_devq	*devq;
+	uint32_t	 freeze;
 
-	mtx_assert(path->bus->sim->mtx, MA_OWNED);
-	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_freeze_devq() %u->%u\n",
-	    dev->ccbq.queue.qfrozen_cnt, dev->ccbq.queue.qfrozen_cnt + count));
-	dev->ccbq.queue.qfrozen_cnt += count;
-	/* Remove frozen device from sendq. */
-	if (device_is_queued(dev)) {
-		camq_remove(&dev->sim->devq->send_queue,
-		    dev->devq_entry.pinfo.index);
-	}
-	return (dev->ccbq.queue.qfrozen_cnt);
+	devq = dev->sim->devq;
+	mtx_lock(&devq->send_mtx);
+	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_freeze_devq(%d)\n", count));
+	freeze = xpt_freeze_devq_device(dev, count);
+	mtx_unlock(&devq->send_mtx);
+	return (freeze);
 }
 
 u_int32_t
 xpt_freeze_simq(struct cam_sim *sim, u_int count)
 {
+	struct cam_devq	*devq;
+	uint32_t	 freeze;
 
-	mtx_assert(sim->mtx, MA_OWNED);
-	sim->devq->send_queue.qfrozen_cnt += count;
-	return (sim->devq->send_queue.qfrozen_cnt);
+	devq = sim->devq;
+	mtx_lock(&devq->send_mtx);
+	freeze = (devq->send_queue.qfrozen_cnt += count);
+	mtx_unlock(&devq->send_mtx);
+	return (freeze);
 }
 
 static void
 xpt_release_devq_timeout(void *arg)
 {
-	struct cam_ed *device;
+	struct cam_ed *dev;
+	struct cam_devq *devq;
 
-	device = (struct cam_ed *)arg;
-	CAM_DEBUG_DEV(device, CAM_DEBUG_TRACE, ("xpt_release_devq_timeout\n"));
-	xpt_release_devq_device(device, /*count*/1, /*run_queue*/TRUE);
+	dev = (struct cam_ed *)arg;
+	CAM_DEBUG_DEV(dev, CAM_DEBUG_TRACE, ("xpt_release_devq_timeout\n"));
+	devq = dev->sim->devq;
+	mtx_assert(&devq->send_mtx, MA_OWNED);
+	if (xpt_release_devq_device(dev, /*count*/1, /*run_queue*/TRUE))
+		xpt_run_devq(devq);
 }
 
 void
 xpt_release_devq(struct cam_path *path, u_int count, int run_queue)
 {
+	struct cam_ed *dev;
+	struct cam_devq *devq;
 
-	mtx_assert(path->bus->sim->mtx, MA_OWNED);
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("xpt_release_devq(%d, %d)\n",
 	    count, run_queue));
-	xpt_release_devq_device(path->device, count, run_queue);
+	dev = path->device;
+	devq = dev->sim->devq;
+	mtx_lock(&devq->send_mtx);
+	if (xpt_release_devq_device(dev, count, run_queue))
+		xpt_run_devq(dev->sim->devq);
+	mtx_unlock(&devq->send_mtx);
 }
 
-void
+static int
 xpt_release_devq_device(struct cam_ed *dev, u_int count, int run_queue)
 {
 
+	mtx_assert(&dev->sim->devq->send_mtx, MA_OWNED);
 	CAM_DEBUG_DEV(dev, CAM_DEBUG_TRACE,
 	    ("xpt_release_devq_device(%d, %d) %u->%u\n", count, run_queue,
 	    dev->ccbq.queue.qfrozen_cnt, dev->ccbq.queue.qfrozen_cnt - count));
@@ -4232,34 +4381,32 @@ xpt_release_devq_device(struct cam_ed *dev, u_int count, int run_queue)
 			callout_stop(&dev->callout);
 			dev->flags &= ~CAM_DEV_REL_TIMEOUT_PENDING;
 		}
-		xpt_run_dev_allocq(dev);
-		if (run_queue == 0)
-			return;
 		/*
 		 * Now that we are unfrozen schedule the
 		 * device so any pending transactions are
 		 * run.
 		 */
-		if (xpt_schedule_devq(dev->sim->devq, dev))
-			xpt_run_devq(dev->sim->devq);
-	}
+		xpt_schedule_devq(dev->sim->devq, dev);
+	} else
+		run_queue = 0;
+	return (run_queue);
 }
 
 void
 xpt_release_simq(struct cam_sim *sim, int run_queue)
 {
-	struct	camq *sendq;
+	struct cam_devq	*devq;
 
-	mtx_assert(sim->mtx, MA_OWNED);
-	sendq = &(sim->devq->send_queue);
-	if (sendq->qfrozen_cnt <= 0) {
+	devq = sim->devq;
+	mtx_lock(&devq->send_mtx);
+	if (devq->send_queue.qfrozen_cnt <= 0) {
 #ifdef INVARIANTS
 		printf("xpt_release_simq: requested 1 > present %u\n",
-		    sendq->qfrozen_cnt);
+		    devq->send_queue.qfrozen_cnt);
 #endif
 	} else
-		sendq->qfrozen_cnt--;
-	if (sendq->qfrozen_cnt == 0) {
+		devq->send_queue.qfrozen_cnt--;
+	if (devq->send_queue.qfrozen_cnt == 0) {
 		/*
 		 * If there is a timeout scheduled to release this
 		 * sim queue, remove it.  The queue frozen count is
@@ -4276,6 +4423,7 @@ xpt_release_simq(struct cam_sim *sim, int run_queue)
 			xpt_run_devq(sim->devq);
 		}
 	}
+	mtx_unlock(&devq->send_mtx);
 }
 
 /*
@@ -4293,49 +4441,34 @@ xpt_release_simq_timeout(void *arg)
 void
 xpt_done(union ccb *done_ccb)
 {
-	struct cam_sim *sim;
-	int	first;
+	struct cam_doneq *queue;
+	int	run, hash;
 
 	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_done\n"));
-	if ((done_ccb->ccb_h.func_code & XPT_FC_QUEUED) != 0) {
-		/*
-		 * Queue up the request for handling by our SWI handler
-		 * any of the "non-immediate" type of ccbs.
-		 */
-		sim = done_ccb->ccb_h.path->bus->sim;
-		TAILQ_INSERT_TAIL(&sim->sim_doneq, &done_ccb->ccb_h,
-		    sim_links.tqe);
-		done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX;
-		if ((sim->flags & (CAM_SIM_ON_DONEQ | CAM_SIM_POLLED |
-		    CAM_SIM_BATCH)) == 0) {
-			mtx_lock(&cam_simq_lock);
-			first = TAILQ_EMPTY(&cam_simq);
-			TAILQ_INSERT_TAIL(&cam_simq, sim, links);
-			mtx_unlock(&cam_simq_lock);
-			sim->flags |= CAM_SIM_ON_DONEQ;
-			if (first)
-				swi_sched(cambio_ih, 0);
-		}
-	}
+	if ((done_ccb->ccb_h.func_code & XPT_FC_QUEUED) == 0)
+		return;
+
+	hash = (done_ccb->ccb_h.path_id + done_ccb->ccb_h.target_id +
+	    done_ccb->ccb_h.target_lun) % cam_num_doneqs;
+	queue = &cam_doneqs[hash];
+	mtx_lock(&queue->cam_doneq_mtx);
+	run = (queue->cam_doneq_sleep && STAILQ_EMPTY(&queue->cam_doneq));
+	STAILQ_INSERT_TAIL(&queue->cam_doneq, &done_ccb->ccb_h, sim_links.stqe);
+	done_ccb->ccb_h.pinfo.index = CAM_DONEQ_INDEX;
+	mtx_unlock(&queue->cam_doneq_mtx);
+	if (run)
+		wakeup(&queue->cam_doneq);
 }
 
 void
-xpt_batch_start(struct cam_sim *sim)
+xpt_done_direct(union ccb *done_ccb)
 {
 
-	KASSERT((sim->flags & CAM_SIM_BATCH) == 0, ("Batch flag already set"));
-	sim->flags |= CAM_SIM_BATCH;
-}
+	CAM_DEBUG(done_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_done_direct\n"));
+	if ((done_ccb->ccb_h.func_code & XPT_FC_QUEUED) == 0)
+		return;
 
-void
-xpt_batch_done(struct cam_sim *sim)
-{
-
-	KASSERT((sim->flags & CAM_SIM_BATCH) != 0, ("Batch flag was not set"));
-	sim->flags &= ~CAM_SIM_BATCH;
-	if (!TAILQ_EMPTY(&sim->sim_doneq) &&
-	    (sim->flags & CAM_SIM_ON_DONEQ) == 0)
-		camisr_runqueue(sim);
+	xpt_done_process(&done_ccb->ccb_h);
 }
 
 union ccb *
@@ -4368,32 +4501,64 @@ xpt_free_ccb(union ccb *free_ccb)
 
 /*
  * Get a CAM control block for the caller. Charge the structure to the device
- * referenced by the path.  If the this device has no 'credits' then the
- * device already has the maximum number of outstanding operations under way
- * and we return NULL. If we don't have sufficient resources to allocate more
- * ccbs, we also return NULL.
+ * referenced by the path.  If we don't have sufficient resources to allocate
+ * more ccbs, we return NULL.
  */
 static union ccb *
-xpt_get_ccb(struct cam_ed *device)
+xpt_get_ccb_nowait(struct cam_periph *periph)
 {
 	union ccb *new_ccb;
-	struct cam_sim *sim;
 
-	sim = device->sim;
-	if ((new_ccb = (union ccb *)SLIST_FIRST(&sim->ccb_freeq)) == NULL) {
-		new_ccb = xpt_alloc_ccb_nowait();
-                if (new_ccb == NULL) {
-			return (NULL);
-		}
-		SLIST_INSERT_HEAD(&sim->ccb_freeq, &new_ccb->ccb_h,
-				  xpt_links.sle);
-		sim->ccb_count++;
-	}
-	cam_ccbq_take_opening(&device->ccbq);
-	SLIST_REMOVE_HEAD(&sim->ccb_freeq, xpt_links.sle);
+	new_ccb = malloc(sizeof(*new_ccb), M_CAMCCB, M_NOWAIT);
+	if (new_ccb == NULL)
+		return (NULL);
+	periph->periph_allocated++;
+	cam_ccbq_take_opening(&periph->path->device->ccbq);
 	return (new_ccb);
 }
 
+static union ccb *
+xpt_get_ccb(struct cam_periph *periph)
+{
+	union ccb *new_ccb;
+
+	cam_periph_unlock(periph);
+	new_ccb = malloc(sizeof(*new_ccb), M_CAMCCB, M_WAITOK);
+	cam_periph_lock(periph);
+	periph->periph_allocated++;
+	cam_ccbq_take_opening(&periph->path->device->ccbq);
+	return (new_ccb);
+}
+
+union ccb *
+cam_periph_getccb(struct cam_periph *periph, u_int32_t priority)
+{
+	struct ccb_hdr *ccb_h;
+
+	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, ("cam_periph_getccb\n"));
+	cam_periph_assert(periph, MA_OWNED);
+	while ((ccb_h = SLIST_FIRST(&periph->ccb_list)) == NULL ||
+	    ccb_h->pinfo.priority != priority) {
+		if (priority < periph->immediate_priority) {
+			periph->immediate_priority = priority;
+			xpt_run_allocq(periph, 0);
+		} else
+			cam_periph_sleep(periph, &periph->ccb_list, PRIBIO,
+			    "cgticb", 0);
+	}
+	SLIST_REMOVE_HEAD(&periph->ccb_list, periph_links.sle);
+	return ((union ccb *)ccb_h);
+}
+
+static void
+xpt_acquire_bus(struct cam_eb *bus)
+{
+
+	xpt_lock_buses();
+	bus->refcount++;
+	xpt_unlock_buses();
+}
+
 static void
 xpt_release_bus(struct cam_eb *bus)
 {
@@ -4404,12 +4569,13 @@ xpt_release_bus(struct cam_eb *bus)
 		xpt_unlock_buses();
 		return;
 	}
-	KASSERT(TAILQ_EMPTY(&bus->et_entries),
-	    ("refcount is zero, but target list is not empty"));
 	TAILQ_REMOVE(&xsoftc.xpt_busses, bus, links);
 	xsoftc.bus_generation++;
 	xpt_unlock_buses();
+	KASSERT(TAILQ_EMPTY(&bus->et_entries),
+	    ("destroying bus, but target list is not empty"));
 	cam_sim_release(bus->sim);
+	mtx_destroy(&bus->eb_mtx);
 	free(bus, M_CAMXPT);
 }
 
@@ -4418,7 +4584,8 @@ xpt_alloc_target(struct cam_eb *bus, target_id_t target_id)
 {
 	struct cam_et *cur_target, *target;
 
-	mtx_assert(bus->sim->mtx, MA_OWNED);
+	mtx_assert(&xsoftc.xpt_topo_lock, MA_OWNED);
+	mtx_assert(&bus->eb_mtx, MA_OWNED);
 	target = (struct cam_et *)malloc(sizeof(*target), M_CAMXPT,
 					 M_NOWAIT|M_ZERO);
 	if (target == NULL)
@@ -4430,14 +4597,13 @@ xpt_alloc_target(struct cam_eb *bus, target_id_t target_id)
 	target->refcount = 1;
 	target->generation = 0;
 	target->luns = NULL;
+	mtx_init(&target->luns_mtx, "CAM LUNs lock", NULL, MTX_DEF);
 	timevalclear(&target->last_reset);
 	/*
 	 * Hold a reference to our parent bus so it
 	 * will not go away before we do.
 	 */
-	xpt_lock_buses();
 	bus->refcount++;
-	xpt_unlock_buses();
 
 	/* Insertion sort into our bus's target list */
 	cur_target = TAILQ_FIRST(&bus->et_entries);
@@ -4452,18 +4618,33 @@ xpt_alloc_target(struct cam_eb *bus, target_id_t target_id)
 	return (target);
 }
 
+static void
+xpt_acquire_target(struct cam_et *target)
+{
+	struct cam_eb *bus = target->bus;
+
+	mtx_lock(&bus->eb_mtx);
+	target->refcount++;
+	mtx_unlock(&bus->eb_mtx);
+}
+
 static void
 xpt_release_target(struct cam_et *target)
 {
+	struct cam_eb *bus = target->bus;
 
-	mtx_assert(target->bus->sim->mtx, MA_OWNED);
-	if (--target->refcount > 0)
+	mtx_lock(&bus->eb_mtx);
+	if (--target->refcount > 0) {
+		mtx_unlock(&bus->eb_mtx);
 		return;
+	}
+	TAILQ_REMOVE(&bus->et_entries, target, links);
+	bus->generation++;
+	mtx_unlock(&bus->eb_mtx);
 	KASSERT(TAILQ_EMPTY(&target->ed_entries),
-	    ("refcount is zero, but device list is not empty"));
-	TAILQ_REMOVE(&target->bus->et_entries, target, links);
-	target->bus->generation++;
-	xpt_release_bus(target->bus);
+	    ("destroying target, but device list is not empty"));
+	xpt_release_bus(bus);
+	mtx_destroy(&target->luns_mtx);
 	if (target->luns)
 		free(target->luns, M_CAMXPT);
 	free(target, M_CAMXPT);
@@ -4481,10 +4662,19 @@ xpt_alloc_device_default(struct cam_eb *bus, struct cam_et *target,
 
 	device->mintags = 1;
 	device->maxtags = 1;
-	bus->sim->max_ccbs += device->ccbq.devq_openings;
 	return (device);
 }
 
+static void
+xpt_destroy_device(void *context, int pending)
+{
+	struct cam_ed	*device = context;
+
+	mtx_lock(&device->device_mtx);
+	mtx_destroy(&device->device_mtx);
+	free(device, M_CAMDEV);
+}
+
 struct cam_ed *
 xpt_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 {
@@ -4492,10 +4682,12 @@ xpt_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 	struct cam_devq	*devq;
 	cam_status status;
 
-	mtx_assert(target->bus->sim->mtx, MA_OWNED);
+	mtx_assert(&bus->eb_mtx, MA_OWNED);
 	/* Make space for us in the device queue on our bus */
 	devq = bus->sim->devq;
+	mtx_lock(&devq->send_mtx);
 	status = cam_devq_resize(devq, devq->send_queue.array_size + 1);
+	mtx_unlock(&devq->send_mtx);
 	if (status != CAM_REQ_CMP)
 		return (NULL);
 
@@ -4504,19 +4696,12 @@ xpt_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 	if (device == NULL)
 		return (NULL);
 
-	cam_init_pinfo(&device->devq_entry.pinfo);
-	device->devq_entry.device = device;
+	cam_init_pinfo(&device->devq_entry);
 	device->target = target;
 	device->lun_id = lun_id;
 	device->sim = bus->sim;
-	/* Initialize our queues */
-	if (camq_init(&device->drvq, 0) != 0) {
-		free(device, M_CAMDEV);
-		return (NULL);
-	}
 	if (cam_ccbq_init(&device->ccbq,
 			  bus->sim->max_dev_openings) != 0) {
-		camq_fini(&device->drvq);
 		free(device, M_CAMDEV);
 		return (NULL);
 	}
@@ -4527,7 +4712,14 @@ xpt_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 	device->tag_delay_count = 0;
 	device->tag_saved_openings = 0;
 	device->refcount = 1;
-	callout_init_mtx(&device->callout, bus->sim->mtx, 0);
+	mtx_init(&device->device_mtx, "CAM device lock", NULL, MTX_DEF);
+	callout_init_mtx(&device->callout, &devq->send_mtx, 0);
+	TASK_INIT(&device->device_destroy_task, 0, xpt_destroy_device, device);
+	/*
+	 * Hold a reference to our parent bus so it
+	 * will not go away before we do.
+	 */
+	target->refcount++;
 
 	cur_device = TAILQ_FIRST(&target->ed_entries);
 	while (cur_device != NULL && cur_device->lun_id < lun_id)
@@ -4536,7 +4728,6 @@ xpt_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 		TAILQ_INSERT_BEFORE(cur_device, device, links);
 	else
 		TAILQ_INSERT_TAIL(&target->ed_entries, device, links);
-	target->refcount++;
 	target->generation++;
 	return (device);
 }
@@ -4544,35 +4735,45 @@ xpt_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 void
 xpt_acquire_device(struct cam_ed *device)
 {
+	struct cam_eb *bus = device->target->bus;
 
-	mtx_assert(device->sim->mtx, MA_OWNED);
+	mtx_lock(&bus->eb_mtx);
 	device->refcount++;
+	mtx_unlock(&bus->eb_mtx);
 }
 
 void
 xpt_release_device(struct cam_ed *device)
 {
+	struct cam_eb *bus = device->target->bus;
 	struct cam_devq *devq;
 
-	mtx_assert(device->sim->mtx, MA_OWNED);
-	if (--device->refcount > 0)
+	mtx_lock(&bus->eb_mtx);
+	if (--device->refcount > 0) {
+		mtx_unlock(&bus->eb_mtx);
 		return;
+	}
+
+	TAILQ_REMOVE(&device->target->ed_entries, device,links);
+	device->target->generation++;
+	mtx_unlock(&bus->eb_mtx);
+
+	/* Release our slot in the devq */
+	devq = bus->sim->devq;
+	mtx_lock(&devq->send_mtx);
+	cam_devq_resize(devq, devq->send_queue.array_size - 1);
+	mtx_unlock(&devq->send_mtx);
 
 	KASSERT(SLIST_EMPTY(&device->periphs),
-	    ("refcount is zero, but periphs list is not empty"));
-	if (device->devq_entry.pinfo.index != CAM_UNQUEUED_INDEX)
-		panic("Removing device while still queued for ccbs");
+	    ("destroying device, but periphs list is not empty"));
+	KASSERT(device->devq_entry.index == CAM_UNQUEUED_INDEX,
+	    ("destroying device while still queued for ccbs"));
 
 	if ((device->flags & CAM_DEV_REL_TIMEOUT_PENDING) != 0)
 		callout_stop(&device->callout);
 
-	TAILQ_REMOVE(&device->target->ed_entries, device,links);
-	device->target->generation++;
-	device->target->bus->sim->max_ccbs -= device->ccbq.devq_openings;
-	/* Release our slot in the devq */
-	devq = device->target->bus->sim->devq;
-	cam_devq_resize(devq, devq->send_queue.array_size - 1);
-	camq_fini(&device->drvq);
+	xpt_release_target(device->target);
+
 	cam_ccbq_fini(&device->ccbq);
 	/*
 	 * Free allocated memory.  free(9) does nothing if the
@@ -4584,27 +4785,22 @@ xpt_release_device(struct cam_ed *device)
 	free(device->physpath, M_CAMXPT);
 	free(device->rcap_buf, M_CAMXPT);
 	free(device->serial_num, M_CAMXPT);
-
-	xpt_release_target(device->target);
-	free(device, M_CAMDEV);
+	taskqueue_enqueue(xsoftc.xpt_taskq, &device->device_destroy_task);
 }
 
 u_int32_t
 xpt_dev_ccbq_resize(struct cam_path *path, int newopenings)
 {
-	int	diff;
 	int	result;
 	struct	cam_ed *dev;
 
 	dev = path->device;
-
-	diff = newopenings - (dev->ccbq.dev_active + dev->ccbq.dev_openings);
+	mtx_lock(&dev->sim->devq->send_mtx);
 	result = cam_ccbq_resize(&dev->ccbq, newopenings);
+	mtx_unlock(&dev->sim->devq->send_mtx);
 	if ((dev->flags & CAM_DEV_TAG_AFTER_COUNT) != 0
 	 || (dev->inq_flags & SID_CmdQue) != 0)
 		dev->tag_saved_openings = newopenings;
-	/* Adjust the global limit */
-	dev->sim->max_ccbs += diff;
 	return (result);
 }
 
@@ -4631,7 +4827,7 @@ xpt_find_target(struct cam_eb *bus, target_id_t	target_id)
 {
 	struct cam_et *target;
 
-	mtx_assert(bus->sim->mtx, MA_OWNED);
+	mtx_assert(&bus->eb_mtx, MA_OWNED);
 	for (target = TAILQ_FIRST(&bus->et_entries);
 	     target != NULL;
 	     target = TAILQ_NEXT(target, links)) {
@@ -4648,7 +4844,7 @@ xpt_find_device(struct cam_et *target, lun_id_t lun_id)
 {
 	struct cam_ed *device;
 
-	mtx_assert(target->bus->sim->mtx, MA_OWNED);
+	mtx_assert(&target->bus->eb_mtx, MA_OWNED);
 	for (device = TAILQ_FIRST(&target->ed_entries);
 	     device != NULL;
 	     device = TAILQ_NEXT(device, links)) {
@@ -4728,10 +4924,12 @@ xpt_config(void *arg)
 	/*
 	 * Now that interrupts are enabled, go find our devices
 	 */
+	if (taskqueue_start_threads(&xsoftc.xpt_taskq, 1, PRIBIO, "CAM taskq"))
+		printf("xpt_config: failed to create taskqueue thread.\n");
 
 	/* Setup debugging path */
 	if (cam_dflags != CAM_DEBUG_NONE) {
-		if (xpt_create_path_unlocked(&cam_dpath, NULL,
+		if (xpt_create_path(&cam_dpath, NULL,
 				    CAM_DEBUG_BUS, CAM_DEBUG_TARGET,
 				    CAM_DEBUG_LUN) != CAM_REQ_CMP) {
 			printf("xpt_config: xpt_create_path() failed for debug"
@@ -4748,7 +4946,8 @@ xpt_config(void *arg)
 	callout_reset(&xsoftc.boot_callout, hz * xsoftc.boot_delay / 1000,
 	    xpt_boot_delay, NULL);
 	/* Fire up rescan thread. */
-	if (kproc_create(xpt_scanner_thread, NULL, NULL, 0, 0, "xpt_thrd")) {
+	if (kproc_kthread_add(xpt_scanner_thread, NULL, &cam_proc, NULL, 0, 0,
+	    "cam", "scanner")) {
 		printf("xpt_config: failed to create rescan thread.\n");
 	}
 }
@@ -4833,13 +5032,11 @@ xpt_register_async(int event, ac_callback_t *cbfunc, void *cbarg,
 	int xptpath = 0;
 
 	if (path == NULL) {
-		mtx_lock(&xsoftc.xpt_lock);
 		status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID,
 					 CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD);
-		if (status != CAM_REQ_CMP) {
-			mtx_unlock(&xsoftc.xpt_lock);
+		if (status != CAM_REQ_CMP)
 			return (status);
-		}
+		xpt_path_lock(path);
 		xptpath = 1;
 	}
 
@@ -4852,8 +5049,8 @@ xpt_register_async(int event, ac_callback_t *cbfunc, void *cbarg,
 	status = csa.ccb_h.status;
 
 	if (xptpath) {
+		xpt_path_unlock(path);
 		xpt_free_path(path);
-		mtx_unlock(&xsoftc.xpt_lock);
 	}
 
 	if ((status == CAM_REQ_CMP) &&
@@ -4938,122 +5135,171 @@ xpt_unlock_buses(void)
 	mtx_unlock(&xsoftc.xpt_topo_lock);
 }
 
-static void
-camisr(void *dummy)
+struct mtx *
+xpt_path_mtx(struct cam_path *path)
 {
-	cam_simq_t queue;
-	struct cam_sim *sim;
 
-	mtx_lock(&cam_simq_lock);
-	TAILQ_INIT(&queue);
-	while (!TAILQ_EMPTY(&cam_simq)) {
-		TAILQ_CONCAT(&queue, &cam_simq, links);
-		mtx_unlock(&cam_simq_lock);
-
-		while ((sim = TAILQ_FIRST(&queue)) != NULL) {
-			TAILQ_REMOVE(&queue, sim, links);
-			CAM_SIM_LOCK(sim);
-			camisr_runqueue(sim);
-			sim->flags &= ~CAM_SIM_ON_DONEQ;
-			CAM_SIM_UNLOCK(sim);
-		}
-		mtx_lock(&cam_simq_lock);
-	}
-	mtx_unlock(&cam_simq_lock);
+	return (&path->device->device_mtx);
 }
 
 static void
-camisr_runqueue(struct cam_sim *sim)
+xpt_done_process(struct ccb_hdr *ccb_h)
 {
-	struct	ccb_hdr *ccb_h;
+	struct cam_sim *sim;
+	struct cam_devq *devq;
+	struct mtx *mtx = NULL;
 
-	while ((ccb_h = TAILQ_FIRST(&sim->sim_doneq)) != NULL) {
-		int	runq;
+	if (ccb_h->flags & CAM_HIGH_POWER) {
+		struct highpowerlist	*hphead;
+		struct cam_ed		*device;
 
-		TAILQ_REMOVE(&sim->sim_doneq, ccb_h, sim_links.tqe);
-		ccb_h->pinfo.index = CAM_UNQUEUED_INDEX;
+		mtx_lock(&xsoftc.xpt_highpower_lock);
+		hphead = &xsoftc.highpowerq;
 
-		CAM_DEBUG(ccb_h->path, CAM_DEBUG_TRACE,
-			  ("camisr\n"));
+		device = STAILQ_FIRST(hphead);
 
-		runq = FALSE;
+		/*
+		 * Increment the count since this command is done.
+		 */
+		xsoftc.num_highpower++;
 
-		if (ccb_h->flags & CAM_HIGH_POWER) {
-			struct highpowerlist	*hphead;
-			struct cam_ed		*device;
+		/*
+		 * Any high powered commands queued up?
+		 */
+		if (device != NULL) {
 
-			mtx_lock(&xsoftc.xpt_lock);
-			hphead = &xsoftc.highpowerq;
+			STAILQ_REMOVE_HEAD(hphead, highpowerq_entry);
+			mtx_unlock(&xsoftc.xpt_highpower_lock);
 
-			device = STAILQ_FIRST(hphead);
+			mtx_lock(&device->sim->devq->send_mtx);
+			xpt_release_devq_device(device,
+					 /*count*/1, /*runqueue*/TRUE);
+			mtx_unlock(&device->sim->devq->send_mtx);
+		} else
+			mtx_unlock(&xsoftc.xpt_highpower_lock);
+	}
 
-			/*
-			 * Increment the count since this command is done.
-			 */
-			xsoftc.num_highpower++;
+	sim = ccb_h->path->bus->sim;
 
-			/*
-			 * Any high powered commands queued up?
-			 */
-			if (device != NULL) {
+	if (ccb_h->status & CAM_RELEASE_SIMQ) {
+		xpt_release_simq(sim, /*run_queue*/FALSE);
+		ccb_h->status &= ~CAM_RELEASE_SIMQ;
+	}
 
-				STAILQ_REMOVE_HEAD(hphead, highpowerq_entry);
-				mtx_unlock(&xsoftc.xpt_lock);
+	if ((ccb_h->flags & CAM_DEV_QFRZDIS)
+	 && (ccb_h->status & CAM_DEV_QFRZN)) {
+		xpt_release_devq(ccb_h->path, /*count*/1,
+				 /*run_queue*/FALSE);
+		ccb_h->status &= ~CAM_DEV_QFRZN;
+	}
 
-				xpt_release_devq_device(device,
-						 /*count*/1, /*runqueue*/TRUE);
-			} else
-				mtx_unlock(&xsoftc.xpt_lock);
+	devq = sim->devq;
+	if ((ccb_h->func_code & XPT_FC_USER_CCB) == 0) {
+		struct cam_ed *dev = ccb_h->path->device;
+
+		mtx_lock(&devq->send_mtx);
+		devq->send_active--;
+		devq->send_openings++;
+		cam_ccbq_ccb_done(&dev->ccbq, (union ccb *)ccb_h);
+
+		if (((dev->flags & CAM_DEV_REL_ON_QUEUE_EMPTY) != 0
+		  && (dev->ccbq.dev_active == 0))) {
+			dev->flags &= ~CAM_DEV_REL_ON_QUEUE_EMPTY;
+			xpt_release_devq_device(dev, /*count*/1,
+					 /*run_queue*/FALSE);
 		}
 
-		if ((ccb_h->func_code & XPT_FC_USER_CCB) == 0) {
-			struct cam_ed *dev;
+		if (((dev->flags & CAM_DEV_REL_ON_COMPLETE) != 0
+		  && (ccb_h->status&CAM_STATUS_MASK) != CAM_REQUEUE_REQ)) {
+			dev->flags &= ~CAM_DEV_REL_ON_COMPLETE;
+			xpt_release_devq_device(dev, /*count*/1,
+					 /*run_queue*/FALSE);
+		}
 
-			dev = ccb_h->path->device;
+		if (!device_is_queued(dev))
+			(void)xpt_schedule_devq(devq, dev);
+		mtx_unlock(&devq->send_mtx);
 
-			cam_ccbq_ccb_done(&dev->ccbq, (union ccb *)ccb_h);
-			sim->devq->send_active--;
-			sim->devq->send_openings++;
-			runq = TRUE;
-
-			if (((dev->flags & CAM_DEV_REL_ON_QUEUE_EMPTY) != 0
-			  && (dev->ccbq.dev_active == 0))) {
-				dev->flags &= ~CAM_DEV_REL_ON_QUEUE_EMPTY;
-				xpt_release_devq(ccb_h->path, /*count*/1,
-						 /*run_queue*/FALSE);
-			}
-
-			if (((dev->flags & CAM_DEV_REL_ON_COMPLETE) != 0
-			  && (ccb_h->status&CAM_STATUS_MASK) != CAM_REQUEUE_REQ)) {
-				dev->flags &= ~CAM_DEV_REL_ON_COMPLETE;
-				xpt_release_devq(ccb_h->path, /*count*/1,
-						 /*run_queue*/FALSE);
-			}
+		if ((dev->flags & CAM_DEV_TAG_AFTER_COUNT) != 0) {
+			mtx = xpt_path_mtx(ccb_h->path);
+			mtx_lock(mtx);
 
 			if ((dev->flags & CAM_DEV_TAG_AFTER_COUNT) != 0
 			 && (--dev->tag_delay_count == 0))
 				xpt_start_tags(ccb_h->path);
-			if (!device_is_queued(dev)) {
-				(void)xpt_schedule_devq(sim->devq, dev);
-			}
 		}
+	}
 
-		if (ccb_h->status & CAM_RELEASE_SIMQ) {
-			xpt_release_simq(sim, /*run_queue*/TRUE);
-			ccb_h->status &= ~CAM_RELEASE_SIMQ;
-			runq = FALSE;
+	if ((ccb_h->flags & CAM_UNLOCKED) == 0) {
+		if (mtx == NULL) {
+			mtx = xpt_path_mtx(ccb_h->path);
+			mtx_lock(mtx);
 		}
-
-		if ((ccb_h->flags & CAM_DEV_QFRZDIS)
-		 && (ccb_h->status & CAM_DEV_QFRZN)) {
-			xpt_release_devq(ccb_h->path, /*count*/1,
-					 /*run_queue*/TRUE);
-			ccb_h->status &= ~CAM_DEV_QFRZN;
-		} else if (runq) {
-			xpt_run_devq(sim->devq);
+	} else {
+		if (mtx != NULL) {
+			mtx_unlock(mtx);
+			mtx = NULL;
 		}
+	}
 
-		/* Call the peripheral driver's callback */
-		(*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h);
+	/* Call the peripheral driver's callback */
+	ccb_h->pinfo.index = CAM_UNQUEUED_INDEX;
+	(*ccb_h->cbfcnp)(ccb_h->path->periph, (union ccb *)ccb_h);
+	if (mtx != NULL)
+		mtx_unlock(mtx);
+
+	mtx_lock(&devq->send_mtx);
+	xpt_run_devq(devq);
+	mtx_unlock(&devq->send_mtx);
+}
+
+void
+xpt_done_td(void *arg)
+{
+	struct cam_doneq *queue = arg;
+	struct ccb_hdr *ccb_h;
+	STAILQ_HEAD(, ccb_hdr)	doneq;
+
+	STAILQ_INIT(&doneq);
+	mtx_lock(&queue->cam_doneq_mtx);
+	while (1) {
+		while (STAILQ_EMPTY(&queue->cam_doneq)) {
+			queue->cam_doneq_sleep = 1;
+			msleep(&queue->cam_doneq, &queue->cam_doneq_mtx,
+			    PRIBIO, "-", 0);
+			queue->cam_doneq_sleep = 0;
+		}
+		STAILQ_CONCAT(&doneq, &queue->cam_doneq);
+		mtx_unlock(&queue->cam_doneq_mtx);
+
+		THREAD_NO_SLEEPING();
+		while ((ccb_h = STAILQ_FIRST(&doneq)) != NULL) {
+			STAILQ_REMOVE_HEAD(&doneq, sim_links.stqe);
+			xpt_done_process(ccb_h);
+		}
+		THREAD_SLEEPING_OK();
+
+		mtx_lock(&queue->cam_doneq_mtx);
+	}
+}
+
+static void
+camisr_runqueue(void)
+{
+	struct	ccb_hdr *ccb_h;
+	struct cam_doneq *queue;
+	int i;
+
+	/* Process global queues. */
+	for (i = 0; i < cam_num_doneqs; i++) {
+		queue = &cam_doneqs[i];
+		mtx_lock(&queue->cam_doneq_mtx);
+		while ((ccb_h = STAILQ_FIRST(&queue->cam_doneq)) != NULL) {
+			STAILQ_REMOVE_HEAD(&queue->cam_doneq, sim_links.stqe);
+			mtx_unlock(&queue->cam_doneq_mtx);
+			xpt_done_process(ccb_h);
+			mtx_lock(&queue->cam_doneq_mtx);
+		}
+		mtx_unlock(&queue->cam_doneq_mtx);
 	}
 }
diff --git a/sys/cam/cam_xpt.h b/sys/cam/cam_xpt.h
index 97933b98a04..1d983c95b90 100644
--- a/sys/cam/cam_xpt.h
+++ b/sys/cam/cam_xpt.h
@@ -56,6 +56,7 @@ struct cam_path;
 struct async_node {
 	SLIST_ENTRY(async_node)	links;
 	u_int32_t	event_enable;	/* Async Event enables */
+	u_int32_t	event_lock;	/* Take SIM lock for handlers. */
 	void		(*callback)(void *arg, u_int32_t code,
 				    struct cam_path *path, void *args);
 	void		*callback_arg;
@@ -110,6 +111,13 @@ void			xpt_hold_boot(void);
 void			xpt_release_boot(void);
 void			xpt_lock_buses(void);
 void			xpt_unlock_buses(void);
+struct mtx *		xpt_path_mtx(struct cam_path *path);
+#define xpt_path_lock(path)	mtx_lock(xpt_path_mtx(path))
+#define xpt_path_unlock(path)	mtx_unlock(xpt_path_mtx(path))
+#define xpt_path_assert(path, what)	mtx_assert(xpt_path_mtx(path), (what))
+#define xpt_path_owned(path)	mtx_owned(xpt_path_mtx(path))
+#define xpt_path_sleep(path, chan, priority, wmesg, timo)		\
+    msleep((chan), xpt_path_mtx(path), (priority), (wmesg), (timo))
 cam_status		xpt_register_async(int event, ac_callback_t *cbfunc,
 					   void *cbarg, struct cam_path *path);
 cam_status		xpt_compile_path(struct cam_path *new_path,
@@ -117,6 +125,10 @@ cam_status		xpt_compile_path(struct cam_path *new_path,
 					 path_id_t path_id,
 					 target_id_t target_id,
 					 lun_id_t lun_id);
+cam_status		xpt_clone_path(struct cam_path **new_path,
+				      struct cam_path *path);
+void			xpt_copy_path(struct cam_path *new_path,
+				      struct cam_path *path);
 
 void			xpt_release_path(struct cam_path *path);
 
diff --git a/sys/cam/cam_xpt_internal.h b/sys/cam/cam_xpt_internal.h
index 70808ba92d7..f8c6498d1f9 100644
--- a/sys/cam/cam_xpt_internal.h
+++ b/sys/cam/cam_xpt_internal.h
@@ -29,6 +29,8 @@
 #ifndef _CAM_CAM_XPT_INTERNAL_H
 #define _CAM_CAM_XPT_INTERNAL_H 1
 
+#include <sys/taskqueue.h>
+
 /* Forward Declarations */
 struct cam_eb;
 struct cam_et;
@@ -54,31 +56,17 @@ struct xpt_xport {
 	xpt_announce_periph_func announce;
 };
 
-/*
- * Structure for queueing a device in a run queue.
- * There is one run queue for allocating new ccbs,
- * and another for sending ccbs to the controller.
- */
-struct cam_ed_qinfo {
-	cam_pinfo pinfo;
-	struct	  cam_ed *device;
-};
-
 /*
  * The CAM EDT (Existing Device Table) contains the device information for
  * all devices for all busses in the system.  The table contains a
  * cam_ed structure for each device on the bus.
  */
 struct cam_ed {
+	cam_pinfo	 devq_entry;
 	TAILQ_ENTRY(cam_ed) links;
-	struct	cam_ed_qinfo devq_entry;
 	struct	cam_et	 *target;
 	struct	cam_sim  *sim;
 	lun_id_t	 lun_id;
-	struct	camq drvq;		/*
-					 * Queue of type drivers wanting to do
-					 * work on this device.
-					 */
 	struct	cam_ccbq ccbq;		/* Queue of pending ccbs */
 	struct	async_list asyncs;	/* Async callback info for this B/T/L */
 	struct	periph_list periphs;	/* All attached devices */
@@ -125,6 +113,8 @@ struct cam_ed {
 	u_int32_t	 refcount;
 	struct callout	 callout;
 	STAILQ_ENTRY(cam_ed) highpowerq_entry;
+	struct mtx	 device_mtx;
+	struct task	 device_destroy_task;
 };
 
 /*
@@ -143,6 +133,7 @@ struct cam_et {
 	struct		timeval last_reset;
 	u_int		rpl_size;
 	struct scsi_report_luns_data *luns;
+	struct mtx	luns_mtx;	/* Protection for luns field. */
 };
 
 /*
@@ -162,6 +153,7 @@ struct cam_eb {
 	u_int		     generation;
 	device_t	     parent_dev;
 	struct xpt_xport     *xport;
+	struct mtx	     eb_mtx;	/* Bus topology mutex. */
 };
 
 struct cam_path {
@@ -179,8 +171,6 @@ struct cam_ed *		xpt_alloc_device(struct cam_eb *bus,
 					 lun_id_t lun_id);
 void			xpt_acquire_device(struct cam_ed *device);
 void			xpt_release_device(struct cam_ed *device);
-int			xpt_schedule_dev(struct camq *queue, cam_pinfo *dev_pinfo,
-					 u_int32_t new_priority);
 u_int32_t		xpt_dev_ccbq_resize(struct cam_path *path, int newopenings);
 void			xpt_start_tags(struct cam_path *path);
 void			xpt_stop_tags(struct cam_path *path);
diff --git a/sys/cam/cam_xpt_periph.h b/sys/cam/cam_xpt_periph.h
index da31c83af8c..9245aee202d 100644
--- a/sys/cam/cam_xpt_periph.h
+++ b/sys/cam/cam_xpt_periph.h
@@ -47,6 +47,7 @@ void		xpt_announce_periph(struct cam_periph *periph,
 				    char *announce_string);
 void		xpt_announce_quirks(struct cam_periph *periph,
 				    int quirks, char *bit_string);
+void		xpt_denounce_periph(struct cam_periph *periph);
 #endif
 
 #endif /* _CAM_CAM_XPT_PERIPH_H */
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index 09126cf6dd5..154364560f7 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -46,8 +46,7 @@ u_int32_t	xpt_freeze_devq(struct cam_path *path, u_int count);
 void		xpt_release_devq(struct cam_path *path,
 		    u_int count, int run_queue);
 void		xpt_done(union ccb *done_ccb);
-void		xpt_batch_start(struct cam_sim *sim);
-void		xpt_batch_done(struct cam_sim *sim);
+void		xpt_done_direct(union ccb *done_ccb);
 #endif
 
 #endif /* _CAM_CAM_XPT_SIM_H */
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 853a36de47d..d88150f52a5 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -360,7 +360,6 @@ static union ctl_io *ctl_malloc_io(ctl_io_type io_type, uint32_t targ_port,
 				   int can_wait);
 static void ctl_kfree_io(union ctl_io *io);
 #endif /* unused */
-static void ctl_free_io_internal(union ctl_io *io, int have_lock);
 static int ctl_alloc_lun(struct ctl_softc *ctl_softc, struct ctl_lun *lun,
 			 struct ctl_be_lun *be_lun, struct ctl_id target_id);
 static int ctl_free_lun(struct ctl_lun *lun);
@@ -998,6 +997,7 @@ ctl_init(void)
 		       "Report no lun possible for invalid LUNs");
 
 	mtx_init(&softc->ctl_lock, "CTL mutex", NULL, MTX_DEF);
+	mtx_init(&softc->pool_lock, "CTL pool mutex", NULL, MTX_DEF);
 	softc->open_count = 0;
 
 	/*
@@ -1057,7 +1057,7 @@ ctl_init(void)
 			    CTL_POOL_ENTRIES_EMERGENCY, &emergency_pool) != 0) {
 		printf("ctl: can't allocate %d entry emergency pool, "
 		       "exiting\n", CTL_POOL_ENTRIES_EMERGENCY);
-		ctl_pool_free(softc, internal_pool);
+		ctl_pool_free(internal_pool);
 		return (ENOMEM);
 	}
 
@@ -1066,8 +1066,8 @@ ctl_init(void)
 	{
 		printf("ctl: can't allocate %d entry other SC pool, "
 		       "exiting\n", CTL_POOL_ENTRIES_OTHER_SC);
-		ctl_pool_free(softc, internal_pool);
-		ctl_pool_free(softc, emergency_pool);
+		ctl_pool_free(internal_pool);
+		ctl_pool_free(emergency_pool);
 		return (ENOMEM);
 	}
 
@@ -1075,12 +1075,6 @@ ctl_init(void)
 	softc->emergency_pool = emergency_pool;
 	softc->othersc_pool = other_pool;
 
-	mtx_lock(&softc->ctl_lock);
-	ctl_pool_acquire(internal_pool);
-	ctl_pool_acquire(emergency_pool);
-	ctl_pool_acquire(other_pool);
-	mtx_unlock(&softc->ctl_lock);
-
 	/*
 	 * We used to allocate a processor LUN here.  The new scheme is to
 	 * just let the user allocate LUNs as he sees fit.
@@ -1097,10 +1091,10 @@ ctl_init(void)
 		printf("error creating CTL work thread!\n");
 		mtx_lock(&softc->ctl_lock);
 		ctl_free_lun(lun);
-		ctl_pool_free(softc, internal_pool);
-		ctl_pool_free(softc, emergency_pool);
-		ctl_pool_free(softc, other_pool);
 		mtx_unlock(&softc->ctl_lock);
+		ctl_pool_free(internal_pool);
+		ctl_pool_free(emergency_pool);
+		ctl_pool_free(other_pool);
 		return (error);
 	}
 	if (bootverbose)
@@ -1154,7 +1148,7 @@ ctl_shutdown(void)
 {
 	struct ctl_softc *softc;
 	struct ctl_lun *lun, *next_lun;
-	struct ctl_io_pool *pool, *next_pool;
+	struct ctl_io_pool *pool;
 
 	softc = (struct ctl_softc *)control_softc;
 
@@ -1171,6 +1165,8 @@ ctl_shutdown(void)
 		ctl_free_lun(lun);
 	}
 
+	mtx_unlock(&softc->ctl_lock);
+
 	/*
 	 * This will rip the rug out from under any FETDs or anyone else
 	 * that has a pool allocated.  Since we increment our module
@@ -1179,18 +1175,14 @@ ctl_shutdown(void)
 	 * able to unload the CTL module until client modules have
 	 * successfully unloaded.
 	 */
-	for (pool = STAILQ_FIRST(&softc->io_pools); pool != NULL;
-	     pool = next_pool) {
-		next_pool = STAILQ_NEXT(pool, links);
-		ctl_pool_free(softc, pool);
-	}
-
-	mtx_unlock(&softc->ctl_lock);
+	while ((pool = STAILQ_FIRST(&softc->io_pools)) != NULL)
+		ctl_pool_free(pool);
 
 #if 0
 	ctl_shutdown_thread(softc->work_thread);
 #endif
 
+	mtx_destroy(&softc->pool_lock);
 	mtx_destroy(&softc->ctl_lock);
 
 	destroy_dev(softc->dev);
@@ -3367,11 +3359,12 @@ ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type,
 	pool->type = pool_type;
 	pool->ctl_softc = ctl_softc;
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&ctl_softc->pool_lock);
 	pool->id = ctl_softc->cur_pool_id++;
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&ctl_softc->pool_lock);
 
 	pool->flags = CTL_POOL_FLAG_NONE;
+	pool->refcount = 1;		/* Reference for validity. */
 	STAILQ_INIT(&pool->free_queue);
 
 	/*
@@ -3407,7 +3400,7 @@ ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type,
 		free(pool, M_CTL);
 		goto bailout;
 	}
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&ctl_softc->pool_lock);
 	ctl_softc->num_pools++;
 	STAILQ_INSERT_TAIL(&ctl_softc->io_pools, pool, links);
 	/*
@@ -3426,7 +3419,7 @@ ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type,
 		MOD_INC_USE_COUNT;
 #endif
 
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&ctl_softc->pool_lock);
 
 	*npool = pool;
 
@@ -3435,14 +3428,11 @@ bailout:
 	return (retval);
 }
 
-int
+static int
 ctl_pool_acquire(struct ctl_io_pool *pool)
 {
 
-	mtx_assert(&control_softc->ctl_lock, MA_OWNED);
-
-	if (pool == NULL)
-		return (-EINVAL);
+	mtx_assert(&pool->ctl_softc->pool_lock, MA_OWNED);
 
 	if (pool->flags & CTL_POOL_FLAG_INVALID)
 		return (-EINVAL);
@@ -3452,51 +3442,21 @@ ctl_pool_acquire(struct ctl_io_pool *pool)
 	return (0);
 }
 
-int
-ctl_pool_invalidate(struct ctl_io_pool *pool)
-{
-
-	mtx_assert(&control_softc->ctl_lock, MA_OWNED);
-
-	if (pool == NULL)
-		return (-EINVAL);
-
-	pool->flags |= CTL_POOL_FLAG_INVALID;
-
-	return (0);
-}
-
-int
+static void
 ctl_pool_release(struct ctl_io_pool *pool)
 {
+	struct ctl_softc *ctl_softc = pool->ctl_softc;
+	union ctl_io *io;
 
-	mtx_assert(&control_softc->ctl_lock, MA_OWNED);
+	mtx_assert(&ctl_softc->pool_lock, MA_OWNED);
 
-	if (pool == NULL)
-		return (-EINVAL);
+	if (--pool->refcount != 0)
+		return;
 
-	if ((--pool->refcount == 0)
-	 && (pool->flags & CTL_POOL_FLAG_INVALID)) {
-		ctl_pool_free(pool->ctl_softc, pool);
-	}
-
-	return (0);
-}
-
-void
-ctl_pool_free(struct ctl_softc *ctl_softc, struct ctl_io_pool *pool)
-{
-	union ctl_io *cur_io, *next_io;
-
-	mtx_assert(&ctl_softc->ctl_lock, MA_OWNED);
-
-	for (cur_io = (union ctl_io *)STAILQ_FIRST(&pool->free_queue);
-	     cur_io != NULL; cur_io = next_io) {
-		next_io = (union ctl_io *)STAILQ_NEXT(&cur_io->io_hdr,
-						      links);
-		STAILQ_REMOVE(&pool->free_queue, &cur_io->io_hdr, ctl_io_hdr,
+	while ((io = (union ctl_io *)STAILQ_FIRST(&pool->free_queue)) != NULL) {
+		STAILQ_REMOVE(&pool->free_queue, &io->io_hdr, ctl_io_hdr,
 			      links);
-		free(cur_io, M_CTL);
+		free(io, M_CTL);
 	}
 
 	STAILQ_REMOVE(&ctl_softc->io_pools, pool, ctl_io_pool, links);
@@ -3515,6 +3475,21 @@ ctl_pool_free(struct ctl_softc *ctl_softc, struct ctl_io_pool *pool)
 	free(pool, M_CTL);
 }
 
+void
+ctl_pool_free(struct ctl_io_pool *pool)
+{
+	struct ctl_softc *ctl_softc;
+
+	if (pool == NULL)
+		return;
+
+	ctl_softc = pool->ctl_softc;
+	mtx_lock(&ctl_softc->pool_lock);
+	pool->flags |= CTL_POOL_FLAG_INVALID;
+	ctl_pool_release(pool);
+	mtx_unlock(&ctl_softc->pool_lock);
+}
+
 /*
  * This routine does not block (except for spinlocks of course).
  * It tries to allocate a ctl_io union from the caller's pool as quickly as
@@ -3539,7 +3514,7 @@ ctl_alloc_io(void *pool_ref)
 
 	ctl_softc = pool->ctl_softc;
 
-	mtx_lock(&ctl_softc->ctl_lock);
+	mtx_lock(&ctl_softc->pool_lock);
 	/*
 	 * First, try to get the io structure from the user's pool.
 	 */
@@ -3549,7 +3524,7 @@ ctl_alloc_io(void *pool_ref)
 			STAILQ_REMOVE_HEAD(&pool->free_queue, links);
 			pool->total_allocated++;
 			pool->free_ctl_io--;
-			mtx_unlock(&ctl_softc->ctl_lock);
+			mtx_unlock(&ctl_softc->pool_lock);
 			return (io);
 		} else
 			ctl_pool_release(pool);
@@ -3572,14 +3547,14 @@ ctl_alloc_io(void *pool_ref)
 			STAILQ_REMOVE_HEAD(&npool->free_queue, links);
 			npool->total_allocated++;
 			npool->free_ctl_io--;
-			mtx_unlock(&ctl_softc->ctl_lock);
+			mtx_unlock(&ctl_softc->pool_lock);
 			return (io);
 		} else
 			ctl_pool_release(npool);
 	}
 
 	/* Drop the spinlock before we malloc */
-	mtx_unlock(&ctl_softc->ctl_lock);
+	mtx_unlock(&ctl_softc->pool_lock);
 
 	/*
 	 * The emergency pool (if it exists) didn't have one, so try an
@@ -3592,7 +3567,7 @@ ctl_alloc_io(void *pool_ref)
 		 * ctl_io to its list when it gets freed.
 		 */
 		if (emergency_pool != NULL) {
-			mtx_lock(&ctl_softc->ctl_lock);
+			mtx_lock(&ctl_softc->pool_lock);
 			if (ctl_pool_acquire(emergency_pool) == 0) {
 				io->io_hdr.pool = emergency_pool;
 				emergency_pool->total_ctl_io++;
@@ -3604,7 +3579,7 @@ ctl_alloc_io(void *pool_ref)
 				 */
 				emergency_pool->total_allocated++;
 			}
-			mtx_unlock(&ctl_softc->ctl_lock);
+			mtx_unlock(&ctl_softc->pool_lock);
 		} else
 			io->io_hdr.pool = NULL;
 	}
@@ -3612,8 +3587,8 @@ ctl_alloc_io(void *pool_ref)
 	return (io);
 }
 
-static void
-ctl_free_io_internal(union ctl_io *io, int have_lock)
+void
+ctl_free_io(union ctl_io *io)
 {
 	if (io == NULL)
 		return;
@@ -3634,8 +3609,7 @@ ctl_free_io_internal(union ctl_io *io, int have_lock)
 
 		pool = (struct ctl_io_pool *)io->io_hdr.pool;
 
-		if (have_lock == 0)
-			mtx_lock(&pool->ctl_softc->ctl_lock);
+		mtx_lock(&pool->ctl_softc->pool_lock);
 #if 0
 		save_flags(xflags);
 
@@ -3672,8 +3646,7 @@ ctl_free_io_internal(union ctl_io *io, int have_lock)
 		pool->total_freed++;
 		pool->free_ctl_io++;
 		ctl_pool_release(pool);
-		if (have_lock == 0)
-			mtx_unlock(&pool->ctl_softc->ctl_lock);
+		mtx_unlock(&pool->ctl_softc->pool_lock);
 	} else {
 		/*
 		 * Otherwise, just free it.  We probably malloced it and
@@ -3684,12 +3657,6 @@ ctl_free_io_internal(union ctl_io *io, int have_lock)
 
 }
 
-void
-ctl_free_io(union ctl_io *io)
-{
-	ctl_free_io_internal(io, /*have_lock*/ 0);
-}
-
 void
 ctl_zero_io(union ctl_io *io)
 {
@@ -4496,7 +4463,7 @@ ctl_free_lun(struct ctl_lun *lun)
 	     io = next_io) {
 		next_io = (union ctl_io *)TAILQ_NEXT(&io->io_hdr, ooa_links);
 		TAILQ_REMOVE(&lun->ooa_queue, &io->io_hdr, ooa_links);
-		ctl_free_io_internal(io, /*have_lock*/ 1);
+		ctl_free_io(io);
 	}
 
 	softc->num_luns--;
@@ -10211,7 +10178,7 @@ ctl_failover(void)
 					TAILQ_REMOVE(&lun->ooa_queue,
 						     &io->io_hdr, ooa_links);
 
-					ctl_free_io_internal(io, 1);
+					ctl_free_io(io);
 				}
 			}
 
@@ -10227,7 +10194,7 @@ ctl_failover(void)
 						&io->io_hdr,
 					     	ooa_links);
 
-					ctl_free_io_internal(io, 1);
+					ctl_free_io(io);
 				}
 			}
 			ctl_check_blocked(lun);
@@ -11118,7 +11085,7 @@ ctl_run_task_queue(struct ctl_softc *ctl_softc)
 			       io->taskio.tag_num : io->scsiio.tag_num);
 			STAILQ_REMOVE(&ctl_softc->task_queue, &io->io_hdr,
 				      ctl_io_hdr, links);
-			ctl_free_io_internal(io, 1);
+			ctl_free_io(io);
 			break;
 		}
 		}
@@ -11215,7 +11182,7 @@ ctl_handle_isc(union ctl_io *io)
 		break;
 	}
 	if (free_io)
-		ctl_free_io_internal(io, 0);
+		ctl_free_io(io);
 
 }
 
@@ -12363,7 +12330,7 @@ ctl_process_done(union ctl_io *io, int have_lock)
 	case CTL_IO_TASK:
 		ctl_io_error_print(io, NULL);
 		if (io->io_hdr.flags & CTL_FLAG_FROM_OTHER_SC)
-			ctl_free_io_internal(io, /*have_lock*/ 0);
+			ctl_free_io(io);
 		else
 			fe_done(io);
 		return (CTL_RETVAL_COMPLETE);
@@ -12682,7 +12649,7 @@ ctl_process_done(union ctl_io *io, int have_lock)
 			/* XXX do something here */
 		}
 
-		ctl_free_io_internal(io, /*have_lock*/ 0);
+		ctl_free_io(io);
 	} else 
 		fe_done(io);
 
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c
index d2d42876399..2dc93529a21 100644
--- a/sys/cam/ctl/ctl_backend_block.c
+++ b/sys/cam/ctl/ctl_backend_block.c
@@ -42,8 +42,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <opt_kdtrace.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -630,10 +628,10 @@ ctl_be_block_flush_file(struct ctl_be_block_lun *be_lun,
 	ctl_complete_beio(beio);
 }
 
-SDT_PROBE_DEFINE1(cbb, kernel, read, file_start, file_start, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, write, file_start, file_start, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, read, file_done, file_done,"uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, write, file_done, file_done, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, read, file_start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, write, file_start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, read, file_done,"uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, write, file_done, "uint64_t");
 
 static void
 ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
@@ -962,10 +960,10 @@ ctl_be_block_cw_dispatch(struct ctl_be_block_lun *be_lun,
 	}
 }
 
-SDT_PROBE_DEFINE1(cbb, kernel, read, start, start, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, write, start, start, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, read, alloc_done, alloc_done, "uint64_t");
-SDT_PROBE_DEFINE1(cbb, kernel, write, alloc_done, alloc_done, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, read, start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, write, start, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, read, alloc_done, "uint64_t");
+SDT_PROBE_DEFINE1(cbb, kernel, write, alloc_done, "uint64_t");
 
 static void
 ctl_be_block_dispatch(struct ctl_be_block_lun *be_lun,
@@ -1485,6 +1483,7 @@ ctl_be_block_close(struct ctl_be_block_lun *be_lun)
 		case CTL_BE_BLOCK_FILE:
 			break;
 		case CTL_BE_BLOCK_NONE:
+			break;
 		default:
 			panic("Unexpected backend type.");
 			break;
@@ -1503,6 +1502,7 @@ ctl_be_block_close(struct ctl_be_block_lun *be_lun)
 			}
 			break;
 		case CTL_BE_BLOCK_NONE:
+			break;
 		default:
 			panic("Unexpected backend type.");
 			break;
@@ -1589,7 +1589,7 @@ ctl_be_block_open(struct ctl_be_block_softc *softc,
 	} else {
 		error = EINVAL;
 		snprintf(req->error_str, sizeof(req->error_str),
-			 "%s is not a disk or file", be_lun->dev_path);
+			 "%s is not a disk or plain file", be_lun->dev_path);
 	}
 	VOP_UNLOCK(be_lun->vn, 0);
 
@@ -1604,18 +1604,6 @@ ctl_be_block_open(struct ctl_be_block_softc *softc,
 	return (0);
 }
 
-static int
-ctl_be_block_mem_ctor(void *mem, int size, void *arg, int flags)
-{
-	return (0);
-}
-
-static void
-ctl_be_block_mem_dtor(void *mem, int size, void *arg)
-{
-	bzero(mem, size);
-}
-
 static int
 ctl_be_block_create(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 {
@@ -1644,8 +1632,7 @@ ctl_be_block_create(struct ctl_be_block_softc *softc, struct ctl_lun_req *req)
 	mtx_init(&be_lun->lock, be_lun->lunname, NULL, MTX_DEF);
 
 	be_lun->lun_zone = uma_zcreate(be_lun->lunname, MAXPHYS, 
-	    ctl_be_block_mem_ctor, ctl_be_block_mem_dtor, NULL, NULL,
-	    /*align*/ 0, /*flags*/0);
+	    NULL, NULL, NULL, NULL, /*align*/ 0, /*flags*/0);
 
 	if (be_lun->lun_zone == NULL) {
 		snprintf(req->error_str, sizeof(req->error_str),
diff --git a/sys/cam/ctl/ctl_frontend.c b/sys/cam/ctl/ctl_frontend.c
index 83042ee94ca..2bc6ade4641 100644
--- a/sys/cam/ctl/ctl_frontend.c
+++ b/sys/cam/ctl/ctl_frontend.c
@@ -114,7 +114,6 @@ ctl_frontend_register(struct ctl_frontend *fe, int master_shelf)
 	fe->targ_port = port_num + (master_shelf!=0 ? 0 : CTL_MAX_PORTS);
 	fe->max_initiators = CTL_MAX_INIT_PER_PORT;
 	STAILQ_INSERT_TAIL(&control_softc->fe_list, fe, links);
-	ctl_pool_acquire(pool);
 	control_softc->ctl_ports[port_num] = fe;
 
 	mtx_unlock(&control_softc->ctl_lock);
@@ -141,10 +140,6 @@ ctl_frontend_deregister(struct ctl_frontend *fe)
 	}
 
 	mtx_lock(&control_softc->ctl_lock);
-
-	ctl_pool_invalidate(pool);
-	ctl_pool_release(pool);
-
 	STAILQ_REMOVE(&control_softc->fe_list, fe, ctl_frontend, links);
 	control_softc->num_frontends--;
 	port_num = (fe->targ_port < CTL_MAX_PORTS) ? fe->targ_port :
@@ -152,6 +147,9 @@ ctl_frontend_deregister(struct ctl_frontend *fe)
 	ctl_clear_mask(&control_softc->ctl_port_mask, port_num);
 	control_softc->ctl_ports[port_num] = NULL;
 	mtx_unlock(&control_softc->ctl_lock);
+
+	ctl_pool_free(pool);
+
 bailout:
 	return (retval);
 }
diff --git a/sys/cam/ctl/ctl_frontend_cam_sim.c b/sys/cam/ctl/ctl_frontend_cam_sim.c
index 2e60b64e63d..f381a6b1572 100644
--- a/sys/cam/ctl/ctl_frontend_cam_sim.c
+++ b/sys/cam/ctl/ctl_frontend_cam_sim.c
@@ -504,14 +504,9 @@ static void
 cfcs_done(union ctl_io *io)
 {
 	union ccb *ccb;
-	struct cfcs_softc *softc;
-	struct cam_sim *sim;
 
 	ccb = io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr;
 
-	sim = xpt_path_sim(ccb->ccb_h.path);
-	softc = (struct cfcs_softc *)cam_sim_softc(sim);
-
 	/*
 	 * At this point we should have status.  If we don't, that's a bug.
 	 */
@@ -550,10 +545,7 @@ cfcs_done(union ctl_io *io)
 		break;
 	}
 
-	mtx_lock(sim->mtx);
 	xpt_done(ccb);
-	mtx_unlock(sim->mtx);
-
 	ctl_free_io(io);
 }
 
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c
index 46eaf08e667..597c0fbe7e1 100644
--- a/sys/cam/ctl/ctl_frontend_iscsi.c
+++ b/sys/cam/ctl/ctl_frontend_iscsi.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <cam/ctl/ctl_io.h>
 #include <cam/ctl/ctl.h>
 #include <cam/ctl/ctl_backend.h>
+#include <cam/ctl/ctl_error.h>
 #include <cam/ctl/ctl_frontend.h>
 #include <cam/ctl/ctl_frontend_internal.h>
 #include <cam/ctl/ctl_debug.h>
@@ -228,8 +229,6 @@ cfiscsi_pdu_update_cmdsn(const struct icl_pdu *request)
 	/*
 	 * The target MUST silently ignore any non-immediate command outside
 	 * of this range.
-	 *
-	 * XXX:	... or non-immediate duplicates within the range.
 	 */
 	if (cmdsn < cs->cs_cmdsn || cmdsn > cs->cs_cmdsn + maxcmdsn_delta) {
 		CFISCSI_SESSION_UNLOCK(cs);
@@ -287,8 +286,8 @@ cfiscsi_pdu_handle(struct icl_pdu *request)
 		CFISCSI_SESSION_WARN(cs, "received PDU with unsupported "
 		    "opcode 0x%x; dropping connection",
 		    request->ip_bhs->bhs_opcode);
-		cfiscsi_session_terminate(cs);
 		icl_pdu_free(request);
+		cfiscsi_session_terminate(cs);
 	}
 
 }
@@ -454,6 +453,9 @@ cfiscsi_pdu_handle_nop_out(struct icl_pdu *request)
 	struct iscsi_bhs_nop_out *bhsno;
 	struct iscsi_bhs_nop_in *bhsni;
 	struct icl_pdu *response;
+	void *data = NULL;
+	size_t datasize;
+	int error;
 
 	cs = PDU_SESSION(request);
 	bhsno = (struct iscsi_bhs_nop_out *)request->ip_bhs;
@@ -467,9 +469,26 @@ cfiscsi_pdu_handle_nop_out(struct icl_pdu *request)
 		return;
 	}
 
+	datasize = icl_pdu_data_segment_length(request);
+	if (datasize > 0) {
+		data = malloc(datasize, M_CFISCSI, M_NOWAIT | M_ZERO);
+		if (data == NULL) {
+			CFISCSI_SESSION_WARN(cs, "failed to allocate memory; "
+			    "dropping connection");
+			icl_pdu_free(request);
+			cfiscsi_session_terminate(cs);
+			return;
+		}
+		icl_pdu_get_data(request, 0, data, datasize);
+	}
+
 	response = cfiscsi_pdu_new_response(request, M_NOWAIT);
 	if (response == NULL) {
+		CFISCSI_SESSION_WARN(cs, "failed to allocate memory; "
+		    "droppping connection");
+		free(data, M_CFISCSI);
 		icl_pdu_free(request);
+		cfiscsi_session_terminate(cs);
 		return;
 	}
 	bhsni = (struct iscsi_bhs_nop_in *)response->ip_bhs;
@@ -477,14 +496,19 @@ cfiscsi_pdu_handle_nop_out(struct icl_pdu *request)
 	bhsni->bhsni_flags = 0x80;
 	bhsni->bhsni_initiator_task_tag = bhsno->bhsno_initiator_task_tag;
 	bhsni->bhsni_target_transfer_tag = 0xffffffff;
-
-#if 0
-	/* XXX */
-	response->ip_data_len = request->ip_data_len;
-	response->ip_data_mbuf = request->ip_data_mbuf;
-	request->ip_data_len = 0;
-	request->ip_data_mbuf = NULL;
-#endif
+	if (datasize > 0) {
+		error = icl_pdu_append_data(response, data, datasize, M_NOWAIT);
+		if (error != 0) {
+			CFISCSI_SESSION_WARN(cs, "failed to allocate memory; "
+			    "dropping connection");
+			free(data, M_CFISCSI);
+			icl_pdu_free(request);
+			icl_pdu_free(response);
+			cfiscsi_session_terminate(cs);
+			return;
+		}
+		free(data, M_CFISCSI);
+	}
 
 	icl_pdu_free(request);
 	cfiscsi_pdu_queue(response);
@@ -506,14 +530,16 @@ cfiscsi_pdu_handle_scsi_command(struct icl_pdu *request)
 	if (request->ip_data_len > 0 && cs->cs_immediate_data == false) {
 		CFISCSI_SESSION_WARN(cs, "unsolicited data with "
 		    "ImmediateData=No; dropping connection");
-		cfiscsi_session_terminate(cs);
 		icl_pdu_free(request);
+		cfiscsi_session_terminate(cs);
 		return;
 	}
 	io = ctl_alloc_io(cs->cs_target->ct_softc->fe.ctl_pool_ref);
 	if (io == NULL) {
-		CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io");
+		CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io; "
+		    "dropping connection");
 		icl_pdu_free(request);
+		cfiscsi_session_terminate(cs);
 		return;
 	}
 	ctl_zero_io(io);
@@ -553,10 +579,12 @@ cfiscsi_pdu_handle_scsi_command(struct icl_pdu *request)
 	refcount_acquire(&cs->cs_outstanding_ctl_pdus);
 	error = ctl_queue(io);
 	if (error != CTL_RETVAL_COMPLETE) {
-		CFISCSI_SESSION_WARN(cs, "ctl_queue() failed; error %d", error);
+		CFISCSI_SESSION_WARN(cs, "ctl_queue() failed; error %d; "
+		    "dropping connection", error);
 		ctl_free_io(io);
 		refcount_release(&cs->cs_outstanding_ctl_pdus);
 		icl_pdu_free(request);
+		cfiscsi_session_terminate(cs);
 	}
 }
 
@@ -574,8 +602,10 @@ cfiscsi_pdu_handle_task_request(struct icl_pdu *request)
 	bhstmr = (struct iscsi_bhs_task_management_request *)request->ip_bhs;
 	io = ctl_alloc_io(cs->cs_target->ct_softc->fe.ctl_pool_ref);
 	if (io == NULL) {
-		CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io");
+		CFISCSI_SESSION_WARN(cs, "can't allocate ctl_io;"
+		    "dropping connection");
 		icl_pdu_free(request);
+		cfiscsi_session_terminate(cs);
 		return;
 	}
 	ctl_zero_io(io);
@@ -616,7 +646,10 @@ cfiscsi_pdu_handle_task_request(struct icl_pdu *request)
 
 		response = cfiscsi_pdu_new_response(request, M_NOWAIT);
 		if (response == NULL) {
+			CFISCSI_SESSION_WARN(cs, "failed to allocate memory; "
+			    "dropping connection");
 			icl_pdu_free(request);
+			cfiscsi_session_terminate(cs);
 			return;
 		}
 		bhstmr2 = (struct iscsi_bhs_task_management_response *)
@@ -635,10 +668,12 @@ cfiscsi_pdu_handle_task_request(struct icl_pdu *request)
 	refcount_acquire(&cs->cs_outstanding_ctl_pdus);
 	error = ctl_queue(io);
 	if (error != CTL_RETVAL_COMPLETE) {
-		CFISCSI_SESSION_WARN(cs, "ctl_queue() failed; error %d", error);
+		CFISCSI_SESSION_WARN(cs, "ctl_queue() failed; error %d; "
+		    "dropping connection", error);
 		ctl_free_io(io);
 		refcount_release(&cs->cs_outstanding_ctl_pdus);
 		icl_pdu_free(request);
+		cfiscsi_session_terminate(cs);
 	}
 }
 
@@ -648,7 +683,7 @@ cfiscsi_handle_data_segment(struct icl_pdu *request, struct cfiscsi_data_wait *c
 	struct iscsi_bhs_data_out *bhsdo;
 	struct cfiscsi_session *cs;
 	struct ctl_sg_entry ctl_sg_entry, *ctl_sglist;
-	size_t copy_len, off, buffer_offset;
+	size_t copy_len, len, off, buffer_offset;
 	int ctl_sg_count;
 	union ctl_io *io;
 
@@ -683,10 +718,6 @@ cfiscsi_handle_data_segment(struct icl_pdu *request, struct cfiscsi_data_wait *c
 		ctl_sglist->len = io->scsiio.kern_data_len;
 		ctl_sg_count = 1;
 	}
-#if 0
-	if (ctl_sg_count > 1)
-		CFISCSI_SESSION_DEBUG(cs, "ctl_sg_count = %d", ctl_sg_count);
-#endif
 
 	if ((request->ip_bhs->bhs_opcode & ~ISCSI_BHS_OPCODE_IMMEDIATE) ==
 	    ISCSI_BHS_OPCODE_SCSI_DATA_OUT)
@@ -706,7 +737,20 @@ cfiscsi_handle_data_segment(struct icl_pdu *request, struct cfiscsi_data_wait *c
 		return (true);
 	}
 
+	/*
+	 * This is the offset within the PDU data segment, as opposed
+	 * to buffer_offset, which is the offset within the task (SCSI
+	 * command).
+	 */
 	off = 0;
+	len = icl_pdu_data_segment_length(request);
+
+	/*
+	 * Iterate over the scatter/gather segments, filling them with data
+	 * from the PDU data segment.  Note that this can get called multiple
+	 * times for one SCSI command; the cdw structure holds state for the
+	 * scatter/gather list.
+	 */
 	for (;;) {
 		KASSERT(cdw->cdw_sg_index < ctl_sg_count,
 		    ("cdw->cdw_sg_index >= ctl_sg_count"));
@@ -714,7 +758,8 @@ cfiscsi_handle_data_segment(struct icl_pdu *request, struct cfiscsi_data_wait *c
 			cdw->cdw_sg_addr = ctl_sglist[cdw->cdw_sg_index].addr;
 			cdw->cdw_sg_len = ctl_sglist[cdw->cdw_sg_index].len;
 		}
-		copy_len = icl_pdu_data_segment_length(request) - off;
+		KASSERT(off <= len, ("len > off"));
+		copy_len = len - off;
 		if (copy_len > cdw->cdw_sg_len)
 			copy_len = cdw->cdw_sg_len;
 
@@ -725,15 +770,27 @@ cfiscsi_handle_data_segment(struct icl_pdu *request, struct cfiscsi_data_wait *c
 		io->scsiio.ext_data_filled += copy_len;
 
 		if (cdw->cdw_sg_len == 0) {
-			if (cdw->cdw_sg_index == ctl_sg_count - 1)
+			/*
+			 * End of current segment.
+			 */
+			if (cdw->cdw_sg_index == ctl_sg_count - 1) {
+				/*
+				 * Last segment in scatter/gather list.
+				 */
 				break;
+			}
 			cdw->cdw_sg_index++;
 		}
-		if (off == icl_pdu_data_segment_length(request))
+
+		if (off == len) {
+			/*
+			 * End of PDU payload.
+			 */
 			break;
+		}
 	}
 
-	if (off < icl_pdu_data_segment_length(request)) {
+	if (len > off) {
 		CFISCSI_SESSION_WARN(cs, "received too much data: got %zd bytes, "
 		    "expected %zd", icl_pdu_data_segment_length(request), off);
 		cfiscsi_session_terminate(cs);
@@ -807,8 +864,8 @@ cfiscsi_pdu_handle_data_out(struct icl_pdu *request)
 	CFISCSI_SESSION_UNLOCK(cs);
 	if (cdw == NULL) {
 		CFISCSI_SESSION_WARN(cs, "data transfer tag 0x%x, initiator task tag "
-		    "0x%x, not found", bhsdo->bhsdo_target_transfer_tag,
-		    bhsdo->bhsdo_initiator_task_tag);
+		    "0x%x, not found; dropping connection",
+		    bhsdo->bhsdo_target_transfer_tag, bhsdo->bhsdo_initiator_task_tag);
 		icl_pdu_free(request);
 		cfiscsi_session_terminate(cs);
 		return;
@@ -845,6 +902,7 @@ cfiscsi_pdu_handle_logout_request(struct icl_pdu *request)
 	case BHSLR_REASON_CLOSE_CONNECTION:
 		response = cfiscsi_pdu_new_response(request, M_NOWAIT);
 		if (response == NULL) {
+			CFISCSI_SESSION_DEBUG(cs, "failed to allocate memory");
 			icl_pdu_free(request);
 			cfiscsi_session_terminate(cs);
 			return;
@@ -862,6 +920,8 @@ cfiscsi_pdu_handle_logout_request(struct icl_pdu *request)
 	case BHSLR_REASON_REMOVE_FOR_RECOVERY:
 		response = cfiscsi_pdu_new_response(request, M_NOWAIT);
 		if (response == NULL) {
+			CFISCSI_SESSION_WARN(cs,
+			    "failed to allocate memory; dropping connection");
 			icl_pdu_free(request);
 			cfiscsi_session_terminate(cs);
 			return;
@@ -933,7 +993,7 @@ cfiscsi_callout(void *context)
 
 	cp = icl_pdu_new_bhs(cs->cs_conn, M_NOWAIT);
 	if (cp == NULL) {
-		CFISCSI_SESSION_WARN(cs, "failed to allocate PDU");
+		CFISCSI_SESSION_WARN(cs, "failed to allocate memory");
 		return;
 	}
 	bhsni = (struct iscsi_bhs_nop_in *)cp->ip_bhs;
@@ -2274,11 +2334,6 @@ cfiscsi_datamove_in(union ctl_io *io)
 	 */
 	PDU_TOTAL_TRANSFER_LEN(request) = io->scsiio.kern_total_len;
 
-#if 0
-	if (ctl_sg_count > 1)
-		CFISCSI_SESSION_DEBUG(cs, "ctl_sg_count = %d", ctl_sg_count);
-#endif
-
 	/*
 	 * This is the offset within the current SCSI command;
 	 * i.e. for the first call of datamove(), it will be 0,
@@ -2286,8 +2341,6 @@ cfiscsi_datamove_in(union ctl_io *io)
 	 * of previous ones.
 	 */
 	off = htonl(io->scsiio.kern_rel_offset);
-	if (off > 1)
-		CFISCSI_SESSION_DEBUG(cs, "off = %zd", off);
 
 	i = 0;
 	addr = NULL;
@@ -2301,7 +2354,8 @@ cfiscsi_datamove_in(union ctl_io *io)
 			if (response == NULL) {
 				CFISCSI_SESSION_WARN(cs, "failed to "
 				    "allocate memory; dropping connection");
-				icl_pdu_free(request);
+				ctl_set_busy(&io->scsiio);
+				io->scsiio.be_move_done(io);
 				cfiscsi_session_terminate(cs);
 				return;
 			}
@@ -2330,8 +2384,9 @@ cfiscsi_datamove_in(union ctl_io *io)
 		if (error != 0) {
 			CFISCSI_SESSION_WARN(cs, "failed to "
 			    "allocate memory; dropping connection");
-			icl_pdu_free(request);
 			icl_pdu_free(response);
+			ctl_set_busy(&io->scsiio);
+			io->scsiio.be_move_done(io);
 			cfiscsi_session_terminate(cs);
 			return;
 		}
@@ -2358,7 +2413,7 @@ cfiscsi_datamove_in(union ctl_io *io)
 			/*
 			 * Can't stuff more data into the current PDU;
 			 * queue it.  Note that's not enough to check
-			 * for kern_data_resid == 0  instead; there
+			 * for kern_data_resid == 0 instead; there
 			 * may be several Data-In PDUs for the final
 			 * call to cfiscsi_datamove(), and we want
 			 * to set the F flag only on the last of them.
@@ -2377,10 +2432,12 @@ cfiscsi_datamove_in(union ctl_io *io)
 	if (response != NULL) {
 		if (off == io->scsiio.kern_total_len) {
 			bhsdi->bhsdi_flags |= BHSDI_FLAGS_F;
+#if 0
 		} else {
 			CFISCSI_SESSION_DEBUG(cs, "not setting the F flag; "
 			    "have %zd, need %zd", off,
 			    (size_t)io->scsiio.kern_total_len);
+#endif
 		}
 		KASSERT(response->ip_data_len > 0, ("sending empty Data-In"));
 		cfiscsi_pdu_queue(response);
@@ -2428,8 +2485,10 @@ cfiscsi_datamove_out(union ctl_io *io)
 	if (cdw == NULL) {
 		CFISCSI_SESSION_WARN(cs, "failed to "
 		    "allocate memory; dropping connection");
-		icl_pdu_free(request);
+		ctl_set_busy(&io->scsiio);
+		io->scsiio.be_move_done(io);
 		cfiscsi_session_terminate(cs);
+		return;
 	}
 	cdw->cdw_ctl_io = io;
 	cdw->cdw_target_transfer_tag = htonl(target_transfer_tag);
@@ -2462,8 +2521,10 @@ cfiscsi_datamove_out(union ctl_io *io)
 	if (response == NULL) {
 		CFISCSI_SESSION_WARN(cs, "failed to "
 		    "allocate memory; dropping connection");
-		icl_pdu_free(request);
+		ctl_set_busy(&io->scsiio);
+		io->scsiio.be_move_done(io);
 		cfiscsi_session_terminate(cs);
+		return;
 	}
 	bhsr2t = (struct iscsi_bhs_r2t *)response->ip_bhs;
 	bhsr2t->bhsr2t_opcode = ISCSI_BHS_OPCODE_R2T;
diff --git a/sys/cam/ctl/ctl_private.h b/sys/cam/ctl/ctl_private.h
index 77611276aa7..d2035fb1d24 100644
--- a/sys/cam/ctl/ctl_private.h
+++ b/sys/cam/ctl/ctl_private.h
@@ -448,6 +448,7 @@ struct ctl_softc {
 	struct ctl_frontend *ctl_ports[CTL_MAX_PORTS];
 	uint32_t num_backends;
 	STAILQ_HEAD(, ctl_backend_driver) be_list;
+	struct mtx pool_lock;
 	uint32_t num_pools;
 	uint32_t cur_pool_id;
 	STAILQ_HEAD(, ctl_io_pool) io_pools;
@@ -462,10 +463,7 @@ extern struct ctl_cmd_entry ctl_cmd_table[];
 uint32_t ctl_get_initindex(struct ctl_nexus *nexus);
 int ctl_pool_create(struct ctl_softc *ctl_softc, ctl_pool_type pool_type,
 		    uint32_t total_ctl_io, struct ctl_io_pool **npool);
-int ctl_pool_acquire(struct ctl_io_pool *pool);
-int ctl_pool_invalidate(struct ctl_io_pool *pool);
-int ctl_pool_release(struct ctl_io_pool *pool);
-void ctl_pool_free(struct ctl_softc *ctl_softc, struct ctl_io_pool *pool);
+void ctl_pool_free(struct ctl_io_pool *pool);
 int ctl_scsi_release(struct ctl_scsiio *ctsio);
 int ctl_scsi_reserve(struct ctl_scsiio *ctsio);
 int ctl_start_stop(struct ctl_scsiio *ctsio);
diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 45acdba42fa..3f50269ff4c 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -73,8 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <cam/ctl/ctl_error.h>
 
 typedef enum {
-	CTLFE_CCB_DEFAULT	= 0x00,
-	CTLFE_CCB_WAITING 	= 0x01
+	CTLFE_CCB_DEFAULT	= 0x00
 } ctlfe_ccb_types;
 
 struct ctlfe_softc {
@@ -82,6 +81,7 @@ struct ctlfe_softc {
 	path_id_t path_id;
 	struct cam_sim *sim;
 	char port_name[DEV_IDLEN];
+	struct mtx lun_softc_mtx;
 	STAILQ_HEAD(, ctlfe_lun_softc) lun_softc_list;
 	STAILQ_ENTRY(ctlfe_softc) links;
 };
@@ -320,7 +320,6 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 #ifdef CTLFE_INIT_ENABLE
 		if (ctlfe_num_targets >= ctlfe_max_targets) {
 			union ccb *ccb;
-			struct cam_sim *sim;
 
 			ccb = (union ccb *)malloc(sizeof(*ccb), M_TEMP,
 						  M_NOWAIT | M_ZERO);
@@ -328,18 +327,12 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 				printf("%s: unable to malloc CCB!\n", __func__);
 				return;
 			}
-			xpt_setup_ccb(&ccb->ccb_h, cpi->ccb_h.path,
-				      CAM_PRIORITY_NONE);
-
-			sim = xpt_path_sim(cpi->ccb_h.path);
+			xpt_setup_ccb(&ccb->ccb_h, path, CAM_PRIORITY_NONE);
 
 			ccb->ccb_h.func_code = XPT_SET_SIM_KNOB;
 			ccb->knob.xport_specific.valid = KNOB_VALID_ROLE;
 			ccb->knob.xport_specific.fc.role = KNOB_ROLE_INITIATOR;
 
-			/* We should hold the SIM lock here */
-			mtx_assert(sim->mtx, MA_OWNED);
-
 			xpt_action(ccb);
 
 			if ((ccb->ccb_h.status & CAM_STATUS_MASK) !=
@@ -381,7 +374,9 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 		}
 
 		bus_softc->path_id = cpi->ccb_h.path_id;
-		bus_softc->sim = xpt_path_sim(cpi->ccb_h.path);
+		bus_softc->sim = xpt_path_sim(path);
+		mtx_init(&bus_softc->lun_softc_mtx, "LUN softc mtx", NULL,
+		    MTX_DEF);
 		STAILQ_INIT(&bus_softc->lun_softc_list);
 
 		fe = &bus_softc->fe;
@@ -435,6 +430,7 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 		if (retval != 0) {
 			printf("%s: ctl_frontend_register() failed with "
 			       "error %d!\n", __func__, retval);
+			mtx_destroy(&bus_softc->lun_softc_mtx);
 			free(bus_softc, M_CTLFE);
 			break;
 		} else {
@@ -464,6 +460,7 @@ ctlfeasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 			 * are no outstanding commands for this frontend?
 			 */
 			ctl_frontend_deregister(&softc->fe);
+			mtx_destroy(&softc->lun_softc_mtx);
 			free(softc, M_CTLFE);
 		}
 		break;
@@ -538,19 +535,18 @@ ctlferegister(struct cam_periph *periph, void *arg)
 {
 	struct ctlfe_softc *bus_softc;
 	struct ctlfe_lun_softc *softc;
-	struct cam_sim *sim;
 	union ccb en_lun_ccb;
 	cam_status status;
 	int i;
 
 	softc = (struct ctlfe_lun_softc *)arg;
 	bus_softc = softc->parent_softc;
-	sim = xpt_path_sim(periph->path);
 	
 	TAILQ_INIT(&softc->work_queue);
 	softc->periph = periph;
 
-	callout_init_mtx(&softc->dma_callout, sim->mtx, /*flags*/ 0);
+	callout_init_mtx(&softc->dma_callout, xpt_path_mtx(periph->path),
+	    /*flags*/ 0);
 	periph->softc = softc;
 
 	xpt_setup_ccb(&en_lun_ccb.ccb_h, periph->path, CAM_PRIORITY_NONE);
@@ -580,6 +576,7 @@ ctlferegister(struct cam_periph *periph, void *arg)
 		xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1);
 		new_ccb->ccb_h.func_code = XPT_ACCEPT_TARGET_IO;
 		new_ccb->ccb_h.cbfcnp = ctlfedone;
+		new_ccb->ccb_h.flags |= CAM_UNLOCKED;
 		xpt_action(new_ccb);
 		softc->atios_sent++;
 		status = new_ccb->ccb_h.status;
@@ -615,6 +612,7 @@ ctlferegister(struct cam_periph *periph, void *arg)
 		xpt_setup_ccb(&new_ccb->ccb_h, periph->path, /*priority*/ 1);
 		new_ccb->ccb_h.func_code = XPT_IMMEDIATE_NOTIFY;
 		new_ccb->ccb_h.cbfcnp = ctlfedone;
+		new_ccb->ccb_h.flags |= CAM_UNLOCKED;
 		xpt_action(new_ccb);
 		softc->inots_sent++;
 		status = new_ccb->ccb_h.status;
@@ -646,6 +644,7 @@ ctlfeoninvalidate(struct cam_periph *periph)
 {
 	union ccb en_lun_ccb;
 	cam_status status;
+	struct ctlfe_softc *bus_softc;
 	struct ctlfe_lun_softc *softc;
 
 	softc = (struct ctlfe_lun_softc *)periph->softc;
@@ -668,21 +667,22 @@ ctlfeoninvalidate(struct cam_periph *periph)
 		  "INOTs outstanding, %d refs\n", softc->atios_sent -
 		  softc->atios_returned, softc->inots_sent -
 		  softc->inots_returned, periph->refcount);
+
+	bus_softc = softc->parent_softc;
+	mtx_lock(&bus_softc->lun_softc_mtx);
+	STAILQ_REMOVE(&bus_softc->lun_softc_list, softc, ctlfe_lun_softc, links);
+	mtx_unlock(&bus_softc->lun_softc_mtx);
 }
 
 static void
 ctlfecleanup(struct cam_periph *periph)
 {
 	struct ctlfe_lun_softc *softc;
-	struct ctlfe_softc *bus_softc;
 
 	xpt_print(periph->path, "%s: Called\n", __func__);
 
 	softc = (struct ctlfe_lun_softc *)periph->softc;
-	bus_softc = softc->parent_softc;
 
-	STAILQ_REMOVE(&bus_softc->lun_softc_list, softc, ctlfe_lun_softc, links);
-	
 	/*
 	 * XXX KDM is there anything else that needs to be done here?
 	 */
@@ -705,14 +705,7 @@ ctlfestart(struct cam_periph *periph, union ccb *start_ccb)
 	start_ccb->ccb_h.ccb_type = CTLFE_CCB_DEFAULT;
 
 	ccb_h = TAILQ_FIRST(&softc->work_queue);
-	if (periph->immediate_priority <= periph->pinfo.priority) {
-		panic("shouldn't get to the CCB waiting case!");
-		start_ccb->ccb_h.ccb_type = CTLFE_CCB_WAITING;
-		SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-				  periph_links.sle);
-		periph->immediate_priority = CAM_PRIORITY_NONE;
-		wakeup(&periph->ccb_list);
-	} else if (ccb_h == NULL) {
+	if (ccb_h == NULL) {
 		softc->ccbs_freed++;
 		xpt_release_ccb(start_ccb);
 	} else {
@@ -791,7 +784,6 @@ ctlfestart(struct cam_periph *periph, union ccb *start_ccb)
 				}
 				start_ccb->ccb_h.func_code = XPT_ABORT;
 				start_ccb->cab.abort_ccb = (union ccb *)atio;
-				start_ccb->ccb_h.cbfcnp = ctlfedone;
 
 				/* Tell the SIM that we've aborted this ATIO */
 				xpt_action(start_ccb);
@@ -1004,6 +996,7 @@ ctlfestart(struct cam_periph *periph, union ccb *start_ccb)
 			      /*data_ptr*/ data_ptr,
 			      /*dxfer_len*/ dxfer_len,
 			      /*timeout*/ 5 * 1000);
+		start_ccb->ccb_h.flags |= CAM_UNLOCKED;
 		start_ccb->ccb_h.ccb_atio = atio;
 		if (((flags & CAM_SEND_STATUS) == 0)
 		 && (io != NULL))
@@ -1011,7 +1004,9 @@ ctlfestart(struct cam_periph *periph, union ccb *start_ccb)
 
 		softc->ctios_sent++;
 
+		cam_periph_unlock(periph);
 		xpt_action(start_ccb);
+		cam_periph_lock(periph);
 
 		if ((atio->ccb_h.status & CAM_DEV_QFRZN) != 0) {
 			cam_release_devq(periph->path,
@@ -1148,7 +1143,10 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 	struct ctlfe_softc *bus_softc;
 	struct ccb_accept_tio *atio = NULL;
 	union ctl_io *io = NULL;
+	struct mtx *mtx;
 
+	KASSERT((done_ccb->ccb_h.flags & CAM_UNLOCKED) != 0,
+	    ("CCB in ctlfedone() without CAM_UNLOCKED flag"));
 #ifdef CTLFE_DEBUG
 	printf("%s: entered, func_code = %#x, type = %#lx\n", __func__,
 	       done_ccb->ccb_h.func_code, done_ccb->ccb_h.ccb_type);
@@ -1156,12 +1154,8 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 
 	softc = (struct ctlfe_lun_softc *)periph->softc;
 	bus_softc = softc->parent_softc;
-
-	if (done_ccb->ccb_h.ccb_type == CTLFE_CCB_WAITING) {
-		panic("shouldn't get to the CCB waiting case!");
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
-	}
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 
 	/*
 	 * If the peripheral is invalid, ATIOs and immediate notify CCBs
@@ -1177,7 +1171,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 		case XPT_IMMEDIATE_NOTIFY:
 		case XPT_NOTIFY_ACKNOWLEDGE:
 			ctlfe_free_ccb(periph, done_ccb);
-			return;
+			goto out;
 		default:
 			break;
 		}
@@ -1215,6 +1209,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 			xpt_schedule(periph, /*priority*/ 1);
 			break;
 		}
+		mtx_unlock(mtx);
 		ctl_zero_io(io);
 
 		/* Save pointers on both sides */
@@ -1271,7 +1266,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 #endif
 
 		ctl_queue(io);
-		break;
+		return;
 	}
 	case XPT_CONT_TARGET_IO: {
 		int srr = 0;
@@ -1333,7 +1328,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 			TAILQ_INSERT_HEAD(&softc->work_queue, &atio->ccb_h,
 					  periph_links.tqe);
 			xpt_schedule(periph, /*priority*/ 1);
-			return;
+			break;
 		}
 
 		/*
@@ -1359,10 +1354,11 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 			}
 			if (periph->flags & CAM_PERIPH_INVALID) {
 				ctlfe_free_ccb(periph, (union ccb *)atio);
-				return;
 			} else {
-				xpt_action((union ccb *)atio);
 				softc->atios_sent++;
+				mtx_unlock(mtx);
+				xpt_action((union ccb *)atio);
+				return;
 			}
 		} else {
 			struct ctlfe_lun_cmd_info *cmd_info;
@@ -1478,10 +1474,12 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 					      /*dxfer_len*/ dxfer_len,
 					      /*timeout*/ 5 * 1000);
 
+				csio->ccb_h.flags |= CAM_UNLOCKED;
 				csio->resid = 0;
 				csio->ccb_h.ccb_atio = atio;
 				io->io_hdr.flags |= CTL_FLAG_DMA_INPROG;
 				softc->ctios_sent++;
+				mtx_unlock(mtx);
 				xpt_action((union ccb *)csio);
 			} else {
 				/*
@@ -1490,10 +1488,12 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 				 */
 				softc->ccbs_freed++;
 				xpt_release_ccb(done_ccb);
+				mtx_unlock(mtx);
 
 				/* Call the backend move done callback */
 				io->scsiio.be_move_done(io);
 			}
+			return;
 		}
 		break;
 	}
@@ -1614,7 +1614,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 				ctl_free_io(io);
 				ctlfe_free_ccb(periph, done_ccb);
 
-				return;
+				goto out;
 			}
 			if (send_ctl_io != 0) {
 				ctl_queue(io);
@@ -1651,12 +1651,6 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 		xpt_action(done_ccb);
 		softc->inots_sent++;
 		break;
-	case XPT_ABORT:
-		/*
-		 * XPT_ABORT is an immediate CCB, we shouldn't get here.
-		 */
-		panic("%s: XPT_ABORT CCB returned!", __func__);
-		break;
 	case XPT_SET_SIM_KNOB:
 	case XPT_GET_SIM_KNOB:
 		break;
@@ -1665,6 +1659,9 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
 		      done_ccb->ccb_h.func_code);
 		break;
 	}
+
+out:
+	mtx_unlock(mtx);
 }
 
 static void
@@ -1674,17 +1671,12 @@ ctlfe_onoffline(void *arg, int online)
 	union ccb *ccb;
 	cam_status status;
 	struct cam_path *path;
-	struct cam_sim *sim;
 	int set_wwnn;
 
 	bus_softc = (struct ctlfe_softc *)arg;
 
 	set_wwnn = 0;
 
-	sim = bus_softc->sim;
-
-	mtx_assert(sim->mtx, MA_OWNED);
-
 	status = xpt_create_path(&path, /*periph*/ NULL, bus_softc->path_id,
 		CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD);
 	if (status != CAM_REQ_CMP) {
@@ -1844,12 +1836,8 @@ ctlfe_online(void *arg)
 	struct cam_path *path;
 	cam_status status;
 	struct ctlfe_lun_softc *lun_softc;
-	struct cam_sim *sim;
 
 	bus_softc = (struct ctlfe_softc *)arg;
-	sim = bus_softc->sim;
-
-	CAM_SIM_LOCK(sim);
 
 	/*
 	 * Create the wildcard LUN before bringing the port online.
@@ -1860,7 +1848,6 @@ ctlfe_online(void *arg)
 	if (status != CAM_REQ_CMP) {
 		printf("%s: unable to create path for wildcard periph\n",
 				__func__);
-		CAM_SIM_UNLOCK(sim);
 		return;
 	}
 
@@ -1870,15 +1857,16 @@ ctlfe_online(void *arg)
 		xpt_print(path, "%s: unable to allocate softc for "
 				"wildcard periph\n", __func__);
 		xpt_free_path(path);
-		CAM_SIM_UNLOCK(sim);
 		return;
 	}
 
+	xpt_path_lock(path);
 	lun_softc->parent_softc = bus_softc;
 	lun_softc->flags |= CTLFE_LUN_WILDCARD;
 
+	mtx_lock(&bus_softc->lun_softc_mtx);
 	STAILQ_INSERT_TAIL(&bus_softc->lun_softc_list, lun_softc, links);
-
+	mtx_unlock(&bus_softc->lun_softc_mtx);
 
 	status = cam_periph_alloc(ctlferegister,
 				  ctlfeoninvalidate,
@@ -1901,11 +1889,10 @@ ctlfe_online(void *arg)
 		       entry->status_text : "Unknown", status);
 	}
 
-	xpt_free_path(path);
-
 	ctlfe_onoffline(arg, /*online*/ 1);
 
-	CAM_SIM_UNLOCK(sim);
+	xpt_path_unlock(path);
+	xpt_free_path(path);
 }
 
 static void
@@ -1915,14 +1902,8 @@ ctlfe_offline(void *arg)
 	struct cam_path *path;
 	cam_status status;
 	struct cam_periph *periph;
-	struct cam_sim *sim;
 
 	bus_softc = (struct ctlfe_softc *)arg;
-	sim = bus_softc->sim;
-
-	CAM_SIM_LOCK(sim);
-
-	ctlfe_onoffline(arg, /*online*/ 0);
 
 	/*
 	 * Disable the wildcard LUN for this port now that we have taken
@@ -1932,19 +1913,20 @@ ctlfe_offline(void *arg)
 				 bus_softc->path_id, CAM_TARGET_WILDCARD,
 				 CAM_LUN_WILDCARD);
 	if (status != CAM_REQ_CMP) {
-		CAM_SIM_UNLOCK(sim);
 		printf("%s: unable to create path for wildcard periph\n",
 		       __func__);
 		return;
 	}
 
+	xpt_path_lock(path);
+
+	ctlfe_onoffline(arg, /*online*/ 0);
 
 	if ((periph = cam_periph_find(path, "ctl")) != NULL)
 		cam_periph_invalidate(periph);
 
+	xpt_path_unlock(path);
 	xpt_free_path(path);
-
-	CAM_SIM_UNLOCK(sim);
 }
 
 static int
@@ -1970,15 +1952,13 @@ ctlfe_lun_enable(void *arg, struct ctl_id targ_id, int lun_id)
 	struct ctlfe_lun_softc *softc;
 	struct cam_path *path;
 	struct cam_periph *periph;
-	struct cam_sim *sim;
 	cam_status status;
 
 	bus_softc = (struct ctlfe_softc *)arg;
-	sim = bus_softc->sim;
 
-	status = xpt_create_path_unlocked(&path, /*periph*/ NULL,
-					  bus_softc->path_id,
-					  targ_id.id, lun_id);
+	status = xpt_create_path(&path, /*periph*/ NULL,
+				  bus_softc->path_id,
+				  targ_id.id, lun_id);
 	/* XXX KDM need some way to return status to CTL here? */
 	if (status != CAM_REQ_CMP) {
 		printf("%s: could not create path, status %#x\n", __func__,
@@ -1987,18 +1967,20 @@ ctlfe_lun_enable(void *arg, struct ctl_id targ_id, int lun_id)
 	}
 
 	softc = malloc(sizeof(*softc), M_CTLFE, M_WAITOK | M_ZERO);
-	CAM_SIM_LOCK(sim);
+	xpt_path_lock(path);
 	periph = cam_periph_find(path, "ctl");
 	if (periph != NULL) {
 		/* We've already got a periph, no need to alloc a new one. */
+		xpt_path_unlock(path);
 		xpt_free_path(path);
 		free(softc, M_CTLFE);
-		CAM_SIM_UNLOCK(sim);
 		return (0);
 	}
 
 	softc->parent_softc = bus_softc;
+	mtx_lock(&bus_softc->lun_softc_mtx);
 	STAILQ_INSERT_TAIL(&bus_softc->lun_softc_list, softc, links);
+	mtx_unlock(&bus_softc->lun_softc_mtx);
 
 	status = cam_periph_alloc(ctlferegister,
 				  ctlfeoninvalidate,
@@ -2011,10 +1993,8 @@ ctlfe_lun_enable(void *arg, struct ctl_id targ_id, int lun_id)
 				  0,
 				  softc);
 
+	xpt_path_unlock(path);
 	xpt_free_path(path);
-
-	CAM_SIM_UNLOCK(sim);
-
 	return (0);
 }
 
@@ -2027,12 +2007,10 @@ ctlfe_lun_disable(void *arg, struct ctl_id targ_id, int lun_id)
 {
 	struct ctlfe_softc *softc;
 	struct ctlfe_lun_softc *lun_softc;
-	struct cam_sim *sim;
 
 	softc = (struct ctlfe_softc *)arg;
-	sim = softc->sim;
 
-	CAM_SIM_LOCK(sim);
+	mtx_lock(&softc->lun_softc_mtx);
 	STAILQ_FOREACH(lun_softc, &softc->lun_softc_list, links) {
 		struct cam_path *path;
 
@@ -2044,16 +2022,18 @@ ctlfe_lun_disable(void *arg, struct ctl_id targ_id, int lun_id)
 		}
 	}
 	if (lun_softc == NULL) {
-		CAM_SIM_UNLOCK(sim);
+		mtx_unlock(&softc->lun_softc_mtx);
 		printf("%s: can't find target %d lun %d\n", __func__,
 		       targ_id.id, lun_id);
 		return (1);
 	}
+	cam_periph_acquire(lun_softc->periph);
+	mtx_unlock(&softc->lun_softc_mtx);
 
+	cam_periph_lock(lun_softc->periph);
 	cam_periph_invalidate(lun_softc->periph);
-
-	CAM_SIM_UNLOCK(sim);
-
+	cam_periph_unlock(lun_softc->periph);
+	cam_periph_release(lun_softc->periph);
 	return (0);
 }
 
@@ -2064,12 +2044,6 @@ ctlfe_dump_sim(struct cam_sim *sim)
 	printf("%s%d: max tagged openings: %d, max dev openings: %d\n",
 	       sim->sim_name, sim->unit_number,
 	       sim->max_tagged_dev_openings, sim->max_dev_openings);
-	printf("%s%d: max_ccbs: %u, ccb_count: %u\n", 
-	       sim->sim_name, sim->unit_number,
-	       sim->max_ccbs, sim->ccb_count);
-	printf("%s%d: ccb_freeq is %sempty\n",
-	       sim->sim_name, sim->unit_number,
-	       (SLIST_FIRST(&sim->ccb_freeq) == NULL) ? "" : "NOT ");
 	printf("\n");
 }
 
@@ -2200,17 +2174,13 @@ static void
 ctlfe_datamove_done(union ctl_io *io)
 {
 	union ccb *ccb;
-	struct cam_sim *sim;
 	struct cam_periph *periph;
 	struct ctlfe_lun_softc *softc;
 
 	ccb = io->io_hdr.ctl_private[CTL_PRIV_FRONTEND].ptr;
 
-	sim = xpt_path_sim(ccb->ccb_h.path);
-
-	CAM_SIM_LOCK(sim);
-
 	periph = xpt_path_periph(ccb->ccb_h.path);
+	cam_periph_lock(periph);
 
 	softc = (struct ctlfe_lun_softc *)periph->softc;
 
@@ -2255,7 +2225,7 @@ ctlfe_datamove_done(union ctl_io *io)
 			xpt_schedule(periph, /*priority*/ 1);
 	}
 
-	CAM_SIM_UNLOCK(sim);
+	cam_periph_unlock(periph);
 }
 
 static void
diff --git a/sys/cam/scsi/scsi_all.c b/sys/cam/scsi/scsi_all.c
index 65302664b0a..ff9dc1711c0 100644
--- a/sys/cam/scsi/scsi_all.c
+++ b/sys/cam/scsi/scsi_all.c
@@ -5249,6 +5249,21 @@ scsi_print_inquiry(struct scsi_inquiry_data *inq_data)
 	       dtype, rstr, qtype);
 }
 
+void
+scsi_print_inquiry_short(struct scsi_inquiry_data *inq_data)
+{
+	char vendor[16], product[48], revision[16];
+
+	cam_strvis(vendor, inq_data->vendor, sizeof(inq_data->vendor),
+		   sizeof(vendor));
+	cam_strvis(product, inq_data->product, sizeof(inq_data->product),
+		   sizeof(product));
+	cam_strvis(revision, inq_data->revision, sizeof(inq_data->revision),
+		   sizeof(revision));
+
+	printf("<%s %s %s>", vendor, product, revision);
+}
+
 /*
  * Table of syncrates that don't follow the "divisible by 4"
  * rule. This table will be expanded in future SCSI specs.
@@ -6494,7 +6509,11 @@ scsi_devid_match(uint8_t *lhs, size_t lhs_len, uint8_t *rhs, size_t rhs_len)
 		while (rhs_id <= rhs_last
 		    && (rhs_id->identifier + rhs_id->length) <= rhs_end) {
 
-			if (rhs_id->length == lhs_id->length
+			if ((rhs_id->id_type &
+			     (SVPD_ID_ASSOC_MASK | SVPD_ID_TYPE_MASK)) ==
+			    (lhs_id->id_type &
+			     (SVPD_ID_ASSOC_MASK | SVPD_ID_TYPE_MASK))
+			 && rhs_id->length == lhs_id->length
 			 && memcmp(rhs_id->identifier, lhs_id->identifier,
 				   rhs_id->length) == 0)
 				return (0);
diff --git a/sys/cam/scsi/scsi_all.h b/sys/cam/scsi/scsi_all.h
index 3e24ae106d4..1b09324d06c 100644
--- a/sys/cam/scsi/scsi_all.h
+++ b/sys/cam/scsi/scsi_all.h
@@ -1451,7 +1451,7 @@ struct scsi_vpd_block_characteristics
 	u_int8_t page_length[2];
 	u_int8_t medium_rotation_rate[2];
 #define SVPD_BDC_RATE_NOT_REPORTED	0x00
-#define SVPD_BDC_RATE_NONE_ROTATING	0x01
+#define SVPD_BDC_RATE_NON_ROTATING	0x01
 	u_int8_t reserved1;
 	u_int8_t nominal_form_factor;
 #define SVPD_BDC_FORM_NOT_REPORTED	0x00
@@ -2313,6 +2313,7 @@ char *		scsi_cdb_string(u_int8_t *cdb_ptr, char *cdb_string,
 				size_t len);
 
 void		scsi_print_inquiry(struct scsi_inquiry_data *inq_data);
+void		scsi_print_inquiry_short(struct scsi_inquiry_data *inq_data);
 
 u_int		scsi_calc_syncsrate(u_int period_factor);
 u_int		scsi_calc_syncparam(u_int period);
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 4bfbc410679..354fd5c8e38 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -118,7 +118,6 @@ typedef enum {
 typedef enum {
 	CD_CCB_PROBE		= 0x01,
 	CD_CCB_BUFFER_IO	= 0x02,
-	CD_CCB_WAITING		= 0x03,
 	CD_CCB_TUR		= 0x04,
 	CD_CCB_TYPE_MASK	= 0x0F,
 	CD_CCB_RETRY_UA		= 0x10
@@ -428,7 +427,6 @@ cdoninvalidate(struct cam_periph *periph)
 		camq_remove(&softc->changer->devq, softc->pinfo.index);
 
 	disk_gone(softc->disk);
-	xpt_print(periph->path, "lost device, %d refs\n", periph->refcount);
 }
 
 static void
@@ -438,8 +436,6 @@ cdcleanup(struct cam_periph *periph)
 
 	softc = (struct cd_softc *)periph->softc;
 
-	xpt_print(periph->path, "removing device entry\n");
-
 	/*
 	 * In the queued, non-active case, the device in question
 	 * has already been removed from the changer run queue.  Since this
@@ -552,7 +548,7 @@ cdasync(void *callback_arg, u_int32_t code,
 		status = cam_periph_alloc(cdregister, cdoninvalidate,
 					  cdcleanup, cdstart,
 					  "cd", CAM_PERIPH_BIO,
-					  cgd->ccb_h.path, cdasync,
+					  path, cdasync,
 					  AC_FOUND_DEVICE, cgd);
 
 		if (status != CAM_REQ_CMP
@@ -983,9 +979,9 @@ cdregister(struct cam_periph *periph, void *arg)
 			STAILQ_INIT(&nchanger->chluns);
 
 			callout_init_mtx(&nchanger->long_handle,
-			    periph->sim->mtx, 0);
+			    cam_periph_mtx(periph), 0);
 			callout_init_mtx(&nchanger->short_handle,
-			    periph->sim->mtx, 0);
+			    cam_periph_mtx(periph), 0);
 
 			mtx_lock(&changerq_mtx);
 			num_changers++;
@@ -1054,7 +1050,7 @@ cdregister(struct cam_periph *periph, void *arg)
 	/*
 	 * Schedule a periodic media polling events.
 	 */
-	callout_init_mtx(&softc->mediapoll_c, periph->sim->mtx, 0);
+	callout_init_mtx(&softc->mediapoll_c, cam_periph_mtx(periph), 0);
 	if ((softc->flags & CD_FLAG_DISC_REMOVABLE) &&
 	    (softc->flags & CD_FLAG_CHANGER) == 0 &&
 	    (cgd->inq_flags & SID_AEN) == 0 &&
@@ -1538,14 +1534,7 @@ cdstart(struct cam_periph *periph, union ccb *start_ccb)
 	case CD_STATE_NORMAL:
 	{
 		bp = bioq_first(&softc->bio_queue);
-		if (periph->immediate_priority <= periph->pinfo.priority) {
-			start_ccb->ccb_h.ccb_state = CD_CCB_WAITING;
-
-			SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-					  periph_links.sle);
-			periph->immediate_priority = CAM_PRIORITY_NONE;
-			wakeup(&periph->ccb_list);
-		} else if (bp == NULL) {
+		if (bp == NULL) {
 			if (softc->tur) {
 				softc->tur = 0;
 				csio = &start_ccb->csio;
@@ -1609,11 +1598,9 @@ cdstart(struct cam_periph *periph, union ccb *start_ccb)
 
 			xpt_action(start_ccb);
 		}
-		if (bp != NULL || softc->tur ||
-		    periph->immediate_priority != CAM_PRIORITY_NONE) {
+		if (bp != NULL || softc->tur) {
 			/* Have more work to do, so ensure we stay scheduled */
-			xpt_schedule(periph, min(CAM_PRIORITY_NORMAL,
-			    periph->immediate_priority));
+			xpt_schedule(periph, CAM_PRIORITY_NORMAL);
 		}
 		break;
 	}
@@ -1898,15 +1885,6 @@ cddone(struct cam_periph *periph, union ccb *done_ccb)
 		cam_periph_unhold(periph);
 		return;
 	}
-	case CD_CCB_WAITING:
-	{
-		/* Caller will release the CCB */
-		CAM_DEBUG(periph->path, CAM_DEBUG_TRACE, 
-			  ("trying to wakeup ccbwait\n"));
-
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
-	}
 	case CD_CCB_TUR:
 	{
 		if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index fdfb97faf24..b83bc53f07d 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -116,8 +116,7 @@ typedef enum {
 } ch_state;
 
 typedef enum {
-	CH_CCB_PROBE,
-	CH_CCB_WAITING
+	CH_CCB_PROBE
 } ch_ccb_types;
 
 typedef enum {
@@ -248,20 +247,19 @@ chinit(void)
 static void
 chdevgonecb(void *arg)
 {
-	struct cam_sim	  *sim;
 	struct ch_softc   *softc;
 	struct cam_periph *periph;
+	struct mtx *mtx;
 	int i;
 
 	periph = (struct cam_periph *)arg;
-	sim = periph->sim;
-	softc = (struct ch_softc *)periph->softc;
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 
+	softc = (struct ch_softc *)periph->softc;
 	KASSERT(softc->open_count >= 0, ("Negative open count %d",
 		softc->open_count));
 
-	mtx_lock(sim->mtx);
-
 	/*
 	 * When we get this callback, we will get no more close calls from
 	 * devfs.  So if we have any dangling opens, we need to release the
@@ -278,13 +276,13 @@ chdevgonecb(void *arg)
 	cam_periph_release_locked(periph);
 
 	/*
-	 * We reference the SIM lock directly here, instead of using
+	 * We reference the lock directly here, instead of using
 	 * cam_periph_unlock().  The reason is that the final call to
 	 * cam_periph_release_locked() above could result in the periph
 	 * getting freed.  If that is the case, dereferencing the periph
 	 * with a cam_periph_unlock() call would cause a page fault.
 	 */
-	mtx_unlock(sim->mtx);
+	mtx_unlock(mtx);
 }
 
 static void
@@ -306,9 +304,6 @@ choninvalidate(struct cam_periph *periph)
 	 * when it has cleaned up its state.
 	 */
 	destroy_dev_sched_cb(softc->dev, chdevgonecb, periph);
-
-	xpt_print(periph->path, "lost device\n");
-
 }
 
 static void
@@ -318,8 +313,6 @@ chcleanup(struct cam_periph *periph)
 
 	softc = (struct ch_softc *)periph->softc;
 
-	xpt_print(periph->path, "removing device entry\n");
-
 	devstat_remove_entry(softc->device_stats);
 
 	free(softc, M_DEVBUF);
@@ -355,7 +348,7 @@ chasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg)
 		 */
 		status = cam_periph_alloc(chregister, choninvalidate,
 					  chcleanup, chstart, "ch",
-					  CAM_PERIPH_BIO, cgd->ccb_h.path,
+					  CAM_PERIPH_BIO, path,
 					  chasync, AC_FOUND_DEVICE, cgd);
 
 		if (status != CAM_REQ_CMP
@@ -508,25 +501,23 @@ chopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 static int
 chclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
-	struct	cam_sim *sim;
 	struct	cam_periph *periph;
 	struct  ch_softc *softc;
+	struct mtx *mtx;
 
 	periph = (struct cam_periph *)dev->si_drv1;
 	if (periph == NULL)
 		return(ENXIO);
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 
-	sim = periph->sim;
 	softc = (struct ch_softc *)periph->softc;
-
-	mtx_lock(sim->mtx);
-
 	softc->open_count--;
 
 	cam_periph_release_locked(periph);
 
 	/*
-	 * We reference the SIM lock directly here, instead of using
+	 * We reference the lock directly here, instead of using
 	 * cam_periph_unlock().  The reason is that the call to
 	 * cam_periph_release_locked() above could result in the periph
 	 * getting freed.  If that is the case, dereferencing the periph
@@ -537,7 +528,7 @@ chclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 	 * protect the open count and avoid another lock acquisition and
 	 * release.
 	 */
-	mtx_unlock(sim->mtx);
+	mtx_unlock(mtx);
 
 	return(0);
 }
@@ -552,14 +543,7 @@ chstart(struct cam_periph *periph, union ccb *start_ccb)
 	switch (softc->state) {
 	case CH_STATE_NORMAL:
 	{
-		if (periph->immediate_priority <= periph->pinfo.priority){
-			start_ccb->ccb_h.ccb_state = CH_CCB_WAITING;
-
-			SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-					  periph_links.sle);
-			periph->immediate_priority = CAM_PRIORITY_NONE;
-			wakeup(&periph->ccb_list);
-		}
+		xpt_release_ccb(start_ccb);
 		break;
 	}
 	case CH_STATE_PROBE:
@@ -739,12 +723,6 @@ chdone(struct cam_periph *periph, union ccb *done_ccb)
 		cam_periph_unhold(periph);
 		return;
 	}
-	case CH_CCB_WAITING:
-	{
-		/* Caller will release the CCB */
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
-	}
 	default:
 		break;
 	}
@@ -1729,10 +1707,8 @@ chscsiversion(struct cam_periph *periph)
 	struct scsi_inquiry_data *inq_data;
 	struct ccb_getdev *cgd;
 	int dev_scsi_version;
-	struct cam_sim *sim;
 
-	sim = xpt_path_sim(periph->path);
-	mtx_assert(sim->mtx, MA_OWNED);
+	cam_periph_assert(periph, MA_OWNED);
 	if ((cgd = (struct ccb_getdev *)xpt_alloc_ccb_nowait()) == NULL)
 		return (-1);
 	/*
diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c
index 913951ef4ff..64109d08202 100644
--- a/sys/cam/scsi/scsi_da.c
+++ b/sys/cam/scsi/scsi_da.c
@@ -84,7 +84,7 @@ typedef enum {
 	DA_FLAG_PACK_LOCKED	= 0x004,
 	DA_FLAG_PACK_REMOVABLE	= 0x008,
 	DA_FLAG_NEED_OTAG	= 0x020,
-	DA_FLAG_WENT_IDLE	= 0x040,
+	DA_FLAG_WAS_OTAG	= 0x040,
 	DA_FLAG_RETRY_UA	= 0x080,
 	DA_FLAG_OPEN		= 0x100,
 	DA_FLAG_SCTX_INIT	= 0x200,
@@ -118,7 +118,6 @@ typedef enum {
 	DA_CCB_PROBE_BDC	= 0x05,
 	DA_CCB_PROBE_ATA	= 0x06,
 	DA_CCB_BUFFER_IO	= 0x07,
-	DA_CCB_WAITING		= 0x08,
 	DA_CCB_DUMP		= 0x0A,
 	DA_CCB_DELETE		= 0x0B,
  	DA_CCB_TUR		= 0x0C,
@@ -199,19 +198,17 @@ struct da_softc {
 	struct	 bio_queue_head bio_queue;
 	struct	 bio_queue_head delete_queue;
 	struct	 bio_queue_head delete_run_queue;
-	SLIST_ENTRY(da_softc) links;
 	LIST_HEAD(, ccb_hdr) pending_ccbs;
+	int	 tur;			/* TEST UNIT READY should be sent */
+	int	 refcount;		/* Active xpt_action() calls */
 	da_state state;
 	da_flags flags;	
 	da_quirks quirks;
 	int	 sort_io_queue;
 	int	 minimum_cmd_size;
 	int	 error_inject;
-	int	 ordered_tag_count;
-	int	 outstanding_cmds;
 	int	 trim_max_ranges;
 	int	 delete_running;
-	int	 tur;
 	int	 delete_available;	/* Delete methods possibly available */
 	uint32_t		unmap_max_ranges;
 	uint32_t		unmap_max_lba;
@@ -950,6 +947,14 @@ static struct da_quirk_entry da_quirk_table[] =
 		{ T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force 3*", "*" },
 		/*quirks*/DA_Q_4K
 	},
+        {
+		/*
+		 * Corsair Neutron GTX SSDs
+		 * 4k optimised & trim only works in 4k requests + 4k aligned
+		 */
+		{ T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Neutron GTX*", "*" },
+		/*quirks*/DA_Q_4K
+	},
 	{
 		/*
 		 * Corsair Force GT SSDs
@@ -1269,86 +1274,72 @@ daclose(struct disk *dp)
 {
 	struct	cam_periph *periph;
 	struct	da_softc *softc;
+	union	ccb *ccb;
 	int error;
 
 	periph = (struct cam_periph *)dp->d_drv1;
-	cam_periph_lock(periph);
-	if (cam_periph_hold(periph, PRIBIO) != 0) {
-		cam_periph_unlock(periph);
-		cam_periph_release(periph);
-		return (0);
-	}
-
 	softc = (struct da_softc *)periph->softc;
-
+	cam_periph_lock(periph);
 	CAM_DEBUG(periph->path, CAM_DEBUG_TRACE | CAM_DEBUG_PERIPH,
 	    ("daclose\n"));
 
-	if ((softc->flags & DA_FLAG_DIRTY) != 0 &&
-	    (softc->quirks & DA_Q_NO_SYNC_CACHE) == 0 &&
-	    (softc->flags & DA_FLAG_PACK_INVALID) == 0) {
-		union	ccb *ccb;
+	if (cam_periph_hold(periph, PRIBIO) == 0) {
 
-		ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
+		/* Flush disk cache. */
+		if ((softc->flags & DA_FLAG_DIRTY) != 0 &&
+		    (softc->quirks & DA_Q_NO_SYNC_CACHE) == 0 &&
+		    (softc->flags & DA_FLAG_PACK_INVALID) == 0) {
+			ccb = cam_periph_getccb(periph, CAM_PRIORITY_NORMAL);
+			scsi_synchronize_cache(&ccb->csio, /*retries*/1,
+			    /*cbfcnp*/dadone, MSG_SIMPLE_Q_TAG,
+			    /*begin_lba*/0, /*lb_count*/0, SSD_FULL_SIZE,
+			    5 * 60 * 1000);
+			error = cam_periph_runccb(ccb, daerror, /*cam_flags*/0,
+			    /*sense_flags*/SF_RETRY_UA | SF_QUIET_IR,
+			    softc->disk->d_devstat);
+			if (error == 0)
+				softc->flags &= ~DA_FLAG_DIRTY;
+			xpt_release_ccb(ccb);
+		}
 
-		scsi_synchronize_cache(&ccb->csio,
-				       /*retries*/1,
-				       /*cbfcnp*/dadone,
-				       MSG_SIMPLE_Q_TAG,
-				       /*begin_lba*/0,/* Cover the whole disk */
-				       /*lb_count*/0,
-				       SSD_FULL_SIZE,
-				       5 * 60 * 1000);
-
-		error = cam_periph_runccb(ccb, daerror, /*cam_flags*/0,
-				  /*sense_flags*/SF_RETRY_UA | SF_QUIET_IR,
-				  softc->disk->d_devstat);
-		if (error == 0)
-			softc->flags &= ~DA_FLAG_DIRTY;
-		xpt_release_ccb(ccb);
-
-	}
-
-	if ((softc->flags & DA_FLAG_PACK_REMOVABLE) != 0) {
-		if ((softc->quirks & DA_Q_NO_PREVENT) == 0)
+		/* Allow medium removal. */
+		if ((softc->flags & DA_FLAG_PACK_REMOVABLE) != 0 &&
+		    (softc->quirks & DA_Q_NO_PREVENT) == 0)
 			daprevent(periph, PR_ALLOW);
-		/*
-		 * If we've got removeable media, mark the blocksize as
-		 * unavailable, since it could change when new media is
-		 * inserted.
-		 */
-		softc->disk->d_devstat->flags |= DEVSTAT_BS_UNAVAILABLE;
+
+		cam_periph_unhold(periph);
 	}
 
+	/*
+	 * If we've got removeable media, mark the blocksize as
+	 * unavailable, since it could change when new media is
+	 * inserted.
+	 */
+	if ((softc->flags & DA_FLAG_PACK_REMOVABLE) != 0)
+		softc->disk->d_devstat->flags |= DEVSTAT_BS_UNAVAILABLE;
+
 	softc->flags &= ~DA_FLAG_OPEN;
-	cam_periph_unhold(periph);
+	while (softc->refcount != 0)
+		cam_periph_sleep(periph, &softc->refcount, PRIBIO, "daclose", 1);
 	cam_periph_unlock(periph);
 	cam_periph_release(periph);
-	return (0);	
+	return (0);
 }
 
 static void
 daschedule(struct cam_periph *periph)
 {
 	struct da_softc *softc = (struct da_softc *)periph->softc;
-	uint32_t prio;
 
 	if (softc->state != DA_STATE_NORMAL)
 		return;
 
-	/* Check if cam_periph_getccb() was called. */
-	prio = periph->immediate_priority;
-
 	/* Check if we have more work to do. */
 	if (bioq_first(&softc->bio_queue) ||
 	    (!softc->delete_running && bioq_first(&softc->delete_queue)) ||
 	    softc->tur) {
-		prio = CAM_PRIORITY_NORMAL;
+		xpt_schedule(periph, CAM_PRIORITY_NORMAL);
 	}
-
-	/* Schedule CCB if any of above is true. */
-	if (prio != CAM_PRIORITY_NONE)
-		xpt_schedule(periph, prio);
 }
 
 /*
@@ -1382,9 +1373,7 @@ dastrategy(struct bio *bp)
 	 * Place it in the queue of disk activities for this disk
 	 */
 	if (bp->bio_cmd == BIO_DELETE) {
-		if (bp->bio_bcount == 0)
-			biodone(bp);
-		else if (DA_SIO)
+		if (DA_SIO)
 			bioq_disksort(&softc->delete_queue, bp);
 		else
 			bioq_insert_tail(&softc->delete_queue, bp);
@@ -1561,9 +1550,6 @@ daoninvalidate(struct cam_periph *periph)
 	 * done cleaning up its resources.
 	 */
 	disk_gone(softc->disk);
-
-	xpt_print(periph->path, "lost device - %d outstanding, %d refs\n",
-		  softc->outstanding_cmds, periph->refcount);
 }
 
 static void
@@ -1573,7 +1559,6 @@ dacleanup(struct cam_periph *periph)
 
 	softc = (struct da_softc *)periph->softc;
 
-	xpt_print(periph->path, "removing device entry\n");
 	cam_periph_unlock(periph);
 
 	/*
@@ -1625,7 +1610,7 @@ daasync(void *callback_arg, u_int32_t code,
 		status = cam_periph_alloc(daregister, daoninvalidate,
 					  dacleanup, dastart,
 					  "da", CAM_PERIPH_BIO,
-					  cgd->ccb_h.path, daasync,
+					  path, daasync,
 					  AC_FOUND_DEVICE, cgd);
 
 		if (status != CAM_REQ_CMP
@@ -2070,7 +2055,7 @@ daregister(struct cam_periph *periph, void *arg)
 	 * Schedule a periodic event to occasionally send an
 	 * ordered tag to a device.
 	 */
-	callout_init_mtx(&softc->sendordered_c, periph->sim->mtx, 0);
+	callout_init_mtx(&softc->sendordered_c, cam_periph_mtx(periph), 0);
 	callout_reset(&softc->sendordered_c,
 	    (da_default_timeout * hz) / DA_ORDEREDTAG_INTERVAL,
 	    dasendorderedtag, softc);
@@ -2137,7 +2122,7 @@ daregister(struct cam_periph *periph, void *arg)
 	else
 		softc->disk->d_maxsize = cpi.maxio;
 	softc->disk->d_unit = periph->unit_number;
-	softc->disk->d_flags = 0;
+	softc->disk->d_flags = DISKFLAG_DIRECT_COMPLETION;
 	if ((softc->quirks & DA_Q_NO_SYNC_CACHE) == 0)
 		softc->disk->d_flags |= DISKFLAG_CANFLUSHCACHE;
 	if ((cpi.hba_misc & PIM_UNMAPPED) != 0)
@@ -2190,7 +2175,7 @@ daregister(struct cam_periph *periph, void *arg)
 	/*
 	 * Schedule a periodic media polling events.
 	 */
-	callout_init_mtx(&softc->mediapoll_c, periph->sim->mtx, 0);
+	callout_init_mtx(&softc->mediapoll_c, cam_periph_mtx(periph), 0);
 	if ((softc->flags & DA_FLAG_PACK_REMOVABLE) &&
 	    (cgd->inq_flags & SID_AEN) == 0 &&
 	    da_poll_period != 0)
@@ -2218,20 +2203,6 @@ skipstate:
 		struct bio *bp;
 		uint8_t tag_code;
 
-		/* Execute immediate CCB if waiting. */
-		if (periph->immediate_priority <= periph->pinfo.priority) {
-			CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE,
-					("queuing for immediate ccb\n"));
-			start_ccb->ccb_h.ccb_state = DA_CCB_WAITING;
-			SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-					  periph_links.sle);
-			periph->immediate_priority = CAM_PRIORITY_NONE;
-			wakeup(&periph->ccb_list);
-			/* May have more work to do, so ensure we stay scheduled */
-			daschedule(periph);
-			break;
-		}
-
 		/* Run BIO_DELETE if not running yet. */
 		if (!softc->delete_running &&
 		    (bp = bioq_first(&softc->delete_queue)) != NULL) {
@@ -2270,7 +2241,7 @@ skipstate:
 		if ((bp->bio_flags & BIO_ORDERED) != 0 ||
 		    (softc->flags & DA_FLAG_NEED_OTAG) != 0) {
 			softc->flags &= ~DA_FLAG_NEED_OTAG;
-			softc->ordered_tag_count++;
+			softc->flags |= DA_FLAG_WAS_OTAG;
 			tag_code = MSG_ORDERED_Q_TAG;
 		} else {
 			tag_code = MSG_SIMPLE_Q_TAG;
@@ -2320,15 +2291,11 @@ skipstate:
 			break;
 		}
 		start_ccb->ccb_h.ccb_state = DA_CCB_BUFFER_IO;
+		start_ccb->ccb_h.flags |= CAM_UNLOCKED;
 
 out:
-		/*
-		 * Block out any asynchronous callbacks
-		 * while we touch the pending ccb list.
-		 */
 		LIST_INSERT_HEAD(&softc->pending_ccbs,
 				 &start_ccb->ccb_h, periph_links.le);
-		softc->outstanding_cmds++;
 
 		/* We expect a unit attention from this device */
 		if ((softc->flags & DA_FLAG_RETRY_UA) != 0) {
@@ -2337,7 +2304,11 @@ out:
 		}
 
 		start_ccb->ccb_h.ccb_bp = bp;
+		softc->refcount++;
+		cam_periph_unlock(periph);
 		xpt_action(start_ccb);
+		cam_periph_lock(periph);
+		softc->refcount--;
 
 		/* May have more work to do, so ensure we stay scheduled */
 		daschedule(periph);
@@ -2632,6 +2603,7 @@ da_delete_unmap(struct cam_periph *periph, union ccb *ccb, struct bio *bp)
 		   /*sense_len*/SSD_FULL_SIZE,
 		   da_default_timeout * 1000);
 	ccb->ccb_h.ccb_state = DA_CCB_DELETE;
+	ccb->ccb_h.flags |= CAM_UNLOCKED;
 }
 
 static void
@@ -2712,6 +2684,7 @@ da_delete_trim(struct cam_periph *periph, union ccb *ccb, struct bio *bp)
 		      /*sense_len*/SSD_FULL_SIZE,
 		      da_default_timeout * 1000);
 	ccb->ccb_h.ccb_state = DA_CCB_DELETE;
+	ccb->ccb_h.flags |= CAM_UNLOCKED;
 }
 
 /*
@@ -2768,6 +2741,7 @@ da_delete_ws(struct cam_periph *periph, union ccb *ccb, struct bio *bp)
 			/*sense_len*/SSD_FULL_SIZE,
 			da_default_timeout * 1000);
 	ccb->ccb_h.ccb_state = DA_CCB_DELETE;
+	ccb->ccb_h.flags |= CAM_UNLOCKED;
 }
 
 static int
@@ -2902,6 +2876,7 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 	{
 		struct bio *bp, *bp1;
 
+		cam_periph_lock(periph);
 		bp = (struct bio *)done_ccb->ccb_h.ccb_bp;
 		if ((done_ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
 			int error;
@@ -2918,6 +2893,7 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 				 * A retry was scheduled, so
 				 * just return.
 				 */
+				cam_periph_unlock(periph);
 				return;
 			}
 			bp = (struct bio *)done_ccb->ccb_h.ccb_bp;
@@ -2985,18 +2961,22 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 			}
 		}
 
-		/*
-		 * Block out any asynchronous callbacks
-		 * while we touch the pending ccb list.
-		 */
 		LIST_REMOVE(&done_ccb->ccb_h, periph_links.le);
-		softc->outstanding_cmds--;
-		if (softc->outstanding_cmds == 0)
-			softc->flags |= DA_FLAG_WENT_IDLE;
+		if (LIST_EMPTY(&softc->pending_ccbs))
+			softc->flags |= DA_FLAG_WAS_OTAG;
 
+		xpt_release_ccb(done_ccb);
 		if (state == DA_CCB_DELETE) {
-			while ((bp1 = bioq_takefirst(&softc->delete_run_queue))
-			    != NULL) {
+			TAILQ_HEAD(, bio) queue;
+
+			TAILQ_INIT(&queue);
+			TAILQ_CONCAT(&queue, &softc->delete_run_queue.queue, bio_queue);
+			softc->delete_run_queue.insert_point = NULL;
+			softc->delete_running = 0;
+			daschedule(periph);
+			cam_periph_unlock(periph);
+			while ((bp1 = TAILQ_FIRST(&queue)) != NULL) {
+				TAILQ_REMOVE(&queue, bp1, bio_queue);
 				bp1->bio_error = bp->bio_error;
 				if (bp->bio_flags & BIO_ERROR) {
 					bp1->bio_flags |= BIO_ERROR;
@@ -3005,13 +2985,11 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 					bp1->bio_resid = 0;
 				biodone(bp1);
 			}
-			softc->delete_running = 0;
-			if (bp != NULL)
-				biodone(bp);
-			daschedule(periph);
-		} else if (bp != NULL)
+		} else
+			cam_periph_unlock(periph);
+		if (bp != NULL)
 			biodone(bp);
-		break;
+		return;
 	}
 	case DA_CCB_PROBE_RC:
 	case DA_CCB_PROBE_RC16:
@@ -3386,9 +3364,18 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 			 * Disable queue sorting for non-rotational media
 			 * by default.
 			 */
-			if (scsi_2btoul(bdc->medium_rotation_rate) ==
-			    SVPD_BDC_RATE_NONE_ROTATING)
+			u_int16_t old_rate = softc->disk->d_rotation_rate;
+
+			softc->disk->d_rotation_rate =
+				scsi_2btoul(bdc->medium_rotation_rate);
+			if (softc->disk->d_rotation_rate ==
+			    SVPD_BDC_RATE_NON_ROTATING) {
 				softc->sort_io_queue = 0;
+			}
+			if (softc->disk->d_rotation_rate != old_rate) {
+				disk_attr_changed(softc->disk,
+				    "GEOM::rotation_rate", M_NOWAIT);
+			}
 		} else {
 			int error;
 			error = daerror(done_ccb, CAM_RETRY_SELTO,
@@ -3423,6 +3410,8 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 		ptr = (uint16_t *)ata_params;
 
 		if ((csio->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) {
+			uint16_t old_rate;
+
 			for (i = 0; i < sizeof(*ata_params) / 2; i++)
 				ptr[i] = le16toh(ptr[i]);
 			if (ata_params->support_dsm & ATA_SUPPORT_DSM_TRIM) {
@@ -3437,8 +3426,18 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 			 * Disable queue sorting for non-rotational media
 			 * by default.
 			 */
-			if (ata_params->media_rotation_rate == 1)
+			old_rate = softc->disk->d_rotation_rate;
+			softc->disk->d_rotation_rate =
+			    ata_params->media_rotation_rate;
+			if (softc->disk->d_rotation_rate ==
+			    ATA_RATE_NON_ROTATING) {
 				softc->sort_io_queue = 0;
+			}
+
+			if (softc->disk->d_rotation_rate != old_rate) {
+				disk_attr_changed(softc->disk,
+				    "GEOM::rotation_rate", M_NOWAIT);
+			}
 		} else {
 			int error;
 			error = daerror(done_ccb, CAM_RETRY_SELTO,
@@ -3461,12 +3460,6 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
 		daprobedone(periph, done_ccb);
 		return;
 	}
-	case DA_CCB_WAITING:
-	{
-		/* Caller will release the CCB */
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
-	}
 	case DA_CCB_DUMP:
 		/* No-op.  We're polling */
 		return;
@@ -3577,7 +3570,7 @@ damediapoll(void *arg)
 	struct cam_periph *periph = arg;
 	struct da_softc *softc = periph->softc;
 
-	if (!softc->tur && softc->outstanding_cmds == 0) {
+	if (!softc->tur && LIST_EMPTY(&softc->pending_ccbs)) {
 		if (cam_periph_acquire(periph) == CAM_REQ_CMP) {
 			softc->tur = 1;
 			daschedule(periph);
@@ -3749,14 +3742,11 @@ dasendorderedtag(void *arg)
 	struct da_softc *softc = arg;
 
 	if (da_send_ordered) {
-		if ((softc->ordered_tag_count == 0) 
-		 && ((softc->flags & DA_FLAG_WENT_IDLE) == 0)) {
-			softc->flags |= DA_FLAG_NEED_OTAG;
+		if (!LIST_EMPTY(&softc->pending_ccbs)) {
+			if ((softc->flags & DA_FLAG_WAS_OTAG) == 0)
+				softc->flags |= DA_FLAG_NEED_OTAG;
+			softc->flags &= ~DA_FLAG_WAS_OTAG;
 		}
-		if (softc->outstanding_cmds > 0)
-			softc->flags &= ~DA_FLAG_WENT_IDLE;
-
-		softc->ordered_tag_count = 0;
 	}
 	/* Queue us up again */
 	callout_reset(&softc->sendordered_c,
diff --git a/sys/cam/scsi/scsi_enc.c b/sys/cam/scsi/scsi_enc.c
index 775d8f649ef..2bf6b50acea 100644
--- a/sys/cam/scsi/scsi_enc.c
+++ b/sys/cam/scsi/scsi_enc.c
@@ -69,7 +69,6 @@ static	periph_init_t	enc_init;
 static  periph_ctor_t	enc_ctor;
 static	periph_oninv_t	enc_oninvalidate;
 static  periph_dtor_t   enc_dtor;
-static  periph_start_t  enc_start;
 
 static void enc_async(void *, uint32_t, struct cam_path *, void *);
 static enctyp enc_type(struct ccb_getdev *);
@@ -113,17 +112,16 @@ enc_init(void)
 static void
 enc_devgonecb(void *arg)
 {
-	struct cam_sim    *sim;
 	struct cam_periph *periph;
 	struct enc_softc  *enc;
+	struct mtx *mtx;
 	int i;
 
 	periph = (struct cam_periph *)arg;
-	sim = periph->sim;
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 	enc = (struct enc_softc *)periph->softc;
 
-	mtx_lock(sim->mtx);
-
 	/*
 	 * When we get this callback, we will get no more close calls from
 	 * devfs.  So if we have any dangling opens, we need to release the
@@ -140,13 +138,13 @@ enc_devgonecb(void *arg)
 	cam_periph_release_locked(periph);
 
 	/*
-	 * We reference the SIM lock directly here, instead of using
+	 * We reference the lock directly here, instead of using
 	 * cam_periph_unlock().  The reason is that the final call to
 	 * cam_periph_release_locked() above could result in the periph
 	 * getting freed.  If that is the case, dereferencing the periph
 	 * with a cam_periph_unlock() call would cause a page fault.
 	 */
-	mtx_unlock(sim->mtx);
+	mtx_unlock(mtx);
 }
 
 static void
@@ -178,8 +176,6 @@ enc_oninvalidate(struct cam_periph *periph)
 	callout_drain(&enc->status_updater);
 
 	destroy_dev_sched_cb(enc->enc_dev, enc_devgonecb, periph);
-
-	xpt_print(periph->path, "lost device\n");
 }
 
 static void
@@ -189,9 +185,6 @@ enc_dtor(struct cam_periph *periph)
 
 	enc = periph->softc;
 
-	xpt_print(periph->path, "removing device entry\n");
-
-
 	/* If the sub-driver has a cleanup routine, call it */
 	if (enc->enc_vec.softc_cleanup != NULL)
 		enc->enc_vec.softc_cleanup(enc);
@@ -248,8 +241,8 @@ enc_async(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 		}
 
 		status = cam_periph_alloc(enc_ctor, enc_oninvalidate,
-		    enc_dtor, enc_start, "ses", CAM_PERIPH_BIO,
-		    cgd->ccb_h.path, enc_async, AC_FOUND_DEVICE, cgd);
+		    enc_dtor, NULL, "ses", CAM_PERIPH_BIO,
+		    path, enc_async, AC_FOUND_DEVICE, cgd);
 
 		if (status != CAM_REQ_CMP && status != CAM_REQ_INPROG) {
 			printf("enc_async: Unable to probe new device due to "
@@ -304,25 +297,23 @@ out:
 static int
 enc_close(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
-	struct cam_sim    *sim;
 	struct cam_periph *periph;
 	struct enc_softc  *enc;
+	struct mtx *mtx;
 
 	periph = (struct cam_periph *)dev->si_drv1;
 	if (periph == NULL)
 		return (ENXIO);
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 
-	sim = periph->sim;
 	enc = periph->softc;
-
-	mtx_lock(sim->mtx);
-
 	enc->open_count--;
 
 	cam_periph_release_locked(periph);
 
 	/*
-	 * We reference the SIM lock directly here, instead of using
+	 * We reference the lock directly here, instead of using
 	 * cam_periph_unlock().  The reason is that the call to
 	 * cam_periph_release_locked() above could result in the periph
 	 * getting freed.  If that is the case, dereferencing the periph
@@ -333,34 +324,11 @@ enc_close(struct cdev *dev, int flag, int fmt, struct thread *td)
 	 * protect the open count and avoid another lock acquisition and
 	 * release.
 	 */
-	mtx_unlock(sim->mtx);
+	mtx_unlock(mtx);
 
 	return (0);
 }
 
-static void
-enc_start(struct cam_periph *p, union ccb *sccb)
-{
-	struct enc_softc *enc;
-
-	enc = p->softc;
-	ENC_DLOG(enc, "%s enter imm=%d prio=%d\n",
-	    __func__, p->immediate_priority, p->pinfo.priority);
-	if (p->immediate_priority <= p->pinfo.priority) {
-		SLIST_INSERT_HEAD(&p->ccb_list, &sccb->ccb_h, periph_links.sle);
-		p->immediate_priority = CAM_PRIORITY_NONE;
-		wakeup(&p->ccb_list);
-	} else
-		xpt_release_ccb(sccb);
-	ENC_DLOG(enc, "%s exit\n", __func__);
-}
-
-void
-enc_done(struct cam_periph *periph, union ccb *dccb)
-{
-	wakeup(&dccb->ccb_h.cbfcnp);
-}
-
 int
 enc_error(union ccb *ccb, uint32_t cflags, uint32_t sflags)
 {
@@ -619,7 +587,7 @@ enc_runcmd(struct enc_softc *enc, char *cdb, int cdbl, char *dptr, int *dlenp)
 	if (enc->enc_type == ENC_SEMB_SES || enc->enc_type == ENC_SEMB_SAFT) {
 		tdlen = min(dlen, 1020);
 		tdlen = (tdlen + 3) & ~3;
-		cam_fill_ataio(&ccb->ataio, 0, enc_done, ddf, 0, dptr, tdlen,
+		cam_fill_ataio(&ccb->ataio, 0, NULL, ddf, 0, dptr, tdlen,
 		    30 * 1000);
 		if (cdb[0] == RECEIVE_DIAGNOSTIC)
 			ata_28bit_cmd(&ccb->ataio,
@@ -637,7 +605,7 @@ enc_runcmd(struct enc_softc *enc, char *cdb, int cdbl, char *dptr, int *dlenp)
 			    0x80, tdlen / 4);
 	} else {
 		tdlen = dlen;
-		cam_fill_csio(&ccb->csio, 0, enc_done, ddf, MSG_SIMPLE_Q_TAG,
+		cam_fill_csio(&ccb->csio, 0, NULL, ddf, MSG_SIMPLE_Q_TAG,
 		    dptr, dlen, sizeof (struct scsi_sense_data), cdbl,
 		    60 * 1000);
 		bcopy(cdb, ccb->csio.cdb_io.cdb_bytes, cdbl);
@@ -891,7 +859,7 @@ enc_kproc_init(enc_softc_t *enc)
 {
 	int result;
 
-	callout_init_mtx(&enc->status_updater, enc->periph->sim->mtx, 0);
+	callout_init_mtx(&enc->status_updater, cam_periph_mtx(enc->periph), 0);
 
 	if (cam_periph_acquire(enc->periph) != CAM_REQ_CMP)
 		return (ENXIO);
diff --git a/sys/cam/scsi/scsi_enc_internal.h b/sys/cam/scsi/scsi_enc_internal.h
index f1b8582b69f..3bf8cfb1308 100644
--- a/sys/cam/scsi/scsi_enc_internal.h
+++ b/sys/cam/scsi/scsi_enc_internal.h
@@ -192,7 +192,6 @@ struct ses_mgmt_mode_page {
 /* Enclosure core interface for sub-drivers */
 int  enc_runcmd(struct enc_softc *, char *, int, char *, int *);
 void enc_log(struct enc_softc *, const char *, ...);
-void enc_done(struct cam_periph *, union ccb *);
 int  enc_error(union ccb *, uint32_t, uint32_t);
 void enc_update_request(enc_softc_t *, uint32_t);
 
diff --git a/sys/cam/scsi/scsi_enc_safte.c b/sys/cam/scsi/scsi_enc_safte.c
index 3c98ab89d71..8282d013bb5 100644
--- a/sys/cam/scsi/scsi_enc_safte.c
+++ b/sys/cam/scsi/scsi_enc_safte.c
@@ -243,12 +243,12 @@ safte_fill_read_buf_io(enc_softc_t *enc, struct enc_fsm_state *state,
 
 	if (enc->enc_type == ENC_SEMB_SAFT) {
 		semb_read_buffer(&ccb->ataio, /*retries*/5,
-				enc_done, MSG_SIMPLE_Q_TAG,
+				NULL, MSG_SIMPLE_Q_TAG,
 				state->page_code, buf, state->buf_size,
 				state->timeout);
 	} else {
 		scsi_read_buffer(&ccb->csio, /*retries*/5,
-				enc_done, MSG_SIMPLE_Q_TAG, 1,
+				NULL, MSG_SIMPLE_Q_TAG, 1,
 				state->page_code, 0, buf, state->buf_size,
 				SSD_FULL_SIZE, state->timeout);
 	}
@@ -942,11 +942,11 @@ safte_fill_control_request(enc_softc_t *enc, struct enc_fsm_state *state,
 
 	if (enc->enc_type == ENC_SEMB_SAFT) {
 		semb_write_buffer(&ccb->ataio, /*retries*/5,
-				enc_done, MSG_SIMPLE_Q_TAG,
+				NULL, MSG_SIMPLE_Q_TAG,
 				buf, xfer_len, state->timeout);
 	} else {
 		scsi_write_buffer(&ccb->csio, /*retries*/5,
-				enc_done, MSG_SIMPLE_Q_TAG, 1,
+				NULL, MSG_SIMPLE_Q_TAG, 1,
 				0, 0, buf, xfer_len,
 				SSD_FULL_SIZE, state->timeout);
 	}
diff --git a/sys/cam/scsi/scsi_enc_ses.c b/sys/cam/scsi/scsi_enc_ses.c
index 6917fffbd41..5393244d293 100644
--- a/sys/cam/scsi/scsi_enc_ses.c
+++ b/sys/cam/scsi/scsi_enc_ses.c
@@ -888,7 +888,6 @@ ses_path_iter_devid_callback(enc_softc_t *enc, enc_element_t *elem,
 	struct device_match_result  *device_match;
 	struct device_match_pattern *device_pattern;
 	ses_path_iter_args_t	    *args;
-	struct cam_sim		    *sim;
 
 	args = (ses_path_iter_args_t *)arg;
 	match_pattern.type = DEV_MATCH_DEVICE;
@@ -901,10 +900,10 @@ ses_path_iter_devid_callback(enc_softc_t *enc, enc_element_t *elem,
 	       device_pattern->data.devid_pat.id_len);
 
 	memset(&cdm, 0, sizeof(cdm));
-	if (xpt_create_path_unlocked(&cdm.ccb_h.path, /*periph*/NULL,
-				     CAM_XPT_PATH_ID,
-				     CAM_TARGET_WILDCARD,
-				     CAM_LUN_WILDCARD) != CAM_REQ_CMP)
+	if (xpt_create_path(&cdm.ccb_h.path, /*periph*/NULL,
+			     CAM_XPT_PATH_ID,
+			     CAM_TARGET_WILDCARD,
+			     CAM_LUN_WILDCARD) != CAM_REQ_CMP)
 		return;
 
 	cdm.ccb_h.func_code = XPT_DEV_MATCH;
@@ -914,11 +913,8 @@ ses_path_iter_devid_callback(enc_softc_t *enc, enc_element_t *elem,
 	cdm.match_buf_len   = sizeof(match_result);
 	cdm.matches         = &match_result;
 
-	sim = xpt_path_sim(cdm.ccb_h.path);
-	CAM_SIM_LOCK(sim);
 	xpt_action((union ccb *)&cdm);
 	xpt_free_path(cdm.ccb_h.path);
-	CAM_SIM_UNLOCK(sim);
 
 	if ((cdm.ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP
 	 || (cdm.status != CAM_DEV_MATCH_LAST
@@ -927,18 +923,15 @@ ses_path_iter_devid_callback(enc_softc_t *enc, enc_element_t *elem,
 		return;
 
 	device_match = &match_result.result.device_result;
-	if (xpt_create_path_unlocked(&cdm.ccb_h.path, /*periph*/NULL,
-				     device_match->path_id,
-				     device_match->target_id,
-				     device_match->target_lun) != CAM_REQ_CMP)
+	if (xpt_create_path(&cdm.ccb_h.path, /*periph*/NULL,
+			     device_match->path_id,
+			     device_match->target_id,
+			     device_match->target_lun) != CAM_REQ_CMP)
 		return;
 
 	args->callback(enc, elem, cdm.ccb_h.path, args->callback_arg);
 
-	sim = xpt_path_sim(cdm.ccb_h.path);
-	CAM_SIM_LOCK(sim);
 	xpt_free_path(cdm.ccb_h.path);
-	CAM_SIM_UNLOCK(sim);
 }
 
 /**
@@ -1186,7 +1179,7 @@ ses_set_timed_completion(enc_softc_t *enc, uint8_t tc_en)
 	if (mode_buf == NULL)
 		goto out;
 
-	scsi_mode_sense(&ccb->csio, /*retries*/4, enc_done, MSG_SIMPLE_Q_TAG,
+	scsi_mode_sense(&ccb->csio, /*retries*/4, NULL, MSG_SIMPLE_Q_TAG,
 	    /*dbd*/FALSE, SMS_PAGE_CTRL_CURRENT, SES_MGMT_MODE_PAGE_CODE,
 	    mode_buf, mode_buf_len, SSD_FULL_SIZE, /*timeout*/60 * 1000);
 
@@ -1214,7 +1207,7 @@ ses_set_timed_completion(enc_softc_t *enc, uint8_t tc_en)
 	/* SES2r20: a completion time of zero means as long as possible */
 	bzero(&mgmt->max_comp_time, sizeof(mgmt->max_comp_time));
 
-	scsi_mode_select(&ccb->csio, 5, enc_done, MSG_SIMPLE_Q_TAG,
+	scsi_mode_select(&ccb->csio, 5, NULL, MSG_SIMPLE_Q_TAG,
 	    /*page_fmt*/FALSE, /*save_pages*/TRUE, mode_buf, mode_buf_len,
 	    SSD_FULL_SIZE, /*timeout*/60 * 1000);
 
@@ -2030,12 +2023,12 @@ ses_fill_rcv_diag_io(enc_softc_t *enc, struct enc_fsm_state *state,
 
 	if (enc->enc_type == ENC_SEMB_SES) {
 		semb_receive_diagnostic_results(&ccb->ataio, /*retries*/5,
-					enc_done, MSG_SIMPLE_Q_TAG, /*pcv*/1,
+					NULL, MSG_SIMPLE_Q_TAG, /*pcv*/1,
 					state->page_code, buf, state->buf_size,
 					state->timeout);
 	} else {
 		scsi_receive_diagnostic_results(&ccb->csio, /*retries*/5,
-					enc_done, MSG_SIMPLE_Q_TAG, /*pcv*/1,
+					NULL, MSG_SIMPLE_Q_TAG, /*pcv*/1,
 					state->page_code, buf, state->buf_size,
 					SSD_FULL_SIZE, state->timeout);
 	}
@@ -2153,12 +2146,12 @@ ses_fill_control_request(enc_softc_t *enc, struct enc_fsm_state *state,
 
 	/* Fill out the ccb */
 	if (enc->enc_type == ENC_SEMB_SES) {
-		semb_send_diagnostic(&ccb->ataio, /*retries*/5, enc_done,
+		semb_send_diagnostic(&ccb->ataio, /*retries*/5, NULL,
 			     MSG_SIMPLE_Q_TAG,
 			     buf, ses_page_length(&ses_cache->status_page->hdr),
 			     state->timeout);
 	} else {
-		scsi_send_diagnostic(&ccb->csio, /*retries*/5, enc_done,
+		scsi_send_diagnostic(&ccb->csio, /*retries*/5, NULL,
 			     MSG_SIMPLE_Q_TAG, /*unit_offline*/0,
 			     /*device_offline*/0, /*self_test*/0,
 			     /*page_format*/1, /*self_test_code*/0,
diff --git a/sys/cam/scsi/scsi_pass.c b/sys/cam/scsi/scsi_pass.c
index 6ce9bb0dbb6..158e90f0930 100644
--- a/sys/cam/scsi/scsi_pass.c
+++ b/sys/cam/scsi/scsi_pass.c
@@ -65,8 +65,7 @@ typedef enum {
 } pass_state;
 
 typedef enum {
-	PASS_CCB_BUFFER_IO,
-	PASS_CCB_WAITING
+	PASS_CCB_BUFFER_IO
 } pass_ccb_types;
 
 #define ccb_type	ppriv_field0
@@ -94,12 +93,9 @@ static	periph_init_t	passinit;
 static	periph_ctor_t	passregister;
 static	periph_oninv_t	passoninvalidate;
 static	periph_dtor_t	passcleanup;
-static	periph_start_t	passstart;
 static void		pass_add_physpath(void *context, int pending);
 static	void		passasync(void *callback_arg, u_int32_t code,
 				  struct cam_path *path, void *arg);
-static	void		passdone(struct cam_periph *periph, 
-				 union ccb *done_ccb);
 static	int		passerror(union ccb *ccb, u_int32_t cam_flags, 
 				  u_int32_t sense_flags);
 static 	int		passsendccb(struct cam_periph *periph, union ccb *ccb,
@@ -143,20 +139,19 @@ passinit(void)
 static void
 passdevgonecb(void *arg)
 {
-	struct cam_sim    *sim;
 	struct cam_periph *periph;
+	struct mtx *mtx;
 	struct pass_softc *softc;
 	int i;
 
 	periph = (struct cam_periph *)arg;
-	sim = periph->sim;
-	softc = (struct pass_softc *)periph->softc;
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 
+	softc = (struct pass_softc *)periph->softc;
 	KASSERT(softc->open_count >= 0, ("Negative open count %d",
 		softc->open_count));
 
-	mtx_lock(sim->mtx);
-
 	/*
 	 * When we get this callback, we will get no more close calls from
 	 * devfs.  So if we have any dangling opens, we need to release the
@@ -173,13 +168,13 @@ passdevgonecb(void *arg)
 	cam_periph_release_locked(periph);
 
 	/*
-	 * We reference the SIM lock directly here, instead of using
+	 * We reference the lock directly here, instead of using
 	 * cam_periph_unlock().  The reason is that the final call to
 	 * cam_periph_release_locked() above could result in the periph
 	 * getting freed.  If that is the case, dereferencing the periph
 	 * with a cam_periph_unlock() call would cause a page fault.
 	 */
-	mtx_unlock(sim->mtx);
+	mtx_unlock(mtx);
 }
 
 static void
@@ -207,11 +202,6 @@ passoninvalidate(struct cam_periph *periph)
 	 * XXX Handle any transactions queued to the card
 	 *     with XPT_ABORT_CCB.
 	 */
-
-	if (bootverbose) {
-		xpt_print(periph->path, "lost device\n");
-	}
-
 }
 
 static void
@@ -221,8 +211,6 @@ passcleanup(struct cam_periph *periph)
 
 	softc = (struct pass_softc *)periph->softc;
 
-	if (bootverbose)
-		xpt_print(periph->path, "removing device entry\n");
 	devstat_remove_entry(softc->device_stats);
 
 	cam_periph_unlock(periph);
@@ -302,8 +290,8 @@ passasync(void *callback_arg, u_int32_t code,
 		 * process.
 		 */
 		status = cam_periph_alloc(passregister, passoninvalidate,
-					  passcleanup, passstart, "pass",
-					  CAM_PERIPH_BIO, cgd->ccb_h.path,
+					  passcleanup, NULL, "pass",
+					  CAM_PERIPH_BIO, path,
 					  passasync, AC_FOUND_DEVICE, cgd);
 
 		if (status != CAM_REQ_CMP
@@ -505,25 +493,23 @@ passopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 static int
 passclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
-	struct  cam_sim    *sim;
 	struct 	cam_periph *periph;
 	struct  pass_softc *softc;
+	struct mtx *mtx;
 
 	periph = (struct cam_periph *)dev->si_drv1;
 	if (periph == NULL)
 		return (ENXIO);	
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 
-	sim = periph->sim;
 	softc = periph->softc;
-
-	mtx_lock(sim->mtx);
-
 	softc->open_count--;
 
 	cam_periph_release_locked(periph);
 
 	/*
-	 * We reference the SIM lock directly here, instead of using
+	 * We reference the lock directly here, instead of using
 	 * cam_periph_unlock().  The reason is that the call to
 	 * cam_periph_release_locked() above could result in the periph
 	 * getting freed.  If that is the case, dereferencing the periph
@@ -534,46 +520,11 @@ passclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 	 * protect the open count and avoid another lock acquisition and
 	 * release.
 	 */
-	mtx_unlock(sim->mtx);
+	mtx_unlock(mtx);
 
 	return (0);
 }
 
-static void
-passstart(struct cam_periph *periph, union ccb *start_ccb)
-{
-	struct pass_softc *softc;
-
-	softc = (struct pass_softc *)periph->softc;
-
-	switch (softc->state) {
-	case PASS_STATE_NORMAL:
-		start_ccb->ccb_h.ccb_type = PASS_CCB_WAITING;			
-		SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-				  periph_links.sle);
-		periph->immediate_priority = CAM_PRIORITY_NONE;
-		wakeup(&periph->ccb_list);
-		break;
-	}
-}
-
-static void
-passdone(struct cam_periph *periph, union ccb *done_ccb)
-{ 
-	struct pass_softc *softc;
-	struct ccb_scsiio *csio;
-
-	softc = (struct pass_softc *)periph->softc;
-	csio = &done_ccb->csio;
-	switch (csio->ccb_h.ccb_type) {
-	case PASS_CCB_WAITING:
-		/* Caller will release the CCB */
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
-	}
-	xpt_release_ccb(done_ccb);
-}
-
 static int
 passioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *td)
 {
@@ -692,12 +643,6 @@ passsendccb(struct cam_periph *periph, union ccb *ccb, union ccb *inccb)
 	 */
 	xpt_merge_ccb(ccb, inccb);
 
-	/*
-	 * There's no way for the user to have a completion
-	 * function, so we put our own completion function in here.
-	 */
-	ccb->ccb_h.cbfcnp = passdone;
-
 	/*
 	 * Let cam_periph_mapmem do a sanity check on the data pointer format.
 	 * Even if no data transfer is needed, it's a cheap check and it
diff --git a/sys/cam/scsi/scsi_pt.c b/sys/cam/scsi/scsi_pt.c
index b30fbbfd3e9..f34748c3cd5 100644
--- a/sys/cam/scsi/scsi_pt.c
+++ b/sys/cam/scsi/scsi_pt.c
@@ -66,7 +66,6 @@ typedef enum {
 
 typedef enum {
 	PT_CCB_BUFFER_IO	= 0x01,
-	PT_CCB_WAITING		= 0x02,
 	PT_CCB_RETRY_UA		= 0x04,
 	PT_CCB_BUFFER_IO_UA	= PT_CCB_BUFFER_IO|PT_CCB_RETRY_UA
 } pt_ccb_state;
@@ -333,8 +332,6 @@ ptoninvalidate(struct cam_periph *periph)
 	 *     with XPT_ABORT_CCB.
 	 */
 	bioq_flush(&softc->bio_queue, NULL, ENXIO);
-
-	xpt_print(periph->path, "lost device\n");
 }
 
 static void
@@ -344,7 +341,6 @@ ptdtor(struct cam_periph *periph)
 
 	softc = (struct pt_softc *)periph->softc;
 
-	xpt_print(periph->path, "removing device entry\n");
 	devstat_remove_entry(softc->device_stats);
 	cam_periph_unlock(periph);
 	destroy_dev(softc->dev);
@@ -381,7 +377,7 @@ ptasync(void *callback_arg, u_int32_t code, struct cam_path *path, void *arg)
 		 */
 		status = cam_periph_alloc(ptctor, ptoninvalidate, ptdtor,
 					  ptstart, "pt", CAM_PERIPH_BIO,
-					  cgd->ccb_h.path, ptasync,
+					  path, ptasync,
 					  AC_FOUND_DEVICE, cgd);
 
 		if (status != CAM_REQ_CMP
@@ -426,15 +422,7 @@ ptstart(struct cam_periph *periph, union ccb *start_ccb)
 	 * See if there is a buf with work for us to do..
 	 */
 	bp = bioq_first(&softc->bio_queue);
-	if (periph->immediate_priority <= periph->pinfo.priority) {
-		CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE,
-				("queuing for immediate ccb\n"));
-		start_ccb->ccb_h.ccb_state = PT_CCB_WAITING;
-		SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-				  periph_links.sle);
-		periph->immediate_priority = CAM_PRIORITY_NONE;
-		wakeup(&periph->ccb_list);
-	} else if (bp == NULL) {
+	if (bp == NULL) {
 		xpt_release_ccb(start_ccb);
 	} else {
 		bioq_remove(&softc->bio_queue, bp);
@@ -557,10 +545,6 @@ ptdone(struct cam_periph *periph, union ccb *done_ccb)
 		biofinish(bp, softc->device_stats, 0);
 		break;
 	}
-	case PT_CCB_WAITING:
-		/* Caller will release the CCB */
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
 	}
 	xpt_release_ccb(done_ccb);
 }
diff --git a/sys/cam/scsi/scsi_sa.c b/sys/cam/scsi/scsi_sa.c
index 6b941e01eee..c1cd0f0bfdf 100644
--- a/sys/cam/scsi/scsi_sa.c
+++ b/sys/cam/scsi/scsi_sa.c
@@ -114,7 +114,6 @@ typedef enum {
 #define ccb_bp	 	ppriv_ptr1
 
 #define	SA_CCB_BUFFER_IO	0x0
-#define	SA_CCB_WAITING		0x1
 #define	SA_CCB_TYPEMASK		0x1
 #define	SA_POSITION_UPDATED	0x2
 
@@ -1401,9 +1400,6 @@ saoninvalidate(struct cam_periph *periph)
 	 */
 	bioq_flush(&softc->bio_queue, NULL, ENXIO);
 	softc->queue_count = 0;
-
-	xpt_print(periph->path, "lost device\n");
-
 }
 
 static void
@@ -1414,7 +1410,6 @@ sacleanup(struct cam_periph *periph)
 
 	softc = (struct sa_softc *)periph->softc;
 
-	xpt_print(periph->path, "removing device entry\n");
 	devstat_remove_entry(softc->device_stats);
 	cam_periph_unlock(periph);
 	destroy_dev(softc->devs.ctl_dev);
@@ -1457,7 +1452,7 @@ saasync(void *callback_arg, u_int32_t code,
 		 */
 		status = cam_periph_alloc(saregister, saoninvalidate,
 					  sacleanup, sastart,
-					  "sa", CAM_PERIPH_BIO, cgd->ccb_h.path,
+					  "sa", CAM_PERIPH_BIO, path,
 					  saasync, AC_FOUND_DEVICE, cgd);
 
 		if (status != CAM_REQ_CMP
@@ -1726,15 +1721,7 @@ sastart(struct cam_periph *periph, union ccb *start_ccb)
 		 * See if there is a buf with work for us to do..
 		 */
 		bp = bioq_first(&softc->bio_queue);
-		if (periph->immediate_priority <= periph->pinfo.priority) {
-			CAM_DEBUG_PRINT(CAM_DEBUG_SUBTRACE,
-					("queuing for immediate ccb\n"));
-			Set_CCB_Type(start_ccb, SA_CCB_WAITING);
-			SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-					  periph_links.sle);
-			periph->immediate_priority = CAM_PRIORITY_NONE;
-			wakeup(&periph->ccb_list);
-		} else if (bp == NULL) {
+		if (bp == NULL) {
 			xpt_release_ccb(start_ccb);
 		} else if ((softc->flags & SA_FLAG_ERR_PENDING) != 0) {
 			struct bio *done_bp;
@@ -1957,12 +1944,6 @@ sadone(struct cam_periph *periph, union ccb *done_ccb)
 		biofinish(bp, softc->device_stats, 0);
 		break;
 	}
-	case SA_CCB_WAITING:
-	{
-		/* Caller will release the CCB */
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
-	}
 	}
 	xpt_release_ccb(done_ccb);
 }
@@ -2549,7 +2530,8 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs)
 		/*
 		 * If a read/write command, we handle it here.
 		 */
-		if (CCB_Type(csio) != SA_CCB_WAITING) {
+		if (csio->cdb_io.cdb_bytes[0] == SA_READ ||
+		    csio->cdb_io.cdb_bytes[0] == SA_WRITE) {
 			break;
 		}
 		/*
diff --git a/sys/cam/scsi/scsi_sg.c b/sys/cam/scsi/scsi_sg.c
index 1ad78ade98f..f1cb75bf283 100644
--- a/sys/cam/scsi/scsi_sg.c
+++ b/sys/cam/scsi/scsi_sg.c
@@ -76,8 +76,7 @@ typedef enum {
 } sg_rdwr_state;
 
 typedef enum {
-	SG_CCB_RDWR_IO,
-	SG_CCB_WAITING
+	SG_CCB_RDWR_IO
 } sg_ccb_types;
 
 #define ccb_type	ppriv_field0
@@ -119,7 +118,6 @@ static periph_init_t	sginit;
 static periph_ctor_t	sgregister;
 static periph_oninv_t	sgoninvalidate;
 static periph_dtor_t	sgcleanup;
-static periph_start_t	sgstart;
 static void		sgasync(void *callback_arg, uint32_t code,
 				struct cam_path *path, void *arg);
 static void		sgdone(struct cam_periph *periph, union ccb *done_ccb);
@@ -172,20 +170,19 @@ sginit(void)
 static void
 sgdevgonecb(void *arg)
 {
-	struct cam_sim    *sim;
 	struct cam_periph *periph;
 	struct sg_softc *softc;
+	struct mtx *mtx;
 	int i;
 
 	periph = (struct cam_periph *)arg;
-	sim = periph->sim;
-	softc = (struct sg_softc *)periph->softc;
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 
+	softc = (struct sg_softc *)periph->softc;
 	KASSERT(softc->open_count >= 0, ("Negative open count %d",
 		softc->open_count));
 
-	mtx_lock(sim->mtx);
-
 	/*
 	 * When we get this callback, we will get no more close calls from
 	 * devfs.  So if we have any dangling opens, we need to release the
@@ -202,13 +199,13 @@ sgdevgonecb(void *arg)
 	cam_periph_release_locked(periph);
 
 	/*
-	 * We reference the SIM lock directly here, instead of using
+	 * We reference the lock directly here, instead of using
 	 * cam_periph_unlock().  The reason is that the final call to
 	 * cam_periph_release_locked() above could result in the periph
 	 * getting freed.  If that is the case, dereferencing the periph
 	 * with a cam_periph_unlock() call would cause a page fault.
 	 */
-	mtx_unlock(sim->mtx);
+	mtx_unlock(mtx);
 }
 
 
@@ -238,9 +235,6 @@ sgoninvalidate(struct cam_periph *periph)
 	 *     with XPT_ABORT_CCB.
 	 */
 
-	if (bootverbose) {
-		xpt_print(periph->path, "lost device\n");
-	}
 }
 
 static void
@@ -249,8 +243,6 @@ sgcleanup(struct cam_periph *periph)
 	struct sg_softc *softc;
 
 	softc = (struct sg_softc *)periph->softc;
-	if (bootverbose)
-		xpt_print(periph->path, "removing device entry\n");
 
 	devstat_remove_entry(softc->device_stats);
 
@@ -282,8 +274,8 @@ sgasync(void *callback_arg, uint32_t code, struct cam_path *path, void *arg)
 		 * start the probe process.
 		 */
 		status = cam_periph_alloc(sgregister, sgoninvalidate,
-					  sgcleanup, sgstart, "sg",
-					  CAM_PERIPH_BIO, cgd->ccb_h.path,
+					  sgcleanup, NULL, "sg",
+					  CAM_PERIPH_BIO, path,
 					  sgasync, AC_FOUND_DEVICE, cgd);
 		if ((status != CAM_REQ_CMP) && (status != CAM_REQ_INPROG)) {
 			const struct cam_status_entry *entry;
@@ -387,24 +379,6 @@ sgregister(struct cam_periph *periph, void *arg)
 	return (CAM_REQ_CMP);
 }
 
-static void
-sgstart(struct cam_periph *periph, union ccb *start_ccb)
-{
-	struct sg_softc *softc;
-
-	softc = (struct sg_softc *)periph->softc;
-
-	switch (softc->state) {
-	case SG_STATE_NORMAL:
-		start_ccb->ccb_h.ccb_type = SG_CCB_WAITING;
-		SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-				  periph_links.sle);
-		periph->immediate_priority = CAM_PRIORITY_NONE;
-		wakeup(&periph->ccb_list);
-		break;
-	}
-}
-
 static void
 sgdone(struct cam_periph *periph, union ccb *done_ccb)
 {
@@ -414,10 +388,6 @@ sgdone(struct cam_periph *periph, union ccb *done_ccb)
 	softc = (struct sg_softc *)periph->softc;
 	csio = &done_ccb->csio;
 	switch (csio->ccb_h.ccb_type) {
-	case SG_CCB_WAITING:
-		/* Caller will release the CCB */
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
 	case SG_CCB_RDWR_IO:
 	{
 		struct sg_rdwr *rdwr;
@@ -485,25 +455,23 @@ sgopen(struct cdev *dev, int flags, int fmt, struct thread *td)
 static int
 sgclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 {
-	struct cam_sim    *sim;
 	struct cam_periph *periph;
 	struct sg_softc   *softc;
+	struct mtx *mtx;
 
 	periph = (struct cam_periph *)dev->si_drv1;
 	if (periph == NULL)
 		return (ENXIO);
+	mtx = cam_periph_mtx(periph);
+	mtx_lock(mtx);
 
-	sim = periph->sim;
 	softc = periph->softc;
-
-	mtx_lock(sim->mtx);
-
 	softc->open_count--;
 
 	cam_periph_release_locked(periph);
 
 	/*
-	 * We reference the SIM lock directly here, instead of using
+	 * We reference the lock directly here, instead of using
 	 * cam_periph_unlock().  The reason is that the call to
 	 * cam_periph_release_locked() above could result in the periph
 	 * getting freed.  If that is the case, dereferencing the periph
@@ -514,7 +482,7 @@ sgclose(struct cdev *dev, int flag, int fmt, struct thread *td)
 	 * protect the open count and avoid another lock acquisition and
 	 * release.
 	 */
-	mtx_unlock(sim->mtx);
+	mtx_unlock(mtx);
 
 	return (0);
 }
@@ -884,7 +852,7 @@ search:
 			break;
 	}
 	if ((rdwr == NULL) || (rdwr->state != SG_RDWR_DONE)) {
-		if (msleep(rdwr, periph->sim->mtx, PCATCH, "sgread", 0) == ERESTART)
+		if (cam_periph_sleep(periph, rdwr, PCATCH, "sgread", 0) == ERESTART)
 			return (EAGAIN);
 		goto search;
 	}
diff --git a/sys/cam/scsi/scsi_targ_bh.c b/sys/cam/scsi/scsi_targ_bh.c
index bcf4eea579d..5a4a39b537c 100644
--- a/sys/cam/scsi/scsi_targ_bh.c
+++ b/sys/cam/scsi/scsi_targ_bh.c
@@ -65,8 +65,7 @@ typedef enum {
 } targbh_flags;
 
 typedef enum {
-	TARGBH_CCB_WORKQ,
-	TARGBH_CCB_WAITING
+	TARGBH_CCB_WORKQ
 } targbh_ccb_types;
 
 #define MAX_ACCEPT	8
@@ -431,7 +430,7 @@ targbhdtor(struct cam_periph *periph)
 		/* FALLTHROUGH */
 	default:
 		/* XXX Wait for callback of targbhdislun() */
-		msleep(softc, periph->sim->mtx, PRIBIO, "targbh", hz/2);
+		cam_periph_sleep(periph, softc, PRIBIO, "targbh", hz/2);
 		free(softc, M_SCSIBH);
 		break;
 	}
@@ -450,13 +449,7 @@ targbhstart(struct cam_periph *periph, union ccb *start_ccb)
 	softc = (struct targbh_softc *)periph->softc;
 	
 	ccbh = TAILQ_FIRST(&softc->work_queue);
-	if (periph->immediate_priority <= periph->pinfo.priority) {
-		start_ccb->ccb_h.ccb_type = TARGBH_CCB_WAITING;			
-		SLIST_INSERT_HEAD(&periph->ccb_list, &start_ccb->ccb_h,
-				  periph_links.sle);
-		periph->immediate_priority = CAM_PRIORITY_NONE;
-		wakeup(&periph->ccb_list);
-	} else if (ccbh == NULL) {
+	if (ccbh == NULL) {
 		xpt_release_ccb(start_ccb);	
 	} else {
 		TAILQ_REMOVE(&softc->work_queue, ccbh, periph_links.tqe);
@@ -535,12 +528,6 @@ targbhdone(struct cam_periph *periph, union ccb *done_ccb)
 
 	softc = (struct targbh_softc *)periph->softc;
 
-	if (done_ccb->ccb_h.ccb_type == TARGBH_CCB_WAITING) {
-		/* Caller will release the CCB */
-		wakeup(&done_ccb->ccb_h.cbfcnp);
-		return;
-	}
-
 	switch (done_ccb->ccb_h.func_code) {
 	case XPT_ACCEPT_TARGET_IO:
 	{
diff --git a/sys/cam/scsi/scsi_target.c b/sys/cam/scsi/scsi_target.c
index 4b4ad78df2e..42dc15275e8 100644
--- a/sys/cam/scsi/scsi_target.c
+++ b/sys/cam/scsi/scsi_target.c
@@ -236,23 +236,21 @@ targioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *t
 	{
 		struct ioc_enable_lun	*new_lun;
 		struct cam_path		*path;
-		struct cam_sim		*sim;
 
 		new_lun = (struct ioc_enable_lun *)addr;
-		status = xpt_create_path_unlocked(&path, /*periph*/NULL,
-						  new_lun->path_id,
-						  new_lun->target_id,
-						  new_lun->lun_id);
+		status = xpt_create_path(&path, /*periph*/NULL,
+					  new_lun->path_id,
+					  new_lun->target_id,
+					  new_lun->lun_id);
 		if (status != CAM_REQ_CMP) {
 			printf("Couldn't create path, status %#x\n", status);
 			break;
 		}
-		sim = xpt_path_sim(path);
-		mtx_lock(sim->mtx);
+		xpt_path_lock(path);
 		status = targenable(softc, path, new_lun->grp6_len,
 				    new_lun->grp7_len);
+		xpt_path_unlock(path);
 		xpt_free_path(path);
-		mtx_unlock(sim->mtx);
 		break;
 	}
 	case TARGIOCDISABLE:
@@ -278,13 +276,10 @@ targioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, struct thread *t
 			cdbg.flags = CAM_DEBUG_PERIPH;
 		else
 			cdbg.flags = CAM_DEBUG_NONE;
-		cam_periph_lock(softc->periph);
 		xpt_setup_ccb(&cdbg.ccb_h, softc->path, CAM_PRIORITY_NORMAL);
 		cdbg.ccb_h.func_code = XPT_DEBUG;
 		cdbg.ccb_h.cbfcnp = targdone;
-
 		xpt_action((union ccb *)&cdbg);
-		cam_periph_unlock(softc->periph);
 		status = cdbg.ccb_h.status & CAM_STATUS_MASK;
 		break;
 	}
@@ -823,7 +818,7 @@ targread(struct cdev *dev, struct uio *uio, int ioflag)
 	user_descr = TAILQ_FIRST(abort_queue);
 	while (ccb_h == NULL && user_descr == NULL) {
 		if ((ioflag & IO_NDELAY) == 0) {
-			error = msleep(user_queue, softc->periph->sim->mtx,
+			error = cam_periph_sleep(softc->periph, user_queue,
 			    PRIBIO | PCATCH, "targrd", 0);
 			ccb_h = TAILQ_FIRST(user_queue);
 			user_descr = TAILQ_FIRST(abort_queue);
@@ -1019,7 +1014,6 @@ abort_all_pending(struct targ_softc *softc)
 	struct targ_cmd_descr   *descr;
 	struct ccb_abort	 cab;
 	struct ccb_hdr		*ccb_h;
-	struct cam_sim		*sim;
 
 	CAM_DEBUG(softc->path, CAM_DEBUG_PERIPH, ("abort_all_pending\n"));
 
@@ -1052,8 +1046,7 @@ abort_all_pending(struct targ_softc *softc)
 
 	/* If we aborted at least one pending CCB ok, wait for it. */
 	if (cab.ccb_h.status == CAM_REQ_CMP) {
-		sim = xpt_path_sim(softc->path);
-		msleep(&softc->pending_ccb_queue, sim->mtx,
+		cam_periph_sleep(softc->periph, &softc->pending_ccb_queue,
 		       PRIBIO | PCATCH, "tgabrt", 0);
 	}
 
diff --git a/sys/cam/scsi/scsi_xpt.c b/sys/cam/scsi/scsi_xpt.c
index 609742b6a78..69752e1d0f7 100644
--- a/sys/cam/scsi/scsi_xpt.c
+++ b/sys/cam/scsi/scsi_xpt.c
@@ -100,6 +100,12 @@ SYSCTL_PROC(_kern_cam, OID_AUTO, cam_srch_hi, CTLTYPE_INT|CTLFLAG_RW, 0, 0,
 		(lval) <<= 8;						\
 		(lval) |=  (lp)->luns[(i)].lundata[1];			\
 	}
+#define	CAM_GET_LUN(lp, i, lval)					\
+	(lval) = scsi_4btoul((lp)->luns[(i)].lundata);			\
+	(lval) = ((lval) >> 16) | ((lval) << 16);
+#define CAM_LUN_ONLY_32BITS(lp, i)				\
+	(scsi_4btoul(&((lp)->luns[(i)].lundata[4])) == 0)
+
 /*
  * If we're not quirked to search <= the first 8 luns
  * and we are either quirked to search above lun 8,
@@ -175,7 +181,8 @@ do {									\
 typedef enum {
 	PROBE_INQUIRY_CKSUM	= 0x01,
 	PROBE_SERIAL_CKSUM	= 0x02,
-	PROBE_NO_ANNOUNCE	= 0x04
+	PROBE_NO_ANNOUNCE	= 0x04,
+	PROBE_EXTLUN		= 0x08
 } probe_flags;
 
 typedef struct {
@@ -561,10 +568,9 @@ static void	 proberequestdefaultnegotiation(struct cam_periph *periph);
 static int       proberequestbackoff(struct cam_periph *periph,
 				     struct cam_ed *device);
 static void	 probedone(struct cam_periph *periph, union ccb *done_ccb);
-static int	 probe_strange_rpl_data(struct scsi_report_luns_data *rp,
-					uint32_t maxlun);
 static void	 probe_purge_old(struct cam_path *path,
-				 struct scsi_report_luns_data *new);
+				 struct scsi_report_luns_data *new,
+				 probe_flags flags);
 static void	 probecleanup(struct cam_periph *periph);
 static void	 scsi_find_quirk(struct cam_ed *device);
 static void	 scsi_scan_bus(struct cam_periph *periph, union ccb *ccb);
@@ -577,7 +583,7 @@ static struct cam_ed *
 				   lun_id_t lun_id);
 static void	 scsi_devise_transport(struct cam_path *path);
 static void	 scsi_set_transfer_settings(struct ccb_trans_settings *cts,
-					    struct cam_ed *device,
+					    struct cam_path *path,
 					    int async_update);
 static void	 scsi_toggle_tags(struct cam_path *path);
 static void	 scsi_dev_async(u_int32_t async_code,
@@ -639,6 +645,7 @@ proberegister(struct cam_periph *periph, void *arg)
 		return (status);
 	}
 	CAM_DEBUG(periph->path, CAM_DEBUG_PROBE, ("Probe started\n"));
+	scsi_devise_transport(periph->path);
 
 	/*
 	 * Ensure we've waited at least a bus settle
@@ -699,6 +706,11 @@ probeschedule(struct cam_periph *periph)
 	else
 		softc->flags &= ~PROBE_NO_ANNOUNCE;
 
+	if (cpi.hba_misc & PIM_EXTLUNS)
+		softc->flags |= PROBE_EXTLUN;
+	else
+		softc->flags &= ~PROBE_EXTLUN;
+
 	xpt_schedule(periph, CAM_PRIORITY_XPT);
 }
 
@@ -1277,13 +1289,6 @@ out:
 			 */
 			free(lp, M_CAMXPT);
 			lp = NULL;
-		} else if (probe_strange_rpl_data(lp, maxlun)) {
-			/*
-			 * If we can't understand the lun format
-			 * of any entry, bail.
-			 */
-			free(lp, M_CAMXPT);
-			lp = NULL;
 		} else {
 			lun_id_t lun;
 			int idx;
@@ -1291,14 +1296,14 @@ out:
 			CAM_DEBUG(path, CAM_DEBUG_PROBE,
 			   ("Probe: %u lun(s) reported\n", nlun));
 
-			CAM_GET_SIMPLE_LUN(lp, 0, lun);
+			CAM_GET_LUN(lp, 0, lun);
 			/*
 			 * If the first lun is not lun 0, then either there
 			 * is no lun 0 in the list, or the list is unsorted.
 			 */
 			if (lun != 0) {
 				for (idx = 0; idx < nlun; idx++) {
-					CAM_GET_SIMPLE_LUN(lp, idx, lun);
+					CAM_GET_LUN(lp, idx, lun);
 					if (lun == 0) {
 						break;
 					}
@@ -1330,7 +1335,7 @@ out:
 			 * This function will also install the new list
 			 * in the target structure.
 			 */
-			probe_purge_old(path, lp);
+			probe_purge_old(path, lp, softc->flags);
 			lp = NULL;
 		}
 		if (path->device->flags & CAM_DEV_INQUIRY_DATA_VALID) {
@@ -1702,36 +1707,25 @@ probe_device_check:
 	}
 }
 
-static int
-probe_strange_rpl_data(struct scsi_report_luns_data *rp, uint32_t maxlun)
-{
-	uint32_t idx;
-	uint32_t nlun = MIN(maxlun, (scsi_4btoul(rp->length) / 8));
-
-	for (idx = 0; idx < nlun; idx++) {
-		if (!CAM_CAN_GET_SIMPLE_LUN(rp, idx)) {
-			return (-1);
-		}
-	}
-	return (0);
-}
-
 static void
-probe_purge_old(struct cam_path *path, struct scsi_report_luns_data *new)
+probe_purge_old(struct cam_path *path, struct scsi_report_luns_data *new,
+    probe_flags flags)
 {
 	struct cam_path *tp;
 	struct scsi_report_luns_data *old;
-	u_int idx1, idx2, nlun_old, nlun_new, this_lun;
+	u_int idx1, idx2, nlun_old, nlun_new;
+	lun_id_t this_lun;
 	u_int8_t *ol, *nl;
 
 	if (path->target == NULL) {
 		return;
 	}
-	if (path->target->luns == NULL) {
-		path->target->luns = new;
-		return;
-	}
+	mtx_lock(&path->target->luns_mtx);
 	old = path->target->luns;
+	path->target->luns = new;
+	mtx_unlock(&path->target->luns_mtx);
+	if (old == NULL)
+		return;
 	nlun_old = scsi_4btoul(old->length) / 8;
 	nlun_new = scsi_4btoul(new->length) / 8;
 
@@ -1755,17 +1749,26 @@ probe_purge_old(struct cam_path *path, struct scsi_report_luns_data *new)
 		 * that would be what the probe state
 		 * machine is currently working on,
 		 * so we won't do that.
-		 *
-		 * We also cannot nuke it if it is
-		 * not in a lun format we understand.
 		 */
-		if (!CAM_CAN_GET_SIMPLE_LUN(old, idx1)) {
-			continue;
-		}
-		CAM_GET_SIMPLE_LUN(old, idx1, this_lun);
+		CAM_GET_LUN(old, idx1, this_lun);
 		if (this_lun == 0) {
 			continue;
 		}
+
+		/*
+		 * We also cannot nuke it if it is
+		 * not in a lun format we understand
+		 * and replace the LUN with a "simple" LUN
+		 * if that is all the HBA supports.
+		 */
+		if (!(flags & PROBE_EXTLUN)) {
+			if (!CAM_CAN_GET_SIMPLE_LUN(old, idx1))
+				continue;
+			CAM_GET_SIMPLE_LUN(old, idx1, this_lun);
+		}
+		if (!CAM_LUN_ONLY_32BITS(old, idx1))
+			continue;
+
 		if (xpt_create_path(&tp, NULL, xpt_path_path_id(path),
 		    xpt_path_target_id(path), this_lun) == CAM_REQ_CMP) {
 			xpt_async(AC_LOST_DEVICE, tp, NULL);
@@ -1773,7 +1776,6 @@ probe_purge_old(struct cam_path *path, struct scsi_report_luns_data *new)
 		}
 	}
 	free(old, M_CAMXPT);
-	path->target->luns = new;
 }
 
 static void
@@ -1835,6 +1837,8 @@ typedef struct {
 static void
 scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 {
+	struct mtx *mtx;
+
 	CAM_DEBUG(request_ccb->ccb_h.path, CAM_DEBUG_TRACE,
 		  ("scsi_scan_bus\n"));
 	switch (request_ccb->ccb_h.func_code) {
@@ -1902,6 +1906,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 		    (work_ccb->cpi.max_target * sizeof (u_int)), M_CAMXPT, M_ZERO|M_NOWAIT);
 		if (scan_info == NULL) {
 			request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL;
+			xpt_free_ccb(work_ccb);
 			xpt_done(request_ccb);
 			return;
 		}
@@ -1932,6 +1937,8 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 				scan_info->counter--;
 			}
 		}
+		mtx = xpt_path_mtx(scan_info->request_ccb->ccb_h.path);
+		mtx_unlock(mtx);
 
 		for (i = low_target; i <= max_target; i++) {
 			cam_status status;
@@ -1964,10 +1971,13 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 				      request_ccb->ccb_h.pinfo.priority);
 			work_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 			work_ccb->ccb_h.cbfcnp = scsi_scan_bus;
+			work_ccb->ccb_h.flags |= CAM_UNLOCKED;
 			work_ccb->ccb_h.ppriv_ptr0 = scan_info;
 			work_ccb->crcn.flags = request_ccb->crcn.flags;
 			xpt_action(work_ccb);
 		}
+
+		mtx_lock(mtx);
 		break;
 	}
 	case XPT_SCAN_LUN:
@@ -2000,8 +2010,11 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 		target = request_ccb->ccb_h.path->target;
 		next_target = 1;
 
+		mtx = xpt_path_mtx(scan_info->request_ccb->ccb_h.path);
+		mtx_lock(mtx);
+		mtx_lock(&target->luns_mtx);
 		if (target->luns) {
-			uint32_t first;
+			lun_id_t first;
 			u_int nluns = scsi_4btoul(target->luns->length) / 8;
 
 			/*
@@ -2009,21 +2022,48 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 			 * of the list as we've actually just finished probing
 			 * it.
 			 */
-			CAM_GET_SIMPLE_LUN(target->luns, 0, first);
+			CAM_GET_LUN(target->luns, 0, first);
 			if (first == 0 && scan_info->lunindex[target_id] == 0) {
 				scan_info->lunindex[target_id]++;
 			} 
 
+			/*
+			 * Skip any LUNs that the HBA can't deal with.
+			 */
+			while (scan_info->lunindex[target_id] < nluns) {
+				if (scan_info->cpi->hba_misc & PIM_EXTLUNS) {
+					CAM_GET_LUN(target->luns,
+					    scan_info->lunindex[target_id],
+					    lun_id);
+					break;
+				}
+
+				/* XXX print warning? */
+				if (!CAM_LUN_ONLY_32BITS(target->luns,
+				    scan_info->lunindex[target_id]))
+					continue;
+				if (CAM_CAN_GET_SIMPLE_LUN(target->luns,
+				    scan_info->lunindex[target_id])) {
+					CAM_GET_SIMPLE_LUN(target->luns,
+					    scan_info->lunindex[target_id],
+					    lun_id);
+					break;
+				}
+					
+				scan_info->lunindex[target_id]++;
+			}
+
 			if (scan_info->lunindex[target_id] < nluns) {
-				CAM_GET_SIMPLE_LUN(target->luns,
-				    scan_info->lunindex[target_id], lun_id);
+				mtx_unlock(&target->luns_mtx);
 				next_target = 0;
 				CAM_DEBUG(request_ccb->ccb_h.path,
 				    CAM_DEBUG_PROBE,
-				   ("next lun to try at index %u is %u\n",
-				   scan_info->lunindex[target_id], lun_id));
+				   ("next lun to try at index %u is %jx\n",
+				   scan_info->lunindex[target_id],
+				   (uintmax_t)lun_id));
 				scan_info->lunindex[target_id]++;
 			} else {
+				mtx_unlock(&target->luns_mtx);
 				/*
 				 * We're done with scanning all luns.
 				 *
@@ -2042,7 +2082,9 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 					}
 				}
 			}
-		} else if (request_ccb->ccb_h.status != CAM_REQ_CMP) {
+		} else {
+		    mtx_unlock(&target->luns_mtx);
+		    if (request_ccb->ccb_h.status != CAM_REQ_CMP) {
 			int phl;
 
 			/*
@@ -2074,7 +2116,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 			if (lun_id == request_ccb->ccb_h.target_lun
 			    || lun_id > scan_info->cpi->max_lun)
 				next_target = 1;
-		} else {
+		    } else {
 
 			device = request_ccb->ccb_h.path->device;
 
@@ -2090,6 +2132,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 			if (lun_id == request_ccb->ccb_h.target_lun
 			    || lun_id > scan_info->cpi->max_lun)
 				next_target = 1;
+		    }
 		}
 
 		/*
@@ -2123,6 +2166,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 				}
 			}
 			if (done) {
+				mtx_unlock(mtx);
 				xpt_free_ccb(request_ccb);
 				xpt_free_ccb((union ccb *)scan_info->cpi);
 				request_ccb = scan_info->request_ccb;
@@ -2136,6 +2180,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 			}
 
 			if ((scan_info->cpi->hba_misc & PIM_SEQSCAN) == 0) {
+				mtx_unlock(mtx);
 				xpt_free_ccb(request_ccb);
 				break;
 			}
@@ -2143,6 +2188,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 			    scan_info->request_ccb->ccb_h.path_id,
 			    scan_info->counter, 0);
 			if (status != CAM_REQ_CMP) {
+				mtx_unlock(mtx);
 				printf("scsi_scan_bus: xpt_create_path failed"
 				    " with status %#x, bus scan halted\n",
 			       	    status);
@@ -2158,6 +2204,7 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 			    request_ccb->ccb_h.pinfo.priority);
 			request_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 			request_ccb->ccb_h.cbfcnp = scsi_scan_bus;
+			request_ccb->ccb_h.flags |= CAM_UNLOCKED;
 			request_ccb->ccb_h.ppriv_ptr0 = scan_info;
 			request_ccb->crcn.flags =
 			    scan_info->request_ccb->crcn.flags;
@@ -2181,10 +2228,12 @@ scsi_scan_bus(struct cam_periph *periph, union ccb *request_ccb)
 				      request_ccb->ccb_h.pinfo.priority);
 			request_ccb->ccb_h.func_code = XPT_SCAN_LUN;
 			request_ccb->ccb_h.cbfcnp = scsi_scan_bus;
+			request_ccb->ccb_h.flags |= CAM_UNLOCKED;
 			request_ccb->ccb_h.ppriv_ptr0 = scan_info;
 			request_ccb->crcn.flags =
 				scan_info->request_ccb->crcn.flags;
 		}
+		mtx_unlock(mtx);
 		xpt_action(request_ccb);
 		break;
 	}
@@ -2201,6 +2250,7 @@ scsi_scan_lun(struct cam_periph *periph, struct cam_path *path,
 	cam_status status;
 	struct cam_path *new_path;
 	struct cam_periph *old_periph;
+	int lock;
 
 	CAM_DEBUG(path, CAM_DEBUG_TRACE, ("scsi_scan_lun\n"));
 
@@ -2248,9 +2298,13 @@ scsi_scan_lun(struct cam_periph *periph, struct cam_path *path,
 		xpt_setup_ccb(&request_ccb->ccb_h, new_path, CAM_PRIORITY_XPT);
 		request_ccb->ccb_h.cbfcnp = xptscandone;
 		request_ccb->ccb_h.func_code = XPT_SCAN_LUN;
+		request_ccb->ccb_h.flags |= CAM_UNLOCKED;
 		request_ccb->crcn.flags = flags;
 	}
 
+	lock = (xpt_path_owned(path) == 0);
+	if (lock)
+		xpt_path_lock(path);
 	if ((old_periph = cam_periph_find(path, "probe")) != NULL) {
 		if ((old_periph->flags & CAM_PERIPH_INVALID) == 0) {
 			probe_softc *softc;
@@ -2276,6 +2330,8 @@ scsi_scan_lun(struct cam_periph *periph, struct cam_path *path,
 			xpt_done(request_ccb);
 		}
 	}
+	if (lock)
+		xpt_path_unlock(path);
 }
 
 static void
@@ -2289,7 +2345,6 @@ xptscandone(struct cam_periph *periph, union ccb *done_ccb)
 static struct cam_ed *
 scsi_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 {
-	struct cam_path path;
 	struct scsi_quirk_entry *quirk;
 	struct cam_ed *device;
 
@@ -2314,22 +2369,6 @@ scsi_alloc_device(struct cam_eb *bus, struct cam_et *target, lun_id_t lun_id)
 	device->device_id_len = 0;
 	device->supported_vpds = NULL;
 	device->supported_vpds_len = 0;
-
-	/*
-	 * XXX should be limited by number of CCBs this bus can
-	 * do.
-	 */
-	bus->sim->max_ccbs += device->ccbq.devq_openings;
-	if (lun_id != CAM_LUN_WILDCARD) {
-		xpt_compile_path(&path,
-				 NULL,
-				 bus->path_id,
-				 target->target_id,
-				 lun_id);
-		scsi_devise_transport(&path);
-		xpt_release_path(&path);
-	}
-
 	return (device);
 }
 
@@ -2508,15 +2547,8 @@ scsi_dev_advinfo(union ccb *start_ccb)
 	start_ccb->ccb_h.status = CAM_REQ_CMP;
 
 	if (cdai->flags & CDAI_FLAG_STORE) {
-		int owned;
-
-		owned = mtx_owned(start_ccb->ccb_h.path->bus->sim->mtx);
-		if (owned == 0)
-			mtx_lock(start_ccb->ccb_h.path->bus->sim->mtx);
 		xpt_async(AC_ADVINFO_CHANGED, start_ccb->ccb_h.path,
 			  (void *)(uintptr_t)cdai->buftype);
-		if (owned == 0)
-			mtx_unlock(start_ccb->ccb_h.path->bus->sim->mtx);
 	}
 }
 
@@ -2528,7 +2560,7 @@ scsi_action(union ccb *start_ccb)
 	case XPT_SET_TRAN_SETTINGS:
 	{
 		scsi_set_transfer_settings(&start_ccb->cts,
-					   start_ccb->ccb_h.path->device,
+					   start_ccb->ccb_h.path,
 					   /*async_update*/FALSE);
 		break;
 	}
@@ -2541,14 +2573,6 @@ scsi_action(union ccb *start_ccb)
 			      start_ccb->ccb_h.path, start_ccb->crcn.flags,
 			      start_ccb);
 		break;
-	case XPT_GET_TRAN_SETTINGS:
-	{
-		struct cam_sim *sim;
-
-		sim = start_ccb->ccb_h.path->bus->sim;
-		(*(sim->sim_action))(sim, start_ccb);
-		break;
-	}
 	case XPT_DEV_ADVINFO:
 	{
 		scsi_dev_advinfo(start_ccb);
@@ -2561,17 +2585,17 @@ scsi_action(union ccb *start_ccb)
 }
 
 static void
-scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device,
+scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_path *path,
 			   int async_update)
 {
 	struct	ccb_pathinq cpi;
 	struct	ccb_trans_settings cur_cts;
 	struct	ccb_trans_settings_scsi *scsi;
 	struct	ccb_trans_settings_scsi *cur_scsi;
-	struct	cam_sim *sim;
 	struct	scsi_inquiry_data *inq_data;
+	struct	cam_ed *device;
 
-	if (device == NULL) {
+	if (path == NULL || (device = path->device) == NULL) {
 		cts->ccb_h.status = CAM_PATH_INVALID;
 		xpt_done((union ccb *)cts);
 		return;
@@ -2588,14 +2612,14 @@ scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device
 		cts->protocol_version = device->protocol_version;
 
 	if (cts->protocol != device->protocol) {
-		xpt_print(cts->ccb_h.path, "Uninitialized Protocol %x:%x?\n",
+		xpt_print(path, "Uninitialized Protocol %x:%x?\n",
 		       cts->protocol, device->protocol);
 		cts->protocol = device->protocol;
 	}
 
 	if (cts->protocol_version > device->protocol_version) {
 		if (bootverbose) {
-			xpt_print(cts->ccb_h.path, "Down reving Protocol "
+			xpt_print(path, "Down reving Protocol "
 			    "Version from %d to %d?\n", cts->protocol_version,
 			    device->protocol_version);
 		}
@@ -2613,22 +2637,20 @@ scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device
 		cts->transport_version = device->transport_version;
 
 	if (cts->transport != device->transport) {
-		xpt_print(cts->ccb_h.path, "Uninitialized Transport %x:%x?\n",
+		xpt_print(path, "Uninitialized Transport %x:%x?\n",
 		    cts->transport, device->transport);
 		cts->transport = device->transport;
 	}
 
 	if (cts->transport_version > device->transport_version) {
 		if (bootverbose) {
-			xpt_print(cts->ccb_h.path, "Down reving Transport "
+			xpt_print(path, "Down reving Transport "
 			    "Version from %d to %d?\n", cts->transport_version,
 			    device->transport_version);
 		}
 		cts->transport_version = device->transport_version;
 	}
 
-	sim = cts->ccb_h.path->bus->sim;
-
 	/*
 	 * Nothing more of interest to do unless
 	 * this is a device connected via the
@@ -2636,13 +2658,13 @@ scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device
 	 */
 	if (cts->protocol != PROTO_SCSI) {
 		if (async_update == FALSE)
-			(*(sim->sim_action))(sim, (union ccb *)cts);
+			xpt_action_default((union ccb *)cts);
 		return;
 	}
 
 	inq_data = &device->inq_data;
 	scsi = &cts->proto_specific.scsi;
-	xpt_setup_ccb(&cpi.ccb_h, cts->ccb_h.path, CAM_PRIORITY_NONE);
+	xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NONE);
 	cpi.ccb_h.func_code = XPT_PATH_INQ;
 	xpt_action((union ccb *)&cpi);
 
@@ -2663,7 +2685,7 @@ scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device
 		 * Perform sanity checking against what the
 		 * controller and device can do.
 		 */
-		xpt_setup_ccb(&cur_cts.ccb_h, cts->ccb_h.path, CAM_PRIORITY_NONE);
+		xpt_setup_ccb(&cur_cts.ccb_h, path, CAM_PRIORITY_NONE);
 		cur_cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
 		cur_cts.type = cts->type;
 		xpt_action((union ccb *)&cur_cts);
@@ -2784,7 +2806,7 @@ scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device
 		 && (spi->flags & (CTS_SPI_VALID_SYNC_RATE|
 				   CTS_SPI_VALID_SYNC_OFFSET|
 				   CTS_SPI_VALID_BUS_WIDTH)) != 0)
-			scsi_toggle_tags(cts->ccb_h.path);
+			scsi_toggle_tags(path);
 	}
 
 	if (cts->type == CTS_TYPE_CURRENT_SETTINGS
@@ -2821,12 +2843,12 @@ scsi_set_transfer_settings(struct ccb_trans_settings *cts, struct cam_ed *device
 				device->tag_delay_count = CAM_TAG_DELAY_COUNT;
 				device->flags |= CAM_DEV_TAG_AFTER_COUNT;
 			} else {
-				xpt_stop_tags(cts->ccb_h.path);
+				xpt_stop_tags(path);
 			}
 		}
 	}
 	if (async_update == FALSE)
-		(*(sim->sim_action))(sim, (union ccb *)cts);
+		xpt_action_default((union ccb *)cts);
 }
 
 static void
@@ -2854,10 +2876,10 @@ scsi_toggle_tags(struct cam_path *path)
 		cts.transport_version = XPORT_VERSION_UNSPECIFIED;
 		cts.proto_specific.scsi.flags = 0;
 		cts.proto_specific.scsi.valid = CTS_SCSI_VALID_TQ;
-		scsi_set_transfer_settings(&cts, path->device,
+		scsi_set_transfer_settings(&cts, path,
 					  /*async_update*/TRUE);
 		cts.proto_specific.scsi.flags = CTS_SCSI_FLAGS_TAG_ENB;
-		scsi_set_transfer_settings(&cts, path->device,
+		scsi_set_transfer_settings(&cts, path,
 					  /*async_update*/TRUE);
 	}
 }
@@ -2928,10 +2950,14 @@ scsi_dev_async(u_int32_t async_code, struct cam_eb *bus, struct cam_et *target,
 		xpt_release_device(device);
 	} else if (async_code == AC_TRANSFER_NEG) {
 		struct ccb_trans_settings *settings;
+		struct cam_path path;
 
 		settings = (struct ccb_trans_settings *)async_arg;
-		scsi_set_transfer_settings(settings, device,
+		xpt_compile_path(&path, NULL, bus->path_id, target->target_id,
+				 device->lun_id);
+		scsi_set_transfer_settings(settings, &path,
 					  /*async_update*/TRUE);
+		xpt_release_path(&path);
 	}
 }
 
@@ -2945,7 +2971,7 @@ scsi_announce_periph(struct cam_periph *periph)
 	u_int	freq;
 	u_int	mb;
 
-	mtx_assert(periph->sim->mtx, MA_OWNED);
+	cam_periph_assert(periph, MA_OWNED);
 
 	xpt_setup_ccb(&cts.ccb_h, path, CAM_PRIORITY_NORMAL);
 	cts.ccb_h.func_code = XPT_GET_TRAN_SETTINGS;
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c b/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c
index a74f795c88f..2774cf45278 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c
@@ -46,7 +46,7 @@ static void
 system_taskq_init(void *arg)
 {
 
-	taskq_zone = uma_zcreate("taskq_zone", sizeof(struct ostask),
+	taskq_zone = uma_zcreate("taskq_zone", sizeof(taskq_ent_t),
 	    NULL, NULL, NULL, NULL, 0, 0);
 	system_taskq = taskq_create("system_taskq", mp_ncpus, 0, 0, 0, 0);
 }
@@ -104,9 +104,9 @@ taskq_member(taskq_t *tq, kthread_t *thread)
 static void
 taskq_run(void *arg, int pending __unused)
 {
-	struct ostask *task = arg;
+	taskq_ent_t *task = arg;
 
-	task->ost_func(task->ost_arg);
+	task->tqent_func(task->tqent_arg);
 
 	uma_zfree(taskq_zone, task);
 }
@@ -114,14 +114,14 @@ taskq_run(void *arg, int pending __unused)
 taskqid_t
 taskq_dispatch(taskq_t *tq, task_func_t func, void *arg, uint_t flags)
 {
-	struct ostask *task;
+	taskq_ent_t *task;
 	int mflag, prio;
 
 	if ((flags & (TQ_SLEEP | TQ_NOQUEUE)) == TQ_SLEEP)
 		mflag = M_WAITOK;
 	else
 		mflag = M_NOWAIT;
-	/* 
+	/*
 	 * If TQ_FRONT is given, we want higher priority for this task, so it
 	 * can go at the front of the queue.
 	 */
@@ -131,42 +131,44 @@ taskq_dispatch(taskq_t *tq, task_func_t func, void *arg, uint_t flags)
 	if (task == NULL)
 		return (0);
 
-	task->ost_func = func;
-	task->ost_arg = arg;
+	task->tqent_func = func;
+	task->tqent_arg = arg;
 
-	TASK_INIT(&task->ost_task, prio, taskq_run, task);
-	taskqueue_enqueue(tq->tq_queue, &task->ost_task);
+	TASK_INIT(&task->tqent_task, prio, taskq_run, task);
+	taskqueue_enqueue(tq->tq_queue, &task->tqent_task);
 
 	return ((taskqid_t)(void *)task);
 }
 
-#define	TASKQ_MAGIC	0x74541c
-
 static void
-taskq_run_safe(void *arg, int pending __unused)
+taskq_run_ent(void *arg, int pending __unused)
 {
-	struct ostask *task = arg;
+	taskq_ent_t *task = arg;
 
-	task->ost_func(task->ost_arg);
+	task->tqent_func(task->tqent_arg);
 }
 
-taskqid_t
-taskq_dispatch_safe(taskq_t *tq, task_func_t func, void *arg, u_int flags,
-    struct ostask *task)
+void
+taskq_dispatch_ent(taskq_t *tq, task_func_t func, void *arg, u_int flags,
+    taskq_ent_t *task)
 {
 	int prio;
 
-	/* 
+	/*
 	 * If TQ_FRONT is given, we want higher priority for this task, so it
 	 * can go at the front of the queue.
 	 */
 	prio = !!(flags & TQ_FRONT);
 
-	task->ost_func = func;
-	task->ost_arg = arg;
+	task->tqent_func = func;
+	task->tqent_arg = arg;
 
-	TASK_INIT(&task->ost_task, prio, taskq_run_safe, task);
-	taskqueue_enqueue(tq->tq_queue, &task->ost_task);
-
-	return ((taskqid_t)(void *)task);
+	TASK_INIT(&task->tqent_task, prio, taskq_run_ent, task);
+	taskqueue_enqueue(tq->tq_queue, &task->tqent_task);
+}
+
+void
+taskq_wait(taskq_t *tq)
+{
+	taskqueue_drain_all(tq->tq_queue);
 }
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c b/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c
index 871f1c69e84..fe444ecc287 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_vm.c
@@ -40,6 +40,8 @@ __FBSDID("$FreeBSD$");
 const int zfs_vm_pagerret_bad = VM_PAGER_BAD;
 const int zfs_vm_pagerret_error = VM_PAGER_ERROR;
 const int zfs_vm_pagerret_ok = VM_PAGER_OK;
+const int zfs_vm_pagerput_sync = VM_PAGER_PUT_SYNC;
+const int zfs_vm_pagerput_inval = VM_PAGER_PUT_INVAL;
 
 void
 zfs_vmobject_assert_wlocked(vm_object_t object)
diff --git a/sys/cddl/compat/opensolaris/sys/taskq.h b/sys/cddl/compat/opensolaris/sys/disp.h
similarity index 77%
rename from sys/cddl/compat/opensolaris/sys/taskq.h
rename to sys/cddl/compat/opensolaris/sys/disp.h
index ffe70ca9e29..468ed678102 100644
--- a/sys/cddl/compat/opensolaris/sys/taskq.h
+++ b/sys/cddl/compat/opensolaris/sys/disp.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2010 Pawel Jakub Dawidek <pjd@FreeBSD.org>
+ * Copyright (c) 2013 Andriy Gapon
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,18 +26,15 @@
  * $FreeBSD$
  */
 
-#ifndef _OPENSOLARIS_SYS_TASKQ_H_
-#define	_OPENSOLARIS_SYS_TASKQ_H_
+#ifndef _OPENSOLARIS_SYS_DISP_H_
+#define	_OPENSOLARIS_SYS_DISP_H_
 
-#include_next <sys/taskq.h>
+#ifdef _KERNEL
 
-struct ostask {
-	struct task	 ost_task;
-	task_func_t	*ost_func;
-	void		*ost_arg;
-};
+#include <sys/proc.h>
 
-taskqid_t taskq_dispatch_safe(taskq_t *tq, task_func_t func, void *arg,
-    u_int flags, struct ostask *task);
+#define	kpreempt(x)	kern_yield(PRI_USER)
 
-#endif	/* _OPENSOLARIS_SYS_TASKQ_H_ */
+#endif	/* _KERNEL */
+
+#endif	/* _OPENSOLARIS_SYS_DISP_H_ */
diff --git a/sys/cddl/compat/opensolaris/sys/sdt.h b/sys/cddl/compat/opensolaris/sys/sdt.h
index 46b5b2244c5..6d05ba9d619 100644
--- a/sys/cddl/compat/opensolaris/sys/sdt.h
+++ b/sys/cddl/compat/opensolaris/sys/sdt.h
@@ -31,18 +31,6 @@
 
 #include_next <sys/sdt.h>
 
-#undef	DTRACE_PROBE
-#undef	DTRACE_PROBE1
-#undef	DTRACE_PROBE2
-#undef	DTRACE_PROBE3
-#undef	DTRACE_PROBE4
-
-#define	DTRACE_PROBE(name)
-#define	DTRACE_PROBE1(name, type1, arg1)
-#define	DTRACE_PROBE2(name, type1, arg1, type2, arg2)
-#define	DTRACE_PROBE3(name, type1, arg1, type2, arg2, type3, arg3)
-#define	DTRACE_PROBE4(name, type1, arg1, type2, arg2, type3, arg3, type4, arg4)
-
 #define	SET_ERROR(err)	(err)
 
 #endif	/* _OPENSOLARIS_SYS_SDT_H_ */
diff --git a/sys/cddl/compat/opensolaris/sys/vm.h b/sys/cddl/compat/opensolaris/sys/vm.h
index 40e4ffa9633..7e74f487283 100644
--- a/sys/cddl/compat/opensolaris/sys/vm.h
+++ b/sys/cddl/compat/opensolaris/sys/vm.h
@@ -31,14 +31,31 @@
 
 #ifdef _KERNEL
 
+#include <sys/sf_buf.h>
+
 extern const int zfs_vm_pagerret_bad;
 extern const int zfs_vm_pagerret_error;
 extern const int zfs_vm_pagerret_ok;
+extern const int zfs_vm_pagerput_sync;
+extern const int zfs_vm_pagerput_inval;
 
 void	zfs_vmobject_assert_wlocked(vm_object_t object);
 void	zfs_vmobject_wlock(vm_object_t object);
 void	zfs_vmobject_wunlock(vm_object_t object);
 
+static inline caddr_t
+zfs_map_page(vm_page_t pp, struct sf_buf **sfp)
+{
+	*sfp = sf_buf_alloc(pp, 0);
+	return ((caddr_t)sf_buf_kva(*sfp));
+}
+
+static inline void
+zfs_unmap_page(struct sf_buf *sf)
+{
+	sf_buf_free(sf);
+}
+
 #endif	/* _KERNEL */
 
 #endif	/* _OPENSOLARIS_SYS_VM_H_ */
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
index b6919896cc5..2c52b6c52ed 100644
--- a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
@@ -163,4 +163,7 @@ zpool_feature_init(void)
 	zfeature_register(SPA_FEATURE_MULTI_VDEV_CRASH_DUMP,
 	    "com.joyent:multi_vdev_crash_dump", "multi_vdev_crash_dump",
 	    "Crash dumps to multiple vdev pools.", B_FALSE, B_FALSE, NULL);
+	zfeature_register(SPA_FEATURE_SPACEMAP_HISTOGRAM,
+	    "com.delphix:spacemap_histogram", "spacemap_histogram",
+	    "Spacemaps maintain space histograms.", B_TRUE, B_FALSE, NULL);
 }
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
index a0b73c2c0f2..1ce368b162b 100644
--- a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
@@ -55,6 +55,7 @@ static enum spa_feature {
 	SPA_FEATURE_EMPTY_BPOBJ,
 	SPA_FEATURE_LZ4_COMPRESS,
 	SPA_FEATURE_MULTI_VDEV_CRASH_DUMP,
+	SPA_FEATURE_SPACEMAP_HISTOGRAM,
 	SPA_FEATURES
 } spa_feature_t;
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/Makefile.files b/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
index d026de8b63e..a47b8588e6c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
+++ b/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
@@ -21,7 +21,8 @@
 
 #
 # Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
-# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved.
+# Copyright (c) 2013 by Delphix. All rights reserved.
 # Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
 #
 #
@@ -62,6 +63,7 @@ ZFS_COMMON_OBJS +=		\
 	lz4.o			\
 	lzjb.o			\
 	metaslab.o		\
+	range_tree.o		\
 	refcount.o		\
 	rrwlock.o		\
 	sa.o			\
@@ -72,6 +74,7 @@ ZFS_COMMON_OBJS +=		\
 	spa_history.o		\
 	spa_misc.o		\
 	space_map.o		\
+	space_reftree.o		\
 	txg.o			\
 	uberblock.o		\
 	unique.o		\
@@ -126,6 +129,3 @@ ZFS_OBJS +=			\
 	zfs_vfsops.o		\
 	zfs_vnops.o		\
 	zvol.o
-
-ZUT_OBJS +=			\
-	zut.o
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index babc42c4f0b..f35cf73f1aa 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -185,6 +185,9 @@ hrtime_t	dtrace_deadman_interval = NANOSEC;
 hrtime_t	dtrace_deadman_timeout = (hrtime_t)10 * NANOSEC;
 hrtime_t	dtrace_deadman_user = (hrtime_t)30 * NANOSEC;
 hrtime_t	dtrace_unregister_defunct_reap = (hrtime_t)60 * NANOSEC;
+#if !defined(sun)
+int		dtrace_memstr_max = 4096;
+#endif
 
 /*
  * DTrace External Variables
@@ -4920,6 +4923,45 @@ inetout:	regs[rd] = (uintptr_t)end + 1;
 		break;
 	}
 
+#if !defined(sun)
+	case DIF_SUBR_MEMSTR: {
+		char *str = (char *)mstate->dtms_scratch_ptr;
+		uintptr_t mem = tupregs[0].dttk_value;
+		char c = tupregs[1].dttk_value;
+		size_t size = tupregs[2].dttk_value;
+		uint8_t n;
+		int i;
+
+		regs[rd] = 0;
+
+		if (size == 0)
+			break;
+
+		if (!dtrace_canload(mem, size - 1, mstate, vstate))
+			break;
+
+		if (!DTRACE_INSCRATCH(mstate, size)) {
+			DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
+			break;
+		}
+
+		if (dtrace_memstr_max != 0 && size > dtrace_memstr_max) {
+			*flags |= CPU_DTRACE_ILLOP;
+			break;
+		}
+
+		for (i = 0; i < size - 1; i++) {
+			n = dtrace_load8(mem++);
+			str[i] = (n == 0) ? c : n;
+		}
+		str[size - 1] = 0;
+
+		regs[rd] = (uintptr_t)str;
+		mstate->dtms_scratch_ptr += size;
+		break;
+	}
+#endif
+
 	case DIF_SUBR_TYPEREF: {
 		uintptr_t size = 4 * sizeof(uintptr_t);
 		uintptr_t *typeref = (uintptr_t *) P2ROUNDUP(mstate->dtms_scratch_ptr, sizeof(uintptr_t));
@@ -9102,6 +9144,9 @@ dtrace_difo_validate_helper(dtrace_difo_t *dp)
 			    subr == DIF_SUBR_NTOHL ||
 			    subr == DIF_SUBR_NTOHLL ||
 			    subr == DIF_SUBR_MEMREF ||
+#if !defined(sun)
+			    subr == DIF_SUBR_MEMSTR ||
+#endif
 			    subr == DIF_SUBR_TYPEREF)
 				break;
 
@@ -15751,10 +15796,6 @@ dtrace_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 #else
 	devfs_set_cdevpriv(state, dtrace_dtr);
 #endif
-	/* This code actually belongs in dtrace_attach() */
-	if (dtrace_opens == 1)
-		dtrace_taskq = taskq_create("dtrace_taskq", 1, maxclsyspri,
-		    1, INT_MAX, 0);
 #endif
 
 	mutex_exit(&cpu_lock);
@@ -15842,11 +15883,6 @@ dtrace_dtr(void *data)
 		(void) kdi_dtrace_set(KDI_DTSET_DTRACE_DEACTIVATE);
 #else
 	--dtrace_opens;
-	/* This code actually belongs in dtrace_detach() */
-	if ((dtrace_opens == 0) && (dtrace_taskq != NULL)) {
-		taskq_destroy(dtrace_taskq);
-		dtrace_taskq = NULL;
-	}
 #endif
 
 	mutex_exit(&dtrace_lock);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
index fd5508fcda6..fc468b06502 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
@@ -2064,20 +2064,16 @@ fasttrap_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int fflag,
 		return (EAGAIN);
 
 	if (cmd == FASTTRAPIOC_MAKEPROBE) {
-		fasttrap_probe_spec_t *uprobe = (void *)arg;
+		fasttrap_probe_spec_t *uprobe = *(fasttrap_probe_spec_t **)arg;
 		fasttrap_probe_spec_t *probe;
 		uint64_t noffs;
 		size_t size;
 		int ret;
 		char *c;
 
-#if defined(sun)
 		if (copyin(&uprobe->ftps_noffs, &noffs,
 		    sizeof (uprobe->ftps_noffs)))
 			return (EFAULT);
-#else
-		noffs = uprobe->ftps_noffs;
-#endif
 
 		/*
 		 * Probes must have at least one tracepoint.
@@ -2093,19 +2089,10 @@ fasttrap_ioctl(struct cdev *dev, u_long cmd, caddr_t arg, int fflag,
 
 		probe = kmem_alloc(size, KM_SLEEP);
 
-#if defined(sun)
 		if (copyin(uprobe, probe, size) != 0) {
 			kmem_free(probe, size);
 			return (EFAULT);
 		}
-#else
-		memcpy(probe, uprobe, sizeof(*probe));
-		if (noffs > 1 && copyin(uprobe + 1, probe + 1, size) != 0) {
-			kmem_free(probe, size);
-			return (EFAULT);
-		}
-#endif
-
 
 		/*
 		 * Verify that the function and module strings contain no
@@ -2284,13 +2271,6 @@ fasttrap_load(void)
 	mutex_init(&fasttrap_count_mtx, "fasttrap count mtx", MUTEX_DEFAULT,
 	    NULL);
 
-	ret = kproc_create(fasttrap_pid_cleanup_cb, NULL,
-	    &fasttrap_cleanup_proc, 0, 0, "ftcleanup");
-	if (ret != 0) {
-		destroy_dev(fasttrap_cdev);
-		return (ret);
-	}
-
 #if defined(sun)
 	fasttrap_max = ddi_getprop(DDI_DEV_T_ANY, devi, DDI_PROP_DONTPASS,
 	    "fasttrap-max-probes", FASTTRAP_MAX_DEFAULT);
@@ -2344,6 +2324,24 @@ fasttrap_load(void)
 		    "providers bucket mtx", MUTEX_DEFAULT, NULL);
 #endif
 
+	ret = kproc_create(fasttrap_pid_cleanup_cb, NULL,
+	    &fasttrap_cleanup_proc, 0, 0, "ftcleanup");
+	if (ret != 0) {
+		destroy_dev(fasttrap_cdev);
+#if !defined(sun)
+		for (i = 0; i < fasttrap_provs.fth_nent; i++)
+			mutex_destroy(&fasttrap_provs.fth_table[i].ftb_mtx);
+		for (i = 0; i < fasttrap_tpoints.fth_nent; i++)
+			mutex_destroy(&fasttrap_tpoints.fth_table[i].ftb_mtx);
+#endif
+		kmem_free(fasttrap_provs.fth_table, fasttrap_provs.fth_nent *
+		    sizeof (fasttrap_bucket_t));
+		mtx_destroy(&fasttrap_cleanup_mtx);
+		mutex_destroy(&fasttrap_count_mtx);
+		return (ret);
+	}
+
+
 	/*
 	 * ... and the procs hash table.
 	 */
@@ -2436,6 +2434,20 @@ fasttrap_unload(void)
 		return (-1);
 	}
 
+	/*
+	 * Stop new processes from entering these hooks now, before the
+	 * fasttrap_cleanup thread runs.  That way all processes will hopefully
+	 * be out of these hooks before we free fasttrap_provs.fth_table
+	 */
+	ASSERT(dtrace_fasttrap_fork == &fasttrap_fork);
+	dtrace_fasttrap_fork = NULL;
+
+	ASSERT(dtrace_fasttrap_exec == &fasttrap_exec_exit);
+	dtrace_fasttrap_exec = NULL;
+
+	ASSERT(dtrace_fasttrap_exit == &fasttrap_exec_exit);
+	dtrace_fasttrap_exit = NULL;
+
 	mtx_lock(&fasttrap_cleanup_mtx);
 	fasttrap_cleanup_drain = 1;
 	/* Wait for the cleanup thread to finish up and signal us. */
@@ -2451,6 +2463,14 @@ fasttrap_unload(void)
 	mutex_exit(&fasttrap_count_mtx);
 #endif
 
+#if !defined(sun)
+	for (i = 0; i < fasttrap_tpoints.fth_nent; i++)
+		mutex_destroy(&fasttrap_tpoints.fth_table[i].ftb_mtx);
+	for (i = 0; i < fasttrap_provs.fth_nent; i++)
+		mutex_destroy(&fasttrap_provs.fth_table[i].ftb_mtx);
+	for (i = 0; i < fasttrap_procs.fth_nent; i++)
+		mutex_destroy(&fasttrap_procs.fth_table[i].ftb_mtx);
+#endif
 	kmem_free(fasttrap_tpoints.fth_table,
 	    fasttrap_tpoints.fth_nent * sizeof (fasttrap_bucket_t));
 	fasttrap_tpoints.fth_nent = 0;
@@ -2463,22 +2483,6 @@ fasttrap_unload(void)
 	    fasttrap_procs.fth_nent * sizeof (fasttrap_bucket_t));
 	fasttrap_procs.fth_nent = 0;
 
-	/*
-	 * We know there are no tracepoints in any process anywhere in
-	 * the system so there is no process which has its p_dtrace_count
-	 * greater than zero, therefore we know that no thread can actively
-	 * be executing code in fasttrap_fork(). Similarly for p_dtrace_probes
-	 * and fasttrap_exec() and fasttrap_exit().
-	 */
-	ASSERT(dtrace_fasttrap_fork == &fasttrap_fork);
-	dtrace_fasttrap_fork = NULL;
-
-	ASSERT(dtrace_fasttrap_exec == &fasttrap_exec_exit);
-	dtrace_fasttrap_exec = NULL;
-
-	ASSERT(dtrace_fasttrap_exit == &fasttrap_exec_exit);
-	dtrace_fasttrap_exit = NULL;
-
 #if !defined(sun)
 	destroy_dev(fasttrap_cdev);
 	mutex_destroy(&fasttrap_count_mtx);
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 e76b3484fce..a4fbf047cb9 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
@@ -20,9 +20,9 @@
  */
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  */
 
 /*
@@ -127,6 +127,7 @@
 #include <sys/refcount.h>
 #include <sys/vdev.h>
 #include <sys/vdev_impl.h>
+#include <sys/dsl_pool.h>
 #ifdef _KERNEL
 #include <sys/dnlc.h>
 #endif
@@ -150,10 +151,6 @@ static kmutex_t		arc_reclaim_thr_lock;
 static kcondvar_t	arc_reclaim_thr_cv;	/* used to signal reclaim thr */
 static uint8_t		arc_thread_exit;
 
-extern int zfs_write_limit_shift;
-extern uint64_t zfs_write_limit_max;
-extern kmutex_t zfs_write_limit_lock;
-
 #define	ARC_REDUCE_DNLC_PERCENT	3
 uint_t arc_reduce_dnlc_percent = ARC_REDUCE_DNLC_PERCENT;
 
@@ -162,6 +159,12 @@ typedef enum arc_reclaim_strategy {
 	ARC_RECLAIM_CONS		/* Conservative reclaim strategy */
 } arc_reclaim_strategy_t;
 
+/*
+ * The number of iterations through arc_evict_*() before we
+ * drop & reacquire the lock.
+ */
+int arc_evict_iterations = 100;
+
 /* number of seconds before growing cache again */
 static int		arc_grow_retry = 60;
 
@@ -177,6 +180,11 @@ static int		arc_shrink_shift = 5;
  */
 static int		arc_min_prefetch_lifespan;
 
+/*
+ * If this percent of memory is free, don't throttle.
+ */
+int arc_lotsfree_percent = 10;
+
 static int arc_dead;
 extern int zfs_prefetch_disable;
 
@@ -526,6 +534,7 @@ typedef struct arc_write_callback arc_write_callback_t;
 struct arc_write_callback {
 	void		*awcb_private;
 	arc_done_func_t	*awcb_ready;
+	arc_done_func_t	*awcb_physdone;
 	arc_done_func_t	*awcb_done;
 	arc_buf_t	*awcb_buf;
 };
@@ -1312,7 +1321,7 @@ arc_change_state(arc_state_t *new_state, arc_buf_hdr_t *ab, kmutex_t *hash_lock)
 	kmutex_t *lock;
 
 	ASSERT(MUTEX_HELD(hash_lock));
-	ASSERT(new_state != old_state);
+	ASSERT3P(new_state, !=, old_state);
 	ASSERT(refcnt == 0 || ab->b_datacnt > 0);
 	ASSERT(ab->b_datacnt == 0 || !GHOST_STATE(new_state));
 	ASSERT(ab->b_datacnt <= 1 || old_state != arc_anon);
@@ -1937,8 +1946,10 @@ arc_evict(arc_state_t *state, uint64_t spa, int64_t bytes, boolean_t recycle,
 	kmutex_t *hash_lock;
 	boolean_t have_lock;
 	void *stolen = NULL;
+	arc_buf_hdr_t marker = { 0 };
+	int count = 0;
 	static int evict_metadata_offset, evict_data_offset;
-	int i, idx, offset, list_count, count;
+	int i, idx, offset, list_count, lists;
 
 	ASSERT(state == arc_mru || state == arc_mfu);
 
@@ -1958,7 +1969,7 @@ arc_evict(arc_state_t *state, uint64_t spa, int64_t bytes, boolean_t recycle,
 		idx = evict_data_offset;
 	}
 	bytes_remaining = evicted_state->arcs_lsize[type];
-	count = 0;
+	lists = 0;
 
 evict_start:
 	list = &list_start[idx];
@@ -1985,6 +1996,33 @@ evict_start:
 		if (recycle && ab->b_size != bytes &&
 		    ab_prev && ab_prev->b_size == bytes)
 			continue;
+
+		/* ignore markers */
+		if (ab->b_spa == 0)
+			continue;
+
+		/*
+		 * It may take a long time to evict all the bufs requested.
+		 * To avoid blocking all arc activity, periodically drop
+		 * the arcs_mtx and give other threads a chance to run
+		 * before reacquiring the lock.
+		 *
+		 * If we are looking for a buffer to recycle, we are in
+		 * the hot code path, so don't sleep.
+		 */
+		if (!recycle && count++ > arc_evict_iterations) {
+			list_insert_after(list, ab, &marker);
+			mutex_exit(evicted_lock);
+			mutex_exit(lock);
+			kpreempt(KPREEMPT_SYNC);
+			mutex_enter(lock);
+			mutex_enter(evicted_lock);
+			ab_prev = list_prev(list, &marker);
+			list_remove(list, &marker);
+			count = 0;
+			continue;
+		}
+
 		hash_lock = HDR_LOCK(ab);
 		have_lock = MUTEX_HELD(hash_lock);
 		if (have_lock || mutex_tryenter(hash_lock)) {
@@ -2051,7 +2089,7 @@ evict_start:
 				mutex_exit(evicted_lock);
 				mutex_exit(lock);
 				idx  = ((idx + 1) & (list_count - 1));
-				count++;
+				lists++;
 				goto evict_start;
 			}
 		} else {
@@ -2063,10 +2101,10 @@ evict_start:
 	mutex_exit(lock);
 
 	idx  = ((idx + 1) & (list_count - 1));
-	count++;
+	lists++;
 
 	if (bytes_evicted < bytes) {
-		if (count < list_count)
+		if (lists < list_count)
 			goto evict_start;
 		else
 			dprintf("only evicted %lld bytes from %x",
@@ -2084,28 +2122,14 @@ evict_start:
 		ARCSTAT_INCR(arcstat_mutex_miss, missed);
 
 	/*
-	 * We have just evicted some data into the ghost state, make
-	 * sure we also adjust the ghost state size if necessary.
+	 * Note: we have just evicted some data into the ghost state,
+	 * potentially putting the ghost size over the desired size.  Rather
+	 * that evicting from the ghost list in this hot code path, leave
+	 * this chore to the arc_reclaim_thread().
 	 */
-	if (arc_no_grow &&
-	    arc_mru_ghost->arcs_size + arc_mfu_ghost->arcs_size > arc_c) {
-		int64_t mru_over = arc_anon->arcs_size + arc_mru->arcs_size +
-		    arc_mru_ghost->arcs_size - arc_c;
 
-		if (mru_over > 0 && arc_mru_ghost->arcs_lsize[type] > 0) {
-			int64_t todelete =
-			    MIN(arc_mru_ghost->arcs_lsize[type], mru_over);
-			arc_evict_ghost(arc_mru_ghost, 0, todelete);
-		} else if (arc_mfu_ghost->arcs_lsize[type] > 0) {
-			int64_t todelete = MIN(arc_mfu_ghost->arcs_lsize[type],
-			    arc_mru_ghost->arcs_size +
-			    arc_mfu_ghost->arcs_size - arc_c);
-			arc_evict_ghost(arc_mfu_ghost, 0, todelete);
-		}
-	}
 	if (stolen)
 		ARCSTAT_BUMP(arcstat_stolen);
-
 	return (stolen);
 }
 
@@ -2122,9 +2146,10 @@ arc_evict_ghost(arc_state_t *state, uint64_t spa, int64_t bytes)
 	kmutex_t *hash_lock, *lock;
 	uint64_t bytes_deleted = 0;
 	uint64_t bufs_skipped = 0;
+	int count = 0;
 	static int evict_offset;
 	int list_count, idx = evict_offset;
-	int offset, count = 0;
+	int offset, lists = 0;
 
 	ASSERT(GHOST_STATE(state));
 
@@ -2142,6 +2167,8 @@ evict_start:
 	mutex_enter(lock);
 	for (ab = list_tail(list); ab; ab = ab_prev) {
 		ab_prev = list_prev(list, ab);
+		if (ab->b_type > ARC_BUFC_NUMTYPES)
+			panic("invalid ab=%p", (void *)ab);
 		if (spa && ab->b_spa != spa)
 			continue;
 
@@ -2153,6 +2180,23 @@ evict_start:
 		/* caller may be trying to modify this buffer, skip it */
 		if (MUTEX_HELD(hash_lock))
 			continue;
+
+		/*
+		 * It may take a long time to evict all the bufs requested.
+		 * To avoid blocking all arc activity, periodically drop
+		 * the arcs_mtx and give other threads a chance to run
+		 * before reacquiring the lock.
+		 */
+		if (count++ > arc_evict_iterations) {
+			list_insert_after(list, ab, &marker);
+			mutex_exit(lock);
+			kpreempt(KPREEMPT_SYNC);
+			mutex_enter(lock);
+			ab_prev = list_prev(list, &marker);
+			list_remove(list, &marker);
+			count = 0;
+			continue;
+		}
 		if (mutex_tryenter(hash_lock)) {
 			ASSERT(!HDR_IO_IN_PROGRESS(ab));
 			ASSERT(ab->b_buf == NULL);
@@ -2188,14 +2232,16 @@ evict_start:
 			mutex_enter(lock);
 			ab_prev = list_prev(list, &marker);
 			list_remove(list, &marker);
-		} else
+		} else {
 			bufs_skipped += 1;
+		}
+
 	}
 	mutex_exit(lock);
 	idx  = ((idx + 1) & (ARC_BUFC_NUMDATALISTS - 1));
-	count++;
+	lists++;
 
-	if (count < list_count)
+	if (lists < list_count)
 		goto evict_start;
 
 	evict_offset = idx;
@@ -2203,7 +2249,7 @@ evict_start:
 	    (bytes < 0 || bytes_deleted < bytes)) {
 		list_start = &state->arcs_lists[0];
 		list_count = ARC_BUFC_NUMMETADATALISTS;
-		offset = count = 0;
+		offset = lists = 0;
 		goto evict_start;
 	}
 
@@ -3083,7 +3129,7 @@ arc_read_done(zio_t *zio)
  */
 int
 arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, arc_done_func_t *done,
-    void *private, int priority, int zio_flags, uint32_t *arc_flags,
+    void *private, zio_priority_t priority, int zio_flags, uint32_t *arc_flags,
     const zbookmark_t *zb)
 {
 	arc_buf_hdr_t *hdr;
@@ -3173,6 +3219,8 @@ top:
 		vdev_t *vd = NULL;
 		uint64_t addr = 0;
 		boolean_t devw = B_FALSE;
+		enum zio_compress b_compress = ZIO_COMPRESS_OFF;
+		uint64_t b_asize = 0;
 
 		if (hdr == NULL) {
 			/* this block is not in the cache */
@@ -3242,10 +3290,12 @@ top:
 		hdr->b_acb = acb;
 		hdr->b_flags |= ARC_IO_IN_PROGRESS;
 
-		if (HDR_L2CACHE(hdr) && hdr->b_l2hdr != NULL &&
+		if (hdr->b_l2hdr != NULL &&
 		    (vd = hdr->b_l2hdr->b_dev->l2ad_vdev) != NULL) {
 			devw = hdr->b_l2hdr->b_dev->l2ad_writing;
 			addr = hdr->b_l2hdr->b_daddr;
+			b_compress = hdr->b_l2hdr->b_compress;
+			b_asize = hdr->b_l2hdr->b_asize;
 			/*
 			 * Lock out device removal.
 			 */
@@ -3296,7 +3346,7 @@ top:
 				cb->l2rcb_bp = *bp;
 				cb->l2rcb_zb = *zb;
 				cb->l2rcb_flags = zio_flags;
-				cb->l2rcb_compress = hdr->b_l2hdr->b_compress;
+				cb->l2rcb_compress = b_compress;
 
 				ASSERT(addr >= VDEV_LABEL_START_SIZE &&
 				    addr + size < vd->vdev_psize -
@@ -3308,8 +3358,7 @@ top:
 				 * Issue a null zio if the underlying buffer
 				 * was squashed to zero size by compression.
 				 */
-				if (hdr->b_l2hdr->b_compress ==
-				    ZIO_COMPRESS_EMPTY) {
+				if (b_compress == ZIO_COMPRESS_EMPTY) {
 					rzio = zio_null(pio, spa, vd,
 					    l2arc_read_done, cb,
 					    zio_flags | ZIO_FLAG_DONT_CACHE |
@@ -3318,8 +3367,8 @@ top:
 					    ZIO_FLAG_DONT_RETRY);
 				} else {
 					rzio = zio_read_phys(pio, vd, addr,
-					    hdr->b_l2hdr->b_asize,
-					    buf->b_data, ZIO_CHECKSUM_OFF,
+					    b_asize, buf->b_data,
+					    ZIO_CHECKSUM_OFF,
 					    l2arc_read_done, cb, priority,
 					    zio_flags | ZIO_FLAG_DONT_CACHE |
 					    ZIO_FLAG_CANFAIL |
@@ -3328,8 +3377,7 @@ top:
 				}
 				DTRACE_PROBE2(l2arc__read, vdev_t *, vd,
 				    zio_t *, rzio);
-				ARCSTAT_INCR(arcstat_l2_read_bytes,
-				    hdr->b_l2hdr->b_asize);
+				ARCSTAT_INCR(arcstat_l2_read_bytes, b_asize);
 
 				if (*arc_flags & ARC_NOWAIT) {
 					zio_nowait(rzio);
@@ -3540,6 +3588,7 @@ arc_release(arc_buf_t *buf, void *tag)
 	if (l2hdr) {
 		mutex_enter(&l2arc_buflist_mtx);
 		hdr->b_l2hdr = NULL;
+		list_remove(l2hdr->b_dev->l2ad_buflist, hdr);
 	}
 	buf_size = hdr->b_size;
 
@@ -3627,7 +3676,6 @@ arc_release(arc_buf_t *buf, void *tag)
 		ARCSTAT_INCR(arcstat_l2_asize, -l2hdr->b_asize);
 		trim_map_free(l2hdr->b_dev->l2ad_vdev, l2hdr->b_daddr,
 		    hdr->b_size, 0);
-		list_remove(l2hdr->b_dev->l2ad_buflist, hdr);
 		kmem_free(l2hdr, sizeof (l2arc_buf_hdr_t));
 		ARCSTAT_INCR(arcstat_l2_size, -buf_size);
 		mutex_exit(&l2arc_buflist_mtx);
@@ -3697,6 +3745,18 @@ arc_write_ready(zio_t *zio)
 	hdr->b_flags |= ARC_IO_IN_PROGRESS;
 }
 
+/*
+ * The SPA calls this callback for each physical write that happens on behalf
+ * of a logical write.  See the comment in dbuf_write_physdone() for details.
+ */
+static void
+arc_write_physdone(zio_t *zio)
+{
+	arc_write_callback_t *cb = zio->io_private;
+	if (cb->awcb_physdone != NULL)
+		cb->awcb_physdone(zio, cb->awcb_buf, cb->awcb_private);
+}
+
 static void
 arc_write_done(zio_t *zio)
 {
@@ -3777,8 +3837,9 @@ arc_write_done(zio_t *zio)
 zio_t *
 arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
     blkptr_t *bp, arc_buf_t *buf, boolean_t l2arc, boolean_t l2arc_compress,
-    const zio_prop_t *zp, arc_done_func_t *ready, arc_done_func_t *done,
-    void *private, int priority, int zio_flags, const zbookmark_t *zb)
+    const zio_prop_t *zp, arc_done_func_t *ready, arc_done_func_t *physdone,
+    arc_done_func_t *done, void *private, zio_priority_t priority,
+    int zio_flags, const zbookmark_t *zb)
 {
 	arc_buf_hdr_t *hdr = buf->b_hdr;
 	arc_write_callback_t *callback;
@@ -3795,18 +3856,20 @@ arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
 		hdr->b_flags |= ARC_L2COMPRESS;
 	callback = kmem_zalloc(sizeof (arc_write_callback_t), KM_SLEEP);
 	callback->awcb_ready = ready;
+	callback->awcb_physdone = physdone;
 	callback->awcb_done = done;
 	callback->awcb_private = private;
 	callback->awcb_buf = buf;
 
 	zio = zio_write(pio, spa, txg, bp, buf->b_data, hdr->b_size, zp,
-	    arc_write_ready, arc_write_done, callback, priority, zio_flags, zb);
+	    arc_write_ready, arc_write_physdone, arc_write_done, callback,
+	    priority, zio_flags, zb);
 
 	return (zio);
 }
 
 static int
-arc_memory_throttle(uint64_t reserve, uint64_t inflight_data, uint64_t txg)
+arc_memory_throttle(uint64_t reserve, uint64_t txg)
 {
 #ifdef _KERNEL
 	uint64_t available_memory =
@@ -3820,7 +3883,9 @@ arc_memory_throttle(uint64_t reserve, uint64_t inflight_data, uint64_t txg)
 	    MIN(available_memory, vmem_size(heap_arena, VMEM_FREE));
 #endif
 #endif	/* sun */
-	if (available_memory >= zfs_write_limit_max)
+
+	if (cnt.v_free_count + cnt.v_cache_count >
+	    (uint64_t)physmem * arc_lotsfree_percent / 100)
 		return (0);
 
 	if (txg > last_txg) {
@@ -3844,20 +3909,6 @@ arc_memory_throttle(uint64_t reserve, uint64_t inflight_data, uint64_t txg)
 		return (SET_ERROR(EAGAIN));
 	}
 	page_load = 0;
-
-	if (arc_size > arc_c_min) {
-		uint64_t evictable_memory =
-		    arc_mru->arcs_lsize[ARC_BUFC_DATA] +
-		    arc_mru->arcs_lsize[ARC_BUFC_METADATA] +
-		    arc_mfu->arcs_lsize[ARC_BUFC_DATA] +
-		    arc_mfu->arcs_lsize[ARC_BUFC_METADATA];
-		available_memory += MIN(evictable_memory, arc_size - arc_c_min);
-	}
-
-	if (inflight_data > available_memory / 4) {
-		ARCSTAT_INCR(arcstat_memory_throttle_count, 1);
-		return (SET_ERROR(ERESTART));
-	}
 #endif
 	return (0);
 }
@@ -3875,15 +3926,6 @@ arc_tempreserve_space(uint64_t reserve, uint64_t txg)
 	int error;
 	uint64_t anon_size;
 
-#ifdef ZFS_DEBUG
-	/*
-	 * Once in a while, fail for no reason.  Everything should cope.
-	 */
-	if (spa_get_random(10000) == 0) {
-		dprintf("forcing random failure\n");
-		return (SET_ERROR(ERESTART));
-	}
-#endif
 	if (reserve > arc_c/4 && !arc_no_grow)
 		arc_c = MIN(arc_c_max, reserve * 4);
 	if (reserve > arc_c)
@@ -3901,7 +3943,8 @@ arc_tempreserve_space(uint64_t reserve, uint64_t txg)
 	 * in order to compress/encrypt/etc the data.  We therefore need to
 	 * make sure that there is sufficient available memory for this.
 	 */
-	if (error = arc_memory_throttle(reserve, anon_size, txg))
+	error = arc_memory_throttle(reserve, txg);
+	if (error != 0)
 		return (error);
 
 	/*
@@ -4092,11 +4135,20 @@ arc_init(void)
 	arc_dead = FALSE;
 	arc_warm = B_FALSE;
 
-	if (zfs_write_limit_max == 0)
-		zfs_write_limit_max = ptob(physmem) >> zfs_write_limit_shift;
-	else
-		zfs_write_limit_shift = 0;
-	mutex_init(&zfs_write_limit_lock, NULL, MUTEX_DEFAULT, NULL);
+	/*
+	 * Calculate maximum amount of dirty data per pool.
+	 *
+	 * If it has been set by /etc/system, take that.
+	 * Otherwise, use a percentage of physical memory defined by
+	 * zfs_dirty_data_max_percent (default 10%) with a cap at
+	 * zfs_dirty_data_max_max (default 4GB).
+	 */
+	if (zfs_dirty_data_max == 0) {
+		zfs_dirty_data_max = ptob(physmem) *
+		    zfs_dirty_data_max_percent / 100;
+		zfs_dirty_data_max = MIN(zfs_dirty_data_max,
+		    zfs_dirty_data_max_max);
+	}
 
 #ifdef _KERNEL
 	if (TUNABLE_INT_FETCH("vfs.zfs.prefetch_disable", &zfs_prefetch_disable))
@@ -4175,8 +4227,6 @@ arc_fini(void)
 		mutex_destroy(&arc_l2c_only->arcs_locks[i].arcs_lock);
 	}
 
-	mutex_destroy(&zfs_write_limit_lock);
-
 	buf_fini();
 
 	ASSERT(arc_loaned_bytes == 0);
@@ -5147,7 +5197,7 @@ l2arc_compress_buf(l2arc_buf_hdr_t *l2hdr)
 	len = l2hdr->b_asize;
 	cdata = zio_data_buf_alloc(len);
 	csize = zio_compress_data(ZIO_COMPRESS_LZ4, l2hdr->b_tmp_cdata,
-	    cdata, l2hdr->b_asize, (size_t)SPA_MINBLOCKSIZE);
+	    cdata, l2hdr->b_asize, (size_t)(1ULL << l2hdr->b_dev->l2ad_vdev->vdev_ashift));
 
 	if (csize == 0) {
 		/* zero block, indicate that there's nothing to write */
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 4d02a1d7957..79770a71124 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
@@ -842,7 +842,7 @@ dbuf_free_range(dnode_t *dn, uint64_t start, uint64_t end, dmu_tx_t *tx)
 		atomic_inc_64(&zfs_free_range_recv_miss);
 	}
 
-	for (db = list_head(&dn->dn_dbufs); db; db = db_next) {
+	for (db = list_head(&dn->dn_dbufs); db != NULL; db = db_next) {
 		db_next = list_next(&dn->dn_dbufs, db);
 		ASSERT(db->db_blkid != DMU_BONUS_BLKID);
 
@@ -1188,6 +1188,8 @@ dbuf_dirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
 		    sizeof (dbuf_dirty_record_t),
 		    offsetof(dbuf_dirty_record_t, dr_dirty_node));
 	}
+	if (db->db_blkid != DMU_BONUS_BLKID && os->os_dsl_dataset != NULL)
+		dr->dr_accounted = db->db.db_size;
 	dr->dr_dbuf = db;
 	dr->dr_txg = tx->tx_txg;
 	dr->dr_next = *drp;
@@ -1271,7 +1273,10 @@ dbuf_dirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
 			dbuf_rele(parent, FTAG);
 
 		mutex_enter(&db->db_mtx);
-		/*  possible race with dbuf_undirty() */
+		/*
+		 * Since we've dropped the mutex, it's possible that
+		 * dbuf_undirty() might have changed this out from under us.
+		 */
 		if (db->db_last_dirty == dr ||
 		    dn->dn_object == DMU_META_DNODE_OBJECT) {
 			mutex_enter(&di->dt.di.dr_mtx);
@@ -1341,7 +1346,11 @@ dbuf_undirty(dmu_buf_impl_t *db, dmu_tx_t *tx)
 
 	ASSERT(db->db.db_size != 0);
 
-	/* XXX would be nice to fix up dn_towrite_space[] */
+	/*
+	 * Any space we accounted for in dp_dirty_* will be cleaned up by
+	 * dsl_pool_sync().  This is relatively rare so the discrepancy
+	 * is not a big deal.
+	 */
 
 	*drp = dr->dr_next;
 
@@ -1521,7 +1530,7 @@ dbuf_assign_arcbuf(dmu_buf_impl_t *db, arc_buf_t *buf, dmu_tx_t *tx)
 
 /*
  * "Clear" the contents of this dbuf.  This will mark the dbuf
- * EVICTING and clear *most* of its references.  Unfortunetely,
+ * EVICTING and clear *most* of its references.  Unfortunately,
  * when we are not holding the dn_dbufs_mtx, we can't clear the
  * entry in the dn_dbufs list.  We have to wait until dbuf_destroy()
  * in this case.  For callers from the DMU we will usually see:
@@ -1708,7 +1717,7 @@ dbuf_create(dnode_t *dn, uint8_t level, uint64_t blkid,
 		db->db.db_offset = 0;
 	} else {
 		int blocksize =
-		    db->db_level ? 1<<dn->dn_indblkshift :  dn->dn_datablksz;
+		    db->db_level ? 1 << dn->dn_indblkshift : dn->dn_datablksz;
 		db->db.db_size = blocksize;
 		db->db.db_offset = db->db_blkid * blocksize;
 	}
@@ -1817,7 +1826,7 @@ dbuf_destroy(dmu_buf_impl_t *db)
 }
 
 void
-dbuf_prefetch(dnode_t *dn, uint64_t blkid)
+dbuf_prefetch(dnode_t *dn, uint64_t blkid, zio_priority_t prio)
 {
 	dmu_buf_impl_t *db = NULL;
 	blkptr_t *bp = NULL;
@@ -1841,8 +1850,6 @@ dbuf_prefetch(dnode_t *dn, uint64_t blkid)
 
 	if (dbuf_findbp(dn, 0, blkid, TRUE, &db, &bp) == 0) {
 		if (bp && !BP_IS_HOLE(bp)) {
-			int priority = dn->dn_type == DMU_OT_DDT_ZAP ?
-			    ZIO_PRIORITY_DDT_PREFETCH : ZIO_PRIORITY_ASYNC_READ;
 			dsl_dataset_t *ds = dn->dn_objset->os_dsl_dataset;
 			uint32_t aflags = ARC_NOWAIT | ARC_PREFETCH;
 			zbookmark_t zb;
@@ -1851,7 +1858,7 @@ dbuf_prefetch(dnode_t *dn, uint64_t blkid)
 			    dn->dn_object, 0, blkid);
 
 			(void) arc_read(NULL, dn->dn_objset->os_spa,
-			    bp, NULL, NULL, priority,
+			    bp, NULL, NULL, prio,
 			    ZIO_FLAG_CANFAIL | ZIO_FLAG_SPECULATIVE,
 			    &aflags, &zb);
 		}
@@ -2536,6 +2543,38 @@ dbuf_write_ready(zio_t *zio, arc_buf_t *buf, void *vdb)
 	mutex_exit(&db->db_mtx);
 }
 
+/*
+ * The SPA will call this callback several times for each zio - once
+ * for every physical child i/o (zio->io_phys_children times).  This
+ * allows the DMU to monitor the progress of each logical i/o.  For example,
+ * there may be 2 copies of an indirect block, or many fragments of a RAID-Z
+ * block.  There may be a long delay before all copies/fragments are completed,
+ * so this callback allows us to retire dirty space gradually, as the physical
+ * i/os complete.
+ */
+/* ARGSUSED */
+static void
+dbuf_write_physdone(zio_t *zio, arc_buf_t *buf, void *arg)
+{
+	dmu_buf_impl_t *db = arg;
+	objset_t *os = db->db_objset;
+	dsl_pool_t *dp = dmu_objset_pool(os);
+	dbuf_dirty_record_t *dr;
+	int delta = 0;
+
+	dr = db->db_data_pending;
+	ASSERT3U(dr->dr_txg, ==, zio->io_txg);
+
+	/*
+	 * The callback will be called io_phys_children times.  Retire one
+	 * portion of our dirty space each time we are called.  Any rounding
+	 * error will be cleaned up by dsl_pool_sync()'s call to
+	 * dsl_pool_undirty_space().
+	 */
+	delta = dr->dr_accounted / zio->io_phys_children;
+	dsl_pool_undirty_space(dp, delta, zio->io_txg);
+}
+
 /* ARGSUSED */
 static void
 dbuf_write_done(zio_t *zio, arc_buf_t *buf, void *vdb)
@@ -2630,6 +2669,7 @@ dbuf_write_done(zio_t *zio, arc_buf_t *buf, void *vdb)
 	ASSERT(db->db_dirtycnt > 0);
 	db->db_dirtycnt -= 1;
 	db->db_data_pending = NULL;
+
 	dbuf_rele_and_unlock(db, (void *)(uintptr_t)txg);
 }
 
@@ -2748,8 +2788,8 @@ dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx)
 		ASSERT(db->db_state != DB_NOFILL);
 		dr->dr_zio = zio_write(zio, os->os_spa, txg,
 		    db->db_blkptr, data->b_data, arc_buf_size(data), &zp,
-		    dbuf_write_override_ready, dbuf_write_override_done, dr,
-		    ZIO_PRIORITY_ASYNC_WRITE, ZIO_FLAG_MUSTSUCCEED, &zb);
+		    dbuf_write_override_ready, NULL, dbuf_write_override_done,
+		    dr, ZIO_PRIORITY_ASYNC_WRITE, ZIO_FLAG_MUSTSUCCEED, &zb);
 		mutex_enter(&db->db_mtx);
 		dr->dt.dl.dr_override_state = DR_NOT_OVERRIDDEN;
 		zio_write_override(dr->dr_zio, &dr->dt.dl.dr_overridden_by,
@@ -2760,7 +2800,7 @@ dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx)
 		    zp.zp_checksum == ZIO_CHECKSUM_NOPARITY);
 		dr->dr_zio = zio_write(zio, os->os_spa, txg,
 		    db->db_blkptr, NULL, db->db.db_size, &zp,
-		    dbuf_write_nofill_ready, dbuf_write_nofill_done, db,
+		    dbuf_write_nofill_ready, NULL, dbuf_write_nofill_done, db,
 		    ZIO_PRIORITY_ASYNC_WRITE,
 		    ZIO_FLAG_MUSTSUCCEED | ZIO_FLAG_NODATA, &zb);
 	} else {
@@ -2768,7 +2808,7 @@ dbuf_write(dbuf_dirty_record_t *dr, arc_buf_t *data, dmu_tx_t *tx)
 		dr->dr_zio = arc_write(zio, os->os_spa, txg,
 		    db->db_blkptr, data, DBUF_IS_L2CACHEABLE(db),
 		    DBUF_IS_L2COMPRESSIBLE(db), &zp, dbuf_write_ready,
-		    dbuf_write_done, db, ZIO_PRIORITY_ASYNC_WRITE,
-		    ZIO_FLAG_MUSTSUCCEED, &zb);
+		    dbuf_write_physdone, dbuf_write_done, db,
+		    ZIO_PRIORITY_ASYNC_WRITE, ZIO_FLAG_MUSTSUCCEED, &zb);
 	}
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
index 9e661be2e98..ccc362703da 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
@@ -45,6 +45,7 @@
 #include <sys/zio_compress.h>
 #include <sys/sa.h>
 #ifdef _KERNEL
+#include <sys/vm.h>
 #include <sys/zfs_znode.h>
 #endif
 
@@ -374,13 +375,11 @@ static int
 dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset, uint64_t length,
     int read, void *tag, int *numbufsp, dmu_buf_t ***dbpp, uint32_t flags)
 {
-	dsl_pool_t *dp = NULL;
 	dmu_buf_t **dbp;
 	uint64_t blkid, nblks, i;
 	uint32_t dbuf_flags;
 	int err;
 	zio_t *zio;
-	hrtime_t start;
 
 	ASSERT(length <= DMU_MAX_ACCESS);
 
@@ -408,9 +407,6 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset, uint64_t length,
 	}
 	dbp = kmem_zalloc(sizeof (dmu_buf_t *) * nblks, KM_SLEEP);
 
-	if (dn->dn_objset->os_dsl_dataset)
-		dp = dn->dn_objset->os_dsl_dataset->ds_dir->dd_pool;
-	start = gethrtime();
 	zio = zio_root(dn->dn_objset->os_spa, NULL, NULL, ZIO_FLAG_CANFAIL);
 	blkid = dbuf_whichblock(dn, offset);
 	for (i = 0; i < nblks; i++) {
@@ -434,9 +430,6 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset, uint64_t length,
 
 	/* wait for async i/o */
 	err = zio_wait(zio);
-	/* track read overhead when we are in sync context */
-	if (dp && dsl_pool_sync_context(dp))
-		dp->dp_read_overhead += gethrtime() - start;
 	if (err) {
 		dmu_buf_rele_array(dbp, nblks, tag);
 		return (err);
@@ -518,12 +511,22 @@ dmu_buf_rele_array(dmu_buf_t **dbp_fake, int numbufs, void *tag)
 	kmem_free(dbp, sizeof (dmu_buf_t *) * numbufs);
 }
 
+/*
+ * Issue prefetch i/os for the given blocks.
+ *
+ * Note: The assumption is that we *know* these blocks will be needed
+ * almost immediately.  Therefore, the prefetch i/os will be issued at
+ * ZIO_PRIORITY_SYNC_READ
+ *
+ * Note: indirect blocks and other metadata will be read synchronously,
+ * causing this function to block if they are not already cached.
+ */
 void
 dmu_prefetch(objset_t *os, uint64_t object, uint64_t offset, uint64_t len)
 {
 	dnode_t *dn;
 	uint64_t blkid;
-	int nblks, i, err;
+	int nblks, err;
 
 	if (zfs_prefetch_disable)
 		return;
@@ -536,7 +539,7 @@ dmu_prefetch(objset_t *os, uint64_t object, uint64_t offset, uint64_t len)
 
 		rw_enter(&dn->dn_struct_rwlock, RW_READER);
 		blkid = dbuf_whichblock(dn, object * sizeof (dnode_phys_t));
-		dbuf_prefetch(dn, blkid);
+		dbuf_prefetch(dn, blkid, ZIO_PRIORITY_SYNC_READ);
 		rw_exit(&dn->dn_struct_rwlock);
 		return;
 	}
@@ -553,16 +556,16 @@ dmu_prefetch(objset_t *os, uint64_t object, uint64_t offset, uint64_t len)
 	rw_enter(&dn->dn_struct_rwlock, RW_READER);
 	if (dn->dn_datablkshift) {
 		int blkshift = dn->dn_datablkshift;
-		nblks = (P2ROUNDUP(offset+len, 1<<blkshift) -
-		    P2ALIGN(offset, 1<<blkshift)) >> blkshift;
+		nblks = (P2ROUNDUP(offset + len, 1 << blkshift) -
+		    P2ALIGN(offset, 1 << blkshift)) >> blkshift;
 	} else {
 		nblks = (offset < dn->dn_datablksz);
 	}
 
 	if (nblks != 0) {
 		blkid = dbuf_whichblock(dn, offset);
-		for (i = 0; i < nblks; i++)
-			dbuf_prefetch(dn, blkid+i);
+		for (int i = 0; i < nblks; i++)
+			dbuf_prefetch(dn, blkid + i, ZIO_PRIORITY_SYNC_READ);
 	}
 
 	rw_exit(&dn->dn_struct_rwlock);
@@ -677,6 +680,16 @@ dmu_free_long_range(objset_t *os, uint64_t object,
 	if (err != 0)
 		return (err);
 	err = dmu_free_long_range_impl(os, dn, offset, length);
+
+	/*
+	 * It is important to zero out the maxblkid when freeing the entire
+	 * file, so that (a) subsequent calls to dmu_free_long_range_impl()
+	 * will take the fast path, and (b) dnode_reallocate() can verify
+	 * that the entire file has been freed.
+	 */
+	if (offset == 0 && length == DMU_OBJECT_END)
+		dn->dn_maxblkid = 0;
+
 	dnode_rele(dn, FTAG);
 	return (err);
 }
@@ -1172,6 +1185,64 @@ dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset, uint64_t size,
 	dmu_buf_rele_array(dbp, numbufs, FTAG);
 	return (err);
 }
+
+#else
+
+int
+dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset, uint64_t size,
+    vm_page_t *ma, dmu_tx_t *tx)
+{
+	dmu_buf_t **dbp;
+	struct sf_buf *sf;
+	int numbufs, i;
+	int err;
+
+	if (size == 0)
+		return (0);
+
+	err = dmu_buf_hold_array(os, object, offset, size,
+	    FALSE, FTAG, &numbufs, &dbp);
+	if (err)
+		return (err);
+
+	for (i = 0; i < numbufs; i++) {
+		int tocpy, copied, thiscpy;
+		int bufoff;
+		dmu_buf_t *db = dbp[i];
+		caddr_t va;
+
+		ASSERT(size > 0);
+		ASSERT3U(db->db_size, >=, PAGESIZE);
+
+		bufoff = offset - db->db_offset;
+		tocpy = (int)MIN(db->db_size - bufoff, size);
+
+		ASSERT(i == 0 || i == numbufs-1 || tocpy == db->db_size);
+
+		if (tocpy == db->db_size)
+			dmu_buf_will_fill(db, tx);
+		else
+			dmu_buf_will_dirty(db, tx);
+
+		for (copied = 0; copied < tocpy; copied += PAGESIZE) {
+			ASSERT3U(ptoa((*ma)->pindex), ==, db->db_offset + bufoff);
+			thiscpy = MIN(PAGESIZE, tocpy - copied);
+			va = zfs_map_page(*ma, &sf);
+			bcopy(va, (char *)db->db_data + bufoff, thiscpy);
+			zfs_unmap_page(sf);
+			ma += 1;
+			bufoff += PAGESIZE;
+		}
+
+		if (tocpy == db->db_size)
+			dmu_buf_fill_done(db, tx);
+
+		offset += tocpy;
+		size -= tocpy;
+	}
+	dmu_buf_rele_array(dbp, numbufs, FTAG);
+	return (err);
+}
 #endif	/* sun */
 #endif
 
@@ -1366,7 +1437,7 @@ dmu_sync_late_arrival(zio_t *pio, objset_t *os, dmu_sync_cb_t *done, zgd_t *zgd,
 
 	zio_nowait(zio_write(pio, os->os_spa, dmu_tx_get_txg(tx), zgd->zgd_bp,
 	    zgd->zgd_db->db_data, zgd->zgd_db->db_size, zp,
-	    dmu_sync_late_arrival_ready, dmu_sync_late_arrival_done, dsa,
+	    dmu_sync_late_arrival_ready, NULL, dmu_sync_late_arrival_done, dsa,
 	    ZIO_PRIORITY_SYNC_WRITE, ZIO_FLAG_CANFAIL, zb));
 
 	return (0);
@@ -1506,8 +1577,9 @@ dmu_sync(zio_t *pio, uint64_t txg, dmu_sync_cb_t *done, zgd_t *zgd)
 
 	zio_nowait(arc_write(pio, os->os_spa, txg,
 	    bp, dr->dt.dl.dr_data, DBUF_IS_L2CACHEABLE(db),
-	    DBUF_IS_L2COMPRESSIBLE(db), &zp, dmu_sync_ready, dmu_sync_done,
-	    dsa, ZIO_PRIORITY_SYNC_WRITE, ZIO_FLAG_CANFAIL, &zb));
+	    DBUF_IS_L2COMPRESSIBLE(db), &zp, dmu_sync_ready,
+	    NULL, dmu_sync_done, dsa, ZIO_PRIORITY_SYNC_WRITE,
+	    ZIO_FLAG_CANFAIL, &zb));
 
 	return (0);
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
index 46bf3bfeb23..b5c0f5f5b1b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
@@ -1028,7 +1028,7 @@ dmu_objset_sync(objset_t *os, zio_t *pio, dmu_tx_t *tx)
 	zio = arc_write(pio, os->os_spa, tx->tx_txg,
 	    os->os_rootbp, os->os_phys_buf, DMU_OS_IS_L2CACHEABLE(os),
 	    DMU_OS_IS_L2COMPRESSIBLE(os), &zp, dmu_objset_write_ready,
-	    dmu_objset_write_done, os, ZIO_PRIORITY_ASYNC_WRITE,
+	    NULL, dmu_objset_write_done, os, ZIO_PRIORITY_ASYNC_WRITE,
 	    ZIO_FLAG_MUSTSUCCEED, &zb);
 
 	/*
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
index dddaa0a16e0..c784d12ee74 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
@@ -54,6 +54,7 @@ dmu_tx_create_dd(dsl_dir_t *dd)
 	    offsetof(dmu_tx_hold_t, txh_node));
 	list_create(&tx->tx_callbacks, sizeof (dmu_tx_callback_t),
 	    offsetof(dmu_tx_callback_t, dcb_node));
+	tx->tx_start = gethrtime();
 #ifdef ZFS_DEBUG
 	refcount_create(&tx->tx_space_written);
 	refcount_create(&tx->tx_space_freed);
@@ -597,13 +598,13 @@ dmu_tx_hold_free(dmu_tx_t *tx, uint64_t object, uint64_t off, uint64_t len)
 	if (txh == NULL)
 		return;
 	dn = txh->txh_dnode;
+	dmu_tx_count_dnode(txh);
 
 	if (off >= (dn->dn_maxblkid+1) * dn->dn_datablksz)
 		return;
 	if (len == DMU_OBJECT_END)
 		len = (dn->dn_maxblkid+1) * dn->dn_datablksz - off;
 
-	dmu_tx_count_dnode(txh);
 
 	/*
 	 * For i/o error checking, we read the first and last level-0
@@ -616,7 +617,7 @@ dmu_tx_hold_free(dmu_tx_t *tx, uint64_t object, uint64_t off, uint64_t len)
 	 */
 	if (dn->dn_datablkshift == 0) {
 		if (off != 0 || len < dn->dn_datablksz)
-			dmu_tx_count_write(txh, off, len);
+			dmu_tx_count_write(txh, 0, dn->dn_datablksz);
 	} else {
 		/* first block will be modified if it is not aligned */
 		if (!IS_P2ALIGNED(off, 1 << dn->dn_datablkshift))
@@ -911,6 +912,161 @@ dmu_tx_dirty_buf(dmu_tx_t *tx, dmu_buf_impl_t *db)
 }
 #endif
 
+/*
+ * If we can't do 10 iops, something is wrong.  Let us go ahead
+ * and hit zfs_dirty_data_max.
+ */
+hrtime_t zfs_delay_max_ns = MSEC2NSEC(100);
+int zfs_delay_resolution_ns = 100 * 1000; /* 100 microseconds */
+
+/*
+ * We delay transactions when we've determined that the backend storage
+ * isn't able to accommodate the rate of incoming writes.
+ *
+ * If there is already a transaction waiting, we delay relative to when
+ * that transaction finishes waiting.  This way the calculated min_time
+ * is independent of the number of threads concurrently executing
+ * transactions.
+ *
+ * If we are the only waiter, wait relative to when the transaction
+ * started, rather than the current time.  This credits the transaction for
+ * "time already served", e.g. reading indirect blocks.
+ *
+ * The minimum time for a transaction to take is calculated as:
+ *     min_time = scale * (dirty - min) / (max - dirty)
+ *     min_time is then capped at zfs_delay_max_ns.
+ *
+ * The delay has two degrees of freedom that can be adjusted via tunables.
+ * The percentage of dirty data at which we start to delay is defined by
+ * zfs_delay_min_dirty_percent. This should typically be at or above
+ * zfs_vdev_async_write_active_max_dirty_percent so that we only start to
+ * delay after writing at full speed has failed to keep up with the incoming
+ * write rate. The scale of the curve is defined by zfs_delay_scale. Roughly
+ * speaking, this variable determines the amount of delay at the midpoint of
+ * the curve.
+ *
+ * delay
+ *  10ms +-------------------------------------------------------------*+
+ *       |                                                             *|
+ *   9ms +                                                             *+
+ *       |                                                             *|
+ *   8ms +                                                             *+
+ *       |                                                            * |
+ *   7ms +                                                            * +
+ *       |                                                            * |
+ *   6ms +                                                            * +
+ *       |                                                            * |
+ *   5ms +                                                           *  +
+ *       |                                                           *  |
+ *   4ms +                                                           *  +
+ *       |                                                           *  |
+ *   3ms +                                                          *   +
+ *       |                                                          *   |
+ *   2ms +                                              (midpoint) *    +
+ *       |                                                  |    **     |
+ *   1ms +                                                  v ***       +
+ *       |             zfs_delay_scale ---------->     ********         |
+ *     0 +-------------------------------------*********----------------+
+ *       0%                    <- zfs_dirty_data_max ->               100%
+ *
+ * Note that since the delay is added to the outstanding time remaining on the
+ * most recent transaction, the delay is effectively the inverse of IOPS.
+ * Here the midpoint of 500us translates to 2000 IOPS. The shape of the curve
+ * was chosen such that small changes in the amount of accumulated dirty data
+ * in the first 3/4 of the curve yield relatively small differences in the
+ * amount of delay.
+ *
+ * The effects can be easier to understand when the amount of delay is
+ * represented on a log scale:
+ *
+ * delay
+ * 100ms +-------------------------------------------------------------++
+ *       +                                                              +
+ *       |                                                              |
+ *       +                                                             *+
+ *  10ms +                                                             *+
+ *       +                                                           ** +
+ *       |                                              (midpoint)  **  |
+ *       +                                                  |     **    +
+ *   1ms +                                                  v ****      +
+ *       +             zfs_delay_scale ---------->        *****         +
+ *       |                                             ****             |
+ *       +                                          ****                +
+ * 100us +                                        **                    +
+ *       +                                       *                      +
+ *       |                                      *                       |
+ *       +                                     *                        +
+ *  10us +                                     *                        +
+ *       +                                                              +
+ *       |                                                              |
+ *       +                                                              +
+ *       +--------------------------------------------------------------+
+ *       0%                    <- zfs_dirty_data_max ->               100%
+ *
+ * Note here that only as the amount of dirty data approaches its limit does
+ * the delay start to increase rapidly. The goal of a properly tuned system
+ * should be to keep the amount of dirty data out of that range by first
+ * ensuring that the appropriate limits are set for the I/O scheduler to reach
+ * optimal throughput on the backend storage, and then by changing the value
+ * of zfs_delay_scale to increase the steepness of the curve.
+ */
+static void
+dmu_tx_delay(dmu_tx_t *tx, uint64_t dirty)
+{
+	dsl_pool_t *dp = tx->tx_pool;
+	uint64_t delay_min_bytes =
+	    zfs_dirty_data_max * zfs_delay_min_dirty_percent / 100;
+	hrtime_t wakeup, min_tx_time, now;
+
+	if (dirty <= delay_min_bytes)
+		return;
+
+	/*
+	 * The caller has already waited until we are under the max.
+	 * We make them pass us the amount of dirty data so we don't
+	 * have to handle the case of it being >= the max, which could
+	 * cause a divide-by-zero if it's == the max.
+	 */
+	ASSERT3U(dirty, <, zfs_dirty_data_max);
+
+	now = gethrtime();
+	min_tx_time = zfs_delay_scale *
+	    (dirty - delay_min_bytes) / (zfs_dirty_data_max - dirty);
+	if (now > tx->tx_start + min_tx_time)
+		return;
+
+	min_tx_time = MIN(min_tx_time, zfs_delay_max_ns);
+
+	DTRACE_PROBE3(delay__mintime, dmu_tx_t *, tx, uint64_t, dirty,
+	    uint64_t, min_tx_time);
+
+	mutex_enter(&dp->dp_lock);
+	wakeup = MAX(tx->tx_start + min_tx_time,
+	    dp->dp_last_wakeup + min_tx_time);
+	dp->dp_last_wakeup = wakeup;
+	mutex_exit(&dp->dp_lock);
+
+#ifdef _KERNEL
+#ifdef illumos
+	mutex_enter(&curthread->t_delay_lock);
+	while (cv_timedwait_hires(&curthread->t_delay_cv,
+	    &curthread->t_delay_lock, wakeup, zfs_delay_resolution_ns,
+	    CALLOUT_FLAG_ABSOLUTE | CALLOUT_FLAG_ROUNDUP) > 0)
+		continue;
+	mutex_exit(&curthread->t_delay_lock);
+#else
+	pause_sbt("dmu_tx_delay", wakeup * SBT_1NS,
+	    zfs_delay_resolution_ns * SBT_1NS, C_ABSOLUTE);
+#endif
+#else
+	hrtime_t delta = wakeup - gethrtime();
+	struct timespec ts;
+	ts.tv_sec = delta / NANOSEC;
+	ts.tv_nsec = delta % NANOSEC;
+	(void) nanosleep(&ts, NULL);
+#endif
+}
+
 static int
 dmu_tx_try_assign(dmu_tx_t *tx, txg_how_t txg_how)
 {
@@ -941,6 +1097,12 @@ dmu_tx_try_assign(dmu_tx_t *tx, txg_how_t txg_how)
 		return (SET_ERROR(ERESTART));
 	}
 
+	if (!tx->tx_waited &&
+	    dsl_pool_need_dirty_delay(tx->tx_pool)) {
+		tx->tx_wait_dirty = B_TRUE;
+		return (SET_ERROR(ERESTART));
+	}
+
 	tx->tx_txg = txg_hold_open(tx->tx_pool, &tx->tx_txgh);
 	tx->tx_needassign_txh = NULL;
 
@@ -1065,6 +1227,10 @@ dmu_tx_unassign(dmu_tx_t *tx)
  *	blocking, returns immediately with ERESTART.  This should be used
  *	whenever you're holding locks.  On an ERESTART error, the caller
  *	should drop locks, do a dmu_tx_wait(tx), and try again.
+ *
+ * (3)  TXG_WAITED.  Like TXG_NOWAIT, but indicates that dmu_tx_wait()
+ *      has already been called on behalf of this operation (though
+ *      most likely on a different tx).
  */
 int
 dmu_tx_assign(dmu_tx_t *tx, txg_how_t txg_how)
@@ -1072,12 +1238,16 @@ dmu_tx_assign(dmu_tx_t *tx, txg_how_t txg_how)
 	int err;
 
 	ASSERT(tx->tx_txg == 0);
-	ASSERT(txg_how == TXG_WAIT || txg_how == TXG_NOWAIT);
+	ASSERT(txg_how == TXG_WAIT || txg_how == TXG_NOWAIT ||
+	    txg_how == TXG_WAITED);
 	ASSERT(!dsl_pool_sync_context(tx->tx_pool));
 
 	/* If we might wait, we must not hold the config lock. */
 	ASSERT(txg_how != TXG_WAIT || !dsl_pool_config_held(tx->tx_pool));
 
+	if (txg_how == TXG_WAITED)
+		tx->tx_waited = B_TRUE;
+
 	while ((err = dmu_tx_try_assign(tx, txg_how)) != 0) {
 		dmu_tx_unassign(tx);
 
@@ -1096,18 +1266,48 @@ void
 dmu_tx_wait(dmu_tx_t *tx)
 {
 	spa_t *spa = tx->tx_pool->dp_spa;
+	dsl_pool_t *dp = tx->tx_pool;
 
 	ASSERT(tx->tx_txg == 0);
 	ASSERT(!dsl_pool_config_held(tx->tx_pool));
 
-	/*
-	 * It's possible that the pool has become active after this thread
-	 * has tried to obtain a tx. If that's the case then his
-	 * tx_lasttried_txg would not have been assigned.
-	 */
-	if (spa_suspended(spa) || tx->tx_lasttried_txg == 0) {
-		txg_wait_synced(tx->tx_pool, spa_last_synced_txg(spa) + 1);
+	if (tx->tx_wait_dirty) {
+		/*
+		 * dmu_tx_try_assign() has determined that we need to wait
+		 * because we've consumed much or all of the dirty buffer
+		 * space.
+		 */
+		mutex_enter(&dp->dp_lock);
+		while (dp->dp_dirty_total >= zfs_dirty_data_max)
+			cv_wait(&dp->dp_spaceavail_cv, &dp->dp_lock);
+		uint64_t dirty = dp->dp_dirty_total;
+		mutex_exit(&dp->dp_lock);
+
+		dmu_tx_delay(tx, dirty);
+
+		tx->tx_wait_dirty = B_FALSE;
+
+		/*
+		 * Note: setting tx_waited only has effect if the caller
+		 * used TX_WAIT.  Otherwise they are going to destroy
+		 * this tx and try again.  The common case, zfs_write(),
+		 * uses TX_WAIT.
+		 */
+		tx->tx_waited = B_TRUE;
+	} else if (spa_suspended(spa) || tx->tx_lasttried_txg == 0) {
+		/*
+		 * If the pool is suspended we need to wait until it
+		 * is resumed.  Note that it's possible that the pool
+		 * has become active after this thread has tried to
+		 * obtain a tx.  If that's the case then tx_lasttried_txg
+		 * would not have been set.
+		 */
+		txg_wait_synced(dp, spa_last_synced_txg(spa) + 1);
 	} else if (tx->tx_needassign_txh) {
+		/*
+		 * A dnode is assigned to the quiescing txg.  Wait for its
+		 * transaction to complete.
+		 */
 		dnode_t *dn = tx->tx_needassign_txh->txh_dnode;
 
 		mutex_enter(&dn->dn_mtx);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
index 8ab5e10322b..647ad9e0441 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
@@ -23,6 +23,10 @@
  * Use is subject to license terms.
  */
 
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ */
+
 #include <sys/zfs_context.h>
 #include <sys/dnode.h>
 #include <sys/dmu_objset.h>
@@ -305,7 +309,7 @@ dmu_zfetch_fetch(dnode_t *dn, uint64_t blkid, uint64_t nblks)
 	fetchsz = dmu_zfetch_fetchsz(dn, blkid, nblks);
 
 	for (i = 0; i < fetchsz; i++) {
-		dbuf_prefetch(dn, blkid + i);
+		dbuf_prefetch(dn, blkid + i, ZIO_PRIORITY_ASYNC_READ);
 	}
 
 	return (fetchsz);
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 c943a0fadfb..9c5e3cdf0d0 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
@@ -1339,7 +1339,7 @@ dnode_set_blksz(dnode_t *dn, uint64_t size, int ibs, dmu_tx_t *tx)
 	rw_enter(&dn->dn_struct_rwlock, RW_WRITER);
 
 	/* Check for any allocated blocks beyond the first */
-	if (dn->dn_phys->dn_maxblkid != 0)
+	if (dn->dn_maxblkid != 0)
 		goto fail;
 
 	mutex_enter(&dn->dn_dbufs_mtx);
@@ -1793,23 +1793,22 @@ dnode_diduse_space(dnode_t *dn, int64_t delta)
 }
 
 /*
- * Call when we think we're going to write/free space in open context.
- * Be conservative (ie. OK to write less than this or free more than
- * this, but don't write more or free less).
+ * Call when we think we're going to write/free space in open context to track
+ * the amount of memory in use by the currently open txg.
  */
 void
 dnode_willuse_space(dnode_t *dn, int64_t space, dmu_tx_t *tx)
 {
 	objset_t *os = dn->dn_objset;
 	dsl_dataset_t *ds = os->os_dsl_dataset;
+	int64_t aspace = spa_get_asize(os->os_spa, space);
 
-	if (space > 0)
-		space = spa_get_asize(os->os_spa, space);
+	if (ds != NULL) {
+		dsl_dir_willuse_space(ds->ds_dir, aspace, tx);
+		dsl_pool_dirty_space(dmu_tx_pool(tx), space, tx);
+	}
 
-	if (ds)
-		dsl_dir_willuse_space(ds->ds_dir, space, tx);
-
-	dmu_tx_willuse_space(tx, space);
+	dmu_tx_willuse_space(tx, aspace);
 }
 
 /*
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
index 123fb325d01..06b6302dd6d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
@@ -589,7 +589,6 @@ dsl_dir_space_available(dsl_dir_t *dd,
 
 struct tempreserve {
 	list_node_t tr_node;
-	dsl_pool_t *tr_dp;
 	dsl_dir_t *tr_ds;
 	uint64_t tr_size;
 };
@@ -740,25 +739,24 @@ dsl_dir_tempreserve_space(dsl_dir_t *dd, uint64_t lsize, uint64_t asize,
 		tr = kmem_zalloc(sizeof (struct tempreserve), KM_SLEEP);
 		tr->tr_size = lsize;
 		list_insert_tail(tr_list, tr);
-
-		err = dsl_pool_tempreserve_space(dd->dd_pool, asize, tx);
 	} else {
 		if (err == EAGAIN) {
+			/*
+			 * If arc_memory_throttle() detected that pageout
+			 * is running and we are low on memory, we delay new
+			 * non-pageout transactions to give pageout an
+			 * advantage.
+			 *
+			 * It is unfortunate to be delaying while the caller's
+			 * locks are held.
+			 */
 			txg_delay(dd->dd_pool, tx->tx_txg,
 			    MSEC2NSEC(10), MSEC2NSEC(10));
 			err = SET_ERROR(ERESTART);
 		}
-		dsl_pool_memory_pressure(dd->dd_pool);
 	}
 
 	if (err == 0) {
-		struct tempreserve *tr;
-
-		tr = kmem_zalloc(sizeof (struct tempreserve), KM_SLEEP);
-		tr->tr_dp = dd->dd_pool;
-		tr->tr_size = asize;
-		list_insert_tail(tr_list, tr);
-
 		err = dsl_dir_tempreserve_impl(dd, asize, fsize >= asize,
 		    FALSE, asize > usize, tr_list, tx, TRUE);
 	}
@@ -787,10 +785,8 @@ dsl_dir_tempreserve_clear(void *tr_cookie, dmu_tx_t *tx)
 	if (tr_cookie == NULL)
 		return;
 
-	while (tr = list_head(tr_list)) {
-		if (tr->tr_dp) {
-			dsl_pool_tempreserve_clear(tr->tr_dp, tr->tr_size, tx);
-		} else if (tr->tr_ds) {
+	while ((tr = list_head(tr_list)) != NULL) {
+		if (tr->tr_ds) {
 			mutex_enter(&tr->tr_ds->dd_lock);
 			ASSERT3U(tr->tr_ds->dd_tempreserved[txgidx], >=,
 			    tr->tr_size);
@@ -806,8 +802,14 @@ dsl_dir_tempreserve_clear(void *tr_cookie, dmu_tx_t *tx)
 	kmem_free(tr_list, sizeof (list_t));
 }
 
-static void
-dsl_dir_willuse_space_impl(dsl_dir_t *dd, int64_t space, dmu_tx_t *tx)
+/*
+ * This should be called from open context when we think we're going to write
+ * or free space, for example when dirtying data. Be conservative; it's okay
+ * to write less space or free more, but we don't want to write more or free
+ * less than the amount specified.
+ */
+void
+dsl_dir_willuse_space(dsl_dir_t *dd, int64_t space, dmu_tx_t *tx)
 {
 	int64_t parent_space;
 	uint64_t est_used;
@@ -825,19 +827,7 @@ dsl_dir_willuse_space_impl(dsl_dir_t *dd, int64_t space, dmu_tx_t *tx)
 
 	/* XXX this is potentially expensive and unnecessary... */
 	if (parent_space && dd->dd_parent)
-		dsl_dir_willuse_space_impl(dd->dd_parent, parent_space, tx);
-}
-
-/*
- * Call in open context when we think we're going to write/free space,
- * eg. when dirtying data.  Be conservative (ie. OK to write less than
- * this or free more than this, but don't write more or free less).
- */
-void
-dsl_dir_willuse_space(dsl_dir_t *dd, int64_t space, dmu_tx_t *tx)
-{
-	dsl_pool_willuse_space(dd->dd_pool, space, tx);
-	dsl_dir_willuse_space_impl(dd, space, tx);
+		dsl_dir_willuse_space(dd->dd_parent, parent_space, tx);
 }
 
 /* call from syncing context when we actually write/free space for this dd */
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 963fd1c614c..4ba8b7eff8a 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
@@ -46,20 +46,93 @@
 #include <sys/zil_impl.h>
 #include <sys/dsl_userhold.h>
 
-int zfs_no_write_throttle = 0;
-int zfs_write_limit_shift = 3;			/* 1/8th of physical memory */
-int zfs_txg_synctime_ms = 1000;		/* target millisecs to sync a txg */
+/*
+ * ZFS Write Throttle
+ * ------------------
+ *
+ * ZFS must limit the rate of incoming writes to the rate at which it is able
+ * to sync data modifications to the backend storage. Throttling by too much
+ * creates an artificial limit; throttling by too little can only be sustained
+ * for short periods and would lead to highly lumpy performance. On a per-pool
+ * basis, ZFS tracks the amount of modified (dirty) data. As operations change
+ * data, the amount of dirty data increases; as ZFS syncs out data, the amount
+ * of dirty data decreases. When the amount of dirty data exceeds a
+ * predetermined threshold further modifications are blocked until the amount
+ * of dirty data decreases (as data is synced out).
+ *
+ * The limit on dirty data is tunable, and should be adjusted according to
+ * both the IO capacity and available memory of the system. The larger the
+ * window, the more ZFS is able to aggregate and amortize metadata (and data)
+ * changes. However, memory is a limited resource, and allowing for more dirty
+ * data comes at the cost of keeping other useful data in memory (for example
+ * ZFS data cached by the ARC).
+ *
+ * Implementation
+ *
+ * As buffers are modified dsl_pool_willuse_space() increments both the per-
+ * txg (dp_dirty_pertxg[]) and poolwide (dp_dirty_total) accounting of
+ * dirty space used; dsl_pool_dirty_space() decrements those values as data
+ * is synced out from dsl_pool_sync(). While only the poolwide value is
+ * relevant, the per-txg value is useful for debugging. The tunable
+ * zfs_dirty_data_max determines the dirty space limit. Once that value is
+ * exceeded, new writes are halted until space frees up.
+ *
+ * The zfs_dirty_data_sync tunable dictates the threshold at which we
+ * ensure that there is a txg syncing (see the comment in txg.c for a full
+ * description of transaction group stages).
+ *
+ * The IO scheduler uses both the dirty space limit and current amount of
+ * dirty data as inputs. Those values affect the number of concurrent IOs ZFS
+ * issues. See the comment in vdev_queue.c for details of the IO scheduler.
+ *
+ * The delay is also calculated based on the amount of dirty data.  See the
+ * comment above dmu_tx_delay() for details.
+ */
 
-uint64_t zfs_write_limit_min = 32 << 20;	/* min write limit is 32MB */
-uint64_t zfs_write_limit_max = 0;		/* max data payload per txg */
-uint64_t zfs_write_limit_inflated = 0;
-uint64_t zfs_write_limit_override = 0;
+/*
+ * zfs_dirty_data_max will be set to zfs_dirty_data_max_percent% of all memory,
+ * capped at zfs_dirty_data_max_max.  It can also be overridden in /etc/system.
+ */
+uint64_t zfs_dirty_data_max;
+uint64_t zfs_dirty_data_max_max = 4ULL * 1024 * 1024 * 1024;
+int zfs_dirty_data_max_percent = 10;
 
-kmutex_t zfs_write_limit_lock;
+/*
+ * If there is at least this much dirty data, push out a txg.
+ */
+uint64_t zfs_dirty_data_sync = 64 * 1024 * 1024;
+
+/*
+ * Once there is this amount of dirty data, the dmu_tx_delay() will kick in
+ * and delay each transaction.
+ * This value should be >= zfs_vdev_async_write_active_max_dirty_percent.
+ */
+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
+ * given throughput.
+ *
+ * For the smoothest delay, this value should be about 1 billion divided
+ * by the maximum number of operations per second.  This will smoothly
+ * handle between 10x and 1/10th this number.
+ *
+ * Note: zfs_delay_scale * zfs_dirty_data_max must be < 2^64, due to the
+ * multiply in dmu_tx_delay().
+ */
+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.
+ */
 
-static pgcnt_t old_physmem = 0;
 
 SYSCTL_DECL(_vfs_zfs);
+#if 0
 TUNABLE_INT("vfs.zfs.no_write_throttle", &zfs_no_write_throttle);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, no_write_throttle, CTLFLAG_RDTUN,
     &zfs_no_write_throttle, 0, "");
@@ -84,6 +157,7 @@ TUNABLE_QUAD("vfs.zfs.write_limit_override", &zfs_write_limit_override);
 SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, write_limit_override, CTLFLAG_RDTUN,
     &zfs_write_limit_override, 0,
     "Force a txg if dirty buffers exceed this value (bytes)");
+#endif
 
 hrtime_t zfs_throttle_delay = MSEC2NSEC(10);
 hrtime_t zfs_throttle_resolution = MSEC2NSEC(10);
@@ -113,7 +187,6 @@ dsl_pool_open_impl(spa_t *spa, uint64_t txg)
 	dp->dp_spa = spa;
 	dp->dp_meta_rootbp = *bp;
 	rrw_init(&dp->dp_config_rwlock, B_TRUE);
-	dp->dp_write_limit = zfs_write_limit_min;
 	txg_init(dp, txg);
 
 	txg_list_create(&dp->dp_dirty_datasets,
@@ -126,6 +199,7 @@ dsl_pool_open_impl(spa_t *spa, uint64_t txg)
 	    offsetof(dsl_sync_task_t, dst_node));
 
 	mutex_init(&dp->dp_lock, NULL, MUTEX_DEFAULT, NULL);
+	cv_init(&dp->dp_spaceavail_cv, NULL, CV_DEFAULT, NULL);
 
 	dp->dp_vnrele_taskq = taskq_create("zfs_vn_rele_taskq", 1, minclsyspri,
 	    1, 4, 0);
@@ -240,9 +314,9 @@ out:
 void
 dsl_pool_close(dsl_pool_t *dp)
 {
-	/* drop our references from dsl_pool_open() */
-
 	/*
+	 * Drop our references from dsl_pool_open().
+	 *
 	 * Since we held the origin_snap from "syncing" context (which
 	 * includes pool-opening context), it actually only got a "ref"
 	 * and not a hold, so just drop that here.
@@ -372,6 +446,34 @@ deadlist_enqueue_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
 	return (0);
 }
 
+static void
+dsl_pool_sync_mos(dsl_pool_t *dp, dmu_tx_t *tx)
+{
+	zio_t *zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
+	dmu_objset_sync(dp->dp_meta_objset, zio, tx);
+	VERIFY0(zio_wait(zio));
+	dprintf_bp(&dp->dp_meta_rootbp, "meta objset rootbp is %s", "");
+	spa_set_rootblkptr(dp->dp_spa, &dp->dp_meta_rootbp);
+}
+
+static void
+dsl_pool_dirty_delta(dsl_pool_t *dp, int64_t delta)
+{
+	ASSERT(MUTEX_HELD(&dp->dp_lock));
+
+	if (delta < 0)
+		ASSERT3U(-delta, <=, dp->dp_dirty_total);
+
+	dp->dp_dirty_total += delta;
+
+	/*
+	 * Note: we signal even when increasing dp_dirty_total.
+	 * This ensures forward progress -- each thread wakes the next waiter.
+	 */
+	if (dp->dp_dirty_total <= zfs_dirty_data_max)
+		cv_signal(&dp->dp_spaceavail_cv);
+}
+
 void
 dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
 {
@@ -380,29 +482,18 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
 	dsl_dir_t *dd;
 	dsl_dataset_t *ds;
 	objset_t *mos = dp->dp_meta_objset;
-	hrtime_t start, write_time;
-	uint64_t data_written;
-	int err;
 	list_t synced_datasets;
 
 	list_create(&synced_datasets, sizeof (dsl_dataset_t),
 	    offsetof(dsl_dataset_t, ds_synced_link));
 
-	/*
-	 * We need to copy dp_space_towrite() before doing
-	 * dsl_sync_task_sync(), because
-	 * dsl_dataset_snapshot_reserve_space() will increase
-	 * dp_space_towrite but not actually write anything.
-	 */
-	data_written = dp->dp_space_towrite[txg & TXG_MASK];
-
 	tx = dmu_tx_create_assigned(dp, txg);
 
-	dp->dp_read_overhead = 0;
-	start = gethrtime();
-
+	/*
+	 * Write out all dirty blocks of dirty datasets.
+	 */
 	zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
-	while (ds = txg_list_remove(&dp->dp_dirty_datasets, txg)) {
+	while ((ds = txg_list_remove(&dp->dp_dirty_datasets, txg)) != NULL) {
 		/*
 		 * We must not sync any non-MOS datasets twice, because
 		 * we may have taken a snapshot of them.  However, we
@@ -412,20 +503,25 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
 		list_insert_tail(&synced_datasets, ds);
 		dsl_dataset_sync(ds, zio, tx);
 	}
-	DTRACE_PROBE(pool_sync__1setup);
-	err = zio_wait(zio);
+	VERIFY0(zio_wait(zio));
 
-	write_time = gethrtime() - start;
-	ASSERT(err == 0);
-	DTRACE_PROBE(pool_sync__2rootzio);
+	/*
+	 * We have written all of the accounted dirty data, so our
+	 * dp_space_towrite should now be zero.  However, some seldom-used
+	 * code paths do not adhere to this (e.g. dbuf_undirty(), also
+	 * rounding error in dbuf_write_physdone).
+	 * Shore up the accounting of any dirtied space now.
+	 */
+	dsl_pool_undirty_space(dp, dp->dp_dirty_pertxg[txg & TXG_MASK], txg);
 
 	/*
 	 * After the data blocks have been written (ensured by the zio_wait()
 	 * above), update the user/group space accounting.
 	 */
-	for (ds = list_head(&synced_datasets); ds;
-	    ds = list_next(&synced_datasets, ds))
+	for (ds = list_head(&synced_datasets); ds != NULL;
+	    ds = list_next(&synced_datasets, ds)) {
 		dmu_objset_do_userquota_updates(ds->ds_objset, tx);
+	}
 
 	/*
 	 * Sync the datasets again to push out the changes due to
@@ -435,12 +531,12 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
 	 * about which blocks are part of the snapshot).
 	 */
 	zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
-	while (ds = txg_list_remove(&dp->dp_dirty_datasets, txg)) {
+	while ((ds = txg_list_remove(&dp->dp_dirty_datasets, txg)) != NULL) {
 		ASSERT(list_link_active(&ds->ds_synced_link));
 		dmu_buf_rele(ds->ds_dbuf, ds);
 		dsl_dataset_sync(ds, zio, tx);
 	}
-	err = zio_wait(zio);
+	VERIFY0(zio_wait(zio));
 
 	/*
 	 * Now that the datasets have been completely synced, we can
@@ -449,18 +545,16 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
 	 *  - move dead blocks from the pending deadlist to the on-disk deadlist
 	 *  - release hold from dsl_dataset_dirty()
 	 */
-	while (ds = list_remove_head(&synced_datasets)) {
+	while ((ds = list_remove_head(&synced_datasets)) != NULL) {
 		objset_t *os = ds->ds_objset;
 		bplist_iterate(&ds->ds_pending_deadlist,
 		    deadlist_enqueue_cb, &ds->ds_deadlist, tx);
 		ASSERT(!dmu_objset_is_dirty(os, txg));
 		dmu_buf_rele(ds->ds_dbuf, ds);
 	}
-
-	start = gethrtime();
-	while (dd = txg_list_remove(&dp->dp_dirty_dirs, txg))
+	while ((dd = txg_list_remove(&dp->dp_dirty_dirs, txg)) != NULL) {
 		dsl_dir_sync(dd, tx);
-	write_time += gethrtime() - start;
+	}
 
 	/*
 	 * The MOS's space is accounted for in the pool/$MOS
@@ -478,20 +572,10 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
 		dp->dp_mos_uncompressed_delta = 0;
 	}
 
-	start = gethrtime();
 	if (list_head(&mos->os_dirty_dnodes[txg & TXG_MASK]) != NULL ||
 	    list_head(&mos->os_free_dnodes[txg & TXG_MASK]) != NULL) {
-		zio = zio_root(dp->dp_spa, NULL, NULL, ZIO_FLAG_MUSTSUCCEED);
-		dmu_objset_sync(mos, zio, tx);
-		err = zio_wait(zio);
-		ASSERT(err == 0);
-		dprintf_bp(&dp->dp_meta_rootbp, "meta objset rootbp is %s", "");
-		spa_set_rootblkptr(dp->dp_spa, &dp->dp_meta_rootbp);
+		dsl_pool_sync_mos(dp, tx);
 	}
-	write_time += gethrtime() - start;
-	DTRACE_PROBE2(pool_sync__4io, hrtime_t, write_time,
-	    hrtime_t, dp->dp_read_overhead);
-	write_time -= dp->dp_read_overhead;
 
 	/*
 	 * If we modify a dataset in the same txg that we want to destroy it,
@@ -502,72 +586,29 @@ dsl_pool_sync(dsl_pool_t *dp, uint64_t txg)
 	 * The MOS data dirtied by the sync_tasks will be synced on the next
 	 * pass.
 	 */
-	DTRACE_PROBE(pool_sync__3task);
 	if (!txg_list_empty(&dp->dp_sync_tasks, txg)) {
 		dsl_sync_task_t *dst;
 		/*
 		 * No more sync tasks should have been added while we
 		 * were syncing.
 		 */
-		ASSERT(spa_sync_pass(dp->dp_spa) == 1);
-		while (dst = txg_list_remove(&dp->dp_sync_tasks, txg))
+		ASSERT3U(spa_sync_pass(dp->dp_spa), ==, 1);
+		while ((dst = txg_list_remove(&dp->dp_sync_tasks, txg)) != NULL)
 			dsl_sync_task_sync(dst, tx);
 	}
 
 	dmu_tx_commit(tx);
 
-	dp->dp_space_towrite[txg & TXG_MASK] = 0;
-	ASSERT(dp->dp_tempreserved[txg & TXG_MASK] == 0);
-
-	/*
-	 * If the write limit max has not been explicitly set, set it
-	 * to a fraction of available physical memory (default 1/8th).
-	 * Note that we must inflate the limit because the spa
-	 * inflates write sizes to account for data replication.
-	 * Check this each sync phase to catch changing memory size.
-	 */
-	if (physmem != old_physmem && zfs_write_limit_shift) {
-		mutex_enter(&zfs_write_limit_lock);
-		old_physmem = physmem;
-		zfs_write_limit_max = ptob(physmem) >> zfs_write_limit_shift;
-		zfs_write_limit_inflated = MAX(zfs_write_limit_min,
-		    spa_get_asize(dp->dp_spa, zfs_write_limit_max));
-		mutex_exit(&zfs_write_limit_lock);
-	}
-
-	/*
-	 * Attempt to keep the sync time consistent by adjusting the
-	 * amount of write traffic allowed into each transaction group.
-	 * Weight the throughput calculation towards the current value:
-	 * 	thru = 3/4 old_thru + 1/4 new_thru
-	 *
-	 * Note: write_time is in nanosecs while dp_throughput is expressed in
-	 * bytes per millisecond.
-	 */
-	ASSERT(zfs_write_limit_min > 0);
-	if (data_written > zfs_write_limit_min / 8 &&
-	    write_time > MSEC2NSEC(1)) {
-		uint64_t throughput = data_written / NSEC2MSEC(write_time);
-
-		if (dp->dp_throughput)
-			dp->dp_throughput = throughput / 4 +
-			    3 * dp->dp_throughput / 4;
-		else
-			dp->dp_throughput = throughput;
-		dp->dp_write_limit = MIN(zfs_write_limit_inflated,
-		    MAX(zfs_write_limit_min,
-		    dp->dp_throughput * zfs_txg_synctime_ms));
-	}
+	DTRACE_PROBE2(dsl_pool_sync__done, dsl_pool_t *dp, dp, uint64_t, txg);
 }
 
 void
 dsl_pool_sync_done(dsl_pool_t *dp, uint64_t txg)
 {
 	zilog_t *zilog;
-	dsl_dataset_t *ds;
 
 	while (zilog = txg_list_remove(&dp->dp_dirty_zilogs, txg)) {
-		ds = dmu_objset_ds(zilog->zl_os);
+		dsl_dataset_t *ds = dmu_objset_ds(zilog->zl_os);
 		zil_clean(zilog, txg);
 		ASSERT(!dmu_objset_is_dirty(zilog->zl_os, txg));
 		dmu_buf_rele(ds->ds_dbuf, zilog);
@@ -609,84 +650,50 @@ dsl_pool_adjustedsize(dsl_pool_t *dp, boolean_t netfree)
 	return (space - resv);
 }
 
-int
-dsl_pool_tempreserve_space(dsl_pool_t *dp, uint64_t space, dmu_tx_t *tx)
+boolean_t
+dsl_pool_need_dirty_delay(dsl_pool_t *dp)
 {
-	uint64_t reserved = 0;
-	uint64_t write_limit = (zfs_write_limit_override ?
-	    zfs_write_limit_override : dp->dp_write_limit);
+	uint64_t delay_min_bytes =
+	    zfs_dirty_data_max * zfs_delay_min_dirty_percent / 100;
+	boolean_t rv;
 
-	if (zfs_no_write_throttle) {
-		atomic_add_64(&dp->dp_tempreserved[tx->tx_txg & TXG_MASK],
-		    space);
-		return (0);
-	}
-
-	/*
-	 * Check to see if we have exceeded the maximum allowed IO for
-	 * this transaction group.  We can do this without locks since
-	 * a little slop here is ok.  Note that we do the reserved check
-	 * with only half the requested reserve: this is because the
-	 * reserve requests are worst-case, and we really don't want to
-	 * throttle based off of worst-case estimates.
-	 */
-	if (write_limit > 0) {
-		reserved = dp->dp_space_towrite[tx->tx_txg & TXG_MASK]
-		    + dp->dp_tempreserved[tx->tx_txg & TXG_MASK] / 2;
-
-		if (reserved && reserved > write_limit)
-			return (SET_ERROR(ERESTART));
-	}
-
-	atomic_add_64(&dp->dp_tempreserved[tx->tx_txg & TXG_MASK], space);
-
-	/*
-	 * If this transaction group is over 7/8ths capacity, delay
-	 * the caller 1 clock tick.  This will slow down the "fill"
-	 * rate until the sync process can catch up with us.
-	 */
-	if (reserved && reserved > (write_limit - (write_limit >> 3))) {
-		txg_delay(dp, tx->tx_txg, zfs_throttle_delay,
-		    zfs_throttle_resolution);
-	}
-
-	return (0);
+	mutex_enter(&dp->dp_lock);
+	if (dp->dp_dirty_total > zfs_dirty_data_sync)
+		txg_kick(dp);
+	rv = (dp->dp_dirty_total > delay_min_bytes);
+	mutex_exit(&dp->dp_lock);
+	return (rv);
 }
 
 void
-dsl_pool_tempreserve_clear(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx)
-{
-	ASSERT(dp->dp_tempreserved[tx->tx_txg & TXG_MASK] >= space);
-	atomic_add_64(&dp->dp_tempreserved[tx->tx_txg & TXG_MASK], -space);
-}
-
-void
-dsl_pool_memory_pressure(dsl_pool_t *dp)
-{
-	uint64_t space_inuse = 0;
-	int i;
-
-	if (dp->dp_write_limit == zfs_write_limit_min)
-		return;
-
-	for (i = 0; i < TXG_SIZE; i++) {
-		space_inuse += dp->dp_space_towrite[i];
-		space_inuse += dp->dp_tempreserved[i];
-	}
-	dp->dp_write_limit = MAX(zfs_write_limit_min,
-	    MIN(dp->dp_write_limit, space_inuse / 4));
-}
-
-void
-dsl_pool_willuse_space(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx)
+dsl_pool_dirty_space(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx)
 {
 	if (space > 0) {
 		mutex_enter(&dp->dp_lock);
-		dp->dp_space_towrite[tx->tx_txg & TXG_MASK] += space;
+		dp->dp_dirty_pertxg[tx->tx_txg & TXG_MASK] += space;
+		dsl_pool_dirty_delta(dp, space);
 		mutex_exit(&dp->dp_lock);
 	}
 }
 
+void
+dsl_pool_undirty_space(dsl_pool_t *dp, int64_t space, uint64_t txg)
+{
+	ASSERT3S(space, >=, 0);
+	if (space == 0)
+		return;
+	mutex_enter(&dp->dp_lock);
+	if (dp->dp_dirty_pertxg[txg & TXG_MASK] < space) {
+		/* XXX writing something we didn't dirty? */
+		space = dp->dp_dirty_pertxg[txg & TXG_MASK];
+	}
+	ASSERT3U(dp->dp_dirty_pertxg[txg & TXG_MASK], >=, space);
+	dp->dp_dirty_pertxg[txg & TXG_MASK] -= space;
+	ASSERT3U(dp->dp_dirty_total, >=, space);
+	dsl_pool_dirty_delta(dp, -space);
+	mutex_exit(&dp->dp_lock);
+}
+
 /* ARGSUSED */
 static int
 upgrade_clones_cb(dsl_pool_t *dp, dsl_dataset_t *hds, void *arg)
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 78a0c6cbf76..5472c3ae58c 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
@@ -1658,7 +1658,6 @@ dsl_scan_scrub_cb(dsl_pool_t *dp,
 	uint64_t phys_birth = BP_PHYSICAL_BIRTH(bp);
 	boolean_t needs_io;
 	int zio_flags = ZIO_FLAG_SCAN_THREAD | ZIO_FLAG_RAW | ZIO_FLAG_CANFAIL;
-	int zio_priority;
 	unsigned int scan_delay = 0;
 
 	if (phys_birth <= scn->scn_phys.scn_min_txg ||
@@ -1670,13 +1669,11 @@ dsl_scan_scrub_cb(dsl_pool_t *dp,
 	ASSERT(DSL_SCAN_IS_SCRUB_RESILVER(scn));
 	if (scn->scn_phys.scn_func == POOL_SCAN_SCRUB) {
 		zio_flags |= ZIO_FLAG_SCRUB;
-		zio_priority = ZIO_PRIORITY_SCRUB;
 		needs_io = B_TRUE;
 		scan_delay = zfs_scrub_delay;
 	} else {
 		ASSERT3U(scn->scn_phys.scn_func, ==, POOL_SCAN_RESILVER);
 		zio_flags |= ZIO_FLAG_RESILVER;
-		zio_priority = ZIO_PRIORITY_RESILVER;
 		needs_io = B_FALSE;
 		scan_delay = zfs_resilver_delay;
 	}
@@ -1735,7 +1732,7 @@ dsl_scan_scrub_cb(dsl_pool_t *dp,
 			delay(MAX((int)scan_delay, 0));
 
 		zio_nowait(zio_read(NULL, spa, bp, data, size,
-		    dsl_scan_scrub_done, NULL, zio_priority,
+		    dsl_scan_scrub_done, NULL, ZIO_PRIORITY_SCRUB,
 		    zio_flags, zb));
 	}
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
index a948e10b12b..7f2c26f766e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c
@@ -564,21 +564,23 @@ dsl_dataset_user_release_impl(nvlist_t *holds, nvlist_t *errlist,
 		ddura.ddura_holdfunc = dsl_dataset_hold_obj_string;
 		pool = spa_name(tmpdp->dp_spa);
 #ifdef _KERNEL
-		dsl_pool_config_enter(tmpdp, FTAG);
 		for (pair = nvlist_next_nvpair(holds, NULL); pair != NULL;
 		    pair = nvlist_next_nvpair(holds, pair)) {
 			dsl_dataset_t *ds;
 
+			dsl_pool_config_enter(tmpdp, FTAG);
 			error = dsl_dataset_hold_obj_string(tmpdp,
 			    nvpair_name(pair), FTAG, &ds);
 			if (error == 0) {
 				char name[MAXNAMELEN];
 				dsl_dataset_name(ds, name);
+				dsl_pool_config_exit(tmpdp, FTAG);
 				dsl_dataset_rele(ds, FTAG);
 				(void) zfs_unmount_snap(name);
+			} else {
+				dsl_pool_config_exit(tmpdp, FTAG);
 			}
 		}
-		dsl_pool_config_exit(tmpdp, FTAG);
 #endif
 	} else {
 		/* Non-temporary holds are specified by name. */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c
index 0f55cc896f7..a7691d6ba49 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c
@@ -44,6 +44,8 @@ static int LZ4_compressCtx(void *ctx, const char *source, char *dest,
 static int LZ4_compress64kCtx(void *ctx, const char *source, char *dest,
     int isize, int osize);
 
+static kmem_cache_t *lz4_ctx_cache;
+
 /*ARGSUSED*/
 size_t
 lz4_compress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
@@ -840,7 +842,7 @@ static int
 real_LZ4_compress(const char *source, char *dest, int isize, int osize)
 {
 #if HEAPMODE
-	void *ctx = kmem_zalloc(sizeof (struct refTables), KM_NOSLEEP);
+	void *ctx = kmem_cache_alloc(lz4_ctx_cache, KM_NOSLEEP);
 	int result;
 
 	/*
@@ -850,12 +852,13 @@ real_LZ4_compress(const char *source, char *dest, int isize, int osize)
 	if (ctx == NULL)
 		return (0);
 
+	bzero(ctx, sizeof(struct refTables));
 	if (isize < LZ4_64KLIMIT)
 		result = LZ4_compress64kCtx(ctx, source, dest, isize, osize);
 	else
 		result = LZ4_compressCtx(ctx, source, dest, isize, osize);
 
-	kmem_free(ctx, sizeof (struct refTables));
+	kmem_cache_free(lz4_ctx_cache, ctx);
 	return (result);
 #else
 	if (isize < (int)LZ4_64KLIMIT)
@@ -1001,3 +1004,22 @@ LZ4_uncompress_unknownOutputSize(const char *source, char *dest, int isize,
 	_output_error:
 	return (int)(-(((char *)ip) - source));
 }
+
+extern void
+lz4_init(void)
+{
+
+#if HEAPMODE
+	lz4_ctx_cache = kmem_cache_create("lz4_ctx", sizeof(struct refTables),
+	    0, NULL, NULL, NULL, NULL, NULL, 0);
+#endif
+}
+
+extern void
+lz4_fini(void)
+{
+
+#if HEAPMODE
+	kmem_cache_destroy(lz4_ctx_cache);
+#endif
+}
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c
index f8d3061bed8..699373ad4d4 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c
@@ -117,7 +117,9 @@ lzjb_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
 			src += 2;
 			if ((cpy = dst - offset) < (uchar_t *)d_start)
 				return (-1);
-			while (--mlen >= 0 && dst < d_end)
+			if (mlen > (d_end - dst))
+				mlen = d_end - dst;
+			while (--mlen >= 0)
 				*dst++ = *cpy++;
 		} else {
 			*dst++ = *src++;
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 50a1e82ba7f..42dcd4aad9c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
@@ -31,6 +31,7 @@
 #include <sys/metaslab_impl.h>
 #include <sys/vdev_impl.h>
 #include <sys/zio.h>
+#include <sys/spa_impl.h>
 
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, metaslab, CTLFLAG_RW, 0, "ZFS metaslab");
@@ -47,6 +48,11 @@ SYSCTL_NODE(_vfs_zfs, OID_AUTO, metaslab, CTLFLAG_RW, 0, "ZFS metaslab");
 	(!((flags) & (METASLAB_GANG_CHILD | METASLAB_GANG_HEADER | \
 	METASLAB_GANG_AVOID)))
 
+#define	METASLAB_WEIGHT_PRIMARY		(1ULL << 63)
+#define	METASLAB_WEIGHT_SECONDARY	(1ULL << 62)
+#define	METASLAB_ACTIVE_MASK		\
+	(METASLAB_WEIGHT_PRIMARY | METASLAB_WEIGHT_SECONDARY)
+
 uint64_t metaslab_aliquot = 512ULL << 10;
 uint64_t metaslab_gang_bang = SPA_MAXBLOCKSIZE + 1;	/* force gang blocks */
 TUNABLE_QUAD("vfs.zfs.metaslab.gang_bang", &metaslab_gang_bang);
@@ -61,11 +67,17 @@ SYSCTL_QUAD(_vfs_zfs_metaslab, OID_AUTO, gang_bang, CTLFLAG_RWTUN,
  * Values should be greater than or equal to 100.
  */
 int zfs_condense_pct = 200;
+TUNABLE_INT("vfs.zfs.condense_pct", &zfs_condense_pct);
+SYSCTL_INT(_vfs_zfs, OID_AUTO, condense_pct, CTLFLAG_RWTUN,
+    &zfs_condense_pct, 0,
+    "Condense on-disk spacemap when it is more than this many percents"
+    " of in-memory counterpart");
 
 /*
  * This value defines the number of allowed allocation failures per vdev.
  * If a device reaches this threshold in a given txg then we consider skipping
- * allocations on that device.
+ * allocations on that device. The value of zfs_mg_alloc_failures is computed
+ * in zio_init() unless it has been overridden in /etc/system.
  */
 int zfs_mg_alloc_failures = 0;
 TUNABLE_INT("vfs.zfs.mg_alloc_failures", &zfs_mg_alloc_failures);
@@ -74,13 +86,42 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, mg_alloc_failures, CTLFLAG_RWTUN,
     "Number of allowed allocation failures per vdev");
 
 /*
- * Metaslab debugging: when set, keeps all space maps in core to verify frees.
+ * The zfs_mg_noalloc_threshold defines which metaslab groups should
+ * be eligible for allocation. The value is defined as a percentage of
+ * a free space. Metaslab groups that have more free space than
+ * zfs_mg_noalloc_threshold are always eligible for allocations. Once
+ * a metaslab group's free space is less than or equal to the
+ * zfs_mg_noalloc_threshold the allocator will avoid allocating to that
+ * group unless all groups in the pool have reached zfs_mg_noalloc_threshold.
+ * Once all groups in the pool reach zfs_mg_noalloc_threshold then all
+ * groups are allowed to accept allocations. Gang blocks are always
+ * eligible to allocate on any metaslab group. The default value of 0 means
+ * no metaslab group will be excluded based on this criterion.
  */
-static int metaslab_debug = 0;
-TUNABLE_INT("vfs.zfs.metaslab.debug", &metaslab_debug);
-SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, debug, CTLFLAG_RWTUN, &metaslab_debug,
-    0,
-    "Metaslab debugging: when set, keeps all space maps in core to verify frees");
+int zfs_mg_noalloc_threshold = 0;
+TUNABLE_INT("vfs.zfs.mg_noalloc_threshold", &zfs_mg_noalloc_threshold);
+SYSCTL_INT(_vfs_zfs, OID_AUTO, mg_noalloc_threshold, CTLFLAG_RWTUN,
+    &zfs_mg_noalloc_threshold, 0,
+    "Percentage of metaslab group size that should be free"
+    " to make it eligible for allocation");
+
+/*
+ * When set will load all metaslabs when pool is first opened.
+ */
+int metaslab_debug_load = 0;
+TUNABLE_INT("vfs.zfs.metaslab.debug_load", &metaslab_debug_load);
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, debug_load, CTLFLAG_RWTUN,
+    &metaslab_debug_load, 0,
+    "Load all metaslabs when pool is first opened");
+
+/*
+ * When set will prevent metaslabs from being unloaded.
+ */
+int metaslab_debug_unload = 0;
+TUNABLE_INT("vfs.zfs.metaslab.debug_unload", &metaslab_debug_unload);
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, debug_unload, CTLFLAG_RWTUN,
+    &metaslab_debug_unload, 0,
+    "Prevent metaslabs from being unloaded");
 
 /*
  * Minimum size which forces the dynamic allocator to change
@@ -119,20 +160,24 @@ SYSCTL_QUAD(_vfs_zfs_metaslab, OID_AUTO, min_alloc_size, CTLFLAG_RWTUN,
     "A metaslab is considered \"free\" if it contains a contiguous segment which is greater than vfs.zfs.metaslab.min_alloc_size");
 
 /*
- * Max number of space_maps to prefetch.
+ * Percentage of all cpus that can be used by the metaslab taskq.
  */
-int metaslab_prefetch_limit = SPA_DVAS_PER_BP;
-TUNABLE_INT("vfs.zfs.metaslab.prefetch_limit", &metaslab_prefetch_limit);
-SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, prefetch_limit, CTLFLAG_RWTUN,
-    &metaslab_prefetch_limit, 0, "Maximum number of space_maps to prefetch");
+int metaslab_load_pct = 50;
+TUNABLE_INT("vfs.zfs.metaslab.load_pct", &metaslab_load_pct);
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, load_pct, CTLFLAG_RWTUN,
+    &metaslab_load_pct, 0,
+    "Percentage of cpus that can be used by the metaslab taskq");
 
 /*
- * Percentage bonus multiplier for metaslabs that are in the bonus area.
+ * Determines how many txgs a metaslab may remain loaded without having any
+ * allocations from it. As long as a metaslab continues to be used we will
+ * keep it loaded.
  */
-int metaslab_smo_bonus_pct = 150;
-TUNABLE_INT("vfs.zfs.metaslab.smo_bonus_pct", &metaslab_smo_bonus_pct);
-SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, smo_bonus_pct, CTLFLAG_RWTUN,
-    &metaslab_smo_bonus_pct, 0, "Maximum number of space_maps to prefetch");
+int metaslab_unload_delay = TXG_SIZE * 2;
+TUNABLE_INT("vfs.zfs.metaslab.unload_delay", &metaslab_unload_delay);
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, unload_delay, CTLFLAG_RWTUN,
+    &metaslab_unload_delay, 0,
+    "Number of TXGs that an unused metaslab can be kept in memory");
 
 /*
  * Should we be willing to write data to degraded vdevs?
@@ -142,13 +187,42 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, write_to_degraded, CTLFLAG_RWTUN,
     &zfs_write_to_degraded, 0, "Allow writing data to degraded vdevs");
 TUNABLE_INT("vfs.zfs.write_to_degraded", &zfs_write_to_degraded);
 
+/*
+ * Max number of metaslabs per group to preload.
+ */
+int metaslab_preload_limit = SPA_DVAS_PER_BP;
+TUNABLE_INT("vfs.zfs.metaslab.preload_limit", &metaslab_preload_limit);
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, preload_limit, CTLFLAG_RWTUN,
+    &metaslab_preload_limit, 0,
+    "Max number of metaslabs per group to preload");
+
+/*
+ * Enable/disable preloading of metaslab.
+ */
+boolean_t metaslab_preload_enabled = B_TRUE;
+TUNABLE_INT("vfs.zfs.metaslab.preload_enabled", &metaslab_preload_enabled);
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, preload_enabled, CTLFLAG_RWTUN,
+    &metaslab_preload_enabled, 0,
+    "Max number of metaslabs per group to preload");
+
+/*
+ * Enable/disable additional weight factor for each metaslab.
+ */
+boolean_t metaslab_weight_factor_enable = B_FALSE;
+TUNABLE_INT("vfs.zfs.metaslab.weight_factor_enable",
+    &metaslab_weight_factor_enable);
+SYSCTL_INT(_vfs_zfs_metaslab, OID_AUTO, weight_factor_enable, CTLFLAG_RWTUN,
+    &metaslab_weight_factor_enable, 0,
+    "Enable additional weight factor for each metaslab");
+
+
 /*
  * ==========================================================================
  * Metaslab classes
  * ==========================================================================
  */
 metaslab_class_t *
-metaslab_class_create(spa_t *spa, space_map_ops_t *ops)
+metaslab_class_create(spa_t *spa, metaslab_ops_t *ops)
 {
 	metaslab_class_t *mc;
 
@@ -279,9 +353,9 @@ metaslab_compare(const void *x1, const void *x2)
 	/*
 	 * If the weights are identical, use the offset to force uniqueness.
 	 */
-	if (m1->ms_map->sm_start < m2->ms_map->sm_start)
+	if (m1->ms_start < m2->ms_start)
 		return (-1);
-	if (m1->ms_map->sm_start > m2->ms_map->sm_start)
+	if (m1->ms_start > m2->ms_start)
 		return (1);
 
 	ASSERT3P(m1, ==, m2);
@@ -289,6 +363,53 @@ metaslab_compare(const void *x1, const void *x2)
 	return (0);
 }
 
+/*
+ * Update the allocatable flag and the metaslab group's capacity.
+ * The allocatable flag is set to true if the capacity is below
+ * the zfs_mg_noalloc_threshold. If a metaslab group transitions
+ * from allocatable to non-allocatable or vice versa then the metaslab
+ * group's class is updated to reflect the transition.
+ */
+static void
+metaslab_group_alloc_update(metaslab_group_t *mg)
+{
+	vdev_t *vd = mg->mg_vd;
+	metaslab_class_t *mc = mg->mg_class;
+	vdev_stat_t *vs = &vd->vdev_stat;
+	boolean_t was_allocatable;
+
+	ASSERT(vd == vd->vdev_top);
+
+	mutex_enter(&mg->mg_lock);
+	was_allocatable = mg->mg_allocatable;
+
+	mg->mg_free_capacity = ((vs->vs_space - vs->vs_alloc) * 100) /
+	    (vs->vs_space + 1);
+
+	mg->mg_allocatable = (mg->mg_free_capacity > zfs_mg_noalloc_threshold);
+
+	/*
+	 * The mc_alloc_groups maintains a count of the number of
+	 * groups in this metaslab class that are still above the
+	 * zfs_mg_noalloc_threshold. This is used by the allocating
+	 * threads to determine if they should avoid allocations to
+	 * a given group. The allocator will avoid allocations to a group
+	 * if that group has reached or is below the zfs_mg_noalloc_threshold
+	 * and there are still other groups that are above the threshold.
+	 * When a group transitions from allocatable to non-allocatable or
+	 * vice versa we update the metaslab class to reflect that change.
+	 * When the mc_alloc_groups value drops to 0 that means that all
+	 * groups have reached the zfs_mg_noalloc_threshold making all groups
+	 * eligible for allocations. This effectively means that all devices
+	 * are balanced again.
+	 */
+	if (was_allocatable && !mg->mg_allocatable)
+		mc->mc_alloc_groups--;
+	else if (!was_allocatable && mg->mg_allocatable)
+		mc->mc_alloc_groups++;
+	mutex_exit(&mg->mg_lock);
+}
+
 metaslab_group_t *
 metaslab_group_create(metaslab_class_t *mc, vdev_t *vd)
 {
@@ -302,6 +423,9 @@ metaslab_group_create(metaslab_class_t *mc, vdev_t *vd)
 	mg->mg_class = mc;
 	mg->mg_activation_count = 0;
 
+	mg->mg_taskq = taskq_create("metaslab_group_tasksq", metaslab_load_pct,
+	    minclsyspri, 10, INT_MAX, TASKQ_THREADS_CPU_PCT);
+
 	return (mg);
 }
 
@@ -339,6 +463,7 @@ metaslab_group_activate(metaslab_group_t *mg)
 		return;
 
 	mg->mg_aliquot = metaslab_aliquot * MAX(1, mg->mg_vd->vdev_children);
+	metaslab_group_alloc_update(mg);
 
 	if ((mgprev = mc->mc_rotor) == NULL) {
 		mg->mg_prev = mg;
@@ -370,6 +495,8 @@ metaslab_group_passivate(metaslab_group_t *mg)
 		return;
 	}
 
+	taskq_wait(mg->mg_taskq);
+
 	mgprev = mg->mg_prev;
 	mgnext = mg->mg_next;
 
@@ -425,32 +552,187 @@ metaslab_group_sort(metaslab_group_t *mg, metaslab_t *msp, uint64_t weight)
 	mutex_exit(&mg->mg_lock);
 }
 
+/*
+ * Determine if a given metaslab group should skip allocations. A metaslab
+ * group should avoid allocations if its used capacity has crossed the
+ * zfs_mg_noalloc_threshold and there is at least one metaslab group
+ * that can still handle allocations.
+ */
+static boolean_t
+metaslab_group_allocatable(metaslab_group_t *mg)
+{
+	vdev_t *vd = mg->mg_vd;
+	spa_t *spa = vd->vdev_spa;
+	metaslab_class_t *mc = mg->mg_class;
+
+	/*
+	 * A metaslab group is considered allocatable if its free capacity
+	 * is greater than the set value of zfs_mg_noalloc_threshold, it's
+	 * associated with a slog, or there are no other metaslab groups
+	 * with free capacity greater than zfs_mg_noalloc_threshold.
+	 */
+	return (mg->mg_free_capacity > zfs_mg_noalloc_threshold ||
+	    mc != spa_normal_class(spa) || mc->mc_alloc_groups == 0);
+}
+
 /*
  * ==========================================================================
- * Common allocator routines
+ * Range tree callbacks
  * ==========================================================================
  */
-static int
-metaslab_segsize_compare(const void *x1, const void *x2)
-{
-	const space_seg_t *s1 = x1;
-	const space_seg_t *s2 = x2;
-	uint64_t ss_size1 = s1->ss_end - s1->ss_start;
-	uint64_t ss_size2 = s2->ss_end - s2->ss_start;
 
-	if (ss_size1 < ss_size2)
+/*
+ * Comparison function for the private size-ordered tree. Tree is sorted
+ * by size, larger sizes at the end of the tree.
+ */
+static int
+metaslab_rangesize_compare(const void *x1, const void *x2)
+{
+	const range_seg_t *r1 = x1;
+	const range_seg_t *r2 = x2;
+	uint64_t rs_size1 = r1->rs_end - r1->rs_start;
+	uint64_t rs_size2 = r2->rs_end - r2->rs_start;
+
+	if (rs_size1 < rs_size2)
 		return (-1);
-	if (ss_size1 > ss_size2)
+	if (rs_size1 > rs_size2)
 		return (1);
 
-	if (s1->ss_start < s2->ss_start)
+	if (r1->rs_start < r2->rs_start)
 		return (-1);
-	if (s1->ss_start > s2->ss_start)
+
+	if (r1->rs_start > r2->rs_start)
 		return (1);
 
 	return (0);
 }
 
+/*
+ * Create any block allocator specific components. The current allocators
+ * rely on using both a size-ordered range_tree_t and an array of uint64_t's.
+ */
+static void
+metaslab_rt_create(range_tree_t *rt, void *arg)
+{
+	metaslab_t *msp = arg;
+
+	ASSERT3P(rt->rt_arg, ==, msp);
+	ASSERT(msp->ms_tree == NULL);
+
+	avl_create(&msp->ms_size_tree, metaslab_rangesize_compare,
+	    sizeof (range_seg_t), offsetof(range_seg_t, rs_pp_node));
+}
+
+/*
+ * Destroy the block allocator specific components.
+ */
+static void
+metaslab_rt_destroy(range_tree_t *rt, void *arg)
+{
+	metaslab_t *msp = arg;
+
+	ASSERT3P(rt->rt_arg, ==, msp);
+	ASSERT3P(msp->ms_tree, ==, rt);
+	ASSERT0(avl_numnodes(&msp->ms_size_tree));
+
+	avl_destroy(&msp->ms_size_tree);
+}
+
+static void
+metaslab_rt_add(range_tree_t *rt, range_seg_t *rs, void *arg)
+{
+	metaslab_t *msp = arg;
+
+	ASSERT3P(rt->rt_arg, ==, msp);
+	ASSERT3P(msp->ms_tree, ==, rt);
+	VERIFY(!msp->ms_condensing);
+	avl_add(&msp->ms_size_tree, rs);
+}
+
+static void
+metaslab_rt_remove(range_tree_t *rt, range_seg_t *rs, void *arg)
+{
+	metaslab_t *msp = arg;
+
+	ASSERT3P(rt->rt_arg, ==, msp);
+	ASSERT3P(msp->ms_tree, ==, rt);
+	VERIFY(!msp->ms_condensing);
+	avl_remove(&msp->ms_size_tree, rs);
+}
+
+static void
+metaslab_rt_vacate(range_tree_t *rt, void *arg)
+{
+	metaslab_t *msp = arg;
+
+	ASSERT3P(rt->rt_arg, ==, msp);
+	ASSERT3P(msp->ms_tree, ==, rt);
+
+	/*
+	 * Normally one would walk the tree freeing nodes along the way.
+	 * Since the nodes are shared with the range trees we can avoid
+	 * walking all nodes and just reinitialize the avl tree. The nodes
+	 * will be freed by the range tree, so we don't want to free them here.
+	 */
+	avl_create(&msp->ms_size_tree, metaslab_rangesize_compare,
+	    sizeof (range_seg_t), offsetof(range_seg_t, rs_pp_node));
+}
+
+static range_tree_ops_t metaslab_rt_ops = {
+	metaslab_rt_create,
+	metaslab_rt_destroy,
+	metaslab_rt_add,
+	metaslab_rt_remove,
+	metaslab_rt_vacate
+};
+
+/*
+ * ==========================================================================
+ * Metaslab block operations
+ * ==========================================================================
+ */
+
+/*
+ * Return the maximum contiguous segment within the metaslab.
+ */
+uint64_t
+metaslab_block_maxsize(metaslab_t *msp)
+{
+	avl_tree_t *t = &msp->ms_size_tree;
+	range_seg_t *rs;
+
+	if (t == NULL || (rs = avl_last(t)) == NULL)
+		return (0ULL);
+
+	return (rs->rs_end - rs->rs_start);
+}
+
+uint64_t
+metaslab_block_alloc(metaslab_t *msp, uint64_t size)
+{
+	uint64_t start;
+	range_tree_t *rt = msp->ms_tree;
+
+	VERIFY(!msp->ms_condensing);
+
+	start = msp->ms_ops->msop_alloc(msp, size);
+	if (start != -1ULL) {
+		vdev_t *vd = msp->ms_group->mg_vd;
+
+		VERIFY0(P2PHASE(start, 1ULL << vd->vdev_ashift));
+		VERIFY0(P2PHASE(size, 1ULL << vd->vdev_ashift));
+		VERIFY3U(range_tree_space(rt) - size, <=, msp->ms_size);
+		range_tree_remove(rt, start, size);
+	}
+	return (start);
+}
+
+/*
+ * ==========================================================================
+ * Common allocator routines
+ * ==========================================================================
+ */
+
 /*
  * This is a helper function that can be used by the allocator to find
  * a suitable block to allocate. This will search the specified AVL
@@ -460,24 +742,24 @@ static uint64_t
 metaslab_block_picker(avl_tree_t *t, uint64_t *cursor, uint64_t size,
     uint64_t align)
 {
-	space_seg_t *ss, ssearch;
+	range_seg_t *rs, rsearch;
 	avl_index_t where;
 
-	ssearch.ss_start = *cursor;
-	ssearch.ss_end = *cursor + size;
+	rsearch.rs_start = *cursor;
+	rsearch.rs_end = *cursor + size;
 
-	ss = avl_find(t, &ssearch, &where);
-	if (ss == NULL)
-		ss = avl_nearest(t, where, AVL_AFTER);
+	rs = avl_find(t, &rsearch, &where);
+	if (rs == NULL)
+		rs = avl_nearest(t, where, AVL_AFTER);
 
-	while (ss != NULL) {
-		uint64_t offset = P2ROUNDUP(ss->ss_start, align);
+	while (rs != NULL) {
+		uint64_t offset = P2ROUNDUP(rs->rs_start, align);
 
-		if (offset + size <= ss->ss_end) {
+		if (offset + size <= rs->rs_end) {
 			*cursor = offset + size;
 			return (offset);
 		}
-		ss = AVL_NEXT(t, ss);
+		rs = AVL_NEXT(t, rs);
 	}
 
 	/*
@@ -491,97 +773,37 @@ metaslab_block_picker(avl_tree_t *t, uint64_t *cursor, uint64_t size,
 	return (metaslab_block_picker(t, cursor, size, align));
 }
 
-static void
-metaslab_pp_load(space_map_t *sm)
-{
-	space_seg_t *ss;
-
-	ASSERT(sm->sm_ppd == NULL);
-	sm->sm_ppd = kmem_zalloc(64 * sizeof (uint64_t), KM_SLEEP);
-
-	sm->sm_pp_root = kmem_alloc(sizeof (avl_tree_t), KM_SLEEP);
-	avl_create(sm->sm_pp_root, metaslab_segsize_compare,
-	    sizeof (space_seg_t), offsetof(struct space_seg, ss_pp_node));
-
-	for (ss = avl_first(&sm->sm_root); ss; ss = AVL_NEXT(&sm->sm_root, ss))
-		avl_add(sm->sm_pp_root, ss);
-}
-
-static void
-metaslab_pp_unload(space_map_t *sm)
-{
-	void *cookie = NULL;
-
-	kmem_free(sm->sm_ppd, 64 * sizeof (uint64_t));
-	sm->sm_ppd = NULL;
-
-	while (avl_destroy_nodes(sm->sm_pp_root, &cookie) != NULL) {
-		/* tear down the tree */
-	}
-
-	avl_destroy(sm->sm_pp_root);
-	kmem_free(sm->sm_pp_root, sizeof (avl_tree_t));
-	sm->sm_pp_root = NULL;
-}
-
-/* ARGSUSED */
-static void
-metaslab_pp_claim(space_map_t *sm, uint64_t start, uint64_t size)
-{
-	/* No need to update cursor */
-}
-
-/* ARGSUSED */
-static void
-metaslab_pp_free(space_map_t *sm, uint64_t start, uint64_t size)
-{
-	/* No need to update cursor */
-}
-
-/*
- * Return the maximum contiguous segment within the metaslab.
- */
-uint64_t
-metaslab_pp_maxsize(space_map_t *sm)
-{
-	avl_tree_t *t = sm->sm_pp_root;
-	space_seg_t *ss;
-
-	if (t == NULL || (ss = avl_last(t)) == NULL)
-		return (0ULL);
-
-	return (ss->ss_end - ss->ss_start);
-}
-
 /*
  * ==========================================================================
  * The first-fit block allocator
  * ==========================================================================
  */
 static uint64_t
-metaslab_ff_alloc(space_map_t *sm, uint64_t size)
+metaslab_ff_alloc(metaslab_t *msp, uint64_t size)
 {
-	avl_tree_t *t = &sm->sm_root;
+	/*
+	 * Find the largest power of 2 block size that evenly divides the
+	 * requested size. This is used to try to allocate blocks with similar
+	 * alignment from the same area of the metaslab (i.e. same cursor
+	 * bucket) but it does not guarantee that other allocations sizes
+	 * may exist in the same region.
+	 */
 	uint64_t align = size & -size;
-	uint64_t *cursor = (uint64_t *)sm->sm_ppd + highbit(align) - 1;
+	uint64_t *cursor = &msp->ms_lbas[highbit(align) - 1];
+	avl_tree_t *t = &msp->ms_tree->rt_root;
 
 	return (metaslab_block_picker(t, cursor, size, align));
 }
 
 /* ARGSUSED */
-boolean_t
-metaslab_ff_fragmented(space_map_t *sm)
+static boolean_t
+metaslab_ff_fragmented(metaslab_t *msp)
 {
 	return (B_TRUE);
 }
 
-static space_map_ops_t metaslab_ff_ops = {
-	metaslab_pp_load,
-	metaslab_pp_unload,
+static metaslab_ops_t metaslab_ff_ops = {
 	metaslab_ff_alloc,
-	metaslab_pp_claim,
-	metaslab_pp_free,
-	metaslab_pp_maxsize,
 	metaslab_ff_fragmented
 };
 
@@ -594,16 +816,24 @@ static space_map_ops_t metaslab_ff_ops = {
  * ==========================================================================
  */
 static uint64_t
-metaslab_df_alloc(space_map_t *sm, uint64_t size)
+metaslab_df_alloc(metaslab_t *msp, uint64_t size)
 {
-	avl_tree_t *t = &sm->sm_root;
+	/*
+	 * Find the largest power of 2 block size that evenly divides the
+	 * requested size. This is used to try to allocate blocks with similar
+	 * alignment from the same area of the metaslab (i.e. same cursor
+	 * bucket) but it does not guarantee that other allocations sizes
+	 * may exist in the same region.
+	 */
 	uint64_t align = size & -size;
-	uint64_t *cursor = (uint64_t *)sm->sm_ppd + highbit(align) - 1;
-	uint64_t max_size = metaslab_pp_maxsize(sm);
-	int free_pct = sm->sm_space * 100 / sm->sm_size;
+	uint64_t *cursor = &msp->ms_lbas[highbit(align) - 1];
+	range_tree_t *rt = msp->ms_tree;
+	avl_tree_t *t = &rt->rt_root;
+	uint64_t max_size = metaslab_block_maxsize(msp);
+	int free_pct = range_tree_space(rt) * 100 / msp->ms_size;
 
-	ASSERT(MUTEX_HELD(sm->sm_lock));
-	ASSERT3U(avl_numnodes(&sm->sm_root), ==, avl_numnodes(sm->sm_pp_root));
+	ASSERT(MUTEX_HELD(&msp->ms_lock));
+	ASSERT3U(avl_numnodes(t), ==, avl_numnodes(&msp->ms_size_tree));
 
 	if (max_size < size)
 		return (-1ULL);
@@ -614,7 +844,7 @@ metaslab_df_alloc(space_map_t *sm, uint64_t size)
 	 */
 	if (max_size < metaslab_df_alloc_threshold ||
 	    free_pct < metaslab_df_free_pct) {
-		t = sm->sm_pp_root;
+		t = &msp->ms_size_tree;
 		*cursor = 0;
 	}
 
@@ -622,10 +852,11 @@ metaslab_df_alloc(space_map_t *sm, uint64_t size)
 }
 
 static boolean_t
-metaslab_df_fragmented(space_map_t *sm)
+metaslab_df_fragmented(metaslab_t *msp)
 {
-	uint64_t max_size = metaslab_pp_maxsize(sm);
-	int free_pct = sm->sm_space * 100 / sm->sm_size;
+	range_tree_t *rt = msp->ms_tree;
+	uint64_t max_size = metaslab_block_maxsize(msp);
+	int free_pct = range_tree_space(rt) * 100 / msp->ms_size;
 
 	if (max_size >= metaslab_df_alloc_threshold &&
 	    free_pct >= metaslab_df_free_pct)
@@ -634,182 +865,228 @@ metaslab_df_fragmented(space_map_t *sm)
 	return (B_TRUE);
 }
 
-static space_map_ops_t metaslab_df_ops = {
-	metaslab_pp_load,
-	metaslab_pp_unload,
+static metaslab_ops_t metaslab_df_ops = {
 	metaslab_df_alloc,
-	metaslab_pp_claim,
-	metaslab_pp_free,
-	metaslab_pp_maxsize,
 	metaslab_df_fragmented
 };
 
 /*
  * ==========================================================================
- * Other experimental allocators
+ * Cursor fit block allocator -
+ * Select the largest region in the metaslab, set the cursor to the beginning
+ * of the range and the cursor_end to the end of the range. As allocations
+ * are made advance the cursor. Continue allocating from the cursor until
+ * the range is exhausted and then find a new range.
  * ==========================================================================
  */
 static uint64_t
-metaslab_cdf_alloc(space_map_t *sm, uint64_t size)
+metaslab_cf_alloc(metaslab_t *msp, uint64_t size)
 {
-	avl_tree_t *t = &sm->sm_root;
-	uint64_t *cursor = (uint64_t *)sm->sm_ppd;
-	uint64_t *extent_end = (uint64_t *)sm->sm_ppd + 1;
-	uint64_t max_size = metaslab_pp_maxsize(sm);
-	uint64_t rsize = size;
+	range_tree_t *rt = msp->ms_tree;
+	avl_tree_t *t = &msp->ms_size_tree;
+	uint64_t *cursor = &msp->ms_lbas[0];
+	uint64_t *cursor_end = &msp->ms_lbas[1];
 	uint64_t offset = 0;
 
-	ASSERT(MUTEX_HELD(sm->sm_lock));
-	ASSERT3U(avl_numnodes(&sm->sm_root), ==, avl_numnodes(sm->sm_pp_root));
+	ASSERT(MUTEX_HELD(&msp->ms_lock));
+	ASSERT3U(avl_numnodes(t), ==, avl_numnodes(&rt->rt_root));
 
-	if (max_size < size)
-		return (-1ULL);
+	ASSERT3U(*cursor_end, >=, *cursor);
 
-	ASSERT3U(*extent_end, >=, *cursor);
+	if ((*cursor + size) > *cursor_end) {
+		range_seg_t *rs;
 
-	/*
-	 * If we're running low on space switch to using the size
-	 * sorted AVL tree (best-fit).
-	 */
-	if ((*cursor + size) > *extent_end) {
+		rs = avl_last(&msp->ms_size_tree);
+		if (rs == NULL || (rs->rs_end - rs->rs_start) < size)
+			return (-1ULL);
 
-		t = sm->sm_pp_root;
-		*cursor = *extent_end = 0;
-
-		if (max_size > 2 * SPA_MAXBLOCKSIZE)
-			rsize = MIN(metaslab_min_alloc_size, max_size);
-		offset = metaslab_block_picker(t, extent_end, rsize, 1ULL);
-		if (offset != -1)
-			*cursor = offset + size;
-	} else {
-		offset = metaslab_block_picker(t, cursor, rsize, 1ULL);
+		*cursor = rs->rs_start;
+		*cursor_end = rs->rs_end;
 	}
-	ASSERT3U(*cursor, <=, *extent_end);
+
+	offset = *cursor;
+	*cursor += size;
+
 	return (offset);
 }
 
 static boolean_t
-metaslab_cdf_fragmented(space_map_t *sm)
+metaslab_cf_fragmented(metaslab_t *msp)
 {
-	uint64_t max_size = metaslab_pp_maxsize(sm);
-
-	if (max_size > (metaslab_min_alloc_size * 10))
-		return (B_FALSE);
-	return (B_TRUE);
+	return (metaslab_block_maxsize(msp) < metaslab_min_alloc_size);
 }
 
-static space_map_ops_t metaslab_cdf_ops = {
-	metaslab_pp_load,
-	metaslab_pp_unload,
-	metaslab_cdf_alloc,
-	metaslab_pp_claim,
-	metaslab_pp_free,
-	metaslab_pp_maxsize,
-	metaslab_cdf_fragmented
+static metaslab_ops_t metaslab_cf_ops = {
+	metaslab_cf_alloc,
+	metaslab_cf_fragmented
 };
 
+/*
+ * ==========================================================================
+ * New dynamic fit allocator -
+ * Select a region that is large enough to allocate 2^metaslab_ndf_clump_shift
+ * contiguous blocks. If no region is found then just use the largest segment
+ * that remains.
+ * ==========================================================================
+ */
+
+/*
+ * Determines desired number of contiguous blocks (2^metaslab_ndf_clump_shift)
+ * to request from the allocator.
+ */
 uint64_t metaslab_ndf_clump_shift = 4;
 
 static uint64_t
-metaslab_ndf_alloc(space_map_t *sm, uint64_t size)
+metaslab_ndf_alloc(metaslab_t *msp, uint64_t size)
 {
-	avl_tree_t *t = &sm->sm_root;
+	avl_tree_t *t = &msp->ms_tree->rt_root;
 	avl_index_t where;
-	space_seg_t *ss, ssearch;
+	range_seg_t *rs, rsearch;
 	uint64_t hbit = highbit(size);
-	uint64_t *cursor = (uint64_t *)sm->sm_ppd + hbit - 1;
-	uint64_t max_size = metaslab_pp_maxsize(sm);
+	uint64_t *cursor = &msp->ms_lbas[hbit - 1];
+	uint64_t max_size = metaslab_block_maxsize(msp);
 
-	ASSERT(MUTEX_HELD(sm->sm_lock));
-	ASSERT3U(avl_numnodes(&sm->sm_root), ==, avl_numnodes(sm->sm_pp_root));
+	ASSERT(MUTEX_HELD(&msp->ms_lock));
+	ASSERT3U(avl_numnodes(t), ==, avl_numnodes(&msp->ms_size_tree));
 
 	if (max_size < size)
 		return (-1ULL);
 
-	ssearch.ss_start = *cursor;
-	ssearch.ss_end = *cursor + size;
+	rsearch.rs_start = *cursor;
+	rsearch.rs_end = *cursor + size;
 
-	ss = avl_find(t, &ssearch, &where);
-	if (ss == NULL || (ss->ss_start + size > ss->ss_end)) {
-		t = sm->sm_pp_root;
+	rs = avl_find(t, &rsearch, &where);
+	if (rs == NULL || (rs->rs_end - rs->rs_start) < size) {
+		t = &msp->ms_size_tree;
 
-		ssearch.ss_start = 0;
-		ssearch.ss_end = MIN(max_size,
+		rsearch.rs_start = 0;
+		rsearch.rs_end = MIN(max_size,
 		    1ULL << (hbit + metaslab_ndf_clump_shift));
-		ss = avl_find(t, &ssearch, &where);
-		if (ss == NULL)
-			ss = avl_nearest(t, where, AVL_AFTER);
-		ASSERT(ss != NULL);
+		rs = avl_find(t, &rsearch, &where);
+		if (rs == NULL)
+			rs = avl_nearest(t, where, AVL_AFTER);
+		ASSERT(rs != NULL);
 	}
 
-	if (ss != NULL) {
-		if (ss->ss_start + size <= ss->ss_end) {
-			*cursor = ss->ss_start + size;
-			return (ss->ss_start);
-		}
+	if ((rs->rs_end - rs->rs_start) >= size) {
+		*cursor = rs->rs_start + size;
+		return (rs->rs_start);
 	}
 	return (-1ULL);
 }
 
 static boolean_t
-metaslab_ndf_fragmented(space_map_t *sm)
+metaslab_ndf_fragmented(metaslab_t *msp)
 {
-	uint64_t max_size = metaslab_pp_maxsize(sm);
-
-	if (max_size > (metaslab_min_alloc_size << metaslab_ndf_clump_shift))
-		return (B_FALSE);
-	return (B_TRUE);
+	return (metaslab_block_maxsize(msp) <=
+	    (metaslab_min_alloc_size << metaslab_ndf_clump_shift));
 }
 
-
-static space_map_ops_t metaslab_ndf_ops = {
-	metaslab_pp_load,
-	metaslab_pp_unload,
+static metaslab_ops_t metaslab_ndf_ops = {
 	metaslab_ndf_alloc,
-	metaslab_pp_claim,
-	metaslab_pp_free,
-	metaslab_pp_maxsize,
 	metaslab_ndf_fragmented
 };
 
-space_map_ops_t *zfs_metaslab_ops = &metaslab_df_ops;
+metaslab_ops_t *zfs_metaslab_ops = &metaslab_df_ops;
 
 /*
  * ==========================================================================
  * Metaslabs
  * ==========================================================================
  */
+
+/*
+ * Wait for any in-progress metaslab loads to complete.
+ */
+void
+metaslab_load_wait(metaslab_t *msp)
+{
+	ASSERT(MUTEX_HELD(&msp->ms_lock));
+
+	while (msp->ms_loading) {
+		ASSERT(!msp->ms_loaded);
+		cv_wait(&msp->ms_load_cv, &msp->ms_lock);
+	}
+}
+
+int
+metaslab_load(metaslab_t *msp)
+{
+	int error = 0;
+
+	ASSERT(MUTEX_HELD(&msp->ms_lock));
+	ASSERT(!msp->ms_loaded);
+	ASSERT(!msp->ms_loading);
+
+	msp->ms_loading = B_TRUE;
+
+	/*
+	 * If the space map has not been allocated yet, then treat
+	 * all the space in the metaslab as free and add it to the
+	 * ms_tree.
+	 */
+	if (msp->ms_sm != NULL)
+		error = space_map_load(msp->ms_sm, msp->ms_tree, SM_FREE);
+	else
+		range_tree_add(msp->ms_tree, msp->ms_start, msp->ms_size);
+
+	msp->ms_loaded = (error == 0);
+	msp->ms_loading = B_FALSE;
+
+	if (msp->ms_loaded) {
+		for (int t = 0; t < TXG_DEFER_SIZE; t++) {
+			range_tree_walk(msp->ms_defertree[t],
+			    range_tree_remove, msp->ms_tree);
+		}
+	}
+	cv_broadcast(&msp->ms_load_cv);
+	return (error);
+}
+
+void
+metaslab_unload(metaslab_t *msp)
+{
+	ASSERT(MUTEX_HELD(&msp->ms_lock));
+	range_tree_vacate(msp->ms_tree, NULL, NULL);
+	msp->ms_loaded = B_FALSE;
+	msp->ms_weight &= ~METASLAB_ACTIVE_MASK;
+}
+
 metaslab_t *
-metaslab_init(metaslab_group_t *mg, space_map_obj_t *smo,
-	uint64_t start, uint64_t size, uint64_t txg)
+metaslab_init(metaslab_group_t *mg, uint64_t id, uint64_t object, uint64_t txg)
 {
 	vdev_t *vd = mg->mg_vd;
+	objset_t *mos = vd->vdev_spa->spa_meta_objset;
 	metaslab_t *msp;
 
 	msp = kmem_zalloc(sizeof (metaslab_t), KM_SLEEP);
 	mutex_init(&msp->ms_lock, NULL, MUTEX_DEFAULT, NULL);
-
-	msp->ms_smo_syncing = *smo;
+	cv_init(&msp->ms_load_cv, NULL, CV_DEFAULT, NULL);
+	msp->ms_id = id;
+	msp->ms_start = id << vd->vdev_ms_shift;
+	msp->ms_size = 1ULL << vd->vdev_ms_shift;
 
 	/*
-	 * We create the main space map here, but we don't create the
-	 * allocmaps and freemaps until metaslab_sync_done().  This serves
+	 * We only open space map objects that already exist. All others
+	 * will be opened when we finally allocate an object for it.
+	 */
+	if (object != 0) {
+		VERIFY0(space_map_open(&msp->ms_sm, mos, object, msp->ms_start,
+		    msp->ms_size, vd->vdev_ashift, &msp->ms_lock));
+		ASSERT(msp->ms_sm != NULL);
+	}
+
+	/*
+	 * We create the main range tree here, but we don't create the
+	 * alloctree and freetree until metaslab_sync_done().  This serves
 	 * two purposes: it allows metaslab_sync_done() to detect the
 	 * addition of new space; and for debugging, it ensures that we'd
 	 * data fault on any attempt to use this metaslab before it's ready.
 	 */
-	msp->ms_map = kmem_zalloc(sizeof (space_map_t), KM_SLEEP);
-	space_map_create(msp->ms_map, start, size,
-	    vd->vdev_ashift, &msp->ms_lock);
-
+	msp->ms_tree = range_tree_create(&metaslab_rt_ops, msp, &msp->ms_lock);
 	metaslab_group_add(mg, msp);
 
-	if (metaslab_debug && smo->smo_object != 0) {
-		mutex_enter(&msp->ms_lock);
-		VERIFY(space_map_load(msp->ms_map, mg->mg_class->mc_ops,
-		    SM_FREE, smo, spa_meta_objset(vd->vdev_spa)) == 0);
-		mutex_exit(&msp->ms_lock);
-	}
+	msp->ms_ops = mg->mg_class->mc_ops;
 
 	/*
 	 * If we're opening an existing pool (txg == 0) or creating
@@ -820,6 +1097,17 @@ metaslab_init(metaslab_group_t *mg, space_map_obj_t *smo,
 	if (txg <= TXG_INITIAL)
 		metaslab_sync_done(msp, 0);
 
+	/*
+	 * If metaslab_debug_load is set and we're initializing a metaslab
+	 * that has an allocated space_map object then load the its space
+	 * map so that can verify frees.
+	 */
+	if (metaslab_debug_load && msp->ms_sm != NULL) {
+		mutex_enter(&msp->ms_lock);
+		VERIFY0(metaslab_load(msp));
+		mutex_exit(&msp->ms_lock);
+	}
+
 	if (txg != 0) {
 		vdev_dirty(vd, 0, NULL, txg);
 		vdev_dirty(vd, VDD_METASLAB, msp, txg);
@@ -833,48 +1121,103 @@ metaslab_fini(metaslab_t *msp)
 {
 	metaslab_group_t *mg = msp->ms_group;
 
-	vdev_space_update(mg->mg_vd,
-	    -msp->ms_smo.smo_alloc, 0, -msp->ms_map->sm_size);
-
 	metaslab_group_remove(mg, msp);
 
 	mutex_enter(&msp->ms_lock);
 
-	space_map_unload(msp->ms_map);
-	space_map_destroy(msp->ms_map);
-	kmem_free(msp->ms_map, sizeof (*msp->ms_map));
+	VERIFY(msp->ms_group == NULL);
+	vdev_space_update(mg->mg_vd, -space_map_allocated(msp->ms_sm),
+	    0, -msp->ms_size);
+	space_map_close(msp->ms_sm);
+
+	metaslab_unload(msp);
+	range_tree_destroy(msp->ms_tree);
 
 	for (int t = 0; t < TXG_SIZE; t++) {
-		space_map_destroy(msp->ms_allocmap[t]);
-		space_map_destroy(msp->ms_freemap[t]);
-		kmem_free(msp->ms_allocmap[t], sizeof (*msp->ms_allocmap[t]));
-		kmem_free(msp->ms_freemap[t], sizeof (*msp->ms_freemap[t]));
+		range_tree_destroy(msp->ms_alloctree[t]);
+		range_tree_destroy(msp->ms_freetree[t]);
 	}
 
 	for (int t = 0; t < TXG_DEFER_SIZE; t++) {
-		space_map_destroy(msp->ms_defermap[t]);
-		kmem_free(msp->ms_defermap[t], sizeof (*msp->ms_defermap[t]));
+		range_tree_destroy(msp->ms_defertree[t]);
 	}
 
 	ASSERT0(msp->ms_deferspace);
 
 	mutex_exit(&msp->ms_lock);
+	cv_destroy(&msp->ms_load_cv);
 	mutex_destroy(&msp->ms_lock);
 
 	kmem_free(msp, sizeof (metaslab_t));
 }
 
-#define	METASLAB_WEIGHT_PRIMARY		(1ULL << 63)
-#define	METASLAB_WEIGHT_SECONDARY	(1ULL << 62)
-#define	METASLAB_ACTIVE_MASK		\
-	(METASLAB_WEIGHT_PRIMARY | METASLAB_WEIGHT_SECONDARY)
+/*
+ * Apply a weighting factor based on the histogram information for this
+ * metaslab. The current weighting factor is somewhat arbitrary and requires
+ * additional investigation. The implementation provides a measure of
+ * "weighted" free space and gives a higher weighting for larger contiguous
+ * regions. The weighting factor is determined by counting the number of
+ * sm_shift sectors that exist in each region represented by the histogram.
+ * That value is then multiplied by the power of 2 exponent and the sm_shift
+ * value.
+ *
+ * For example, assume the 2^21 histogram bucket has 4 2MB regions and the
+ * metaslab has an sm_shift value of 9 (512B):
+ *
+ * 1) calculate the number of sm_shift sectors in the region:
+ *	2^21 / 2^9 = 2^12 = 4096 * 4 (number of regions) = 16384
+ * 2) multiply by the power of 2 exponent and the sm_shift value:
+ *	16384 * 21 * 9 = 3096576
+ * This value will be added to the weighting of the metaslab.
+ */
+static uint64_t
+metaslab_weight_factor(metaslab_t *msp)
+{
+	uint64_t factor = 0;
+	uint64_t sectors;
+	int i;
+
+	/*
+	 * A null space map means that the entire metaslab is free,
+	 * calculate a weight factor that spans the entire size of the
+	 * metaslab.
+	 */
+	if (msp->ms_sm == NULL) {
+		vdev_t *vd = msp->ms_group->mg_vd;
+
+		i = highbit(msp->ms_size) - 1;
+		sectors = msp->ms_size >> vd->vdev_ashift;
+		return (sectors * i * vd->vdev_ashift);
+	}
+
+	if (msp->ms_sm->sm_dbuf->db_size != sizeof (space_map_phys_t))
+		return (0);
+
+	for (i = 0; i < SPACE_MAP_HISTOGRAM_SIZE(msp->ms_sm); i++) {
+		if (msp->ms_sm->sm_phys->smp_histogram[i] == 0)
+			continue;
+
+		/*
+		 * Determine the number of sm_shift sectors in the region
+		 * indicated by the histogram. For example, given an
+		 * sm_shift value of 9 (512 bytes) and i = 4 then we know
+		 * that we're looking at an 8K region in the histogram
+		 * (i.e. 9 + 4 = 13, 2^13 = 8192). To figure out the
+		 * number of sm_shift sectors (512 bytes in this example),
+		 * we would take 8192 / 512 = 16. Since the histogram
+		 * is offset by sm_shift we can simply use the value of
+		 * of i to calculate this (i.e. 2^i = 16 where i = 4).
+		 */
+		sectors = msp->ms_sm->sm_phys->smp_histogram[i] << i;
+		factor += (i + msp->ms_sm->sm_shift) * sectors;
+	}
+	return (factor * msp->ms_sm->sm_shift);
+}
 
 static uint64_t
 metaslab_weight(metaslab_t *msp)
 {
 	metaslab_group_t *mg = msp->ms_group;
-	space_map_t *sm = msp->ms_map;
-	space_map_obj_t *smo = &msp->ms_smo;
 	vdev_t *vd = mg->mg_vd;
 	uint64_t weight, space;
 
@@ -885,7 +1228,7 @@ metaslab_weight(metaslab_t *msp)
 	 * for us to do here.
 	 */
 	if (vd->vdev_removing) {
-		ASSERT0(smo->smo_alloc);
+		ASSERT0(space_map_allocated(msp->ms_sm));
 		ASSERT0(vd->vdev_ms_shift);
 		return (0);
 	}
@@ -893,7 +1236,7 @@ metaslab_weight(metaslab_t *msp)
 	/*
 	 * The baseline weight is the metaslab's free space.
 	 */
-	space = sm->sm_size - smo->smo_alloc;
+	space = msp->ms_size - space_map_allocated(msp->ms_sm);
 	weight = space;
 
 	/*
@@ -905,20 +1248,14 @@ metaslab_weight(metaslab_t *msp)
 	 * In effect, this means that we'll select the metaslab with the most
 	 * free bandwidth rather than simply the one with the most free space.
 	 */
-	weight = 2 * weight -
-	    ((sm->sm_start >> vd->vdev_ms_shift) * weight) / vd->vdev_ms_count;
+	weight = 2 * weight - (msp->ms_id * weight) / vd->vdev_ms_count;
 	ASSERT(weight >= space && weight <= 2 * space);
 
-	/*
-	 * For locality, assign higher weight to metaslabs which have
-	 * a lower offset than what we've already activated.
-	 */
-	if (sm->sm_start <= mg->mg_bonus_area)
-		weight *= (metaslab_smo_bonus_pct / 100);
-	ASSERT(weight >= space &&
-	    weight <= 2 * (metaslab_smo_bonus_pct / 100) * space);
+	msp->ms_factor = metaslab_weight_factor(msp);
+	if (metaslab_weight_factor_enable)
+		weight += msp->ms_factor;
 
-	if (sm->sm_loaded && !sm->sm_ops->smop_fragmented(sm)) {
+	if (msp->ms_loaded && !msp->ms_ops->msop_fragmented(msp)) {
 		/*
 		 * If this metaslab is one we're actively using, adjust its
 		 * weight to make it preferable to any inactive metaslab so
@@ -926,79 +1263,29 @@ metaslab_weight(metaslab_t *msp)
 		 */
 		weight |= (msp->ms_weight & METASLAB_ACTIVE_MASK);
 	}
+
 	return (weight);
 }
 
-static void
-metaslab_prefetch(metaslab_group_t *mg)
-{
-	spa_t *spa = mg->mg_vd->vdev_spa;
-	metaslab_t *msp;
-	avl_tree_t *t = &mg->mg_metaslab_tree;
-	int m;
-
-	mutex_enter(&mg->mg_lock);
-
-	/*
-	 * Prefetch the next potential metaslabs
-	 */
-	for (msp = avl_first(t), m = 0; msp; msp = AVL_NEXT(t, msp), m++) {
-		space_map_t *sm = msp->ms_map;
-		space_map_obj_t *smo = &msp->ms_smo;
-
-		/* If we have reached our prefetch limit then we're done */
-		if (m >= metaslab_prefetch_limit)
-			break;
-
-		if (!sm->sm_loaded && smo->smo_object != 0) {
-			mutex_exit(&mg->mg_lock);
-			dmu_prefetch(spa_meta_objset(spa), smo->smo_object,
-			    0ULL, smo->smo_objsize);
-			mutex_enter(&mg->mg_lock);
-		}
-	}
-	mutex_exit(&mg->mg_lock);
-}
-
 static int
 metaslab_activate(metaslab_t *msp, uint64_t activation_weight)
 {
-	metaslab_group_t *mg = msp->ms_group;
-	space_map_t *sm = msp->ms_map;
-	space_map_ops_t *sm_ops = msp->ms_group->mg_class->mc_ops;
-
 	ASSERT(MUTEX_HELD(&msp->ms_lock));
 
 	if ((msp->ms_weight & METASLAB_ACTIVE_MASK) == 0) {
-		space_map_load_wait(sm);
-		if (!sm->sm_loaded) {
-			space_map_obj_t *smo = &msp->ms_smo;
-
-			int error = space_map_load(sm, sm_ops, SM_FREE, smo,
-			    spa_meta_objset(msp->ms_group->mg_vd->vdev_spa));
-			if (error)  {
+		metaslab_load_wait(msp);
+		if (!msp->ms_loaded) {
+			int error = metaslab_load(msp);
+			if (error) {
 				metaslab_group_sort(msp->ms_group, msp, 0);
 				return (error);
 			}
-			for (int t = 0; t < TXG_DEFER_SIZE; t++)
-				space_map_walk(msp->ms_defermap[t],
-				    space_map_claim, sm);
-
-		}
-
-		/*
-		 * Track the bonus area as we activate new metaslabs.
-		 */
-		if (sm->sm_start > mg->mg_bonus_area) {
-			mutex_enter(&mg->mg_lock);
-			mg->mg_bonus_area = sm->sm_start;
-			mutex_exit(&mg->mg_lock);
 		}
 
 		metaslab_group_sort(msp->ms_group, msp,
 		    msp->ms_weight | activation_weight);
 	}
-	ASSERT(sm->sm_loaded);
+	ASSERT(msp->ms_loaded);
 	ASSERT(msp->ms_weight & METASLAB_ACTIVE_MASK);
 
 	return (0);
@@ -1012,26 +1299,74 @@ metaslab_passivate(metaslab_t *msp, uint64_t size)
 	 * this metaslab again.  In that case, it had better be empty,
 	 * or we would be leaving space on the table.
 	 */
-	ASSERT(size >= SPA_MINBLOCKSIZE || msp->ms_map->sm_space == 0);
+	ASSERT(size >= SPA_MINBLOCKSIZE || range_tree_space(msp->ms_tree) == 0);
 	metaslab_group_sort(msp->ms_group, msp, MIN(msp->ms_weight, size));
 	ASSERT((msp->ms_weight & METASLAB_ACTIVE_MASK) == 0);
 }
 
+static void
+metaslab_preload(void *arg)
+{
+	metaslab_t *msp = arg;
+	spa_t *spa = msp->ms_group->mg_vd->vdev_spa;
+
+	mutex_enter(&msp->ms_lock);
+	metaslab_load_wait(msp);
+	if (!msp->ms_loaded)
+		(void) metaslab_load(msp);
+
+	/*
+	 * Set the ms_access_txg value so that we don't unload it right away.
+	 */
+	msp->ms_access_txg = spa_syncing_txg(spa) + metaslab_unload_delay + 1;
+	mutex_exit(&msp->ms_lock);
+}
+
+static void
+metaslab_group_preload(metaslab_group_t *mg)
+{
+	spa_t *spa = mg->mg_vd->vdev_spa;
+	metaslab_t *msp;
+	avl_tree_t *t = &mg->mg_metaslab_tree;
+	int m = 0;
+
+	if (spa_shutting_down(spa) || !metaslab_preload_enabled) {
+		taskq_wait(mg->mg_taskq);
+		return;
+	}
+	mutex_enter(&mg->mg_lock);
+
+	/*
+	 * Prefetch the next potential metaslabs
+	 */
+	for (msp = avl_first(t); msp != NULL; msp = AVL_NEXT(t, msp)) {
+
+		/* If we have reached our preload limit then we're done */
+		if (++m > metaslab_preload_limit)
+			break;
+
+		VERIFY(taskq_dispatch(mg->mg_taskq, metaslab_preload,
+		    msp, TQ_SLEEP) != 0);
+	}
+	mutex_exit(&mg->mg_lock);
+}
+
 /*
- * Determine if the in-core space map representation can be condensed on-disk.
- * We would like to use the following criteria to make our decision:
+ * Determine if the space map's on-disk footprint is past our tolerance
+ * for inefficiency. We would like to use the following criteria to make
+ * our decision:
  *
  * 1. The size of the space map object should not dramatically increase as a
- * result of writing out our in-core free map.
+ * result of writing out the free space range tree.
  *
  * 2. The minimal on-disk space map representation is zfs_condense_pct/100
- * times the size than the in-core representation (i.e. zfs_condense_pct = 110
- * and in-core = 1MB, minimal = 1.1.MB).
+ * times the size than the free space range tree representation
+ * (i.e. zfs_condense_pct = 110 and in-core = 1MB, minimal = 1.1.MB).
  *
  * Checking the first condition is tricky since we don't want to walk
  * the entire AVL tree calculating the estimated on-disk size. Instead we
- * use the size-ordered AVL tree in the space map and calculate the
- * size required for the largest segment in our in-core free map. If the
+ * use the size-ordered range tree in the metaslab and calculate the
+ * size required to write out the largest segment in our free tree. If the
  * size required to represent that segment on disk is larger than the space
  * map object then we avoid condensing this map.
  *
@@ -1042,21 +1377,20 @@ metaslab_passivate(metaslab_t *msp, uint64_t size)
 static boolean_t
 metaslab_should_condense(metaslab_t *msp)
 {
-	space_map_t *sm = msp->ms_map;
-	space_map_obj_t *smo = &msp->ms_smo_syncing;
-	space_seg_t *ss;
+	space_map_t *sm = msp->ms_sm;
+	range_seg_t *rs;
 	uint64_t size, entries, segsz;
 
 	ASSERT(MUTEX_HELD(&msp->ms_lock));
-	ASSERT(sm->sm_loaded);
+	ASSERT(msp->ms_loaded);
 
 	/*
-	 * Use the sm_pp_root AVL tree, which is ordered by size, to obtain
-	 * the largest segment in the in-core free map. If the tree is
-	 * empty then we should condense the map.
+	 * Use the ms_size_tree range tree, which is ordered by size, to
+	 * obtain the largest segment in the free tree. If the tree is empty
+	 * then we should condense the map.
 	 */
-	ss = avl_last(sm->sm_pp_root);
-	if (ss == NULL)
+	rs = avl_last(&msp->ms_size_tree);
+	if (rs == NULL)
 		return (B_TRUE);
 
 	/*
@@ -1065,102 +1399,94 @@ metaslab_should_condense(metaslab_t *msp)
 	 * larger on-disk than the entire current on-disk structure, then
 	 * clearly condensing will increase the on-disk structure size.
 	 */
-	size = (ss->ss_end - ss->ss_start) >> sm->sm_shift;
+	size = (rs->rs_end - rs->rs_start) >> sm->sm_shift;
 	entries = size / (MIN(size, SM_RUN_MAX));
 	segsz = entries * sizeof (uint64_t);
 
-	return (segsz <= smo->smo_objsize &&
-	    smo->smo_objsize >= (zfs_condense_pct *
-	    sizeof (uint64_t) * avl_numnodes(&sm->sm_root)) / 100);
+	return (segsz <= space_map_length(msp->ms_sm) &&
+	    space_map_length(msp->ms_sm) >= (zfs_condense_pct *
+	    sizeof (uint64_t) * avl_numnodes(&msp->ms_tree->rt_root)) / 100);
 }
 
 /*
  * Condense the on-disk space map representation to its minimized form.
  * The minimized form consists of a small number of allocations followed by
- * the in-core free map.
+ * the entries of the free range tree.
  */
 static void
 metaslab_condense(metaslab_t *msp, uint64_t txg, dmu_tx_t *tx)
 {
 	spa_t *spa = msp->ms_group->mg_vd->vdev_spa;
-	space_map_t *freemap = msp->ms_freemap[txg & TXG_MASK];
-	space_map_t condense_map;
-	space_map_t *sm = msp->ms_map;
-	objset_t *mos = spa_meta_objset(spa);
-	space_map_obj_t *smo = &msp->ms_smo_syncing;
+	range_tree_t *freetree = msp->ms_freetree[txg & TXG_MASK];
+	range_tree_t *condense_tree;
+	space_map_t *sm = msp->ms_sm;
 
 	ASSERT(MUTEX_HELD(&msp->ms_lock));
 	ASSERT3U(spa_sync_pass(spa), ==, 1);
-	ASSERT(sm->sm_loaded);
+	ASSERT(msp->ms_loaded);
 
 	spa_dbgmsg(spa, "condensing: txg %llu, msp[%llu] %p, "
-	    "smo size %llu, segments %lu", txg,
-	    (msp->ms_map->sm_start / msp->ms_map->sm_size), msp,
-	    smo->smo_objsize, avl_numnodes(&sm->sm_root));
+	    "smp size %llu, segments %lu", txg, msp->ms_id, msp,
+	    space_map_length(msp->ms_sm), avl_numnodes(&msp->ms_tree->rt_root));
 
 	/*
-	 * Create an map that is a 100% allocated map. We remove segments
+	 * Create an range tree that is 100% allocated. We remove segments
 	 * that have been freed in this txg, any deferred frees that exist,
 	 * and any allocation in the future. Removing segments should be
-	 * a relatively inexpensive operation since we expect these maps to
-	 * a small number of nodes.
+	 * a relatively inexpensive operation since we expect these trees to
+	 * have a small number of nodes.
 	 */
-	space_map_create(&condense_map, sm->sm_start, sm->sm_size,
-	    sm->sm_shift, sm->sm_lock);
-	space_map_add(&condense_map, condense_map.sm_start,
-	    condense_map.sm_size);
+	condense_tree = range_tree_create(NULL, NULL, &msp->ms_lock);
+	range_tree_add(condense_tree, msp->ms_start, msp->ms_size);
 
 	/*
-	 * Remove what's been freed in this txg from the condense_map.
+	 * Remove what's been freed in this txg from the condense_tree.
 	 * Since we're in sync_pass 1, we know that all the frees from
-	 * this txg are in the freemap.
+	 * this txg are in the freetree.
 	 */
-	space_map_walk(freemap, space_map_remove, &condense_map);
+	range_tree_walk(freetree, range_tree_remove, condense_tree);
 
-	for (int t = 0; t < TXG_DEFER_SIZE; t++)
-		space_map_walk(msp->ms_defermap[t],
-		    space_map_remove, &condense_map);
+	for (int t = 0; t < TXG_DEFER_SIZE; t++) {
+		range_tree_walk(msp->ms_defertree[t],
+		    range_tree_remove, condense_tree);
+	}
 
-	for (int t = 1; t < TXG_CONCURRENT_STATES; t++)
-		space_map_walk(msp->ms_allocmap[(txg + t) & TXG_MASK],
-		    space_map_remove, &condense_map);
+	for (int t = 1; t < TXG_CONCURRENT_STATES; t++) {
+		range_tree_walk(msp->ms_alloctree[(txg + t) & TXG_MASK],
+		    range_tree_remove, condense_tree);
+	}
 
 	/*
 	 * We're about to drop the metaslab's lock thus allowing
 	 * other consumers to change it's content. Set the
-	 * space_map's sm_condensing flag to ensure that
+	 * metaslab's ms_condensing flag to ensure that
 	 * allocations on this metaslab do not occur while we're
 	 * in the middle of committing it to disk. This is only critical
-	 * for the ms_map as all other space_maps use per txg
+	 * for the ms_tree as all other range trees use per txg
 	 * views of their content.
 	 */
-	sm->sm_condensing = B_TRUE;
+	msp->ms_condensing = B_TRUE;
 
 	mutex_exit(&msp->ms_lock);
-	space_map_truncate(smo, mos, tx);
+	space_map_truncate(sm, tx);
 	mutex_enter(&msp->ms_lock);
 
 	/*
 	 * While we would ideally like to create a space_map representation
 	 * that consists only of allocation records, doing so can be
-	 * prohibitively expensive because the in-core free map can be
+	 * prohibitively expensive because the in-core free tree can be
 	 * large, and therefore computationally expensive to subtract
-	 * from the condense_map. Instead we sync out two maps, a cheap
-	 * allocation only map followed by the in-core free map. While not
+	 * from the condense_tree. Instead we sync out two trees, a cheap
+	 * allocation only tree followed by the in-core free tree. While not
 	 * optimal, this is typically close to optimal, and much cheaper to
 	 * compute.
 	 */
-	space_map_sync(&condense_map, SM_ALLOC, smo, mos, tx);
-	space_map_vacate(&condense_map, NULL, NULL);
-	space_map_destroy(&condense_map);
+	space_map_write(sm, condense_tree, SM_ALLOC, tx);
+	range_tree_vacate(condense_tree, NULL, NULL);
+	range_tree_destroy(condense_tree);
 
-	space_map_sync(sm, SM_FREE, smo, mos, tx);
-	sm->sm_condensing = B_FALSE;
-
-	spa_dbgmsg(spa, "condensed: txg %llu, msp[%llu] %p, "
-	    "smo size %llu", txg,
-	    (msp->ms_map->sm_start / msp->ms_map->sm_size), msp,
-	    smo->smo_objsize);
+	space_map_write(sm, msp->ms_tree, SM_FREE, tx);
+	msp->ms_condensing = B_FALSE;
 }
 
 /*
@@ -1169,94 +1495,113 @@ metaslab_condense(metaslab_t *msp, uint64_t txg, dmu_tx_t *tx)
 void
 metaslab_sync(metaslab_t *msp, uint64_t txg)
 {
-	vdev_t *vd = msp->ms_group->mg_vd;
+	metaslab_group_t *mg = msp->ms_group;
+	vdev_t *vd = mg->mg_vd;
 	spa_t *spa = vd->vdev_spa;
 	objset_t *mos = spa_meta_objset(spa);
-	space_map_t *allocmap = msp->ms_allocmap[txg & TXG_MASK];
-	space_map_t **freemap = &msp->ms_freemap[txg & TXG_MASK];
-	space_map_t **freed_map = &msp->ms_freemap[TXG_CLEAN(txg) & TXG_MASK];
-	space_map_t *sm = msp->ms_map;
-	space_map_obj_t *smo = &msp->ms_smo_syncing;
-	dmu_buf_t *db;
+	range_tree_t *alloctree = msp->ms_alloctree[txg & TXG_MASK];
+	range_tree_t **freetree = &msp->ms_freetree[txg & TXG_MASK];
+	range_tree_t **freed_tree =
+	    &msp->ms_freetree[TXG_CLEAN(txg) & TXG_MASK];
 	dmu_tx_t *tx;
+	uint64_t object = space_map_object(msp->ms_sm);
 
 	ASSERT(!vd->vdev_ishole);
 
 	/*
 	 * This metaslab has just been added so there's no work to do now.
 	 */
-	if (*freemap == NULL) {
-		ASSERT3P(allocmap, ==, NULL);
+	if (*freetree == NULL) {
+		ASSERT3P(alloctree, ==, NULL);
 		return;
 	}
 
-	ASSERT3P(allocmap, !=, NULL);
-	ASSERT3P(*freemap, !=, NULL);
-	ASSERT3P(*freed_map, !=, NULL);
+	ASSERT3P(alloctree, !=, NULL);
+	ASSERT3P(*freetree, !=, NULL);
+	ASSERT3P(*freed_tree, !=, NULL);
 
-	if (allocmap->sm_space == 0 && (*freemap)->sm_space == 0)
+	if (range_tree_space(alloctree) == 0 &&
+	    range_tree_space(*freetree) == 0)
 		return;
 
 	/*
 	 * The only state that can actually be changing concurrently with
-	 * metaslab_sync() is the metaslab's ms_map.  No other thread can
-	 * be modifying this txg's allocmap, freemap, freed_map, or smo.
-	 * Therefore, we only hold ms_lock to satify space_map ASSERTs.
-	 * We drop it whenever we call into the DMU, because the DMU
-	 * can call down to us (e.g. via zio_free()) at any time.
+	 * metaslab_sync() is the metaslab's ms_tree.  No other thread can
+	 * be modifying this txg's alloctree, freetree, freed_tree, or
+	 * space_map_phys_t. Therefore, we only hold ms_lock to satify
+	 * space_map ASSERTs. We drop it whenever we call into the DMU,
+	 * because the DMU can call down to us (e.g. via zio_free()) at
+	 * any time.
 	 */
 
 	tx = dmu_tx_create_assigned(spa_get_dsl(spa), txg);
 
-	if (smo->smo_object == 0) {
-		ASSERT(smo->smo_objsize == 0);
-		ASSERT(smo->smo_alloc == 0);
-		smo->smo_object = dmu_object_alloc(mos,
-		    DMU_OT_SPACE_MAP, 1 << SPACE_MAP_BLOCKSHIFT,
-		    DMU_OT_SPACE_MAP_HEADER, sizeof (*smo), tx);
-		ASSERT(smo->smo_object != 0);
-		dmu_write(mos, vd->vdev_ms_array, sizeof (uint64_t) *
-		    (sm->sm_start >> vd->vdev_ms_shift),
-		    sizeof (uint64_t), &smo->smo_object, tx);
+	if (msp->ms_sm == NULL) {
+		uint64_t new_object;
+
+		new_object = space_map_alloc(mos, tx);
+		VERIFY3U(new_object, !=, 0);
+
+		VERIFY0(space_map_open(&msp->ms_sm, mos, new_object,
+		    msp->ms_start, msp->ms_size, vd->vdev_ashift,
+		    &msp->ms_lock));
+		ASSERT(msp->ms_sm != NULL);
 	}
 
 	mutex_enter(&msp->ms_lock);
 
-	if (sm->sm_loaded && spa_sync_pass(spa) == 1 &&
+	if (msp->ms_loaded && spa_sync_pass(spa) == 1 &&
 	    metaslab_should_condense(msp)) {
 		metaslab_condense(msp, txg, tx);
 	} else {
-		space_map_sync(allocmap, SM_ALLOC, smo, mos, tx);
-		space_map_sync(*freemap, SM_FREE, smo, mos, tx);
+		space_map_write(msp->ms_sm, alloctree, SM_ALLOC, tx);
+		space_map_write(msp->ms_sm, *freetree, SM_FREE, tx);
 	}
 
-	space_map_vacate(allocmap, NULL, NULL);
+	range_tree_vacate(alloctree, NULL, NULL);
+
+	if (msp->ms_loaded) {
+		/*
+		 * When the space map is loaded, we have an accruate
+		 * histogram in the range tree. This gives us an opportunity
+		 * to bring the space map's histogram up-to-date so we clear
+		 * it first before updating it.
+		 */
+		space_map_histogram_clear(msp->ms_sm);
+		space_map_histogram_add(msp->ms_sm, msp->ms_tree, tx);
+	} else {
+		/*
+		 * Since the space map is not loaded we simply update the
+		 * exisiting histogram with what was freed in this txg. This
+		 * means that the on-disk histogram may not have an accurate
+		 * view of the free space but it's close enough to allow
+		 * us to make allocation decisions.
+		 */
+		space_map_histogram_add(msp->ms_sm, *freetree, tx);
+	}
 
 	/*
-	 * For sync pass 1, we avoid walking the entire space map and
-	 * instead will just swap the pointers for freemap and
-	 * freed_map. We can safely do this since the freed_map is
+	 * For sync pass 1, we avoid traversing this txg's free range tree
+	 * and instead will just swap the pointers for freetree and
+	 * freed_tree. We can safely do this since the freed_tree is
 	 * guaranteed to be empty on the initial pass.
 	 */
 	if (spa_sync_pass(spa) == 1) {
-		ASSERT0((*freed_map)->sm_space);
-		ASSERT0(avl_numnodes(&(*freed_map)->sm_root));
-		space_map_swap(freemap, freed_map);
+		range_tree_swap(freetree, freed_tree);
 	} else {
-		space_map_vacate(*freemap, space_map_add, *freed_map);
+		range_tree_vacate(*freetree, range_tree_add, *freed_tree);
 	}
 
-	ASSERT0(msp->ms_allocmap[txg & TXG_MASK]->sm_space);
-	ASSERT0(msp->ms_freemap[txg & TXG_MASK]->sm_space);
+	ASSERT0(range_tree_space(msp->ms_alloctree[txg & TXG_MASK]));
+	ASSERT0(range_tree_space(msp->ms_freetree[txg & TXG_MASK]));
 
 	mutex_exit(&msp->ms_lock);
 
-	VERIFY0(dmu_bonus_hold(mos, smo->smo_object, FTAG, &db));
-	dmu_buf_will_dirty(db, tx);
-	ASSERT3U(db->db_size, >=, sizeof (*smo));
-	bcopy(smo, db->db_data, sizeof (*smo));
-	dmu_buf_rele(db, FTAG);
-
+	if (object != space_map_object(msp->ms_sm)) {
+		object = space_map_object(msp->ms_sm);
+		dmu_write(mos, vd->vdev_ms_array, sizeof (uint64_t) *
+		    msp->ms_id, sizeof (uint64_t), &object, tx);
+	}
 	dmu_tx_commit(tx);
 }
 
@@ -1267,13 +1612,10 @@ metaslab_sync(metaslab_t *msp, uint64_t txg)
 void
 metaslab_sync_done(metaslab_t *msp, uint64_t txg)
 {
-	space_map_obj_t *smo = &msp->ms_smo;
-	space_map_obj_t *smosync = &msp->ms_smo_syncing;
-	space_map_t *sm = msp->ms_map;
-	space_map_t **freed_map = &msp->ms_freemap[TXG_CLEAN(txg) & TXG_MASK];
-	space_map_t **defer_map = &msp->ms_defermap[txg % TXG_DEFER_SIZE];
 	metaslab_group_t *mg = msp->ms_group;
 	vdev_t *vd = mg->mg_vd;
+	range_tree_t **freed_tree;
+	range_tree_t **defer_tree;
 	int64_t alloc_delta, defer_delta;
 
 	ASSERT(!vd->vdev_ishole);
@@ -1282,63 +1624,63 @@ metaslab_sync_done(metaslab_t *msp, uint64_t txg)
 
 	/*
 	 * If this metaslab is just becoming available, initialize its
-	 * allocmaps, freemaps, and defermap and add its capacity to the vdev.
+	 * alloctrees, freetrees, and defertree and add its capacity to
+	 * the vdev.
 	 */
-	if (*freed_map == NULL) {
-		ASSERT(*defer_map == NULL);
+	if (msp->ms_freetree[TXG_CLEAN(txg) & TXG_MASK] == NULL) {
 		for (int t = 0; t < TXG_SIZE; t++) {
-			msp->ms_allocmap[t] = kmem_zalloc(sizeof (space_map_t),
-			    KM_SLEEP);
-			space_map_create(msp->ms_allocmap[t], sm->sm_start,
-			    sm->sm_size, sm->sm_shift, sm->sm_lock);
-			msp->ms_freemap[t] = kmem_zalloc(sizeof (space_map_t),
-			    KM_SLEEP);
-			space_map_create(msp->ms_freemap[t], sm->sm_start,
-			    sm->sm_size, sm->sm_shift, sm->sm_lock);
+			ASSERT(msp->ms_alloctree[t] == NULL);
+			ASSERT(msp->ms_freetree[t] == NULL);
+
+			msp->ms_alloctree[t] = range_tree_create(NULL, msp,
+			    &msp->ms_lock);
+			msp->ms_freetree[t] = range_tree_create(NULL, msp,
+			    &msp->ms_lock);
 		}
 
 		for (int t = 0; t < TXG_DEFER_SIZE; t++) {
-			msp->ms_defermap[t] = kmem_zalloc(sizeof (space_map_t),
-			    KM_SLEEP);
-			space_map_create(msp->ms_defermap[t], sm->sm_start,
-			    sm->sm_size, sm->sm_shift, sm->sm_lock);
+			ASSERT(msp->ms_defertree[t] == NULL);
+
+			msp->ms_defertree[t] = range_tree_create(NULL, msp,
+			    &msp->ms_lock);
 		}
 
-		freed_map = &msp->ms_freemap[TXG_CLEAN(txg) & TXG_MASK];
-		defer_map = &msp->ms_defermap[txg % TXG_DEFER_SIZE];
-
-		vdev_space_update(vd, 0, 0, sm->sm_size);
+		vdev_space_update(vd, 0, 0, msp->ms_size);
 	}
 
-	alloc_delta = smosync->smo_alloc - smo->smo_alloc;
-	defer_delta = (*freed_map)->sm_space - (*defer_map)->sm_space;
+	freed_tree = &msp->ms_freetree[TXG_CLEAN(txg) & TXG_MASK];
+	defer_tree = &msp->ms_defertree[txg % TXG_DEFER_SIZE];
+
+	alloc_delta = space_map_alloc_delta(msp->ms_sm);
+	defer_delta = range_tree_space(*freed_tree) -
+	    range_tree_space(*defer_tree);
 
 	vdev_space_update(vd, alloc_delta + defer_delta, defer_delta, 0);
 
-	ASSERT(msp->ms_allocmap[txg & TXG_MASK]->sm_space == 0);
-	ASSERT(msp->ms_freemap[txg & TXG_MASK]->sm_space == 0);
+	ASSERT0(range_tree_space(msp->ms_alloctree[txg & TXG_MASK]));
+	ASSERT0(range_tree_space(msp->ms_freetree[txg & TXG_MASK]));
 
 	/*
-	 * If there's a space_map_load() in progress, wait for it to complete
+	 * If there's a metaslab_load() in progress, wait for it to complete
 	 * so that we have a consistent view of the in-core space map.
 	 */
-	space_map_load_wait(sm);
+	metaslab_load_wait(msp);
 
 	/*
-	 * Move the frees from the defer_map to this map (if it's loaded).
-	 * Swap the freed_map and the defer_map -- this is safe to do
-	 * because we've just emptied out the defer_map.
+	 * Move the frees from the defer_tree back to the free
+	 * range tree (if it's loaded). Swap the freed_tree and the
+	 * defer_tree -- this is safe to do because we've just emptied out
+	 * the defer_tree.
 	 */
-	space_map_vacate(*defer_map, sm->sm_loaded ? space_map_free : NULL, sm);
-	ASSERT0((*defer_map)->sm_space);
-	ASSERT0(avl_numnodes(&(*defer_map)->sm_root));
-	space_map_swap(freed_map, defer_map);
+	range_tree_vacate(*defer_tree,
+	    msp->ms_loaded ? range_tree_add : NULL, msp->ms_tree);
+	range_tree_swap(freed_tree, defer_tree);
 
-	*smo = *smosync;
+	space_map_update(msp->ms_sm);
 
 	msp->ms_deferspace += defer_delta;
 	ASSERT3S(msp->ms_deferspace, >=, 0);
-	ASSERT3S(msp->ms_deferspace, <=, sm->sm_size);
+	ASSERT3S(msp->ms_deferspace, <=, msp->ms_size);
 	if (msp->ms_deferspace != 0) {
 		/*
 		 * Keep syncing this metaslab until all deferred frees
@@ -1347,54 +1689,33 @@ metaslab_sync_done(metaslab_t *msp, uint64_t txg)
 		vdev_dirty(vd, VDD_METASLAB, msp, txg + 1);
 	}
 
-	/*
-	 * If the map is loaded but no longer active, evict it as soon as all
-	 * future allocations have synced.  (If we unloaded it now and then
-	 * loaded a moment later, the map wouldn't reflect those allocations.)
-	 */
-	if (sm->sm_loaded && (msp->ms_weight & METASLAB_ACTIVE_MASK) == 0) {
-		int evictable = 1;
+	if (msp->ms_loaded && msp->ms_access_txg < txg) {
+		for (int t = 1; t < TXG_CONCURRENT_STATES; t++) {
+			VERIFY0(range_tree_space(
+			    msp->ms_alloctree[(txg + t) & TXG_MASK]));
+		}
 
-		for (int t = 1; t < TXG_CONCURRENT_STATES; t++)
-			if (msp->ms_allocmap[(txg + t) & TXG_MASK]->sm_space)
-				evictable = 0;
-
-		if (evictable && !metaslab_debug)
-			space_map_unload(sm);
+		if (!metaslab_debug_unload)
+			metaslab_unload(msp);
 	}
 
 	metaslab_group_sort(mg, msp, metaslab_weight(msp));
-
 	mutex_exit(&msp->ms_lock);
+
 }
 
 void
 metaslab_sync_reassess(metaslab_group_t *mg)
 {
-	vdev_t *vd = mg->mg_vd;
 	int64_t failures = mg->mg_alloc_failures;
 
-	/*
-	 * Re-evaluate all metaslabs which have lower offsets than the
-	 * bonus area.
-	 */
-	for (int m = 0; m < vd->vdev_ms_count; m++) {
-		metaslab_t *msp = vd->vdev_ms[m];
-
-		if (msp->ms_map->sm_start > mg->mg_bonus_area)
-			break;
-
-		mutex_enter(&msp->ms_lock);
-		metaslab_group_sort(mg, msp, metaslab_weight(msp));
-		mutex_exit(&msp->ms_lock);
-	}
-
+	metaslab_group_alloc_update(mg);
 	atomic_add_64(&mg->mg_alloc_failures, -failures);
 
 	/*
-	 * Prefetch the next potential metaslabs
+	 * Preload the next potential metaslabs
 	 */
-	metaslab_prefetch(mg);
+	metaslab_group_preload(mg);
 }
 
 static uint64_t
@@ -1402,7 +1723,7 @@ metaslab_distance(metaslab_t *msp, dva_t *dva)
 {
 	uint64_t ms_shift = msp->ms_group->mg_vd->vdev_ms_shift;
 	uint64_t offset = DVA_GET_OFFSET(dva) >> ms_shift;
-	uint64_t start = msp->ms_map->sm_start >> ms_shift;
+	uint64_t start = msp->ms_id;
 
 	if (msp->ms_group->mg_vd->vdev_id != DVA_GET_VDEV(dva))
 		return (1ULL << 63);
@@ -1454,7 +1775,7 @@ metaslab_group_alloc(metaslab_group_t *mg, uint64_t psize, uint64_t asize,
 			/*
 			 * If the selected metaslab is condensing, skip it.
 			 */
-			if (msp->ms_map->sm_condensing)
+			if (msp->ms_condensing)
 				continue;
 
 			was_active = msp->ms_weight & METASLAB_ACTIVE_MASK;
@@ -1462,7 +1783,8 @@ metaslab_group_alloc(metaslab_group_t *mg, uint64_t psize, uint64_t asize,
 				break;
 
 			target_distance = min_distance +
-			    (msp->ms_smo.smo_alloc ? 0 : min_distance >> 1);
+			    (space_map_allocated(msp->ms_sm) != 0 ? 0 :
+			    min_distance >> 1);
 
 			for (i = 0; i < d; i++)
 				if (metaslab_distance(msp, &dva[i]) <
@@ -1475,6 +1797,8 @@ metaslab_group_alloc(metaslab_group_t *mg, uint64_t psize, uint64_t asize,
 		if (msp == NULL)
 			return (-1ULL);
 
+		mutex_enter(&msp->ms_lock);
+
 		/*
 		 * If we've already reached the allowable number of failed
 		 * allocation attempts on this metaslab group then we
@@ -1487,15 +1811,15 @@ metaslab_group_alloc(metaslab_group_t *mg, uint64_t psize, uint64_t asize,
 		    CAN_FASTGANG(flags) && psize > SPA_GANGBLOCKSIZE &&
 		    activation_weight == METASLAB_WEIGHT_PRIMARY) {
 			spa_dbgmsg(spa, "%s: skipping metaslab group: "
-			    "vdev %llu, txg %llu, mg %p, psize %llu, "
-			    "asize %llu, failures %llu", spa_name(spa),
-			    mg->mg_vd->vdev_id, txg, mg, psize, asize,
+			    "vdev %llu, txg %llu, mg %p, msp[%llu] %p, "
+			    "psize %llu, asize %llu, failures %llu",
+			    spa_name(spa), mg->mg_vd->vdev_id, txg, mg,
+			    msp->ms_id, msp, psize, asize,
 			    mg->mg_alloc_failures);
+			mutex_exit(&msp->ms_lock);
 			return (-1ULL);
 		}
 
-		mutex_enter(&msp->ms_lock);
-
 		/*
 		 * Ensure that the metaslab we have selected is still
 		 * capable of handling our request. It's possible that
@@ -1527,25 +1851,25 @@ metaslab_group_alloc(metaslab_group_t *mg, uint64_t psize, uint64_t asize,
 		 * we can't manipulate this metaslab until it's committed
 		 * to disk.
 		 */
-		if (msp->ms_map->sm_condensing) {
+		if (msp->ms_condensing) {
 			mutex_exit(&msp->ms_lock);
 			continue;
 		}
 
-		if ((offset = space_map_alloc(msp->ms_map, asize)) != -1ULL)
+		if ((offset = metaslab_block_alloc(msp, asize)) != -1ULL)
 			break;
 
 		atomic_inc_64(&mg->mg_alloc_failures);
 
-		metaslab_passivate(msp, space_map_maxsize(msp->ms_map));
-
+		metaslab_passivate(msp, metaslab_block_maxsize(msp));
 		mutex_exit(&msp->ms_lock);
 	}
 
-	if (msp->ms_allocmap[txg & TXG_MASK]->sm_space == 0)
+	if (range_tree_space(msp->ms_alloctree[txg & TXG_MASK]) == 0)
 		vdev_dirty(mg->mg_vd, VDD_METASLAB, msp, txg);
 
-	space_map_add(msp->ms_allocmap[txg & TXG_MASK], offset, asize);
+	range_tree_add(msp->ms_alloctree[txg & TXG_MASK], offset, asize);
+	msp->ms_access_txg = txg + metaslab_unload_delay;
 
 	mutex_exit(&msp->ms_lock);
 
@@ -1648,6 +1972,21 @@ top:
 		} else {
 			allocatable = vdev_allocatable(vd);
 		}
+
+		/*
+		 * Determine if the selected metaslab group is eligible
+		 * for allocations. If we're ganging or have requested
+		 * an allocation for the smallest gang block size
+		 * then we don't want to avoid allocating to the this
+		 * metaslab group. If we're in this condition we should
+		 * try to allocate from any device possible so that we
+		 * don't inadvertently return ENOSPC and suspend the pool
+		 * even though space is still available.
+		 */
+		if (allocatable && CAN_FASTGANG(flags) &&
+		    psize > SPA_GANGBLOCKSIZE)
+			allocatable = metaslab_group_allocatable(mg);
+
 		if (!allocatable)
 			goto next;
 
@@ -1777,13 +2116,22 @@ metaslab_free_dva(spa_t *spa, const dva_t *dva, uint64_t txg, boolean_t now)
 	mutex_enter(&msp->ms_lock);
 
 	if (now) {
-		space_map_remove(msp->ms_allocmap[txg & TXG_MASK],
+		range_tree_remove(msp->ms_alloctree[txg & TXG_MASK],
 		    offset, size);
-		space_map_free(msp->ms_map, offset, size);
+
+		VERIFY(!msp->ms_condensing);
+		VERIFY3U(offset, >=, msp->ms_start);
+		VERIFY3U(offset + size, <=, msp->ms_start + msp->ms_size);
+		VERIFY3U(range_tree_space(msp->ms_tree) + size, <=,
+		    msp->ms_size);
+		VERIFY0(P2PHASE(offset, 1ULL << vd->vdev_ashift));
+		VERIFY0(P2PHASE(size, 1ULL << vd->vdev_ashift));
+		range_tree_add(msp->ms_tree, offset, size);
 	} else {
-		if (msp->ms_freemap[txg & TXG_MASK]->sm_space == 0)
+		if (range_tree_space(msp->ms_freetree[txg & TXG_MASK]) == 0)
 			vdev_dirty(vd, VDD_METASLAB, msp, txg);
-		space_map_add(msp->ms_freemap[txg & TXG_MASK], offset, size);
+		range_tree_add(msp->ms_freetree[txg & TXG_MASK],
+		    offset, size);
 	}
 
 	mutex_exit(&msp->ms_lock);
@@ -1818,10 +2166,10 @@ metaslab_claim_dva(spa_t *spa, const dva_t *dva, uint64_t txg)
 
 	mutex_enter(&msp->ms_lock);
 
-	if ((txg != 0 && spa_writeable(spa)) || !msp->ms_map->sm_loaded)
+	if ((txg != 0 && spa_writeable(spa)) || !msp->ms_loaded)
 		error = metaslab_activate(msp, METASLAB_WEIGHT_SECONDARY);
 
-	if (error == 0 && !space_map_contains(msp->ms_map, offset, size))
+	if (error == 0 && !range_tree_contains(msp->ms_tree, offset, size))
 		error = SET_ERROR(ENOENT);
 
 	if (error || txg == 0) {	/* txg == 0 indicates dry run */
@@ -1829,12 +2177,16 @@ metaslab_claim_dva(spa_t *spa, const dva_t *dva, uint64_t txg)
 		return (error);
 	}
 
-	space_map_claim(msp->ms_map, offset, size);
+	VERIFY(!msp->ms_condensing);
+	VERIFY0(P2PHASE(offset, 1ULL << vd->vdev_ashift));
+	VERIFY0(P2PHASE(size, 1ULL << vd->vdev_ashift));
+	VERIFY3U(range_tree_space(msp->ms_tree) - size, <=, msp->ms_size);
+	range_tree_remove(msp->ms_tree, offset, size);
 
 	if (spa_writeable(spa)) {	/* don't dirty if we're zdb(1M) */
-		if (msp->ms_allocmap[txg & TXG_MASK]->sm_space == 0)
+		if (range_tree_space(msp->ms_alloctree[txg & TXG_MASK]) == 0)
 			vdev_dirty(vd, VDD_METASLAB, msp, txg);
-		space_map_add(msp->ms_allocmap[txg & TXG_MASK], offset, size);
+		range_tree_add(msp->ms_alloctree[txg & TXG_MASK], offset, size);
 	}
 
 	mutex_exit(&msp->ms_lock);
@@ -1867,7 +2219,7 @@ metaslab_alloc(spa_t *spa, metaslab_class_t *mc, uint64_t psize, blkptr_t *bp,
 	for (int d = 0; d < ndvas; d++) {
 		error = metaslab_alloc_dva(spa, mc, psize, dva, d, hintdva,
 		    txg, flags);
-		if (error) {
+		if (error != 0) {
 			for (d--; d >= 0; d--) {
 				metaslab_free_dva(spa, &dva[d], txg, B_TRUE);
 				bzero(&dva[d], sizeof (dva_t));
@@ -1934,19 +2286,6 @@ metaslab_claim(spa_t *spa, const blkptr_t *bp, uint64_t txg)
 	return (error);
 }
 
-static void
-checkmap(space_map_t *sm, uint64_t off, uint64_t size)
-{
-	space_seg_t *ss;
-	avl_index_t where;
-
-	mutex_enter(sm->sm_lock);
-	ss = space_map_find(sm, off, size, &where);
-	if (ss != NULL)
-		panic("freeing free block; ss=%p", (void *)ss);
-	mutex_exit(sm->sm_lock);
-}
-
 void
 metaslab_check_free(spa_t *spa, const blkptr_t *bp)
 {
@@ -1955,19 +2294,19 @@ metaslab_check_free(spa_t *spa, const blkptr_t *bp)
 
 	spa_config_enter(spa, SCL_VDEV, FTAG, RW_READER);
 	for (int i = 0; i < BP_GET_NDVAS(bp); i++) {
-		uint64_t vdid = DVA_GET_VDEV(&bp->blk_dva[i]);
-		vdev_t *vd = vdev_lookup_top(spa, vdid);
-		uint64_t off = DVA_GET_OFFSET(&bp->blk_dva[i]);
+		uint64_t vdev = DVA_GET_VDEV(&bp->blk_dva[i]);
+		vdev_t *vd = vdev_lookup_top(spa, vdev);
+		uint64_t offset = DVA_GET_OFFSET(&bp->blk_dva[i]);
 		uint64_t size = DVA_GET_ASIZE(&bp->blk_dva[i]);
-		metaslab_t *ms = vd->vdev_ms[off >> vd->vdev_ms_shift];
+		metaslab_t *msp = vd->vdev_ms[offset >> vd->vdev_ms_shift];
 
-		if (ms->ms_map->sm_loaded)
-			checkmap(ms->ms_map, off, size);
+		if (msp->ms_loaded)
+			range_tree_verify(msp->ms_tree, offset, size);
 
 		for (int j = 0; j < TXG_SIZE; j++)
-			checkmap(ms->ms_freemap[j], off, size);
+			range_tree_verify(msp->ms_freetree[j], offset, size);
 		for (int j = 0; j < TXG_DEFER_SIZE; j++)
-			checkmap(ms->ms_defermap[j], off, size);
+			range_tree_verify(msp->ms_defertree[j], offset, size);
 	}
 	spa_config_exit(spa, SCL_VDEV, FTAG);
 }
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
new file mode 100644
index 00000000000..f44222c5703
--- /dev/null
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c
@@ -0,0 +1,391 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ */
+
+#include <sys/zfs_context.h>
+#include <sys/spa.h>
+#include <sys/dmu.h>
+#include <sys/dnode.h>
+#include <sys/zio.h>
+#include <sys/range_tree.h>
+
+static kmem_cache_t *range_seg_cache;
+
+void
+range_tree_init(void)
+{
+	ASSERT(range_seg_cache == NULL);
+	range_seg_cache = kmem_cache_create("range_seg_cache",
+	    sizeof (range_seg_t), 0, NULL, NULL, NULL, NULL, NULL, 0);
+}
+
+void
+range_tree_fini(void)
+{
+	kmem_cache_destroy(range_seg_cache);
+	range_seg_cache = NULL;
+}
+
+void
+range_tree_stat_verify(range_tree_t *rt)
+{
+	range_seg_t *rs;
+	uint64_t hist[RANGE_TREE_HISTOGRAM_SIZE] = { 0 };
+	int i;
+
+	for (rs = avl_first(&rt->rt_root); rs != NULL;
+	    rs = AVL_NEXT(&rt->rt_root, rs)) {
+		uint64_t size = rs->rs_end - rs->rs_start;
+		int idx	= highbit(size) - 1;
+
+		hist[idx]++;
+		ASSERT3U(hist[idx], !=, 0);
+	}
+
+	for (i = 0; i < RANGE_TREE_HISTOGRAM_SIZE; i++) {
+		if (hist[i] != rt->rt_histogram[i]) {
+			zfs_dbgmsg("i=%d, hist=%p, hist=%llu, rt_hist=%llu",
+			    i, hist, hist[i], rt->rt_histogram[i]);
+		}
+		VERIFY3U(hist[i], ==, rt->rt_histogram[i]);
+	}
+}
+
+static void
+range_tree_stat_incr(range_tree_t *rt, range_seg_t *rs)
+{
+	uint64_t size = rs->rs_end - rs->rs_start;
+	int idx = highbit(size) - 1;
+
+	ASSERT3U(idx, <,
+	    sizeof (rt->rt_histogram) / sizeof (*rt->rt_histogram));
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+	rt->rt_histogram[idx]++;
+	ASSERT3U(rt->rt_histogram[idx], !=, 0);
+}
+
+static void
+range_tree_stat_decr(range_tree_t *rt, range_seg_t *rs)
+{
+	uint64_t size = rs->rs_end - rs->rs_start;
+	int idx = highbit(size) - 1;
+
+	ASSERT3U(idx, <,
+	    sizeof (rt->rt_histogram) / sizeof (*rt->rt_histogram));
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+	ASSERT3U(rt->rt_histogram[idx], !=, 0);
+	rt->rt_histogram[idx]--;
+}
+
+/*
+ * NOTE: caller is responsible for all locking.
+ */
+static int
+range_tree_seg_compare(const void *x1, const void *x2)
+{
+	const range_seg_t *r1 = x1;
+	const range_seg_t *r2 = x2;
+
+	if (r1->rs_start < r2->rs_start) {
+		if (r1->rs_end > r2->rs_start)
+			return (0);
+		return (-1);
+	}
+	if (r1->rs_start > r2->rs_start) {
+		if (r1->rs_start < r2->rs_end)
+			return (0);
+		return (1);
+	}
+	return (0);
+}
+
+range_tree_t *
+range_tree_create(range_tree_ops_t *ops, void *arg, kmutex_t *lp)
+{
+	range_tree_t *rt;
+
+	rt = kmem_zalloc(sizeof (range_tree_t), KM_SLEEP);
+
+	avl_create(&rt->rt_root, range_tree_seg_compare,
+	    sizeof (range_seg_t), offsetof(range_seg_t, rs_node));
+
+	rt->rt_lock = lp;
+	rt->rt_ops = ops;
+	rt->rt_arg = arg;
+
+	if (rt->rt_ops != NULL)
+		rt->rt_ops->rtop_create(rt, rt->rt_arg);
+
+	return (rt);
+}
+
+void
+range_tree_destroy(range_tree_t *rt)
+{
+	VERIFY0(rt->rt_space);
+
+	if (rt->rt_ops != NULL)
+		rt->rt_ops->rtop_destroy(rt, rt->rt_arg);
+
+	avl_destroy(&rt->rt_root);
+	kmem_free(rt, sizeof (*rt));
+}
+
+void
+range_tree_add(void *arg, uint64_t start, uint64_t size)
+{
+	range_tree_t *rt = arg;
+	avl_index_t where;
+	range_seg_t rsearch, *rs_before, *rs_after, *rs;
+	uint64_t end = start + size;
+	boolean_t merge_before, merge_after;
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+	VERIFY(size != 0);
+
+	rsearch.rs_start = start;
+	rsearch.rs_end = end;
+	rs = avl_find(&rt->rt_root, &rsearch, &where);
+
+	if (rs != NULL && rs->rs_start <= start && rs->rs_end >= end) {
+		zfs_panic_recover("zfs: allocating allocated segment"
+		    "(offset=%llu size=%llu)\n",
+		    (longlong_t)start, (longlong_t)size);
+		return;
+	}
+
+	/* Make sure we don't overlap with either of our neighbors */
+	VERIFY(rs == NULL);
+
+	rs_before = avl_nearest(&rt->rt_root, where, AVL_BEFORE);
+	rs_after = avl_nearest(&rt->rt_root, where, AVL_AFTER);
+
+	merge_before = (rs_before != NULL && rs_before->rs_end == start);
+	merge_after = (rs_after != NULL && rs_after->rs_start == end);
+
+	if (merge_before && merge_after) {
+		avl_remove(&rt->rt_root, rs_before);
+		if (rt->rt_ops != NULL) {
+			rt->rt_ops->rtop_remove(rt, rs_before, rt->rt_arg);
+			rt->rt_ops->rtop_remove(rt, rs_after, rt->rt_arg);
+		}
+
+		range_tree_stat_decr(rt, rs_before);
+		range_tree_stat_decr(rt, rs_after);
+
+		rs_after->rs_start = rs_before->rs_start;
+		kmem_cache_free(range_seg_cache, rs_before);
+		rs = rs_after;
+	} else if (merge_before) {
+		if (rt->rt_ops != NULL)
+			rt->rt_ops->rtop_remove(rt, rs_before, rt->rt_arg);
+
+		range_tree_stat_decr(rt, rs_before);
+
+		rs_before->rs_end = end;
+		rs = rs_before;
+	} else if (merge_after) {
+		if (rt->rt_ops != NULL)
+			rt->rt_ops->rtop_remove(rt, rs_after, rt->rt_arg);
+
+		range_tree_stat_decr(rt, rs_after);
+
+		rs_after->rs_start = start;
+		rs = rs_after;
+	} else {
+		rs = kmem_cache_alloc(range_seg_cache, KM_SLEEP);
+		rs->rs_start = start;
+		rs->rs_end = end;
+		avl_insert(&rt->rt_root, rs, where);
+	}
+
+	if (rt->rt_ops != NULL)
+		rt->rt_ops->rtop_add(rt, rs, rt->rt_arg);
+
+	range_tree_stat_incr(rt, rs);
+	rt->rt_space += size;
+}
+
+void
+range_tree_remove(void *arg, uint64_t start, uint64_t size)
+{
+	range_tree_t *rt = arg;
+	avl_index_t where;
+	range_seg_t rsearch, *rs, *newseg;
+	uint64_t end = start + size;
+	boolean_t left_over, right_over;
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+	VERIFY3U(size, !=, 0);
+	VERIFY3U(size, <=, rt->rt_space);
+
+	rsearch.rs_start = start;
+	rsearch.rs_end = end;
+	rs = avl_find(&rt->rt_root, &rsearch, &where);
+
+	/* Make sure we completely overlap with someone */
+	if (rs == NULL) {
+		zfs_panic_recover("zfs: freeing free segment "
+		    "(offset=%llu size=%llu)",
+		    (longlong_t)start, (longlong_t)size);
+		return;
+	}
+	VERIFY3U(rs->rs_start, <=, start);
+	VERIFY3U(rs->rs_end, >=, end);
+
+	left_over = (rs->rs_start != start);
+	right_over = (rs->rs_end != end);
+
+	range_tree_stat_decr(rt, rs);
+
+	if (rt->rt_ops != NULL)
+		rt->rt_ops->rtop_remove(rt, rs, rt->rt_arg);
+
+	if (left_over && right_over) {
+		newseg = kmem_cache_alloc(range_seg_cache, KM_SLEEP);
+		newseg->rs_start = end;
+		newseg->rs_end = rs->rs_end;
+		range_tree_stat_incr(rt, newseg);
+
+		rs->rs_end = start;
+
+		avl_insert_here(&rt->rt_root, newseg, rs, AVL_AFTER);
+		if (rt->rt_ops != NULL)
+			rt->rt_ops->rtop_add(rt, newseg, rt->rt_arg);
+	} else if (left_over) {
+		rs->rs_end = start;
+	} else if (right_over) {
+		rs->rs_start = end;
+	} else {
+		avl_remove(&rt->rt_root, rs);
+		kmem_cache_free(range_seg_cache, rs);
+		rs = NULL;
+	}
+
+	if (rs != NULL) {
+		range_tree_stat_incr(rt, rs);
+
+		if (rt->rt_ops != NULL)
+			rt->rt_ops->rtop_add(rt, rs, rt->rt_arg);
+	}
+
+	rt->rt_space -= size;
+}
+
+static range_seg_t *
+range_tree_find(range_tree_t *rt, uint64_t start, uint64_t size,
+    avl_index_t *wherep)
+{
+	range_seg_t rsearch, *rs;
+	uint64_t end = start + size;
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+	VERIFY(size != 0);
+
+	rsearch.rs_start = start;
+	rsearch.rs_end = end;
+	rs = avl_find(&rt->rt_root, &rsearch, wherep);
+
+	if (rs != NULL && rs->rs_start <= start && rs->rs_end >= end)
+		return (rs);
+	return (NULL);
+}
+
+void
+range_tree_verify(range_tree_t *rt, uint64_t off, uint64_t size)
+{
+	range_seg_t *rs;
+	avl_index_t where;
+
+	mutex_enter(rt->rt_lock);
+	rs = range_tree_find(rt, off, size, &where);
+	if (rs != NULL)
+		panic("freeing free block; rs=%p", (void *)rs);
+	mutex_exit(rt->rt_lock);
+}
+
+boolean_t
+range_tree_contains(range_tree_t *rt, uint64_t start, uint64_t size)
+{
+	avl_index_t where;
+
+	return (range_tree_find(rt, start, size, &where) != NULL);
+}
+
+void
+range_tree_swap(range_tree_t **rtsrc, range_tree_t **rtdst)
+{
+	range_tree_t *rt;
+
+	ASSERT(MUTEX_HELD((*rtsrc)->rt_lock));
+	ASSERT0(range_tree_space(*rtdst));
+	ASSERT0(avl_numnodes(&(*rtdst)->rt_root));
+
+	rt = *rtsrc;
+	*rtsrc = *rtdst;
+	*rtdst = rt;
+}
+
+void
+range_tree_vacate(range_tree_t *rt, range_tree_func_t *func, void *arg)
+{
+	range_seg_t *rs;
+	void *cookie = NULL;
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+
+	if (rt->rt_ops != NULL)
+		rt->rt_ops->rtop_vacate(rt, rt->rt_arg);
+
+	while ((rs = avl_destroy_nodes(&rt->rt_root, &cookie)) != NULL) {
+		if (func != NULL)
+			func(arg, rs->rs_start, rs->rs_end - rs->rs_start);
+		kmem_cache_free(range_seg_cache, rs);
+	}
+
+	bzero(rt->rt_histogram, sizeof (rt->rt_histogram));
+	rt->rt_space = 0;
+}
+
+void
+range_tree_walk(range_tree_t *rt, range_tree_func_t *func, void *arg)
+{
+	range_seg_t *rs;
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+
+	for (rs = avl_first(&rt->rt_root); rs; rs = AVL_NEXT(&rt->rt_root, rs))
+		func(arg, rs->rs_start, rs->rs_end - rs->rs_start);
+}
+
+uint64_t
+range_tree_space(range_tree_t *rt)
+{
+	return (rt->rt_space);
+}
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 cfeb21c6616..fb8101bd2b3 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
@@ -95,23 +95,23 @@ SYSCTL_INT(_vfs_zfs, OID_AUTO, check_hostid, CTLFLAG_RW, &check_hostid, 0,
 static int zfs_ccw_retry_interval = 300;
 
 typedef enum zti_modes {
-	zti_mode_fixed,			/* value is # of threads (min 1) */
-	zti_mode_online_percent,	/* value is % of online CPUs */
-	zti_mode_batch,			/* cpu-intensive; value is ignored */
-	zti_mode_null,			/* don't create a taskq */
-	zti_nmodes
+	ZTI_MODE_FIXED,			/* value is # of threads (min 1) */
+	ZTI_MODE_BATCH,			/* cpu-intensive; value is ignored */
+	ZTI_MODE_NULL,			/* don't create a taskq */
+	ZTI_NMODES
 } zti_modes_t;
 
-#define	ZTI_FIX(n)	{ zti_mode_fixed, (n) }
-#define	ZTI_PCT(n)	{ zti_mode_online_percent, (n) }
-#define	ZTI_BATCH	{ zti_mode_batch, 0 }
-#define	ZTI_NULL	{ zti_mode_null, 0 }
+#define	ZTI_P(n, q)	{ ZTI_MODE_FIXED, (n), (q) }
+#define	ZTI_BATCH	{ ZTI_MODE_BATCH, 0, 1 }
+#define	ZTI_NULL	{ ZTI_MODE_NULL, 0, 0 }
 
-#define	ZTI_ONE		ZTI_FIX(1)
+#define	ZTI_N(n)	ZTI_P(n, 1)
+#define	ZTI_ONE		ZTI_N(1)
 
 typedef struct zio_taskq_info {
-	enum zti_modes zti_mode;
+	zti_modes_t zti_mode;
 	uint_t zti_value;
+	uint_t zti_count;
 } zio_taskq_info_t;
 
 static const char *const zio_taskq_types[ZIO_TASKQ_TYPES] = {
@@ -119,17 +119,30 @@ static const char *const zio_taskq_types[ZIO_TASKQ_TYPES] = {
 };
 
 /*
- * Define the taskq threads for the following I/O types:
- * 	NULL, READ, WRITE, FREE, CLAIM, and IOCTL
+ * This table defines the taskq settings for each ZFS I/O type. When
+ * initializing a pool, we use this table to create an appropriately sized
+ * taskq. Some operations are low volume and therefore have a small, static
+ * number of threads assigned to their taskqs using the ZTI_N(#) or ZTI_ONE
+ * macros. Other operations process a large amount of data; the ZTI_BATCH
+ * macro causes us to create a taskq oriented for throughput. Some operations
+ * are so high frequency and short-lived that the taskq itself can become a a
+ * point of lock contention. The ZTI_P(#, #) macro indicates that we need an
+ * additional degree of parallelism specified by the number of threads per-
+ * taskq and the number of taskqs; when dispatching an event in this case, the
+ * particular taskq is chosen at random.
+ *
+ * The different taskq priorities are to handle the different contexts (issue
+ * and interrupt) and then to reserve threads for ZIO_PRIORITY_NOW I/Os that
+ * need to be handled with minimum delay.
  */
 const zio_taskq_info_t zio_taskqs[ZIO_TYPES][ZIO_TASKQ_TYPES] = {
 	/* ISSUE	ISSUE_HIGH	INTR		INTR_HIGH */
-	{ ZTI_ONE,	ZTI_NULL,	ZTI_ONE,	ZTI_NULL },
-	{ ZTI_FIX(8),	ZTI_NULL,	ZTI_BATCH,	ZTI_NULL },
-	{ ZTI_BATCH,	ZTI_FIX(5),	ZTI_FIX(8),	ZTI_FIX(5) },
-	{ ZTI_FIX(100),	ZTI_NULL,	ZTI_ONE,	ZTI_NULL },
-	{ ZTI_ONE,	ZTI_NULL,	ZTI_ONE,	ZTI_NULL },
-	{ ZTI_ONE,	ZTI_NULL,	ZTI_ONE,	ZTI_NULL },
+	{ ZTI_ONE,	ZTI_NULL,	ZTI_ONE,	ZTI_NULL }, /* NULL */
+	{ ZTI_N(8),	ZTI_NULL,	ZTI_BATCH,	ZTI_NULL }, /* READ */
+	{ ZTI_BATCH,	ZTI_N(5),	ZTI_N(8),	ZTI_N(5) }, /* WRITE */
+	{ ZTI_P(12, 8),	ZTI_NULL,	ZTI_ONE,	ZTI_NULL }, /* FREE */
+	{ ZTI_ONE,	ZTI_NULL,	ZTI_ONE,	ZTI_NULL }, /* CLAIM */
+	{ ZTI_ONE,	ZTI_NULL,	ZTI_ONE,	ZTI_NULL }, /* IOCTL */
 };
 
 static void spa_sync_version(void *arg, dmu_tx_t *tx);
@@ -140,7 +153,7 @@ static int spa_load_impl(spa_t *spa, uint64_t, nvlist_t *config,
     char **ereport);
 static void spa_vdev_resilver_done(spa_t *spa);
 
-uint_t		zio_taskq_batch_pct = 100;	/* 1 thread per cpu in pset */
+uint_t		zio_taskq_batch_pct = 75;	/* 1 thread per cpu in pset */
 #ifdef PSRSET_BIND
 id_t		zio_taskq_psrset_bind = PS_NONE;
 #endif
@@ -821,50 +834,129 @@ spa_get_errlists(spa_t *spa, avl_tree_t *last, avl_tree_t *scrub)
 	    offsetof(spa_error_entry_t, se_avl));
 }
 
-static taskq_t *
-spa_taskq_create(spa_t *spa, const char *name, enum zti_modes mode,
-    uint_t value)
+static void
+spa_taskqs_init(spa_t *spa, zio_type_t t, zio_taskq_type_t q)
 {
-	uint_t flags = TASKQ_PREPOPULATE;
+	const zio_taskq_info_t *ztip = &zio_taskqs[t][q];
+	enum zti_modes mode = ztip->zti_mode;
+	uint_t value = ztip->zti_value;
+	uint_t count = ztip->zti_count;
+	spa_taskqs_t *tqs = &spa->spa_zio_taskq[t][q];
+	char name[32];
+	uint_t flags = 0;
 	boolean_t batch = B_FALSE;
 
-	switch (mode) {
-	case zti_mode_null:
-		return (NULL);		/* no taskq needed */
+	if (mode == ZTI_MODE_NULL) {
+		tqs->stqs_count = 0;
+		tqs->stqs_taskq = NULL;
+		return;
+	}
 
-	case zti_mode_fixed:
+	ASSERT3U(count, >, 0);
+
+	tqs->stqs_count = count;
+	tqs->stqs_taskq = kmem_alloc(count * sizeof (taskq_t *), KM_SLEEP);
+
+	switch (mode) {
+	case ZTI_MODE_FIXED:
 		ASSERT3U(value, >=, 1);
 		value = MAX(value, 1);
 		break;
 
-	case zti_mode_batch:
+	case ZTI_MODE_BATCH:
 		batch = B_TRUE;
 		flags |= TASKQ_THREADS_CPU_PCT;
 		value = zio_taskq_batch_pct;
 		break;
 
-	case zti_mode_online_percent:
-		flags |= TASKQ_THREADS_CPU_PCT;
-		break;
-
 	default:
-		panic("unrecognized mode for %s taskq (%u:%u) in "
+		panic("unrecognized mode for %s_%s taskq (%u:%u) in "
 		    "spa_activate()",
-		    name, mode, value);
+		    zio_type_name[t], zio_taskq_types[q], mode, value);
 		break;
 	}
 
+	for (uint_t i = 0; i < count; i++) {
+		taskq_t *tq;
+
+		if (count > 1) {
+			(void) snprintf(name, sizeof (name), "%s_%s_%u",
+			    zio_type_name[t], zio_taskq_types[q], i);
+		} else {
+			(void) snprintf(name, sizeof (name), "%s_%s",
+			    zio_type_name[t], zio_taskq_types[q]);
+		}
+
 #ifdef SYSDC
-	if (zio_taskq_sysdc && spa->spa_proc != &p0) {
-		if (batch)
-			flags |= TASKQ_DC_BATCH;
+		if (zio_taskq_sysdc && spa->spa_proc != &p0) {
+			if (batch)
+				flags |= TASKQ_DC_BATCH;
 
-		return (taskq_create_sysdc(name, value, 50, INT_MAX,
-		    spa->spa_proc, zio_taskq_basedc, flags));
-	}
+			tq = taskq_create_sysdc(name, value, 50, INT_MAX,
+			    spa->spa_proc, zio_taskq_basedc, flags);
+		} else {
 #endif
-	return (taskq_create_proc(name, value, maxclsyspri, 50, INT_MAX,
-	    spa->spa_proc, flags));
+			pri_t pri = maxclsyspri;
+			/*
+			 * The write issue taskq can be extremely CPU
+			 * intensive.  Run it at slightly lower priority
+			 * than the other taskqs.
+			 */
+			if (t == ZIO_TYPE_WRITE && q == ZIO_TASKQ_ISSUE)
+				pri--;
+
+			tq = taskq_create_proc(name, value, pri, 50,
+			    INT_MAX, spa->spa_proc, flags);
+#ifdef SYSDC
+		}
+#endif
+
+		tqs->stqs_taskq[i] = tq;
+	}
+}
+
+static void
+spa_taskqs_fini(spa_t *spa, zio_type_t t, zio_taskq_type_t q)
+{
+	spa_taskqs_t *tqs = &spa->spa_zio_taskq[t][q];
+
+	if (tqs->stqs_taskq == NULL) {
+		ASSERT0(tqs->stqs_count);
+		return;
+	}
+
+	for (uint_t i = 0; i < tqs->stqs_count; i++) {
+		ASSERT3P(tqs->stqs_taskq[i], !=, NULL);
+		taskq_destroy(tqs->stqs_taskq[i]);
+	}
+
+	kmem_free(tqs->stqs_taskq, tqs->stqs_count * sizeof (taskq_t *));
+	tqs->stqs_taskq = NULL;
+}
+
+/*
+ * Dispatch a task to the appropriate taskq for the ZFS I/O type and priority.
+ * Note that a type may have multiple discrete taskqs to avoid lock contention
+ * on the taskq itself. In that case we choose which taskq at random by using
+ * the low bits of gethrtime().
+ */
+void
+spa_taskq_dispatch_ent(spa_t *spa, zio_type_t t, zio_taskq_type_t q,
+    task_func_t *func, void *arg, uint_t flags, taskq_ent_t *ent)
+{
+	spa_taskqs_t *tqs = &spa->spa_zio_taskq[t][q];
+	taskq_t *tq;
+
+	ASSERT3P(tqs->stqs_taskq, !=, NULL);
+	ASSERT3U(tqs->stqs_count, !=, 0);
+
+	if (tqs->stqs_count == 1) {
+		tq = tqs->stqs_taskq[0];
+	} else {
+		tq = tqs->stqs_taskq[gethrtime() % tqs->stqs_count];
+	}
+
+	taskq_dispatch_ent(tq, func, arg, flags, ent);
 }
 
 static void
@@ -872,16 +964,7 @@ spa_create_zio_taskqs(spa_t *spa)
 {
 	for (int t = 0; t < ZIO_TYPES; t++) {
 		for (int q = 0; q < ZIO_TASKQ_TYPES; q++) {
-			const zio_taskq_info_t *ztip = &zio_taskqs[t][q];
-			enum zti_modes mode = ztip->zti_mode;
-			uint_t value = ztip->zti_value;
-			char name[32];
-
-			(void) snprintf(name, sizeof (name),
-			    "%s_%s", zio_type_name[t], zio_taskq_types[q]);
-
-			spa->spa_zio_taskq[t][q] =
-			    spa_taskq_create(spa, name, mode, value);
+			spa_taskqs_init(spa, t, q);
 		}
 	}
 }
@@ -1058,9 +1141,7 @@ spa_deactivate(spa_t *spa)
 
 	for (int t = 0; t < ZIO_TYPES; t++) {
 		for (int q = 0; q < ZIO_TASKQ_TYPES; q++) {
-			if (spa->spa_zio_taskq[t][q] != NULL)
-				taskq_destroy(spa->spa_zio_taskq[t][q]);
-			spa->spa_zio_taskq[t][q] = NULL;
+			spa_taskqs_fini(spa, t, q);
 		}
 	}
 
@@ -1194,6 +1275,15 @@ spa_unload(spa_t *spa)
 
 	bpobj_close(&spa->spa_deferred_bpobj);
 
+	spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
+
+	/*
+	 * Close all vdevs.
+	 */
+	if (spa->spa_root_vdev)
+		vdev_free(spa->spa_root_vdev);
+	ASSERT(spa->spa_root_vdev == NULL);
+
 	/*
 	 * Close the dsl pool.
 	 */
@@ -1205,20 +1295,12 @@ spa_unload(spa_t *spa)
 
 	ddt_unload(spa);
 
-	spa_config_enter(spa, SCL_ALL, FTAG, RW_WRITER);
 
 	/*
 	 * Drop and purge level 2 cache
 	 */
 	spa_l2cache_drop(spa);
 
-	/*
-	 * Close all vdevs.
-	 */
-	if (spa->spa_root_vdev)
-		vdev_free(spa->spa_root_vdev);
-	ASSERT(spa->spa_root_vdev == NULL);
-
 	for (i = 0; i < spa->spa_spares.sav_count; i++)
 		vdev_free(spa->spa_spares.sav_vdevs[i]);
 	if (spa->spa_spares.sav_vdevs) {
@@ -4686,7 +4768,9 @@ spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing)
 	vdev_dirty(tvd, VDD_DTL, newvd, txg);
 
 	/*
-	 * Restart the resilver
+	 * Schedule the resilver to restart in the future. We do this to
+	 * ensure that dmu_sync-ed blocks have been stitched into the
+	 * respective datasets.
 	 */
 	dsl_resilver_restart(spa->spa_dsl_pool, dtl_max_txg);
 
@@ -5315,7 +5399,7 @@ spa_vdev_remove_evacuate(spa_t *spa, vdev_t *vd)
 	ASSERT0(vd->vdev_stat.vs_alloc);
 	txg = spa_vdev_config_enter(spa);
 	vd->vdev_removing = B_TRUE;
-	vdev_dirty(vd, 0, NULL, txg);
+	vdev_dirty_leaves(vd, VDD_DTL, txg);
 	vdev_config_dirty(vd);
 	spa_vdev_config_exit(spa, NULL, txg, 0, FTAG);
 
@@ -5976,6 +6060,32 @@ spa_free_sync_cb(void *arg, const blkptr_t *bp, dmu_tx_t *tx)
 	return (0);
 }
 
+/*
+ * Note: this simple function is not inlined to make it easier to dtrace the
+ * amount of time spent syncing frees.
+ */
+static void
+spa_sync_frees(spa_t *spa, bplist_t *bpl, dmu_tx_t *tx)
+{
+	zio_t *zio = zio_root(spa, NULL, NULL, 0);
+	bplist_iterate(bpl, spa_free_sync_cb, zio, tx);
+	VERIFY(zio_wait(zio) == 0);
+}
+
+/*
+ * Note: this simple function is not inlined to make it easier to dtrace the
+ * amount of time spent syncing deferred frees.
+ */
+static void
+spa_sync_deferred_frees(spa_t *spa, dmu_tx_t *tx)
+{
+	zio_t *zio = zio_root(spa, NULL, NULL, 0);
+	VERIFY3U(bpobj_iterate(&spa->spa_deferred_bpobj,
+	    spa_free_sync_cb, zio, tx), ==, 0);
+	VERIFY0(zio_wait(zio));
+}
+
+
 static void
 spa_sync_nvlist(spa_t *spa, uint64_t obj, nvlist_t *nv, dmu_tx_t *tx)
 {
@@ -6133,7 +6243,7 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
 			ASSERT(zpool_prop_feature(nvpair_name(elem)));
 
 			fname = strchr(nvpair_name(elem), '@') + 1;
-			VERIFY3U(0, ==, zfeature_lookup_name(fname, &feature));
+			VERIFY0(zfeature_lookup_name(fname, &feature));
 
 			spa_feature_enable(spa, feature, tx);
 			spa_history_log_internal(spa, "set", tx,
@@ -6141,7 +6251,7 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
 			break;
 
 		case ZPOOL_PROP_VERSION:
-			VERIFY(nvpair_value_uint64(elem, &intval) == 0);
+			intval = fnvpair_value_uint64(elem);
 			/*
 			 * The version is synced seperatly before other
 			 * properties and should be correct by now.
@@ -6165,7 +6275,7 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
 			 */
 			break;
 		case ZPOOL_PROP_COMMENT:
-			VERIFY(nvpair_value_string(elem, &strval) == 0);
+			strval = fnvpair_value_string(elem);
 			if (spa->spa_comment != NULL)
 				spa_strfree(spa->spa_comment);
 			spa->spa_comment = spa_strdup(strval);
@@ -6197,23 +6307,23 @@ spa_sync_props(void *arg, dmu_tx_t *tx)
 
 			if (nvpair_type(elem) == DATA_TYPE_STRING) {
 				ASSERT(proptype == PROP_TYPE_STRING);
-				VERIFY(nvpair_value_string(elem, &strval) == 0);
-				VERIFY(zap_update(mos,
+				strval = fnvpair_value_string(elem);
+				VERIFY0(zap_update(mos,
 				    spa->spa_pool_props_object, propname,
-				    1, strlen(strval) + 1, strval, tx) == 0);
+				    1, strlen(strval) + 1, strval, tx));
 				spa_history_log_internal(spa, "set", tx,
 				    "%s=%s", nvpair_name(elem), strval);
 			} else if (nvpair_type(elem) == DATA_TYPE_UINT64) {
-				VERIFY(nvpair_value_uint64(elem, &intval) == 0);
+				intval = fnvpair_value_uint64(elem);
 
 				if (proptype == PROP_TYPE_INDEX) {
 					const char *unused;
-					VERIFY(zpool_prop_index_to_string(
-					    prop, intval, &unused) == 0);
+					VERIFY0(zpool_prop_index_to_string(
+					    prop, intval, &unused));
 				}
-				VERIFY(zap_update(mos,
+				VERIFY0(zap_update(mos,
 				    spa->spa_pool_props_object, propname,
-				    8, 1, &intval, tx) == 0);
+				    8, 1, &intval, tx));
 				spa_history_log_internal(spa, "set", tx,
 				    "%s=%lld", nvpair_name(elem), intval);
 			} else {
@@ -6302,7 +6412,6 @@ spa_sync(spa_t *spa, uint64_t txg)
 {
 	dsl_pool_t *dp = spa->spa_dsl_pool;
 	objset_t *mos = spa->spa_meta_objset;
-	bpobj_t *defer_bpo = &spa->spa_deferred_bpobj;
 	bplist_t *free_bpl = &spa->spa_free_bplist[txg & TXG_MASK];
 	vdev_t *rvd = spa->spa_root_vdev;
 	vdev_t *vd;
@@ -6389,10 +6498,7 @@ spa_sync(spa_t *spa, uint64_t txg)
 	    !txg_list_empty(&dp->dp_sync_tasks, txg) ||
 	    ((dsl_scan_active(dp->dp_scan) ||
 	    txg_sync_waiting(dp)) && !spa_shutting_down(spa))) {
-		zio_t *zio = zio_root(spa, NULL, NULL, 0);
-		VERIFY3U(bpobj_iterate(defer_bpo,
-		    spa_free_sync_cb, zio, tx), ==, 0);
-		VERIFY0(zio_wait(zio));
+		spa_sync_deferred_frees(spa, tx);
 	}
 
 	/*
@@ -6410,13 +6516,10 @@ spa_sync(spa_t *spa, uint64_t txg)
 		dsl_pool_sync(dp, txg);
 
 		if (pass < zfs_sync_pass_deferred_free) {
-			zio_t *zio = zio_root(spa, NULL, NULL, 0);
-			bplist_iterate(free_bpl, spa_free_sync_cb,
-			    zio, tx);
-			VERIFY(zio_wait(zio) == 0);
+			spa_sync_frees(spa, free_bpl, tx);
 		} else {
 			bplist_iterate(free_bpl, bpobj_enqueue_cb,
-			    defer_bpo, tx);
+			    &spa->spa_deferred_bpobj, tx);
 		}
 
 		ddt_sync(spa, txg);
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 d92bcf06ff6..7c1927c8cfa 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,6 +243,10 @@ int zfs_flags = ~(ZFS_DEBUG_DPRINTF | ZFS_DEBUG_SPA);
 #else
 int zfs_flags = 0;
 #endif
+SYSCTL_DECL(_debug);
+TUNABLE_INT("debug.zfs_flags", &zfs_flags);
+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
@@ -255,23 +259,29 @@ TUNABLE_INT("vfs.zfs.recover", &zfs_recover);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, recover, CTLFLAG_RDTUN, &zfs_recover, 0,
     "Try to recover from otherwise-fatal errors.");
 
-extern int zfs_txg_synctime_ms;
+/*
+ * Expiration time in milliseconds. This value has two meanings. First it is
+ * used to determine when the spa_deadman() logic should fire. By default the
+ * spa_deadman() will fire if spa_sync() has not completed in 1000 seconds.
+ * Secondly, the value determines if an I/O is considered "hung". Any I/O that
+ * has not completed in zfs_deadman_synctime_ms is considered "hung" resulting
+ * in a system panic.
+ */
+uint64_t zfs_deadman_synctime_ms = 1000000ULL;
+TUNABLE_QUAD("vfs.zfs.deadman_synctime_ms", &zfs_deadman_synctime_ms);
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, deadman_synctime_ms, CTLFLAG_RDTUN,
+    &zfs_deadman_synctime_ms, 0,
+    "Stalled ZFS I/O expiration time in milliseconds");
 
 /*
- * Expiration time in units of zfs_txg_synctime_ms. This value has two
- * meanings. First it is used to determine when the spa_deadman logic
- * should fire. By default the spa_deadman will fire if spa_sync has
- * not completed in 1000 * zfs_txg_synctime_ms (i.e. 1000 seconds).
- * Secondly, the value determines if an I/O is considered "hung".
- * Any I/O that has not completed in zfs_deadman_synctime is considered
- * "hung" resulting in a system panic.
- * 1000 zfs_txg_synctime_ms (i.e. 1000 seconds).
+ * Check time in milliseconds. This defines the frequency at which we check
+ * for hung I/O.
  */
-uint64_t zfs_deadman_synctime = 1000ULL;
-TUNABLE_QUAD("vfs.zfs.deadman_synctime", &zfs_deadman_synctime);
-SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, deadman_synctime, CTLFLAG_RDTUN,
-    &zfs_deadman_synctime, 0,
-    "Stalled ZFS I/O expiration time in units of vfs.zfs.txg.synctime_ms");
+uint64_t zfs_deadman_checktime_ms = 5000ULL;
+TUNABLE_QUAD("vfs.zfs.deadman_checktime_ms", &zfs_deadman_checktime_ms);
+SYSCTL_UQUAD(_vfs_zfs, OID_AUTO, deadman_checktime_ms, CTLFLAG_RDTUN,
+    &zfs_deadman_checktime_ms, 0,
+    "Period of checks for stalled ZFS I/O in milliseconds");
 
 /*
  * Default value of -1 for zfs_deadman_enabled is resolved in
@@ -282,6 +292,20 @@ TUNABLE_INT("vfs.zfs.deadman_enabled", &zfs_deadman_enabled);
 SYSCTL_INT(_vfs_zfs, OID_AUTO, deadman_enabled, CTLFLAG_RDTUN,
     &zfs_deadman_enabled, 0, "Kernel panic on stalled ZFS I/O");
 
+/*
+ * The worst case is single-sector max-parity RAID-Z blocks, in which
+ * case the space requirement is exactly (VDEV_RAIDZ_MAXPARITY + 1)
+ * times the size; so just assume that.  Add to this the fact that
+ * we can have up to 3 DVAs per bp, and one more factor of 2 because
+ * the block may be dittoed with up to 3 DVAs by ddt_sync().  All together,
+ * the worst case is:
+ *     (VDEV_RAIDZ_MAXPARITY + 1) * SPA_DVAS_PER_BP * 2 == 24
+ */
+int spa_asize_inflation = 24;
+TUNABLE_INT("vfs.zfs.spa_asize_inflation", &spa_asize_inflation);
+SYSCTL_INT(_vfs_zfs, OID_AUTO, spa_asize_inflation, CTLFLAG_RWTUN,
+    &spa_asize_inflation, 0, "Worst case inflation factor for single sector writes");
+
 #ifndef illumos
 #ifdef _KERNEL
 static void
@@ -476,6 +500,18 @@ spa_deadman(void *arg)
 {
 	spa_t *spa = arg;
 
+	/*
+	 * Disable the deadman timer if the pool is suspended.
+	 */
+	if (spa_suspended(spa)) {
+#ifdef illumos
+		VERIFY(cyclic_reprogram(spa->spa_deadman_cycid, CY_INFINITY));
+#else
+		/* Nothing.  just don't schedule any future callouts. */
+#endif
+		return;
+	}
+
 	zfs_dbgmsg("slow spa_sync: started %llu seconds ago, calls %llu",
 	    (gethrtime() - spa->spa_sync_starttime) / NANOSEC,
 	    ++spa->spa_deadman_calls);
@@ -534,17 +570,16 @@ spa_add(const char *name, nvlist_t *config, const char *altroot)
 	hdlr.cyh_level = CY_LOW_LEVEL;
 #endif
 
-	spa->spa_deadman_synctime = MSEC2NSEC(zfs_deadman_synctime *
-	    zfs_txg_synctime_ms);
+	spa->spa_deadman_synctime = MSEC2NSEC(zfs_deadman_synctime_ms);
 
 #ifdef illumos
 	/*
 	 * This determines how often we need to check for hung I/Os after
 	 * the cyclic has already fired. Since checking for hung I/Os is
 	 * an expensive operation we don't want to check too frequently.
-	 * Instead wait for 5 synctimes before checking again.
+	 * Instead wait for 5 seconds before checking again.
 	 */
-	when.cyt_interval = MSEC2NSEC(5 * zfs_txg_synctime_ms);
+	when.cyt_interval = MSEC2NSEC(zfs_deadman_checktime_ms);
 	when.cyt_when = CY_INFINITY;
 	mutex_enter(&cpu_lock);
 	spa->spa_deadman_cycid = cyclic_add(&hdlr, &when);
@@ -1048,7 +1083,7 @@ spa_vdev_config_exit(spa_t *spa, vdev_t *vd, uint64_t txg, int error, char *tag)
 		txg_wait_synced(spa->spa_dsl_pool, txg);
 
 	if (vd != NULL) {
-		ASSERT(!vd->vdev_detached || vd->vdev_dtl_smo.smo_object == 0);
+		ASSERT(!vd->vdev_detached || vd->vdev_dtl_sm == NULL);
 		spa_config_enter(spa, SCL_ALL, spa, RW_WRITER);
 		vdev_free(vd);
 		spa_config_exit(spa, SCL_ALL, spa);
@@ -1534,14 +1569,7 @@ spa_freeze_txg(spa_t *spa)
 uint64_t
 spa_get_asize(spa_t *spa, uint64_t lsize)
 {
-	/*
-	 * The worst case is single-sector max-parity RAID-Z blocks, in which
-	 * case the space requirement is exactly (VDEV_RAIDZ_MAXPARITY + 1)
-	 * times the size; so just assume that.  Add to this the fact that
-	 * we can have up to 3 DVAs per bp, and one more factor of 2 because
-	 * the block may be dittoed with up to 3 DVAs by ddt_sync().
-	 */
-	return (lsize * (VDEV_RAIDZ_MAXPARITY + 1) * SPA_DVAS_PER_BP * 2);
+	return (lsize * spa_asize_inflation);
 }
 
 uint64_t
@@ -1737,8 +1765,9 @@ spa_init(int mode)
 #endif /* illumos */
 	refcount_sysinit();
 	unique_init();
-	space_map_init();
+	range_tree_init();
 	zio_init();
+	lz4_init();
 	dmu_init();
 	zil_init();
 	vdev_cache_stat_init();
@@ -1764,8 +1793,9 @@ spa_fini(void)
 	vdev_cache_stat_fini();
 	zil_fini();
 	dmu_fini();
+	lz4_fini();
 	zio_fini();
-	space_map_fini();
+	range_tree_fini();
 	unique_fini();
 	refcount_fini();
 
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 13130892f6e..4732ec946ea 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
@@ -23,360 +23,79 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
 #include <sys/spa.h>
 #include <sys/dmu.h>
+#include <sys/dmu_tx.h>
+#include <sys/dnode.h>
+#include <sys/dsl_pool.h>
 #include <sys/zio.h>
 #include <sys/space_map.h>
-
-SYSCTL_DECL(_vfs_zfs);
-static int space_map_last_hope;
-TUNABLE_INT("vfs.zfs.space_map_last_hope", &space_map_last_hope);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, space_map_last_hope, CTLFLAG_RDTUN,
-    &space_map_last_hope, 0,
-    "If kernel panic in space_map code on pool import, import the pool in readonly mode and backup all your data before trying this option.");
-
-static kmem_cache_t *space_seg_cache;
-
-void
-space_map_init(void)
-{
-	ASSERT(space_seg_cache == NULL);
-	space_seg_cache = kmem_cache_create("space_seg_cache",
-	    sizeof (space_seg_t), 0, NULL, NULL, NULL, NULL, NULL, 0);
-}
-
-void
-space_map_fini(void)
-{
-	kmem_cache_destroy(space_seg_cache);
-	space_seg_cache = NULL;
-}
+#include <sys/refcount.h>
+#include <sys/zfeature.h>
 
 /*
- * Space map routines.
- * NOTE: caller is responsible for all locking.
+ * 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.
  */
-static int
-space_map_seg_compare(const void *x1, const void *x2)
-{
-	const space_seg_t *s1 = x1;
-	const space_seg_t *s2 = x2;
-
-	if (s1->ss_start < s2->ss_start) {
-		if (s1->ss_end > s2->ss_start)
-			return (0);
-		return (-1);
-	}
-	if (s1->ss_start > s2->ss_start) {
-		if (s1->ss_start < s2->ss_end)
-			return (0);
-		return (1);
-	}
-	return (0);
-}
-
-void
-space_map_create(space_map_t *sm, uint64_t start, uint64_t size, uint8_t shift,
-	kmutex_t *lp)
-{
-	bzero(sm, sizeof (*sm));
-
-	cv_init(&sm->sm_load_cv, NULL, CV_DEFAULT, NULL);
-
-	avl_create(&sm->sm_root, space_map_seg_compare,
-	    sizeof (space_seg_t), offsetof(struct space_seg, ss_node));
-
-	sm->sm_start = start;
-	sm->sm_size = size;
-	sm->sm_shift = shift;
-	sm->sm_lock = lp;
-}
-
-void
-space_map_destroy(space_map_t *sm)
-{
-	ASSERT(!sm->sm_loaded && !sm->sm_loading);
-	VERIFY0(sm->sm_space);
-	avl_destroy(&sm->sm_root);
-	cv_destroy(&sm->sm_load_cv);
-}
-
-void
-space_map_add(space_map_t *sm, uint64_t start, uint64_t size)
-{
-	avl_index_t where;
-	space_seg_t *ss_before, *ss_after, *ss;
-	uint64_t end = start + size;
-	int merge_before, merge_after;
-
-	ASSERT(MUTEX_HELD(sm->sm_lock));
-	VERIFY(!sm->sm_condensing);
-	VERIFY(size != 0);
-	VERIFY3U(start, >=, sm->sm_start);
-	VERIFY3U(end, <=, sm->sm_start + sm->sm_size);
-	VERIFY(sm->sm_space + size <= sm->sm_size);
-	VERIFY(P2PHASE(start, 1ULL << sm->sm_shift) == 0);
-	VERIFY(P2PHASE(size, 1ULL << sm->sm_shift) == 0);
-again:
-	ss = space_map_find(sm, start, size, &where);
-	if (ss != NULL) {
-		zfs_panic_recover("zfs: allocating allocated segment"
-		    "(offset=%llu size=%llu)\n",
-		    (longlong_t)start, (longlong_t)size);
-		return;
-	}
-	if (ss != NULL && space_map_last_hope) {
-		uint64_t sstart, ssize;
-
-		if (ss->ss_start > start)
-			sstart = ss->ss_start;
-		else
-			sstart = start;
-		if (ss->ss_end > end)
-			ssize = end - sstart;
-		else
-			ssize = ss->ss_end - sstart;
-		ZFS_LOG(0,
-		    "Removing colliding space_map range (start=%ju end=%ju). Good luck!",
-		    (uintmax_t)sstart, (uintmax_t)(sstart + ssize));
-		space_map_remove(sm, sstart, ssize);
-		goto again;
-	}
-
-	/* Make sure we don't overlap with either of our neighbors */
-	VERIFY(ss == NULL);
-
-	ss_before = avl_nearest(&sm->sm_root, where, AVL_BEFORE);
-	ss_after = avl_nearest(&sm->sm_root, where, AVL_AFTER);
-
-	merge_before = (ss_before != NULL && ss_before->ss_end == start);
-	merge_after = (ss_after != NULL && ss_after->ss_start == end);
-
-	if (merge_before && merge_after) {
-		avl_remove(&sm->sm_root, ss_before);
-		if (sm->sm_pp_root) {
-			avl_remove(sm->sm_pp_root, ss_before);
-			avl_remove(sm->sm_pp_root, ss_after);
-		}
-		ss_after->ss_start = ss_before->ss_start;
-		kmem_cache_free(space_seg_cache, ss_before);
-		ss = ss_after;
-	} else if (merge_before) {
-		ss_before->ss_end = end;
-		if (sm->sm_pp_root)
-			avl_remove(sm->sm_pp_root, ss_before);
-		ss = ss_before;
-	} else if (merge_after) {
-		ss_after->ss_start = start;
-		if (sm->sm_pp_root)
-			avl_remove(sm->sm_pp_root, ss_after);
-		ss = ss_after;
-	} else {
-		ss = kmem_cache_alloc(space_seg_cache, KM_SLEEP);
-		ss->ss_start = start;
-		ss->ss_end = end;
-		avl_insert(&sm->sm_root, ss, where);
-	}
-
-	if (sm->sm_pp_root)
-		avl_add(sm->sm_pp_root, ss);
-
-	sm->sm_space += size;
-}
-
-void
-space_map_remove(space_map_t *sm, uint64_t start, uint64_t size)
-{
-#ifdef illumos
-	avl_index_t where;
-#endif
-	space_seg_t *ss, *newseg;
-	uint64_t end = start + size;
-	int left_over, right_over;
-
-	VERIFY(!sm->sm_condensing);
-#ifdef illumos
-	ss = space_map_find(sm, start, size, &where);
-#else
-	ss = space_map_find(sm, start, size, NULL);
-#endif
-
-	/* Make sure we completely overlap with someone */
-	if (ss == NULL) {
-		zfs_panic_recover("zfs: freeing free segment "
-		    "(offset=%llu size=%llu)",
-		    (longlong_t)start, (longlong_t)size);
-		return;
-	}
-	VERIFY3U(ss->ss_start, <=, start);
-	VERIFY3U(ss->ss_end, >=, end);
-	VERIFY(sm->sm_space - size < sm->sm_size);
-
-	left_over = (ss->ss_start != start);
-	right_over = (ss->ss_end != end);
-
-	if (sm->sm_pp_root)
-		avl_remove(sm->sm_pp_root, ss);
-
-	if (left_over && right_over) {
-		newseg = kmem_cache_alloc(space_seg_cache, KM_SLEEP);
-		newseg->ss_start = end;
-		newseg->ss_end = ss->ss_end;
-		ss->ss_end = start;
-		avl_insert_here(&sm->sm_root, newseg, ss, AVL_AFTER);
-		if (sm->sm_pp_root)
-			avl_add(sm->sm_pp_root, newseg);
-	} else if (left_over) {
-		ss->ss_end = start;
-	} else if (right_over) {
-		ss->ss_start = end;
-	} else {
-		avl_remove(&sm->sm_root, ss);
-		kmem_cache_free(space_seg_cache, ss);
-		ss = NULL;
-	}
-
-	if (sm->sm_pp_root && ss != NULL)
-		avl_add(sm->sm_pp_root, ss);
-
-	sm->sm_space -= size;
-}
-
-space_seg_t *
-space_map_find(space_map_t *sm, uint64_t start, uint64_t size,
-    avl_index_t *wherep)
-{
-	space_seg_t ssearch, *ss;
-
-	ASSERT(MUTEX_HELD(sm->sm_lock));
-	VERIFY(size != 0);
-	VERIFY(P2PHASE(start, 1ULL << sm->sm_shift) == 0);
-	VERIFY(P2PHASE(size, 1ULL << sm->sm_shift) == 0);
-
-	ssearch.ss_start = start;
-	ssearch.ss_end = start + size;
-	ss = avl_find(&sm->sm_root, &ssearch, wherep);
-
-	if (ss != NULL && ss->ss_start <= start && ss->ss_end >= start + size)
-		return (ss);
-	return (NULL);
-}
-
-boolean_t
-space_map_contains(space_map_t *sm, uint64_t start, uint64_t size)
-{
-	avl_index_t where;
-
-	return (space_map_find(sm, start, size, &where) != 0);
-}
-
-void
-space_map_swap(space_map_t **msrc, space_map_t **mdst)
-{
-	space_map_t *sm;
-
-	ASSERT(MUTEX_HELD((*msrc)->sm_lock));
-	ASSERT0((*mdst)->sm_space);
-	ASSERT0(avl_numnodes(&(*mdst)->sm_root));
-
-	sm = *msrc;
-	*msrc = *mdst;
-	*mdst = sm;
-}
-
-void
-space_map_vacate(space_map_t *sm, space_map_func_t *func, space_map_t *mdest)
-{
-	space_seg_t *ss;
-	void *cookie = NULL;
-
-	ASSERT(MUTEX_HELD(sm->sm_lock));
-
-	while ((ss = avl_destroy_nodes(&sm->sm_root, &cookie)) != NULL) {
-		if (func != NULL)
-			func(mdest, ss->ss_start, ss->ss_end - ss->ss_start);
-		kmem_cache_free(space_seg_cache, ss);
-	}
-	sm->sm_space = 0;
-}
-
-void
-space_map_walk(space_map_t *sm, space_map_func_t *func, space_map_t *mdest)
-{
-	space_seg_t *ss;
-
-	ASSERT(MUTEX_HELD(sm->sm_lock));
-
-	for (ss = avl_first(&sm->sm_root); ss; ss = AVL_NEXT(&sm->sm_root, ss))
-		func(mdest, ss->ss_start, ss->ss_end - ss->ss_start);
-}
-
-/*
- * Wait for any in-progress space_map_load() to complete.
- */
-void
-space_map_load_wait(space_map_t *sm)
-{
-	ASSERT(MUTEX_HELD(sm->sm_lock));
-
-	while (sm->sm_loading) {
-		ASSERT(!sm->sm_loaded);
-		cv_wait(&sm->sm_load_cv, sm->sm_lock);
-	}
-}
+int space_map_max_blksz = (1 << 12);
 
 /*
+ * Load the space map disk into the specified range tree. Segments of maptype
+ * are added to the range tree, other segment types are removed.
+ *
  * Note: space_map_load() will drop sm_lock across dmu_read() calls.
  * The caller must be OK with this.
  */
 int
-space_map_load(space_map_t *sm, space_map_ops_t *ops, uint8_t maptype,
-	space_map_obj_t *smo, objset_t *os)
+space_map_load(space_map_t *sm, range_tree_t *rt, maptype_t maptype)
 {
 	uint64_t *entry, *entry_map, *entry_map_end;
 	uint64_t bufsize, size, offset, end, space;
-	uint64_t mapstart = sm->sm_start;
 	int error = 0;
 
 	ASSERT(MUTEX_HELD(sm->sm_lock));
-	ASSERT(!sm->sm_loaded);
-	ASSERT(!sm->sm_loading);
 
-	sm->sm_loading = B_TRUE;
-	end = smo->smo_objsize;
-	space = smo->smo_alloc;
+	end = space_map_length(sm);
+	space = space_map_allocated(sm);
 
-	ASSERT(sm->sm_ops == NULL);
-	VERIFY0(sm->sm_space);
+	VERIFY0(range_tree_space(rt));
 
 	if (maptype == SM_FREE) {
-		space_map_add(sm, sm->sm_start, sm->sm_size);
+		range_tree_add(rt, sm->sm_start, sm->sm_size);
 		space = sm->sm_size - space;
 	}
 
-	bufsize = 1ULL << SPACE_MAP_BLOCKSHIFT;
+	bufsize = MAX(sm->sm_blksz, SPA_MINBLOCKSIZE);
 	entry_map = zio_buf_alloc(bufsize);
 
 	mutex_exit(sm->sm_lock);
-	if (end > bufsize)
-		dmu_prefetch(os, smo->smo_object, bufsize, end - bufsize);
+	if (end > bufsize) {
+		dmu_prefetch(sm->sm_os, space_map_object(sm), bufsize,
+		    end - bufsize);
+	}
 	mutex_enter(sm->sm_lock);
 
 	for (offset = 0; offset < end; offset += bufsize) {
 		size = MIN(end - offset, bufsize);
 		VERIFY(P2PHASE(size, sizeof (uint64_t)) == 0);
 		VERIFY(size != 0);
+		ASSERT3U(sm->sm_blksz, !=, 0);
 
 		dprintf("object=%llu  offset=%llx  size=%llx\n",
-		    smo->smo_object, offset, size);
+		    space_map_object(sm), offset, size);
 
 		mutex_exit(sm->sm_lock);
-		error = dmu_read(os, smo->smo_object, offset, size, entry_map,
-		    DMU_READ_PREFETCH);
+		error = dmu_read(sm->sm_os, space_map_object(sm), offset, size,
+		    entry_map, DMU_READ_PREFETCH);
 		mutex_enter(sm->sm_lock);
 		if (error != 0)
 			break;
@@ -384,115 +103,236 @@ space_map_load(space_map_t *sm, space_map_ops_t *ops, uint8_t maptype,
 		entry_map_end = entry_map + (size / sizeof (uint64_t));
 		for (entry = entry_map; entry < entry_map_end; entry++) {
 			uint64_t e = *entry;
+			uint64_t offset, size;
 
 			if (SM_DEBUG_DECODE(e))		/* Skip debug entries */
 				continue;
 
-			(SM_TYPE_DECODE(e) == maptype ?
-			    space_map_add : space_map_remove)(sm,
-			    (SM_OFFSET_DECODE(e) << sm->sm_shift) + mapstart,
-			    SM_RUN_DECODE(e) << sm->sm_shift);
+			offset = (SM_OFFSET_DECODE(e) << sm->sm_shift) +
+			    sm->sm_start;
+			size = SM_RUN_DECODE(e) << sm->sm_shift;
+
+			VERIFY0(P2PHASE(offset, 1ULL << sm->sm_shift));
+			VERIFY0(P2PHASE(size, 1ULL << sm->sm_shift));
+			VERIFY3U(offset, >=, sm->sm_start);
+			VERIFY3U(offset + size, <=, sm->sm_start + sm->sm_size);
+			if (SM_TYPE_DECODE(e) == maptype) {
+				VERIFY3U(range_tree_space(rt) + size, <=,
+				    sm->sm_size);
+				range_tree_add(rt, offset, size);
+			} else {
+				range_tree_remove(rt, offset, size);
+			}
 		}
 	}
 
-	if (error == 0) {
-		VERIFY3U(sm->sm_space, ==, space);
-
-		sm->sm_loaded = B_TRUE;
-		sm->sm_ops = ops;
-		if (ops != NULL)
-			ops->smop_load(sm);
-	} else {
-		space_map_vacate(sm, NULL, NULL);
-	}
+	if (error == 0)
+		VERIFY3U(range_tree_space(rt), ==, space);
+	else
+		range_tree_vacate(rt, NULL, NULL);
 
 	zio_buf_free(entry_map, bufsize);
-
-	sm->sm_loading = B_FALSE;
-
-	cv_broadcast(&sm->sm_load_cv);
-
 	return (error);
 }
 
 void
-space_map_unload(space_map_t *sm)
+space_map_histogram_clear(space_map_t *sm)
 {
-	ASSERT(MUTEX_HELD(sm->sm_lock));
+	if (sm->sm_dbuf->db_size != sizeof (space_map_phys_t))
+		return;
 
-	if (sm->sm_loaded && sm->sm_ops != NULL)
-		sm->sm_ops->smop_unload(sm);
-
-	sm->sm_loaded = B_FALSE;
-	sm->sm_ops = NULL;
-
-	space_map_vacate(sm, NULL, NULL);
+	bzero(sm->sm_phys->smp_histogram, sizeof (sm->sm_phys->smp_histogram));
 }
 
-uint64_t
-space_map_maxsize(space_map_t *sm)
+boolean_t
+space_map_histogram_verify(space_map_t *sm, range_tree_t *rt)
 {
-	ASSERT(sm->sm_ops != NULL);
-	return (sm->sm_ops->smop_max(sm));
-}
-
-uint64_t
-space_map_alloc(space_map_t *sm, uint64_t size)
-{
-	uint64_t start;
-
-	start = sm->sm_ops->smop_alloc(sm, size);
-	if (start != -1ULL)
-		space_map_remove(sm, start, size);
-	return (start);
+	/*
+	 * Verify that the in-core range tree does not have any
+	 * ranges smaller than our sm_shift size.
+	 */
+	for (int i = 0; i < sm->sm_shift; i++) {
+		if (rt->rt_histogram[i] != 0)
+			return (B_FALSE);
+	}
+	return (B_TRUE);
 }
 
 void
-space_map_claim(space_map_t *sm, uint64_t start, uint64_t size)
+space_map_histogram_add(space_map_t *sm, range_tree_t *rt, dmu_tx_t *tx)
 {
-	sm->sm_ops->smop_claim(sm, start, size);
-	space_map_remove(sm, start, size);
+	int idx = 0;
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+	ASSERT(dmu_tx_is_syncing(tx));
+	VERIFY3U(space_map_object(sm), !=, 0);
+
+	if (sm->sm_dbuf->db_size != sizeof (space_map_phys_t))
+		return;
+
+	dmu_buf_will_dirty(sm->sm_dbuf, tx);
+
+	ASSERT(space_map_histogram_verify(sm, rt));
+
+	/*
+	 * Transfer the content of the range tree histogram to the space
+	 * map histogram. The space map histogram contains 32 buckets ranging
+	 * between 2^sm_shift to 2^(32+sm_shift-1). The range tree,
+	 * however, can represent ranges from 2^0 to 2^63. Since the space
+	 * map only cares about allocatable blocks (minimum of sm_shift) we
+	 * can safely ignore all ranges in the range tree smaller than sm_shift.
+	 */
+	for (int i = sm->sm_shift; i < RANGE_TREE_HISTOGRAM_SIZE; i++) {
+
+		/*
+		 * Since the largest histogram bucket in the space map is
+		 * 2^(32+sm_shift-1), we need to normalize the values in
+		 * the range tree for any bucket larger than that size. For
+		 * example given an sm_shift of 9, ranges larger than 2^40
+		 * would get normalized as if they were 1TB ranges. Assume
+		 * the range tree had a count of 5 in the 2^44 (16TB) bucket,
+		 * the calculation below would normalize this to 5 * 2^4 (16).
+		 */
+		ASSERT3U(i, >=, idx + sm->sm_shift);
+		sm->sm_phys->smp_histogram[idx] +=
+		    rt->rt_histogram[i] << (i - idx - sm->sm_shift);
+
+		/*
+		 * Increment the space map's index as long as we haven't
+		 * reached the maximum bucket size. Accumulate all ranges
+		 * larger than the max bucket size into the last bucket.
+		 */
+		if (idx < SPACE_MAP_HISTOGRAM_SIZE(sm) - 1) {
+			ASSERT3U(idx + sm->sm_shift, ==, i);
+			idx++;
+			ASSERT3U(idx, <, SPACE_MAP_HISTOGRAM_SIZE(sm));
+		}
+	}
+}
+
+uint64_t
+space_map_entries(space_map_t *sm, range_tree_t *rt)
+{
+	avl_tree_t *t = &rt->rt_root;
+	range_seg_t *rs;
+	uint64_t size, entries;
+
+	/*
+	 * All space_maps always have a debug entry so account for it here.
+	 */
+	entries = 1;
+
+	/*
+	 * Traverse the range tree and calculate the number of space map
+	 * entries that would be required to write out the range tree.
+	 */
+	for (rs = avl_first(t); rs != NULL; rs = AVL_NEXT(t, rs)) {
+		size = (rs->rs_end - rs->rs_start) >> sm->sm_shift;
+		entries += howmany(size, SM_RUN_MAX);
+	}
+	return (entries);
 }
 
 void
-space_map_free(space_map_t *sm, uint64_t start, uint64_t size)
+space_map_set_blocksize(space_map_t *sm, uint64_t size, dmu_tx_t *tx)
 {
-	space_map_add(sm, start, size);
-	sm->sm_ops->smop_free(sm, start, size);
+	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 << highbit(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_sync() will drop sm_lock across dmu_write() calls.
+ * Note: space_map_write() will drop sm_lock across dmu_write() calls.
  */
 void
-space_map_sync(space_map_t *sm, uint8_t maptype,
-	space_map_obj_t *smo, objset_t *os, dmu_tx_t *tx)
+space_map_write(space_map_t *sm, range_tree_t *rt, maptype_t maptype,
+    dmu_tx_t *tx)
 {
+	objset_t *os = sm->sm_os;
 	spa_t *spa = dmu_objset_spa(os);
-	avl_tree_t *t = &sm->sm_root;
-	space_seg_t *ss;
-	uint64_t bufsize, start, size, run_len, total, sm_space, nodes;
+	avl_tree_t *t = &rt->rt_root;
+	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;
 
-	ASSERT(MUTEX_HELD(sm->sm_lock));
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+	ASSERT(dsl_pool_sync_context(dmu_objset_pool(os)));
+	VERIFY3U(space_map_object(sm), !=, 0);
+	dmu_buf_will_dirty(sm->sm_dbuf, tx);
 
-	if (sm->sm_space == 0)
+	/*
+	 * This field is no longer necessary since the in-core space map
+	 * now contains the object number but is maintained for backwards
+	 * compatibility.
+	 */
+	sm->sm_phys->smp_object = sm->sm_object;
+
+	if (range_tree_space(rt) == 0) {
+		VERIFY3U(sm->sm_object, ==, sm->sm_phys->smp_object);
 		return;
-
-	dprintf("object %4llu, txg %llu, pass %d, %c, count %lu, space %llx\n",
-	    smo->smo_object, dmu_tx_get_txg(tx), spa_sync_pass(spa),
-	    maptype == SM_ALLOC ? 'A' : 'F', avl_numnodes(&sm->sm_root),
-	    sm->sm_space);
+	}
 
 	if (maptype == SM_ALLOC)
-		smo->smo_alloc += sm->sm_space;
+		sm->sm_phys->smp_alloc += range_tree_space(rt);
 	else
-		smo->smo_alloc -= sm->sm_space;
+		sm->sm_phys->smp_alloc -= range_tree_space(rt);
 
-	bufsize = (8 + avl_numnodes(&sm->sm_root)) * sizeof (uint64_t);
-	bufsize = MIN(bufsize, 1ULL << SPACE_MAP_BLOCKSHIFT);
-	entry_map = zio_buf_alloc(bufsize);
-	entry_map_end = entry_map + (bufsize / sizeof (uint64_t));
+	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;
 
 	*entry++ = SM_DEBUG_ENCODE(1) |
@@ -501,24 +341,28 @@ space_map_sync(space_map_t *sm, uint8_t maptype,
 	    SM_DEBUG_TXG_ENCODE(dmu_tx_get_txg(tx));
 
 	total = 0;
-	nodes = avl_numnodes(&sm->sm_root);
-	sm_space = sm->sm_space;
-	for (ss = avl_first(t); ss != NULL; ss = AVL_NEXT(t, ss)) {
-		size = ss->ss_end - ss->ss_start;
-		start = (ss->ss_start - sm->sm_start) >> sm->sm_shift;
+	nodes = avl_numnodes(&rt->rt_root);
+	rt_space = range_tree_space(rt);
+	for (rs = avl_first(t); rs != NULL; rs = AVL_NEXT(t, rs)) {
+		uint64_t start;
 
-		total += size;
-		size >>= sm->sm_shift;
+		size = (rs->rs_end - rs->rs_start) >> sm->sm_shift;
+		start = (rs->rs_start - sm->sm_start) >> sm->sm_shift;
+
+		total += size << sm->sm_shift;
+
+		while (size != 0) {
+			uint64_t run_len;
 
-		while (size) {
 			run_len = MIN(size, SM_RUN_MAX);
 
 			if (entry == entry_map_end) {
-				mutex_exit(sm->sm_lock);
-				dmu_write(os, smo->smo_object, smo->smo_objsize,
-				    bufsize, entry_map, tx);
-				mutex_enter(sm->sm_lock);
-				smo->smo_objsize += bufsize;
+				mutex_exit(rt->rt_lock);
+				dmu_write(os, space_map_object(sm),
+				    sm->sm_phys->smp_objsize, sm->sm_blksz,
+				    entry_map, tx);
+				mutex_enter(rt->rt_lock);
+				sm->sm_phys->smp_objsize += sm->sm_blksz;
 				entry = entry_map;
 			}
 
@@ -528,162 +372,236 @@ space_map_sync(space_map_t *sm, uint8_t maptype,
 
 			start += run_len;
 			size -= run_len;
+			actual_entries++;
 		}
 	}
 
 	if (entry != entry_map) {
 		size = (entry - entry_map) * sizeof (uint64_t);
-		mutex_exit(sm->sm_lock);
-		dmu_write(os, smo->smo_object, smo->smo_objsize,
+		mutex_exit(rt->rt_lock);
+		dmu_write(os, space_map_object(sm), sm->sm_phys->smp_objsize,
 		    size, entry_map, tx);
-		mutex_enter(sm->sm_lock);
-		smo->smo_objsize += size;
+		mutex_enter(rt->rt_lock);
+		sm->sm_phys->smp_objsize += size;
 	}
+	ASSERT3U(expected_entries, ==, actual_entries);
 
 	/*
 	 * Ensure that the space_map's accounting wasn't changed
 	 * while we were in the middle of writing it out.
 	 */
-	VERIFY3U(nodes, ==, avl_numnodes(&sm->sm_root));
-	VERIFY3U(sm->sm_space, ==, sm_space);
-	VERIFY3U(sm->sm_space, ==, total);
+	VERIFY3U(nodes, ==, avl_numnodes(&rt->rt_root));
+	VERIFY3U(range_tree_space(rt), ==, rt_space);
+	VERIFY3U(range_tree_space(rt), ==, total);
 
-	zio_buf_free(entry_map, bufsize);
+	zio_buf_free(entry_map, sm->sm_blksz);
 }
 
-void
-space_map_truncate(space_map_obj_t *smo, objset_t *os, dmu_tx_t *tx)
-{
-	VERIFY(dmu_free_range(os, smo->smo_object, 0, -1ULL, tx) == 0);
-
-	smo->smo_objsize = 0;
-	smo->smo_alloc = 0;
-}
-
-/*
- * Space map reference trees.
- *
- * A space map is a collection of integers.  Every integer is either
- * in the map, or it's not.  A space map reference tree generalizes
- * the idea: it allows its members to have arbitrary reference counts,
- * as opposed to the implicit reference count of 0 or 1 in a space map.
- * This representation comes in handy when computing the union or
- * intersection of multiple space maps.  For example, the union of
- * N space maps is the subset of the reference tree with refcnt >= 1.
- * The intersection of N space maps is the subset with refcnt >= N.
- *
- * [It's very much like a Fourier transform.  Unions and intersections
- * are hard to perform in the 'space map domain', so we convert the maps
- * into the 'reference count domain', where it's trivial, then invert.]
- *
- * vdev_dtl_reassess() uses computations of this form to determine
- * DTL_MISSING and DTL_OUTAGE for interior vdevs -- e.g. a RAID-Z vdev
- * has an outage wherever refcnt >= vdev_nparity + 1, and a mirror vdev
- * has an outage wherever refcnt >= vdev_children.
- */
 static int
-space_map_ref_compare(const void *x1, const void *x2)
+space_map_open_impl(space_map_t *sm)
 {
-	const space_ref_t *sr1 = x1;
-	const space_ref_t *sr2 = x2;
+	int error;
+	u_longlong_t blocks;
 
-	if (sr1->sr_offset < sr2->sr_offset)
-		return (-1);
-	if (sr1->sr_offset > sr2->sr_offset)
-		return (1);
+	error = dmu_bonus_hold(sm->sm_os, sm->sm_object, sm, &sm->sm_dbuf);
+	if (error)
+		return (error);
 
-	if (sr1 < sr2)
-		return (-1);
-	if (sr1 > sr2)
-		return (1);
+	dmu_object_size_from_db(sm->sm_dbuf, &sm->sm_blksz, &blocks);
+	sm->sm_phys = sm->sm_dbuf->db_data;
+	return (0);
+}
+
+int
+space_map_open(space_map_t **smp, objset_t *os, uint64_t object,
+    uint64_t start, uint64_t size, uint8_t shift, kmutex_t *lp)
+{
+	space_map_t *sm;
+	int error;
+
+	ASSERT(*smp == NULL);
+	ASSERT(os != NULL);
+	ASSERT(object != 0);
+
+	sm = kmem_zalloc(sizeof (space_map_t), KM_SLEEP);
+
+	sm->sm_start = start;
+	sm->sm_size = size;
+	sm->sm_shift = shift;
+	sm->sm_lock = lp;
+	sm->sm_os = os;
+	sm->sm_object = object;
+
+	error = space_map_open_impl(sm);
+	if (error != 0) {
+		space_map_close(sm);
+		return (error);
+	}
+
+	*smp = sm;
 
 	return (0);
 }
 
 void
-space_map_ref_create(avl_tree_t *t)
+space_map_close(space_map_t *sm)
 {
-	avl_create(t, space_map_ref_compare,
-	    sizeof (space_ref_t), offsetof(space_ref_t, sr_node));
-}
+	if (sm == NULL)
+		return;
 
-void
-space_map_ref_destroy(avl_tree_t *t)
-{
-	space_ref_t *sr;
-	void *cookie = NULL;
+	if (sm->sm_dbuf != NULL)
+		dmu_buf_rele(sm->sm_dbuf, sm);
+	sm->sm_dbuf = NULL;
+	sm->sm_phys = NULL;
 
-	while ((sr = avl_destroy_nodes(t, &cookie)) != NULL)
-		kmem_free(sr, sizeof (*sr));
-
-	avl_destroy(t);
+	kmem_free(sm, sizeof (*sm));
 }
 
 static void
-space_map_ref_add_node(avl_tree_t *t, uint64_t offset, int64_t refcnt)
+space_map_reallocate(space_map_t *sm, dmu_tx_t *tx)
 {
-	space_ref_t *sr;
+	ASSERT(dmu_tx_is_syncing(tx));
 
-	sr = kmem_alloc(sizeof (*sr), KM_SLEEP);
-	sr->sr_offset = offset;
-	sr->sr_refcnt = refcnt;
+	space_map_free(sm, tx);
+	dmu_buf_rele(sm->sm_dbuf, sm);
 
-	avl_add(t, sr);
+	sm->sm_object = space_map_alloc(sm->sm_os, tx);
+	VERIFY0(space_map_open_impl(sm));
 }
 
 void
-space_map_ref_add_seg(avl_tree_t *t, uint64_t start, uint64_t end,
-	int64_t refcnt)
+space_map_truncate(space_map_t *sm, dmu_tx_t *tx)
 {
-	space_map_ref_add_node(t, start, refcnt);
-	space_map_ref_add_node(t, end, -refcnt);
+	objset_t *os = sm->sm_os;
+	spa_t *spa = dmu_objset_spa(os);
+	zfeature_info_t *space_map_histogram =
+	    &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM];
+	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, space_map_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) {
+		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);
+	}
+
+	dmu_buf_will_dirty(sm->sm_dbuf, tx);
+	sm->sm_phys->smp_objsize = 0;
+	sm->sm_phys->smp_alloc = 0;
 }
 
 /*
- * Convert (or add) a space map into a reference tree.
+ * Update the in-core space_map allocation and length values.
  */
 void
-space_map_ref_add_map(avl_tree_t *t, space_map_t *sm, int64_t refcnt)
+space_map_update(space_map_t *sm)
 {
-	space_seg_t *ss;
+	if (sm == NULL)
+		return;
 
 	ASSERT(MUTEX_HELD(sm->sm_lock));
 
-	for (ss = avl_first(&sm->sm_root); ss; ss = AVL_NEXT(&sm->sm_root, ss))
-		space_map_ref_add_seg(t, ss->ss_start, ss->ss_end, refcnt);
+	sm->sm_alloc = sm->sm_phys->smp_alloc;
+	sm->sm_length = sm->sm_phys->smp_objsize;
 }
 
-/*
- * Convert a reference tree into a space map.  The space map will contain
- * all members of the reference tree for which refcnt >= minref.
- */
-void
-space_map_ref_generate_map(avl_tree_t *t, space_map_t *sm, int64_t minref)
+uint64_t
+space_map_alloc(objset_t *os, dmu_tx_t *tx)
 {
-	uint64_t start = -1ULL;
-	int64_t refcnt = 0;
-	space_ref_t *sr;
+	spa_t *spa = dmu_objset_spa(os);
+	zfeature_info_t *space_map_histogram =
+	    &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM];
+	uint64_t object;
+	int bonuslen;
 
-	ASSERT(MUTEX_HELD(sm->sm_lock));
+	if (spa_feature_is_enabled(spa, space_map_histogram)) {
+		spa_feature_incr(spa, space_map_histogram, tx);
+		bonuslen = sizeof (space_map_phys_t);
+		ASSERT3U(bonuslen, <=, dmu_bonus_max());
+	} else {
+		bonuslen = SPACE_MAP_SIZE_V0;
+	}
 
-	space_map_vacate(sm, NULL, NULL);
+	object = dmu_object_alloc(os,
+	    DMU_OT_SPACE_MAP, SPACE_MAP_INITIAL_BLOCKSIZE,
+	    DMU_OT_SPACE_MAP_HEADER, bonuslen, tx);
 
-	for (sr = avl_first(t); sr != NULL; sr = AVL_NEXT(t, sr)) {
-		refcnt += sr->sr_refcnt;
-		if (refcnt >= minref) {
-			if (start == -1ULL) {
-				start = sr->sr_offset;
-			}
-		} else {
-			if (start != -1ULL) {
-				uint64_t end = sr->sr_offset;
-				ASSERT(start <= end);
-				if (end > start)
-					space_map_add(sm, start, end - start);
-				start = -1ULL;
-			}
+	return (object);
+}
+
+void
+space_map_free(space_map_t *sm, dmu_tx_t *tx)
+{
+	spa_t *spa;
+	zfeature_info_t *space_map_histogram =
+	    &spa_feature_table[SPA_FEATURE_SPACEMAP_HISTOGRAM];
+
+	if (sm == NULL)
+		return;
+
+	spa = dmu_objset_spa(sm->sm_os);
+	if (spa_feature_is_enabled(spa, space_map_histogram)) {
+		dmu_object_info_t doi;
+
+		dmu_object_info_from_db(sm->sm_dbuf, &doi);
+		if (doi.doi_bonus_size != SPACE_MAP_SIZE_V0) {
+			VERIFY(spa_feature_is_active(spa, space_map_histogram));
+			spa_feature_decr(spa, space_map_histogram, tx);
 		}
 	}
-	ASSERT(refcnt == 0);
-	ASSERT(start == -1ULL);
+
+	VERIFY3U(dmu_object_free(sm->sm_os, space_map_object(sm), tx), ==, 0);
+	sm->sm_object = 0;
+}
+
+uint64_t
+space_map_object(space_map_t *sm)
+{
+	return (sm != NULL ? sm->sm_object : 0);
+}
+
+/*
+ * Returns the already synced, on-disk allocated space.
+ */
+uint64_t
+space_map_allocated(space_map_t *sm)
+{
+	return (sm != NULL ? sm->sm_alloc : 0);
+}
+
+/*
+ * Returns the already synced, on-disk length;
+ */
+uint64_t
+space_map_length(space_map_t *sm)
+{
+	return (sm != NULL ? sm->sm_length : 0);
+}
+
+/*
+ * Returns the allocated space that is currently syncing.
+ */
+int64_t
+space_map_alloc_delta(space_map_t *sm)
+{
+	if (sm == NULL)
+		return (0);
+	ASSERT(sm->sm_dbuf != NULL);
+	return (sm->sm_phys->smp_alloc - space_map_allocated(sm));
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_reftree.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_reftree.c
new file mode 100644
index 00000000000..a508092c530
--- /dev/null
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_reftree.c
@@ -0,0 +1,159 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ */
+
+#include <sys/zfs_context.h>
+#include <sys/range_tree.h>
+#include <sys/space_reftree.h>
+
+/*
+ * Space reference trees.
+ *
+ * A range tree is a collection of integers.  Every integer is either
+ * in the tree, or it's not.  A space reference tree generalizes
+ * the idea: it allows its members to have arbitrary reference counts,
+ * as opposed to the implicit reference count of 0 or 1 in a range tree.
+ * This representation comes in handy when computing the union or
+ * intersection of multiple space maps.  For example, the union of
+ * N range trees is the subset of the reference tree with refcnt >= 1.
+ * The intersection of N range trees is the subset with refcnt >= N.
+ *
+ * [It's very much like a Fourier transform.  Unions and intersections
+ * are hard to perform in the 'range tree domain', so we convert the trees
+ * into the 'reference count domain', where it's trivial, then invert.]
+ *
+ * vdev_dtl_reassess() uses computations of this form to determine
+ * DTL_MISSING and DTL_OUTAGE for interior vdevs -- e.g. a RAID-Z vdev
+ * has an outage wherever refcnt >= vdev_nparity + 1, and a mirror vdev
+ * has an outage wherever refcnt >= vdev_children.
+ */
+static int
+space_reftree_compare(const void *x1, const void *x2)
+{
+	const space_ref_t *sr1 = x1;
+	const space_ref_t *sr2 = x2;
+
+	if (sr1->sr_offset < sr2->sr_offset)
+		return (-1);
+	if (sr1->sr_offset > sr2->sr_offset)
+		return (1);
+
+	if (sr1 < sr2)
+		return (-1);
+	if (sr1 > sr2)
+		return (1);
+
+	return (0);
+}
+
+void
+space_reftree_create(avl_tree_t *t)
+{
+	avl_create(t, space_reftree_compare,
+	    sizeof (space_ref_t), offsetof(space_ref_t, sr_node));
+}
+
+void
+space_reftree_destroy(avl_tree_t *t)
+{
+	space_ref_t *sr;
+	void *cookie = NULL;
+
+	while ((sr = avl_destroy_nodes(t, &cookie)) != NULL)
+		kmem_free(sr, sizeof (*sr));
+
+	avl_destroy(t);
+}
+
+static void
+space_reftree_add_node(avl_tree_t *t, uint64_t offset, int64_t refcnt)
+{
+	space_ref_t *sr;
+
+	sr = kmem_alloc(sizeof (*sr), KM_SLEEP);
+	sr->sr_offset = offset;
+	sr->sr_refcnt = refcnt;
+
+	avl_add(t, sr);
+}
+
+void
+space_reftree_add_seg(avl_tree_t *t, uint64_t start, uint64_t end,
+	int64_t refcnt)
+{
+	space_reftree_add_node(t, start, refcnt);
+	space_reftree_add_node(t, end, -refcnt);
+}
+
+/*
+ * Convert (or add) a range tree into a reference tree.
+ */
+void
+space_reftree_add_map(avl_tree_t *t, range_tree_t *rt, int64_t refcnt)
+{
+	range_seg_t *rs;
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+
+	for (rs = avl_first(&rt->rt_root); rs; rs = AVL_NEXT(&rt->rt_root, rs))
+		space_reftree_add_seg(t, rs->rs_start, rs->rs_end, refcnt);
+}
+
+/*
+ * Convert a reference tree into a range tree.  The range tree will contain
+ * all members of the reference tree for which refcnt >= minref.
+ */
+void
+space_reftree_generate_map(avl_tree_t *t, range_tree_t *rt, int64_t minref)
+{
+	uint64_t start = -1ULL;
+	int64_t refcnt = 0;
+	space_ref_t *sr;
+
+	ASSERT(MUTEX_HELD(rt->rt_lock));
+
+	range_tree_vacate(rt, NULL, NULL);
+
+	for (sr = avl_first(t); sr != NULL; sr = AVL_NEXT(t, sr)) {
+		refcnt += sr->sr_refcnt;
+		if (refcnt >= minref) {
+			if (start == -1ULL) {
+				start = sr->sr_offset;
+			}
+		} else {
+			if (start != -1ULL) {
+				uint64_t end = sr->sr_offset;
+				ASSERT(start <= end);
+				if (end > start)
+					range_tree_add(rt, start, end - start);
+				start = -1ULL;
+			}
+		}
+	}
+	ASSERT(refcnt == 0);
+	ASSERT(start == -1ULL);
+}
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 dcf86ea69cf..bc622845d48 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
@@ -104,12 +104,13 @@ int arc_referenced(arc_buf_t *buf);
 #endif
 
 int arc_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
-    arc_done_func_t *done, void *priv, int priority, int flags,
+    arc_done_func_t *done, void *priv, zio_priority_t priority, int flags,
     uint32_t *arc_flags, const zbookmark_t *zb);
 zio_t *arc_write(zio_t *pio, spa_t *spa, uint64_t txg,
     blkptr_t *bp, arc_buf_t *buf, boolean_t l2arc, boolean_t l2arc_compress,
-    const zio_prop_t *zp, arc_done_func_t *ready, arc_done_func_t *done,
-    void *priv, int priority, int zio_flags, const zbookmark_t *zb);
+    const zio_prop_t *zp, arc_done_func_t *ready, arc_done_func_t *physdone,
+    arc_done_func_t *done, void *priv, zio_priority_t priority,
+    int zio_flags, const zbookmark_t *zb);
 void arc_freed(spa_t *spa, const blkptr_t *bp);
 
 void arc_set_callback(arc_buf_t *buf, arc_evict_func_t *func, void *priv);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
index 3306118d203..b8f5eeb725e 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
@@ -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 (c) 2013 by Saso Kiselkov. All rights reserved.
  */
 
@@ -112,6 +112,9 @@ typedef struct dbuf_dirty_record {
 	/* pointer to parent dirty record */
 	struct dbuf_dirty_record *dr_parent;
 
+	/* How much space was changed to dsl_pool_dirty_space() for this? */
+	unsigned int dr_accounted;
+
 	union dirty_types {
 		struct dirty_indirect {
 
@@ -254,7 +257,7 @@ dmu_buf_impl_t *dbuf_hold_level(struct dnode *dn, int level, uint64_t blkid,
 int dbuf_hold_impl(struct dnode *dn, uint8_t level, uint64_t blkid, int create,
     void *tag, dmu_buf_impl_t **dbp);
 
-void dbuf_prefetch(struct dnode *dn, uint64_t blkid);
+void dbuf_prefetch(struct dnode *dn, uint64_t blkid, zio_priority_t prio);
 
 void dbuf_add_ref(dmu_buf_impl_t *db, void *tag);
 uint64_t dbuf_refcount(dmu_buf_impl_t *db);
@@ -326,7 +329,8 @@ boolean_t dbuf_is_metadata(dmu_buf_impl_t *db);
 	((_db)->db_objset->os_secondary_cache == ZFS_CACHE_METADATA)))
 
 #define	DBUF_IS_L2COMPRESSIBLE(_db)					\
-	((_db)->db_objset->os_compress != ZIO_COMPRESS_OFF)
+	((_db)->db_objset->os_compress != ZIO_COMPRESS_OFF ||		\
+	(dbuf_is_metadata(_db) && zfs_mdcomp_disable == B_FALSE))
 
 #ifdef ZFS_DEBUG
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
index d2b44cdab93..a10faa3cacd 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
@@ -24,6 +24,7 @@
  * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012, Joyent, Inc. All rights reserved.
+ * Copyright 2013 DEY Storage Systems, Inc.
  */
 
 /* Portions Copyright 2010 Robert Milkowski */
@@ -220,6 +221,7 @@ typedef enum dmu_object_type {
 typedef enum txg_how {
 	TXG_WAIT = 1,
 	TXG_NOWAIT,
+	TXG_WAITED,
 } txg_how_t;
 
 void byteswap_uint64_array(void *buf, size_t size);
@@ -604,8 +606,15 @@ int dmu_write_uio(objset_t *os, uint64_t object, struct uio *uio, uint64_t size,
     dmu_tx_t *tx);
 int dmu_write_uio_dbuf(dmu_buf_t *zdb, struct uio *uio, uint64_t size,
     dmu_tx_t *tx);
+#ifdef _KERNEL
+#ifdef sun
 int dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset,
     uint64_t size, struct page *pp, dmu_tx_t *tx);
+#else
+int dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset,
+    uint64_t size, struct vm_page **ppa, dmu_tx_t *tx);
+#endif
+#endif
 struct arc_buf *dmu_request_arcbuf(dmu_buf_t *handle, int size);
 void dmu_return_arcbuf(struct arc_buf *buf);
 void dmu_assign_arcbuf(dmu_buf_t *handle, uint64_t offset, struct arc_buf *buf,
@@ -806,6 +815,8 @@ int dmu_diff(const char *tosnap_name, const char *fromsnap_name,
 #define	ZFS_CRC64_POLY	0xC96C5795D7870F42ULL	/* ECMA-182, reflected form */
 extern uint64_t zfs_crc64_table[256];
 
+extern int zfs_mdcomp_disable;
+
 #ifdef	__cplusplus
 }
 #endif
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
index f1f5ac2028c..df8f03103e3 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
@@ -130,7 +130,7 @@ struct objset {
 	((os)->os_secondary_cache == ZFS_CACHE_ALL ||		\
 	(os)->os_secondary_cache == ZFS_CACHE_METADATA)
 
-#define	DMU_OS_IS_L2COMPRESSIBLE(os)	((os)->os_compress != ZIO_COMPRESS_OFF)
+#define	DMU_OS_IS_L2COMPRESSIBLE(os)	(zfs_mdcomp_disable == B_FALSE)
 
 /* called from zpl */
 int dmu_objset_hold(const char *name, void *tag, objset_t **osp);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
index 1f16e3c92b2..fa99f98f3e0 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #ifndef	_SYS_DMU_TX_H
@@ -59,8 +59,22 @@ struct dmu_tx {
 	txg_handle_t tx_txgh;
 	void *tx_tempreserve_cookie;
 	struct dmu_tx_hold *tx_needassign_txh;
-	list_t tx_callbacks; /* list of dmu_tx_callback_t on this dmu_tx */
-	uint8_t tx_anyobj;
+
+	/* list of dmu_tx_callback_t on this dmu_tx */
+	list_t tx_callbacks;
+
+	/* placeholder for syncing context, doesn't need specific holds */
+	boolean_t tx_anyobj;
+
+	/* has this transaction already been delayed? */
+	boolean_t tx_waited;
+
+	/* time this transaction was created */
+	hrtime_t tx_start;
+
+	/* need to wait for sufficient dirty space */
+	boolean_t tx_wait_dirty;
+
 	int tx_err;
 #ifdef ZFS_DEBUG
 	uint64_t tx_space_towrite;
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
index 641bcfcdd30..87e2ce8315f 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
@@ -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.
  */
 
 #ifndef	_SYS_DSL_DIR_H
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
index d3b411ba578..ea180c9a5b8 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
@@ -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.
  */
 
 #ifndef	_SYS_DSL_POOL_H
@@ -49,6 +49,13 @@ struct dsl_pool;
 struct dmu_tx;
 struct dsl_scan;
 
+extern uint64_t zfs_dirty_data_max;
+extern uint64_t zfs_dirty_data_max_max;
+extern uint64_t zfs_dirty_data_sync;
+extern int zfs_dirty_data_max_percent;
+extern int zfs_delay_min_dirty_percent;
+extern uint64_t zfs_delay_scale;
+
 /* These macros are for indexing into the zfs_all_blkstats_t. */
 #define	DMU_OT_DEFERRED	DMU_OT_NONE
 #define	DMU_OT_OTHER	DMU_OT_NUMTYPES /* place holder for DMU_OT() types */
@@ -83,9 +90,6 @@ typedef struct dsl_pool {
 
 	/* No lock needed - sync context only */
 	blkptr_t dp_meta_rootbp;
-	hrtime_t dp_read_overhead;
-	uint64_t dp_throughput; /* bytes per millisec */
-	uint64_t dp_write_limit;
 	uint64_t dp_tmp_userrefs_obj;
 	bpobj_t dp_free_bpobj;
 	uint64_t dp_bptree_obj;
@@ -95,12 +99,19 @@ typedef struct dsl_pool {
 
 	/* Uses dp_lock */
 	kmutex_t dp_lock;
-	uint64_t dp_space_towrite[TXG_SIZE];
-	uint64_t dp_tempreserved[TXG_SIZE];
+	kcondvar_t dp_spaceavail_cv;
+	uint64_t dp_dirty_pertxg[TXG_SIZE];
+	uint64_t dp_dirty_total;
 	uint64_t dp_mos_used_delta;
 	uint64_t dp_mos_compressed_delta;
 	uint64_t dp_mos_uncompressed_delta;
 
+	/*
+	 * Time of most recently scheduled (furthest in the future)
+	 * wakeup for delayed transactions.
+	 */
+	hrtime_t dp_last_wakeup;
+
 	/* Has its own locking */
 	tx_state_t dp_tx;
 	txg_list_t dp_dirty_datasets;
@@ -129,10 +140,8 @@ void dsl_pool_sync_done(dsl_pool_t *dp, uint64_t txg);
 int dsl_pool_sync_context(dsl_pool_t *dp);
 uint64_t dsl_pool_adjustedsize(dsl_pool_t *dp, boolean_t netfree);
 uint64_t dsl_pool_adjustedfree(dsl_pool_t *dp, boolean_t netfree);
-int dsl_pool_tempreserve_space(dsl_pool_t *dp, uint64_t space, dmu_tx_t *tx);
-void dsl_pool_tempreserve_clear(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx);
-void dsl_pool_memory_pressure(dsl_pool_t *dp);
-void dsl_pool_willuse_space(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx);
+void dsl_pool_dirty_space(dsl_pool_t *dp, int64_t space, dmu_tx_t *tx);
+void dsl_pool_undirty_space(dsl_pool_t *dp, int64_t space, uint64_t txg);
 void dsl_free(dsl_pool_t *dp, uint64_t txg, const blkptr_t *bpp);
 void dsl_free_sync(zio_t *pio, dsl_pool_t *dp, uint64_t txg,
     const blkptr_t *bpp);
@@ -144,6 +153,7 @@ void dsl_pool_mos_diduse_space(dsl_pool_t *dp,
 void dsl_pool_config_enter(dsl_pool_t *dp, void *tag);
 void dsl_pool_config_exit(dsl_pool_t *dp, void *tag);
 boolean_t dsl_pool_config_held(dsl_pool_t *dp);
+boolean_t dsl_pool_need_dirty_delay(dsl_pool_t *dp);
 
 taskq_t *dsl_pool_vnrele_taskq(dsl_pool_t *dp);
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
index 1a4fe7607b3..fda9fffc70d 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
@@ -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.
  */
 
 #ifndef _SYS_METASLAB_H
@@ -36,14 +36,25 @@
 extern "C" {
 #endif
 
-extern space_map_ops_t *zfs_metaslab_ops;
+typedef struct metaslab_ops {
+	uint64_t (*msop_alloc)(metaslab_t *msp, uint64_t size);
+	boolean_t (*msop_fragmented)(metaslab_t *msp);
+} metaslab_ops_t;
 
-extern metaslab_t *metaslab_init(metaslab_group_t *mg, space_map_obj_t *smo,
-    uint64_t start, uint64_t size, uint64_t txg);
-extern void metaslab_fini(metaslab_t *msp);
-extern void metaslab_sync(metaslab_t *msp, uint64_t txg);
-extern void metaslab_sync_done(metaslab_t *msp, uint64_t txg);
-extern void metaslab_sync_reassess(metaslab_group_t *mg);
+extern metaslab_ops_t *zfs_metaslab_ops;
+
+metaslab_t *metaslab_init(metaslab_group_t *mg, uint64_t id,
+    uint64_t object, uint64_t txg);
+void metaslab_fini(metaslab_t *msp);
+
+void metaslab_load_wait(metaslab_t *msp);
+int metaslab_load(metaslab_t *msp);
+void metaslab_unload(metaslab_t *msp);
+
+void metaslab_sync(metaslab_t *msp, uint64_t txg);
+void metaslab_sync_done(metaslab_t *msp, uint64_t txg);
+void metaslab_sync_reassess(metaslab_group_t *mg);
+uint64_t metaslab_block_maxsize(metaslab_t *msp);
 
 #define	METASLAB_HINTBP_FAVOR	0x0
 #define	METASLAB_HINTBP_AVOID	0x1
@@ -51,32 +62,29 @@ extern void metaslab_sync_reassess(metaslab_group_t *mg);
 #define	METASLAB_GANG_CHILD	0x4
 #define	METASLAB_GANG_AVOID	0x8
 
-extern int metaslab_alloc(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
+int metaslab_alloc(spa_t *spa, metaslab_class_t *mc, uint64_t psize,
     blkptr_t *bp, int ncopies, uint64_t txg, blkptr_t *hintbp, int flags);
-extern void metaslab_free(spa_t *spa, const blkptr_t *bp, uint64_t txg,
-    boolean_t now);
-extern int metaslab_claim(spa_t *spa, const blkptr_t *bp, uint64_t txg);
-extern void metaslab_check_free(spa_t *spa, const blkptr_t *bp);
+void metaslab_free(spa_t *spa, const blkptr_t *bp, uint64_t txg, boolean_t now);
+int metaslab_claim(spa_t *spa, const blkptr_t *bp, uint64_t txg);
+void metaslab_check_free(spa_t *spa, const blkptr_t *bp);
 
-extern metaslab_class_t *metaslab_class_create(spa_t *spa,
-    space_map_ops_t *ops);
-extern void metaslab_class_destroy(metaslab_class_t *mc);
-extern int metaslab_class_validate(metaslab_class_t *mc);
+metaslab_class_t *metaslab_class_create(spa_t *spa, metaslab_ops_t *ops);
+void metaslab_class_destroy(metaslab_class_t *mc);
+int metaslab_class_validate(metaslab_class_t *mc);
 
-extern void metaslab_class_space_update(metaslab_class_t *mc,
+void metaslab_class_space_update(metaslab_class_t *mc,
     int64_t alloc_delta, int64_t defer_delta,
     int64_t space_delta, int64_t dspace_delta);
-extern uint64_t metaslab_class_get_alloc(metaslab_class_t *mc);
-extern uint64_t metaslab_class_get_space(metaslab_class_t *mc);
-extern uint64_t metaslab_class_get_dspace(metaslab_class_t *mc);
-extern uint64_t metaslab_class_get_deferred(metaslab_class_t *mc);
-extern uint64_t metaslab_class_get_minblocksize(metaslab_class_t *mc);
+uint64_t metaslab_class_get_alloc(metaslab_class_t *mc);
+uint64_t metaslab_class_get_space(metaslab_class_t *mc);
+uint64_t metaslab_class_get_dspace(metaslab_class_t *mc);
+uint64_t metaslab_class_get_deferred(metaslab_class_t *mc);
+uint64_t metaslab_class_get_minblocksize(metaslab_class_t *mc);
 
-extern metaslab_group_t *metaslab_group_create(metaslab_class_t *mc,
-    vdev_t *vd);
-extern void metaslab_group_destroy(metaslab_group_t *mg);
-extern void metaslab_group_activate(metaslab_group_t *mg);
-extern void metaslab_group_passivate(metaslab_group_t *mg);
+metaslab_group_t *metaslab_group_create(metaslab_class_t *mc, vdev_t *vd);
+void metaslab_group_destroy(metaslab_group_t *mg);
+void metaslab_group_activate(metaslab_group_t *mg);
+void metaslab_group_passivate(metaslab_group_t *mg);
 
 #ifdef	__cplusplus
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
index e9fa73ebaae..b63578ecc8c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h
@@ -24,7 +24,7 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_METASLAB_IMPL_H
@@ -32,6 +32,7 @@
 
 #include <sys/metaslab.h>
 #include <sys/space_map.h>
+#include <sys/range_tree.h>
 #include <sys/vdev.h>
 #include <sys/txg.h>
 #include <sys/avl.h>
@@ -43,8 +44,9 @@ extern "C" {
 struct metaslab_class {
 	spa_t			*mc_spa;
 	metaslab_group_t	*mc_rotor;
-	space_map_ops_t		*mc_ops;
+	metaslab_ops_t		*mc_ops;
 	uint64_t		mc_aliquot;
+	uint64_t		mc_alloc_groups; /* # of allocatable groups */
 	uint64_t		mc_alloc;	/* total allocated space */
 	uint64_t		mc_deferred;	/* total deferred frees */
 	uint64_t		mc_space;	/* total space (alloc + free) */
@@ -56,51 +58,109 @@ struct metaslab_group {
 	kmutex_t		mg_lock;
 	avl_tree_t		mg_metaslab_tree;
 	uint64_t		mg_aliquot;
-	uint64_t		mg_bonus_area;
 	uint64_t		mg_alloc_failures;
+	boolean_t		mg_allocatable;		/* can we allocate? */
+	uint64_t		mg_free_capacity;	/* percentage free */
 	int64_t			mg_bias;
 	int64_t			mg_activation_count;
 	metaslab_class_t	*mg_class;
 	vdev_t			*mg_vd;
+	taskq_t			*mg_taskq;
 	metaslab_group_t	*mg_prev;
 	metaslab_group_t	*mg_next;
 };
 
 /*
- * Each metaslab maintains an in-core free map (ms_map) that contains the
- * current list of free segments. As blocks are allocated, the allocated
- * segment is removed from the ms_map and added to a per txg allocation map.
- * As blocks are freed, they are added to the per txg free map. These per
- * txg maps allow us to process all allocations and frees in syncing context
- * where it is safe to update the on-disk space maps.
+ * This value defines the number of elements in the ms_lbas array. The value
+ * of 64 was chosen as it covers to cover all power of 2 buckets up to
+ * UINT64_MAX. This is the equivalent of highbit(UINT64_MAX).
+ */
+#define	MAX_LBAS	64
+
+/*
+ * Each metaslab maintains a set of in-core trees to track metaslab operations.
+ * The in-core free tree (ms_tree) contains the current list of free segments.
+ * As blocks are allocated, the allocated segment are removed from the ms_tree
+ * and added to a per txg allocation tree (ms_alloctree). As blocks are freed,
+ * they are added to the per txg free tree (ms_freetree). These per txg
+ * trees allow us to process all allocations and frees in syncing context
+ * where it is safe to update the on-disk space maps. One additional in-core
+ * tree is maintained to track deferred frees (ms_defertree). Once a block
+ * is freed it will move from the ms_freetree to the ms_defertree. A deferred
+ * free means that a block has been freed but cannot be used by the pool
+ * until TXG_DEFER_SIZE transactions groups later. For example, a block
+ * that is freed in txg 50 will not be available for reallocation until
+ * txg 52 (50 + TXG_DEFER_SIZE).  This provides a safety net for uberblock
+ * rollback. A pool could be safely rolled back TXG_DEFERS_SIZE
+ * transactions groups and ensure that no block has been reallocated.
  *
- * Each metaslab's free space is tracked in a space map object in the MOS,
+ * The simplified transition diagram looks like this:
+ *
+ *
+ *      ALLOCATE
+ *         |
+ *         V
+ *    free segment (ms_tree) --------> ms_alloctree ----> (write to space map)
+ *         ^
+ *         |
+ *         |                           ms_freetree <--- FREE
+ *         |                                 |
+ *         |                                 |
+ *         |                                 |
+ *         +----------- ms_defertree <-------+---------> (write to space map)
+ *
+ *
+ * Each metaslab's space is tracked in a single space map in the MOS,
  * which is only updated in syncing context. Each time we sync a txg,
- * we append the allocs and frees from that txg to the space map object.
- * When the txg is done syncing, metaslab_sync_done() updates ms_smo
- * to ms_smo_syncing. Everything in ms_smo is always safe to allocate.
+ * we append the allocs and frees from that txg to the space map.
+ * The pool space is only updated once all metaslabs have finished syncing.
  *
- * To load the in-core free map we read the space map object from disk.
+ * To load the in-core free tree we read the space map from disk.
  * This object contains a series of alloc and free records that are
  * combined to make up the list of all free segments in this metaslab. These
- * segments are represented in-core by the ms_map and are stored in an
+ * segments are represented in-core by the ms_tree and are stored in an
  * AVL tree.
  *
- * As the space map objects grows (as a result of the appends) it will
- * eventually become space-inefficient. When the space map object is
- * zfs_condense_pct/100 times the size of the minimal on-disk representation,
- * we rewrite it in its minimized form.
+ * As the space map grows (as a result of the appends) it will
+ * eventually become space-inefficient. When the metaslab's in-core free tree
+ * is zfs_condense_pct/100 times the size of the minimal on-disk
+ * representation, we rewrite it in its minimized form. If a metaslab
+ * needs to condense then we must set the ms_condensing flag to ensure
+ * that allocations are not performed on the metaslab that is being written.
  */
 struct metaslab {
-	kmutex_t	ms_lock;	/* metaslab lock		*/
-	space_map_obj_t	ms_smo;		/* synced space map object	*/
-	space_map_obj_t	ms_smo_syncing;	/* syncing space map object	*/
-	space_map_t	*ms_allocmap[TXG_SIZE];	/* allocated this txg	*/
-	space_map_t	*ms_freemap[TXG_SIZE];	/* freed this txg	*/
-	space_map_t	*ms_defermap[TXG_DEFER_SIZE];	/* deferred frees */
-	space_map_t	*ms_map;	/* in-core free space map	*/
+	kmutex_t	ms_lock;
+	kcondvar_t	ms_load_cv;
+	space_map_t	*ms_sm;
+	metaslab_ops_t	*ms_ops;
+	uint64_t	ms_id;
+	uint64_t	ms_start;
+	uint64_t	ms_size;
+
+	range_tree_t	*ms_alloctree[TXG_SIZE];
+	range_tree_t	*ms_freetree[TXG_SIZE];
+	range_tree_t	*ms_defertree[TXG_DEFER_SIZE];
+	range_tree_t	*ms_tree;
+
+	boolean_t	ms_condensing;	/* condensing? */
+	boolean_t	ms_loaded;
+	boolean_t	ms_loading;
+
 	int64_t		ms_deferspace;	/* sum of ms_defermap[] space	*/
 	uint64_t	ms_weight;	/* weight vs. others in group	*/
+	uint64_t	ms_factor;
+	uint64_t	ms_access_txg;
+
+	/*
+	 * The metaslab block allocators can optionally use a size-ordered
+	 * range tree and/or an array of LBAs. Not all allocators use
+	 * this functionality. The ms_size_tree should always contain the
+	 * same number of segments as the ms_tree. The only difference
+	 * is that the ms_size_tree is ordered by segment sizes.
+	 */
+	avl_tree_t	ms_size_tree;
+	uint64_t	ms_lbas[MAX_LBAS];
+
 	metaslab_group_t *ms_group;	/* metaslab group		*/
 	avl_node_t	ms_group_node;	/* node in metaslab group tree	*/
 	txg_node_t	ms_txg_node;	/* per-txg dirty metaslab links	*/
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h
new file mode 100644
index 00000000000..a41effe4e98
--- /dev/null
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/range_tree.h
@@ -0,0 +1,96 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ */
+
+#ifndef _SYS_RANGE_TREE_H
+#define	_SYS_RANGE_TREE_H
+
+#include <sys/avl.h>
+#include <sys/dmu.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+#define	RANGE_TREE_HISTOGRAM_SIZE	64
+
+typedef struct range_tree_ops range_tree_ops_t;
+
+typedef struct range_tree {
+	avl_tree_t	rt_root;	/* offset-ordered segment AVL tree */
+	uint64_t	rt_space;	/* sum of all segments in the map */
+	range_tree_ops_t *rt_ops;
+	void		*rt_arg;
+
+	/*
+	 * The rt_histogram maintains a histogram of ranges. Each bucket,
+	 * rt_histogram[i], contains the number of ranges whose size is:
+	 * 2^i <= size of range in bytes < 2^(i+1)
+	 */
+	uint64_t	rt_histogram[RANGE_TREE_HISTOGRAM_SIZE];
+	kmutex_t	*rt_lock;	/* pointer to lock that protects map */
+} range_tree_t;
+
+typedef struct range_seg {
+	avl_node_t	rs_node;	/* AVL node */
+	avl_node_t	rs_pp_node;	/* AVL picker-private node */
+	uint64_t	rs_start;	/* starting offset of this segment */
+	uint64_t	rs_end;		/* ending offset (non-inclusive) */
+} range_seg_t;
+
+struct range_tree_ops {
+	void    (*rtop_create)(range_tree_t *rt, void *arg);
+	void    (*rtop_destroy)(range_tree_t *rt, void *arg);
+	void	(*rtop_add)(range_tree_t *rt, range_seg_t *rs, void *arg);
+	void    (*rtop_remove)(range_tree_t *rt, range_seg_t *rs, void *arg);
+	void	(*rtop_vacate)(range_tree_t *rt, void *arg);
+};
+
+typedef void range_tree_func_t(void *arg, uint64_t start, uint64_t size);
+
+void range_tree_init(void);
+void range_tree_fini(void);
+range_tree_t *range_tree_create(range_tree_ops_t *ops, void *arg, kmutex_t *lp);
+void range_tree_destroy(range_tree_t *rt);
+boolean_t range_tree_contains(range_tree_t *rt, uint64_t start, uint64_t size);
+uint64_t range_tree_space(range_tree_t *rt);
+void range_tree_verify(range_tree_t *rt, uint64_t start, uint64_t size);
+void range_tree_swap(range_tree_t **rtsrc, range_tree_t **rtdst);
+void range_tree_stat_verify(range_tree_t *rt);
+
+void range_tree_add(void *arg, uint64_t start, uint64_t size);
+void range_tree_remove(void *arg, uint64_t start, uint64_t size);
+
+void range_tree_vacate(range_tree_t *rt, range_tree_func_t *func, void *arg);
+void range_tree_walk(range_tree_t *rt, range_tree_func_t *func, void *arg);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _SYS_RANGE_TREE_H */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
index 582bd76f018..6b9af2ef4f8 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/sa_impl.h
@@ -20,7 +20,7 @@
  */
 /*
  * Copyright (c) 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.
  */
 
 #ifndef	_SYS_SA_IMPL_H
@@ -153,12 +153,13 @@ struct sa_os {
  *
  * The header has a fixed portion with a variable number
  * of "lengths" depending on the number of variable sized
- * attribues which are determined by the "layout number"
+ * attributes which are determined by the "layout number"
  */
 
 #define	SA_MAGIC	0x2F505A  /* ZFS SA */
 typedef struct sa_hdr_phys {
 	uint32_t sa_magic;
+	/* BEGIN CSTYLED */
 	/*
 	 * Encoded with hdrsize and layout number as follows:
 	 * 16      10       0
@@ -175,6 +176,7 @@ typedef struct sa_hdr_phys {
 	 *          2 ==> 16 byte header
 	 *
 	 */
+	/* END CSTYLED */
 	uint16_t sa_layout_info;
 	uint16_t sa_lengths[1];	/* optional sizes for variable length attrs */
 	/* ... Data follows the lengths.  */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
index 250421ba080..fa11ccf494c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
@@ -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 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
  */
@@ -81,16 +81,16 @@ typedef struct spa_config_dirent {
 	char		*scd_path;
 } spa_config_dirent_t;
 
-enum zio_taskq_type {
+typedef enum zio_taskq_type {
 	ZIO_TASKQ_ISSUE = 0,
 	ZIO_TASKQ_ISSUE_HIGH,
 	ZIO_TASKQ_INTERRUPT,
 	ZIO_TASKQ_INTERRUPT_HIGH,
 	ZIO_TASKQ_TYPES
-};
+} zio_taskq_type_t;
 
 /*
- * State machine for the zpool-pooname process.  The states transitions
+ * State machine for the zpool-poolname process.  The states transitions
  * are done as follows:
  *
  *	From		   To			Routine
@@ -108,6 +108,11 @@ typedef enum spa_proc_state {
 	SPA_PROC_GONE		/* spa_thread() is exiting, spa_proc = &p0 */
 } spa_proc_state_t;
 
+typedef struct spa_taskqs {
+	uint_t stqs_count;
+	taskq_t **stqs_taskq;
+} spa_taskqs_t;
+
 struct spa {
 	/*
 	 * Fields protected by spa_namespace_lock.
@@ -126,7 +131,7 @@ struct spa {
 	uint8_t		spa_sync_on;		/* sync threads are running */
 	spa_load_state_t spa_load_state;	/* current load operation */
 	uint64_t	spa_import_flags;	/* import specific flags */
-	taskq_t		*spa_zio_taskq[ZIO_TYPES][ZIO_TASKQ_TYPES];
+	spa_taskqs_t	spa_zio_taskq[ZIO_TYPES][ZIO_TASKQ_TYPES];
 	dsl_pool_t	*spa_dsl_pool;
 	boolean_t	spa_is_initializing;	/* true while opening pool */
 	metaslab_class_t *spa_normal_class;	/* normal data class */
@@ -240,9 +245,22 @@ struct spa {
 #endif
 #endif	/* illumos */
 	uint64_t	spa_deadman_calls;	/* number of deadman calls */
-	uint64_t	spa_sync_starttime;	/* starting time fo spa_sync */
+	hrtime_t	spa_sync_starttime;	/* starting time fo spa_sync */
 	uint64_t	spa_deadman_synctime;	/* deadman expiration timer */
+#ifdef illumos
+	/*
+	 * spa_iokstat_lock protects spa_iokstat and
+	 * spa_queue_stats[].
+	 */
+	kmutex_t	spa_iokstat_lock;
+	struct kstat	*spa_iokstat;		/* kstat of io to this pool */
+	struct {
+		int spa_active;
+		int spa_queued;
+	} spa_queue_stats[ZIO_PRIORITY_NUM_QUEUEABLE];
+#endif
 	hrtime_t	spa_ccw_fail_time;	/* Conf cache write fail time */
+
 	/*
 	 * spa_refcount & spa_config_lock must be the last elements
 	 * because refcount_t changes size based on compilation options.
@@ -258,6 +276,9 @@ struct spa {
 
 extern const char *spa_config_path;
 
+extern void spa_taskq_dispatch_ent(spa_t *spa, zio_type_t t, zio_taskq_type_t q,
+    task_func_t *func, void *arg, uint_t flags, taskq_ent_t *ent);
+
 #ifdef	__cplusplus
 }
 #endif
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 c0070da670b..3691803306d 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
@@ -24,66 +24,72 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_SPACE_MAP_H
 #define	_SYS_SPACE_MAP_H
 
 #include <sys/avl.h>
+#include <sys/range_tree.h>
 #include <sys/dmu.h>
 
 #ifdef	__cplusplus
 extern "C" {
 #endif
 
-typedef struct space_map_ops space_map_ops_t;
+/*
+ * The size of the space map object has increased to include a histogram.
+ * The SPACE_MAP_SIZE_V0 designates the original size and is used to
+ * maintain backward compatibility.
+ */
+#define	SPACE_MAP_SIZE_V0	(3 * sizeof (uint64_t))
+#define	SPACE_MAP_HISTOGRAM_SIZE(sm)			\
+	(sizeof ((sm)->sm_phys->smp_histogram) /	\
+	sizeof ((sm)->sm_phys->smp_histogram[0]))
 
+/*
+ * The space_map_phys is the on-disk representation of the space map.
+ * Consumers of space maps should never reference any of the members of this
+ * structure directly. These members may only be updated in syncing context.
+ *
+ * Note the smp_object is no longer used but remains in the structure
+ * for backward compatibility.
+ */
+typedef struct space_map_phys {
+	uint64_t	smp_object;	/* on-disk space map object */
+	uint64_t	smp_objsize;	/* size of the object */
+	uint64_t	smp_alloc;	/* space allocated from the map */
+	uint64_t	smp_pad[5];	/* reserved */
+
+	/*
+	 * The smp_histogram maintains a histogram of free regions. Each
+	 * bucket, smp_histogram[i], contains the number of free regions
+	 * whose size is:
+	 * 2^(i+sm_shift) <= size of free region in bytes < 2^(i+sm_shift+1)
+	 */
+	uint64_t	smp_histogram[32]; /* histogram of free space */
+} space_map_phys_t;
+
+/*
+ * The space map object defines a region of space, its size, how much is
+ * allocated, and the on-disk object that stores this information.
+ * Consumers of space maps may only access the members of this structure.
+ */
 typedef struct space_map {
-	avl_tree_t	sm_root;	/* offset-ordered segment AVL tree */
-	uint64_t	sm_space;	/* sum of all segments in the map */
 	uint64_t	sm_start;	/* start of map */
 	uint64_t	sm_size;	/* size of map */
 	uint8_t		sm_shift;	/* unit shift */
-	uint8_t		sm_loaded;	/* map loaded? */
-	uint8_t		sm_loading;	/* map loading? */
-	uint8_t		sm_condensing;	/* map condensing? */
-	kcondvar_t	sm_load_cv;	/* map load completion */
-	space_map_ops_t	*sm_ops;	/* space map block picker ops vector */
-	avl_tree_t	*sm_pp_root;	/* size-ordered, picker-private tree */
-	void		*sm_ppd;	/* picker-private data */
+	uint64_t	sm_length;	/* synced length */
+	uint64_t	sm_alloc;	/* synced space allocated */
+	objset_t	*sm_os;		/* objset for this map */
+	uint64_t	sm_object;	/* object id for this map */
+	uint32_t	sm_blksz;	/* block size for space map */
+	dmu_buf_t	*sm_dbuf;	/* space_map_phys_t dbuf */
+	space_map_phys_t *sm_phys;	/* on-disk space map */
 	kmutex_t	*sm_lock;	/* pointer to lock that protects map */
 } space_map_t;
 
-typedef struct space_seg {
-	avl_node_t	ss_node;	/* AVL node */
-	avl_node_t	ss_pp_node;	/* AVL picker-private node */
-	uint64_t	ss_start;	/* starting offset of this segment */
-	uint64_t	ss_end;		/* ending offset (non-inclusive) */
-} space_seg_t;
-
-typedef struct space_ref {
-	avl_node_t	sr_node;	/* AVL node */
-	uint64_t	sr_offset;	/* offset (start or end) */
-	int64_t		sr_refcnt;	/* associated reference count */
-} space_ref_t;
-
-typedef struct space_map_obj {
-	uint64_t	smo_object;	/* on-disk space map object */
-	uint64_t	smo_objsize;	/* size of the object */
-	uint64_t	smo_alloc;	/* space allocated from the map */
-} space_map_obj_t;
-
-struct space_map_ops {
-	void	(*smop_load)(space_map_t *sm);
-	void	(*smop_unload)(space_map_t *sm);
-	uint64_t (*smop_alloc)(space_map_t *sm, uint64_t size);
-	void	(*smop_claim)(space_map_t *sm, uint64_t start, uint64_t size);
-	void	(*smop_free)(space_map_t *sm, uint64_t start, uint64_t size);
-	uint64_t (*smop_max)(space_map_t *sm);
-	boolean_t (*smop_fragmented)(space_map_t *sm);
-};
-
 /*
  * debug entry
  *
@@ -124,61 +130,45 @@ struct space_map_ops {
 
 #define	SM_RUN_MAX			SM_RUN_DECODE(~0ULL)
 
-#define	SM_ALLOC	0x0
-#define	SM_FREE		0x1
+typedef enum {
+	SM_ALLOC,
+	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.
- * This could use a lot more research, but for now, set the freelist
- * block size to 4k (2^12).
+ * 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_BLOCKSHIFT	12
+#define	SPACE_MAP_INITIAL_BLOCKSIZE	(1ULL << 12)
 
-typedef void space_map_func_t(space_map_t *sm, uint64_t start, uint64_t size);
+int space_map_load(space_map_t *sm, range_tree_t *rt, maptype_t maptype);
 
-extern void space_map_init(void);
-extern void space_map_fini(void);
-extern void space_map_create(space_map_t *sm, uint64_t start, uint64_t size,
-    uint8_t shift, kmutex_t *lp);
-extern void space_map_destroy(space_map_t *sm);
-extern void space_map_add(space_map_t *sm, uint64_t start, uint64_t size);
-extern void space_map_remove(space_map_t *sm, uint64_t start, uint64_t size);
-extern boolean_t space_map_contains(space_map_t *sm,
-    uint64_t start, uint64_t size);
-extern space_seg_t *space_map_find(space_map_t *sm, uint64_t start,
-    uint64_t size, avl_index_t *wherep);
-extern void space_map_swap(space_map_t **msrc, space_map_t **mdest);
-extern void space_map_vacate(space_map_t *sm,
-    space_map_func_t *func, space_map_t *mdest);
-extern void space_map_walk(space_map_t *sm,
-    space_map_func_t *func, space_map_t *mdest);
+void space_map_histogram_clear(space_map_t *sm);
+void space_map_histogram_add(space_map_t *sm, range_tree_t *rt,
+    dmu_tx_t *tx);
 
-extern void space_map_load_wait(space_map_t *sm);
-extern int space_map_load(space_map_t *sm, space_map_ops_t *ops,
-    uint8_t maptype, space_map_obj_t *smo, objset_t *os);
-extern void space_map_unload(space_map_t *sm);
+void space_map_update(space_map_t *sm);
 
-extern uint64_t space_map_alloc(space_map_t *sm, uint64_t size);
-extern void space_map_claim(space_map_t *sm, uint64_t start, uint64_t size);
-extern void space_map_free(space_map_t *sm, uint64_t start, uint64_t size);
-extern uint64_t space_map_maxsize(space_map_t *sm);
+uint64_t space_map_object(space_map_t *sm);
+uint64_t space_map_allocated(space_map_t *sm);
+uint64_t space_map_length(space_map_t *sm);
 
-extern void space_map_sync(space_map_t *sm, uint8_t maptype,
-    space_map_obj_t *smo, objset_t *os, dmu_tx_t *tx);
-extern void space_map_truncate(space_map_obj_t *smo,
-    objset_t *os, dmu_tx_t *tx);
+void space_map_write(space_map_t *sm, range_tree_t *rt, maptype_t maptype,
+    dmu_tx_t *tx);
+void space_map_truncate(space_map_t *sm, dmu_tx_t *tx);
+uint64_t space_map_alloc(objset_t *os, dmu_tx_t *tx);
+void space_map_free(space_map_t *sm, dmu_tx_t *tx);
 
-extern void space_map_ref_create(avl_tree_t *t);
-extern void space_map_ref_destroy(avl_tree_t *t);
-extern void space_map_ref_add_seg(avl_tree_t *t,
-    uint64_t start, uint64_t end, int64_t refcnt);
-extern void space_map_ref_add_map(avl_tree_t *t,
-    space_map_t *sm, int64_t refcnt);
-extern void space_map_ref_generate_map(avl_tree_t *t,
-    space_map_t *sm, int64_t minref);
+int space_map_open(space_map_t **smp, objset_t *os, uint64_t object,
+    uint64_t start, uint64_t size, uint8_t shift, kmutex_t *lp);
+void space_map_close(space_map_t *sm);
+
+int64_t space_map_alloc_delta(space_map_t *sm);
 
 #ifdef	__cplusplus
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_reftree.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_reftree.h
new file mode 100644
index 00000000000..249b15be672
--- /dev/null
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_reftree.h
@@ -0,0 +1,57 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
+ *
+ * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+ * or http://www.opensolaris.org/os/licensing.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Use is subject to license terms.
+ */
+
+/*
+ * Copyright (c) 2013 by Delphix. All rights reserved.
+ */
+
+#ifndef _SYS_SPACE_REFTREE_H
+#define	_SYS_SPACE_REFTREE_H
+
+#include <sys/range_tree.h>
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+typedef struct space_ref {
+	avl_node_t	sr_node;	/* AVL node */
+	uint64_t	sr_offset;	/* range offset (start or end) */
+	int64_t		sr_refcnt;	/* associated reference count */
+} space_ref_t;
+
+void space_reftree_create(avl_tree_t *t);
+void space_reftree_destroy(avl_tree_t *t);
+void space_reftree_add_seg(avl_tree_t *t, uint64_t start, uint64_t end,
+    int64_t refcnt);
+void space_reftree_add_map(avl_tree_t *t, range_tree_t *rt, int64_t refcnt);
+void space_reftree_generate_map(avl_tree_t *t, range_tree_t *rt,
+    int64_t minref);
+
+#ifdef	__cplusplus
+}
+#endif
+
+#endif	/* _SYS_SPACE_REFTREE_H */
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
index 1529e5ac6da..e96c1fa8aac 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
@@ -23,7 +23,7 @@
  * Use is subject to license terms.
  */
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_TXG_H
@@ -76,6 +76,7 @@ extern void txg_register_callbacks(txg_handle_t *txghp, list_t *tx_callbacks);
 
 extern void txg_delay(struct dsl_pool *dp, uint64_t txg, hrtime_t delta,
     hrtime_t resolution);
+extern void txg_kick(struct dsl_pool *dp);
 
 /*
  * Wait until the given transaction group has finished syncing.
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
index 8a0977f1f4d..e583d61eac2 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
@@ -18,6 +18,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -89,11 +90,14 @@ struct tx_cpu {
 typedef struct tx_state {
 	tx_cpu_t	*tx_cpu;	/* protects access to tx_open_txg */
 	kmutex_t	tx_sync_lock;	/* protects the rest of this struct */
+
 	uint64_t	tx_open_txg;	/* currently open txg id */
 	uint64_t	tx_quiesced_txg; /* quiesced txg waiting for sync */
 	uint64_t	tx_syncing_txg;	/* currently syncing txg id */
 	uint64_t	tx_synced_txg;	/* last synced txg id */
 
+	hrtime_t	tx_open_time;	/* start time of tx_open_txg */
+
 	uint64_t	tx_sync_txg_waiting; /* txg we're waiting to sync */
 	uint64_t	tx_quiesce_txg_waiting; /* txg we're waiting to open */
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
index 74bcf5fd3e2..fb30ea93683 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
@@ -120,6 +120,9 @@ extern void vdev_queue_init(vdev_t *vd);
 extern void vdev_queue_fini(vdev_t *vd);
 extern zio_t *vdev_queue_io(zio_t *zio);
 extern void vdev_queue_io_done(zio_t *zio);
+extern int vdev_queue_length(vdev_t *vd);
+extern uint64_t vdev_queue_lastoffset(vdev_t *vd);
+extern void vdev_queue_register_lastoffset(vdev_t *vd, zio_t *zio);
 
 extern void vdev_config_dirty(vdev_t *vd);
 extern void vdev_config_clean(vdev_t *vd);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
index 99dffb5fc0c..3c68f8f54a5 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
@@ -99,13 +99,24 @@ struct vdev_cache {
 	kmutex_t	vc_lock;
 };
 
+typedef struct vdev_queue_class {
+	uint32_t	vqc_active;
+
+	/*
+	 * Sorted by offset or timestamp, depending on if the queue is
+	 * LBA-ordered vs FIFO.
+	 */
+	avl_tree_t	vqc_queued_tree;
+} vdev_queue_class_t;
+
 struct vdev_queue {
-	avl_tree_t	vq_deadline_tree;
-	avl_tree_t	vq_read_tree;
-	avl_tree_t	vq_write_tree;
-	avl_tree_t	vq_pending_tree;
-	hrtime_t	vq_io_complete_ts;
+	vdev_t		*vq_vdev;
+	vdev_queue_class_t vq_class[ZIO_PRIORITY_NUM_QUEUEABLE];
+	avl_tree_t	vq_active_tree;
+	uint64_t	vq_last_offset;
+	hrtime_t	vq_io_complete_ts; /* time last i/o completed */
 	kmutex_t	vq_lock;
+	uint64_t	vq_lastoffset;
 };
 
 /*
@@ -152,7 +163,6 @@ struct vdev {
 	vdev_t		*vdev_parent;	/* parent vdev			*/
 	vdev_t		**vdev_child;	/* array of children		*/
 	uint64_t	vdev_children;	/* number of children		*/
-	space_map_t	vdev_dtl[DTL_TYPES]; /* in-core dirty time logs	*/
 	vdev_stat_t	vdev_stat;	/* virtual device statistics	*/
 	boolean_t	vdev_expanding;	/* expand the vdev?		*/
 	boolean_t	vdev_reopening;	/* reopen in progress?		*/
@@ -173,19 +183,21 @@ struct vdev {
 	txg_node_t	vdev_txg_node;	/* per-txg dirty vdev linkage	*/
 	boolean_t	vdev_remove_wanted; /* async remove wanted?	*/
 	boolean_t	vdev_probe_wanted; /* async probe wanted?	*/
-	uint64_t	vdev_removing;	/* device is being removed?	*/
 	list_node_t	vdev_config_dirty_node; /* config dirty list	*/
 	list_node_t	vdev_state_dirty_node; /* state dirty list	*/
 	uint64_t	vdev_deflate_ratio; /* deflation ratio (x512)	*/
 	uint64_t	vdev_islog;	/* is an intent log device	*/
-	uint64_t	vdev_ishole;	/* is a hole in the namespace 	*/
+	uint64_t	vdev_removing;	/* device is being removed?	*/
+	boolean_t	vdev_ishole;	/* is a hole in the namespace 	*/
 
 	/*
 	 * Leaf vdev state.
 	 */
-	uint64_t	vdev_psize;	/* physical device capacity	*/
-	space_map_obj_t	vdev_dtl_smo;	/* dirty time log space map obj	*/
+	range_tree_t	*vdev_dtl[DTL_TYPES]; /* dirty time logs	*/
+	space_map_t	*vdev_dtl_sm;	/* dirty time log space map	*/
 	txg_node_t	vdev_dtl_node;	/* per-txg dirty DTL linkage	*/
+	uint64_t	vdev_dtl_object; /* DTL object			*/
+	uint64_t	vdev_psize;	/* physical device capacity	*/
 	uint64_t	vdev_wholedisk;	/* true if this is a whole disk */
 	uint64_t	vdev_offline;	/* persistent offline state	*/
 	uint64_t	vdev_faulted;	/* persistent faulted state	*/
@@ -199,25 +211,27 @@ struct vdev {
 	char		*vdev_fru;	/* physical FRU location	*/
 	uint64_t	vdev_not_present; /* not present during import	*/
 	uint64_t	vdev_unspare;	/* unspare when resilvering done */
-	hrtime_t	vdev_last_try;	/* last reopen time		*/
 	boolean_t	vdev_nowritecache; /* true if flushwritecache failed */
 	boolean_t	vdev_notrim;	/* true if trim failed */
 	boolean_t	vdev_checkremove; /* temporary online test	*/
 	boolean_t	vdev_forcefault; /* force online fault		*/
 	boolean_t	vdev_splitting;	/* split or repair in progress  */
 	boolean_t	vdev_delayed_close; /* delayed device close?	*/
-	uint8_t		vdev_tmpoffline; /* device taken offline temporarily? */
-	uint8_t		vdev_detached;	/* device detached?		*/
-	uint8_t		vdev_cant_read;	/* vdev is failing all reads	*/
-	uint8_t		vdev_cant_write; /* vdev is failing all writes	*/
-	uint64_t	vdev_isspare;	/* was a hot spare		*/
-	uint64_t	vdev_isl2cache;	/* was a l2cache device		*/
+	boolean_t	vdev_tmpoffline; /* device taken offline temporarily? */
+	boolean_t	vdev_detached;	/* device detached?		*/
+	boolean_t	vdev_cant_read;	/* vdev is failing all reads	*/
+	boolean_t	vdev_cant_write; /* vdev is failing all writes	*/
+	boolean_t	vdev_isspare;	/* was a hot spare		*/
+	boolean_t	vdev_isl2cache;	/* was a l2cache device		*/
 	vdev_queue_t	vdev_queue;	/* I/O deadline schedule queue	*/
 	vdev_cache_t	vdev_cache;	/* physical block cache		*/
 	spa_aux_vdev_t	*vdev_aux;	/* for l2cache vdevs		*/
 	zio_t		*vdev_probe_zio; /* root of current probe	*/
 	vdev_aux_t	vdev_label_aux;	/* on-disk aux state		*/
-	struct trim_map	*vdev_trimmap;
+	struct trim_map	*vdev_trimmap;	/* map on outstanding trims	*/ 
+	uint16_t	vdev_rotation_rate; /* rotational rate of the media */
+#define	VDEV_RATE_UNKNOWN	0
+#define	VDEV_RATE_NON_ROTATING	1
 
 	/*
 	 * For DTrace to work in userland (libzpool) context, these fields must
@@ -313,9 +327,11 @@ extern void vdev_remove_parent(vdev_t *cvd);
 extern void vdev_load_log_state(vdev_t *nvd, vdev_t *ovd);
 extern boolean_t vdev_log_state_valid(vdev_t *vd);
 extern void vdev_load(vdev_t *vd);
+extern int vdev_dtl_load(vdev_t *vd);
 extern void vdev_sync(vdev_t *vd, uint64_t txg);
 extern void vdev_sync_done(vdev_t *vd, uint64_t txg);
 extern void vdev_dirty(vdev_t *vd, int flags, void *arg, uint64_t txg);
+extern void vdev_dirty_leaves(vdev_t *vd, int flags, uint64_t txg);
 
 /*
  * Available vdev types.
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h
index 1a081e422d4..9df7e4973de 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfeature.h
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_ZFEATURE_H
@@ -47,6 +47,7 @@ extern void spa_feature_incr(struct spa *, zfeature_info_t *, struct dmu_tx *);
 extern void spa_feature_decr(struct spa *, zfeature_info_t *, struct dmu_tx *);
 extern boolean_t spa_feature_is_enabled(struct spa *, zfeature_info_t *);
 extern boolean_t spa_feature_is_active(struct spa *, zfeature_info_t *);
+extern int spa_feature_get_refcount(struct spa *, zfeature_info_t *);
 
 #ifdef	__cplusplus
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
index b76349bec8e..51020404271 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
@@ -24,7 +24,7 @@
  */
 /*
  * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #ifndef _SYS_ZFS_CONTEXT_H
@@ -94,10 +94,11 @@ extern "C" {
 #include <sys/sunddi.h>
 #ifdef illumos
 #include <sys/cyclic.h>
+#include <sys/callo.h>
 #else	/* FreeBSD */
 #include <sys/callout.h>
 #endif
-
+#include <sys/disp.h>
 #include <machine/stdarg.h>
 
 #include <vm/vm.h>
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
index b001e111078..41960b51e8b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
@@ -21,9 +21,10 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  * Copyright (c) 2013 by Saso Kiselkov. All rights reserved.
- * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  */
 
 #ifndef _ZIO_H
@@ -128,20 +129,16 @@ enum zio_compress {
 #define	ZIO_FAILURE_MODE_CONTINUE	1
 #define	ZIO_FAILURE_MODE_PANIC		2
 
-#define	ZIO_PRIORITY_NOW		(zio_priority_table[0])
-#define	ZIO_PRIORITY_SYNC_READ		(zio_priority_table[1])
-#define	ZIO_PRIORITY_SYNC_WRITE		(zio_priority_table[2])
-#define	ZIO_PRIORITY_LOG_WRITE		(zio_priority_table[3])
-#define	ZIO_PRIORITY_CACHE_FILL		(zio_priority_table[4])
-#define	ZIO_PRIORITY_AGG		(zio_priority_table[5])
-#define	ZIO_PRIORITY_FREE		(zio_priority_table[6])
-#define	ZIO_PRIORITY_ASYNC_WRITE	(zio_priority_table[7])
-#define	ZIO_PRIORITY_ASYNC_READ		(zio_priority_table[8])
-#define	ZIO_PRIORITY_RESILVER		(zio_priority_table[9])
-#define	ZIO_PRIORITY_SCRUB		(zio_priority_table[10])
-#define	ZIO_PRIORITY_DDT_PREFETCH	(zio_priority_table[11])
-#define	ZIO_PRIORITY_TRIM		(zio_priority_table[12])
-#define	ZIO_PRIORITY_TABLE_SIZE		13
+typedef enum zio_priority {
+	ZIO_PRIORITY_SYNC_READ,
+	ZIO_PRIORITY_SYNC_WRITE,	/* ZIL */
+	ZIO_PRIORITY_ASYNC_READ,	/* prefetch */
+	ZIO_PRIORITY_ASYNC_WRITE,	/* spa_sync() */
+	ZIO_PRIORITY_SCRUB,		/* asynchronous scrub/resilver reads */
+	ZIO_PRIORITY_NUM_QUEUEABLE,
+
+	ZIO_PRIORITY_NOW		/* non-queued i/os (e.g. free) */
+} zio_priority_t;
 
 #define	ZIO_PIPELINE_CONTINUE		0x100
 #define	ZIO_PIPELINE_STOP		0x101
@@ -197,6 +194,7 @@ enum zio_flag {
 	ZIO_FLAG_GODFATHER	= 1 << 24,
 	ZIO_FLAG_NOPWRITE	= 1 << 25,
 	ZIO_FLAG_REEXECUTED	= 1 << 26,
+	ZIO_FLAG_DELEGATED	= 1 << 27,
 };
 
 #define	ZIO_FLAG_MUSTSUCCEED		0
@@ -237,8 +235,7 @@ enum zio_wait_type {
 
 typedef void zio_done_func_t(zio_t *zio);
 
-extern uint8_t zio_priority_table[ZIO_PRIORITY_TABLE_SIZE];
-extern char *zio_type_name[ZIO_TYPES];
+extern const char *zio_type_name[ZIO_TYPES];
 
 /*
  * A bookmark is a four-tuple <objset, object, level, blkid> that uniquely
@@ -411,7 +408,7 @@ struct zio {
 	zio_type_t	io_type;
 	enum zio_child	io_child_type;
 	int		io_cmd;
-	uint8_t		io_priority;
+	zio_priority_t	io_priority;
 	uint8_t		io_reexecute;
 	uint8_t		io_state[ZIO_WAIT_TYPES];
 	uint64_t	io_txg;
@@ -427,6 +424,7 @@ struct zio {
 
 	/* Callback info */
 	zio_done_func_t	*io_ready;
+	zio_done_func_t	*io_physdone;
 	zio_done_func_t	*io_done;
 	void		*io_private;
 	int64_t		io_prev_space_delta;	/* DMU private */
@@ -444,11 +442,8 @@ struct zio {
 	const zio_vsd_ops_t *io_vsd_ops;
 
 	uint64_t	io_offset;
-	uint64_t	io_deadline;
 	hrtime_t	io_timestamp;
-	avl_node_t	io_offset_node;
-	avl_node_t	io_deadline_node;
-	avl_tree_t	*io_vdev_tree;
+	avl_node_t	io_queue_node;
 
 	/* Internal pipeline state */
 	enum zio_flag	io_flags;
@@ -461,6 +456,7 @@ struct zio {
 	int		io_child_error[ZIO_CHILD_TYPES];
 	uint64_t	io_children[ZIO_CHILD_TYPES][ZIO_WAIT_TYPES];
 	uint64_t	io_child_count;
+	uint64_t	io_phys_children;
 	uint64_t	io_parent_count;
 	uint64_t	*io_stall;
 	zio_t		*io_gang_leader;
@@ -474,10 +470,9 @@ struct zio {
 	zio_cksum_report_t *io_cksum_report;
 	uint64_t	io_ena;
 
-#ifdef _KERNEL
-	/* FreeBSD only. */
-	struct ostask	io_task;
-#endif
+	/* Taskq dispatching state */
+	taskq_ent_t	io_tqent;
+
 	avl_node_t	io_trim_node;
 	list_node_t	io_trim_link;
 };
@@ -490,16 +485,17 @@ extern zio_t *zio_root(spa_t *spa,
 
 extern zio_t *zio_read(zio_t *pio, spa_t *spa, const blkptr_t *bp, void *data,
     uint64_t size, zio_done_func_t *done, void *priv,
-    int priority, enum zio_flag flags, const zbookmark_t *zb);
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb);
 
 extern zio_t *zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
     void *data, uint64_t size, const zio_prop_t *zp,
-    zio_done_func_t *ready, zio_done_func_t *done, void *priv,
-    int priority, enum zio_flag flags, const zbookmark_t *zb);
+    zio_done_func_t *ready, zio_done_func_t *physdone, zio_done_func_t *done,
+    void *priv,
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb);
 
 extern zio_t *zio_rewrite(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
     void *data, uint64_t size, zio_done_func_t *done, void *priv,
-    int priority, enum zio_flag flags, zbookmark_t *zb);
+    zio_priority_t priority, enum zio_flag flags, zbookmark_t *zb);
 
 extern void zio_write_override(zio_t *zio, blkptr_t *bp, int copies,
     boolean_t nopwrite);
@@ -512,17 +508,17 @@ extern zio_t *zio_claim(zio_t *pio, spa_t *spa, uint64_t txg,
 
 extern zio_t *zio_ioctl(zio_t *pio, spa_t *spa, vdev_t *vd, int cmd,
     uint64_t offset, uint64_t size, zio_done_func_t *done, void *priv,
-    int priority, enum zio_flag flags);
+    enum zio_flag flags);
 
 extern zio_t *zio_read_phys(zio_t *pio, vdev_t *vd, uint64_t offset,
     uint64_t size, void *data, int checksum,
-    zio_done_func_t *done, void *priv, int priority, enum zio_flag flags,
-    boolean_t labels);
+    zio_done_func_t *done, void *priv, zio_priority_t priority,
+    enum zio_flag flags, boolean_t labels);
 
 extern zio_t *zio_write_phys(zio_t *pio, vdev_t *vd, uint64_t offset,
     uint64_t size, void *data, int checksum,
-    zio_done_func_t *done, void *priv, int priority, enum zio_flag flags,
-    boolean_t labels);
+    zio_done_func_t *done, void *priv, zio_priority_t priority,
+    enum zio_flag flags, boolean_t labels);
 
 extern zio_t *zio_free_sync(zio_t *pio, spa_t *spa, uint64_t txg,
     const blkptr_t *bp, uint64_t size, enum zio_flag flags);
@@ -553,11 +549,12 @@ extern void zio_data_buf_free(void *buf, size_t size);
 extern void zio_resubmit_stage_async(void *);
 
 extern zio_t *zio_vdev_child_io(zio_t *zio, blkptr_t *bp, vdev_t *vd,
-    uint64_t offset, void *data, uint64_t size, int type, int priority,
-    enum zio_flag flags, zio_done_func_t *done, void *priv);
+    uint64_t offset, void *data, uint64_t size, int type,
+    zio_priority_t priority, enum zio_flag flags,
+    zio_done_func_t *done, void *priv);
 
 extern zio_t *zio_vdev_delegated_io(vdev_t *vd, uint64_t offset,
-    void *data, uint64_t size, int type, int priority,
+    void *data, uint64_t size, int type, zio_priority_t priority,
     enum zio_flag flags, zio_done_func_t *done, void *priv);
 
 extern void zio_vdev_io_bypass(zio_t *zio);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
index 85b8a9982b6..c0be314e63b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h
@@ -70,6 +70,8 @@ extern size_t zle_compress(void *src, void *dst, size_t s_len, size_t d_len,
     int level);
 extern int zle_decompress(void *src, void *dst, size_t s_len, size_t d_len,
     int level);
+extern void lz4_init(void);
+extern void lz4_fini(void);
 extern size_t lz4_compress(void *src, void *dst, size_t s_len, size_t d_len,
     int level);
 extern int lz4_decompress(void *src, void *dst, size_t s_len, size_t d_len,
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
index ae2fdd7da6b..0201bef3ae9 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
@@ -45,7 +45,7 @@
  * either be processing, or blocked waiting to enter the next state. There may
  * be up to three active txgs, and there is always a txg in the open state
  * (though it may be blocked waiting to enter the quiescing state). In broad
- * strokes, transactions — operations that change in-memory structures — are
+ * strokes, transactions -- operations that change in-memory structures -- are
  * accepted into the txg in the open state, and are completed while the txg is
  * in the open or quiescing states. The accumulated changes are written to
  * disk in the syncing state.
@@ -53,7 +53,7 @@
  * Open
  *
  * When a new txg becomes active, it first enters the open state. New
- * transactions — updates to in-memory structures — are assigned to the
+ * transactions -- updates to in-memory structures -- are assigned to the
  * currently open txg. There is always a txg in the open state so that ZFS can
  * accept new changes (though the txg may refuse new changes if it has hit
  * some limit). ZFS advances the open txg to the next state for a variety of
@@ -369,6 +369,7 @@ txg_quiesce(dsl_pool_t *dp, uint64_t txg)
 
 	ASSERT(txg == tx->tx_open_txg);
 	tx->tx_open_txg++;
+	tx->tx_open_time = gethrtime();
 
 	DTRACE_PROBE2(txg__quiescing, dsl_pool_t *, dp, uint64_t, txg);
 	DTRACE_PROBE2(txg__opened, dsl_pool_t *, dp, uint64_t, tx->tx_open_txg);
@@ -462,7 +463,8 @@ txg_sync_thread(void *arg)
 
 	start = delta = 0;
 	for (;;) {
-		uint64_t timer, timeout = zfs_txg_timeout * hz;
+		uint64_t timeout = zfs_txg_timeout * hz;
+		uint64_t timer;
 		uint64_t txg;
 
 		/*
@@ -474,7 +476,8 @@ txg_sync_thread(void *arg)
 		while (!dsl_scan_active(dp->dp_scan) &&
 		    !tx->tx_exiting && timer > 0 &&
 		    tx->tx_synced_txg >= tx->tx_sync_txg_waiting &&
-		    tx->tx_quiesced_txg == 0) {
+		    tx->tx_quiesced_txg == 0 &&
+		    dp->dp_dirty_total < zfs_dirty_data_sync) {
 			dprintf("waiting; tx_synced=%llu waiting=%llu dp=%p\n",
 			    tx->tx_synced_txg, tx->tx_sync_txg_waiting, dp);
 			txg_thread_wait(tx, &cpr, &tx->tx_sync_more_cv, timer);
@@ -652,6 +655,28 @@ txg_wait_open(dsl_pool_t *dp, uint64_t txg)
 	mutex_exit(&tx->tx_sync_lock);
 }
 
+/*
+ * If there isn't a txg syncing or in the pipeline, push another txg through
+ * the pipeline by queiscing the open txg.
+ */
+void
+txg_kick(dsl_pool_t *dp)
+{
+	tx_state_t *tx = &dp->dp_tx;
+
+	ASSERT(!dsl_pool_config_held(dp));
+
+	mutex_enter(&tx->tx_sync_lock);
+	if (tx->tx_syncing_txg == 0 &&
+	    tx->tx_quiesce_txg_waiting <= tx->tx_open_txg &&
+	    tx->tx_sync_txg_waiting <= tx->tx_synced_txg &&
+	    tx->tx_quiesced_txg <= tx->tx_synced_txg) {
+		tx->tx_quiesce_txg_waiting = tx->tx_open_txg + 1;
+		cv_broadcast(&tx->tx_quiesce_more_cv);
+	}
+	mutex_exit(&tx->tx_sync_lock);
+}
+
 boolean_t
 txg_stalled(dsl_pool_t *dp)
 {
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 8fa4d4416e1..46a9c023dbe 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
@@ -37,6 +37,7 @@
 #include <sys/metaslab.h>
 #include <sys/metaslab_impl.h>
 #include <sys/space_map.h>
+#include <sys/space_reftree.h>
 #include <sys/zio.h>
 #include <sys/zap.h>
 #include <sys/fs/zfs.h>
@@ -371,7 +372,7 @@ vdev_alloc_common(spa_t *spa, uint_t id, uint64_t guid, vdev_ops_t *ops)
 	mutex_init(&vd->vdev_stat_lock, NULL, MUTEX_DEFAULT, NULL);
 	mutex_init(&vd->vdev_probe_lock, NULL, MUTEX_DEFAULT, NULL);
 	for (int t = 0; t < DTL_TYPES; t++) {
-		space_map_create(&vd->vdev_dtl[t], 0, -1ULL, 0,
+		vd->vdev_dtl[t] = range_tree_create(NULL, NULL,
 		    &vd->vdev_dtl_lock);
 	}
 	txg_list_create(&vd->vdev_ms_list,
@@ -557,7 +558,7 @@ vdev_alloc(spa_t *spa, vdev_t **vdp, nvlist_t *nv, vdev_t *parent, uint_t id,
 	    alloctype == VDEV_ALLOC_ROOTPOOL)) {
 		if (alloctype == VDEV_ALLOC_LOAD) {
 			(void) nvlist_lookup_uint64(nv, ZPOOL_CONFIG_DTL,
-			    &vd->vdev_dtl_smo.smo_object);
+			    &vd->vdev_dtl_object);
 			(void) nvlist_lookup_uint64(nv, ZPOOL_CONFIG_UNSPARE,
 			    &vd->vdev_unspare);
 		}
@@ -679,9 +680,10 @@ vdev_free(vdev_t *vd)
 	txg_list_destroy(&vd->vdev_dtl_list);
 
 	mutex_enter(&vd->vdev_dtl_lock);
+	space_map_close(vd->vdev_dtl_sm);
 	for (int t = 0; t < DTL_TYPES; t++) {
-		space_map_unload(&vd->vdev_dtl[t]);
-		space_map_destroy(&vd->vdev_dtl[t]);
+		range_tree_vacate(vd->vdev_dtl[t], NULL, NULL);
+		range_tree_destroy(vd->vdev_dtl[t]);
 	}
 	mutex_exit(&vd->vdev_dtl_lock);
 
@@ -896,27 +898,16 @@ vdev_metaslab_init(vdev_t *vd, uint64_t txg)
 	vd->vdev_ms_count = newc;
 
 	for (m = oldc; m < newc; m++) {
-		space_map_obj_t smo = { 0, 0, 0 };
+		uint64_t object = 0;
+
 		if (txg == 0) {
-			uint64_t object = 0;
 			error = dmu_read(mos, vd->vdev_ms_array,
 			    m * sizeof (uint64_t), sizeof (uint64_t), &object,
 			    DMU_READ_PREFETCH);
 			if (error)
 				return (error);
-			if (object != 0) {
-				dmu_buf_t *db;
-				error = dmu_bonus_hold(mos, object, FTAG, &db);
-				if (error)
-					return (error);
-				ASSERT3U(db->db_size, >=, sizeof (smo));
-				bcopy(db->db_data, &smo, sizeof (smo));
-				ASSERT3U(smo.smo_object, ==, object);
-				dmu_buf_rele(db, FTAG);
-			}
 		}
-		vd->vdev_ms[m] = metaslab_init(vd->vdev_mg, &smo,
-		    m << vd->vdev_ms_shift, 1ULL << vd->vdev_ms_shift, txg);
+		vd->vdev_ms[m] = metaslab_init(vd->vdev_mg, m, object, txg);
 	}
 
 	if (txg == 0)
@@ -944,9 +935,12 @@ vdev_metaslab_fini(vdev_t *vd)
 
 	if (vd->vdev_ms != NULL) {
 		metaslab_group_passivate(vd->vdev_mg);
-		for (m = 0; m < count; m++)
-			if (vd->vdev_ms[m] != NULL)
-				metaslab_fini(vd->vdev_ms[m]);
+		for (m = 0; m < count; m++) {
+			metaslab_t *msp = vd->vdev_ms[m];
+
+			if (msp != NULL)
+				metaslab_fini(msp);
+		}
 		kmem_free(vd->vdev_ms, count * sizeof (metaslab_t *));
 		vd->vdev_ms = NULL;
 	}
@@ -1614,9 +1608,10 @@ vdev_create(vdev_t *vd, uint64_t txg, boolean_t isreplacing)
 	}
 
 	/*
-	 * Recursively initialize all labels.
+	 * Recursively load DTLs and initialize all labels.
 	 */
-	if ((error = vdev_label_init(vd, txg, isreplacing ?
+	if ((error = vdev_dtl_load(vd)) != 0 ||
+	    (error = vdev_label_init(vd, txg, isreplacing ?
 	    VDEV_LABEL_REPLACE : VDEV_LABEL_CREATE)) != 0) {
 		vdev_close(vd);
 		return (error);
@@ -1669,6 +1664,16 @@ vdev_dirty(vdev_t *vd, int flags, void *arg, uint64_t txg)
 	(void) txg_list_add(&vd->vdev_spa->spa_vdev_txg_list, vd, txg);
 }
 
+void
+vdev_dirty_leaves(vdev_t *vd, int flags, uint64_t txg)
+{
+	for (int c = 0; c < vd->vdev_children; c++)
+		vdev_dirty_leaves(vd->vdev_child[c], flags, txg);
+
+	if (vd->vdev_ops->vdev_op_leaf)
+		vdev_dirty(vd->vdev_top, flags, vd, txg);
+}
+
 /*
  * DTLs.
  *
@@ -1710,31 +1715,31 @@ vdev_dirty(vdev_t *vd, int flags, void *arg, uint64_t txg)
 void
 vdev_dtl_dirty(vdev_t *vd, vdev_dtl_type_t t, uint64_t txg, uint64_t size)
 {
-	space_map_t *sm = &vd->vdev_dtl[t];
+	range_tree_t *rt = vd->vdev_dtl[t];
 
 	ASSERT(t < DTL_TYPES);
 	ASSERT(vd != vd->vdev_spa->spa_root_vdev);
 	ASSERT(spa_writeable(vd->vdev_spa));
 
-	mutex_enter(sm->sm_lock);
-	if (!space_map_contains(sm, txg, size))
-		space_map_add(sm, txg, size);
-	mutex_exit(sm->sm_lock);
+	mutex_enter(rt->rt_lock);
+	if (!range_tree_contains(rt, txg, size))
+		range_tree_add(rt, txg, size);
+	mutex_exit(rt->rt_lock);
 }
 
 boolean_t
 vdev_dtl_contains(vdev_t *vd, vdev_dtl_type_t t, uint64_t txg, uint64_t size)
 {
-	space_map_t *sm = &vd->vdev_dtl[t];
+	range_tree_t *rt = vd->vdev_dtl[t];
 	boolean_t dirty = B_FALSE;
 
 	ASSERT(t < DTL_TYPES);
 	ASSERT(vd != vd->vdev_spa->spa_root_vdev);
 
-	mutex_enter(sm->sm_lock);
-	if (sm->sm_space != 0)
-		dirty = space_map_contains(sm, txg, size);
-	mutex_exit(sm->sm_lock);
+	mutex_enter(rt->rt_lock);
+	if (range_tree_space(rt) != 0)
+		dirty = range_tree_contains(rt, txg, size);
+	mutex_exit(rt->rt_lock);
 
 	return (dirty);
 }
@@ -1742,12 +1747,12 @@ vdev_dtl_contains(vdev_t *vd, vdev_dtl_type_t t, uint64_t txg, uint64_t size)
 boolean_t
 vdev_dtl_empty(vdev_t *vd, vdev_dtl_type_t t)
 {
-	space_map_t *sm = &vd->vdev_dtl[t];
+	range_tree_t *rt = vd->vdev_dtl[t];
 	boolean_t empty;
 
-	mutex_enter(sm->sm_lock);
-	empty = (sm->sm_space == 0);
-	mutex_exit(sm->sm_lock);
+	mutex_enter(rt->rt_lock);
+	empty = (range_tree_space(rt) == 0);
+	mutex_exit(rt->rt_lock);
 
 	return (empty);
 }
@@ -1758,14 +1763,14 @@ vdev_dtl_empty(vdev_t *vd, vdev_dtl_type_t t)
 static uint64_t
 vdev_dtl_min(vdev_t *vd)
 {
-	space_seg_t *ss;
+	range_seg_t *rs;
 
 	ASSERT(MUTEX_HELD(&vd->vdev_dtl_lock));
-	ASSERT3U(vd->vdev_dtl[DTL_MISSING].sm_space, !=, 0);
+	ASSERT3U(range_tree_space(vd->vdev_dtl[DTL_MISSING]), !=, 0);
 	ASSERT0(vd->vdev_children);
 
-	ss = avl_first(&vd->vdev_dtl[DTL_MISSING].sm_root);
-	return (ss->ss_start - 1);
+	rs = avl_first(&vd->vdev_dtl[DTL_MISSING]->rt_root);
+	return (rs->rs_start - 1);
 }
 
 /*
@@ -1774,14 +1779,14 @@ vdev_dtl_min(vdev_t *vd)
 static uint64_t
 vdev_dtl_max(vdev_t *vd)
 {
-	space_seg_t *ss;
+	range_seg_t *rs;
 
 	ASSERT(MUTEX_HELD(&vd->vdev_dtl_lock));
-	ASSERT3U(vd->vdev_dtl[DTL_MISSING].sm_space, !=, 0);
+	ASSERT3U(range_tree_space(vd->vdev_dtl[DTL_MISSING]), !=, 0);
 	ASSERT0(vd->vdev_children);
 
-	ss = avl_last(&vd->vdev_dtl[DTL_MISSING].sm_root);
-	return (ss->ss_end);
+	rs = avl_last(&vd->vdev_dtl[DTL_MISSING]->rt_root);
+	return (rs->rs_end);
 }
 
 /*
@@ -1802,7 +1807,7 @@ vdev_dtl_should_excise(vdev_t *vd)
 	ASSERT0(vd->vdev_children);
 
 	if (vd->vdev_resilver_txg == 0 ||
-	    vd->vdev_dtl[DTL_MISSING].sm_space == 0)
+	    range_tree_space(vd->vdev_dtl[DTL_MISSING]) == 0)
 		return (B_TRUE);
 
 	/*
@@ -1872,35 +1877,35 @@ vdev_dtl_reassess(vdev_t *vd, uint64_t txg, uint64_t scrub_txg, int scrub_done)
 			 * positive refcnt -- either 1 or 2.  We then convert
 			 * the reference tree into the new DTL_MISSING map.
 			 */
-			space_map_ref_create(&reftree);
-			space_map_ref_add_map(&reftree,
-			    &vd->vdev_dtl[DTL_MISSING], 1);
-			space_map_ref_add_seg(&reftree, 0, scrub_txg, -1);
-			space_map_ref_add_map(&reftree,
-			    &vd->vdev_dtl[DTL_SCRUB], 2);
-			space_map_ref_generate_map(&reftree,
-			    &vd->vdev_dtl[DTL_MISSING], 1);
-			space_map_ref_destroy(&reftree);
+			space_reftree_create(&reftree);
+			space_reftree_add_map(&reftree,
+			    vd->vdev_dtl[DTL_MISSING], 1);
+			space_reftree_add_seg(&reftree, 0, scrub_txg, -1);
+			space_reftree_add_map(&reftree,
+			    vd->vdev_dtl[DTL_SCRUB], 2);
+			space_reftree_generate_map(&reftree,
+			    vd->vdev_dtl[DTL_MISSING], 1);
+			space_reftree_destroy(&reftree);
 		}
-		space_map_vacate(&vd->vdev_dtl[DTL_PARTIAL], NULL, NULL);
-		space_map_walk(&vd->vdev_dtl[DTL_MISSING],
-		    space_map_add, &vd->vdev_dtl[DTL_PARTIAL]);
+		range_tree_vacate(vd->vdev_dtl[DTL_PARTIAL], NULL, NULL);
+		range_tree_walk(vd->vdev_dtl[DTL_MISSING],
+		    range_tree_add, vd->vdev_dtl[DTL_PARTIAL]);
 		if (scrub_done)
-			space_map_vacate(&vd->vdev_dtl[DTL_SCRUB], NULL, NULL);
-		space_map_vacate(&vd->vdev_dtl[DTL_OUTAGE], NULL, NULL);
+			range_tree_vacate(vd->vdev_dtl[DTL_SCRUB], NULL, NULL);
+		range_tree_vacate(vd->vdev_dtl[DTL_OUTAGE], NULL, NULL);
 		if (!vdev_readable(vd))
-			space_map_add(&vd->vdev_dtl[DTL_OUTAGE], 0, -1ULL);
+			range_tree_add(vd->vdev_dtl[DTL_OUTAGE], 0, -1ULL);
 		else
-			space_map_walk(&vd->vdev_dtl[DTL_MISSING],
-			    space_map_add, &vd->vdev_dtl[DTL_OUTAGE]);
+			range_tree_walk(vd->vdev_dtl[DTL_MISSING],
+			    range_tree_add, vd->vdev_dtl[DTL_OUTAGE]);
 
 		/*
 		 * If the vdev was resilvering and no longer has any
 		 * DTLs then reset its resilvering flag.
 		 */
 		if (vd->vdev_resilver_txg != 0 &&
-		    vd->vdev_dtl[DTL_MISSING].sm_space == 0 &&
-		    vd->vdev_dtl[DTL_OUTAGE].sm_space == 0)
+		    range_tree_space(vd->vdev_dtl[DTL_MISSING]) == 0 &&
+		    range_tree_space(vd->vdev_dtl[DTL_OUTAGE]) == 0)
 			vd->vdev_resilver_txg = 0;
 
 		mutex_exit(&vd->vdev_dtl_lock);
@@ -1922,46 +1927,55 @@ vdev_dtl_reassess(vdev_t *vd, uint64_t txg, uint64_t scrub_txg, int scrub_done)
 			minref = vd->vdev_nparity + 1;	/* RAID-Z */
 		else
 			minref = vd->vdev_children;	/* any kind of mirror */
-		space_map_ref_create(&reftree);
+		space_reftree_create(&reftree);
 		for (int c = 0; c < vd->vdev_children; c++) {
 			vdev_t *cvd = vd->vdev_child[c];
 			mutex_enter(&cvd->vdev_dtl_lock);
-			space_map_ref_add_map(&reftree, &cvd->vdev_dtl[s], 1);
+			space_reftree_add_map(&reftree, cvd->vdev_dtl[s], 1);
 			mutex_exit(&cvd->vdev_dtl_lock);
 		}
-		space_map_ref_generate_map(&reftree, &vd->vdev_dtl[t], minref);
-		space_map_ref_destroy(&reftree);
+		space_reftree_generate_map(&reftree, vd->vdev_dtl[t], minref);
+		space_reftree_destroy(&reftree);
 	}
 	mutex_exit(&vd->vdev_dtl_lock);
 }
 
-static int
+int
 vdev_dtl_load(vdev_t *vd)
 {
 	spa_t *spa = vd->vdev_spa;
-	space_map_obj_t *smo = &vd->vdev_dtl_smo;
 	objset_t *mos = spa->spa_meta_objset;
-	dmu_buf_t *db;
-	int error;
+	int error = 0;
 
-	ASSERT(vd->vdev_children == 0);
+	if (vd->vdev_ops->vdev_op_leaf && vd->vdev_dtl_object != 0) {
+		ASSERT(!vd->vdev_ishole);
 
-	if (smo->smo_object == 0)
-		return (0);
+		error = space_map_open(&vd->vdev_dtl_sm, mos,
+		    vd->vdev_dtl_object, 0, -1ULL, 0, &vd->vdev_dtl_lock);
+		if (error)
+			return (error);
+		ASSERT(vd->vdev_dtl_sm != NULL);
 
-	ASSERT(!vd->vdev_ishole);
+		mutex_enter(&vd->vdev_dtl_lock);
+
+		/*
+		 * Now that we've opened the space_map we need to update
+		 * the in-core DTL.
+		 */
+		space_map_update(vd->vdev_dtl_sm);
+
+		error = space_map_load(vd->vdev_dtl_sm,
+		    vd->vdev_dtl[DTL_MISSING], SM_ALLOC);
+		mutex_exit(&vd->vdev_dtl_lock);
 
-	if ((error = dmu_bonus_hold(mos, smo->smo_object, FTAG, &db)) != 0)
 		return (error);
+	}
 
-	ASSERT3U(db->db_size, >=, sizeof (*smo));
-	bcopy(db->db_data, smo, sizeof (*smo));
-	dmu_buf_rele(db, FTAG);
-
-	mutex_enter(&vd->vdev_dtl_lock);
-	error = space_map_load(&vd->vdev_dtl[DTL_MISSING],
-	    NULL, SM_ALLOC, smo, mos);
-	mutex_exit(&vd->vdev_dtl_lock);
+	for (int c = 0; c < vd->vdev_children; c++) {
+		error = vdev_dtl_load(vd->vdev_child[c]);
+		if (error != 0)
+			break;
+	}
 
 	return (error);
 }
@@ -1970,66 +1984,75 @@ void
 vdev_dtl_sync(vdev_t *vd, uint64_t txg)
 {
 	spa_t *spa = vd->vdev_spa;
-	space_map_obj_t *smo = &vd->vdev_dtl_smo;
-	space_map_t *sm = &vd->vdev_dtl[DTL_MISSING];
+	range_tree_t *rt = vd->vdev_dtl[DTL_MISSING];
 	objset_t *mos = spa->spa_meta_objset;
-	space_map_t smsync;
-	kmutex_t smlock;
-	dmu_buf_t *db;
+	range_tree_t *rtsync;
+	kmutex_t rtlock;
 	dmu_tx_t *tx;
+	uint64_t object = space_map_object(vd->vdev_dtl_sm);
 
 	ASSERT(!vd->vdev_ishole);
+	ASSERT(vd->vdev_ops->vdev_op_leaf);
 
 	tx = dmu_tx_create_assigned(spa->spa_dsl_pool, txg);
 
-	if (vd->vdev_detached) {
-		if (smo->smo_object != 0) {
-			int err = dmu_object_free(mos, smo->smo_object, tx);
-			ASSERT0(err);
-			smo->smo_object = 0;
-		}
+	if (vd->vdev_detached || vd->vdev_top->vdev_removing) {
+		mutex_enter(&vd->vdev_dtl_lock);
+		space_map_free(vd->vdev_dtl_sm, tx);
+		space_map_close(vd->vdev_dtl_sm);
+		vd->vdev_dtl_sm = NULL;
+		mutex_exit(&vd->vdev_dtl_lock);
 		dmu_tx_commit(tx);
 		return;
 	}
 
-	if (smo->smo_object == 0) {
-		ASSERT(smo->smo_objsize == 0);
-		ASSERT(smo->smo_alloc == 0);
-		smo->smo_object = dmu_object_alloc(mos,
-		    DMU_OT_SPACE_MAP, 1 << SPACE_MAP_BLOCKSHIFT,
-		    DMU_OT_SPACE_MAP_HEADER, sizeof (*smo), tx);
-		ASSERT(smo->smo_object != 0);
+	if (vd->vdev_dtl_sm == NULL) {
+		uint64_t new_object;
+
+		new_object = space_map_alloc(mos, tx);
+		VERIFY3U(new_object, !=, 0);
+
+		VERIFY0(space_map_open(&vd->vdev_dtl_sm, mos, new_object,
+		    0, -1ULL, 0, &vd->vdev_dtl_lock));
+		ASSERT(vd->vdev_dtl_sm != NULL);
+	}
+
+	bzero(&rtlock, sizeof(rtlock));
+	mutex_init(&rtlock, NULL, MUTEX_DEFAULT, NULL);
+
+	rtsync = range_tree_create(NULL, NULL, &rtlock);
+
+	mutex_enter(&rtlock);
+
+	mutex_enter(&vd->vdev_dtl_lock);
+	range_tree_walk(rt, range_tree_add, rtsync);
+	mutex_exit(&vd->vdev_dtl_lock);
+
+	space_map_truncate(vd->vdev_dtl_sm, tx);
+	space_map_write(vd->vdev_dtl_sm, rtsync, SM_ALLOC, tx);
+	range_tree_vacate(rtsync, NULL, NULL);
+
+	range_tree_destroy(rtsync);
+
+	mutex_exit(&rtlock);
+	mutex_destroy(&rtlock);
+
+	/*
+	 * If the object for the space map has changed then dirty
+	 * the top level so that we update the config.
+	 */
+	if (object != space_map_object(vd->vdev_dtl_sm)) {
+		zfs_dbgmsg("txg %llu, spa %s, DTL old object %llu, "
+		    "new object %llu", txg, spa_name(spa), object,
+		    space_map_object(vd->vdev_dtl_sm));
 		vdev_config_dirty(vd->vdev_top);
 	}
 
-	bzero(&smlock, sizeof (smlock));
-	mutex_init(&smlock, NULL, MUTEX_DEFAULT, NULL);
-
-	space_map_create(&smsync, sm->sm_start, sm->sm_size, sm->sm_shift,
-	    &smlock);
-
-	mutex_enter(&smlock);
+	dmu_tx_commit(tx);
 
 	mutex_enter(&vd->vdev_dtl_lock);
-	space_map_walk(sm, space_map_add, &smsync);
+	space_map_update(vd->vdev_dtl_sm);
 	mutex_exit(&vd->vdev_dtl_lock);
-
-	space_map_truncate(smo, mos, tx);
-	space_map_sync(&smsync, SM_ALLOC, smo, mos, tx);
-	space_map_vacate(&smsync, NULL, NULL);
-
-	space_map_destroy(&smsync);
-
-	mutex_exit(&smlock);
-	mutex_destroy(&smlock);
-
-	VERIFY(0 == dmu_bonus_hold(mos, smo->smo_object, FTAG, &db));
-	dmu_buf_will_dirty(db, tx);
-	ASSERT3U(db->db_size, >=, sizeof (*smo));
-	bcopy(smo, db->db_data, sizeof (*smo));
-	dmu_buf_rele(db, FTAG);
-
-	dmu_tx_commit(tx);
 }
 
 /*
@@ -2078,7 +2101,7 @@ vdev_resilver_needed(vdev_t *vd, uint64_t *minp, uint64_t *maxp)
 
 	if (vd->vdev_children == 0) {
 		mutex_enter(&vd->vdev_dtl_lock);
-		if (vd->vdev_dtl[DTL_MISSING].sm_space != 0 &&
+		if (range_tree_space(vd->vdev_dtl[DTL_MISSING]) != 0 &&
 		    vdev_writeable(vd)) {
 
 			thismin = vdev_dtl_min(vd);
@@ -2183,29 +2206,25 @@ vdev_remove(vdev_t *vd, uint64_t txg)
 
 	tx = dmu_tx_create_assigned(spa_get_dsl(spa), txg);
 
-	if (vd->vdev_dtl_smo.smo_object) {
-		ASSERT0(vd->vdev_dtl_smo.smo_alloc);
-		(void) dmu_object_free(mos, vd->vdev_dtl_smo.smo_object, tx);
-		vd->vdev_dtl_smo.smo_object = 0;
-	}
-
 	if (vd->vdev_ms != NULL) {
 		for (int m = 0; m < vd->vdev_ms_count; m++) {
 			metaslab_t *msp = vd->vdev_ms[m];
 
-			if (msp == NULL || msp->ms_smo.smo_object == 0)
+			if (msp == NULL || msp->ms_sm == NULL)
 				continue;
 
-			ASSERT0(msp->ms_smo.smo_alloc);
-			(void) dmu_object_free(mos, msp->ms_smo.smo_object, tx);
-			msp->ms_smo.smo_object = 0;
+			mutex_enter(&msp->ms_lock);
+			VERIFY0(space_map_allocated(msp->ms_sm));
+			space_map_free(msp->ms_sm, tx);
+			space_map_close(msp->ms_sm);
+			msp->ms_sm = NULL;
+			mutex_exit(&msp->ms_lock);
 		}
 	}
 
 	if (vd->vdev_ms_array) {
 		(void) dmu_object_free(mos, vd->vdev_ms_array, tx);
 		vd->vdev_ms_array = 0;
-		vd->vdev_ms_shift = 0;
 	}
 	dmu_tx_commit(tx);
 }
@@ -3369,7 +3388,7 @@ vdev_deadman(vdev_t *vd)
 		vdev_queue_t *vq = &vd->vdev_queue;
 
 		mutex_enter(&vq->vq_lock);
-		if (avl_numnodes(&vq->vq_pending_tree) > 0) {
+		if (avl_numnodes(&vq->vq_active_tree) > 0) {
 			spa_t *spa = vd->vdev_spa;
 			zio_t *fio;
 			uint64_t delta;
@@ -3379,7 +3398,7 @@ vdev_deadman(vdev_t *vd)
 			 * if any I/O has been outstanding for longer than
 			 * the spa_deadman_synctime we panic the system.
 			 */
-			fio = avl_first(&vq->vq_pending_tree);
+			fio = avl_first(&vq->vq_active_tree);
 			delta = gethrtime() - fio->io_timestamp;
 			if (delta > spa_deadman_synctime(spa)) {
 				zfs_dbgmsg("SLOW IO: zio timestamp %lluns, "
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
index 1cc5bf9736d..97573406216 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
@@ -322,7 +322,7 @@ vdev_cache_read(zio_t *zio)
 	}
 
 	fio = zio_vdev_delegated_io(zio->io_vd, cache_offset,
-	    ve->ve_data, VCBS, ZIO_TYPE_READ, ZIO_PRIORITY_CACHE_FILL,
+	    ve->ve_data, VCBS, ZIO_TYPE_READ, ZIO_PRIORITY_NOW,
 	    ZIO_FLAG_DONT_CACHE, vdev_cache_fill, ve);
 
 	ve->ve_fill_io = fio;
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
index 15685a5bcb3..e1cca48f201 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
@@ -42,9 +42,11 @@
  * Virtual device vector for GEOM.
  */
 
+static g_attrchanged_t vdev_geom_attrchanged;
 struct g_class zfs_vdev_class = {
 	.name = "ZFS::VDEV",
 	.version = G_VERSION,
+	.attrchanged = vdev_geom_attrchanged,
 };
 
 DECLARE_GEOM_CLASS(zfs_vdev_class, zfs_vdev);
@@ -61,6 +63,34 @@ TUNABLE_INT("vfs.zfs.vdev.bio_delete_disable", &vdev_geom_bio_delete_disable);
 SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, bio_delete_disable, CTLFLAG_RW,
     &vdev_geom_bio_delete_disable, 0, "Disable BIO_DELETE");
 
+static void
+vdev_geom_set_rotation_rate(vdev_t *vd, struct g_consumer *cp)
+{ 
+	int error;
+	uint16_t rate;
+
+	error = g_getattr("GEOM::rotation_rate", cp, &rate);
+	if (error == 0)
+		vd->vdev_rotation_rate = rate;
+	else
+		vd->vdev_rotation_rate = VDEV_RATE_UNKNOWN;
+}
+
+static void
+vdev_geom_attrchanged(struct g_consumer *cp, const char *attr)
+{
+	vdev_t *vd;
+
+	vd = cp->private;
+	if (vd == NULL)
+		return;
+
+	if (strcmp(attr, "GEOM::rotation_rate") == 0) {
+		vdev_geom_set_rotation_rate(vd, cp);
+		return;
+	}
+}
+
 static void
 vdev_geom_orphan(struct g_consumer *cp)
 {
@@ -147,6 +177,7 @@ vdev_geom_attach(struct g_provider *pp)
 			ZFS_LOG(1, "Used existing consumer for %s.", pp->name);
 		}
 	}
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	return (cp);
 }
 
@@ -370,10 +401,16 @@ vdev_geom_attach_taster(struct g_consumer *cp, struct g_provider *pp)
 
 	if (pp->flags & G_PF_WITHER)
 		return (EINVAL);
-	if (pp->sectorsize > VDEV_PAD_SIZE || !ISP2(pp->sectorsize))
-		return (EINVAL);
 	g_attach(cp, pp);
 	error = g_access(cp, 1, 0, 0);
+	if (error == 0) {
+		if (pp->sectorsize > VDEV_PAD_SIZE || !ISP2(pp->sectorsize))
+			error = EINVAL;
+		else if (pp->mediasize < SPA_MINDEVSIZE)
+			error = EINVAL;
+		if (error != 0)
+			g_access(cp, -1, 0, 0);
+	}
 	if (error != 0)
 		g_detach(cp);
 	return (error);
@@ -682,6 +719,11 @@ vdev_geom_open(vdev_t *vd, uint64_t *psize, uint64_t *max_psize,
 	vd->vdev_physpath = kmem_alloc(bufsize, KM_SLEEP);
 	snprintf(vd->vdev_physpath, bufsize, "/dev/%s", pp->name);
 
+	/*
+	 * Determine the device's rotation rate.
+	 */
+	vdev_geom_set_rotation_rate(vd, cp);
+
 	return (0);
 }
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
index 60f875dd973..c7dd3ad741c 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
@@ -289,9 +289,10 @@ vdev_config_generate(spa_t *spa, vdev_t *vd, boolean_t getstats,
 			    vd->vdev_removing);
 	}
 
-	if (vd->vdev_dtl_smo.smo_object != 0)
+	if (vd->vdev_dtl_sm != NULL) {
 		fnvlist_add_uint64(nv, ZPOOL_CONFIG_DTL,
-		    vd->vdev_dtl_smo.smo_object);
+		    space_map_object(vd->vdev_dtl_sm));
+	}
 
 	if (vd->vdev_crtxg)
 		fnvlist_add_uint64(nv, ZPOOL_CONFIG_CREATE_TXG, vd->vdev_crtxg);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
index 34c28fa6619..1ffd1de2731 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
@@ -41,27 +41,97 @@ typedef struct mirror_child {
 	vdev_t		*mc_vd;
 	uint64_t	mc_offset;
 	int		mc_error;
+	int		mc_load;
 	uint8_t		mc_tried;
 	uint8_t		mc_skipped;
 	uint8_t		mc_speculative;
 } mirror_child_t;
 
 typedef struct mirror_map {
+	int		*mm_preferred;
+	int		mm_preferred_cnt;
 	int		mm_children;
-	int		mm_replacing;
-	int		mm_preferred;
-	int		mm_root;
-	mirror_child_t	mm_child[1];
+	boolean_t	mm_replacing;
+	boolean_t	mm_root;
+	mirror_child_t	mm_child[];
 } mirror_map_t;
 
-int vdev_mirror_shift = 21;
+static int vdev_mirror_shift = 21;
+
+SYSCTL_DECL(_vfs_zfs_vdev);
+static SYSCTL_NODE(_vfs_zfs_vdev, OID_AUTO, mirror, CTLFLAG_RD, 0,
+    "ZFS VDEV Mirror");
+
+/*
+ * The load configuration settings below are tuned by default for
+ * the case where all devices are of the same rotational type.
+ *
+ * If there is a mixture of rotating and non-rotating media, setting
+ * non_rotating_seek_inc to 0 may well provide better results as it
+ * will direct more reads to the non-rotating vdevs which are more
+ * likely to have a higher performance.
+ */
+
+/* Rotating media load calculation configuration. */
+static int rotating_inc = 0;
+TUNABLE_INT("vfs.zfs.vdev.mirror.rotating_inc", &rotating_inc);
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_inc, CTLFLAG_RW,
+    &rotating_inc, 0, "Rotating media load increment for non-seeking I/O's");
+
+static int rotating_seek_inc = 5;
+TUNABLE_INT("vfs.zfs.vdev.mirror.rotating_seek_inc", &rotating_seek_inc);
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_inc, CTLFLAG_RW,
+    &rotating_seek_inc, 0, "Rotating media load increment for seeking I/O's");
+
+static int rotating_seek_offset = 1 * 1024 * 1024;
+TUNABLE_INT("vfs.zfs.vdev.mirror.rotating_seek_offset", &rotating_seek_offset);
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, rotating_seek_offset, CTLFLAG_RW,
+    &rotating_seek_offset, 0, "Offset in bytes from the last I/O which "
+    "triggers a reduced rotating media seek increment");
+
+/* Non-rotating media load calculation configuration. */
+static int non_rotating_inc = 0;
+TUNABLE_INT("vfs.zfs.vdev.mirror.non_rotating_inc", &non_rotating_inc);
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_inc, CTLFLAG_RW,
+    &non_rotating_inc, 0,
+    "Non-rotating media load increment for non-seeking I/O's");
+
+static int non_rotating_seek_inc = 1;
+TUNABLE_INT("vfs.zfs.vdev.mirror.non_rotating_seek_inc",
+     &non_rotating_seek_inc);
+SYSCTL_INT(_vfs_zfs_vdev_mirror, OID_AUTO, non_rotating_seek_inc, CTLFLAG_RW,
+    &non_rotating_seek_inc, 0,
+    "Non-rotating media load increment for seeking I/O's");
+
+
+static inline size_t
+vdev_mirror_map_size(int children)
+{
+	return (offsetof(mirror_map_t, mm_child[children]) +
+	    sizeof(int) * children);
+}
+
+static inline mirror_map_t *
+vdev_mirror_map_alloc(int children, boolean_t replacing, boolean_t root)
+{
+	mirror_map_t *mm;
+
+	mm = kmem_zalloc(vdev_mirror_map_size(children), KM_SLEEP);
+	mm->mm_children = children;
+	mm->mm_replacing = replacing;
+	mm->mm_root = root;
+	mm->mm_preferred = (int *)((uintptr_t)mm + 
+	    offsetof(mirror_map_t, mm_child[children]));
+
+	return mm;
+}
 
 static void
 vdev_mirror_map_free(zio_t *zio)
 {
 	mirror_map_t *mm = zio->io_vsd;
 
-	kmem_free(mm, offsetof(mirror_map_t, mm_child[mm->mm_children]));
+	kmem_free(mm, vdev_mirror_map_size(mm->mm_children));
 }
 
 static const zio_vsd_ops_t vdev_mirror_vsd_ops = {
@@ -69,55 +139,80 @@ static const zio_vsd_ops_t vdev_mirror_vsd_ops = {
 	zio_vsd_default_cksum_report
 };
 
+static int
+vdev_mirror_load(mirror_map_t *mm, vdev_t *vd, uint64_t zio_offset)
+{
+	uint64_t lastoffset;
+	int load;
+
+	/* All DVAs have equal weight at the root. */
+	if (mm->mm_root)
+		return (INT_MAX);
+
+	/*
+	 * We don't return INT_MAX if the device is resilvering i.e.
+	 * vdev_resilver_txg != 0 as when tested performance was slightly
+	 * worse overall when resilvering with compared to without.
+	 */
+
+	/* Standard load based on pending queue length. */
+	load = vdev_queue_length(vd);
+	lastoffset = vdev_queue_lastoffset(vd);
+
+	if (vd->vdev_rotation_rate == VDEV_RATE_NON_ROTATING) {
+		/* Non-rotating media. */
+		if (lastoffset == zio_offset)
+			return (load + non_rotating_inc);
+
+		/*
+		 * Apply a seek penalty even for non-rotating devices as
+		 * sequential I/O'a can be aggregated into fewer operations
+		 * on the device, thus avoiding unnecessary per-command
+		 * overhead and boosting performance.
+		 */
+		return (load + non_rotating_seek_inc);
+	}
+
+	/* Rotating media I/O's which directly follow the last I/O. */
+	if (lastoffset == zio_offset)
+		return (load + rotating_inc);
+
+	/*
+	 * Apply half the seek increment to I/O's within seek offset
+	 * of the last I/O queued to this vdev as they should incure less
+	 * of a seek increment.
+	 */
+	if (ABS(lastoffset - zio_offset) < rotating_seek_offset)
+		return (load + (rotating_seek_inc / 2));
+
+	/* Apply the full seek increment to all other I/O's. */
+	return (load + rotating_seek_inc);
+}
+
+
 static mirror_map_t *
-vdev_mirror_map_alloc(zio_t *zio)
+vdev_mirror_map_init(zio_t *zio)
 {
 	mirror_map_t *mm = NULL;
 	mirror_child_t *mc;
 	vdev_t *vd = zio->io_vd;
-	int c, d;
+	int c;
 
 	if (vd == NULL) {
 		dva_t *dva = zio->io_bp->blk_dva;
 		spa_t *spa = zio->io_spa;
 
-		c = BP_GET_NDVAS(zio->io_bp);
-
-		mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_SLEEP);
-		mm->mm_children = c;
-		mm->mm_replacing = B_FALSE;
-		mm->mm_preferred = spa_get_random(c);
-		mm->mm_root = B_TRUE;
-
-		/*
-		 * Check the other, lower-index DVAs to see if they're on
-		 * the same vdev as the child we picked.  If they are, use
-		 * them since they are likely to have been allocated from
-		 * the primary metaslab in use at the time, and hence are
-		 * more likely to have locality with single-copy data.
-		 */
-		for (c = mm->mm_preferred, d = c - 1; d >= 0; d--) {
-			if (DVA_GET_VDEV(&dva[d]) == DVA_GET_VDEV(&dva[c]))
-				mm->mm_preferred = d;
-		}
-
+		mm = vdev_mirror_map_alloc(BP_GET_NDVAS(zio->io_bp), B_FALSE,
+		    B_TRUE);
 		for (c = 0; c < mm->mm_children; c++) {
 			mc = &mm->mm_child[c];
-
 			mc->mc_vd = vdev_lookup_top(spa, DVA_GET_VDEV(&dva[c]));
 			mc->mc_offset = DVA_GET_OFFSET(&dva[c]);
 		}
 	} else {
-		c = vd->vdev_children;
-
-		mm = kmem_zalloc(offsetof(mirror_map_t, mm_child[c]), KM_SLEEP);
-		mm->mm_children = c;
-		mm->mm_replacing = (vd->vdev_ops == &vdev_replacing_ops ||
-		    vd->vdev_ops == &vdev_spare_ops);
-		mm->mm_preferred = mm->mm_replacing ? 0 :
-		    (zio->io_offset >> vdev_mirror_shift) % c;
-		mm->mm_root = B_FALSE;
-
+		mm = vdev_mirror_map_alloc(vd->vdev_children,
+		    (vd->vdev_ops == &vdev_replacing_ops ||
+                    vd->vdev_ops == &vdev_spare_ops), B_FALSE);
 		for (c = 0; c < mm->mm_children; c++) {
 			mc = &mm->mm_child[c];
 			mc->mc_vd = vd->vdev_child[c];
@@ -211,50 +306,121 @@ vdev_mirror_scrub_done(zio_t *zio)
 }
 
 /*
- * Try to find a child whose DTL doesn't contain the block we want to read.
+ * Check the other, lower-index DVAs to see if they're on the same
+ * vdev as the child we picked.  If they are, use them since they
+ * are likely to have been allocated from the primary metaslab in
+ * use at the time, and hence are more likely to have locality with
+ * single-copy data.
+ */
+static int
+vdev_mirror_dva_select(zio_t *zio, int preferred)
+{
+	dva_t *dva = zio->io_bp->blk_dva;
+	mirror_map_t *mm = zio->io_vsd;
+	int c;
+
+	for (c = preferred - 1; c >= 0; c--) {
+		if (DVA_GET_VDEV(&dva[c]) == DVA_GET_VDEV(&dva[preferred]))
+			preferred = c;
+	}
+	return (preferred);
+}
+
+static int
+vdev_mirror_preferred_child_randomize(zio_t *zio)
+{
+	mirror_map_t *mm = zio->io_vsd;
+	int p;
+
+	if (mm->mm_root) {
+		p = spa_get_random(mm->mm_preferred_cnt);
+		return (vdev_mirror_dva_select(zio, mm->mm_preferred[p]));
+	}
+
+	/*
+	 * To ensure we don't always favour the first matching vdev,
+	 * which could lead to wear leveling issues on SSD's, we
+	 * use the I/O offset as a pseudo random seed into the vdevs
+	 * which have the lowest load.
+	 */
+	p = (zio->io_offset >> vdev_mirror_shift) % mm->mm_preferred_cnt;
+	return (mm->mm_preferred[p]);
+}
+
+/*
+ * Try to find a vdev whose DTL doesn't contain the block we want to read
+ * prefering vdevs based on determined load.
+ *
  * If we can't, try the read on any vdev we haven't already tried.
  */
 static int
 vdev_mirror_child_select(zio_t *zio)
 {
 	mirror_map_t *mm = zio->io_vsd;
-	mirror_child_t *mc;
 	uint64_t txg = zio->io_txg;
-	int i, c;
+	int c, lowest_load;
 
 	ASSERT(zio->io_bp == NULL || BP_PHYSICAL_BIRTH(zio->io_bp) == txg);
 
-	/*
-	 * Try to find a child whose DTL doesn't contain the block to read.
-	 * If a child is known to be completely inaccessible (indicated by
-	 * vdev_readable() returning B_FALSE), don't even try.
-	 */
-	for (i = 0, c = mm->mm_preferred; i < mm->mm_children; i++, c++) {
-		if (c >= mm->mm_children)
-			c = 0;
+	lowest_load = INT_MAX;
+	mm->mm_preferred_cnt = 0;
+	for (c = 0; c < mm->mm_children; c++) {
+		mirror_child_t *mc;
+
 		mc = &mm->mm_child[c];
 		if (mc->mc_tried || mc->mc_skipped)
 			continue;
+
 		if (!vdev_readable(mc->mc_vd)) {
 			mc->mc_error = SET_ERROR(ENXIO);
 			mc->mc_tried = 1;	/* don't even try */
 			mc->mc_skipped = 1;
 			continue;
 		}
-		if (!vdev_dtl_contains(mc->mc_vd, DTL_MISSING, txg, 1))
-			return (c);
-		mc->mc_error = SET_ERROR(ESTALE);
-		mc->mc_skipped = 1;
-		mc->mc_speculative = 1;
+
+		if (vdev_dtl_contains(mc->mc_vd, DTL_MISSING, txg, 1)) {
+			mc->mc_error = SET_ERROR(ESTALE);
+			mc->mc_skipped = 1;
+			mc->mc_speculative = 1;
+			continue;
+		}
+
+		mc->mc_load = vdev_mirror_load(mm, mc->mc_vd, mc->mc_offset);
+		if (mc->mc_load > lowest_load)
+			continue;
+
+		if (mc->mc_load < lowest_load) {
+			lowest_load = mc->mc_load;
+			mm->mm_preferred_cnt = 0;
+		}
+		mm->mm_preferred[mm->mm_preferred_cnt] = c;
+		mm->mm_preferred_cnt++;
+	}
+
+	if (mm->mm_preferred_cnt == 1) {
+		vdev_queue_register_lastoffset(
+		    mm->mm_child[mm->mm_preferred[0]].mc_vd, zio);
+		return (mm->mm_preferred[0]);
+	}
+
+	if (mm->mm_preferred_cnt > 1) {
+		int c = vdev_mirror_preferred_child_randomize(zio);
+
+		vdev_queue_register_lastoffset(mm->mm_child[c].mc_vd, zio);
+		return (c);
 	}
 
 	/*
 	 * Every device is either missing or has this txg in its DTL.
 	 * Look for any child we haven't already tried before giving up.
 	 */
-	for (c = 0; c < mm->mm_children; c++)
-		if (!mm->mm_child[c].mc_tried)
+	for (c = 0; c < mm->mm_children; c++) {
+		if (!mm->mm_child[c].mc_tried) {
+			vdev_queue_register_lastoffset(mm->mm_child[c].mc_vd,
+			    zio);
 			return (c);
+		}
+	}
 
 	/*
 	 * Every child failed.  There's no place left to look.
@@ -269,7 +435,7 @@ vdev_mirror_io_start(zio_t *zio)
 	mirror_child_t *mc;
 	int c, children;
 
-	mm = vdev_mirror_map_alloc(zio);
+	mm = vdev_mirror_map_init(zio);
 
 	if (zio->io_type == ZIO_TYPE_READ) {
 		if ((zio->io_flags & ZIO_FLAG_SCRUB) && !mm->mm_replacing) {
@@ -437,7 +603,7 @@ vdev_mirror_io_done(zio_t *zio)
 			zio_nowait(zio_vdev_child_io(zio, zio->io_bp,
 			    mc->mc_vd, mc->mc_offset,
 			    zio->io_data, zio->io_size,
-			    ZIO_TYPE_WRITE, zio->io_priority,
+			    ZIO_TYPE_WRITE, ZIO_PRIORITY_ASYNC_WRITE,
 			    ZIO_FLAG_IO_REPAIR | (unexpected_errors ?
 			    ZIO_FLAG_SELF_HEAL : 0), NULL, NULL));
 		}
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 0a687b290e7..d7d0deeadd3 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
@@ -24,35 +24,137 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright (c) 2013 by Delphix. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
 #include <sys/vdev_impl.h>
+#include <sys/spa_impl.h>
 #include <sys/zio.h>
 #include <sys/avl.h>
+#include <sys/dsl_pool.h>
 
 /*
- * These tunables are for performance analysis.
+ * ZFS I/O Scheduler
+ * ---------------
+ *
+ * ZFS issues I/O operations to leaf vdevs to satisfy and complete zios.  The
+ * I/O scheduler determines when and in what order those operations are
+ * issued.  The I/O scheduler divides operations into five I/O classes
+ * prioritized in the following order: sync read, sync write, async read,
+ * async write, and scrub/resilver.  Each queue defines the minimum and
+ * maximum number of concurrent operations that may be issued to the device.
+ * In addition, the device has an aggregate maximum. Note that the sum of the
+ * per-queue minimums must not exceed the aggregate maximum, and if the
+ * aggregate maximum is equal to or greater than the sum of the per-queue
+ * maximums, the per-queue minimum has no effect.
+ *
+ * For many physical devices, throughput increases with the number of
+ * concurrent operations, but latency typically suffers. Further, physical
+ * devices typically have a limit at which more concurrent operations have no
+ * effect on throughput or can actually cause it to decrease.
+ *
+ * The scheduler selects the next operation to issue by first looking for an
+ * I/O class whose minimum has not been satisfied. Once all are satisfied and
+ * the aggregate maximum has not been hit, the scheduler looks for classes
+ * whose maximum has not been satisfied. Iteration through the I/O classes is
+ * done in the order specified above. No further operations are issued if the
+ * aggregate maximum number of concurrent operations has been hit or if there
+ * are no operations queued for an I/O class that has not hit its maximum.
+ * Every time an i/o is queued or an operation completes, the I/O scheduler
+ * looks for new operations to issue.
+ *
+ * All I/O classes have a fixed maximum number of outstanding operations
+ * except for the async write class. Asynchronous writes represent the data
+ * that is committed to stable storage during the syncing stage for
+ * transaction groups (see txg.c). Transaction groups enter the syncing state
+ * periodically so the number of queued async writes will quickly burst up and
+ * then bleed down to zero. Rather than servicing them as quickly as possible,
+ * the I/O scheduler changes the maximum number of active async write i/os
+ * according to the amount of dirty data in the pool (see dsl_pool.c). Since
+ * both throughput and latency typically increase with the number of
+ * concurrent operations issued to physical devices, reducing the burstiness
+ * in the number of concurrent operations also stabilizes the response time of
+ * operations from other -- and in particular synchronous -- queues. In broad
+ * strokes, the I/O scheduler will issue more concurrent operations from the
+ * async write queue as there's more dirty data in the pool.
+ *
+ * Async Writes
+ *
+ * The number of concurrent operations issued for the async write I/O class
+ * follows a piece-wise linear function defined by a few adjustable points.
+ *
+ *        |                   o---------| <-- zfs_vdev_async_write_max_active
+ *   ^    |                  /^         |
+ *   |    |                 / |         |
+ * active |                /  |         |
+ *  I/O   |               /   |         |
+ * count  |              /    |         |
+ *        |             /     |         |
+ *        |------------o      |         | <-- zfs_vdev_async_write_min_active
+ *       0|____________^______|_________|
+ *        0%           |      |       100% of zfs_dirty_data_max
+ *                     |      |
+ *                     |      `-- zfs_vdev_async_write_active_max_dirty_percent
+ *                     `--------- zfs_vdev_async_write_active_min_dirty_percent
+ *
+ * Until the amount of dirty data exceeds a minimum percentage of the dirty
+ * data allowed in the pool, the I/O scheduler will limit the number of
+ * concurrent operations to the minimum. As that threshold is crossed, the
+ * number of concurrent operations issued increases linearly to the maximum at
+ * the specified maximum percentage of the dirty data allowed in the pool.
+ *
+ * Ideally, the amount of dirty data on a busy pool will stay in the sloped
+ * part of the function between zfs_vdev_async_write_active_min_dirty_percent
+ * and zfs_vdev_async_write_active_max_dirty_percent. If it exceeds the
+ * maximum percentage, this indicates that the rate of incoming data is
+ * greater than the rate that the backend storage can handle. In this case, we
+ * must further throttle incoming writes (see dmu_tx_delay() for details).
  */
 
-/* The maximum number of I/Os concurrently pending to each device. */
-int zfs_vdev_max_pending = 10;
-
 /*
- * The initial number of I/Os pending to each device, before it starts ramping
- * up to zfs_vdev_max_pending.
+ * The maximum number of i/os active to each device.  Ideally, this will be >=
+ * the sum of each queue's max_active.  It must be at least the sum of each
+ * queue's min_active.
  */
-int zfs_vdev_min_pending = 4;
+uint32_t zfs_vdev_max_active = 1000;
 
 /*
- * The deadlines are grouped into buckets based on zfs_vdev_time_shift:
- * deadline = pri + gethrtime() >> time_shift)
+ * Per-queue limits on the number of i/os active to each device.  If the
+ * sum of the queue's max_active is < zfs_vdev_max_active, then the
+ * min_active comes into play.  We will send min_active from each queue,
+ * and then select from queues in the order defined by zio_priority_t.
+ *
+ * In general, smaller max_active's will lead to lower latency of synchronous
+ * operations.  Larger max_active's may lead to higher overall throughput,
+ * depending on underlying storage.
+ *
+ * The ratio of the queues' max_actives determines the balance of performance
+ * between reads, writes, and scrubs.  E.g., increasing
+ * zfs_vdev_scrub_max_active will cause the scrub or resilver to complete
+ * more quickly, but reads and writes to have higher latency and lower
+ * throughput.
  */
-int zfs_vdev_time_shift = 29; /* each bucket is 0.537 seconds */
+uint32_t zfs_vdev_sync_read_min_active = 10;
+uint32_t zfs_vdev_sync_read_max_active = 10;
+uint32_t zfs_vdev_sync_write_min_active = 10;
+uint32_t zfs_vdev_sync_write_max_active = 10;
+uint32_t zfs_vdev_async_read_min_active = 1;
+uint32_t zfs_vdev_async_read_max_active = 3;
+uint32_t zfs_vdev_async_write_min_active = 1;
+uint32_t zfs_vdev_async_write_max_active = 10;
+uint32_t zfs_vdev_scrub_min_active = 1;
+uint32_t zfs_vdev_scrub_max_active = 2;
 
-/* exponential I/O issue ramp-up rate */
-int zfs_vdev_ramp_rate = 2;
+/*
+ * When the pool has less than zfs_vdev_async_write_active_min_dirty_percent
+ * dirty data, use zfs_vdev_async_write_min_active.  When it has more than
+ * zfs_vdev_async_write_active_max_dirty_percent, use
+ * zfs_vdev_async_write_max_active. The value is linearly interpolated
+ * between min and max.
+ */
+int zfs_vdev_async_write_active_min_dirty_percent = 30;
+int zfs_vdev_async_write_active_max_dirty_percent = 60;
 
 /*
  * To reduce IOPs, we aggregate small adjacent I/Os into one large I/O.
@@ -64,20 +166,42 @@ int zfs_vdev_aggregation_limit = SPA_MAXBLOCKSIZE;
 int zfs_vdev_read_gap_limit = 32 << 10;
 int zfs_vdev_write_gap_limit = 4 << 10;
 
+#ifdef __FreeBSD__
 SYSCTL_DECL(_vfs_zfs_vdev);
-TUNABLE_INT("vfs.zfs.vdev.max_pending", &zfs_vdev_max_pending);
-SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, max_pending, CTLFLAG_RW,
-    &zfs_vdev_max_pending, 0, "Maximum I/O requests pending on each device");
-TUNABLE_INT("vfs.zfs.vdev.min_pending", &zfs_vdev_min_pending);
-SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, min_pending, CTLFLAG_RW,
-    &zfs_vdev_min_pending, 0,
-    "Initial number of I/O requests pending to each device");
-TUNABLE_INT("vfs.zfs.vdev.time_shift", &zfs_vdev_time_shift);
-SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, time_shift, CTLFLAG_RW,
-    &zfs_vdev_time_shift, 0, "Used for calculating I/O request deadline");
-TUNABLE_INT("vfs.zfs.vdev.ramp_rate", &zfs_vdev_ramp_rate);
-SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, ramp_rate, CTLFLAG_RW,
-    &zfs_vdev_ramp_rate, 0, "Exponential I/O issue ramp-up rate");
+TUNABLE_INT("vfs.zfs.vdev.max_active", &zfs_vdev_max_active);
+SYSCTL_UINT(_vfs_zfs_vdev, OID_AUTO, max_active, CTLFLAG_RW,
+    &zfs_vdev_max_active, 0,
+    "The maximum number of i/os of all types active for each device.");
+
+#define ZFS_VDEV_QUEUE_KNOB_MIN(name)					\
+TUNABLE_INT("vfs.zfs.vdev." #name "_min_active",			\
+    &zfs_vdev_ ## name ## _min_active);					\
+SYSCTL_UINT(_vfs_zfs_vdev, OID_AUTO, name ## _min_active, CTLFLAG_RW,	\
+    &zfs_vdev_ ## name ## _min_active, 0,				\
+    "Initial number of I/O requests of type " #name			\
+    " active for each device");
+
+#define ZFS_VDEV_QUEUE_KNOB_MAX(name)					\
+TUNABLE_INT("vfs.zfs.vdev." #name "_max_active",			\
+    &zfs_vdev_ ## name ## _max_active);					\
+SYSCTL_UINT(_vfs_zfs_vdev, OID_AUTO, name ## _max_active, CTLFLAG_RW,	\
+    &zfs_vdev_ ## name ## _max_active, 0,				\
+    "Maximum number of I/O requests of type " #name			\
+    " active for each device");
+
+ZFS_VDEV_QUEUE_KNOB_MIN(sync_read);
+ZFS_VDEV_QUEUE_KNOB_MAX(sync_read);
+ZFS_VDEV_QUEUE_KNOB_MIN(sync_write);
+ZFS_VDEV_QUEUE_KNOB_MAX(sync_write);
+ZFS_VDEV_QUEUE_KNOB_MIN(async_read);
+ZFS_VDEV_QUEUE_KNOB_MAX(async_read);
+ZFS_VDEV_QUEUE_KNOB_MIN(async_write);
+ZFS_VDEV_QUEUE_KNOB_MAX(async_write);
+ZFS_VDEV_QUEUE_KNOB_MIN(scrub);
+ZFS_VDEV_QUEUE_KNOB_MAX(scrub);
+
+#undef ZFS_VDEV_QUEUE_KNOB
+
 TUNABLE_INT("vfs.zfs.vdev.aggregation_limit", &zfs_vdev_aggregation_limit);
 SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, aggregation_limit, CTLFLAG_RW,
     &zfs_vdev_aggregation_limit, 0,
@@ -90,33 +214,7 @@ TUNABLE_INT("vfs.zfs.vdev.write_gap_limit", &zfs_vdev_write_gap_limit);
 SYSCTL_INT(_vfs_zfs_vdev, OID_AUTO, write_gap_limit, CTLFLAG_RW,
     &zfs_vdev_write_gap_limit, 0,
     "Acceptable gap between two writes being aggregated");
-
-/*
- * Virtual device vector for disk I/O scheduling.
- */
-int
-vdev_queue_deadline_compare(const void *x1, const void *x2)
-{
-	const zio_t *z1 = x1;
-	const zio_t *z2 = x2;
-
-	if (z1->io_deadline < z2->io_deadline)
-		return (-1);
-	if (z1->io_deadline > z2->io_deadline)
-		return (1);
-
-	if (z1->io_offset < z2->io_offset)
-		return (-1);
-	if (z1->io_offset > z2->io_offset)
-		return (1);
-
-	if (z1 < z2)
-		return (-1);
-	if (z1 > z2)
-		return (1);
-
-	return (0);
-}
+#endif
 
 int
 vdev_queue_offset_compare(const void *x1, const void *x2)
@@ -137,24 +235,52 @@ vdev_queue_offset_compare(const void *x1, const void *x2)
 	return (0);
 }
 
+int
+vdev_queue_timestamp_compare(const void *x1, const void *x2)
+{
+	const zio_t *z1 = x1;
+	const zio_t *z2 = x2;
+
+	if (z1->io_timestamp < z2->io_timestamp)
+		return (-1);
+	if (z1->io_timestamp > z2->io_timestamp)
+		return (1);
+
+	if (z1 < z2)
+		return (-1);
+	if (z1 > z2)
+		return (1);
+
+	return (0);
+}
+
 void
 vdev_queue_init(vdev_t *vd)
 {
 	vdev_queue_t *vq = &vd->vdev_queue;
 
 	mutex_init(&vq->vq_lock, NULL, MUTEX_DEFAULT, NULL);
+	vq->vq_vdev = vd;
 
-	avl_create(&vq->vq_deadline_tree, vdev_queue_deadline_compare,
-	    sizeof (zio_t), offsetof(struct zio, io_deadline_node));
+	avl_create(&vq->vq_active_tree, vdev_queue_offset_compare,
+	    sizeof (zio_t), offsetof(struct zio, io_queue_node));
 
-	avl_create(&vq->vq_read_tree, vdev_queue_offset_compare,
-	    sizeof (zio_t), offsetof(struct zio, io_offset_node));
+	for (zio_priority_t p = 0; p < ZIO_PRIORITY_NUM_QUEUEABLE; p++) {
+		/*
+		 * The synchronous i/o queues are FIFO rather than LBA ordered.
+		 * This provides more consistent latency for these i/os, and
+		 * they tend to not be tightly clustered anyway so there is
+		 * little to no throughput loss.
+		 */
+		boolean_t fifo = (p == ZIO_PRIORITY_SYNC_READ ||
+		    p == ZIO_PRIORITY_SYNC_WRITE);
+		avl_create(&vq->vq_class[p].vqc_queued_tree,
+		    fifo ? vdev_queue_timestamp_compare :
+		    vdev_queue_offset_compare,
+		    sizeof (zio_t), offsetof(struct zio, io_queue_node));
+	}
 
-	avl_create(&vq->vq_write_tree, vdev_queue_offset_compare,
-	    sizeof (zio_t), offsetof(struct zio, io_offset_node));
-
-	avl_create(&vq->vq_pending_tree, vdev_queue_offset_compare,
-	    sizeof (zio_t), offsetof(struct zio, io_offset_node));
+	vq->vq_lastoffset = 0;
 }
 
 void
@@ -162,10 +288,9 @@ vdev_queue_fini(vdev_t *vd)
 {
 	vdev_queue_t *vq = &vd->vdev_queue;
 
-	avl_destroy(&vq->vq_deadline_tree);
-	avl_destroy(&vq->vq_read_tree);
-	avl_destroy(&vq->vq_write_tree);
-	avl_destroy(&vq->vq_pending_tree);
+	for (zio_priority_t p = 0; p < ZIO_PRIORITY_NUM_QUEUEABLE; p++)
+		avl_destroy(&vq->vq_class[p].vqc_queued_tree);
+	avl_destroy(&vq->vq_active_tree);
 
 	mutex_destroy(&vq->vq_lock);
 }
@@ -173,30 +298,204 @@ vdev_queue_fini(vdev_t *vd)
 static void
 vdev_queue_io_add(vdev_queue_t *vq, zio_t *zio)
 {
-	avl_add(&vq->vq_deadline_tree, zio);
-	avl_add(zio->io_vdev_tree, zio);
+	spa_t *spa = zio->io_spa;
+	ASSERT3U(zio->io_priority, <, ZIO_PRIORITY_NUM_QUEUEABLE);
+	avl_add(&vq->vq_class[zio->io_priority].vqc_queued_tree, zio);
+
+#ifdef illumos
+	mutex_enter(&spa->spa_iokstat_lock);
+	spa->spa_queue_stats[zio->io_priority].spa_queued++;
+	if (spa->spa_iokstat != NULL)
+		kstat_waitq_enter(spa->spa_iokstat->ks_data);
+	mutex_exit(&spa->spa_iokstat_lock);
+#endif
 }
 
 static void
 vdev_queue_io_remove(vdev_queue_t *vq, zio_t *zio)
 {
-	avl_remove(&vq->vq_deadline_tree, zio);
-	avl_remove(zio->io_vdev_tree, zio);
+	spa_t *spa = zio->io_spa;
+	ASSERT3U(zio->io_priority, <, ZIO_PRIORITY_NUM_QUEUEABLE);
+	avl_remove(&vq->vq_class[zio->io_priority].vqc_queued_tree, zio);
+
+#ifdef illumos
+	mutex_enter(&spa->spa_iokstat_lock);
+	ASSERT3U(spa->spa_queue_stats[zio->io_priority].spa_queued, >, 0);
+	spa->spa_queue_stats[zio->io_priority].spa_queued--;
+	if (spa->spa_iokstat != NULL)
+		kstat_waitq_exit(spa->spa_iokstat->ks_data);
+	mutex_exit(&spa->spa_iokstat_lock);
+#endif
+}
+
+static void
+vdev_queue_pending_add(vdev_queue_t *vq, zio_t *zio)
+{
+	spa_t *spa = zio->io_spa;
+	ASSERT(MUTEX_HELD(&vq->vq_lock));
+	ASSERT3U(zio->io_priority, <, ZIO_PRIORITY_NUM_QUEUEABLE);
+	vq->vq_class[zio->io_priority].vqc_active++;
+	avl_add(&vq->vq_active_tree, zio);
+
+#ifdef illumos
+	mutex_enter(&spa->spa_iokstat_lock);
+	spa->spa_queue_stats[zio->io_priority].spa_active++;
+	if (spa->spa_iokstat != NULL)
+		kstat_runq_enter(spa->spa_iokstat->ks_data);
+	mutex_exit(&spa->spa_iokstat_lock);
+#endif
+}
+
+static void
+vdev_queue_pending_remove(vdev_queue_t *vq, zio_t *zio)
+{
+	spa_t *spa = zio->io_spa;
+	ASSERT(MUTEX_HELD(&vq->vq_lock));
+	ASSERT3U(zio->io_priority, <, ZIO_PRIORITY_NUM_QUEUEABLE);
+	vq->vq_class[zio->io_priority].vqc_active--;
+	avl_remove(&vq->vq_active_tree, zio);
+
+#ifdef illumos
+	mutex_enter(&spa->spa_iokstat_lock);
+	ASSERT3U(spa->spa_queue_stats[zio->io_priority].spa_active, >, 0);
+	spa->spa_queue_stats[zio->io_priority].spa_active--;
+	if (spa->spa_iokstat != NULL) {
+		kstat_io_t *ksio = spa->spa_iokstat->ks_data;
+
+		kstat_runq_exit(spa->spa_iokstat->ks_data);
+		if (zio->io_type == ZIO_TYPE_READ) {
+			ksio->reads++;
+			ksio->nread += zio->io_size;
+		} else if (zio->io_type == ZIO_TYPE_WRITE) {
+			ksio->writes++;
+			ksio->nwritten += zio->io_size;
+		}
+	}
+	mutex_exit(&spa->spa_iokstat_lock);
+#endif
 }
 
 static void
 vdev_queue_agg_io_done(zio_t *aio)
 {
-	zio_t *pio;
-
-	while ((pio = zio_walk_parents(aio)) != NULL)
-		if (aio->io_type == ZIO_TYPE_READ)
+	if (aio->io_type == ZIO_TYPE_READ) {
+		zio_t *pio;
+		while ((pio = zio_walk_parents(aio)) != NULL) {
 			bcopy((char *)aio->io_data + (pio->io_offset -
 			    aio->io_offset), pio->io_data, pio->io_size);
+		}
+	}
 
 	zio_buf_free(aio->io_data, aio->io_size);
 }
 
+static int
+vdev_queue_class_min_active(zio_priority_t p)
+{
+	switch (p) {
+	case ZIO_PRIORITY_SYNC_READ:
+		return (zfs_vdev_sync_read_min_active);
+	case ZIO_PRIORITY_SYNC_WRITE:
+		return (zfs_vdev_sync_write_min_active);
+	case ZIO_PRIORITY_ASYNC_READ:
+		return (zfs_vdev_async_read_min_active);
+	case ZIO_PRIORITY_ASYNC_WRITE:
+		return (zfs_vdev_async_write_min_active);
+	case ZIO_PRIORITY_SCRUB:
+		return (zfs_vdev_scrub_min_active);
+	default:
+		panic("invalid priority %u", p);
+		return (0);
+	}
+}
+
+static int
+vdev_queue_max_async_writes(uint64_t dirty)
+{
+	int writes;
+	uint64_t min_bytes = zfs_dirty_data_max *
+	    zfs_vdev_async_write_active_min_dirty_percent / 100;
+	uint64_t max_bytes = zfs_dirty_data_max *
+	    zfs_vdev_async_write_active_max_dirty_percent / 100;
+
+	if (dirty < min_bytes)
+		return (zfs_vdev_async_write_min_active);
+	if (dirty > max_bytes)
+		return (zfs_vdev_async_write_max_active);
+
+	/*
+	 * linear interpolation:
+	 * slope = (max_writes - min_writes) / (max_bytes - min_bytes)
+	 * move right by min_bytes
+	 * move up by min_writes
+	 */
+	writes = (dirty - min_bytes) *
+	    (zfs_vdev_async_write_max_active -
+	    zfs_vdev_async_write_min_active) /
+	    (max_bytes - min_bytes) +
+	    zfs_vdev_async_write_min_active;
+	ASSERT3U(writes, >=, zfs_vdev_async_write_min_active);
+	ASSERT3U(writes, <=, zfs_vdev_async_write_max_active);
+	return (writes);
+}
+
+static int
+vdev_queue_class_max_active(spa_t *spa, zio_priority_t p)
+{
+	switch (p) {
+	case ZIO_PRIORITY_SYNC_READ:
+		return (zfs_vdev_sync_read_max_active);
+	case ZIO_PRIORITY_SYNC_WRITE:
+		return (zfs_vdev_sync_write_max_active);
+	case ZIO_PRIORITY_ASYNC_READ:
+		return (zfs_vdev_async_read_max_active);
+	case ZIO_PRIORITY_ASYNC_WRITE:
+		return (vdev_queue_max_async_writes(
+		    spa->spa_dsl_pool->dp_dirty_total));
+	case ZIO_PRIORITY_SCRUB:
+		return (zfs_vdev_scrub_max_active);
+	default:
+		panic("invalid priority %u", p);
+		return (0);
+	}
+}
+
+/*
+ * Return the i/o class to issue from, or ZIO_PRIORITY_MAX_QUEUEABLE if
+ * there is no eligible class.
+ */
+static zio_priority_t
+vdev_queue_class_to_issue(vdev_queue_t *vq)
+{
+	spa_t *spa = vq->vq_vdev->vdev_spa;
+	zio_priority_t p;
+
+	if (avl_numnodes(&vq->vq_active_tree) >= zfs_vdev_max_active)
+		return (ZIO_PRIORITY_NUM_QUEUEABLE);
+
+	/* find a queue that has not reached its minimum # outstanding i/os */
+	for (p = 0; p < ZIO_PRIORITY_NUM_QUEUEABLE; p++) {
+		if (avl_numnodes(&vq->vq_class[p].vqc_queued_tree) > 0 &&
+		    vq->vq_class[p].vqc_active <
+		    vdev_queue_class_min_active(p))
+			return (p);
+	}
+
+	/*
+	 * If we haven't found a queue, look for one that hasn't reached its
+	 * maximum # outstanding i/os.
+	 */
+	for (p = 0; p < ZIO_PRIORITY_NUM_QUEUEABLE; p++) {
+		if (avl_numnodes(&vq->vq_class[p].vqc_queued_tree) > 0 &&
+		    vq->vq_class[p].vqc_active <
+		    vdev_queue_class_max_active(spa, p))
+			return (p);
+	}
+
+	/* No eligible queued i/os */
+	return (ZIO_PRIORITY_NUM_QUEUEABLE);
+}
+
 /*
  * Compute the range spanned by two i/os, which is the endpoint of the last
  * (lio->io_offset + lio->io_size) minus start of the first (fio->io_offset).
@@ -207,154 +506,192 @@ vdev_queue_agg_io_done(zio_t *aio)
 #define	IO_GAP(fio, lio) (-IO_SPAN(lio, fio))
 
 static zio_t *
-vdev_queue_io_to_issue(vdev_queue_t *vq, uint64_t pending_limit)
+vdev_queue_aggregate(vdev_queue_t *vq, zio_t *zio)
 {
-	zio_t *fio, *lio, *aio, *dio, *nio, *mio;
-	avl_tree_t *t;
-	int flags;
-	uint64_t maxspan = zfs_vdev_aggregation_limit;
-	uint64_t maxgap;
-	int stretch;
+	zio_t *first, *last, *aio, *dio, *mandatory, *nio;
+	uint64_t maxgap = 0;
+	uint64_t size;
+	boolean_t stretch = B_FALSE;
+	vdev_queue_class_t *vqc = &vq->vq_class[zio->io_priority];
+	avl_tree_t *t = &vqc->vqc_queued_tree;
+	enum zio_flag flags = zio->io_flags & ZIO_FLAG_AGG_INHERIT;
+
+	if (zio->io_flags & ZIO_FLAG_DONT_AGGREGATE)
+		return (NULL);
+
+	/*
+	 * The synchronous i/o queues are not sorted by LBA, so we can't
+	 * find adjacent i/os.  These i/os tend to not be tightly clustered,
+	 * or too large to aggregate, so this has little impact on performance.
+	 */
+	if (zio->io_priority == ZIO_PRIORITY_SYNC_READ ||
+	    zio->io_priority == ZIO_PRIORITY_SYNC_WRITE)
+		return (NULL);
+
+	first = last = zio;
+
+	if (zio->io_type == ZIO_TYPE_READ)
+		maxgap = zfs_vdev_read_gap_limit;
+
+	/*
+	 * We can aggregate I/Os that are sufficiently adjacent and of
+	 * the same flavor, as expressed by the AGG_INHERIT flags.
+	 * The latter requirement is necessary so that certain
+	 * attributes of the I/O, such as whether it's a normal I/O
+	 * or a scrub/resilver, can be preserved in the aggregate.
+	 * We can include optional I/Os, but don't allow them
+	 * to begin a range as they add no benefit in that situation.
+	 */
+
+	/*
+	 * We keep track of the last non-optional I/O.
+	 */
+	mandatory = (first->io_flags & ZIO_FLAG_OPTIONAL) ? NULL : first;
+
+	/*
+	 * Walk backwards through sufficiently contiguous I/Os
+	 * recording the last non-option I/O.
+	 */
+	while ((dio = AVL_PREV(t, first)) != NULL &&
+	    (dio->io_flags & ZIO_FLAG_AGG_INHERIT) == flags &&
+	    IO_SPAN(dio, last) <= zfs_vdev_aggregation_limit &&
+	    IO_GAP(dio, first) <= maxgap) {
+		first = dio;
+		if (mandatory == NULL && !(first->io_flags & ZIO_FLAG_OPTIONAL))
+			mandatory = first;
+	}
+
+	/*
+	 * Skip any initial optional I/Os.
+	 */
+	while ((first->io_flags & ZIO_FLAG_OPTIONAL) && first != last) {
+		first = AVL_NEXT(t, first);
+		ASSERT(first != NULL);
+	}
+
+	/*
+	 * Walk forward through sufficiently contiguous I/Os.
+	 */
+	while ((dio = AVL_NEXT(t, last)) != NULL &&
+	    (dio->io_flags & ZIO_FLAG_AGG_INHERIT) == flags &&
+	    IO_SPAN(first, dio) <= zfs_vdev_aggregation_limit &&
+	    IO_GAP(last, dio) <= maxgap) {
+		last = dio;
+		if (!(last->io_flags & ZIO_FLAG_OPTIONAL))
+			mandatory = last;
+	}
+
+	/*
+	 * Now that we've established the range of the I/O aggregation
+	 * we must decide what to do with trailing optional I/Os.
+	 * For reads, there's nothing to do. While we are unable to
+	 * aggregate further, it's possible that a trailing optional
+	 * I/O would allow the underlying device to aggregate with
+	 * subsequent I/Os. We must therefore determine if the next
+	 * non-optional I/O is close enough to make aggregation
+	 * worthwhile.
+	 */
+	if (zio->io_type == ZIO_TYPE_WRITE && mandatory != NULL) {
+		zio_t *nio = last;
+		while ((dio = AVL_NEXT(t, nio)) != NULL &&
+		    IO_GAP(nio, dio) == 0 &&
+		    IO_GAP(mandatory, dio) <= zfs_vdev_write_gap_limit) {
+			nio = dio;
+			if (!(nio->io_flags & ZIO_FLAG_OPTIONAL)) {
+				stretch = B_TRUE;
+				break;
+			}
+		}
+	}
+
+	if (stretch) {
+		/* This may be a no-op. */
+		dio = AVL_NEXT(t, last);
+		dio->io_flags &= ~ZIO_FLAG_OPTIONAL;
+	} else {
+		while (last != mandatory && last != first) {
+			ASSERT(last->io_flags & ZIO_FLAG_OPTIONAL);
+			last = AVL_PREV(t, last);
+			ASSERT(last != NULL);
+		}
+	}
+
+	if (first == last)
+		return (NULL);
+
+	size = IO_SPAN(first, last);
+	ASSERT3U(size, <=, zfs_vdev_aggregation_limit);
+
+	aio = zio_vdev_delegated_io(first->io_vd, first->io_offset,
+	    zio_buf_alloc(size), size, first->io_type, zio->io_priority,
+	    flags | ZIO_FLAG_DONT_CACHE | ZIO_FLAG_DONT_QUEUE,
+	    vdev_queue_agg_io_done, NULL);
+	aio->io_timestamp = first->io_timestamp;
+
+	nio = first;
+	do {
+		dio = nio;
+		nio = AVL_NEXT(t, dio);
+		ASSERT3U(dio->io_type, ==, aio->io_type);
+
+		if (dio->io_flags & ZIO_FLAG_NODATA) {
+			ASSERT3U(dio->io_type, ==, ZIO_TYPE_WRITE);
+			bzero((char *)aio->io_data + (dio->io_offset -
+			    aio->io_offset), dio->io_size);
+		} else if (dio->io_type == ZIO_TYPE_WRITE) {
+			bcopy(dio->io_data, (char *)aio->io_data +
+			    (dio->io_offset - aio->io_offset),
+			    dio->io_size);
+		}
+
+		zio_add_child(dio, aio);
+		vdev_queue_io_remove(vq, dio);
+		zio_vdev_io_bypass(dio);
+		zio_execute(dio);
+	} while (dio != last);
+
+	return (aio);
+}
+
+static zio_t *
+vdev_queue_io_to_issue(vdev_queue_t *vq)
+{
+	zio_t *zio, *aio;
+	zio_priority_t p;
+	avl_index_t idx;
+	vdev_queue_class_t *vqc;
+	zio_t search;
 
 again:
 	ASSERT(MUTEX_HELD(&vq->vq_lock));
 
-	if (avl_numnodes(&vq->vq_pending_tree) >= pending_limit ||
-	    avl_numnodes(&vq->vq_deadline_tree) == 0)
+	p = vdev_queue_class_to_issue(vq);
+
+	if (p == ZIO_PRIORITY_NUM_QUEUEABLE) {
+		/* No eligible queued i/os */
 		return (NULL);
-
-	fio = lio = avl_first(&vq->vq_deadline_tree);
-
-	t = fio->io_vdev_tree;
-	flags = fio->io_flags & ZIO_FLAG_AGG_INHERIT;
-	maxgap = (t == &vq->vq_read_tree) ? zfs_vdev_read_gap_limit : 0;
-
-	if (!(flags & ZIO_FLAG_DONT_AGGREGATE)) {
-		/*
-		 * We can aggregate I/Os that are sufficiently adjacent and of
-		 * the same flavor, as expressed by the AGG_INHERIT flags.
-		 * The latter requirement is necessary so that certain
-		 * attributes of the I/O, such as whether it's a normal I/O
-		 * or a scrub/resilver, can be preserved in the aggregate.
-		 * We can include optional I/Os, but don't allow them
-		 * to begin a range as they add no benefit in that situation.
-		 */
-
-		/*
-		 * We keep track of the last non-optional I/O.
-		 */
-		mio = (fio->io_flags & ZIO_FLAG_OPTIONAL) ? NULL : fio;
-
-		/*
-		 * Walk backwards through sufficiently contiguous I/Os
-		 * recording the last non-option I/O.
-		 */
-		while ((dio = AVL_PREV(t, fio)) != NULL &&
-		    (dio->io_flags & ZIO_FLAG_AGG_INHERIT) == flags &&
-		    IO_SPAN(dio, lio) <= maxspan &&
-		    IO_GAP(dio, fio) <= maxgap) {
-			fio = dio;
-			if (mio == NULL && !(fio->io_flags & ZIO_FLAG_OPTIONAL))
-				mio = fio;
-		}
-
-		/*
-		 * Skip any initial optional I/Os.
-		 */
-		while ((fio->io_flags & ZIO_FLAG_OPTIONAL) && fio != lio) {
-			fio = AVL_NEXT(t, fio);
-			ASSERT(fio != NULL);
-		}
-
-		/*
-		 * Walk forward through sufficiently contiguous I/Os.
-		 */
-		while ((dio = AVL_NEXT(t, lio)) != NULL &&
-		    (dio->io_flags & ZIO_FLAG_AGG_INHERIT) == flags &&
-		    IO_SPAN(fio, dio) <= maxspan &&
-		    IO_GAP(lio, dio) <= maxgap) {
-			lio = dio;
-			if (!(lio->io_flags & ZIO_FLAG_OPTIONAL))
-				mio = lio;
-		}
-
-		/*
-		 * Now that we've established the range of the I/O aggregation
-		 * we must decide what to do with trailing optional I/Os.
-		 * For reads, there's nothing to do. While we are unable to
-		 * aggregate further, it's possible that a trailing optional
-		 * I/O would allow the underlying device to aggregate with
-		 * subsequent I/Os. We must therefore determine if the next
-		 * non-optional I/O is close enough to make aggregation
-		 * worthwhile.
-		 */
-		stretch = B_FALSE;
-		if (t != &vq->vq_read_tree && mio != NULL) {
-			nio = lio;
-			while ((dio = AVL_NEXT(t, nio)) != NULL &&
-			    IO_GAP(nio, dio) == 0 &&
-			    IO_GAP(mio, dio) <= zfs_vdev_write_gap_limit) {
-				nio = dio;
-				if (!(nio->io_flags & ZIO_FLAG_OPTIONAL)) {
-					stretch = B_TRUE;
-					break;
-				}
-			}
-		}
-
-		if (stretch) {
-			/* This may be a no-op. */
-			VERIFY((dio = AVL_NEXT(t, lio)) != NULL);
-			dio->io_flags &= ~ZIO_FLAG_OPTIONAL;
-		} else {
-			while (lio != mio && lio != fio) {
-				ASSERT(lio->io_flags & ZIO_FLAG_OPTIONAL);
-				lio = AVL_PREV(t, lio);
-				ASSERT(lio != NULL);
-			}
-		}
 	}
 
-	if (fio != lio) {
-		uint64_t size = IO_SPAN(fio, lio);
-		ASSERT(size <= zfs_vdev_aggregation_limit);
+	/*
+	 * For LBA-ordered queues (async / scrub), issue the i/o which follows
+	 * the most recently issued i/o in LBA (offset) order.
+	 *
+	 * For FIFO queues (sync), issue the i/o with the lowest timestamp.
+	 */
+	vqc = &vq->vq_class[p];
+	search.io_timestamp = 0;
+	search.io_offset = vq->vq_last_offset + 1;
+	VERIFY3P(avl_find(&vqc->vqc_queued_tree, &search, &idx), ==, NULL);
+	zio = avl_nearest(&vqc->vqc_queued_tree, idx, AVL_AFTER);
+	if (zio == NULL)
+		zio = avl_first(&vqc->vqc_queued_tree);
+	ASSERT3U(zio->io_priority, ==, p);
 
-		aio = zio_vdev_delegated_io(fio->io_vd, fio->io_offset,
-		    zio_buf_alloc(size), size, fio->io_type, ZIO_PRIORITY_AGG,
-		    flags | ZIO_FLAG_DONT_CACHE | ZIO_FLAG_DONT_QUEUE,
-		    vdev_queue_agg_io_done, NULL);
-		aio->io_timestamp = fio->io_timestamp;
-
-		nio = fio;
-		do {
-			dio = nio;
-			nio = AVL_NEXT(t, dio);
-			ASSERT(dio->io_type == aio->io_type);
-			ASSERT(dio->io_vdev_tree == t);
-
-			if (dio->io_flags & ZIO_FLAG_NODATA) {
-				ASSERT(dio->io_type == ZIO_TYPE_WRITE);
-				bzero((char *)aio->io_data + (dio->io_offset -
-				    aio->io_offset), dio->io_size);
-			} else if (dio->io_type == ZIO_TYPE_WRITE) {
-				bcopy(dio->io_data, (char *)aio->io_data +
-				    (dio->io_offset - aio->io_offset),
-				    dio->io_size);
-			}
-
-			zio_add_child(dio, aio);
-			vdev_queue_io_remove(vq, dio);
-			zio_vdev_io_bypass(dio);
-			zio_execute(dio);
-		} while (dio != lio);
-
-		avl_add(&vq->vq_pending_tree, aio);
-
-		return (aio);
-	}
-
-	ASSERT(fio->io_vdev_tree == t);
-	vdev_queue_io_remove(vq, fio);
+	aio = vdev_queue_aggregate(vq, zio);
+	if (aio != NULL)
+		zio = aio;
+	else
+		vdev_queue_io_remove(vq, zio);
 
 	/*
 	 * If the I/O is or was optional and therefore has no data, we need to
@@ -362,17 +699,18 @@ again:
 	 * deadlock that we could encounter since this I/O will complete
 	 * immediately.
 	 */
-	if (fio->io_flags & ZIO_FLAG_NODATA) {
+	if (zio->io_flags & ZIO_FLAG_NODATA) {
 		mutex_exit(&vq->vq_lock);
-		zio_vdev_io_bypass(fio);
-		zio_execute(fio);
+		zio_vdev_io_bypass(zio);
+		zio_execute(zio);
 		mutex_enter(&vq->vq_lock);
 		goto again;
 	}
 
-	avl_add(&vq->vq_pending_tree, fio);
+	vdev_queue_pending_add(vq, zio);
+	vq->vq_last_offset = zio->io_offset;
 
-	return (fio);
+	return (zio);
 }
 
 zio_t *
@@ -381,28 +719,31 @@ vdev_queue_io(zio_t *zio)
 	vdev_queue_t *vq = &zio->io_vd->vdev_queue;
 	zio_t *nio;
 
-	ASSERT(zio->io_type == ZIO_TYPE_READ || zio->io_type == ZIO_TYPE_WRITE);
-
 	if (zio->io_flags & ZIO_FLAG_DONT_QUEUE)
 		return (zio);
 
+	/*
+	 * Children i/os inherent their parent's priority, which might
+	 * not match the child's i/o type.  Fix it up here.
+	 */
+	if (zio->io_type == ZIO_TYPE_READ) {
+		if (zio->io_priority != ZIO_PRIORITY_SYNC_READ &&
+		    zio->io_priority != ZIO_PRIORITY_ASYNC_READ &&
+		    zio->io_priority != ZIO_PRIORITY_SCRUB)
+			zio->io_priority = ZIO_PRIORITY_ASYNC_READ;
+	} else {
+		ASSERT(zio->io_type == ZIO_TYPE_WRITE);
+		if (zio->io_priority != ZIO_PRIORITY_SYNC_WRITE &&
+		    zio->io_priority != ZIO_PRIORITY_ASYNC_WRITE)
+			zio->io_priority = ZIO_PRIORITY_ASYNC_WRITE;
+	}
+
 	zio->io_flags |= ZIO_FLAG_DONT_CACHE | ZIO_FLAG_DONT_QUEUE;
 
-	if (zio->io_type == ZIO_TYPE_READ)
-		zio->io_vdev_tree = &vq->vq_read_tree;
-	else
-		zio->io_vdev_tree = &vq->vq_write_tree;
-
 	mutex_enter(&vq->vq_lock);
-
 	zio->io_timestamp = gethrtime();
-	zio->io_deadline = (zio->io_timestamp >> zfs_vdev_time_shift) +
-	    zio->io_priority;
-
 	vdev_queue_io_add(vq, zio);
-
-	nio = vdev_queue_io_to_issue(vq, zfs_vdev_min_pending);
-
+	nio = vdev_queue_io_to_issue(vq);
 	mutex_exit(&vq->vq_lock);
 
 	if (nio == NULL)
@@ -420,20 +761,18 @@ void
 vdev_queue_io_done(zio_t *zio)
 {
 	vdev_queue_t *vq = &zio->io_vd->vdev_queue;
+	zio_t *nio;
 
 	if (zio_injection_enabled)
 		delay(SEC_TO_TICK(zio_handle_io_delay(zio)));
 
 	mutex_enter(&vq->vq_lock);
 
-	avl_remove(&vq->vq_pending_tree, zio);
+	vdev_queue_pending_remove(vq, zio);
 
 	vq->vq_io_complete_ts = gethrtime();
 
-	for (int i = 0; i < zfs_vdev_ramp_rate; i++) {
-		zio_t *nio = vdev_queue_io_to_issue(vq, zfs_vdev_max_pending);
-		if (nio == NULL)
-			break;
+	while ((nio = vdev_queue_io_to_issue(vq)) != NULL) {
 		mutex_exit(&vq->vq_lock);
 		if (nio->io_done == vdev_queue_agg_io_done) {
 			zio_nowait(nio);
@@ -446,3 +785,26 @@ vdev_queue_io_done(zio_t *zio)
 
 	mutex_exit(&vq->vq_lock);
 }
+
+/*
+ * As these three methods are only used for load calculations we're not concerned
+ * if we get an incorrect value on 32bit platforms due to lack of vq_lock mutex
+ * use here, instead we prefer to keep it lock free for performance.
+ */ 
+int
+vdev_queue_length(vdev_t *vd)
+{
+	return (avl_numnodes(&vd->vdev_queue.vq_active_tree));
+}
+
+uint64_t
+vdev_queue_lastoffset(vdev_t *vd)
+{
+	return (vd->vdev_queue.vq_lastoffset);
+}
+
+void
+vdev_queue_register_lastoffset(vdev_t *vd, zio_t *zio)
+{
+	vd->vdev_queue.vq_lastoffset = zio->io_offset + zio->io_size;
+}
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
index f2fd29d713e..6e23e6c8e72 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
@@ -2370,7 +2370,7 @@ done:
 
 			zio_nowait(zio_vdev_child_io(zio, NULL, cvd,
 			    rc->rc_offset, rc->rc_data, rc->rc_size,
-			    ZIO_TYPE_WRITE, zio->io_priority,
+			    ZIO_TYPE_WRITE, ZIO_PRIORITY_ASYNC_WRITE,
 			    ZIO_FLAG_IO_REPAIR | (unexpected_errors ?
 			    ZIO_FLAG_SELF_HEAL : 0), NULL, NULL));
 		}
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
index 638b1413937..7ab45c6ca4a 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfeature.c
@@ -361,36 +361,46 @@ spa_feature_enable(spa_t *spa, zfeature_info_t *feature, dmu_tx_t *tx)
 	    spa->spa_feat_desc_obj, feature, FEATURE_ACTION_ENABLE, tx));
 }
 
-/*
- * If the specified feature has not yet been enabled, this function returns
- * ENOTSUP; otherwise, this function increments the feature's refcount (or
- * returns EOVERFLOW if the refcount cannot be incremented). This function must
- * be called from syncing context.
- */
 void
 spa_feature_incr(spa_t *spa, zfeature_info_t *feature, dmu_tx_t *tx)
 {
+	ASSERT(dmu_tx_is_syncing(tx));
 	ASSERT3U(spa_version(spa), >=, SPA_VERSION_FEATURES);
 	VERIFY3U(0, ==, feature_do_action(spa->spa_meta_objset,
 	    spa->spa_feat_for_read_obj, spa->spa_feat_for_write_obj,
 	    spa->spa_feat_desc_obj, feature, FEATURE_ACTION_INCR, tx));
 }
 
-/*
- * If the specified feature has not yet been enabled, this function returns
- * ENOTSUP; otherwise, this function decrements the feature's refcount (or
- * returns EOVERFLOW if the refcount is already 0). This function must
- * be called from syncing context.
- */
 void
 spa_feature_decr(spa_t *spa, zfeature_info_t *feature, dmu_tx_t *tx)
 {
+	ASSERT(dmu_tx_is_syncing(tx));
 	ASSERT3U(spa_version(spa), >=, SPA_VERSION_FEATURES);
 	VERIFY3U(0, ==, feature_do_action(spa->spa_meta_objset,
 	    spa->spa_feat_for_read_obj, spa->spa_feat_for_write_obj,
 	    spa->spa_feat_desc_obj, feature, FEATURE_ACTION_DECR, tx));
 }
 
+/*
+ * This interface is for debugging only. Normal consumers should use
+ * spa_feature_is_enabled/spa_feature_is_active.
+ */
+int
+spa_feature_get_refcount(spa_t *spa, zfeature_info_t *feature)
+{
+	int err;
+	uint64_t refcount;
+
+	if (spa_version(spa) < SPA_VERSION_FEATURES)
+		return (B_FALSE);
+
+	err = feature_get_refcount(spa->spa_meta_objset,
+	    spa->spa_feat_for_read_obj, spa->spa_feat_for_write_obj,
+	    feature, &refcount);
+	ASSERT(err == 0 || err == ENOTSUP);
+	return (err == 0 ? refcount : 0);
+}
+
 boolean_t
 spa_feature_is_enabled(spa_t *spa, zfeature_info_t *feature)
 {
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
index c07677560d4..1f7fee29a95 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
@@ -951,7 +951,6 @@ zfs_make_xattrdir(znode_t *zp, vattr_t *vap, vnode_t **xvpp, cred_t *cr)
 		return (SET_ERROR(EDQUOT));
 	}
 
-top:
 	tx = dmu_tx_create(zfsvfs->z_os);
 	dmu_tx_hold_sa_create(tx, acl_ids.z_aclp->z_acl_bytes +
 	    ZFS_SA_BASE_ATTR_SIZE);
@@ -960,13 +959,8 @@ top:
 	fuid_dirtied = zfsvfs->z_fuid_dirty;
 	if (fuid_dirtied)
 		zfs_fuid_txhold(zfsvfs, tx);
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, TXG_WAIT);
 	if (error) {
-		if (error == ERESTART) {
-			dmu_tx_wait(tx);
-			dmu_tx_abort(tx);
-			goto top;
-		}
 		zfs_acl_ids_free(&acl_ids);
 		dmu_tx_abort(tx);
 		return (error);
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 d9dacbf6b4a..03398011455 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
@@ -71,7 +71,6 @@
 #include <sys/kidmap.h>
 #include <sys/bio.h>
 #include <sys/buf.h>
-#include <sys/sf_buf.h>
 #include <sys/sched.h>
 #include <sys/acl.h>
 #include <vm/vm_param.h>
@@ -107,11 +106,18 @@
  *  (3)	All range locks must be grabbed before calling dmu_tx_assign(),
  *	as they can span dmu_tx_assign() calls.
  *
- *  (4)	Always pass TXG_NOWAIT as the second argument to dmu_tx_assign().
- *	This is critical because we don't want to block while holding locks.
- *	Note, in particular, that if a lock is sometimes acquired before
- *	the tx assigns, and sometimes after (e.g. z_lock), then failing to
- *	use a non-blocking assign can deadlock the system.  The scenario:
+ *  (4) If ZPL locks are held, pass TXG_NOWAIT as the second argument to
+ *      dmu_tx_assign().  This is critical because we don't want to block
+ *      while holding locks.
+ *
+ *	If no ZPL locks are held (aside from ZFS_ENTER()), use TXG_WAIT.  This
+ *	reduces lock contention and CPU usage when we must wait (note that if
+ *	throughput is constrained by the storage, nearly every transaction
+ *	must wait).
+ *
+ *      Note, in particular, that if a lock is sometimes acquired before
+ *      the tx assigns, and sometimes after (e.g. z_lock), then failing
+ *      to use a non-blocking assign can deadlock the system.  The scenario:
  *
  *	Thread A has grabbed a lock before calling dmu_tx_assign().
  *	Thread B is in an already-assigned tx, and blocks for this lock.
@@ -119,7 +125,11 @@
  *	forever, because the previous txg can't quiesce until B's tx commits.
  *
  *	If dmu_tx_assign() returns ERESTART and zfsvfs->z_assign is TXG_NOWAIT,
- *	then drop all locks, call dmu_tx_wait(), and try again.
+ *	then drop all locks, call dmu_tx_wait(), and try again.  On subsequent
+ *	calls to dmu_tx_assign(), pass TXG_WAITED rather than TXG_NOWAIT,
+ *	to indicate that this operation has already called dmu_tx_wait().
+ *	This will ensure that we don't retry forever, waiting a short bit
+ *	each time.
  *
  *  (5)	If the operation succeeded, generate the intent log entry for it
  *	before dropping locks.  This ensures that the ordering of events
@@ -141,12 +151,13 @@
  *	rw_enter(...);			// grab any other locks you need
  *	tx = dmu_tx_create(...);	// get DMU tx
  *	dmu_tx_hold_*();		// hold each object you might modify
- *	error = dmu_tx_assign(tx, TXG_NOWAIT);	// try to assign
+ *	error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
  *	if (error) {
  *		rw_exit(...);		// drop locks
  *		zfs_dirent_unlock(dl);	// unlock directory entry
  *		VN_RELE(...);		// release held vnodes
  *		if (error == ERESTART) {
+ *			waited = B_TRUE;
  *			dmu_tx_wait(tx);
  *			dmu_tx_abort(tx);
  *			goto top;
@@ -329,6 +340,20 @@ page_busy(vnode_t *vp, int64_t start, int64_t off, int64_t nbytes)
 {
 	vm_object_t obj;
 	vm_page_t pp;
+	int64_t end;
+
+	/*
+	 * At present vm_page_clear_dirty extends the cleared range to DEV_BSIZE
+	 * aligned boundaries, if the range is not aligned.  As a result a
+	 * DEV_BSIZE subrange with partially dirty data may get marked as clean.
+	 * It may happen that all DEV_BSIZE subranges are marked clean and thus
+	 * the whole page would be considred clean despite have some dirty data.
+	 * For this reason we should shrink the range to DEV_BSIZE aligned
+	 * boundaries before calling vm_page_clear_dirty.
+	 */
+	end = rounddown2(off + nbytes, DEV_BSIZE);
+	off = roundup2(off, DEV_BSIZE);
+	nbytes = end - off;
 
 	obj = vp->v_object;
 	zfs_vmobject_assert_wlocked(obj);
@@ -363,7 +388,8 @@ page_busy(vnode_t *vp, int64_t start, int64_t off, int64_t nbytes)
 			ASSERT3U(pp->valid, ==, VM_PAGE_BITS_ALL);
 			vm_object_pip_add(obj, 1);
 			pmap_remove_write(pp);
-			vm_page_clear_dirty(pp, off, nbytes);
+			if (nbytes != 0)
+				vm_page_clear_dirty(pp, off, nbytes);
 		}
 		break;
 	}
@@ -425,21 +451,6 @@ page_unhold(vm_page_t pp)
 	vm_page_unlock(pp);
 }
 
-static caddr_t
-zfs_map_page(vm_page_t pp, struct sf_buf **sfp)
-{
-
-	*sfp = sf_buf_alloc(pp, 0);
-	return ((caddr_t)sf_buf_kva(*sfp));
-}
-
-static void
-zfs_unmap_page(struct sf_buf *sf)
-{
-
-	sf_buf_free(sf);
-}
-
 /*
  * When a file is memory mapped, we must keep the IO data synchronized
  * between the DMU cache and the memory mapped pages.  What this means:
@@ -456,6 +467,7 @@ update_pages(vnode_t *vp, int64_t start, int len, objset_t *os, uint64_t oid,
 	caddr_t va;
 	int off;
 
+	ASSERT(segflg != UIO_NOCOPY);
 	ASSERT(vp->v_mount != NULL);
 	obj = vp->v_object;
 	ASSERT(obj != NULL);
@@ -466,27 +478,7 @@ update_pages(vnode_t *vp, int64_t start, int len, objset_t *os, uint64_t oid,
 		vm_page_t pp;
 		int nbytes = imin(PAGESIZE - off, len);
 
-		if (segflg == UIO_NOCOPY) {
-			pp = vm_page_lookup(obj, OFF_TO_IDX(start));
-			KASSERT(pp != NULL,
-			    ("zfs update_pages: NULL page in putpages case"));
-			KASSERT(off == 0,
-			    ("zfs update_pages: unaligned data in putpages case"));
-			KASSERT(pp->valid == VM_PAGE_BITS_ALL,
-			    ("zfs update_pages: invalid page in putpages case"));
-			KASSERT(vm_page_sbusied(pp),
-			    ("zfs update_pages: unbusy page in putpages case"));
-			KASSERT(!pmap_page_is_write_mapped(pp),
-			    ("zfs update_pages: writable page in putpages case"));
-			zfs_vmobject_wunlock(obj);
-
-			va = zfs_map_page(pp, &sf);
-			(void) dmu_write(os, oid, start, nbytes, va, tx);
-			zfs_unmap_page(sf);
-
-			zfs_vmobject_wlock(obj);
-			vm_page_undirty(pp);
-		} else if ((pp = page_busy(vp, start, off, nbytes)) != NULL) {
+		if ((pp = page_busy(vp, start, off, nbytes)) != NULL) {
 			zfs_vmobject_wunlock(obj);
 
 			va = zfs_map_page(pp, &sf);
@@ -500,8 +492,7 @@ update_pages(vnode_t *vp, int64_t start, int len, objset_t *os, uint64_t oid,
 		len -= nbytes;
 		off = 0;
 	}
-	if (segflg != UIO_NOCOPY)
-		vm_object_pip_wakeupn(obj, 0);
+	vm_object_pip_wakeupn(obj, 0);
 	zfs_vmobject_wunlock(obj);
 }
 
@@ -560,8 +551,10 @@ mappedread_sf(vnode_t *vp, int nbytes, uio_t *uio)
 				vm_page_activate(pp);
 			}
 			vm_page_unlock(pp);
-		} else
+		} else {
+			ASSERT3U(pp->valid, ==, VM_PAGE_BITS_ALL);
 			vm_page_sunbusy(pp);
+		}
 		if (error)
 			break;
 		uio->uio_resid -= bytes;
@@ -948,7 +941,6 @@ zfs_write(vnode_t *vp, uio_t *uio, int ioflag, cred_t *cr, caller_context_t *ct)
 	while (n > 0) {
 		abuf = NULL;
 		woff = uio->uio_loffset;
-again:
 		if (zfs_owner_overquota(zfsvfs, zp, B_FALSE) ||
 		    zfs_owner_overquota(zfsvfs, zp, B_TRUE)) {
 			if (abuf != NULL)
@@ -1000,13 +992,8 @@ again:
 		dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE);
 		dmu_tx_hold_write(tx, zp->z_id, woff, MIN(n, max_blksz));
 		zfs_sa_upgrade_txholds(tx, zp);
-		error = dmu_tx_assign(tx, TXG_NOWAIT);
+		error = dmu_tx_assign(tx, TXG_WAIT);
 		if (error) {
-			if (error == ERESTART) {
-				dmu_tx_wait(tx);
-				dmu_tx_abort(tx);
-				goto again;
-			}
 			dmu_tx_abort(tx);
 			if (abuf != NULL)
 				dmu_return_arcbuf(abuf);
@@ -1600,6 +1587,7 @@ zfs_create(vnode_t *dvp, char *name, vattr_t *vap, int excl, int mode,
 	zfs_acl_ids_t   acl_ids;
 	boolean_t	fuid_dirtied;
 	boolean_t	have_acl = B_FALSE;
+	boolean_t	waited = B_FALSE;
 	void		*vsecp = NULL;
 	int		flag = 0;
 
@@ -1722,10 +1710,11 @@ top:
 			dmu_tx_hold_write(tx, DMU_NEW_OBJECT,
 			    0, acl_ids.z_aclp->z_acl_bytes);
 		}
-		error = dmu_tx_assign(tx, TXG_NOWAIT);
+		error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
 		if (error) {
 			zfs_dirent_unlock(dl);
 			if (error == ERESTART) {
+				waited = B_TRUE;
 				dmu_tx_wait(tx);
 				dmu_tx_abort(tx);
 				goto top;
@@ -1856,6 +1845,7 @@ zfs_remove(vnode_t *dvp, char *name, cred_t *cr, caller_context_t *ct,
 	pathname_t	realnm;
 	int		error;
 	int		zflg = ZEXISTS;
+	boolean_t	waited = B_FALSE;
 
 	ZFS_ENTER(zfsvfs);
 	ZFS_VERIFY_ZP(dzp);
@@ -1944,13 +1934,14 @@ top:
 	/* charge as an update -- would be nice not to charge at all */
 	dmu_tx_hold_zap(tx, zfsvfs->z_unlinkedobj, FALSE, NULL);
 
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
 	if (error) {
 		zfs_dirent_unlock(dl);
 		VN_RELE(vp);
 		if (xzp)
 			VN_RELE(ZTOV(xzp));
 		if (error == ERESTART) {
+			waited = B_TRUE;
 			dmu_tx_wait(tx);
 			dmu_tx_abort(tx);
 			goto top;
@@ -2090,6 +2081,7 @@ zfs_mkdir(vnode_t *dvp, char *dirname, vattr_t *vap, vnode_t **vpp, cred_t *cr,
 	gid_t		gid = crgetgid(cr);
 	zfs_acl_ids_t   acl_ids;
 	boolean_t	fuid_dirtied;
+	boolean_t	waited = B_FALSE;
 
 	ASSERT(vap->va_type == VDIR);
 
@@ -2186,10 +2178,11 @@ top:
 	dmu_tx_hold_sa_create(tx, acl_ids.z_aclp->z_acl_bytes +
 	    ZFS_SA_BASE_ATTR_SIZE);
 
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
 	if (error) {
 		zfs_dirent_unlock(dl);
 		if (error == ERESTART) {
+			waited = B_TRUE;
 			dmu_tx_wait(tx);
 			dmu_tx_abort(tx);
 			goto top;
@@ -2265,6 +2258,7 @@ zfs_rmdir(vnode_t *dvp, char *name, vnode_t *cwd, cred_t *cr,
 	dmu_tx_t	*tx;
 	int		error;
 	int		zflg = ZEXISTS;
+	boolean_t	waited = B_FALSE;
 
 	ZFS_ENTER(zfsvfs);
 	ZFS_VERIFY_ZP(dzp);
@@ -2320,13 +2314,14 @@ top:
 	dmu_tx_hold_zap(tx, zfsvfs->z_unlinkedobj, FALSE, NULL);
 	zfs_sa_upgrade_txholds(tx, zp);
 	zfs_sa_upgrade_txholds(tx, dzp);
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
 	if (error) {
 		rw_exit(&zp->z_parent_lock);
 		rw_exit(&zp->z_name_lock);
 		zfs_dirent_unlock(dl);
 		VN_RELE(vp);
 		if (error == ERESTART) {
+			waited = B_TRUE;
 			dmu_tx_wait(tx);
 			dmu_tx_abort(tx);
 			goto top;
@@ -3382,12 +3377,9 @@ top:
 
 	zfs_sa_upgrade_txholds(tx, zp);
 
-	err = dmu_tx_assign(tx, TXG_NOWAIT);
-	if (err) {
-		if (err == ERESTART)
-			dmu_tx_wait(tx);
+	err = dmu_tx_assign(tx, TXG_WAIT);
+	if (err)
 		goto out;
-	}
 
 	count = 0;
 	/*
@@ -3717,6 +3709,7 @@ zfs_rename(vnode_t *sdvp, char *snm, vnode_t *tdvp, char *tnm, cred_t *cr,
 	int		cmp, serr, terr;
 	int		error = 0;
 	int		zflg = 0;
+	boolean_t	waited = B_FALSE;
 
 	ZFS_ENTER(zfsvfs);
 	ZFS_VERIFY_ZP(sdzp);
@@ -3959,7 +3952,7 @@ top:
 
 	zfs_sa_upgrade_txholds(tx, szp);
 	dmu_tx_hold_zap(tx, zfsvfs->z_unlinkedobj, FALSE, NULL);
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
 	if (error) {
 		if (zl != NULL)
 			zfs_rename_unlock(&zl);
@@ -3973,6 +3966,7 @@ top:
 		if (tzp)
 			VN_RELE(ZTOV(tzp));
 		if (error == ERESTART) {
+			waited = B_TRUE;
 			dmu_tx_wait(tx);
 			dmu_tx_abort(tx);
 			goto top;
@@ -4088,6 +4082,7 @@ zfs_symlink(vnode_t *dvp, vnode_t **vpp, char *name, vattr_t *vap, char *link,
 	zfs_acl_ids_t	acl_ids;
 	boolean_t	fuid_dirtied;
 	uint64_t	txtype = TX_SYMLINK;
+	boolean_t	waited = B_FALSE;
 	int		flags = 0;
 
 	ASSERT(vap->va_type == VLNK);
@@ -4151,10 +4146,11 @@ top:
 	}
 	if (fuid_dirtied)
 		zfs_fuid_txhold(zfsvfs, tx);
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
 	if (error) {
 		zfs_dirent_unlock(dl);
 		if (error == ERESTART) {
+			waited = B_TRUE;
 			dmu_tx_wait(tx);
 			dmu_tx_abort(tx);
 			goto top;
@@ -4280,6 +4276,7 @@ zfs_link(vnode_t *tdvp, vnode_t *svp, char *name, cred_t *cr,
 	int		zf = ZNEW;
 	uint64_t	parent;
 	uid_t		owner;
+	boolean_t	waited = B_FALSE;
 
 	ASSERT(tdvp->v_type == VDIR);
 
@@ -4302,6 +4299,11 @@ zfs_link(vnode_t *tdvp, vnode_t *svp, char *name, cred_t *cr,
 	szp = VTOZ(svp);
 	ZFS_VERIFY_ZP(szp);
 
+	if (szp->z_pflags & (ZFS_APPENDONLY | ZFS_IMMUTABLE | ZFS_READONLY)) {
+		ZFS_EXIT(zfsvfs);
+		return (SET_ERROR(EPERM));
+	}
+
 	/*
 	 * We check z_zfsvfs rather than v_vfsp here, because snapshots and the
 	 * ctldir appear to have the same v_vfsp.
@@ -4369,10 +4371,11 @@ top:
 	dmu_tx_hold_zap(tx, dzp->z_id, TRUE, name);
 	zfs_sa_upgrade_txholds(tx, szp);
 	zfs_sa_upgrade_txholds(tx, dzp);
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, waited ? TXG_WAITED : TXG_NOWAIT);
 	if (error) {
 		zfs_dirent_unlock(dl);
 		if (error == ERESTART) {
+			waited = B_TRUE;
 			dmu_tx_wait(tx);
 			dmu_tx_abort(tx);
 			goto top;
@@ -4489,19 +4492,13 @@ zfs_putapage(vnode_t *vp, page_t *pp, u_offset_t *offp,
 		err = SET_ERROR(EDQUOT);
 		goto out;
 	}
-top:
 	tx = dmu_tx_create(zfsvfs->z_os);
 	dmu_tx_hold_write(tx, zp->z_id, off, len);
 
 	dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE);
 	zfs_sa_upgrade_txholds(tx, zp);
-	err = dmu_tx_assign(tx, TXG_NOWAIT);
+	err = dmu_tx_assign(tx, TXG_WAIT);
 	if (err != 0) {
-		if (err == ERESTART) {
-			dmu_tx_wait(tx);
-			dmu_tx_abort(tx);
-			goto top;
-		}
 		dmu_tx_abort(tx);
 		goto out;
 	}
@@ -5786,6 +5783,168 @@ zfs_freebsd_getpages(ap)
 	return (zfs_getpages(ap->a_vp, ap->a_m, ap->a_count, ap->a_reqpage));
 }
 
+static int
+zfs_putpages(struct vnode *vp, vm_page_t *ma, size_t len, int flags,
+    int *rtvals)
+{
+	znode_t		*zp = VTOZ(vp);
+	zfsvfs_t	*zfsvfs = zp->z_zfsvfs;
+	rl_t		*rl;
+	dmu_tx_t	*tx;
+	struct sf_buf	*sf;
+	vm_object_t	object;
+	vm_page_t	m;
+	caddr_t		va;
+	size_t		tocopy;
+	size_t		lo_len;
+	vm_ooffset_t	lo_off;
+	vm_ooffset_t	off;
+	uint_t		blksz;
+	int		ncount;
+	int		pcount;
+	int		err;
+	int		i;
+
+	ZFS_ENTER(zfsvfs);
+	ZFS_VERIFY_ZP(zp);
+
+	object = vp->v_object;
+	pcount = btoc(len);
+	ncount = pcount;
+
+	KASSERT(ma[0]->object == object, ("mismatching object"));
+	KASSERT(len > 0 && (len & PAGE_MASK) == 0, ("unexpected length"));
+
+	for (i = 0; i < pcount; i++)
+		rtvals[i] = zfs_vm_pagerret_error;
+
+	off = IDX_TO_OFF(ma[0]->pindex);
+	blksz = zp->z_blksz;
+	lo_off = rounddown(off, blksz);
+	lo_len = roundup(len + (off - lo_off), blksz);
+	rl = zfs_range_lock(zp, lo_off, lo_len, RL_WRITER);
+
+	zfs_vmobject_wlock(object);
+	if (len + off > object->un_pager.vnp.vnp_size) {
+		if (object->un_pager.vnp.vnp_size > off) {
+			int pgoff;
+
+			len = object->un_pager.vnp.vnp_size - off;
+			ncount = btoc(len);
+			if ((pgoff = (int)len & PAGE_MASK) != 0) {
+				/*
+				 * If the object is locked and the following
+				 * conditions hold, then the page's dirty
+				 * field cannot be concurrently changed by a
+				 * pmap operation.
+				 */
+				m = ma[ncount - 1];
+				vm_page_assert_sbusied(m);
+				KASSERT(!pmap_page_is_write_mapped(m),
+				    ("zfs_putpages: page %p is not read-only", m));
+				vm_page_clear_dirty(m, pgoff, PAGE_SIZE -
+				    pgoff);
+			}
+		} else {
+			len = 0;
+			ncount = 0;
+		}
+		if (ncount < pcount) {
+			for (i = ncount; i < pcount; i++) {
+				rtvals[i] = zfs_vm_pagerret_bad;
+			}
+		}
+	}
+	zfs_vmobject_wunlock(object);
+
+	if (ncount == 0)
+		goto out;
+
+	if (zfs_owner_overquota(zfsvfs, zp, B_FALSE) ||
+	    zfs_owner_overquota(zfsvfs, zp, B_TRUE)) {
+		goto out;
+	}
+
+top:
+	tx = dmu_tx_create(zfsvfs->z_os);
+	dmu_tx_hold_write(tx, zp->z_id, off, len);
+
+	dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE);
+	zfs_sa_upgrade_txholds(tx, zp);
+	err = dmu_tx_assign(tx, TXG_NOWAIT);
+	if (err != 0) {
+		if (err == ERESTART) {
+			dmu_tx_wait(tx);
+			dmu_tx_abort(tx);
+			goto top;
+		}
+		dmu_tx_abort(tx);
+		goto out;
+	}
+
+	if (zp->z_blksz < PAGE_SIZE) {
+		i = 0;
+		for (i = 0; len > 0; off += tocopy, len -= tocopy, i++) {
+			tocopy = len > PAGE_SIZE ? PAGE_SIZE : len;
+			va = zfs_map_page(ma[i], &sf);
+			dmu_write(zfsvfs->z_os, zp->z_id, off, tocopy, va, tx);
+			zfs_unmap_page(sf);
+		}
+	} else {
+		err = dmu_write_pages(zfsvfs->z_os, zp->z_id, off, len, ma, tx);
+	}
+
+	if (err == 0) {
+		uint64_t mtime[2], ctime[2];
+		sa_bulk_attr_t bulk[3];
+		int count = 0;
+
+		SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zfsvfs), NULL,
+		    &mtime, 16);
+		SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zfsvfs), NULL,
+		    &ctime, 16);
+		SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_FLAGS(zfsvfs), NULL,
+		    &zp->z_pflags, 8);
+		zfs_tstamp_update_setup(zp, CONTENT_MODIFIED, mtime, ctime,
+		    B_TRUE);
+		zfs_log_write(zfsvfs->z_log, tx, TX_WRITE, zp, off, len, 0);
+
+		zfs_vmobject_wlock(object);
+		for (i = 0; i < ncount; i++) {
+			rtvals[i] = zfs_vm_pagerret_ok;
+			vm_page_undirty(ma[i]);
+		}
+		zfs_vmobject_wunlock(object);
+		PCPU_INC(cnt.v_vnodeout);
+		PCPU_ADD(cnt.v_vnodepgsout, ncount);
+	}
+	dmu_tx_commit(tx);
+
+out:
+	zfs_range_unlock(rl);
+	if ((flags & (zfs_vm_pagerput_sync | zfs_vm_pagerput_inval)) != 0 ||
+	    zfsvfs->z_os->os_sync == ZFS_SYNC_ALWAYS)
+		zil_commit(zfsvfs->z_log, zp->z_id);
+	ZFS_EXIT(zfsvfs);
+	return (rtvals[0]);
+}
+
+int
+zfs_freebsd_putpages(ap)
+	struct vop_putpages_args /* {
+		struct vnode *a_vp;
+		vm_page_t *a_m;
+		int a_count;
+		int a_sync;
+		int *a_rtvals;
+		vm_ooffset_t a_offset;
+	} */ *ap;
+{
+
+	return (zfs_putpages(ap->a_vp, ap->a_m, ap->a_count, ap->a_sync,
+	    ap->a_rtvals));
+}
+
 static int
 zfs_freebsd_bmap(ap)
 	struct vop_bmap_args /* {
@@ -6932,6 +7091,7 @@ struct vop_vector zfs_vnodeops = {
 	.vop_setacl =		zfs_freebsd_setacl,
 	.vop_aclcheck =		zfs_freebsd_aclcheck,
 	.vop_getpages =		zfs_freebsd_getpages,
+	.vop_putpages =		zfs_freebsd_putpages,
 };
 
 struct vop_vector zfs_fifoops = {
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
index ebb33373af9..a3a13380564 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
@@ -1536,7 +1536,6 @@ zfs_extend(znode_t *zp, uint64_t end)
 		zfs_range_unlock(rl);
 		return (0);
 	}
-top:
 	tx = dmu_tx_create(zfsvfs->z_os);
 	dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE);
 	zfs_sa_upgrade_txholds(tx, zp);
@@ -1556,13 +1555,8 @@ top:
 		newblksz = 0;
 	}
 
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, TXG_WAIT);
 	if (error) {
-		if (error == ERESTART) {
-			dmu_tx_wait(tx);
-			dmu_tx_abort(tx);
-			goto top;
-		}
 		dmu_tx_abort(tx);
 		zfs_range_unlock(rl);
 		return (error);
@@ -1670,17 +1664,11 @@ zfs_trunc(znode_t *zp, uint64_t end)
 		zfs_range_unlock(rl);
 		return (error);
 	}
-top:
 	tx = dmu_tx_create(zfsvfs->z_os);
 	dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE);
 	zfs_sa_upgrade_txholds(tx, zp);
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, TXG_WAIT);
 	if (error) {
-		if (error == ERESTART) {
-			dmu_tx_wait(tx);
-			dmu_tx_abort(tx);
-			goto top;
-		}
 		dmu_tx_abort(tx);
 		zfs_range_unlock(rl);
 		return (error);
@@ -1771,13 +1759,8 @@ log:
 	tx = dmu_tx_create(zfsvfs->z_os);
 	dmu_tx_hold_sa(tx, zp->z_sa_hdl, B_FALSE);
 	zfs_sa_upgrade_txholds(tx, zp);
-	error = dmu_tx_assign(tx, TXG_NOWAIT);
+	error = dmu_tx_assign(tx, TXG_WAIT);
 	if (error) {
-		if (error == ERESTART) {
-			dmu_tx_wait(tx);
-			dmu_tx_abort(tx);
-			goto log;
-		}
 		dmu_tx_abort(tx);
 		return (error);
 	}
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 7a731e9ad6d..b26ca3d6826 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
@@ -884,7 +884,7 @@ zil_lwb_write_init(zilog_t *zilog, lwb_t *lwb)
 	if (lwb->lwb_zio == NULL) {
 		lwb->lwb_zio = zio_rewrite(zilog->zl_root_zio, zilog->zl_spa,
 		    0, &lwb->lwb_blk, lwb->lwb_buf, BP_GET_LSIZE(&lwb->lwb_blk),
-		    zil_lwb_write_done, lwb, ZIO_PRIORITY_LOG_WRITE,
+		    zil_lwb_write_done, lwb, ZIO_PRIORITY_SYNC_WRITE,
 		    ZIO_FLAG_CANFAIL | ZIO_FLAG_DONT_PROPAGATE, &zb);
 	}
 }
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
index b92ceacd4ae..fe440af810b 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.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.
+ * Copyright (c) 2011 Nexenta Systems, Inc. All rights reserved.
  */
 
 #include <sys/zfs_context.h>
@@ -39,7 +40,11 @@
 
 SYSCTL_DECL(_vfs_zfs);
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, zio, CTLFLAG_RW, 0, "ZFS ZIO");
+#if defined(__amd64__)
+static int zio_use_uma = 1;
+#else
 static int zio_use_uma = 0;
+#endif
 TUNABLE_INT("vfs.zfs.zio.use_uma", &zio_use_uma);
 SYSCTL_INT(_vfs_zfs_zio, OID_AUTO, use_uma, CTLFLAG_RDTUN, &zio_use_uma, 0,
     "Use uma(9) for ZIO allocations");
@@ -61,33 +66,12 @@ zio_trim_stats_t zio_trim_stats = {
 
 static kstat_t *zio_trim_ksp;
 
-/*
- * ==========================================================================
- * I/O priority table
- * ==========================================================================
- */
-uint8_t zio_priority_table[ZIO_PRIORITY_TABLE_SIZE] = {
-	0,	/* ZIO_PRIORITY_NOW		*/
-	0,	/* ZIO_PRIORITY_SYNC_READ	*/
-	0,	/* ZIO_PRIORITY_SYNC_WRITE	*/
-	0,	/* ZIO_PRIORITY_LOG_WRITE	*/
-	1,	/* ZIO_PRIORITY_CACHE_FILL	*/
-	1,	/* ZIO_PRIORITY_AGG		*/
-	4,	/* ZIO_PRIORITY_FREE		*/
-	4,	/* ZIO_PRIORITY_ASYNC_WRITE	*/
-	6,	/* ZIO_PRIORITY_ASYNC_READ	*/
-	10,	/* ZIO_PRIORITY_RESILVER	*/
-	20,	/* ZIO_PRIORITY_SCRUB		*/
-	2,	/* ZIO_PRIORITY_DDT_PREFETCH	*/
-	30,	/* ZIO_PRIORITY_TRIM		*/
-};
-
 /*
  * ==========================================================================
  * I/O type descriptions
  * ==========================================================================
  */
-char *zio_type_name[ZIO_TYPES] = {
+const char *zio_type_name[ZIO_TYPES] = {
 	"zio_null", "zio_read", "zio_write", "zio_free", "zio_claim",
 	"zio_ioctl"
 };
@@ -551,7 +535,10 @@ zio_notify_parent(zio_t *pio, zio_t *zio, enum zio_wait_type wait)
 		*errorp = zio_worst_error(*errorp, zio->io_error);
 	pio->io_reexecute |= zio->io_reexecute;
 	ASSERT3U(*countp, >, 0);
-	if (--*countp == 0 && pio->io_stall == countp) {
+
+	(*countp)--;
+
+	if (*countp == 0 && pio->io_stall == countp) {
 		pio->io_stall = NULL;
 		mutex_exit(&pio->io_lock);
 		zio_execute(pio);
@@ -575,7 +562,7 @@ zio_inherit_child_errors(zio_t *zio, enum zio_child c)
 static zio_t *
 zio_create(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
     void *data, uint64_t size, zio_done_func_t *done, void *private,
-    zio_type_t type, int priority, enum zio_flag flags,
+    zio_type_t type, zio_priority_t priority, enum zio_flag flags,
     vdev_t *vd, uint64_t offset, const zbookmark_t *zb,
     enum zio_stage stage, enum zio_stage pipeline)
 {
@@ -685,7 +672,7 @@ zio_root(spa_t *spa, zio_done_func_t *done, void *private, enum zio_flag flags)
 zio_t *
 zio_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
     void *data, uint64_t size, zio_done_func_t *done, void *private,
-    int priority, enum zio_flag flags, const zbookmark_t *zb)
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb)
 {
 	zio_t *zio;
 
@@ -701,8 +688,9 @@ zio_read(zio_t *pio, spa_t *spa, const blkptr_t *bp,
 zio_t *
 zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
     void *data, uint64_t size, const zio_prop_t *zp,
-    zio_done_func_t *ready, zio_done_func_t *done, void *private,
-    int priority, enum zio_flag flags, const zbookmark_t *zb)
+    zio_done_func_t *ready, zio_done_func_t *physdone, zio_done_func_t *done,
+    void *private,
+    zio_priority_t priority, enum zio_flag flags, const zbookmark_t *zb)
 {
 	zio_t *zio;
 
@@ -721,6 +709,7 @@ zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
 	    ZIO_DDT_CHILD_WRITE_PIPELINE : ZIO_WRITE_PIPELINE);
 
 	zio->io_ready = ready;
+	zio->io_physdone = physdone;
 	zio->io_prop = *zp;
 
 	return (zio);
@@ -728,8 +717,8 @@ zio_write(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp,
 
 zio_t *
 zio_rewrite(zio_t *pio, spa_t *spa, uint64_t txg, blkptr_t *bp, void *data,
-    uint64_t size, zio_done_func_t *done, void *private, int priority,
-    enum zio_flag flags, zbookmark_t *zb)
+    uint64_t size, zio_done_func_t *done, void *private,
+    zio_priority_t priority, enum zio_flag flags, zbookmark_t *zb)
 {
 	zio_t *zio;
 
@@ -809,7 +798,7 @@ zio_free_sync(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
 		stage |= ZIO_STAGE_ISSUE_ASYNC;
 
 	zio = zio_create(pio, spa, txg, bp, NULL, size,
-	    NULL, NULL, ZIO_TYPE_FREE, ZIO_PRIORITY_FREE, flags,
+	    NULL, NULL, ZIO_TYPE_FREE, ZIO_PRIORITY_NOW, flags,
 	    NULL, 0, NULL, ZIO_STAGE_OPEN, stage);
 
 	return (zio);
@@ -846,7 +835,7 @@ zio_claim(zio_t *pio, spa_t *spa, uint64_t txg, const blkptr_t *bp,
 
 zio_t *
 zio_ioctl(zio_t *pio, spa_t *spa, vdev_t *vd, int cmd, uint64_t offset,
-    uint64_t size, zio_done_func_t *done, void *private, int priority,
+    uint64_t size, zio_done_func_t *done, void *private,
     enum zio_flag flags)
 {
 	zio_t *zio;
@@ -854,7 +843,7 @@ zio_ioctl(zio_t *pio, spa_t *spa, vdev_t *vd, int cmd, uint64_t offset,
 
 	if (vd->vdev_children == 0) {
 		zio = zio_create(pio, spa, 0, NULL, NULL, size, done, private,
-		    ZIO_TYPE_IOCTL, priority, flags, vd, offset, NULL,
+		    ZIO_TYPE_IOCTL, ZIO_PRIORITY_NOW, flags, vd, offset, NULL,
 		    ZIO_STAGE_OPEN, ZIO_IOCTL_PIPELINE);
 
 		zio->io_cmd = cmd;
@@ -863,7 +852,7 @@ zio_ioctl(zio_t *pio, spa_t *spa, vdev_t *vd, int cmd, uint64_t offset,
 
 		for (c = 0; c < vd->vdev_children; c++)
 			zio_nowait(zio_ioctl(zio, spa, vd->vdev_child[c], cmd,
-			    offset, size, done, private, priority, flags));
+			    offset, size, done, private, flags));
 	}
 
 	return (zio);
@@ -872,7 +861,7 @@ zio_ioctl(zio_t *pio, spa_t *spa, vdev_t *vd, int cmd, uint64_t offset,
 zio_t *
 zio_read_phys(zio_t *pio, vdev_t *vd, uint64_t offset, uint64_t size,
     void *data, int checksum, zio_done_func_t *done, void *private,
-    int priority, enum zio_flag flags, boolean_t labels)
+    zio_priority_t priority, enum zio_flag flags, boolean_t labels)
 {
 	zio_t *zio;
 
@@ -893,7 +882,7 @@ zio_read_phys(zio_t *pio, vdev_t *vd, uint64_t offset, uint64_t size,
 zio_t *
 zio_write_phys(zio_t *pio, vdev_t *vd, uint64_t offset, uint64_t size,
     void *data, int checksum, zio_done_func_t *done, void *private,
-    int priority, enum zio_flag flags, boolean_t labels)
+    zio_priority_t priority, enum zio_flag flags, boolean_t labels)
 {
 	zio_t *zio;
 
@@ -928,8 +917,8 @@ zio_write_phys(zio_t *pio, vdev_t *vd, uint64_t offset, uint64_t size,
  */
 zio_t *
 zio_vdev_child_io(zio_t *pio, blkptr_t *bp, vdev_t *vd, uint64_t offset,
-	void *data, uint64_t size, int type, int priority, enum zio_flag flags,
-	zio_done_func_t *done, void *private)
+	void *data, uint64_t size, int type, zio_priority_t priority,
+	enum zio_flag flags, zio_done_func_t *done, void *private)
 {
 	enum zio_stage pipeline = ZIO_VDEV_CHILD_PIPELINE;
 	zio_t *zio;
@@ -964,12 +953,16 @@ zio_vdev_child_io(zio_t *pio, blkptr_t *bp, vdev_t *vd, uint64_t offset,
 	    done, private, type, priority, flags, vd, offset, &pio->io_bookmark,
 	    ZIO_STAGE_VDEV_IO_START >> 1, pipeline);
 
+	zio->io_physdone = pio->io_physdone;
+	if (vd->vdev_ops->vdev_op_leaf && zio->io_logical != NULL)
+		zio->io_logical->io_phys_children++;
+
 	return (zio);
 }
 
 zio_t *
 zio_vdev_delegated_io(vdev_t *vd, uint64_t offset, void *data, uint64_t size,
-	int type, int priority, enum zio_flag flags,
+	int type, zio_priority_t priority, enum zio_flag flags,
 	zio_done_func_t *done, void *private)
 {
 	zio_t *zio;
@@ -978,7 +971,7 @@ zio_vdev_delegated_io(vdev_t *vd, uint64_t offset, void *data, uint64_t size,
 
 	zio = zio_create(NULL, vd->vdev_spa, 0, NULL,
 	    data, size, done, private, type, priority,
-	    flags | ZIO_FLAG_CANFAIL | ZIO_FLAG_DONT_RETRY,
+	    flags | ZIO_FLAG_CANFAIL | ZIO_FLAG_DONT_RETRY | ZIO_FLAG_DELEGATED,
 	    vd, offset, NULL,
 	    ZIO_STAGE_VDEV_IO_START >> 1, ZIO_VDEV_CHILD_PIPELINE);
 
@@ -989,7 +982,7 @@ void
 zio_flush(zio_t *zio, vdev_t *vd)
 {
 	zio_nowait(zio_ioctl(zio, zio->io_spa, vd, DKIOCFLUSHWRITECACHE, 0, 0,
-	    NULL, NULL, ZIO_PRIORITY_NOW,
+	    NULL, NULL,
 	    ZIO_FLAG_CANFAIL | ZIO_FLAG_DONT_PROPAGATE | ZIO_FLAG_DONT_RETRY));
 }
 
@@ -1000,7 +993,7 @@ zio_trim(zio_t *zio, spa_t *spa, vdev_t *vd, uint64_t offset, uint64_t size)
 	ASSERT(vd->vdev_ops->vdev_op_leaf);
 
 	return zio_ioctl(zio, spa, vd, DKIOCTRIM, offset, size,
-	    NULL, NULL, ZIO_PRIORITY_TRIM,
+	    NULL, NULL,
 	    ZIO_FLAG_CANFAIL | ZIO_FLAG_DONT_PROPAGATE | ZIO_FLAG_DONT_RETRY);
 }
 
@@ -1216,11 +1209,11 @@ zio_free_bp_init(zio_t *zio)
  */
 
 static void
-zio_taskq_dispatch(zio_t *zio, enum zio_taskq_type q, boolean_t cutinline)
+zio_taskq_dispatch(zio_t *zio, zio_taskq_type_t q, boolean_t cutinline)
 {
 	spa_t *spa = zio->io_spa;
 	zio_type_t t = zio->io_type;
-	int flags = TQ_SLEEP | (cutinline ? TQ_FRONT : 0);
+	int flags = (cutinline ? TQ_FRONT : 0);
 
 	ASSERT(q == ZIO_TASKQ_ISSUE || q == ZIO_TASKQ_INTERRUPT);
 
@@ -1239,31 +1232,43 @@ zio_taskq_dispatch(zio_t *zio, enum zio_taskq_type q, boolean_t cutinline)
 		t = ZIO_TYPE_NULL;
 
 	/*
-	 * If this is a high priority I/O, then use the high priority taskq.
+	 * If this is a high priority I/O, then use the high priority taskq if
+	 * available.
 	 */
 	if (zio->io_priority == ZIO_PRIORITY_NOW &&
-	    spa->spa_zio_taskq[t][q + 1] != NULL)
+	    spa->spa_zio_taskq[t][q + 1].stqs_count != 0)
 		q++;
 
 	ASSERT3U(q, <, ZIO_TASKQ_TYPES);
-#ifdef _KERNEL
-	(void) taskq_dispatch_safe(spa->spa_zio_taskq[t][q],
-	    (task_func_t *)zio_execute, zio, flags, &zio->io_task);
+
+	/*
+	 * NB: We are assuming that the zio can only be dispatched
+	 * to a single taskq at a time.  It would be a grievous error
+	 * to dispatch the zio to another taskq at the same time.
+	 */
+#if defined(illumos) || !defined(_KERNEL)
+	ASSERT(zio->io_tqent.tqent_next == NULL);
 #else
-	(void) taskq_dispatch(spa->spa_zio_taskq[t][q],
-	    (task_func_t *)zio_execute, zio, flags);
+	ASSERT(zio->io_tqent.tqent_task.ta_pending == 0);
 #endif
+	spa_taskq_dispatch_ent(spa, t, q, (task_func_t *)zio_execute, zio,
+	    flags, &zio->io_tqent);
 }
 
 static boolean_t
-zio_taskq_member(zio_t *zio, enum zio_taskq_type q)
+zio_taskq_member(zio_t *zio, zio_taskq_type_t q)
 {
 	kthread_t *executor = zio->io_executor;
 	spa_t *spa = zio->io_spa;
 
-	for (zio_type_t t = 0; t < ZIO_TYPES; t++)
-		if (taskq_member(spa->spa_zio_taskq[t][q], executor))
-			return (B_TRUE);
+	for (zio_type_t t = 0; t < ZIO_TYPES; t++) {
+		spa_taskqs_t *tqs = &spa->spa_zio_taskq[t][q];
+		uint_t i;
+		for (i = 0; i < tqs->stqs_count; i++) {
+			if (taskq_member(tqs->stqs_taskq[i], executor))
+				return (B_TRUE);
+		}
+	}
 
 	return (B_FALSE);
 }
@@ -1898,7 +1903,7 @@ zio_write_gang_block(zio_t *pio)
 
 		zio_nowait(zio_write(zio, spa, txg, &gbh->zg_blkptr[g],
 		    (char *)pio->io_data + (pio->io_size - resid), lsize, &zp,
-		    zio_write_gang_member_ready, NULL, &gn->gn_child[g],
+		    zio_write_gang_member_ready, NULL, NULL, &gn->gn_child[g],
 		    pio->io_priority, ZIO_GANG_CHILD_FLAGS(pio),
 		    &pio->io_bookmark));
 	}
@@ -2275,7 +2280,7 @@ zio_ddt_write(zio_t *zio)
 		}
 
 		dio = zio_write(zio, spa, txg, bp, zio->io_orig_data,
-		    zio->io_orig_size, &czp, NULL,
+		    zio->io_orig_size, &czp, NULL, NULL,
 		    zio_ddt_ditto_write_done, dde, zio->io_priority,
 		    ZIO_DDT_CHILD_FLAGS(zio), &zio->io_bookmark);
 
@@ -2297,7 +2302,7 @@ zio_ddt_write(zio_t *zio)
 		ddt_phys_addref(ddp);
 	} else {
 		cio = zio_write(zio, spa, txg, bp, zio->io_orig_data,
-		    zio->io_orig_size, zp, zio_ddt_child_write_ready,
+		    zio->io_orig_size, zp, zio_ddt_child_write_ready, NULL,
 		    zio_ddt_child_write_done, dde, zio->io_priority,
 		    ZIO_DDT_CHILD_FLAGS(zio), &zio->io_bookmark);
 
@@ -2453,7 +2458,7 @@ zio_alloc_zil(spa_t *spa, uint64_t txg, blkptr_t *new_bp, blkptr_t *old_bp,
 	if (error) {
 		error = metaslab_alloc(spa, spa_normal_class(spa), size,
 		    new_bp, 1, txg, old_bp,
-		    METASLAB_HINTBP_AVOID | METASLAB_GANG_AVOID);
+		    METASLAB_HINTBP_AVOID);
 	}
 
 	if (error == 0) {
@@ -2754,6 +2759,13 @@ zio_vdev_io_assess(zio_t *zio)
 	if (zio->io_error)
 		zio->io_pipeline = ZIO_INTERLOCK_PIPELINE;
 
+	if (vd != NULL && vd->vdev_ops->vdev_op_leaf &&
+	    zio->io_physdone != NULL) {
+		ASSERT(!(zio->io_flags & ZIO_FLAG_DELEGATED));
+		ASSERT(zio->io_child_type == ZIO_CHILD_VDEV);
+		zio->io_physdone(zio->io_logical);
+	}
+
 	return (ZIO_PIPELINE_CONTINUE);
 }
 
@@ -3170,16 +3182,14 @@ zio_done(zio_t *zio)
 			 * Reexecution is potentially a huge amount of work.
 			 * Hand it off to the otherwise-unused claim taskq.
 			 */
-#ifdef _KERNEL
-			(void) taskq_dispatch_safe(
-			    spa->spa_zio_taskq[ZIO_TYPE_CLAIM][ZIO_TASKQ_ISSUE],
-			    (task_func_t *)zio_reexecute, zio, TQ_SLEEP,
-			    &zio->io_task);
+#if defined(illumos) || !defined(_KERNEL)
+			ASSERT(zio->io_tqent.tqent_next == NULL);
 #else
-			(void) taskq_dispatch(
-			    spa->spa_zio_taskq[ZIO_TYPE_CLAIM][ZIO_TASKQ_ISSUE],
-			    (task_func_t *)zio_reexecute, zio, TQ_SLEEP);
+			ASSERT(zio->io_tqent.tqent_task.ta_pending == 0);
 #endif
+			spa_taskq_dispatch_ent(spa, ZIO_TYPE_CLAIM,
+			    ZIO_TASKQ_ISSUE, (task_func_t *)zio_reexecute, zio,
+			    0, &zio->io_tqent);
 		}
 		return (ZIO_PIPELINE_STOP);
 	}
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 72d45025a88..753927da6b6 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
@@ -2153,6 +2153,7 @@ zvol_geom_create(const char *name)
 	gp->start = zvol_geom_start;
 	gp->access = zvol_geom_access;
 	pp = g_new_providerf(gp, "%s/%s", ZVOL_DRIVER, name);
+	pp->flags |= G_PF_DIRECT_RECEIVE | G_PF_DIRECT_SEND;
 	pp->sectorsize = DEV_BSIZE;
 
 	zv = kmem_zalloc(sizeof(*zv), KM_SLEEP);
@@ -2256,18 +2257,20 @@ zvol_geom_start(struct bio *bp)
 	zvol_state_t *zv;
 	boolean_t first;
 
+	zv = bp->bio_to->private;
+	ASSERT(zv != NULL);
 	switch (bp->bio_cmd) {
+	case BIO_FLUSH:
+		if (!THREAD_CAN_SLEEP())
+			goto enqueue;
+		zil_commit(zv->zv_zilog, ZVOL_OBJ);
+		g_io_deliver(bp, 0);
+		break;
 	case BIO_READ:
 	case BIO_WRITE:
-	case BIO_FLUSH:
-		zv = bp->bio_to->private;
-		ASSERT(zv != NULL);
-		mtx_lock(&zv->zv_queue_mtx);
-		first = (bioq_first(&zv->zv_queue) == NULL);
-		bioq_insert_tail(&zv->zv_queue, bp);
-		mtx_unlock(&zv->zv_queue_mtx);
-		if (first)
-			wakeup_one(&zv->zv_queue);
+		if (!THREAD_CAN_SLEEP())
+			goto enqueue;
+		zvol_strategy(bp);
 		break;
 	case BIO_GETATTR:
 	case BIO_DELETE:
@@ -2275,6 +2278,15 @@ zvol_geom_start(struct bio *bp)
 		g_io_deliver(bp, EOPNOTSUPP);
 		break;
 	}
+	return;
+
+enqueue:
+	mtx_lock(&zv->zv_queue_mtx);
+	first = (bioq_first(&zv->zv_queue) == NULL);
+	bioq_insert_tail(&zv->zv_queue, bp);
+	mtx_unlock(&zv->zv_queue_mtx);
+	if (first)
+		wakeup_one(&zv->zv_queue);
 }
 
 static void
@@ -2449,6 +2461,7 @@ zvol_rename_minor(struct g_geom *gp, const char *newname)
 	g_wither_provider(pp, ENXIO);
 
 	pp = g_new_providerf(gp, "%s/%s", ZVOL_DRIVER, newname);
+	pp->flags |= G_PF_DIRECT_RECEIVE | G_PF_DIRECT_SEND;
 	pp->sectorsize = DEV_BSIZE;
 	pp->mediasize = zv->zv_volsize;
 	pp->private = zv;
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
index 8728e300df9..295457c634a 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h
@@ -311,8 +311,9 @@ typedef enum dtrace_probespec {
 #define	DIF_SUBR_SX_SHARED_HELD		48
 #define	DIF_SUBR_SX_EXCLUSIVE_HELD	49
 #define	DIF_SUBR_SX_ISEXCLUSIVE		50
+#define	DIF_SUBR_MEMSTR			51
 
-#define	DIF_SUBR_MAX			50	/* max subroutine value */
+#define	DIF_SUBR_MAX			51	/* max subroutine value */
 
 typedef uint32_t dif_instr_t;
 
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h b/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h
index 58967fd6c12..431307f46a2 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h
@@ -42,8 +42,8 @@ extern "C" {
 #define	FASTTRAPIOC_MAKEPROBE	(FASTTRAPIOC | 1)
 #define	FASTTRAPIOC_GETINSTR	(FASTTRAPIOC | 2)
 #else
-#define	FASTTRAPIOC_MAKEPROBE	_IOW('f', 1, fasttrap_probe_spec_t)
 #define	FASTTRAPIOC_GETINSTR	_IOWR('f', 2, uint8_t)
+#define	FASTTRAPIOC_MAKEPROBE	_IO('f', 3)
 #endif
 
 typedef enum fasttrap_probe_type {
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h b/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
index a4e51fd04d6..6512da788da 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
@@ -158,15 +158,15 @@ typedef struct fasttrap_hash {
  */
 #define	fasttrap_copyout	copyout
 #define	fasttrap_fuword32	fuword32
-#define	fasttrap_suword32(_k, _u)	copyout((_k), (_u), sizeof(uint32_t))
-#define	fasttrap_suword64(_k, _u)	copyout((_k), (_u), sizeof(uint64_t))
+#define	fasttrap_suword32	suword32
+#define	fasttrap_suword64	suword64
 
 #ifdef __amd64__
 #define	fasttrap_fulword	fuword64
-#define	fasttrap_sulword	fasttrap_suword64
+#define	fasttrap_sulword	suword64
 #else
 #define	fasttrap_fulword	fuword32
-#define	fasttrap_sulword	fasttrap_suword32
+#define	fasttrap_sulword	suword32
 #endif
 
 extern void fasttrap_sigtrap(proc_t *, kthread_t *, uintptr_t);
diff --git a/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h b/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h
index fb3f76d7765..1d8bfd671db 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h
+++ b/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h
@@ -45,6 +45,12 @@ typedef struct taskq taskq_t;
 typedef uintptr_t taskqid_t;
 typedef void (task_func_t)(void *);
 
+typedef struct taskq_ent {
+	struct task	 tqent_task;
+	task_func_t	*tqent_func;
+	void		*tqent_arg;
+} taskq_ent_t;
+
 struct proc;
 
 /*
@@ -70,24 +76,25 @@ struct proc;
 
 extern taskq_t *system_taskq;
 
-extern void	taskq_init(void);
-extern void	taskq_mp_init(void);
+void	taskq_init(void);
+void	taskq_mp_init(void);
 
-extern taskq_t	*taskq_create(const char *, int, pri_t, int, int, uint_t);
-extern taskq_t	*taskq_create_instance(const char *, int, int, pri_t, int,
-    int, uint_t);
-extern taskq_t	*taskq_create_proc(const char *, int, pri_t, int, int,
+taskq_t	*taskq_create(const char *, int, pri_t, int, int, uint_t);
+taskq_t	*taskq_create_instance(const char *, int, int, pri_t, int, int, uint_t);
+taskq_t	*taskq_create_proc(const char *, int, pri_t, int, int,
     struct proc *, uint_t);
-extern taskq_t	*taskq_create_sysdc(const char *, int, int, int,
+taskq_t	*taskq_create_sysdc(const char *, int, int, int,
     struct proc *, uint_t, uint_t);
-extern taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t);
-extern void	nulltask(void *);
-extern void	taskq_destroy(taskq_t *);
-extern void	taskq_wait(taskq_t *);
-extern void	taskq_suspend(taskq_t *);
-extern int	taskq_suspended(taskq_t *);
-extern void	taskq_resume(taskq_t *);
-extern int	taskq_member(taskq_t *, kthread_t *);
+taskqid_t taskq_dispatch(taskq_t *, task_func_t, void *, uint_t);
+void	taskq_dispatch_ent(taskq_t *, task_func_t, void *, uint_t,
+    taskq_ent_t *);
+void	nulltask(void *);
+void	taskq_destroy(taskq_t *);
+void	taskq_wait(taskq_t *);
+void	taskq_suspend(taskq_t *);
+int	taskq_suspended(taskq_t *);
+void	taskq_resume(taskq_t *);
+int	taskq_member(taskq_t *, kthread_t *);
 
 #endif	/* _KERNEL */
 
diff --git a/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c b/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
index 65991aff025..0063a4ba708 100644
--- a/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
+++ b/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
@@ -104,6 +104,7 @@ uwrite(proc_t *p, void *kaddr, size_t len, uintptr_t uaddr)
 #define	r_rip	r_eip
 #define	r_rflags r_eflags
 #define	r_rsp	r_esp
+#define	r_rbp	r_ebp
 #endif
 
 /*
@@ -272,7 +273,20 @@ fasttrap_anarg(struct reg *rp, int function_entry, int argno)
 		 * registers.
 		 */
 		if (argno < 6)
-			return ((&rp->r_rdi)[argno]);
+			switch (argno) {
+			case 0:
+				return (rp->r_rdi);
+			case 1:
+				return (rp->r_rsi);
+			case 2:
+				return (rp->r_rdx);
+			case 3:
+				return (rp->r_rcx);
+			case 4:
+				return (rp->r_r8);
+			case 5:
+				return (rp->r_r9);
+			}
 
 		stack = (uintptr_t *)rp->r_rsp;
 		DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
@@ -1381,29 +1395,27 @@ fasttrap_pid_probe(struct reg *rp)
 	case FASTTRAP_T_PUSHL_EBP:
 	{
 		int ret = 0;
-		uintptr_t addr = 0;
 
 #ifdef __amd64
 		if (p->p_model == DATAMODEL_NATIVE) {
-			addr = rp->r_rsp - sizeof (uintptr_t);
-			ret = fasttrap_sulword((void *)addr, &rp->r_rsp);
+			rp->r_rsp -= sizeof (uintptr_t);
+			ret = fasttrap_sulword((void *)rp->r_rsp, rp->r_rbp);
 		} else {
 #endif
 #ifdef __i386__
-			addr = rp->r_rsp - sizeof (uint32_t);
-			ret = fasttrap_suword32((void *)addr, &rp->r_rsp);
+			rp->r_rsp -= sizeof (uint32_t);
+			ret = fasttrap_suword32((void *)rp->r_rsp, rp->r_rbp);
 #endif
 #ifdef __amd64
 		}
 #endif
 
 		if (ret == -1) {
-			fasttrap_sigsegv(p, curthread, addr);
+			fasttrap_sigsegv(p, curthread, rp->r_rsp);
 			new_pc = pc;
 			break;
 		}
 
-		rp->r_rsp = addr;
 		new_pc = pc + tp->ftt_size;
 		break;
 	}
@@ -1487,13 +1499,13 @@ fasttrap_pid_probe(struct reg *rp)
 			if (p->p_model == DATAMODEL_NATIVE) {
 				addr = rp->r_rsp - sizeof (uintptr_t);
 				pcps = pc + tp->ftt_size;
-				ret = fasttrap_sulword((void *)addr, &pcps);
+				ret = fasttrap_sulword((void *)addr, pcps);
 			} else {
 #endif
 #ifdef __i386__
 				addr = rp->r_rsp - sizeof (uint32_t);
 				pcps = (uint32_t)(pc + tp->ftt_size);
-				ret = fasttrap_suword32((void *)addr, &pcps);
+				ret = fasttrap_suword32((void *)addr, pcps);
 #endif
 #ifdef __amd64
 			}
diff --git a/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c b/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
index 36115ea0743..c035c99f55a 100644
--- a/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
+++ b/sys/cddl/contrib/opensolaris/uts/powerpc/dtrace/fasttrap_isa.c
@@ -18,13 +18,560 @@
  *
  * CDDL HEADER END
  */
-
+/* Portions Copyright 2013 Justin Hibbits */
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+#include <sys/fasttrap_isa.h>
+#include <sys/fasttrap_impl.h>
+#include <sys/dtrace.h>
+#include <sys/dtrace_impl.h>
+#include <cddl/dev/dtrace/dtrace_cddl.h>
+#include <sys/proc.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/ptrace.h>
+#include <sys/sysent.h>
+
+#define OP(x)	((x) >> 26)
+#define OPX(x)	(((x) >> 2) & 0x3FF)
+#define OP_BO(x) (((x) & 0x03E00000) >> 21)
+#define OP_BI(x) (((x) & 0x001F0000) >> 16)
+#define OP_RS(x) (((x) & 0x03E00000) >> 21)
+#define OP_RA(x) (((x) & 0x001F0000) >> 16)
+#define OP_RB(x) (((x) & 0x0000F100) >> 11)
+
+
+static int
+proc_ops(int op, proc_t *p, void *kaddr, off_t uaddr, size_t len)
+{
+	struct iovec iov;
+	struct uio uio;
+
+	iov.iov_base = kaddr;
+	iov.iov_len = len;
+	uio.uio_offset = uaddr;
+	uio.uio_iov = &iov;
+	uio.uio_resid = len;
+	uio.uio_iovcnt = 1;
+	uio.uio_segflg = UIO_SYSSPACE;
+	uio.uio_td = curthread;
+	uio.uio_rw = op;
+	PHOLD(p);
+	if (proc_rwmem(p, &uio) < 0) {
+		PRELE(p);
+		return (-1);
+	}
+	PRELE(p);
+
+	return (0);
+}
+
+static int
+uread(proc_t *p, void *kaddr, size_t len, uintptr_t uaddr)
+{
+
+	return (proc_ops(UIO_READ, p, kaddr, uaddr, len));
+}
+
+static int
+uwrite(proc_t *p, void *kaddr, size_t len, uintptr_t uaddr)
+{
+
+	return (proc_ops(UIO_WRITE, p, kaddr, uaddr, len));
+}
+
+int
+fasttrap_tracepoint_install(proc_t *p, fasttrap_tracepoint_t *tp)
+{
+	fasttrap_instr_t instr = FASTTRAP_INSTR;
+
+	if (uwrite(p, &instr, 4, tp->ftt_pc) != 0)
+		return (-1);
+
+	return (0);
+}
+
+int
+fasttrap_tracepoint_remove(proc_t *p, fasttrap_tracepoint_t *tp)
+{
+	uint32_t instr;
+
+	/*
+	 * Distinguish between read or write failures and a changed
+	 * instruction.
+	 */
+	if (uread(p, &instr, 4, tp->ftt_pc) != 0)
+		return (0);
+	if (instr != FASTTRAP_INSTR)
+		return (0);
+	if (uwrite(p, &tp->ftt_instr, 4, tp->ftt_pc) != 0)
+		return (-1);
+
+	return (0);
+}
+
+int
+fasttrap_tracepoint_init(proc_t *p, fasttrap_tracepoint_t *tp, uintptr_t pc,
+    fasttrap_probe_type_t type)
+{
+	uint32_t instr;
+	//int32_t disp;
+
+	/*
+	 * Read the instruction at the given address out of the process's
+	 * address space. We don't have to worry about a debugger
+	 * changing this instruction before we overwrite it with our trap
+	 * instruction since P_PR_LOCK is set.
+	 */
+	if (uread(p, &instr, 4, pc) != 0)
+		return (-1);
+
+	/*
+	 * Decode the instruction to fill in the probe flags. We can have
+	 * the process execute most instructions on its own using a pc/npc
+	 * trick, but pc-relative control transfer present a problem since
+	 * we're relocating the instruction. We emulate these instructions
+	 * in the kernel. We assume a default type and over-write that as
+	 * needed.
+	 *
+	 * pc-relative instructions must be emulated for correctness;
+	 * other instructions (which represent a large set of commonly traced
+	 * instructions) are emulated or otherwise optimized for performance.
+	 */
+	tp->ftt_type = FASTTRAP_T_COMMON;
+	tp->ftt_instr = instr;
+
+	switch (OP(instr)) {
+	/* The following are invalid for trapping (invalid opcodes, tw/twi). */
+	case 0:
+	case 1:
+	case 2:
+	case 4:
+	case 5:
+	case 6:
+	case 30:
+	case 39:
+	case 58:
+	case 62:
+	case 3:	/* twi */
+		return (-1);
+	case 31:	/* tw */
+		if (OPX(instr) == 4)
+			return (-1);
+		else if (OPX(instr) == 444 && OP_RS(instr) == OP_RA(instr) &&
+		    OP_RS(instr) == OP_RB(instr))
+			tp->ftt_type = FASTTRAP_T_NOP;
+		break;
+	case 16:
+		tp->ftt_type = FASTTRAP_T_BC;
+		tp->ftt_dest = instr & 0x0000FFFC; /* Extract target address */
+		if (instr & 0x00008000)
+			tp->ftt_dest |= 0xFFFF0000;
+		/* Use as offset if not absolute address. */
+		if (!(instr & 0x02))
+			tp->ftt_dest += pc;
+		tp->ftt_bo = OP_BO(instr);
+		tp->ftt_bi = OP_BI(instr);
+		break;
+	case 18:
+		tp->ftt_type = FASTTRAP_T_B;
+		tp->ftt_dest = instr & 0x03FFFFFC; /* Extract target address */
+		if (instr & 0x02000000)
+			tp->ftt_dest |= 0xFC000000;
+		/* Use as offset if not absolute address. */
+		if (!(instr & 0x02))
+			tp->ftt_dest += pc;
+		break;
+	case 19:
+		switch (OPX(instr)) {
+		case 528:	/* bcctr */
+			tp->ftt_type = FASTTRAP_T_BCTR;
+			tp->ftt_bo = OP_BO(instr);
+			tp->ftt_bi = OP_BI(instr);
+			break;
+		case 16:	/* bclr */
+			tp->ftt_type = FASTTRAP_T_BCTR;
+			tp->ftt_bo = OP_BO(instr);
+			tp->ftt_bi = OP_BI(instr);
+			break;
+		};
+		break;
+	case 24:
+		if (OP_RS(instr) == OP_RA(instr) &&
+		    (instr & 0x0000FFFF) == 0)
+			tp->ftt_type = FASTTRAP_T_NOP;
+		break;
+	};
+
+	/*
+	 * We don't know how this tracepoint is going to be used, but in case
+	 * it's used as part of a function return probe, we need to indicate
+	 * whether it's always a return site or only potentially a return
+	 * site. If it's part of a return probe, it's always going to be a
+	 * return from that function if it's a restore instruction or if
+	 * the previous instruction was a return. If we could reliably
+	 * distinguish jump tables from return sites, this wouldn't be
+	 * necessary.
+	 */
+#if 0
+	if (tp->ftt_type != FASTTRAP_T_RESTORE &&
+	    (uread(p, &instr, 4, pc - sizeof (instr)) != 0 ||
+	    !(OP(instr) == 2 && OP3(instr) == OP3_RETURN)))
+		tp->ftt_flags |= FASTTRAP_F_RETMAYBE;
+#endif
+
+	return (0);
+}
+
+static uint64_t
+fasttrap_anarg(struct reg *rp, int argno)
+{
+	uint64_t value;
+	proc_t  *p = curproc;
+
+	/* The first 8 arguments are in registers. */
+	if (argno < 8)
+		return rp->fixreg[argno + 3];
+
+	/* Arguments on stack start after SP+LR (2 register slots). */
+	if (SV_PROC_FLAG(p, SV_ILP32)) {
+		DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
+		value = dtrace_fuword32((void *)(rp->fixreg[1] + 8 +
+		    ((argno - 8) * sizeof(uint32_t))));
+		DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT | CPU_DTRACE_BADADDR);
+	} else {
+		DTRACE_CPUFLAG_SET(CPU_DTRACE_NOFAULT);
+		value = dtrace_fuword64((void *)(rp->fixreg[1] + 16 +
+		    ((argno - 8) * sizeof(uint32_t))));
+		DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT | CPU_DTRACE_BADADDR);
+	}
+	return value;
+}
+
+uint64_t
+fasttrap_pid_getarg(void *arg, dtrace_id_t id, void *parg, int argno,
+    int aframes)
+{
+	struct reg r;
+
+	fill_regs(curthread, &r);
+
+	return (fasttrap_anarg(&r, argno));
+}
+
+uint64_t
+fasttrap_usdt_getarg(void *arg, dtrace_id_t id, void *parg, int argno,
+    int aframes)
+{
+	struct reg r;
+
+	fill_regs(curthread, &r);
+
+	return (fasttrap_anarg(&r, argno));
+}
+
+static void
+fasttrap_usdt_args(fasttrap_probe_t *probe, struct reg *rp, int argc,
+    uintptr_t *argv)
+{
+	int i, x, cap = MIN(argc, probe->ftp_nargs);
+
+	for (i = 0; i < cap; i++) {
+		x = probe->ftp_argmap[i];
+
+		if (x < 8)
+			argv[i] = rp->fixreg[x];
+		else
+			if (SV_PROC_FLAG(curproc, SV_ILP32))
+				argv[i] = fuword32((void *)(rp->fixreg[1] + 8 +
+				    (x * sizeof(uint32_t))));
+			else
+				argv[i] = fuword32((void *)(rp->fixreg[1] + 16 +
+				    (x * sizeof(uint64_t))));
+	}
+
+	for (; i < argc; i++) {
+		argv[i] = 0;
+	}
+}
+
+static void
+fasttrap_return_common(struct reg *rp, uintptr_t pc, pid_t pid,
+    uintptr_t new_pc)
+{
+	fasttrap_tracepoint_t *tp;
+	fasttrap_bucket_t *bucket;
+	fasttrap_id_t *id;
+
+	bucket = &fasttrap_tpoints.fth_table[FASTTRAP_TPOINTS_INDEX(pid, pc)];
+
+	for (tp = bucket->ftb_data; tp != NULL; tp = tp->ftt_next) {
+		if (pid == tp->ftt_pid && pc == tp->ftt_pc &&
+		    tp->ftt_proc->ftpc_acount != 0)
+			break;
+	}
+
+	/*
+	 * Don't sweat it if we can't find the tracepoint again; unlike
+	 * when we're in fasttrap_pid_probe(), finding the tracepoint here
+	 * is not essential to the correct execution of the process.
+	 */
+	if (tp == NULL) {
+		return;
+	}
+
+	for (id = tp->ftt_retids; id != NULL; id = id->fti_next) {
+		/*
+		 * If there's a branch that could act as a return site, we
+		 * need to trace it, and check here if the program counter is
+		 * external to the function.
+		 */
+		/* Skip function-local branches. */
+		if ((new_pc - id->fti_probe->ftp_faddr) < id->fti_probe->ftp_fsize)
+			continue;
+
+		dtrace_probe(id->fti_probe->ftp_id,
+		    pc - id->fti_probe->ftp_faddr,
+		    rp->fixreg[3], rp->fixreg[4], 0, 0);
+	}
+}
+
+
+static int
+fasttrap_branch_taken(int bo, int bi, struct reg *regs)
+{
+	int crzero = 0;
+
+	/* Branch always? */
+	if ((bo & 0x14) == 0x14)
+		return 1;
+
+	/* Handle decrementing ctr */
+	if (!(bo & 0x04)) {
+		--regs->ctr;
+		crzero = (regs->ctr == 0);
+		if (bo & 0x10) {
+			return (!(crzero ^ (bo >> 1)));
+		}
+	}
+
+	return (crzero | (((regs->cr >> (31 - bi)) ^ (bo >> 3)) ^ 1));
+}
+
+
+int
+fasttrap_pid_probe(struct reg *rp)
+{
+	proc_t *p = curproc;
+	uintptr_t pc = rp->pc;
+	uintptr_t new_pc = 0;
+	fasttrap_bucket_t *bucket;
+	fasttrap_tracepoint_t *tp, tp_local;
+	pid_t pid;
+	dtrace_icookie_t cookie;
+	uint_t is_enabled = 0;
+
+	/*
+	 * It's possible that a user (in a veritable orgy of bad planning)
+	 * could redirect this thread's flow of control before it reached the
+	 * return probe fasttrap. In this case we need to kill the process
+	 * since it's in a unrecoverable state.
+	 */
+	if (curthread->t_dtrace_step) {
+		ASSERT(curthread->t_dtrace_on);
+		fasttrap_sigtrap(p, curthread, pc);
+		return (0);
+	}
+
+	/*
+	 * Clear all user tracing flags.
+	 */
+	curthread->t_dtrace_ft = 0;
+	curthread->t_dtrace_pc = 0;
+	curthread->t_dtrace_npc = 0;
+	curthread->t_dtrace_scrpc = 0;
+	curthread->t_dtrace_astpc = 0;
+
+
+	PROC_LOCK(p);
+	pid = p->p_pid;
+	bucket = &fasttrap_tpoints.fth_table[FASTTRAP_TPOINTS_INDEX(pid, pc)];
+
+	/*
+	 * Lookup the tracepoint that the process just hit.
+	 */
+	for (tp = bucket->ftb_data; tp != NULL; tp = tp->ftt_next) {
+		if (pid == tp->ftt_pid && pc == tp->ftt_pc &&
+		    tp->ftt_proc->ftpc_acount != 0)
+			break;
+	}
+
+	/*
+	 * If we couldn't find a matching tracepoint, either a tracepoint has
+	 * been inserted without using the pid<pid> ioctl interface (see
+	 * fasttrap_ioctl), or somehow we have mislaid this tracepoint.
+	 */
+	if (tp == NULL) {
+		PROC_UNLOCK(p);
+		return (-1);
+	}
+
+	if (tp->ftt_ids != NULL) {
+		fasttrap_id_t *id;
+
+		for (id = tp->ftt_ids; id != NULL; id = id->fti_next) {
+			fasttrap_probe_t *probe = id->fti_probe;
+
+			if (id->fti_ptype == DTFTP_ENTRY) {
+				/*
+				 * We note that this was an entry
+				 * probe to help ustack() find the
+				 * first caller.
+				 */
+				cookie = dtrace_interrupt_disable();
+				DTRACE_CPUFLAG_SET(CPU_DTRACE_ENTRY);
+				dtrace_probe(probe->ftp_id, rp->fixreg[3],
+						rp->fixreg[4], rp->fixreg[5], rp->fixreg[6],
+						rp->fixreg[7]);
+				DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_ENTRY);
+				dtrace_interrupt_enable(cookie);
+			} else if (id->fti_ptype == DTFTP_IS_ENABLED) {
+				/*
+				 * Note that in this case, we don't
+				 * call dtrace_probe() since it's only
+				 * an artificial probe meant to change
+				 * the flow of control so that it
+				 * encounters the true probe.
+				 */
+				is_enabled = 1;
+			} else if (probe->ftp_argmap == NULL) {
+				dtrace_probe(probe->ftp_id, rp->fixreg[3],
+				    rp->fixreg[4], rp->fixreg[5], rp->fixreg[6],
+				    rp->fixreg[7]);
+			} else {
+				uintptr_t t[5];
+
+				fasttrap_usdt_args(probe, rp,
+				    sizeof (t) / sizeof (t[0]), t);
+
+				dtrace_probe(probe->ftp_id, t[0], t[1],
+				    t[2], t[3], t[4]);
+			}
+		}
+	}
+
+	/*
+	 * We're about to do a bunch of work so we cache a local copy of
+	 * the tracepoint to emulate the instruction, and then find the
+	 * tracepoint again later if we need to light up any return probes.
+	 */
+	tp_local = *tp;
+	PROC_UNLOCK(p);
+	tp = &tp_local;
+
+	/*
+	 * If there's an is-enabled probe connected to this tracepoint it
+	 * means that there was a 'xor r3, r3, r3'
+	 * instruction that was placed there by DTrace when the binary was
+	 * linked. As this probe is, in fact, enabled, we need to stuff 1
+	 * into R3. Accordingly, we can bypass all the instruction
+	 * emulation logic since we know the inevitable result. It's possible
+	 * that a user could construct a scenario where the 'is-enabled'
+	 * probe was on some other instruction, but that would be a rather
+	 * exotic way to shoot oneself in the foot.
+	 */
+	if (is_enabled) {
+		rp->fixreg[3] = 1;
+		new_pc = rp->pc + 4;
+		goto done;
+	}
+
+
+	switch (tp->ftt_type) {
+	case FASTTRAP_T_NOP:
+		new_pc = rp->pc + 4;
+		break;
+	case FASTTRAP_T_BC:
+		if (!fasttrap_branch_taken(tp->ftt_bo, tp->ftt_bi, rp))
+			break;
+		/* FALLTHROUGH */
+	case FASTTRAP_T_B:
+		if (tp->ftt_instr & 0x01)
+			rp->lr = rp->pc + 4;
+		new_pc = tp->ftt_dest;
+		break;
+	case FASTTRAP_T_BLR:
+	case FASTTRAP_T_BCTR:
+		if (!fasttrap_branch_taken(tp->ftt_bo, tp->ftt_bi, rp))
+			break;
+		/* FALLTHROUGH */
+		if (tp->ftt_type == FASTTRAP_T_BCTR)
+			new_pc = rp->ctr;
+		else
+			new_pc = rp->lr;
+		if (tp->ftt_instr & 0x01)
+			rp->lr = rp->pc + 4;
+		break;
+	case FASTTRAP_T_COMMON:
+		break;
+	};
+done:
+	/*
+	 * If there were no return probes when we first found the tracepoint,
+	 * we should feel no obligation to honor any return probes that were
+	 * subsequently enabled -- they'll just have to wait until the next
+	 * time around.
+	 */
+	if (tp->ftt_retids != NULL) {
+		/*
+		 * We need to wait until the results of the instruction are
+		 * apparent before invoking any return probes. If this
+		 * instruction was emulated we can just call
+		 * fasttrap_return_common(); if it needs to be executed, we
+		 * need to wait until the user thread returns to the kernel.
+		 */
+		if (tp->ftt_type != FASTTRAP_T_COMMON) {
+			fasttrap_return_common(rp, pc, pid, new_pc);
+		} else {
+			ASSERT(curthread->t_dtrace_ret != 0);
+			ASSERT(curthread->t_dtrace_pc == pc);
+			ASSERT(curthread->t_dtrace_scrpc != 0);
+			ASSERT(new_pc == curthread->t_dtrace_astpc);
+		}
+	}
+
+	rp->pc = new_pc;
+	set_regs(curthread, rp);
+
+	return (0);
+}
+
+int
+fasttrap_return_probe(struct reg *rp)
+{
+	proc_t *p = curproc;
+	uintptr_t pc = curthread->t_dtrace_pc;
+	uintptr_t npc = curthread->t_dtrace_npc;
+
+	curthread->t_dtrace_pc = 0;
+	curthread->t_dtrace_npc = 0;
+	curthread->t_dtrace_scrpc = 0;
+	curthread->t_dtrace_astpc = 0;
+
+	/*
+	 * We set rp->pc to the address of the traced instruction so
+	 * that it appears to dtrace_probe() that we're on the original
+	 * instruction, and so that the user can't easily detect our
+	 * complex web of lies. dtrace_return_probe() (our caller)
+	 * will correctly set %pc after we return.
+	 */
+	rp->pc = pc;
+
+	fasttrap_return_common(rp, pc, p->p_pid, npc);
+
+	return (0);
+}
 
-/*
- *	XXX: Placeholder for PowerPC fasttrap code
- */
diff --git a/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h b/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h
index 0f21899f701..98d5d267566 100644
--- a/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h
+++ b/sys/cddl/contrib/opensolaris/uts/powerpc/sys/fasttrap_isa.h
@@ -19,6 +19,7 @@
  *
  * CDDL HEADER END
  */
+/* Portions Copyright 2013 Justin Hibbits */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -34,13 +35,39 @@
 #ifdef	__cplusplus
 extern "C" {
 #endif
-/*
- *  XXXDTRACE: placehodler for PowerPC fasttrap stuff
- */
+
+#define	FASTTRAP_SUNWDTRACE_SIZE	64
+#define FASTTRAP_INSTR			0x0FFFDDDD
 
 typedef	uint32_t	fasttrap_instr_t;
-#define	FASTTRAP_SUNWDTRACE_SIZE	64
-#define FASTTRAP_INSTR 0x0FFFDDDD
+
+typedef struct fasttrap_machtp_t {
+	fasttrap_instr_t	ftmt_instr;	/* original instruction */
+	uintptr_t		ftmt_dest;	/* branch target */
+	uint8_t			ftmt_type;	/* emulation type */
+	uint8_t			ftmt_flags;	/* emulation flags */
+	uint8_t			ftmt_bo;	/* BO field */
+	uint8_t			ftmt_bi;	/* BI field (CR bit) */
+} fasttrap_machtp_t;
+
+#define	ftt_instr	ftt_mtp.ftmt_instr
+#define	ftt_dest	ftt_mtp.ftmt_dest
+#define	ftt_type	ftt_mtp.ftmt_type
+#define	ftt_flags	ftt_mtp.ftmt_flags
+#define	ftt_bo		ftt_mtp.ftmt_bo
+#define	ftt_bi		ftt_mtp.ftmt_bi
+
+#define FASTTRAP_T_COMMON	0x00
+#define FASTTRAP_T_B		0x01
+#define FASTTRAP_T_BC		0x02
+#define FASTTRAP_T_BLR		0x03
+#define FASTTRAP_T_BCTR		0x04
+#define FASTTRAP_T_NOP		0x05
+
+#define	FASTTRAP_AFRAMES		3
+#define	FASTTRAP_RETURN_AFRAMES		4
+#define	FASTTRAP_ENTRY_AFRAMES		3
+#define	FASTTRAP_OFFSET_AFRAMES		3
 
 #ifdef	__cplusplus
 }
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
index 34d6f331ebe..3d3c43cd2e8 100644
--- a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c
@@ -367,7 +367,27 @@ dtrace_getarg(int arg, int aframes)
 			    sizeof (uintptr_t));
 
 			if (arg <= inreg) {
-				stack = (uintptr_t *)&rp->r_rdi;
+				switch (arg) {
+				case 0:
+					stack = (uintptr_t *)&rp->r_rdi;
+					break;
+				case 1:
+					stack = (uintptr_t *)&rp->r_rsi;
+					break;
+				case 2:
+					stack = (uintptr_t *)&rp->r_rdx;
+					break;
+				case 3:
+					stack = (uintptr_t *)&rp->r_rcx;
+					break;
+				case 4:
+					stack = (uintptr_t *)&rp->r_r8;
+					break;
+				case 5:
+					stack = (uintptr_t *)&rp->r_r9;
+					break;
+				}
+				arg = 0;
 			} else {
 				stack = (uintptr_t *)(rp->r_rsp);
 				arg -= inreg;
diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
index 1ec15094e9f..bdd6fbe6f9b 100644
--- a/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
+++ b/sys/cddl/dev/dtrace/amd64/dtrace_subr.c
@@ -142,7 +142,6 @@ dtrace_sync(void)
 }
 
 #ifdef notyet
-int (*dtrace_fasttrap_probe_ptr)(struct regs *);
 int (*dtrace_pid_probe_ptr)(struct regs *);
 int (*dtrace_return_probe_ptr)(struct regs *);
 
@@ -213,13 +212,6 @@ dtrace_user_probe(struct regs *rp, caddr_t addr, processorid_t cpuid)
 		rw_exit(rwp);
 		rp->r_pc = npc;
 
-	} else if (rp->r_trapno == T_DTRACE_PROBE) {
-		rwp = &CPU->cpu_ft_lock;
-		rw_enter(rwp, RW_READER);
-		if (dtrace_fasttrap_probe_ptr != NULL)
-			(void) (*dtrace_fasttrap_probe_ptr)(rp);
-		rw_exit(rwp);
-
 	} else if (rp->r_trapno == T_BPTFLT) {
 		uint8_t instr;
 		rwp = &CPU->cpu_ft_lock;
diff --git a/sys/cddl/dev/dtrace/dtrace_load.c b/sys/cddl/dev/dtrace/dtrace_load.c
index 05436fe8827..5d59a0430a0 100644
--- a/sys/cddl/dev/dtrace/dtrace_load.c
+++ b/sys/cddl/dev/dtrace/dtrace_load.c
@@ -56,6 +56,8 @@ dtrace_load(void *dummy)
 	/* Hang our hook for exceptions. */
 	dtrace_invop_init();
 
+	dtrace_taskq = taskq_create("dtrace_taskq", 1, maxclsyspri, 0, 0, 0);
+
 	/* Register callbacks for linker file load and unload events. */
 	dtrace_kld_load_tag = EVENTHANDLER_REGISTER(kld_load,
 	    dtrace_kld_load, NULL, EVENTHANDLER_PRI_ANY);
diff --git a/sys/cddl/dev/dtrace/dtrace_sysctl.c b/sys/cddl/dev/dtrace/dtrace_sysctl.c
index 00ed7091601..1b5b3abf135 100644
--- a/sys/cddl/dev/dtrace/dtrace_sysctl.c
+++ b/sys/cddl/dev/dtrace/dtrace_sysctl.c
@@ -80,3 +80,5 @@ sysctl_dtrace_providers(SYSCTL_HANDLER_ARGS)
 SYSCTL_PROC(_debug_dtrace, OID_AUTO, providers, CTLTYPE_STRING | CTLFLAG_RD,
     0, 0, sysctl_dtrace_providers, "A", "");
 
+SYSCTL_INT(_debug_dtrace, OID_AUTO, memstr_max, CTLFLAG_RW, &dtrace_memstr_max,
+    0, "largest allowed argument to memstr(), 0 indicates no limit");
diff --git a/sys/cddl/dev/dtrace/dtrace_test.c b/sys/cddl/dev/dtrace/dtrace_test.c
index f50ad89de6b..9caf2f00f32 100644
--- a/sys/cddl/dev/dtrace/dtrace_test.c
+++ b/sys/cddl/dev/dtrace/dtrace_test.c
@@ -25,8 +25,6 @@
  * $FreeBSD$
  *
  */
-#include "opt_kdtrace.h"
-
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #include <sys/param.h>
@@ -41,7 +39,7 @@
 
 SDT_PROVIDER_DEFINE(test);
 
-SDT_PROBE_DEFINE7(test, , , sdttest, sdttest, "int", "int", "int", "int", "int",
+SDT_PROBE_DEFINE7(test, , , sdttest, "int", "int", "int", "int", "int",
     "int", "int");
 
 /*
diff --git a/sys/cddl/dev/dtrace/dtrace_unload.c b/sys/cddl/dev/dtrace/dtrace_unload.c
index e9bd53cd32e..41b753821c9 100644
--- a/sys/cddl/dev/dtrace/dtrace_unload.c
+++ b/sys/cddl/dev/dtrace/dtrace_unload.c
@@ -127,6 +127,8 @@ dtrace_unload()
 	mutex_destroy(&dtrace_errlock);
 #endif
 
+	taskq_destroy(dtrace_taskq);
+
 	/* Reset our hook for exceptions. */
 	dtrace_invop_uninit();
 
diff --git a/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c b/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
index 9582c97da5e..b7edca5acf3 100644
--- a/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
+++ b/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c
@@ -49,7 +49,8 @@
 
 /* Offset to the LR Save word (ppc32) */
 #define RETURN_OFFSET	4
-#define RETURN_OFFSET64	8
+/* Offset to LR Save word (ppc64).  CR Save area sits between back chain and LR */
+#define RETURN_OFFSET64	16
 
 #define INKERNEL(x)	((x) <= VM_MAX_KERNEL_ADDRESS && \
 		(x) >= VM_MIN_KERNEL_ADDRESS)
diff --git a/sys/cddl/dev/fbt/fbt_powerpc.c b/sys/cddl/dev/fbt/fbt_powerpc.c
index cdaa06a420a..67062820518 100644
--- a/sys/cddl/dev/fbt/fbt_powerpc.c
+++ b/sys/cddl/dev/fbt/fbt_powerpc.c
@@ -219,7 +219,7 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
 		return (0);
 
 	instr = (u_int32_t *) symval->value;
-	limit = (u_int32_t *) symval->value + symval->size;
+	limit = (u_int32_t *) (symval->value + symval->size);
 
 	for (; instr < limit; instr++)
 		if (*instr == FBT_MFLR_R0)
diff --git a/sys/cddl/dev/lockstat/lockstat.c b/sys/cddl/dev/lockstat/lockstat.c
index 9b3f7d7d32e..b8d12ac77d0 100644
--- a/sys/cddl/dev/lockstat/lockstat.c
+++ b/sys/cddl/dev/lockstat/lockstat.c
@@ -29,8 +29,6 @@
  * Use is subject to license terms.
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/cdefs.h>
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/cddl/dev/sdt/sdt.c b/sys/cddl/dev/sdt/sdt.c
index 41d3610f8b1..6856ec7afc3 100644
--- a/sys/cddl/dev/sdt/sdt.c
+++ b/sys/cddl/dev/sdt/sdt.c
@@ -24,7 +24,20 @@
  *
  */
 
-#include "opt_kdtrace.h"
+/*
+ * This file contains a reimplementation of the statically-defined tracing (SDT)
+ * framework for DTrace. Probes and SDT providers are defined using the macros
+ * in sys/sdt.h, which append all the needed structures to linker sets. When
+ * this module is loaded, it iterates over all of the loaded modules and
+ * registers probes and providers with the DTrace framework based on the
+ * contents of these linker sets.
+ *
+ * A list of SDT providers is maintained here since a provider may span multiple
+ * modules. When a kernel module is unloaded, a provider defined in that module
+ * is unregistered only if no other modules refer to it. The DTrace framework is
+ * responsible for destroying individual probes when a kernel module is
+ * unloaded; in particular, probes may not span multiple kernel modules.
+ */
 
 #include <sys/cdefs.h>
 #include <sys/param.h>
@@ -53,9 +66,8 @@ static void	sdt_destroy(void *, dtrace_id_t, void *);
 static void	sdt_enable(void *, dtrace_id_t, void *);
 static void	sdt_disable(void *, dtrace_id_t, void *);
 
-static d_open_t	sdt_open;
-static void	sdt_load(void *);
-static int	sdt_unload(void *);
+static void	sdt_load(void);
+static int	sdt_unload(void);
 static void	sdt_create_provider(struct sdt_provider *);
 static void	sdt_create_probe(struct sdt_probe *);
 static void	sdt_kld_load(void *, struct linker_file *);
@@ -63,12 +75,6 @@ static void	sdt_kld_unload_try(void *, struct linker_file *, int *);
 
 static MALLOC_DEFINE(M_SDT, "SDT", "DTrace SDT providers");
 
-static struct cdevsw sdt_cdevsw = {
-	.d_version	= D_VERSION,
-	.d_open		= sdt_open,
-	.d_name		= "sdt",
-};
-
 static dtrace_pattr_t sdt_attr = {
 { DTRACE_STABILITY_EVOLVING, DTRACE_STABILITY_EVOLVING, DTRACE_CLASS_COMMON },
 { DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
@@ -90,8 +96,6 @@ static dtrace_pops_t sdt_pops = {
 	sdt_destroy,
 };
 
-static struct cdev	*sdt_cdev;
-
 static TAILQ_HEAD(, sdt_provider) sdt_prov_list;
 
 eventhandler_tag	sdt_kld_load_tag;
@@ -117,7 +121,6 @@ sdt_create_provider(struct sdt_provider *prov)
 	newprov = malloc(sizeof(*newprov), M_SDT, M_WAITOK | M_ZERO);
 	newprov->name = strdup(prov->name, M_SDT);
 	prov->sdt_refs = newprov->sdt_refs = 1;
-	TAILQ_INIT(&newprov->probe_list);
 
 	TAILQ_INSERT_TAIL(&sdt_prov_list, newprov, prov_entry);
 
@@ -133,6 +136,8 @@ sdt_create_probe(struct sdt_probe *probe)
 	char mod[DTRACE_MODNAMELEN];
 	char func[DTRACE_FUNCNAMELEN];
 	char name[DTRACE_NAMELEN];
+	const char *from;
+	char *to;
 	size_t len;
 
 	TAILQ_FOREACH(prov, &sdt_prov_list, prov_entry)
@@ -156,17 +161,30 @@ sdt_create_probe(struct sdt_probe *probe)
 	 * in the C compiler, so we have to respect const vs non-const.
 	 */
 	strlcpy(func, probe->func, sizeof(func));
-	strlcpy(name, probe->name, sizeof(name));
+
+	from = probe->name;
+	to = name;
+	for (len = 0; len < (sizeof(name) - 1) && *from != '\0';
+	    len++, from++, to++) {
+		if (from[0] == '_' && from[1] == '_') {
+			*to = '-';
+			from++;
+		} else
+			*to = *from;
+	}
+	*to = '\0';
 
 	if (dtrace_probe_lookup(prov->id, mod, func, name) != DTRACE_IDNONE)
 		return;
 
-	TAILQ_INSERT_TAIL(&prov->probe_list, probe, probe_entry);
-
 	(void)dtrace_probe_create(prov->id, mod, func, name, 1, probe);
 }
 
-/* Probes are created through the SDT module load/unload hook. */
+/*
+ * Probes are created through the SDT module load/unload hook, so this function
+ * has nothing to do. It only exists because the DTrace provider framework
+ * requires one of provide_probes and provide_module to be defined.
+ */
 static void
 sdt_provide_probes(void *arg, dtrace_probedesc_t *desc)
 {
@@ -198,39 +216,39 @@ sdt_getargdesc(void *arg, dtrace_id_t id, void *parg, dtrace_argdesc_t *desc)
 	struct sdt_argtype *argtype;
 	struct sdt_probe *probe = parg;
 
-	if (desc->dtargd_ndx < probe->n_args) {
-		TAILQ_FOREACH(argtype, &probe->argtype_list, argtype_entry) {
-			if (desc->dtargd_ndx == argtype->ndx) {
-				desc->dtargd_mapping = desc->dtargd_ndx;
-				strlcpy(desc->dtargd_native, argtype->type,
-				    sizeof(desc->dtargd_native));
-				if (argtype->xtype != NULL)
-					strlcpy(desc->dtargd_xlate,
-					    argtype->xtype,
-					    sizeof(desc->dtargd_xlate));
-				else
-					desc->dtargd_xlate[0] = '\0';
-			}
-		}
-	} else
+	if (desc->dtargd_ndx >= probe->n_args) {
 		desc->dtargd_ndx = DTRACE_ARGNONE;
+		return;
+	}
+
+	TAILQ_FOREACH(argtype, &probe->argtype_list, argtype_entry) {
+		if (desc->dtargd_ndx == argtype->ndx) {
+			desc->dtargd_mapping = desc->dtargd_ndx;
+			if (argtype->type == NULL) {
+				desc->dtargd_native[0] = '\0';
+				desc->dtargd_xlate[0] = '\0';
+				continue;
+			}
+			strlcpy(desc->dtargd_native, argtype->type,
+			    sizeof(desc->dtargd_native));
+			if (argtype->xtype != NULL)
+				strlcpy(desc->dtargd_xlate, argtype->xtype,
+				    sizeof(desc->dtargd_xlate));
+		}
+	}
 }
 
 static void
 sdt_destroy(void *arg, dtrace_id_t id, void *parg)
 {
-	struct sdt_probe *probe;
-
-	probe = parg;
-	TAILQ_REMOVE(&probe->prov->probe_list, probe, probe_entry);
 }
 
 /*
  * Called from the kernel linker when a module is loaded, before
  * dtrace_module_loaded() is called. This is done so that it's possible to
- * register new providers when modules are loaded. We cannot do this in the
- * provide_module method since it's called with the provider lock held
- * and dtrace_register() will try to acquire it again.
+ * register new providers when modules are loaded. The DTrace framework
+ * explicitly disallows calling into the framework from the provide_module
+ * provider method, so we cannot do this there.
  */
 static void
 sdt_kld_load(void *arg __unused, struct linker_file *lf)
@@ -264,14 +282,15 @@ sdt_kld_load(void *arg __unused, struct linker_file *lf)
 }
 
 static void
-sdt_kld_unload_try(void *arg __unused, struct linker_file *lf, int *error __unused)
+sdt_kld_unload_try(void *arg __unused, struct linker_file *lf, int *error)
 {
 	struct sdt_provider *prov, **curr, **begin, **end, *tmp;
 
 	if (*error != 0)
 		/* We already have an error, so don't do anything. */
 		return;
-	else if (linker_file_lookup_set(lf, "sdt_providers_set", &begin, &end, NULL))
+	else if (linker_file_lookup_set(lf, "sdt_providers_set", &begin, &end,
+	    NULL))
 		/* No DTrace providers are declared in this file. */
 		return;
 
@@ -281,17 +300,20 @@ sdt_kld_unload_try(void *arg __unused, struct linker_file *lf, int *error __unus
 	 */
 	for (curr = begin; curr < end; curr++) {
 		TAILQ_FOREACH_SAFE(prov, &sdt_prov_list, prov_entry, tmp) {
-			if (strcmp(prov->name, (*curr)->name) == 0) {
-				if (prov->sdt_refs == 1) {
-					TAILQ_REMOVE(&sdt_prov_list, prov,
-					    prov_entry);
-					dtrace_unregister(prov->id);
-					free(prov->name, M_SDT);
-					free(prov, M_SDT);
-				} else
-					prov->sdt_refs--;
-				break;
-			}
+			if (strcmp(prov->name, (*curr)->name) != 0)
+				continue;
+
+			if (prov->sdt_refs == 1) {
+				if (dtrace_unregister(prov->id) != 0) {
+					*error = 1;
+					return;
+				}
+				TAILQ_REMOVE(&sdt_prov_list, prov, prov_entry);
+				free(prov->name, M_SDT);
+				free(prov, M_SDT);
+			} else
+				prov->sdt_refs--;
+			break;
 		}
 	}
 }
@@ -306,15 +328,11 @@ sdt_linker_file_cb(linker_file_t lf, void *arg __unused)
 }
 
 static void
-sdt_load(void *arg __unused)
+sdt_load()
 {
 
 	TAILQ_INIT(&sdt_prov_list);
 
-	/* Create the /dev/dtrace/sdt entry. */
-	sdt_cdev = make_dev(&sdt_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
-	    "dtrace/sdt");
-
 	sdt_probe_func = dtrace_probe;
 
 	sdt_kld_load_tag = EVENTHANDLER_REGISTER(kld_load, sdt_kld_load, NULL,
@@ -327,9 +345,10 @@ sdt_load(void *arg __unused)
 }
 
 static int
-sdt_unload(void *arg __unused)
+sdt_unload()
 {
 	struct sdt_provider *prov, *tmp;
+	int ret;
 
 	EVENTHANDLER_DEREGISTER(kld_load, sdt_kld_load_tag);
 	EVENTHANDLER_DEREGISTER(kld_unload_try, sdt_kld_unload_try_tag);
@@ -337,18 +356,17 @@ sdt_unload(void *arg __unused)
 	sdt_probe_func = sdt_probe_stub;
 
 	TAILQ_FOREACH_SAFE(prov, &sdt_prov_list, prov_entry, tmp) {
+		ret = dtrace_unregister(prov->id);
+		if (ret != 0)
+			return (ret);
 		TAILQ_REMOVE(&sdt_prov_list, prov, prov_entry);
-		dtrace_unregister(prov->id);
 		free(prov->name, M_SDT);
 		free(prov, M_SDT);
 	}
 
-	destroy_dev(sdt_cdev);
-
 	return (0);
 }
 
-/* ARGSUSED */
 static int
 sdt_modevent(module_t mod __unused, int type, void *data __unused)
 {
@@ -356,9 +374,11 @@ sdt_modevent(module_t mod __unused, int type, void *data __unused)
 
 	switch (type) {
 	case MOD_LOAD:
+		sdt_load();
 		break;
 
 	case MOD_UNLOAD:
+		error = sdt_unload();
 		break;
 
 	case MOD_SHUTDOWN:
@@ -372,18 +392,6 @@ sdt_modevent(module_t mod __unused, int type, void *data __unused)
 	return (error);
 }
 
-/* ARGSUSED */
-static int
-sdt_open(struct cdev *dev __unused, int oflags __unused, int devtype __unused,
-    struct thread *td __unused)
-{
-
-	return (0);
-}
-
-SYSINIT(sdt_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, sdt_load, NULL);
-SYSUNINIT(sdt_unload, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY, sdt_unload, NULL);
-
 DEV_MODULE(sdt, sdt_modevent, NULL);
 MODULE_VERSION(sdt, 1);
 MODULE_DEPEND(sdt, dtrace, 1, 1, 1);
diff --git a/sys/compat/freebsd32/freebsd32.h b/sys/compat/freebsd32/freebsd32.h
index 8376e956f32..94f886e79d7 100644
--- a/sys/compat/freebsd32/freebsd32.h
+++ b/sys/compat/freebsd32/freebsd32.h
@@ -362,6 +362,12 @@ struct kinfo_proc32 {
 	int	ki_tdflags;
 };
 
+struct kinfo_sigtramp32 {
+	uint32_t ksigtramp_start;
+	uint32_t ksigtramp_end;
+	uint32_t ksigtramp_spare[4];
+};
+
 struct kld32_file_stat_1 {
 	int	version;	/* set to sizeof(struct kld_file_stat_1) */
 	char	name[MAXPATHLEN];
diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c
index deb03f3ef58..3b267456229 100644
--- a/sys/compat/freebsd32/freebsd32_misc.c
+++ b/sys/compat/freebsd32/freebsd32_misc.c
@@ -83,6 +83,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/msg.h>
 #include <sys/sem.h>
 #include <sys/shm.h>
+#include <sys/condvar.h>
+#include <sys/sf_buf.h>
+#include <sys/sf_sync.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -1652,12 +1655,15 @@ freebsd32_do_sendfile(struct thread *td,
 	cap_rights_t rights;
 	off_t offset;
 	int error;
+	off_t sbytes;
+	struct sendfile_sync *sfs;
 
 	offset = PAIR32TO64(off_t, uap->offset);
 	if (offset < 0)
 		return (EINVAL);
 
 	hdr_uio = trl_uio = NULL;
+	sfs = NULL;
 
 	if (uap->hdtr != NULL) {
 		error = copyin(uap->hdtr, &hdtr32, sizeof(hdtr32));
@@ -1691,9 +1697,24 @@ freebsd32_do_sendfile(struct thread *td,
 		goto out;
 	}
 
+	/*
+	 * If we need to wait for completion, initialise the sfsync
+	 * state here.
+	 */
+	if (uap->flags & SF_SYNC)
+		sfs = sf_sync_alloc(uap->flags & SF_SYNC);
+
 	error = fo_sendfile(fp, uap->s, hdr_uio, trl_uio, offset,
-	    uap->nbytes, uap->sbytes, uap->flags, compat ? SFK_COMPAT : 0, td);
+	    uap->nbytes, &sbytes, uap->flags, compat ? SFK_COMPAT : 0,
+	    sfs, td);
+	if (sfs != NULL) {
+		sf_sync_syscall_wait(sfs);
+		sf_sync_free(sfs);
+	}
+
 	fdrop(fp, td);
+	if (uap->sbytes != NULL)
+		copyout(&sbytes, uap->sbytes, sizeof(off_t));
 
 out:
 	if (hdr_uio)
@@ -1925,7 +1946,7 @@ freebsd32_jail(struct thread *td, struct freebsd32_jail_args *uap)
 		CP(j32_v0, j, version);
 		PTRIN_CP(j32_v0, j, path);
 		PTRIN_CP(j32_v0, j, hostname);
-		j.ip4s = j32_v0.ip_number;
+		j.ip4s = htonl(j32_v0.ip_number);	/* jail_v0 is host order */
 		break;
 	}
 
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c
index 28b683a9d53..c3e5b141f42 100644
--- a/sys/compat/linprocfs/linprocfs.c
+++ b/sys/compat/linprocfs/linprocfs.c
@@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/vnet.h>
 
 #include <vm/vm.h>
diff --git a/sys/compat/linsysfs/linsysfs.c b/sys/compat/linsysfs/linsysfs.c
index 45f44af7baf..069e7ffc578 100644
--- a/sys/compat/linsysfs/linsysfs.c
+++ b/sys/compat/linsysfs/linsysfs.c
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/queue.h>
 #include <sys/blist.h>
 #include <sys/conf.h>
diff --git a/sys/compat/linux/linux_dtrace.h b/sys/compat/linux/linux_dtrace.h
index 7ad6d6d0b5f..b713f16c82a 100644
--- a/sys/compat/linux/linux_dtrace.h
+++ b/sys/compat/linux/linux_dtrace.h
@@ -48,27 +48,27 @@
     LINUX_DTRACE, a, b, c)
 
 #define	_LIN_SDT_PROBE_DEFINE0(a, b, c, d)		SDT_PROBE_DEFINE(a, \
-    b, c, d, d)
+    b, c, d)
 #define	LIN_SDT_PROBE_DEFINE0(a, b, c)			_LIN_SDT_PROBE_DEFINE0(\
     LINUX_DTRACE, a, b, c)
 #define	_LIN_SDT_PROBE_DEFINE1(a, b, c, d, e)		SDT_PROBE_DEFINE1(a, \
-    b, c, d, d, e)
+    b, c, d, e)
 #define	LIN_SDT_PROBE_DEFINE1(a, b, c, d)		_LIN_SDT_PROBE_DEFINE1(\
     LINUX_DTRACE, a, b, c, d)
 #define	_LIN_SDT_PROBE_DEFINE2(a, b, c, d, e, f)	SDT_PROBE_DEFINE2(a, \
-    b, c, d, d, e, f)
+    b, c, d, e, f)
 #define	LIN_SDT_PROBE_DEFINE2(a, b, c, d, e)		_LIN_SDT_PROBE_DEFINE2(\
     LINUX_DTRACE, a, b, c, d, e)
 #define	_LIN_SDT_PROBE_DEFINE3(a, b, c, d, e, f, g)	SDT_PROBE_DEFINE3(a, \
-    b, c, d, d, e, f, g)
+    b, c, d, e, f, g)
 #define	LIN_SDT_PROBE_DEFINE3(a, b, c, d, e, f)		_LIN_SDT_PROBE_DEFINE3(\
     LINUX_DTRACE, a, b, c, d, e, f)
 #define	_LIN_SDT_PROBE_DEFINE4(a, b, c, d, e, f, g, h)	SDT_PROBE_DEFINE4(a, \
-    b, c, d, d, e, f, g, h)
+    b, c, d, e, f, g, h)
 #define	LIN_SDT_PROBE_DEFINE4(a, b, c, d, e, f, g)	_LIN_SDT_PROBE_DEFINE4(\
     LINUX_DTRACE, a, b, c, d, e, f, g)
 #define	_LIN_SDT_PROBE_DEFINE5(a, b, c, d, e, f, g, h, i) \
-    SDT_PROBE_DEFINE5(a, b, c, d, d, e, f, g, h, i)
+    SDT_PROBE_DEFINE5(a, b, c, d, e, f, g, h, i)
 #define	LIN_SDT_PROBE_DEFINE5(a, b, c, d, e, f, g, h)	_LIN_SDT_PROBE_DEFINE5(\
     LINUX_DTRACE, a, b, c, d, e, f, g, h)
 
diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c
index 61156ba0d5d..ec19cd9e74b 100644
--- a/sys/compat/linux/linux_emul.c
+++ b/sys/compat/linux/linux_emul.c
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c
index 210363635e9..316cf2a61eb 100644
--- a/sys/compat/linux/linux_fork.c
+++ b/sys/compat/linux/linux_fork.c
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c
index 9b4c92fdc6c..82a2ef353f7 100644
--- a/sys/compat/linux/linux_futex.c
+++ b/sys/compat/linux/linux_futex.c
@@ -38,7 +38,6 @@ __KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.7 2006/07/24 19:01:49 manu Exp $")
 #endif
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 2a4016a3055..48afc09897b 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/resourcevar.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/vnet.h>
@@ -2286,7 +2287,7 @@ linux_gifflags(struct thread *td, struct ifnet *ifp, struct l_ifreq *ifr)
 
 	flags = (ifp->if_flags | ifp->if_drv_flags) & 0xffff;
 	/* these flags have no Linux equivalent */
-	flags &= ~(IFF_SMART|IFF_DRV_OACTIVE|IFF_SIMPLEX|
+	flags &= ~(IFF_DRV_OACTIVE|IFF_SIMPLEX|
 	    IFF_LINK0|IFF_LINK1|IFF_LINK2);
 	/* Linux' multicast flag is in a different bit */
 	if (flags & IFF_MULTICAST) {
diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c
index 323a38faf97..3b75307337d 100644
--- a/sys/compat/linux/linux_mib.c
+++ b/sys/compat/linux/linux_mib.c
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index ac2384cd0b0..01073f45ff4 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -31,7 +31,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/blist.h>
diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c
index 22f811c50a7..7a8ed6826d7 100644
--- a/sys/compat/linux/linux_socket.c
+++ b/sys/compat/linux/linux_socket.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/un.h>
 
 #include <net/if.h>
+#include <net/vnet.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
@@ -60,7 +61,6 @@ __FBSDID("$FreeBSD$");
 #ifdef INET6
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
-#include <netinet6/in6_var.h>
 #endif
 
 #ifdef COMPAT_LINUX32
diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c
index decd8f88b4e..7d263df8616 100644
--- a/sys/compat/linux/linux_sysctl.c
+++ b/sys/compat/linux/linux_sysctl.c
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c
index e03af00f996..be6e169b26c 100644
--- a/sys/compat/linux/linux_time.c
+++ b/sys/compat/linux/linux_time.c
@@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp
 #endif
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c
index a2c3214085f..c5bf2ddb4f7 100644
--- a/sys/compat/linux/linux_uid16.c
+++ b/sys/compat/linux/linux_uid16.c
@@ -28,7 +28,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/fcntl.h>
 #include <sys/param.h>
diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c
index 76c210c591f..be52459c4b8 100644
--- a/sys/compat/linux/linux_util.c
+++ b/sys/compat/linux/linux_util.c
@@ -33,7 +33,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff --git a/sys/compat/ndis/kern_ndis.c b/sys/compat/ndis/kern_ndis.c
index d0a05e14014..f1e4cd88b39 100644
--- a/sys/compat/ndis/kern_ndis.c
+++ b/sys/compat/ndis/kern_ndis.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/compat/ndis/subr_ndis.c b/sys/compat/ndis/subr_ndis.c
index bc13b2f55a1..f3ba7008411 100644
--- a/sys/compat/ndis/subr_ndis.c
+++ b/sys/compat/ndis/subr_ndis.c
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysproto.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/compat/ndis/subr_usbd.c b/sys/compat/ndis/subr_usbd.c
index b989630a05b..eca2708bfc1 100644
--- a/sys/compat/ndis/subr_usbd.c
+++ b/sys/compat/ndis/subr_usbd.c
@@ -54,7 +54,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ioctl.h>
 
diff --git a/sys/compat/svr4/svr4_sockio.c b/sys/compat/svr4/svr4_sockio.c
index afb3cfe776c..6e10e3f6a30 100644
--- a/sys/compat/svr4/svr4_sockio.c
+++ b/sys/compat/svr4/svr4_sockio.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/vnet.h>
 
 #include <compat/svr4/svr4.h>
@@ -143,6 +144,7 @@ svr4_sock_ioctl(fp, td, retval, fd, cmd, data)
 	case SVR4_SIOCGIFCONF:
 		{
 			struct svr4_ifconf sc;
+			struct ifconf *ifc;
 
 			if ((error = copyin(data, &sc, sizeof(sc))) != 0)
 				return error;
@@ -151,9 +153,19 @@ svr4_sock_ioctl(fp, td, retval, fd, cmd, data)
 				sizeof(struct ifreq), sizeof(struct svr4_ifreq),
 				sc.svr4_ifc_len));
 
-			if ((error = fo_ioctl(fp, OSIOCGIFCONF,
-					    (caddr_t) &sc, td->td_ucred,
-					    td)) != 0)
+			ifc = (struct ifconf *)&sc;
+			ifc->ifc_req->ifr_addr.sa_family =
+			    sc.svr4_ifc_req->svr4_ifr_addr.sa_family;
+			ifc->ifc_req->ifr_addr.sa_len =
+			    sizeof(struct osockaddr);
+
+			error = fo_ioctl(fp, SIOCGIFCONF, &sc, td->td_ucred,
+			    td);
+
+			sc.svr4_ifc_req->svr4_ifr_addr.sa_family =
+			    ifc->ifc_req->ifr_addr.sa_family;
+
+			if (error != 0)
 				return error;
 
 			DPRINTF(("SIOCGIFCONF\n"));
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index c13272b845d..eacba7bb45f 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -75,7 +75,8 @@ FILES_CPU_FUNC =	$S/$M/$M/cpufunc_asm_arm7tdmi.S \
 	$S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \
 	$S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S \
 	$S/$M/$M/cpufunc_asm_fa526.S $S/$M/$M/cpufunc_asm_sheeva.S \
-	$S/$M/$M/cpufunc_asm_pj4b.S $S/$M/$M/cpufunc_asm_armv7.S
+	$S/$M/$M/cpufunc_asm_pj4b.S $S/$M/$M/cpufunc_asm_armv6.S \
+	$S/$M/$M/cpufunc_asm_armv7.S
 
 KERNEL_EXTRA=trampoline
 KERNEL_EXTRA_INSTALL=kernel.gz.tramp
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 975d3f49208..b5377970237 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -127,7 +127,7 @@ options 	BLKDEV_IOSIZE=8192
 # devices and DFLTPHYS for the rest. Some applications have better
 # performance with larger raw I/O access sizes. Note that certain VM
 # parameters are derived from these values and making them too large
-# can make an an unbootable kernel.
+# can make an unbootable kernel.
 #
 # The defaults are 64K and 128K respectively.
 options 	DFLTPHYS=(64*1024)
@@ -728,7 +728,6 @@ options 	NETGRAPH_DEVICE
 options 	NETGRAPH_ECHO
 options 	NETGRAPH_EIFACE
 options 	NETGRAPH_ETHER
-options 	NETGRAPH_FEC
 options 	NETGRAPH_FRAME_RELAY
 options 	NETGRAPH_GIF
 options 	NETGRAPH_GIF_DEMUX
@@ -1168,9 +1167,6 @@ options 	MAC_TEST
 options 	CAPABILITIES	# fine-grained rights on file descriptors
 options 	CAPABILITY_MODE	# sandboxes with no global namespace access
 
-# Support for process descriptors
-options		PROCDESC
-
 
 #####################################################################
 # CLOCK OPTIONS
@@ -1281,8 +1277,7 @@ hint.sa.1.target="6"
 # to incoming commands that do not otherwise have a logical unit assigned
 # to them.
 #
-# The "unknown" device (uk? in pre-2.0.5) is now part of the base SCSI
-# configuration as the "pass" driver.
+# The pass driver provides a passthrough API to access the CAM subsystem.
 
 device		scbus		#base SCSI code
 device		ch		#SCSI media changers
@@ -2962,3 +2957,8 @@ options 	RCTL
 options 	BROOKTREE_ALLOC_PAGES=(217*4+1)
 options 	MAXFILES=999
 
+# Random number generator
+options 	RANDOM_YARROW	# Yarrow RNG
+##options 	RANDOM_FORTUNA	# Fortuna RNG - not yet implemented
+options 	RANDOM_DEBUG	# Debugging messages
+options 	RANDOM_RWFILE	# Read and write entropy cache
diff --git a/sys/conf/files b/sys/conf/files
index 7ba7e7c0e17..a73d31e0c9e 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -9,44 +9,39 @@ acpi_quirks.h			optional acpi				   \
 	compile-with	"${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"acpi_quirks.h"
-aicasm				optional ahc | ahd			   \
-	dependency	"$S/dev/aic7xxx/aicasm/*.[chyl]"		   \
-	compile-with	"CC='${CC}' ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
-	no-obj no-implicit-rule						   \
-	clean		"aicasm* y.tab.h"
 aic7xxx_seq.h			optional ahc				   \
-	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
+	compile-with	"aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
 	no-obj no-implicit-rule before-depend local			   \
 	clean		"aic7xxx_seq.h"					   \
-	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h"
 aic7xxx_reg.h			optional ahc				   \
-	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
+	compile-with	"aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
 	no-obj no-implicit-rule before-depend local			   \
 	clean		"aic7xxx_reg.h"					   \
-	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h"
 aic7xxx_reg_print.c		optional ahc				   \
-	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
+	compile-with	"aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic7xxx_seq.h -r aic7xxx_reg.h -p aic7xxx_reg_print.c -i $S/dev/aic7xxx/aic7xxx_osm.h $S/dev/aic7xxx/aic7xxx.seq"   \
 	no-obj no-implicit-rule local					   \
 	clean		"aic7xxx_reg_print.c"				   \
-	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+	dependency	"$S/dev/aic7xxx/aic7xxx.{reg,seq} $S/cam/scsi/scsi_message.h"
 aic7xxx_reg_print.o		optional ahc ahc_reg_pretty_print	   \
 	compile-with	"${NORMAL_C}"					   \
 	no-implicit-rule local
 aic79xx_seq.h		optional ahd pci				   \
-	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
+	compile-with	"aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
 	no-obj no-implicit-rule before-depend local			   \
 	clean		"aic79xx_seq.h"					   \
-	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h"
 aic79xx_reg.h		optional ahd pci				   \
-	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
+	compile-with	"aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
 	no-obj no-implicit-rule before-depend local			   \
 	clean		"aic79xx_reg.h"					   \
-	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h"
 aic79xx_reg_print.c	optional ahd pci				   \
-	compile-with	"./aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
+	compile-with	"aicasm ${INCLUDES} -I$S/cam/scsi -I$S/dev/aic7xxx -o aic79xx_seq.h -r aic79xx_reg.h -p aic79xx_reg_print.c -i $S/dev/aic7xxx/aic79xx_osm.h $S/dev/aic7xxx/aic79xx.seq"   \
 	no-obj no-implicit-rule local					   \
 	clean		"aic79xx_reg_print.c"				   \
-	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h aicasm"
+	dependency	"$S/dev/aic7xxx/aic79xx.{reg,seq} $S/cam/scsi/scsi_message.h"
 aic79xx_reg_print.o		optional ahd pci ahd_reg_pretty_print	   \
 	compile-with	"${NORMAL_C}"					   \
 	no-implicit-rule local
@@ -87,7 +82,7 @@ pccarddevs.h			standard				   \
 	compile-with	"${AWK} -f $S/tools/pccarddevs2h.awk $S/dev/pccard/pccarddevs" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"pccarddevs.h"
-teken_state.h		optional sc					   \
+teken_state.h		optional sc | vt				   \
 	dependency	"$S/teken/gensequences $S/teken/sequences" \
 	compile-with	"${AWK} -f $S/teken/gensequences $S/teken/sequences > teken_state.h" \
 	no-obj no-implicit-rule before-depend				   \
@@ -210,6 +205,7 @@ cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c			optional zfs compile-with "$
 cddl/contrib/opensolaris/uts/common/fs/zfs/lz4.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c			optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c				optional zfs compile-with "${ZFS_C}"
@@ -220,6 +216,7 @@ cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c			optional zfs compile-w
 cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c			optional zfs compile-with "${ZFS_C}"
+cddl/contrib/opensolaris/uts/common/fs/zfs/space_reftree.c		optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c			optional zfs compile-with "${ZFS_C}"
 cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c			optional zfs compile-with "${ZFS_C}"
@@ -1199,7 +1196,7 @@ t4fw.fwo		optional cxgbe					\
 	no-implicit-rule						\
 	clean		"t4fw.fwo"
 t4fw.fw			optional cxgbe					\
-	dependency	"$S/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu"	\
+	dependency	"$S/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"t4fw.fw"
@@ -1223,7 +1220,7 @@ t5fw.fwo		optional cxgbe					\
 	no-implicit-rule						\
 	clean		"t5fw.fwo"
 t5fw.fw			optional cxgbe					\
-	dependency	"$S/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu"	\
+	dependency	"$S/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu"	\
 	compile-with	"${NORMAL_FW}"					\
 	no-obj no-implicit-rule						\
 	clean		"t5fw.fw"
@@ -1380,6 +1377,7 @@ dev/etherswitch/arswitch/arswitch_8216.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_8226.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_8316.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_7240.c	optional arswitch
+dev/etherswitch/arswitch/arswitch_9340.c	optional arswitch
 dev/etherswitch/arswitch/arswitch_vlans.c	optional arswitch
 dev/etherswitch/etherswitch.c		optional etherswitch
 dev/etherswitch/etherswitch_if.m	optional etherswitch
@@ -1398,13 +1396,16 @@ dev/ex/if_ex_isa.c		optional ex isa
 dev/ex/if_ex_pccard.c		optional ex pccard
 dev/exca/exca.c			optional cbb
 dev/fatm/if_fatm.c		optional fatm pci
-dev/fb/splash.c			optional splash
+dev/fb/fbd.c			optional fbd | vt
+dev/fb/fb_if.m			standard
+dev/fb/splash.c			optional sc splash
 dev/fdt/fdt_common.c		optional fdt
+dev/fdt/fdt_ic_if.m		optional fdt
 dev/fdt/fdt_pci.c		optional fdt pci
 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/${FDT_DTS_FILE}"
-dev/fdt/fdtbus.c		optional fdt
+dev/fdt/fdtbus.c		optional fdtbus
 dev/fdt/simplebus.c		optional fdt
 dev/fe/if_fe.c			optional fe
 dev/fe/if_fe_pccard.c		optional fe pccard
@@ -1539,9 +1540,6 @@ dev/iscsi_initiator/isc_cam.c	optional iscsi_initiator scbus
 dev/iscsi_initiator/isc_soc.c	optional iscsi_initiator scbus
 dev/iscsi_initiator/isc_sm.c	optional iscsi_initiator scbus
 dev/iscsi_initiator/isc_subr.c	optional iscsi_initiator scbus
-dev/isf/isf.c			optional isf
-dev/isf/isf_fdt.c		optional isf fdt
-dev/isf/isf_nexus.c		optional isf
 dev/isp/isp.c			optional isp
 dev/isp/isp_freebsd.c		optional isp
 dev/isp/isp_library.c		optional isp
@@ -1882,6 +1880,8 @@ dev/nand/nfc_if.m		optional nand
 dev/ncv/ncr53c500.c		optional ncv
 dev/ncv/ncr53c500_pccard.c	optional ncv pccard
 dev/netmap/netmap.c		optional netmap
+dev/netmap/netmap_mem2.c	optional netmap
+# compile-with "${NORMAL_C} -Wconversion -Wextra"
 dev/nge/if_nge.c		optional nge
 dev/nxge/if_nxge.c		optional nxge \
 	compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN}"
@@ -1916,6 +1916,8 @@ dev/ofw/ofw_bus_if.m		optional fdt
 dev/ofw/ofw_bus_subr.c		optional fdt
 dev/ofw/ofw_fdt.c		optional fdt
 dev/ofw/ofw_if.m		optional fdt
+dev/ofw/ofw_iicbus.c		optional fdt iicbus
+dev/ofw/ofw_nexus.c		optional fdt
 dev/ofw/openfirm.c		optional fdt
 dev/ofw/openfirmio.c		optional fdt
 dev/patm/if_patm.c		optional patm pci
@@ -2043,13 +2045,15 @@ rt2860.fw			optional rt2860fw | ralfw		\
 	no-obj no-implicit-rule						\
 	clean		"rt2860.fw"
 dev/random/harvest.c		standard
-dev/random/hash.c		optional random
-dev/random/pseudo_rng.c		standard
+dev/random/dummy_rng.c		standard
 dev/random/random_adaptors.c	standard
-dev/random/random_harvestq.c	standard
+dev/random/live_entropy_sources.c	optional random
+dev/random/random_harvestq.c	optional random
 dev/random/randomdev.c		optional random
 dev/random/randomdev_soft.c	optional random
 dev/random/yarrow.c		optional random
+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/rndtest/rndtest.c		optional rndtest
@@ -2175,6 +2179,7 @@ dev/sound/midi/mpu_if.m		optional sound
 dev/sound/midi/mpufoi_if.m	optional sound
 dev/sound/midi/sequencer.c	optional sound
 dev/sound/midi/synth_if.m	optional sound
+dev/spibus/ofw_spibus.c		optional fdt spibus
 dev/spibus/spibus.c		optional spibus				\
 	dependency	"spibus_if.h"
 dev/spibus/spibus_if.m		optional spibus
@@ -2310,6 +2315,7 @@ dev/usb/usb_util.c		optional usb
 #
 dev/usb/net/if_aue.c		optional aue
 dev/usb/net/if_axe.c		optional axe
+dev/usb/net/if_axge.c		optional axge
 dev/usb/net/if_cdce.c		optional cdce
 dev/usb/net/if_cue.c		optional cue
 dev/usb/net/if_ipheth.c		optional ipheth
@@ -2320,8 +2326,8 @@ dev/usb/net/if_smsc.c		optional smsc
 dev/usb/net/if_udav.c		optional udav
 dev/usb/net/if_usie.c		optional usie
 dev/usb/net/ruephy.c		optional rue
-dev/usb/net/usb_ethernet.c	optional aue | axe | cdce | cue | kue | mos | \
-					 rue | smsc | udav | ipheth
+dev/usb/net/usb_ethernet.c	optional aue | axe | axge | cdce | cue | kue | \
+					 mos | rue | smsc | udav | ipheth
 dev/usb/net/uhso.c		optional uhso
 #
 # USB WLAN drivers
@@ -2457,6 +2463,17 @@ dev/vge/if_vge.c		optional vge
 
 dev/vkbd/vkbd.c			optional vkbd
 dev/vr/if_vr.c			optional vr pci
+dev/vt/colors/vt_termcolors.c	optional vt
+dev/vt/font/vt_font_default.c	optional vt
+dev/vt/font/vt_mouse_cursor.c	optional vt
+dev/vt/hw/fb/vt_fb.c		optional vt
+dev/vt/hw/vga/vga.c		optional vt vt_vga
+dev/vt/logo/logo_freebsd.c	optional vt splash
+dev/vt/vt_buf.c			optional vt
+dev/vt/vt_consolectl.c		optional vt
+dev/vt/vt_core.c		optional vt
+dev/vt/vt_font.c		optional vt
+dev/vt/vt_sysmouse.c		optional vt
 dev/vte/if_vte.c		optional vte pci
 dev/vx/if_vx.c			optional vx
 dev/vx/if_vx_eisa.c		optional vx eisa
@@ -2893,6 +2910,7 @@ kern/subr_sleepqueue.c		standard
 kern/subr_smp.c			standard
 kern/subr_stack.c		optional ddb | stack | ktr
 kern/subr_taskqueue.c		standard
+kern/subr_terminal.c		optional vt
 kern/subr_trap.c		standard
 kern/subr_turnstile.c		standard
 kern/subr_uio.c			standard
@@ -2919,7 +2937,6 @@ kern/tty_pts.c			standard
 kern/tty_tty.c			standard
 kern/tty_ttydisc.c		standard
 kern/uipc_accf.c		optional inet
-kern/uipc_cow.c			optional socket_send_cow
 kern/uipc_debug.c		optional ddb
 kern/uipc_domain.c		standard
 kern/uipc_mbuf.c		standard
@@ -3202,7 +3219,6 @@ netgraph/ng_echo.c		optional netgraph_echo
 netgraph/ng_eiface.c		optional netgraph_eiface
 netgraph/ng_ether.c		optional netgraph_ether
 netgraph/ng_ether_echo.c	optional netgraph_ether_echo
-netgraph/ng_fec.c		optional netgraph_fec
 netgraph/ng_frame_relay.c	optional netgraph_frame_relay
 netgraph/ng_gif.c		optional netgraph_gif
 netgraph/ng_gif_demux.c		optional netgraph_gif_demux
@@ -3712,7 +3728,7 @@ opencrypto/crypto.c		optional crypto
 opencrypto/cryptodev.c		optional cryptodev
 opencrypto/cryptodev_if.m	optional crypto
 opencrypto/cryptosoft.c		optional crypto
-opencrypto/deflate.c		optional crypto
+opencrypto/cryptodeflate.c	optional crypto
 opencrypto/rmd160.c		optional crypto | ipsec
 opencrypto/skipjack.c		optional crypto
 opencrypto/xform.c		optional crypto
@@ -3794,7 +3810,7 @@ security/mac_portacl/mac_portacl.c optional mac_portacl
 security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids
 security/mac_stub/mac_stub.c	optional mac_stub
 security/mac_test/mac_test.c	optional mac_test
-teken/teken.c			optional sc
+teken/teken.c			optional sc | vt
 ufs/ffs/ffs_alloc.c		optional ffs
 ufs/ffs/ffs_balloc.c		optional ffs
 ufs/ffs/ffs_inode.c		optional ffs
@@ -3844,7 +3860,6 @@ vm/vm_zeroidle.c		standard
 vm/vnode_pager.c		standard
 xen/gnttab.c			optional xen | xenhvm
 xen/features.c			optional xen | xenhvm
-xen/evtchn/evtchn_dev.c		optional xen | xenhvm
 xen/xenbus/xenbus_if.m		optional xen | xenhvm
 xen/xenbus/xenbus.c		optional xen | xenhvm
 xen/xenbus/xenbusb_if.m		optional xen | xenhvm
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 9ee6d77d4ba..d1bdcd97bfb 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -241,7 +241,7 @@ dev/hyperv/vmbus/hv_connection.c			optional	hyperv
 dev/hyperv/vmbus/hv_hv.c				optional	hyperv
 dev/hyperv/vmbus/hv_ring_buffer.c			optional	hyperv
 dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c			optional	hyperv
-dev/kbd/kbd.c			optional	atkbd | sc | ukbd
+dev/kbd/kbd.c			optional	atkbd | sc | ukbd | vt
 dev/lindev/full.c		optional	lindev
 dev/lindev/lindev.c		optional	lindev
 dev/nfe/if_nfe.c		optional	nfe pci
@@ -259,8 +259,8 @@ dev/nvme/nvme_sysctl.c		optional	nvme
 dev/nvme/nvme_test.c		optional	nvme
 dev/nvme/nvme_util.c		optional	nvme
 dev/nvram/nvram.c		optional	nvram isa
-dev/random/ivy.c		optional	random rdrand_rng
-dev/random/nehemiah.c		optional	random padlock_rng
+dev/random/ivy.c		optional	rdrand_rng
+dev/random/nehemiah.c		optional	padlock_rng
 dev/qlxge/qls_dbg.c		optional	qlxge pci
 dev/qlxge/qls_dump.c		optional	qlxge pci
 dev/qlxge/qls_hw.c		optional	qlxge pci
@@ -531,6 +531,15 @@ x86/cpufreq/powernow.c		optional	cpufreq
 x86/cpufreq/est.c		optional	cpufreq
 x86/cpufreq/hwpstate.c		optional	cpufreq
 x86/cpufreq/p4tcc.c		optional	cpufreq
+x86/iommu/busdma_dmar.c		optional	acpi acpi_dmar pci
+x86/iommu/intel_ctx.c		optional	acpi acpi_dmar pci
+x86/iommu/intel_drv.c		optional	acpi acpi_dmar pci
+x86/iommu/intel_fault.c		optional	acpi acpi_dmar pci
+x86/iommu/intel_gas.c		optional	acpi acpi_dmar pci
+x86/iommu/intel_idpgtbl.c	optional	acpi acpi_dmar pci
+x86/iommu/intel_qi.c		optional	acpi acpi_dmar pci
+x86/iommu/intel_quirks.c	optional	acpi acpi_dmar pci
+x86/iommu/intel_utils.c		optional	acpi acpi_dmar pci
 x86/isa/atpic.c			optional	atpic isa
 x86/isa/atrtc.c			standard
 x86/isa/clock.c			standard
@@ -541,6 +550,7 @@ x86/isa/nmi.c			standard
 x86/isa/orm.c			optional	isa
 x86/pci/pci_bus.c		optional	pci
 x86/pci/qpi.c			optional	pci
+x86/x86/busdma_bounce.c		standard
 x86/x86/busdma_machdep.c	standard
 x86/x86/dump_machdep.c		standard
 x86/x86/fdt_machdep.c		optional	fdt
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index dbb9ffc2d36..392360d3338 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -14,6 +14,7 @@ arm/arm/cpufunc_asm_armv4.S 	standard
 arm/arm/db_disasm.c		optional	ddb
 arm/arm/db_interface.c		optional	ddb
 arm/arm/db_trace.c		optional	ddb
+arm/arm/devmap.c		standard
 arm/arm/disassem.c		optional	ddb
 arm/arm/dump_machdep.c		standard
 arm/arm/elf_machdep.c		standard
@@ -61,7 +62,7 @@ crypto/blowfish/bf_enc.c	optional	crypto | ipsec
 crypto/des/des_enc.c		optional	crypto | ipsec | netsmb
 dev/fb/fb.c			optional	sc
 dev/hwpmc/hwpmc_arm.c		optional	hwpmc
-dev/kbd/kbd.c			optional	sc
+dev/kbd/kbd.c			optional	sc | vt
 dev/syscons/scgfbrndr.c		optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvtb.c		optional	sc
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index b29d8f9213c..eb8697cd9d7 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -221,6 +221,18 @@ dev/hwpmc/hwpmc_piv.c		optional hwpmc
 dev/hwpmc/hwpmc_ppro.c		optional hwpmc
 dev/hwpmc/hwpmc_tsc.c		optional hwpmc
 dev/hwpmc/hwpmc_x86.c		optional hwpmc
+dev/hyperv/netvsc/hv_net_vsc.c				optional	hyperv
+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_util.c				optional	hyperv
+dev/hyperv/vmbus/hv_channel.c				optional	hyperv
+dev/hyperv/vmbus/hv_channel_mgmt.c			optional	hyperv
+dev/hyperv/vmbus/hv_connection.c			optional	hyperv
+dev/hyperv/vmbus/hv_hv.c				optional	hyperv
+dev/hyperv/vmbus/hv_ring_buffer.c			optional	hyperv
+dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c			optional	hyperv
 dev/ichwd/ichwd.c		optional ichwd
 dev/if_ndis/if_ndis.c		optional ndis
 dev/if_ndis/if_ndis_pccard.c	optional ndis pccard
@@ -237,7 +249,7 @@ 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_linux
-dev/kbd/kbd.c			optional atkbd | sc | ukbd
+dev/kbd/kbd.c			optional atkbd | sc | ukbd | vt
 dev/le/if_le_isa.c		optional le isa
 dev/lindev/full.c		optional lindev
 dev/lindev/lindev.c		optional lindev
@@ -257,8 +269,8 @@ dev/nvme/nvme_test.c		optional nvme
 dev/nvme/nvme_util.c		optional nvme
 dev/nvram/nvram.c		optional nvram isa
 dev/pcf/pcf_isa.c		optional pcf
-dev/random/ivy.c		optional random rdrand_rng
-dev/random/nehemiah.c		optional random padlock_rng
+dev/random/ivy.c		optional rdrand_rng
+dev/random/nehemiah.c		optional padlock_rng
 dev/sbni/if_sbni.c		optional sbni
 dev/sbni/if_sbni_isa.c		optional sbni isa
 dev/sbni/if_sbni_pci.c		optional sbni pci
@@ -281,6 +293,7 @@ dev/viawd/viawd.c		optional viawd
 dev/vmware/vmxnet3/if_vmx.c	optional vmx
 dev/acpica/acpi_if.m		standard
 dev/acpi_support/acpi_wmi_if.m	standard
+dev/vt/hw/xboxfb/xboxfb.c	optional vt_xboxfb
 dev/wbwd/wbwd.c			optional wbwd
 dev/wpi/if_wpi.c		optional wpi
 dev/isci/isci.c							optional isci
@@ -554,6 +567,15 @@ x86/cpufreq/hwpstate.c		optional cpufreq
 x86/cpufreq/p4tcc.c		optional cpufreq
 x86/cpufreq/powernow.c		optional cpufreq
 x86/cpufreq/smist.c		optional cpufreq
+x86/iommu/busdma_dmar.c		optional acpi acpi_dmar pci
+x86/iommu/intel_ctx.c		optional acpi acpi_dmar pci
+x86/iommu/intel_drv.c		optional acpi acpi_dmar pci
+x86/iommu/intel_fault.c		optional acpi acpi_dmar pci
+x86/iommu/intel_gas.c		optional acpi acpi_dmar pci
+x86/iommu/intel_idpgtbl.c	optional acpi acpi_dmar pci
+x86/iommu/intel_qi.c		optional acpi acpi_dmar pci
+x86/iommu/intel_quirks.c	optional acpi acpi_dmar pci
+x86/iommu/intel_utils.c		optional acpi acpi_dmar pci
 x86/isa/atpic.c			optional atpic
 x86/isa/atrtc.c			optional native
 x86/isa/clock.c			optional native
@@ -564,6 +586,7 @@ x86/isa/nmi.c			standard
 x86/isa/orm.c			optional isa
 x86/pci/pci_bus.c		optional pci
 x86/pci/qpi.c			optional pci
+x86/x86/busdma_bounce.c		standard
 x86/x86/busdma_machdep.c	standard
 x86/x86/dump_machdep.c		standard
 x86/x86/fdt_machdep.c		optional fdt
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index a8e60b6f729..fd3ad4a2617 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -247,6 +247,7 @@ x86/isa/atpic.c			optional atpic
 x86/isa/clock.c			standard
 x86/isa/isa.c			optional isa
 x86/pci/pci_bus.c		optional pci
+x86/x86/busdma_bounce.c		standard
 x86/x86/busdma_machdep.c	standard
 x86/x86/dump_machdep.c		standard
 x86/x86/intr_machdep.c		standard
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index f714987989a..f3365ef1426 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -35,7 +35,7 @@ dev/iicbus/ad7417.c		optional	ad7417 powermac
 dev/iicbus/ds1631.c		optional	ds1631 powermac
 dev/iicbus/ds1775.c		optional	ds1775 powermac
 dev/iicbus/max6690.c		optional	max6690 powermac
-dev/kbd/kbd.c			optional	sc
+dev/kbd/kbd.c			optional	sc | vt
 dev/nand/nfc_fsl.c		optional	nand mpc85xx
 # ofw can be either aim or fdt: fdt case handled in files. aim only powerpc specific.
 dev/ofw/openfirm.c		optional	aim
@@ -46,6 +46,7 @@ dev/ofw/ofw_bus_subr.c		optional	aim
 dev/ofw/ofw_console.c		optional	aim
 dev/ofw/ofw_disk.c		optional	ofwd aim
 dev/ofw/ofw_iicbus.c		optional	iicbus aim
+dev/ofw/ofw_nexus.c		optional	aim | fdt
 dev/ofw/ofw_standard.c		optional	aim powerpc
 dev/powermac_nvram/powermac_nvram.c optional	powermac_nvram powermac
 dev/quicc/quicc_bfe_fdt.c	optional	quicc mpc85xx
@@ -62,9 +63,9 @@ dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvtb.c		optional	sc
 dev/tsec/if_tsec.c		optional	tsec
 dev/tsec/if_tsec_fdt.c		optional	tsec fdt
-dev/uart/uart_cpu_fdt.c		optional	uart fdt
-dev/uart/uart_cpu_powerpc.c	optional	uart aim
+dev/uart/uart_cpu_powerpc.c	optional	uart
 dev/usb/controller/ehci_fsl.c	optional	ehci mpc85xx
+dev/vt/hw/ofwfb/ofwfb.c		optional	vt aim
 kern/kern_clocksource.c		standard
 kern/subr_dummy_vdso_tc.c	standard
 kern/syscalls.c			optional	ktr
@@ -85,8 +86,6 @@ libkern/qdivrem.c		optional	powerpc
 libkern/ucmpdi2.c		optional	powerpc
 libkern/udivdi3.c		optional	powerpc
 libkern/umoddi3.c		optional	powerpc
-powerpc/aim/clock.c		optional	aim
-powerpc/aim/copyinout.c		optional	aim
 powerpc/aim/interrupt.c		optional	aim
 powerpc/aim/locore.S		optional	aim no-obj
 powerpc/aim/machdep.c		optional	aim
@@ -95,41 +94,32 @@ powerpc/aim/mmu_oea64.c		optional	aim
 powerpc/aim/moea64_if.m		optional	aim
 powerpc/aim/moea64_native.c	optional	aim
 powerpc/aim/mp_cpudep.c		optional	aim smp
-powerpc/aim/nexus.c		optional	aim
 powerpc/aim/slb.c		optional	aim powerpc64
-powerpc/aim/swtch32.S		optional	aim powerpc
-powerpc/aim/swtch64.S		optional	aim powerpc64
 powerpc/aim/trap.c		optional	aim
 powerpc/aim/uma_machdep.c	optional	aim
-powerpc/aim/vm_machdep.c	optional	aim
-powerpc/booke/clock.c		optional	booke
-powerpc/booke/copyinout.c	optional	booke
 powerpc/booke/interrupt.c	optional	booke
 powerpc/booke/locore.S		optional	booke no-obj
 powerpc/booke/machdep.c		optional	booke
 powerpc/booke/machdep_e500.c	optional	booke_e500
 powerpc/booke/mp_cpudep.c	optional	booke smp
-powerpc/booke/platform_bare.c	optional	mpc85xx
+powerpc/booke/platform_bare.c	optional	booke
 powerpc/booke/pmap.c		optional	booke
-powerpc/booke/swtch.S		optional	booke
 powerpc/booke/trap.c		optional	booke
-powerpc/booke/vm_machdep.c	optional	booke
 powerpc/cpufreq/dfs.c		optional	cpufreq
 powerpc/cpufreq/pcr.c		optional	cpufreq aim
-powerpc/fpu/fpu_add.c		optional	fpu_emu powerpc
-powerpc/fpu/fpu_compare.c	optional	fpu_emu powerpc
-powerpc/fpu/fpu_div.c		optional	fpu_emu powerpc
-powerpc/fpu/fpu_emu.c		optional	fpu_emu powerpc
-powerpc/fpu/fpu_explode.c	optional	fpu_emu powerpc
-powerpc/fpu/fpu_implode.c	optional	fpu_emu powerpc
-powerpc/fpu/fpu_mul.c		optional	fpu_emu powerpc
-powerpc/fpu/fpu_sqrt.c		optional	fpu_emu powerpc
-powerpc/fpu/fpu_subr.c		optional	fpu_emu powerpc
+powerpc/fpu/fpu_add.c		optional	fpu_emu
+powerpc/fpu/fpu_compare.c	optional	fpu_emu
+powerpc/fpu/fpu_div.c		optional	fpu_emu
+powerpc/fpu/fpu_emu.c		optional	fpu_emu
+powerpc/fpu/fpu_explode.c	optional	fpu_emu
+powerpc/fpu/fpu_implode.c	optional	fpu_emu
+powerpc/fpu/fpu_mul.c		optional	fpu_emu
+powerpc/fpu/fpu_sqrt.c		optional	fpu_emu
+powerpc/fpu/fpu_subr.c		optional	fpu_emu
 powerpc/mambo/mambocall.S	optional	mambo
 powerpc/mambo/mambo.c		optional	mambo
 powerpc/mambo/mambo_console.c	optional	mambo
 powerpc/mambo/mambo_disk.c	optional	mambo
-powerpc/mambo/mambo_openpic.c	optional	mambo
 powerpc/mpc85xx/atpic.c		optional	mpc85xx isa
 powerpc/mpc85xx/ds1553_bus_fdt.c	optional	ds1553 fdt
 powerpc/mpc85xx/ds1553_core.c	optional	ds1553
@@ -137,18 +127,19 @@ powerpc/mpc85xx/i2c.c		optional	iicbus fdt
 powerpc/mpc85xx/isa.c		optional	mpc85xx isa
 powerpc/mpc85xx/lbc.c		optional	mpc85xx
 powerpc/mpc85xx/mpc85xx.c	optional	mpc85xx
-powerpc/mpc85xx/nexus.c		optional	mpc85xx
-powerpc/mpc85xx/pci_fdt.c	optional	pci mpc85xx
+powerpc/mpc85xx/platform_mpc85xx.c	optional	mpc85xx
+powerpc/mpc85xx/pci_mpc85xx.c	optional	pci mpc85xx
 powerpc/ofw/ofw_cpu.c		optional	aim
-powerpc/ofw/ofw_machdep.c	optional	aim
-powerpc/ofw/ofw_pci.c		optional	pci aim
-powerpc/ofw/ofw_pcibus.c	optional	pci aim
-powerpc/ofw/ofw_pcib_pci.c	optional	pci aim
+powerpc/ofw/ofw_machdep.c	standard
+powerpc/ofw/ofw_pci.c		optional	pci
+powerpc/ofw/ofw_pcibus.c	optional	pci
+powerpc/ofw/ofw_pcib_pci.c	optional	pci
 powerpc/ofw/ofw_real.c		optional	aim
 powerpc/ofw/ofw_syscons.c	optional	sc aim
 powerpc/ofw/ofwcall32.S		optional	aim powerpc
 powerpc/ofw/ofwcall64.S		optional	aim powerpc64
 powerpc/ofw/ofwmagic.S		optional	aim
+powerpc/ofw/openpic_ofw.c	optional	aim | fdt
 powerpc/ofw/rtas.c		optional	aim
 powerpc/powermac/ata_kauai.c	optional	powermac ata | powermac atamacio
 powerpc/powermac/ata_macio.c	optional	powermac ata | powermac atamacio
@@ -164,7 +155,6 @@ powerpc/powermac/kiic.c		optional	powermac kiic
 powerpc/powermac/macgpio.c	optional	powermac pci 
 powerpc/powermac/macio.c	optional	powermac pci
 powerpc/powermac/nvbl.c		optional	powermac nvbl
-powerpc/powermac/openpic_macio.c optional	powermac pci
 powerpc/powermac/platform_powermac.c optional	powermac
 powerpc/powermac/powermac_thermal.c optional	powermac
 powerpc/powermac/pswitch.c	optional	powermac pswitch
@@ -175,11 +165,13 @@ powerpc/powermac/uninorth.c	optional	powermac
 powerpc/powermac/uninorthpci.c	optional	powermac pci
 powerpc/powermac/vcoregpio.c	optional	powermac 
 powerpc/powermac/windtunnel.c	optional	powermac windtunnel
-powerpc/powerpc/altivec.c	optional	aim
+powerpc/powerpc/altivec.c	standard
 powerpc/powerpc/autoconf.c	standard
 powerpc/powerpc/bcopy.c		standard
 powerpc/powerpc/bus_machdep.c	standard
 powerpc/powerpc/busdma_machdep.c standard
+powerpc/powerpc/clock.c		standard
+powerpc/powerpc/copyinout.c	standard
 powerpc/powerpc/copystr.c	standard
 powerpc/powerpc/cpu.c		standard
 powerpc/powerpc/db_disasm.c	optional	ddb
@@ -190,7 +182,7 @@ powerpc/powerpc/dump_machdep.c	standard
 powerpc/powerpc/elf32_machdep.c	optional	powerpc | compat_freebsd32
 powerpc/powerpc/elf64_machdep.c	optional	powerpc64
 powerpc/powerpc/exec_machdep.c	standard
-powerpc/powerpc/fpu.c		optional	aim
+powerpc/powerpc/fpu.c		standard
 powerpc/powerpc/fuswintr.c	standard
 powerpc/powerpc/gdb_machdep.c	optional	gdb
 powerpc/powerpc/in_cksum.c	optional	inet | inet6
@@ -199,8 +191,8 @@ powerpc/powerpc/iommu_if.m	standard
 powerpc/powerpc/mem.c		optional	mem
 powerpc/powerpc/mmu_if.m	standard
 powerpc/powerpc/mp_machdep.c	optional	smp
+powerpc/powerpc/nexus.c		standard
 powerpc/powerpc/openpic.c	standard
-powerpc/powerpc/openpic_fdt.c	optional	fdt
 powerpc/powerpc/pic_if.m	standard
 powerpc/powerpc/pmap_dispatch.c	standard
 powerpc/powerpc/platform.c	standard
@@ -209,11 +201,14 @@ powerpc/powerpc/sc_machdep.c	optional	sc
 powerpc/powerpc/setjmp.S	standard
 powerpc/powerpc/sigcode32.S	optional	powerpc | compat_freebsd32
 powerpc/powerpc/sigcode64.S	optional	powerpc64
+powerpc/powerpc/swtch32.S	optional	powerpc
+powerpc/powerpc/swtch64.S	optional	powerpc64
 powerpc/powerpc/stack_machdep.c	optional	ddb | stack
 powerpc/powerpc/suswintr.c	standard
 powerpc/powerpc/syncicache.c	standard
 powerpc/powerpc/sys_machdep.c	standard
 powerpc/powerpc/uio_machdep.c	standard
+powerpc/powerpc/vm_machdep.c	standard
 powerpc/ps3/ehci_ps3.c		optional	ps3 ehci
 powerpc/ps3/ohci_ps3.c		optional	ps3 ohci
 powerpc/ps3/if_glc.c		optional	ps3 glc
@@ -228,9 +223,11 @@ powerpc/ps3/ps3-hvcall.S	optional	ps3 sc
 powerpc/pseries/phyp-hvcall.S	optional	pseries powerpc64
 powerpc/pseries/mmu_phyp.c	optional	pseries powerpc64
 powerpc/pseries/phyp_console.c	optional	pseries powerpc64 uart
+powerpc/pseries/phyp_llan.c	optional	llan
 powerpc/pseries/phyp_vscsi.c	optional	pseries powerpc64 scbus
 powerpc/pseries/platform_chrp.c	optional	pseries
 powerpc/pseries/plpar_iommu.c	optional	pseries powerpc64
+powerpc/pseries/plpar_pcibus.c	optional	pseries powerpc64 pci
 powerpc/pseries/rtas_dev.c	optional	pseries
 powerpc/pseries/rtas_pci.c	optional	pseries pci
 powerpc/pseries/vdevice.c	optional	pseries powerpc64
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index a0fad9b5477..5c00350e7cd 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -39,7 +39,7 @@ dev/fb/fb.c			optional	sc
 dev/fb/gallant12x22.c		optional	sc
 dev/fb/machfb.c			optional	machfb sc
 dev/hwpmc/hwpmc_sparc64.c	optional	hwpmc
-dev/kbd/kbd.c			optional	atkbd | sc | ukbd
+dev/kbd/kbd.c			optional	atkbd | sc | ukbd | vt
 dev/le/if_le_lebuffer.c		optional	le sbus
 dev/le/if_le_ledma.c		optional	le sbus
 dev/le/lebuffer_sbus.c		optional	le sbus
@@ -59,7 +59,8 @@ dev/syscons/scgfbrndr.c		optional	sc
 dev/syscons/scterm-teken.c	optional	sc
 dev/syscons/scvtb.c		optional	sc
 dev/uart/uart_cpu_sparc64.c	optional	uart
-dev/uart/uart_kbd_sun.c		optional	uart sc
+dev/uart/uart_kbd_sun.c		optional	uart sc | vt
+dev/vt/hw/ofwfb/ofwfb.c		optional	vt
 kern/kern_clocksource.c		standard
 kern/subr_dummy_vdso_tc.c	standard
 kern/syscalls.c			optional	ktr
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 2939a59cb0b..6e6ba92c4db 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -147,6 +147,12 @@ INLINE_LIMIT?=	8000
 #
 CFLAGS+=	-ffreestanding
 
+#
+# Do not allow a compiler to optimize out overflow checks for signed
+# types.
+#
+CFLAGS+=	-fno-strict-overflow
+
 #
 # GCC SSP support
 #
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index b01d5061aec..e979011e611 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -80,16 +80,17 @@ INCLUDES+= -I$S/dev/cxgb -I$S/dev/cxgbe
 
 CFLAGS=	${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
 CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
+CFLAGS_PARAM_INLINE_UNIT_GROWTH?=100
+CFLAGS_PARAM_LARGE_FUNCTION_GROWTH?=1000
+.if ${MACHINE_CPUARCH} == "mips"
+CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000
+.endif
 .if ${COMPILER_TYPE} != "clang"
 CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
-.if ${MACHINE_CPUARCH} != "mips"
-CFLAGS+= --param inline-unit-growth=100
-CFLAGS+= --param large-function-growth=1000
-.else
-# XXX Actually a gross hack just for Octeon because of the Simple Executive.
-CFLAGS+= --param inline-unit-growth=10000
-CFLAGS+= --param large-function-growth=100000
-CFLAGS+= --param max-inline-insns-single=10000
+CFLAGS+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
+CFLAGS+= --param large-function-growth=${CFLAGS_PARAM_LARGE_FUNCTION_GROWTH}
+.if defined(CFLAGS_ARCH_PARAMS)
+CFLAGS+=${CFLAGS_ARCH_PARAMS}
 .endif
 .endif
 WERROR?= -Werror
@@ -193,7 +194,7 @@ MKMODULESENV+=	WITHOUT_MODULES="${WITHOUT_MODULES}"
 MKMODULESENV+=	DEBUG_FLAGS="${DEBUG}"
 .endif
 
-# Are various things configured?
+# Detect kernel config options that force stack frames to be turned on.
 DDB_ENABLED!=	grep DDB opt_ddb.h || true ; echo
 DTR_ENABLED!=	grep KDTRACE_FRAME opt_kdtrace.h || true ; echo
 HWPMC_ENABLED!=	grep HWPMC opt_hwpmc_hooks.h || true ; echo
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 7eaba852984..bd058789b54 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -340,13 +340,13 @@ CFLAGS+=	${CONF_CFLAGS}
 
 MFILES?= dev/acpica/acpi_if.m dev/acpi_support/acpi_wmi_if.m \
 	dev/agp/agp_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \
-	dev/gpio/gpio_if.m dev/gpio/gpiobus_if.m \
+	dev/fb/fb_if.m dev/gpio/gpio_if.m dev/gpio/gpiobus_if.m \
 	dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \
 	dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \
 	dev/mii/miibus_if.m dev/mvs/mvs_if.m dev/ofw/ofw_bus_if.m \
 	dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
 	dev/pci/pcib_if.m dev/ppbus/ppbus_if.m \
-	dev/sdhci/sdhci_if.m dev/smbus/smbus_if.m \
+	dev/sdhci/sdhci_if.m dev/smbus/smbus_if.m dev/spibus/spibus_if.m \
 	dev/sound/pci/hda/hdac_if.m \
 	dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
 	dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 263eb4c76ee..e4efc0ae8cf 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -31,8 +31,8 @@
 # $FreeBSD$
 
 TYPE="FreeBSD"
-REVISION="10.0"
-BRANCH="ALPHA4"
+REVISION="11.0"
+BRANCH="CURRENT"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
@@ -130,6 +130,15 @@ if [ -d "${SYSDIR}/../.git" ] ; then
 	done
 fi
 
+if [ -d "${SYSDIR}/../.hg" ] ; then
+	for dir in /usr/bin /usr/local/bin; do
+		if [ -x "${dir}/hg" ] ; then
+			hg_cmd="${dir}/hg -R ${SYSDIR}/../.hg"
+			break
+		fi
+	done
+fi
+
 if [ -n "$svnversion" ] ; then
 	svn=`cd ${SYSDIR} && $svnversion 2>/dev/null`
 	case "$svn" in
@@ -184,12 +193,23 @@ if [ -n "$p4_cmd" ] ; then
 	*)	unset p4version ;;
 	esac
 fi
-	
+
+if [ -n "$hg_cmd" ] ; then
+	hg=`$hg_cmd id 2>/dev/null`
+	svn=`$hg_cmd svn info 2>/dev/null | \
+		awk -F': ' '/Revision/ { print $2 }'`
+	if [ -n "$svn" ] ; then
+		svn=" r${svn}"
+	fi
+	if [ -n "$hg" ] ; then
+		hg=" ${hg}"
+	fi
+fi
 
 cat << EOF > vers.c
 $COPYRIGHT
-#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${p4version}: ${t}"
-#define VERSTR "${VERSION} #${v}${svn}${git}${p4version}: ${t}\\n    ${u}@${h}:${d}\\n"
+#define SCCSSTR "@(#)${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}"
+#define VERSTR "${VERSION} #${v}${svn}${git}${hg}${p4version}: ${t}\\n    ${u}@${h}:${d}\\n"
 #define RELSTR "${RELEASE}"
 
 char sccs[sizeof(SCCSSTR) > 128 ? sizeof(SCCSSTR) : 128] = SCCSSTR;
diff --git a/sys/conf/options b/sys/conf/options
index 2c0a183594f..12b705510e7 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -68,6 +68,8 @@ TEXTDUMP_VERBOSE	opt_ddb.h
 # Miscellaneous options.
 ADAPTIVE_LOCKMGRS
 ALQ
+ALTERA_SDCARD_FAST_SIM	opt_altera_sdcard.h
+ATSE_CFI_HACK	opt_cfi.h
 AUDIT		opt_global.h
 BOOTHOWTO	opt_global.h
 BOOTVERBOSE	opt_global.h
@@ -124,7 +126,8 @@ GEOM_UZIP	opt_geom.h
 GEOM_VIRSTOR	opt_geom.h
 GEOM_VOL	opt_geom.h
 GEOM_ZERO	opt_geom.h
-KDTRACE_HOOKS	opt_kdtrace.h
+KDTRACE_HOOKS	opt_global.h
+KDTRACE_FRAME	opt_kdtrace.h
 KSTACK_MAX_PAGES
 KSTACK_PAGES
 KTRACE
@@ -162,7 +165,6 @@ PPC_DEBUG	opt_ppc.h
 PPC_PROBE_CHIPSET	opt_ppc.h
 PPS_SYNC	opt_ntp.h
 PREEMPTION	opt_sched.h
-PROCDESC	opt_procdesc.h
 QUOTA
 SCHED_4BSD	opt_sched.h
 SCHED_STATS	opt_sched.h
@@ -686,6 +688,7 @@ OPENSOLARIS_WITNESS	opt_global.h
 ACPI_DEBUG		opt_acpi.h
 ACPI_MAX_TASKS		opt_acpi.h
 ACPI_MAX_THREADS	opt_acpi.h
+ACPI_DMAR		opt_acpi.h
 
 # ISA support
 DEV_ISA			opt_isa.h
@@ -728,8 +731,10 @@ SAFE_DEBUG		opt_safe.h
 SAFE_NO_RNG		opt_safe.h
 SAFE_RNDTEST		opt_safe.h
 
-# syscons options
+# syscons/vt options
 MAXCONS			opt_syscons.h
+VT_FB_DEFAULT_WIDTH	opt_syscons.h
+VT_FB_DEFAULT_HEIGHT	opt_syscons.h
 SC_ALT_MOUSE_IMAGE	opt_syscons.h
 SC_CUT_SPACES2TABS	opt_syscons.h
 SC_CUT_SEPCHARS		opt_syscons.h
@@ -752,6 +757,9 @@ SC_NORM_REV_ATTR	opt_syscons.h
 SC_PIXEL_MODE		opt_syscons.h
 SC_RENDER_DEBUG		opt_syscons.h
 SC_TWOBUTTON_MOUSE	opt_syscons.h
+DEV_SC			opt_syscons.h
+DEV_VT			opt_syscons.h
+
 
 # teken terminal emulator options
 TEKEN_CONS25		opt_teken.h
@@ -904,3 +912,9 @@ RACCT		opt_global.h
 
 # Resource Limits
 RCTL		opt_global.h
+
+# Random number generator(s)
+RANDOM_YARROW	opt_random.h
+RANDOM_FORTUNA	opt_random.h
+RANDOM_DEBUG	opt_random.h
+RANDOM_RWFILE	opt_random.h
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 31d16508d68..f1d4b4a57e4 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -58,9 +58,6 @@ PSM_RESETAFTERSUSPEND	opt_psm.h
 PSM_DEBUG		opt_psm.h
 DEV_ATPIC		opt_atpic.h
 
-# Debugging
-KDTRACE_FRAME		opt_kdtrace.h
-
 # BPF just-in-time compiler
 BPF_JITTER		opt_bpf.h
 
diff --git a/sys/conf/options.arm b/sys/conf/options.arm
index 1d676452e7d..a503eb0d0fe 100644
--- a/sys/conf/options.arm
+++ b/sys/conf/options.arm
@@ -5,7 +5,6 @@ ARM_KERN_DIRECTMAP	opt_vm.h
 ARM_L2_PIPT		opt_global.h
 ARM_MANY_BOARD		opt_global.h
 ARM_USE_SMALL_ALLOC	opt_global.h
-ARM_VFP_SUPPORT		opt_global.h
 ARM_WANT_TP_ADDRESS	opt_global.h
 COUNTS_PER_SEC		opt_timer.h
 CPU_ARM9		opt_global.h
diff --git a/sys/conf/options.mips b/sys/conf/options.mips
index 1435a6eac6c..911e74b2c63 100644
--- a/sys/conf/options.mips
+++ b/sys/conf/options.mips
@@ -29,6 +29,8 @@
 # $FreeBSD$
 
 CPU_MIPS4KC	opt_global.h
+CPU_MIPS24KC	opt_global.h
+CPU_MIPS74KC	opt_global.h
 CPU_MIPS32	opt_global.h
 CPU_MIPS64	opt_global.h
 CPU_SENTRY5	opt_global.h
@@ -68,6 +70,11 @@ TICK_USE_MALTA_RTC	opt_global.h
 #
 MAXMEM			opt_global.h
 
+#
+# Manual override of cache config
+#
+MIPS_DISABLE_L1_CACHE	opt_global.h
+
 #
 # Options that control the Cavium Simple Executive.
 #
@@ -78,6 +85,11 @@ OCTEON_VENDOR_RADISYS		opt_cvmx.h
 OCTEON_VENDOR_GEFES		opt_cvmx.h
 OCTEON_BOARD_CAPK_0100ND	opt_cvmx.h
 
+#
+# Options specific to the BERI platform. 
+#
+BERI_LARGE_TLB			opt_global.h
+
 #
 # Options that control the Atheros SoC peripherals
 #
diff --git a/sys/contrib/altq/altq/altq_cbq.c b/sys/contrib/altq/altq/altq_cbq.c
index 0a337929fe4..3991d1d927c 100644
--- a/sys/contrib/altq/altq/altq_cbq.c
+++ b/sys/contrib/altq/altq/altq_cbq.c
@@ -54,9 +54,12 @@
 #endif
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <netinet/in.h>
 
-#include <net/pfvar.h>
+#include <netpfil/pf/pf.h>
+#include <netpfil/pf/pf_altq.h>
+#include <netpfil/pf/pf_mtag.h>
 #include <altq/altq.h>
 #include <altq/altq_cbq.h>
 #ifdef ALTQ3_COMPAT
diff --git a/sys/contrib/altq/altq/altq_cdnr.c b/sys/contrib/altq/altq/altq_cdnr.c
index fca7041fdee..ee36fe8a9f5 100644
--- a/sys/contrib/altq/altq/altq_cdnr.c
+++ b/sys/contrib/altq/altq/altq_cdnr.c
@@ -55,6 +55,7 @@
 #include <netinet/ip6.h>
 #endif
 
+#include <altq/if_altq.h>
 #include <altq/altq.h>
 #ifdef ALTQ3_COMPAT
 #include <altq/altq_conf.h>
diff --git a/sys/contrib/altq/altq/altq_hfsc.c b/sys/contrib/altq/altq/altq_hfsc.c
index f436bd5014d..03630167fc6 100644
--- a/sys/contrib/altq/altq/altq_hfsc.c
+++ b/sys/contrib/altq/altq/altq_hfsc.c
@@ -66,9 +66,12 @@
 #endif /* ALTQ3_COMPAT */
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <netinet/in.h>
 
-#include <net/pfvar.h>
+#include <netpfil/pf/pf.h>
+#include <netpfil/pf/pf_altq.h>
+#include <netpfil/pf/pf_mtag.h>
 #include <altq/altq.h>
 #include <altq/altq_hfsc.h>
 #ifdef ALTQ3_COMPAT
diff --git a/sys/contrib/altq/altq/altq_priq.c b/sys/contrib/altq/altq/altq_priq.c
index 72bad809d27..3ce65dc15e1 100644
--- a/sys/contrib/altq/altq/altq_priq.c
+++ b/sys/contrib/altq/altq/altq_priq.c
@@ -51,9 +51,12 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <netinet/in.h>
 
-#include <net/pfvar.h>
+#include <netpfil/pf/pf.h>
+#include <netpfil/pf/pf_altq.h>
+#include <netpfil/pf/pf_mtag.h>
 #include <altq/altq.h>
 #ifdef ALTQ3_COMPAT
 #include <altq/altq_conf.h>
diff --git a/sys/contrib/altq/altq/altq_red.c b/sys/contrib/altq/altq/altq_red.c
index b92e005a107..defee2923d4 100644
--- a/sys/contrib/altq/altq/altq_red.c
+++ b/sys/contrib/altq/altq/altq_red.c
@@ -86,6 +86,7 @@
 #endif /* ALTQ3_COMPAT */
 
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -94,7 +95,9 @@
 #include <netinet/ip6.h>
 #endif
 
-#include <net/pfvar.h>
+#include <netpfil/pf/pf.h>
+#include <netpfil/pf/pf_altq.h>
+#include <netpfil/pf/pf_mtag.h>
 #include <altq/altq.h>
 #include <altq/altq_red.h>
 #ifdef ALTQ3_COMPAT
diff --git a/sys/contrib/altq/altq/altq_rio.c b/sys/contrib/altq/altq/altq_rio.c
index a48cd6dc33c..151debed451 100644
--- a/sys/contrib/altq/altq/altq_rio.c
+++ b/sys/contrib/altq/altq/altq_rio.c
@@ -81,6 +81,7 @@
 #endif
 
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -89,7 +90,8 @@
 #include <netinet/ip6.h>
 #endif
 
-#include <net/pfvar.h>
+#include <netpfil/pf/pf.h>
+#include <netpfil/pf/pf_altq.h>
 #include <altq/altq.h>
 #include <altq/altq_cdnr.h>
 #include <altq/altq_red.h>
diff --git a/sys/contrib/altq/altq/altq_rmclass.c b/sys/contrib/altq/altq/altq_rmclass.c
index 83a8720b4fc..c433024e717 100644
--- a/sys/contrib/altq/altq/altq_rmclass.c
+++ b/sys/contrib/altq/altq/altq_rmclass.c
@@ -59,12 +59,14 @@
 #endif
 
 #include <net/if.h>
+#include <net/if_var.h>
 #ifdef ALTQ3_COMPAT
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #endif
 
+#include <altq/if_altq.h>
 #include <altq/altq.h>
 #include <altq/altq_rmclass.h>
 #include <altq/altq_rmclass_debug.h>
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c
index 2d7ce758221..16b796a1e52 100644
--- a/sys/contrib/altq/altq/altq_subr.c
+++ b/sys/contrib/altq/altq/altq_subr.c
@@ -49,6 +49,7 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #ifdef __FreeBSD__
@@ -64,7 +65,8 @@
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
-#include <net/pfvar.h>
+#include <netpfil/pf/pf.h>
+#include <netpfil/pf/pf_altq.h>
 #include <altq/altq.h>
 #ifdef ALTQ3_COMPAT
 #include <altq/altq_conf.h>
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 642aba1b370..a52f01e227b 100644
--- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
+++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c
@@ -1332,7 +1332,7 @@ ar9300_set_operating_mode(struct ath_hal *ah, int opmode)
 }
 
 /* XXX need the logic for Osprey */
-inline void
+void
 ar9300_init_pll(struct ath_hal *ah, struct ieee80211_channel *chan)
 {
     u_int32_t pll;
diff --git a/sys/contrib/dev/run/rt2870.fw.uu b/sys/contrib/dev/run/rt2870.fw.uu
index 6e74a976e56..1e0196bbf06 100644
--- a/sys/contrib/dev/run/rt2870.fw.uu
+++ b/sys/contrib/dev/run/rt2870.fw.uu
@@ -42,191 +42,191 @@
 # is RT3071. On each 4KB firmware, the last 2 bytes are CRC, 3rd last byte
 # is minor version number and 4th last byte is major version number.
 # This file comes with
-#  RT2870 v. 0.236
-#  RT3071 v. 0.236
+#  RT2870 v. 0.33
+#  RT3071 v. 0.33
 begin 644 rt2870.fw.uu
-M____`A`H`A`R`A!]`A.[`A.\`A/;`A/@$A/<(@(8V@(:&@(5/`(4=S`%!B`-
-M`Q(:_R*0`8S@,.,@Y5@PX!#E3##@!']`@`)_`)`0+^_PD`&,=`CPY)`!I_"0
-M`8S@,.`<D`&`X+0"%:/@M`$0D`&$X+2!"9`!C'0!\!(-R"*0!!3@(.<#`A.Z
-MD'`2X/56D`0$X!(*G1#A,1#%-A$*4!%!41%*4A%*4Q%*5!&+51':5A(X<!)C
-M<1*1<A,\<Q-=@!.`D```$[J0<!'@]3SDD'`3\)`$%'2`\.56]'`#`A.Z`A.S
-M(`(#,`,=?0*O5A(+D9`$%'2`\.20<!/PY5;T<`,"$[H"$[.%5D'2`B*0<!#@
-M5'__OPH-D'`1X+0(!G5.`75/A)!P$.!4?_^_`A*0<!'@9`A@!."T(`9U3@-U
-M3R#D]2<BD'`1X"3_DD<BD`0$X"7@)%WU5Y!P$.#_=$<E5_C&[\:0<!'@_W1(
-M)5?XQN_&Y/VO5A(+D9`$%'2`\.20<!/PY5;T<`,"$[H"$[/E1V0'8!WE1V0(
-M8!?E1V0)8!'E1V0*8`OE1V0+8`7E1[0,")!P$>!4#_4ZY4>T"0CE.K0#`^3U
-M1N5'M`H(Y3JT`0/D]4;D_:]6$@N1T@0BD'`1X/3_D'`0X%__D'`1X%4G3Y!P
-M&/"0<!'@D'`9\.3]KU82"Y$P%032%(`FD'`8X/4GD`(IX/^0<!G@_N]>D`(I
-M\#!'!*\G@`3E)_3_D`(H[_#E5O1P`P(3N@(3LY!P$.#^D'`1X/WM^.;U5_VO
-M5A(+D9`$%'2`\.20<!/PY5;T<`,"$[H"$[.0<!#@_I!P$>#][?6"CH/@]5?]
-MKU82"Y&0!!1T@/#DD'`3\.56]'`#`A.Z`A.SD!``X/57Y/58]5F0$`/@M"@%
-M=5@!@#R0$`/@M#`%=5@"@#"0$`/@M#,%=5@$@"20$`/@M#4,D!`"X+1R!758
-M"(`1D!`#X+0U"I`0`N"TDP-U6!#E6##A&9`%".!$`?#]D`4%X%3[\$0$\.U4
-M_I`%"/#D]4[U3W4Z_W4\_ZU7KU82"Y'DD'`R\,(6]5SU6O5;D'`P\*/PD`04
-M=(#PY)!P$_#E5O1P`P(3NH!WD'`0X"3_DI/D_:]6$@N1D`04=(#PY)!P$_#E
-M5O1@7X!6D'`0X"3_DDK2!:U7KU82"Y&0!!1T@/#DD'`3\.56]&`\@#.0<!#@
-M)/^2%I!P$>#U7*U7KU82"Y&0!!1T@/"0<##E6O"CY5OPY/5:]5N0<!/PY5;T
-M8`>0<"7@1`'P(B+E4W`:,&`)LDTP300%1L($Y4]%3F`(Y4\53W`"%4XB(L)"
-MTR(P%#"0<!G@52?_D'`8X$_U)Y`"*>#_D'`9X/[O7I`"*?`P1P2O)X`$Y2?T
-M_Y`"*._PPA0P%F#"KY`0!.#U5Y`"*.!4!?57Y5QD`7`AY5>0$`0PX`;@5/OP
-M@`3@1`3PY5<PXC$%6^5;<"L%6H`GY5<PX!OE7)`0!'`&X%3[\(`$X$0$\`5;
-MY5MP"P5:@`>0$`3@1`3PTJ\BPDO"3.5$$@J=%)D`%2<$%2,(%0,0%*T@%,U@
-M%-Z@```5*85(0X5*0H5,7N5'9`9@`P(5*8`;Y4C$5`_U0^5*Q%0/]4+E3,14
-M#_5>Y4=D!G!A4T,/@%R%24.%2T*%35[E1V0&<$V`&^5)Q%0/]4/E2\14#_5"
-MY4W$5`_U7N5'9`9P,.5#5`]$$/5#@";E1V0$8`7E1[0%!D->!'5"">5'M`80
-MY4-4#T0P]4.`!M)+@`+23.3U)>5"Q%3P_^5#5`]/]5_28"+2%>5')/5@"R3+
-M8`<D0'`&PA4B$ABE$A5>PA7"K\($TJ\BPJ^0!!3@5`Y@!-(8@`CE3D5/)/^2
-M&-*OD`04X*+DDAET'O#E7U0/]2WE)7`3,!@%Y5\@Y0LP&1GE7U0P_[\P$>4E
-M<`5U)0R``A4ETFS2;8`/Y5\PY@;";-)M@`32;,)MY4=D`W`A,$L&PFS2;8`8
-MY25P`S!,$<),Y25P!74E!X`"%272;-)MY4>T"13E1"#C"^4Z9`)@!>4ZM`,$
-MPFS2;>5'M`H3Y3JT`0;";-)M@`CE.G`$TFS";2!I!^5>(.`"LF@@:P?E7B#A
-M`K)J(&T'Y5X@X@*R;'4N0"!I!*)H@"8P:`;E1J+B@!WE7B#@!'\!@`)_`.5&
-M5/#^OO`$?@&``GX`[F\D_Y)SDG(@:P2B:H`F,&H&Y4:BXH`=Y5X@X01_`8`"
-M?P#E1E3P_K[P!'X!@`)^`.YO)/^2=9)T(&T$HFR`)N5'9`IP(C!L!N5&HN.`
-M%^4ZM`$&Y4:BXX`TY48@Y`,PY0/3@`'#@"8P;`;E1J+B@!WE7B#B!'\!@`)_
-M`.5&5/#^OO`$?@&``GX`[F\D_Y)QDG"0$`#@D!`L\)`0`^##E#!`%*)QDG>B
-M<))VY2X3$U0_]2["=])VD!`OY2[PY4=D!G!'D`(HX#!'`_^``O3_CR>0`BG@
-M5/[PY4/$5`\48`PD_F`,)`-P$\(X@`_2.(`+Y48PX@/3@`'#DC@P1P6O)P(8
-MG^4G]/\"&)_E1V0'8`_E1V0(8`GE1V0)8`,"&`V0`BC@,$<#_X`"]/^/)Y`"
-M*>!4_/#E.A1@(A1@)11@+23\8$DD^6`4)`YP4.5&$Q-4/W7P`X3E\"3_@#K2
-M.<(X@#[E1C#B`].`'<.`&N5&,.(-5#C#E#!0!GX`?P&`!'X`?P#N3R3_DCC"
-M.8`3Y48PX@/3@`'#DCG".(`$PCC".3!'!*\G@`3E)_3_`AB?Y4=D#&`)Y4=D
-M"V`#`ABDD`(HX#!'`_^``O3_CR>0`BG@5/WPY3H48"`48"$48"LD_&!%)/E@
-M$B0.<$KE1A,35#]U\`.$Y?"`*=(Y@#KE1C#B`].``<.2.8`MY48PX@U4.,.4
-M,%`&?@!_`8`$?@!_`.Y/)/^2.8`/Y48PX@/3@`'#DCF``L(Y,$<$KR>`!.4G
-M]/^0`BCO\"+E1[0+$)`"*>!4Z_#E)U3K147U)R+DD`(I\#!'!*]%@`3E1?3_
-MD`(H[_`BCU#262*/5-)8(N3U8L*OY5$48$@48&8D`F`#`AG^TEEU50&0`J+@
-M5'_PH^`@YR.0!#3@M`(<H^"T`A>CX+0"$G\@$AC0D!`$X%3S\'51`0(9_N50
-M<`9U8@,"&?Z0$@#@5`-P$G\@$AC0D`*BX%2_\'51`@(9_N50<`,"&?F0`J/@
-M,.8#`AGUD`0WX&0B8`,"&?60`8IT?O"0`9;PD!($=`KPY5@PXQ7DD`4`\*-T
-M"/"C=`'P=`/P?P$2#2J0$RC@D'`:\)`3*>"0<!OPD!,KX)!P(O"0$RC@5/#P
-MH^!4\/"0$RO@5,SPY5@PXQ/E//20$RI@!>!4\X`1X%3[\(`4Y3STD!,J8`C@
-M5/)%//"`!.!4^O"0!`'@5/WP=6(!=54"Y/51@`GE4'`%=6(#]5'E8F`5P@'D
-M]5'"6:UBKT`2&LOE8K0#`M(#TJ\BPJ\P`1+DD`&6\/51PEG"`7T"KT`2&LOE
-M4A1@#`1@`P(:R'52`755`Y`$`>!$#O#E6%088!Z0<!K@D!,H\)!P&^"0$RGP
-MHW0%\)!P(N"0$ROP@!&0$RC@1`_PH^!$#_"CX$0%\)`2!'0#\.58,.,6D`4`
-M=.+PHW0(\*-T`?!T`_!_`1(-*I`"HN!$P/"0$`3@1`SPY/52]54P`@G"`GT!
-MKT$2&LLP`P+"`^20`9;PTJ\B[_1@+>3^=!0N]8+D-'#U@^"T_QET%"[U@N0T
-M</6#[_!T'"[U@N0T</6#[?`B#KX$U2(B(I!P*N`PX4W"KY!P*."0$!SPD'`I
-MX)`0'?"0<"K@D!`>\)`0'.#U8I`0'N`@X?.0$!S@D'`H\)`0'>"0<"GPD!`>
-MX)!P*O`P2@>0<"3@1`'PP@72KR(B(@``````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M`````````````````````````````````````````````````````````.SQ
-M2O___P(0*`(0,@(0?0(3NP(3O`(3VP(3X!(3W"("&-H"&AH"%3P"%'<P!08@
-M#0,2&O\BD`&,X##C(.58,.`0Y4PPX`1_0(`"?P"0$"_O\)`!C'0(\.20`:?P
-MD`&,X##@')`!@."T`A6CX+0!$)`!A."T@0F0`8QT`?`2#=TBD`04X"#G`P(3
-MNI!P$N#U5I`$!.`2"K80X3$0Q381"E`105$12E(12E,12E01BU41VE82.'`2
-M8W$2D7(3/',378`3@)```!.ZD'`1X/4\Y)!P$_"0!!1T@/#E5O1P`P(3N@(3
-MLR`"`S`#'7T"KU82"ZJ0!!1T@/#DD'`3\.56]'`#`A.Z`A.SA59!T@(BD'`0
-MX%1__[\*#9!P$>"T"`9U3@%U3X20<!#@5'__OP(2D'`1X&0(8`3@M"`&=4X#
-M=4\@Y/4G(I!P$>`D_Y)'(I`$!.`EX"1=]5>0<!#@_W1')5?XQN_&D'`1X/]T
-M2"57^,;OQN3]KU82"ZJ0!!1T@/#DD'`3\.56]'`#`A.Z`A.SY4=D!V`=Y4=D
-M"&`7Y4=D"6`1Y4=D"F`+Y4=D"V`%Y4>T#`B0<!'@5`_U.N5'M`D(Y3JT`P/D
-M]4;E1[0*".4ZM`$#Y/5&Y/VO5A(+JM($(I!P$>#T_Y!P$.!?_Y!P$>!5)T^0
-M<!CPD'`1X)!P&?#D_:]6$@NJ,!4$TA2`)I!P&.#U)Y`"*>#_D'`9X/[O7I`"
-M*?`P1P2O)X`$Y2?T_Y`"*._PY5;T<`,"$[H"$[.0<!#@_I!P$>#][?CF]5?]
-MKU82"ZJ0!!1T@/#DD'`3\.56]'`#`A.Z`A.SD'`0X/Z0<!'@_>WU@HZ#X/57
-M_:]6$@NJD`04=(#PY)!P$_#E5O1P`P(3N@(3LY`0`.#U5^3U6/59D!`#X+0H
-M!758`8`\D!`#X+0P!758`H`PD!`#X+0S!758!(`DD!`#X+0U#)`0`N"T<@5U
-M6`B`$9`0`^"T-0J0$`+@M),#=5@0Y5@PX1F0!0C@1`'P_9`%!>!4^_!$!/#M
-M5/Z0!0CPY/5.]4]U.O]U//^M5Z]6$@NJY)!P,O#"%O5<]5KU6Y!P,/"C\)`$
-M%'2`\.20<!/PY5;T<`,"$[J`=Y!P$.`D_Y*3Y/VO5A(+JI`$%'2`\.20<!/P
-MY5;T8%^`5I!P$.`D_Y)*T@6M5Z]6$@NJD`04=(#PY)!P$_#E5O1@/(`SD'`0
-MX"3_DA:0<!'@]5RM5Z]6$@NJD`04=(#PD'`PY5KPH^5;\.3U6O5;D'`3\.56
-M]&`'D'`EX$0!\"(BY5-P&C!@";)-,$T$!4;"!.5/14Y@".5/%4]P`A5.(B+"
-M0M,B,!0PD'`9X%4G_Y!P&.!/]2>0`BG@_Y!P&>#^[UZ0`BGP,$<$KR>`!.4G
-M]/^0`BCO\,(4,!9@PJ^0$`3@]5>0`BC@5`7U5^5<9`%P(>57D!`$,.`&X%3[
-M\(`$X$0$\.57,.(Q!5OE6W`K!5J`)^57,.`;Y5R0$`1P!N!4^_"`!.!$!/`%
-M6^5;<`L%6H`'D!`$X$0$\-*O(L)+PDSE1!(*MA29`!4G!!4C"!4#$!2M(!3-
-M8!3>H```%2F%2$.%2D*%3%[E1V0&8`,"%2F`&^5(Q%0/]4/E2L14#_5"Y4S$
-M5`_U7N5'9`9P85-##X!<A4E#A4M"A4U>Y4=D!G!-@!OE2<14#_5#Y4O$5`_U
-M0N5-Q%0/]5[E1V0&<##E0U0/1!#U0X`FY4=D!&`%Y4>T!09#7@1U0@GE1[0&
-M$.5#5`]$,/5#@`;22X`"TDSD]27E0L14\/_E0U0/3_5?TF`BTA7E1R3U8`LD
-MRV`')$!P!L(5(A(8I1(57L(5PJ_"!-*O(L*OD`04X%0.8`32&(`(Y4Y%3R3_
-MDAC2KY`$%."BY)(9=![PY5]4#_4MY25P$S`8!>5?(.4+,!D9Y5]4,/^_,!'E
-M)7`%=24,@`(5)=)LTFV`#^5?,.8&PFS2;8`$TFS";>5'9`-P(3!+!L)LTFV`
-M&.4E<`,P3!'"3.4E<`5U)0>``A4ETFS2;>5'M`D4Y40@XPOE.F0"8`7E.K0#
-M!,)LTFWE1[0*$^4ZM`$&PFS2;8`(Y3IP!-)LPFT@:0?E7B#@`K)H(&L'Y5X@
-MX0*R:B!M!^5>(.("LFQU+D`@:02B:(`F,&@&Y4:BXH`=Y5X@X`1_`8`"?P#E
-M1E3P_K[P!'X!@`)^`.YO)/^2<Y)R(&L$HFJ`)C!J!N5&HN*`'>5>(.$$?P&`
-M`G\`Y494\/Z^\`1^`8`"?@#N;R3_DG62="!M!*)L@";E1V0*<"(P;`;E1J+C
-M@!?E.K0!!N5&HN.`-.5&(.0#,.4#TX`!PX`F,&P&Y4:BXH`=Y5X@X@1_`8`"
-M?P#E1E3P_K[P!'X!@`)^`.YO)/^2<9)PD!``X)`0+/"0$`/@PY0P0!2B<9)W
-MHG"2=N4N$Q-4/_4NPG?2=I`0+^4N\.5'9`9P1Y`"*.`P1P/_@`+T_X\GD`(I
-MX%3^\.5#Q%0/%&`,)/Y@#"0#<!/".(`/TCB`"^5&,.(#TX`!PY(X,$<%KR<"
-M&)_E)_3_`AB?Y4=D!V`/Y4=D"&`)Y4=D"6`#`A@-D`(HX#!'`_^``O3_CR>0
-M`BG@5/SPY3H48"(48"448"TD_&!))/E@%"0.<%#E1A,35#]U\`.$Y?`D_X`Z
-MTCG".(`^Y48PX@/3@!W#@!KE1C#B#50XPY0P4`9^`'\!@`1^`'\`[D\D_Y(X
-MPCF`$^5&,.(#TX`!PY(YPCB`!,(XPCDP1P2O)X`$Y2?T_P(8G^5'9`Q@">5'
-M9`M@`P(8I)`"*.`P1P/_@`+T_X\GD`(IX%3]\.4Z%&`@%&`A%&`K)/Q@123Y
-M8!(D#G!*Y483$U0_=?`#A.7P@"G2.8`ZY48PX@/3@`'#DCF`+>5&,.(-5#C#
-ME#!0!GX`?P&`!'X`?P#N3R3_DCF`#^5&,.(#TX`!PY(Y@`+".3!'!*\G@`3E
-M)_3_D`(H[_`BY4>T"Q"0`BG@5.OPY2=4ZT5%]2<BY)`"*?`P1P2O18`$Y47T
-M_Y`"*._P(H]0TEDBCU326"+D]6+"K^51%&!(%&!F)`)@`P(9_M)9=54!D`*B
-MX%1_\*/@(.<CD`0TX+0"'*/@M`(7H^"T`A)_(!(8T)`0!.!4\_!U40$"&?[E
-M4'`&=6(#`AG^D!(`X%0#<!)_(!(8T)`"HN!4O_!U40("&?[E4'`#`AGYD`*C
-MX##F`P(9]9`$-^!D(F`#`AGUD`&*='[PD`&6\)`2!'0*\.58,.,5Y)`%`/"C
-M=`CPHW0!\'0#\'\!$@U(D!,HX)!P&O"0$RG@D'`;\)`3*^"0<"+PD!,HX%3P
-M\*/@5/#PD!,KX%3,\.58,.,3Y3STD!,J8`7@5/.`$>!4^_"`%.4\])`3*F`(
-MX%3R13SP@`3@5/KPD`0!X%3]\'5B`755`N3U48`)Y5!P!75B`_51Y6)@%<(!
-MY/51PEFM8J]`$AK+Y6*T`P+2`]*O(L*O,`$2Y)`!EO#U4<)9P@%]`J]`$AK+
-MY5(48`P$8`,"&LAU4@%U50.0!`'@1`[PY5A4&&`>D'`:X)`3*/"0<!O@D!,I
-M\*-T!?"0<"+@D!,K\(`1D!,HX$0/\*/@1`_PH^!$!?"0$@1T`_#E6##C%I`%
-M`'3B\*-T"/"C=`'P=`/P?P$2#4B0`J+@1,#PD!`$X$0,\.3U4O55,`()P@)]
-M`:]!$AK+,`,"P@/DD`&6\-*O(N_T8"WD_G04+O6"Y#1P]8/@M/\9=!0N]8+D
-M-'#U@^_P=!PN]8+D-'#U@^WP(@Z^!-4B(B*0<"K@,.%-PJ^0<"C@D!`<\)!P
-M*>"0$!WPD'`JX)`0'O"0$!S@]6*0$![@(.'SD!`<X)!P*/"0$!W@D'`I\)`0
-M'N"0<"KP,$H'D'`DX$0!\,(%TJ\B(B(`````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M````````````````````````````````````````````````````````````
-M``````````````````````````````````````````````````````````#L
-"*=(`
+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
+M<"CPD!`=X)!P*?"0$![@D'`J\#!*!Y!P).!$`?#"!=*O(B`<6GT%$A]SD$RP
+M$A]DD$R[[_!]`Q(?<Y!,O!(?9)!,O>_P?0D2'WZ03+?O\'T($A]^D$RV[_!]
+M!Q(?F9!,M>_P?082'YF03+3O\.203+'PD$RYX)!,N/#2',('(GT!?[@2%R1_
+MN1(7/N]D`6`#`A]9TY!,L^"5)Y!,LN"5)D`1D$RQX`3PD$RXX&`:X!3P@!60
+M3+G@_Y!,N.##GU`(D$RYX)!,N/#D]2;U)WT%?[@2%R203+`2'XE]`G^X$A<D
+MD$R[$A^)?0-_N!(7))!,O!(?D7T$?[@2%R203+T2'Y%]"7^X$A<DD$RW$A^D
+M?0A_N!(7))!,MA(?I'T'?[@2%R203+7@_7^Y$A<D?09_N!(7))!,M.#]?[D2
+M%R1]`1(?K.3]$A^L@`@%)^4G<`(%)L('(N_P?0)_N!(7)'^Y$A<^(G^X$A<D
+M?[D2%SXB?[@2%R1_N1(7/B+@_7^Y$A<D(N#]?[D2%R0B?[@2%R1_N1(7/B+@
+M_7^Y$A<D(G^X$A<D?0%_N1(7)"(B````````````````````````````````
+M`````````````````````````````````````````````````````````"%A
+M@/___P(0*`(0.P(0A@(57P(58`(61`(6C1(612("&\\"'/@"&!P"%U<P!08@
+M#0,2'=TP!P8@#P,2'C(BD`&,X##C(.58,.`0Y4PPX`1_0(`"?P"0$"_O\)`!
+MC'0(\.20`:?PD`&,X##@')`!@."T`A6CX+0!$)`!A."T@0F0`8QT`?`2#=TB
+MD`04X"#G`P(57I!P$N#U5I`$!.`2"K80\S$0US81'%`14U$17%(17%,17%01
+MG541[%82KV022F42=682VW(3HW,3R'04Q(`4YY`5')$``!5>D'`1X/4\Y)!P
+M$_"0!!1T@/#E5O1P`P(57@(55R`"`S`#'7T"KU82"ZJ0!!1T@/#DD'`3\.56
+M]'`#`A5>`A57A59!T@(BD'`0X%1__[\*#9!P$>"T"`9U3@%U3X20<!#@5'__
+MOP(2D'`1X&0(8`3@M"`&=4X#=4\@Y/4_(I!P$>`D_Y)'(I`$!.`EX"1=]5>0
+M<!#@_W1')5?XQN_&D'`1X/]T2"57^,;OQN3]KU82"ZJ0!!1T@/#DD'`3\.56
+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
+MX/U_N1(7)")_N!(7)'T!?[D2%R0B(@``````````````````````````````
+M```````````````````````````````````````````````````````````A
+"]\T`
 `
 end
diff --git a/sys/contrib/ipfilter/netinet/ip_compat.h b/sys/contrib/ipfilter/netinet/ip_compat.h
index 1d5b5b7f949..3dbaee266ed 100644
--- a/sys/contrib/ipfilter/netinet/ip_compat.h
+++ b/sys/contrib/ipfilter/netinet/ip_compat.h
@@ -146,6 +146,7 @@ struct  ether_addr {
 # endif /* _KERNEL */
 
 #  include <sys/selinfo.h>
+#  include <sys/lock.h>
 #  include <sys/mutex.h>
 #    define	KRWLOCK_FILL_SZ		56
 #    define	KMUTEX_FILL_SZ		56
diff --git a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
index 4b453c037d0..29aec0044f3 100644
--- a/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
@@ -159,7 +159,7 @@ ipf_p_rcmd_portmsg(fin, aps, nat)
 	ip6_t *ip6;
 #endif
 	int tcpsz;
-	int slen;
+	int slen = 0; /* silence gcc */
 	ip_t *ip;
 	mb_t *m;
 
diff --git a/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c b/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c
index 409b982fe10..9c0ef91ec9c 100644
--- a/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c
+++ b/sys/contrib/ipfilter/netinet/ip_tftp_pxy.c
@@ -297,7 +297,7 @@ ipf_p_tftp_backchannel(fin, aps, nat)
 	tftpinfo_t *ti;
 	udphdr_t udp;
 	fr_info_t fi;
-	u_short slen;
+	u_short slen = 0; /* silence gcc */
 	nat_t *nat2;
 	int nflags;
 	ip_t *ip;
diff --git a/sys/contrib/ipfilter/netinet/radix_ipf.c b/sys/contrib/ipfilter/netinet/radix_ipf.c
index f145c38a94d..133eb16466b 100644
--- a/sys/contrib/ipfilter/netinet/radix_ipf.c
+++ b/sys/contrib/ipfilter/netinet/radix_ipf.c
@@ -9,12 +9,14 @@
 #include <sys/param.h>
 #include <netinet/in.h>
 #include <net/if.h>
-#if !defined(_KERNEL)
+#ifdef _KERNEL
+#include <sys/systm.h>
+#else
 # include <stddef.h>
 # include <stdlib.h>
 # include <strings.h>
 # include <string.h>
-#endif
+#endif /* !_KERNEL */
 #include "netinet/ip_compat.h"
 #include "netinet/ip_fil.h"
 #ifdef RDX_DEBUG
diff --git a/sys/contrib/rdma/ib_addr.h b/sys/contrib/rdma/ib_addr.h
deleted file mode 100644
index 87344656564..00000000000
--- a/sys/contrib/rdma/ib_addr.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2005 Voltaire Inc.  All rights reserved.
- * Copyright (c) 2005 Intel Corporation.  All rights reserved.
- *
- * This Software is licensed under one of the following licenses:
- *
- * 1) under the terms of the "Common Public License 1.0" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/cpl.php.
- *
- * 2) under the terms of the "The BSD License" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/bsd-license.php.
- *
- * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
- *    copy of which is available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/gpl-license.php.
- *
- * Licensee has the right to choose one of the above licenses.
- *
- * Redistributions of source code must retain the above copyright
- * notice and one of the license notices.
- *
- * Redistributions in binary form must reproduce both the above copyright
- * notice, one of the license notices in the documentation
- * and/or other materials provided with the distribution.
- *
- * $FreeBSD$
- *
- */
-
-#if !defined(IB_ADDR_H)
-#define IB_ADDR_H
-
-#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/condvar.h>
-
-#include <net/if.h>
-#include <net/ethernet.h>
-
-#include <contrib/rdma/ib_verbs.h>
-
-
-#define MAX_ADDR_LEN	20
-
-struct rdma_addr_client {
-	int refcount;
-	struct cv comp;
-	struct mtx lock;
-};
-
-/**
- * rdma_addr_register_client - Register an address client.
- */
-void rdma_addr_register_client(struct rdma_addr_client *client);
-
-/**
- * rdma_addr_unregister_client - Deregister an address client.
- * @client: Client object to deregister.
- */
-void rdma_addr_unregister_client(struct rdma_addr_client *client);
-
-struct rdma_dev_addr {
-	unsigned char src_dev_addr[MAX_ADDR_LEN];
-	unsigned char dst_dev_addr[MAX_ADDR_LEN];
-	unsigned char broadcast[MAX_ADDR_LEN];
-	enum rdma_node_type dev_type;
-};
-
-/**
- * rdma_translate_ip - Translate a local IP address to an RDMA hardware
- *   address.
- */
-int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr);
-
-/**
- * rdma_resolve_ip - Resolve source and destination IP addresses to
- *   RDMA hardware addresses.
- * @client: Address client associated with request.
- * @src_addr: An optional source address to use in the resolution.  If a
- *   source address is not provided, a usable address will be returned via
- *   the callback.
- * @dst_addr: The destination address to resolve.
- * @addr: A reference to a data location that will receive the resolved
- *   addresses.  The data location must remain valid until the callback has
- *   been invoked.
- * @timeout_ms: Amount of time to wait for the address resolution to complete.
- * @callback: Call invoked once address resolution has completed, timed out,
- *   or been canceled.  A status of 0 indicates success.
- * @context: User-specified context associated with the call.
- */
-int rdma_resolve_ip(struct rdma_addr_client *client,
-		    struct sockaddr *src_addr, struct sockaddr *dst_addr,
-		    struct rdma_dev_addr *addr, int timeout_ms,
-		    void (*callback)(int status, struct sockaddr *src_addr,
-				     struct rdma_dev_addr *addr, void *context),
-		    void *context);
-
-void rdma_addr_cancel(struct rdma_dev_addr *addr);
-
-int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct ifnet *dev,
-	      const unsigned char *dst_dev_addr);
-
-static inline int ip_addr_size(struct sockaddr *addr)
-{
-	return addr->sa_family == AF_INET6 ?
-	       sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in);
-}
-
-static inline u16 ib_addr_get_pkey(struct rdma_dev_addr *dev_addr)
-{
-	return ((u16)dev_addr->broadcast[8] << 8) | (u16)dev_addr->broadcast[9];
-}
-
-static inline void ib_addr_set_pkey(struct rdma_dev_addr *dev_addr, u16 pkey)
-{
-	dev_addr->broadcast[8] = pkey >> 8;
-	dev_addr->broadcast[9] = (unsigned char) pkey;
-}
-
-static inline void ib_addr_get_mgid(struct rdma_dev_addr *dev_addr,
-				    union ib_gid *gid)
-{
-	memcpy(gid, dev_addr->broadcast + 4, sizeof *gid);
-}
-
-static inline void ib_addr_get_sgid(struct rdma_dev_addr *dev_addr,
-				    union ib_gid *gid)
-{
-	memcpy(gid, dev_addr->src_dev_addr + 4, sizeof *gid);
-}
-
-static inline void ib_addr_set_sgid(struct rdma_dev_addr *dev_addr,
-				    union ib_gid *gid)
-{
-	memcpy(dev_addr->src_dev_addr + 4, gid, sizeof *gid);
-}
-
-static inline void ib_addr_get_dgid(struct rdma_dev_addr *dev_addr,
-				    union ib_gid *gid)
-{
-	memcpy(gid, dev_addr->dst_dev_addr + 4, sizeof *gid);
-}
-
-static inline void ib_addr_set_dgid(struct rdma_dev_addr *dev_addr,
-				    union ib_gid *gid)
-{
-	memcpy(dev_addr->dst_dev_addr + 4, gid, sizeof *gid);
-}
-
-static inline void iw_addr_get_sgid(struct rdma_dev_addr *dev_addr,
-				    union ib_gid *gid)
-{
-	memcpy(gid, dev_addr->src_dev_addr, sizeof *gid);
-}
-
-static inline void iw_addr_get_dgid(struct rdma_dev_addr *dev_addr,
-				    union ib_gid *gid)
-{
-	memcpy(gid, dev_addr->dst_dev_addr, sizeof *gid);
-}
-
-#endif /* IB_ADDR_H */
diff --git a/sys/contrib/rdma/ib_cache.h b/sys/contrib/rdma/ib_cache.h
deleted file mode 100644
index 419bea2f252..00000000000
--- a/sys/contrib/rdma/ib_cache.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2004 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Intel Corporation. All rights reserved.
- * Copyright (c) 2005 Sun Microsystems, Inc. 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.
- *
- * $Id: ib_cache.h 1349 2004-12-16 21:09:43Z roland $
- *
- * $FreeBSD$
- */
-
-#ifndef _IB_CACHE_H
-#define _IB_CACHE_H
-
-#include <contrib/rdma/ib_verbs.h>
-
-/**
- * ib_get_cached_gid - Returns a cached GID table entry
- * @device: The device to query.
- * @port_num: The port number of the device to query.
- * @index: The index into the cached GID table to query.
- * @gid: The GID value found at the specified index.
- *
- * ib_get_cached_gid() fetches the specified GID table entry stored in
- * the local software cache.
- */
-int ib_get_cached_gid(struct ib_device    *device,
-		      u8                   port_num,
-		      int                  index,
-		      union ib_gid        *gid);
-
-/**
- * ib_find_cached_gid - Returns the port number and GID table index where
- *   a specified GID value occurs.
- * @device: The device to query.
- * @gid: The GID value to search for.
- * @port_num: The port number of the device where the GID value was found.
- * @index: The index into the cached GID table where the GID was found.  This
- *   parameter may be NULL.
- *
- * ib_find_cached_gid() searches for the specified GID value in
- * the local software cache.
- */
-int ib_find_cached_gid(struct ib_device *device,
-		       union ib_gid	*gid,
-		       u8               *port_num,
-		       u16              *index);
-
-/**
- * ib_get_cached_pkey - Returns a cached PKey table entry
- * @device: The device to query.
- * @port_num: The port number of the device to query.
- * @index: The index into the cached PKey table to query.
- * @pkey: The PKey value found at the specified index.
- *
- * ib_get_cached_pkey() fetches the specified PKey table entry stored in
- * the local software cache.
- */
-int ib_get_cached_pkey(struct ib_device    *device_handle,
-		       u8                   port_num,
-		       int                  index,
-		       u16                 *pkey);
-
-/**
- * ib_find_cached_pkey - Returns the PKey table index where a specified
- *   PKey value occurs.
- * @device: The device to query.
- * @port_num: The port number of the device to search for the PKey.
- * @pkey: The PKey value to search for.
- * @index: The index into the cached PKey table where the PKey was found.
- *
- * ib_find_cached_pkey() searches the specified PKey table in
- * the local software cache.
- */
-int ib_find_cached_pkey(struct ib_device    *device,
-			u8                   port_num,
-			u16                  pkey,
-			u16                 *index);
-
-/**
- * ib_get_cached_lmc - Returns a cached lmc table entry
- * @device: The device to query.
- * @port_num: The port number of the device to query.
- * @lmc: The lmc value for the specified port for that device.
- *
- * ib_get_cached_lmc() fetches the specified lmc table entry stored in
- * the local software cache.
- */
-int ib_get_cached_lmc(struct ib_device *device,
-		      u8                port_num,
-		      u8                *lmc);
-
-#endif /* _IB_CACHE_H */
diff --git a/sys/contrib/rdma/ib_cm.h b/sys/contrib/rdma/ib_cm.h
deleted file mode 100644
index 5fa918a949e..00000000000
--- a/sys/contrib/rdma/ib_cm.h
+++ /dev/null
@@ -1,593 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 Intel Corporation.  All rights reserved.
- * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
- * Copyright (c) 2004 Voltaire Corporation.  All rights reserved.
- * Copyright (c) 2005 Sun Microsystems, Inc. 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.
- *
- * $Id: ib_cm.h 4311 2005-12-05 18:42:01Z sean.hefty $
- *
- * $FreeBSD$
- */
-
-
-#if !defined(IB_CM_H)
-#define IB_CM_H
-
-#include <contrib/rdma/ib_mad.h>
-#include <contrib/rdma/ib_sa.h>
-
-enum ib_cm_state {
-	IB_CM_IDLE,
-	IB_CM_LISTEN,
-	IB_CM_REQ_SENT,
-	IB_CM_REQ_RCVD,
-	IB_CM_MRA_REQ_SENT,
-	IB_CM_MRA_REQ_RCVD,
-	IB_CM_REP_SENT,
-	IB_CM_REP_RCVD,
-	IB_CM_MRA_REP_SENT,
-	IB_CM_MRA_REP_RCVD,
-	IB_CM_ESTABLISHED,
-	IB_CM_DREQ_SENT,
-	IB_CM_DREQ_RCVD,
-	IB_CM_TIMEWAIT,
-	IB_CM_SIDR_REQ_SENT,
-	IB_CM_SIDR_REQ_RCVD
-};
-
-enum ib_cm_lap_state {
-	IB_CM_LAP_UNINIT,
-	IB_CM_LAP_IDLE,
-	IB_CM_LAP_SENT,
-	IB_CM_LAP_RCVD,
-	IB_CM_MRA_LAP_SENT,
-	IB_CM_MRA_LAP_RCVD,
-};
-
-enum ib_cm_event_type {
-	IB_CM_REQ_ERROR,
-	IB_CM_REQ_RECEIVED,
-	IB_CM_REP_ERROR,
-	IB_CM_REP_RECEIVED,
-	IB_CM_RTU_RECEIVED,
-	IB_CM_USER_ESTABLISHED,
-	IB_CM_DREQ_ERROR,
-	IB_CM_DREQ_RECEIVED,
-	IB_CM_DREP_RECEIVED,
-	IB_CM_TIMEWAIT_EXIT,
-	IB_CM_MRA_RECEIVED,
-	IB_CM_REJ_RECEIVED,
-	IB_CM_LAP_ERROR,
-	IB_CM_LAP_RECEIVED,
-	IB_CM_APR_RECEIVED,
-	IB_CM_SIDR_REQ_ERROR,
-	IB_CM_SIDR_REQ_RECEIVED,
-	IB_CM_SIDR_REP_RECEIVED
-};
-
-enum ib_cm_data_size {
-	IB_CM_REQ_PRIVATE_DATA_SIZE	 = 92,
-	IB_CM_MRA_PRIVATE_DATA_SIZE	 = 222,
-	IB_CM_REJ_PRIVATE_DATA_SIZE	 = 148,
-	IB_CM_REP_PRIVATE_DATA_SIZE	 = 196,
-	IB_CM_RTU_PRIVATE_DATA_SIZE	 = 224,
-	IB_CM_DREQ_PRIVATE_DATA_SIZE	 = 220,
-	IB_CM_DREP_PRIVATE_DATA_SIZE	 = 224,
-	IB_CM_REJ_ARI_LENGTH		 = 72,
-	IB_CM_LAP_PRIVATE_DATA_SIZE	 = 168,
-	IB_CM_APR_PRIVATE_DATA_SIZE	 = 148,
-	IB_CM_APR_INFO_LENGTH		 = 72,
-	IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE = 216,
-	IB_CM_SIDR_REP_PRIVATE_DATA_SIZE = 136,
-	IB_CM_SIDR_REP_INFO_LENGTH	 = 72,
-	IB_CM_COMPARE_SIZE		 = 64
-};
-
-struct ib_cm_id;
-
-struct ib_cm_req_event_param {
-	struct ib_cm_id		*listen_id;
-	u8			port;
-
-	struct ib_sa_path_rec	*primary_path;
-	struct ib_sa_path_rec	*alternate_path;
-
-	__be64			remote_ca_guid;
-	u32			remote_qkey;
-	u32			remote_qpn;
-	enum ib_qp_type		qp_type;
-
-	u32			starting_psn;
-	u8			responder_resources;
-	u8			initiator_depth;
-	unsigned int		local_cm_response_timeout:5;
-	unsigned int		flow_control:1;
-	unsigned int		remote_cm_response_timeout:5;
-	unsigned int		retry_count:3;
-	unsigned int		rnr_retry_count:3;
-	unsigned int		srq:1;
-};
-
-struct ib_cm_rep_event_param {
-	__be64			remote_ca_guid;
-	u32			remote_qkey;
-	u32			remote_qpn;
-	u32			starting_psn;
-	u8			responder_resources;
-	u8			initiator_depth;
-	unsigned int		target_ack_delay:5;
-	unsigned int		failover_accepted:2;
-	unsigned int		flow_control:1;
-	unsigned int		rnr_retry_count:3;
-	unsigned int		srq:1;
-};
-
-enum ib_cm_rej_reason {
-	IB_CM_REJ_NO_QP				= 1,
-	IB_CM_REJ_NO_EEC			= 2,
-	IB_CM_REJ_NO_RESOURCES			= 3,
-	IB_CM_REJ_TIMEOUT			= 4,
-	IB_CM_REJ_UNSUPPORTED			= 5,
-	IB_CM_REJ_INVALID_COMM_ID		= 6,
-	IB_CM_REJ_INVALID_COMM_INSTANCE		= 7,
-	IB_CM_REJ_INVALID_SERVICE_ID		= 8,
-	IB_CM_REJ_INVALID_TRANSPORT_TYPE	= 9,
-	IB_CM_REJ_STALE_CONN			= 10,
-	IB_CM_REJ_RDC_NOT_EXIST			= 11,
-	IB_CM_REJ_INVALID_GID			= 12,
-	IB_CM_REJ_INVALID_LID			= 13,
-	IB_CM_REJ_INVALID_SL			= 14,
-	IB_CM_REJ_INVALID_TRAFFIC_CLASS		= 15,
-	IB_CM_REJ_INVALID_HOP_LIMIT		= 16,
-	IB_CM_REJ_INVALID_PACKET_RATE		= 17,
-	IB_CM_REJ_INVALID_ALT_GID		= 18,
-	IB_CM_REJ_INVALID_ALT_LID		= 19,
-	IB_CM_REJ_INVALID_ALT_SL		= 20,
-	IB_CM_REJ_INVALID_ALT_TRAFFIC_CLASS	= 21,
-	IB_CM_REJ_INVALID_ALT_HOP_LIMIT		= 22,
-	IB_CM_REJ_INVALID_ALT_PACKET_RATE	= 23,
-	IB_CM_REJ_PORT_CM_REDIRECT		= 24,
-	IB_CM_REJ_PORT_REDIRECT			= 25,
-	IB_CM_REJ_INVALID_MTU			= 26,
-	IB_CM_REJ_INSUFFICIENT_RESP_RESOURCES	= 27,
-	IB_CM_REJ_CONSUMER_DEFINED		= 28,
-	IB_CM_REJ_INVALID_RNR_RETRY		= 29,
-	IB_CM_REJ_DUPLICATE_LOCAL_COMM_ID	= 30,
-	IB_CM_REJ_INVALID_CLASS_VERSION		= 31,
-	IB_CM_REJ_INVALID_FLOW_LABEL		= 32,
-	IB_CM_REJ_INVALID_ALT_FLOW_LABEL	= 33
-};
-
-struct ib_cm_rej_event_param {
-	enum ib_cm_rej_reason	reason;
-	void			*ari;
-	u8			ari_length;
-};
-
-struct ib_cm_mra_event_param {
-	u8	service_timeout;
-};
-
-struct ib_cm_lap_event_param {
-	struct ib_sa_path_rec	*alternate_path;
-};
-
-enum ib_cm_apr_status {
-	IB_CM_APR_SUCCESS,
-	IB_CM_APR_INVALID_COMM_ID,
-	IB_CM_APR_UNSUPPORTED,
-	IB_CM_APR_REJECT,
-	IB_CM_APR_REDIRECT,
-	IB_CM_APR_IS_CURRENT,
-	IB_CM_APR_INVALID_QPN_EECN,
-	IB_CM_APR_INVALID_LID,
-	IB_CM_APR_INVALID_GID,
-	IB_CM_APR_INVALID_FLOW_LABEL,
-	IB_CM_APR_INVALID_TCLASS,
-	IB_CM_APR_INVALID_HOP_LIMIT,
-	IB_CM_APR_INVALID_PACKET_RATE,
-	IB_CM_APR_INVALID_SL
-};
-
-struct ib_cm_apr_event_param {
-	enum ib_cm_apr_status	ap_status;
-	void			*apr_info;
-	u8			info_len;
-};
-
-struct ib_cm_sidr_req_event_param {
-	struct ib_cm_id		*listen_id;
-	u8			port;
-	u16			pkey;
-};
-
-enum ib_cm_sidr_status {
-	IB_SIDR_SUCCESS,
-	IB_SIDR_UNSUPPORTED,
-	IB_SIDR_REJECT,
-	IB_SIDR_NO_QP,
-	IB_SIDR_REDIRECT,
-	IB_SIDR_UNSUPPORTED_VERSION
-};
-
-struct ib_cm_sidr_rep_event_param {
-	enum ib_cm_sidr_status	status;
-	u32			qkey;
-	u32			qpn;
-	void			*info;
-	u8			info_len;
-};
-
-struct ib_cm_event {
-	enum ib_cm_event_type	event;
-	union {
-		struct ib_cm_req_event_param	req_rcvd;
-		struct ib_cm_rep_event_param	rep_rcvd;
-		/* No data for RTU received events. */
-		struct ib_cm_rej_event_param	rej_rcvd;
-		struct ib_cm_mra_event_param	mra_rcvd;
-		struct ib_cm_lap_event_param	lap_rcvd;
-		struct ib_cm_apr_event_param	apr_rcvd;
-		/* No data for DREQ/DREP received events. */
-		struct ib_cm_sidr_req_event_param sidr_req_rcvd;
-		struct ib_cm_sidr_rep_event_param sidr_rep_rcvd;
-		enum ib_wc_status		send_status;
-	} param;
-
-	void			*private_data;
-};
-
-/**
- * ib_cm_handler - User-defined callback to process communication events.
- * @cm_id: Communication identifier associated with the reported event.
- * @event: Information about the communication event.
- *
- * IB_CM_REQ_RECEIVED and IB_CM_SIDR_REQ_RECEIVED communication events
- * generated as a result of listen requests result in the allocation of a
- * new @cm_id.  The new @cm_id is returned to the user through this callback.
- * Clients are responsible for destroying the new @cm_id.  For peer-to-peer
- * IB_CM_REQ_RECEIVED and all other events, the returned @cm_id corresponds
- * to a user's existing communication identifier.
- *
- * Users may not call ib_destroy_cm_id while in the context of this callback;
- * however, returning a non-zero value instructs the communication manager to
- * destroy the @cm_id after the callback completes.
- */
-typedef int (*ib_cm_handler)(struct ib_cm_id *cm_id,
-			     struct ib_cm_event *event);
-
-struct ib_cm_id {
-	ib_cm_handler		cm_handler;
-	void			*context;
-	struct ib_device	*device;
-	__be64			service_id;
-	__be64			service_mask;
-	enum ib_cm_state	state;		/* internal CM/debug use */
-	enum ib_cm_lap_state	lap_state;	/* internal CM/debug use */
-	__be32			local_id;
-	__be32			remote_id;
-	u32			remote_cm_qpn;  /* 1 unless redirected */
-};
-
-/**
- * ib_create_cm_id - Allocate a communication identifier.
- * @device: Device associated with the cm_id.  All related communication will
- * be associated with the specified device.
- * @cm_handler: Callback invoked to notify the user of CM events.
- * @context: User specified context associated with the communication
- *   identifier.
- *
- * Communication identifiers are used to track connection states, service
- * ID resolution requests, and listen requests.
- */
-struct ib_cm_id *ib_create_cm_id(struct ib_device *device,
-				 ib_cm_handler cm_handler,
-				 void *context);
-
-/**
- * ib_destroy_cm_id - Destroy a connection identifier.
- * @cm_id: Connection identifier to destroy.
- *
- * This call blocks until the connection identifier is destroyed.
- */
-void ib_destroy_cm_id(struct ib_cm_id *cm_id);
-
-#define IB_SERVICE_ID_AGN_MASK	__constant_cpu_to_be64(0xFF00000000000000ULL)
-#define IB_CM_ASSIGN_SERVICE_ID __constant_cpu_to_be64(0x0200000000000000ULL)
-#define IB_CMA_SERVICE_ID	__constant_cpu_to_be64(0x0000000001000000ULL)
-#define IB_CMA_SERVICE_ID_MASK	__constant_cpu_to_be64(0xFFFFFFFFFF000000ULL)
-#define IB_SDP_SERVICE_ID	__constant_cpu_to_be64(0x0000000000010000ULL)
-#define IB_SDP_SERVICE_ID_MASK	__constant_cpu_to_be64(0xFFFFFFFFFFFF0000ULL)
-
-struct ib_cm_compare_data {
-	u8  data[IB_CM_COMPARE_SIZE];
-	u8  mask[IB_CM_COMPARE_SIZE];
-};
-
-/**
- * ib_cm_listen - Initiates listening on the specified service ID for
- *   connection and service ID resolution requests.
- * @cm_id: Connection identifier associated with the listen request.
- * @service_id: Service identifier matched against incoming connection
- *   and service ID resolution requests.  The service ID should be specified
- *   network-byte order.  If set to IB_CM_ASSIGN_SERVICE_ID, the CM will
- *   assign a service ID to the caller.
- * @service_mask: Mask applied to service ID used to listen across a
- *   range of service IDs.  If set to 0, the service ID is matched
- *   exactly.  This parameter is ignored if %service_id is set to
- *   IB_CM_ASSIGN_SERVICE_ID.
- * @compare_data: This parameter is optional.  It specifies data that must
- *   appear in the private data of a connection request for the specified
- *   listen request.
- */
-int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask,
-		 struct ib_cm_compare_data *compare_data);
-
-struct ib_cm_req_param {
-	struct ib_sa_path_rec	*primary_path;
-	struct ib_sa_path_rec	*alternate_path;
-	__be64			service_id;
-	u32			qp_num;
-	enum ib_qp_type		qp_type;
-	u32			starting_psn;
-	const void		*private_data;
-	u8			private_data_len;
-	u8			peer_to_peer;
-	u8			responder_resources;
-	u8			initiator_depth;
-	u8			remote_cm_response_timeout;
-	u8			flow_control;
-	u8			local_cm_response_timeout;
-	u8			retry_count;
-	u8			rnr_retry_count;
-	u8			max_cm_retries;
-	u8			srq;
-};
-
-/**
- * ib_send_cm_req - Sends a connection request to the remote node.
- * @cm_id: Connection identifier that will be associated with the
- *   connection request.
- * @param: Connection request information needed to establish the
- *   connection.
- */
-int ib_send_cm_req(struct ib_cm_id *cm_id,
-		   struct ib_cm_req_param *param);
-
-struct ib_cm_rep_param {
-	u32		qp_num;
-	u32		starting_psn;
-	const void	*private_data;
-	u8		private_data_len;
-	u8		responder_resources;
-	u8		initiator_depth;
-	u8		target_ack_delay;
-	u8		failover_accepted;
-	u8		flow_control;
-	u8		rnr_retry_count;
-	u8		srq;
-};
-
-/**
- * ib_send_cm_rep - Sends a connection reply in response to a connection
- *   request.
- * @cm_id: Connection identifier that will be associated with the
- *   connection request.
- * @param: Connection reply information needed to establish the
- *   connection.
- */
-int ib_send_cm_rep(struct ib_cm_id *cm_id,
-		   struct ib_cm_rep_param *param);
-
-/**
- * ib_send_cm_rtu - Sends a connection ready to use message in response
- *   to a connection reply message.
- * @cm_id: Connection identifier associated with the connection request.
- * @private_data: Optional user-defined private data sent with the
- *   ready to use message.
- * @private_data_len: Size of the private data buffer, in bytes.
- */
-int ib_send_cm_rtu(struct ib_cm_id *cm_id,
-		   const void *private_data,
-		   u8 private_data_len);
-
-/**
- * ib_send_cm_dreq - Sends a disconnection request for an existing
- *   connection.
- * @cm_id: Connection identifier associated with the connection being
- *   released.
- * @private_data: Optional user-defined private data sent with the
- *   disconnection request message.
- * @private_data_len: Size of the private data buffer, in bytes.
- */
-int ib_send_cm_dreq(struct ib_cm_id *cm_id,
-		    const void *private_data,
-		    u8 private_data_len);
-
-/**
- * ib_send_cm_drep - Sends a disconnection reply to a disconnection request.
- * @cm_id: Connection identifier associated with the connection being
- *   released.
- * @private_data: Optional user-defined private data sent with the
- *   disconnection reply message.
- * @private_data_len: Size of the private data buffer, in bytes.
- *
- * If the cm_id is in the correct state, the CM will transition the connection
- * to the timewait state, even if an error occurs sending the DREP message.
- */
-int ib_send_cm_drep(struct ib_cm_id *cm_id,
-		    const void *private_data,
-		    u8 private_data_len);
-
-/**
- * ib_cm_notify - Notifies the CM of an event reported to the consumer.
- * @cm_id: Connection identifier to transition to established.
- * @event: Type of event.
- *
- * This routine should be invoked by users to notify the CM of relevant
- * communication events.  Events that should be reported to the CM and
- * when to report them are:
- *
- * IB_EVENT_COMM_EST - Used when a message is received on a connected
- *    QP before an RTU has been received.
- * IB_EVENT_PATH_MIG - Notifies the CM that the connection has failed over
- *   to the alternate path.
- */
-int ib_cm_notify(struct ib_cm_id *cm_id, enum ib_event_type event);
-
-/**
- * ib_send_cm_rej - Sends a connection rejection message to the
- *   remote node.
- * @cm_id: Connection identifier associated with the connection being
- *   rejected.
- * @reason: Reason for the connection request rejection.
- * @ari: Optional additional rejection information.
- * @ari_length: Size of the additional rejection information, in bytes.
- * @private_data: Optional user-defined private data sent with the
- *   rejection message.
- * @private_data_len: Size of the private data buffer, in bytes.
- */
-int ib_send_cm_rej(struct ib_cm_id *cm_id,
-		   enum ib_cm_rej_reason reason,
-		   void *ari,
-		   u8 ari_length,
-		   const void *private_data,
-		   u8 private_data_len);
-
-/**
- * ib_send_cm_mra - Sends a message receipt acknowledgement to a connection
- *   message.
- * @cm_id: Connection identifier associated with the connection message.
- * @service_timeout: The maximum time required for the sender to reply to
- *   to the connection message.
- * @private_data: Optional user-defined private data sent with the
- *   message receipt acknowledgement.
- * @private_data_len: Size of the private data buffer, in bytes.
- */
-int ib_send_cm_mra(struct ib_cm_id *cm_id,
-		   u8 service_timeout,
-		   const void *private_data,
-		   u8 private_data_len);
-
-/**
- * ib_send_cm_lap - Sends a load alternate path request.
- * @cm_id: Connection identifier associated with the load alternate path
- *   message.
- * @alternate_path: A path record that identifies the alternate path to
- *   load.
- * @private_data: Optional user-defined private data sent with the
- *   load alternate path message.
- * @private_data_len: Size of the private data buffer, in bytes.
- */
-int ib_send_cm_lap(struct ib_cm_id *cm_id,
-		   struct ib_sa_path_rec *alternate_path,
-		   const void *private_data,
-		   u8 private_data_len);
-
-/**
- * ib_cm_init_qp_attr - Initializes the QP attributes for use in transitioning
- *   to a specified QP state.
- * @cm_id: Communication identifier associated with the QP attributes to
- *   initialize.
- * @qp_attr: On input, specifies the desired QP state.  On output, the
- *   mandatory and desired optional attributes will be set in order to
- *   modify the QP to the specified state.
- * @qp_attr_mask: The QP attribute mask that may be used to transition the
- *   QP to the specified state.
- *
- * Users must set the @qp_attr->qp_state to the desired QP state.  This call
- * will set all required attributes for the given transition, along with
- * known optional attributes.  Users may override the attributes returned from
- * this call before calling ib_modify_qp.
- */
-int ib_cm_init_qp_attr(struct ib_cm_id *cm_id,
-		       struct ib_qp_attr *qp_attr,
-		       int *qp_attr_mask);
-
-/**
- * ib_send_cm_apr - Sends an alternate path response message in response to
- *   a load alternate path request.
- * @cm_id: Connection identifier associated with the alternate path response.
- * @status: Reply status sent with the alternate path response.
- * @info: Optional additional information sent with the alternate path
- *   response.
- * @info_length: Size of the additional information, in bytes.
- * @private_data: Optional user-defined private data sent with the
- *   alternate path response message.
- * @private_data_len: Size of the private data buffer, in bytes.
- */
-int ib_send_cm_apr(struct ib_cm_id *cm_id,
-		   enum ib_cm_apr_status status,
-		   void *info,
-		   u8 info_length,
-		   const void *private_data,
-		   u8 private_data_len);
-
-struct ib_cm_sidr_req_param {
-	struct ib_sa_path_rec	*path;
-	__be64			service_id;
-	int			timeout_ms;
-	const void		*private_data;
-	u8			private_data_len;
-	u8			max_cm_retries;
-};
-
-/**
- * ib_send_cm_sidr_req - Sends a service ID resolution request to the
- *   remote node.
- * @cm_id: Communication identifier that will be associated with the
- *   service ID resolution request.
- * @param: Service ID resolution request information.
- */
-int ib_send_cm_sidr_req(struct ib_cm_id *cm_id,
-			struct ib_cm_sidr_req_param *param);
-
-struct ib_cm_sidr_rep_param {
-	u32			qp_num;
-	u32			qkey;
-	enum ib_cm_sidr_status	status;
-	const void		*info;
-	u8			info_length;
-	const void		*private_data;
-	u8			private_data_len;
-};
-
-/**
- * ib_send_cm_sidr_rep - Sends a service ID resolution reply to the
- *   remote node.
- * @cm_id: Communication identifier associated with the received service ID
- *   resolution request.
- * @param: Service ID resolution reply information.
- */
-int ib_send_cm_sidr_rep(struct ib_cm_id *cm_id,
-			struct ib_cm_sidr_rep_param *param);
-
-#endif /* IB_CM_H */
diff --git a/sys/contrib/rdma/ib_fmr_pool.h b/sys/contrib/rdma/ib_fmr_pool.h
deleted file mode 100644
index 55996b8228f..00000000000
--- a/sys/contrib/rdma/ib_fmr_pool.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
- * Copyright (c) 2005 Sun Microsystems, Inc. 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.
- *
- * $Id: ib_fmr_pool.h 2730 2005-06-28 16:43:03Z sean.hefty $
- *
- * $FreeBSD$
- */
-
-#if !defined(IB_FMR_POOL_H)
-#define IB_FMR_POOL_H
-
-#include <rdma/ib_verbs.h>
-
-struct ib_fmr_pool;
-
-/**
- * struct ib_fmr_pool_param - Parameters for creating FMR pool
- * @max_pages_per_fmr:Maximum number of pages per map request.
- * @page_shift: Log2 of sizeof "pages" mapped by this fmr
- * @access:Access flags for FMRs in pool.
- * @pool_size:Number of FMRs to allocate for pool.
- * @dirty_watermark:Flush is triggered when @dirty_watermark dirty
- *     FMRs are present.
- * @flush_function:Callback called when unmapped FMRs are flushed and
- *     more FMRs are possibly available for mapping
- * @flush_arg:Context passed to user's flush function.
- * @cache:If set, FMRs may be reused after unmapping for identical map
- *     requests.
- */
-struct ib_fmr_pool_param {
-	int                     max_pages_per_fmr;
-	int                     page_shift;
-	enum ib_access_flags    access;
-	int                     pool_size;
-	int                     dirty_watermark;
-	void                  (*flush_function)(struct ib_fmr_pool *pool,
-						void *              arg);
-	void                   *flush_arg;
-	unsigned                cache:1;
-};
-
-struct ib_pool_fmr {
-	struct ib_fmr      *fmr;
-	struct ib_fmr_pool *pool;
-	struct list_head    list;
-	struct hlist_node   cache_node;
-	int                 ref_count;
-	int                 remap_count;
-	u64                 io_virtual_address;
-	int                 page_list_len;
-	u64                 page_list[0];
-};
-
-struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd             *pd,
-				       struct ib_fmr_pool_param *params);
-
-void ib_destroy_fmr_pool(struct ib_fmr_pool *pool);
-
-int ib_flush_fmr_pool(struct ib_fmr_pool *pool);
-
-struct ib_pool_fmr *ib_fmr_pool_map_phys(struct ib_fmr_pool *pool_handle,
-					 u64                *page_list,
-					 int                 list_len,
-					 u64                 io_virtual_address);
-
-int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr);
-
-#endif /* IB_FMR_POOL_H */
diff --git a/sys/contrib/rdma/ib_mad.h b/sys/contrib/rdma/ib_mad.h
deleted file mode 100644
index 7fabc97bc08..00000000000
--- a/sys/contrib/rdma/ib_mad.h
+++ /dev/null
@@ -1,656 +0,0 @@
-/*
- * Copyright (c) 2004 Mellanox Technologies Ltd.  All rights reserved.
- * Copyright (c) 2004 Infinicon Corporation.  All rights reserved.
- * Copyright (c) 2004 Intel Corporation.  All rights reserved.
- * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
- * Copyright (c) 2004-2006 Voltaire Corporation.  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.
- *
- * $Id: ib_mad.h 5596 2006-03-03 01:00:07Z sean.hefty $
- *
- * $FreeBSD$
- */
-
-#if !defined( IB_MAD_H )
-#define IB_MAD_H
-
-
-#include <contrib/rdma/ib_verbs.h>
-
-/* Management base version */
-#define IB_MGMT_BASE_VERSION			1
-
-/* Management classes */
-#define IB_MGMT_CLASS_SUBN_LID_ROUTED		0x01
-#define IB_MGMT_CLASS_SUBN_DIRECTED_ROUTE	0x81
-#define IB_MGMT_CLASS_SUBN_ADM			0x03
-#define IB_MGMT_CLASS_PERF_MGMT			0x04
-#define IB_MGMT_CLASS_BM			0x05
-#define IB_MGMT_CLASS_DEVICE_MGMT		0x06
-#define IB_MGMT_CLASS_CM			0x07
-#define IB_MGMT_CLASS_SNMP			0x08
-#define IB_MGMT_CLASS_DEVICE_ADM		0x10
-#define IB_MGMT_CLASS_BOOT_MGMT			0x11
-#define IB_MGMT_CLASS_BIS			0x12
-#define IB_MGMT_CLASS_CONG_MGMT			0x21
-#define IB_MGMT_CLASS_VENDOR_RANGE2_START	0x30
-#define IB_MGMT_CLASS_VENDOR_RANGE2_END		0x4F
-
-#define	IB_OPENIB_OUI				(0x001405)
-
-/* Management methods */
-#define IB_MGMT_METHOD_GET			0x01
-#define IB_MGMT_METHOD_SET			0x02
-#define IB_MGMT_METHOD_GET_RESP			0x81
-#define IB_MGMT_METHOD_SEND			0x03
-#define IB_MGMT_METHOD_TRAP			0x05
-#define IB_MGMT_METHOD_REPORT			0x06
-#define IB_MGMT_METHOD_REPORT_RESP		0x86
-#define IB_MGMT_METHOD_TRAP_REPRESS		0x07
-
-#define IB_MGMT_METHOD_RESP			0x80
-#define IB_BM_ATTR_MOD_RESP			cpu_to_be32(1)
-
-#define IB_MGMT_MAX_METHODS			128
-
-/* RMPP information */
-#define IB_MGMT_RMPP_VERSION			1
-
-#define IB_MGMT_RMPP_TYPE_DATA			1
-#define IB_MGMT_RMPP_TYPE_ACK			2
-#define IB_MGMT_RMPP_TYPE_STOP			3
-#define IB_MGMT_RMPP_TYPE_ABORT			4
-
-#define IB_MGMT_RMPP_FLAG_ACTIVE		1
-#define IB_MGMT_RMPP_FLAG_FIRST			(1<<1)
-#define IB_MGMT_RMPP_FLAG_LAST			(1<<2)
-
-#define IB_MGMT_RMPP_NO_RESPTIME		0x1F
-
-#define	IB_MGMT_RMPP_STATUS_SUCCESS		0
-#define	IB_MGMT_RMPP_STATUS_RESX		1
-#define	IB_MGMT_RMPP_STATUS_ABORT_MIN		118
-#define	IB_MGMT_RMPP_STATUS_T2L			118
-#define	IB_MGMT_RMPP_STATUS_BAD_LEN		119
-#define	IB_MGMT_RMPP_STATUS_BAD_SEG		120
-#define	IB_MGMT_RMPP_STATUS_BADT		121
-#define	IB_MGMT_RMPP_STATUS_W2S			122
-#define	IB_MGMT_RMPP_STATUS_S2B			123
-#define	IB_MGMT_RMPP_STATUS_BAD_STATUS		124
-#define	IB_MGMT_RMPP_STATUS_UNV			125
-#define	IB_MGMT_RMPP_STATUS_TMR			126
-#define	IB_MGMT_RMPP_STATUS_UNSPEC		127
-#define	IB_MGMT_RMPP_STATUS_ABORT_MAX		127
-
-#define IB_QP0		0
-#define IB_QP1		__constant_htonl(1)
-#define IB_QP1_QKEY	0x80010000
-#define IB_QP_SET_QKEY	0x80000000
-
-enum {
-	IB_MGMT_MAD_HDR = 24,
-	IB_MGMT_MAD_DATA = 232,
-	IB_MGMT_RMPP_HDR = 36,
-	IB_MGMT_RMPP_DATA = 220,
-	IB_MGMT_VENDOR_HDR = 40,
-	IB_MGMT_VENDOR_DATA = 216,
-	IB_MGMT_SA_HDR = 56,
-	IB_MGMT_SA_DATA = 200,
-	IB_MGMT_DEVICE_HDR = 64,
-	IB_MGMT_DEVICE_DATA = 192,
-};
-
-struct ib_mad_hdr {
-	u8	base_version;
-	u8	mgmt_class;
-	u8	class_version;
-	u8	method;
-	__be16	status;
-	__be16	class_specific;
-	__be64	tid;
-	__be16	attr_id;
-	__be16	resv;
-	__be32	attr_mod;
-};
-
-struct ib_rmpp_hdr {
-	u8	rmpp_version;
-	u8	rmpp_type;
-	u8	rmpp_rtime_flags;
-	u8	rmpp_status;
-	__be32	seg_num;
-	__be32	paylen_newwin;
-};
-
-typedef u64 ib_sa_comp_mask;
-
-#define IB_SA_COMP_MASK(n) ((__force ib_sa_comp_mask) cpu_to_be64(1ull << n))
-
-/*
- * ib_sa_hdr and ib_sa_mad structures must be packed because they have
- * 64-bit fields that are only 32-bit aligned. 64-bit architectures will
- * lay them out wrong otherwise.  (And unfortunately they are sent on
- * the wire so we can't change the layout)
- */
-struct ib_sa_hdr {
-	__be64			sm_key;
-	__be16			attr_offset;
-	__be16			reserved;
-	ib_sa_comp_mask		comp_mask;
-} __attribute__ ((packed));
-
-struct ib_mad {
-	struct ib_mad_hdr	mad_hdr;
-	u8			data[IB_MGMT_MAD_DATA];
-};
-
-struct ib_rmpp_mad {
-	struct ib_mad_hdr	mad_hdr;
-	struct ib_rmpp_hdr	rmpp_hdr;
-	u8			data[IB_MGMT_RMPP_DATA];
-};
-
-struct ib_sa_mad {
-	struct ib_mad_hdr	mad_hdr;
-	struct ib_rmpp_hdr	rmpp_hdr;
-	struct ib_sa_hdr	sa_hdr;
-	u8			data[IB_MGMT_SA_DATA];
-} __attribute__ ((packed));
-
-struct ib_vendor_mad {
-	struct ib_mad_hdr	mad_hdr;
-	struct ib_rmpp_hdr	rmpp_hdr;
-	u8			reserved;
-	u8			oui[3];
-	u8			data[IB_MGMT_VENDOR_DATA];
-};
-
-struct ib_class_port_info
-{
-	u8			base_version;
-	u8			class_version;
-	__be16			capability_mask;
-	u8			reserved[3];
-	u8			resp_time_value;
-	u8			redirect_gid[16];
-	__be32			redirect_tcslfl;
-	__be16			redirect_lid;
-	__be16			redirect_pkey;
-	__be32			redirect_qp;
-	__be32			redirect_qkey;
-	u8			trap_gid[16];
-	__be32			trap_tcslfl;
-	__be16			trap_lid;
-	__be16			trap_pkey;
-	__be32			trap_hlqp;
-	__be32			trap_qkey;
-};
-
-/**
- * ib_mad_send_buf - MAD data buffer and work request for sends.
- * @next: A pointer used to chain together MADs for posting.
- * @mad: References an allocated MAD data buffer for MADs that do not have
- *   RMPP active.  For MADs using RMPP, references the common and management
- *   class specific headers.
- * @mad_agent: MAD agent that allocated the buffer.
- * @ah: The address handle to use when sending the MAD.
- * @context: User-controlled context fields.
- * @hdr_len: Indicates the size of the data header of the MAD.  This length
- *   includes the common MAD, RMPP, and class specific headers.
- * @data_len: Indicates the total size of user-transferred data.
- * @seg_count: The number of RMPP segments allocated for this send.
- * @seg_size: Size of each RMPP segment.
- * @timeout_ms: Time to wait for a response.
- * @retries: Number of times to retry a request for a response.
- *
- * Users are responsible for initializing the MAD buffer itself, with the
- * exception of any RMPP header.  Additional segment buffer space allocated
- * beyond data_len is padding.
- */
-struct ib_mad_send_buf {
-	struct ib_mad_send_buf	*next;
-	void			*mad;
-	struct ib_mad_agent	*mad_agent;
-	struct ib_ah		*ah;
-	void			*context[2];
-	int			hdr_len;
-	int			data_len;
-	int			seg_count;
-	int			seg_size;
-	int			timeout_ms;
-	int			retries;
-};
-
-/**
- * ib_response_mad - Returns if the specified MAD has been generated in
- *   response to a sent request or trap.
- */
-int ib_response_mad(struct ib_mad *mad);
-
-/**
- * ib_get_rmpp_resptime - Returns the RMPP response time.
- * @rmpp_hdr: An RMPP header.
- */
-static inline u8 ib_get_rmpp_resptime(struct ib_rmpp_hdr *rmpp_hdr)
-{
-	return rmpp_hdr->rmpp_rtime_flags >> 3;
-}
-
-/**
- * ib_get_rmpp_flags - Returns the RMPP flags.
- * @rmpp_hdr: An RMPP header.
- */
-static inline u8 ib_get_rmpp_flags(struct ib_rmpp_hdr *rmpp_hdr)
-{
-	return rmpp_hdr->rmpp_rtime_flags & 0x7;
-}
-
-/**
- * ib_set_rmpp_resptime - Sets the response time in an RMPP header.
- * @rmpp_hdr: An RMPP header.
- * @rtime: The response time to set.
- */
-static inline void ib_set_rmpp_resptime(struct ib_rmpp_hdr *rmpp_hdr, u8 rtime)
-{
-	rmpp_hdr->rmpp_rtime_flags = ib_get_rmpp_flags(rmpp_hdr) | (rtime << 3);
-}
-
-/**
- * ib_set_rmpp_flags - Sets the flags in an RMPP header.
- * @rmpp_hdr: An RMPP header.
- * @flags: The flags to set.
- */
-static inline void ib_set_rmpp_flags(struct ib_rmpp_hdr *rmpp_hdr, u8 flags)
-{
-	rmpp_hdr->rmpp_rtime_flags = (rmpp_hdr->rmpp_rtime_flags & 0xF1) |
-				     (flags & 0x7);
-}
-
-struct ib_mad_agent;
-struct ib_mad_send_wc;
-struct ib_mad_recv_wc;
-
-/**
- * ib_mad_send_handler - callback handler for a sent MAD.
- * @mad_agent: MAD agent that sent the MAD.
- * @mad_send_wc: Send work completion information on the sent MAD.
- */
-typedef void (*ib_mad_send_handler)(struct ib_mad_agent *mad_agent,
-				    struct ib_mad_send_wc *mad_send_wc);
-
-/**
- * ib_mad_snoop_handler - Callback handler for snooping sent MADs.
- * @mad_agent: MAD agent that snooped the MAD.
- * @send_wr: Work request information on the sent MAD.
- * @mad_send_wc: Work completion information on the sent MAD.  Valid
- *   only for snooping that occurs on a send completion.
- *
- * Clients snooping MADs should not modify data referenced by the @send_wr
- * or @mad_send_wc.
- */
-typedef void (*ib_mad_snoop_handler)(struct ib_mad_agent *mad_agent,
-				     struct ib_mad_send_buf *send_buf,
-				     struct ib_mad_send_wc *mad_send_wc);
-
-/**
- * ib_mad_recv_handler - callback handler for a received MAD.
- * @mad_agent: MAD agent requesting the received MAD.
- * @mad_recv_wc: Received work completion information on the received MAD.
- *
- * MADs received in response to a send request operation will be handed to
- * the user before the send operation completes.  All data buffers given
- * to registered agents through this routine are owned by the receiving
- * client, except for snooping agents.  Clients snooping MADs should not
- * modify the data referenced by @mad_recv_wc.
- */
-typedef void (*ib_mad_recv_handler)(struct ib_mad_agent *mad_agent,
-				    struct ib_mad_recv_wc *mad_recv_wc);
-
-/**
- * ib_mad_agent - Used to track MAD registration with the access layer.
- * @device: Reference to device registration is on.
- * @qp: Reference to QP used for sending and receiving MADs.
- * @mr: Memory region for system memory usable for DMA.
- * @recv_handler: Callback handler for a received MAD.
- * @send_handler: Callback handler for a sent MAD.
- * @snoop_handler: Callback handler for snooped sent MADs.
- * @context: User-specified context associated with this registration.
- * @hi_tid: Access layer assigned transaction ID for this client.
- *   Unsolicited MADs sent by this client will have the upper 32-bits
- *   of their TID set to this value.
- * @port_num: Port number on which QP is registered
- * @rmpp_version: If set, indicates the RMPP version used by this agent.
- */
-struct ib_mad_agent {
-	struct ib_device	*device;
-	struct ib_qp		*qp;
-	struct ib_mr		*mr;
-	ib_mad_recv_handler	recv_handler;
-	ib_mad_send_handler	send_handler;
-	ib_mad_snoop_handler	snoop_handler;
-	void			*context;
-	u32			hi_tid;
-	u8			port_num;
-	u8			rmpp_version;
-};
-
-/**
- * ib_mad_send_wc - MAD send completion information.
- * @send_buf: Send MAD data buffer associated with the send MAD request.
- * @status: Completion status.
- * @vendor_err: Optional vendor error information returned with a failed
- *   request.
- */
-struct ib_mad_send_wc {
-	struct ib_mad_send_buf	*send_buf;
-	enum ib_wc_status	status;
-	u32			vendor_err;
-};
-
-/**
- * ib_mad_recv_buf - received MAD buffer information.
- * @list: Reference to next data buffer for a received RMPP MAD.
- * @grh: References a data buffer containing the global route header.
- *   The data refereced by this buffer is only valid if the GRH is
- *   valid.
- * @mad: References the start of the received MAD.
- */
-struct ib_mad_recv_buf {
-	TAILQ_ENTRY(ib_mad_recv_buf)	entry;
-	struct ib_grh		*grh;
-	struct ib_mad		*mad;
-};
-
-/**
- * ib_mad_recv_wc - received MAD information.
- * @wc: Completion information for the received data.
- * @recv_buf: Specifies the location of the received data buffer(s).
- * @rmpp_list: Specifies a list of RMPP reassembled received MAD buffers.
- * @mad_len: The length of the received MAD, without duplicated headers.
- *
- * For received response, the wr_id contains a pointer to the ib_mad_send_buf
- *   for the corresponding send request.
- */
-struct ib_mad_recv_wc {
-	struct ib_wc		*wc;
-	struct ib_mad_recv_buf	recv_buf;
-	TAILQ_ENTRY(ib_mad_recv_wc)	entry;
-	int			mad_len;
-};
-
-/**
- * ib_mad_reg_req - MAD registration request
- * @mgmt_class: Indicates which management class of MADs should be receive
- *   by the caller.  This field is only required if the user wishes to
- *   receive unsolicited MADs, otherwise it should be 0.
- * @mgmt_class_version: Indicates which version of MADs for the given
- *   management class to receive.
- * @oui: Indicates IEEE OUI when mgmt_class is a vendor class
- *   in the range from 0x30 to 0x4f. Otherwise not used.
- * @method_mask: The caller will receive unsolicited MADs for any method
- *   where @method_mask = 1.
- */
-struct ib_mad_reg_req {
-	u8	mgmt_class;
-	u8	mgmt_class_version;
-	u8	oui[3];
-#ifdef notyet	
-	DECLARE_BITMAP(method_mask, IB_MGMT_MAX_METHODS);
-#endif	
-};
-
-/**
- * ib_register_mad_agent - Register to send/receive MADs.
- * @device: The device to register with.
- * @port_num: The port on the specified device to use.
- * @qp_type: Specifies which QP to access.  Must be either
- *   IB_QPT_SMI or IB_QPT_GSI.
- * @mad_reg_req: Specifies which unsolicited MADs should be received
- *   by the caller.  This parameter may be NULL if the caller only
- *   wishes to receive solicited responses.
- * @rmpp_version: If set, indicates that the client will send
- *   and receive MADs that contain the RMPP header for the given version.
- *   If set to 0, indicates that RMPP is not used by this client.
- * @send_handler: The completion callback routine invoked after a send
- *   request has completed.
- * @recv_handler: The completion callback routine invoked for a received
- *   MAD.
- * @context: User specified context associated with the registration.
- */
-struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device,
-					   u8 port_num,
-					   enum ib_qp_type qp_type,
-					   struct ib_mad_reg_req *mad_reg_req,
-					   u8 rmpp_version,
-					   ib_mad_send_handler send_handler,
-					   ib_mad_recv_handler recv_handler,
-					   void *context);
-
-enum ib_mad_snoop_flags {
-	/*IB_MAD_SNOOP_POSTED_SENDS	   = 1,*/
-	/*IB_MAD_SNOOP_RMPP_SENDS	   = (1<<1),*/
-	IB_MAD_SNOOP_SEND_COMPLETIONS	   = (1<<2),
-	/*IB_MAD_SNOOP_RMPP_SEND_COMPLETIONS = (1<<3),*/
-	IB_MAD_SNOOP_RECVS		   = (1<<4)
-	/*IB_MAD_SNOOP_RMPP_RECVS	   = (1<<5),*/
-	/*IB_MAD_SNOOP_REDIRECTED_QPS	   = (1<<6)*/
-};
-
-/**
- * ib_register_mad_snoop - Register to snoop sent and received MADs.
- * @device: The device to register with.
- * @port_num: The port on the specified device to use.
- * @qp_type: Specifies which QP traffic to snoop.  Must be either
- *   IB_QPT_SMI or IB_QPT_GSI.
- * @mad_snoop_flags: Specifies information where snooping occurs.
- * @send_handler: The callback routine invoked for a snooped send.
- * @recv_handler: The callback routine invoked for a snooped receive.
- * @context: User specified context associated with the registration.
- */
-struct ib_mad_agent *ib_register_mad_snoop(struct ib_device *device,
-					   u8 port_num,
-					   enum ib_qp_type qp_type,
-					   int mad_snoop_flags,
-					   ib_mad_snoop_handler snoop_handler,
-					   ib_mad_recv_handler recv_handler,
-					   void *context);
-
-/**
- * ib_unregister_mad_agent - Unregisters a client from using MAD services.
- * @mad_agent: Corresponding MAD registration request to deregister.
- *
- * After invoking this routine, MAD services are no longer usable by the
- * client on the associated QP.
- */
-int ib_unregister_mad_agent(struct ib_mad_agent *mad_agent);
-
-/**
- * ib_post_send_mad - Posts MAD(s) to the send queue of the QP associated
- *   with the registered client.
- * @send_buf: Specifies the information needed to send the MAD(s).
- * @bad_send_buf: Specifies the MAD on which an error was encountered.  This
- *   parameter is optional if only a single MAD is posted.
- *
- * Sent MADs are not guaranteed to complete in the order that they were posted.
- *
- * If the MAD requires RMPP, the data buffer should contain a single copy
- * of the common MAD, RMPP, and class specific headers, followed by the class
- * defined data.  If the class defined data would not divide evenly into
- * RMPP segments, then space must be allocated at the end of the referenced
- * buffer for any required padding.  To indicate the amount of class defined
- * data being transferred, the paylen_newwin field in the RMPP header should
- * be set to the size of the class specific header plus the amount of class
- * defined data being transferred.  The paylen_newwin field should be
- * specified in network-byte order.
- */
-int ib_post_send_mad(struct ib_mad_send_buf *send_buf,
-		     struct ib_mad_send_buf **bad_send_buf);
-
-
-/**
- * ib_free_recv_mad - Returns data buffers used to receive a MAD.
- * @mad_recv_wc: Work completion information for a received MAD.
- *
- * Clients receiving MADs through their ib_mad_recv_handler must call this
- * routine to return the work completion buffers to the access layer.
- */
-void ib_free_recv_mad(struct ib_mad_recv_wc *mad_recv_wc);
-
-/**
- * ib_cancel_mad - Cancels an outstanding send MAD operation.
- * @mad_agent: Specifies the registration associated with sent MAD.
- * @send_buf: Indicates the MAD to cancel.
- *
- * MADs will be returned to the user through the corresponding
- * ib_mad_send_handler.
- */
-void ib_cancel_mad(struct ib_mad_agent *mad_agent,
-		   struct ib_mad_send_buf *send_buf);
-
-/**
- * ib_modify_mad - Modifies an outstanding send MAD operation.
- * @mad_agent: Specifies the registration associated with sent MAD.
- * @send_buf: Indicates the MAD to modify.
- * @timeout_ms: New timeout value for sent MAD.
- *
- * This call will reset the timeout value for a sent MAD to the specified
- * value.
- */
-int ib_modify_mad(struct ib_mad_agent *mad_agent,
-		  struct ib_mad_send_buf *send_buf, u32 timeout_ms);
-
-/**
- * ib_redirect_mad_qp - Registers a QP for MAD services.
- * @qp: Reference to a QP that requires MAD services.
- * @rmpp_version: If set, indicates that the client will send
- *   and receive MADs that contain the RMPP header for the given version.
- *   If set to 0, indicates that RMPP is not used by this client.
- * @send_handler: The completion callback routine invoked after a send
- *   request has completed.
- * @recv_handler: The completion callback routine invoked for a received
- *   MAD.
- * @context: User specified context associated with the registration.
- *
- * Use of this call allows clients to use MAD services, such as RMPP,
- * on user-owned QPs.  After calling this routine, users may send
- * MADs on the specified QP by calling ib_mad_post_send.
- */
-struct ib_mad_agent *ib_redirect_mad_qp(struct ib_qp *qp,
-					u8 rmpp_version,
-					ib_mad_send_handler send_handler,
-					ib_mad_recv_handler recv_handler,
-					void *context);
-
-/**
- * ib_process_mad_wc - Processes a work completion associated with a
- *   MAD sent or received on a redirected QP.
- * @mad_agent: Specifies the registered MAD service using the redirected QP.
- * @wc: References a work completion associated with a sent or received
- *   MAD segment.
- *
- * This routine is used to complete or continue processing on a MAD request.
- * If the work completion is associated with a send operation, calling
- * this routine is required to continue an RMPP transfer or to wait for a
- * corresponding response, if it is a request.  If the work completion is
- * associated with a receive operation, calling this routine is required to
- * process an inbound or outbound RMPP transfer, or to match a response MAD
- * with its corresponding request.
- */
-int ib_process_mad_wc(struct ib_mad_agent *mad_agent,
-		      struct ib_wc *wc);
-
-/**
- * ib_create_send_mad - Allocate and initialize a data buffer and work request
- *   for sending a MAD.
- * @mad_agent: Specifies the registered MAD service to associate with the MAD.
- * @remote_qpn: Specifies the QPN of the receiving node.
- * @pkey_index: Specifies which PKey the MAD will be sent using.  This field
- *   is valid only if the remote_qpn is QP 1.
- * @rmpp_active: Indicates if the send will enable RMPP.
- * @hdr_len: Indicates the size of the data header of the MAD.  This length
- *   should include the common MAD header, RMPP header, plus any class
- *   specific header.
- * @data_len: Indicates the size of any user-transferred data.  The call will
- *   automatically adjust the allocated buffer size to account for any
- *   additional padding that may be necessary.
- * @gfp_mask: GFP mask used for the memory allocation.
- *
- * This routine allocates a MAD for sending.  The returned MAD send buffer
- * will reference a data buffer usable for sending a MAD, along
- * with an initialized work request structure.  Users may modify the returned
- * MAD data buffer before posting the send.
- *
- * The returned MAD header, class specific headers, and any padding will be
- * cleared.  Users are responsible for initializing the common MAD header,
- * any class specific header, and MAD data area.
- * If @rmpp_active is set, the RMPP header will be initialized for sending.
- */
-struct ib_mad_send_buf * ib_create_send_mad(struct ib_mad_agent *mad_agent,
-					    u32 remote_qpn, u16 pkey_index,
-					    int rmpp_active,
-					    int hdr_len, int data_len,
-					    int gfp_mask);
-
-/**
- * ib_is_mad_class_rmpp - returns whether given management class
- * supports RMPP.
- * @mgmt_class: management class
- *
- * This routine returns whether the management class supports RMPP.
- */
-int ib_is_mad_class_rmpp(u8 mgmt_class);
-
-/**
- * ib_get_mad_data_offset - returns the data offset for a given
- * management class.
- * @mgmt_class: management class
- *
- * This routine returns the data offset in the MAD for the management
- * class requested.
- */
-int ib_get_mad_data_offset(u8 mgmt_class);
-
-/**
- * ib_get_rmpp_segment - returns the data buffer for a given RMPP segment.
- * @send_buf: Previously allocated send data buffer.
- * @seg_num: number of segment to return
- *
- * This routine returns a pointer to the data buffer of an RMPP MAD.
- * Users must provide synchronization to @send_buf around this call.
- */
-void *ib_get_rmpp_segment(struct ib_mad_send_buf *send_buf, int seg_num);
-
-/**
- * ib_free_send_mad - Returns data buffers used to send a MAD.
- * @send_buf: Previously allocated send data buffer.
- */
-void ib_free_send_mad(struct ib_mad_send_buf *send_buf);
-
-#endif /* IB_MAD_H */
diff --git a/sys/contrib/rdma/ib_marshall.h b/sys/contrib/rdma/ib_marshall.h
deleted file mode 100644
index 60cd219efd0..00000000000
--- a/sys/contrib/rdma/ib_marshall.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2005-2006 Intel Corporation.  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.
- *
- * $FreeBSD$
- */
-
-#if !defined(IB_USER_MARSHALL_H)
-#define IB_USER_MARSHALL_H
-
-#include <rdma/ib_verbs.h>
-#include <rdma/ib_sa.h>
-#include <rdma/ib_user_verbs.h>
-#include <rdma/ib_user_sa.h>
-
-void ib_copy_qp_attr_to_user(struct ib_uverbs_qp_attr *dst,
-			     struct ib_qp_attr *src);
-
-void ib_copy_ah_attr_to_user(struct ib_uverbs_ah_attr *dst,
-			     struct ib_ah_attr *src);
-
-void ib_copy_path_rec_to_user(struct ib_user_path_rec *dst,
-			      struct ib_sa_path_rec *src);
-
-void ib_copy_path_rec_from_user(struct ib_sa_path_rec *dst,
-				struct ib_user_path_rec *src);
-
-#endif /* IB_USER_MARSHALL_H */
diff --git a/sys/contrib/rdma/ib_pack.h b/sys/contrib/rdma/ib_pack.h
deleted file mode 100644
index 206d1f1c0a6..00000000000
--- a/sys/contrib/rdma/ib_pack.h
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2004 Topspin Corporation.  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.
- *
- * $Id: ib_pack.h 1349 2004-12-16 21:09:43Z roland $
- *
- * $FreeBSD$
- */
-
-#ifndef IB_PACK_H
-#define IB_PACK_H
-
-#include <rdma/ib_verbs.h>
-
-enum {
-	IB_LRH_BYTES  = 8,
-	IB_GRH_BYTES  = 40,
-	IB_BTH_BYTES  = 12,
-	IB_DETH_BYTES = 8
-};
-
-struct ib_field {
-	size_t struct_offset_bytes;
-	size_t struct_size_bytes;
-	int    offset_words;
-	int    offset_bits;
-	int    size_bits;
-	char  *field_name;
-};
-
-#define RESERVED \
-	.field_name          = "reserved"
-
-/*
- * This macro cleans up the definitions of constants for BTH opcodes.
- * It is used to define constants such as IB_OPCODE_UD_SEND_ONLY,
- * which becomes IB_OPCODE_UD + IB_OPCODE_SEND_ONLY, and this gives
- * the correct value.
- *
- * In short, user code should use the constants defined using the
- * macro rather than worrying about adding together other constants.
-*/
-#define IB_OPCODE(transport, op) \
-	IB_OPCODE_ ## transport ## _ ## op = \
-		IB_OPCODE_ ## transport + IB_OPCODE_ ## op
-
-enum {
-	/* transport types -- just used to define real constants */
-	IB_OPCODE_RC                                = 0x00,
-	IB_OPCODE_UC                                = 0x20,
-	IB_OPCODE_RD                                = 0x40,
-	IB_OPCODE_UD                                = 0x60,
-
-	/* operations -- just used to define real constants */
-	IB_OPCODE_SEND_FIRST                        = 0x00,
-	IB_OPCODE_SEND_MIDDLE                       = 0x01,
-	IB_OPCODE_SEND_LAST                         = 0x02,
-	IB_OPCODE_SEND_LAST_WITH_IMMEDIATE          = 0x03,
-	IB_OPCODE_SEND_ONLY                         = 0x04,
-	IB_OPCODE_SEND_ONLY_WITH_IMMEDIATE          = 0x05,
-	IB_OPCODE_RDMA_WRITE_FIRST                  = 0x06,
-	IB_OPCODE_RDMA_WRITE_MIDDLE                 = 0x07,
-	IB_OPCODE_RDMA_WRITE_LAST                   = 0x08,
-	IB_OPCODE_RDMA_WRITE_LAST_WITH_IMMEDIATE    = 0x09,
-	IB_OPCODE_RDMA_WRITE_ONLY                   = 0x0a,
-	IB_OPCODE_RDMA_WRITE_ONLY_WITH_IMMEDIATE    = 0x0b,
-	IB_OPCODE_RDMA_READ_REQUEST                 = 0x0c,
-	IB_OPCODE_RDMA_READ_RESPONSE_FIRST          = 0x0d,
-	IB_OPCODE_RDMA_READ_RESPONSE_MIDDLE         = 0x0e,
-	IB_OPCODE_RDMA_READ_RESPONSE_LAST           = 0x0f,
-	IB_OPCODE_RDMA_READ_RESPONSE_ONLY           = 0x10,
-	IB_OPCODE_ACKNOWLEDGE                       = 0x11,
-	IB_OPCODE_ATOMIC_ACKNOWLEDGE                = 0x12,
-	IB_OPCODE_COMPARE_SWAP                      = 0x13,
-	IB_OPCODE_FETCH_ADD                         = 0x14,
-
-	/* real constants follow -- see comment about above IB_OPCODE()
-	   macro for more details */
-
-	/* RC */
-	IB_OPCODE(RC, SEND_FIRST),
-	IB_OPCODE(RC, SEND_MIDDLE),
-	IB_OPCODE(RC, SEND_LAST),
-	IB_OPCODE(RC, SEND_LAST_WITH_IMMEDIATE),
-	IB_OPCODE(RC, SEND_ONLY),
-	IB_OPCODE(RC, SEND_ONLY_WITH_IMMEDIATE),
-	IB_OPCODE(RC, RDMA_WRITE_FIRST),
-	IB_OPCODE(RC, RDMA_WRITE_MIDDLE),
-	IB_OPCODE(RC, RDMA_WRITE_LAST),
-	IB_OPCODE(RC, RDMA_WRITE_LAST_WITH_IMMEDIATE),
-	IB_OPCODE(RC, RDMA_WRITE_ONLY),
-	IB_OPCODE(RC, RDMA_WRITE_ONLY_WITH_IMMEDIATE),
-	IB_OPCODE(RC, RDMA_READ_REQUEST),
-	IB_OPCODE(RC, RDMA_READ_RESPONSE_FIRST),
-	IB_OPCODE(RC, RDMA_READ_RESPONSE_MIDDLE),
-	IB_OPCODE(RC, RDMA_READ_RESPONSE_LAST),
-	IB_OPCODE(RC, RDMA_READ_RESPONSE_ONLY),
-	IB_OPCODE(RC, ACKNOWLEDGE),
-	IB_OPCODE(RC, ATOMIC_ACKNOWLEDGE),
-	IB_OPCODE(RC, COMPARE_SWAP),
-	IB_OPCODE(RC, FETCH_ADD),
-
-	/* UC */
-	IB_OPCODE(UC, SEND_FIRST),
-	IB_OPCODE(UC, SEND_MIDDLE),
-	IB_OPCODE(UC, SEND_LAST),
-	IB_OPCODE(UC, SEND_LAST_WITH_IMMEDIATE),
-	IB_OPCODE(UC, SEND_ONLY),
-	IB_OPCODE(UC, SEND_ONLY_WITH_IMMEDIATE),
-	IB_OPCODE(UC, RDMA_WRITE_FIRST),
-	IB_OPCODE(UC, RDMA_WRITE_MIDDLE),
-	IB_OPCODE(UC, RDMA_WRITE_LAST),
-	IB_OPCODE(UC, RDMA_WRITE_LAST_WITH_IMMEDIATE),
-	IB_OPCODE(UC, RDMA_WRITE_ONLY),
-	IB_OPCODE(UC, RDMA_WRITE_ONLY_WITH_IMMEDIATE),
-
-	/* RD */
-	IB_OPCODE(RD, SEND_FIRST),
-	IB_OPCODE(RD, SEND_MIDDLE),
-	IB_OPCODE(RD, SEND_LAST),
-	IB_OPCODE(RD, SEND_LAST_WITH_IMMEDIATE),
-	IB_OPCODE(RD, SEND_ONLY),
-	IB_OPCODE(RD, SEND_ONLY_WITH_IMMEDIATE),
-	IB_OPCODE(RD, RDMA_WRITE_FIRST),
-	IB_OPCODE(RD, RDMA_WRITE_MIDDLE),
-	IB_OPCODE(RD, RDMA_WRITE_LAST),
-	IB_OPCODE(RD, RDMA_WRITE_LAST_WITH_IMMEDIATE),
-	IB_OPCODE(RD, RDMA_WRITE_ONLY),
-	IB_OPCODE(RD, RDMA_WRITE_ONLY_WITH_IMMEDIATE),
-	IB_OPCODE(RD, RDMA_READ_REQUEST),
-	IB_OPCODE(RD, RDMA_READ_RESPONSE_FIRST),
-	IB_OPCODE(RD, RDMA_READ_RESPONSE_MIDDLE),
-	IB_OPCODE(RD, RDMA_READ_RESPONSE_LAST),
-	IB_OPCODE(RD, RDMA_READ_RESPONSE_ONLY),
-	IB_OPCODE(RD, ACKNOWLEDGE),
-	IB_OPCODE(RD, ATOMIC_ACKNOWLEDGE),
-	IB_OPCODE(RD, COMPARE_SWAP),
-	IB_OPCODE(RD, FETCH_ADD),
-
-	/* UD */
-	IB_OPCODE(UD, SEND_ONLY),
-	IB_OPCODE(UD, SEND_ONLY_WITH_IMMEDIATE)
-};
-
-enum {
-	IB_LNH_RAW        = 0,
-	IB_LNH_IP         = 1,
-	IB_LNH_IBA_LOCAL  = 2,
-	IB_LNH_IBA_GLOBAL = 3
-};
-
-struct ib_unpacked_lrh {
-	u8        virtual_lane;
-	u8        link_version;
-	u8        service_level;
-	u8        link_next_header;
-	__be16    destination_lid;
-	__be16    packet_length;
-	__be16    source_lid;
-};
-
-struct ib_unpacked_grh {
-	u8    	     ip_version;
-	u8    	     traffic_class;
-	__be32 	     flow_label;
-	__be16       payload_length;
-	u8    	     next_header;
-	u8    	     hop_limit;
-	union ib_gid source_gid;
-	union ib_gid destination_gid;
-};
-
-struct ib_unpacked_bth {
-	u8           opcode;
-	u8           solicited_event;
-	u8           mig_req;
-	u8           pad_count;
-	u8           transport_header_version;
-	__be16       pkey;
-	__be32       destination_qpn;
-	u8           ack_req;
-	__be32       psn;
-};
-
-struct ib_unpacked_deth {
-	__be32       qkey;
-	__be32       source_qpn;
-};
-
-struct ib_ud_header {
-	struct ib_unpacked_lrh  lrh;
-	int                     grh_present;
-	struct ib_unpacked_grh  grh;
-	struct ib_unpacked_bth  bth;
-	struct ib_unpacked_deth deth;
-	int            		immediate_present;
-	__be32         		immediate_data;
-};
-
-void ib_pack(const struct ib_field        *desc,
-	     int                           desc_len,
-	     void                         *structure,
-	     void                         *buf);
-
-void ib_unpack(const struct ib_field        *desc,
-	       int                           desc_len,
-	       void                         *buf,
-	       void                         *structure);
-
-void ib_ud_header_init(int     		   payload_bytes,
-		       int    		   grh_present,
-		       struct ib_ud_header *header);
-
-int ib_ud_header_pack(struct ib_ud_header *header,
-		      void                *buf);
-
-int ib_ud_header_unpack(void                *buf,
-			struct ib_ud_header *header);
-
-#endif /* IB_PACK_H */
diff --git a/sys/contrib/rdma/ib_sa.h b/sys/contrib/rdma/ib_sa.h
deleted file mode 100644
index bf6a28a1c61..00000000000
--- a/sys/contrib/rdma/ib_sa.h
+++ /dev/null
@@ -1,386 +0,0 @@
-/*
- * Copyright (c) 2004 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Voltaire, Inc.  All rights reserved.
- * Copyright (c) 2006 Intel Corporation.  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.
- *
- * $Id: ib_sa.h 2811 2005-07-06 18:11:43Z halr $
- *
- * $FreeBSD$
- */
-
-#ifndef IB_SA_H
-#define IB_SA_H
-
-#include <machine/atomic.h>
-
-#include <contrib/rdma/ib_verbs.h>
-#include <contrib/rdma/ib_mad.h>
-
-enum {
-	IB_SA_CLASS_VERSION		= 2,	/* IB spec version 1.1/1.2 */
-
-	IB_SA_METHOD_GET_TABLE		= 0x12,
-	IB_SA_METHOD_GET_TABLE_RESP	= 0x92,
-	IB_SA_METHOD_DELETE		= 0x15,
-	IB_SA_METHOD_DELETE_RESP	= 0x95,
-	IB_SA_METHOD_GET_MULTI		= 0x14,
-	IB_SA_METHOD_GET_MULTI_RESP	= 0x94,
-	IB_SA_METHOD_GET_TRACE_TBL	= 0x13
-};
-
-enum {
-	IB_SA_ATTR_CLASS_PORTINFO    = 0x01,
-	IB_SA_ATTR_NOTICE	     = 0x02,
-	IB_SA_ATTR_INFORM_INFO	     = 0x03,
-	IB_SA_ATTR_NODE_REC	     = 0x11,
-	IB_SA_ATTR_PORT_INFO_REC     = 0x12,
-	IB_SA_ATTR_SL2VL_REC	     = 0x13,
-	IB_SA_ATTR_SWITCH_REC	     = 0x14,
-	IB_SA_ATTR_LINEAR_FDB_REC    = 0x15,
-	IB_SA_ATTR_RANDOM_FDB_REC    = 0x16,
-	IB_SA_ATTR_MCAST_FDB_REC     = 0x17,
-	IB_SA_ATTR_SM_INFO_REC	     = 0x18,
-	IB_SA_ATTR_LINK_REC	     = 0x20,
-	IB_SA_ATTR_GUID_INFO_REC     = 0x30,
-	IB_SA_ATTR_SERVICE_REC	     = 0x31,
-	IB_SA_ATTR_PARTITION_REC     = 0x33,
-	IB_SA_ATTR_PATH_REC	     = 0x35,
-	IB_SA_ATTR_VL_ARB_REC	     = 0x36,
-	IB_SA_ATTR_MC_MEMBER_REC     = 0x38,
-	IB_SA_ATTR_TRACE_REC	     = 0x39,
-	IB_SA_ATTR_MULTI_PATH_REC    = 0x3a,
-	IB_SA_ATTR_SERVICE_ASSOC_REC = 0x3b,
-	IB_SA_ATTR_INFORM_INFO_REC   = 0xf3
-};
-
-enum ib_sa_selector {
-	IB_SA_GT   = 0,
-	IB_SA_LT   = 1,
-	IB_SA_EQ   = 2,
-	/*
-	 * The meaning of "best" depends on the attribute: for
-	 * example, for MTU best will return the largest available
-	 * MTU, while for packet life time, best will return the
-	 * smallest available life time.
-	 */
-	IB_SA_BEST = 3
-};
-
-/*
- * Structures for SA records are named "struct ib_sa_xxx_rec."  No
- * attempt is made to pack structures to match the physical layout of
- * SA records in SA MADs; all packing and unpacking is handled by the
- * SA query code.
- *
- * For a record with structure ib_sa_xxx_rec, the naming convention
- * for the component mask value for field yyy is IB_SA_XXX_REC_YYY (we
- * never use different abbreviations or otherwise change the spelling
- * of xxx/yyy between ib_sa_xxx_rec.yyy and IB_SA_XXX_REC_YYY).
- *
- * Reserved rows are indicated with comments to help maintainability.
- */
-
-/* reserved:								 0 */
-/* reserved:								 1 */
-#define IB_SA_PATH_REC_DGID				IB_SA_COMP_MASK( 2)
-#define IB_SA_PATH_REC_SGID				IB_SA_COMP_MASK( 3)
-#define IB_SA_PATH_REC_DLID				IB_SA_COMP_MASK( 4)
-#define IB_SA_PATH_REC_SLID				IB_SA_COMP_MASK( 5)
-#define IB_SA_PATH_REC_RAW_TRAFFIC			IB_SA_COMP_MASK( 6)
-/* reserved:								 7 */
-#define IB_SA_PATH_REC_FLOW_LABEL       		IB_SA_COMP_MASK( 8)
-#define IB_SA_PATH_REC_HOP_LIMIT			IB_SA_COMP_MASK( 9)
-#define IB_SA_PATH_REC_TRAFFIC_CLASS			IB_SA_COMP_MASK(10)
-#define IB_SA_PATH_REC_REVERSIBLE			IB_SA_COMP_MASK(11)
-#define IB_SA_PATH_REC_NUMB_PATH			IB_SA_COMP_MASK(12)
-#define IB_SA_PATH_REC_PKEY				IB_SA_COMP_MASK(13)
-/* reserved:								14 */
-#define IB_SA_PATH_REC_SL				IB_SA_COMP_MASK(15)
-#define IB_SA_PATH_REC_MTU_SELECTOR			IB_SA_COMP_MASK(16)
-#define IB_SA_PATH_REC_MTU				IB_SA_COMP_MASK(17)
-#define IB_SA_PATH_REC_RATE_SELECTOR			IB_SA_COMP_MASK(18)
-#define IB_SA_PATH_REC_RATE				IB_SA_COMP_MASK(19)
-#define IB_SA_PATH_REC_PACKET_LIFE_TIME_SELECTOR	IB_SA_COMP_MASK(20)
-#define IB_SA_PATH_REC_PACKET_LIFE_TIME			IB_SA_COMP_MASK(21)
-#define IB_SA_PATH_REC_PREFERENCE			IB_SA_COMP_MASK(22)
-
-struct ib_sa_path_rec {
-	/* reserved */
-	/* reserved */
-	union ib_gid dgid;
-	union ib_gid sgid;
-	__be16       dlid;
-	__be16       slid;
-	int          raw_traffic;
-	/* reserved */
-	__be32       flow_label;
-	u8           hop_limit;
-	u8           traffic_class;
-	int          reversible;
-	u8           numb_path;
-	__be16       pkey;
-	/* reserved */
-	u8           sl;
-	u8           mtu_selector;
-	u8           mtu;
-	u8           rate_selector;
-	u8           rate;
-	u8           packet_life_time_selector;
-	u8           packet_life_time;
-	u8           preference;
-};
-
-#define IB_SA_MCMEMBER_REC_MGID				IB_SA_COMP_MASK( 0)
-#define IB_SA_MCMEMBER_REC_PORT_GID			IB_SA_COMP_MASK( 1)
-#define IB_SA_MCMEMBER_REC_QKEY				IB_SA_COMP_MASK( 2)
-#define IB_SA_MCMEMBER_REC_MLID				IB_SA_COMP_MASK( 3)
-#define IB_SA_MCMEMBER_REC_MTU_SELECTOR			IB_SA_COMP_MASK( 4)
-#define IB_SA_MCMEMBER_REC_MTU				IB_SA_COMP_MASK( 5)
-#define IB_SA_MCMEMBER_REC_TRAFFIC_CLASS		IB_SA_COMP_MASK( 6)
-#define IB_SA_MCMEMBER_REC_PKEY				IB_SA_COMP_MASK( 7)
-#define IB_SA_MCMEMBER_REC_RATE_SELECTOR		IB_SA_COMP_MASK( 8)
-#define IB_SA_MCMEMBER_REC_RATE				IB_SA_COMP_MASK( 9)
-#define IB_SA_MCMEMBER_REC_PACKET_LIFE_TIME_SELECTOR	IB_SA_COMP_MASK(10)
-#define IB_SA_MCMEMBER_REC_PACKET_LIFE_TIME		IB_SA_COMP_MASK(11)
-#define IB_SA_MCMEMBER_REC_SL				IB_SA_COMP_MASK(12)
-#define IB_SA_MCMEMBER_REC_FLOW_LABEL			IB_SA_COMP_MASK(13)
-#define IB_SA_MCMEMBER_REC_HOP_LIMIT			IB_SA_COMP_MASK(14)
-#define IB_SA_MCMEMBER_REC_SCOPE			IB_SA_COMP_MASK(15)
-#define IB_SA_MCMEMBER_REC_JOIN_STATE			IB_SA_COMP_MASK(16)
-#define IB_SA_MCMEMBER_REC_PROXY_JOIN			IB_SA_COMP_MASK(17)
-
-struct ib_sa_mcmember_rec {
-	union ib_gid mgid;
-	union ib_gid port_gid;
-	__be32       qkey;
-	__be16       mlid;
-	u8           mtu_selector;
-	u8           mtu;
-	u8           traffic_class;
-	__be16       pkey;
-	u8 	     rate_selector;
-	u8 	     rate;
-	u8 	     packet_life_time_selector;
-	u8 	     packet_life_time;
-	u8           sl;
-	__be32       flow_label;
-	u8           hop_limit;
-	u8           scope;
-	u8           join_state;
-	int          proxy_join;
-};
-
-/* Service Record Component Mask Sec 15.2.5.14 Ver 1.1	*/
-#define IB_SA_SERVICE_REC_SERVICE_ID			IB_SA_COMP_MASK( 0)
-#define IB_SA_SERVICE_REC_SERVICE_GID			IB_SA_COMP_MASK( 1)
-#define IB_SA_SERVICE_REC_SERVICE_PKEY			IB_SA_COMP_MASK( 2)
-/* reserved:								 3 */
-#define IB_SA_SERVICE_REC_SERVICE_LEASE			IB_SA_COMP_MASK( 4)
-#define IB_SA_SERVICE_REC_SERVICE_KEY			IB_SA_COMP_MASK( 5)
-#define IB_SA_SERVICE_REC_SERVICE_NAME			IB_SA_COMP_MASK( 6)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_0		IB_SA_COMP_MASK( 7)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_1		IB_SA_COMP_MASK( 8)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_2		IB_SA_COMP_MASK( 9)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_3		IB_SA_COMP_MASK(10)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_4		IB_SA_COMP_MASK(11)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_5		IB_SA_COMP_MASK(12)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_6		IB_SA_COMP_MASK(13)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_7		IB_SA_COMP_MASK(14)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_8		IB_SA_COMP_MASK(15)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_9		IB_SA_COMP_MASK(16)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_10		IB_SA_COMP_MASK(17)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_11		IB_SA_COMP_MASK(18)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_12		IB_SA_COMP_MASK(19)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_13		IB_SA_COMP_MASK(20)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_14		IB_SA_COMP_MASK(21)
-#define IB_SA_SERVICE_REC_SERVICE_DATA8_15		IB_SA_COMP_MASK(22)
-#define IB_SA_SERVICE_REC_SERVICE_DATA16_0		IB_SA_COMP_MASK(23)
-#define IB_SA_SERVICE_REC_SERVICE_DATA16_1		IB_SA_COMP_MASK(24)
-#define IB_SA_SERVICE_REC_SERVICE_DATA16_2		IB_SA_COMP_MASK(25)
-#define IB_SA_SERVICE_REC_SERVICE_DATA16_3		IB_SA_COMP_MASK(26)
-#define IB_SA_SERVICE_REC_SERVICE_DATA16_4		IB_SA_COMP_MASK(27)
-#define IB_SA_SERVICE_REC_SERVICE_DATA16_5		IB_SA_COMP_MASK(28)
-#define IB_SA_SERVICE_REC_SERVICE_DATA16_6		IB_SA_COMP_MASK(29)
-#define IB_SA_SERVICE_REC_SERVICE_DATA16_7		IB_SA_COMP_MASK(30)
-#define IB_SA_SERVICE_REC_SERVICE_DATA32_0		IB_SA_COMP_MASK(31)
-#define IB_SA_SERVICE_REC_SERVICE_DATA32_1		IB_SA_COMP_MASK(32)
-#define IB_SA_SERVICE_REC_SERVICE_DATA32_2		IB_SA_COMP_MASK(33)
-#define IB_SA_SERVICE_REC_SERVICE_DATA32_3		IB_SA_COMP_MASK(34)
-#define IB_SA_SERVICE_REC_SERVICE_DATA64_0		IB_SA_COMP_MASK(35)
-#define IB_SA_SERVICE_REC_SERVICE_DATA64_1		IB_SA_COMP_MASK(36)
-
-#define IB_DEFAULT_SERVICE_LEASE 	0xFFFFFFFF
-
-struct ib_sa_service_rec {
-	u64		id;
-	union ib_gid	gid;
-	__be16 		pkey;
-	/* reserved */
-	u32		lease;
-	u8		key[16];
-	u8		name[64];
-	u8		data8[16];
-	u16		data16[8];
-	u32		data32[4];
-	u64		data64[2];
-};
-
-struct ib_sa_client {
-	volatile int users;
-#ifdef notyet
-	struct completion comp;
-#endif	
-};
-
-/**
- * ib_sa_register_client - Register an SA client.
- */
-void ib_sa_register_client(struct ib_sa_client *client);
-
-/**
- * ib_sa_unregister_client - Deregister an SA client.
- * @client: Client object to deregister.
- */
-void ib_sa_unregister_client(struct ib_sa_client *client);
-
-struct ib_sa_query;
-
-void ib_sa_cancel_query(int id, struct ib_sa_query *query);
-
-int ib_sa_path_rec_get(struct ib_sa_client *client,
-		       struct ib_device *device, u8 port_num,
-		       struct ib_sa_path_rec *rec,
-		       ib_sa_comp_mask comp_mask,
-		       int timeout_ms, int gfp_mask,
-		       void (*callback)(int status,
-					struct ib_sa_path_rec *resp,
-					void *context),
-		       void *context,
-		       struct ib_sa_query **query);
-
-int ib_sa_service_rec_query(struct ib_sa_client *client,
-			 struct ib_device *device, u8 port_num,
-			 u8 method,
-			 struct ib_sa_service_rec *rec,
-			 ib_sa_comp_mask comp_mask,
-			 int timeout_ms, int gfp_mask,
-			 void (*callback)(int status,
-					  struct ib_sa_service_rec *resp,
-					  void *context),
-			 void *context,
-			 struct ib_sa_query **sa_query);
-
-struct ib_sa_multicast {
-	struct ib_sa_mcmember_rec rec;
-	ib_sa_comp_mask		comp_mask;
-	int			(*callback)(int status,
-					    struct ib_sa_multicast *multicast);
-	void			*context;
-};
-
-/**
- * ib_sa_join_multicast - Initiates a join request to the specified multicast
- *   group.
- * @client: SA client
- * @device: Device associated with the multicast group.
- * @port_num: Port on the specified device to associate with the multicast
- *   group.
- * @rec: SA multicast member record specifying group attributes.
- * @comp_mask: Component mask indicating which group attributes of %rec are
- *   valid.
- * @gfp_mask: GFP mask for memory allocations.
- * @callback: User callback invoked once the join operation completes.
- * @context: User specified context stored with the ib_sa_multicast structure.
- *
- * This call initiates a multicast join request with the SA for the specified
- * multicast group.  If the join operation is started successfully, it returns
- * an ib_sa_multicast structure that is used to track the multicast operation.
- * Users must free this structure by calling ib_free_multicast, even if the
- * join operation later fails.  (The callback status is non-zero.)
- *
- * If the join operation fails; status will be non-zero, with the following
- * failures possible:
- * ETIMEDOUT: The request timed out.
- * EIO: An error occurred sending the query.
- * EINVAL: The MCMemberRecord values differed from the existing group's.
- * ENETRESET: Indicates that an fatal error has occurred on the multicast
- *   group, and the user must rejoin the group to continue using it.
- */
-struct ib_sa_multicast *ib_sa_join_multicast(struct ib_sa_client *client,
-					     struct ib_device *device, u8 port_num,
-					     struct ib_sa_mcmember_rec *rec,
-					     ib_sa_comp_mask comp_mask, int gfp_mask,
-					     int (*callback)(int status,
-							     struct ib_sa_multicast
-								    *multicast),
-					     void *context);
-
-/**
- * ib_free_multicast - Frees the multicast tracking structure, and releases
- *    any reference on the multicast group.
- * @multicast: Multicast tracking structure allocated by ib_join_multicast.
- *
- * This call blocks until the multicast identifier is destroyed.  It may
- * not be called from within the multicast callback; however, returning a non-
- * zero value from the callback will result in destroying the multicast
- * tracking structure.
- */
-void ib_sa_free_multicast(struct ib_sa_multicast *multicast);
-
-/**
- * ib_get_mcmember_rec - Looks up a multicast member record by its MGID and
- *   returns it if found.
- * @device: Device associated with the multicast group.
- * @port_num: Port on the specified device to associate with the multicast
- *   group.
- * @mgid: MGID of multicast group.
- * @rec: Location to copy SA multicast member record.
- */
-int ib_sa_get_mcmember_rec(struct ib_device *device, u8 port_num,
-			   union ib_gid *mgid, struct ib_sa_mcmember_rec *rec);
-
-/**
- * ib_init_ah_from_mcmember - Initialize address handle attributes based on
- * an SA multicast member record.
- */
-int ib_init_ah_from_mcmember(struct ib_device *device, u8 port_num,
-			     struct ib_sa_mcmember_rec *rec,
-			     struct ib_ah_attr *ah_attr);
-
-/**
- * ib_init_ah_from_path - Initialize address handle attributes based on an SA
- *   path record.
- */
-int ib_init_ah_from_path(struct ib_device *device, u8 port_num,
-			 struct ib_sa_path_rec *rec,
-			 struct ib_ah_attr *ah_attr);
-
-#endif /* IB_SA_H */
diff --git a/sys/contrib/rdma/ib_smi.h b/sys/contrib/rdma/ib_smi.h
deleted file mode 100644
index 0e4b1e940d8..00000000000
--- a/sys/contrib/rdma/ib_smi.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2004 Mellanox Technologies Ltd.  All rights reserved.
- * Copyright (c) 2004 Infinicon Corporation.  All rights reserved.
- * Copyright (c) 2004 Intel Corporation.  All rights reserved.
- * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
- * Copyright (c) 2004 Voltaire Corporation.  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.
- *
- * $Id: ib_smi.h 1389 2004-12-27 22:56:47Z roland $
- *
- * $FreeBSD$
- */
-
-#if !defined( IB_SMI_H )
-#define IB_SMI_H
-
-#include <rdma/ib_mad.h>
-
-#define IB_SMP_DATA_SIZE			64
-#define IB_SMP_MAX_PATH_HOPS			64
-
-struct ib_smp {
-	u8	base_version;
-	u8	mgmt_class;
-	u8	class_version;
-	u8	method;
-	__be16	status;
-	u8	hop_ptr;
-	u8	hop_cnt;
-	__be64	tid;
-	__be16	attr_id;
-	__be16	resv;
-	__be32	attr_mod;
-	__be64	mkey;
-	__be16	dr_slid;
-	__be16	dr_dlid;
-	u8	reserved[28];
-	u8	data[IB_SMP_DATA_SIZE];
-	u8	initial_path[IB_SMP_MAX_PATH_HOPS];
-	u8	return_path[IB_SMP_MAX_PATH_HOPS];
-} __attribute__ ((packed));
-
-#define IB_SMP_DIRECTION			__constant_htons(0x8000)
-
-/* Subnet management attributes */
-#define IB_SMP_ATTR_NOTICE			__constant_htons(0x0002)
-#define IB_SMP_ATTR_NODE_DESC			__constant_htons(0x0010)
-#define IB_SMP_ATTR_NODE_INFO			__constant_htons(0x0011)
-#define IB_SMP_ATTR_SWITCH_INFO			__constant_htons(0x0012)
-#define IB_SMP_ATTR_GUID_INFO			__constant_htons(0x0014)
-#define IB_SMP_ATTR_PORT_INFO			__constant_htons(0x0015)
-#define IB_SMP_ATTR_PKEY_TABLE			__constant_htons(0x0016)
-#define IB_SMP_ATTR_SL_TO_VL_TABLE		__constant_htons(0x0017)
-#define IB_SMP_ATTR_VL_ARB_TABLE		__constant_htons(0x0018)
-#define IB_SMP_ATTR_LINEAR_FORWARD_TABLE	__constant_htons(0x0019)
-#define IB_SMP_ATTR_RANDOM_FORWARD_TABLE	__constant_htons(0x001A)
-#define IB_SMP_ATTR_MCAST_FORWARD_TABLE		__constant_htons(0x001B)
-#define IB_SMP_ATTR_SM_INFO			__constant_htons(0x0020)
-#define IB_SMP_ATTR_VENDOR_DIAG			__constant_htons(0x0030)
-#define IB_SMP_ATTR_LED_INFO			__constant_htons(0x0031)
-#define IB_SMP_ATTR_VENDOR_MASK			__constant_htons(0xFF00)
-
-struct ib_port_info {
-	__be64 mkey;
-	__be64 gid_prefix;
-	__be16 lid;
-	__be16 sm_lid;
-	__be32 cap_mask;
-	__be16 diag_code;
-	__be16 mkey_lease_period;
-	u8 local_port_num;
-	u8 link_width_enabled;
-	u8 link_width_supported;
-	u8 link_width_active;
-	u8 linkspeed_portstate;			/* 4 bits, 4 bits */
-	u8 portphysstate_linkdown;		/* 4 bits, 4 bits */
-	u8 mkeyprot_resv_lmc;			/* 2 bits, 3, 3 */
-	u8 linkspeedactive_enabled;		/* 4 bits, 4 bits */
-	u8 neighbormtu_mastersmsl;		/* 4 bits, 4 bits */
-	u8 vlcap_inittype;			/* 4 bits, 4 bits */
-	u8 vl_high_limit;
-	u8 vl_arb_high_cap;
-	u8 vl_arb_low_cap;
-	u8 inittypereply_mtucap;		/* 4 bits, 4 bits */
-	u8 vlstallcnt_hoqlife;			/* 3 bits, 5 bits */
-	u8 operationalvl_pei_peo_fpi_fpo;	/* 4 bits, 1, 1, 1, 1 */
-	__be16 mkey_violations;
-	__be16 pkey_violations;
-	__be16 qkey_violations;
-	u8 guid_cap;
-	u8 clientrereg_resv_subnetto;		/* 1 bit, 2 bits, 5 */
-	u8 resv_resptimevalue;			/* 3 bits, 5 bits */
-	u8 localphyerrors_overrunerrors;	/* 4 bits, 4 bits */
-	__be16 max_credit_hint;
-	u8 resv;
-	u8 link_roundtrip_latency[3];
-};
-
-static inline u8
-ib_get_smp_direction(struct ib_smp *smp)
-{
-	return ((smp->status & IB_SMP_DIRECTION) == IB_SMP_DIRECTION);
-}
-
-#endif /* IB_SMI_H */
diff --git a/sys/contrib/rdma/ib_umem.h b/sys/contrib/rdma/ib_umem.h
deleted file mode 100644
index 9e1abbbe294..00000000000
--- a/sys/contrib/rdma/ib_umem.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2007 Cisco Systems.  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 IB_UMEM_H
-#define IB_UMEM_H
-
-#include <linux/list.h>
-#include <linux/scatterlist.h>
-#include <linux/workqueue.h>
-#include <linux/dma-attrs.h>
-
-struct ib_ucontext;
-
-struct ib_umem {
-	struct ib_ucontext     *context;
-	size_t			length;
-	int			offset;
-	int			page_size;
-	int                     writable;
-	int                     hugetlb;
-	struct list_head	chunk_list;
-	struct work_struct	work;
-	struct mm_struct       *mm;
-	unsigned long		diff;
-};
-
-/* contiguous memory structure */
-struct ib_cmem {
-
-	struct ib_ucontext     *context;
-	size_t			length;
-	/* Link list of contiguous blocks being part of that cmem  */
-	struct list_head ib_cmem_block;
-
-	/* Order of cmem block,  2^ block_order will equal number
-	     of physical pages per block
-	*/
-	unsigned long    block_order;
-	/* Refernce counter for that memory area
-	  - When value became 0 pages will be returned to the kernel.
-	*/
-	struct kref refcount;
-};
-
-
-struct ib_cmem_block {
-
-	struct list_head	list;
-	/* page will point to the page struct of the head page
-	    in the current compound page.
-	    block order is saved once as part of ib_cmem.
-	*/
-	struct page            *page;
-};
-
-
-
-struct ib_umem_chunk {
-	struct list_head	list;
-	int                     nents;
-	int                     nmap;
-	struct dma_attrs	attrs;
-	struct scatterlist      page_list[0];
-};
-
-#ifdef CONFIG_INFINIBAND_USER_MEM
-
-struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
-			    size_t size, int access, int dmasync);
-void ib_umem_release(struct ib_umem *umem);
-int ib_umem_page_count(struct ib_umem *umem);
-
-int ib_cmem_map_contiguous_pages_to_vma(struct ib_cmem *ib_cmem,
-	struct vm_area_struct *vma);
-struct ib_cmem *ib_cmem_alloc_contiguous_pages(struct ib_ucontext *context,
-				unsigned long total_size,
-				unsigned long page_size_order);
-void ib_cmem_release_contiguous_pages(struct ib_cmem *cmem);
-int ib_umem_map_to_vma(struct ib_umem *umem,
-				struct vm_area_struct *vma);
-
-#else /* CONFIG_INFINIBAND_USER_MEM */
-
-#include <linux/err.h>
-
-static inline struct ib_umem *ib_umem_get(struct ib_ucontext *context,
-					  unsigned long addr, size_t size,
-					  int access, int dmasync) {
-	return ERR_PTR(-EINVAL);
-}
-static inline void ib_umem_release(struct ib_umem *umem) { }
-static inline int ib_umem_page_count(struct ib_umem *umem) { return 0; }
-
-#endif /* CONFIG_INFINIBAND_USER_MEM */
-
-#endif /* IB_UMEM_H */
diff --git a/sys/contrib/rdma/ib_user_cm.h b/sys/contrib/rdma/ib_user_cm.h
deleted file mode 100644
index e8815d51cf5..00000000000
--- a/sys/contrib/rdma/ib_user_cm.h
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * Copyright (c) 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Intel Corporation.  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.
- *
- * $Id: ib_user_cm.h 4019 2005-11-11 00:33:09Z sean.hefty $
- *
- * $FreeBSD$
- */
-
-#ifndef IB_USER_CM_H
-#define IB_USER_CM_H
-
-#include <rdma/ib_user_sa.h>
-
-#define IB_USER_CM_ABI_VERSION 5
-
-enum {
-	IB_USER_CM_CMD_CREATE_ID,
-	IB_USER_CM_CMD_DESTROY_ID,
-	IB_USER_CM_CMD_ATTR_ID,
-
-	IB_USER_CM_CMD_LISTEN,
-	IB_USER_CM_CMD_NOTIFY,
-
-	IB_USER_CM_CMD_SEND_REQ,
-	IB_USER_CM_CMD_SEND_REP,
-	IB_USER_CM_CMD_SEND_RTU,
-	IB_USER_CM_CMD_SEND_DREQ,
-	IB_USER_CM_CMD_SEND_DREP,
-	IB_USER_CM_CMD_SEND_REJ,
-	IB_USER_CM_CMD_SEND_MRA,
-	IB_USER_CM_CMD_SEND_LAP,
-	IB_USER_CM_CMD_SEND_APR,
-	IB_USER_CM_CMD_SEND_SIDR_REQ,
-	IB_USER_CM_CMD_SEND_SIDR_REP,
-
-	IB_USER_CM_CMD_EVENT,
-	IB_USER_CM_CMD_INIT_QP_ATTR,
-};
-/*
- * command ABI structures.
- */
-struct ib_ucm_cmd_hdr {
-	__u32 cmd;
-	__u16 in;
-	__u16 out;
-};
-
-struct ib_ucm_create_id {
-	__u64 uid;
-	__u64 response;
-};
-
-struct ib_ucm_create_id_resp {
-	__u32 id;
-};
-
-struct ib_ucm_destroy_id {
-	__u64 response;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct ib_ucm_destroy_id_resp {
-	__u32 events_reported;
-};
-
-struct ib_ucm_attr_id {
-	__u64 response;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct ib_ucm_attr_id_resp {
-	__be64 service_id;
-	__be64 service_mask;
-	__be32 local_id;
-	__be32 remote_id;
-};
-
-struct ib_ucm_init_qp_attr {
-	__u64 response;
-	__u32 id;
-	__u32 qp_state;
-};
-
-struct ib_ucm_listen {
-	__be64 service_id;
-	__be64 service_mask;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct ib_ucm_notify {
-	__u32 id;
-	__u32 event;
-};
-
-struct ib_ucm_private_data {
-	__u64 data;
-	__u32 id;
-	__u8  len;
-	__u8  reserved[3];
-};
-
-struct ib_ucm_req {
-	__u32 id;
-	__u32 qpn;
-	__u32 qp_type;
-	__u32 psn;
-	__be64 sid;
-	__u64 data;
-	__u64 primary_path;
-	__u64 alternate_path;
-	__u8  len;
-	__u8  peer_to_peer;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  remote_cm_response_timeout;
-	__u8  flow_control;
-	__u8  local_cm_response_timeout;
-	__u8  retry_count;
-	__u8  rnr_retry_count;
-	__u8  max_cm_retries;
-	__u8  srq;
-	__u8  reserved[5];
-};
-
-struct ib_ucm_rep {
-	__u64 uid;
-	__u64 data;
-	__u32 id;
-	__u32 qpn;
-	__u32 psn;
-	__u8  len;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  target_ack_delay;
-	__u8  failover_accepted;
-	__u8  flow_control;
-	__u8  rnr_retry_count;
-	__u8  srq;
-	__u8  reserved[4];
-};
-
-struct ib_ucm_info {
-	__u32 id;
-	__u32 status;
-	__u64 info;
-	__u64 data;
-	__u8  info_len;
-	__u8  data_len;
-	__u8  reserved[6];
-};
-
-struct ib_ucm_mra {
-	__u64 data;
-	__u32 id;
-	__u8  len;
-	__u8  timeout;
-	__u8  reserved[2];
-};
-
-struct ib_ucm_lap {
-	__u64 path;
-	__u64 data;
-	__u32 id;
-	__u8  len;
-	__u8  reserved[3];
-};
-
-struct ib_ucm_sidr_req {
-	__u32 id;
-	__u32 timeout;
-	__be64 sid;
-	__u64 data;
-	__u64 path;
-	__u16 reserved_pkey;
-	__u8  len;
-	__u8  max_cm_retries;
-	__u8  reserved[4];
-};
-
-struct ib_ucm_sidr_rep {
-	__u32 id;
-	__u32 qpn;
-	__u32 qkey;
-	__u32 status;
-	__u64 info;
-	__u64 data;
-	__u8  info_len;
-	__u8  data_len;
-	__u8  reserved[6];
-};
-/*
- * event notification ABI structures.
- */
-struct ib_ucm_event_get {
-	__u64 response;
-	__u64 data;
-	__u64 info;
-	__u8  data_len;
-	__u8  info_len;
-	__u8  reserved[6];
-};
-
-struct ib_ucm_req_event_resp {
-	struct ib_user_path_rec primary_path;
-	struct ib_user_path_rec alternate_path;
-	__be64                 remote_ca_guid;
-	__u32                  remote_qkey;
-	__u32                  remote_qpn;
-	__u32                  qp_type;
-	__u32                  starting_psn;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  local_cm_response_timeout;
-	__u8  flow_control;
-	__u8  remote_cm_response_timeout;
-	__u8  retry_count;
-	__u8  rnr_retry_count;
-	__u8  srq;
-	__u8  port;
-	__u8  reserved[7];
-};
-
-struct ib_ucm_rep_event_resp {
-	__be64 remote_ca_guid;
-	__u32 remote_qkey;
-	__u32 remote_qpn;
-	__u32 starting_psn;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  target_ack_delay;
-	__u8  failover_accepted;
-	__u8  flow_control;
-	__u8  rnr_retry_count;
-	__u8  srq;
-	__u8  reserved[5];
-};
-
-struct ib_ucm_rej_event_resp {
-	__u32 reason;
-	/* ari in ib_ucm_event_get info field. */
-};
-
-struct ib_ucm_mra_event_resp {
-	__u8  timeout;
-	__u8  reserved[3];
-};
-
-struct ib_ucm_lap_event_resp {
-	struct ib_user_path_rec path;
-};
-
-struct ib_ucm_apr_event_resp {
-	__u32 status;
-	/* apr info in ib_ucm_event_get info field. */
-};
-
-struct ib_ucm_sidr_req_event_resp {
-	__u16 pkey;
-	__u8  port;
-	__u8  reserved;
-};
-
-struct ib_ucm_sidr_rep_event_resp {
-	__u32 status;
-	__u32 qkey;
-	__u32 qpn;
-	/* info in ib_ucm_event_get info field. */
-};
-
-#define IB_UCM_PRES_DATA      0x01
-#define IB_UCM_PRES_INFO      0x02
-#define IB_UCM_PRES_PRIMARY   0x04
-#define IB_UCM_PRES_ALTERNATE 0x08
-
-struct ib_ucm_event_resp {
-	__u64 uid;
-	__u32 id;
-	__u32 event;
-	__u32 present;
-	__u32 reserved;
-	union {
-		struct ib_ucm_req_event_resp req_resp;
-		struct ib_ucm_rep_event_resp rep_resp;
-		struct ib_ucm_rej_event_resp rej_resp;
-		struct ib_ucm_mra_event_resp mra_resp;
-		struct ib_ucm_lap_event_resp lap_resp;
-		struct ib_ucm_apr_event_resp apr_resp;
-
-		struct ib_ucm_sidr_req_event_resp sidr_req_resp;
-		struct ib_ucm_sidr_rep_event_resp sidr_rep_resp;
-
-		__u32                             send_status;
-	} u;
-};
-
-#endif /* IB_USER_CM_H */
diff --git a/sys/contrib/rdma/ib_user_mad.h b/sys/contrib/rdma/ib_user_mad.h
deleted file mode 100644
index ec1d50987c8..00000000000
--- a/sys/contrib/rdma/ib_user_mad.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2004 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Voltaire, Inc. 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.
- *
- * $Id: ib_user_mad.h 2814 2005-07-06 19:14:09Z halr $
- *
- * $FreeBSD$
- */
-
-#ifndef IB_USER_MAD_H
-#define IB_USER_MAD_H
-
-/*
- * Increment this value if any changes that break userspace ABI
- * compatibility are made.
- */
-#define IB_USER_MAD_ABI_VERSION	5
-
-/*
- * Make sure that all structs defined in this file remain laid out so
- * that they pack the same way on 32-bit and 64-bit architectures (to
- * avoid incompatibility between 32-bit userspace and 64-bit kernels).
- */
-
-/**
- * ib_user_mad_hdr - MAD packet header
- * @id - ID of agent MAD received with/to be sent with
- * @status - 0 on successful receive, ETIMEDOUT if no response
- *   received (transaction ID in data[] will be set to TID of original
- *   request) (ignored on send)
- * @timeout_ms - Milliseconds to wait for response (unset on receive)
- * @retries - Number of automatic retries to attempt
- * @qpn - Remote QP number received from/to be sent to
- * @qkey - Remote Q_Key to be sent with (unset on receive)
- * @lid - Remote lid received from/to be sent to
- * @sl - Service level received with/to be sent with
- * @path_bits - Local path bits received with/to be sent with
- * @grh_present - If set, GRH was received/should be sent
- * @gid_index - Local GID index to send with (unset on receive)
- * @hop_limit - Hop limit in GRH
- * @traffic_class - Traffic class in GRH
- * @gid - Remote GID in GRH
- * @flow_label - Flow label in GRH
- */
-struct ib_user_mad_hdr {
-	__u32	id;
-	__u32	status;
-	__u32	timeout_ms;
-	__u32	retries;
-	__u32	length;
-	__be32	qpn;
-	__be32  qkey;
-	__be16	lid;
-	__u8	sl;
-	__u8	path_bits;
-	__u8	grh_present;
-	__u8	gid_index;
-	__u8	hop_limit;
-	__u8	traffic_class;
-	__u8	gid[16];
-	__be32	flow_label;
-};
-
-/**
- * ib_user_mad - MAD packet
- * @hdr - MAD packet header
- * @data - Contents of MAD
- *
- */
-struct ib_user_mad {
-	struct ib_user_mad_hdr hdr;
-	__u64	data[0];
-};
-
-/**
- * ib_user_mad_reg_req - MAD registration request
- * @id - Set by the kernel; used to identify agent in future requests.
- * @qpn - Queue pair number; must be 0 or 1.
- * @method_mask - The caller will receive unsolicited MADs for any method
- *   where @method_mask = 1.
- * @mgmt_class - Indicates which management class of MADs should be receive
- *   by the caller.  This field is only required if the user wishes to
- *   receive unsolicited MADs, otherwise it should be 0.
- * @mgmt_class_version - Indicates which version of MADs for the given
- *   management class to receive.
- * @oui: Indicates IEEE OUI when mgmt_class is a vendor class
- *   in the range from 0x30 to 0x4f. Otherwise not used.
- * @rmpp_version: If set, indicates the RMPP version used.
- *
- */
-struct ib_user_mad_reg_req {
-	__u32	id;
-	__u32	method_mask[4];
-	__u8	qpn;
-	__u8	mgmt_class;
-	__u8	mgmt_class_version;
-	__u8    oui[3];
-	__u8	rmpp_version;
-};
-
-#define IB_IOCTL_MAGIC		0x1b
-
-#define IB_USER_MAD_REGISTER_AGENT	_IOWR(IB_IOCTL_MAGIC, 1, \
-					      struct ib_user_mad_reg_req)
-
-#define IB_USER_MAD_UNREGISTER_AGENT	_IOW(IB_IOCTL_MAGIC, 2, __u32)
-
-#endif /* IB_USER_MAD_H */
diff --git a/sys/contrib/rdma/ib_user_sa.h b/sys/contrib/rdma/ib_user_sa.h
deleted file mode 100644
index ddb76ed5c9c..00000000000
--- a/sys/contrib/rdma/ib_user_sa.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2005 Intel Corporation.  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.
- *
- * $FreeBSD$
- */
-
-#ifndef IB_USER_SA_H
-#define IB_USER_SA_H
-
-struct ib_user_path_rec {
-	__u8	dgid[16];
-	__u8	sgid[16];
-	__be16	dlid;
-	__be16	slid;
-	__u32	raw_traffic;
-	__be32	flow_label;
-	__u32	reversible;
-	__u32	mtu;
-	__be16	pkey;
-	__u8	hop_limit;
-	__u8	traffic_class;
-	__u8	numb_path;
-	__u8	sl;
-	__u8	mtu_selector;
-	__u8	rate_selector;
-	__u8	rate;
-	__u8	packet_life_time_selector;
-	__u8	packet_life_time;
-	__u8	preference;
-};
-
-#endif /* IB_USER_SA_H */
diff --git a/sys/contrib/rdma/ib_user_verbs.h b/sys/contrib/rdma/ib_user_verbs.h
deleted file mode 100644
index faa966c2092..00000000000
--- a/sys/contrib/rdma/ib_user_verbs.h
+++ /dev/null
@@ -1,688 +0,0 @@
-/*
- * Copyright (c) 2005 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005, 2006 Cisco Systems.  All rights reserved.
- * Copyright (c) 2005 PathScale, Inc.  All rights reserved.
- * Copyright (c) 2006 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
- * 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.
- *
- * $Id: ib_user_verbs.h 4019 2005-11-11 00:33:09Z sean.hefty $
- *
- * $FreeBSD$
- */
-
-#ifndef IB_USER_VERBS_H
-#define IB_USER_VERBS_H
-
-#include <contrib/rdma/types.h>
-
-
-/*
- * Increment this value if any changes that break userspace ABI
- * compatibility are made.
- */
-#define IB_USER_VERBS_ABI_VERSION	6
-
-enum {
-	IB_USER_VERBS_CMD_GET_CONTEXT,
-	IB_USER_VERBS_CMD_QUERY_DEVICE,
-	IB_USER_VERBS_CMD_QUERY_PORT,
-	IB_USER_VERBS_CMD_ALLOC_PD,
-	IB_USER_VERBS_CMD_DEALLOC_PD,
-	IB_USER_VERBS_CMD_CREATE_AH,
-	IB_USER_VERBS_CMD_MODIFY_AH,
-	IB_USER_VERBS_CMD_QUERY_AH,
-	IB_USER_VERBS_CMD_DESTROY_AH,
-	IB_USER_VERBS_CMD_REG_MR,
-	IB_USER_VERBS_CMD_REG_SMR,
-	IB_USER_VERBS_CMD_REREG_MR,
-	IB_USER_VERBS_CMD_QUERY_MR,
-	IB_USER_VERBS_CMD_DEREG_MR,
-	IB_USER_VERBS_CMD_ALLOC_MW,
-	IB_USER_VERBS_CMD_BIND_MW,
-	IB_USER_VERBS_CMD_DEALLOC_MW,
-	IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL,
-	IB_USER_VERBS_CMD_CREATE_CQ,
-	IB_USER_VERBS_CMD_RESIZE_CQ,
-	IB_USER_VERBS_CMD_DESTROY_CQ,
-	IB_USER_VERBS_CMD_POLL_CQ,
-	IB_USER_VERBS_CMD_PEEK_CQ,
-	IB_USER_VERBS_CMD_REQ_NOTIFY_CQ,
-	IB_USER_VERBS_CMD_CREATE_QP,
-	IB_USER_VERBS_CMD_QUERY_QP,
-	IB_USER_VERBS_CMD_MODIFY_QP,
-	IB_USER_VERBS_CMD_DESTROY_QP,
-	IB_USER_VERBS_CMD_POST_SEND,
-	IB_USER_VERBS_CMD_POST_RECV,
-	IB_USER_VERBS_CMD_ATTACH_MCAST,
-	IB_USER_VERBS_CMD_DETACH_MCAST,
-	IB_USER_VERBS_CMD_CREATE_SRQ,
-	IB_USER_VERBS_CMD_MODIFY_SRQ,
-	IB_USER_VERBS_CMD_QUERY_SRQ,
-	IB_USER_VERBS_CMD_DESTROY_SRQ,
-	IB_USER_VERBS_CMD_POST_SRQ_RECV
-};
-
-/*
- * Make sure that all structs defined in this file remain laid out so
- * that they pack the same way on 32-bit and 64-bit architectures (to
- * avoid incompatibility between 32-bit userspace and 64-bit kernels).
- * Specifically:
- *  - Do not use pointer types -- pass pointers in __u64 instead.
- *  - Make sure that any structure larger than 4 bytes is padded to a
- *    multiple of 8 bytes.  Otherwise the structure size will be
- *    different between 32-bit and 64-bit architectures.
- */
-
-struct ib_uverbs_async_event_desc {
-	__u64 element;
-	__u32 event_type;	/* enum ib_event_type */
-	__u32 reserved;
-};
-
-struct ib_uverbs_comp_event_desc {
-	__u64 cq_handle;
-};
-
-/*
- * All commands from userspace should start with a __u32 command field
- * followed by __u16 in_words and out_words fields (which give the
- * length of the command block and response buffer if any in 32-bit
- * words).  The kernel driver will read these fields first and read
- * the rest of the command struct based on these value.
- */
-
-struct ib_uverbs_cmd_hdr {
-	__u32 command;
-	__u16 in_words;
-	__u16 out_words;
-};
-
-struct ib_uverbs_get_context {
-	__u64 response;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_get_context_resp {
-	__u32 async_fd;
-	__u32 num_comp_vectors;
-};
-
-struct ib_uverbs_query_device {
-	__u64 response;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_device_resp {
-	__u64 fw_ver;
-	__be64 node_guid;
-	__be64 sys_image_guid;
-	__u64 max_mr_size;
-	__u64 page_size_cap;
-	__u32 vendor_id;
-	__u32 vendor_part_id;
-	__u32 hw_ver;
-	__u32 max_qp;
-	__u32 max_qp_wr;
-	__u32 device_cap_flags;
-	__u32 max_sge;
-	__u32 max_sge_rd;
-	__u32 max_cq;
-	__u32 max_cqe;
-	__u32 max_mr;
-	__u32 max_pd;
-	__u32 max_qp_rd_atom;
-	__u32 max_ee_rd_atom;
-	__u32 max_res_rd_atom;
-	__u32 max_qp_init_rd_atom;
-	__u32 max_ee_init_rd_atom;
-	__u32 atomic_cap;
-	__u32 max_ee;
-	__u32 max_rdd;
-	__u32 max_mw;
-	__u32 max_raw_ipv6_qp;
-	__u32 max_raw_ethy_qp;
-	__u32 max_mcast_grp;
-	__u32 max_mcast_qp_attach;
-	__u32 max_total_mcast_qp_attach;
-	__u32 max_ah;
-	__u32 max_fmr;
-	__u32 max_map_per_fmr;
-	__u32 max_srq;
-	__u32 max_srq_wr;
-	__u32 max_srq_sge;
-	__u16 max_pkeys;
-	__u8  local_ca_ack_delay;
-	__u8  phys_port_cnt;
-	__u8  reserved[4];
-};
-
-struct ib_uverbs_query_port {
-	__u64 response;
-	__u8  port_num;
-	__u8  reserved[7];
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_port_resp {
-	__u32 port_cap_flags;
-	__u32 max_msg_sz;
-	__u32 bad_pkey_cntr;
-	__u32 qkey_viol_cntr;
-	__u32 gid_tbl_len;
-	__u16 pkey_tbl_len;
-	__u16 lid;
-	__u16 sm_lid;
-	__u8  state;
-	__u8  max_mtu;
-	__u8  active_mtu;
-	__u8  lmc;
-	__u8  max_vl_num;
-	__u8  sm_sl;
-	__u8  subnet_timeout;
-	__u8  init_type_reply;
-	__u8  active_width;
-	__u8  active_speed;
-	__u8  phys_state;
-	__u8  reserved[3];
-};
-
-struct ib_uverbs_alloc_pd {
-	__u64 response;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_alloc_pd_resp {
-	__u32 pd_handle;
-};
-
-struct ib_uverbs_dealloc_pd {
-	__u32 pd_handle;
-};
-
-struct ib_uverbs_reg_mr {
-	__u64 response;
-	__u64 start;
-	__u64 length;
-	__u64 hca_va;
-	__u32 pd_handle;
-	__u32 access_flags;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_reg_mr_resp {
-	__u32 mr_handle;
-	__u32 lkey;
-	__u32 rkey;
-};
-
-struct ib_uverbs_dereg_mr {
-	__u32 mr_handle;
-};
-
-struct ib_uverbs_create_comp_channel {
-	__u64 response;
-};
-
-struct ib_uverbs_create_comp_channel_resp {
-	__u32 fd;
-};
-
-struct ib_uverbs_create_cq {
-	__u64 response;
-	__u64 user_handle;
-	__u32 cqe;
-	__u32 comp_vector;
-	__s32 comp_channel;
-	__u32 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_create_cq_resp {
-	__u32 cq_handle;
-	__u32 cqe;
-};
-
-struct ib_uverbs_resize_cq {
-	__u64 response;
-	__u32 cq_handle;
-	__u32 cqe;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_resize_cq_resp {
-	__u32 cqe;
-	__u32 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_poll_cq {
-	__u64 response;
-	__u32 cq_handle;
-	__u32 ne;
-};
-
-struct ib_uverbs_wc {
-	__u64 wr_id;
-	__u32 status;
-	__u32 opcode;
-	__u32 vendor_err;
-	__u32 byte_len;
-	__u32 imm_data;
-	__u32 qp_num;
-	__u32 src_qp;
-	__u32 wc_flags;
-	__u16 pkey_index;
-	__u16 slid;
-	__u8 sl;
-	__u8 dlid_path_bits;
-	__u8 port_num;
-	__u8 reserved;
-};
-
-struct ib_uverbs_poll_cq_resp {
-	__u32 count;
-	__u32 reserved;
-	struct ib_uverbs_wc wc[0];
-};
-
-struct ib_uverbs_req_notify_cq {
-	__u32 cq_handle;
-	__u32 solicited_only;
-};
-
-struct ib_uverbs_destroy_cq {
-	__u64 response;
-	__u32 cq_handle;
-	__u32 reserved;
-};
-
-struct ib_uverbs_destroy_cq_resp {
-	__u32 comp_events_reported;
-	__u32 async_events_reported;
-};
-
-struct ib_uverbs_global_route {
-	__u8  dgid[16];
-	__u32 flow_label;
-	__u8  sgid_index;
-	__u8  hop_limit;
-	__u8  traffic_class;
-	__u8  reserved;
-};
-
-struct ib_uverbs_ah_attr {
-	struct ib_uverbs_global_route grh;
-	__u16 dlid;
-	__u8  sl;
-	__u8  src_path_bits;
-	__u8  static_rate;
-	__u8  is_global;
-	__u8  port_num;
-	__u8  reserved;
-};
-
-struct ib_uverbs_qp_attr {
-	__u32	qp_attr_mask;
-	__u32	qp_state;
-	__u32	cur_qp_state;
-	__u32	path_mtu;
-	__u32	path_mig_state;
-	__u32	qkey;
-	__u32	rq_psn;
-	__u32	sq_psn;
-	__u32	dest_qp_num;
-	__u32	qp_access_flags;
-
-	struct ib_uverbs_ah_attr ah_attr;
-	struct ib_uverbs_ah_attr alt_ah_attr;
-
-	/* ib_qp_cap */
-	__u32	max_send_wr;
-	__u32	max_recv_wr;
-	__u32	max_send_sge;
-	__u32	max_recv_sge;
-	__u32	max_inline_data;
-
-	__u16	pkey_index;
-	__u16	alt_pkey_index;
-	__u8	en_sqd_async_notify;
-	__u8	sq_draining;
-	__u8	max_rd_atomic;
-	__u8	max_dest_rd_atomic;
-	__u8	min_rnr_timer;
-	__u8	port_num;
-	__u8	timeout;
-	__u8	retry_cnt;
-	__u8	rnr_retry;
-	__u8	alt_port_num;
-	__u8	alt_timeout;
-	__u8	reserved[5];
-};
-
-struct ib_uverbs_create_qp {
-	__u64 response;
-	__u64 user_handle;
-	__u32 pd_handle;
-	__u32 send_cq_handle;
-	__u32 recv_cq_handle;
-	__u32 srq_handle;
-	__u32 max_send_wr;
-	__u32 max_recv_wr;
-	__u32 max_send_sge;
-	__u32 max_recv_sge;
-	__u32 max_inline_data;
-	__u8  sq_sig_all;
-	__u8  qp_type;
-	__u8  is_srq;
-	__u8  reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_create_qp_resp {
-	__u32 qp_handle;
-	__u32 qpn;
-	__u32 max_send_wr;
-	__u32 max_recv_wr;
-	__u32 max_send_sge;
-	__u32 max_recv_sge;
-	__u32 max_inline_data;
-	__u32 reserved;
-};
-
-/*
- * This struct needs to remain a multiple of 8 bytes to keep the
- * alignment of the modify QP parameters.
- */
-struct ib_uverbs_qp_dest {
-	__u8  dgid[16];
-	__u32 flow_label;
-	__u16 dlid;
-	__u16 reserved;
-	__u8  sgid_index;
-	__u8  hop_limit;
-	__u8  traffic_class;
-	__u8  sl;
-	__u8  src_path_bits;
-	__u8  static_rate;
-	__u8  is_global;
-	__u8  port_num;
-};
-
-struct ib_uverbs_query_qp {
-	__u64 response;
-	__u32 qp_handle;
-	__u32 attr_mask;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_qp_resp {
-	struct ib_uverbs_qp_dest dest;
-	struct ib_uverbs_qp_dest alt_dest;
-	__u32 max_send_wr;
-	__u32 max_recv_wr;
-	__u32 max_send_sge;
-	__u32 max_recv_sge;
-	__u32 max_inline_data;
-	__u32 qkey;
-	__u32 rq_psn;
-	__u32 sq_psn;
-	__u32 dest_qp_num;
-	__u32 qp_access_flags;
-	__u16 pkey_index;
-	__u16 alt_pkey_index;
-	__u8  qp_state;
-	__u8  cur_qp_state;
-	__u8  path_mtu;
-	__u8  path_mig_state;
-	__u8  sq_draining;
-	__u8  max_rd_atomic;
-	__u8  max_dest_rd_atomic;
-	__u8  min_rnr_timer;
-	__u8  port_num;
-	__u8  timeout;
-	__u8  retry_cnt;
-	__u8  rnr_retry;
-	__u8  alt_port_num;
-	__u8  alt_timeout;
-	__u8  sq_sig_all;
-	__u8  reserved[5];
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_modify_qp {
-	struct ib_uverbs_qp_dest dest;
-	struct ib_uverbs_qp_dest alt_dest;
-	__u32 qp_handle;
-	__u32 attr_mask;
-	__u32 qkey;
-	__u32 rq_psn;
-	__u32 sq_psn;
-	__u32 dest_qp_num;
-	__u32 qp_access_flags;
-	__u16 pkey_index;
-	__u16 alt_pkey_index;
-	__u8  qp_state;
-	__u8  cur_qp_state;
-	__u8  path_mtu;
-	__u8  path_mig_state;
-	__u8  en_sqd_async_notify;
-	__u8  max_rd_atomic;
-	__u8  max_dest_rd_atomic;
-	__u8  min_rnr_timer;
-	__u8  port_num;
-	__u8  timeout;
-	__u8  retry_cnt;
-	__u8  rnr_retry;
-	__u8  alt_port_num;
-	__u8  alt_timeout;
-	__u8  reserved[2];
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_modify_qp_resp {
-};
-
-struct ib_uverbs_destroy_qp {
-	__u64 response;
-	__u32 qp_handle;
-	__u32 reserved;
-};
-
-struct ib_uverbs_destroy_qp_resp {
-	__u32 events_reported;
-};
-
-/*
- * The ib_uverbs_sge structure isn't used anywhere, since we assume
- * the ib_sge structure is packed the same way on 32-bit and 64-bit
- * architectures in both kernel and user space.  It's just here to
- * document the ABI.
- */
-struct ib_uverbs_sge {
-	__u64 addr;
-	__u32 length;
-	__u32 lkey;
-};
-
-struct ib_uverbs_send_wr {
-	__u64 wr_id;
-	__u32 num_sge;
-	__u32 opcode;
-	__u32 send_flags;
-	__u32 imm_data;
-	union {
-		struct {
-			__u64 remote_addr;
-			__u32 rkey;
-			__u32 reserved;
-		} rdma;
-		struct {
-			__u64 remote_addr;
-			__u64 compare_add;
-			__u64 swap;
-			__u32 rkey;
-			__u32 reserved;
-		} atomic;
-		struct {
-			__u32 ah;
-			__u32 remote_qpn;
-			__u32 remote_qkey;
-			__u32 reserved;
-		} ud;
-	} wr;
-};
-
-struct ib_uverbs_post_send {
-	__u64 response;
-	__u32 qp_handle;
-	__u32 wr_count;
-	__u32 sge_count;
-	__u32 wqe_size;
-	struct ib_uverbs_send_wr send_wr[0];
-};
-
-struct ib_uverbs_post_send_resp {
-	__u32 bad_wr;
-};
-
-struct ib_uverbs_recv_wr {
-	__u64 wr_id;
-	__u32 num_sge;
-	__u32 reserved;
-};
-
-struct ib_uverbs_post_recv {
-	__u64 response;
-	__u32 qp_handle;
-	__u32 wr_count;
-	__u32 sge_count;
-	__u32 wqe_size;
-	struct ib_uverbs_recv_wr recv_wr[0];
-};
-
-struct ib_uverbs_post_recv_resp {
-	__u32 bad_wr;
-};
-
-struct ib_uverbs_post_srq_recv {
-	__u64 response;
-	__u32 srq_handle;
-	__u32 wr_count;
-	__u32 sge_count;
-	__u32 wqe_size;
-	struct ib_uverbs_recv_wr recv[0];
-};
-
-struct ib_uverbs_post_srq_recv_resp {
-	__u32 bad_wr;
-};
-
-struct ib_uverbs_create_ah {
-	__u64 response;
-	__u64 user_handle;
-	__u32 pd_handle;
-	__u32 reserved;
-	struct ib_uverbs_ah_attr attr;
-};
-
-struct ib_uverbs_create_ah_resp {
-	__u32 ah_handle;
-};
-
-struct ib_uverbs_destroy_ah {
-	__u32 ah_handle;
-};
-
-struct ib_uverbs_attach_mcast {
-	__u8  gid[16];
-	__u32 qp_handle;
-	__u16 mlid;
-	__u16 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_detach_mcast {
-	__u8  gid[16];
-	__u32 qp_handle;
-	__u16 mlid;
-	__u16 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_create_srq {
-	__u64 response;
-	__u64 user_handle;
-	__u32 pd_handle;
-	__u32 max_wr;
-	__u32 max_sge;
-	__u32 srq_limit;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_create_srq_resp {
-	__u32 srq_handle;
-	__u32 max_wr;
-	__u32 max_sge;
-	__u32 reserved;
-};
-
-struct ib_uverbs_modify_srq {
-	__u32 srq_handle;
-	__u32 attr_mask;
-	__u32 max_wr;
-	__u32 srq_limit;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_srq {
-	__u64 response;
-	__u32 srq_handle;
-	__u32 reserved;
-	__u64 driver_data[0];
-};
-
-struct ib_uverbs_query_srq_resp {
-	__u32 max_wr;
-	__u32 max_sge;
-	__u32 srq_limit;
-	__u32 reserved;
-};
-
-struct ib_uverbs_destroy_srq {
-	__u64 response;
-	__u32 srq_handle;
-	__u32 reserved;
-};
-
-struct ib_uverbs_destroy_srq_resp {
-	__u32 events_reported;
-};
-
-#endif /* IB_USER_VERBS_H */
diff --git a/sys/contrib/rdma/ib_verbs.h b/sys/contrib/rdma/ib_verbs.h
deleted file mode 100644
index 5d98ef7e0e4..00000000000
--- a/sys/contrib/rdma/ib_verbs.h
+++ /dev/null
@@ -1,1854 +0,0 @@
-/*
- * Copyright (c) 2004 Mellanox Technologies Ltd.  All rights reserved.
- * Copyright (c) 2004 Infinicon Corporation.  All rights reserved.
- * Copyright (c) 2004 Intel Corporation.  All rights reserved.
- * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
- * Copyright (c) 2004 Voltaire Corporation.  All rights reserved.
- * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
- * Copyright (c) 2005, 2006, 2007 Cisco Systems.  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.
- *
- * $Id: ib_verbs.h 1349 2004-12-16 21:09:43Z roland $
- *
- * $FreeBSD$
- */
-
-
-#if !defined(IB_VERBS_H)
-#define IB_VERBS_H
-
-#include <contrib/rdma/types.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-
-struct rdma_scatterlist {
-	void *page;
-	unsigned int length;
-	unsigned int offset; 
-};
-struct vm_object;
-
-union ib_gid {
-	u8	raw[16];
-	struct {
-		__be64	subnet_prefix;
-		__be64	interface_id;
-	} global;
-};
-
-enum rdma_node_type {
-	/* IB values map to NodeInfo:NodeType. */
-	RDMA_NODE_IB_CA 	= 1,
-	RDMA_NODE_IB_SWITCH,
-	RDMA_NODE_IB_ROUTER,
-	RDMA_NODE_RNIC
-};
-
-enum rdma_transport_type {
-	RDMA_TRANSPORT_IB,
-	RDMA_TRANSPORT_IWARP
-};
-
-enum rdma_transport_type
-rdma_node_get_transport(enum rdma_node_type node_type);
-
-enum ib_device_cap_flags {
-	IB_DEVICE_RESIZE_MAX_WR		= 1,
-	IB_DEVICE_BAD_PKEY_CNTR		= (1<<1),
-	IB_DEVICE_BAD_QKEY_CNTR		= (1<<2),
-	IB_DEVICE_RAW_MULTI		= (1<<3),
-	IB_DEVICE_AUTO_PATH_MIG		= (1<<4),
-	IB_DEVICE_CHANGE_PHY_PORT	= (1<<5),
-	IB_DEVICE_UD_AV_PORT_ENFORCE	= (1<<6),
-	IB_DEVICE_CURR_QP_STATE_MOD	= (1<<7),
-	IB_DEVICE_SHUTDOWN_PORT		= (1<<8),
-	IB_DEVICE_INIT_TYPE		= (1<<9),
-	IB_DEVICE_PORT_ACTIVE_EVENT	= (1<<10),
-	IB_DEVICE_SYS_IMAGE_GUID	= (1<<11),
-	IB_DEVICE_RC_RNR_NAK_GEN	= (1<<12),
-	IB_DEVICE_SRQ_RESIZE		= (1<<13),
-	IB_DEVICE_N_NOTIFY_CQ		= (1<<14),
-	IB_DEVICE_ZERO_STAG		= (1<<15),
-	IB_DEVICE_SEND_W_INV		= (1<<16),
-	IB_DEVICE_MEM_WINDOW		= (1<<17)
-};
-
-enum ib_atomic_cap {
-	IB_ATOMIC_NONE,
-	IB_ATOMIC_HCA,
-	IB_ATOMIC_GLOB
-};
-
-struct ib_device_attr {
-	u64			fw_ver;
-	__be64			sys_image_guid;
-	u64			max_mr_size;
-	u64			page_size_cap;
-	u32			vendor_id;
-	u32			vendor_part_id;
-	u32			hw_ver;
-	int			max_qp;
-	int			max_qp_wr;
-	int			device_cap_flags;
-	int			max_sge;
-	int			max_sge_rd;
-	int			max_cq;
-	int			max_cqe;
-	int			max_mr;
-	int			max_pd;
-	int			max_qp_rd_atom;
-	int			max_ee_rd_atom;
-	int			max_res_rd_atom;
-	int			max_qp_init_rd_atom;
-	int			max_ee_init_rd_atom;
-	enum ib_atomic_cap	atomic_cap;
-	int			max_ee;
-	int			max_rdd;
-	int			max_mw;
-	int			max_raw_ipv6_qp;
-	int			max_raw_ethy_qp;
-	int			max_mcast_grp;
-	int			max_mcast_qp_attach;
-	int			max_total_mcast_qp_attach;
-	int			max_ah;
-	int			max_fmr;
-	int			max_map_per_fmr;
-	int			max_srq;
-	int			max_srq_wr;
-	int			max_srq_sge;
-	u16			max_pkeys;
-	u8			local_ca_ack_delay;
-};
-
-enum ib_mtu {
-	IB_MTU_256  = 1,
-	IB_MTU_512  = 2,
-	IB_MTU_1024 = 3,
-	IB_MTU_2048 = 4,
-	IB_MTU_4096 = 5
-};
-
-static inline int ib_mtu_enum_to_int(enum ib_mtu mtu)
-{
-	switch (mtu) {
-	case IB_MTU_256:  return  256;
-	case IB_MTU_512:  return  512;
-	case IB_MTU_1024: return 1024;
-	case IB_MTU_2048: return 2048;
-	case IB_MTU_4096: return 4096;
-	default: 	  return -1;
-	}
-}
-
-enum ib_port_state {
-	IB_PORT_NOP		= 0,
-	IB_PORT_DOWN		= 1,
-	IB_PORT_INIT		= 2,
-	IB_PORT_ARMED		= 3,
-	IB_PORT_ACTIVE		= 4,
-	IB_PORT_ACTIVE_DEFER	= 5
-};
-
-enum ib_port_cap_flags {
-	IB_PORT_SM				= 1 <<  1,
-	IB_PORT_NOTICE_SUP			= 1 <<  2,
-	IB_PORT_TRAP_SUP			= 1 <<  3,
-	IB_PORT_OPT_IPD_SUP                     = 1 <<  4,
-	IB_PORT_AUTO_MIGR_SUP			= 1 <<  5,
-	IB_PORT_SL_MAP_SUP			= 1 <<  6,
-	IB_PORT_MKEY_NVRAM			= 1 <<  7,
-	IB_PORT_PKEY_NVRAM			= 1 <<  8,
-	IB_PORT_LED_INFO_SUP			= 1 <<  9,
-	IB_PORT_SM_DISABLED			= 1 << 10,
-	IB_PORT_SYS_IMAGE_GUID_SUP		= 1 << 11,
-	IB_PORT_PKEY_SW_EXT_PORT_TRAP_SUP	= 1 << 12,
-	IB_PORT_CM_SUP				= 1 << 16,
-	IB_PORT_SNMP_TUNNEL_SUP			= 1 << 17,
-	IB_PORT_REINIT_SUP			= 1 << 18,
-	IB_PORT_DEVICE_MGMT_SUP			= 1 << 19,
-	IB_PORT_VENDOR_CLASS_SUP		= 1 << 20,
-	IB_PORT_DR_NOTICE_SUP			= 1 << 21,
-	IB_PORT_CAP_MASK_NOTICE_SUP		= 1 << 22,
-	IB_PORT_BOOT_MGMT_SUP			= 1 << 23,
-	IB_PORT_LINK_LATENCY_SUP		= 1 << 24,
-	IB_PORT_CLIENT_REG_SUP			= 1 << 25
-};
-
-enum ib_port_width {
-	IB_WIDTH_1X	= 1,
-	IB_WIDTH_4X	= 2,
-	IB_WIDTH_8X	= 4,
-	IB_WIDTH_12X	= 8
-};
-
-static inline int ib_width_enum_to_int(enum ib_port_width width)
-{
-	switch (width) {
-	case IB_WIDTH_1X:  return  1;
-	case IB_WIDTH_4X:  return  4;
-	case IB_WIDTH_8X:  return  8;
-	case IB_WIDTH_12X: return 12;
-	default: 	  return -1;
-	}
-}
-
-struct ib_port_attr {
-	enum ib_port_state	state;
-	enum ib_mtu		max_mtu;
-	enum ib_mtu		active_mtu;
-	int			gid_tbl_len;
-	u32			port_cap_flags;
-	u32			max_msg_sz;
-	u32			bad_pkey_cntr;
-	u32			qkey_viol_cntr;
-	u16			pkey_tbl_len;
-	u16			lid;
-	u16			sm_lid;
-	u8			lmc;
-	u8			max_vl_num;
-	u8			sm_sl;
-	u8			subnet_timeout;
-	u8			init_type_reply;
-	u8			active_width;
-	u8			active_speed;
-	u8                      phys_state;
-};
-
-enum ib_device_modify_flags {
-	IB_DEVICE_MODIFY_SYS_IMAGE_GUID	= 1 << 0,
-	IB_DEVICE_MODIFY_NODE_DESC	= 1 << 1
-};
-
-struct ib_device_modify {
-	u64	sys_image_guid;
-	char	node_desc[64];
-};
-
-enum ib_port_modify_flags {
-	IB_PORT_SHUTDOWN		= 1,
-	IB_PORT_INIT_TYPE		= (1<<2),
-	IB_PORT_RESET_QKEY_CNTR		= (1<<3)
-};
-
-struct ib_port_modify {
-	u32	set_port_cap_mask;
-	u32	clr_port_cap_mask;
-	u8	init_type;
-};
-
-enum ib_event_type {
-	IB_EVENT_CQ_ERR,
-	IB_EVENT_QP_FATAL,
-	IB_EVENT_QP_REQ_ERR,
-	IB_EVENT_QP_ACCESS_ERR,
-	IB_EVENT_COMM_EST,
-	IB_EVENT_SQ_DRAINED,
-	IB_EVENT_PATH_MIG,
-	IB_EVENT_PATH_MIG_ERR,
-	IB_EVENT_DEVICE_FATAL,
-	IB_EVENT_PORT_ACTIVE,
-	IB_EVENT_PORT_ERR,
-	IB_EVENT_LID_CHANGE,
-	IB_EVENT_PKEY_CHANGE,
-	IB_EVENT_SM_CHANGE,
-	IB_EVENT_SRQ_ERR,
-	IB_EVENT_SRQ_LIMIT_REACHED,
-	IB_EVENT_QP_LAST_WQE_REACHED,
-	IB_EVENT_CLIENT_REREGISTER
-};
-
-enum dma_data_direction {
-        DMA_BIDIRECTIONAL = 0,
-        DMA_TO_DEVICE = 1,
-        DMA_FROM_DEVICE = 2,
-        DMA_NONE = 3,
-};
-
-struct ib_event {
-	struct ib_device	*device;
-	union {
-		struct ib_cq	*cq;
-		struct ib_qp	*qp;
-		struct ib_srq	*srq;
-		u8		port_num;
-	} element;
-	enum ib_event_type	event;
-};
-
-struct ib_event_handler {
-	struct ib_device *device;
-	void            (*handler)(struct ib_event_handler *, struct ib_event *);
-	TAILQ_ENTRY(ib_event_handler) list;
-};
-
-#define INIT_IB_EVENT_HANDLER(_ptr, _device, _handler)		\
-	do {							\
-		(_ptr)->device  = _device;			\
-		(_ptr)->handler = _handler;			\
-	} while (0)
-
-struct ib_global_route {
-	union ib_gid	dgid;
-	u32		flow_label;
-	u8		sgid_index;
-	u8		hop_limit;
-	u8		traffic_class;
-};
-
-struct ib_grh {
-	__be32		version_tclass_flow;
-	__be16		paylen;
-	u8		next_hdr;
-	u8		hop_limit;
-	union ib_gid	sgid;
-	union ib_gid	dgid;
-};
-
-enum {
-	IB_MULTICAST_QPN = 0xffffff
-};
-
-#define IB_LID_PERMISSIVE	__constant_htons(0xFFFF)
-
-enum ib_ah_flags {
-	IB_AH_GRH	= 1
-};
-
-enum ib_rate {
-	IB_RATE_PORT_CURRENT = 0,
-	IB_RATE_2_5_GBPS = 2,
-	IB_RATE_5_GBPS   = 5,
-	IB_RATE_10_GBPS  = 3,
-	IB_RATE_20_GBPS  = 6,
-	IB_RATE_30_GBPS  = 4,
-	IB_RATE_40_GBPS  = 7,
-	IB_RATE_60_GBPS  = 8,
-	IB_RATE_80_GBPS  = 9,
-	IB_RATE_120_GBPS = 10
-};
-
-/**
- * ib_rate_to_mult - Convert the IB rate enum to a multiple of the
- * base rate of 2.5 Gbit/sec.  For example, IB_RATE_5_GBPS will be
- * converted to 2, since 5 Gbit/sec is 2 * 2.5 Gbit/sec.
- * @rate: rate to convert.
- */
-int ib_rate_to_mult(enum ib_rate rate);
-
-/**
- * mult_to_ib_rate - Convert a multiple of 2.5 Gbit/sec to an IB rate
- * enum.
- * @mult: multiple to convert.
- */
-enum ib_rate mult_to_ib_rate(int mult);
-
-struct ib_ah_attr {
-	struct ib_global_route	grh;
-	u16			dlid;
-	u8			sl;
-	u8			src_path_bits;
-	u8			static_rate;
-	u8			ah_flags;
-	u8			port_num;
-};
-
-enum ib_wc_status {
-	IB_WC_SUCCESS,
-	IB_WC_LOC_LEN_ERR,
-	IB_WC_LOC_QP_OP_ERR,
-	IB_WC_LOC_EEC_OP_ERR,
-	IB_WC_LOC_PROT_ERR,
-	IB_WC_WR_FLUSH_ERR,
-	IB_WC_MW_BIND_ERR,
-	IB_WC_BAD_RESP_ERR,
-	IB_WC_LOC_ACCESS_ERR,
-	IB_WC_REM_INV_REQ_ERR,
-	IB_WC_REM_ACCESS_ERR,
-	IB_WC_REM_OP_ERR,
-	IB_WC_RETRY_EXC_ERR,
-	IB_WC_RNR_RETRY_EXC_ERR,
-	IB_WC_LOC_RDD_VIOL_ERR,
-	IB_WC_REM_INV_RD_REQ_ERR,
-	IB_WC_REM_ABORT_ERR,
-	IB_WC_INV_EECN_ERR,
-	IB_WC_INV_EEC_STATE_ERR,
-	IB_WC_FATAL_ERR,
-	IB_WC_RESP_TIMEOUT_ERR,
-	IB_WC_GENERAL_ERR
-};
-
-enum ib_wc_opcode {
-	IB_WC_SEND,
-	IB_WC_RDMA_WRITE,
-	IB_WC_RDMA_READ,
-	IB_WC_COMP_SWAP,
-	IB_WC_FETCH_ADD,
-	IB_WC_BIND_MW,
-/*
- * Set value of IB_WC_RECV so consumers can test if a completion is a
- * receive by testing (opcode & IB_WC_RECV).
- */
-	IB_WC_RECV			= 1 << 7,
-	IB_WC_RECV_RDMA_WITH_IMM
-};
-
-enum ib_wc_flags {
-	IB_WC_GRH		= 1,
-	IB_WC_WITH_IMM		= (1<<1)
-};
-
-struct ib_wc {
-	u64			wr_id;
-	enum ib_wc_status	status;
-	enum ib_wc_opcode	opcode;
-	u32			vendor_err;
-	u32			byte_len;
-	struct ib_qp	       *qp;
-	__be32			imm_data;
-	u32			src_qp;
-	int			wc_flags;
-	u16			pkey_index;
-	u16			slid;
-	u8			sl;
-	u8			dlid_path_bits;
-	u8			port_num;	/* valid only for DR SMPs on switches */
-};
-
-enum ib_cq_notify_flags {
-	IB_CQ_SOLICITED			= 1 << 0,
-	IB_CQ_NEXT_COMP			= 1 << 1,
-	IB_CQ_SOLICITED_MASK		= IB_CQ_SOLICITED | IB_CQ_NEXT_COMP,
-	IB_CQ_REPORT_MISSED_EVENTS	= 1 << 2,
-};
-
-enum ib_srq_attr_mask {
-	IB_SRQ_MAX_WR	= 1 << 0,
-	IB_SRQ_LIMIT	= 1 << 1,
-};
-
-struct ib_srq_attr {
-	u32	max_wr;
-	u32	max_sge;
-	u32	srq_limit;
-};
-
-struct ib_srq_init_attr {
-	void		      (*event_handler)(struct ib_event *, void *);
-	void		       *srq_context;
-	struct ib_srq_attr	attr;
-};
-
-struct ib_qp_cap {
-	u32	max_send_wr;
-	u32	max_recv_wr;
-	u32	max_send_sge;
-	u32	max_recv_sge;
-	u32	max_inline_data;
-};
-
-enum ib_sig_type {
-	IB_SIGNAL_ALL_WR,
-	IB_SIGNAL_REQ_WR
-};
-
-enum ib_qp_type {
-	/*
-	 * IB_QPT_SMI and IB_QPT_GSI have to be the first two entries
-	 * here (and in that order) since the MAD layer uses them as
-	 * indices into a 2-entry table.
-	 */
-	IB_QPT_SMI,
-	IB_QPT_GSI,
-
-	IB_QPT_RC,
-	IB_QPT_UC,
-	IB_QPT_UD,
-	IB_QPT_RAW_IPV6,
-	IB_QPT_RAW_ETY
-};
-
-struct ib_qp_init_attr {
-	void                  (*event_handler)(struct ib_event *, void *);
-	void		       *qp_context;
-	struct ib_cq	       *send_cq;
-	struct ib_cq	       *recv_cq;
-	struct ib_srq	       *srq;
-	struct ib_qp_cap	cap;
-	enum ib_sig_type	sq_sig_type;
-	enum ib_qp_type		qp_type;
-	u8			port_num; /* special QP types only */
-};
-
-enum ib_rnr_timeout {
-	IB_RNR_TIMER_655_36 =  0,
-	IB_RNR_TIMER_000_01 =  1,
-	IB_RNR_TIMER_000_02 =  2,
-	IB_RNR_TIMER_000_03 =  3,
-	IB_RNR_TIMER_000_04 =  4,
-	IB_RNR_TIMER_000_06 =  5,
-	IB_RNR_TIMER_000_08 =  6,
-	IB_RNR_TIMER_000_12 =  7,
-	IB_RNR_TIMER_000_16 =  8,
-	IB_RNR_TIMER_000_24 =  9,
-	IB_RNR_TIMER_000_32 = 10,
-	IB_RNR_TIMER_000_48 = 11,
-	IB_RNR_TIMER_000_64 = 12,
-	IB_RNR_TIMER_000_96 = 13,
-	IB_RNR_TIMER_001_28 = 14,
-	IB_RNR_TIMER_001_92 = 15,
-	IB_RNR_TIMER_002_56 = 16,
-	IB_RNR_TIMER_003_84 = 17,
-	IB_RNR_TIMER_005_12 = 18,
-	IB_RNR_TIMER_007_68 = 19,
-	IB_RNR_TIMER_010_24 = 20,
-	IB_RNR_TIMER_015_36 = 21,
-	IB_RNR_TIMER_020_48 = 22,
-	IB_RNR_TIMER_030_72 = 23,
-	IB_RNR_TIMER_040_96 = 24,
-	IB_RNR_TIMER_061_44 = 25,
-	IB_RNR_TIMER_081_92 = 26,
-	IB_RNR_TIMER_122_88 = 27,
-	IB_RNR_TIMER_163_84 = 28,
-	IB_RNR_TIMER_245_76 = 29,
-	IB_RNR_TIMER_327_68 = 30,
-	IB_RNR_TIMER_491_52 = 31
-};
-
-enum ib_qp_attr_mask {
-	IB_QP_STATE			= 1,
-	IB_QP_CUR_STATE			= (1<<1),
-	IB_QP_EN_SQD_ASYNC_NOTIFY	= (1<<2),
-	IB_QP_ACCESS_FLAGS		= (1<<3),
-	IB_QP_PKEY_INDEX		= (1<<4),
-	IB_QP_PORT			= (1<<5),
-	IB_QP_QKEY			= (1<<6),
-	IB_QP_AV			= (1<<7),
-	IB_QP_PATH_MTU			= (1<<8),
-	IB_QP_TIMEOUT			= (1<<9),
-	IB_QP_RETRY_CNT			= (1<<10),
-	IB_QP_RNR_RETRY			= (1<<11),
-	IB_QP_RQ_PSN			= (1<<12),
-	IB_QP_MAX_QP_RD_ATOMIC		= (1<<13),
-	IB_QP_ALT_PATH			= (1<<14),
-	IB_QP_MIN_RNR_TIMER		= (1<<15),
-	IB_QP_SQ_PSN			= (1<<16),
-	IB_QP_MAX_DEST_RD_ATOMIC	= (1<<17),
-	IB_QP_PATH_MIG_STATE		= (1<<18),
-	IB_QP_CAP			= (1<<19),
-	IB_QP_DEST_QPN			= (1<<20)
-};
-
-enum ib_qp_state {
-	IB_QPS_RESET,
-	IB_QPS_INIT,
-	IB_QPS_RTR,
-	IB_QPS_RTS,
-	IB_QPS_SQD,
-	IB_QPS_SQE,
-	IB_QPS_ERR
-};
-
-enum ib_mig_state {
-	IB_MIG_MIGRATED,
-	IB_MIG_REARM,
-	IB_MIG_ARMED
-};
-
-struct ib_qp_attr {
-	enum ib_qp_state	qp_state;
-	enum ib_qp_state	cur_qp_state;
-	enum ib_mtu		path_mtu;
-	enum ib_mig_state	path_mig_state;
-	u32			qkey;
-	u32			rq_psn;
-	u32			sq_psn;
-	u32			dest_qp_num;
-	int			qp_access_flags;
-	struct ib_qp_cap	cap;
-	struct ib_ah_attr	ah_attr;
-	struct ib_ah_attr	alt_ah_attr;
-	u16			pkey_index;
-	u16			alt_pkey_index;
-	u8			en_sqd_async_notify;
-	u8			sq_draining;
-	u8			max_rd_atomic;
-	u8			max_dest_rd_atomic;
-	u8			min_rnr_timer;
-	u8			port_num;
-	u8			timeout;
-	u8			retry_cnt;
-	u8			rnr_retry;
-	u8			alt_port_num;
-	u8			alt_timeout;
-};
-
-enum ib_wr_opcode {
-	IB_WR_RDMA_WRITE,
-	IB_WR_RDMA_WRITE_WITH_IMM,
-	IB_WR_SEND,
-	IB_WR_SEND_WITH_IMM,
-	IB_WR_RDMA_READ,
-	IB_WR_ATOMIC_CMP_AND_SWP,
-	IB_WR_ATOMIC_FETCH_AND_ADD
-};
-
-enum ib_send_flags {
-	IB_SEND_FENCE		= 1,
-	IB_SEND_SIGNALED	= (1<<1),
-	IB_SEND_SOLICITED	= (1<<2),
-	IB_SEND_INLINE		= (1<<3)
-};
-
-struct ib_sge {
-	u64	addr;
-	u32	length;
-	u32	lkey;
-};
-
-struct ib_send_wr {
-	struct ib_send_wr      *next;
-	u64			wr_id;
-	struct ib_sge	       *sg_list;
-	int			num_sge;
-	enum ib_wr_opcode	opcode;
-	int			send_flags;
-	__be32			imm_data;
-	union {
-		struct {
-			u64	remote_addr;
-			u32	rkey;
-		} rdma;
-		struct {
-			u64	remote_addr;
-			u64	compare_add;
-			u64	swap;
-			u32	rkey;
-		} atomic;
-		struct {
-			struct ib_ah *ah;
-			u32	remote_qpn;
-			u32	remote_qkey;
-			u16	pkey_index; /* valid for GSI only */
-			u8	port_num;   /* valid for DR SMPs on switch only */
-		} ud;
-	} wr;
-};
-
-struct ib_recv_wr {
-	struct ib_recv_wr      *next;
-	u64			wr_id;
-	struct ib_sge	       *sg_list;
-	int			num_sge;
-};
-
-enum ib_access_flags {
-	IB_ACCESS_LOCAL_WRITE	= 1,
-	IB_ACCESS_REMOTE_WRITE	= (1<<1),
-	IB_ACCESS_REMOTE_READ	= (1<<2),
-	IB_ACCESS_REMOTE_ATOMIC	= (1<<3),
-	IB_ACCESS_MW_BIND	= (1<<4)
-};
-
-struct ib_phys_buf {
-	u64      addr;
-	u64      size;
-};
-
-struct ib_mr_attr {
-	struct ib_pd	*pd;
-	u64		device_virt_addr;
-	u64		size;
-	int		mr_access_flags;
-	u32		lkey;
-	u32		rkey;
-};
-
-enum ib_mr_rereg_flags {
-	IB_MR_REREG_TRANS	= 1,
-	IB_MR_REREG_PD		= (1<<1),
-	IB_MR_REREG_ACCESS	= (1<<2)
-};
-
-struct ib_mw_bind {
-	struct ib_mr   *mr;
-	u64		wr_id;
-	u64		addr;
-	u32		length;
-	int		send_flags;
-	int		mw_access_flags;
-};
-
-struct ib_fmr_attr {
-	int	max_pages;
-	int	max_maps;
-	u8	page_shift;
-};
-
-/*
- * XXX can this really be on 7 different lists at once?
- *
- */
-struct ib_ucontext {
-	struct ib_device       *device;
-	TAILQ_ENTRY(ib_ucontext)	pd_list;
-	TAILQ_ENTRY(ib_ucontext)	mr_list;
-	TAILQ_ENTRY(ib_ucontext)	mw_list;
-	TAILQ_ENTRY(ib_ucontext)	cq_list;
-	TAILQ_ENTRY(ib_ucontext)	qp_list;
-	TAILQ_ENTRY(ib_ucontext)	srq_list;
-	TAILQ_ENTRY(ib_ucontext)	ah_list;
-	int			closing;
-};
-
-struct ib_uobject {
-	u64			user_handle;	/* handle given to us by userspace */
-	struct ib_ucontext     *context;	/* associated user context */
-	void		       *object;		/* containing object */
-	TAILQ_ENTRY(ib_uobject)	entry;		/* link to context's list */
-	u32			id;		/* index into kernel idr */
-	volatile uint32_t	ref;
-	struct mtx	        lock;		/* protects .live */
-	int			live;
-};
-
-struct ib_udata {
-	void	*inbuf;
-	void	*outbuf;
-	size_t	inlen;
-	size_t	outlen;
-};
-
-#define IB_UMEM_MAX_PAGE_CHUNK						\
-	((PAGE_SIZE - offsetof(struct ib_umem_chunk, page_list)) /	\
-	 ((void *) &((struct ib_umem_chunk *) 0)->page_list[1] -	\
-	  (void *) &((struct ib_umem_chunk *) 0)->page_list[0]))
-
-struct ib_pd {
-	struct ib_device       *device;
-	struct ib_uobject      *uobject;
-	volatile int      	usecnt; /* count all resources */
-};
-
-struct ib_ah {
-	struct ib_device	*device;
-	struct ib_pd		*pd;
-	struct ib_uobject	*uobject;
-};
-
-typedef void (*ib_comp_handler)(struct ib_cq *cq, void *cq_context);
-
-struct ib_cq {
-	struct ib_device       *device;
-	struct ib_uobject      *uobject;
-	ib_comp_handler   	comp_handler;
-	void                  (*event_handler)(struct ib_event *, void *);
-	void *            	cq_context;
-	int               	cqe;
-	volatile int          	usecnt; /* count number of work queues */
-};
-
-struct ib_srq {
-	struct ib_device       *device;
-	struct ib_pd	       *pd;
-	struct ib_uobject      *uobject;
-	void		      (*event_handler)(struct ib_event *, void *);
-	void		       *srq_context;
-	volatile int		usecnt;
-};
-
-struct ib_qp {
-	struct ib_device       *device;
-	struct ib_pd	       *pd;
-	struct ib_cq	       *send_cq;
-	struct ib_cq	       *recv_cq;
-	struct ib_srq	       *srq;
-	struct ib_uobject      *uobject;
-	void                  (*event_handler)(struct ib_event *, void *);
-	void		       *qp_context;
-	u32			qp_num;
-	enum ib_qp_type		qp_type;
-};
-
-struct ib_mr {
-	struct ib_device  *device;
-	struct ib_pd	  *pd;
-	struct ib_uobject *uobject;
-	u32		   lkey;
-	u32		   rkey;
-	volatile int	   usecnt; /* count number of MWs */
-};
-
-struct ib_mw {
-	struct ib_device	*device;
-	struct ib_pd		*pd;
-	struct ib_uobject	*uobject;
-	u32			rkey;
-};
-
-
-struct ib_fmr {
-	struct ib_device	*device;
-	struct ib_pd		*pd;
-	TAILQ_ENTRY(ib_fmr)	entry;
-	u32			lkey;
-	u32			rkey;
-};
-
-TAILQ_HEAD(ib_fmr_list_head, ib_fmr);
-
-struct ib_mad;
-struct ib_grh;
-
-enum ib_process_mad_flags {
-	IB_MAD_IGNORE_MKEY	= 1,
-	IB_MAD_IGNORE_BKEY	= 2,
-	IB_MAD_IGNORE_ALL	= IB_MAD_IGNORE_MKEY | IB_MAD_IGNORE_BKEY
-};
-
-enum ib_mad_result {
-	IB_MAD_RESULT_FAILURE  = 0,      /* (!SUCCESS is the important flag) */
-	IB_MAD_RESULT_SUCCESS  = 1 << 0, /* MAD was successfully processed   */
-	IB_MAD_RESULT_REPLY    = 1 << 1, /* Reply packet needs to be sent    */
-	IB_MAD_RESULT_CONSUMED = 1 << 2  /* Packet consumed: stop processing */
-};
-
-#define IB_DEVICE_NAME_MAX 64
-
-struct ib_cache {
-	struct mtx              lock;
-	struct ib_event_handler event_handler;
-	struct ib_pkey_cache  **pkey_cache;
-	struct ib_gid_cache   **gid_cache;
-	u8                     *lmc_cache;
-};
-
-struct ib_dma_mapping_ops {
-	int		(*mapping_error)(struct ib_device *dev,
-					 u64 dma_addr);
-	u64		(*map_single)(struct ib_device *dev,
-				      void *ptr, size_t size,
-				      enum dma_data_direction direction);
-	void		(*unmap_single)(struct ib_device *dev,
-					u64 addr, size_t size,
-					enum dma_data_direction direction);
-	u64		(*map_page)(struct ib_device *dev,
-				    void *page, unsigned long offset,
-				    size_t size,
-				    enum dma_data_direction direction);
-	void		(*unmap_page)(struct ib_device *dev,
-				      u64 addr, size_t size,
-				      enum dma_data_direction direction);
-	int		(*map_sg)(struct ib_device *dev,
-				  struct rdma_scatterlist *sg, int nents,
-				  enum dma_data_direction direction);
-	void		(*unmap_sg)(struct ib_device *dev,
-				    struct rdma_scatterlist *sg, int nents,
-				    enum dma_data_direction direction);
-	u64		(*dma_address)(struct ib_device *dev,
-				       struct rdma_scatterlist *sg);
-	unsigned int	(*dma_len)(struct ib_device *dev,
-				   struct rdma_scatterlist *sg);
-	void		(*sync_single_for_cpu)(struct ib_device *dev,
-					       u64 dma_handle,
-					       size_t size,
-				               enum dma_data_direction dir);
-	void		(*sync_single_for_device)(struct ib_device *dev,
-						  u64 dma_handle,
-						  size_t size,
-						  enum dma_data_direction dir);
-	void		*(*alloc_coherent)(struct ib_device *dev,
-					   size_t size,
-					   u64 *dma_handle,
-					   int flag);
-	void		(*free_coherent)(struct ib_device *dev,
-					 size_t size, void *cpu_addr,
-					 u64 dma_handle);
-};
-
-struct iw_cm_verbs;
-
-struct ib_device {
-	struct device                *dma_device;
-
-	char                          name[IB_DEVICE_NAME_MAX];
-
-	TAILQ_HEAD(, ib_event_handler) event_handler_list;
-	struct mtx                    event_handler_lock;
-
-        TAILQ_ENTRY(ib_device)        core_list;
-        TAILQ_HEAD(, ib_client_data)  client_data_list;
-	struct mtx                    client_data_lock;
-
-	struct ib_cache               cache;
-	int                          *pkey_tbl_len;
-	int                          *gid_tbl_len;
-
-	u32                           flags;
-
-	int			      num_comp_vectors;
-
-	struct iw_cm_verbs	     *iwcm;
-
-	int		           (*query_device)(struct ib_device *device,
-						   struct ib_device_attr *device_attr);
-	int		           (*query_port)(struct ib_device *device,
-						 u8 port_num,
-						 struct ib_port_attr *port_attr);
-	int		           (*query_gid)(struct ib_device *device,
-						u8 port_num, int index,
-						union ib_gid *gid);
-	int		           (*query_pkey)(struct ib_device *device,
-						 u8 port_num, u16 index, u16 *pkey);
-	int		           (*modify_device)(struct ib_device *device,
-						    int device_modify_mask,
-						    struct ib_device_modify *device_modify);
-	int		           (*modify_port)(struct ib_device *device,
-						  u8 port_num, int port_modify_mask,
-						  struct ib_port_modify *port_modify);
-	struct ib_ucontext *       (*alloc_ucontext)(struct ib_device *device,
-						     struct ib_udata *udata);
-	int                        (*dealloc_ucontext)(struct ib_ucontext *context);
-	int                        (*mmap)(struct ib_ucontext *context,
-					   struct vm_object *vma);
-	struct ib_pd *             (*alloc_pd)(struct ib_device *device,
-					       struct ib_ucontext *context,
-					       struct ib_udata *udata);
-	int                        (*dealloc_pd)(struct ib_pd *pd);
-	struct ib_ah *             (*create_ah)(struct ib_pd *pd,
-						struct ib_ah_attr *ah_attr);
-	int                        (*modify_ah)(struct ib_ah *ah,
-						struct ib_ah_attr *ah_attr);
-	int                        (*query_ah)(struct ib_ah *ah,
-					       struct ib_ah_attr *ah_attr);
-	int                        (*destroy_ah)(struct ib_ah *ah);
-	struct ib_srq *            (*create_srq)(struct ib_pd *pd,
-						 struct ib_srq_init_attr *srq_init_attr,
-						 struct ib_udata *udata);
-	int                        (*modify_srq)(struct ib_srq *srq,
-						 struct ib_srq_attr *srq_attr,
-						 enum ib_srq_attr_mask srq_attr_mask,
-						 struct ib_udata *udata);
-	int                        (*query_srq)(struct ib_srq *srq,
-						struct ib_srq_attr *srq_attr);
-	int                        (*destroy_srq)(struct ib_srq *srq);
-	int                        (*post_srq_recv)(struct ib_srq *srq,
-						    struct ib_recv_wr *recv_wr,
-						    struct ib_recv_wr **bad_recv_wr);
-	struct ib_qp *             (*create_qp)(struct ib_pd *pd,
-						struct ib_qp_init_attr *qp_init_attr,
-						struct ib_udata *udata);
-	int                        (*modify_qp)(struct ib_qp *qp,
-						struct ib_qp_attr *qp_attr,
-						int qp_attr_mask,
-						struct ib_udata *udata);
-	int                        (*query_qp)(struct ib_qp *qp,
-					       struct ib_qp_attr *qp_attr,
-					       int qp_attr_mask,
-					       struct ib_qp_init_attr *qp_init_attr);
-	int                        (*destroy_qp)(struct ib_qp *qp);
-	int                        (*post_send)(struct ib_qp *qp,
-						struct ib_send_wr *send_wr,
-						struct ib_send_wr **bad_send_wr);
-	int                        (*post_recv)(struct ib_qp *qp,
-						struct ib_recv_wr *recv_wr,
-						struct ib_recv_wr **bad_recv_wr);
-	struct ib_cq *             (*create_cq)(struct ib_device *device, int cqe,
-						int comp_vector,
-						struct ib_ucontext *context,
-						struct ib_udata *udata);
-	int                        (*destroy_cq)(struct ib_cq *cq);
-	int                        (*resize_cq)(struct ib_cq *cq, int cqe,
-						struct ib_udata *udata);
-	int                        (*poll_cq)(struct ib_cq *cq, int num_entries,
-					      struct ib_wc *wc);
-	int                        (*peek_cq)(struct ib_cq *cq, int wc_cnt);
-	int                        (*req_notify_cq)(struct ib_cq *cq,
-						    enum ib_cq_notify_flags flags);
-	int                        (*req_ncomp_notif)(struct ib_cq *cq,
-						      int wc_cnt);
-	struct ib_mr *             (*get_dma_mr)(struct ib_pd *pd,
-						 int mr_access_flags);
-	struct ib_mr *             (*reg_phys_mr)(struct ib_pd *pd,
-						  struct ib_phys_buf *phys_buf_array,
-						  int num_phys_buf,
-						  int mr_access_flags,
-						  u64 *iova_start);
-	struct ib_mr *             (*reg_user_mr)(struct ib_pd *pd,
-						  u64 start, u64 length,
-						  u64 virt_addr,
-						  int mr_access_flags,
-						  struct ib_udata *udata);
-	int                        (*query_mr)(struct ib_mr *mr,
-					       struct ib_mr_attr *mr_attr);
-	int                        (*dereg_mr)(struct ib_mr *mr);
-	int                        (*rereg_phys_mr)(struct ib_mr *mr,
-						    int mr_rereg_mask,
-						    struct ib_pd *pd,
-						    struct ib_phys_buf *phys_buf_array,
-						    int num_phys_buf,
-						    int mr_access_flags,
-						    u64 *iova_start);
-	struct ib_mw *             (*alloc_mw)(struct ib_pd *pd);
-	int                        (*bind_mw)(struct ib_qp *qp,
-					      struct ib_mw *mw,
-					      struct ib_mw_bind *mw_bind);
-	int                        (*dealloc_mw)(struct ib_mw *mw);
-	struct ib_fmr *	           (*alloc_fmr)(struct ib_pd *pd,
-						int mr_access_flags,
-						struct ib_fmr_attr *fmr_attr);
-	int		           (*map_phys_fmr)(struct ib_fmr *fmr,
-						   u64 *page_list, int list_len,
-						   u64 iova);
-	int		           (*unmap_fmr)(struct ib_fmr_list_head *fmr_list);
-	int		           (*dealloc_fmr)(struct ib_fmr *fmr);
-	int                        (*attach_mcast)(struct ib_qp *qp,
-						   union ib_gid *gid,
-						   u16 lid);
-	int                        (*detach_mcast)(struct ib_qp *qp,
-						   union ib_gid *gid,
-						   u16 lid);
-	int                        (*process_mad)(struct ib_device *device,
-						  int process_mad_flags,
-						  u8 port_num,
-						  struct ib_wc *in_wc,
-						  struct ib_grh *in_grh,
-						  struct ib_mad *in_mad,
-						  struct ib_mad *out_mad);
-
-	struct ib_dma_mapping_ops   *dma_ops;
-
-	struct module               *owner;
-#ifdef notyet	
-	struct class_device          class_dev;
-	struct kobject               ports_parent;
-	struct list_head             port_list;
-#endif
-	enum {
-		IB_DEV_UNINITIALIZED,
-		IB_DEV_REGISTERED,
-		IB_DEV_UNREGISTERED
-	}                            reg_state;
-
-	u64			     uverbs_cmd_mask;
-	int			     uverbs_abi_ver;
-
-	char			     node_desc[64];
-	__be64			     node_guid;
-	u8                           node_type;
-	u8                           phys_port_cnt;
-};
-
-struct ib_client {
-	char  *name;
-	void (*add)   (struct ib_device *);
-	void (*remove)(struct ib_device *);
-	TAILQ_ENTRY(ib_client) list;
-};
-
-struct ib_device *ib_alloc_device(size_t size);
-void ib_dealloc_device(struct ib_device *device);
-
-int ib_register_device   (struct ib_device *device);
-void ib_unregister_device(struct ib_device *device);
-
-int ib_register_client   (struct ib_client *client);
-void ib_unregister_client(struct ib_client *client);
-
-void *ib_get_client_data(struct ib_device *device, struct ib_client *client);
-void  ib_set_client_data(struct ib_device *device, struct ib_client *client,
-			 void *data);
-
-static inline int ib_copy_from_udata(void *dest, struct ib_udata *udata, size_t len)
-{
-	return copyin(udata->inbuf, dest, len);
-}
-
-static inline int ib_copy_to_udata(struct ib_udata *udata, void *src, size_t len)
-{
-	return copyout(src, udata->outbuf, len);
-}
-
-/**
- * ib_modify_qp_is_ok - Check that the supplied attribute mask
- * contains all required attributes and no attributes not allowed for
- * the given QP state transition.
- * @cur_state: Current QP state
- * @next_state: Next QP state
- * @type: QP type
- * @mask: Mask of supplied QP attributes
- *
- * This function is a helper function that a low-level driver's
- * modify_qp method can use to validate the consumer's input.  It
- * checks that cur_state and next_state are valid QP states, that a
- * transition from cur_state to next_state is allowed by the IB spec,
- * and that the attribute mask supplied is allowed for the transition.
- */
-int ib_modify_qp_is_ok(enum ib_qp_state cur_state, enum ib_qp_state next_state,
-		       enum ib_qp_type type, enum ib_qp_attr_mask mask);
-
-int ib_register_event_handler  (struct ib_event_handler *event_handler);
-int ib_unregister_event_handler(struct ib_event_handler *event_handler);
-void ib_dispatch_event(struct ib_event *event);
-
-int ib_query_device(struct ib_device *device,
-		    struct ib_device_attr *device_attr);
-
-int ib_query_port(struct ib_device *device,
-		  u8 port_num, struct ib_port_attr *port_attr);
-
-int ib_query_gid(struct ib_device *device,
-		 u8 port_num, int index, union ib_gid *gid);
-
-int ib_query_pkey(struct ib_device *device,
-		  u8 port_num, u16 index, u16 *pkey);
-
-int ib_modify_device(struct ib_device *device,
-		     int device_modify_mask,
-		     struct ib_device_modify *device_modify);
-
-int ib_modify_port(struct ib_device *device,
-		   u8 port_num, int port_modify_mask,
-		   struct ib_port_modify *port_modify);
-
-int ib_find_gid(struct ib_device *device, union ib_gid *gid,
-		u8 *port_num, u16 *index);
-
-int ib_find_pkey(struct ib_device *device,
-		 u8 port_num, u16 pkey, u16 *index);
-
-/**
- * ib_alloc_pd - Allocates an unused protection domain.
- * @device: The device on which to allocate the protection domain.
- *
- * A protection domain object provides an association between QPs, shared
- * receive queues, address handles, memory regions, and memory windows.
- */
-struct ib_pd *ib_alloc_pd(struct ib_device *device);
-
-/**
- * ib_dealloc_pd - Deallocates a protection domain.
- * @pd: The protection domain to deallocate.
- */
-int ib_dealloc_pd(struct ib_pd *pd);
-
-/**
- * ib_create_ah - Creates an address handle for the given address vector.
- * @pd: The protection domain associated with the address handle.
- * @ah_attr: The attributes of the address vector.
- *
- * The address handle is used to reference a local or global destination
- * in all UD QP post sends.
- */
-struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr);
-
-/**
- * ib_init_ah_from_wc - Initializes address handle attributes from a
- *   work completion.
- * @device: Device on which the received message arrived.
- * @port_num: Port on which the received message arrived.
- * @wc: Work completion associated with the received message.
- * @grh: References the received global route header.  This parameter is
- *   ignored unless the work completion indicates that the GRH is valid.
- * @ah_attr: Returned attributes that can be used when creating an address
- *   handle for replying to the message.
- */
-int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc,
-		       struct ib_grh *grh, struct ib_ah_attr *ah_attr);
-
-/**
- * ib_create_ah_from_wc - Creates an address handle associated with the
- *   sender of the specified work completion.
- * @pd: The protection domain associated with the address handle.
- * @wc: Work completion information associated with a received message.
- * @grh: References the received global route header.  This parameter is
- *   ignored unless the work completion indicates that the GRH is valid.
- * @port_num: The outbound port number to associate with the address.
- *
- * The address handle is used to reference a local or global destination
- * in all UD QP post sends.
- */
-struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, struct ib_wc *wc,
-				   struct ib_grh *grh, u8 port_num);
-
-/**
- * ib_modify_ah - Modifies the address vector associated with an address
- *   handle.
- * @ah: The address handle to modify.
- * @ah_attr: The new address vector attributes to associate with the
- *   address handle.
- */
-int ib_modify_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr);
-
-/**
- * ib_query_ah - Queries the address vector associated with an address
- *   handle.
- * @ah: The address handle to query.
- * @ah_attr: The address vector attributes associated with the address
- *   handle.
- */
-int ib_query_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr);
-
-/**
- * ib_destroy_ah - Destroys an address handle.
- * @ah: The address handle to destroy.
- */
-int ib_destroy_ah(struct ib_ah *ah);
-
-/**
- * ib_create_srq - Creates a SRQ associated with the specified protection
- *   domain.
- * @pd: The protection domain associated with the SRQ.
- * @srq_init_attr: A list of initial attributes required to create the
- *   SRQ.  If SRQ creation succeeds, then the attributes are updated to
- *   the actual capabilities of the created SRQ.
- *
- * srq_attr->max_wr and srq_attr->max_sge are read the determine the
- * requested size of the SRQ, and set to the actual values allocated
- * on return.  If ib_create_srq() succeeds, then max_wr and max_sge
- * will always be at least as large as the requested values.
- */
-struct ib_srq *ib_create_srq(struct ib_pd *pd,
-			     struct ib_srq_init_attr *srq_init_attr);
-
-/**
- * ib_modify_srq - Modifies the attributes for the specified SRQ.
- * @srq: The SRQ to modify.
- * @srq_attr: On input, specifies the SRQ attributes to modify.  On output,
- *   the current values of selected SRQ attributes are returned.
- * @srq_attr_mask: A bit-mask used to specify which attributes of the SRQ
- *   are being modified.
- *
- * The mask may contain IB_SRQ_MAX_WR to resize the SRQ and/or
- * IB_SRQ_LIMIT to set the SRQ's limit and request notification when
- * the number of receives queued drops below the limit.
- */
-int ib_modify_srq(struct ib_srq *srq,
-		  struct ib_srq_attr *srq_attr,
-		  enum ib_srq_attr_mask srq_attr_mask);
-
-/**
- * ib_query_srq - Returns the attribute list and current values for the
- *   specified SRQ.
- * @srq: The SRQ to query.
- * @srq_attr: The attributes of the specified SRQ.
- */
-int ib_query_srq(struct ib_srq *srq,
-		 struct ib_srq_attr *srq_attr);
-
-/**
- * ib_destroy_srq - Destroys the specified SRQ.
- * @srq: The SRQ to destroy.
- */
-int ib_destroy_srq(struct ib_srq *srq);
-
-/**
- * ib_post_srq_recv - Posts a list of work requests to the specified SRQ.
- * @srq: The SRQ to post the work request on.
- * @recv_wr: A list of work requests to post on the receive queue.
- * @bad_recv_wr: On an immediate failure, this parameter will reference
- *   the work request that failed to be posted on the QP.
- */
-static inline int ib_post_srq_recv(struct ib_srq *srq,
-				   struct ib_recv_wr *recv_wr,
-				   struct ib_recv_wr **bad_recv_wr)
-{
-	return srq->device->post_srq_recv(srq, recv_wr, bad_recv_wr);
-}
-
-/**
- * ib_create_qp - Creates a QP associated with the specified protection
- *   domain.
- * @pd: The protection domain associated with the QP.
- * @qp_init_attr: A list of initial attributes required to create the
- *   QP.  If QP creation succeeds, then the attributes are updated to
- *   the actual capabilities of the created QP.
- */
-struct ib_qp *ib_create_qp(struct ib_pd *pd,
-			   struct ib_qp_init_attr *qp_init_attr);
-
-/**
- * ib_modify_qp - Modifies the attributes for the specified QP and then
- *   transitions the QP to the given state.
- * @qp: The QP to modify.
- * @qp_attr: On input, specifies the QP attributes to modify.  On output,
- *   the current values of selected QP attributes are returned.
- * @qp_attr_mask: A bit-mask used to specify which attributes of the QP
- *   are being modified.
- */
-int ib_modify_qp(struct ib_qp *qp,
-		 struct ib_qp_attr *qp_attr,
-		 int qp_attr_mask);
-
-/**
- * ib_query_qp - Returns the attribute list and current values for the
- *   specified QP.
- * @qp: The QP to query.
- * @qp_attr: The attributes of the specified QP.
- * @qp_attr_mask: A bit-mask used to select specific attributes to query.
- * @qp_init_attr: Additional attributes of the selected QP.
- *
- * The qp_attr_mask may be used to limit the query to gathering only the
- * selected attributes.
- */
-int ib_query_qp(struct ib_qp *qp,
-		struct ib_qp_attr *qp_attr,
-		int qp_attr_mask,
-		struct ib_qp_init_attr *qp_init_attr);
-
-/**
- * ib_destroy_qp - Destroys the specified QP.
- * @qp: The QP to destroy.
- */
-int ib_destroy_qp(struct ib_qp *qp);
-
-/**
- * ib_post_send - Posts a list of work requests to the send queue of
- *   the specified QP.
- * @qp: The QP to post the work request on.
- * @send_wr: A list of work requests to post on the send queue.
- * @bad_send_wr: On an immediate failure, this parameter will reference
- *   the work request that failed to be posted on the QP.
- */
-static inline int ib_post_send(struct ib_qp *qp,
-			       struct ib_send_wr *send_wr,
-			       struct ib_send_wr **bad_send_wr)
-{
-	return qp->device->post_send(qp, send_wr, bad_send_wr);
-}
-
-/**
- * ib_post_recv - Posts a list of work requests to the receive queue of
- *   the specified QP.
- * @qp: The QP to post the work request on.
- * @recv_wr: A list of work requests to post on the receive queue.
- * @bad_recv_wr: On an immediate failure, this parameter will reference
- *   the work request that failed to be posted on the QP.
- */
-static inline int ib_post_recv(struct ib_qp *qp,
-			       struct ib_recv_wr *recv_wr,
-			       struct ib_recv_wr **bad_recv_wr)
-{
-	return qp->device->post_recv(qp, recv_wr, bad_recv_wr);
-}
-
-/**
- * ib_create_cq - Creates a CQ on the specified device.
- * @device: The device on which to create the CQ.
- * @comp_handler: A user-specified callback that is invoked when a
- *   completion event occurs on the CQ.
- * @event_handler: A user-specified callback that is invoked when an
- *   asynchronous event not associated with a completion occurs on the CQ.
- * @cq_context: Context associated with the CQ returned to the user via
- *   the associated completion and event handlers.
- * @cqe: The minimum size of the CQ.
- * @comp_vector - Completion vector used to signal completion events.
- *     Must be >= 0 and < context->num_comp_vectors.
- *
- * Users can examine the cq structure to determine the actual CQ size.
- */
-struct ib_cq *ib_create_cq(struct ib_device *device,
-			   ib_comp_handler comp_handler,
-			   void (*event_handler)(struct ib_event *, void *),
-			   void *cq_context, int cqe, int comp_vector);
-
-/**
- * ib_resize_cq - Modifies the capacity of the CQ.
- * @cq: The CQ to resize.
- * @cqe: The minimum size of the CQ.
- *
- * Users can examine the cq structure to determine the actual CQ size.
- */
-int ib_resize_cq(struct ib_cq *cq, int cqe);
-
-/**
- * ib_destroy_cq - Destroys the specified CQ.
- * @cq: The CQ to destroy.
- */
-int ib_destroy_cq(struct ib_cq *cq);
-
-/**
- * ib_poll_cq - poll a CQ for completion(s)
- * @cq:the CQ being polled
- * @num_entries:maximum number of completions to return
- * @wc:array of at least @num_entries &struct ib_wc where completions
- *   will be returned
- *
- * Poll a CQ for (possibly multiple) completions.  If the return value
- * is < 0, an error occurred.  If the return value is >= 0, it is the
- * number of completions returned.  If the return value is
- * non-negative and < num_entries, then the CQ was emptied.
- */
-static inline int ib_poll_cq(struct ib_cq *cq, int num_entries,
-			     struct ib_wc *wc)
-{
-	return cq->device->poll_cq(cq, num_entries, wc);
-}
-
-/**
- * ib_peek_cq - Returns the number of unreaped completions currently
- *   on the specified CQ.
- * @cq: The CQ to peek.
- * @wc_cnt: A minimum number of unreaped completions to check for.
- *
- * If the number of unreaped completions is greater than or equal to wc_cnt,
- * this function returns wc_cnt, otherwise, it returns the actual number of
- * unreaped completions.
- */
-int ib_peek_cq(struct ib_cq *cq, int wc_cnt);
-
-/**
- * ib_req_notify_cq - Request completion notification on a CQ.
- * @cq: The CQ to generate an event for.
- * @flags:
- *   Must contain exactly one of %IB_CQ_SOLICITED or %IB_CQ_NEXT_COMP
- *   to request an event on the next solicited event or next work
- *   completion at any type, respectively. %IB_CQ_REPORT_MISSED_EVENTS
- *   may also be |ed in to request a hint about missed events, as
- *   described below.
- *
- * Return Value:
- *    < 0 means an error occurred while requesting notification
- *   == 0 means notification was requested successfully, and if
- *        IB_CQ_REPORT_MISSED_EVENTS was passed in, then no events
- *        were missed and it is safe to wait for another event.  In
- *        this case is it guaranteed that any work completions added
- *        to the CQ since the last CQ poll will trigger a completion
- *        notification event.
- *    > 0 is only returned if IB_CQ_REPORT_MISSED_EVENTS was passed
- *        in.  It means that the consumer must poll the CQ again to
- *        make sure it is empty to avoid missing an event because of a
- *        race between requesting notification and an entry being
- *        added to the CQ.  This return value means it is possible
- *        (but not guaranteed) that a work completion has been added
- *        to the CQ since the last poll without triggering a
- *        completion notification event.
- */
-static inline int ib_req_notify_cq(struct ib_cq *cq,
-				   enum ib_cq_notify_flags flags)
-{
-	return cq->device->req_notify_cq(cq, flags);
-}
-
-/**
- * ib_req_ncomp_notif - Request completion notification when there are
- *   at least the specified number of unreaped completions on the CQ.
- * @cq: The CQ to generate an event for.
- * @wc_cnt: The number of unreaped completions that should be on the
- *   CQ before an event is generated.
- */
-static inline int ib_req_ncomp_notif(struct ib_cq *cq, int wc_cnt)
-{
-	return cq->device->req_ncomp_notif ?
-		cq->device->req_ncomp_notif(cq, wc_cnt) :
-		ENOSYS;
-}
-
-/**
- * ib_get_dma_mr - Returns a memory region for system memory that is
- *   usable for DMA.
- * @pd: The protection domain associated with the memory region.
- * @mr_access_flags: Specifies the memory access rights.
- *
- * Note that the ib_dma_*() functions defined below must be used
- * to create/destroy addresses used with the Lkey or Rkey returned
- * by ib_get_dma_mr().
- */
-struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags);
-#ifdef notyet
-/**
- * ib_dma_mapping_error - check a DMA addr for error
- * @dev: The device for which the dma_addr was created
- * @dma_addr: The DMA address to check
- */
-static inline int ib_dma_mapping_error(struct ib_device *dev, u64 dma_addr)
-{
-	if (dev->dma_ops)
-		return dev->dma_ops->mapping_error(dev, dma_addr);
-	return dma_mapping_error(dma_addr);
-}
-
-/**
- * ib_dma_map_single - Map a kernel virtual address to DMA address
- * @dev: The device for which the dma_addr is to be created
- * @cpu_addr: The kernel virtual address
- * @size: The size of the region in bytes
- * @direction: The direction of the DMA
- */
-static inline u64 ib_dma_map_single(struct ib_device *dev,
-				    void *cpu_addr, size_t size,
-				    enum dma_data_direction direction)
-{
-	if (dev->dma_ops)
-		return dev->dma_ops->map_single(dev, cpu_addr, size, direction);
-	return dma_map_single(dev->dma_device, cpu_addr, size, direction);
-}
-
-/**
- * ib_dma_unmap_single - Destroy a mapping created by ib_dma_map_single()
- * @dev: The device for which the DMA address was created
- * @addr: The DMA address
- * @size: The size of the region in bytes
- * @direction: The direction of the DMA
- */
-static inline void ib_dma_unmap_single(struct ib_device *dev,
-				       u64 addr, size_t size,
-				       enum dma_data_direction direction)
-{
-	if (dev->dma_ops)
-		dev->dma_ops->unmap_single(dev, addr, size, direction);
-	else
-		dma_unmap_single(dev->dma_device, addr, size, direction);
-}
-
-/**
- * ib_dma_map_page - Map a physical page to DMA address
- * @dev: The device for which the dma_addr is to be created
- * @page: The page to be mapped
- * @offset: The offset within the page
- * @size: The size of the region in bytes
- * @direction: The direction of the DMA
- */
-static inline u64 ib_dma_map_page(struct ib_device *dev,
-				  struct page *page,
-				  unsigned long offset,
-				  size_t size,
-					 enum dma_data_direction direction)
-{
-	if (dev->dma_ops)
-		return dev->dma_ops->map_page(dev, page, offset, size, direction);
-	return dma_map_page(dev->dma_device, page, offset, size, direction);
-}
-
-/**
- * ib_dma_unmap_page - Destroy a mapping created by ib_dma_map_page()
- * @dev: The device for which the DMA address was created
- * @addr: The DMA address
- * @size: The size of the region in bytes
- * @direction: The direction of the DMA
- */
-static inline void ib_dma_unmap_page(struct ib_device *dev,
-				     u64 addr, size_t size,
-				     enum dma_data_direction direction)
-{
-	if (dev->dma_ops)
-		dev->dma_ops->unmap_page(dev, addr, size, direction);
-	else
-		dma_unmap_page(dev->dma_device, addr, size, direction);
-}
-
-/**
- * ib_dma_map_sg - Map a scatter/gather list to DMA addresses
- * @dev: The device for which the DMA addresses are to be created
- * @sg: The array of scatter/gather entries
- * @nents: The number of scatter/gather entries
- * @direction: The direction of the DMA
- */
-static inline int ib_dma_map_sg(struct ib_device *dev,
-				struct rdma_scatterlist *sg, int nents,
-				enum dma_data_direction direction)
-{
-	if (dev->dma_ops)
-		return dev->dma_ops->map_sg(dev, sg, nents, direction);
-	return dma_map_sg(dev->dma_device, sg, nents, direction);
-}
-
-/**
- * ib_dma_unmap_sg - Unmap a scatter/gather list of DMA addresses
- * @dev: The device for which the DMA addresses were created
- * @sg: The array of scatter/gather entries
- * @nents: The number of scatter/gather entries
- * @direction: The direction of the DMA
- */
-static inline void ib_dma_unmap_sg(struct ib_device *dev,
-				   struct rdma_scatterlist *sg, int nents,
-				   enum dma_data_direction direction)
-{
-	if (dev->dma_ops)
-		dev->dma_ops->unmap_sg(dev, sg, nents, direction);
-	else
-		dma_unmap_sg(dev->dma_device, sg, nents, direction);
-}
-
-/**
- * ib_sg_dma_address - Return the DMA address from a scatter/gather entry
- * @dev: The device for which the DMA addresses were created
- * @sg: The scatter/gather entry
- */
-static inline u64 ib_sg_dma_address(struct ib_device *dev,
-				    struct rdma_scatterlist *sg)
-{
-	if (dev->dma_ops)
-		return dev->dma_ops->dma_address(dev, sg);
-	return sg_dma_address(sg);
-}
-
-/**
- * ib_sg_dma_len - Return the DMA length from a scatter/gather entry
- * @dev: The device for which the DMA addresses were created
- * @sg: The scatter/gather entry
- */
-static inline unsigned int ib_sg_dma_len(struct ib_device *dev,
-					 struct rdma_scatterlist *sg)
-{
-	if (dev->dma_ops)
-		return dev->dma_ops->dma_len(dev, sg);
-	return sg_dma_len(sg);
-}
-
-/**
- * ib_dma_sync_single_for_cpu - Prepare DMA region to be accessed by CPU
- * @dev: The device for which the DMA address was created
- * @addr: The DMA address
- * @size: The size of the region in bytes
- * @dir: The direction of the DMA
- */
-static inline void ib_dma_sync_single_for_cpu(struct ib_device *dev,
-					      u64 addr,
-					      size_t size,
-					      enum dma_data_direction dir)
-{
-	if (dev->dma_ops)
-		dev->dma_ops->sync_single_for_cpu(dev, addr, size, dir);
-	else
-		dma_sync_single_for_cpu(dev->dma_device, addr, size, dir);
-}
-
-/**
- * ib_dma_sync_single_for_device - Prepare DMA region to be accessed by device
- * @dev: The device for which the DMA address was created
- * @addr: The DMA address
- * @size: The size of the region in bytes
- * @dir: The direction of the DMA
- */
-static inline void ib_dma_sync_single_for_device(struct ib_device *dev,
-						 u64 addr,
-						 size_t size,
-						 enum dma_data_direction dir)
-{
-	if (dev->dma_ops)
-		dev->dma_ops->sync_single_for_device(dev, addr, size, dir);
-	else
-		dma_sync_single_for_device(dev->dma_device, addr, size, dir);
-}
-
-/**
- * ib_dma_alloc_coherent - Allocate memory and map it for DMA
- * @dev: The device for which the DMA address is requested
- * @size: The size of the region to allocate in bytes
- * @dma_handle: A pointer for returning the DMA address of the region
- * @flag: memory allocator flags
- */
-static inline void *ib_dma_alloc_coherent(struct ib_device *dev,
-					   size_t size,
-					   u64 *dma_handle,
-					   gfp_t flag)
-{
-	if (dev->dma_ops)
-		return dev->dma_ops->alloc_coherent(dev, size, dma_handle, flag);
-	else {
-		dma_addr_t handle;
-		void *ret;
-
-		ret = dma_alloc_coherent(dev->dma_device, size, &handle, flag);
-		*dma_handle = handle;
-		return ret;
-	}
-}
-
-/**
- * ib_dma_free_coherent - Free memory allocated by ib_dma_alloc_coherent()
- * @dev: The device for which the DMA addresses were allocated
- * @size: The size of the region
- * @cpu_addr: the address returned by ib_dma_alloc_coherent()
- * @dma_handle: the DMA address returned by ib_dma_alloc_coherent()
- */
-static inline void ib_dma_free_coherent(struct ib_device *dev,
-					size_t size, void *cpu_addr,
-					u64 dma_handle)
-{
-	if (dev->dma_ops)
-		dev->dma_ops->free_coherent(dev, size, cpu_addr, dma_handle);
-	else
-		dma_free_coherent(dev->dma_device, size, cpu_addr, dma_handle);
-}
-#endif
-/**
- * ib_reg_phys_mr - Prepares a virtually addressed memory region for use
- *   by an HCA.
- * @pd: The protection domain associated assigned to the registered region.
- * @phys_buf_array: Specifies a list of physical buffers to use in the
- *   memory region.
- * @num_phys_buf: Specifies the size of the phys_buf_array.
- * @mr_access_flags: Specifies the memory access rights.
- * @iova_start: The offset of the region's starting I/O virtual address.
- */
-struct ib_mr *ib_reg_phys_mr(struct ib_pd *pd,
-			     struct ib_phys_buf *phys_buf_array,
-			     int num_phys_buf,
-			     int mr_access_flags,
-			     u64 *iova_start);
-
-/**
- * ib_rereg_phys_mr - Modifies the attributes of an existing memory region.
- *   Conceptually, this call performs the functions deregister memory region
- *   followed by register physical memory region.  Where possible,
- *   resources are reused instead of deallocated and reallocated.
- * @mr: The memory region to modify.
- * @mr_rereg_mask: A bit-mask used to indicate which of the following
- *   properties of the memory region are being modified.
- * @pd: If %IB_MR_REREG_PD is set in mr_rereg_mask, this field specifies
- *   the new protection domain to associated with the memory region,
- *   otherwise, this parameter is ignored.
- * @phys_buf_array: If %IB_MR_REREG_TRANS is set in mr_rereg_mask, this
- *   field specifies a list of physical buffers to use in the new
- *   translation, otherwise, this parameter is ignored.
- * @num_phys_buf: If %IB_MR_REREG_TRANS is set in mr_rereg_mask, this
- *   field specifies the size of the phys_buf_array, otherwise, this
- *   parameter is ignored.
- * @mr_access_flags: If %IB_MR_REREG_ACCESS is set in mr_rereg_mask, this
- *   field specifies the new memory access rights, otherwise, this
- *   parameter is ignored.
- * @iova_start: The offset of the region's starting I/O virtual address.
- */
-int ib_rereg_phys_mr(struct ib_mr *mr,
-		     int mr_rereg_mask,
-		     struct ib_pd *pd,
-		     struct ib_phys_buf *phys_buf_array,
-		     int num_phys_buf,
-		     int mr_access_flags,
-		     u64 *iova_start);
-
-/**
- * ib_query_mr - Retrieves information about a specific memory region.
- * @mr: The memory region to retrieve information about.
- * @mr_attr: The attributes of the specified memory region.
- */
-int ib_query_mr(struct ib_mr *mr, struct ib_mr_attr *mr_attr);
-
-/**
- * ib_dereg_mr - Deregisters a memory region and removes it from the
- *   HCA translation table.
- * @mr: The memory region to deregister.
- */
-int ib_dereg_mr(struct ib_mr *mr);
-
-/**
- * ib_alloc_mw - Allocates a memory window.
- * @pd: The protection domain associated with the memory window.
- */
-struct ib_mw *ib_alloc_mw(struct ib_pd *pd);
-
-/**
- * ib_bind_mw - Posts a work request to the send queue of the specified
- *   QP, which binds the memory window to the given address range and
- *   remote access attributes.
- * @qp: QP to post the bind work request on.
- * @mw: The memory window to bind.
- * @mw_bind: Specifies information about the memory window, including
- *   its address range, remote access rights, and associated memory region.
- */
-static inline int ib_bind_mw(struct ib_qp *qp,
-			     struct ib_mw *mw,
-			     struct ib_mw_bind *mw_bind)
-{
-	/* XXX reference counting in corresponding MR? */
-	return mw->device->bind_mw ?
-		mw->device->bind_mw(qp, mw, mw_bind) :
-		ENOSYS;
-}
-
-/**
- * ib_dealloc_mw - Deallocates a memory window.
- * @mw: The memory window to deallocate.
- */
-int ib_dealloc_mw(struct ib_mw *mw);
-
-/**
- * ib_alloc_fmr - Allocates a unmapped fast memory region.
- * @pd: The protection domain associated with the unmapped region.
- * @mr_access_flags: Specifies the memory access rights.
- * @fmr_attr: Attributes of the unmapped region.
- *
- * A fast memory region must be mapped before it can be used as part of
- * a work request.
- */
-struct ib_fmr *ib_alloc_fmr(struct ib_pd *pd,
-			    int mr_access_flags,
-			    struct ib_fmr_attr *fmr_attr);
-
-/**
- * ib_map_phys_fmr - Maps a list of physical pages to a fast memory region.
- * @fmr: The fast memory region to associate with the pages.
- * @page_list: An array of physical pages to map to the fast memory region.
- * @list_len: The number of pages in page_list.
- * @iova: The I/O virtual address to use with the mapped region.
- */
-static inline int ib_map_phys_fmr(struct ib_fmr *fmr,
-				  u64 *page_list, int list_len,
-				  u64 iova)
-{
-	return fmr->device->map_phys_fmr(fmr, page_list, list_len, iova);
-}
-
-/**
- * ib_unmap_fmr - Removes the mapping from a list of fast memory regions.
- * @fmr_list: A linked list of fast memory regions to unmap.
- */
-int ib_unmap_fmr(struct ib_fmr_list_head *fmr_list);
-
-/**
- * ib_dealloc_fmr - Deallocates a fast memory region.
- * @fmr: The fast memory region to deallocate.
- */
-int ib_dealloc_fmr(struct ib_fmr *fmr);
-
-/**
- * ib_attach_mcast - Attaches the specified QP to a multicast group.
- * @qp: QP to attach to the multicast group.  The QP must be type
- *   IB_QPT_UD.
- * @gid: Multicast group GID.
- * @lid: Multicast group LID in host byte order.
- *
- * In order to send and receive multicast packets, subnet
- * administration must have created the multicast group and configured
- * the fabric appropriately.  The port associated with the specified
- * QP must also be a member of the multicast group.
- */
-int ib_attach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid);
-
-/**
- * ib_detach_mcast - Detaches the specified QP from a multicast group.
- * @qp: QP to detach from the multicast group.
- * @gid: Multicast group GID.
- * @lid: Multicast group LID in host byte order.
- */
-int ib_detach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid);
-
-#endif /* IB_VERBS_H */
diff --git a/sys/contrib/rdma/iw_cm.h b/sys/contrib/rdma/iw_cm.h
deleted file mode 100644
index e594d669375..00000000000
--- a/sys/contrib/rdma/iw_cm.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 2005 Network Appliance, Inc. All rights reserved.
- * Copyright (c) 2005 Open Grid Computing, Inc. 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.
- *
- * $FreeBSD$
- */
-#ifndef IW_CM_H
-#define IW_CM_H
-
-#include <contrib/rdma/ib_cm.h>
-
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-
-struct iw_cm_id;
-
-enum iw_cm_event_type {
-	IW_CM_EVENT_CONNECT_REQUEST = 1, /* connect request received */
-	IW_CM_EVENT_CONNECT_REPLY,	 /* reply from active connect request */
-	IW_CM_EVENT_ESTABLISHED,	 /* passive side accept successful */
-	IW_CM_EVENT_DISCONNECT,		 /* orderly shutdown */
-	IW_CM_EVENT_CLOSE		 /* close complete */
-};
-
-enum iw_cm_event_status {
-	IW_CM_EVENT_STATUS_OK = 0,	 /* request successful */
-	IW_CM_EVENT_STATUS_ACCEPTED = 0, /* connect request accepted */
-	IW_CM_EVENT_STATUS_REJECTED,	 /* connect request rejected */
-	IW_CM_EVENT_STATUS_TIMEOUT,	 /* the operation timed out */
-	IW_CM_EVENT_STATUS_RESET,	 /* reset from remote peer */
-	IW_CM_EVENT_STATUS_EINVAL,	 /* asynchronous failure for bad parm */
-};
-
-struct iw_cm_event {
-	enum iw_cm_event_type event;
-	enum iw_cm_event_status status;
-	struct sockaddr_in local_addr;
-	struct sockaddr_in remote_addr;
-	void *private_data;
-	u8 private_data_len;
-	void* provider_data;
-	struct socket *so;
-};
-
-/**
- * iw_cm_handler - Function to be called by the IW CM when delivering events
- * to the client.
- *
- * @cm_id: The IW CM identifier associated with the event.
- * @event: Pointer to the event structure.
- */
-typedef int (*iw_cm_handler)(struct iw_cm_id *cm_id,
-			     struct iw_cm_event *event);
-
-/**
- * iw_event_handler - Function called by the provider when delivering provider
- * events to the IW CM.  Returns either 0 indicating the event was processed
- * or -errno if the event could not be processed.
- *
- * @cm_id: The IW CM identifier associated with the event.
- * @event: Pointer to the event structure.
- */
-typedef int (*iw_event_handler)(struct iw_cm_id *cm_id,
-				 struct iw_cm_event *event);
-
-struct iw_cm_id {
-	iw_cm_handler		cm_handler;      /* client callback function */
-	void		        *context;	 /* client cb context */
-	struct ib_device	*device;
-	struct sockaddr_in      local_addr;
-	struct sockaddr_in	remote_addr;
-	void			*provider_data;	 /* provider private data */
-	iw_event_handler        event_handler;   /* cb for provider
-						    events */
-	/* Used by provider to add and remove refs on IW cm_id */
-	void (*add_ref)(struct iw_cm_id *);
-	void (*rem_ref)(struct iw_cm_id *);
-	struct socket 		*so;
-};
-
-struct iw_cm_conn_param {
-	const void *private_data;
-	u16 private_data_len;
-	u32 ord;
-	u32 ird;
-	u32 qpn;
-};
-
-struct iw_cm_verbs {
-	void		(*add_ref)(struct ib_qp *qp);
-
-	void		(*rem_ref)(struct ib_qp *qp);
-
-	struct ib_qp *	(*get_qp)(struct ib_device *device,
-				  int qpn);
-
-	int		(*connect)(struct iw_cm_id *cm_id,
-				   struct iw_cm_conn_param *conn_param);
-
-	int		(*accept)(struct iw_cm_id *cm_id,
-				  struct iw_cm_conn_param *conn_param);
-
-	int		(*reject)(struct iw_cm_id *cm_id,
-				  const void *pdata, u8 pdata_len);
-
-	int		(*create_listen)(struct iw_cm_id *cm_id,
-					 int backlog);
-
-	int		(*destroy_listen)(struct iw_cm_id *cm_id);
-};
-
-/**
- * iw_create_cm_id - Create an IW CM identifier.
- *
- * @device: The IB device on which to create the IW CM identier.
- * @so: The socket to be used for establishing the rdma connection.
- * @event_handler: User callback invoked to report events associated with the
- *   returned IW CM identifier.
- * @context: User specified context associated with the id.
- */
-struct iw_cm_id *iw_create_cm_id(struct ib_device *device,
-				 struct socket *so,
-				 iw_cm_handler cm_handler, void *context);
-
-/**
- * iw_destroy_cm_id - Destroy an IW CM identifier.
- *
- * @cm_id: The previously created IW CM identifier to destroy.
- *
- * The client can assume that no events will be delivered for the CM ID after
- * this function returns.
- */
-void iw_destroy_cm_id(struct iw_cm_id *cm_id);
-
-/**
- * iw_cm_bind_qp - Unbind the specified IW CM identifier and QP
- *
- * @cm_id: The IW CM idenfier to unbind from the QP.
- * @qp: The QP
- *
- * This is called by the provider when destroying the QP to ensure
- * that any references held by the IWCM are released. It may also
- * be called by the IWCM when destroying a CM_ID to that any
- * references held by the provider are released.
- */
-void iw_cm_unbind_qp(struct iw_cm_id *cm_id, struct ib_qp *qp);
-
-/**
- * iw_cm_get_qp - Return the ib_qp associated with a QPN
- *
- * @ib_device: The IB device
- * @qpn: The queue pair number
- */
-struct ib_qp *iw_cm_get_qp(struct ib_device *device, int qpn);
-
-/**
- * iw_cm_listen - Listen for incoming connection requests on the
- * specified IW CM id.
- *
- * @cm_id: The IW CM identifier.
- * @backlog: The maximum number of outstanding un-accepted inbound listen
- *   requests to queue.
- *
- * The source address and port number are specified in the IW CM identifier
- * structure.
- */
-int iw_cm_listen(struct iw_cm_id *cm_id, int backlog);
-
-/**
- * iw_cm_accept - Called to accept an incoming connect request.
- *
- * @cm_id: The IW CM identifier associated with the connection request.
- * @iw_param: Pointer to a structure containing connection establishment
- *   parameters.
- *
- * The specified cm_id will have been provided in the event data for a
- * CONNECT_REQUEST event. Subsequent events related to this connection will be
- * delivered to the specified IW CM identifier prior and may occur prior to
- * the return of this function. If this function returns a non-zero value, the
- * client can assume that no events will be delivered to the specified IW CM
- * identifier.
- */
-int iw_cm_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param);
-
-/**
- * iw_cm_reject - Reject an incoming connection request.
- *
- * @cm_id: Connection identifier associated with the request.
- * @private_daa: Pointer to data to deliver to the remote peer as part of the
- *   reject message.
- * @private_data_len: The number of bytes in the private_data parameter.
- *
- * The client can assume that no events will be delivered to the specified IW
- * CM identifier following the return of this function. The private_data
- * buffer is available for reuse when this function returns.
- */
-int iw_cm_reject(struct iw_cm_id *cm_id, const void *private_data,
-		 u8 private_data_len);
-
-/**
- * iw_cm_connect - Called to request a connection to a remote peer.
- *
- * @cm_id: The IW CM identifier for the connection.
- * @iw_param: Pointer to a structure containing connection  establishment
- *   parameters.
- *
- * Events may be delivered to the specified IW CM identifier prior to the
- * return of this function. If this function returns a non-zero value, the
- * client can assume that no events will be delivered to the specified IW CM
- * identifier.
- */
-int iw_cm_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param);
-
-/**
- * iw_cm_disconnect - Close the specified connection.
- *
- * @cm_id: The IW CM identifier to close.
- * @abrupt: If 0, the connection will be closed gracefully, otherwise, the
- *   connection will be reset.
- *
- * The IW CM identifier is still active until the IW_CM_EVENT_CLOSE event is
- * delivered.
- */
-int iw_cm_disconnect(struct iw_cm_id *cm_id, int abrupt);
-
-/**
- * iw_cm_init_qp_attr - Called to initialize the attributes of the QP
- * associated with a IW CM identifier.
- *
- * @cm_id: The IW CM identifier associated with the QP
- * @qp_attr: Pointer to the QP attributes structure.
- * @qp_attr_mask: Pointer to a bit vector specifying which QP attributes are
- *   valid.
- */
-int iw_cm_init_qp_attr(struct iw_cm_id *cm_id, struct ib_qp_attr *qp_attr,
-		       int *qp_attr_mask);
-
-#endif /* IW_CM_H */
diff --git a/sys/contrib/rdma/krping/getopt.c b/sys/contrib/rdma/krping/getopt.c
index 701910ea8b3..24e62e1b882 100644
--- a/sys/contrib/rdma/krping/getopt.c
+++ b/sys/contrib/rdma/krping/getopt.c
@@ -5,9 +5,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/ctype.h>
-#include <sys/param.h>
-#include <sys/libkern.h>
+#include <sys/types.h>
+#include <linux/kernel.h>
+#include <linux/string.h>
+
 #include "getopt.h"
 
 /**
@@ -49,29 +50,29 @@ int krping_getopt(const char *caller, char **options,
 				if (opts->has_arg & OPT_NOPARAM) {
 					return opts->val;
 				}
-				printf("%s: the %s option requires "
+				printk(KERN_INFO "%s: the %s option requires "
 				       "an argument\n", caller, token);
 				return -EINVAL;
 			}
 			if (opts->has_arg & OPT_INT) {
 				char* v;
 
-				*value = strtoul(val, &v, 0);
+				*value = simple_strtoul(val, &v, 0);
 				if (!*v) {
 					return opts->val;
 				}
-				printf("%s: invalid numeric value "
+				printk(KERN_INFO "%s: invalid numeric value "
 				       "in %s=%s\n", caller, token, val);
 				return -EDOM;
 			}
 			if (opts->has_arg & OPT_STRING) {
 				return opts->val;
 			}
-			printf("%s: unexpected argument %s to the "
+			printk(KERN_INFO "%s: unexpected argument %s to the "
 			       "%s option\n", caller, val, token);
 			return -EINVAL;
 		}
 	}
-	printf("%s: Unrecognized option %s\n", caller, token);
+	printk(KERN_INFO "%s: Unrecognized option %s\n", caller, token);
 	return -EOPNOTSUPP;
 }
diff --git a/sys/contrib/rdma/krping/krping.c b/sys/contrib/rdma/krping/krping.c
index c0acf0cf913..1aed101ef21 100644
--- a/sys/contrib/rdma/krping/krping.c
+++ b/sys/contrib/rdma/krping/krping.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2005 Ammasso, Inc. All rights reserved.
- * Copyright (c) 2006 Open Grid Computing, Inc. All rights reserved.
+ * Copyright (c) 2006-2009 Open Grid Computing, Inc. 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,39 +34,52 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/ctype.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/err.h>
+#include <linux/string.h>
+#include <linux/inet.h>
+#include <linux/list.h>
+#include <linux/in.h>
+#include <linux/device.h>
+#include <linux/pci.h>
+#include <linux/sched.h>
+#include <asm/system.h>
 
-#include <sys/param.h>
-#include <sys/condvar.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/endian.h>
-#include <sys/limits.h>
-#include <sys/proc.h>
-#include <sys/signalvar.h>
+#include <asm/atomic.h>
 
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/rwlock.h>
-#include <sys/queue.h>
-#include <sys/taskqueue.h>
-#include <sys/syslog.h>
-#include <netinet/in.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
-#include <linux/types.h>
+#include <rdma/ib_verbs.h>
 #include <rdma/rdma_cm.h>
 
-#include "getopt.h"
 #include "krping.h"
+#include "getopt.h"
 
-#define PFX "krping: "
+extern int krping_debug;
+#define DEBUG_LOG(cb, x...) if (krping_debug) krping_printf((cb)->cookie, x)
+#define PRINTF(cb, x...) krping_printf((cb)->cookie, x)
 
-static int debug = 0;
-#define DEBUG_LOG if (debug) printf
+MODULE_AUTHOR("Steve Wise");
+MODULE_DESCRIPTION("RDMA ping client/server");
+MODULE_LICENSE("Dual BSD/GPL");
+
+static __inline uint64_t
+get_cycles(void)
+{
+	uint32_t low, high;
+	__asm __volatile("rdtsc" : "=a" (low), "=d" (high));
+	return (low | ((u_int64_t)high << 32));
+}
+
+typedef uint64_t cycles_t;
+
+enum mem_type {
+	DMA = 1,
+	FASTREG = 2,
+	MW = 3,
+	MR = 4
+};
 
 static const struct krping_option krping_opts[] = {
 	{"count", OPT_INT, 'C'},
@@ -77,23 +90,29 @@ static const struct krping_option krping_opts[] = {
 	{"validate", OPT_NOPARAM, 'V'},
 	{"server", OPT_NOPARAM, 's'},
 	{"client", OPT_NOPARAM, 'c'},
-	{"dmamr", OPT_NOPARAM, 'D'},
-	{"debug", OPT_NOPARAM, 'd'},
-	{"wlat", OPT_NOPARAM, 'l'},
-	{"rlat", OPT_NOPARAM, 'L'},
-	{"bw", OPT_NOPARAM, 'B'},
-	{"tx-depth", OPT_INT, 't'},
-  	{"poll", OPT_NOPARAM, 'P'},
-  	{"memlimit", OPT_INT, 'm'},
+	{"mem_mode", OPT_STRING, 'm'},
+	{"server_inv", OPT_NOPARAM, 'I'},
+ 	{"wlat", OPT_NOPARAM, 'l'},
+ 	{"rlat", OPT_NOPARAM, 'L'},
+ 	{"bw", OPT_NOPARAM, 'B'},
+ 	{"duplex", OPT_NOPARAM, 'd'},
+ 	{"txdepth", OPT_INT, 'T'},
+ 	{"poll", OPT_NOPARAM, 'P'},
+ 	{"local_dma_lkey", OPT_NOPARAM, 'Z'},
+ 	{"read_inv", OPT_NOPARAM, 'R'},
+ 	{"fr", OPT_NOPARAM, 'f'},
 	{NULL, 0, 0}
 };
 
-struct mtx krping_mutex;
+#define htonll(x) cpu_to_be64((x))
+#define ntohll(x) cpu_to_be64((x))
+
+static struct mutex krping_mutex;
 
 /*
  * List of running krping threads.
  */
-struct krping_cb_list krping_cbs;
+static LIST_HEAD(krping_cbs);
 
 /*
  * krping "ping/pong" loop:
@@ -108,25 +127,119 @@ struct krping_cb_list krping_cbs;
  * 	<repeat loop>
  */
 
+/*
+ * These states are used to signal events between the completion handler
+ * and the main client or server thread.
+ *
+ * Once CONNECTED, they cycle through RDMA_READ_ADV, RDMA_WRITE_ADV,
+ * and RDMA_WRITE_COMPLETE for each ping.
+ */
+enum test_state {
+	IDLE = 1,
+	CONNECT_REQUEST,
+	ADDR_RESOLVED,
+	ROUTE_RESOLVED,
+	CONNECTED,
+	RDMA_READ_ADV,
+	RDMA_READ_COMPLETE,
+	RDMA_WRITE_ADV,
+	RDMA_WRITE_COMPLETE,
+	ERROR
+};
+
+struct krping_rdma_info {
+	uint64_t buf;
+	uint32_t rkey;
+	uint32_t size;
+};
+
 /*
  * Default max buffer size for IO...
  */
 #define RPING_BUFSIZE 128*1024
-#define RPING_SQ_DEPTH 32
+#define RPING_SQ_DEPTH 64
 
-static void krping_wait(struct krping_cb *cb, int state)
-{
-	int rc;
-	mtx_lock(&cb->lock);
-	while (cb->state < state) {
-		rc = msleep(cb, &cb->lock, PCATCH, "krping", 0);
-		if (rc && rc != ERESTART) {
-			cb->state = ERROR;
-			break;
-		}
-	}
-	mtx_unlock(&cb->lock);
-}
+/*
+ * Control block struct.
+ */
+struct krping_cb {
+	void *cookie;
+	int server;			/* 0 iff client */
+	struct ib_cq *cq;
+	struct ib_pd *pd;
+	struct ib_qp *qp;
+
+	enum mem_type mem;
+	struct ib_mr *dma_mr;
+
+	struct ib_fast_reg_page_list *page_list;
+	int page_list_len;
+	struct ib_send_wr fastreg_wr;
+	struct ib_send_wr invalidate_wr;
+	struct ib_mr *fastreg_mr;
+	int server_invalidate;
+	int read_inv;
+	u8 key;
+
+	struct ib_mw *mw;
+	struct ib_mw_bind bind_attr;
+
+	struct ib_recv_wr rq_wr;	/* recv work request record */
+	struct ib_sge recv_sgl;		/* recv single SGE */
+	struct krping_rdma_info recv_buf;/* malloc'd buffer */
+	u64 recv_dma_addr;
+	DECLARE_PCI_UNMAP_ADDR(recv_mapping)
+	struct ib_mr *recv_mr;
+
+	struct ib_send_wr sq_wr;	/* send work requrest record */
+	struct ib_sge send_sgl;
+	struct krping_rdma_info send_buf;/* single send buf */
+	u64 send_dma_addr;
+	DECLARE_PCI_UNMAP_ADDR(send_mapping)
+	struct ib_mr *send_mr;
+
+	struct ib_send_wr rdma_sq_wr;	/* rdma work request record */
+	struct ib_sge rdma_sgl;		/* rdma single SGE */
+	char *rdma_buf;			/* used as rdma sink */
+	u64  rdma_dma_addr;
+	DECLARE_PCI_UNMAP_ADDR(rdma_mapping)
+	struct ib_mr *rdma_mr;
+
+	uint32_t remote_rkey;		/* remote guys RKEY */
+	uint64_t remote_addr;		/* remote guys TO */
+	uint32_t remote_len;		/* remote guys LEN */
+
+	char *start_buf;		/* rdma read src */
+	u64  start_dma_addr;
+	DECLARE_PCI_UNMAP_ADDR(start_mapping)
+	struct ib_mr *start_mr;
+
+	enum test_state state;		/* used for cond/signalling */
+	wait_queue_head_t sem;
+	struct krping_stats stats;
+
+	uint16_t port;			/* dst port in NBO */
+	struct in_addr addr;		/* dst addr in NBO */
+	char *addr_str;			/* dst addr string */
+	int verbose;			/* verbose logging */
+	int count;			/* ping count */
+	int size;			/* ping data size */
+	int validate;			/* validate ping data */
+	int wlat;			/* run wlat test */
+	int rlat;			/* run rlat test */
+	int bw;				/* run bw test */
+	int duplex;			/* run bw full duplex test */
+	int poll;			/* poll or block for rlat test */
+	int txdepth;			/* SQ depth */
+	int local_dma_lkey;		/* use 0 for lkey */
+	int frtest;			/* fastreg test */
+
+	/* CM stuff */
+	struct rdma_cm_id *cm_id;	/* connection on client side,*/
+					/* listener on server side. */
+	struct rdma_cm_id *child_cm_id;	/* connection on server side */
+	struct list_head list;
+};
 
 static int krping_cma_event_handler(struct rdma_cm_id *cma_id,
 				   struct rdma_cm_event *event)
@@ -134,39 +247,37 @@ static int krping_cma_event_handler(struct rdma_cm_id *cma_id,
 	int ret;
 	struct krping_cb *cb = cma_id->context;
 
-	DEBUG_LOG(PFX "cma_event type %d cma_id %p (%s)\n", event->event, cma_id,
-		  (cma_id == cb->cm_id) ? "parent" : "child");
+	DEBUG_LOG(cb, "cma_event type %d cma_id %p (%s)\n", event->event,
+	    cma_id, (cma_id == cb->cm_id) ? "parent" : "child");
 
-	mtx_lock(&cb->lock);
 	switch (event->event) {
 	case RDMA_CM_EVENT_ADDR_RESOLVED:
 		cb->state = ADDR_RESOLVED;
 		ret = rdma_resolve_route(cma_id, 2000);
 		if (ret) {
-			log(LOG_ERR, "rdma_resolve_route error %d\n", 
-			       ret);
-			wakeup(cb);
+			PRINTF(cb, "rdma_resolve_route error %d\n", ret);
+			wake_up_interruptible(&cb->sem);
 		}
 		break;
 
 	case RDMA_CM_EVENT_ROUTE_RESOLVED:
 		cb->state = ROUTE_RESOLVED;
-		wakeup(cb);
+		wake_up_interruptible(&cb->sem);
 		break;
 
 	case RDMA_CM_EVENT_CONNECT_REQUEST:
 		cb->state = CONNECT_REQUEST;
 		cb->child_cm_id = cma_id;
-		DEBUG_LOG(PFX "child cma %p\n", cb->child_cm_id);
-		wakeup(cb);
+		DEBUG_LOG(cb, "child cma %p\n", cb->child_cm_id);
+		wake_up_interruptible(&cb->sem);
 		break;
 
 	case RDMA_CM_EVENT_ESTABLISHED:
-		DEBUG_LOG(PFX "ESTABLISHED\n");
+		DEBUG_LOG(cb, "ESTABLISHED\n");
 		if (!cb->server) {
 			cb->state = CONNECTED;
-			wakeup(cb);
 		}
+		wake_up_interruptible(&cb->sem);
 		break;
 
 	case RDMA_CM_EVENT_ADDR_ERROR:
@@ -174,40 +285,34 @@ static int krping_cma_event_handler(struct rdma_cm_id *cma_id,
 	case RDMA_CM_EVENT_CONNECT_ERROR:
 	case RDMA_CM_EVENT_UNREACHABLE:
 	case RDMA_CM_EVENT_REJECTED:
-		log(LOG_ERR, "cma event %d, error %d\n", event->event,
+		PRINTF(cb, "cma event %d, error %d\n", event->event,
 		       event->status);
 		cb->state = ERROR;
-		wakeup(cb);
+		wake_up_interruptible(&cb->sem);
 		break;
 
 	case RDMA_CM_EVENT_DISCONNECTED:
-		DEBUG_LOG(PFX "DISCONNECT EVENT...\n");
+		PRINTF(cb, "DISCONNECT EVENT...\n");
 		cb->state = ERROR;
-		wakeup(cb);
+		wake_up_interruptible(&cb->sem);
 		break;
 
 	case RDMA_CM_EVENT_DEVICE_REMOVAL:
-		DEBUG_LOG(PFX "cma detected device removal!!!!\n");
-		cb->state = ERROR;
-		wakeup(cb);
-		mtx_unlock(&cb->lock);
-		krping_wait(cb, CLEANUP);
-		tsleep(cb, 0, "krping", 5000);
-		return 0;
+		PRINTF(cb, "cma detected device removal!!!!\n");
+		break;
 
 	default:
-		log(LOG_ERR, "oof bad type!\n");
-		wakeup(cb);
+		PRINTF(cb, "oof bad type!\n");
+		wake_up_interruptible(&cb->sem);
 		break;
 	}
-	mtx_unlock(&cb->lock);
 	return 0;
 }
 
 static int server_recv(struct krping_cb *cb, struct ib_wc *wc)
 {
 	if (wc->byte_len != sizeof(cb->recv_buf)) {
-		log(LOG_ERR, "Received bogus data, size %d\n", 
+		PRINTF(cb, "Received bogus data, size %d\n", 
 		       wc->byte_len);
 		return -1;
 	}
@@ -215,7 +320,7 @@ static int server_recv(struct krping_cb *cb, struct ib_wc *wc)
 	cb->remote_rkey = ntohl(cb->recv_buf.rkey);
 	cb->remote_addr = ntohll(cb->recv_buf.buf);
 	cb->remote_len  = ntohl(cb->recv_buf.size);
-	DEBUG_LOG(PFX "Received rkey %x addr %llx len %d from peer\n",
+	DEBUG_LOG(cb, "Received rkey %x addr %llx len %d from peer\n",
 		  cb->remote_rkey, (unsigned long long)cb->remote_addr, 
 		  cb->remote_len);
 
@@ -230,7 +335,7 @@ static int server_recv(struct krping_cb *cb, struct ib_wc *wc)
 static int client_recv(struct krping_cb *cb, struct ib_wc *wc)
 {
 	if (wc->byte_len != sizeof(cb->recv_buf)) {
-		log(LOG_ERR, "Received bogus data, size %d\n", 
+		PRINTF(cb, "Received bogus data, size %d\n", 
 		       wc->byte_len);
 		return -1;
 	}
@@ -250,11 +355,13 @@ static void krping_cq_event_handler(struct ib_cq *cq, void *ctx)
 	struct ib_recv_wr *bad_wr;
 	int ret;
 
-	mtx_lock(&cb->lock);
-	KASSERT(cb->cq == cq, ("bad condition"));
+	BUG_ON(cb->cq != cq);
 	if (cb->state == ERROR) {
-		log(LOG_ERR,  "cq completion in ERROR state\n");
-		mtx_unlock(&cb->lock);
+		PRINTF(cb, "cq completion in ERROR state\n");
+		return;
+	}
+	if (cb->frtest) {
+		PRINTF(cb, "cq completion event in frtest!\n");
 		return;
 	}
 	if (!cb->wlat && !cb->rlat && !cb->bw)
@@ -262,76 +369,77 @@ static void krping_cq_event_handler(struct ib_cq *cq, void *ctx)
 	while ((ret = ib_poll_cq(cb->cq, 1, &wc)) == 1) {
 		if (wc.status) {
 			if (wc.status == IB_WC_WR_FLUSH_ERR) {
-				DEBUG_LOG("cq flushed\n");
+				DEBUG_LOG(cb, "cq flushed\n");
 				continue;
 			} else {
-				log(LOG_CRIT, "cq completion failed status %d\n",
-					wc.status);
+				PRINTF(cb, "cq completion failed with "
+				       "wr_id %Lx status %d opcode %d vender_err %x\n",
+					wc.wr_id, wc.status, wc.opcode, wc.vendor_err);
 				goto error;
 			}
 		}
 
 		switch (wc.opcode) {
 		case IB_WC_SEND:
-			DEBUG_LOG(PFX "send completion\n");
+			DEBUG_LOG(cb, "send completion\n");
 			cb->stats.send_bytes += cb->send_sgl.length;
 			cb->stats.send_msgs++;
 			break;
 
 		case IB_WC_RDMA_WRITE:
-			DEBUG_LOG(PFX "rdma write completion\n");
+			DEBUG_LOG(cb, "rdma write completion\n");
 			cb->stats.write_bytes += cb->rdma_sq_wr.sg_list->length;
 			cb->stats.write_msgs++;
 			cb->state = RDMA_WRITE_COMPLETE;
-			wakeup(cb);
+			wake_up_interruptible(&cb->sem);
 			break;
 
 		case IB_WC_RDMA_READ:
-			DEBUG_LOG(PFX "rdma read completion\n");
+			DEBUG_LOG(cb, "rdma read completion\n");
 			cb->stats.read_bytes += cb->rdma_sq_wr.sg_list->length;
 			cb->stats.read_msgs++;
 			cb->state = RDMA_READ_COMPLETE;
-			wakeup(cb);
+			wake_up_interruptible(&cb->sem);
 			break;
 
 		case IB_WC_RECV:
-			DEBUG_LOG(PFX "recv completion\n");
+			DEBUG_LOG(cb, "recv completion\n");
 			cb->stats.recv_bytes += sizeof(cb->recv_buf);
 			cb->stats.recv_msgs++;
 			if (cb->wlat || cb->rlat || cb->bw)
 				ret = server_recv(cb, &wc);
 			else
 				ret = cb->server ? server_recv(cb, &wc) :
-					   client_recv(cb, &wc);
+						   client_recv(cb, &wc);
 			if (ret) {
-				log(LOG_ERR, "recv wc error: %d\n", ret);
+				PRINTF(cb, "recv wc error: %d\n", ret);
 				goto error;
 			}
 
 			ret = ib_post_recv(cb->qp, &cb->rq_wr, &bad_wr);
 			if (ret) {
-				log(LOG_ERR, "post recv error: %d\n", 
+				PRINTF(cb, "post recv error: %d\n", 
 				       ret);
 				goto error;
 			}
-			wakeup(cb);
+			wake_up_interruptible(&cb->sem);
 			break;
 
 		default:
-			log(LOG_ERR, "unknown!!!!! completion\n");
+			PRINTF(cb, 
+			       "%s:%d Unexpected opcode %d, Shutting down\n",
+			       __func__, __LINE__, wc.opcode);
 			goto error;
 		}
 	}
 	if (ret) {
-		log(LOG_ERR, "poll error %d\n", ret);
+		PRINTF(cb, "poll error %d\n", ret);
 		goto error;
 	}
-	mtx_unlock(&cb->lock);
 	return;
 error:
 	cb->state = ERROR;
-	wakeup(cb);
-	mtx_unlock(&cb->lock);
+	wake_up_interruptible(&cb->sem);
 }
 
 static int krping_accept(struct krping_cb *cb)
@@ -339,7 +447,7 @@ static int krping_accept(struct krping_cb *cb)
 	struct rdma_conn_param conn_param;
 	int ret;
 
-	DEBUG_LOG(PFX "accepting client connection request\n");
+	DEBUG_LOG(cb, "accepting client connection request\n");
 
 	memset(&conn_param, 0, sizeof conn_param);
 	conn_param.responder_resources = 1;
@@ -347,14 +455,15 @@ static int krping_accept(struct krping_cb *cb)
 
 	ret = rdma_accept(cb->child_cm_id, &conn_param);
 	if (ret) {
-		log(LOG_ERR, "rdma_accept error: %d\n", ret);
+		PRINTF(cb, "rdma_accept error: %d\n", ret);
 		return ret;
 	}
 
 	if (!cb->wlat && !cb->rlat && !cb->bw) {
-		krping_wait(cb, CONNECTED);
+		wait_event_interruptible(cb->sem, cb->state >= CONNECTED);
 		if (cb->state == ERROR) {
-			log(LOG_ERR,  "wait for CONNECTED state %d\n", cb->state);
+			PRINTF(cb, "wait for CONNECTED state %d\n", 
+				cb->state);
 			return -1;
 		}
 	}
@@ -363,19 +472,22 @@ static int krping_accept(struct krping_cb *cb)
 
 static void krping_setup_wr(struct krping_cb *cb)
 {
-	/* XXX X86 only here... not mapping for dma! */
-	cb->recv_sgl.addr = vtophys(&cb->recv_buf);
+	cb->recv_sgl.addr = cb->recv_dma_addr;
 	cb->recv_sgl.length = sizeof cb->recv_buf;
-	if (cb->use_dmamr)
+	if (cb->local_dma_lkey)
+		cb->recv_sgl.lkey = cb->qp->device->local_dma_lkey;
+	else if (cb->mem == DMA)
 		cb->recv_sgl.lkey = cb->dma_mr->lkey;
 	else
 		cb->recv_sgl.lkey = cb->recv_mr->lkey;
 	cb->rq_wr.sg_list = &cb->recv_sgl;
 	cb->rq_wr.num_sge = 1;
 
-	cb->send_sgl.addr = vtophys(&cb->send_buf);
+	cb->send_sgl.addr = cb->send_dma_addr;
 	cb->send_sgl.length = sizeof cb->send_buf;
-	if (cb->use_dmamr)
+	if (cb->local_dma_lkey)
+		cb->send_sgl.lkey = cb->qp->device->local_dma_lkey;
+	else if (cb->mem == DMA)
 		cb->send_sgl.lkey = cb->dma_mr->lkey;
 	else
 		cb->send_sgl.lkey = cb->send_mr->lkey;
@@ -385,18 +497,39 @@ static void krping_setup_wr(struct krping_cb *cb)
 	cb->sq_wr.sg_list = &cb->send_sgl;
 	cb->sq_wr.num_sge = 1;
 
-	cb->rdma_addr = vtophys(cb->rdma_buf);
-	cb->rdma_sgl.addr = cb->rdma_addr;
-	if (cb->use_dmamr)
-		cb->rdma_sgl.lkey = cb->dma_mr->lkey;
-	else
-		cb->rdma_sgl.lkey = cb->rdma_mr->lkey;
-	cb->rdma_sq_wr.send_flags = IB_SEND_SIGNALED;
-	cb->rdma_sq_wr.sg_list = &cb->rdma_sgl;
-	cb->rdma_sq_wr.num_sge = 1;
+	if (cb->server || cb->wlat || cb->rlat || cb->bw) {
+		cb->rdma_sgl.addr = cb->rdma_dma_addr;
+		if (cb->mem == MR)
+			cb->rdma_sgl.lkey = cb->rdma_mr->lkey;
+		cb->rdma_sq_wr.send_flags = IB_SEND_SIGNALED;
+		cb->rdma_sq_wr.sg_list = &cb->rdma_sgl;
+		cb->rdma_sq_wr.num_sge = 1;
+	}
 
-	if (!cb->server || cb->wlat || cb->rlat || cb->bw) {
-		cb->start_addr = vtophys(cb->start_buf);
+	switch(cb->mem) {
+	case FASTREG:
+
+		/* 
+		 * A chain of 2 WRs, INVALDATE_MR + FAST_REG_MR.
+		 * both unsignaled.  The client uses them to reregister
+		 * the rdma buffers with a new key each iteration.
+		 */
+		cb->fastreg_wr.opcode = IB_WR_FAST_REG_MR;
+		cb->fastreg_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
+		cb->fastreg_wr.wr.fast_reg.length = cb->size;
+		cb->fastreg_wr.wr.fast_reg.page_list = cb->page_list;
+		cb->fastreg_wr.wr.fast_reg.page_list_len = cb->page_list_len;
+
+		cb->invalidate_wr.next = &cb->fastreg_wr;
+		cb->invalidate_wr.opcode = IB_WR_LOCAL_INV;
+		break;
+	case MW:
+		cb->bind_attr.wr_id = 0xabbaabba;
+		cb->bind_attr.send_flags = 0; /* unsignaled */
+		cb->bind_attr.length = cb->size;
+		break;
+	default:
+		break;
 	}
 }
 
@@ -406,134 +539,207 @@ static int krping_setup_buffers(struct krping_cb *cb)
 	struct ib_phys_buf buf;
 	u64 iovbase;
 
-	DEBUG_LOG(PFX "krping_setup_buffers called on cb %p\n", cb);
+	DEBUG_LOG(cb, "krping_setup_buffers called on cb %p\n", cb);
 
-	if (cb->use_dmamr) {
+	cb->recv_dma_addr = dma_map_single(cb->pd->device->dma_device, 
+				   &cb->recv_buf, 
+				   sizeof(cb->recv_buf), DMA_BIDIRECTIONAL);
+	pci_unmap_addr_set(cb, recv_mapping, cb->recv_dma_addr);
+	cb->send_dma_addr = dma_map_single(cb->pd->device->dma_device, 
+					   &cb->send_buf, sizeof(cb->send_buf),
+					   DMA_BIDIRECTIONAL);
+	pci_unmap_addr_set(cb, send_mapping, cb->send_dma_addr);
+
+	if (cb->mem == DMA) {
 		cb->dma_mr = ib_get_dma_mr(cb->pd, IB_ACCESS_LOCAL_WRITE|
 					   IB_ACCESS_REMOTE_READ|
 				           IB_ACCESS_REMOTE_WRITE);
 		if (IS_ERR(cb->dma_mr)) {
-			log(LOG_ERR, "reg_dmamr failed\n");
-			return PTR_ERR(cb->dma_mr);
+			DEBUG_LOG(cb, "reg_dmamr failed\n");
+			ret = PTR_ERR(cb->dma_mr);
+			goto bail;
 		}
 	} else {
+		if (!cb->local_dma_lkey) {
+			buf.addr = cb->recv_dma_addr;
+			buf.size = sizeof cb->recv_buf;
+			DEBUG_LOG(cb, "recv buf dma_addr %llx size %d\n", buf.addr, 
+				(int)buf.size);
+			iovbase = cb->recv_dma_addr;
+			cb->recv_mr = ib_reg_phys_mr(cb->pd, &buf, 1, 
+						     IB_ACCESS_LOCAL_WRITE, 
+						     &iovbase);
 
-		buf.addr = vtophys(&cb->recv_buf);
-		buf.size = sizeof cb->recv_buf;
-		iovbase = vtophys(&cb->recv_buf);
-		cb->recv_mr = ib_reg_phys_mr(cb->pd, &buf, 1, 
-					     IB_ACCESS_LOCAL_WRITE, 
-					     &iovbase);
+			if (IS_ERR(cb->recv_mr)) {
+				DEBUG_LOG(cb, "recv_buf reg_mr failed\n");
+				ret = PTR_ERR(cb->recv_mr);
+				goto bail;
+			}
 
-		if (IS_ERR(cb->recv_mr)) {
-			log(LOG_ERR, "recv_buf reg_mr failed\n");
-			return PTR_ERR(cb->recv_mr);
-		}
+			buf.addr = cb->send_dma_addr;
+			buf.size = sizeof cb->send_buf;
+			DEBUG_LOG(cb, "send buf dma_addr %llx size %d\n", buf.addr, 
+				(int)buf.size);
+			iovbase = cb->send_dma_addr;
+			cb->send_mr = ib_reg_phys_mr(cb->pd, &buf, 1, 
+						     0, &iovbase);
 
-		buf.addr = vtophys(&cb->send_buf);
-		buf.size = sizeof cb->send_buf;
-		iovbase = vtophys(&cb->send_buf);
-		cb->send_mr = ib_reg_phys_mr(cb->pd, &buf, 1, 
-					     0, &iovbase);
-
-		if (IS_ERR(cb->send_mr)) {
-			log(LOG_ERR, "send_buf reg_mr failed\n");
-			ib_dereg_mr(cb->recv_mr);
-			return PTR_ERR(cb->send_mr);
+			if (IS_ERR(cb->send_mr)) {
+				DEBUG_LOG(cb, "send_buf reg_mr failed\n");
+				ret = PTR_ERR(cb->send_mr);
+				goto bail;
+			}
 		}
 	}
 
-	/* RNIC adapters have a limit upto which it can register physical memory
-	 * If DMA-MR memory mode is set then normally driver registers maximum
-	 * supported memory. After that if contigmalloc allocates memory beyond the
-	 * specified RNIC limit then Krping may not work.
-	 */
-	if (cb->use_dmamr && cb->memlimit)
-		cb->rdma_buf = contigmalloc(cb->size, M_DEVBUF, M_WAITOK, 0, cb->memlimit,
-					    PAGE_SIZE, 0);
-	else 
-		cb->rdma_buf = contigmalloc(cb->size, M_DEVBUF, M_WAITOK, 0, -1UL,
-					    PAGE_SIZE, 0);
-
+	cb->rdma_buf = kmalloc(cb->size, GFP_KERNEL);
 	if (!cb->rdma_buf) {
-		log(LOG_ERR, "rdma_buf malloc failed\n");
-		ret = ENOMEM;
-		goto err1;
+		DEBUG_LOG(cb, "rdma_buf malloc failed\n");
+		ret = -ENOMEM;
+		goto bail;
 	}
-	if (!cb->use_dmamr) {
 
-		buf.addr = vtophys(cb->rdma_buf);
-		buf.size = cb->size;
-		iovbase = vtophys(cb->rdma_buf);
-		cb->rdma_mr = ib_reg_phys_mr(cb->pd, &buf, 1, 
+	cb->rdma_dma_addr = dma_map_single(cb->pd->device->dma_device, 
+			       cb->rdma_buf, cb->size, 
+			       DMA_BIDIRECTIONAL);
+	pci_unmap_addr_set(cb, rdma_mapping, cb->rdma_dma_addr);
+	if (cb->mem != DMA) {
+		switch (cb->mem) {
+		case FASTREG:
+			cb->page_list_len = (((cb->size - 1) & PAGE_MASK) +
+				PAGE_SIZE) >> PAGE_SHIFT;
+			cb->page_list = ib_alloc_fast_reg_page_list(
+						cb->pd->device, 
+						cb->page_list_len);
+			if (IS_ERR(cb->page_list)) {
+				DEBUG_LOG(cb, "recv_buf reg_mr failed\n");
+				ret = PTR_ERR(cb->page_list);
+				goto bail;
+			}
+			cb->fastreg_mr = ib_alloc_fast_reg_mr(cb->pd, 
+					cb->page_list->max_page_list_len);
+			if (IS_ERR(cb->fastreg_mr)) {
+				DEBUG_LOG(cb, "recv_buf reg_mr failed\n");
+				ret = PTR_ERR(cb->fastreg_mr);
+				goto bail;
+			}
+			DEBUG_LOG(cb, "fastreg rkey 0x%x page_list %p"
+				" page_list_len %u\n", cb->fastreg_mr->rkey, 
+				cb->page_list, cb->page_list_len);
+			break;
+		case MW:
+			cb->mw = ib_alloc_mw(cb->pd);
+			if (IS_ERR(cb->mw)) {
+				DEBUG_LOG(cb, "recv_buf alloc_mw failed\n");
+				ret = PTR_ERR(cb->mw);
+				goto bail;
+			}
+			DEBUG_LOG(cb, "mw rkey 0x%x\n", cb->mw->rkey);
+			/*FALLTHROUGH*/
+		case MR:
+			buf.addr = cb->rdma_dma_addr;
+			buf.size = cb->size;
+			iovbase = cb->rdma_dma_addr;
+			cb->rdma_mr = ib_reg_phys_mr(cb->pd, &buf, 1, 
 					     IB_ACCESS_REMOTE_READ| 
 					     IB_ACCESS_REMOTE_WRITE, 
 					     &iovbase);
-
-		if (IS_ERR(cb->rdma_mr)) {
-			log(LOG_ERR, "rdma_buf reg_mr failed\n");
-			ret = PTR_ERR(cb->rdma_mr);
-			goto err2;
+			if (IS_ERR(cb->rdma_mr)) {
+				DEBUG_LOG(cb, "rdma_buf reg_mr failed\n");
+				ret = PTR_ERR(cb->rdma_mr);
+				goto bail;
+			}
+			DEBUG_LOG(cb, "rdma buf dma_addr %llx size %d mr rkey 0x%x\n", 
+				buf.addr, (int)buf.size, cb->rdma_mr->rkey);
+			break;
+		default:
+			ret = -EINVAL;
+			goto bail;
+			break;
 		}
 	}
 
 	if (!cb->server || cb->wlat || cb->rlat || cb->bw) {
-		if (cb->use_dmamr && cb->memlimit)
-			cb->start_buf = contigmalloc(cb->size, M_DEVBUF, M_WAITOK,
-						     0, cb->memlimit, PAGE_SIZE, 0);
-		else
-			cb->start_buf = contigmalloc(cb->size, M_DEVBUF, M_WAITOK,
-						     0, -1UL, PAGE_SIZE, 0);
+
+		cb->start_buf = kmalloc(cb->size, GFP_KERNEL);
 		if (!cb->start_buf) {
-			log(LOG_ERR, "start_buf malloc failed\n");
-			ret = ENOMEM;
-			goto err2;
+			DEBUG_LOG(cb, "start_buf malloc failed\n");
+			ret = -ENOMEM;
+			goto bail;
 		}
-		if (!cb->use_dmamr) {
+
+		cb->start_dma_addr = dma_map_single(cb->pd->device->dma_device, 
+						   cb->start_buf, cb->size, 
+						   DMA_BIDIRECTIONAL);
+		pci_unmap_addr_set(cb, start_mapping, cb->start_dma_addr);
+
+		if (cb->mem == MR || cb->mem == MW) {
 			unsigned flags = IB_ACCESS_REMOTE_READ;
 
-			if (cb->wlat || cb->rlat || cb->bw) 
+			if (cb->wlat || cb->rlat || cb->bw)
 				flags |= IB_ACCESS_REMOTE_WRITE;
-			buf.addr = vtophys(cb->start_buf);
+
+			buf.addr = cb->start_dma_addr;
 			buf.size = cb->size;
-			iovbase = vtophys(cb->start_buf);
+			DEBUG_LOG(cb, "start buf dma_addr %llx size %d\n", 
+				buf.addr, (int)buf.size);
+			iovbase = cb->start_dma_addr;
 			cb->start_mr = ib_reg_phys_mr(cb->pd, &buf, 1, 
 					     flags,
 					     &iovbase);
 
 			if (IS_ERR(cb->start_mr)) {
-				log(LOG_ERR, "start_buf reg_mr failed\n");
+				DEBUG_LOG(cb, "start_buf reg_mr failed\n");
 				ret = PTR_ERR(cb->start_mr);
-				goto err3;
+				goto bail;
 			}
 		}
 	}
 
 	krping_setup_wr(cb);
-	DEBUG_LOG(PFX "allocated & registered buffers...\n");
+	DEBUG_LOG(cb, "allocated & registered buffers...\n");
 	return 0;
-err3:
-	contigfree(cb->start_buf, cb->size, M_DEVBUF);
-
-	if (!cb->use_dmamr)
+bail:
+	if (cb->fastreg_mr && !IS_ERR(cb->fastreg_mr))
+		ib_dereg_mr(cb->fastreg_mr);
+	if (cb->mw && !IS_ERR(cb->mw))
+		ib_dealloc_mw(cb->mw);
+	if (cb->rdma_mr && !IS_ERR(cb->rdma_mr))
 		ib_dereg_mr(cb->rdma_mr);
-err2:
-	contigfree(cb->rdma_buf, cb->size, M_DEVBUF);
-err1:
-	if (cb->use_dmamr)
+	if (cb->page_list && !IS_ERR(cb->page_list))
+		ib_free_fast_reg_page_list(cb->page_list);
+	if (cb->dma_mr && !IS_ERR(cb->dma_mr))
 		ib_dereg_mr(cb->dma_mr);
-	else {
+	if (cb->recv_mr && !IS_ERR(cb->recv_mr))
 		ib_dereg_mr(cb->recv_mr);
+	if (cb->send_mr && !IS_ERR(cb->send_mr))
 		ib_dereg_mr(cb->send_mr);
-	}
+	if (cb->rdma_buf)
+		kfree(cb->rdma_buf);
+	if (cb->start_buf)
+		kfree(cb->start_buf);
 	return ret;
 }
 
 static void krping_free_buffers(struct krping_cb *cb)
 {
-	DEBUG_LOG(PFX "krping_free_buffers called on cb %p\n", cb);
+	DEBUG_LOG(cb, "krping_free_buffers called on cb %p\n", cb);
 	
-#if 0
+	if (cb->dma_mr)
+		ib_dereg_mr(cb->dma_mr);
+	if (cb->send_mr)
+		ib_dereg_mr(cb->send_mr);
+	if (cb->recv_mr)
+		ib_dereg_mr(cb->recv_mr);
+	if (cb->rdma_mr)
+		ib_dereg_mr(cb->rdma_mr);
+	if (cb->start_mr)
+		ib_dereg_mr(cb->start_mr);
+	if (cb->fastreg_mr)
+		ib_dereg_mr(cb->fastreg_mr);
+	if (cb->mw)
+		ib_dealloc_mw(cb->mw);
+
 	dma_unmap_single(cb->pd->device->dma_device,
 			 pci_unmap_addr(cb, recv_mapping),
 			 sizeof(cb->recv_buf), DMA_BIDIRECTIONAL);
@@ -543,24 +749,12 @@ static void krping_free_buffers(struct krping_cb *cb)
 	dma_unmap_single(cb->pd->device->dma_device,
 			 pci_unmap_addr(cb, rdma_mapping),
 			 cb->size, DMA_BIDIRECTIONAL);
-#endif
-	contigfree(cb->rdma_buf, cb->size, M_DEVBUF);
-	if (!cb->server || cb->wlat || cb->rlat || cb->bw) {
-#if 0
+	kfree(cb->rdma_buf);
+	if (cb->start_buf) {
 		dma_unmap_single(cb->pd->device->dma_device,
 			 pci_unmap_addr(cb, start_mapping),
 			 cb->size, DMA_BIDIRECTIONAL);
-#endif
-		contigfree(cb->start_buf, cb->size, M_DEVBUF);
-	}
-	if (cb->use_dmamr)
-		ib_dereg_mr(cb->dma_mr);
-	else {
-		ib_dereg_mr(cb->send_mr);
-		ib_dereg_mr(cb->recv_mr);
-		ib_dereg_mr(cb->rdma_mr);
-		if (!cb->server)
-			ib_dereg_mr(cb->start_mr);
+		kfree(cb->start_buf);
 	}
 }
 
@@ -577,6 +771,7 @@ static int krping_create_qp(struct krping_cb *cb)
 	init_attr.qp_type = IB_QPT_RC;
 	init_attr.send_cq = cb->cq;
 	init_attr.recv_cq = cb->cq;
+	init_attr.sq_sig_type = IB_SIGNAL_REQ_WR;
 
 	if (cb->server) {
 		ret = rdma_create_qp(cb->child_cm_id, cb->pd, &init_attr);
@@ -603,36 +798,36 @@ static int krping_setup_qp(struct krping_cb *cb, struct rdma_cm_id *cm_id)
 	int ret;
 	cb->pd = ib_alloc_pd(cm_id->device);
 	if (IS_ERR(cb->pd)) {
-		log(LOG_ERR, "ib_alloc_pd failed\n");
+		PRINTF(cb, "ib_alloc_pd failed\n");
 		return PTR_ERR(cb->pd);
 	}
-	DEBUG_LOG(PFX "created pd %p\n", cb->pd);
+	DEBUG_LOG(cb, "created pd %p\n", cb->pd);
 
-	strlcpy(cb->name, cb->pd->device->name, sizeof(cb->name));
+	strlcpy(cb->stats.name, cb->pd->device->name, sizeof(cb->stats.name));
 
 	cb->cq = ib_create_cq(cm_id->device, krping_cq_event_handler, NULL,
 			      cb, cb->txdepth * 2, 0);
 	if (IS_ERR(cb->cq)) {
-		log(LOG_ERR, "ib_create_cq failed\n");
+		PRINTF(cb, "ib_create_cq failed\n");
 		ret = PTR_ERR(cb->cq);
 		goto err1;
 	}
-	DEBUG_LOG(PFX "created cq %p\n", cb->cq);
+	DEBUG_LOG(cb, "created cq %p\n", cb->cq);
 
-	if (!cb->wlat && !cb->rlat && !cb->bw) {
+	if (!cb->wlat && !cb->rlat && !cb->bw && !cb->frtest) {
 		ret = ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP);
 		if (ret) {
-			log(LOG_ERR, "ib_create_cq failed\n");
+			PRINTF(cb, "ib_create_cq failed\n");
 			goto err2;
 		}
 	}
 
 	ret = krping_create_qp(cb);
 	if (ret) {
-		log(LOG_ERR, "krping_create_qp failed: %d\n", ret);
+		PRINTF(cb, "krping_create_qp failed: %d\n", ret);
 		goto err2;
 	}
-	DEBUG_LOG(PFX "created qp %p\n", cb->qp);
+	DEBUG_LOG(cb, "created qp %p\n", cb->qp);
 	return 0;
 err2:
 	ib_destroy_cq(cb->cq);
@@ -641,115 +836,257 @@ err1:
 	return ret;
 }
 
-static void krping_format_send(struct krping_cb *cb, u64 buf, 
-			       struct ib_mr *mr)
+/*
+ * return the (possibly rebound) rkey for the rdma buffer.
+ * FASTREG mode: invalidate and rebind via fastreg wr.
+ * MW mode: rebind the MW.
+ * other modes: just return the mr rkey.
+ */
+static u32 krping_rdma_rkey(struct krping_cb *cb, u64 buf, int post_inv)
+{
+	u32 rkey = 0xffffffff;
+	u64 p;
+	struct ib_send_wr *bad_wr;
+	int i;
+	int ret;
+
+	switch (cb->mem) {
+	case FASTREG:
+		cb->invalidate_wr.ex.invalidate_rkey = cb->fastreg_mr->rkey;
+
+		/*
+		 * Update the fastreg key.
+		 */
+		ib_update_fast_reg_key(cb->fastreg_mr, ++cb->key);
+		cb->fastreg_wr.wr.fast_reg.rkey = cb->fastreg_mr->rkey;
+
+		/*
+		 * Update the fastreg WR with new buf info.
+		 */
+		if (buf == (u64)cb->start_dma_addr)
+			cb->fastreg_wr.wr.fast_reg.access_flags = IB_ACCESS_REMOTE_READ;
+		else
+			cb->fastreg_wr.wr.fast_reg.access_flags = IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE;
+		cb->fastreg_wr.wr.fast_reg.iova_start = buf;
+		p = (u64)(buf & PAGE_MASK);
+		for (i=0; i < cb->fastreg_wr.wr.fast_reg.page_list_len; 
+		     i++, p += PAGE_SIZE) {
+			cb->page_list->page_list[i] = p;
+			DEBUG_LOG(cb, "page_list[%d] 0x%llx\n", i, p);
+		}
+
+		DEBUG_LOG(cb, "post_inv = %d, fastreg new rkey 0x%x shift %u len %u"
+			" iova_start %llx page_list_len %u\n",
+			post_inv,
+			cb->fastreg_wr.wr.fast_reg.rkey,
+			cb->fastreg_wr.wr.fast_reg.page_shift,
+			cb->fastreg_wr.wr.fast_reg.length,
+			cb->fastreg_wr.wr.fast_reg.iova_start,
+			cb->fastreg_wr.wr.fast_reg.page_list_len);
+
+		if (post_inv)
+			ret = ib_post_send(cb->qp, &cb->invalidate_wr, &bad_wr);
+		else
+			ret = ib_post_send(cb->qp, &cb->fastreg_wr, &bad_wr);
+		if (ret) {
+			PRINTF(cb, "post send error %d\n", ret);
+			cb->state = ERROR;
+		}
+		rkey = cb->fastreg_mr->rkey;
+		break;
+	case MW:
+		/*
+		 * Update the MW with new buf info.
+		 */
+		if (buf == (u64)cb->start_dma_addr) {
+			cb->bind_attr.mw_access_flags = IB_ACCESS_REMOTE_READ;
+			cb->bind_attr.mr = cb->start_mr;
+		} else {
+			cb->bind_attr.mw_access_flags = IB_ACCESS_REMOTE_WRITE;
+			cb->bind_attr.mr = cb->rdma_mr;
+		}
+		cb->bind_attr.addr = buf;
+		DEBUG_LOG(cb, "binding mw rkey 0x%x to buf %llx mr rkey 0x%x\n",
+			cb->mw->rkey, buf, cb->bind_attr.mr->rkey);
+		ret = ib_bind_mw(cb->qp, cb->mw, &cb->bind_attr);
+		if (ret) {
+			PRINTF(cb, "bind mw error %d\n", ret);
+			cb->state = ERROR;
+		} else
+			rkey = cb->mw->rkey;
+		break;
+	case MR:
+		if (buf == (u64)cb->start_dma_addr)
+			rkey = cb->start_mr->rkey;
+		else
+			rkey = cb->rdma_mr->rkey;
+		break;
+	case DMA:
+		rkey = cb->dma_mr->rkey;
+		break;
+	default:
+		PRINTF(cb, "%s:%d case ERROR\n", __func__, __LINE__);
+		cb->state = ERROR;
+		break;
+	}
+	return rkey;
+}
+
+static void krping_format_send(struct krping_cb *cb, u64 buf)
 {
 	struct krping_rdma_info *info = &cb->send_buf;
+	u32 rkey;
 
-	info->buf = htonll(buf);
-	info->rkey = htonl(mr->rkey);
-	info->size = htonl(cb->size);
-
-	DEBUG_LOG(PFX "RDMA addr %llx rkey %x len %d\n",
-		  (unsigned long long)buf, mr->rkey, cb->size);
+	/*
+	 * Client side will do fastreg or mw bind before
+	 * advertising the rdma buffer.  Server side
+	 * sends have no data.
+	 */
+	if (!cb->server || cb->wlat || cb->rlat || cb->bw) {
+		rkey = krping_rdma_rkey(cb, buf, !cb->server_invalidate);
+		info->buf = htonll(buf);
+		info->rkey = htonl(rkey);
+		info->size = htonl(cb->size);
+		DEBUG_LOG(cb, "RDMA addr %llx rkey %x len %d\n",
+			  (unsigned long long)buf, rkey, cb->size);
+	}
 }
 
 static void krping_test_server(struct krping_cb *cb)
 {
-	struct ib_send_wr *bad_wr;
+	struct ib_send_wr *bad_wr, inv;
 	int ret;
 
 	while (1) {
 		/* Wait for client's Start STAG/TO/Len */
-		krping_wait(cb, RDMA_READ_ADV);
+		wait_event_interruptible(cb->sem, cb->state >= RDMA_READ_ADV);
 		if (cb->state != RDMA_READ_ADV) {
-			DEBUG_LOG(PFX "wait for RDMA_READ_ADV state %d\n",
+			PRINTF(cb, "wait for RDMA_READ_ADV state %d\n",
 				cb->state);
 			break;
 		}
 
-		DEBUG_LOG(PFX "server received sink adv\n");
+		DEBUG_LOG(cb, "server received sink adv\n");
 
-		/* Issue RDMA Read. */
-		cb->rdma_sq_wr.opcode = IB_WR_RDMA_READ;
 		cb->rdma_sq_wr.wr.rdma.rkey = cb->remote_rkey;
 		cb->rdma_sq_wr.wr.rdma.remote_addr = cb->remote_addr;
 		cb->rdma_sq_wr.sg_list->length = cb->remote_len;
+		cb->rdma_sgl.lkey = krping_rdma_rkey(cb, cb->rdma_dma_addr, 1);
+		cb->rdma_sq_wr.next = NULL;
+
+		/* Issue RDMA Read. */
+		if (cb->read_inv)
+			cb->rdma_sq_wr.opcode = IB_WR_RDMA_READ_WITH_INV;
+		else {
+
+			cb->rdma_sq_wr.opcode = IB_WR_RDMA_READ;
+			if (cb->mem == FASTREG) {
+				/* 
+				 * Immediately follow the read with a 
+				 * fenced LOCAL_INV.
+				 */
+				cb->rdma_sq_wr.next = &inv;
+				memset(&inv, 0, sizeof inv);
+				inv.opcode = IB_WR_LOCAL_INV;
+				inv.ex.invalidate_rkey = cb->fastreg_mr->rkey;
+				inv.send_flags = IB_SEND_FENCE;
+			}
+		}
 
 		ret = ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr);
 		if (ret) {
-			log(LOG_ERR, "post send error %d\n", ret);
+			PRINTF(cb, "post send error %d\n", ret);
 			break;
 		}
-		DEBUG_LOG(PFX "server posted rdma read req \n");
+		cb->rdma_sq_wr.next = NULL;
+
+		DEBUG_LOG(cb, "server posted rdma read req \n");
 
 		/* Wait for read completion */
-		krping_wait(cb, RDMA_READ_COMPLETE);
+		wait_event_interruptible(cb->sem, 
+					 cb->state >= RDMA_READ_COMPLETE);
 		if (cb->state != RDMA_READ_COMPLETE) {
-			log(LOG_ERR,  
+			PRINTF(cb, 
 			       "wait for RDMA_READ_COMPLETE state %d\n",
 			       cb->state);
 			break;
 		}
-		DEBUG_LOG(PFX "server received read complete\n");
+		DEBUG_LOG(cb, "server received read complete\n");
 
 		/* Display data in recv buf */
 		if (cb->verbose)
-			DEBUG_LOG("server ping data: %s\n", cb->rdma_buf);
+			PRINTF(cb, "server ping data: %s\n", 
+				cb->rdma_buf);
 
 		/* Tell client to continue */
+		if (cb->server && cb->server_invalidate) {
+			cb->sq_wr.ex.invalidate_rkey = cb->remote_rkey;
+			cb->sq_wr.opcode = IB_WR_SEND_WITH_INV;
+			DEBUG_LOG(cb, "send-w-inv rkey 0x%x\n", cb->remote_rkey);
+		} 
 		ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 		if (ret) {
-			log(LOG_ERR, "post send error %d\n", ret);
+			PRINTF(cb, "post send error %d\n", ret);
 			break;
 		}
-		DEBUG_LOG(PFX "server posted go ahead\n");
+		DEBUG_LOG(cb, "server posted go ahead\n");
 
 		/* Wait for client's RDMA STAG/TO/Len */
-		krping_wait(cb, RDMA_WRITE_ADV);
+		wait_event_interruptible(cb->sem, cb->state >= RDMA_WRITE_ADV);
 		if (cb->state != RDMA_WRITE_ADV) {
-			log(LOG_ERR,  
+			PRINTF(cb, 
 			       "wait for RDMA_WRITE_ADV state %d\n",
 			       cb->state);
 			break;
 		}
-		DEBUG_LOG(PFX "server received sink adv\n");
+		DEBUG_LOG(cb, "server received sink adv\n");
 
 		/* RDMA Write echo data */
 		cb->rdma_sq_wr.opcode = IB_WR_RDMA_WRITE;
 		cb->rdma_sq_wr.wr.rdma.rkey = cb->remote_rkey;
 		cb->rdma_sq_wr.wr.rdma.remote_addr = cb->remote_addr;
 		cb->rdma_sq_wr.sg_list->length = strlen(cb->rdma_buf) + 1;
-		DEBUG_LOG(PFX "rdma write from lkey %x laddr %llx len %d\n",
+		if (cb->local_dma_lkey)
+			cb->rdma_sgl.lkey = cb->qp->device->local_dma_lkey;
+		else 
+			cb->rdma_sgl.lkey = krping_rdma_rkey(cb, cb->rdma_dma_addr, 0);
+			
+		DEBUG_LOG(cb, "rdma write from lkey %x laddr %llx len %d\n",
 			  cb->rdma_sq_wr.sg_list->lkey,
 			  (unsigned long long)cb->rdma_sq_wr.sg_list->addr,
 			  cb->rdma_sq_wr.sg_list->length);
 
 		ret = ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr);
 		if (ret) {
-			log(LOG_ERR, "post send error %d\n", ret);
+			PRINTF(cb, "post send error %d\n", ret);
 			break;
 		}
 
 		/* Wait for completion */
-		krping_wait(cb, RDMA_WRITE_COMPLETE);
+		ret = wait_event_interruptible(cb->sem, cb->state >= 
+							 RDMA_WRITE_COMPLETE);
 		if (cb->state != RDMA_WRITE_COMPLETE) {
-			log(LOG_ERR,  
+			PRINTF(cb, 
 			       "wait for RDMA_WRITE_COMPLETE state %d\n",
 			       cb->state);
 			break;
 		}
-		DEBUG_LOG(PFX "server rdma write complete \n");
+		DEBUG_LOG(cb, "server rdma write complete \n");
 
 		cb->state = CONNECTED;
 
 		/* Tell client to begin again */
+		if (cb->server && cb->server_invalidate) {
+			cb->sq_wr.ex.invalidate_rkey = cb->remote_rkey;
+			cb->sq_wr.opcode = IB_WR_SEND_WITH_INV;
+			DEBUG_LOG(cb, "send-w-inv rkey 0x%x\n", cb->remote_rkey);
+		} 
 		ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 		if (ret) {
-			log(LOG_ERR, "post send error %d\n", ret);
+			PRINTF(cb, "post send error %d\n", ret);
 			break;
 		}
-		DEBUG_LOG(PFX "server posted go ahead\n");
+		DEBUG_LOG(cb, "server posted go ahead\n");
 	}
 }
 
@@ -770,16 +1107,16 @@ static void rlat_test(struct krping_cb *cb)
 	cb->rdma_sq_wr.sg_list->length = cb->size;
 
 	microtime(&start_tv);
- 	if (!cb->poll) {
- 		cb->state = RDMA_READ_ADV;
- 		ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP);
- 	}
+	if (!cb->poll) {
+		cb->state = RDMA_READ_ADV;
+		ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP);
+	}
 	while (scnt < iters) {
 
- 		cb->state = RDMA_READ_ADV;
+		cb->state = RDMA_READ_ADV;
 		ret = ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr);
 		if (ret) {
-			log(LOG_ERR,  
+			PRINTF(cb, 
 				"Couldn't post send: ret=%d scnt %d\n",
 				ret, scnt);
 			return;
@@ -787,30 +1124,33 @@ static void rlat_test(struct krping_cb *cb)
 
 		do {
 			if (!cb->poll) {
-				krping_wait(cb, RDMA_READ_COMPLETE);
+				wait_event_interruptible(cb->sem, 
+					cb->state != RDMA_READ_ADV);
 				if (cb->state == RDMA_READ_COMPLETE) {
 					ne = 1;
-					ib_req_notify_cq(cb->cq, IB_CQ_NEXT_COMP);
+					ib_req_notify_cq(cb->cq, 
+						IB_CQ_NEXT_COMP);
 				} else {
 					ne = -1;
 				}
 			} else
 				ne = ib_poll_cq(cb->cq, 1, &wc);
 			if (cb->state == ERROR) {
-				log(LOG_ERR, 
-				       "state == ERROR...bailing scnt %d\n", scnt);
+				PRINTF(cb, 
+					"state == ERROR...bailing scnt %d\n", 
+					scnt);
 				return;
 			}
 		} while (ne == 0);
 
 		if (ne < 0) {
-			log(LOG_ERR, "poll CQ failed %d\n", ne);
+			PRINTF(cb, "poll CQ failed %d\n", ne);
 			return;
 		}
- 		if (cb->poll && wc.status != IB_WC_SUCCESS) {
-			log(LOG_ERR, "Completion wth error at %s:\n",
+		if (cb->poll && wc.status != IB_WC_SUCCESS) {
+			PRINTF(cb, "Completion wth error at %s:\n",
 				cb->server ? "server" : "client");
-			log(LOG_ERR, "Failed status %d: wr_id %d\n",
+			PRINTF(cb, "Failed status %d: wr_id %d\n",
 				wc.status, (int) wc.wr_id);
 			return;
 		}
@@ -823,75 +1163,18 @@ static void rlat_test(struct krping_cb *cb)
                 stop_tv.tv_sec  -= 1;
         }
 
-	log(LOG_ERR, "delta sec %zu delta usec %lu iter %d size %d\n",
+	PRINTF(cb, "delta sec %lu delta usec %lu iter %d size %d\n",
 		stop_tv.tv_sec - start_tv.tv_sec, 
 		stop_tv.tv_usec - start_tv.tv_usec,
 		scnt, cb->size);
 }
 
-static int alloc_cycle_mem(int cycle_iters,
-				cycles_t **post_cycles_start,
-				cycles_t **post_cycles_stop,
-				cycles_t **poll_cycles_start,
-				cycles_t **poll_cycles_stop,
-				cycles_t **last_poll_cycles_start)
-{
-	*post_cycles_start = malloc(cycle_iters * sizeof(cycles_t), M_DEVBUF, M_WAITOK);
-	if (!*post_cycles_start) {
-		goto fail1;
-	}
-	*post_cycles_stop = malloc(cycle_iters * sizeof(cycles_t), M_DEVBUF, M_WAITOK);
-	if (!*post_cycles_stop) {
-		goto fail2;
-	}
-	*poll_cycles_start = malloc(cycle_iters * sizeof(cycles_t), M_DEVBUF, M_WAITOK);
-	if (!*poll_cycles_start) {
-		goto fail3;
-	}
-	*poll_cycles_stop = malloc(cycle_iters * sizeof(cycles_t), M_DEVBUF, M_WAITOK);
-	if (!*poll_cycles_stop) {
-		goto fail4;
-	}
-	*last_poll_cycles_start = malloc(cycle_iters * sizeof(cycles_t), M_DEVBUF, M_WAITOK);
-	if (!*last_poll_cycles_start) {
-		goto fail5;
-	}
-	return 0;
-fail5:
-	free(*poll_cycles_stop, M_DEVBUF);
-fail4:
-	free(*poll_cycles_start, M_DEVBUF);
-fail3:
-	free(*post_cycles_stop, M_DEVBUF);
-fail2:
-	free(*post_cycles_start, M_DEVBUF);
-fail1:
-	log(LOG_ERR, "%s malloc failed\n", __FUNCTION__);
-	return ENOMEM;
-}
-
-static void free_cycle_mem(cycles_t *post_cycles_start,
-				cycles_t *post_cycles_stop,
-				cycles_t *poll_cycles_start,
-				cycles_t *poll_cycles_stop,
-				cycles_t *last_poll_cycles_start)
-{
-	free(last_poll_cycles_start, M_DEVBUF);
-	free(poll_cycles_stop, M_DEVBUF);
-	free(poll_cycles_start, M_DEVBUF);
-	free(post_cycles_stop, M_DEVBUF);
-	free(post_cycles_start, M_DEVBUF);
-}
-
 static void wlat_test(struct krping_cb *cb)
 {
 	int ccnt, scnt, rcnt;
 	int iters=cb->count;
 	volatile char *poll_buf = (char *) cb->start_buf;
 	char *buf = (char *)cb->rdma_buf;
-	ccnt = 0;
-	scnt = 0;
-	rcnt = 0;
 	struct timeval start_tv, stop_tv;
 	cycles_t *post_cycles_start, *post_cycles_stop;
 	cycles_t *poll_cycles_start, *poll_cycles_stop;
@@ -899,16 +1182,37 @@ static void wlat_test(struct krping_cb *cb)
 	cycles_t sum_poll = 0, sum_post = 0, sum_last_poll = 0;
 	int i;
 	int cycle_iters = 1000;
-	int err;
 
-	err = alloc_cycle_mem(cycle_iters, &post_cycles_start, &post_cycles_stop,
-				&poll_cycles_start, &poll_cycles_stop, &last_poll_cycles_start);
-			  
-	if (err) {
-		log(LOG_ERR, "%s malloc failed\n", __FUNCTION__);
+	ccnt = 0;
+	scnt = 0;
+	rcnt = 0;
+
+	post_cycles_start = kmalloc(cycle_iters * sizeof(cycles_t), GFP_KERNEL);
+	if (!post_cycles_start) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
+		return;
+	}
+	post_cycles_stop = kmalloc(cycle_iters * sizeof(cycles_t), GFP_KERNEL);
+	if (!post_cycles_stop) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
+		return;
+	}
+	poll_cycles_start = kmalloc(cycle_iters * sizeof(cycles_t), GFP_KERNEL);
+	if (!poll_cycles_start) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
+		return;
+	}
+	poll_cycles_stop = kmalloc(cycle_iters * sizeof(cycles_t), GFP_KERNEL);
+	if (!poll_cycles_stop) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
+		return;
+	}
+	last_poll_cycles_start = kmalloc(cycle_iters * sizeof(cycles_t), 
+		GFP_KERNEL);
+	if (!last_poll_cycles_start) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
 		return;
 	}
-
 	cb->rdma_sq_wr.opcode = IB_WR_RDMA_WRITE;
 	cb->rdma_sq_wr.wr.rdma.rkey = cb->remote_rkey;
 	cb->rdma_sq_wr.wr.rdma.remote_addr = cb->remote_addr;
@@ -924,7 +1228,8 @@ static void wlat_test(struct krping_cb *cb)
 			++rcnt;
 			while (*poll_buf != (char)rcnt) {
 				if (cb->state == ERROR) {
-					log(LOG_ERR, "state = ERROR, bailing\n");
+					PRINTF(cb, 
+						"state = ERROR, bailing\n");
 					return;
 				}
 			}
@@ -937,7 +1242,8 @@ static void wlat_test(struct krping_cb *cb)
 			if (scnt < cycle_iters)
 				post_cycles_start[scnt] = get_cycles();
 			if (ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr)) {
-				log(LOG_ERR,  "Couldn't post send: scnt=%d\n",
+				PRINTF(cb, 
+					"Couldn't post send: scnt=%d\n",
 					scnt);
 				return;
 			}
@@ -954,7 +1260,8 @@ static void wlat_test(struct krping_cb *cb)
 				poll_cycles_start[ccnt] = get_cycles();
 			do {
 				if (ccnt < cycle_iters)
-					last_poll_cycles_start[ccnt] = get_cycles();
+					last_poll_cycles_start[ccnt] = 
+						get_cycles();
 				ne = ib_poll_cq(cb->cq, 1, &wc);
 			} while (ne == 0);
 			if (ccnt < cycle_iters)
@@ -962,15 +1269,18 @@ static void wlat_test(struct krping_cb *cb)
 			++ccnt;
 
 			if (ne < 0) {
-				log(LOG_ERR, "poll CQ failed %d\n", ne);
+				PRINTF(cb, "poll CQ failed %d\n", ne);
 				return;
 			}
 			if (wc.status != IB_WC_SUCCESS) {
-				log(LOG_ERR, "Completion wth error at %s:\n",
+				PRINTF(cb, 
+					"Completion wth error at %s:\n",
 					cb->server ? "server" : "client");
-				log(LOG_ERR, "Failed status %d: wr_id %d\n",
+				PRINTF(cb, 
+					"Failed status %d: wr_id %d\n",
 					wc.status, (int) wc.wr_id);
-				log(LOG_ERR, "scnt=%d, rcnt=%d, ccnt=%d\n",
+				PRINTF(cb, 
+					"scnt=%d, rcnt=%d, ccnt=%d\n",
 					scnt, rcnt, ccnt);
 				return;
 			}
@@ -986,27 +1296,27 @@ static void wlat_test(struct krping_cb *cb)
 	for (i=0; i < cycle_iters; i++) {
 		sum_post += post_cycles_stop[i] - post_cycles_start[i];
 		sum_poll += poll_cycles_stop[i] - poll_cycles_start[i];
-		sum_last_poll += poll_cycles_stop[i] - last_poll_cycles_start[i];
+		sum_last_poll += poll_cycles_stop[i]-last_poll_cycles_start[i];
 	}
-
-	log(LOG_ERR, "delta sec %zu delta usec %lu iter %d size %d cycle_iters %d sum_post %llu sum_poll %llu sum_last_poll %llu\n",
+	PRINTF(cb, 
+		"delta sec %lu delta usec %lu iter %d size %d cycle_iters %d"
+		" sum_post %llu sum_poll %llu sum_last_poll %llu\n",
 		stop_tv.tv_sec - start_tv.tv_sec, 
 		stop_tv.tv_usec - start_tv.tv_usec,
 		scnt, cb->size, cycle_iters, 
 		(unsigned long long)sum_post, (unsigned long long)sum_poll, 
 		(unsigned long long)sum_last_poll);
-
-	free_cycle_mem(post_cycles_start, post_cycles_stop, poll_cycles_start, 
-			poll_cycles_stop, last_poll_cycles_start);
+	kfree(post_cycles_start);
+	kfree(post_cycles_stop);
+	kfree(poll_cycles_start);
+	kfree(poll_cycles_stop);
+	kfree(last_poll_cycles_start);
 }
 
 static void bw_test(struct krping_cb *cb)
 {
 	int ccnt, scnt, rcnt;
 	int iters=cb->count;
-	ccnt = 0;
-	scnt = 0;
-	rcnt = 0;
 	struct timeval start_tv, stop_tv;
 	cycles_t *post_cycles_start, *post_cycles_stop;
 	cycles_t *poll_cycles_start, *poll_cycles_stop;
@@ -1014,16 +1324,37 @@ static void bw_test(struct krping_cb *cb)
 	cycles_t sum_poll = 0, sum_post = 0, sum_last_poll = 0;
 	int i;
 	int cycle_iters = 1000;
-	int err;
 
-	err = alloc_cycle_mem(cycle_iters, &post_cycles_start, &post_cycles_stop,
-				&poll_cycles_start, &poll_cycles_stop, &last_poll_cycles_start);
-			  
-	if (err) {
-		log(LOG_ERR, "%s kmalloc failed\n", __FUNCTION__);
+	ccnt = 0;
+	scnt = 0;
+	rcnt = 0;
+
+	post_cycles_start = kmalloc(cycle_iters * sizeof(cycles_t), GFP_KERNEL);
+	if (!post_cycles_start) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
+		return;
+	}
+	post_cycles_stop = kmalloc(cycle_iters * sizeof(cycles_t), GFP_KERNEL);
+	if (!post_cycles_stop) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
+		return;
+	}
+	poll_cycles_start = kmalloc(cycle_iters * sizeof(cycles_t), GFP_KERNEL);
+	if (!poll_cycles_start) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
+		return;
+	}
+	poll_cycles_stop = kmalloc(cycle_iters * sizeof(cycles_t), GFP_KERNEL);
+	if (!poll_cycles_stop) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
+		return;
+	}
+	last_poll_cycles_start = kmalloc(cycle_iters * sizeof(cycles_t), 
+		GFP_KERNEL);
+	if (!last_poll_cycles_start) {
+		PRINTF(cb, "%s kmalloc failed\n", __FUNCTION__);
 		return;
 	}
-
 	cb->rdma_sq_wr.opcode = IB_WR_RDMA_WRITE;
 	cb->rdma_sq_wr.wr.rdma.rkey = cb->remote_rkey;
 	cb->rdma_sq_wr.wr.rdma.remote_addr = cb->remote_addr;
@@ -1040,7 +1371,8 @@ static void bw_test(struct krping_cb *cb)
 			if (scnt < cycle_iters)
 				post_cycles_start[scnt] = get_cycles();
 			if (ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr)) {
-				log(LOG_ERR,  "Couldn't post send: scnt=%d\n",
+				PRINTF(cb, 
+					"Couldn't post send: scnt=%d\n",
 					scnt);
 				return;
 			}
@@ -1057,7 +1389,8 @@ static void bw_test(struct krping_cb *cb)
 				poll_cycles_start[ccnt] = get_cycles();
 			do {
 				if (ccnt < cycle_iters)
-					last_poll_cycles_start[ccnt] = get_cycles();
+					last_poll_cycles_start[ccnt] = 
+						get_cycles();
 				ne = ib_poll_cq(cb->cq, 1, &wc);
 			} while (ne == 0);
 			if (ccnt < cycle_iters)
@@ -1065,13 +1398,15 @@ static void bw_test(struct krping_cb *cb)
 			ccnt += 1;
 
 			if (ne < 0) {
-				log(LOG_ERR, "poll CQ failed %d\n", ne);
+				PRINTF(cb, "poll CQ failed %d\n", ne);
 				return;
 			}
 			if (wc.status != IB_WC_SUCCESS) {
-				log(LOG_ERR, "Completion wth error at %s:\n",
+				PRINTF(cb, 
+					"Completion wth error at %s:\n",
 					cb->server ? "server" : "client");
-				log(LOG_ERR, "Failed status %d: wr_id %d\n",
+				PRINTF(cb, 
+					"Failed status %d: wr_id %d\n",
 					wc.status, (int) wc.wr_id);
 				return;
 			}
@@ -1087,18 +1422,21 @@ static void bw_test(struct krping_cb *cb)
 	for (i=0; i < cycle_iters; i++) {
 		sum_post += post_cycles_stop[i] - post_cycles_start[i];
 		sum_poll += poll_cycles_stop[i] - poll_cycles_start[i];
-		sum_last_poll += poll_cycles_stop[i] - last_poll_cycles_start[i];
+		sum_last_poll += poll_cycles_stop[i]-last_poll_cycles_start[i];
 	}
-
-	log(LOG_ERR, "delta sec %zu delta usec %lu iter %d size %d cycle_iters %d sum_post %llu sum_poll %llu sum_last_poll %llu\n",
+	PRINTF(cb, 
+		"delta sec %lu delta usec %lu iter %d size %d cycle_iters %d"
+		" sum_post %llu sum_poll %llu sum_last_poll %llu\n",
 		stop_tv.tv_sec - start_tv.tv_sec, 
 		stop_tv.tv_usec - start_tv.tv_usec,
 		scnt, cb->size, cycle_iters, 
 		(unsigned long long)sum_post, (unsigned long long)sum_poll, 
 		(unsigned long long)sum_last_poll);
-
-	free_cycle_mem(post_cycles_start, post_cycles_stop, poll_cycles_start, 
-			poll_cycles_stop, last_poll_cycles_start);
+	kfree(post_cycles_start);
+	kfree(post_cycles_stop);
+	kfree(poll_cycles_start);
+	kfree(poll_cycles_stop);
+	kfree(last_poll_cycles_start);
 }
 
 static void krping_rlat_test_server(struct krping_cb *cb)
@@ -1113,28 +1451,25 @@ static void krping_rlat_test_server(struct krping_cb *cb)
 	}
 
 	/* Send STAG/TO/Len to client */
-	if (cb->dma_mr)
-		krping_format_send(cb, cb->start_addr, cb->dma_mr);
-	else
-		krping_format_send(cb, cb->start_addr, cb->start_mr);
+	krping_format_send(cb, cb->start_dma_addr);
 	ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 	if (ret) {
-		log(LOG_ERR, "post send error %d\n", ret);
+		PRINTF(cb, "post send error %d\n", ret);
 		return;
 	}
 
 	/* Spin waiting for send completion */
 	while ((ret = ib_poll_cq(cb->cq, 1, &wc) == 0));
 	if (ret < 0) {
-		log(LOG_ERR, "poll error %d\n", ret);
+		PRINTF(cb, "poll error %d\n", ret);
 		return;
 	}
 	if (wc.status) {
-		log(LOG_ERR, "send completiong error %d\n", wc.status);
+		PRINTF(cb, "send completiong error %d\n", wc.status);
 		return;
 	}
 
-	krping_wait(cb, ERROR);
+	wait_event_interruptible(cb->sem, cb->state == ERROR);
 }
 
 static void krping_wlat_test_server(struct krping_cb *cb)
@@ -1149,29 +1484,26 @@ static void krping_wlat_test_server(struct krping_cb *cb)
 	}
 
 	/* Send STAG/TO/Len to client */
-	if (cb->dma_mr)
-		krping_format_send(cb, cb->start_addr, cb->dma_mr);
-	else
-		krping_format_send(cb, cb->start_addr, cb->start_mr);
+	krping_format_send(cb, cb->start_dma_addr);
 	ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 	if (ret) {
-		log(LOG_ERR, "post send error %d\n", ret);
+		PRINTF(cb, "post send error %d\n", ret);
 		return;
 	}
 
 	/* Spin waiting for send completion */
 	while ((ret = ib_poll_cq(cb->cq, 1, &wc) == 0));
 	if (ret < 0) {
-		log(LOG_ERR, "poll error %d\n", ret);
+		PRINTF(cb, "poll error %d\n", ret);
 		return;
 	}
 	if (wc.status) {
-		log(LOG_ERR, "send completiong error %d\n", wc.status);
+		PRINTF(cb, "send completiong error %d\n", wc.status);
 		return;
 	}
 
 	wlat_test(cb);
-	krping_wait(cb, ERROR);
+	wait_event_interruptible(cb->sem, cb->state == ERROR);
 }
 
 static void krping_bw_test_server(struct krping_cb *cb)
@@ -1186,30 +1518,48 @@ static void krping_bw_test_server(struct krping_cb *cb)
 	}
 
 	/* Send STAG/TO/Len to client */
-	if (cb->dma_mr)
-		krping_format_send(cb, cb->start_addr, cb->dma_mr);
-	else
-		krping_format_send(cb, cb->start_addr, cb->start_mr);
+	krping_format_send(cb, cb->start_dma_addr);
 	ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 	if (ret) {
-		log(LOG_ERR, "post send error %d\n", ret);
+		PRINTF(cb, "post send error %d\n", ret);
 		return;
 	}
 
 	/* Spin waiting for send completion */
 	while ((ret = ib_poll_cq(cb->cq, 1, &wc) == 0));
 	if (ret < 0) {
-		log(LOG_ERR, "poll error %d\n", ret);
+		PRINTF(cb, "poll error %d\n", ret);
 		return;
 	}
 	if (wc.status) {
-		log(LOG_ERR, "send completiong error %d\n", wc.status);
+		PRINTF(cb, "send completiong error %d\n", wc.status);
 		return;
 	}
 
 	if (cb->duplex)
 		bw_test(cb);
-	krping_wait(cb, ERROR);
+	wait_event_interruptible(cb->sem, cb->state == ERROR);
+}
+
+static int fastreg_supported(struct krping_cb *cb)
+{
+	struct ib_device *dev = cb->child_cm_id->device;
+	struct ib_device_attr attr;
+	int ret;
+
+	ret = ib_query_device(dev, &attr);
+	if (ret) {
+		PRINTF(cb, "ib_query_device failed ret %d\n", ret);
+		return 0;
+	}
+	if (!(attr.device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS)) {
+		PRINTF(cb, "Fastreg not supported - device_cap_flags 0x%x\n",
+		    attr.device_cap_flags);
+		return 0;
+	}
+	DEBUG_LOG(cb, "Fastreg supported - device_cap_flags 0x%x\n",
+		attr.device_cap_flags);
+	return 1;
 }
 
 static int krping_bind_server(struct krping_cb *cb)
@@ -1225,25 +1575,28 @@ static int krping_bind_server(struct krping_cb *cb)
 
 	ret = rdma_bind_addr(cb->cm_id, (struct sockaddr *) &sin);
 	if (ret) {
-		log(LOG_ERR, "rdma_bind_addr error %d\n", ret);
+		PRINTF(cb, "rdma_bind_addr error %d\n", ret);
 		return ret;
 	}
-	DEBUG_LOG(PFX "rdma_bind_addr successful\n");
+	DEBUG_LOG(cb, "rdma_bind_addr successful\n");
 
-	DEBUG_LOG(PFX "rdma_listen\n");
+	DEBUG_LOG(cb, "rdma_listen\n");
 	ret = rdma_listen(cb->cm_id, 3);
 	if (ret) {
-		log(LOG_ERR, "rdma_listen failed: %d\n", ret);
+		PRINTF(cb, "rdma_listen failed: %d\n", ret);
 		return ret;
 	}
 
-	krping_wait(cb, CONNECT_REQUEST);
+	wait_event_interruptible(cb->sem, cb->state >= CONNECT_REQUEST);
 	if (cb->state != CONNECT_REQUEST) {
-		log(LOG_ERR,  "wait for CONNECT_REQUEST state %d\n",
+		PRINTF(cb, "wait for CONNECT_REQUEST state %d\n",
 			cb->state);
 		return -1;
 	}
 
+	if (cb->mem == FASTREG && !fastreg_supported(cb))
+		return -EINVAL;
+
 	return 0;
 }
 
@@ -1258,25 +1611,25 @@ static void krping_run_server(struct krping_cb *cb)
 
 	ret = krping_setup_qp(cb, cb->child_cm_id);
 	if (ret) {
-		log(LOG_ERR, "setup_qp failed: %d\n", ret);
-		return;
+		PRINTF(cb, "setup_qp failed: %d\n", ret);
+		goto err0;
 	}
 
 	ret = krping_setup_buffers(cb);
 	if (ret) {
-		log(LOG_ERR, "krping_setup_buffers failed: %d\n", ret);
+		PRINTF(cb, "krping_setup_buffers failed: %d\n", ret);
 		goto err1;
 	}
 
 	ret = ib_post_recv(cb->qp, &cb->rq_wr, &bad_wr);
 	if (ret) {
-		log(LOG_ERR, "ib_post_recv failed: %d\n", ret);
+		PRINTF(cb, "ib_post_recv failed: %d\n", ret);
 		goto err2;
 	}
 
 	ret = krping_accept(cb);
 	if (ret) {
-		log(LOG_ERR, "connect error %d\n", ret);
+		PRINTF(cb, "connect error %d\n", ret);
 		goto err2;
 	}
 
@@ -1288,13 +1641,13 @@ static void krping_run_server(struct krping_cb *cb)
 		krping_bw_test_server(cb);
 	else
 		krping_test_server(cb);
-
 	rdma_disconnect(cb->child_cm_id);
-	rdma_destroy_id(cb->child_cm_id);
 err2:
 	krping_free_buffers(cb);
 err1:
 	krping_free_qp(cb);
+err0:
+	rdma_destroy_id(cb->child_cm_id);
 }
 
 static void krping_test_client(struct krping_cb *cb)
@@ -1320,41 +1673,38 @@ static void krping_test_client(struct krping_cb *cb)
 			start = 65;
 		cb->start_buf[cb->size - 1] = 0;
 
-		if (cb->dma_mr)
-			krping_format_send(cb, cb->start_addr, cb->dma_mr);
-		else
-			krping_format_send(cb, cb->start_addr, cb->start_mr);
-
+		krping_format_send(cb, cb->start_dma_addr);
+		if (cb->state == ERROR) {
+			PRINTF(cb, "krping_format_send failed\n");
+			break;
+		}
 		ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 		if (ret) {
-			log(LOG_ERR, "post send error %d\n", ret);
+			PRINTF(cb, "post send error %d\n", ret);
 			break;
 		}
 
 		/* Wait for server to ACK */
-		krping_wait(cb, RDMA_WRITE_ADV);
+		wait_event_interruptible(cb->sem, cb->state >= RDMA_WRITE_ADV);
 		if (cb->state != RDMA_WRITE_ADV) {
-			log(LOG_ERR,  
+			PRINTF(cb, 
 			       "wait for RDMA_WRITE_ADV state %d\n",
 			       cb->state);
 			break;
 		}
 
-		if (cb->dma_mr)
-			krping_format_send(cb, cb->rdma_addr, cb->dma_mr);
-		else
-			krping_format_send(cb, cb->rdma_addr, cb->rdma_mr);
-
+		krping_format_send(cb, cb->rdma_dma_addr);
 		ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 		if (ret) {
-			log(LOG_ERR, "post send error %d\n", ret);
+			PRINTF(cb, "post send error %d\n", ret);
 			break;
 		}
 
 		/* Wait for the server to say the RDMA Write is complete. */
-		krping_wait(cb, RDMA_WRITE_COMPLETE);
+		wait_event_interruptible(cb->sem, 
+					 cb->state >= RDMA_WRITE_COMPLETE);
 		if (cb->state != RDMA_WRITE_COMPLETE) {
-			log(LOG_ERR,  
+			PRINTF(cb, 
 			       "wait for RDMA_WRITE_COMPLETE state %d\n",
 			       cb->state);
 			break;
@@ -1362,12 +1712,15 @@ static void krping_test_client(struct krping_cb *cb)
 
 		if (cb->validate)
 			if (memcmp(cb->start_buf, cb->rdma_buf, cb->size)) {
-				log(LOG_ERR, "data mismatch!\n");
+				PRINTF(cb, "data mismatch!\n");
 				break;
 			}
 
 		if (cb->verbose)
-			DEBUG_LOG("ping data: %s\n", cb->rdma_buf);
+			PRINTF(cb, "ping data: %s\n", cb->rdma_buf);
+#ifdef SLOW_KRPING
+		wait_event_interruptible_timeout(cb->sem, cb->state == ERROR, HZ);
+#endif
 	}
 }
 
@@ -1380,24 +1733,25 @@ static void krping_rlat_test_client(struct krping_cb *cb)
 	cb->state = RDMA_READ_ADV;
 
 	/* Send STAG/TO/Len to client */
-	if (cb->dma_mr)
-		krping_format_send(cb, cb->start_addr, cb->dma_mr);
-	else
-		krping_format_send(cb, cb->start_addr, cb->rdma_mr);
+	krping_format_send(cb, cb->start_dma_addr);
+	if (cb->state == ERROR) {
+		PRINTF(cb, "krping_format_send failed\n");
+		return;
+	}
 	ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 	if (ret) {
-		log(LOG_ERR, "post send error %d\n", ret);
+		PRINTF(cb, "post send error %d\n", ret);
 		return;
 	}
 
 	/* Spin waiting for send completion */
 	while ((ret = ib_poll_cq(cb->cq, 1, &wc) == 0));
 	if (ret < 0) {
-		log(LOG_ERR, "poll error %d\n", ret);
+		PRINTF(cb, "poll error %d\n", ret);
 		return;
 	}
 	if (wc.status) {
-		log(LOG_ERR, "send completion error %d\n", wc.status);
+		PRINTF(cb, "send completion error %d\n", wc.status);
 		return;
 	}
 
@@ -1426,20 +1780,20 @@ static void krping_rlat_test_client(struct krping_cb *cb)
 	microtime(&start);
 	for (i=0; i < 100000; i++) {
 		if (ib_post_send(cb->qp, &cb->rdma_sq_wr, &bad_wr)) {
-			log(LOG_ERR,  "Couldn't post send\n");
+			PRINTF(cb, "Couldn't post send\n");
 			return;
 		}
 		do {
 			ne = ib_poll_cq(cb->cq, 1, &wc);
 		} while (ne == 0);
 		if (ne < 0) {
-			log(LOG_ERR, "poll CQ failed %d\n", ne);
+			PRINTF(cb, "poll CQ failed %d\n", ne);
 			return;
 		}
 		if (wc.status != IB_WC_SUCCESS) {
-			log(LOG_ERR, "Completion wth error at %s:\n",
+			PRINTF(cb, "Completion wth error at %s:\n",
 				cb->server ? "server" : "client");
-			log(LOG_ERR, "Failed status %d: wr_id %d\n",
+			PRINTF(cb, "Failed status %d: wr_id %d\n",
 				wc.status, (int) wc.wr_id);
 			return;
 		}
@@ -1453,7 +1807,7 @@ static void krping_rlat_test_client(struct krping_cb *cb)
 	sec     = stop.tv_sec - start.tv_sec;
 	usec    = stop.tv_usec - start.tv_usec;
 	elapsed = sec * 1000000 + usec;
-	log(LOG_ERR, "0B-write-lat iters 100000 usec %llu\n", elapsed);
+	PRINTF(cb, "0B-write-lat iters 100000 usec %llu\n", elapsed);
 }
 #endif
 
@@ -1469,24 +1823,25 @@ static void krping_wlat_test_client(struct krping_cb *cb)
 	cb->state = RDMA_READ_ADV;
 
 	/* Send STAG/TO/Len to client */
-	if (cb->dma_mr)
-		krping_format_send(cb, cb->start_addr, cb->dma_mr);
-	else
-		krping_format_send(cb, cb->start_addr, cb->start_mr);
+	krping_format_send(cb, cb->start_dma_addr);
+	if (cb->state == ERROR) {
+		PRINTF(cb, "krping_format_send failed\n");
+		return;
+	}
 	ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 	if (ret) {
-		log(LOG_ERR, "post send error %d\n", ret);
+		PRINTF(cb, "post send error %d\n", ret);
 		return;
 	}
 
 	/* Spin waiting for send completion */
 	while ((ret = ib_poll_cq(cb->cq, 1, &wc) == 0));
 	if (ret < 0) {
-		log(LOG_ERR, "poll error %d\n", ret);
+		PRINTF(cb, "poll error %d\n", ret);
 		return;
 	}
 	if (wc.status) {
-		log(LOG_ERR, "send completion error %d\n", wc.status);
+		PRINTF(cb, "send completion error %d\n", wc.status);
 		return;
 	}
 
@@ -1507,24 +1862,25 @@ static void krping_bw_test_client(struct krping_cb *cb)
 	cb->state = RDMA_READ_ADV;
 
 	/* Send STAG/TO/Len to client */
-	if (cb->dma_mr)
-		krping_format_send(cb, cb->start_addr, cb->dma_mr);
-	else
-		krping_format_send(cb, cb->start_addr, cb->start_mr);
+	krping_format_send(cb, cb->start_dma_addr);
+	if (cb->state == ERROR) {
+		PRINTF(cb, "krping_format_send failed\n");
+		return;
+	}
 	ret = ib_post_send(cb->qp, &cb->sq_wr, &bad_wr);
 	if (ret) {
-		log(LOG_ERR, "post send error %d\n", ret);
+		PRINTF(cb, "post send error %d\n", ret);
 		return;
 	}
 
 	/* Spin waiting for send completion */
 	while ((ret = ib_poll_cq(cb->cq, 1, &wc) == 0));
 	if (ret < 0) {
-		log(LOG_ERR, "poll error %d\n", ret);
+		PRINTF(cb, "poll error %d\n", ret);
 		return;
 	}
 	if (wc.status) {
-		log(LOG_ERR, "send completion error %d\n", wc.status);
+		PRINTF(cb, "send completion error %d\n", wc.status);
 		return;
 	}
 
@@ -1536,6 +1892,121 @@ static void krping_bw_test_client(struct krping_cb *cb)
 	bw_test(cb);
 }
 
+static void krping_fr_test(struct krping_cb *cb)
+{
+	struct ib_fast_reg_page_list *pl;
+	struct ib_send_wr fr, inv, *bad;
+	struct ib_wc wc;
+	u8 key = 0;
+	struct ib_mr *mr;
+	int i;
+	int ret;
+	int size = cb->size;
+	int plen = (((size - 1) & PAGE_MASK) + PAGE_SIZE) >> PAGE_SHIFT;
+	time_t start;
+	int count = 0;
+	int scnt = 0;
+
+	pl = ib_alloc_fast_reg_page_list(cb->qp->device, plen);
+	if (IS_ERR(pl)) {
+		PRINTF(cb, "ib_alloc_fast_reg_page_list failed %ld\n", PTR_ERR(pl));
+		return;
+	}
+	
+	mr = ib_alloc_fast_reg_mr(cb->pd, plen);
+	if (IS_ERR(mr)) {
+		PRINTF(cb, "ib_alloc_fast_reg_mr failed %ld\n", PTR_ERR(pl));
+		goto err1;
+	}
+
+	for (i=0; i<plen; i++)
+		pl->page_list[i] = 0xcafebabe | i;
+	
+	memset(&fr, 0, sizeof fr);
+	fr.opcode = IB_WR_FAST_REG_MR;
+	fr.wr.fast_reg.page_shift = PAGE_SHIFT;
+	fr.wr.fast_reg.length = size;
+	fr.wr.fast_reg.page_list = pl;
+	fr.wr.fast_reg.page_list_len = plen;
+	fr.wr.fast_reg.iova_start = 0;
+	fr.wr.fast_reg.access_flags = IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE;
+	fr.next = &inv;
+	memset(&inv, 0, sizeof inv);
+	inv.opcode = IB_WR_LOCAL_INV;
+	inv.send_flags = IB_SEND_SIGNALED;
+	
+	DEBUG_LOG(cb, "fr_test: stag index 0x%x plen %u size %u depth %u\n", mr->rkey >> 8, plen, cb->size, cb->txdepth);
+	start = time_uptime;
+	while (1) {
+		if ((time_uptime - start) >= 9) {
+			DEBUG_LOG(cb, "fr_test: pausing 1 second! count %u latest size %u plen %u\n", count, size, plen);
+			wait_event_interruptible(cb->sem, cb->state == ERROR);
+			if (cb->state == ERROR)
+				break;
+			start = time_uptime;
+		}	
+		while (scnt < (cb->txdepth>>1)) {
+			ib_update_fast_reg_key(mr, ++key);
+			fr.wr.fast_reg.rkey = mr->rkey;
+			inv.ex.invalidate_rkey = mr->rkey;
+			size = arc4random() % cb->size;
+			if (size == 0)
+				size = cb->size;
+			plen = (((size - 1) & PAGE_MASK) + PAGE_SIZE) >> PAGE_SHIFT;
+			fr.wr.fast_reg.length = size;
+			fr.wr.fast_reg.page_list_len = plen;
+			ret = ib_post_send(cb->qp, &fr, &bad);
+			if (ret) {
+				PRINTF(cb, "ib_post_send failed %d\n", ret);
+				goto err2;	
+			}
+			scnt++;
+		}
+
+		do {
+			ret = ib_poll_cq(cb->cq, 1, &wc);
+			if (ret < 0) {
+				PRINTF(cb, "ib_poll_cq failed %d\n", ret);
+				goto err2;	
+			}
+			if (ret == 1) {
+				if (wc.status) {
+					PRINTF(cb, "completion error %u\n", wc.status);
+					goto err2;
+				}
+				count++;
+				scnt--;
+			}
+			else if (krping_sigpending()) {
+				PRINTF(cb, "signal!\n");
+				goto err2;
+			}
+		} while (ret == 1);
+	}
+err2:
+#if 0
+	DEBUG_LOG(cb, "sleeping 1 second\n");
+	wait_event_interruptible_timeout(cb->sem, cb->state == ERROR, HZ);
+#endif
+	DEBUG_LOG(cb, "draining the cq...\n");
+	do {
+		ret = ib_poll_cq(cb->cq, 1, &wc);
+		if (ret < 0) {
+			PRINTF(cb, "ib_poll_cq failed %d\n", ret);
+			break;
+		}
+		if (ret == 1) {
+			if (wc.status) {
+				PRINTF(cb, "completion error %u opcode %u\n", wc.status, wc.opcode);
+			}
+		}
+	} while (ret == 1);
+	DEBUG_LOG(cb, "fr_test: done!\n");
+	ib_dereg_mr(mr);
+err1:
+	ib_free_fast_reg_page_list(pl);
+}
+
 static int krping_connect_client(struct krping_cb *cb)
 {
 	struct rdma_conn_param conn_param;
@@ -1548,17 +2019,17 @@ static int krping_connect_client(struct krping_cb *cb)
 
 	ret = rdma_connect(cb->cm_id, &conn_param);
 	if (ret) {
-		log(LOG_ERR, "rdma_connect error %d\n", ret);
+		PRINTF(cb, "rdma_connect error %d\n", ret);
 		return ret;
 	}
 
-	krping_wait(cb, CONNECTED);
+	wait_event_interruptible(cb->sem, cb->state >= CONNECTED);
 	if (cb->state == ERROR) {
-		log(LOG_ERR,  "wait for CONNECTED state %d\n", cb->state);
+		PRINTF(cb, "wait for CONNECTED state %d\n", cb->state);
 		return -1;
 	}
 
-	DEBUG_LOG(PFX "rdma_connect successful\n");
+	DEBUG_LOG(cb, "rdma_connect successful\n");
 	return 0;
 }
 
@@ -1576,19 +2047,22 @@ static int krping_bind_client(struct krping_cb *cb)
 	ret = rdma_resolve_addr(cb->cm_id, NULL, (struct sockaddr *) &sin,
 				2000);
 	if (ret) {
-		log(LOG_ERR, "rdma_resolve_addr error %d\n", ret);
+		PRINTF(cb, "rdma_resolve_addr error %d\n", ret);
 		return ret;
 	}
 
-	krping_wait(cb, ROUTE_RESOLVED);
+	wait_event_interruptible(cb->sem, cb->state >= ROUTE_RESOLVED);
 	if (cb->state != ROUTE_RESOLVED) {
-		log(LOG_ERR,  
+		PRINTF(cb, 
 		       "addr/route resolution did not resolve: state %d\n",
 		       cb->state);
-		return EINTR;
+		return -EINTR;
 	}
 
-	DEBUG_LOG(PFX "rdma_resolve_addr - rdma_resolve_route successful\n");
+	if (cb->mem == FASTREG && !fastreg_supported(cb))
+		return -EINVAL;
+
+	DEBUG_LOG(cb, "rdma_resolve_addr - rdma_resolve_route successful\n");
 	return 0;
 }
 
@@ -1603,25 +2077,25 @@ static void krping_run_client(struct krping_cb *cb)
 
 	ret = krping_setup_qp(cb, cb->cm_id);
 	if (ret) {
-		log(LOG_ERR, "setup_qp failed: %d\n", ret);
+		PRINTF(cb, "setup_qp failed: %d\n", ret);
 		return;
 	}
 
 	ret = krping_setup_buffers(cb);
 	if (ret) {
-		log(LOG_ERR, "krping_setup_buffers failed: %d\n", ret);
+		PRINTF(cb, "krping_setup_buffers failed: %d\n", ret);
 		goto err1;
 	}
 
 	ret = ib_post_recv(cb->qp, &cb->rq_wr, &bad_wr);
 	if (ret) {
-		log(LOG_ERR, "ib_post_recv failed: %d\n", ret);
+		PRINTF(cb, "ib_post_recv failed: %d\n", ret);
 		goto err2;
 	}
 
 	ret = krping_connect_client(cb);
 	if (ret) {
-		log(LOG_ERR, "connect error %d\n", ret);
+		PRINTF(cb, "connect error %d\n", ret);
 		goto err2;
 	}
 
@@ -1631,6 +2105,8 @@ static void krping_run_client(struct krping_cb *cb)
 		krping_rlat_test_client(cb);
 	else if (cb->bw)
 		krping_bw_test_client(cb);
+	else if (cb->frtest)
+		krping_fr_test(cb);
 	else
 		krping_test_client(cb);
 	rdma_disconnect(cb->cm_id);
@@ -1640,119 +2116,137 @@ err1:
 	krping_free_qp(cb);
 }
 
-int krping_doit(char *cmd)
+int krping_doit(char *cmd, void *cookie)
 {
 	struct krping_cb *cb;
 	int op;
 	int ret = 0;
 	char *optarg;
 	unsigned long optint;
-	debug = 0;
 
-	cb = malloc(sizeof(*cb), M_DEVBUF, M_WAITOK);
+	cb = kzalloc(sizeof(*cb), GFP_KERNEL);
 	if (!cb)
-		return ENOMEM;
-	bzero(cb, sizeof *cb);
+		return -ENOMEM;
 
-	mtx_lock(&krping_mutex);
-	TAILQ_INSERT_TAIL(&krping_cbs, cb, list);
-	mtx_unlock(&krping_mutex);
+	mutex_lock(&krping_mutex);
+	list_add_tail(&cb->list, &krping_cbs);
+	mutex_unlock(&krping_mutex);
 
+	cb->cookie = cookie;
 	cb->server = -1;
 	cb->state = IDLE;
 	cb->size = 64;
 	cb->txdepth = RPING_SQ_DEPTH;
-	cb->use_dmamr = 1;
-	cb->memlimit = 0;
-	mtx_init(&cb->lock, "krping mtx", NULL, MTX_DUPOK|MTX_DEF);
+	cb->mem = DMA;
+	init_waitqueue_head(&cb->sem);
 
 	while ((op = krping_getopt("krping", &cmd, krping_opts, NULL, &optarg,
 			      &optint)) != 0) {
 		switch (op) {
 		case 'a':
 			cb->addr_str = optarg;
-			DEBUG_LOG(PFX "ipaddr (%s)\n", optarg);
+			DEBUG_LOG(cb, "ipaddr (%s)\n", optarg);
 			if (!inet_aton(optarg, &cb->addr)) {
-				log(LOG_ERR, "bad addr string %s\n", optarg);
+				PRINTF(cb, "bad addr string %s\n",
+				    optarg);
 				ret = EINVAL;
 			}
 			break;
-		case 'D':
-			cb->use_dmamr = 1;
-			DEBUG_LOG(PFX "using dma mr\n");
-			break;
 		case 'p':
 			cb->port = htons(optint);
-			DEBUG_LOG(PFX "port %d\n", (int)optint);
+			DEBUG_LOG(cb, "port %d\n", (int)optint);
 			break;
 		case 'P':
 			cb->poll = 1;
-			DEBUG_LOG("server\n");
+			DEBUG_LOG(cb, "server\n");
 			break;
 		case 's':
 			cb->server = 1;
-			DEBUG_LOG(PFX "server\n");
+			DEBUG_LOG(cb, "server\n");
 			break;
 		case 'c':
 			cb->server = 0;
-			DEBUG_LOG(PFX "client\n");
+			DEBUG_LOG(cb, "client\n");
 			break;
 		case 'S':
 			cb->size = optint;
 			if ((cb->size < 1) ||
 			    (cb->size > RPING_BUFSIZE)) {
-				log(LOG_ERR, "Invalid size %d "
+				PRINTF(cb, "Invalid size %d "
 				       "(valid range is 1 to %d)\n",
 				       cb->size, RPING_BUFSIZE);
 				ret = EINVAL;
 			} else
-				DEBUG_LOG(PFX "size %d\n", (int)optint);
+				DEBUG_LOG(cb, "size %d\n", (int)optint);
 			break;
 		case 'C':
 			cb->count = optint;
 			if (cb->count < 0) {
-				log(LOG_ERR, "Invalid count %d\n",
+				PRINTF(cb, "Invalid count %d\n",
 					cb->count);
 				ret = EINVAL;
 			} else
-				DEBUG_LOG(PFX "count %d\n", (int) cb->count);
+				DEBUG_LOG(cb, "count %d\n", (int) cb->count);
 			break;
 		case 'v':
 			cb->verbose++;
-			DEBUG_LOG(PFX "verbose\n");
+			DEBUG_LOG(cb, "verbose\n");
 			break;
 		case 'V':
 			cb->validate++;
-			DEBUG_LOG(PFX "validate data\n");
-			break;
-		case 'L':
-			cb->rlat++;
+			DEBUG_LOG(cb, "validate data\n");
 			break;
 		case 'l':
 			cb->wlat++;
 			break;
+		case 'L':
+			cb->rlat++;
+			break;
 		case 'B':
 			cb->bw++;
 			break;
-		case 't':
-			cb->txdepth = optint;
-			DEBUG_LOG(PFX "txdepth %d\n", cb->txdepth);
-			break;
 		case 'd':
-			debug++;
+			cb->duplex++;
 			break;
 		case 'm':
-                        cb->memlimit = optint;
-                        if (cb->memlimit < 1) {
-                                log(LOG_ERR, "Invalid memory limit %ju\n",
-				    cb->memlimit);
-                                ret = EINVAL;
-                        } else
-                                DEBUG_LOG(PFX "memory limit %d\n", (int)optint);
-                        break;
+			if (!strncmp(optarg, "dma", 3))
+				cb->mem = DMA;
+			else if (!strncmp(optarg, "fastreg", 7))
+				cb->mem = FASTREG;
+			else if (!strncmp(optarg, "mw", 2))
+				cb->mem = MW;
+			else if (!strncmp(optarg, "mr", 2))
+				cb->mem = MR;
+			else {
+				PRINTF(cb, "unknown mem mode %s.  "
+					"Must be dma, fastreg, mw, or mr\n",
+					optarg);
+				ret = -EINVAL;
+				break;
+			}
+			break;
+		case 'I':
+			cb->server_invalidate = 1;
+			break;
+		case 'T':
+			cb->txdepth = optint;
+			DEBUG_LOG(cb, "txdepth %d\n", (int) cb->txdepth);
+			break;
+		case 'Z':
+			cb->local_dma_lkey = 1;
+			DEBUG_LOG(cb, "using local dma lkey\n");
+			break;
+		case 'R':
+			cb->read_inv = 1;
+			DEBUG_LOG(cb, "using read-with-inv\n");
+			break;
+		case 'f':
+			cb->frtest = 1;
+			DEBUG_LOG(cb, "fast-reg test!\n");
+			break;
 		default:
-			log(LOG_ERR, "unknown opt %s\n", optarg);
-			ret = EINVAL;
+			PRINTF(cb, "unknown opt %s\n", optarg);
+			ret = -EINVAL;
 			break;
 		}
 	}
@@ -1760,46 +2254,77 @@ int krping_doit(char *cmd)
 		goto out;
 
 	if (cb->server == -1) {
-		log(LOG_ERR, "must be either client or server\n");
-		ret = EINVAL;
-		goto out;
-	}
-	if ((cb->bw + cb->rlat + cb->wlat) > 1) {
-		log(LOG_ERR, "Pick only one test: bw, rlat, wlat\n");
-		ret = EINVAL;
+		PRINTF(cb, "must be either client or server\n");
+		ret = -EINVAL;
 		goto out;
 	}
 
+	if (cb->server && cb->frtest) {
+		PRINTF(cb, "must be client to run frtest\n");
+		ret = -EINVAL;
+		goto out;
+	}
+
+	if ((cb->frtest + cb->bw + cb->rlat + cb->wlat) > 1) {
+		PRINTF(cb, "Pick only one test: fr, bw, rlat, wlat\n");
+		ret = -EINVAL;
+		goto out;
+	}
+
+	if (cb->server_invalidate && cb->mem != FASTREG) {
+		PRINTF(cb, "server_invalidate only valid with fastreg mem_mode\n");
+		ret = -EINVAL;
+		goto out;
+	}
+
+	if (cb->read_inv && cb->mem != FASTREG) {
+		PRINTF(cb, "read_inv only valid with fastreg mem_mode\n");
+		ret = -EINVAL;
+		goto out;
+	}
+
+	if (cb->mem != MR && (cb->wlat || cb->rlat || cb->bw)) {
+		PRINTF(cb, "wlat, rlat, and bw tests only support mem_mode MR\n");
+		ret = -EINVAL;
+		goto out;
+	}
 
 	cb->cm_id = rdma_create_id(krping_cma_event_handler, cb, RDMA_PS_TCP);
 	if (IS_ERR(cb->cm_id)) {
 		ret = PTR_ERR(cb->cm_id);
-		log(LOG_ERR, "rdma_create_id error %d\n", ret);
+		PRINTF(cb, "rdma_create_id error %d\n", ret);
 		goto out;
 	}
-	DEBUG_LOG(PFX "created cm_id %p\n", cb->cm_id);
+	DEBUG_LOG(cb, "created cm_id %p\n", cb->cm_id);
+
 	if (cb->server)
 		krping_run_server(cb);
 	else
 		krping_run_client(cb);
-	DEBUG_LOG(PFX "destroy cm_id %p\n", cb->cm_id);
-
-	mtx_lock(&cb->lock);
-	cb->state = CLEANUP;
-	wakeup(cb);
-	mtx_unlock(&cb->lock);
 
+	DEBUG_LOG(cb, "destroy cm_id %p\n", cb->cm_id);
 	rdma_destroy_id(cb->cm_id);
 out:
-	mtx_lock(&krping_mutex);
-	TAILQ_REMOVE(&krping_cbs, cb, list);
-	mtx_unlock(&krping_mutex);
-	free(cb, M_DEVBUF);
+	mutex_lock(&krping_mutex);
+	list_del(&cb->list);
+	mutex_unlock(&krping_mutex);
+	kfree(cb);
 	return ret;
 }
 
+void
+krping_walk_cb_list(void (*f)(struct krping_stats *, void *), void *arg)
+{
+	struct krping_cb *cb;
+
+	mutex_lock(&krping_mutex);
+	list_for_each_entry(cb, &krping_cbs, list)
+	    (*f)(cb->pd ? &cb->stats : NULL, arg);
+	mutex_unlock(&krping_mutex);
+}
+
 void krping_init(void)
 {
-	mtx_init(&krping_mutex, "krping lock", NULL, MTX_DEF);
-	TAILQ_INIT(&krping_cbs);
+
+	mutex_init(&krping_mutex);
 }
diff --git a/sys/contrib/rdma/krping/krping.h b/sys/contrib/rdma/krping/krping.h
index 5cced304b87..04be5311ced 100644
--- a/sys/contrib/rdma/krping/krping.h
+++ b/sys/contrib/rdma/krping/krping.h
@@ -1,133 +1,21 @@
 /*
  * $FreeBSD$
  */
-#include <rdma/ib_verbs.h>
-#include <netinet/in.h>
-
-/*
- * Krping header stuffs...
- */
 
 struct krping_stats {
-	unsigned send_bytes;
-	unsigned send_msgs;
-	unsigned recv_bytes;
-	unsigned recv_msgs;
-	unsigned write_bytes;
-	unsigned write_msgs;
-	unsigned read_bytes;
-	unsigned read_msgs;
-};
-
-
-/*
- * These states are used to signal events between the completion handler
- * and the main client or server thread.
- *
- * Once CONNECTED, they cycle through RDMA_READ_ADV, RDMA_WRITE_ADV, 
- * and RDMA_WRITE_COMPLETE for each ping.
- */
-enum test_state {
-	IDLE = 1,
-	CONNECT_REQUEST,
-	ADDR_RESOLVED,
-	ROUTE_RESOLVED,
-	CONNECTED,
-	RDMA_READ_ADV,
-	RDMA_READ_COMPLETE,
-	RDMA_WRITE_ADV,
-	RDMA_WRITE_COMPLETE,
-	ERROR,
-	CLEANUP
-};
-
-struct krping_rdma_info {
-	uint64_t buf;
-	uint32_t rkey;
-	uint32_t size;
-};
-
-/*
- * Control block struct.
- */
-struct krping_cb {
-	int server;			/* 0 iff client */
-	struct ib_cq *cq;
-	struct ib_pd *pd;
-	struct ib_qp *qp;
-	struct ib_mr *dma_mr;
-	int use_dmamr;
-
-	struct ib_recv_wr rq_wr;	/* recv work request record */
-	struct ib_sge recv_sgl;		/* recv single SGE */
-	struct krping_rdma_info recv_buf;/* malloc'd buffer */
-	struct ib_mr *recv_mr;
-
-	struct ib_send_wr sq_wr;	/* send work requrest record */
-	struct ib_sge send_sgl;
-	struct krping_rdma_info send_buf;/* single send buf */
-	struct ib_mr *send_mr;
-
-	struct ib_send_wr rdma_sq_wr;	/* rdma work request record */
-	struct ib_sge rdma_sgl;		/* rdma single SGE */
-	char *rdma_buf;			/* used as rdma sink */
-	u64  rdma_addr;
-	struct ib_mr *rdma_mr;
-
-	uint32_t remote_rkey;		/* remote guys RKEY */
-	uint64_t remote_addr;		/* remote guys TO */
-	uint32_t remote_len;		/* remote guys LEN */
-
-	char *start_buf;		/* rdma read src */
-	u64  start_addr;
-	struct ib_mr *start_mr;
-
-	enum test_state state;		/* used for cond/signalling */
-	struct mtx lock;
-	struct krping_stats stats;
-
-	uint16_t port;			/* dst port in NBO */
-	struct in_addr addr;		/* dst addr in NBO */
-	char *addr_str;			/* dst addr string */
-	int verbose;			/* verbose logging */
-	int count;			/* ping count */
-	int size;			/* ping data size */
-	int validate;			/* validate ping data */
-	uint64_t memlimit;		/* limit of the physical memory that
-					   can be registered with dma_mr mode */
-
-	/* CM stuff */
-	struct rdma_cm_id *cm_id;	/* connection on client side,*/
-					/* listener on service side. */
-	struct rdma_cm_id *child_cm_id;	/* connection on server side */
-	TAILQ_ENTRY(krping_cb) list;	
-
-	int rlat;			/* run read latency test */
-	int wlat;			/* run write latency test */
-	int bw;				/* run write bw test */
-	int duplex;			/* run write bw full duplex test */
-	int poll;			/* poll vs block in rlat */
-	int txdepth;
-
+	unsigned long long send_bytes;
+	unsigned long long send_msgs;
+	unsigned long long recv_bytes;
+	unsigned long long recv_msgs;
+	unsigned long long write_bytes;
+	unsigned long long write_msgs;
+	unsigned long long read_bytes;
+	unsigned long long read_msgs;
 	char name[16];
 };
 
-static __inline uint64_t
-get_cycles(void)
-{
-	u_int32_t low, high;
-	__asm __volatile("rdtsc" : "=a" (low), "=d" (high));
-	return (low | ((u_int64_t)high << 32)); 
-}
-
-#define htonll(x) htobe64((x))
-#define ntohll(x) be64toh((x))
-
-typedef uint64_t cycles_t;
-
-extern struct mtx krping_mutex;
-TAILQ_HEAD(krping_cb_list, krping_cb);
-extern struct krping_cb_list krping_cbs;
-
-int krping_doit(char *cmd);
+int krping_doit(char *, void *);
+void krping_walk_cb_list(void (*)(struct krping_stats *, void *), void *);
 void krping_init(void);
+void krping_printf(void *, const char *, ...);
+int krping_sigpending(void);
diff --git a/sys/contrib/rdma/krping/krping_dev.c b/sys/contrib/rdma/krping/krping_dev.c
index d6ab00a1e23..2244d72486e 100644
--- a/sys/contrib/rdma/krping/krping_dev.c
+++ b/sys/contrib/rdma/krping/krping_dev.c
@@ -1,19 +1,20 @@
 /*
- * This code lifted from: 
+ * This code lifted from:
  * 	Simple `echo' pseudo-device KLD
  * 	Murray Stokely
  * 	Converted to 5.X by Søren (Xride) Straarup
  */
 
 /*
- * /bin/echo "server,port=9999,addr=192.168.69.142,validate" > /dev/krping  
- * /bin/echo "client,port=9999,addr=192.168.69.142,validate" > /dev/krping  
+ * /bin/echo "server,port=9999,addr=192.168.69.142,validate" > /dev/krping
+ * /bin/echo "client,port=9999,addr=192.168.69.142,validate" > /dev/krping
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
+#include <sys/module.h>
 #include <sys/systm.h>  /* uprintf */
 #include <sys/errno.h>
 #include <sys/param.h>  /* defines used in kernel.h */
@@ -21,11 +22,19 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>   /* cdevsw struct */
 #include <sys/uio.h>    /* uio struct */
 #include <sys/malloc.h>
+#include <sys/proc.h>
+#include <sys/sysctl.h>
+#include <machine/stdarg.h>
 
 #include "krping.h"
 
 #define BUFFERSIZE 512
 
+SYSCTL_NODE(_dev, OID_AUTO, krping, CTLFLAG_RW, 0, "kernel rping module");
+
+int krping_debug = 0;
+SYSCTL_INT(_dev_krping, OID_AUTO, debug, CTLFLAG_RW, &krping_debug, 0 , "");
+
 /* Function prototypes */
 static d_open_t      krping_open;
 static d_close_t     krping_close;
@@ -47,12 +56,15 @@ typedef struct s_krping {
 	int len;
 } krping_t;
 
+struct stats_list_entry {
+	STAILQ_ENTRY(stats_list_entry) link;
+	struct krping_stats *stats;
+};
+STAILQ_HEAD(stats_list, stats_list_entry);
+
 /* vars */
 static struct cdev *krping_dev;
 
-#undef MODULE_VERSION
-#include <sys/module.h>
-
 static int
 krping_loader(struct module *m, int what, void *arg)
 {
@@ -61,7 +73,7 @@ krping_loader(struct module *m, int what, void *arg)
 	switch (what) {
 	case MOD_LOAD:                /* kldload */
 		krping_init();
-		krping_dev = make_dev(&krping_cdevsw, 0, UID_ROOT, GID_WHEEL, 
+		krping_dev = make_dev(&krping_cdevsw, 0, UID_ROOT, GID_WHEEL,
 					0600, "krping");
 		printf("Krping device loaded.\n");
 		break;
@@ -73,61 +85,82 @@ krping_loader(struct module *m, int what, void *arg)
 		err = EOPNOTSUPP;
 		break;
 	}
-	return err;
+
+	return (err);
 }
 
 static int
 krping_open(struct cdev *dev, int oflags, int devtype, struct thread *p)
 {
-	int err = 0;
-	return err;
+
+	return (0);
 }
 
 static int
 krping_close(struct cdev *dev, int fflag, int devtype, struct thread *p)
 {
+
 	return 0;
 }
 
+static void
+krping_copy_stats(struct krping_stats *stats, void *arg)
+{
+	struct stats_list_entry *s;
+	struct stats_list *list = arg;
+
+	s = malloc(sizeof(*s), M_DEVBUF, M_NOWAIT | M_ZERO);
+	if (s == NULL)
+		return;
+	if (stats != NULL) {
+		s->stats = malloc(sizeof(*stats), M_DEVBUF, M_NOWAIT | M_ZERO);
+		if (s->stats == NULL) {
+			free(s, M_DEVBUF);
+			return;
+		}
+		*s->stats = *stats;
+	}
+	STAILQ_INSERT_TAIL(list, s, link);
+}
+
 static int
 krping_read(struct cdev *dev, struct uio *uio, int ioflag)
 {
-	struct krping_cb *cb, *cb2;
-	int num=1;
-	struct krping_cb_list copy_cbs;
+	int num = 1;
+	struct stats_list list;
+	struct stats_list_entry *e;
+
+	STAILQ_INIT(&list);
+	krping_walk_cb_list(krping_copy_stats, &list);
+
+	if (STAILQ_EMPTY(&list))
+		return (0);
 
 	uprintf("krping: %4s %10s %10s %10s %10s %10s %10s %10s %10s %10s\n",
-		"num", "device", "snd bytes", "snd msgs", "rcv bytes", 
-		"rcv msgs", "wr bytes", "wr msgs", "rd bytes", "rd msgs");
-	TAILQ_INIT(&copy_cbs);
+	    "num", "device", "snd bytes", "snd msgs", "rcv bytes", "rcv msgs",
+	    "wr bytes", "wr msgs", "rd bytes", "rd msgs");
 
-	mtx_lock(&krping_mutex);
-	TAILQ_FOREACH(cb, &krping_cbs, list) {
-		cb2 = malloc(sizeof(*cb), M_DEVBUF, M_NOWAIT|M_ZERO);
-		if (!cb2)
-			break;
-		bcopy(cb, cb2, sizeof(*cb));
-		TAILQ_INSERT_TAIL(&copy_cbs, cb2, list);
-	}
-	mtx_unlock(&krping_mutex);
+	while (!STAILQ_EMPTY(&list)) {
+		e = STAILQ_FIRST(&list);
+		STAILQ_REMOVE_HEAD(&list, link);
+		if (e->stats == NULL)
+			uprintf("krping: %d listen\n", num);
+		else {
+			struct krping_stats *stats = e->stats;
 
-	while (!TAILQ_EMPTY(&copy_cbs)) {
-		cb = TAILQ_FIRST(&copy_cbs);
-		TAILQ_REMOVE(&copy_cbs, cb, list);
-		if (cb->pd) {
-			uprintf("krping: %4d %10s %10u %10u %10u %10u %10u %10u %10u %10u\n",
-			     num++, cb->name, cb->stats.send_bytes,
-			     cb->stats.send_msgs, cb->stats.recv_bytes,
-			     cb->stats.recv_msgs, cb->stats.write_bytes,
-			     cb->stats.write_msgs,
-			     cb->stats.read_bytes,
-			     cb->stats.read_msgs);
-		} else {
-			uprintf("krping: %d listen\n", num++);
+			uprintf("krping: %4d %10s %10llu %10llu %10llu %10llu "
+			    "%10llu %10llu %10llu %10llu\n", num, stats->name,
+			    stats->send_bytes, stats->send_msgs,
+			    stats->recv_bytes, stats->recv_msgs,
+			    stats->write_bytes, stats->write_msgs,
+			    stats->read_bytes, stats->read_msgs);
+			free(stats, M_DEVBUF);
 		}
-		free(cb, M_DEVBUF);
+		num++;
+		free(e, M_DEVBUF);
 	}
-	return 0;
+
+	return (0);
 }
 
 static int
@@ -171,9 +204,27 @@ krping_write(struct cdev *dev, struct uio *uio, int ioflag)
 	*cp = 0;
 	krpingmsg->len = (unsigned long)(cp - krpingmsg->msg);
 	uprintf("krping: write string = |%s|\n", krpingmsg->msg);
-	err = krping_doit(krpingmsg->msg);
+	err = krping_doit(krpingmsg->msg, curproc);
 	free(krpingmsg, M_DEVBUF);
 	return(err);
 }
 
-DEV_MODULE(krping,krping_loader,NULL);
+void
+krping_printf(void *cookie, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	vtprintf(cookie, -1, fmt, ap);
+	va_end(ap);
+}
+
+int
+krping_sigpending(void)
+{
+
+	return (SIGPENDING(curthread));
+}
+
+DEV_MODULE(krping, krping_loader, NULL);
+MODULE_DEPEND(krping, ibcore, 1, 1, 1);
diff --git a/sys/contrib/rdma/rdma_addr.c b/sys/contrib/rdma/rdma_addr.c
deleted file mode 100644
index b1717c0d276..00000000000
--- a/sys/contrib/rdma/rdma_addr.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (c) 2005 Voltaire Inc.  All rights reserved.
- * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
- * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
- * Copyright (c) 2005 Intel Corporation.  All rights reserved.
- *
- * This Software is licensed under one of the following licenses:
- *
- * 1) under the terms of the "Common Public License 1.0" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/cpl.php.
- *
- * 2) under the terms of the "The BSD License" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/bsd-license.php.
- *
- * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
- *    copy of which is available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/gpl-license.php.
- *
- * Licensee has the right to choose one of the above licenses.
- *
- * Redistributions of source code must retain the above copyright
- * notice and one of the license notices.
- *
- * Redistributions in binary form must reproduce both the above copyright
- * notice, one of the license notices in the documentation
- * and/or other materials provided with the distribution.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/condvar.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/socket.h>
-#include <sys/module.h>
-
-#include <sys/lock.h>
-#include <sys/condvar.h>
-#include <sys/mutex.h>
-#include <sys/rwlock.h>
-#include <sys/queue.h>
-#include <sys/taskqueue.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_var.h>
-#include <net/if_arp.h>
-#include <net/route.h>
-
-#include <net80211/ieee80211_freebsd.h>
-
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-
-#include <contrib/rdma/ib_addr.h>
-
-struct addr_req {
-	TAILQ_ENTRY(addr_req) entry;
-	struct sockaddr src_addr;
-	struct sockaddr dst_addr;
-	struct rdma_dev_addr *addr;
-	struct rdma_addr_client *client;
-	void *context;
-	void (*callback)(int status, struct sockaddr *src_addr,
-			 struct rdma_dev_addr *addr, void *context);
-	unsigned long timeout;
-	int status;
-};
-
-static void process_req(void *ctx, int pending);
-
-static struct mtx lock;
-
-static TAILQ_HEAD(addr_req_list, addr_req) req_list;
-static struct task addr_task;
-static struct taskqueue *addr_taskq;
-static struct callout addr_ch;
-static eventhandler_tag route_event_tag;
-
-static void addr_timeout(void *arg)
-{
-	taskqueue_enqueue(addr_taskq, &addr_task);
-}
-
-void rdma_addr_register_client(struct rdma_addr_client *client)
-{
-	mtx_init(&client->lock, "rdma_addr client lock", NULL, MTX_DUPOK|MTX_DEF);
-	cv_init(&client->comp, "rdma_addr cv");
-	client->refcount = 1;
-}
-
-static inline void put_client(struct rdma_addr_client *client)
-{
-	mtx_lock(&client->lock);
-	if (--client->refcount == 0) {
-		cv_broadcast(&client->comp);
-	}
-	mtx_unlock(&client->lock);
-}
-
-void rdma_addr_unregister_client(struct rdma_addr_client *client)
-{
-	put_client(client);
-	mtx_lock(&client->lock);
-	if (client->refcount) {
-		cv_wait(&client->comp, &client->lock);
-	}
-	mtx_unlock(&client->lock);
-}
-
-int rdma_copy_addr(struct rdma_dev_addr *dev_addr, struct ifnet *dev,
-		     const unsigned char *dst_dev_addr)
-{
-	dev_addr->dev_type = RDMA_NODE_RNIC;
-	memset(dev_addr->src_dev_addr, 0, MAX_ADDR_LEN);
-	memcpy(dev_addr->src_dev_addr, IF_LLADDR(dev), dev->if_addrlen);
-	memcpy(dev_addr->broadcast, dev->if_broadcastaddr, MAX_ADDR_LEN);
-	if (dst_dev_addr)
-		memcpy(dev_addr->dst_dev_addr, dst_dev_addr, MAX_ADDR_LEN);
-	return 0;
-}
-
-int rdma_translate_ip(struct sockaddr *addr, struct rdma_dev_addr *dev_addr)
-{
-	struct ifaddr *ifa;
-	struct sockaddr_in *sin = (struct sockaddr_in *)addr;
-	uint16_t port = sin->sin_port;
-	int ret;
-	
-	sin->sin_port = 0;
-	ifa = ifa_ifwithaddr(addr);
-	sin->sin_port = port;
-	if (!ifa)
-		return (EADDRNOTAVAIL);
-	ret = rdma_copy_addr(dev_addr, ifa->ifa_ifp, NULL);
-	ifa_free(ifa);
-	return (ret);
-}
-
-static void queue_req(struct addr_req *req)
-{
-	struct addr_req *tmp_req = NULL;
-	
-	mtx_lock(&lock);
-	TAILQ_FOREACH_REVERSE(tmp_req, &req_list, addr_req_list, entry)
-	    if (time_after_eq(req->timeout, tmp_req->timeout))
-		    break;
-	
-	if (tmp_req)
-		TAILQ_INSERT_AFTER(&req_list, tmp_req, req, entry);
-	else
-		TAILQ_INSERT_TAIL(&req_list, req, entry);
-	
-	if (TAILQ_FIRST(&req_list) == req)	
-		callout_reset(&addr_ch, req->timeout - ticks, addr_timeout, NULL);
-	mtx_unlock(&lock);
-}
-
-#ifdef needed
-static void addr_send_arp(struct sockaddr_in *dst_in)
-{
-	struct route iproute;
-	struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst;
-	char dmac[ETHER_ADDR_LEN];
-	struct llentry *lle;
-
-	bzero(&iproute, sizeof iproute);
-	*dst = *dst_in;
-
-	rtalloc(&iproute);
-	if (iproute.ro_rt == NULL)
-		return;
-
-	arpresolve(iproute.ro_rt->rt_ifp, iproute.ro_rt, NULL, 
-		   rt_key(iproute.ro_rt), dmac, &lle);
-
-	RTFREE(iproute.ro_rt);
-}
-#endif
-
-static int addr_resolve_remote(struct sockaddr_in *src_in,
-			       struct sockaddr_in *dst_in,
-			       struct rdma_dev_addr *addr)
-{
-	int ret = 0;
-	struct route iproute;
-	struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst;
-	char dmac[ETHER_ADDR_LEN];
-	struct llentry *lle;
-
-	bzero(&iproute, sizeof iproute);
-	*dst = *dst_in;
-
-	rtalloc(&iproute);
-	if (iproute.ro_rt == NULL) {
-		ret = EHOSTUNREACH;
-		goto out;
-	}
-
-	/* If the device does ARP internally, return 'done' */
-	if (iproute.ro_rt->rt_ifp->if_flags & IFF_NOARP) {
-		rdma_copy_addr(addr, iproute.ro_rt->rt_ifp, NULL);
-		goto put;
-	}
- 	ret = arpresolve(iproute.ro_rt->rt_ifp, iproute.ro_rt, NULL, 
-		(struct sockaddr *)dst_in, dmac, &lle);
-	if (ret) {
-		goto put;
-	}
-
-	if (!src_in->sin_addr.s_addr) {
-		src_in->sin_len = sizeof *src_in;
-		src_in->sin_family = dst_in->sin_family;
-		src_in->sin_addr.s_addr = ((struct sockaddr_in *)iproute.ro_rt->rt_ifa->ifa_addr)->sin_addr.s_addr;
-	}
-
-	ret = rdma_copy_addr(addr, iproute.ro_rt->rt_ifp, dmac);
-put:
-	RTFREE(iproute.ro_rt);
-out:
-	return ret;
-}
-
-static void process_req(void *ctx, int pending)
-{
-	struct addr_req *req, *tmp_req;
-	struct sockaddr_in *src_in, *dst_in;
-	TAILQ_HEAD(, addr_req) done_list;
-
-	TAILQ_INIT(&done_list);
-
-	mtx_lock(&lock);
-	TAILQ_FOREACH_SAFE(req, &req_list, entry, tmp_req) {
-		if (req->status == EWOULDBLOCK) {
-			src_in = (struct sockaddr_in *) &req->src_addr;
-			dst_in = (struct sockaddr_in *) &req->dst_addr;
-			req->status = addr_resolve_remote(src_in, dst_in,
-							  req->addr);
-			if (req->status && time_after_eq(ticks, req->timeout))
-				req->status = ETIMEDOUT;
-			else if (req->status == EWOULDBLOCK)
-				continue;
-		}
-		TAILQ_REMOVE(&req_list, req, entry);
-		TAILQ_INSERT_TAIL(&done_list, req, entry);
-	}
-
-	if (!TAILQ_EMPTY(&req_list)) {
-		req = TAILQ_FIRST(&req_list);
-		callout_reset(&addr_ch, req->timeout - ticks, addr_timeout, 
-			NULL);
-	}
-	mtx_unlock(&lock);
-
-	TAILQ_FOREACH_SAFE(req, &done_list, entry, tmp_req) {
-		TAILQ_REMOVE(&done_list, req, entry);
-		req->callback(req->status, &req->src_addr, req->addr,
-			      req->context);
-		put_client(req->client);
-		free(req, M_DEVBUF);
-	}
-}
-
-int rdma_resolve_ip(struct rdma_addr_client *client,
-		    struct sockaddr *src_addr, struct sockaddr *dst_addr,
-		    struct rdma_dev_addr *addr, int timeout_ms,
-		    void (*callback)(int status, struct sockaddr *src_addr,
-				     struct rdma_dev_addr *addr, void *context),
-		    void *context)
-{
-	struct sockaddr_in *src_in, *dst_in;
-	struct addr_req *req;
-	int ret = 0;
-
-	req = malloc(sizeof *req, M_DEVBUF, M_NOWAIT);
-	if (!req)
-		return (ENOMEM);
-	memset(req, 0, sizeof *req);
-
-	if (src_addr)
-		memcpy(&req->src_addr, src_addr, ip_addr_size(src_addr));
-	memcpy(&req->dst_addr, dst_addr, ip_addr_size(dst_addr));
-	req->addr = addr;
-	req->callback = callback;
-	req->context = context;
-	req->client = client;
-	mtx_lock(&client->lock);
-	client->refcount++;
-	mtx_unlock(&client->lock);
-
-	src_in = (struct sockaddr_in *) &req->src_addr;
-	dst_in = (struct sockaddr_in *) &req->dst_addr;
-
-	req->status = addr_resolve_remote(src_in, dst_in, addr);
-
-	switch (req->status) {
-	case 0:
-		req->timeout = ticks;
-		queue_req(req);
-		break;
-	case EWOULDBLOCK:
-		req->timeout = msecs_to_ticks(timeout_ms) + ticks;
-		queue_req(req);
-#ifdef needed
-		addr_send_arp(dst_in);
-#endif
-		break;
-	default:
-		ret = req->status;
-		mtx_lock(&client->lock);
-		client->refcount--;
-		mtx_unlock(&client->lock);
-		free(req, M_DEVBUF);
-		break;
-	}
-	return ret;
-}
-
-void rdma_addr_cancel(struct rdma_dev_addr *addr)
-{
-	struct addr_req *req, *tmp_req;
-
-	mtx_lock(&lock);
-	TAILQ_FOREACH_SAFE(req, &req_list, entry, tmp_req) {
-		if (req->addr == addr) {
-			req->status = ECANCELED;
-			req->timeout = ticks;
-			TAILQ_REMOVE(&req_list, req, entry);
-			TAILQ_INSERT_HEAD(&req_list, req, entry);
-			callout_reset(&addr_ch, req->timeout - ticks, addr_timeout, NULL);
-			break;
-		}
-	}
-	mtx_unlock(&lock);
-}
-
-static void
-route_event_arp_update(void *unused, struct rtentry *rt0, uint8_t *enaddr,
-	struct sockaddr *sa)
-{
-		callout_stop(&addr_ch);
-		taskqueue_enqueue(addr_taskq, &addr_task);
-}
-
-static int addr_init(void)
-{
-	TAILQ_INIT(&req_list);
-	mtx_init(&lock, "rdma_addr req_list lock", NULL, MTX_DEF);
-
-	addr_taskq = taskqueue_create("rdma_addr_taskq", M_NOWAIT,
-		taskqueue_thread_enqueue, &addr_taskq);
-        if (addr_taskq == NULL) {
-                printf("failed to allocate rdma_addr taskqueue\n");
-                return (ENOMEM);
-        }
-        taskqueue_start_threads(&addr_taskq, 1, PI_NET, "rdma_addr taskq");
-        TASK_INIT(&addr_task, 0, process_req, NULL);
-
-	callout_init(&addr_ch, TRUE);
-
-	route_event_tag = EVENTHANDLER_REGISTER(route_arp_update_event, 
-		route_event_arp_update, NULL, EVENTHANDLER_PRI_ANY);
-
-	return 0;
-}
-
-static void addr_cleanup(void)
-{
-	EVENTHANDLER_DEREGISTER(route_event_arp_update, route_event_tag);
-	callout_stop(&addr_ch);
-	taskqueue_drain(addr_taskq, &addr_task);
-	taskqueue_free(addr_taskq);
-}
-
-static int 
-addr_load(module_t mod, int cmd, void *arg)
-{
-        int err = 0;
-
-        switch (cmd) {
-        case MOD_LOAD:
-                printf("Loading rdma_addr.\n");
-
-                addr_init();
-                break;
-        case MOD_QUIESCE:
-                break;
-        case MOD_UNLOAD:
-                printf("Unloading rdma_addr.\n");
-		addr_cleanup();
-                break;
-        case MOD_SHUTDOWN:
-                break;
-        default:
-                err = EOPNOTSUPP;
-                break;
-        }
-
-        return (err);
-}
-
-static moduledata_t mod_data = {
-	"rdma_addr",
-	addr_load,
-	0
-};
-
-MODULE_VERSION(rdma_addr, 1);
-DECLARE_MODULE(rdma_addr, mod_data, SI_SUB_EXEC, SI_ORDER_ANY);
diff --git a/sys/contrib/rdma/rdma_cache.c b/sys/contrib/rdma/rdma_cache.c
deleted file mode 100644
index 1e516a1b036..00000000000
--- a/sys/contrib/rdma/rdma_cache.c
+++ /dev/null
@@ -1,411 +0,0 @@
-/*
- * Copyright (c) 2004 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Intel Corporation. All rights reserved.
- * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
- * Copyright (c) 2005 Voltaire, Inc. 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.
- *
- * $Id: cache.c 1349 2004-12-16 21:09:43Z roland $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/taskqueue.h>
-#include <sys/lock.h>
-#include <sys/rwlock.h>
-#include <sys/mutex.h>
-#include <sys/module.h>
-#include <sys/syslog.h>
-
-
-#ifdef needed
-#include <sys/condvar.h>
-#include <sys/socket.h>
-#include <sys/condvar.h>
-#endif
-
-#include <contrib/rdma/ib_cache.h>
-
-#include "core_priv.h"
-
-struct ib_pkey_cache {
-	int             table_len;
-	u16             table[0];
-};
-
-struct ib_gid_cache {
-	int             table_len;
-	union ib_gid    table[0];
-};
-
-struct ib_update_work {
-	struct task 	  task;
-	struct ib_device  *device;
-	u8                 port_num;
-};
-
-static inline int start_port(struct ib_device *device)
-{
-	return (device->node_type == RDMA_NODE_IB_SWITCH) ? 0 : 1;
-}
-
-static inline int end_port(struct ib_device *device)
-{
-	return (device->node_type == RDMA_NODE_IB_SWITCH) ?
-		0 : device->phys_port_cnt;
-}
-
-int ib_get_cached_gid(struct ib_device *device,
-		      u8                port_num,
-		      int               index,
-		      union ib_gid     *gid)
-{
-	struct ib_gid_cache *cache;
-	int ret = 0;
-
-	if (port_num < start_port(device) || port_num > end_port(device))
-		return -EINVAL;
-
-	mtx_lock(&device->cache.lock);
-
-	cache = device->cache.gid_cache[port_num - start_port(device)];
-
-	if (index < 0 || index >= cache->table_len)
-		ret = -EINVAL;
-	else
-		*gid = cache->table[index];
-
-	mtx_unlock(&device->cache.lock);
-
-	return ret;
-}
-
-int ib_find_cached_gid(struct ib_device *device,
-		       union ib_gid	*gid,
-		       u8               *port_num,
-		       u16              *index)
-{
-	struct ib_gid_cache *cache;
-	int p, i;
-	int ret = -ENOENT;
-
-	*port_num = -1;
-	if (index)
-		*index = -1;
-
-	mtx_lock(&device->cache.lock);
-
-	for (p = 0; p <= end_port(device) - start_port(device); ++p) {
-		cache = device->cache.gid_cache[p];
-		for (i = 0; i < cache->table_len; ++i) {
-			if (!memcmp(gid, &cache->table[i], sizeof *gid)) {
-				*port_num = p + start_port(device);
-				if (index)
-					*index = i;
-				ret = 0;
-				goto found;
-			}
-		}
-	}
-found:
-	mtx_unlock(&device->cache.lock);
-
-	return ret;
-}
-
-int ib_get_cached_pkey(struct ib_device *device,
-		       u8                port_num,
-		       int               index,
-		       u16              *pkey)
-{
-	struct ib_pkey_cache *cache;
-	int ret = 0;
-
-	if (port_num < start_port(device) || port_num > end_port(device))
-		return -EINVAL;
-
-	mtx_lock(&device->cache.lock);
-
-	cache = device->cache.pkey_cache[port_num - start_port(device)];
-
-	if (index < 0 || index >= cache->table_len)
-		ret = -EINVAL;
-	else
-		*pkey = cache->table[index];
-
-	mtx_unlock(&device->cache.lock);
-
-	return ret;
-}
-
-int ib_find_cached_pkey(struct ib_device *device,
-			u8                port_num,
-			u16               pkey,
-			u16              *index)
-{
-	struct ib_pkey_cache *cache;
-	int i;
-	int ret = -ENOENT;
-
-	if (port_num < start_port(device) || port_num > end_port(device))
-		return -EINVAL;
-
-	mtx_lock(&device->cache.lock);
-
-	cache = device->cache.pkey_cache[port_num - start_port(device)];
-
-	*index = -1;
-
-	for (i = 0; i < cache->table_len; ++i)
-		if ((cache->table[i] & 0x7fff) == (pkey & 0x7fff)) {
-			*index = i;
-			ret = 0;
-			break;
-		}
-
-	mtx_unlock(&device->cache.lock);
-
-	return ret;
-}
-
-int ib_get_cached_lmc(struct ib_device *device,
-		      u8                port_num,
-		      u8                *lmc)
-{
-	int ret = 0;
-
-	if (port_num < start_port(device) || port_num > end_port(device))
-		return -EINVAL;
-
-	mtx_lock(&device->cache.lock);
-	*lmc = device->cache.lmc_cache[port_num - start_port(device)];
-	mtx_unlock(&device->cache.lock);
-
-	return ret;
-}
-
-static void ib_cache_update(struct ib_device *device,
-			    u8                port)
-{
-	struct ib_port_attr       *tprops = NULL;
-	struct ib_pkey_cache      *pkey_cache = NULL, *old_pkey_cache;
-	struct ib_gid_cache       *gid_cache = NULL, *old_gid_cache;
-	int                        i;
-	int                        ret;
-
-	tprops = malloc(sizeof *tprops, M_DEVBUF, M_NOWAIT);
-	if (!tprops)
-		return;
-
-	ret = ib_query_port(device, port, tprops);
-	if (ret) {
-		log(LOG_WARNING, "ib_query_port failed (%d) for %s\n",
-		       ret, device->name);
-		goto err;
-	}
-
-	pkey_cache = malloc(sizeof *pkey_cache + tprops->pkey_tbl_len *
-			     sizeof *pkey_cache->table, M_DEVBUF, M_NOWAIT);
-	if (!pkey_cache)
-		goto err;
-
-	pkey_cache->table_len = tprops->pkey_tbl_len;
-
-	gid_cache = malloc(sizeof *gid_cache + tprops->gid_tbl_len *
-			    sizeof *gid_cache->table, M_DEVBUF, M_NOWAIT);
-	if (!gid_cache)
-		goto err;
-
-	gid_cache->table_len = tprops->gid_tbl_len;
-
-	for (i = 0; i < pkey_cache->table_len; ++i) {
-		ret = ib_query_pkey(device, port, i, pkey_cache->table + i);
-		if (ret) {
-			log(LOG_WARNING, "ib_query_pkey failed (%d) for %s (index %d)\n",
-			       ret, device->name, i);
-			goto err;
-		}
-	}
-
-	for (i = 0; i < gid_cache->table_len; ++i) {
-		ret = ib_query_gid(device, port, i, gid_cache->table + i);
-		if (ret) {
-			log(LOG_WARNING, "ib_query_gid failed (%d) for %s (index %d)\n",
-			       ret, device->name, i);
-			goto err;
-		}
-	}
-
-	mtx_lock(&device->cache.lock);
-
-	old_pkey_cache = device->cache.pkey_cache[port - start_port(device)];
-	old_gid_cache  = device->cache.gid_cache [port - start_port(device)];
-
-	device->cache.pkey_cache[port - start_port(device)] = pkey_cache;
-	device->cache.gid_cache [port - start_port(device)] = gid_cache;
-
-	device->cache.lmc_cache[port - start_port(device)] = tprops->lmc;
-
-	mtx_unlock(&device->cache.lock);
-
-	free(old_pkey_cache, M_DEVBUF);
-	free(old_gid_cache, M_DEVBUF);
-	free(tprops, M_DEVBUF);
-	return;
-
-err:
-	free(pkey_cache, M_DEVBUF);
-	free(gid_cache, M_DEVBUF);
-	free(tprops, M_DEVBUF);
-}
-
-static void ib_cache_task(void *context, int pending)
-{
-	struct ib_update_work *work = context;
-
-	ib_cache_update(work->device, work->port_num);
-	free(work, M_DEVBUF);
-}
-
-static void ib_cache_event(struct ib_event_handler *handler,
-			   struct ib_event *event)
-{
-	struct ib_update_work *work;
-
-	if (event->event == IB_EVENT_PORT_ERR    ||
-	    event->event == IB_EVENT_PORT_ACTIVE ||
-	    event->event == IB_EVENT_LID_CHANGE  ||
-	    event->event == IB_EVENT_PKEY_CHANGE ||
-	    event->event == IB_EVENT_SM_CHANGE   ||
-	    event->event == IB_EVENT_CLIENT_REREGISTER) {
-		work = malloc(sizeof *work, M_DEVBUF, M_NOWAIT);
-		if (work) {
-			TASK_INIT(&work->task, 0, ib_cache_task, work);
-			work->device   = event->device;
-			work->port_num = event->element.port_num;
-			taskqueue_enqueue(taskqueue_thread, &work->task);
-		}
-	}
-}
-
-static void ib_cache_setup_one(struct ib_device *device)
-{
-	int p;
-
-	mtx_init(&device->cache.lock, "ib device cache", NULL, 
-		MTX_DUPOK|MTX_DEF);
-
-	device->cache.pkey_cache =
-		malloc(sizeof *device->cache.pkey_cache *
-			(end_port(device) - start_port(device) + 1), M_DEVBUF, 
-			M_NOWAIT);
-	device->cache.gid_cache =
-		malloc(sizeof *device->cache.gid_cache *
-			(end_port(device) - start_port(device) + 1), M_DEVBUF, 
-			M_NOWAIT);
-
-	device->cache.lmc_cache = malloc(sizeof *device->cache.lmc_cache *
-					  (end_port(device) -
-					  start_port(device) + 1),
-					  M_DEVBUF, M_NOWAIT);
-
-	if (!device->cache.pkey_cache || !device->cache.gid_cache ||
-	    !device->cache.lmc_cache) {
-		log(LOG_WARNING, "Couldn't allocate cache "
-		       "for %s\n", device->name);
-		goto err;
-	}
-
-	for (p = 0; p <= end_port(device) - start_port(device); ++p) {
-		device->cache.pkey_cache[p] = NULL;
-		device->cache.gid_cache [p] = NULL;
-		ib_cache_update(device, p + start_port(device));
-	}
-
-	INIT_IB_EVENT_HANDLER(&device->cache.event_handler,
-			      device, ib_cache_event);
-	if (ib_register_event_handler(&device->cache.event_handler))
-		goto err_cache;
-
-	return;
-
-err_cache:
-	for (p = 0; p <= end_port(device) - start_port(device); ++p) {
-		free(device->cache.pkey_cache[p], M_DEVBUF);
-		free(device->cache.gid_cache[p], M_DEVBUF);
-	}
-
-err:
-	free(device->cache.pkey_cache, M_DEVBUF);
-	free(device->cache.gid_cache, M_DEVBUF);
-	free(device->cache.lmc_cache, M_DEVBUF);
-}
-
-static void ib_cache_cleanup_one(struct ib_device *device)
-{
-	int p;
-
-	ib_unregister_event_handler(&device->cache.event_handler);
-#ifdef XXX
-	flush_scheduled_work();
-#endif
-
-	for (p = 0; p <= end_port(device) - start_port(device); ++p) {
-		free(device->cache.pkey_cache[p], M_DEVBUF);
-		free(device->cache.gid_cache[p], M_DEVBUF);
-	}
-
-	free(device->cache.pkey_cache, M_DEVBUF);
-	free(device->cache.gid_cache, M_DEVBUF);
-	free(device->cache.lmc_cache, M_DEVBUF);
-}
-
-static struct ib_client cache_client = {
-	.name   = "cache",
-	.add    = ib_cache_setup_one,
-	.remove = ib_cache_cleanup_one
-};
-
-int ib_cache_setup(void)
-{
-	return ib_register_client(&cache_client);
-}
-
-void ib_cache_cleanup(void)
-{
-	ib_unregister_client(&cache_client);
-}
diff --git a/sys/contrib/rdma/rdma_cm.h b/sys/contrib/rdma/rdma_cm.h
deleted file mode 100644
index 1b30d04435d..00000000000
--- a/sys/contrib/rdma/rdma_cm.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2005 Voltaire Inc.  All rights reserved.
- * Copyright (c) 2005 Intel Corporation.  All rights reserved.
- *
- * This Software is licensed under one of the following licenses:
- *
- * 1) under the terms of the "Common Public License 1.0" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/cpl.php.
- *
- * 2) under the terms of the "The BSD License" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/bsd-license.php.
- *
- * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
- *    copy of which is available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/gpl-license.php.
- *
- * Licensee has the right to choose one of the above licenses.
- *
- * Redistributions of source code must retain the above copyright
- * notice and one of the license notices.
- *
- * Redistributions in binary form must reproduce both the above copyright
- * notice, one of the license notices in the documentation
- * and/or other materials provided with the distribution.
- *
- * $FreeBSD$
- */
-
-#if !defined(RDMA_CM_H)
-#define RDMA_CM_H
-
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <contrib/rdma/ib_addr.h>
-#include <contrib/rdma/ib_sa.h>
-
-/*
- * Upon receiving a device removal event, users must destroy the associated
- * RDMA identifier and release all resources allocated with the device.
- */
-enum rdma_cm_event_type {
-	RDMA_CM_EVENT_ADDR_RESOLVED,
-	RDMA_CM_EVENT_ADDR_ERROR,
-	RDMA_CM_EVENT_ROUTE_RESOLVED,
-	RDMA_CM_EVENT_ROUTE_ERROR,
-	RDMA_CM_EVENT_CONNECT_REQUEST,
-	RDMA_CM_EVENT_CONNECT_RESPONSE,
-	RDMA_CM_EVENT_CONNECT_ERROR,
-	RDMA_CM_EVENT_UNREACHABLE,
-	RDMA_CM_EVENT_REJECTED,
-	RDMA_CM_EVENT_ESTABLISHED,
-	RDMA_CM_EVENT_DISCONNECTED,
-	RDMA_CM_EVENT_DEVICE_REMOVAL,
-	RDMA_CM_EVENT_MULTICAST_JOIN,
-	RDMA_CM_EVENT_MULTICAST_ERROR
-};
-
-enum rdma_port_space {
-	RDMA_PS_SDP  = 0x0001,
-	RDMA_PS_IPOIB= 0x0002,
-	RDMA_PS_TCP  = 0x0106,
-	RDMA_PS_UDP  = 0x0111,
-	RDMA_PS_SCTP = 0x0183
-};
-
-struct rdma_addr {
-	struct sockaddr src_addr;
-	u8		src_pad[sizeof(struct sockaddr_in6) -
-				sizeof(struct sockaddr)];
-	struct sockaddr dst_addr;
-	u8		dst_pad[sizeof(struct sockaddr_in6) -
-				sizeof(struct sockaddr)];
-	struct rdma_dev_addr dev_addr;
-};
-
-struct rdma_route {
-	struct rdma_addr addr;
-	struct ib_sa_path_rec *path_rec;
-	int num_paths;
-};
-
-struct rdma_conn_param {
-	const void *private_data;
-	u8 private_data_len;
-	u8 responder_resources;
-	u8 initiator_depth;
-	u8 flow_control;
-	u8 retry_count;		/* ignored when accepting */
-	u8 rnr_retry_count;
-	/* Fields below ignored if a QP is created on the rdma_cm_id. */
-	u8 srq;
-	u32 qp_num;
-};
-
-struct rdma_ud_param {
-	const void *private_data;
-	u8 private_data_len;
-	struct ib_ah_attr ah_attr;
-	u32 qp_num;
-	u32 qkey;
-};
-
-struct rdma_cm_event {
-	enum rdma_cm_event_type	 event;
-	int			 status;
-	union {
-		struct rdma_conn_param	conn;
-		struct rdma_ud_param	ud;
-	} param;
-};
-
-struct rdma_cm_id;
-
-/**
- * rdma_cm_event_handler - Callback used to report user events.
- *
- * Notes: Users may not call rdma_destroy_id from this callback to destroy
- *   the passed in id, or a corresponding listen id.  Returning a
- *   non-zero value from the callback will destroy the passed in id.
- */
-typedef int (*rdma_cm_event_handler)(struct rdma_cm_id *id,
-				     struct rdma_cm_event *event);
-
-struct rdma_cm_id {
-	struct ib_device	*device;
-	void			*context;
-	struct ib_qp		*qp;
-	rdma_cm_event_handler	 event_handler;
-	struct rdma_route	 route;
-	enum rdma_port_space	 ps;
-	u8			 port_num;
-};
-
-/**
- * rdma_create_id - Create an RDMA identifier.
- *
- * @event_handler: User callback invoked to report events associated with the
- *   returned rdma_id.
- * @context: User specified context associated with the id.
- * @ps: RDMA port space.
- */
-struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
-				  void *context, enum rdma_port_space ps);
-
-/**
-  * rdma_destroy_id - Destroys an RDMA identifier.
-  *
-  * @id: RDMA identifier.
-  *
-  * Note: calling this function has the effect of canceling in-flight
-  * asynchronous operations associated with the id.
-  */
-void rdma_destroy_id(struct rdma_cm_id *id);
-
-/**
- * rdma_bind_addr - Bind an RDMA identifier to a source address and
- *   associated RDMA device, if needed.
- *
- * @id: RDMA identifier.
- * @addr: Local address information.  Wildcard values are permitted.
- *
- * This associates a source address with the RDMA identifier before calling
- * rdma_listen.  If a specific local address is given, the RDMA identifier will
- * be bound to a local RDMA device.
- */
-int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr);
-
-/**
- * rdma_resolve_addr - Resolve destination and optional source addresses
- *   from IP addresses to an RDMA address.  If successful, the specified
- *   rdma_cm_id will be bound to a local device.
- *
- * @id: RDMA identifier.
- * @src_addr: Source address information.  This parameter may be NULL.
- * @dst_addr: Destination address information.
- * @timeout_ms: Time to wait for resolution to complete.
- */
-int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
-		      struct sockaddr *dst_addr, int timeout_ms);
-
-/**
- * rdma_resolve_route - Resolve the RDMA address bound to the RDMA identifier
- *   into route information needed to establish a connection.
- *
- * This is called on the client side of a connection.
- * Users must have first called rdma_resolve_addr to resolve a dst_addr
- * into an RDMA address before calling this routine.
- */
-int rdma_resolve_route(struct rdma_cm_id *id, int timeout_ms);
-
-/**
- * rdma_create_qp - Allocate a QP and associate it with the specified RDMA
- * identifier.
- *
- * QPs allocated to an rdma_cm_id will automatically be transitioned by the CMA
- * through their states.
- */
-int rdma_create_qp(struct rdma_cm_id *id, struct ib_pd *pd,
-		   struct ib_qp_init_attr *qp_init_attr);
-
-/**
- * rdma_destroy_qp - Deallocate the QP associated with the specified RDMA
- * identifier.
- *
- * Users must destroy any QP associated with an RDMA identifier before
- * destroying the RDMA ID.
- */
-void rdma_destroy_qp(struct rdma_cm_id *id);
-
-/**
- * rdma_init_qp_attr - Initializes the QP attributes for use in transitioning
- *   to a specified QP state.
- * @id: Communication identifier associated with the QP attributes to
- *   initialize.
- * @qp_attr: On input, specifies the desired QP state.  On output, the
- *   mandatory and desired optional attributes will be set in order to
- *   modify the QP to the specified state.
- * @qp_attr_mask: The QP attribute mask that may be used to transition the
- *   QP to the specified state.
- *
- * Users must set the @qp_attr->qp_state to the desired QP state.  This call
- * will set all required attributes for the given transition, along with
- * known optional attributes.  Users may override the attributes returned from
- * this call before calling ib_modify_qp.
- *
- * Users that wish to have their QP automatically transitioned through its
- * states can associate a QP with the rdma_cm_id by calling rdma_create_qp().
- */
-int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr,
-		       int *qp_attr_mask);
-
-/**
- * rdma_connect - Initiate an active connection request.
- * @id: Connection identifier to connect.
- * @conn_param: Connection information used for connected QPs.
- *
- * Users must have resolved a route for the rdma_cm_id to connect with
- * by having called rdma_resolve_route before calling this routine.
- *
- * This call will either connect to a remote QP or obtain remote QP
- * information for unconnected rdma_cm_id's.  The actual operation is
- * based on the rdma_cm_id's port space.
- */
-int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param);
-
-/**
- * rdma_listen - This function is called by the passive side to
- *   listen for incoming connection requests.
- *
- * Users must have bound the rdma_cm_id to a local address by calling
- * rdma_bind_addr before calling this routine.
- */
-int rdma_listen(struct rdma_cm_id *id, int backlog);
-
-/**
- * rdma_accept - Called to accept a connection request or response.
- * @id: Connection identifier associated with the request.
- * @conn_param: Information needed to establish the connection.  This must be
- *   provided if accepting a connection request.  If accepting a connection
- *   response, this parameter must be NULL.
- *
- * Typically, this routine is only called by the listener to accept a connection
- * request.  It must also be called on the active side of a connection if the
- * user is performing their own QP transitions.
- *
- * In the case of error, a reject message is sent to the remote side and the
- * state of the qp associated with the id is modified to error, such that any
- * previously posted receive buffers would be flushed.
- */
-int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param);
-
-/**
- * rdma_notify - Notifies the RDMA CM of an asynchronous event that has
- * occurred on the connection.
- * @id: Connection identifier to transition to established.
- * @event: Asynchronous event.
- *
- * This routine should be invoked by users to notify the CM of relevant
- * communication events.  Events that should be reported to the CM and
- * when to report them are:
- *
- * IB_EVENT_COMM_EST - Used when a message is received on a connected
- *    QP before an RTU has been received.
- */
-int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event);
-
-/**
- * rdma_reject - Called to reject a connection request or response.
- */
-int rdma_reject(struct rdma_cm_id *id, const void *private_data,
-		u8 private_data_len);
-
-/**
- * rdma_disconnect - This function disconnects the associated QP and
- *   transitions it into the error state.
- */
-int rdma_disconnect(struct rdma_cm_id *id);
-
-/**
- * rdma_join_multicast - Join the multicast group specified by the given
- *   address.
- * @id: Communication identifier associated with the request.
- * @addr: Multicast address identifying the group to join.
- * @context: User-defined context associated with the join request, returned
- * to the user through the private_data pointer in multicast events.
- */
-int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr,
-			void *context);
-
-/**
- * rdma_leave_multicast - Leave the multicast group specified by the given
- *   address.
- */
-void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr);
-
-#endif /* RDMA_CM_H */
diff --git a/sys/contrib/rdma/rdma_cm_ib.h b/sys/contrib/rdma/rdma_cm_ib.h
deleted file mode 100644
index b69f66613bd..00000000000
--- a/sys/contrib/rdma/rdma_cm_ib.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2006 Intel Corporation.  All rights reserved.
- *
- * This Software is licensed under one of the following licenses:
- *
- * 1) under the terms of the "Common Public License 1.0" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/cpl.php.
- *
- * 2) under the terms of the "The BSD License" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/bsd-license.php.
- *
- * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
- *    copy of which is available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/gpl-license.php.
- *
- * Licensee has the right to choose one of the above licenses.
- *
- * Redistributions of source code must retain the above copyright
- * notice and one of the license notices.
- *
- * Redistributions in binary form must reproduce both the above copyright
- * notice, one of the license notices in the documentation
- * and/or other materials provided with the distribution.
- *
- * $FreeBSD$
- */
-
-#if !defined(RDMA_CM_IB_H)
-#define RDMA_CM_IB_H
-
-#include <rdma/rdma_cm.h>
-
-/**
- * rdma_set_ib_paths - Manually sets the path records used to establish a
- *   connection.
- * @id: Connection identifier associated with the request.
- * @path_rec: Reference to the path record
- *
- * This call permits a user to specify routing information for rdma_cm_id's
- * bound to Infiniband devices.  It is called on the client side of a
- * connection and replaces the call to rdma_resolve_route.
- */
-int rdma_set_ib_paths(struct rdma_cm_id *id,
-		      struct ib_sa_path_rec *path_rec, int num_paths);
-
-/* Global qkey for UDP QPs and multicast groups. */
-#define RDMA_UDP_QKEY 0x01234567
-
-#endif /* RDMA_CM_IB_H */
diff --git a/sys/contrib/rdma/rdma_cma.c b/sys/contrib/rdma/rdma_cma.c
deleted file mode 100644
index ea3d501c4f0..00000000000
--- a/sys/contrib/rdma/rdma_cma.c
+++ /dev/null
@@ -1,3000 +0,0 @@
-/*
- * Copyright (c) 2005 Voltaire Inc.  All rights reserved.
- * Copyright (c) 2002-2005, Network Appliance, Inc. All rights reserved.
- * Copyright (c) 1999-2005, Mellanox Technologies, Inc. All rights reserved.
- * Copyright (c) 2005-2006 Intel Corporation.  All rights reserved.
- *
- * This Software is licensed under one of the following licenses:
- *
- * 1) under the terms of the "Common Public License 1.0" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/cpl.php.
- *
- * 2) under the terms of the "The BSD License" a copy of which is
- *    available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/bsd-license.php.
- *
- * 3) under the terms of the "GNU General Public License (GPL) Version 2" a
- *    copy of which is available from the Open Source Initiative, see
- *    http://www.opensource.org/licenses/gpl-license.php.
- *
- * Licensee has the right to choose one of the above licenses.
- *
- * Redistributions of source code must retain the above copyright
- * notice and one of the license notices.
- *
- * Redistributions in binary form must reproduce both the above copyright
- * notice, one of the license notices in the documentation
- * and/or other materials provided with the distribution.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/condvar.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/libkern.h>
-#include <sys/socket.h>
-#include <sys/module.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/rwlock.h>
-#include <sys/queue.h>
-#include <sys/taskqueue.h>
-#include <sys/priv.h>
-#include <sys/syslog.h>
-
-#include <net/if.h>
-#include <netinet/in.h>
-#include <netinet/in_pcb.h>
-
-#include <contrib/rdma/rdma_cm.h>
-#include <contrib/rdma/ib_cache.h>
-#include <contrib/rdma/ib_cm.h>
-#include <contrib/rdma/ib_sa.h>
-#include <contrib/rdma/iw_cm.h>
-
-#define CMA_CM_RESPONSE_TIMEOUT 20
-#define CMA_MAX_CM_RETRIES 15
-
-static void cma_add_one(struct ib_device *device);
-static void cma_remove_one(struct ib_device *device);
-
-static struct ib_client cma_client = {
-	.name   = "cma",
-	.add    = cma_add_one,
-	.remove = cma_remove_one
-};
-
-#ifdef IB_SUPPORTED
-static struct ib_sa_client sa_client;
-#endif
-static struct rdma_addr_client addr_client;
-static TAILQ_HEAD(, cma_device) dev_list;
-static LIST_HEAD(, rdma_id_private) listen_any_list;
-static struct mtx lock;
-static struct taskqueue *cma_wq;
-static DEFINE_KVL(sdp_ps);
-static DEFINE_KVL(tcp_ps);
-static DEFINE_KVL(udp_ps);
-static DEFINE_KVL(ipoib_ps);
-static int next_port;
-
-struct cma_device {
-	struct ib_device	*device;
-	struct mtx		lock;
-	struct cv		comp;
-	int			refcount;
-
-	LIST_HEAD(, rdma_id_private) id_list;
-	TAILQ_ENTRY(cma_device) list;
-};
-
-enum cma_state {
-	CMA_IDLE,
-	CMA_ADDR_QUERY,
-	CMA_ADDR_RESOLVED,
-	CMA_ROUTE_QUERY,
-	CMA_ROUTE_RESOLVED,
-	CMA_CONNECT,
-	CMA_DISCONNECT,
-	CMA_ADDR_BOUND,
-	CMA_LISTEN,
-	CMA_DEVICE_REMOVAL,
-	CMA_DESTROYING
-};
-
-struct rdma_bind_list {
-	struct kvl		*ps;
-	TAILQ_HEAD(, rdma_id_private) owners;
-	unsigned short		port;
-};
-
-/*
- * Device removal can occur at anytime, so we need extra handling to
- * serialize notifying the user of device removal with other callbacks.
- * We do this by disabling removal notification while a callback is in process,
- * and reporting it after the callback completes.
- */
-struct rdma_id_private {
-	struct rdma_cm_id	id;
-
-	struct rdma_bind_list	*bind_list;
-	struct socket		*so;
-	TAILQ_ENTRY(rdma_id_private) node;
-	LIST_ENTRY(rdma_id_private) list; /* listen_any_list or cma_dev.list */
-	LIST_HEAD(, rdma_id_private) listen_list; /* per-device listens */
-	LIST_ENTRY(rdma_id_private) listen_entry; 
-	struct cma_device	*cma_dev;
-#ifdef IB_SUPPORTED	
-	LIST_HEAD(, cma_multicast) mc_list;
-#endif
-	enum cma_state		state;
-	struct mtx		lock;
-	struct cv		comp;
-	int			refcount;
-	struct cv		wait_remove;
-	int			dev_remove;
-
-	int			backlog;
-	int			timeout_ms;
-	struct ib_sa_query	*query;
-	int			query_id;
-	union {
-		struct ib_cm_id	*ib;
-		struct iw_cm_id	*iw;
-	} cm_id;
-
-	u32			seq_num;
-	u32			qkey;
-	u32			qp_num;
-	u8			srq;
-};
-
-#ifdef IB_SUPPORTED
-struct cma_multicast {
-	struct rdma_id_private *id_priv;
-	union {
-		struct ib_sa_multicast *ib;
-	} multicast;
-	struct list_head	list;
-	void			*context;
-	struct sockaddr		addr;
-	u8			pad[sizeof(struct sockaddr_in6) -
-				    sizeof(struct sockaddr)];
-};
-#endif
-
-struct cma_work {
-	struct task		task;
-	struct rdma_id_private	*id;
-	enum cma_state		old_state;
-	enum cma_state		new_state;
-	struct rdma_cm_event	event;
-};
-
-union cma_ip_addr {
-	struct in6_addr ip6;
-	struct {
-		__u32 pad[3];
-		__u32 addr;
-	} ip4;
-};
-
-struct cma_hdr {
-	u8 cma_version;
-	u8 ip_version;	/* IP version: 7:4 */
-	__u16 port;
-	union cma_ip_addr src_addr;
-	union cma_ip_addr dst_addr;
-};
-
-struct sdp_hh {
-	u8 bsdh[16];
-	u8 sdp_version; /* Major version: 7:4 */
-	u8 ip_version;	/* IP version: 7:4 */
-	u8 sdp_specific1[10];
-	__u16 port;
-	__u16 sdp_specific2;
-	union cma_ip_addr src_addr;
-	union cma_ip_addr dst_addr;
-};
-
-struct sdp_hah {
-	u8 bsdh[16];
-	u8 sdp_version;
-};
-
-#define CMA_VERSION 0x00
-#define SDP_MAJ_VERSION 0x2
-
-static int cma_comp(struct rdma_id_private *id_priv, enum cma_state comp)
-{
-	int ret;
-
-	mtx_lock(&id_priv->lock);
-	ret = (id_priv->state == comp);
-	mtx_unlock(&id_priv->lock);
-	return ret;
-}
-
-static int cma_comp_exch(struct rdma_id_private *id_priv,
-			 enum cma_state comp, enum cma_state exch)
-{
-	int ret;
-
-	mtx_lock(&id_priv->lock);
-	if ((ret = (id_priv->state == comp)))
-		id_priv->state = exch;
-	mtx_unlock(&id_priv->lock);
-	return ret;
-}
-
-static enum cma_state cma_exch(struct rdma_id_private *id_priv,
-			       enum cma_state exch)
-{
-	enum cma_state old;
-
-	mtx_lock(&id_priv->lock);
-	old = id_priv->state;
-	id_priv->state = exch;
-	mtx_unlock(&id_priv->lock);
-	return old;
-}
-
-static inline u8 cma_get_ip_ver(struct cma_hdr *hdr)
-{
-	return hdr->ip_version >> 4;
-}
-
-static inline void cma_set_ip_ver(struct cma_hdr *hdr, u8 ip_ver)
-{
-	hdr->ip_version = (ip_ver << 4) | (hdr->ip_version & 0xF);
-}
-
-static inline u8 sdp_get_majv(u8 sdp_version)
-{
-	return sdp_version >> 4;
-}
-
-static inline u8 sdp_get_ip_ver(struct sdp_hh *hh)
-{
-	return hh->ip_version >> 4;
-}
-
-static inline void sdp_set_ip_ver(struct sdp_hh *hh, u8 ip_ver)
-{
-	hh->ip_version = (ip_ver << 4) | (hh->ip_version & 0xF);
-}
-
-static inline int cma_is_ud_ps(enum rdma_port_space ps)
-{
-	return (ps == RDMA_PS_UDP || ps == RDMA_PS_IPOIB);
-}
-
-static void cma_attach_to_dev(struct rdma_id_private *id_priv,
-			      struct cma_device *cma_dev)
-{
-	mtx_lock(&cma_dev->lock);
-	cma_dev->refcount++;
-	mtx_unlock(&cma_dev->lock);
-	id_priv->cma_dev = cma_dev;
-	id_priv->id.device = cma_dev->device;
-	LIST_INSERT_HEAD(&cma_dev->id_list, id_priv, list);
-}
-
-static inline void cma_deref_dev(struct cma_device *cma_dev)
-{
-	mtx_lock(&cma_dev->lock);
-	if (--cma_dev->refcount == 0)
-		cv_broadcast(&cma_dev->comp);
-	mtx_unlock(&cma_dev->lock);
-}
-
-static void cma_detach_from_dev(struct rdma_id_private *id_priv)
-{
-	LIST_REMOVE(id_priv, list);
-	cma_deref_dev(id_priv->cma_dev);
-	id_priv->cma_dev = NULL;
-}
-
-#ifdef IB_SUPPORTED
-static int cma_set_qkey(struct ib_device *device, u8 port_num,
-			enum rdma_port_space ps,
-			struct rdma_dev_addr *dev_addr, u32 *qkey)
-{
-	struct ib_sa_mcmember_rec rec;
-	int ret = 0;
-
-	switch (ps) {
-	case RDMA_PS_UDP:
-		*qkey = RDMA_UDP_QKEY;
-		break;
-	case RDMA_PS_IPOIB:
-		ib_addr_get_mgid(dev_addr, &rec.mgid);
-		ret = ib_sa_get_mcmember_rec(device, port_num, &rec.mgid, &rec);
-		*qkey = be32_to_cpu(rec.qkey);
-		break;
-	default:
-		break;
-	}
-	return ret;
-}
-#endif
-
-static int cma_acquire_dev(struct rdma_id_private *id_priv)
-{
-	struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr;
-	struct cma_device *cma_dev;
-	union ib_gid gid;
-	int ret = ENODEV;
-
-	switch (rdma_node_get_transport(dev_addr->dev_type)) {
-#ifdef IB_SUPPORTED
-	case RDMA_TRANSPORT_IB:
-		ib_addr_get_sgid(dev_addr, &gid);
-		break;
-#endif
-	case RDMA_TRANSPORT_IWARP:
-		iw_addr_get_sgid(dev_addr, &gid);
-		break;
-	default:
-		return (ENODEV);
-	}
-
-	TAILQ_FOREACH(cma_dev, &dev_list, list) {
-		ret = ib_find_cached_gid(cma_dev->device, &gid,
-					 &id_priv->id.port_num, NULL);
-		if (!ret) {
-#ifdef IB_SUPPORTED
-			ret = cma_set_qkey(cma_dev->device,
-					   id_priv->id.port_num,
-					   id_priv->id.ps, dev_addr,
-					   &id_priv->qkey);
-			if (!ret)
-#endif
-				cma_attach_to_dev(id_priv, cma_dev);
-			break;
-		}
-	}
-	return ret;
-}
-
-static void cma_deref_id(struct rdma_id_private *id_priv)
-{
-	mtx_lock(&id_priv->lock);
-	if (--id_priv->refcount == 0) {
-		cv_broadcast(&id_priv->comp);
-	}
-	mtx_unlock(&id_priv->lock);
-}
-
-static int cma_disable_remove(struct rdma_id_private *id_priv,
-			      enum cma_state state)
-{
-	int ret;
-
-	mtx_lock(&id_priv->lock);
-	if (id_priv->state == state) {
-		id_priv->dev_remove++;
-		ret = 0;
-	} else
-		ret = EINVAL;
-	mtx_unlock(&id_priv->lock);
-	return ret;
-}
-
-static void cma_enable_remove(struct rdma_id_private *id_priv)
-{
-	mtx_lock(&id_priv->lock);
-	if (--id_priv->dev_remove == 0)
-		cv_broadcast(&id_priv->wait_remove);
-	mtx_unlock(&id_priv->lock);
-}
-
-static int cma_has_cm_dev(struct rdma_id_private *id_priv)
-{
-	return (id_priv->id.device && id_priv->cm_id.ib);
-}
-
-struct rdma_cm_id *rdma_create_id(rdma_cm_event_handler event_handler,
-				  void *context, enum rdma_port_space ps)
-{
-	struct rdma_id_private *id_priv;
-
-	id_priv = malloc(sizeof *id_priv, M_DEVBUF, M_NOWAIT);
-	if (!id_priv)
-		return ERR_PTR(-ENOMEM);
-	bzero(id_priv, sizeof *id_priv);
-
-	id_priv->state = CMA_IDLE;
-	id_priv->id.context = context;
-	id_priv->id.event_handler = event_handler;
-	id_priv->id.ps = ps;
-	mtx_init(&id_priv->lock, "rdma_cm_id_priv", NULL, MTX_DUPOK|MTX_DEF);
-	cv_init(&id_priv->comp, "rdma_cm_id_priv");
-	id_priv->refcount = 1;
-	cv_init(&id_priv->wait_remove, "id priv wait remove");
-	LIST_INIT(&id_priv->listen_list);
-	arc4rand(&id_priv->seq_num, sizeof id_priv->seq_num, 0);
-
-	return &id_priv->id;
-}
-
-static int cma_init_ud_qp(struct rdma_id_private *id_priv, struct ib_qp *qp)
-{
-	struct ib_qp_attr qp_attr;
-	int qp_attr_mask, ret;
-
-	qp_attr.qp_state = IB_QPS_INIT;
-	ret = rdma_init_qp_attr(&id_priv->id, &qp_attr, &qp_attr_mask);
-	if (ret)
-		return ret;
-
-	ret = ib_modify_qp(qp, &qp_attr, qp_attr_mask);
-	if (ret)
-		return ret;
-
-	qp_attr.qp_state = IB_QPS_RTR;
-	ret = ib_modify_qp(qp, &qp_attr, IB_QP_STATE);
-	if (ret)
-		return ret;
-
-	qp_attr.qp_state = IB_QPS_RTS;
-	qp_attr.sq_psn = 0;
-	ret = ib_modify_qp(qp, &qp_attr, IB_QP_STATE | IB_QP_SQ_PSN);
-
-	return ret;
-}
-
-static int cma_init_conn_qp(struct rdma_id_private *id_priv, struct ib_qp *qp)
-{
-	struct ib_qp_attr qp_attr;
-	int qp_attr_mask, ret;
-
-	qp_attr.qp_state = IB_QPS_INIT;
-	ret = rdma_init_qp_attr(&id_priv->id, &qp_attr, &qp_attr_mask);
-	if (ret)
-		return ret;
-
-	return ib_modify_qp(qp, &qp_attr, qp_attr_mask);
-}
-
-int rdma_create_qp(struct rdma_cm_id *id, struct ib_pd *pd,
-		   struct ib_qp_init_attr *qp_init_attr)
-{
-	struct rdma_id_private *id_priv;
-	struct ib_qp *qp;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (id->device != pd->device)
-		return (EINVAL);
-
-	qp = ib_create_qp(pd, qp_init_attr);
-	if (IS_ERR(qp))
-		return PTR_ERR(qp);
-	if (cma_is_ud_ps(id_priv->id.ps))
-		ret = cma_init_ud_qp(id_priv, qp);
-	else
-		ret = cma_init_conn_qp(id_priv, qp);
-	if (ret)
-		goto err;
-
-	id->qp = qp;
-	id_priv->qp_num = qp->qp_num;
-	id_priv->srq = (qp->srq != NULL);
-	return 0;
-err:
-	ib_destroy_qp(qp);
-	return ret;
-}
-
-void rdma_destroy_qp(struct rdma_cm_id *id)
-{
-	ib_destroy_qp(id->qp);
-}
-
-static int cma_modify_qp_rtr(struct rdma_cm_id *id)
-{
-	struct ib_qp_attr qp_attr;
-	int qp_attr_mask, ret;
-
-	if (!id->qp)
-		return 0;
-
-	/* Need to update QP attributes from default values. */
-	qp_attr.qp_state = IB_QPS_INIT;
-	ret = rdma_init_qp_attr(id, &qp_attr, &qp_attr_mask);
-	if (ret)
-		return ret;
-
-	ret = ib_modify_qp(id->qp, &qp_attr, qp_attr_mask);
-	if (ret)
-		return ret;
-
-	qp_attr.qp_state = IB_QPS_RTR;
-	ret = rdma_init_qp_attr(id, &qp_attr, &qp_attr_mask);
-	if (ret)
-		return ret;
-
-	return ib_modify_qp(id->qp, &qp_attr, qp_attr_mask);
-}
-
-#ifdef IB_SUPPORTED
-static int cma_modify_qp_rts(struct rdma_cm_id *id)
-{
-	struct ib_qp_attr qp_attr;
-	int qp_attr_mask, ret;
-
-	if (!id->qp)
-		return 0;
-
-	qp_attr.qp_state = IB_QPS_RTS;
-	ret = rdma_init_qp_attr(id, &qp_attr, &qp_attr_mask);
-	if (ret)
-		return ret;
-
-	return ib_modify_qp(id->qp, &qp_attr, qp_attr_mask);
-}
-#endif
-
-static int cma_modify_qp_err(struct rdma_cm_id *id)
-{
-	struct ib_qp_attr qp_attr;
-
-	if (!id->qp)
-		return 0;
-
-	qp_attr.qp_state = IB_QPS_ERR;
-	return ib_modify_qp(id->qp, &qp_attr, IB_QP_STATE);
-}
-
-#ifdef IB_SUPPORTED
-static int cma_ib_init_qp_attr(struct rdma_id_private *id_priv,
-			       struct ib_qp_attr *qp_attr, int *qp_attr_mask)
-{
-	struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr;
-	int ret;
-
-	ret = ib_find_cached_pkey(id_priv->id.device, id_priv->id.port_num,
-				  ib_addr_get_pkey(dev_addr),
-				  &qp_attr->pkey_index);
-	if (ret)
-		return ret;
-
-	qp_attr->port_num = id_priv->id.port_num;
-	*qp_attr_mask = IB_QP_STATE | IB_QP_PKEY_INDEX | IB_QP_PORT;
-
-	if (cma_is_ud_ps(id_priv->id.ps)) {
-		qp_attr->qkey = id_priv->qkey;
-		*qp_attr_mask |= IB_QP_QKEY;
-	} else {
-		qp_attr->qp_access_flags = 0;
-		*qp_attr_mask |= IB_QP_ACCESS_FLAGS;
-	}
-	return 0;
-}
-#endif
-
-int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr,
-		       int *qp_attr_mask)
-{
-	struct rdma_id_private *id_priv;
-	int ret = 0;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-#ifdef IB_SUPPORTED
-	switch (rdma_node_get_transport(id_priv->id.device->node_type)) {
-	case RDMA_TRANSPORT_IB:
-		if (!id_priv->cm_id.ib || cma_is_ud_ps(id_priv->id.ps))
-			ret = cma_ib_init_qp_attr(id_priv, qp_attr, qp_attr_mask);
-		else
-			ret = ib_cm_init_qp_attr(id_priv->cm_id.ib, qp_attr,
-						 qp_attr_mask);
-		if (qp_attr->qp_state == IB_QPS_RTR)
-			qp_attr->rq_psn = id_priv->seq_num;
-		break;
-	case RDMA_TRANSPORT_IWARP:
-#endif
-		if (!id_priv->cm_id.iw) {
-			qp_attr->qp_access_flags = IB_ACCESS_LOCAL_WRITE;
-			*qp_attr_mask = IB_QP_STATE | IB_QP_ACCESS_FLAGS;
-		} else
-			ret = iw_cm_init_qp_attr(id_priv->cm_id.iw, qp_attr,
-						 qp_attr_mask);
-#ifdef IB_SUPPORTED
-		break;
-	default:
-		ret = ENOSYS;
-		break;
-	}
-#endif
-
-	return ret;
-}
-
-static inline int cma_zero_addr(struct sockaddr *addr)
-{
-	struct in6_addr *ip6;
-
-	if (addr->sa_family == AF_INET)
-		return in_nullhost(((struct sockaddr_in *) addr)->sin_addr);
-	else {
-		ip6 = &((struct sockaddr_in6 *) addr)->sin6_addr;
-		return (ip6->s6_addr32[0] | ip6->s6_addr32[1] |
-			ip6->s6_addr32[2] | ip6->s6_addr32[3]) == 0;
-	}
-}
-
-static inline int cma_loopback_addr(struct sockaddr *addr)
-{
-	return ((struct sockaddr_in *)addr)->sin_addr.s_addr == INADDR_LOOPBACK;
-}
-
-static inline int cma_any_addr(struct sockaddr *addr)
-{
-	return cma_zero_addr(addr) || cma_loopback_addr(addr);
-}
-
-static inline __be16 cma_port(struct sockaddr *addr)
-{
-	if (addr->sa_family == AF_INET)
-		return ((struct sockaddr_in *) addr)->sin_port;
-	else
-		return ((struct sockaddr_in6 *) addr)->sin6_port;
-}
-
-static inline int cma_any_port(struct sockaddr *addr)
-{
-	return !cma_port(addr);
-}
-
-#ifdef IB_SUPPORTED
-static int cma_get_net_info(void *hdr, enum rdma_port_space ps,
-			    u8 *ip_ver, __u16 *port,
-			    union cma_ip_addr **src, union cma_ip_addr **dst)
-{
-	switch (ps) {
-	case RDMA_PS_SDP:
-		if (sdp_get_majv(((struct sdp_hh *) hdr)->sdp_version) !=
-		    SDP_MAJ_VERSION)
-			return (EINVAL);
-
-		*ip_ver	= sdp_get_ip_ver(hdr);
-		*port	= ((struct sdp_hh *) hdr)->port;
-		*src	= &((struct sdp_hh *) hdr)->src_addr;
-		*dst	= &((struct sdp_hh *) hdr)->dst_addr;
-		break;
-	default:
-		if (((struct cma_hdr *) hdr)->cma_version != CMA_VERSION)
-			return (EINVAL);
-
-		*ip_ver	= cma_get_ip_ver(hdr);
-		*port	= ((struct cma_hdr *) hdr)->port;
-		*src	= &((struct cma_hdr *) hdr)->src_addr;
-		*dst	= &((struct cma_hdr *) hdr)->dst_addr;
-		break;
-	}
-
-	if (*ip_ver != 4 && *ip_ver != 6)
-		return (EINVAL);
-	return 0;
-}
-
-static void cma_save_net_info(struct rdma_addr *addr,
-			      struct rdma_addr *listen_addr,
-			      u8 ip_ver, __u16 port,
-			      union cma_ip_addr *src, union cma_ip_addr *dst)
-{
-	struct sockaddr_in *listen4, *ip4;
-	struct sockaddr_in6 *listen6, *ip6;
-
-	switch (ip_ver) {
-	case 4:
-		listen4 = (struct sockaddr_in *) &listen_addr->src_addr;
-		ip4 = (struct sockaddr_in *) &addr->src_addr;
-		ip4->sin_family = listen4->sin_family;
-		ip4->sin_addr.s_addr = dst->ip4.addr;
-		ip4->sin_port = listen4->sin_port;
-
-		ip4 = (struct sockaddr_in *) &addr->dst_addr;
-		ip4->sin_family = listen4->sin_family;
-		ip4->sin_addr.s_addr = src->ip4.addr;
-		ip4->sin_port = port;
-		break;
-	case 6:
-		listen6 = (struct sockaddr_in6 *) &listen_addr->src_addr;
-		ip6 = (struct sockaddr_in6 *) &addr->src_addr;
-		ip6->sin6_family = listen6->sin6_family;
-		ip6->sin6_addr = dst->ip6;
-		ip6->sin6_port = listen6->sin6_port;
-
-		ip6 = (struct sockaddr_in6 *) &addr->dst_addr;
-		ip6->sin6_family = listen6->sin6_family;
-		ip6->sin6_addr = src->ip6;
-		ip6->sin6_port = port;
-		break;
-	default:
-		break;
-	}
-}
-#endif
-
-static inline int cma_user_data_offset(enum rdma_port_space ps)
-{
-	switch (ps) {
-	case RDMA_PS_SDP:
-		return 0;
-	default:
-		return sizeof(struct cma_hdr);
-	}
-}
-
-static void cma_cancel_route(struct rdma_id_private *id_priv)
-{
-#ifdef IB_SUPPORTED
-	switch (rdma_node_get_transport(id_priv->id.device->node_type)) {
-	case RDMA_TRANSPORT_IB:
-		if (id_priv->query)
-			ib_sa_cancel_query(id_priv->query_id, id_priv->query);
-		break;
-	default:
-		break;
-	}
-#endif
-}
-
-static inline int cma_internal_listen(struct rdma_id_private *id_priv)
-{
-	return (id_priv->state == CMA_LISTEN) && id_priv->cma_dev &&
-	       cma_any_addr(&id_priv->id.route.addr.src_addr);
-}
-
-static void cma_destroy_listen(struct rdma_id_private *id_priv)
-{
-	cma_exch(id_priv, CMA_DESTROYING);
-
-	if (id_priv->cma_dev) {
-#ifdef IB_SUPPORTED
-		switch (rdma_node_get_transport(id_priv->id.device->node_type)) {
-		case RDMA_TRANSPORT_IB:
-			if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib))
-				ib_destroy_cm_id(id_priv->cm_id.ib);
-			break;
-		case RDMA_TRANSPORT_IWARP:
-#endif
-			if (id_priv->cm_id.iw && !IS_ERR(id_priv->cm_id.iw))
-				iw_destroy_cm_id(id_priv->cm_id.iw);
-#ifdef IB_SUPPORTED
-			break;
-		default:
-			break;
-		}
-#endif
-		cma_detach_from_dev(id_priv);
-	}
-	LIST_REMOVE(id_priv, listen_entry);
-
-	cma_deref_id(id_priv);
-	mtx_lock(&id_priv->lock);
-	if (id_priv->refcount)
-		cv_wait(&id_priv->comp, &id_priv->lock);
-	mtx_unlock(&id_priv->lock);
-
-	free(id_priv, M_DEVBUF);
-}
-
-static void cma_cancel_listens(struct rdma_id_private *id_priv)
-{
-	struct rdma_id_private *dev_id_priv;
-
-	mtx_lock(&lock);
-	LIST_REMOVE(id_priv, list);
-
-	while (!LIST_EMPTY(&id_priv->listen_list)) {
-		dev_id_priv = LIST_FIRST(&id_priv->listen_list);
-		cma_destroy_listen(dev_id_priv);
-	}
-	mtx_unlock(&lock);
-}
-
-static void cma_cancel_operation(struct rdma_id_private *id_priv,
-				 enum cma_state state)
-{
-	switch (state) {
-	case CMA_ADDR_QUERY:
-		rdma_addr_cancel(&id_priv->id.route.addr.dev_addr);
-		break;
-	case CMA_ROUTE_QUERY:
-		cma_cancel_route(id_priv);
-		break;
-	case CMA_LISTEN:
-		if (cma_any_addr(&id_priv->id.route.addr.src_addr) &&
-		    !id_priv->cma_dev)
-			cma_cancel_listens(id_priv);
-		break;
-	default:
-		break;
-	}
-}
-
-static void cma_release_port(struct rdma_id_private *id_priv)
-{
-	struct rdma_bind_list *bind_list = id_priv->bind_list;
-
-	if (!bind_list)
-		return;
-
-	mtx_lock(&lock);
-	TAILQ_REMOVE(&bind_list->owners, id_priv, node);
-	if (TAILQ_EMPTY(&bind_list->owners)) {
-		kvl_delete(bind_list->ps, bind_list->port);
-		free(bind_list, M_DEVBUF);
-	}
-	mtx_unlock(&lock);
-	if (id_priv->so)
-		soclose(id_priv->so);
-}
-
-#ifdef IB_SUPPORTED
-static void cma_leave_mc_groups(struct rdma_id_private *id_priv)
-{
-	struct cma_multicast *mc;
-
-	while (!LIST_EMPTY(&id_priv->mc_list)) {
-		mc = LIST_FIRST(&id_priv->mc_list);
-		LIST_REMOVE(mc, list);
-		ib_sa_free_multicast(mc->multicast.ib);
-		free(mc, M_DEVBUF);
-	}
-}
-#endif
-
-void rdma_destroy_id(struct rdma_cm_id *id)
-{
-	struct rdma_id_private *id_priv;
-	enum cma_state state;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	state = cma_exch(id_priv, CMA_DESTROYING);
-	cma_cancel_operation(id_priv, state);
-
-	mtx_lock(&lock);
-	if (id_priv->cma_dev) {
-		mtx_unlock(&lock);
-#ifdef IB_SUPPORTED
-		switch (rdma_node_get_transport(id->device->node_type)) {
-		case RDMA_TRANSPORT_IB:
-			if (id_priv->cm_id.ib && !IS_ERR(id_priv->cm_id.ib))
-				ib_destroy_cm_id(id_priv->cm_id.ib);
-			break;
-		case RDMA_TRANSPORT_IWARP:
-#endif
-			if (id_priv->cm_id.iw && !IS_ERR(id_priv->cm_id.iw))
-				iw_destroy_cm_id(id_priv->cm_id.iw);
-#ifdef IB_SUPPORTED
-			break;
-		default:
-			break;
-		}
-		cma_leave_mc_groups(id_priv);
-#endif
-		mtx_lock(&lock);
-		cma_detach_from_dev(id_priv);
-	}
-	mtx_unlock(&lock);
-	cma_release_port(id_priv);
-	cma_deref_id(id_priv);
-	mtx_lock(&id_priv->lock);
-	PANIC_IF(id_priv->refcount < 0);
-	if (id_priv->refcount)
-		cv_wait(&id_priv->comp, &id_priv->lock);
-	mtx_unlock(&id_priv->lock);
-	free(id_priv->id.route.path_rec, M_DEVBUF);
-	free(id_priv, M_DEVBUF);
-}
-
-#ifdef IB_SUPPORTED
-static int cma_rep_recv(struct rdma_id_private *id_priv)
-{
-	int ret;
-
-	ret = cma_modify_qp_rtr(&id_priv->id);
-	if (ret)
-		goto reject;
-
-	ret = cma_modify_qp_rts(&id_priv->id);
-	if (ret)
-		goto reject;
-
-	ret = ib_send_cm_rtu(id_priv->cm_id.ib, NULL, 0);
-	if (ret)
-		goto reject;
-
-	return 0;
-reject:
-	cma_modify_qp_err(&id_priv->id);
-	ib_send_cm_rej(id_priv->cm_id.ib, IB_CM_REJ_CONSUMER_DEFINED,
-		       NULL, 0, NULL, 0);
-	return ret;
-}
-
-static int cma_verify_rep(struct rdma_id_private *id_priv, void *data)
-{
-	if (id_priv->id.ps == RDMA_PS_SDP &&
-	    sdp_get_majv(((struct sdp_hah *) data)->sdp_version) !=
-	    SDP_MAJ_VERSION)
-		return (EINVAL);
-
-	return 0;
-}
-
-static void cma_set_rep_event_data(struct rdma_cm_event *event,
-				   struct ib_cm_rep_event_param *rep_data,
-				   void *private_data)
-{
-	event->param.conn.private_data = private_data;
-	event->param.conn.private_data_len = IB_CM_REP_PRIVATE_DATA_SIZE;
-	event->param.conn.responder_resources = rep_data->responder_resources;
-	event->param.conn.initiator_depth = rep_data->initiator_depth;
-	event->param.conn.flow_control = rep_data->flow_control;
-	event->param.conn.rnr_retry_count = rep_data->rnr_retry_count;
-	event->param.conn.srq = rep_data->srq;
-	event->param.conn.qp_num = rep_data->remote_qpn;
-}
-
-static int cma_ib_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
-{
-	struct rdma_id_private *id_priv = cm_id->context;
-	struct rdma_cm_event event;
-	int ret = 0;
-
-	if (cma_disable_remove(id_priv, CMA_CONNECT))
-		return 0;
-
-	memset(&event, 0, sizeof event);
-	switch (ib_event->event) {
-	case IB_CM_REQ_ERROR:
-	case IB_CM_REP_ERROR:
-		event.event = RDMA_CM_EVENT_UNREACHABLE;
-		event.status = ETIMEDOUT;
-		break;
-	case IB_CM_REP_RECEIVED:
-		event.status = cma_verify_rep(id_priv, ib_event->private_data);
-		if (event.status)
-			event.event = RDMA_CM_EVENT_CONNECT_ERROR;
-		else if (id_priv->id.qp && id_priv->id.ps != RDMA_PS_SDP) {
-			event.status = cma_rep_recv(id_priv);
-			event.event = event.status ? RDMA_CM_EVENT_CONNECT_ERROR :
-						     RDMA_CM_EVENT_ESTABLISHED;
-		} else
-			event.event = RDMA_CM_EVENT_CONNECT_RESPONSE;
-		cma_set_rep_event_data(&event, &ib_event->param.rep_rcvd,
-				       ib_event->private_data);
-		break;
-	case IB_CM_RTU_RECEIVED:
-	case IB_CM_USER_ESTABLISHED:
-		event.event = RDMA_CM_EVENT_ESTABLISHED;
-		break;
-	case IB_CM_DREQ_ERROR:
-		event.status = ETIMEDOUT; /* fall through */
-	case IB_CM_DREQ_RECEIVED:
-	case IB_CM_DREP_RECEIVED:
-		if (!cma_comp_exch(id_priv, CMA_CONNECT, CMA_DISCONNECT))
-			goto out;
-		event.event = RDMA_CM_EVENT_DISCONNECTED;
-		break;
-	case IB_CM_TIMEWAIT_EXIT:
-	case IB_CM_MRA_RECEIVED:
-		/* ignore event */
-		goto out;
-	case IB_CM_REJ_RECEIVED:
-		cma_modify_qp_err(&id_priv->id);
-		event.status = ib_event->param.rej_rcvd.reason;
-		event.event = RDMA_CM_EVENT_REJECTED;
-		event.param.conn.private_data = ib_event->private_data;
-		event.param.conn.private_data_len = IB_CM_REJ_PRIVATE_DATA_SIZE;
-		break;
-	default:
-		log(LOG_ERR, "RDMA CMA: unexpected IB CM event: %d",
-		       ib_event->event);
-		goto out;
-	}
-
-	ret = id_priv->id.event_handler(&id_priv->id, &event);
-	if (ret) {
-		/* Destroy the CM ID by returning a non-zero value. */
-		id_priv->cm_id.ib = NULL;
-		cma_exch(id_priv, CMA_DESTROYING);
-		cma_enable_remove(id_priv);
-		rdma_destroy_id(&id_priv->id);
-		return ret;
-	}
-out:
-	cma_enable_remove(id_priv);
-	return ret;
-}
-
-static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
-					       struct ib_cm_event *ib_event)
-{
-	struct rdma_id_private *id_priv;
-	struct rdma_cm_id *id;
-	struct rdma_route *rt;
-	union cma_ip_addr *src, *dst;
-	__u16 port;
-	u8 ip_ver;
-
-	if (cma_get_net_info(ib_event->private_data, listen_id->ps,
-			     &ip_ver, &port, &src, &dst))
-		goto err;
-
-	id = rdma_create_id(listen_id->event_handler, listen_id->context,
-			    listen_id->ps);
-	if (IS_ERR(id))
-		goto err;
-
-	cma_save_net_info(&id->route.addr, &listen_id->route.addr,
-			  ip_ver, port, src, dst);
-
-	rt = &id->route;
-	rt->num_paths = ib_event->param.req_rcvd.alternate_path ? 2 : 1;
-	rt->path_rec = malloc(sizeof *rt->path_rec * rt->num_paths,
-			       M_DEVBUF, M_NOWAIT);
-	if (!rt->path_rec)
-		goto destroy_id;
-
-	rt->path_rec[0] = *ib_event->param.req_rcvd.primary_path;
-	if (rt->num_paths == 2)
-		rt->path_rec[1] = *ib_event->param.req_rcvd.alternate_path;
-
-	ib_addr_set_sgid(&rt->addr.dev_addr, &rt->path_rec[0].sgid);
-	ib_addr_set_dgid(&rt->addr.dev_addr, &rt->path_rec[0].dgid);
-	ib_addr_set_pkey(&rt->addr.dev_addr, be16_to_cpu(rt->path_rec[0].pkey));
-	rt->addr.dev_addr.dev_type = RDMA_NODE_IB_CA;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	id_priv->state = CMA_CONNECT;
-	return id_priv;
-
-destroy_id:
-	rdma_destroy_id(id);
-err:
-	return NULL;
-}
-
-static struct rdma_id_private *cma_new_udp_id(struct rdma_cm_id *listen_id,
-					      struct ib_cm_event *ib_event)
-{
-	struct rdma_id_private *id_priv;
-	struct rdma_cm_id *id;
-	union cma_ip_addr *src, *dst;
-	__u16 port;
-	u8 ip_ver;
-	int ret;
-
-	id = rdma_create_id(listen_id->event_handler, listen_id->context,
-			    listen_id->ps);
-	if (IS_ERR(id))
-		return NULL;
-
-
-	if (cma_get_net_info(ib_event->private_data, listen_id->ps,
-			     &ip_ver, &port, &src, &dst))
-		goto err;
-
-	cma_save_net_info(&id->route.addr, &listen_id->route.addr,
-			  ip_ver, port, src, dst);
-
-	ret = rdma_translate_ip(&id->route.addr.src_addr,
-				&id->route.addr.dev_addr);
-	if (ret)
-		goto err;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	id_priv->state = CMA_CONNECT;
-	return id_priv;
-err:
-	rdma_destroy_id(id);
-	return NULL;
-}
-
-static void cma_set_req_event_data(struct rdma_cm_event *event,
-				   struct ib_cm_req_event_param *req_data,
-				   void *private_data, int offset)
-{
-	event->param.conn.private_data = private_data + offset;
-	event->param.conn.private_data_len = IB_CM_REQ_PRIVATE_DATA_SIZE - offset;
-	event->param.conn.responder_resources = req_data->responder_resources;
-	event->param.conn.initiator_depth = req_data->initiator_depth;
-	event->param.conn.flow_control = req_data->flow_control;
-	event->param.conn.retry_count = req_data->retry_count;
-	event->param.conn.rnr_retry_count = req_data->rnr_retry_count;
-	event->param.conn.srq = req_data->srq;
-	event->param.conn.qp_num = req_data->remote_qpn;
-}
-
-static int cma_req_handler(struct ib_cm_id *cm_id, struct ib_cm_event *ib_event)
-{
-	struct rdma_id_private *listen_id, *conn_id;
-	struct rdma_cm_event event;
-	int offset, ret;
-
-	listen_id = cm_id->context;
-	if (cma_disable_remove(listen_id, CMA_LISTEN))
-		return (ECONNABORTED);
-
-	memset(&event, 0, sizeof event);
-	offset = cma_user_data_offset(listen_id->id.ps);
-	event.event = RDMA_CM_EVENT_CONNECT_REQUEST;
-	if (cma_is_ud_ps(listen_id->id.ps)) {
-		conn_id = cma_new_udp_id(&listen_id->id, ib_event);
-		event.param.ud.private_data = ib_event->private_data + offset;
-		event.param.ud.private_data_len =
-				IB_CM_SIDR_REQ_PRIVATE_DATA_SIZE - offset;
-	} else {
-		conn_id = cma_new_conn_id(&listen_id->id, ib_event);
-		cma_set_req_event_data(&event, &ib_event->param.req_rcvd,
-				       ib_event->private_data, offset);
-	}
-	if (!conn_id) {
-		ret = ENOMEM;
-		goto out;
-	}
-
-	mtx_lock(&conn_id->lock);
-	conn_id->dev_remove++;
-	mtx_unlock(&conn_id->lock);
-	mtx_lock(&lock);
-	ret = cma_acquire_dev(conn_id);
-	mtx_unlock(&lock);
-	if (ret)
-		goto release_conn_id;
-
-	conn_id->cm_id.ib = cm_id;
-	cm_id->context = conn_id;
-	cm_id->cm_handler = cma_ib_handler;
-
-	ret = conn_id->id.event_handler(&conn_id->id, &event);
-	if (!ret)
-		goto out;
-
-	/* Destroy the CM ID by returning a non-zero value. */
-	conn_id->cm_id.ib = NULL;
-
-release_conn_id:
-	cma_exch(conn_id, CMA_DESTROYING);
-	cma_enable_remove(conn_id);
-	rdma_destroy_id(&conn_id->id);
-
-out:
-	cma_enable_remove(listen_id);
-	return ret;
-}
-
-static __be64 cma_get_service_id(enum rdma_port_space ps, struct sockaddr *addr)
-{
-	return cpu_to_be64(((u64)ps << 16) + be16_to_cpu(cma_port(addr)));
-}
-
-static void cma_set_compare_data(enum rdma_port_space ps, struct sockaddr *addr,
-				 struct ib_cm_compare_data *compare)
-{
-	struct cma_hdr *cma_data, *cma_mask;
-	struct sdp_hh *sdp_data, *sdp_mask;
-	__u32 ip4_addr;
-	struct in6_addr ip6_addr;
-
-	memset(compare, 0, sizeof *compare);
-	cma_data = (void *) compare->data;
-	cma_mask = (void *) compare->mask;
-	sdp_data = (void *) compare->data;
-	sdp_mask = (void *) compare->mask;
-
-	switch (addr->sa_family) {
-	case AF_INET:
-		ip4_addr = ((struct sockaddr_in *) addr)->sin_addr.s_addr;
-		if (ps == RDMA_PS_SDP) {
-			sdp_set_ip_ver(sdp_data, 4);
-			sdp_set_ip_ver(sdp_mask, 0xF);
-			sdp_data->dst_addr.ip4.addr = ip4_addr;
-			sdp_mask->dst_addr.ip4.addr = ~0;
-		} else {
-			cma_set_ip_ver(cma_data, 4);
-			cma_set_ip_ver(cma_mask, 0xF);
-			cma_data->dst_addr.ip4.addr = ip4_addr;
-			cma_mask->dst_addr.ip4.addr = ~0;
-		}
-		break;
-	case AF_INET6:
-		ip6_addr = ((struct sockaddr_in6 *) addr)->sin6_addr;
-		if (ps == RDMA_PS_SDP) {
-			sdp_set_ip_ver(sdp_data, 6);
-			sdp_set_ip_ver(sdp_mask, 0xF);
-			sdp_data->dst_addr.ip6 = ip6_addr;
-			memset(&sdp_mask->dst_addr.ip6, 0xFF,
-			       sizeof sdp_mask->dst_addr.ip6);
-		} else {
-			cma_set_ip_ver(cma_data, 6);
-			cma_set_ip_ver(cma_mask, 0xF);
-			cma_data->dst_addr.ip6 = ip6_addr;
-			memset(&cma_mask->dst_addr.ip6, 0xFF,
-			       sizeof cma_mask->dst_addr.ip6);
-		}
-		break;
-	default:
-		break;
-	}
-}
-#endif /* IB_SUPPORTED */
-
-static int cma_iw_handler(struct iw_cm_id *iw_id, struct iw_cm_event *iw_event)
-{
-	struct rdma_id_private *id_priv = iw_id->context;
-	struct rdma_cm_event event;
-	struct sockaddr_in *sin;
-	int ret = 0;
-
-	if (cma_disable_remove(id_priv, CMA_CONNECT))
-		return 0;
-
-	memset(&event, 0, sizeof event);
-	switch (iw_event->event) {
-	case IW_CM_EVENT_CLOSE:
-		event.event = RDMA_CM_EVENT_DISCONNECTED;
-		break;
-	case IW_CM_EVENT_CONNECT_REPLY:
-		sin = (struct sockaddr_in *) &id_priv->id.route.addr.src_addr;
-		*sin = iw_event->local_addr;
-		sin = (struct sockaddr_in *) &id_priv->id.route.addr.dst_addr;
-		*sin = iw_event->remote_addr;
-		switch ((int)iw_event->status) {
-		case 0:
-			event.event = RDMA_CM_EVENT_ESTABLISHED;
-			break;
-		case ECONNRESET:
-		case ECONNREFUSED:
-			event.event = RDMA_CM_EVENT_REJECTED;
-			break;
-		case ETIMEDOUT:
-			event.event = RDMA_CM_EVENT_UNREACHABLE;
-			break;
-		default:
-			event.event = RDMA_CM_EVENT_CONNECT_ERROR;
-			break;
-		}
-		break;
-	case IW_CM_EVENT_ESTABLISHED:
-		event.event = RDMA_CM_EVENT_ESTABLISHED;
-		break;
-	default:
-		panic("unknown event type %d", iw_event->event);
-		
-	}
-
-	event.status = iw_event->status;
-	event.param.conn.private_data = iw_event->private_data;
-	event.param.conn.private_data_len = iw_event->private_data_len;
-	ret = id_priv->id.event_handler(&id_priv->id, &event);
-	if (ret) {
-		/* Destroy the CM ID by returning a non-zero value. */
-		id_priv->cm_id.iw = NULL;
-		cma_exch(id_priv, CMA_DESTROYING);
-		cma_enable_remove(id_priv);
-		rdma_destroy_id(&id_priv->id);
-		return ret;
-	}
-
-	cma_enable_remove(id_priv);
-	return ret;
-}
-
-static int iw_conn_req_handler(struct iw_cm_id *cm_id,
-			       struct iw_cm_event *iw_event)
-{
-	struct rdma_cm_id *new_cm_id;
-	struct rdma_id_private *listen_id, *conn_id;
-	struct sockaddr_in *sin;
-	struct ifnet *dev;
-	struct rdma_cm_event event;
-	int ret;
-	struct ifaddr *ifa;
-	uint16_t port;
-
-	listen_id = cm_id->context;
-	if (cma_disable_remove(listen_id, CMA_LISTEN))
-		return (ECONNABORTED);
-
-	/* Create a new RDMA id for the new IW CM ID */
-	new_cm_id = rdma_create_id(listen_id->id.event_handler,
-				   listen_id->id.context,
-				   RDMA_PS_TCP);
-	if (!new_cm_id) {
-		ret = ENOMEM;
-		goto out;
-	}
-	conn_id = container_of(new_cm_id, struct rdma_id_private, id);
-	mtx_lock(&conn_id->lock);
-	++conn_id->dev_remove;
-	mtx_unlock(&conn_id->lock);
-	conn_id->state = CMA_CONNECT;
-
-	port = iw_event->local_addr.sin_port;
-	iw_event->local_addr.sin_port = 0;
-	ifa = ifa_ifwithaddr((struct sockaddr *)&iw_event->local_addr);
-	iw_event->local_addr.sin_port = port;
-	if (!ifa) {
-		ret = EADDRNOTAVAIL;
-		cma_enable_remove(conn_id);
-		rdma_destroy_id(new_cm_id);
-		goto out;
-	}
-	dev = ifa->ifa_ifp;
-	ret = rdma_copy_addr(&conn_id->id.route.addr.dev_addr, dev, NULL);
-	ifa_free(ifa);
-	if (ret) {
-		cma_enable_remove(conn_id);
-		rdma_destroy_id(new_cm_id);
-		goto out;
-	}
-
-	mtx_lock(&lock);
-	ret = cma_acquire_dev(conn_id);
-	mtx_unlock(&lock);
-	if (ret) {
-		cma_enable_remove(conn_id);
-		rdma_destroy_id(new_cm_id);
-		goto out;
-	}
-
-	conn_id->cm_id.iw = cm_id;
-	cm_id->context = conn_id;
-	cm_id->cm_handler = cma_iw_handler;
-
-	sin = (struct sockaddr_in *) &new_cm_id->route.addr.src_addr;
-	*sin = iw_event->local_addr;
-	sin = (struct sockaddr_in *) &new_cm_id->route.addr.dst_addr;
-	*sin = iw_event->remote_addr;
-	conn_id->so = cm_id->so;
-
-	memset(&event, 0, sizeof event);
-	event.event = RDMA_CM_EVENT_CONNECT_REQUEST;
-	event.param.conn.private_data = iw_event->private_data;
-	event.param.conn.private_data_len = iw_event->private_data_len;
-	ret = conn_id->id.event_handler(&conn_id->id, &event);
-	if (ret) {
-		/* User wants to destroy the CM ID */
-		conn_id->cm_id.iw = NULL;
-		cma_exch(conn_id, CMA_DESTROYING);
-		cma_enable_remove(conn_id);
-		rdma_destroy_id(&conn_id->id);
-	}
-
-out:
-	cma_enable_remove(listen_id);
-	return ret;
-}
-
-#ifdef IB_SUPPORTED
-static int cma_ib_listen(struct rdma_id_private *id_priv)
-{
-	struct ib_cm_compare_data compare_data;
-	struct sockaddr *addr;
-	__be64 svc_id;
-	int ret;
-
-	id_priv->cm_id.ib = ib_create_cm_id(id_priv->id.device, cma_req_handler,
-					    id_priv);
-	if (IS_ERR(id_priv->cm_id.ib))
-		return PTR_ERR(id_priv->cm_id.ib);
-
-	addr = &id_priv->id.route.addr.src_addr;
-	svc_id = cma_get_service_id(id_priv->id.ps, addr);
-	if (cma_any_addr(addr))
-		ret = ib_cm_listen(id_priv->cm_id.ib, svc_id, 0, NULL);
-	else {
-		cma_set_compare_data(id_priv->id.ps, addr, &compare_data);
-		ret = ib_cm_listen(id_priv->cm_id.ib, svc_id, 0, &compare_data);
-	}
-
-	if (ret) {
-		ib_destroy_cm_id(id_priv->cm_id.ib);
-		id_priv->cm_id.ib = NULL;
-	}
-
-	return ret;
-}
-#endif
-
-static int cma_iw_listen(struct rdma_id_private *id_priv, int backlog)
-{
-	int ret;
-	struct sockaddr_in *sin;
-
-	id_priv->cm_id.iw = iw_create_cm_id(id_priv->id.device, id_priv->so,
-					    iw_conn_req_handler, id_priv);
-	if (IS_ERR(id_priv->cm_id.iw))
-		return PTR_ERR(id_priv->cm_id.iw);
-
-	sin = (struct sockaddr_in *) &id_priv->id.route.addr.src_addr;
-	id_priv->cm_id.iw->local_addr = *sin;
-
-	ret = iw_cm_listen(id_priv->cm_id.iw, backlog);
-
-	if (ret) {
-		iw_destroy_cm_id(id_priv->cm_id.iw);
-		id_priv->cm_id.iw = NULL;
-	}
-
-	return ret;
-}
-
-static int cma_listen_handler(struct rdma_cm_id *id,
-			      struct rdma_cm_event *event)
-{
-	struct rdma_id_private *id_priv = id->context;
-
-	id->context = id_priv->id.context;
-	id->event_handler = id_priv->id.event_handler;
-	return id_priv->id.event_handler(id, event);
-}
-
-static void cma_listen_on_dev(struct rdma_id_private *id_priv,
-			      struct cma_device *cma_dev)
-{
-	struct rdma_id_private *dev_id_priv;
-	struct rdma_cm_id *id;
-	int ret;
-
-	id = rdma_create_id(cma_listen_handler, id_priv, id_priv->id.ps);
-	if (IS_ERR(id))
-		return;
-
-	dev_id_priv = container_of(id, struct rdma_id_private, id);
-
-	dev_id_priv->state = CMA_ADDR_BOUND;
-	memcpy(&id->route.addr.src_addr, &id_priv->id.route.addr.src_addr,
-	       ip_addr_size(&id_priv->id.route.addr.src_addr));
-	dev_id_priv->so = id_priv->so; /* XXX */
-
-	cma_attach_to_dev(dev_id_priv, cma_dev);
-	LIST_INSERT_HEAD(&id_priv->listen_list, dev_id_priv, listen_entry);
-
-	ret = rdma_listen(id, id_priv->backlog);
-	if (ret)
-		goto err;
-
-	return;
-err:
-	cma_destroy_listen(dev_id_priv);
-}
-
-static void cma_listen_on_all(struct rdma_id_private *id_priv)
-{
-	struct cma_device *cma_dev;
-
-	mtx_lock(&lock);
-	LIST_INSERT_HEAD(&listen_any_list, id_priv, list);
-	TAILQ_FOREACH(cma_dev, &dev_list, list)
-		cma_listen_on_dev(id_priv, cma_dev);
-	mtx_unlock(&lock);
-}
-
-static int cma_bind_any(struct rdma_cm_id *id, sa_family_t af)
-{
-	struct sockaddr_in addr_in;
-
-	memset(&addr_in, 0, sizeof addr_in);
-	addr_in.sin_family = af;
-	addr_in.sin_len = sizeof addr_in;
-	return rdma_bind_addr(id, (struct sockaddr *) &addr_in);
-}
-
-int rdma_listen(struct rdma_cm_id *id, int backlog)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (id_priv->state == CMA_IDLE) {
-		ret = cma_bind_any(id, AF_INET);
-		if (ret)
-			return ret;
-	}
-
-	if (!cma_comp_exch(id_priv, CMA_ADDR_BOUND, CMA_LISTEN))
-		return (EINVAL);
-
-	id_priv->backlog = backlog;
-	if (id->device) {
-#ifdef IB_SUPPORTED
-		switch (rdma_node_get_transport(id->device->node_type)) {
-		case RDMA_TRANSPORT_IB:
-			ret = cma_ib_listen(id_priv);
-			if (ret)
-				goto err;
-			break;
-		case RDMA_TRANSPORT_IWARP:
-#endif
-			ret = cma_iw_listen(id_priv, backlog);
-			if (ret)
-				goto err;
-#ifdef IB_SUPPORTED
-			break;
-		default:
-			ret = ENOSYS;
-			goto err;
-		}
-#endif
-	} else
-		cma_listen_on_all(id_priv);
-
-	return 0;
-err:
-	id_priv->backlog = 0;
-	cma_comp_exch(id_priv, CMA_LISTEN, CMA_ADDR_BOUND);
-	return ret;
-}
-
-#ifdef IB_SUPPORTED
-static void cma_query_handler(int status, struct ib_sa_path_rec *path_rec,
-			      void *context)
-{
-	struct cma_work *work = context;
-	struct rdma_route *route;
-
-	route = &work->id->id.route;
-
-	if (!status) {
-		route->num_paths = 1;
-		*route->path_rec = *path_rec;
-	} else {
-		work->old_state = CMA_ROUTE_QUERY;
-		work->new_state = CMA_ADDR_RESOLVED;
-		work->event.event = RDMA_CM_EVENT_ROUTE_ERROR;
-		work->event.status = status;
-	}
-
-	taskqueue_enqueue(cma_wq, &work->task);
-}
-
-static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms,
-			      struct cma_work *work)
-{
-	struct rdma_dev_addr *addr = &id_priv->id.route.addr.dev_addr;
-	struct ib_sa_path_rec path_rec;
-
-	memset(&path_rec, 0, sizeof path_rec);
-	ib_addr_get_sgid(addr, &path_rec.sgid);
-	ib_addr_get_dgid(addr, &path_rec.dgid);
-	path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(addr));
-	path_rec.numb_path = 1;
-	path_rec.reversible = 1;
-
-	id_priv->query_id = ib_sa_path_rec_get(&sa_client, id_priv->id.device,
-				id_priv->id.port_num, &path_rec,
-				IB_SA_PATH_REC_DGID | IB_SA_PATH_REC_SGID |
-				IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH |
-				IB_SA_PATH_REC_REVERSIBLE,
-				timeout_ms, M_NOWAIT,
-				cma_query_handler, work, &id_priv->query);
-
-	return (id_priv->query_id < 0) ? id_priv->query_id : 0;
-}
-#endif
-
-static void cma_work_handler(void *context, int pending)
-{
-	struct cma_work *work = context;
-	struct rdma_id_private *id_priv = work->id;
-	int destroy = 0;
-
-	mtx_lock(&id_priv->lock);
-	++id_priv->dev_remove;
-	mtx_unlock(&id_priv->lock);
-	if (!cma_comp_exch(id_priv, work->old_state, work->new_state))
-		goto out;
-
-	if (id_priv->id.event_handler(&id_priv->id, &work->event)) {
-		cma_exch(id_priv, CMA_DESTROYING);
-		destroy = 1;
-	}
-out:
-	cma_enable_remove(id_priv);
-	cma_deref_id(id_priv);
-	if (destroy)
-		rdma_destroy_id(&id_priv->id);
-	free(work, M_DEVBUF);
-}
-
-#ifdef IB_SUPPORTED
-static int cma_resolve_ib_route(struct rdma_id_private *id_priv, int timeout_ms)
-{
-	struct rdma_route *route = &id_priv->id.route;
-	struct cma_work *work;
-	int ret;
-
-	work = malloc(sizeof *work, M_DEVBUF, M_NOWAIT);
-	if (!work)
-		return (ENOMEM);
-	bzero(work, sizeof *work);
-
-	work->id = id_priv;
-        TASK_INIT(&work->task, 0, cma_work_handler, work);
-	work->old_state = CMA_ROUTE_QUERY;
-	work->new_state = CMA_ROUTE_RESOLVED;
-	work->event.event = RDMA_CM_EVENT_ROUTE_RESOLVED;
-
-	route->path_rec = malloc(sizeof *route->path_rec, M_DEVBUF, M_NOWAIT);
-	if (!route->path_rec) {
-		ret = ENOMEM;
-		goto err1;
-	}
-
-	ret = cma_query_ib_route(id_priv, timeout_ms, work);
-	if (ret)
-		goto err2;
-
-	return 0;
-err2:
-	free(route->path_rec, M_DEVBUF);
-	route->path_rec = NULL;
-err1:
-	free(work, M_DEVBUF);
-	return ret;
-}
-
-int rdma_set_ib_paths(struct rdma_cm_id *id,
-		      struct ib_sa_path_rec *path_rec, int num_paths)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_RESOLVED))
-		return (EINVAL);
-
-	id->route.path_rec = malloc(sizeof *path_rec * num_paths, M_DEVBUF, M_NOWAIT);
-	if (!id->route.path_rec) {
-		ret = ENOMEM;
-		goto err;
-	}
-
-	memcpy(id->route.path_rec, path_rec, sizeof *path_rec * num_paths);
-	return 0;
-err:
-	cma_comp_exch(id_priv, CMA_ROUTE_RESOLVED, CMA_ADDR_RESOLVED);
-	return ret;
-}
-#endif
-
-static int cma_resolve_iw_route(struct rdma_id_private *id_priv, int timeout_ms)
-{
-	struct cma_work *work;
-
-	work = malloc(sizeof *work, M_DEVBUF, M_NOWAIT);
-	if (!work)
-		return (ENOMEM);
-	bzero(work, sizeof *work);
-
-	work->id = id_priv;
-        TASK_INIT(&work->task, 0, cma_work_handler, work);
-	work->old_state = CMA_ROUTE_QUERY;
-	work->new_state = CMA_ROUTE_RESOLVED;
-	work->event.event = RDMA_CM_EVENT_ROUTE_RESOLVED;
-	taskqueue_enqueue(cma_wq, &work->task);
-	return 0;
-}
-
-int rdma_resolve_route(struct rdma_cm_id *id, int timeout_ms)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_QUERY))
-		return (EINVAL);
-
-	mtx_lock(&id_priv->lock);
-	id_priv->refcount++;
-	mtx_unlock(&id_priv->lock);
-#ifdef IB_SUPPORTED
-	switch (rdma_node_get_transport(id->device->node_type)) {
-	case RDMA_TRANSPORT_IB:
-		ret = cma_resolve_ib_route(id_priv, timeout_ms);
-		break;
-	case RDMA_TRANSPORT_IWARP:
-#endif
-		ret = cma_resolve_iw_route(id_priv, timeout_ms);
-#ifdef IB_SUPPORTED
-		break;
-	default:
-		ret = ENOSYS;
-		break;
-	}
-#endif
-	if (ret)
-		goto err;
-
-	return 0;
-err:
-	cma_comp_exch(id_priv, CMA_ROUTE_QUERY, CMA_ADDR_RESOLVED);
-	cma_deref_id(id_priv);
-	return ret;
-}
-
-static int cma_bind_loopback(struct rdma_id_private *id_priv)
-{
-	struct cma_device *cma_dev;
-	struct ib_port_attr port_attr;
-	union ib_gid gid;
-	u16 pkey;
-	int ret;
-	u8 p;
-
-	mtx_lock(&lock);
-	if (TAILQ_EMPTY(&dev_list)) {
-		ret = ENODEV;
-		goto out;
-	}
-	TAILQ_FOREACH(cma_dev, &dev_list, list)
-		for (p = 1; p <= cma_dev->device->phys_port_cnt; ++p)
-			if (!ib_query_port(cma_dev->device, p, &port_attr) &&
-			    port_attr.state == IB_PORT_ACTIVE)
-				goto port_found;
-
-	p = 1;
-	cma_dev = TAILQ_FIRST(&dev_list);
-
-port_found:
-	ret = ib_get_cached_gid(cma_dev->device, p, 0, &gid);
-	if (ret)
-		goto out;
-
-	ret = ib_get_cached_pkey(cma_dev->device, p, 0, &pkey);
-	if (ret)
-		goto out;
-
-	ib_addr_set_sgid(&id_priv->id.route.addr.dev_addr, &gid);
-	ib_addr_set_pkey(&id_priv->id.route.addr.dev_addr, pkey);
-	id_priv->id.port_num = p;
-	cma_attach_to_dev(id_priv, cma_dev);
-out:
-	mtx_unlock(&lock);
-	return ret;
-}
-
-static void addr_handler(int status, struct sockaddr *src_addr,
-			 struct rdma_dev_addr *dev_addr, void *context)
-{
-	struct rdma_id_private *id_priv = context;
-	struct rdma_cm_event event;
-
-	memset(&event, 0, sizeof event);
-	mtx_lock(&id_priv->lock);
-	++id_priv->dev_remove;
-	mtx_unlock(&id_priv->lock);
-
-	/*
-	 * Grab mutex to block rdma_destroy_id() from removing the device while
-	 * we're trying to acquire it.
-	 */
-	mtx_lock(&lock);
-	if (!cma_comp_exch(id_priv, CMA_ADDR_QUERY, CMA_ADDR_RESOLVED)) {
-		mtx_unlock(&lock);
-		goto out;
-	}
-
-	if (!status && !id_priv->cma_dev)
-		status = cma_acquire_dev(id_priv);
-	mtx_unlock(&lock);
-
-	if (status) {
-		if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ADDR_BOUND))
-			goto out;
-		event.event = RDMA_CM_EVENT_ADDR_ERROR;
-		event.status = status;
-	} else {
-		memcpy(&id_priv->id.route.addr.src_addr, src_addr,
-		       ip_addr_size(src_addr));
-		event.event = RDMA_CM_EVENT_ADDR_RESOLVED;
-	}
-
-	if (id_priv->id.event_handler(&id_priv->id, &event)) {
-		cma_exch(id_priv, CMA_DESTROYING);
-		cma_enable_remove(id_priv);
-		cma_deref_id(id_priv);
-		rdma_destroy_id(&id_priv->id);
-		return;
-	}
-out:
-	cma_enable_remove(id_priv);
-	cma_deref_id(id_priv);
-}
-
-static int cma_resolve_loopback(struct rdma_id_private *id_priv)
-{
-	struct cma_work *work;
-	struct sockaddr_in *src_in, *dst_in;
-	union ib_gid gid;
-	int ret;
-
-	work = malloc(sizeof *work, M_DEVBUF, M_NOWAIT);
-	if (!work)
-		return (ENOMEM);
-	bzero(work, sizeof *work);
-
-	if (!id_priv->cma_dev) {
-		ret = cma_bind_loopback(id_priv);
-		if (ret)
-			goto err;
-	}
-
-	ib_addr_get_sgid(&id_priv->id.route.addr.dev_addr, &gid);
-	ib_addr_set_dgid(&id_priv->id.route.addr.dev_addr, &gid);
-
-	if (cma_zero_addr(&id_priv->id.route.addr.src_addr)) {
-		src_in = (struct sockaddr_in *)&id_priv->id.route.addr.src_addr;
-		dst_in = (struct sockaddr_in *)&id_priv->id.route.addr.dst_addr;
-		src_in->sin_family = dst_in->sin_family;
-		src_in->sin_addr.s_addr = dst_in->sin_addr.s_addr;
-	}
-
-	work->id = id_priv;
-        TASK_INIT(&work->task, 0, cma_work_handler, work);
-	work->old_state = CMA_ADDR_QUERY;
-	work->new_state = CMA_ADDR_RESOLVED;
-	work->event.event = RDMA_CM_EVENT_ADDR_RESOLVED;
-	taskqueue_enqueue(cma_wq, &work->task);
-	return 0;
-err:
-	free(work, M_DEVBUF);
-	return ret;
-}
-
-static int cma_bind_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
-			 struct sockaddr *dst_addr)
-{
-	if (src_addr && src_addr->sa_family)
-		return rdma_bind_addr(id, src_addr);
-	else
-		return cma_bind_any(id, dst_addr->sa_family);
-}
-
-int rdma_resolve_addr(struct rdma_cm_id *id, struct sockaddr *src_addr,
-		      struct sockaddr *dst_addr, int timeout_ms)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (id_priv->state == CMA_IDLE) {
-		ret = cma_bind_addr(id, src_addr, dst_addr);
-		if (ret)
-			return ret;
-	}
-
-	if (!cma_comp_exch(id_priv, CMA_ADDR_BOUND, CMA_ADDR_QUERY))
-		return (EINVAL);
-
-	mtx_lock(&id_priv->lock);
-	id_priv->refcount++;
-	mtx_unlock(&id_priv->lock);
-	memcpy(&id->route.addr.dst_addr, dst_addr, ip_addr_size(dst_addr));
-	if (cma_any_addr(dst_addr))
-		ret = cma_resolve_loopback(id_priv);
-	else
-		ret = rdma_resolve_ip(&addr_client, &id->route.addr.src_addr,
-				      dst_addr, &id->route.addr.dev_addr,
-				      timeout_ms, addr_handler, id_priv);
-	if (ret)
-		goto err;
-
-	return 0;
-err:
-	cma_comp_exch(id_priv, CMA_ADDR_QUERY, CMA_ADDR_BOUND);
-	cma_deref_id(id_priv);
-	return ret;
-}
-
-static void cma_bind_port(struct rdma_bind_list *bind_list,
-			  struct rdma_id_private *id_priv)
-{
-	struct sockaddr_in *sin;
-
-	sin = (struct sockaddr_in *) &id_priv->id.route.addr.src_addr;
-	sin->sin_port = htons(bind_list->port);
-	id_priv->bind_list = bind_list;
-	TAILQ_INSERT_HEAD(&bind_list->owners, id_priv, node);
-}
-
-static int cma_alloc_port(struct kvl *ps, struct rdma_id_private *id_priv,
-			  unsigned short snum)
-{
-	struct rdma_bind_list *bind_list;
-	int port, ret;
-
-	bind_list = malloc(sizeof *bind_list, M_DEVBUF, M_NOWAIT);
-	if (!bind_list)
-		return (ENOMEM);
-	bzero(bind_list, sizeof *bind_list);
-
-	do {
-		ret = kvl_alloc_above(ps, bind_list, snum, &port);
-	} while (ret == EAGAIN);
-
-	if (ret)
-		goto err1;
-
-	if (port != snum) {
-		ret = EADDRNOTAVAIL;
-		goto err2;
-	}
-
-	bind_list->ps = ps;
-	bind_list->port = (unsigned short) port;
-	cma_bind_port(bind_list, id_priv);
-	return 0;
-err2:
-	kvl_delete(ps, port);
-err1:
-	free(bind_list, M_DEVBUF);
-	return ret;
-}
-
-static int cma_alloc_any_port(struct kvl *ps, struct rdma_id_private *id_priv)
-{
-	struct rdma_bind_list *bind_list;
-	int port, ret;
-
-	bind_list = malloc(sizeof *bind_list, M_DEVBUF, M_NOWAIT);
-	if (!bind_list)
-		return (ENOMEM);
-	bzero(bind_list, sizeof *bind_list);
-
-retry:
-	do {
-		ret = kvl_alloc_above(ps, bind_list, next_port, &port);
-	} while (ret == EAGAIN);
-
-	if (ret)
-		goto err1;
-
-	if (port > V_ipport_lastauto) {
-		if (next_port != V_ipport_firstauto) {
-			kvl_delete(ps, port);
-			next_port = V_ipport_firstauto;
-			goto retry;
-		}
-		ret = EADDRNOTAVAIL;
-		goto err2;
-	}
-
-	if (port == V_ipport_lastauto)
-		next_port = V_ipport_firstauto;
-	else
-		next_port = port + 1;
-
-	bind_list->ps = ps;
-	bind_list->port = (unsigned short) port;
-	cma_bind_port(bind_list, id_priv);
-	return 0;
-err2:
-	kvl_delete(ps, port);
-err1:
-	free(bind_list, M_DEVBUF);
-	return ret;
-}
-
-static int cma_use_port(struct kvl *ps, struct rdma_id_private *id_priv)
-{
-	struct rdma_id_private *cur_id;
-	struct sockaddr_in *sin, *cur_sin;
-	struct rdma_bind_list *bind_list;
-	unsigned short snum;
-
-	sin = (struct sockaddr_in *) &id_priv->id.route.addr.src_addr;
-	snum = ntohs(sin->sin_port);
-	if (snum <= V_ipport_reservedhigh && snum >= V_ipport_reservedlow &&
-	    priv_check(curthread, PRIV_NETINET_RESERVEDPORT))
-		return (EACCES);
-
-	bind_list = kvl_lookup(ps, snum);
-	if (!bind_list)
-		return cma_alloc_port(ps, id_priv, snum);
-
-	/*
-	 * We don't support binding to any address if anyone is bound to
-	 * a specific address on the same port.
-	 */
-	if (cma_any_addr(&id_priv->id.route.addr.src_addr))
-		return (EADDRNOTAVAIL);
-
-	TAILQ_FOREACH(cur_id, &bind_list->owners, node) {
-		if (cma_any_addr(&cur_id->id.route.addr.src_addr))
-			return (EADDRNOTAVAIL);
-
-		cur_sin = (struct sockaddr_in *)&cur_id->id.route.addr.src_addr;
-		if (sin->sin_addr.s_addr == cur_sin->sin_addr.s_addr)
-			return (EADDRINUSE);
-	}
-
-	cma_bind_port(bind_list, id_priv);
-	return 0;
-}
-
-static int cma_get_tcp_port(struct rdma_id_private *id_priv)
-{
-	int ret;
-	struct socket *so;
-
-	ret = socreate(AF_INET, &so, SOCK_STREAM, IPPROTO_TCP, 
-				curthread->td_ucred, curthread);
-	if (ret) {
-		printf("%s socreate err %d\n", __FUNCTION__, ret);
-		return ret;
-	}
-
-	ret = sobind(so, (struct sockaddr *)&id_priv->id.route.addr.src_addr,
-			curthread);
-	if (ret) {
-		soclose(so);
-		return ret;
-	}
-	id_priv->so = so;
-	return 0;       
-}
-
-static int cma_get_port(struct rdma_id_private *id_priv)
-{
-	struct kvl *ps;
-	int ret;
-
-	switch (id_priv->id.ps) {
-	case RDMA_PS_SDP:
-		ps = &sdp_ps;
-		break;
-	case RDMA_PS_TCP:
-		ps = &tcp_ps;
-		ret = cma_get_tcp_port(id_priv); /* Synch with native stack */
-		if (ret)
-			return ret;
-		break;
-	case RDMA_PS_UDP:
-		ps = &udp_ps;
-		break;
-	case RDMA_PS_IPOIB:
-		ps = &ipoib_ps;
-		break;
-	default:
-		return (EPROTONOSUPPORT);
-	}
-
-	mtx_lock(&lock);
-	if (cma_any_port(&id_priv->id.route.addr.src_addr))
-		ret = cma_alloc_any_port(ps, id_priv);
-	else
-		ret = cma_use_port(ps, id_priv);
-	mtx_unlock(&lock);
-
-	return ret;
-}
-
-int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	if (addr->sa_family != AF_INET)
-		return (EAFNOSUPPORT);
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (!cma_comp_exch(id_priv, CMA_IDLE, CMA_ADDR_BOUND))
-		return (EINVAL);
-
-	if (!cma_any_addr(addr)) {
-		ret = rdma_translate_ip(addr, &id->route.addr.dev_addr);
-		if (ret)
-			goto err1;
-
-		mtx_lock(&lock);
-		ret = cma_acquire_dev(id_priv);
-		mtx_unlock(&lock);
-		if (ret)
-			goto err1;
-	}
-
-	memcpy(&id->route.addr.src_addr, addr, ip_addr_size(addr));
-	ret = cma_get_port(id_priv);
-	if (ret)
-		goto err2;
-
-	return 0;
-err2:
-	if (!cma_any_addr(addr)) {
-		mtx_lock(&lock);
-		cma_detach_from_dev(id_priv);
-		mtx_unlock(&lock);
-	}
-err1:
-	cma_comp_exch(id_priv, CMA_ADDR_BOUND, CMA_IDLE);
-	return ret;
-}
-
-#ifdef IB_SUPPORTED
-static int cma_format_hdr(void *hdr, enum rdma_port_space ps,
-			  struct rdma_route *route)
-{
-	struct sockaddr_in *src4, *dst4;
-	struct cma_hdr *cma_hdr;
-	struct sdp_hh *sdp_hdr;
-
-	src4 = (struct sockaddr_in *) &route->addr.src_addr;
-	dst4 = (struct sockaddr_in *) &route->addr.dst_addr;
-
-	switch (ps) {
-	case RDMA_PS_SDP:
-		sdp_hdr = hdr;
-		if (sdp_get_majv(sdp_hdr->sdp_version) != SDP_MAJ_VERSION)
-			return (EINVAL);
-		sdp_set_ip_ver(sdp_hdr, 4);
-		sdp_hdr->src_addr.ip4.addr = src4->sin_addr.s_addr;
-		sdp_hdr->dst_addr.ip4.addr = dst4->sin_addr.s_addr;
-		sdp_hdr->port = src4->sin_port;
-		break;
-	default:
-		cma_hdr = hdr;
-		cma_hdr->cma_version = CMA_VERSION;
-		cma_set_ip_ver(cma_hdr, 4);
-		cma_hdr->src_addr.ip4.addr = src4->sin_addr.s_addr;
-		cma_hdr->dst_addr.ip4.addr = dst4->sin_addr.s_addr;
-		cma_hdr->port = src4->sin_port;
-		break;
-	}
-	return 0;
-}
-
-static int cma_sidr_rep_handler(struct ib_cm_id *cm_id,
-				struct ib_cm_event *ib_event)
-{
-	struct rdma_id_private *id_priv = cm_id->context;
-	struct rdma_cm_event event;
-	struct ib_cm_sidr_rep_event_param *rep = &ib_event->param.sidr_rep_rcvd;
-	int ret = 0;
-
-	if (cma_disable_remove(id_priv, CMA_CONNECT))
-		return 0;
-
-	memset(&event, 0, sizeof event);
-	switch (ib_event->event) {
-	case IB_CM_SIDR_REQ_ERROR:
-		event.event = RDMA_CM_EVENT_UNREACHABLE;
-		event.status = ETIMEDOUT;
-		break;
-	case IB_CM_SIDR_REP_RECEIVED:
-		event.param.ud.private_data = ib_event->private_data;
-		event.param.ud.private_data_len = IB_CM_SIDR_REP_PRIVATE_DATA_SIZE;
-		if (rep->status != IB_SIDR_SUCCESS) {
-			event.event = RDMA_CM_EVENT_UNREACHABLE;
-			event.status = ib_event->param.sidr_rep_rcvd.status;
-			break;
-		}
-		if (id_priv->qkey != rep->qkey) {
-			event.event = RDMA_CM_EVENT_UNREACHABLE;
-			event.status = EINVAL;
-			break;
-		}
-		ib_init_ah_from_path(id_priv->id.device, id_priv->id.port_num,
-				     id_priv->id.route.path_rec,
-				     &event.param.ud.ah_attr);
-		event.param.ud.qp_num = rep->qpn;
-		event.param.ud.qkey = rep->qkey;
-		event.event = RDMA_CM_EVENT_ESTABLISHED;
-		event.status = 0;
-		break;
-	default:
-		log(LOG_ERR, "RDMA CMA: unexpected IB CM event: %d",
-		       ib_event->event);
-		goto out;
-	}
-
-	ret = id_priv->id.event_handler(&id_priv->id, &event);
-	if (ret) {
-		/* Destroy the CM ID by returning a non-zero value. */
-		id_priv->cm_id.ib = NULL;
-		cma_exch(id_priv, CMA_DESTROYING);
-		cma_enable_remove(id_priv);
-		rdma_destroy_id(&id_priv->id);
-		return ret;
-	}
-out:
-	cma_enable_remove(id_priv);
-	return ret;
-}
-
-static int cma_resolve_ib_udp(struct rdma_id_private *id_priv,
-			      struct rdma_conn_param *conn_param)
-{
-	struct ib_cm_sidr_req_param req;
-	struct rdma_route *route;
-	int ret;
-
-	req.private_data_len = sizeof(struct cma_hdr) +
-			       conn_param->private_data_len;
-	req.private_data = malloc(req.private_data_len, M_DEVBUF, M_NOWAIT);
-	if (!req.private_data)
-		return (ENOMEM);
-	bzero((void *)req.private_data, req.private_data_len);
-
-	if (conn_param->private_data && conn_param->private_data_len)
-		memcpy((caddr_t) req.private_data + sizeof(struct cma_hdr),
-		       conn_param->private_data, conn_param->private_data_len);
-
-	route = &id_priv->id.route;
-	ret = cma_format_hdr((void *) req.private_data, id_priv->id.ps, route);
-	if (ret)
-		goto out;
-
-	id_priv->cm_id.ib = ib_create_cm_id(id_priv->id.device,
-					    cma_sidr_rep_handler, id_priv);
-	if (IS_ERR(id_priv->cm_id.ib)) {
-		ret = PTR_ERR(id_priv->cm_id.ib);
-		goto out;
-	}
-
-	req.path = route->path_rec;
-	req.service_id = cma_get_service_id(id_priv->id.ps,
-					    &route->addr.dst_addr);
-	req.timeout_ms = 1 << (CMA_CM_RESPONSE_TIMEOUT - 8);
-	req.max_cm_retries = CMA_MAX_CM_RETRIES;
-
-	ret = ib_send_cm_sidr_req(id_priv->cm_id.ib, &req);
-	if (ret) {
-		ib_destroy_cm_id(id_priv->cm_id.ib);
-		id_priv->cm_id.ib = NULL;
-	}
-out:
-	free(req.private_data, M_DEVBUF);
-	return ret;
-}
-
-static int cma_connect_ib(struct rdma_id_private *id_priv,
-			  struct rdma_conn_param *conn_param)
-{
-	struct ib_cm_req_param req;
-	struct rdma_route *route;
-	void *private_data;
-	int offset, ret;
-
-	memset(&req, 0, sizeof req);
-	offset = cma_user_data_offset(id_priv->id.ps);
-	req.private_data_len = offset + conn_param->private_data_len;
-	private_data = malloc(req.private_data_len, M_DEVBUF, M_NOWAIT);
-	if (!private_data)
-		return (ENOMEM);
-	bzero(private_data, req.private_data_len);
-
-	if (conn_param->private_data && conn_param->private_data_len)
-		memcpy(private_data + offset, conn_param->private_data,
-		       conn_param->private_data_len);
-
-	id_priv->cm_id.ib = ib_create_cm_id(id_priv->id.device, cma_ib_handler,
-					    id_priv);
-	if (IS_ERR(id_priv->cm_id.ib)) {
-		ret = PTR_ERR(id_priv->cm_id.ib);
-		goto out;
-	}
-
-	route = &id_priv->id.route;
-	ret = cma_format_hdr(private_data, id_priv->id.ps, route);
-	if (ret)
-		goto out;
-	req.private_data = private_data;
-
-	req.primary_path = &route->path_rec[0];
-	if (route->num_paths == 2)
-		req.alternate_path = &route->path_rec[1];
-
-	req.service_id = cma_get_service_id(id_priv->id.ps,
-					    &route->addr.dst_addr);
-	req.qp_num = id_priv->qp_num;
-	req.qp_type = IB_QPT_RC;
-	req.starting_psn = id_priv->seq_num;
-	req.responder_resources = conn_param->responder_resources;
-	req.initiator_depth = conn_param->initiator_depth;
-	req.flow_control = conn_param->flow_control;
-	req.retry_count = conn_param->retry_count;
-	req.rnr_retry_count = conn_param->rnr_retry_count;
-	req.remote_cm_response_timeout = CMA_CM_RESPONSE_TIMEOUT;
-	req.local_cm_response_timeout = CMA_CM_RESPONSE_TIMEOUT;
-	req.max_cm_retries = CMA_MAX_CM_RETRIES;
-	req.srq = id_priv->srq ? 1 : 0;
-
-	ret = ib_send_cm_req(id_priv->cm_id.ib, &req);
-out:
-	if (ret && !IS_ERR(id_priv->cm_id.ib)) {
-		ib_destroy_cm_id(id_priv->cm_id.ib);
-		id_priv->cm_id.ib = NULL;
-	}
-
-	free(private_data, M_DEVBUF);
-	return ret;
-}
-#endif
-
-static int cma_connect_iw(struct rdma_id_private *id_priv,
-			  struct rdma_conn_param *conn_param)
-{
-	struct iw_cm_id *cm_id;
-	struct sockaddr_in* sin;
-	int ret;
-	struct iw_cm_conn_param iw_param;
-
-	cm_id = iw_create_cm_id(id_priv->id.device, id_priv->so,
-				 cma_iw_handler, id_priv);
-	if (IS_ERR(cm_id)) {
-		ret = PTR_ERR(cm_id);
-		goto out;
-	}
-
-	id_priv->cm_id.iw = cm_id;
-
-	sin = (struct sockaddr_in*) &id_priv->id.route.addr.src_addr;
-	cm_id->local_addr = *sin;
-
-	sin = (struct sockaddr_in*) &id_priv->id.route.addr.dst_addr;
-	cm_id->remote_addr = *sin;
-
-	ret = cma_modify_qp_rtr(&id_priv->id);
-	if (ret)
-		goto out;
-
-	iw_param.ord = conn_param->initiator_depth;
-	iw_param.ird = conn_param->responder_resources;
-	iw_param.private_data = conn_param->private_data;
-	iw_param.private_data_len = conn_param->private_data_len;
-	if (id_priv->id.qp)
-		iw_param.qpn = id_priv->qp_num;
-	else
-		iw_param.qpn = conn_param->qp_num;
-	ret = iw_cm_connect(cm_id, &iw_param);
-out:
-	if (ret && !IS_ERR(cm_id)) {
-		iw_destroy_cm_id(cm_id);
-		id_priv->cm_id.iw = NULL;
-	}
-	return ret;
-}
-
-int rdma_connect(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (!cma_comp_exch(id_priv, CMA_ROUTE_RESOLVED, CMA_CONNECT))
-		return (EINVAL);
-
-	if (!id->qp) {
-		id_priv->qp_num = conn_param->qp_num;
-		id_priv->srq = conn_param->srq;
-	}
-
-#ifdef IB_SUPPORTED
-	switch (rdma_node_get_transport(id->device->node_type)) {
-	case RDMA_TRANSPORT_IB:
-		if (cma_is_ud_ps(id->ps))
-			ret = cma_resolve_ib_udp(id_priv, conn_param);
-		else
-			ret = cma_connect_ib(id_priv, conn_param);
-		break;
-	case RDMA_TRANSPORT_IWARP:
-#endif
-		ret = cma_connect_iw(id_priv, conn_param);
-#ifdef IB_SUPPORTED
-		break;
-	default:
-		ret = ENOSYS;
-		break;
-	}
-#endif
-	if (ret)
-		goto err;
-
-	return 0;
-err:
-	cma_comp_exch(id_priv, CMA_CONNECT, CMA_ROUTE_RESOLVED);
-	return ret;
-}
-
-#ifdef IB_SUPPORTED
-static int cma_accept_ib(struct rdma_id_private *id_priv,
-			 struct rdma_conn_param *conn_param)
-{
-	struct ib_cm_rep_param rep;
-	struct ib_qp_attr qp_attr;
-	int qp_attr_mask, ret;
-
-	if (id_priv->id.qp) {
-		ret = cma_modify_qp_rtr(&id_priv->id);
-		if (ret)
-			goto out;
-
-		qp_attr.qp_state = IB_QPS_RTS;
-		ret = ib_cm_init_qp_attr(id_priv->cm_id.ib, &qp_attr,
-					 &qp_attr_mask);
-		if (ret)
-			goto out;
-
-		qp_attr.max_rd_atomic = conn_param->initiator_depth;
-		ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
-		if (ret)
-			goto out;
-	}
-
-	memset(&rep, 0, sizeof rep);
-	rep.qp_num = id_priv->qp_num;
-	rep.starting_psn = id_priv->seq_num;
-	rep.private_data = conn_param->private_data;
-	rep.private_data_len = conn_param->private_data_len;
-	rep.responder_resources = conn_param->responder_resources;
-	rep.initiator_depth = conn_param->initiator_depth;
-	rep.target_ack_delay = CMA_CM_RESPONSE_TIMEOUT;
-	rep.failover_accepted = 0;
-	rep.flow_control = conn_param->flow_control;
-	rep.rnr_retry_count = conn_param->rnr_retry_count;
-	rep.srq = id_priv->srq ? 1 : 0;
-
-	ret = ib_send_cm_rep(id_priv->cm_id.ib, &rep);
-out:
-	return ret;
-}
-#endif
-
-static int cma_accept_iw(struct rdma_id_private *id_priv,
-		  struct rdma_conn_param *conn_param)
-{
-	struct iw_cm_conn_param iw_param;
-	int ret;
-
-	ret = cma_modify_qp_rtr(&id_priv->id);
-	if (ret)
-		return ret;
-
-	iw_param.ord = conn_param->initiator_depth;
-	iw_param.ird = conn_param->responder_resources;
-	iw_param.private_data = conn_param->private_data;
-	iw_param.private_data_len = conn_param->private_data_len;
-	if (id_priv->id.qp) {
-		iw_param.qpn = id_priv->qp_num;
-	} else
-		iw_param.qpn = conn_param->qp_num;
-
-	return iw_cm_accept(id_priv->cm_id.iw, &iw_param);
-}
-
-#ifdef IB_SUPPORTED
-static int cma_send_sidr_rep(struct rdma_id_private *id_priv,
-			     enum ib_cm_sidr_status status,
-			     const void *private_data, int private_data_len)
-{
-	struct ib_cm_sidr_rep_param rep;
-
-	memset(&rep, 0, sizeof rep);
-	rep.status = status;
-	if (status == IB_SIDR_SUCCESS) {
-		rep.qp_num = id_priv->qp_num;
-		rep.qkey = id_priv->qkey;
-	}
-	rep.private_data = private_data;
-	rep.private_data_len = private_data_len;
-
-	return ib_send_cm_sidr_rep(id_priv->cm_id.ib, &rep);
-}
-#endif
-
-int rdma_accept(struct rdma_cm_id *id, struct rdma_conn_param *conn_param)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (!cma_comp(id_priv, CMA_CONNECT))
-		return (EINVAL);
-
-	if (!id->qp && conn_param) {
-		id_priv->qp_num = conn_param->qp_num;
-		id_priv->srq = conn_param->srq;
-	}
-
-#ifdef IB_SUPPORTED
-	switch (rdma_node_get_transport(id->device->node_type)) {
-	case RDMA_TRANSPORT_IB:
-		if (cma_is_ud_ps(id->ps))
-			ret = cma_send_sidr_rep(id_priv, IB_SIDR_SUCCESS,
-						conn_param->private_data,
-						conn_param->private_data_len);
-		else if (conn_param)
-			ret = cma_accept_ib(id_priv, conn_param);
-		else
-			ret = cma_rep_recv(id_priv);
-		break;
-	case RDMA_TRANSPORT_IWARP:
-#endif
-		ret = cma_accept_iw(id_priv, conn_param);
-#ifdef IB_SUPPORTED
-		break;
-	default:
-		ret = ENOSYS;
-		break;
-	}
-#endif
-
-	if (ret)
-		goto reject;
-
-	return 0;
-reject:
-	cma_modify_qp_err(id);
-	rdma_reject(id, NULL, 0);
-	return ret;
-}
-
-int rdma_notify(struct rdma_cm_id *id, enum ib_event_type event)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (!cma_has_cm_dev(id_priv))
-		return (EINVAL);
-#ifdef IB_SUPPORTED
-	switch (id->device->node_type) {
-	case RDMA_NODE_IB_CA:
-		ret = ib_cm_notify(id_priv->cm_id.ib, event);
-		break;
-	default:
-#endif
-		ret = 0;
-#ifdef IB_SUPPORTED
-		break;
-	}
-#endif
-	return ret;
-}
-
-int rdma_reject(struct rdma_cm_id *id, const void *private_data,
-		u8 private_data_len)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (!cma_has_cm_dev(id_priv))
-		return (EINVAL);
-
-#ifdef IB_SUPPORTED
-	switch (rdma_node_get_transport(id->device->node_type)) {
-	case RDMA_TRANSPORT_IB:
-		if (cma_is_ud_ps(id->ps))
-			ret = cma_send_sidr_rep(id_priv, IB_SIDR_REJECT,
-						private_data, private_data_len);
-		else
-			ret = ib_send_cm_rej(id_priv->cm_id.ib,
-					     IB_CM_REJ_CONSUMER_DEFINED, NULL,
-					     0, private_data, private_data_len);
-		break;
-	case RDMA_TRANSPORT_IWARP:
-#endif
-		ret = iw_cm_reject(id_priv->cm_id.iw,
-				   private_data, private_data_len);
-#ifdef IB_SUPPORTED
-		break;
-	default:
-		ret = ENOSYS;
-		break;
-	}
-#endif
-	return ret;
-}
-
-int rdma_disconnect(struct rdma_cm_id *id)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (!cma_has_cm_dev(id_priv))
-		return (EINVAL);
-
-#ifdef IB_SUPPORTED
-	switch (rdma_node_get_transport(id->device->node_type)) {
-	case RDMA_TRANSPORT_IB:
-		ret = cma_modify_qp_err(id);
-		if (ret)
-			goto out;
-		/* Initiate or respond to a disconnect. */
-		if (ib_send_cm_dreq(id_priv->cm_id.ib, NULL, 0))
-			ib_send_cm_drep(id_priv->cm_id.ib, NULL, 0);
-		break;
-	case RDMA_TRANSPORT_IWARP:
-#endif
-		ret = iw_cm_disconnect(id_priv->cm_id.iw, 0);
-#ifdef IB_SUPPORTED
-		break;
-	default:
-		ret = EINVAL;
-		break;
-	}
-out:
-#endif
-	return ret;
-}
-
-#ifdef IB_SUPPORTED
-static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
-{
-	struct rdma_id_private *id_priv;
-	struct cma_multicast *mc = multicast->context;
-	struct rdma_cm_event event;
-	int ret;
-
-	id_priv = mc->id_priv;
-	if (cma_disable_remove(id_priv, CMA_ADDR_BOUND) &&
-	    cma_disable_remove(id_priv, CMA_ADDR_RESOLVED))
-		return 0;
-
-	if (!status && id_priv->id.qp)
-		status = ib_attach_mcast(id_priv->id.qp, &multicast->rec.mgid,
-					 multicast->rec.mlid);
-
-	memset(&event, 0, sizeof event);
-	event.status = status;
-	event.param.ud.private_data = mc->context;
-	if (!status) {
-		event.event = RDMA_CM_EVENT_MULTICAST_JOIN;
-		ib_init_ah_from_mcmember(id_priv->id.device,
-					 id_priv->id.port_num, &multicast->rec,
-					 &event.param.ud.ah_attr);
-		event.param.ud.qp_num = 0xFFFFFF;
-		event.param.ud.qkey = be32_to_cpu(multicast->rec.qkey);
-	} else
-		event.event = RDMA_CM_EVENT_MULTICAST_ERROR;
-
-	ret = id_priv->id.event_handler(&id_priv->id, &event);
-	if (ret) {
-		cma_exch(id_priv, CMA_DESTROYING);
-		cma_enable_remove(id_priv);
-		rdma_destroy_id(&id_priv->id);
-		return 0;
-	}
-
-	cma_enable_remove(id_priv);
-	return 0;
-}
-
-static void cma_set_mgid(struct rdma_id_private *id_priv,
-			 struct sockaddr *addr, union ib_gid *mgid)
-{
-	unsigned char mc_map[MAX_ADDR_LEN];
-	struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr;
-	struct sockaddr_in *sin = (struct sockaddr_in *) addr;
-	struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) addr;
-
-	if (cma_any_addr(addr)) {
-		memset(mgid, 0, sizeof *mgid);
-	} else if ((addr->sa_family == AF_INET6) &&
-		   ((be32_to_cpu(sin6->sin6_addr.s6_addr32[0]) & 0xFF10A01B) ==
-								 0xFF10A01B)) {
-		/* IPv6 address is an SA assigned MGID. */
-		memcpy(mgid, &sin6->sin6_addr, sizeof *mgid);
-	} else {
-		ip_ib_mc_map(sin->sin_addr.s_addr, mc_map);
-		if (id_priv->id.ps == RDMA_PS_UDP)
-			mc_map[7] = 0x01;	/* Use RDMA CM signature */
-		mc_map[8] = ib_addr_get_pkey(dev_addr) >> 8;
-		mc_map[9] = (unsigned char) ib_addr_get_pkey(dev_addr);
-		*mgid = *(union ib_gid *) (mc_map + 4);
-	}
-}
-
-static int cma_join_ib_multicast(struct rdma_id_private *id_priv,
-				 struct cma_multicast *mc)
-{
-	struct ib_sa_mcmember_rec rec;
-	struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr;
-	ib_sa_comp_mask comp_mask;
-	int ret;
-
-	ib_addr_get_mgid(dev_addr, &rec.mgid);
-	ret = ib_sa_get_mcmember_rec(id_priv->id.device, id_priv->id.port_num,
-				     &rec.mgid, &rec);
-	if (ret)
-		return ret;
-
-	cma_set_mgid(id_priv, &mc->addr, &rec.mgid);
-	if (id_priv->id.ps == RDMA_PS_UDP)
-		rec.qkey = cpu_to_be32(RDMA_UDP_QKEY);
-	ib_addr_get_sgid(dev_addr, &rec.port_gid);
-	rec.pkey = cpu_to_be16(ib_addr_get_pkey(dev_addr));
-	rec.join_state = 1;
-
-	comp_mask = IB_SA_MCMEMBER_REC_MGID | IB_SA_MCMEMBER_REC_PORT_GID |
-		    IB_SA_MCMEMBER_REC_PKEY | IB_SA_MCMEMBER_REC_JOIN_STATE |
-		    IB_SA_MCMEMBER_REC_QKEY | IB_SA_MCMEMBER_REC_SL |
-		    IB_SA_MCMEMBER_REC_FLOW_LABEL |
-		    IB_SA_MCMEMBER_REC_TRAFFIC_CLASS;
-
-	mc->multicast.ib = ib_sa_join_multicast(&sa_client, id_priv->id.device,
-						id_priv->id.port_num, &rec,
-						comp_mask, M_NOWAIT,
-						cma_ib_mc_handler, mc);
-	if (IS_ERR(mc->multicast.ib))
-		return PTR_ERR(mc->multicast.ib);
-
-	return 0;
-}
-
-int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr,
-			void *context)
-{
-	struct rdma_id_private *id_priv;
-	struct cma_multicast *mc;
-	int ret;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	if (!cma_comp(id_priv, CMA_ADDR_BOUND) &&
-	    !cma_comp(id_priv, CMA_ADDR_RESOLVED))
-		return (EINVAL);
-
-	mc = malloc(sizeof *mc, M_DEVBUF, M_NOWAIT);
-	if (!mc)
-		return (ENOMEM);
-
-	memcpy(&mc->addr, addr, ip_addr_size(addr));
-	mc->context = context;
-	mc->id_priv = id_priv;
-
-	mtx_lock(&id_priv->lock);
-	LIST_INSERT_HEAD(&id_priv->mc_list, mc, list);
-	mtx_unlock(&id_priv->lock);
-
-	switch (rdma_node_get_transport(id->device->node_type)) {
-	case RDMA_TRANSPORT_IB:
-		ret = cma_join_ib_multicast(id_priv, mc);
-		break;
-	default:
-		ret = ENOSYS;
-		break;
-	}
-
-	if (ret) {
-		mtx_lock(&id_priv->lock);
-		list_del(&mc->list);
-		mtx_unlock(&id_priv->lock);
-		free(mc, M_DEVBUF);
-	}
-	return ret;
-}
-
-void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr)
-{
-	struct rdma_id_private *id_priv;
-	struct cma_multicast *mc;
-
-	id_priv = container_of(id, struct rdma_id_private, id);
-	mtx_lock(&id_priv->lock);
-	LIST_FOREACH(mc, &id_priv->mc_list, list) {
-		if (!memcmp(&mc->addr, addr, ip_addr_size(addr))) {
-			list_del(&mc->list);
-			mtx_unlock(&id_priv->lock);
-
-			if (id->qp)
-				ib_detach_mcast(id->qp,
-						&mc->multicast.ib->rec.mgid,
-						mc->multicast.ib->rec.mlid);
-			ib_sa_free_multicast(mc->multicast.ib, M_DEVBUF);
-			free(mc, M_DEVBUF);
-			return;
-		}
-	}
-	mtx_unlock(&id_priv->lock);
-}
-#endif
-
-static void cma_add_one(struct ib_device *device)
-{
-	struct cma_device *cma_dev;
-	struct rdma_id_private *id_priv;
-
-	cma_dev = malloc(sizeof *cma_dev, M_DEVBUF, M_NOWAIT|M_ZERO);
-	if (!cma_dev)
-		return;
-
-	cma_dev->device = device;
-
-	cv_init(&cma_dev->comp, "cma_device");
-	mtx_init(&cma_dev->lock, "cma_device", NULL, MTX_DUPOK|MTX_DEF);
-	cma_dev->refcount = 1;
-	LIST_INIT(&cma_dev->id_list);
-	ib_set_client_data(device, &cma_client, cma_dev);
-
-	mtx_lock(&lock);
-	TAILQ_INSERT_TAIL(&dev_list, cma_dev, list);
-	LIST_FOREACH(id_priv, &listen_any_list, list)
-		cma_listen_on_dev(id_priv, cma_dev);
-	mtx_unlock(&lock);
-}
-
-static int cma_remove_id_dev(struct rdma_id_private *id_priv)
-{
-	struct rdma_cm_event event;
-	enum cma_state state;
-
-	/* Record that we want to remove the device */
-	state = cma_exch(id_priv, CMA_DEVICE_REMOVAL);
-	if (state == CMA_DESTROYING)
-		return 0;
-
-	cma_cancel_operation(id_priv, state);
-	mtx_lock(&id_priv->lock);
-	PANIC_IF(id_priv->dev_remove < 0);
-	if (id_priv->dev_remove)
-		cv_wait(&id_priv->wait_remove, &id_priv->lock);
-	mtx_unlock(&id_priv->lock);
-
-	/* Check for destruction from another callback. */
-	if (!cma_comp(id_priv, CMA_DEVICE_REMOVAL))
-		return 0;
-
-	memset(&event, 0, sizeof event);
-	event.event = RDMA_CM_EVENT_DEVICE_REMOVAL;
-	return id_priv->id.event_handler(&id_priv->id, &event);
-}
-
-static void cma_process_remove(struct cma_device *cma_dev)
-{
-	struct rdma_id_private *id_priv;
-	int ret;
-
-	mtx_lock(&lock);
-	while (!LIST_EMPTY(&cma_dev->id_list)) {
-		id_priv = LIST_FIRST(&cma_dev->id_list);
-
-		if (cma_internal_listen(id_priv)) {
-			cma_destroy_listen(id_priv);
-			continue;
-		}
-
-		LIST_REMOVE(id_priv, list);
-		mtx_lock(&id_priv->lock);
-		id_priv->refcount++;
-		mtx_unlock(&id_priv->lock);
-		mtx_unlock(&lock);
-
-		ret = cma_remove_id_dev(id_priv);
-		cma_deref_id(id_priv);
-		if (ret)
-			rdma_destroy_id(&id_priv->id);
-
-		mtx_lock(&lock);
-	}
-	mtx_unlock(&lock);
-
-	cma_deref_dev(cma_dev);
-	mtx_lock(&cma_dev->lock);
-	PANIC_IF(cma_dev->refcount < 0);
-	if (cma_dev->refcount)
-		cv_wait(&cma_dev->comp, &cma_dev->lock);
-	mtx_unlock(&cma_dev->lock);
-}
-
-static void cma_remove_one(struct ib_device *device)
-{
-	struct cma_device *cma_dev;
-
-	cma_dev = ib_get_client_data(device, &cma_client);
-	if (!cma_dev)
-		return;
-
-	mtx_lock(&lock);
-	TAILQ_REMOVE(&dev_list, cma_dev, list);
-	mtx_unlock(&lock);
-
-	cma_process_remove(cma_dev);
-	free(cma_dev, M_DEVBUF);
-}
-
-static int cma_init(void)
-{
-	int ret;
-
-	LIST_INIT(&listen_any_list);
-	TAILQ_INIT(&dev_list);
-	mtx_init(&lock, "cma_device list", NULL, MTX_DEF);
-
-	arc4rand(&next_port, sizeof next_port, 0);
-	next_port = ((unsigned int) next_port %
-		    (V_ipport_lastauto - V_ipport_firstauto)) +
-		    V_ipport_firstauto;
-	cma_wq = taskqueue_create("rdma_cm", M_NOWAIT, taskqueue_thread_enqueue,
-		&cma_wq);
-
-	if (!cma_wq)
-		return (ENOMEM);
-	
-	taskqueue_start_threads(&cma_wq, 1, PI_NET, "cma_wq thread"); 
-#ifdef IB_SUPPORTED
-	ib_sa_register_client(&sa_client);
-#endif
-	rdma_addr_register_client(&addr_client);
-
-	ret = ib_register_client(&cma_client);
-	if (ret)
-		goto err;
-	return 0;
-
-err:
-	rdma_addr_unregister_client(&addr_client);
-#ifdef IB_SUPPORTED
-	ib_sa_unregister_client(&sa_client);
-#endif
-	taskqueue_free(cma_wq);
-	return ret;
-}
-
-static void cma_cleanup(void)
-{
-	ib_unregister_client(&cma_client);
-	rdma_addr_unregister_client(&addr_client);
-#ifdef IB_SUPPORTED
-	ib_sa_unregister_client(&sa_client);
-#endif
-	taskqueue_free(cma_wq);
-	kvl_free(&sdp_ps);
-	kvl_free(&tcp_ps);
-	kvl_free(&udp_ps);
-	kvl_free(&ipoib_ps);
-}
-
-static int 
-cma_load(module_t mod, int cmd, void *arg)
-{
-        int err = 0;
-
-        switch (cmd) {
-        case MOD_LOAD:
-                printf("Loading rdma_cma.\n");
-                cma_init();
-                break;
-        case MOD_QUIESCE:
-                break;
-        case MOD_UNLOAD:
-                printf("Unloading rdma_cma.\n");
-		cma_cleanup();
-                break;
-        case MOD_SHUTDOWN:
-                break;
-        default:
-                err = EOPNOTSUPP;
-                break;
-        }
-
-        return (err);
-}
-
-static moduledata_t mod_data = {
-	"rdma_cma",
-	cma_load,
-	0
-};
-
-MODULE_VERSION(rdma_cma, 1);
-MODULE_DEPEND(rdma_cma, rdma_core, 1, 1, 1);
-MODULE_DEPEND(rdma_cma, rdma_addr, 1, 1, 1);
-MODULE_DEPEND(rdma_cma, rdma_iwcm, 1, 1, 1);
-DECLARE_MODULE(rdma_cma, mod_data, SI_SUB_EXEC, SI_ORDER_ANY);
diff --git a/sys/contrib/rdma/rdma_device.c b/sys/contrib/rdma/rdma_device.c
deleted file mode 100644
index 53cf31fb28d..00000000000
--- a/sys/contrib/rdma/rdma_device.c
+++ /dev/null
@@ -1,776 +0,0 @@
-/*
- * Copyright (c) 2004 Topspin Communications.  All rights reserved.
- * Copyright (c) 2005 Sun Microsystems, Inc. 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.
- *
- * $Id: device.c 1349 2004-12-16 21:09:43Z roland $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/condvar.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/libkern.h>
-#include <sys/socket.h>
-#include <sys/module.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/rwlock.h>
-#include <sys/queue.h>
-#include <sys/taskqueue.h>
-#include <sys/priv.h>
-#include <sys/syslog.h>
-
-#include <contrib/rdma/core_priv.h>
-
-struct ib_client_data {
-	TAILQ_ENTRY(ib_client_data) list;
-	struct ib_client *client;
-	void *            data;
-};
-
-static TAILQ_HEAD(, ib_device) device_list;
-static TAILQ_HEAD(client_list_s, ib_client) client_list;
-
-/*
- * device_mutex protects access to both device_list and client_list.
- * There's no real point to using multiple locks or something fancier
- * like an rwsem: we always access both lists, and we're always
- * modifying one list or the other list.  In any case this is not a
- * hot path so there's no point in trying to optimize.
- */
-static struct mtx device_mutex;
-
-static int ib_device_check_mandatory(struct ib_device *device)
-{
-#define IB_MANDATORY_FUNC(x) { offsetof(struct ib_device, x), #x }
-#define MANDATORY_TABLE_DEPTH 19
-	static const struct {
-		size_t offset;
-		char  *name;
-	} mandatory_table[] = {
-		IB_MANDATORY_FUNC(query_device),
-		IB_MANDATORY_FUNC(query_port),
-		IB_MANDATORY_FUNC(query_pkey),
-		IB_MANDATORY_FUNC(query_gid),
-		IB_MANDATORY_FUNC(alloc_pd),
-		IB_MANDATORY_FUNC(dealloc_pd),
-		IB_MANDATORY_FUNC(create_ah),
-		IB_MANDATORY_FUNC(destroy_ah),
-		IB_MANDATORY_FUNC(create_qp),
-		IB_MANDATORY_FUNC(modify_qp),
-		IB_MANDATORY_FUNC(destroy_qp),
-		IB_MANDATORY_FUNC(post_send),
-		IB_MANDATORY_FUNC(post_recv),
-		IB_MANDATORY_FUNC(create_cq),
-		IB_MANDATORY_FUNC(destroy_cq),
-		IB_MANDATORY_FUNC(poll_cq),
-		IB_MANDATORY_FUNC(req_notify_cq),
-		IB_MANDATORY_FUNC(get_dma_mr),
-		IB_MANDATORY_FUNC(dereg_mr)
-	};
-	int i;
-
-	for (i = 0; i < MANDATORY_TABLE_DEPTH; ++i) {
-		if (!*(void **) ((void *) ((unsigned long)device + mandatory_table[i].offset))) {
-			log(LOG_WARNING, "Device %s is missing mandatory function %s\n",
-			       device->name, mandatory_table[i].name);
-			return (EINVAL);
-		}
-	}
-
-	return 0;
-}
-
-static struct ib_device *__ib_device_get_by_name(const char *name)
-{
-	struct ib_device *device;
-
-	TAILQ_FOREACH(device, &device_list, core_list)
-		if (!strncmp(name, device->name, IB_DEVICE_NAME_MAX))
-			return device;
-
-	return NULL;
-}
-
-
-static int alloc_name(char *name)
-{
-	long *inuse;
-	char buf[IB_DEVICE_NAME_MAX];
-	struct ib_device *device;
-	int i;
-
-	inuse = malloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT);
-	if (!inuse)
-		return (ENOMEM);
-
-	TAILQ_FOREACH(device, &device_list, core_list) {
-		if (!sscanf(device->name, name, &i))
-			continue;
-		if (i < 0 || i >= PAGE_SIZE * 8)
-			continue;
-		snprintf(buf, sizeof buf, name, i);
-		if (!strncmp(buf, device->name, IB_DEVICE_NAME_MAX))
-			setbit(inuse, i);
-	}
-
-	i = find_first_zero_bit(inuse, PAGE_SIZE * 8);
-	free(inuse, M_DEVBUF);
-	snprintf(buf, sizeof buf, name, i);
-
-	if (__ib_device_get_by_name(buf))
-		return (ENFILE);
-
-	strlcpy(name, buf, IB_DEVICE_NAME_MAX);
-	return 0;
-}
-
-static int start_port(struct ib_device *device)
-{
-	return (device->node_type == RDMA_NODE_IB_SWITCH) ? 0 : 1;
-}
-
-
-static int end_port(struct ib_device *device)
-{
-	return (device->node_type == RDMA_NODE_IB_SWITCH) ?
-		0 : device->phys_port_cnt;
-}
-
-/**
- * ib_alloc_device - allocate an IB device struct
- * @size:size of structure to allocate
- *
- * Low-level drivers should use ib_alloc_device() to allocate &struct
- * ib_device.  @size is the size of the structure to be allocated,
- * including any private data used by the low-level driver.
- * ib_dealloc_device() must be used to free structures allocated with
- * ib_alloc_device().
- */
-struct ib_device *ib_alloc_device(size_t size)
-{
-	void *dev;
-
-	if (size < sizeof (struct ib_device))
-		panic("size=%zd < sizeof (struct ib_device)=%zd)",
-		    size, sizeof (struct ib_device));
-	
-	dev = malloc(size, M_DEVBUF, M_NOWAIT);
-	if (dev)
-		bzero(dev, size);
-	return dev;
-}
-
-/**
- * ib_dealloc_device - free an IB device struct
- * @device:structure to free
- *
- * Free a structure allocated with ib_alloc_device().
- */
-void ib_dealloc_device(struct ib_device *device)
-{
-	if (device->reg_state == IB_DEV_UNINITIALIZED) {
-		free(device, M_DEVBUF);
-		return;
-	}
-
-	if (device->reg_state != IB_DEV_UNREGISTERED)
-		panic("device->reg_state=%d != IB_DEV_UNREGISTERED)",
-		    device->reg_state);
-#ifdef notyet
-	ib_device_unregister_sysfs(device);
-#endif
-}
-
-static int add_client_context(struct ib_device *device, struct ib_client *client)
-{
-	struct ib_client_data *context;
-
-	context = malloc(sizeof *context, M_DEVBUF, M_NOWAIT);
-	if (!context) {
-		log(LOG_WARNING, "Couldn't allocate client context for %s/%s\n",
-		       device->name, client->name);
-		return (ENOMEM);
-	}
-
-	context->client = client;
-	context->data   = NULL;
-
-	mtx_lock(&device->client_data_lock);
-	TAILQ_INSERT_TAIL(&device->client_data_list, context, list);
-	mtx_unlock(&device->client_data_lock);
-
-	return 0;
-}
-
-static int read_port_table_lengths(struct ib_device *device)
-{
-	struct ib_port_attr *tprops = NULL;
-	int num_ports, ret = ENOMEM;
-	u8 port_index;
-
-	tprops = malloc(sizeof *tprops, M_DEVBUF, M_NOWAIT);
-	if (!tprops)
-		goto out;
-
-	num_ports = end_port(device) - start_port(device) + 1;
-
-	device->pkey_tbl_len = malloc(sizeof *device->pkey_tbl_len * num_ports,
-				       M_DEVBUF, M_NOWAIT);
-	device->gid_tbl_len = malloc(sizeof *device->gid_tbl_len * num_ports,
-				      M_DEVBUF, M_NOWAIT);
-	if (!device->pkey_tbl_len || !device->gid_tbl_len)
-		goto err;
-
-	for (port_index = 0; port_index < num_ports; ++port_index) {
-		ret = ib_query_port(device, port_index + start_port(device),
-					tprops);
-		if (ret)
-			goto err;
-		device->pkey_tbl_len[port_index] = tprops->pkey_tbl_len;
-		device->gid_tbl_len[port_index]  = tprops->gid_tbl_len;
-	}
-
-	ret = 0;
-	goto out;
-
-err:
-	free(device->gid_tbl_len, M_DEVBUF);
-	free(device->pkey_tbl_len, M_DEVBUF);
-out:
-	free(tprops, M_DEVBUF);
-	return ret;
-}
-
-/**
- * ib_register_device - Register an IB device with IB core
- * @device:Device to register
- *
- * Low-level drivers use ib_register_device() to register their
- * devices with the IB core.  All registered clients will receive a
- * callback for each device that is added. @device must be allocated
- * with ib_alloc_device().
- */
-int ib_register_device(struct ib_device *device)
-{
-	int ret;
-
-	mtx_lock(&device_mutex);
-
-	if (strchr(device->name, '%')) {
-		ret = alloc_name(device->name);
-		if (ret)
-			goto out;
-	}
-
-	if (ib_device_check_mandatory(device)) {
-		ret = EINVAL;
-		goto out;
-	}
-
-	TAILQ_INIT(&device->event_handler_list);
-	TAILQ_INIT(&device->client_data_list);
-	mtx_init(&device->event_handler_lock, "ib event handler", NULL, 
-		 MTX_DUPOK|MTX_DEF);
-	mtx_init(&device->client_data_lock, "ib client data", NULL, 
-		 MTX_DUPOK|MTX_DEF);
-
-	ret = read_port_table_lengths(device);
-	if (ret) {
-		log(LOG_WARNING, "Couldn't create table lengths cache for device %s\n",
-		       device->name);
-		goto out;
-	}
-
-#ifdef notyet
-	ret = ib_device_register_sysfs(device);
-	if (ret) {
-		log(LOG_WARNING, "Couldn't register device %s with driver model\n",
-		       device->name);
-		free(device->gid_tbl_len, M_DEVBUF);
-		free(device->pkey_tbl_len, M_DEVBUF);
-		goto out;
-	}
-#endif
-
-	TAILQ_INSERT_TAIL(&device_list, device, core_list);
-
-	device->reg_state = IB_DEV_REGISTERED;
-
-	{
-		struct ib_client *client;
-
-		TAILQ_FOREACH(client, &client_list, list)
-			if (client->add && !add_client_context(device, client))
-				client->add(device);
-	}
-
- out:
-	mtx_unlock(&device_mutex);
-	return ret;
-}
-
-/**
- * ib_unregister_device - Unregister an IB device
- * @device:Device to unregister
- *
- * Unregister an IB device.  All clients will receive a remove callback.
- */
-void ib_unregister_device(struct ib_device *device)
-{
-	struct ib_client *client;
-	struct ib_client_data *context, *tmp;
-
-	mtx_lock(&device_mutex);
-
-	TAILQ_FOREACH_REVERSE(client, &client_list, client_list_s, list)
-		if (client->remove)
-			client->remove(device);
-
-	TAILQ_REMOVE(&device_list, device, core_list);
-
-	free(device->gid_tbl_len, M_DEVBUF);
-	free(device->pkey_tbl_len, M_DEVBUF);
-
-	mtx_unlock(&device_mutex);
-
-	mtx_lock(&device->client_data_lock);
-	TAILQ_FOREACH_SAFE(context, &device->client_data_list, list, tmp)
-		free(context, M_DEVBUF);
-	mtx_unlock(&device->client_data_lock);
-
-	device->reg_state = IB_DEV_UNREGISTERED;
-}
-
-/**
- * ib_register_client - Register an IB client
- * @client:Client to register
- *
- * Upper level users of the IB drivers can use ib_register_client() to
- * register callbacks for IB device addition and removal.  When an IB
- * device is added, each registered client's add method will be called
- * (in the order the clients were registered), and when a device is
- * removed, each client's remove method will be called (in the reverse
- * order that clients were registered).  In addition, when
- * ib_register_client() is called, the client will receive an add
- * callback for all devices already registered.
- */
-int ib_register_client(struct ib_client *client)
-{
-	struct ib_device *device;
-
-	mtx_lock(&device_mutex);
-
-	TAILQ_INSERT_TAIL(&client_list, client, list);
-	TAILQ_FOREACH(device, &device_list, core_list)
-		if (client->add && !add_client_context(device, client))
-			client->add(device);
-
-	mtx_unlock(&device_mutex);
-
-	return 0;
-}
-
-/**
- * ib_unregister_client - Unregister an IB client
- * @client:Client to unregister
- *
- * Upper level users use ib_unregister_client() to remove their client
- * registration.  When ib_unregister_client() is called, the client
- * will receive a remove callback for each IB device still registered.
- */
-void ib_unregister_client(struct ib_client *client)
-{
-	struct ib_client_data *context, *tmp;
-	struct ib_device *device;
-
-	mtx_lock(&device_mutex);
-
-	TAILQ_FOREACH(device, &device_list, core_list) {
-		if (client->remove)
-			client->remove(device);
-
-		mtx_lock(&device->client_data_lock);
-		TAILQ_FOREACH_SAFE(context, &device->client_data_list, list,tmp)
-			if (context->client == client) {
-				TAILQ_REMOVE(&device->client_data_list, context,
-					list);
-				free(context, M_DEVBUF);
-			}
-		mtx_unlock(&device->client_data_lock);
-	}
-	TAILQ_REMOVE(&client_list, client, list);
-
-	mtx_unlock(&device_mutex);
-}
-
-/**
- * ib_get_client_data - Get IB client context
- * @device:Device to get context for
- * @client:Client to get context for
- *
- * ib_get_client_data() returns client context set with
- * ib_set_client_data().
- */
-void *ib_get_client_data(struct ib_device *device, struct ib_client *client)
-{
-	struct ib_client_data *context;
-	void *ret = NULL;
-
-	mtx_lock(&device->client_data_lock);
-	TAILQ_FOREACH(context, &device->client_data_list, list)
-		if (context->client == client) {
-			ret = context->data;
-			break;
-		}
-	mtx_unlock(&device->client_data_lock);
-
-	return ret;
-}
-
-/**
- * ib_set_client_data - Set IB client context
- * @device:Device to set context for
- * @client:Client to set context for
- * @data:Context to set
- *
- * ib_set_client_data() sets client context that can be retrieved with
- * ib_get_client_data().
- */
-void ib_set_client_data(struct ib_device *device, struct ib_client *client,
-			void *data)
-{
-	struct ib_client_data *context;
-
-	mtx_lock(&device->client_data_lock);
-	TAILQ_FOREACH(context, &device->client_data_list, list)
-		if (context->client == client) {
-			context->data = data;
-			goto out;
-		}
-
-	log(LOG_WARNING, "No client context found for %s/%s\n",
-	       device->name, client->name);
-
-out:
-	mtx_unlock(&device->client_data_lock);
-}
-
-/**
- * ib_register_event_handler - Register an IB event handler
- * @event_handler:Handler to register
- *
- * ib_register_event_handler() registers an event handler that will be
- * called back when asynchronous IB events occur (as defined in
- * chapter 11 of the InfiniBand Architecture Specification).  This
- * callback may occur in interrupt context.
- */
-int ib_register_event_handler  (struct ib_event_handler *event_handler)
-{
-	mtx_lock(&event_handler->device->event_handler_lock);
-	TAILQ_INSERT_TAIL(&event_handler->device->event_handler_list, 
-		event_handler, list);
-	mtx_unlock(&event_handler->device->event_handler_lock);
-
-	return 0;
-}
-
-/**
- * ib_unregister_event_handler - Unregister an event handler
- * @event_handler:Handler to unregister
- *
- * Unregister an event handler registered with
- * ib_register_event_handler().
- */
-int ib_unregister_event_handler(struct ib_event_handler *event_handler)
-{
-	mtx_lock(&event_handler->device->event_handler_lock);
-	TAILQ_REMOVE(&event_handler->device->event_handler_list, event_handler,
-		list);
-	mtx_unlock(&event_handler->device->event_handler_lock);
-
-	return 0;
-}
-
-/**
- * ib_dispatch_event - Dispatch an asynchronous event
- * @event:Event to dispatch
- *
- * Low-level drivers must call ib_dispatch_event() to dispatch the
- * event to all registered event handlers when an asynchronous event
- * occurs.
- */
-void ib_dispatch_event(struct ib_event *event)
-{
-	struct ib_event_handler *handler;
-
-	mtx_lock(&event->device->event_handler_lock);
-
-	TAILQ_FOREACH(handler, &event->device->event_handler_list, list)
-		handler->handler(handler, event);
-
-	mtx_unlock(&event->device->event_handler_lock);
-}
-
-/**
- * ib_query_device - Query IB device attributes
- * @device:Device to query
- * @device_attr:Device attributes
- *
- * ib_query_device() returns the attributes of a device through the
- * @device_attr pointer.
- */
-int ib_query_device(struct ib_device *device,
-		    struct ib_device_attr *device_attr)
-{
-	return device->query_device(device, device_attr);
-}
-
-/**
- * ib_query_port - Query IB port attributes
- * @device:Device to query
- * @port_num:Port number to query
- * @port_attr:Port attributes
- *
- * ib_query_port() returns the attributes of a port through the
- * @port_attr pointer.
- */
-int ib_query_port(struct ib_device *device,
-		  u8 port_num,
-		  struct ib_port_attr *port_attr)
-{
-	if (port_num < start_port(device) || port_num > end_port(device))
-		return (EINVAL);
-
-	return device->query_port(device, port_num, port_attr);
-}
-
-/**
- * ib_query_gid - Get GID table entry
- * @device:Device to query
- * @port_num:Port number to query
- * @index:GID table index to query
- * @gid:Returned GID
- *
- * ib_query_gid() fetches the specified GID table entry.
- */
-int ib_query_gid(struct ib_device *device,
-		 u8 port_num, int index, union ib_gid *gid)
-{
-	return device->query_gid(device, port_num, index, gid);
-}
-
-/**
- * ib_query_pkey - Get P_Key table entry
- * @device:Device to query
- * @port_num:Port number to query
- * @index:P_Key table index to query
- * @pkey:Returned P_Key
- *
- * ib_query_pkey() fetches the specified P_Key table entry.
- */
-int ib_query_pkey(struct ib_device *device,
-		  u8 port_num, u16 index, u16 *pkey)
-{
-	return device->query_pkey(device, port_num, index, pkey);
-}
-
-/**
- * ib_modify_device - Change IB device attributes
- * @device:Device to modify
- * @device_modify_mask:Mask of attributes to change
- * @device_modify:New attribute values
- *
- * ib_modify_device() changes a device's attributes as specified by
- * the @device_modify_mask and @device_modify structure.
- */
-int ib_modify_device(struct ib_device *device,
-		     int device_modify_mask,
-		     struct ib_device_modify *device_modify)
-{
-	return device->modify_device(device, device_modify_mask,
-				     device_modify);
-}
-
-/**
- * ib_modify_port - Modifies the attributes for the specified port.
- * @device: The device to modify.
- * @port_num: The number of the port to modify.
- * @port_modify_mask: Mask used to specify which attributes of the port
- *   to change.
- * @port_modify: New attribute values for the port.
- *
- * ib_modify_port() changes a port's attributes as specified by the
- * @port_modify_mask and @port_modify structure.
- */
-int ib_modify_port(struct ib_device *device,
-		   u8 port_num, int port_modify_mask,
-		   struct ib_port_modify *port_modify)
-{
-	if (port_num < start_port(device) || port_num > end_port(device))
-		return (EINVAL);
-
-	return device->modify_port(device, port_num, port_modify_mask,
-				   port_modify);
-}
-
-/**
- * ib_find_gid - Returns the port number and GID table index where
- *   a specified GID value occurs.
- * @device: The device to query.
- * @gid: The GID value to search for.
- * @port_num: The port number of the device where the GID value was found.
- * @index: The index into the GID table where the GID was found.  This
- *   parameter may be NULL.
- */
-int ib_find_gid(struct ib_device *device, union ib_gid *gid,
-		u8 *port_num, u16 *index)
-{
-	union ib_gid tmp_gid;
-	int ret, port, i;
-
-	for (port = start_port(device); port <= end_port(device); ++port) {
-		for (i = 0; i < device->gid_tbl_len[port - start_port(device)]; ++i) {
-			ret = ib_query_gid(device, port, i, &tmp_gid);
-			if (ret)
-				return ret;
-			if (!memcmp(&tmp_gid, gid, sizeof *gid)) {
-				*port_num = port;
-				if (index)
-					*index = i;
-				return 0;
-			}
-		}
-	}
-
-	return (ENOENT);
-}
-
-/**
- * ib_find_pkey - Returns the PKey table index where a specified
- *   PKey value occurs.
- * @device: The device to query.
- * @port_num: The port number of the device to search for the PKey.
- * @pkey: The PKey value to search for.
- * @index: The index into the PKey table where the PKey was found.
- */
-int ib_find_pkey(struct ib_device *device,
-		 u8 port_num, u16 pkey, u16 *index)
-{
-	int ret, i;
-	u16 tmp_pkey;
-
-	for (i = 0; i < device->pkey_tbl_len[port_num - start_port(device)]; ++i) {
-		ret = ib_query_pkey(device, port_num, i, &tmp_pkey);
-		if (ret)
-			return ret;
-
-		if (pkey == tmp_pkey) {
-			*index = i;
-			return 0;
-		}
-	}
-
-	return (ENOENT);
-}
-
-static int rdma_core_init(void)
-{
-	int ret;
-#ifdef notyet
-	ret = ib_sysfs_setup();
-	if (ret)
-		log(LOG_WARNING, "Couldn't create InfiniBand device class\n");
-#endif
-
-	mtx_init(&device_mutex, "rdma_device mutex", NULL, MTX_DEF);
-	TAILQ_INIT(&client_list);
-	TAILQ_INIT(&device_list);
-	ret = ib_cache_setup();
-	if (ret) {
-		log(LOG_WARNING, "Couldn't set up InfiniBand P_Key/GID cache\n");
-#ifdef notyet
-		ib_sysfs_cleanup();
-#endif
-	}
-
-	return ret;
-}
-
-static void rdma_core_cleanup(void)
-{
-	ib_cache_cleanup();
-#ifdef notyet
-	ib_sysfs_cleanup();
-	/* Make sure that any pending umem accounting work is done. */
-	flush_scheduled_work();
-#endif
-}
-
-static int 
-rdma_core_load(module_t mod, int cmd, void *arg)
-{
-        int err = 0;
-
-        switch (cmd) {
-        case MOD_LOAD:
-                printf("Loading rdma_core.\n");
-                rdma_core_init();
-                break;
-        case MOD_QUIESCE:
-                break;
-        case MOD_UNLOAD:
-                printf("Unloading rdma_core.\n");
-		rdma_core_cleanup();
-                break;
-        case MOD_SHUTDOWN:
-                break;
-        default:
-                err = EOPNOTSUPP;
-                break;
-        }
-
-        return (err);
-}
-
-static moduledata_t mod_data = {
-	"rdma_core",
-	rdma_core_load,
-	0
-};
-
-MODULE_VERSION(rdma_core, 1);
-DECLARE_MODULE(rdma_core, mod_data, SI_SUB_EXEC, SI_ORDER_ANY);
diff --git a/sys/contrib/rdma/rdma_iwcm.c b/sys/contrib/rdma/rdma_iwcm.c
deleted file mode 100644
index 916abcd2dfd..00000000000
--- a/sys/contrib/rdma/rdma_iwcm.c
+++ /dev/null
@@ -1,1086 +0,0 @@
-/*
- * Copyright (c) 2004, 2005 Intel Corporation.  All rights reserved.
- * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
- * Copyright (c) 2004, 2005 Voltaire Corporation.  All rights reserved.
- * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
- * Copyright (c) 2005 Open Grid Computing, Inc. All rights reserved.
- * Copyright (c) 2005 Network Appliance, Inc. 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.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/kernel.h>
-#include <sys/libkern.h>
-#include <sys/socket.h>
-#include <sys/socketvar.h>
-#include <sys/module.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/rwlock.h>
-#include <sys/queue.h>
-#include <sys/taskqueue.h>
-#include <sys/priv.h>
-#include <sys/syslog.h>
-#include <sys/malloc.h>
-
-#include <netinet/in.h>
-#include <netinet/in_pcb.h>
-
-#include <contrib/rdma/iw_cm.h>
-
-enum iw_cm_state {
-	IW_CM_STATE_IDLE,             /* unbound, inactive */
-	IW_CM_STATE_LISTEN,           /* listen waiting for connect */
-	IW_CM_STATE_CONN_RECV,        /* inbound waiting for user accept */
-	IW_CM_STATE_CONN_SENT,        /* outbound waiting for peer accept */
-	IW_CM_STATE_ESTABLISHED,      /* established */
-	IW_CM_STATE_CLOSING,	      /* disconnect */
-	IW_CM_STATE_DESTROYING        /* object being deleted */
-};
-
-struct iwcm_id_private {
-	struct iw_cm_id	id;
-	enum iw_cm_state state;
-	unsigned long flags;
-	struct ib_qp *qp;
-	void * destroy_comp;
-	void * connect_wait;
-	TAILQ_HEAD(, iwcm_work) work_list;
-	struct mtx lock;
-	volatile int refcount;
-	TAILQ_HEAD(, iwcm_work) work_free_list;
-};
-
-#define IWCM_F_CALLBACK_DESTROY   1
-#define IWCM_F_CONNECT_WAIT       2
-
-static struct taskqueue *iwcm_wq;
-struct iwcm_work {
-	struct task task;
-	struct iwcm_id_private *cm_id;
-	TAILQ_ENTRY(iwcm_work) list;
-	struct iw_cm_event event;
-	TAILQ_ENTRY(iwcm_work) free_list;
-};
-
-/*
- * The following services provide a mechanism for pre-allocating iwcm_work
- * elements.  The design pre-allocates them  based on the cm_id type:
- *	LISTENING IDS: 	Get enough elements preallocated to handle the
- *			listen backlog.
- *	ACTIVE IDS:	4: CONNECT_REPLY, ESTABLISHED, DISCONNECT, CLOSE
- *	PASSIVE IDS:	3: ESTABLISHED, DISCONNECT, CLOSE
- *
- * Allocating them in connect and listen avoids having to deal
- * with allocation failures on the event upcall from the provider (which
- * is called in the interrupt context).
- *
- * One exception is when creating the cm_id for incoming connection requests.
- * There are two cases:
- * 1) in the event upcall, cm_event_handler(), for a listening cm_id.  If
- *    the backlog is exceeded, then no more connection request events will
- *    be processed.  cm_event_handler() returns ENOMEM in this case.  Its up
- *    to the provider to reject the connection request.
- * 2) in the connection request workqueue handler, cm_conn_req_handler().
- *    If work elements cannot be allocated for the new connect request cm_id,
- *    then IWCM will call the provider reject method.  This is ok since
- *    cm_conn_req_handler() runs in the workqueue thread context.
- */
-
-static struct iwcm_work *get_work(struct iwcm_id_private *cm_id_priv)
-{
-	struct iwcm_work *work;
-
-	if (TAILQ_EMPTY(&cm_id_priv->work_free_list))
-		return NULL;
-	work = TAILQ_FIRST(&cm_id_priv->work_free_list);
-	TAILQ_REMOVE(&cm_id_priv->work_free_list, work, free_list);
-	return work;
-}
-
-static void put_work(struct iwcm_work *work)
-{
-	TAILQ_INSERT_HEAD(&work->cm_id->work_free_list, work, free_list);
-}
-
-static void dealloc_work_entries(struct iwcm_id_private *cm_id_priv)
-{
-	struct iwcm_work *e, *tmp;
-
-	TAILQ_FOREACH_SAFE(e, &cm_id_priv->work_free_list, free_list, tmp)
-		free(e, M_DEVBUF);
-}
-
-static int alloc_work_entries(struct iwcm_id_private *cm_id_priv, int count)
-{
-	struct iwcm_work *work;
-
-	PANIC_IF(!TAILQ_EMPTY(&cm_id_priv->work_free_list));
-	while (count--) {
-		work = malloc(sizeof(struct iwcm_work), M_DEVBUF, M_NOWAIT);
-		if (!work) {
-			dealloc_work_entries(cm_id_priv);
-			return (ENOMEM);
-		}
-		work->cm_id = cm_id_priv;
-		put_work(work);
-	}
-	return 0;
-}
-
-/*
- * Save private data from incoming connection requests to
- * iw_cm_event, so the low level driver doesn't have to. Adjust
- * the event ptr to point to the local copy.
- */
-static int copy_private_data(struct iw_cm_event *event)
-{
-	void *p;
-
-	p = malloc(event->private_data_len, M_DEVBUF, M_NOWAIT);
-	if (!p)
-		return (ENOMEM);
-	bcopy(event->private_data, p, event->private_data_len);
-	event->private_data = p;
-	return 0;
-}
-
-static void free_cm_id(struct iwcm_id_private *cm_id_priv)
-{
-	dealloc_work_entries(cm_id_priv);
-	free(cm_id_priv, M_DEVBUF);
-}
-
-/*
- * Release a reference on cm_id. If the last reference is being
- * released, enable the waiting thread (in iw_destroy_cm_id) to
- * get woken up, and return 1 if a thread is already waiting.
- */
-static int iwcm_deref_id(struct iwcm_id_private *cm_id_priv)
-{
-	mtx_lock(&cm_id_priv->lock);
-	PANIC_IF(atomic_load_acq_int(&cm_id_priv->refcount)==0);
-	if (atomic_fetchadd_int(&cm_id_priv->refcount, -1) == 1) {
-		PANIC_IF(!TAILQ_EMPTY(&cm_id_priv->work_list));
-		wakeup(&cm_id_priv->destroy_comp);
-		mtx_unlock(&cm_id_priv->lock);
-		return 1;
-	}
-	mtx_unlock(&cm_id_priv->lock);
-
-	return 0;
-}
-
-static void add_ref(struct iw_cm_id *cm_id)
-{
-	struct iwcm_id_private *cm_id_priv;
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-	mtx_lock(&cm_id_priv->lock);
-	atomic_add_int(&cm_id_priv->refcount, 1);
-	mtx_unlock(&cm_id_priv->lock);
-}
-
-static void rem_ref(struct iw_cm_id *cm_id)
-{
-	struct iwcm_id_private *cm_id_priv;
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-	if (iwcm_deref_id(cm_id_priv) &&
-	    isset(&cm_id_priv->flags, IWCM_F_CALLBACK_DESTROY)) {
-		PANIC_IF(!TAILQ_EMPTY(&cm_id_priv->work_list));
-		free_cm_id(cm_id_priv);
-	}
-}
-
-static int cm_event_handler(struct iw_cm_id *cm_id, struct iw_cm_event *event);
-
-struct iw_cm_id *iw_create_cm_id(struct ib_device *device,
-				 struct socket *so,
-				 iw_cm_handler cm_handler,
-				 void *context)
-{
-	struct iwcm_id_private *cm_id_priv;
-
-	KASSERT(so, ("iw_create_cm_id called with NULL socket!"));
-	cm_id_priv = malloc(sizeof(*cm_id_priv), M_DEVBUF, M_NOWAIT);
-	if (!cm_id_priv)
-		return ERR_PTR(ENOMEM);
-	bzero(cm_id_priv, sizeof *cm_id_priv);
-
-	cm_id_priv->state = IW_CM_STATE_IDLE;
-	cm_id_priv->id.device = device;
-	cm_id_priv->id.cm_handler = cm_handler;
-	cm_id_priv->id.context = context;
-	cm_id_priv->id.event_handler = cm_event_handler;
-	cm_id_priv->id.add_ref = add_ref;
-	cm_id_priv->id.rem_ref = rem_ref;
-	cm_id_priv->id.so = so;
-	mtx_init(&cm_id_priv->lock, "cm_id_priv", NULL, MTX_DUPOK|MTX_DEF);
-	atomic_store_rel_int(&cm_id_priv->refcount, 1);
-	TAILQ_INIT(&cm_id_priv->work_list);
-	TAILQ_INIT(&cm_id_priv->work_free_list);
-
-	return &cm_id_priv->id;
-}
-
-
-static int iwcm_modify_qp_err(struct ib_qp *qp)
-{
-	struct ib_qp_attr qp_attr;
-
-	if (!qp)
-		return (EINVAL);
-
-	qp_attr.qp_state = IB_QPS_ERR;
-	return ib_modify_qp(qp, &qp_attr, IB_QP_STATE);
-}
-
-/*
- * This is really the RDMAC CLOSING state. It is most similar to the
- * IB SQD QP state.
- */
-static int iwcm_modify_qp_sqd(struct ib_qp *qp)
-{
-	struct ib_qp_attr qp_attr;
-
-	PANIC_IF(qp == NULL);
-	qp_attr.qp_state = IB_QPS_SQD;
-	return ib_modify_qp(qp, &qp_attr, IB_QP_STATE);
-}
-
-/*
- * CM_ID <-- CLOSING
- *
- * Block if a passive or active connection is currently being processed. Then
- * process the event as follows:
- * - If we are ESTABLISHED, move to CLOSING and modify the QP state
- *   based on the abrupt flag
- * - If the connection is already in the CLOSING or IDLE state, the peer is
- *   disconnecting concurrently with us and we've already seen the
- *   DISCONNECT event -- ignore the request and return 0
- * - Disconnect on a listening endpoint returns EINVAL
- */
-int iw_cm_disconnect(struct iw_cm_id *cm_id, int abrupt)
-{
-	struct iwcm_id_private *cm_id_priv;
-	int ret = 0;
-	struct ib_qp *qp = NULL;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-	/* Wait if we're currently in a connect or accept downcall */
-	mtx_lock(&cm_id_priv->lock);
-	if (isset(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT))
-		msleep(&cm_id_priv->connect_wait, &cm_id_priv->lock, 0, "iwcm connect1", 0);
-
-	switch (cm_id_priv->state) {
-	case IW_CM_STATE_ESTABLISHED:
-		cm_id_priv->state = IW_CM_STATE_CLOSING;
-
-		/* QP could be <nul> for user-mode client */
-		if (cm_id_priv->qp)
-			qp = cm_id_priv->qp;
-		else
-			ret = EINVAL;
-		break;
-	case IW_CM_STATE_LISTEN:
-		ret = EINVAL;
-		break;
-	case IW_CM_STATE_CLOSING:
-		/* remote peer closed first */
-	case IW_CM_STATE_IDLE:
-		/* accept or connect returned !0 */
-		break;
-	case IW_CM_STATE_CONN_RECV:
-		/*
-		 * App called disconnect before/without calling accept after
-		 * connect_request event delivered.
-		 */
-		break;
-	case IW_CM_STATE_CONN_SENT:
-		/* Can only get here if wait above fails */
-	default:
-		panic("just cuz");
-	}
-	mtx_unlock(&cm_id_priv->lock);
-
-	if (qp) {
-		if (abrupt)
-			ret = iwcm_modify_qp_err(qp);
-		else
-			ret = iwcm_modify_qp_sqd(qp);
-
-		/*
-		 * If both sides are disconnecting the QP could
-		 * already be in ERR or SQD states
-		 */
-		ret = 0;
-	}
-
-	return ret;
-}
-
-/*
- * CM_ID <-- DESTROYING
- *
- * Clean up all resources associated with the connection and release
- * the initial reference taken by iw_create_cm_id.
- */
-static void destroy_cm_id(struct iw_cm_id *cm_id)
-{
-	struct iwcm_id_private *cm_id_priv;
-	int ret;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-	/*
-	 * Wait if we're currently in a connect or accept downcall. A
-	 * listening endpoint should never block here.
-	 */
-	mtx_lock(&cm_id_priv->lock);
-	if (isset(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT))
-		msleep(&cm_id_priv->connect_wait, &cm_id_priv->lock, 0, "iwcm connect2", 0);
-
-	switch (cm_id_priv->state) {
-	case IW_CM_STATE_LISTEN:
-		cm_id_priv->state = IW_CM_STATE_DESTROYING;
-		mtx_unlock(&cm_id_priv->lock);
-		/* destroy the listening endpoint */
-		ret = cm_id->device->iwcm->destroy_listen(cm_id);
-		mtx_lock(&cm_id_priv->lock);
-		break;
-	case IW_CM_STATE_ESTABLISHED:
-		cm_id_priv->state = IW_CM_STATE_DESTROYING;
-		mtx_unlock(&cm_id_priv->lock);
-		/* Abrupt close of the connection */
-		(void)iwcm_modify_qp_err(cm_id_priv->qp);
-		mtx_lock(&cm_id_priv->lock);
-		break;
-	case IW_CM_STATE_IDLE:
-	case IW_CM_STATE_CLOSING:
-		cm_id_priv->state = IW_CM_STATE_DESTROYING;
-		break;
-	case IW_CM_STATE_CONN_RECV:
-		/*
-		 * App called destroy before/without calling accept after
-		 * receiving connection request event notification or
-		 * returned non zero from the event callback function.
-		 * In either case, must tell the provider to reject.
-		 */
-		cm_id_priv->state = IW_CM_STATE_DESTROYING;
-		break;
-	case IW_CM_STATE_CONN_SENT:
-	case IW_CM_STATE_DESTROYING:
-	default:
-		panic("just cuz");
-		break;
-	}
-	if (cm_id_priv->qp) {
-		cm_id_priv->id.device->iwcm->rem_ref(cm_id_priv->qp);
-		cm_id_priv->qp = NULL;
-	}
-	mtx_unlock(&cm_id_priv->lock);
-
-	(void)iwcm_deref_id(cm_id_priv);
-}
-
-/*
- * This function is only called by the application thread and cannot
- * be called by the event thread. The function will wait for all
- * references to be released on the cm_id and then free the cm_id
- * object.
- */
-void iw_destroy_cm_id(struct iw_cm_id *cm_id)
-{
-	struct iwcm_id_private *cm_id_priv;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-	PANIC_IF(isset(&cm_id_priv->flags, IWCM_F_CALLBACK_DESTROY));
-
-	destroy_cm_id(cm_id);
-
-	mtx_lock(&cm_id_priv->lock);
-	if (atomic_load_acq_int(&cm_id_priv->refcount))
-		msleep(&cm_id_priv->destroy_comp, &cm_id_priv->lock, 0, "iwcm destroy", 0);
-	mtx_unlock(&cm_id_priv->lock);
-
-	free_cm_id(cm_id_priv);
-}
-
-/*
- * CM_ID <-- LISTEN
- *
- * Start listening for connect requests. Generates one CONNECT_REQUEST
- * event for each inbound connect request.
- */
-int iw_cm_listen(struct iw_cm_id *cm_id, int backlog)
-{
-	struct iwcm_id_private *cm_id_priv;
-	int ret;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-
-	ret = alloc_work_entries(cm_id_priv, backlog);
-	if (ret)
-		return ret;
-
-	mtx_lock(&cm_id_priv->lock);
-	switch (cm_id_priv->state) {
-	case IW_CM_STATE_IDLE:
-		cm_id_priv->state = IW_CM_STATE_LISTEN;
-		mtx_unlock(&cm_id_priv->lock);
-		ret = cm_id->device->iwcm->create_listen(cm_id, backlog);
-		if (ret)
-			cm_id_priv->state = IW_CM_STATE_IDLE;
-		mtx_lock(&cm_id_priv->lock);
-		break;
-	default:
-		ret = EINVAL;
-	}
-	mtx_unlock(&cm_id_priv->lock);
-
-	return ret;
-}
-
-/*
- * CM_ID <-- IDLE
- *
- * Rejects an inbound connection request. No events are generated.
- */
-int iw_cm_reject(struct iw_cm_id *cm_id,
-		 const void *private_data,
-		 u8 private_data_len)
-{
-	struct iwcm_id_private *cm_id_priv;
-	int ret;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-	setbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-
-	mtx_lock(&cm_id_priv->lock);
-	if (cm_id_priv->state != IW_CM_STATE_CONN_RECV) {
-		clrbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-		wakeup(&cm_id_priv->connect_wait);
-		mtx_unlock(&cm_id_priv->lock);
-		return (EINVAL);
-	}
-	cm_id_priv->state = IW_CM_STATE_IDLE;
-	mtx_unlock(&cm_id_priv->lock);
-
-	ret = cm_id->device->iwcm->reject(cm_id, private_data,
-					  private_data_len);
-
-	mtx_lock(&cm_id_priv->lock);
-	clrbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-	wakeup(&cm_id_priv->connect_wait);
-	mtx_unlock(&cm_id_priv->lock);
-
-	return ret;
-}
-
-/*
- * CM_ID <-- ESTABLISHED
- *
- * Accepts an inbound connection request and generates an ESTABLISHED
- * event. Callers of iw_cm_disconnect and iw_destroy_cm_id will block
- * until the ESTABLISHED event is received from the provider.
- */
-int iw_cm_accept(struct iw_cm_id *cm_id,
-		 struct iw_cm_conn_param *iw_param)
-{
-	struct iwcm_id_private *cm_id_priv;
-	struct ib_qp *qp;
-	int ret;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-	setbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-
-	mtx_lock(&cm_id_priv->lock);
-	if (cm_id_priv->state != IW_CM_STATE_CONN_RECV) {
-		clrbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-		wakeup(&cm_id_priv->connect_wait);
-		mtx_unlock(&cm_id_priv->lock);
-		
-		return (EINVAL);
-	}
-	/* Get the ib_qp given the QPN */
-	qp = cm_id->device->iwcm->get_qp(cm_id->device, iw_param->qpn);
-	if (!qp) {
-		mtx_unlock(&cm_id_priv->lock);
-		return (EINVAL);
-	}
-	cm_id->device->iwcm->add_ref(qp);
-	cm_id_priv->qp = qp;
-	mtx_unlock(&cm_id_priv->lock);
-
-	ret = cm_id->device->iwcm->accept(cm_id, iw_param);
-	if (ret) {
-		/* An error on accept precludes provider events */
-		PANIC_IF(cm_id_priv->state != IW_CM_STATE_CONN_RECV);
-		cm_id_priv->state = IW_CM_STATE_IDLE;
-		mtx_lock(&cm_id_priv->lock);
-		if (cm_id_priv->qp) {
-			cm_id->device->iwcm->rem_ref(qp);
-			cm_id_priv->qp = NULL;
-		}
-		clrbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-		wakeup(&cm_id_priv->connect_wait);
-		mtx_unlock(&cm_id_priv->lock);
-	}
-
-	return ret;
-}
-
-/*
- * Active Side: CM_ID <-- CONN_SENT
- *
- * If successful, results in the generation of a CONNECT_REPLY
- * event. iw_cm_disconnect and iw_cm_destroy will block until the
- * CONNECT_REPLY event is received from the provider.
- */
-int iw_cm_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *iw_param)
-{
-	struct iwcm_id_private *cm_id_priv;
-	int ret;
-	struct ib_qp *qp;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-
-	ret = alloc_work_entries(cm_id_priv, 4);
-	if (ret)
-		return ret;
-
-	setbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-	mtx_lock(&cm_id_priv->lock);
-
-	if (cm_id_priv->state != IW_CM_STATE_IDLE) {
-		clrbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT); 
-		wakeup(&cm_id_priv->connect_wait);
-		mtx_unlock(&cm_id_priv->lock);
-		
-		return (EINVAL);
-	}
-
-	/* Get the ib_qp given the QPN */
-	qp = cm_id->device->iwcm->get_qp(cm_id->device, iw_param->qpn);
-	if (!qp) {
-		mtx_unlock(&cm_id_priv->lock);
-		return (EINVAL);
-	}
-	cm_id->device->iwcm->add_ref(qp);
-	cm_id_priv->qp = qp;
-	cm_id_priv->state = IW_CM_STATE_CONN_SENT;
-	mtx_unlock(&cm_id_priv->lock);
-
-	ret = cm_id->device->iwcm->connect(cm_id, iw_param);
-	if (ret) {
-		mtx_lock(&cm_id_priv->lock);
-		if (cm_id_priv->qp) {
-			cm_id->device->iwcm->rem_ref(qp);
-			cm_id_priv->qp = NULL;
-		}
-		PANIC_IF(cm_id_priv->state != IW_CM_STATE_CONN_SENT);
-		cm_id_priv->state = IW_CM_STATE_IDLE;
-		clrbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-		wakeup(&cm_id_priv->connect_wait);
-		mtx_unlock(&cm_id_priv->lock);
-		
-	}
-
-	return ret;
-}
-
-/*
- * Passive Side: new CM_ID <-- CONN_RECV
- *
- * Handles an inbound connect request. The function creates a new
- * iw_cm_id to represent the new connection and inherits the client
- * callback function and other attributes from the listening parent.
- *
- * The work item contains a pointer to the listen_cm_id and the event. The
- * listen_cm_id contains the client cm_handler, context and
- * device. These are copied when the device is cloned. The event
- * contains the new four tuple.
- *
- * An error on the child should not affect the parent, so this
- * function does not return a value.
- */
-static void cm_conn_req_handler(struct iwcm_id_private *listen_id_priv,
-				struct iw_cm_event *iw_event)
-{
-	struct iw_cm_id *cm_id;
-	struct iwcm_id_private *cm_id_priv;
-	int ret;
-
-	/*
-	 * The provider should never generate a connection request
-	 * event with a bad status.
-	 */
-	PANIC_IF(iw_event->status);
-
-	/*
-	 * We could be destroying the listening id. If so, ignore this
-	 * upcall.
-	 */
-	mtx_lock(&listen_id_priv->lock);
-	if (listen_id_priv->state != IW_CM_STATE_LISTEN) {
-		mtx_unlock(&listen_id_priv->lock);
-		goto out;
-	}
-	mtx_unlock(&listen_id_priv->lock);
-
-	cm_id = iw_create_cm_id(listen_id_priv->id.device,
-				iw_event->so,
-				listen_id_priv->id.cm_handler,
-				listen_id_priv->id.context);
-	/* If the cm_id could not be created, ignore the request */
-	if (IS_ERR(cm_id))
-		goto out;
-
-	cm_id->provider_data = iw_event->provider_data;
-	cm_id->local_addr = iw_event->local_addr;
-	cm_id->remote_addr = iw_event->remote_addr;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-	cm_id_priv->state = IW_CM_STATE_CONN_RECV;
-
-	ret = alloc_work_entries(cm_id_priv, 3);
-	if (ret) {
-		iw_cm_reject(cm_id, NULL, 0);
-		iw_destroy_cm_id(cm_id);
-		goto out;
-	}
-
-	/* Call the client CM handler */
-	ret = cm_id->cm_handler(cm_id, iw_event);
-	if (ret) {
-		iw_cm_reject(cm_id, NULL, 0);
-		setbit(&cm_id_priv->flags, IWCM_F_CALLBACK_DESTROY);
-		
-		destroy_cm_id(cm_id);
-		if (atomic_load_acq_int(&cm_id_priv->refcount)==0)
-			free_cm_id(cm_id_priv);
-	}
-
-out:
-	if (iw_event->private_data_len)
-		free(iw_event->private_data, M_DEVBUF);
-}
-
-/*
- * Passive Side: CM_ID <-- ESTABLISHED
- *
- * The provider generated an ESTABLISHED event which means that
- * the MPA negotion has completed successfully and we are now in MPA
- * FPDU mode.
- *
- * This event can only be received in the CONN_RECV state. If the
- * remote peer closed, the ESTABLISHED event would be received followed
- * by the CLOSE event. If the app closes, it will block until we wake
- * it up after processing this event.
- */
-static int cm_conn_est_handler(struct iwcm_id_private *cm_id_priv,
-			       struct iw_cm_event *iw_event)
-{
-	int ret;
-
-	mtx_lock(&cm_id_priv->lock);
-
-	/*
-	 * We clear the CONNECT_WAIT bit here to allow the callback
-	 * function to call iw_cm_disconnect. Calling iw_destroy_cm_id
-	 * from a callback handler is not allowed.
-	 */
-	clrbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-	PANIC_IF(cm_id_priv->state != IW_CM_STATE_CONN_RECV);
-	cm_id_priv->state = IW_CM_STATE_ESTABLISHED;
-	ret = cm_id_priv->id.cm_handler(&cm_id_priv->id, iw_event);
-	wakeup(&cm_id_priv->connect_wait);
-	mtx_unlock(&cm_id_priv->lock);
-
-	return ret;
-}
-
-/*
- * Active Side: CM_ID <-- ESTABLISHED
- *
- * The app has called connect and is waiting for the established event to
- * post it's requests to the server. This event will wake up anyone
- * blocked in iw_cm_disconnect or iw_destroy_id.
- */
-static int cm_conn_rep_handler(struct iwcm_id_private *cm_id_priv,
-			       struct iw_cm_event *iw_event)
-{
-	int ret;
-
-	mtx_lock(&cm_id_priv->lock);
-	/*
-	 * Clear the connect wait bit so a callback function calling
-	 * iw_cm_disconnect will not wait and deadlock this thread
-	 */
-	clrbit(&cm_id_priv->flags, IWCM_F_CONNECT_WAIT);
-	PANIC_IF(cm_id_priv->state != IW_CM_STATE_CONN_SENT);
-	if (iw_event->status == IW_CM_EVENT_STATUS_ACCEPTED) {
-		cm_id_priv->id.local_addr = iw_event->local_addr;
-		cm_id_priv->id.remote_addr = iw_event->remote_addr;
-		cm_id_priv->state = IW_CM_STATE_ESTABLISHED;
-	} else {
-		/* REJECTED or RESET */
-		cm_id_priv->id.device->iwcm->rem_ref(cm_id_priv->qp);
-		cm_id_priv->qp = NULL;
-		cm_id_priv->state = IW_CM_STATE_IDLE;
-	}
-	mtx_unlock(&cm_id_priv->lock);
-	ret = cm_id_priv->id.cm_handler(&cm_id_priv->id, iw_event);
-
-	mtx_lock(&cm_id_priv->lock);
-	if (iw_event->private_data_len)
-		free(iw_event->private_data, M_DEVBUF);
-
-	/* Wake up waiters on connect complete */
-	wakeup(&cm_id_priv->connect_wait);
-	mtx_unlock(&cm_id_priv->lock);
-
-	return ret;
-}
-
-/*
- * CM_ID <-- CLOSING
- *
- * If in the ESTABLISHED state, move to CLOSING.
- */
-static void cm_disconnect_handler(struct iwcm_id_private *cm_id_priv,
-				  struct iw_cm_event *iw_event)
-{
-
-	mtx_lock(&cm_id_priv->lock);
-	if (cm_id_priv->state == IW_CM_STATE_ESTABLISHED)
-		cm_id_priv->state = IW_CM_STATE_CLOSING;
-	mtx_unlock(&cm_id_priv->lock);
-}
-
-/*
- * CM_ID <-- IDLE
- *
- * If in the ESTBLISHED or CLOSING states, the QP will have have been
- * moved by the provider to the ERR state. Disassociate the CM_ID from
- * the QP,  move to IDLE, and remove the 'connected' reference.
- *
- * If in some other state, the cm_id was destroyed asynchronously.
- * This is the last reference that will result in waking up
- * the app thread blocked in iw_destroy_cm_id.
- */
-static int cm_close_handler(struct iwcm_id_private *cm_id_priv,
-				  struct iw_cm_event *iw_event)
-{
-	int ret = 0;
-	mtx_lock(&cm_id_priv->lock);
-
-	if (cm_id_priv->qp) {
-		cm_id_priv->id.device->iwcm->rem_ref(cm_id_priv->qp);
-		cm_id_priv->qp = NULL;
-	}
-	switch (cm_id_priv->state) {
-	case IW_CM_STATE_ESTABLISHED:
-	case IW_CM_STATE_CLOSING:
-		cm_id_priv->state = IW_CM_STATE_IDLE;
-		mtx_unlock(&cm_id_priv->lock);
-		ret = cm_id_priv->id.cm_handler(&cm_id_priv->id, iw_event);
-		mtx_lock(&cm_id_priv->lock);
-		break;
-	case IW_CM_STATE_DESTROYING:
-		break;
-	default:
-		panic("just cuz");
-	}
-	mtx_unlock(&cm_id_priv->lock);
-
-	return ret;
-}
-
-static int process_event(struct iwcm_id_private *cm_id_priv,
-			 struct iw_cm_event *iw_event)
-{
-	int ret = 0;
-
-	switch (iw_event->event) {
-	case IW_CM_EVENT_CONNECT_REQUEST:
-		cm_conn_req_handler(cm_id_priv, iw_event);
-		break;
-	case IW_CM_EVENT_CONNECT_REPLY:
-		ret = cm_conn_rep_handler(cm_id_priv, iw_event);
-		break;
-	case IW_CM_EVENT_ESTABLISHED:
-		ret = cm_conn_est_handler(cm_id_priv, iw_event);
-		break;
-	case IW_CM_EVENT_DISCONNECT:
-		cm_disconnect_handler(cm_id_priv, iw_event);
-		break;
-	case IW_CM_EVENT_CLOSE:
-		ret = cm_close_handler(cm_id_priv, iw_event);
-		break;
-	default:
-		panic("just cuz");
-	}
-
-	return ret;
-}
-
-/*
- * Process events on the work_list for the cm_id. If the callback
- * function requests that the cm_id be deleted, a flag is set in the
- * cm_id flags to indicate that when the last reference is
- * removed, the cm_id is to be destroyed. This is necessary to
- * distinguish between an object that will be destroyed by the app
- * thread asleep on the destroy_comp list vs. an object destroyed
- * here synchronously when the last reference is removed.
- */
-static void cm_work_handler(void *context, int pending)
-{
-	struct iwcm_work *work = context;
-	struct iw_cm_event levent;
-	struct iwcm_id_private *cm_id_priv = work->cm_id;
-	int empty;
-	int ret = 0;
-
-	mtx_lock(&cm_id_priv->lock);
-	empty = TAILQ_EMPTY(&cm_id_priv->work_list);
-	while (!empty) {
-		work = TAILQ_FIRST(&cm_id_priv->work_list);
-		TAILQ_REMOVE(&cm_id_priv->work_list, work, list);
-		empty = TAILQ_EMPTY(&cm_id_priv->work_list);
-		levent = work->event;
-		put_work(work);
-		mtx_unlock(&cm_id_priv->lock);
-
-		ret = process_event(cm_id_priv, &levent);
-		if (ret) {
-			setbit(&cm_id_priv->flags, IWCM_F_CALLBACK_DESTROY);
-			destroy_cm_id(&cm_id_priv->id);
-		}
-		PANIC_IF(atomic_load_acq_int(&cm_id_priv->refcount)==0);
-		if (iwcm_deref_id(cm_id_priv)) {
-			if (isset(&cm_id_priv->flags,
-				IWCM_F_CALLBACK_DESTROY)) {
-				PANIC_IF(!TAILQ_EMPTY(&cm_id_priv->work_list));
-				free_cm_id(cm_id_priv);
-			}
-			return;
-		}
-		mtx_lock(&cm_id_priv->lock);
-	}
-	mtx_unlock(&cm_id_priv->lock);
-}
-
-/*
- * This function is called on interrupt context. Schedule events on
- * the iwcm_wq thread to allow callback functions to downcall into
- * the CM and/or block.  Events are queued to a per-CM_ID
- * work_list. If this is the first event on the work_list, the work
- * element is also queued on the iwcm_wq thread.
- *
- * Each event holds a reference on the cm_id. Until the last posted
- * event has been delivered and processed, the cm_id cannot be
- * deleted.
- *
- * Returns:
- * 	      0	- the event was handled.
- *	ENOMEM	- the event was not handled due to lack of resources.
- */
-static int cm_event_handler(struct iw_cm_id *cm_id,
-			     struct iw_cm_event *iw_event)
-{
-	struct iwcm_work *work;
-	struct iwcm_id_private *cm_id_priv;
-	int ret = 0;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-
-	mtx_lock(&cm_id_priv->lock);
-	work = get_work(cm_id_priv);
-	if (!work) {
-		ret = ENOMEM;
-		goto out;
-	}
-
-        TASK_INIT(&work->task, 0, cm_work_handler, work);
-	work->cm_id = cm_id_priv;
-	work->event = *iw_event;
-
-	if ((work->event.event == IW_CM_EVENT_CONNECT_REQUEST ||
-	     work->event.event == IW_CM_EVENT_CONNECT_REPLY) &&
-	    work->event.private_data_len) {
-		ret = copy_private_data(&work->event);
-		if (ret) {
-			put_work(work);
-			goto out;
-		}
-	}
-
-	atomic_add_acq_int(&cm_id_priv->refcount, 1);
-	if (TAILQ_EMPTY(&cm_id_priv->work_list)) {
-		TAILQ_INSERT_TAIL(&cm_id_priv->work_list, work, list);
-		taskqueue_enqueue(iwcm_wq, &work->task);
-	} else
-		TAILQ_INSERT_TAIL(&cm_id_priv->work_list, work, list);
-out:
-	mtx_unlock(&cm_id_priv->lock);
-	return ret;
-}
-
-static int iwcm_init_qp_init_attr(struct iwcm_id_private *cm_id_priv,
-				  struct ib_qp_attr *qp_attr,
-				  int *qp_attr_mask)
-{
-	int ret;
-
-	mtx_lock(&cm_id_priv->lock);
-	switch (cm_id_priv->state) {
-	case IW_CM_STATE_IDLE:
-	case IW_CM_STATE_CONN_SENT:
-	case IW_CM_STATE_CONN_RECV:
-	case IW_CM_STATE_ESTABLISHED:
-		*qp_attr_mask = IB_QP_STATE | IB_QP_ACCESS_FLAGS;
-		qp_attr->qp_access_flags = IB_ACCESS_LOCAL_WRITE |
-					   IB_ACCESS_REMOTE_WRITE|
-					   IB_ACCESS_REMOTE_READ;
-		ret = 0;
-		break;
-	default:
-		ret = EINVAL;
-		break;
-	}
-	mtx_unlock(&cm_id_priv->lock);
-	return ret;
-}
-
-static int iwcm_init_qp_rts_attr(struct iwcm_id_private *cm_id_priv,
-				  struct ib_qp_attr *qp_attr,
-				  int *qp_attr_mask)
-{
-	int ret;
-
-	mtx_lock(&cm_id_priv->lock);
-	switch (cm_id_priv->state) {
-	case IW_CM_STATE_IDLE:
-	case IW_CM_STATE_CONN_SENT:
-	case IW_CM_STATE_CONN_RECV:
-	case IW_CM_STATE_ESTABLISHED:
-		*qp_attr_mask = 0;
-		ret = 0;
-		break;
-	default:
-		ret = EINVAL;
-		break;
-	}
-	mtx_unlock(&cm_id_priv->lock);
-	return ret;
-}
-
-int iw_cm_init_qp_attr(struct iw_cm_id *cm_id,
-		       struct ib_qp_attr *qp_attr,
-		       int *qp_attr_mask)
-{
-	struct iwcm_id_private *cm_id_priv;
-	int ret;
-
-	cm_id_priv = container_of(cm_id, struct iwcm_id_private, id);
-	switch (qp_attr->qp_state) {
-	case IB_QPS_INIT:
-	case IB_QPS_RTR:
-		ret = iwcm_init_qp_init_attr(cm_id_priv,
-					     qp_attr, qp_attr_mask);
-		break;
-	case IB_QPS_RTS:
-		ret = iwcm_init_qp_rts_attr(cm_id_priv,
-					    qp_attr, qp_attr_mask);
-		break;
-	default:
-		ret = EINVAL;
-		break;
-	}
-	return ret;
-}
-
-static int iw_cm_init(void)
-{
-	iwcm_wq = taskqueue_create("iw_cm_wq", M_NOWAIT, taskqueue_thread_enqueue, &iwcm_wq);
-	if (!iwcm_wq)
-		return (ENOMEM);
-
-	taskqueue_start_threads(&iwcm_wq, 1, PI_NET, "iw_cm_wq thread");
-	return 0;
-}
-
-static void iw_cm_cleanup(void)
-{
-	taskqueue_free(iwcm_wq);
-}
-
-static int 
-iw_cm_load(module_t mod, int cmd, void *arg)
-{
-        int err = 0;
-
-        switch (cmd) {
-        case MOD_LOAD:
-                printf("Loading rdma_iwcm.\n");
-
-                iw_cm_init();
-                break;
-        case MOD_QUIESCE:
-                break;
-        case MOD_UNLOAD:
-                printf("Unloading rdma_iwcm.\n");
-		iw_cm_cleanup();
-                break;
-        case MOD_SHUTDOWN:
-                break;
-        default:
-                err = EOPNOTSUPP;
-                break;
-        }
-
-        return (err);
-}
-
-static moduledata_t mod_data = {
-	"rdma_iwcm",
-	iw_cm_load,
-	0
-};
-
-MODULE_VERSION(rdma_iwcm, 1);
-MODULE_DEPEND(rdma_iwcm, rdma_core, 1, 1, 1);
-DECLARE_MODULE(rdma_iwcm, mod_data, SI_SUB_EXEC, SI_ORDER_ANY);
diff --git a/sys/contrib/rdma/rdma_user_cm.h b/sys/contrib/rdma/rdma_user_cm.h
deleted file mode 100644
index 0ffa4e5b3c2..00000000000
--- a/sys/contrib/rdma/rdma_user_cm.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2005-2006 Intel Corporation.  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.
- *
- * $FreeBSD$
- */
-
-#ifndef RDMA_USER_CM_H
-#define RDMA_USER_CM_H
-
-#include <rdma/ib_user_verbs.h>
-#include <rdma/ib_user_sa.h>
-
-#define RDMA_USER_CM_ABI_VERSION	4
-
-#define RDMA_MAX_PRIVATE_DATA		256
-
-enum {
-	RDMA_USER_CM_CMD_CREATE_ID,
-	RDMA_USER_CM_CMD_DESTROY_ID,
-	RDMA_USER_CM_CMD_BIND_ADDR,
-	RDMA_USER_CM_CMD_RESOLVE_ADDR,
-	RDMA_USER_CM_CMD_RESOLVE_ROUTE,
-	RDMA_USER_CM_CMD_QUERY_ROUTE,
-	RDMA_USER_CM_CMD_CONNECT,
-	RDMA_USER_CM_CMD_LISTEN,
-	RDMA_USER_CM_CMD_ACCEPT,
-	RDMA_USER_CM_CMD_REJECT,
-	RDMA_USER_CM_CMD_DISCONNECT,
-	RDMA_USER_CM_CMD_INIT_QP_ATTR,
-	RDMA_USER_CM_CMD_GET_EVENT,
-	RDMA_USER_CM_CMD_GET_OPTION,
-	RDMA_USER_CM_CMD_SET_OPTION,
-	RDMA_USER_CM_CMD_NOTIFY,
-	RDMA_USER_CM_CMD_JOIN_MCAST,
-	RDMA_USER_CM_CMD_LEAVE_MCAST
-};
-
-/*
- * command ABI structures.
- */
-struct rdma_ucm_cmd_hdr {
-	__u32 cmd;
-	__u16 in;
-	__u16 out;
-};
-
-struct rdma_ucm_create_id {
-	__u64 uid;
-	__u64 response;
-	__u16 ps;
-	__u8  reserved[6];
-};
-
-struct rdma_ucm_create_id_resp {
-	__u32 id;
-};
-
-struct rdma_ucm_destroy_id {
-	__u64 response;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct rdma_ucm_destroy_id_resp {
-	__u32 events_reported;
-};
-
-struct rdma_ucm_bind_addr {
-	__u64 response;
-	struct sockaddr_in6 addr;
-	__u32 id;
-};
-
-struct rdma_ucm_resolve_addr {
-	struct sockaddr_in6 src_addr;
-	struct sockaddr_in6 dst_addr;
-	__u32 id;
-	__u32 timeout_ms;
-};
-
-struct rdma_ucm_resolve_route {
-	__u32 id;
-	__u32 timeout_ms;
-};
-
-struct rdma_ucm_query_route {
-	__u64 response;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct rdma_ucm_query_route_resp {
-	__u64 node_guid;
-	struct ib_user_path_rec ib_route[2];
-	struct sockaddr_in6 src_addr;
-	struct sockaddr_in6 dst_addr;
-	__u32 num_paths;
-	__u8 port_num;
-	__u8 reserved[3];
-};
-
-struct rdma_ucm_conn_param {
-	__u32 qp_num;
-	__u32 reserved;
-	__u8  private_data[RDMA_MAX_PRIVATE_DATA];
-	__u8  private_data_len;
-	__u8  srq;
-	__u8  responder_resources;
-	__u8  initiator_depth;
-	__u8  flow_control;
-	__u8  retry_count;
-	__u8  rnr_retry_count;
-	__u8  valid;
-};
-
-struct rdma_ucm_ud_param {
-	__u32 qp_num;
-	__u32 qkey;
-	struct ib_uverbs_ah_attr ah_attr;
-	__u8  private_data[RDMA_MAX_PRIVATE_DATA];
-	__u8  private_data_len;
-	__u8  reserved[7];
-};
-
-struct rdma_ucm_connect {
-	struct rdma_ucm_conn_param conn_param;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct rdma_ucm_listen {
-	__u32 id;
-	__u32 backlog;
-};
-
-struct rdma_ucm_accept {
-	__u64 uid;
-	struct rdma_ucm_conn_param conn_param;
-	__u32 id;
-	__u32 reserved;
-};
-
-struct rdma_ucm_reject {
-	__u32 id;
-	__u8  private_data_len;
-	__u8  reserved[3];
-	__u8  private_data[RDMA_MAX_PRIVATE_DATA];
-};
-
-struct rdma_ucm_disconnect {
-	__u32 id;
-};
-
-struct rdma_ucm_init_qp_attr {
-	__u64 response;
-	__u32 id;
-	__u32 qp_state;
-};
-
-struct rdma_ucm_notify {
-	__u32 id;
-	__u32 event;
-};
-
-struct rdma_ucm_join_mcast {
-	__u64 response;		/* rdma_ucm_create_id_resp */
-	__u64 uid;
-	struct sockaddr_in6 addr;
-	__u32 id;
-};
-
-struct rdma_ucm_get_event {
-	__u64 response;
-};
-
-struct rdma_ucm_event_resp {
-	__u64 uid;
-	__u32 id;
-	__u32 event;
-	__u32 status;
-	union {
-		struct rdma_ucm_conn_param conn;
-		struct rdma_ucm_ud_param   ud;
-	} param;
-};
-
-#endif /* RDMA_USER_CM_H */
diff --git a/sys/contrib/rdma/rdma_verbs.c b/sys/contrib/rdma/rdma_verbs.c
deleted file mode 100644
index 93821074b3c..00000000000
--- a/sys/contrib/rdma/rdma_verbs.c
+++ /dev/null
@@ -1,822 +0,0 @@
-/*
- * Copyright (c) 2004 Mellanox Technologies Ltd.  All rights reserved.
- * Copyright (c) 2004 Infinicon Corporation.  All rights reserved.
- * Copyright (c) 2004 Intel Corporation.  All rights reserved.
- * Copyright (c) 2004 Topspin Corporation.  All rights reserved.
- * Copyright (c) 2004 Voltaire Corporation.  All rights reserved.
- * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
- * Copyright (c) 2005, 2006 Cisco Systems.  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.
- *
- * $Id: verbs.c 1349 2004-12-16 21:09:43Z roland $
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/libkern.h>
-#include <sys/module.h>
-#include <sys/endian.h>
-
-#include <contrib/rdma/ib_verbs.h>
-#include <contrib/rdma/ib_cache.h>
-
-int ib_rate_to_mult(enum ib_rate rate)
-{
-	switch (rate) {
-	case IB_RATE_2_5_GBPS: return  1;
-	case IB_RATE_5_GBPS:   return  2;
-	case IB_RATE_10_GBPS:  return  4;
-	case IB_RATE_20_GBPS:  return  8;
-	case IB_RATE_30_GBPS:  return 12;
-	case IB_RATE_40_GBPS:  return 16;
-	case IB_RATE_60_GBPS:  return 24;
-	case IB_RATE_80_GBPS:  return 32;
-	case IB_RATE_120_GBPS: return 48;
-	default:	       return -1;
-	}
-}
-
-enum ib_rate mult_to_ib_rate(int mult)
-{
-	switch (mult) {
-	case 1:  return IB_RATE_2_5_GBPS;
-	case 2:  return IB_RATE_5_GBPS;
-	case 4:  return IB_RATE_10_GBPS;
-	case 8:  return IB_RATE_20_GBPS;
-	case 12: return IB_RATE_30_GBPS;
-	case 16: return IB_RATE_40_GBPS;
-	case 24: return IB_RATE_60_GBPS;
-	case 32: return IB_RATE_80_GBPS;
-	case 48: return IB_RATE_120_GBPS;
-	default: return IB_RATE_PORT_CURRENT;
-	}
-}
-
-enum rdma_transport_type
-rdma_node_get_transport(enum rdma_node_type node_type)
-{
-	switch (node_type) {
-	case RDMA_NODE_IB_CA:
-	case RDMA_NODE_IB_SWITCH:
-	case RDMA_NODE_IB_ROUTER:
-		return RDMA_TRANSPORT_IB;
-	case RDMA_NODE_RNIC:
-		return RDMA_TRANSPORT_IWARP;
-	default:
-		panic("bad condition");
-		return 0;
-	}
-}
-
-/* Protection domains */
-
-struct ib_pd *ib_alloc_pd(struct ib_device *device)
-{
-	struct ib_pd *pd;
-
-	pd = device->alloc_pd(device, NULL, NULL);
-
-	if (!IS_ERR(pd)) {
-		pd->device  = device;
-		pd->uobject = NULL;
-		atomic_store_rel_int(&pd->usecnt, 0);
-	}
-
-	return pd;
-}
-
-int ib_dealloc_pd(struct ib_pd *pd)
-{
-	if (atomic_load_acq_int(&pd->usecnt))
-		return (EBUSY);
-
-	return pd->device->dealloc_pd(pd);
-}
-
-/* Address handles */
-
-struct ib_ah *ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr)
-{
-	struct ib_ah *ah;
-
-	ah = pd->device->create_ah(pd, ah_attr);
-
-	if (!IS_ERR(ah)) {
-		ah->device  = pd->device;
-		ah->pd      = pd;
-		ah->uobject = NULL;
-		atomic_add_acq_int(&pd->usecnt, 1);
-	}
-
-	return ah;
-}
-
-int ib_init_ah_from_wc(struct ib_device *device, u8 port_num, struct ib_wc *wc,
-		       struct ib_grh *grh, struct ib_ah_attr *ah_attr)
-{
-	u32 flow_class;
-	u16 gid_index;
-	int ret;
-
-	memset(ah_attr, 0, sizeof *ah_attr);
-	ah_attr->dlid = wc->slid;
-	ah_attr->sl = wc->sl;
-	ah_attr->src_path_bits = wc->dlid_path_bits;
-	ah_attr->port_num = port_num;
-
-	if (wc->wc_flags & IB_WC_GRH) {
-		ah_attr->ah_flags = IB_AH_GRH;
-		ah_attr->grh.dgid = grh->sgid;
-
-		ret = ib_find_cached_gid(device, &grh->dgid, &port_num,
-					 &gid_index);
-		if (ret)
-			return ret;
-
-		ah_attr->grh.sgid_index = (u8) gid_index;
-		flow_class = be32toh(grh->version_tclass_flow);
-		ah_attr->grh.flow_label = flow_class & 0xFFFFF;
-		ah_attr->grh.hop_limit = 0xFF;
-		ah_attr->grh.traffic_class = (flow_class >> 20) & 0xFF;
-	}
-	return 0;
-}
-
-struct ib_ah *ib_create_ah_from_wc(struct ib_pd *pd, struct ib_wc *wc,
-				   struct ib_grh *grh, u8 port_num)
-{
-	struct ib_ah_attr ah_attr;
-	int ret;
-
-	ret = ib_init_ah_from_wc(pd->device, port_num, wc, grh, &ah_attr);
-	if (ret)
-		return ERR_PTR(ret);
-
-	return ib_create_ah(pd, &ah_attr);
-}
-
-int ib_modify_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr)
-{
-	return ah->device->modify_ah ?
-		ah->device->modify_ah(ah, ah_attr) :
-		ENOSYS;
-}
-
-int ib_query_ah(struct ib_ah *ah, struct ib_ah_attr *ah_attr)
-{
-	return ah->device->query_ah ?
-		ah->device->query_ah(ah, ah_attr) :
-		ENOSYS;
-}
-
-int ib_destroy_ah(struct ib_ah *ah)
-{
-	struct ib_pd *pd;
-	int ret;
-
-	pd = ah->pd;
-	ret = ah->device->destroy_ah(ah);
-	if (!ret)
-		atomic_subtract_acq_int(&pd->usecnt, 1);
-
-	return ret;
-}
-
-/* Shared receive queues */
-
-struct ib_srq *ib_create_srq(struct ib_pd *pd,
-			     struct ib_srq_init_attr *srq_init_attr)
-{
-	struct ib_srq *srq;
-
-	if (!pd->device->create_srq)
-		return ERR_PTR(ENOSYS);
-
-	srq = pd->device->create_srq(pd, srq_init_attr, NULL);
-
-	if (!IS_ERR(srq)) {
-		srq->device    	   = pd->device;
-		srq->pd        	   = pd;
-		srq->uobject       = NULL;
-		srq->event_handler = srq_init_attr->event_handler;
-		srq->srq_context   = srq_init_attr->srq_context;
-		atomic_add_acq_int(&pd->usecnt, 1);
-		atomic_store_rel_int(&srq->usecnt, 0);
-	}
-
-	return srq;
-}
-
-int ib_modify_srq(struct ib_srq *srq,
-		  struct ib_srq_attr *srq_attr,
-		  enum ib_srq_attr_mask srq_attr_mask)
-{
-	return srq->device->modify_srq(srq, srq_attr, srq_attr_mask, NULL);
-}
-
-int ib_query_srq(struct ib_srq *srq,
-		 struct ib_srq_attr *srq_attr)
-{
-	return srq->device->query_srq ?
-		srq->device->query_srq(srq, srq_attr) : ENOSYS;
-}
-
-int ib_destroy_srq(struct ib_srq *srq)
-{
-	struct ib_pd *pd;
-	int ret;
-
-	if (atomic_load_acq_int(&srq->usecnt))
-		return (EBUSY);
-
-	pd = srq->pd;
-
-	ret = srq->device->destroy_srq(srq);
-	if (!ret)
-		atomic_subtract_acq_int(&pd->usecnt, 1);
-
-	return ret;
-}
-
-/* Queue pairs */
-
-struct ib_qp *ib_create_qp(struct ib_pd *pd,
-			   struct ib_qp_init_attr *qp_init_attr)
-{
-	struct ib_qp *qp;
-
-	qp = pd->device->create_qp(pd, qp_init_attr, NULL);
-
-	if (!IS_ERR(qp)) {
-		qp->device     	  = pd->device;
-		qp->pd         	  = pd;
-		qp->send_cq    	  = qp_init_attr->send_cq;
-		qp->recv_cq    	  = qp_init_attr->recv_cq;
-		qp->srq	       	  = qp_init_attr->srq;
-		qp->uobject       = NULL;
-		qp->event_handler = qp_init_attr->event_handler;
-		qp->qp_context    = qp_init_attr->qp_context;
-		qp->qp_type	  = qp_init_attr->qp_type;
-		atomic_add_acq_int(&pd->usecnt, 1);
-		atomic_add_acq_int(&qp_init_attr->send_cq->usecnt, 1);
-		atomic_add_acq_int(&qp_init_attr->recv_cq->usecnt, 1);
-		if (qp_init_attr->srq)
-			atomic_add_acq_int(&qp_init_attr->srq->usecnt, 1);
-	}
-
-	return qp;
-}
-
-static const struct {
-	int			valid;
-	enum ib_qp_attr_mask	req_param[IB_QPT_RAW_ETY + 1];
-	enum ib_qp_attr_mask	opt_param[IB_QPT_RAW_ETY + 1];
-} qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {
-	[IB_QPS_RESET] = {
-		[IB_QPS_RESET] = { .valid = 1 },
-		[IB_QPS_ERR]   = { .valid = 1 },
-		[IB_QPS_INIT]  = {
-			.valid = 1,
-			.req_param = {
-				[IB_QPT_UD]  = (IB_QP_PKEY_INDEX		|
-						IB_QP_PORT			|
-						IB_QP_QKEY),
-				[IB_QPT_UC]  = (IB_QP_PKEY_INDEX		|
-						IB_QP_PORT			|
-						IB_QP_ACCESS_FLAGS),
-				[IB_QPT_RC]  = (IB_QP_PKEY_INDEX		|
-						IB_QP_PORT			|
-						IB_QP_ACCESS_FLAGS),
-				[IB_QPT_SMI] = (IB_QP_PKEY_INDEX		|
-						IB_QP_QKEY),
-				[IB_QPT_GSI] = (IB_QP_PKEY_INDEX		|
-						IB_QP_QKEY),
-			}
-		},
-	},
-	[IB_QPS_INIT]  = {
-		[IB_QPS_RESET] = { .valid = 1 },
-		[IB_QPS_ERR] =   { .valid = 1 },
-		[IB_QPS_INIT]  = {
-			.valid = 1,
-			.opt_param = {
-				[IB_QPT_UD]  = (IB_QP_PKEY_INDEX		|
-						IB_QP_PORT			|
-						IB_QP_QKEY),
-				[IB_QPT_UC]  = (IB_QP_PKEY_INDEX		|
-						IB_QP_PORT			|
-						IB_QP_ACCESS_FLAGS),
-				[IB_QPT_RC]  = (IB_QP_PKEY_INDEX		|
-						IB_QP_PORT			|
-						IB_QP_ACCESS_FLAGS),
-				[IB_QPT_SMI] = (IB_QP_PKEY_INDEX		|
-						IB_QP_QKEY),
-				[IB_QPT_GSI] = (IB_QP_PKEY_INDEX		|
-						IB_QP_QKEY),
-			}
-		},
-		[IB_QPS_RTR]   = {
-			.valid = 1,
-			.req_param = {
-				[IB_QPT_UC]  = (IB_QP_AV			|
-						IB_QP_PATH_MTU			|
-						IB_QP_DEST_QPN			|
-						IB_QP_RQ_PSN),
-				[IB_QPT_RC]  = (IB_QP_AV			|
-						IB_QP_PATH_MTU			|
-						IB_QP_DEST_QPN			|
-						IB_QP_RQ_PSN			|
-						IB_QP_MAX_DEST_RD_ATOMIC	|
-						IB_QP_MIN_RNR_TIMER),
-			},
-			.opt_param = {
-				 [IB_QPT_UD]  = (IB_QP_PKEY_INDEX		|
-						 IB_QP_QKEY),
-				 [IB_QPT_UC]  = (IB_QP_ALT_PATH			|
-						 IB_QP_ACCESS_FLAGS		|
-						 IB_QP_PKEY_INDEX),
-				 [IB_QPT_RC]  = (IB_QP_ALT_PATH			|
-						 IB_QP_ACCESS_FLAGS		|
-						 IB_QP_PKEY_INDEX),
-				 [IB_QPT_SMI] = (IB_QP_PKEY_INDEX		|
-						 IB_QP_QKEY),
-				 [IB_QPT_GSI] = (IB_QP_PKEY_INDEX		|
-						 IB_QP_QKEY),
-			 }
-		}
-	},
-	[IB_QPS_RTR]   = {
-		[IB_QPS_RESET] = { .valid = 1 },
-		[IB_QPS_ERR] =   { .valid = 1 },
-		[IB_QPS_RTS]   = {
-			.valid = 1,
-			.req_param = {
-				[IB_QPT_UD]  = IB_QP_SQ_PSN,
-				[IB_QPT_UC]  = IB_QP_SQ_PSN,
-				[IB_QPT_RC]  = (IB_QP_TIMEOUT			|
-						IB_QP_RETRY_CNT			|
-						IB_QP_RNR_RETRY			|
-						IB_QP_SQ_PSN			|
-						IB_QP_MAX_QP_RD_ATOMIC),
-				[IB_QPT_SMI] = IB_QP_SQ_PSN,
-				[IB_QPT_GSI] = IB_QP_SQ_PSN,
-			},
-			.opt_param = {
-				 [IB_QPT_UD]  = (IB_QP_CUR_STATE		|
-						 IB_QP_QKEY),
-				 [IB_QPT_UC]  = (IB_QP_CUR_STATE		|
-						 IB_QP_ALT_PATH			|
-						 IB_QP_ACCESS_FLAGS		|
-						 IB_QP_PATH_MIG_STATE),
-				 [IB_QPT_RC]  = (IB_QP_CUR_STATE		|
-						 IB_QP_ALT_PATH			|
-						 IB_QP_ACCESS_FLAGS		|
-						 IB_QP_MIN_RNR_TIMER		|
-						 IB_QP_PATH_MIG_STATE),
-				 [IB_QPT_SMI] = (IB_QP_CUR_STATE		|
-						 IB_QP_QKEY),
-				 [IB_QPT_GSI] = (IB_QP_CUR_STATE		|
-						 IB_QP_QKEY),
-			 }
-		}
-	},
-	[IB_QPS_RTS]   = {
-		[IB_QPS_RESET] = { .valid = 1 },
-		[IB_QPS_ERR] =   { .valid = 1 },
-		[IB_QPS_RTS]   = {
-			.valid = 1,
-			.opt_param = {
-				[IB_QPT_UD]  = (IB_QP_CUR_STATE			|
-						IB_QP_QKEY),
-				[IB_QPT_UC]  = (IB_QP_CUR_STATE			|
-						IB_QP_ACCESS_FLAGS		|
-						IB_QP_ALT_PATH			|
-						IB_QP_PATH_MIG_STATE),
-				[IB_QPT_RC]  = (IB_QP_CUR_STATE			|
-						IB_QP_ACCESS_FLAGS		|
-						IB_QP_ALT_PATH			|
-						IB_QP_PATH_MIG_STATE		|
-						IB_QP_MIN_RNR_TIMER),
-				[IB_QPT_SMI] = (IB_QP_CUR_STATE			|
-						IB_QP_QKEY),
-				[IB_QPT_GSI] = (IB_QP_CUR_STATE			|
-						IB_QP_QKEY),
-			}
-		},
-		[IB_QPS_SQD]   = {
-			.valid = 1,
-			.opt_param = {
-				[IB_QPT_UD]  = IB_QP_EN_SQD_ASYNC_NOTIFY,
-				[IB_QPT_UC]  = IB_QP_EN_SQD_ASYNC_NOTIFY,
-				[IB_QPT_RC]  = IB_QP_EN_SQD_ASYNC_NOTIFY,
-				[IB_QPT_SMI] = IB_QP_EN_SQD_ASYNC_NOTIFY,
-				[IB_QPT_GSI] = IB_QP_EN_SQD_ASYNC_NOTIFY
-			}
-		},
-	},
-	[IB_QPS_SQD]   = {
-		[IB_QPS_RESET] = { .valid = 1 },
-		[IB_QPS_ERR] =   { .valid = 1 },
-		[IB_QPS_RTS]   = {
-			.valid = 1,
-			.opt_param = {
-				[IB_QPT_UD]  = (IB_QP_CUR_STATE			|
-						IB_QP_QKEY),
-				[IB_QPT_UC]  = (IB_QP_CUR_STATE			|
-						IB_QP_ALT_PATH			|
-						IB_QP_ACCESS_FLAGS		|
-						IB_QP_PATH_MIG_STATE),
-				[IB_QPT_RC]  = (IB_QP_CUR_STATE			|
-						IB_QP_ALT_PATH			|
-						IB_QP_ACCESS_FLAGS		|
-						IB_QP_MIN_RNR_TIMER		|
-						IB_QP_PATH_MIG_STATE),
-				[IB_QPT_SMI] = (IB_QP_CUR_STATE			|
-						IB_QP_QKEY),
-				[IB_QPT_GSI] = (IB_QP_CUR_STATE			|
-						IB_QP_QKEY),
-			}
-		},
-		[IB_QPS_SQD]   = {
-			.valid = 1,
-			.opt_param = {
-				[IB_QPT_UD]  = (IB_QP_PKEY_INDEX		|
-						IB_QP_QKEY),
-				[IB_QPT_UC]  = (IB_QP_AV			|
-						IB_QP_ALT_PATH			|
-						IB_QP_ACCESS_FLAGS		|
-						IB_QP_PKEY_INDEX		|
-						IB_QP_PATH_MIG_STATE),
-				[IB_QPT_RC]  = (IB_QP_PORT			|
-						IB_QP_AV			|
-						IB_QP_TIMEOUT			|
-						IB_QP_RETRY_CNT			|
-						IB_QP_RNR_RETRY			|
-						IB_QP_MAX_QP_RD_ATOMIC		|
-						IB_QP_MAX_DEST_RD_ATOMIC	|
-						IB_QP_ALT_PATH			|
-						IB_QP_ACCESS_FLAGS		|
-						IB_QP_PKEY_INDEX		|
-						IB_QP_MIN_RNR_TIMER		|
-						IB_QP_PATH_MIG_STATE),
-				[IB_QPT_SMI] = (IB_QP_PKEY_INDEX		|
-						IB_QP_QKEY),
-				[IB_QPT_GSI] = (IB_QP_PKEY_INDEX		|
-						IB_QP_QKEY),
-			}
-		}
-	},
-	[IB_QPS_SQE]   = {
-		[IB_QPS_RESET] = { .valid = 1 },
-		[IB_QPS_ERR] =   { .valid = 1 },
-		[IB_QPS_RTS]   = {
-			.valid = 1,
-			.opt_param = {
-				[IB_QPT_UD]  = (IB_QP_CUR_STATE			|
-						IB_QP_QKEY),
-				[IB_QPT_UC]  = (IB_QP_CUR_STATE			|
-						IB_QP_ACCESS_FLAGS),
-				[IB_QPT_SMI] = (IB_QP_CUR_STATE			|
-						IB_QP_QKEY),
-				[IB_QPT_GSI] = (IB_QP_CUR_STATE			|
-						IB_QP_QKEY),
-			}
-		}
-	},
-	[IB_QPS_ERR] = {
-		[IB_QPS_RESET] = { .valid = 1 },
-		[IB_QPS_ERR] =   { .valid = 1 }
-	}
-};
-
-int ib_modify_qp_is_ok(enum ib_qp_state cur_state, enum ib_qp_state next_state,
-		       enum ib_qp_type type, enum ib_qp_attr_mask mask)
-{
-	enum ib_qp_attr_mask req_param, opt_param;
-
-	if (cur_state  < 0 || cur_state  > IB_QPS_ERR ||
-	    next_state < 0 || next_state > IB_QPS_ERR)
-		return 0;
-
-	if (mask & IB_QP_CUR_STATE  &&
-	    cur_state != IB_QPS_RTR && cur_state != IB_QPS_RTS &&
-	    cur_state != IB_QPS_SQD && cur_state != IB_QPS_SQE)
-		return 0;
-
-	if (!qp_state_table[cur_state][next_state].valid)
-		return 0;
-
-	req_param = qp_state_table[cur_state][next_state].req_param[type];
-	opt_param = qp_state_table[cur_state][next_state].opt_param[type];
-
-	if ((mask & req_param) != req_param)
-		return 0;
-
-	if (mask & ~(req_param | opt_param | IB_QP_STATE))
-		return 0;
-
-	return 1;
-}
-
-int ib_modify_qp(struct ib_qp *qp,
-		 struct ib_qp_attr *qp_attr,
-		 int qp_attr_mask)
-{
-	return qp->device->modify_qp(qp, qp_attr, qp_attr_mask, NULL);
-}
-
-int ib_query_qp(struct ib_qp *qp,
-		struct ib_qp_attr *qp_attr,
-		int qp_attr_mask,
-		struct ib_qp_init_attr *qp_init_attr)
-{
-	return qp->device->query_qp ?
-		qp->device->query_qp(qp, qp_attr, qp_attr_mask, qp_init_attr) :
-		ENOSYS;
-}
-
-int ib_destroy_qp(struct ib_qp *qp)
-{
-	struct ib_pd *pd;
-	struct ib_cq *scq, *rcq;
-	struct ib_srq *srq;
-	int ret;
-
-	pd  = qp->pd;
-	scq = qp->send_cq;
-	rcq = qp->recv_cq;
-	srq = qp->srq;
-
-	ret = qp->device->destroy_qp(qp);
-	if (!ret) {
-		atomic_subtract_acq_int(&pd->usecnt, 1);
-		atomic_subtract_acq_int(&scq->usecnt, 1);
-		atomic_subtract_acq_int(&rcq->usecnt, 1);
-		if (srq)
-			atomic_subtract_acq_int(&srq->usecnt, 1);
-	}
-
-	return ret;
-}
-
-/* Completion queues */
-
-struct ib_cq *ib_create_cq(struct ib_device *device,
-			   ib_comp_handler comp_handler,
-			   void (*event_handler)(struct ib_event *, void *),
-			   void *cq_context, int cqe, int comp_vector)
-{
-	struct ib_cq *cq;
-
-	cq = device->create_cq(device, cqe, comp_vector, NULL, NULL);
-
-	if (!IS_ERR(cq)) {
-		cq->device        = device;
-		cq->uobject       = NULL;
-		cq->comp_handler  = comp_handler;
-		cq->event_handler = event_handler;
-		cq->cq_context    = cq_context;
-		atomic_store_rel_int(&cq->usecnt, 0);
-	}
-
-	return cq;
-}
-
-int ib_destroy_cq(struct ib_cq *cq)
-{
-	if (atomic_load_acq_int(&cq->usecnt))
-		return (EBUSY);
-
-	return cq->device->destroy_cq(cq);
-}
-
-int ib_resize_cq(struct ib_cq *cq, int cqe)
-{
-	return cq->device->resize_cq ?
-		cq->device->resize_cq(cq, cqe, NULL) : ENOSYS;
-}
-
-/* Memory regions */
-
-struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags)
-{
-	struct ib_mr *mr;
-
-	mr = pd->device->get_dma_mr(pd, mr_access_flags);
-
-	if (!IS_ERR(mr)) {
-		mr->device  = pd->device;
-		mr->pd      = pd;
-		mr->uobject = NULL;
-		atomic_add_acq_int(&pd->usecnt, 1);
-		atomic_store_rel_int(&mr->usecnt, 0);
-	}
-
-	return mr;
-}
-
-struct ib_mr *ib_reg_phys_mr(struct ib_pd *pd,
-			     struct ib_phys_buf *phys_buf_array,
-			     int num_phys_buf,
-			     int mr_access_flags,
-			     u64 *iova_start)
-{
-	struct ib_mr *mr;
-
-	mr = pd->device->reg_phys_mr(pd, phys_buf_array, num_phys_buf,
-				     mr_access_flags, iova_start);
-
-	if (!IS_ERR(mr)) {
-		mr->device  = pd->device;
-		mr->pd      = pd;
-		mr->uobject = NULL;
-		atomic_add_acq_int(&pd->usecnt, 1);
-		atomic_store_rel_int(&mr->usecnt, 0);
-	}
-
-	return mr;
-}
-
-int ib_rereg_phys_mr(struct ib_mr *mr,
-		     int mr_rereg_mask,
-		     struct ib_pd *pd,
-		     struct ib_phys_buf *phys_buf_array,
-		     int num_phys_buf,
-		     int mr_access_flags,
-		     u64 *iova_start)
-{
-	struct ib_pd *old_pd;
-	int ret;
-
-	if (!mr->device->rereg_phys_mr)
-		return (ENOSYS);
-
-	if (atomic_load_acq_int(&mr->usecnt))
-		return (EBUSY);
-
-	old_pd = mr->pd;
-
-	ret = mr->device->rereg_phys_mr(mr, mr_rereg_mask, pd,
-					phys_buf_array, num_phys_buf,
-					mr_access_flags, iova_start);
-
-	if (!ret && (mr_rereg_mask & IB_MR_REREG_PD)) {
-		atomic_subtract_acq_int(&old_pd->usecnt, 1);
-		atomic_add_acq_int(&pd->usecnt, 1);
-	}
-
-	return ret;
-}
-
-int ib_query_mr(struct ib_mr *mr, struct ib_mr_attr *mr_attr)
-{
-	return mr->device->query_mr ?
-		mr->device->query_mr(mr, mr_attr) : ENOSYS;
-}
-
-int ib_dereg_mr(struct ib_mr *mr)
-{
-	struct ib_pd *pd;
-	int ret;
-
-	if (atomic_load_acq_int(&mr->usecnt))
-		return (EBUSY);
-
-	pd = mr->pd;
-	ret = mr->device->dereg_mr(mr);
-	if (!ret)
-		atomic_subtract_acq_int(&pd->usecnt, 1);
-
-	return ret;
-}
-
-/* Memory windows */
-
-struct ib_mw *ib_alloc_mw(struct ib_pd *pd)
-{
-	struct ib_mw *mw;
-
-	if (!pd->device->alloc_mw)
-		return ERR_PTR(ENOSYS);
-
-	mw = pd->device->alloc_mw(pd);
-	if (!IS_ERR(mw)) {
-		mw->device  = pd->device;
-		mw->pd      = pd;
-		mw->uobject = NULL;
-		atomic_add_acq_int(&pd->usecnt, 1);
-	}
-
-	return mw;
-}
-
-int ib_dealloc_mw(struct ib_mw *mw)
-{
-	struct ib_pd *pd;
-	int ret;
-
-	pd = mw->pd;
-	ret = mw->device->dealloc_mw(mw);
-	if (!ret)
-		atomic_subtract_acq_int(&pd->usecnt, 1);
-
-	return ret;
-}
-
-/* "Fast" memory regions */
-
-struct ib_fmr *ib_alloc_fmr(struct ib_pd *pd,
-			    int mr_access_flags,
-			    struct ib_fmr_attr *fmr_attr)
-{
-	struct ib_fmr *fmr;
-
-	if (!pd->device->alloc_fmr)
-		return ERR_PTR(ENOSYS);
-
-	fmr = pd->device->alloc_fmr(pd, mr_access_flags, fmr_attr);
-	if (!IS_ERR(fmr)) {
-		fmr->device = pd->device;
-		fmr->pd     = pd;
-		atomic_add_acq_int(&pd->usecnt, 1);
-	}
-
-	return fmr;
-}
-
-int ib_unmap_fmr(struct ib_fmr_list_head *fmr_list)
-{
-	struct ib_fmr *fmr;
-
-	if (TAILQ_EMPTY(fmr_list))
-		return 0;
-
-	fmr = TAILQ_FIRST(fmr_list);
-	return fmr->device->unmap_fmr(fmr_list);
-}
-
-int ib_dealloc_fmr(struct ib_fmr *fmr)
-{
-	struct ib_pd *pd;
-	int ret;
-
-	pd = fmr->pd;
-	ret = fmr->device->dealloc_fmr(fmr);
-	if (!ret)
-		atomic_subtract_acq_int(&pd->usecnt, 1);
-
-	return ret;
-}
-
-/* Multicast groups */
-
-int ib_attach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid)
-{
-	if (!qp->device->attach_mcast)
-		return (ENOSYS);
-	if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD)
-		return (EINVAL);
-
-	return qp->device->attach_mcast(qp, gid, lid);
-}
-
-int ib_detach_mcast(struct ib_qp *qp, union ib_gid *gid, u16 lid)
-{
-	if (!qp->device->detach_mcast)
-		return (ENOSYS);
-	if (gid->raw[0] != 0xff || qp->qp_type != IB_QPT_UD)
-		return (EINVAL);
-
-	return qp->device->detach_mcast(qp, gid, lid);
-}
diff --git a/sys/contrib/rdma/types.h b/sys/contrib/rdma/types.h
deleted file mode 100644
index a8c22eef656..00000000000
--- a/sys/contrib/rdma/types.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * $FreeBSD$
- */
-#ifndef	__RDMA_TYPES_H_
-#define	__RDMA_TYPES_H_
-#include <sys/types.h>
-#include <sys/malloc.h>
-
-
-typedef uint8_t 	u8;
-typedef uint16_t 	u16;
-typedef uint32_t 	u32;
-typedef uint64_t 	u64;
- 
-typedef uint8_t		__u8;
-typedef uint16_t	__u16;
-typedef uint32_t	__u32;
-typedef uint64_t	__u64;
-typedef uint8_t		__be8;
-typedef uint16_t	__be16;
-typedef uint32_t	__be32;
-typedef uint64_t	__be64;
-
-typedef	int32_t		__s32;
-
-
-#define LINUX_TYPES_DEFINED
-#define ERR_PTR(err) ((void *)((long)(err)))
-#define IS_ERR(ptr)  ((unsigned long)(ptr) > (unsigned long)(-1000))
-#define PTR_ERR(ptr)    ((long)(ptr))
-
-#ifndef PANIC_IF
-#define PANIC_IF(exp) do {                  \
-	if (exp)                            \
-		panic("BUG func %s line %u: %s", __FUNCTION__, __LINE__, #exp);      \
-} while (0)
-#endif
-
-#define container_of(p, stype, field) ((stype *)(((uint8_t *)(p)) - offsetof(stype, field)))
-
-static __inline int
-find_first_zero_bit(volatile void *p, int max)
-{
-        int b;
-        volatile int *ptr = (volatile int *)p;
-
-        for (b = 0; b < max; b += 32) {
-                if (ptr[b >> 5] != ~0) {
-                        for (;;) {
-                                if ((ptr[b >> 5] & (1 << (b & 0x1f))) == 0)
-                                        return (b);
-                                b++;
-                        }
-                }
-        }
-
-        return (max);
-}
-
-struct kvl {
-        struct kvl *next;
-        unsigned int key;
-        void *value;
-};
-
-#define DEFINE_KVL(x) struct kvl x;
-
-static __inline void *
-kvl_lookup(struct kvl *x, uint32_t key)
-{
-        struct kvl *i;
-        for (i=x->next;i;i=i->next) if (i->key==key) return(i->value);
-        return(0);
-}
-
-static __inline int
-kvl_alloc_above(struct kvl *idp, void *ptr, int starting_id, int *id)
-{
-	int newid = starting_id;
-	struct kvl *i;
-
-        for (i=idp->next;i;i=i->next) 
-		if (i->key == newid)
-			return -EEXIST;
-
-        i=malloc(sizeof(struct kvl),M_TEMP,M_NOWAIT);
-        i->key=newid;
-        i->value=ptr;
-        i->next=idp->next;
-        idp->next=i;
-	*id = newid;
-        return(0);
-}
-
-static __inline void
-kvl_delete(struct kvl *idp, int id) 
-{
-        /* leak */
-        struct kvl *i, *prev=NULL;
-        for (i=idp->next;i;prev=i,i=i->next) 
-                if ((i)->key==id) {
-			if (!prev)
-				idp->next = i->next;
-			else
-				prev->next = i->next;
-			free(i, M_TEMP);
-                        return;
-                }
-}
-
-static __inline void
-kvl_free(struct kvl *idp)
-{
-        struct kvl *i, *tmp;
-        for (i=idp->next;i;i=tmp) {
-		tmp=i->next;
-		free(i, M_TEMP);
-	}
-	idp->next = NULL;
-}
-
-
-#endif
diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h
index 0c9bf5f2162..5e4f128b7e7 100644
--- a/sys/crypto/aesni/aesencdec.h
+++ b/sys/crypto/aesni/aesencdec.h
@@ -30,11 +30,10 @@
 #include <wmmintrin.h>
 
 static inline void
-aesni_enc8(int rounds, const uint8_t *key_schedule, __m128i a,
+aesni_enc8(int rounds, const __m128i *keysched, __m128i a,
     __m128i b, __m128i c, __m128i d, __m128i e, __m128i f, __m128i g,
     __m128i h, __m128i out[8])
 {
-	const __m128i *keysched = (const __m128i *)key_schedule;
 	int i;
 
 	a ^= keysched[0];
@@ -68,11 +67,10 @@ aesni_enc8(int rounds, const uint8_t *key_schedule, __m128i a,
 }
 
 static inline void
-aesni_dec8(int rounds, const uint8_t *key_schedule, __m128i a,
+aesni_dec8(int rounds, const __m128i *keysched, __m128i a,
     __m128i b, __m128i c, __m128i d, __m128i e, __m128i f, __m128i g,
     __m128i h, __m128i out[8])
 {
-	const __m128i *keysched = (const __m128i *)key_schedule;
 	int i;
 
 	a ^= keysched[0];
@@ -106,10 +104,9 @@ aesni_dec8(int rounds, const uint8_t *key_schedule, __m128i a,
 }
 
 static inline __m128i
-aesni_enc(int rounds, const uint8_t *key_schedule, const __m128i from)
+aesni_enc(int rounds, const __m128i *keysched, const __m128i from)
 {
 	__m128i tmp;
-	const __m128i *keysched = (const __m128i *)key_schedule;
 	int i;
 
 	tmp = from ^ keysched[0];
@@ -121,10 +118,9 @@ aesni_enc(int rounds, const uint8_t *key_schedule, const __m128i from)
 }
 
 static inline __m128i
-aesni_dec(int rounds, const uint8_t *key_schedule, const __m128i from)
+aesni_dec(int rounds, const __m128i *keysched, const __m128i from)
 {
 	__m128i tmp;
-	const __m128i *keysched = (const __m128i *)key_schedule;
 	int i;
 
 	tmp = from ^ keysched[0];
diff --git a/sys/crypto/aesni/aesni.c b/sys/crypto/aesni/aesni.c
index 73eb28a16e3..723ccc0ea5a 100644
--- a/sys/crypto/aesni/aesni.c
+++ b/sys/crypto/aesni/aesni.c
@@ -92,7 +92,8 @@ aesni_attach(device_t dev)
 	sc = device_get_softc(dev);
 	TAILQ_INIT(&sc->sessions);
 	sc->sid = 1;
-	sc->cid = crypto_get_driverid(dev, CRYPTOCAP_F_HARDWARE);
+	sc->cid = crypto_get_driverid(dev, CRYPTOCAP_F_HARDWARE |
+	    CRYPTOCAP_F_SYNC);
 	if (sc->cid < 0) {
 		device_printf(dev, "Could not get crypto driver id.\n");
 		return (ENOMEM);
diff --git a/sys/crypto/aesni/aesni.h b/sys/crypto/aesni/aesni.h
index 17ca9c5bf7f..99edd42f150 100644
--- a/sys/crypto/aesni/aesni.h
+++ b/sys/crypto/aesni/aesni.h
@@ -71,29 +71,30 @@ struct aesni_session {
 /*
  * Internal functions, implemented in assembler.
  */
-void aesni_set_enckey(const uint8_t *userkey, uint8_t *encrypt_schedule,
-    int number_of_rounds);
-void aesni_set_deckey(const uint8_t *encrypt_schedule,
-    uint8_t *decrypt_schedule, int number_of_rounds);
+void aesni_set_enckey(const uint8_t *userkey,
+    uint8_t *encrypt_schedule /*__aligned(16)*/, int number_of_rounds);
+void aesni_set_deckey(const uint8_t *encrypt_schedule /*__aligned(16)*/,
+    uint8_t *decrypt_schedule /*__aligned(16)*/, int number_of_rounds);
 
 /*
  * Slightly more public interfaces.
  */
-void aesni_encrypt_cbc(int rounds, const void *key_schedule, size_t len,
-    const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN]);
-void aesni_decrypt_cbc(int rounds, const void *key_schedule, size_t len,
-    uint8_t *buf, const uint8_t iv[AES_BLOCK_LEN]);
-void aesni_encrypt_ecb(int rounds, const void *key_schedule, size_t len,
-    const uint8_t from[AES_BLOCK_LEN], uint8_t to[AES_BLOCK_LEN]);
-void aesni_decrypt_ecb(int rounds, const void *key_schedule, size_t len,
-    const uint8_t from[AES_BLOCK_LEN], uint8_t to[AES_BLOCK_LEN]);
+void aesni_encrypt_cbc(int rounds, const void *key_schedule /*__aligned(16)*/,
+    size_t len, const uint8_t *from, uint8_t *to,
+    const uint8_t iv[AES_BLOCK_LEN]);
+void aesni_decrypt_cbc(int rounds, const void *key_schedule /*__aligned(16)*/,
+    size_t len, uint8_t *buf, const uint8_t iv[AES_BLOCK_LEN]);
+void aesni_encrypt_ecb(int rounds, const void *key_schedule /*__aligned(16)*/,
+    size_t len, const uint8_t *from, uint8_t *to);
+void aesni_decrypt_ecb(int rounds, const void *key_schedule /*__aligned(16)*/,
+    size_t len, const uint8_t *from, uint8_t *to);
 
-void aesni_encrypt_xts(int rounds, const void *data_schedule,
-    const void *tweak_schedule, size_t len, const uint8_t *from, uint8_t *to,
-    const uint8_t iv[AES_BLOCK_LEN]);
-void aesni_decrypt_xts(int rounds, const void *data_schedule,
-    const void *tweak_schedule, size_t len, const uint8_t *from, uint8_t *to,
-    const uint8_t iv[AES_BLOCK_LEN]);
+void aesni_encrypt_xts(int rounds, const void *data_schedule /*__aligned(16)*/,
+    const void *tweak_schedule /*__aligned(16)*/, size_t len,
+    const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN]);
+void aesni_decrypt_xts(int rounds, const void *data_schedule /*__aligned(16)*/,
+    const void *tweak_schedule /*__aligned(16)*/, size_t len,
+    const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN]);
 
 int aesni_cipher_setup(struct aesni_session *ses,
     struct cryptoini *encini);
@@ -103,4 +104,4 @@ int aesni_cipher_process(struct aesni_session *ses,
 uint8_t *aesni_cipher_alloc(struct cryptodesc *enccrd, struct cryptop *crp,
     int *allocated);
 
-#endif
+#endif /* _AESNI_H_ */
diff --git a/sys/crypto/aesni/aesni_wrap.c b/sys/crypto/aesni/aesni_wrap.c
index 197baf7f077..4f5acf3e5f4 100644
--- a/sys/crypto/aesni/aesni_wrap.c
+++ b/sys/crypto/aesni/aesni_wrap.c
@@ -41,6 +41,10 @@ __FBSDID("$FreeBSD$");
 
 MALLOC_DECLARE(M_AESNI);
 
+struct blocks8 {
+	__m128i	blk[8];
+} __packed;
+
 void
 aesni_encrypt_cbc(int rounds, const void *key_schedule, size_t len,
     const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN])
@@ -65,20 +69,20 @@ aesni_decrypt_cbc(int rounds, const void *key_schedule, size_t len,
     uint8_t *buf, const uint8_t iv[AES_BLOCK_LEN])
 {
 	__m128i blocks[8];
-	__m128i *bufs;
+	struct blocks8 *blks;
 	__m128i ivreg, nextiv;
 	size_t i, j, cnt;
 
 	ivreg = _mm_loadu_si128((const __m128i *)iv);
 	cnt = len / AES_BLOCK_LEN / 8;
 	for (i = 0; i < cnt; i++) {
-		bufs = (__m128i *)buf;
-		aesni_dec8(rounds - 1, key_schedule, bufs[0], bufs[1],
-		    bufs[2], bufs[3], bufs[4], bufs[5], bufs[6],
-		    bufs[7], &blocks[0]);
+		blks = (struct blocks8 *)buf;
+		aesni_dec8(rounds - 1, key_schedule, blks->blk[0], blks->blk[1],
+		    blks->blk[2], blks->blk[3], blks->blk[4], blks->blk[5],
+		    blks->blk[6], blks->blk[7], &blocks[0]);
 		for (j = 0; j < 8; j++) {
-			nextiv = bufs[j];
-			bufs[j] = blocks[j] ^ ivreg;
+			nextiv = blks->blk[j];
+			blks->blk[j] = blocks[j] ^ ivreg;
 			ivreg = nextiv;
 		}
 		buf += AES_BLOCK_LEN * 8;
@@ -86,9 +90,9 @@ aesni_decrypt_cbc(int rounds, const void *key_schedule, size_t len,
 	i *= 8;
 	cnt = len / AES_BLOCK_LEN;
 	for (; i < cnt; i++) {
-		bufs = (__m128i *)buf;
-		nextiv = bufs[0];
-		bufs[0] = aesni_dec(rounds - 1, key_schedule, bufs[0]) ^ ivreg;
+		nextiv = _mm_loadu_si128((void *)buf);
+		_mm_storeu_si128((void *)buf,
+		    aesni_dec(rounds - 1, key_schedule, nextiv) ^ ivreg);
 		ivreg = nextiv;
 		buf += AES_BLOCK_LEN;
 	}
@@ -99,15 +103,26 @@ aesni_encrypt_ecb(int rounds, const void *key_schedule, size_t len,
     const uint8_t *from, uint8_t *to)
 {
 	__m128i tot;
-	const __m128i *blocks;
+	__m128i tout[8];
+	struct blocks8 *top;
+	const struct blocks8 *blks;
 	size_t i, cnt;
 
 	cnt = len / AES_BLOCK_LEN / 8;
 	for (i = 0; i < cnt; i++) {
-		blocks = (const __m128i *)from;
-		aesni_enc8(rounds - 1, key_schedule, blocks[0], blocks[1],
-		    blocks[2], blocks[3], blocks[4], blocks[5], blocks[6],
-		    blocks[7], (__m128i *)to);
+		blks = (const struct blocks8 *)from;
+		top = (struct blocks8 *)to;
+		aesni_enc8(rounds - 1, key_schedule, blks->blk[0], blks->blk[1],
+		    blks->blk[2], blks->blk[3], blks->blk[4], blks->blk[5],
+		    blks->blk[6], blks->blk[7], tout);
+		top->blk[0] = tout[0];
+		top->blk[1] = tout[1];
+		top->blk[2] = tout[2];
+		top->blk[3] = tout[3];
+		top->blk[4] = tout[4];
+		top->blk[5] = tout[5];
+		top->blk[6] = tout[6];
+		top->blk[7] = tout[7];
 		from += AES_BLOCK_LEN * 8;
 		to += AES_BLOCK_LEN * 8;
 	}
@@ -127,15 +142,26 @@ aesni_decrypt_ecb(int rounds, const void *key_schedule, size_t len,
     const uint8_t from[AES_BLOCK_LEN], uint8_t to[AES_BLOCK_LEN])
 {
 	__m128i tot;
-	const __m128i *blocks;
+	__m128i tout[8];
+	const struct blocks8 *blks;
+	struct blocks8 *top;
 	size_t i, cnt;
 
 	cnt = len / AES_BLOCK_LEN / 8;
 	for (i = 0; i < cnt; i++) {
-		blocks = (const __m128i *)from;
-		aesni_dec8(rounds - 1, key_schedule, blocks[0], blocks[1],
-		    blocks[2], blocks[3], blocks[4], blocks[5], blocks[6],
-		    blocks[7], (__m128i *)to);
+		blks = (const struct blocks8 *)from;
+		top = (struct blocks8 *)to;
+		aesni_dec8(rounds - 1, key_schedule, blks->blk[0], blks->blk[1],
+		    blks->blk[2], blks->blk[3], blks->blk[4], blks->blk[5],
+		    blks->blk[6], blks->blk[7], tout);
+		top->blk[0] = tout[0];
+		top->blk[1] = tout[1];
+		top->blk[2] = tout[2];
+		top->blk[3] = tout[3];
+		top->blk[4] = tout[4];
+		top->blk[5] = tout[5];
+		top->blk[6] = tout[6];
+		top->blk[7] = tout[7];
 		from += AES_BLOCK_LEN * 8;
 		to += AES_BLOCK_LEN * 8;
 	}
@@ -173,31 +199,33 @@ xts_crank_lfsr(__m128i inp)
 }
 
 static void
-aesni_crypt_xts_block(int rounds, const void *key_schedule, __m128i *tweak,
-    const __m128i *from, __m128i *to, int do_encrypt)
+aesni_crypt_xts_block(int rounds, const __m128i *key_schedule, __m128i *tweak,
+    const uint8_t *from, uint8_t *to, int do_encrypt)
 {
 	__m128i block;
 
-	block = *from ^ *tweak;
+	block = _mm_loadu_si128((const __m128i *)from) ^ *tweak;
 
 	if (do_encrypt)
 		block = aesni_enc(rounds - 1, key_schedule, block);
 	else
 		block = aesni_dec(rounds - 1, key_schedule, block);
 
-	*to = block ^ *tweak;
+	_mm_storeu_si128((__m128i *)to, block ^ *tweak);
 
 	*tweak = xts_crank_lfsr(*tweak);
 }
 
 static void
-aesni_crypt_xts_block8(int rounds, const void *key_schedule, __m128i *tweak,
-    const __m128i *from, __m128i *to, int do_encrypt)
+aesni_crypt_xts_block8(int rounds, const __m128i *key_schedule, __m128i *tweak,
+    const uint8_t *from, uint8_t *to, int do_encrypt)
 {
 	__m128i tmptweak;
 	__m128i a, b, c, d, e, f, g, h;
 	__m128i tweaks[8];
 	__m128i tmp[8];
+	__m128i *top;
+	const __m128i *fromp;
 
 	tmptweak = *tweak;
 
@@ -205,10 +233,12 @@ aesni_crypt_xts_block8(int rounds, const void *key_schedule, __m128i *tweak,
 	 * unroll the loop.  This lets gcc put values directly in the
 	 * register and saves memory accesses.
 	 */
+	fromp = (const __m128i *)from;
 #define PREPINP(v, pos) 					\
 		do {						\
 			tweaks[(pos)] = tmptweak;		\
-			(v) = from[(pos)] ^ tmptweak;		\
+			(v) = _mm_loadu_si128(&fromp[pos]) ^	\
+			    tmptweak;				\
 			tmptweak = xts_crank_lfsr(tmptweak);	\
 		} while (0)
 	PREPINP(a, 0);
@@ -228,20 +258,21 @@ aesni_crypt_xts_block8(int rounds, const void *key_schedule, __m128i *tweak,
 		aesni_dec8(rounds - 1, key_schedule, a, b, c, d, e, f, g, h,
 		    tmp);
 
-	to[0] = tmp[0] ^ tweaks[0];
-	to[1] = tmp[1] ^ tweaks[1];
-	to[2] = tmp[2] ^ tweaks[2];
-	to[3] = tmp[3] ^ tweaks[3];
-	to[4] = tmp[4] ^ tweaks[4];
-	to[5] = tmp[5] ^ tweaks[5];
-	to[6] = tmp[6] ^ tweaks[6];
-	to[7] = tmp[7] ^ tweaks[7];
+	top = (__m128i *)to;
+	_mm_storeu_si128(&top[0], tmp[0] ^ tweaks[0]);
+	_mm_storeu_si128(&top[1], tmp[1] ^ tweaks[1]);
+	_mm_storeu_si128(&top[2], tmp[2] ^ tweaks[2]);
+	_mm_storeu_si128(&top[3], tmp[3] ^ tweaks[3]);
+	_mm_storeu_si128(&top[4], tmp[4] ^ tweaks[4]);
+	_mm_storeu_si128(&top[5], tmp[5] ^ tweaks[5]);
+	_mm_storeu_si128(&top[6], tmp[6] ^ tweaks[6]);
+	_mm_storeu_si128(&top[7], tmp[7] ^ tweaks[7]);
 }
 
 static void
-aesni_crypt_xts(int rounds, const void *data_schedule,
-    const void *tweak_schedule, size_t len, const uint8_t *from, uint8_t *to,
-    const uint8_t iv[AES_BLOCK_LEN], int do_encrypt)
+aesni_crypt_xts(int rounds, const __m128i *data_schedule,
+    const __m128i *tweak_schedule, size_t len, const uint8_t *from,
+    uint8_t *to, const uint8_t iv[AES_BLOCK_LEN], int do_encrypt)
 {
 	__m128i tweakreg;
 	uint8_t tweak[AES_XTS_BLOCKSIZE] __aligned(16);
@@ -264,7 +295,7 @@ aesni_crypt_xts(int rounds, const void *data_schedule,
 	cnt = len / AES_XTS_BLOCKSIZE / 8;
 	for (i = 0; i < cnt; i++) {
 		aesni_crypt_xts_block8(rounds, data_schedule, &tweakreg,
-		    (const __m128i *)from, (__m128i *)to, do_encrypt);
+		    from, to, do_encrypt);
 		from += AES_XTS_BLOCKSIZE * 8;
 		to += AES_XTS_BLOCKSIZE * 8;
 	}
@@ -272,7 +303,7 @@ aesni_crypt_xts(int rounds, const void *data_schedule,
 	cnt = len / AES_XTS_BLOCKSIZE;
 	for (; i < cnt; i++) {
 		aesni_crypt_xts_block(rounds, data_schedule, &tweakreg,
-		    (const __m128i *)from, (__m128i *)to, do_encrypt);
+		    from, to, do_encrypt);
 		from += AES_XTS_BLOCKSIZE;
 		to += AES_XTS_BLOCKSIZE;
 	}
diff --git a/sys/dev/aac/aacvar.h b/sys/dev/aac/aacvar.h
index 0950a2f6a7f..bcedff59f1f 100644
--- a/sys/dev/aac/aacvar.h
+++ b/sys/dev/aac/aacvar.h
@@ -412,7 +412,7 @@ struct aac_softc
 #define AAC_FLAGS_RAW_IO	(1 << 12)	/* Raw I/O interface */
 #define AAC_FLAGS_ARRAY_64BIT	(1 << 13)	/* 64-bit array size */
 #define	AAC_FLAGS_LBA_64BIT	(1 << 14)	/* 64-bit LBA support */
-#define	AAC_FLAGS_NOMSI		(1 << 31)	/* Broken MSI */
+#define	AAC_FLAGS_NOMSI		(1U << 31)	/* Broken MSI */
 
 	u_int32_t		supported_options;
 	u_int32_t		scsi_method_id;
diff --git a/sys/dev/aacraid/aacraid.c b/sys/dev/aacraid/aacraid.c
index 22a36444da3..2da1718fc15 100644
--- a/sys/dev/aacraid/aacraid.c
+++ b/sys/dev/aacraid/aacraid.c
@@ -98,8 +98,11 @@ static int	aac_alloc(struct aac_softc *sc);
 static void	aac_common_map(void *arg, bus_dma_segment_t *segs, int nseg,
 			       int error);
 static int	aac_check_firmware(struct aac_softc *sc);
+static void	aac_define_int_mode(struct aac_softc *sc);
 static int	aac_init(struct aac_softc *sc);
+static int	aac_find_pci_capability(struct aac_softc *sc, int cap);
 static int	aac_setup_intr(struct aac_softc *sc);
+static int	aac_check_config(struct aac_softc *sc);
 
 /* PMC SRC interface */
 static int	aac_src_get_fwstatus(struct aac_softc *sc);
@@ -110,7 +113,7 @@ static void	aac_src_set_mailbox(struct aac_softc *sc, u_int32_t command,
 				    u_int32_t arg0, u_int32_t arg1,
 				    u_int32_t arg2, u_int32_t arg3);
 static int	aac_src_get_mailbox(struct aac_softc *sc, int mb);
-static void	aac_src_set_interrupts(struct aac_softc *sc, int enable);
+static void	aac_src_access_devreg(struct aac_softc *sc, int mode);
 static int aac_src_send_command(struct aac_softc *sc, struct aac_command *cm);
 static int aac_src_get_outb_queue(struct aac_softc *sc);
 static void aac_src_set_outb_queue(struct aac_softc *sc, int index);
@@ -122,7 +125,7 @@ struct aac_interface aacraid_src_interface = {
 	aac_src_clear_istatus,
 	aac_src_set_mailbox,
 	aac_src_get_mailbox,
-	aac_src_set_interrupts,
+	aac_src_access_devreg,
 	aac_src_send_command,
 	aac_src_get_outb_queue,
 	aac_src_set_outb_queue
@@ -141,7 +144,7 @@ struct aac_interface aacraid_srcv_interface = {
 	aac_src_clear_istatus,
 	aac_srcv_set_mailbox,
 	aac_srcv_get_mailbox,
-	aac_src_set_interrupts,
+	aac_src_access_devreg,
 	aac_src_send_command,
 	aac_src_get_outb_queue,
 	aac_src_set_outb_queue
@@ -258,6 +261,7 @@ aacraid_attach(struct aac_softc *sc)
 	/*
 	 * Check that the firmware on the card is supported.
 	 */
+	sc->msi_enabled = FALSE;
 	if ((error = aac_check_firmware(sc)) != 0)
 		return(error);
 
@@ -278,6 +282,7 @@ aacraid_attach(struct aac_softc *sc)
 	if ((error = aac_alloc(sc)) != 0)
 		return(error);
 	if (!(sc->flags & AAC_FLAGS_SYNC_MODE)) {
+		aac_define_int_mode(sc);
 		if ((error = aac_init(sc)) != 0)
 			return(error);
 	}
@@ -341,7 +346,7 @@ aacraid_attach(struct aac_softc *sc)
 	sc->aac_state &= ~AAC_STATE_SUSPEND;
 
 	/* enable interrupts now */
-	AAC_UNMASK_INTERRUPTS(sc);
+	AAC_ACCESS_DEVREG(sc, AAC_ENABLE_INTERRUPT);
 
 #if __FreeBSD_version >= 800000
 	mtx_lock(&sc->aac_io_lock);
@@ -442,6 +447,7 @@ aac_get_container_info(struct aac_softc *sc, struct aac_fib *sync_fib, int cid,
 	struct aac_fib *fib;
 	struct aac_mntinfo *mi;
 	struct aac_cnt_config *ccfg;
+	int rval;
 
 	if (sync_fib == NULL) {
 		if (aacraid_alloc_command(sc, &cm)) {
@@ -499,9 +505,10 @@ aac_get_container_info(struct aac_softc *sc, struct aac_fib *sync_fib, int cid,
 	*uid = cid;
 	if (mir->MntTable[0].VolType != CT_NONE && 
 		!(mir->MntTable[0].ContentState & AAC_FSCS_HIDDEN)) {
-		if (!(sc->aac_support_opt2 & AAC_SUPPORTED_VARIABLE_BLOCK_SIZE))
-			mir->MntTable[0].ObjExtension.BlockSize = 0x200;
-
+		if (!(sc->aac_support_opt2 & AAC_SUPPORTED_VARIABLE_BLOCK_SIZE)) {
+			mir->MntTable[0].ObjExtension.BlockDevice.BlockSize = 0x200;
+			mir->MntTable[0].ObjExtension.BlockDevice.bdLgclPhysMap = 0;
+		}
 		ccfg = (struct aac_cnt_config *)&fib->data[0];
 		bzero(ccfg, sizeof (*ccfg) - CT_PACKET_SIZE);
 		ccfg->Command = VM_ContainerConfig;
@@ -509,9 +516,10 @@ aac_get_container_info(struct aac_softc *sc, struct aac_fib *sync_fib, int cid,
 		ccfg->CTCommand.param[0] = cid;
 
 		if (sync_fib) {
-			if (aac_sync_fib(sc, ContainerCommand, 0, fib,
-				sizeof(struct aac_cnt_config) == 0) &&
-				ccfg->CTCommand.param[0] == ST_OK &&
+			rval = aac_sync_fib(sc, ContainerCommand, 0, fib,
+				sizeof(struct aac_cnt_config));
+			if (rval == 0 && ccfg->Command == ST_OK &&
+				ccfg->CTCommand.param[0] == CT_OK &&
 				mir->MntTable[0].VolType != CT_PASSTHRU)
 				*uid = ccfg->CTCommand.param[1];
 		} else {
@@ -527,8 +535,9 @@ aac_get_container_info(struct aac_softc *sc, struct aac_fib *sync_fib, int cid,
 				AAC_FIBSTATE_ASYNC	 |
 				AAC_FIBSTATE_FAST_RESPONSE;
 			fib->Header.Command = ContainerCommand;
-			if (aacraid_wait_command(cm) == 0 &&
-				ccfg->CTCommand.param[0] == ST_OK &&
+			rval = aacraid_wait_command(cm);
+			if (rval == 0 && ccfg->Command == ST_OK &&
+				ccfg->CTCommand.param[0] == CT_OK &&
 				mir->MntTable[0].VolType != CT_PASSTHRU)
 				*uid = ccfg->CTCommand.param[1];
 			aacraid_release_command(cm);
@@ -681,6 +690,8 @@ aac_alloc(struct aac_softc *sc)
 void
 aacraid_free(struct aac_softc *sc)
 {
+	int i;
+
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
 	/* remove the control device */
@@ -704,11 +715,18 @@ aacraid_free(struct aac_softc *sc)
 		bus_dma_tag_destroy(sc->aac_common_dmat);
 
 	/* disconnect the interrupt handler */
-	if (sc->aac_intr)
-		bus_teardown_intr(sc->aac_dev, sc->aac_irq, sc->aac_intr);
-	if (sc->aac_irq != NULL)
-		bus_release_resource(sc->aac_dev, SYS_RES_IRQ, sc->aac_irq_rid,
-				     sc->aac_irq);
+	for (i = 0; i < AAC_MAX_MSIX; ++i) {	
+		if (sc->aac_intr[i])
+			bus_teardown_intr(sc->aac_dev, 
+				sc->aac_irq[i], sc->aac_intr[i]);
+		if (sc->aac_irq[i])
+			bus_release_resource(sc->aac_dev, SYS_RES_IRQ, 
+				sc->aac_irq_rid[i], sc->aac_irq[i]);
+		else
+			break;
+	}
+	if (sc->msi_enabled)
+		pci_release_msi(sc->aac_dev);
 
 	/* destroy data-transfer DMA tag */
 	if (sc->aac_buffer_dmat)
@@ -815,14 +833,14 @@ aacraid_shutdown(device_t dev)
 
 	bzero(cc, sizeof(struct aac_close_command));
 	cc->Command = VM_CloseAll;
-	cc->ContainerId = 0xffffffff;
+	cc->ContainerId = 0xfffffffe;
 	if (aac_sync_fib(sc, ContainerCommand, 0, fib,
 	    sizeof(struct aac_close_command)))
 		printf("FAILED.\n");
 	else
 		printf("done\n");
 
-	AAC_MASK_INTERRUPTS(sc);
+	AAC_ACCESS_DEVREG(sc, AAC_DISABLE_INTERRUPT);
 	aac_release_sync_fib(sc);
 	mtx_unlock(&sc->aac_io_lock);
 
@@ -842,7 +860,7 @@ aacraid_suspend(device_t dev)
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 	sc->aac_state |= AAC_STATE_SUSPEND;
 
-	AAC_MASK_INTERRUPTS(sc);
+	AAC_ACCESS_DEVREG(sc, AAC_DISABLE_INTERRUPT);
 	return(0);
 }
 
@@ -858,7 +876,7 @@ aacraid_resume(device_t dev)
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 	sc->aac_state &= ~AAC_STATE_SUSPEND;
-	AAC_UNMASK_INTERRUPTS(sc);
+	AAC_ACCESS_DEVREG(sc, AAC_ENABLE_INTERRUPT);
 	return(0);
 }
 
@@ -868,23 +886,75 @@ aacraid_resume(device_t dev)
 void
 aacraid_new_intr_type1(void *arg)
 {
+	struct aac_msix_ctx *ctx;
 	struct aac_softc *sc;
+	int vector_no;
 	struct aac_command *cm;
 	struct aac_fib *fib;
 	u_int32_t bellbits, bellbits_shifted, index, handle;
-	int isFastResponse, isAif, noMoreAif;
+	int isFastResponse, isAif, noMoreAif, mode;
 
-	sc = (struct aac_softc *)arg;
+	ctx = (struct aac_msix_ctx *)arg;
+	sc = ctx->sc;
+	vector_no = ctx->vector_no;
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 	mtx_lock(&sc->aac_io_lock);
-	bellbits = AAC_MEM0_GETREG4(sc, AAC_SRC_ODBR_R);
-	if (bellbits & AAC_DB_RESPONSE_SENT_NS) {
-		bellbits = AAC_DB_RESPONSE_SENT_NS;
-		AAC_MEM0_SETREG4(sc, AAC_SRC_ODBR_C, bellbits);
-		AAC_MEM0_GETREG4(sc, AAC_SRC_ODBR_R);	/* ODR readback,Prep #238630 */
+
+	if (sc->msi_enabled) {
+		mode = AAC_INT_MODE_MSI;
+		if (vector_no == 0) {
+			bellbits = AAC_MEM0_GETREG4(sc, AAC_SRC_ODBR_MSI);
+			if (bellbits & 0x40000)
+				mode |= AAC_INT_MODE_AIF;
+			else if (bellbits & 0x1000)
+				mode |= AAC_INT_MODE_SYNC;
+		}
+	} else {	
+		mode = AAC_INT_MODE_INTX;
+		bellbits = AAC_MEM0_GETREG4(sc, AAC_SRC_ODBR_R);
+		if (bellbits & AAC_DB_RESPONSE_SENT_NS) {
+			bellbits = AAC_DB_RESPONSE_SENT_NS;
+			AAC_MEM0_SETREG4(sc, AAC_SRC_ODBR_C, bellbits);
+		} else {
+			bellbits_shifted = (bellbits >> AAC_SRC_ODR_SHIFT);
+			AAC_MEM0_SETREG4(sc, AAC_SRC_ODBR_C, bellbits);
+			if (bellbits_shifted & AAC_DB_AIF_PENDING)
+				mode |= AAC_INT_MODE_AIF;
+			else if (bellbits_shifted & AAC_DB_SYNC_COMMAND) 
+				mode |= AAC_INT_MODE_SYNC;
+		}
+		/* ODR readback, Prep #238630 */
+		AAC_MEM0_GETREG4(sc, AAC_SRC_ODBR_R);	
+	}
+
+	if (mode & AAC_INT_MODE_SYNC) {
+		if (sc->aac_sync_cm) {	
+			cm = sc->aac_sync_cm;
+			cm->cm_flags |= AAC_CMD_COMPLETED;
+			/* is there a completion handler? */
+			if (cm->cm_complete != NULL) {
+				cm->cm_complete(cm);
+			} else {
+				/* assume that someone is sleeping on this command */
+				wakeup(cm);
+			}
+			sc->flags &= ~AAC_QUEUE_FRZN;
+			sc->aac_sync_cm = NULL;
+		}
+		mode = 0;
+	}
+
+	if (mode & AAC_INT_MODE_AIF) {
+		if (mode & AAC_INT_MODE_INTX) {
+			aac_request_aif(sc);
+			mode = 0;
+		} 
+	}
+
+	if (mode) {
 		/* handle async. status */
-		index = sc->aac_host_rrq_idx;
+		index = sc->aac_host_rrq_idx[vector_no];
 		for (;;) {
 			isFastResponse = isAif = noMoreAif = 0;
 			/* remove toggle bit (31) */
@@ -901,6 +971,7 @@ aacraid_new_intr_type1(void *arg)
 
 			cm = sc->aac_commands + (handle - 1);
 			fib = cm->cm_fib;
+			sc->aac_rrq_outstanding[vector_no]--;
 			if (isAif) {
 				noMoreAif = (fib->Header.XferState & AAC_FIBSTATE_NOMOREAIF) ? 1:0;
 				if (!noMoreAif)
@@ -928,34 +999,19 @@ aacraid_new_intr_type1(void *arg)
 			}
 
 			sc->aac_common->ac_host_rrq[index++] = 0;
-			if (index == sc->aac_max_fibs) 
-				index = 0;
-			sc->aac_host_rrq_idx = index;
+			if (index == (vector_no + 1) * sc->aac_vector_cap) 
+				index = vector_no * sc->aac_vector_cap;
+			sc->aac_host_rrq_idx[vector_no] = index;
 
 			if ((isAif && !noMoreAif) || sc->aif_pending) 
 				aac_request_aif(sc);
 		}
-	} else {
-		bellbits_shifted = (bellbits >> AAC_SRC_ODR_SHIFT);
-		AAC_MEM0_SETREG4(sc, AAC_SRC_ODBR_C, bellbits);
-		if (bellbits_shifted & AAC_DB_AIF_PENDING) {
-			/* handle AIF */
-			aac_request_aif(sc);
-		} else if (bellbits_shifted & AAC_DB_SYNC_COMMAND) {
-			if (sc->aac_sync_cm) {	
-				cm = sc->aac_sync_cm;
-				cm->cm_flags |= AAC_CMD_COMPLETED;
-				/* is there a completion handler? */
-				if (cm->cm_complete != NULL) {
-					cm->cm_complete(cm);
-				} else {
-					/* assume that someone is sleeping on this command */
-					wakeup(cm);
-				}
-				sc->flags &= ~AAC_QUEUE_FRZN;
-				sc->aac_sync_cm = NULL;
-			}
-		}
+	}
+
+	if (mode & AAC_INT_MODE_AIF) {
+		aac_request_aif(sc);
+		AAC_ACCESS_DEVREG(sc, AAC_CLEAR_AIF_BIT);
+		mode = 0;
 	}
 
 	/* see if we can start some more I/O */
@@ -1479,32 +1535,47 @@ static int
 aac_check_firmware(struct aac_softc *sc)
 {
 	u_int32_t code, major, minor, maxsize;
-	u_int32_t options = 0, atu_size = 0, status;
+	u_int32_t options = 0, atu_size = 0, status, waitCount;
 	time_t then;
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+
+	/* check if flash update is running */
+	if (AAC_GET_FWSTATUS(sc) & AAC_FLASH_UPD_PENDING) {
+		then = time_uptime;
+		do {
+			code = AAC_GET_FWSTATUS(sc);
+			if (time_uptime > (then + AAC_FWUPD_TIMEOUT)) {
+				device_printf(sc->aac_dev,
+						  "FATAL: controller not coming ready, "
+						   "status %x\n", code);
+				return(ENXIO);
+			}
+		} while (!(code & AAC_FLASH_UPD_SUCCESS) && !(code & AAC_FLASH_UPD_FAILED));
+		/* 
+		 * Delay 10 seconds. Because right now FW is doing a soft reset,
+		 * do not read scratch pad register at this time
+		 */
+		waitCount = 10 * 10000;
+		while (waitCount) {
+			DELAY(100);		/* delay 100 microseconds */
+			waitCount--;
+		}
+	}
+
 	/*
 	 * Wait for the adapter to come ready.
 	 */
 	then = time_uptime;
 	do {
 		code = AAC_GET_FWSTATUS(sc);
-		if (code & AAC_SELF_TEST_FAILED) {
-			device_printf(sc->aac_dev, "FATAL: selftest failed\n");
-			return(ENXIO);
-		}
-		if (code & AAC_KERNEL_PANIC) {
-			device_printf(sc->aac_dev,
-				      "FATAL: controller kernel panic");
-			return(ENXIO);
-		}
 		if (time_uptime > (then + AAC_BOOT_TIMEOUT)) {
 			device_printf(sc->aac_dev,
 				      "FATAL: controller not coming ready, "
 					   "status %x\n", code);
 			return(ENXIO);
 		}
-	} while (!(code & AAC_UP_AND_RUNNING));
+	} while (!(code & AAC_UP_AND_RUNNING) || code == 0xffffffff);
 
 	/*
 	 * Retrieve the firmware version numbers.  Dell PERC2/QC cards with
@@ -1629,9 +1700,13 @@ aac_check_firmware(struct aac_softc *sc)
 		options = AAC_GET_MAILBOX(sc, 2);
 		sc->aac_sg_tablesize = (options >> 16);
 		options = AAC_GET_MAILBOX(sc, 3);
-		sc->aac_max_fibs = (options & 0xFFFF);
+		sc->aac_max_fibs = ((options >> 16) & 0xFFFF);
+		if (sc->aac_max_fibs == 0 || sc->aac_hwif != AAC_HWIF_SRCV)
+			sc->aac_max_fibs = (options & 0xFFFF);
 		options = AAC_GET_MAILBOX(sc, 4);
 		sc->aac_max_aif = (options & 0xFFFF);
+		options = AAC_GET_MAILBOX(sc, 5);
+		sc->aac_max_msix =(sc->flags & AAC_FLAGS_NEW_COMM_TYPE2) ? options : 0;
 	}
 
 	maxsize = sc->aac_max_fib_size + 31;
@@ -1661,12 +1736,14 @@ static int
 aac_init(struct aac_softc *sc)
 {
 	struct aac_adapter_init	*ip;
-	int error;
+	int i, error;
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
 	/* reset rrq index */
-	sc->aac_host_rrq_idx = 0;
+	sc->aac_fibs_pushed_no = 0;
+	for (i = 0; i < sc->aac_max_msix; i++)
+		sc->aac_host_rrq_idx[i] = i * sc->aac_vector_cap;
 
 	/*
 	 * Fill in the init structure.  This tells the adapter about the
@@ -1678,7 +1755,7 @@ aac_init(struct aac_softc *sc)
 		ip->InitStructRevision = AAC_INIT_STRUCT_REVISION_4;
 		sc->flags |= AAC_FLAGS_RAW_IO;
 	}
-	ip->MiniPortRevision = AAC_INIT_STRUCT_MINIPORT_REVISION;
+	ip->NoOfMSIXVectors = sc->aac_max_msix;
 
 	ip->AdapterFibsPhysicalAddress = sc->aac_common_busaddr +
 					 offsetof(struct aac_common, ac_fibs);
@@ -1708,7 +1785,6 @@ aac_init(struct aac_softc *sc)
 		ip->InitStructRevision = AAC_INIT_STRUCT_REVISION_6;
 		ip->InitFlags |= (AAC_INITFLAGS_NEW_COMM_TYPE1_SUPPORTED |
 			AAC_INITFLAGS_FAST_JBOD_SUPPORTED);
-		ip->MiniPortRevision = 0L;
 		device_printf(sc->aac_dev, "New comm. interface type1 enabled\n");
 	} else if (sc->flags & AAC_FLAGS_NEW_COMM_TYPE2) {
 		ip->InitStructRevision = AAC_INIT_STRUCT_REVISION_7;
@@ -1750,31 +1826,209 @@ aac_init(struct aac_softc *sc)
 		goto out;
 	}
 
+	/*
+	 * Check configuration issues 
+	 */
+	if ((error = aac_check_config(sc)) != 0)
+		goto out;
+
 	error = 0;
 out:
 	return(error);
 }
 
+static void
+aac_define_int_mode(struct aac_softc *sc)
+{
+	device_t dev;
+	int cap, msi_count, error = 0;
+	uint32_t val;
+	
+	dev = sc->aac_dev;
+
+	/* max. vectors from AAC_MONKER_GETCOMMPREF */
+	if (sc->aac_max_msix == 0) {
+		sc->aac_max_msix = 1;
+		sc->aac_vector_cap = sc->aac_max_fibs;
+		return;
+	}
+
+	/* OS capability */
+	msi_count = pci_msix_count(dev);
+	if (msi_count > AAC_MAX_MSIX)
+		msi_count = AAC_MAX_MSIX;
+	if (msi_count > sc->aac_max_msix)
+		msi_count = sc->aac_max_msix;
+	if (msi_count == 0 || (error = pci_alloc_msix(dev, &msi_count)) != 0) {
+		device_printf(dev, "alloc msix failed - msi_count=%d, err=%d; "
+				   "will try MSI\n", msi_count, error);
+		pci_release_msi(dev);
+	} else {
+		sc->msi_enabled = TRUE;
+		device_printf(dev, "using MSI-X interrupts (%u vectors)\n",
+			msi_count);
+	}
+
+	if (!sc->msi_enabled) {
+		msi_count = 1;
+		if ((error = pci_alloc_msi(dev, &msi_count)) != 0) {
+			device_printf(dev, "alloc msi failed - err=%d; "
+				           "will use INTx\n", error);
+			pci_release_msi(dev);
+		} else {
+			sc->msi_enabled = TRUE;
+			device_printf(dev, "using MSI interrupts\n");
+		}
+	}
+
+	if (sc->msi_enabled) {
+		/* now read controller capability from PCI config. space */
+		cap = aac_find_pci_capability(sc, PCIY_MSIX);	
+		val = (cap != 0 ? pci_read_config(dev, cap + 2, 2) : 0);	
+		if (!(val & AAC_PCI_MSI_ENABLE)) {
+			pci_release_msi(dev);
+			sc->msi_enabled = FALSE;
+		}
+	}
+
+	if (!sc->msi_enabled) {
+		device_printf(dev, "using legacy interrupts\n");
+		sc->aac_max_msix = 1;
+	} else {
+		AAC_ACCESS_DEVREG(sc, AAC_ENABLE_MSIX);
+		if (sc->aac_max_msix > msi_count)
+			sc->aac_max_msix = msi_count;
+	}
+	sc->aac_vector_cap = sc->aac_max_fibs / sc->aac_max_msix;
+
+	fwprintf(sc, HBA_FLAGS_DBG_DEBUG_B, "msi_enabled %d vector_cap %d max_fibs %d max_msix %d",
+		sc->msi_enabled,sc->aac_vector_cap, sc->aac_max_fibs, sc->aac_max_msix);
+}
+
+static int
+aac_find_pci_capability(struct aac_softc *sc, int cap)
+{
+	device_t dev;
+	uint32_t status;
+	uint8_t ptr;
+
+	dev = sc->aac_dev;
+
+	status = pci_read_config(dev, PCIR_STATUS, 2);
+	if (!(status & PCIM_STATUS_CAPPRESENT))
+		return (0);
+
+	status = pci_read_config(dev, PCIR_HDRTYPE, 1);
+	switch (status & PCIM_HDRTYPE) {
+	case 0:
+	case 1:
+		ptr = PCIR_CAP_PTR;
+		break;
+	case 2:
+		ptr = PCIR_CAP_PTR_2;
+		break;
+	default:
+		return (0);
+		break;
+	}
+	ptr = pci_read_config(dev, ptr, 1);
+
+	while (ptr != 0) {
+		int next, val;
+		next = pci_read_config(dev, ptr + PCICAP_NEXTPTR, 1);
+		val = pci_read_config(dev, ptr + PCICAP_ID, 1);
+		if (val == cap)
+			return (ptr);
+		ptr = next;
+	}
+
+	return (0);
+}
+
 static int
 aac_setup_intr(struct aac_softc *sc)
 {
-	sc->aac_irq_rid = 0;
-	if ((sc->aac_irq = bus_alloc_resource_any(sc->aac_dev, SYS_RES_IRQ,
-			   			  &sc->aac_irq_rid,
-			   			  RF_SHAREABLE |
-						  RF_ACTIVE)) == NULL) {
-		device_printf(sc->aac_dev, "can't allocate interrupt\n");
-		return (EINVAL);
-	}
-	if (aac_bus_setup_intr(sc->aac_dev, sc->aac_irq,
-			   INTR_MPSAFE|INTR_TYPE_BIO, NULL, 
-			   aacraid_new_intr_type1, sc, &sc->aac_intr)) {
-		device_printf(sc->aac_dev, "can't set up interrupt\n");
-		return (EINVAL);
+	int i, msi_count, rid;
+	struct resource *res;
+	void *tag;
+
+	msi_count = sc->aac_max_msix;
+	rid = (sc->msi_enabled ? 1:0);
+
+	for (i = 0; i < msi_count; i++, rid++) {
+		if ((res = bus_alloc_resource_any(sc->aac_dev,SYS_RES_IRQ, &rid,
+			RF_SHAREABLE | RF_ACTIVE)) == NULL) {
+			device_printf(sc->aac_dev,"can't allocate interrupt\n");
+			return (EINVAL);
+		}
+		sc->aac_irq_rid[i] = rid;
+		sc->aac_irq[i] = res;
+		if (aac_bus_setup_intr(sc->aac_dev, res, 
+			INTR_MPSAFE | INTR_TYPE_BIO, NULL, 
+			aacraid_new_intr_type1, &sc->aac_msix[i], &tag)) {
+			device_printf(sc->aac_dev, "can't set up interrupt\n");
+			return (EINVAL);
+		}
+		sc->aac_msix[i].vector_no = i;
+		sc->aac_msix[i].sc = sc;
+		sc->aac_intr[i] = tag;
 	}
+
 	return (0);
 }
 
+static int
+aac_check_config(struct aac_softc *sc)
+{
+	struct aac_fib *fib;
+	struct aac_cnt_config *ccfg;
+	struct aac_cf_status_hdr *cf_shdr;
+	int rval;
+
+	mtx_lock(&sc->aac_io_lock);
+	aac_alloc_sync_fib(sc, &fib);
+
+	ccfg = (struct aac_cnt_config *)&fib->data[0];
+	bzero(ccfg, sizeof (*ccfg) - CT_PACKET_SIZE);
+	ccfg->Command = VM_ContainerConfig;
+	ccfg->CTCommand.command = CT_GET_CONFIG_STATUS;
+	ccfg->CTCommand.param[CNT_SIZE] = sizeof(struct aac_cf_status_hdr);
+
+	rval = aac_sync_fib(sc, ContainerCommand, 0, fib,
+		sizeof (struct aac_cnt_config));
+	cf_shdr = (struct aac_cf_status_hdr *)ccfg->CTCommand.data;
+	if (rval == 0 && ccfg->Command == ST_OK &&
+		ccfg->CTCommand.param[0] == CT_OK) {
+		if (cf_shdr->action <= CFACT_PAUSE) {
+			bzero(ccfg, sizeof (*ccfg) - CT_PACKET_SIZE);
+			ccfg->Command = VM_ContainerConfig;
+			ccfg->CTCommand.command = CT_COMMIT_CONFIG;
+
+			rval = aac_sync_fib(sc, ContainerCommand, 0, fib,
+				sizeof (struct aac_cnt_config));
+			if (rval == 0 && ccfg->Command == ST_OK &&
+				ccfg->CTCommand.param[0] == CT_OK) {
+				/* successful completion */
+				rval = 0;
+			} else {
+				/* auto commit aborted due to error(s) */
+				rval = -2;
+			}
+		} else {
+			/* auto commit aborted due to adapter indicating
+			   config. issues too dangerous to auto commit  */
+			rval = -3;
+		}
+	} else {
+		/* error */
+		rval = -1;
+	}
+
+	aac_release_sync_fib(sc);
+	mtx_unlock(&sc->aac_io_lock);
+	return(rval);
+}
+
 /*
  * Send a synchronous command to the controller and wait for a result.
  * Indicate if the controller completed the command with an error status.
@@ -1793,7 +2047,8 @@ aacraid_sync_command(struct aac_softc *sc, u_int32_t command,
 	AAC_SET_MAILBOX(sc, command, arg0, arg1, arg2, arg3);
 
 	/* ensure the sync command doorbell flag is cleared */
-	AAC_CLEAR_ISTATUS(sc, AAC_DB_SYNC_COMMAND);
+	if (!sc->msi_enabled)
+		AAC_CLEAR_ISTATUS(sc, AAC_DB_SYNC_COMMAND);
 
 	/* then set it to signal the adapter */
 	AAC_QNOTIFY(sc, AAC_DB_SYNC_COMMAND);
@@ -1802,7 +2057,7 @@ aacraid_sync_command(struct aac_softc *sc, u_int32_t command,
 		/* spin waiting for the command to complete */
 		then = time_uptime;
 		do {
-			if (time_uptime > (then + AAC_IMMEDIATE_TIMEOUT)) {
+			if (time_uptime > (then + AAC_SYNC_TIMEOUT)) {
 				fwprintf(sc, HBA_FLAGS_DBG_ERROR_B, "timed out");
 				return(EIO);
 			}
@@ -1849,14 +2104,13 @@ aac_sync_fib(struct aac_softc *sc, u_int32_t command, u_int32_t xferstate,
 	fib->Header.SenderSize = sizeof(struct aac_fib);
 	fib->Header.SenderFibAddress = 0;	/* Not needed */
 	fib->Header.u.ReceiverFibAddress = sc->aac_common_busaddr +
-					 offsetof(struct aac_common,
-						  ac_sync_fib);
+		offsetof(struct aac_common, ac_sync_fib);
 
 	/*
 	 * Give the FIB to the controller, wait for a response.
 	 */
 	if (aacraid_sync_command(sc, AAC_MONKER_SYNCFIB,
-			     fib->Header.u.ReceiverFibAddress, 0, 0, 0, NULL, NULL)) {
+		fib->Header.u.ReceiverFibAddress, 0, 0, 0, NULL, NULL)) {
 		fwprintf(sc, HBA_FLAGS_DBG_ERROR_B, "IO error");
 		return(EIO);
 	}
@@ -1873,7 +2127,7 @@ aac_timeout(struct aac_softc *sc)
 {
 	struct aac_command *cm;
 	time_t deadline;
-	int timedout, code;
+	int timedout;
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 	/*
@@ -1883,9 +2137,7 @@ aac_timeout(struct aac_softc *sc)
 	timedout = 0;
 	deadline = time_uptime - AAC_CMD_TIMEOUT;
 	TAILQ_FOREACH(cm, &sc->aac_busy, cm_link) {
-		if ((cm->cm_timestamp  < deadline)
-			/* && !(cm->cm_flags & AAC_CMD_TIMEDOUT) */) {
-			cm->cm_flags |= AAC_CMD_TIMEDOUT;
+		if (cm->cm_timestamp < deadline) {
 			device_printf(sc->aac_dev,
 				      "COMMAND %p TIMEOUT AFTER %d SECONDS\n",
 				      cm, (int)(time_uptime-cm->cm_timestamp));
@@ -1894,14 +2146,8 @@ aac_timeout(struct aac_softc *sc)
 		}
 	}
 
-	if (timedout) {
-		code = AAC_GET_FWSTATUS(sc);
-		if (code != AAC_UP_AND_RUNNING) {
-			device_printf(sc->aac_dev, "WARNING! Controller is no "
-				      "longer running! code= 0x%x\n", code);
-			aac_reset_adapter(sc);
-		}
-	}
+	if (timedout) 
+		aac_reset_adapter(sc);
 	aacraid_print_queues(sc);
 }
 
@@ -1937,9 +2183,20 @@ aac_src_qnotify(struct aac_softc *sc, int qbit)
 static int
 aac_src_get_istatus(struct aac_softc *sc)
 {
+	int val;
+
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_MEM0_GETREG4(sc, AAC_SRC_ODBR_R) >> AAC_SRC_ODR_SHIFT);
+	if (sc->msi_enabled) {
+		val = AAC_MEM0_GETREG4(sc, AAC_SRC_ODBR_MSI);
+		if (val & AAC_MSI_SYNC_STATUS)
+			val = AAC_DB_SYNC_COMMAND;
+		else
+			val = 0;
+	} else {
+		val = AAC_MEM0_GETREG4(sc, AAC_SRC_ODBR_R) >> AAC_SRC_ODR_SHIFT;
+	}
+	return(val);
 }
 
 /*
@@ -1950,7 +2207,12 @@ aac_src_clear_istatus(struct aac_softc *sc, int mask)
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_MEM0_SETREG4(sc, AAC_SRC_ODBR_C, mask << AAC_SRC_ODR_SHIFT);
+	if (sc->msi_enabled) {
+		if (mask == AAC_DB_SYNC_COMMAND)
+			AAC_ACCESS_DEVREG(sc, AAC_CLEAR_SYNC_BIT);
+	} else {
+		AAC_MEM0_SETREG4(sc, AAC_SRC_ODBR_C, mask << AAC_SRC_ODR_SHIFT);
+	}
 }
 
 /*
@@ -2005,14 +2267,77 @@ aac_srcv_get_mailbox(struct aac_softc *sc, int mb)
  * Set/clear interrupt masks
  */
 static void
-aac_src_set_interrupts(struct aac_softc *sc, int enable)
+aac_src_access_devreg(struct aac_softc *sc, int mode)
 {
-	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "%sable interrupts", enable ? "en" : "dis");
+	u_int32_t val;
 
-	if (enable) {
-		AAC_MEM0_SETREG4(sc, AAC_SRC_OIMR, ~AAC_DB_INT_NEW_COMM_TYPE1);
-	} else {
-		AAC_MEM0_SETREG4(sc, AAC_SRC_OIMR, ~0);
+	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+
+	switch (mode) {
+	case AAC_ENABLE_INTERRUPT:
+		AAC_MEM0_SETREG4(sc, AAC_SRC_OIMR, 
+			(sc->msi_enabled ? AAC_INT_ENABLE_TYPE1_MSIX :
+				           AAC_INT_ENABLE_TYPE1_INTX));
+		break;
+
+	case AAC_DISABLE_INTERRUPT:
+		AAC_MEM0_SETREG4(sc, AAC_SRC_OIMR, AAC_INT_DISABLE_ALL);
+		break;
+
+	case AAC_ENABLE_MSIX:
+		/* set bit 6 */
+		val = AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		val |= 0x40;
+		AAC_MEM0_SETREG4(sc, AAC_SRC_IDBR, val);		
+		AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		/* unmask int. */
+		val = PMC_ALL_INTERRUPT_BITS;
+		AAC_MEM0_SETREG4(sc, AAC_SRC_IOAR, val);
+		val = AAC_MEM0_GETREG4(sc, AAC_SRC_OIMR);
+		AAC_MEM0_SETREG4(sc, AAC_SRC_OIMR, 
+			val & (~(PMC_GLOBAL_INT_BIT2 | PMC_GLOBAL_INT_BIT0)));
+		break;
+
+	case AAC_DISABLE_MSIX:
+		/* reset bit 6 */
+		val = AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		val &= ~0x40;
+		AAC_MEM0_SETREG4(sc, AAC_SRC_IDBR, val);		
+		AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		break;
+
+	case AAC_CLEAR_AIF_BIT:
+		/* set bit 5 */
+		val = AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		val |= 0x20;
+		AAC_MEM0_SETREG4(sc, AAC_SRC_IDBR, val);		
+		AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		break;
+
+	case AAC_CLEAR_SYNC_BIT:
+		/* set bit 4 */
+		val = AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		val |= 0x10;
+		AAC_MEM0_SETREG4(sc, AAC_SRC_IDBR, val);		
+		AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		break;
+
+	case AAC_ENABLE_INTX:
+		/* set bit 7 */
+		val = AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		val |= 0x80;
+		AAC_MEM0_SETREG4(sc, AAC_SRC_IDBR, val);		
+		AAC_MEM0_GETREG4(sc, AAC_SRC_IDBR);
+		/* unmask int. */
+		val = PMC_ALL_INTERRUPT_BITS;
+		AAC_MEM0_SETREG4(sc, AAC_SRC_IOAR, val);
+		val = AAC_MEM0_GETREG4(sc, AAC_SRC_OIMR);
+		AAC_MEM0_SETREG4(sc, AAC_SRC_OIMR, 
+			val & (~(PMC_GLOBAL_INT_BIT2)));
+		break;
+	
+	default:
+		break;
 	}
 }
 
@@ -2028,6 +2353,34 @@ aac_src_send_command(struct aac_softc *sc, struct aac_command *cm)
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "send command (new comm. type1)");
 
+	if (sc->msi_enabled && cm->cm_fib->Header.Command != AifRequest &&
+		sc->aac_max_msix > 1) { 
+		u_int16_t vector_no, first_choice = 0xffff;
+	
+		vector_no = sc->aac_fibs_pushed_no % sc->aac_max_msix;
+		do {
+			vector_no += 1;
+			if (vector_no == sc->aac_max_msix)
+				vector_no = 1;
+			if (sc->aac_rrq_outstanding[vector_no] < 
+				sc->aac_vector_cap)
+				break;
+			if (0xffff == first_choice)
+				first_choice = vector_no;
+			else if (vector_no == first_choice)
+				break;
+		} while (1);
+		if (vector_no == first_choice)
+			vector_no = 0;
+		sc->aac_rrq_outstanding[vector_no]++;
+		if (sc->aac_fibs_pushed_no == 0xffffffff)
+			sc->aac_fibs_pushed_no = 0;
+		else
+			sc->aac_fibs_pushed_no++; 
+		
+		cm->cm_fib->Header.Handle += (vector_no << 16);
+	}		
+
 	if (sc->flags & AAC_FLAGS_NEW_COMM_TYPE2) {
 		/* Calculate the amount to the fibsize bits */
 		fibsize = (cm->cm_fib->Header.Size + 127) / 128 - 1; 
@@ -3364,9 +3717,11 @@ aac_reset_adapter(struct aac_softc *sc)
 	struct aac_command *cm;
 	struct aac_fib *fib;
 	struct aac_pause_command *pc;
-	u_int32_t status, old_flags, reset_mask, waitCount;
+	u_int32_t status, reset_mask, waitCount, max_msix_orig;
+	int msi_enabled_orig;
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
+	mtx_assert(&sc->aac_io_lock, MA_OWNED);
 
 	if (sc->aac_state & AAC_STATE_RESET) {
 		device_printf(sc->aac_dev, "aac_reset_adapter() already in progress\n");
@@ -3375,7 +3730,7 @@ aac_reset_adapter(struct aac_softc *sc)
 	sc->aac_state |= AAC_STATE_RESET;
 
 	/* disable interrupt */
-	AAC_MASK_INTERRUPTS(sc);
+	AAC_ACCESS_DEVREG(sc, AAC_DISABLE_INTERRUPT);
 
 	/*
 	 * Abort all pending commands:
@@ -3458,35 +3813,39 @@ aac_reset_adapter(struct aac_softc *sc)
 		}
 	} else if (sc->aac_support_opt2 & AAC_SUPPORTED_DOORBELL_RESET) {
 		AAC_MEM0_SETREG4(sc, AAC_SRC_IDBR, reset_mask);
-		/* We need to wait for 5 seconds before accessing the doorbell again
-		 * 10000 * 100us = 1000,000us = 1000ms = 1s  
+		/* 
+		 * We need to wait for 5 seconds before accessing the doorbell
+		 * again, 10000 * 100us = 1000,000us = 1000ms = 1s  
 		 */
 		waitCount = 5 * 10000;
 		while (waitCount) {
-			DELAY(100);			/* delay 100 microseconds */
+			DELAY(100);		/* delay 100 microseconds */
 			waitCount--;
 		}
 	}
 
-	/*
-	 * Re-read and renegotiate the FIB parameters, as one of the actions
-	 * that can result from an IOP reset is the running of a new firmware
-	 * image.
-	 */
-	old_flags = sc->flags;
 	/*
 	 * Initialize the adapter.
 	 */
+	max_msix_orig = sc->aac_max_msix;
+	msi_enabled_orig = sc->msi_enabled;
+	sc->msi_enabled = FALSE;
 	if (aac_check_firmware(sc) != 0)
 		goto finish;
 	if (!(sc->flags & AAC_FLAGS_SYNC_MODE)) {
-		if (aac_init(sc) != 0)
-			goto finish;
+		sc->aac_max_msix = max_msix_orig;
+		if (msi_enabled_orig) {
+			sc->msi_enabled = msi_enabled_orig;
+			AAC_ACCESS_DEVREG(sc, AAC_ENABLE_MSIX);
+		}
+		mtx_unlock(&sc->aac_io_lock);
+		aac_init(sc);
+		mtx_lock(&sc->aac_io_lock);
 	}
 
 finish:
 	sc->aac_state &= ~AAC_STATE_RESET;
-	AAC_UNMASK_INTERRUPTS(sc);
+	AAC_ACCESS_DEVREG(sc, AAC_ENABLE_INTERRUPT);
 	aacraid_startio(sc);
 	return (0);
 }
diff --git a/sys/dev/aacraid/aacraid_cam.c b/sys/dev/aacraid/aacraid_cam.c
index 602e961d153..56eaac00f0c 100644
--- a/sys/dev/aacraid/aacraid_cam.c
+++ b/sys/dev/aacraid/aacraid_cam.c
@@ -709,7 +709,7 @@ aac_container_special_command(struct cam_sim *sim, union ccb *ccb,
 		"Container READ_CAPACITY id %d lun %d len %d", 
 		ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
 		ccb->csio.dxfer_len);
-		scsi_ulto4b(co->co_mntobj.ObjExtension.BlockSize, p->length);
+		scsi_ulto4b(co->co_mntobj.ObjExtension.BlockDevice.BlockSize, p->length);
 		/* check if greater than 2TB */
 		if (co->co_mntobj.CapacityHigh) {
 			if (sc->flags & AAC_FLAGS_LBA_64BIT)
@@ -737,9 +737,20 @@ aac_container_special_command(struct cam_sim *sim, union ccb *ccb,
 			xpt_done(ccb);
 			return;	
 		}
-		scsi_ulto4b(co->co_mntobj.ObjExtension.BlockSize, p->length);
+		scsi_ulto4b(co->co_mntobj.ObjExtension.BlockDevice.BlockSize, p->length);
 		scsi_ulto4b(co->co_mntobj.CapacityHigh, p->addr);
 		scsi_ulto4b(co->co_mntobj.Capacity-1, &p->addr[4]);
+
+		if (ccb->csio.dxfer_len >= 14) {		
+			u_int32_t mapping = co->co_mntobj.ObjExtension.BlockDevice.bdLgclPhysMap;
+			p->prot_lbppbe = 0;
+			while (mapping > 1) {
+				mapping >>= 1;
+				p->prot_lbppbe++;
+			}
+			p->prot_lbppbe &= 0x0f;
+		}
+
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		break;
 	}
@@ -769,7 +780,7 @@ aac_container_special_command(struct cam_sim *sim, union ccb *ccb,
 			p->hd.block_descr_len = 
 				sizeof(struct scsi_mode_block_descr);	
 			p->hd.datalen += p->hd.block_descr_len;
-			scsi_ulto3b(co->co_mntobj.ObjExtension.BlockSize, p->bd.block_len);
+			scsi_ulto3b(co->co_mntobj.ObjExtension.BlockDevice.BlockSize, p->bd.block_len);
 			if (co->co_mntobj.Capacity > 0xffffff ||
 				co->co_mntobj.CapacityHigh) {
 				p->bd.num_blocks[0] = 0xff;
@@ -1213,11 +1224,20 @@ aac_cam_complete(struct aac_command *cm)
 				   */
 				  if ((device == T_DIRECT && 
 				    !(sc->aac_feature_bits & AAC_SUPPL_SUPPORTED_JBOD)) ||
-				    (device == T_PROCESSOR) ||
-				    (sc->flags & AAC_FLAGS_CAM_PASSONLY)) 
+				    (device == T_PROCESSOR)) 
 				    ccb->csio.data_ptr[0] =
 				  	((device & 0xe0) | T_NODEVICE);
 					
+				  /* handle phys. components of a log. drive */
+				  if (ccb->csio.data_ptr[0] & 0x20) {
+					if (sc->hint_flags & 8) {
+					  /* expose phys. device (daXX) */
+					  ccb->csio.data_ptr[0] &= 0xdf;
+					} else {
+					  /* phys. device only visible through pass device (passXX) */
+					  ccb->csio.data_ptr[0] |= 0x10;
+					}
+				  }
 				} else if (ccb->ccb_h.status == CAM_SEL_TIMEOUT &&
 				  ccb->ccb_h.target_lun != 0) {
 				  /* fix for INQUIRYs on Lun>0 */
diff --git a/sys/dev/aacraid/aacraid_reg.h b/sys/dev/aacraid/aacraid_reg.h
index 988520c5ea3..682d4003bf3 100644
--- a/sys/dev/aacraid/aacraid_reg.h
+++ b/sys/dev/aacraid/aacraid_reg.h
@@ -230,8 +230,7 @@ struct aac_adapter_init {
 #define AAC_INIT_STRUCT_REVISION_4		4
 #define AAC_INIT_STRUCT_REVISION_6		6
 #define AAC_INIT_STRUCT_REVISION_7		7
-	u_int32_t	MiniPortRevision;
-#define AAC_INIT_STRUCT_MINIPORT_REVISION	1
+	u_int32_t	NoOfMSIXVectors;
 	u_int32_t	FilesystemRevision;
 	u_int32_t	CommHeaderAddress;
 	u_int32_t	FastIoCommAreaAddress;
@@ -676,6 +675,13 @@ struct aac_supplement_adapter_info {
 #define AAC_UP_AND_RUNNING	0x00000080
 #define AAC_KERNEL_PANIC	0x00000100
 
+/*
+ * for dual FW image support
+ */
+#define AAC_FLASH_UPD_PENDING	0x00002000
+#define AAC_FLASH_UPD_SUCCESS	0x00004000
+#define AAC_FLASH_UPD_FAILED	0x00008000
+
 /*
  * Data types relating to control and monitoring of the NVRAM/WriteCache 
  * subsystem.
@@ -1147,6 +1153,9 @@ typedef enum _VM_COMMANDS {
 #define	CT_CID_TO_32BITS_UID		165
 #define CT_PM_DRIVER_SUPPORT		245
 
+/* General CT_xxx return status */
+#define CT_OK		218
+
 /* CT_PM_DRIVER_SUPPORT parameter */
 typedef enum {
 	AAC_PM_DRIVERSUP_GET_STATUS = 1,
@@ -1188,7 +1197,10 @@ struct aac_mntobj {
 	u_int32_t			ContentState;
 	union {
 		u_int32_t	pad[8];
-		u_int32_t	BlockSize;
+		struct {
+			u_int32_t	BlockSize;
+			u_int32_t	bdLgclPhysMap;
+		} BlockDevice;
 	} ObjExtension;
 	u_int32_t			AlterEgoId;
 	u_int32_t			CapacityHigh;
@@ -1334,6 +1346,7 @@ typedef enum {
 #define	CT_PACKET_SIZE \
 	(AAC_FIB_DATASIZE - sizeof (u_int32_t) - \
 	((sizeof (u_int32_t)) * (MAX_FIB_PARAMS + 1)))
+#define CNT_SIZE			5
 
 struct aac_fsa_ctm {
 	u_int32_t	command;
@@ -1346,6 +1359,19 @@ struct aac_cnt_config {
 	struct aac_fsa_ctm	CTCommand;
 };
 
+/* check config. */
+enum {
+	CFACT_CONTINUE = 0,	/* continue without pause */
+	CFACT_PAUSE,		/* pause, then continue */
+	CFACT_ABORT		/* abort */
+};
+
+struct aac_cf_status_hdr {
+	u_int32_t	action;
+	u_int32_t	flags;
+	u_int32_t	recordcount;
+};
+
 /*
  * Block read/write operations.
  * These structures are packed into the 'data' area in the FIB.
@@ -1540,7 +1566,8 @@ enum {
  * Register definitions for the Adaptec PMC SRC/SRCv adapters.
  */
 /* accessible via BAR0 */
-#define AAC_SRC_OMR			0xbc	/* outbound message register */
+#define AAC_SRC_OMR		0xbc	/* outbound message register */
+#define AAC_SRC_IOAR		0x18	/* IOA->host interrupt register */
 #define AAC_SRC_IDBR		0x20	/* inbound doorbell register */
 #define AAC_SRC_IISR		0x24	/* inbound interrupt status register */
 #define AAC_SRC_ODBR_R		0x9c	/* outbound doorbell register read */
@@ -1548,7 +1575,8 @@ enum {
 #define AAC_SRC_OIMR		0x34	/* outbound interrupt mask register */
 #define AAC_SRC_IQUE32		0x40	/* inbound queue address 32-bit */
 #define AAC_SRC_IQUE64_L	0xc0	/* inbound queue address 64-bit (low) */
-#define AAC_SRC_IQUE64_H	0xc4	/* inbound queue address 64-bit (high) */
+#define AAC_SRC_IQUE64_H	0xc4	/* inbound queue address 64-bit (high)*/
+#define AAC_SRC_ODBR_MSI	0xc8	/* MSI register for sync./AIF */
 
 #define AAC_SRC_MAILBOX		0x7fc60	/* mailbox (20 bytes) */
 #define AAC_SRCV_MAILBOX	0x1000	/* mailbox (20 bytes) */
@@ -1569,13 +1597,9 @@ enum {
  * Status bits in the doorbell registers.
  */
 #define AAC_DB_SYNC_COMMAND	(1<<0)	/* send/completed synchronous FIB */
-#define AAC_DB_COMMAND_READY	(1<<1)	/* posted one or more commands */
-#define AAC_DB_RESPONSE_READY	(1<<2)	/* one or more commands complete */
-#define AAC_DB_COMMAND_NOT_FULL	(1<<3)	/* command queue not full */
-#define AAC_DB_RESPONSE_NOT_FULL (1<<4)	/* response queue not full */
-#define AAC_DB_AIF_PENDING		(1<<6)	/* pending AIF (new comm. type1) */
+#define AAC_DB_AIF_PENDING	(1<<6)	/* pending AIF (new comm. type1) */
 /* PMC specific outbound doorbell bits */
-#define AAC_DB_RESPONSE_SENT_NS		(1<<1)	/* response sent (not shifted) */
+#define AAC_DB_RESPONSE_SENT_NS		(1<<1)	/* response sent (not shifted)*/
 
 /*
  * The adapter can request the host print a message by setting the
@@ -1588,11 +1612,55 @@ enum {
 #define AAC_PRINTF_DONE		(1<<5)	/* Host completed printf processing */
 
 /*
- * Mask containing the interrupt bits we care about.  We don't anticipate (or
- * want) interrupts not in this mask.
+ * Interrupts
  */
-#define AAC_DB_INTERRUPTS	(AAC_DB_COMMAND_READY  |	\
-				 AAC_DB_RESPONSE_READY |	\
-				 AAC_DB_PRINTF)
-#define AAC_DB_INT_NEW_COMM		0x08  
-#define AAC_DB_INT_NEW_COMM_TYPE1	0x04
+#define AAC_MAX_MSIX		32	/* vectors */
+#define AAC_PCI_MSI_ENABLE	0x8000
+#define AAC_MSI_SYNC_STATUS	0x1000
+
+enum {
+	AAC_ENABLE_INTERRUPT	= 0x0,
+	AAC_DISABLE_INTERRUPT,
+	AAC_ENABLE_MSIX,
+	AAC_DISABLE_MSIX,
+	AAC_CLEAR_AIF_BIT,
+	AAC_CLEAR_SYNC_BIT,
+	AAC_ENABLE_INTX
+};
+
+#define AAC_INT_MODE_INTX		(1<<0)
+#define AAC_INT_MODE_MSI		(1<<1)
+#define AAC_INT_MODE_AIF		(1<<2)
+#define AAC_INT_MODE_SYNC		(1<<3)
+
+#define AAC_INT_ENABLE_TYPE1_INTX	0xfffffffb
+#define AAC_INT_ENABLE_TYPE1_MSIX	0xfffffffa
+#define AAC_INT_DISABLE_ALL		0xffffffff
+
+/* Bit definitions in IOA->Host Interrupt Register */
+#define PMC_TRANSITION_TO_OPERATIONAL	(0x80000000 >> 0)
+#define PMC_IOARCB_TRANSFER_FAILED	(0x80000000 >> 3)
+#define PMC_IOA_UNIT_CHECK		(0x80000000 >> 4)
+#define PMC_NO_HOST_RRQ_FOR_CMD_RESPONSE (0x80000000 >> 5)
+#define PMC_CRITICAL_IOA_OP_IN_PROGRESS	(0x80000000 >> 6)
+#define PMC_IOARRIN_LOST		(0x80000000 >> 27)
+#define PMC_SYSTEM_BUS_MMIO_ERROR	(0x80000000 >> 28)
+#define PMC_IOA_PROCESSOR_IN_ERROR_STATE (0x80000000 >> 29)
+#define PMC_HOST_RRQ_VALID		(0x80000000 >> 30)
+#define PMC_OPERATIONAL_STATUS		(0x80000000 >> 0)
+#define PMC_ALLOW_MSIX_VECTOR0		(0x80000000 >> 31)
+
+#define PMC_IOA_ERROR_INTERRUPTS	(PMC_IOARCB_TRANSFER_FAILED | \
+					 PMC_IOA_UNIT_CHECK | \
+					 PMC_NO_HOST_RRQ_FOR_CMD_RESPONSE | \
+					 PMC_IOARRIN_LOST | \
+					 PMC_SYSTEM_BUS_MMIO_ERROR | \
+					 PMC_IOA_PROCESSOR_IN_ERROR_STATE)
+
+#define PMC_ALL_INTERRUPT_BITS		(PMC_IOA_ERROR_INTERRUPTS | \
+					 PMC_HOST_RRQ_VALID | \
+					 PMC_TRANSITION_TO_OPERATIONAL | \
+					 PMC_ALLOW_MSIX_VECTOR0)
+
+#define PMC_GLOBAL_INT_BIT2		0x00000004
+#define PMC_GLOBAL_INT_BIT0		0x00000001
diff --git a/sys/dev/aacraid/aacraid_var.h b/sys/dev/aacraid/aacraid_var.h
index 07546ff2f33..55035a93dff 100644
--- a/sys/dev/aacraid/aacraid_var.h
+++ b/sys/dev/aacraid/aacraid_var.h
@@ -46,8 +46,8 @@
 #define	AAC_TYPE_RELEASE		4
 
 #define	AAC_DRIVER_MAJOR_VERSION	3
-#define	AAC_DRIVER_MINOR_VERSION	1
-#define	AAC_DRIVER_BUGFIX_LEVEL		1
+#define	AAC_DRIVER_MINOR_VERSION	2
+#define	AAC_DRIVER_BUGFIX_LEVEL		5
 #define	AAC_DRIVER_TYPE			AAC_TYPE_RELEASE
 
 #ifndef AAC_DRIVER_BUILD
@@ -114,14 +114,20 @@
 #define AAC_BOOT_TIMEOUT	(3 * 60)
 
 /*
- * Timeout for immediate commands.
+ * We wait this many seconds for the adapter to come ready  
+ * after flash update
  */
-#define AAC_IMMEDIATE_TIMEOUT	30		/* seconds */
+#define AAC_FWUPD_TIMEOUT	(5 * 60)
+
+/*
+ * Timeout for sync. commands.
+ */
+#define AAC_SYNC_TIMEOUT	180		/* seconds */
 
 /*
  * Timeout for normal commands
  */
-#define AAC_CMD_TIMEOUT		120		/* seconds */
+#define AAC_CMD_TIMEOUT		180		/* seconds */
 
 /*
  * Rate at which we periodically check for timed out commands and kick the
@@ -271,7 +277,7 @@ struct aac_interface
 				   u_int32_t arg0, u_int32_t arg1,
 				   u_int32_t arg2, u_int32_t arg3);
 	int	(*aif_get_mailbox)(struct aac_softc *sc, int mb);
-	void	(*aif_set_interrupts)(struct aac_softc *sc, int enable);
+	void	(*aif_access_devreg)(struct aac_softc *sc, int enable);
 	int (*aif_send_command)(struct aac_softc *sc, struct aac_command *cm);
 	int (*aif_get_outb_queue)(struct aac_softc *sc);
 	void (*aif_set_outb_queue)(struct aac_softc *sc, int index);
@@ -289,10 +295,8 @@ extern struct aac_interface	aacraid_srcv_interface;
 	(arg3)))
 #define AAC_GET_MAILBOX(sc, mb)		((sc)->aac_if.aif_get_mailbox((sc), \
 					(mb)))
-#define	AAC_MASK_INTERRUPTS(sc)		((sc)->aac_if.aif_set_interrupts((sc), \
-					0))
-#define AAC_UNMASK_INTERRUPTS(sc)	((sc)->aac_if.aif_set_interrupts((sc), \
-					1))
+#define	AAC_ACCESS_DEVREG(sc, mode)	((sc)->aac_if.aif_access_devreg((sc), \
+					mode))
 #define AAC_SEND_COMMAND(sc, cm)	((sc)->aac_if.aif_send_command((sc), (cm)))
 #define AAC_GET_OUTB_QUEUE(sc)		((sc)->aac_if.aif_get_outb_queue((sc)))
 #define AAC_SET_OUTB_QUEUE(sc, idx)	((sc)->aac_if.aif_set_outb_queue((sc), (idx)))
@@ -331,6 +335,12 @@ struct aac_fib_context {
 	struct aac_fib_context *next, *prev;
 };
 
+/* MSIX context */
+struct aac_msix_ctx {
+	int			vector_no;	
+	struct aac_softc  	*sc;
+};
+
 /*
  * Per-controller structure.
  */
@@ -345,9 +355,10 @@ struct aac_softc
 	bus_dma_tag_t		aac_parent_dmat;	/* parent DMA tag */
 	bus_dma_tag_t		aac_buffer_dmat;	/* data buffer/command
 							 * DMA tag */
-	struct resource		*aac_irq;		/* interrupt */
-	int			aac_irq_rid;
-	void			*aac_intr;		/* interrupt handle */
+	struct resource		*aac_irq[AAC_MAX_MSIX];	 /* interrupt */
+	int			aac_irq_rid[AAC_MAX_MSIX];
+	void			*aac_intr[AAC_MAX_MSIX]; /* interrupt handle */
+	struct aac_msix_ctx	aac_msix[AAC_MAX_MSIX]; /* context */
 	eventhandler_tag	eh;
 #if __FreeBSD_version >= 800000
 	struct callout	aac_daemontime;		/* clock daemon callout */
@@ -375,7 +386,9 @@ struct aac_softc
 							 * DMA map */
 	struct aac_common	*aac_common;
 	u_int32_t		aac_common_busaddr;
-	u_int32_t		aac_host_rrq_idx;
+	u_int32_t		aac_host_rrq_idx[AAC_MAX_MSIX];
+	u_int32_t		aac_rrq_outstanding[AAC_MAX_MSIX];
+	u_int32_t		aac_fibs_pushed_no;
 	struct aac_interface	aac_if;
 
 	/* command/fib resources */
@@ -466,6 +479,9 @@ struct aac_softc
 	u_int32_t	aac_feature_bits;		/* feature bits from suppl. info */
 	u_int32_t	aac_support_opt2;		/* supp. options from suppl. info */
 	u_int32_t	aac_max_aif;			/* max. AIF count */
+	u_int32_t	aac_max_msix;			/* max. MSI-X vectors */
+	u_int32_t	aac_vector_cap;			/* MSI-X vector capab.*/
+	int		msi_enabled;			/* MSI/MSI-X enabled */
 #define AAC_CAM_TARGET_WILDCARD ~0
 	void			(*cam_rescan_cb)(struct aac_softc *, uint32_t,
 				    uint32_t);
@@ -515,8 +531,6 @@ extern void		aacraid_map_command_sg(void *arg, bus_dma_segment_t *segs,
 				int nseg, int error);
 extern int		aacraid_wait_command(struct aac_command *cmp);
 
-/* #define AACRAID_DEBUG */
-
 #ifdef AACRAID_DEBUG
 # define fwprintf(sc, flags, fmt, args...)				\
 	aacraid_fw_printf(sc, flags, "%s: " fmt, __func__, ##args);
diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index da252c4fcde..d17245eb419 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -431,7 +431,7 @@ acpi_probe(device_t dev)
 
     device_set_desc(dev, acpi_desc);
 
-    return_VALUE (0);
+    return_VALUE (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c
index be869ed8897..4d600f5a24f 100644
--- a/sys/dev/acpica/acpi_hpet.c
+++ b/sys/dev/acpica/acpi_hpet.c
@@ -293,7 +293,7 @@ hpet_find(ACPI_HANDLE handle, UINT32 level, void *context,
 		return (AE_OK);
 	if (ACPI_FAILURE(acpi_GetInteger(handle, "_UID", &uid)) ||
 	    id == uid)
-		*((int *)status) = 1;
+		*status = acpi_get_device(handle);
 	return (AE_OK);
 }
 
@@ -321,7 +321,7 @@ hpet_identify(driver_t *driver, device_t parent)
 	ACPI_TABLE_HPET *hpet;
 	ACPI_STATUS	status;
 	device_t	child;
-	int 		i, found;
+	int		i;
 
 	/* Only one HPET device can be added. */
 	if (devclass_get_device(hpet_devclass, 0))
@@ -332,12 +332,18 @@ hpet_identify(driver_t *driver, device_t parent)
 		if (ACPI_FAILURE(status))
 			return;
 		/* Search for HPET device with same ID. */
-		found = 0;
+		child = NULL;
 		AcpiWalkNamespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
-		    100, hpet_find, NULL, (void *)(uintptr_t)hpet->Sequence, (void *)&found);
+		    100, hpet_find, NULL, (void *)(uintptr_t)hpet->Sequence,
+		    (void *)&child);
 		/* If found - let it be probed in normal way. */
-		if (found)
+		if (child) {
+			if (bus_get_resource(child, SYS_RES_MEMORY, 0,
+			    NULL, NULL) != 0)
+				bus_set_resource(child, SYS_RES_MEMORY, 0,
+				    hpet->Address.Address, HPET_MEM_WIDTH);
 			continue;
+		}
 		/* If not - create it from table info. */
 		child = BUS_ADD_CHILD(parent, 2, "hpet", 0);
 		if (child == NULL) {
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index 39fba8809e5..78d8639fd65 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -29,6 +29,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_acpi.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -80,6 +82,7 @@ static ACPI_STATUS acpi_pci_save_handle(ACPI_HANDLE handle, UINT32 level,
 static int	acpi_pci_set_powerstate_method(device_t dev, device_t child,
 		    int state);
 static void	acpi_pci_update_device(ACPI_HANDLE handle, device_t pci_child);
+static bus_dma_tag_t acpi_pci_get_dma_tag(device_t bus, device_t child);
 
 static device_method_t acpi_pci_methods[] = {
 	/* Device interface */
@@ -90,6 +93,7 @@ static device_method_t acpi_pci_methods[] = {
 	DEVMETHOD(bus_read_ivar,	acpi_pci_read_ivar),
 	DEVMETHOD(bus_write_ivar,	acpi_pci_write_ivar),
 	DEVMETHOD(bus_child_location_str, acpi_pci_child_location_str_method),
+	DEVMETHOD(bus_get_dma_tag,	acpi_pci_get_dma_tag),
 
 	/* PCI interface */
 	DEVMETHOD(pci_set_powerstate,	acpi_pci_set_powerstate_method),
@@ -308,3 +312,28 @@ acpi_pci_attach(device_t dev)
 
 	return (bus_generic_attach(dev));
 }
+
+#ifdef ACPI_DMAR
+bus_dma_tag_t dmar_get_dma_tag(device_t dev, device_t child);
+static bus_dma_tag_t
+acpi_pci_get_dma_tag(device_t bus, device_t child)
+{
+	bus_dma_tag_t tag;
+
+	if (device_get_parent(child) == bus) {
+		/* try dmar and return if it works */
+		tag = dmar_get_dma_tag(bus, child);
+	} else
+		tag = NULL;
+	if (tag == NULL)
+		tag = pci_get_dma_tag(bus, child);
+	return (tag);
+}
+#else
+static bus_dma_tag_t
+acpi_pci_get_dma_tag(device_t bus, device_t child)
+{
+
+	return (pci_get_dma_tag(bus, child));
+}
+#endif
diff --git a/sys/dev/acpica/acpi_video.c b/sys/dev/acpica/acpi_video.c
index cda45db325b..5b9e526e346 100644
--- a/sys/dev/acpica/acpi_video.c
+++ b/sys/dev/acpica/acpi_video.c
@@ -132,7 +132,7 @@ static void	vo_set_device_state(ACPI_HANDLE, UINT32);
 #define	DOD_HEAD_ID_BITS	3
 #define	DOD_HEAD_ID_MASK \
 		(((1 << DOD_HEAD_ID_BITS) - 1) << DOD_HEAD_ID_SHIFT)
-#define	DOD_DEVID_SCHEME_STD	(1 << 31)
+#define	DOD_DEVID_SCHEME_STD	(1U << 31)
 
 /* _BCL related constants */
 #define	BCL_FULLPOWER		0
@@ -149,7 +149,7 @@ static void	vo_set_device_state(ACPI_HANDLE, UINT32);
 #define	DSS_INACTIVE		0
 #define	DSS_ACTIVE		(1 << 0)
 #define	DSS_SETNEXT		(1 << 30)
-#define	DSS_COMMIT		(1 << 31)
+#define	DSS_COMMIT		(1U << 31)
 
 static device_method_t acpi_video_methods[] = {
 	DEVMETHOD(device_identify, acpi_video_identify),
diff --git a/sys/dev/adb/adb_kbd.c b/sys/dev/adb/adb_kbd.c
index 75899c971d7..91891d31924 100644
--- a/sys/dev/adb/adb_kbd.c
+++ b/sys/dev/adb/adb_kbd.c
@@ -621,7 +621,7 @@ akbd_read_char(keyboard_t *kbd, int wait)
 
 	if (!sc->buffers) {
 		mtx_unlock(&sc->sc_mutex);
-		return (0);
+		return (NOKEY);
 	}
 
 	adb_code = sc->buffer[0];
diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c
index f10763b651f..cd7ed5481de 100644
--- a/sys/dev/ae/if_ae.c
+++ b/sys/dev/ae/if_ae.c
@@ -35,8 +35,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
+#include <sys/mutex.h>
 #include <sys/rman.h>
 #include <sys/module.h>
 #include <sys/queue.h>
@@ -47,6 +49,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c
index 72391210a4f..3055d7732e9 100644
--- a/sys/dev/age/if_age.c
+++ b/sys/dev/age/if_age.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 414a7a590a9..725aa992903 100644
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -2226,10 +2226,10 @@ agp_i830_chipset_flush(device_t dev)
 	sc = device_get_softc(dev);
 	pmap_invalidate_cache();
 	hic = bus_read_4(sc->sc_res[0], AGP_I830_HIC);
-	bus_write_4(sc->sc_res[0], AGP_I830_HIC, hic | (1 << 31));
+	bus_write_4(sc->sc_res[0], AGP_I830_HIC, hic | (1U << 31));
 	for (i = 0; i < 20000 /* 1 sec */; i++) {
 		hic = bus_read_4(sc->sc_res[0], AGP_I830_HIC);
-		if ((hic & (1 << 31)) == 0)
+		if ((hic & (1U << 31)) == 0)
 			break;
 		DELAY(50);
 	}
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c
index ab2a59a0323..ee9cc72b7f1 100644
--- a/sys/dev/aha/aha.c
+++ b/sys/dev/aha/aha.c
@@ -1168,8 +1168,10 @@ ahadone(struct aha_softc *aha, struct aha_ccb *accb, aha_mbi_comp_code_t comp_co
 		    cam_sim_path(aha->sim), accb->hccb.target,
 		    CAM_LUN_WILDCARD);
 
-		if (error == CAM_REQ_CMP)
+		if (error == CAM_REQ_CMP) {
 			xpt_async(AC_SENT_BDR, path, NULL);
+			xpt_free_path(path);
+		}
 
 		ccb_h = LIST_FIRST(&aha->pending_ccbs);
 		while (ccb_h != NULL) {
diff --git a/sys/dev/ahci/ahci.c b/sys/dev/ahci/ahci.c
index e45bc507b4a..e7efe59c19b 100644
--- a/sys/dev/ahci/ahci.c
+++ b/sys/dev/ahci/ahci.c
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 static int ahci_setup_interrupt(device_t dev);
 static void ahci_intr(void *data);
 static void ahci_intr_one(void *data);
+static void ahci_intr_one_edge(void *data);
 static int ahci_suspend(device_t dev);
 static int ahci_resume(device_t dev);
 static int ahci_ch_init(device_t dev);
@@ -62,8 +63,9 @@ static int ahci_ch_deinit(device_t dev);
 static int ahci_ch_suspend(device_t dev);
 static int ahci_ch_resume(device_t dev);
 static void ahci_ch_pm(void *arg);
-static void ahci_ch_intr_locked(void *data);
-static void ahci_ch_intr(void *data);
+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 int ahci_ctlr_reset(device_t dev);
 static int ahci_ctlr_setup(device_t dev);
 static void ahci_begin_transaction(device_t dev, union ccb *ccb);
@@ -190,21 +192,54 @@ static struct {
 	{0x28268086, 0x00, "Intel Patsburg (RAID)",	0},
 	{0x1e028086, 0x00, "Intel Panther Point",	0},
 	{0x1e038086, 0x00, "Intel Panther Point",	0},
-	{0x1e048086, 0x00, "Intel Panther Point",	0},
-	{0x1e058086, 0x00, "Intel Panther Point",	0},
-	{0x1e068086, 0x00, "Intel Panther Point",	0},
-	{0x1e078086, 0x00, "Intel Panther Point",	0},
-	{0x1e0e8086, 0x00, "Intel Panther Point",	0},
-	{0x1e0f8086, 0x00, "Intel Panther Point",	0},
+	{0x1e048086, 0x00, "Intel Panther Point (RAID)",	0},
+	{0x1e058086, 0x00, "Intel Panther Point (RAID)",	0},
+	{0x1e068086, 0x00, "Intel Panther Point (RAID)",	0},
+	{0x1e078086, 0x00, "Intel Panther Point (RAID)",	0},
+	{0x1e0e8086, 0x00, "Intel Panther Point (RAID)",	0},
+	{0x1e0f8086, 0x00, "Intel Panther Point (RAID)",	0},
+	{0x1f228086, 0x00, "Intel Avoton",	0},
+	{0x1f238086, 0x00, "Intel Avoton",	0},
+	{0x1f248086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f258086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f268086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f278086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f2e8086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f2f8086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f328086, 0x00, "Intel Avoton",	0},
+	{0x1f338086, 0x00, "Intel Avoton",	0},
+	{0x1f348086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f358086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f368086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f378086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f3e8086, 0x00, "Intel Avoton (RAID)",	0},
+	{0x1f3f8086, 0x00, "Intel Avoton (RAID)",	0},
 	{0x23a38086, 0x00, "Intel Coleto Creek",        0},
+	{0x28238086, 0x00, "Intel Wellsburg (RAID)",	0},
+	{0x28278086, 0x00, "Intel Wellsburg (RAID)",	0},
 	{0x8c028086, 0x00, "Intel Lynx Point",	0},
 	{0x8c038086, 0x00, "Intel Lynx Point",	0},
-	{0x8c048086, 0x00, "Intel Lynx Point",	0},
-	{0x8c058086, 0x00, "Intel Lynx Point",	0},
-	{0x8c068086, 0x00, "Intel Lynx Point",	0},
-	{0x8c078086, 0x00, "Intel Lynx Point",	0},
-	{0x8c0e8086, 0x00, "Intel Lynx Point",	0},
-	{0x8c0f8086, 0x00, "Intel Lynx Point",	0},
+	{0x8c048086, 0x00, "Intel Lynx Point (RAID)",	0},
+	{0x8c058086, 0x00, "Intel Lynx Point (RAID)",	0},
+	{0x8c068086, 0x00, "Intel Lynx Point (RAID)",	0},
+	{0x8c078086, 0x00, "Intel Lynx Point (RAID)",	0},
+	{0x8c0e8086, 0x00, "Intel Lynx Point (RAID)",	0},
+	{0x8c0f8086, 0x00, "Intel Lynx Point (RAID)",	0},
+	{0x8d028086, 0x00, "Intel Wellsburg",	0},
+	{0x8d048086, 0x00, "Intel Wellsburg (RAID)",	0},
+	{0x8d068086, 0x00, "Intel Wellsburg (RAID)",	0},
+	{0x8d628086, 0x00, "Intel Wellsburg",	0},
+	{0x8d648086, 0x00, "Intel Wellsburg (RAID)",	0},
+	{0x8d668086, 0x00, "Intel Wellsburg (RAID)",	0},
+	{0x8d6e8086, 0x00, "Intel Wellsburg (RAID)",	0},
+	{0x9c028086, 0x00, "Intel Lynx Point-LP",	0},
+	{0x9c038086, 0x00, "Intel Lynx Point-LP",	0},
+	{0x9c048086, 0x00, "Intel Lynx Point-LP (RAID)",	0},
+	{0x9c058086, 0x00, "Intel Lynx Point-LP (RAID)",	0},
+	{0x9c068086, 0x00, "Intel Lynx Point-LP (RAID)",	0},
+	{0x9c078086, 0x00, "Intel Lynx Point-LP (RAID)",	0},
+	{0x9c0e8086, 0x00, "Intel Lynx Point-LP (RAID)",	0},
+	{0x9c0f8086, 0x00, "Intel Lynx Point-LP (RAID)",	0},
 	{0x23238086, 0x00, "Intel DH89xxCC",	0},
 	{0x2360197b, 0x00, "JMicron JMB360",	0},
 	{0x2361197b, 0x00, "JMicron JMB361",	AHCI_Q_NOFORCE},
@@ -397,6 +432,7 @@ ahci_attach(device_t dev)
 	struct ahci_controller *ctlr = device_get_softc(dev);
 	device_t child;
 	int	error, unit, speed, i;
+	u_int	u;
 	uint32_t devid = pci_get_devid(dev);
 	uint8_t revid = pci_get_revid(dev);
 	u_int32_t version;
@@ -496,6 +532,12 @@ ahci_attach(device_t dev)
 		rman_fini(&ctlr->sc_iomem);
 		return ENXIO;
 	}
+	i = 0;
+	for (u = ctlr->ichannels; u != 0; u >>= 1)
+		i += (u & 1);
+	ctlr->direct = (ctlr->msi && (ctlr->numirqs > 1 || i <= 3));
+	resource_int_value(device_get_name(dev), device_get_unit(dev),
+	    "direct", &ctlr->direct);
 	/* Announce HW capabilities. */
 	speed = (ctlr->caps & AHCI_CAP_ISS) >> AHCI_CAP_ISS_SHIFT;
 	device_printf(dev,
@@ -677,24 +719,26 @@ static int
 ahci_setup_interrupt(device_t dev)
 {
 	struct ahci_controller *ctlr = device_get_softc(dev);
-	int i, msi = 1;
+	int i;
 
+	ctlr->msi = 2;
 	/* Process hints. */
 	if (ctlr->quirks & AHCI_Q_NOMSI)
-		msi = 0;
+		ctlr->msi = 0;
 	resource_int_value(device_get_name(dev),
-	    device_get_unit(dev), "msi", &msi);
-	if (msi < 0)
-		msi = 0;
-	else if (msi == 1)
-		msi = min(1, pci_msi_count(dev));
-	else if (msi > 1)
-		msi = pci_msi_count(dev);
+	    device_get_unit(dev), "msi", &ctlr->msi);
+	ctlr->numirqs = 1;
+	if (ctlr->msi < 0)
+		ctlr->msi = 0;
+	else if (ctlr->msi == 1)
+		ctlr->msi = min(1, pci_msi_count(dev));
+	else if (ctlr->msi > 1) {
+		ctlr->msi = 2;
+		ctlr->numirqs = pci_msi_count(dev);
+	}
 	/* Allocate MSI if needed/present. */
-	if (msi && pci_alloc_msi(dev, &msi) == 0) {
-		ctlr->numirqs = msi;
-	} else {
-		msi = 0;
+	if (ctlr->msi && pci_alloc_msi(dev, &ctlr->numirqs) != 0) {
+		ctlr->msi = 0;
 		ctlr->numirqs = 1;
 	}
 	/* Check for single MSI vector fallback. */
@@ -706,7 +750,7 @@ ahci_setup_interrupt(device_t dev)
 	/* Allocate all IRQs. */
 	for (i = 0; i < ctlr->numirqs; i++) {
 		ctlr->irqs[i].ctlr = ctlr;
-		ctlr->irqs[i].r_irq_rid = i + (msi ? 1 : 0);
+		ctlr->irqs[i].r_irq_rid = i + (ctlr->msi ? 1 : 0);
 		if (ctlr->numirqs == 1 || i >= ctlr->channels ||
 		    (ctlr->ccc && i == ctlr->cccv))
 			ctlr->irqs[i].mode = AHCI_IRQ_MODE_ALL;
@@ -720,7 +764,9 @@ ahci_setup_interrupt(device_t dev)
 			return ENXIO;
 		}
 		if ((bus_setup_intr(dev, ctlr->irqs[i].r_irq, ATA_INTR_FLAGS, NULL,
-		    (ctlr->irqs[i].mode == AHCI_IRQ_MODE_ONE) ? ahci_intr_one : ahci_intr,
+		    (ctlr->irqs[i].mode != AHCI_IRQ_MODE_ONE) ? ahci_intr :
+		     ((ctlr->quirks & AHCI_Q_EDGEIS) ? ahci_intr_one_edge :
+		      ahci_intr_one),
 		    &ctlr->irqs[i], &ctlr->irqs[i].handle))) {
 			/* SOS XXX release r_irq */
 			device_printf(dev, "unable to setup interrupt\n");
@@ -789,14 +835,25 @@ ahci_intr_one(void *data)
 	int unit;
 
 	unit = irq->r_irq_rid - 1;
-	/* Some controllers have edge triggered IS. */
-	if (ctlr->quirks & AHCI_Q_EDGEIS)
-		ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit);
 	if ((arg = ctlr->interrupt[unit].argument))
 	    ctlr->interrupt[unit].function(arg);
 	/* AHCI declares level triggered IS. */
-	if (!(ctlr->quirks & AHCI_Q_EDGEIS))
-		ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit);
+	ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit);
+}
+
+static void
+ahci_intr_one_edge(void *data)
+{
+	struct ahci_controller_irq *irq = data;
+	struct ahci_controller *ctlr = irq->ctlr;
+	void *arg;
+	int unit;
+
+	unit = irq->r_irq_rid - 1;
+	/* Some controllers have edge triggered IS. */
+	ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit);
+	if ((arg = ctlr->interrupt[unit].argument))
+		ctlr->interrupt[unit].function(arg);
 }
 
 static struct resource *
@@ -1000,6 +1057,7 @@ ahci_ch_attach(device_t dev)
 	mtx_init(&ch->mtx, "AHCI channel lock", NULL, MTX_DEF);
 	resource_int_value(device_get_name(dev),
 	    device_get_unit(dev), "pm_level", &ch->pm_level);
+	STAILQ_INIT(&ch->doneq);
 	if (ch->pm_level > 3)
 		callout_init_mtx(&ch->pm_timer, &ch->mtx, 0);
 	callout_init_mtx(&ch->reset_timer, &ch->mtx, 0);
@@ -1045,7 +1103,8 @@ ahci_ch_attach(device_t dev)
 		goto err0;
 	}
 	if ((bus_setup_intr(dev, ch->r_irq, ATA_INTR_FLAGS, NULL,
-	    ahci_ch_intr_locked, dev, &ch->ih))) {
+	    ctlr->direct ? ahci_ch_intr_direct : ahci_ch_intr,
+	    dev, &ch->ih))) {
 		device_printf(dev, "Unable to setup interrupt\n");
 		error = ENXIO;
 		goto err1;
@@ -1054,13 +1113,16 @@ ahci_ch_attach(device_t dev)
 	version = ATA_INL(ctlr->r_mem, AHCI_VS);
 	if (version < 0x00010200 && (ctlr->caps & AHCI_CAP_FBSS))
 		ch->chcaps |= AHCI_P_CMD_FBSCP;
+	if (ch->caps2 & AHCI_CAP2_SDS)
+		ch->chscaps = ATA_INL(ch->r_mem, AHCI_P_DEVSLP);
 	if (bootverbose) {
-		device_printf(dev, "Caps:%s%s%s%s%s\n",
+		device_printf(dev, "Caps:%s%s%s%s%s%s\n",
 		    (ch->chcaps & AHCI_P_CMD_HPCP) ? " HPCP":"",
 		    (ch->chcaps & AHCI_P_CMD_MPSP) ? " MPSP":"",
 		    (ch->chcaps & AHCI_P_CMD_CPD) ? " CPD":"",
 		    (ch->chcaps & AHCI_P_CMD_ESP) ? " ESP":"",
-		    (ch->chcaps & AHCI_P_CMD_FBSCP) ? " FBSCP":"");
+		    (ch->chcaps & AHCI_P_CMD_FBSCP) ? " FBSCP":"",
+		    (ch->chscaps & AHCI_P_DEVSLP_DSP) ? " DSP":"");
 	}
 	/* Create the device queue for our SIM. */
 	devq = cam_simq_alloc(ch->numslots);
@@ -1465,18 +1527,60 @@ ahci_notify_events(device_t dev, u_int32_t status)
 }
 
 static void
-ahci_ch_intr_locked(void *data)
+ahci_done(struct ahci_channel *ch, union ccb *ccb)
 {
-	device_t dev = (device_t)data;
+
+	mtx_assert(&ch->mtx, MA_OWNED);
+	if ((ccb->ccb_h.func_code & XPT_FC_QUEUED) == 0 ||
+	    ch->batch == 0) {
+		xpt_done(ccb);
+		return;
+	}
+
+	STAILQ_INSERT_TAIL(&ch->doneq, &ccb->ccb_h, sim_links.stqe);
+}
+
+static void
+ahci_ch_intr(void *arg)
+{
+	device_t dev = (device_t)arg;
 	struct ahci_channel *ch = device_get_softc(dev);
+	uint32_t istatus;
+
+	/* Read interrupt statuses. */
+	istatus = ATA_INL(ch->r_mem, AHCI_P_IS);
+	if (istatus == 0)
+		return;
 
 	mtx_lock(&ch->mtx);
-	xpt_batch_start(ch->sim);
-	ahci_ch_intr(data);
-	xpt_batch_done(ch->sim);
+	ahci_ch_intr_main(ch, istatus);
 	mtx_unlock(&ch->mtx);
 }
 
+static void
+ahci_ch_intr_direct(void *arg)
+{
+	device_t dev = (device_t)arg;
+	struct ahci_channel *ch = device_get_softc(dev);
+	struct ccb_hdr *ccb_h;
+	uint32_t istatus;
+
+	/* Read interrupt statuses. */
+	istatus = ATA_INL(ch->r_mem, AHCI_P_IS);
+	if (istatus == 0)
+		return;
+
+	mtx_lock(&ch->mtx);
+	ch->batch = 1;
+	ahci_ch_intr_main(ch, istatus);
+	ch->batch = 0;
+	mtx_unlock(&ch->mtx);
+	while ((ccb_h = STAILQ_FIRST(&ch->doneq)) != NULL) {
+		STAILQ_REMOVE_HEAD(&ch->doneq, sim_links.stqe);
+		xpt_done_direct((union ccb *)ccb_h);
+	}
+}
+
 static void
 ahci_ch_pm(void *arg)
 {
@@ -1495,18 +1599,14 @@ ahci_ch_pm(void *arg)
 }
 
 static void
-ahci_ch_intr(void *data)
+ahci_ch_intr_main(struct ahci_channel *ch, uint32_t istatus)
 {
-	device_t dev = (device_t)data;
-	struct ahci_channel *ch = device_get_softc(dev);
-	uint32_t istatus, cstatus, serr = 0, sntf = 0, ok, err;
+	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;
 
-	/* Read and clear interrupt statuses. */
-	istatus = ATA_INL(ch->r_mem, AHCI_P_IS);
-	if (istatus == 0)
-		return;
+	/* Clear interrupt statuses. */
 	ATA_OUTL(ch->r_mem, AHCI_P_IS, istatus);
 	/* Read command statuses. */
 	if (ch->numtslots != 0)
@@ -1598,7 +1698,7 @@ ahci_ch_intr(void *data)
 				xpt_freeze_devq(fccb->ccb_h.path, 1);
 				fccb->ccb_h.status |= CAM_DEV_QFRZN;
 			}
-			xpt_done(fccb);
+			ahci_done(ch, fccb);
 		}
 		for (i = 0; i < ch->numslots; i++) {
 			/* XXX: reqests in loading state. */
@@ -2007,7 +2107,7 @@ ahci_timeout(struct ahci_slot *slot)
 			xpt_freeze_devq(fccb->ccb_h.path, 1);
 			fccb->ccb_h.status |= CAM_DEV_QFRZN;
 		}
-		xpt_done(fccb);
+		ahci_done(ch, fccb);
 	}
 	if (!ch->fbs_enabled && !ch->wrongccs) {
 		/* Without FBS we know real timeout source. */
@@ -2213,7 +2313,7 @@ ahci_end_transaction(struct ahci_slot *slot, enum ahci_err_type et)
 		ch->hold[slot->slot] = ccb;
 		ch->numhslots++;
 	} else
-		xpt_done(ccb);
+		ahci_done(ch, ccb);
 	/* If we have no other active commands, ... */
 	if (ch->rslots == 0) {
 		/* if there was fatal error - reset port. */
@@ -2273,7 +2373,7 @@ completeall:
 				continue;
 			ch->hold[i]->ccb_h.status &= ~CAM_STATUS_MASK;
 			ch->hold[i]->ccb_h.status |= CAM_RESRC_UNAVAIL;
-			xpt_done(ch->hold[i]);
+			ahci_done(ch, ch->hold[i]);
 			ch->hold[i] = NULL;
 			ch->numhslots--;
 		}
@@ -2361,7 +2461,7 @@ ahci_process_read_log(device_t dev, union ccb *ccb)
 				ch->hold[i]->ccb_h.status &= ~CAM_STATUS_MASK;
 				ch->hold[i]->ccb_h.status |= CAM_REQUEUE_REQ;
 			}
-			xpt_done(ch->hold[i]);
+			ahci_done(ch, ch->hold[i]);
 			ch->hold[i] = NULL;
 			ch->numhslots--;
 		}
@@ -2376,7 +2476,7 @@ ahci_process_read_log(device_t dev, union ccb *ccb)
 				continue;
 			if (ch->hold[i]->ccb_h.func_code != XPT_ATA_IO)
 				continue;
-			xpt_done(ch->hold[i]);
+			ahci_done(ch, ch->hold[i]);
 			ch->hold[i] = NULL;
 			ch->numhslots--;
 		}
@@ -2401,7 +2501,7 @@ ahci_process_request_sense(device_t dev, union ccb *ccb)
 		ch->hold[i]->ccb_h.status &= ~CAM_STATUS_MASK;
 		ch->hold[i]->ccb_h.status |= CAM_AUTOSENSE_FAIL;
 	}
-	xpt_done(ch->hold[i]);
+	ahci_done(ch, ch->hold[i]);
 	ch->hold[i] = NULL;
 	ch->numhslots--;
 	xpt_free_ccb(ccb);
@@ -2585,7 +2685,7 @@ ahci_reset(device_t dev)
 			xpt_freeze_devq(fccb->ccb_h.path, 1);
 			fccb->ccb_h.status |= CAM_DEV_QFRZN;
 		}
-		xpt_done(fccb);
+		ahci_done(ch, fccb);
 	}
 	/* Kill the engine and requeue all running commands. */
 	ahci_stop(dev);
@@ -2599,7 +2699,7 @@ ahci_reset(device_t dev)
 	for (i = 0; i < ch->numslots; i++) {
 		if (!ch->hold[i])
 			continue;
-		xpt_done(ch->hold[i]);
+		ahci_done(ch, ch->hold[i]);
 		ch->hold[i] = NULL;
 		ch->numhslots--;
 	}
@@ -2795,12 +2895,12 @@ ahci_check_ids(device_t dev, union ccb *ccb)
 
 	if (ccb->ccb_h.target_id > ((ch->caps & AHCI_CAP_SPM) ? 15 : 0)) {
 		ccb->ccb_h.status = CAM_TID_INVALID;
-		xpt_done(ccb);
+		ahci_done(ch, ccb);
 		return (-1);
 	}
 	if (ccb->ccb_h.target_lun != 0) {
 		ccb->ccb_h.status = CAM_LUN_INVALID;
-		xpt_done(ccb);
+		ahci_done(ch, ccb);
 		return (-1);
 	}
 	return (0);
@@ -2992,15 +3092,19 @@ ahciaction(struct cam_sim *sim, union ccb *ccb)
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 		break;
 	}
-	xpt_done(ccb);
+	ahci_done(ch, ccb);
 }
 
 static void
 ahcipoll(struct cam_sim *sim)
 {
 	struct ahci_channel *ch = (struct ahci_channel *)cam_sim_softc(sim);
+	uint32_t istatus;
 
-	ahci_ch_intr(ch->dev);
+	/* Read interrupt statuses and process if any. */
+	istatus = ATA_INL(ch->r_mem, AHCI_P_IS);
+	if (istatus != 0)
+		ahci_ch_intr_main(ch, istatus);
 	if (ch->resetting != 0 &&
 	    (--ch->resetpolldiv <= 0 || !callout_pending(&ch->reset_timer))) {
 		ch->resetpolldiv = 1000;
diff --git a/sys/dev/ahci/ahci.h b/sys/dev/ahci/ahci.h
index c44a76b9718..7da30db9688 100644
--- a/sys/dev/ahci/ahci.h
+++ b/sys/dev/ahci/ahci.h
@@ -137,6 +137,7 @@
 #define         ATA_SC_IPM_NONE         0x00000000
 #define         ATA_SC_IPM_DIS_PARTIAL  0x00000100
 #define         ATA_SC_IPM_DIS_SLUMBER  0x00000200
+#define         ATA_SC_IPM_DIS_DEVSLEEP 0x00000400
 
 #define ATA_SACTIVE                     16
 
@@ -286,6 +287,17 @@
 #define 	AHCI_P_FBS_ADO_SHIFT 12
 #define 	AHCI_P_FBS_DWE      0x000f0000
 #define 	AHCI_P_FBS_DWE_SHIFT 16
+#define AHCI_P_DEVSLP               0x44
+#define 	AHCI_P_DEVSLP_ADSE  0x00000001
+#define 	AHCI_P_DEVSLP_DSP   0x00000002
+#define 	AHCI_P_DEVSLP_DETO  0x000003fc
+#define 	AHCI_P_DEVSLP_DETO_SHIFT 2
+#define 	AHCI_P_DEVSLP_MDAT  0x00007c00
+#define 	AHCI_P_DEVSLP_MDAT_SHIFT 10
+#define 	AHCI_P_DEVSLP_DITO  0x01ff8000
+#define 	AHCI_P_DEVSLP_DITO_SHIFT 15
+#define 	AHCI_P_DEVSLP_DM    0x0e000000
+#define 	AHCI_P_DEVSLP_DM_SHIFT 25
 
 /* Just to be sure, if building as module. */
 #if MAXPHYS < 512 * 1024
@@ -309,7 +321,7 @@ struct ahci_dma_prd {
     u_int32_t                   dbc;            /* 0 based */
 #define AHCI_PRD_MASK		0x003fffff      /* max 4MB */
 #define AHCI_PRD_MAX		(AHCI_PRD_MASK + 1)
-#define AHCI_PRD_IPC		(1 << 31)
+#define AHCI_PRD_IPC		(1U << 31)
 } __packed;
 
 struct ahci_cmd_tab {
@@ -402,6 +414,7 @@ struct ahci_channel {
 	uint32_t		caps;		/* Controller capabilities */
 	uint32_t		caps2;		/* Controller capabilities */
 	uint32_t		chcaps;		/* Channel capabilities */
+	uint32_t		chscaps;	/* Channel sleep capabilities */
 	int			quirks;
 	int			numslots;	/* Number of present slots */
 	int			pm_level;	/* power management level */
@@ -409,6 +422,8 @@ struct ahci_channel {
 	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 */
@@ -481,6 +496,8 @@ struct ahci_controller {
 	int			ichannels;
 	int			ccc;		/* CCC timeout */
 	int			cccv;		/* CCC vector */
+	int			direct;		/* Direct command completion */
+	int			msi;		/* MSI interupts */
 	struct {
 		void			(*function)(void *);
 		void			*argument;
diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c
index 363301bcea4..394bc83b34b 100644
--- a/sys/dev/aic7xxx/aic79xx.c
+++ b/sys/dev/aic7xxx/aic79xx.c
@@ -10343,9 +10343,9 @@ ahd_handle_target_cmd(struct ahd_softc *ahd, struct target_cmd *cmd)
 		/* Tag was included */
 		atio->tag_action = *byte++;
 		atio->tag_id = *byte++;
-		atio->ccb_h.flags = CAM_TAG_ACTION_VALID;
+		atio->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 	} else {
-		atio->ccb_h.flags = 0;
+		atio->ccb_h.flags &= ~CAM_TAG_ACTION_VALID;
 	}
 	byte++;
 
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index 7bbe3c58b7c..626e2657f4f 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -7843,9 +7843,9 @@ ahc_handle_target_cmd(struct ahc_softc *ahc, struct target_cmd *cmd)
 		/* Tag was included */
 		atio->tag_action = *byte++;
 		atio->tag_id = *byte++;
-		atio->ccb_h.flags = CAM_TAG_ACTION_VALID;
+		atio->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 	} else {
-		atio->ccb_h.flags = 0;
+		atio->ccb_h.flags &= ~CAM_TAG_ACTION_VALID;
 	}
 	byte++;
 
diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile
index 97b93d00e86..04bac72835c 100644
--- a/sys/dev/aic7xxx/aicasm/Makefile
+++ b/sys/dev/aic7xxx/aicasm/Makefile
@@ -15,7 +15,7 @@ SRCS=	${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
 CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
 DPADD=	${LIBL}
 LDADD=	-ll
-WARNS?=	5
+WARNS?=	0
 
 # Correct path for kernel builds
 # Don't rely on the kernel's .depend file
@@ -24,7 +24,7 @@ WARNS?=	5
 DEPENDFILE=	.depend_aicasm
 .endif
 
-CFLAGS+= -I.
+CFLAGS+= -I${.CURDIR}
 .ifdef MAKESRCPATH
 CFLAGS+= -I${MAKESRCPATH}
 .endif
@@ -38,4 +38,8 @@ YFLAGS+= -t -v
 LFLAGS+= -d
 .endif
 
+BINDIR=/usr/bin
+
+build-tools: ${PROG}
+
 .include <bsd.prog.mk>
diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c
index 2ee9513009c..9886e9b336f 100644
--- a/sys/dev/alc/if_alc.c
+++ b/sys/dev/alc/if_alc.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c
index b5eb59756c4..591a24abd5e 100644
--- a/sys/dev/ale/if_ale.c
+++ b/sys/dev/ale/if_ale.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/altera/atse/a_api.h b/sys/dev/altera/atse/a_api.h
new file mode 100644
index 00000000000..ad34e9ed7a7
--- /dev/null
+++ b/sys/dev/altera/atse/a_api.h
@@ -0,0 +1,98 @@
+/*-
+ * Copyright (c) 2012 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$
+ */
+/*
+ * Altera, Embedded Peripherals IP, User Guide, v. 11.0, June 2011.
+ * UG-01085-11.0.
+ */
+
+#ifndef _A_API_H
+#define _A_API_H
+
+/* Table 16-1. Memory Map. */
+#define	A_ONCHIP_FIFO_MEM_CORE_DATA		0x00
+#define	A_ONCHIP_FIFO_MEM_CORE_METADATA		0x04
+
+#define	A_ONCHIP_FIFO_MEM_CORE_SOP		(1<<0)
+#define	A_ONCHIP_FIFO_MEM_CORE_EOP		(1<<1)
+#define	A_ONCHIP_FIFO_MEM_CORE_EMPTY_MASK	0x000000f7
+#define	A_ONCHIP_FIFO_MEM_CORE_EMPTY_SHIFT	2
+	/* Reserved				(1<<7)	   */
+#define	A_ONCHIP_FIFO_MEM_CORE_CHANNEL_MASK	0x0000ff00
+#define	A_ONCHIP_FIFO_MEM_CORE_CHANNEL_SHIFT	8
+#define	A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK	0x00ff0000
+#define	A_ONCHIP_FIFO_MEM_CORE_ERROR_SHIFT	16
+	/* Reserved				0xff000000 */
+
+/* Table 16-3. FIFO Status Register Memory Map. */
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_FILL_LEVEL	0x00
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_I_STATUS	0x04
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_EVENT		0x08
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_INT_ENABLE	0x0c
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_ALMOSTFULL	0x10
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_ALMOSTEMPTY	0x14
+
+/* Table 16-5. Status Bit Field Descriptions. */
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_FULL		(1<<0)
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_EMPTY		(1<<1)
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_ALMOSTFULL	(1<<2)
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_ALMOSTEMPTY	(1<<3)
+#define	A_ONCHIP_FIFO_MEM_CORE_STATUS_OVERFLOW		(1<<4)
+#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)
+#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)
+#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			\
+	    (A_ONCHIP_FIFO_MEM_CORE_INTR_EMPTY|		\
+	    A_ONCHIP_FIFO_MEM_CORE_INTR_FULL|		\
+	    A_ONCHIP_FIFO_MEM_CORE_INTR_ALMOSTEMPTY|	\
+	    A_ONCHIP_FIFO_MEM_CORE_INTR_ALMOSTFULL|	\
+	    A_ONCHIP_FIFO_MEM_CORE_INTR_OVERFLOW|	\
+	    A_ONCHIP_FIFO_MEM_CORE_INTR_UNDERFLOW)
+
+#endif /* _A_API_H */
+
+/* end */
diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c
new file mode 100644
index 00000000000..f6ed625f76a
--- /dev/null
+++ b/sys/dev/altera/atse/if_atse.c
@@ -0,0 +1,1979 @@
+/*-
+ * Copyright (c) 2012,2013 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.
+ */
+/*
+ * Altera Triple-Speed Ethernet MegaCore, Function User Guide
+ * UG-01008-3.0, Software Version: 12.0, June 2012.
+ * Available at the time of writing at:
+ * http://www.altera.com/literature/ug/ug_ethernet.pdf
+ *
+ * We are using an Marvell E1111 (Alaska) PHY on the DE4.  See mii/e1000phy.c.
+ */
+/*
+ * XXX-BZ NOTES:
+ * - ifOutBroadcastPkts are only counted if both ether dst and src are all-1s;
+ *   seems an IP core bug, they count ether broadcasts as multicast.  Is this
+ *   still the case?
+ * - figure out why the TX FIFO fill status and intr did not work as expected.
+ * - test 100Mbit/s and 10Mbit/s
+ * - blacklist the one special factory programmed ethernet address (for now
+ *   hardcoded, later from loader?)
+ * - resolve all XXX, left as reminders to shake out details later
+ * - Jumbo frame support
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_device_polling.h"
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/endian.h>
+#include <sys/jail.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/types.h>
+
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_var.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+#include <net/if_vlan_var.h>
+
+#include <net/bpf.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/rman.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+
+#include <dev/altera/atse/if_atsereg.h>
+#include <dev/altera/atse/a_api.h>
+
+MODULE_DEPEND(atse, ether, 1, 1, 1);
+MODULE_DEPEND(atse, miibus, 1, 1, 1);
+
+
+#define	ATSE_WATCHDOG_TIME	5
+
+#ifdef DEVICE_POLLING
+static poll_handler_t atse_poll;
+#endif
+
+/* XXX once we'd do parallel attach, we need a global lock for this. */
+#define	ATSE_ETHERNET_OPTION_BITS_UNDEF	0
+#define	ATSE_ETHERNET_OPTION_BITS_READ	1
+static int atse_ethernet_option_bits_flag = ATSE_ETHERNET_OPTION_BITS_UNDEF;
+static uint8_t atse_ethernet_option_bits[ALTERA_ETHERNET_OPTION_BITS_LEN];
+
+/*
+ * Softc and critical resource locking.
+ */
+#define	ATSE_LOCK(_sc)		mtx_lock(&(_sc)->atse_mtx)
+#define	ATSE_UNLOCK(_sc)	mtx_unlock(&(_sc)->atse_mtx)
+#define	ATSE_LOCK_ASSERT(_sc)	mtx_assert(&(_sc)->atse_mtx, MA_OWNED)
+
+#ifdef DEBUG
+#define	DPRINTF(format, ...)	printf(format, __VA_ARGS__)
+#else
+#define	DPRINTF(format, ...)
+#endif
+
+/* a_api.c functions; factor out? */
+static inline void
+a_onchip_fifo_mem_core_write(struct resource *res, uint32_t off,
+    uint32_t val4, const char *desc, const char *f, const int l)
+{
+
+	val4 = htole32(val4);
+	DPRINTF("[%s:%d] FIFOW %s 0x%08x = 0x%08x\n", f, l, desc, off, val4);
+	bus_write_4(res, off, val4);
+}
+static inline uint32_t
+a_onchip_fifo_mem_core_read(struct resource *res, uint32_t off,
+    const char *desc, const char *f, const int l)
+{
+	uint32_t val4;
+
+	val4 = le32toh(bus_read_4(res, off));
+	DPRINTF("[%s:%d] FIFOR %s 0x%08x = 0x%08x\n", f, l, desc, off, val4);
+	return (val4);
+}
+
+/* The FIFO does an endian convertion, so we must not do it as well. */
+/* XXX-BZ in fact we should do a htobe32 so le would be fine as well? */
+#define	ATSE_TX_DATA_WRITE(sc, val4)					\
+	bus_write_4((sc)->atse_tx_mem_res, A_ONCHIP_FIFO_MEM_CORE_DATA, val4)
+
+#define	ATSE_TX_META_WRITE(sc, val4)					\
+	a_onchip_fifo_mem_core_write((sc)->atse_tx_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_METADATA,				\
+	    (val4), "TXM", __func__, __LINE__)
+#define	ATSE_TX_META_READ(sc)						\
+	a_onchip_fifo_mem_core_read((sc)->atse_tx_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_METADATA,				\
+	    "TXM", __func__, __LINE__)
+
+#define	ATSE_TX_READ_FILL_LEVEL(sc)					\
+	a_onchip_fifo_mem_core_read((sc)->atse_txc_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_FILL_LEVEL,		\
+	    "TX_FILL", __func__, __LINE__)
+#define	ATSE_RX_READ_FILL_LEVEL(sc)					\
+	a_onchip_fifo_mem_core_read((sc)->atse_rxc_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_FILL_LEVEL,		\
+	    "RX_FILL", __func__, __LINE__)
+
+/* The FIFO does an endian convertion, so we must not do it as well. */
+/* XXX-BZ in fact we shoudl do a htobe32 so le would be fine as well? */
+#define	ATSE_RX_DATA_READ(sc)						\
+	bus_read_4((sc)->atse_rx_mem_res, A_ONCHIP_FIFO_MEM_CORE_DATA)
+#define	ATSE_RX_META_READ(sc)						\
+	a_onchip_fifo_mem_core_read((sc)->atse_rx_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_METADATA,				\
+	    "RXM", __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,			\
+	    "RX_EVENT", __func__, __LINE__)
+
+#define	ATSE_TX_EVENT_READ(sc)						\
+	a_onchip_fifo_mem_core_read((sc)->atse_txc_mem_res,		\
+	    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_EVENT,			\
+	    "TX_EVENT", __func__, __LINE__)
+
+#define	ATSE_RX_EVENT_CLEAR(sc)						\
+	do {								\
+		uint32_t val4;						\
+									\
+		val4 = a_onchip_fifo_mem_core_read(			\
+		    (sc)->atse_rxc_mem_res,				\
+		    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_EVENT,		\
+		    "RX_EVENT", __func__, __LINE__);			\
+		if (val4 != 0x00)					\
+			a_onchip_fifo_mem_core_write(			\
+			    (sc)->atse_rxc_mem_res,			\
+			    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_EVENT,	\
+			    val4, "RX_EVENT", __func__, __LINE__);	\
+	} while(0)
+#define	ATSE_TX_EVENT_CLEAR(sc)						\
+	do {								\
+		uint32_t val4;						\
+									\
+		val4 = a_onchip_fifo_mem_core_read(			\
+		    (sc)->atse_txc_mem_res,				\
+		    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_EVENT,		\
+		    "TX_EVENT", __func__, __LINE__);			\
+		if (val4 != 0x00)					\
+			a_onchip_fifo_mem_core_write(			\
+			    (sc)->atse_txc_mem_res,			\
+			    A_ONCHIP_FIFO_MEM_CORE_STATUS_REG_EVENT,	\
+			    val4, "TX_EVENT", __func__, __LINE__);	\
+	} while(0)
+
+#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,				\
+	    "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_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,				\
+	    "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__)
+
+/*
+ * Register space access macros.
+ */
+static inline void
+csr_write_4(struct atse_softc *sc, uint32_t reg, uint32_t val4,
+    const char *f, const int l)
+{
+
+	val4 = htole32(val4);
+	DPRINTF("[%s:%d] CSR W %s 0x%08x (0x%08x) = 0x%08x\n", f, l,
+	    "atse_mem_res", reg, reg * 4, val4);
+	bus_write_4(sc->atse_mem_res, reg * 4, val4);
+}
+
+static inline uint32_t
+csr_read_4(struct atse_softc *sc, uint32_t reg, const char *f, const int l)
+{
+	uint32_t val4;
+
+	val4 = le32toh(bus_read_4(sc->atse_mem_res, reg * 4));
+	DPRINTF("[%s:%d] CSR R %s 0x%08x (0x%08x) = 0x%08x\n", f, l, 
+	    "atse_mem_res", reg, reg * 4, val4);
+	return (val4);
+}
+
+/*
+ * See page 5-2 that it's all dword offsets and the MS 16 bits need to be zero
+ * on write and ignored on read.
+ */
+static inline void
+pxx_write_2(struct atse_softc *sc, bus_addr_t bmcr, uint32_t reg, uint16_t val,
+    const char *f, const int l, const char *s)
+{
+	uint32_t val4;
+
+	val4 = htole32(val & 0x0000ffff);
+	DPRINTF("[%s:%d] %s W %s 0x%08x (0x%08jx) = 0x%08x\n", f, l, s,
+	    "atse_mem_res", reg, (bmcr + reg) * 4, val4);
+	bus_write_4(sc->atse_mem_res, (bmcr + reg) * 4, val4);
+}
+
+static inline uint16_t
+pxx_read_2(struct atse_softc *sc, bus_addr_t bmcr, uint32_t reg, const char *f,
+    const int l, const char *s)
+{
+	uint32_t val4;
+	uint16_t val;
+
+	val4 = bus_read_4(sc->atse_mem_res, (bmcr + reg) * 4);
+	val = le32toh(val4) & 0x0000ffff;
+	DPRINTF("[%s:%d] %s R %s 0x%08x (0x%08jx) = 0x%04x\n", f, l, s,
+	    "atse_mem_res", reg, (bmcr + reg) * 4, val);
+	return (val);
+}
+
+#define	CSR_WRITE_4(sc, reg, val)	\
+	csr_write_4((sc), (reg), (val), __func__, __LINE__)
+#define	CSR_READ_4(sc, reg)		\
+	csr_read_4((sc), (reg), __func__, __LINE__)
+#define	PCS_WRITE_2(sc, reg, val)	\
+	pxx_write_2((sc), sc->atse_bmcr0, (reg), (val), __func__, __LINE__, \
+	    "PCS")
+#define	PCS_READ_2(sc, reg)		\
+	pxx_read_2((sc), sc->atse_bmcr0, (reg), __func__, __LINE__, "PCS")
+#define	PHY_WRITE_2(sc, reg, val)	\
+	pxx_write_2((sc), sc->atse_bmcr1, (reg), (val), __func__, __LINE__, \
+	    "PHY")
+#define	PHY_READ_2(sc, reg)		\
+	pxx_read_2((sc), sc->atse_bmcr1, (reg), __func__, __LINE__, "PHY")
+
+static void atse_tick(void *);
+static int atse_detach(device_t);
+
+devclass_t atse_devclass;
+
+static int
+atse_tx_locked(struct atse_softc *sc, int *sent)
+{
+	struct mbuf *m;
+	uint32_t val4, fill_level;
+	int c;
+
+	ATSE_LOCK_ASSERT(sc);
+
+	m = sc->atse_tx_m;
+	KASSERT(m != NULL, ("%s: m is null: sc=%p", __func__, sc));
+	KASSERT(m->m_flags & M_PKTHDR, ("%s: not a pkthdr: m=%p", __func__, m));
+
+	/*
+	 * Copy to buffer to minimize our pain as we can only store
+	 * double words which, after the first mbuf gets out of alignment
+	 * quite quickly.
+	 */
+	if (sc->atse_tx_m_offset == 0) {
+		m_copydata(m, 0, m->m_pkthdr.len, sc->atse_tx_buf);
+		sc->atse_tx_buf_len = m->m_pkthdr.len;
+	}
+
+	fill_level = ATSE_TX_READ_FILL_LEVEL(sc);
+#if 0	/* Returns 0xdeadc0de. */
+	val4 = ATSE_TX_META_READ(sc);
+#endif
+	if (sc->atse_tx_m_offset == 0) {
+		/* Write start of packet. */
+		val4 = A_ONCHIP_FIFO_MEM_CORE_SOP;
+		val4 &= ~A_ONCHIP_FIFO_MEM_CORE_EOP;
+		ATSE_TX_META_WRITE(sc, val4);
+	}
+
+	/* TX FIFO is single clock mode, so we have the full FIFO. */
+	c = 0;
+	while ((sc->atse_tx_buf_len - sc->atse_tx_m_offset) > 4 &&
+	     fill_level < AVALON_FIFO_TX_BASIC_OPTS_DEPTH) {
+
+		bcopy(&sc->atse_tx_buf[sc->atse_tx_m_offset], &val4,
+		    sizeof(val4));
+		ATSE_TX_DATA_WRITE(sc, val4);
+		sc->atse_tx_m_offset += sizeof(val4);
+		c += sizeof(val4);
+
+		fill_level++;
+		if (fill_level == AVALON_FIFO_TX_BASIC_OPTS_DEPTH)
+			fill_level = ATSE_TX_READ_FILL_LEVEL(sc);
+	}
+	if (sent != NULL)
+		*sent += c;
+
+	/* Set EOP *before* writing the last symbol. */
+	if (sc->atse_tx_m_offset >= (sc->atse_tx_buf_len - 4) &&
+	    fill_level < AVALON_FIFO_TX_BASIC_OPTS_DEPTH) {
+		int leftm;
+		uint32_t x;
+
+		/* Set EndOfPacket. */
+		val4 = A_ONCHIP_FIFO_MEM_CORE_EOP;
+		/* Set EMPTY. */
+		leftm = sc->atse_tx_buf_len - sc->atse_tx_m_offset;
+		val4 |= ((4 - leftm) << A_ONCHIP_FIFO_MEM_CORE_EMPTY_SHIFT);
+		x = val4;
+		ATSE_TX_META_WRITE(sc, val4);
+
+		/* Write last symbol. */
+		val4 = 0;
+		bcopy(sc->atse_tx_buf + sc->atse_tx_m_offset, &val4, leftm);
+		ATSE_TX_DATA_WRITE(sc, val4);
+
+		if (sent != NULL)
+			*sent += leftm;
+
+		/* OK, the packet is gone. */
+		sc->atse_tx_m = NULL;
+		sc->atse_tx_m_offset = 0;
+
+		/* If anyone is interested give them a copy. */
+		BPF_MTAP(sc->atse_ifp, m);
+
+		m_freem(m);
+		return (0);
+	}
+
+	return (EBUSY);
+}
+
+static void
+atse_start_locked(struct ifnet *ifp)
+{
+	struct atse_softc *sc;
+	int error, sent;
+
+	sc = ifp->if_softc;
+	ATSE_LOCK_ASSERT(sc);
+
+	if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
+	    IFF_DRV_RUNNING || (sc->atse_flags & ATSE_FLAGS_LINK) == 0)
+		return;
+
+#if 1
+	/* 
+	 * Disable the watchdog while sending, we are batching packets.
+	 * Though we should never reach 5 seconds, and are holding the lock,
+	 * but who knows.
+	 */
+	sc->atse_watchdog_timer = 0;
+#endif
+
+	if (sc->atse_tx_m != NULL) {
+		error = atse_tx_locked(sc, &sent);
+		if (error != 0)
+			goto done;
+	}
+	/* We have more space to send so continue ... */
+	for (; !IFQ_DRV_IS_EMPTY(&ifp->if_snd); ) {
+
+		IFQ_DRV_DEQUEUE(&ifp->if_snd, sc->atse_tx_m);
+		sc->atse_tx_m_offset = 0;
+		if (sc->atse_tx_m == NULL)
+			break;
+		error = atse_tx_locked(sc, &sent);
+		if (error != 0)
+			goto done;
+	}
+
+done:
+	/* If the IP core walks into Nekromanteion try to bail out. */
+	if (sent > 0)
+		sc->atse_watchdog_timer = ATSE_WATCHDOG_TIME;
+}
+
+static void
+atse_start(struct ifnet *ifp)
+{
+	struct atse_softc *sc;
+
+	sc = ifp->if_softc;
+	ATSE_LOCK(sc);
+	atse_start_locked(ifp);
+	ATSE_UNLOCK(sc);
+}
+
+static int
+atse_stop_locked(struct atse_softc *sc)
+{
+	struct ifnet *ifp;
+	uint32_t mask, val4;
+	int i;
+
+	ATSE_LOCK_ASSERT(sc);
+
+	sc->atse_watchdog_timer = 0;
+	callout_stop(&sc->atse_tick);
+
+	ifp = sc->atse_ifp;
+	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+	ATSE_RX_INTR_DISABLE(sc);
+	ATSE_TX_INTR_DISABLE(sc);
+	ATSE_RX_EVENT_CLEAR(sc);
+	ATSE_TX_EVENT_CLEAR(sc);
+
+	/* Disable MAC transmit and receive datapath. */
+	mask = BASE_CFG_COMMAND_CONFIG_TX_ENA|BASE_CFG_COMMAND_CONFIG_RX_ENA;
+	val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+	val4 &= ~mask;
+	CSR_WRITE_4(sc, BASE_CFG_COMMAND_CONFIG, val4);
+	/* Wait for bits to be cleared; i=100 is excessive. */
+	for (i = 0; i < 100; i++) {
+		val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+		if ((val4 & mask) == 0)
+			break;
+		DELAY(10);
+	}
+	if ((val4 & mask) != 0)
+		device_printf(sc->atse_dev, "Disabling MAC TX/RX timed out.\n");
+		/* Punt. */
+
+	sc->atse_flags &= ~ATSE_FLAGS_LINK;
+
+	/* XXX-BZ free the RX/TX rings. */
+
+	return (0);
+}
+
+static uint8_t
+atse_mchash(struct atse_softc *sc __unused, const uint8_t *addr)
+{
+	int i, j;
+	uint8_t x, y;
+
+	x = 0;
+	for (i = 0; i < ETHER_ADDR_LEN; i++) {
+		y = addr[i] & 0x01;
+		for (j = 1; j < 8; j++)
+			y ^= (addr[i] >> j) & 0x01;
+		x |= (y << i);
+	}
+	return (x);
+}
+
+static int
+atse_rxfilter_locked(struct atse_softc *sc)
+{
+	struct ifnet *ifp;
+	struct ifmultiaddr *ifma;
+	uint32_t val4;
+	int i;
+
+	/* XXX-BZ can we find out if we have the MHASH synthesized? */
+	val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+	/* For simplicity always hash full 48 bits of addresses. */
+	if ((val4 & BASE_CFG_COMMAND_CONFIG_MHASH_SEL) != 0)
+		val4 &= ~BASE_CFG_COMMAND_CONFIG_MHASH_SEL;
+
+	ifp = sc->atse_ifp;
+	if (ifp->if_flags & IFF_PROMISC)
+		val4 |= BASE_CFG_COMMAND_CONFIG_PROMIS_EN;
+	else
+		val4 &= ~BASE_CFG_COMMAND_CONFIG_PROMIS_EN;
+
+	CSR_WRITE_4(sc, BASE_CFG_COMMAND_CONFIG, val4);
+
+	if (ifp->if_flags & IFF_ALLMULTI) {
+		/* Accept all multicast addresses. */
+		for (i = 0; i <= MHASH_LEN; i++)
+			CSR_WRITE_4(sc, MHASH_START + i, 0x1);
+	} else {
+		/* 
+		 * Can hold MHASH_LEN entries.
+		 * XXX-BZ bitstring.h would be more general.
+		 */
+		uint64_t h;
+
+		h = 0;
+		/*
+		 * Re-build and re-program hash table.  First build the
+		 * bit-field "yes" or "no" for each slot per address, then
+		 * do all the programming afterwards.
+		 */
+		if_maddr_rlock(ifp);
+		TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
+			if (ifma->ifma_addr->sa_family != AF_LINK)
+				continue;
+
+			h |= (1 << atse_mchash(sc,
+			    LLADDR((struct sockaddr_dl *)ifma->ifma_addr)));
+		}
+		if_maddr_runlock(ifp);
+		for (i = 0; i <= MHASH_LEN; i++)
+			CSR_WRITE_4(sc, MHASH_START + i,
+			    (h & (1 << i)) ? 0x01 : 0x00);
+	}
+
+	return (0);
+}
+
+static int
+atse_ethernet_option_bits_read_fdt(device_t dev)
+{
+	struct resource *res;
+	device_t fdev;
+	int i, rid;
+
+	if (atse_ethernet_option_bits_flag & ATSE_ETHERNET_OPTION_BITS_READ)
+		return (0);
+
+	fdev = device_find_child(device_get_parent(dev), "cfi", 0);
+	if (fdev == NULL)
+		return (ENOENT);
+
+	rid = 0;
+	res = bus_alloc_resource_any(fdev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE | RF_SHAREABLE);
+	if (res == NULL)
+		return (ENXIO);
+
+	for (i = 0; i < ALTERA_ETHERNET_OPTION_BITS_LEN; i++)
+		atse_ethernet_option_bits[i] = bus_read_1(res,
+		    ALTERA_ETHERNET_OPTION_BITS_OFF + i);
+
+	bus_release_resource(fdev, SYS_RES_MEMORY, rid, res);
+	atse_ethernet_option_bits_flag |= ATSE_ETHERNET_OPTION_BITS_READ;
+
+	return (0);
+}
+
+static int
+atse_ethernet_option_bits_read(device_t dev)
+{
+	int error;
+
+	error = atse_ethernet_option_bits_read_fdt(dev);
+	if (error == 0)
+		return (0);
+	
+	device_printf(dev, "Cannot read Ethernet addresses from flash.\n");
+	return (error);
+}
+
+static int
+atse_get_eth_address(struct atse_softc *sc)
+{
+	unsigned long hostid;
+	uint32_t val4;
+	int unit;
+
+	/*
+	 * Make sure to only ever do this once.  Otherwise a reset would
+	 * possibly change our ethernet address, which is not good at all.
+	 */
+	if (sc->atse_eth_addr[0] != 0x00 || sc->atse_eth_addr[1] != 0x00 ||
+	    sc->atse_eth_addr[2] != 0x00)
+		return (0);
+
+	if ((atse_ethernet_option_bits_flag &
+	    ATSE_ETHERNET_OPTION_BITS_READ) == 0)
+		goto get_random;
+
+	val4 = atse_ethernet_option_bits[0] << 24;
+	val4 |= atse_ethernet_option_bits[1] << 16;
+	val4 |= atse_ethernet_option_bits[2] << 8;
+	val4 |= atse_ethernet_option_bits[3];
+	/* They chose "safe". */
+	if (val4 != le32toh(0x00005afe)) {
+		device_printf(sc->atse_dev, "Magic '5afe' is not safe: 0x%08x. "
+		    "Falling back to random numbers for hardware address.\n",
+		     val4);
+		goto get_random;
+	}
+
+	sc->atse_eth_addr[0] = atse_ethernet_option_bits[4];
+	sc->atse_eth_addr[1] = atse_ethernet_option_bits[5];
+	sc->atse_eth_addr[2] = atse_ethernet_option_bits[6];
+	sc->atse_eth_addr[3] = atse_ethernet_option_bits[7];
+	sc->atse_eth_addr[4] = atse_ethernet_option_bits[8];
+	sc->atse_eth_addr[5] = atse_ethernet_option_bits[9];
+
+	/* Handle factory default ethernet addresss: 00:07:ed:ff:ed:15 */
+	if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x07 &&
+	    sc->atse_eth_addr[2] == 0xed && sc->atse_eth_addr[3] == 0xff &&
+	    sc->atse_eth_addr[4] == 0xed && sc->atse_eth_addr[5] == 0x15) {
+
+		device_printf(sc->atse_dev, "Factory programmed Ethernet "
+		    "hardware address blacklisted.  Falling back to random "
+		    "address to avoid collisions.\n");
+		device_printf(sc->atse_dev, "Please re-program your flash.\n");
+		goto get_random;
+	}
+
+	if (sc->atse_eth_addr[0] == 0x00 && sc->atse_eth_addr[1] == 0x00 &&
+	    sc->atse_eth_addr[2] == 0x00 && sc->atse_eth_addr[3] == 0x00 &&
+	    sc->atse_eth_addr[4] == 0x00 && sc->atse_eth_addr[5] == 0x00) {
+		device_printf(sc->atse_dev, "All zero's Ethernet hardware "
+		    "address blacklisted.  Falling back to random address.\n");
+		device_printf(sc->atse_dev, "Please re-program your flash.\n");
+		goto get_random;
+	}
+
+	if (ETHER_IS_MULTICAST(sc->atse_eth_addr)) {
+		device_printf(sc->atse_dev, "Multicast Ethernet hardware "
+		    "address blacklisted.  Falling back to random address.\n");
+		device_printf(sc->atse_dev, "Please re-program your flash.\n");
+		goto get_random;
+	}
+
+	/*
+	 * If we find an Altera prefixed address with a 0x0 ending
+	 * adjust by device unit.  If not and this is not the first
+	 * Ethernet, go to random.
+	 */
+	unit = device_get_unit(sc->atse_dev);
+	if (unit == 0x00)
+		return (0);
+
+	if (unit > 0x0f) {
+		device_printf(sc->atse_dev, "We do not support Ethernet "
+		    "addresses for more than 16 MACs. Falling back to "
+		    "random hadware address.\n");
+		goto get_random;
+	}
+	if ((sc->atse_eth_addr[0] & ~0x2) != 0 ||
+	    sc->atse_eth_addr[1] != 0x07 || sc->atse_eth_addr[2] != 0xed ||
+	    (sc->atse_eth_addr[5] & 0x0f) != 0x0) {
+		device_printf(sc->atse_dev, "Ethernet address not meeting our "
+		    "multi-MAC standards. Falling back to random hadware "
+		    "address.\n");
+		goto get_random;
+	}
+	sc->atse_eth_addr[5] |= (unit & 0x0f);
+
+	return (0);
+
+get_random:
+	/*
+	 * Fall back to random code we also use on bridge(4).
+	 */
+	getcredhostid(curthread->td_ucred, &hostid);
+	if (hostid == 0) {
+		arc4rand(sc->atse_eth_addr, ETHER_ADDR_LEN, 1);
+		sc->atse_eth_addr[0] &= ~1;/* clear multicast bit */
+		sc->atse_eth_addr[0] |= 2; /* set the LAA bit */
+	} else {
+		sc->atse_eth_addr[0] = 0x2;
+		sc->atse_eth_addr[1] = (hostid >> 24)	& 0xff;
+		sc->atse_eth_addr[2] = (hostid >> 16)	& 0xff;
+		sc->atse_eth_addr[3] = (hostid >> 8 )	& 0xff;
+		sc->atse_eth_addr[4] = hostid		& 0xff;
+		sc->atse_eth_addr[5] = sc->atse_unit	& 0xff;
+	}
+
+	return (0);
+}
+
+static int
+atse_set_eth_address(struct atse_softc *sc, int n)
+{
+	uint32_t v0, v1;
+
+	v0 = (sc->atse_eth_addr[3] << 24) | (sc->atse_eth_addr[2] << 16) |
+	    (sc->atse_eth_addr[1] << 8) | sc->atse_eth_addr[0];
+	v1 = (sc->atse_eth_addr[5] << 8) | sc->atse_eth_addr[4];
+
+	if (n & ATSE_ETH_ADDR_DEF) {
+		CSR_WRITE_4(sc, BASE_CFG_MAC_0, v0);
+		CSR_WRITE_4(sc, BASE_CFG_MAC_1, v1);
+	}
+	if (n & ATSE_ETH_ADDR_SUPP1) {
+		CSR_WRITE_4(sc, SUPPL_ADDR_SMAC_0_0, v0);
+		CSR_WRITE_4(sc, SUPPL_ADDR_SMAC_0_1, v1);
+	}
+	if (n & ATSE_ETH_ADDR_SUPP2) {
+		CSR_WRITE_4(sc, SUPPL_ADDR_SMAC_1_0, v0);
+		CSR_WRITE_4(sc, SUPPL_ADDR_SMAC_1_1, v1);
+	}
+	if (n & ATSE_ETH_ADDR_SUPP3) {
+		CSR_WRITE_4(sc, SUPPL_ADDR_SMAC_2_0, v0);
+		CSR_WRITE_4(sc, SUPPL_ADDR_SMAC_2_1, v1);
+	}
+	if (n & ATSE_ETH_ADDR_SUPP4) {
+		CSR_WRITE_4(sc, SUPPL_ADDR_SMAC_3_0, v0);
+		CSR_WRITE_4(sc, SUPPL_ADDR_SMAC_3_1, v1);
+	}
+
+	return (0);
+}
+
+static int
+atse_reset(struct atse_softc *sc)
+{
+	int i;
+	uint32_t val4, mask;
+	uint16_t val;
+
+	/* 1. External PHY Initialization using MDIO. */
+	/*
+	 * We select the right MDIO space in atse_attach() and let MII do
+	 * anything else.
+	 */
+
+	/* 2. PCS Configuration Register Initialization. */
+	/* a. Set auto negotiation link timer to 1.6ms for SGMII. */
+	PCS_WRITE_2(sc, PCS_EXT_LINK_TIMER_0, 0x0D40);
+	PCS_WRITE_2(sc, PCS_EXT_LINK_TIMER_1, 0x0003);
+
+	/* b. Configure SGMII. */
+	val = PCS_EXT_IF_MODE_SGMII_ENA|PCS_EXT_IF_MODE_USE_SGMII_AN;
+	PCS_WRITE_2(sc, PCS_EXT_IF_MODE, val);
+
+	/* c. Enable auto negotiation. */
+	/* Ignore Bits 6,8,13; should be set,set,unset. */
+	val = PCS_READ_2(sc, PCS_CONTROL);
+	val &= ~(PCS_CONTROL_ISOLATE|PCS_CONTROL_POWERDOWN);
+	val &= ~PCS_CONTROL_LOOPBACK;		/* Make this a -link1 option? */
+	val |= PCS_CONTROL_AUTO_NEGOTIATION_ENABLE;
+	PCS_WRITE_2(sc, PCS_CONTROL, val);
+
+	/* d. PCS reset. */
+	val = PCS_READ_2(sc, PCS_CONTROL);
+	val |= PCS_CONTROL_RESET;
+	PCS_WRITE_2(sc, PCS_CONTROL, val);
+	/* Wait for reset bit to clear; i=100 is excessive. */
+	for (i = 0; i < 100; i++) {
+		val = PCS_READ_2(sc, PCS_CONTROL);
+		if ((val & PCS_CONTROL_RESET) == 0)
+			break;
+		DELAY(10);
+	}
+	if ((val & PCS_CONTROL_RESET) != 0) {
+		device_printf(sc->atse_dev, "PCS reset timed out.\n");
+		return (ENXIO);
+	}
+
+	/* 3. MAC Configuration Register Initialization. */
+	/* a. Disable MAC transmit and receive datapath. */
+	mask = BASE_CFG_COMMAND_CONFIG_TX_ENA|BASE_CFG_COMMAND_CONFIG_RX_ENA;
+	val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+	val4 &= ~mask;
+	/* Samples in the manual do have the SW_RESET bit set here, why? */
+	CSR_WRITE_4(sc, BASE_CFG_COMMAND_CONFIG, val4);
+	/* Wait for bits to be cleared; i=100 is excessive. */
+	for (i = 0; i < 100; i++) {
+		val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+		if ((val4 & mask) == 0)
+			break;
+		DELAY(10);
+	}
+	if ((val4 & mask) != 0) {
+		device_printf(sc->atse_dev, "Disabling MAC TX/RX timed out.\n");
+		return (ENXIO);
+	}
+	/* b. MAC FIFO configuration. */
+	CSR_WRITE_4(sc, BASE_CFG_TX_SECTION_EMPTY, FIFO_DEPTH_TX - 16);
+	CSR_WRITE_4(sc, BASE_CFG_TX_ALMOST_FULL, 3);
+	CSR_WRITE_4(sc, BASE_CFG_TX_ALMOST_EMPTY, 8);
+	CSR_WRITE_4(sc, BASE_CFG_RX_SECTION_EMPTY, FIFO_DEPTH_RX - 16);
+	CSR_WRITE_4(sc, BASE_CFG_RX_ALMOST_FULL, 8);
+	CSR_WRITE_4(sc, BASE_CFG_RX_ALMOST_EMPTY, 8);
+#if 0
+	CSR_WRITE_4(sc, BASE_CFG_TX_SECTION_FULL, 16);
+	CSR_WRITE_4(sc, BASE_CFG_RX_SECTION_FULL, 16);
+#else
+	/* For store-and-forward mode, set this threshold to 0. */
+	CSR_WRITE_4(sc, BASE_CFG_TX_SECTION_FULL, 0);
+	CSR_WRITE_4(sc, BASE_CFG_RX_SECTION_FULL, 0);
+#endif
+	/* c. MAC address configuration. */
+	/* Also intialize supplementary addresses to our primary one. */
+	/* XXX-BZ FreeBSD really needs to grow and API for using these. */
+	atse_get_eth_address(sc);
+	atse_set_eth_address(sc, ATSE_ETH_ADDR_ALL);
+
+	/* d. MAC function configuration. */
+	CSR_WRITE_4(sc, BASE_CFG_FRM_LENGTH, 1518);	/* Default. */
+	CSR_WRITE_4(sc, BASE_CFG_TX_IPG_LENGTH, 12);
+	CSR_WRITE_4(sc, BASE_CFG_PAUSE_QUANT, 0xFFFF);
+
+	val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+	/*	
+	 * If 1000BASE-X/SGMII PCS is initialized, set the ETH_SPEED (bit 3)
+	 * and ENA_10 (bit 25) in command_config register to 0.  If half duplex
+	 * is reported in the PHY/PCS status register, set the HD_ENA (bit 10)
+	 * to 1 in command_config register.
+	 * BZ: We shoot for 1000 instead.
+	 */
+#if 0
+	val4 |= BASE_CFG_COMMAND_CONFIG_ETH_SPEED;
+#else
+	val4 &= ~BASE_CFG_COMMAND_CONFIG_ETH_SPEED;
+#endif
+	val4 &= ~BASE_CFG_COMMAND_CONFIG_ENA_10;
+#if 0
+	/*
+	 * We do not want to set this, otherwise, we could not even send
+	 * random raw ethernet frames for various other research.  By default
+	 * FreeBSD will use the right ether source address.
+	 */
+	val4 |= BASE_CFG_COMMAND_CONFIG_TX_ADDR_INS;
+#endif
+	val4 |= BASE_CFG_COMMAND_CONFIG_PAD_EN;
+	val4 &= ~BASE_CFG_COMMAND_CONFIG_CRC_FWD;
+#if 0
+	val4 |= BASE_CFG_COMMAND_CONFIG_CNTL_FRM_ENA;
+#endif
+#if 1
+	val4 |= BASE_CFG_COMMAND_CONFIG_RX_ERR_DISC;
+#endif
+	val &= ~BASE_CFG_COMMAND_CONFIG_LOOP_ENA;		/* link0? */
+	CSR_WRITE_4(sc, BASE_CFG_COMMAND_CONFIG, val4);
+
+	/*
+	 * Make sure we do not enable 32bit alignment;  FreeBSD cannot
+	 * cope with the additional padding (though we should!?).
+	 * Also make sure we get the CRC appended.
+	 */
+	val4 = CSR_READ_4(sc, TX_CMD_STAT);
+	val4 &= ~(TX_CMD_STAT_OMIT_CRC|TX_CMD_STAT_TX_SHIFT16);
+	CSR_WRITE_4(sc, TX_CMD_STAT, val4);
+	val4 = CSR_READ_4(sc, RX_CMD_STAT);
+	val4 &= ~RX_CMD_STAT_RX_SHIFT16;
+	CSR_WRITE_4(sc, RX_CMD_STAT, val4);
+
+	/* e. Reset MAC. */
+	val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+	val4 |= BASE_CFG_COMMAND_CONFIG_SW_RESET;
+	CSR_WRITE_4(sc, BASE_CFG_COMMAND_CONFIG, val4);
+	/* Wait for bits to be cleared; i=100 is excessive. */
+	for (i = 0; i < 100; i++) {
+		val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+		if ((val4 & BASE_CFG_COMMAND_CONFIG_SW_RESET) == 0)
+			break;
+		DELAY(10);
+	}
+	if ((val4 & BASE_CFG_COMMAND_CONFIG_SW_RESET) != 0) {
+		device_printf(sc->atse_dev, "MAC reset timed out.\n");
+		return (ENXIO);
+	}
+	
+	/* f. Enable MAC transmit and receive datapath. */
+	mask = BASE_CFG_COMMAND_CONFIG_TX_ENA|BASE_CFG_COMMAND_CONFIG_RX_ENA;
+	val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+	val4 |= mask;
+	CSR_WRITE_4(sc, BASE_CFG_COMMAND_CONFIG, val4);
+	/* Wait for bits to be cleared; i=100 is excessive. */
+	for (i = 0; i < 100; i++) {
+		val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+		if ((val4 & mask) == mask)
+			break;
+		DELAY(10);
+	}
+	if ((val4 & mask) != mask) {
+		device_printf(sc->atse_dev, "Enabling MAC TX/RX timed out.\n");
+		return (ENXIO);
+	}
+
+	return (0);
+}
+
+static void
+atse_init_locked(struct atse_softc *sc)
+{
+	struct ifnet *ifp;
+	struct mii_data *mii;
+	uint8_t *eaddr;
+
+	ATSE_LOCK_ASSERT(sc);
+	ifp = sc->atse_ifp;
+
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+		return;
+
+	/*
+	 * Must update the ether address if changed.  Given we do not handle
+	 * in atse_ioctl() but it's in the general framework, just always
+	 * do it here before atse_reset().
+	 */
+	eaddr = IF_LLADDR(sc->atse_ifp);
+	bcopy(eaddr, &sc->atse_eth_addr, ETHER_ADDR_LEN);
+
+	/* Make things frind to halt, cleanup, ... */
+	atse_stop_locked(sc);
+	/* ... reset, ... */
+	atse_reset(sc);
+
+	/* ... and fire up the engine again. */
+	atse_rxfilter_locked(sc);
+
+	/* Memory rings?  DMA engine? */
+
+	sc->atse_rx_buf_len = 0;
+	sc->atse_flags &= ATSE_FLAGS_LINK;	/* Preserve. */
+
+#ifdef DEVICE_POLLING
+        /* Only enable interrupts if we are not polling. */
+	if (ifp->if_capenable & IFCAP_POLLING) {
+		ATSE_RX_INTR_DISABLE(sc);
+		ATSE_TX_INTR_DISABLE(sc);
+		ATSE_RX_EVENT_CLEAR(sc);
+		ATSE_TX_EVENT_CLEAR(sc);
+	} else
+#endif
+	{
+		ATSE_RX_INTR_ENABLE(sc);
+		ATSE_TX_INTR_ENABLE(sc);
+	}
+
+	mii = device_get_softc(sc->atse_miibus);
+
+	sc->atse_flags &= ~ATSE_FLAGS_LINK;
+	mii_mediachg(mii);
+
+	ifp->if_drv_flags |= IFF_DRV_RUNNING;
+	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+
+	callout_reset(&sc->atse_tick, hz, atse_tick, sc);
+}
+
+static void
+atse_init(void *xsc)
+{
+	struct atse_softc *sc;
+
+	sc = (struct atse_softc *)xsc;
+	ATSE_LOCK(sc);
+	atse_init_locked(sc);
+	ATSE_UNLOCK(sc);
+}
+
+static int
+atse_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
+{
+	struct atse_softc *sc;
+	struct ifreq *ifr;
+	int error, mask;
+
+
+	error = 0;
+	sc = ifp->if_softc;
+	ifr = (struct ifreq *)data;
+
+	switch (command) {
+	case SIOCSIFFLAGS:
+		ATSE_LOCK(sc);
+		if (ifp->if_flags & IFF_UP) {
+			if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0 &&
+			    ((ifp->if_flags ^ sc->atse_if_flags) &
+			    (IFF_PROMISC | IFF_ALLMULTI)) != 0)
+				atse_rxfilter_locked(sc);
+			else
+				atse_init_locked(sc);
+		} else if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+			atse_stop_locked(sc);
+                sc->atse_if_flags = ifp->if_flags;
+		ATSE_UNLOCK(sc);
+		break;
+	case SIOCSIFCAP:
+		ATSE_LOCK(sc);
+		mask = ifr->ifr_reqcap ^ ifp->if_capenable;
+#ifdef DEVICE_POLLING
+		if ((mask & IFCAP_POLLING) != 0 &&
+		    (IFCAP_POLLING & ifp->if_capabilities) != 0) {
+			ifp->if_capenable ^= IFCAP_POLLING;
+			if ((IFCAP_POLLING & ifp->if_capenable) != 0) {
+
+				error = ether_poll_register(atse_poll, ifp);
+				if (error != 0) {
+					ATSE_UNLOCK(sc);
+					break;
+				}
+				/* Disable interrupts. */
+				ATSE_RX_INTR_DISABLE(sc);
+				ATSE_TX_INTR_DISABLE(sc);
+				ATSE_RX_EVENT_CLEAR(sc);
+				ATSE_TX_EVENT_CLEAR(sc);
+
+			/*
+			 * Do not allow disabling of polling if we do
+			 * not have interrupts.
+			 */
+			} else if (sc->atse_rx_irq_res != NULL ||
+			    sc->atse_tx_irq_res != NULL) {
+				error = ether_poll_deregister(ifp);
+				/* Enable interrupts. */
+				ATSE_RX_INTR_ENABLE(sc);
+				ATSE_TX_INTR_ENABLE(sc);
+			} else {
+				ifp->if_capenable ^= IFCAP_POLLING;
+				error = EINVAL;
+			}
+		}
+#endif /* DEVICE_POLLING */
+		ATSE_UNLOCK(sc);
+		break;
+	case SIOCADDMULTI:
+	case SIOCDELMULTI:
+		ATSE_LOCK(sc);
+		atse_rxfilter_locked(sc);
+		ATSE_UNLOCK(sc);
+		break;
+	case SIOCGIFMEDIA:
+	case SIOCSIFMEDIA:
+	{
+		struct mii_data *mii;
+		struct ifreq *ifr;
+
+		mii = device_get_softc(sc->atse_miibus);
+		ifr = (struct ifreq *)data;
+		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
+		break;
+	}
+	default:
+		error = ether_ioctl(ifp, command, data);
+		break;
+	}
+
+	return (error);
+}
+
+static void
+atse_watchdog(struct atse_softc *sc)
+{
+
+	ATSE_LOCK_ASSERT(sc);
+
+	if (sc->atse_watchdog_timer == 0 || --sc->atse_watchdog_timer > 0)
+		return;
+
+	device_printf(sc->atse_dev, "watchdog timeout\n");
+	sc->atse_ifp->if_oerrors++;
+
+	sc->atse_ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
+	atse_init_locked(sc);
+
+	if (!IFQ_DRV_IS_EMPTY(&sc->atse_ifp->if_snd))
+		atse_start_locked(sc->atse_ifp);
+}
+
+static void
+atse_tick(void *xsc)
+{
+	struct atse_softc *sc;
+	struct mii_data *mii;
+	struct ifnet *ifp;
+
+	sc = (struct atse_softc *)xsc;
+	ATSE_LOCK_ASSERT(sc);
+	ifp = sc->atse_ifp;
+
+	mii = device_get_softc(sc->atse_miibus);
+	mii_tick(mii);
+	atse_watchdog(sc);
+	if ((sc->atse_flags & ATSE_FLAGS_LINK) == 0)
+		atse_miibus_statchg(sc->atse_dev);
+	callout_reset(&sc->atse_tick, hz, atse_tick, sc);
+}
+
+/*
+ * Set media options.
+ */
+static int 
+atse_ifmedia_upd(struct ifnet *ifp)
+{
+	struct atse_softc *sc;
+	struct mii_data *mii;
+	struct mii_softc *miisc;
+	int error;
+
+	sc = ifp->if_softc;
+
+	ATSE_LOCK(sc);
+	mii = device_get_softc(sc->atse_miibus);
+	LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
+		PHY_RESET(miisc);
+	error = mii_mediachg(mii);
+	ATSE_UNLOCK(sc);
+
+	return (error);
+}
+
+static void
+atse_update_rx_err(struct atse_softc *sc, uint32_t mask)
+{
+	int i;
+
+	/* RX error are 6 bits, we only know 4 of them. */
+	for (i = 0; i < ATSE_RX_ERR_MAX; i++)
+		if ((mask & (1 << i)) != 0)
+			sc->atse_rx_err[i]++;
+}
+
+static int
+atse_rx_locked(struct atse_softc *sc)
+{
+	struct ifnet *ifp;
+	struct mbuf *m;
+	uint32_t fill, i, j;
+	uint32_t data, meta;
+	int rx_npkts = 0;
+
+	ATSE_LOCK_ASSERT(sc);
+
+	ifp = sc->atse_ifp;
+	j = 0;
+	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_DONTWAIT, MT_DATA, M_PKTHDR);
+			if (m == NULL)
+				return (rx_npkts);
+			m->m_len = m->m_pkthdr.len = MCLBYTES;
+			/* Make sure upper layers will be aligned. */
+			m_adj(m, 2);
+			sc->atse_rx_m = m;
+		}
+
+		fill = ATSE_RX_READ_FILL_LEVEL(sc);
+		for (i = 0; i < fill; i++) {
+			/*
+			 * XXX-BZ for whatever reason the FIFO requires the
+			 * the data read before we can access the meta data.
+			 */
+			data = ATSE_RX_DATA_READ(sc);
+			meta = ATSE_RX_META_READ(sc);
+			if (meta & A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) {
+				/* XXX-BZ evaluate error. */
+				atse_update_rx_err(sc, ((meta &
+				    A_ONCHIP_FIFO_MEM_CORE_ERROR_MASK) >>
+				    A_ONCHIP_FIFO_MEM_CORE_ERROR_SHIFT) & 0xff);
+				ifp->if_ierrors++;
+				sc->atse_rx_buf_len = 0;
+				/*
+				 * Should still read till EOP or next SOP.
+				 *
+				 * XXX-BZ might also depend on
+				 * BASE_CFG_COMMAND_CONFIG_RX_ERR_DISC
+				 */
+				sc->atse_flags |= ATSE_FLAGS_ERROR;
+				return (rx_npkts);
+			}
+			if ((meta & A_ONCHIP_FIFO_MEM_CORE_CHANNEL_MASK) != 0)
+				device_printf(sc->atse_dev, "%s: unexpected "
+				    "channel %u\n", __func__, (meta &
+				    A_ONCHIP_FIFO_MEM_CORE_CHANNEL_MASK) >>
+				    A_ONCHIP_FIFO_MEM_CORE_CHANNEL_SHIFT);
+
+			if (meta & A_ONCHIP_FIFO_MEM_CORE_SOP) {
+				/*
+				 * There is no need to clear SOP between 1st
+				 * and subsequent packet data junks.
+				 */
+				if (sc->atse_rx_buf_len != 0 &&
+				    (sc->atse_flags & ATSE_FLAGS_SOP_SEEN) == 0)
+				{
+					device_printf(sc->atse_dev, "%s: SOP "
+					    "without empty buffer: %u\n",
+					    __func__, sc->atse_rx_buf_len);
+					/* XXX-BZ any better counter? */
+					ifp->if_ierrors++;
+				}
+				
+				if ((sc->atse_flags & ATSE_FLAGS_SOP_SEEN) == 0)
+				{
+					sc->atse_flags |= ATSE_FLAGS_SOP_SEEN;
+					sc->atse_rx_buf_len = 0;
+				}
+			}
+#if 0 /* We had to read the data before we could access meta data. See above. */
+			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) {
+				/*
+				 * XXX-BZ Error.  We need more mbufs and are
+				 * not setup for this yet.
+				 */
+				ifp->if_ierrors++;
+				sc->atse_flags |= ATSE_FLAGS_ERROR;
+			}
+			if ((sc->atse_flags & ATSE_FLAGS_ERROR) == 0)
+				/*
+				 * MUST keep this bcopy as m_data after m_adj
+				 * for IP header aligment is on half-word
+				 * and not word alignment.
+				 */
+				bcopy(&data, (uint8_t *)(sc->atse_rx_m->m_data +
+				    sc->atse_rx_buf_len), sizeof(data));
+			if (meta & A_ONCHIP_FIFO_MEM_CORE_EOP) {
+				uint8_t empty;
+
+				empty = (meta &
+				    A_ONCHIP_FIFO_MEM_CORE_EMPTY_MASK) >>
+				    A_ONCHIP_FIFO_MEM_CORE_EMPTY_SHIFT;
+				sc->atse_rx_buf_len += (4 - empty);
+
+				ifp->if_ipackets++;
+				rx_npkts++;
+
+				m = sc->atse_rx_m;
+				m->m_pkthdr.len = m->m_len =
+				    sc->atse_rx_buf_len;
+				sc->atse_rx_m = NULL;
+
+				sc->atse_rx_buf_len = 0;
+				sc->atse_flags &= ~ATSE_FLAGS_SOP_SEEN;
+				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;
+				}
+
+				m->m_pkthdr.rcvif = ifp;
+
+				ATSE_UNLOCK(sc);
+				(*ifp->if_input)(ifp, m);
+				ATSE_LOCK(sc);
+				goto outer;	/* Need a new mbuf. */
+			} else {
+				sc->atse_rx_buf_len += sizeof(data);
+			}
+		} /* for */
+
+	/* XXX-BZ could optimize in case of another packet waiting. */
+	} while ((meta & A_ONCHIP_FIFO_MEM_CORE_EOP) == 0 || fill > 0);
+
+	return (rx_npkts);
+}
+
+
+/*
+ * Report current media status.
+ */
+static void
+atse_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
+{
+	struct atse_softc *sc;
+	struct mii_data *mii;
+
+	sc = ifp->if_softc;
+
+	ATSE_LOCK(sc);
+	mii = device_get_softc(sc->atse_miibus);
+	mii_pollstat(mii);
+	ifmr->ifm_active = mii->mii_media_active;
+	ifmr->ifm_status = mii->mii_media_status;
+	ATSE_UNLOCK(sc);
+}
+
+static void
+atse_intr(void *arg)
+{
+	struct atse_softc *sc;
+	struct ifnet *ifp;
+	uint32_t rx, tx;
+
+	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
+
+	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);
+		}
+	}
+	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;
+#if 0
+		if (tx & (A_ONCHIP_FIFO_MEM_CORE_EVENT_EMPTY|
+		    A_ONCHIP_FIFO_MEM_CORE_EVENT_ALMOSTEMPTY))
+			atse_start_locked(ifp);
+#endif
+	}
+
+	/* 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);
+	}
+
+	ATSE_UNLOCK(sc);
+}
+
+#ifdef DEVICE_POLLING
+static int
+atse_poll(struct ifnet *ifp, enum poll_cmd cmd, int count)
+{
+	struct atse_softc *sc;
+	int rx_npkts = 0;
+
+	sc = ifp->if_softc;
+	ATSE_LOCK(sc);
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) {
+		ATSE_UNLOCK(sc);
+		return (rx_npkts); 
+	}
+
+	sc->atse_rx_cycles = count;
+	rx_npkts = atse_rx_locked(sc);
+	atse_start_locked(ifp);
+
+	if (sc->atse_rx_cycles > 0 || cmd == POLL_AND_CHECK_STATUS) {
+		uint32_t rx, tx;
+
+		rx = ATSE_RX_EVENT_READ(sc);
+		tx = ATSE_TX_EVENT_READ(sc);
+
+		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 (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;
+
+#if 0
+		if (/* Severe error; if only we could find out. */) {
+			ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
+			atse_init_locked(sc);
+		}
+#endif
+	}
+
+	ATSE_UNLOCK(sc);
+	return (rx_npkts);
+}
+#endif /* DEVICE_POLLING */
+
+static struct atse_mac_stats_regs {
+	const char *name;
+	const char *descr;	/* Mostly copied from Altera datasheet. */
+} atse_mac_stats_regs[] = {
+	[0x1a] =
+	{ "aFramesTransmittedOK",
+	    "The number of frames that are successfully transmitted including "
+	    "the pause frames." },
+	{ "aFramesReceivedOK",
+	    "The number of frames that are successfully received including the "
+	    "pause frames." },
+	{ "aFrameCheckSequenceErrors",
+	    "The number of receive frames with CRC error." },
+	{ "aAlignmentErrors",
+	    "The number of receive frames with alignment error." },
+	{ "aOctetsTransmittedOK",
+	    "The lower 32 bits of the number of data and padding octets that "
+	    "are successfully transmitted." },
+	{ "aOctetsReceivedOK",
+	    "The lower 32 bits of the number of data and padding octets that "
+	    " are successfully received." },
+	{ "aTxPAUSEMACCtrlFrames",
+	    "The number of pause frames transmitted." },
+	{ "aRxPAUSEMACCtrlFrames",
+	    "The number received pause frames received." },
+	{ "ifInErrors",
+	    "The number of errored frames received." },
+	{ "ifOutErrors",
+	    "The number of transmit frames with either a FIFO overflow error, "
+	    "a FIFO underflow error, or a error defined by the user "
+	    "application." },
+	{ "ifInUcastPkts",
+	    "The number of valid unicast frames received." },
+	{ "ifInMulticastPkts",
+	    "The number of valid multicast frames received. The count does "
+	    "not include pause frames." },
+	{ "ifInBroadcastPkts",
+	    "The number of valid broadcast frames received." },
+	{ "ifOutDiscards",
+	    "This statistics counter is not in use.  The MAC function does not "
+	    "discard frames that are written to the FIFO buffer by the user "
+	    "application." },
+	{ "ifOutUcastPkts",
+	    "The number of valid unicast frames transmitted." },
+	{ "ifOutMulticastPkts",
+	    "The number of valid multicast frames transmitted, excluding pause "
+	    "frames." },
+	{ "ifOutBroadcastPkts",
+	    "The number of valid broadcast frames transmitted." },
+	{ "etherStatsDropEvents",
+	    "The number of frames that are dropped due to MAC internal errors "
+	    "when FIFO buffer overflow persists." },
+	{ "etherStatsOctets",
+	    "The lower 32 bits of the total number of octets received. This "
+	    "count includes both good and errored frames." },
+	{ "etherStatsPkts",
+	    "The total number of good and errored frames received." },
+	{ "etherStatsUndersizePkts",
+	    "The number of frames received with length less than 64 bytes. "
+	    "This count does not include errored frames." },
+	{ "etherStatsOversizePkts",
+	    "The number of frames received that are longer than the value "
+	    "configured in the frm_length register. This count does not "
+	    "include errored frames." },
+	{ "etherStatsPkts64Octets",
+	    "The number of 64-byte frames received. This count includes good "
+	    "and errored frames." },
+	{ "etherStatsPkts65to127Octets",
+	    "The number of received good and errored frames between the length "
+	    "of 65 and 127 bytes." },
+	{ "etherStatsPkts128to255Octets",
+	    "The number of received good and errored frames between the length "
+	    "of 128 and 255 bytes." },
+	{ "etherStatsPkts256to511Octets",
+	    "The number of received good and errored frames between the length "
+	    "of 256 and 511 bytes." },
+	{ "etherStatsPkts512to1023Octets",
+	    "The number of received good and errored frames between the length "
+	    "of 512 and 1023 bytes." },
+	{ "etherStatsPkts1024to1518Octets",
+	    "The number of received good and errored frames between the length "
+	    "of 1024 and 1518 bytes." },
+	{ "etherStatsPkts1519toXOctets",
+	    "The number of received good and errored frames between the length "
+	    "of 1519 and the maximum frame length configured in the frm_length "
+	    "register." },
+	{ "etherStatsJabbers",
+	    "Too long frames with CRC error." },
+	{ "etherStatsFragments",
+	    "Too short frames with CRC error." },
+	/* 0x39 unused, 0x3a/b non-stats. */
+	[0x3c] =
+	/* Extended Statistics Counters */
+	{ "msb_aOctetsTransmittedOK",
+	    "Upper 32 bits of the number of data and padding octets that are "
+	    "successfully transmitted." },
+	{ "msb_aOctetsReceivedOK",
+	    "Upper 32 bits of the number of data and padding octets that are "
+	    "successfully received." },
+	{ "msb_etherStatsOctets",
+	    "Upper 32 bits of the total number of octets received. This count "
+	    "includes both good and errored frames." }
+};
+
+static int
+sysctl_atse_mac_stats_proc(SYSCTL_HANDLER_ARGS)
+{
+	struct atse_softc *sc;
+        int error, offset, s;
+
+        sc = arg1;
+	offset = arg2;
+
+	s = CSR_READ_4(sc, offset);
+	error = sysctl_handle_int(oidp, &s, 0, req);
+	if (error || !req->newptr)
+		return (error);
+
+        return (0);
+}
+
+static struct atse_rx_err_stats_regs {
+	const char *name;
+	const char *descr;
+} atse_rx_err_stats_regs[] = {
+
+#define ATSE_RX_ERR_FIFO_THRES_EOP      0 /* FIFO threshold reached, on EOP. */
+#define ATSE_RX_ERR_ELEN                1 /* Frame/payload length not valid. */
+#define ATSE_RX_ERR_CRC32               2 /* CRC-32 error. */
+#define ATSE_RX_ERR_FIFO_THRES_TRUNC    3 /* FIFO thresh., truncated frame. */
+#define ATSE_RX_ERR_4                   4 /* ? */
+#define ATSE_RX_ERR_5                   5 /* / */
+
+	{ "rx_err_fifo_thres_eop",
+	    "FIFO threshold reached, reported on EOP." },
+	{ "rx_err_fifo_elen",
+	    "Frame or payload length not valid." },
+	{ "rx_err_fifo_crc32",
+	    "CRC-32 error." },
+	{ "rx_err_fifo_thres_trunc",
+	    "FIFO threshold reached, truncated frame" },
+	{ "rx_err_4",
+	    "?" },
+	{ "rx_err_5",
+	    "?" },
+};
+
+static int
+sysctl_atse_rx_err_stats_proc(SYSCTL_HANDLER_ARGS)
+{
+	struct atse_softc *sc;
+        int error, offset, s;
+
+        sc = arg1;
+	offset = arg2;
+
+	s = sc->atse_rx_err[offset];
+	error = sysctl_handle_int(oidp, &s, 0, req);
+	if (error || !req->newptr)
+		return (error);
+
+        return (0);
+}
+
+static void
+atse_sysctl_stats_attach(device_t dev)
+{
+	struct sysctl_ctx_list *sctx;
+	struct sysctl_oid *soid;
+	struct atse_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+        sctx = device_get_sysctl_ctx(dev);
+        soid = device_get_sysctl_tree(dev);
+
+	/* MAC statistics. */
+	for (i = 0; i < sizeof(atse_mac_stats_regs) /
+	    sizeof(*atse_mac_stats_regs); i++) {
+		if (atse_mac_stats_regs[i].name == NULL ||
+		    atse_mac_stats_regs[i].descr == NULL)
+			continue;
+
+		SYSCTL_ADD_PROC(sctx, SYSCTL_CHILDREN(soid), OID_AUTO,
+		    atse_mac_stats_regs[i].name, CTLTYPE_UINT|CTLFLAG_RD,
+		    sc, i, sysctl_atse_mac_stats_proc, "IU",
+		    atse_mac_stats_regs[i].descr);
+	}
+
+	/* rx_err[]. */
+	for (i = 0; i < ATSE_RX_ERR_MAX; i++) {
+		if (atse_rx_err_stats_regs[i].name == NULL ||
+		    atse_rx_err_stats_regs[i].descr == NULL)
+			continue;
+
+		SYSCTL_ADD_PROC(sctx, SYSCTL_CHILDREN(soid), OID_AUTO,
+		    atse_rx_err_stats_regs[i].name, CTLTYPE_UINT|CTLFLAG_RD,
+		    sc, i, sysctl_atse_rx_err_stats_proc, "IU",
+		    atse_rx_err_stats_regs[i].descr);
+	}
+}
+
+/*
+ * Generic device handling routines.
+ */
+int
+atse_attach(device_t dev)
+{
+	struct atse_softc *sc;
+	struct ifnet *ifp;
+	int error;
+
+	sc = device_get_softc(dev);
+
+	atse_ethernet_option_bits_read(dev);
+
+	mtx_init(&sc->atse_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
+	    MTX_DEF);
+
+	callout_init_mtx(&sc->atse_tick, &sc->atse_mtx, 0);
+
+	sc->atse_tx_buf = malloc(ETHER_MAX_LEN_JUMBO, M_DEVBUF, M_WAITOK);
+
+	/*
+	 * We are only doing single-PHY with this driver currently.  The
+	 * defaults would be right so that BASE_CFG_MDIO_ADDR0 points to the
+	 * 1st PHY address (0) apart from the fact that BMCR0 is always
+	 * the PCS mapping, so we always use BMCR1. See Table 5-1 0xA0-0xBF.
+	 */
+#if 0	/* Always PCS. */
+	sc->atse_bmcr0 = MDIO_0_START;
+	CSR_WRITE_4(sc, BASE_CFG_MDIO_ADDR0, 0x00);
+#endif
+	/* Always use matching PHY for atse[0..]. */
+	sc->atse_phy_addr = device_get_unit(dev);
+	sc->atse_bmcr1 = MDIO_1_START;
+	CSR_WRITE_4(sc, BASE_CFG_MDIO_ADDR1, sc->atse_phy_addr);
+
+	/* Reset the adapter. */
+	atse_reset(sc);
+
+	/* Setup interface. */
+	ifp = sc->atse_ifp = if_alloc(IFT_ETHER);
+	if (ifp == NULL) {
+		device_printf(dev, "if_alloc() failed\n");
+		error = ENOSPC;
+		goto err;
+	}
+	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_ioctl = atse_ioctl;
+	ifp->if_start = atse_start;
+	ifp->if_init = atse_init;
+	IFQ_SET_MAXLEN(&ifp->if_snd, ATSE_TX_LIST_CNT - 1);
+	ifp->if_snd.ifq_drv_maxlen = ATSE_TX_LIST_CNT - 1;
+	IFQ_SET_READY(&ifp->if_snd);
+
+	/* MII setup. */
+	error = mii_attach(dev, &sc->atse_miibus, ifp, atse_ifmedia_upd,
+	    atse_ifmedia_sts, BMSR_DEFCAPMASK, MII_PHY_ANY, MII_OFFSET_ANY, 0);
+	if (error != 0) {
+		device_printf(dev, "attaching PHY failed: %d\n", error);
+		goto err;
+	}
+
+	/* Call media-indepedent attach routine. */
+	ether_ifattach(ifp, sc->atse_eth_addr);
+
+	/* Tell the upper layer(s) about vlan mtu support. */
+	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+	ifp->if_capabilities |= IFCAP_VLAN_MTU;
+	ifp->if_capenable = ifp->if_capabilities;
+#ifdef DEVICE_POLLING
+	/* We will enable polling by default if no irqs available. See below. */
+	ifp->if_capabilities |= IFCAP_POLLING;
+#endif
+
+	/* 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);
+		if (error != 0) {
+			device_printf(dev, "enabling RX IRQ failed\n");
+			ether_ifdetach(ifp);
+			goto err;
+		}
+	}
+
+	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);
+		if (error != 0) {
+			bus_teardown_intr(dev, sc->atse_rx_irq_res,
+			    sc->atse_rx_intrhand);
+			device_printf(dev, "enabling TX IRQ failed\n");
+			ether_ifdetach(ifp);
+			goto err;
+		}
+	}
+
+	if ((ifp->if_capenable & IFCAP_POLLING) != 0 ||
+	   (sc->atse_rx_irq_res == NULL && sc->atse_tx_irq_res == NULL)) {
+#ifdef DEVICE_POLLING
+		/* If not on and no IRQs force it on. */
+		if (sc->atse_rx_irq_res == NULL && sc->atse_tx_irq_res == NULL){
+			ifp->if_capenable |= IFCAP_POLLING;
+			device_printf(dev, "forcing to polling due to no "
+			    "interrupts\n");
+		}
+		error = ether_poll_register(atse_poll, ifp);
+		if (error != 0)
+			goto err;
+#else
+		device_printf(dev, "no DEVICE_POLLING in kernel and no IRQs\n");
+		error = ENXIO;
+#endif
+	} else {
+		ATSE_RX_INTR_ENABLE(sc);
+		ATSE_TX_INTR_ENABLE(sc);
+	}
+
+err:
+	if (error != 0)
+		atse_detach(dev);
+
+	if (error == 0)
+		atse_sysctl_stats_attach(dev);
+
+	return (error);
+}
+
+static int
+atse_detach(device_t dev)
+{
+	struct atse_softc *sc;
+	struct ifnet *ifp;
+
+	sc = device_get_softc(dev);
+	KASSERT(mtx_initialized(&sc->atse_mtx), ("%s: mutex not initialized",
+	    device_get_nameunit(dev)));
+	ifp = sc->atse_ifp;
+
+#ifdef DEVICE_POLLING
+	if (ifp->if_capenable & IFCAP_POLLING)
+		ether_poll_deregister(ifp);
+#endif
+
+	/* Only cleanup if attach succeeded. */
+	if (device_is_attached(dev)) {
+		ATSE_LOCK(sc);
+		atse_stop_locked(sc);
+		ATSE_UNLOCK(sc);
+		callout_drain(&sc->atse_tick);
+		ether_ifdetach(ifp);
+	}
+	if (sc->atse_miibus != NULL)
+		device_delete_child(dev, sc->atse_miibus);
+
+	if (sc->atse_tx_intrhand)
+		bus_teardown_intr(dev, sc->atse_tx_irq_res,
+		    sc->atse_tx_intrhand);
+	if (sc->atse_rx_intrhand)
+		bus_teardown_intr(dev, sc->atse_rx_irq_res,
+		    sc->atse_rx_intrhand);
+
+	if (ifp != NULL)
+		if_free(ifp);
+
+	if (sc->atse_tx_buf != NULL)
+		free(sc->atse_tx_buf, M_DEVBUF);
+
+	mtx_destroy(&sc->atse_mtx);
+
+	return (0);
+}
+
+/* Shared between nexus anf fdt implementation. */
+void
+atse_detach_resources(device_t dev)
+{
+	struct atse_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	if (sc->atse_txc_mem_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_txc_mem_rid,
+		    sc->atse_txc_mem_res);
+		sc->atse_txc_mem_res = NULL;
+	}
+	if (sc->atse_tx_mem_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_tx_mem_rid,
+		    sc->atse_tx_mem_res);
+		sc->atse_tx_mem_res = NULL;
+	}
+	if (sc->atse_tx_irq_res != NULL) {
+		bus_release_resource(dev, SYS_RES_IRQ, sc->atse_tx_irq_rid,
+		    sc->atse_tx_irq_res);
+		sc->atse_tx_irq_res = NULL;
+	}
+	if (sc->atse_rxc_mem_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_rxc_mem_rid,
+		    sc->atse_rxc_mem_res);
+		sc->atse_rxc_mem_res = NULL;
+	}
+	if (sc->atse_rx_mem_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_rx_mem_rid,
+		    sc->atse_rx_mem_res);
+		sc->atse_rx_mem_res = NULL;
+	}
+	if (sc->atse_rx_irq_res != NULL) {
+		bus_release_resource(dev, SYS_RES_IRQ, sc->atse_rx_irq_rid,
+		    sc->atse_rx_irq_res);
+		sc->atse_rx_irq_res = NULL;
+	}
+	if (sc->atse_mem_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_mem_rid,
+		    sc->atse_mem_res);
+		sc->atse_mem_res = NULL;
+	}
+}
+
+int
+atse_detach_dev(device_t dev)
+{
+	int error;
+
+	error = atse_detach(dev);
+	if (error) {
+		/* We are basically in undefined state now. */
+		device_printf(dev, "atse_detach() failed: %d\n", error);
+		return (error);
+	}
+
+	atse_detach_resources(dev);
+
+	return (0);
+}
+
+int
+atse_miibus_readreg(device_t dev, int phy, int reg)
+{
+	struct atse_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	/*
+	 * We currently do not support re-mapping of MDIO space on-the-fly
+	 * but de-facto hard-code the phy#.
+	 */
+	if (phy != sc->atse_phy_addr)
+		return (0);
+
+	return (PHY_READ_2(sc, reg));
+}
+
+int
+atse_miibus_writereg(device_t dev, int phy, int reg, int data)
+{
+	struct atse_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	/*
+	 * We currently do not support re-mapping of MDIO space on-the-fly
+	 * but de-facto hard-code the phy#.
+	 */
+	if (phy != sc->atse_phy_addr)
+		return (0);
+
+	PHY_WRITE_2(sc, reg, data);
+	return (0);
+}
+
+void
+atse_miibus_statchg(device_t dev)
+{
+	struct atse_softc *sc;
+	struct mii_data *mii;
+	struct ifnet *ifp;
+	uint32_t val4;
+
+	sc = device_get_softc(dev);
+	ATSE_LOCK_ASSERT(sc);
+
+        mii = device_get_softc(sc->atse_miibus);
+        ifp = sc->atse_ifp;
+        if (mii == NULL || ifp == NULL ||
+            (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+                return;
+
+	val4 = CSR_READ_4(sc, BASE_CFG_COMMAND_CONFIG);
+
+	/* Assume no link. */
+	sc->atse_flags &= ~ATSE_FLAGS_LINK;
+
+	if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
+	    (IFM_ACTIVE | IFM_AVALID)) {
+
+		switch (IFM_SUBTYPE(mii->mii_media_active)) {
+		case IFM_10_T:
+			val4 |= BASE_CFG_COMMAND_CONFIG_ENA_10;
+			val4 &= ~BASE_CFG_COMMAND_CONFIG_ETH_SPEED;
+			sc->atse_flags |= ATSE_FLAGS_LINK;
+			break;
+		case IFM_100_TX:
+			val4 &= ~BASE_CFG_COMMAND_CONFIG_ENA_10;
+			val4 &= ~BASE_CFG_COMMAND_CONFIG_ETH_SPEED;
+			sc->atse_flags |= ATSE_FLAGS_LINK;
+			break;
+		case IFM_1000_T:
+			val4 &= ~BASE_CFG_COMMAND_CONFIG_ENA_10;
+			val4 |= BASE_CFG_COMMAND_CONFIG_ETH_SPEED;
+			sc->atse_flags |= ATSE_FLAGS_LINK;
+			break;
+		default:
+			break;
+		}
+	}
+
+        if ((sc->atse_flags & ATSE_FLAGS_LINK) == 0) {
+		/* XXX-BZ need to stop the MAC? */
+                return;
+        }
+
+	if (IFM_OPTIONS(mii->mii_media_active & IFM_FDX) != 0)
+		val4 &= ~BASE_CFG_COMMAND_CONFIG_HD_ENA;
+        else
+		val4 |= BASE_CFG_COMMAND_CONFIG_HD_ENA;
+	/* XXX-BZ flow control? */
+
+	/* Make sure the MAC is activated. */
+	val4 |= BASE_CFG_COMMAND_CONFIG_TX_ENA;
+	val4 |= BASE_CFG_COMMAND_CONFIG_RX_ENA;
+
+	CSR_WRITE_4(sc, BASE_CFG_COMMAND_CONFIG, val4);
+}
+
+/* end */
diff --git a/sys/dev/altera/atse/if_atse_fdt.c b/sys/dev/altera/atse/if_atse_fdt.c
new file mode 100644
index 00000000000..af5531da6e9
--- /dev/null
+++ b/sys/dev/altera/atse/if_atse_fdt.c
@@ -0,0 +1,217 @@
+/*-
+ * Copyright (c) 2013 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 <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/socket.h>
+#include <sys/systm.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_media.h>
+#include <net/if_var.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.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 <dev/altera/atse/if_atsereg.h>
+
+/* "device miibus" required.  See GENERIC if you get errors here. */
+#include "miibus_if.h"
+
+static int
+atse_probe_fdt(device_t dev)
+{
+
+	if (ofw_bus_is_compatible(dev, "altera,atse")) {
+		device_set_desc(dev, "Altera Triple-Speed Ethernet MegaCore");
+		return (BUS_PROBE_DEFAULT);
+	}
+        return (ENXIO);
+}
+
+static int
+atse_attach_fdt(device_t dev)
+{
+	struct atse_softc *sc;
+	int error;
+
+	sc = device_get_softc(dev);
+	sc->atse_dev = dev;
+	sc->atse_unit = device_get_unit(dev);
+
+	/*
+	 * FDT has the list of our resources.  Given we are using multiple
+	 * memory regions and possibly multiple interrupts, we need to attach
+	 * them in the order specified in .dts:
+	 * MAC, RX and RXC FIFO, TX and TXC FIFO; RX INTR, TX INTR.
+	 */
+
+	/* MAC: Avalon-MM, atse management register region. */
+	sc->atse_mem_rid = 0;
+	sc->atse_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->atse_mem_rid, RF_ACTIVE);
+	if (sc->atse_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for ctrl region\n");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->atse_dev, "MAC ctrl region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->atse_mem_res),
+		    (void *)(rman_get_start(sc->atse_mem_res) +
+		    rman_get_size(sc->atse_mem_res)));
+
+	/*
+	 * RX and RXC FIFO memory regions.
+	 * 0x00: 2 * 32bit FIFO data,
+	 * 0x20: 8 * 32bit FIFO ctrl, Avalon-ST Sink to Avalon-MM R-Slave.
+	 */
+	sc->atse_rx_mem_rid = 1;
+	sc->atse_rx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->atse_rx_mem_rid, RF_ACTIVE);
+	if (sc->atse_rx_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for RX FIFO\n");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->atse_dev, "RX FIFO at mem %p-%p\n",
+		    (void *)rman_get_start(sc->atse_rx_mem_res),
+		    (void *)(rman_get_start(sc->atse_rx_mem_res) +
+		    rman_get_size(sc->atse_rx_mem_res)));
+
+	sc->atse_rxc_mem_rid = 2;
+	sc->atse_rxc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->atse_rxc_mem_rid, RF_ACTIVE);
+	if (sc->atse_rxc_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for RXC FIFO\n");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->atse_dev, "RXC FIFO at mem %p-%p\n",
+		    (void *)rman_get_start(sc->atse_rxc_mem_res),
+		    (void *)(rman_get_start(sc->atse_rxc_mem_res) +
+		    rman_get_size(sc->atse_rxc_mem_res)));
+
+	/*
+	 * TX and TXC FIFO memory regions.
+	 * 0x00: 2 * 32bit FIFO data,
+	 * 0x20: 8 * 32bit FIFO ctrl, Avalon-MM W-Slave to Avalon-ST Source.
+	 */
+	sc->atse_tx_mem_rid = 3;
+	sc->atse_tx_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->atse_tx_mem_rid, RF_ACTIVE);
+	if (sc->atse_tx_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for TX FIFO\n");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->atse_dev, "TX FIFO at mem %p-%p\n",
+		    (void *)rman_get_start(sc->atse_tx_mem_res),
+		    (void *)(rman_get_start(sc->atse_tx_mem_res) +
+		    rman_get_size(sc->atse_tx_mem_res)));
+
+	sc->atse_txc_mem_rid = 4;
+	sc->atse_txc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->atse_txc_mem_rid, RF_ACTIVE);
+	if (sc->atse_txc_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for TXC FIFO\n");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->atse_dev, "TXC FIFO at mem %p-%p\n",
+		    (void *)rman_get_start(sc->atse_txc_mem_res),
+		    (void *)(rman_get_start(sc->atse_txc_mem_res) +
+		    rman_get_size(sc->atse_txc_mem_res)));
+
+	/* (Optional) RX and TX IRQ. */
+	sc->atse_rx_irq_rid = 0;
+	sc->atse_rx_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+	    &sc->atse_rx_irq_rid, RF_ACTIVE | RF_SHAREABLE);
+	sc->atse_tx_irq_rid = 1;
+	sc->atse_tx_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+	    &sc->atse_tx_irq_rid, RF_ACTIVE | RF_SHAREABLE);
+
+	error = atse_attach(dev);
+	if (error)
+		goto err;
+
+	return (0);
+
+err:
+	/* Cleanup. */
+	atse_detach_resources(dev);
+
+	return (error);
+}
+
+static device_method_t atse_methods_fdt[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		atse_probe_fdt),
+	DEVMETHOD(device_attach,	atse_attach_fdt),
+	DEVMETHOD(device_detach,	atse_detach_dev),
+
+	/* MII interface */
+	DEVMETHOD(miibus_readreg,	atse_miibus_readreg),
+	DEVMETHOD(miibus_writereg,	atse_miibus_writereg),
+	DEVMETHOD(miibus_statchg,	atse_miibus_statchg),
+
+	DEVMETHOD_END
+};
+
+static driver_t atse_driver_fdt = {
+	"atse",
+	atse_methods_fdt,
+	sizeof(struct atse_softc)
+};
+
+DRIVER_MODULE(atse, simplebus, atse_driver_fdt, atse_devclass, 0, 0);
+DRIVER_MODULE(miibus, atse, miibus_driver, miibus_devclass, 0, 0);
+
+/* end */
diff --git a/sys/dev/altera/atse/if_atse_nexus.c b/sys/dev/altera/atse/if_atse_nexus.c
new file mode 100644
index 00000000000..f52f448b53f
--- /dev/null
+++ b/sys/dev/altera/atse/if_atse_nexus.c
@@ -0,0 +1,259 @@
+/*-
+ * Copyright (c) 2012,2013 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_device_polling.h"
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_media.h>
+#include <net/if_var.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+
+#include <dev/altera/atse/if_atsereg.h>
+
+/* "device miibus" required.  See GENERIC if you get errors here. */
+#include "miibus_if.h"
+
+MODULE_DEPEND(atse, ether, 1, 1, 1);
+MODULE_DEPEND(atse, miibus, 1, 1, 1);
+
+/*
+ * Device routines for interacting with nexus (probe, attach, detach) & helpers.
+ * XXX We should add suspend/resume later.
+ */
+static int
+atse_resource_int(device_t dev, const char *resname, int *v)
+{
+	int error;
+
+	error = resource_int_value(device_get_name(dev), device_get_unit(dev),
+	    resname, v);
+	if (error != 0) {
+		/* If it does not exist, we fail, so not ingoring ENOENT. */
+		device_printf(dev, "could not fetch '%s' hint\n", resname);
+		return (error);
+	}
+
+	return (0);
+}
+
+static int
+atse_resource_long(device_t dev, const char *resname, long *v)
+{
+	int error;
+
+	error = resource_long_value(device_get_name(dev), device_get_unit(dev),
+	    resname, v);
+	if (error != 0) {
+		/* If it does not exist, we fail, so not ingoring ENOENT. */
+		device_printf(dev, "could not fetch '%s' hint\n", resname);
+		return (error);
+	}
+
+	return (0);
+}
+
+static int
+atse_probe_nexus(device_t dev)
+{
+	struct resource *res;
+	long l;
+	int error, rid;
+
+	/*
+	 * It is almost impossible to properly probe this device.  We must
+	 * rely on hints being set correctly.  So try to get hints and
+	 * one memory mapping.  Must cleanup and do again in attach but
+	 * should not probe successfully if not able to attach later.
+	 */
+	error = atse_resource_int(dev, "rx_irq", &rid);
+	error += atse_resource_long(dev, "rx_maddr", &l);
+	error += atse_resource_long(dev, "rx_msize", &l);
+	error += atse_resource_long(dev, "rxc_maddr", &l);
+	error += atse_resource_long(dev, "rxc_msize", &l);
+	error += atse_resource_int(dev, "tx_irq", &rid);
+	error += atse_resource_long(dev, "tx_maddr", &l);
+	error += atse_resource_long(dev, "tx_msize", &l);
+	error += atse_resource_long(dev, "txc_maddr", &l);
+	error += atse_resource_long(dev, "txc_msize", &l);
+	if (error != 0)
+		return (ENXIO);
+
+	rid = 0;
+	res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+	if (res == NULL)
+		return (ENXIO);
+	bus_release_resource(dev, SYS_RES_MEMORY, rid, res);
+
+	/* Success. */
+	device_set_desc(dev, "Altera Triple-Speed Ethernet MegaCore");
+	return (BUS_PROBE_NOWILDCARD);
+}
+
+static int
+atse_attach_nexus(device_t dev)
+{
+	struct atse_softc *sc;
+	int error;
+
+	sc = device_get_softc(dev);
+	sc->atse_dev = dev;
+	sc->atse_unit = device_get_unit(dev);
+
+	/* Get RX and TX IRQ and FIFO information from hints. */
+	error = atse_resource_int(dev, "rx_irq", &sc->atse_rx_irq);
+	error += atse_resource_long(dev, "rx_maddr", &sc->atse_rx_maddr);
+	error += atse_resource_long(dev, "rx_msize", &sc->atse_rx_msize);
+	error += atse_resource_long(dev, "rxc_maddr", &sc->atse_rxc_maddr);
+	error += atse_resource_long(dev, "rxc_msize", &sc->atse_rxc_msize);
+	error += atse_resource_int(dev, "tx_irq", &sc->atse_tx_irq);
+	error += atse_resource_long(dev, "tx_maddr", &sc->atse_tx_maddr);
+	error += atse_resource_long(dev, "tx_msize", &sc->atse_tx_msize);
+	error += atse_resource_long(dev, "txc_maddr", &sc->atse_txc_maddr);
+	error += atse_resource_long(dev, "txc_msize", &sc->atse_txc_msize);
+	if (error != 0)
+		return (error);
+
+	/* Avalon-MM, atse management register region. */
+	sc->atse_mem_rid = 0;
+	sc->atse_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->atse_mem_rid, RF_ACTIVE);
+	if (sc->atse_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for ctrl region\n");
+		return (ENXIO);
+	}
+
+	/*
+	 * (Optional) RX IRQ and memory mapped regions.
+	 * 0x00: 2 * 32bit FIFO data,
+	 * 0x20: 8 * 32bit FIFO ctrl, Avalon-ST Sink to Avalon-MM R-Slave.
+	 */
+	sc->atse_rx_irq_rid = 0;
+	sc->atse_rx_irq_res = bus_alloc_resource(dev, SYS_RES_IRQ,
+	    &sc->atse_rx_irq_rid, sc->atse_rx_irq, sc->atse_rx_irq, 1,
+	    RF_ACTIVE | RF_SHAREABLE);
+
+	sc->atse_rx_mem_rid = 0;
+	sc->atse_rx_mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
+	    &sc->atse_rx_mem_rid, sc->atse_rx_maddr, sc->atse_rx_maddr +
+	    sc->atse_rx_msize, sc->atse_rx_msize, RF_ACTIVE);
+	if (sc->atse_rx_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for RX\n");
+		goto err;
+        }
+	sc->atse_rxc_mem_rid = 0;
+	sc->atse_rxc_mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
+	    &sc->atse_rxc_mem_rid, sc->atse_rxc_maddr, sc->atse_rxc_maddr +
+	    sc->atse_rxc_msize, sc->atse_rxc_msize, RF_ACTIVE);
+	if (sc->atse_rxc_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for RX control\n");
+		goto err;
+        }
+
+	/*
+	 * (Optional) TX IRQ and memory mapped regions.
+	 * 0x00: 2 * 32bit FIFO data,
+	 * 0x20: 8 * 32bit FIFO ctrl, Avalon-MM W-Slave to Avalon-ST Source.
+	 */
+	sc->atse_tx_irq_rid = 0;
+	sc->atse_tx_irq_res = bus_alloc_resource(dev, SYS_RES_IRQ,
+	    &sc->atse_tx_irq_rid, sc->atse_tx_irq, sc->atse_tx_irq, 1,
+	    RF_ACTIVE | RF_SHAREABLE);
+
+	sc->atse_tx_mem_rid = 0;
+	sc->atse_tx_mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
+	    &sc->atse_tx_mem_rid, sc->atse_tx_maddr, sc->atse_tx_maddr +
+	    sc->atse_tx_msize, sc->atse_tx_msize, RF_ACTIVE);
+	if (sc->atse_tx_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for TX\n");
+		goto err;
+	}
+	sc->atse_txc_mem_rid = 0;
+	sc->atse_txc_mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY,
+	    &sc->atse_txc_mem_rid, sc->atse_txc_maddr, sc->atse_txc_maddr +
+	    sc->atse_txc_msize, sc->atse_txc_msize, RF_ACTIVE);
+	if (sc->atse_txc_mem_res == NULL) {
+		device_printf(dev, "failed to map memory for TX control\n");
+		goto err;
+	}
+
+	error = atse_attach(dev);
+	if (error)
+		goto err;
+
+	return (0);
+
+err:
+	/* Cleanup. */
+	atse_detach_resources(dev);
+
+	return (error);
+}
+
+static device_method_t atse_methods_nexus[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		atse_probe_nexus),
+	DEVMETHOD(device_attach,	atse_attach_nexus),
+	DEVMETHOD(device_detach,	atse_detach_dev),
+
+	/* MII interface */
+	DEVMETHOD(miibus_readreg,	atse_miibus_readreg),
+	DEVMETHOD(miibus_writereg,	atse_miibus_writereg),
+	DEVMETHOD(miibus_statchg,	atse_miibus_statchg),
+
+	DEVMETHOD_END
+};
+
+static driver_t atse_driver_nexus = {
+	"atse",
+	atse_methods_nexus,
+	sizeof(struct atse_softc)
+};
+
+DRIVER_MODULE(atse, nexus, atse_driver_nexus, atse_devclass, 0, 0);
+DRIVER_MODULE(miibus, atse, miibus_driver, miibus_devclass, 0, 0);
+
+/* end */
diff --git a/sys/dev/altera/atse/if_atsereg.h b/sys/dev/altera/atse/if_atsereg.h
new file mode 100644
index 00000000000..8caba4f34ce
--- /dev/null
+++ b/sys/dev/altera/atse/if_atsereg.h
@@ -0,0 +1,486 @@
+/*-
+ * Copyright (c) 2012 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 _DEV_IF_ATSEREG_H
+#define _DEV_IF_ATSEREG_H
+
+#define	ATSE_VENDOR			0x6af7
+#define	ATSE_DEVICE			0x00bd
+
+/* See hints file/fdt for ctrl port and Avalon FIFO addresses. */
+
+/* Section 3. Parameter Settings. */
+/*
+ * This is a lot of options that affect the way things are synthesized.
+ * We cannot really make them all hints and most of them might be stale.
+ */
+
+/* 3-1 Core Configuration */
+#if 0
+static const char *atse_core_core_variation[] = {
+	[0] = "10/100/1000 Mbps Ethernet MAC only",
+	[1] = "10/100/1000 Mbps Ethernet MAC with 1000BASE-X/SGMII PCS",
+	[2] = "1000BASE-X/SGMII PCS only",
+	[3] = "1000 Mbps Small MAC",
+	[4] = "10/100 Mbps Small MAC",
+	NULL
+};
+static const char *atse_core_interface[] = {
+	[0] = "MII",				/* Core variation 4. */
+	[1] = "GMII",				/* Core variation 3. */
+	[2] = "RGMII",				/* Core variation 0,1,3. */
+	[3] = "MII/GMII",			/* Core variation 0,1. */
+	NULL
+};
+#endif
+#define	CORE_CORE_VARIATION		1	/* atse_core_core_variation[] */
+#define	CORE_INTERFACE			3	/* atse_core_interface[] */
+#define	CORE_USE_INTERNAL_FIFO		1
+#define	CORE_NUMBER_OF_PORTS		1	/* Internal FIFO count. */
+#define	CORE_USE_TRANSCEIVER_BLOCK	1	/* SGMII PCS transceiver:
+						 * LVDS I/O. */
+
+/* 3-2 MAC Options. */
+/* Ethernet MAC Options. */
+#define	MAC_ENABLE_10_100_HDX_SUPPORT	0
+#define	MAC_ENABLE_RG_G_MII_LOOPBACK	0
+#define	MAC_ENABLE_SUPL_MAC_UCAST_ADDR	0	/* Supplementary MAC unicast. */
+#define	MAC_INCLUDE_STATISTICS_COUNTERS	0
+#define	MAC_STATISTICS_COUNTERS_64BIT	0
+#define	MAC_INCLUDE_MC_HASHTABLE	0	/* Multicast. */
+#define	MAC_ALIGN_PKTHDR_32BIT		1
+#define	MAC_ENABLE_FDX_FLOW_CTRL	0
+#define	MAC_ENABLE_VLAN_DETECTION	0	/* VLAN and stacked VLANs. */
+#define	MAC_ENABLE_MAGIC_PKT_DETECTION	0
+/* MDIO Module. */
+#define	MAC_MDIO_INCLUDE_MDIO_MODULE	1
+#define	MAC_MDIO_HOST_CLOCK_DIVISOR	40	/* Not just On/Off. */
+
+/* 3-4 FIFO Options. */
+/* Width and Memory Type. */
+#if 0
+static char *fifo_memory_block[] = {
+	[0] = "M4K",
+	[1] = "M9K",
+	[2] = "M144K",
+	[3] = "MRAM",
+	[4] = "AUTO",
+	NULL
+};
+#endif
+#define	FIFO_MEMORY_BLOCK		4
+#define	FIFO_WITDH			32	/* Other: 8 bits. */
+/* Depth. */
+#define	FIFO_DEPTH_TX			2048	/* 64 .. 64k, 2048x32bits. */
+#define	FIFO_DEPTH_RX			2048	/* 64 .. 64k, 2048x32bits. */
+
+#define	ATSE_TX_LIST_CNT		5	/* Certainly not bufferbloat. */
+
+/* 3-4 PCS/Transceiver Options */
+/* PCS Options. */
+#define	PCS_TXRX_PHY_ID			0x00000000	/* 32 bits */
+#define	PCS_TXRX_ENABLE_SGMII_BRIDGE	0
+/* Transceiver Options. */
+#define	PCS_TXRX_EXP_POWER_DOWN_SIGNAL	0	/* Export power down signal. */
+#define	PCS_TXRX_ENABLE_DYNAMIC_RECONF	0	/* Dynamic trans. reconfig. */
+#define	PCS_TXRX_STARTING_CHANNEL	0	/* 0..284. */
+
+
+/* -------------------------------------------------------------------------- */
+
+/* XXX more values based on the bitmaps provided. Cleanup. */
+/* See regs above. */
+#define	AVALON_FIFO_TX_BLOCK_DIAGRAM		0
+#define	AVALON_FIFO_TX_BLOCK_DIAGRAM_SHOW_SIGANLS	0
+#define	AVALON_FIFO_TX_PARAM_SINGLE_RESET_MODE	0
+#define	AVALON_FIFO_TX_BASIC_OPTS_DEPTH		16
+#define	AVALON_FIFO_TX_BASIC_OPTS_ALLOW_BACKPRESSURE	1
+#define	AVALON_FIFO_TX_BASIC_OPTS_CLOCK_SETTING	"Single Clock Mode"
+#define	AVALON_FIFO_TX_BASIC_OPTS_FIFO_IMPL	"Construct FIFO from embedded memory blocks"
+#define	AVALON_FIFO_TX_STATUS_PORT_CREATE_STATUS_INT_FOR_INPUT	1
+#define	AVALON_FIFO_TX_STATUS_PORT_CREATE_STATUS_INT_FOR_OUTPUT	0
+#define	AVALON_FIFO_TX_STATUS_PORT_ENABLE_IRQ_FOR_STATUS_PORT	1
+#define	AVALON_FIFO_TX_INPUT_TYPE			"AVALONMM_WRITE"
+#define	AVALON_FIFO_TX_OUTPUT_TYPE			"AVALONST_SOURCE"
+#define	AVALON_FIFO_TX_AVALON_MM_PORT_SETTINGS_DATA_WIDTH	""
+#define	AVALON_FIFO_TX_AVALON_ST_PORT_SETTINGS_BITS_PER_SYMBOL	8
+#define	AVALON_FIFO_TX_AVALON_ST_PORT_SETTINGS_SYM_PER_BEAT	4
+#define	AVALON_FIFO_TX_AVALON_ST_PORT_SETTINGS_ERROR_WIDTH		1
+#define	AVALON_FIFO_TX_AVALON_ST_PORT_SETTINGS_CHANNEL_WIDTH	0
+#define	AVALON_FIFO_TX_AVALON_ST_PORT_SETTINGS_ENABLE_PACKET_DATA	1
+
+#define	AVALON_FIFO_RX_BLOCK_DIAGRAM		0
+#define	AVALON_FIFO_RX_BLOCK_DIAGRAM_SHOW_SIGNALS		0
+#define	AVALON_FIFO_RX_PARAM_SINGLE_RESET_MODE	0
+#define	AVALON_FIFO_RX_BASIC_OPTS_DEPTH		16
+#define	AVALON_FIFO_RX_BASIC_OPTS_ALLOW_BACKPRESSURE	1
+#define	AVALON_FIFO_RX_BASIC_OPTS_CLOCK_SETTING	"Single Clock Mode"
+#define	AVALON_FIFO_RX_BASIC_OPTS_FIFO_IMPL	"Construct FIFO from embedded memory blocks"
+#define	AVALON_FIFO_RX_STATUS_PORT_CREATE_STATUS_INT_FOR_INPUT	1
+#define	AVALON_FIFO_RX_STATUS_PORT_CREATE_STATUS_INT_FOR_OUTPUT	0
+#define	AVALON_FIFO_RX_STATUS_PORT_ENABLE_IRQ_FOR_STATUS_PORT	1
+#define	AVALON_FIFO_RX_INPUT_TYPE			"AVALONST_SINK"
+#define	AVALON_FIFO_RX_OUTPUT_TYPE			"AVALONMM_READ"
+#define	AVALON_FIFO_RX_AVALON_MM_PORT_SETTINGS_DATA_WIDTH	""
+#define	AVALON_FIFO_RX_AVALON_ST_PORT_SETTINGS_BITS_PER_SYMBOL	8
+#define	AVALON_FIFO_RX_AVALON_ST_PORT_SETTINGS_SYM_PER_BEAT	4
+#define	AVALON_FIFO_RX_AVALON_ST_PORT_SETTINGS_ERROR_WIDTH		6
+#define	AVALON_FIFO_RX_AVALON_ST_PORT_SETTINGS_CHANNEL_WIDTH	0
+#define	AVALON_FIFO_RX_AVALON_ST_PORT_SETTINGS_ENABLE_PACKET_DATA	1
+
+/* -------------------------------------------------------------------------- */
+
+/* 5. Configuration Register Space. */
+
+/* 5-1, MAC Configuration Register Space; Dword offsets. */
+/* 0x00 - 0x17, Base Configuration. */
+#define	BASE_CONFIG_REV			0x00		/* ro, IP Core ver. */
+#define	BASE_CFG_REV_VER_MASK			0x0000FFFF
+#define	BASE_CFG_REV_CUST_VERSION__MASK		0xFFFF0000
+
+#define	BASE_CFG_SCRATCH		0x01		/* rw, 0 */
+
+#define	BASE_CFG_COMMAND_CONFIG		0x02		/* rw, 0 */
+#define	BASE_CFG_COMMAND_CONFIG_TX_ENA		(1<<0)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_RX_ENA		(1<<1)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_XON_GEN		(1<<2)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_ETH_SPEED	(1<<3)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_PROMIS_EN	(1<<4)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_PAD_EN		(1<<5)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_CRC_FWD		(1<<6)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_PAUSE_FWD	(1<<7)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_PAUSE_IGNORE	(1<<8)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_TX_ADDR_INS	(1<<9)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_HD_ENA		(1<<10)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_EXCESS_COL	(1<<11)	/* ro */
+#define	BASE_CFG_COMMAND_CONFIG_LATE_COL	(1<<12)	/* ro */
+#define	BASE_CFG_COMMAND_CONFIG_SW_RESET	(1<<13)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_MHASH_SEL	(1<<14)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_LOOP_ENA	(1<<15)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_TX_ADDR_SEL	(1<<16|1<<17|1<<18) /* rw */
+#define	BASE_CFG_COMMAND_CONFIG_MAGIC_ENA	(1<<19)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_SLEEP		(1<<20)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_WAKEUP		(1<<21)	/* ro */
+#define	BASE_CFG_COMMAND_CONFIG_XOFF_GEN	(1<<22)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_CNTL_FRM_ENA	(1<<23)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_NO_LGTH_CHECK	(1<<24)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_ENA_10		(1<<25)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_RX_ERR_DISC	(1<<26)	/* rw */
+#define	BASE_CFG_COMMAND_CONFIG_DISABLE_READ_TIMEOUT	(1<<27)	/* rw */
+	/* 28-30 Reserved. */				/* - */
+#define	BASE_CFG_COMMAND_CONFIG_CNT_RESET	(1<<31)	/* rw */
+
+#define	BASE_CFG_MAC_0			0x03		/* rw, 0 */
+#define	BASE_CFG_MAC_1			0x04		/* rw, 0 */
+#define	BASE_CFG_FRM_LENGTH		0x05		/* rw/ro, 1518 */
+#define	BASE_CFG_PAUSE_QUANT		0x06		/* rw, 0 */
+#define	BASE_CFG_RX_SECTION_EMPTY	0x07		/* rw/ro, 0 */
+#define	BASE_CFG_RX_SECTION_FULL	0x08		/* rw/ro, 0 */
+#define	BASE_CFG_TX_SECTION_EMPTY	0x09		/* rw/ro, 0 */
+#define	BASE_CFG_TX_SECTION_FULL	0x0A		/* rw/ro, 0 */
+#define	BASE_CFG_RX_ALMOST_EMPTY	0x0B		/* rw/ro, 0 */
+#define	BASE_CFG_RX_ALMOST_FULL		0x0C		/* rw/ro, 0 */
+#define	BASE_CFG_TX_ALMOST_EMPTY	0x0D		/* rw/ro, 0 */
+#define	BASE_CFG_TX_ALMOST_FULL		0x0E		/* rw/ro, 0 */
+#define	BASE_CFG_MDIO_ADDR0		0x0F		/* rw, 0 */
+#define	BASE_CFG_MDIO_ADDR1		0x10		/* rw, 1 */
+#define	BASE_CFG_HOLDOFF_QUANT		0x11		/* rw, 0xFFFF */
+/* 0x12-0x16 Reserved. */				/* -, 0 */
+#define	BASE_CFG_TX_IPG_LENGTH		0x17		/* rw, 0 */
+
+/* 0x18 - 0x38, Statistics Counters. */
+#define	STATS_A_MAC_ID_0		0x18		/* ro */
+#define	STATS_A_MAC_ID_1		0x19		/* ro */
+#define	STATS_A_FRAMES_TX_OK		0x1A		/* ro */
+#define	STATS_A_FRAMES_RX_OK		0x1B		/* ro */
+#define	STATS_A_FCS_ERRORS		0x1C		/* ro */
+#define	STATS_A_ALIGNMENT_ERRORS	0x1D		/* ro */
+#define	STATS_A_OCTETS_TX_OK		0x1E		/* ro */
+#define	STATS_A_OCTETS_RX_OK		0x1F		/* ro */
+#define	STATS_A_TX_PAUSE_MAX_CTRL_FRAME	0x20		/* ro */
+#define	STATS_A_RX_PAUSE_MAX_CTRL_FRAME	0x21		/* ro */
+#define	STATS_IF_IN_ERRORS		0x22		/* ro */
+#define	STATS_IF_OUT_ERRORS		0x23		/* ro */
+#define	STATS_IF_IN_UCAST_PKTS		0x24		/* ro */
+#define	STATS_IF_IN_MULTICAST_PKTS	0x25		/* ro */
+#define	STATS_IF_IN_BROADCAST_PKTS	0x26		/* ro */
+#define	STATS_IF_OUT_DISCARDS		0x27		/* ro */
+#define	STATS_IF_OUT_UCAST_PKTS		0x28		/* ro */
+#define	STATS_IF_OUT_MULTICAST_PKTS	0x29		/* ro */
+#define	STATS_IF_OUT_BROADCAST_PKTS	0x2A		/* ro */
+#define	STATS_ETHER_STATS_DROP_EVENT	0x2B		/* ro */
+#define	STATS_ETHER_STATS_OCTETS	0x2C		/* ro */
+#define	STATS_ETHER_STATS_PKTS		0x2D		/* ro */
+#define	STATS_ETHER_STATS_USIZE_PKTS	0x2E		/* ro */
+#define	STATS_ETHER_STATS_OSIZE_PKTS	0x2F		/* ro */
+#define	STATS_ETHER_STATS_PKTS_64_OCTETS 0x30		/* ro */
+#define	STATS_ETHER_STATS_PKTS_65_TO_127_OCTETS	 0x31	/* ro */
+#define	STATS_ETHER_STATS_PKTS_128_TO_255_OCTETS 0x32	/* ro */
+#define	STATS_ETHER_STATS_PKTS_256_TO_511_OCTETS 0x33	/* ro */
+#define	STATS_ETHER_STATS_PKTS_512_TO_1023_OCTETS 0x34	/* ro */
+#define	STATS_ETHER_STATS_PKTS_1024_TO_1518_OCTETS 0x35	/* ro */
+#define	STATS_ETHER_STATS_PKTS_1519_TO_X_OCTETS	0x36	/* ro */
+#define	STATS_ETHER_STATS_JABBERS	0x37		/* ro */
+#define	STATS_ETHER_STATS_FRAGMENTS	0x38		/* ro */
+	/* 0x39, Reserved. */				/* - */
+
+/* 0x3A, Transmit Command. */
+#define	TX_CMD_STAT			0x3A		/* rw */
+#define	TX_CMD_STAT_OMIT_CRC			(1<<17)
+#define	TX_CMD_STAT_TX_SHIFT16			(1<<18)
+
+/* 0x3B, Receive Command. */
+#define	RX_CMD_STAT			0x3B		/* rw */
+#define	RX_CMD_STAT_RX_SHIFT16			(1<<25)
+
+/* 0x3C - 0x3E, Extended Statistics Counters. */
+#define	ESTATS_MSB_A_OCTETS_TX_OK	0x3C		/* ro */
+#define	ESTATS_MSB_A_OCTETS_RX_OK	0x3D		/* ro */
+#define	ESTATS_MSB_ETHER_STATS_OCTETS	0x3E		/* ro */
+
+/* 0x3F, Reserved. */
+
+/* 0x40 - 0x7F, Multicast Hash Table. */
+#define	MHASH_START			0x40
+#define	MHASH_LEN			0x3F
+
+/* 0x80 - 0x9F, MDIO Space 0 or PCS Function Configuration. */
+#define	MDIO_0_START			0x80
+
+/* The following are offsets to the first PCS register at 0x80. */
+/* See sys/dev/mii/mii.h. */
+#define	PCS_CONTROL			0x00		/* rw */
+	/* Bits 0:4, Reserved. */			/* - */
+#define	PCS_CONTROL_UNIDIRECTIONAL_ENABLE	(1<<5)	/* rw */
+#define	PCS_CONTROL_SPEED_SELECTION		(1<<6|1<<13) /* ro */
+#define	PCS_CONTROL_COLLISION_TEST		(1<<7)	/* ro */
+#define	PCS_CONTROL_DUPLEX_MODE			(1<<8)	/* ro */
+#define	PCS_CONTROL_RESTART_AUTO_NEGOTIATION	(1<<9)	/* rw */
+#define	PCS_CONTROL_ISOLATE			(1<<10)	/* rw */
+#define	PCS_CONTROL_POWERDOWN			(1<<11)	/* rw */
+#define	PCS_CONTROL_AUTO_NEGOTIATION_ENABLE	(1<<12)	/* rw */
+	/* See bit 6 above. */				/* ro */
+#define	PCS_CONTROL_LOOPBACK			(1<<14)	/* rw */
+#define	PCS_CONTROL_RESET			(1<<15)	/* rw */
+
+#define	PCS_STATUS			0x01		/* ro */
+#define	PCS_STATUS_EXTENDED_CAPABILITY		(1<<0)	/* ro */
+#define	PCS_STATUS_JABBER_DETECT		(1<<1)	/* -, 0 */
+#define	PCS_STATUS_LINK_STATUS			(1<<2)	/* ro */
+#define	PCS_STATUS_AUTO_NEGOTIATION_ABILITY	(1<<3)	/* ro */
+#define	PCS_STATUS_REMOTE_FAULT			(1<<4)	/* -, 0 */
+#define	PCS_STATUS_AUTO_NEGOTIATION_COMPLETE	(1<<5)	/* ro */
+#define	PCS_STATUS_MF_PREAMBLE_SUPPRESSION	(1<<6)	/* -, 0 */
+#define	PCS_STATUS_UNIDIRECTIONAL_ABILITY	(1<<7)	/* ro */
+#define	PCS_STATUS_EXTENDED_STATUS		(1<<8)	/* -, 0 */
+#define	PCS_STATUS_100BASET2_HALF_DUPLEX	(1<<9)	/* ro */
+#define	PCS_STATUS_100BASET2_FULL_DUPLEX	(1<<10)	/* ro */
+#define	PCS_STATUS_10MBPS_HALF_DUPLEX		(1<<11)	/* ro */
+#define	PCS_STATUS_10MBPS_FULL_DUPLEX		(1<<12)	/* ro */
+#define	PCS_STATUS_100BASE_X_HALF_DUPLEX	(1<<13)	/* ro */
+#define	PCS_STATUS_100BASE_X_FULL_DUPLEX	(1<<14)	/* ro */
+#define	PCS_STATUS_100BASE_T4			(1<<15)	/* ro */
+
+#define	PCS_PHY_IDENTIFIER_0		0x02		/* ro */
+#define	PCS_PHY_IDENTIFIER_1		0x03		/* ro */
+
+#define	PCS_DEV_ABILITY			0x04		/* rw */
+	/* 1000BASE-X */
+	/* Bits 0:4, Reserved. */			/* - */
+#define	PCS_DEV_ABILITY_1000BASE_X_FD		(1<<5)	/* rw */
+#define	PCS_DEV_ABILITY_1000BASE_X_HD		(1<<6)	/* rw */
+#define	PCS_DEV_ABILITY_1000BASE_X_PS1		(1<<7)	/* rw */
+#define	PCS_DEV_ABILITY_1000BASE_X_PS2		(1<<8)	/* rw */
+	/* Bits 9:11, Reserved. */			/* - */
+#define	PCS_DEV_ABILITY_1000BASE_X_RF1		(1<<12)	/* rw */
+#define	PCS_DEV_ABILITY_1000BASE_X_RF2		(1<<13)	/* rw */
+#define	PCS_DEV_ABILITY_1000BASE_X_ACK		(1<<14)	/* rw */
+#define	PCS_DEV_ABILITY_1000BASE_X_NP		(1<<15)	/* rw */
+
+#define	PCS_PARTNER_ABILITY		0x05		/* ro */
+	/* 1000BASE-X */
+	/* Bits 0:4, Reserved. */			/* - */
+#define	PCS_PARTNER_ABILITY_1000BASE_X_FD	(1<<5)	/* ro */
+#define	PCS_PARTNER_ABILITY_1000BASE_X_HD	(1<<6)	/* ro */
+#define	PCS_PARTNER_ABILITY_1000BASE_X_PS1	(1<<7)	/* ro */
+#define	PCS_PARTNER_ABILITY_1000BASE_X_PS2	(1<<8)	/* ro */
+	/* Bits 9:11, Reserved. */			/* - */
+#define	PCS_PARTNER_ABILITY_1000BASE_X_RF1	(1<<12)	/* ro */
+#define	PCS_PARTNER_ABILITY_1000BASE_X_RF2	(1<<13)	/* ro */
+#define	PCS_PARTNER_ABILITY_1000BASE_X_ACK	(1<<14)	/* ro */
+#define	PCS_PARTNER_ABILITY_1000BASE_X_NP	(1<<15)	/* ro */
+	/* SGMII */
+	/* Bits 0:9, Reserved. */			/* - */
+#define	PCS_PARTNER_ABILITY_SGMII_COPPER_SPEED0	(1<<10)	/* ro */
+#define	PCS_PARTNER_ABILITY_SGMII_COPPER_SPEED1	(1<<11)	/* ro */
+#define	PCS_PARTNER_ABILITY_SGMII_COPPER_DUPLEX_STATUS	(1<<12)	/* ro */
+	/* Bit 13, Reserved. */				/* - */
+#define	PCS_PARTNER_ABILITY_SGMII_ACK		(1<<14)	/* ro */
+#define	PCS_PARTNER_ABILITY_SGMII_COPPER_LINK_STATUS	(1<<15)	/* ro */
+
+#define	PCS_AN_EXPANSION		0x06		/* ro */
+#define	PCS_AN_EXPANSION_LINK_PARTNER_AUTO_NEGOTIATION_ABLE	(1<<0)	/* ro */
+#define	PCS_AN_EXPANSION_PAGE_RECEIVE		(1<<1)	/* ro */
+#define	PCS_AN_EXPANSION_NEXT_PAGE_ABLE		(1<<2)	/* -, 0 */
+	/* Bits 3:15, Reserved. */			/* - */
+
+#define	PCS_DEVICE_NEXT_PAGE		0x07		/* ro */
+#define	PCS_PARTNER_NEXT_PAGE		0x08		/* ro */
+#define	PCS_MASTER_SLAVE_CNTL		0x09		/* ro */
+#define	PCS_MASTER_SLAVE_STAT		0x0A		/* ro */
+	/* 0x0B - 0x0E, Reserved */			/* - */
+#define	PCS_EXTENDED_STATUS		0x0F		/* ro */
+/* Specific Extended Registers. */
+#define	PCS_EXT_SCRATCH			0x10		/* rw */
+#define	PCS_EXT_REV			0x11		/* ro */
+#define	PCS_EXT_LINK_TIMER_0		0x12		/* rw */
+#define	PCS_EXT_LINK_TIMER_1		0x13		/* rw */
+#define	PCS_EXT_IF_MODE			0x14		/* rw */
+#define	PCS_EXT_IF_MODE_SGMII_ENA		(1<<0)	/* rw */
+#define	PCS_EXT_IF_MODE_USE_SGMII_AN		(1<<1)	/* rw */
+#define	PCS_EXT_IF_MODE_SGMII_SPEED1		(1<<2)	/* rw */
+#define	PCS_EXT_IF_MODE_SGMII_SPEED0		(1<<3)	/* rw */
+#define	PCS_EXT_IF_MODE_SGMII_DUPLEX		(1<<4)	/* rw */
+	/* Bits 5:15, Reserved. */			/* - */
+
+#define	PCS_EXT_DISABLE_READ_TIMEOUT	0x15		/* rw */
+#define	PCS_EXT_READ_TIMEOUT		0x16		/* r0 */
+	/* 0x17-0x1F, Reserved. */
+
+/* 0xA0 - 0xBF, MDIO Space 1. */
+#define	MDIO_1_START			0xA0
+#define	ATSE_BMCR			MDIO_1_START
+
+/* 0xC0 - 0xC7, Supplementary Address. */
+#define	SUPPL_ADDR_SMAC_0_0		0xC0		/* rw */
+#define	SUPPL_ADDR_SMAC_0_1		0xC1		/* rw */
+#define	SUPPL_ADDR_SMAC_1_0		0xC2		/* rw */
+#define	SUPPL_ADDR_SMAC_1_1		0xC3		/* rw */
+#define	SUPPL_ADDR_SMAC_2_0		0xC4		/* rw */
+#define	SUPPL_ADDR_SMAC_2_1		0xC5		/* rw */
+#define	SUPPL_ADDR_SMAC_3_0		0xC6		/* rw */
+#define	SUPPL_ADDR_SMAC_3_1		0xC7		/* rw */
+
+/* 0xC8 - 0xCF, Reserved; set to zero, ignore on read. */
+/* 0xD7 - 0xFF, Reserved; set to zero, ignore on read. */
+
+
+/* -------------------------------------------------------------------------- */
+
+/* DE4 Intel Strata Flash Ethernet Option Bits area. */
+/* XXX-BZ this is something a loader will have to handle for us. */
+#define	ALTERA_ETHERNET_OPTION_BITS_OFF	0x00008000
+#define	ALTERA_ETHERNET_OPTION_BITS_LEN	0x00007fff
+
+/* -------------------------------------------------------------------------- */
+
+struct atse_softc {
+	struct ifnet		*atse_ifp;
+	struct mbuf		*atse_rx_m;
+	struct mbuf		*atse_tx_m;
+	uint8_t			*atse_tx_buf;
+	struct resource		*atse_mem_res;
+	struct resource		*atse_rx_irq_res;
+	struct resource		*atse_rx_mem_res;
+	struct resource		*atse_rxc_mem_res;
+	struct resource		*atse_tx_irq_res;
+	struct resource		*atse_tx_mem_res;
+	struct resource		*atse_txc_mem_res;
+	device_t		atse_miibus;
+	device_t		atse_dev;
+	int			atse_unit;
+	int			atse_mem_rid;
+	int			atse_rx_irq_rid;
+	int			atse_rx_mem_rid;
+	int			atse_rxc_mem_rid;
+	int			atse_tx_irq_rid;
+	int			atse_tx_mem_rid;
+	int			atse_txc_mem_rid;
+	int			atse_phy_addr;
+	int			atse_if_flags;
+	int			atse_rx_irq;
+	int			atse_tx_irq;
+	u_long			atse_rx_maddr;
+	u_long			atse_rx_msize;
+	u_long			atse_tx_maddr;
+	u_long			atse_tx_msize;
+	u_long			atse_rxc_maddr;
+	u_long			atse_rxc_msize;
+	u_long			atse_txc_maddr;
+	u_long			atse_txc_msize;
+	void			*atse_rx_intrhand;
+	void			*atse_tx_intrhand;
+	bus_addr_t		atse_bmcr0;
+	bus_addr_t		atse_bmcr1;
+	uint32_t		atse_flags;
+#define	ATSE_FLAGS_LINK			0x00000001
+#define	ATSE_FLAGS_ERROR		0x00000002
+#define	ATSE_FLAGS_SOP_SEEN		0x00000004
+	uint8_t			atse_eth_addr[ETHER_ADDR_LEN];
+#define	ATSE_ETH_ADDR_DEF	0x01
+#define	ATSE_ETH_ADDR_SUPP1	0x02
+#define	ATSE_ETH_ADDR_SUPP2	0x04
+#define	ATSE_ETH_ADDR_SUPP3	0x08
+#define	ATSE_ETH_ADDR_SUPP4	0x10
+#define	ATSE_ETH_ADDR_ALL	0x1f
+	uint16_t		atse_watchdog_timer;
+	uint16_t		atse_tx_m_offset;
+	uint16_t		atse_tx_buf_len;
+	uint16_t		atse_rx_buf_len;
+	int16_t			atse_rx_cycles;		/* POLLING */
+#define	RX_CYCLES_IN_INTR	5
+	uint32_t		atse_rx_err[6];
+#define	ATSE_RX_ERR_FIFO_THRES_EOP	0 /* FIFO threshold reached, on EOP. */
+#define	ATSE_RX_ERR_ELEN		1 /* Frame/payload length not valid. */
+#define	ATSE_RX_ERR_CRC32		2 /* CRC-32 error. */
+#define	ATSE_RX_ERR_FIFO_THRES_TRUNC	3 /* FIFO thresh., truncated frame. */
+#define	ATSE_RX_ERR_4			4 /* ? */
+#define	ATSE_RX_ERR_5			5 /* / */
+#define	ATSE_RX_ERR_MAX			6
+	struct callout		atse_tick;
+	struct mtx		atse_mtx;
+};
+
+
+int	atse_attach(device_t);
+int	atse_detach_dev(device_t);
+void	atse_detach_resources(device_t);
+
+int	atse_miibus_readreg(device_t, int, int);
+int	atse_miibus_writereg(device_t, int, int, int);
+void	atse_miibus_statchg(device_t);
+
+extern devclass_t atse_devclass;
+
+#endif /* _DEV_IF_ATSEREG_H */
+
+/* end */
diff --git a/sys/dev/altera/avgen/altera_avgen_nexus.c b/sys/dev/altera/avgen/altera_avgen_nexus.c
index d0e4f9b3420..45e263c3042 100644
--- a/sys/dev/altera/avgen/altera_avgen_nexus.c
+++ b/sys/dev/altera/avgen/altera_avgen_nexus.c
@@ -58,7 +58,7 @@ altera_avgen_nexus_probe(device_t dev)
 {
 
 	device_set_desc(dev, "Generic Altera Avalon device attachment");
-	return (BUS_PROBE_DEFAULT);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
index 2fe772ae424..ff954fdeecb 100644
--- a/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
+++ b/sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c
@@ -62,7 +62,7 @@ altera_jtag_uart_nexus_probe(device_t dev)
 {
 
 	device_set_desc(dev, "Altera JTAG UART");
-	return (BUS_PROBE_DEFAULT);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/dev/altera/sdcard/altera_sdcard.c b/sys/dev/altera/sdcard/altera_sdcard.c
index f64b9c51ab9..45088451bc3 100644
--- a/sys/dev/altera/sdcard/altera_sdcard.c
+++ b/sys/dev/altera/sdcard/altera_sdcard.c
@@ -31,6 +31,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_altera_sdcard.h"
+
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/condvar.h>
@@ -258,6 +260,9 @@ altera_sdcard_task_io(struct altera_sdcard_softc *sc)
 	ALTERA_SDCARD_LOCK_ASSERT(sc);
 	KASSERT(sc->as_currentbio != NULL, ("%s: no current I/O", __func__));
 
+#ifdef ALTERA_SDCARD_FAST_SIM
+recheck:
+#endif
 	asr = altera_sdcard_read_asr(sc);
 
 	/*
@@ -299,9 +304,12 @@ altera_sdcard_task_io(struct altera_sdcard_softc *sc)
 	/*
 	 * Finally, either start the next I/O or transition to the IDLE state.
 	 */
-	if (bioq_first(&sc->as_bioq) != NULL)
+	if (bioq_first(&sc->as_bioq) != NULL) {
 		altera_sdcard_nextio(sc);
-	else
+#ifdef ALTERA_SDCARD_FAST_SIM
+		goto recheck;
+#endif
+	} else
 		sc->as_state = ALTERA_SDCARD_STATE_IDLE;
 }
 
@@ -398,6 +406,8 @@ altera_sdcard_start(struct altera_sdcard_softc *sc)
 
 	taskqueue_cancel_timeout(sc->as_taskqueue, &sc->as_task, NULL);
 	altera_sdcard_nextio(sc);
-	taskqueue_enqueue_timeout(sc->as_taskqueue, &sc->as_task,
-	    ALTERA_SDCARD_TIMEOUT_IO);
+#ifdef ALTERA_SDCARD_FAST_SIM
+	altera_sdcard_task_io(sc);
+#endif
+	altera_sdcard_task_rechedule(sc);
 }
diff --git a/sys/dev/altera/sdcard/altera_sdcard_io.c b/sys/dev/altera/sdcard/altera_sdcard_io.c
index b256c0bd396..55d2c4a2997 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_io.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_io.c
@@ -390,20 +390,23 @@ altera_sdcard_io_complete(struct altera_sdcard_softc *sc, uint16_t asr)
 		break;
 	}
 	if (error) {
+		sc->as_retriesleft--;
+		if (sc->as_retriesleft == 0 || bootverbose)
+			device_printf(sc->as_dev, "%s: %s operation block %ju "
+			    "length %ju failed; asr 0x%08x (rr1: 0x%04x)%s\n",
+			    __func__, bp->bio_cmd == BIO_READ ? "BIO_READ" :
+			    (bp->bio_cmd == BIO_WRITE ? "BIO_WRITE" :
+			    "unknown"),
+			    bp->bio_pblkno, bp->bio_bcount, asr, rr1,
+			    sc->as_retriesleft != 0 ? " retrying" : "");
 		/*
 		 * This attempt experienced an error; possibly retry.
 		 */
-		sc->as_retriesleft--;
 		if (sc->as_retriesleft != 0) {
 			sc->as_flags |= ALTERA_SDCARD_FLAG_IOERROR;
 			altera_sdcard_io_start_internal(sc, bp);
 			return (0);
 		}
-		device_printf(sc->as_dev, "%s: %s operation block %ju length "
-		    "%ju failed; asr 0x%08x (rr1: 0x%04x)\n", __func__,
-		    bp->bio_cmd == BIO_READ ? "BIO_READ" :
-		    (bp->bio_cmd == BIO_WRITE ? "BIO_WRITE" : "unknown"),
-		    bp->bio_pblkno, bp->bio_bcount, asr, rr1);
 		sc->as_flags &= ~ALTERA_SDCARD_FLAG_IOERROR;
 	} else {
 		/*
diff --git a/sys/dev/altera/sdcard/altera_sdcard_nexus.c b/sys/dev/altera/sdcard/altera_sdcard_nexus.c
index 88abe1fa123..bd5c6b81e6a 100644
--- a/sys/dev/altera/sdcard/altera_sdcard_nexus.c
+++ b/sys/dev/altera/sdcard/altera_sdcard_nexus.c
@@ -62,7 +62,7 @@ altera_sdcard_nexus_probe(device_t dev)
 {
 
 	device_set_desc(dev, "Altera Secure Data Card IP Core");
-	return (BUS_PROBE_DEFAULT);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index b2a13df8447..dbd5a7c8d45 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -111,6 +111,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/ethernet.h>
diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c
index 727e0aa74e4..7e993e7db90 100644
--- a/sys/dev/arcmsr/arcmsr.c
+++ b/sys/dev/arcmsr/arcmsr.c
@@ -957,9 +957,9 @@ static void arcmsr_iop_reset(struct AdapterControlBlock *acb)
 				srb->srb_state = ARCMSR_SRB_ABORTED;
 				srb->pccb->ccb_h.status |= CAM_REQ_ABORTED;
 				arcmsr_srb_complete(srb, 1);
-				printf("arcmsr%d: scsi id=%d lun=%d srb='%p' aborted\n"
+				printf("arcmsr%d: scsi id=%d lun=%jx srb='%p' aborted\n"
 						, acb->pci_unit, srb->pccb->ccb_h.target_id
-						, srb->pccb->ccb_h.target_lun, srb);
+						, (uintmax_t)srb->pccb->ccb_h.target_lun, srb);
 			}
 		}
 		/* enable all outbound interrupt */
@@ -2736,10 +2736,10 @@ static u_int8_t arcmsr_seek_cmd2abort(union ccb *abortccb)
 			if(srb->srb_state == ARCMSR_SRB_START) {
 				if(srb->pccb == abortccb) {
 					srb->srb_state = ARCMSR_SRB_ABORTED;
-					printf("arcmsr%d:scsi id=%d lun=%d abort srb '%p'"
+					printf("arcmsr%d:scsi id=%d lun=%jx abort srb '%p'"
 						"outstanding command \n"
 						, acb->pci_unit, abortccb->ccb_h.target_id
-						, abortccb->ccb_h.target_lun, srb);
+						, (uintmax_t)abortccb->ccb_h.target_lun, srb);
 					arcmsr_polling_srbdone(acb, srb);
 					/* enable outbound Post Queue, outbound doorbell Interrupt */
 					arcmsr_enable_allintr(acb, intmask_org);
@@ -3176,11 +3176,11 @@ polling_ccb_retry:
 		poll_srb_done = (srb == poll_srb) ? 1:0;
 		if((srb->acb != acb) || (srb->srb_state != ARCMSR_SRB_START)) {
 			if(srb->srb_state == ARCMSR_SRB_ABORTED) {
-				printf("arcmsr%d: scsi id=%d lun=%d srb='%p'"
+				printf("arcmsr%d: scsi id=%d lun=%jx srb='%p'"
 					"poll command abort successfully \n"
 					, acb->pci_unit
 					, srb->pccb->ccb_h.target_id
-					, srb->pccb->ccb_h.target_lun, srb);
+					, (uintmax_t)srb->pccb->ccb_h.target_lun, srb);
 				srb->pccb->ccb_h.status |= CAM_REQ_ABORTED;
 				arcmsr_srb_complete(srb, 1);
 				continue;
@@ -3236,11 +3236,11 @@ polling_ccb_retry:
 		poll_srb_done = (srb == poll_srb) ? 1:0;
 		if((srb->acb != acb) || (srb->srb_state != ARCMSR_SRB_START)) {
 			if(srb->srb_state == ARCMSR_SRB_ABORTED) {
-				printf("arcmsr%d: scsi id=%d lun=%d srb='%p'"
+				printf("arcmsr%d: scsi id=%d lun=%jx srb='%p'"
 					"poll command abort successfully \n"
 					, acb->pci_unit
 					, srb->pccb->ccb_h.target_id
-					, srb->pccb->ccb_h.target_lun, srb);
+					, (uintmax_t)srb->pccb->ccb_h.target_lun, srb);
 				srb->pccb->ccb_h.status |= CAM_REQ_ABORTED;
 				arcmsr_srb_complete(srb, 1);		
 				continue;
@@ -3291,8 +3291,8 @@ polling_ccb_retry:
 			poll_srb_done = (srb == poll_srb) ? 1:0;
 		if((srb->acb != acb) || (srb->srb_state != ARCMSR_SRB_START)) {
 			if(srb->srb_state == ARCMSR_SRB_ABORTED) {
-				printf("arcmsr%d: scsi id=%d lun=%d srb='%p'poll command abort successfully \n"
-						, acb->pci_unit, srb->pccb->ccb_h.target_id, srb->pccb->ccb_h.target_lun, srb);
+				printf("arcmsr%d: scsi id=%d lun=%jx srb='%p'poll command abort successfully \n"
+						, acb->pci_unit, srb->pccb->ccb_h.target_id, (uintmax_t)srb->pccb->ccb_h.target_lun, srb);
 				srb->pccb->ccb_h.status |= CAM_REQ_ABORTED;
 				arcmsr_srb_complete(srb, 1);
 				continue;
@@ -3347,8 +3347,8 @@ polling_ccb_retry:
 			poll_srb_done = (srb == poll_srb) ? 1:0;
 		if((srb->acb != acb) || (srb->srb_state != ARCMSR_SRB_START)) {
 			if(srb->srb_state == ARCMSR_SRB_ABORTED) {
-				printf("arcmsr%d: scsi id=%d lun=%d srb='%p'poll command abort successfully \n"
-						, acb->pci_unit, srb->pccb->ccb_h.target_id, srb->pccb->ccb_h.target_lun, srb);
+				printf("arcmsr%d: scsi id=%d lun=%jx srb='%p'poll command abort successfully \n"
+						, acb->pci_unit, srb->pccb->ccb_h.target_id, (uintmax_t)srb->pccb->ccb_h.target_lun, srb);
 				srb->pccb->ccb_h.status |= CAM_REQ_ABORTED;
 				arcmsr_srb_complete(srb, 1);
 				continue;
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index 1e4f1a618a4..ac97483b5a1 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -2740,12 +2740,13 @@ asr_action(struct cam_sim *sim, union ccb  *ccb)
 		}
 		if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_INPROG) {
 			printf(
-			  "asr%d WARNING: scsi_cmd(%x) already done on b%dt%du%d\n",
+			  "asr%d WARNING: scsi_cmd(%x) already done on b%dt%d "
+			  "LUN %jx\n",
 			  cam_sim_unit(xpt_path_sim(ccb->ccb_h.path)),
 			  ccb->csio.cdb_io.cdb_bytes[0],
 			  cam_sim_bus(sim),
 			  ccb->ccb_h.target_id,
-			  ccb->ccb_h.target_lun);
+			  (uintmax_t)ccb->ccb_h.target_lun);
 		}
 		debug_asr_cmd_printf("(%d,%d,%d,%d)", cam_sim_unit(sim),
 				     cam_sim_bus(sim), ccb->ccb_h.target_id,
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c
index cfd025f1708..957dd954317 100644
--- a/sys/dev/ata/ata-all.c
+++ b/sys/dev/ata/ata-all.c
@@ -92,7 +92,7 @@ FEATURE(ata_cam, "ATA devices are accessed through the cam(4) driver");
 int
 ata_probe(device_t dev)
 {
-    return 0;
+    return (BUS_PROBE_DEFAULT);
 }
 
 int
@@ -353,9 +353,7 @@ ata_interrupt(void *data)
     struct ata_channel *ch = (struct ata_channel *)data;
 
     mtx_lock(&ch->state_mtx);
-    xpt_batch_start(ch->sim);
     ata_interrupt_locked(data);
-    xpt_batch_done(ch->sim);
     mtx_unlock(&ch->state_mtx);
 }
 
diff --git a/sys/dev/ata/ata-card.c b/sys/dev/ata/ata-card.c
index eb49c2cb456..5346b8fd717 100644
--- a/sys/dev/ata/ata-card.c
+++ b/sys/dev/ata/ata-card.c
@@ -140,7 +140,7 @@ ata_pccard_attach(device_t dev)
         ch-> flags |= ATA_NO_SLAVE;
     ata_generic_hw(dev);
     err = ata_probe(dev);
-    if (err)
+    if (err > 0)
 	return (err);
     return (ata_attach(dev));
 }
diff --git a/sys/dev/ata/ata-pci.h b/sys/dev/ata/ata-pci.h
index 8b360731b7f..26ee4a07fc6 100644
--- a/sys/dev/ata/ata-pci.h
+++ b/sys/dev/ata/ata-pci.h
@@ -257,6 +257,11 @@ struct ata_pci_controller {
 #define ATA_PPT_R5		0x1e0e8086
 #define ATA_PPT_R6		0x1e0f8086
 
+#define ATA_AVOTON_S1		0x1f208086
+#define ATA_AVOTON_S2		0x1f218086
+#define ATA_AVOTON_S3		0x1f308086
+#define ATA_AVOTON_S4		0x1f318086
+
 #define ATA_LPT_S1		0x8c008086
 #define ATA_LPT_S2		0x8c018086
 #define ATA_LPT_AH1		0x8c028086
@@ -270,6 +275,16 @@ struct ata_pci_controller {
 #define ATA_LPT_R5		0x8c0e8086
 #define ATA_LPT_R6		0x8c0f8086
 
+#define ATA_WELLS_S1		0x8d008086
+#define ATA_WELLS_S2		0x8d088086
+#define ATA_WELLS_S3		0x8d608086
+#define ATA_WELLS_S4		0x8d688086
+
+#define ATA_LPTLP_S1		0x9c008086
+#define ATA_LPTLP_S2		0x9c018086
+#define ATA_LPTLP_S3		0x9c088086
+#define ATA_LPTLP_S4		0x9c098086
+
 #define ATA_I31244              0x32008086
 #define ATA_ISCH                0x811a8086
 #define ATA_DH89XXCC            0x23238086
diff --git a/sys/dev/ata/chipsets/ata-intel.c b/sys/dev/ata/chipsets/ata-intel.c
index d7b135d545c..33078354f1d 100644
--- a/sys/dev/ata/chipsets/ata-intel.c
+++ b/sys/dev/ata/chipsets/ata-intel.c
@@ -211,6 +211,10 @@ ata_intel_probe(device_t dev)
      { ATA_PPT_S4,       0, INTEL_6CH2, 0, ATA_SA300, "Panther Point" },
      { ATA_PPT_R5,       0, INTEL_AHCI, 0, ATA_SA300, "Panther Point" },
      { ATA_PPT_R6,       0, INTEL_AHCI, 0, ATA_SA300, "Panther Point" },
+     { ATA_AVOTON_S1,    0, INTEL_6CH,  0, ATA_SA300, "Avoton" },
+     { ATA_AVOTON_S2,    0, INTEL_6CH,  0, ATA_SA300, "Avoton" },
+     { ATA_AVOTON_S3,    0, INTEL_6CH2, 0, ATA_SA300, "Avoton" },
+     { ATA_AVOTON_S4,    0, INTEL_6CH2, 0, ATA_SA300, "Avoton" },
      { ATA_LPT_S1,       0, INTEL_6CH,  0, ATA_SA300, "Lynx Point" },
      { ATA_LPT_S2,       0, INTEL_6CH,  0, ATA_SA300, "Lynx Point" },
      { ATA_LPT_AH1,      0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" },
@@ -223,6 +227,14 @@ ata_intel_probe(device_t dev)
      { ATA_LPT_S4,       0, INTEL_6CH2, 0, ATA_SA300, "Lynx Point" },
      { ATA_LPT_R5,       0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" },
      { ATA_LPT_R6,       0, INTEL_AHCI, 0, ATA_SA300, "Lynx Point" },
+     { ATA_WELLS_S1,     0, INTEL_6CH,  0, ATA_SA300, "Wellsburg" },
+     { ATA_WELLS_S2,     0, INTEL_6CH2, 0, ATA_SA300, "Wellsburg" },
+     { ATA_WELLS_S3,     0, INTEL_6CH,  0, ATA_SA300, "Wellsburg" },
+     { ATA_WELLS_S4,     0, INTEL_6CH2, 0, ATA_SA300, "Wellsburg" },
+     { ATA_LPTLP_S1,     0, INTEL_6CH,  0, ATA_SA300, "Lynx Point-LP" },
+     { ATA_LPTLP_S2,     0, INTEL_6CH,  0, ATA_SA300, "Lynx Point-LP" },
+     { ATA_LPTLP_S3,     0, INTEL_6CH2, 0, ATA_SA300, "Lynx Point-LP" },
+     { ATA_LPTLP_S4,     0, INTEL_6CH2, 0, ATA_SA300, "Lynx Point-LP" },
      { ATA_I31244,       0,          0, 2, ATA_SA150, "31244" },
      { ATA_ISCH,         0,          0, 1, ATA_UDMA5, "SCH" },
      { ATA_DH89XXCC,     0, INTEL_AHCI, 0, ATA_SA300, "DH89xxCC" },
diff --git a/sys/dev/ath/ath_dfs/null/dfs_null.c b/sys/dev/ath/ath_dfs/null/dfs_null.c
index 36b20420c6c..c980a7990ed 100644
--- a/sys/dev/ath/ath_dfs/null/dfs_null.c
+++ b/sys/dev/ath/ath_dfs/null/dfs_null.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
 
@@ -53,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212.h b/sys/dev/ath/ath_hal/ar5212/ar5212.h
index 0631432fdbe..6d38d65f723 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212.h
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212.h
@@ -335,6 +335,16 @@ struct ath_hal_5212 {
 
 	uint8_t		ah_txTrigLev;		/* current Tx trigger level */
 	uint8_t		ah_maxTxTrigLev;	/* max tx trigger level */
+
+	/*
+	 * Channel Tx, Rx, Rx Clear State
+	 */
+	uint32_t	ah_cycleCount;
+	uint32_t	ah_ctlBusy;
+	uint32_t	ah_rxBusy;
+	uint32_t	ah_txBusy;
+	uint32_t	ah_rx_chainmask;
+	uint32_t	ah_tx_chainmask;
 };
 #define	AH5212(_ah)	((struct ath_hal_5212 *)(_ah))
 
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c b/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c
index b101306a635..8e87a2f1fa4 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_ani.c
@@ -865,16 +865,40 @@ static int32_t
 ar5212AniGetListenTime(struct ath_hal *ah)
 {
 	struct ath_hal_5212 *ahp = AH5212(ah);
-	struct ar5212AniState *aniState;
-	uint32_t txFrameCount, rxFrameCount, cycleCount;
-	int32_t listenTime;
+	struct ar5212AniState *aniState = NULL;
+	int32_t listenTime = 0;
+	int good;
+	HAL_SURVEY_SAMPLE hs;
+	HAL_CHANNEL_SURVEY *cs = AH_NULL;
 
-	txFrameCount = OS_REG_READ(ah, AR_TFCNT);
-	rxFrameCount = OS_REG_READ(ah, AR_RFCNT);
-	cycleCount = OS_REG_READ(ah, AR_CCCNT);
+	/*
+	 * We shouldn't see ah_curchan be NULL, but just in case..
+	 */
+	if (AH_PRIVATE(ah)->ah_curchan == AH_NULL) {
+		ath_hal_printf(ah, "%s: ah_curchan = NULL?\n", __func__);
+		return (0);
+	}
 
-	aniState = ahp->ah_curani;
-	if (aniState->cycleCount == 0 || aniState->cycleCount > cycleCount) {
+	cs = &ahp->ah_chansurvey;
+
+	/*
+	 * Fetch the current statistics, squirrel away the current
+	 * sample, bump the sequence/sample counter.
+	 */
+	OS_MEMZERO(&hs, sizeof(hs));
+	good = ar5212GetMibCycleCounts(ah, &hs);
+	if (cs != AH_NULL) {
+		OS_MEMCPY(&cs->samples[cs->cur_sample], &hs, sizeof(hs));
+		cs->samples[cs->cur_sample].seq_num = cs->cur_seq;
+		cs->cur_sample =
+		    (cs->cur_sample + 1) % CHANNEL_SURVEY_SAMPLE_COUNT;
+		cs->cur_seq++;
+	}
+
+	if (ANI_ENA(ah))
+		aniState = ahp->ah_curani;
+
+	if (good == AH_FALSE) {
 		/*
 		 * Cycle counter wrap (or initial call); it's not possible
 		 * to accurately calculate a value because the registers
@@ -882,15 +906,29 @@ ar5212AniGetListenTime(struct ath_hal *ah)
 		 */
 		listenTime = 0;
 		ahp->ah_stats.ast_ani_lzero++;
-	} else {
-		int32_t ccdelta = cycleCount - aniState->cycleCount;
-		int32_t rfdelta = rxFrameCount - aniState->rxFrameCount;
-		int32_t tfdelta = txFrameCount - aniState->txFrameCount;
+	} else if (ANI_ENA(ah)) {
+		/*
+		 * Only calculate and update the cycle count if we have
+		 * an ANI state.
+		 */
+		int32_t ccdelta =
+		    AH5212(ah)->ah_cycleCount - aniState->cycleCount;
+		int32_t rfdelta =
+		    AH5212(ah)->ah_rxBusy - aniState->rxFrameCount;
+		int32_t tfdelta =
+		    AH5212(ah)->ah_txBusy - aniState->txFrameCount;
 		listenTime = (ccdelta - rfdelta - tfdelta) / CLOCK_RATE;
 	}
-	aniState->cycleCount = cycleCount;
-	aniState->txFrameCount = txFrameCount;
-	aniState->rxFrameCount = rxFrameCount;
+
+	/*
+	 * Again, only update ANI state if we have it.
+	 */
+	if (ANI_ENA(ah)) {
+		aniState->cycleCount = AH5212(ah)->ah_cycleCount;
+		aniState->rxFrameCount = AH5212(ah)->ah_rxBusy;
+		aniState->txFrameCount = AH5212(ah)->ah_txBusy;
+	}
+
 	return listenTime;
 }
 
@@ -956,13 +994,15 @@ ar5212AniPoll(struct ath_hal *ah, const struct ieee80211_channel *chan)
 	const struct ar5212AniParams *params;
 	int32_t listenTime;
 
+	/* Always update from the MIB, for statistics gathering */
+	listenTime = ar5212AniGetListenTime(ah);
+
 	/* XXX can aniState be null? */
 	if (aniState == AH_NULL)
 		return;
 	if (!ANI_ENA(ah))
 		return;
 
-	listenTime = ar5212AniGetListenTime(ah);
 	if (listenTime < 0) {
 		ahp->ah_stats.ast_ani_lneg++;
 		/* restart ANI period if listenTime is invalid */
diff --git a/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c b/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
index 486de30a372..71ee84546f8 100644
--- a/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
+++ b/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
@@ -1405,13 +1405,47 @@ ar5212Get11nExtBusy(struct ath_hal *ah)
 }
 
 /*
- * There's no channel survey support for the AR5212.
+ * Channel survey support.
  */
 HAL_BOOL
 ar5212GetMibCycleCounts(struct ath_hal *ah, HAL_SURVEY_SAMPLE *hsample)
 {
+	struct ath_hal_5212 *ahp = AH5212(ah);
+	u_int32_t good = AH_TRUE;
 
-	return (AH_FALSE);
+	/* XXX freeze/unfreeze mib counters */
+	uint32_t rc = OS_REG_READ(ah, AR_RCCNT);
+	uint32_t rf = OS_REG_READ(ah, AR_RFCNT);
+	uint32_t tf = OS_REG_READ(ah, AR_TFCNT);
+	uint32_t cc = OS_REG_READ(ah, AR_CCCNT); /* read cycles last */
+
+	if (ahp->ah_cycleCount == 0 || ahp->ah_cycleCount > cc) {
+		/*
+		 * Cycle counter wrap (or initial call); it's not possible
+		 * to accurately calculate a value because the registers
+		 * right shift rather than wrap--so punt and return 0.
+		 */
+		HALDEBUG(ah, HAL_DEBUG_ANY,
+		    "%s: cycle counter wrap. ExtBusy = 0\n", __func__);
+		good = AH_FALSE;
+	} else {
+		hsample->cycle_count = cc - ahp->ah_cycleCount;
+		hsample->chan_busy = rc - ahp->ah_ctlBusy;
+		hsample->ext_chan_busy = 0;
+		hsample->rx_busy = rf - ahp->ah_rxBusy;
+		hsample->tx_busy = tf - ahp->ah_txBusy;
+	}
+
+	/*
+	 * Keep a copy of the MIB results so the next sample has something
+	 * to work from.
+	 */
+	ahp->ah_cycleCount = cc;
+	ahp->ah_rxBusy = rf;
+	ahp->ah_ctlBusy = rc;
+	ahp->ah_txBusy = tf;
+
+	return (good);
 }
 
 void
diff --git a/sys/dev/ath/ath_rate/sample/sample.c b/sys/dev/ath/ath_rate/sample/sample.c
index b3f82fa9509..3df2ccd324f 100644
--- a/sys/dev/ath/ath_rate/sample/sample.c
+++ b/sys/dev/ath/ath_rate/sample/sample.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
 
@@ -61,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index b4df1d67fc2..49fd9efb33e 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
@@ -2725,7 +2726,7 @@ ath_transmit(struct ifnet *ifp, struct mbuf *m)
 	 */
 	ATH_PCU_LOCK(sc);
 	if (sc->sc_inreset_cnt > 0) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT,
 		    "%s: sc_inreset_cnt > 0; bailing\n", __func__);
 		ATH_PCU_UNLOCK(sc);
 		IF_LOCK(&ifp->if_snd);
@@ -6430,7 +6431,7 @@ ath_node_recv_pspoll(struct ieee80211_node *ni, struct mbuf *m)
 	 * Immediately punt.
 	 */
 	if (! an->an_is_powersave) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_NODE_PWRSAVE,
 		    "%s: %6D: not in powersave?\n",
 		    __func__,
 		    ni->ni_macaddr,
@@ -6498,7 +6499,8 @@ ath_node_recv_pspoll(struct ieee80211_node *ni, struct mbuf *m)
 	/*
 	 * XXX nothing in the TIDs at this point? Eek.
 	 */
-	device_printf(sc->sc_dev, "%s: %6D: TIDs empty, but ath_node showed traffic?!\n",
+	DPRINTF(sc, ATH_DEBUG_NODE_PWRSAVE,
+	    "%s: %6D: TIDs empty, but ath_node showed traffic?!\n",
 	    __func__,
 	    ni->ni_macaddr,
 	    ":");
diff --git a/sys/dev/ath/if_ath_ahb.c b/sys/dev/ath/if_ath_ahb.c
index 59593b604a8..362257fd679 100644
--- a/sys/dev/ath/if_ath_ahb.c
+++ b/sys/dev/ath/if_ath_ahb.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h> 
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
@@ -55,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 
diff --git a/sys/dev/ath/if_ath_beacon.c b/sys/dev/ath/if_ath_beacon.c
index 11b0426ff8c..f721de64c93 100644
--- a/sys/dev/ath/if_ath_beacon.c
+++ b/sys/dev/ath/if_ath_beacon.c
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/ath/if_ath_btcoex.c b/sys/dev/ath/if_ath_btcoex.c
index fff6f3b93ef..9d776222750 100644
--- a/sys/dev/ath/if_ath_btcoex.c
+++ b/sys/dev/ath/if_ath_btcoex.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
 
@@ -54,6 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
diff --git a/sys/dev/ath/if_ath_keycache.c b/sys/dev/ath/if_ath_keycache.c
index 6c2749f173b..a9e6df0e46e 100644
--- a/sys/dev/ath/if_ath_keycache.c
+++ b/sys/dev/ath/if_ath_keycache.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/ath/if_ath_lna_div.c b/sys/dev/ath/if_ath_lna_div.c
index 4ae81a3c980..961b83429c1 100644
--- a/sys/dev/ath/if_ath_lna_div.c
+++ b/sys/dev/ath/if_ath_lna_div.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
 
@@ -54,6 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
diff --git a/sys/dev/ath/if_ath_pci.c b/sys/dev/ath/if_ath_pci.c
index 91cb425ffc2..0b1153cdd7c 100644
--- a/sys/dev/ath/if_ath_pci.c
+++ b/sys/dev/ath/if_ath_pci.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h> 
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
@@ -53,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 
diff --git a/sys/dev/ath/if_ath_rx.c b/sys/dev/ath/if_ath_rx.c
index d9e212bf2ac..5c30a46cbef 100644
--- a/sys/dev/ath/if_ath_rx.c
+++ b/sys/dev/ath/if_ath_rx.c
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/ath/if_ath_rx_edma.c b/sys/dev/ath/if_ath_rx_edma.c
index 2be8627ace2..e072fc22e89 100644
--- a/sys/dev/ath/if_ath_rx_edma.c
+++ b/sys/dev/ath/if_ath_rx_edma.c
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/ath/if_ath_spectral.c b/sys/dev/ath/if_ath_spectral.c
index 5cfb1a98d14..e4afdaefbbb 100644
--- a/sys/dev/ath/if_ath_spectral.c
+++ b/sys/dev/ath/if_ath_spectral.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
 
@@ -53,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
diff --git a/sys/dev/ath/if_ath_sysctl.c b/sys/dev/ath/if_ath_sysctl.c
index 0a5719a24a1..f1b6dd264c1 100644
--- a/sys/dev/ath/if_ath_sysctl.c
+++ b/sys/dev/ath/if_ath_sysctl.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/ath/if_ath_tdma.c b/sys/dev/ath/if_ath_tdma.c
index c075d01849a..3ea70e359a0 100644
--- a/sys/dev/ath/if_ath_tdma.c
+++ b/sys/dev/ath/if_ath_tdma.c
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/ath/if_ath_tx.c b/sys/dev/ath/if_ath_tx.c
index b6bab9b4fd9..b529db6dfdd 100644
--- a/sys/dev/ath/if_ath_tx.c
+++ b/sys/dev/ath/if_ath_tx.c
@@ -59,10 +59,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/kthread.h>
 #include <sys/taskqueue.h>
 #include <sys/priv.h>
+#include <sys/ktr.h>
 
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
@@ -268,7 +270,7 @@ ath_txfrag_setup(struct ath_softc *sc, ath_bufhead *frags,
 		/* XXX non-management? */
 		bf = _ath_getbuf_locked(sc, ATH_BUFTYPE_NORMAL);
 		if (bf == NULL) {	/* out of buffers, cleanup */
-			device_printf(sc->sc_dev, "%s: no buffer?\n",
+			DPRINTF(sc, ATH_DEBUG_XMIT, "%s: no buffer?\n",
 			    __func__);
 			ath_txfrag_cleanup(sc, frags, ni);
 			break;
@@ -560,10 +562,10 @@ ath_tx_setds_11n(struct ath_softc *sc, struct ath_buf *bf_first)
 	bf = bf_first;
 
 	if (bf->bf_state.bfs_txrate0 == 0)
-		device_printf(sc->sc_dev, "%s: bf=%p, txrate0=%d\n",
+		DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR, "%s: bf=%p, txrate0=%d\n",
 		    __func__, bf, 0);
 	if (bf->bf_state.bfs_rc[0].ratecode == 0)
-		device_printf(sc->sc_dev, "%s: bf=%p, rix0=%d\n",
+		DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR, "%s: bf=%p, rix0=%d\n",
 		    __func__, bf, 0);
 
 	/*
@@ -708,11 +710,9 @@ ath_tx_handoff_mcast(struct ath_softc *sc, struct ath_txq *txq,
 	 * mapped correctly.
 	 */
 	if (bf->bf_state.bfs_tx_queue != sc->sc_cabq->axq_qnum) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT,
 		    "%s: bf=%p, bfs_tx_queue=%d, axq_qnum=%d\n",
-		    __func__,
-		    bf,
-		    bf->bf_state.bfs_tx_queue,
+		    __func__, bf, bf->bf_state.bfs_tx_queue,
 		    txq->axq_qnum);
 	}
 
@@ -881,11 +881,9 @@ ath_tx_handoff_hw(struct ath_softc *sc, struct ath_txq *txq,
 	 * checking and holding buffer manipulation is sane.
 	 */
 	if (bf->bf_state.bfs_tx_queue != txq->axq_qnum) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT,
 		    "%s: bf=%p, bfs_tx_queue=%d, axq_qnum=%d\n",
-		    __func__,
-		    bf,
-		    bf->bf_state.bfs_tx_queue,
+		    __func__, bf, bf->bf_state.bfs_tx_queue,
 		    txq->axq_qnum);
 	}
 
@@ -1343,8 +1341,8 @@ ath_tx_setds(struct ath_softc *sc, struct ath_buf *bf)
 	struct ath_hal *ah = sc->sc_ah;
 
 	if (bf->bf_state.bfs_txrate0 == 0)
-		device_printf(sc->sc_dev, "%s: bf=%p, txrate0=%d\n",
-		    __func__, bf, 0);
+		DPRINTF(sc, ATH_DEBUG_XMIT, 
+		    "%s: bf=%p, txrate0=%d\n", __func__, bf, 0);
 
 	ath_hal_setuptxdesc(ah, ds
 		, bf->bf_state.bfs_pktlen	/* packet length */
@@ -1481,14 +1479,10 @@ ath_tx_should_swq_frame(struct ath_softc *sc, struct ath_node *an,
 		 * Other control/mgmt frame; bypass software queuing
 		 * for now!
 		 */
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT, 
 		    "%s: %6D: Node is asleep; sending mgmt "
 		    "(type=%d, subtype=%d)\n",
-		    __func__,
-		    ni->ni_macaddr,
-		    ":",
-		    type,
-		    subtype);
+		    __func__, ni->ni_macaddr, ":", type, subtype);
 		return (0);
 	} else {
 		return (1);
@@ -1743,7 +1737,7 @@ ath_tx_normal_setup(struct ath_softc *sc, struct ieee80211_node *ni,
 	 */
 #if 0
 	if (txq != sc->sc_ac2q[pri]) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT, 
 		    "%s: txq=%p (%d), pri=%d, pri txq=%p (%d)\n",
 		    __func__,
 		    txq,
@@ -2145,7 +2139,7 @@ ath_tx_raw_start(struct ath_softc *sc, struct ieee80211_node *ni,
 	/* Map ADDBA to the correct priority */
 	if (do_override) {
 #if 0
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT, 
 		    "%s: overriding tid %d pri %d -> %d\n",
 		    __func__, o_tid, pri, TID_TO_WME_AC(o_tid));
 #endif
@@ -2356,8 +2350,8 @@ ath_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
 
 	ATH_PCU_LOCK(sc);
 	if (sc->sc_inreset_cnt > 0) {
-		device_printf(sc->sc_dev, "%s: sc_inreset_cnt > 0; bailing\n",
-		    __func__);
+		DPRINTF(sc, ATH_DEBUG_XMIT, 
+		    "%s: sc_inreset_cnt > 0; bailing\n", __func__);
 		error = EIO;
 		ATH_PCU_UNLOCK(sc);
 		goto bad0;
@@ -2585,16 +2579,14 @@ ath_tx_addto_baw(struct ath_softc *sc, struct ath_node *an,
 	tap = ath_tx_get_tx_tid(an, tid->tid);
 
 	if (! bf->bf_state.bfs_dobaw) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
 		    "%s: dobaw=0, seqno=%d, window %d:%d\n",
-		    __func__,
-		    SEQNO(bf->bf_state.bfs_seqno),
-		    tap->txa_start,
-		    tap->txa_wnd);
+		    __func__, SEQNO(bf->bf_state.bfs_seqno),
+		    tap->txa_start, tap->txa_wnd);
 	}
 
 	if (bf->bf_state.bfs_addedbaw)
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
 		    "%s: re-added? tid=%d, seqno %d; window %d:%d; "
 		    "baw head=%d tail=%d\n",
 		    __func__, tid->tid, SEQNO(bf->bf_state.bfs_seqno),
@@ -2607,7 +2599,7 @@ ath_tx_addto_baw(struct ath_softc *sc, struct ath_node *an,
 	 */
 	if (! BAW_WITHIN(tap->txa_start, tap->txa_wnd,
 	    SEQNO(bf->bf_state.bfs_seqno))) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
 		    "%s: bf=%p: outside of BAW?? tid=%d, seqno %d; window %d:%d; "
 		    "baw head=%d tail=%d\n",
 		    __func__, bf, tid->tid, SEQNO(bf->bf_state.bfs_seqno),
@@ -2633,11 +2625,11 @@ ath_tx_addto_baw(struct ath_softc *sc, struct ath_node *an,
 	assert(tid->tx_buf[cindex] == NULL);
 #endif
 	if (tid->tx_buf[cindex] != NULL) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
 		    "%s: ba packet dup (index=%d, cindex=%d, "
 		    "head=%d, tail=%d)\n",
 		    __func__, index, cindex, tid->baw_head, tid->baw_tail);
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
 		    "%s: BA bf: %p; seqno=%d ; new bf: %p; seqno=%d\n",
 		    __func__,
 		    tid->tx_buf[cindex],
@@ -2684,22 +2676,21 @@ ath_tx_switch_baw_buf(struct ath_softc *sc, struct ath_node *an,
 	 * soon hang.
 	 */
 	if (old_bf->bf_state.bfs_seqno != new_bf->bf_state.bfs_seqno) {
-		device_printf(sc->sc_dev, "%s: retransmitted buffer"
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
+		    "%s: retransmitted buffer"
 		    " has mismatching seqno's, BA session may hang.\n",
 		    __func__);
-		device_printf(sc->sc_dev, "%s: old seqno=%d, new_seqno=%d\n",
-		    __func__,
-		    old_bf->bf_state.bfs_seqno,
-		    new_bf->bf_state.bfs_seqno);
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
+		    "%s: old seqno=%d, new_seqno=%d\n", __func__,
+		    old_bf->bf_state.bfs_seqno, new_bf->bf_state.bfs_seqno);
 	}
 
 	if (tid->tx_buf[cindex] != old_bf) {
-		device_printf(sc->sc_dev, "%s: ath_buf pointer incorrect; "
-		    " has m BA session may hang.\n",
-		    __func__);
-		device_printf(sc->sc_dev, "%s: old bf=%p, new bf=%p\n",
-		    __func__,
-		    old_bf, new_bf);
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
+		    "%s: ath_buf pointer incorrect; "
+		    " has m BA session may hang.\n", __func__);
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
+		    "%s: old bf=%p, new bf=%p\n", __func__, old_bf, new_bf);
 	}
 
 	tid->tx_buf[cindex] = new_bf;
@@ -2743,10 +2734,9 @@ ath_tx_update_baw(struct ath_softc *sc, struct ath_node *an,
 	 * here and causing it to fire off. Disable TDMA for now.
 	 */
 	if (tid->tx_buf[cindex] != bf) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
 		    "%s: comp bf=%p, seq=%d; slot bf=%p, seqno=%d\n",
-		    __func__,
-		    bf, SEQNO(bf->bf_state.bfs_seqno),
+		    __func__, bf, SEQNO(bf->bf_state.bfs_seqno),
 		    tid->tx_buf[cindex],
 		    (tid->tx_buf[cindex] != NULL) ?
 		      SEQNO(tid->tx_buf[cindex]->bf_state.bfs_seqno) : -1);
@@ -2992,10 +2982,9 @@ ath_tx_xmit_aggr(struct ath_softc *sc, struct ath_node *an,
 	 * be reset or the completion code will get upset with you.
 	 */
 	if (bf->bf_state.bfs_aggr != 0 || bf->bf_state.bfs_nframes > 1) {
-		device_printf(sc->sc_dev, "%s: bfs_aggr=%d, bfs_nframes=%d\n",
-		    __func__,
-		    bf->bf_state.bfs_aggr,
-		    bf->bf_state.bfs_nframes);
+		DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
+		    "%s: bfs_aggr=%d, bfs_nframes=%d\n", __func__,
+		    bf->bf_state.bfs_aggr, bf->bf_state.bfs_nframes);
 		bf->bf_state.bfs_aggr = 0;
 		bf->bf_state.bfs_nframes = 1;
 	}
@@ -3273,10 +3262,9 @@ ath_tx_tid_resume(struct ath_softc *sc, struct ath_tid *tid)
 	 * until it's actually resolved.
 	 */
 	if (tid->paused == 0) {
-		device_printf(sc->sc_dev, "%s: %6D: paused=0?\n",
-		    __func__,
-		    tid->an->an_node.ni_macaddr,
-		    ":");
+		DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL,
+		    "%s: %6D: paused=0?\n", __func__,
+		    tid->an->an_node.ni_macaddr, ":");
 	} else {
 		tid->paused--;
 	}
@@ -3298,7 +3286,8 @@ ath_tx_tid_resume(struct ath_softc *sc, struct ath_tid *tid)
 
 	/* XXX isfiltered shouldn't ever be 0 at this point */
 	if (tid->isfiltered == 1) {
-		device_printf(sc->sc_dev, "%s: filtered?!\n", __func__);
+		DPRINTF(sc, ATH_DEBUG_SW_TX_CTRL, "%s: filtered?!\n",
+		    __func__);
 		return;
 	}
 
@@ -3321,8 +3310,9 @@ ath_tx_tid_filt_addbuf(struct ath_softc *sc, struct ath_tid *tid,
 
 	ATH_TX_LOCK_ASSERT(sc);
 
-	if (! tid->isfiltered)
-		device_printf(sc->sc_dev, "%s: not filtered?!\n", __func__);
+	if (!tid->isfiltered)
+		DPRINTF(sc, ATH_DEBUG_SW_TX_FILT, "%s: not filtered?!\n",
+		    __func__);
 
 	DPRINTF(sc, ATH_DEBUG_SW_TX_FILT, "%s: bf=%p\n", __func__, bf);
 
@@ -3518,8 +3508,8 @@ ath_tx_tid_bar_suspend(struct ath_softc *sc, struct ath_tid *tid)
 
 	/* We shouldn't be called when bar_tx is 1 */
 	if (tid->bar_tx) {
-		device_printf(sc->sc_dev, "%s: bar_tx is 1?!\n",
-		    __func__);
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAR,
+		    "%s: bar_tx is 1?!\n", __func__);
 	}
 
 	/* If we've already been called, just be patient. */
@@ -3551,14 +3541,10 @@ ath_tx_tid_bar_unsuspend(struct ath_softc *sc, struct ath_tid *tid)
 	    tid->tid);
 
 	if (tid->bar_tx == 0 || tid->bar_wait == 0) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAR,
 		    "%s: %6D: TID=%d, bar_tx=%d, bar_wait=%d: ?\n",
-		    __func__,
-		    tid->an->an_node.ni_macaddr,
-		    ":",
-		    tid->tid,
-		    tid->bar_tx,
-		    tid->bar_wait);
+		    __func__, tid->an->an_node.ni_macaddr, ":",
+		    tid->tid, tid->bar_tx, tid->bar_wait);
 	}
 
 	tid->bar_tx = tid->bar_wait = 0;
@@ -3621,14 +3607,10 @@ ath_tx_tid_bar_tx(struct ath_softc *sc, struct ath_tid *tid)
 	 * This is an error condition!
 	 */
 	if (tid->bar_wait == 0 || tid->bar_tx == 1) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_BAR,
 		    "%s: %6D: TID=%d, bar_tx=%d, bar_wait=%d: ?\n",
-		    __func__,
-		    tid->an->an_node.ni_macaddr,
-		    ":",
-		    tid->tid,
-		    tid->bar_tx,
-		    tid->bar_wait);
+		    __func__, tid->an->an_node.ni_macaddr, ":",
+		    tid->tid, tid->bar_tx, tid->bar_wait);
 		return;
 	}
 
@@ -3679,11 +3661,9 @@ ath_tx_tid_bar_tx(struct ath_softc *sc, struct ath_tid *tid)
 
 	/* Failure? For now, warn loudly and continue */
 	ATH_TX_LOCK(sc);
-	device_printf(sc->sc_dev,
+	DPRINTF(sc, ATH_DEBUG_SW_TX_BAR,
 	    "%s: %6D: TID=%d, failed to TX BAR, continue!\n",
-	    __func__,
-	    tid->an->an_node.ni_macaddr,
-	    ":",
+	    __func__, tid->an->an_node.ni_macaddr, ":",
 	    tid->tid);
 	ath_tx_tid_bar_unsuspend(sc, tid);
 }
@@ -3715,7 +3695,7 @@ ath_tx_tid_drain_pkt(struct ath_softc *sc, struct ath_node *an,
 		 * This has become a non-fatal error now
 		 */
 		if (! bf->bf_state.bfs_addedbaw)
-			device_printf(sc->sc_dev,
+			DPRINTF(sc, ATH_DEBUG_SW_TX_BAW
 			    "%s: wasn't added: seqno %d\n",
 			    __func__, SEQNO(bf->bf_state.bfs_seqno));
 #endif
@@ -3733,12 +3713,13 @@ ath_tx_tid_drain_print(struct ath_softc *sc, struct ath_node *an,
     const char *pfx, struct ath_tid *tid, struct ath_buf *bf)
 {
 	struct ieee80211_node *ni = &an->an_node;
-	struct ath_txq *txq = sc->sc_ac2q[tid->ac];
+	struct ath_txq *txq;
 	struct ieee80211_tx_ampdu *tap;
 
+	txq = sc->sc_ac2q[tid->ac];
 	tap = ath_tx_get_tx_tid(an, tid->tid);
 
-	device_printf(sc->sc_dev,
+	DPRINTF(sc, ATH_DEBUG_SW_TX,
 	    "%s: %s: %6D: bf=%p: addbaw=%d, dobaw=%d, "
 	    "seqno=%d, retry=%d\n",
 	    __func__,
@@ -3750,7 +3731,7 @@ ath_tx_tid_drain_print(struct ath_softc *sc, struct ath_node *an,
 	    bf->bf_state.bfs_dobaw,
 	    SEQNO(bf->bf_state.bfs_seqno),
 	    bf->bf_state.bfs_retries);
-	device_printf(sc->sc_dev,
+	DPRINTF(sc, ATH_DEBUG_SW_TX,
 	    "%s: %s: %6D: bf=%p: txq[%d] axq_depth=%d, axq_aggr_depth=%d\n",
 	    __func__,
 	    pfx,
@@ -3760,8 +3741,7 @@ ath_tx_tid_drain_print(struct ath_softc *sc, struct ath_node *an,
 	    txq->axq_qnum,
 	    txq->axq_depth,
 	    txq->axq_aggr_depth);
-
-	device_printf(sc->sc_dev,
+	DPRINTF(sc, ATH_DEBUG_SW_TX,
 	    "%s: %s: %6D: bf=%p: tid txq_depth=%d hwq_depth=%d, bar_wait=%d, "
 	      "isfiltered=%d\n",
 	    __func__,
@@ -3773,7 +3753,7 @@ ath_tx_tid_drain_print(struct ath_softc *sc, struct ath_node *an,
 	    tid->hwq_depth,
 	    tid->bar_wait,
 	    tid->isfiltered);
-	device_printf(sc->sc_dev,
+	DPRINTF(sc, ATH_DEBUG_SW_TX,
 	    "%s: %s: %6D: tid %d: "
 	    "sched=%d, paused=%d, "
 	    "incomp=%d, baw_head=%d, "
@@ -4091,7 +4071,7 @@ ath_tx_normal_comp(struct ath_softc *sc, struct ath_buf *bf, int fail)
 	 */
 	if ((ts->ts_status & HAL_TXERR_FILT) ||
 	    (ts->ts_status != 0 && atid->isfiltered)) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX,
 		    "%s: isfiltered=%d, ts_status=%d: huh?\n",
 		    __func__,
 		    atid->isfiltered,
@@ -4100,9 +4080,9 @@ ath_tx_normal_comp(struct ath_softc *sc, struct ath_buf *bf, int fail)
 	}
 #endif
 	if (atid->isfiltered)
-		device_printf(sc->sc_dev, "%s: filtered?!\n", __func__);
+		DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: filtered?!\n", __func__);
 	if (atid->hwq_depth < 0)
-		device_printf(sc->sc_dev, "%s: hwq_depth < 0: %d\n",
+		DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: hwq_depth < 0: %d\n",
 		    __func__, atid->hwq_depth);
 
 	/*
@@ -4213,8 +4193,8 @@ ath_tx_tid_cleanup(struct ath_softc *sc, struct ath_node *an, int tid,
 			ATH_TID_REMOVE(atid, bf, bf_list);
 			if (bf->bf_state.bfs_dobaw) {
 				ath_tx_update_baw(sc, an, atid, bf);
-				if (! bf->bf_state.bfs_addedbaw)
-					device_printf(sc->sc_dev,
+				if (!bf->bf_state.bfs_addedbaw)
+					DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
 					    "%s: wasn't added: seqno %d\n",
 					    __func__,
 					    SEQNO(bf->bf_state.bfs_seqno));
@@ -4275,13 +4255,13 @@ ath_tx_retry_clone(struct ath_softc *sc, struct ath_node *an,
 	nbf = ath_buf_clone(sc, bf);
 
 #if 0
-	device_printf(sc->sc_dev, "%s: ATH_BUF_BUSY; cloning\n",
+	DPRINTF(sc, ATH_DEBUG_XMIT, "%s: ATH_BUF_BUSY; cloning\n",
 	    __func__);
 #endif
 
 	if (nbf == NULL) {
 		/* Failed to clone */
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT,
 		    "%s: failed to clone a busy buffer\n",
 		    __func__);
 		return NULL;
@@ -4290,7 +4270,7 @@ ath_tx_retry_clone(struct ath_softc *sc, struct ath_node *an,
 	/* Setup the dma for the new buffer */
 	error = ath_tx_dmasetup(sc, nbf, nbf->bf_m);
 	if (error != 0) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT,
 		    "%s: failed to setup dma for clone\n",
 		    __func__);
 		/*
@@ -4367,7 +4347,7 @@ ath_tx_aggr_retry_unaggr(struct ath_softc *sc, struct ath_buf *bf)
 		if (bf->bf_state.bfs_dobaw) {
 			ath_tx_update_baw(sc, an, atid, bf);
 			if (! bf->bf_state.bfs_addedbaw)
-				device_printf(sc->sc_dev,
+				DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
 				    "%s: wasn't added: seqno %d\n",
 				    __func__, SEQNO(bf->bf_state.bfs_seqno));
 		}
@@ -4457,8 +4437,8 @@ ath_tx_retry_subframe(struct ath_softc *sc, struct ath_buf *bf,
 		    "%s: max retries: seqno %d\n",
 		    __func__, SEQNO(bf->bf_state.bfs_seqno));
 		ath_tx_update_baw(sc, an, atid, bf);
-		if (! bf->bf_state.bfs_addedbaw)
-			device_printf(sc->sc_dev,
+		if (!bf->bf_state.bfs_addedbaw)
+			DPRINTF(sc, ATH_DEBUG_SW_TX_BAW,
 			    "%s: wasn't added: seqno %d\n",
 			    __func__, SEQNO(bf->bf_state.bfs_seqno));
 		bf->bf_state.bfs_dobaw = 0;
@@ -4663,7 +4643,7 @@ ath_tx_aggr_comp_aggr(struct ath_softc *sc, struct ath_buf *bf_first,
 
 	atid->hwq_depth--;
 	if (atid->hwq_depth < 0)
-		device_printf(sc->sc_dev, "%s: hwq_depth < 0: %d\n",
+		DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR, "%s: hwq_depth < 0: %d\n",
 		    __func__, atid->hwq_depth);
 
 	/*
@@ -4681,7 +4661,7 @@ ath_tx_aggr_comp_aggr(struct ath_softc *sc, struct ath_buf *bf_first,
 	 */
 	if (atid->cleanup_inprogress) {
 		if (atid->isfiltered)
-			device_printf(sc->sc_dev,
+			DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
 			    "%s: isfiltered=1, normal_comp?\n",
 			    __func__);
 		ATH_TX_UNLOCK(sc);
@@ -4699,7 +4679,7 @@ ath_tx_aggr_comp_aggr(struct ath_softc *sc, struct ath_buf *bf_first,
 	if ((ts.ts_status & HAL_TXERR_FILT) ||
 	    (ts.ts_status != 0 && atid->isfiltered)) {
 		if (fail != 0)
-			device_printf(sc->sc_dev,
+			DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
 			    "%s: isfiltered=1, fail=%d\n", __func__, fail);
 		ath_tx_tid_filt_comp_aggr(sc, atid, bf_first, &bf_cq);
 
@@ -4709,8 +4689,8 @@ ath_tx_aggr_comp_aggr(struct ath_softc *sc, struct ath_buf *bf_first,
 				drops++;
 			if (bf->bf_state.bfs_dobaw) {
 				ath_tx_update_baw(sc, an, atid, bf);
-				if (! bf->bf_state.bfs_addedbaw)
-					device_printf(sc->sc_dev,
+				if (!bf->bf_state.bfs_addedbaw)
+					DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
 					    "%s: wasn't added: seqno %d\n",
 					    __func__,
 					    SEQNO(bf->bf_state.bfs_seqno));
@@ -4792,7 +4772,7 @@ ath_tx_aggr_comp_aggr(struct ath_softc *sc, struct ath_buf *bf_first,
 #if 0
 	/* Occasionally, the MAC sends a tx status for the wrong TID. */
 	if (tid != ts.ts_tid) {
-		device_printf(sc->sc_dev, "%s: tid %d != hw tid %d\n",
+		DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR, "%s: tid %d != hw tid %d\n",
 		    __func__, tid, ts.ts_tid);
 		tx_ok = 0;
 	}
@@ -4800,7 +4780,7 @@ ath_tx_aggr_comp_aggr(struct ath_softc *sc, struct ath_buf *bf_first,
 
 	/* AR5416 BA bug; this requires an interface reset */
 	if (isaggr && tx_ok && (! hasba)) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
 		    "%s: AR5416 bug: hasba=%d; txok=%d, isaggr=%d, "
 		    "seq_st=%d\n",
 		    __func__, hasba, tx_ok, isaggr, seq_st);
@@ -4851,8 +4831,8 @@ ath_tx_aggr_comp_aggr(struct ath_softc *sc, struct ath_buf *bf_first,
 			sc->sc_stats.ast_tx_aggr_ok++;
 			ath_tx_update_baw(sc, an, atid, bf);
 			bf->bf_state.bfs_dobaw = 0;
-			if (! bf->bf_state.bfs_addedbaw)
-				device_printf(sc->sc_dev,
+			if (!bf->bf_state.bfs_addedbaw)
+				DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
 				    "%s: wasn't added: seqno %d\n",
 				    __func__, SEQNO(bf->bf_state.bfs_seqno));
 			bf->bf_next = NULL;
@@ -4881,7 +4861,7 @@ ath_tx_aggr_comp_aggr(struct ath_softc *sc, struct ath_buf *bf_first,
 	ATH_TX_UNLOCK(sc);
 
 	if (nframes != nf)
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_SW_TX_AGGR,
 		    "%s: num frames seen=%d; bf nframes=%d\n",
 		    __func__, nframes, nf);
 
@@ -4992,7 +4972,7 @@ ath_tx_aggr_comp_unaggr(struct ath_softc *sc, struct ath_buf *bf, int fail)
 	ATH_TX_LOCK(sc);
 
 	if (tid == IEEE80211_NONQOS_TID)
-		device_printf(sc->sc_dev, "%s: TID=16!\n", __func__);
+		DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: TID=16!\n", __func__);
 
 	DPRINTF(sc, ATH_DEBUG_SW_TX,
 	    "%s: bf=%p: tid=%d, hwq_depth=%d, seqno=%d\n",
@@ -5001,7 +4981,7 @@ ath_tx_aggr_comp_unaggr(struct ath_softc *sc, struct ath_buf *bf, int fail)
 
 	atid->hwq_depth--;
 	if (atid->hwq_depth < 0)
-		device_printf(sc->sc_dev, "%s: hwq_depth < 0: %d\n",
+		DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: hwq_depth < 0: %d\n",
 		    __func__, atid->hwq_depth);
 
 	/*
@@ -5020,7 +5000,7 @@ ath_tx_aggr_comp_unaggr(struct ath_softc *sc, struct ath_buf *bf, int fail)
 	 */
 	if (atid->cleanup_inprogress) {
 		if (atid->isfiltered)
-			device_printf(sc->sc_dev,
+			DPRINTF(sc, ATH_DEBUG_SW_TX,
 			    "%s: isfiltered=1, normal_comp?\n",
 			    __func__);
 		ATH_TX_UNLOCK(sc);
@@ -5047,10 +5027,9 @@ ath_tx_aggr_comp_unaggr(struct ath_softc *sc, struct ath_buf *bf, int fail)
 		int freeframe;
 
 		if (fail != 0)
-			device_printf(sc->sc_dev,
+			DPRINTF(sc, ATH_DEBUG_SW_TX,
 			    "%s: isfiltered=1, fail=%d\n",
-			    __func__,
-			    fail);
+			    __func__, fail);
 		freeframe = ath_tx_tid_filt_comp_single(sc, atid, bf);
 		if (freeframe) {
 			/* Remove from BAW */
@@ -5058,8 +5037,8 @@ ath_tx_aggr_comp_unaggr(struct ath_softc *sc, struct ath_buf *bf, int fail)
 				drops++;
 			if (bf->bf_state.bfs_dobaw) {
 				ath_tx_update_baw(sc, an, atid, bf);
-				if (! bf->bf_state.bfs_addedbaw)
-					device_printf(sc->sc_dev,
+				if (!bf->bf_state.bfs_addedbaw)
+					DPRINTF(sc, ATH_DEBUG_SW_TX,
 					    "%s: wasn't added: seqno %d\n",
 					    __func__, SEQNO(bf->bf_state.bfs_seqno));
 			}
@@ -5111,8 +5090,8 @@ ath_tx_aggr_comp_unaggr(struct ath_softc *sc, struct ath_buf *bf, int fail)
 	if (bf->bf_state.bfs_dobaw) {
 		ath_tx_update_baw(sc, an, atid, bf);
 		bf->bf_state.bfs_dobaw = 0;
-		if (! bf->bf_state.bfs_addedbaw)
-			device_printf(sc->sc_dev,
+		if (!bf->bf_state.bfs_addedbaw)
+			DPRINTF(sc, ATH_DEBUG_SW_TX,
 			    "%s: wasn't added: seqno %d\n",
 			    __func__, SEQNO(bf->bf_state.bfs_seqno));
 	}
@@ -5177,8 +5156,8 @@ ath_tx_tid_hw_queue_aggr(struct ath_softc *sc, struct ath_node *an,
 	tap = ath_tx_get_tx_tid(an, tid->tid);
 
 	if (tid->tid == IEEE80211_NONQOS_TID)
-		device_printf(sc->sc_dev, "%s: called for TID=NONQOS_TID?\n",
-		    __func__);
+		DPRINTF(sc, ATH_DEBUG_SW_TX, 
+		    "%s: called for TID=NONQOS_TID?\n", __func__);
 
 	for (;;) {
 		status = ATH_AGGR_DONE;
@@ -5210,7 +5189,7 @@ ath_tx_tid_hw_queue_aggr(struct ath_softc *sc, struct ath_node *an,
 			ATH_TID_REMOVE(tid, bf, bf_list);
 
 			if (bf->bf_state.bfs_nframes > 1)
-				device_printf(sc->sc_dev,
+				DPRINTF(sc, ATH_DEBUG_SW_TX, 
 				    "%s: aggr=%d, nframes=%d\n",
 				    __func__,
 				    bf->bf_state.bfs_aggr,
@@ -5341,7 +5320,7 @@ ath_tx_tid_hw_queue_aggr(struct ath_softc *sc, struct ath_node *an,
 		bf->bf_comp = ath_tx_aggr_comp;
 
 		if (bf->bf_state.bfs_tid == IEEE80211_NONQOS_TID)
-		    device_printf(sc->sc_dev, "%s: TID=16?\n", __func__);
+			DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: TID=16?\n", __func__);
 
 		/*
 		 * Update leak count and frame config if were leaking frames.
@@ -5399,10 +5378,10 @@ ath_tx_tid_hw_queue_norm(struct ath_softc *sc, struct ath_node *an,
 
 	/* Check - is AMPDU pending or running? then print out something */
 	if (ath_tx_ampdu_pending(sc, an, tid->tid))
-		device_printf(sc->sc_dev, "%s: tid=%d, ampdu pending?\n",
+		DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: tid=%d, ampdu pending?\n",
 		    __func__, tid->tid);
 	if (ath_tx_ampdu_running(sc, an, tid->tid))
-		device_printf(sc->sc_dev, "%s: tid=%d, ampdu running?\n",
+		DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: tid=%d, ampdu running?\n",
 		    __func__, tid->tid);
 
 	for (;;) {
@@ -5426,9 +5405,9 @@ ath_tx_tid_hw_queue_norm(struct ath_softc *sc, struct ath_node *an,
 
 		/* Sanity check! */
 		if (tid->tid != bf->bf_state.bfs_tid) {
-			device_printf(sc->sc_dev, "%s: bfs_tid %d !="
-			    " tid %d\n",
-			    __func__, bf->bf_state.bfs_tid, tid->tid);
+			DPRINTF(sc, ATH_DEBUG_SW_TX, "%s: bfs_tid %d !="
+			    " tid %d\n", __func__, bf->bf_state.bfs_tid,
+			    tid->tid);
 		}
 		/* Normal completion handler */
 		bf->bf_comp = ath_tx_normal_comp;
@@ -5900,7 +5879,7 @@ ath_bar_response(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap,
 	if (status == 0 || attempts == 50) {
 		ATH_TX_LOCK(sc);
 		if (atid->bar_tx == 0 || atid->bar_wait == 0)
-			device_printf(sc->sc_dev,
+			DPRINTF(sc, ATH_DEBUG_SW_TX_BAR,
 			    "%s: huh? bar_tx=%d, bar_wait=%d\n",
 			    __func__,
 			    atid->bar_tx, atid->bar_wait);
@@ -5986,11 +5965,9 @@ ath_tx_node_sleep(struct ath_softc *sc, struct ath_node *an)
 	ATH_TX_LOCK(sc);
 
 	if (an->an_is_powersave) {
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT,
 		    "%s: %6D: node was already asleep!\n",
-		    __func__,
-		    an->an_node.ni_macaddr,
-		    ":");
+		    __func__, an->an_node.ni_macaddr, ":");
 		ATH_TX_UNLOCK(sc);
 		return;
 	}
@@ -6026,7 +6003,7 @@ ath_tx_node_wakeup(struct ath_softc *sc, struct ath_node *an)
 	/* !? */
 	if (an->an_is_powersave == 0) {
 		ATH_TX_UNLOCK(sc);
-		device_printf(sc->sc_dev,
+		DPRINTF(sc, ATH_DEBUG_XMIT,
 		    "%s: an=%p: node was already awake\n",
 		    __func__, an);
 		return;
diff --git a/sys/dev/ath/if_ath_tx_edma.c b/sys/dev/ath/if_ath_tx_edma.c
index 5498dd5c5ed..3405d4a3431 100644
--- a/sys/dev/ath/if_ath_tx_edma.c
+++ b/sys/dev/ath/if_ath_tx_edma.c
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index 3b27b8d446d..a93b8afad56 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -53,6 +53,54 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_bce.h"
 
+#include <sys/param.h>
+#include <sys/endian.h>
+#include <sys/systm.h>
+#include <sys/sockio.h>
+#include <sys/lock.h>
+#include <sys/mbuf.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/queue.h>
+
+#include <net/bpf.h>
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_var.h>
+#include <net/if_arp.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+
+#include <net/if_types.h>
+#include <net/if_vlan_var.h>
+
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
+#include <netinet/if_ether.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#include <netinet/tcp.h>
+#include <netinet/udp.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include "miidevs.h"
+#include <dev/mii/brgphyreg.h>
+
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+
+#include "miibus_if.h"
+
 #include <dev/bce/if_bcereg.h>
 #include <dev/bce/if_bcefw.h>
 
@@ -5064,9 +5112,11 @@ bce_reset(struct bce_softc *sc, u32 reset_code)
 
 bce_reset_exit:
 	/* Restore EMAC Mode bits needed to keep ASF/IPMI running. */
-	val = REG_RD(sc, BCE_EMAC_MODE);
-	val = (val & ~emac_mode_mask) | emac_mode_save;
-	REG_WR(sc, BCE_EMAC_MODE, val);
+	if (reset_code == BCE_DRV_MSG_CODE_RESET) {
+		val = REG_RD(sc, BCE_EMAC_MODE);
+		val = (val & ~emac_mode_mask) | emac_mode_save;
+		REG_WR(sc, BCE_EMAC_MODE, val);
+	}
 
 	DBEXIT(BCE_VERBOSE_RESET);
 	return (rc);
diff --git a/sys/dev/bce/if_bcereg.h b/sys/dev/bce/if_bcereg.h
index dab19c4ae71..5b76f8c40d9 100644
--- a/sys/dev/bce/if_bcereg.h
+++ b/sys/dev/bce/if_bcereg.h
@@ -32,51 +32,6 @@
 #ifndef	_BCEREG_H_DEFINED
 #define _BCEREG_H_DEFINED
 
-#include <sys/param.h>
-#include <sys/endian.h>
-#include <sys/systm.h>
-#include <sys/sockio.h>
-#include <sys/mbuf.h>
-#include <sys/malloc.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-#include <sys/queue.h>
-
-#include <net/bpf.h>
-#include <net/ethernet.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_dl.h>
-#include <net/if_media.h>
-
-#include <net/if_types.h>
-#include <net/if_vlan_var.h>
-
-#include <netinet/in_systm.h>
-#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
-#include <netinet/tcp.h>
-#include <netinet/udp.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-#include <sys/bus.h>
-#include <sys/rman.h>
-
-#include <dev/mii/mii.h>
-#include <dev/mii/miivar.h>
-#include "miidevs.h"
-#include <dev/mii/brgphyreg.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-
-#include "miibus_if.h"
-
 /****************************************************************************/
 /* Conversion to FreeBSD type definitions.                                  */
 /****************************************************************************/
diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
index be7e2a4053b..1e22d5625f6 100644
--- a/sys/dev/bfe/if_bfe.c
+++ b/sys/dev/bfe/if_bfe.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
index 6b2ceb42330..b20c4deda3e 100644
--- a/sys/dev/bge/if_bge.c
+++ b/sys/dev/bge/if_bge.c
@@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -220,11 +221,16 @@ static const struct bge_type {
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57760 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57761 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57762 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57764 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57765 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57766 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57767 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57780 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57781 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57782 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57785 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57786 },
+	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57787 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57788 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57790 },
 	{ BCOM_VENDORID,	BCOM_DEVICEID_BCM57791 },
@@ -2693,6 +2699,9 @@ bge_chipid(device_t dev)
 		case BCOM_DEVICEID_BCM5725:
 		case BCOM_DEVICEID_BCM5727:
 		case BCOM_DEVICEID_BCM5762:
+		case BCOM_DEVICEID_BCM57764:
+		case BCOM_DEVICEID_BCM57767:
+		case BCOM_DEVICEID_BCM57787:
 			id = pci_read_config(dev,
 			    BGE_PCI_GEN2_PRODID_ASICREV, 4);
 			break;
@@ -2701,7 +2710,9 @@ bge_chipid(device_t dev)
 		case BCOM_DEVICEID_BCM57765:
 		case BCOM_DEVICEID_BCM57766:
 		case BCOM_DEVICEID_BCM57781:
+		case BCOM_DEVICEID_BCM57782:
 		case BCOM_DEVICEID_BCM57785:
+		case BCOM_DEVICEID_BCM57786:
 		case BCOM_DEVICEID_BCM57791:
 		case BCOM_DEVICEID_BCM57795:
 			id = pci_read_config(dev,
diff --git a/sys/dev/bge/if_bgereg.h b/sys/dev/bge/if_bgereg.h
index a1e6df16dfc..8f4d9654260 100644
--- a/sys/dev/bge/if_bgereg.h
+++ b/sys/dev/bge/if_bgereg.h
@@ -2503,11 +2503,16 @@ struct bge_status_block {
 #define	BCOM_DEVICEID_BCM57760		0x1690
 #define	BCOM_DEVICEID_BCM57761		0x16B0
 #define	BCOM_DEVICEID_BCM57762		0x1682
+#define	BCOM_DEVICEID_BCM57764		0x1642
 #define	BCOM_DEVICEID_BCM57765		0x16B4
 #define	BCOM_DEVICEID_BCM57766		0x1686
+#define	BCOM_DEVICEID_BCM57767		0x1683
 #define	BCOM_DEVICEID_BCM57780		0x1692
 #define	BCOM_DEVICEID_BCM57781		0x16B1
+#define	BCOM_DEVICEID_BCM57782		0x16B7
 #define	BCOM_DEVICEID_BCM57785		0x16B5
+#define	BCOM_DEVICEID_BCM57786		0x16B3
+#define	BCOM_DEVICEID_BCM57787		0x1641
 #define	BCOM_DEVICEID_BCM57788		0x1691
 #define	BCOM_DEVICEID_BCM57790		0x1694
 #define	BCOM_DEVICEID_BCM57791		0x16B2
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index bb2ae332c2e..c38afe547a0 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -2599,7 +2599,7 @@ dump_bt848( bktr_ptr_t bktr )
 #define BKTR_TEST_RISC_STATUS_BIT0 (1 << 28)
 #define BKTR_TEST_RISC_STATUS_BIT1 (1 << 29)
 #define BKTR_TEST_RISC_STATUS_BIT2 (1 << 30)
-#define BKTR_TEST_RISC_STATUS_BIT3 (1 << 31)
+#define BKTR_TEST_RISC_STATUS_BIT3 (1U << 31)
 
 static bool_t notclipped (bktr_reg_t * bktr, int x, int width) {
     int i;
diff --git a/sys/dev/bm/if_bm.c b/sys/dev/bm/if_bm.c
index cce5ee387e5..8db15834317 100644
--- a/sys/dev/bm/if_bm.c
+++ b/sys/dev/bm/if_bm.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c
index a2c9f4ffe97..b24442e92c0 100644
--- a/sys/dev/buslogic/bt.c
+++ b/sys/dev/buslogic/bt.c
@@ -1586,8 +1586,10 @@ btdone(struct bt_softc *bt, struct bt_ccb *bccb, bt_mbi_comp_code_t comp_code)
 					bccb->hccb.target_id,
 					CAM_LUN_WILDCARD);
 		
-		if (error == CAM_REQ_CMP)
+		if (error == CAM_REQ_CMP) {
 			xpt_async(AC_SENT_BDR, path, NULL);
+			xpt_free_path(path);
+		}
 
 		ccb_h = LIST_FIRST(&bt->pending_ccbs);
 		while (ccb_h != NULL) {
diff --git a/sys/dev/bwi/bwimac.c b/sys/dev/bwi/bwimac.c
index 30b19fcc2e6..849bf022f1d 100644
--- a/sys/dev/bwi/bwimac.c
+++ b/sys/dev/bwi/bwimac.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/firmware.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/bwi/bwiphy.c b/sys/dev/bwi/bwiphy.c
index 86c7f4f74de..1057a83dcb9 100644
--- a/sys/dev/bwi/bwiphy.c
+++ b/sys/dev/bwi/bwiphy.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/bwi/bwirf.c b/sys/dev/bwi/bwirf.c
index c10887ee66c..cd0723a6a3d 100644
--- a/sys/dev/bwi/bwirf.c
+++ b/sys/dev/bwi/bwirf.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/bwi/if_bwi.c b/sys/dev/bwi/if_bwi.c
index 25b5f2bc16d..c43eed78677 100644
--- a/sys/dev/bwi/if_bwi.c
+++ b/sys/dev/bwi/if_bwi.c
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/bwi/if_bwi_pci.c b/sys/dev/bwi/if_bwi_pci.c
index 346558eac43..1977b93a4ac 100644
--- a/sys/dev/bwi/if_bwi_pci.c
+++ b/sys/dev/bwi/if_bwi_pci.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
 
@@ -52,8 +53,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
diff --git a/sys/dev/bwn/if_bwn.c b/sys/dev/bwn/if_bwn.c
index 933e8307d4c..e7174ebd189 100644
--- a/sys/dev/bwn/if_bwn.c
+++ b/sys/dev/bwn/if_bwn.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_llc.h>
diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
index 0588d242c2d..5ec4a52aaa0 100644
--- a/sys/dev/bxe/bxe.c
+++ b/sys/dev/bxe/bxe.c
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#define BXE_DRIVER_VERSION "1.78.17"
+#define BXE_DRIVER_VERSION "1.78.75"
 
 #include "bxe.h"
 #include "ecore_sp.h"
@@ -303,70 +303,70 @@ static int load_count[2][3] = { {0} }; /* per-path: 0-common, 1-port0, 2-port1 *
 SYSCTL_NODE(_hw, OID_AUTO, bxe, CTLFLAG_RD, 0, "bxe driver parameters");
 
 /* Debug */
-uint32_t bxe_debug = 0;
-TUNABLE_INT("hw.bxe.debug", &bxe_debug);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, debug, (CTLFLAG_RDTUN),
-            &bxe_debug, 0, "Debug logging mode");
+unsigned long bxe_debug = 0;
+TUNABLE_ULONG("hw.bxe.debug", &bxe_debug);
+SYSCTL_ULONG(_hw_bxe, OID_AUTO, debug, (CTLFLAG_RDTUN),
+             &bxe_debug, 0, "Debug logging mode");
 
 /* Interrupt Mode: 0 (IRQ), 1 (MSI/IRQ), and 2 (MSI-X/MSI/IRQ) */
 static int bxe_interrupt_mode = INTR_MODE_MSIX;
 TUNABLE_INT("hw.bxe.interrupt_mode", &bxe_interrupt_mode);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, interrupt_mode, CTLFLAG_RDTUN,
-            &bxe_interrupt_mode, 0, "Interrupt (MSI-X/MSI/INTx) mode");
+SYSCTL_INT(_hw_bxe, OID_AUTO, interrupt_mode, CTLFLAG_RDTUN,
+           &bxe_interrupt_mode, 0, "Interrupt (MSI-X/MSI/INTx) mode");
 
 /* Number of Queues: 0 (Auto) or 1 to 16 (fixed queue number) */
 static int bxe_queue_count = 4;
 TUNABLE_INT("hw.bxe.queue_count", &bxe_queue_count);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, queue_count, CTLFLAG_RDTUN,
-            &bxe_queue_count, 0, "Multi-Queue queue count");
+SYSCTL_INT(_hw_bxe, OID_AUTO, queue_count, CTLFLAG_RDTUN,
+           &bxe_queue_count, 0, "Multi-Queue queue count");
 
 /* max number of buffers per queue (default RX_BD_USABLE) */
-static uint32_t bxe_max_rx_bufs = 0;
+static int bxe_max_rx_bufs = 0;
 TUNABLE_INT("hw.bxe.max_rx_bufs", &bxe_max_rx_bufs);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, max_rx_bufs, CTLFLAG_RDTUN,
-            &bxe_max_rx_bufs, 0, "Maximum Number of Rx Buffers Per Queue");
+SYSCTL_INT(_hw_bxe, OID_AUTO, max_rx_bufs, CTLFLAG_RDTUN,
+           &bxe_max_rx_bufs, 0, "Maximum Number of Rx Buffers Per Queue");
 
 /* Host interrupt coalescing RX tick timer (usecs) */
-static uint32_t bxe_hc_rx_ticks = 25;
+static int bxe_hc_rx_ticks = 25;
 TUNABLE_INT("hw.bxe.hc_rx_ticks", &bxe_hc_rx_ticks);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, hc_rx_ticks, CTLFLAG_RDTUN,
-            &bxe_hc_rx_ticks, 0, "Host Coalescing Rx ticks");
+SYSCTL_INT(_hw_bxe, OID_AUTO, hc_rx_ticks, CTLFLAG_RDTUN,
+           &bxe_hc_rx_ticks, 0, "Host Coalescing Rx ticks");
 
 /* Host interrupt coalescing TX tick timer (usecs) */
-static uint32_t bxe_hc_tx_ticks = 50;
+static int bxe_hc_tx_ticks = 50;
 TUNABLE_INT("hw.bxe.hc_tx_ticks", &bxe_hc_tx_ticks);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, hc_tx_ticks, CTLFLAG_RDTUN,
-            &bxe_hc_tx_ticks, 0, "Host Coalescing Tx ticks");
+SYSCTL_INT(_hw_bxe, OID_AUTO, hc_tx_ticks, CTLFLAG_RDTUN,
+           &bxe_hc_tx_ticks, 0, "Host Coalescing Tx ticks");
 
 /* Maximum number of Rx packets to process at a time */
-static uint32_t bxe_rx_budget = 0xffffffff;
+static int bxe_rx_budget = 0xffffffff;
 TUNABLE_INT("hw.bxe.rx_budget", &bxe_rx_budget);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_TUN,
-            &bxe_rx_budget, 0, "Rx processing budget");
+SYSCTL_INT(_hw_bxe, OID_AUTO, rx_budget, CTLFLAG_TUN,
+           &bxe_rx_budget, 0, "Rx processing budget");
 
 /* Maximum LRO aggregation size */
-static uint32_t bxe_max_aggregation_size = 0;
+static int bxe_max_aggregation_size = 0;
 TUNABLE_INT("hw.bxe.max_aggregation_size", &bxe_max_aggregation_size);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_TUN,
-            &bxe_max_aggregation_size, 0, "max aggregation size");
+SYSCTL_INT(_hw_bxe, OID_AUTO, max_aggregation_size, CTLFLAG_TUN,
+           &bxe_max_aggregation_size, 0, "max aggregation size");
 
 /* PCI MRRS: -1 (Auto), 0 (128B), 1 (256B), 2 (512B), 3 (1KB) */
 static int bxe_mrrs = -1;
 TUNABLE_INT("hw.bxe.mrrs", &bxe_mrrs);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, mrrs, CTLFLAG_RDTUN,
-            &bxe_mrrs, 0, "PCIe maximum read request size");
+SYSCTL_INT(_hw_bxe, OID_AUTO, mrrs, CTLFLAG_RDTUN,
+           &bxe_mrrs, 0, "PCIe maximum read request size");
 
 /* AutoGrEEEn: 0 (hardware default), 1 (force on), 2 (force off) */
 static int bxe_autogreeen = 0;
 TUNABLE_INT("hw.bxe.autogreeen", &bxe_autogreeen);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, autogreeen, CTLFLAG_RDTUN,
-            &bxe_autogreeen, 0, "AutoGrEEEn support");
+SYSCTL_INT(_hw_bxe, OID_AUTO, autogreeen, CTLFLAG_RDTUN,
+           &bxe_autogreeen, 0, "AutoGrEEEn support");
 
 /* 4-tuple RSS support for UDP: 0 (disabled), 1 (enabled) */
 static int bxe_udp_rss = 0;
 TUNABLE_INT("hw.bxe.udp_rss", &bxe_udp_rss);
-SYSCTL_UINT(_hw_bxe, OID_AUTO, udp_rss, CTLFLAG_RDTUN,
-            &bxe_udp_rss, 0, "UDP RSS support");
+SYSCTL_INT(_hw_bxe, OID_AUTO, udp_rss, CTLFLAG_RDTUN,
+           &bxe_udp_rss, 0, "UDP RSS support");
 
 
 #define STAT_NAME_LEN 32 /* no stat names below can be longer than this */
@@ -936,8 +936,8 @@ bxe_dma_alloc(struct bxe_softc *sc,
     int rc;
 
     if (dma->size > 0) {
-        BLOGE(sc, "dma block '%s' already has size %lu\n", msg, 
-	  (unsigned long) dma->size);
+        BLOGE(sc, "dma block '%s' already has size %lu\n", msg,
+              (unsigned long)dma->size);
         return (1);
     }
 
@@ -2532,9 +2532,9 @@ bxe_sp_post(struct bxe_softc *sc,
         atomic_subtract_acq_long(&sc->cq_spq_left, 1);
     }
 
-    BLOGD(sc, DBG_SP, "SPQE -> %p\n", (void *)sc->spq_dma.paddr);
-    BLOGD(sc, DBG_SP, "FUNC_RDATA -> %p / %p\n",
-          BXE_SP(sc, func_rdata), (void *)BXE_SP_MAPPING(sc, func_rdata));
+    BLOGD(sc, DBG_SP, "SPQE -> %#jx\n", (uintmax_t)sc->spq_dma.paddr);
+    BLOGD(sc, DBG_SP, "FUNC_RDATA -> %p / %#jx\n",
+          BXE_SP(sc, func_rdata), (uintmax_t)BXE_SP_MAPPING(sc, func_rdata));
     BLOGD(sc, DBG_SP,
           "SPQE[%x] (%x:%x) (cmd, common?) (%d,%d) hw_cid %x data (%x:%x) type(0x%x) left (CQ, EQ) (%lx,%lx)\n",
           sc->spq_prod_idx,
@@ -3604,10 +3604,10 @@ bxe_watchdog(struct bxe_softc    *sc,
         return (0);
     }
 
-    BXE_FP_TX_UNLOCK(fp);
-
     BLOGE(sc, "TX watchdog timeout on fp[%02d], resetting!\n", fp->index);
 
+    BXE_FP_TX_UNLOCK(fp);
+
     atomic_store_rel_long(&sc->chip_tq_flags, CHIP_TQ_REINIT);
     taskqueue_enqueue(sc->chip_tq, &sc->chip_tq_task);
 
@@ -3652,21 +3652,21 @@ bxe_txeof(struct bxe_softc    *sc,
 
     tx_bd_avail = bxe_tx_avail(sc, fp);
 
-    /* reset the watchdog timer if there are pending transmits */
-    if (tx_bd_avail >= BXE_TX_CLEANUP_THRESHOLD) {
+    if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) {
+        ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+    } else {
         ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-
-        if (tx_bd_avail >= (TX_BD_USABLE - 1)) {
-            /* clear watchdog if the tx chain is empty */
-            fp->watchdog_timer = 0;
-            return (FALSE);
-        }
-
-        /* reset watchdog if there are pending transmits */
-        fp->watchdog_timer = BXE_TX_TIMEOUT;
     }
 
-    return (TRUE);
+    if (fp->tx_pkt_prod != fp->tx_pkt_cons) {
+        /* reset the watchdog timer if there are pending transmits */
+        fp->watchdog_timer = BXE_TX_TIMEOUT;
+        return (TRUE);
+    } else {
+        /* clear watchdog when there are no pending transmits */
+        fp->watchdog_timer = 0;
+        return (FALSE);
+    }
 }
 
 static void
@@ -5879,13 +5879,11 @@ bxe_tx_start_locked(struct bxe_softc    *sc,
 
         /* handle any completions if we're running low */
         if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) {
+            /* bxe_txeof will set IFF_DRV_OACTIVE appropriately */
             bxe_txeof(sc, fp);
-        }
-
-        /* close TX if we're still running low */
-        if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) {
-            ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-            break;
+            if (ifp->if_drv_flags & IFF_DRV_OACTIVE) {
+                break;
+            }
         }
     }
 
@@ -6008,13 +6006,11 @@ bxe_tx_mq_start_locked(struct bxe_softc    *sc,
 
         /* handle any completions if we're running low */
         if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) {
+            /* bxe_txeof will set IFF_DRV_OACTIVE appropriately */
             bxe_txeof(sc, fp);
-        }
-
-        /* close TX if we're still running low */
-        if (tx_bd_avail < BXE_TX_CLEANUP_THRESHOLD) {
-            ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-            break;
+            if (ifp->if_drv_flags & IFF_DRV_OACTIVE) {
+                break;
+            }
         }
 
         next = drbr_dequeue(ifp, tx_br);
@@ -6923,11 +6919,11 @@ bxe_alloc_fw_stats_mem(struct bxe_softc *sc)
     sc->fw_stats_data_mapping = (sc->fw_stats_dma.paddr +
                                  sc->fw_stats_req_size);
 
-    BLOGD(sc, DBG_LOAD, "statistics request base address set to %p\n",
-          (void *)sc->fw_stats_req_mapping);
+    BLOGD(sc, DBG_LOAD, "statistics request base address set to %#jx\n",
+          (uintmax_t)sc->fw_stats_req_mapping);
 
-    BLOGD(sc, DBG_LOAD, "statistics data base address set to %p\n",
-          (void *)sc->fw_stats_data_mapping);
+    BLOGD(sc, DBG_LOAD, "statistics data base address set to %#jx\n",
+          (uintmax_t)sc->fw_stats_data_mapping);
 
     return (0);
 }
@@ -14173,7 +14169,7 @@ bxe_get_tunable_params(struct bxe_softc *sc)
 
     BLOGD(sc, DBG_LOAD,
           "User Config: "
-          "debug=0x%x "
+          "debug=0x%lx "
           "interrupt_mode=%d "
           "queue_count=%d "
           "hc_rx_ticks=%d "
@@ -14201,8 +14197,14 @@ bxe_media_detect(struct bxe_softc *sc)
     uint32_t phy_idx = bxe_get_cur_phy_idx(sc);
     switch (sc->link_params.phy[phy_idx].media_type) {
     case ELINK_ETH_PHY_SFPP_10G_FIBER:
-    case ELINK_ETH_PHY_SFP_1G_FIBER:
     case ELINK_ETH_PHY_XFP_FIBER:
+        BLOGI(sc, "Found 10Gb Fiber media.\n");
+        sc->media = IFM_10G_SR;
+        break;
+    case ELINK_ETH_PHY_SFP_1G_FIBER:
+        BLOGI(sc, "Found 1Gb Fiber media.\n");
+        sc->media = IFM_1000_SX;
+        break;
     case ELINK_ETH_PHY_KR:
     case ELINK_ETH_PHY_CX4:
         BLOGI(sc, "Found 10GBase-CX4 media.\n");
@@ -14213,8 +14215,14 @@ bxe_media_detect(struct bxe_softc *sc)
         sc->media = IFM_10G_TWINAX;
         break;
     case ELINK_ETH_PHY_BASE_T:
-        BLOGI(sc, "Found 10GBase-T media.\n");
-        sc->media = IFM_10G_T;
+        if (sc->link_params.speed_cap_mask[0] &
+            PORT_HW_CFG_SPEED_CAPABILITY_D0_10G) {
+            BLOGI(sc, "Found 10GBase-T media.\n");
+            sc->media = IFM_10G_T;
+        } else {
+            BLOGI(sc, "Found 1000Base-T media.\n");
+            sc->media = IFM_1000_T;
+        }
         break;
     case ELINK_ETH_PHY_NOT_PRESENT:
         BLOGI(sc, "Media not present.\n");
diff --git a/sys/dev/bxe/bxe.h b/sys/dev/bxe/bxe.h
index 34d4c85a944..47a0b79e6ce 100644
--- a/sys/dev/bxe/bxe.h
+++ b/sys/dev/bxe/bxe.h
@@ -748,6 +748,9 @@ struct bxe_fastpath {
 #define BXE_VF_ID_INVALID  0xFF
 #define IS_SRIOV(sc) 0
 
+#define GET_NUM_VFS_PER_PATH(sc) 0
+#define GET_NUM_VFS_PER_PF(sc)   0
+
 /* maximum number of fast-path interrupt contexts */
 #define FP_SB_MAX_E1x 16
 #define FP_SB_MAX_E2  HC_SB_MAX_SB_E2
@@ -1405,7 +1408,7 @@ struct bxe_softc {
 #define BXE_MF_FUNC_DIS      0x00000800
 #define BXE_TX_SWITCHING     0x00001000
 
-    uint32_t debug; /* per-instance debug logging config */
+    unsigned long debug; /* per-instance debug logging config */
 
 #define MAX_BARS 5
     struct bxe_bar bar[MAX_BARS]; /* map BARs 0, 2, 4 */
@@ -1603,7 +1606,7 @@ struct bxe_softc {
     int      max_rx_bufs;
     int      hc_rx_ticks;
     int      hc_tx_ticks;
-    uint32_t rx_budget;
+    int      rx_budget;
     int      max_aggregation_size;
     int      mrrs;
     int      autogreeen;
diff --git a/sys/dev/bxe/bxe_elink.c b/sys/dev/bxe/bxe_elink.c
index 5ac0ec5ec05..f4e280151ab 100644
--- a/sys/dev/bxe/bxe_elink.c
+++ b/sys/dev/bxe/bxe_elink.c
@@ -607,6 +607,7 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_WC_REG_RX1_PCI_CTRL			0x80ca
 #define MDIO_WC_REG_RX2_PCI_CTRL			0x80da
 #define MDIO_WC_REG_RX3_PCI_CTRL			0x80ea
+#define MDIO_WC_REG_RXB_ANA_RX_CONTROL_PCI		0x80fa
 #define MDIO_WC_REG_XGXSBLK2_UNICORE_MODE_10G 		0x8104
 #define MDIO_WC_REG_XGXS_STATUS3			0x8129
 #define MDIO_WC_REG_PAR_DET_10G_STATUS			0x8130
@@ -4632,6 +4633,19 @@ static void elink_warpcore_enable_AN_KR(struct elink_phy *phy,
 
 		elink_warpcore_enable_AN_KR2(phy, params, vars);
 	} else {
+		/* Enable Auto-Detect to support 1G over CL37 as well */
+		elink_cl45_write(sc, phy, MDIO_WC_DEVAD,
+				 MDIO_WC_REG_SERDESDIGITAL_CONTROL1000X1, 0x10);
+
+		/* Force cl48 sync_status LOW to avoid getting stuck in CL73
+		 * parallel-detect loop when CL73 and CL37 are enabled.
+		 */
+		CL22_WR_OVER_CL45(sc, phy, MDIO_REG_BANK_AER_BLOCK,
+				  MDIO_AER_BLOCK_AER_REG, 0);
+		elink_cl45_write(sc, phy, MDIO_WC_DEVAD,
+				 MDIO_WC_REG_RXB_ANA_RX_CONTROL_PCI, 0x0800);
+		elink_set_aer_mmd(params, phy);
+
 		elink_disable_kr2(params, vars, phy);
 	}
 
@@ -7317,10 +7331,8 @@ static elink_status_t elink_link_initialize(struct elink_params *params,
 		    (CHIP_IS_E1x(sc) ||
 		     CHIP_IS_E2(sc)))
 			elink_set_parallel_detection(phy, params);
-			if (params->phy[ELINK_INT_PHY].config_init)
-				params->phy[ELINK_INT_PHY].config_init(phy,
-								 params,
-								 vars);
+		if (params->phy[ELINK_INT_PHY].config_init)
+			params->phy[ELINK_INT_PHY].config_init(phy, params, vars);
 	}
 
 	/* Re-read this value in case it was changed inside config_init due to
@@ -8904,17 +8916,20 @@ static elink_status_t elink_get_edc_mode(struct elink_phy *phy,
 				*edc_mode = ELINK_EDC_MODE_ACTIVE_DAC;
 			else
 				check_limiting_mode = 1;
-		} else if (copper_module_type &
-			ELINK_SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE) {
-				ELINK_DEBUG_P0(sc,
-				   "Passive Copper cable detected\n");
-				*edc_mode =
-				      ELINK_EDC_MODE_PASSIVE_DAC;
 		} else {
-			ELINK_DEBUG_P1(sc,
-			   "Unknown copper-cable-type 0x%x !!!\n",
-			   copper_module_type);
-			return ELINK_STATUS_ERROR;
+			*edc_mode = ELINK_EDC_MODE_PASSIVE_DAC;
+			/* Even in case PASSIVE_DAC indication is not set,
+			 * treat it as a passive DAC cable, since some cables
+			 * don't have this indication.
+			 */
+			if (copper_module_type &
+			    ELINK_SFP_EEPROM_FC_TX_TECH_BITMASK_COPPER_PASSIVE) {
+				ELINK_DEBUG_P0(sc,
+					       "Passive Copper cable detected\n");
+			} else {
+				ELINK_DEBUG_P0(sc,
+					       "Unknown copper-cable-type\n");
+			}
 		}
 		break;
 	}
@@ -14360,6 +14375,10 @@ static uint8_t elink_analyze_link_error(struct elink_params *params,
 	ELINK_DEBUG_P3(sc, "Link changed:[%x %x]->%x\n", vars->link_up,
 	   old_status, status);
 
+	/* Do not touch the link in case physical link down */
+	if ((vars->phy_flags & PHY_PHYSICAL_LINK_FLAG) == 0)
+		return 1;
+
 	/* a. Update shmem->link_status accordingly
 	 * b. Update elink_vars->link_up
 	 */
diff --git a/sys/dev/bxe/bxe_stats.c b/sys/dev/bxe/bxe_stats.c
index 78b8dd8079c..977f6cfb259 100644
--- a/sys/dev/bxe/bxe_stats.c
+++ b/sys/dev/bxe/bxe_stats.c
@@ -263,6 +263,17 @@ bxe_stats_pmf_update(struct bxe_softc *sc)
     int loader_idx = PMF_DMAE_C(sc);
     uint32_t *stats_comp = BXE_SP(sc, stats_comp);
 
+    if (sc->devinfo.bc_ver <= 0x06001400) {
+        /*
+         * Bootcode v6.0.21 fixed a GRC timeout that occurs when accessing
+         * BRB registers while the BRB block is in reset. The DMA transfer
+         * below triggers this issue resulting in the DMAE to stop
+         * functioning. Skip this initial stats transfer for old bootcode
+         * versions <= 6.0.20.
+         */
+        return;
+    }
+
     /* sanity */
     if (!sc->port.pmf || !sc->port.port_stx) {
         BLOGE(sc, "BUG!\n");
diff --git a/sys/dev/bxe/ecore_hsi.h b/sys/dev/bxe/ecore_hsi.h
index b06ace1324e..1da8e381d68 100644
--- a/sys/dev/bxe/ecore_hsi.h
+++ b/sys/dev/bxe/ecore_hsi.h
@@ -1057,6 +1057,9 @@ struct port_feat_cfg {		    /* port 0: 0x454  port 1: 0x4c8 */
 	#define PORT_FEATURE_MBA_VLAN_TAG_MASK              0x0000FFFF
 	#define PORT_FEATURE_MBA_VLAN_TAG_SHIFT                      0
 	#define PORT_FEATURE_MBA_VLAN_EN                    0x00010000
+	#define PORT_FEATUTE_BOFM_CFGD_EN                   0x00020000
+	#define PORT_FEATURE_BOFM_CFGD_FTGT                 0x00040000
+	#define PORT_FEATURE_BOFM_CFGD_VEN                  0x00080000
 
 	uint32_t Reserved1;
 	uint32_t smbus_config;
@@ -1099,8 +1102,8 @@ struct port_feat_cfg {		    /* port 0: 0x454  port 1: 0x4c8 */
     #define PORT_FEATURE_LINK_SPEED_MASK                0x000F0000
 		#define PORT_FEATURE_LINK_SPEED_SHIFT                16
 		#define PORT_FEATURE_LINK_SPEED_AUTO                 0x00000000
-		#define PORT_FEATURE_LINK_SPEED_10M_FULL             0x00010000
-		#define PORT_FEATURE_LINK_SPEED_10M_HALF             0x00020000
+		#define PORT_FEATURE_LINK_SPEED_10M_HALF             0x00010000
+		#define PORT_FEATURE_LINK_SPEED_10M_FULL             0x00020000
 		#define PORT_FEATURE_LINK_SPEED_100M_HALF            0x00030000
 		#define PORT_FEATURE_LINK_SPEED_100M_FULL            0x00040000
 		#define PORT_FEATURE_LINK_SPEED_1G                   0x00050000
@@ -1654,6 +1657,7 @@ struct drv_func_mb {
 	#define DRV_MSG_CODE_LOAD_REQ_FORCE_LFA         0x00002000
 
 	#define DRV_MSG_CODE_USR_BLK_IMAGE_REQ          0x00000001
+	#define DRV_MSG_CODE_ISCSI_PERS_IMAGE_REQ       0x00000002
 
 	uint32_t fw_mb_header;
 	#define FW_MSG_CODE_MASK                        0xffff0000
@@ -2558,6 +2562,8 @@ struct shmem2_region {
 	uint32_t drv_func_info_size;			/* Offset 0x150 */
 	uint32_t link_attr_sync[PORT_MAX];		/* Offset 0x154 */
 	#define LINK_ATTR_SYNC_KR2_ENABLE	(1<<0)
+
+	uint32_t ibft_host_addr_hi;  /* Initialize by uEFI ROM */
 };
 
 
diff --git a/sys/dev/bxe/ecore_init.h b/sys/dev/bxe/ecore_init.h
index 4e61cab79b9..21242acd6d6 100644
--- a/sys/dev/bxe/ecore_init.h
+++ b/sys/dev/bxe/ecore_init.h
@@ -717,23 +717,35 @@ static const struct {
  * [30] MCP Latched ump_tx_parity
  * [31] MCP Latched scpad_parity
  */
-#define MISC_AEU_ENABLE_MCP_PRTY_BITS	\
+#define MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS	\
 	(AEU_INPUTS_ATTN_BITS_MCP_LATCHED_ROM_PARITY | \
 	 AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_RX_PARITY | \
-	 AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY | \
+	 AEU_INPUTS_ATTN_BITS_MCP_LATCHED_UMP_TX_PARITY)
+
+#define MISC_AEU_ENABLE_MCP_PRTY_BITS	\
+	(MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS | \
 	 AEU_INPUTS_ATTN_BITS_MCP_LATCHED_SCPAD_PARITY)
 
 /* Below registers control the MCP parity attention output. When
  * MISC_AEU_ENABLE_MCP_PRTY_BITS are set - attentions are
  * enabled, when cleared - disabled.
  */
-static const uint32_t mcp_attn_ctl_regs[] = {
-	MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0,
-	MISC_REG_AEU_ENABLE4_NIG_0,
-	MISC_REG_AEU_ENABLE4_PXP_0,
-	MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0,
-	MISC_REG_AEU_ENABLE4_NIG_1,
-	MISC_REG_AEU_ENABLE4_PXP_1
+static const struct {
+	uint32_t addr;
+	uint32_t bits;
+} mcp_attn_ctl_regs[] = {
+	{ MISC_REG_AEU_ENABLE4_FUNC_0_OUT_0,
+		MISC_AEU_ENABLE_MCP_PRTY_BITS },
+	{ MISC_REG_AEU_ENABLE4_NIG_0,
+		MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
+	{ MISC_REG_AEU_ENABLE4_PXP_0,
+		MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
+	{ MISC_REG_AEU_ENABLE4_FUNC_1_OUT_0,
+		MISC_AEU_ENABLE_MCP_PRTY_BITS },
+	{ MISC_REG_AEU_ENABLE4_NIG_1,
+		MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS },
+	{ MISC_REG_AEU_ENABLE4_PXP_1,
+		MISC_AEU_ENABLE_MCP_PRTY_SUB_BITS }
 };
 
 static inline void ecore_set_mcp_parity(struct bxe_softc *sc, uint8_t enable)
@@ -742,14 +754,14 @@ static inline void ecore_set_mcp_parity(struct bxe_softc *sc, uint8_t enable)
 	uint32_t reg_val;
 
 	for (i = 0; i < ARRSIZE(mcp_attn_ctl_regs); i++) {
-		reg_val = REG_RD(sc, mcp_attn_ctl_regs[i]);
+		reg_val = REG_RD(sc, mcp_attn_ctl_regs[i].addr);
 
 		if (enable)
-			reg_val |= MISC_AEU_ENABLE_MCP_PRTY_BITS;
+			reg_val |= MISC_AEU_ENABLE_MCP_PRTY_BITS; /* Linux is using mcp_attn_ctl_regs[i].bits */
 		else
-			reg_val &= ~MISC_AEU_ENABLE_MCP_PRTY_BITS;
+			reg_val &= ~MISC_AEU_ENABLE_MCP_PRTY_BITS; /* Linux is using mcp_attn_ctl_regs[i].bits */
 
-		REG_WR(sc, mcp_attn_ctl_regs[i], reg_val);
+		REG_WR(sc, mcp_attn_ctl_regs[i].addr, reg_val);
 	}
 }
 
diff --git a/sys/dev/bxe/ecore_reg.h b/sys/dev/bxe/ecore_reg.h
index cf427668ba5..3c8de57a1b9 100644
--- a/sys/dev/bxe/ecore_reg.h
+++ b/sys/dev/bxe/ecore_reg.h
@@ -3384,6 +3384,7 @@ Theotherbitsarereservedandshouldbezero*/
 #define MDIO_WC_REG_RX1_PCI_CTRL			0x80ca
 #define MDIO_WC_REG_RX2_PCI_CTRL			0x80da
 #define MDIO_WC_REG_RX3_PCI_CTRL			0x80ea
+#define MDIO_WC_REG_RXB_ANA_RX_CONTROL_PCI		0x80fa
 #define MDIO_WC_REG_XGXSBLK2_UNICORE_MODE_10G		0x8104
 #define MDIO_WC_REG_XGXS_STATUS3			0x8129
 #define MDIO_WC_REG_PAR_DET_10G_STATUS			0x8130
diff --git a/sys/dev/bxe/ecore_sp.c b/sys/dev/bxe/ecore_sp.c
index c7a3b3fc5d3..d3a5ad83cd4 100644
--- a/sys/dev/bxe/ecore_sp.c
+++ b/sys/dev/bxe/ecore_sp.c
@@ -168,16 +168,6 @@ static inline void __ecore_exe_queue_reset_pending(
 	}
 }
 
-static inline void ecore_exe_queue_reset_pending(struct bxe_softc *sc,
-						 struct ecore_exe_queue_obj *o)
-{
-	ECORE_SPIN_LOCK_BH(&o->lock);
-
-	__ecore_exe_queue_reset_pending(sc, o);
-
-	ECORE_SPIN_UNLOCK_BH(&o->lock);
-}
-
 /**
  * ecore_exe_queue_step - execute one execution chunk atomically
  *
@@ -188,7 +178,6 @@ static inline void ecore_exe_queue_reset_pending(struct bxe_softc *sc,
  * (Should be called while holding the exe_queue->lock).
  */
 static inline int ecore_exe_queue_step(struct bxe_softc *sc,
-				       struct ecore_vlan_mac_obj *vobj,
 				       struct ecore_exe_queue_obj *o,
 				       unsigned long *ramrod_flags)
 {
@@ -491,7 +480,7 @@ static void __ecore_vlan_mac_h_exec_pending(struct bxe_softc *sc,
 		  ramrod_flags);
 	o->head_exe_request = FALSE;
 	o->saved_ramrod_flags = 0;
-	rc = ecore_exe_queue_step(sc, o, &o->exe_queue, &ramrod_flags);
+	rc = ecore_exe_queue_step(sc, &o->exe_queue, &ramrod_flags);
 	if (rc != ECORE_SUCCESS) {
 		ECORE_ERR("execution of pending commands failed with rc %d\n",
 			  rc);
@@ -667,7 +656,8 @@ static int ecore_get_n_elements(struct bxe_softc *sc, struct ecore_vlan_mac_obj
 {
 	struct ecore_vlan_mac_registry_elem *pos;
 	uint8_t *next = base;
-	int counter = 0, read_lock;
+	int counter = 0;
+	int read_lock;
 
 	ECORE_MSG(sc, "get_n_elements - taking vlan_mac_lock (reader)\n");
 	read_lock = ecore_vlan_mac_h_read_lock(sc, o);
@@ -680,7 +670,7 @@ static int ecore_get_n_elements(struct bxe_softc *sc, struct ecore_vlan_mac_obj
 		if (counter < n) {
 			ECORE_MEMCPY(next, &pos->u, size);
 			counter++;
-			ECORE_MSG(sc, "copied element number %d to address %p element was:",
+			ECORE_MSG(sc, "copied element number %d to address %p element was:\n",
 				  counter, next);
 			next += stride + size;
 		}
@@ -1669,7 +1659,7 @@ static int __ecore_vlan_mac_execute_step(struct bxe_softc *sc,
 		 */
 		rc = ECORE_PENDING;
 	} else {
-		rc = ecore_exe_queue_step(sc, o, &o->exe_queue, ramrod_flags);
+		rc = ecore_exe_queue_step(sc, &o->exe_queue, ramrod_flags);
 	}
 	ECORE_SPIN_UNLOCK_BH(&o->exe_queue.lock);
 
@@ -1693,12 +1683,19 @@ static int ecore_complete_vlan_mac(struct bxe_softc *sc,
 	struct ecore_raw_obj *r = &o->raw;
 	int rc;
 
+	/* Clearing the pending list & raw state should be made
+	 * atomically (as execution flow assumes they represent the same)
+	 */
+	ECORE_SPIN_LOCK_BH(&o->exe_queue.lock);
+
 	/* Reset pending list */
-	ecore_exe_queue_reset_pending(sc, &o->exe_queue);
+	__ecore_exe_queue_reset_pending(sc, &o->exe_queue);
 
 	/* Clear pending */
 	r->clear_pending(r);
 
+	ECORE_SPIN_UNLOCK_BH(&o->exe_queue.lock);
+
 	/* If ramrod failed this is most likely a SW bug */
 	if (cqe->message.error)
 		return ECORE_INVAL;
@@ -1857,6 +1854,7 @@ static int ecore_execute_vlan_mac(struct bxe_softc *sc,
 	 * and exit. Otherwise send a ramrod to FW.
 	 */
 	if (!drv_only) {
+		ECORE_DBG_BREAK_IF(r->check_pending(r));
 
 		/* Set pending */
 		r->set_pending(r);
@@ -2090,10 +2088,11 @@ static int ecore_vlan_mac_del_all(struct bxe_softc *sc,
 				  unsigned long *ramrod_flags)
 {
 	struct ecore_vlan_mac_registry_elem *pos = NULL;
-	int rc = 0, read_lock;
 	struct ecore_vlan_mac_ramrod_params p;
 	struct ecore_exe_queue_obj *exeq = &o->exe_queue;
 	struct ecore_exeq_elem *exeq_pos, *exeq_pos_n;
+	int read_lock;
+	int rc = 0;
 
 	/* Clear pending commands first */
 
@@ -2529,7 +2528,8 @@ static int ecore_set_rx_mode_e2(struct bxe_softc *sc,
 			ETH_FILTER_RULES_CMD_TX_CMD;
 
 		ecore_rx_mode_set_cmd_state_e2(sc, &p->tx_accept_flags,
-			&(data->rules[rule_idx++]), FALSE);
+					       &(data->rules[rule_idx++]),
+					       FALSE);
 	}
 
 	/* Rx */
@@ -2541,7 +2541,8 @@ static int ecore_set_rx_mode_e2(struct bxe_softc *sc,
 			ETH_FILTER_RULES_CMD_RX_CMD;
 
 		ecore_rx_mode_set_cmd_state_e2(sc, &p->rx_accept_flags,
-			&(data->rules[rule_idx++]), FALSE);
+					       &(data->rules[rule_idx++]),
+					       FALSE);
 	}
 
 	/* If FCoE Queue configuration has been requested configure the Rx and
@@ -2559,10 +2560,10 @@ static int ecore_set_rx_mode_e2(struct bxe_softc *sc,
 			data->rules[rule_idx].cmd_general_data =
 						ETH_FILTER_RULES_CMD_TX_CMD;
 
-			ecore_rx_mode_set_cmd_state_e2(sc,
-							 &p->tx_accept_flags,
-						     &(data->rules[rule_idx++]),
+			ecore_rx_mode_set_cmd_state_e2(sc, &p->tx_accept_flags,
+						       &(data->rules[rule_idx]),
 						       TRUE);
+			rule_idx++;
 		}
 
 		/* Rx */
@@ -2573,10 +2574,10 @@ static int ecore_set_rx_mode_e2(struct bxe_softc *sc,
 			data->rules[rule_idx].cmd_general_data =
 						ETH_FILTER_RULES_CMD_RX_CMD;
 
-			ecore_rx_mode_set_cmd_state_e2(sc,
-							 &p->rx_accept_flags,
-						     &(data->rules[rule_idx++]),
+			ecore_rx_mode_set_cmd_state_e2(sc, &p->rx_accept_flags,
+						       &(data->rules[rule_idx]),
 						       TRUE);
+			rule_idx++;
 		}
 	}
 
@@ -2718,7 +2719,7 @@ static int ecore_mcast_enqueue_cmd(struct bxe_softc *sc,
 	if (!new_cmd)
 		return ECORE_NOMEM;
 
-	ECORE_MSG(sc, "About to enqueue a new %d command. macs_list_len=%d\n", \
+	ECORE_MSG(sc, "About to enqueue a new %d command. macs_list_len=%d\n",
 		  cmd, macs_list_len);
 
 	ECORE_LIST_INIT(&new_cmd->data.macs_head);
@@ -4259,9 +4260,22 @@ void ecore_init_mac_credit_pool(struct bxe_softc *sc,
 		 * CAM credit is equaly divided between all active functions
 		 * on the PATH.
 		 */
-		if ((func_num > 0)) {
+		if ((func_num > 1)) {
 			if (!CHIP_REV_IS_SLOW(sc))
-				cam_sz = (MAX_MAC_CREDIT_E2 / func_num);
+				cam_sz = (MAX_MAC_CREDIT_E2
+				- GET_NUM_VFS_PER_PATH(sc))
+				/ func_num 
+				+ GET_NUM_VFS_PER_PF(sc);
+			else
+				cam_sz = ECORE_CAM_SIZE_EMUL;
+
+			/* No need for CAM entries handling for 57712 and
+			 * newer.
+			 */
+			ecore_init_credit_pool(p, -1, cam_sz);
+		} else if (func_num == 1) {
+			if (!CHIP_REV_IS_SLOW(sc))
+				cam_sz = MAX_MAC_CREDIT_E2;
 			else
 				cam_sz = ECORE_CAM_SIZE_EMUL;
 
@@ -4332,6 +4346,10 @@ static int ecore_setup_rss(struct bxe_softc *sc,
 		rss_mode = ETH_RSS_MODE_DISABLED;
 	else if (ECORE_TEST_BIT(ECORE_RSS_MODE_REGULAR, &p->rss_flags))
 		rss_mode = ETH_RSS_MODE_REGULAR;
+#if defined(__VMKLNX__) && (VMWARE_ESX_DDK_VERSION < 55000) /* ! BNX2X_UPSTREAM */
+	else if (ECORE_TEST_BIT(ECORE_RSS_MODE_ESX51, &p->rss_flags))
+		rss_mode = ETH_RSS_MODE_ESX51;
+#endif
 
 	data->rss_mode = rss_mode;
 
@@ -4456,6 +4474,16 @@ void ecore_init_rss_config_obj(struct bxe_softc *sc,
 	rss_obj->config_rss = ecore_setup_rss;
 }
 
+int validate_vlan_mac(struct bxe_softc *sc,
+		      struct ecore_vlan_mac_obj *vlan_mac)
+{
+	if (!vlan_mac->get_n_elements) {
+		ECORE_ERR("vlan mac object was not intialized\n");
+		return ECORE_INVAL;
+	}
+	return 0;
+}
+
 /********************** Queue state object ***********************************/
 
 /**
diff --git a/sys/dev/bxe/ecore_sp.h b/sys/dev/bxe/ecore_sp.h
index 19607e5dfd8..ccb83eb1fea 100644
--- a/sys/dev/bxe/ecore_sp.h
+++ b/sys/dev/bxe/ecore_sp.h
@@ -77,9 +77,14 @@ struct bxe_softc;
 typedef bus_addr_t ecore_dma_addr_t; /* expected to be 64 bit wide */
 typedef volatile int ecore_atomic_t;
 
-#if __FreeBSD_version < 1000002
-typedef int bool;
+#ifndef __bool_true_false_are_defined
+#ifndef __cplusplus
+#define bool _Bool
+#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 && !defined(__INTEL_COMPILER)
+typedef _Bool bool;
 #endif
+#endif /* !__cplusplus */
+#endif /* !__bool_true_false_are_defined$ */
 
 #define ETH_ALEN ETHER_ADDR_LEN /* 6 */
 
@@ -1143,6 +1148,9 @@ enum {
 	ECORE_RSS_IPV6_UDP,
 
 	ECORE_RSS_TUNNELING,
+#if defined(__VMKLNX__) && (VMWARE_ESX_DDK_VERSION < 55000) /* ! BNX2X_UPSTREAM */
+	ECORE_RSS_MODE_ESX51,
+#endif
 };
 
 struct ecore_config_rss_params {
@@ -1852,6 +1860,9 @@ int ecore_config_rss(struct bxe_softc *sc,
 void ecore_get_rss_ind_table(struct ecore_rss_config_obj *rss_obj,
 			     uint8_t *ind_table);
 
+/* set as inline so printout will show the offending function */
+int validate_vlan_mac(struct bxe_softc *sc,
+		      struct ecore_vlan_mac_obj *vlan_mac);
 
 #endif /* ECORE_SP_H */
 
diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c
index 1bb3f093048..55b0ee81ddb 100644
--- a/sys/dev/cadence/if_cgem.c
+++ b/sys/dev/cadence/if_cgem.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
index 4f38a254b2c..08d615f4afa 100644
--- a/sys/dev/cas/if_cas.c
+++ b/sys/dev/cas/if_cas.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/ce/if_ce.c b/sys/dev/ce/if_ce.c
index 3f1a550693c..899f33f38dc 100644
--- a/sys/dev/ce/if_ce.c
+++ b/sys/dev/ce/if_ce.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #if __FreeBSD_version > 501000
 #   include <dev/pci/pcivar.h>
 #   include <dev/pci/pcireg.h>
diff --git a/sys/dev/cesa/cesa.c b/sys/dev/cesa/cesa.c
index d5739e961dd..899211cbe47 100644
--- a/sys/dev/cesa/cesa.c
+++ b/sys/dev/cesa/cesa.c
@@ -71,8 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <arm/mv/mvvar.h>
 #include "cesa.h"
 
-#undef DEBUG
-
 static int	cesa_probe(device_t);
 static int	cesa_attach(device_t);
 static int	cesa_detach(device_t);
@@ -997,11 +995,17 @@ cesa_attach(device_t dev)
 	sc->sc_dev = dev;
 
 	/* Check if CESA peripheral device has power turned on */
+#if defined(SOC_MV_KIRKWOOD)
+	if (soc_power_ctrl_get(CPU_PM_CTRL_CRYPTO) == CPU_PM_CTRL_CRYPTO) {
+		device_printf(dev, "not powered on\n");
+		return (ENXIO);
+	}
+#else
 	if (soc_power_ctrl_get(CPU_PM_CTRL_CRYPTO) != CPU_PM_CTRL_CRYPTO) {
 		device_printf(dev, "not powered on\n");
 		return (ENXIO);
 	}
-
+#endif
 	soc_id(&d, &r);
 
 	switch (d) {
diff --git a/sys/dev/cesa/cesa.h b/sys/dev/cesa/cesa.h
index 7bf2ff56b87..28536d57e90 100644
--- a/sys/dev/cesa/cesa.h
+++ b/sys/dev/cesa/cesa.h
@@ -297,8 +297,8 @@ struct cesa_chain_info {
 #define CESA_CSH_AES_KLEN_MASK		(3 << 24)
 
 #define CESA_CSHD_FRAG_FIRST		(1 << 30)
-#define CESA_CSHD_FRAG_LAST		(2 << 30)
-#define CESA_CSHD_FRAG_MIDDLE		(3 << 30)
+#define CESA_CSHD_FRAG_LAST		(2U << 30)
+#define CESA_CSHD_FRAG_MIDDLE		(3U << 30)
 
 /* CESA registers definitions */
 #define CESA_ICR			0xDE20
diff --git a/sys/dev/cfe/cfe_resource.c b/sys/dev/cfe/cfe_resource.c
index 125fe6c7788..02581fc5831 100644
--- a/sys/dev/cfe/cfe_resource.c
+++ b/sys/dev/cfe/cfe_resource.c
@@ -61,7 +61,7 @@ static int
 cferes_probe(device_t dev)
 {
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/dev/cfi/cfi_bus_nexus.c b/sys/dev/cfi/cfi_bus_nexus.c
index 4e1fa4ebfef..a87ee143dbe 100644
--- a/sys/dev/cfi/cfi_bus_nexus.c
+++ b/sys/dev/cfi/cfi_bus_nexus.c
@@ -50,14 +50,25 @@ __FBSDID("$FreeBSD$");
 static int
 cfi_nexus_probe(device_t dev)
 {
+	return (BUS_PROBE_NOWILDCARD);
+}
 
-	return cfi_probe(dev);
+static int
+cfi_nexus_attach(device_t dev)
+{
+	int error;
+
+	error = cfi_probe(dev);
+	if (error != 0)
+		return (error);
+
+	return cfi_attach(dev);
 }
 
 static device_method_t cfi_nexus_methods[] = {
 	/* device interface */
 	DEVMETHOD(device_probe,		cfi_nexus_probe),
-	DEVMETHOD(device_attach,	cfi_attach),
+	DEVMETHOD(device_attach,	cfi_nexus_attach),
 	DEVMETHOD(device_detach,	cfi_detach),
 
 	{0, 0}
diff --git a/sys/dev/cfi/cfi_core.c b/sys/dev/cfi/cfi_core.c
index f318ebc55ac..3393ca6ea27 100644
--- a/sys/dev/cfi/cfi_core.c
+++ b/sys/dev/cfi/cfi_core.c
@@ -281,7 +281,11 @@ cfi_attach(device_t dev)
 
 	sc->sc_rid = 0;
 	sc->sc_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->sc_rid,
+#ifndef ATSE_CFI_HACK
 	    RF_ACTIVE);
+#else
+	    RF_ACTIVE | RF_SHAREABLE);
+#endif
 	if (sc->sc_res == NULL)
 		return (ENXIO);
 
diff --git a/sys/dev/cm/if_cm_isa.c b/sys/dev/cm/if_cm_isa.c
index fb3660e8545..adcd31fb45f 100644
--- a/sys/dev/cm/if_cm_isa.c
+++ b/sys/dev/cm/if_cm_isa.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 
 #include <sys/module.h>
 #include <sys/bus.h>
@@ -45,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arc.h>
 
 #include <dev/cm/smc90cx6reg.h>
diff --git a/sys/dev/cm/smc90cx6.c b/sys/dev/cm/smc90cx6.c
index f7ceae60135..e0e8e42fa2b 100644
--- a/sys/dev/cm/smc90cx6.c
+++ b/sys/dev/cm/smc90cx6.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_arc.h>
diff --git a/sys/dev/cp/if_cp.c b/sys/dev/cp/if_cp.c
index e5f86b123ec..ec5f0421280 100644
--- a/sys/dev/cp/if_cp.c
+++ b/sys/dev/cp/if_cp.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <machine/bus.h>
diff --git a/sys/dev/cs/if_cs.c b/sys/dev/cs/if_cs.c
index c89760abcfa..b6a3d3b91f6 100644
--- a/sys/dev/cs/if_cs.c
+++ b/sys/dev/cs/if_cs.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/cs/if_cs_isa.c b/sys/dev/cs/if_cs_isa.c
index 2fabb7e2a07..20b74046019 100644
--- a/sys/dev/cs/if_cs_isa.c
+++ b/sys/dev/cs/if_cs_isa.c
@@ -30,7 +30,10 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 
 #include <sys/module.h>
@@ -41,7 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h> 
 #include <net/if.h>
-#include <net/if_arp.h>
+#include <net/if_media.h>
 
 #include <isa/isavar.h>
 
diff --git a/sys/dev/cs/if_cs_pccard.c b/sys/dev/cs/if_cs_pccard.c
index 073affd7a2b..575d7f032a2 100644
--- a/sys/dev/cs/if_cs_pccard.c
+++ b/sys/dev/cs/if_cs_pccard.c
@@ -29,7 +29,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 
 #include <sys/module.h>
@@ -40,7 +42,7 @@ __FBSDID("$FreeBSD$");
  
 #include <net/ethernet.h> 
 #include <net/if.h> 
-#include <net/if_arp.h>
+#include <net/if_media.h>
 
 #include <dev/cs/if_csvar.h>
 #include <dev/cs/if_csreg.h>
diff --git a/sys/dev/cs/if_csvar.h b/sys/dev/cs/if_csvar.h
index be1bfbd590e..1765f9f7cab 100644
--- a/sys/dev/cs/if_csvar.h
+++ b/sys/dev/cs/if_csvar.h
@@ -28,9 +28,6 @@
 #ifndef _IF_CSVAR_H
 #define _IF_CSVAR_H
 
-#include <net/if_arp.h>
-#include <net/if_media.h>
-
 /*
  * cs_softc: per line info and status
  */
diff --git a/sys/dev/ctau/if_ct.c b/sys/dev/ctau/if_ct.c
index 4956e4e65d4..958faa54de8 100644
--- a/sys/dev/ctau/if_ct.c
+++ b/sys/dev/ctau/if_ct.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <machine/cpufunc.h>
 #include <machine/cserial.h>
 #include <machine/resource.h>
diff --git a/sys/dev/cx/if_cx.c b/sys/dev/cx/if_cx.c
index 2abc4531af8..27112d5032f 100644
--- a/sys/dev/cx/if_cx.c
+++ b/sys/dev/cx/if_cx.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <machine/cpufunc.h>
 #include <machine/cserial.h>
 #include <machine/resource.h>
diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h
index 8b368065a35..6aaacd36553 100644
--- a/sys/dev/cxgb/cxgb_adapter.h
+++ b/sys/dev/cxgb/cxgb_adapter.h
@@ -41,9 +41,11 @@ $FreeBSD$
 #include <sys/sockio.h>
 #include <sys/condvar.h>
 #include <sys/buf_ring.h>
+#include <sys/taskqueue.h>
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_dl.h>
 #include <netinet/in.h>
diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
index 81e2f5ad9db..6ccf6e3774a 100644
--- a/sys/dev/cxgb/cxgb_main.c
+++ b/sys/dev/cxgb/cxgb_main.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c
index bf669b9e34c..42744faa44d 100644
--- a/sys/dev/cxgb/cxgb_sge.c
+++ b/sys/dev/cxgb/cxgb_sge.c
@@ -56,9 +56,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/sglist.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
 #include <net/bpf.h>	
 #include <net/ethernet.h>
-#include <net/if.h>
 #include <net/if_vlan_var.h>
 
 #include <netinet/in_systm.h>
diff --git a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
index c8652a0c97d..1825a430d04 100644
--- a/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
+++ b/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
@@ -298,3 +298,4 @@ DECLARE_MODULE(iw_cxgb, iwch_mod_data, SI_SUB_EXEC, SI_ORDER_ANY);
 MODULE_DEPEND(t3_tom, cxgbc, 1, 1, 1);
 MODULE_DEPEND(iw_cxgb, toecore, 1, 1, 1);
 MODULE_DEPEND(iw_cxgb, t3_tom, 1, 1, 1);
+MODULE_DEPEND(iw_cxgb, ibcore, 1, 1, 1);
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
index 49ad0745cb2..ba9dd61ea40 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/route.h>
 
diff --git a/sys/dev/cxgb/ulp/tom/cxgb_listen.c b/sys/dev/cxgb/ulp/tom/cxgb_listen.c
index 8148ae46005..94a219b20c3 100644
--- a/sys/dev/cxgb/ulp/tom/cxgb_listen.c
+++ b/sys/dev/cxgb/ulp/tom/cxgb_listen.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
index 89358d28c40..3db92d5380b 100644
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -35,7 +35,12 @@
 #include <sys/bus.h>
 #include <sys/rman.h>
 #include <sys/types.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/rwlock.h>
+#include <sys/sx.h>
+#include <vm/uma.h>
+
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <machine/bus.h>
@@ -43,6 +48,7 @@
 #include <sys/sysctl.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <netinet/in.h>
 #include <netinet/tcp_lro.h>
@@ -194,6 +200,7 @@ struct port_info {
 	unsigned long flags;
 	int if_flags;
 
+	uint16_t *rss;
 	uint16_t viid;
 	int16_t  xact_addr_filt;/* index of exact MAC address filter */
 	uint16_t rss_size;	/* size of VI's RSS table slice */
@@ -510,7 +517,8 @@ struct sge {
 	int timer_val[SGE_NTIMERS];
 	int counter_val[SGE_NCOUNTERS];
 	int fl_starve_threshold;
-	int s_qpp;
+	int eq_s_qpp;
+	int iq_s_qpp;
 
 	int nrxq;	/* total # of Ethernet rx queues */
 	int ntxq;	/* total # of Ethernet tx tx queues */
diff --git a/sys/dev/cxgbe/common/common.h b/sys/dev/cxgbe/common/common.h
index 22edff686fa..efda04d5b89 100644
--- a/sys/dev/cxgbe/common/common.h
+++ b/sys/dev/cxgbe/common/common.h
@@ -246,7 +246,7 @@ struct pci_params {
  * Firmware device log.
  */
 struct devlog_params {
-	u32 memtype;			/* which memory (EDC0, EDC1, MC) */
+	u32 memtype;			/* which memory (FW_MEMTYPE_* ) */
 	u32 start;			/* start of log in firmware memory */
 	u32 size;			/* size of log */
 };
@@ -587,4 +587,8 @@ int t4_sge_ctxt_rd_bd(struct adapter *adap, unsigned int cid, enum ctxt_type cty
 int t4_sge_ctxt_flush(struct adapter *adap, unsigned int mbox);
 int t4_handle_fw_rpl(struct adapter *adap, const __be64 *rpl);
 int t4_fwaddrspace_write(struct adapter *adap, unsigned int mbox, u32 addr, u32 val);
+int t4_sched_config(struct adapter *adapter, int type, int minmaxen);
+int t4_sched_params(struct adapter *adapter, int type, int level, int mode,
+		    int rateunit, int ratemode, int channel, int cl,
+		    int minrate, int maxrate, int weight, int pktsize);
 #endif /* __CHELSIO_COMMON_H */
diff --git a/sys/dev/cxgbe/common/t4_hw.c b/sys/dev/cxgbe/common/t4_hw.c
index 61742d437ee..105593c7c1f 100644
--- a/sys/dev/cxgbe/common/t4_hw.c
+++ b/sys/dev/cxgbe/common/t4_hw.c
@@ -29,6 +29,9 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 
+#include <sys/param.h>
+#include <sys/eventhandler.h>
+
 #include "common.h"
 #include "t4_regs.h"
 #include "t4_regs_values.h"
@@ -5661,3 +5664,50 @@ int __devinit t4_port_init(struct port_info *p, int mbox, int pf, int vf)
 
 	return 0;
 }
+
+int t4_sched_config(struct adapter *adapter, int type, int minmaxen)
+{
+	struct fw_sched_cmd cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_SCHED_CMD) |
+				      F_FW_CMD_REQUEST |
+				      F_FW_CMD_WRITE);
+	cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+
+	cmd.u.config.sc = FW_SCHED_SC_CONFIG;
+	cmd.u.config.type = type;
+	cmd.u.config.minmaxen = minmaxen;
+
+	return t4_wr_mbox_meat(adapter,adapter->mbox, &cmd, sizeof(cmd),
+			       NULL, 1);
+}
+
+int t4_sched_params(struct adapter *adapter, int type, int level, int mode,
+		    int rateunit, int ratemode, int channel, int cl,
+		    int minrate, int maxrate, int weight, int pktsize)
+{
+	struct fw_sched_cmd cmd;
+
+	memset(&cmd, 0, sizeof(cmd));
+	cmd.op_to_write = cpu_to_be32(V_FW_CMD_OP(FW_SCHED_CMD) |
+				      F_FW_CMD_REQUEST |
+				      F_FW_CMD_WRITE);
+	cmd.retval_len16 = cpu_to_be32(FW_LEN16(cmd));
+
+	cmd.u.params.sc = FW_SCHED_SC_PARAMS;
+	cmd.u.params.type = type;
+	cmd.u.params.level = level;
+	cmd.u.params.mode = mode;
+	cmd.u.params.ch = channel;
+	cmd.u.params.cl = cl;
+	cmd.u.params.unit = rateunit;
+	cmd.u.params.rate = ratemode;
+	cmd.u.params.min = cpu_to_be32(minrate);
+	cmd.u.params.max = cpu_to_be32(maxrate);
+	cmd.u.params.weight = cpu_to_be16(weight);
+	cmd.u.params.pktsize = cpu_to_be16(pktsize);
+
+	return t4_wr_mbox_meat(adapter,adapter->mbox, &cmd, sizeof(cmd),
+			       NULL, 1);
+}
diff --git a/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu b/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu
deleted file mode 100644
index 2faec4eba11..00000000000
--- a/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu
+++ /dev/null
@@ -1,8417 +0,0 @@
-/*-
- * Copyright (c) 2013 Chelsio Communications, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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.
- */
-begin-base64 644 t4fw
-AAADpgEICwAAAQkBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAA4sDmgOhAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAENoZWxzaW8gRlcgUlVOTUVNIERFQlVHPTAgKEJ1aWx0IEZyaSBNYXkgMjQgMTM6
-NDA6MTQgUERUIDIwMTMgb24gY2xlb3BhdHJhLmFzaWNkZXNpZ25lcnMuY29tOi9ob21lL2Zpcm13
-YXJlL2N2cy9mdy1yZWxlYXNlKSwgVmVyc2lvbiBUNHh4IDAxLjA4LjBiLjAwAAAAAAAAAPj2L99g
-AMAA4QAwuHj///8f/OFAgAAAAeEAe3AAABAAH//8EOEBlHAgAAAA4QGcBOEAeQAAAgBA4QB5gAAG
-AEAAAgAKAAYACuEAeQQACgAAgAABAuEAezzhAHtE4QB75OIAAAAAAQAA4QB7kCAAAAAAAIAA4QB7
-AAAAQAHhAHucAABAAERERELgAAAA4wAEY0REREDjAAgAIAACXAAAAAAf/5BQAAAAAB//kFQAAAAA
-H/+QWAAAAAAf/5BcH//AAAAAAAAAAAAAwAAS/88T/8+EIAQzAZMgEf/OEv/OkhAR/84S/86SEBH/
-zgH0MRH/zSIK/5IQAOQxAAUxAQIAEv/KAucxAhYAEf/JgRABAV/AIQIRAckREf/GEv/GkhAR/8YS
-/8aSEGAADxH/wRL/xZIQEf/BEv/EkhCBEBH/w8AgkhES/8KSEsAgkhMS/8GSEIIQAvJQZS/3Ef+/
-xy+SEBH/vpIQEv++E/++kyDAMpMhE/+9kyKCIhL/vBP/vJMgIyIhFP+7BDMByTgT/7qDMAODFAgz
-ERT/uKQzkyET/6yTImAACMIwkyET/6mTIhL/s5AgkCGQIpAjkCSQJZAmkCeQKJApkCqQK5AskC2Q
-LpAvICYQICYRgiIS/6bAMC03MC03NC03OC03PCM9AXIz7QACABL/o8AwLzcALzcQLzcgLzcwIz0B
-cjPtAAIAEv+ZwDAoNzAoNzQoNzgoNzwjPQFyM+0DAgAS/5YjCgAnNwAnNxAnNyAnNzAjPQFyM+0D
-AgAS/5AV/5EW/5HAMNcgBWYBYAASBDYFAAIA0w/TDwUzDG47FAdHFAcEQ3Yx5gQ2BQUzDG877QAC
-ABL/hRX/gyMKAAInAgcEQwQ+BQUzDAdHFG878AMCABL/f8kugyCEIYUivCJ0Ow6GULRVljC0M3Qz
-9GP/5gBlP+JlX98S/3PAMgMuBQMCABL/asAwKDdAKDdEKDdIKDdMIz0BcjPtAwIAAAIAEv9tLScA
-wBEBSTEASDEBAgDAABT/aQTSMRX/aJRQFP9oBNMxFf9olFAU/2cE1DEV/2eUUBT/ZwTVMRX/ZpRQ
-EP9mAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAA
-H/wAAOMACfgf/AAAH/wAAOMACfgf/AAAH/wAAOMACfgf/4AAH/+I8OMACfgf/4jwH/+I8OMAEugf
-/4jwH/+I8OMAEugf/4jwH/+KcOMAEugf/4pwH/+QUOMAFGgf/5BQH/+snOMAGkgf/6ycH/+snOMA
-NpQf/8AAH//9DeMANpQgAAAAIAABauMAc6QgAAF4IAABfOMAdRAgAAF8IAABheMAdRQgAAGYIAAB
-nOMAdSAgAAGcIAABpeMAdSQgAAG4IAABvOMAdTAgAAG8IAABxeMAdTQgAAHYIAAB2OMAdUAgAAHc
-IAAB4uMAdUAgAAH4IAAB+OMAdUggAAH8IAAB/OMAdUggAAIYIAACGOMAdUggAAIcIAACHOMAdUgg
-AAI4IAACOOMAdUggAAI8IAACPOMAdUggAAJYIAACWOMAdUggAAJcIAACYuMAdUggAAJ4IAACeOMA
-dVAgAAJ8IAACguMAdVAgAAKYIAGsnuMAdVggAoAAIAKTNOMCH2AgApM0IAKTNOMCMpQgApM4IAYK
-IOMCMpggBgogIAYO0OMFqYAgBoAAIAaNEOMFrjAgBo0QIAduWuMFu0AgB25gIAdvLOMGnJAgCMAA
-IAjAAOMGnVwgCMAAIAjAAOMGnVwgCMAAIAk2z+MGnVwAAAAAAAAAAAAAAAAgAA/2IAAP6CAAFAEg
-AA/oIAATbSAAD+ggABCdIAATBSAAEoogAA/oIAASOSAAEeogABF9IAAP1SAAEScgAA/oIAAP6CAA
-D+ggABC9AAAAAP///////w/8///w////APwgAJtzIACcsyAAnOMgAJypIACcaSAAnF8gAJwkIACc
-GiAAnBAgAJvAIACc4SAAm7YgAJucAAAAAAAAAAAAAAAAAAAACgAAAAoAAAAUAAAACgAAAAoAAAAK
-AAAACgAAAAoAAAAKAAAAAAAAAAAAAAAAAAAIAAAAEAAAAEAAAAEAAAAACAAAABAAAABAAAABAAAA
-BAAAABAAAABAAAABAAAA/xgwYGAAAAD/AAECAgAAACAG8tUgBvGCIAbzwyAG85ogBvNxIAbzSCAG
-8ycgBvL+ECBAAAAAAAAAAAAAAAAAAAQAAgABAACAAEAAIAAQAAggBw0rIAcNKyAHDLkgBwyAIAcL
-vyAHC6UgBwulIAcNKyAHDSsgBwulIAcLiyAHC4sgBw0rIAcNKyAHC1IgBw0rIAcNKyAHDSsgBw0r
-IAcNKyAHDSsgBw0rIAcNKyAHDSsgBw0rIAcNKyAHDSsgBw0rIAcNKyAHDSsgBw0rIAcLZyACivgA
-AAABIAKK/AAAAAIgAo2oAAAA/yACiTgAAAD/IAKJOAAAAAAgAo2oAAAAACACijAAAAABIAKKOAAA
-AAQgAopAAAAACCACikwAAAAQIAKKVAAAACAgAopcAAAAQCACimQAAACAIAKKeAAAAQAgAoqMAAAC
-ACACiqQAAAQAIAKKuAAACAAgAorIAAAQACACitQAACAAIAKK6AAAQAAgAoocAAAAECACiiQAAAAR
-IAKJnAAAAQAgAomoAAAAgCACibgAAABAIAKJyAAAACAgAonYAAAAECACiegAAAAIIAKJ9AAAAAQg
-AooAAAAAAiACigwAAAABAAAAAAAAAAAAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAA
-AAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAABwAAAAcAAAAGAAAABgAMNQAAEEaqABRY
-VQAYagAAACtoAAAjgwAAGGoAAA0GAAALKgAAAAAAAAAAAAAAAAAAaCsAAGgrAABsggAAb5wAAEpo
-AABKaAAATSkAAEpoAABO6gAATJgAAFI9AABPuAABhqAAAYagAAII1gACCNYAAgjVAAII1QACiwsA
-AosLAAII1QACtnIAArZyAAMNQAAEBgcAAAAAAAAAAAAAAAAgB1wIIAdb5iAHXAMgB1wDIAdb5iAH
-W+YgB1wIIAdcCCAHW+YgB1wIIAdb5iAHXAggB1wDIAdb5iAHW+YgB1vmIAdb5iAHW+YgB1wIIAdb
-5iAHW+YgB1vmIAdb5iAHW+YAAgIFBQgICwsODhERFBQXFxoaHR0gICMjJiYpKSwsLy8yMjU1ODg7
-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
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-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
-9RQn8IEAAAjuAey7DAdxAQAALvYJ/+EGFaANFQD6qygVoAwFAFgAF+okAApYBIAA/ABCHaANJQBb
-/3jRDysyEi5SawuKROqqDwtgBIAA/0ABBTANFQD7QAgVr7uBAFgACfZiRhWv/iYAAAAAAAAAAGwQ
-BMBRAyQsAyIuAlI5pCLRDwAAbBAEKSEEhyD/IAAUtYMdAOl3CAxHgoAA+O8AC7AKFQD2/4AV5JMB
-AOZyACyBCoAA/UABBV/49QAIqAPmqgEMggqAAPsgBADROp0A6GYBCkAKgAAIZgLmdgAigRGAACUh
-AshKsFrqJQIpkASAANEPsVvrJQIpkASAANEPANIw0Q9sEAQnIQSIIA8CAPb/4BWvkzkA6SUFKy8C
-gADlhQgM7wKAAA1dDA0AhyohA/oAIh3mwwEADDtgCgpGDwIA/GJgR1AMBQAMnRENXQwNIIcMO2Jv
-Phf4wT4N7/31AMihc6EqCZIRojLRDwAAAADnIQQkyAUAAAkJTyklBXeRUbB2DGUR9QAAQv/+/gAA
-AAmUEaQ0/uAAFzWUHQDuiAgMz4KAAAmIDPkfgBWkRAEA7oIAKgEKgADpIQUtsAqAAA1vAw/uAQ5m
-ApaA+EAIFa/+hgAsJQX//pwNoAkFAAAAIAK28iACtuIgArbqIAK28iACtuIgArbiIAK24iACtuog
-ArbyIAK28iACtuIgArbiIAK3RCACt6QgArdEIAK3RCACt6QgArekIAK3pCACt0QgArdEIAK3RCAC
-t6QgArekIAK4USACuUsgArlVIAK4USACuUsgArlLIAK5SyACuVUgArhRIAK4USACuUsgArlLIALk
-WSAC5XQgAuRZIALkWSAC5XQgAuV0IALldCAC5FkgAuRZIALkWSAC5XQgAuV0IALmRSAC5sUgAuc+
-IALneCAC54sgAuhNIALoyCAC6NsgAulFIALpdSAC6ZoAAAAAIALw+SAC8kUgAu/MIALv7yAC8OEg
-Au+sIALvxCAC8mIgAvLAIAL2NSAC9PUgAvUvIALzUSAC88MgAvQxIAL0cCAC9KggAvWlIAL1nSAC
-9ZUgAvVZIAL1UQAAAAAAAAAAIAMgUiADIGggAyH6IAMijSADIwkgAyOFIAMkcCADJS0BEBgBAAEA
-AAAAAAAAAAAAIAO36SADt+kgA7X7IAO36SADtfsgA7fEIAO3nSADtfsgA7bRIAO1+yADtfsgA7bI
-IAO1+yADt+kgA7X7IAO1+yADt+kgA7YEAAAAAAAAAAADAQACAAAAAAAAAAAAAAAAIAQ78iAEPCAg
-BD2TIAQ78iAEPYsgBD11IAQ78iAEO/IgBDvyIAQ78iAEO/IgBDvyIAQ78iAEO/IgBDvyIAQ78iAE
-PWogBD1fIAQ78iAEO/IgBDvyIAQ78iAEO/IgBDvyIAQ78iAEO/IgBDvyIAQ78iAEO/IgBDvyIAQ7
-8iAEO/IgBD0wIAQ78iAEPRUgBD0VIAQ78iAEO/IgBDz1IAQ78iAEPRUgBDvyIAQ78iAEO/IgBDvy
-IAQ78iAEO/IgBDvyIAQ78iAEO/IgBDvyIAQ78iAEO/IgBDvyIAQ78iAEO/IgBDvyIAQ78iAEO/Ig
-BDvyIAQ78iAEO/IgBDvyIAQ78iAEPNUAAAAAAAAAAAAAAAAgBF1WIARdViAEXCkgBF1WIARXRiAE
-XUwgBF0oIARXRiAEV0YgBFdGIARXRiAEV0YgBFwMIARdViAEV0YgBFwMIARdVgAAAAAAAAAAAAAA
-ACAEaokgBGreIARtMyAEbOIgBGyaIARsbyAEbFwgBGxWIARrrAAAAAAAAAAAAAAAAAEQGAEAAgAA
-ARAYAQACAAAgBLh+IAS4UyAEtsMgBLgbIAS4GyAEuBsgBLbDIAS4GyAEtsMgBLf7IAS2wyAEtsMg
-BLf7IAS4GwAAAAAAAAAAIATcCyAE19QgBNvfIATbsyAE24cgBNf7IATX+yAE2BIgBNtuIATYRyAE
-2DMgBNf7IATYRyAE1/sgBNf7IATX+yAE3AsAAAAAAAAAAAAAAAAAAAAAIAUuoCAFJQggBSS4IAUi
-vAAAAAAAAAAAAAAAACAFJPIgBSTuIAUk7iAFJO4gBSTyIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTu
-IAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4g
-BSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAF
-JO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk
-7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJPIgBSTuIAUk7iAFJO4gBSTyIAUk7iAFJO4gBSTu
-IAUk8iAFJO4gBSTuIAUk7iAFJPIgBSTuIAUk7iAFJO4gBSTyIAUk7iAFJO4gBSTuIAUk8iAFJO4g
-BSTuIAUk7iAFJPIgBSTuIAUk7iAFJO4gBSTyIAUk7iAFJO4gBSTuIAUk8iAFJO4gBSTuIAUk7iAF
-JPIgBSTuIAUk7iAFJO4gBSTyIAUk7iAFJO4gBSTuIAUk8iAFJO4gBSTuIAUk7iAFJPIgBSTuIAUk
-7iAFJO4gBSTyIAUk7iAFJO4gBSTuIAUk8iAFJO4gBSTuIAUk7iAFJPIgBSTuIAUk7iAFJO4gBSTu
-IAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4g
-BSTuIAUk8iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk8iAF
-JO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk
-7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk7iAFJO4gBSTuIAUk8iAFJO4gBSTuIAUk7iAFJPIgBSTu
-IAUk7iAFJO4gBSTyAAAAAAAAAAAAAAAAIAUlQCAFJpUgBShDIAUoNSAFKCAgBSgSIAUn/SAFJ+8g
-BSfaIAUnzSAFJ7ogBSetIAUnmiAFJ40gBSd6IAUlNiAFJ2cgBSdaIAUnRyAFJzogBScmIAUnHCAF
-JwsgBScBIAUm8CAFJTYgBSU2IAUlNiAFJTYgBSU2IAUlNiAFJuMgBSVZIAUlNiAFJTYgBSU2IAUm
-xiAFJq0gBSajIAUmhCAFJTYgBSZxIAUmVyAFJkQgBSYqIAUmFyAFJf8gBSXsIAUl2SAFJXMAAAAA
-AAAAACAFLuQgBS7uIAUwWiAFMDIgBTArIAUwJCAFMB0gBTAWIAUwDyAFMAggBTABIAUv9yAFL+0g
-BS/PIAUvbiAFLz4gBS81IAUvICAFLxYgBS8PIAUvAiAFLvsgBS7WAAAAACAFjNQgBYzqIAWOgCAF
-jxUgBY+UIAWQDSAFkPIgBZGtIAW2kCAFs+wgBbKAIAWwVCAFrlAgBaNkIAWlsCAFrUggBaIIAAAA
-AAAAAAAAAAAAAw8IEoOOk5IAAAAAAAAAACAF1MUgBdN5IAXTfiAF1MUgBdN5IAXTeSAF03kgBdN+
-IAXUxSAF1MUgBdN5IAXTeVJWAAAAAAAAQb3NZQAAAABjb25maWd1cmF0aW9uIGZpbGUgcGFyc2Vy
-IGZvdW5kIGFkZGl0aW9uYWwgY29uZmlndXJhdGlvbiBhZnRlciBbZmluaV0KAAAwAAAAZmNvZQAA
-AAB2bmljX2lkAHZsYW4AAAAAdG9zAGV0aGVydHlwZQAAAG1hY21hdGNoAAAAAG1wc2hpdHR5cGUA
-AGZyYWdtZW50YXRpb24AAABiYXNpY3ZpcnR1YWwAAAAAc3lubWFwZW4AAAAAc3luNHR1cGVuaXB2
-NgAAAHN5bjJ0dXBlbmlwdjYAAABzeW40dHVwZW5pcHY0AAAAc3luMnR1cGVuaXB2NAAAAG9mZG1h
-cGVuAAAAAHRubG1hcGVuAAAAAHRubGFsbGxrcAAAAGhhc2h0b2VwbGl0egAAAAB0cF9waW8AAHRw
-X3RtX3BpbwAAAG5pY192bQAAbmljX3VtAABuaWNfdW1faXNnbABvZmxkAAAAAHJkZHAAAAAAcmRt
-YWMAAABpc2NzaV9pbml0aWF0b3JfcGR1AGlzY3NpX3RhcmdldF9wZHUAAAAAaXNjc2lfaW5pdGlh
-dG9yX2ZvZmxkAAAAaXNjc2lfdGFyZ2V0X2ZvZmxkAABmY29lX2luaXRpYXRvcgAAZmNvZV90YXJn
-ZXQAcG9mY29lX2luaXRpYXRvcgAAAABwb2Zjb2VfdGFyZ2V0AAAAcHBwAGRjYngAAAAAIAKS1AAE
-AAAAAAQAAAQAAAAAAAAgBfPwIAXbUCAF8+AgBdtgIAXbdCAF2oAgBdwcIAXaGAABAgMAAAAAIAOH
-ZCADhvggBGQQAAAAACADhvAgA4boIAOG4AAAAAAwMTIzNDU2Nzg5YWJjZGVmQUJDREVGAAAAAAAA
-AAAAAEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXow
-MTIzNDU2Nzg5Ky8AAAAAAAAAAAAAAAAAAAAAIAAf9AABAAAgAB/UAAUAASAAH7gAAwAFIAAfmAAH
-AABjglNjAAAAAP///////wAAAAQECAAHQwAAAAAAAAAAAP////////////////////8AIQAJAIEA
-QQAhAAkAIQAJAIEAQQCBAEEAgQBBAIEAQQAhAAkAgQBBACEACQAhABEAgQBBAIEAQQAhAAkAgQBB
-ACEACQAhAAkBAQBBAIEAIQCBACEAEBBhAQEAgQEBAIEDAgEAAAAAAAAAAAAAAAAAAAAAgAAAAQAA
-AAIAAAAEAAAACAAAABAAAAAAAAAAAAAgQIAAAAAAAAAAAAAAAAAAIAKJOAAAAAAgAo2oAAAAACAC
-iTwAAAABIAKNtAAAAAIgAolEAAAABCACiUwAAAAIIAKJVAAAABAgAo28AAAAICACiVgAAABAIAKJ
-ZAAAAIAgAolwAAABACACiXwAAAIAAAAABQAAAAMAAAABAAAAAiAFupggBbpUIAW5RCAFuAwgBbfM
-IAW3oCAFt/QAAAAAAAACAAAABAAAAAgATkEAAFYwAABWMQAAVjIAAFYzAABWNAAAVjUAAFY2AABW
-NwAAVjgAAFY5AABWQQAAVkIAAFZDAABWRAAAVkUAAFZGAABhbGwAKgAAAG5vbmUAAAAAMHgAAHBv
-cnQAAAAAcHJvdG9jb2wAAAAAZ2xvYmFsAABmdW5jdGlvbgAAAABmaW5pAAAAAHJlZwBmaWx0ZXJN
-b2RlAABmaWx0ZXJNYXNrAAByc3NfZ2xiX2NvbmZpZ19tb2RlAHJzc19nbGJfY29uZmlnX29wdGlv
-bnMAAHNnZV90aW1lcl92YWx1ZQB0cF9wbXJ4AHRwX3BtcnhfcGFnZXNpemUAAAAAdHBfbnJ4Y2gA
-AAAAdHBfcG10eAB0cF9wbXR4X3BhZ2VzaXplAAAAAHRwX250eGNoAAAAAG10dXMAAAAAbnZmAHd4
-X2NhcHMAcl9jYXBzAABuaXFmbGludAAAAABuZXEAbmV0aGN0cmwAAAAAbnZpAHJzc252aQAAbmV4
-YWN0ZgBjbWFzawAAAHBtYXNrAAAAbmV0aG9mbGQAAAAAbnJvdXRlAABuY2xpcAAAAG5maWx0ZXIA
-bnNlcnZlcgBuaGFzaAAAAHRwX2wydAAAdHBfZGRwAAB0cF9kZHBfaXNjc2kAAAAAdHBfc3RhZwB0
-cF9wYmwAAHRwX3JxAAAAaXNjc2lfbnRhc2sAaXNjc2lfbnNlc3MAaXNjc2lfbmNvbm5fcGVyX3Nl
-c3Npb24AaXNjc2lfbmluaXRpYXRvcl9pbnN0YW5jZQAAAGlzY3NpX21heF9zZ2UAAABwcG1fbWF4
-X3pvbmVzAAAAcHBtX3pvbmVfcmFuZ2UwAHBwbV96b25lX3JhbmdlMQBwcG1fem9uZV9yYW5nZTIA
-cHBtX3pvbmVfcmFuZ2UzAGZjb2VfbmZjZgAAAGZjb2VfbnZucAAAAGZjb2VfbnNzbgAAAGRjYgBi
-Z19tZW0AAGxwYmtfbWVtAAAAAGh3bQBsd20AZHdtAHZlcnNpb24AY2hlY2tzdW0AAAAAMDEyMzQ1
-Njc4OWFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6AAAAAFllcwBTZXNzaW9uVHlwZQBPRk1hcmtl
-cgAAAABJRk1hcmtlcgAAAABEYXRhRGlnZXN0AABIZWFkZXJEaWdlc3QAAAAARXJyb3JSZWNvdmVy
-eUxldmVsAABJbW1lZGlhdGVEYXRhAAAARGF0YVBEVUluT3JkZXIAAERhdGFTZXF1ZW5jZUluT3Jk
-ZXIASW5pdGlhbFIyVAAATWF4Q29ubmVjdGlvbnMAAE1heFJlY3ZEYXRhU2VnbWVudExlbmd0aAAA
-AABJbml0aWF0b3JOYW1lAAAASW5pdGlhdG9yQWxpYXMAAERlZmF1bHRUaW1lMldhaXQAAAAARGVm
-YXVsdFRpbWUyUmV0YWluAABNYXhCdXJzdExlbmd0aAAARmlyc3RCdXJzdExlbmd0aAAAAABNYXhP
-dXRzdGFuZGluZ1IyVAAAAFRhcmdldE5hbWUAAFRhcmdldEFsaWFzAFRhcmdldEFkZHJlc3MAAABU
-YXJnZXRQb3J0YWxHcm91cFRhZwAAAABBdXRoTWV0aG9kAABTZW5kVGFyZ2V0cz1BbGwAQ0hBUF9B
-AABDSEFQX0kAAENIQVBfQwAAQ0hBUF9OAABDSEFQX1IAAERpc2NvdmVyeQAAAE5vcm1hbAAATm9u
-ZQAAAABDUkMzMkMAAENSQzMyQyxOb25lAE5vbmUsQ1JDMzJDAENIQVAAAAAAQ0hBUCxOb25lAAAA
-Tm9uZSxDSEFQAAAATm90VW5kZXJzdG9vZAAAAElycmVsZXZhbnQAAFJlamVjdAAATm8AADUAAABD
-SE5ldCAxLjAwAAAAAAAMAAAAAAEAAXwADAEAAAAAEAAAABQgBgVQAAADFQ5AAAAf/AAAH/wAAB//
-rKAf/6ygIAYO0CAGEkAgB28wIAdvMCAHwAAgCBBAIAhAACAIwAAAAAAA4QGOAAABkQyAAAAAIAkG
-gCAJBjAgCQawIAkGYAAACAD///P/H/+QoOECFgDhAhoA///I////F////x//AACAAAAAEAAAAhkc
-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
-qpox0Q9kTp2MZ4zOLMEinDHRD2ROjy7Sq54x0Q9kQeEoYGAvYGEIiBEI/wL+YCYV4AIFANEPZE5s
-KWBUC4tH+WAMK+IAnQDHr/pgJhWgAgUA0Q9kTk+LZ4u+i72bMdEPZE5CLsJVLcJUrt2w3Z0x0Q9k
-TjEvwlSfMdEPZE4nKcJTKMJSqYiwiJgx0Q9kThYqwlKaMdEPZE4Mi2eLviyyEIu/rLuwu5sx0Q9k
-TfiMZ4zOjM+cMdEPZE3rjWeN3o7cjduu3bDdnTHRD2RN2I5nju6O654x0Q9kTcuPZ4/+iP6P/aj/
-sP+fMdEPZE24iGeIjomKiImpiLCImDHRD2RNpYlniZ6JmZkx0Q9kTZiKZ4qui6iKp6uqsKqaMdEP
-ZE2Fi2eLvou3mzHRD2RNeIxnjM6NxozFrcywzJwx0Q9kTWWNZ43ejdWdMdEPZE1YjmeO7i/hKS7h
-KK/usO6eMdEPZE1Dj2eP/i/xKJ8x0Q9kTTWIZ4iOKYEnKIEmqYiwiJgx0Q9kTSCJZ4meKZEmmTHR
-D2RNEopniq4roSUqoSSrqrCqmjHRD2RM/Ytni74rsSSbMdEPZEzvjGeMzi3BIyzBIq3MsMycMdEP
-ZFDR2mBYGG4tYAwI3RH9RgAO8I4FAA7dAvxgJhXgAgUA0Q9kUK6OMf7EBh2o7h0A/sQmHaACBQDR
-D2RQl48x/swmHej/HQD+zAYd4AIFANEPZJEjL8LEjmAP7gwOWRQOmRH5rwAM9FsFAKuZ+ThoFaTu
-AQAA4QQAqxoLiAL5OGYVoAIFANEPAGRQSYkxDwIADwIAaJAB3pDuZHYrUASAAFsU18Ag0Q8AKMF+
-ZI0BKsF3KcF2qpmwmfhgJhXgAgUA0Q8rwX5kvP8twXb8YCYV4AIFANEPxy/RDwAAAC1gDC6wgADQ
-BP5fAA8wClUA+kBoHeAuAQDsXGwZcASAAFg16fJgJhWgAgUA0Q+PZ4/+iPOP8qj/sP/+YCYV4AIF
-ANEPiGeIjoiC+GAmFaACBQDRD4pvqaqwqvpgJhWgAgUA0Q+Lb/pgJhXgAgUA0Q8sYROpzLDM/GAm
-FaACBQDRDy1hE/xgJhXgAgUA0Q8AAAAAAAD/7nQNr/n1AChgDC6wgACBBACvGg/uAv9wBh2gAgUA
-0Q8AAAAAAAAAbBAEKCAKIyAIGltFwFDrIAspoASAAOo6CwwBFgAALKK5fLMXKSEC75tdZOgFAAAl
-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
-AS4EgYEBGwIBAQAOAoEBAS4CgYEACgIAAQAOAoEBAA4CAQEBGgGBgQEOAgEBAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAwEAAA4DAQEATwQBAQBfBAEBADwEAQAAAAAA
-AABs/wEBAEwEAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACADatQgA2tQIANq
-8CADbFQAAAAAHwAAAAAAAAEAAAAAAAAAAgEAAAAAAAAEAgAAAAAAAAcSAAAAAAAACAMAAAAAAAAP
-EwAAAAAAABAEAAAAAAAAHxQAAAAAAAAgBQAAAAAAAD8VAAAAAAAAQAYAAAAAAACABwAAAAAAAMAW
-AAAAAAABAAgAAAAAAAIACQAAAAAAAwAXAAAAAAAEAAoAAAAAAAgACwAAAAAADAAYAAAAAAAQAAwA
-AAAAABgAGgAAAAAAIAANAAAAAABAAA4AAAAAAIAADwAAAAAAwAAaAAAAAADgABsAAAAAAQAAEAAA
-AAABgAAcAAAAAAHAAB0AAAAAAeAAHgAAAAACAAARAAAA8tUSmPLVEpjy1RKY8tUSmPLVEpjy1RKY
-8tUSmPLVEpjy1RKY8tUSmPLVEpgDhRsYA4UbmPLVEpjy1RKY8tUSmPLVEpjy1RKY8tUSmPLVEpjy
-1RKYAAAAAAAAAAAAAAAA//8ABQAGAAcACAAJAAoACwAMAA0ADgAPABD///////8ACgAUAIwAggBk
-AFoAoACWAHgAbgBQAEYAPAAyACgAHgAKBM4EkgnOCZICsgRWBOIEpgO2BBoHsglWBl4CdgniCaYH
-TgI6CLYJGggWBiICxgRqAJYDegFyB3YAvgPeBPYEugRCA6ICYgc6Bg4AggPKBC4AbgBaAyoBNgHq
-Az4HxglqAUoHEgWWCHoGwgH+BnICigNSBeYFvgjeAZoH2gn2CboJfgeeCUIIogkGAV4HYgJOByYD
-FgEiBYIIZgWqCMoJLgiOAQ4FbgVaBUYG1ggqBjYCEgHCBuoIPgDmBoYC2gR+Ap4EBgZKAiYIAgNm
-AKoDjgX6AEYB1gb+Bq4F0gGGB4oI8gMCCFIA+gUyAa4A0gPyB+4AMgaaAu4FHgAeBQoAAAnECYgE
-2AScB6gJTAnYCZwIrAkQArwEYAFoB2wE7ASwAlgHMAPABCQDIAEsB7wJYAWMCHAGaAKABbQI1Ans
-CbAJOAiYB1gCRAEYBXgIwAkkBWQFUAggBiwG4Ag0AtAEdAZAAhwAoAOEAcwG9AF8B4AISADwAMgD
-6AaQAuQFAATEBIgCqARMA6wEEAZUAmwHRAIwCAwGGACMA3AAtAPUBDgDmAYEAHgAZABQAeADNAFA
-BwgGuAH0A0gF3AGQB9AJdAeUCPwBVAccAwwIXAWgCIQBBAU8BswCCAG4ANwGfAKUA/wH+ANcBfAA
-PAakBcgI6AL4BSgBpAfkACgFFAAUAAAEyQSNCckJjQKtBFEE3QShA7EEFQetCVEGWQJxCd0JoQdJ
-AjUIsQkVCBEGHQLBBGUAkQN1AW0HcQC5A9kE8QS1BD0DnQJdBzUGCQB9A8UEKQBpAFUDJQExAeUD
-OQfBCWUBRQcNBZEIdQa9AfkGbQKFA00F4QW5CNkBlQfVCfEJtQl5B5kJPQidCQEBWQddAkkHIQMR
-AR0FfQhhBaUIxQkpCIkBCQVpBVUFQQbRCCUGMQINAb0G5Qg5AOEGgQLVBHkCmQQBBkUCIQf9A2EA
-pQOJBfUAQQHRBvkGqQXNAYEHhQjtAv0ITQD1BS0BqQDNA+0H6QAtBpUC6QUZABkFBQAACb8JgwTT
-BJcHowlHCdMJlwinCQsCtwRbAWMHZwTnBKsCUwcrA7sEHwMbAScHtwlbBYcIawZjAnsFrwjPCecJ
-qwkzCJMHUwI/ARMFcwi7CR8FXwVLCBsGJwbbCC8CywRvBjsCFwCbA38BxwbvAXcHewhDAOsAwwPj
-BosC3wT7BL8EgwKjBEcDpwQLBk8CZwc/AisIBwYTAIcDawCvA88EMwOTBf8AcwBfAEsB2wMvATsH
-AwazAe8DQwXXAYsHywlvB48I9wFPBxcDBwhXBZsIfwD/BTcGxwIDAbMA1wZ3Ao8D9wfzA1cF6wA3
-Bp8FwwjjAvMFIwGfB98AIwUPAAAACgCMAG4AlgB4ADwAUACgAIIAZAAyAEYAWgAoAB4AFAAAAIcA
-aQCRAHMANwBLAJsAfQBfAC0AQQBVACMAGQAAIAKN5CAHKHQgAo3oIAcvoCACjfQgBy7IIAKOACAH
-LnggAo4UIActzCACjiwgByxYIAKOPCAHLDAgAo5EIAcsCCACjlggByvYIAKOZCAHK7AgAo5sIAcr
-iCACjoAgBytUIAKOjCAHMFwAAAAAAAAAACACjpQgByg0IAKOmCAHJ7ggAo6gIAcngCACjqggBydI
-IAKOtCAHJxAgAo64IAcm2CACjsQgByagIAKOyCAHJ/AgAo7QIAcmaCACjtggByYwIAKO4CAHJEAg
-Ao7oIAcl+CACjvQgByXAIAKO/CAHJYggAo8EIAclUCACjwwgByUYIAKPFCAHJOAgAo28IAciSCAC
-jxwgByIQIAKPJCAHIdggAo8sIAchoCACjzwgByFoIAKPRCAHITAgAo9MIAcg+CACj1QgByDQIAKP
-YCAHIKggAo9sIAcgeCACj4QgByBQIAKPoCAHICggAo+wIAcgACACj8AgBx/YIAKP0CAHH7AgAo/g
-IAcfiCACj/AgBx9gIAKQACAHHzggApAMIAcfECACkBggBx7oAAAAAAAAAAAgApAkIAcd0CACkCgg
-Bx2gIAKQMCAHHXAgApA8IAcdQCACkEAgBx0QIAKQRCAHHOAgApBIIAccuCACkFAgBxyQIAKNyCAH
-MqAgAo3QIAcxzCACjbQgBzEUIAKN3CAHMGQAABAhIEIwY0CEUKVgxnDngQiRKaFKsWvBjNGt4c7x
-7xIxAhAycyJSUrVClHL3YtaTOYMYs3ujWtO9w5zz/+PeJGI0QwQgFAFk5nTHRKRUhaVqtUuFKJUJ
-5e71z8Ws1Y02UyZyFhEGMHbXZvZWlUa0t1unepcZhzj33+f+153HvEjEWOVohninCEAYYSgCOCPJ
-zNnt6Y75r4lImWmpCrkrWvVK1Hq3apYacQpQOjMqEtv9y9z7v+uem3mLWLs7qxpspnyHTORcxSwi
-PAMMYBxB7a79j83s3c2tKr0LjWidSX6XbrZe1U70PhMuMh5RDnD/n+++393P/L8brzqfWY94kYiB
-qbHKoevRDMEt8U7hbxCAAKEwwiDjUARAJXBGYGeDuZOYo/uz2sM90xzjf/NeArESkCLzMtJCNVIU
-YndyVrXqpcuVqIWJ9W7lT9UsxQ004iTDFKAEgXRmZEdUJEQFp9u3+oeZl7jnX/d+xx3XPCbTNvIG
-kRawZld2dkYVVjTZTMlt+Q7pL5nIiem5iqmrWERIZXgGaCcYwAjhOIIoo8t921zrP/sei/mb2Ku7
-u5pKdVpUajd6FgrxGtAqszqS/S7tD91szU29qq2LneiNyXwmbAdcZExFPKIsgxzgDMHvH/8+z13f
-fK+bv7qP2Z/4bhd+Nk5VXnQukz6yDtEe8AAAMAQAADAQAABZCAAAWaQAAZQwAAAQJAAAEDAAABA8
-AAAQ3AAAeywAAHs0AAHijAAB5owAAeqMAAHujAAB8owAAfaMAAH6jAAB/owAAI3MAAB+dAAAj9wA
-AZFYAACP/AAAdRwAAHUYAAB1EAAAd+AAAHfkAAB39AABnDwAARB0AAEQhAAAlAgAAJhcAACWDAAA
-lhQAAJYgAACWLAAA0CgAAJAIAAIQ3AACMNwAAlDcAAJw3AABkFQAAGAcAAGg2AABkJAAAHfgAAB3
-5AAAd/QAAHl4AAB5+AABlAQAAePAAAHnwAAB68AAAe/AAAHzwAAB98AAAfvAAAH/wAABlAwAADAA
-P///wAAAMAg////AAABZEKyAAAAAAFmsfiUAAAABlBAf////AAGUNAAAABEAAZQIH////wABlDgA
-AAARAAAQKH////8AABAsf////wAAEDR/////AAAQOH////8AABBAD0QAAAAAeygAH//iAAB7MD//
-7v8AAHs4AAAAAQAAe0A//+7/AAB8JAAf/+IAAeKIAAgAAAAB5ogACAAAAAHqiAAIAAAAAe6IAAgA
-AAAB8ogACAAAAAH2iAAIAAAAAfqIAAgAAAAB/ogACAAAAACNyP////8AAI3Q/////wAAfnB/v///
-AAB+eH+///8AAH4AAMAAAAABkVQB////AAGRnAH///8AAI/YAH///QAAj/j////9AAB1FAAAAAcA
-AHUMAAAACwAAd9wAAAADAAB38P////8AAZw4AAGAQAABnPgAAAADAACQBAAAAD4AARB4AP///wAB
-EHwA////AAEQiAAAAAAAAJQEAAD//wAAlBAAAP//AACYVAAAAf8AAJhYAAAB/wAAlggAAAAAAACW
-EAAf//8AAJYYAB///wAAlhwAD///AACWJAAP//8AAJYoAP///wAAljAA////AADQIAAAAAcAANAk
-AAAABwACENgAAAADAAIw2AAAAAMAAlDYAAAAAwACcNgAAAADAAGQUAAAAC8AAaDUAAABgwABkIwA
-OAAAAAGQmAA4AAAAAHl0AAAALwAAeXAAAAAFAAB59AAAAC8AAHnwAAAABeECDgAAAEAAAAD/8AAA
-MNThAF4AAAgACAAA5AAAAMQwAADEMR//mNzhAGIA4QByAAAAYkgABAAphhAAAAAAYkCAAAAAgBQA
-A4AWAAOAEgBDgBHSA4AQAAUAAHUEH/+aNB//koAf/5qgIAjt4B//maAAAEEeAADwAwAAQQ4AAEBA
-AACgAAAAoCAAAEGIAAB//wAAQYYAAIAAAABBgQAAqBkAAKgaAADDAAAAqBsAAKgcAACoFwAA//8A
-ABAEAADlnwAAHxEAAO4JAAD//gAA6v8gCO4QAAD/ACAI7lAgCO6QAAmJaAAAxFAgCO7AIAju4CAI
-7wAAACAAAADEUQAAwAEAAMRSH/+YZAAPAA8AAGGoIFAAACAJJhAAAEANIAkmcCAJJjAgCSZQIE//
-gCAGhuQgCSbgIAknQCAJJpAAAMAGAAgAAiAJJ4AAAIDXAAMHgAAAQIIAAMSCAACEAyAJKXAgCShw
-AACApgAAgD0gCSfQAACAQCAJKNAgCSkgIAkoIB//mMgf/5mMIAkqECAI7yAf/5hgIAKMgOEAdgD/
-//AAIAKMIOEBmgAf/5isH/+RNAAACAD/wP//ABAAACAJKcAABggAH/+aiD////8AAZ4M4QGeAAAB
-nnQAAZ6sAAGe1AABnuwAAZ8UIAjv8CAI8FAgCStQIAkrACAJKmAgCSqw4QAuACACjJAAAJAAH/+S
-oAAsFACAAACA4QBaAIHw4IDhAC4IIAAAAOEAVgAMAAAA//OAAAAMOABGAAAAPz///4CAAADz////
-/+D//wABAAAf/5XAIAaAACAGhcQgBoEA4QGSAB//kTDhAIoA4QAOAOEAfgDhAHoAAAIAAAB/AEAA
-AwAAAIAAgADBAMD//yP/AADIABAgASDhAI4APAAAAP//v/9QaOhH+P///wQAAACSAAAA8ADwAJ+/
-+/sgAAQEf/f//4AAAgD//+////+A///3/38AAH6wAAYAAAAAD/8AAH60AP///wBJJJIAAH4YCAEI
-ARABEAEAAH5AIAEgARUVFRWEIYQhEBAQEOEBjgAAAP5/BAQBgB//mxwf/5igMzMzMyIiIiIRERER
-4QDOAOEAjgThAI4I4QCODAAAj8Tg//4AgAABACAGh+QAAJAIAAAIwIABxBHEEcQRAP8A/wBAAEAA
-D0JAAAAcIP//AAAgCSvAIAksMB//mFAzIhEAEREAADMzIiL/8P8AAAIAMyoqFRUf/5sUH/+aIAAA
-//0gCSzgH/+aOCAI8MAgBzBkAFAAAACgAAAgoAAA4wACAOL//wDQAAAAz//+ACACiPAf/5ooH/+A
-oB//mkggBg8QAAAQACAJLpAgCPMAIAjzQCAI82AgCPOAIAjz4CAI9DAgCPSQAAAf/yAI9MAgCPTg
-IAj1ICAJLkAgCS4AIAkuYCAI9UAf/50A/wAAAOEAOQAf/4DQH/+SIOEBlgDhAN4A4QDuAOEB/gDh
-Al4A4QI+AOECHgDhAeIAAAIBAOEBDgDhAJIACAAAAP//8P8f/5hI4QEOBOEBDgjhAQ4M//AAAAAC
-gAb/+///IAj6MCAI+pAf/4EAH/+XoCAGDOAgAoq4IAj7ACAI+0Af/5Gg4AAAAAAAfWwADwAAEAAA
-AB//lqAABAAAIAj7oCAI+9Af/5pQH/+BMP//x/+AAIAAH/+pICACjLDh//4AH/+QoAAIAAAf/4EQ
-IAkwoCAJMRAf/5iYH/+SaB/84gAgBgogAAB7YB/83gDhAZgAH/+SiB//mSQf/5iQIAkxcCAJMbAf
-/5qEIAj8AB//loggCPxAH/+bIB//mmAf/5X4H/+hkB//nRQf/58QIACYjB//78Qf/+7oH/+avCAA
-mhwf/5pEAgCCEAIAAhACAAAQAQAAAAAaAAAA+saIACAAAAAA8AAf/5owH/+RdCAGCzQgBgokIAYK
-rB//gVAgCP0gIAj88CAI/MAgCP1QH/+X+B//mZwgCTBg4QASAB//koSIAAIQAAD4AOEANgDhAEX8
-IAYM5B//l4QAAH5M//wAAAAD//8AEEEEAACP5AAAfUwgBojkH/+aLCAGC4Af/5gMIJ/wAABAAAAg
-CgAAAAoAAB//mLwf/5i4H/+YTB//gdAf/5k4H/+ZPB//mUAf/5lwH/+ZbB//mWgf/5lkH/+ZYB//
-mVgf/5lMH/+ZUB//mVQf/4HwH/+CcB//ligf/5gIH/+WJAPn/BggCP8QH/+CgB//mfAgAomMH/+Z
-7A////8gAozAH/+XuCAI/3AgBoW0IAaFhCAGhFQgBoV8H/+ZkCAGg+QAAGUAAACAgP//CPoAAEME
-AAB9M+EAagAAAGQIAAA8AACAAAD/AP8AH/+C0AEBAQHhAGIQAABkDB//gvBVqlWqAACqqlpaWlql
-paWlAABikAARIjOIEgADIAKNIAAAagAAAGoY//9/f4AQAAAf/4MQAABqYAAAIQEf/4MgAAgAKQAA
-YoAACgApAAB0BAAAYkQAAGIAAABqeAAAYtQf/4MwAABi2AAAYugAAGLcAABi+AAAYuRBvc1lAAAJ
-wwAAYuwf/4NQAABi8B//g2AAAGL0H/+DgAAAYvwAAgjVAABjAAABBGsAAGMEAAII1gAAYwgAAGMM
-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
-o8zpzBECIAUAAOyZCAMMgQAAaGIiaGQp8p/7y6IAnQBj/54ZyQGpOSmQfWP/RKWa90AGHe//kgCl
-m/dgBB3v/2oApZz3gAYV7/9CAKWdJ9QA0Q+lniflANEPAAAAAAAAIAKNXAzAAAIgBe0cIAKNYAjA
-AAggBe0cIAKNZCDAAAwgBeykIAKNaAbAADQgBe54IAKNbAjAADggBe0cIAKNcALAADwgBe54IAKN
-dAjAAEAgBe0cIAKNeAiAAEQgBe2kIAKNfBiAAFggBe2kIAKNgBiAAGggBe2kIAKNhBiAAHggBe2k
-IAKNiBiAAIggBe2kIAKNjBiAANggBe2kIAKNkBiAAOQgBe2kIAKNlBiAAPAgBe2kIAKNmBiAAPwg
-Be2kIAKNnAiAATggBe2kcFsldV0gY2hhbmdpbmcgc3BlZWQgZnJvbSAlI3ggdG8gJSN4CgAAAAAA
-AAAAAAAAcFsldV0gYmNtODQ4MzQgbGluayBzdGF0dXMgY2hhbmdlIFVQCgAAAAAAAAAAAAAAcFsl
-dV0gYmNtODQ4MzQgbGluayBzdGF0dXMgY2hhbmdlIERPV04KAAAAAAAAAAAAaHdfY2w0NV91cGRf
-c3BkX2FkdiAlI3gKAAAAAAAAAABwWyV1XSBjaGFuZ2luZyBzcGVlZCBmcm9tICUjeCB0byAlI3gK
-AAAAAAAAAAAAAABwWyV1XSBjYWxpYnJhdGluZyBQSFkgU0VSREVTIGZvciBuZXcgc3BlZWQKAAAA
-AABwWyV1XSBhcTEyMDIgbGluayBzdGF0dXMgY2hhbmdlIFVQCgAAAAAAAAAAAAAAAABwWyV1XSBQ
-SFkgT1ZFUkhFQVRFRCAtIGZvcmNlZCBwb3dlciBkb3duICh0ZW1wPSVkKQoAAAAAAAAAAAAAAAAA
-cFsldV0gYXExMjAyIGxpbmsgc3RhdHVzIGNoYW5nZSBET1dOCgAAAAAAAAAAAAAAaW5vZGVfZmMt
-PmZsb3djX2ZsYWdzIFsweCV4XSwgaW5vZGVfZmMtPmZsb3djX2J1Zi0+Zmlmby5udW1fYnl0ZXMg
-WyV1XQoAAAAAAAAAAABhdXRoZW50aWNhdGVfdGFyZ2V0OiBLRVlfQ0hBUF9SRVNQIC0gWzB4JXgl
-eCV4JXgleCV4JXgleF0KAAAAAAAAYXV0aGVudGljYXRlX3RhcmdldDogS0VZX0NIQVBfUkVTUCAt
-IFsweCV4JXgleCV4JXgleCV4JXhdCgAAAAAAAGF1dGhlbnRpY2F0ZV90YXJnZXQ6IEluY29ycmVj
-dCBwYXNzd29yZAoAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogS2V5IENIQVBfQSwgdmFsIFslZF0K
-AAAAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogS2V5IENIQVBfSSwgdmFsIFslZF0KAAAAAAAAAAAA
-AENIQVBfQzogZGlnZXN0IGV4cGFuc2lvbiBlcnJvcgoAdmFsaWRhdGVfa2V5dmFsOiBLRVlfQ0hB
-UF9OQU1FLCBsZW4gWzB4JXhdCgAAAAAAQ0hBUF9OOiBUYXJnZXQgdXNlcmlkIG1pc21hdGNoCgBD
-SEFQX1I6IGRpZ2VzdCBleHBhbnNpb24gZXJyb3IKAFJlY2lldmVkIEF1dGhNZXRob2QgdmFsdWUK
-AAAAAAAAdmFsaWRhdGVfa2V5dmFsOiBmbG93Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4JXhdCgAA
-AAAAAAAAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogZmxvd2NfZm9pc2NzaV9jb25uX2ZsYWdzIFsw
-eCV4XQoAAAAAAAAAAAAAAAAAAABOZWdvIEZCTCBbJXVdCgAAS0VZX01BWFJDVkRTTCBbJXVdCgAA
-AAAAAAAAAAAAAABEdXBsaWNhdGUgaXNjc2kga2V5CgAAAAAAAAAAAAAAAGZvaXNjc2lfcGFyc2Vf
-cmN2ZF9wYXJhbXM6IGVycm9yCgAAAAAAAAAAAAAAAAAAAGZvaXNjc2lfcGFyc2VfcmN2ZF9wYXJh
-bXM6IHJsZW4gJWQKAAAAAAAAAAAAAAAAAGFzeW5jX3BkdTogbG9nb3V0IHJlcXVlc3RlZCBibG9j
-a2luZyBzZXNzaW9uCgAAAGFzeW5jX3BkdTogc2Vzcy9jb25uIGRyb3AgcmVxdWVzdGVkIGJsb2Nr
-aW5nIHNlc3Npb24KAAAAAAAAAAAAAABsb2dpbl9yZXNwOiBmbG93Y19mb2lzY3NpX2Nvbm5fZmxh
-Z3MgWzB4JXhdCgAAAABsb2dpbl9yZXNwOiBmbG93Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4JXhd
-LCByYyBbMHgleF0KAAAAAAAAAAAAaVNDU0kgU2VjLXBhcmFtcyByZWNlaXZlZGhhdmUgZXJyb3Jz
-ISEKAAAAAAAAAAAAVGFyZ2V0IG1vdmVkIHRlbXAuIGNvbm4gJXgsIHNlc3MgJXgKAAAAAAAAAAAA
-AAAATG9naW4gRmFpbGVkISEuIGNvbm5fZmMgWzB4JXhdLCBzZXNzX2ZjIFsweCV4XSwgc3RhdHVz
-X2NsYXNzIFsweCV4XQoAAAAAAAAAAAAAAABsb2dpbl9yZXNwOiBzZXNzX2ZjLT5mbG93Y19pZCBb
-JXVdLCBjb25uX2ZjLT5mbG93Y19pZCBbJXVdIGxvZ2dlZCBpbgoAAAAAAAAAAAAAAFByb3RvY29s
-IEVycm9yIGNiaXQgJWQgdGJpdCAlZCBjc2cgJWQgbnNnICVkCgAAAGNvbm4gdGlkIFsweCV4XSwg
-cnhfZGF0YS0+c2VxIFsweCV4XSwgcnhfZGF0YS0+bGVuIFsweCV4XSwgcnhfZGF0YS0+c3RhdHVz
-IFsweCV4XQoAAAAAAAAAAAAAAAAAAGNza19mYy0+Zmxvd2NfY3NvY2tfb2Zmc2V0IFsweCV4XSwg
-ZGxlbjE2IFsweCV4XQoAAAAAAAAAAAAAAAAAAABhY3RfZXN0OiBmbG93Y19mb2lzY3NpX2Nvbm5f
-ZmxhZ3MgWzB4JXhdCgAAAAAAAABhY3RfZXN0YWI6IHRjYl9mYy0+Zmxvd2NfYnVmIFsweCV4XSwg
-dGNiX2ZjLT5mbG93Y190eXBlIFsweCV4XSB0Y2JfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgbnBh
-Z2VzIFsweCV4XSwgZmxvd2NfdHBfc25kX21heCBbMHgleF0KAAAAAAAAAAAAAAAAAABhY3RfZXN0
-YWI6IGF0aWQgWzB4JXhdLCB0aWQgWzB4JXhdLCBvcCBbMHgleF0sIHJjdl9pc24gWzB4JXhdLCBz
-bmRfaXNuIFsweCV4XSwgY3NvY2stPmZsb3djX3N0YXRlIFsweCV4XSwgdGNwX29wdCBbMHgleF0s
-IHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdIAoAAAAAAAAAAAAAAAAAY3NrX2ZjLT5mbG93Y19jc29j
-a19jb29raWUgWzB4JXhdIAoAAAAAAAAAAAAAAAAAbDNpbjRfZGV2X2NvbmZpZzogd3ItPnBhcmFt
-LnZsYW5pZCBbJXVdLCBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5kZXYgWzB4JXhdCgAA
-AAAAAAAAAAAAAAAAbmV0X2wzaW40X2Rldl9jb25maWc6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgl
-eF0sIGFkZHJlc3MgYWxyZWFkeSB1c2VkIGJ5IHBvcnQgJWQKAAAAAAAAAAAAAAAAAAAAbmV0X2wz
-aW40X2Rldl9jb25maWc6ICBhZGRyIFsweCV4XSwgbWFzayBbMHgleF0sIGd3IFsweCV4XSwgcmVm
-X2NudCBbMHgleF0gaW4gdXNlCgAAAAAAAAAAAAAAAAAAd3JoX2NobmV0X2lmY29uZjogbDJkZXZf
-ZmMtPmZsb3djX2lkIFsweCV4XSwgbDJkZXZfZmMtPmZsb3djX3R5cGUgWyUweF0sIGlmY29uZl93
-ci0+c3Vib3AgWzB4JXhdCgAAAAAAAAAAAAAAAAAAAHdyaF9jaG5ldF9pZmNvbmY6IGwyZGV2X2Zj
-LT5mbG93Y19pZCBbMHgleF0sIHVua25vd24gc3Vib3AgWzB4JXhdCgAAAAAAAAAAAAAAAAAAd3Jo
-X2NobmV0X2lmY29uZjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgcmMgJWQKAAAAAAAAAAAA
-AAAAAG5ldGlmX2lwX2NvbmZsaWN0X3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhd
-LCBpbmRldmN0eHQtPnN0YXRlIFslZF0sIGluZGV2Y3R4dC0+cmV0cnlfY250IFslZF0KAAAAAAAA
-AABuZXRpZl9pcF9jb25mbGljdF90aW1lcl9jYjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwg
-aW5kZXZjdHh0IFsweCV4XSwgaW4gZnJlZSBzdGF0ZQoAAAAAAAAAAABjbWRoX2NobmV0X2lmYWNl
-OiBmYyBbMHgleF0sIGZjLT5mbG93Y19pZCBbMHgleF0sIGZjLT5mbG93Y190eXBlIFsweCV4XSwg
-cCBbMHgleF0sIGxlbjE2IFsldV0sIGxvYyBbMHgleF0KAAAAAAAAY21kaF9jaG5ldF9pZmFjZTps
-MmRldl9mYyBbMHgleF0sIGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGwyZGV2LT5mbG93Y190
-eXBlIFsldV0sIGwyZGV2X2ZjLT5mbG93Y19uZXRfbDJkZXZfZmxhZ3MgWyUweF0KAAAAAABjbWRo
-X2NobmV0X2lmYWNlOiBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X2ZsYWdzIGNoYW5nZWQgZnJv
-bSBbJTB4XSB0byBbJTB4XSwgcmMgWyVkXQoAAAAAAAAAAABjaG5ldF9sMmRldl91cF9tYl9jYjog
-cmMgWyVkXSwgcG9ydCBbJXVdLCBzdGF0ZSBbJXVdLCBjb29raWUgWzB4JXhdCgAAAAAAAAAAAAAA
-AGNobmV0X3F1ZXVlX3htaXQ6IGZjLT5mbG93Y19pZCBbMHgleF0sIGJ1Zl9sZW4gWzB4JXhdLCBi
-dWZmZXJlZCBbMHgleF0sIGZpZm8ubnVtX2J5dGVzIFslMHhdCgAAAGRoY3BfcHJvY2Vzc19jYjog
-bDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgZGhjdHh0LT5zdGF0ZSBbJTB4XSwgZGhjdHh0LT5y
-dHJ5X2NudCBbJXVdCgAAAAAAAAAAAGRoY3BfdGltZXJfY2I6IERIQ1BESVNDT1ZFUiBzZW50LCBi
-dXQgbm8gcmVwbHkgZnJvbSBhbnkgcG9zc2libGUgc2VydmVyIG9uIHRoZSBuZXR3b3JrLiBSZXRy
-eWluZyBhZ2FpbgoAAAAAAAAAAABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4
-JXhdLCBzZW5kaW5nIERIQ1BESVNDT1ZFUiBmb3IgZGhjdHh0IFsweCV4XSBvbiBwaWQgWyVkXQoA
-AABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBESENQT0ZGRVIgcmVj
-ZWl2ZWQgZm9yIGRoY3R4dCBbJXhdIHBpZCBbJWRdCgAAAAAAAAAAAABkaGNwX3RpbWVyX2NiOiBs
-MmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCAgREhDUEFDSyByZWNlaXZlZCBmb3IgZGhjdHh0IFsl
-eF0sIHBpZCBbJWRdCgAAAAAAAAAAAABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQg
-WzB4JXhdLCBkaGN0eHQtPmlwYWRkciBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAGRoY3BfdGltZXJf
-Y2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIG5vIHJlcGx5IGZyb20gZGhjcCBzZXJ2ZXIs
-IHRpbWluZyBvdXQKAAAAAAAAAAAAAAAAAAAAAGxvZ2luX3BhcmFtczogY29ubl9mYy0+Zmxvd2Nf
-Zm9pc2NzaV9jb25uX2ZsYWdzIFsweCV4XQoAAAAAAAAAAABsb2dpbl9wYXJhbXM6IGNvbm5fZmMt
-PmZsb3djX2ZvaXNjc2lfY29ubl9mbGFncyBbMHgleF0KAAAAAAAAAAAAYXV0aF9uZWdvX3NlY3Vy
-aXR5OiBzZW5kX2ZsYWcgWzB4JXhdLCBhdXRoX3BvbGljeSBbMHgleF0KAAAAAAAAAGF1dGhfbmVn
-b19zZWN1cml0eTogS0VZX0NIQVBfUkVTUCAtIGhhc2hbMHgleCV4JXgleCV4JXgleCV4XQoAAABh
-dXRoX25lZ29fc2VjdXJpdHk6IEtFWV9DSEFQX1JFU1AgLSBoYXNoWzB4JXgleCV4JXgleCV4JXgl
-eF0KAAAAYXV0aF9uZWdvX3NlY3VyaXR5OiBLRVlfQ0hBUF9SRVNQIC0gZXJyb3IgZW5jb2Rpbmcg
-dG8gaGV4CgAAAAAAAGF1dGhfbmVnb19zZWN1cml0eTogS0VZX0NIQVBfUkVTUCAtIGVsZW4gWzB4
-JXhdCgAAAAAAAAAAAAAAAAAAAABhdXRoX25lZ29fc2VjdXJpdHk6IEtFWV9DSEFQX0NIQUwgLSBl
-cnJvciBlbmNvZGluZyB0byBoZXgKAAAAAAAAYXV0aF9uZWdvX3NlY3VyaXR5OiBLRVlfQ0hBUF9D
-SEFMIC0gZWxlbiBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAHNlbmRfbG9naW5fcmVxdWVzdDpjb25u
-X2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlc3NfZmMtPmZsb3djX2lkIFsweCV4XSwgY3RybF94bWl0
-IFsweCV4XSwgc2Vzc19mYy0+Zmxvd2NfZm9pc2NzaV9zZXNzX3R5cGUgWzB4JXhdCgAAAAAAAAAA
-AAAAAAAAAHNlbmRfbG9naW5fcmVxdWVzdDogZmxhZyBbMHgleF0uCgAAAAAAAAAAAAAAAAAAAHNl
-bmRfbG9naW5fcmVxdWVzdDogdHhfbGVuIFsldV0KAAAAAAAAAAAAAAAAAAAAAHhtaXRfc2VuZHRh
-cmdldHM6IGNvbm4gdGlkIFsweCV4XSwgY3RybF94bWl0LT50dHQgWzB4JXhdLCBkYXRhX2xlbiBb
-JXVdLCBwYWRfbGVuIFsldV0KAAAAAAAAAAAAAHBpbmdfdGFyZ2V0OiBwaW5nIHRpbWVvdXQgYmxv
-Y2tpbmcgc2Vzc2lvbgoAAAAAAHNlbmRfbm9wX291dDogY29ubiBmbG93X2lkIFsweCV4XSwgcmVx
-IFsldV0sIHR0dCBbMHgleF0KAAAAAAAAAABjc29ja19mYWlsZWQ6IGNza19mYy0+Zmxvd2NfaWQg
-WzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgc2Vzc19mYy0+Zmxvd2NfaWQgWzB4
-JXhdLCBzZXNzX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGV2dCBbMHgleF0KAAAAAAAAAAAAAABj
-b3NrY19mYWlsZWQ6IHNlc3Npb24gYmxvY2ssIGV2ZW50IFsweCV4XQoAAAAAAABjb3NrY19mYWls
-ZWQ6IHNlc3Npb24gYmxvY2ssIGV2ZW50IFsweCV4XQoAAAAAAABjaG5ldF9maW5kX2wydF9lbnRy
-eTogZGFkZHIgWyUwOHhdLCBbMHglMDh4XSwgbG9jYWwgbmV0d29yayBbJWRdCgAAAAAAAAAAAAAA
-AAAAAGwydGVudCBbJTB4XSwgbDJ0ZW50LT5pZHggWyVkXQoAcmMgWyVkXSwgY3NrX2ZjIFsweCV4
-XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAGNzb2NrX2ZyZWU6IHNp
-emVvZihjc2tfZmMtPnUuY3NvY2spIFsldV0sIGJ5dGVzCgAAAAAAAAAAAAAAAAAAAABUQ1AgY29u
-biBlc3RhYmxpc2htZW50IGZhaWxlZCAlZAoAAAAAAAAAAAAAAAAAAABJbnZhbGlkIG9wY29kZSAw
-eCV4IGluIGN0cmwgcGF0aAoAAAAAAAAAAAAAAAAAAABERFAgZXJyb3IgWzB4JXhdLCBhYm9ydGlu
-ZyBjb25ubiBbMHgleF0KAAAAAAAAAABzZW5kX2Fib3J0X3JlcTogY3NrX2ZjLT5mbG93Y190eXBl
-IFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIHRpZCBbMHgleF0sIHVscHR4Y2ggWyV1
-XSwgYnVmZmVyZWQgWyV1XQoAAAAAaXNjc2lfaGRyOiBiYWQgdGNiIHN0YXRlIHRvIHJ4IGRhdGEs
-IHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCB0Y2JfZmMtPmZsb3djX3N0YXRlIFsweCV4XQoAAAAA
-AAAAZHJvcF9hbGxfdGFzazogcmVxdWVzdGVkIGxpZHggWyV1XQoAAAAAAAAAAAAAAAAAZ2V0X3Jl
-Zl90YXNrOiBpc3Rhc2stPmZsb3djX2lkIFsweCV4XSwgaXN0YXNrX2ZjLT5mbG93Y19zdGF0ZSBb
-JXVdLCBpc3Rhc2tfZmMtPmZsb3djX2ZvaXNjc2lfdGFza19saWR4IFsldV0sIGxpZHggWyV1XQoA
-AAAAAAAAAABwcm9jZXNzX3RtZl9yZXNwb25zZTogaXN0YXNrX2ZjLT5mbG93Y19idWYtPnNjaGVk
-X25vZGUubmV4dCBbMHgleF0sIGlzdGFza19mYyBbMHgleF0sIGlzdGFza19mYy0+Zmxvd2NfaWQg
-WyV1XQoAcHJvY2Vzc190bWZfcmVzcG9uc2U6IHVscHR4cGxlbjE2IFsldV0KAAAAAAAAAAAAcHJv
-Y2Vzc190bWZfcmVzcG9uc2U6IGRlbGF5X3Byb2Nlc3NpbmcsIG9wIFsleF0KAAAAAAAAAAAAAAAA
-AAAAAHByb2Nlc3NfdG1mX3Jlc3BvbnNlOjogd3Igb3Bjb2RlIFsweCV4XQoAAAAAAAAAAHByb2Nl
-c3NfdG1mX3Jlc3BvbnNlOjogdGFzayBmdW5jdGlvbiBbMHgleF0KAAAAAGNhbGxpbmcgZHJvcF90
-YXNrLCBpc3Rhc2tfZmMtPmZsb3djX2ZvaXNjc2lfdGFza19saWR4IDB4JXgKAAAAAAB3cmhfZm9p
-c2NzaV9ub2RlOiBub2RlX3dyLT5mbG93aWRfbGVuMTYgMiBbJXhdCgB3cmhfZm9pc2NzaV9jaGFw
-OiBpZF9sZW4gWyV4XSwgc2VjX2xlbiBbJXhdCgAAAAB3cmhfZm9pc2NzaV9jaGFwOiB0Z3RfaWRf
-bGVuIFsleF0sIHRndF9zZWNfbGVuIFsleF0KAAAAAAAAAAAAAAAAcGVlcl9jb246IGNza19mYyA9
-PiBmbG93aWQgWzB4JXhdLCBmbG93Y19idWYgWzB4JXhdCgAAAAAAAAAAAAAAAGZvaXNjc2lfY3Ry
-bDogc3Vib3AgWzB4JXhdLCBzZXNzX3R5cGVfdG9fZXJsIFsweCV4XSwgc2Vzc190eXBlIFsweCV4
-XQoAAAAAAAAAAAAAd2F0Y2hkb2cgY21kIGhhbmRsZXIgKHRpbWUgJXUgYWN0aW9uICV1KQoAAAAA
-AAAAV0FUQ0hET0c6IGRldmljZSBzaHV0ZG93bgoAAAAAAABXQVRDSERPRzogYnlwYXNzIHRpbWVv
-dXQKAAAAAAAAAFdBVENIRE9HOiBGTFIgLSBub3QgaW1wbGVtZW50ZWQgeWV0CgAAAAAAAAAAAAAA
-AGZpbHRlcjogcG9yZ3JhbW1pbmcgdGlkICV1IChsZSB0Y2FtIGluZGV4ICV1KS4uLgoAAAAAAAAA
-AAAAAAAAAABmaWx0ZXI6IHJlcXVlc3RpbmcgY29tcGxldGlvbi4uLgoAAAAAAAAAAAAAAAAAAABG
-Q09FIEZyZWU6IHN0aWxsIHlpZWxkZWQgd2hlbiBmcmVlaW5nLi4uZmxvd2NfaWQgJXggZmxvd2Nf
-ZmxhZ3MgJXggCgAAAAAAAAAAAAAAAHBvcnQgJWQgcHJpb3IgJWQgc2VsZWN0ICVkIHByb3RvY29s
-SUQgMHglMDR4CgAAAHBvcnQgJWQgc2V0IHBmY19lbiA9IDB4JXgKAAAAAAAAcG9ydCAlZCBzZXQg
-cGdpZF8wXzcgPSAweCUwOHggcGdfcGVyY2VudGFnZSAweCUwOHhfJTA4eCBudW1fdGNzX3N1cHBv
-cnRlZCAlZAoAAABwb3J0ICVkIHNldCBwZmNfZW4gPSAweCV4CgAAAAAAAEZDb0UgRERQIGZhaWxl
-ZCA6IG94X2lkIDB4JXggcnhfaWQgMHgleAoAAAAAAAAAAEZDb0UgRERQIGZhaWxlZCA6IERkcFJl
-cG9ydCAweCV4IERkcFZhbGlkIDB4JXgKAFBSTEkgUnNwIHRpbWVkb3V0IDogZmxvd2NfaWQgMHgl
-eCBveF9pZCAweCV4IHJ4X2lkIDB4JXggCgAAAAAAAABjYW5ub3QgYWxsb2NhdGUgb2ZmbG9hZGVk
-IGZpbHRlciBjb25uZWN0aW9uCgAAAABjYW5ub3QgYWxsb2NhdGUgb2ZmbG9hZGVkIGZpbHRlciBJ
-UHY2IGNvbm5lY3Rpb24KAAAAAAAAAAAAAAAAAAAAdW9bJXVdOiB3ciAlcCB3ci0+bGVuZ3RoICV1
-IG1zcyAldQoAAAAAAAAAAAAAAAAAdW9bJXVdOiBmIDB4JTA4eCBkc3RfY3BsIDB4JTA4eCBzcmNf
-Y3BsIDB4JTA4eCBpbW1kbGVuMTYgJXUKAAAAAHVvWyV1XTogbGFzdCBtc3MgJXUKAAAAAAAAAAAA
-AAAAdW9bJXVdOiAhbGFzdCB3ci0+c2NoZWRwa3RzaXplICV1CgAAAAAAAAAAAAAAAAAAaW52YWxp
-ZCBidWZmZXIgZ3JvdXBbJXVdIGNvbmZpZ3VyYXRpb246IG10dSAldSBsd20gJXUgaHdtICV1IGR3
-bSAldQoAAAAAAAAAAAAAAABmYyAldSB2ZiAldSBnb3QgaXZmPTB4JXgscmFuZ2U6ICUjeC0lI3gg
-KCV1LyV1IHVzZWQpCgAAAAAAAAAAAAAAVkkgJXUgY2Fubm90IGdldCBSU1Mgc2xpY2U6IE5vIG1v
-cmUgc2xpY2VzIGF2YWlsYWJsZSAodXNlZCAldS8ldSkKAAAAAAAAAAAAAAAAAABwZm4gJXUgdmZu
-ICV1IHdpdGggcG9ydCBtYXNrIDB4JXggY2Fubm90IGFjY2VzcyBwb3J0ICV1LCByZXQgJWQKAAAA
-AAAAAAAAAAAAAAAAAHBmbiAldSB2Zm4gJXUgY291bGQgbm90IGFsbG9jYXRlIHZpaWQsIHJldCAl
-ZAoAAHBmbiAldSB2Zm4gJXUgY291bGQgbWFwIHZpaWQgIDB4JXggdG8gZmxvd2MsIHJldCAlZAoA
-AAAAAAAAAAAAAABwZm4gJXUgdmZuICV1IGNvdWxkIG5vdCBhbGxvY2F0ZSB1d2lyZSBmdW5jICVk
-IG1hYyBhZGRyLCByZXQgJWQKAAAAAAAAAAAAAAAAAAAAAG1paV9mb3JjZV9zcGVlZFsldV06IHJj
-YXBzIDB4JXgKAAAAAAAAAAAAAAAAAAAAAG1paV9saW5rX3N0YXR1c1sldV06IGJtc3IgMHglMDh4
-IHN0YXR1cyAldSB4Z21fbHMgMHglMDh4CgAAAAAAAABwb3J0X2NtZF9oYW5kbGVyOiB1bmtub3du
-IHUuZGNiLnR5cGUgMHgleAoAAAAAAABwb3J0WyV1OjB4JTAyeDoweCUwMnhdOiBwaHkgcmVzZXQg
-bm90IGF2YWlsYWJsZQoAAAAAAAAAAAAAAAAAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogdW5r
-bm93biBhY3Rpb24gMHgleAoAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogdW5rbm93biByZWFk
-IGFjdGlvbiAweCV4CgAAAAAAAAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5OiB0aWQgJXUgY3BsIDB4
-JTA4eCUwOHgKAAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5OiB0aWQgJXUgY3BsIDB4JTA4eCUwOHgg
-MHglMDh4JTA4eAoAAAAAAAAAAAAAAAAAAABjcGxfZXJyX25vdGlmeTogdGlkICV1IGxlbiAldQoA
-AEZDT0UgRnJlZTogc3RpbGwgeWllbGRlZCB3aGVuIGZyZWVpbmcuLi5mbG93Y19pZCAleCBmbG93
-Y19mbGFncyAleCAKAAAAAAAAAAAAAAAARkNPRSBCUCBXUiBFUlI6IFdSIHdpdGggY29va2llICV4
-JXggZXJyb3JlZCBiYWNrIAoAAAAAAAAAAAAAAAAAAHNjc2lfYWJvcnQ6IEVudGVyaW5nIEFib3J0
-X3Rhc2ssIGJ1ZmZlcmVkIFsldV0KAHNjc2lfYWJvcnQ6OiB3ci0+aXFpZCBbMHgleF0sIGlzdGFz
-a19mYy0+Zmxvd2Nfc2dlX2lxaWQgWzB4JXhdCgBzY3NpX2Fib3J0OjogbHVuX2lkeCBbMHgleF0K
-AAAAAHNjc2lfYWJvcnQ6IHJlZiB0YXNrIG5vdCBvdXRzdGFuZGluZwoAAAAAAAAAAAAAAHNjc2lf
-YWJvcnQ6IHNyZXEtPm9wY29kZSBbMHgleF0gZmxhZ3MgWzB4JXhdCgAAAHNjc2lfYWJvcnQ6IHRh
-c2tfaWR4IFsldV0sIGl0dCBbMHgleF0KAAAAAAAAAAAAAGFib3J0L2Nsb3NlIFdSIHdpdGggY29v
-a2llIDB4JWx4IHdhcyBpc3N1ZWQgb24gc3NuIDB4JXggaW4gd3Jvbmcgc3RhdGUgMHgleAoAAAAA
-YWJvcnQgV1Igb24gc3NuIDB4JXggZGlkIG5vdCBmaW5kIFdSIHdpdGggY29va2llIDB4JXgleAoA
-AAAAAAAAAGNsb3NlIFdSIHdpdGggY29va2llIDB4JWx4IG9uIHNzbiAweCV4O2RpZCBub3QgZmlu
-ZCBXUiB3aXRoIGNvb2tpZSAweCVseAoAAAAAAAAAYWJvcnQgV1Igb24gc3NuIDB4JXggd2FzIGlz
-c3VlZCBvbiB4Y2hnIDB4JXggd2l0aCByeF9pZCAweCV4IGluIHdyb25nIHN0YXRlIDB4JXgKAAAA
-AAAAAAAAAAAAAAAAcG9ydCAlZCBhcHBsSUQgMHglMDR4IG91aSAweCUwNnggdXNlcl9wcmlvciAl
-ZAoAc2VuZCBkY2J4IGluZm86Zmxvd2NpZCAldQoAAAAAAABzZW5kIGRjYnggY29tcGxldGUKAAAA
-AAAAAAAAAAAAAERDQlggcG9ydCAldSBhbGxfc3luY2QgPSAldQoAAAAAY2huZXRfbDJ0X3VwZGF0
-ZTogbDJkZXZfZmMgWzB4JXhdLCBsMmRldl9mYy0+Zmxvd2NfaWQgWyV1XSBsMmRldl9mYy0+Zmxv
-d2NfZmxhZ3MgWzB4JXhdCgAAAAAAAAAAY2huZXRfbDJ0X3VwZGF0ZTogbDJkZXZfZmMtPmZsb3dj
-X2lkIFsldV0gYWxyZWFkeSBzY2hlZHVsZWQKAAAAAGNobmV0X2wydF91cGRhdGU6IGluIGRlbGF5
-ZWRfcHJvY2Vzc2luZywgbDJ0ZW50IFslMDh4XQoAAAAAAAAAAABjaG5ldF9sMnRfdXBkYXRlOiBs
-MnRfdXBkYXRlIHJlcXVlc3Qgc2VudCBsMnRlbnQgWyUwOHhdLCBsMnRlbnQtPmlkeCBbJWRdLCBs
-MnRlbnQtPnZsYW4gWyVkXQoAAABuZXRpZl9wcm9jZXNzX2RoY3A6IGwyZGV2X2ZjLT5mbG93Y19p
-ZCBbMHgleF0sIHByb2Nlc3NpbmcsIG9wdF9sZW4gJXUKAAAAAAAAAAAAAGNobmV0X2RoY3BfcmVj
-djogdmxhbmlkIFsldV0sIGwyZGV2X3BpZF9mYy0+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5kZXYgWzB4
-JXhdLCBsMmRldl9mYyBbMHgleF0KAAAAAGNobmV0X2RoY3BfcmVjdjogbDJkZXZfZmMtPmZsb3dj
-X2lkIFsweCV4XSwgZGhjdHh0LT5zdGF0ZSBbJWRdLCBtYWxhY2lvdXMgZGhjcCByZWN2IGZvciBu
-byByZXF1ZXN0CgAAAAAAAAAAAAAAAABkaGN0eHQtPnN0YXRlIDogJWQKAAAAAAAAAAAAAAAAAGwy
-ZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIEJhZCBESENQIGNvb2tpZSByZWNpZXZlZCwgYWJvcnRp
-bmcKAABOX1BPUlQgMHgleCV4JXggcmVqZWN0ZWQgUExPR0kgd2l0aCByZWFzb24gY29kZSAleAoA
-AAAAAAAAAAAAAAAAQUJUUyB3aGlsZSBhd2FpdGluZyBQUkxJIFJzcDogZmxvd2NfaWQgMHgleCBv
-eF9pZCAweCV4IHJ4X2lkIDB4JXggCgAAAAAAAAAAAAAAAABBQlRTIGZha2UgUnNwOiBsb2MgMHgl
-eCBveF9pZCAweCV4IHJ4X2lkIDB4JXgKAABjYW5ub3QgYWxsb2NhdGUgUE9GQ09FIGZpbHRlciBj
-b25uZWN0aW9uIGZvciB4X2lkICV4IAoAAAAAAAAAAAAAcmVsZWFzZV90aWQ6IHNpemVvZih0Y2Jf
-ZmMtPmZsb3djX2ZvaXNjc2lfY29ubikgWyV1XSwgYnl0ZXMKAAAAAGFjdF9vcGVuX3JwbDogYXRp
-ZCBbMHgleF0sIHRpZCBbMHgleF0sIG9wIFsweCV4XSwgc3RhdHVzIFsweCV4XQoAAAAAAAAAAAAA
-AAAAAAAAYWN0X29wZW5fcnBsOiBjc2tfZmMtPnRjYl9zdGF0ZSBbMHgleF0sIGNza19mYy0+Zmxh
-Z3MgWzB4JXhdLCB0Y2JfZmMtPmZsb3djX3N0YXRlIFsweCV4XQoAAAAAAAAAc2VuZF9hYm9ydF9y
-cGw6IGNza19mYy0+Zmxvd2NfdHlwZSBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCB0
-aWQgWzB4JXhdLCB1bHB0eGNoIFsldV0sIGJ1ZmZlcmVkIFsldV0KAAAAAHdyaF9vZmxkX3RjcF9j
-bG9zZV9jb25fcmVwbHk6IHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCB0Y2JfZmMtPmZsb3djX3R5
-cGUgWzB4JXhdLCBsZW4xNiBbJXVdLCBsb2MgWyV1XQoAAAAAAAAAAAB3cmhfb2ZsZF90Y3BfY2xv
-c2VfY29uX3JlcGx5OiBycGwtPm9wX1RpZCBbMHgleF0sIHJwbD5zdGF0dXMgWzB4JXhdLCBycGwt
-PnNuZF9ueHQgWzB4JXhdLCBycGwtPnJjdl9ueHQgWzB4JXhdCgAAdGNwX2Fib3J0X3JwbF9yc3M6
-IHRpZCBbMHgleF0sIHN0YXR1cyBbMHgleF0KAAAAdGNwX2Fib3J0X3JlcV9yc3M6IHRpZCBbMHgl
-eF0sIHN0YXR1cyBbMHgleF0KAAAAcGt0c2NoZWRfY2xfcmxbJXU6JXVdOiBtb2RlIHwgdW5pdCB8
-IHJhdGUgMHglMDZ4IG1pbiAldSBtYXggJXUgcGt0c2l6ZSAldQoAAAAAAABwYXJhbV9kbWFxWzB4
-JXg6MHgleF06IGRtYXEgMHgleCByZWFkICV1IHBmICV1IHJldCAlZAoAAAAAAAAAAAAATUMgaW5p
-dGlhbGl6YXRpb24gbm90IGNvbXBsZXRpbmcsIE1DIGN1cnJlbnQgaW5pdCBzdGF0ZSBpcyAweCUw
-MngKAAAAAAAAAAAAAAAAAABod19iY204NDgzNF9sb2Fkc2VxdWVuY2U6IFN0YXJ0ZWQKAAAAAAAA
-AAAAAAAAAABod19iY204NDgzNF9sb2Fkc2VxdWVuY2U6IFVwbG9hZCBpbWFnZSB0byBQSFkgb24t
-Y2hpcCBtZW1vcgoAAAAAaHdfYmNtODQ4MzRfbG9hZHNlcXVlbmNlOiBkb25lIGxvYWRpbmcgaW1h
-Z2UgKGkgPSAldSkKAAAAAAAAAAAAAEZMQVNIIG5vdCByZWFkeTogaSAldSBudnJSZWcgJSN4CgAA
-AAAAAAAAAAAAAAAAAEFRX0ZMQVNIX1JlYWR5IC0gVGltZW91dCAoMSkKAAAAQVFfRkxBU0hfUmVh
-ZHkgLSBUaW1lb3V0ICgyKQoAAAAJQVFfUmV0dXJuQ29udHJvbE9mRkxBU0gKAAAAAAAAAHBoeTog
-ZmFpbGVkIHRvIGFsbG9jYXRlZCBtZW1vcnkgZm9yIHBoeSBmdyBmaWxlLCByZXQgJWQKAAAAAAAA
-AABQSFkgRlcgdmVyc2lvbiBpbmZvcm1hdGlvbiBub3QgYXZhaWxhYmxlIGZvciB0aGlzIHRlY2hu
-b2xvZ3kKAAAAaHdfbGVfZmlsdGVyX2N0dXBsZTogdHVwbGUgJXUgbm90IHNwZWNpZmllZCBidXQg
-cmVxdWlyZWQgZm9yIG1hc2sgMHgleAoAAAAAAAAAAABsZSBjb25maWd1cmF0aW9uOiBuZW50cmll
-cyAldSByb3V0ZSAldSBjbGlwICV1IGZpbHRlciAldSBhY3RpdmUgJXUgc2VydmVyICV1IGhhc2gg
-JXUKAAAAAAAAAAAAAABsZSBjb25maWd1cmF0aW9uOiBuZW50cmllcyAldSByb3V0ZSAldSBjbGlw
-ICV1IGZpbHRlciAldSBzZXJ2ZXIgJXUgYWN0aXZlICV1IGhhc2ggJXUgbnNlcnZlcnNyYW0gJXUK
-AAAAAAAAAAAAAAAAY2ZfcGFyc2U6IGZpbGUgbWVtdHlwZSAweCV4IG1lbWFkZHIgMHgleCBtYXBw
-ZWQgQCAlcDoKAAAAAAAAAAAAAGNvbmZpZ3VyZWQgd2l0aCBjYXBzIG5ibXxsaW5rIDB4JTA4eCBz
-d2l0Y2h8bmljIDB4JTA4eCB0b2V8cmRtYSAweCUwOHggaXNjc2l8ZmNvZSAweCUwOHgKAAAAAAAA
-AG5ldCBWSSBhbGxvY2F0aW9uIGZhaWxlZCBmb3IgZmNfaWQgJXUgd2l0aCBlcnJvciAlZAoAAAAA
-AAAAAAAAAABuZXQgVkkgbWFjIGFkZHJlc3MgcHJvZ3JhbW1pbmcgZmFpbGVkIGZvciBmY19pZCAl
-dSB3aXRoIGVycm9yICVkCgAAAAAAAAAAAAAAAAAAAG5ldCBWSSByeG1vZGUgcHJvZ3JhbW1pbmcg
-ZmFpbGVkIGZvciBmY19pZCAldSB3aXRoIGVycm9yICVkCgAAAABuZXQgVkkgcnNzIGluZGlyZWN0
-aW9uIHRhYmxlIHByb2dyYW1taW5nIGZvciBmY19pZCAldSBmYWlsZWQgd2l0aCBlcnJvciAlZAoA
-AAAAAG5ldCBWSSByc3MgY29uZmlnIGNvbW1hbmQgZmFpbGVkIGZvciBmY19pZCAldSB3aXRoIGVy
-cm9yICVkCgAAAABuZXQgVkkgY29tbWFuZCBmYWlsZWQgZm9yIGZjX2lkICV1IHdpdGggZXJyb3Ig
-JWQKAAAAAAAAAAAAAAAAAAAAcHBtYXggWyV1XSwgYml0cyBbJXVdLCBGV19JU0NTSV9QQUdFUE9E
-X1RBR19JRFhfTUFYX1NJWkUgWyV1XQoAAGRlZmF1bHQgdGFnbWFzayBbMHglMHhdCgAAAAAAAAAA
-cHJvZ3JhbW1lZCB0YWdtYXNrIFsweCUweF0KAAAAAABwcG0tPmRkcF9pbmZvLmxsaW1pdCBbMHgl
-MHhdLCBwcG0tPmRkcF9pbmZvLnVsaW1pdCBbMHglMHhdLCBwcG0tPmRkcF9pbmZvLnNpemUgWzB4
-JTB4XQoAAAAAAAAAAABwcG0tPmRkcF9pbmZvLm1heF90eHN6IFsweCUweF0gcHBtLT5kZHBfaW5m
-by5tYXhfcnhzeiBbMHglMHhdIGlvc2l6ZSBbMHglMHhdCgAAAHBwbWF4IFsldV0sIGlkeF9iaXRz
-IFsldV0sIGlkeF9tYXNrIFsweCUweF0sIHJlc3ZkX3RhZ19tYXNrIFsweCUweF0sIHRhZ21hc2sg
-WzB4JTB4XQoAAAAAAAAAAAAAAHRhZyBpdHQgMHglMHgsIGJpdHMgJXUsIGFnZSAweCUweCwgYml0
-cyAldQoAAAAAAGN4Y25pYy0+aXNjc2lfcHBtIFsweCUweF0KAAAAAAAAc2NzaV9wbGRfc2l6ZSBb
-JXVdLCBBTElHTihzY3NpX3BsZF9zaXplLCAxNikgWyV1XQoAAAAAAAAAAAAAAAAAAG1heF9wcG9k
-X3pvbmVzIFsldV0KAAAAAAAAAAAAAAAAZm9pc2NzaV9pbml0OiBmb2lzY3NpX2luaXRfZG9uZSBb
-JXVdLCBkZXYucmVzLmZvaXNjc2lfbnRhc2tzIFsldV0sIGRldi5yZXMuZm9pc2NzaV9uc2VzcyBb
-JXVdLCBkZXYucmVzLm5jc29jayBbJXVdLCBkZXYucmVzLmZvaXNjc2lfbmluaXQgWyV1XSwgcmMg
-WyVkXQoAAAAAAAAAAGNoX2NsX3JhdGVbJXUvJXVdOiBjYXBwZWQgY2xhc3MgcmF0ZSBmcm9tIHJl
-cXVlc3RlZCAldSB0byBjb25maWd1cmVkIChlZmZlY3RpdmUpIGNoYW5uZWwgcmF0ZSAldQoAAAAA
-AAAAAAAAAAAAAABjaF9jbF9yYXRlWyV1LyV1XTogaW5jcmVhc2VkIGRlZmljaXRfaW5jciBmcm9t
-IHJlcXVlc3RlZCAldSB0byByZXF1aXJlZCBtaW4gb2YgJXU7IHJhdGUgJXUgKGVmZiAldSkgZGVm
-aWNpdF9tYXggJXUKAAAAAAAAAAAAAAAAAHBrdHNjaGVkIGNoYW5uZWwgJXUgc2V0cyBzcGVlZCAo
-ZnJvbSAldSkgdG8gJXUga2JwcwoAAAAAAAAAAAAAAABwb3J0X2NtZF9oYW5kbGVyOiB1bmtub3du
-IHUuZGNiLnR5cGUgMHgleAoAAAAAAABpMmMgZXJyb3IgY2F1c2VkIGJ5IG1vZHVsZSB1bnBsdWcK
-AAAAAAAAAAAAAAAAAABzZW5kdG8gcGVuZGluZzogd3JfcGVuZCAlcCBmb3IgcG9ydCAldSwgIHdh
-bnQgdG8gc2VuZCB0byBwb3J0ICV1CgAAAAAAAAAAAAAAAAAAAHNlbmR0bzpmbG93Y2lkICV1CgAA
-AAAAAAAAAAAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXJbJXVdIGxlYXZpbmcgU1RBVEVfVVAg
-KD0+cG93ZXJkb3duKQoAAAAAAHBvcnRfbGlua19zdGF0ZV9oYW5kbGVyWyV1XSBwb3dlcmluZyBk
-b3duCgAAAAAAAHBvcnRfbGlua19zdGF0ZV9oYW5kbGVyWyV1XSBsZWF2aW5nIHBvd2VyZG93biAo
-PT5kb3duKQoAAAAAAAAAAABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlclsldV0gbGVhdmluZyBTVEFU
-RV9ET1dOICg9PnBvd2VydXApCgAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXJbJXVdIHBvd2Vy
-aW5nIHVwCgAAAAAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXIgbGVhdmluZyBwb3dlcnVwICg9
-PnVwKQoAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXJbJXVdIG9oIG15IHdoYXQgaXMgZ29pbmcgb24g
-KHN0YXRlID0gJSN4CgAAAAAAAAAAAAAAAAAAAABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlciBnb3Qg
-cmVzY2hlZHVsZWQKAAAAAAAAAABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlcjogU29tZXRoaW5nIHdl
-bnQgdGVycmlibHkgd3JvbmcuIHJldCA9ICVkCgAAAAAAAAAAAAAAAAAAAHNldHRpbmcvdW5zZXR0
-aW5nIGhzcyByZXN5bmMgYml0CgAAAAAAAAAAAAAAAAAAAGxlIGluaXRpYWxpemF0aW9uOiBuZW50
-cmllcyAldSByb3V0ZSAldSBjbGlwICV1IGZpbHRlciAldSBhY3RpdmUgJXUgc2VydmVyICV1IGhh
-c2ggJXUKAAAAAAAAAAAAAGxlIGluaXRpYWxpemF0aW9uOiBuZW50cmllcyAldSByb3V0ZSAldSBj
-bGlwICV1IGZpbHRlciAldSBzZXJ2ZXIgJXUgYWN0aXZlICV1IGhhc2ggJXUgbnNlcnZlcnNyYW0g
-JXUKAAAAAAAAAAAAAAB0cCBjaGFubmVsIGNvbmZpZ3VyYXRpb246ICV1IHJ4IGFuZCAldSB0eCBj
-aGFubmVscwoAAAAAAAAAAAAAAAAAdHAgbWVtIGRpc3RyaWJ1dGlvblslJV0gcG10eCAldSBwbXJ4
-ICV1IGRkcCAldSBkZHBfaXNjc2kgJXUgc3RhZyAldSBwYmwgJXUgcnEgJXUgcnF1ZHAgJXUKAAAA
-AAAAVFBfUE1NX1JYX1BBR0VfU0laRSAldSBpcyBub3Qgc3VwcG9ydGVkCgAAAAAAAAAAVFBfUE1N
-X1RYX1BBR0VfU0laRSAldSBpcyBub3Qgc3VwcG9ydGVkCgAAAAAAAAAAY3hjbmljX2RldmljZV9p
-bml0OiBjeGNuaWMgWzB4JTB4XSwgY3hjbmljLT5maWx0ZXIgWyUweF0KAAAAAAAAAGN4Y25pY19k
-ZXZpY2VfaW5pdDogZGV2LnRwLm51bV90eF9wYWdlcyBbJXVdLCBkZXYubWNbMF0uc2l6ZSBbJXVd
-LCBkZXYudHAudHhfcGFnZV9zeiBbJXVdLCBjeGNuaWMgc2l6ZSBbJWRdLCByYyBbJWRdCgAAAAAA
-AAAAAAAAUG9ydFsldV06IFVua25vd24gU0dNSUkgc3ViLXR5cGUgJSN4CgAAAAAAAAAAAAAAUG9y
-dFsldV06IFVua25vd24gQlRfWEZJIHN1Yi10eXBlICUjeAoAAAAAAAAAAAAAUG9ydFsldV06IFVu
-a25vd24gQlRfWEFVSSBzdWItdHlwZSAlI3gKAAAAAAAAAAAAcG9ydF9pbml0WyV1XTogcG9ydCB0
-eXBlIDB4JXggaXMgbm90IHN1cHBvcnRlZAoARVEgcGZuICV1IHZmbiAldTogZGVzdHJveWluZyBl
-cWlkICV1IHdpdGggcGVuZGluZyBXUihzKSAobnVtX2J5dGVzICV1IGFuZCBmbGFncyAweCUwOHgK
-AAAAAAAAAAAAbDJkZXZfZmMtPmZsb3djX2lkIFsldV0sIGwyZGMtPnBmbiBbJXVdLCBsMmRjLT52
-Zm4gWyV1XSwgbDJkYy0+bHBvcnQgWyV1XSwgbDJkZXZfZmMtPmZsb3dpZCBbJXVdIGwyZGMtPnR4
-X2NoIFsldV0sIGRldi52cGQucG9ydHZlYyBbJXhdCgAAAAAAAAAAcG9ydHZlYyBbJXVdCgAAAEFo
-IGhhLi4uZG91YmxlIGZyZWUgb3hfaWQgMHgleCwgcnhfaWQgMHgleAoAAAAAAEhvc3QgUFJMSSBS
-ZXNwb25zZSB0aW1lZG91dDogb3hfaWQgMHgleCByeF9pZCAweCV4CgAAAAAAAAAAAAAAAABwZm4g
-JXUgdmZuICV1IHZpYSBjb21tYW5kCgAAAAAAAGNvbmZpZ3VyYXRpb24gZmlsZSBwYXJzZXI6IHNn
-ZSB0aW1lciB2YWx1ZVslaV0gaXMgdG9vIGxhcmdlLCBjaGFuZ2luZyBmcm9tICV1IHRvICV1dXNl
-Y3MKAAAAAAAAAGZpbHRlcm1hc2sgMHgleCBpcyBub3QgZXF1YWwvc3Vic2V0IHRvL29mIGZpbHRl
-cm1vZGUKAAAAAAAAAAAAAABod19sZV9jbGlwX2hhbmRsZXI6IHJlbW92ZWQgcG9zPSV1ICg9aWR4
-ICV1KQoAAABod19sZV9jbGlwX2hhbmRsZXI6IGFkZGluZyB0byBwb3M9JXUgKD1pZHggJXUpCgBt
-b2R1bGVbJXVdOiBwb3J0IG1vZHVsZSBpbnNlcnRlZCBhbmQgcmVhZHkKAAAAAABtb2R1bGVbJXVd
-OiBwb3J0IG1vZHVsZSByZW1vdmVkCgAAAAAAAAAAAAAAAAAAAABtb2R1bGVbJXVdOiB1bmtub3du
-IG1vZHVsZSBpZGVudGlmaWVyIDB4JTAyeAoAAABtb2R1bGVbJXVdOiBncGlvICV1IHRyYW5zIDEw
-RyAweCUwMnggMUcgMHglMDJ4IChsZW5ndGggJXUpIGNhYmxlIDB4JTAyeCAobGVuZ3RoICV1KSBt
-b2R1bGVfdHlwZSAweCUwMngKAAAAAAAAAAAAY3g0X2NyX3Bkb3duWyV1XTogZW4gJXUgdmlfZW5f
-Y250ICV1CgAAAAAAAAAAAAAAY3JfbW9kdWxlX3J4X2xvc1sldV06IHJ4X2xvcyBjaGFuZ2VkIHRv
-ICV1CgAAAAAAaW5pdF9wb3J0WyV1XTogIGxpbmsgc3RhdHVzIDB4JXggbW9kX3R5cGUgMHgleCB2
-aV9lbl9jbnQgJXUgcnhfbG9zICV1IGhzc19zaWdkZXQgJXUgcG9ydF9jZmcuc2lnZGV0ICV1CgAA
-AAAAAAAAAGluaXRfcG9ydFsldV06ICBsaW5rIHN0YXR1cyAweCV4CgAAAAAAAAAAAAAAAAAAAGlu
-aXRfcG9ydFsldV06ICBsaW5rIHN0YXR1cyAweCV4CgAAAAAAAAAAAAAAAAAAAGluaXRfcG9ydFsl
-dV06ICBsaW5rIHN0YXR1cyAweCV4CgAAAAAAAAAAAAAAAAAAAGluaXRfcG9ydFsldV06ICBsaW5r
-IHN0YXR1cyAweCV4CgAAAAAAAAAAAAAAAAAAAGluaXRfcG9ydFsldV06ICBsaW5rIHN0YXR1cyAw
-eCV4CgAAAAAAAAAAAAAAAAAAAGN4NF9jclsldV06IHJldCAlZCBzdGF0dXMgJXUgeGdtX2xzIDB4
-JTA4eAoAAAAAAHBmbiAldSB2Zm4gJXUKAABodyBwZiBiaXRtYXAgMHglMDJ4IHZmaWQgYml0bWFw
-IDB4JTA4eDoweCUwOHg6MHglMDh4OjB4JTA4eAoAAAAAYWZ0ZXIgdmZpZCBmaXh1cCwgdmZpZCBi
-aXRtYXAgMHglMDh4OjB4JTA4eDoweCUwOHg6MHglMDh4CgAAAAAAAHdvcmthcm91bmQxMzcyMzog
-ZGV0ZWN0ZWQgV1IgQCAweCUwOHggb2Ygc2l6ZSAldSBieXRlcywgZHJpYmJsaW5nIGl0IGluICV1
-IGJ5dGVzIGF0IGEgdGltZQoAAAAAAHRpbWVyIHF1ZXVlICV1IGxvc3QgYSB0aWNrISBuZXh0ICVw
-IGxhc3QgJXAgbnVtZSAldQoAAAAAAAAAAAAAAABmbHJfdGltZXJfc3RhcnQ6IGZsb3djX2lkICV1
-ICVwIGJ1ZiAlcAoAAAAAAAAAAABwY2llOiBucGYgJXUgKHBmYml0bWFwIDB4JTAyeCkgbnZmICV1
-IChwZiAwLi4zIDB4JTAyeCAweCUwMnggMHglMDJ4IDB4JTAyeCkKAAAAAGZhaWxlZCB0byBmaW5k
-IHRoZSAlYyVjIFZQRCBwYXJhbWV0ZXIKAAAAAAAAAAAAAGZhaWxlZCB0byBwYXJzZSB0aGUgJWMl
-YyBWUEQgcGFyYW1ldGVyCgAAAAAAAAAAAGZhaWxlZCB0byBzdWNjZXNzZnVsbHkgZmluZCBDaGVs
-c2lvIFZQRAoAAAAAAAAAAGxvZyBpbml0aWFsaXplZCBAIDB4JTA4eCBzaXplICV1ICgldSBlbnRy
-aWVzKQoAAHdyaF9mb2lzY3NpX3Njc2lfZXJyOiB3ciBbMHgleF0sIHF1ZXVlZCBvbiBmbG93YyBb
-MHgleF0sIGZpZm8gWzB4JXhdIGJ5dGVzX2F2YWlsYWJsZQoAAAAAAAAAAAAAAGh3IHJlZ2lzdGVy
-IG9wZXJhdGlvbiBub3QgY29tcGxldGluZywgcmVnIDB4JTA4eCBtYXNrIDB4JTA4eCB2YWx1ZSAw
-eCUwOHggKHJlZyAweCUwOHgpCgAAAAAAAAAAAE1ESU8gQ0w0NTogZmFpbGVkIHRvIHNldCB1cCBN
-TUQgYWRkcgoAAAAAAAAAAAAAAE1ESU86IGZhaWxlZCB0byB3cml0ZQoAAAAAAAAAAAAATURJTyBD
-TDQ1OiBmYWlsZWQgdG8gc2V0IHVwIE1NRCBhZGRyCgAAAAAAAAAAAAAATURJTzogZmFpbGVkIHRv
-IHJlYWQKAAAAAAAAAAAAAABzZW5kX2Nsb3NlX3JlcTogY3NrX2ZjLT5mbG93Y190eXBlIFsweCV4
-XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+dGNiX3N0YXRlIFsweCV4XQoAAABz
-ZW5kX2Nsb3NlX3JlcTogY3NrX2ZjLT5mbG93Y190eXBlIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19p
-ZCBbMHgleF0sIHRpZCBbMHgleF0sIHVscHR4Y2ggWyV1XSxidWZmZXJlZCBbJXVdCgAAAAAAb2Zs
-ZF90Y3BfZG9fYWN0aXZlX2Nsb3NlOiBjc2tfZmMgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsw
-eCV4XSwgY3NrX2ZjLT50Y2Jfc3RhdGUgWzB4JXhdCgAAAAAAb2ZsZF90Y3BfZG9fYWN0aXZlX2Ns
-b3NlOiBjc2tfZmMgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT50Y2Jf
-c3RhdGUgWzB4JXhdCgAAAAAAc2Vzc2lvbl9ibG9jazogc2Vzc19mYy0+Zmxvd2NfaWQgWzB4JXhd
-LCBzZXNzX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGNvbm5fZmMtPmZsb3djX2lkIFsweCV4XSwg
-Y29ubl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3Nr
-X2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0KAAAAAAAAAAAAAAAAAAAAb2ZsZF90Y3BfZGlzY29ubmVj
-dDogdGNiX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2st
-PnRjYl9zdGF0ZSBbMHgleF0KAAAAZGVjb2RlX2Jhc2U2NF9zdHJpbmc6IGRsZW4gWyVkXQoAAAAA
-AAAAAAAAAAAAAAAAZGVjb2RlX2hleF9zdHJpbmc6IGRsZW4gWyVkXQoAAABsb2dnZWRfaW46IGZs
-b3djX2ZvaXNjc2lfY29ubl9mbGFncyBbMHgleF0KAAAAAABmb2lzY3NpX3ZhbGlkYXRlX2xvZ2lu
-X3N0YWdlOiAtIDEKAAAAAAAAAAAAAAAAAABTZXEgIyBtaXNtYXRjaCBzdGF0c24gPSAweCV4IGV4
-cHN0YXRzbiA9IDB4JXgKAAB0ZXh0X3Jlc3A6IGNfYml0IFsweCV4XSwgZl9iaXQgWzB4JXhdCgAA
-AAAAAAAAAABuZXRfbDJkZXZfZmluZF9ieV9hZGRyOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhd
-LCBsMmRjLT5scG9ydCBbJXVdLCBsMmRfZmMtPmZsb3djX2lkIFsweCV4XSwgbDJkYy0+aW40X2Rl
-di5pbl9hZGRyLmFkZHIgWzB4JXhdLCBhZGRyIFsweCV4XQoAAABuZXRfbDJkZXZfbXR1X2NvbmZp
-ZzogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgbXR1ICV1CgAAAAAAAAAAbmV0aWZfZG9fZGhj
-cDogd3ItPnBhcmFtLnZsYW5pZCBbJXVdLCBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5k
-ZXYgWzB4JXhdCgBsMmRldl92aV9mc206IG1iIFsweCV4XSwgZGVmZXJyZWQsIHN0YXRlIFsweCV4
-XSwgcG9ydCBbMHgleF0KAAAAbDJkZXZfdmlfZnNtOiB2aWlkIFsweCV4XSBwb3J0IFsweCV4XSwg
-bWFjLWlkIFslMDJ4OiUwMng6JTAyeDolMDJ4OiUwMng6JTAyeF0uIAoAAAAAAAAAAAAAAAAAAAAA
-bDJkZXZfdmlfZnNtOiBzZ2VfZXFpZCBbMHgleF0sIHNnZV9pcWlkIFsweCV4XSwgc2dlX2VxY3Ig
-WzB4JXhdLCByc3Nfc3ogWzB4JXhdCgBsMmRldl92aV9mc206IGwyZGV2X2ZjLT5mbG93Y19uZXRf
-bDJkZXZfbXR1IFsldV0sIG1iX3NjcmF0Y2ggWzB4JXhdLCBwb3J0IFsweCV4XQoAAAAAAAAAAAAA
-AAAAAABsMmRldl92aV9mc206IHZpaWQgWyVkXSwgdmlfZmMtPmZsb3djX3ZpX2ZsYWdzIFsweCV4
-XQoAAAAAAAAAAAAAbDJkZXZfdmlfZnNtOiBwZm4gWzB4JXhdLCB2Zm4gWzB4JXhdLCBsMmRldl9m
-Yy0+Zmxvd2NfaWQgWzB4JXhdLCBscG9ydCBbMHgleF0sIHZpaWQgWzB4JXhdLCBmbGFncyBbMHgl
-eF0KAAAAAAAAAGwyZGV2X3ZpX2ZzbTogRXJyb3IgZnJlZWluZyBWSSwgcmMgWzB4JXhdCgAAAAAA
-AGwyZGV2X3ZpX2ZzbTogcGlkIFsweCV4XSwgdmlpZCBbMHgleF0sIG1iX2xvYyBbMHgleF0sIG1i
-X29yaWdbMHgleF0sIGwyZGV2X2ZsYWdzIFsweCV4XSwgcmMgWzB4JXhdCgAAAAAAAAAAAAAAAABl
-bmNvZGUgaGV4IHN0cmluZzogZGxlbiBbJWRdCgAAAHRjcF9zZW5kX2FvcGVuX3JlcTogY3NrX2Zj
-LT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBidWZmZXJlZCBb
-JXVdLCByZXNfY250IFsweCV4XSwgc2NoZWRfbm9kZS5uZXh0IFsweCV4XQoAYW9wZW5fcmVxOiBo
-d19sZV9maWx0ZXJfY3R1cGxlIGZhaWxlZCA6ICVkCgAAAAAAb2ZsZF90Y3Bfc2VuZF9hb3Blbl9y
-ZXE6IGNwbF9yZXEtPkZpbHRlciBbMHglMHhdLCBjdHVwbGVzWzBdIFsweCV4XSwgY3R1cGxlc1sx
-XSBbMHgleF0KAAAAAAAAAAAAY3NvY2tfYWxsb2M6IHR4X2NoIFsweCV4XSwgbHBvcnQgWzB4JXhd
-LCBjb29raWUgWyUwOHhdCgAAAAAAAAAAAGNzb2NrX2FsbG9jOiBhdmFpbGFibGUgWyV1XSwgbmNz
-b2NrIFsldV0sIHBvczphdGlkIFsweCV4XSwgY3NrX2ZjIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19p
-ZCBbMHgleF0sIHNwb3J0IFsldV0KAABmb2lzY3NpX3BlZXJfaW5pdDogY29ubl9hdHRyLT5oZGln
-ZXN0X3RvX2RkcF9wZ3N6IFsweCV4XQoAAAAAAAAAZm9pc2NzaV9wZWVyX2luaXQ6IGNvbm5fZmMt
-PmZsb3djX2ZvaXNjc2lfY29ubl9mbGFncyBbMHgleF0KAAAAAHRhc2tfZnJlZTogdHJ5aW5nIHRv
-IGZyZWUgcXVldWVkIHRhc2sgWzB4JXhdISEhCgAAAAAAAAAAAAAAAAAAAABXQVRDSERPRzogTm8g
-dGVtcGVyYXR1cmUgc2Vuc29yIGF2YWlsYWJsZS4KAAAAAABXQVRDSERPRzogQWN0aXZhdGluZwoA
-AAAAAAAAAAAAAFdBVENIRE9HIC0gRW5hYmxlIGFjdGlvbiAldSB0aW1lICV1CgAAAAAAAAAAAAAA
-AFdBVENIRE9HIC0gRGlzYWJsZSBhY3Rpb24gJXUKAAAAV0FUQ0hET0c6IERlLWFjdGl2YXRpbmcK
-AAAAAAAAAABzZXNzaW9uX3VuYmxvY2s6IHNlc3NfZmMtPmZsb3djX2lkIFsweCV4XSwgc2Vzc19m
-Yy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBjb25uX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNvbm5fZmMt
-PmZsb3djX3N0YXRlIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+Zmxv
-d2Nfc3RhdGUgWzB4JXhdCgAAAAAAAAAAAAAAAABzZXNzaW9uX2xpbmtfbm90aWZ5OiBwb3J0IFsw
-eCV4XSBsaW5rIGRvd24gcGluZyByZWNvdmVyeSBkaXNhYmxlZCwgdHJ5aW5nIHRvIHJlY292ZXIg
-c2Vzc2lvbiBbMHgleF0gY29ubiBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAHNlc3Npb25fbGlua19u
-b3RpZnk6IHBvcnQgWzB4JXhdIGxpbmsgdXAgc2Vzc2lvbiBbMHgleF0gY29ubiBbMHgleF0KAAAA
-AAAAAAAAAAAAZm9pc2NzaSBjb25uX2ZjIFsweCV4XSwgZmxvd2Nfc2NoZWRjbCBbMHgleF0sIGlu
-Z19jaCBbMHgleF0sIGVncl9jaCBbMHgleF0KAAAAAABsMmRldl9ub3RpZnkgd2l0aCB1bmtub3du
-IGZsYWcgWzB4JXhdCgAAAAAAAAAAAABGQ29FIEZDQiBsaW5rZG93bjogaW9fcmVxIDB4JXgleCBp
-cWlkIDB4JXggZmxvd2lkIDB4JXggb3AgMHgleAoAZmNvZSBub3RpZnkgOiBVcGRhdGUgbmV3IERD
-QlggdmFsdWVzIFZJIHN0YXRlIDB4JXggcHJpIDB4JXggc2NoZWRjbCAweCV4IGRjYnhfZG9uZSAw
-eCV4CgAAAAAAAAAAZmNvZSBub3RpZnkgOiBGQ0YgZmxvd2lkIDB4JXgsIHVscGNoIDB4JXggCgAA
-AAAAbmV0X2wyZGV2X25vdGlmeTogRXZlbnQgb24gbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwg
-cG9ydCBbJWRdLCBldmVudCBbMHgleF0sIHVscHR4Y2ggWyV1XSwgY2xhc3MgWzB4JXhdLCBwcmlv
-cml0eSBbMHgleF0KAAAAAABmY29lIG5vdGlmeSA6IERDQlggOiBwb3J0IDB4JXgsIHByaW9yaXR5
-IDB4JXggdWxwdHhjaCAweCV4IGNsYXNzIDB4JXgKAAAAAAAAAAAAAGNoX2NsX3JhdGVbJXUvJXVd
-OiBjYXBwZWQgZGVmaWNpdF9pbmNyIGZyb20gcmVxdWlyZWQgJXUgdG8gJXU7IHJhdGUgJXUgKGVm
-ZiAldSkgZGVmaWNpdF9tYXggJXUKAEZDb0UgRkNGIHRpbWVyOiBmbG93YyBzdGF0ZSAweCV4LCBw
-b3J0IDB4JXggLGZjZiAweCV4LCBmbG93Y19pZCAweCV4CgAAAAAAAAAAAAAAY29yZV9wcm9ncmFt
-X3RjYjogdGlkICUjeCB0X3N0YXRlICUjeCByY3ZfYWR2IDB4JTA4eCByY3Zfc2NhbGUgJSN4IHR4
-X21heCAlI3ggcmN2X254dCAlI3ggYXRpZCAlI3gKAAAAAAAAAAAAAAAAAAlvcHQwICUjeCV4IG9w
-dDIgJSN4IGlwdjYgJSN4IGZsYWdzX3RpbWVyIDB4JTA4eAoAAAAAAAAAAAAAAAAAAABvZmxkX2Nv
-bm5lY3Rpb25fd3I6IGNvbm5lY3Rpb24gd2l0aCA1LXR1cGxlIGxwIDB4JTA0eCBmcCAweCUwNHgg
-bGlwIDB4JTA4eCUwOHggcGlwIDB4JTA4eCUwOHggZmlsdGVyIDB4JTA4eCBleGlzdHMgQCBMRSBp
-bmRleCAldQoAAAAAAAAAAAAAAAAAAABvZmxkX2Nvbm5lY3Rpb25fd3I6IGNvbm5lY3Rpb24gd2l0
-aCA1LXR1cGxlIGxwIDB4JTA0eCBmcCAweCUwNHggbGlwIDB4JTA4eCBwaXAgMHglMDh4IGZpbHRl
-ciAweCUwOHggZXhpc3RzIEAgTEUgaW5kZXggJXUKAAAAAAAAAG9mbGRfY29ubmVjdGlvbl93cjog
-Y29ubmVjdGlvbiB3aXRoIDUtdHVwbGUgbHAgMHglMDR4IGZwIDB4JTA0eCBsaXAgMHglMDh4JTA4
-eCBwaXAgMHglMDh4JTA4eCBmaWx0ZXIgMHglMDh4CgAAAABvZmxkX2Nvbm5lY3Rpb25fd3I6IGNv
-bm5lY3Rpb24gd2l0aCA1LXR1cGxlIGxwIDB4JTA0eCBmcCAweCUwNHggbGlwIDB4JTA4eCBwaXAg
-MHglMDh4IGZpbHRlciAweCUwOHgKAAAAAAAAAAAAAAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBp
-cWVzaXplICV1IHRvbyBzbWFsbAoAAAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBpcWlkICV1IHRv
-byBsYXJnZSAobWF4ICV1KQoAAAAAAAAAAAAAAAAAAElRRkxJTlQgcGZuICV1IHZmbiAldTogaXFp
-ZCAldSBub3QgYWxsb2NhdGVkCgAAAElRRkxJTlQgcGZuICV1IHZmbiAldTogZmwwaWQgJXUgdG9v
-IGxhcmdlIChtYXggJXUpCgAAAAAAAAAAAAAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGZsMGlk
-ICV1IG5vdCBhbGxvY2F0ZWQKAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGZsMWlkICV1IHRvbyBs
-YXJnZSAobWF4ICV1KQoAAAAAAAAAAAAAAAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBmbDFpZCAl
-dSBub3QgYWxsb2NhdGVkCgAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBmbDFpZCAldSBpcyB2YWxp
-ZCBidXQgbm90IGZsMGlkICV1CgAAAAAAAElRRkxJTlQgcGZuICV1IHZmbiAldTogZmwxaWQgJXUg
-aXMgdmFsaWQgYnV0IGhlYWRlciBzcGxpdCBmZWF0dXJlIGlzIG5vdCBlbmFibGVkCgAAAAAAAAAA
-AAAAAAAAAElRIHBmbiAldSB2Zm4gJXU6IGlxaWQgJXUgdG9vIGxhcmdlIChtYXggJXUpCgAAAElR
-IHBmbiAldSB2Zm4gJXU6IGlxaWQgJXUgbm90IGFsbG9jYXRlZAoAAAAAAAAAAElRIHBmbiAldSB2
-Zm4gJXU6IGZsMGlkICV1IGZsMWlkICV1IGJ1dCBub3Qgc3VwcG9ydGVkCgAAAAAAAAAAAABod191
-bHB0eF93b3JrYXJvdW5kX3ByMTY5NDlfZW5hYmxlZF9wZjogcGYgJXUgZW5hYmxlZCAldQoAAAAA
-AAAAaHdfdWxwdHhfd29ya2Fyb3VuZF9wcjE2OTQ5X2VuYWJsZWRfdmZpZDogdmZpZCAldSBlbmFi
-bGVkICV1CgAAAEVRIHBmbiAldSB2Zm4gJXU6IGNyZWF0aW5nIEVUSCBlcWlkICV1IHdpdGggcGVu
-ZGluZyBXUihzKSAobnVtX2J5dGVzICV1IGFuZCBmbGFncyAweCUwOHgKAAAAAAAAAEVRIHBmbiAl
-dSB2Zm4gJXU6IGNyZWF0aW5nIENUUkwgZXFpZCAldSB3aXRoIHBlbmRpbmcgV1IocykgKG51bV9i
-eXRlcyAldSBhbmQgZmxhZ3MgMHglMDh4CgAAAAAAAEVRIHBmbiAldSB2Zm4gJXU6IGVxaWQgJXUg
-dG9vIGxhcmdlIChtYXggJXUpCgAAAEVRIHBmbiAldSB2Zm4gJXU6IGVxaWQgJXUgbm90IGFsbG9j
-YXRlZAoAAAAAAAAAAGh3X2NpbV90cF93b3JrYXJvdW5kMTM3MjNfZW5hYmxlOiBwb3J0ICV1IHBy
-b3RvY29sIDB4JXggZW4gJXUgY3VycmVudCAweCV4IHdvcmthcm91bmRfcHIxMzcyMyAweCV4CgAA
-AAAAAAAAAAAAAABwb3J0X2JsaW5rX2xlZF9yZXN0b3JlCgAAAAAAAAAAAHBvcnRfYmxpbms6IGJs
-aW5rZHVyPTB4JXggYmxpbmtfcmVmY250CgAAAAAAAAAAAHBvcnRfYmxpbms6IAlibGlua19yZWZj
-bnQ9MHgleAoAcG9ydF9ibGluazogCWJsaW5rX3JlZmNudD0weCV4CgBtaWlfYWR2X2ZjWyV1XTog
-cmNhcHMgMHgleAoAAAAAAG1paV9hZHZfc3BlZWRbJXVdOiByY2FwcyAweCV4CgAAbWlpX2FucmVz
-dGFydFsldV06IGFjYXBzIDB4JXgKAABtaWlfaW5pdFsldV06IGFjYXBzIDB4JXgKAAAAAAAAAG1p
-aV9wZG93blsldV06IHBvd2VyZG93biBlbiAldQoAcG9ydFsldV06IGdhdmUgdXAgZml4aW5nIGVy
-cm9ycyEhIQoAAAAAAAAAAAAAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogbDFjZmcsIHBjYXBz
-IDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAAAAAAAAAAAAAAAABwb3J0WyV1OjB4JTAy
-eDoweCUwMnhdOiBsMWNmZywgaW52YWxpZCByZXF1ZXN0LCBwY2FwcyAweCV4IGFjYXBzIDB4JXgg
-cmNhcHMgMHgleAoAAAAAAAAAAAAAAAAAAABwb3J0WyV1OjB4JTAyeDoweCUwMnhdOiBsMWNmZywg
-bWRpIG4vYSBwY2FwcyAweCV4IGFjYXBzIDB4JXggcmNhcHMgMHgleAoAAAAAAAAAAHBvcnRbJXU6
-MHglMDJ4OjB4JTAyeF06IGwxY2ZnLCBjYW5ub3QgZm9yY2Ugbm8vbXVsdGlwbGUgc3BlZWQocyks
-IHBjYXBzIDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAAAAAAAAAAAABnZXRfcmVmX3Rh
-c2s6IHJlcXVlc3RlZCBjb29raWU6IGhpZ2ggWzB4JTA4eF0sIGxvdyBbMHglMDh4XQoAAAAAZ2V0
-X3JlZl90YXNrOiB0YXNrIGNvb2tpZTogaGlnaCBbMHglMDh4XSwgbG93IFsweCUwOHhdCgAAAAAA
-AAAAAGdldF9yZWZfdGFzazogaXN0YXNrLT5mbG93Y19pZCBbMHgleF0sIGlzdGFza19mYy0+Zmxv
-d2Nfc3RhdGUgWyV1XQoAAAAAAAAAAAAAAAAAZ2V0X3JlZl90YXNrOiB0YXNrIG5vdCBmb3IgY29v
-a2llICVseAoAAAAAAAAAAAAAcHJvY2Vzc19kaGNwX29wdHM6IHJvb3QgcGF0aCBsZW4gWyVkXSBi
-eXRlcwoAAAAAbmV0aWZfcHJvY2Vzc19kaGNwX29wdHM6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgl
-eF0sIE1TR19UWVBFIFslZF0sIGRoY3R4dC0+c3RhdGUgWyVkXQoAAAAAAAAAAAAAaWNtcF9yZWN2
-OiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBwaWQgWzB4JXhdLCBpY21wIHR5cGUgWzB4JXhd
-CgAAAAAAAAAAAAAAAABBQlRTIEFDQyBhd2FpdGluZyBQUkxJIFJzcDogZmxvd2NfaWQgMHgleCBv
-eF9pZCAweCV4IHJ4X2lkIDB4JXggaXFpZCAweCV4CgAAAAAAAGNobmV0X2FycF9yZWN2OiBpcCBj
-b25mbGljdCBkZXRlY3RlZAoAAAAAAAAAAAAAAGNobmV0X2FycF9yZWN2OiBwaWQgWyV1XSwgdmxh
-biBbMHgleF0sIGFycCBvcCBbMHgleF0sIHNpcCBbMHgleF0sIHJpcCBbMHgleF0KAAAAY3NvY2tf
-cGVlcl9jbG9zZTogY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+dGNiX2ZjLT5mbG93
-Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2Nz
-b2NrX3RjYl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdCgAAAAAAAAAAAGNzb2NrX3BlZXJfY2xvc2U6
-IGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlICBbMHgleF0KAAAA
-AAAAAAAAaHdfdWxwdHhfd29ya2Fyb3VuZF9wcjE2OTQ5X2VuYWJsZWRfcGZfaXE6IGlxICV1IGVu
-YWJsZWQgJXUgKHBmICV1KQoAAAAAAAAAAAAAAAB0Y2JfZmMtPmZsb3djX2lkIFsweCUwNnhdLCB0
-Y2JfZmMtPmZsb3djX3R5cGUgWzB4JXhdLCBjcGxvcCBbMHgleF0gCgAAAAAAAAAAAAAAAGNoX3Jh
-dGVbJXVdOiBjYXBwZWQgdGljayBmcm9tIHJlcXVpcmVkICV1IHRvIHN1cHBvcnRlZCAldTsgcmF0
-ZSAldSAoZWZmICV1KSBkZWZpY2l0X2luY3IgJXUgdGljayAldQoAAAAAAAAAAAAAAABwa3RzY2hl
-ZF9jaF9ybFsldV06IGNoYW5uZWwgcmwgbm90IGF2YWlsYWJsZSBpbiBjb25qdW5jdGlvbiB3aXRo
-IGZsb3cgc2hhcGluZwoAAHBrdHNjaGVkX2NoX3JsWyV1XTogcmF0ZSAldSBtYXggJXUKAAAAAAAA
-AAAAAAAAAHBrdHNjaGVkX2NsX3dyclsldToldV06IHdlaWdodCAldSB3ZWlnaHRlZF9tYXNrIDB4
-JXgKAAAAAAAAAAAAAABlcV9wYXJhbXNbMHgleDoweCV4XTogZG1hcSAweCV4IHJlYWQgJXUgcGYg
-JXUgZXFpZF9hcGkgJXUgcmV0ICVkCgAAAAAAAAAAAAAAAAAAAGh3X2JjbTg0MzRfY2hlY2tyYW06
-IFN0YXJ0CgAAAAAAUEhZWyV1XSBwcm9jZXNzb3Igbm90IHJ1bm5pbmcKAABQSFlbJXVdIEZXIGhh
-cyBiYWQgQ1JDCgAAAAAAAAAAAFBIWSBmaXJtd2FyZSBsb2FkIHN1Y2Nlc3NmdWwhCgAACUFRX1Rh
-a2VDb250cm9sT2ZGTEFTSDogMWUuYzAwMT0lI3ggMWUuYzQ1MD0lI3ggMWUuYzQ1MT0lI3ggMWUu
-MTAwPSUjeAoAAAAAAAAAAABBUV9BUElfV3JpdGVBbmRWZXJpZnlGbGFzaEltYWdlIC0gSW1hZ2Ug
-aW50ZWdyaXR5IGNoZWNrIGZhaWxlZCAoY2FsYyAlI3ggdmFsICUjeCkKAAAAAAAAAAAAAAAAAABB
-UV9BUElfV3JpdGVBbmRWZXJpZnlGbGFzaEltYWdlIC0gSW1hZ2UgaW50ZWdyaXR5IGNoZWNrIHBh
-c3NlZAoAQVFfQVBJX1dyaXRlQW5kVmVyaWZ5Rmxhc2hJbWFnZSAtIFRpbWVvdXQgd2FpdGluZyBm
-b3IgZmxhc2ggaW50ZXJmYWNlICgldSkKAAAAAABBUV9BUElfV3JpdGVBbmRWZXJpZnlGbGFzaElt
-YWdlIC0gVGltZW91dCB3YWl0aW5nIGZvciBmbGFzaCBpbnRlcmZhY2UgKCV1KQoAAAAAAEFRX0FQ
-SV9Xcml0ZUFuZFZlcmlmeUZsYXNoSW1hZ2UgLSBUaW1lb3V0IHdhaXRpbmcgZm9yIGZsYXNoIGlu
-dGVyZmFjZSAoJXUpCgAAAAAAQVFfQVBJX1dyaXRlQW5kVmVyaWZ5Rmxhc2hJbWFnZSAtIFRpbWVv
-dXQgd2FpdGluZyBmb3IgZmxhc2ggaW50ZXJmYWNlICgldSkgKHBwICUjeCBhcCAlI3gpCgAAAAAA
-QVFfQVBJX1dyaXRlQW5kVmVyaWZ5Rmxhc2hJbWFnZSAtIFRpbWVvdXQgd2FpdGluZyBmb3IgZmxh
-c2ggaW50ZXJmYWNlICgldSkKAAAAAABBUV9BUElfV3JpdGVBbmRWZXJpZnlGbGFzaEltYWdlIC0g
-VGltZW91dCB3YWl0aW5nIGZvciBmbGFzaCBpbnRlcmZhY2UgKCV1KQoAAAAAAEFRX0FQSV9Xcml0
-ZUFuZFZlcmlmeUZsYXNoSW1hZ2UgLSBFcnJvciBvbiBidXJuaW5nIEZMQVNIIChjcmMxNiBtaXNt
-YXRjaCkKAAAAAAAAbWFsbG9jX2RlY1sldV06IHN0YXJ0ICVwIGVuZCAlcCBuZXh0ICVwIHNpemUg
-MHgleCBhbGlnbWVudCAweCV4IHAgJXAKAAAAAAAAAAAAAABtYWxsb2NfaW5jWyV1XTogc3RhcnQg
-JXAgZW5kICVwIG5leHQgJXAgc2l6ZSAweCV4IGFsaWdtZW50IDB4JXggcCAlcAoAAAAAAAAAAAAA
-AGxlIGNvbmZpZ3VyYXRpb246IGhhc2ggbW9kZSByZXF1aXJlcyBhdCBsZWFzdCAxNiBlbnRyaWVz
-LCBuaGFzaCAldQoAAAAAAAAAAAAAAAAAbGUgY29uZmlndXJhdGlvbjogaGFzaCBtb2RlIHJlcXVp
-cmVzIGF0IGVudHJpZXMgdG8gYmUgYSBwb3dlciBvZiAyLCBuaGFzaCAldQoAAABsZSBjb25maWd1
-cmF0aW9uOiByZXF1ZXN0ZWQgJXUgdGNhbSBlbnRyaWVzIGJ1dCBvbmx5ICV1IGF2YWlsYWJsZQoA
-AAAAAAAAAAAAAAAAAGxlIGNvbmZpZ3VyYXRpb246IHRjYW0gcmVnaW9ucyBtdXN0IGhhdmUgbXVs
-dGlwbGUgb2YgMzIgZW50cmllcywgbnJvdXRlICV1IG5jbGlwICV1IG5maWx0ZXIgJXUgbnNlcnZl
-ciAldQoAAAAAAABvZmxkIHRwIHRpbWVyIHNldHRpbmdzIFRQX01TTCAweCUwOHggVFBfUlhUX01J
-TiAweCUwOHggVFBfUlhUX01BWCAweCUwOHggVFBfUEVSU19NSU4gMHglMDh4IFRQX1BFUlNfTUFY
-IDB4JTA4eAoAICAgICAgICAgICAgICAgICAgICAgICBUUF9LRUVQX0lETEUgMHglMDh4IFRQX0tF
-RVBfSU5UVkwgMHglMDh4IFRQX0lOSVRfU1JUVC5pbml0X3NydHRfbWF4cnR0IDB4JTA0eCBUUF9J
-TklUX1NSVFQuaW5pdF9zcnR0X2luaXRzcnR0IDB4JTA0eCBUUF9GSU5XQUlUMl9USU1FUiAweCUw
-OHgKAAAAAAAAAAAAAABjb25maWd1cmF0aW9uIGZpbGUgcGFyc2VyIGVuY291bnRlcmVkIGVycm9y
-IEAgbGluZSAldToKAAAAAAAAAAAAaHdfaTJjX3RyYW5zYWN0aW9uOiBuZGF0YSAldSBhZGRyX29w
-IDB4JXggZGF0YVswXSAweCV4IGRpZmYgJXUKAGh3X2kyY190cmFuc2FjdGlvbjogbmRhdGEgJXUg
-YWRkcl9vcCAweCV4IGRhdGFbMF0gMHgleCBkaWZmICV1IGRwb3MgJXUgY29udCAldSBmYWlsZWQg
-d2l0aCBlcnIgJWQKAAAAAAAAAAAAAAAAAABpMmMgdHJhbnNhY3Rpb24gZmFpbGVkIHRvIGNvbXBs
-ZXRlCgAAAAAAAAAAAAAAAABIT1NUIFBBR0VfU0laRSBbMHglMGx4XSB0b28gc21hbGwsIG1pbiBb
-MHglMGx4XSByZXF1aXJlZAoAAAAAAAAAcGFnZSBzaXplIFslbHVdIG1pc21hdGNoCgAAAAAAAABQ
-QUdFIHNpemUgJWx1IHVuc3VwcG9ydGVkLCBkZHAgZGlzYWJsZWQKAAAAAAAAAABIb3N0IHBhZ2Vf
-c2l6ZSAlbHUsIGRkcF9pZHggJXUKAEZDb0UgRERQIGluaXQ6IGZjb2UgbGxpbWl0IDB4JXgsIGZj
-b2UgdWxpbWl0IDB4JXggZ2JsIGxsaW1pdCAweCV4IGdibCB1bGltaXQgMHgleAoAAAAAAAAAAAAA
-AAAAAEZDb0UgRERQIGluaXQ6IGZjb2UgcHBvZCBvZmYgMHgleCwgZmNvZSBzdCBwcG9kIGFkZHIg
-MHgleCBmY29lIG51bSBwcG9kcyAweCV4CgAAZmNvZSB4Y2hnIG1nciBpbml0OiBOdW1iZXIgb2Yg
-ZXhjaGFuZ2VzIGZvciBGQ29FIGlzICV4CgAAAAAAAAAAAFFTRlAgbW9kdWxlIHVucGx1ZyAtIHJl
-aW5pdGlhbGl6aW5nIHJ4X2xvcyAgdG8gMHhmZgoAAAAAAAAAAAAAAABncGlvX3FzZnBfbW9kdWxl
-X3VwZGF0ZTogY2hhbmdlZCByeF9sb3MgZnJvbSAweCV4IHRvIDB4JXgKAAAAAAAAZ3Bpb19xc2Zw
-X21vZHVsZV91cGRhdGU6IGNoYW5nZWQgdHhfZGlzIGZyb20gMHgleCB0byAweCV4CgAAAAAAAENh
-bGN1bGF0aW9uIG91dCBvZiBib3VuZHMgZnVyaW5nIGluaXQ6ICUjeCAlI3ggJSN4CgAAAAAAAAAA
-AAAAAABxdWV1ZXNfcGVyX3BhZ2U6IHBmICV1IGhhcyBhIGJhcnNpemUgb2YgJXUtYnl0ZXMsIG9j
-cV9zaXplICV1CgAAaHdfc2dlX21hbWVtX2NhbGM6IGVuY291bnRlcmVkIGVycm9yICVkCgAAAAAA
-AAAAc2dlIHJlcXVpcmUgbmVxICV1IG5pcSAldSByb3VuZGluZyB0byAldSAldQoAAAAAaHdfc2dl
-X21hbWVtX2luaXQ6IGVuY291bnRlcmVkIGVycm9yICVkCgAAAAAAAAAAaHdfZWRjX2Jpc3RbJXVd
-OiBiaXN0X2NtZFsweCUwOHhdIGFkZHIgMHgleCBsZW4gMHgleAoAAAAAAAAAAAAAAGh3X2VkY19i
-aXN0WyV1XTogZG9uZSwgZW5jb3VudGVyZWQgJXUgZXJyb3JzIG9uIGZpcnN0IGFuZCAldSBlcnJv
-cnMgb24gc2Vjb25kIGF0dGVtcHQKAAAAAAAAAAAAAGZvaXNjc2lfYnllOmwyZGV2X2ZjLT5mbG93
-Y19pZCBbMHgleF0sIGwyZGV2X2ZjLT5mbG93Y19wY2llX3BmbiBbMHgleF0sIGwyZGV2X2ZjLT5m
-bG93Y19wY2llX3ZmbiBbMHgleF0sIHBvcnQgWzB4JXhdCgAAAAAAAAAAAAAAZm9pc2NzaV9ieWU6
-dmxhbmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCB2bGFuZGV2X2ZjLT5mbG93Y19wY2llX3BmbiBb
-MHgleF0sIHZsYW5kZXZfZmMtPmZsb3djX3BjaWVfdmZuIFsweCV4XSwgcG9ydCBbMHgleF0KAAAA
-AABod194Z21fbGVkX2xpbmtfdXAgbGVkMCBjb25maWc6ICV1CgAAAAAAAAAAAAAAAABod194Z21f
-bGVkX2xpbmtfdXAgbGVkMSBjb25maWc6ICV1CgAAAAAAAAAAAAAAAABoc3Nfc2lnZGV0WyV1XTog
-aHNzX3NpZ2RldCBjaGFuZ2VkIHRvIDB4JXgKAAAAAABwZm4gJXUgdmZuICV1IGhhcyBwbmR0eG5z
-ICV1IGFmdGVyIDEwMG1zCgAAAAAAAABiYWQgbWFpbGJveCBjbWQ6IHBmbiAweCV4IHZmbiAweCV4
-OyBvcGNvZGUgMHgleCA+IExBU1RDMkUgMHgleAoAbWFpbGJveCBjbWQgbm90IHlldCBzdXBwb3J0
-ZWQ6IHBmbiAweCV4IHZmbiAweCV4OyBvcGNvZGUgMHgleAoAAGJhZCBtYWlsYm94IGNtZDogcGZu
-IDB4JXggdmZuIDB4JXg7IG9wY29kZSAweCV4IGlzIHZhbGlkIHBvc3QgZGV2aWNlIGluaXQgb25s
-eQoAYmFkIG1haWxib3ggY21kOiBwZm4gMHgleCB2Zm4gMHgleDsgb3Bjb2RlIDB4JTAyeCByYW1h
-c2sgMHgleCBjbWQgcmFtYXNrIDB4JXgKAABiYWQgbWFpbGJveCBjbWQ6IHBmbiAweCV4IHZmbiAw
-eCV4OyBvcGNvZGUgMHglMDJ4IGxlbjE2IDB4JXggdmVyc3VzIGV4cGVjdGVkIGxlbjE2IDB4JXgK
-AAAAAAAAAABpbnN1ZmZpY2llbnQgY2FwcyB0byBwcm9jZXNzIG1haWxib3ggY21kOiBwZm4gMHgl
-eCB2Zm4gMHgleDsgcl9jYXBzIDB4JXggd3hfY2FwcyAweCV4IHJlcXVpcmVkIHJfY2FwcyAweCV4
-IHdfY2FwcyAweCV4CgAAAAAAAAAAAGluc3VmZmljaWVudCBjYXBzIHRvIHByb2Nlc3MgbWFpbGJv
-eCBjbWQ6IHBmbiAweCV4IHZmbiAweCV4OyByX2NhcHMgMHgleCB3eF9jYXBzIDB4JXggcmVxdWly
-ZWQgcl9jYXBzIDB4JXggd19jYXBzIDB4JXgKAAAAAAAAAAAAVlBEIHJlZ2lvbiBpcyB0b28gc21h
-bGwgKFNFUkNGR19TUl9QRk5WUERTSVpFIDB4JXgpCgAAAAAAAAAAAAAAAGNmOiBmYWlsZWQgdG8g
-YWxsb2NhdGVkIG1lbW9yeSBmb3IgY29uZmlndXJhdGlvbiBmaWxlLCByZXQgJWQKAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAACCAAABIAAAAAAAAACCAAABAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAGgIAAAAAAAAAAAAAAAACAAAAAAAAAAAACgAAAAAAAAAAAAAIAAwAAAAABYAgAAAAA
-AwAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAgAAAAAAAAAAACAAAAAAAAAAAAAAAAEAA4AAAAAAAAAA
-AAAAAgAAAAAAAAAAACADgAAAAAAAAAAAABACgACAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAA
-AAAAAAAAAoAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAoAAAAAAAAAAAAEAAwAAAAAAAAAAAAACgwAA
-AAAAAAAAABACgAAAAAAAAAAAADAAAwAAAAAAAAgAADAAAwAAAAAAAAAAADAFgwAAAAAAAAgAADAF
-gwAAAAAAAAAAADAEgwAAAAAAAAgAADAEgwAAAAAAAAAAADADAwAAAAAAAAgAADADAwAAAAAAAAAA
-ADgDAwAAAAAAAAAAADgFgwAAAAAAAAAAADgEgwAAAAAAAAAAADgAAwAAAAAAAAAAADQGggAAAAAA
-AAAAADwDggAAAAAAAAAAADwAAwAAAAAAAAgAADwAAwAAAAAAAAAAADwEgwAAAAAAAAAAADwFAwAA
-AAAAAAAAAD0EAwAAAAAAAAAAADwDgwAAAAAAAAAAACwAAgAAAAAAAAAAACwFggAAAAAAAAAAACwF
-AgAAAAAAAAAAABAGgAAAAAAAAAAAABAGgsAAAAAAAAAAABAGgoAAAAAAAAAAAAAOggAAAAAAAAAA
-ABAHgoAAAAAgAAAAAAAHggAAAAAgAAAAABAHAoAAAAAAAAAAABAHAoAAAAAAAAAAABAHAoAAAAAA
-AAAAAAAHAgAAAAAgAAAAABAXgwAAAAAAAAgAABAXgwAAAAAAAAgAABAAAAAAAAAAAAAAABAGA4AA
-AAAAAAAAAAAOAwAAAAAAAAAAABAGA0AAAAAAAAAAABAGAwAAAAAAAAAAABAGAAAAAAAAAAAAAAAG
-A4AAAAAAAAAAAAAGAwAAAAAAAAAAAAAOAgAAAAAAAAAAAAAOAgAAAAAAAAAAABAGAgAAAAAAAAAA
-ABAGAgAAAAAAAAAAABAGAoAAAAAAAAAAABAGAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAIAAAAAAAAAAAAQAwAAAAAAAAgAAAAAAAAAAAAAAAAAAP//////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-/wAAACAAAAAAwAAAAAAAACAAAAAA4AAAAAAAAAACAAAAAAAAAEAAAAAAAAAAAAAAAAAAASEAAAAA
-AAAAAAABASAAAAAAAAAAAAAAAgAAAAQABAAAAAAFAAAABAAAAAAAAAAAAKAAAAAAgAAAAACAAEAA
-AAAAAAIAAACAACAAAAAAAAIAAAEAQAAAAAAAAAAAAAEAQgAAAAAAAAAAAAAAIAAAAAAAAAAAAAIQ
-IAAAAAAAAAAAAAIMAgAAAAAAAAAAAACFAgAAAAQAAAAAAACAQgAAAAAAAAAAAAIAIgAAAAAAAAAA
-AACAQQAAAAAAAAAAAACAQYAAAAAAAAAAAAIAIQAAAAAAAAAAAAAQIIAAAAAAAAAAAAIlAIAAAAAA
-AAAAAAAFAAAAAAAAAAAAAAiIBIAAAAAAAAAAAAiIBIAAAAAAAAAAAAiiAIAAAAAAAAAAAAiiAIAA
-AAAAAAAAAAijAIAAAAAAAAAAAAijAIAAAAAAAAAAAAikgIAAAAAAAAAAAAikgIAAAAAAAAAAAASk
-gMAAAAAAAAAAAASiAMAAAAAAAAAAAASjAMAAAAAAAAAAAASIBMAAAAAAAAAAAAAJAYAAAAAAAAAA
-AAIMAIAAAAAAAAAAAACIBMAAAAAAAAAAAACIBIAAAAAAAAAAAAILAIAAAAAAAAAAAACKgIAAAAAA
-AAAAAAALgIAAAAAAAAAAAACMAIAAAAAAAAAAAAIgEIAAAAAAAAAAAAIKAIAAAAAAAAAAAAIKgIAA
-AAAAAAAAAAAJAoAAAAAAAAAAAAABAQAAAAAAAAAAAAABAUAAAAAAAAAAAAABAIAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAgRAAAAAAAAAAAAAAgQgAAAAAAAAAAAAAgQQAAAAAAAAA
-AAAAgYAAAAAAAAAAAACAAMAAAAAAAAAAAACAAKAAAAAAAAAAAAAACAAAAAAAAAAAAACBgAAAAAAA
-AAAAAACBgIAAAAAAAAAAAACJgIAAAAAAAAAAAACJgMAAAAAAAAAAAAABggAAAAAAAAAAAAIBgAAA
-AAAAAAAAAAIBgIAAAAAAAAAAAABBgYAAAAAAAAAAAAIBgYAAAAAAAAAAAABJgYAAAAAAAAAAAAIJ
-gYAAAAAAAAAAAAIBgQAAAAAAAAAAAABBgQAAAAAAAAAAACAAAAAAAAAAAAAAABAAAAIAAAAAAAAA
-ABAAAAAAAAAAAAAAAACAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////wAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAACACSAAAAAAAAAANmACAAQAAAAAAIAJIAAAAAAAAAA3IBJQRA
-AAAAAAAAAAAAAAAAAAADlgAgAEAAAAAACAAAAAIAiAOHAABWACAAQAAAAAAAAAAAAAAAAAAAA5YA
-IABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAAAAAAAAAA
-A5YAIABAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAAAAAA
-AAAAA5YAIABAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAA
-AAAAAAAAA5YAIABAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAA
-AAAAAAAAAAIAA5YAJgRAAAAAAAhHIAEEAAACsgAC0gUgJEAAAAAAAAAAAAAAAAAAAAOWACAAQAAA
-AAAARyABBgyhgrBAAZIEICRAAAAAAABHIAEEDKBCs4ACEgUgJEAAAAAACAAAAAIAiAOFAACWASAA
-QAAAAAAIAAAAAgCIA4UAAJYBIABAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAAAAAAAAAAAAAAAAOW
-ACAAQAAAAAANxRK6ArCA0xRUi+JKRiRAAAAAAAXFEroCt4DTFFSLYkmmJEAAAAAABcUSogawgNMU
-VIviSkYkQAAAAAANxRKiBreA0xRUi2JJpiRAAAAAAAXFEqIGsIDTFFSL4kpGJEAAAAAADcUSoga3
-gNMUVItiSaYkQAAAAAAFxRKiBrCA0xRUi+JKRiRAAAAAAA3FEqIGt4DTFFSLYkmmJEAAAAAACcQQ
-oAIAgJAAAItiacYkQAAAAAABxBCgBrCAkwZUi2JpxiRAAAAAAAHEEKAGsICTBlSLYmnGJEAAAAAA
-AcUQuAawgJMWVItiSMYkQAAAAAAIoRCIAgCBWBIAC1IApiRAAAAAAAnAEJACsIADFlSKkgHGJEAA
-AAAACcAQuAawgAMQlIviAkYkQAAAAAAJwBC4ArSAAxCUi2IBpiRAAAAAAAnAELgCtIADEJSLYgGm
-JEAAAAAACcAQuAK0gAMQlItiAaYkQAAAAAAJwBC4ArSAAxCUi2IBpiRAAAAAAAGgEJAGtIADEJSL
-YgGmJEAAAAAAAcAQgAKwgAMUVIpSAMYkQAAAAAABwBCAArCAAxRUilIAxiRAAAAAAAHAEIACsIAD
-FFSKUgDGJEAAAAAACEcgAQQAAAKyAALSBSAkQAAAAAAAgQAAAgCFWAdAC1IApiRAAAAAAACBAAAC
-AIVYB0ALUgCmJEAAAAAAAAAAAAQAoEABgAHWACAAQAAAAAAAAAAABgChgABAAVYAIABAAAAAAAAA
-AAAEAKBAAYAB1gAgAEAAAAAACIEAAAIAhVmABAtSAKYkQAAAAAAJYUAAAAAAGAAAA0IBJqRAAAAA
-AAhAAAAAAAAAAAADUgEmJEAAAAAAAAAAAAQAoEABgAHWACAAQAAAAAAIAAAAAgCIA4cAA9YAJgRA
-AAAAAAgAAAACAIgDhwAD1gAmBEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAAAAAAAAAAA5YA
-IABAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAACcAQuAK0gAMQlItiAaYkQAAAAAAAAAAAAAAAAAIA
-A5YAJgRAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAACAAAAAIAiAOFAACWASAAQAAAAAAAAAAABACg
-QAGAAdYAIABAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAAAAAAAAQAoEABgAHWACAAQAAAAAAIoRCI
-AgCBWBAACRIBpiRAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAAAAAAAAYAoYAAQAFWACAAQAAAAAAI
-AAAAAgCIA4VACNICRiRAAAAAAAnFEqIClIjSEICLIkimJEAAAAAACcAQgAKkiACHVItSAaYkQAAA
-AAAJwBCABrSIAwEUi1IBpiRAAAAAAA3AAAACsIDDFlSL4gNGJEAAAAAAAAAAAAAAAAAAAAOWACAA
-QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAgAMAAEAAAAAgAAAgAmJEAAAAAAAEcwAAYDIAK3AAgCAcAkQAAAAAAI
-AwAAAgagCrUACAIAxiRAAAAAAAAAAAAAAAAAAgAAAgAmJEAAAAAAACBQAAQAAAACAAACACYkQAAA
-AAAIYCAAhAAAAAAAAAYAIABAAAAAAAhgIACEAAAAAgEwAgAmJUAAAAAACGAAAAQAhAGABAQCAcYk
-wAAAAAABwAAAAkOAAwIMiAIBpiRAAAAAAAgAYAAEAAAAAgAAAgAmJEAAAAAACABgAAQAAAAAAAAE
-ASAAQAAAAAAAAAAAAAAAAAAAAAQBIABAAAAAAAQIFIAGCgAABwFMAiCmJkAAAAAACIAAAAYAhAGA
-BAgCAaYmQAAAAAAAQAAAAgCgAAJACAIBpiRAAAAAAAAAAAAAAAAAAgAAAgAmJEAAAAAABAAAAAKE
-AAMCiggCBKYkQAAAAAAAAAAAAAAAAAIAAAYBIEhAAAAAAAAgUAAEAAAAAgAAAgAmJEAAAAAACGAg
-AIQAAAACAAAGACYEQAAAAAAIYCAAhAAAAAIAAAIBJiVAAAAAAAhgAAAEAIQBgAQEAgHGJMAAAAAA
-CABgAAQAAAAAAAAEASAAQAAAAAAAAAAAAAAAAAAAAAIAJkxwAAAAAAAAAAAAAAAAAAAABgEgAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwAAACLSQBAkWBAIExiRAAAAAAAHAAAAItJAE
-CRYEAgTGJEAAAAAABAh0gEwJAABQAFwCYeYkQAAAAAAMCHSARAAAAFIAQAJhJiRAAAAAAAgCEKAE
-AAAAAAEAAgAmJEAAAAAACAIQoAQAAAAAAQACACYkQAAAAAAECHQAQgEAAAcAiAJgxiRAAAAAAA3I
-FAACCQAABECcAmDmJEAAAAAACcgQgAa0kAQClIgCZcYkQAAAAAANyHQASLSQAwCUiAJgpiTAAAAA
-AA3IdABItJADAJSIAmCmJMAAAAAACEcAAAQAAAAAAAACASAkQAAAAAAIRwAABAAAAAIAAAIFICRA
-AAAAAABHIAEMByHCtwAIAgHAJEAAAAAAAEcgAQwHIcK3AAgCAcAkQAAAAAAARyABDAchwrcACAIB
-wCRAAAAAAAAAIAEIAIQABUCIAgHGJMAAAAAAAAAgAQgAhAAFQIgCAcYkwAAAAAAAACABCACEAAVA
-iAIBxiTAAAAAAAAAIAGGggABAsCIAgPGJMAAAAAAAAAgAYKCAAACwIgCA8YkwAAAAAAJwCABgqSA
-AQVAiAIBxiTAAAAAAAgAAAAMAIQABUCIAgHGJMAAAAAAAAAgAYaCAAECwIgCA8YkwAAAAAAAACAB
-goIAAADAiAICpiTAAAAAAAnAIAGCpIABBUCIAgHGJMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAIAAAABAAEJAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFtnbG9iYWxdCnJz
-c19nbGJfY29uZmlnX21vZGU9YmFzaWN2aXJ0dWFsCnJzc19nbGJfY29uZmlnX29wdGlvbnM9dG5s
-bWFwZW4saGFzaHRvZXBsaXR6LHRubGFsbGxrcApyZWdbMHgxMDA4XT0weDQwODEwLzB4MjFjNzAK
-cmVnWzB4MTAwY109MHgyMjIyMjIyMgpyZWdbMHgxMGEwXT0weDAxMDQwODEwCnJlZ1sweDEwNDRd
-PTQwOTYKcmVnWzB4MTA0OF09NjU1MzYKcmVnWzB4MTA0Y109MTUzNgpyZWdbMHgxMDUwXT05MDI0
-CnJlZ1sweDEwNTRdPTkyMTYKcmVnWzB4MTA1OF09MjA0OApyZWdbMHgxMDVjXT0xMjgKcmVnWzB4
-MTA2MF09ODE5MgpyZWdbMHgxMDY0XT0xNjM4NApyZWdbMHgxMGE0XT0weGEwMDBhMDAwLzB4ZjAw
-MGYwMDAKcmVnWzB4MTBhOF09MHgyMDAwLzB4MjAwMApzZ2VfdGltZXJfdmFsdWU9NSwxMCwyMCw1
-MCwxMDAsMjAwCnJlZ1sweDdkYzBdPTB4NjJmODg0OQpmaWx0ZXJNb2RlPWZyYWdtZW50YXRpb24s
-bXBzaGl0dHlwZSxwcm90b2NvbCx2bGFuLHBvcnQsZmNvZQp0cF9wbXJ4PTMwCnRwX3BtcnhfcGFn
-ZXNpemU9NjRLCnRwX25yeGNoPTAKdHBfcG10eD01MAp0cF9wbXR4X3BhZ2VzaXplPTY0Swp0cF9u
-dHhjaD0wCltmdW5jdGlvbiIwIl0KbnZmPTE2Cnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTEK
-bmlxZmxpbnQ9OApuZXRoY3RybD04Cm5lcT0xNgpuZXhhY3RmPTgKY21hc2s9YWxsCnBtYXNrPTB4
-MQpbZnVuY3Rpb24iMSJdCm52Zj0xNgp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT0xCm5pcWZs
-aW50PTgKbmV0aGN0cmw9OApuZXE9MTYKbmV4YWN0Zj04CmNtYXNrPWFsbApwbWFzaz0weDIKW2Z1
-bmN0aW9uIjIiXQpudmY9MTYKd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9MQpuaXFmbGludD04
-Cm5ldGhjdHJsPTgKbmVxPTE2Cm5leGFjdGY9OApjbWFzaz1hbGwKcG1hc2s9MHg0CltmdW5jdGlv
-biIzIl0KbnZmPTE2Cnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTEKbmlxZmxpbnQ9OApuZXRo
-Y3RybD04Cm5lcT0xNgpuZXhhY3RmPTgKY21hc2s9YWxsCnBtYXNrPTB4OApbZnVuY3Rpb24iNCJd
-Cnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTI4Cm5pcWZsaW50PTE3MApuZXRoY3RybD0xMDAK
-bmVxPTI1NgpuZXhhY3RmPTQwCmNtYXNrPWFsbApwbWFzaz1hbGwKbmV0aG9mbGQ9MTAyNApucm91
-dGU9MzIKbmNsaXA9MzIKbmZpbHRlcj00OTYKbnNlcnZlcj00OTYKbmhhc2g9MTIyODgKcHJvdG9j
-b2w9bmljX3ZtLG9mbGQscmRkcCxyZG1hYyxpc2NzaV9pbml0aWF0b3JfcGR1LGlzY3NpX3Rhcmdl
-dF9wZHUKdHBfbDJ0PTMwNzIKdHBfZGRwPTIKdHBfZGRwX2lzY3NpPTIKdHBfc3RhZz0yCnRwX3Bi
-bD01CnRwX3JxPTcKW2Z1bmN0aW9uIjUiXQp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT00Cm5p
-cWZsaW50PTM0Cm5ldGhjdHJsPTMyCm5lcT02NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPWFs
-bApuc2VydmVyPTE2Cm5oYXNoPTIwNDgKdHBfbDJ0PTEwMjQKcHJvdG9jb2w9aXNjc2lfaW5pdGlh
-dG9yX2ZvZmxkCnRwX2RkcF9pc2NzaT0yCmlzY3NpX250YXNrPTIwNDgKaXNjc2lfbnNlc3M9MjA0
-OAppc2NzaV9uY29ubl9wZXJfc2Vzc2lvbj0xCmlzY3NpX25pbml0aWF0b3JfaW5zdGFuY2U9NjQK
-W2Z1bmN0aW9uIjYiXQp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT00Cm5pcWZsaW50PTM0Cm5l
-dGhjdHJsPTMyCm5lcT02NgpuZXhhY3RmPTMyCmNtYXNrPWFsbApwbWFzaz1hbGwKbmhhc2g9MjA0
-OApwcm90b2NvbD1mY29lX2luaXRpYXRvcgp0cF9kZHA9MgpmY29lX25mY2Y9MTYKZmNvZV9udm5w
-PTMyCmZjb2VfbnNzbj0xMDI0CltmdW5jdGlvbiIxMDIzIl0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFs
-bApudmk9NApjbWFzaz1hbGwKcG1hc2s9YWxsCm5leGFjdGY9OApuZmlsdGVyPTE2CltmdW5jdGlv
-biIwLyoiXQp3eF9jYXBzPTB4ODIKcl9jYXBzPTB4ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3Ry
-bD0yCm5lcT00Cm5leGFjdGY9NApjbWFzaz1hbGwKcG1hc2s9MHgxCltmdW5jdGlvbiIxLyoiXQp3
-eF9jYXBzPTB4ODIKcl9jYXBzPTB4ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3RybD0yCm5lcT00
-Cm5leGFjdGY9NApjbWFzaz1hbGwKcG1hc2s9MHgyCltmdW5jdGlvbiIyLyoiXQp3eF9jYXBzPTB4
-ODIKcl9jYXBzPTB4ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3RybD0yCm5lcT00Cm5leGFjdGY9
-NApjbWFzaz1hbGwKcG1hc2s9MHg0CltmdW5jdGlvbiIzLyoiXQp3eF9jYXBzPTB4ODIKcl9jYXBz
-PTB4ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3RybD0yCm5lcT00Cm5leGFjdGY9NApjbWFzaz1h
-bGwKcG1hc2s9MHg4Cltwb3J0IjAiXQpkY2I9cHBwLGRjYngKYmdfbWVtPTI1CmxwYmtfbWVtPTI1
-Cmh3bT0zMApsd209MTUKZHdtPTMwCltwb3J0IjEiXQpkY2I9cHBwLGRjYngKYmdfbWVtPTI1Cmxw
-YmtfbWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCltwb3J0IjIiXQpkY2I9cHBwLGRjYngKYmdf
-bWVtPTI1CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCltwb3J0IjMiXQpkY2I9cHBw
-LGRjYngKYmdfbWVtPTI1CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCltmaW5pXQp2
-ZXJzaW9uPTB4MTQyNTAwMGQKY2hlY2tzdW09MHgyNWMyZjc4MgoAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAW2dsb2JhbF0KcnNzX2dsYl9j
-b25maWdfbW9kZT1iYXNpY3ZpcnR1YWwKcnNzX2dsYl9jb25maWdfb3B0aW9ucz10bmxtYXBlbixo
-YXNodG9lcGxpdHosdG5sYWxsbGtwCnJlZ1sweDEwMDhdPTB4NDA4MTAvMHgyMWM3MApyZWdbMHgx
-MDBjXT0weDIyMjIyMjIyCnJlZ1sweDEwYTBdPTB4MDEwNDA4MTAKcmVnWzB4MTA0NF09NDA5Ngpy
-ZWdbMHgxMDQ4XT02NTUzNgpyZWdbMHgxMDRjXT0xNTM2CnJlZ1sweDEwNTBdPTkwMjQKcmVnWzB4
-MTA1NF09OTIxNgpyZWdbMHgxMDU4XT0yMDQ4CnJlZ1sweDEwNWNdPTEyOApyZWdbMHgxMDYwXT04
-MTkyCnJlZ1sweDEwNjRdPTE2Mzg0CnJlZ1sweDEwYTRdPTB4YTAwMGEwMDAvMHhmMDAwZjAwMApy
-ZWdbMHgxMGE4XT0weDIwMDAvMHgyMDAwCnNnZV90aW1lcl92YWx1ZT01LDEwLDIwLDUwLDEwMCwy
-MDAKcmVnWzB4N2RjMF09MHg2MmY4ODQ5CmZpbHRlck1vZGU9ZnJhZ21lbnRhdGlvbixtcHNoaXR0
-eXBlLHByb3RvY29sLHZsYW4scG9ydCxmY29lCnRwX3Btcng9MzAKdHBfcG1yeF9wYWdlc2l6ZT02
-NEsKdHBfcG10eD01MAp0cF9wbXR4X3BhZ2VzaXplPTY0SwpbZnVuY3Rpb24iMCJdCnd4X2NhcHM9
-YWxsCnJfY2Fwcz1hbGwKbnZpPTI4Cm5pcWZsaW50PTE3MApuZXRoY3RybD05NgpuZXE9MjUyCm5l
-eGFjdGY9NDAKY21hc2s9YWxsCnBtYXNrPWFsbApucm91dGU9MzIKbmNsaXA9MzIKbmZpbHRlcj00
-OApuc2VydmVyPTMyCm5oYXNoPTAKcHJvdG9jb2w9bmljX3ZtLG9mbGQscmRkcCxyZG1hYyxpc2Nz
-aV9pbml0aWF0b3JfcGR1LGlzY3NpX3RhcmdldF9wZHUKdHBfbDJ0PTMwNzIKdHBfZGRwPTIKdHBf
-ZGRwX2lzY3NpPTIKdHBfc3RhZz0yCnRwX3BibD01CnRwX3JxPTcKW2Z1bmN0aW9uIjEiXQp3eF9j
-YXBzPWFsbApyX2NhcHM9YWxsCm52aT00Cm5pcWZsaW50PTM0Cm5ldGhjdHJsPTMyCm5lcT02Ngpu
-ZXhhY3RmPTMyCmNtYXNrPWFsbApwbWFzaz1hbGwKbmhhc2g9MApwcm90b2NvbD1mY29lX2luaXRp
-YXRvcgp0cF9kZHA9MgpmY29lX25mY2Y9MTYKZmNvZV9udm5wPTMyCmZjb2VfbnNzbj0xMDI0Cltm
-dW5jdGlvbiIxMDIzIl0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9NApjbWFzaz1hbGwKcG1h
-c2s9YWxsCm5leGFjdGY9OApuZmlsdGVyPTE2CltmdW5jdGlvbiIwLyoiXQp3eF9jYXBzPTB4ODIK
-cl9jYXBzPTB4ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3RybD0yCm5lcT00Cm5leGFjdGY9NApj
-bWFzaz1hbGwKcG1hc2s9MHgxCltmdW5jdGlvbiIxLyoiXQp3eF9jYXBzPTB4ODIKcl9jYXBzPTB4
-ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3RybD0yCm5lcT00Cm5leGFjdGY9NApjbWFzaz1hbGwK
-cG1hc2s9MHgyCltwb3J0IjAiXQpkY2I9cHBwLGRjYngKYmdfbWVtPTI1CmxwYmtfbWVtPTI1Cmh3
-bT0zMApsd209MTUKZHdtPTMwCltwb3J0IjEiXQpkY2I9cHBwLGRjYngKYmdfbWVtPTI1CmxwYmtf
-bWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCltwb3J0IjIiXQpkY2I9cHBwLGRjYngKYmdfbWVt
-PTI1CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCltwb3J0IjMiXQpkY2I9cHBwLGRj
-YngKYmdfbWVtPTI1CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCltmaW5pXQp2ZXJz
-aW9uPTB4MTQyNTAwMGMKY2hlY2tzdW09MHg0YzU2NjYzOQoAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
-====
diff --git a/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu b/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
new file mode 100644
index 00000000000..d28161d65f3
--- /dev/null
+++ b/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
@@ -0,0 +1,8705 @@
+/*-
+ * Copyright (c) 2013 Chelsio Communications, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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.
+ */
+begin-base64 644 t4fw
+AAADxgEJDAAAAQkBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAA6sDugPBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAENoZWxzaW8gRlcgUlVOTUVNIERFQlVHPTAgKEJ1aWx0IEZyaSBPY3QgMTEgMjM6
+MDY6MDEgUERUIDIwMTMgb24gY2xlb3BhdHJhLmFzaWNkZXNpZ25lcnMuY29tOi9ob21lL2Zpcm13
+YXJlL2N2cy9mdy1yZWxlYXNlKSwgVmVyc2lvbiBUNHh4IDAxLjA5LjBjLjAwAAAAAAAAAJW7pA1g
+AMgA4QB78AAQAADhADC4eP///x/84UCAAAAB4QB7cAAAEAAf//vg4QGUcCAAAADhAZwE4QB5AAAC
+AEDhAHmAAAYAQAACAAoABgAK4QB5BAAKAACAAAEC4QB7POEAe0ThAHvk4gAAAAABAADhAHuQIAAA
+AAAAgADhAHsAAABAAeEAe5wAAEAAREREQuAAAADjAARzREREQOMACAAgAAJcAAAAAB//kYAAAAAA
+H/+RhAAAAAAf/5GIAAAAAB//kYwf/8AAAAAAAAAAAADAABL/zRP/zZMgEv/NE//NhCAEMwGTIBH/
+zBL/zJIQEf/MEv/MkhAR/8wB9DER/8siCv+SEADkMQAFMQECABL/yALnMQIWABH/x4EQAQFfwCEC
+EQHJERH/xBL/xJIQEf/EEv/EkhBgAA8R/78S/8OSEBH/vxL/wpIQgRAR/8HAIJIREv/AkhLAIJIT
+Ev+/khCCEALyUGUv9xH/vccvkhAR/7ySEBL/vBP/vJMgwDKTIRP/u5MigiIS/7oT/7qTICMiIRT/
+uQQzAck4E/+4gzADgxQIMxEU/7akM5MhE/+qkyJgAAjCMJMhE/+nkyIS/7GQIJAhkCKQI5AkkCWQ
+JpAnkCiQKZAqkCuQLJAtkC6QLyAmECAmEYIiEv+kwDAtNzAtNzQtNzgtNzwjPQFyM+0AAgAS/6HA
+MC83AC83EC83IC83MCM9AXIz7QACABL/l8AwKDcwKDc0KDc4KDc8Iz0BcjPtAwIAEv+UIwoAJzcA
+JzcQJzcgJzcwIz0BcjPtAwIAEv+OFf+PFv+PwDDXIAVmAWAAEgQ2BQACANMP0w8FMwxuOxQHRxQH
+BEN2MeYENgUFMwxvO+0AAgAS/4MV/4EjCgACJwIHBEMEPgUFMwwHRxRvO/ADAgAS/33JLoMghCGF
+IrwidDsOhlC0VZYwtDN0M/Rj/+YAZT/iZV/fEv9xwDIDLgUDAgAS/2jAMCg3QCg3RCg3SCg3TCM9
+AXIz7QMCAAACABL/ay0nAMARAUkxAEgxAQIAwAAU/2cE0jEV/2aUUBT/ZgTTMRX/ZpRQFP9lBNQx
+Ff9llFAU/2UE1TEV/2SUUBD/ZAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+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
+AAAAAAAAAAAAAAAAAAAAAIEAAAAAAAAYBQAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAE
+AAAAAAAAAoEAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAKABHydxPyd9MPA+YxAQIAFvJ1F/J2d2sG
+kGC0Zndj+FQOkFWVFw8UAGP/+QAAAGwQBBjycx3ybisgBxzybiohCPoCAAdxuwEA7tw5DdwCgAAL
+qgKcMOPyaBmwBIAACKoCHPJmIzCA+kAIFeANBQCdZexmAiG43QAA+sCGFaR3HQDpfP8t3gKAAOt7
+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
+wKBZEeEcdQOJyGuRqv//FA2gCgUAAMCgwNoNnTT9gQYV7/7WAAAAACACt4ogArd6IAK3giACt4og
+Ard6IAK3eiACt3ogAreCIAK3iiACt4ogArd6IAK3eiACt9wgArg8IAK33CACt9wgArg8IAK4PCAC
+uDwgArfcIAK33CACt9wgArg8IAK4PCACuOkgArnjIAK57SACuOkgArnjIAK54yACueMgArntIAK4
+6SACuOkgArnjIAK54yAC5NkgAuX0IALk2SAC5NkgAuX0IALl9CAC5fQgAuTZIALk2SAC5NkgAuX0
+IALl9CAC5sUgAudFIALnviAC5/ggAugLIALozSAC6UggAulbIALpxSAC6fUgAuoaAAAAACAC8Xkg
+AvLFIALwTCAC8G8gAvFhIALwLCAC8EQgAvLiIALzQCAC9rUgAvV1IAL1ryAC89EgAvRDIAL0sSAC
+9PAgAvUoIAL2JSAC9h0gAvYVIAL12SAC9dEAAAAAAAAAAAEQGAEAAQAAAAAAAAAAAAAgA7WRIAO1
+kSADs6MgA7WRIAOzoyADtWwgA7VFIAOzoyADtHkgA7OjIAOzoyADtHAgA7OjIAO1kSADs6MgA7Oj
+IAO1kSADs6wAAAAAAAAAAAMBAAIAAAAAAAAAAAAAAAAgBDoCIAQ6MCAEO6UgBDoCIAQ7nSAEO4Ug
+BDoCIAQ6AiAEOgIgBDoCIAQ6AiAEOgIgBDoCIAQ6AiAEOgIgBDoCIAQ7eiAEO28gBDoCIAQ6AiAE
+OgIgBDoCIAQ6AiAEOgIgBDoCIAQ6AiAEOgIgBDoCIAQ6AiAEOgIgBDoCIAQ6AiAEO0AgBDoCIAQ7
+JSAEOyUgBDoCIAQ6AiAEOwUgBDoCIAQ7JSAEOgIgBDoCIAQ6AiAEOgIgBDoCIAQ6AiAEOgIgBDoC
+IAQ6AiAEOgIgBDoCIAQ6AiAEOgIgBDoCIAQ6AiAEOgIgBDoCIAQ6AiAEOgIgBDoCIAQ6AiAEOgIg
+BDoCIAQ65QAAAAAAAAAAAAAAACAEW34gBFt+IARaUSAEW34gBFVuIARbdCAEW1AgBFVuIARVbiAE
+VW4gBFVuIARVbiAEWjQgBFt+IARVbiAEWjQgBFt+AAAAAAAAAAAAAAAAIARpWSAEaa4gBGwDIARr
+siAEa2ogBGs/IARrLCAEayYgBGp8AAAAAAAAAAAAAAAAARAYAQACAAAAAAAAAAAAAAEQGAEAAgAA
+AAAAAAAAAAAgBLv2IAS7yyAEujMgBLuTIAS7kyAEu5MgBLozIAS7kyAEujMgBLt0IAS6MyAEujMg
+BLt0IAS7kwAAAAAAAAAAIATf0yAE25QgBN+nIATfeyAE308gBNu7IATbuyAE29IgBN82IATcByAE
+2/MgBNu7IATcByAE27sgBNu7IATbuyAE39MAAAAAAAAAAAAAAAAAAAAAIAUwwCAFJxggBSbIIAUk
+zAAAAAAAAAAAAAAAACAFJwIgBSb+IAUm/iAFJv4gBScCIAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+
+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4g
+BSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAF
+Jv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm
+/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJwIgBSb+IAUm/iAFJv4gBScCIAUm/iAFJv4gBSb+
+IAUnAiAFJv4gBSb+IAUm/iAFJwIgBSb+IAUm/iAFJv4gBScCIAUm/iAFJv4gBSb+IAUnAiAFJv4g
+BSb+IAUm/iAFJwIgBSb+IAUm/iAFJv4gBScCIAUm/iAFJv4gBSb+IAUnAiAFJv4gBSb+IAUm/iAF
+JwIgBSb+IAUm/iAFJv4gBScCIAUm/iAFJv4gBSb+IAUnAiAFJv4gBSb+IAUm/iAFJwIgBSb+IAUm
+/iAFJv4gBScCIAUm/iAFJv4gBSb+IAUnAiAFJv4gBSb+IAUm/iAFJwIgBSb+IAUm/iAFJv4gBSb+
+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4g
+BSb+IAUnAiAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUnAiAF
+Jv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm
+/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUm/iAFJv4gBSb+IAUnAiAFJv4gBSb+IAUm/iAFJwIgBSb+
+IAUm/iAFJv4gBScCAAAAAAAAAAAAAAAAIAUnUCAFKKUgBSpTIAUqRSAFKjAgBSoiIAUqDSAFKf8g
+BSnqIAUp3SAFKcogBSm9IAUpqiAFKZ0gBSmKIAUnRiAFKXcgBSlqIAUpVyAFKUogBSk2IAUpLCAF
+KRsgBSkRIAUpACAFJ0YgBSdGIAUnRiAFJ0YgBSdGIAUnRiAFKPMgBSdpIAUnRiAFJ0YgBSdGIAUo
+1iAFKL0gBSizIAUolCAFJ0YgBSiBIAUoZyAFKFQgBSg6IAUoJyAFKA8gBSf8IAUn6SAFJ4MAAAAA
+AAAAACAFMQQgBTEOIAUyeiAFMlQgBTJNIAUyRiAFMj8gBTI4IAUyMSAFMiogBTIjIAUyGSAFMg8g
+BTH3IAUxliAFMWYgBTFdIAUxRyAFMT0gBTE2IAUxKSAFMSIgBTD2IAUxGyAFkC8gBZBCIAWR0SAF
+kp8gBZNWIAWT/SAFlJUgBZVYIAW6qCAFuAQgBbaYIAW0XCAFslggBadkIAWpuCAFsVAgBaYIAAAA
+AAMPCBKDjpOSIAXX1SAF1okgBdaOIAXX1SAF1okgBdaJIAXWiSAF1o4gBdfVIAXX1SAF1okgBdaJ
+UlYAAAAAAABBvc1lAAAAAGNvbmZpZ3VyYXRpb24gZmlsZSBwYXJzZXIgZm91bmQgYWRkaXRpb25h
+bCBjb25maWd1cmF0aW9uIGFmdGVyIFtmaW5pXQoAADAAAABmY29lAAAAAHZuaWNfaWQAdmxhbgAA
+AAB0b3MAZXRoZXJ0eXBlAAAAbWFjbWF0Y2gAAAAAbXBzaGl0dHlwZQAAZnJhZ21lbnRhdGlvbgAA
+AGJhc2ljdmlydHVhbAAAAABzeW5tYXBlbgAAAABzeW40dHVwZW5pcHY2AAAAc3luMnR1cGVuaXB2
+NgAAAHN5bjR0dXBlbmlwdjQAAABzeW4ydHVwZW5pcHY0AAAAb2ZkbWFwZW4AAAAAdG5sbWFwZW4A
+AAAAdG5sYWxsbGtwAAAAaGFzaHRvZXBsaXR6AAAAAHRwX3BpbwAAdHBfdG1fcGlvAAAAbmljX3Zt
+AABuaWNfdW0AAG5pY191bV9pc2dsAG5pY19oYXNoZmlsdGVyAABvZmxkAAAAAHJkZHAAAAAAcmRt
+YWMAAABpc2NzaV9pbml0aWF0b3JfcGR1AGlzY3NpX3RhcmdldF9wZHUAAAAAaXNjc2lfaW5pdGlh
+dG9yX2ZvZmxkAAAAaXNjc2lfdGFyZ2V0X2ZvZmxkAABmY29lX2luaXRpYXRvcgAAZmNvZV90YXJn
+ZXQAcG9mY29lX2luaXRpYXRvcgAAAABwb2Zjb2VfdGFyZ2V0AAAAcHBwAGRjYngAAAAAIAKS2AAE
+AAAAAAQAAAQAAAAAAAAgBfuQIAXeWCAF+4AgBd5oIAXefCAF3YggBd8kIAXdIP8YMGBgAAAAAAEC
+AwAAAAAAAAAAAAAAACADhLwgA4RQIARiQAAAAAAgA4RIIAOEQCADhDgAAAAAMDEyMzQ1Njc4OWFi
+Y2RlZkFCQ0RFRgAAAAAAAAAAAABBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWmFiY2RlZmdoaWpr
+bG1ub3BxcnN0dXZ3eHl6MDEyMzQ1Njc4OSsvAAAAAAAAAAAAAAAAAAAAACAAIAwAAQAAIAAf7AAF
+AAEgAB/QAAMABSAAH7AABwAAY4JTYwAAAAD///////8AAAAEBAgAB0MAAAAAAAAAAAD/////////
+////////////ACEACQCBAEEAIQAJACEACQCBAEEAgQBBAIEAQQCBAEEAIQAJAIEAQQAhAAkAIQAR
+AIEAQQCBAEEAIQAJAIEAQQAhAAkAIQAJAQEAQQCBACEAgQAhABAQYQEBAIEBAQCBAwIBAAAAAAAA
+AAAAAAAAAAAAAIAAAAEAAAACAAAABAAAAAgAAAAQAAAAAAAAAAAAIAKJGAAAAAAgAo2YAAAAACAC
+iRwAAAABIAKNuAAAAAIgAokkAAAABCACiSwAAAAIIAKJNAAAABAgAo3AAAAAICACiTgAAABAIAKJ
+RAAAAIAgAolQAAABACACiVwAAAIAAAAABQAAAAMAAAABAAAAAiAFvrggBb5sIAW9ZCAFvCQgBbvk
+IAW7uCAFvAwAAAAAAAACAAAABAAAAAgATkEAAFYwAABWMQAAVjIAAFYzAABWNAAAVjUAAFY2AABW
+NwAAVjgAAFY5AABWQQAAVkIAAFZDAABWRAAAVkUAAFZGAABhbGwAKgAAAG5vbmUAAAAAZGlzYWJs
+ZWQAAAAAZW5hYmxlZAAweAAAcG9ydAAAAABwcm90b2NvbAAAAABnbG9iYWwAAGZ1bmN0aW9uAAAA
+AGZpbmkAAAAAcmVnAGZpbHRlck1vZGUAAGZpbHRlck1hc2sAAHJzc19nbGJfY29uZmlnX21vZGUA
+cnNzX2dsYl9jb25maWdfb3B0aW9ucwAAc2dlX3RpbWVyX3ZhbHVlAHRwX3BtcngAdHBfcG1yeF9w
+YWdlc2l6ZQAAAAB0cF9ucnhjaAAAAAB0cF9wbXR4AHRwX3BtdHhfcGFnZXNpemUAAAAAdHBfbnR4
+Y2gAAAAAdHBfbXR1cwBudmYAd3hfY2FwcwByX2NhcHMAAG5pcWZsaW50AAAAAG5lcQBuZXRoY3Ry
+bAAAAABudmkAcnNzbnZpAABuZXhhY3RmAGNtYXNrAAAAcG1hc2sAAABuZXRob2ZsZAAAAABucm91
+dGUAAG5jbGlwAAAAbmZpbHRlcgBuc2VydmVyAG5oYXNoAAAAdHBfbDJ0AAB0cF9kZHAAAHRwX2Rk
+cF9pc2NzaQAAAAB0cF9zdGFnAHRwX3BibAAAdHBfcnEAAABpc2NzaV9udGFzawBpc2NzaV9uc2Vz
+cwBpc2NzaV9uY29ubl9wZXJfc2Vzc2lvbgBpc2NzaV9uaW5pdGlhdG9yX2luc3RhbmNlAAAAaXNj
+c2lfbWF4X3NnZQAAAHBwbV9tYXhfem9uZXMAAABwcG1fem9uZV9yYW5nZTAAcHBtX3pvbmVfcmFu
+Z2UxAHBwbV96b25lX3JhbmdlMgBwcG1fem9uZV9yYW5nZTMAZmNvZV9uZmNmAAAAZmNvZV9udm5w
+AAAAZmNvZV9uc3NuAAAAZGNiAGJnX21lbQAAbHBia19tZW0AAAAAaHdtAGx3bQBkd20AdmVyc2lv
+bgBjaGVja3N1bQAAAAAwMTIzNDU2Nzg5YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoAAAAAWWVz
+AFNlc3Npb25UeXBlAE9GTWFya2VyAAAAAElGTWFya2VyAAAAAERhdGFEaWdlc3QAAEhlYWRlckRp
+Z2VzdAAAAABFcnJvclJlY292ZXJ5TGV2ZWwAAEltbWVkaWF0ZURhdGEAAABEYXRhUERVSW5PcmRl
+cgAARGF0YVNlcXVlbmNlSW5PcmRlcgBJbml0aWFsUjJUAABNYXhDb25uZWN0aW9ucwAATWF4UmVj
+dkRhdGFTZWdtZW50TGVuZ3RoAAAAAEluaXRpYXRvck5hbWUAAABJbml0aWF0b3JBbGlhcwAARGVm
+YXVsdFRpbWUyV2FpdAAAAABEZWZhdWx0VGltZTJSZXRhaW4AAE1heEJ1cnN0TGVuZ3RoAABGaXJz
+dEJ1cnN0TGVuZ3RoAAAAAE1heE91dHN0YW5kaW5nUjJUAAAAVGFyZ2V0TmFtZQAAVGFyZ2V0QWxp
+YXMAVGFyZ2V0QWRkcmVzcwAAAFRhcmdldFBvcnRhbEdyb3VwVGFnAAAAAEF1dGhNZXRob2QAAFNl
+bmRUYXJnZXRzPUFsbABDSEFQX0EAAENIQVBfSQAAQ0hBUF9DAABDSEFQX04AAENIQVBfUgAARGlz
+Y292ZXJ5AAAATm9ybWFsAABOb25lAAAAAENSQzMyQwAAQ1JDMzJDLE5vbmUATm9uZSxDUkMzMkMA
+Q0hBUAAAAABDSEFQLE5vbmUAAABOb25lLENIQVAAAABOb3RVbmRlcnN0b29kAAAASXJyZWxldmFu
+dAAAUmVqZWN0AABObwAANQAAAENITmV0IDEuMDAAAAAAAAwAAAAAAQABfAAMAQAAAAAQAAAAFCAG
+EFAAAAMVDkAAAB/8AAAf/AAAH/+ugB//roAgBhngIAYdQCAHgnAgB4JwIAfAACAIEEAgCEAAIAjA
+AOEBjgAAAZEMgAAAACAJF5AgCRdAIAkXwCAJF3AAAAgA///z/x//kdDhAhYA4QIaAP//yP///xf/
+//8f/wAAgAAAABAAAAIZHAACGXwAAhmcAAIZ/B//nFj///H/AAIZAMAAAAAAAhokAAIapAACGigA
+AhqoAAIaNAACGrQAAhowAAIasCAIwAAAAEAOIAjAMAAAQBoAAP/p4QIOAAAAE4cgAoAAIAKAMCAC
+gGAAAEANAAD/9wAAD/8AAA9CIAjA8CAIwJAgCMDAAAAMAAAAGAAAAhA04QAAAAAA//UAACBAAAAg
+AAAAxBAAAMABAADIICAIwSAAAMQAAABAAB//m9D+AAAAAF/2pwCyN8dAAAAAHf///2IAAAAAAMQw
+AADEMf//9/8gCMFwAADERQAAyAAgCMFAAAAnEAAA6AAgCMHQIAjCECAIwaAgBVq4AADIEAAAEAEA
+ACB8AAAyAAAAzAAAAknv4QBeAOD//gD//7//AAAQEAAAUBDhAhgAAAB//QAAEBHhAhcE4QIXAAAA
+DAn/AAD/f////wAgAAAAAAwOAAAMDCAAAAAAAAwL3////wAADAof/5JkAADAEAACYloAAMMwIAKA
+kBAQAAAgEAAAABAHYP/v+J8e/gAA4QIYDBAAAADwAMNwH/+SYAAIAAAgAoDAAA9CQAACEODhAhIA
+AIAAAABAAAAAABIAAAIVAAAAE4gAACABHc1lAO////8gAoDwAADDUPf///8gAoEQgH////+Af/+/
+/////z///wAHoSD/wAA/IAkX4CAJGEAIAAAAH/zgdCAC98Qf/5xMIAjCQCAIwnAPPAAAIAjDACAD
+XCAgA13sIAjDcA8AAAAgCMPQH/+e4AEAAAAoAAAAIAjEIB//hqAf/4UQH/+HkCAIxHAgCMSwIAjE
+8CACi0AgAojAIAKLgCACiwAgCRnQIAKK4CAJGgAgCRiwIAkZECAJGXAgCRogH/+cUOAAAAAgCRpQ
+IAAgLAACAAAgCMcwIAjHAAD///8gCMdgIAkawCAIx5AgCMfQIAjIMCAIyNAgCMgAIAM/rCADRIAg
+CMiAIAjKUCAGF/AAD/wAH/+XgB//mKQAADAAIAjKkCAIyyAgCMvAVQAAACAJG5AgCRuwDgAAACAC
+i/gAAAgGIAjL8B//m7wAAA/+IAjMsAAA//8gCRvQIAjMUCADHTQgAxQQIAjNECAIzYAgCM3QIAkc
+oCADIcQgAyUkIAkcYCAIzhAgCM6AIAjO4CAIz1AgBh0AIAjP0CAGGhAgCNAAIAjQYCAI0RAgCNNQ
+IAjSoCAI0wAgCNFwIAjR4CAI0kAgAyesIAkc8CAJHRAgAovwH/zeAAwAAACBAAAABAAACB//hwAf
+/4gAIAKQYB//huAgCNOwIAjT8D/////P////IAjUMB//h7wgCNRwIAjUsCAJHTAgCNUwAACcTv//
+0E3//y5cAADRpH///6sgCNWwIAjVcCAI1PAf/4b8IAjV8AAASAAgCNawIAjWgB//hvgf/4dgIAjW
+4CAI2BD//f//IAjYoB//nFwgCNjwIAkdUAP/0AAAUAf/AAEAACAJHdAf/5gcIAkeACADTAwgCNkQ
+//9AAB//m8ggCNlQAAAf/iAI2ZAgCNnQIAjaMCAI2qAgCR8QIAkfUCAJH6AEAQAIIAMqPCAI2tAg
+CRsgIAkbYCAJGvAgCN4AAACOAiAI3nAgCN7AIAjfECAI3jAgCN9gH/+e8AOAAAAgCN+wIAjgECAD
+VKwgA0fgIANJMAAAwAAgCR5gIAkeoCAI4QACAAAAIAjhkAAAF3AgCSBAIAkgICADaBAgCR/wIAkg
+cCAJIJAgBhfUH/+cROEAegAgCOHAIAjh4CAI4gAgCOIwH/+a6OEAfgAf/5v4H/+cVAAA8/8EAAAA
+FAAAACoAAAAgA280IANVxCAI46D/9///IAji4CADcRwAmJaAIANTLB//m8wgCSCwIAkhgB//qbAa
+AAAAIAjkYIP/twCD/7YgIAkiAB//nPgf/6rYMAAAECAJIkAgCSKgH/+cPB//k8AgCSLQ4QH+AB//
+l0QgCSNgIiIiIh//rFQgCOSwAAAMvAAAiQYgCOTg4AAJJACcAAAgCOUAIAjlUAACBMDhAI4AAACW
+gAAAlkAgBhngAACWoAAAlmDhAgAs//8AAAAB4ADhAZIAAAHjAB//nGAgCOVwIAjloAAAGyAf/6r0
+AA///x//qqThAZYAH/+T0B//m+AgBhyAIAYVIBeQAAAUsAAAAABgAIAAAAQgBhyKAAAbCgAAg/8V
+oAAAIAKBUBagAAAIUAEAIKAAAD/wAAAjoAAAA/8AHwDAAAQf/6xYIAXvACADnYwgBe7E3q2+/xrA
+AAAgBhuIAAD/6iAGHJAAAAgUAACIAB//nIQAEAAAH/+bEAAehIAgA7NgOAAAADAAAHQgAoFgIAjl
+0DAAAAgwAAAMNAAACNAAAAAAAIkUOwAACDSQAAAAMAAA/wf//wVdSoAgA7mIABgAAAA4AAAgCSRQ
+BgAAACADx1z4AAAAAf//5wABwAAgAACABAAQAB//mvjhAZoA4QGaQOEBmjzhAZo44QGaNOEBmjCA
+AAADgAAAAgAAht0f/5vk//z//+EBDgAAABewH/+TaB//k+ggA9VAIAkp8CAJJ6AgCSfgIAkpkCAJ
+KcAgCSgQIAkoUCAJKIAgCSjAIAko8CAJKTAgCSdwD///8P/wAAAgCSpwH/+rAB//mJwgCSowIAPk
+kCAJK3AgCSugIAkrECAJKrAAACMoH/+Z5B//l8wAAP+AIAjmgAAEAAD/+///4QHiwB//m/yQAADw
+/P+A7yAI5tAgCOcQAAD4AAACAQwAAgEIj////wAA8AAf/5vw4QGYACAI52AgCOewIAjn4CAI6CDh
+AN4AAAIDCAACAgD///AA4QDuAB//nGj//3//AADgAAAA/AAAAgMEAAERHAABERgAEAgAgAAIAAAC
+AQT//8AAAAD//gAAJYAAAgMAH/+b6OD/4sAgCSvQIAksYAACEAggCSyQIAkssCAJLEAAAP/zIAks
+0CAJLPAgCS0QIAjocAAAKjAgCS0wAAD/+AAA/48AAFK1AABICgAAj4IAAI+GAAA4AAAAj4oAAOM/
+AACDrgAA//EgCOiQ///PvwAAEEAgAoGwIAjowCAJLVAAAP/7IAjpAP//3/8gAoHAIAjpoCAI6XAg
+CS2AAAIWCH8///8AAPn/AAD+/wAA/8AAAP8/IAkt0CAI6TAgCS6AIAkuMCAI6lAgCOoQIAjp4CAI
+6nAf/6zwIAjqwAAAGxgAAN6tH/+qnCACgtAAAIMAIAjugBAABQ3uAAAAAcCAAAkAAAAAAIIAIAjt
+oCAI7fAgCO4wEAAHAgAA/P8gCO7gAAUAAhsAAAAgCO8QIAKDICADgqggA38QIAOB9CAI72AgBhoA
+AP/AABIAAAAgBHcwIAjwECAI79AgCPBQIAjwsCAJMdAgCPHQIAKLcCAI8fAgCPEAIAjxYAD///wA
+ABA2///v/yACg1Af/6roIAPDhAAACFAgAoNgMgAAAAAACEAgCTKwIAky8CAJMzAA///6AACABQAA
+gAczkAAAIAjyMCAJM1Derb7vgYAAAB//nEAAAIP9MAAAHDAAAAQwAAAUAAD/7//+//8f/6uUIAKD
+cAD/8AAAKAAAIAjycDAAAAAwAAA0AACAASACg7AAAIACEAAFEJkAAAA0AAAAIAkzkCAI8rAAGQAA
+IAjzACACjAQAABshAACAwh//mmADFQAABQAAAIP/ABsgCPOwIAj0AOEBkawAAZGsIAj0YAsAAAAg
+BQvwIAj00CAI9UAgCPWwIAj14CAJNMAgCTVAH/+dWB//k8wgBCKc4QAOAOEAEgAf/5pEAAE4gOAA
+BgAAAicQIAk2MH///w8f/53A4QAuAPwA///hAJYA4QCaAAAACf8AALAAH/+c8CAChAADAAAA4QAS
+BOEAEgjhABIM4QASEOEAEhQTAAAAEQAAAB/8AAAf/5wsIAj2YCAJN2AAAZSPAAGUz///7/ggAoQg
+H/+bNCAChxAgCPagIAj20AACSfAf/5tQIAKH4B//knQgCPlwH/+aOB//mSgf/5zQIAj7EB//mjQA
+P///AAD/lwAA//0AAP/V//+rk8IAAA4F3AEAA/8AAMAAAAEgCPtwIAj7sCAI/AAgCPxAIAj8kCAI
+/NAf/6jQAA8D/wMRAAAf/520/f//0B//kfAf/5OsAAL//wAAnEAgCSPwIAj/8CAJAGAAAP4AIAVB
+tCAJASAAACEAIAVKpCAGFnggBhaIIAYWmCAGFqggBha4IAYWyCAGFtgf/5vsH/+TxCAJAVAAAwAC
+IAkjoCAJAdAgCQGA4QIWJAEw+EAAAYagACYloAJiWgAF9eEAIAkDQCAJA8AgCQHwIAkCMCAJAmAg
+CQMQIAlBUCAJQdAgCUGQIAkDkCAFYNAAABkABAAAAQAAIcEgCQQQ4QIABOECAgDhAoIAAAQF7uEC
+AQThAeIA4AAJCAPoAAAf/50EAFAAAACgAAAAAHkEAAB2AB//myQf/5soH/+YhOEAcgAgBoAAAAAU
+ACAGgRAgBq6gIAbu8CAGhmAgBoVQIAaEQCAGgzAf/5rQIAaCIB//nIAf///wH/+p0CACirAf/6rs
+H/+tqB//rOhJAAAAIAlBECAJQGAgCUDAH/+ZtB//nAQgBhf04QB2AP//8A8gCQqwH/+b9B//m2Qg
+AohAIAkN4CAJC7AAAFAAIAYcwCAGHBAgAyFgIAYcyiAJC/AgCQxQAACP/iAJDKAjKBUAIAkNACAJ
+DUAUkAAAQAAABCAJDbAgCUcQIAlHkCAGHAgf/6qY/+gP/wAQgAAgCQ7AIAWkGCACiGAByEAG4QGZ
+4B//nQAgCT7QAAGQ+CAJPxD//Ph/IAk/gCAGFmwAAH5QAAB+QAAAfhggBbgEH/+buCACjZAgAo2U
+IAKNmCACjaAgAo2sIAKNtABQIAbhAZoMH/+bVABwIAb/4AAAAAIgBiAJD/DhAZoE4QGaCAAEIAYg
+CRAgIAKIiCAJEFAgCRDgIAkQgCAJELAgCRFQH/+dMAAEk+D/+2wg/+F7gCAJEYAgCRGwIAkSICAJ
+ElAgCRKAIAkSsCAJEuAgAoiQHf/w7wAACgAgCUgQIAkTECAJSEAgCUhwH/+XFOAAAQDf//4AH/zA
+AMAAAAXhAd4AIAXhlCAJE0D/7///IAlIoB//k8gf/50g4QBWAOEBlNAgCRNwIAkTsB0AAAAf/5N0
+IAkT8B//nPwgBhgUIAKLJCAJSaAgCUpQIAlI0CAJSRAgCUrQIAlJ8CAJSVAgBhYEH/+cMCAJFJAg
+BeSQH/+egB//rjQf/65MH/+uZB//oEAf/644H/+uUB//rmgf/50UH/+fEOEAMQAf/5n8H/+Z9OH/
+/gAf/OGAIAfAAB//kuCf////H/+aWL//8P8gCUuQH/+UIP8P//8f/5JwIAkV0CAJFgAgBhoEIAkW
+cAoAAAAgBgxwf/AAAAAf//9sEAQkICHz9/AF4AYFAA8CAPyYABIwCHUACEQCJDbBJjbCG/vz/MBo
+HaA9JQD7994FoA4VAPZ4ZhWgDwUAW7tT56BUbRAEgADApP331AWgG0UAWNnmZiB6JDbBJjbCG/vk
+/AACHaA9JQD798AFoA4VAPZ4ZhWgDwUAW7tE56BgbRAEgADAof33uAWgG0UAWNnX0Q8AAAAAAPv3
+rAXgDAUA/AZCHeAOFQD796IFoAg1APh4ZhWgDwUAW7s056AZbRAEgADApP33mgWgG0UAWNnHZy+E
+0Q8AAAD0eEgV7/3mAPinAAyyCgUACpkCKTbCG/vA/AACHaA9JQD793gFoA4VAP54ZhWgDwUAW7sg
+56ARbRAEgADAof33dAWgG0UAWNmz0Q8AbBAEIiEc0Q9sEAQoSgD2AAIdoEkFAOk5AQsgBIAA6YQ5
+AeA0gAAY+64IRAIEBE8lICHz90gF4BcFAA8CAPy4ABKwCHUACFUCJTbBJzbCG/uf/AACHaA9JQD7
+9zYFoA4VAPZ4ZhWgDwUAW7r/56BUbRAEgADApP33LAWgG0UAWNmSZiB6JTbBwYAoNsIb+5D8AAId
+oD0lAPv3GAWgDhUA9nhmFaAPBQBbuvDnoGFtEASAAMCh/fcQBaAbRQBY2YLRDwAAAPv3BAXgDAUA
+/AZCHeAOFQD79voFoAk1APh4ZhXgDwUAW7rg56AZbRAEgADApP328gWgG0UAWNlzZy+E0Q8AAAD2
+eEgV7/3mAAAAABr7dQp6AQoKTwpKAio2whv7a/wAAh2gPSUA+/bOBaAOFQD+eGYVoA8FAFu6y+eg
+EW0QBIAAwKH99soFoBtFAFjZXtEPAGwQBBf7ZPf2yAWgCSUA/EdgAd/4BQAJLDYMDEcDzBGmzCvC
+zAi7AQs7AivGzArqMCVyRapVBOowBFQMakEObQgIDeowDV0MatECY//waCI3CSw2DAxHA8wRpswr
+wuwIuwELOwIrxuwK6jAO6jAlckUKVQgOXgxq4Q5tCAgN6jANXQxq0QJj//BvImUW+0QJJTYFBUcD
+VRGmVSZSTAhmAQY2AiZWTATqMA7qMCJyRaQiDi4MauEObQgICeowCSkMapECY//wJlJsCGYBBjYC
+JlZsBOowCuowInJFpCIKKgxqoQ5tCAgI6jAIKAxqgQJj//DRDwBsEAQX+yoZ+yYY+yb8SQAB0Aol
+AAotNg0NRwPdEQjdCCzSy+RPEQn2AoAAD+4CB8wBDswCLNbLC+owJpJFC2YIBeowBWUMalEObQgI
+DuowDm4MauECY//waCJBCi02DQ1HA90RqN0s0uvkTxEJ9gKAAA/uAgfMAQ7MAizW6wvqMA/qMCaS
+RatmD28MavEObQgIDuowDm4MauECY//wbyJwGPsCCiY2BgZHA2YRqGYoYkvkRREJngKAAAUzAgeI
+AQg4AihmSwXqMA/qMCKSRaUiDy8MavEObQgICOowCCgMaoECY//wJWJrB1UBBTUCJWZrBOowCuow
+IpJFpCIKKgxqoQ5tCAgI6jAIKAxqgQJj//DRDwBsEAQY+uYZ+uYX+ub39c4FoA0lAP31vAWgCgUA
+6/rdER2xAADllAANIASAAA0vNg8PRwP/Eav/LvLfA51ADYU5Bj0B9cAEB3BTWQDtdDgKrIKAAPSG
+AApwU1EAA1URBe4CBO4CLvbfDeowJcJFrVUO6jAOXgz9wmAg0A0lAG0ICATqMARUDGpBAmP/8Ggi
+aO6UAA14BIAADSU2BQVHA1URq1UkUv8Dm0ALjjn+gAQCMLNZAOY+AQ3cgoAA/uIAD7DjUQDr+wIP
+dMKAAA5EAgtEAiRW/w/qMA7qMCvCRa+7Dr4MauESbQgIDuowDr4MauEGY//wAAAAAPRABSlSAJ0A
+HvqlDSs2CwtHA7sRrrslsl/2YAQHMgIFAPJgBAEwBBUA8o0ACTAPBQAOTzj+7QANcONRAPMNAAyw
+Q1kA5ZUBCiSCgADqRAIPHMKAAAQzAgU1AiW2XwTqMA/qMCLCRaQiDy8MavEObQgIDeowDS0MatEC
+Y//wJbJ/BZUBBTUCJbZ/BOowDuowIsJFpCIOLgxq4Q5tCAgI6jAIKAxqgQJj//DRDwBsEARoI0X3
+9QAFoAclAAcnNgcHRwN3EfbgAEMwawUA7DQAC1AEgABYCuAa+ngrKgDTD+p6CApgBIAAWArbyEva
+YPygaB2gG/UAWArXFvpn/E8gAV/pBQD79NwFoAclAAcnNgcHR/j4ABOwawUA6noICeAEgABYCswa
++mcrKgAPAgDqeggKYASAAFgKx/CDwA3v6QUAHfpWrX0s0ucJzAEMXAIs1ucL6jAqYkWrqgvqMAur
+DGqxFW0ICA7qMA6uDGrhCWP/8AAAAAAAAAD0QAlhUgCdAC36n/30jAWgCyUACys2CwtHA7sRDLsI
+LrJHDe4BDj4CLrZHDOowD+owKmJFDKoID68MavEPbQgIDOowDKwMasEDY//wAC7a/y+yXw7/AQ9P
+Ai+2XwzqMA/qMCpiRayqD68MavEObQgICOowCKgMaoECY//wKLJnDYgBCDgCKLZnD+owDOowKmJF
+r6oMrAxqwQ5tCAgM6jAMrAxqwQJj//Atsn8O3QENTQIttn8M6jAN6jAqYkWsqg2tDGrRD20ICA7q
+MA6uDGrhA2P/8ABkQFctskcJ3QENXQIttkcM6jAP6jAqYkWsqg+vDGrxDm0ICA7qMA6uDGrhAmP/
+8CyyZwnMAQxcAiy2ZwrqMA/qMCliRaqZD58MavEObQgIDeowDZ0MatECY//w0Q8AAGwQBBX6BRf5
++CVSgfjhQCWgCZUA6IKfIoOhgACiiAmIEahYJoAj/MVACVAEBQBmYCIjgCzTD2gyI2gxIGg2HWgz
+Gmg0UMBCBCIKByIKIiJd0Q8AAHlh2WtqAmtpCgQiCgciCiIiXdEPaDVNaDc9/GHgBFAEBQD8ZkAE
+0AW1AHUxKgQiCgciCiIiXdEPDCIRonIiIl3RDyOANnkxwGk5pcAxAyIKByIKIiJd0Q/AMgMiCgci
+CiIiXdEPwDEDIgoHIgoiIl3RDwAAbBAEGfnTKZKBFfnF8yTQDeAMtQArXQorsp+iuwm7EaubKrAj
+/UaACVANlQBmoCwqsCzTD9MPaKIwaKUt9UAUYhIAnQD1QBPgkgCdAPVAE0oSAJ0A8ABQDaAJJQB9
+oc9rqgf5QBG8kgCdAMCQAiQJpJQFRAokQn38YAkMIgCdAPRgCMkSAJ0ABApC8/NMBeAHJQAHJzYH
+B0cDdxHjcwgNNwKAAPZACFFfivUA9EAN6RIAnQAsMuAKzAEMbAIsNuAL6jAI6jApUkULmQgImAxq
+gQ9tCAgN6jANnQxq0QNj//AAfEcX2iD8AAIdoGsFAFv/EmAAGgAAAAAAfE/n+kBoHaALBQD0hAAG
+sgwFAFv/CuokAApYBIAAW/6fc0dpHPmNLTLcBNpC7N0BDVXCgAANrQItNtwL6jAO6jApUkWrmQ6e
+DGrhDm0ICA7qMA6eDGrhAmP/8B75da5+LeJ8DN0BDa0CLeZ8C+owD+owKVJFq5kPnwxq8RBtCAgP
+6jAPnwxq8QRj//AAANog9FAABbHEmQBb/jt2TwzRDwAAAP/7qA2gCkUA+kBoHaO0qQBb/ffRDxr5
+aSsKcA8CAOp6CAtgBIAAWAnHLDLgKfqPCcwBDGwCLDbgC+owKlJFq6oL6jALqwxqsQ5tCAgN6jAN
+rQxq0QJj//Ab+U2rey2yQAndAQ1tAi22QAzqMA7qMCpSRayqDq4MauEQbQgIDOowDKwMasEEY//w
+AAAssmAJzAEMbAIstmAK6jAN6jApUkWqmQ2dDPe/9OCSAJ0AbQgNDeowDZ0M97/1GJIAnQBj/+sC
+JAkFRAr0j6gVr/hCAAAsMsAKzAEMbAIsNsAL6jAI6jApUkWrmQiYDPcf8riSAJ0ADeowDZ0Ma9H2
+Y/5GAAAAaDVDaDc4aDgFaDkyfDEv//bwDaAJBQAAAAAAAC6wNvnf7KTSAJ0A//aQDaAJFQAvsDb9
+/+uNYgCdAGP9jwAA//YwDaAJJQD/9hANoAkVAGwQBBX5GCVSgeb5ChKLKYAAKG0KKIKfoogJiBGo
+WCeAI/zlYAlQCZUAZnAjI4As0w8PAgBoMiZoMSNoNiBoMx30YAqqEgCdAPAAUA2gAyUAeXHYa3oH
++OAJNJIAnQDAMAMlCgZVCiVSXRP5AeNTAQKIOIAAwlT0ZgAK8AAmAMBYBTUC9/HaBeAJJQD8R6AB
+3xg1AAkrNgsLRwO7EQe7CCqyhAiqAQpaAiq2hATqMCNiRQQzCArqMAo6DGqhDm0ICAzqMAw8DGrB
+AmP/8GgiOQkrNgsLRwO7EQe7CCqypAiqAQpaAiq2pATqMA3qMCNiRQQzCA09DGrRD20ICAzqMAw8
+DGrBA2P/8ABvImMU+MwJIzYDA0cDMxGkM4c0CHcBB1cClzQE6jAN6jAiYkWkIg0tDGrRDm0ICATq
+MAQkDGpBAmP/8CcyJAh3AQdXAic2JATqMAfqMCJiRaQiBycManEObQgICOowCCgMaoECY//w0Q8M
+JRGlZfSrqBXv+7oAAGg1PGg3MWg4B2g5K8CLeDEm//ssDaADBQAjgDb4f/X0YgCdAPh/9QTSAJ0A
+//rADaADFQAAAAAA//qQDaADJQD/+nANoAMVAGwQBOokAAnYBIAAW/6eCqQC6zQACVAEgABYAjsT
++JT78SgF4AUlAAUlNvRABtGSAJ0AA1kR+yAARPPUqQAtlogM6jAqMkUMqggI6jAIqAxqgRFtCAgM
+6jAMrAxqwQVj//AAAAAE/UUtlokM6jAN6jAqMkXTD6yqDa0MatEObQgIDuowDq4MauECY//wBK1E
+LZaKDOowD+owKjJF0w+sqg+vDGrxDm0ICA7qMA6uDGrhAmP/8AR9Qi2WjQzqMA/qMCoyRdMPrKoP
+rwxq8Q5tCAgO6jAOrgxq4QJj//AEDEYslowK6jAP6jApMkXTD6qZD58MavESbQgIDeowDZ0MatEG
+Y//wAAAAAPRABqESAJ0AA1kR+yAARPPUqQAtlqgM6jAO6jAqMkXTD6yqDq4MauEQbQgIC+owC6sM
+arEEY//wAAAE/EUslqkL6jAM6jAqMkWrqgysDGrBEG0ICA3qMA2tDGrRBGP/8AAABKxELJaqC+ow
+DuowKjJFq6oOrgxq4RBtCAgN6jANrQxq0QRj//AAAAR8QiyWrQvqMA7qMCoyRauqDq4MauEQbQgI
+DeowDa0MatEEY//wAAAEC0YrlqwK6jAO6jApMkWqmQ6eDGrhDm0ICAzqMAycDGrBAmP/8Bb4JfRA
+BclSAJ0AA1IR9kAARTO0qQCbqAzqMA3qMCkyRayZDZ0M96AHkJIAnQBtCA0N6jANnQz3oAcIkgCd
+AGP/6wAAGvgiBPdF6ioIC9gEgABYCXAa+B7qKggL2ASAAFgJbBr4HASnROoqCAvYBIAAWAloGvgZ
+6ioIC9gEgABYCWUa+BYEd0LqKggL2ASAAFgJYBr4E+oqCAvYBIAAWAldGvgQBARG6ioIClgEgABY
+CVka+A3qKggKWASAAFgJVQUKRwOqEfdAAEUwDBUALKaiC+owKTJFq5kL6jALmwxqsRBtCAgL6jAL
+mwxqsQRj//AAAMDALKaiC+owDOowKTJFq5kMnAxqwQ5tCAgN6jANnQxq0QJj//DRDwAAK6YoDOow
+DuowKTJFrJkOngz33/iYkgCdAG0IDQ3qMA2dDPe/+BCSAJ0AY//rAAAAbBAG4xYCKfAEgAD978oF
+oApFAPxEUBXgG0UAWNXBFPe/GPfD9+/ABeAGBQD0AAId4AMFAOgWACRDQQAA+CAmFaAAOgCxZvTA
+BJySAJ0ALCAh/ZgAFjAd5QANzAIsRsEnRsIa96/7714F4AwFAPwGQh3gDhUA8phmFeAPBQBbtxBm
+oJsa96cb96f8AAIdoD0lAP4AIh2gCDUA+JhmFaAPBQBbtwdmoIclQsIFBU9+VywK6jAZ96MpkkWq
+mQjqMAiYDPcf+/iSAJ0AbQgNCuowCpoM91/7cJIAnQBj/+t0VxktICL6AIIdoBtFAOz3rxrwBIAA
+WNWLxyvRD4wSKiAh/BACHeCLBQD9bQAJsBvlAOz3pxnwBIAAWJ3jwCDRDwDApPwgKBWgG0UAWNV9
+Y/99wKT8IAgVoBtFAFjVeWP/bQBsEAQqICEd94X6AOId4AUFAP6gaB2ggxkA+a0ADzAsBQBYndDm
+oFNtIASAABz3kfoAQh2iCQUA6joBCvAEgAAKnjkqICH8QAId4At1AFidxeagJ20gBIAA+kQwFaEN
+BQD6IAId4MMBAP1tAAqwC3UA/qBoHaAcBQBYnbrSQNEPAGwQBMAg0Q8AbBAEGPd6AycRqHcjcrv+
+Z8AP0AUFABj3WPfu6gWgAD4AKXK7758ocqgFAAB2US0D6jAigkUDIggK6jAKKgxqod9tCAgJ6jAJ
+KQxqkdNj//Aqcrf69uYVoAIFANEPxyvRDwAAAGwQBm86DBT3YgQ0CoRACkAAAACDEPXugAXgCCUA
+CCg29+56BaeIAQD5GAAUP3cFAOWFCAEQ04AAKVLAB5kBCTkCKVbABOowImJFpCIJ6jAJKQxqkUpt
+CAgK6jAKKgxqoT5j//AAAAAA9EAG8RIAnQAoUuAHiAEIOAIoVuAE6jAL6jAiYkWkIgsrDGqxDm0I
+CAnqMAkpDGqRAmP/8NEPAAApUuAHmQEJOQIpVuAE6jAK6jAiYkWkIgoqDGqhDm0ICArqMAoqDGqh
+AmP/8BX3FKWFKVJAB5kBCTkCKVZABOowC+owImJFpCILKwxqsQ5tCAgI6jAIKAxqgQJj//AoUmDT
+DweIAQg4AihWYATqMAnqMCJiRaQiCSkM9z/7+JIAnQBtCAgJ6jAJKQxqkQJj//DRD/IQoh3v+34A
+8hDiHe/7XgDyEQId7/s+AChSwAeIAQg4AihWwATqMArqMCJiRaQiCioM91/5oJIAnQAJ6jAJKQxr
+kfbRDwBsEAQX9uYW9uf0YAUdUAglABT3AgQ0CoRACkAA9EAEmVIAnQACKQkHmQopkn3xIAWZkgCd
+APRgBVwSAJ0A9GAFHJIAnQDAq/pgBMwiAJ0ACCo2A6oR90AARTCpBQAppoYE6jAickWkIgvqMAsr
+DGqxPgvqMAsrDGux9tEPCCk2A5kR9yAARLD09QAkloYD6jAM6jAickWjIgwsDGrBEW0ICArqMAoq
+DGqhAmP/8NEPANEPAAgpNgOZEfcgAESwBPUAJJaGA+owC+owInJFoyILKwxqsdptCAgK6jAKKgxq
+oc5j//AIKTYDmRH3IABEsARVACSWhgPqMAvqMCJyRaMiCysMarGpbQgICuowCioMaqECY//w0Q8A
+bBAGbzoOFPbABDQKhEAKQADAiJgQFvab9e04BeAIJQD8R4AB3/cFAAgqNgOqEaWqK6KAKRIAB7sB
+C5kCKaaABOowI2JFBDMICeowCTkMapEObQgIC+owCzsMarECY//waCI1CCo2A6oRpaoroqCJEAe7
+AQuZAimmoATqMAzqMCNiRaQzDDwMasEObQgIC+owCzsMarECY//wbyJsCCM2AzMRpToprQSJkIgQ
+B5kB6YkCBVATAACZoATqMAzqMCJiRaQiDCwMasEObQgIBOowBCQMakECY//wGfZtqTklkiAHVQEF
+hQIlliAE6jAF6jAiYkWkIgUlDGpRDm0ICArqMAoqDGqhAmP/8NEPwLX6IAYV7/wSAMDH/CAGFa/7
+6gAAbBAEFfZkJVKB5vZWEoupgAAobQoogp+iiAmIEahYJ4Aj/OVgCVAJlQBmcCMjgCzTDw8CAGgy
+JmgxI2g2IGgzHfRgCyoSAJ0A8ABQDaADJQB5cdhregf44Am0kgCdAMAwAyUKBlUKJVJd9+x+BeAJ
+JQD8SWAB3+gFAAkrNgsLRwO7EQe7CCqygwWdUf+wABaxxdkADcwCCKoBDKoCKraDBOowI2JFBDMI
+CuowCjoMaqEObQgIDOowDDwMasECY//waCJFCSs2CwtHA7sRp7sqsqMFnVH/sAAWscXZAA3MAgiq
+AQyqAiq2owTqMA3qMCNiRaQzDT0MatEPbQgIDOowDDwMasEDY//wAG8icxr2GAknNgcHRwN3Eap3
+inP0OwAB8UXJAOiqAQongoAABDMCCjoCmnME6jAN6jAiYkWkIg0tDGrRDm0ICAnqMAkpDGqRAmP/
+8CVyIwhVAQU1AiV2IwTqMArqMCJiRaQiCioMaqEObQgICOowCCgMaoECY//w0Q8MJRGlZfSrqBXv
++3oAAGg1PGg3MWg4B2g5K8CLeDEm//rsDaADBQAjgDb4f/V0YgCdAPh/9ITSAJ0A//qADaADFQAA
+AAAA//pQDaADJQD/+jANoAMVAGwQCPhDBBWgBDUA8+uuBeAHFQD0RFAV4AYFAOsgKyQKSYAAKiAh
+/VgAFTAb5QALqgIqNsEZ9fgpNsIa9czr9cwbYASAAP7gaB2gPSUA9nhmFaAPBQBbtS3qFgItHJIA
+ABr1w/vrhgXgDAUA/AZCHeAOFQD0eGYVoA8FAFu1JOoWAi0cSgAAKTLCKxIC5rNwbaAEgADxIAbm
+kgCdAAk5QfUgCBCSAJ0A9SAP6RIAnQD1IBBpkgCdACwgK2XAvC4gIS8gIC8WA/3YABcwD3UAD+4C
+LjbBHfXRLTbCGvWk++tIBeAMBQD8BkId4A4VAPZ4ZhWgDwUAW7UF5qLibSgEgAAa9Zsb9Zv8AAId
+oD0lAP4AIh2gCDUA+HhmFaAPBQBbtPvmovZtKASAACkywgkJT5kQ5lKMatAEgAAqICEc9bcd9bf/
+624FoAt1AFib6WeiAosTK7z7+u0ACnAKVQDqJCAqEASAANEPAORkAA2AdgAAYAApACwgK2TPQiYk
+K+YlHiroBIAA9kPkHaAKRQD960oFoBtFAFjTdSsgK8BBZL8c0kDRDwApIR8PAgAJDkVo4SvA0S0W
+ARz1nPxEUBXgCkUA/iAoFeAbRQBY02gqICIrICOMESwlH1gBVykhHwkKRfVAB6ESAJ0A9UAHYJIA
+nQD1QAikEgCdAMCgKyArwOEK6jl6sZf5X/uI0gCdAPygaB3gCkUA/esKBaAbRQBY01MoICEmJCAn
+JCv9GAAUMAl1AAmIAig2wcHzLzbCGvVM++qYBeAMBQD8BkId4A4VAPZ4ZhWgDwUAW7StZqKaGvVD
+G/VE/AACHaA9JQD+ACIdoAk1APh4ZhXgDwUAW7SkZqKGKjLCLCEd6/VqGAQKgADzgASOUgCdAPtA
+BPTiAJ0A8AJgDaBJBQAAKSEfCQ5F9d/5WRIAnQDA0vwgJhXv++oAKSEfCQ5F9d/4nBIAnQDA+P4g
+JhXv+4oAGvVKA1kRqpkqkrcb9VQLqgIqlrcpkrfxP/g80AoFAPM/9/0SAJ0A//vcDaAKFQAAKiAi
+G/VLA6oRq6ob9UqrqoqgwLL7QAQFf/tqAHWnCPgYAh3gAEIAAB31FQusAX3BDsCQ+EPEHe/5ZgAA
+AAAAAPgQAh3v/74AAAAALyAh/fgAF7AIdQAI/wIvNsEe9TcuNsIa9QD76gAF4AwFAPwGQh3gDhUA
+9nhmFaAPBQBbtGHnoSFtaASAAP3p8gWgCkUA/CCGFeAbRQBY0vKJFOaQGGzQBIAAKiAhHPUaHfUa
+/iAIFaALdQBYm0xmrYt4X2WJEymc+vjtAApwCGUA6CQgKhAEgADRD8Ck/enKBaAbRQBY0uBj/ULA
+pP3pwgWgG0UAWNLcY/yKAAAqICtlrXNj/LMAAMCk/em2BaAbRQBY0tVj/G3ApP3prgWgG0UAWNLR
+Y/0FAAArICHTD/14ABWwDHUADLsCKzbBJzbCGvTK++mUBeAMBQD8BkId4A4VAPZ4ZhWgDwUAW7Qr
+5qCzbTAEgAAa9MAb9MH8AAIdoD0lAP4AIh2gCDUA+HhmFaAPBQBbtCHmoJptMASAACUywmZst4kT
+BUpACpkMCXQ56iQgKhAEgADRDxr0rxv0sPwAAh2gPSUA/gAiHaAINQD4eGYVoA8FAFu0ENmg6hYE
+JQDlgADApP3pUAWgG0UAWNKiiRRj/roAAAAAAAD0eEgV7/rGAMCk/ek8BaAbRQBY0ppj/XvApP3p
+OAWgG0UAWNKWY/1rwKT96SwFoBtFAFjSkmP/bMCk/ekoBaAbRQBY0o5j/1xsEAR/N2IqICH6ACId
+4AyVAPwAIh3gDhUAWJrnKiAh/ekoBeALdQD8AAIdoA4FAFia4iogIf3pagXgCxUA/+loBaAMBQBY
+mtwDmEHqICEsHIQAAP3pYAWgC3UA/ABiHeAOJQBYmtVgABnGKtEPAAAA/elSBaALdQD8AGId4A4V
+AFiazfpEMBWgC3UA/elGBeAsBQBYvIn6RDAVoAt1APxAAh3gDAUAWLyEKiAh+gAiHeAMlQD8ACId
+4A4FAFiavsAg0Q8AbBAEKDAIyILGKtEPKiAhFPRX/VgAFTAb5QALqgIqRsEZ9I4pRsIb9FP8BkId
+4A4VAPvongWgDAUA/JhmFaAPBQBbs7PmoDxtEASAAPvolAXgDAUA/AZCHeAOFQD76IoFoAg1APiY
+ZhWgDwUAW7Oo5qApbRAEgAApQsIImTIJiRKZM9EPwKT96HgFoBtFAFjSOAiqMgqKEpoz0Q8AwKT9
+6HAFoBtFAFjSMgi7MguLEpsz0Q8AbBAE+gCCHaAbRQDs9GcZ6ASAAFjSKiogIfoA4h3gHAUA9AAC
+HaCTAQD+gGgdoQgFAPkNAA9xDQUAWJqBZqBAHfQtHPRa/oBoHaCjCQAK3jn6RDAVoAt1AFiaeWag
+IR30JvpEMBWgsxkA+60ACnAsBQD+gGgdoAt1AFiacdKg0Q/SoNEPbBAEGPQyAyURCFUI6VKAIkUZ
+AABoQkf8hiAA0AYVACpSgMe+C6oB6laAIkT1AAD0gAeJEgCdAPSACIiSmekAwCAsUoAGzAIsVoDR
+DwndUmnTzMAg0Q8J3lJl77dj//IJ31Jp8rFj/+nAcOokAAnYBIAAWAhK6iQACdgEgABYqMVmoBnr
+NAAJUASAAFjEtClSgBr0JgqZAilWgChSgMCRG/QkZHDGGvP4K7KfKqKBorsJuxGrqiqhH//oPgXl
+qgEA9UAFAJAMpQDqZAAFa/kAAA3KOChSgxL0GA+IAQoiLQgiAiJWgy5ShB30FQ/uAQrdLQ7dAi1W
+hC9SgBj0ERz0ERL0Euz/AQJb+QAAC4I4Av8CL1aALlKABu4C7laALJAEgADRD/YAAh3gCxUA+F0A
+BvAKBQDtujgG4/UAAOy3OAUA4YAA//yIDaADJQDKnC+c/v4AIh2gBwUAD+c4//z8DaAJBQD6DIId
+r/2uACJSgAYiAuJWgCyQBIAA0Q/AMv/7oA2gBxUAAABsEAQpICHBbvPnUgXgBQUAC5kRBpkCKTbB
+GPPqKDbCGvOk6/OkGuAEgAD8BkId4A4VAPR4ZhXgDwUAW7MFF/OhwEHnfNAtBGIAACgKoyg2whrz
+mPvnMAXgDAUA/oBoHaA9JQD0eGYVoA8FAFuy+WaggiogIQuqEQaqAio2wRnz0ik2whrzi/vnFgXg
+DAUA/AZCHeAOFQD0eGYV4A8FAFuy7GagPSsKYys2whrzgfvnAgXgDAUA/AZCHeAOFQD0eGYVoA8F
+AFuy4vFDiA3gAgUA0Q/aQPzgaB2gG0UAWNF0Y/+OwKH84GgdoBtFAFjRcMAg0Q8AwKH95uYFoBtF
+AFjRbGP/bMCh/ebeBaAbRQBY0WjAINEPAAAAbBAEJiAh9ebGBaAFBQD82AATMBjlAAhmAiZGwSVG
+whvzX/wAAh2gPSUA++a2BaAOFQD0mGYV4A8FAFuyv+egU20QBIAAwKT95qwFoBtFAFjRUmYgeSZG
+wSVGwhvzUPwAAh2gPSUA++aYBaAOFQD0mGYV4A8FAFuysOegZG0QBIAAwKH95pAFoBtFAFjRQ9EP
+AAAAAPvmhAXgDAUA/AZCHeAOFQD75noFoAg1APiYZhWgDwUAW7Kg56AZbRAEgADApP3mcgWgG0UA
+WNEzZy+F0Q8AAAD2mEgV7/3qAAAAAAAAGvMzGfN0A6U5CXkBBZkCCQlPKUbCG/Mp/AACHaA9JQD7
+5koFoA4VAP6YZhWgDwUAW7KJ56ARbRAEgADAof3mRgWgG0UAWNEc0Q8AbBAGLCBqwFP8YAAGMAcF
+AOTzFhYHyYAAaMEExyXRDwD95rYFoApFAPxEUBXgG0UAWNEOHPNXHfMcKiAh/+Y2BaALRQBYmWrm
+ob9tMASAAB7zCRXzT+4WASdowQAA/CAGFeAGRQAvICEPAgAPAgAL/xEG/wIvRsElRsIb8v38AAId
+oD0lAPvl8gWgDhUA9phmFeAPBQBbsl3moFBtMASAAPvl6AXgDAUA/AZCHeAOFQD75d4FoAg1APiY
+ZhWgDwUAW7JS5qA1bTAEgAAjQsJmYTj+cgAM0AZFACkgaioK8AqZAfhNRh3gAgUA0Q/ApPwgKBWg
+G0UAWNDdY//RwKT8IAgVoBtFAFjQ2WP/wQAsICEPAgAPAgD9mAAWMA11AA3MAixGwRvzHCtGwhvy
+0fzgaB2gPSUA++WaBaAOFQD2mGYV4A8FAFuyMeagwm0wBIAAG/LI/AACHaA9JQD75YgFoA4VAPSY
+ZhXgDwUAW7Io5qCsbTAEgAApQsJmYI0uIR8JGkH9TUAB1e4BAOiibWVD/QAA/gAiHeAEBQAI9Dh0
+4UrApP3l+gWgG0UA7SAiKngEgABY0K4kJR8qICLrICMqYASAAFv+nMusKiBqGfL0+GAGFeD7BQD7
+QAQFcAsVAAuqAuokaisQBIAA0Q/AINEPAGjo9//+pA2gBIUAaOLs//54DaAEJQDAINEP0mDRD8Ck
+/eUyBaAbRQBY0JRj/1rApP3lLgWgG0UAWNCQY/9KAABsEAgT8o0pICH2RFAV4AYFAPYgBhWgGuUA
+C5kRCpkCKTbBGPLAKDbCG/KG/MBoHaA9JQD75QQFoA4VAPZ4ZhWgDwUAW7Hm1KDzXsgN4AU1ABvy
+fPwAAh2gPSUA++TwBaAOFQD0eGYV4A8FAFux3AqpAuoWAy0e2gAAJjLC5pF0bKAEgAAIaDL4gAAk
+MGzVAPmAHnuiAJ0AKSEYDwIADwIAZJCCKiAh/VgAFTAOFQAOqgIqNsEZ8q8pNsIb8mH8AAIdoD0l
+APvkugWgCAUA+HhmFaAPBQBbscHmo5xtIASAABvyWPwAAh2gPSUA++SoBaAOFQD0eGYV4A8FAFux
+uNmg6hYELRyCAAAqMsLmk4FsoASAAPNACE/SAJ0A8AAkDaAFBQAAAADAUPCMqA3gCgUAKyAr9WAE
+jGIAnQD0oAjIkAsFACskKyslHuslHyUBIYAA/eUQBaAKRQD4xwAPMBtFAPzgaB3k7g0AWNA0wPQv
+JCAqICEc8nf6A8Id4A0FAFi6UCogIRzyc/oDwh3gDQUAWLpLGvJPA3kRqpkokoLBtP3k7AWv+gUA
++wAEBDAK5QDqiAIL6ASAAPkwRhWgCkUAWNAeKyArwEHOtCUgIPigFrpSAJ0A/L+AFaALFQD9bQAK
+MAlFAOkkICoQBIAA0Q8A0kDRD8BQx9X8gBDsYgCdAMDgnhLaIPoAIh3gDAUAW/6l+iBIFa/8bgAA
+AAAAAAAA6iQACNgEgABb/ulmQKkpIR8JCUVoknBokW31IA38EgCdAMCQwKEJqTn1IGgd7/tuAAAA
+AAAAAAD6AIIdoBtFAOzyRxvoBIAAWM/0+kQwFaAMFQD8RWYdoAsFAOskICDoEQAA+gDiHeAcNQBY
+ueUtIR0b8hvqEQIm5SKAAHusW/ABaA2gSgUAABvyCgN6EauqK6K3HPIUDLsCK6a3KqK3/1AgBNAJ
+BQDzX/vNEgCdAP/9xA2gCRUAAP/5MA2gBQUAdacJ+hgCHaAAWgAAAB3x2QusAf2ACcxiAJ0AwKAs
+ICEqJR79mAAVMBvlAAuqAio2wRnyDyk2whrxyRvxyfwAAh2gPSUA/gAiHaAIBQD4eGYVoA8FAFux
+KRXxxuRc0C0WygAAKQqjKTbCGvG8G/G9/AACHaA9JQD+ACIdoAgVAPh4ZhWgDwUAW7EdZqLKKiAh
+/VgAFTAb5QALqgIqNsEZ8fUpNsIa8a4b8a78AAIdoD0lAP4AIh2gCAUA+HhmFaAPBQBbsQ5mon8p
+CmMpNsIa8aMb8aP8AAIdoD0lAP4AIh2gCBUA+HhmFaAPBQBbsQNmonUuIR/A1//f4BWgCmUADto4
+HPG7A3sRrLsssoLH0A3MAQyqAvtwRhWv9yoAKSAiGvHCA5kRqpka8cGqmYmQwKL7IAQEv/i+AIsQ
+7PHZGVAEgABYzGXAINEPAAAAAAAA+hACHa/7JgD94wYFoApFAPQgZhWgG0UAWM98iRNj/CvApP3i
+/AWgG0UAWM94iRNj/BnHS/QAAh3gChUA+iBGFa/2UgAAAAAA/eLmBaAKRQD0IIYVoBtFAFjPbIkU
+Y/x60pDRD8Ck/eLaBaAbRQBYz2eJFGP8ZAAAKiAh/VgAFTALdQALqgIqNsEZ8bIpNsIa8V8b8V/8
+AAIdoD0lAP4AIh2gCAUA+HhmFaAPBQBbsL/noC5tMASAAMCk/eKsBaAbRQBYz1JnYFj8v2AVoAsV
+AP1tAAowCVUA6SQgKhAEgADRDxrxShvxSvwAAh2gPSUA/gAiHaAINQD4eGYVoA8FAFuwquegFG0w
+BIAAwKT94oYFoBtFAFjPPWAAAicywmZvpnB/G/y/QBWgCxUA/W0ACjAJZQDpJCAqEASAANEPAAAH
+mURplRr8v8AVoAsVAP1tAAowCSUA6SQgKhAEgADRDwAqICH9WAAVMAt1AAuqAio2wcGTKTbCGvEl
+G/El/AACHaA9JQD+ACIdoAgFAPh4ZhWgDwUAW7CF5qCMbTAEgAAa8Rsb8Rv8AAIdoD0lAP4AIh2g
+CDUA+HhmFaAPBQBbsHvmoHNtMASAACcywmZu+AfZQPivAA5wCxUADLQ56SQgKhAEgADRDwDAofyA
+aB2gG0UAWM8GY/1E3ED6ACIdoBtFAFjPAmP9mcCh/KBoHaAbRQBYzv5j/STcUPoAIh2gG0UAWM76
+Y/15wKT94fQFoBtFAFjO9mP/k8Ck/eHwBaAbRQBYzvJj/4NsEAQoICH14mgFoBblAPPh2AXgBQUA
+C4gRBogCKDbBJDbCGvDo6/DoGuAEgAD8BkId4A4VAPR4ZhXgDwUAW7BJZqDkGvDgG/Dg/AACHaA9
+JQD+ACIdoAk1APh4ZhXgDwUAW7BAZqDQKTLC+kQwFaEHBQD/K4AF0AIVAAusEQbMAiw2wSQ2whrw
+z/vhngXgDAUA/kBoHaA9JQD0eGYV4A8FAFuwMGagoCU2whrwxvvhjAXgDAUA/AZCHeAOFQDyeGYV
+oA8FAFuwJ2egV2AAnAAAAAALrREG3QItNsEkNsIa8Ln74XIF4AwFAP5AaB2gPSUA9HhmFeAPBQBb
+sBpmoFknNsIa8LD74WAF4AwFAPwGQh3gDhUA8nhmFaAPBQBbsBFmoFjAINEPAMCk/eFQBaAbRQBY
+zqRj/zHApP3hTAWgG0UAWM6gY/8hwKH94UIFoBtFAFjOnMAg0Q/Aof3hOgWgG0UAWM6YwCDRDwDA
+of3hNAWgG0UAWM6TwCDRD8Ch/eEsBaAbRQBYzo/AINEPAAAAbBAGKCAhKQoH8+ESBeAGBQALiBEJ
+iAIoNsEmNsIa8IXr8IYbYASAAPwGQh3gDhUA9nhmFaAPBQBbr+YX8IL6ICYVoAQ1AOV80C0GkgAA
+GvB5++DyBeAMBQD8BkId4A4VAPR4ZhWgDwUAW6/a6hYBLQYaAAApMsKKEWagsSogIfMgBizSAJ0A
++gAiHeAMlQD8ACId4A4VAFiWyPpEMBWgC3UA/eFuBeAsBQBYuIMqICH94TIFoAt1APwAYh3gDgUA
+WJa9KiAh/eFeBeALFQD/4R4FoAwFAFiWuCogIf3gygXgC3UA/+DGBaAMBQBYlrL6RDAVoAt1AP3h
+SAXgDAUAWLhuKiAh+gAiHeAMlQD8ACId4A4FAFiWqMAg0Q/ApPygaB2gG0UAWM5DixFnv02CEdEP
+AMCk/OBoHaAbRQBYzj1j/zMAAAAAAP1YABYwDXUADcwCnBAsNsEmNsIa8Db74GwF4AwFAPwGQh3g
+DhUA9nhmFaAPBQBbr5fnoFVtEASAANxQ+gCCHaAbRQBYzipmIHaOEC42wSY2whrwJvvgTgXgDAUA
+/AZCHeAOFQD2eGYVoA8FAFuvh+egXW0QBIAAwKH94D4FoBtFAFjOGtEPAAAAABrwGPvgMAXgDAUA
+/AZCHeAOFQD0eGYVoA8FAFuveeegHG0QBIAA3HD6AIIdoBtFAFjODGcviNEPAAAAAAAA9HhIFa/9
+6gD4hwAPsggFAAj/Ai82whrwA/vgBgXgDAUA/AZCHeAOFQD+eGYVoA8FAFuvZOevhG0QBIAAwKH9
+3/wFoBtFAFjN99EPAGwQBpISjBIswCL73/YFoAsFAPgCAh2gLYUA/YYADnACBQBtig0toZR80TDr
+vAElUAkAAMebZpF5FvA+Hu/rE+/l9+B4BeAEBQDuFgAnc0EAAP4gJhWgAd4AAAAA5r/VbcgEgAAc
+8DUtwoT7YAQA0AsVAP1gAQXf+vUA6roDDIEKgADtrQEJcAqAAA7dAi3GhA3qMBnv2SmSRQmZCg2Z
+Cg3qMA2dDPegBqCSAJ0AbQgNDeowDZ0M96AGGJIAnQBj/+sAsUT2gAY0YgCdAC4SAg8CAC7gIf3Y
+ABcwH+UAD+4CLjbBJjbCGu+8+994BeAMBQD8BkId4A4VAPJ4ZhWgDwUAW68d5qCKbRAEgAAa77Mb
+77P8AAIdoD0lAP4AIh2gCDUA+HhmFaAPBQBbrxPmoHFtEASAACUywuYgPWlQBIAA/qagDlACBQAK
+6jAZ76spkkUJmQoKmQoK6jAKmgz3X/sIkgCdAG0IDQrqMAqaDPdf+oCSAJ0AY//r0qDRDy3ChA2t
+AQ29Av2QhhXv+roAxyvRD8Ck/CAoFaAbRQBYzY5j/5XApPwgCBWgG0UAWM2KY/+F0pDRDwAAbBAE
+GO/gqCgngoDHnwk5Awl3AQdHAieGgAfqMBbviSZiRadiBeowBSUMalEObQgICeowCSkMapECY//w
+0Q8AAGwQBB7vfxzvf4snJSAiGO+Z+2HIFeAKJQDqWjYKpMKAAPiAAEI//+UA5DB6bVTCgABuUgnw
+ACANoJUBAAAAwJAPnQH/uAAWsJkBAA2ZAgmZEamprJkokoPC0A2IAiiWgw3qMCniRa2ZDeowDZ0M
+atEObQgIDuowDp4MauECY//wwNAvQoAY77AI/wEvRoAtJCsttSMttSQttEIttEHttGEukASAANEP
+blIH8AAYDaCVAQDAkA+bAf94ABWwmQEAC5kCCZkRqamsmSiSgyv63wuIASiWgw3qMAvqMCniRa2Z
+C5sMarEObQgIDOowDJwMasECY//wEu93LUKA4t0CCtAEgAD8kAYV4At1AFikDGagHfqgaB2gC3UA
+WL/6L0KAAv8CL0aA/pAIFaACBQDRD8Ag0Q8AbBAEKSAjhScmICL4B+IdoDS1AOVSDiTL1QAA+QIA
+CnHDpQAjJR3yQ4Qd4AcFACckLCckICZUQCdVIydVJCdUQvaoJh3gKgUA51UiImgcgAB/Rwh9RwJv
+YgIkVSInVGEmVGAmICJuYgfwABgNoEYBAMBAG+8X/f/CHeDEAQD8gAQG8AklAOlpNg7vwoAADcwC
+45kRDmZCgACsmauZKJKDCogCKJaDCOowFO8JJEJFqEQI6jAISAxqgQ5tCAgO6jAOTgxq4QJj//AU
+7x4DYxGkMy8ygBTvUAT/AS82gCckKydVIydVJCdUQidUQfasJh3gAgUA0Q8AAABsEAQiGsrRD2wQ
+BIUnhV4kUSL6qBAVr+h1AOhCAQHkKIAAKAoICCIC/mDgBhAZBQAJIgJ6JwJ/JwV9JwtuogjGKtEP
+AAAAAADypEQdoAIFANEPAABsEATyQOgV4AIFAIM+IjUjIjUkIjRCIjRBIjRh0Q8AAGwQBPJA6BXg
+AgUAgz4iNSMiNSQiNEIiNEEiNGHRDwAAbBAEhicmYg4lYSL4AIIdoCoVAPrIEBXv2YUA6VUBAfBU
+gAApICMKVQLoVwIEy9UAAAl1OP5g4AeQAiUAAlUCelcCf1cK/qFgB1ACBQBusgPGKtEPJWUi0Q8A
+AABsEAQmIgcPAgAmYg4lYSL4AIIdoCoVAPrIEBXv2YUA6VUBAfBUgAApICMKVQLoVwIEy9UAAAl1
+OP5g4AeQAiUAAlUCelcCf1cK/qFgB1ACBQBusgPGKtEPJWUiImUjImUkImRCImRBImRh0Q9sEAQY
+7smoKJOACOowFe6aJVJFqFIE6jAEJAxqQQ5tCAgJ6jAJKQxqkQJj//DRDwBsEASNKyzQBBXukY3Q
+/ZgAFjAIhQD5hgAOMAclAAfdNuvu3R7tQoAArcwFzAorxoAK6jAZ7oUkkkUKRAgD6jADQwxqMQ5t
+CAgO6jAOTgxq4QJj//CMKyvABIzAC7sRCLsCB8w26u7NHmVCgACsuwW7Ciq2gAbqMA/qMCSSRaZE
+D08MavEObQgIDeowDU0MatECY//wgysiMASDMAsiEQgiAgczNgUzEaMiBSIKIiKAAvJA0Q9sEATy
+QWgV4ATFACIwBOMyACkWwoAABCICwEIEMzYFMxGjIhPusQ4iEaMigiACAkTRDwAAbBAE8kFoFeAU
+NQAiMATjMgApFsKAAAQiAsBCBDM2BTMRoyIT7qQOIhGjIoIgAgJH0Q8AAGwQBPJBaBXgFMUAIjAE
+4zIAKRbCgAAEIgLAQgQzNgUzEaMiE+6XDiIRoyKCIAJCQtEPAABsEASFKyNQBBTuPfSgCBXgByUA
+/HgAEbAJdQD4ZgAJ8AiFAAdVNu8iCyqtQoAApTMEMwojMoAjJQQu8ASP8AvuEQjuAgf/Nu0iCy/9
+QoAAr+4E7gou4oAuJQMs0ASN0P2YABYwHvUADswCB9026+54Hu1CgACtzATMCivGgArqMBbuHiVi
+RapVA+owA1MMajEObQgICuowCloMaqECY//wjCsrwASMwAu7EQfMNu0iCy5lQoAArLsEuwos0ASN
+0CuygAvMEfehAA7/jvUA7rsBDu1CgACtzATMCivGgArqMAvqMCViRapVC1sMarEObQgIDeowDV0M
+atECY//wjCsrwASMwP14ABWwDrUADrsCB8w2jSsFzBGsuyzQBAS7Co3Q67KALmbCgAAOzAL3oQAO
+9w4FAO67Ag7tQoAArcwEzAorxoAK6jAO6jAlYkWqVQ5eDGrhDm0ICA3qMA1dDGrRAmP/8I0rLNAE
+jdDr7jYeZsKAAAjMAgfdNgXdEa3MBMwKK8aACuowDuowJWJFqlUOXgxq4Q5tCAgO6jAOXgxq4QJj
+//COKy3gBI7gC90RCN0CB+427O4oH3VCgACu3QTdCizWgArqMA/qMCViRapVD18MavEPbQgID+ow
+D18MavEDY//wAI0rLNAEjdALzBEIzAIH3TYF3RGtzATMCivGgArqMAPqMCViRapVA1MMajEQbQgI
+DuowDl4MauEEY//wAACIKyWABIiAC1URCVUCB4g2iisFiBGoVSigBARVCoqg5VKALEbCgAAJiAL3
+QQANf+sFAOtVAQ1VQoAAqogEiAolhoAD6jAP6jAiYkWjIg8vDGrxDm0ICAnqMAkpDGqRAmP/8NEP
+AABsEASCK4IgE+3yAyIRoyKCINEPAGwQBIQrhEAV7e4DRBGlRJNA0Q8AbBAGAiMCKzIJF+3p9dsg
+BaAFJQDxYASoUAJ1ACc1Ao87LvAEj/DtMQQvdsKAAALuAgX/NgX/EQ/uCATuCi3mgAzqMArqMBvt
+gCmyRQyZCAqaDGqhD20ICAjqMAiYDGqBA2P/8ACPOy7wBC0xA4/w/dgAFzAIhQAI7gIF/zYF/xGv
+7gTuCi3mgAzqMArqMCmyRayZCpoMaqEObQgICOowCJgMaoECY//wIjEC0Q8W7cEqMQIc7ZT+IaId
+4Q1VAP1FTg3hDhUAetJyiTNkkPqLN+01AiTz/QAAnjMGuwEMuwL6YOYV4QJVANEPAAAvGgJ/ohH7
+4Ah7IgCdAPhgaBXgAHoAAAD/QApLIAtFAPvACTsiAJ0A6zYDLcgEgABkkLyCN+81AiTD/QAAmDMG
+IgEMIgLyYOYVoQIlANEPACc6A/dABSNiAJ0A+uAJ4yIAnQCKM2ShQLCp6TYDKdAEgABb/u+LOAs8
+QvuACjmiAJ0AjTf6QAAHv851AO6+AQ//QoAAD+4Cnjge7TcnNQIG3QEO3QL8YOYV4wI1ANEPAIk4
+CTlCa5YH+SATYhIAnQD1IBQjEgCdAPUgE2OSAJ0AwKD6YGYVoAkFAGWfBIw4Hu17x90NzAEOvgEu
+NgksNggvSgj+YEQd7/jyAH+iRnrySYI3GO1zLjUCBiIBCCIC4jYHLxAEgADRDygaBHipK4kzZJ+L
++mDoFaECRQDiNQIk2/0AAJsz90AEBTILBQALqgKaN9EPLBoGfKGk2jBb/sWNNy4aDS41AgbdAfxg
+5hXhAtUA0Q/A/3+p4MCwiTmxu/M/7eBQihUAmxN7qgob7VX6YEQd7/a+ANowW/5iHO0i6xIDJX7B
+gABgAEMsOgf9X/p0IgCdAGP/oY039GBmFeECRQAiNQL3oAQGsg4FAA7dAp030Q+PNxLs7Cc1Agb/
+AQL/Av5g5hXjAjUA0Q8AAI47LeAEjuD9uAAWsA+VAA/dAgXuNgXuEa7dBN0KLdKAwIb86AAFd90B
+AG2KYw0fEvwCAAXwjQEA+CBGFaDtCQD/BEYNoNqNACg5CfggJhWgmgkAebEKsYn4YSQd4AAqAACw
+iCg1CXvhH4kS+mGCFaC6EQB7kQ2xrv5hhB2gADYAAAAAALCoKDUM6tQAD+gEgAApMBb1IAbqEgCd
+ACs5CfogJhXvCgUA+0AGueIAnQBqvwmKOPFADA+SAJ0ALjEKtu4uNQovMBz14AhiEgCdACo5DCj6
+APsACFmiAJ0Aaq8JiTnxIA7YEgCdACoxDbaqKjUNKzECLRoG/WANLGIAnQAvMQoe7MJ/4xIoMBYA
+iDJrhAmJOPE/85+SAJ0AKzENGuy7+1/vW+IAnQAtMBwA3TL5v+7qEgCdAI458d/yaBIAnQBj/csA
+AAAA+ACiHeAPVQD+YGYV7/aaAPgBgh3gCMUA+GBmFa/2WgDAmZkz//YoDaAJlQCKOPFf+k+SAJ0A
+Y/8Zizj8YOgVoA0FAC01Ci01CfeABAY//dUADbsB+mEGFeINBQANzAKcN/FgBp9SAJ0A/mLQFeEC
+ZQDyYEQdr/61AA6+Ae42CCf4BQAA/mLGHeECZQDRD4g58R/4qBIAnQBj/uqJOB3swfpg6BWgCwUA
+KzUNKzUMizkGqgEMqgKaNw27AZs58SAH/9IAnQD+IMIdp9rBAP5gRB2v/OUA7JwBBugFAAAtNBz8
+YQYVoQJlANEPAAAAAAAA/mDoFeAIBQAoNQooNQn34AQHsQgFAAj/Ap8380AIz1IAnQD4YtAV4Qxl
+APxgRB2gC0UAC6sC6zYIJMgFAAD4YsYd4QJlANEPwPD+YsYd4Q5lAP5gRB2v/bUADb0B/GEGFeEC
+ZQDRDwAqMB/AgOg1AiUEEYAAwpp5oHga7JH6YEQdr+pqAAAAAPpg6BWgCwUAKzUNKzUMG+wyiTgG
+qgELqgKaN/MgBY/SAJ0ALhoG/mBEHaANFQD9JgAO98rBAO02CCZgBQAA/GOGHaECZQDRD8CA+GOG
+Ha//5QD/IAQH8QJlACI1Av5hBhXhAmUA0Q8AAAAA2jBb/bvqFgAp0ASAAFv9q4wQAKsy8YcADjAZ
+NQB8kgnA3vugBjtiAJ0ALDAQe8p3jDlyzk8rMBGxuwsLR/piJh3gAToAwOD+YsYdoQ1lAPxgRB3g
+DEUADKwC/GEGFaECZQDRDwDAgPhjhh2gDxUA/yYAD/ECZQAiNQL+YQYV4QJlANEPAMCQ+GImHeAL
+BQAd7FANzQLtNgktvNAAAB7sTv5gRB2v5hIAfLoUjDlyxiQrMBGxuwsLR/piJh3gAI4AwMD8YiYd
+oAsFAGi3z/piBh2v9A4AwND8YiYd4AsFAB7sPg7OAf5hJhWv/4YAH+w8/mBEHe/k0gAAbBAEiyoq
+sAQV69WLsP1YABUwByUAB6oCB7s2BbsRC6oI9UABBXA5BQAppoAI6jAW68okYkUIRAgD6jADQwxq
+MQ5tCAgM6jAMTAxqwQJj//CJKiiQBImQ/RgAFDAKNQAKiAIHmTYFmRGpiPUAAQRwBBUAJIaAA+ow
+DeowImJFoyINLQxq0Q5tCAgK6jAKKgxqoQJj//DRDwAAAAAAbBAEFOwSKEB98wAH39ANFQAZ7A8c
+7BAqQi8b7A8MqgwKmzjvOiFt4ASAAB7sDA4+Co7gCuAAAAAAHuwJG+wKLyz9D+s5C8sC+dgQBeAH
+JQAe67gHKjYDrBGuzCjCuC7CuB/sAgmIAQm5AQ/uAQ6+Ai7GuPkABIxiAJ0AL0B8/edgEl/15QBu
+IjP+X8AV4As1AP4AIh2gBgUA7+Y4C5gEgAAGszkFaQHo6/Icz8KAAAlmAglmEQhmDCZtWIZjLsKB
+0w8N7gIuxoEL6jApQiCrmQjqMAiYDGqBDm0ICA/qMA+fDGrxAmP/8CjCgQWIASjGgVv0FClAfG+U
+VW4iUm4yC/AAKA2gkwEAwCDRD8CQBz42BZ0B/7gAFrDJAQANzAId69Xj7hEOZkKAAK7MrcyWwAvq
+MClCIKuZC+owC5sMarEObQgIDuowDp4MauECY//w0qDRDxrruhvryPxigATTbgUAwPt/MQpvIgf7
+14gF7/tqAC8s/Q+6OQrLAv9mAA2/+yYAAGwQBBbrnqYmJWKAx38HNwMHVQEFRQIlZoDRDwBsEAYs
+IAH312wF4AWVAOMgACYCWYAAdcFDaMlAWMYB/OQoFeAMBQBYynotIgQuIgX9QZYN4AwFAHrZAnvr
+AcDB8YFgDeAIpQD4QCYdr5klAOkkAiyQBIAA0Q8sIAEW6y0e66Ed60v71lwFoAm1APmABcLgBAUA
+GeucCckKiZAKkAAAAAAAWMXn/OQoFeAMBQBYyl8f65Yc65DTD++7CA3wBIAA/2DSDaANJQCxqpsl
+6iYELlgEgADtOjYJmBwAABvrdxzriwOqEdMP/UAARTAMBQBb/8RYxdP85CgV4AwFAFjKSx7rUg8C
+AA8CAP9gAEewDBUA6/sGfWgEgACxrZ8nnSYsJAFYxcf85CgV4AwFAFjKP44mLyIH+8GWDaANBQB6
+6QJ/uwHA0cjUxyXRDwAA7OtqGZgcAAAc61n71toF4AolAAo6NgOqEeuqCA5YBIAAW/+kWMWz/OQo
+FeAMBQBYyiwd6zKtvevbBn1gBIAAsaydJ/xAxhWgDiUALiQBWMWp/OQoFeAMBQBYyiGNJo4n+6GW
+DaAMBQB62QJ+uwHAwWXPhsCDKCQBL3CA0w9v9Af0f/uxUgCdAPpgaB2gC6UAW/8nZqNJwJQpJAH6
+YGgdoAulAFi7+x3q7u7rQh0WWgAA2UAf60QDPBGvz+vq0hfAEwAAm4DrIQIn0BMAACSmABrrPgsI
+QNMP6Kk5BfhAgAAY6yAPAgAPAgAImQJ9twga6zcPAgAKmQLyIAYVoIsZAPqAaB2gQgUACCo54hIA
+JewogAAoCoAIqgL71boFoIoxACYWAgimOQaZAuYSAiXoKIAAGuq9CpkCGuquqsqZoq3ILoa36Osj
+F9gTAAD5YAYVoAtVAPpAJh3gACoAAAM8EarKi6HxYAkO0gCdAMC6+kAmHe/5VQDpJAIskASAANEP
+8SATd5IAnQDA0vxAhB3gDHUA/EBmHaAKJQApIQIPAgAPAgB8lw0uIQN75wfA+A+qAiolBHuXDSgh
+A3yHB8GQCakCKSUEwLYrJAEqcIBvpAf0f/ExUgCdAOsgAynQBIAAW/7TZqHhwMcsJAHrIAMp0ASA
+AFi7p2egEvpARh2gDaUA7SQBLRAEgADRDwAtIQQb6vH4eAAVMBwFAPtAAEVw3SkADcQ5/IBoHaAb
+BQBb/yFYxTD85CgV4AwFAFjJqRzq5qy8e8sBsaqcJ/pAxhWgDYUALSQBWMUn/OQoFeAMBQBYyZ+N
+Ji4iB/1Blg3gDAUAetkCfrMBwMFkzX70QCYd4AIFANEPwCDRD3m3JRnq1I+r8eAHr5IAnQCIo3CH
+E5mk9UCmFa/yVQDRDyIgAgAiMtEPrcgogrf/H+n+IgCdAMLBi6PAkOQlAyWgZIAAwJEpJQP/YYAA
+UAkVAPxAZB2gKRUAebYHwKQKmQIpJQN6tgfA0g2dAi0lAy4hAsTw+oBoHaCOGQDo+jkHbCiAACkK
+gAmqAvvUvgWgyjEADKY52mBYUZYKbkD4gGgd4A2FAO7ZOQVgJIAAwfAPmQIoIQMqIQIJiAIIqQHo
+JQMk/XSAAMCx+kCEHeAKhQAqJAPxP/HWkAoVAPoEIh2gLBUA/ECEHa/4qgAAAAAA+kBGHaANpQDt
+JAEtEASAANEPj6aIp/H/+QQSAJ0AmaT1QKYVr/JVANEPAAAAAAAA8T/up1IAnQAqIQTAxfxAZh2g
+C0UAC6oC+kCEHa/3WgD6QEYdoA2lAO0kAS0QBIAA0Q8AAAAAAAD6QEYdoA6lAO4kAS0QBIAA0Q/A
++v5AJh3v6aUA6SQCLJAEgADRDwAAbBAIKCEYgyf0RFAVoAeFAPoAQh3gBQUA4zIOJBTpgAD8giBB
+UA2VAPAALA2g5AEAAAAAAADeUPnT2AXv/OUADO8B//gAF7COAQAPiAILTzbpiBEP/MKAAK+IqYgo
+gscvMEEa6lHm6hUUaF6AAGTx4f3gG6RiAJ0A9eAbDJIAnQD94BTkYgCdACiggA8CAG+ESCkwQP7T
+6BWgCDUA7Jz+LJDoAAAMizgsYqOuvgnuEQ7MCC7CBwu6Au7iDieZqYAA9eAbOZIAnQD14BQDEgCd
+ACo8QFv+fWAABgAqPEBb/nrA4erqOQ0wBIAA7aQAAxRRgAD4ACIdoA8FAA2POGTxsCkxJNMP8SAG
+19IAnQAqMGH1QAZ7EgCdAOYwYCUNYYAA9UANI5IAnQAL6jAc6eQswsuaFv1gVauiAJ0AHeobGunf
+LdIhK6bL+1lIFaAMBQBYyOIuMhovMhv/QY4NoA0FAHrpAnv7AcDR6hIGJorhgAAf6dcuMiUP7gLu
+NiUh0cEAAFv8Bin6khvpmANqEauqJaZE9UjGFeAIdQAoNGH4bEYd4AQiAAvqMBzpxSzCy/1gUtOi
+AJ0AHen8GunALdIhK6bL+1lIFaAMBQBYyMMf6gLvuwgN8ASAAH67AbGqKzYxKjYwGemdA0gRCYgI
+KIKNfo9PC+owGumxKqLL+2BO66IAnQAd6eka6a0t0iErpsv7WUgVoAwFAFjIsC4yMC8yMfvBlg2g
+DQUAeukCf7sBwNHAoPfyQh2v/lUA/c0AC3AAGgDAoWZg4C8gK3r5EtJg0Q8AKCArDwIADwIAZIGE
+wKDqJCslDdEAACUlHyUlHiU1IyU1JCU0QiU0QfRsJh3gAhUA0Q8AAAAA9UA0IRIAnQAa6dMpMiX0
+cgYd4As1ACs0YQqZASk2JceV5pQABPfBgAD//jwNoAoFACwgK2TB8PqgaB2v/nYAAG+o2xjpxQio
+CoiACoAAAAAqMSTAkvRDxB3gqgkACpc5JyUfKTEj/yHABxAKBQDEsPpDxB3gSgUAe5cILAqADKwC
+LCUe2kBYmFj0RAYd4AIVANEPAAAAAAD/93ANoAYFAPogRhWv/VUA/MAj/GIAnQAlNSMlNSQlNEIl
+NEH0bCYd7/v+ACrgQWShLS8KCf9ACTxiAJ0A9UAI/JIAnQAuFgH1QAijEgCdAP/1sA2v+lUAKDEk
+8x/rn9IAnQAc6TUDSxGsuyqygcLADKoCKraBC+owGelIKZLLnRX5YEK74gCdAB3pfxrpRC3SISum
+y/tZSBWgDAUAWMhGH+mJ77sIDfAEgAB+uwGxqo0VKzYx+mYGFa/0ZgAoICtljnrAINEPACkgK2We
+b2P/8SvgQci7wNl9sQf5f/uM0gCdACngYciZaJYH+T/7C9IAnQAowRhkjKacEPdAGrFSAJ0A8A1A
+DaCaAQAq4EEPAgAPAgDJoMCZeaEMaKkJnhH5X/lh0gCdAO4WASHRAQAAW/2dixErsEFkvITAyf1/
+4/wiAJ0A9X/jvJIAnQCOEbG9/cgmHe/xrgAAAAAAAAAA7hYBIdEBAABb/Y+NESvQQWS8TMD5/3/i
+PGIAnQD1f+H8kgCdALG4+agmHa/w1gAA0lDRDxrozQNpEaqZKZJG8T/vJtIAnQDAtis0Yf/3ZA2g
+CQUAHujFA20Rrt0v0kbx/+4kUgCdAMCT+GwmHeAIBQAoNisoNiopMTp1lw/xIB9lEgCdAP/x+A2v
++bUAKTIl0w/zIAZY0GnhAHSWQgvqMBro5yqiy/tgOBOiAJ0AHekeGujiLdIhK6bL+1lIFaAMBQBY
+x+UuMiovMivTD/vBjg2gDQUAeukCe/MBwNFk0IAqPHBb+w78ZKgV4QkFAOmpAQVcPIAAGukK0w8K
+3QItNiUf6RnAgQmJOe/dAQzxQoAADt0C7TYlJpEYgAAL6jAZ6McpksudE/lgNIviAJ0AHej+GujC
+LdIhK6bL+1lIFaAMBQBYx8WNE/9gaB2j64UAC+sIfrsBsaorNisqNioNxlBkbMLAxCw0YSowkMDe
+/UAOsuD29QAe6P0OrgqO4ArgAG5iB/AAGA2gpgEAwKAmNi4mNiwlNTolNh8lNIAlNIElNUElNUIl
+NIYlNUQlNUUlNIwd6PAe6O4vMiT6AcId4JoBAPtABAXwChUA+2YADT/IdQDr6MAd58KAAAj/AQyc
+Auw0vC1XwoAA+yYADL/4tQAI/wEa6OH8ZQgVr/jVAAj/Afh2hh3v+OUACP8BKTIlGOjbLzYkDswB
+JTSQLzIkDcwB+yAEBPC+BQCuPi42JwqZAR3onhrozAj/AS82JA3MAfuABAZwvYUArT0b6MQsNigt
+NiYLmQEKmQHpNiUh0cEAAFv8ah/oQANuEf/AAEdwDyUAL+ZEJeZGwNMt5kYL6jAc6G4swsv9YCiL
+ogCdAB3ophroap4ULdIhK6bL+1lIFaAMBQBYx2wf6LaNFO+7CA3wBIAAfrsBsaorNhv6Y0YVoAgV
+APhsJh2gADIAHugmA20Rrt0v0kbx/9pekgCdAMCC+GwmHa/12gApMGLxJwAMv+ziAMCQx84MnAH/
+mAAWMLkBAP1mAA2wDCUADKw26bsRDmTCgACsuxzoE6y7K7LH82ARTpIAnQAvMEFj+RAAAAAA2iD9
+0KgFoAsFAFjC4PogSBWv6g4AHeiPLDIjKzIk9m4AFa/MQQDtuwEOZoKAAOy7AgtQBIAA+mSGFe+7
+MQBb+mUqMiQKak9qqyLBsHq6LRvn//tAB/tiAJ0A+2APeaIAnQAsreBlynRgAeEAAPdAGeCSAJ0A
++V/S4RD29QApMij1QBmgkPb1AAeeEf3Q2gXs7g0Ase4ODkftnQEPdEKAAA7dAi02KC8yJ4/wGOfi
+A/8RqP8v8kEPD0dk8uUoMieIgBnn3QOIEamIKIJBCApH6DSPJQHRgAApCip5oC8qMiT4ZQgV4AwV
+APxx5h2vujEA9WAXyJIAnQAf6FIe58YtMiUPnwEvNigO3QItNiX6bgAVoAsFAFv6LygyJ4iAGefG
+A4gRqYgogkH4382OIgCdAMCV+HIGHe/m+gAc574DaxGsu/doxhXgClUA+mwmHa/mmgAAAAD5X8wm
+UPb1ACkyKPVAFRESAJ0AB54R/dBqBezuDQCw7g4OR+2dAQ90QoAADt0CLTYoLzInj/AY56oD/xGo
+/y/yQQ8PR8z4wIb4cgYdr+VOACkyJ4mQGueiA5kRqpn5KCgV4AsFAOk0jyHRwQAAW/oEKjIniqAb
+55oDqhGrqiqiQXpgCcC3+nIGHe/kWgAqMI9kqPTCyv1fx34iAJ0A+m4AFaALhQBb+fYtMieN0B7n
+jAPdEa7dLdJBDQ1HZdDu9nIGHe/jdgCeESXlIyXlJCXkQiXkQeXkYSdRAQAAW/w4ihD9z44FoAsF
+AFjCU/4gKBWv9sYAACY8cNpgW/ncCgtHzLjAwvxyBh2v4l4ALTInjdAe53MD3RGu3e3SQStQBIAA
+/HHmHeALBQBb+dUmCv8uMieO4B/nawPuEa/uLuJB/t/CLiIAnQDA8/5yBh3v4UoA9m4AFaAAmgAm
+PHDaYFv5wwoIR8yIwJz4cgYd7+DOAPrAaB2gCwUAW/nB2mBb+bsrCv/7f8AOIgCdAMDN/HIGHa/g
+OgD2bgAVoAIKAPZuABWgAVYA9m4AFaAAqgAtMieN0B7nSwPdEf+gAEawCwUA7dJBIbHBAADtNI8r
+UASAAFv5q9pgW/mlLgr/euAJwPn+cgYd797uACsyJPrAaB2vuzEAW/mj2mBb+ZwKDEfMzsDa/HIG
+He/eZgAAAAAAAAD6wGgdoAsFAFv5mdpgW/mTLgr/+9+7DiIAnQDA+/5yBh3v3boAJjxw2mBb+Ywo
+Cv96gELAkfhyBh3v3VoAwKT6cgYdr90yAAD7X7lgkgCdAGP/1A+cEfvPQAXszA0AscwMDEfrmwEO
+YkKAAAy7AvplBhXv8z4A2mBb+Xj6ceYdr9vmAAAAAAAA/c8oBeAOJQAOrgIuNiQNnQH8ZQYV7/Qu
+AA+fEf/PGgWs/w0AsP8PD0fungEP+kKAAA/uAv5lBhWv9YYAGec4KJLKsYj5OUYVr9huABrnNCmi
+yrGZ+VlGFe/VDgAc5zAqwsqxqvuZRhWv3oYAHecsLNLKscz9uUYVr9Z6AB/nKC3yyrHd/flGFe/r
+ngAf5yQu8sqx7v/5RhWv49oAGOcgL4LKsf//GUYV7+WeAGwQCCQiGBznbSMgB/yAkBXgClUA/oAI
+FaA7BQD+gLAV4TMBAFjE1ClABSgKcnmDCMAg0Q8AAAAAABznYY9ILUAE/oAIFaAIFQD/4AgV50UB
+AOMWACIr+QAA9Q0ACvAKVQD0ICYV4DsFAFjEw/pAaB2gC4UA7RwQKeAEgABbr5Du51EVAemAAI0g
+wPCfoQ7dAp2gHOdN6RIEKd8CgACsu+m2ACIWNQAAiif6ACId4AwFAPtEABWgDRUAW6UWwCDRD9og
+7OdCGtgEgABbr2LAINEPAAAAbBAIE+c+DwIADwIAJzKKJxYGJ3IS/c50BaAKVQD84Ggd4DsFAFjE
+n/bgDiCSAJ0Ajhb0AAId4AYFAP5HABXv9PUA7xYFJ3FBAAD+IIYVoAC6AACxuw0dFGXf99owW6ZL
+ii/pEgUhwIEAAJigmTiaOZgvsVX04AlEYgCdAIoW0w/qohEiWAUAAFus4RjmxBPnGyiCkyMyhKqI
+7OcaHEZCgACoMy8wBeoyCi0gBIAAjjCIPIqgmhCJMvggJhXgOwUA6SIAKmgEgAD4IEYV4IgBAPgg
+ZhWgClUAWMRyjzouMAVy+VQpCpZ54U4qCpd64UgrCpp74UIsCpns4WZzMAUAAC0KmH3hWy8Km3/h
+YI0yZN9OGOb9/R/6RmIAnQBk0HjAsG0IEC76AH3gIw2NFOTfKmXYIQAAY//o/GAIFeAKVQD9zeYF
+oDsFAFjEVmP/I8eQ/T/4DmIAnQC0u//73A2k3R0AGubr+mFmFa/+jgCLPH+3mYoUKzISW0MGLDEr
+KjYT7eblFmANAAD8YWYV4cwNAPxlRB2v/eIA//r8DaALBQCIFY8uwKX9zbgFoA0VAPnvAA+wDgUA
+/6IAD3A7BQDtIgIreASAAFjEN8tmGebUiiJ5oAQKK1PJtCsgB/pAaB2huwEA67wYKWAEgABbrTTR
+D/xHABWgBgUA/CCmFa/+kgAAAADApf3NjAWgOwUA/EAIFeAORQBYxCP6QggVoAtFAFgdmNEPAAAA
+bBBIG+aKGuZbK7B9KKKbKaKjIxaF5RaALEZCgADpiAgF/ESAAC4KgK6O/jDGFaAAMgAvKoCvjy8W
+hogniI4ropYigoWrIgkiEaKS9oAJWJIAnQDl5qoQ+QEAAO8WhCCYgQAAIxaC5RaBJDALAAD2MGYV
+occFAPXNRAXgBgUA881CBeABSgAAAAAAKRKEbaoFCACGCQJhp2b2ISYV7kgFAKhEjieNIv3NMAWg
+ClUA/8KCFaA7BQBYw/HqJAAI2ASAAPwEAh2gDSUAW6Ct9oAFUJIAnQCKJyqsIFuf9ysSgdgQ/DDI
+FeDvFQD6AAgd4CkFAG2aAggCYY4gkxCVEi8UGP3AABcwLwUAD+4CnhEu0Act0SsODkEA7hEO3QIe
+5gwrEoIoEoMO3QKdFAzqMJwVJxUPCCCGCwJjCACGKBKFCwJhCGgI9P/6EyAaxQApEoAb5jDTD+oS
+CCSAUYAAC6oCKhYIKhKE7EQADFgEgABYvgGUGf/8sA2gBAUAwCDRDwAAbBAEijcFQgj7QcgVoAsF
+ACskACVAAPNgaB3gPKUA/KAJFCApxQBkUTJtCBCxM6Q1J1AA7HEKesAEgADIcmP/6AAnUAErVAD4
+5QYN4AMFAMpw9QBoHeADBQBtCBEnUAKxM+lxDnKoBQAAyHZvNQRj/+cAAKg868QBIYKBgAD4DAId
+4AcFAPUAaB3gfKUA+gciHeAo9QBtOi0jUAFziwpzswfyegAV4ABaAHObC3PDCPJ1IBXgACIAACM8
+yQd3CuN3CQKoBQAAYAABwHD8AAId4AwFAPAAZA2gK+UALpAAsZgOiTnsXAIMoASAALHdaNQ3I0AA
+5D/0bmYCgAD6Z2YN4AgFAMBQbQgaBVUK41UJBEAFAACkiSOQAOQ/v2KrQQAAezG3Y//eAADsppIl
+MAsAAPbERB3gAgUA0Q/ZQP/+bA2gBQUAJUABK0QA+KRGDeADBQDJWviAaB2v++YAJUABK0QADwIA
++KDmDeADBQBlX+P4gGgdr/v+AGwQBBvmBAs7CyOwgNog67IhKeAEgABYvZkb5f8Y5gANRBGrS6hE
+JECA8mAARTA81QDspAAlUAUAAOuywSpgBIAAWL2OpDzzgABHMA0FAO3kAiYQCQAA0Q9sEASGIPpg
+BADQBBUAAEMadjAEwCDRDwAGMwLjJgApkASAANEPAAAAbBAWgjcY5d8c5eaCLugABQCogQAA9ACo
+HeOEBQD0QABCMoMFAKMlL1D+LlD9LVD8KFD/mBArQACbESpAAZoSKUACKRYD+IBwFaA7BQD4IIYV
+oApVAFjDKxzl0y9ABi5ABS1ABChAB5gQK0AImxEqQAmaEilACpkT+IFwFaA7BQD4IIYVoApVAFjD
+HilQ2CkUNORQ2iDQ4QAAW0QdKhw4+iaAFeAMFQBbQ8gpSoCpKSqQXvFBcA3gDAUAbQgMKpBfsczk
+oAdkyAUAAGP/7CtK3usrCADQ4QAAW0O7/IBoHaNbtQDrKwgA0OEAAFtDt+ocOCDYgQAAW0NnwLD6
+JAAVoBwFANMPbcoTLaAAoryjzCzA/LG77NkIdVAFAADAINEP/YDWDe/69QDAoWSv7sCi/cs8BaA7
+BQBYwvPAIdEPAABsEAYoIADDkHmJLCsgAR/ll/vLLgWgXIUA/WAJbCIAnQAtCnj9YAkUYgCdAC4K
+Qn6xCigKYnixBMYq0Q8ALCAC84aADeAHBQDyIEYV4D7VAP+AFqQiAJ0A28Dz6BAV4AYFAPnLCAXg
+BQUA+CAmFeAEBQALDUf8ZUYN4AsFAOrlfh/gBIAAbQgXKKCAsbvkgJ1lUAUAACnAQe2RB3ZgBQAA
+Y//hiRGpufEoMA3tTQUAGuVwCpkMrZlmkHPqVREDMAUAAOWVAgsguAAAiBL0gGAVoAYFAPUARh3v
+pYEA+wAGHaiVHQDphAEkQA0AAPggRhWgBQUAsXeieiygAuvEAAYA4YAA/5/7XSIAnQDIzH65HSug
+A+W/9mVQBQAAZGGP9MAQ8RIAnQD0wBFBkgCdAMZK+gCiHaA7BQDs5VEaaASAAFjCoNJA0Q8AAAAr
+IALn5UwZqASAAPxAQBXtbAUA8WKQDeAJBQBtCAwuIAOxmeTgCGEQBQAAY//sAAkLQAsIBgm4O/UA
+CaCSAJ0AwCAr0ABksEXj8CAuoASAAPIgBhWgBgUACw5H880GDeALBQDs9AAL0ASAAG0IFyiggLG7
+5IAVZVAFAAApwCHukSF2YAUAAGP/4QAAAMYq+gCiHaA7BQDs5SkZaASAAFjCdtEPHOUg/WAARj1q
+BQB6wdpmv9cqQAFkr9Fquxj7f0AV4ABWAAAAHuUXKNpgeOG7KkABZK+19WBoHafqAQDzycYN4AsF
+AOz0AAvQBIAA0w9tCBcpoICxu+SfkGVQBQAAKMAh7oEHdmAFAABj/98Z5Qb5YABE/WoFAPs/+3wi
+AJ0AZr9narsW+39AFeAATgAAGuT9LNpg/V/6lCIAnQClaOYSACp3AoAADr4C7oQAIRAFAAAGJgwN
+ZAkrQABlvvhj/yvAQMaK9QIACj/58gAAACTQACnwIPUohg2gDgUA63QAD5AEgAAosIBkjv8pICHu
+7AEl2AUAAOSZ63EQBQAAquv9f/c8IgCdAObu32boBQAAausT+99AFeAASgAAAP1f9lQiAJ0Asd3b
+4Os0ACGoBQAA//mwDaACFQAAAAAA68QACVAEgAD2AAIdoAUFAP/3RA2gBAUAjRL0gCAVpMUdAP2g
+Bh2v/YIAjxL0gEAVqoUdAPngBh2i5R0A/+AmHa/9GgBsEAgjIhgvMAX+YAgVoHQlAH9Ld/oAoh2g
+OwUA7OTAGegEgABYwgwvMAUoCnP14oYNoAIFAPngB1wgeVUA+eAH3GIAnQDApf3JbAWgOwUA7jIA
+KegEgABYwgDKLIM40w8lMhgc5I4iMAf8oJAV4ApVAP6gCBWgOwUA/qCwFeEiAQBYwfUoUAV4QzzR
+D/xACBXgClUA/clIBaA7BQBYwe4vMAX1/IYNoHkFAHnx3PphCBWgCwUA/AACHaANJQBbkB/RDwAA
+AAAAHOR2j1gtUASOUP/gCBXgClUA8iAGFaAIBQD4ICYVoDsFAFjB2/pgaB2gC4UA7RwQKWAEgABb
+rKju5GkVAomAAI0wwMCcoQ7dAp2gG+Rl6BIEKU8CgACrmZiQ0Q8AgjgvCnQvNAX+QKYd4AIVAP5g
+sBXv/DYAiTgoCncoNAX5IKYdoAIVAP5gsBXv+9YA2jD9yKoFoAsFAFusddEPAGwQDiggBSkKlfkA
+C7RgBAUA/cjYBaAKVQD8YkgV4DsFAFjBtCkyEvwAIh3hhgUA/yKACtGp8QD1QAsokbnhAPVgCuiS
+AJ0AhSeFXqZWJGSRjjAuVoctZJIsIHL1gAeYkgCdABjkEBrj4YstGeRXLSIS/EKmFe+cJQAsJAX5
+MGgV7/zVAAy7AZstKqKbKIB99NImHaCOBQDsIgAtVkKAAPsgAESyjwUA+8iSBaANRQDqFgokfDSA
+AP8gAESwAB4AAK+ZHuQtH+QtnxTuFgYuZgKAAA3MApwVK5AHKZErCwtBALsRC5kCCpkCmRgI6jCU
+G+gWCSLICwAA6WYAANDBAAAKDIoJQIgKCIoJIIgKBIoJAIgKAIrrHBApUASAAPwAgh2gDSUAW540
+HOQqLSAFLiISLyITKiIUmhCJL5kR+E5QFaA7BQD4IEYVoApVAFjBadEPK1KQZL8KHuPjHON0HeQd
+7rsoCdAEgABbPVQY5BsvMhII/wLvNhIp0ASAAFs9M2P+39ogWz0tiS30RuQdr/rlAAqZAfhBphXv
++eIAAAAA+mBoHaALBQD8AAIdoA0lAFtAFNEPAAAAbBAKkhiVGfaAC1iSAJ0A8gACHaAGBQDwAPQN
+oDfVAAD3YAl0YgCdAMDQJmzq9ILAFa/rpQD8AAIdoA4FAIoYjxkLawyrO68vW0JJoqJmISf2gAkg
+kgCdAKNvK/AAZL+/92AHdGIAnQBqQbzb8P6AAELwDQUAbQgaLrABsdrtpAAF4AUAAOvEAAcAeYAA
+d+EKdcoEY//eAAB36Y4owAHAsOvEACVwBQAA5IOeZmAFAAD1wBtxogCdAMDgbQgTse6t66+5KZAB
+5JAMZdAFAAB0qgZj/+UAALG6BKkMCbo476gIBUgFAAD3IABDMAsFACuEAOlEDAzYBIAA99/6AZIA
+nQBk4oMvwABk8n0V47ElUtuZEOpQACcN44AAf6lw9CAmFeALBQBtCCbr6QwF2AUAAPUgEqCSAJ0A
+9yAS6RIAnQCKEay1JVAAqroqoAB1qUBj/9Io8AH94CAVoAkFAOn0ACQXuYAA9oATeRIAnQD//RwN
+oA0FAADAIPoAoh2gOwUA7OOpGWgEgABYwOzRDwDV8IsQnxd6UxH1QhYN4A8VAPAAIA2gDwUAAADH
+/2Tx2RXjiCVS18Dw6lAAJwzjgACIF5UWeKksbQgm7+kMB/gFAAD1IA2gkgCdAPcgDnESAJ0Aihas
+9SVQAKr6KqAAelkEY//ShRd6UxH1QhYN4A8VAPAAIA2gDwUAAADH/2TxeRXjcCVSncDw6lAAJwzj
+gACIF5UVeKksbQgm7+kMB/gFAAD1IAqgkgCdAPcgC+kSAJ0AihWs9SVQAKr6KqAAelkEY//ShRd6
+UxH1QhYN4A8VAPAAIA2gDwUAAADH/2TxGRXjWCVShcDw6lAAJwzjgACIF5UUeKksbQgm7+kMB/gF
+AAD1IAegkgCdAPcgCWESAJ0AihSs9SVQAKr6KqAAelkEY//ShRd6UxH1QhYN4A8VAPAAIA2gDwUA
+AADH/2TwuRXjQCVStcDw6lAAJwzjgACIF5UTeKksbQgm7+kMB/gFAAD1IASgkgCdAPcgCEESAJ0A
+ihOs9SVQAKr6KqAAelkEY//ShRd6UxH1QhYN4A8VAPAAIA2gDwUAAADH/2TwWRXjKCVSn8Dw6lAA
+JwzTgACIF5USeKkobQghD+kM6JE5Z/gFAAD3IAXhEgCdAIoSrPUlUACq+iqgAHpZBWP/1wCFF3pT
+D/VB1g3gDxUA8AAYDaAPBQDH/2X8tMCl/cZOBaA7BQBYwGrHL9EPihGstSVQAKq6+0AQFa/3qgCK
+Fqz1JVAAqvoqoABj/jqKFaz1JVAAqvoqoABj/ouKFKz1JVAAqvoqoABj/twA9IAEYJIAnQDAkcDg
+/yAARHANBQDthAAk2AUAAPdgAEMwDQUA+o8ACn/w9gCKE6z1JVAAqvoqoABj/wCKEqz1JVAAqvoq
+oABj/00E6wwLrjjZ4P8gAERwDgUA7oQAJNgFAAD3YABDMA4FAPqPAAp/794ABOsMC644+cBoHe//
+WgBoQRT//gwNoAkVAAAAAAAA//3YDaAJBQD//bgNoAkFAGwQHBni7C0wByswBSgwBCQiEC4gByww
+BupCByxGAoAA+wYADHHuAQDuFiosRgKAAAyIAiqiDuoWLSxGAoAADYgC+QAEBHALBQD4JYYVogwF
+AFi6Zhzi2SYwAfxCSBXgClUA+GSQFaA7BQD4JSYVoXYBAPYlZhXhVhEA9ucAA7BmMQBYwBAa4rHt
+4rAa8ASAAPvFhgXgTHUA8NsADeAPBQBkcNLAov3FigWgOwUAWMAFG+K7HeKlGuKl/AjiHaAPBQAZ
+4j4e4rUY4mspkpsu4oMogH0JmRH5wABHcIkFAOnpCAR8HIAAYAAEKSqAqekuEi0oGoCo6CyEkYhA
+LRYaKxYeKhYY/QAAFDAKRQAKiAIoFhkqkAcpkSsKCkEAqhEKmQILmQIpFhwI6jAoFh0vFh/p7QIg
+0f0AAOlmAAVQBQAACgyKCUCICgiKCSCICgSKCQCICgCK6xxgKlAEgAD8AIIdoA0lAFucmNogW/3A
+wCDRDwAAAAAA3lD93/osIgCdAC0iEuzijx98woAA0w//pgAO8ApVAPxCRhXgOwUAWL/JKBIsy4zr
+PDApUASAAO0SLSxgBIAAW/5056ApbUgEgADAov3FAAWgOwUAWL++G+JzHeJe+8S8BaBMdQD/+4gN
+oA8FAMCQLxIpKRYo8fsQDe+LdQDtIgAnjeUAABzic/pMhh3gCiUA/oAIFaA7BQBYv63tZAAL8ASA
+AOzibBr4BIAA+CVoFeAKJQD4IAYV4DsFAFi/pBviWh3iRPvEiAWgTHUA//nsDaAPBQAAAGR/JmRR
+hvi/+RDSAJ0ALhIrZO5g9d/y6JIAnQD+JWgVr/wyAP3EsAWgAxUA+kyGHeAKJQD+gAgVoDsFAFi/
+jvKCZhXgCQUAKUYRKUYWIyIY+IJGFe+aVQAqRAUvMAUuMgD4goYV4HQlAP6ACXriAJ0A+gCiHaA7
+BQDs4jAZ6ASAAFi/fS8wBXTxFSsKc/vgDtxiAJ0ALAp1/eAPRCIAnQDAIMCl/cROBaA7BQDuMgAp
+6ASAAFi/cGQgzoU40w/TDyJSGBzh/iNQB/xAkBXgClUA/kAIFaA7BQD+QLAV4TMBAFi/ZSggBfiA
+BPKiAJ0AHOH0jyiOIC0gBP/gCBXgClUA8iAGFeAJBQD4ICYV4DsFAFi/WfqgaB2gC4UA7RwQKeAE
+gABbqiZko2kc4eaLUMDQnaEMuwKboBnh5OISBCnHAoAAqYjzAAYVoAIFANEPAAAAAAD6QGgdoAsF
+AFuc7SkiEgnbQW+yay8SKCgSLflAhhWgjgUADp4CL6UKH+IDn6IuJhKJImSSj8Ag0Q8uEitl7ohj
+/N4AAAAAAAD8QAgV4ApVAP3D0AWgOwUAWL8yLzAFdPHTKApwePHN+mEIFaALBQD8AAIdoA0lAFuN
+ZMAg0Q8AAPl/72nSAJ0AK/qLKyRkKTAcKzAdLEIT7TAeLM4CgAALmQLrMB8szgKAAA2ZAgiZEQuZ
+AnyZBLHNLUYTLkByLzAgLDAhKTAO6DAiL/4CgAAM/wLrMA8v/gKAAAj/AugwIyzOAoAAC5kC6UYR
+L/4CgAAI/wLvRhQvAo4AAMfPnKQoIhIb4c37QEYV4IkFAAmIAvhCRhWv/HIAjjgtCnQtNAX9wKYd
+4AIVAP5gsBXv+IoAgjgvCncvNAX+QKYd4AIVAP5gsBXv+CoAHOG9/IAIFeAKVQD+QAgVoDsFAFi+
+8oon+gCCHeAMBQD7RAAVoA1FAFufUytABSwKlf1gDHQiAJ0A/cM4BaAKVQD8QkgV4DsFAFi+5Cki
+EnueFQntUfWgDDiSAJ0ACc5R9cAL4JIAnQCDR4M+JRqA9GAAQvAKBQAqVJGJIPhw5hXgCBUAKFSS
+L0By9eAIIJIAnQCITR7hh/iCSBXvnyUAL0QFKUYVH+EL/9BoFa/51QAJiAGYTRjhNS/ymyiAfQn/
+Ee/uCAR8PIAAKQqA+cAARPAAJgApKoCp6RjhYR3hdvvCwgXgCgUAKlSRj0CbGJ0emBr94AAXsAhF
+AAj/Ap8ZLpAHLJErDg5BAO4RDswCDcwCnBwL6jDrFg0hyAsAAOoWDyDRAQAACeCIChyKCcCIChiK
+CaCIChSKCYCIChCK6xwgKlAEgAD8AIIdoA0lAFubZBzhWS9CEy5CEi1ABSpCFJoQiU+ZEfiOUBWg
+OwUA+CBGFaAKVQBYvpnAINEPKxIq2iDrvBgpYASAAFunmsAg0Q8AKzKQZL75HuENHOCeHeFH7rso
+CVAEgABbOn4Y4UUvIhII/wLvJhIpUASAAFs6XWP+ztpAWzpXiU3AsPqG5B3v+uUACpkB+IGmFe/5
+egAA+kBoHaALBQD8AAIdoA0lAFs9PsAg0Q8A2lD9whoFoAsFAFupLcAg0Q8AAAAAAAAAbBAMH+Eu
+jjQY4N0c4K6NNiiAfSvCo/uTaBWr3QEAnRz/wAQHcIkFAO4WCS1WQoAA66oIBHw4gACprfwhRhXg
+AC4ALiqArq6eGoY5hRwkwpSHOJcYpUTnMQ8qJkKAAKS09IEoFeAPBQAvJg4vJg8vJhAvJhEvJhIv
+JhMvJhQvJhUvJhYvJhcvJhgvJhkvJhovJhtbkrQc4RSNIP1ABhXgOwUA7iISLUAEgAD4QOYVoApV
+AFi+RokYKyAHHeEMjhr8oPAVoA8FAC8lGy8kIi7hB/6hkBXhzAEA/YAARnD9tQANuwEvJAwswIAv
+UA0uJQcvJA3v4P8eZ4KAAAy7AvpA5h3g/MUADLsB+qDwFaAedQAuJASZKykmCSkmFSYmDPZChhWh
+qgEAC6oCG+DT9kJmFaANhQAtJAUsso4d4O4qJAd8+wgMaAwPiAgoJhQu0n0ospAv0oDuiAgPggqA
+APkf4BWg7k0A+cAEBzAPJQD5sEgVoO6dAA/uNx/g4PnBAA8zx2EA/4AAhnD/9QAP7jYuJCMswcIs
+zNj+IWYVr8wBAOwlGiPgNIAALMz0DAxPLCUa+qLQFeCOBQDl4NEWcDOAAP5DRB2gjAUAKyQWKNJ9
+CFU2f7EOCgpBW2AyLCEaClU2DFU3DFgsCMgc6CUbKVAEgABbnJaFGBzgwo0nLiAELyAFihuaEPhB
+SBXgOwUA+CAmFeAKVQBYve0c4LuNHI4ZJCYY4kYIIVDhAACaLvpB5hWgeTUAKUQFKSQFjzSWEJUR
+KEAFlxP4IEYVoDsFAPhACBWgClUA+CCGFaf/wQBYvdv9wVQFoApVAPyB6BXgOwUAWL3WiifAsPtE
+ABWgDBUAW6JAjEwb4KLrpgAmAHmAAOtCDylQBIAAC8AAwCDRDwAAbBAEiCopIDX/AcABEAZFAPcm
+AA0wACIAAADakMOw/cEoBadaAQD8oGgd4ApVAFi9vxzgkBvgkSkgDf5BkBWgCAUA+GBEHaAvpQAv
+NQPtIRkvdgKAAO6ZAgrUAoAACpkC+yYADPAKVQD4YAYV4DsFAFi9rokqKiEZ6+AkFIQwgAAEqhEL
+qgKaMuo8FiEQ2QAA+kBoHeAMZQBYt+IuQA0vQA8oQBErQBAtQA4sQAwIuwIP3QIOzAINzAIMuwLl
+sBhh0EEAAPvA3AXgDGUAWLfVYAAQAAAAAAAA+oGAFeAMZQBYt9Aa35gf4Gb2ZGYdoAxlACw0IolA
+iEL+Y6Yd4A6FAP5jhh2gDRUALTQf+mQmHaALBQArNB7oNC8pWASAAPhkph3oiB0A+GXGHaiZHQD4
+ZIYd6IgdAPhlph2gCYUA+GQGHeiIHQDoNCwh0JkAAFi3tS1AEy5AFS9AFypAFixAFCtAEg+qAg7M
+Ag27Agy7AguqAsisKjww+oJAFeAMZQBYt6mCQfJnJh2oIh0A8mcGHagiHQDyZuYdqCIdAPJmxh2g
+AgUA0Q8AAGwQBhzgNvxiRBXgClUA/kHoFaA7BQBYvVsqMRLn4DEZIASAAPtgAAUwDAUA6+AuFRSr
+gAB6siKJL2SSQy2RGQ0NS+rdDA4gBIAADZQ4zEnUIPABrA2gEmUAAI06hUcmcpf49QgV4IoFAOVS
+DiaBAYAAKHJWCWYRqWZtiRCLZ4u+K7K//WAHJGIAnQCqZiJSwtMP0w/rUsAhCRGAABzgEy1Svy5S
+wP64yBXgClUA8iAGFaA7BQBYvTP8AAIdoBIFABvfby1ADCuymypyqK277uAHHd5CgACrqi2hK/+g
+BEwiuwUAjUcY38kV392N3h7fxR/fxqvb7gAFDcgEgAAJAmEJAmEJAmEJAmGJQCXWsv+1xhXgDkUA
+6NasLM4CgAAOmQIp1q0ooAcvoSsICEEAiBEI/wIF/wIv1rAO6jAs1rP/tiYVotkFAKnZAyCGCQJj
+AwCGCQJh+aBAJeAMRQDzPMYdoA0lAFuZyNEPABzf4S5gNY9gnRH6IAYV4ApVAP3gaB3gOwUAWLz/
+/tAQDeAMBQD03/fMIgCdAI0g/sawFaAKVQD9v6gFoDsFAFi89sDA8gxiHa/8NgAAAACKOmSgrIo7
+LVLGerECKlbAijwvUr960QIqVsaOOv/ABOxiAJ0AKiog+qAARTAGFQDmVqgpyASAAAkghgoCYwkA
+hgoCYQnghgoCbwnAhgoCbQmghgoCawmAhgoCaQlghgoCZwlAhgoCZRvfVBze5e3ftBpQBIAAWzjG
+2kBbOKkc37GCUPJhSBXgCyUAK1ao+kBoHaA7pQBbQbbIrpao80EmFeANBQCdqowiysHAINEPAAAA
+LFa/LFbALFbGLFa9//kQDaACBQD1gGgdr/cmACsgB/pAaB2huwEA67wYKWAEgABbpcDAINEPAABs
+EAgc35YtIgD+QJAVoApVAP5isBXgOwUAWLyxF99TFt9RFd9lGt9j+EaQFaAMBQD1vwwFor8FAPtQ
+ABXijQUA9QAFCxBuRQApIAwospsqooOpiAmIEaiqKKEr9QAONCIAnQCEJ4ROGN8+r0voAAUNyASA
+APgAqB3gCEUACQJhCQJhCQJhjyAlRrInRqzmRq4v/gKAAAj/Ai9GrSmgByihKwkJQQCZEQmIAgWI
+AihGsA/qMCxGs/6WJhXi2QUAqUkDIIYJAmMDAIYJAmH8gABEcAxFAP8Mxh2gDSUAW5lBwCDRDwAA
+KTAVHt9W9SATKJIAnQCZFPUgCYOSAJ0AjhTAmfnAExRgCLUA+cAKTCIAnQD9vqYFoApVAPxACBXg
+OwUAWLxvG96t+75GBaAMBQD8UAId4r8FAP/8NA2gHmUAwZaZExvepSwgDBrfGiuymyqig6y7CbsR
+q6oroSsc3wH1YAScIgCdAI0njd4rKrCr2+wABQ3IBIAACQJhCQJhCQJhCQJhjCAl1rL3tcYVoA5F
+AOfWrC5mAoAADswCLNatKaAHKKErCQlBAJkRCYgCBYgC6NawKcgEgAAP6jD/tiYV4twFAP2gAEYw
+DgUALtazCWCGDAJnCUCGDAJl/iBoFaKPBQD/oABH8AxFAP/sxh2gDSUAW5j8jhOeFf2+NAWgClUA
+/EAIFeA7BQBYvDUb3nKOFRre6PxQAh3gDAUA/8J8DeK/BQDAINEPKjESCgpL91/4YRIAnQD73/gj
+IgCdAIsv6xYALZB+AADAwvwgZhWv+9IAAAAAHN8E/GJEFeAKVQD+QegVoDsFAFi8HSsxEgsLS+qy
+IGlQBIAAHN7xe8IViS9kkjYtkRkNDUv7rwAO8AoFAA2aOGShso6nju4r7BDrFgEpyASAAJoSCWCG
+CwJnCUCGCwJlCSCGCwJjCQCGCwJhCeCGCwJvCcCGCwJtCaCGCwJrCYCGCwJp+iBIFaAIFQAo5iUv
+IDssIDqLoMCQ6eYmL/oCgAD5gAAWN9tBAO/MAg7uAoAADcwC/b2wBee7AQAMuwIr5icc3gAb3m1b
+N+KKEv29pgWiW+UAW0DXzKb/+xANoA7FAIkRmaiKEls3vooSi6JksXv/+rANoA4FAAAAAADqJAAJ
+2ASAAFv+f/9AaB2v+lYAHN7D/EAIFeAKVQD+YmQVoDsFAFi72YkvKjET6iUYJIA5gAAqlRgb3hIs
+IAwa3ogrspsqooOsuwm7EauqLKEr9YAE1CIAnQAtIgct0g4c3msrKrAL2wjsAAUNyASAAAkCYQkC
+YQkCYQkCYSwiACXWsve1xhWgDkUA59asLmYCgAAOzAIs1q0poAcooSsJCUEAmREJiAIFiALo1rAp
+yASAAA/qMP+2JhXgDgUA/7ZmFaLcBQAM3AgJoIYMAmsJgIYMAmn+UAId4AxFAP+gAEfwDgUA/+zG
+HaANJQBbmGj/9sANoA4FAP/2oA2gHmUAKiEYLiANLSA1LCAWKCAHLyAMIrYQ6yEWLcgEgAAvlAwu
+lA0tlDUqlRjrlRYk0NkAAOyUFiFY2QAA+SDmHaAMZQBYtdCNEB7d04wq+GJEFaAPBQCfEw7MAijV
+Gf2hRhWv8kIAAAAAAAD/91gNoAoFACugBwsLQeu8GC1gBIAAW6SJY/5vbBAGgyeDPhzeZo0g/nUI
+FaAKVQD+dSgV4DsFAFi7eiwyqPOC4A3iLgUA9YARMJAEBQAa3ioV3k4W3ir3vCgF4r8FAO3eExYU
+VQAAaMNVJDap5DaoKhAEgADRDwArMqkc3kj1YAdzUgCdAOIyACXQBQAA+nUmFaAJJQD4dQYV4Dul
+AOMykilQBIAAW0BJyK+UqvNBJhXgDBUAnKiLImSx18Ag0Q8sIAwronsqooOsuwm7EauqKKEr9QAE
+XGIAnQCMJ4zOGN3xr8voAAUNyASAAPgAqB3gBUUACQJhCQJhCQJhiCAmxrItxqznxq4sRgKAAAWI
+AijGrS+gBymhKw8PQQD/EQ+ZAgaZAinGsAjqMCTGsyjGsf5gAESy3wUAr88JIIYPAmMJAIYPAmH4
+DEId4o0FAP2AAEZwDSUA+YzGHeAMRQBbl/IkNqn0dQYVoGIlANEPANogWzb+HN4JKDKULjKSijAp
+MpMpNsCaEZ4QLja/+HjGFaL/BQCvP/53phXgO6UAW0ALyaOLEfwgCBXgDBUAnKidqp2pi7JksPQb
+3VgsIAwa3c4rspsqooOsuwm7EauqLqErwMT1wARMYrsFAI0njd4e3bEY3bKr2+4ABQ3IBIAACQJh
+CQJhCQJhCQJhjyAm1rIn1q7o1qwv/gKAAAz/Ai/WrS6gBymhKw4OQQDuEQ6ZAgaZAinWsAjqMCTW
+s/m2JhWi3wUA/6AAR/IpBQCpOQlghg8CZwlAhg8CZSkqgPmgAETwDEUA9SzGHaANJQBbl7IkNqn0
+dQYVoAIFANEPAAD9u6gFoApVAPxACBXiLgUA/mAARzA7BQBYuubaIFs2t8Ag0Q8rIAf6QGgdobsB
+AOu8GClgBIAAW6PlwCDRD4wRK8AHCwtB67wYLlAEgABbo99j/vRsEAgc3b8X3RQoMAiYFegyAClo
+BIAAjtApcpL29GgV44gBAJgUqYjv0AQsRkKAAKh35HIKKhAEgACTEPIgJhWgClUA9CBGFeA7BQBY
+usUc3a3+4AgVoApVAP7gkBXgOwUA5BYAK+gEgABYur3p3acZwASAANMPbSkFCACGCQJhHN2jGd2j
+LTAJ/mFQFaAKVQD1IqYV4DsFAFi6sSowCY56691DFQBRgAAL7gIudgqMMPwgqBXgAgUA+bpCBaAb
+BQD/gUACkAplAGjRNWjSX3TpFib6jXYhDNpQ6zQACWAEgABYuXDAINEP3UD6AKIdoDsFAOzdiBl4
+BIAAWLqZY//QAClwNOwSBCS1kQAAwKAqdDTo6wIL0ASAAOt2CinYBIAAWJuljnrzQGgdr/6SAI1w
+CN0RnTMscDRpxpJz5o8f3Q6MFCp0NA/uAevMAgvQBIAA7nYKKdgEgABYm5eOevNAaB2v/bIAAAAA
+AAAA89/68NIAnQCMFCp0NPuGAA5//lIAAAAAbBAGEty0HN1jKCKShTHyVGgVo5QBAKmI/QgAFDAK
+VQD4QABBMDsFAP5GsBWnVUEA/kaQFeBVTQDkFgAq6ASAAFi6Zshd2iDrNAAKYASAAFibedEPKCA0
+sYj4RoYdr/+iAAAAAGwQBoMngz4c3UuNIP5kqBWgClUA/mTIFeA7BQBYulYoMiUX3PYW3Ijl3S4U
+GUGAACgyJfUAE2kQBAUAKDIl9QAV+hIAnQApMiX1IAgakgCdACsyJrG7+mTGFeBqNQB7q0r9umoF
+oApVAPxACBXgOwUAWLpBGtz2G9x+HNyrjickNiUkNiYswH0rspsqooMvKoDu4g4t3kKAAOuqCAZ8
+YIAALAqA/UAARTAAPgCNImTSh8Ag0Q+vqiuhKxnc0fV+Bg3v7BUAiKAs5Ngn5jIp5jD9AAAUMBll
+AAmIAijmMS+gBw8PQQD/EQ+/Agb/Ai/mNA3qMP3GphXhLAUA/c3kHaDrBQD7wABF8GjlAOjk9iHI
+QQAACSCGCwJjCQCGCwJh+GHIFeDLBQCr6ynmQIg/KOZBJOZC/mIIFeAcZQD/yGYV4A0lAFuWzcAg
+0Q8AAAAAABzc+/xACBXgClUA7yA1IfBBAAD+IAYVoDsFAFi6Axzc9PxACBXgClUA/mVIFaA7BQBY
+uf0b3Dsa3LEsMiotMi0uMiuPJyQ2JiQ2JZ4/LjbALTYQLTbGnD4sNr8c3F8qooMrspsswH3v8g4t
+3kKAAOuqCAZ8RIAAKAqA+UAARTAALgAAACkqgKmqK6ErHNyJiRD1b4YN7+0VAIigLfTYJ/YyLPYw
+/QAAFDAcZQAMiAIo9jEuoAcODkEA7hEOvgIG7gIu9jQN6jAk9Pb95qYV4OsFAPvgAEXxLAUALPVv
+CWCGCwJnCUCGCwJl+GHIFeDLBQCr+yn2QIg/JPZCKPZB/mIIFaAcZQD/6GYVoA0lAFuWh4Iw/blG
+BaA7pQDjMr8pUASAAFs+q2SuN5Oq80EmFeANFQCdqIwiZc4mKyAH+kBoHaG7AQDrvBgpYASAAFui
+vMAg0Q/Apf25TgWgOwUAWLmyHNyl/EAIFeAKVQDvIDUh8EEAAP4gBhWgOwUAWLmq2iD9uRoFolvl
+AFs+kfwAIh2gCQUA6sk4BQBBgACNEJ2o/gAiHeAOBQAJ/jhl7VJj/a8c3JL8QAgV4ApVAO8gNSHw
+QQAA/iAGFaA7BQBYuZbaIP25FgWiW+UAWz59ZK2BiBD5QQYVr/RyACsgB/pAaB2huwEA67wYKWAE
+gABbopDAINEPANogWzVawCDRDwAAAGwQBogq9IAIFaXZxQApFQDpIDUkEDiAAMCk+yYADTAAGgDa
+kMOw/bjmBadaAQD8oGgd4ApVAFi5eBzcbx/cSi4gDfhBkBXiSuUA+mBkHaALBQArNQLtIRkszgKA
+AOnuAgrEAoAACO4C/8YAD3AKVQD+YAYVoDsFAFi5Z4wqccYNLSEZHtvcBN0RDt0CnTIqPBD8ScId
+oAsFAFizqcdvJjQQJjQR5jQSIdBZAAD2YmYdoAxlAOY0FCEQ2QAA5jQVKVgEgABYs5ImNDEX21kd
+24/8ZKYd4AkFAPhmhh3gTEUA/GZmHaBKNQD6ZqYdoAsFAPpmRh3ohh0A+GYGHaJPBQD+ZCYd4AWF
+APRjhh3gDiUALjQg9mOmHeAeFQD+ZOYdoEcFACc0JCc0Jv5j0BXgBSUA9GbGHeiIHQD4ZeYdoAUV
+AOU0OilYBIAA9GdmHeiIHQD4ZcYdoijFAPhm5h2j/wEA9+YAD/D3BQD34AQH8AdVAOf/AgHRWQAA
+/mPGHeAHZQDnNDwr4ASAAFizYfpnwBWgi8UA+oAARfAMRQBYs1z7uC4F4SplAPpgAEUwDEUAWLNY
+KQqw+GAARPA8VQAslHollHv1L4Yd4D11AC2UfStAF3i3Cfcvxh3gAC4AAADApSqUfiWUf/cwJh3g
+CDUAKJSAK0AXIhoy4jIIBeA4gADBkekkACEQBQAAwFL0QGYd4BylAPxABh2gOpUA+kBGHaAbxQDr
+JAEhUBEAAOsUAArgBIAAWLM3G9ujK7KNLbAA8aGQDeAKBQDZsG0IDCyQAbGq5MAHZMgFAABj/+z6
+QOYdoD3FAPxAxh3nOgEA7DQAAVAhAABYsyaiPibkCPSEJhXgAgUA0Q8AAGwQBogq9IAIFaXZxQD4
+IAQd4AZFAOkgNSQQMIAA9yYADTAAGgDakMOw/begBadaAQD8oGgd4ApVAFi41RzbzR/bpy4gDfhB
+kBXiSuUA+mBkHaALBQArNQLtIRkszgKAAOnuAgrEAoAACO4C/8YAD3AKVQD+YAYVoDsFAFi4xYwq
+ccYNLSEZHts5BN0RDt0CnTIqPBD8ScIdoAsFAFizBsdfJTQQJTQR5TQSIdBZAAD0YmYd4AxlAOU0
+FCEQ2QAA5TQVKVgEgABYsvAlNDErMB4e2u37tWoFoB0VAC00J/pjph2oxR0A/GYGHaJIBQAoNCH+
+ZKYdoAmFAPhjhh3gDyUA/mQGHeAJBQD4ZoYd4A8lAP5mxh3gDhUALjQ6/mdmHaIoxQD4ZuYdqMwd
+APxl5h2gSjUA+mamHajMHQD8ZcYdoEwFACw0JPxkxh2juwEA/WYADbD8BQD9YAQFsAxVAOy7AgHR
+WQAA+mPGHeBMRQD8ZmYdoAsFAPpmRh3gDGUA7DQ8KVgEgABYssD6Z8AVoIvFAPqAAEXwDEUAWLK7
++7bqBeEqZQD6YABFMAxFAFiytioaL/pgAEUwt4UA9mAAQXANFQAtJHP2TsYdoDxVAPxORh2gO2UA
++k6mHeAMNQD8ToYdoJtFAPqAAEXwDEUAWLKm9k+GHaA7JQD6T2Yd4TpVAPpgAEUwm4UA+oAARfAM
+RQBYsp3AwvxQRh2gO5UA+lAmHeE6tQDqOggI2ASAAFiylhvbAiuyjSywAPGB4A3gCgUAC7kCbQgM
+LJABsarkwAtkyAUAAGP/7AAAAAD8J+Id4AY1APpQxh2gPsUA/lCmHacqAQDtOggJYASAAFiygqMv
+p/8l9If2hCYVoAIFANEPbBAEJyAHiCIZ2zj0QggV4XcBAOWCI2vXAoAACaoIKKKe9wAQ0tIAnQAk
+op3o2toSEHmAACYiEiwiCdMP+kFIFeBmQQAIZgomYoAPAgDsuwwDMMEAAPdgDpuiAJ0AKyAWKAr/
+eLEN+kDwFaAMBQBboMpkodsc2mAtIQcZ2xwf2x37tjgF6t0BAO4hGi7vAoAAD90CnUCIIPqARhXg
+SgUAmkP5BgAM8AdVAOlGBCxGAoAAB4gCmEH8QkgV4D8FAJ9Fnkb8CAAF8t1RAObdEQ3egoAADbsC
+DLsCm0cqIhWLKaaqprubKfpCphWv6QUA+IAKTGIAnQAW2qL4hAAV4AplAPoAAh3gCAUA9gAIHaCP
+BQAJAmEJAmEJAmEqRCAuMBIrRCMrRCIrRCcrRCYrRCUoRCQP7gIuRCHmAhUCSKEAAAkAiiwwEu0x
+CCYAeYAA/IamHejdHQAtRDSKX/qG5h3oux0A60Q2JVAFAACaX1s9YvqGZh2omh0A+IZGHeiZHQD4
+hiYd6JkdAClEMChSEviHZh2oiB0A+IdGHaiIHQD4hyYdqIgdAChEOC8iFv6H5h3o/x0A/ofGHej/
+HQD+h6Yd6P8dAC9EPOYABQJxAQAADgJhLSAHDQ1BHtrEDN0RDt0IJ9adKyAWLAr/fLEK+kDwFaA8
+BQBboFOKJ/oAgh3gDAUA+0QAFaANRQBbmCQsIhIt+n8NzAEsJhIrUhKxu/qiRhXgAgUA0Q8AAAAA
+AOokAAtYBIAAW6B5ZK4iwCDRDwDaIOwkAAPYYQAAW6CzwCDRD9og63wSKWAEgABboK/AINEPAAAA
+bBAMJyIQo0YS2qMocHOJdysiFSwgUJwYiZ74IKYV4IgJAOgWDStQBIAAWLHaHdqaihiMHRvaP/rA
+AEUwNdUA5aQALmdCgACryyuy3a3MLMCA7BYOJVAFAABYsc6PGI4eKyIXLCBYr+73wABDMA8FAC9k
+Ai1wc+wWCSdwCQAArkTygABDcN0RAO0WDStQBIAAWLHAihkc2oCLHapqJaQADLsLLLCAnB7rsiEl
+UAUAAFixuY8Zjh4rIhksIGCv7vfAAEMwDwUAL2QCLXBz7BYKJ3AJAACuRPKAAENw3RkA7RYNK1AE
+gABYsauKGhzaa4sdqmolpAAMuwsssICcHuuyISVQBQAAWLGjjxqOHisiG6/u98AAQzAPBQAvZAIt
+cHMsIGjsFgsncAkAAP6AAEIw3QEA40YIBug5AADtFgYrUASAAFixlB3Z+4obG9n5jBaqaiWkAAvL
+C+uywS5nQoAADcwILMCA7BYHJVAFAABYsYmNG4wXKyIdrcymzvZOEBWgDQUA7eQCJmAJAACsRONK
+CAtgBIAAWLF/EtpBpkQY2d+YHKNGJWQA63E2KOAEgADoAAUI+ASAAP4AqB3gDqUA/iCGFe/9ZQDA
+kG0IHtqwDrstDb8or6qqKiqgAOrEAC5QBIAA5LAOZmAFAABj/9gAAAAAAAAAKaQBehss2xBtCCLt
+sAAmc/8AACng/+3k/yVT/QAA6bQAJdgFAADquwl2Y/0AAGP/1gAALxAA8eGQDeAFBQDZEG0IDCiQ
+AbFV5IAHZMgFAABj/+yxausUAArgBIAAWLFQsVurRBvaDiWweKNKsarrsh8q4ASAAFixSo8c6RIF
+ItgFAACrRPKAAENwOtUAKmQA6ZKPKOAEgADvBAUI8ASAAP4EqB2gDaUA/iCGFa/7ZQDA4G0IHt+Q
+DZktC5goqP+vLy/wAO/EAC5QBIAA5JAIZmAFAABj/9gALqQBehss2xBtCCLusAAme/8AAC3w/+70
+/yVT/QAA7bQAJdgFAADquwl2Y/0AAGP/1gAAKBAA8QGQDeAFBQDZEG0IDCqQAbFV5KAHZMgFAABj
+/+yxausUAArgBIAAWLEasVurRBvZ2CWwoANKCCqsAeuyKSrgBIAAWLET7xIMIsgFAACpRPKAAENw
+ONUAKGQA6XIZKOAEgADvCAUI8ASAAP4IqB2gDaUA/iCGFa/7ZQBtCB7akA2ZLQueKK6qqioqoADq
+xAAuUASAAOSQCGZgBQAAY//aAMCAKKQBehss2xBtCCLtsAAmc/8AACng/+3k/yVT/QAA6bQAJdgF
+AADquwl2Y/0AAGP/1gAALxAA8eGQDeAFBQDZEG0IDCiQAbFV5IAHZMgFAABj/+yxausUAArgBIAA
+WLDksVurRBvZoiWwqANKCCqsAeuyKyrgBIAAWLDd7xIMIsgFAACpRPKAAENwONUAKGQA6XIYKOAE
+gADvDAUI8ASAAP4MqB2gDaUA/iCGFa/7ZQDA4G0IHtqQDZktC58or6qqKiqgAOrEAC5QBIAA5JAI
+ZmAFAABj/9gALqQBehss2xBtCCLtsAAmc/8AACng/+3k/yVT/QAA6bQAJdgFAADquwl2Y/0AAGP/
+1gAALxAA8eGQDeAFBQDZEG0IDCiQAbFV5IAHZMgFAABj/+yxausUAArgBIAAWLCuG9ltsVysRCWw
+sANKCCqsAeuyLSrgBIAAWLCn7hIMIrAFAACmRPKAAENwP9UAL2QA6XIXKOAEgADuEAUI6ASAAPwQ
+qB3gD6UA/CCGFe/+ZQD6IGgd4AoFAG0IHtiQD5ktDp0orYioKCiAAOjEAC5oBIAA5JAHZmAFAABj
+/9Iq1AF9uzfq1AAI2ASAAA8CANMPbQgi77AAJkP/AAAugP/vhP8lU/0AAO60ACXYBQAA6rsJdmP9
+AABj/9EAACkQAPEhkA3gAgUA2RBtCAwqkAGxIuSgB2TIBQAAY//ssWrrFAAJYASAAFiwdKQisiLR
+DwBsEA4mIhAU2TOHZ5YdJmBzJ3IOJxYGJ0BI60ITKdAEgAD84GgdoGYxAFiwZxvYzhjZJw1mEatr
+qGYmYID2YABFcDXVAOWkACVQBQAA67LdK2AEgABYsFwrQhWnaixAUJwfhh3zQABEcAcFACeEAuZg
+cyVQCQAAmhejqvohxhWgZjkAWLBRG9kRjB+KHgtrCyawgKyq5aQAJVAFAADrsiErYASAAFiwSBzZ
+DIgfhBeJHqhopIT5AABEcApVAPcARh3gOwUA7SISIiAJAABYtgCJHSmQcu0iEiSX+YAAwKX9sf4F
+oDsFAFi1+hvY+i0iEqNGLLBY/CIGFaHd4QDrshcm6AkAAO0WCCtQBIAAWLAuHdiWKhIQG9iTjBgK
+agglpAALywvrssEuZ0KAAA3MCCzAgOwWCSVQBQAAWLAjLxIQG9jljhkssGCv7qbvJ/QCLSISLBYR
+67IZJ3AJAAD+gABCMd3xAONGCAboCQAA7RYKK1AEgABYsBQS2Ncd2HsqEhEb2HmMGqpqJaQAC8sL
+K7LBDcwLLMCA7BYLJVAFAABYsAotEhGMGysiG63Mps0mIGjn1AImYAkAAKxE40oIC2AEgABYsAEY
+2GKmRKNGJWQA6AAFCJAEgAACAmGSFBLYvS8gAJgc9iAmHeAFBQDvFAAngMmAANkQbQgMKJABsVXk
+gAdkyAUAAGP/7LFq6xQACuAEgABYr+2xW6tEG9iuJbCwo0qxquuyLSrgBIAAWK/mjxzpEgYi0AUA
+AKpE8oAAQ3A61QAqZADvBAUEyAcAAOkWBSjgBIAA6ZGUKPAEgAD+BKgdoA2lAP4ghhWv+2UAbQge
+3pANmS0Lnyiv7q4uLuAA7sQALlAEgADkkA1mYAUAAGP/2gAAAAAAACekAXobLNsQbQgi7bAAJnP/
+AAAp4P/t5P8lU/0AAOm0ACXYBQAA6rsJdmP9AABj/9YAAC8QAPHhkA3gBQUA2RBtCAwokAGxVeSA
+B2TIBQAAY//ssWrrFAAK4ASAAFivtBvYdrFcrEQlsLijSrGq67IvKuAEgABYr66PHOkSBSLYBQAA
+q0TygABDcDrVACpkAOmRlSjgBIAA7wgFCPAEgAD+CKgdoA2lAP4ghhWv+2UAbQge3pANmS0Lnyiv
+7q4uLuAA7sQALlAEgADkkApmYAUAAGP/2gAAACekAXobLNsQbQgi7bAAJnP/AAAp4P/t5P8lU/0A
+AOm0ACXYBQAA6rsJdmP9AABj/9YAAC8QAPHhkA3gAgUA2RBtCAwokAGxIuSAB2TIBQAAY//ssWrr
+FAAJYASAAFivfqQisiLRDx/YQh7YQg/dAQ7dAfxCRhXv89YAAGwQIIY3hm4uYo4c2Dz6AKIdoDsF
+APygaB3h7rkAWLUxEtg4/KGgANAHBQDBiHhRP9Jw0Q8lICz6gGgdoDPVAOsiDCrgBIAAWK9lKyI2
+JiDUpUojpADsZAAFUAUAAFivX6VipCjnhAIhEAkAANEPAAAZ11uKPiuSlimSo6uq4yBELVZCgACq
+mYmX+kJIFeA11QDpkg4p4ASAAOkWMCpQBIAAWK9OKxIwo0wlxAArsALqsTBt0ASAACkSMCoagOqZ
+CA5QBIAAbbkSLZBI7aQBJMgFAADk0HZlUAUAACoSMNMPKqACGNego6IoFjXoAAUAmIEAAAMCYfIh
+hhXigwUAo2srFjYssNgsFDTrsPsg0OEAAOsWLyEQCQAAWzX1Khw4+iaAFeAMFQBbNaAqEjCjqSuQ
+KPFicA3gDAUAbQgMLZApsczk0BdkyAUAAGP/7CoSMKvNJ9QB+0BQFa/+KgArKqjrqwgA0OEAAFs1
+j/wl6BWje8UA62sIANDhAABbNYvqHDgg2IEAAFs1OxzX3i8QIi4QIS0QICgQI5gQKxAkmxEqECWa
+EikQJikWA/gk8BWgOwUA+CCGFaAKVQBYtMoc19IvECouECktECgpECuZECgQLJgRKxAtmxIqEC6a
+E/gl8BXgOwUA+CCGFeAKVQBYtL0b18QEKggPAgAssEwsFi4rshRYrvYsEi4Z12asIqQq9UAGHeA/
+BQD1QCJoEH6FAC+kAS6kAu0cIC1gBIAA+AICHaB75QBtijL3YA/h0gCdAC7QAA5PQ/8gAEfz7gEA
+rp4u4IDv8IAmYAkAAO/EASXb+QAA7sQCJugFAAD3RGYd4CU1AMCl/a9KBaA7BQDsFjQq6ASAAFi0
+l2ZUDfoAoh2gOwUA7NefGugEgABYtJIoYo74oCAV4A81APhAAEF4iLkA+eAdXiIAnQAP6jAF6jAc
+15Ud15YZ15YPXzge15MJ+y0NtSgOuyil/xXXkgz/KK+7pbgLizoLjxIPuwMLTxIPuwMLC0IP6jAI
+6jAPjzgJ+i0NqCgOqiio/wz/KK+qpagKijoKjxIPqgMKXxIPqgP/aAAVsqoBAAuqAgvqMA/qMAv7
+OAm5LQ2dKA6ZKK27DLsoq5lmk0IY11MpFi0phhQuEi0OjxIP7gMOXxLv7gMNR4KAAP4v4BXh7gEA
+6O4CB/hFAAAu9AAsEJD7rsIF4A0VAA3MNy0SNvRAAEU3zAEALBSQLNTYLLA0LBYyi75Yro8f11Es
+EjIqEjUpEJD8QABBMA6lAPRAAEYwO9UA68QAIOn9AADqBAUGwIUAAOgsAAbohQAA+CWGFa/7ZQDY
+kA6ZLQuaKA8CAKqICPgIKIAA6NQALtAEgADln+Fm6AUAACscf+ekASXYhQAAers1bQgi77AAJsP/
+AAAugP/vhP8lU/0AAO60ACXYBQAA6rsUduv9AABj/9YAACfEA//40A2v5aUAKhx/KqwhK6AAwJDp
+FjElgPGAAG0IDCugAbGZ5LALZVAFAABj/+wAAAAAKRYx6swBINn9AADsEjEl2IUAAFiuViwSMevX
+HhZgBQAArCKkKiywPCwWM+uyECVQBQAAWK5OLxIz/CaoFeNZtQDpaQgH+AUAAK8i9EAARTA+1QAu
+pAANAIcJAmEJAmEJAmEJAmEJAmEJAmEJAmEJAmH6JagV4AkFAPom5hWgGAUAbYq0CuowDOowHtcH
+H9cIG9cICso4FNcFC6gtD4woBIgorKoOqiiqiKWMCMg6CIoSCogDCEoSCogDCAhCCuowDOowCso4
+C60tD9woBN0orKoOqiiq3aXcDc06DYoSCt0DDVoSCt0D/wgAFDLdAQAI3QIM6jAI6jAMjDgLyy0P
+vygEuyivzA7MKKy7pbwLyzoLihIKugP3IABGMuqNAO6qAw7vgoAA84AARnGqAQANqgLqxNskyAUA
+AB7Wuy0SNioSN/vChhXgHgUALtTa9UAFkBIAnQAvyqX+wAcMYgCdABnWdC8SNv1AaB3ge4UA+0BG
+HeA8BQD9QCYdoHvlANMPbeotbrNhLvDbDkhD+SAARDPuAQCuni7ggOiAgCboCQAA6NQBJdv5AADu
+1AIn+AUAAPdEZh3gIzUA+gCiHaA7BQDsEjQp6ASAAFizq2YwO/oAoh2gOwUA7Na5GegEgABYs6Wx
+P68i0Q8n1AP//ygNr+OlANEPAAAAAAAA//AcDa/lpQD//sgNr+OlAMCl/a1YBaA7BQBYs5jHL9EP
+GNaCpZkpFi35AoYV7/LqAMCl/a1KBaA7BQBYs5DHL9EPJ6QB//3UDa/jpQAAAABsEAgmIhAU1ceW
+FIVuJ0KWiGckQqMmYHKIjqdV59aYGq5CgAClRIRHJXAkKBYB63IKKdAEgADkQg4q4ASAAFituR3W
+IOvWHxtnQoAA9GAARXA21QAmpACryyuywa3MLMCA7BYCJVAFAABYra6KEqWqJXCEmhPzQABFcAsF
+AOukAiVQCQAA63IiKuAEgABYraWME6XFo1ompAIrQAjxYgAN4AwFANlAbQgMLZAJsczk0A5kyAUA
+AGP/7AAAAAAAAADqrAMiWCEAAFitli5ACPHBsA3gCQUABEoCbQgML6AJsZnk8AhlUAUAAGP/7ACl
+lfKgAEVwCAUAKKQEKEDo5IEDYqgRAAArcIxqsR+jXOpyJC5IBIAAbbkSLaAA7ZQAJVAFAADk0DFk
+yAUAAKtV8qAAQ3A/1QAvZAAuQOjxwrAN4AwFANlAbQgMKJDpsczkgBlkyAUAAGP/7PuAAEVwCQUA
++UAGHe//HgAAACsK6OtLCANQBQAAWK1rLEDo8YGQDeAJBQDaQG0IDC2g6bGZ5NAHZVAFAABj/+yy
+nq5V8qAAQ3AEBQAkZACPFC/wcmjxYSgiEiJw3PrnCBXgM9UA+sBoHaJ4yQDnfAYpYASAAFitVRvV
+vBzVvKJqI6QADHwLI8CA63sLBVAFAADrssEp4ASAAFitTKI4pYKmiOSEAiEQCQAA0Q/AQPKgAEN/
+/nYAAAAAK3IwLHC87BYAK1AEgABYrUGLEY4QLRqArb2uVfKgAENwOtUAKmQAKdDw8SGQDeAMBQDZ
+0G0IDC+Q8bHM5PAHZMgFAABj/+z8IKYV4ngFAOi7CANQBQAAWK0uiRUrkPDxYZAN4AoFAN2QbQgM
+LNDxsarkwAdm6AUAAGP/7LKtrVWjVvTABh2v/GIAAGwQDiYiEBzV940giWeOYChgcvkhyBXgClUA
++CHmFeA7BQDoFgAp+ASAAFiy2SwgBxnV0gwMQQzIEamIKoKenBr8IaYVoEslAPtAIuPiAJ0AJIKd
+/areBeBJJQDoRAACIkmAAJ0e/AAIHeA1BQBtmgIIAmEsMQpkwBXrMgQiUUEAAFitASwxCvWGABXg
+ABIAKCISCNpB80FQDeAHBQD1QBLYkgCdANVwjymOKqXF8qYAFeGVAQAJOAy0iAmDOQ/uDPPADsPi
+AJ0AKyAWKQr/ebEN+kDwFaAMBQBbm1Nko+Ac1acd1cEoIQcf1abp1aYR0L0AAPqOAA06iAEA6hYL
+LEcCgAAJiAKYQIsg70YCIfBBAACeQ51HDLwC7EYELd4CgADrqgIJ6ASAAPqAJhWgOwUA/atcBaAK
+VQBYspX6IegV4E01AC1EIP5CSBWgjxUA9oRGHeCJBQD2hGYd41wlAP1gAEWx7mkA/+IADLANdQDt
+nQIHc/0AAO7ZOAJQoQAA+CGGFeAMZQBYrMAuYhGKb/6F5h2o7h0ALkQuWzf7+oZmHajqHQAuRDL6
+IYgVqO4dAP6GJh2o7h0ALkQw/MJIFaANFQAtRDX8h2YdoA0FAC1ENPwhyBXozB0A/IdGHajMHQD8
+hyYdqMwdACxEOP5CyBWotx0A+obGHej1HQD2huYd6I8dAPqEJh2omB0AKUQkKEQlL0QmLkQ/9ITm
+HejuHQD+h8YdqO4dAP6Hph2o7h0ALkQ87QAFAmEBAAAMAmGKKSsiFaOqo7srJhWaKYkdGtVK6BIL
+LM8CgACqmSiWnSsgFi8K/3+xCuogByngBIAAW5rZiif6AIId4AwFAPtEABWgDUUAW5KpKyISLPp/
+DLsB+kJGFeACBQDRDwAA6iQACdgEgABbmwFkrh3AINEPih8rKoCrqi2g2WTRWJoZ/gDiHab4yQD/
+3+7mYgCdAMCl/aqQBaA7BQBYsi6NGS3Q2fOgCk/SAJ0AwYj9AAtg4gCdAMBQ/GFEFa/2wgAAZc2l
+pUXlFhAiqIEAAOokAArYBIAAW/vrKGBy7xIQLWAEgAD1AAuIkgCdABjVMy2AgGrRH6+q64IhLUAE
+gABt2RIpsADphCAl2AUAAOSQvWRABQAAG9RNHtUPrcWMHv6gAEfwPdUA7fQgIMBBAADsBAUMUASA
+APoEqB2gDaUA+iEGFa/8ZQDZsA27LQy6KKqZqekpkADphAAsUASAAOW/5WRABQAA56QBINhBAAB6
+uyLtsAAkc/8AACzg/+3k/yVT/QAA7LQAJdgFAADqs+F0Q/0AACgcECmAANMP0w/xIRAN4AwFACqA
+AbHM5a/3ZEAFAAAsFhHq/CEg2EEAAFisIygSEaWF9KBAFe/7ugCtqfckBh3v/QYAAKVL67wgKVAE
+gABb/lHVoPxhRBWv8gIAANog5UwIC1gEgAD9hAAVoA0VAFv8m44ZLeDZLwr+790BDSgEgAD92yYd
+7/p6ANog5UwIC1gEgADszCAsaASAAFv8kI4ZLeDZJQr39aAEBvDv9QDv3QENKASAAP3bJh3v+aYA
+AAAAAAAA61QACVAEgABb+hX1QGgd7/lCAACIImWN/Isa2iDrvBgpYASAAFuau8Ag0Q+LGtog67wS
+KWAEgABbmrbAINEPAGwQCCggZPRCCBXgibUAeYEEwCDRDwCONCQKBPmphAXgCgUA9cATCBAGBQAc
+1L/8QAgV4DsFAOoWACM4wQAA/uBoHeAKVQBYsZ2LIiogBy5sX/2pKAXk7h0A/3tMDeGqAQAMqxGt
+uyyynioWBP+AFgOiAJ0AKbKd5JQABJXxgAAuIhIY1DP+QSgV4O5BAAjuCi7igCwiCgbuCO/MDAdw
+wQAALhYF/4AOQ6IAnQArIBYvCv9/sRL6QPAVoAwFAFuaJe3UeRUUQYAAHNO6KCEHGdR2GtR3/6js
+BaqIAQDvIRosRwKAAAqIAphA6CIAI1kBAACbQ+5GAiNRfQAA+QYADPSqHQDpRgQsRgKAAAioAphB
+LiISl0WfRv4IAAWy7lEA5u4RDd6CgAAOuwIMuwKMFZtHiykpIhUW1AGsu6yZ+EKmFe/oBQDrJgki
+SIEAAPif9gQiAJ0A9gAIHaAPRQAJAmEJAmEJAmEsQCH+hAYd4I4FAA7MAixEIStSEvqHZh3oux0A
++odGHei7HQD6hyYd6LsdACtEOCkiFviH5h3omR0A+IfGHeiZHQD4h6Yd6JkdAClEPI40mhb4YKgV
+oAsFAPXABxAYnh0ALkQ3K0QnK0QmK0QlK0QkKUQ2+IZmHaiZHQD4hqYd6JkdAPiGhh3oiB0A+IZG
+HaiIHQD4hiYdqIgdAChEMPqEZh3omx0AKUQi5gAFAkEBAAAIAmEvIAcPD0EM/xGt/yr2nSsgFi4K
+/36xCuogByvgBIAAW5mxiif6AIId4AwFAPtEABWgDUUAW5GCLCISLfp/DcwBLCYSK1ISsbv6okYV
+4AIFANEPAAAAAOvkAAlQBIAAW5nX7dQKFXFpgABj/YoAACaQgLFmBgtB+o8ADXAIBQALijimr/vt
+AAs/9ioAHdPf/aeCBa/79QArRDcsRDb8hqYd4P71AC5ENIpfsaqaX1s2exvUFvqGZh2oyh0ALEQy
+83AQFejMHQD8hiYdqMwdAOxEMCJRQQAA67IhKeAEgABYqy4d0+qKFvKAAEfwCwUA6/RQIfAFAAD+
+hOYdqO4dAP6Exh2o7h0A/oSmHajuHQD+hIYdr/tiAP/1DA2gCQUAAIsU2iDrvBgpYASAAFuZ48Ag
+0Q+LFNog67wSKWAEgABbmd7AINEPAGwQDhzT8o0gLiAFLzIAKDAF9CAmFaAKVQD4IAYVoDsFAFiw
+zow3KgqV7MIOIg1dAABvRBduQhQtMAV60UL6YGgdoAsVAFgKPcAg0Q9pRDAuMAV64SqIKPpgaB2g
+DyUA/wymHeALFQBYCjXAINEPAAB60QyJKOuUZSnQBIAAWAovwCDRDy0wBS4KkP+8Xg2gCxUAGNNT
+GtLviz4f0xwtopYpopsqoqP/77AV4G5VAO27CAzOQoAA6akIDd5CgADrqggH/DyAACsKgPsgAETw
+ACYALSqArZkd00Pr01YWeAsAAC70EY6gmxr4IMYVoA9FAO0WBC92AoAAD+4CnhUtkAcokSsNCUEA
+mREJiAILiAKYGA/qMJ8Z+YBAJeAOBQDuFgsg2MEAAAlgiAsMiglAiAsIigkgiAsEigkAiAsAiisc
+EPwAgh2gDSUAW41FwCDRD2wQBCswBfembAXgBAUA9/ICHaCaJQD7YAWUIJVVAPVgBVRgmAUA+WAG
+XSIAnQCJOCJyieoyCSSAcYAAmaCLOJqxlDiUOShydYo3JTIA+0HIFaALBQD4rwAKtWyFAFiqtZQ4
+lDmUOpQ7lDyUPZQ+lD8kNhAkNhEkNhIkNhMkNhQkNhUkNhYkNhckNhgkNhkkNhokNhskNhwkNh0k
+Nh7kNh8q2ASAAPZgph2gDAUA+kIIFaANFQBbkH0rIhOwu/pCZhXgAgUA0Q8AAAAAAIk9/EJIFe/8
+1QDsnAEE+BiAAJw986AFe5IAnQB6sQ2UOvVgBgRiAJ0AwCDRD4k4InKJ7jIJJIBxgACZ4I84nvGU
+OJQ5KHJ1ijeFMPtByBWgCwUA+K8ACrVshQBYqoOUOJQ5lDqUO5Q8lD2UPpQ/JDYQJDYRJDYSJDYT
+JDYUJDYVJDYWJDYXJDYYJDYZJDYaJDYbJDYcJDYdJDYe5DYfKtgEgAD2YKYdoAwFAPpCCBWgDRUA
+W5BLKyITsLv6QmYV4AIFANEPAADaIFsr7x3TOiwiEiswBf2ABAZwmiUA/EJGFa/87gCOPfPf+ffS
+AJ0A+mBoHaALVQBYCYrAINEPAABsEASMJyzCDivCwAO4AQS6AeihB3koBIAAI8LG/aZOBaANFQDz
+YAQHcA8FAP9PAA8wOwUA/6IAD7AKVQDtNAAKcASAAFiv/u/SahGEOYAAGtI6G9MaL/B9KqKbKbKA
+/UgAFTAGFQDqmQgH/FCAACmSJ4meKZIQ+T/gFeAAOgApkqeJnimSELCZ4rKGJICJgACCJG2ZB4gi
+c4EpIiwowNDi1AAGgcmAAMopLiEG+gCiHaA7BQDs0wMZaASAAFiv4NEPAAAA/EBoHe//XgAAAAAA
+AADAIP//UA2v/vUA2lD9pWwFoDulAFs0wGSvupOplKqWqIlSZZ+vK1AH+qBoHaG7AQDrvBgq4ASA
+AFuY02P/lmwQEhzS7CkgB4MpLSIALiAF/kJoFedFAQD2n8AVoAgVAPcNAAswClUA/iAGFeA7BQD4
+QqgVoVkBAOgWASt4BIAAWK+7KyIQLCIR5hYYKdAEgABb/6f3QGgdoAcFAPFXvA3gGUUAKiIT+yAT
+gqIAnQAnJhP0gAnBEgCdAIon/OBoHaALFQD7RAAVoA0VAFuQD2ABGwAogQf54pYNoAnlAOzMASbA
+CwAA7JvpdugJAAAf0sIjMRb8QWgV55sBAOTMEAzLgoAA/SYADLazAQDk7BENx8KAAP+mAA73iAEA
+6BYPLEECgAAMiAIsISUspQIsISSdoC8iESylAy1hBhzSDe+mAi7vAoAA/SYADPPTGQANmQIMmQIt
+IhAsYQedoy8gBycWEf2lTAXh/wEA6aYEL/+CgAAI/wIoEhedpx3Rg+0WDixGAoAACP8C/0CmFeAI
+FQD4IgYVoA9lAJ8dH9GhKWATmRn/gAgsYgCdAB/SlSoWFg/PAv4hZhXig0EA/QgAFDCTOQDouAIM
+zAKAAOmIAgDQgQAA6BYKINlBAABbi3VkoNHApf2lEAWgOwUAWK9gjS7I29og+kHoFeAMFQAL0ACM
+LcjJ+kHoFeAKBQALwADaIFgA/sAg0Q8AAAAA+kBoHaArBQDtHBAq4ASAAFuaIuzSKhUH8YAAiyop
+GgD6WAAF8A8VAPstAA/wDdUA6xYXL/AEgAD/iYoN4AsFAGAABQDPGn76CbG769r0fYEKgAAd0mYv
+MRiXGOcWDCboCwAA7dEHJ4QxgAD9//Mj4AwFAB3SXvwAAh2gCeUA/aBAFe/5BgAAAP//HA2gCwUA
++iLGFa/8EgApEhYvEhX9pKgFoApVAP8gxhXgOwUA7hIUL+gEgABYryctCnItJAUc0bnqEgQq3wKA
+AKy76rYAIhStAACKJ/oAIh3gDAUA+0QAFaANFQBbj4LSoNEPL1rc/f/u++AMBQBj/3fAINEPALGr
+7CQACVAEgADrJhMi2GEAAFuYFisSGOzSNxlQBIAAW5nDwCDRDwBsEBAc0iskIAeDKY0g+EJoFaB+
+FQD+QKYdoApVAPggBhWgOwUA+EKoFaAPBQD4ICYVoUQBANMPWK79KyIQ7CIRKdAEgABb/un1QGgd
+4AYFAPFFzA3gGUUAKiIT+yAR8qIAnQAmJhMtIg7I3AIqAvpB6BXgDBUAC9AAjC3TD2TACvpB6BXg
+CgUAC8AA2iBYAI7vIgApcASAAP2kHAWgClUA+gYCHeANBQBYruDAINEPAPpAaB2gKwUA7RwQKmAE
+gABbmaznpAAFD2GAAI8q+6NiBeEKBQD+WAAH8A0VAP9NAA7wDNUA/WAK+eAKBQBgAAUAuBp9igmx
+qurK9H0BCoAAlhiWHBzR8C4xGPYiJhWgCwUA4zEWJmALAADswQcnCZGAAHzjLRzR5/oAAh3gCOUA
+/YBAFaAAPgApkQf5wpYN4AjlAOu8ASZICwAA64vpdmAJAAAc0djzYAAUN+oBAOsiCy9zgoAACO4C
+KCElDLsCKHUCKSEkm3AqIhEpdQOacvigxBXmowEA61EHLWfCgAD4QggVp8wBAOwWDy5hAoAA6HYD
+LsUCgAAIzALoIAcszwKAAPnGAA9zYxkA98YADzAGZQD2IaYVoYgBAObQxBxHgoAA7IgCD84CgAAJ
+iAKYdRjRExzRtZx3CO4C/uCGFaAIFQAoFhAe0JMpUBOZGZ4edrEFFtGuBrYC9iFmFaKDQQD9CAAU
+MJM5AOioAgzMAoAA6YgCANlBAADoFgog0IEAAFuKj8qrwKX9o0QFoDsFAFiue2P+IAAAAP/60A2g
+CgUALlrc/d/346ALBQBj/sYAAAAALxIV/aMwBaAKVQD+4MYV4DsFAO4SFC/oBIAAWK5rLApyLCQF
+G9D96RIEKlcCgACrqvlABhXv9+YAAAArTBjtrAEpYASAAO0mEylQBIAAW5dk2iD9owoFoAsFAFuZ
+EmP9zAAAAAAAbBAEhSAb0YEd0YIkISWKKijSlvO1aBXgBgUA+oAAQneaAQDoVQwEgeGAAMskjCcv
++sD2QOYVr/j1AOjGACZwgQAAD+4B5sUUJ3EBAACeyZ7I9SAGGJIAnQD1IAbJEgCdAJoqK9JT7iIR
+JYHhgAD/oPYF4AoFAG0IKSjykizSpaioCYgRqMyMx4zOKcK/7pkPdVAFAAApwsKwmSnGwivSU3ur
+AmP/z5YoJiYJJiYKJiYLJiYMJiYNJiYOJiYPJiYQJiYRJiYSJiYTJiYUJiYVJiYWJiYX/aKeBaAK
+VQD6BgId4E0FAFiuH/qgaB3gegUA+kCmHaAMBQD6YagVoA0VAFuOQOoyDipYBIAA/AACHaANFQBb
+jjzRD4476iIKJlghAACb4e7GAiH4sQAAn8P6YWYV7/y+AIk56iIKJkAhAACYkenGAiHYkQAAm8P4
+YSYVr/xGAGwQDCohN4MnGNEvwFLyYcgV4AsVAPsD1g2gBAUALyAFKAqS+eAKhCCZVQD54Ac8YgCd
+AMAg0Q/aIFspx4ot/aJEBaGGBQD2YABDP/vlAAuqAZot9NJGHeA7BQD8RuQV4AolAFit6xjQVhnQ
+nhzQiyiAfSqSeymSg/+hOAWiiwUA5GSRLVZCgADqmQgEfESAACoKgPsgAESwACIAAACrmRvQfYgg
+nhb8IAYVoApFAOsWAixGAoAACogCmBEvkActkSsPD0EA/xEP3QIO3QKdFAzqMJQX7BYFIcgLAADp
+ZgAA0IEAAAoMiglAiAoIigkgiAoEigkAiAoAiuokAAjYBIAA/ACCHaANJQBbioL0RuQdoAIFANEP
+JCYRJCYWJCYSJCYUHNDqjSDrJhMlcAUAAP/gAAcwClUA/kbkHaA7BQBYrbSPLX73HI0g/kCwFaAK
+VQD9ob4FoDsFAFitrcAg0Q8AAAAA6iQACdgEgABYA3HAINEPAAAAANogWyl3wCDRD2wQBPBB0A3g
+mFUAhDcqMAWETnihJygKkHihIcAg0Q8AAAAAAPoAQh2gOwUA7NDKGegEgABYrZbAINEPAAAc0MYl
+IhgtQo4jJhD4oSgV4ApVAPhhhhXgOwUAWK2N/aGABaAKVQD8QkgV4DsFAFitiC1Cjo5aHNC7+Z86
+BeGN4QD+WAAHMf25AOn/EA91goAA7+4CDEECgAD5oAQG8v3JAOjdAg/5woAAD90C/6YADrAKVQD8
+QkYV4DsFAFitdRvQOCMgB+nPqhlQBIAA+ELmFeAEBQD0QsYVr4ilAPhMhh2hMwEAW4sS6iISLWAE
+gAD1gUQdoIsFAOTGBClgBIAA66oCAdhhAADqJhIpUASAAFuWZsAg0Q8AAABsEAYZ0BImIAcYz8cq
+knspkoMogH39SAAVMIcFAPsgAESxZgEA55cIBHwcgABgAAQnKoCnl4giG9BK7GQABABxgADAINEP
+AAAAAAAA9MAG4hIAnQAMahELqggpop7TD/UgCAuiAJ0AKaKdZJDhGNA+LyAHLSEHGs/2HtB0/UAA
+BvD/EQDq/xAO7wKAAA/dAg7dAp2QjiDqlgYie/0AAOiWAi//AoAA75YDL3YCgAAOTgKekS1wByhx
+K/wgAAbwDgUA7pYFLuwCgAANiAIKiAKYlA/qMJ+V7pYHJNCBAAD4ZAAV4A0lAG3aBQkAhgoCYQzP
+EfvgAEf35QEA5PadJxRtAACKJ/oAgh3gDAUA+0QAFaANRQBbjX/UoIw0yMnrMgUpUASAAAvAANJA
+0Q8ez/+N6GrRNwzKEauqL6KedPNOKaKd5JBKZvv9AACf6GWfHdog62wYKWAEgABblg3AINEPAAAA
+AP/8CA2gCQUA9iAGFaAKBQBYqecez+yN6IwQ68/4Fo7LAAD//wgNoAkFAMCQwIoI2DT5wQYVr/7O
+AAAAAGwQNiQiGIRHJEIOKiIQLUAeL0AdLEAcK0AgLkAh6EAiLmYCgADvzAIN3gKAAA67Ai9AH+5A
+Iy3eAoAA6LsCDmYCgAANzALtQAAt3gKAAO67Ag5mAoAAD8wC/W8ADDA/9QD9BOAgVd0BAC6iE3zh
+CA7IDGaAAiymEyyiFNMPDwIAe8EIDLkMZpACK6YU9aAQDhAqNQD7oBGEIAYFAPWgCgXgK0UA+6AK
+jGCHBQDCxv2gBaQgPiUAftESf9F/wKL9n/oFoDsFAFisxNEPAC9AGCNAGehAGi/+AoAAA/8C40Ab
+L/4CgAAI/wII/xED/wIv/AEvJhYpQCQjIhD/PLAN4JRVAPUgD9CSAJ0Aa5S7apK4KgoF/Z/SBaA7
+BQBYrK8oMAV0gaT6YGgdoAkVAPhMph3gCxUAWAYgBgAAAAAqQBgrQBnsQBotVgKAAAuqAutAGy1W
+AoAADKoCCKoRC6oCsaoqJhbRDwArQBsqQBgtQBkjIhDsQBotVgKAAA2qAuUyBy1WAoAADKoCCKoR
+C6oC5VIOJVgFAAArJhZ6uQSyqysmFixAAmXPIdogW+p1LTBy+b/4sNIAnQArXQL6IGgdoVwFAFim
+wxnPOR7O8CqSeymSg//PsBWgCyUA6xQQLVZCgACqmfHAEm/SAJ0A9yAARPAJKgAAAAAAAAAuQBgv
+QBnjQBovdgKAAA/uAu9AGy92AoAAA+4CCO4RD+4C7M+oF3AFAAAuJhYuQAH0QPAV4ApVAPJCCBXg
+TQUA/cAEBvA7BQD3wAQHcVUBAFisY/pAaB2gCwUAW4oHKCISLzBy54gCDTAEgADoJhIniSmAAPmf
+IAXgCgUAKmQSKmUImWKLImW+Rtog7CQAAthhAABblVjRDyxAGC1AGe5AGi5mAoAADcwC7UAbLmYC
+gAAOzAIIzBENzALszAEpUASAAOwmFipYBIAAWzAQ0Q8tQBguQBnvQBou7gKAAA7dAu5AGy7uAoAA
+D90CCN0RDt0C7dwBKVAEgADtJhYqWASAAFvsBtEPAMCl/Z7eBaA7BQBYrDMuMAV04Q36YGgdoAsV
+AAERAlgFpi8iEg8CAHj3ISoiB/oAgh3gDAUA+0QAFaANRQBbjI0rIhIs+n8MuwErJhL6QGgdr43F
+AO0kZCrYBIAAW4nFJqQSLyISLiICJqUIB/8C7yYSL2q+AAArIAf6QGgdobsBAOu8GClgBIAAW5UZ
+0Q8tQAEsQAQvQAUezszoQAYuZgKAAA/MAu9ABy5mAoAACMwCCMwR78wCAljBAADuzAEG4ZaAAPpg
+aB2gDQUAW+fkLkAUL0AV6EAWL3YCgAAP7gLvQBcvdgKAAAjuAgjuEQ/uAp5kLUAQLkARH8696EAS
+Lu4CgAAO3QLuQBMu7gKAAAjdAu9mAi7uAoAADt0C/MCmFe/5dgD6YGgdoA0VAFvny2P+OgAALyqA
+r5kdzp0bzokazocmFBGPMCoWVvoqhhXgCEUA7RZaL/4CgAAI/wIvFlUukAcskSsODkEA7hEOzAIN
+zAIsFlgL6jArFlnmFlsg0AcAAOqscCjIBIAACWCICgyKCUCICgiKCSCICgSKCQCICgCK2jD6ICAl
+4AxFAPtqABXgDSUAW4iJ0Q8AAGwQBIk3KJkUhZlkgYqOU/ygSBXgClUA/Z34BaA7BQBYq78kIAce
+zrcEBEHtIQcqTwKAAK6ZKpKe9kDwFardAQDs3REKYASAAPdACqJSAJ0AKpKdGM6uH87m6c5mFQoZ
+gAD2IAACMGYRAOtRCCsygoAABt0C790CCiQCgAAEuwIJuwKdoIYg+UBGFaAEBQCUpZSn+UDGFeAN
+RQD7QIYV4DsFAOumAys2AoAADWYC5qYBJUiBAAAFIIYJAmMFAIYJAmEYztKYqezO0h5/AoAArv79
+06YV4ApVAFirkIk4ypQczs38YAgV4ApVAP5gsBWgOwUAWKuKijmUO4w4nKCLOJqxlDiUOY08/6Jg
+B9+etQAuNAWPLigsOHjxVcAg0Q+PNx3OFfpgCBXvyAUA5dKKJ/CBAAD5wAQHP5llACk0BZQ8JPUU
+7dJ0J3EBAACe+Z74/W8ADfAMBQD6oigVoA0VAFuLlypSErCq+qJGFa/+ngAA/Z1UBaAKVQD6BgId
+4A01AFirZvpCCBWgCzUAWATcwCDRDwAAAAAAAP/5xA2gBQUA/Z0+BaAKVQD8QEgV4DsFAFirWosi
+Zb9h2iDrTBgpYASAAFuUXMAg0Q8AAABsEAbyICYV4ApVAP2dJAWgOwUA/mAIFaf1AQD//8AV4AgV
+AO+POQnoBIAAWKtJFs5CE85DF86KjREbzoebECXSE/2lRBXgABIAwKX9nQoFoARFAPWhAAowOwUA
+71QACnAEgABYqzsqIAcKCkEMqhGmquiinipOgoAAKZwnCUkU+QALS+IAnQApop3qlAAEizGAAAVd
+FOeWACpOgoAA/UBmFeXJHQCcoosgLpwn/WAAFbTuHQAL6wKboesSACVAYQAA6aYFJMg9AADzQIYV
+5JkdAOsAFQzPwoAAbZkCCACKKCAHCAhBjxHt8SosRwKAAKaILoad5N0MCnaCgAD+oABCv90BAO31
+Ki76DgAAiRGJmPEhQA3gBQUAihGLqZWrmbCMqJvBlaiVqY8RFs2fjfz00UgVr55lAO70BSb9+oAA
+jBGJx4vA9YGGFe/KBQDsYnQkwIEAAAqIAeWVFCRBAQAAmJiYmf1vAA2wDRUA+oIoFaAMBQBbix4v
+QhKNLrD/70YSIXDhAAB+0QrAINEPAAAAAAAAAP2caAWgClUA+gYCHeANRQBYqur6QggVoAtFAFgE
+YMAg0Q8AAACLESuyEi5CJAuKRPtaAA0wDAUA/0ABBTANFQD7QAgVr7uBAFuLBIwR9YJGFe/9agAA
+AAD/+mgNoAkFAI0iyNqOEfXCZhXgAgUA0Q8rIAf6QGgdobsBAOu8GClgBIAAW5PUjhH1wmYV4AIF
+ANEPAABsEAwYzTUZzX0ogH0rknspkoP6QGgdoIwFAOM6OQ3eQoAA65kIBHw4gAD9IABGMAAuAAAA
+LCqArJztzVsYyASAAPNBng3v+/UA+mFoFeAAEgANAIcJAmEJAmEJAmEJAmHkBx4AyIEAAAkCYwQA
+hgkCYR3NThnNT4igH81hnxb4IAYV4A5FAO0WAixGAoAADo0CnREpwActwSsJCUEAmREJ3QIP3QLt
+FgQvYASAAAnqMCkWBSUUMfojhB3gDwUA/iDmFeANJQANiALoFgko2ASAAFuHVtEPAABsEAQTzNEo
+IQwkMpYjMqOoRAlEEaQzhDcoIBOETsmO9IEAFeALBQD6oGgdoOwFAFik0tpQ7CATIViBAABYpMIo
+IBLKgSkK6PiAAEJwCwUA+oBoHaDsBQBYpMjaQOwgEiFYBwAAWKS4KvqF6jQFKZAEgADRD2wQBBTN
+KykhDChCdiNCg6mICYgRqDOKN/SRKBWgCwUA+0HIFaM8BQBYpLaKTyshDPwAAh2gDRUAW4qQG81C
++kGEHe/69QCaO9EPAABsEAQVzRgkUomKTyihAiMhDMiJ2zBbiqbIqMAg0Q/AINEPAADqQg8p2ASA
+APwAIh2gDRUAW4p+GMyUKIKWJVKDqDgJiBGoVYRXLCAThE5kwArrLCAiUCEAAFikiywgEsjMKgro
+6koIAVgHAABYpIaMUJwlk1vyQYQd74tVAOtUBSqQBIAA0Q8AbBAE4kkICTAEgADTD21KEiUwAOVk
+ACGYBQAA5FAGYzAFAADRD8CAKJQA0Q9sEAgrMpIkMpP7mr4FoUyFAKw8J8F+LaKULqKlI6Kr6KJT
+Lu5CgACu3fphqBWgjwUAbYkQjteO7ijiv/UACFQiAJ0Ar93A8J8WKKECZIEMKTIODwIAKZECZJEA
+nBUrFgRbhqEYzFwVzUgogpQlUqXqiAgNMASAAOoyDixGQoAAqFVbhpmLFI4WH81dGM1aKeAHJ1Uk
+llsiVg8oVgwuVgkvVg0rVhAkVhErUAcUzVMkVg71mqYFoPzFAAy7Af2apAWhmQEAC5kCKVQH7eAH
+KXgEgAD1QABCMDsFAP/GsBWgClUA9KSkHaHdAQBYqfwXzSaNPRzNRS5yVC3RApUQ6FIAK3gEgAD0
+IEYVoApVAPggJhWgOwUAWKnx8KQADeAEJQAvIHL6gGgdoA4VAA/qOfVABNiQDAUA9UAG2R/jpQDK
+MNpQW/uN0jDRDyjiwu0WBiRABQAA+dhGFa/7xgDALNEPAAAczSr8oAgV4ApVAP6g6BWgOwUAWKnZ
+KiByG80llSrpUgolBiGAAAubAptaji2NFQTuAu4mDSboBwAALNAhL9Ai7tAjLmYCgAAPzALt0CQu
+ZgKAAA7MAgjMEQ3MAuxWFSrQBIAAW/q60qDRDy9yq4v7L/wsf7FHiLGNsC2GACmyACiWASy2AOy2
+ASWCoYAA41IAJcP/AAAjhj6OWi+8+J9X+8YADzADBQD+oUYVr/zCAAAAAClyq4uZKZwkebkL//xo
+Da/zRQAAAAAAjbGPsJ/QjrCd4Zyw7LYBLf2mAAD/++gNoAMFAPihRhXv/QYAbBAMH8xEGMwNGcxV
+HsxBKIB9K5J76ZKDKVAEgAD8UAIdoA1FAOQ0ES3eQoAA65kIBHw8gAArCoD7IABE8AAaAKyZGMxI
+jKCfEJ4S6BYGLmYCgAANzAKcESuQBy+RKwsJQQCZEQn/Agj/Ap8UDuow/iCmFaANBQDtFgcgyIEA
+AANgiAkMigNAiAkIigMgiAkEigMAiAkAitsQ/ACCHaANJQBbhjvRDwAAbBAE4swtGRgEgAAlIoko
+UhAogQL2UGgVoIplAOSBNWEiAQAAiTUoInapiAmIEahmKWAFepEFKvqGKmQFKlIQW4XsJEKVIiKD
+qkQJRBGkIoQnH8tqhE7+QeYV4A4VAC4mFP5CZhWgBwUAJyYV9kJGFe+dBQAtJAWMONMP+0BoHeHM
+8QDsJHIqUASAAFsz5cefKSYQiDXmJgsp2ASAAOclNyJQCwAA+EHGFaFcBQBYo4sqQojTD9MP/0Gg
+ARAMJQArIHMMuwIrJHP/QaAA0A5FAC0gcw7dAi0kc/9CYACQCIUALyBzDwIADwIACP8CLyRz/ABi
+HafawQD/QaABUAsVACkgcwuZAikkc/2CYB3gHwUALiBzDwIADwIAD+4CLiRz6SIAImAHAAAtwZIt
+JTYswZMsJhcrQosrJhkqQowqJhgpRoYoUhOXKOcmCSRABQAAKFYT0Q/AINEPAAAAbBAGHMxv/GBI
+FeAKVQD+YGgVoAsFAFipHIgwJjICGcxp5DIDKAQKgADxAAU6kgCdAHabF8bK6lQACdgEgABYp+PA
+INEPAAAAAAAAAPSABYmSAJ0A6iIHKgIKgAD4T3AV4AzVAPxfAA4wCxUA6qIOKgEKgADvxwx8uASA
+AC0gDdMPZd+v4LsaA3AFAADrFgAjBDmAAAm5AvqAAQe3mQEA6SR7J/gXAAAu9eju9ekjgYGAAN1A
+/sBoHaAKVQD9mIYFoAsFAFio8P/9rA2gDAUAAAAAAAD//XgNoAwFAAAAZJ/QwKX9mHQFoAsFAFio
+5xvLMuzMNxlQBIAAWKXCY/+yAABbiaZlr0zAov2YZAWgCwUAWKjdY/8c3UD3YGgdoApVAP2YWgWg
+CwUAWKjXKSB7x68KagMKmQEJCUfpJHsj/EmAAGWfgcCl/ZhKBaALBQBYqM7aIFsknmP/bAAAbBAG
+hCcVzB8pIHuETvYAAh2gAwUA+mAIANAHRQD0gKAloImdAH+HZypB6LCqCgpP6kXoLQLmAADpFgIh
+nPEAACsgDeogDC2DZgAA6RYCLVYCgAAZy2EKCEcJiAqYESiCkgqKFCoWAAuAAAoJQeiRX21YBIAA
+aJNaKFJ/2iALgAAqQejTDw8CAOkSAiUDuYAA5mwEIqgRAADkTAQhmAUAAOAwBAO7/QAA/vecDeCJ
+nQBgAHAby/WKICuyf5kSC6oM/UAAFTALFQD7RgANf/4eAHynGY0njd6JEqbd/aDAJeAMFQD9rQQd
+r/6mAAAAiBEogpT6IAgVr/nFAAm7AQuAAGP/dCoge/pgBADQCxUA/WABBd/89QAMuwMLqgH6T2Yd
+r/3CABvKzuzL0xlQBIAAWKVewCDRDwAAbBAEY//8AABsEAQTy9LAiCg2UsAgIjZT0Q8AAGwQBMCi
+/ZeaBaALBQBYqHLApluJ9MAg0Q8AAABsEATApP2XjgWgCwUAWKhrGMrX0w8ogH17h0AdysAaym/8
+DwIdoAsFAP2wiBXgGQUAbZoMLqGU7OEIdVAJAACxu8e7ALAE/J8AD/AKJQD+AAAH8AsVAA+6OVh6
+MMAg0Q9sEATApP2XYAWgCwUAWKhTwCDRD2wQBB7KWR3LJy7ilf2v6BXg7ukADu4KD+4RLuxz/cLO
+DeBvRQCCJ4IuIi0G/k3EHeACBQDRDwDAof2XPgWgCwUAWKhBwKVbicOCJ4Iu8kDAJaBvRQD+TcQd
+4AIFANEPAGwQBBrLluqifylYBIAA/GBoHaANFQBbiFzSoNEPAAAAbBAEGsuOKqJ/2yBbiHfSoNEP
+AABsEAaUEZIQ58uJG2AEgADtVAAJ8ASAACgaQCh2ECdyEecWAyOPcYAA+AACHeAKBQD6AAId4AMF
+APACcA2gBRUA8mPwDeAnBQD67wAL8AQFAOcWAiOSoYAAhhInCgD64AQA0AIVAOZs/yqYCoAAbWkP
+4CEEARAFAADjRAIKmAqAAANDAifiAAOGAePzAQ2BCoAA4tIAKZgKgAADdwLmEgIrGAqAACfmAAMi
+AicSAOMSASsCCoAA86AGFaFvnQD24AYVoSidAPJgBhWgAwUAK6zg9SAJ9JIAnQCGEwCRBABXGvbA
+BANwKAUA7mxMZMgFAAB2g3wvwCXowCQlUCEAAGSvzvVf+d5SAJ0AhuDi0gAtgQqAAAD3GudmAgwY
+CoAA4yICDVgEgAD3wAYVoAMVAPOgBhWv/noAAABuZFb0wATK0gCdACbAHO/BFyVQRQAA+YLEFaB2
+EQD44AATsGYhAOf/Ags0AoAA9wYADD/+UgAAAPzHgEfRBwUA9uAE46IPBQCIyPtAYBWi+AEA//3A
+DaKIGQBuYmL03/m50gCdAIjI+0BgFaL4MQD//UwNoohJAAD2wAQnUI8FAPf/+KOiAJ0AiMj7QSAV
+qPhxAP/8wA2oiLkAAAAAAAAA/M6ARdAfBQD3//djogCdAO/AJyVQIQAA+YTQFa/8KgD43/ag0gCd
+AIjI+0AgFaD4YQD/+8ANoIhpAMAg0Q8AAP7f9aViAJ0AKMAc+0AgFaD4MQD/+zwNoIg5AAAAAAAA
++N/0ptIAnQDvwQ0lUEEAAPmBhBWv+soA+N/z5FIAnQAmwBzvwRUlUEUAAPmChBWgdhkA+OAAE7Bm
+KQDn/wILNAKAAPcGAAw/+f4AhhCCYACxBAD3GgciApJghhGCYACHGgciAvLABhWv+LYAAAAAAP/3
+XA2gAwUAbBAE9hYCHeCGBQDy4gALcJUFAKVl4lY4AhP1AAAobEAChjjSYNEPAGwQBBXK1dMPJFJd
+JVKi/pgAEjEIBQDlRQsCeF+AAPUPAAwwCgUAbYkHKVEAcpEDuFXRDypVAZpRKlUA0Q8AAABsEAQf
+ysUp8l0u8qLA0P84ABSxCwUA7poLBPmbgAAJuwxtuRwroQDcoOKxNXzABIAA8WQwDeeZAQDqzAgk
+SAUAAOzyoiaB2YAALVQADtYLDNwLImUAI8UB9YAmFaACFQDRDyOlAZSh+KAGHeACBQDRDwAAAAAA
+AAD9IgAO//72AMcv0Q9sEAQXyqTTDylyXShyov84ABSxCgUA6JgLBPhjgAAJqgxtqQ0rgQBysQvp
+nAEkQCEAAMcv0Q8jhQGUgfigBh3gAgUA0Q8AAABsEAQYye8eyXCPNB3KkS7ingj/Af2wSBXr/wEA
+r+7rMgUvdkKAAK7dKNAEwCD6+AAF8An1APkBZg3gDgUA0Q8AAAAAAO7UVCWAyYAAKNIUGsqBL4EA
+GckkCv8BCf8CL4UAj9Ir0hMq0hIu1hL/omYVr/jlAAj+Af+gRhWgDAUAWKXlwCDRDwAAbBAEKCEH
+GcpyCAhKDIgRCYgCmDCHIBbKTunKBxu+AoAAB0cClzHmABUBkCEAAAIAipU16TYEIZBhAADRDwAA
+AGwQBosz+kDoFaAMBQDsJCcqaASAAPtgAAP/O4EA60QABVCBAABbh18qICbAkeXJ8BGI2YAA5qQA
+DV8CgAD1QAayEgCdAAW7CCyynioWAPeACRHSAJ0AJLKdZED4LiEHH8pMDg5KDO4RD+4CnkCNIBzK
+KP2gABawDjUADt0CnUHsABUCUCEAAAoAivmTtgWgH4UAn0XoRgQpUASAAFs0UB3KPS8hGC4iEPxC
+KBWmlwEA4TgQDMsCgAAJiAKcS/1GAA7/efUA+OAEBPC3OQDoRgct3UKAAPsmAAzy/x0A/IDGFeAL
+BQDrRgkv/AKAAO/uAgzMAoAAmUieSosiwMEMuwKbIgxqEfVAAEVwCTUA+VOmFeACBQDRDx7JqI3o
+6hYAJo1zgAAMaxGluyyynm7DZiSyneRAYmbj/QAAnOhlTxz6IAYVoABKAAAAAAAA+EqGHe/7lgAA
+ixDaIOu8GClgBIAAW4iKLCAny8rAINEPAAAAAAAAAP/7hA2gBAUAwKBYo4keyY2N6OoSACaOawAA
+//6oDaAEBQDAQMD6D980/8EGFe/+bgCKJ8Cw+0QAFaAMFQBbjoMcyfofyfifoO0iACn0AoAADn4C
+/UBGFaALFQDupgMu7gKAAAvdAp2h+kTmHeACBQDRDwAAbBAGwFH9kj4F4AQFAPpBSBXvj+UA/ZH4
+BaGHBQD6YGgdoJ5VAOPJ5BWBmYAAhrj1QAQIkgCdAGiiOfVAEmGSAJ0A9UASWhIAnQD1QBPykgCd
+APVABJsSAJ0A0Q/1QBBIkgCdAPVAD2kSAJ0A9oBoHa//KgCIbixsOHyBJ4puiaDrogEkgHGAAJmw
+jaCb0ZSglKGIbsDx/Q8ADDAOBQAI/jhk79ecbuxmDytQBIAAW+Gz0Q8AKWISL2RkimIMmQIpZhLu
+JAUlBZmAAPugBV4iAJ0AZKIm/eACHaALBQDwBSANr/0FAAAAAAAcybSNIIgqH8m0K2ISioguIAUP
+uwGPoCtmEiqgBZoQiYCZEfkAsBWgOwUA+CBGFaAKVQBYpkCGJ4Zu52gICVAEgADlhJIp2ASAAFuD
+4iltAukHHgVYgQAACwJjCQCGCwJhlKSUpisgB/xAaB2huwEA67wYKVAEgABbjzUs+pIsJAXRD7G7
+ChoUZa/32mBbh+QtYhLzoAX7kgCdAIgqHMmPioiNIC4gBY+gKqAFmhCJgJkR+QCwFaA7BQD4IEYV
+oApVANMPWKYcgyeDPvZgAEbwDDUA7NSSIdgPAAAktFklJhMlJhQkJhEkJhYkJhIkJhXryXcZUASA
+AFuDtik9AukPHgVYgQAACwJnCUCGCwJllKb9kuYFoA0lAJ2lnKQrIAf8QGgdobsBAOu8GClQBIAA
+W48H0Q8KihTkr09l2CEAAHrI8fu/+fYiAJ0AtLv//NANpKodAADaYFshyR/JFC5iEg/uAf7CRhWv
+/M4AiE7DyP0ABTwiAJ0A9oBoHa/4XgApQhIvRGSKQgyZAilGEu4kBSUDyYAAetBp9oBoHa/5MgDa
+YFvhO9EPimf6ACId4AwFAPtEABWgDRUAW4ZGKWBlaJFfaJJk+T/tOdIAnQD6wGgdoAsFAPwAAh2g
+DSUAWGYD0Q8byUAcx+LtyT8ZUASAAFshw9ogWyGmiy0FuwKbLdEPAPaAaB2v+iYA9oBoHa/6BgD/
++dANoAsFAPaAaB2v9nIA2mBb467RDwD6wGgdoAsFAPwAAh2gDSUAWKYL0Q8AAABsEAgVySkPAgAm
+UqooYhMpUlVkgZrqySYUjLmAACoWBOnJIxK4EQAA6RYDJVlBAADrFgUlUsEAAPogRhWgBAUA6mIQ
+KlgEgABbjgXrcpUtB6IAACxSpKq6CaoRqsorogwpogrzYAblIgCdAGSRQSuSCGSxO/hgBYESAJ0A
+ZjCoLLIS84AJU5IAnQAtog3zoAj/kJ4lAC2gBf+ohg2gn1UA/6AE/WIAnQCbEZoQ+GAEmNIAnQAt
+IDWPEY4QjBL/4AgV4ApVAP/ACBWgOwUAWKWJihCIrX6Pa8C2W/7+YABjAJsR6hYAKf3WAAAtIDWO
+EI8RjBP/wAgVoApVAP/gCBXgOwUAWKV8ihAvoAUoCpV48TGLEcCS+WymHeALFQBb/u1gAB8AAAAA
+AOsWASGUnQAA+gCiHaA7BQDsEgUp6ASAAFilbCxSVbFE/J/3o6IAnQBgAFwpIAfvsActwASAAP0A
+CBXg+rUA+kLQFeCZEQDq/wEMz4KAAAn/Ai+EB/hA8BXg/MUADP8BjBT7AsYd4ZkBAPnmAA/wClUA
+/wDmHeA7BQD+IAAHcP8RAFilUmP/kwDRDwAAbBAIiCAjFgQpEgQjIAcXyEb2AEIdoASlAPkA8g3h
+MwEABEYC9GAJShIAnQAMOBEHiAgpgp73IBMbogCdACiCnQiEAugWAyQKKYAAGcfdCQCHbWkCCAJh
+KSEHiyAayDb8IIgVqpkBAAyZEeqZAg3WAoAA/WAI06AFBQAfyKGZQP+QWAWgDIUAnEOeQvmRPAXg
+DSUADaoCmkEJuQKZRCrygC7yf+shCSnHAoAA9wAARHAMBQDmhp0nc/0AAP/v5hWgDRUAW4VHiieO
+Iv9EABXvyAUACP8B5aUUJ/kBAACfqe+mCCcCsYAA/ZEQBaAKVQD8QAgV4DslAFilEogiZICEwLD7
+/gIdrwkFAG0IDXiQDQiIFOSAHGXYIQAAY//reKALtLvwABgNpIgdALG7CBgUZY/32iBbhryKJ8ef
+KaYAJSYHW4I0JSQE5SQFKhAEgADRDxXH54lY9yAKUJIAnQAMOBGniCqCnvdACpOiAJ0AKIKdZIFJ
+sJr6oQYVr/saAAAAAAAAAP/+qA2gCwUA0oDRDx/IX44THMbrlRH0IAYV4A1FAO2rAg3HgoAALSAH
+DIgC+cCGFaAshQCc45ngm+EZx9z5wEYV4d0BAO0WAijQBIAA790CAVmFAAD9wKYV4Aw1AFifFbQa
++kugFeAMNQBYnxKPEx7HrRvIRpX79eFGFe/49QCY+Zj4mPeV9owQihH4QOQV4IQFAPXgAEI3zMEA
+DKoCmvyKEo0QGMfCC6oC68fBHu4CgAD/pgAOupkBAO32DSzPAoAAC5kCKfYQiyAl9hYl9hcl9hgl
+9hkl9hol9hsl9hwl9h0o9hL74qYVoCyFAP3iZhWgDkUA7MayHdYCgAAOrgLu9hEtx4KAAAyIAvni
+hhWv954AAAAAAAD/9oANoAgFAMCgWKGNiVj5P/V4kgCdAP/2JA2gCAUAAMCABJo0+qEGFa/17gAA
+AABsEAgoIAXDrg8CAPsADaQiAJ0AiScqJAUPAgD7JAAV78QFAPVgBAWwAwUA45UUJdEBAACameqW
+CClQBIAAWyBf+kBoHaCLRQBYMveDKWQxP/eP/AXgRuUA9iCmFeBXZQCJNyiZFIU7KjAF5JIJJAFR
+gAB3oSr3QAb8IgCdAOY0BSnQBIAAWyBNGcfxKpF/fqcYzUhgAMEAAP//WA2gBAUA2jBbgjZgAK8A
+AGRAqowVjUOOQolAikH+YQQV4DslAP4g5hXnmcEA+CDGFeeqAQD6IIYVoCgFAOoyACwCCoAA+iAG
+FaDunQD4ICYV4ApVAFikYRvH1iuxf4oX/2qAB1P89QB8oWKNFmjWKGRASuo0AApYBIAA/CCIFaCP
+RQD+gQQd4A4VAP5iph2gDQUAWGKrYAAkjRSKNywKAA8CAOvUAAVQgQAAW4Sy9UBoHa/++gAAACs6
+/3uhD+NUAAr4JgAA8kEoFeAAsgCNN/2kABWvzgUA/4AEBjAOBQDu1RQmYQEAAJzZ/aEGFa//QgAA
+AAAA6yIKIYF5gADKvCmyCw8CAA8CAMiebQgJ6ZILLNgEgADIkWP/75O7+mGGFeAPBQCfKdEP0Q8A
+AADyQUYV4AgFAJgp0Q9sEBwoMCIVx50PAgAIiAkMiBGoUyUyfw8CAOokAAKCCYAAEsbULaAMLiJ7
+KiKDDt0I6d0RCtgEgAD9QABFcAwVAFiQXvYFoh2gJ2UA8IEQDeAsNQBoQwn0gAVikgCdANEPL6AF
+0w8PAgB88fLCgiikBVsf3fJwaBWhigUA+mAARTALBQD7TyYd7/n1AOmkeikBZgAAY//HAAAAAAD6
+YGgdoAsVAFhMKiMyCcg5KzAFdrnpgzllP/SCKWQvoiwiFXXJ9C0gBXfR7o8nKfrA5PIOJ8CBAAAJ
+iAH2QKYd4A4FAO71FCRBAQAAmPno9ggpUASAAFsfvSpBEYMqsarqRREp/WYAAGP/ryykBVsftyIy
+g2QvSx/HJe8WLSDwZQAA7hYuIOh1AADtFiwg2OEAAPol5hXgAKoAAAAAAAAA+mBoHaALFQBYTAIj
+MgnIOSgwBXaJ6YM5ZT/0gilkLwIpIhX1Pp4N4CtVACogBftAB41iAJ0A7BItKMAEgADyQUgV7g4F
+AP4lRhWgDQUA/CVmFeALBQD8AAoVoApFAP2OcgWgGVUAbZoCCACKnBCIMCoUGPoiZh3j+fUAKRUI
+/QAAFDAJtQAJiAKYES8wBPXgBoKSAJ0AKhIu+mogFeAMNQBYne4qEiz6acAV4Aw1AFid6xTGYSgy
+Fg8CACRCg8Of6TQFLEZCgACoRPol6BWgCVUA+CYGHeAIBQAoFDHoFDIiWQEAAPgmZh2gDIUAWJ3b
+60xIINH9AAD7RaAVoAw1AFid1i4SK+o0AAjYBIAA0w//DgAPMAy1AP4hphWgDSUAWEg5iCcq+sDk
+gg4kSIEAAAqZAfZAph3gDwUA74UUJMkBAACZiemGCClQBIAAWx9XK0ERgyqxu+tFESn1rgAAY/64
+KhIu+mkAFeAMNQBYnbskHH8kTCkvQAHtQAIg8HUAAC3kAi/kAfSAEBWgLLUA5OQAKaAEgAD8YKYd
+r/y+AABsEAYpMCIYxuYJmQkMmRGpgysyf2Sw8RXGIC0gDC5SeypSg67d/agAFrAMFQDtqggCkgEA
+AFiPqvyDgBHQKyUAyUQvoAV7+RfCgflAph2gAEoAAAAAAAAA9IAJIxIAnQD6b+gV4YcFAKc6JKB7
+JqB65aB4JYSpgAAtoIAaxgcuIpsqooOu3QndEf1AAEVwDBUAWI+TL6AHJqQW9AIABHD5tQDp/wEM
+R4KAAPnmAA+w/sUA/+AEB7GVAQAJ/wIvpAfqMogtEASAABzGuCugBy0gBac4DrsB+yYADPf2AQDp
+pAcqcASAAPkPMBWgOyUA+CAGFaAKRQBYozMjMoPIORXGq/iYABIwAC4A0Q+DOWQ/+I0wKjEZLiAH
+KSAW6TQWKuAEgAD+YOYdq6oBAPqGAA0wOyUA+mMkHaAKRQBYoyKKOsymY//Fiqlkr8AsMActMBYr
+MRmJqiulKS2kFuykByT/MYAACwtPbQgTK5UiLqAHL6AWL5QWLpQHiZhkn8dj/+UooAXCk/kf9r1i
+AJ0A+0CmHe/7PgAAAABsEBAcxoYaxoQswIAtooYvooQuooii3eL/CA7uQoAADe0I7dIHL/5CgAAP
+7gj+IqYVoAsFAP2hyBXgCEUAbYoSALAEDA4b7+cHdfgFAAAvFhKxuyYagKbWKGDl9wAOCJIAnQAb
+xnHpxm8Rc/0AAP+M2AXgDRUA/iGmFedyAQD2IiYV4A8FAP4h5hXgDAUADtw47BYKKUTCgACpiJgc
+6MZjGVeCgADrqggBqAkAAPohZhWgBwUA6BYOJEEBAAD4IgYVoAMaAIoaGcZaiB8KmDkoFg8pEg//
+cAAVsAoVAOsSCy2BCoAA/UABBVAIBQD7IABEsAqFAPl4ZhXgCwUAbaoX+wAEANOpAQDgqhoEQAkA
+APtgAEW0mR0AjBwrxossEhAtEhUvEhEuEhYt0CL+IAYVoApFAP4iiBWgOyUAWKK7KhIVKqAiKBIU
+HsY7Cq8J6RIWL/8CgACv7vnPxh3gDxUAL+R9IuR8KOR/WAQPK2Dl4zwDI7gFAADvAgACqA0AAPrg
+BOniAJ0A61QAANCBAAD0YDAVoAwlAFic48CB/CKoFaLkKQD+IoYVovQBAO4WEy8BCoAA78RfLEAK
+gAAoxF4tERAtxTAqERCs7CzARPwixhWgG4UA6hYAKWgEgAD9jCwFoApVAFiikRvGFSlg5yoREGWf
+d3uhKhzGEi0SEv1f+10iAJ0A+b/4oVIAnQDrEhMpdaYAAMDg/iHmFa/63gAA0Q8YxMAUxfwogpIk
+QoiiiAmIEahEjUAvQRksQDT+hrAVoAkFAPqA8BWgCxUA7785BmPpAAAMuTiMHZoQKEAW+CCGFeA7
+BQD4ICYVoApVAP4gZhXgCAUA+CBGFaAPJQBYomuMHi0SFi8SEf4iiBWgClUA/iEmFaA7BQBYomQi
+RAcsQDQpQRkexcOKGY1KKxIW60QWLXzCgADu3QIEgFGAAAkJTClFGZ1KD58CL0UZ+Z/001IAnQD6
+gGgdoAslAFv8lmP+h2wQBOLEjxloBIAAHMXVGMRiJCKhIiKfKIKBrUTtIggKJkKAAKSEhEfuMAEp
+FkKAAKgi9IHIFaAKVQD+RaYdoBuFAFiiQShNAiiAZ8iF0Q8AAAAAAPpAaB2gCxUAWHEi0Q8AAABs
+EAT3iIAFoReFAAcnKKdmJ2L7BHcoB3cK/vgAE7PohQAIdywaxbfiKQsJxwKAAKhmA5kJGMW0DJkR
+qpkIeAKYkPbXRhXglcUAJWa50Q8AAGwQCBTEYigwABbENiVCoSRCnyligaJV4kQICq5CgAD1IABC
+8AqFAPSg6BXiiAEA6Kg4CiZCgADpRAgB2AUAAPShyBXgDEUA6ERcINBBAABYnE+JFLA7+J/gFaAN
+BQD8i2Yd46kBAPqJZh2kmR0A/GGQFaAKdQAPAgDTD9MPbaof/QtmHeOpAQDshFQl2/0AAPsJZh2k
+mR0A7LANJEP9AADsxYYeWASAACuEVI4UL0BPKUBOJ0BTKEBQKkBNLUBRK0BS40BMLVQCgADg3REM
+QgKAAO2IAg3eAoAA63cCCZoCgADqMwIMzgKAAAn/AgP/Agh3AucWACloBIAA8ouQFeAKVQDyICYV
+4BuFAFih4ixdAizAZw8CAGXAbS1AXINAKGJ98gACHaAGFQDTD+gzDAaCwYAA2jD6QGgd4AwFAPRA
+AEKwDQUA9KmQFeAPBQD+ICYV4A4FAP4gRhXgaUUA+CAGFeAPBQBbfQJmoB0GXDfqNAAJWASAAFt8
+5uagDmEQBQAAKEBceCOr0Q/RD9EPAABsEATAIdEPAGwQBMAh0Q8AbBAEwCHRDwBsEAQVw/gYw80m
+UqElUp8ogoGiZuJVCAs2QoAApoaGZwlVEahV5mIOIgH5gAD9inIFoApVAP5gEBWgG4UA7lQtKWgE
+gABYoan6oGgdoAsVAFhwjiltASiRocCiCogC6JWhKZAEgADRD8Ag0Q9sEAgYw90Ww7LjgqEp0ASA
+ACiCnyVigaIz4ogICZ5CgADyoABB8AsFAPJg6BXgD/UA/QgAFDAJhQD4oABCsAIVAOMyDiIGeYAA
+/UAIFaAEBQBtmiMLXQz7TwAMc+wBAP/ABUxkzB0AJNRbLtRLKIAL6NRTJdgFAACLUCmgDClUXCZi
+fcBA5rYMBIOBgAAqFgTaYPqAaB3gDAUA9IAAQ/ANBQD26ZAV4AkFAPggJhXgDgUA+CBGFeBoRQD4
+IAYVoA8FAFt8pmagGwJ8N+pkAApYBIAAW3yK5qAKYiAFAAAoUFx4Q6srPQEpsaGKFAKZAum1oS0Q
+BIAA0Q8rPQEpsaECmQLptaEtEASAANEP86tmHa/9agDAINEPbBAEiDAqMAgrMAnxAAkqUygBAPSA
+BerQDtUA/GIAFeO7AQD6IAAGMqohAOTBDWZD9QAA/gBCHeAEFQDo9DgFB6mAAPVAB2vSAJ0ABKYM
+BgZHprn5wAbrYgCdAGRgXhjEze/DdRl0woAADr4K6O4IC0gEgADv7wgO2ASAAPUgBriSAJ0A6LQA
+DdAEgAAPAIfrAAcHcEEAAOoGAATL+QAA6iYAB/hBAADohx4F2EEAAOiDHgz+TgAADWsRDb0KBA5H
+ZOBZ+kBoHaALJQBYAChgAEsAAAD9iUYF4B+lAO9JVHlkwoAA2zD4AaId5MgFAG2aGKyJrZkqkoDp
+koEl2CEAAOq2ASRAIQAAmbD6QGgdoAslAPxuABXgDDUAWAAUwMDqVAAJ2ASAAFif4cAg0Q8AAAAA
+AAD//5wNr+ylAP9fQA3gBAUA6rgIBTuzgADo4uR9MASAAGP/BhnDXanpKpKAmrApkoH5YCYV7/0+
+AGwQBBjEisec6IKAIgCBgAB0mAgaxHZoMQtoMgjGKtEPAAAAAAAqoIAAIAQKCht/p+r0YArZEgCd
+ABfEfhzEfQgDQWQxVfRgCuCQCxUADykRHsMfGsR57cNCEn18gADAJO54CA0YBIAA+EAF4NIAnQCt
+fyLygJIwL/KBnzHptgkNl8KAAOabL3F4BQAACpgKg1DyoCgVof8dAG35GoeAo3OTUIaAdjsDsSKS
+UY+BovLiVgEkQCEAALhV7kdjfRgEgAD/gABCMAJFAO8CAAm4BIAA+EAESNIAnQCtwiYigJYwIiKB
+kjHptwkNl8KAAOebL3FABQAACpQKg1DyoCgVoYgdAG2JGopAo6OTUIlAeTsDsSKSUYtBorLiVgEi
+ICEAAMAg0Q8AAAAA7zQACbAEgAAIAIfjAAcDuEEAAOYGAAET+QAA5iYABEBBAADvhx4BmEEAAO+D
+Hgl4jgAAY/8d2DAEIIfjIAcGYEEAAOhGAAET+QAA6GYAAiBBAADnjx4BmEEAAOeLHgl6FgAAY/9W
+AAAcxCv3iFYF7/qiAMCQ//q8DaALRQAexCcDLRGu3Y3Q+gBCHeAKBQD9tWAl4AlFAP1CAAz/+jYA
+AGwQBIgw/mEwFeAapQD6YRAV7+ylAPEAB3pTKAEA9IAG+tAXZQD8YgAV4AQVAPogAAZ17wEA/gcA
+B/K7IQDkwVdmS/UAACgKAumEOAWKIYAA9WAJ49AIFQAEtgwPjzn+7QANd2YBAAboCPlACRsiAJ0A
+ZGBsGsKkGMMo+oACHeVJBQAPuTnp7goJfMKAAA/uCOjuCA7YBIAA6u8IC0gEgAD1IAi4kgCdAOi0
+AA3QBIAADwCH6wAHB3BBAADqBgAEy/kAAOomAAf4QQAA6IceBdhBAADogx4M/k4AAA1rEQ29CgQO
+R8jp+kBoHaALFQBb/1LwAEwNoAwFAAAAAAAAAAD6goYNpAgFAOpUAAnYBIAAWJ8ZwCDRDwDtw8UZ
+2ASAAPhYABYwGXUA0w9tmhisia2ZKpKA6ZKBJdghAADqtgEkQCEAAJmwKFpA+mBoHeAZtQBtmhms
+ia2ZKpKA6ZKBJdghAADqti8kQCEAACm2Ltog/DMCHeALFQD8YABG8Aw1AFv/Lf/+BA2gDAUAAAAA
+AAD//dANr+ylAP9/QA3gBAUA6+gIBbuzgADAkQ+fOQ96OXii3PdgaB2v+vYAGsJ3quovooCfsCqi
+gftgJhWv/D4AbBAEGsOrF8JLGcMQGMNupzfTD9MPbQhM6FFMalgEgADcQC2CQC6S0grmAQYmAiaW
+0i+S0gcAhwQAYS6W0u2S0iIgQQAA7AYAAZhBAADsJgADuEEAAOuHHgKr+QAA64MeAoGBgABj/6gr
+gkAvktIK9wEHJwInltImktIVwlOlNSZSgJZBJVKBlUAvltIuktLRD9EPAGwQBIswxsrxYAWiUKs5
+APaABWFQhgUAH8Ii7sJGGAQKgAD0gASi0gCdACQxBATNQvGqAA3kRAEA9aAEw9AcBQD1oABEsBgV
+AArIOfkABCvgDBUAwJD7ggAMswgFAOmGOQHgQQAA5koLBeHOgAApIAwbw2wGmRGpqauZr5r1oAmw
+kgCdAOvEAA54BIAACgCH7AAHBMhBAADvBgAG6/kAAO8mAAVQQQAA64ceBmBBAADrgx4O/k4AAGAA
+PcCJeEFU6lQACdgEgABYnpPAINEPAAAAAAAA//+cDa/spQAZw1LAuG26CS6SpQ4OUsniuJnAsKq7
+KiA3W/+d//8MDaAMBQArkqQLC0n/cAAVv/+aAAAAAAAAAOi3QXHgIQAAGcNCwNht2gkukqUODlLJ
+57iZwKCmq/pG8BWgHQUAW/+M//34DaAMBQAqkqQKCkn/UAAVP/+GAAAAAAAAACogDBvDMwaqEauq
+/0AARfAZBQDokTRuaASAAN/ACyCH7CAHBVBBAADvRgAEy/kAAO9mAAXYQQAA7Y8eBmBBAADtix4M
+/n4AAGP/mK6oKYKAmcAogoH5gCYVr/4uAK6aK6KAm8AqooH7gCYVr/zSAGwQBCggBGiGBcAg0Q8A
+ABTDFYwuK0J/CcwRrLuLt4u+LrAdKbAcKrAYLbAZ7LAeLM4CgADumQINVgKAAA2qAi6wGu2wHyzO
+AoAADJkC7LAbLM4CgADtmQINVgKAAA6qAi2wFe6wNS1WAoAA7KoCBOAFAAD9Y+YdqIwdAOnLBndw
+BQAAsaossBQotB4utDUqtBsusBb7YhAVqPodAP9jRh3oiB0A+WOmHaj/HQD/YyYd6IgdAPljhh2o
+/x0AL7QY77ARLmYCgAANzALtsBIuZgKAAO7MAg1WAoAAD6oC77ATLVYCgAANqgItsBfuMQstVgKA
+AO+qAg5mAoAADcwC/cAARjANBQD/gNINqPwdALGqKrQTLLQX/2LGHeiKHQD5YkYdqP8dAP9iph3o
+iB0A+WImHaj/HQD/YoYd6IgdACi0EIwtK0J/CcwRrLuLt4u+L7AZKrAYKbAcKLAd7LAeLVYCgADv
+qgIMzgKAAAiZAi+wH+iwGizOAoAADJkC7LAbLVYCgADoqgIMzgKAAO+ZAg1WAoAA7KoCBOAFAAAs
+tB/5gNIN6IwdALGqLLBZKrQb+WPGHaj6HQD7YhAVqIgdACi0Hf9jRh3oiB0A+WOGHaj/HQAvtBn5
+YjAVqP8dAO+0GCZgBQAALLRZLLAU77AVLVYCgAAIqgLosBYuZgKAAA/MAu+wEi5mAoAACMwC6LAT
+LVYCgAAPqgLvsBctVgKAAAiqAuraCA5mAoAAD8wCrOx+ywGxqi4hNy0hNiq0E/1i5h2omh0A+WJG
+HejMHQD9YsYdqJkdAPliJh3ozB0A/WKmHaiZHQD5YgYd6MwdAP1ihh2gCiUA/YT4BaA7JQBYnuKN
+N/5hKBWgCiUA/YTwBaA7JQBYnt0tIAXE5f+/610iAJ0AxfX+QKYd4AIFANEPAABsEAYqIAcYwm79
+hNwF4aoBAAqkCenA2RonAoAArUYjYn+pRKhE8oEeDeALBQDAINEPjjGaEYcwl+CPMCw5ECfSp57x
+mzDrNgEmA0GAAIo3ZKBejaEYwlgcwlz5D+gVqJ0dAAyZAeo8GCzOQoAA+QAARHfdAQDoFgIr4ASA
+AFt/HRrCU/phJBXgDAUA+0hoFaANFQBbftkqPPhbe+TccOoSAirwBIAA+iBoHeANBQBba1crYn/1
+f/usIgCdAIwiZc9rixHaIOu8GClgBIAAW4eowCDRD2wQBhPCIgIkCQxEEQQzCCsyICQwfyYwfuUw
+fCWIeYAAHsDXLTCEGsFMLuKbKqKDDt0ICd0R/UAARXAMFQBYitgvoAcmpBb0AgAEcPm1AOn/AQxH
+goAA+eYAD7D+xQD/4AQHsZUBAAn/Ai+kB+oyKS0QBIAAK6AHHMH8LSAFDrsB+yYADPf2AQDppAcq
+cASAAPhvsBWgOyUA+CAGFaAKRQBYnngjMiRkMIEVwfD4mAASMAAqAACDOWQwcI0wKjEZLiAHKSAW
+6TQWKuAEgAD+YOYdq6oBAPqGAA0wOyUA+mMkHaAKRQBYnmeKOsynY//FAIqpZK+/LDAHLTAWKzEZ
+iaorpSktpBbspAck/zGAAAsLT20IEyuVIi6gBy+gFi+UFi6UB4mYZJ/HY//l0Q8AAABsEAQpCoAJ
+OgHyYAmeEoNBAKmJ9SAJj1IAnQDVkPFT8A3ik0EALyAMG8HpHsHp+eAJdWajAQApIA0tIFUsIFQW
+weXtzAgEgVGAAOSRCmZj/QAAKOB9LWJgsJcIdyiv3afdC9kKKZKACQlGeaESLSBV/UAHY+IAnQD9
+QAciogCdACkgDewgDCSBiYAA6OB9JICJgAAvYmCwnQjdKKz8DcwIC8kKKZKACQlGeakI8ABUDaAL
+BQAAKSANKyBVwMEJyTkLqwyrmyoiFFt+aujAYBUEiYAAKIKeLWKfpYUJVREF1Qgbwb0ZwLzpAAUN
+yASAAAkCYQkCYQkCYQkCYR7BuRjBtxLBAOFKEApIgoAA+yYADLAMFQAMmQIpJp0ogpP+ZgAPMA1V
+AO4mnCrQBIAAC4AAIiKdAoJHySbRDwAAAAAAAP/7XA2mkwEA9TAAFe/7RgDCgihUBdEPAP3gaB3v
+/BYA//30DaAFBQBsEAgmIAwUwZoYwJglIA2YE+gABQpIBIAACQJhCQJhCQJhCQJhHcGVGMGTHMGV
+HsGV7kYBK04CgADpWQICOkEAAPyAhB2gCgUA6kQRKd8CgADrRBApUASAAOiCkCpYBIAA/SYADPAM
+RQD4gAYV4A1VAAuAAClyHQmJR8iS0pDRDxrBgxm/4itxPAM+CRjBTx/Bfu8WBS93AoAA+cAARDu7
+AQCbF5gS+w/mFeGNBQCtjaqZqe6eFibUgCXUgSrwASzwACzkACrkASjwAynwAinkAijkAy3wBS/w
+BO/kBClQBIAA/cCmHeAMFQBYigeLFhzBQSkhCCghCSYhB+UgDS0YBIAALTAmLyAMKiAUDd0JLzQM
+KDUJKTUI6jQULu8CgACtzSY1B/Rhph3gDvUALjQEhReOExbBUC3Qfw4Ah+4SBSpIBIAACQJhCQJh
+CQJhCQJhGcFP84KgBaAMRQDsdh0uxQKAAAmIAgJSAiJ2HCh1PCiwACmwASnkASjkAC2wAi+wAy/k
+Ay3kAimwBCqwBSrkBSnkBChikcDV60QACdAEgAALgAAuch0PAgAPAgAOjkfx2/AN4V8FAPXADb0S
+AJ0A+4JsBa+OAQDp5AAMdYYAAB7BMIsSKaECKRUCiqDqFgAl2AsAAC21BCgwJokTHcEBCIgJ6QAF
+DEcCgAAI3Qjt0H8qSASAAAkCYQkCYQkCYQkCYSJ2HChikSwRAikRAC8RAf7nxB3gCkUA6nYdKlgE
+gADpdT0p0ASAAOx1Py7NAoAA/yYADLAMRQD454Qd4A1VAAuAAC5yHQ8CAA6OR2Th3PXADs0SAJ0A
++cBoHe/+AQDoEgMv8EYAAOgABQpIBIAACQJhCQJhCQJhCQJhKGKSGcED+4IGBeACFQDidh0p0ASA
+APrjxhXgDVUA6VkCClgEgADpdhwpYASAAAuAAClyHQmMR/GXHA3omR0AjBP6AIIdoAsFAOwABQpI
+BIAACQJhCQJhCQJhCQJhInU8KGKcGcDtK3U9HMDs+uOmFaANVQDsdiAp0ASAAOlZAgpYBIAA+OOG
+FeAMRQALgAApch0JjUfxsTwN6JkdAIoT6gAFCkgEgAAJAmEJAmEJAmEJAmEoYp8ZwNr7gbQF4Awl
+ACx2Het2HynQBIAA+KYADPANVQDpdhwqWASAAAuAACJyHQKCR9EPLXE8DwIADwIADQ1J/f/x6uIA
+nQCOE/wghhXhjAUA7gAFCkgEgAAJAmEJAmEJAmEJAmGNEgzdCCzQhC/QhSjQhinQgy7QguiIEQ/8
+AoAA6P8CDM4CgADt0IcvdAKAAAnuAg7MAg/dAg3MA/LjhhWs3B0A/ZcADnALFQD/gWIFptwdAP2X
+AA5wCgUA/uOmFaXMAQBYnxX8AIIdoA1VAOhikS1IBIAA63YfKdAEgADpdh4qWASAAAuAAC5yHY0U
+//YwDafuQQAJAkfRDyhxPA8CAPkgAAQxXwUA+f/wyqIAnQAqEgPqAAUKSASAAAkCYQkCYQkCYQkC
+YSwQAi4QACgQBCkQAS8QA+0QBSxGAoAA6JkRD3QCgADp7gIP/AKAAAj/Ag/dAg7MAg3MA/LjhhWs
+3B0A/ZcADnALFQD/gQIFptwdAP2XAA5wCgUA/uOmFaXMAQBYnuX8AIIdoA1VAOhikS1IBIAA63Yf
+KdAEgADpdh4qWASAAAuAAC5yHf/12A2n7kEAAABsEAaJMCsgDB6++RrAMI0yJuKbKKF/KqJZ+sAA
+Q3fdwQD8yAATMykBAOpmCAQEmYAAepZE7MBjGSFQAADwAOwNoBRlAAAqFgHpFgAji3mAAAZqAvrg
+aB3gDBUAWIjtK6AFLAoh/WAPdCIAnQDaYOskAAvgBIAAWACQwEDaUOs0AApgBIAAWJtswCDRDy/i
+nxnAEAIrCeL/CA3fAoAAqbnnkf8v/kKAAO+qCAb80YAA/aLgANAUZQBj/8AAAAAAAAD1fs4Fr/7e
+AAAAmxKaEekWACONcYAAGcAvGL6OhBKpiOhECAHQgQAA+oBoHeAMZQBYlr6POY04AEQE/6sADvTt
+HQD+YQYVoFcFAOc0ICHQoQAA/GEmFeAOBQD+ZOYdp91BAOLdAgpYBIAA/GTGHeAMZQBYlq6KO4g6
+AEQE+wsADDSYHQCZOuc0KCpYBIAA+GFmFa+JBQD4ZeYd54hBAPMGAAwwDGUA6DQuIdBpAABYlp+L
+ENpg+3/kFeAMFQBb/ggKBE9lTvTaIFv9uY4RLuAiHcAMDu4J7GAML3cCgACu3S3QgP2f9qViAJ0A
+2mD6ICgV4AxlAFv43mP+v4gRDwIAKIAiCIgJ72AMLEcCgACoyCiAgPngBewiAJ0AiWcsYgIrmRTz
+f/AFoA0VAO3MAgTQgQAA7GYCJYWJgAArkglksKYusAAvCip/6QUosgJygUH6AAId4AwlAFuEJBu/
+6x2/mZ2gjGCSopOlJKQc9UDGFe/59QD7QIYV4A0lAOmkHS5mAoAADcwC7KYBKtAEgABYmyDAINEP
+ihAqooPJoSugBf1/sAWgLVUA/X/6fGIAnQDaYOskAAvgBIAAWAAPY/346mQACVgEgABb/h8KBE9l
+Telj/kGLEfrAaB2gDFUAW/ftY/82AAAAAPoAAh3gDCUAW4B9Y/9kAABsEAYVv6z3f1oF4I8FAA9G
+AfKAEN4SAJ0ABIlCr5n1IBC3UgCdAJkS7L+kEwbRgAAtIAz+QbAVorRBAPugBj1mNAEAKyBVKSBU
+65kIBw/ZgADk4htk+/0AACnAfStyYLDoCYgorbsIuwgFvQot0oANDUZ9MRIrIFX6YART4gCdAP5g
+BBLiAJ0AKSANyp7rIAwkgJmAAC/AfS5yYLCdD90oq+utuwW4CiiCgAgIRng5CfAAWA2gCwUAAAAp
+IA0rIFXA0QnZOQs7DKubKiIUW3wj7L96FQ1hgADoEgImUCMAAC+ini5yn6j/Cf8Rr+7uFgEjAPmA
+AAQDRm4+ISk8gPggBhXgAHYAwLDrFgErf04AAPRIAAGwiAUAqDNvPt2TEPDVUA3itEEAKiAMLSAN
++0AKPWY0AQArIFUpIFTrmQgGiImAAOTQE2Tz/QAAKMB9L3JgsNsIuyiq+quqBakKKZKACQlGeTES
+KyBV+mAIW+IAnQD+YAgaogCdACkgDcqd6iAMJICZgAAuwH0tcmCwmw67KKraq6oFrwov8oAPD0Z/
+OQjwAFQNoAsFAAApIA0rIFXAwQnJOQs7DKubKiIUW3vn6L3dFQWhgACJECiCniJyn6mICYgRqCIb
+vzoZvjjpAAUNyASAAAkCYQkCYQkCYQkCYRO+fhi/NPl+aAXgDBUALDadKIKT6UkCCVAEgAD4c4YV
+4A1VAAuAACkynfogKBXnmUEA8SMQDeAqNQAqtAXRD//3yA2mlAEALJyA/CBGFa/3pgAAAAAAAP8g
+aB3v+LIA/yBoHa/8VgCOEcLy/kCmHeAtNQAt5AXRDwAAAAAAAAD7oGgd7/fWAP/9bA2gAgUAwID4
+ICYVr/nKAAAAbBAIijAbvx6IIvl9wAXjqgEACqoJ577KHVcCgAD7IABEsCylAOaR/yQDOYAAiSct
+mRTk01Zk0IEAAC2SCWTTSy7QACjSAnzpAnuBP/oAAh3gDCUAW4NEHb8KG78Kl6CMIJOlJKQclab7
+QIYV7/n1ACmkHS2mAv2AABYwDSUADcwC7KYBKtAEgABYmkDAINEPmRD9fcoFoIoFAAptAfLAFp4S
+AJ0ABolCqpn1IBZ3UgCdAJkV7r7fFofRgAAoIAwrIA34IEYVopZBAPkAByVmdgEAKiBVKSBU6pkI
+BZbBgACwmuoWASWXcYAAGb7QKZB96uJgJcP9AAAJiCiJEqmqCKoIDKsKK7KACwtGe3EXKiBV+uAE
+66IAnQAoEgHTD/jgBIKiAJ0AKSANy5LqIAwkgLGAABi+viiAfbCbCLsoKOJgqoqrqgypCimSgAkJ
+Rnl5CsCw/CDGFeAAbgAAKSANKyBV/CDGFeAIFQAJiTkLewyrmyoiFFt7Vhy+rI0W7r6sFRSZgACL
+FSrimininwuqCAmqEQqZCOkWBCaBEYAABgdGbn4kK3yA+iBmFeAAggAAAADA8O8WBC7/NgAA9kgA
+A7CIBQCod29+2pcT86PQDeKmQQAtIAwrIA37oBF9JnYBACogVSkgVOqZCAWOiYAA5LHpZPv9AAAZ
+vo0pkH0q4mCwuAmIKK2qqKoMqworsoALC0Z7cRIqIFX64A+DogCdAP7gD0LiAJ0AKSANy5LqIAwk
+gLGAAB++fS/wfS3iYLCbD7soqtqrqgyoCiiCgAgIRnh5CvAAYA2gCwUAAAAAKSANKyBVwMEJyTkL
+ewwLmwgqIhRbexdkoZMYvQyJExe+bCiCnidyn6mICYgRqHcbvmkZvWjpAAUNyASAAAkCYQkCYQkC
+YQkCYR69rhi+Y/l8xgXgDBUALOadKIKT6WkCC9AEgAD504YV4A1VAAuAABm9pCmSnRa+bY0U+iAI
+FeeZQQDxLfAN4Cw1AIknLNQFKpkU/EBIFaAHBQAntoPkoJxk2IEAAOqSCSYHOYAAZKCPLqAAwvp/
+6RQYvlqMovmABiQiAJ0A95/rJCIAnQDasPwAQh2gCwUAW4KMGb5UHL4BnKCLIJaik6UkpByVpvdD
+ph3gDCUA6aYELd4CgAAMuwLrpgEq0ASAAFiZicAg0Q8AAAAAAAD/9OgNppYBAC6cgP4gphWv9MYA
+AAAAAAD6AAId4AwlAFt+82P8vAAAZMBP2rD8AEIdoAsFAFt+7mP/iQAAAAAA+CAmFe/1ZgD/IGgd
+7/liAMKS+OCmHe/8fgAAAAAAAAD6IEgVr/SqAPugaB2v+KYA95/6jSIAnQBj/JzaUPpgaB3gDAUA
+WJk+2iBYkzzAINEPAAAAAAAAAP/59A2gBwUAwKD6IIYVr/YeAAAAbBAGJjAIJzAJ9iAABLJmIQDo
+MgAjBnmAAPTABjvQOoUA8QAGilB7hQD0gAW60gCdAPDgCf4SAJ0AGrz1GL32mBDqAAUMUASAAAoC
+YQoCYQoCYQoCYQmaCRm+AQyqEaqZIpIfZCB9HryILZCAGrz+LuKbKqKDrt3p3REJWASAAP1AAEVw
+DBUAWIaJixAfvfkYveL/e/AFpZcBAOmc/ytlAoAADJkCJOY/KeWAKIKW/kYAD/ANVQDv5j4qYASA
+AAuAABy97CzCP/hiABXnzEEA6L3rFgORgAAMDAbwACQNr8wBAAAAHL3l6lQACdgEgABYmPnAINEP
+e4bqjTFx1uXpvWYSK4uAACggBGiBRPUABaISAJ0AaYXMBwhFqG8N/xH//wAV4E4FAH/juQOIC+kA
+FQMAUYAAbWkCCACK//6gDaAMBQAAAG1pBQgAiAkAimP/lQcIRahrDbsRK7z4e6OEA4gL6QAVA36p
+gABtaQIIAIpj/8cAKCAEaIFz9QAFGhIAnQD5H/ry0gCdAAcIRahtDd0R/b8AFeBMBQD9n/oz4gCd
+AIoniq7qiAsByEEAAORviWRD4QAAbWkFCACICQCKY/94AAAHCEWobA3MESzM+P1/+IuiAJ0AA4gL
+6QAVA3rpgABtaQIIAIpj/08AAAAHCEWobQ3dES3c+P1f9zviAJ0AiieKruqICwHIQQAA5G8qZEPh
+AABtaQUIAIgJAIpj/xkHCEWobA3MESzM+P1/9aOiAJ0Aiicqog7qiAsByEEAAORu9mRD4QAAbWkF
+CACICQCKY/7lAAAAbBAKG7xt8kRQFaAGBQAmNB8mNB4mNB0mNBwmNBsmNBomNBkmNBgmNBcmNBYm
+NBUmNBQmNBMmNBImNBEmNBDrBAUI0ASAAAoCY+sABQDIUQAACQJhiDDqFgQh0EEAAOkWCSQkWoAA
+BVoC+mBoHeAMBQBYmILAINEPGL1YFLu3AikJDJkR+IAAQnAMZQD4gABCMCvlAOs0DypYBIAAWJPk
+jzWNNABEBP+rAA707R0A/mCGFaBXBQAnNBDtNgUqWASAAPZi5h2n3UEA4t0CAdBhAAD8YsYd4Axl
+AFiT1R+9VIg2G7ujijf9eqAFpJgdAPhgxhXiAD0ACogYmDf2YwYd54hBAPMGAAw/iQUAKTQf6DQe
+IMhRAACWkJaRlpKWk5YQlhH2IEYVp9gFAJgT/CBkHaAa9QAqFQX6IEQd4A2lAC0VAf4hRB3gDhUA
+/iQmHaD99QAtFQQtFQ7sFQ0o2ASAAOsPHgHQgQAACgJn6QseAcDBAAD4CKgdr/u+AABsEASIMPEA
+BWLSAJ0AiTFnkKIUvOUqQosroQJksWlbdeodvFIs0g4szAEs1g71QAq4EgCdABi7nyiCjx28ACRC
+iAqICAmIEQhECO0ABQJIgQAACQJhCQJhCQJhCQJhCQJhCQJhLyAMLiANLSEHLCAHKyAWKSB8+kFI
+FaAIRQAoRAQvRAwuRA0tRQcsRAcpRFX6gsYd4Dv1AOtEBSUHoYAAKaIIyZ9tCAnpkggs0ASAAMmS
+Y//vwcbqVAAJ2ASAAFiYEMAg0Q+UqPqGBh3gBgUAlknmRggh2EEAAOtGAAJQ0QAA6oseAchhAADp
+JgACQPEAAOiHHgH4gQAA7wYAAnFxAAAOAIqNO+1GGSHgwQAA7AMeAlmhAADrDAACUTkAAPhACBXg
+DDUA6UYWIdg1AABYk2EqTFH6SQAV4Aw1AFiTXRm8u49AjUcsISkrIhMqIFAqREwrRhL8hEQdr8gF
+AOn/AQbwgQAACO4B7zYKJ3EBAACe2f+hBhWgDAUA96KEHa/84gAAAAAAAP/8rA2gDMUA9EFGFa/8
+0gBsEAwWu/QavMaJMOe8xBqgBIAA9XlABeArtQDqmgEErCSAAIwxZsFzepZEizIqcnYFuwHtIgAt
+3kKAAKuqLqIe6TwgIfihAADrrDglQQEAAP+gCKQiAJ0AwcbqRAAJ2ASAAFiXwcAg0Q8AAAAAAAAA
+7HJjJKXYgACKMityIgWqAXyrBKy7erPPJXJ2CagR+KAAQrAMZQDqPBIi2bEAAFiTH/inABXgDAUA
+6UYAAcBhAADoix4C+QEAAO8mAAHwgQAA7oceAulRAADtAx4B2KEAAOsMAALRkQAA6gYAAcjhAAD4
+gmgd7/3WAABkr2qKMexyYygECoAA8V/66FIAnQCKMi1yIgWqAeyrDn1GQoAArN37v/obogCdACVy
+do4qqFX13/mkYgCdAClQBfsgEsxiAJ0A2lBYRij6oGgdoAsFAFhA5NpQWEBn6lQACVgEgABYQEcq
+YhD7X+AVoAwFAPrCBhWv++IAAAAtPBgNoIgLFIoJgIj4omgdoAwFAO8HHgVxUQAA7iwAAejhAADt
+ZgAFWZEAAPqaaB3v+woAKnJ6LqECZOHaW3UiL2IQsf8vZhD1QA5gEgCdABu62SmykBi7OSZydqqZ
+CZkRqWboAAUDSIEAAAkCYQkCYQkCYQkCYQkCYQkCYS8gFiggBykhByogDS0gDPzBhh3gDFUA/MCG
+HaAutQAuZAUqZA0uIQksIQgpZQcoZAcvZBYtspsrIAwqcnYuZQmtu+xlCC3eQoAAq6r6QqgV4AwV
+AFiEwYsq56QABZZxgACJueq0AASAeYAA6ZIJLNAEgABln/SWqZJoiiApIRkoIDb4yWYdoAsFAJtp
+m2qbayllKfrDxhWgDGUA7yBTI1HJAADvZHwhWQEAAFiSohq8Ih+8IBu8HvwiABXgDAUAnNCc0ZzS
+nNOcEJwR/CBGFafeBQCeE/ogZB3g+fUAKRUE/iEEHeAIFQAoFB0pFQz6IWQd4AmlACkVARu6X/og
+RB3gHPUA7BUFKPAEgADuCx4DQVEAAAgCZe3GAAN5kQAADxiKjCqeGJ0ZdsEPL6JjjmAP7gz+IaYV
+oAAiAMCAmB0tobnrukcW9cCAAGhFaI4yKjwY6hYMIZCBAADzwAjyUgCdAOoGAANA4QAA+IJoHaBb
+FQDi5gADeQEAAO+fHgtQBIAAWDhfiWD1IAQE8AwFAPhgRhXv84oAAAAAAP/zWA2gDMUA6lQACVgE
+gABYP7f/8wwNoAwFACJwJhu6KQItCQzdEa27HbvGKjwYmhz9YABF8AxlAFiSWI83jjYARAT/ywAP
+dI4dAPhgxhWgXwUALzQYnjf+IagV5+5BAALuAi40Hi80HyJwJhu6FgItCQzdEa27HbuzKjwgmhv9
+YABF8AxlAFiSRYkbjR2MOPohiBXgjgUADt0C/mEoFaSMHQD4YQYVoF8FAP5kBh3iAD0ADswYnDn8
+ZOYd58xBAALMAiw0JutGAANQ4QAACgiK6SYAA0EBAAD4imgdr/w2ACxwJh27mJwaDMwJ6hIMLmcC
+gACsu/1gAEXwDGUAWJInjjeNNgBEBP+rAA60/R0A/mDGFeBeBQAuNBiPHY4anTf+Y+Yd591BAA7d
+Ai00HidwJhu55B27gwd8CQzMEey7CAlQBIAA/WAARfAMZQBYkhOIHY84+iGIFaCJBQAJiAL4YSgV
+5M8dAPxhBhWgWwUA+mQGHeIAPQAJ/xifOfhk5h2n/0EAB/8C/mTGHe/47gD2QUYVr/UmAGwQBIgw
+1FAPAgD/AUACUBxlACkgBGiREOpEAAnYBIAAWJaLwCDRDwAAKCEWKDURLyEYLzUQLiEZ7jQkIdAp
+AADtIDYhWQEAAPxhRhXgDGUAWJHsKTwY6ixIIWDhAADsJgAB2EEAAPqKaB3gDDUA6gYAAVlBAADp
+gx4B0JUAAFiR4SkgUyk0MSohF/9BQAQQTQUADZkCKTQx/0FABFAuBQAOmQIpNDH/QYAHUAwFAMHw
+D58CLzQxKCA0+GCEHa/9bgAAAABsEAQZun2IMB67UOpUAAnYBIAA47nZFCUIgAAYuvuNnyySEI8n
+iZ4ogn+P/iO1BSO1BiO1B4/0n7Qj4n6TtZi2mbcv4oCfuC7if565nbr9YWYVp9kFACm1BMDAWJZM
+wCDRDwAAbBAEjjJu4g9o4jxo41Fo5B7AINEPAAAA6iQACdgEgADsRAAK6ASAAFg2l9Kg0Q8A6iQA
+CdgEgADsRAAK6ASAAFg1C9Kg0Q8A6iQACdgEgADsRAAK6ASAAFgEf9Kg0Q8A6iQACdgEgADsRAAK
+6ASAAFgCDtKg0Q8AAAAAAGwQBoonFrrODwIAhakoqRQpYX9kgOXulwd6oASAAGRQ0ykgBcWmDwIA
++yAIHCIAnQDEv+skBSlQBIAAWxMd8KswDeP79QCHUSohCCNVCCxhf4hQ/4dAB1d3AQD7QAVsYgCd
+AAiIV/UABnsSAJ0AykLbQOx0AAlQBIAA8oEEHeAJFQD4QqYd4A0FAFhVkWAAAwB7oXf6QagV4FwF
+ACwkBSpiWQm7EQuqCCqiCmSgFSusYPogaB2gDEUAWJFp+iAIFaAAJgAauXWaEB666C066A2tLA7d
+KO0WAClQBIAAWxL0ixAcuV7tuuIZUASAAFsTENogWxLz0Q8AAAAAAP8m4A+QBQUA//xkDaAEBQCP
+J//kABWvyQUA+cAEB3AIBQDo9RQncQEAAJ75/+EGFa/9ogDaIFt0z9EP0Q+KJ/rgaB3gDAUA6qwg
+K+gEgABbd271QGgdr/xyAAAAbBAsFbm4gy0oUoMJMxGjg4s3i76JLiqwMCywMQiqEeyqAgzOQoAA
+6YIIBVAFAAD7ZiYdqKodAOq0MClQBIAAWxLGiinJoISrKwqKW/+X6kQACn+mAACKKcBA6yILJQCx
+gABls5r6QWYVoAAmAACau5uslCkrIAwsIhYXuicduSIoIRn4KcYVoB6lAC4kVCpSgy3Sm+cAFQ5m
+QoAArKz9YABF8BkFAOwWTy3eQoAA66oICMAEgABtmgIIAIofua8qoSslLE7/QBF0YAYVAB65ch+5
+cfxACBXg6BUAKBQY/iBGFeAMhQDuFgAu7gKAAAzdAp0RLiAH/3H0BeHuAQAA7hEOrgIP7gKeFAvq
+MJsVnRn7dQYFoEkFACkVD5oYKCBUKBQxLyAFLxQyLiAwJhQwLhQzLSIW7RYNIOiBAACL1YrUidOI
+0u/SASDxAQAAn+GY4pnjmuSb5Y3QLeYAKyIAKxYWKiBUKhRdKSAFKRRgKCAwJhRc5BReIVjRAADo
+FGEg0aEAAFiQ4CoccPpHgBXgDIUAWJDdKxJPKhx6+25AFeAMZQBYkNkqHH36oGgd4Aw1AFiQ1ess
+XCDR/QAA+0CgFaAMhQBYkNAsEk4vEUIoEUP4JiQdoJwhAP4NAAbw73EA/C4ADbCsKQDrywINV8KA
+AOnuEQ7ugoAA/gUAB/CMWQDu3QIP/sKAAP5BiBWguwEA+yYADLCsQQDsqhEN3kKAAP9mAA307pkA
+/2YADbD8UQD6LIYd4Ow5APwGAAWwzEkA7e4RDmbCgADsqgIN34KAAA67Au4gaCxGQoAA7CBpL/6C
+gAAI/wL/RgANcO4ZAP/IABcw/DkA/6YADrDsMQDu/xEPd8KAAA/uAv+mAA6wzCkA/YYADnA9BQAN
+zAIsFGWILAuqAgqZAvgs5h3g+IEA+BEABzCIkQDq7hEMRkKAAOjuAg/+woAA/8YAD3APhQAP7gIu
+FGYsIgcPAgAtyRTk0TpmUIEAACnCCWSRL/ogaB3gDIUAW3qzwZXkJRkgwf0AAOcAFQRARQAAbZoC
+CACKHLoE7BYkIVlFAAD4QAgV4A21APQ0Zh2j+vUA9jUGHaAMNQDqFVAszgKAAO2ZAgDR/QAA6RYl
+JVCpAABYkG/qHH8q2ASAAPtFwBWgDDUAWJBqJBTBJBTCJBTD/AICHaALNQDrFMAg0f0AAOqsRSHZ
+UQAAWJBh6zxAINH9AAD7SqAVoAyFAFiQXOs8OCDR/QAA+0ugFaAMhQBYkFjrPGQg0AcAAPtAgBWg
+DIUAWJBTJhWIJBTkJBT0+kBoHaAuBQD+OIYdoPz1AO4UxSDoBwAA5NQUINn9AADsFYYl2EUAAPwB
+Yh2gDSUAWDqvw/kvJAXRD4m70w/TD2ScZG0ICumSCyzYBIAAZJxWY//uAADqJAAI2ASAAPwBAh2g
+DSUAW3K5Y/7EAABsEDYTuY0XuTeLLS0yfx65uOogBS3eQoAAq9uLt+y4lBVS7QAA/0ABBzAFFQD7
+YcgV4BglAPlBUg2gBAUAjuAK4AAA2iBbc6fAINEPHLmqjSD+RsQVoApVAP5G5BXgOyUAWJXehi4j
+Mn8JZhGmM+Y8TiDQFQAA+sBoHeAMNQBYkBXnABUAwGEAAPtzNgXgGVUAbZoCCACKmxb4QAgV4Aw1
+ACwUK/QmBh3j+vUAKhUU/SAAFLAKtQAKmQKZFygwBCocMfUADdKSAJ0AKzxRWJAB22D6JqAVoAw1
+AFiP/iUUSCQUSSQUSiQUSyQUTuscGClQBIAA/ABCHeAMlQD8KaYdoAy1AFg6XtogW3N2wCDRD9og
+W3N0wCDRD9ogWxGCiC4jMn/TD+cAFQxGQoAA6DMIAMH9AAD5CCAVoBlVAG2aAggAihy5biwWMOki
+DiGxRQAA5RTYINH9AAD0OmYdo/v1APotBB3gDDUA/SAAFLALtQDrmQIFUWkAAOkWMStYBIAAWI/U
+6zxOINH9AAD7S8AVoAw1AFiPzyQU8SQU8iQU8/rAaB3gHCUA7BTwINH9AAD7TsAVoAw1AFiPxtow
+/kAIFaAMtQD+L4QdoA0lAO4hNyDZ/QAA7hV9JdkFAABYOijAINEPAIkuCZkRqdmJl4meKJA7sYgo
+lDsvsF+x/++0XylQBIAAW/5xwCDRD4knKpkUyKCEmYlBKMJE+kBoHaANBQD6gGgd58kBAAuAAMAg
+0Q8vHQHouTMX2aEAAJSwlLGUspSzlLSUtZS2lLcoFlqJIOjCRClQBIAA9e+GHeAOJQDk9HsszgKA
+AO6ZAgpoBIAA6RZbL2AEgAALgADAINEPKzxIWI+UtRkrkAHskAAg0NUAACykACukASmQAvlARh3v
++PYAbBAILSEpKyAWHLjCiCeHKCogfOUgByrwBIAAhncKrwmIjugWBS//AoAAr8yGbizCf/wg5hWg
++PUA+WSGDaFVAQD8IMYV584BAP2fwBWgDRUADNw5W33ejBftEgYlFrmAABS4LwxZEfSgESoSAJ0A
+pJkukp7TDw8CAPfAFXtSAJ0AI5KdZDI3GrfM6gAFCcgEgAAJAmEJAmEJAmEJAmEJAmEJAmEqIQf7
+cEIF4pxBAP0gABS2jAEA+QYADHqqAQD/QAAVMJw5AOuqAgzNQoAA+mAGFa2tHQDruBQdVQKAAAqZ
+AgmIAoog+mBGFeBMhQCcM/1AABUwDGUADKoCmjH+T5AV4A4FAOq41h7NAoAA/mFEHaA9RQDtNQsv
+/AKAAAj/Ahi32AqZApk26P8CAVnJAADvNgQh0IEAAFiPPeo8JiFZsQAA+iCGFeAMZQBYjzgetwgZ
+uMT4ZaYd4B8FAP5lxh3gC3UA/mbmHaCIlQD4ZYYdoAolAPpnBh2gDRUA/GZmHeAMNQD8ZiYdoI0F
+APpmph3gDAUA+mcmHaALBQDrNDQj2WEAAOw0MCHQ6QAA/GbGHeAMZQBYjx4rEgT6aEAVoA+1AP5o
+Bh3gDlUA/mgmHaAMZQBYjxcqPEn6SQAV4Aw1AFiPE/ppgBWgB2UA+kgAFeAMhQBYjw6PFS7wICjw
+IenwIi92AoAACO4C6PAjL3YCgAAJ7gII7hEI7gKx7v/kZh2o7h0A/+RGHajuHQD/5CYdqO4dAC70
+II1gjGEt3DjtZgAmYAUAAJxhiicMWxH1YABFv8kFAOe2nSVQgQAA+UAEBPALBQDrpQQkyQEAAJmg
+KaYBKyAWKAr/+WAEpCIAnQD6T5AVoDxFAFt9PMAg0Q8bt5bTD4q490AFiJIAnQAMWRGkmS+Snvfg
+BjtSAJ0AI5Kd5DC+ZXP9AACeuGU9x48iZPBRH7hpiSf+QAgVoAg1AJgS/iAGFe/NBQD7JAAVoA8V
+AO2tAQ92AoAAD+4C7hYBJukBAADtlgko2ASAAP0hBhXgCAUA+SKEHaAMFQBbePfAINEPACtcGOok
+AAlgBIAAW32LY/+cAAAAAAD/9VANoAMFAIkiZZ+KKyB82iDrvBIpYASAAFt9gmP/d50W/CDmFaAK
+BQBYkV8bt2OKuIwXjRb5X/nIkgCdAP/9OA2gAwUAwDDA6g6uNP9hBhWv/P4AAAAAbBA4KCAF+29a
+BaAp5QD5ACb9bAsFACoWZesWACDAIQAA+gAKFaAZVQBtmgIIAIrruCUQ4IUAACwWXPogRhXgCLUA
+/kAIFeAEBQD0I2Ydo/n1APghhB3gChUA6hQgIVEhAADqFmYg0PEAAOoWXS/+AoAACP8CLxYDLSBJ
+LiBILsQALcQBKyBKK8QCJBQ5JBQ69CdmHaAJNQDpFDghWVEAACsWXigQAC0QAu8QASDwlQAAL+QB
+LeQC+cAGHaAcBQBYjnsTtygWt+EXuAgYt9wlIEEqIEAbt9nrFmcgyTEAACkWXyqUACWUAS8gQi4g
+Qy6UA++UAiDxUQAALhZhLCBFLSBELZQELJQFJSBHKiBGKpQGJZQHLSA5LyA4L+QALeQBLCA6KiA7
+KuQD7OQCINHxAAAqFmMlID0pIDwp5AQl5AUtID8vID4v5AYt5AcpIGUsIGQspAAppAElIGYvIGcv
+pAPlpAIheOEAAO8WYiEpAQAAJRZgLiBoLSBpLaQF7qQEIWmRAAAtFmQpIGssIGospAb5QOYd5B4F
+AC4VQSiCsCQUXCQUbPQxhh2gKQUAKRQ9KRQ8iSCMJ/4kJB2gChUAKhVEB5kC/YHIFaD19QAlFUL2
+c6YVoA1VAOwWWilQBIAA+HOGFeAMRQALgAArMp0ct4j4K0gVqLsdAPqgGH5iAJ0AL4A6KYA7CP8R
+Cf8Csf//B2Yd6P8dAC+EOinaACkWLCkSZSgcfyiMOfgAChXgGVUAbZoCCACKKxJmGLelKBYujSD0
+OWYdoA8VAP46Bh3j/vUA/iyEHaAMNQD9oAAWsA61AO7dAgDR/QAA7RYvJVFJAABYjg4kFOkkFOok
+FOsYt2/6L+AVoAw1APw95h2gayUA6xToJWDFAAApwAIrwAHogrAlUVkAACukASmkAizAACykAIkg
+jCcrEmcHmQKMzvZzphWgDVUA7BZbKVAEgAD4c4YV4AxFAAuAAC0ynR63TC8SW/luoAWo3R0A/KAU
+JmIAnQAu8Doo8DsI7hEI7gKx7v/nZh2o7h0ALvQ6KBJlL6oA/iAGFeAZVQDoABUAwCEAAG2aAggA
+iioSXCkSZhi3ZZgSjSD0I2YdoA8VAP4kBh3j/vUALhUM/aAAFrAOtQAO3QKdEyyQACuQASukASyk
+ACsSXimQAimkAiQUOSQUOiQUO/orqBWgCDUAKBQ4KRACLhAB7xAAIOiVAAAv1AAu1AH5oEYd4BwF
+AFiNxC4SYC0SXyvgASzgACzUACvUASngAyrgAirUAinUAy/gBSjgBCjUBC/UBSzgBy7gBi7UBizU
+By0SYiwSYSrQASvQACvEACrEASjQAynQAinEAijEAy7QBS/QBC/EBC7EBSvQBy3QBi3EBivEBywS
+ZCsSYynAASrAACq0ACm0AS/AAyjAAii0Ai+0Axi3BS3ABS7ABC60BC20BSrAByzABiy0Biq0B/kW
+CBWkGQUAKRVBKRUhJBRc9C2GHaArBQArFDwrFD0kFIwrEmeEJ/hACBXgChUAKhVEhE4mNp30KEQd
+4A1VAPcmAAzwDEUA6TacKVAEgAALgAAtMp0ZtuP/bigF6N0dAPygCXjiAJ0AKDKmE7bYIzJ/CYgB
+CYgRqDMYtw2OPAjuAQ/uAu42DCmJTgAAwozoJAUpUASAAFsPCBu3Bhy1Q+23BRlQBIAAWw8k2iBb
+Dwf6QGgdoAsFAPwAAh2gDQUAW/3ewCDRDwAAAAAbtsYqMqYpwn8LqgHstvYdVkKAAKqZipwbtvYp
+FlgMqgELqgLqlgwk5zGAACoSWNsQ+0nAFaAMNQBYjVnqElgg2CEAAPwBYh2gDSUAWDe/LBJYLcAF
+/YYGHeA7FQD7gKYd7/K2AAAALzKmLuJ/CP8B6bbdH/5CgACv7o/sGLbeLhZZCf8BCP8C7+YMJ2uh
+gAAqEln6L+AV4Aw1AOu8MSVROQAAWI0/KhJZ+i/gFeAMtQD7ZyAV4A0lAFg3pC0SWcPI/aCmHa/0
+7gAuQDovQDsI7hEP7gKx7v6HZh2o7h0A/odGHa/7fgAqPE76IGgd4Aw1AFiNK+scCCnQBIAA/AFi
+HaANJQBYN5EoMAX4ZgYdoE8VAP5gph3v+q4AAGwQCisgFiYgB4cnKiBTLCEZ5LZVGmgEgACcGZ0Y
+CqgJ53IOLEcCgACoRPSP6BWg+PUA+WOmDaFmAQAFDEf9n8AVoA8VAAz8OVt7duwSCSUZyYAAE7XI
+DGkR9MAPshIAnQADmQgtkp73oBiqUgCdACWSnWRSChq1ZeoABQrIBIAACQJhCQJhCQJhCQJhLSEH
+HrW8DQ1K6bW5Hu8CgAD/pgAOsvRBAO1WAC/+AoAA+kAIFebkAQD/xgAPcDoFAPqgZhWgDUUA6VYC
+Ld4CgAANuwKbUfxKcBXgCAUAKFUKmFiYWZhamFuYXJhd+KHGFaD0OQD4oeYVrYwdAOX/EQxFAoAA
+CP8C7+4CDuwCgAAO3QL/bNIF4CsFAOy1cB51AoAAK1ULD+4C7NwCAtCBAADsVgQhWQEAAP6gxhWg
+DGUAWIzR6lwmISFhAAD6gGgd4AxlAFiMzBu2Wf9pNgXgiZUAKVQs/qbmHeAYBQD4pcYdoAwlACxU
+NexUOCLQ6QAA/KcmHaAOFQD6paYd4A01AO1UMSpYBIAA/qZmHaANBQD8pgYd4I4FAP6mxh2gDAUA
+/KaGHaAMZQBYjLOPc4xyLvwB/8DyDeAKRQAszAGLcY1wnnPsdgIl2AUAAOt2ASbgkQAAnHCNGOgi
+BytPAoAAo5n7M6YVoAwFAOqMIC7YBIAAW3LKiCf/BAAV78kFAPngBAfwCQUA6YUUJ/kBAACfiZ+I
+KyAWLgr/frEK+kpwFaAsBQBbeugqIDf7X+AVoPvlAPpG5h2nqgEA+0AEfGIAnQDAINEPAAAetTqK
+6PdACiCSAJ0ADGkRo5krkp73YAqyUgCdACWSneRRTWVb/QAAm+hlXfSMImTA5Bm2DY4n+EAIFaAK
+JQCaFvgghhXvzwUA+8QAFaAJFQDvrwEMRgKAAAmIAugWBSf5AQAA7+YJINhBAAD/wQYV4A0FAP3C
+hB3gDBUAW3acwCDRDwAAHLYBLiAH/ECwFeAKVQD4QAgVoDslAOgWACl4BIAAWJIliicr+sDzQcgV
+4CxlAOwkBSVIgQAA+yAEBPALBQDrpRQkyQEAAJmp6aYIKVAEgABbDeosMRGCKrHM7DURIXi5gADw
+AGgNoCPVAAAAAAAAAPpAaB2gCxUAWDo6gilkLvQtIAVz2emCKWUv9GP+5gAAAAArbBjqJAAJYASA
+AFt7C2P/CQAAAAAA//O4DaAFBQCOImXu9ysgU9og67wSKWAEgABbewJj/uT8ISYVoAoFAFiO3x60
+5IrojBn5X/VQkgCdAP/6/A2gBQUAwFDA2g2tNP3BBhXv+sIAAAAAbBAKKCAFKQol+QASJWIAnQAt
+IRkrIBYlIAcqIFMmIgcXtV0KqAnmYg4sRwKAAAh3CPbv6BXg/PUA/WLmDaFVAQD8IQYV4AwVAFt6
+ge0SCCUZ4YAAE7TTDFkR9KAPyhIAnQCjmS6SnvfAGMpSAJ0AJJKdZEILGrRw6gAFCkgEgAAJAmEJ
+AmEJAmEJAmEsIQcetMcMDErptMQeZwKAAP+GAA4y90EA7EYAL/4CgAD6QAgV5ucBAP/GAA9wOgUA
++oBmFaAMRQDpRgIt3gKAAAy7AptB/EpwFaAIBQAoRQqYSJhJmEqYS/iBhhWg9zkA6EYNL/1CgAD4
+gcYVoCsFAPiB5hWtjR0A60ULLEUCgAAI/wIP7gLvtXMeZAKAAA7MAu20eR71AoAAD+4C7kYGIlCB
+AADtzAIBWQEAAPyAhhWgDGUAWIvb6kwmITlhAAD64Ggd4AxlAFiL1h6zphm1YviFph3gHwUAL0Qu
+/obmHaCIlQD4hYYdoAslACtENStEOPqHJh3gDDUA/IYmHaANFQDtRDMiUOkAAPwAAh2gjQUA/IYG
+HaAMZQD8hsYd4AsFAOtENCvYBIAAWIu+jmOLYrHs/4DSDaAKRQCxu4lgjWGcY+tmAiTIkQAA6WYA
+JtgFAACbYf5A6BXgCwUA/qAAFDAMBQDzAABEcA0FAOqGnSfQgQAAW3HUiCf/BAAV78kFAPngBAfw
+CQUA6YUUJ/kBAACfiZ+IKyAWLgr/frEK+kpwFaAsBQBbefIqIDf7X+AVoPvlAPpG5h2nqgEA+0AE
+fGIAnQDAINEPAAAbtESKuPdACiCSAJ0ADFkRo5kskp73gAqyUgCdACSSnWRBTbCsnLhlTfONImTQ
+5xq1GPhACBXvyAUA/kDoFeALJQD6IMYV4AsVAOoWBCzOAoAA65kCB9CBAAAIqAH4IKYV4A4FAO71
+FCRBAQAA+eEmFaAMFQDo9ggg2EEAAFt1pcAg0Q8AHLULLiAH/ECwFeAKVQD4QAgVoDslAOgWACl4
+BIAAWJEviicr+sDzQcgV4CxlAOwkBSVIgQAA+yAEBPALBQDrpRQkyQEAAJmp6aYIKVAEgABbDPQs
+MRGCKrHM7DURIXi5gADwAGgNoCPVAAAAAAAAAPpAaB2gCxUAWDlEgilkLvQtIAVz2emCKWUv9GP+
+5gAAAAArXBjqJAAJYASAAFt6FWP/BgAAAAAA//OoDaAEBQCOImXu9CsgU9og67wSKWAEgABbegxj
+/uH8IQYV4AoFAFiN6Ruz7oq4jRj5X/VQkgCdAP/68A2gBAUAwEDAygysNP1hBhWv+rYAAAAAbBAG
+KCAFKyAH+mBoHad1AQDygGgd4BlFAPkABv1huwEAFbPp+OAHIVIAnQDkogYtaASAAO8CAA2wBIAA
+9WAEYhIAnQAMuhGlqiyinveAB6TSAJ0AKqKdZKC5+kAIFeAMFQBbIeYbtCAuIQkds9ksIAcvISIo
+IST5aV4F4MwRAO3/Ag5igoAADIgCCYgCmKCMIJ+i/0BmFaANJQDkpgUuZgKAAA3MApyh6wAVBUhh
+AAAJAIoMbhH1wABHcA2lAO3mnSuVoAAAwCDRDwAAHLOxichqkXcMahGlqi+invfgBMTSAJ0AKqKd
+5KCPZPP9AAD/gQYVr/2SAAAAAAAA6iQACtgEgABbeBTSoNEPAPVAaBWv/JIAjyLrFgAnhSmAAO0W
+ASOVlQAAwCDRD4on+mBoHeAMBQDqrCAp6ASAAFtxD9Kg0Q8A//w8DaAKBQCdEfogBhXgCgUAWI2J
+HLONiciLEO0SASgECoAA+T/7QJIAnQD/+4wNoAoFAMCgwOoOnjT/gQYVr/tSAIonwLD7RAAVoAwV
+AFt1AB6z9p6gjSAbtGaMEf2gABawDhUADt0CnaGMxpyj+0BGFeACBQDRDwAAixDtFgEpUASAAOu8
+GClgBIAAW3mJ/CAoFe/9GgBsEAQUs8L7ZiQFoAkVAOomACnGAoAACYgC6CYBIRghAADkABUBEEEA
+AAMAitEPAABsEAT9aJYF4AslACs0ACogFR60SBizEOhJEQ1RAoAA+yYADTALVQALqgKaMegABQGg
+QQAABAJhBAJhBAJhBAJhKCAH/2h6BeGIAQDgVREMRIKAAAhVApU2hSCeP58+/GIGFeAEBQD0YQYV
+oAs1AOQ8UCrmwoAA7DYHIwHZgAD8QrAV4A4VAC40WC40UOc0WS7pAoAADZ0CDt0CLTYVDOow7EUF
+KtYCgAALqgLqRgMhkYEAANEP0kDRDwAAAGwQBPJASBXv9BUABDMBkyLRDwAAbBAE2iD8YGgdoAsV
+AFiOYdKg0Q9sEAiHRohHL0ELKUEK9IEIFeyAPQD8YGgdpP8dAPgCAAbwaXEA+AMAB3A18QD0HwAC
++bgdAOh4GA3cAoAA71UQCZwCgADlMwIPd8KAAO7dAgs0QoAA9ICIFeHpAQDmMwIPd4KAAPogxhXh
+aWEA+tgAEzALFQD4IKYVoIl5AOv/NwxFQoAA6GYCD/8CgAD/xgAPcIlZAOYzAgxGgoAA+IYAA3GZ
+IQDu3QIMzgKAAO0WBys3woAA+MYACzCFeQDmMwIMQ8KAAPkGAAxxZWEA9WAABPBVcQDlMwILMIKA
+AOWyOxzLgoAACWYC+MYACzZ3yQAHZgIXs9kFMwLjFgMpUASAAPbGAAtwDgUA5hYEKOgEgABYjRrS
+oNEPbBAE2iD8YGgdoAsFAFiOFtKg0Q9sEAiLR4dG40IEKeAEgADmIQcpUASAAPiAqBWrgD0A9xcA
+BPFToQD3QAADMOORAPHIABcy+LkA5P8QCzRCgADrdxgKrMKAAPamAAq5ux0A6RYFLduCgAD54AAE
+sGiZAOdiEQs2QoAA5xYGLM+CgAD0RgAJdHjRAOuZAgu+AoAA8hkABfJYoQD3YAAVsIj5AOdmAgxE
+woAA8rgAErFzgQDl/wILvIKAAPjmAAuwg8EA9wgAFDBTsQD7BgAMcLO5AO9VEA3bgoAA+qYACvCz
+0QD4pgAKsDOZAOkzAg3YgoAAC+4CkxcHVQITs5IGVQIP7gL0IEYV4B+FAA/uAu4WAyjoBIAA8kYA
+CXALBQDyIIYVoA4FAFiMz9Kg0Q8AAGwQBBSzhQ8CAA8CACpCgNsgW2/t6KEcbRgEgADqQn8pWASA
+APwAAh2gDRUAW2/G0jDRDwDqQn8hWAUAAPwAAh2gDQUAW2/A6kKAKVgEgAD8AAIdoA0VAFtvvGP/
+vgAAAGwQBPVm3AWgCAUAHrNtKObUHbNsKNbUHLNsKMbUG7NrKLbUGbNrKgoA+TqGFaAJxQBtmhmJ
+KwSrCo07KbbA4zz8IRPxAADtttQlUAUAABizPShGvcD1L0a8WH3M4qQADQDOAAAoQuXHL/8B4AfT
+mEEAaJMHIkLo0Q/RDwDRDwAAbBAEErNNIiJ/IiEC0Q8AAGwQCCQVBPlmngXgDSUAnRGZECwgDCsg
+DQjMEQy7AusVBSlQBIAA6CEJKZRCgAACUgKZEJ0RGbIAJBUEKBYD6QAFAMBBAAAIAmHyIIYVoAwF
+AOYWBSjYBIAAWFBy0Q8AAGwQCPtmcgXgDSUAnRGbEI8yDw9fLxUELiAMLCANCO4RDswCLBUFKSEJ
+mxDtFgEpUASAAOkWAyDAQQAA8ghoHeAMBQDoDAAI2ASAAFhQXtEPbBAEGbMmKHEOpDymWqMjqsyk
+OywlA6SiKrUKeYEFIjUJ0Q8ALSzYLTUK0Q9sEAbbMOxEAAlQBIAAW3OgL6ARLqEJKKAVJ6AU9kCk
+Fa/NBQANLQHtFgElWIEAAO1tCA3gBIAA6HcIBukBAAD9YAVq4gCdACPMHOWhDCnYBIAA/GAFEuIA
+nQDvwwgNoASAAO7/CAGYSQAA7PgICdgEgADvAgAEQFEAAPxgBBLiAJ0A6BYALZgEgADti3p8WASA
+AKV4KUEAp/2tXS3FAx2y9Ci1AK6LfZFmKzUALqAVjxEtoBHroBQnAVGAAC6hCSYhBa7drbvvbwgF
+2EkAAOy7CAf5AQAA77tBfRAEgACbo9EPwPDvpgMtEASAANEPAAD3bwAOP/1OAPZvAA2//XoA9m8A
+Db/9+gD3DwANv/4aAC282PxgJB3v/lYABr4M7qYDLRAEgADRD2wQCByy0o0gLsKXKTIALMKf7t0M
+CbAEgADlFgAu7oKAAP2AAEZwBRUA6swgJKlsgAAtMAnpPBAtWASAAPwHAAdw3TEACSCGCwJjCQCG
+CwJhKMABKQrgCYgBKMQBLzAI+eYAD7C59QDp/wEPRoKAAPnmAA+w2fUA6f8BDsbCgAAI/wIvxAEp
+MgDnsMwUpVCAAC5iASjAAQfuAfgHAAe0mAEA+MEGHeDYMQDp3REP+EKAAP/GAA9wiCkA7mYBLEaC
+gADo3QIDWEEAAO1kCS1IBIAACWCGCwJnCUCGCwJlKWIAe5ZkLsABiGErCoD+BgAGsJ4pAPMADEgQ
++PkAHrFO7gAFDXAEgAAOAmEOAmHAgCjEAS4gVPHDAA3gBAUAnBIescnmFgMum8KAAO2yihzEAoAA
+CDMCkxHzZQwF4ANSAIYT/CBIFaAFFQApwADTDw8CAP8hgA4QAhUAKsABeK8BwCDjEgAuUASAAFsv
+iR6wmv9k9AXlih0ADogRCO4M/8AAR3SqAQDt4n8tAQqAAPygAQRf+fUA6YgDC1gEgADo3QEJeAqA
+AP+mAA7wDAUA7eZ/KdAEgABYjVDAINEPq2bZoAdsAizWsyjStIURA4gB+KYACrAMBQD1toYV4BgF
+AG2KHfHlgA3gBQUAJZEADlUC7cgKBMgJAADlhrUmYAUAACbWsykgVLFE+J/5ouIAnQApIA3KSywg
+VcCBCYk5rEwJyQwsIAwIzBEMmQILmQL/MWAGEmlBAP/+FA2maQEAY/+uAGSfzywgDMqeGLH6FrJA
+KIB9JmJf4hYEJJP9AAAIIiisaaKZghQcsfEMmQopkoD//rgNppkBAAAA+YBoHe//pgAOCEYLiAL5
+gCYdr/oeAAAAbBAEGrGoiyAsonuJMCqigwy7DP1wABWwBBUA66oIBKjYgAAtoADsoAEhyEEAAOkH
+Hg1YBIAACwJjCQCGCwJhKzAI/UAmHaDuBQAO3gEOuwIrpACJMHmWQSigABmwM48xCAtE+mEGHeCI
+OQDp/wEMQEKAAOj/Ag1IBIAA7zYBIdhBAAAJYIYLAmcJQIYLAmX4YAgV4AsFACs1CP8loALQAhUA
+jDEdsMDmwIFtSASAACugAQ0AhwkCYQkCYSukAflAEBXgADIAAAAAAAApoAB4nwcuoAF47wHAIFsv
+CRiwGvlj9AXluh0ADrsRC4gM+QAARHTaAQDvgn8ugQqAAPyAAQVf/PUA7KoDCdgEgADq/wEJSAqA
+APnmAA/wDAUA74Z/KtAEgABYjNDAINEPKaAA+MAABPCLBQALmQL5QAYd7/5CAAAAbBAE6SIAKSAE
+gACTkYghk4AEAIgDAIqSIJIh0Q8AAABsEAQpIA0qICL5YTAFoAsVANMP6bk5DVYCgAAKkgICA0cI
+MwooMpICihQLgAAKCUFokQJpkx0oMpgCKgILgADboPpAaB2gDAUAWIyu0Q8AAAAAAAD//6QNoAsF
+AGwQBMk29GAFSJIAnQDJOvRgBWiSAJ0AwCDRDwAAKCETDwIA5IQICf9GAAATsKhlcKZzYTOML/pA
+aB2gCwUA/MAARjANBQBYi2VmoRccsbAswX/6QGgdoAslAPWAAEYwDQUAWIteZqDvc1EvjC/6QGgd
+oAsFANMP/KAARjANBQBYi1dmoNr6QGgdoAslAPyAaB2gDQUAWItRZqC86iQACmAEgAD6ACId4A0F
+AFiLTNKg0Q+NLPWgAEI//VYAAAAAAPpAaB2gCxUA7EQAC+gEgABYi0LSoNEPAPpAaB2gCxUA/IBo
+HaANFQBYizxmoGlzUS76QGgdoAslAPyAaB2gDRUAWIs2ZqBQLCIP+kBoHaALBQD8oABGMA0VAFiL
+MGagO3NhNByxeizBf/pAaB2gCyUA9YAARjANFQBYiyhmoBiML/pAaB2gCwUA/MAARjANFQBYiyLS
+oNEP0qDRD9Kg0Q/SoNEP0qDRD2wQIogihzTksFcaMASAAJQUlBX7AGLIknfpANog9iWGFaALdQBY
+ioH3QGgdr/hFAPlAZmQiAJ0A7bEwHQT6AACJMCoxBS8xBuYxBySsJIAAizFmsfsuIA3TD2TgrCoW
+NnTxAmThR58ULxY1dGECZOFRlhUmFjRkcLD04AqwkgCdAMBgBvxQ+gAiHeAKBQAMujhkoEaKMA8C
+AHqmJGRySPTgEqiSAJ0AHLEv8ulwDeALFQD04ExgkgCdAMBgZmAbijANpAF9oAmOMfPACrBSAJ0A
+yEaJMQnfUmTxNNog/B+iHaALBQBYi6Io+o14oQIGpjjaIOwSLCnYBIAA7VQAC3AEgABYeDjSoNEP
+ZHIa9OARKJIAnQAZsBMpFjb1//olIgCdAGP/PwAAAAAmIRIqEjb3QGB6ogCdAIoqKxI2W213HbDu
++0Bg6BIAnQArEjV0sRqGLvdgY6qiAJ0AKiIQW21vHbDl+0BkQBIAnQAuEjT13/h0IgCdAIYu98Bk
+uqIAnQDqIhAvWASAAFttZB2w2/tAZSgSAJ0AKBI19QBl9CIAnQAZsQEpkH1lntVgDNiKLwr6DCoW
+NZoU9N/1lSIAnQBj/q2LLwtrDCsWNPogphXv+p4AhissEjb3gF1KogCdAOoiDS5YBIAAW21MHbDD
++0BdsBIAnQAuEjX1wFjlIgCdAC8SNPX/88wiAJ0AYAsJAPMgB4jSAJ0A8T/1+RIAnQBgDIssEjbt
+EjUpUASAAO4SNCvYBIAAWGvt5q6ebTAEgAAYsK2EMPiABAI/+h4AAAAALjET+mNkFeAKBQD2IgAV
+oAwFAO7GOADIUQAA66k4CAQKgAD64EpQEgCdAPTgYoCSAJ0AH6+4LxY2wGBmbkv64EwoEgCdAPTg
+TRCSAJ0ALiAN+8BMABIAnQAqEjaIFCgWNXSBB/vATIgSAJ0AJhI1iRUpFjR0kQf7wExAEgCdACkS
+NCw1BCo1BSk1ByY1Bv/2xA2gBgUAACgSNiYhE/jAAEM/9tYAAAAoEjaGLPjAAEM/9poALBI2LRI1
+7hI0K9gEgAD6QGgdoA8VAFv+3/dAaB2v9uYAAAApIRMJqQz4JsYV7/emAIssC6sM+ibGFe/3cgAA
+ACkxCvhhCBWh2WEA/CWmFeDpeQDl7hEO7cKAAA7dAo4xCOpQ+BoAB7Du4QDi/xEPdMKAAP/GAA9w
++PkA4KoRD/vCgAD/RgANcPlxAAH/EQ+qAg6qAo80DaoCLSANCUlB/SAAFLCI2QD9bQAMcO95APfY
+ABcx32EA+cYAD3ufAQDi3RAMy4KAAAndAikxCv+mAA606TEA/9gAFzD/cQD/xgAPcPlZAOmIEQ/+
+goAACP8CD6oC/0YADTDpGQD/2AAXMIkRAA6IAi4xC/5g6BXk7h0A+8BAB3GZAQDumREPdwKAAA6Z
+Ai4yBgmIAvohZhWpnx0A6BYPLMwCgAD4IcYV7IA9AP/LAA92jskA7hYNKVAEgAD5pgAOsA4FAOzc
+AgDogQAA7BYMK2AEgABYiYYdsCH7QFN4UgCdAI405hYzJwzYgAAZryUoEi0vIAepiSmQgCYWM/ZF
+ZB2g+7UA6/8BDM+CgAD55gAP8PnFAAn/AQj/Ai8kBysSNdag9WAVlCIAnQAvMQoPD0H34FERUgCd
+ACkSNYgvijjAs+wSMyDpAQAA+QAARHOqoQD6IuYVoA4FAOgWMClQBIAAWIli5qvXbTAEgAAsEjOG
+OIgx+GFEFeANBQAtFh/4HAAEMOZhAPiGAAfwmVkA6ZkRD/4CgAD55gAP8JZpAOLuEQzMQoAA6e4C
+DETCgAD5xgAPMIZxAP/GAA9w9nkA4IgRD/vCgAD55gAPsKYJAPgmCBWglhEA7qoQDMtCgAD7JgAM
+sWbhAOxmEAxSgoAA+sYACzqIHQAI7gL+I6YVoAslAOlmAgDpgQAA5v8CCVAEgAD+I8YV4A4FAFiJ
+NOarH20wBIAAhjsrMRKIOoo4+icAB3APRQAP7gIfr/UqFi4oFjEv8HwmFjL2JmgVoJpZAO2ZEA/F
+QoAACYgCKSAN+iXmFeDKUQD6RAAF8KoBAOhmAgSAeYAAGa50+MYAC3AKFQApMRMtIQckFjfoEjEv
+IQKAAOwyAS5wQoAA5O4CDaHCgAAE7gL6YUQV6Ei5ACQWJSQSMgF0BPULAAw5RB0A7pkRCiOCgAAE
+mQIUrigoFibk7gILJsKAAPXGAA81jx0A6q9CHScCgAD4hgAKMMzhAO8SLi/BQoAA5O4CDmQCgAD+
+JGYVobthAOqIAg3cgoAA/iXoFaqtAQD5SAAVMN8xAPsGAAwwr0kA790QDVMCgAD9hgAOcE8ZAPiG
+AApwn0EA9ygAFLDeeQDqmQIO7MKAAP4HAAVx/yEA/WYADfTeUQDo3REP/MKAAOj/Ag1TgoAA+yYA
+DLAIJQD4hgAKMK4ZAP0mAAyy7gEA7BIwLVZCgADtqgIPdcKAAA/uAiQWJwuZAiQSN/9bfAXgCwUA
+6pkCAOn9AADpFiIm6AUAAO/uAglQBIAA/iSGFaAOBQBYiMgdr2PmqWttMASAACgSNA8CAA8CAPUf
+ydwiAJ0AiTwcr4gkIg/uEjMpUASAAP2H5BWgCzUA+IAAQjOZoQDpFhcg6QEAAP+AAEYwDgUAWIi0
+5qkfbTAEgAAoMQqMPC0SM/iGAAMwiFkA/AIABTC8CQD8DAAHsJxxAOCZEQ/8goAA7rsQDVNCgADp
+iBELNgKAAPjGAAswjHkA+0YADXDMaQDrMgEuZEKAAOz/AgxDwoAACYgCHK9j+GEIFeAOBQD+I+YV
+oLvhAOzBPy3cwoAAC/8C9JAAFbGZ4QDm/wIMywKAAPsmAAz6ZB0ABv8CLxYd/YAARnAOBQD7JgAM
+sAslAOmIAglQBIAA6BYeIOmBAABYiITmqF1tMASAACsxGoo8Fq9IiT+IPigWMSkWMigSMy9gfCZh
+P/olRhWgmlkA6xYrLMtCgADoZggPxUKAAPkGAAxwylEA+EGwFeHrOQD6RAAF8KoBAPjGAAswCEUA
+6O4CBIB5gAAZrcH4xgALcAoVACkxGy0hByUWOOgSMS8pAoAA7DIBLnBCgADl7gINqcKAAAXuAvph
+RBXoWLkAJRYlJRIyAXQE9QsADHlVHQDumREKq4KAAAWZAhWtdSgWJuXuAgsuwoAA9cYAD3WPHQDq
+ro8dLwKAAPimAAqwzOEA7xIqL8FCgADl7gIOZAKAAP4kZhWhu2EA6ogCDdyCgAD+JWgVqq0BAPlI
+ABUw3zEA+wYADDCvSQDv3RANUwKAAP2GAA5wXxkA+KYACvCfQQD3KAAUsN55AOqZAg7swoAADbsC
+/ooABrCvOQD3UAAVMf8hAOqZAg/8woAA6P8CDu4CgAD+AwAFMAglAPimAAqy7gEA7JkCDVZCgADt
+qgIPdcKAAA/uAguZAiUWJ+USOCpgBIAA/1oWBeALBQDqmQIA6f0AAOkWIiboBQAA7+4CCVAEgAD+
+JIYVoA4FAFiIFR2usPdAaB2v2gIAAAAlFjiEOIg2JSAN9BsABLD0+QD3+AAXsOTxAOW5OQ90AoAA
+D+4CjzH0YOgV7IA9APphRBWgRNEA+JAAEjD/4QD5+AAXudUdAPXmAA+wSnEA5YUYCiRCgAAE7gIP
+7gIvMQvkMgQszkKAAOUWDS7sAoAA/CHGFeT/HQD74EAH8doBAO7dEQ//AoAA/6YADvD6GQD/+AAX
+sFoRAP6mAArx+iEA/eAAF7aIyQD8pgAK8NR5AOUWDy7rwoAA/6YADvFUYQD1YAAHsERxAOJVEA/7
+goAA/qYACvT6MQDtVQIP/8KAAPXmAA+xSmEA+KYACrCKWQDsVQIMRoKAAPQhhhXgqnkA6YgCDVVC
+gADlEjgqTcKAAAqZAunuAgDogQAA6O4CC2AEgADv7gIJUASAAP4hZhWgDgUAWIfE7a5gHQHiAACI
+NA8CAA8CAHOGLButZCkgBwtLCCuwgPZFZB2g/LUA7JkBDd+CgAD7JgAM8PvFAAuZAQSZAikkB/dA
+aB2v1AIAAACKKiyhAukWKCYJKYAAW2cOHa5JKhYp6hY2IwCpgAAqIhAuoQJk4ylbZwcdrkOaYC8S
+KPv/tJASAJ0AKiIQKKECZIMoW2cAKRIoHa47+yAGFa/Z4gAAAC4SNiwhE/+AAEY/2fYAy3f4/7QI
+0gCdACsSNoos+0AARX/Z0gAuEjaMLP+AAEY/2WYAhi/4wABDP9nCACsSNIkv+yAARP/Z2gArEjYq
+IRP7QABFf9kKAACJJw8CACyZFBSuFeTAYWTQgQAAK5IJZLBWLbAALgoqftkFL7ICdPFB+gACHeAM
+JQBbckQZrkIcrbmcoIsglKKTpSakHPVAxhXv+PUA+UCGFeAMJQDopB0t3gKAAAy7AuumASrQBIAA
+WIlAwCDRDwAA+gACHeAMJQBbbrFj/7QAAP9aOgWv9kUA/ibGFa/WQgDmEiwpUASAAPxAaB2gG8UA
+W2wbY/9ZAAAAHK4lLxI1LiANLSAM+CaIFaAKJQD4IAYVoBslAFiKMR2t8P/NEA2v5qUAHK4cLxI2
+/EGQFeAKJQD2IAYVoBslAFiKKP1bzgXv/24AHK4VLSAM/kGwFaAKJQD+JsgV4BslAFiKIP1bvAXv
+/uoAHK4NLxI2/EGQFeAKJQD2IAYVoBslAFiKGP1brAXv/mYAAAAcrgYtIAz+QbAVoAolAP4myBXg
+GyUAWIoP/VuaBe/92gAAAAAcrf4vEjUuIA38QZAV4AolAPYgBhWgGyUAWIoF/VuIBe/9PgAcrfYt
+IAz+QbAVoAolAP4mqBXgGyUAWIn9/Vt2Be/8ugAAAAAcre4vEjQuIA38QZAV4AolAPYgBhWgGyUA
+WInz/VtkBe/8HgAcreYtIAz+QbAVoAolAP4miBXgGyUAWInr/VtSBe/7mgAAAAAcrd4vEjQuIA38
+QZAV4AolAPggBhWgGyUAWInh/VtABe/6/gAAAAAAAAAAHK3ULSAM/kGwFaAKJQD+JogV4BslAFiJ
+1/1bLAXv+l4AAAAAAAAAACwSNi0SNe4SNCvYBIAA+kBoHaAPBQBb+/T3QGgdr8g+AIotK6ECZL4X
+W2ZLHa2H+ibGFa/OogAAAPdAaB2vx0IAAAAcrbr8QZAV4AolAP5BsBWgGyUAWIm9Ha18/8a0Da/m
+pQArEimKKvwAAh2gDRUAW2neHa11/82IDa/2RQDIa4tg/AACHaANFQBbadgrEimKKvwAAh2gDRUA
+W2nUY//SbBAiiCKHMCQWGg8CAPsAQqCXd8EA+kBoHaALRQBYhq/3QGgdr/xFAP1AQWQiAJ0A5K07
+HRj6AAAoMgDTD+kyAiQsKIAAKjIBZqQlLiANii4nFhbkmQEHHQmAANeQ+uBDuqIAnQDqIhAr2ASA
+AFtp1/tARGASAJ0AwKDmpAANFq4AAIow8UAVapIAnQAdrRuLNCkgDYYyLyETLxYjBGQB+CRGFetm
+oQAPbAwJxjj9YAQF/8sBAI01D8gM6Yw4CzMCgAAGRAKUMgy7Aok2KRYnjDebNPZB6BWv7QEA/iQm
+Fa+LAQD54ABHt6rBAPbAAENwGCUAeKERKAoheKELKRIjBEhbCJkIKRYgLBYd/iOGFeCLwQD4JSYV
+oEu5APQlRhWgm8kA+CUGFeRN0QD0JcYVoJuxAPglZhXgjfkA+CWmFaCdmQD4JeYV4IuRACgWMBis
+zfhgKBXgS9EAJBYx+Q/kFaJNuQD0JkYVoJnhAPglhhXgGYUA+SQAHaJNoQDkFhslQ7kAAP6kAh3l
+TAUA+eIADjAAQgAAAAAA9CNmFaVMBQANDVL4AiId4fuhAPlAGQxgS5kA/CamFaAYJQD5QCc0IgCd
+AMGT+UAbTGIAnQDCgflAOmwiAJ0AihWLFIkWKRYmKxYkKhYlixeKGCkSJwl4WCgWESgSHQF0BAiZ
+GCkWEvlaSAXpiB0A7u4RDEOCgAD5xgAPNIwdAAmIASkSJA5OAv4iZhWnmQEA594RDM0CgAAJ7gIp
+EiX5+AAWt/gBAOX/EAzJgoAACf8CKRIc7BIbLMxCgAAJ/wLrEjItzsKAAA/dAu7dAg5hwoAA+iUI
+FafqAQDvEjAt2QKAAAy7AiwSMS0WEC0SJuH/EA5ggoAADP8CLBIv6/8CD3cCgAD6JcgV590BAOn/
+Ag7vQoAA/8YAD3L4KQAP3QIO3QLuEiwuZkKAAO0WDy3eAoAADLsCLRIrLBIpDKoQ4O4RDuvCgADu
+3QIOY0KAAAyqAi4SFCwSLQ4OR+PMEQ90goAADswCLhIqDu4Q/0YADTAOBQDtqgIA6MEAAOyqAgtg
+BIAA+0YADXALBQDqFg4pUASAAFiGA9agZmAfijAZrJwJqwF5oAoqMgHzQAcYUgCdAMi2iTEJ21Jk
+sLTaIPwfoh2gCwUAWIcw91kSBe+M1QB8oQIGpjiMJw8CAC3JFOkiAiZYgQAA6sIJJoMZgABkkNHx
+RbAN4C+lAC6gAH/pCxiseSyiAnjBenfBPdqw/ABCHaALBQBbcK0sEhoZrHUdrCGdoIsgl6KTpZWm
+JqQdmaQspBz9YAAVsAwlAAy7AuumASrQBIAAWIeqwCDRD2SQctqw/ABCHaALBQBbbRtj/7eHL/cv
+AAv/8X4AAAAAAAAA8yArENIAnQDxP/n5EgCdAGAFb3fJkWP/vwAAAAAAAADsEhYpUASAAPrgaB3g
+DRUAWGfd90BoHa/4RQD5QCD0IgCdAGavBBysVosw/WAEBb/7ygDaUOs0AAtgBIAAWIdi2iBYgWDS
+oNEPKiIQLaECZNUtJxYWW2UOhi8uEhbXoPrAAEMwGyUA+8ALDGIAnQDBk/nACrxiAJ0AwGBlbqwc
+rHuNL4oyLiANp93tNgMr2ASAAA7bOAyqAftGAA1wBgUA+mBGFa/u2gAoIGALCVEAkAQICBvxABuH
+0gCdACkWFCYlCRqrOPgkCBWgCwUAKyQUKCUI+kKmHeAIFQAoFiQrIA2qmiqggAuLOSsWJusiAC1X
+goAACpoC+kDmHaAKFQAqFiX/8vANoAoVABmr1CmSQCggYAsKUelpCg0CCoAA+SAIFeCInQDxABf3
+0gCdACoWFCkWHywWNS8WNi0WNysgDCMWOCghBxOrFyaVCSiVB/shhh3v+PUA+SWGHaALhQArlASI
+l6OjKxIgK5UI8nAQFeALBQArlBUrlBQrlAbrlAUpn4KAAAOjAiOUByMSIiOUDSMSOCiJFCgWHpuS
+i5DrFjQsH0YAAMCB+CSGFaAKhQD7IKYdoAgFAPgkxhWgChUAKhYl/+/sDaAKFQAAKiITK6ECZLQi
+W2SuLiANHapoGaufLCISK9KaKZJZ6soIDUAEgACquuwSFi1WQoAAqpr5QUYVoB8lAP+ADjRiAJ0A
+6hYzJw8JgAAeq5GNIC7iUg7dDB6qIA1fFA7/EQ/uDC7tB//D6BWkjQEA+wAEANAPFQDsrAwf+AqA
+AP/ABAdwChUA/00ADzALBQD+IwYVoApVAFiICCkSMy8SGC+UVxirfCiCQAhoCvkABhXv+AIAGat3
+izgvFjYpkkD8JuYV67uBACsWGQlpCumSAClQBIAA+CPmFeAMFQBYdD4tEjcvEjbsEjUlC6mAAI40
+KyBgDg5R7hYULwIKgAD/RNAVoLudAPFgCq/SAJ0AKCEHKRIfJBY5JRY6JCAM9EGwFeALBQArlBUr
+lBSbkiuUBiWUDSuUBSUSGSiVBySUDPVVTgWghTkA+iKIFeKlQQDoqhEMRUKAAPsGAAw2VQEACFUC
+GqvSKBIhpLQkQIAqoIAllRflEjoqJ4KAAPVmAA22qh0ACogMJBIcK5QH9SEEHaALhQArlAQkEjmL
+N4o25pUJLEaCgAALiwh4uwIqrAEpEh+amJuZKCAN/yWGHaALFQAIuDkoFiaIlysgeiuUFiiJFIuQ
+KxY06BYXLBN+AAAuEh/AqCrkBf5gqBWgCQUA+CSGFeAIFQD4JKYVoAoVAP/n2A2v7gEA6hYzJwD5
+gAAp0pwfqyCIIC/yWgmIDAqIEaj//0HGFe/4fgAeq6EtIAwu4IAA0AT+XwAPMApVAP1XOgWg7gEA
+/iKmFaALBQBYh5spEjMvEhX/KuYd7/kiAP/rcA2v5qUA2iD8QGgdoBvFAFtpc4wnKMkU5IDyZlCB
+AACLyWSw6CmwAMLKfJkIHqs/LbICftFE+gACHeAMJQBbb3Qfq4UrEhocqzgdquidoIggnKKTpSuk
+HJWm/0CGFe/59QAppB39AAAUMAklAAmIAuimASrQBIAAWIZvwCDRDwAAAAAAAAD9VuoFoBslAO0g
+DCv4BIAA+iAGFaAKJQBYh27/3gwNr+qlAAAAAAAA/VbYBaAKJQD8QZAV4BslAO4gDSv4BIAAWIdk
+Y//UAAAoIGALCVEAkAT4IoYV4IidAPEf+N/SAJ0AwID4JKYVoAsVAPokhhXgCgUA+iTGFaALBQD/
+4kwNoAoFAAAAAAAA+gACHeAMJQBba71j/ySML/pAaB2gCwUA94AARnANFQBYhOj3QGgdr+cyAIwv
++kBoHaALBQD3gABGcA0FAFiE4fdAaB2v5r4A1sD2IsYV7+vWAByrQCkSHv5BsBWgClUA/EGQFeAI
+BQD4ICYVoBslAOkWACv4BIAAWIc0KRIfLRI3iJcsEjX+YKgVoA8FAP8ChB3vywUA7xI2JFCBAAAL
+qgHrEjQlUQEAAPsBJhWv7gEA+wEGFa/u5gAAAAAAAAAA6iIQK9gEgAD8AAIdoA0VAFtnRv/psA2v
+9kUAHKsfKRIX/kGwFaAKVQD8QZAV4AgFAPggJhWgGyUA6RYAK/gEgABYhxIuEh8tEjcvEjaO5ywS
+NSsSNPvEABWvyAUA+UAEBTAIBQDo5RQlUQEAAJrp+8EGFa/09gAAbBAGHarsDS0KJNKEBARKCUQR
+9IALF5IAnQAaqnr4AAId4AwFAPtQEBWgDkUAbeoRAJAECgsb77cGdMgFAACxzNMPFar4Fqr494AJ
+IJIAnQAfqvf+AAIdoAoFAPv0KBXgCIUA0w9tihAAoAQLCRkJCUPpIRR1UBEAAO/8BCdwBQAA/dre
+DaAKBQBm4LsaqPYcqR8CKwqrayzCnymwfiqigazs45kcDmZCgACsqiqhM8DKDJktpaoKnDcMTAxm
+wMUssID7IEAFP5nFAAyZHQpKDKmpZpCvL7B/Dz8cwIoI/y0cqtQeqUX/IQAP84qNAPkAABQz/40A
+CP8CL9ajLuCAKjx/7KoBDxB0AAAKSQxmkHT9UYQFoIgFAKiYCHgSDIgCKNaSLNKIDAxKCcwR+48A
+DTQJBQB5ok0urfwOfhL/suYVoAIFANEPAAIrCqtrKbB+A5kcwKoKmS0FnzcPTwxm8CP7VWAFr/1q
+AAAAAAAAAAD//GANoA4FABypIf20ZhWgAgUA0Q8cqqsvsH7psH8paASAAOkWACnwBIAA+XAQFaAK
+JQD4ICYVoBuFAFiGmsck0Q8AAGwQBBiqFfdUKAXgBgUA+kBoHaALFQDsrIAtAQqAAOC5Gg4BCoAA
+/WABBdACBQD9RcAXUAUFAC0KBG3aDwZeCqfuLuLD7pgEcqgFAADiLAEjMIMAAOiNICknWAAAwCTR
+Dy+Cwn+w5dEPbBAIx//oqmQZSASAAOxkAApYBIAAE6h54yMCAVIBAADjhrMpcCAAAGAA2AD7FogV
+pDIBAPpgBADQDRUA4xYELugKgADjqfkZgQqAAO/dAwrwCoAA/iCmFaXiHQD/0AAXMqrhAOPuCAqD
+pgAA81PCBa8GBQD0IGgd4ANFANMPbTobIyKEJCKEAwNHBkQB41YAIqgRAADkJoQhEIMAACTihCMS
+BRKp0wTUAeQzAgigBIAA89CGFeADRQBtOhsjIoQjIoTlQgAiIBEAAAYzAQNTAuMmhCEQgwAAYAAS
+AJIWI+KEghUNMwEDIgIi5oSCFiLiiIMUADEE7SIBDZgKgAADIgIi5oglgrQdqkUeqkXAIAstOQ5V
+AQ1VAiWGtPtABADQBBUA6YazKiAKgADvQgMGARGAACuCrwK7AQtLAiuGrxmqOQalEfigAELwAzUA
+k1DRDyyCrwLMASyGr9EPbBAGgyAVqjEsIFr4QQgV4AsVAPqyaBWgCAUA9LMIFaDMOQAMuDjqMwwM
+zkKAAOlECAQIyYAAL0BiLkBj/8AHwuIAnQAtUqIt0QJk0Oou7AEuRGMqUqJbYpQoCoAIqAIoJFos
+Ul3vpAAGBzmAALDJCcsBecAVbQgMsLrquwEN4ASAAHrAAmP/7A/MER2oCitSXAzdLC0lGg39HC0l
+GXs7FRqoPSqinilSmKOqCaoR+yAARLAAGgDAkBupV8PqLrYQLbYRw8ssthAcqgIPCkYIqhEMqgIq
+thGLsB2p/hypTu27AQnuAoAA/WYADfAtBQANuwLrxgAkgEGAAJqamJuNIC4hGZ4QKyEarrvsqfMV
+2/0AAJsRKkBj6hYCKfAEgAD4jFAV4BulAPggZhXgClUAWIXbwCDRDwAA/GBoHeAKVQD9U84FoBul
+AFiF1MAg0Q8A//zcDaAMFQBsEAgUqY+JMOSaAQSsQIAAiDHTD/MAFtBSAJ0AwGDnqdoVAEmAAI0x
+ZtGZwEDzIASakgCdAHmWeisxBNog+2AABfAMFQBYcgbipAAFGKGAACugJi0xDA8CAOfdAQ3/AoAA
+LzQQLTUMLKEawOEM7DgNzAIsNQzsoFgh6CkAAFiFCOagL20gBIAAKjAR0w/xQfAN4AsFAG0IEi4g
+POTgEWEQBQAAsbt6uwdvtARj/+YAACs0EdpQ6zQACmAEgABYhHLAINEPJjEE+kBoHatmAQD6wGgd
+4AwVAFhx4mSigiugNvNgE+dSAJ0ALTAQKCBhDU1DANAECAgb8QATL9IAnQAfqFktpCav3//wEBXg
+jgUA/sAEBjAIJQAIuALopDYv/4KAAA/fAi+kB35oD/ZIAAWwjgUA/2AARbAAHgAGC0YvIhQo8QMv
+8QJ48U3j2REF8G+AAB6pjgtfFPngAQT02wEA/yAARLAAQgAAGKmJ+SAARLLbAQAfp82vnybygPug
+BADQDhUA/cABB1/49QAI6AMIZgEG7gIu9oDKxBipUiygDB2nag29Ai2GsymCtB2peu2ZAQ5hAoAA
+DJkCKYa0K4aziTBj/m8kMBAvIGH4YIQV40QhAABABA8OG/HADF/SmWEAKiIUKKEC6RYELACWAADH
+xPQgphWgAPYAAAAAAFth1OkgDSUJCYAALCBVLQoBCdk5CswICckMJiAM5BYFKzYCgAD3JgALMIgF
+APjGAAswDAUA5MQADgq2AAACKgL6wGgd4AwFAFhxhuekAAUK4YAAW/8VKHA2JnUr+ubwFaAJFQAJ
+iAIodDZYXOsrEgXsEgQr0ASAAOx0WCHoKQAAWISI5qFMbSAEgAAdqUAfqUMuMQQsMQwP7gENzAEs
+NQwG7gIuNQQrcRr6YjAVoA0VAAvbOP1mAA2wBgUA6zUMLQmeAABgACBvZB0qoqIuoQLJ5FthoKds
+KsQ8KzAR6qkwEzAFAAB7Y94XqSiJMPZiJh2v9P4AJjEE+kBoHatmAQD6wGgd4AwVAFhxVuykAAUC
+oYAA6iQAC1gEgABYZMWJMPUgBAU/8/YAZJ7f6iAMJIFhgAAdqKQcqRot0H0swlywmw27KKrJq5ka
+qRYOmRGqmYmQ//sQDaaZAQAA+UBoHe//pgD/9TwNr+SlABypDy4gDfxBkBXgCjUA9CAGFa/opQD4
+ICYVoBulAFiE72P/0y0gDC4gDfoAYh2gG6UA7KkDGngEgABYhOhj/QrsqQEbeASAAPxBkBXgCjUA
+/kGwFa/ppQD4IAYV4BulAFiE3mP/kQAAHKj4jxQuIA38QZAV4Ao1APQgBhWgG6UAWITWY/zEAAAa
+qOtj/tAAAGwQBvxhgBdQCRUA8AAcDaSzAQADC0IVqLX7TZoFoAcFAACxBOCYGg2BCoAA+kYADj/7
+9QALiwMsVsXgfBoJ8FQAAC1Sxg29AQ3NAvy4xhXgAFoAA18UBf8KLvLHDr4BDs4CLvbHIlbFlxAm
+QCaXEeokAAjYBIAA7WQAAOARAABYBSYTqM6MEYsQ8kACAfFI9QDig1N7bMKAAC0ygSkygPrABADQ
+DhUAAO4a7rIXbPgEgADt7QIOEJQAAAfpEPnmAAzwAGoAx48I7wMP3wHs/TgPecKAAAj/Aw+ZAS02
+gfhwBhXgAV4AAAD/UWwFolg1APMABqKiSfUAGaaj/6AARrAAkgDEkB6mnw2dCvrABADQCRUA76is
+HMgKgAAAmREOmQKv3R6m467dLtKA92AFoVIAnQAJ6QIp1oDgrREOVgKAAA2qAgq6AgoJR+sygCSF
+EYAAaZFHGaicCgpf6bkBBXCngAAYpnsIqAIoVrMlUrQFxVIIVREFpQL1JgAK8IgFAPimAAqwADYA
+JayACFURBZUCW/3WKDKBKDaBJTaA6kIOKVgEgABbZLHJoepCDilYBIAA/AACHaANFQBbZIzAINEP
+AAAAAAAAAPM/+buiAJ0ACmkR+E8ADP6+BQD/IABEv/yaAGixQf/9MA2gCQUAAAAdpzEeqHYMLBGu
+zC3Gg8e/K8aCLcaBK8aAJzaBGqhx2yD2cAYV4AwFAPtP6BWgDRUAW2RyY/91ABmoa/nABAT//B4A
+AGwQBAEEBAQ5GPEhcA3gCgUAbQgMsJgImQHkkAdlUAUAAGP/7P1OLgWvtAEA8WHADeAJBQDTD20I
+DLC9DbsB5LAKZMgFAABj/+oAAAD+ACIdr/j1ABuoUQxfEav/LPaDKPaCLPaBKPaACDsDK/aDCEgD
+KPaCI/aBJPaA76hDEOiBAACN0PoAAAQwuQEA6LsRDEXCgADriAIOgQqAAO9fCw9wCoAACO4CLvaB
+7d0JC1zCgAD7oAQA0odBAOiIEQ3YCoAA+wYADHbnAQAI7gL5TEIFoLc5AAm7EQvuAgjuAu72gCFw
+U4AA8//iHeAEFQDwADgNpGIBAMc/8kAAAzAEFQAXp+7spgYbAQqAAABEGgNDAwxcAux2xSlwVAAA
+LXLGDT0BDU0CLXbGJXbF0Q8CXxQH/wou8scOPgEOTgIu9scldsXRD2wQBP1MZAWgCQUA+06kBeAK
+BQD5T7AFoIcFAAiSCiIix8snLcKeJrKCqt0J3RENZghtCB9/JxEvMAwuYAwlMA0kYA1/6QJ1QQ4C
+EhTnZggBAGGAAGP/2QDAIdEPsZnqrCAspuQAAMAg0Q8AAGwQCPtP6gXgiQUA/mHgDhQMBQADhkL4
+wABDcAAeAAMGRhmnMgsoCyiCgP8IIATQChUA56e1E3BLgAAGC0QAsQT9QAEG0AA2AAYNQgDRBACt
+GhulxgsuAu52xStwiAAAL3LG/6AEB/AIFQAPjznO8yhBAAmIAQyIAihFANEPBloUB6oKKqLH+6AE
+BTALFQAKujlkr9rqUg4pWASAAFtj+ixBAS1CAftPoAXhXwUA/0BoHaAKBQBt+hMosoF4yQUpsoB5
+0QfrvBAlUAUAANug80AGbSIAnQDrFgQjcF+AAAYORPvABADQDRUA/aABBtAASgAGDkL7wAQA0A0V
+AADdGh+lmw+/Ai92xfbACKdSAJ0AKHLG+aAEBDAJFQAImDllgRUSp62KFAKiCy0igS0mgSkigByl
+k+yZAgtYBIAA+FAGFeAMFQBYBMCKFCtQJlgEZSlBAPqk0BXimWEALiKBKCKALiaBHabiGqej67sJ
+DMzCgADsQQAtgQqAAOCZGg2BCoAA/UABBV/79QALqgMNzAEsRQAKiAEJiAIoJoDRDwCeFfoghhWh
+SvUA+0AE0uQMBQAXp44rcn8rsQLppswV9YmAANog62QACuAEgABb/pMqcn9bX+iMQS5BAOtBASn4
+BIAA7VAmLRAEgAD6wGgdou5hAO0WACloBIAAW/8VjxXI/OpSDilYBIAAW2OfZKDkGad6KEEACYgB
+AogCKEUA0Q8GWhQHqgoqosf7oAQFMAsVAAq6OWSu6RymrStBAAy7AStFANEPAADaIOtkAArgBIAA
+W/5y4hIEI3BfgAAGDkT7wAQA0A0VAP2gAQbQAEoABg5C+8AEANANFQAA3RoYpTuPFAj/Au92xStw
+YAAAKXLG+aAEBPAKFQD5TQAM8ABmAAAGWRQHmQopksf5oAQE8AoVAAmpOcmW22D6IIgVoAwVAFgE
+YYoUK1AmWAQGY/8tHKdCixQMuwstsoEttoEqsoAcpSgMqgL7cAYVr/82AAAAAAAAAOpSDilYBIAA
+/AAiHaANFQBbY0AZpzwoQQAJiAECiAIoRQDRD2wQBP9KKAWgiQUA7ab5EeA+gAADi0L5YABF8AAe
+AAMLRvNM2AXj/NUA/E1eDaAPFQAqQQGHQRynJvgqAh3gAgUAbZoXKMKB0w/TD3ipBSnCgHlxB+zM
+ECEQBQAA9WANj1IAnQALCkQAoQT94AEE0AayAAAAAAtYFA2ICiiCx/kgBASwDBUACck5ZJGsKRpQ
++EANNGIAnQAcpwoMLAsqwoDxQAys0gCdAP1iABdUiwEAAIEE/eABBNAAOgAACwlCAJEEAPkaDi4C
+7tbFLfBgAAAo0sb5IAQEsAgVAPkNAAzwAGYAAAtYFA2ICiiCx/kgBASwCBUACYk5ZJE980AK7RIA
+nQBvvg0LCUQAkQT94AEE0AA2AAsKQgChBAD5Gu7WxS3wXAAAKtLG+yAEBLAIFQD5DQAM8ABiAAta
+FA2qCiqix/sgBASwCBUACYk5ZJC/b74J8AAkDaSbAQAAAAsJQsAw+yAEAN/49QDu1sUv0AqAAOip
+AwyBCoAA4DoaDfBcAAAr0sYLmwELqwL7uMYV4ABiAAAAC18UDf8KLvLHDp4BDq4CLvbH+0sIBa/4
+9QAi1sUbpscMKRGrmSqWgyiWgiqWgSiWgCPGgSPGgOokAArYBIAAW/6qZKByGqa++kBoHeAMBQD7
+T+gVoA0VAFtiwOpiDilYBIAAW2LeyaHqYg4pWASAAPwAAh2gDRUAW2K40Q8LDEIAwQQA+RoOKAIo
+1sX3f/KPUgCdACzSxv0gBASwChUACak5ZZ5SLUEA86AEBvQOBQAO3QItRQDRDy5RLbDu/qWkHa/+
+EgAAAADqJAALYASAAFv9p2P/YAAAbBAIKkEBG6XXj0GIKCeygvJIAALwiQUA7LJ7LEZCgAD44ABD
+sA4VAOhwDSHgOoAA+KAAQvAAJgAAAAMFRolwLbKD7JkMBAChgAAKmBGo3SzQAPOAE5YSAJ0AHKaC
++CoCHeANBQBtmhcowoHTD9MPeKkFKcKAefEH7MwQJugFAADa0PegaB2hTPUA/YAE2+IAnQDspjwS
+8EuAAAUNRADRBP3AAQTQADYABQ9CAPEEAOkamhQfpE0PrwLvxsUq8FwAACrCxvsgBASwCBUA+Q0A
+DPAAYgAFXRQM3Qot0sf9IAQE8AsVAAm5OZ8V8yBoHeAIFQDpgzkEhVGAAPoAIh2gCQUAA6k4ZJB9
+KkEAHaZL+yAABbP85QB8sV4NrQEG3QL8gAQd4AIFANEPLHEtLnEs6rKEJkAFAAD/gA4SogCdACh1
+LS+hAmT/v1teqYxBK0EB7kEAKfgEgADpICYtMASAAOpUAAtoBIAA+CAGFeLuYQBb/dZj/5EAAOoi
+DitYBIAAW2JgZKDxEqYsL0EAAv8BBv8C/oAEHeACBQDRDwAAAADqEgQr2ASAAFv+GYwV7qX1FQeB
+gABvXhIFCkT7QAQA0AkVAP0gAQTQAEoABQpC+0AEANAJFQAAmRrs5sUq8FwAACzixv0gBASwCxUA
++W0ADPAAYgAFXxQO/wov8sf/IAQE8A0VAAnZORimEycSBOh3CwSE8YAABVsC+iCIFaAMFQBYAygq
+EgQrICYBEQJYAswqQQD8RNAVoqphAC1ygSlygC12gRumCwzMCeOqEQ4BCoAA4KoaDgEKgAD9YAEF
+3/z1AAy7AwuZAQqZAvjwBhXv+i4AAAAAAADqIg4rWASAAPwAIh2gDRUAW2H+EqXrL0EAAv8BBv8C
+/oAEHeACBQDRDytxLbG7+uWkHe/8LgAAAC5ygS52gSxygB2j0A3MAvzwBhWv/U4AAA0hhwoOPw8N
+Pw0Ah/gFCB2knAEA+R/r0+IAnQAcpSEqQQAbo+8MqgELqgL6gAQdoAIFANEPxyTRDwAAAGwQCpQY
+90s8BaWzHQDyQAAC8AoVAPQghhXgCRUA/GDAR1AFBQDAoPdgAQe0gwEA/iDGFeANBQDrpcgR8BuA
+AMCQ+CCmFaCMBQDp3DkO8ASAAAo+OZ4SGaP7/CBmFaBHBQD9R0AFoAQVAIoY+qAEANAuBQDtogMq
+eAqAAOqiAiLgV4AA/6AEB/AOFQD/zQAP8ACOAADtXOAvAgqAAPugBADQ+p0AAEga+eAEB7AIFQAP
+jzktICYK2hHqWggO7MKAAA1dCvugAEbxXgUA7qoICveCgACeF6ndLtKA8cAHEtIAnQCeEe0WACHw
+M4AA/CCoFeAAGgCNFADRBOyuAgpACoAA7mbFLoEKgAD94AEHX/31AO2NAwnwVAAAL2LGD98BD+8C
+/tjGFeAATgAvEgYo8scNiAEI6AIo9scqZsUrICZYAkcZo8D7SwgF59oBAOyjZRaMbQAAZNBbHaNo
+KhIBDaoCLRIA+7AGFaADsgAepXz6ICgVr9qBAO6qAQbwm4AADNgCKGazL2K0D89SCP8RD98C/0YA
+DXCOBQD/RgANMAA2AC7cgAjuEQ6qAo8Q+/AGFaACkgCKEMCA+VAGFaACYgBk8JDuEgUh8B+AAGAA
+AY4UjRcA4QTgSBoPAQqAAOyuAg/4CoAA/timFa/+9QDujgMJ8FQAAChixg6IAQj4AvjYxhWgAFoA
+khmIFiKCxw4iAQLyAiKGx4IZLiAmKmbFLyAMAOEEAEga6P8RDEQCgAAPiAIfpKkD7hGu3q/ujxII
+/wKIEw+IAh+k5e+IAgdwEwAAKOYAsHflfg9iqAUAACogJC0gJh6jXY8YG6MxLuKfj/ErsoGu3Qnd
+Ee27CAekXIAAZKBEKrAq66U7FQ1NAADJrtEPAP9ewA3gDQUAKrAqsKr8RIYd56oBAPtlRh2v/2oA
+LSAmA90Rq92p3SzSgB6jbA7MASzWgNEPKrAqsar0RIYdp6oBAPtlRh2v/rYALiAmA+4Rq+6p7i3i
+gAzdAi3mgNEPAGwQCpIVH6UfGKQYlBsaozWTGYkZlRQqop8pkCaFGyiCgKqZ/SgAFLXVHQDpiAgO
+74KAAOgWASLwN4AA/6AARPAAIgAAGaURFqTRF6Lp/0aABaFYBQD0gAAB8AoVAPpgBADQAwUA7p4I
+DSAKgABtig0HOQIpZsUo4oB4SASxMyMaUCsaT/NgCwPiAJ0A7l4GasgEgADAkJ0amRCv2PggZhWg
+ASYAAACxM/agCT9RUgUAGaT2H6MnAyoM/yAAR/ANBQBtqhKj3gfpAilmxSjygOhIBnboBQAAo97z
+wGgd4Ur1AP9AB9uiAJ0AihkSpNwqog4CMgsiFgLiIoAp2ASAAFthA4gUyIFooZzJo4oZ+mBoHeAM
+BQD7QcgVoA0VAFtg2ysSCSuyEGSwLSwSCR6k0OzCECnvAoAArt0u0oEvEgl+yRQv8hHI/ogZKdKA
+KIIR+QANtGIAnQB0L1Iao8P6YGgd4AwFAA8CAPtQSBWgDRUAW2DG4hICKdAEgAD6oGgd4AwFAFgB
+0h6kuQw9Ea7dHqNxLtaDx88s1oIu1oEs1oDAsCsmgfpQBhXgAEoAANow7BIJKtgEgABb+7oiGlDr
+EgUp0ASAAFv8lGShAfS/9w9SAJ0A+CBoFe/7cgAAAAAAAPwhSBXgChUAjxkFCELv8CYsAQqAAObS
+CA1ICoAA+CDGFeFYBQDiFgcv/oKAAAj/CP4hBhXgAgUA714HakgEgABgAAGJFoMYoyMHOALoZsUq
+8GAAACpixvsgBASwCBUA+Q0ADPAAWgAALBIHLMLH/SAEBLALFQAJuTlkkC0DOgL6oGgd4AwFAFgB
+mY0ZLdAmG6R9A90RDS0Kq90ZorWp3S7SgHDvFMDgLtaAsSJpLYiMGSzAJGTAo2AAEosZ67AmKdAE
+gABYATBj/98AAACOES3gKrDdDQ1H7eQqJoEJgACPGcDg/+SGHaACBQDRD4kVKJEtsIj5JaQdr/vO
+AIoZLKAmHaRnA8wRrcwdopmtzCvCgB2iog27AfuQBhXgCQUA+USGHeACBQDRD4wVihmLEP2BkBWg
+DQUALaYQLaYR7aRVLmYCgAD9ZgANsI0FAP1mAA3wDBUAWAKwY/4bwCDRDwBsEAjjo8EZ8ASAAIoo
+ieDyb+gV4IsFAOmqEQqwBIAA+EgAAvuJAQDqMwgEYD6AAPqgAELwACoAAAAACQVGKCA2/wOgD5/k
+pQApIFRkkG4mJhLuJhMrUASAAFh/C8Ag0Q8AieDAQOriASSsHIAAZqHKepbUieGL4PMgDSof+vUA
+/iAmFaeZAQD7IACEu7sBAOsWAyzA9AAA9iCGFa/rpQCbEooShhTuEgEtIASAACwgNsDUDcwC/EbG
+Ha/+PgDaYOvkAApgBIAAWH7KwCDRDwAA8TlADeP+1QCTEIcR9iCGFaANBQD8IEYV4//lAOeVCwug
+BIAA9uEAFeABAgAAAAAA/sxGDaFI9QB2gxrrEgMrUASAAOx0AAloBIAAW/wK/n+iHaP/5QC4RO8C
+AAO4IQAA9J/7bGIAnQApQQTTD/E/+wQROVEA/GgAAVlpAQBoMzj+wAT4YgCdAClBBepCAyz9DgAA
+Za+Z2mDrEgMr4ASAAO0SAClwBIAAW/y4Ljr9/n/CHe/+kgAAAAB+YVYsQQWJQ/GEsA3gCxUALCYQ
+KSYRKyRV5yYUKVAEgAD6IGgV4AwFAFgCQS46/fxygIFT/+UAiBEZoxstgQQJ3QEthQQsQQQMDEn8
+gIQdr/06AAAAAABln7XAoComEComEfpKph2v/s4A2iDrEgMr4ASAAFv9Mv5/oh2j/+UA6hYCJXjV
+gACGFP/6PA2gCgUAAAAAAAAA61QAD2AEgADsFgEpUASAAFv95v4gKBWv+doAnhHqNAAJWASAAPyg
+aB2gDRUAW/6ciRHpkgAtIASAAP4gKBWv+EoAAAAAAAAA9iCGFaAKBQD6IEYVr/i2AGwQBhujdJMQ
+lBH1RhAFoAwVAB2hiQ0tAi22xSuyxvFr4A3gCAUAIgr/+LgAFzANBQD+IEYVoAoFAPXAAEcwhQUA
+bQgiAIEEAMkaebAP4lQABVAFAAAv4sJ58AGx3bGI74gNYqgFAABj/9YAAAAAAAD+AAId4AMFABuj
+Vy4SAgv7CuuyxynABIAA//AAErAmBQD+oABHMAUFAOTuCAWBWYAAbWojAFEEAMkaebAS4oQABVAF
+AAAm4sMPAgB5YAGx3eVcASRABQAAsf/jPCAvpqgAAIkQiBGakJ2A0Q8AAAAA+LgAFTDy9QD6IEYV
+oA0FAP/98A2gCgUAbBAEG6M2GqLLE6FN0w8DIwIjtsUnssbw6RAN4AIFAANcEfuAAEQwBQUAbQgR
+wW8CZgx2dQSxVSmCwrEibygCY//nwJALlwoncsf/MAATMAIFAPzAAEQwLQUA6ogIA4CxgABt2g7B
+3wLdDH11BLFVLoLDsSKxmWmUygxCCuoiCAqQYAAAIy0EgzAVoTrlMwIBIBMAAJNA0Q8kLQSEQBij
+SehEAQEoEwAAlFDRDwNcEf/+PA2gBQUAAGwQBtog+iBoHeAIBQDoFgAg4BEAAOgWASnoBIAAW/+M
+jBH6IAgV4Un1APMpVg2gDhUAH6MwDy8LKfKB+mAEAN/49QDt8oAvcAqAAOjiAw2REAAA6ekCDhGM
+AAAH4hAC0gIp9oEIyBHi9oAtFAKAAAgiAgKyAtEPAPlGQAXiWDUA4otMeezCgAAeoQ35oABE8AHy
+AAKSAewpOA8ZwoAACDMDA90BKfaBCMgR7faALRQCgAAIIgICsgLRDyn2gQjIEe32gC0UAoAACCIC
+ArIC0Q/5RhYFokn1APMiVg2uvwUACjkRCSkM/yAARPAAGgDEkO+g8xmBCoAA7ZkKD3AKgADomQgP
+dAKAAA/uAh2hN62Z7ZKALZBwAAAO3wIIyBHvloAtFAKAAAgiAgKyAtEPAABosRTA0AjIEe2WgC0U
+AoAACCICArIC0Q8eovEO3QEIyBHtloAtFAKAAAgiAgKyAtEPAAAAbBAE56KvEfA3gADwACANpGMB
+AAADBkIAYQT1QYQF4AgVAP0AAQRf+fUA6YYDCwEKgADlJQIKIAqAAOV2xSnwWAAAKXLGCWkBCUkC
+KXbGInbF0Q8AA1sUB7sKKrLHCmoBCkoCKrbHInbF0Q8AbBAK5qEFGUgEgAD3RZAF4AwVAPVFIAXh
+XQUA/GGAF1CKBQD+QbAV4AAaAMDwKJAmEqCiLpAM/GDAR1/79QDAoOjuEQwBCoAA7v4CDkAKgADq
+7gIMRAKAAA6IAh6ivtMPDogCLpBZ6BYBIgwBgABl4UD9KyYdpKMBAPogZhWiswEA+iBGFeXjHQD1
+wAEHcAQFAP4ghhWgSwUAKpAmA68R708KDVaCgACqSq2qp/+m/yjygOKuAggECoAA8QAEEtIAnQDv
+EgMh8B+AAGAAAY8S7lbFL4EKgAD9gAEH3/71AO7+AwnwaAAAKFLGmxeZEAjoAQj4Avi4xhWgAG4A
+AJIYiBQigsebF5kQDiIBAvICIobHghiNEOpWxSnYBIAA7dAmKmAEgABb/xSJEPog6BXgDBUA/CoC
+HeABygAAAAAAAADoEgMh8DOAAPggphWgACIAiBKYFYgVAIEE7lbFLnAKgAD+IMYVr/j1AOjuAwnw
+bAAAKFLGDogBjhYI7gIuVsb+ISgVoAB2AACTGpIYgxQoMseCFg6IAQgiAiI2x4IYgxoqVsWOES72
+gLC75b7rYiAFAAAvkCT7QKYF4A0FAOygexeBOYAALZQkKZAmLMKfK7KBqcwJzBGsuyqwKrCqCghH
+6rQqJAb5gADRD2TvxPggBhXi8wEA/iBGFeAIBQD5KyYdpOMBAP4gZhWlQx0ABUQK9CCGFaAEBQCP
+EC/wJukSAy/WgoAA6koID/zCgAAPTwqn/+2qCAHwH4AAYAABiRLirgIMgQqAAO5WxS5ACoAA+yAE
+ANAOBQAA7hrriQMJ8FQAAChSxgmIAQjoAvi4xhWgAFoAkhiIFCKCxwkiAQLiAiKGx4IYKlbFpvko
+koBwjxPAoCqWgLFE+J/77tIAnQCJEGP/DY0Q2zDt0CYqYASAAFv+sfwqAh3gDBUA//9YDa/79QAY
+oiEDnxGo/6b/LvKAGKBdCO4BLvaA0Q8AbBAGH6IeHp/6/EGQFaALBQD8RNAV4AkVAOeiDBpQBIAA
+9S0ADTJVRQDl1QgO7MKAAOfdCAHwH4AAC7kC6v45DmYCgAD/hgAOMI4FAOm+OQHwc4AAKCAN/QYA
+DDSjAQD5xgAPMABGAAAAAAAA/cYADzKjAQD5Q4IF4AYVAO+f2B0BCoAA/MABBF/89QDsigMNAQqA
+AO9fAgpgCoAA75bFKfBUAAAvksYPrwEPzwL/OMYV4ABaAANfFAn/CijyxwioAQjIAij2xxOgHSWW
+xaPZKJKAZoAILpaA0Q8AAAAAIiAm6xYAKtAEgADrFgEg4BEAAOsUAAloBIAAW/4q+iAIFaFJ9QD1
+J5YN4l81AByhzwxcCynCgS3CgO4SASkBCoAA4GsaDRDIAAAJuQL3wAT5UgCdAAe+EA7eAinGgS7G
+gNEPAAAA5fsseVzCgACnuf0/YAWgAXYAx6/qvwMNwcKAAAqIAwjYAQ+fAQ75OCnGgSjGgNEP/0Nu
+BaJI9QB1gxIKKRH4rwAM/rwFAP0gAESwABoAxJDtn58ZAQqAAOuZCgtgCoAA7pkIDmQCgAANzAKj
+meuSgCUQR4AA/UMgANAPBQAvloDRDwy4AiiWgNEPKcaBLcaA0Q8aoaIKugEqloDRDwAAAGwQBiog
+JsCR5qB1EghhgADnpAANXwKAAPVABmISAJ0Aprsosp6aEPcACGnSAJ0AJbKdZFDrLiEHH6DRDg5K
+DO4RD+4CnlCNIBygrf2gABawDjUADt0CnVHsABUC0CEAAAoAivlAwAWgH4UAn1XoVgQpUASAAFsK
+1S8iECghGB6gwPCIABS2swEA92AAFbDDOQDrmQIOZUKAAP9GAA8/e/UA+mAEBfKIHQDsuwIMRAKA
+AAj/AiwiEZxbmVf+oMYVoA0FAO1WCS3cAoAAm1ifWosiwMEMuwKbIgx6EfdAAEUwCTUAKaad0Q8d
+oC+M2OoWACYNP4AADHsRprsusp5u41klsp3kUFVmc/0AAJ7YZV8k+iAGFaAANgD4SoYd7/vSAACL
+ENog67wYKWAEgABbXxIsICfLwtEPAP/72A2gBQUAwKBYehMdoBeM2OoSACYOnwAA//7cDaAFBQDA
+UMDqDs40/6EGFa/+ogCKJ8Cw+0QAFaAMFQBbZQ0coIQfoIKfoO0iACp0AoAADj4C/UBGFaALFQDu
+pgMu7gKAAAvdAp2hKyQn0Q8AAABsEAQdoTzjoH4Z0ASAABufaBafIigyoBegZSZigaSI7KDzHEZC
+gACoZhWfCQ8CAAUlAiXGsy7CtB+hMO/uAQUoSQAADl4CLsa0IsazGaB+A0gRCYIIKiLB9UAGYuIA
+nQAqYDRkobomIsEDSwgrsID5QOwFoAwVAPFgDe/fZgEACEgKKILD+GAABLACBQD7IAQA1IgdAP2A
+AQVQCTUAbZon+GAABLS4HQD7IAQA05ghAODJGgyBCoAA6akCDlAKgAD7JgANNIsdAPNAaB3gGfUA
+ApkMeT05sSL8XoCCUBn1ABqfRyqgffNACD9SAJ0A8IAID9IAnQAAWxEEHBQHzAotwvQNDU8NuwIr
+xvTRDwAAAOokAAtYBIAAW/XHZ6+3Y/++AAAAAAAAAPqgBiqiAJ0A2kBYBzXlpAAFBcGAAC1gNGTR
+BCYiwQNOCC7ggPlAfgWgDBUA8cAIh99mAQAISAoogsMICUP7IAQA0AIFAP2AAQVUiB0A80BoHeAJ
+NQBtmif4YAAEtLgdAPsgBADTmCEA4MkaDIEKgADpOQIOGAqAAPMmAAn0ix0AwZ8CmQx5PS+xIvxe
+gIJQGfUAGp8QKqB9fa8t4FsRAn0MgAAEHBQHzAotwvQNDU8NuwIrxvTRDwDrZAAJUASAAFv1k2ev
+wWP/yNEPBB4UB+4KLeL0H6AnD90BDV0CLeb00Q8EGBQHiAovgvQZoCEJ/wEPXwIvhvTRDylgIgOZ
+Ea2Zq5klloD0wyQd7/jSAAAA6kQAC1gEgABb9X1j/pkAACpgIhugqgOqEauqG57Xq6olpoD0wyQd
+7/uSAAAAAAAA62QAClAEgABb9XFj/0MAAGwQCo0yjzD6RtAV4IcFAP3wAAJxzXEA/CoABXufAQD4
+ISYV4e1hAP8iAA4R3UEAD4ZC9sAAQ3AAIgAADwZGGKCRfrcLdIMwGaCQDwIAdJsn/f1CHaAEBQAq
+IFXTD2Sgb2RAbCUmEuMmEyrQBIAAWHtQwCDRDwAAAPk+YgXgCEUACLgC6CQ2J6kcgACcGJ4XnRYq
+FgV5QUgGagLsICYqWASAAFv/OSogVStMEuslGCUAiYAAixn6QGgdoAwFAFv+yPAAeA2gBBUAAAAA
+AAAAwMDqVAAJ2ASAAFh7D8Ag0Q8AwECMGPeADIFSAJ0AjRUYoGf6AAId4AoVAPWgB3FSWQUALyAM
+jRUsICacFA2tOenJCA5kwoAA6MwIA3AbgADAoIgUCrc5GqBT6J4xHAEKgADtqDkL8ASAAP3gABUw
+DRUA6KoCDugKgADg3REDcJOAACggDf+mAA+wBxUA+wYADDTWAQD55gAPsABmAAAAAAAA+8YAD7AH
+FQD/pgAP8tYBABqf/QDRBPzgAQdf+PUA6O0DDoEKgAAYnhCOFeiYAg9wCoAA6KbFK3BUAAAoosYI
+2AEI6AL5WMYVoABmAAZYFAqICiqCxwraAQrqAiqGxxqf6R6eWZkTKabFrsotooCbEvOgBcLSAJ0A
+L6aAjxebEvfgBJlSAJ0AiBZvgnOKFhmgJBiea4wgLZKdL5KY6os4DnZCgACu3R6edYraKZJhD8wM
+DqoBC6oCi9t5ywf5oGgd4AAaAMCQHZ9Fw/ov1hAr1hHD6y7WECrWEY3QH5/wHp8/790BDkYCgAD5
+pgAOsC8FAA/dAu3mACSAQYAAmpqbm//3kA2gDAUA6iQAC1gEgABb/d5j/mXbYOwSBylQBIAAW/0j
++iBIFe/9ggAAihOIEi0gJp0a6BYAKNgEgADoFgEg4BEAAFv8OosSihONGv4gCBWhSfUAepNSH5/e
+D68LKvKBKfKAANEE5xIBK+gKgADu4hds4ASAAOraAguQlAAAB9kQ+YYADPAAagDHj+jcAw7xwoAA
+CO4DDpkBDKwBB8o4KvaB+fAGFe/7TgApKlPqmxJ+/MKAAB2fyBmduP3gAEbwAOoAKCpPeoMSCtkR
++U8ADP68BQD9IABEsAAaAMSQGJ+/6p2uHoEKgADvnQoLyAqAAACZEQqZAqjdGp3zqtrtooAvEDwA
+AAnZAvlQBhXv+bIAaOEJ///EDaAJBQAAABmfs/mgBAT//5IAAGwQDOqeQhlIBIAA5JAmKhAEgACG
+mCuigy+ie+eifys2QoAAq2YsYAzdUPTgAEOwjgUA78wIC75CgADntwgOZkKAAOy7CAHgPoAAA4NC
+/mAAQbAAHgADA0b8YoBHUA4VABifpgY1EahV9KAIFeAAkgAcnv4DWhQMqgooooQqoogDDEQAwQTq
+iAIPKAqAAAhVASxxGKRq76B8IoBpgABlIVll0VZgAAJkIj8YnWsuYhcogrWYGPHACiUSAJ0A/CCG
+FaAOBQD7wAQA0AgVAO1MEQxACoAA7BYFLgEKgAD9AAEEX/z1AP0XAAwwDBUAnBaMGAjMARidWQDh
+BOyGtSEIuYAAkh6IFYIW4CIaDAEKgAAAIhoCzAISnVCIGCwmteISDiQIMYAAZMGonxmbGpobnRz4
+IaYV4AgVAOgWByEIQYAAjxecEfghCBXgClUA+CAGFeALhQDsn2oaaASAAFh7NokdjRyKG4sajxks
+YAzAgQ8CAP2fIBWgDgUA/QIADzAMBQAOjDjKzOxxGCKG2YAAKMz/KHUYJaB8JVz/JaR8KLB4JZA2
+KIz/+W8GHaD4dQAIVQEllDb8ACIdoAkFAA7JOO4SBCSBCYAA7HEYJwYRgABkwRzpoHwnhiGAAJsa
+7RYMJIlhgAAvYAxo9yEusHjaMOtEAAlgBIAAW/SS0Q8O2EFkgPnA4fwghhWv+vIA//90DaAOFQCS
+HoIWwIANgjiSFvIhyBWv+3oAZM79HJ5bwIgoxlIoCuIoxlMcnQj9lqgVr/umAACdHJ8Zkh6bGoIX
+mhv4IaYV4AgFAA2COJIX8iHIFa/7fgCxyCh1GCWgfLFVJaR8KLB4JZA2sYj5bwYdoAiFAAhVAvUm
+xh3v/K4AZM9BwJP47WYd7/zyAJsa7RYMJPohgAAenZqLYC7ie/rjaBWgDBUA/28ADbANFQBbWwaN
+HPohSBXgDxUA/uXGHe/8XgAcnjHAiCjGUsCAKMZTHJze/ZaoFa/5DgBl3bxj/wrAkfjtZh3v+3YA
+AAAA7BYEJ3NNgAD/9vANoA4lAB6dgItgLuJ7+uNoFaAMBQD/bwANsA0VAFta7I0c+iFIFe/63gAA
+AABsEAYpIDb9/UIdoApFAOqYAgT4HoAAYACjKCQ2iTAfnW7+YCgVoA0FAPEgBHLbSQEAJ/J/KyAm
+JvKDp7ftJCcrvkKAAPbAAENw3uEA9iAGFaB++QD/zqAIkG7xACwgWynyfyjye33BP6m5iygq8oMJ
+uxGrr4vwCZkRqarouwwHDDCAAO0WASYKCYAALvB50w8PAgCw7vwgJhXnzgEA7vR5JgiJgAAtJFvq
+JAAKWASAAOx0AAtoBIAAW/8EwMDqVAAJ2ASAAFh5YMAg0Q8AIjEEjhD9PXwFoBuFAO7gKCloBIAA
+WHqIH51hFpzgFJ65fyE+8EYQDeEoxQBygyuJEI0QKZAlihDt0h0khvmAACqhE3ojB4wQDysRK8UT
+jdxk0Nv//mQNoAwFAP/+RA2v7KUAixArsChksNqMELG9DQ1H/YUGHeAKRQD9PUYFoBuFAFh6bWP/
+ygCLECuwKGS/yYwQLbz/DQ1H/YUGHeAKRQD9PTQFoBuFAFh6Y44QLuAoZe+eiBDApP09KgWgDwUA
+/wSmHeAbhQBYeluJECmSHYqcZKCni51ksKKKEAuwAGP/cAAAACqiHPwAAh2gDRUAW1p5/CAoFe/7
+hgAu8HnAweqiHCdwBQAA/+8mHaANFQBbWnH8ICgV7/sGAIgQwJHphCUpf8KAAP8CZB3v/I4AixAq
+sCIDqhGkqqaqKqKA+2ymHa/8RgCLECuyHYu8ybWLEMDQ/WJkHeAMFQAstCX7ZRAV7/wmAI8QLvAi
+A+4RpO6m7i7igP/sph2v/1oAjxAo8CLv8GUsRMKAAKSIpoj/EAYV7/sGAABsEATqJAAKYASAAPpi
+ABXgDTUAWDs+0qDRDwAAbBAEb2NcZTBZ8MBwDeAY5QB0g078yQAA1yIBAMlh+kBoHaALBQD34AAG
+sBz1AFhkNvDjMA3vxAEALVEA+kBoHaALBQBYZDDJYfpAaB2gCwUA/APiHaANBQBYZCvAINEPb0u4
+xirRDwATnAYLKhEKygIqNsEanAQbnAT8AAIdoD0lAP4AIh2gCaUA+HhmFeAPBQBbW2RmoAorMsL6
+oAQd7/6iAMCk/Tf2BaAbRQBYefVj/5MAbBAG+kQwFaALBQD8IGgd4Bw1AP4AIh2gDwUAW//M6Z4j
+HQGSAADoEQApjMgAAAmIASgVAPoAAh3gHDUA6iAhKOgEgAD+ACIdoA8VAFv/v9Kg0Q8A0qDRDwAA
+AADqEQAhlB0AAGkzzOmqAQnfgoAAC6oC+iAEHa/++gAAAGwQBvxhYAZQJGUAdDEWxirRDyggQfUJ
+Jg2gCQUAKSRBghDRDwDAsPpEMBWgHIUA/AAiHeAOFQBYQijmoGxtGASAACogIfoAAh3gHCUA/AQC
+HeAuBQBYQiDkJEEpkASAANEPKiAh+gACHeAchQD8ACId4A4FAFhCGOagLm0YBIAAKiAh+gACHeAc
+JQD8BAId4A4FAFhCEeagEG0YBIAAwKDqJEEpkASAANEP0jDRDwAAbBAEwKX9O74FoBuFAO0gIinw
+BIAAWHmj+AgCHeQIBQD4YAQE8AQFAOmEOQHgNIAAGJujCEQCBARPIyAhFZuZ/HgAEbAIRQAIMwIj
+VsH7NywF4AwFAPwGQh3gDhUA+zciBaAJpQD4uGYV4A8FAFta9eegFG0QBIAAwKT9NxwFoBtFAFh5
+iNEPAClSwiNWwRqbjAqZAQkJTwlJAilWwvs3BAXgDAUA/AZCHeAOFQD7NvoFoAiVAPi4ZhWgDwUA
+W1rh56AUbRAEgADAof029gWgG0UAWHl00Q8A0Q8AAGwQBMCl/TtSBaAbhQDtICIp8ASAAFh5bPpE
+MBWgCwUA9AACHaCDAQD+gGgdoQ0FAPmtAA8wDEUAWEHEZqApKgoC+mAEBTIJBQD7LQAKMAsFAPpE
+MBWgDJUA/oBoHaINBQBYQbrSoNEP0qDRD2wQBBydkPxEUBXgClUA/kOkFaAbhQBYeVEjICEUm08L
+MxEjRsH7NpwF4AwFAPwGQh3gDhUA+zaSBaAIpQD4mGYVoA8FAFtareagR20QBIAAKULCI0bBGpvC
+CJkyDwIACpkCKUbC+zZ8BeAMBQD8BkId4A4VAPs2cgWgCJUA+JhmFaAPBQBbWp3moBdtEASAANEP
+AMCk/TZqBaAbRQBYeS/RDwDAof02ZAWgG0UAWHkr0Q8AAGwQBMCl/TrGBaAbhQDtICIp8ASAAFh5
+JOogISGBAYAA/TZQBeALBQD/NkwFoAwFAFhBftKg0Q8AAAAAAP02QgXgCwUA/AACHaAOBQBYQXfm
+oERtGASAACYgIRSbEsBa55sWGzbCgAAmRsEamw/7Nh4F4AwFAPwGQh3gDhUA9JhmFeAPBQBbWnBm
+oIYoQsJ0j9UuIR137wTSMNEPAP06egWgClUA/ERQFeAbhQBYeP4iICELIhEiRsEamvz7NfgF4AwF
+APwGQh3gDhUA9JhmFeAPBQBbWl1moEopQsIiRsEam3MImTIKmQIpRsIamu8bmu/8AAIdoD0lAP4A
+Ih2gCJUA+JhmFaAPBQBbWk9nr4dgACLApPzgaB2gG0UAWHjiIvq50Q/ApPzgaB2gG0UAWHje0jDR
+D8Ch/TXCBaAbRQBYeNrSMNEPAABsEAQqICEUmuTzNagF57MBAOSwQ21WwoAAwIALqQIpNsEoNsIa
+ms/7NZ4F4D0lAP4AIh2gDwUA6DbDLGAEgABbWjDmoHltEASAACQ2wsCh+nhmFaAAQgAAKjbBJDbC
+wLkrNsMamr8bmr/8AAIdoD0lAP4AIh2gDwUAW1oh5qAqbRAEgAAK6jAZmr4pkkUKmQoM6jAMnAxq
+wQ5tCAgK6jAKmgxqoQJj//DRD8Ch/TVkBaAbRQBYeKpnL8lj/+oAAMCh/TVUBaAbRQBYeKVj/+cA
+bBAI+kBoHafJNQD4Q4Qd4cg1APhDpB2gCwUAW//FZ6AK0qDRDwAAAAAAAAD6RDAVoAsFAPwD4h2g
+DRUAWGK1F5qaFpqXE5qR/11YDeAEpQAqICHTDw8CAP1YABUwGzUAC6oCKjbBG5qL/AACHaA9JQD7
+NQ4FoA4VAPR4ZhWgDwUAW1nr56MobSgEgADApPzAaB2gG0UAWHh+BVoCZq+B2iD6ACId4AwFAFv/
+T2avcfpEMBWgCwUA/TlkBeAc9QBYYpX/VbgN4AVFACsgIcHIC7sRDLsCKzbBGppu+zTcBeAMBQD8
+BkId4A4VAPR4ZhWgDwUAW1nP6hYGJRe9gAAqCgT8wGgdoBtFAFh4YYoWZq8P+kQwFaALBQD9OTIF
+4Bz1AFhifGau+SwgIQ8CAA8CAAvMESw2wRqaVvs0rAXgDAUA/AZCHeAOFQD0eGYVoA8FAFtZt+oW
+ASUZTYAA3GD6AIIdoBtFAFh4SooRZq6yKiAh+gACHeAc5QD8AGId4A4FAFhApGaumSogIfoAAh3g
+HCUA/gACHaCNBQBYQJ5mroAlICLApf047gWgG4UA7iEdKugEgABYeDYtICEL3REtNsEamjP7NGgF
+4AwFAPwGQh3gDhUA9HhmFaAPBQBbWZSaE/VCKA3gBgUAKRoALjLCLyEdDwIACe4C/+IABd/uAQAf
+mjMPAgAP7gIODk/6RDAVoAsFAPwAAh2gDQUAWEB9Zq3+KiAh+gACHeAMRQD+AAIdo+0FAFhAd2at
+5SogIfoAAh3gDJUA/gACHaENBQBYQHFmrcwcnEgtICL+Q6QVoApVAP4ghhWgG4UAWHgJiRT6RDAV
+oAsFAPggAh2gDEUA/sBoHaCZAQD5DQAPcQ0FAFhAYWahCosULSoA/ABCHaIKBQDsuwELcASAAPtN
+AA9wDJUA+kQwFaALBQBYQFZmoN8cnCwtICL+Q6QVoApVAP4gRhWgG4UAWHfujRL+CAId5A4FAO/f
+AQtIBIAAD+k56RYFJuAwgAAHmQIJCU+ZFScgIfz4ABOwCEUACHcCJzbBGpng+zPABeAMBQD8BkId
+4A4VAPR4ZhWgDwUAW1lB5qLubSAEgAAqMsInNsEbmdyJFQuqAQoKTwqZAik2whqZ0RuZ0fwAAh2g
+PSUA/gAiHaAIlQD4eGYVoA8FAFtZMeaixm0YBIAAZqAnJiRA+qBoHaALJQBYaoxmrJcdmeYDXBGt
+zC3CgB6Z/A7dAi3GgCzCgGasfeYkIC0QBIAA0Q8AAAAtMsLAsPpEMBWv3QEA96YADvAcNQBYYdNm
+rFX6RDAVoAsFAPwD4h2gDQUAWGHOZqw/+kBoHaALBQBb/tFj/KwAAB+b5S0ywsCw0w//oAQG8A41
+AP+mAA6wHIUA+kQwFa/dAQBYYcBmrAf6RDAVoAsFAPwD4h2gDQUAWGG6ZqvxKCAhDwIADwIA/RgA
+FDAZhQAJiAIoNsEamZL7MyQF4AwFAPwGQh3gDhUA9HhmFaAPBQBbWPPqFgAlC72AAMCk/MBoHaAb
+RQBYd4b6IAgVr/JGAB+bwi0ywisKAA8CAP+gBAbwbgUA/6YADrAMBQD6RDAVr90BAFhhm2ardfpE
+MBWgCwUA/TduBeAc9QBYYZZmq1/6RDAVoAsFAPwCQh2gHSUAWGGQZqtJ+kQwFaALBQD9N1oF4BwV
+AFhhi2arM/pEMBWgCwUA/TdQBeAcBQBYYYVmqx36RDAVoAsFAPwCQh2gDQUAWGGAZqsH+kQwFaAL
+BQD8hEId4BwVAFhhemaq8fpEMBWgCwUA/TcyBeAcBQBYYXVmqtv6RDAVoAsFAPwCQh2gPcUAWGFv
+ZqrF+kQwFaALBQD9Nx4F4BwVAFhhamaqr/pEMBWgCwUA/TcUBeAcBQBYYWRmqpn6RDAVoAsFAPwC
+Qh2gDYUAWGFfZqqD+kQwFaALBQD9NwAF4BwVAFhhWWaqbfpEMBWgCwUA/Tb4BeAcBQBYYVRmqlf6
+RDAVoAsFAPwD4h2gDQUAWGFOY/uLHpt0LTLC/6AEBrALBQD1pgAO8ByFAPpEMBWv3QEAWGFFY/sK
+AAAAAMCk/TJKBaAbRQBYdx/6IGgVr/YiAAAAAMCk/TI+BaAbRQBYdxnnTUhqUASAAGP9aMCh/TI0
+BaAbRQBYdxP6YGgdr/S2AGwQBCkgIROZDv04ABSwGtUACpICIjbBGpkLG5kL/AACHaA9JQD+ACId
+oAilAPh4ZhWgDwUAW1hrZ6ARwKT9MgoFoBtFAFh2/2egT9EPKTLCIjbBK/oA+yAEBPAqFQAKmQIJ
+CU8pNsIamPcbmPf8AAIdoD0lAP4AIh2gCJUA+HhmFaAPBQBbWFdnoAzAof0x5AWgG0UAWHbrZs+v
+wCDRDwBsEAQpICETmOb9OAAUsBrVAAqZAik2wRqY4xuY4/wAAh2gPSUA/gAiHaAIpQD4eGYVoA8F
+AFtYQ2agPCkywuogIST8eIAA+gACHeAc1QD8H+Id4O7lAFg/NNKg0Q8AAAD6AAId4BzVAPwf4h3g
+7vUAWD8t0qDRDwDApP0xnAWgG0UAWHbIY/+1bBAEIiEc0Q9sEAQqCgX9NhgFoBuFAO0gIinwBIAA
+WHa/JCAhFZi9C0QRJFbB+zF4BeAMBQD8BkId4A4VAPsxbgWgCKUA+LhmFaAPBQBbWBvnoBRtEASA
+AMCk/TFoBaAbRQBYdq7RDwApUsIkVsEbmOIdmvQamvX9IAQE8MMBAP1tAA0/mQEACpkCKVbC+zFI
+BeAMBQD8BkId4A4VAPsxPgWgCJUA+LhmFaAPBQBbWAPnoBRtEASAAMCh/TE6BaAbRQBYdpbRDwDR
+DwAAbBAEFpjEGJiYBicBeHEVdScCdT8W9uFeDaACBQAGNAF4QQ3RD3Y85sQg0Q8iCsDRDyIKgNEP
+AABsEAgkICL6RDAVoAsFAPwiABXgDBUAWGB580BoHeAHFQDpmKIdAaIAAANGEalmKGK3G5irC4gC
+KGa3K2K3KCAr8WAZxNIAnQDzYBmFEgCdACoRCAolQHhZCmRRaNIw0Q8AAAAA+kQwFaALBQD8IkAV
+4AylAFhgYeav3m0YBIAA8L9ADeAJBQAqIEDyAGId4AslAPkw3gWgTwUA/ERQFeOqAQAcmIIPAgAD
+3hEM7ggs4rcIzAIs5rfs4rclDomAAPVADwiSAJ0A9UAPSRIAnQD1QBQJkgCdAMAw9n/74JIAnQD6
+RDAVoAsFAPwigBXgHMUAWGBC5q9hbRgEgAAempMrEQoqIC/u4gAg6GEAAP+gBhWhy2EArcwswAAt
+CuftqgEOZ0KAAAyqAiokLyligP9j4AbSmekAH5h6+T/AFaAKJQD6Q+QdoAkFAPntAAywAFYAG5h1
+JyUf/T+gFaAJBQAMuTnKlihigMeu0w8KiAEoZoAuYoAfmGwPAgAP7gEOngIuZoAtYoAH3QItZoD6
+RDAVoAsFAPwjgBXgDFUAWGAX5q62bRgEgAAsIR0bmEzqEQ4mZdqAAPtABEziAJ0A8AIMDaBJBQAt
+ICEVmBP0RBAVoAalAP24ABawHqUADt0CLVbBGpgN+zAcBeAMBQD8BkId4A4VAPa4ZhWgDwUAW1du
+6ZgKHQxiAAAuUsLxwAf9EgCdAChM/vjtAAmwDyUA7yQgKZAEgADRD3WnCfgYAh3gAFoAAAAcl/8L
+qQH9IAm0IgCdAMCQKSUe9kVmHeANBQAtJCDdQOyaPhr4BIAA/iEEFaAKRQD4IAYVoBuFAFh16v/3
+mA2gAxUAKSQrKSUe+EPkHe//RgAAAAAAAAAA8YAGZBIAnQAnJED/+PgNoAMFAAAAAAAA8YAF5BIA
+nQD6SAYd7/ieAPGABaQSAJ0AKgrwKOKBDwIADwIAD4gCKOaBKOKBLPq/DIgBKOaBLCBACswBLMwQ
+LCRAC8wCLCRACsoB+V/vJtIAnQDAof00KgWgG0UAWHXF8kgGHe/3PgAAKSAh/TgAFLAKVQAKmQIp
+VsEal777L3wF4AwFAPwGQh3gDhUA9rhmFaAPBQBbVx9moHEqUsIK2kAqJCAKSgwKcznSMNEPAAD/
+9gQNr/P1AP/15A2gAxUA+EgGHe/1vgD4SAYd7/WeAPgQAh3v+zIAG5n2KhEIC6oB+iEEHa/zKgAA
+AMCk/SBoHaAbRQBYdZ8tTPv87QAJ8AxVAOwkICmQBIAA0Q/ApP0vOgWgG0UAWHWXLUz7/O0ACfAM
+VQDsJCApkASAANEPAGwQBB6ZDuyZdxl8woAA+y8cBeAJBQD4AAIdr/31APAAJA2gChUAsZlolEUP
+lQquVSVSw/6+8A3gAgUAC5YRbQgsACEEAKcad1AWC2MCI8azI8K0DXQD9KAEAr0zAQADiDexIu8s
+v2MwBQAAZF+3Y//MrvUlUsLwo+AN4AIFAPYQAh2giXUAbQgrACEEAKcad1AWC2MCI8azLsK0DX8D
+/qAEAv3uAQAOiDexZuaTCXEQBQAAyFFj/80iWu4IgjnRD2wQBBuXniwgIhqYfSuyoS0wCCqigKy7
+6TIBLd5CgACrqoqn+mFwFe+ZgQDqog4mg4mAAPWgBEiSAJ0A9aAIaRIAnQD1oATJkgCdAGjUEcCk
+/TM6BaAbhQBYdUrGKtEPAPUgBLMSAJ0A9SAFq5IAnQBpmOcLvgn7wACHMN/lAK/uLeECLOEBLuEA
+LjUH/GGGHeHMQQD8YaYdoAIFANEPAAD1IAdLEgCdAPUgB2uSAJ0AaZinL6IU/mBmFeACBQDRD/Ug
+BwsSAJ0A9SAHs5IAnQD1IARsH+KlANEPAAAAAAAA9SAH4xIAnQD1IAgLkgCdAPUgBGQf4qUA0Q8L
+uQkKmQkpnHYrkQIqkQEskQAsNQf6YYYd4apBAPphph2gAgUA0Q8LuQn7IACEsKylAKyZK5ECKpEB
+LJEALDUH+mGGHeGqQQD6YaYdoAIFANEPKyxU6wYAAdBBAAD6gmgdoAIFANEPLqBc7jQPJWlRAADt
+JgAB4EEAAPyKaB2gAgUA0Q8AAC+gcP5hJh3gAgUA0Q+CqvJgZhWgAgUA0Q+Ir/hgZhWgAgUA0Q8s
+oDTsNA8lWLEAAOtGAAHIQQAA+JJoHeACBQDRDy+gSO80DyVxAQAA7mYAAehBAAD8mmgd4AIFANEP
+ACKgZPJhJh2gAgUA0Q8ooGr4YSYdoAIFANEPAABsEAQYlx8UlvQogp8blwQkQoGiiOeXWxxGQoAA
+qET6iDAVoC+FAP4EYh2gLSUA4ywRCAQKgAD0YAQuEgCdAOSgCGk0woAAxirRD6tl/GAGNGIAnQD+
+YAc8IgCdAP5gBjxiAJ0AKkAjI0RBKUr+6VaBJSztAABopjNopDBop31oonr1QAQkEAuVAHuhfGij
+efVABoyQDLUA/UAGTCIAnQAtSv78sCYV4AIFANEPKUquLcr/DZ0B/LAmFeACBQDRD6vL/UAEXGIA
+nQD/QAT8IgCdAP9ABURiAJ0Ap8gigsDHngkiASKGwC6ygS/63Q/uAf9wJhWgAgUAIkRB0Q8tSqb8
+sCYV4AIFANEPLUrM/LAmFeACBQDRDypSgBuW0guqAvqwBhWv/QYALFKBe8dep24t4sDA8Q/dAv3Y
+BhXv/KYAKFKAGZcLCYgC+LAGFa/8YgAqsoAdmN4NqgH7cAYVr/3yAAAAAPiJgh3v/R4ALrKAH5fu
+D+4B/3AGFa/9ggAosoENiAL5cCYVr/1KAADrQCMpUASAAFhnRWP/kgAAbBAQijCEMfZEUBWgBwUA
+/S2gBaALNQD/Q2AC30SBABmYxcSB+IAEUqANFQAJSQqJkAqQAAAAwMB5pkSEMdMPDwIABARf9IAe
+GZAIhQD1AZYNoCl1APSAI7tSAJ0AeUE0HJi27iAjK2gEgAD+RtAV4AolAPQgBhWgG4UAWHRcxsrq
+VAAJ2ASAAFhzKcAg0Q8AAAAAAAAsIh0swhDLyeokAAnYBIAAC8AA/UBoHa//UgAAAByYou4gIyto
+BIAA/kbQFeAKJQD0IAYVoBuFAFh0R2P/qgAAAAAA//6QDa/spQArIR0sIRz8IiYVodtJAPwhphXl
+SwEA9CIGFaH7MQD+IcYV4OtBAJ4fLyA2LiAjhDKUEvwgBhWgClUA6xYBK2gEgAD9MQ4FoBuFAFh0
+MCgiHWSGfikSESrqAAqZAvUgM5SiAJ0AKxIQBA1FfbkkjB4EbkF+yRyPHwSIQHj5FASZQekWDCS2
+oYAAih35QDZUYgCdAAS+QPKAG70QxGEA8oAbPNCkaQAflpnbcPvtAA2wDaoAAAAALCIdjMBkxkr6
+QGgdoAsFAAvAAOoyAC1gBIAAY/6EAAAsIh2MzmTE8utEAAlQBIAAC8AA6jIALWAEgABj/mQAAOtE
+AAtQBIAAW/8h6jIALWAEgABj/kwAAAAAAC0gQcLm/6Al/SIAnQAsIh2MzmTEyutEAAlQBIAAC8AA
+6jIALWAEgABj/hwAAAAALSRr//hIDaAMBQArJGv/+BwNoAwFAOs8CClQBIAAWEML6jIALWAEgABj
+/ewAAP/3nA2gDAUAGJYjKiAhFJX4KIKfKTAIJEKBqojrl14cRkKAAOhECAT9DIAALzEILjAJnxUv
+MQn9RgASUO4hAIkVAJkR6fkCDXzCgACr/yn2yCnywP+tAA8/+OUACJkBCekCKfbAKTAILxISfpdF
+LzEKLjAJnxYvMQv9RuASUO4pAIgWAIgR6PgCDXzCgACr/yj2ySjywMCR/y0ADz/51QDpiAEPT8KA
+AAiZAin2wCkwCC8SE32XRS8xDC4wCZ8XLzEN/UbgElDuMQCIFwCIEej4Ag18woAAq/8o9soo8sDA
+kf8tAA8/+bUA6YgBD0+CgAAImQIp9sApMAgvEhR8l0UvMQ4uMAmfGC8xD/1G4BJQ7jkAiBgAiBHo
++AINfMKAAKv/KPbLKPLAwJH/LQAPP/l1AOmIAQ9PQoAACJkCKfbAKTAILxIVe5c2KTAJ4hYWK8AE
+gAD+YKQVoJkZAAOiEasiLibHLyLAweD5zQAMf+n1AAn/AQj/Ai8mwCkwCCISFnmXMSsxB+mXsBWd
+cYAALkAi6rwSL3TCgAD5wABHf6oBAKzuKuaAKkUZLUQ0KUAuZJNlKUQuijD/8MANoAwFABuVtS0h
+HiohHxmV9RSV9PjgaB2g6jEA/y0AC7D6OQDphAAMcASAAP6NAAxw/TEAD745JCAkLyAr/wYADDWq
+AQDrlXYdUgKAAO4gLCoiwoAA9OYACjDdOQDtuTkP+EKAAAr/Ai0hHAn/AikgIwj/AgT/AiggISQg
+IC01BushHSzOAoAA6zUHLEQCgAAJiALo/wIKJsKAAATuAiohGSo1CA/uAp4y+EaQFeAIBQCYNpk3
+JCA1JDQSLyAv/mJmHe/u3gAAAADqJAAJ2ASAAFv94/1AaB2v7oYAAAAAAAD7K4AF4AAyAPsqgAXg
+pGkAKSAiH5eSA5kRr5kflZOvmSiSgB+Xjw+IAQi4AiiWgCkgLy8K/g+ZASkkLw6ZAvhF5h3g+NUA
+CJkB6SQvLn/CgAAPnwL+ReYd4Pi1AOj/AQ1PgoAACfkCKBIRLyQv+EXmHeYPBQB48EQEmkHLrosd
+erE6LCIdjM+aHO0WBCYWWYAA6xIMKVAEgAALwAAYl3IuIR2PHI0U6O4BD/3CgAAP7gL+Q6QdoAAq
+AAAAAADAoCgaAAhLAXhAS+oWCSaMYYAAKRIQmxr9IAjNYgCdAJ0UjB/6IUYV4A8VAAv7OfuACBVi
+AJ0AiB76ISYVoZQxAJkb+QAJZWIAnQDqMgAtYASAAGP6PACLH8q+KCIdiIWdFPpAaB2gCwUAC4AA
+KCIdiIT6QGgdoAsFAAuAABuXSykhHY0UC5kBKSUdLBIQfckEjh9k4TRk0ckv3P/94A4Y4gCdACwi
+HSzCA2TAFS0WBOokAApYBIAAC8AA7RIELXxiAAAelzssIR0OzAGOHg3MAvxDpB2htDEAe+kDjx/J
+8RiXNNMP6MgBDc6CgAAJiAIoJR0pICvqFgkk+omAACogIlhD/IoZY/9BAAD/5hANoAwFAOpkAApY
+BIAAW/3o/UBoHa/m5gAAAAAAAP/lkA2gDAUAAAAoIh2IhZ0U6iQAClgEgAALgAAdlxosIR2aGQ3M
+AY0U+CHIFeG0MQCbGw3MAiwlHXuZC48ajh/AgQ+POX/hJygiHdMPiITrRAAJUASAAAuAABuXCykh
+HYob65kBDVaCgAAKmQIpJR0oIh2IiNogC4AAG5cBKSEdihn7IAQE8QsFAAuZAvhDpB3v+j4AKTEG
+//JMDaCZAQCMHgRrQfuf87xiAJ0A/EOkFa/8EgAnRDRb/QctQDRl3GcvQCIYlsAD/xGo/xiU7fng
+AEe/6gEALvaA+oMkHa/xLgAcluovIDYuICMpEhGZEPhDpBWgCiUA9CBGFaAbhQDoFgEraASAAFhy
+hP/4RA2v6qUAAAAAAADuICMraASAAP5G0BXgCiUA/S20BaAbhQBYcnpj+HcAAByW1y8gNi4gIygS
+EZgQ/EOkFeAKJQD8ICYV4BuFAOQWAitoBIAAWHJvY/+mAAAAAP/20A2gCgUAHJbKLyA2LiAjKhIR
+mhD4Q6QV4BuFAOkWAStoBIAA9CBGFaAKJQBYcmFj/25sEAYuMQvtIgAnRPUAAGjrEsCj/S12BaAL
+hQBYclnAINEPAAAclriONo83iTiZEPhhKBWgCjUA+CAmFaALhQBYclDAINEPAI42/mDoFeAKNQD9
+LVoFoAuFAFhyScAg0Q9sEATAINEPAGwQCIggIxYEKRIEIyAHF5U89gBCHaAEpQD5APIN4TMBAARG
+AvRgCUoSAJ0ADDgRB4gIKYKe9yATG6IAnQAogp0IhALoFgMkCimAABmU0wkAh21pAggCYSkhB4sg
+GpUs/CCIFaqZAQAMmRHqmQIN1gKAAP1gCNOgBQUAH5WXmUD/KkQFoAyFAJxDnkL5KygF4A0lAA2q
+AppBCbkCmUQq8oAu8n/rIQkpxwKAAPcAAERwDAUA5oadJ3P9AAD/7+YVoA0VAFtSPYonjiL/RAAV
+78gFAAj/AeWlFCf5AQAAn6nvpggnArGAAP0s3gWgClUA/EAIFeA7JQBYcgiIImSAhMCw+/4CHa8J
+BQBtCA14kA0IiBTkgBxl2CEAAGP/63igC7S78AAYDaSIHQCxuwgYFGWP99ogW1OyiifHnymmACUm
+B1tPKiUkBOUkBSoQBIAA0Q8VlN2JWPcgClCSAJ0ADDgRp4gqgp73QAqTogCdACiCnWSBSbCa+qEG
+Fa/7GgAAAAAAAAD//qgNoAsFANKA0Q8flVWOExyT4ZUR9CAGFeANRQDtqwINx4KAAC0gBwyIAvnA
+hhWgLIUAnOOZ4JvhGZTS+cBGFeHdAQDtFgIo0ASAAO/dAgFZhQAA/cCmFeAMNQBYbAu0GvpLoBXg
+DDUAWGwIjxMelKMblTyV+/XhRhXv+PUAmPmY+Jj3lfaMEIoR+EDkFeCEBQD14ABCN8zBAAyqApr8
+ihKNEBiUuAuqAuuUtx7uAoAA/6YADrqZAQDt9g0szwKAAAuZAin2EIsgJfYWJfYXJfYYJfYZJfYa
+JfYbJfYcJfYdKPYS++KmFaAshQD94mYVoA5FAOyTqB3WAoAADq4C7vYRLceCgAAMiAL54oYVr/ee
+AAAAAAAA//aADaAIBQDAoFhug4lY+T/1eJIAnQD/9iQNoAgFAADAgASaNPqhBhWv9e4AAAAAbBAG
+LSAHkhAZlSv1KlYFod0BAA3dCeiTlR7vAoAApNQkQn+piKjY+IAFVCIAnQAXlesWlSL3oABD8AsF
+AI0QjdBtCCMuSRCFQA8CAOJCBycA2YAALyIBD48UBv8Bf9Ea5XFxeqAEgABj/9WIsQiIFAaIAfm9
+Pg2gAgUAjSOOIvoAoh2gLwUA++AIANA7JQD9K6gFoO6dAFhxbYlBi0CbkIpA6aYBKegEgAD6IAgV
+oAgFAPiABhWgDBUA6EYBKVgEgABYMN4qTPhbTpXUUPT/+2VgCwUAwCDRDwAAAGwQRCggBPkAF6JS
+AJ0AFpQyKTIBFZSZF5UZ8yAXQJAEhQATlM4qIAwrMoAoIhYjMoj7QABFcBkFAOUAFQ1WQoAA6joI
+DC5CgADlMwgAwf0AAOUhGSRAxQAAbZoCCACKKqEr90AUxCIAnQAYk+Mfk+H8QAgV4O4VAC4UyC8W
+LugWLC7uAoAABN0CLRYtKCAH+SbYBeGIAQAAiBEIqAIJiAIoFjAP6jAvFjEnFjT8JqYV4E4FAC4V
+ZywgVCwU4SsgBSsU4vpGEBWgDRUALRTgKhTj7CIWIMn9AADsFjkkyUUAAIyUipWOk++SAiDZ/QAA
+6JIBJdnFAACYsZ+ynrMqtgUstgQpkgAptgD4QAgV4AyFAOkWQiDwBwAA7yBUIMAHAADvhA0hWNEA
+AOogBSDIBwAA6uQQIMAHAADvIDAg0AcAAO+EESDwBwAA/cGGHeAIBQDolA4lUGEAAFhrQ+ssPCDQ
+BwAA+0QAFaAMhQBYaz7rPHIg0AcAAPtFQBWgDGUAWGs66yxOINAHAAD7RaAVoAw1AFhrNessXCDQ
+BwAA+0aAFaAMhQBYazDyM0QV4KUhAPQFAAXwxTEA+DNkFeDVOQD0CwAHcYUdAOhYAg92QoAA6RWJ
+Lu9CgADpIgwuZ4KAAO3MAg3fwoAA+0YADXDVUQD9sAAWsLVBAP+mAA6w5UkA7LsRD3bCgAD/ZgAN
+sIgBAP1mAA3w0ykA6YgRDu7CgAD9BgAMdJmZAOmIAgCwBwAAKGQU/k0QFeDjaQD8TTAV4DNxAOru
+EQmeQoAA88YAD3D/GQD/6AAXsD05AP/GAA9w/TEA7jMRD//CgAAD/wL/xgAPcN0pAP+mAA6wPgUA
+Dt0CLWQViSwMuwILqgL6wuYdoImBAPgRAAHwmZEA6jMRDM5CgADpMwIMRsKAAAgzAgQzAiNkFoQn
+L0kUKkwg7EIJJ6HxgABkxDYrHH/7ZiAV4AyFAFtVFMAg0Q8AAP1gMcwiAJ0AhCnwgUAN4FtlACpA
+BftAJrxiAJ0AhEtlT+/AINEPAAAAACsgBfoCoh2gTTUA/Xj+DeA89QD0AAoV4AwFAPwgJhWuCwUA
+6xYAIMAhAABtqgIIAIoalAaaEv5ACBWgCQUA+CNmHeAIRQD4JAYdo//1AC8VDP3AABcwD7UAD+4C
+LhYDLSAEKhwh9aAq6pIAnQD6SiAV4Aw1AFhquyocJfpJwBXgDDUAWGq3E5P0KCIWIzKIw5/pJAUs
+RkKAAKgzwJDpFDkg0QEAAOkUOiHZAQAA+CdmHeAIVQD4JwYdoAyFAFhqqSs8SPoggBWgDDUAWGql
+jhHrHAgpUASAAP8OAA8wDLUA/iHmFaANJQBYFQkqIAwTk9r7JTgF4ByVACwkVAUAiSuymyMyiCUi
+FguqCP1IABUwGQUA6joICq5CgADlMwgAwf0AAOUhGSRAxQAAbZoCCACKKqEr90ATlCIAnQAZku0Y
+kuv+QAgVoO8VAC8UyCgWLukWLC92AoAABO4CLhYtKSAHCQlBAJkRCakCGpJ0CpkCKRYwCOowLhY1
+JxY0+CYmFaBPBQAvFWctIFQtFOEsIAUsFOIrIDD6PGYd4A0VAC0U4O4iFiDR/QAA7hY5JVFFAACL
+pYmhiKLvogMg4f0AAO6iBCZhxQAAnsQvxgMoxgIpxgErxgUqogAqxgDqIgAhWNEAAOoWQiDwBwAA
+6CBUIMgHAADolA0g+AcAAPpAsBWgDIUA6vQQIMgHAADoIDAg+AcAAO30DCDQBwAA+SImHaANBQDt
+5A4lUGEAAFhqTessPCDQBwAA+0QAFaAMhQBYakjrPHIg0AcAAPtFQBWgDGUAWGpE6yxOINAHAAD7
+RaAVoAw1AFhqP+ssXCDQBwAA+0aAFaAMhQBYajoqEZr0BgAD8IVRAPQEAAHwZUEA9AUAB3CVSQD+
+M2QV4NVZAP4xJB3htR0A+qYADfDFOQDtzBEO7kKAAOuZEQ93woAA7jMCCzcCgADpZgIMRoKAAO2I
+Agu/goAADHcC/EGIFaC7AQD9aAAVsNopAOhmAg7uwoAA/WYADfTMmQDsuwIA6AcAACvUFPpNEBXg
+mmkA+E0wFaCqcQDqmRENVkKAAPsmAAywuxkA+AYABTDIOQDuzBENV8KAAOyqAg3fQoAAC5kC+yYA
+DLCIKQD5BgAMcDkFAAmIAijUFS8iDAdmAgYzAvOi5h3g74EA/hEABnD/kQDqzBEP/kKAAO/MAg92
+woAADswCBMwCLNQWhCcrSRTksmtiUIEAAIxJ0w/TD2TCXSscf/tmIBXgDIUAW1QdFJMrKCIWJEKI
+6YgRCVAEgAD4gABCMIt1AFv+FtogWut6KiIJDwIAZKARg6srCodb2ErqNAAJ/6YAAIop6yILJQIp
+gADOsPpBZhWgAMYAANog+i/gFeAMhQD7ZiAV4A0lAFtMWMAg0Q+Ju8iZ6ZILLNgEgABln/Sau5us
+wMD8QSYVoAoFAItKcrkLiimNKPyBRhXgAKoAybctsggPAgAPAgBy0Qzr1AAGgEmAAI3YctnyyLcq
+IgkuIggutgj6QLAV4A8FAJ8o6yQwLQI2AACIK8+MxJP5YA2EYgCdABqS9IsgLqJ0+1FoFaAMBQD/
+bwANsA0VAFtPmhySXovOw9/tJAUl2/0AAPuBxhXgAgUA0Q/E4v5Aph2gAgUA0Q9kSy77X9ldYgCd
+ANpAWus3KDEcijMqJh+JMiglCCkmHi8wH2TxfsDD5ixOINAHAADrZAAFURUAAFhpmCMwHwUAifgg
+ICWgGVUA+QsAFaYzAQBtmgIIAIofkxrvFlYg0AcAAPqACBXgDTUA/U1mHeAOFQD/TgYdo/z1ACwV
+tP1gABWwDLUADLsCKxZXKCAEKqxx9QAHGpIAnQD6SiAV4Aw1AFhpfuodAStYBIAA+06gFaAMNQBY
+aXn6ICAl4A8VAC+0iPNxph3gDgUA7rSJKlAEgAD/cUYdoAy1AP9xZh2gDSUA7rSOJdlhAABYE9fD
+ifhAph2gAgUA0Q8AAAAAAAAA+kkAFeAMNQBYaWQtEAAsEAHqEAIg2JUAACq0Auy0ASkYBIAA/WAG
+HeAptQD4QKYd7+qWANog+i/gFeAMhQD7ZiAV4A0lAFtL2GP9lwAakpCLICyidPtRaBWgDRUA/W8A
+DbAMBQBbTzfAINEPw9/8QKYd4AIFANEP+kkAFeAMNQBYaUYvHQEu/EUo4AHp4AAn+dUAACn0ACj0
+AS7gAv/gRh2v/FoA2kD6QGgd4AwFAFgYUMAg0Q8AAGwQBIknKiAHKJkUiZnTIPENEA3hqgEAH5Hv
+ZJDGDKsRr7sssp73gAX6UgCdACuynRKR6+SRpBWFiYAAjJH4YOQVp8wBAJyRLDAHGpId9GEEFeqI
+AQD/AAAUMOwRAPXQABcxzAEA7ogCDmwCgAANVQIEVQIKiAKYsI0w9WDGFaA+BQCes5Ky9WCGFeAC
+BQDzYKYVoAVFAOK2By7uAoAABd0C7bYBJdCBAAAJIIYKAmMJAIYKAmGINwzJEf8gAET/zgUA5Zad
+JECBAAAOjgHihQQncQEAAJ6A/wAmFaBdJQAtNAXRD8Ag0Q+LMsi6xMn8YKYdoAIFANEPK6wY7DQA
+CdAEgABbV8DEyfxgph2gAgUA0Q8AAGwQBoYrLyAEKiIJKPz7CGo48UYADeAGBQBtCC2Lpym5FP4A
+Ih2gDAUA8SIADeANBQCJuYiSiZMEiAwI7DgFmQwJ7Th9yCiKq8qpY//LjmKIY/XPAA8wDRUA9Q8A
+DHAMBQD5ogAOMAsFAA7bOHyw1tKg0Q8AACcgBx6SMvMkZAXhdwEAB3cJ6JCcG78CgACjc5MQIzJ/
+qHeufv5gCRQiAJ0AbQgsKDkQizf8ACIdoAoFAPECAA3gCQUAjbKIswTdDAWIDAjKOA3JOHqYL4Mw
+c+F2Y//MAItijGP1bwANsAoVAPWPAA5wCQUA/UIADLAIBQALqDj5GoAd4AsFAI0xLzIAL9YALjIA
+LeYBJjYAJjYBLCAEacQNAioC/BBCHeAMFQBYLen4YwAVr8kFAAmIAeY1ECRBAQAAmDfoNgYh0+EA
+AFtLmsAg0Q+DEB6SySMyfa5+fjkHYABmgzBz4WEoORCLN/wAIh2gCgUA8QJwDeAJBQCNsoizBN0M
+BYgMCMo4Dck4epDSaPQ7HpK7/mEkHaACBQDRD4tijGP1bwANsAoVAPWPAA5wCQUA/UIADLAIBQAL
+qDj5FAAd4AsFAGP/xcAg0Q8A2iD8EEId4AwVAFgtvhySqPxhJB2gAgUA0Q8AAGwQEi0gBBeSpOUg
+ByrwBIAAGZHQ63K9KjAEgAD9p+ACUVUBAPWgB3KSAJ0AaNYEwCDRDwCKLiySf48tCaoRrKroogcv
+/kKAAK/MLBYWjMeIjigWFIzO/CKmFaAApgAAKCIWLJJ/7yIHLEZCgACozCwWFozHj/4vFhSMzuwW
+FSlQBIAAJCAFLDAT+AhCHaA55QD4gDFsZfwRAPiAMSwgKdUA+IAw7GBI5QD4gDCsIgCdAJsa9CEG
+FeCMAQAoFhf1oAVTEAQFAJoX6xYGJn2AgAD1oAbCEgCdAOUWCCeFAYAA9eAHWJIAnQDVQPW/+gsS
+AJ0A6hIXIvnJgABkrzGKJ9sw6qwgK2AEgABbUmj1QsYd4AIFANEPjCciFhb9gcgVoAoFAPwiphWv
+/XIAAI03jDafG5sa7hYJKVAEgABb/zjUoOUWCCUqaYAAixb6IOgVoAUVACkwEwkpRcqZmxb1ICyA
+kgCdAC0gBGP/fgDuFgkpIASAAP//bA2gBQUAnhn0AAId4AQFAC1ABf23YBWgHxUA/4AMquIAnQAY
+kkAIyAqIgOsWBiwAIoAAAAAA5RYIJ/5hgACbFvn/+XDSAJ0AjUebGp4Z5RYILoC+AABj/l+bFo1H
+mxqeGeUWCCbyoYAA9AACHeAEBQAp2RTklqZm0IEAAIvZjBkMDEfowiVtuASAAI2xjBb84AAG8AsF
+AFtOIY1HLtkUZOcri9n3YGgd4AAaAJMaiBj9AGgd4A6FAPUAM1oQCkUA6JCqHH8CgACo/ynyntug
+B+s5+yBCg+IAnQAp8p1kloApFhHqFg0jhIGAAB+Q2ixBBytABx2QWfKBBBXqzAEA+iAABHC7EQDq
+uxAMRAKAAOgzAg5nAoAAC8wCGJCWDTMCD8wCnJCMQP0gxhXgDwUAn5WTlPkgRhWgOwUA65YDLmYC
+gAAKzAKckYtxHJH4CwtH7LsCC/gEgADrdgEkmIEAAA8ghgMCYw8AhgMCYeoWDSTpAQAALRYRikeL
+GuqsICtgBIAAW1HsLBIRjR3mpgEtGASAAPqAaB2gC4UA5705CdgEgABYJMvaQFrpSNpAW0s3Y/47
+AMmhLxIULPA4mxbrEgYmYAUAACz0OC8SFp0e6xYGJ4B5gAApEhUokFyxiCiUXByR0y9BN45AjSD4
+IcgV4AolAPggBhXgOyUAWG1hjUcr2RTktNdm0IEAAIvZjLAMjFf8ImYVoD5FAP+ALcwiAJ0AwPD+
+IgYV4A2lACpBCPqC0BXj/PUA/U8ADTAJZQD7IgAOsPj1AHixIywSCSpAQfwhhhXnzAEA/Z/AFaAN
+FQAM3DlbVe3tEgwlNiGAAI8Y3vD14COCEgCdABiQPAz/Eaj/KPKe/QA0q+IAnQAp8p1kkzcaj9sb
+kDfqAAUM4ASAAJ4fnRwpFhIMAmEMAmEMAmEMAmEMAmEMAmEckKkvQQcuQEHokCwc0ASAAPiERBXq
+/wEA7u0JD/8CgADo/wIO7wKAAK3M/Y/oFaANBQCdFJ+g+IAIFab8AQD7QEYV4rxBAP1BRB3gTcUA
+7aYDLd4CgAAL/wL8BwAFvckdAOTMEQ3dQoAA/WYADbA8xQAspQsL/wLrkYAfdAKAAA/uAu+RfhzN
+AoAAC5kCG5F8KaYG7+4CDEYCgAD/QIYVoAzFAPtA5hXgCWUA6YgCAlkhAADopgElUIEAAFhnQCkS
+EipBKvslph2oqh0AKpQsKEBX+ouAFeAchQD5J2YdqIgdAPknRh2oiB0A+ScmHaiIHQDolDgk0PEA
+AFhnMStAdMTC/WAeLCIAnQAvEhL9IroF744VAP/nhh2gCAUAKPYU6PUlINhBAAD56IYdoAw1AO0W
+BCfRFQAAWGchKhISKUB06aRYKlAEgABa6LEbkHWMTSuyfwnMEay7i7rJtCu8YPoigBWgDEUAWGcV
++iCoFeAAJgAbjyGbFR2QlCw66Ay8LA3MKOwWBSpQBIAAWuigixUcjwrtkI4aUASAAFrovNpAWuif
+LUEILjr//6AJBCIAnQAvEhPDhPngCGwiAJ0AikcpqRRkkvuLqR+RLx6OzIqwKLASjbEsEhL57QAP
+N6rBAPoiZhWn3QEADt0C7bYBJmGBAADtEgwqUASAAFgkBikSEyUWGfYjRhWgOiUA+yALlCIAnQAr
+EhMlFhn2I0YVoDxVAP1gCuQiAJ0AjkclEhkmEhr7xAAVr80FAP1ABAbwDwUA7+UUJukBAADt5gkp
+2ASAAO3mCCtgBIAAW1EHY/rSjhvTDw8CAGTjSfXAHCCSAJ0A6hIHKdgEgAD8wGgdoB1lAFgsDC0g
+BP/osA2gBQUA3GD6YGgd4I1FAFgsBhyQ+44yjzOJIJkQ+ECwFaAKJQD4ICYVoDslAFhsg8Ag0Q+N
+R2Xa8GP5NSoSEGWu8I4fH4937RIML3cCgACv7i3mnSsgFiUWGfYjRhWg/PUA/X/5zCIAnQAqQEH6
+gtAV4DzFAFtVAiUWGfYjRhWv/IIAAI9CZPMmKEEIKTr/+QASVGIAnQAqEhPDtPtAEbxiAJ0AiUcs
+mRTkwmJk0IEAAIuZh7H8IMgVp3cBAPzgaB3gCwUAW0zEikfbMOqsICtgBIAAW1DGjECLRwjMEQxs
+AuymASXQgQAA6xIGK+AEgABbUL9j+bAtQRQlQRLAYO0WGCb04YAA6nJCKtgEgAD8AAIdoA0VAFtM
+cChyQy4SGOZsASKoBQAACFUufmnYY/5tAADIqSsSFCmwQLGZKbRAKxIWyLktEhUs0GSxzCzUZI1C
+6hYHJoCxgADa0FhF3uukAApQBIAAW03uihfE2u1EBSUAeYAALxIULvBBse4u9EEvEhZk+y8pEhUo
+kGWxiPksph2v7JIA/+ysDaALBQAcjxOMyPeAEriSAJ0AGI8dDO8RqP8o8p79ABNT4gCdACnynWSS
+YRuPCbDK+2EGFa/t7gAAAAAAAP/lcA2gCwUAAByPAozImh33gBJgkgCdABiPDQzfEaj/KPKe2aAH
+6Tn5ABLT4gCdACnynWSSUR2O97DL+6EGFe/mAgCOQmThoo1H5HCKZtCBAADrEgorYASAAFtT8GP4
+cP/0CA2gCwUAKBISL4BIsf//CQYd7/DOAMipKRIUKJA6sYgolDopEhZkmlQrEhUqsF6xqvtrxh2v
+6SYAAMS7+oCmHe/o+gDEyvyAph2v6NIA/+NIDaALBQAAjbGMFvzgAAbwCwUAW0xO6hYQLQOmAAD/
+6OgNoA1lAPohSBXvzgUA/0AEBzAPBQDv1RQncQEAAJ7Z7tYIK2AEgABbUEdj99AvEhBl/caJR/sk
+ABWvyAUA+UAEBDALBQDrlRQkQQEAAOiWCStgBIAA6JYIKdgEgABbUDlj95oAAP/2gA2gCwUA/AFC
+HeBJpQD4QKYd7+cKAAAAjzOOMv0gagWgClUA/EAIFeA7JQBYa7+KF8ipLBIUK8A5sbsrxDksEhZk
+zJEuEhUt4F2x3f3Lph3v8hoAAAAckCiOMo8ziiCaEIk3mRP4YMgVoDslAPggRhWgClUAWGutixfI
+uS0SFCzQQ7HMLNRDLRIWZNxILxIVLvBnse7/7OYdr/D2AAAAixjaQOu8GCpgBIAAW1SlY/zGixja
+QOu8GCpgBIAAW1ShY/5KAAAA/+W4DaAJBQD/3swNoAkFAIxCZcycK0BB2kDrvBIqYASAAFtUlmP8
+iZ8f/CGGFeAKBQBYaHMcjneMyI0cjh/5n+yYkgCdAP/koA2gCQUAwJAYjnHA+g/PNP8BBhXv5FoA
++CHmFaAKBQBYaGUcjmqMyIodjR/5n+0AkA6FAP/c/A2gCQUAAADAkB+OY8DaDc00/eEGFe/crgBs
+EAjqIAcqMASAAOUyACqgBIAAKCAE9OAAAvGqAQDqFgQiua0AAPUAE1oUdx0AKyAWKAr/eLEY+kgw
+FafEAQD9n8AVoAkVAAycOVtUBmSi940UGY5YnRXs2BEGpIEAAKmIJoKe9sAWw+IAnQAkgp3PR4ki
+ZJKPwCDRDwAajkCJqPcgFziSAJ0AiBUbjkoMiBGriCuCnvdgF2viAJ0AJIKdZELksJubqGRPxhyN
+6OwABQpABIAAbXkCCAJh2iD6YGgd4AwlAFsdCCYhBxiOPQYGSgxmEQhmApZAjSDvjjgS8TEAAJ5D
+70YCLu4CgAANfQKdQSkgQSohIhiOrAmcCesgBS5nAoAArIj5D+gVoF0FAP1ihg3gTOUA/WGGDaBd
+ZQD9YBHtYgCdAAreFPjAAAYy2EEA6Y+UHNwCgADpRgcu7gKAAP2GAA5w2DkA5O4RDu1CgAAO3QIN
+zAIMuwLqj4kdZQKAAO2PjhKw8QAAJkULCroCDcwCnEb6gIYVoAwFAOxFCiFBIQAA6AceAniBAAAP
+AmP6RUQV4A4FAC5EMS5EMv6GZh2gDQUALUQ1LUQ2LUQ3LEQu/IXmHaAKBQAqRDD6haYd4AkFAPiG
+hh3oux0AK0QsKCBX+oeAFaAMRQD4h2YdqIgdAPiHRh2oiB0A+IcmHaiIHQDoRDghWXEAAFhlMeYW
+ASFBgQAA6CYAAkkBAAAJBIoIAIgJAIouIhzqTFQh2MEAAP6KZh2o7h0A/opGHajuHQD+iiYdqO4d
+AO5EUCrgBIAAWGUfpUkoIHQolFiGFRiN2AxmEahmJ2adKyAWLwr/f7EHKiBBjBFbU2nEqCokBSgw
+EmSN/RuNURyNER2OleuLKAlQBIAAWubC2iBa5qXAINEPkxLqJAAI2ASAAO0xCCngBIAA5hYDKnAE
+gABbN3QtCoh9oW+KEGStuIqnixLsEgMlUIEAAFtPLYwQjcCLEwjdEQ27AuumAS0YBIAA6iQACdgE
+gABbNqTeoOoSACcBeYAA2zDsEgMqaASAAFgpDcAg0Q+LFNog67wYKWAEgABbU7TAINEPAAAAAAAA
+APNAaB2v9CoAixLsEgMpUASAAFgqIsAg0Q8AAAAAAAAA//SsDaAEBQCMImXNKCsgQdog67wSKWAE
+gABbU6LAINEPxcL8QKYdr/cGAMCgWGd+Go2Diaj5P+h4kgCdAP/0mA2gBAUAAMBAwNoNnTT9QQYV
+7/RaAAAAAGwQBvyHgADQCxUA/IIgAVAGNQD0gAVJkAtFAGhEa9EPZFEBaVH36zQIIdBBAAD4SRAV
+oAyFAOg0DyFZAQAAWGS70Q8ZjZv7GXIFoAxVAOw0CCFYCwAAK7BEKqKhKZKAq6oJqhGqmSuQNfFs
+MA3gCgUALZBJ8auADeAPFQAokF0I+jkJrhEuNAnRDys0CCU0CwVZCfMgAISw2uUAqpkskQIqkQEp
+kQAMDE/8YYYdoapBAPphph2vmQEAKTUH0Q8AACY0CCggavsABAbwDIUA/QAEBzH4jQD74AQH8KiN
+AAyqAf/YABcwDCUA7IkBDu9CgAAO3QL/RgANcuiNAOzuAQzOwoAA+AAABjCIOQDo7gIOZkKAAAnM
+Ag6qAg2qAgyqAio0CdEPwJApNAiIL5gz0Q8JqxErNAnRD2wQEBqNuSuihiiihCeiiKK74ogIDd5C
+gACre4u34hYVLEZCgAAIdwjrsg4iGIGAAB6Nr8DA/9AQFaANRQBt2g8AwAQOCBt/hwSxySkWEbHM
+KhqAqroqFhMqoOWbGJMZ80twDeACBQAfjaMsEhX5G0QFoAoVAP0bPAXgCQUA7RYNLjeCgADoZggO
+dMKAAO/uCAZb/QAAC6k4mRr+IYYVoAsFAJsfG42W9iFmFafMAQD8IkYVrwYFAOsWDiXZAQAA+iIG
+FeAB1gAAsUQKGhRlr/f9HQIFp/5BAP8c/AWvhAEAKBYUp4kpkEQpFhb/oAQGsApVAOgWAC7uAoAA
+/eYAD/AbhQDtEhUq8ASAAFhp/B+Nfw8CAP6gBoxiAJ0AGI19eFFeKRITKZDl4zwGIRAFAAD4QA8y
+4gCdACUxAC0xAS4xAi50XiV1MP7gAAUxvUEA63RfJQRpgADAQG0IDXpgDQqKFOSvamIgIQAAY//r
+x8D7n/q+IgCdALRE//00DaSqHQAtEhH1oAlZEgCdACwSEC8SEvzkUBXgCkUA/iLIFaA7JQD+IAYV
+p+QBAFhp1CpwIi8SFRiNVAqpCesSFizPAoAACYgIK4R+9Q/mHaAJFQAphH0vhHxbyyhj/0YAAAAA
+AP/7sA2gBAUAABiMAikSFRWNPiiCkiVSiKmICYgRqFUuUDUvURksUDT8oAgV4AsVAPqg8BWgCQUA
+7785BmPpAAAMuTiMHZoQKFAW+CCGFeA7BQD4ICYVoApVAP4gZhXgCAUA+CBGFaAPJQBYaazApfwh
+yBWgOwUA/CLIFedEAQDvEhIqcASAAFhppSoSFSlRGSsSFitUFupUBySAUYAACQlMKVUZLFA0Hoz/
+7VIKKnzCgAAPnwIvVRkO3QKdWvmf9AtSAJ0A+qBoHaALJQBbw9Zj/m4oEhVkgHiLGhqNESkSDwup
+OSkWDysSFCwSC+kSDy3fgoAA+2AEANAKFQD9QAEFUAgFAPsgAESwCwUA+ZhmFeAKhQBtqhf7AAQA
+06kBAOCqGgRACQAA+2AARbSZHQCMHPuRZhXv+doAjhgu7QEt4aHyISgVoA9FAA/dAi3lodEPwPD+
+IeYV7/4+AMAg0Q9sEBIajCMnon/pooEqMASAAOOigymgBIAAonfimQgLvkKAAKc36HIbLM5CgACp
+M4M3KYEDKIECJBYZgz75AAnkYgCdABiL/hmMExqL/RyL/ZwUmhaZGugABQDIwQAACQJhCQJhIhYY
+HY3NHo3Lnh0NLQKdHPSACcCQBTUA9IAIERALFQD0gAtZkgCdAPSADoISAJ0AKnIb8iLmFeALBQBb
+UaISjCDoi4MdKASAAOYWFi0YBIAA9xfsBaABcgAAi5nCyFtHpWWh8uscECtQBIAA/ACCHaANJQBb
+RfkcjbEtEhj+IsgV4ApFAPjACBXgG4UA6RYAKnAEgABYaTDqchsi2AUAAFtRiBiLaxaL4eoxa30o
+BIAAKIKbJmKDDwIABYgICYgRCGYIKmErcqHO6nIcKtgEgABbSWn/XAAN4A9FAI5gCO4RD+4CnhUt
+YAcsYSsNDUHpYgcu7AKAAA3MAh2LzSuZFO3MAgTQgQAA7BYILfp2AAD//SANoAsFANEPAAAAAGRh
+Jfjf+FjSAJ0A6xQ4INEBAAD+aRAV4AyFAO8UPyHZAQAAWGNDY/7oAAAAAAD7F3AFoA1VAO0UOCHg
+CwAALMBEK6KBKqKDrLsJuxGrqiigNfEBEA3gCQUALqBJyOYooF3A8Qj5OQmaEfonJh2v+pYAJRQ4
+LzBq/AECHaAIJQD54AQFMu+NAP3gBASwv40A7LsBDM/CgAD9WAAVMM8BAPnABAcwCEUA6P0BDmZC
+gADqzAIO70KAAPmmAA7wnzkA+cYAD3H/jQAI/wEPuwIOuwINuwIMuwL6JyYd7/jiACYUO/bAAIQw
+CUUAKRQ48wAAhHDZ5QCpiCuBAuqBASDJQQAAKpUBK5UCKIEAKJUALhEoLREpLxEqLxQ8/iPkHaHd
+QQD8J6Yd7/e2AMCwKxQ4ij/6IeYVr/d6AAApoCjKn2iROWiTQo5nLeEV/8QAFa/MBQAM7AGs3Oyq
+NHVZAQAA+8BoHaAshQBbRxtkrdlj/8lpQssvEhZl/8VgABppQsIoEhZpgbxgAA5pQ7lgAAgA/W8A
+Df//MgDtEhYlWIEAAOoSFypgBIAAW/4XY/3NAABsEA7ni00ZyASAAPIgxhXgGwUA+iAGFeGEBQDk
+JAgJsASAAPJhSBXgOAUA+CBGFaAKJQDqFgEk+KEAAO8WCCTwUQAA/iEmFaAKNQCaH+MWByFACwAA
+4oBEKJgEgAAsYDUtYhCcGixgMYXUjtCP0onRiNOL1psbi9WK15oeKrACmB2ZHPzGBh2gmjEA+MbG
+HeAIlQB4yxIYjPcIyAqIgJsV7BIKLAAigAAAKWA3LGA1ZJCv8YrADeAJFQCIHoobKWQxldSb1Z7Q
+n9Ka1oocmtGKGpjXiB3o1gMlBXmAAGTAqosf4zwEI7gRAADrvP8jMFEAAOsWDy37PgAAwCDRDyhg
+MvzHMBXgDAUA6xYFJBspgACfFC4WEIsdKmA6LGQ1KWA4LWQyjDD4AAAE8KoBAOqqEQzOQoAACpkC
+KVQCihtYYpEuEhCKF48UixWKoSxgNfzCCBXgCAUA6GQ3JVAFAAAqZDQoYDLpEgYkEXmAACmQI+oS
+BiSWIYAAKqAi80wQDeAJNQBj/zMAAGTPVIsWjBn6wBQsYgCdAPzAE2wiAJ0AjRj83/ndYgCdAC5A
+5Pff+YCQBQUA2iD04AAGcAtFAFv+xC9A5LFVf1LqY/8TKVACiB6YHPEgDk4SAJ0A8UAODhIAnQCb
+FfEgFQZSAJ0AmxUuFhDzQBSeUgCdAJsV/iCGFeAJtQApZDH4ACId4LopAPj0CBWgDAUAC5w46xIO
+KVAEgAALgACLFSmwAsDh+AUABPAIBQAJ6DgoZDMoUAKPFPwb4h3gDAUA/QAEBvCIKQAI7DjsZDUt
+cASAAO1UAi4M9gAAiheKoexgNSVQBQAA+saGHaAGKgApYDdj/jL4xvAV4AwVACxkNf/4kA2gDBUA
+LFABKrABiBcMqjT6oAYdoAkFAClkNYiBKWA37GA1JEAFAAD4xoYdr/fmAChyoOokAA/YBIAA+iCG
+FeAMBQALgADA0C1kNS1kMylQAo8U+iCoFeAsBQAMmQLpVAItcASAAPjG8BXgDAUA/MIIFe/2zgAA
+AChyoOokAA/YBIAA+iCGFeAMBQALgAD8IOgV4A4FAC5kNS5kM43Rsd0tZDQpUAKPFPogqBXgLAUA
+DJkCKVQCLGA16WA3LXAEgAD8wggV7/WCAChyoOokAA/YBIAA+iCGFeAMFQALgADA0S1kMylQAo8U
++iCoFeDc9QAMmQEpVAIsYDXpYDctcASAAPzCCBXv9H4AAAAAAP/0eA2gCSUAmxX+IIYV4A7FAC5k
+MShyoOokAA/YBIAA+iCGFeAMBQALgAD+IIgV4AwFACxkMy5QAvogqBXgDRUA/AACHaDZ9QD5wAQE
+8O4pAA7cOOxkNS1wBIAA6VQCJgdBgAApYDf8wggV7/KyAADaIPoAYh3gDAUAW/4vY/zH2iD6AEId
+4AwFAFv+K9og+gBCHeAMFQBb/ihj/KoAAAD/8fgNoAl1AChgO2SAkShQASmwASpQAAiZNHmhB//x
+hA2gCVUAKLAAwJj7DwAMMAplAPlNAAy/8TIAmxWfFP4iBhWgCRUA/SIADn/yPgAAAAAuFhCLHihy
+pJ8UihQLgAAuEhCPFPogqBXgCZUA/SBoHaANpQAK3DksZDF5wUP1gASMkgCdAMCLeMEw9Z/3NRIA
+nQD8xrAVr/y2AAAAAAAA/+94DaAJRQCJF4mR7GA1JMgFAAD4xoYd7/wyACqwAmP9DChyoNog+iCI
+FeAMBQALgADA4C5kMylQAo8U+iCoFeAtBQD9JgAO8MkpACxkNe1UAi1wBIAA8z/2TpIAnQCIF4iB
+7GA1JEAFAAD4xoYdr/rWAIsVK7AC+PQIFaAJFQD6BQAF8AwFAAucOOsSBClQBIAAC4AAixUpsALA
+4fgFAATwCAUACeg4KGQzKFACjxT8G+Id4AwFAP0ABAbwiCkACOw47GQ1LXAEgADtVAIucq4AAIoX
+iqHsYDUlUAUAAPrGhh2v+QYAAGwQChuKUf0S3gXh2oUAqiouoGwt0qGTFSuygK7d6hYILu5CgAAN
+uwj6ISYV4AgFAPlsZh2gBgUA+WnmHaAMFQDotDspqASAAP1kRh2gAwUA6KRyLDgEgADaEPqgaB3g
+DCUAWGFYKhEACplG4JAECAQKgAD1IAUIkgCdAGuVOeCRBASU24AAwMHgzBoMggqAAPOGAAnws50A
+/2LgB9czAQAoIovnxwIEQAUAAPhRZhWndwEAYAAJAAAoIoyxiCgmjAoISKaG6IwCIzAJAAD4oABC
+v2YBAPTf+/uiAJ0AhRXjFgEheOEAAO8WBCFxmQAA/iBmFaANBQDtFgchMEEAAPYgxhWgqGUA+EAA
+RDAGBQD4IEYVoAFqAAD7IAQA0LOdAPNgGmfQCBUAAIgaCDMC//44DaczAQAAAPUgCwiSAJ0AaJJa
+9SAFOZIAnQD1IAdKEgCdAKY26DwCIzAJAAD4oABCv2YBAPTAC6KiAJ0A2hD6oGgd4AwlAFhhEyMR
+AAOZRv77QA3oMwEAb5WsAJAEBwgbf4ejsjn4oABC//8uAIwZwLH7h2Yd4BpFAPNUtg3gDAUAbTkR
+pc6izS3QOC7gAu3pDXZgBQAAY/+IAAAAAAAA/6DWDa/89QDAwWTPdYoU7DQAAtgJAABYYPdj/2UA
+jxnA4S70T/R/+tPQDAUAbTkRpc6izS3QZi7gAu3pCnZgBQAAY/89AAAA/6DWDa/89QDAwWTPLYoT
+7DQAAtgJAABYYOVj/x0AAAD+f4AV4AhlAAj/LPohKBWgCIUACP82iBjAkSmkY/8Rph3gPkUA89/3
+k+AMBQBtORGlzqLNLdCmLuAC7ekKdmAFAABj/tUAAAD/oNYNr/z1AMDBZM7FihLsNAAC2AkAAFhg
+y2P+tYoWL1ACLyQM7lADItgRAAD+QaYdoAyFAFhgw40ZiySKIogXwJH7TwANcAwFAP2kRh2niAEA
+Cpg5+CDmFa/56gCOF2ThLYgYwPH/DkYd4A4VAIoZKaA1wDDqogokiGGAAIsZK7BJZLD/jRkt0F3A
+wQ3DOe2iASmgBIAAjxkroAAnoAGF+yzxEinwISZQASn0IO/wIiSMsQAA9SAI+RIAnQD1IAnJkgCd
+APUgCooSAJ0A9SAMGpIAnQD1IAs7EgCdAHzZAmRBVGTgwWTw1sCjixnqtCEpUASAAFv9sogZKIA1
+ZIBviRkpkElkkGeKGSqgXWSgX2QwX4sYK7Bz9WAEoJIAnQCCGYwR8kNIFaAd5QB9yTWIIM+AiRkp
+khWJkMqXihkqohCKoMmuihiLJ5sh+02QFaAMFQBb+/+MGPpABhWgCxUAK8Rv0Q+OGMDRLeRv0Q8A
+AGQ/n4oYwLH7TZAVoAwFAFv8xGP/jcBA/UAoFe/8MgAAjBj+AAIdoAsFAPuORh3v+0IAAAAAAAAA
+//z8DaAKFQCOGMDQ/c5mHe/9ogAAAAAA9sCABHAPVQD5bwAMMApFAPniAA0//F4AiaGIGLGZ+UAm
+FeAJFQD5DmYd7/vOAAAAKiKKsaoqJorRD8CRmaGJGcCAmKIolRIooAH5QAYdoAgVAPkkZh2v+x4A
+J6ABJlABiRgHaDT5QAYdoAgVAPkuZh2v+rIAAAAA//q8DaAKJQCFUYgY9UBGFeAJFQD5DmYd7/o2
+AIgZkhryoEgVoAkVACmEI4mihVEihRKCGnWZ0ogZwKAqhCP9v/NNIgCdAGP+XgAAAGwQCB+JEPcQ
+XAXhzgUA/kAARzGWhQCmJuhgrCrYBIAA9vQoFeGlBQClJS/ygPjgAEOx6QUA6SkIC75CgACn//nj
+RhXgHFUA9eIGFeANJQD/4qYVoAiVAOr8MCfxEQAA6LE3d7lhAAD9Z4AE0Ai1APlgCkwiAJ0A/WUg
+hVAZlQB0kyHuRB5iU/0AAMG6+2r2DaAMNQAMqixgAE6aEPyAELQiAJ0A0Q8AmhB8SfckGiOkJOs0
+AApQBIAAWGABGYo+8iAIFeE4hQD4QABEMQrlAPpAAEUwCxUAKzQNlFGaUvigZhWgAUoAAMCo+tmm
+HaFlxQDlJQgJ2ASAAOxEAArQBIAAWF/v+RRaBeGIVQD4QABEMAolAPrhph2gCwUA+uHmHeFaNQCq
+KiVmEypmFOhmFSuYBIAALDAMmRInMA8qMA2FNCgwDpgUlRaaFZcThFD6oEgV4d8FAPagKBXgDWUA
+9KBoFeAKBQBt2hqirq/uLeCCLuB8DwIADwIAfeMX7tMEdVAFAADxgUwN4AoFAGAAegAAAAAA8Ycg
+DeAKFQBowXT1gAWxEgCdAI8WlPCX8ZvylfMsNAzRDwAAAAAAAPif9yFSAJ0ALDAB+mAQFeFJ1QD4
+QABE8VgVAPhAAEQxSvUAqiorpAD9QCYdoLs5ACv0Uy30USomcSgmc+kmci8YBIAA+RPeBe/8wgAA
+AMDB/GGGHaAMFQDlQW9+EASAAI0V1FD1oAmBEgCdAJsR9aAJ8JIAnQCIEupgrCpYBIAAC4AAiTT6
+ICgVoAsVACs0BZWTmpKXkZSQIjQM0Q/SwPaABoRiAJ0AjBXUcPWACLESAJ0A6xYBLg78AACOFGTg
+x+sWASv9lgAAYAC8jxXTDw8CAGjybPngBFjSAJ0AiRQPAgBkkH5kcHv04GgdoAIlAPogJhXv/goA
+AAAkGiPkJAgJ2ASAAOcwACpQBIAAWF99GYm68iAIFeE4hQD4QABEMQrlAPpAAEUwtzkA+mHmHeAM
+JQAsNA2UUZpS+KBmFa/46gCJFMmcjBP/mcAN4AkFAI0T9aAEoJIAnQCbEfU/+LCSAJ0AjhaU4Jfh
+m+KV4yI0DNEPjxUPAgAPAgBo8ltp8eKJFMiRZX/b6xYBLaAEgAD/+4gNoAIVAIwU6xYBJnbBgACN
+E/+6jA3gCRUAY/84AI4U6xYBJ3YBgABlfyr6ICYV7/rWAI8UZP+9iBNogSDrFgEr9R4AAGP/rYkU
+ZJ+ojBNowRNkf6Bj/3llr2xj/vdlr5Rj/9gAAGWvjGP/5QAAbBAIiCokIAf4RrAV4ApFAP8BgAER
+RAEA+yYADTAAGgDakP0S8AWgOwUA7yICKWgEgAD+QAgVp3oBAPYgBhXgClUAWGTyHIlwHYlxiiD7
+gAgV51UBAOaH5xKUHQAAIzID7aoCBdgFAADrxgAqTwKAAPSABYISAJ0Appkukp73wAn5UgCdAC2S
+nWTQzRuHgOsABQ7IBIAACQJhCQJhGIldGYbpG4fWHIfWnNCPIOvWAiu+AoAACXcC+UYADDAZBQCZ
+05jUJ9UK/eAAF7AHJQAH/wIoMQYo1Qv/oCYV4AxlAO4xBybQaQAA7tUMIdiBAABYXwUMThGm7vfT
+phXvjQUA7TQSIpR1AACKJ/oAIh3gDAUA+0QAFaANFQBbRSPSoNEPwCDRDxyHpovImhT3YAWIkgCd
+AAxJEaaZLZKe96AF6VIAnQAtkp3k0LRl8/0AAP+BBhWv/NoAZd8xjyJl8GkrTBjqJAAJYASAAFtN
+rmlSsCoiBysKAPtEABWgDBUAW0kQHYgHnaCMIBuJI/NAZhXgDRUA66YCLmYCgAD9hgAOcDsFAOym
+ASnoBIAA/RI2BaAKVQBYZJbAINEPAAAAAAAAAP/7EA2gDQUA/EAIFeAKVQD9EiYFoDsFAFhkjMAg
+0Q8AwKBYYXEch3WLyIoU+X/6GJIAnQD//XgNoA0FAMDQwOoOvjT/gQYVr/0+AABsEAQXh54mcoaK
+YyhKAG2KB4mgc5FlKqwQKmIBK6ECZLCGW0D6jWPsqhENYASAAKra7KUCJQOhgADjpgAqWASAAPtB
+QBWgDGUAWF6rGoarG4bYKqKbKXKAJnKG67B9LVZCgACqmYpi6KECJfxYgAAnkieHfvbh6BXgAEIA
+zqlj/5cnkqeHfod/yY1bQOCIZKerCqYKCGYL+sDEHeAJBQCZYOlmASsARgAA0Q8AAJJmk2LlZQcq
+WASAAOkgNSNQgQAA+MJmHeAMZQBYXov6QGgdoAwlAPvwQh3gDSUA62QSK1gEgABb/0PuYQYraASA
+AP7A5BXgClUA/RGOBaA7BQBYZEDRD2wQBtog8iAGFeA7pQDshxkbGASAAFrpI+akAAUBoYAAZDAN
+AzsC+0WAFaAMZQBYXnHIe9tw+sZAFaAMZQBYXm2UaZVqiRCZaIgiyIbAINEPwCzRDysgB/pAaB2h
+uwEA67wYKWAEgABbTSvAINEPAABsEAQiIr/AQeMlDAEAYYAAwCAFQjjRDwDAINEPbBAKLkAQL0AR
+DwIA6EAqL3YCgAD/xgAPcAoFAPXAAEKwBhUA+QARoV//9QDAhG2KR6Sso6srsIwswC7rwTh1UAUA
+AOvDBn/QBIAA2mBloguLICxALPtmwBXgCgUAbckTq62krCzARi3QALGq/aAPfSIAnQBgAAnTD2P/
+0wAAAAAA/RECBa7tZQD9wABHcApVAPxACBXgOwUAWGP1+odAFeCahQD6YABFMAxFAFheLvgSgh3h
+G6UA60QIAcBBAAD0gAzK4JcFAJgXpzepOfggxhXgqgUA+mAARTELJQD6YABF8KxFAPxgAEYwncUA
+rT2dE5wVHIhmmxH6IQYVoDZlAOwWAiZgwQAA/CCGFaAzNQArQADzYATTYgCdAHs6Gvdk7g2gPlUA
+e2Iiihb6gEAV4AxFAFheDWAAEtpw+oBAFeAMRQBYXglgAAJ+sQwvQAGy/69EdUO5YAECjBSNII8X
+LkACnhn/46gV4ApVAP2gCBXgOwUAWGO+iRlokhtplcyIFyiCHfkABqHSAJ0AihfAlflDphXv/uIA
+ixcrsh35YAXZUgCdAI0XwMT9o6YVr/5+AGq2b/1rQCPQHhUAfrmMjxcPAgAPAgAv8AcPAgDx//ve
+EgCdAI8XK/TwLkABLvTxLEABLRoADcw2+iAoFafMAQDsFgAiWAkAAFhd2/wgSBWgClUA/CAIFeA7
+BQBYY5hj/zmKGPqAQBXgDEUAWF3SY/8pAABqsxz5f/kKEgCdAIoV+oBAFeAMRQBYXctj/wwAAAAA
+APl/+CDSAJ0AihP6gEAV4AxFAFhdxGP+79EPAH3DAd9gZf/0Y/4WAABsEAQqMgTzC3oFo5qBAP8g
+4Adf+LUACJkBKCKSIiKjqYgJiBGoIvNABPJSAJ0AhCfTD4ROKEIl9wAHaJIAnQD9D/IFoApVAPyE
+qBXgOwUAWGNtKDBGKTBHGof0/QAAFDALBQD5BgAMcPlFAPkABVNgvoUAwJRtmhMtoICjvK7MLMB+
+sbvs2Rh1UAUAANpA60wQIeCBAABb/z/AINEPAAAA/YDWDe/69QDAoWSv3vxACBXgClUA/Q+6BaA7
+BQBYY1HAINEPAAAAAP0PtAWgClUA/GFEFeA7BQDuIg8peASAAFhjSIov+AAiHaAPBQDxQvAN4AkF
+AC0xCi6hGf9gAAc73QEADt0MDak4wKAJijgKjzjpkjkP+M4AAMAg0Q8AAAD//5QNoAkFAPxACBXg
+ClUA/Q+CBaA7BQBYYzLAINEPAGwQBIIv8EDwDetTAQAkIRkEBEt1SQHRD8Ag0Q9sEBoYhmsIORH4
+IAYV4BlVAOgAFQDAIQAAbZoCCACK5IbmENCFAAD0IEYVoA61APxACBXj//UA/iGEHeAFBQD0I2Yd
+4AQVAOQUIC7uAoAA7t0CAVkhAAD8IGYV4Aw1AFhdUCUUOSUUOiUUOygQAiwQAfwgEBXgDjUA7hQ4
+IMiVAADtlAAg0PEAAOyUASFZUQAA+SBGHaAcBQBYXUEqHEz6SAAV4AyFAFhdPiocVPpHABXgDIUA
+WF06Khx8+kyAFeAMhQBYXTcbhpkchp0ahsQYhpglFFwlFGwlFIwkFUT1C7wFpB0FAC0VQfwkJB3g
+KQUAKRQ8KRQ9iSCNJyiCsPsmAAyw9fUA4tIOKVAEgAAlFUL8k6YVoA1VAPiThhXgDEUAC4AALkKd
+GYavGoax+Q1YBajuHQB+WD8dhngShnIrQqYch2YiIn8NuwHsPAwNnkKAAPJAAEFwCxUA/kGIFeAD
+BQAMszgDqDkJ/wEI/wLvJgwpASYAANEPKCA6KSA7CIgRCYgCsYj4R2YdqIgdACgkOtEPAAAAKixO
++iBoHeAMNQBYXP/rHAgpUASAAPwBYh2gDSUAWAdl+kCwFeA6FQD6RgYd4EkVAAOpOSkkBdEPAGwQ
+BuYkAAIKqYAAxu/6SQAVoAUFAOoWASFZQQAA6xYAIWEBAADsFgIhOOEAAPMOcAWv/NUA+w5uBeAB
+MgBolW1pmjEtMAQoMAXvMAYu7gKAAAjdAugwBy7uAoAAD90C6yIBDu4CgAD5pgAOs++FAA/dLC1k
+Ni8wAQPzCqX19KAFiqIAnQApMAD1IATAkgCdAGiSa2mUpu4iAQHIEQAA6SYAC8AEgAD4imgdoAEe
+ACgwAvhgcBXv2vUACiIB6hIALEYCgADpiAIB2BUAAPjDBB2gDDUAWFy+jRHrhw4R+CEAAP4QaB3v
+/NUA/IJoHe/u9QAqMAEDowqlpXRTiGAAMooS/ADCHa/7tQDrIgEB2AkAAFhcr/sOAAXv/NUA//9E
+Da/u9QAMIgEtMAP8xoYd7/0eAMogGoXAi2AuonT7UWgVoAwFAP9vAA2wDRUAW0KKwrQrZAXRD9EP
+AAAAAPMN2gWv/1IAbBAKKiAmFoXSCqgJDIgRqGbjIAcjQAcAACiA+fpC0BXg+fUA8iAAAfAHBQDm
+Yn8kEemAAHmxEwUMR/2fwBWgCBUADIw5W0rxZKK8FYVEDDkR9GAQ8hIAnQClmS2SnvegFPLSAJ0A
+JJKdZEIwGoTi6gAFCkgEgAAJAmEJAmEJAmEJAmEJAmEchTcYhTf+QOQV5pYBAPYHAAUytkEA6LsR
+DVVCgAD7RgANev8BAOqZAg//AoAACP8Cn0COIPkKAgWgPcUA/IBmFeAPVQDsRgIvdgKAAA/uAp5B
+Hoa3LyAmJ0YSJ0YRJ0YQl0+XTpdNl0yXS5dKl0knRggnRQrt4QIv/AKAAAn/Ai7iAAj/AhiEMZ9E
++IDGFaAvxQDvRQsg2EEAAO62ACJQgQAA/WBEHeAMZQBYXE4sICYWhbcbhBYMzAkMzBHsuwgCUJkA
+APdgAEWwDGUAWFxG+wukBaALFQArRDP6haYdoImVAPiFhh3gGAUA+IXGHaANJQAtRDj8hyYd4A9F
+AP6GJh3gDlUA/oamHaAPBQD+hgYd4A4FAC5ENCwgJhuD/AzMCQzMEey7CAJQ6QAA92AARbAMZQBY
+XCzA5P6IBh2gDTUALURBLCAmG4PxnBgMzAkMzBHsuwgA0GEAAPdgAEWwDGUAWFwgiBePFgBEBPnr
+AA+0nx0A+CDGFeBYBQAoFBj4IQgVoAZVAO8WByJREQAA9iPmHef/QQDo/wIA2GEAAP4jxh3gDIUA
+WFwPiycMPBH1gABGf8oFAObGnSXYgQAACroB57UEJVEBAACasJqxKyAWKQr/ebEO+kTQFaAsxQBb
+SlTAINEPwCDRDwAAG4Ssirj3QAUgkgCdAAw5EaWZLZKe96AFctIAnQAkkp1kQKWwrJy4ZU3OjSJk
+0EoZhYCOJ/hACBWgCkUAmhL4IAYV788FAPvEABWgCRUA768BDEYCgAAJiALoFgEn+QEAAJ/p7+YI
+KNgEgAD3woQd4AwVAFtGEMAg0Q8rPBjqJAAJYASAAFtKpGP/owAA//WUDaAEBQCLImW/lCsgJtog
+67wSKWAEgABbSpxj/4HAoFheexuEf4q4+V/6kJIAnQD//ZANoAQFAMBAwMoMrDT9YQYVr/1WAAAA
+AAAAAABsEAjsJAAKsASAAOl0AAIEcYAAG4YS8wwkBaAKBQD2IEYVr+f1APwgJhWv9bUA+CAGFe//
+1QBtCB8pMAAoMAHqiggEjTUAAGiSOGiUKmiVF2iaCAODCnSrQWP/2QK7AfIghhXv/8IAACb63wa7
+AfZgaB2v/4YAAAAHuwH8YGgdr/9SAAW7AfxgaB3v/yYAAAAPuwH+YGgdr/7yAMiywCHRD4gRKIAm
+EoXwCIgJDIgRqCIiIn9kIbjzwHAV4AtlAPAAMA2gDgUAAAAAgilkIaCPJ/YAAh3gBQUA/+HIFeAE
+BQD+IGYV4A8FAG26E63rouoqoEArsAKx7vtgCaUiAJ0A/gACHaALhQDTD226E6zrouoqoDgrsASx
+7vtgCR0iAJ0A/gACHaALhQBtuhOm66LqKqBIK7AIse77YAilIgCdAPoAAh2gCzUA0w9tuhOmrqKr
+K7BQLuAFsar7wAgdYgCdAC4gNA8CAA8CAHPhAiMkNP7gAARwDgUA/xTsDeALZQAECUdln0MFCkfI
+rCosSPrBABXgDIUAWFthBwtHybW1a/pKABWgDDUAWFtcjRMs0RmxzCzVGY0ULdAD86AGB9IAnQCL
+FCqwBC2wBeywBi1WAoAADaoC67AHLVYCgAAMqgLuIDYtVgKAAPtGAA1z64UAC6oseuEpixIqJDbx
+YAUvkgCdAI0TLNEY7hIAJmAFAAAs1RiNIP3ABhXgAgUA0Q8AjhCNIP3ABhXgAgUA0Q8AAPtf9mPv
+//UA//sQDaAPFQD7X/br7/T1AP/7VA2gBBUA+1/3Y+/19QD/+5ANoAUVAP9/9+uv9/UA//vUDaAH
+FQCCEMf//kAGFeACBQDRD9ogWty6wJApJDaJEyiQNu4SACRABQAAKJQ2jSD9wAYV4AIFANEP2iBa
+3LEuIDYbg1ocgusdhW7uuygJUASAAFrcy9ogWtyuY/86bBAKKCAEKiBTJyAHHIRLCq0J5hYILu8C
+gAD9gABGcCuFAOzCfykgBIAA/ECwFeAGBQD1ABnYkXcBAPugGexgLlUA/6AZrCD/9QArIBacGf9j
+5g3gDQUABQxH/Z/AFaANFQAM3DlbSWPA0OwSCSUa6YAAFYO0DHkR9OAT+hIAnQClmS6SnvfAGbrS
+AJ0AI5KdZDKRGoNSGIOu6gAFCcgEgAAJAmEJAmEJAmEJAmEJAmEvIQcPD0ruIRkv/wKAAAj/Av5g
+BhXgSgUA+kAIFeKMQQDpg54cRgKAAPhgRhXgD1UA6jYDLd4CgAD/ZgAN9vwBAAj/ApsxKkAmLTUK
+nTidOZ06nTudPJ09nT6dP/xiBhXgOQUA/GImFe2+HQD8YkYV4Iw5AO02EyxFQoAA6TULLd0CgAAI
+uwIPuwLvhFIdVAKAAAuqAuuDWB91AoAAD+4CnjYLqgIqNgTkYiRh0IEAAPrIABXgDGUAWFq6LEAm
+FoQjG4KCDMwJDMwR7LsIAdCZAAD3YABFsAxlAFhash6EPhuCgfpm5h3gCgUA+maGHaAYBQD4ZcYd
+oI+VAC80LP5lph2gDSUALTQ5/GcGHeAJFQApNDP4ZiYd4IwFAPxmxh2gDGUA/GamHaAJBQApNDAt
+QCYbgmYN3QkM3RGtu+a7CAHQ6QAAWFqXwOP+aCYdoA1FAC00QCRAJhuCXQRMCQzMEey7CADQYQAA
+92AARbAMZQBYWowoEgcvEgbyWGgdoAZlAA8CAPnrAA+0nx0A+CDGFeBYBQDoFBgh0REAAP4g5hXg
+CAUA+CPmHaf/QQDk/wIA2GEAAP4jxh3gDIUAWFp59mmGHaAPFQAvNE2NJxiEyo3e+GnmHaAOhQAu
+NE6P0I7RLNENL/w079YAJ3AFAADu1gEmYAUAAP2hpB2gBAUADHsR9WAARfAKVQAqtp0rIBYpCv95
+sQr6SnAVoDwFAFtItIgn+gUCHa/JBQDqJAUkEIEAAAkiAeSFFCERAQAAkonzAQYVoAIFANEPABuD
+BIq490AHIJIAnQAMeRGlmS6SnvfAB7LSAJ0AI5KdZDDtsK6euGU9bY8iZPB5HIPYiCeLII4YnhL8
+IAYVr8kFAPsEABWgDBUA6akBDd4CgAAMuwLrFgEkyQEAAJmJ+QEGFeAMFQDthRQo2ASAAFtEacAg
+0Q/WIPRBCBWv8w4AwCDRDwAZhIvvkQIgwEEAAC+FAvkgCBXgDGUA6YYALFgEgABYWi1j/cYrfBjq
+JAAJYASAAFtI8f/90A2gDQUAAAAAAAAA//MwDaADBQAAAACKImWvWSsgU9og67wSKWAEgABbSOX/
+/RgNoA0FAPwhJhWgCgUAWFzBG4LGiriMGflf+FCQDQUA//xwDaADBQDAMMDqDq40/2EGFa/8NgAA
+AABsEBr5BiIFrgkFAPggBhXgBAUA9CAmFaAZVQDoABUAwCEAANMPbZoCCACKLRACLxABJRAA6IOH
+EPARAAAq4AIs4AEoFgIoIgAkFBsjFDgkFDkkFDokFDv/wBAVo/v1APohhB3gCUUA6RQgINiFAAAs
+tAH7YEYdoAm1AO60ACxGAoAA6YgCAPCVAAAl5ADv5AEg0PEAAP3ARh3gHAUA6BYDIVlRAABYWeQq
+HEz6SAAV4AyFAFhZ4SocVPpHABXgDIUAWFndKhx8+kyAFeAMhQBYWdr5A1IF4CgFACgUPPgnph2g
+XxUAfzEvKRUgJBRcJBRsJBSMjijrHAgpUASAAP/DJBWgDLUA/kUkHaANJQBYBDXC+y8kBdEPKBAg
+wJIJiAL4JAYdr/8eAGwQBMBwbUoRonijdCRAACiAAOSJDnO4BQAAwCDRDwAAAAAAAPUBFg2v8vUA
+wCHRD9EPAABsEDQnMgQWgizzBdoFo3eBAAd3CQx3EQciCO5ieyFoCwAALdAAKmKDJyJ/Dt0I/agA
+FrAMFQDtqggL2ASAAFhLsCQig+WkAAIEAYAAKzBMLDBNCLsR/WYADbACBQCMSsnPisvJoW0ICS2h
+NnvRB4qryKRj/+8A0qDMLSzCCdMPZc/ezCOESWVP0xqCC4gtJqKD64IuHEZCgACoZo5nhGgpMFSO
+7o1HLhZbHoPjjd4tFlodgvT1IAdQkAwFAGiSEtEPAAAAAAAAAP/+9A2gAgUAAAArCsrrOwgDUbEA
+APorBhWgDGUAWFl96zw9I1EhAAD6KyYVoAw1AFhZeCwxL27PCh2Dzv2gD0KiAJ0AwJcqMS4vMJj6
+DAAFsA4VAPvCAAzwqikA+80ADLCPOQD5wgAMsP8ZAA/pOGSR0YtKdrksLhJbLeAyL+AzCN0RD90C
+sd39xmYd6N0dAC3kMi0SWizQObHM/acmHaAAtgAAKBJbL4A0KYA1CP8RCf8Csf//BqYd6P8dAC+E
+NC8SWi7wOi7sAS70OgZqAlgMgAIqAls809EPiEp2iSAvElsp8DYo8DcImREImQKxmfnm5h3omR0A
++ebGHeAAggAoElsvgDgpgDkI/xEJ/wKx//8HJh3o/x0AL4Q4LzBZ9eAMwpIAnQDAifngCBwiAJ0A
+I6KDGIE471AMIMlBAACckJyRnJKck5yUnJWclpyXnJicmZyaKIKbnJucnK+I7JYNLEZCgACoMy8x
+KyyWDiyWD/vgBTRiAJ0AKVAFKgoj+yAExCIAnQAZgYYagYYoMgAbgZkrFhoqFhQpFhb9AAAUMAlF
+AAmIAigWFSowBwoKQQCqEQr6AguqAioWGAnqMCkWGSwWGyhQJhuA3QiPCQ6IAugWHC//AoAAD7sI
+DbsILkIALBR9/iPGFaANNQDtFh0g0f0AAO1iACVQLQAA/CQmFeAMZQBYWQPrHFAp0ASAAPwAgh2g
+DSUAWzuB2iBbPIHRDwAAAAAAAP/4aA2gCQUAKzBawsn9YBmUIgCdANogWzx50Q8Zglwegm4dgoGP
+YIxnGIJUG4JTKxZXKIKwjM4N/wLsFlYrUASAAP/HxhXgDEUA+cfmFeANVQALgAAcgmApwj/5DgAM
+8P71AHngSysSViqwOiywOwiqEQyqAiqsAftnZh2oqh0AKrQ6BmoCWAwIAioCWzxbBgAAANogWzxZ
+i0r3f/rVIgCdAPrAaB2gC0UAW/7C0Q8AAAAagXwfgisZgUQroqYpkoMPuwEJuxGrmRuCWY2cGIED
+C90BCN0C7ZYMJP1BgAAsElgpFl0eggUdgSMoUCYtFlMNAIcIiAntElcsRwKAAKjuLuB/DQJhDQJh
+DQJhDQJhH4IiHYIx6YIhH3UCgAD/xgAPcApFACrWPwl5AhqCGSkWUe7VgC5YBIAA+afGFeAMZQBY
+WKoYgg0nEl0ogpHrElcq0ASAAPwAgh2gDVUAC4AAHIIdL8I/D49HZPVl9eArFRIAnQArZT+bGysW
+Ui8WVB2AiS5hKfjPkBWgChUA+iCGFaAJBQCZGCkWCSkWCikWDSoWDBmBywiKCegWBS1XAoAACpkI
+KZJ/KRZV/cAuzGIAnQAdgXAuFlAPAgAN7QIvElUtFgfTD/7AAAdyj0EA/QgAFDD/OQDo7gIP/AKA
+AO/uAgDQQQAA7hYGINkBAABbOk5koWfApf0FpAWgOyUAWF45KBJUDwIAZIGaKhJbKaA8K6A9CJkR
+C5kCsZn5R6Yd6JkdAOmkPCtQBIAAWAuaGoEHHIDhHoBpL1AM/CoAFeALBQAr1gAr1gEr1gKb05vU
+m9Wb1pvXm9ib2Zvam9su4pub3CzCg6/u69YNL3ZCgACuzC/BK5vem9/74AV0IgCdAC1QBcLj/6AF
+DCIAnQAdgLYagMqLcB6AtS4WFCoWGi0WFv1gABWwDUUADbsCKxYVKcAHCQlBAJkRCfkCCpkCKRYY
+COow+CMmFaAOBQAuFhstUCYfgpkbgAsN3Anv3QIOZwKAAKy7LRYcHIGm/oAIFeANNQAtFh0uFH0v
+Fh7suwgA0f0AAO9iACVQLQAA/iQmFeAMZQBYWDHrHFAr0ASAAPwAgh2gDSUAWzqv2iBbO6/RDwDa
+IFs7rY9KdvkS+sBoHaALRQBb/hfRDwAAAAAAAPrAaB2gWxUAW/4S0Q8tElAuElUcgngvYHz4KkgV
+oApVAPggBhWgOyUAWF3aHIJz/CIIFeAKVQD+IigVoDslAFhd1SoSECkSVCsSEStmE+pkUCzzTgAA
+HICEHYAML1AM+CoAFaAOBQCegJ6BnoKeg56EnoWehp6HnoieiZ6Knost0puejCzCg6/d7oYNLu5C
+gACtzB2Ami/BK56Ono/94AWUYgCdAC1QBcLj/6AFLCIAnQAdgFkagG2LcB6AWC4WFCoWGi0WFv1g
+ABWwDUUADbsCKxYVKcAHCQlBAJkRCfkCCpkCKRYYD+ow/iMmFeAIBQAoFhstUCYegjwbf64N3Anu
+3QIOZwKAAKy7LRYcHIFJjUD8I8YV4A41AP4jphWgDxUALxR97LsIANH9AADvYgAlUC0AAP4kJhXg
+DGUAWFfT6xxQK9AEgAD8AIIdoA0lAFs6US9ANsn/2kBa2WAuQDYbgAkcf5odgh3uuygKUASAAFrZ
+etpAWtldKnw0+m4AFeAMhQBYV8EqfDz6bQAV4AyFAFhXvip8XPprgBXgDIUAWFe67DIZI9GhAAD8
+4yYVoJuFANMP+mAARfAcBQBYV7MrPEH66cAVoAw1AFhXsI1KLnAFLnQwdtkRwIz46oYdoD9lAP7g
+ph3gAEoAKgoO+uqGHaA5dQApdAUHegJYELQCKgJbOyYbgTMcf3HtgTMbUASAAFrZUtpgWtk0i0oP
+AgB2uRSCaWQgD/pAaB2gWxUAW/2IgillL+/rgeQbUASAAFv6KhyAlvgv4BWtCQUA6RYkJEBlAAD8
+AAoVoBlVAG2aAggAiisSWfsCJAWgDDUA+iTGFaAOtQD8wAgV4AkVAPg2Bh3gDwUA/jVmHeP49QDo
+FVQu7gKAAO7dAgDR/QAA7RYnJVDJAABYV3kegPMfgN/5AbYFoA0FAC0Uy+0UyiDR/QAA/DkmHeAM
+NQD8OeYdoGslAOsUyCVgRQAAKcACK8AB6IKwJVDZAAArpAEppAIrElcswAAspACCZxqA84lggi7/
+x+YV4A1VAPsmAAywDEUA6eY+K1AEgAALgAAfgNcv8j//DgAP8P71AP/ACJDiAJ0AGIAEGYCzEn/M
+KIKmIiKDCYgB6oDjHEZCgACoIogsGYDkCogBCYgC6CYMKQgeAADrgaYbUASAAFv54MKcKWQF0Q8r
+wYD7IAAF8VoFAPtf1JriAJ0ALBJRLRJTKRJXKxZcDQCHCQJhCQJhCQJhCQJhGoC1GYCuKaY/LKY+
+LGBuLmBsKGBwKWBtL2Bv7WBxLEYCgADomREPdAKAAOnuAg/8AoAACP8CD90CDswCDcwDDM0UDcwD
+DG0U/ZcADnALFQD8oAAGMAoFAFhfAh6AnxiAh9mgKeZA+RIoFaAMRQD7yCYV4A1VAOsSVyrQBIAA
+C4AAHICVL8I/KxJc/+eYDaf/QQAAAAAAAP4qBhWv6M4AKCA6KSA7CIgRCYgCsYj4R2YdqIgdAPhH
+Rh2v/B4AAADqLE4g2f0AAPtiIBXgDDUAWFcG2iD6L+AV4Ay1APtjIBXgDSUAWAFsw8j8QKYdr/tO
+AAAAAAAAAGwQBhiBWXhRBtEPAAAAAADqJAAJ2ASAAOxEAAroBIAA7mQACPgEgABb+ytlr9qNEPsA
+FAWgJ0UA9aAF4BAMFQAjooYJ2BGoM443ju6J5eriBCToBQAAneX5oNIN4Cs1ALGqmuQpIAUsNDfT
+D/szJg3gLGUAKjAFfKECd6mLjjf1wcgV788FAOc0BSdogQAA/6AEBvAPBQDv5RQm6QEAAJ3p7eYI
+KdAEgABa2GYoURKEOrGI6FUSIgCJgADCXSlABXWRJYRJZU/0+kBoHaALBQD8AAIdoA0FAFv6K4s3
+i74qsQ6xqiq1DtEP2kBYBDSESWVPyWP/0QAA+kBoHaALBQD8AAIdoA0FAFv6Hxp/0yqiiyyhAmTO
+8Vs4/B5/GB9+tRx/zh1/Yi/ykSzChovfqvruAAUNVkKAAOrKCAXYBQAA69YPJXCBAAAOAmEOAmEO
+AmEOAmEOAmEOAmGaESggFhl/3iwhBy0gDf5BkBWgDxUAL6QELqQMLyAHLaQNLiAmHYDyLKUHDusJ
+7qRTLd8CgACrmSmSfymmFS+kBy6kU5Ko7aUWKmAEgADopBYp2ASAAFv5nB1/+iwgJht+WIMRDMwJ
+5H86HmcCgADsuwgB0WEAAP1gAEXwDGUAWFaGikstoQLI21s4yY5MAq8Rr+4uNhgqICYZf7kKqgkM
+qhGqmSqSg2SgY4mpyJnpkgks0ASAAGWf9JOpJTUX9mCmHeALBQCbOes2CiHvGYAAjDeMzo3FisTm
+NRkm2AUAAH27Fy3BDuvGBSVwBQAA7sYEJugFAAAtxQ7RDy/BDpvF6sYEJ/gFAAAvxQ7RDwDzMGYV
+7/6mAGwQJhiAvvihJg2gCgUAwCHRDwDbMOxEAAroBIAA6hYEK/AEgADqJAAA+EEAAFv6jmWv2ooU
+9P8WBeArZQDpqBEFBzUAACNSWagzjTeN3izRDLHMLNUMKTAF8mFIFaAqVQD7IBKcYAZFACo0BSlR
+f/EgCbdQBAUAZCEyKyAFws39YBSsIgCdAB1/Q/Qi5hWuDgUA7hYWIMGBAAD8AAoV4BlVAG2aAggA
+iu9/vRDRcQAAK6AC7qABIMlhAAAtkAIokAEvFhgvIgAmFJAkFHMkFJEkFJIkFJMpkAD7QBAVo/z1
+ACwVOOYUeCDh5QAAK8QCLsQBKsQA/eAAF7AKtQDq/wIA8fUAAOnkACFZUQAA/cBGHeAcBQDvFhkg
+0f0AAOjkASVQVQAAWFYX6yxAINH9AAD7RKAVoAyFAFhWEussOCDR/QAA+0WgFaAMhQBYVg7rLGQg
+0f0AAPtKoBWgDIUAWFYJJBTkJBTE9DaGHaAoBQAoFJUoFJSOKO990xlQBIAA7xVMINmBAAD/wyQV
+oAy1AP5FJB2gDSUAARECWABlwpv4QKYd4AIFANEPwCDRDxt/WBp+V+oABQ3IBIAACQJhCQJhCQJh
+CQJhHYBOiTAYf1ISfpsef1Qogq8uJp0kJp7kJp8p0ASAAO2ZAgtgBIAA+FOGFeANVQALgAAqIp37
+DgANMPn1AHqQFIw3jM4rwDexu/uG5h3gAgUA0Q8AAJQclB2UHiQWERt9xRd/EBh/NCMinvKrKBWg
+BRUAlRgIMwHlFhApnkKAAKMiJSEpKCB8KSE/mBkIiAnpFg8sRwKAAKh343J/I7gLAAAncQR7UQUb
+fqsLWwKbG/LAAAZy40EA/cgAFzDTOQDuzAIO7AKAAO3MAgDQgQAA7BYKINlBAABbN4zKq8Cl/QAg
+BaA7JQBYW3dj/dMAAAAAAPxgCBXgClUA/QAiBaA7JQBYW3DAIdEPAN1Q7IAGGfAEgAD+T5AV4ApV
+APYgBhXgOyUAWFtoHIAA/CKIFeAKVQD+IqgVoDslAFhbYi8SFCgSFSgmE/5KBh3v9d4AAAAAAPxA
+CBXgClUA/P/0BaA7JQBYW1jAINEPAGwQDpUTkxL6YAgV4A41AO4WCypQBIAA6hYEKcAEgAAmgBjj
+IAcpoASAACeAE/YhxhXnuwEA+iHmFeEzAQDzbnAN4HYRAH1nDSgKwPggBhWgADoAAAAAiB8ojEyY
+ECWMHwVFFCggBGuGB/kAGPISAJ0AKyAWJgr/DwIAdrEihhMPAgD6SDAVp2YBAPzfwBWgCBUADIw5
+W0PX+0BTqBIAnQD4/DYFoA91AO8WDCOUIYAA6X4lEaTJAAAMOBGpiCqCnvVAUiPiAJ0AJ4KdZXBG
+iiJkpe6LEowU7RIDKVAEgABbQRLSoNEPiYj3IFKAkgCdABp+FQw3Eap3K3Ke9WBTC+IAnQAncp36
+4FLAEgCdALCbm4hkf7gcfbHTD+wABQvABIAAbVkCCAJhKCEHGX4J/CHIFaqIAQDtEgAsRwKAAAmI
+AphwjiAffgGfcu12Ay92AoAA7l4CCVAEgADudgEqWASAAFsMxS0hIikgBRh+cyxAGIYtHn2vGn03
+KyBBLuKDKqKb678JCzZCgACuZpYY9sEIFaDMCQDsFgkv/wKAAK+IL2AMhmcogn8K/wgmYg7mFg0v
+/kKAAA/uCP4g5hWgWgUAepELLwpOf5EFKQpSKSQF+WAAFjboAQD6AAId4vhBAPrhRB3gugUA6nUL
+L/4CgAAP7gL4BwAHvY0dAOSIEQ/9QoAACP8CD+4CH36eDswC7X2mHvUCgAAP7gLudgYj0IEAAO3M
+AgFZIQAA/OCGFaAMZQBYVQgsIEEdfnEbfNAMzAkMzBHsuwgD0JkAAP1gAEXwDGUAWFT/G36M/vmc
+BaCJlQDpdCwj0PEAAP7m5h2gjQUA/ObGHeAYBQD45cYdoAwVAPrlph3gDyUA73QxIVlxAAD85mYd
+oA8FAP7mBh3gHIUAWFTsKnxU7BIPIljBAABYVOjA0vzmph3gDQUALXQ0KEAw9QAdIhIAnQAoFhD1
+AD1akgCdAMXh/wAc9CIAnQCLHYywirEtCrStzOy2ACVQBQAAmrEZfZMMPxGp/yX2nfUAGgKSAJ0A
+KyAWLgr/frFyjB/qIEEmYPEAAFtDIcAg0Q8AAAAAAAD/9NwNoAWFAPRgBrISAJ0AGH2DDDcRqHct
+cp71oECL4gCdACdynecWCiuHPgAAiiJlrXcrPBjqJAAJYASAAFtDg2P9ZosSK7EILDr/fLEMixLs
+EgQpUASAAFgZ8sAg0Q8AAACNEtog7hIDINgRAADt0Qgu4ASAAFsnHC0KiH2hw4wRZM/WiseLEuwS
+BCVQgQAAWz7VjBGOwI0UCO4RDt0CnaErIATmpAANIASAAPVgOFoSAJ0A6iQAC1gEgABbJknsEgEl
+F2GAAO0SAytYBIAA7BIELlAEgABYGLDAINEPAAAAiYj3IDtYkgCdABp9TAw3Eap3L3Ke9eA7m+IA
+nQAncp1kd2qwm5uI5xYKI/kJgAAdfOiIGg0Ah21ZAggCYdog7BIOKlgEgABbDAkvIQcXfT76IUgV
+qv8BAAz/EQf/Ap+giyAZfTbsISIt3gKAAAtbApuhLiBBLBYGH32t7u0JAWEhAADorCAu7wKAAO/d
+CAm/AoAA7xIPIhjBAADpdwgFUPEAAOkgBSFZcQAA5PInb3QCgAAvEgoWfSMm9gImEgAm9gP9r+gV
+4F8FAH+REC8KTn+RCiYKVvcgNGUiAJ0A+CDIFeJtQQD8wAATNv0BAAb/AvwHAAN92R0A5WYRDu0C
+gAANZgIG/wIWfoaNGu/vAgzNAoAABpkCFn57mdYZfnsG/wKGH/mg5hXgCQUAKdUK79YEIzDxAAAm
+1QsMAIYIAmEmISr3paYdoA8FAC/UMS/UMi/UM/ml5h3gCQUA+aaGHeAPBQAv1DUv1Db/puYd6GYd
+APelhh2gDwUA/6XGHeAPBQAv1DAmIFf3p2YdqGYdAPenRh2oZh0A96cmHahmHQAm1DgvsAEpsAAp
+pAAvpAEvsAMmsALmpAIm6QEAAO+kAyFJgQAACSCIDQSKCQCIDQCKihorIhyMH/tKZh3oux0A+0pG
+Hei7HQD7SiYd6LsdACukUOs0AAVRUQAAWFQTjx+OGi0gdK/uLeRYjB4ldp31gCIpkgCdAChAEmSE
+qBt8SRx8CR19jeuLKAlQBIAAWtW62iBa1Z1j/MQAHX5mjC79n+XdYgCdAI4XjuLx3+V/0gCdAPog
+6BWgCxUAWtTbY/yciR0vkRSx//8ihB3gAEYAaITtih0poRaxmSmlFokZ/CGIFeAOJQAudMj++SYd
+oCxFAPznJh2gK2UA+uamHeAKBQD65oYdoA+FAAn9OfznBh3v8JYAAAAAKzwY6iQACWAEgABbQqlj
++f8AAAAAAPOAaB2v5lYAhhrE9J9jH34+n2IWfFGPLSZigwn/Ea9mhmct0n+GbvYgphWgXwUAf5EJ
+xG52kQTFkikkBYkW/EgAB/ZtAQD94AAXsN05AP7GAAt9+R0A5d0RD/0CgAAP3QIfffUNZgIG5gKN
+Gh59+g9mAubWBCzNAoAADpkCj00Wfe+W1+nWBif48QAA/6FkHeAPBQAv1QouwAEpwAAphAAuhAEm
+wAMvwAIvhAImhAMuwAUpwAQphAQuhAUmwAcvwAYvhAYmhAcuwAkpwAgphAguhAkmwAsvwAovhAom
+hAsuISr/paYdqO4dAC7ULCwgV/2nZh2ozB0A/adGHajMHQD9pyYdqMwdAP2nBh2gHIUAWFOaihrb
+MPtLABWgHAUAWFOXihqJFRx8U/1DRhWgDYUALaYbKyB0K6R0G33yJXadKqIXjS4qrED7oAkkYAgF
+AB58Ai7igwnfEa/ujueO7ibgBSPgBC3gAC/gAeXgBimeAoAA5jMCDu4CgADv3QIJngKAAAUzAibg
+AiXgB+/gAy7uAoAA5t0CCZ4CgADlMwIO7gKAAA/dAq2NA6MIejsCLdwBJuANL+AMLeQD88DmHehT
+HQD1wMYd6D0dAP3BEBXoVR0AJeQF88BGHehVHQD1wIYd6DMdACPkAfXBMBXoMx0A4+QAL/4CgAAG
+/wIj4A7m4Aou7gKAAOXdAg/+AoAAA/8CJeAP4+ALLu4CgADm3QIP/gKAAOX/Ag7uAoAA490CB5gF
+AAB/OwGx3SPkD/3BZh3owx0A/cHGHai9HQD7wUYd6MwdAP3Bph2oux0A+8EmHejMHQD9wYYdqLsd
+ACvkCCaQBS2QBC+QACuQAe6QBi7uAoAA5t0CD/4CgADr/wIO7gKAAA7dAiuQAi6QB+aQAy/+AoAA
+6/8CDu4CgADu3QIP/gKAAAb/Aq+Ira162wGxiC2UByuQCSyQDSiUA/chkBWoiB0A+SBGHaitHQD7
+IMYdqIgdAPkgJh2oqh0A+yCmHaiIHQD5IAYdqKodACqUBCiQCOqQDis2AoAADGYC7JAKKzYCgADq
+ZgIMRgKAAAuIAiuQD+qQCyxGAoAA7IgCCzYCgADrZgIMRgKAAOqIAgNoBQAAdtsBsYgtlA8olAv6
+IcgV6O0dAP8hxh2oyB0A/SFGHajuHQD/IaYdqMwdAP0hJh2o7h0A/yGGHajMHQAslAj5f94Z0gCd
+AC8gBcVm9//IzCIAnQDaIFs2fMAg0Q8AAAAAAI0dLNETKnxm6xIIJmAFAAD9omQdoA4lAP7shh2g
+CAUA/uymHaANlQD85wYd4AnVAPjmph3gDLUA7HQ5JdmxAAD45oYdoAxlAFhS4/giCBWv4FIAjh6L
+G8DS7ts4CVAEgABYEBVj+CMqrBn6SiAV4Aw1AFhS2SpsHfpJwBXgDDUAWFLV/CAoFa/jZgD/1vwN
+oAcFAABpYg6KJ9tA7BIEJVCBAABbPPuLImW4WysgQdog67wSKWAEgABbQY/AINEPwKBYVW4Ye3KJ
+iPk/rTCSAJ0A/9cADaAHBQAAAP/fyA2gBwUAwHDAygycNP0BBhWv1p4AAMXy/kCmHe/lygAAwKBY
+VV4Ye2OJiPk/xFiSAJ0A/+KADaAHBQAAwHDAqgqaNPsBBhWv4kIAAAAAbBAEijqMKYgseikH/GFG
+FaAAfgDJpYup0w8PAgBysQzqtAAFgEmAAIu5crnynKn6QagVoAwFAJwq/EFmFaA5BQDsJgkkAFmA
+ACkkBdEPAABlr/UafPr6QAgV4C21AC0kBS6idCqii/9vAA2wDRUAWzh50Q9sEAYoCivoJAUpUASA
+AFrUHoMsFHwNFnvF8GdwDeBXBQDnNAUp0ASAAFrUFysyDSpiiAm7EQuqCCqiCmSgGSusYPogaB2g
+DEUAWFJ7+iAIFaAANgAAAAAAGnqGmhAde/ksOugMrCwNzCjsFgAp0ASAAFrUBesSACpoBIAA7Hpu
+GdAEgABa1CADOgJa1AODO2U/joMs6yINIYC5gABlsL/yQaYV4AAiAJO7mzzA4J4sgyrJMMO+KjAF
+hTh7oQ/jVAAK/6YAAMCwmyrRDwAA2jBa0+6EOvCHQA3gO+UA50QFKlAEgABa0+iLTSpiiAm7Eauq
+iqpkoBUrrGD6IIAVoAxFAFhSTfogKBWgACYAGnpZmhEde8wsOugMrCwNzCjsFgEqUASAAFrT2IsR
+HHpC7XvGGlAEgABa0/TaQFrT14RLDwIA/plsDeA75QCEOuwyCyIBkYAAZcBA9GFmFaAAjgCJu9MP
+DwIAZJ89bQgK6ZILLNgEgABkny9j/+6Uy5xMwNCdOo45wPDvNggnAUGAAMSC+GCmHa/8pgCJy9MP
+0w9kn9htCArpkgss4ASAAGSfymP/7ok7ZZ/W+mAIFeA/9QAvNAUuYnT60WgVoAwFAP9vAA2wDRUA
+WzgCGXrGiJ75H+AVoDvlAPkhxhWv+1IAAAAAbBAQhSgoIAUPAgD0oQgVoCrVAPsAGJQiAJ0AiScq
+JAX7JAAV78wFAP1gBAWwBgUA5pUUJdEBAACameqWCClQBIAAWtOVF3s48G7QDeAKRQAdepocef0p
+QAzjclkg8EEAAJbgluGW4pbjluSW5ZbmlueW6JbpluoowpuW65bsqYjm5g0sRkKAAKgzKzErlu6W
+7/1gBSRiAJ0ALUAFwuP/oAS8IgCdABh6Sx16X48wGXpKmRSdGpgW/eAAF7AIRQAI/wKfFS4wBw4O
+QQDuEQ67Ag27AvohBhXgCDUACuowmhkmFgsvQCYZfC8de0EP/gnp/wIGW9sAAO8WDC9nAoAADLsI
+DbsIKVIAKBYNKRYOJhQ97yIAINEpAAD+IiYV4AxlAFhRyescECnQBIAA/ACCHaANJQBbNEfApBN7
+Jht6JSxSFYRY6wAFCcgEgAAJAmEJAmEJAmEJAmEeezcdeycffB8v5YDq5j8hWbEAAO3NAgHQKQAA
+/cfGFeAMZQBYUbIYexYogpHqRAAJ2ASAAPwAgh2gDVUAC4AAgyrJO/AAOA2gNOUAANowW7LNgzjI
+OSkwBXSZ8IM4ZT/0gytkMT3+9bIFoFZlAP4iphWgReUAiTcvmRQqMAXkkgkngVGAAHahKvVABuxi
+AJ0A5TQFKdAEgABa0ykocX9+hxvNS2AAwgAAAAAA//9YDaAEBQDaMFs1EmAArQAAZECoLBIVjUOO
+QolAikH+YQQV4DslAP4i5hXnmcEA+CLGFeeqAQD6IoYVoCgFAOoyACwCCoAA+iAGFaDunQD4ICYV
+4ApVAFhXPCtxfyoSF/9qYAdT/PUAfKFgLRIWaNYoZEBI7BIUKlgEgAD6YGgdoI9FAP6BBB3gDhUA
+/mKmHaANBQBYFYdgACItEhSKN8DADwIA69QABVCBAABbN471QGgdr/76ACs6/3uhDoM7ZT8GwGDy
+QWgV4AC+AI03/aQAFa/OBQD/gAQGMA4FAO7VFCZhAQAAnNn9oQYVr/9GAAAAAAAAAADrIgwhgUmA
+AMq0KbILDwIADwIAyJ5tCAnpkgss2ASAAMiRY//vk7ubPJYr0Q/RDwCTLJYr0Q8AAGwQBIknK/rA
+45IOJNCBAAD7QAQFcCtlAOskBSVRAQAAmpn7IQYVoAgFAOiVFClQBIAAWtLMLDERgiqxzOw1ESEB
+aYAA8ABgDaAj1QAAAAAA+kBoHaALFQBb/xwiIgnIKy0gBXPZ6YIpZS/00Q/RDwBsEBoYeiwpChXo
+ABUIwASAAG2aAggAih17iRx7iQ8CAATcOSwWACsiAPh/4h3gChUA+CEEHeAMtQDqFBgt3gKAAOy7
+AgDQZQAA+iAmFeAMNQDsFBMh2UUAAFhREis8TvojoBWgDDUAWFEPwKAqFDEqFDL6JmYdoAslAOsU
+MCIDGYAAH3phiC0qFioqFDP/7+gV4Aw1AOoUMiDw4QAA6xQwLEZCgADo/wgA2QEAAOoUMSfo4QAA
+7SYAANH9AADrhx4HwQEAAOgGAAVQpQAA7oMeB9khAABYUPMoEioIiBQoFhLqJAAI2ASAAPwBYh2g
+DSUAW/tX0Q8AAGwQGhh57ikKFegAFQjABIAAbZoCCACKG3tN+iAGFeAFFQD6QAgVoAw1APwiZh2j
++fUA+CEEHeALtQDlFBgtVgKAAOuqAgHZRQAA6hYBINBlAABYUNYqHB36acAV4Aw1AFhQ0voBAh3g
+HwUA/iYmHeAOBQD+JkYdoB1FAPwmZh3gDCUA7BQwIgDRgAAoQAApQAL1AAZcEgCdAPomxh3gAEoA
+iTwJClALqhEFqgIqFDYVefcPAgAtUX/6JoYd4B8lAP2gBAIwLiUABP45LhYQ/a7AHaBUZQAoIAX1
+AAkcIgCdACQkBSowBSkKOflIXg3gC3UAK1F//2eAB5A91QAsIAV0yTErIg0qUlkJuxELqggqogpk
+oK3rrGAg0f0AAPtFIBWgDEUAWFCh+iVIFaACdgArNFTRDyo0MPxgph3gDHUALDRU0Q8AAADqJAAI
+2ASAAPwBYh2gDSUAW/r/Y/+FAADzP/muEKk5APM/+W5Q2TEAjkN75xPx3/kGkgCdABh69C8xGQj/
+AS81GS41GRZ6VIQ8BkQBFnllDqgQCEQCBkQBFnrtD9gQ+IYACjD5KQDmSQEP/AKAAA+ZAvhhhhXv
++5oAAAAaeIgqFioZefsoOugIqCwJiCjoFiopUASAAFrSBysSKhx4ce159RlQBIAAWtIj2iBa0gbA
+lyk0VNEPAAAA6iQACNgEgAD8AWIdoE71AP5Aph2gDSUAW/rPY/7FAABsEBoYeWYpChXoABUIwASA
+AG2aAggAiht54/ogBhXgBhUA+kAIFaAMNQD8ImYdo/n1APghBB3gC7UA5hQYLVYCgADrqgIB2UUA
+AOoWASDQZQAAWFBOKhwd+mnAFeAMNQBYUErAUOUUMSDQ0QAA9CZGHeAMJQDsFDAiWVEAAPQmZh3g
+HAUAWFBBKhxE+ogAFeAMhQBYUD4qHEz6hwAV4AyFAFhQOitMZPougBWgDIUAWFA3woAoFDQoFDUv
+MhkvFhDmFUApUASAAOUUVCjYBIAA9CyGHeAMtQD0MIYd4P71AP4nxB2gDSUAW/qTKjAF+mYGHaA5
+lQApNAXRDwBsEBoYeSf+81YF4Au1APgCoh3j/fUA6AAVCMAEgABtmgIIAIqfEIog/CEEHeAOFQD+
+IwYdoAw1AOwUEy1WAoAAC6oCmhEpMAQnHB3qHBkkrTUAACs8UVhQDtpw+mnAFeAMNQBYUAvlFDUp
+UASAAPYmxh2gCRUA+CYGHeAIBQDoFDEo2ASAAPgmRh2gDLUA+CZmHaANJQBb+mnRDwArPEhYT/za
+cPqAoBXgDDUAWE/4Y/+zAABsEDIcemEdelfTDyzCfxp5TPqgaB3vzgUA5cxULkgEgABtSQUDAIYJ
+AmH4QOgV7AMFAJMQ5iINJjlhAADqon8mGPEAAOQiDiTAgQAA7o8BCzZCgADqZggH+QEAAPyABYRi
+AJ0ACUQRpKSNR4je/yEmFeA6lQD/IQYV4A0FAO2VFCIFIYAAKcBUwtD3IAaWED71APmgCVNgO9UA
+LoBUL4BV5YBWL3YCgAAP7gLvgFcvdgKAAAXuAgjuEQ/uArHu/wrmHajuHQD/CsYdqO4dAP8Kph2o
+7h0ALoRUKEAF+wA6NCA1pQD1AEIEYgCdAPsAKBxiAJ0A2iDrRAAJ4ASAAPwBIh3gHuUAW/+R0Q8A
+AAAAAP8ABAewCgUA6pUUJ/kBAACfmS+WCMpvKMBU9QAtUZIAnQBohXL1AC5mEGsVAPsM/g3gLMUA
+KGAF/QANlCAt9QD9AA1UYgCdANEPAAAAAAAA9yAIIpIAnQD5IBCjEgCdACmAWCqAWQiZEQqZArGZ
++QsmHeiZHQAphFgoQAX5GUAVoA7lAP8AIhqiAJ0AGnn8CooKiqAKoAAA2iDrZAAJ4ASAAPwBIh3g
+DgUAW/9k0Q8AxXL3IArTYDW1APjgEatiAJ0ALYBgLoBh74BiLu4CgAAO3QLugGMu7gKAAA/dAgjd
+EQ7dArHd/QxmHejdHQD9DEYd6N0dAP0MJh3o3R0ALYRgKEAF+KAgAyIAnQD7AB/DIgCdACrCG/gA
+Ah2v8/UA/UAAFTAOhQBt6hWkiwyJCCmQZCuwNA8CAOm5DHRABQAA8AiADaAIBQDpswZ5wASAAMCB
+ZI/qYAPM+SAH4dIAnQArgFAsgFHtgFIt3gKAAAy7AuyAUy3eAoAADbsCCLsRDLsCsbv7CmYd6Lsd
+APsKRh3oux0A+womHei7HQArhFAoQAX7ADxUIgCdAP8AHtQiAJ0A6kQAC9gEgABYArropAAFJzmA
+ANog7DQAClgEgAD44AAHMA11AFv/GfqAaB2gi6UAWAIo0Q8AAAAAAAAAg2rJNCo8TvogaB3gDDUA
+WAPRZKN0gzhlP+naIFsytNEPAMLBfJlCLYBaLoBbCN0RDt0Csd39C2Yd6N0dAC2EWihABfUAJdxi
+AJ0A+wAlnGIAnQDaIOtEAAngBIAA/AEiHeAOBQBb/vrRD9og60QACeAEgAD8AWId4A4FAFv+9NEP
+AMHifpniKoBoK4Bp7YBqLVYCgAALqgLrgGstVgKAAA2qAu93qh1WAoAAC6oC6cEvJVAFAAD7DWYd
+qKodAPsNRh2oqh0A+w0mHaiqHQAqhGj/IDdUYgCdAIVLyF4oUTf5ABK8YgCdAIVbZV/v2iDrRAAJ
+4ASAAPwA4h3gHnUAW/7T0Q8AKwph+z/69WIAnQAsgGQtgGXugGYuZgKAAA3MAu2AZy5mAoAADswC
+CMwRDcwC42IKJmAFAAD9DOYdqMwdAP0Mxh2ozB0A/QymHajMHQDshGQh6CGAACo8TvogaB3gDDUA
+WAN8ZKYrgzhlP+lj/OYAAADA2G3aE6SLrIkpkFwrsDyxiPlgCb1iAJ0AKhYs+C/gFaAJBQD5BiAV
+oAs1ANMPbboXK4AApJoqoE7pnAEkQAUAAPtgCL0iAJ0AGXfLKBx/KIw5+AAKFeAZVQBtmgIIAIoZ
+eSjpFi4iWUUAAPxACBXgDxUA/joGHeAINQD4OWYdo/71AP4shB2gDDUA/aAAFrAOtQDu3QIA0f0A
+AO0WLyVRSQAAWE6x60xOINH9AAD7SsAVoAw1AFhOrPrwCAXgCSUA+D0GHeAPBQAvFOsvFOovFOkr
+sn+OLfg9Bh3gDDUA7xZYIOn9AADvFOsg0AcAAO8U6i92QoAA7rsIBVGBAADvFOklwOEAAOgmAAb5
+5QAA74ceBfEBAADuBgAG6cUAAO2DHgXZIQAAWE6QLhJY2iD8AWIdoA0lAPov4BXo7h0A7hZAJdjl
+AABb+PPRD+mzBnnABIAAwIFkjr9gAGR7owHAMWQ+5GAAWdog60QACeAEgAD8ASId4B7lAFv+V9EP
+AAIqAutEAAvgBIAAW/2ML3AC8f/YDpIAnQAESgJYB4QGAAAAAAD7H+BEYgCdANog60QACeAEgAD8
+ASId4B7lAFv+RtEPAABkXa75AA0tYgCdAClRNijBLvkADL1iAJ0AK8xZ+qugFaAMNQBYAv1loYEq
+UAUrClZ7oQUFWgJbMd8CKgL6gGgd4AwFAFv9LtEPAAAAAAAA+mBoHaF7JQBYBNTRDwAAAPqAaB2g
+DDUA7ERUK9gEgABYAcLopAAFG0mAANog7DQAClgEgAD44AAHMA11AFv+IfqAaB2gCwUAWAEw0Q8A
+AAD6wGgdoAtFAFgCt+SkAA0QZgAA2iDrZAAJ4ASAAPwBIh3gLpUAW/4T0Q8AAADaIOtkAAngBIAA
+/AEiHeAe5QBb/g3RD/VgGtmSAJ0A2iDrRAAJ4ASAAPwBIh3gHuUAW/4F0Q/aIPqAaB3gDAUAW/z8
+/ICwFeAPRQAvRFT8hgYd4E41AH7RBMOPKEQF+oBoHaCLdQBYAarRDwAAANog+oBoHeAMBQBb/O76
+wGgdoAsVAFv8AtpgW/uF62IIK1AEgABb+2XRDwDaIPqAaB3gDAUAW/zjimhb/MbRDwAAAAAAAPqA
+aB2gCTUA6URUKtgEgABYAOACKgLrRAALYASAAFv9ngRKAlgHEAYAAAAAANog60QACeAEgAD8AOId
+4B51AFv91dEPAAAAAPpAaB2gM5UA+oBoHeAMBQBb/Mn6gLAVoAuFACtEVCpEMCNEBdEP2iDrRAAL
+4ASAAFv8/yxwAvOAEoaSAJ0AjXPxv8Yu0BIFAB526bgY/gAKFaAZVQBtmgIIAIobeEibEv6ACBXj
++fUA+CGEHeAKFQD6JAYdoAgFAPgjZh2gDDUA/eAAF7AItQDo/wICWUUAAO8WAyDQhQAAWE3QKhwl
++onAFeAMNQBYTc3iFDkqUASAAPohABXgD4UA/ieGHeAuBQD+JwYdoAgFAP4nxh2gLCUA/CJGFaAd
+RQD8J2Yd4Ay1APgnRh2gDSUAW/gnJUQF0Q8AAAd7AlgBL+ikAAUCWYAAAioC7DQAClgEgAD44AAH
+MA11AFv9jfqAaB2gCwUAWACdBgAAAAAA2iDrRAAL4ASAAFv8vylwAvE/vm6SAJ0A2kBYBrfRDwDq
+RAAK2ASAAAERAlgAfo5HDwIADwIALuIOLeBQL+BR6OBSLu4CgAAP3QLv4FMu7gKAAAjdAupMTi7u
+AoAA/6YADvAMNQDjPAUm6AUAAP3KZh3o3R0A/cpGHejdHQD9yiYd6N0dAO3kUCnYBIAAWE2J6h0B
+KdgEgAD7TIAVoAw1AFhNhCsSWfjuKAXoux0AKxZZiEwcd+0JiAF8vA4cd+wMjAL8gYYVoAA2AAAd
+daENjQKdTNog+oBoHeAONQDuRFQrYASAAFv9ENpAWAaD0Q8A6kQACtgEgABYAEoCKgLrRAALYASA
+AFv9CARKAlgGegYAAAAAAAAAAOpEAAvYBIAAWADa6KQABQPpgADaIOw0AApYBIAA+OAABzANdQBb
+/Tn6gGgdoAsFAFgASNEPAAAAAAAA2iD6gGgd4AwFAFv8LNEP2kBYBmRj/asAAADaIPqAaB3gDAUA
+W/wmL2B9+/+1eJIAnQD6YGgdoXslAFgDy9EPAAAA2iD6gGgd4AwFAFv8HNEPKnwQ+sgAFeAMhQBY
+Ad/moFVtQASAAGqhJ+pEAArYBIAAWAAXAioC60QAC2AEgABb/NXAg+hEVCpQBIAAWAZF0Q/aIOw0
+AApYBIAA+OAABzANdQBb/Qv6gGgdoAsFAFgAGtEPAAAAANog60QACeAEgAD8AcId4B6VAFv9AdEP
+AABsEAQqLDT6Y4AV4AyFAFhNICosPPpigBXgDIUAWE0cKixc+mEAFeAMhQBYTRkqLGjoMgQh2REA
+APhDJhWgHAUAWE0T0Q8AAABsEAQWdk4oIhYlYojpiBEJUASAAOhVCAnYBIAAW+E52iBazp2KKciv
+hKvbMFu7bupEAAp/rgAAiinA0OsiCyUA2YAAZbCX+kFmFaAAIgCau5us/EEmFeAKBQCLWnK5Eoop
+iSj4oUYV4AC+AAAAAAAAAADJuIy4csEUbQgM68QABgBxgACMyHLBBGP/7AAAyLSKKYwonLidKCsg
+BeskMC0BxgAAjSvO3sTjfrFNLmJ0iyD60WgVoAwFAP9vAA2wDRUAWzLLGXWPiJ7D/+8kBSRD/QAA
+mJ7RD8SSKSQF0Q+Juw8CAA8CAGSfZG0ICumSCyzYBIAAZJ9WY//uw68qJAXRDwAAAGwQGvjrqAWu
+CQUA+CAGFeAEBQD0ICYVoBlVAOgAFQDAIQAA0w9tmgIIAIoYdgCYEvxACBWj/vUA/iGEHaAPRQD+
+JAYd4A21AOQUGy5mAoAADcwCLBYDKyAE6hwhKAQKgAD1YAQakgCdAPpKIBXgDDUAWEy0Khwl+knA
+FeAMNQBYTLETdgkoIhYjMn/Dn+kkBSxGQoAAqDMkFDkkFDrkFDsg0QEAAPpoABXgCFUA+CcGHaAM
+hQBYTKMrPEj6IIAVoAw1AFhMoIkR6xwIKVAEgAD5DgAM8Ay1APgh5hXgDSUAW/cD0Q8AAAD6SQAV
+4Aw1AFhMlCsQAi0QAe4QACDglQAALsQA7cQBKRgEgAD7gEYd4Cq1APpAph2v/f4AbBAEIjEDKjEC
+FHbf/EXgR9AIFQDyhPYNoAUVACcxAiYwQPYMAARwAgUA+K0ACTB3KQD2rQAJcGY5AAZSONEPKTBA
++gwABbACdQD7DQAJcKopAPsNAAkwmTkACYI40Q8AbBAWKAqG+GAbRCIAnQApCof4YBs8YgCdACUh
+GSwgDBd1pyQiFht1bC1ygCpyiOsAFQjABIAA7cwICiZCgADkpAgOZkKAAP1AAEUwGQUAbZoCCACK
+HnT5KqEr/0ARTCAGBQAcdLwbdLz4QAgV4O0VAC0UGJsQnBL9IAAUsAyFAAyZApkRLSAH+uiMBeHd
+AQAA3RENqgILqgKaFAjqMJgVmRn+65wF4E4FAC4VD58YLSBULRQxKyAFKxQy+kYQFaAPFQAvFDAq
+FDMpIhbpFg0g6IEAAIvUiNWK0+nSAiDxAQAAmeKa45jlK+YEKNIBKOYBLdIALeYAKyIAKxYWKiBU
+KhRdKSAFKRRgKCAwLxRc5hReIVjRAADoFGEg0aEAAFhMKioccPpHgBXgDIUAWEwmK0xy+i9AFaAM
+ZQBYTCMqHH36ScAV4Aw1AFhMH+ssXCDR/QAA+0CgFaAMhQBYTBsvEUL0BAAE8KUpAPQGAAXwxTkA
+9C4ACnDVWQDkVAIO7kKAAO3MEQ3fgoAA7LsCDVfCgAD0AAACMMVRAPsmAAywpUEA7KoRDmaCgADt
+zAIKJkKAAPQoZBXg1UkA9CYkHeCPKQDlIgwsRsKAAOhEAg7uwoAADaoC/UYADTRVmQAFRAIkFGT+
+TRAVoN9pAPxNMBWg/3EA6f8RDu6CgAD/pgAO8O4ZAP/IABcw/DkA/6YADrDsMQDu/xEPd8KAAA/u
+Av+mAA6wzCkA/YYADnA9BQANzAIsFGWILAuqAgqZAvgs5h3gWIEA+BEAAjCIkQDqRBEMRkKAAOhE
+AgquwoAA9IYACnAFhQAFRAIkFGaFJy9ZFOTxGmLQgQAAK1IJZLEP+iBoHeAMhQBbNf8oIhYlcojp
+iBEJUASAAOhVCAnYBIAAW9/52iBazV2KKcivhKvbMFu6LupEAAp/rgAAiinrIgslANmAAGWwkPpB
+ZhWgACIAmrubrPZBJhWgCgUAi1pyuQuKKYko+KFGFeAAogDJuIy4csEUbQgM68QABgBxgACMyHLB
+BGP/7AAAyLSKKYwonLiWKCsgBeskMC0BxgAAjSvO3sTjfrF9LnJ0iyD68WgVoAwFAP9vAA2wDRUA
+WzGNGXRRiJ7D/+8kBSRD/QAAmJ7RD8SSKSQF0Q+Juw8CAA8CAGSfa20ICumSCyzYBIAAZJ9dY//u
+wab6SoYdr/KGAMC0+kqGHe/yXgAAAAAAAADqJAAI2ASAAPwBAh2gDSUAWy4NY/7kw88sJAXRDwAA
+AGwQBBt06Rl07RV0Mh51Exh054QnLSIAKIKwJEIO7t0CCVAEgAD8s4YV4AxFAPizphXgDVUAC4AA
+KlKdHnUJ+B/iHeACBQDygAAG+KodAOqQH37rQoAAK0A6LEA7CLsRDLsCsbv6h2Yd6LsdACtEOtEP
+GXTIEnTDKFKmIiJ/CYgBCYgRqCKMLA7MAQ3MApws0Q8AAABsEATAcG1KEaJ4o3QkQAAogADkiQ5z
+uAUAAMAg0Q8AAAAAAAD1ARYNr/L1AMAh0Q/RDwAAbBBGKTBUxHL06RYF4AolAPUgD7CQAgUA+SAK
+cVIAnQAqMS8tMJgvMS7kdE4deDwAABh1oPsAF0KiAJ0AwJf+DAAHcAwVAP+NAAyw/ykA/40ADPDd
+OQD9ggAM8BpVAPMw4A3uCAUAkhUEAImYFO10cxDAYQAAbaoCCACKnRaKYPIlZh2gDEUA/CYGHaP7
+9QArFRT9QAAVMAu1AAuqAioWBylgBCocMQ8CAPUgE9qSAJ0A+sogFeAMNQBYSyYqHDX6ycAV4Aw1
+AFhLIyhiFiNSWcOf6WQFLEZCgACoMyIUSSIUSuIUSyHZAQAA/AECHaAKVQDqFEgg0UEAAFhLFis8
+SPoigBWgDDUAWEsSjhXrHBgrUASAAP8OAA8wDLUA/iJmFaANJQBb9XYoYhYkUlnpiBELUASAAPiA
+AEIwi6UAW9802mBazJiKacmgg6srCopbuWnqNAAJ/6YAAIppi2vKp8y4+sFmFaAAbgDRD4m7yJvp
+kgss2ASAANMPZZ/ymrubrPLBJhWgCgUAi0p2uQuKaYlo+IFGFeAAngDJtyyyCA8CAA8CAHbBDOvE
+AAYASYAAjMh2yfLItIppjGicuJJoK2AF62QwLQHuAACNa8/TxOP/YAxkIgCdAC5SRYtg+quIFaAM
+BQD/bwANsA0VAFswwxhzh4+Ow5/pZAUn+/0AAJ+O0Q8nZAXRDwAAIzBZwL76f/q8YgCdABx1Pi9g
+UC5gTy1gTipkVChgBfjGBh2gOyUA8iAGFeAKVQBYUIgoYhYkUlnpiBELUASAAPiAAEIwi6UAW97v
+2mBazFOKacmgg6srCopbuSTqNAAJ/6YAAIpp62ILJQFpgADMuPrBZhWgAG4AAACJu8ib6ZILLNgE
+gADTD2Wf8pq7m6zywSYVoAoFAItKdrkLimmJaPiBRhXgAJ4AybcssggPAgAPAgB2wQzrxAAGAEmA
+AIzIdsnyyLSKaYxonLiSaCtgBetkMC0B1gAAjWvP0MTjfrF8LlJFi2D6q4gVoAwFAP9vAA2wDRUA
+WzB+GHNCj47Dn+lkBSf7/QAAn47RDwAAJ2QF0Q8AAAD4QGgd7/RqAPrJABXgDDUAWEqILhwQLeAB
+6+ACIODVAAArxAItxAHu4AArGASAAP+ABh2gKrUA+sCmHa/2BgAAw/8vZAXRDwDDjyhkBdEPAOs8
+cCNQ0QAA+i/GFaAMhQBYSnTrPGgjUPEAAPov5hWgDIUAWEpw6zxcI1FxAAD6MAYVoAyFAFhKa+wy
+GSNRoQAA/MMmFaCbhQD6YABF8BwFAFhKZC1gDB5yY/7AsBXgBxUAJ2RUL2QwJ2IWLuKbLFJZBACJ
+7t0IC75CgADnxwgO7kKAAP2AAEZwGQUA7WEZIMH9AADtFoEkQQUAANMPbZoCCACKGHLsLMEr+YAT
+JCADhQAfcrAYcq7+wAgVoOkVACkU2CgWMu8WMC92AoAAA+4CLhYxL2AH+ORyBaH/AQAA/xEPzwII
+/wIvFjQN6jAtFjUuFjn854IFoEsFACsVbywWOCpgVCoU8SlgBSkU8vjGEBWgDBUALBTwKBTz72IW
+IPH9AADvFj0ncYUAAI3li+SK44ni6OIBIPgHAACY8ZnymvOb9J31LuIALvYALWIALRZG6mBUINgH
+AAAqtB3oYAUgyAcAAOiUICD4BwAA7mAwIOgHAADu9CEg2AcAAOK0HiDQBwAA7NQcJVChAADrEn4p
+4ASAAFhKE+sSfyDQBwAA+0YAFaAMhQBYSg7rfHIg0AcAAPtHQBWgDGUAWEoK62xOINAHAAD7R6AV
+oAw1AFhKBesSgCDQBwAA+0iAFaAMhQBYSgArEaMnEoEqEaIrFZH2CwAGcNchAPoNAAQwmnEA9i4A
+D/DnKQDvfwIPd8KAAOmZEQxGgoAA+gUABTC3UQDpiAINVsKAAPjBiBXg/wEA/6YADrDnQQDs7hEP
+/kKAAPvmAA+0mZkA6f8CANAHAAD/RIYd4Jc5APYGAAfwd0kA7ZkRC77CgADn7gIP/4KAAAn/Aulg
+aC5mQoAA52BpLd6CgAAMuwL7xgAPcJkZAP8oABSwtzkA+QYADHCXMQDuuxEMz8KAAAuZAvkGAAxw
+dykA+OYAC7A4BQAIdwInpCWMbA/uAg7dAv1E5h3gvIEA/BEABLDMkQDqmREOZkKAAOyZAg3ewoAA
+C5kCA5kCKaQmjWco2RTkgNpm0IEAAIzZ0w9kwM4rHH/7aCAV4AyFAFsz5CxRf/Of1w+SAJ0A5AAV
+AMAHAAD5CgAVoBlVAG2aAggAiu50FBNZRQAA/iqGFaAMFQD4wAgV4/31AO0VsCDQBwAA80xmHaAN
+tQDspGgszgKAAP0mAAzwDDUA6RZVJVGlAABYSZzrbE4g0AcAAPtNoBWgDDUAWEmX6x0BK1AEgADz
+cEYdoAy1APNwhh3gKQUA+XAGHeANJQD5cMYd4BgFAPlwJh2gH0UA/3BmHeAuJQDuFmQl2UEAAFvz
+8cOqKmQF0Q/aYPov4BXgDIUA+2ggFeANJQBbLAJj/yYAbBAcGHKB9uVoBewKBQD6IAYVoAsFAJsR
+KSIWJHJZCACJ6ZkRAMAhAAD4gABCcBlVAG2aAggAivokIBWgDDUA/EAIFeAGFQD2I2YdoA61APYk
+Bh2j//UA7xUMLu4CgADu3QIBKUUAAO0WAyrYBIAAWEliJhQ4IxUgLBABKRAC/CAQFeD+xQD+J4Yd
+oAolAOoUPSDYlQAALbQA+WBGHeIfNQD9YCYdoXglAPhn5g2gDIUA/mAErGIYdQD4YAY8Ihn1ACoW
+LXkxPC0SLB5zu+scCClQBIAA/6YADzAMtQD+IEYVoA0lAFvzr9EPAAD8KWYdoD8lAP5Aph3gHUUA
+9o+mHa//KgDbUPNAaB3gBIUA+iCAFaAMNQBYSTiKESlxf/Qp5h2oqh0AmhH6IkYVoJkJAPjNAAnw
+HYUA8inGHeA4RQD4QKYdr/4aAAAA21D6IIAVoAw1AFhJKI0R+ocAFejdHQDtFgEg0TEAAPwiRhXg
+DIUAWEkh/AOCHeA+VQD+QKYdr/0qANtQ+iCAFaAMNQBYSRqIEfYpxh2oiB0A+CJGFaA9RQD4ICYV
+oD81AP5Aph3v/G4AAGwQIvjkkAWgCQUAmRCJLSiCWQmZEamCiSiMKiSSGeTALmIjwQAAKgpAbQgL
+i8wLO1RotAaMyMnGY//tLcAFLcUJ+4CmHa//vgAAAAAAAAAA9oAJldIAnQCPKikWLBpx/etyXBFh
+UQAA7BYxIOjxAADtFjAg8JUAAO4WLyDAhQAAKBYuKxY46hYtINkxAADrFjIhUQEAAOoWMyDBUQAA
+6BY0IXDhAADuFjUg6fEAAO0WNiFhkQAALBY3uDz0YgAV4A4FAPxgaB3gCIUA0w9tihEm0Bii5ydw
+QLHu5nkadugFAACNNGbQoCRM8OM8ECJbL4AAYACSAAAA9uDWDa/99QDA0WTf3CYSLIZqy2v8YGgd
+4A4FACfQGKbqKqBAsd3nqQ53cAUAAHzZ6o00Y/+1AAD3QNYN7/31AMDRZN/rhmndMP7c/A3gDgUA
+7PQAB4aZgACLzN0w+pMABfAOBQD5YAXSUAiFAG2KVCbQGKznJ3A8se7mcUV26AUAAPbgF3Ov/fUA
+YALkAI8q4/QAD4BOAABgACDJPSgwBeMyCCnQBIAAaY3viawJOVRplOcrCoZb/DNlP+DAoCokfdEP
+0w+NNMDw6NgRCPAEgAD4IAYVoAs1AG26EybgAKz1JVBOsf/TD+VpFHdwBQAAKMEJKMQF/kFIFe/7
+ygAAAPag1g2v/vUAwOFk7+IqzE76IGgd4Aw1AFhIjPxgiBXv/14AjMhlzzAZccEpkX9+lwaNNGP+
+tQAAHnEzH3HsG3ISGHHmhieJICiCsIZuC5kC6xI4KVAEgAD/06YV4AxFAPnThhXgDVUAC4AAGnEm
+KqKd+w4ADTD59QB6kCUrYDosYDsIuxEMuwKxu/rHZh3oux0AK2Q6jTT+QUgV7/lGAAAAABhxGBlx
+xxZxoSiCpiZiWQmIAe1x9xxGQoAAqGaMbA3MAR1wiQ3MAuxmDCN+QYAAiTS4W+psPCzOAoAA+CAG
+FeAMhQBYSFnlbE4o2ASAAPqgaB2gDDUAWEhUKhItKBwI+gAKFaAZVQBtmgIIAIoqEi4ZcdSZEvzA
+CBXgDxUA/iQGHeAIBQD4I2Ydo/71AC4VDP2gABawDrUA7t0CA1lFAAD8IGYV4Aw1AFhIQCsSMSgS
+LylQASpQACqEACmEASoSMC9QAv8ARh3gDjUA/icGHaANBQAtFDktFDr8J2Yd4BwFAFhIMi4SMy0S
+MizgACvgASvUASzUACrgAingAynUAyrUAijgBC/gBS/UBSjUBCzgBy7gBi7UBizUBy0SNSwSNCvQ
+ACrQASrEASvEACnQAijQAyjEAynEAi/QBC7QBS7EBS/EBCvQBy3QBi3EBivEBywSNysSNirAACnA
+ASm0ASq0ACjAAi/AAy+0Ayi0Ai7ABC3ABS20BS60BCrAByzABiq0B/1gxh2gKQUA+CeGHeD49QD4
+J6Yd4A4FAP4rhh2gDxUA/i2GHaANJQDvFUQrUASAAP4xhh2gDLUA6BVCINghAABb8mTD2fzAph3v
++J4AwNFl3atj/UoAAGwQLigwVGiCAtEPAOs8cCMo0QAA+qBoHaAMhQBYR+zrPGgjIPEAAPqAaB2g
+DIUAWEfo6zxcIxFxAAD6QGgdoAyFAFhH4ys8eOkyGSNRoQAA+MMmFeAcBQBYR90ccW6KbCtgBe9w
+UhjABIAA/UAEBTA8FQD9YBusIAMVAB1xZQ2tAp1sKmAMI2RUK/J7J2IWL/KDC6oI7mEZLVZCgADq
++ggLvkKAAAf/CBdwzi4WUS8WUPYAChXgGQUAbZoCCACKGHBgKqEr+UARnCIAnQAZcCQbcCP4wAgV
+oOwVACwUGPogRhXgDIUA6RYALEYCgAAMiAKYESlgB/rfWAXhmQEAAJkRCakCC5kCmRQP6jCYGZ8V
+HnE1/iEGFaBNBQAtFQ8rYFQrFDEqYAUqFDIpYDApFDMjFDAoYhboFg0gwIEAAI+FioGLgo2D7oIE
+IMkBAACelJ2Tm5KakZ+VKIIAKJYAL2IALxYWLmBULhRdLWAFLRRgK2Aw+iwmHeAKBQDTD+oUXirY
+BIAA4xRcINGhAABYR5DbQPouABWgDIUAWEeNKxJQKhx6+25AFeAMZQBYR4kqHH36ycAV4Aw1AFhH
+heocfylYBIAA+0CgFaAMhQBYR4ApElEsEUItEUP8JiQd4EkhAPwNAAUwvHEA+C4ADHBZKQDomAIK
+r8KAAOm7EQ1WgoAA/AUABjDZWQDrqgIOZsKAAPrBiBXgiAEA9IYACnBZQQDsVREMRkKAAP0GAAw0
+u5kA+wYADHDJUQD4LIYdoLk5APgGAARwmUkA7bsRDM7CgADpVQIMR4KAAAuIAutgaC7uQoAA6WBp
+LmaCgAANzAL8pgAKsLsZAP9oABWwyTkA+0YADXC5MQDuzBEN38KAAAy7AvtGAA1wmSkA+yYADLA6
+BQAKmQIpFGWCbAhVAgVEAvQs5h2g8oEA8hEABzAikQDq7hEJFkKAAOLuAg/+woAA/8YAD3APhQAP
+7gIuFGYsYgctyRQqzCDuwgkmiJGAAGThCvogaB3gDIUAWzFkL2AF+AYiHawJBQD5/+f1IAoFAAcA
+iSoWJekWJCDB/QAA+QMgFaAZVQBtmgIIAIryyiAVoAw1APzACBXgDrUA4xSrINH9AADyNgYd4//1
+AO8VVC7uAoAA7t0CBVDJAADtFicpWASAAFhHGyMUyPov4BWiH3UA/i0EHeD5xQD4OYYd4AglAOgU
+zSVwRQAAKOAC7eABJUjZAAAtlAHolAIpWASAAP/AEBWgDDUA7pQAJVBVAABYRwgoEiXaYP7i7gWg
+DLUA8jvGHeiIHQD4JKYVoA0lAPgmxhWgPzUA72QFINn9AADuFiYl2GUAAFvxZdEPGXCNCakC+MGG
+Fe/yNgAAAOpkAAjYBIAA/AECHaANJQBbKXNj/ukAAGwQFigiFhNvZBRv8CogDCsyewQAiSMyg/tA
+AEVwGQUA5CEZLVZCgADqOggMRkKAAOgzCAjABIAA0w9tmgIIAIoYb3sqoSv5QBIMIgCdABVvPh9v
+Pv5ACBWg6BUAKBQYnxCVEv3AABcwBYUABe4CnhEvIAf43ZAFof8BAAD/EQ+vAgj/Ap8UDeownhmd
+FRxwUPwhBhWgSwUAKxUPKiBUKhQxKSAFKRQyKCAw+CZmHaAKFQAqFDAvIhbvFg0g+IEAAI71ifGL
+8ozz7fIEIMEBAACdhJyDm4KZgS6GBS/yAC+GAC4iAC4WFi0gVC0UXSwgBSwUYPpGEBXgCQUAKRRe
+KxRh6hRcKuAEgADqHGghWNEAAFhGqioccPpHgBXgDIUAWEanKzxy+i9AFaAMZQBYRqMqHH36ScAV
+4Aw1AFhGoOssXCDR/QAA+0CgFaAMhQBYRpsqEUL0BAAHsGQxAPQFAAawNEEA9AoAA7CUWQD+KGQV
+oIRJAP4mJB2htB0A+oYADfDEOQDtzBEMRsKAAOmZEQu+goAA6XcCCZ8CgADoMwIO78KAAO3/Ags3
+goAADGYC/EGIFaC7AQD9aAAVsNopAOczAg7uwoAA/WYADfTMmQAMuwIrFGT6TRAV4JppAPZNMBXg
+qnEA6pkRDVZCgAD7JgAMsLsZAPYGAAVwxzkA7swRDVfCgADsqgIN30KAAAuZAvsmAAywdykA+OYA
+C/A4BQAIdwInFGWOLAYzAgP/Av4s5h3g3oEA/hEABjDukQDqzBEPdkKAAO7MAg7uwoAADcwCBcwC
+LBRmiScrmRQqnCDskgklgKmAAMjN+iBoHeAMhQBbMIHRDwAA6iQACNgEgAD8AQIdoA0lAFsoz9EP
+AAAAbBAciScnMQsomRSGmeSAr2O7EQAAKmwZ+megFeAMNQBYRkIqbB36aCAV4Aw1AFhGPy4wPIou
+GHCf/9ugFaALFQDuvjkNNkKAAPlALIwiAJ0AGG6tiS0ogoPscKYczkKAAKmKqGYtYAWPp4tniqj/
+4cgV4BgVAOuyDibrPQAAeNsxGHCdCNgKiIAKgAArFi0qFiz1wDGQkgCdACnwPirwPwiZEQqZArGZ
++efmHeiZHQAp9D7aIFspodEPAAAAAAAA//1EDaAGBQAAAGXkFikwVPUgOriSAJ0AaZLXwafqZFQr
+UASAAFv/ImP/x2XkEykwVPUgJ4CSAJ0AaZK2YATzZeQdKTBU9SA3OJIAnQBpkqLAxSxkVCswWPVg
+QfQQCRUA/gAiHaANBQAJ7Thk0GErMhkrZRkbb8qIbCowWg8CAPsABARwqjkA627YHVOCgAAKiAIo
+ZgwqMFr7AAQEcKoxAOtwXR1TwoAACogCKGYMKjBaL2AFC4gB+gUABTA71QDrZAUtVAKAAAqIAihm
+DC9kMPwAIh3gDAUACdw4ZM8UJGEZK2AMI2IWHG3hGm5XHm7jLMKbKqKD7gAVAMBBAADsuwgJnkKA
+AOOjCA3eQoAA+0AARXAZBQBtmgIIAIodbnAqoSv9X/ZsYgCdABxuNB1uMvrACBXg7hUALhQo/CDG
+FeAFhQDsFgQt3gKAAAW7ApsVLGAH/Nt4BeHMAQAAzBEMrAINzAKcGAnqMJkZmx0Yb0T4IYYVoEoF
+ACoVFy9gVC8UQS5gBS4UQvzGEBXgDxUALxRALRRDLGIW7BYRIODBAACLxYrEicOIwu7CASDpQQAA
+ntGY0inWAyrWBCvWBSzCACzWACtiACsWGipgVCoUbSlgBSkUcPjGEBWgDgUA7xRsKuAEgADuFG4j
+WNEAAOgUcSDR4QAAWEWd62w8INH9AAD7QCAVoAyFAFhFmOs8ciDR/QAA+0FgFaAMZQBYRZTrbE4g
+0f0AAPtBwBWgDDUAWEWP62xcINH9AAD7QqAVoAyFAFhFivwpRBWgtEEA9AQAA7CEKQD+KWQVoJQ5
+APQuAA6wpFkA7U0CDVZCgADuFTksz0KAAO5iDCxHwoAA+OYAC7DdAQD9qAAWsIQxAP8QABQw/CkA
++QYADHCUUQD9+AAXtO6ZAO/dAgzOgoAA+yYADLCkSQDu3QINpwKAAO0UdC1WwoAA+oYACjCsaQD6
+zRAV4MxxAAnMEelEAg1WgoAA+M0wFeC7GQDsqgIN30KAAAuqAvgGAAXwyTkA77sRDmeCgAAMuwL7
+RgANcJkpAPsmAAywOgUACpkCKRR1g2wIRAIEdAL0LuYdoPOBAPIRAAdwM5EA6u4RCZ5CgADj7gIP
+/sKAAA/uAgXuAi4UdolnLZkU5NULZKCBAACKmWSlAdpA+iIAFeAMhQBbL29j/IRl4Q4pMFT1IBdQ
+kgCdAPk/45lSAJ0AYALz+cAIqNIAnQAqMS79QB8UIgCdABtvqPtf4pViAJ0A+sBoHaF7JQBb+7Fj
+/D/5wAhI0gCdACoxLv1AHhwiAJ0AHG+d/V/hNSIAnQD6wGgdohs1AFv7pmP8E/nAB+jSAJ0AKjEu
+/UAdJCIAnQAdb5L9X9/VYgCdAPrAaB2iG/UAW/ubY/vnZeDxKTBU9SAT8JIAnQD5P96xUgCdAGAC
+hy7wPijwPwjuEQjuArHu/+fmHajuHQD/58Ydr+7WACjwPinwPwiIEQmIArGI+efmHaiIHQD558Yd
+r+5eACnwPirwPwiZEQqZArGZ+efmHeiZHQD558Yd7+3mAAAAKvA+K/A/CKoRC6oCsar75+YdqKod
+APvnxh2v7WYAAAAr8D4s8D8IuxEMuwKxu/vn5h3oux0A++fGHe/s5gAAACzwPi3wPwjMEQ3MArHM
+/efmHajMHQD958Ydr+xmAAAALfA+LvA/CN0RDt0Csd395+Yd6N0dAP3nxh3v6+YAAAAu8D4o8D8I
+7hEI7gKx7v/n5h2o7h0A/+fGHa/rZgDaIFsoVtEPL7BwDwIADwIAsf8vtHAtMhsI3RH5IBMpUByF
+AMCg///iHaAPhQBt+hGmpKOvL/BkJEA070kMdVAFAADwAFANoAoFAO9DBn9QBIAAwKFkr+pgAG/A
+iG2KEaako68v8FwkQDzvSUV1UAUAAO0WACjQBIAA+ABiHaANBQDTD22KEyOgAKbfL/BOsd3TD+85
+LHVQBQAAKWAF+MYGHeA41QD4wKYdr+iyAAAAAAAA70MGf1AEgADAocyqY/+vAHPzAcDhZO/PLGRU
++ggCHaCLZQDqZAUrUASAAFv4KmP58QAAAAAAAADrPEUg0f0AAPtEIBWgDDUAWESULxIoKBIs/wMI
+Faj/HQAvFigtghkcbiP9wABFcCvVAPegAEbwL+UA7YYZJwu5gAAYbId9i3MpEij9P80MogCdAGP5
+lAAAAAAqsFwssF0IqhEMqgKxqvtrph2oqh0AKrRc2iDrNAAKYASAAO1UAAtwBIAAW/kiY/lfLLBc
+LbBdCMwRDcwCscz9a6YdqMwdACy0XNog6zQACmAEgADtVAALcASAAFv8d2P5Li0wOCgwOdMP6TA6
+Lu4CgAAI3QLoMDsu7gKAAAndAgjdEQjdAvugDGRiAJ0A/6AMJGIAnQAvEiguFisqFirs/F9x2VEA
+ANxwWERY2iDrEisqYASAAO1UAAtwBIAAW/tBKRIswID5IyYVr+MeACqwXiywXwiqEQyqArGq+2vm
+HaiqHQAqtF71P8gZEgCdAPrGEBXgDGUALGRU+sCmHe/l+gDccFhEQdEPLbBxsd39biYd7+H+AC6w
+crHu/25GHa/hygAvsHKx//9uRh3v4ZYAKLBysYj5bkYdr+FiAAAAACxkVPrAaB2gSQUA+MCmHeCL
+ZQBb97tj+DcAAC0SKP2/waSiAJ0ALTA4KDA56TA6Lu4CgAAI3QLoMDsu7gKAAAndAgjdEQjdAi0W
+KXvRB/+/v/1iAJ0AGG6RKTEuLhYrKhYq+T/3BSIAnQDaIOxEAAHZUQAA7VQAC3AEgABb+wIcbaYq
+EiotMDgoMDkuEivpMDou7gKAAAjdAugwOy7uAoAA+aYADvAr1QD9oAAWsC/lAPmmAA6/+kYAAAAA
+AADrHBArUASAAPwBAh2gDSUAWyaBY/d8AAAfbm8rMS5/sUYYbm4uFisqFip4sVoqEizAkPlDJhXv
+3XYAKjBa81+9/hIAnQDzX72+UgCdAPFfvX6SAJ0ACgxD/Z/gFaALBQD9YgAMv95yACgSLS+Aci4S
+LLH//w5GHeANBQD9wyYV79xSAAAAAAAA7HQAAdlRAABYQ94ZbXIoEijTD/kft8ziAJ0A2iDrEisq
+YASAAO1UAAtwBIAAW/rEY/9xAAAAAABsEAYrIAeIJwsLQeSBK2RggQAALYkU6oIJJokBgADxUYAN
+4B8lACiiAC6gMAiIVygWAv/AFqRj/fUAKaEI/SAXPGBOtQAoIAX1QGgd4EnVAPnBjg2gT6UA/wAG
+8eIAnQD5AAa0YD0FAIoSLvrADs4B7aEefbAEgAAowQUMShGqOq6O7uxALSgEgAD/QBaSogCdACgx
+C4da6WxpFEMRAADodzYNxwKAAPVgESoSAJ0AqYjqgp4j4N0AAAxMFLTM/UAVM6IAnQAmgp3vbAIb
+A54AAIoi6xYAJROZgACLEsPAfLlXiCcVbgUtiRQlUn/k0k9kUIEAAIiJhoH24AADMAsFAOxUAAto
+BIAAWym5iifbMOqsICpgBIAAWy27jCCLJwjMEQxMAuymASXQgQAA61QAC2AEgABbLbTRD9EPAAAA
+AOpsehPo3QAA/gAIHeTdHQD8ICYV7/7FAO7RFHP4YQAA6dwEK0AEgADTD22ZAggCYSggB/wgKBWg
+mBEA7mwyHMqCgAAKmQKZYC0iACoSAi9mA+5mAi7uAoAADcwC/MAmFaA7BQB7oRoqIgf6gGgd4AwF
+AOqsICpoBIAAWymNKCAH1aArIQgIDEHtbdEeZAKAAP1mAA2wDAUAnGUNuwKbZAUEiQYgi51ml2cs
+IAwqbCjnZgcuZAKAAOy7AgvgBIAA62YEIdlRAABYQ1EqXBn6Z6AV4Aw1AFhDTeRsRBHZBQAA+qOg
+FaAMNQBYQ0gba8CKUYgRJ1UL/EDkFeeqAQCaUS4gB+whCCxPAoAA+MAARPrdAQD/oAAWsK4RAPVQ
+ABUx7gEA6t0CD3wCgAAPzAIaa/ULzAIE3QKdkI0gnJSblvsgRhWgPwUA/yBmFeAKBQD7IKYVoA9F
+AOqWBy7uAoAAD90C7ZYBJPiBAAAFIIYPAmMFAIYPAmEda+EM7BHtzAgEWBEAAOvGnSlQBIAAWyak
+0Q8ca82KyPdABLiSAJ0AGWvXDGgRqYjugp4j+N0AAA9PFLT//8AE4+IAnQAmgp1kYJOwrf2BBhXv
+9w4AE2xpKCIeIzJ/CYgR6DMICVAEgABbJo/aMFsmjtEP6iQACdgEgADsRAAK6ASAAFv8udEPAAAA
+//bMDaAIBQAAACu8GOokAAlgBIAAWzHFY/1/AAAAAAD5TwAKv/S6AP/1dA2gBgUA+iAGFeAKBQBY
+RZ0ca6KKyIsQ+V/6uJIAnQD/9OwNoAYFAMBgwNoNrTT9gQYV7/SyAAAAAGwQBBprpx9r3y4hBygg
+BxxrXvxBBBXq7gEA+CAAA7CIEQDqiBAPdwKAAOjuAgu0AoAABt0CDN0CD+4CnkCGIJ1E/IDGFaAL
+BQCbRfqA5hXgOQUA+oBGFaAIRQDpRgMrNgKAAAhmAuZGASIQgQAAAyCGAgJjAwCGAgJhEmshDH8R
+ov+V8NEPAABsEAYabCCLLSqifwm7EauqKqIKZKAVK6xg+iBoHaAMRQBYQr/6IAgVoAAmABpqy5oQ
+/NXyBaPrhQALqywDuygMuyjrFgApUASAAFrESYsQHGqz7Ww3GVAEgABaxGXaIFrESNEPbBAQGmtK
+G2wGLDEnjS4psn8oIAfvMSYu7kKAAK2Z+4HmDaGIAQAuITf9wCLdIgCdACYhNvfgIoUiAJ0Ajidk
+4O4q6RSYH+XiCSUiwYAAmR7lFhMpUASAAFrELCghCPxAsBWgDrUA9CImFaP/9QD/DwAP8F1lAP2A
+I+RgBHUAD+Q5+iHoFaP39QDqFhIioRmAAIlQ0w8PAgD3ACOkZ5nBAPVAIKISAJ0A6mtBHUcCgACq
+iC2CnvWgKvuiAJ0AKIKdIxYQ04DlbKcZg34AAIoi6RYVJShxgABollWOJyvpFCNSveS0umdQgQAA
+hennVAACgSGAACVSAfTgAALwCwUA7DQACugEgABbKJaKJ+qsICm4BIAAKxIQLBIRWyyXjCArEhEI
+zBEMuwLrpgEroIYAANEPAAAAAAAA9SAkUxIAnQAdasHTD+0ABQnABIAAbUkCCAJhGWyKLCBBHmuR
+JyEHDM8J6GsVH/8CgAD/wABHencBAO7ifyu/AoAACHcCLyEi/kgAAzbeAQD8wAATMO45APemAA69
+bx0A5e4RCzUCgAAG7gIWbLvu3QIOZAKAAA3MAu1scR/9AoAA9+YAD7AGBQCWFJcwDcwCF2r7jiAm
+NQqZN/xghhWgSoUA+mFkHaBbhQDvNgYh0IEAAPpgZhXgD3UA5zYCL3YCgADv7gIBWSEAAP5gJhWg
+DMUAWEIswID81uQFoAkFAPhnRh3gBgUA9mcGHaAq5QD6Z2YdoIuVAOs0LCHQ8QAA7DQtIVlxAAD4
+ZyYdoByFAFhCHR1skv5pEBWgBgUAJjRE5jUlIdEVAAD2YoYVr49FAO80PCdwBQAA7jRIINhBAAD8
+IIYV4Aw1AFhCDvrVVAXgCQUAKTRULCBoLDRVLiE2LjUsLyE3+mXkHeBKJQAqNGQpNS4vNS0nIAXF
+hvjgF4wiAJ0AxdAtJAUoIQguOv//ABX0IgCdACYSExlq8R9qci4gByshB/ZACBXgDEUA/gIABTHu
+AQD5wAAWursBAO2NAg3HAoAA790CC94CgADsvAINUoKAAPsGAAwwOgUA+QYADHCZBQDpOQgLA6YA
+ABZsXPYgxhWgBiUABrYClheGHitiH5sZJmIelx32IQYVoAslAPolZh3gBgUA9iGGFaALBQArNiEr
+NiMsNh0qNh8tNiAvNiIoNhwYapHoNh4gwGEAAAgghgkCYwgAhgkCYRlqiQzoEamI9ROmFaAB8gAq
+EhMiFheGoRJr+QYGRwJmApahLDYdLTYgLzYi+GOGFaACBQAiNiEiNiMWan32Y8YVoDIFACI2H+IS
+Fy1ABIAACGCGCQJnCECGCQJlG2py6RITL1cCgACrqiSmnYmQ+PgABPA3JQD3IAp0YgCdAMPF/SAK
+JCIAnQAtOv8tJQguIAUZawL+CsId78sFAP/ADpxgDAUAjScq3CALqgHrIg4lUQEAAJrYmtkpkn+K
+LIgr7NUULd5CgADrmQgNAGYAAPkhJhWgABoAmKvxAGAN4AwFAJqMnCuIm+wmDCQAQYAAkoyYK5Kb
++kBoHaALNQBb/sbRDwDakOs0AApgBIAA/KBoHeCOVQBYAV/RDwAAAMBQ+CHGFe/uogAAAAAA/++w
+DaAJBQAVai+OWCkWFffACviSAJ0AKBISGmo4DIgRqogtgp71oAtjogCdACiCnWSBY+MWECdT/QAA
+mljzAGgd7+9OAIweLcAF/YYGHeBLNQD7gKYd7+3eAAAAAAAA+T/cY1IAnQCPJ//kABWvxgUA98AE
+BzAJBQDp9RQncQEAAJ75/+EGFa/togCKJ9tw6qwgKuAEgABbK4vRDyshFCMhEsBA6xYUJfWhgADq
+UkIp2ASAAPwAAh2gDRUAWyc9JlJDLBIU5EwBIZgFAAAGMy58Sdhj/oUAKBISGWoIDIgRqYj1E6YV
+r/nyAAAAAAAA/+0gDaAFBQAca72NIPhBBBXgClUA+CAGFeA7JQBYRwFj/PwAAACKJy0SEcDA6qwg
+LtgEgABbJ2L6ImYVr+2SAACLH9og67wYKWAEgABbL/spEhVj+uAAABxrqo0g/kbEFaAKVQD+RuQV
+4DslAFhG7dogWySu0Q8AwIDyIgYV7+qWAADAoFhDzo5YKRIV+d/0uJIAnQDAgPIiBhXv+s4AAAAA
+AAAAAMCA8iIGFeAMpQAM7DT8oQYVr/peAABsEAYXanCMLSdyf+hrdx5mQoAArHyMx/pByBWgT7UA
++meQFeBGpQD9gcgVoE6FAPlHJg2gjRUACaoRqnqHp4d+fbFlLSAF/6AJFCIAnQB98hV20hItCoT9
+YA/kYI5VAP9gCQwiAJ0A0Q8AAAD9YAzMYgCdAC0gBf+gFvQiAJ0A/eAMI2IAnQD3oAvjIgCdAC8K
+hP9gDgxiAJ0AKAqF+WAVXCIAnQDRDwAAKcBgK8Bh7cBiLM4CgAALmQLrwGMszgKAAA2ZAgiZEQuZ
+ArGZ+YxmHeiZHQD5jEYd6JkdAPmMJh3omR0A6cRgJQIhgAArcDwscD3tcD4t3gKAAAy7AuxwPy3e
+AoAADbsCCLsRDLsCK7wB+ufmHei7HQD658Yd6LsdAPrnph3oux0AK3Q8K6AFxMD7gc4N4E4lAMPe
+/X/5OeIAnQD/f/j8IFgFAC8gBfngDwwiAJ0A6iQACdgEgADsRAAK6ASAAFv+D9EPKcBssZnpxGwl
+d5GAACpwc7GqKnRz0Q8AK8BtsbvrxG0lAhmAACxwdC1wde5wdi5mAoAADcwC7XB3LmYCgAAOzAII
+zBENzAKxzPzu5h2ozB0A/O7GHajMHQD87qYdqMwdACx0dMRt5GkKGVAEgABawjXmJAUq6ASAAOhC
+TylQBIAA+GTkFeALBQD4RuQd4AwFAAuAANogWyQb0Q/RDyvAYC3AYe7AYi3eAoAADbsC7cBjLd4C
+gAAOuwIIuxENuwL7YCAV4AoFAPuMZh3oux0A+4xGHei7HQD7jCYd6LsdAPuMBh3v+3oAAAAAAMRN
+5mjoGVAEgABawhPkJAUq6ASAAOhiTylQBIAA+GTkFeALBQD4RuQd4AwFAAuAACowVNMP9UAGpxIA
+nQAaacyLLIwuKqJ/6SILLmZCgADsqggNgGYAAPlBJhXgABoAmbvIkJucwLCbK4mr6yYMJIBBgACS
+nJkrkqsaab2LLQ8CACqifwm7EauqKqIKZKAVK6xg+iBoHaAMRQBYQFv6IAgVoAAmABpoZ5oQHGiV
+KzroC6ssDLso6xYAKVAEgABaweaLEBxoUO1p1BlQBIAAWsIC2iBaweXRDwAAAAAA6zQACmAEgAD8
+oGgd4I5FAFgAHdEPAAAALcBtsd39jaYd7/nuAC7AbLHuLsRs0Q8ALzEuZf8pKDEvZY8jKiBoKTBV
+sar7P/jFIgCdANogWyO70Q8AbBAEwHBtShGieKN0JEAAKIAA5IkOc7gFAADAINEPAAAAAAAA9QEW
+Da/y9QDAIdEP0Q8AAGwQCBppYR5o4y0gB5cU5Wl+GsgEgAD6SrAV4A8FAOciFipgBIAA9K/oFeHd
+AQDruwkOxwKAAO6ICA3fAoAA+0AARXAEZQDrISIrvkKAAPagAELwDnUA/iAGFeCHRQDnZwwKeASA
+AAfvOC6Cnp0SKqJ//8AQo+IAnQAngp0vCgH4EIIdoA51AOhoDAOP8YAA/NDOBeAMBQAI/DgM5Dnt
+AAULwASAAG1JAggCYRhovS8hB/pIAAa2mgEA/aAAFrCqOQD9JgAM/dsdAOWqEQ7tAoAA/UYADXr/
+AQDqmQIP/wKAAAj/Ap9wLiIAHWisLXYC7WojH3YCgADuTgIN1QKAAP7gJhWgX4UA/UYADXBeBQD9
+7QAPME+FAP7gZhWgTgUADP45+K+QFaANBQAtdQoqdgbsag0cRAKAAAmIAhlqCS51C+x2ByLZyQAA
+6YgCA9CBAAD44IYVoAxlAFg/0itcbPrkwBWgDGUAWD/PJnQ8/tIoBaAJBQD46IYd4AgFAPjnRh2g
+CgUAKnQ5/uWmHaCPlQD+5YYd4CXlAPTnZh3gCwUAK3Q4FWhcKzEmKjEnLTBALDBJLHRJLXRAKnUn
+KDEnK3UmKXRI9QAFxGANBQAqfEH6SiAV4Aw1AFg/syssTvrnoBWgDDUAWD+vH2fwKDBFjRAeaicA
+iDII/Tvu3QID0RUAAOjdEQjYBIAA/CAGFeAMNQBYP6T4EIId4AuVAPjFJg3gDgUAK3RV/urmHaBM
+JQD864YdoA01AC10VooSG2hWDKoRq6okpp3RD8Cg+uqGHa/89QAsdFUrMSYrdSwpMScldS8qdS74
+5aQd4EglACh0ZI8SGGhIDP8RqP8k9p3RDwD85OQd7/0iAACOIpwRmRPllAAHAmmAAPzT/AWgClUA
+/mTEFaA7JQDvMScq6ASAAFhFPwUPR2jyAdEPiieLESmpFCihFQy7EauZ6YPrdVCBAADsEgEp2ASA
+AFspodEPAADr3BgsqASAAOokAAlgBIAAWy40Y/+gAABsEAYbab0CLAkMzBGsuyuyf2Sw7fAALA2r
+4wEAAACLuWSw3iixGQgIS3jp8Ya6ZG/s+gACHaAJZQBtmhGkraasLMBsLdAA7NkOdVAFAADAoPAA
+VA2gDWUA/YDWDe/69QDAoWWgb2P/5QBt2hGkraasLMByLdAG7NlOdVAFAACCatMPZCBw40whI3HJ
+AADuFgAiaBkAAO0WASI4dQAA2zD6ScAVoAw1AFv/C8yt23D6SiAVoAw1AFv/B8qngihlL9xgADIA
+AAAAAP2A1g3v+vUAwKFkr6iGacCg/tXMDeAJZQBj/zmKEPogKBXgDGUAW/75Za/G1iDJZi9gBGj0
+HcAg0Q/AYPagBhWgAgUA0Q8AAPagBhWgAgUA0Q8AAIJpyiv6AAIdoAg1ANMPbYoRpKyiqyuwXSzA
+IevJHXVQBQAALSE2LEEWfcEfgitlL9KWUNEPAAAAAAAAAP1g1g2v+vUAwKFlr+Jj/9aSUNEPbBAO
++s4eBeAKBQCaEIk0FGft6LKhIZC5AAD7f4AV45mBAPUgJBJSAJ0AJEKAqJgJiBGoRIRHq5srsICE
+TvFgIz+SAJ0AJU0BKFGCZIRZ+mTAFeJaJQD6gABFMAxlAFg++B9pcywagKxM7vACINgRAAAutAL/
+4AQV4AkFAP9gBB3gDTUA71GgLlAEgABk0Utm0Uht2hcNATANADEt3C4t3QENATEAAgANAjAt3AEt
+sAAuoNLqrAEl2AUAAP+gCNQiAJ0A6cTnJ6H5gAApMQvBjfkAHqLiAJ0A9CCmFeAJBQD4IcYV4AgF
+APgiJhWgCgUA+iHmFaALBQD6ISYV4pxVAPyAAEYynRUA/IAARvKOdQD+gABHMm/1AK9Pnx2eFp0Y
+nBv6kIgVomuFAPqAAEXyeJUA+IAARDJ5dQCpSZkXKBYK+iGGFeKLJQD6gABF8AYFAOsWECVQBQAA
++pCGFaAHBQC4GvpAaB3gDCUAWD61JREE/GFkFajVAQD3oABDNlVJAOZsAi7wBIAA/qBoHe9mAQD8
+wBi6ogCdAOBQBAKgP4AABwgb8wAdR9IAnQD34A2ikgCdAGv2LJ4T9aAXf9IAnQD6IggVoAyVAOzc
+NAFYCQAAWD6bjhNgAgLTD//7kA2gCRUAAPfgCOQQCoUA/0aODeB49QD9QBWi4K91AJ4T/eAVU+IA
+nQD6IWgVoAzFAOzcNAFYCQAAWD6KjhNgAb0AAAAAAAD54A09IgCdAPegE+JSAJ0A/iBmFaH59QD9
+IBNj4gCdANoQ+kBAFeAMRQBYPnyNEBpo+P4gaBWo/R0A++1GDafdAQAYaPT54At9IgCdAMCY/SAL
+KuIAnQDArP1ACtviAJ0Ajh4YaOzsEgMhWBkAAJsZ6EaCJ3gFAAD9n4AVp+8BAP4hxhWnzAEA7BYE
+KlAEgABb3jIpQonuEgMkyAUAAPiRJhXgBFoAAAD5oBIBUgCdAB9o2CwSEe9GgiFQGQAA6hYJJ1vx
+AAD9gCAV57sBAPoghhXnzQEA/CImFaADegAAAGr3LPngBiQSAJ0AnhP5oAy6UgCdAPohCBWgDEUA
+7Nw0AVgJAABYPkWOE2AAqgAAAPngBLtSAJ0AnhP1oAtX0gCdAPogyBWgDKUA7Nw0AVgJAABYPjqO
+E2AAfQAAAAAAAPfgBwESAJ0Aa/M0ZNE5nhP1oAmn0gCdAPohqBWgDIUA7Nw0AVgJAABYPiz+IGgV
+oAhFAAh3AvAA+A2ndwEAAABq9CRr9SSeE/WgB+fSAJ0A+iFIFaAMlQDs3DQBWAkAAFg+Ho4TYAAP
+aPM8LUKH0w8PAgCx3S1Gh+oSESd4CQAA7yIICAQKgAD0oAUKUgCdAABQBAcIG/MABMfSAJ0AYACm
+AAAAAAAAAO4WAygECoAA+aAEoVIAnQD6IOgVoAwlAOzcNAFYCQAAmx9YPgT+IGgVoAiFAAh3Av/+
+cA2ndwEAAAAAAGrxM2vygGTQWu4WAyb5X4AA+iGIFaAMdQDs3DQBWAkAAFg99f4gaBWgCCUACHcC
+//2EDad3AQBl/0zO1sCBCHcC//08Dad3AQDAnnl5FfVABLFSAJ0AZVy/jR/K3WAAGNEPAAAsQoUr
+QoaxzOxGhSXYBQAAK0aG0Q/7oGgd4lrFAPqAAEUwDCUAWD3bix7sEhEt/nYAAGnBxo0ZZN/BjhUu
+4a5k77kESgLsEgQu2ASAAFvcYC9CibH/L0aJ0Q8oQoOxiChGg9EPK0KHKkKFKUKGsbvrRoclUAUA
+AOpGhSTIBQAAKUaG0Q8uQo0tQoUsQoax7u5GjSboBQAA7UaFJmAFAAAsRobRDylCiChChS9ChrGZ
+6UaIJEAFAADoRoUn+AUAAC9GhtEPbBAO5DIEKngEgADWIPLN0gWjRIEABEQJDEQRpCIkIn/uMQsi
+BlGAAJ4clhsaZuH4y1AF4YgFAKgoKICAKZKblRoqolnpiAgKWASAAO8WCSxGQoAA+UAARTAMFQBY
+L6UsMDMrMDEpMDAvMDcuMDYlMDTmMDUtaASAAOqgBy92AoAA7+4CCq4CgAAGVQLmIoMszgKAAPsm
+AAzxqgEA7zEKIdjhAADntAADAkGAAIhniI6YH2iRJv0oYAFQDuUAaJN9aZQqacInymSbGO0WBSHI
+6QAA+CHGFeAD2gAAAPWAIIiSAJ0Amxj1gAs5EgCdANEPwID4IeYVr/7yAAAAaMHuacLrG2arK7F/
+8WAMX1IAnQAuMDjAyH7C1Wrn0vXAIbuSAJ0Ajh8t4Rex3S3lF4objBntEgop2ASAAFvjrtEPaMGs
+acKpZF+m8gKCHeAEBQD6IQYV4ANmAAAAKnABB6cKBKQIdUtiK3AAf7ntLnACKHADLGEZCO4RCO4C
+/WAABjvuAQB86dMoGoCoKCiAewOIEQjoAihlGYgUL4EP2mDsEgkp2ASAAO0SCif4BQAA/wHkHeAO
+BQBb4jEpcAEHlwqklPSUNg3gD+UAhmnLaIoVKqAW6mQWI1kBAAD6IcgVoAxlAFvjd/9eDA3gD+UA
+iWf2IQgV4AQFAOmSDiL+cYAA+CCGFe/9jgDRDwAAAAD7X/b1YgCdABxlONMPDDMBLXABB9cKpNT0
+gBnq4gCdACpwAGiiO/1awIJQC7UAJiKDxu/uMwEDdVmAALR//iAGFeAEHgCINggoUWSCqurUAArg
+BIAA7eQAD/AEgABb5hzRDyYig8eb6TMBA3O5gACyepodih36yAAV4AxlAFvjTWSvjIZpZW/qY/5W
+GGUOizMSZkUogowiIlmriAmIEagijycr+RRksmeL+YewFWXC92BoHaALpQD1QBLqF3fBAAyqEaWq
+KKKe/wAbq6IAnQApop3VkPCoTA3gOgUAiyJks0H6/+/tIgCdAIknFWdhLJkUJVJ/5MMgZNCBAACL
+mYax/KBoHadmAQD8wGgd4AsFAFsjFYon2zDsEgklUIEAAFsnGI0gjBmLJwjdEQ3MAuymASXQgQAA
+61QAC2AEgABbJxDRD4ZpZG2ZihD6yQAV4AxlAFvjGGWv6mP+tAAuIAcfZdAOLEDtFgUuYoKAAA/M
+ApxQjyAZZZL4oEYV4IjFAOhWAy/+AoAAC/8Cn1F6cRiKJ40ZwMDqrCAu2ASAAFsi8u4gBy0wBIAA
+G2c3LSEI/iAABzAMBQDsVgUvdAKAAA7dAgvdAi1WBAYEieUgFwLQoQAA+qDGFeB8RQDsVgch2VEA
+AFg8uBdl74gtJ3JZ/QgAFDAMZQD44ABDsMulAOcWByO5sQAA6zsIC9AEgABYPK2KF/pnoBXgDDUA
+6xYGJVEhAABYPKiKFxtk5Rxkdh1mOFq+WIoXWr47ixb6wyAVoAw1AFg8oCs8QfrDoBWgDDUAWDyc
+jmH6wGgd4AMFAPpAaB2grAUA/KAARjfuAQD+wCYVoA3lAFv5qR5mDh1l/hpl9B9l+w1NApOvk66T
+rZOsk6uTqpOpk6iTp5Omk6WTpJOjk6KToeOmACvYBIAA/9AEHeAIRQD5x+YVoAxlAO3mPiVQKQAA
+WDx/GGXjihUogpEbZeD8AIIdoA1VAAuAANogWx/80Q+KHymgOLGZKaQ40Q8AAAAAAAAA6tQACuAE
+gADuEgwvaASAAFvmDdEPAAAA//ZYDaALBQAcZRmPyCoWEPfgCSCSAJ0ADKoRpaooop7/AAnzogCd
+ACminWSRNbD+nsj1IGgd7/Y6AIgfL4EVsf//AqQd7+8yAGU7hfYhCBXgBAUA8ABgDaALtQCDOc85
+KXABB5cKpJT0gARS4Au1ACpwAHup6WRrWIlq45QABP8JgADpFgEj6CUAAO0WAyPgMQAA7BYCI5AJ
+AADaIPptgBXgDGUAW+J/Za+wihP6aQAV4Aw1AFvie2WvoIoS+mgAFeAMZQBb4ndlr5COEXPhVy/g
+BcKMePmH+mBoHaALFQBb6iLaMFvppfpgaB2gWxUAW+IiY/9piWeJniiRELGIKJUQ0Q8AAAAA//OI
+DaALBQAAAADaIPxAaB2gG8UAWyrt//K0DaA6BQDaYFvq3WP/L//yOA2gCQUA/CCmFeAKBQBYPsUc
+ZMqPyI0V+iIIFaAO5QD5//YQkAulAP/7UA2gCQUAwJAL+jT7gQYVr/seAABsEAQTZa4qMn9bHlPU
+oOghCG0oBIAA0qDRDyoyf1seTupJMn0QBIAAYABMAAAAAADqMn8q2ASAAPwAAh2gDRUAWyHq6jJ/
+KSgEgABbHkPqQSZ9EASAALFYeCnU6jKAKtgEgAD8ACIdoA0FAFsh4NJQ0Q8AAAAAAADqMn8q2ASA
+APwAAh2gDRUAWyHYxyTRDwBsEAT0zNYFoAMVAAQkCyRCoShBAyRBAviPAAowAgUABDI40Q9sEAgu
+IQiMJyUgBxNmC/mCghWgP0UA9H/iHaAHBQD6d6gV4VUBAOSCamZQgQAAhsmWEvXAIAwiAJ0AjmD6
+IAYV507BAP6AFiRnjgEA/wAV5GAJBQD4ICYV4ApFAOoWAyv4BIAA6FRYasAEgAAZZIXtEgMqxwKA
+AKmILIKes939gB5T4gCdAC6CnWXgaWhNCRpjxIsSCkoCmrDI/YonixD7RAAVoAwlAFspaosiZbHf
+2iDsJAAC2GEAAFsqfcAg0Q8bZGKMuJUU94AcSJIAnQAZZGzuEgMsRwKAAKmILYKes+7/oBybogCd
+AC6CnWTjirDKmrhk75UdZAiLEx9mJ/wACB3v/NUA/WJGDaAdhQDpvAMvQASAAG2ZAggCYRxmHioh
+B4kSG2Ra+Mw0BaqqAQDlkQgtVwKAAAurApvgiyCX6Zfol+af5Zjn/cBmFeAINQDsvAIN3gKAAAi4
+ApzkmOEYZEqY4oyRwPTvvwIKrgKAAPhBBBWnzAEADFUClZGFE4kR9IANxpIAnQAsIAezVfTH8AWh
+3AEA+aAAFbDMEQDriwIOYoKAAOS7AgdBQQAA5GRvHIK+AACf7SfmESfmEyvmEBlkMRtj65nu+8JG
+FeA5BQCZ74sSDKkCBJkC+cGGFeA2JQALIIYIAmMLAIYIAmEZZCTkEgIuxwKAAKmIJYadhEDwAVwN
+p0TBAClgFPE0YA3gNiUAJ+YTJ+YRn+0r5hAZZBqZ7v1GAA2wOQUAme8EuwKb7IsRGWPOKeYSC2CG
+CAJnC0CGCAJlGWQO5BIBLscCgACpiCWGnYRABIRX9o7GDaA6VQB6QW6MJ/uEABXvzQUADbsB58UU
+JdkBAACbyevGCClQBIAAWrzWLiAVZOC8wCDRDwDrFgArsASAAPXADLwiAJ0AiHAIhFd/QV8ICUd/
+kVn+AAId4AxFAPwgZhWgCwUA+iAmFeAKBQD6IEYVr/ZaAAAAAAAmIRQkIRL+2HAN4AUFAOoyQipY
+BIAA/AACHaANFQBbIRAoMkPlXAEiIAUAAAhELnZZ22P/WwDAsPwgCBWgDSUAWyFHmhEoYBSJEOkW
+Ai0AVgAAZY9jYAACZIEOwKSaE//0rA2gDxUAjRKM0AjMEP2gBhWv+QYA2iBbHpTAINEPACfmEZ/t
+K+YQGmQDGWPJFGODJOYS+cHGFeA9BQCd74kRCsYCluwmkQiNkYSQ/MAAEzfdAQD8xgALd0TBAPcg
+JhWgNiUAdkEGhBKEQASEV4kRCaCGCAJrCYCGCAJpLCEHLSAH/kEEFeCYBQD5wABEOswBAPwgAAXw
+3REA6t0QDcwCgADp/wIOZwKAAA3MAhljqR1jYgrMAizmHIwgJ+YhJ+YjLeYiKeYe/eYAD/A5BQAp
+5h8v5iD9gAAWMA1FAA3MAizmHYkSCeCGCAJvCcCGCAJtHGOWDLoRrKr1U6YV7/imANogWx5ZwCDR
+D8DY/CBmFe/7vgAAAP/w5A2gDgUA/iCmFeAKBQBYPXUbY3qMuI8ViBT5n+MYkgCdAP/x/A2gDgUA
+wODAigjINPlhBhWv8cIAAGwQDCgxCPrHiAWj+fUA+QAFFGIAnQAeYzQbYx8KAInqYx0YyASAAAkA
+igkAigkAigkAigkAigkAigkAigkAioggmhL+IMYVoAlFAOsWACxGAoAACYgCmBEvIActMQgPD0EA
+/xEP3QIO3QKdFAzqMPwgphWgCwUA6xYHIMiBAAADIIYJAmMDAIYJAmGLJwhdEQ1NAiy5FC6yCe+x
+FSXQgQAA7RYJJgE5gADk4B9mQQEAAHj7B9EPAAAAAAAA+iBoHeAMRQBbJL/RDwAAAOokAAjYBIAA
+/ACCHaANJQBbHQ3RDwAAAGwQBhxlC4U1/mCIFaAKVQD4xgYFoDsFAPVoAAN3VQEA9CAGFef+wQDo
+7gELaASAAFhAPhhifCmClBxk/iiCo6aW7yAFKzZCgACmhvzAsBXgClUA/sFIFaA7BQBYQDTCk/ig
+BHxgK1UA+qAEPGAsRQB8UX/8r4AGUH4FAC1gBX7RcS8iGIhoZPBu6SAEJAOZgADBd+1iDiSDiYAA
+yNvaYPrB6BXgDBUAC9AAiydksGDwolAN4BxlAHxRHWhTGndRF+okAAnYBIAA/IBoHaANJQBbDk/A
+INEPAPrBCBWgCwUA/g4iHaAMBQD+wKYdoA0lAFsOR8Ag0Q8A9kMGFa/+NgDywQYVr/42APZAhh3v
+/j4AWxRsjyCfoPpA5hWv/lIAAGwQBCUkA+RJEAnGAoAA+QYADHAJFQD5BgAMcAYFACYkAOgmASEQ
+QQAA0Q8AbBAEG2JcGmS6/slwBeAMBQDrOAIJT4KAAPsgAEUwDVUA/yAARPAOFQD5IAYVoA8FAFsh
+U9Kg0Q9sEAQjJHL6QGgdoAsVAFslptogWyYw0qDRDwAAbBAEiioZYm4cYkv/ReAAkHglAAmpASsg
+BQyZAZkq+WOGDaB6BQB6sRT6QQgVoAsFAPwAAh2gDSUAWw4N0Q/RD2wQCBxklyMgB/RDCBWnVQEA
+9r/AFaAIFQAGhjkvQggtQAQuQgD/4AgV4TMBAPIgBhXgClUA9iAmFaA7BQBYP8P6QGgdoBsFAO0c
+ECngBIAAWyqQZKCHHWSDjCDA4S6kCQ3MApygG2JN6RIEKdcCgAALqggppgDrICIpUASAAFsft49K
++g5CHeB4RQD6gLAVoAwFAOwkIyeIhIAAeKEZaFI4iifAsftEABWgDRUAWyAOwCDRDwAAAAD7Q8YN
+4HwFAHyhFvqBCBWgCwUA/AACHaANJQBbDdfAINEPwCDRD9og7GRiG1gEgABbKk/AINEPAGwQBhxk
+Xu0iACp4BIAA/kCQFaAKVQD0IAYV4DsFAFg/jxxkVy0yBC4wFy8yBvhg6BWgClUA+CAGFaA7BQBY
+P4cpIAT6RFAV4Bp1AHqRWci42iBbH4bAsCskIyowBfoOwh3gfEUA/UjmDaB9dQD7pe4NoAIFAPtE
+7g3gfiUA/0PmDaB/BQB/oRf6YQgVoAsFAPwAAh2gDSUAWw2pwCDRDwDRDwAAAAAAAPJDCBXv/ooA
+KzQF+kCmHeACBQDRDwAAAGwQBCQiGB9iIY00HGQu/mLwFaAKVQD/oAQG8DsFAFg/XygwF8KaeYEX
+6yAiKVAEgABbH17AoOokIypQBIAAW/90wCDRDwAAAGwQBCQiGB9iD400HGQd/mLwFaAKVQD/oAQG
+8DsFAFg/TSowF8KF+UAFTCApRQD5QAUMYgCdAIlKG2GJ9gRiHaAdRQD/ISAIUBX1AAucApxK+ICw
+FaB5RQD9QAQkYB7lAP9ABCQgDDUA9U2GDeAvFQB/oWT3TCYNr/z1AHmBEY1OyNzrQg8qUASAAAvQ
+ACowF3WhP/dHhg2gi+UAHWG7jEoqIGQNzAGcSvtCng3gDjUA/kymHaACBQDRDwAAAAAAAPpAaB2g
+CwUA/AACHaANJQBb/03AINEPAP/+fA2gDEUA//5cDaAMJQBj/48AbBAGIiIYZCBwHGPjiCiNIC8g
+BY6A+QCwFaAKVQD4IAYVoDsFAFg/EC4gBSkKc/nJhg3gekUA+81mDaB7ZQD7xL4N4HwlAP3Dpg2g
+fQUAfeEV+kEIFaALBQD8AAIdoA0lAFsNOi4gBfxACBXgClUA/MeWBaA7BQBYPvzAINEPjS6PKC4K
+dS4kBe70BSaAiYAA2iD6QegV4AwVAAvQAP5AsBWv/xoAiSgoCncoJAUolAX+QLAVr/7OAGwQBCgg
+csCUCYgC6CRyKVAEgABbJTLSoNEPAABsEAomIActIA0ZY7DuYSAa2ASAAPxBkBWnewEA6pJBJodB
+gAAYY6uoyCiAfSXinK2IqFUJVRGlpSVcgPTgCLkRZgEAiSLTD2WRQCpQDfFEoA3gCQUAGmOdKqCA
+GGF562GJHS4CgAD0ISYV51UBAAhVCihSkguqAQuAAAoJQWiRB/kgCuHSAJ0AKFKYihkLgADppAAN
+AD4AAGABKRVhuGhkdwxqEaWqK6Ke92AJSlIAnQArop2UGOS0AAWIWYAAyJuKMPphABXjqgEAWrOc
+2iDrRAAJ4ASAAFsiiQxsEfWAAEZwC0UA68adI5RlAACKJ40YwMDqrCAu2ASAAFsfDdKg0Q/AINEP
+AAAl4pusVQlVEfVAAEL//J4AABxhiozImRr3gAYgkgCdAAxqEaWqLaKe96AGklIAnQArop1ksMke
+YYHkFggma/0AAJ3o5LQADft+AABgAG6IJ/kEABXvygUA+yAEBLAPBQDvhRQkyQEAAJmJ6YYIKVAE
+gABbEOorIAT5f/X8UgCdAGAAkmhyA8Ag0Q+KJ8Cw+0QAFaAMNQBbIuodYeCdoIwg+saWBeANNQDr
+pgIuZgKAAA3MAv1AJhWgAgUA0Q8rbBjqJAAJYASAAFsndmP/tMCw9CEGFa/7agD/+rANoAoFAMCg
+WDtRHGFVjMiJGvmf+YCSAJ0AwLD0IQYVr/0mAMCwHmFP9CEGFaANpQANzTT9wQYV7/zGAB9g/esh
+CSjIBIAA/gAIHeAOJQBt6gIJAmEZYyj6IGgdoAhlAG2KEiqs/OyiCCToEwAA7NYAJMgRAAAZYyH6
+wnQFoA5lANMPbeoP76IHJMgRAADvlgclU/EAABxjGBhgvRpgRgi4Avmf5hWj64UAsLvItCnC/3mo
+9cCg+kCmHa/2ngBsEAj6xEAF4A0lAJ0RmxCPMg8PXy8VBC4gDCwgDQjuEQ7MAiwVBSkhCZsQ7RYB
+KVAEgADpFgMgwEEAAPIIaB3gDAUA6AwACNgEgABb/0XRD2wQBBhhytMPCEgKKILY6iQACdgEgAAL
+gADRDwBsEAb2wFIFoReFAAcnKKdmF2LxI2b5J3J/62LvG9AEgABYQCTltAANIASAAPpgaB2ga0UA
+WEAf/AACHaBtRQBYP1faQPNgaB3gDAUA61QACegEgABYP1HvsS5t8ASAABpgVhli3gIoC+xi3hxG
+woAAqYgshsX632YVoAklAClm+iuGwStm/NEPAJMQHGLWmxMfYNgbYNf8wJAF4Ao1AO0WAivPQoAA
+C5ks/SMADPArBQDpFgEpaASAAFg98xxgzR9gPh5ixgItC+hixh7uwoAArt0o1sX+32YV4A4lAC5m
++izWwSxm/NEPbBAG9L/eBaEYhQAIKCioRCpC+OpG+SnYBIAAWD/s/AACHaBtRQBYPyMVYrAlUn/T
+sOtirxrQBIAAWD/k/GBoHeAMBQBYPxvvsS5t8ASAABpgIBliqAIoC+xiqBxGwoAAqYgshsX6n2YV
+oAklAClG+iuGwStG/NEPAJMQHGKgmxMfYKIbYKH8wCQF4Ao1AO0WAirPQoAAC5ks/SMADPArBQDp
+FgEpaASAAFg9vRxglx9gCB5ikAItC+hikB7uwoAArt0o1sX+n2YV4A4lAC5G+izWwSxG/NEPbBAG
+KTAIGmAV9KBoHa/spQDlYC0UgimAAGiREupEAAnYBIAAWDx5wCDRDwAAAACJMAqaAewSACUC4YAA
+KjAJZKBh/UrAAN/spQD1IAQFf+ilAPsNAA4//xoAiTDqmgEEqGCAACowCWSgWf1JwADf7KUAY/+m
+AAAAeZa4KzAJZb+a6zwIKVAEgABbGYT9QGgdr/4yAGP/sgAAAAAA/ftCHa/+qgDrPAgpUASAAFsZ
+M4kw/UBoHa/+VgAAAAD9+0Idr/1yAOs8CClQBIAAWxl6/UBoHa/9JgAAbBAEHmGqL+JhKeJ22lDr
+NAAHiVGAAAnJU2SRH/kgCHjSAJ0AiTCNICPimPfTqBWgJQUA868ACfAXBQDxIAVqkAQVAOghGi7O
+QoAAqWYZYkCNaoyzgmvp3QEEAVGAAH/HBRhfZAjdAnvHBSkKgAndAnzHBMSACN0CfccCBd0CfscC
+B90C/TAABLP49QD5IYYNoAwFAH87EmAAEQAAGV+XCd0C/mDWDeAMFQDAYBhgr8P6L4YQIoYRw5sp
+hhAthhEZYVqIgB9hCumIAQnOAoAACYgCBYgCD48CDPg5GWCj6JYAIwBBgACdapJribAfX395ljwv
+8p4t4p2j/wn/Ea/djdoNDFkAzBEEyALtjDoG4ByAAAfMAnnXBMCICMwCetcEwJQJzAJ71wTA0g3M
+ApyzwMBYPADAINEPAAAAAP33Ih2v/8YAbBAEiTDqVAAJ2ASAAOxiABSoooAAeZYXj8CIwZizn7KN
+wo7DnrWdtIjFicSZtpi3wMBYO+/AINEPGWH2KZKucZYH/fciHa//sgCJMgnJU2+SLf0koADRD8UA
+ibKNs53BmcCPtIi1mMOfwo22jreexZ3EibBj/50AAAAAjjN/6Nn//rgNr+ylAGwQBBlgYBphARhf
+Hfa+DgXpYgEA+sYACzACBQD3P2YVoAWlANMPbVoNKpL7CKsB57EIcRAFAADHINEPCq1J/GAGFenK
+AQD8gAYVoAIFANEPbBAK5l+pGXgEgAAs8A2VFevwDCmQBIAA42KDJhwhgAAaYbyquiqgfSlifKyq
+qpkJmREJOQgpnIAtkRMukRIs8RorIQQN7gjkwCBnc/0AAGSzyigKIPsAHiPiAJ0AKSEFC5kI+YAd
+s+IAnQCLIBRgMfFgDGKSAJ0AKiEF7RYDJSFhgAD4ACIdoAkFAP0CAAywCwUACYs46RYGJZyxgAAq
+IQUn8RkjIQTqdwgBKEEAAPNAHN/Qd40A9gKCHaAMBQCfEvZgF2lQCgUA/mBoHeGDHQBtiWCJUABg
+BAkDGfDPgA3pMwEAJmz2AGAECQsZ8M9wDem7AQAmbPb9YAez4gCdAPvAB3PiAJ0A/GAHM+IAnQDz
+wAbz4gCdAKep5rgRDMsCgAAJiALoOAIH+/kAAOhG+yVQBQAAmxGTEJ4ULRYD9eAT8JIAnQCNFo8S
++gAiHeAKBQANujjiFgclEYGAAIsgkhfxYBEiUgCdACYhBfLLgA3gCwUALvEa4hYHJxBxgAAdXpYe
+XqsZYI0oIQUjIQQv8RmbJCslBOb/CAE4QQAA8QAPt9BvjQAPGkn5RgANcAilAPqfZhWgDwUAbYoN
+LEL7DsgB7YFCd/gFAADwATQNr/wFAAAAAAAAAPSggBXgFkUA+KAIFe/8DgC0Vf1/+JLgFkUAmxHy
+IAYV4AiWAAAAAAD//WwNoAwFAAyqSfogBhWpnAEA+CAmFeAMBQDpYGgTMAUAAOIWBy4LFgAAiBHs
+iBABm/0AAPjgBhWgD6UA9mAPyVAKBQCLEZYY4hYHKagEgADyIAgV4AGGAAACo0nyIAYV6bIBAPog
+JhXgDAUAiBdlwRYpgQSymSmFBIlwAPEEADgaCJkC6XYAJ4M5gAAv/PYA8QTlXP4twAqAAOiYAgVQ
+BQAA6HYAJ4MJgADpYEQX+9kAAG5Sa4wYrKwMDEn5hgAOcAilAPyfZhWgDAUAbYoNIkL7DiYB7WGA
+dmAFAAD83/vEb/wFAGP/gwAAAAAAAAD24IAV4A8FAP7gBhXgCQUA//4wDaAfRQD4wFoF4B9FAPbg
+gBXgCAUA+OAGFa/+XgAAAGlRY4IXiBgcYCSoqAgISf0GAAwwCwUA+J9mFaAMpQBtyg0sQvsOyQHt
+kQx12AUAAPAAXA2v/AUADKtJ+iAGFemsAQD6ICYVoAwFAOIWBy4AxgAAjhCNcADxBOIWBy9wCoAA
+Dt0CnXCKFYsXWDriwCDRDwAAAAD/+oQNoB9FAClie6uZCZkR+GAARP/yMgAAAJ8SnhSdE/h/7FDS
+AJ0A56cICNgEgADqdAAA4BEAAFv+94NQAGAEAwMZ/UBoHakzAQDjFgAtCQ4AACg6/3gxE4kT+GAI
+i+IAnQCLFPNgCDviAJ0AjRHsfhAO7YKAAA7dAg09AvyfZhXv9LYAxsryIOYVr/2aAAD6QIYV7/Ui
+AMDA/iBGFe/0QgCSF/h/+kjSAJ0AlhjyIOYVr/tuAJ8SnhTtFgMr0ASAAOwcBCjYBIAAW/7TjROL
+UI4UjxL9QGgdqbuhAOsWAS0DvgAAfbNve+Ns6BIAIZv9AADmuhELywKAAPsmAAywBqUA6YgCA7gF
+AAD4n2YVr/BiAJ8SihKeFIqgHWCjjiTvYn4tXkKAAKs7jLoPqgz7YWgV6e6hAO3MAQ90AoAA/4YA
+DjANBQBYCEKPEo0TjhT940QVr+5eAPIg5hWv66UACro4/UBoHa/6KgAAAAAAAPIg5hWv7aUACto4
+/UBoHa/5ygAAbBAEiSIPAgAPAgD4QGgdoFnhAPgdAANxmfEAFGCDBJQKIkKE8TAAE7//BQDwQATS
+VDIBAO2CACtQwoAA6nUCCrECgAD2pgAKtGJBAO/dAQs2AoAA9mYACbPikQAO3QKdgAUzApOCLEKI
+5mBwHK5CgAD9EAAGsAIFAPewABa9zAEA/YYADnATxQDshgMsIASAAG06FOUjCgIgEQAA5jMIARAF
+AAAjMoCTQ/IAAh2gE8UAbToV5SMKBEARAADmMwgBEAUAACMyoCOGH8Ag0Q8AAGwQBIUijCAdYFTi
+IgMpQASAAPxgAAYxlfEA9B0ABfCl4QD0iAAD/UKRAPOgAAE0VQEAI9KA5mBJEfgsgADGKtEPAAAA
+7l3pG54CgADjUwIOe4KAAA8zAg2fCg4zAiP2hPiAABcwBAUA7i4CDL5CgADu9oglgTGAAPMAaB2g
+E8UA0w9tOhSDJOdFCgEQEQAA5lUIAiAFAAAjVoDxQoAN4AIFACQKAP0oABOwE8UAbToVI4Ig50UK
+BEARAADmVQgCIAUAACNWoNEPbBAEKTIADwIA/yMACpAMBQB5niLqVAAJ2ASAAFg6EcAg0Q8AANow
+W//EiTAPAgDpluF9YASAANowW/+L/UBoHa//UgBsEAQrIQT0wCIFoAcVAPQAAh3gBgUA+g8ABPAD
+RQD6DgAFcNtpAPqIAAZxuzEAbToVLkKE6eYNciARAAAAUQQAfxoPZgKxVR5gAWSQfCPigH4/cmRg
+b+Vf/RUBYYAAJwoA+L/4BaAPRQBt+hkjUojBT/aPAAp9MwEA44sHcqgRAAB0bUGxdyzmjBRf8yMh
+BfVmAAowAgUA4uaBKiQCgAAEMwIj5oIl4oDu3xEMx8KAAP8GAAx//4UAD1UBBaUCCFUCJeaA0Q/G
+KtEPKOKAx73riAEM18KAAAqIAvnQBhWgAgUA0Q9sEASIMP8CwArQDAUA6lQACdgEgABYOcnAINEP
+AAAA2jBb/779QGgdr/+WAGwQCIkwwEDxIATykAgFACogDPtfIBWgCRUACpQ4BJg4ZIB0ijPrX8kV
+AH2AACuxf/FgB2dSAJ0AjDIZXoD+YIgV4Gr5APhgqBWj6sEA+UAEBvO6oQDuFgIpUASAAPogZhXv
+6AEA9iAmFau8oQD5gAQGd2+BAPYgBhWnmMEA+CCmFe9vAQD2IIYVp4iBAPggxhWn/8EAWDnd+AAi
+HeAIBQAEmDhkgGEpMgB5llssIRKLKwzMEAy7ApsyKSBgKiBhLyEHiC7sqhAMygKAAAqZAgmIApgz
+LiBU/EWEFeP/YQDo/xAPdAKAAA/uAg7dAp00KyAgLCAhKiIR6MwQDdwCgAAMuwILqgKaNcDA6lQA
+CdgEgABYOX/AINEPAAAAAAAAAP//mA2v7KUAbBAGGV0o5zIAKbAEgAD+gAAVMAwFAPNAAEJwDRUA
++OAEA/AIhQD7DMoNp+UBAJQR9CAGFeAFBQDu1TgBoCEAAItiDwIAC4tXb7VUy7EYX3YIuAqIgOok
+AAvgBIAA7VQAClgEgAALgADspAADMCEAAOWgDGIgIQAAiREPAgB5Q7/qEgAp2ASAAFg5V8Ag0Q8A
+lRD//6gNoAwFAAAAAAAAAP//cA2v7KUAbBAEGFy8FFyRKIKfJEKBooIJIhGiQqIyIiBE0Q8AAABs
+EAzjMgAp0ASAACshEy4gDQMMTwvNDP+iAA43M4EA7LsIAeQlAADGKtEPABhfPelcbBIDKYAAFF9L
+BLQC9R/mFaPkhQBtCAqwRGRA2iaC/3aQBmP/7gAAAAASXzH0JAAVoAM1AG06IeMtBCEoEQAA4zIA
+IqgTAADjRgciI+EAAONSACEQIQAAk0iIH/lAJhWgAgUA0Q8AAGRQh9QQ7KIBLBAEgAD8IOYVoAM1
+AG06IeVCByEYEwAA50IGITARAADlNgAiI+EAAOVtBCEQIQAAl1ATXS4SXxMaXyYdXyQfXyKGNIw1
+jjaEN5QonvgUXyEeXyKPM5zYjTKWqJ9InegWXx/3ZgALM+KFAOaG/yET/QAAySYngv/nmPdxE/0A
+AMAg0Q/HL9EPAMcr0Q/HK9EPbBAcFlzKGF76GVwpjzAqIRMuIA36vh4F788BAArNDP+iAA43L4EA
+7KoIAQXJgAD0QAqIkgCdAGgiB8Yq0Q8AAAAAZU/0BgCH4jIBKJgEgADjDAAAoIEAAAMCYR9e+R1e
+9uJe/BkbgoAAkxySFOwSBiwQBIAA/iDoFaADNQBtOiHlQgchGBMAAOdCBiEwEQAA5TYAIiPhAADl
+bQQhECEAAJdQEl7UFV7lhBWeKJzYjhQdXuWUWIwThBIVXuOe+JzYlFj7RgAP8+KFAO+G/yET/QAA
+ZCFWJYL/5Zj2cRP9AADAINEPZU9SgjHmAAUAmf0AAPJgIBXgDCUAbcoCAwJh8i/gFeB15QDiXroZ
+Z8KAAOwWKyGYhQAA9CRmFeAFZQDTD21aEiM8/O0yCCFwEwAA7eYAIRARAADiXq8Qmf0AAPJgIBXg
+D2UADwIADwIAbfoP5TIHIRARAADlJgchm/EAAAusAv0f5hWj4oUAsCJkIMMtgv/9IAYOYgCdAGP/
+7AAAAAAAAGVOsuYABQChgQAA4jIBIJkBAADyAKgd4w4FAAMCYS4WFO1epBl+AoAA/iOGFeADNQDv
+XqIcEASAAG06IeVCByEYEwAA50IGITARAADlNgAiI+EAAOVtBCEQIQAAl1ASXoTlXpUQmQEAAIQ1
+jDaON54onNiONB1ekpRYjDOEMhVekZ74nNiUWPtGAA/z4oUA74b/IRP9AADJISWC/+WY93ET/QAA
+wCDRD8cr0Q/HK9EPxyvRD8Ag0Q9sEAaKMAoGV/zDoBHQHTUAZUGI2zDqJAAKYASAAFv/adOgZTF4
+0jDRD3bTd/zOgEXfugEA7156GAQKgAD0wARlkgCdAMGB+MAFBCIAnQD3oAujoBklAPjAC2PiAJ0A
+ZUFk6PJzIoW5gACMLy4gDey6DA3IBIAADqk4qcwIzAqMwGTBRYox/MAE3GIAnQD1QAXYEgCdACrE
+FsCg80BoHe/+EgAAAPjAB6ZSAJ0A6zQACVAEgADsRAAK6ASAAFv+9fNAaB3v/X4AAAAAAADuIA0i
+BCGAAOkhCCcFYYAAKyETC5sM+mAmFe/+ygCJLy4gDSrycwm8DA7LOKuZCpkK6ZIAIgNBgADpkQgn
+BBmAAC0hEw2dDPxgJhXv/gYAAP/96A2v+vUAaKBsLsAHLfKI+/GIFeHuAQCu3QndEa27q6r7SJAV
+r/1OAAAAAAAAAPof4h2v/RYALyETiDEPiQwOmDio//5BBB3v/M4AKiETizEKvAwOyzirqvshBB2v
+/HoAAAAAAAAA+GAmFe/8QgD4YCYV7/wiAPof4h2v+/YAxjocXiAuIA0tIAzkFgAreASAAPQgJhXg
+CiUA8iBGFeAbJQBYOSzSMNEPLiANHF4WLSAM9CAGFaAKJQDlFgEreASAAPogRhXv6KUA+CBmFaAb
+JQBYOSD/+pANr+qlAAAAbBAEFlvYgjAXXgnmIgECASmAAPLhUg2guZUAGF4FcosYFF4EFl4FpCR5
+SwkGRgqGYApgAMlTxirRDxhbQqgoiID4YCYVoAIFANEPxy/RDwBsEAQcXfoZXfqLMB1bDvgGQh2g
+/vUA9kBoHaergQD5QZINoAIFAAmpComQCpAAxirRDwAAAAAAAGRDNytgISpgIAi7EQuqAvpgJhWg
+AgUA0Q9kQ4MqYHr/QCMsIgCdANmg+GAmFeACBQDRD/q51gXgChUA6WANIhlRgABkk60vwsOOYA/u
+DA5UFA5EEQTUDCRNB/SD6BWkngEAAJEE7FzcHUAKgADoRAEJWASAAOSkOQ9oBIAA/oBoHaAKVQBY
+ONn0YCYVoAIFANEPAAAAAAAAAGRPWShgDWSDf/JgJhWgAgUA0Q9kT0YpYA1kk4LyYCYVoAIFANEP
+ZE8zKmANZKL38mAmFaACBQDRDwAAAAAAZE8bK2ANZLL58mAmFaACBQDRD2RPCCxgDeliDiYaoYAA
+sJ38YCYV4AIFANEPZE7uLmANZONK8mAmFaACBQDRD2RO2y9gDelhEieaGYAAsJj4YCYVoAIFANEP
+ZE7BKWANZJM68mAmFaACBQDRD2ROrivSsSrSsKuqsKqaMdEPZE6djGeMzizBIpwx0Q9kTo8u0rCe
+MdEPZEHhKGBgL2BhCIgRCP8C/mAmFeACBQDRD2RObClgVAuLR/lgDCviAJ0Ax6/6YCYVoAIFANEP
+ZE5Pi2eLvou9mzHRD2ROQi7CWi3CWa7dsN2dMdEPZE4xL8JZnzHRD2ROJynCWCjCV6mIsIiYMdEP
+ZE4WKsJXmjHRD2RODItni74sshCLv6y7sLubMdEPZE34jGeMzozPnDHRD2RN641njd6O3I3brt2w
+3Z0x0Q9kTdiOZ47ujuueMdEPZE3Lj2eP/oj+j/2o/7D/nzHRD2RNuIhniI6JioiJqYiwiJgx0Q9k
+TaWJZ4meiZmZMdEPZE2YimeKrouoiqerqrCqmjHRD2RNhYtni76Lt5sx0Q9kTXiMZ4zOjcaMxa3M
+sMycMdEPZE1ljWeN3o3VnTHRD2RNWI5nju4v4Sku4Siv7rDunjHRD2RNQ49nj/4v8SifMdEPZE01
+iGeIjimBJyiBJqmIsIiYMdEPZE0giWeJnimRJpkx0Q9kTRKKZ4quK6ElKqEkq6qwqpox0Q9kTP2L
+Z4u+K7EkmzHRD2RM74xnjM4twSMswSKtzLDMnDHRD2RQ0dpgWBjCLWAMCN0R/UYADvCOBQAO3QL8
+YCYV4AIFANEPZFCujjH+xAYdqO4dAP7EJh2gAgUA0Q9kUJePMf7MJh3o/x0A/swGHeACBQDRD2SR
+Iy/Cw45gD+4MDlkUDpkR+a8ADPR7BQCrmfk4aBWk7gEAAOEEAKsaC4gC+ThmFaACBQDRDwBkUEmJ
+MQ8CAA8CAGiQAd6Q7mR6K1AEgABbFArAINEPACjBhGSNASrBdynBdqqZsJn4YCYV4AIFANEPK8GE
+ZLz/LcF2/GAmFeACBQDRD8cv0Q8AAAAtYAwusIAA0AT+XwAPMApVAPpAaB3gLgEA7Fv1GXAEgABY
+N/XyYCYVoAIFANEPj2eP/ojzj/Ko/7D//mAmFeACBQDRD4hniI6IgvhgJhWgAgUA0Q+Kb6mqsKr6
+YCYVoAIFANEPi2/6YCYV4AIFANEPLGETqcywzPxgJhWgAgUA0Q8tYRP8YCYV4AIFANEPAAAAAAAA
+/+50Da/59QAoYAwusIAAgQQArxoP7gL/cAYdoAIFANEPAAAAbBAEJTAKJzAL9mEQFaAKVQDsXL8Z
+aASAAPJgRBWgC4UA5GQAC3AEgABYN8UbW2fAoOtrCwqBPgAALLK9fHMcbytpLTECKjQL6jQIJugF
+AAD8YEQd7/JVANEPAAAosrzaMAuAAPFDgA3gDbUA9MMmDaAKBQAkNAj6YWYdoAkVAPhhRh3v8lUA
+0Q8rMAvAwOw0CiXYBQAA+mFmHe/yVQDRD7FkfUnGwCDRDwAAAPzAaB3gChUA/LkwBaALhQBYN6DH
+K9EPAGwQBudZnRlQBIAA6VQAChAEgAD9WAASMAUFAOkWASGCKYAAkhADSAIodsEidsIbWZT8oGgd
+oD0lAPqzIAWgDhUA9PhmFeAPBQBbGPTnoLRtEASAAMCk/LMWBaAbRQBYN4dgAEMCSgIqdsHAmil2
+wxtZhPwAAh2gPSUA+rMABaAOFQDyIAYVoA8FAFsY5OegFG0QBIAAwKT8svoFoBtFAFg3d2AAAiVy
+wogRZiBUx58JiAMIVQHwZZAN71UBAANKAip2wYkQKXbC+rLcBeAMBQD8BkId4A4VAPqy0gWgCAUA
++PhmFaAPBQBbGMznoGltEASAAMCh/LLIBaAbRQBYN1/RD9EPghDAs/r4ZhXv/Y4AAACOEA5OAi52
+wQVtAi12wsDJLHbD+rKsBeAMBQD6sqYFoD0lAP4AIh2gDwUAWxi356ARbRAEgADAofyyogWgG0UA
+WDdK0Q8ABWgCKHbCwPH++GYV7/8GAGwQBhZZmhNZQhdZmRhZRpIS9AACHaAS5QDoFgAkQ0EAAPgg
+JhWgAEYAAAAAsUT2gAV8YgCdAIkSKZAhC5kRApkCKTbBJjbCGlkzG1kz/AACHaA9JQD+ACIdoAgF
+APh4ZhWgDwUAWxiT5qB5bRAEgAAaWSkbWSn8AAIdoD0lAP4AIh2gCDUA+HhmFaAPBQBbGInmoGBt
+EASAACUywuYgPWlQBIAA/qagDlAS5QAK6jAZWSEpkkUJmQoKmQoK6jAKmgz3X/s4kgCdAG0IDQrq
+MAqaDPdf+rCSAJ0AY//r0qDRD8cr0Q/ApPwgKBWgG0UAWDcJY/+mwKT8IAgVoBtFAFg3BWP/lgAA
+AGwQBhNZARhZBRdZ2va37AWgCgUA6BYAJENBAAD4ICYVoAG6AAApICH9OAAUsBrlAAqZAik2wcCA
+KDbCGlj0+rHoBeAMBQD8BkId4A4VAPh4ZhWgDwUAWxhVZqBvGljsG1js/AACHaA9JQD+ACIdoAg1
+APh4ZhWgDwUAWxhMZqBfJTLCBQVPd1k7sUp2oTLUoAvqMBlY5imSRQmZCguZCgjqMAiYDPcf++CS
+AJ0AbQgNCuowCpoM91/7WJIAnQBj/+vAIdEPdkH4wCDRD8Ck/CAoFaAbRQBYNs13Uaxj/+UAwKT8
+IAgVoBtFAFg2yGP/lWwQBBdYziYKKPZGAAswEwUA9OBoHeACBQBtOgwoUZTmgQpyqAkAALEixyvR
+D2YgUxZZE9MPI2KEwID6QAQA0AUVAPygAQLf9PUA5FQDCQEKgADjQwEMQAqAAAgzAiNmhAPqMCJy
+RQIiCgMiCgnqMAkpDGqRFW0IDwjqMAgoDGuBBGAABtEP0w9j/+kpYoQJSQEJWQL40IYV4AIFANEP
+AABsEAbtJAACAbGAAB5Y2oswHFt19LciBeD/9QD68AAFcBiFAPlCUg2gAgUAGVuMCakKiZAKkABk
+Qe/GKtEPZV/Kxy/RD2RP8SpSPJox0Q9kT+cbWgYrsICbMdEPZE/akjHRD2RP05Ix0Q9kT8ws4ksL
+zBGcMdEPZE+/nzHRD2RPuC1SPZ0x0Q9kT64LiUdkkaNpkaUpUptmkkKZMdEPZE+Yx++eMdEPFltu
+KWCA/SGAAlerAQD5P/wJ0gCdAC/CrvPgDEBSAJ0AZKHF9UAO4JIAnQDAINEP997AJaB6hQD8wGgd
+oBgFAG2KDCnBlOqRC3ZgCQAAsSIi+trRD2Yv9/CU4A3nm0EAHVi18Sw8DeAPFQDbYMDA/bCIFeAe
+BQBt6g4osZSyu/sACgwiAJ0AsczwBNwNr/y1AGRO/ilSRypSRv1AABU/mYEACpkCmTHRD2RO5itS
+pJsx0Q9kTtwsUqOcMdEPZE7SkjHRD2ROy5Ix0Q9kTsSSMdEPZE69kjHRD2ROtpIx0Q9kTq+SMdEP
+ZE6okjHRD2ROoSvijCpSwwm7EauqiqdkoJgqrCBbEkMKTBT8YCYVoAIFANEPZE57WBLW+mAmFaAC
+BQDRDwAAAAAAAPk/8yjSAJ0A22D8EgIdoAoFAP2wqBXgHwUAbfoNKLGUfIEk6qwBJdgJAAAq4p8p
+UsMJqhGqmSmQZMChCak5+GAmFeACBQDRDwCgBA0LGX+32f//pA2gCSUALcKucdZVIvq50Q8pUppm
+kJ2ZMdEPAAAqUlz7XwAVr/2CACL6udEPZJER+T/vENIAnQD6YCgVoAsVAFgH3tKg0Q8AwAQNDhn+
+AAAHMAslAA77OfpgJhXgAgUA0Q+KMVhchcAg0Q8AAOoyASIEaYAAWF+V5q2abRAEgABYX4yaMdEP
+ZE2LL2CAKeKfKFLD4hUALJZCgADigggHpHkAAMCk/LXOBaALhQBYNerGKtEPANKQ0Q/SkNEPKsKu
+ca4HwKdb/x1mrUraIFv+32atQtogW/6bZq06+kQwFaAb5QD8IGgd4CwFAFgf1OatJG0QBIAAKxEA
+mzHRDwAiUsMo4p8p0AwKhBT9CAAUNzoBAOgiCAzWAoAAWDTGKWCAaJMp+T/sQlIAnQDqJAAKWASA
+AO1STCngBIAAWFyA0qDRD4oxWAJl0qDRDwAA6iQAClgEgADtUkwp4ASAAFhcX9Kg0Q8AbBAEE1q3
+JTKAFFgTIzJ/pCQlRoAjRoHRDwAAAGwQBBZasfSwsgXgBAUA+AACHaAHFQD2z+QVoAOlAG06KgBA
+BAYJG++XF3IgBQAAK1AwALEEAHoasKr6QAYVoAAaAJgg5VwBIRARAADAINEPbBAEFVegAkkUKVaR
+JFKSAghDD4gR+wAEANAHNQDgNhoMAQqAAPzgAQPf+PUACHcDB0QBBkQCJFaS0Q8AbBAEFFeRIkaW
+I0aX0Q8AAGwQBtIwiSAUWorpllJ6mASAABhaZCiCrvEACYBSAJ0AwFAoQYwpQkWZIyglCC9BjS8l
+CS5Bji4lCi1Bjy0lDCxBkCwlDStBkSslDipBkiolEClBkyklEfhACBXgAB4AAMBQepYdiiMrQkV6
+tAfwAEgNr+WlACxBjCshCCpGRXvEEsFW2jDrJAAK4ASAAFg0PMAg0Q8tQY0rRYwqIQnTD9MPetzc
+LkGOKkWNKiEKeuzQL0GPKkWOKiEMevzEKEGQKkWPKiENeoy4KUGRKkWQKiEOepysK0GSKkWRKiEQ
+erygLEGTKkWSKiEResyUKkWTWGQoHFpQLUGNLkGPJUGTL0GRKUGQKEGSKkGO60GMLMwCgADp/wIM
+RAKAAOhVAg1UAoAA6u4CDdwCgAD7pgAO8ApFAPQgBhXgCwUAWDVAWBHy5q8/bSgEgABgAYEAF1o7
+/LR2BaANNQAtRY78keQd4AYFACZFjCZFjSx27FhlBYsh0w90tnr6WAAFd7uBAFhkH+ahMW0oBIAA
+KHKLmCovcoyfKy5yii4mCVhkEytyExpXuuxXZBWDIYAA+1/zq+IAnQApckb5X/NT4gCdACpCJP9F
+8A3gCwUAKkJjbQgZLsKbrr4J7hGuribmGy1CJLG7/X/x+uIAnQBj/98AAAAAAAD6AKIdoAsFAFhk
+AOevmW0oBIAAWI/8Y/55L3JGZf+ZKHLLHVoLHloMH1oLKUGTK0GSKkGPD5kBDrsBDaoBKkWP+pJE
+HeAKBQDpRZMkAiGAAPy0BgXgDkUAL8KbK0Jjr68J/xGvuyiyF+2IAQVQBQAA6LYXJFAcgAAutTsm
+thsocssPAgAPAgB4o80pQZMrQZL/YqAG0AolACp2uip2u/r3JhWhCwUAK3a8f5cj+vbmFaANhQD8
+9sYV4CwFAPz2phWv9coAAFiPz2P9xwAAAAAA9pJkHa/1egAAAAAAAFhhZvVAaB3v9r4AbBAEjEGI
+QB5ZeRlYeI0g/8/oFaeIwQAJiArognwp0ASAAO7dDApYBIAA/aAAFrAOVQD/pgAOt8wBAAuAAIlB
+jzIJiUfx4WAN4JlNAMheiieKrpWg90AmFa+C1QDRD9KQ0Q8AAGwQDBRXXysgDCogDeQABQjIBIAA
+CQJhCQJhCQJhCQJhF1haGVhbFVlY7VhbGecCgAAsFBD8ICYV4A4FAO4UES3GAoAACKgCLlJ/CYgC
+KBYA/EAIFeeIwQAHiAr5D4gVoAZVAO7dDAjYBIAA6N0RCVAEgAD3pgAOsAxFAAuAAIMR0w8PAgAD
+g0cDAwZmMi4jEQT6QGgdqzMBAPpgaB3gDBUAWCDe5AAFCMgEgADpDAANMASAAAkCYQkCYQkCYS9S
+fxhYOhlZlBpYN/oghB2gDBUAnBEpFgMIOAIoFgD8QAgV54jBAAeICvkPiBWhjgUALhUF790MCNgE
+gAD9oAAWsA5VAO7dAgtQBIAAC4AAhRH06AAC8A5VAP6yOAXgVU0A5lG0aMgEgAAEAIf4AKgd4AUV
+AAkCYQkCYQkCYS/yf5URGFgcGVl1mRIIOAKYEPxACBXniMEAB4gKKIJ8790MC1AEgADo3REI2ASA
+AP+mAA6wDBUAC4AAhRH+sggF51VBAPggaB3gVU0A8LZIDeAOVQAEAIcJAmEJAmEJAmEJAmEv8n8Y
+WAX4sAoF4AoVAPoghB2gDEUAnBGZFAg4ApgQ/EAIFeeIwQAHiArognwo2ASAAP+vAA7wDwUA7xUF
+Lu4CgADu3QILUASAAAuAAIURBYVHBQUG5lERaMgEgAAEAIcJAmEJAmEJAmEJAmEYV+0eWN74soQF
+4AwlAJwRmRMu4n8IOAKYEPxACBXniMEAB4gKKIJ87t0MC1AEgAD9oAAWsA5VAO7dAgjYBIAAC4AA
+hREFhUcFBQbmUMhoyASAAAQAhwkCYQkCYQkCYQkCYRhXxx5YxhlZK5kRLuJ/CDgCmBD8QAgV54jB
+AAeICuiCfCtQBIAA7t0MCNgEgAD9oAAWsA5VAP+mAA6wDBUAC4AAhREFhUcFBQZmUILSMNEPjSD6
+AEIdoAsFAOxZFxnwBIAAWDQM0jDRDwCNIPoAQh2gCwUA7FkRGvAEgABYNAXSUNEPjSD6AEIdoAsF
+AOxZDBrwBIAAWDP/0lDRD40g+gBCHaALBQDsWQca8ASAAFgz+dJQ0Q+NIPoAQh2gCwUA7FkCGvAE
+gABYM/LSUNEPAI0g+gBCHaALBQDsWPwa8ASAAFgz7NJQ0Q8AAABsEATwRdAN7zKBAPBiAA3gJAUA
+AohXyoICyVPKmALqUeSgMGJb/QAAArQ70kDRDwAiEf//dA2gFAUAAAAIIhH0nwAVr/9WAAwiEfSf
+gBWv/z4AAAAOLRHsTP0iE/kAAA3CO9EPwCDRDwAAAABsEAQSVc0iItjRDwBsEAQSVcoiItfRDwBs
+EAQl+sAFJQEkURWTIfSAAEJwxQUApUSUINEPbBAEE1jQ+K00BeAMBQAsNuosNugsNuYsNuMsNtgs
+NtYsNtIsNtEsNswsNsosNsUsNsAsNr8sNr4sNsQsNtAsNuL4eMYV7A4FAC423S423/58phWgP/UA
+Lzbc/nvGFe/y9QAiNsHyeOYVoA1lAC020/x9JhXgG+UA+neGFeAapQD6eEYVoAg1APh5BhWgGQUA
++HwGFeP49QD4fIYVoBoVACo22htYV/p7JhXgHbUALTbUEleeH1ilLzbN8nlmFaAOFQD+ecYVoAL1
+ACI26xxYnyw219EPAAAAbBAE51WTGS+CgAAWWJunV5NwplUkVn/RDwAAAGwQBBhW4oiAGViWE1bg
+CYgB+EYACTAUBQAEIgLyYAYVoAIFANEPAABsEAQYV6kaVtcmgmEpgpgngp12KwyimQmZEfjgAEPw
+ABoAwHDDyiymECOmEcO7K6YQJKYRG1d8iqAcVyvrqgEJbgKAAP1GAA1wKwUAC6oCDKwCBco5G1bD
+wCDqtgAjgFGAAJR6k3vRD8Ag0Q9sEAQbWHP4q2wFoAoVAPYPAh3v+fUA67zgKQ0IAAALtQL2AAId
+oBwFAG3KDC1RlOfRCXKoCQAAsWYm+vsvgoQAYQQArhoJ4gMC/wEP7gL/EIYVoAFCAAAAAAAAAPhA
+BSlQBgUA9WBoHeATBQDTD206DCRRlOdBCHKoCQAAsWbHayyChPrABADQDQUA4N0aCwEKgAAArhoJ
+7gMOzAENzAIshoTzYGgdoAUFAP4CAh2gloUAbeoMLyGU5vEIcRAJAACxVcdbJ4KEFFVsE1VB5EKf
+KoEKgADjMoEtMAqAAAlrA+t3AQomQoAApDMiMDcHZgL3EIYVoAQlAAQiAvJm5h2gAgUA0Q/GKtEP
+AAAAbBAI/qq0Ba8NBQD6r94F4Pz1AOIqCwtIBIAA80AAhXEXhQDnJygNVwKAAOuqCAdD2wAA6HcI
+CbcCgADnZggEg1mAAB9YIQIpC+hV5BzOwoAAq5kbWB77OKYV4AslACt2+ih2+yjxf5gWKJbBKHb8
+L/F+mhQPSC4PTyzsWQgH2AUAAAi/ORtYEg2ZARhVRgWbOZsXf4N+C4wUAM0RDf0CLabJLGa5L2a6
+0Q8o4hwpcvwvcvvqFgQsR0KAAAmILAj/KJ8V9eAFS6IAnQAkZrjqcvsqWASAAFg08vwgqBXgDAUA
+WDQp8KswDeD59QD4oABC/wgFAOhVAQWFSYAA/CCIFeilHQAArBEMvAIs1skqZrkrZrrRDxxX74oW
+hRcZVSIo4hzkFgEpaASAAPggBhXgKwUA5RYDLEdCgAAKiCzpiCgJ8ASAAPggRhWgCjUAWDLJGVUV
+/CCIFailHQAAqxELmwIrxskqZrkpZrrRDwAAAAD+gGgd4Ao1APwgqBWgKwUA7BYAKWgEgADsV9QZ
+8ASAAFgyuPQgqBWv/NIAFVfNZb9aGFTy6IIcKWgEgAD0ICYVoAkVAOkWACnwBIAA+P+IFeAKNQDs
+V8Yd+ASAAOUWAyxHQoAACYgs+CBGFaArBQBYMqXAkfwgiBWopR0AAKsRC5sCK8bJKma5KWa60Q8A
+AABsEAb2qUgFoReFAAcnKAdmCBdXayNm+SNm+Cdyf+tXaRvQBIAAWDSe5bQADSAEgAD6YGgdoGtF
+AFg0mfwAAh2gbUUAWDPR2kDzYGgd4AwFAOtUAAnoBIAAWDPL77EubfAEgAAaVNAZV1gCKAvsV1gc
+RsKAAKmILIbF+t9mFaAJJQApZvorhsErZvzRDwCTEBxXUJsTH1VSG1VR/KmEBeAKNQDtFgIrz0KA
+AAuZLP0jAAzwKwUA6RYBKWgEgABYMm0cVUcfVLgeV0ACLQvoV0Ae7sKAAK7dKNbF/t9mFeAOJQAu
+Zvos1sEsZvzRD2wQCBlUnyYgBxNVfimSoSMygKaZCZkRqTODN4gigz7IhMAg0Q8AACc9ASpxoGSh
+sCtxgmSxqioqw/pgAEUyW+UA+mAARfAMJQBYLI0eVwstMoL/ph4NoAklAClxoPMgF+/SAJ0AwoSY
+EPMgGn+SAJ0AmBDzIB0vUgCdAPggZhWgAkYAAAAAKirP+mAARTKNBQCtPfwgRhXgDgUA/6jmHaAP
+pQAv1Ez/qaYdoCgVACjUSenUSiHYEQAA+almHeAMFQD9qcYdoBm1APmpBh3gDIUAWCxrKXGg8yAL
+X9IAnQDDhpgR8yANb5IAnQCYEfMgD6dSAJ0AGVc/L4zaDw9ICf8CiRKYE/8oxh3o/x0AL5RFiRMX
+VReLE/hgAETyigUA+yAARLAIBQDolCEl2MUAAOiUIitHAoAA9MAGYhS7HQCniCqCnvtAHWPiAJ0A
+KoKdZKNDiRMbVK0pnDH6AAgd5JkdAOkWBC1ABIAAbZkCCAJhjxSMEx1VAfiqzAXiqxUAqzuZoIgg
+naLtVBcWcEkAAO6mAyxGAoAACP8CL6YBH1TN/nAIFaAJBQDppQomYAkAACylC+2mBitEAoAACO4C
+D+4C7qYEJVCBAABYLC3rEgQrZwKAAKfMK8adKjKOsaoqNo4FDUf1v/HJEgCdAIon+oBoHeAMBQDq
+rCAqaASAAFsSScAg0Q8AABpUzImo9yAXYJIAnQDsEgMrRwKAAKeIK4KeLMwxDEwU/WAXW6IAnQAo
+gp1kguKwm5uo6oQADHiuAABgAlEAAI4SKird+mAARTAYFQD5ywYdoAsVAPvLRh3gDQUA/csmHeAM
+RQAs5FcvMCbv5Fsh2KEAAP3Lhh3gDNUAWCv/KXGg//lYDaBIlQAAAAAAAPhgAEcyqnUA+8AARTKP
+BQD/wABHcAhlACjkIvnEJh2gCRUA+cSGHeANBQAt5CMvMGLv5CUh2ZEAAP3Exh3gDCUAWCvqiBEp
+caD5AQAVr/gqABxTrvhgAEQxiwUAqzv7fJAV4qp1APsAAEUyjQUA/QAARH/5pQD7OQAM8A0VAP0E
+hh3gB0UA+O8AC/APBQD/BGYd6LcBAAy7AvsERh3oux0AK4QhKTB06YQlI+PxAADvhCYh2dkAAFgr
+zYgRsnn5AABEf/Z+AAAAAAAqKsv6YABFMowFAPxgAEY/+eUA+YimHeAYlQD5iMYdoA8FAP+I5h3v
+jgUA/4kGHa/NJQD9iSYd4AuVAPuJRh3hC+UA+mAARfAcVQBYK7UpcaD/8tANoDj1AAAAAAAA+GAA
+RTKNBQD9QABG8AllAPmkRh3vjwUA/6SGHe/OJQD/pKYdoAgFAPmkZh2v++UA+6QmHeAMtQD9pMYd
+oqt1APtAAEVxS9UA+mAARfAMJQBYK5yIEClxoPkBABWv8WYA+GAARLKqdQD7IABFMYcFAKc39vyQ
+FeKLBQD7IABE/44FAP8khh2gCMUA+STGHa/NJQD9JKYd4AsFACuUIx1WZgd3CfzgoBWhWzUA+mAA
+RfjMAQDtzAIDuAUAAP0kRh2ozB0A7JQhK+AEgABYK36IELZ5+QAARH/vpgAqMo8rbBjqrAEpYASA
+AOo2jylQBIAAWxMXBQtH+X/bWVIAnQCKJ8Cw+0QAFaAMFQBbFZ0dVJOdoIwg+qyUBeANFQDrpgIu
+ZgKAAA3MAv1AJhWgAgUA0Q8AAAAAAAAA//FcDaAKBQDAoFguCRpUDYmo+T/oUJIAnQD/9JwNoAgF
+AMCAwOoOnjT/QQYVr/RiAAAAAGwQBBhTK/amqAXgBgUA5SAiIYJRgADyRbAV4AQVACQkXStyn+qC
+gSGB4YAApbvsVWcd3kKAAKuqKaEf7JkBCbgEgAD54AAE8MsFAOuZAgnABIAA+UPkHeAAlgAA9kum
+HaADBQApcp8ogoGlmQmZEamIKIEf+AcAA7CIMQAp+gAUVHYDUhGkIisiggm7AQt7AismgioigHGu
+GyUigBlTaBhTdgOWOQhVAQZVAvRQBhXgAgUA0Q8tIoQJ3QENjQItJoQqIoAcU14bU2wDxjkLqgEG
+qgL6UAYVoAIFANEPAAAAbBAGJDAAFVLy8IQwDeAGFQD0gBAYkgCdAPSAELkSAJ0A9IAROZIAnQDr
+VfMYBAqAAPSABFoSAJ0A+gCCHaAbhQDsVewaaASAAFgwzcYq0Q+IMfpAaB2gCSUADwIA0w/TD22a
+MvhgAAS0uB0A+GQABjPYQQD7X4AVo+hhAPlJ5h3kmx0A/UnGHaSZHQD9SaYd5IkdAC6kTCgwAfEA
+C7YSAJ0A6FJ9Ige5gAD0gAd4kgCdAPSABzkSAJ0AwCDRDwAAFFLuLyAiJEKhLVKBpP/uMAMv/kKA
+AK/djdcO5AkvMAWN3i8kXywxAw1PCSwlMCkwBPhLxh3vzAEALPVvLCBfIxqA86AARXAYtQD7JgAM
+8cwBAOn1cS5mAoAACMwC/e4EHaALBQDrpAUnSAUAACmk5CogXv/+Ah3vDAUA7ukJBQwJgAB6wA0K
+ihTkoB1l2CEAAHrI8XrwDLS78AAcDaSqHQAAsbsKGhRlr/csIF+p2fMgAETy+wEA/fgAF7LMAQAP
+zAIslAYqITAKihQqlAcoITD5IQYdoAIFANEPAAAqIFyEIMAw6EQMBQLBgADaQPpgaB3gDAUA8mAA
+QrANBQD0qZAV4A8FAP4gJhXgDgUA/iBGFeBpRQD4IAYV4A8FAFsLn2agGwZcN+pEAAnYBIAAWwuD
+5qAKYZgFAAAoIFx4M6spIC3Ln/pAaB2gCxUAW/9E0qDRD8Ag0Q8sMAfsJFwh2CEAAOsGAAFRMQAA
++oJoHa/5ogAAuD7uJgABaVEAAPyKaB3v+VYA0qDRDwAALDABwOL4AQIdoA1FAP2ABATwfI0A+YAE
+BTG8jQDtuwENV8KAAOh3AQzPQoAA/4AEBrCMAQDqmQIMRkKAAPrmAAvyrI0A7qoBDu7CgAD9BgAM
+cMw5AAyqAgp3Agl3AvjmAAuwCwUA5yQtKVAEgABb/xlj/dYpIF+k3/PgAEfymQEAKfQGKCEwCIgU
+KPQHLiEw7vQILZAEgADRDwAAbBAEGlI5jCAjon8DzAz7UCgVp8wBAKPD61JeGZ5CgACjo4M3K7Kf
+IzIODLsI/WgAFbAOJQDrqggBoAcAAPiQRBWhhQUA9GAAQvANFQD6liQV4AwFAOlBgyQHSYAA7FTG
+JI0hAABokm31IAWhkgCdACoylihQxiqsASo2lulFgyQAuYAA+kBoHaALBQD8AAIdoA0lAFv9nhtS
+fOxVHhlQBIAAWCzcwCDRDy8yjioyiffgBJpSAJ0ALzKWC/gu6Nw4BQWZgAApUMYtNpbuRYMk/kGA
+AGP/rS4gNWTgfy8gSWTweSggXWSAcy4ylgvuLg7cOCxUxitBruSwbGX7/QAADw9P70WuJ4MJgAAq
+MpYoUMaxqio2lulFgyR78YAAY/9jLDKWL0GuLVTGK1DG7+k5BmAFAAAsNpbpRYMl+uGAAGP/QcAg
+0Q9lr3soMpaxiCg2lviQZB3v/L4AAAAA/LjGHe/+UgAAAADAsFv+s//+aA2gCTUAKlDGsfsrNpbp
+RYMteCYAAGXO/GP/DAAAbBAIGlIALCAiGVLfKqKhKZKArKoJqhGqmYOX61TcFPjBAACfEYM+7JQH
+JOFhAAD8IEYVoegFAPhgAEQxzQUA/GAARvGuBQCuPu6WEClQBIAA7ZYVJLCBAADolhokoREAAFv+
+yhtUy+QWBClQBIAAW/7H61TIGVAEgABb/sTrVMYZUASAAFv+wetUxRlQBIAAW/6+61TDGVAEgABb
+/rzrVMEZUASAAFv+uSc9AS1xsSxxsBtScNMPDcwcDLs2+vXkHeAFFQDlNBkp0ASAAPRg5hXgBAUA
+9GMGHaAMxQDkNggh2GEAAFgpxycWAyRlAiRkACVkAeNmAiHAMQAA+MBmFa/PBQAvNE70aYYdoAkF
+APRpph3gCgUA9GnmHaCMBQD0IAYVoA6FAG3qO6KbLrBEjRCpOPvAQAUz7gEA/6AARreqAQDtFgAk
+uCeAAAzfEZ8QLbBMLYRULbBMrIgphMXthL0kyAUAAKw3/iAIFeE5lQDpOggFcAUAAC40XP5ihhXi
+7gEA7O4CCNgEgAD+9wYdoAxFAFgpnOs8TCGwkQAA+sBoHaAcRQBYKZcqGg76YABFMTuFAPpgAEXw
+HFUAWCmRjhEPAgAPAgAk5Awk5A0l5A4k5A8k5AMk5AAl5AEk5Ask5AUtME71wSYd4P05AP/BBh3g
+3TEA7eQKIeFBAADsNmsh2OEAAOs2bSHQ8QAAKjZvJDZoJDZpJDRs9G2mHe/JBQApNG7kNG8hwKEA
+ACg2big2aiY2bP5FsBXgBoUA9m4mHa+OhQDvNHAh2bEAAP76Jh2gDGUA7SAtIbGBAADtdNIrUASA
+AFgpZ/YgiBXhStUA+mAARTFbFQD6YABF8AwlAFgpYCR0DCR0DSV0DiR0DyR0AyR0ACV0ASR0CyR0
+Bfpt0BWg26UA+mAARfGCBQCiMvThJh3gyjkA/OEGHaCqMQD64UYdr8kFACk03OQ02iHBwQAA6DZz
+IfmZAADvNnUh8akAAC42dyQ2cCQ2ceY2dCHpkQAALTZ2LTZyLCDkJTTb5DTdIbHJAAD9gACGMA1F
+AO3MCQtQBIAAWCk69iBoFeFaNQD6YABFMYtVAPpgAEXwHJUAWCk0iBIsCt6sPCSEBSSECyWEASSE
+ACSEAySEDyWEDiSEDSSEDPh7kBXgrWUA/GAARvCupQCuPvUBJh3gqTEA+wFGHaCZOQDphAgh+dkA
+AC82ei82fiY2fCQ2eSQ2eC42fy02fSw2e/RYph3gC3UAK3WgJDaJJDaEJDaO9PBkHeACBQDRD2wQ
+BBVREhRQ5yVSnxdSUCRCgaJV5lMrGq5CgAClRCVBH/KDpBXgSAUA+oPEFaCJBQDmVQEJNMKAAOVF
+HyHkzIAAeKcr6kEfKTTCgACnZStSgMAh6KoCCAQKgADxYATI0gCdAPKFsBWgAkYAAAAAAAD2wABC
+8AIFACj6AC1ShCxBHQjdAfxGAA7wAgUA7VaEJmCIgAAuQR555xcvUoArQR/AIem7AgeNaIAA8oWw
+FaABSgAnUoITURMIdwEHJwInVoIjMH3iUMkR/K6AAChBH+JiCARgSIAAIyKUFFCfBDMCIyaU0Q8o
+IpQZUP8JiAEoJpTRD9EPAAAA+oPkHa/98gD6g+Qd7/66AGwQBPBrkA3v/PUA9IAF2RAFFQD4nwAV
+4AgFAPiiAAxwCQUAGlDiHVCR+gAiHeAEBQD2FwId4B4FAOcnAg6YBIAAbeoMLjGU5+EtcZgJAACx
+RNPQ9BYCHaAfBQD0RgAJMAQFANMPbfoMJTGU4lEucZgJAACxRNEPAGZP1SaihABBBOCeGgoBCoAA
+AL8aDP8DD2YBDmYC91CGFa/+4gBmT9QiooQAQQTggxoKAQqAAAC1GgxVAwUiAQMiAiKmhNEPAMCA
+//10DaAJBQDAgP/9TA2gCRUAbBAEiScpkg4okjMiICIrCgD5ACAVoAwFAOiWMylQBIAAW//CHFHT
+AyoRDKwILsKEL/oAD+4BLsaEK8KAHVDcDbsBK8aAC+owGVBUKZJFCZkKC5kJC+owC5sMarEObQgI
+DeowDZ0MatECY//wG1CBGFBnqKgvgoAZUNPqUFMV8/EAAK4uCf8CL4aALLKfK7KhKqKBLuCAorvi
+zAgN3kKAAKuri7cJzBGsquuyDid4JoAAwCDRDwDAkOm2giXgBwAAKcWhKcWgKcWu6cWCLNgEgABb
+/RHAINEPbBAEHVM7FlNNGlB9/bwAFeAJFQDkMERjO5EAAGgyPNjQ/BICHaALBQD/UKgVoB8FAG36
+DiSBlLKI/IAHPCIAnQCxuyhynyVinAmIEahVJVBkZFGU9EAHoJIAnQD6YGgd4AwVAPONAA3wCAUA
+9EAHIR/89QDegPQCAh2gj4UAbUoOJdGUst3+oAXUYgCdALHux1sIjQIkooQucp8sYpwvCiDr/TkP
+dkKAAA7MCC/ANw3/Au/ENyqBCoAA4DwaCoEKgAD9IAEG3/71AA7dAw1EAQxEAiSmhGQwchpTGSNi
+YvRABmiSAJ0AZDBh8gACHaAJNQBtCCskoHwAIAQEBBt/Rxokcp8jYpykJAlEEaQzKzBkyLQoNGQp
+NGsjYmKxInMrKmP/zQCwBA4IGfEf+K/SAJ0A+F/5MVIAnQBgAA4AAAAAAAAA9cBoHe/9KgDAINEP
+AAAAAPUAaB3gHgUA0w9t6gwv0ZTo/ghm6AkAALFVx1vegCSihMDYC945L3KfLWKcCf8Rr90v0DcO
+/wLv1DcqgQqAAOA9GgqBCoAAAJ4aDO4DDkQBDUQC9VCGFa/8rgAAZD+YwCBtCC0uoHwAIAQODhvv
+YpwnfFyAACNyn6MjCTMRo/8p9Gsp9GQjYmKxIvJf+1LiAJ0AY//LZS5vY/9cAGwQBBpSvyig8cDO
++kRwFeAeBQDqrOAkcMqAAP1tpg2gHQUALCAiDAxC/YYADnALBQBt2gwtoZTtwSl1UAkAALG78AB8
+Da/7tQB8sT8sCmfAsG3qDC+hlOzxCXVQCQAAsbsr+vsYT+sogoXBnwuZDHmNC8Gc+EWGHeACBQDR
+DyogIvFBUA3gAgUA0Q8ALCAiLQpg/YYADn/+5gDApPylXAWgG4UAWC2CwCDRDwBsEBQqIhvAwCwk
+LimhAyihAvkACLxiAJ0AGFHyHk+IGVAaF1AuG1AZmxiXHishHikWCiQgIv2AaB3g+zkAD+05CEQC
+JBYQFE+s7yEfLkgEgAD+pSwFoLsxAAtJORtP6S4WEfmAaB2g7zkADrg5KyArDw5F6YgCD3ICgADp
+ICwt2EKAAA67Ag27Ah5P3i0gJAi7AvhDhBWg/zEAD+w57iAjLurCgAANzAIMuwItICEsICAoFSbv
+IR0vdgKAAO8VJy7sAoAADt0C7bsCDmbCgAAMmQIuIRkuFSgLmQIpFhL8RpAV4AwFACwWFi0WFysg
+NSsUUikgL/gqZh3gCwUAWxWcHU9/HlC9LhYcHlJp5lAYHRgEgADqFh0mqbEAAO4WGSdzAQAA/iMG
+FaABHgDRDwAAAAAALUAM9aAE2xIAnQDIlvWgCTiSAJ0A9aAI+pIAnQBkUcQVUKfqIhsh2AUAAFsV
+hC8SHR1PZurxwX0YBIAAKNKbJFKIo4gJiBGoRCtBK/d6Bg2gD0UAiEAIiBEPiAKYGS5AB4lHDg5B
+7JkUL3QCgADuvgIE0IEAAPfGAA9wCwUA7hYMJgWZgACLmcLIWwt46099HROuAADAUC6wffHf+xfQ
+ngEALCArLyAiwJEMnDnv/wkGAsGAAOpQuhYYt4AAysXtQAwv/wKAAK+qKqCADwIAfakq6kQACVgE
+gABbiYz6ntIF4ABaAABowx/1gAkqEgCdAGjFFGjGxy1ADC6wff/8KA2gngEAAAAAACkgIhhQpAmZ
+Ce1ADCzPAoAAqYgogIB9idfqRAAJWASAAFuIwfqeqgXv/xoAY/9PGU8kKiAiGFBfKZKSLyArKIKI
++yAARLAKFQAPrznvFhsszkKAAKmIKBYaLoA1K4A0LIEZLYIAKYAH7Kw5BdvpAAD4IAYV4AkFAAup
+OCiAFikWBCwWA/ggJhWgClUA/COIFaAIBQD4IEYVoDsFAFgsyioSG/VABbESAJ0ALBIaLMA0LRIb
++Z/y61IAnQBk0QX1oAkQkgCdAPm/8lFSAJ0A+iNIFaALJQBbhv9lXjrrHCAqUASAAPwAgh2gDSUA
+Wwl3/IAIFeAKRQD8o8AFoBuFAFgssmP+EQAAAAAsEhktQCIuIAIvIAH4QBAVoApFAPggBhWgOyUA
+WCyoKkAiG1BaCqwJDMwR/WAARbAOFQAutHktIAAttHosIAIstHspIAEptHhbjfz6nhIF7/paAPwj
+CBWgDwUALfAA/+BQFaAKVQD/4DAV4DsFAFgslCoSGsCALIAAKaEZKIABLKQW6KQHJIBpgAAtEhoJ
+CUwp1Rn+I0gV4A4FAC7gAhpP6ujyCi90woAADp4CLvUZCogC+eFGFa/7rgAA+iNIFaALBQBbhsH6
+I0gVoAsFAFq5+GP9NgAAAAAAAAD6I0gVoAsVAFuGufojSBWgCxUAWrnwY/0W1aAlFh6OWPoAgh2g
+G4UA7FGcGugEgAD+RFAV4+4BAFgsaotY+vgAB/AYtQB48TKKRy2hFftEABWvyQUACakB6dkIAtkB
+AAD4oAeh4gCdAMLIWwrFG07J5aQABWmhgABj/6IsICILDUN9ycMuEhEODl9p47oZTpIeTmMrIR4l
+Fh70naIF4AwFAP2AaB3g+zkAD+05LiEf/4BoHeC7MQALnzn4RXAV4I45AOhcOQ5YBIAA/4YADnX+
+AQDhmRAP+gKAAA+ZAg2ZAgyZAiwgJB1Ovw5uQO7bOQ5iwoAADLsCC5kCKyAhLCAj6MwRDdwCgAAM
+uwILmQIrICAoICwLuxELiAIrEh4JiAIpIRwptRYlIR2YuiW1Fy8hGS+1GP5GkBWgDQUAnb6evywg
+NSy0MikgLym0MxtOkv/xXA2gBRUAAP1vAA3//DIAbBAIKCId0w8PAgCIguMgKylQBIAAC4AA90AY
+4JAHFQAqICsVTiyNJ/NAEKRiAJ0A40+TFRfhgACN3izSMhtOTylSgeQgIiZgBQAALNYyKrKfwGT1
+QABFMA0lAP1IABUwDAUA6pkIDkAEgAAeUTQDShGuro7gDi9A/s0ADHD+GQAP3DkvkC8mCv4G/wH/
+JeYd4O4hAA/uAv8l5h2g/9UAD+4BLpQvDOwC/SXmHaD9tQANzAEslC8IyAIolC8WThempi5igB9O
+eQ/uAS5mgCxitx1RHA3MAixmtyuynylSgaS76FBDHd5CgACrmS+RHy6RHfngBAewCwUA75UfJ2Sc
+gAAukR545xwtkR+jqi+igMTgDt0C8eAJkNIAnQD7JbAV4ASyAKOqLfoALKKEKJEdDcwB/WYADjAL
+BQDspoQkYHSAAC6RHnnnEi+igPHgCCjSAJ0A+yWwFeAD/gAsooIYTjUNzAEMvAIspoIogH1/jyMt
+kR941xEuYpQfTcMP7gL+0oYVoABGAAAoYpQZTiIJiAEoZpQoooAZTf0bTycJiALopoAlsBEAACZi
+oSpSgaRm60sICzZCgACqZixiByuwgCzCDuwWAigECoAA82AEz5IAnQAsIR/aQPygAAYwCxUAW/0V
+K1J9iiApIR/7TwANdZkBAPUgCYiSAJ0A604eFJSRAAD1IAnKEgCdAPUgCcwSAJ0A9SAJzZIAnQD1
+IAnOEgCdABxNoCzCRi066A29LAfMEQ3MLAOtEaPdLNaBWwg19kXGHeACBQDRD8Cx/SPkHe/7WgDA
+sS+RHygKgAj/Av8j5B3v++IAABlNxSmSn6SZCZkRqapb+8ArUn+PYAv/DPqwKBWn/wEAq/vuTbwd
+3kKAAKuri7eIEi7in4u+7+4IBEALAADnhQIl4AcAAO3Bgi92QoAArqouwbHpwYMm+KmAAC0agP1g
+AEbwCAUA6NTGKAQKgAD1IAQ4kgCdAPUgBfkSAJ0A9SAIoZIAnQAvspYu0Max/y+2lunFgycAuYAA
++sBoHaALBQD8AAIdoA0lAFv4+htN2OxQehtQBIAAWCg4Y/6uAAAAAPqhDgXv+94A2iBb/PZnrqrS
+oNEPAAAAAPqhBAXv+34A+p10Be/7XgD6oP4F7/s+APqg/AXv+x4AKLKOKrKJ9wAF0lIAnQAospaY
+EQ6ILv4AIh3gDgUACP447hYAJQaxgAAp0Mb3csYV4AolAOrFgyz7RgAAY/9zAC9gNWTwkShgSWSA
+iy9gXWTwhS+ylpIX+AAiHaACBQAO/y4Pgjgi1MaCFy7BrusWBScDeYAAsOj6IKYV74gBAOjFriQC
+6YAALrKWKtDGse4utpbpxYMteFYAAGP/FS7BriiylifUxv+40BXgCiUA7qk5BEAFAAAotpbpxYMv
+9x4AAGP+7mWvYS+ylrH/L7aW+ZBkHe/7NgAA97jGHe/+OgCdE/wghhWgCwUAW/n2jBSNE4sV//5A
+DaAJNQCKESjQxrGqKraW6cWDLHS+AACLEGW+jWP+nQAAAGwQBCkgN9MP8yAG5tIAnQAaUBP8mqwF
+4AMVAP4AAh2v//UA6qzgJPWEgADZoPvAaB3gHAUAbcoMKJGU6I4JZMgJAACxuyv6+yzShBhNLuVN
+Ax2BCoAA6SA3LyAKgADogp8tgQqAAA8CAOVSgSnACoAA/xcADHD1tQAFmQEpJDcIzAEEzAIs1oT/
+LwAH0AsFAPgCAh3gnIUA0w9tmgwooZTsgQh1UAkAALG7x7ss0oQAsQTg6BoNgQqAAAA5Gg+ZAwnM
+ASkgNwjMAv2whhWg+uUACpkB+EbmHeGZHQD4RuYd4AIFANEPAAD6AAIdoAsFAFv8nikgNyoK7wqZ
+AfhG5h3v/EIACRsU+kbmHeACBQDRDwAAAGwQBB1NFfqZiAWgCwUA/gAiHeCcBQD9sKgV4BgFAG2K
+DC6hlOzhSHVQCQAAsbsdT9kr0mJksErAoOxOKxbzkQAAbQgoKMCAAKAECAgb6dKcJHxcgAAr4p+r
+qwm7EauZL5RkL5RrK9Jisap7qxRj/9AAsAQNDBl/x7TAolv3P8Ag0Q/AoVv3PMAg0Q8AbBAEGE0G
+0w8ogH36A+IdoA4VAP8BoAcQAwUAKSAiKyAsZJJTKiAjwHn3QBIEYAXlAPVAEcRiAJ0AKiAl+kUQ
+FeAWBQD+mcYFoAQFAO1OuxUB4YAAKSETZLHX/yAgFeAIFQD8gGgdoK8BAAqMOO8lEyYA2YAAKSId
+i5zfYOySDSWEQYAAZMCA2iALsAAtICJk0l0uIGoOSUNkkLj1IAfIkgCdAPUgCekSAJ0A40+mFJzR
+AAD8n0QFoAolAPxEUBXgG4UAWCpqxjr6AEIdoBuFAOxPnBnoBIAAWCpk8Aw8DaAEFQAqICN3oQf1
+QBYdYgCdACogLBNPlPtcIBWgDhUA+80ADTAKvgAAKSAiA5kRrZksICKumemSgC5kwoAArcyuzCvC
+gAlJQPiNAA//6PUACLsBD7sC+5AGFe/9TgAAAzwC9E1GHaAKRQD8RFAV4BuFAFgqRvye+gWgCkUA
+/ERQFeAbhQBYKkH6QGgdoAsVAFgAqOOkAA0SpgAA5iRqKVAEgABb/hn8nuIFoApFAPxEUBXgG4UA
+WCo1KiAjHE9rKwog56EMdmHBAAD1QA/dYgCdACogLPtcIBWgDRUACto5LiBrLSBkLuz/Dko4DUo5
+ZKH4+k1GHeAKRQD8RFAV4BuFAFgqIhxPW/oAgh2gG4UA7SAiJmNBAABYKh36QGgdoAsFAFgAgx1P
+UuOkAA0N9gAA8p6aBeAKRQD9oGgdoBuFAFgqEsPQ/E1GHe/66gAAAAAAALCZCQlPKSUT8z/yd9IA
+nQBlni/0RKYdoApFAPycegWgG4UAWCoFKSIdipxkoSqLnWSxJdogC7AAY/4eKiAiWBnvY/3CAAD7
+f+1EIAwFABtMORRMDtMPKLKfJEKBLQpn/QgAFDAfBQDoRAgF29sAAG36DCixlO2BCHXYCQAAsczH
+yxVM2hlMRdMPKZKFAMEEAOsae5gFK0AserksLFApIwr/c8EPwKX8nj4FoBuFAFgp4iNUKcAwZz04
+0jDRDwDaIFv+22P9mQAAKgr//ABiHaCrBQBYIZLmoFBtGASAAC1QKdMPfalXLVAoLlAqfeFGKUAs
+aJRAaJU9Kgr//ArCHaCrBQBYEk7moCNtGASAABxPBvylUBXgClUA/qUQFaAbhQBYKcYvUCgvVCpn
+P4jaQFv8FmP/gAD//fANoAMFAPoAoh2gG4UA7E75GfAEgABYKbrypSYd7/5GACkgIhpN6uggZSzM
+woAAqpkaTA2qmfkwBhWv86IA//hMDaAKFQDAoSwgaysgZLDMDEo4C0o5ZK162iBb/YjToGcwHsfV
+/H/nrWIAnQDApPydwgWgG4UAWCmi8AAYDaAEBQDAQS4gLsjj2iBb/BxkTu8bTszsTtkZUASAAFgm
+eNIw0Q8AAABsEAQkICLAkglJNuOZEQIYR4AAGkuiwNX7IABFMABeABtLoeubCAJj9QAA/WIADTAN
+pQAbS+MWS5GrqxpLkvSXWAXv/PUADNwD6poIAYSZgAADThGl7inigAnZUmSQePUgCaiSAJ0A9SAJ
+qRIAnQAZTrovooYPzwEvpoYooogIyAEI2AIopogosoDE8A+IAii2gAjqMC9iRg+fLCliRQ+ZKAmJ
+CA/qMA+fDGrxDm0ICAjqMAiYDGqBAmP/8Cl6/inmgSgiHYiB2zD6QGgdoAwFAAuAANKg0Q///lgN
+oEkFAO5LcxN4KwAAL/KfLuKBpP8J/xGv7ifgIyiihgjIAQjYAiimhi+iiA/PAS+miCiygCn6vwmI
+ASi2gA/qMCliRQ+ZCQ/qMA+fDGrxCAjqMAiYDGuB9sCZeXECaXQLKuEfDwIACgpFaKJf6kQAC9gE
+gABYABlmoB7rdAAKUASAAFgcCANLEaW7LLKAHUt5DcwCLLaAK7KACuowDOowKWJFCpkJDJwM95/5
+0JIAnQAL6jALmwxrsfZj/yn4IAId7/taAPhQAh3v+zoA+oBoHaALJQBYHFtj/74AAGwQBOokAAnY
+BIAAW19/ZqGsGUtJ9pcgBaAHFQADJRGpVCxCgB1OYA8CAA3MAixGgCpChhtLgQuqAipGhhhLmKhV
+K1IEHE5ZDLsCK1YEKFIdKioACogC6FYdIQhRgAD0QAjAkgCdAPRACTESAJ0A9EAJsZIAnQAoQoYZ
+S8bpiAEN+gKAAAj/Ai9Ghi5gffPABD/SAJ0A6iQACdgEgABbVLDqJAAJ2ASAAFtUZeokAAnYBIAA
+W1Qd+sQIFeAKBQD8H0IdoAIWAAAA6iQACdgEgABbU7doMQVvNz5uNDvApPycZgWgCwUAWCjv/JYm
+BeAKJQAKKjYDrBENzAguwrgfSyAP7gIuxrgrwrgdTTcNuwErxrhbU45moKktQoAeSzwO3QEtRoCM
+UwfMApxTK00Ei7DnuwICYBMAAPuABhXgAgUA0Q+xqnyhgAnqMKuZD+owD58MavHsbQgIDeowDZ0M
+atHgY//wK2JwC0xD/4AAFjO7AQD9ZgANv/wCACticAvMQ/+AABYzu0EA/WYADb/7qgArYnALHFD/
+gAAWMLuBAP1mAA2/+1IAAAArYnALPFD/gAAWMLuRAP1mAA2/+vIA0qDRD9Kg0Q8AAGwQBGgxSetL
+MRGUQQAAaDRGaDhLaDtQaDwtGEq4KIJGKTroCbksB4gRCYgsGk3vAykRCpkI6JYAKVAEgABbBUvR
+DwAAAAAAAPqbsAXv/zoA+pumBe//GgD6m6QF7/76APqYFAXv/toA+pueBe/+ugBsEAQaSwbTDyOg
+fRdKoPJgBkfQCxUA8gACHaAm9QD04Ggd4BgFAG2KDSlRlHaRCeIsASKoCQAAxytmIJsZSuTTDy2S
+hAAhBP1gAQNf9fUABWUDDV0BDW0CLZaELJKE+kAEANANBQDlzAEO6AqAAA3MAiyWhAjqMAzqMCSi
+IKhEDEwMasEObQgICOowCEgMaoECY//wKpKEBaoBCmoCKpaEJnJFwFD2wAEDN9cFAP7YABMwACoA
+ALFVd1EcBOowCOowpkQISAxqgextCAgI6jAISAxqgeBj//DRDxpKiSkK/vlQJhXv/vIAbBAEE0xm
+9AACHeAEhQDjIwoJOASAAPJ0KBXgAgUADwIA0w/TD21KF/pABADTQwEA4EQaARAJAAD0oABCtDMd
+ABlL4wN4EamI9QAGFeACBQDRDwAAbBAEFEvg9kBoHaADhQBtOgooQqUICFJkgFG4RCcKABlL1xhK
+nPqWeAWghQUA+pcwBeAMBQD44ABCMCIFAG0qKCKyQCKi0gkjAQNjAiOm0iOi0ixGoKVzqDMjMoAi
+ptLiotIiIBEAALRV0Q8AJ0KkBwdJ/vAAE7/+pgAAAGwQBBZNcPYAAh3gAwUA0w/ywGgdoBR1AOZt
+ICO4BQAA0w9tSgojJoDjJoEhECEAAMFH6XTiaxAEgAASTWL2msQF4ATVANYg0w9tSgojJrDjJrEh
+ECEAAONmyiMQgwAA9lxeDeAE1QAWTVcnCgAPAgDywGgdoBS1AOZtICO4BQAA0w9tSgojJtDjJtEh
+ECEAAMFL6XTiaxAEgADRD2wQBBpLcqooKICAAwVP8QAEV9AMFQAorfwIKAoogqHAMPhgAASwAgUA
++yAEANSIHQD9gAEFUAk1AG2aJ/hgAAS0uB0A+yAEANOYIQDgyRoMgQqAAOmpAg5QCoAA+yYADTSL
+HQD1QGgdoBn1AAOZDHlNEbEz/H6AglAZ9QDRDwAAAAAAAOo0AArYBIAAW6Dd56/fbRAEgABj/+EA
+AOokAArYBIAAW6DX0qDRDwBsEATnS8IZMASAABVJ2QUlAiV2syJytBRMABNNGvRABAEwFAUA8kYA
+CXADBQDidrQrkASAAG1KB+MmtSEQEQAAJnaz0Q8AAABsEAQWSiGmJiVigMd/BzcDB1UBBUUCJWaA
+0Q8AbBAEwMEYTQcDJBEPAgAIRAgYSyokQgAIKAgogID/D2AH30QBABhLvggoCiiCoQgJQ/sgBADQ
+AgUA/YABBVSIHQDzQGgd4Ak1AG2aJ/hgAAS0uB0A+yAEANOYIQDgyRoMgQqAAOk5Ag4YCoAA8yYA
+CfSLHQDBnwKZDHk9D7Ei/F6AglAZ9QDRDwAAAADrRAAJUASAAFugl2ev4dEP6iQAClgEgABboJPR
+DwAAAGwQBFv/aRxM3fwAAh3gAwUA+YBoHaAaFQDszQQm6AUAAG2qCiOGQOOGQSRAIQAAwaHp2ORu
+QASAABRLZfSP6BWgAgUAKgr//EBoHaALFQBYX6oqCv9b/zWxImku5txA+gACHeD69QBYX6T4mLAF
+oBoFAG2qCiOGEOOGESRAIQAAGExTiIAZTFHAogqIApiQ0Q8AAABsEAjiShEZQASAANkwDwIA4gAF
+CJAEgAACAmECAmH1AASSUgCdABJMOfQgaB2gAzUAbToh5UIHIRgTAADnQgYhMBEAAOU2ACIj4QAA
+5W0EIRAhAACXUBVKSBJMLRtMQR1MPx9MPRRMO4xUjlWDVopXmiiTSIpTFEw7g1Ke+JzYmriTSBdM
+IhxJx+ZJUBxaAoAAC5sCDLsC+v/mFePihQBtCAmwIskgLHL/fGACY//vwCDRDwDAINEPxyvRD2wQ
+BBVKmsCICCgCKFZSDzQRJFZT0Q8AAGwQBBNMhQIiCwsiEaMigiDRDwAAbBAE9pgYBeAJJQAWST0c
+TH4ESAryQAIFsAoVAPNgAIXwDQUA9UIADrEahQDqKigN3wKAAOe7CAxDwoAADcg5+sAAQzqIHQDo
+tssp1wKAAKpqKKa7AiULC1URp1UnUsL+eAAVMAgFAOSYOQ0BCoAA4IgaDQEKgAD9IAEE3/r1AAqZ
+Awl3AQh3AidWwiVSwiVm/dEPAGwQBBdL5wImCwtmEadmKWLCDz0RANEE4FoaDoEKgAD8gAEF3/z1
+AAy7AwuZAQqZAilmwvaSHAXhGIUACCgoJmLCqHcmdv3RD2wQBBVL1QIkCwtEEaVEI0LAFUj9BTMC
+I0bA0Q9sEAQVS84CJAsLRBGlRCNCwBZJ+RVJNwYzAQUzAiNGwNEPAABsEAQbS8Prsn8p0ASAAFgo
++PwBAh3gDAUAWCgh/EBoHeAMBQBYKCzSsNEPAGwQBPKTvgXgAhUAIjaAIjaB0Q8AbBAEGEwrKoJ/
+wbALqgIqhn9YKVPRDwAAbBAEhyD4YAgVr/b1AOZGAwJL/QAACXkBCUkMCWYBBoQMp2bmJgAigHGA
+AAVILghIDJgw0Q+UMNEPAAAAbBAGGEwXE0k2G0wW8wGyDaAqBQApMH0KmQIpNH1yuxTaIOwcBCjY
+BIAAWF6+iRBokhJolgHRDywwfS0KgA3MAiw0fdEPLjB9xPAP7gIuNH3RDwAAbBAEwIAI5BYBAgAb
+SgwCKgkLqgojpmQr+sALSwH6pgAN8CwFAAy7AiumZSemZiqiZgrqMBlIsimSRQmZCgqSCgbqMAYm
+DGphDm0ICAzqMAwsDGrBAmP/8AjkFtEPAAAAbBAE+hACHaVJBQDzMQAJMTj1AAOjOqMk+IAAQj+I
+BQAIQgHRDwAAAGwQBONL4hkWQoAAoyLRDwBsEAQYSTDoAAUJn4KAAG05AgICYdEPAABsEAQSS9nR
+D2wQBBhIxhJJpiiCoiIigAmIEagiAioCWqJVGUki+EDoFaAKBQD4AAgd4EkFAG2aAggCYZon0Q8A
+bBAEEkvKIyJAIiF/oyLRD2wQBBJKUxRLxiMigXs2ICkiigkJVfsgBADQCBUAAIgaIiL+AiIU8wAA
+QTAAJgAAACJBfSRBgONIbxIAWYAAAyI1pCLRD9EPAGwQBBJKQSMigXs2GykiigkJVfsgBADQCBUA
+AIgaIiL+AiIUooLRDwASS6siIX/RD2wQBMsnwFD3/gId7wYFANMPbQgNcmANAoIU5CAcYqghAABj
+/+lycAu0VfAAGA2kIh0AsVUCEhRlL/fSUNEPwCDRDwAAbBAEyiCwIwMlAXMgF20IDLBU5FUBCpAE
+gAB0IAJj/+wPIhHRD9EPwCHRDwBsEAQTS44jMn/wYOAN4AIFABhLi8AgIobA0Q/RDwAAAGwQCBdI
+chJJkxZJripynfhQSBXgAwUA/JGeBaAIBQDsFgQtVkKAAOqZCAOj8QAA+CBmFeAAdgAA+rAGFaAI
+BQDkTAEhmAUAAPRgCmISAJ0AKXKhJSKCqTntYIAszkKAAKlVJVIHADAE+pAQFaDdnQDlUg4m/zCA
+AH6nxAM6AvwgaB2gC3UAWCU2ixTYUPoACB3gOTUAbZoCCAJhLiqA/qAARzGIBQD4oABEMqp1AKpa
+6hYCIuAHAADzGIYd4H+FAP+V5B3gG+UA+5YkHeAPRQD/lgQd4H2FAC3kRC/kMf/HBh3viAUA+cRG
+HaAJFQD5xCYd78wlAP3EZh2gC+UA+8TGHeAMdQAs5DD9xyYdoAs1APvHRh3viYUA+cWmHe/IxQD5
+xcYdoAllAPnIJh3gDwUA/8hmHeAIJQDo5C8o2ASAAPnIRh2gDGUAWCAg+iBoHeK6JQD6oABFMAxl
+AFggG/ogSBXiurUA+qAARTAMZQBYIBf6IGgd4krFAPqgAEUwDGUAWCAS6hIDKdgEgABb8RHnrqRt
+QASAANKA0Q9sEAYWSG0GAIcWSx8ZSyDYYG2aAggCYRhLHh5LHx1LHxpLHRdLIxRLIBNLIBJLHh9L
+HCUxpS82iiI2iSQ2iCc2hyY2hSo26iky4ysy3S027C42y+ysMCbwIwAA7DbtJuijAAAtNuXuNuQt
+3kKAAKuZiZfoNoYlUUEAACo2yome+CAGFeAEBQDlZQIkY/8AAOVlAyK5/QAA/MAGFad3HQD2wIQd
+5iUBAORlBSEBaYAA2iD6gGgd4A0VAFsB3GiuFfpAaB2gCwUA/MAIFaANFQBbAddprukoMoYnhQQk
+hQUlhQIlhQPlhAAEYEEAAOyGACEBUYAA2iD6AAId4A0VAFsBy2iuFfpAaB2gCwUA/KAIFaANFQBb
+AcVprumHECUyhw8CACdxJyRVBSdVAudVAyLgQQAA7FYAI7H9AAD2wAABd2YdAOZVBCERaYAAAioC
++gACHeANFQBbAbVorhX6QGgdoAsFAPygCBWgDRUAWwGvaa7pJTKIDwIADwIAJlUE51UCKVAEgAD2
+oGQd4AsFAORVBSLgQQAA/KAGFaANFQBbAaNorhX6QGgdoAsFAPygCBWgDRUAWwGdaa7pKDG2ZICZ
+JTKJJzGpJFUFJ1UC9qBkHeYnAQDmfH8i4EEAAPygBhWnZh0A5lUEIQFRgADaIPoAAh3gDRUAWwGN
+aK4V+kBoHaALBQD8oAgVoA0VAFsBh2mu6SUyig8CAA8CACZVBCdVAidVA+RVBSLgQQAA7FYAIQFR
+gADaIPoAAh3gDRUAWwF7aK4V+kBoHaALBQD8oAgVoA0VAFsBdWmu6SkypyIy5SYK+/jPAAtwWgUA
+9ECkHaFcBQD8QEQdoAsFAPxAZB2gCDUA6CUEIWBBAAD8QAYVoA0VAFsBZmiuFfoKAh2gCwUA/EAI
+FaANFQBbAWBpruklMuotbH8NfRQtVQQmVQL2oGQdpiYBAORVBSLgQQAA7FYAIQFZgAACKgL6AAId
+4A0VAFsBUmiuFfpAaB2gCwUA/KAIFaANFQBbAU1prukqMqhkoJCwrg6oAX6gFW0IDLCP74gBDFAE
+gAB/oAJj/+wPqhEiMu3TDyQlBeolAiUZ/QAA+kBkHaczHQAjJQT8QgAVpjoBAOwmACGBUYAA2jD6
+AAId4A0VAFsBNWiuFfpgaB2gCwUA/EAIFaANFQBbAS9prunRDygyiCaFBCeFAieFA+SFBSRIQQAA
++QAGFe/4ugAAAAAA//4kDaAKFQBsEA4WSkUsIAwYR1AqYm/rYncmNL0AACiAfQmqEftgAEUwgwUA
+46MIBHwcgABgAAIjrQMcR8aIzfEBUA3gAgUA0Q+qwwkzEfNgAEH//6IAAAAkYiQVSjLkFggiIf0A
+AAQ6FAWqAftCABWgGwUAWF0T+CEIFaeUHQDppQQtEASAAOilAiVgQQAA+UBkHaAHBQD3QKQd5kgB
+AOymACIBUYAA2kD64Ggd4A0VAFsA+WiuFfqAaB2gCwUA/EAIFaANFQBbAPNprukkYiMPAgAPAgDk
+FgkiIf0AAPLPhhWjpB0ABaoB+0IAFaAbBQBYXPQnpQX0ISgVp4QdAOilBC0QBIAA5KUCJWBBAAD1
+QGQdpkQBAOymACIBUYAA2kD6AAId4A0VAFsA22iuFfqAaB2gCwUA/EAIFaANFQBbANVprukkYiIP
+AgAPAgDkFgoiIf0AAPLPZhWjpB0ABaoB+0IAFaAbBQBYXNYnpQX0IUgVp4QdAOilBC0QBIAA5KUC
+JWBBAAD1QGQdpkQBAOymACIBUYAA2kD6AAId4A0VAFsAvWiuFfqAaB2gCwUA/EAIFaANFQBbALdp
+rukaR0Xyz0YVoBsFAFhcvhhJ1xlHFf3/4h2gDTUA6obwJEAPAAD4AAgd4AnFAG2aAggCYRlH7/8s
+ABWgCgUAKpR8LJR+LJSuLJTeLZR/LZSvLZTfLOSuLeSv/dWGHeAPJQD/O4Yd4AgVACiUrCRiJMGw
+BLQ25BYQIiH9AAAEOhQFqgEqrBBYXKAnpQX4IggVp5QdAOmlBC0QBIAA6KUCJWBBAAD5QGQdpkgB
+AOymACIBUYAA2kD6AAId4A0VAFsAh2iuFfqAaB2gCwUA/EAIFaANFQBbAIFprukaRy/ipgspAEYA
+AMck0Q8qEhD5UAAVMBsFAFhchBtHKPLgaB2v+UUACpI46rYMIQBBgADRDwAAHUmXHEmaEkmXGEmX
+6BYPJiAhAAAsFhEqYnssJn+dGymhAiwmgCQmgeQmgiSJOYAAWwCsH0ZnL/KQLmJ3qv/pEgsv/kKA
+AK/uKOAH+TAQFeD6xQAKiAH+kwwF54gBAAmIAijkB58ULeIAKuIH7iaDINhBAAD9oAAWsA4VAP+m
+AA6wDBUA7RYFJVCBAABbCH8sEhGNG4gf4iwwIiDBAADszDAm6AUAAPmf+1UiAJ0AJDIHJEIOJEIE
+5BYNIiH9AAAEOhQFqgH7QgAVoBsFAFhcSielBfQhqBWnhB0A6KUELRAEgADkpQIlYEEAAPVAZB2m
+RAEA7KYAIgFRgADaQPoAAh3gDRUAWwAxaK4V+oBoHaALBQD8QAgVoA0VAFsAK2mu6Y03HklOjd4c
+SVLzzwYVoApVAP2giBXgOyUAWCPmH0lHL/J48uBoHa/+RQAP4jjIJNEPxyTRDxJF3y4i254eLDIH
+HUk+LMIOIiLcJ9a8K8IGLMIFLNa4LNa6DLsI7s4MBdv9AAD9bwAONu4dAP+3ZhWmzB0A69a5JiH9
+AAD8IYYVo6QdAPVABAVwGwUA7NZ2JVBBAABYXBAnpQX0IYgVp4QdAOilBC0YBIAA5KUCJWBBAAD1
+QGQdpkQBAOymACIBUYAA2kD6AAId4A0VAFr/92iuFfqAaB2gCwUA/GAIFaANFQBa//FprukZSRTj
+lnUpgGYAAPABFA2v8kUAHEkWjx4ukrn9NwgV4ApVAPIgBhWgaAUA+CAmFaA7JQBYI6YfSQccSQ4t
+8rv/90gVoApVAP/uyBXgOyUAWCOfwCDII9EPAAAAHkb6LxpBLRpALeYQHEj6K+IRK8bxL+YQKGG7
+KeIRKhoA6pkCBHgogAAYRaEImQL8AAIdoANlAPmAAh2gOvUAL+YQKeYRHUjsJ9amLNZ/LNZ+LNaA
+LNaFLNaELNaKLNaMLNaRLNaQLNaSLNaWLNaYLNajLNaiLNaoLNaqKNadKNaf+bSmFa/79QAr1oEr
+1ocj1pMq1pwq1p7ztSYV4AoVACrWjvqMwAXgEwUA87QGFeAINQAo1ogTSH8j1o34juwFo/P1ACPW
+pCjWi/thphWgGBUA+bNGFaAbpQAr1oIaRj8q1oYbSHUr1pcbRroaSB8q1pn7eEgV4BzlAP2vhhWg
+HLUA/bKGFaAM9QAs1qvRD2wQBBJHNSMigXs2GykiigkJVfsgBADQCBUAAIgaIiL+AiIUooLRDwAS
+SJ8iIX/RD2wQEhtItiiy6+lItRQScYAA8gACHaAMBQD0AAId4AYFAPYAAh3gCAUA+CKGFaAPBQD+
+ISYV4A4FAP4hBhWgDQUA/CFmFeAEBQD0IOYVoAMFAPIhRhXgBAUA9iKmFeADBQD2IcYVoAcFAPQi
+RhXgBgUA/CJmFaAMBQD8IMYVoAUFABxFahtIlyzCmyuylqwsCcwRrLubHCyxEiW1EyuxE+xVCAlQ
+BIAAWE8UIhYWix6CHC8SFCkSFZcvLiB0liwjJFUsIHEoIHMqIHItIFSdE6mpr4+ryyghMowrrTOb
+Hi8WFCkWFYoWKiYSKSIRjxuLLi0SE6xmjBit7at3r4+fGygiGyshNC4hM6mqLRYTKSE1jRms7JwY
+rb2OGosXnRmunquLGEhvKRISIiBwKIBtnhqpKeISFiR8coAAKRYSIhYWiByCE5IVIoRi8iLIFaAA
+PgAAiBwpFhIogGKYFRlIYJoWiBUpkuubF+hECAEQBQAA+F/4a+IAnQAYSFkogu1kgVv4IcgV4AIF
+AG0IFwABMAAAMSAMNiANAQABMQACAAACMCAMASQWFxRFISRCnSIWGKQkEkhLIiKW6BISKiZCgACk
+IiQgcKhIKBYSJCByKBIVIhYQKiYSqEgoFhUkIHMoEhQjJFWXL6hIKBYUJCB0KBITliwlJROoSCQh
+MigWEyghM69PJCE0rIwoITWtTSQiG66OKCBxq0skIRKpiYgrpFWELqhmGEgvpHckIhEogG0iIFSS
+H6SqJBIXojPiEhgkfeqAAJkeIhYWKBIQgh8iFhEihGLyIsgVoAG2ACqSWWSirvQAAh2gAwUA+gAC
+HaAHBQD2AAIdoAUFAP4AAh3gDAUA/AACHeALBQD6IkYV4A4FAP4ihhWgCwUA/CKmFeAOBQD8IcYV
+oA0FAP4iZhXgDAUA//swDaAPBQAoEhCZHiiAYigWERlIBigSESmS7ehECAEQBQAAeSsEiR5j/qsi
+EhLpSAAWDeGAACyVCS2VC+6VDSWCOYAAsLgIuQGZFPlgC44iAJ0AixQPAgAPAgBtCBLrFgIly/0A
+AOm7AQ3ABIAAeYAH+iCGFe//egCLEulH7B3fwoAAmxKLEi6VDRhH6C2VCyyVCSuGnC2R9htH5OyR
+9yaJWYAAiB4pkfgusEkitEiZEQmOOS60SelH3RYAsYAALhIVKBIUKLRLLrRKLhITLrRMLpH1/8Jg
+BpACBQAitEUitETzIaQdoAAiAABk0T8okljjll8kCImAAJ8b+iDGFaACBQAaRJ0ZR8oqopwpkpaq
+KgmqEaqZKRYNKZES6RYAKNAEgABYVfSKHYsQ66USJVCxAABYVfCKHSqsOFhV7okdjBYukhEtkFQs
+lhIjlFWXn4+elpwqkRIllROIm6pVGke0qGavdyugba0z7swIARAFAADsFgYl/DKAAP0sRh3gAB4A
+LZBiK6JYrUT6X/ur4gCdACWmUyamVCemVSOmWiSmW40bLqH1LKI/jxb/SsYV4O4xAA7cOf1H5hWg
+AgUA0Q8ZR5v6IEYV7/r6AGXO1S6R+WXuzy6R+CiwSYkenhEOmDkZR5P5aSYdr/umAAAAZd5EZe5B
+ZL6eLJUJLZUL/yGkHa/5DgAAJZZTJpZUJ5ZVKpZWIpI/I5Za9StmFaCOMQAI8jnzJ+YVoAIFANEP
+AGXOvCyR+WXOto0RZd6xIrRFIrREIpUNLZEHKJEFLJEJkpgNiAwMiAz5IWQdr/pSAMBA+gACHaAH
+BQD2AAIdoAUFAPIAAh3gDgUA/iHGFaACBQDyIoYVoA8FAP4iphXgAgUA8iJmFeAPBQD/9+gNoAMF
+AAAAAAAAAGwQBpQQWB45W/6nFkbxDwIAKGGQ8wAWr9IAnQCKay1iDS5hkS9hkixhkysKAP4kAAfx
+7gEA/00ADrHMAQDtZg0mFjmAAGTyyxhFQ/iOoAXgC0UAK2YqKgonKoYQKIIRJCAM9kGwFeDIAQD9
+L4YdoLgJAPsvph3gqBEA+y/GHaCIGQAolH9YZmjmofRtEASAACliY+pEEBOTCYAAG0afq0srsH0o
+opyntweHCAl3EQeXCCd8gCtiYipiK/tAAEVwBDUAWGZCWBy9WGXT5qGxbRAEgABYZVJYZQZYZAXm
+oaBtEASAAFhjIuahlW0QBIAALGGNfscKWGMc5qGEbRAEgABYYq/moXltEASAAFhideahbm0QBIAA
+LWGQ0w/TD/OgCqfSAJ0ALmGR0w/TD/6ACyiiAJ0AKmGTLwoY++ALUKIAnQAESAL7AAwQoAQFAClh
+ktMPe5ca6nQACdgEgADsEgAq6ASAAFhht+ahFG0QBIAAW/vMWwJfZaIWwCBmIQFb+2LmoPttEASA
+AFgd2B1EACnQfepG/xToloAAHkOPKKJ2Kfr9CYgBKKZ2JKZxLOLIH0PSKdB9D8wBLObIeZ8eLKJ2
+x9sNzAEspnYbRtYrsn/kpnIlgFGAAB5G1CTmwFsCRMmmWwJDZKF0KHANincpcHuKruuUAAQJeYAA
+GEZSL4KuGUO5GkN+/IeaBeALBQD55gAP8Ex1AP8VxhXgHgUAbeoMLqGU7OEgdVAJAACxuy/SghhG
+2PngBAewCBUACP8C/7BGFeAA9gAAZr/iKtKE+2AEANAJFQD9IAEE3/z1AAycAwyqAQqZAvmwhhXg
+AFYAAAAAAAAAWGIJ566pbRAEgABYHZraUOs0AAlgBIAAWCAkwCDRDwBYYfHnrphtEASAAGP/3AAA
+AAAA6nQACdgEgADsEgAq6ASAAFhh0eavwW0QBIAA+tJkFa/57gDAQOp0AAnYBIAA7BIAKugEgABb
+/FjnrmltEASAAGP/lAAAW/3i+sFmFa/0qgAnopukdwl3EfcgAEP/9sIAm26bb/rCBhXv9NYAK2YU
+K2YTK2YS+sKmFe/0ngDAyAyZAvjgAATwaFUA6XR7JWAXAAAoxe7oxe8lgWGAAMCl/IjqBaALBQD+
+DIIdoA01AFghIWP+nMCi/IjkBaALBQBYIR1j/oxkn9TApfyI1gWgCwUAWCEYG0Nj7ERpG9AEgABY
+HfNj/7YAAPoHAh3g+vUA/B+CHaCtpQBYCY/mrtltEASAAPoHAh3g+vUA/AFiHaANNQBYCYnzQGgd
+r/bmAAAAAAAAAGwQBMk39GAGoJIAnQDJOPRgBqCSAJ0AwCDRDwAAACchE+R3CAn/VgAAKCErHkPT
+DwIAd4kCLiUrfmE262QACVAEgAD8AgIdoA0FAFgAMuaghG0YBIAAHETYLMF/AioC94AARnALJQBY
+Hw7moGhtGASAAB1DwdMP0w99UTDrVAAJUASAAPwCAh2gDQUAWAAh5qBDbRgEgAACKgL84GgdoAsl
+AFge/+agLW0YBIAAAioC/OBoHaALFQBYHvnmoBdtGASAAOoiCipYBIAA/AACHaANFQBbAPfSMNEP
+AAAAhyz04ABDv/yqANxw+kBoHaALFQBYHuvmr95tGASAAOoiDSpYBIAA/AACHaANFQBbAOjSMNEP
+AGwQCBREyoYvJEJ/o2YEZAqEQORAvWs/goAA7EOyEoWpgAArQAcLC0EMuhGsqiiintmwmRT3AAhD
+UgCdACWinWRRBQu6AlsDc/4AAh3gDgUA+qBoHe/99QDtFgAtKASAAP4gJhWgDVUA/EAIFaAOBQDT
+Dw8CAPwgRhWgDBUAWwS0/AACHaANVQD+AAIdoAgFAPggBhWgDwUA6BYBLVgEgADoFgIq0ASAAFsE
+qY0UHkONDN0R/6AARrAMZQAs1p0rIAaJIsCh6pkCBdgFAAArJAYpJgLaIPzAaB2gCwUAWB6r5qBX
+bSgEgADqIhAp2ASAAPwAAh2gDRUAWwCo8IPADeAGBQCKRyZEBSqpFGWgSvqBSBXgDAUA+kJoFaAu
+BQD+gEYVoA0VAFsAnR9EgC/yf6f/5vYAKpAEgADRD9JQ0Q8A//vsDaAFBQDaIOu8GClgBIAAWwJL
+xyTRDxxF1y4gDS0gDOoWACn4BIAA+IBIFaAbJQD4ICYVoApFAFggYItHKkICDwIA+WQAFe/MBQAM
+mQHmtRQkyQEAAJm56bYIJQIRgAD94AIdoAsFAPuCQB2v/QUACooU5KAdZdghAAB6yPF60Ay0u/AA
+HA2kqh0AALG7ChoUZa/32kBbAgJj/y8AAP//yA2gCwUAbBAG/ITQFaCJBQD4YAQEdnMBAOgWACHg
+PoAAA4VC+KAAQvAAGgDVcBlFqyqSlihAWyuSmqyq7JKSLVZCgAD7QABFcAYFAOoWASQBMYAAjkgJ
+7hGuvi3geYvgLdz//c8mHefdAQDsuwwGlcGAACZEW+s0AApQBIAA/AACHaANBQBbpJbqJAAKWASA
+APygaB2gDQUAW58l61QADRgEgAD6gGgdoAwFAFuiJSpAJvqgaB3iXQUA0w/9QABFcAwFAFuhTRtD
+/BhCFQhYAii2s/6INAXgCAUA/3aGFeAZBQBtmgrriQoEQAUAACaWtSkgDSW2s+sgDCSB2YAA7kOl
+FICxgAAdRXQu4H0t0luwnA7MKKvbrLsYRBcOvxGo/4/wDw9Gf3kJ8ABYDaALBQAAACkgDSsgVcDB
+Cck5C3sMq5sqIhSHEPwAAh2gDRUAWwAaZHGiKUAmF0JJ///iHaAPFQDjmREC8GuAABpD/QVcFPmA
+AQT0tQEA+yAARLAAPgAdQ/n9IABE8rUBAKeaKKKAALEE4GwaDYEKgAAA/RoO3QMNiAEMiAIopoAu
+QDZ85xMpEgEokRgojP8ICE/olRgkC9GAAG5eDRpEBAZZEaqZiZBgACAAHENcBVsUDLsKKrKEK7KI
+BQxEAMEE66oCD8gKgAAKmQHJlY4R2lD6hNAV4AwFAP/DBBWgDQUAW5lFK0BaGkUx/AACHaANFQD7
+VIgVprsBAFr/5CZEWipAJiYkYyZFGSZFGiZENluqJixAJhtD4APMEevMCA0QBIAAp8wswoCNEf1A
+BEQiAJ0ALdA0ZNCpKkAmW/fqHkIYLuB96UAmJ3W6gAB/lzIAKxEeQv8JHRQO3Qos0vSCTighAyIh
+AgwMTwy8AvhPAAk//yUAAvM57Nb0KZAEgADRDwDbIB5C8gkdFA7dCizS9IJOHkMqKCEDIiECDswB
+DLwC+E8ACT//JQAC8zns1vQpkASAANEPgk4oIQMiIQL4TwAJP/8lAALzOdIw0Q8oIhQpgQMogQL5
+H/KEYgCdANIw0Q+JESqQIgOqEauqp6oipoDzIyQdr/0OAAAAihHcYPtDiBWgDRUAWv+hY/05AAAA
+ihEooh2IgfoAIh3gDAUAC4AA//nQDaAPFQBsEAQlIA3OPspc4iAMIoHRgAAYQwsURNwogH0kQn+w
+UwgzKKJCoyITQ34OIhGjIoIgAgJG0Q8AACIgVcBBBUU5oyIFIgzRDwAUQ3YOIhGkIoIgAgJG0Q8A
+bBAEKCIQ0w8pgQMogQL5D4YN7/ZFAMBA+kBoHaALhQBYHF7moXFtGASAACoiENMPK6EDKaEC+yfG
+DeAFBQDbQFsHpcDA9UBoHaANBQDqJAAKWASAAFv+huahNG0YBIAAKiIQ0w/TDy2hAyyhAu3BB3Ko
+BQAAaVjFKaEDKKECwPH5DwAMcA4FAAj+OGTvidog/B+iHaALBQBYHZHToGYw74oqDwIAK6EDKqEC
+e6F3wDD6QGgdoAuFAFgcOOag8W0gBIAAiiosoQMroQL9Z6YNoAUFANswWweAHUH/HkH+80BoHeAL
+BQDqJAAJ4ASAAFv+G+agn20gBIAAiiouoQMtoQLu0QdyqAUAAGlUxiuhAymhAsCB+y8ADPAPBQAJ
+jzhk/41gAAIAwDDaIPwfoh2gCwUAWB1r5qBbbSAEgACKLS2hAyyhAn3BS9swWwdjHUHhHkHh80Bo
+HeALFQDqJAAJ4ASAAFv9/umkAA0gBIAA8UIoDeAPFQCKLSuhAyihAvsPAAxwDgUACP44ZO+70pDR
+D9Iw0Q/SQNEP91/4DSIAnQDaIPxAaB2gG8UAWwDRY/7sdqng2iD8QGgdoBvFAFsAzNJA0Q9sEAwW
+QdUvIDUZQZwtIAyFMSiSey4gNPcwaBXgCwUA/QAARHdVQQD9CAAUMFVNAOh3CAKAoYAA/cQgQVAJ
+dQD4RoYd4A51AOhEShdAU4AACOgKiIDvFggsACKAACskNBxERS0gNRZBvC4hFhNBuS9iFZMQiSr4
+ICYV4ApVAPQgRhXgOwUAWB7IKmIV6zQACuAEgABYHZbSUNEPAPyIbgWgClUA/MKoFeA7BQBYHr8W
+RDQaQV0VRDKaGuoABQtIBIAACQJhCQJhCQJhCQJhGEDFHUQtLCAMGUEgKiANG0JX6ZB9LmYCgAAM
+qgLrqgIK+ASAAPulhhWgmQEACY85GkJQKtYtL9VcLiA1wMDrdAAL0ASAAOzUwS93AoAA7tTAK2AE
+gADtRBkacASAAFvpxvVAaB3vi9UA+1/65GIAnQBlrx0cRBArwVwLC0srJRYswWQeRA/+ISYVqswB
+ACwlFyrgACngASkkNyokNijgAi/gAy8kOSgkOC3gBe7gBCEo2QAA/kdGHaAMFQDtJDsr0ASAAFgK
+zBxD/y5wDCtwDSlxCShxCC0hFi9wFC+kFCilCCmlCSukDS6kDComES8gNi4gN54QjhgrIDibESog
+OZoSKSA6mRP4R3AVoDsFAPgghhWgClUAWB5wHEPrL3AULnEILXEJ+ELkFaAKVQD4IAYVoDsFAFge
+aYkgKjwa6JkRCtgEgAD4YGYV4AxlAFgYoRpBTpUcKqIVWB1XgxqLHP4hKBXgDCUA/EaGHaAASgAf
+Q9MTQPrrLDYns9kAABVB+R5DzeMABQtIBIAACQJhCQJhCQJhCQJhGkH6HEPM+ELEFeANFQAt5i0s
+5VwKmQIp5iwosAAtsAEt9AEo9AAssAIqsAMq9AMs9AIpsAQosAUo9AUp9AQs4i2NcCjiLB9A9Coi
+EZob/+9oFeeIwQAFiAoognzv3QwLWASAAP2gABawDlUA/6YADrfMAQALgAAZQ6qOGyWSLY7i+odQ
+BedVQQDz2EAN4FVNAGSzfI93j/6b8PXgJhWvgtUA0Q8AABNAxxZDnPyHRAWgClUA/EMEFeA7BQDv
+EggrcASAAFgeH/6DggXgDhUA4wAFC0gEgAAJAmEJAmEJAmEJAmElIhEaQ44bQcIZQMooIRYcQ5Ip
+knsLiAIspi4upi0opiz84AgV54jBAA+ICuiCfCtYBIAA+a8ADvAMFQD9oAAWsA5VAO7dAgrQBIAA
+C4AAGUN7KJItilL6hvQF51hBAPNN4A3gVU0AZLLWiXeJnpuQ9SAmFa+C1QDRDxNAmfaG3AWgD0UA
+wOHjAAULSASAAAkCYQkCYQkCYQkCYRxBoCUiERtBnRpApCghFhlDZCqiewuIAi6VXBtBjCyWMC+W
+LSiWLPzgCBXniMEAC4gK+Q+IFaAOBQD/K6QdoAxFAOrdDAtYBIAA/aAAFrAOVQDu3QIK0ASAAAuA
+ABlDUSiSLYtSCIVH82TQDeBVTQAaQ01kokKLd4u+mrD1YCYVr4LVANEPE0BvFkNFwLLjAAULSASA
+AAkCYQkCYQkCYQkCYRxBeRpBeB5AfBlDPSghFi7ieyuWLQqIAiyWLyUiESiWLI1wGUFi/68ADreI
+wQDpiAoLWASAAPkPiBWgDCUA/aAAFrAOVQDu3QIK0ASAAAuAABhDKyiCLY9SCIVH8fywDeBVTQAZ
+QydkkcCKd4qumaD1QCYVr4LVANEPAAATQEkWQx/jAAULSASAAAkCYQkCYQkCYQkCYRVBRRxDIfxC
+xBXgClUA/kIoFaA7BQBYHZ0ZQUAoIRYfQxIqIhEJiAIo9iyJKh4/mRs/2fgcAATwDAUA6ew5DmgE
+gAAJvTkeQEb9hgAOcA0VAA3MAi7ieyz2LfzgCBXniMEABYgKKIJ87t0MC1gEgAD9oAAWsA5VAP+m
+AA63zAEAC4AAFUL5JVIt9CQABLdVQQD7KvAN4FVNAPU/1vCSAJ0A/EGQFeAAKgATQBkWQu4cQvcu
+IA2PICogNZoQKSEWmRH4QUgVoDsFAPggRhWgClUAWB1uH0LlGkLi4wAFC0gEgAAJAmEJAmEJAmEJ
+AmEbQugpIA0sIRYeQuctIAwKzAIu9i3s9Vwu1gKAAAqZAguZAin2LCggNcDQ6nQAC2AEgAD/AAAU
+MA4FAOj0wCvYBIAAW+h95aQABQC5gAD6AEIdoDsFAOxC1RroBIAAWB1QwNDtJDQqkASAANEPLvqN
+flFRZVnfwPP+RoYd7/IyACj6jXhRPmVZzMD0/kaGHe/01gAp+o15UStlWbnApfpGhh2v9xIAACv6
+jXtRF2VZpfpAaB2gCzUAWqq1wMb8RoYdr/j2ANJQ0Q8AAGwQBIIngi6CL9EPAGwQBIIngi4jIhCC
+L6MisCLRDwAAbBAEgieCLoIk0Q8AbBAOFUKG4lLpKUgEgAAoIhOTFfgghhXgBwUA5ICQYrAHAAD8
+sogVoAA2AAAAAC0iE2TQev+fYA3gBAUA6iIQKlgEgABbBXMrYpVmoFYpUuOquwm7EauZKZIKZJBG
+I5II8GQADeCNxQAsMGR9wTX6gIgF747FAO40ZCnQBIAAWvqxJ6QSjzLnpQgvgNYAACswB/pgaB2h
+uwEA67wYKeAEgABbBgcsUpSxRHxDj2P/fixSlfGO4A3vwwUA8AE4DaAEBQCOxy3sIAPdAeflFCbp
+AQAAnemd6JfIl8mXypfLl8yXzZfOl88nxhAnxhEnxhInxhMnxhQnxhUnxhYnxhcsUpUkTAH8gATi
+ogCdAC1ikyxS461NCd0RrcwuwgzsFgYnfoiAACvCEu4iJCZhIQAA/CEmFaSrQQD7WgANMA0VAP9A
+AQUwDAUA+0AIFa+7gQBa/P6NFogZj9fnhgAn8IEAAAPuAef1FCdxAQAAnvme+JfYl9mX2pfbl9yX
+3Zfel98n1hAn1hEn1hIn1hMn1hQn1hUn1hYn1hcsUpWxRPyf+2OiAJ0AKSIRKsx/+CFGFeeqHQAq
+lQQnlQX9IEQdpkwBAOyVAyTgQQAA7JYAIgFhgADaQPoAAh3gDRUAWvjwaK4XjBr6gGgdoAsFAP2A
+CBWgDRUAWvjqaa7nLFKS0w/KxsBALGKUKlLjrEwJzBH9QABFMAsFAPtEABWgTAUAWBbsLFKSsUR8
+Q9mNLi7Mf/whZhXn7h0ALtUEJ9UF/aBEHaZMAQDs1QMm4EEAAOzWACIBYYAA2kD6AAId4A0VAFr4
+z2iuF4wb+oBoHaALBQD9gAgVoA0VAFr4yWmu540tJFKSLRYMJ9UFJNUC5NUDJuBBAADs1gAiQf0A
+APTAAAI3iB0A6NUEIgFpgAAESgL6AAId4A0VAFr4umiuF4wc+oBoHaALBQD9gAgVoA0VAFr4tGmu
+5yxSlGTAccBAbQhoLmKVLVLjrk4J7hGu3Y/XLvwgA+4B5/UUJ3EBAACe+Z74l9iX2Zfal9uX3Jfd
+l96X3yfWECfWESfWEifWEyfWFCfWFSfWFifWFyfWGCfWGSfWGifWGyfWHCfWHSfWHifWHyxSlLFE
+fEsDY/+QAC8iEJ8dJ/UF7PUCJiH9AAD94GQdp0QdACT1BP3iABWmTAEA7PYAIgFhgADaQPoAAh3g
+DRUAWviHaK4XjB36gGgdoAsFAP2ACBWgDRUAWviBaa7nLFKTZMBOwEAoYpYjUuOoSAmIEagzjjf9
+xAAV788FAA/dAeflFCbpAQAA7eYJKlgEgAD9wQYV4AwFAPpB6BWgDRUAWvxalzuXOpc5lzgsUpOx
+RHxDsoMvKcx/CXkUKTUEJzUF/GBEHaZMAQDsNQMh4EEAAOw2ACIBUYAA2kD6AAId4A0VAFr4Xmiu
+FfqAaB2gCwUA/GAIFaANFQBa+FlprukaPoYpUuMrYpsqoH0JuxHrmQgFfFiAACuSJ4u+K7IQsLv6
+IOYV4ABCACySp4zOLMIQsMycFy0gFPegCyiSAJ0AHEGPHUGOLRYO/CEGFaALBQArFhAoYpIkEhAj
+UuOoROwSDiomQoAApDMtMgAuMAwkMgcvMA0oMDX0gcgVoApVAPggBhWgOwUAWBv4KTA09SAOwxIA
+nQD6RAIdoAsFAPqAAEUwnAUAWBY7KkwQ/EICHaALBQBYFjf6XgIdoAsFAPqAAEUwLMUAWBYy+mQC
+HaALBQD6gABFMHwFAFgWLoQ/ZECOjBiNQC5ADIlHL0ANKDA1KZIO+CHmFeAKVQD4IAYVoDsFAFgb
+2Yof/BICHaIrBQD7QABFcAsFAFgWHoofwLD7QgAVohwFAFgWGoof+l4CHeAsxQD7QABFcAsFAFgW
+FYof/A4CHaMrBQD7QABFcAsFAFgWEJdIl0mXSpdLl0yXTZdOl08nRhAnRhEnRhInRhMsEhAnNhMn
+NhInNhEnNhCXP5c+lz2XPJc7lzqXOZc4LSAULMwBLBYQ/Z/1u2IAnQCFF4oUWvkQiiP+oAAWMAsF
+AFgV+IokBVwK/4gAFjALBQBYFfTkIgEqn8KAACg8fwh4FChFBCdFBeNFAiJgQQAA8oBkHeYzAQDs
+RgAhgVmAAAM6AvoAAh3gDRUAWvfYaK4V+mBoHaALBQD8gAgVoA0VAFr302mu6SIiAilcf/ZApB3n
+mR0AKSUE9EBEHeY1AQDlJQMhYEEAAOwmACGBWYAAAzoC+gACHeANFQBa98RorhX6YGgdoAsFAPxA
+CBWgDRUAWve/aa7p0Q8sEhD8YUgV4C4FAA7MAh4+AosVDt0B7TYKKdAEgABb/I5j/gcAbBAKFT4W
+GT7sLyAMFj2yGD8UmBMrYqYqYpsuYqgtYqf8IIYV4AMFAP4gxhWgBwUA/tRoFaAMRQDq/wgDI8EA
+AOsWBS/+QoAA7+4IDJAEgAAoIf8vYp/tQqckBbGAAK8/Cf8Rr90t0CKJE/WgBRJSAJ0ABQCHK+AN
+nBkN2AkfPs4q4AzqFgcsRwKAAAj/CC8WAQkCYQkCYQkCYQkCYS/x/+sWCCeDYYAAKxIDLBIHLhYA
+GD7sHkDQGUDLKhIAKeYfGT7s6IKQLu8CgAAt5IgJ/wIpEggdQMPv5UAuZgKAAAyZAv0mAAzwDEUA
++cPGFeANVQALgAAbQL+MGSuyH44QLRIB+w4ADfD69QB7qAIn1n/jPAEmY/0AAOXPNGEQwQAAG0CU
+7D6lFcghAAApxoYpxocrxoTrxoUl6MEAAC3GkO3GkSXQ4QAAKsaS6saTJfmhAADvxp4lwYEAACjG
+nCjGne/GnyRAwQAAKMao6MapJ/jBAAAvxqovxquC54IuI8I2giTnNQUh4EEAAJwwIjUC4jUDIXn9
+AADywAABN/8dAO81BCEBWYAAAioC+gACHeANFQBa90dorhX6QGgdoAsFAPxgCBWgDRUAWvdBaa7p
+EkCKDwIAIyJDIiJEJzUFIjUC4jUDIeBBAADsNgAhQf0AAPLAAAE3iB0A6DUEIQFRgADaIPoAAh3g
+DRUAWvcxaK4V+kBoHaALBQD8YAgVoA0VAFr3K2mu6SlCVMEwCTM2yT7AIBo91vpAaB3gDAUA+0Fo
+FaANFQBa+w2xInMp5ClCVPEnEA3gAgUAKGKRI0KnqCgJiBGoM9owWpavizf7ZAAVr8kFAAmqAee1
+FCVRAQAAmriauZc59mFGFeArRQArNAXlAAUB4IEAAAwCYQwCYQwCYQwCYQwCYQwCYeoSBilYBIAA
+/AACHaANFQBa+vArQlSxInsjkitCUyMKAOUWAiWHiYAAEkBJlRIoYpAlQqctIpioOAmIEahV9aAG
+VGIAnQApIqT1IAX8YgCdACoisPVABaRiAJ0ALCK89YAFTGIAnQDaUFqWhI1X/6QAFa/PBQAP7gEu
+7ECe2J7ZKlIL59UUJQChgACCq1r4a+okAAl/vgAAEkAtilzTD8iugqta+GXqJAAJf74AABJAKIpd
+DwIAZKAPgqta+F/qJAAJf74AABJAIpdbJ1YKKBIC9qEmFeAptQApVAXoAAUC2IEAAAsCYQsCYQsC
+YQsCYQsCYQsCYeoSBCnYBIAA/AACHaANFQBa+rIrQlOxM/p/+OPiAJ0AKUJS8SrADeAFBQAoYo8j
+QqeoWAmIEagz2jBallKJN/skABWvywUAC6oBKqxAmpiamYo555UUJQCJgACCq1r4OeokAAl/vgAA
+ijrIq4KrWvg16iQACX++AACKO8irgqta+DHqJAAJf74AAJc5jBL2YQYV4Dn1ACk0BewABQHYgQAA
+CwJhCwJhCwJhCwJhCwJhCwJh6hIFKtgEgAD8AAIdoA0VAFr6hi1CUrFV/L/64+IAnQAePUYZPuqX
+7yfmEJfuJ5Z/J5aLJ5aXJ5aj0Q8AAGwQBB8/2vx+VgXv/vUA9n46BaAKFQAnICIoIgor0q4AcQQA
+qhrrrAEEA6GAAAwMR2TApOC3FX3gBIAAC8hCeHkK/2AEBnAJBQApZIAOqAMIyAEvYU/5tcYVoAs1
+AA8CAH+wESkgDBo8pWiWcyqgfX+nAmiRaithTnu3BSwgDGjFduokAAnYBIAA7EQACugEgABYAGUK
+ogIGAAAAAADAwOC3FX34BIAAC8hCeHkKHz+vwIAoZIAPvwHuqQMJ2ASAAOn5AQrQBIAAKdauWBjx
+wCDRDwAAAAAAAP33Ih2v/w4A6iQACdgEgADsRAAK6ASAAFv+n2P/fgAA6iQACdgEgADsRAAK6ASA
+AFv85mP/cgAAbBAELzICLQoB6lQACdgEgADyfcgF4v+JACIgIiwyrgAhBODdGg5wBIAA/YRAHeeM
+AQD5oAZVIgCdAPlgSBXv/PUADNwDDOwB8SAFo9IAnQAMWFLo/wwP8sKAAA/sOe8+xRZA2oAAibIE
+LhH/JSAIkkmhAAl4UA2IEOjuAgpEAoAADogCHj93CMwCDswCDA5H5PSAJwOhgAAM3AL4eKgFoiyp
+AOw2riZAMIAA8AAYDaKcYQDAnx474i3wgPZYABEwPPEA7s4BCZiCgADj7gIO6wKAAOLuAgySAoAA
+At0CDt0CnbIs8iGcsyiAfvP/Ah3gDAUACDw4WBiiwCDRDwAAAP33Ih2v/8oAf5aMGDxZ+YAEBj/+
+GgAAAGwQBIgiwnrmPSscBm4AANogWA7XZaDAHD9N/EGQFeAKNQD+QbAVoBsFAFgZviwiBy3JFBc9
+cukiAiZYgQAA6sIJJoM5gABkkHfxReAN4C+lAC6gABg9aCyiAn/pBXjBWnfBQNqw/ABCHaALBQBb
+AZsbPWSWoIwgl6KTpSSkHPVAxhXgDSUA+0CGFeAJBQDppB0uZgKAAA3MAuymASrQBIAAWBiXwCDR
+DwDJlNqw/ABCHaALBQBa/ghj/7R3ybFj/+LaUPpgaB3gDAUAWBhn2iBYEmTSoNEPAIwnLckU5NBf
+ZlCBAACLyWSwVS6wAHfpBxg9QY+yePE/+gACHeAMJQBbAXYdPTwbPxKWoIwgk6UkpByVpvtAhhXv
++fUAKaQdLaYC/YAAFjANJQANzALspgEq0ASAAFgYcsAg0Q8AAAAA+gACHeAMJQBa/eNj/7QAAGwQ
+BB4+TiggDe3iriQA2YAA6iQACdgEgADsRAAK6ASAAFv/o9Kg0Q+JM2eQGx870dpQ790CCdgEgAD9
+1cYV4AwFAFgYNcAg0Q8oICIZO2gIiBEI2AIJiAKKMijmrlqVFMAg0Q9sEASKMAo6RG6pENpQ+mBo
+He/spQBYGCfAINEPGD7hCKgKiIDrNAAKYASAAO1UAAlQBIAAC4AA0qDRDwBsEASMMPqgaB3inAEA
+6jQABIH5gABokTdpkj/qxhJ+SASAAA3qMAzqMP2PAA5wABoAwMB5lg4P6jDAgJijDuowD+4MrszA
+0FgYP9Kg0Q8AAC362v//wA2gDAUAxtr//5gNoAwFAAAAAGwQBOIgDSlABIAALYEHK4AMDSIRIi0x
++mAABfHdcQAUO1+x3AvHKKQi8kAIFaAExQD2gAXb4gCdAC6ADBY9/v52dAXqIgEA/EAAETPuIQAC
+7gIP7gKCgO5muyEpNIAAZLBF+gACHaAJBQD5IAEBMAQFAG3JEYMk5kUKARARAADjVrwiIAUAACSA
+CC7cAe6ZCAVQEQAA6JIKAnFcgAD7WjYN4AQFACKCAHkmRPFkEA3gCQUAwKD5IAECMAIFAG3JEeYj
+CgIgEQAA4zK8IRAFAACTQy+ACOqsBCaQBQAA8yAARLACBQDolAoH8ByAAHujzMAg0Q9sEATSMCoi
+AA8CAA8CAAoJQuNUAASCUYAA9SAG0JIAnQBokhf9/UId4AwFAOokAAnYBIAAWBfs0qDRDwAE6jDz
+QAwSkgCdAPNADPJSAJ0AwNBm0WcM6jD1jwAOP/9GAAvqMHmmviogCPlACaEf7aUAZqEs6SEFJQzp
+gAAJDUcaPGv8QTAVoA6FAG3qCi+ipQ8PUn/BU7iqwJCPIxw7yan/GjwmKqJALsLSGDxeCOgBCN0C
+LcbSKsLSGDr8qP/vAAUBQEEAAOgABwxQBIAALsbSLMLSCgCICiCI+IpoHaANBQD4gmgdoALuACmi
+pAkJSf8wABS//poABOowKiAILCAM/kFQFeANxQDzQAUeEroBAAwMQ/2gCaug6hkAKCAJKSAL8dgA
+FTDaIQDuOu0e6QKAAO2qAgzOAoAA6f8CDEMCgAAKiAIaPX/o/wIN7QKAAA/dAg7dAokg7aaYJKh0
+gADJxdkgbckOj5QuIAi0me+mmSdwfIAAKSIAeZYU2SBtyQ8ropmblCggCOyHBHTIEQAAwNBw3iYM
+6jD1jwAOP/pCAAzqMPuPAA5/+hYAAAAAANogW/9W4KbdfWgEgAD/+bANoAwFAAAqIAgrIAksIAr8
+QXAV4aoxAAERAlgBAGagLIkg8T/zUlIAnQAqIAgrIAnTD/xBUBWhqjEAWBAwZqAM+kFmHa/5MgAA
+AAAAAP/5BA2v/fUAeJcH8AAcDaaZAQAJiUIaOqsdO8wqop75sEgV78kBAKyqCaoRqplkneb9JvAV
+7/j2AAAAAAAAAAD//QgNr+2lAGwQBooyiDAZOmXtOt4UJWiAAPsgBJOgGxUAGDw3/1AAFT/59QBt
+ugfphtQkQBEAABI8Mg2rAismvRo93yomvFgGouekAAUBYYAA6jQACtgEgAD84Ggd4AwFAFgXTtKg
+0Q8AAAAAAAAA//94Da/npQAAABQ8IRY90Swi8Ow0ECGQRQAA2iDtQu8o2ASAAPwgBhXgDEUAWBJ5
+JEz85knkcRARAABj/6MAAP/+eA2v56UAbBAKAiYCC+owGD3BKIJ/+WATO6IAnQAdOpsXOxoaPbwt
+0iAichkrpn/7T8gVoAwFAFgZbRw6lNMPLMB9828ACrANFQDtdGgmcCiAAC0wAGjTKcfu/sAEBzA/
+hQB/4RzApfx7WAWgC4UA7zAAKmgEgADlFgArcASAAFgYFsHz9eALMuIAnQAXOhImdr0aPaMbOhL8
+DIId4AwFAP4BQh2gCDUA+PfGFaAPBQBa+XIdPZjipAAFDrGAAPQg5hXgCQUA4xYGIgmpgACWFPp7
+KAXg5gEA7hYIImP9AADsFgksqASAAPogphXgAzUA8ABIDaAGFQAAAAAAAADwZMAN4AYVAI8ZiBh/
+UwHAYOSAeGsXwoAAGznx8vfGFaAMBQD4ewIF4G1FAPp6+gWgDqUA+CAGFeAPBQBa9CripAAFBNmA
+AGYgxiVcAXRTrxQ6zx09cQvqMCrSf/tgC4OiAJ0AHjpKLuIgK9Z/KtJ+/cBoHeAMBQBYGR0rRhnq
+RhghhzmAAMDwL0Ro0Q+KFg8CAKWqKqAAKna9Gj1h+nOgBeAMBQD4esAFoAkVAPhGAAzwbUUA+PfG
+FeAOpQD4IAYVoA8FAFr0COKkAA173gAAK3K+83/7gFIAnQBgAC+MFityvaXM+4AGHe/9egAAAAD6
+epwF4BpFAAWqDFr0KWP+jBQ6ov/9OA2gAzUAAAAi+rmMFY8WjhSNFy/wAJYS9CAmFeAKRQD8IAYV
+4AuFAOIWAypoBIAAWBepiBl4U2awMwrqMBk5rimSRQmZCgqZCgrqMAqaDGqhCArqMAqaDGuh9v/6
+bA2gBQUAwKH8emAFoAuFAFgXmsCw+o0GHe/ytQDRDx09JSzSfrHM/a/GFa/2RgAucr7z3/E4UgCd
+APP3Ih2v+H4AwJApdr0aPR0bOYz8DIId4AwFAP4BQh2gCBUA+PfGFaAPBQBa+Oxj/28AACrSfrGq
++6/GFa/6LgAAAABsEAz+QGgd4AzlAPZ46gXg+PUA9CImHee0AQDrFBApsASAAPZAAEPwAxUA+EHe
+DaAFBQDaUPogphXgAz4AKHCA+iCmFeSIAQB8iSQaOXT8oGgd4HsFAPpGAA3wGQUAbZoMLqGU6+Fx
+dVAJAACx3bQvHjz4APEE6eCAKcAKgAAIC0MrFBJ5gX4aPFb4AAId4A2VAPogxhXgD0UAbfoVK6CA
+CwtE7bsMBMAFAADriTgFUAUAAG6STyoK4PoiQBXgDBUAW/8Z8UQIDeAM5QAePOGNFv3QBh3gAM4A
+Zt+RGDmgL4KEANEE4FkaDoEKgAD8YAEFX/v1AAuqAwr/AQn/Av8QhhXv/bIAwKBmopsL6jAaPMot
+on99uwguon4u7AEupn6WHh05oho8xB86IS3SICumfy/yGSqifv4hZhXgDAUAWBh0HTmaHjoZhhst
+0H2MHvdvAAsw+uUA4+RoJvAkgACOFWjjNgrPAf4g5hXv+OUA+eAEB7A4hQB48SUED0f2IAYVoApV
+APx5WgWgC4UA/iDoFaANJQBYFxlgAAQKyQGZF/Qg6BWgGjUAdqMN+nlOBeAaRQAGqgxa84IVOQ8k
+Vr0aPKAbOQ/8DIId4AwFAP4BQh2gCDUA+LfGFaAPBQBa+G/mFgktAFYAAClSviYWCcAw/HkqBaAG
+NQD8IUYVoLQBAPohhhXgDhUA/CGIFeAEBQAD5DgPThHuFg0ugt4AACocEKo6KqAAKla9GjyFGzj1
+9CEGFaAMBQD4eQgFoAkVAPnGAAzwbUUA+LfGFeAPBQD4IAYVoA6lAFrzLOSkAA0CvgAAK1K+cb5M
+9fciHaABMgAAAAAAABo8chs44pQY+HjkBaAMBQD4IagV4G1FAPi3xhXgDqUA+CAGFaAPBQBa8xrk
+pAANAI4AAOpSvSDYQQAAqzsqtABnQUeMGo0ZjhgvEBCTEZQT/iBGFaAKRQD8IAYV4AuFAP4g6BWg
+DSUAWBbHzjTAkClWvRo8Vhs4xfwMgh3gDAUA/gFCHaAIFQD4t8YVoA8FAFr4JbBmC+owCuowGTjD
+KZJFCZkKC5kKCpoMaqEICuowCpoMa6H2wDD+zXwN4A4VAAvqMBw8QNMPLMJ/Gjw+FTma/WNSDaAD
+FQAaPDoton7lOZYW6AUAAP1PxhXgAxUAHTkSK6Z/KqJ+/aQIFeAMBQBYF+b6oyYV4AzlAOpWGCsA
+zgAAwKH8eGAFoAuFAFgWmvwBwh2v9LUAwODuVGgqUASAAC9wgNMPDw9EfPkiHDia+g4CHeANBQD6
+RgAN8BgFAG2KDC7BlOvhCnZgCQAAsd3SoNEPZt/4EjjgKCKEANEE/GABB9/59QAJ+QMJiAEI/wLv
+JoQtEASAANEPsTP0f/l5UgCdAGP/HwAAAGwQBBk7jiswCPx24gWgDeUA6ZDxJNOBAAD9ZAASUB4F
+AKy8LMCA/ygADxTMAQB9yQ4sCmD9ZgAOMADiAAB8nyz6QAAGcB0FAP2GAA5wCwUA0w9t2gwtoZTs
+0Sh1UAkAALG78AB4Da/7tQB9wcMsCmfAsG3qDC+hlOzxCHVQCQAAsbvHuxg4sg8CACiChSkKHwuZ
+DHmNaSkyAP8pYAKf7aUAKzAJLDAKKjAILTAQW/7Q/UBoHeAJBQD8HwAF8AoVAAupOMqUjDDTD3nG
+HiswCSwwCiowCO4wCyHoQQAAWAV0/UBoHeAAHgB5nuDaMPqgaB3gDAUAWBVB0qDRDwAAAAD//5wN
+r+3VAGwQBIow/GCEFeAIdQD7AAUIogCdAHmmXPwPAAT+rQEADOowGzoYcN9WKrazwIDusrQp0ASA
+AP5g5hWgGQUADwIA0w/TD22aEuuJCgVQCQAA6ZK1JEAFAAAppQ8P6jD97wAOMA0FAOo0AArYBIAA
+WBUh0qDRD8DQ//+sDaAMBQAAaZE4GTgZCakCKbbFKLLGLzEFCP8CLzUFLrLKnjMtssmdNCmyyJk1
+KLLH+GDGFa/+tgDG2v/+uA2gDAUAxtr//pANoAwFAAAAbBAEFjgF5DBAaVbCgAADqAIoZsEkZsIb
+OAL8BkId4A4VAPpv/AWgDAUA/NhmFaAPBQBa92LmoFdtEASAAMCT+NhmFeAASgAAAAAErAIsZsHA
+uitmw/pv5AXgDAUA+m/eBaA9JQD+ACIdoA8FAFr3U+agDG0QBIAALWLCLVUA0Q/ApPxv1AWgG0UA
+WBXk0Q8AwKT8b8gFoBtFAFgV4NEPAGwQBBY33eQwQGlWwoAAA6gCKGbBJGbCGzfa/AZCHeAOFQD6
+b6wFoAwFAPzYZhWgDwUAWvc65qBTbRAEgAAlZsLAkfjYZhXgAEoABKwCLGbBJWbCwLkrZsP6b5QF
+4AwFAPpvjgWgPSUA/gAiHaAPBQBa9yrmoAZtEASAANEPwKH8b4gFoBtFAFgVvdEPwKH8b3wFoBtF
+AFgVudEPAGwQBikyACQxBCgKB/kACpDiAJ0A/G/iBeR0AQDw83AN5ERBABs3wy3SnyuygfoAAh2g
+jAUA/agAFrAJFQD9YABF8AhFAG2KFC6wIey7CA2QBIAA9cAHbCIAnQCxqosw/2YgApAGBQCZEgbq
+MGSRBOwxBSpQBIAA7TEHK9gEgABb/7mJEoswmhAP6jD37wALMAAWAADxYAaiUgCdAAjqMOgWASSI
+UYAA4jeNGlbCgADsMQUjgfmAAIQRB6kCKSbBLCbCGzeI/AZCHeAOFQD6bwgFoAwFAPxYZhWgDwUA
+Wvbo5qEobTgEgADAo/pYZhWgAEYAhBEMrQItJsHAuismw/pu8gXgDAUA+m7sBaA9JQD+ACIdoA8F
+AFr22uag3m04BIAALiLCLjUH3XAP6jAE/wyvZtow61QAC2AEgABYFGzSoNEPAPVf+KoSAJ0AZX8N
+//woDaAJBQAoMQX3H/Y2UgCdAMba//8oDaAGBQD8IAgV7/8KACogJOkWAiUDGYAAKCId2kDoggcr
+2ASAAOwxBSHoOQAA/mDEFaAPFQALgACJEosw+iAGFa/7hgAAACkgJMueIiIdgifKLepEAAvYBIAA
+7DEFIeg5AAD+YMQVoA8FAAsgAIQR/UBoHe/9QgDHj/ggBhWv+pIAhBH//PANr+2lAIQR//zIDa/9
+9QDApPxueAWgG0UAWBU2Y/8bwKT8bmwFoBtFAFgVMmP/C2wQBBQ3iaQiIyaAIiKB0Q9sEAQVN4Wl
+JSNWgCRWgdEPbBAEiTD6bwAF4pkBAOo6vBSDGYAAaJFf6jq5HJWQAACJMP8kYAKQDAUADeowiDKO
+M6uvKPaALvaBDOowiTD9jwAOcAAeAAAAAHmWFg3qMI8yq64v5oAu4oGeMwnqMA2ZDKnMwNDqNAAK
+2ASAAFgUEdKg0Q9j/6gA+nVGBa/+kgDG2v//fA2gDAUAAABsEASKJyipFBc4uukiAiVYgQAA6qIJ
+JAMZgABkkHPxRaAN4CylACmgAB04r3yZB4yifcFXd8E92rD8AEIdoAsFAFr84x44rBg4WJigjyCX
+opOlJKQclab3Q6YdoAglAO6mBC/+AoAACP8C76YBKtAEgABYE+DAINEPAMmU2rD8AEIdoAsFAFr5
+UWP/t3fJtGP/4tpQ6zQAC2AEgABYE6/aIFgNrdKg0Q9sEAQWOawYN0LlNtoZGgKAAAgzAvLf5hXj
+4oUA0w9tCAmwIsgrKWL/eVACY//twCDRD8cr0Q8AAGwQBogzJjIAFzgw5DICKkgEgADzAA0AUmYB
+ACgiAikWAO04sBwO7gAAZGFK9MAKqJIAnQD0wArhEgCdAOvQfSscVAAAKtE/ALEEAKoa+oASWqIA
+nQD6QGgdoAslAFgRwuaiGG04BIAAiTDzIAUakgCdAPMgBkJSAJ0A22D6QGgdoAwFAFgTCfZwxAWv
+jNUAfKECB6c4jCctyRTpIgImWIEAAOrCCSaF8YAAZJEf8UtgDeAvpQAuoAAYOFQsogJ/6Qr5gAc8
+IgCdAHbBPNqw/ABCHaALBQBa/IaMEBk4Th03+p2giyCWopOllaYnpB2ZpCykHP1gABWwDCUADLsC
+66YBKtAEgABYE4PAINEPAAAAAA7qMNog62QACmAEgADuN3IR6EEAAFgRp+agt204BIAAD+owiTDx
+P/oCUgCdAAjqMOxEAAlQBIAA7TwQK1gEgABYEdLmoJxtOASAAAnqMGP/FwAAZJBl2rD8AEIdoAsF
+AFr43mP/YSrSIPqf9XOiAJ0AYAEWK9Ih+p/1Q+IAnQBgAQgALtB9LNE/AOEEAMwa/J/0w6IAnQBg
+APAA95/5TSIAnQBj/1HaYFv/g9yg6zQACtAEgABYEy3AINEP2lDrNAAL4ASAAFgTKdogWA0m0qDR
+DwAv+o3/X/o0YgCdAGP+hwAAKPqN+V/7DCIAnQBj/neMJynJFOSQYWZQgQAAi8lksFcssADC2n3J
+Bx83+46yf+Gk+gACHeAMJQBa/DCMEBk52h039ZegiyCdopOllab5QIYV7/j1ACikHSykHP1gABWw
+DCUADLsC66YBKtAEgABYEyzAINEPAAAA+gACHeAMJQBa+J1j/7QAAPZvJgXv/kUA/1/71SIAnQDa
+IPxAaB2gG8UAWv0uY/9l//doDa/npQBsEASJMIQy/yegCpACBQB5nhjqNAAK2ASAAPxAaB2gDQUA
+WBMg0qDRDwAA2kBYFnZYFo0J6jCKQJozCOowCYgM+EAAQT//OgAI6jCJM5lAAuow6CIMClAEgABY
+FmtYFoKJMGP/qQAAAGwQBIInJikU4iIJIwGBgADwQoAN4CilACcgABo3uokieHkYepkViyYsIByN
+JZ0wLEQA+qAGFeACBQDRD8ci0Q9sEAbqJAAI2ASAAOwcBCDoIQAAW//rLBIAZqA7KTwQ6QceBlBB
+AAAKAmMJAIYKAmEJ6jAaNsgrOQEowgEImTILmQz7IQAMv4gBAOjGASzMAoAACYgCKMYB+kBoHaAL
+BQBajwDRDwAAAGwQBBc5ehI3eyZyliRyVQIyAXYrCqZEcksFwCDRDwAAKHKpCSIRooLRDwAAbBAE
+FzlvEjdwJnKXJHJWAjIBdisIpkRySwPAINEPKHKpCSIRooLRD2wQBBQ3ZxI3YSIifwQ0AQlEEaQi
+0Q8AAGwQBBQ3QSRAgPhrrgWjIwEAACAEBAQb6IKBInwmgADAINEPABQ1+yRCn6QiCSIRooLRDwBs
+EAQpCoAJOgHyYAbeEoNBAKmJ9SAGz1IAnQDVkPFOcA3ik0EALyAMGzdNHjdN+eAGtWajAQAtIFUs
+IFQpIA0TN0mtzOSQsGYz/QAA6OB9JIWBgAAsMmCwnQjdKK/MDcwIC8kKKZKACQlGeaESLSBV/UAE
+o+IAnQD3QARiogCdAGRATCkgDewgDCSBiYAA6OB9JICBgAAvMmCwnQjdKKz8rcwLyQopkoAJCUb5
+QT4N4AsFAGAAEQAAKSANKyBVwMEJyTkLqwyrmyoiFFrzzsumGDXDKIKeIjKfpYgJiBGoItEPAAAA
+AAAA//y8DaaTAQD1MAAV7/ymAPeAaB2v/dIA/eBoHa/9dgDAINEPbBAEKQqACToB8mAGvhKDQQCp
+ifUgBq9SAJ0A1JDxTjAN4pNBAC4gDBs3Ch83CvnABpVmowEALSBVLCBUKSANEzcGrczkkKxmK/0A
+AOjwfSSFYYAALDJgsJ0I3SiuzK3MC8kKKZKACQlGeaESLSBV/UAEi+IAnQD1QARK4gCdACkgDewg
+DCSBmYAA6PB9JICBgAAuMmCwnQjdKKzsrcwLyQopkoAJCUb5QX4N4AsFAGAAEwAAAAApIA0rIFXA
+wQnJOQurDKubKiIUWvOL6DWBFQGhgAAogp4iMp+kiAmIEagi0Q8A//zMDaaTAQD1MAAVr/y2APWA
+aB3v/d4A/cBoHa/9ggDAINEPbBAEJCANyELRDwAAEjXmGDf/8kgAAvczAQDiIoMhMgEAAOhYCAGA
+wYAAKIB9JGKco4ioRAlEEaQiIiyA0Q8pYpulmQmZEaki0Q8AAGwQBNEPAAAAbBAEFzV3pycjdoAm
+coEjdoDHjwhIAwhmAQZWAiZ2gdEPAAAAbBAGy00nIADTD/aF5g3gCAUADwIA0w/TD20ID+RwFGRA
+BQAAooknkAB3QRJj/+IAAAAAAPAAJA2gAgUAANkgsZJkIe0WOKAqYADxT8AN4AQFAG0IDCVgAbFE
+5FAHYzAFAABj/+xkQOEnIABkcNv2gAmQkgCdAPrgCVUgCAUAGTiR+I8ACzAAQgArsAAqkAAIRgx7
+qSb0wAWIkgCdAOmcASRABQAA4osIAxeDAAAaOIUCiwgrsAAKiggqoAB6sw/7QdYN4AQVAPAAGA2g
+BAUAx09kQHUWOH0qYADxRsAN4AQFAG0IDCxgAbFE5MAHYzAFAABj/+xkQFH2gAoAkgCdAPdACcVg
+CAUAGThw+I8ACzAATgAAKpAAoosrsAAIRgx7qRzoYSRkQAUAAOti5mTIBQAAGjhloosrsACqiiqg
+AHqzE/tCVg3gBBUAx8/8YAYVoAIFANEPx09kT+4WOFzTDyxgAMCA5IQABgPZgABtCAwtYAGxROTQ
+B2MwBQAAY//sZEBg9oAKKJIAnQD3gAntYAkFABo4TviPAAtwAIoAAAAAAAAA+uBoHe/8UgAAACyg
+AKKbK7AACUYMe8kc6GEkZMgFAADrYuZlUAUAABw4QKKbK7AArJwswAB8sxH7ghYN4AQVAPhgBhWg
+AgUA0Q/HT2RP8BY4NyxgAPGH8A3gBAUAbQgMLWABsUTk0AdjMAUAAGP/7GRAZPaACkiSAJ0A94AK
+DWAJBQAaOCr4jwALcACaAMYq0Q8AAAAAAAD64Ggd7/v+AAAALKAAopsrsAAJRgx7yRzoYSRkyAUA
+AOti5mVQBQAAHDgbopsrsACsnCzAAHyzEfuCFg3gBBUA+GAGFaACBQDRD8dPZE/wFjgSLGAA8YdQ
+DeAEBQBtCAwtYAGxROTQB2MwBQAAY//sZEBa9oAOCJIAnQD3gA3NYAkFABo4BfiPAAtwAHIAAAD6
+4Ggd7/wmACygAKKbK7AACUYMe8kc6GEkZMgFAADrYuZlUAUAABw3+KKbK7AArJwswAB8sxP7glYN
+4AQVAMDB/GAGFaACBQDRD8dPZE/uFjfvLmAA+gciHaAp9QDx33AN4AQFAG0IDC1gAbFE5NAHYzAF
+AABj/+xkQJFqQVH3yd4N4AwFAB034fyPAAswAIYAAAAAAAAAAPrgaB3v/CYALtAAossrsAAMRgx7
+6SPoYV5mYAUAAOti5mboBQAAHjfTossrsACuzv/AEBWgABoA23B+sxD7wfYN4AQVAPAAHA2gBAUA
+AMdPykSYMCggAMBA+SAIwqALBQD5QAqrogCdANyA+2AgFeACtgAAAGThR/ZvfgWgBAUA0w9tCAws
+YAGxROTACGMwBQAAY//qAJgwokcmcADwzDAN4AQFAPLAaB2gaAUA+gjCHeBsZQBtCFEMRBGUMHKb
+D3KjDPJaABWgANIAAAAAAADzApINoE0FAHLDDPJVIBWgAHIAAAAAAADzv+8SogCdAPN/7tOiAJ0A
+IizJokSUMCJwAeQgXmO4BQAAY/+nAAAA+uBoHe/6HgAAeKMborfkRAoGK0EAAAVECZQwKHAAsbvo
+k+V8YASAAMqIKgpt+AliHeBL1QDzAGgdoGi1AHghL3khPHohRnshUyJwAeUv7WO4BQAAwIDoFgAs
+EASAANEPAAAAAABkj+v2QGgd7/76ACk66AlJKPhgBhXgAgUA0Q8GShH6YAYVoAIFANEPGzRRC0so
++mAGFeACBQDRDwxMEPxgBhWgAgUA0Q9lj7pj/6OYMCYgAP7ZsA3gBAUA9kBoHe/7UgAAAABsEAQm
+IAD2ZUYNoAcFAA8CANMP0w9tCA/kYA9juAUAAKJ4JoAAdjEHY//iwCDRDwCxgtEPsSLRD2wQBCMg
+AAIkAvBhcA3gAgUAbQgMKEABsSLkgAdiIAUAAGP/7NEPAABsEAQVNYsWM7XwACQNoAQFALFEaEkp
+I1K8fDcfA+owImJFoyII6jAIKAxqgeNtCAgI6jAIKAxqgddj//DAINEPxy/RD2wQBCIsf/Jt+AXj
+Ih0AAyIBIiwQ0Q8AAGwQCB43OBk3ORQ3NygiACmSuhc1cCwyAfkPAAx/9oUA+CBmFa/y9QDxgAUA
+EKz5APOAC7BSAJ0A7DctFRPBgAAswWEaNWTziSAN4B0VAAM8Am3aIPZh5g2gDwUAekIH/4CoFeAA
+EgAvpsAszPziptQlUBEAAB83Hig8CAjvOS92vFv/yOSkAAUPgYAA6TbSGgmqAACIEhI3FSmRovJZ
+yBWiiB0ACYgMB4gRqCLrEgMpUASAAFrxsmSiKdpQ6zQACmAEgABYEDfAINEPAPGABtBSAJ0AGzcG
+0w8PAgArsWHcMPogphWgHRUA6nQABYY5gABt2iD2YeYNoA0FAHpCB/2AqBXgABIALabALMz84qbU
+JVARAAAeNvYfNvMoPAgI/jkudrxb/59koWlmoIYaNu+NEg8CAC6hYIsT+1nIFaLdHQAO3QztFgQu
+7cKAAP1AAEVwDAUA+iAmFaANFQBa8WiLESyxAyuxAo4UfLkWL3K9GDbhjRII/wEP3QItdr0cNt4s
+drz8bbwFoApVAPwgSBXgC2UAWBEyHjbT+iCoFaAJBQD4IAYV7/pKAJoV//woDa/kpQAq+rmaEIoV
+/m2UBa/55gAAABs2ySuxYWSxSBg1AfgAAh3gGxUAbboKKYbA4obUJEARAADaIBw2wSx2vFv/beSk
+AAUIMYAAwJBlQEyZEho09Is1K6bA6za9EcPxAACIhSi2wOg2uxH74QAAj/UvhsDvNrER89EAAI7l
+0w8u9sAtcr0eNQQO3QENnQItdr0cNrEsdrxb/1fUoGZOahI2p44SLyFg8lnIFaLuHQAP7gwH6BGo
+IighAy8hAnjxS/X3Ih2v+RoAKnLlf6cNfqcKCshP+CBGFa/4EgD/9/ANr/RFACxy5fGf+M/SAJ0A
+8Z/4j5IAnQAMyU/4IEYV7/nyAAAA9CAIFa/4CgD8bSgFoApVAPwgSBXgC2UAWBDk//dkDaAEBQAA
+AAAAAP/2sA2v5KUA6xIDKVAEgAD8ACIdoA0VAFrxAmP9vwAAKXLlf5cKfpcH//vMDa+ZYQDHRP/7
+pA2gCQUAxkr/+3wNoAkFAAAAAGwQBv5rxAXgCuUA9muKBeB+BQD8QGgdoDgFAOQUACf7gQAA9wAK
+a6AEFQAoCv/4QAi0IgCdAKcpKZCA0w/+RgANtJkBAPskHg2gHQUA++BoHaAMBQBt2g4ooZSyqvsA
+BXxiAJ0Ascy0LBs2SQDBBNMP7bCAKkgKgAD48DAVo6kBACoUAX2RUi1wgJoR+vBwFaAJBQD88FAV
+pN0BAP2+4BXgCxUA/WIADPSIAQDtnAEkQ90AAPmiAAy0zAEA65wBJmPdAAD9YgAMtKoBAOicASVT
+3QAACok4b5J3wKBmoJb6IGgd4PrlAPpgBAUwDBUAW/heZqCA5DoCCtgEgAD8wGgdp6oBAFv4WGag
+asAg0Q8AZs9THTLiK9KE+4AEANAIBQDgiBoOAQqAAPyAAQTf+vUACpkDCbsBCLsC+7CGFe/8pgAA
+AAAAAAD//kANoAoFAAAAKgrg+iAgFeAMFQBb+ELrNgwde8IAAIkR+XAGHe/9ugAAAMaqpywswID8
+gAAGMA3lAH3JIxwydfoOAh3gDQUA+kYADfAeBQBt6g0uwZR74Q3t3AEmYAkAANKg0Q8AAGbf9hIy
+uigihADRBPyAAQff+fUACfkDCYgBCP8C7yaELRAEgADRDwBsEAYjMAgkICLtICMoBAqAAPhgBSmS
+AJ0A7zK+GAQKgAD2YASokgCdACjwfcDu+mSqBaALBQD/BsAPEBkFAP+gBJwixAEAKQoQ+YYADnAL
+BQBtmgwooZTsgTF1UAkAALG78ACcDa/7tQAAAAAAAAAA/6wmDaBsdQDTD22aDCihlOyBCHVQCQAA
+sbvHuxkyjimShcGvC6oM+yDBBa/i1QDRDyrwfQ8CAA8CAHyvAn7ZDfxqgAFf4qUA0Q/GKtEP2kD8
+C4IdoKsFAFgH3/9CIA5fwjUA0Q8sCmD8hgAOP/5yAO48/ypQBIAA/AzCHeBshQD/ogAOMKslAPwg
+aB3gDiUAW/9J0qDRDwD6H+IdoKsFAPwgaB3gLCUA/IAAhjAOJQBb/0HSoNEPAGwQDh4yIhw1IfwC
+Ah3gCuUA4uJ9KSAEgAD5njAVoAUVAP/QKBWgC4UA4kMIBmOBAADrjwEJnkKAAO4zCARxDoAAKDAj
+JzAsIjA2+wqmDaAOBQAMywL6ZrAVovQBAP3mAA/wBQUAbdoMKLGU74EJddgJAACx7i76+/fAaB2g
+AYoA5EAfaU5CgACp6SqQNiuQLCs0LCo0NimQNfhmph3gAgUA0Q8qMDUiMDbnMCwuWASAAP4AAh2g
+GAUA8ebQDeBtdQBtigwpsZTtkQh12AkAALHux+srCv/vtDkPMASAAB41gxgyLuniASDYgQAAmbH/
+wAgVoB31AP9gBhWgDgUAKIKFKzAsBtkMeY0NfbEnwCDRDwAAAAAAAAD9YAt9YgCdAP5sZh2gAgUA
+0Q8tCmD8hgAO//5CACswY+oWDCWRcYAALzBisbgoNGN7+8H6AKIdoBuFAOw1ZxpoBIAAWA+4wZ34
+ZYYd4AoFACo0Yyo0Nvpmph2gCxUA+mXGHeAMBQD6gGgdoKsFAFgHZmijCcDN/UAg9SIAnQAsHCAM
+XArsFg0qUASAAP2AEBWgqwUAWAdcwd3mo+ttYASAAPKjMA3gDiUA9UAXWhIAnQD1QBeZEgCdACsw
+LC8K/3/BFSgwI8CeDwIA+QAWBGIAnQAqCggqNR/9YAzkYgCdAC8K//+ADzxg+vUAmhucGv1gEHRi
+AJ0ALBINBEoC/YAwFaCrBQBYB0DqFg4tHaIAAOo0NSKAaYAACq0KD90RLTQ1KzAs/AACHaD99QB3
+uRIuMDZy6QyIHC8wNfn/9bwiAJ0AjxqcE5sUiRvtFgIrcASAAOoWASpoBIAA+CAGFeAKRQD8ajwF
+oBuFAFgPbsAg0Q8AAMEv+gCiHaAbhQDsNRgaaASAAFgPZ/Jlhh2gDgUA/mamHaAKFQDqNC4i82GA
+ACswI8DO/WAF/CIAnQDFxxoxZfoAAh3gHQUAbdoNL6GUfPFM67wBJVAJAADHuxoxrSmihPhkgAWv
+//UA/AAiHeDy9QDuNGMtgQqAAODsGg2BCoAA4oQpLugKgAAP3QMNmQEMmQL5UIYV4AIFANEPAAAa
+MZ0pooT4ZF4Fr//1APwAIh3g8vUA7jRjLYEKgADg7BoNgQqAAOKEKS7oCoAAD90DDZkBDJkC+VCG
+FeACBQDRDwBkXdLrMCMqUASAAFgLDvpscBXv9xIAxcD8hgAOP/0GAAAAAAAAAOwWCirzJgAA2kD8
+AMIdoKsFAFgG34wa/0BoHeAd1QD1QA7okA4lAPVADqkSAJ0A9UAObBIAnQArMCx9sQIuNR8oCv/5
+//FlIgCdACkK//mf8Q1iAJ0AwPD+Y+Qd7/heAPVACbWSAJ0A9UAKJhIAnQD1QApmkgCdAPVACqcS
+AJ0A+mWQFe/3AgAAjB3aQP2AUBWgqwUAWAa+6hYPLQ3iAAD8AYId4Ay1AP4Aoh2gD0UA6hYQIoXh
+gAAKSxT1YAQM0gCdAGi4ecDi/mWGHaALJQDB/X+xM4wd2kD9gHAVoKsFAFgGq9Wg5qF7bWAEgAAq
+NDX1QAdYkgCdAG+kV8DaLTQ2+mWQFeAAGgDAwC0SEP/2iA2gCgUAwfD+Y+Qd7/USAC40LPvAaB3v
+9HYAAAAAAAD6ACId4AgVAPhlhh2v9CIAaLlhfLFebroeLjQs//4ADaALVQBvpjDAm/hmxh3v/pIA
+AAAAAAAAAPplkBXv/ZIADakBaJRzaJh7+mWQFe/9TgAAAAAAAAAA9V/7rFIAnQDArPpmxh2v/a4A
+LjQs+8BoHe/yjgAvNCz//JANoAtFAMCxKzQs//IsDaALFQAAAAD6AMId4A9lAP5lhh3v8eIA+gBi
+HeAINQD4ZYYdr/GiAMCZ+GbGHe/8bgAvNCz74Ggd7/t+AC40LPvAaB3v+1IALjQs//jMDaALJQAA
+AAAAAOoWCinQBIAAW+D4ghrRDwDqFhEtAmIAAMCi/GigBaAbhQDuEhEqaASAAFgOnMAg0Q8AAAAA
+AAAA4qQACdAEgABb4OrRDwAAAOKkAAnQBIAAW+Dm0Q/aMFvg5dJQ0Q8AAOISESnQBIAAW+Dg0Q8A
+AABsEAQdMOL+YeoFoAvlAPRhHgXgDJUA+kRwFaAHhQD0RFAVoA8VAPBpsA3v9vUAfKECe6lEKOB9
+AEEE7jFoFHG6gAD7TMYN4BkFAPaGAA3wCgUAbZoMLFGU68EIcqgJAACxqserKNKEAKEEAP4aBukD
+CYgBCO4CLtaEHDCRA0sRrLsqsoAcMMQMqgEqtoDtRAAJ8ASAAP5DBBXgCkUA/GgoBaAbhQBYDmHA
+INEPKOAoAP0aBtkDCYgBCN0C/cUGHe/+6gAAAHyhCnuhB9ogWADmY/+5KOB9/wkADxAMBQD7SAYN
+4BkFAOdLAg5QBIAAbZoMLlGU6+EIcqgJAACxqserKNKEAKEE4MkaDQEKgAAA+xoGuwMLiAEJiAL5
+sIYVr/62AB4xLu3gKCoBCoAAAPkaBpkD6d0BDkAKgAAI3QL9xQYd7/4mAAAAbBAGIyAjwF70RFAV
+oAqVAPpg5g2gBwUAdTkWwY8oJCx1ORwpCtD4Q6Qd4AByAAAAAAAnJCzqRAAJ2ASAAFgA8ioKyCol
+HSckIPpAaB2gCxUA+khmHeAMBQBb/5fmoNFtMASAAMC5ezEH9GAGJWIAnQAL6jAaM84sonP9YAuz
+ogCdAB0whBozyS3SICumc/tOSBWgDAUAWA9YGjB+LKB9mxDzgAhnEgCdAPRgCCRiAJ0AGjO/GzM8
+Wu4uHTB2HDO7iRAqJGIvwh8eM7oYM7oJ/wyu/ujyBnvQBIAA2uAuwIAAQAQOCxt/tzoo0H0bMxLH
+/+u84CRxDIAA95AGHeBudQD8AAIdoBgFAG2KDCmxlO6RXXXYCQAAsczwAUwNr/y1AC8kY8Ch6iQu
+KlAEgABb/d7SYNEPAAAA+oAEANAIFQAAiBoPiAMI6AEoxID0YATMYgCdAMGQ+IYAD3AMBQBtmgwo
+sZTugQh12AkAALHMx8seMDXTDyvih/uABADQCRUAAJkaKeaHe5iaCeowK9IgCrsoq5kL6jALmwxq
+sYNtCA0M6jAMnAz3n/u4kgCdAGP/6xoxjRsy/Frt7h0wNhwze4kQKiRiL8IfHjGIGDN7Cf8M7v4I
+C9AEgAD5//gDIgCdAPvAaB2v++IALgpg/oYADz/8RgAvonKx//9ORhXv+hYAAAAAbBAEIyAjwE70
+YQYNoMKFANEPAAAiCtDRDwAAAGwQBPhEcBWgDRUA5CAiKRgEgAD6SFAVoAnlAPkABIxgAgUAGzAU
+K7B9wej/aqAPEB8FAA5OAusvqxlgBIAAbfoML7GU7vEIddgJAACxzMfLHi/1KOKFAMEEANsaeLgY
+KeKHK+aHe5A37TRCLQCmAABgAEwAAAAAAO00QiUCIYAAwCDRDxkwfCmQKQBABAkJGwkLQOs0QiUB
+MYAAf5dU0Q/iNEIlfuGAAGAARwAAAAAA4jRCJX5hgABgADcAAH+XvxsvpgNKEauqK6KAHC/YDLsB
+K6aA+1AIFaACFQDdQP5oUBWgCkUA/GZaBaAbhQBYDXXRD9owWAAC//+ADaACFQBsEAYVL60kICIY
+L5MDQxGoMy4yjRwzIygygC8gLCohGJoQKSBC+CAmFeAbhQDpIEMqaASAAPggRhXgiHEA+CBmFaAK
+VQBYDV8qICz8QwQVoBn1APlChg3gG+UAe6EMyMktIELuIEMmgDGAANEPZO/6wKX8ZhgFoBuFAO4y
+jSpoBIAAWA1QKDKABYgCKDaALzKAwKX8ZgoFoBuFAO4yjSpoBIAAWA1IwKX8ZgIFoBuFAO4yjSpo
+BIAAWA1CwKX8ZfgFoBuFAO4yjSpoBIAAWA093UD8ZfAFoApVAP5xqBWgG4UAWA040Q8AbBAE9GAK
+iRALtQD0YApLkAoFAGg5LXsxKugy7RHQn4AACDgKiIAKgADBkAmqAvRgCrOSAJ0A9GAKcRIAnQAs
+GgAMqgIYL0sDJBGoRChCgBky4QmIAQioAihGgC5Chh8vhA/uAi5Ghvyfwh3gBRUA7UaBIa0pAABo
+NkJoND/0YAb7kgCdAPRgBrkSAJ0A9GAGvBAJlQD4YAZ8YgCdAPRgBjmSAJ0A9GAGvJIAnQD6YAZ8
+YgCdAPj/wh3gAB4AKUqu+l7mBaz79QALmwErRoEqoH3TD3+veeokAAnYBIAAWzZs6iQACdgEgABb
+NffqJAAJ2ASAAFs1ORovNxkvDCqinymSgaKqCaoRqpkpkR8fLzL4oAAE8AulAOyc/iSN8QAADLU4
+2VAoQoMSLy0PiAEJIi0IIgIiRoMuQoQdLykP7gEJ3S0O3QL8kIYV4AIFANEPwCDRDwAAAAD6XkYF
+r/reAPiUwh3v/XIA+JmCHe/9UgAAAAAAABkymPlGAA1/+yIA+ImCHe/88gAsSgD9RgANP/q+AAAA
+AAAA+AyCHe/+JgBsEATqJAAJ2ASAAFvjo2agMeokAAnYBIAAW/+RGS7tAygRqYgpgoAbLwILmQIp
+hoDAIOiCgCUAXYAAaKAD0qDRD9EP0qDRDwBsEAoqIGr0XcAF4AeVAPREUBWgDBUA+mAABTD/BQDj
+ICMlAcmAAP1MIADQBwUAJiArzmErIEL4RBAV4AwVAPNoYA3gDmUALZz6Dcc57iQgK5AEgADRD9Jw
+0Q8AA0YRpWb2YBg0YgCdANogW/8xKCBqLwrw/wAEBHAMFQD9BgAMMAcVAPhNRh2gAD4AA0YR9MAA
+Q3AHBQDArvohZhWgC5UA+mAVjGIAnQCaG/pgFTwiAJ0AKyAjIyAi/EhwFeAOBQD1YBFzEAiVAPlg
+E6QiAJ0ALCRDK2K30w8PAgD/YSAE0A0FAHS/AcDR7S6LHpgEgAAoYrcZLrIPAgAJiAIoZrcpIEFk
+kIImICvy3/ksYgCdAOsWByGEyYAAwMH8RWYdoA4FAC4kICrSlScgIvxkZAWh2qkA/CFGFeC6oQD6
+IIYV4WrBAPobAAUwCwUA+iEGFaAKRQBYDGiJGvkgBmIQDHUAZpDEA3gRpYgqgoLHsOuqAQz/woAA
+Cv8C74aCKwX+AADwAwgNoAY1ACYgLMGfeWEUwYx4YQ/BnnlhCighGMiEKSBCZJLyLCArZM6HwDAu
+JCsp0pUsICL4FAAE8Aj1AAmKOQPMEQXMCCjCgin68AmIAQioAijGgiXSlfQbAALw6QUABfk5JcKC
++iDmFe8I9QAIVQEFmQIpxoLtRAAJ+ASAAPxj/AWgG4UA+iDoFaAOFQDTDw8CAPogBhWgCkUAWAw1
+//goDaAHFQD1IA1iEgCdAPUgD3qSAJ0AZG9E/N+gFeALBQANtjj6AIIdoAsFAOwx6xtoBIAAWAwn
+6hIEIySvAABmYCMDfxGl/yjygin6D+mIAQt2woAACO4C//BGFaAAagAAAAAAAAD0wAt6EgCdAPTA
+DaKSAJ0A6RIIJQChgAADehGlqiiigsCxC4gCKKaCZJ9EA3wRpcwrwoLB0A27AvuQRhXv/NIALiAi
+Hy49A+4Rr+4fLjyv7o7gDj5ALiQg/y8ADzANFQAO1znScNEPAAAAwI+YGQM7EaW7mxUrsruJGQtI
+FPkABARzuyEA+khmHeOIAQB4kQf+SGYdoAsFAGTQp2W9rIkVLJKAHS5MDcwBLJaAmhv7MAgV4AXG
+AAAAKCAs+R/sSlIAnQDAkfghJhXv/pYA2iBb/jb6IWgVoAwVAP4eAh3v9TIAKSEfCQlF+z8AFeAK
+JQALejiaFipigPUgB3QSAJ0A9SAH4RIAnQBpkQoK21L1YAbxkgCdAOsSBipQBIAAW+KqZqy76xIG
+KlAEgABb/pgtYoAeLgsO3QItZoD80AgVr/KGAGS9BPohZhWgA/oAAAAvIR/5//LMUgCdAAN5EaWZ
+KJKCx6AKiAEMiAL5MEYVr/kGACshH/l/9LRSAJ0AA30Rpd0s0oLH4P+ABAYwDnUADswC/bBGFa/5
+5gAuIR/53/BxUgCdAAN4EaWIL4KCx5AJ/wEM/wL/EEYV7/faAAAAKSEf+T/ySVIAnQADfBGlzCvC
+gsfQ/WAEBfANdQANuwL7kEYV7/iyAAAACt1SZd8P6xIGKlAEgABb/mVj++EAAAreUvnf+AlSAJ0A
+Y//hAAAoIENkjQYpIGRlnQBj/F0AAAAA3TD8YqgFoApFAP5IcBWgG4UAWAuN+iFoFaAOBQD+HgId
+7/AeANogW/4XY//SbBAEFS8m8w4ACjcyAQDiUp8hjOEAAChSl6SICYgRqCIkIA0XLx0jUmDiIAwi
+AWmAACdwfaIzEjE9sEYHZigiIn+mMwozEaMi0Q8oUpikiAmIEfhAAEE//yoAGTE0KZJ/CiIRopLR
+DwBsEAQbLwzzDgANN5IBAOiynySN+QAALLKXqswJzBGsiBIxKSqADR0vAiiADOIifyUAmYAALdB9
+LLJgsKkNmSioyKmICokR6SIIAYKxgACKIYggCgqO+R8ADDAJdQDoJgEpQASAAG2aE4mC6oYAJEAh
+AACKgQkJjpmBCgqO6oYAKVAEgABYDajaIFgNpNEPAAAsspiqzAnMEf0AAEQ//hIAiiGLIAoKjgsL
+jvpAJhXgCXUAbZoTiSLqJgAhECEAAIohCQmOmSEKCo6aINEPAAAAbBAEEzD9DCIRoyKCINEPAGwQ
+BBUw+gwkEaVEI0bAJELA0Q8AbBAEFTD2+Fw0BahiHQDqZBELT0KAAOVFCAzPQoAA6JkIBDnBAADn
+QggBgemAAPZAaB2gA4UADwIAbToQ45IcJMghAAAkkhsklhojlhsGYIYFAmcGQIYFAmUGIIYFAmMG
+AIYFAmHRDwXghgICbwXAhgICbQWghgICawWAhvIQqB2gA4UADWIRCCILDwIA0w/TD206EOMiHCEQ
+IQAAJCIbJCYaIyYb0Q8AbBAE8lviBagyHQAKMxGjIiIscNEPAAAAAAAAAGwQBATqMBgtBSiCRQKI
+KKhCA+owAyMMajEObQgICeowCSkMapECY//w0Q8AbBAEFi1MpiYlYoDHfwc3AwdVAQVFAiVmgNEP
+AGwQBC0gDSsgDBQuiucuiRaLgYAAKHB9LkJgsN8I/yir7q/uKCAF/QVgAdAKNQBohHb1AAmCkgCd
+APUAClsSAJ0A9QAKq5IAnQBoiAXAINEPAAAqJAVk0V8YL7EI7gsq4sAfMJwKDEoIzBEPzAL94AAG
+MAkFAP0XZhWpqmEAbakCKYa8KuLAHyziCgxKCMwRD8wC/eAABjAJFQD9F2YVqaphAG2pAimGvPVg
+BaMSAJ0AGiz/6EKfJoeJgAAZL42puSmQfSOinK2ZCTMICTMRo4MjPIAIthEqMhQPAgAuoQMtoQJ+
+0XorCgBa8w0oMA3Lpi8wVcCRCJg5qv8I+Az3BgAKsIgFAOhVAgnQBIAA+qBoHeAMFQBb9u7coOtU
+AAnQBIAAW+pfY/+tZI/E6jAMJAFJgAAscH0rQmCwiQyZKKq4qYgZLjoJiAoogoD//rgNpogBAAAA
+AAAA+UBoHa//mgDApSokBdogW+s48UfoDeAMhQDsJAUtEASAANEPAAAAAP9gaB2v+n4A+gACHaAM
+hQDsJAUtEASAANEPwNj8QKYd4AIFANEPAAAjopurMwkzEfMAAEH//H4AGDBIBu8RqP8o8pDxH/SL
+0gCdAAgqQfgAgh3gCAUAbZoEeoEEsYhj/nYqjCT78kYVr/nCANKg0Q9sEAQWL0oGJgslYsHHfwc3
+AwdVAQVFAiVmwdEPbBAEiCLOhdogW/96za5oUwPAINEPiif6gGgd4AwFAOqsICpoBIAAWurH0qDR
+D2hTMoonwLD7RAAVoAwVAFruxx0tvp2gjCD6YEQF4A0VAOumAi5mAoAADcwC/UAmFaACBQDRD8Ag
+0Q9sEASDJxovKIM+HC3s9FzEBaaIBQCoMygwYS8wYC0gDO4gDSRAKQAA6DRhJ4EBgABo8Wr14AWx
+EgCdAMCh/GAWBaALBQBYCj7HItEP8cvADeAFFQAvwH0pQlyw6w+7KK2Zq5kKnAsrwsEdLfQNuwIr
+xsGIImWApdogW/9EZaCdiyAlNGAuQpP6lGgVoAwVAP9vAA2wDRUAWupSwCDRDygwYcT1ePth78B9
+JwNRgAApQlyw6w+7KK2Zq5kKkgsvIsEPj0ll8IIqIsEbLB4LqgIqJsEoIsEZL+YJiAH4WCYVoAIl
+APJsBh2gAgUA0Q/AwCw0YCw0YS5Ck4sgKkKj/28ADbANFQBa6jbAINEP+aBoHe/9TgD5oGgd7/6K
+AACKJ8Cw+0QAFaAMFQBa7nIeLWmeoIsgHS/N7aYCLeYCgAAFzAL9QCYVr/zyAMCh/F+UBaAbBQBY
+CfsqIsEbK/oLqgIqJsEoIsEZL8IJiAH4WCYVoAIlAPJsBh2gAgUA0Q8AAABsEAQVLYYqUocpoQMo
+oQL5AAaMYgCdAMCwWvJE5y+3HSAEgADuLCUdMASAAC7imy1Sfw8CAKTuCe4RDt0ILtANKdAMZOCl
+73QABIYRgAD/IYAH0AoFAOpwfSP4BQAACRkU5JAqZNv9AADs8H0nwAkAAG25DuuAfCRACQAAqsos
+gHuquuqAfC1YBIAAq8urqrDvr68PWxQOuxELOwz7YGgV5P8BAPvgBADQDBUAAMwa/WAEBbAMFQAL
+yzna0Fv/cCpShw8CACmhAyihAnmBFStMAVryFu4r+R0gBIAA+t/6ZSIAnQDAINEPAAAAAPsgBADQ
+CxUAALsa+kAEBfAKFQD7TQAN//7eAAAAAAAA//38DaAKBQBsEBAUK+gpQmQXLoL8Xu4FoAYFAP84
+ABSwKAUA+Q8ADHAFFQASL3IswhAiIvPpzP8sAgqAAPeAByCRIp0A7Zz5LNgEgADyAAId7/r1AAII
+QWmDAn05FfJgIBXiIh0A7Dnrddv9AABgALMAAAAaL18uQpsqok+uvgnuEa6qL3KuLqAi7xYJJ8Bo
+gACIGQjIQnjpDRgvDhkvVI8ZJpS4CP8B6hYILwEKgAD8oAEE3/j1AAiZAwn5AS0WFCiiAiwWFSsW
+Ful2riwAxgAAKhIIW/6KKxIWLBIV7RIUJXvhgACKGIqn/CKGFeALBQD7RAAVoAwVAFrt2ysSFiwS
+FY4YHyzPn6CO4C0SFB8vM++mAi92AoAABe4C/0AmFa/89gArHBBb/3ISLPcTK6PTDygig3GOA8Ag
+0Q8eLy4kIriUHBwvLSQmuA4Ah+4ABwDoQQAADQBhjxWOFIsW+iAGFeAKVQDpEgcqaASAAPggJhXg
+GwUAWAlPLCKDA8wCLCaDGy8bK7IQwCDpcq4lhamAAGRArRQvFfMgBAHwigUA6hYNILBBAADkFgsi
+ciEAAP4hxhWgAcYAAAAaLw0sokcrok+sLQndEa27mxqLsCqiVwy7DFrpf2ShrG8kDI8eL/D18fTM
+DeAOBQAbLwErshCPHI4bjR38IcgVof8dAO8WDCdwBQAA7hYLJugFAADtFg0mYAUAAOwWDiEQBQAA
+eyshiBzJjIkcf5fFZT+MBysLKrLBHCshDKoC+3gmFa/+dgAAABwu748WjhWNFPgg6BWgClUA+CAG
+FaAbBQBYCRUoHBAIIIfAIAIlYhQrUAEgY/Rf9icSAJ0AGi7dKEKcI6JPoojsokcsRkKAAKgzizAq
+olcMuwxa6U/JowFEh7EiAiVk4UQHCXdIAABj/ooAAPpgaB2gCwUAW/6uY//cAADpRAABBaGAAMCg
+/kGAB9DSjQDqQH0iSAUAAOTQLWbb/QAA7JB9JMAJAAAPAgBtug7rgHwkQAkAAKrKLIB7qrrqgHwt
+WASAAKvLq6qq6gpdFA7dEQ1tDP2gaBWkmgEAAJEEAFgaCMwCnNOx7v/f9eLiAJ0AyDnqEg0vBhwA
+AGP/zOosfBcE8QAAGS6qKqB9KZIQCuooqSmqmQeaCyiiwRsq1o8eC4gCKKbB//6wFe/+8gAAAAAA
+AAAA//48DaAKBQD4QGgd7/9SAPohSBWgCwUAW/54Y/5EAABsEASKJ4kwK6EV90QAFa/NBQD8wAQG
+98UBAP1gAEX2iUEA67xALhVcAABkgIaJqwiMEeycCAJT/QAA7K4RBmAHAAD7gATy4gCdAO7OCAHA
+QQAA/2AE46IAnQBoQQptqQUIAIYMAmGJY4iQsYiYkI8w8+AFjBIAnQDAINEPAIoxCgpHaaHy/kKQ
+Faf5AQDv/AErUASAAP4uAA/wCxUA/8AAR3AMBQD+QoYdoA0VAFrpAtKg0Q8lMBceLm0vqRTpoggi
+qAUAAOmmCyrnAoAArP8vpRSekIwgCMwRDFUC9SAmFe/9PgAoYQX5jwAOP/1+AAAAAAy7DAtJFLie
+Dq42bekFCACGDAJhA7gI6U8MBskBAADv/P8kQEEAAG35BQgghgkCY2P/QBUrIiSQEIphI5AX9IAB
+AnAHBQDpqW50qEEAAPrAaB2gCxUA/OBoHaANFQBa6NmNY43Q2iD4QpAV590BAO3cASrYBIAA+III
+FaHdHQDtmQgJ4ASAAPhChh3gDSUAC4AALmIDDwIAZO7q6zQAC1AEgAD8YGgd4AwFAFroxvbAZhXg
+AgUA0Q+OINtQ6EIQKVAEgAD9wAAXMA8VAO/uAgngBIAA/yAmFaANJQALgACJY2SeoS9pBOlmACGQ
+BQAA52YDKRcCgAAC/wz+wIQd4AIFANEPAABsEATRDwAAAGwQBuotPxl4BIAA9CAGHaAG5QD0ICYd
+oAUVAPpAAEIw+PUA+EALTCB7BQAoQIDTD/iAAAQwDgUA9wPeDaAZBQAdKj8LLAJtmg4v0ZSy3f3g
+BvQiAJ0Ase60LxwtxQDxBO2ggyrACoAA+ZAQFeN4AQAnFAIsoIF5gU8ooIDAkP9QUBXkiAEA+R7g
+FaAOFQD5wgAMtMwBAOicASZj3QAA/QIADLT/AQDunAEn+90AAP/CAAz03QEA7JwBJuvdAAANyTj1
+IAbBUgCdAMCgZqDq+iBoHeD65QD6YAQFMAwVAFvv2mag1OU6AgDYBQAA+uAABTAMFQBb79QrQIBm
+oLv6VB4FpLsBAPdkPg2gfAUADCwC+gACHeAdBQDTD23aDC2hlOzRPnVQCQAAsbsiEAHRDwBm7yQY
+KlIvgoT7wAQA0AkFAOCZGg8BCoAA/KABBl/99QANzAMM/wEJ/wL/EIYV7/vqAGa/xBwqRS3ChPtg
+BADf/vUA4hABKtAKgAAOrgMO3QENqgIqxoTRDwAAAAAAAAD//NwNoAoFAAAAAAAAKgrg+iBAFeAM
+FQBb76dmrxwfLXDn9IAleM2AAChAgAgIRHaJIxsp3vwOAh2gDQUA/EYADjAZBQBtmg0usZR84Qvt
+3AEl2AkAANKg0Q9m3/gSKiMoIoQA0QT8oAEH3/n1AAn5AwmIAQj/Au8mhC0QBIAA0Q8AAABsEAYs
+CgH8IAYdoDqFAOwUASjYBIAAW++HFC2QFSzP9lQkBaAD5QDyH+Idr/f1AOVc4C0DygAAw6n6ICAV
+4AwVAFvvfChAf2agYfiAAAQwCwUA8wKeDeAZBQBtmgwqUZTioRhyqAkAALG7HCp+KxAB+4/mFeBi
+RQDRDwAAZr/qImKEHip4+2AEANAPFQDtEAEv+AqAAAf4Ay3mfwgiAQL/Av7QhhXgYkUA0Q8AKEB/
+CAhEc4kY+gACHeAZBQBtmg0sUZRywRXrvAEiqAkAAB0qZfuv5hWgYkUA0Q8AZr/uImKEHipg+2AE
+ANAPFQAA/xoH+AMq5n8IIgEC/wL+0IYV4GJFANEPAABsEAQaKnktooQooocpoof5YAAEO5mBAHmJ
+AdEPKaKCf5/3ItAHbysB0Q/ApfxalgWgCwUA/kAAFzD/BQBYB3AbKsjsKXcRE8UAAPBEAA3gDYUA
+/gHiHaB6FQAP6jApwkUPmQgP6jAPnwxq8QgI6jAImAxrgfYOLzYPqgwttlLvIgwNT8KAAOm2Uyl+
+hgAACuowCOowKcJFqpkImAxqgQgM6jAMnAxrwfYttlIuCuIutlPRDwBsEAQE6jAVLSgiUoByQwQk
+VoDRDyhSf+RWgCRABQAAKFZ/0Q9sEAQTKjWIOGmADgrqMIk5CpkMapEDwCDRD8ChWAQpiThqkRwb
+KjsMKhGrqiuinm69HCKineQgJWTj/QAAnDjRD8CgWAQgiThrkdjAINEPwNoNnTT8YQYV4AIFANEP
+wNoNnTSdONEPAGwQBIknKJkU+yQAFaACBQDrkgkkAQGAAPFhgA3gLKUAHSrcKbAAi7J8mQh9sQge
+Ktp+sQLRDwDAsvwAAh2gDSUAWueG0qDRD2wQBIknKJkU65IJJACBgACJIsiewCDRDwAAAAD//8AN
+oAsFACywHYq2i7UAzDJYBePaIFv/4dKg0Q8AAGwQBIs1iDQsMBztMgYpUASAAAuAANKg0Q8AAABs
+EAYvMgAkIgAYKqf+dAAF9//BAPXgBsbSAJ0ACPgKKIJ8ZIDwGSvYGCzWKZKuD/UK6FUIBIQ+gAAq
+UHzzQAn30gCdAOZQfSWhgoAAC2wBDAxD/WpeDaD99QAnUH59cQyLMQsLR/dgB61iAJ0AJ1CAKkAg
+izAcKrh3qAsjUH8vQCF8uElz8EYZLL8GSEMPAgAJiAoogn8ESgILgADqJgAlBImAAMAg0Q8cLLgu
+QA38gZAV4AolAPogBhXjhgEA+CAmFaALBQBYBtbGKtEPABwsry5ADS1ADJMR+iAGFaALBQD2IEYV
+4AolAFgGzccv0Q8cLKj8gZAV4AolAP6BsBWgSQUA+CAGFeALBQBYBsXGKtEPAAAAAC1ADP6BsBWg
+CiUA/Fk4BaALBQBYBr0i+trRDxwsmS9AIS5ADS1ADCpAIJoQKVB/mRH4sBAVoAsFAPggRhWgCiUA
+WAayxirRDxwsjy5ADS1ADPogBhXgCiUA9iAmFeALBQBYBqrGKtEPLUAM/oGwFaAKJQD8WQoFoAsF
+AFgGoyL6udEPAAAAbBAKHyyBDSsRD7sIKrCA7LCCJ/pxAAAPLwso8OXyACId4A4FAOzMASVT/QAA
+7KoBBEAFAAD6RQAGN6oBAOq0giQC+YAA/WPoFeAEBQANyQqJkAoIRACABAkJGcmabQgUf588sar4
+LgAM96oBAOq0giSAQYAAY//kACmwgejw5SZgBQAADJkMCUw4C8oR/8AgFaeqAQDqtIIkQAUAAHjj
+rBspLv1AABYwHhUA67KDJeoBAAD+QAoMIgCdACXSm6pVCVUR5bUIDhgEgAAUKRkDAkcEIgooIpID
+ihQLgAAoIpb6YGgdoAsFAAuAACgimNowC4AAh6H1QGgdp3cBAPTgCGrSAJ0AKqIAGSoB9qBoHaf6
+wQD14Ase06qhAAn7CiuyfGSxdhwrMhgsLyzCrg/yCugiCAYEPoAALSB886AOX9IAnQCaGCsgffNA
+BooSAJ0ACr4B+iEGFaPuAQD/QAX1IgCdACogfigK/3ihE4lB+iDmFaeZAQCZFPsgC00iAJ0ALSCA
+LmAgikB96CAvYCGeFp0VGCoKLCB/nBn5QAVwogCdAJwZ/eAFJiIAnQAZLA8LSEPTDwmICiiCf+uk
+AAtQBIAADwIAC4AA5aQABQdpgADAwGbAOohAGSnNCIhXCYgKKIJ86lQAClgEgADsdAAJ6ASAAAuA
+ANEPJdKcqlXjwwIKrkKAAPVgAEL/+woAAMbK6jQAClgEgABYBOvRDxwr84kYLmAN/MGQFeOLAQD4
+ICYVoAolAPggBhXgCwUAWAYR//44Da/spQAAAAAAHCvpiBWKFi5gDS1gDIkZmRH6IAYVoAsFAPgg
+RhWgCiUAWAYF//14Da/89QAAABwr3vyhkBXgCiUA/qGwFaBLBQD6IAYV4AsFAFgF+2P/pC1QDP6h
+sBWgCiUA/FeoBaALBQBYBfX9+0Idr/x2ABwr0C9gIS5gDS1gDCpgIJoQKSB/mRH4UBAVoAsFAPgg
+RhWgCiUAWAXpY/9aHCvGiBcuYA0tYAz4IAYV4AolAPggJhWgCwUAWAXgY/85AAAAAC1QDP6hsBWg
+CiUA/Fd2BaALBQBYBdn99yIdr/q6AGwQBIkw2lDtK7cZ2ASAAOwwCCSoPIAAbsYt8AAYDa/spQDA
+wO4ohBSkZIAAL9CCL7QIKdIerpkJSRSZtCjSH5i1WASXwCDRDyzUgv//VA2gDAUAAGwQBOYkAAmQ
+BIAA40QACyAEgAAPAgAPAgBtOQ/jIAAhEAUAAONEACIgBQAA0mDRD2wQBNYg0w/TD21JB+MkACEQ
+BQAA0mDRD2wQBCkKYPgF4h2ge6UA8i4ACrA6lQBtWVoiMAFyiwxyown2WgAV4ABmAAAA4psPcTsl
+AAByswf2VSAV4AASACIwAOKLD3GYCQAAcqMH8loAFaAAWgBymwtyswjyVSAVoAAiAAAiLMkMLBGs
+fOxFACIgCQAAwCDRD2wQBAIdFGTQevwMAh2gCQUA+gXiHeB/pQD+ByIdoAgFAPQAQh3gAgUA4ycI
+AVAJAABtWiwicAAMiBHiuw9zuAUAAHLjB/JaABWgAFoAcssLcvMI8lUgFaAAIgAAIizJqCgEkgj5
+ICAV4AUlAOgkAC0QBIAA8kAAQ/AIBQDtmbFxUAkAAMAg0Q9sEAQCMhRkIGf6DAIdoHylAPgF4h3g
+O5UA9EABBzACBQDyQABD8AgFAPxBABXgBYUAbVosInAADIgR4psPc7gFAAByswfyWgAVoABaAHKr
+C3LDCPJVIBWgACIAACIsyago6EYAIiARAADuSbR+kASAAMAg0Q8AAABsEATnJAABgoGAAPoHIh2g
+KPUA+g9CHeBpBQDyAAIdoAYFAG05LqdjIzAAAiIK44sPczAFAABzowfyegAV4ABWAHObCnOzB/J1
+IBXgAB4AIzzJAyIJ0Q/AINEPAGwQBPBFIA3gBwUAw7n8D0IdoCn1APgAAh2gagUAbSkuo3IiIAAI
+iArimw9zuAUAAHKzB/JaABWgAFYAcqsKcsMH8lUgFaAAHgAiLMkCiAn4gAYVoAIFANEPwJD4gAYV
+4AIFANEPAAAAbBAEIyUC4yUDIWBBAAD8QAYVoAsFAOslBSHB/QAA8sAAAfeIHQDoJQQhgUGAAPpg
+aB2gDRUAWuFQaK4V+mBoHaALBQD8QAgVoA0VAFrhSmmu6chLKSEEDJkRKZwQmUDRD9EPAGwQBBgn
+RRIoJSiCoiIigAmIEQgiCIgny4H8VcgFoApFAPxACBXgCwUA7yIHKXAEgABYBPsbJ0ccJwjtKt0Z
+UASAAFqA6dogWoDM0Q/6CAIdoEsFAFhbrfpACBXv/PUA+kDmFaANBQBYPRtj/6sAAABsEAQTKrwD
+AIfjAAcBAEmAAAIAYdEP0Q9sEAQTKHoiMrgiNrjRDwAAbBAEHSbpHidcHyrGGSrIEicqEyrCFSrC
+HCrELDaOJTZ+IjaFKTZwKTZxLzaGLjaN7dJFJNEBAAAqNoDqNoEk2IEAACs2ePpvJhXgCBUA+G6m
+FaBkRQDkNn0kyYEAACk2iCk2iQLSKATUKJRQkvAUKrEVKq8SKrEO3SidwCI2jyU2fyQ2h9EPAGwQ
+BBMqrBIqrPQCwh3gBwUA+APiHaAE1QBtSiLiNoAhoAsAAOI2fyEQMQAA6FY2AqgFAADnRQIhmDEA
+ACZFA9EPAAAAbBAEGCdZAgRHDwIACEQKKEKSAooUC4AA/GLAgNGaAQBokQJpkxwoQpjaIAuAANKg
+0Q8oQpb6QGgdoAsFAAuAAGP/4sAg0Q8AbBAEEinDIyKbIiJkoyLRD2wQBBgqhw0nEah34nIAIYBR
+gAACyVMpNADwgHAN46LBACpEAPCgcA3psmEAK1UA8MCQDerCAQAsZQDRD9EPAABsEAToKCcRgMmA
+ABUp9yiAfSVSf7A0CEQoolKkItEPANEPAABsEAQYJof4UHoF4AX1APcSqBWgCuUACWYBBlo5FCae
+AyMRpDMrMoIZJwn5EqgVr/wFAAy7AQuqAvpwRhWg9gUA+QAEBHDiBQAIYjkkMoIl+g8FRAEEIgLy
+cEYVoAIFANEPAAAAbBAE8lSsBeDJxQAJKSgYJs/4YABB8AoVAPpwRh2gCQUAKTSAKTSDKTU+KIB9
+DwIAf4cX2iBYJ47ipAANAOYAAMCrKjSA0Q8AAAAA2iBYJ3bipAAFf2GAANEPAABsEAQYKkH0VH4F
+oMXFAAUlKKVEK4KALYKBKYKA/RAoFaC7gQArRIAmgoAqgoH1EAgV4imJAPKQJh2gZqEA9pBGHaAH
+FQD5ECgVolWxAOVEgyE8rQAAGCazBioMBaoMKICAKqwd+0AEANACBQDgeRoEDDEAACdEnylGI9EP
+wCAiRiPRDwBsEAQVJoYkUoT6QAQA0AcVAOA2GgkBCoAA/OABA9/49QAIdwMHRAEGRAIkVoTRDwBs
+EAT4AgIdoATlAPRqRg2gVnUAEiYm+kzqBeADBQD+Tg4FoP31AG2KDCkhlOaRCHEQCQAAsTPHOyyy
+hO3kKSmBCoAA/cVGHeAKFQD9QAEFX/31AA2tAw3MAQyqAiq2hNEPxWD2RgALP/6yAABsEAQUJl8k
+QoX6QAQA0AMVAAAyGgJCAQIyOdEPbBAEFCZYJUKF+kAEANADFQAAMxr4YAARv/b1AAY2AwZVAQUz
+AiNGhdEPAABsEAQWJk6mJiVigMd/BzcDB1UBBUUCJWaA0Q8AbBAEFSnhDCQRpUSTQNEPAGwQBBMp
+3QwiEaMigiDRDwBsEATyU7AF4AQVACIymwJyVgQiCfJziBXnIgEA0Q8AAGwQBGRAUSkgAGSQS8Bw
+6DAAIgzLgAB5iSptCBoHRgzoYTVjuAUAAGpiD6N4onkpkAAogAB5iQxj/96jeKJ5KZAAKIAAeJML
++QI2DeACFQDAINEPxy/RDwDAINEP0Q8AAGwQBBopuOoqCAFIEQAA+1AIFeH49QDpgwd54ASAACqi
+gVgF4wtCAdEPAAAAbBAEHSmvGCmv+aBoHeDKBQBtqgUIAIYJAmHrJeYe0ASAAFgGGtEPAGwQBBMo
+i/RS7AXgCAUAJDKuGSY6CUkBKTauKFaoKFapKFaqKFarWGD3GyWvKjroKrZFWGDn5qCkbRAEgABY
+YMRYYILSoFv/5GYgkVhf5Oagi20QBIAAW//gck4LLFKADwIADwIAf8cQHSmODU0B/HXGFeAKNQBa
+f0tYXzfmoF1tEASAAFhe2+agUm0QBIAAWF585qBHbRAEgAAiMq7TDw8CAHQvRh4l8g4uAS42rlhe
+XVheTeagJW0QBIAAGianGyamWFo8Hyl36vZ/JQbBgAAbJ5+0vFhaENKgZyAEwKFa5P3RD2P//AAA
+AAAA9kxEBeJSQQAIVhEGBEcHRAonQpLaUNMPC3AACglBaJEH+SAFmdIAnQAoQpjaYAuAAM2n2lAL
+cAAKCUFokQJpk24oQpjaYAuAAGSv5hwoRv1ABhWgDRUAnaEbKVgaKC76QAQF8pKBACmkgOs2rirQ
+BIAAC3AAKEKW06D6wGgdoAsVAAuAAPiSiBWv+8UA+mAEBfAMpQDsuwIK0ASAAAuAAPJf+qCSAJ0A
+Y/8WAAAAAAD//lQNoAoFAPxShAWgChUA+gAiHe/9RQBYA0T//HwNr/JFAAAAAAAA//1UDaAKBQBs
+EAQdJUbrNAAJUASAAP2oqBXgDAUAWAR+47QADRAEgADRDwBsEAQD6jAWKMMkYn90MwcjZn8iYn7R
+DyJifuNmfyEQBQAAImZ+0Q8AbBAE+EDoFa/19QCJg4Mii4KbkIqCBUUDBTMB+UAmFeAGBQCWgpaD
+kyLRDwBsEATrNAAKaASAAPpAaB2gDAUAWn8O2iBafvDRDwAAAGwQBBUmBINYyDDJKBgn5yiCqflA
+AAQxhAUA+IFWDaCJBQCZWNEP0Q/Hz5xYCuowGyUVK7JFLBr0DLsoq6qaWdEPAAAAbBAEFCXzhEjy
+TAAFoAh1AOg4KAGoKQAAdUIUJSKu+KO2DaAJBQAqIq3HJAqSOdEPwMD6AAId7/JFAAyyOdEPwOD8
+AAId7/JFAA7SOdEPAABsEAQUKO0VJd4kQICFWLo48IKADeACBQD4pE4NoAl1ABIl5igirgk5KPkE
+Fg3gCgUAIyKtxyQDojnRDwDRD8DA+gACHe/yRQAMsjnRD8Aw+gACHa/yRQADojnRD2wQBGQwovRg
+BMJSAJ0AZDCQ+E9SBaAJNQDTD9MPbZoh61IHJEgTAADtUgYkYBEAAOuWACKr4QAA680EJEAhAACd
+sBgluBonnQaGOBgnrxsnrYllHSerj2eMZp+oj2Sc2B0nq5m4jGOJYhsnqZ+InNiZuBwnkRklNusk
+wBnCAoAACEgCCYgC+Z/mFaPqhQBtCAmwqsutKcL/ebACY//vwCDRD8ci0Q8AAAAaKKwqoIBkr17q
+JAAJ2ASAAPyAaB3gjAUA7lQAC3gEgABYAJjSoNEPAAAAxyvRD2wQBOYkAAGDWYAAbzRfZDBcHSdz
+7CSjGcICgAAISAL5v+YVo+uFAG0ICrC7ZLC7KdL/ecACY//u+E7UBaAJNQAPAgDTD22aIemNBCRY
+EQAA6ZIAJdgTAADpVgciq+EAAOmyACRAIQAAmVjAINEPxyLRDxoohCqggGSvlRIldIko4yWBFI2z
+gAArMq5ksHMqMq1koG+wnJwo+MAIFaAPFQAvpAD/QQYd4AIFAOKkCSpeAoAAD7sCm6EJ6jAppQX9
+AAAUMAk1AAmIApijLWAGjmIvNq3v7gIG6AUAAC1kBv7ARhWm3QEALWQG0Q/HK9EPAMCgW/9RiShr
+kY3//mgNoAoFAMCgwMoMnDT8QQYVr/4uAAAAAGwQDBslAQ8CAOsABQjIBIAACQJhCQJh6wAFAMiB
+AAAJAmEJAmFkMLMZJI/0YAdokgCdAPRgB6kSAJ0A9GAEulIAnQBkMI8YJyH6IGgdoAk1AG2aIeui
+ByRIEwAA7aIGJGARAADrlgAlU+EAAOvNBCRAIQAAnbDpJxYQ0IEAAB8nJxsnJYilHScjjKaOp56Y
+nNiOpB0nI5i4jKOIohsnIp74nNiYuB4nCRgkr+wkOBn6AoAAD08CCP8C/9/mFePqhQBtCAqwqmSg
+ciji/3jAAmP/7sAg0Q/HItEPAAAZKCUpkIDqJU0a3AKAACsWAuoWCiT6qYAA6iQACdgEgAD8gGgd
+4IwFAO8cICjwBIAAWAAMCqICBgAAAAAAAAAA6RYLKtTCgAD6IGYVr/xOAOkWDSrcwoAA+iCmFe/8
+DgDHK9EPbBAEHCT9isjnJQobmASAAPdABMCSAJ0AKHKu+gDiHeAJVQADuTn5AATj4gCdAClyreSQ
+k2Vr/QAAncjA4u6UACTQQQAABiCGCgJjBgCGCgJh5DA3ZNDBAADyyGgd4AhVAAoCZwNAhgoCZQha
+EQqKApqRLyAGKHatBP8C/kDGHeACBQDRDwAAAAAAAAD8oAAWsAw1AA3NAp2RKyAGLHatBLsC+kDG
+HeACBQDRD8CgW/7NHCTRisj5X/rwkgCdAP/95A2gCQUAwJDA6g6uNP+BBhWv/aoAAAAAbBAIGCR7
+0w/TD+gABQjIBIAACQJhCQJhZDCc9GAEqlIAnQBkMI0YJqP6IGgdoAk1AG2aIeuiByRIEwAA7aIG
+JGARAADrlgAlU+EAAOvNBCRAIQAAnbAaJLIZJpcYJqocJqgeJqaLpY2mj6efmJ3oj6QeJqWbyI2j
+i6IcJqSfiJ3om8geJowZJDHsI7oZwgKAAAhIAgmIAvnf5hWj6oUAbQgJsKrLqCni/3nAAmP/78Ag
+0Q8AxyLRDxonqCqggGSvZOokAAnYBIAA/IBoHeCMBQD+IGgdoA8FAFv/k9Kg0Q/HK9EPbBAEyjlv
+NCHJPhwjofpM4AXj6oUAbQgKsKpkoKoosv94wAJj/+7AINEPxyLRDwAAGSeRKZCAZJ/QKiAG/07A
+BhAGFQAVJH6JWOMkihSN/4AAKzKuZLCLKjKtZKCHsJycWIsgJqQAlqEmpAgkpAkM6jAspQX9YAAV
+sAw1AAy7ApujiSIoIAYGmQLpJgIkQAUAACgkBi8gBo4i9nWmFa+N1QD+AAAHNv8BAP5Axh3gAgUA
+DtI50Q+OIi36jf4AAAcwAgUADtI50Q/HK9EPwKBb/laJWPk/+9CSAJ0A//4IDaAKBQDAoMD6D580
+/qEGFe/9zgAAAGwQBJcj6CRgGtQCgADoJgIqSoKAAAqZAuokXRneAoAAC2sCmyEKmQLpJgAhEEEA
+ANEPAABsEAQVJA0UJiblUoMisgEAAOQkCAGAwYAAJEB9ImKco0SkIgkiEaJSIiyA0Q8kYpuiQgki
+EaJS0Q8AAABsEAQWI/QCBUcGVQooUpIChhQGagILgADHnAmpAek5AgGdDQAAwDjjkwICAKmAABgm
+GCiCrv8A4AMQCUUACTMCKFKW+kBoHaALFQALgAAoUpTqZAAJ2ASAAAuAANEPAAAAAAAA8yBoHe//
+mgBsEAQZJymIMAQKBio0BvkABAR3ogEA6DYAJS0ZAABoo3MTI9EDowooMpIChBTaQAuAACgyltWg
++kBoHaALFQALgAD4cogVr/vFAPqgBAXwDKUA7LsCClAEgAALgADRDwAbI1UaI8srspv7UGgVqMId
+AKy7CbsRq6qLp4u+jbDJ0/1gKBWgDgUAnrDutgEp2ASAAAvQANEPAGwQBAIKR2ilJhMjsQOjCigy
+kgKCFNogC4AAKDKU+0BoHeAMNQDsuwIJUASAAAuAANEPAABsEAQZI9UoIgHpSTYJ0ASAAPkgABS/
+iAEA6YgCCuAEgADoJgEpWASAAFv/wsAg0Q9sEASUK5UuJiYRIyUSKCANKSEHixyMG40ajhguJFQt
+JGDsJGEr1QKAAPpFhB3rmQEACpkC6SUHJACBgACPHoMdIyQhLyQg0Q/RDwAAbBAEGCRYZCBD+kXE
+BeAHBQD5EBAVoAYFAG0pEQBgBAgJG++XBnMwBQAAuHfTDyqySCuxjytFAKeqqjr6gEQdr6qBAPqA
+JB2gAgUA0Q8dItEs0kgt0Y8tRQCsPPyARB2vzIEA/IAkHaACBQDRDwAAAGwQBBkmvCiQgCWQfyKQ
+fuYlFhq+AoAA6HcCCRYCgAAFIgL2VwAJcgUFAAUiAvZABAMw9eUA9oAmHagiHQAFIgHygAYdoAIF
+ACuQgStEAiqQgipEAyiQgyhEBCNEBdEPAGwQBCggDcmCKyEr2jD8oGgdprsBAFv/4tKg0Q/aMOtE
+AArgBIAAW//C0qDRDwAAAGwQBPZAUBXgFQUA9kAQFaAEBQDjIAMqAQqAAOIgASu+AoAA5zMCCzYC
+gAAGIgLgIhoKgQqAAAAzGgMiAtEPAABsEAgkFgUUIyEPAgAkQoocJoYiFgbygkgVoApVAPwgqBXg
+OwUAWACD8FcADeAHBQDwBLQNr/b1AAAAAACOFi1SCv3lUBWgGgUA++UQFeAJBQDo8CssgQqAAO/w
+KS5mAoAA7IgCDd4CgAAL/wLg/xoNAQqAAACIGgj/Av+gBvUiAJ0AKBIF/wAGnWIAnQAcJmcuUAX8
+oAgV4ApVAPggBhWgOwUAWABkKVII+EXwBa+bdQD+oYgV755lAOxSCSSAwYAAKcYALVII/aAmFaAK
+BQCaWJpZmlsrVAUogoqYFO5UBSf8vIAAjhQrUhIu4iQLikT7WgANMAwFAP9AAQUwDRUA+0AIFa+7
+gQBa4HLA8C9WEooUjlccIt76oAgV4AgFAPihhhWvzwUA7MJ0J2iBAAAP3QHo5RQm6QEAAJ3pDLsM
+/cEGFeAMBQD7QigVoA0VAFrgYY4ULeISsN0t5hKxd3JxOupCESNYBQAAWuiNGCJwFSLHKIKTJVKE
+qogJiBGoVeNR2X0wBIAAiVcqmRTvkgktdWYAAP/6kA2gDwUA0Q8AAGwQBC9hBy1gBxgjV/zBBBWq
+/wEA/AIABPHdAQDqmRAO7AKAAO3MAg//AoAACf8CCP8CHSMUnyAfJMWOYJQjnSIPzALsJgQvdgKA
+AA4+Av5AJhWgDgUAniUHBIn+QMYV4L4FAJ4nAiCLi2ctYAzrsg4u7AKAAA3MAuwmBCLgwQAA7CYH
+IVChAABb+kAMOBGoItEPAABsEAqWGBslW+Ml4BnABIAAlxkrsfAqMh4pMILlFgct3gKAAKul8yAH
+26IAnQAL6jAsMrMoFgP9YAdjogCdACs2sx0h9xYl7ioysv2oqBXgDAUAWAEwm1GIE+5iACLIQQAA
+8qHGHaAdhQD6oAYVoAIFAP6gRhWgCsUA6FQPJ3gFAAD+wAYV4AjFAG2qBQQAhgkCYSJUz+gWAirQ
+BIAA/iIAFaAJhQD+ICYVoASlAORUziD4wQAA/iAGFeAkRQBtmje0iOgWAi9YBIAA+aHODaAZ1QBg
+ABIAAAAAAAAA6YoGf9gEgADYQJgSq4wszf8swj/spjQlUBEAAPqgaB2hCwUAWAItHSH9KDFALdI3
+sYj54AAEON0dAH2JBCI1QNEPKDVA0Q8A0Q8uMrKx7v52RhWv/D4AAGwQCBwlshoiGY8gIyAH+EMI
+FedFAQD0n8AV4A0VAAXVOS2QBIia/yAIFaB7hQArlAUKiAIrJAX5IUYVoTMBAPIgBhXgClUA9CAm
+FeA7BQBb/5/6QGgdoBsFAO0cECngBIAAWups7CWaFQI5gACLIMDQLaQJDLsCm6CJKZmhGCIn7hIE
+Kf8CgACo/+72ACIUeQAAKiIH+gAiHeAMBQD7RAAVoA0VAFrf8MAg0Q/AINEP2iDsJYga2ASAAFrq
+O8Ag0Q8AAAAPRBEEFBQFSgJkoEzJTApPBPteoBWgCRUA6pkMDQEKgAAFRBj8oAEC0AQaAApfBCqs
+9ftABADf6RUA6pkMDQB6AAAAVBr0AAId4AOWAAUEGfygAQLQA2oAAA8iEQISFPJmAAmwJ/kAASIQ
+5iICCYBWAAAUId8EIgLAMNEPDyIRAhIUAyoCZKBLySwKLwT7XqAVoAgVAOqIDA0BCoAAAyIY/GAB
+AdACNgAKPwQqrPX7QAQA3+gVAOqIDA0AegAAADIa8gACHeABsgADAhn8YAEB0AGGAAfyUPBIABEw
+AwUA0Q8E91ABdxAHIgN2TAcUIcDTDwQiAtEPAARIEQWIAmSP0uJEAAqYBIAA0Q8AdTM+YABFAABs
+EAIWJT8EJwN2JMB2RNTzVAAEOpShAGSe0WSPSgZEAholOQYiAgmIDApEAQoiAfKCNg2vgD0AckG9
+sIjjIhgJmAqAAAQiDHU7AbAi+gAiHeA5RQD0bwAJ8AoFAOMiGAmYCoAA0w9tmCYLqhjkIxh92AqA
+AHQhSAQiDOU7B3XYBQAAIiz/BTMM4yIYCZgKgAApOv7piAgEyBMAAHmLQXQjB3QhI7G7ZLCi47QA
+DEMCgACoogf3UAF3EAciAtEPAAB1O7Nj/8EAAHUz3XU51bG7ZLB4CxsU/3gAFb//PgAAAGaAEPkg
+IBWgAwUA9wAAET//EgAACAgG4IAEBGBXgADrqxgNsAqAAPqfAA0wAGoAAG+NQOumGA3ICoAA+GYA
+CfG6nQDAoPJGAAlwCAUAyCPAkQlmAmdvcbG7yL8PZhFlb2cLGxT/eAAVv/2GAPtAIBWv/WYAB/JQ
+8EgAETADBQDRDwAAAGwQAhYk5nYkMvNUAAI5VqEABUQMa0wwZkA9sUT2RgALuoA9AON1GAJk0QAA
+AEEEBQUZBQIGB1I70Q8AAAQkEQNEAshCxy/RD/rIABI/9fUAAlQ70kDRDwDAINEPZiAE0lDRDwAF
+YhHRDwAAAGwQCCMWASIWAOUWAynQBIAA5BYCKtgEgABYAM0oEgKCEAODKAUiKKMi4qIIDZgEgADR
+DwAAAAAAbBAI21DqJAAJsASAAPCOcA3gLAUAdCsL8gACHeACBQDRDwAAB08E58gMA5U5gAAAgAT6
+4AQA0TKdAAVNGPZLAA+4AD0A/eAAB38tgQACNC4CMyzzwwAOf58BAO9EGAnYBIAA7EsZelAEgACk
+2u2jD3Hb/QAAfKsH6toIAdv5AAAMrwwC+C4C/yzv7CgMdAKAAO6eAg/QBIAA7OsZfxAEgACu0u0j
+D3fT/QAAfCsH4tIIB9P5AADsIgwNnAKAAOOjAguBCoAA6jQACtgKgABYAJJ6IxX6QAY1IgCdAABx
+BABoGvsABcLiAJ0A8n/gFeACBQDRDwAAAAD0QAVC4gCdAAlfBOSQD2yBCoAAAyIY4FsaCZgKgAD7
+4AAGf9uBAA0kLg0iLPODAA04AD0A40QYCXgEgADqSxl6cASAAKtO6+MPcXv9AAB66wfuvggBe/kA
+APvPAA0/gwEADakuDa0s7c4oDOQCgAAMjALuyyN+0ASAAKvM68MZdtP9AAB+yxHg8xEG0/kAAPNG
+AAnwAgUA0Q8A8xHzRgAJ8AIFANEPwCDRDwAAZFFSDr8EZOFU7skMDwEKgADguxoMggqAAPqfAAo/
+24EA+8AEAN/LAQANRS4NRCzgqBoMggqAAPvABADRJp0A5M4oCxgKgAD4RgAJOAA9AOJVGAp4BIAA
+7lsZetAEgACrWuujD3J7/QAAfqsH6roIAnv5AAD/TwAMP1IBAA2ELA2ILuTCKAxEAoAA6FUCCnAE
+gADiWxl60ASAAKta66MPcnP9AAByqwfquggCc/kAAOKiDA/8AoAAD+8CDSQsDSUu9YMADTgAPQDj
+VRgKEASAAOpbGXrwBIAAq17r4w9yE/0AAHrrB+6+CAIT+QAA+88ADT+DAQANqS4NrSztzigM5AKA
+AAyMAu7LNH7QBIAAq8zrwyp20/0AAH7LIuPc/ilEAoAA6DMCD5AEgADRDwByQwJ1MxfyACId4AIF
+ANEPACMR46MCD5AEgADRDwDyAAId4AIFANEPwLEFuyxj/qQLogz78AAG/8sBAP/9NA2gDxUAAAAA
+bBACAwVf9F0AC39CgQADSxwPAgCrZvrA0g3gCQUAsZnyXQAN+AA9AOaZGAswCoAAq2Z7awIpnAHl
+QhwLGASAAKki0Q9sEALgQQQCZEcAAOMiGAmYCoAA0Q8AAAD8YAEBUAMFANEPAABsEALgQAQCZEcA
+APJLAAnxIp0A0Q8AAADynwAJsAIFANEPAABsEALLLfYAAh3gAFIAAAAAbBACyi3yHwADsCItAOQv
+BAu4QoAAAEEEACUa9LgAEbslHQAlSh0EVQwMVRClIgciAtEPAMAw0Q9sEAIC6jDRD2wQAswlA/Ax
+YAAPAG8iBQPxMWAABW8jBQPyMQACANEPbBACzCUC8DDRDwAAbyIEAvEw0Q9vIwQC8jDRD8Ag0Q9s
+EAIiCoAjCgBtKA4oN0AoN0QoN0goN0wjPQEDAgDRD2wQAiYnAAMCANEPAGwQAiUnAAMCANEPAGwQ
+AgIERaQzIzw/A2MUbTkFJicAIixAAwIA0Q9sEAICBEWkMyM8PwNjFG05BSQnACIsQAMCANEPbBAC
+AgRFpDMjPD8DYxRtOQUlJwAiLEADAgDRD2wQAgMCANEPbBACAuQx0Q8QAAAAAAAAACAF0RAgBdhI
+AAAAAAAAAAAAAAAAIAXUXAAAAAAAAAAAIAXSWAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAFydgg
+AtfcIALVXCAC63ggAth4IALXkCAC2BwgAteIAAAAACAC1/wgAtaQAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAACAEJ9wgBCaUIAQxJCAEMCggBCSYIAQldCAEMCAgBCK4IAQl4CAEKKwAAAAAAAAA
+ACAEL5ggBC74IAQj6CAEI2wAAAAAAAAAACACtBwgArvQIAK13CACpHwgArVcIAKkdAAAAAAgAqNQ
+IAaW0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAtNkIALFpCACyQAgAsEIIAKkfCACwoAg
+AqR0AAAAACAC0QggBpcQAAAAAAAAAAAgAs94IALEjAAAAAAAAAAAIALBzAAAAQIAAQAAAAAAAAAA
+AAABAAECAwQFAjIyAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAMQAAAAAAAAAAAAAAAAAAAEAAAACACJ
+BgAAAAAAAAAABAAAAQgAiRQAAAAAAAAAAAQAAAIgAQy8AAAAAAAAAAAAAAAB/wAAAAAAAAEAAAAA
+AAAAAAAAAAAf/OEwAAAAAOAAAOABAAAAAAAAACAFpcwAAAAAIAWlaCAFowAgBaHwIAWDYCAFNQAg
+BSCYIAUfcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAD1UAgA+SQIAPkkCAD5JAgA/P4IAQKkCAE
+GWggBCA4IAPSGCADz4ggA4tsIAQ5UCADiQggA4XUIAUfRCAFHhwgBRdoIAPkkCAFFpAgBRVMIAUU
+dCAF8+AgAx/cIANmtCAFxNwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACADrPQgA5hI
+IAOnGCADpYAgA6QEAAAAACADoawgA6wwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAHY1AA
+AAABIAdhhAAAAAIgB1zoAAAAASAHWngAAAABIAdYbAAAAAEgB1ZwAAAAASAHU/AAAAABIAdHWAAA
+AAEgB04gAAAAASAHRjAAAAABIAdGKAAAAAEAAAAAAAAAAAABAAEAAAAAAAAAAAAAAAAgBbtQIAPT
+fCAAXngAAAAAAAD/AAAADv8AAQAAAAAAAAoBAIEACgEAAQAKAQABAAoBAAEADgMBAQAe/4GBAB4C
+gQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGwQDAwEbAgMDARsDAwMBGwIBAQEfBIGB
+ASv/gYEBKgGBgQEpAYGBAR8DgQEBHwOBAQEs/4GBAT0CgQUBPP+FAAE8/4UAATkBBQUBPg8FBQEu
+BIGBARsCAQEADgKBAQEuAoGBAA4CAAEADgKBAQAOAgEBARoBgYEBDgIBAQAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHAMBAAAOAwEBAE8EAQEAXwQBAQA8BAEAAAAAAAAA
+bP8BAQBMBAEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgA2lkIANp4CADaYAg
+A2n08tUSmPLVEpjy1RKY8tUSmPLVEpjy1RKY8tUSmPLVEpjy1RKY8tUSmPLVEpgDhRsYA4UbmPLV
+Epjy1RKY8tUSmPLVEpjy1RKY8tUSmPLVEpjy1RKYAAAAAAAAAAAAAAAA//8ABQAGAAcACAAJAAoA
+CwAMAA0ADgAPABD///////8ACgAUAIwAggBkAFoAoACWAHgAbgBQAEYAPAAyACgAHgAKBM4EkgnO
+CZICsgRWBOIEpgO2BBoHsglWBl4CdgniCaYHTgI6CLYJGggWBiICxgRqAJYDegFyB3YAvgPeBPYE
+ugRCA6ICYgc6Bg4AggPKBC4AbgBaAyoBNgHqAz4HxglqAUoHEgWWCHoGwgH+BnICigNSBeYFvgje
+AZoH2gn2CboJfgeeCUIIogkGAV4HYgJOByYDFgEiBYIIZgWqCMoJLgiOAQ4FbgVaBUYG1ggqBjYC
+EgHCBuoIPgDmBoYC2gR+Ap4EBgZKAiYIAgNmAKoDjgX6AEYB1gb+Bq4F0gGGB4oI8gMCCFIA+gUy
+Aa4A0gPyB+4AMgaaAu4FHgAeBQoAAAnECYgE2AScB6gJTAnYCZwIrAkQArwEYAFoB2wE7ASwAlgH
+MAPABCQDIAEsB7wJYAWMCHAGaAKABbQI1AnsCbAJOAiYB1gCRAEYBXgIwAkkBWQFUAggBiwG4Ag0
+AtAEdAZAAhwAoAOEAcwG9AF8B4AISADwAMgD6AaQAuQFAATEBIgCqARMA6wEEAZUAmwHRAIwCAwG
+GACMA3AAtAPUBDgDmAYEAHgAZABQAeADNAFABwgGuAH0A0gF3AGQB9AJdAeUCPwBVAccAwwIXAWg
+CIQBBAU8BswCCAG4ANwGfAKUA/wH+ANcBfAAPAakBcgI6AL4BSgBpAfkACgFFAAUAAAEyQSNCckJ
+jQKtBFEE3QShA7EEFQetCVEGWQJxCd0JoQdJAjUIsQkVCBEGHQLBBGUAkQN1AW0HcQC5A9kE8QS1
+BD0DnQJdBzUGCQB9A8UEKQBpAFUDJQExAeUDOQfBCWUBRQcNBZEIdQa9AfkGbQKFA00F4QW5CNkB
+lQfVCfEJtQl5B5kJPQidCQEBWQddAkkHIQMRAR0FfQhhBaUIxQkpCIkBCQVpBVUFQQbRCCUGMQIN
+Ab0G5Qg5AOEGgQLVBHkCmQQBBkUCIQf9A2EApQOJBfUAQQHRBvkGqQXNAYEHhQjtAv0ITQD1BS0B
+qQDNA+0H6QAtBpUC6QUZABkFBQAACb8JgwTTBJcHowlHCdMJlwinCQsCtwRbAWMHZwTnBKsCUwcr
+A7sEHwMbAScHtwlbBYcIawZjAnsFrwjPCecJqwkzCJMHUwI/ARMFcwi7CR8FXwVLCBsGJwbbCC8C
+ywRvBjsCFwCbA38BxwbvAXcHewhDAOsAwwPjBosC3wT7BL8EgwKjBEcDpwQLBk8CZwc/AisIBwYT
+AIcDawCvA88EMwOTBf8AcwBfAEsB2wMvATsHAwazAe8DQwXXAYsHywlvB48I9wFPBxcDBwhXBZsI
+fwD/BTcGxwIDAbMA1wZ3Ao8D9wfzA1cF6wA3Bp8FwwjjAvMFIwGfB98AIwUPAAAACgCMAG4AlgB4
+ADwAUACgAIIAZAAyAEYAWgAoAB4AFAAAAIcAaQCRAHMANwBLAJsAfQBfAC0AQQBVACMAGQAAIAKN
+6CAHOdwgAo3sIAdCcCACjfggB0GYIAKOBCAHQUggAo4YIAdAnCACjjAgBz8sIAKOQCAHPwQgAo5I
+IAc+3CACjlwgBz6sIAKOaCAHPoQgAo5wIAc+XCACjoQgBz4oIAKOkCAHPLwAAAAAAAAAACACjpgg
+BzmcIAKOnCAHOSAgAo6kIAc46CACjqwgBziwIAKOuCAHOHggAo68IAc4QCACjsggBzgIIAKOzCAH
+OVggAo7UIAc30CACjtwgBzeYIAKO5CAHNcAgAo7sIAc3SCACjvggBzdAIAKPACAHNwggAo8IIAc2
+0CACjxAgBzaYIAKPGCAHNmAgAo3AIAczwCACjyAgBzOIIAKPKCAHM1AgAo8wIAczGCACj0AgBzLg
+IAKPSCAHMqggAo9QIAcycCACj1ggBzJIIAKPZCAHMiAgAo9wIAcx8CACj4ggBzHIIAKPpCAHMaAg
+Ao+0IAcxeCACj8QgBzFQIAKP1CAHMSggAo/kIAcxACACj/QgBzDYIAKQBCAHMLAgApAQIAcwiCAC
+kBwgBzBgAAAAAAAAAAAgApAoIAcvSCACkCwgBy8YIAKQNCAHLuggApBAIAcuuCACkEQgBy6IIAKQ
+SCAHLlggApBMIAcuMCACkFQgBy4IIAKNzCAHRXAgAo3UIAdEnCACjbggB0PkIAKN4CAHQzgAABAh
+IEIwY0CEUKVgxnDngQiRKaFKsWvBjNGt4c7x7xIxAhAycyJSUrVClHL3YtaTOYMYs3ujWtO9w5zz
+/+PeJGI0QwQgFAFk5nTHRKRUhaVqtUuFKJUJ5e71z8Ws1Y02UyZyFhEGMHbXZvZWlUa0t1unepcZ
+hzj33+f+153HvEjEWOVohninCEAYYSgCOCPJzNnt6Y75r4lImWmpCrkrWvVK1Hq3apYacQpQOjMq
+Etv9y9z7v+uem3mLWLs7qxpspnyHTORcxSwiPAMMYBxB7a79j83s3c2tKr0LjWidSX6XbrZe1U70
+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
+ckOhY//LAAAsspuEESmig6PM6cwRAiAFAADsmQgDDIEAAGhiImhkKfKf+8uiAJ0AY/+eGcQzqTkp
+kH1j/0ilmvdABh3v/5IApZv3YAQd7/9qAKWc94AGFe//QgClnSfUANEPpZ4n5QDRDwAAAAAAAAAA
+AAAAAAAAIAKNTAzAAAIgBfT0IAKNUAjAAAggBfT0IAKNVCDAAAwgBfR8IAKNWAbAADQgBfZQIAKN
+XAjAADggBfT0IAKNYALAADwgBfZQIAKNZAjAAEAgBfT0IAKNaAiAAEQgBfV8IAKNbBiAAFggBfV8
+IAKNcBiAAGggBfV8IAKNdBiAAHggBfV8IAKNeBiAAIggBfV8IAKNfBiAANggBfV8IAKNgBiAAOQg
+BfV8IAKNhBiAAPAgBfV8IAKNiBiAAPwgBfV8IAKNjAiAATggBfV8aHdfYmNtODQzNF9sb3dwb3dl
+clsldV06IGVuYWJsZT0lZAoAAAAAAAAAAAAAAAAAaHdfYmNtODQzNF9sb3dwb3dlclsldV0sIGZh
+aWxlZCB0byBzZXQgMzAuMHg0MDBBIGJpdCA3IHNpbmNlIDMwLjB4NDAwRSBiaXQ9MSBhZnRlciA1
+bXMsCXJlZz0leAoAcFsldV0gY2hhbmdpbmcgc3BlZWQgZnJvbSAlI3ggdG8gJSN4CgAAAAAAAAAA
+AAAAcFsldV0gYmNtODQ4MzQgbGluayBzdGF0dXMgY2hhbmdlIFVQCgAAAAAAAAAAAAAAcFsldV0g
+YmNtODQ4MzQgbGluayBzdGF0dXMgY2hhbmdlIERPV04KAAAAAAAAAAAAaHdfY2w0NV91cGRfc3Bk
+X2FkdiAlI3gKAAAAAAAAAABwWyV1XSBjaGFuZ2luZyBzcGVlZCBmcm9tICUjeCB0byAlI3gKAAAA
+AAAAAAAAAABwWyV1XSBjYWxpYnJhdGluZyBQSFkgU0VSREVTIGZvciBuZXcgc3BlZWQKAAAAAABw
+WyV1XSBhcTEyMDIgbGluayBzdGF0dXMgY2hhbmdlIFVQCgAAAAAAAAAAAAAAAABwWyV1XSBQSFkg
+T1ZFUkhFQVRFRCAtIGZvcmNlZCBwb3dlciBkb3duICh0ZW1wPSVkKQoAAAAAAAAAAAAAAAAAcFsl
+dV0gYXExMjAyIGxpbmsgc3RhdHVzIGNoYW5nZSBET1dOCgAAAAAAAAAAAAAAZ2F0aGVyX3Rhc2tz
+X3RvX3R4X2xpc3Q6IHRhc2sgaW4gdXNlIFsldV0KAAAAAAAAZ2F0aGVyX3Rhc2tzX3RvX3R4X2xp
+c3Q6IGlkeCBbJXVdLCB0YXNrIGZpZCBbMHgleF0sIHRhc2sgc3RhdGUgWzB4JXhdLCB0YXNrIGNv
+bm4gWzB4JXhdLCB0YXNrIGZmbGFncyBbMHgleF0sIGNvbm4gZmlkIFsweCV4XSwgZGRwIFslZF0K
+AAAAAAAAAAAAZ2F0aGVyX3Rhc2tzX3RvX3R4X2xpc3Q6IHRhc2sgWzB4JXhdLCBzdGF0ZSBbMHgl
+eF0gb24gY29ubiBbMHgleF0gbm90IHZhbGlkIHRvIGdhdGhlciwgc2tpcHBpbmcKAAAAAAAAAAAA
+AAAAAAAAAGdhdGhlcl90YXNrc190b190eF9saXN0OiBjb25uX2ZjLT5mbG93Y19mbGFncyBbMHgl
+eF0sIGxpc3RfZW1wdHkgWzB4JXhdLCBhZGRfdGFza19jb3VudCBbMHgleF0KAHRvX3R4X2xpc3Q6
+IG5vIHRhc2sgdG8gY2xvc2UgZm9yIGNvbm4gWzB4JXhdLCBiYWlsaW5nIHRvIHJlY292ZXJ5IHN0
+YXRlIFsweCV4XQoAaW5vZGVfZmMtPmZsb3djX2ZsYWdzIFsweCV4XSwgaW5vZGVfZmMtPmZsb3dj
+X2J1Zi0+Zmlmby5udW1fYnl0ZXMgWyV1XQoAAAAAAAAAAABhdXRoZW50aWNhdGVfdGFyZ2V0OiBL
+RVlfQ0hBUF9SRVNQIC0gWzB4JXgleCV4JXgleCV4JXgleF0KAAAAAAAAYXV0aGVudGljYXRlX3Rh
+cmdldDogS0VZX0NIQVBfUkVTUCAtIFsweCV4JXgleCV4JXgleCV4JXhdCgAAAAAAAGF1dGhlbnRp
+Y2F0ZV90YXJnZXQ6IEluY29ycmVjdCBwYXNzd29yZAoAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDog
+S2V5IENIQVBfQSwgdmFsIFslZF0KAAAAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogS2V5IENIQVBf
+SSwgdmFsIFslZF0KAAAAAAAAAAAAAENIQVBfQzogZGlnZXN0IGV4cGFuc2lvbiBlcnJvcgoAdmFs
+aWRhdGVfa2V5dmFsOiBLRVlfQ0hBUF9OQU1FLCBsZW4gWzB4JXhdCgAAAAAAQ0hBUF9OOiBUYXJn
+ZXQgdXNlcmlkIG1pc21hdGNoCgBDSEFQX1I6IGRpZ2VzdCBleHBhbnNpb24gZXJyb3IKAFJlY2ll
+dmVkIEF1dGhNZXRob2QgdmFsdWUKAAAAAAAAdmFsaWRhdGVfa2V5dmFsOiBmbG93Y19mb2lzY3Np
+X2Nvbm5fZmxhZ3MgWzB4JXhdCgAAAAAAAAAAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogZmxvd2Nf
+Zm9pc2NzaV9jb25uX2ZsYWdzIFsweCV4XQoAAAAAAAAAAAAAAAAAAABOZWdvIEZCTCBbJXVdCgAA
+S0VZX01BWFJDVkRTTCBbJXVdCgAAAAAAAAAAAAAAAABEdXBsaWNhdGUgaXNjc2kga2V5CgAAAAAA
+AAAAAAAAAGZvaXNjc2lfcGFyc2VfcmN2ZF9wYXJhbXM6IGVycm9yCgAAAAAAAAAAAAAAAAAAAGZv
+aXNjc2lfcGFyc2VfcmN2ZF9wYXJhbXM6IHJsZW4gJWQKAAAAAAAAAAAAAAAAAGxvZ2luX3Jlc3A6
+IGZsb3djX2ZvaXNjc2lfY29ubl9mbGFncyBbMHgleF0KAAAAAGxvZ2luX3Jlc3A6IGZsb3djX2Zv
+aXNjc2lfY29ubl9mbGFncyBbMHgleF0sIHJjIFsweCV4XQoAAAAAAAAAAABpU0NTSSBTZWMtcGFy
+YW1zIHJlY2VpdmVkaGF2ZSBlcnJvcnMhIQoAAAAAAAAAAABUYXJnZXQgbW92ZWQgdGVtcC4gY29u
+biAleCwgc2VzcyAleAoAAAAAAAAAAAAAAABMb2dpbiBGYWlsZWQhIS4gY29ubl9mYyBbMHgleF0s
+IHNlc3NfZmMgWzB4JXhdLCBzdGF0dXNfY2xhc3MgWzB4JXhdCgAAAAAAAAAAAAAAAGxvZ2luX3Jl
+c3A6IHNlc3NfZmMtPmZsb3djX2lkIFsldV0sIGNvbm5fZmMtPmZsb3djX2lkIFsldV0gbG9nZ2Vk
+IGluCgAAAAAAAAAAAAAAUHJvdG9jb2wgRXJyb3IgY2JpdCAlZCB0Yml0ICVkIGNzZyAlZCBuc2cg
+JWQKAAAAcmVjdl9ub3BpbjogY3RybCB0YXNrIGFscmVhZHkgcGVuZGluZwoAAAAAAAAAAAAAd3Jo
+X29mbGRfcnhfZGF0YTogYWllZSwgaXNjc2kgY29ubiBbMHgleF0gZm9yIHNlc3MgWzB4JXhdLCB0
+eXBlIFsweCV4XSB0cmFuc2l0ZWQgaW4gdG9lIG1vZGUuIEtpY2tpbmcgcmVjb3ZlcnkgCgAAAAAA
+AAAAAAAAAAAAAABjb25uIHRpZCBbMHgleF0sIHJ4X2RhdGEtPnNlcSBbMHgleF0sIHJ4X2RhdGEt
+PmxlbiBbMHgleF0sIHJ4X2RhdGEtPnN0YXR1cyBbMHgleF0KAAAAAAAAAAAAAAAAAABjc2tfZmMt
+PmZsb3djX2Nzb2NrX29mZnNldCBbMHgleF0sIGRsZW4xNiBbMHgleF0KAAAAAAAAAAAAAAAAAAAA
+YWN0X2VzdDogdGNiX2ZjIFsweCV4XSwgZmxvd2NfZm9pc2NzaV9jb25uX2ZsYWdzIFsweCV4XQoA
+AAAAAAAAAGFjdF9lc3RhYjogdGNiX2ZjLT5mbG93Y19idWYgWzB4JXhdLCB0Y2JfZmMtPmZsb3dj
+X3R5cGUgWzB4JXhdIHRjYl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBucGFnZXMgWzB4JXhdLCBm
+bG93Y190cF9zbmRfbWF4IFsweCV4XQoAAAAAAAAAAAAAAAAAAGFjdF9lc3RhYjogYXRpZCBbMHgl
+eF0sIHRpZCBbMHgleF0sIG9wIFsweCV4XSwgcmN2X2lzbiBbMHgleF0sIHNuZF9pc24gWzB4JXhd
+LCBjc29jay0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCB0Y3Bfb3B0IFsweCV4XSwgdGNiX2ZjLT5mbG93
+Y19pZCBbMHgleF0gCgAAAAAAAAAAAAAAAABjc2tfZmMtPmZsb3djX2Nzb2NrX2Nvb2tpZSBbMHgl
+eF0gCgAAAAAAAAAAAAAAAABsM2luNF9kZXZfY29uZmlnOiB3ci0+cGFyYW0udmxhbmlkIFsldV0s
+IGwyZGV2X2ZjLT5mbG93Y19uZXRfbDJkZXZfdmxhbmRldiBbMHgleF0KAAAAAAAAAAAAAAAAAABu
+ZXRfbDNpbjRfZGV2X2NvbmZpZzogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgYWRkcmVzcyBh
+bHJlYWR5IHVzZWQgYnkgcG9ydCAlZAoAAAAAAAAAAAAAAAAAAABuZXRfbDNpbjRfZGV2X2NvbmZp
+ZzogIGFkZHIgWzB4JXhdLCBtYXNrIFsweCV4XSwgZ3cgWzB4JXhdLCByZWZfY250IFsweCV4XSBp
+biB1c2UKAAAAAAAAAAAAAAAAAAB3cmhfY2huZXRfaWZjb25mOiBsMmRldl9mYy0+Zmxvd2NfaWQg
+WzB4JXhdLCBsMmRldl9mYy0+Zmxvd2NfdHlwZSBbJTB4XSwgaWZjb25mX3dyLT5zdWJvcCBbMHgl
+eF0KAAAAAAAAAAAAAAAAAAAAd3JoX2NobmV0X2lmY29uZjogbDJkZXZfZmMtPmZsb3djX2lkIFsw
+eCV4XSwgdW5rbm93biBzdWJvcCBbMHgleF0KAAAAAAAAAAAAAAAAAAB3cmhfY2huZXRfaWZjb25m
+OiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCByYyAlZAoAAAAAAAAAAAAAAAAAbmV0aWZfaXBf
+Y29uZmxpY3RfdGltZXJfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGluZGV2Y3R4dC0+
+c3RhdGUgWyVkXSwgaW5kZXZjdHh0LT5yZXRyeV9jbnQgWyVkXQoAAAAAAAAAAG5ldGlmX2lwX2Nv
+bmZsaWN0X3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBpbmRldmN0eHQgWzB4
+JXhdLCBpbiBmcmVlIHN0YXRlCgAAAAAAAAAAAGNtZGhfY2huZXRfaWZhY2U6IGZjIFsweCV4XSwg
+ZmMtPmZsb3djX2lkIFsweCV4XSwgZmMtPmZsb3djX3R5cGUgWzB4JXhdLCBwIFsweCV4XSwgbGVu
+MTYgWyV1XSwgbG9jIFsweCV4XQoAAAAAAABjbWRoX2NobmV0X2lmYWNlOmwyZGV2X2ZjIFsweCV4
+XSwgbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgbDJkZXYtPmZsb3djX3R5cGUgWyV1XSwgbDJk
+ZXZfZmMtPmZsb3djX25ldF9sMmRldl9mbGFncyBbJTB4XQoAAAAAAGNtZGhfY2huZXRfaWZhY2U6
+IHIyWzBdICV1IHIyWzFdICV1CgAAAAAAAAAAAAAAAGNtZGhfY2huZXRfaWZhY2U6IGwyZGV2X2Zj
+LT5mbG93Y19uZXRfbDJkZXZfZmxhZ3MgY2hhbmdlZCBmcm9tIFslMHhdIHRvIFslMHhdLCByYyBb
+JWRdCgAAAAAAAAAAAGNobmV0X2wyZGV2X3VwX21iX2NiOiByYyBbJWRdLCBwb3J0IFsldV0sIHN0
+YXRlIFsldV0sIGNvb2tpZSBbMHgleF0KAAAAAAAAAAAAAAAAY2huZXRfcXVldWVfeG1pdDogZmMt
+PmZsb3djX2lkIFsweCV4XSwgYnVmX2xlbiBbMHgleF0sIGJ1ZmZlcmVkIFsweCV4XSwgZmlmby5u
+dW1fYnl0ZXMgWyUweF0KAAAAZGhjcF9wcm9jZXNzX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4
+JXhdLCBkaGN0eHQtPnN0YXRlIFslMHhdLCBkaGN0eHQtPnJ0cnlfY250IFsldV0KAAAAAAAAAAAA
+ZGhjcF90aW1lcl9jYjogREhDUERJU0NPVkVSIHNlbnQsIGJ1dCBubyByZXBseSBmcm9tIGFueSBw
+b3NzaWJsZSBzZXJ2ZXIgb24gdGhlIG5ldHdvcmsuIFJldHJ5aW5nIGFnYWluCgAAAAAAAAAAAGRo
+Y3BfdGltZXJfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlbmRpbmcgREhDUERJU0NP
+VkVSIGZvciBkaGN0eHQgWzB4JXhdIG9uIHBpZCBbJWRdCgAAAGRoY3BfdGltZXJfY2I6IGwyZGV2
+X2ZjLT5mbG93Y19pZCBbMHgleF0sIERIQ1BPRkZFUiByZWNlaXZlZCBmb3IgZGhjdHh0IFsleF0g
+cGlkIFslZF0KAAAAAAAAAAAAAGRoY3BfdGltZXJfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgl
+eF0sICBESENQQUNLIHJlY2VpdmVkIGZvciBkaGN0eHQgWyV4XSwgcGlkIFslZF0KAAAAAAAAAAAA
+AGRoY3BfdGltZXJfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGRoY3R4dC0+aXBhZGRy
+IFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAZGhjcF90aW1lcl9jYjogbDJkZXZfZmMtPmZsb3djX2lk
+IFsweCV4XSwgbm8gcmVwbHkgZnJvbSBkaGNwIHNlcnZlciwgdGltaW5nIG91dAoAAAAAAAAAAAAA
+AAAAAAAAbG9naW5fcGFyYW1zOiBjb25uX2ZjLT5mbG93Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4
+JXhdCgAAAAAAAAAAAGxvZ2luX3BhcmFtczogY29ubl9mYy0+Zmxvd2NfZm9pc2NzaV9jb25uX2Zs
+YWdzIFsweCV4XQoAAAAAAAAAAABhdXRoX25lZ29fc2VjdXJpdHk6IHNlbmRfZmxhZyBbMHgleF0s
+IGF1dGhfcG9saWN5IFsweCV4XQoAAAAAAAAAYXV0aF9uZWdvX3NlY3VyaXR5OiBLRVlfQ0hBUF9S
+RVNQIC0gaGFzaFsweCV4JXgleCV4JXgleCV4JXhdCgAAAGF1dGhfbmVnb19zZWN1cml0eTogS0VZ
+X0NIQVBfUkVTUCAtIGhhc2hbMHgleCV4JXgleCV4JXgleCV4XQoAAABhdXRoX25lZ29fc2VjdXJp
+dHk6IEtFWV9DSEFQX1JFU1AgLSBlcnJvciBlbmNvZGluZyB0byBoZXgKAAAAAAAAYXV0aF9uZWdv
+X3NlY3VyaXR5OiBLRVlfQ0hBUF9SRVNQIC0gZWxlbiBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAGF1
+dGhfbmVnb19zZWN1cml0eTogS0VZX0NIQVBfQ0hBTCAtIGVycm9yIGVuY29kaW5nIHRvIGhleAoA
+AAAAAABhdXRoX25lZ29fc2VjdXJpdHk6IEtFWV9DSEFQX0NIQUwgLSBlbGVuIFsweCV4XQoAAAAA
+AAAAAAAAAAAAAAAAc2VuZF9sb2dpbl9yZXF1ZXN0OmNvbm5fZmMtPmZsb3djX2lkIFsweCV4XSwg
+c2Vzc19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjdHJsX3htaXQgWzB4JXhdLCBzZXNzX2ZjLT5mbG93
+Y19mb2lzY3NpX3Nlc3NfdHlwZSBbMHgleF0KAAAAAAAAAAAAAAAAAAAAc2VuZF9sb2dpbl9yZXF1
+ZXN0OiBmbGFnIFsweCV4XS4KAAAAAAAAAAAAAAAAAAAAc2VuZF9sb2dpbl9yZXF1ZXN0OiB0eF9s
+ZW4gWyV1XQoAAAAAAAAAAAAAAAAAAAAAeG1pdF9zZW5kdGFyZ2V0czogY29ubiB0aWQgWzB4JXhd
+LCBjdHJsX3htaXQtPnR0dCBbMHgleF0sIGRhdGFfbGVuIFsldV0sIHBhZF9sZW4gWyV1XQoAAAAA
+AAAAAAAAcGluZ190YXJnZXQ6IHBpbmcgdGltZW91dCwga2lja2luZyByZWNvdmVyeSBmb3Igc2Vz
+cyBbMHgleF0KAAAAAHNlbmRfbm9wX291dDogY29ubiBmbG93X2lkIFsweCV4XSwgcmVxIFsldV0s
+IHR0dCBbMHgleF0KAAAAAAAAAABzZW5kX25vcF9vdXQ6IHR0dCBbMCV4XSwgaXR0IFsweCV4XSwg
+Y21kc24gWzB4JXhdLCBleHBfc3RhdHNuIFsweCV4XQoAAAAAAAAAAAAAAGNzb2NrX2ZhaWxlZDog
+Y3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBzZXNz
+X2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlc3NfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgZXZ0IFsw
+eCV4XQoAAAAAAAAAAAAAAGNobmV0X2ZpbmRfbDJ0X2VudHJ5OiBkYWRkciBbJTA4eF0sIFsweCUw
+OHhdLCBsb2NhbCBuZXR3b3JrIFslZF0KAAAAAAAAAAAAAAAAAAAAbDJ0ZW50IFslMHhdLCBsMnRl
+bnQtPmlkeCBbJWRdCgByYyBbJWRdLCBjc2tfZmMgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsw
+eCV4XQoAAAAAAAAAAAAAAAAAAAAAY3NvY2tfZnJlZTogc2l6ZW9mKGNza19mYy0+dS5jc29jaykg
+WyV1XSwgYnl0ZXMKAAAAAAAAAAAAAAAAAAAAAGZvaXNjc2k6IFJlY292ZXJ5IHRpbWVkIG91dCBh
+ZnRlciBbJXVdIHJldHJ5LCBiYWlsaW5nIG91dAoAAAAAAAByZWNvdmVyeV90aW1lb3V0OiBzZXNz
+X2ZjLT5mbG93Y19pZCBbMHgleF0sIHJldHJ5IGNvdW50IFslZF0sIHNlc3NfZmMtPmZsb3djX3N0
+YXRlIFsweCV4XQoAAAAAAAByZWNvdmVyeV90aW1lb3V0OiBzZXNzX2ZjLT5mbG93Y19mb2lzY3Np
+X3Nlc3NfZmxhZ3MgWzB4JXhdLCBjb25uZWN0aW9uIHJlcXVlc3QgcGVuZGluZywgYmFpbGluZyBv
+dXQKAAAAAAAAAAAAAAAAVENQIGNvbm4gZXN0YWJsaXNobWVudCBmYWlsZWQgJWQKAAAAAAAAAAAA
+AAAAAAAASW52YWxpZCBvcGNvZGUgMHgleCBpbiBjdHJsIHBhdGgKAAAAAAAAAAAAAAAAAAAARERQ
+IGVycm9yIFsweCV4XSwgYWJvcnRpbmcgY29ubm4gWzB4JXhdCgAAAAAAAAAAcnhfZGF0YV9kZHA6
+IFJlc3BvbmNlIHJlY2lldmVkIGZvciB0YXNrIFswJXhdIHdoaWxlIGludmFsaWQgdGFzayBvciBj
+b25uZWN0aW9uIHN0YXRlLiB0YXNrIHN0YXRlIFsweCV4XSwgY29ubiBzdGF0ZSBbMHgleF0KAAAA
+AABpc2NzaV9oZHJfcng6IFJlc3BvbmNlIHJlY2lldmVkIGZvciB0YXNrIFswJXhdIHdoaWxlIGlu
+dmFsaWQgdGFzayBvciBjb25uZWN0aW9uIHN0YXRlLiB0YXNrIHN0YXRlIFsweCV4XSwgY29ubiBz
+dGF0ZSBbMHgleF0KAAAAAGlzY3NpX2hkcl9yeDogSW52YWxpZCB0YXNrIHN0YXRlIDB4JXggZm9y
+IHRhc2sgMHgleCwgaXR0IFsweCV4XSwgb3BjIFsweCV4XQoAAAAAcHJvY2Vzc190bWZfcmVzcG9u
+c2U6IGlzdGFza19mYy0+Zmxvd2NfYnVmLT5zY2hlZF9ub2RlLm5leHQgWzB4JXhdLCBpc3Rhc2tf
+ZmMgWzB4JXhdLCBpc3Rhc2tfZmMtPmZsb3djX2lkIFsldV0KAHByb2Nlc3NfdG1mX3Jlc3BvbnNl
+OiB3ciBvcGNvZGUgWzB4JXhdCgAAAAAAAAAAAHByb2Nlc3NfdG1mX3Jlc3BvbnNlOjogdGFzayBm
+dW5jdGlvbiBbMHgleF0KAAAAAHByb2Nlc3NfdG1mX3Jlc3BvbnNlOiBkZWxheV9wcm9jZXNzaW5n
+LCBvcCBbJXhdCgAAAAAAAAAAAAAAAAAAAABjYWxsaW5nIGRyb3BfdGFzaywgbGlkeCBbMHgleF0K
+AHNjc2lfYWJvcnQ6IGZyZWVpbmcgYWJvcnRlZCB0YXNrIFsweCV4XSBvbiBsdW4gWzB4JXhdIG9u
+IGNvbm4gWzB4JXhdCgAAAAAAAAAAAAAAcmV0dXJuX3BlbmRpbmdfdGFzazogY29va2llIFsweCUw
+OHhdLCBbMHglMDh4XQoAcmV0dXJuX3BlbmRpbmdfdGFzazogZGVsYXkgcHJvY2Vzc2luZywgY29u
+biBmbGFncyBbMHgleF0KAAAAAAAAAHJldHVybl9wZW5kaW5nX3Rhc2s6IERvbmUgc2VuZGluZyB0
+YXNrIGVycm9yIHRvIGhvc3QsIHVscHR4bGVuMTYgWyV1XQoAAAAAAAAAAAAAcmV0dXJuX3BlbmRp
+bmdfdGFzazogZGVxdWV1ZSB0YXNrIFsweCV4XSwgc3RhdGUgWzB4JXhdIGZyb20gdHhfbGlzdAoA
+AAAAAAAAAAAAAAByZXR1cm5fcGVuZGluZ190YXNrOiBhbGwgdGFza3MgcmV0dXJuZWQsIHJlY292
+ZXJ5IHN0YXRlIHRyYW5zIHRvIFsweCV4XQoAAAAAAAAAAGNsZWFyX2RkcF9tYXA6IGlzdGFza19m
+YyBbMHgleF0sIGlzdGFza19mYy0+Zmxvd2NfaWQgWzB4JXhdIGJ1ZmZlcmVkICV1CgAAAAAAAAAA
+Y2xlYXJfZGRwX21hcDogaXN0YXNrX2ZjLT5mbG93Y19mb2lzY3NpX3Rhc2tfbnBwb2QgJXUsIG5w
+cG9kICV1LCBwcGRhZGRyIFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAY2xlYXJfZGRwX21hcDogYWxs
+IHJldHVybmVkIHRhc2tzIGRkcCBjbGVhcmVkLCByZWNvdmVyeSBzdGF0ZSB0cmFucyB0byBbMHgl
+eF0KAAB3cmhfZm9pc2NzaV9ub2RlOiBub2RlX3dyLT5mbG93aWRfbGVuMTYgMiBbJXhdCgB3cmhf
+Zm9pc2NzaV9jaGFwOiBpZF9sZW4gWyV4XSwgc2VjX2xlbiBbJXhdCgAAAAB3cmhfZm9pc2NzaV9j
+aGFwOiB0Z3RfaWRfbGVuIFsleF0sIHRndF9zZWNfbGVuIFsleF0KAAAAAAAAAAAAAAAAcGVlcl9j
+b246IGNza19mYyA9PiBmbG93aWQgWzB4JXhdLCBmbG93Y19idWYgWzB4JXhdCgAAAAAAAAAAAAAA
+AGZvaXNjc2lfY3RybDogc3Vib3AgWzB4JXhdLCBzZXNzX3R5cGVfdG9fZXJsIFsweCV4XSwgc2Vz
+c190eXBlIFsweCV4XQoAAAAAAAAAAAAAd2F0Y2hkb2cgY21kIGhhbmRsZXIgKHRpbWUgJXUgYWN0
+aW9uICV1KQoAAAAAAAAAV0FUQ0hET0c6IGRldmljZSBzaHV0ZG93bgoAAAAAAABXQVRDSERPRzog
+YnlwYXNzIHRpbWVvdXQKAAAAAAAAAFdBVENIRE9HOiBGTFIgLSBub3QgaW1wbGVtZW50ZWQgeWV0
+CgAAAAAAAAAAAAAAAFdBVENIRE9HOiB0ZW1wZXJhdHVyZSBvZiAlZEMgZXhjZWVkcyB0aHJlc2hv
+bGQgb2YgJWRDCgAAAAAAAAAAAABmaWx0ZXI6IHBvcmdyYW1taW5nIHRpZCAldSAobGUgdGNhbSBp
+bmRleCAldSkuLi4KAAAAAAAAAAAAAAAAAAAAZmlsdGVyOiByZXF1ZXN0aW5nIGNvbXBsZXRpb24u
+Li4KAAAAAAAAAAAAAAAAAAAAc2Vzc2lvbl9ibG9jazogc2Vzc19mYy0+Zmxvd2NfaWQgWzB4JXhd
+LCBzZXNzX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGNvbm5fZmMtPmZsb3djX2lkIFsweCV4XSwg
+Y29ubl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3Nr
+X2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0KAAAAAAAAAAAAAAAAAAAAc2Vzc2lvbl91bmJsb2NrOiBz
+ZXNzX2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlc3NfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgY29u
+bl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjb25uX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGNza19m
+Yy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4XQoAAAAAAAAAAAAA
+AAAARkNPRSBGcmVlOiBzdGlsbCB5aWVsZGVkIHdoZW4gZnJlZWluZy4uLmZsb3djX2lkICV4IGZs
+b3djX2ZsYWdzICV4IAoAAAAAAAAAAAAAAABwb3J0ICVkIHByaW9yICVkIHNlbGVjdCAlZCBwcm90
+b2NvbElEIDB4JTA0eAoAAABwb3J0ICVkIHNldCBwZmNfZW4gPSAweCV4CgAAAAAAAHBvcnQgJWQg
+c2V0IHBnaWRfMF83ID0gMHglMDh4IHBnX3BlcmNlbnRhZ2UgMHglMDh4XyUwOHggbnVtX3Rjc19z
+dXBwb3J0ZWQgJWQKAAAAcG9ydCAlZCBzZXQgcGZjX2VuID0gMHgleAoAAAAAAABGQ29FIEREUCBm
+YWlsZWQgOiBveF9pZCAweCV4IHJ4X2lkIDB4JXgKAAAAAAAAAABGQ29FIEREUCBmYWlsZWQgOiBE
+ZHBSZXBvcnQgMHgleCBEZHBWYWxpZCAweCV4CgBQUkxJIFJzcCB0aW1lZG91dCA6IGZsb3djX2lk
+IDB4JXggb3hfaWQgMHgleCByeF9pZCAweCV4IAoAAAAAAAAAY2Fubm90IGFsbG9jYXRlIG9mZmxv
+YWRlZCBmaWx0ZXIgY29ubmVjdGlvbgoAAAAAY2Fubm90IGFsbG9jYXRlIG9mZmxvYWRlZCBmaWx0
+ZXIgSVB2NiBjb25uZWN0aW9uCgAAAAAAAAAAAAAAAAAAAGludmFsaWQgYnVmZmVyIGdyb3VwWyV1
+XSBjb25maWd1cmF0aW9uOiBtdHUgJXUgbHdtICV1IGh3bSAldSBkd20gJXUKAAAAAAAAAAAAAAAA
+ZmMgJXUgdmYgJXUgZ290IGl2Zj0weCV4LHJhbmdlOiAlI3gtJSN4ICgldS8ldSB1c2VkKQoAAAAA
+AAAAAAAAAFZJICV1IGNhbm5vdCBnZXQgUlNTIHNsaWNlOiBObyBtb3JlIHNsaWNlcyBhdmFpbGFi
+bGUgKHVzZWQgJXUvJXUpCgAAAAAAAAAAAAAAAAAAcGZuICV1IHZmbiAldSB3aXRoIHBvcnQgbWFz
+ayAweCV4IGNhbm5vdCBhY2Nlc3MgcG9ydCAldSwgcmV0ICVkCgAAAAAAAAAAAAAAAAAAAABwZm4g
+JXUgdmZuICV1IGNvdWxkIG5vdCBhbGxvY2F0ZSB2aWlkLCByZXQgJWQKAABwZm4gJXUgdmZuICV1
+IGNvdWxkIG1hcCB2aWlkICAweCV4IHRvIGZsb3djLCByZXQgJWQKAAAAAAAAAAAAAAAAcGZuICV1
+IHZmbiAldSBjb3VsZCBub3QgYWxsb2NhdGUgdXdpcmUgZnVuYyAlZCBtYWMgYWRkciwgcmV0ICVk
+CgAAAAAAAAAAAAAAAAAAAABtaWlfcGRvd25bJXVdOiBwb3dlcmRvd24gZW4gJXUKAG1paV9mb3Jj
+ZV9zcGVlZFsldV06IHJjYXBzIDB4JXgKAAAAAAAAAAAAAAAAAAAAAG1paV9saW5rX3N0YXR1c1sl
+dV06IGJtc3IgMHglMDh4IHN0YXR1cyAldSB4Z21fbHMgMHglMDh4CgAAAAAAAABwb3J0X2NtZF9o
+YW5kbGVyOiB1bmtub3duIHUuZGNiLnR5cGUgMHgleAoAAAAAAABwb3J0WyV1OjB4JTAyeDoweCUw
+MnhdOiBwaHkgcmVzZXQgbm90IGF2YWlsYWJsZQoAAAAAAAAAAAAAAAAAAAAAcG9ydFsldToweCUw
+Mng6MHglMDJ4XTogdW5rbm93biBhY3Rpb24gMHgleAoAAAAAcG9ydFsldToweCUwMng6MHglMDJ4
+XTogdW5rbm93biByZWFkIGFjdGlvbiAweCV4CgAAAAAAAAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5
+OiB0aWQgJXUgY3BsIDB4JTA4eCUwOHgKAAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5OiB0aWQgJXUg
+Y3BsIDB4JTA4eCUwOHggMHglMDh4JTA4eAoAAAAAAAAAAAAAAAAAAABjcGxfZXJyX25vdGlmeTog
+dGlkICV1IGxlbiAldQoAAEZDT0UgRnJlZTogc3RpbGwgeWllbGRlZCB3aGVuIGZyZWVpbmcuLi5m
+bG93Y19pZCAleCBmbG93Y19mbGFncyAleCAKAAAAAAAAAAAAAAAARkNPRSBCUCBXUiBFUlI6IFdS
+IHdpdGggY29va2llICV4JXggZXJyb3JlZCBiYWNrIAoAAAAAAAAAAAAAAAAAAGdldF9yZWZfdGFz
+azogcmVxdWVzdGVkIGNvb2tpZTogaGlnaCBbMHglMDh4XSwgbG93IFsweCUwOHhdCgAAAABnZXRf
+cmVmX3Rhc2s6IHRhc2sgY29va2llOiBoaWdoIFsweCUwOHhdLCBsb3cgWzB4JTA4eF0KAAAAAAAA
+AAAAZ2V0X3JlZl90YXNrOiBpc3Rhc2stPmZsb3djX2lkIFsweCV4XSwgaXN0YXNrX2ZjLT5mbG93
+Y19zdGF0ZSBbMHgleF0sIGlzdGFza19mYy0+Zmxvd2NfZm9pc2NzaV90YXNrX2NtZHNuIFsweCV4
+XQoAAAAAAAAAAAAAAAAAAABnZXRfcmVmX3Rhc2s6IHRhc2sgbm90IGZvciBjb29raWUgJWx4CgAA
+AAAAAAAAAABzY3NpX2Fib3J0OiBFbnRlcmluZyBBYm9ydF90YXNrLCBidWZmZXJlZCBbJXVdCgBz
+Y3NpX2Fib3J0OiBpZGF0YS0+b3AgWzB4JXhdLCBmbGFncyBbMHgleF0sIGZ1bmMgWzB4JXhdLCBs
+dW5faWR4IFsweCV4XQoAAAAAAAAAAHNjc2lfYWJvcnQ6IHdyLT5pcWlkIFsweCV4XSwgaXN0YXNr
+X2ZjLT5mbG93Y19zZ2VfaXFpZCBbMHgleF0sIGlzdGFza19mYyB0YXNrIGZsYWdzIFsweCV4XQoA
+AAAAAHNjc2lfYWJvcnQ6IHJlZiB0YXNrIG5vdCBvdXRzdGFuZGluZwoAAAAAAAAAAAAAAHNjc2lf
+YWJvcnQ6IGNvbm4gWzB4JXhdLCBjbWRzbiBbMHgleF0sIHNlbnRfY21kc24gWzB4JXhdLCBtYXhf
+Y21kc24gWzB4JXhdLCBpdHQgWzB4JXhdCgAAAAAAAAAAAGFib3J0L2Nsb3NlIFdSIHdpdGggY29v
+a2llIDB4JWx4IHdhcyBpc3N1ZWQgb24gc3NuIDB4JXggaW4gd3Jvbmcgc3RhdGUgMHgleAoAAAAA
+YWJvcnQgV1Igb24gc3NuIDB4JXggZGlkIG5vdCBmaW5kIFdSIHdpdGggY29va2llIDB4JXgleAoA
+AAAAAAAAAGNsb3NlIFdSIHdpdGggY29va2llIDB4JWx4IG9uIHNzbiAweCV4O2RpZCBub3QgZmlu
+ZCBXUiB3aXRoIGNvb2tpZSAweCVseAoAAAAAAAAAYWJvcnQgV1Igb24gc3NuIDB4JXggd2FzIGlz
+c3VlZCBvbiB4Y2hnIDB4JXggd2l0aCByeF9pZCAweCV4IGluIHdyb25nIHN0YXRlIDB4JXgKAAAA
+AAAAAAAAAAAAAAAAcG9ydCAlZCBhcHBsSUQgMHglMDR4IG91aSAweCUwNnggdXNlcl9wcmlvciAl
+ZAoAZGNieCB1cGRhdGVbJXVdIHNlbnQgdG8gZHJpdmVyICh0eXBlICUjeCBzdWJ0eXBlICUjeCBm
+bG93Y2lkICV1KQoAAAAAAAAAAAAAAAAAAABjaG5ldF9sMnRfdXBkYXRlOiBsMmRldl9mYyBbMHgl
+eF0sIGwyZGV2X2ZjLT5mbG93Y19pZCBbJXVdIGwyZGV2X2ZjLT5mbG93Y19mbGFncyBbMHgleF0s
+IGludGYgWzB4JXhdCgAAAAAAAAAAAAAAY2huZXRfbDJ0X3VwZGF0ZTogbDJkZXZfZmMtPmZsb3dj
+X2lkIFsldV0gYWxyZWFkeSBzY2hlZHVsZWQKAAAAAGNobmV0X2wydF91cGRhdGU6IGluIGRlbGF5
+ZWRfcHJvY2Vzc2luZywgbDJ0ZW50IFslMDh4XQoAAAAAAAAAAABjaG5ldF9sMnRfdXBkYXRlOiBs
+MnRfdXBkYXRlIHJlcXVlc3Qgc2VudCBsMnRlbnQgWyUwOHhdLCBsMnRlbnQtPmlkeCBbJWRdLCBs
+MnRlbnQtPnZsYW4gWyVkXQoAAABuZXRpZl9wcm9jZXNzX2RoY3A6IGwyZGV2X2ZjLT5mbG93Y19p
+ZCBbMHgleF0sIHByb2Nlc3NpbmcsIG9wdF9sZW4gJXUKAAAAAAAAAAAAAGNobmV0X2RoY3BfcmVj
+djogdmxhbmlkIFsldV0sIGwyZGV2X3BpZF9mYy0+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5kZXYgWzB4
+JXhdLCBsMmRldl9mYyBbMHgleF0KAAAAAGNobmV0X2RoY3BfcmVjdjogbDJkZXZfZmMtPmZsb3dj
+X2lkIFsweCV4XSwgZGhjdHh0LT5zdGF0ZSBbJWRdLCBtYWxhY2lvdXMgZGhjcCByZWN2IGZvciBu
+byByZXF1ZXN0CgAAAAAAAAAAAAAAAABkaGN0eHQtPnN0YXRlIDogJWQKAAAAAAAAAAAAAAAAAGwy
+ZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIEJhZCBESENQIGNvb2tpZSByZWNpZXZlZCwgYWJvcnRp
+bmcKAABpZ25vcmluZyBmaXAgcmVjdiBmb3IgZmNmIGZsb3c6JXggaW4gb2ZmbGluZSBzdGF0ZQoA
+AAAAAAAAAAAAAAAATl9QT1JUIDB4JXgleCV4IHJlamVjdGVkIFBMT0dJIHdpdGggcmVhc29uIGNv
+ZGUgJXgKAAAAAAAAAAAAAAAAAEFCVFMgd2hpbGUgYXdhaXRpbmcgUFJMSSBSc3A6IGZsb3djX2lk
+IDB4JXggb3hfaWQgMHgleCByeF9pZCAweCV4IAoAAAAAAAAAAAAAAAAAQUJUUyBmYWtlIFJzcDog
+bG9jIDB4JXggb3hfaWQgMHgleCByeF9pZCAweCV4CgAAY2Fubm90IGFsbG9jYXRlIFBPRkNPRSBm
+aWx0ZXIgY29ubmVjdGlvbiBmb3IgeF9pZCAleCAKAAAAAAAAAAAAAHJlbGVhc2VfdGlkOiBzaXpl
+b2YodGNiX2ZjLT5mbG93Y19mb2lzY3NpX2Nvbm4pIFsldV0sIGJ5dGVzCgAAAABhY3Rfb3Blbl9y
+cGw6IGF0aWQgWzB4JXhdLCB0aWQgWzB4JXhdLCBvcCBbMHgleF0sIHN0YXR1cyBbMHgleF0KAAAA
+AAAAAAAAAAAAAAAAAGFjdF9vcGVuX3JwbDogY3NrX2ZjLT50Y2Jfc3RhdGUgWzB4JXhdLCBjc2tf
+ZmMtPmZsYWdzIFsweCV4XSwgdGNiX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0KAAAAAAAAAHNlbmRf
+YWJvcnRfcnBsOiBjc2tfZmMtPmZsb3djX3R5cGUgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsw
+eCV4XSwgdGlkIFsweCV4XSwgdWxwdHhjaCBbJXVdLCBidWZmZXJlZCBbJXVdCgAAAAB3cmhfb2Zs
+ZF90Y3BfY2xvc2VfY29uX3JlcGx5OiB0Y2JfZmMtPmZsb3djX2lkIFsweCV4XSwgdGNiX2ZjLT5m
+bG93Y190eXBlIFsweCV4XSwgbGVuMTYgWyV1XSwgbG9jIFsldV0KAAAAAAAAAAAAd3JoX29mbGRf
+dGNwX2Nsb3NlX2Nvbl9yZXBseTogcnBsLT5vcF9UaWQgWzB4JXhdLCBycGw+c3RhdHVzIFsweCV4
+XSwgcnBsLT5zbmRfbnh0IFsweCV4XSwgcnBsLT5yY3Zfbnh0IFsweCV4XQoAAHRjcF9hYm9ydF9y
+cGxfcnNzOiB0aWQgWzB4JXhdLCBzdGF0dXMgWzB4JXhdCgAAAHRjcF9hYm9ydF9yZXFfcnNzOiB0
+aWQgWzB4JXhdLCBzdGF0dXMgWzB4JXhdCgAAAHBrdHNjaGVkX2NsX3JsWyV1OiV1XTogbW9kZSB8
+IHVuaXQgfCByYXRlIDB4JTA2eCBtaW4gJXUgbWF4ICV1IHBrdHNpemUgJXUKAAAAAAAAcGFyYW1f
+ZG1hcVsweCV4OjB4JXhdOiBkbWFxIDB4JXggcmVhZCAldSBwZiAldSByZXQgJWQKAAAAAAAAAAAA
+AE1DWyV1XSBpbml0X3N0YXRlX21hY2hpbmUgMHglMDJ4CgAAAAAAAAAAAAAAAAAAAE1DIGluaXRp
+YWxpemF0aW9uIG5vdCBjb21wbGV0aW5nLCBNQyBjdXJyZW50IGluaXQgc3RhdGUgaXMgMHglMDJ4
+CgAAAAAAAAAAAAAAAAAATUNbJXVdIF9od19tY19pbml0X21jCgAAAAAAAAAAAABod19iY204NDM0
+X2NoZWNrcmFtOiBTdGFydAoAAAAAAFBIWSBwcm9jZXNzb3Igbm90IHJ1bm5pbmcsIHN0aWxsIGlu
+IHJlc2V0IGZvciA1bXMsIHBvcnRfYml0X21hcD0ldSAKAAAAAAAAAAAAAAAAUEhZIEZXIGhhcyBi
+YWQgQ1JDLCBva19jcmM9JXUKAABQSFkgZmlybXdhcmUgbG9hZCBzdWNjZXNzZnVsIQoAAGh3X2Jj
+bTg0ODM0X2xvYWRzZXF1ZW5jZTogU3RhcnRlZAoAAAAAAAAAAAAAAAAAAGh3X2JjbTg0ODM0X2xv
+YWRzZXF1ZW5jZTogVXBsb2FkIGltYWdlIHRvIFBIWSBvbi1jaGlwIG1lbW9yCgAAAABod19iY204
+NDgzNF9sb2Fkc2VxdWVuY2U6IGRvbmUgbG9hZGluZyBpbWFnZSAoaSA9ICV1KQoAAAAAAAAAAAAA
+RkxBU0ggbm90IHJlYWR5OiBpICV1IG52clJlZyAlI3gKAAAAAAAAAAAAAAAAAAAAQVFfRkxBU0hf
+UmVhZHkgLSBUaW1lb3V0ICgxKQoAAABBUV9GTEFTSF9SZWFkeSAtIFRpbWVvdXQgKDIpCgAAAAlB
+UV9SZXR1cm5Db250cm9sT2ZGTEFTSAoAAAAAAAAAcGh5OiBmYWlsZWQgdG8gYWxsb2NhdGVkIG1l
+bW9yeSBmb3IgcGh5IGZ3IGZpbGUsIHJldCAlZAoAAAAAAAAAAFBIWSBGVyB2ZXJzaW9uIGluZm9y
+bWF0aW9uIG5vdCBhdmFpbGFibGUgZm9yIHRoaXMgdGVjaG5vbG9neQoAAABod19sZV9maWx0ZXJf
+Y3R1cGxlOiB0dXBsZSAldSBub3Qgc3BlY2lmaWVkIGJ1dCByZXF1aXJlZCBmb3IgbWFzayAweCV4
+CgAAAAAAAAAAAGxlIGNvbmZpZ3VyYXRpb246IG5lbnRyaWVzICV1IHJvdXRlICV1IGNsaXAgJXUg
+ZmlsdGVyICV1IGFjdGl2ZSAldSBzZXJ2ZXIgJXUgaGFzaCAldQoAAAAAAAAAAAAAAGxlIGNvbmZp
+Z3VyYXRpb246IG5lbnRyaWVzICV1IHJvdXRlICV1IGNsaXAgJXUgZmlsdGVyICV1IHNlcnZlciAl
+dSBhY3RpdmUgJXUgaGFzaCAldSBuc2VydmVyc3JhbSAldQoAAAAAAAAAAAAAAABjZl9wYXJzZTog
+ZmlsZSBtZW10eXBlIDB4JXggbWVtYWRkciAweCV4IG1hcHBlZCBAICVwOgoAAAAAAAAAAAAAY29u
+ZmlndXJlZCB3aXRoIGNhcHMgbmJtfGxpbmsgMHglMDh4IHN3aXRjaHxuaWMgMHglMDh4IHRvZXxy
+ZG1hIDB4JTA4eCBpc2NzaXxmY29lIDB4JTA4eAoAAAAAAAAAbmV0IFZJIGFsbG9jYXRpb24gZmFp
+bGVkIGZvciBmY19pZCAldSB3aXRoIGVycm9yICVkCgAAAAAAAAAAAAAAAG5ldCBWSSBtYWMgYWRk
+cmVzcyBwcm9ncmFtbWluZyBmYWlsZWQgZm9yIGZjX2lkICV1IHdpdGggZXJyb3IgJWQKAAAAAAAA
+AAAAAAAAAAAAbmV0IFZJIHJ4bW9kZSBwcm9ncmFtbWluZyBmYWlsZWQgZm9yIGZjX2lkICV1IHdp
+dGggZXJyb3IgJWQKAAAAAG5ldCBWSSByc3MgaW5kaXJlY3Rpb24gdGFibGUgcHJvZ3JhbW1pbmcg
+Zm9yIGZjX2lkICV1IGZhaWxlZCB3aXRoIGVycm9yICVkCgAAAAAAbmV0IFZJIHJzcyBjb25maWcg
+Y29tbWFuZCBmYWlsZWQgZm9yIGZjX2lkICV1IHdpdGggZXJyb3IgJWQKAAAAAG5ldCBWSSBjb21t
+YW5kIGZhaWxlZCBmb3IgZmNfaWQgJXUgd2l0aCBlcnJvciAlZAoAAAAAAAAAAAAAAAAAAABwcG1h
+eCBbJXVdLCBiaXRzIFsldV0sIEZXX0lTQ1NJX1BBR0VQT0RfVEFHX0lEWF9NQVhfU0laRSBbJXVd
+CgAAZGVmYXVsdCB0YWdtYXNrIFsweCUweF0KAAAAAAAAAABwcm9ncmFtbWVkIHRhZ21hc2sgWzB4
+JTB4XQoAAAAAAHBwbS0+ZGRwX2luZm8ubGxpbWl0IFsweCUweF0sIHBwbS0+ZGRwX2luZm8udWxp
+bWl0IFsweCUweF0sIHBwbS0+ZGRwX2luZm8uc2l6ZSBbMHglMHhdCgAAAAAAAAAAAHBwbS0+ZGRw
+X2luZm8ubWF4X3R4c3ogWzB4JTB4XSBwcG0tPmRkcF9pbmZvLm1heF9yeHN6IFsweCUweF0gaW9z
+aXplIFsweCUweF0KAAAAcHBtYXggWyV1XSwgaWR4X2JpdHMgWyV1XSwgaWR4X21hc2sgWzB4JTB4
+XSwgcmVzdmRfdGFnX21hc2sgWzB4JTB4XSwgdGFnbWFzayBbMHglMHhdCgAAAAAAAAAAAAAAdGFn
+IGl0dCAweCUweCwgYml0cyAldSwgYWdlIDB4JTB4LCBiaXRzICV1CgAAAAAAY3hjbmljLT5pc2Nz
+aV9wcG0gWzB4JTB4XQoAAAAAAABzY3NpX3BsZF9zaXplIFsldV0sIEFMSUdOKHNjc2lfcGxkX3Np
+emUsIDE2KSBbJXVdCgAAAAAAAAAAAAAAAAAAbWF4X3Bwb2Rfem9uZXMgWyV1XQoAAAAAAAAAAAAA
+AABmb2lzY3NpX2luaXQ6IGZvaXNjc2lfaW5pdF9kb25lIFsldV0sIGRldi5yZXMuZm9pc2NzaV9u
+dGFza3MgWyV1XSwgZGV2LnJlcy5mb2lzY3NpX25zZXNzIFsldV0sIGRldi5yZXMubmNzb2NrIFsl
+dV0sIGRldi5yZXMuZm9pc2NzaV9uaW5pdCBbJXVdLCByYyBbJWRdCgAAAAAAAAAAY2hfY2xfcmF0
+ZVsldS8ldV06IGNhcHBlZCBjbGFzcyByYXRlIGZyb20gcmVxdWVzdGVkICV1IHRvIGNvbmZpZ3Vy
+ZWQgKGVmZmVjdGl2ZSkgY2hhbm5lbCByYXRlICV1CgAAAAAAAAAAAAAAAAAAAGNoX2NsX3JhdGVb
+JXUvJXVdOiBpbmNyZWFzZWQgZGVmaWNpdF9pbmNyIGZyb20gcmVxdWVzdGVkICV1IHRvIHJlcXVp
+cmVkIG1pbiBvZiAldTsgcmF0ZSAldSAoZWZmICV1KSBkZWZpY2l0X21heCAldQoAAAAAAAAAAAAA
+AAAAcGt0c2NoZWQgY2hhbm5lbCAldSBzZXRzIHNwZWVkIChmcm9tICV1KSB0byAldSBrYnBzCgAA
+AAAAAAAAAAAAAHBvcnRfY21kX2hhbmRsZXI6IHVua25vd24gdS5kY2IudHlwZSAweCV4CgAAAAAA
+AGkyYyBlcnJvciBjYXVzZWQgYnkgbW9kdWxlIHVucGx1ZwoAAAAAAAAAAAAAAAAAAHNlbmR0byBw
+ZW5kaW5nOiB3cl9wZW5kICVwIGZvciBwb3J0ICV1LCAgd2FudCB0byBzZW5kIHRvIHBvcnQgJXUK
+AAAAAAAAAAAAAAAAAAAAc2VuZHRvOmZsb3djaWQgJXUKAAAAAAAAAAAAAAAAAABwb3J0X2xpbmtf
+c3RhdGVfaGFuZGxlclsldV0gbGVhdmluZyBTVEFURV9VUCAoPT5wb3dlcmRvd24pCgAAAAAAcG9y
+dF9saW5rX3N0YXRlX2hhbmRsZXJbJXVdIHBvd2VyaW5nIGRvd24KAAAAAAAAcG9ydF9saW5rX3N0
+YXRlX2hhbmRsZXJbJXVdIGxlYXZpbmcgcG93ZXJkb3duICg9PmRvd24pCgAAAAAAAAAAAHBvcnRf
+bGlua19zdGF0ZV9oYW5kbGVyWyV1XSBsZWF2aW5nIFNUQVRFX0RPV04gKD0+cG93ZXJ1cCkKAAAA
+AABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlclsldV0gcG93ZXJpbmcgdXAKAAAAAAAAAABwb3J0X2xp
+bmtfc3RhdGVfaGFuZGxlciBsZWF2aW5nIHBvd2VydXAgKD0+dXApCgBwb3J0X2xpbmtfc3RhdGVf
+aGFuZGxlclsldV0gb2ggbXkgd2hhdCBpcyBnb2luZyBvbiAoc3RhdGUgPSAlI3gKAAAAAAAAAAAA
+AAAAAAAAAHBvcnRfbGlua19zdGF0ZV9oYW5kbGVyIGdvdCByZXNjaGVkdWxlZAoAAAAAAAAAAHBv
+cnRfbGlua19zdGF0ZV9oYW5kbGVyOiBTb21ldGhpbmcgd2VudCB0ZXJyaWJseSB3cm9uZy4gcmV0
+ID0gJWQKAAAAAAAAAAAAAAAAAAAAc2V0dGluZy91bnNldHRpbmcgaHNzIHJlc3luYyBiaXQKAAAA
+AAAAAAAAAAAAAAAAbGUgaW5pdGlhbGl6YXRpb246IG5lbnRyaWVzICV1IHJvdXRlICV1IGNsaXAg
+JXUgZmlsdGVyICV1IGFjdGl2ZSAldSBzZXJ2ZXIgJXUgaGFzaCAldQoAAAAAAAAAAAAAbGUgaW5p
+dGlhbGl6YXRpb246IG5lbnRyaWVzICV1IHJvdXRlICV1IGNsaXAgJXUgZmlsdGVyICV1IHNlcnZl
+ciAldSBhY3RpdmUgJXUgaGFzaCAldSBuc2VydmVyc3JhbSAldQoAAAAAAAAAAAAAAGh3X3RwX2lu
+aXQ6IHRjYiByZWdpb24gKHN0YXJ0IDB4JTA4cyBzaXplICV1KSBtdXN0IGJlIGluIGZpcnN0IDI1
+Nk1CIG9mIE1BIG1lbW9yeQoAAAAAAAAAAAAAAAAAAGh3X3RwX2luaXQ6IHBnbW5ndCByZWdpb24g
+KHN0YXJ0IDB4JTA4cyBzaXplICV1KSBtdXN0IGJlIGluIGZpcnN0IDI1Nk1CIG9mIE1BIG1lbW9y
+eQoAAAAAAAAAAAAAAGh3X3RwX2luaXQ6IFRQIHBnbW5ndCBpbml0aWFsaXphdGlvbiBkaWQgbm90
+IGNvbXBsZXRlCgAAAAAAAAAAAABidWZtX2luaXQ6IG4gJXUgYnVmbGw2NGludF9zaXplIDB4JXgK
+AAAAAAAAAAAAAABidWZtX2luaXQ6IG5vdCBlbm91Z2ggbWVtb3J5IHRvIGFsbG9jYXRlIGludGVy
+bmFsIGJ1ZmxsNjQgYnVmZmVycwoAAAAAAAAAAAAAAAAAAGJ1Zm1faW5pdDogbm90IGVub3VnaCBt
+ZW1vcnkgdG8gYWxsb2NhdGUgYnVmbGw2NCBidWZmZXJzCgAAAAAAAABtZW1faW5pdF9idWY6IG5v
+dCBlbm91Z2ggbWVtb3J5IHRvIGFsbG9jYXRlIGZsb3cgYnVmZmVycwoAAAAAAAAAbWVtX2luaXRf
+YnVmOiBub3QgZW5vdWdoIG1lbW9yeSB0byBhbGxvY2F0ZSB0Y2JfY2FjaGUgKG9mZmVyZWQgJXUg
+dHJ5aW5nIHRvIHVzZSAldSBhdmFpbGFibGUgJXUpCgAAAAAAAAAAAAAAAAAAAG1wYXJ0aXRpb25f
+b3RoZXJzOiBzdGFydCAweCUwOHggc2l6ZSAldSAodW51c2VkICV1KQoAAAAAAAAAAAAAAABtcGFy
+dGl0aW9uX290aGVyczogc3RhcnQgMHglMDh4IHNpemUgJXUgKHVudXNlZCAldSkKAAAAAAAAAAAA
+AAAAbWVtX2luaXQ6IEVEQyBvdmVyY29tbWl0dGVkIGJ5ICVkIGJ5dGVzCgAAAAAAAAAAbWVtX2lu
+aXQ6IG5vdCBlbm91Z2ggbWVtb3J5IHRvIGFsbG9jYXRlIGZsb3cgdGFibGUKAAAAAAAAAAAAAAAA
+AGN4Y25pY19kZXZpY2VfaW5pdDogY3hjbmljIFsweCUweF0sIGN4Y25pYy0+ZmlsdGVyIFslMHhd
+CgAAAAAAAABjeGNuaWNfZGV2aWNlX2luaXQ6IGRldi50cC5udW1fdHhfcGFnZXMgWyV1XSwgZGV2
+Lm1jWzBdLnNpemUgWyV1XSwgZGV2LnRwLnR4X3BhZ2Vfc3ogWyV1XSwgY3hjbmljIHNpemUgWyVk
+XSwgcmMgWyVkXQoAAAAAAAAAAAAAAFBvcnRbJXVdOiBVbmtub3duIFNHTUlJIHN1Yi10eXBlICUj
+eAoAAAAAAAAAAAAAAFBvcnRbJXVdOiBVbmtub3duIEJUX1hGSSBzdWItdHlwZSAlI3gKAAAAAAAA
+AAAAAFBvcnRbJXVdOiBVbmtub3duIEJUX1hBVUkgc3ViLXR5cGUgJSN4CgAAAAAAAAAAAHBvcnRf
+aW5pdFsldV06IHBvcnQgdHlwZSAweCV4IGlzIG5vdCBzdXBwb3J0ZWQKAG1wYXJ0aXRpb25faW5p
+dDogbW92ZWQgcG1yeF9zdGFydCBmcm9tIDB4JTA4eCB0byAweCUwOHggdG8gbWFrZSByb29tIGZv
+ciBMRSBIQVNIIGFuZC9vciBUUCBUQ0JzCgAAAAAAAAAAAAAAAAAAAABtcGFydGl0aW9uX2luaXQ6
+IG1vdmVkIHBtcnhfc3RhcnQgZnJvbSAweCUwOHggdG8gMHglMDh4IChFRFJBTSkKAAAAAAAAAAAA
+AAAAAAAAAEVRIHBmbiAldSB2Zm4gJXU6IGRlc3Ryb3lpbmcgZXFpZCAldSB3aXRoIHBlbmRpbmcg
+V1IocykgKG51bV9ieXRlcyAldSBhbmQgZmxhZ3MgMHglMDh4CgAAAAAAAAAAAGwyZGV2X2ZjLT5m
+bG93Y19pZCBbJXVdLCBsMmRjLT5wZm4gWyV1XSwgbDJkYy0+dmZuIFsldV0sIGwyZGMtPmxwb3J0
+IFsldV0sIGwyZGV2X2ZjLT5mbG93aWQgWyV1XSBsMmRjLT50eF9jaCBbJXVdLCBkZXYudnBkLnBv
+cnR2ZWMgWyV4XQoAAAAAAAAAAHBvcnR2ZWMgWyV1XQoAAABsMmRldl92aV9mc206IG1iIFsweCV4
+XSwgZGVmZXJyZWQsIHN0YXRlIFsweCV4XSwgcG9ydCBbMHgleF0KAAAAbDJkZXZfdmlfZnNtOiB2
+aWlkIFsweCV4XSBwb3J0IFsweCV4XSwgbWFjLWlkIFslMDJ4OiUwMng6JTAyeDolMDJ4OiUwMng6
+JTAyeF0uIAoAAAAAAAAAAAAAAAAAAAAAbDJkZXZfdmlfZnNtOiBzZ2VfZXFpZCBbMHgleF0sIHNn
+ZV9pcWlkIFsweCV4XSwgc2dlX2VxY3IgWzB4JXhdLCByc3Nfc3ogWzB4JXhdCgBsMmRldl92aV9m
+c206IGwyZGV2X2ZjLT5mbG93Y19uZXRfbDJkZXZfbXR1IFsldV0sIG1iX3NjcmF0Y2ggWzB4JXhd
+LCBwb3J0IFsweCV4XQoAAAAAAAAAAAAAAAAAAABsMmRldl92aV9mc206IHZpaWQgWyVkXSwgdmlf
+ZmMtPmZsb3djX3ZpX2ZsYWdzIFsweCV4XQoAAAAAAAAAAAAAbDJkZXZfdmlfZnNtOiBwZm4gWzB4
+JXhdLCB2Zm4gWzB4JXhdLCBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBscG9ydCBbMHgleF0s
+IHZpaWQgWzB4JXhdLCBmbGFncyBbMHgleF0KAAAAAAAAAGwyZGV2X3ZpX2ZzbTogRXJyb3IgZnJl
+ZWluZyBWSSwgcmMgWzB4JXhdCgAAAAAAAGwyZGV2X3ZpX2ZzbTogcGlkIFsweCV4XSwgdmlpZCBb
+MHgleF0sIG1iX2xvYyBbMHgleF0sIG1iX29yaWdbMHgleF0sIGwyZGV2X2ZsYWdzIFsweCV4XSwg
+cmMgWzB4JXhdCgAAAAAAAAAAAAAAAABBaCBoYS4uLmRvdWJsZSBmcmVlIG94X2lkIDB4JXgsIHJ4
+X2lkIDB4JXgKAAAAAABIb3N0IFBSTEkgUmVzcG9uc2UgdGltZWRvdXQ6IG94X2lkIDB4JXggcnhf
+aWQgMHgleAoAAAAAAAAAAAAAAAAAcGZuICV1IHZmbiAldSB2aWEgY29tbWFuZAoAAAAAAAB0cF9t
+dHVzIGhhcyAldSBlbnRyaWVzIG9ubHksIHJlcXVpcmUgJXUgZW50cmllcwoAAAAAAAAAAAAAAAAA
+AAAAdHBfbXR1c1sldV0gaXMgJXUgYnl0ZXMgd2hpY2ggaXMgbm90IHN1cHBvcnRlZAoAY29uZmln
+dXJhdGlvbiBmaWxlIHBhcnNlcjogc2dlIHRpbWVyIHZhbHVlWyVpXSBpcyB0b28gbGFyZ2UsIGNo
+YW5naW5nIGZyb20gJXUgdG8gJXV1c2VjcwoAAAAAAAAAZmlsdGVybWFzayAweCV4IGlzIG5vdCBl
+cXVhbC9zdWJzZXQgdG8vb2YgZmlsdGVybW9kZQoAAAAAAAAAAAAAAGh3X2xlX2NsaXBfaGFuZGxl
+cjogcmVtb3ZlZCBwb3M9JXUgKD1pZHggJXUpCgAAAGh3X2xlX2NsaXBfaGFuZGxlcjogYWRkaW5n
+IHRvIHBvcz0ldSAoPWlkeCAldSkKAG1vZHVsZVsldV06IHBvcnQgbW9kdWxlIGluc2VydGVkIGFu
+ZCByZWFkeQoAAAAAAG1vZHVsZVsldV06IHBvcnQgbW9kdWxlIHJlbW92ZWQKAAAAAAAAAAAAAAAA
+AAAAAG1vZHVsZVsldV06IHVua25vd24gbW9kdWxlIGlkZW50aWZpZXIgMHglMDJ4CgAAAG1vZHVs
+ZVsldV06IGdwaW8gJXUgdHJhbnMgMTBHIDB4JTAyeCAxRyAweCUwMnggKGxlbmd0aCAldSkgY2Fi
+bGUgMHglMDJ4IChsZW5ndGggJXUpIG1vZHVsZV90eXBlIDB4JTAyeAoAAAAAAAAAAABjeDRfY3Jf
+cGRvd25bJXVdOiBlbiAldSB2aV9lbl9jbnQgJXUKAAAAAAAAAAAAAABjcl9tb2R1bGVfcnhfbG9z
+WyV1XTogcnhfbG9zIGNoYW5nZWQgdG8gJXUKAAAAAABpbml0X3BvcnRbJXVdOiAgbGluayBzdGF0
+dXMgMHgleCBtb2RfdHlwZSAweCV4IHZpX2VuX2NudCAldSByeF9sb3MgJXUgaHNzX3NpZ2RldCAl
+dSBwb3J0X2NmZy5zaWdkZXQgJXUKAAAAAAAAAAAAaW5pdF9wb3J0WyV1XTogIGxpbmsgc3RhdHVz
+IDB4JXgKAAAAAAAAAAAAAAAAAAAAaW5pdF9wb3J0WyV1XTogIGxpbmsgc3RhdHVzIDB4JXgKAAAA
+AAAAAAAAAAAAAAAAaW5pdF9wb3J0WyV1XTogIGxpbmsgc3RhdHVzIDB4JXgKAAAAAAAAAAAAAAAA
+AAAAaW5pdF9wb3J0WyV1XTogIGxpbmsgc3RhdHVzIDB4JXgKAAAAAAAAAAAAAAAAAAAAaW5pdF9w
+b3J0WyV1XTogIGxpbmsgc3RhdHVzIDB4JXgKAAAAAAAAAAAAAAAAAAAAY3g0X2NyWyV1XTogcmV0
+ICVkIHN0YXR1cyAldSB4Z21fbHMgMHglMDh4CgAAAAAAZmxyX3BmdmZfZnNtWyV1OiV1XTogdW5r
+bm93biBzdGF0ZSAldQoAAAAAAAAAAAAAaHcgcGYgYml0bWFwIDB4JTAyeCB2ZmlkIGJpdG1hcCAw
+eCUwOHg6MHglMDh4OjB4JTA4eDoweCUwOHgKAAAAAGFmdGVyIHZmaWQgZml4dXAsIHZmaWQgYml0
+bWFwIDB4JTA4eDoweCUwOHg6MHglMDh4OjB4JTA4eAoAAAAAAAB3b3JrYXJvdW5kMTM3MjM6IGRl
+dGVjdGVkIFdSIEAgMHglMDh4IG9mIHNpemUgJXUgYnl0ZXMsIGRyaWJibGluZyBpdCBpbiAldSBi
+eXRlcyBhdCBhIHRpbWUKAAAAAAB0aW1lciBxdWV1ZSAldSBsb3N0IGEgdGljayEgbmV4dCAlcCBs
+YXN0ICVwIG51bWUgJXUKAAAAAAAAAAAAAAAAZmxyX3RpbWVyX3N0YXJ0OiBmbG93Y19pZCAldSAl
+cCBidWYgJXAKAAAAAAAAAAAAcGNpZTogbnBmICV1IChwZmJpdG1hcCAweCUwMngpIG52ZiAldSAo
+cGYgMC4uMyAweCUwMnggMHglMDJ4IDB4JTAyeCAweCUwMngpCgAAAABmYWlsZWQgdG8gZmluZCB0
+aGUgJWMlYyBWUEQgcGFyYW1ldGVyCgAAAAAAAAAAAABmYWlsZWQgdG8gcGFyc2UgdGhlICVjJWMg
+VlBEIHBhcmFtZXRlcgoAAAAAAAAAAABmYWlsZWQgdG8gc3VjY2Vzc2Z1bGx5IGZpbmQgQ2hlbHNp
+byBWUEQKAAAAAAAAAABsb2cgaW5pdGlhbGl6ZWQgQCAweCUwOHggc2l6ZSAldSAoJXUgZW50cmll
+cykKAABkcm9wX2FsbF90YXNrOiByZXF1ZXN0ZWQgbGlkeCBbJXVdCgAAAAAAAAAAAAAAAABnZXRf
+cmVmX3Rhc2s6IGlzdGFzay0+Zmxvd2NfaWQgWzB4JXhdLCBpc3Rhc2tfZmMtPmZsb3djX3N0YXRl
+IFsldV0sIGFicnRfbGlkeCBbMHgleF0sIGxpZHggWzB4JXhdCgAAAAAAAAAAAAAAAAAAc2VuZF9h
+Ym9ydF9yZXE6IGNza19mYy0+Zmxvd2NfdHlwZSBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4
+JXhdLCB0aWQgWzB4JXhdLCB1bHB0eGNoIFsldV0sIGJ1ZmZlcmVkIFsldV0KAAAAAGh3IHJlZ2lz
+dGVyIG9wZXJhdGlvbiBub3QgY29tcGxldGluZywgcmVnIDB4JTA4eCBtYXNrIDB4JTA4eCB2YWx1
+ZSAweCUwOHggKHJlZyAweCUwOHgpCgAAAAAAAAAAAE1ESU8gQ0w0NTogZmFpbGVkIHRvIHNldCB1
+cCBNTUQgYWRkcgoAAAAAAAAAAAAAAE1ESU86IGZhaWxlZCB0byB3cml0ZQoAAAAAAAAAAAAATURJ
+TyBDTDQ1OiBmYWlsZWQgdG8gc2V0IHVwIE1NRCBhZGRyCgAAAAAAAAAAAAAATURJTzogZmFpbGVk
+IHRvIHJlYWQKAAAAAAAAAAAAAABzZW5kX2Nsb3NlX3JlcTogY3NrX2ZjLT5mbG93Y190eXBlIFsw
+eCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+dGNiX3N0YXRlIFsweCV4XQoA
+AABzZW5kX2Nsb3NlX3JlcTogY3NrX2ZjLT5mbG93Y190eXBlIFsweCV4XSwgY3NrX2ZjLT5mbG93
+Y19pZCBbMHgleF0sIHRpZCBbMHgleF0sIHVscHR4Y2ggWyV1XSxidWZmZXJlZCBbJXVdCgAAAAAA
+b2ZsZF90Y3BfZG9fYWN0aXZlX2Nsb3NlOiBjc2tfZmMgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lk
+IFsweCV4XSwgY3NrX2ZjLT50Y2Jfc3RhdGUgWzB4JXhdCgAAAAAAb2ZsZF90Y3BfZG9fYWN0aXZl
+X2Nsb3NlOiBjc2tfZmMgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT50
+Y2Jfc3RhdGUgWzB4JXhdCgAAAAAAb2ZsZF90Y3BfZGlzY29ubmVjdDogdGNiX2ZjLT5mbG93Y19p
+ZCBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2stPnRjYl9zdGF0ZSBbMHgleF0K
+AAAAZGVjb2RlX2Jhc2U2NF9zdHJpbmc6IGRsZW4gWyVkXQoAAAAAAAAAAAAAAAAAAAAAZGVjb2Rl
+X2hleF9zdHJpbmc6IGRsZW4gWyVkXQoAAABsb2dnZWRfaW46IGZsb3djX2ZvaXNjc2lfY29ubl9m
+bGFncyBbMHgleF0KAAAAAABsb2dnZWRfaW46IHNlc3Mgc3RhdGUgWzB4JXhdLCBjbWRzbiBbMHgl
+eF0sIGV4cGNtZHNuIFsweCV4XSwgbWF4Y21kc24gWzB4JXhdLCBpdHQgWzB4JXhdLCB0eXBlIFsw
+eCV4XQoAAAAAAAAAAAAAZm9pc2NzaV92YWxpZGF0ZV9sb2dpbl9zdGFnZTogLSAxCgAAAAAAAAAA
+AAAAAAAAYXN5bmNfcGR1OiBsb2dvdXQgcmVxdWVzdGVkIGJsb2NraW5nIHNlc3Npb24KAAAAYXN5
+bmNfcGR1OiBzZXNzL2Nvbm4gZHJvcCByZXF1ZXN0ZWQgYmxvY2tpbmcgc2Vzc2lvbgoAAAAAAAAA
+AAAAAHRleHRfcmVzcDogY19iaXQgWzB4JXhdLCBmX2JpdCBbMHgleF0KAAAAAAAAAAAAAGNwbF90
+eF9wa3Q6IGludGYgWzB4JXhdCgAAAAAAAAAAY3BsX3R4X3BrdDogdmxhbmlkIFsweCV4XQoAAAAA
+AABuZXRfbDJkZXZfZmluZF9ieV9hZGRyOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBsMmRj
+LT5scG9ydCBbJXVdLCBsMmRfZmMtPmZsb3djX2lkIFsweCV4XSwgbDJkYy0+aW40X2Rldi5pbl9h
+ZGRyLmFkZHIgWzB4JXhdLCBhZGRyIFsweCV4XQoAAABuZXRfbDJkZXZfbXR1X2NvbmZpZzogbDJk
+ZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgbXR1ICV1CgAAAAAAAAAAbmV0aWZfZG9fZGhjcDogd3It
+PnBhcmFtLnZsYW5pZCBbJXVdLCBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5kZXYgWzB4
+JXhdCgBjcGxfdHhfcGt0OiBpbnRmIFsweCV4XQoAAAAAAAAAAGNwbF90eF9wa3Q6IHZsYW5pZCBb
+MHgleF0KAAAAAAAAZW5jb2RlIGhleCBzdHJpbmc6IGRsZW4gWyVkXQoAAAB0Y3Bfc2VuZF9hb3Bl
+bl9yZXE6IGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4
+XSwgYnVmZmVyZWQgWyV1XSwgcmVzX2NudCBbMHgleF0sIGlxX2lkeCBbMHgleF0KAAAAAAAAAAAA
+AGFvcGVuX3JlcTogaHdfbGVfZmlsdGVyX2N0dXBsZSBmYWlsZWQKAAAAAAAAAAAAAG9mbGRfdGNw
+X3NlbmRfYW9wZW5fcmVxOiBjcGxfcmVxLT5GaWx0ZXIgWzB4JTB4XSwgY3R1cGxlc1swXSBbMHgl
+eF0sIGN0dXBsZXNbMV0gWzB4JXhdCgAAAAAAAAAAAGNzb2NrX2FsbG9jOiB0eF9jaCBbMHgleF0s
+IGxwb3J0IFsweCV4XSwgY29va2llIFslMDh4XQoAAAAAAAAAAABjc29ja19hbGxvYzogYXZhaWxh
+YmxlIFsldV0sIG5jc29jayBbJXVdLCBwb3M6YXRpZCBbMHgleF0sIGNza19mYyBbMHgleF0sIGNz
+a19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBzcG9ydCBbJXVdCgAAZm9pc2NzaV9wZWVyX2luaXQ6IGNv
+bm5fYXR0ci0+aGRpZ2VzdF90b19kZHBfcGdzeiBbMHgleF0KAAAAAAAAAGZvaXNjc2lfcGVlcl9p
+bml0OiBQcmUtaW5pdCBjb25uX2ZjLT5mbG93Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4JXhdCgAA
+AAAAAAAAAAAAZm9pc2NzaV9wZWVyX2luaXQ6IFBvc3QtaW5pdCBjb25uX2ZjLT5mbG93Y19mb2lz
+Y3NpX2Nvbm5fZmxhZ3MgWzB4JXhdCgAAAAAAAAAAAABXQVRDSERPRzogTm8gdGVtcGVyYXR1cmUg
+c2Vuc29yIGF2YWlsYWJsZS4KAAAAAABXQVRDSERPRzogQWN0aXZhdGluZwoAAAAAAAAAAAAAAFdB
+VENIRE9HIC0gRW5hYmxlIGFjdGlvbiAldSB0aW1lICV1CgAAAAAAAAAAAAAAAFdBVENIRE9HIC0g
+RGlzYWJsZSBhY3Rpb24gJXUKAAAAV0FUQ0hET0c6IERlLWFjdGl2YXRpbmcKAAAAAAAAAABzZXNz
+aW9uX2xpbmtfbm90aWZ5OiBwb3J0IFsweCV4XSBsaW5rIGRvd24gcGluZyByZWNvdmVyeSBkaXNh
+YmxlZCwgdHJ5aW5nIHRvIHJlY292ZXIgc2Vzc2lvbiBbMHgleF0gY29ubiBbMHgleF0KAAAAAAAA
+AAAAAAAAAAAAAHNlc3Npb25fbGlua19ub3RpZnk6IHBvcnQgWzB4JXhdIGxpbmsgdXAgc2Vzc2lv
+biBbMHgleF0gY29ubiBbMHgleF0KAAAAAAAAAAAAAAAAZm9pc2NzaSBjb25uX2ZjIFsweCV4XSwg
+Zmxvd2Nfc2NoZWRjbCBbMHgleF0sIGluZ19jaCBbMHgleF0sIGVncl9jaCBbMHgleF0KAAAAAABs
+MmRldl9ub3RpZnkgd2l0aCB1bmtub3duIGZsYWcgWzB4JXhdCgAAAAAAAAAAAABGQ29FIEZDQiBs
+aW5rZG93bjogaW9fcmVxIDB4JXgleCBpcWlkIDB4JXggZmxvd2lkIDB4JXggb3AgMHgleAoAZmNv
+ZSBub3RpZnkgOiBVcGRhdGUgbmV3IERDQlggdmFsdWVzIFZJIHN0YXRlIDB4JXggcHJpIDB4JXgg
+c2NoZWRjbCAweCV4IGRjYnhfZG9uZSAweCV4CgAAAAAAAAAAZmNvZSBub3RpZnkgOiBGQ0YgZmxv
+d2lkIDB4JXgsIHVscGNoIDB4JXggCgAAAAAAbmV0X2wyZGV2X25vdGlmeTogbDJkZXZfZmMtPmZs
+b3djX2lkIFsweCV4XSwgcG9ydCBbJWRdLCBldmVudCBbMHgleF0sIHVscHR4Y2ggWyV1XSwgY2xh
+c3MgWzB4JXhdLCB2cHJpbyBbMHgleF0sIHZpZCBbMHgleF0sIHZpX3JlYWR5IFsldV0KAAAAAAAA
+bmV0X2wyZGV2X25vdGlmeTogcGdpZCBbMHgleF0sIHByaW8gWzB4JXhdLCBjaCBbMHgleF0KAAAA
+AAAAAAAAAGZjb2Ugbm90aWZ5IDogRENCWCA6IHBvcnQgMHgleCwgcHJpb3JpdHkgMHgleCB1bHB0
+eGNoIDB4JXggY2xhc3MgMHgleAoAAAAAAAAAAAAAY2hfY2xfcmF0ZVsldS8ldV06IGNhcHBlZCBk
+ZWZpY2l0X2luY3IgZnJvbSByZXF1aXJlZCAldSB0byAldTsgcmF0ZSAldSAoZWZmICV1KSBkZWZp
+Y2l0X21heCAldQoARkNvRSBGQ0YgdGltZXI6IGZsb3djIHN0YXRlIDB4JXgsIHBvcnQgMHgleCAs
+ZmNmIDB4JXgsIGZsb3djX2lkIDB4JXgKAAAAAAAAAAAAAAByaV93cl9pbml0WyV1XTogbXNzICV1
+IGlzIG5vdCA4LWJ5dGUgYWxpZ25lZAoAAABjb3JlX3Byb2dyYW1fdGNiOiB0aWQgJSN4IHRfc3Rh
+dGUgJSN4IHJjdl9hZHYgMHglMDh4IHJjdl9zY2FsZSAlI3ggdHhfbWF4ICUjeCByY3Zfbnh0ICUj
+eCBhdGlkICUjeAoAAAAAAAAAAAAAAAAACW9wdDAgJSN4JXggb3B0MiAlI3ggaXB2NiAlI3ggZmxh
+Z3NfdGltZXIgMHglMDh4CgAAAAAAAAAAAAAAAAAAAG9mbGRfY29ubmVjdGlvbl93cjogY29ubmVj
+dGlvbiB3aXRoIDUtdHVwbGUgbHAgMHglMDR4IGZwIDB4JTA0eCBsaXAgMHglMDh4JTA4eCBwaXAg
+MHglMDh4JTA4eCBmaWx0ZXIgMHglMDh4IGV4aXN0cyBAIExFIGluZGV4ICV1CgAAAAAAAAAAAAAA
+AAAAAG9mbGRfY29ubmVjdGlvbl93cjogY29ubmVjdGlvbiB3aXRoIDUtdHVwbGUgbHAgMHglMDR4
+IGZwIDB4JTA0eCBsaXAgMHglMDh4IHBpcCAweCUwOHggZmlsdGVyIDB4JTA4eCBleGlzdHMgQCBM
+RSBpbmRleCAldQoAAAAAAAAAb2ZsZF9jb25uZWN0aW9uX3dyOiBjb25uZWN0aW9uIHdpdGggNS10
+dXBsZSBscCAweCUwNHggZnAgMHglMDR4IGxpcCAweCUwOHglMDh4IHBpcCAweCUwOHglMDh4IGZp
+bHRlciAweCUwOHgKAAAAAG9mbGRfY29ubmVjdGlvbl93cjogY29ubmVjdGlvbiB3aXRoIDUtdHVw
+bGUgbHAgMHglMDR4IGZwIDB4JTA0eCBsaXAgMHglMDh4IHBpcCAweCUwOHggZmlsdGVyIDB4JTA4
+eAoAAAAAAAAAAAAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGlxZXNpemUgJXUgdG9vIHNtYWxs
+CgAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGlxaWQgJXUgdG9vIGxhcmdlIChtYXggJXUpCgAA
+AAAAAAAAAAAAAAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBpcWlkICV1IG5vdCBhbGxvY2F0ZWQK
+AAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBmbDBpZCAldSB0b28gbGFyZ2UgKG1heCAldSkKAAAA
+AAAAAAAAAAAAAElRRkxJTlQgcGZuICV1IHZmbiAldTogZmwwaWQgJXUgbm90IGFsbG9jYXRlZAoA
+AElRRkxJTlQgcGZuICV1IHZmbiAldTogZmwxaWQgJXUgdG9vIGxhcmdlIChtYXggJXUpCgAAAAAA
+AAAAAAAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGZsMWlkICV1IG5vdCBhbGxvY2F0ZWQKAABJ
+UUZMSU5UIHBmbiAldSB2Zm4gJXU6IGZsMWlkICV1IGlzIHZhbGlkIGJ1dCBub3QgZmwwaWQgJXUK
+AAAAAAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBmbDFpZCAldSBpcyB2YWxpZCBidXQgaGVhZGVy
+IHNwbGl0IGZlYXR1cmUgaXMgbm90IGVuYWJsZWQKAAAAAAAAAAAAAAAAAAAASVEgcGZuICV1IHZm
+biAldTogaXFpZCAldSB0b28gbGFyZ2UgKG1heCAldSkKAAAASVEgcGZuICV1IHZmbiAldTogaXFp
+ZCAldSBub3QgYWxsb2NhdGVkCgAAAAAAAAAASVEgcGZuICV1IHZmbiAldTogZmwwaWQgJXUgZmwx
+aWQgJXUgYnV0IG5vdCBzdXBwb3J0ZWQKAAAAAAAAAAAAAGh3X3VscHR4X3dvcmthcm91bmRfcHIx
+Njk0OV9lbmFibGVkX3BmOiBwZiAldSBlbmFibGVkICV1CgAAAAAAAABod191bHB0eF93b3JrYXJv
+dW5kX3ByMTY5NDlfZW5hYmxlZF92ZmlkOiB2ZmlkICV1IGVuYWJsZWQgJXUKAAAARVEgcGZuICV1
+IHZmbiAldTogY3JlYXRpbmcgRVRIIGVxaWQgJXUgd2l0aCBwZW5kaW5nIFdSKHMpIChudW1fYnl0
+ZXMgJXUgYW5kIGZsYWdzIDB4JTA4eAoAAAAAAAAARVEgcGZuICV1IHZmbiAldTogY3JlYXRpbmcg
+Q1RSTCBlcWlkICV1IHdpdGggcGVuZGluZyBXUihzKSAobnVtX2J5dGVzICV1IGFuZCBmbGFncyAw
+eCUwOHgKAAAAAAAARVEgcGZuICV1IHZmbiAldTogZXFpZCAldSB0b28gbGFyZ2UgKG1heCAldSkK
+AAAARVEgcGZuICV1IHZmbiAldTogZXFpZCAldSBub3QgYWxsb2NhdGVkCgAAAAAAAAAAaHdfY2lt
+X3RwX3dvcmthcm91bmQxMzcyM19lbmFibGU6IHBvcnQgJXUgcHJvdG9jb2wgMHgleCBlbiAldSBj
+dXJyZW50IDB4JXggd29ya2Fyb3VuZF9wcjEzNzIzIDB4JXgKAAAAAAAAAAAAAAAAAHBvcnRfYmxp
+bmtfbGVkX3Jlc3RvcmUKAAAAAAAAAAAAcG9ydF9ibGluazogYmxpbmtkdXI9MHgleCBibGlua19y
+ZWZjbnQKAAAAAAAAAAAAcG9ydF9ibGluazogCWJsaW5rX3JlZmNudD0weCV4CgBwb3J0X2JsaW5r
+OiAJYmxpbmtfcmVmY250PTB4JXgKAG1paV9hZHZfZmNbJXVdOiByY2FwcyAweCV4CgAAAAAAbWlp
+X2Fkdl9zcGVlZFsldV06IHJjYXBzIDB4JXgKAABtaWlfYW5yZXN0YXJ0WyV1XTogYWNhcHMgMHgl
+eAoAAG1paV9pbml0WyV1XTogYWNhcHMgMHgleAoAAAAAAAAAcG9ydFsldV06IGdhdmUgdXAgZml4
+aW5nIGVycm9ycyEhIQoAAAAAAAAAAAAAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogbDFjZmcs
+IHBjYXBzIDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAAAAAAAAAAAAAAAABwb3J0WyV1
+OjB4JTAyeDoweCUwMnhdOiBsMWNmZywgaW52YWxpZCByZXF1ZXN0LCBwY2FwcyAweCV4IGFjYXBz
+IDB4JXggcmNhcHMgMHgleAoAAAAAAAAAAAAAAAAAAABwb3J0WyV1OjB4JTAyeDoweCUwMnhdOiBs
+MWNmZywgbWRpIG4vYSBwY2FwcyAweCV4IGFjYXBzIDB4JXggcmNhcHMgMHgleAoAAAAAAAAAAHBv
+cnRbJXU6MHglMDJ4OjB4JTAyeF06IGwxY2ZnLCBjYW5ub3QgZm9yY2Ugbm8vbXVsdGlwbGUgc3Bl
+ZWQocyksIHBjYXBzIDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAAAAAAAAAAAABzY3Np
+X2NtZDogY29tbWFuZCByZWNpZXZlZCBvbiBpbnZhbGlkIGNvbm4gdHlwZSBbMHgleF0uCgAAAAAA
+AAAAc2NzaV9jbWQ6IGJ1ZmZlcmVkIFsweCV4XSwgY29ubiBzdGF0ZSBbMHgleF0KAAAAc2NzaV9j
+bWQ6IGlTQ1NJIGNvbW1hbmQgc2VxdWVuY2Ugd2luZG93IGNsb3NlZC4gY29ubiBbMHgleF0sIG9w
+IFsweCV4XSwgIGNtZHNuIFsweCV4XSwgc2VudF9jbWRzbiBbMHgleF0sIG1heF9jbWRzbiBbMHgl
+eF0sIGl0dCBbMHgleF0KAAAAAAAAAAAAc2NzaV9yZWFkOiBjb21tYW5kIHJlY2lldmVkIG9uIGlu
+dmFsaWQgY29ubiB0eXBlIFsweCV4XS4KAAAAAAAAAHNjc2lfcmVhZDogYnVmZmVyZWQgWzB4JXhd
+LCBjb25uIHN0YXRlIFsweCV4XQoAAHNjc2lfcmVhZDogaVNDU0kgY29tbWFuZCBzZXF1ZW5jZSB3
+aW5kb3cgY2xvc2VkLiBjb25uIFsweCV4XSwgY21kc24gWzB4JXhdLCBzZW50X2NtZHNuIFsweCV4
+XSwgbWF4X2NtZHNuIFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAc2NzaV93cml0ZTogY29tbWFuZCBy
+ZWNpZXZlZCBvbiBpbnZhbGlkIGNvbm4gdHlwZSBbMHgleF0uCgAAAAAAAHNjc2lfd3JpdGU6IGJ1
+ZmZlcmVkIFsweCV4XSwgY29ubiBzdGF0ZSBbMHgleF0KAHNjc2lfd3JpdGU6IGlTQ1NJIGNvbW1h
+bmQgc2VxdWVuY2Ugd2luZG93IGNsb3NlZC4gY29ubiBbMHgleF0sIGNtZHNuIFsweCV4XSwgc2Vu
+dF9jbWRzbiBbMHgleF0sIG1heF9jbWRzbiBbMHgleF0sIGl0dCBbMHgleF0KAAAAcHJvY2Vzc19k
+aGNwX29wdHM6IHJvb3QgcGF0aCBsZW4gWyVkXSBieXRlcwoAAAAAbmV0aWZfcHJvY2Vzc19kaGNw
+X29wdHM6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIE1TR19UWVBFIFslZF0sIGRoY3R4dC0+
+c3RhdGUgWyVkXQoAAAAAAAAAAAAAaWNtcF9yZWN2OiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhd
+LCBwaWQgWzB4JXhdLCBpY21wIHR5cGUgWzB4JXhdCgAAAAAAAAAAAAAAAABmY19zZW5kX2FsbG9j
+X2NwbDogZmFpbGVkIHRvIHNldHVwIGZpbHRlciBjdHVwbGUKAAAAAAAAAAAAAAAAAAAAZmNvZV9j
+b21wdXRlX2N0dXBsZSB2bGFuICV4IHZpaWQgJXggcG9ydCAleCBtcHNfaWR4ICV4CgAAAAAAAAAA
+AGZjb2VfY29tcHV0ZV9jdHVwbGUgMHgleDoleAoAAAAAaWdub3JpbmcgZmlwIHJlY3YgZm9yIHBj
+YiBmbG93OiV4IGluIG9mZmxpbmUgc3RhdGUKAAAAAAAAAAAAAAAAAEFCVFMgQUNDIGF3YWl0aW5n
+IFBSTEkgUnNwOiBmbG93Y19pZCAweCV4IG94X2lkIDB4JXggcnhfaWQgMHgleCBpcWlkIDB4JXgK
+AAAAAAAAYXJwX3JlY3Y6IGlwaWQgWzB4JXhdLCBpbl9hZGRyLmFkZHIgWzB4JXhdLCBzaXAgWzB4
+JXhdLCByaXAgWzB4JXhdLCBhcnBfb3AgWzB4JXhdCgAAAAAAAAAAAAAAAAAAY2huZXRfYXJwX3Jl
+Y3Y6IGlwIGNvbmZsaWN0IGRldGVjdGVkCgAAAAAAAAAAAAAAY2huZXRfYXJwX3JlY3Y6IHBpZCBb
+JXVdLCB2bGFuIFsweCV4XSwgYXJwIG9wIFsweCV4XSwgc2lwIFsweCV4XSwgcmlwIFsweCV4XQoA
+AABjc29ja19wZWVyX2Nsb3NlOiBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgdGNiX2ZjLT5mbG93
+Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCB0Y2JfZmMtPmZsb3djX3N0
+YXRlIFsweCV4XQoAAAAAAGNzb2NrX3BlZXJfY2xvc2U6IGNza19mYy0+Zmxvd2NfaWQgWzB4JXhd
+LCBjc2tfZmMtPmZsb3djX3N0YXRlICBbMHgleF0KAAAAAAAAAAAAaHdfdWxwdHhfd29ya2Fyb3Vu
+ZF9wcjE2OTQ5X2VuYWJsZWRfcGZfaXE6IGlxICV1IGVuYWJsZWQgJXUgKHBmICV1KQoAAAAAAAAA
+AAAAAAB0Y3BfY2xzX2FicnRfcnBsOiB0Y2IgdGlkIFsweCUwNnhdLCBmbG93Y190eXBlIFsweCV4
+XSwgY3Bsb3AgWzB4JXhdIAoAAAAAAAAAAAAAAGNoX3JhdGVbJXVdOiBjYXBwZWQgdGljayBmcm9t
+IHJlcXVpcmVkICV1IHRvIHN1cHBvcnRlZCAldTsgcmF0ZSAldSAoZWZmICV1KSBkZWZpY2l0X2lu
+Y3IgJXUgdGljayAldQoAAAAAAAAAAAAAAABwa3RzY2hlZF9jaF9ybFsldV06IGNoYW5uZWwgcmwg
+bm90IGF2YWlsYWJsZSBpbiBjb25qdW5jdGlvbiB3aXRoIGZsb3cgc2hhcGluZwoAAHBrdHNjaGVk
+X2NoX3JsWyV1XTogcmF0ZSAldSBtYXggJXUKAAAAAAAAAAAAAAAAAHBrdHNjaGVkX2NsX3dyclsl
+dToldV06IHdlaWdodCAldSB3ZWlnaHRlZF9tYXNrIDB4JXgKAAAAAAAAAAAAAABlcV9wYXJhbXNb
+MHgleDoweCV4XTogZG1hcSAweCV4IHJlYWQgJXUgcGYgJXUgZXFpZF9hcGkgJXUgcmV0ICVkCgAA
+AAAAAAAAAAAAAAAAAAlBUV9UYWtlQ29udHJvbE9mRkxBU0g6IDFlLmMwMDE9JSN4IDFlLmM0NTA9
+JSN4IDFlLmM0NTE9JSN4IDFlLjEwMD0lI3gKAAAAAAAAAAAAQVFfQVBJX1dyaXRlQW5kVmVyaWZ5
+Rmxhc2hJbWFnZSAtIEltYWdlIGludGVncml0eSBjaGVjayBmYWlsZWQgKGNhbGMgJSN4IHZhbCAl
+I3gpCgAAAAAAAAAAAAAAAAAAQVFfQVBJX1dyaXRlQW5kVmVyaWZ5Rmxhc2hJbWFnZSAtIEltYWdl
+IGludGVncml0eSBjaGVjayBwYXNzZWQKAEFRX0FQSV9Xcml0ZUFuZFZlcmlmeUZsYXNoSW1hZ2Ug
+LSBUaW1lb3V0IHdhaXRpbmcgZm9yIGZsYXNoIGludGVyZmFjZSAoJXUpCgAAAAAAQVFfQVBJX1dy
+aXRlQW5kVmVyaWZ5Rmxhc2hJbWFnZSAtIFRpbWVvdXQgd2FpdGluZyBmb3IgZmxhc2ggaW50ZXJm
+YWNlICgldSkKAAAAAABBUV9BUElfV3JpdGVBbmRWZXJpZnlGbGFzaEltYWdlIC0gVGltZW91dCB3
+YWl0aW5nIGZvciBmbGFzaCBpbnRlcmZhY2UgKCV1KQoAAAAAAEFRX0FQSV9Xcml0ZUFuZFZlcmlm
+eUZsYXNoSW1hZ2UgLSBUaW1lb3V0IHdhaXRpbmcgZm9yIGZsYXNoIGludGVyZmFjZSAoJXUpIChw
+cCAlI3ggYXAgJSN4KQoAAAAAAEFRX0FQSV9Xcml0ZUFuZFZlcmlmeUZsYXNoSW1hZ2UgLSBUaW1l
+b3V0IHdhaXRpbmcgZm9yIGZsYXNoIGludGVyZmFjZSAoJXUpCgAAAAAAQVFfQVBJX1dyaXRlQW5k
+VmVyaWZ5Rmxhc2hJbWFnZSAtIFRpbWVvdXQgd2FpdGluZyBmb3IgZmxhc2ggaW50ZXJmYWNlICgl
+dSkKAAAAAABBUV9BUElfV3JpdGVBbmRWZXJpZnlGbGFzaEltYWdlIC0gRXJyb3Igb24gYnVybmlu
+ZyBGTEFTSCAoY3JjMTYgbWlzbWF0Y2gpCgAAAAAAAGh3X21hX2FkZHJfdG9fbWVtX3R5cGVfb2Zm
+OiBNQSBhZGRyZXNzIDB4JTA4eCBpcyBub3QgbWFwcGVkCgAAAABod19tYV9hZGRyX3RvX21lbV90
+eXBlX29mZjogTUEgYWRkcmVzcyAweCUwOHggbWFwcyB0byB0eXBlICV1IG9mZnNldCAweCV4CgAA
+AAAAAG1lbV9tYWxsb2NfdGVtcDogZmFpbGVkIHRvIGFsbG9jYXRlICV1IGJ5dGVzLCByZXR1cm5p
+bmcgTlVMTAoAAABtZW1fbWFsbG9jOiBmYWlsZWQgdG8gYWxsb2NhdGUgJXUgYnl0ZXMsIHJldHVy
+bmluZyBOVUxMCgAAAAAAAAAAbGUgY29uZmlndXJhdGlvbjogaGFzaCBtb2RlIHJlcXVpcmVzIGF0
+IGxlYXN0IDE2IGVudHJpZXMsIG5oYXNoICV1CgAAAAAAAAAAAAAAAABsZSBjb25maWd1cmF0aW9u
+OiBoYXNoIG1vZGUgcmVxdWlyZXMgYXQgZW50cmllcyB0byBiZSBhIHBvd2VyIG9mIDIsIG5oYXNo
+ICV1CgAAAGxlIGNvbmZpZ3VyYXRpb246IHJlcXVlc3RlZCAldSB0Y2FtIGVudHJpZXMgYnV0IG9u
+bHkgJXUgYXZhaWxhYmxlIChucm91dGUgJXUgbmNsaXAgJXUgbmZpbHRlciAldSBuc2VydmVyICV1
+CgAAAABsZSBjb25maWd1cmF0aW9uOiB0Y2FtIHJlZ2lvbnMgbXVzdCBoYXZlIG11bHRpcGxlIG9m
+IDMyIGVudHJpZXMsIG5yb3V0ZSAldSBuY2xpcCAldSBuZmlsdGVyICV1IG5zZXJ2ZXIgJXUKAAAA
+AAAAb2ZsZCB0cCB0aW1lciBzZXR0aW5ncyBUUF9NU0wgMHglMDh4IFRQX1JYVF9NSU4gMHglMDh4
+IFRQX1JYVF9NQVggMHglMDh4IFRQX1BFUlNfTUlOIDB4JTA4eCBUUF9QRVJTX01BWCAweCUwOHgK
+ACAgICAgICAgICAgICAgICAgICAgICAgVFBfS0VFUF9JRExFIDB4JTA4eCBUUF9LRUVQX0lOVFZM
+IDB4JTA4eCBUUF9JTklUX1NSVFQuaW5pdF9zcnR0X21heHJ0dCAweCUwNHggVFBfSU5JVF9TUlRU
+LmluaXRfc3J0dF9pbml0c3J0dCAweCUwNHggVFBfRklOV0FJVDJfVElNRVIgMHglMDh4CgAAAAAA
+AAAAAAAAY29uZmlndXJhdGlvbiBmaWxlIHBhcnNlciBlbmNvdW50ZXJlZCBlcnJvciBAIGxpbmUg
+JXU6CgAAAAAAAAAAAGh3X2kyY190cmFuc2FjdGlvbjogbmRhdGEgJXUgYWRkcl9vcCAweCV4IGRh
+dGFbMF0gMHgleCBkaWZmICV1CgBod19pMmNfdHJhbnNhY3Rpb246IG5kYXRhICV1IGFkZHJfb3Ag
+MHgleCBkYXRhWzBdIDB4JXggZGlmZiAldSBkcG9zICV1IGNvbnQgJXUgZmFpbGVkIHdpdGggZXJy
+ICVkCgAAAAAAAAAAAAAAAAAAaTJjIHRyYW5zYWN0aW9uIGZhaWxlZCB0byBjb21wbGV0ZQoAAAAA
+AAAAAAAAAAAASE9TVCBQQUdFX1NJWkUgWzB4JTBseF0gdG9vIHNtYWxsLCBtaW4gWzB4JTBseF0g
+cmVxdWlyZWQKAAAAAAAAAHBhZ2Ugc2l6ZSBbJWx1XSBtaXNtYXRjaAoAAAAAAAAAUEFHRSBzaXpl
+ICVsdSB1bnN1cHBvcnRlZCwgZGRwIGRpc2FibGVkCgAAAAAAAAAASG9zdCBwYWdlX3NpemUgJWx1
+LCBkZHBfaWR4ICV1CgBGQ29FIEREUCBpbml0OiBmY29lIGxsaW1pdCAweCV4LCBmY29lIHVsaW1p
+dCAweCV4IGdibCBsbGltaXQgMHgleCBnYmwgdWxpbWl0IDB4JXggcGNic3ogJXgKAAAAAABGQ29F
+IEREUCBpbml0OiBmY29lIHBwb2Qgb2ZmIDB4JXgsIGZjb2Ugc3QgcHBvZCBhZGRyIDB4JXggZmNv
+ZSBudW0gcHBvZHMgMHgleAoAAGZjb2UgeGNoZyBtZ3IgaW5pdDogTnVtYmVyIG9mIGV4Y2hhbmdl
+cyBmb3IgRkNvRSBpcyAleAoAAAAAAAAAAABRU0ZQIG1vZHVsZSB1bnBsdWcgLSByZWluaXRpYWxp
+emluZyByeF9sb3MgIHRvIDB4ZmYKAAAAAAAAAAAAAAAAZ3Bpb19xc2ZwX21vZHVsZV91cGRhdGU6
+IGNoYW5nZWQgcnhfbG9zIGZyb20gMHgleCB0byAweCV4CgAAAAAAAGdwaW9fcXNmcF9tb2R1bGVf
+dXBkYXRlOiBjaGFuZ2VkIHR4X2RpcyBmcm9tIDB4JXggdG8gMHgleAoAAAAAAABDYWxjdWxhdGlv
+biBvdXQgb2YgYm91bmRzIGZ1cmluZyBpbml0OiAlI3ggJSN4ICUjeAoAAAAAAAAAAAAAAAAAaHdf
+c2dlX21hbWVtX2luaXQ6IGVuY291bnRlcmVkIGVycm9yICVkCgAAAAAAAAAAX2h3X3RwX3BnbW5n
+dDogdHhfcGFnZV9tYXggJXUgcnhfcGFnZV9tYXggJXUgcHN0cnVjdHMgJXUgc2l6ZSAldQoAAAAA
+AAAAAAAAAAAAAABtcGFydGl0aW9uX290aGVyc190b3RhbDogZGRwICV1IGRkcF9pc2NzaSAldSBz
+dGFnICV1IHBibCAldSBycSAldSBycXVkcCAldSAtPiAldQoAAAAAAAAAAAAAAAAAAABfbXBhcnRp
+dGlvbl9iYW5rc19tY1g6IG5iYW5rc19wbXR4ICV1ICgldU1CKSBuYmFua3NfcG1yeCAldSAoJXVN
+QikgbmJhbmtzX290aGVycyAldSAoJXVNQikgbmJhbmtzX2Z3ICV1ICgldU1CKQoAX21wYXJ0aXRp
+b25fYmFua3NfbWMxOiBuYmFua3NfcG10eCAldSAoJXVNQikgbmJhbmtzX2Z3ICV1ICgldU1CKQoA
+AAAAAAAAAAAAAAAAAABfbXBhcnRpdGlvbl9iYW5rc19tYzA6IG5iYW5rc19wbXJ4ICV1ICgldU1C
+KSBuYmFua3Nfb3RoZXIgJXUgKCV1TUIpCgAAAAAAAAAAAAAAAG1lbV9tYWxsb2NfaW50ZXJuYWw6
+IGZhaWxlZCB0byBhbGxvY2F0ZSAldSBieXRlcywgcmV0dXJuaW5nIE5VTEwKAAAAAAAAAAAAAAAA
+AAAAaHdfZWRjX2Jpc3RbJXVdOiBiaXN0X2NtZFsweCUwOHhdIGFkZHIgMHgleCBsZW4gMHgleAoA
+AAAAAAAAAAAAAGh3X2VkY19iaXN0WyV1XTogZG9uZSwgZW5jb3VudGVyZWQgJXUgZXJyb3JzIG9u
+IGZpcnN0IGFuZCAldSBlcnJvcnMgb24gc2Vjb25kIGF0dGVtcHQKAAAAAAAAAAAAAGh3X21jX2Jp
+c3Rfc3luY1sldV06IHdhaXRlZCAldW5zIGZvciBiaXN0IHRvIGNvbXBsZXRlCgAAAAAAAAAAAABt
+ZW1faW5pdF9jYWNoZXM6IGNhY2hlX3NpemUgJXUgZmxvd2NfYnVmX3RjYl9jYWNoZV9zaXplICV1
+IGJ1ZmxsNjRfY2FjaGVfc2l6ZSAldQoAAAAAAAAAAAAAAAAAAABxdWV1ZXNfcGVyX3BhZ2U6IHBm
+ICV1IGhhcyBhIGJhcnNpemUgb2YgJXUtYnl0ZXMsIG9jcV9zaXplICV1CgAAc2dlIHJlcXVpcmUg
+bmVxICV1IG5pcSAldSByb3VuZGluZyB0byAldSAldQoAAAAAbXBhcnRpdGlvbl9wbXR4OiBtIDB4
+JTA4eCBzaXplICV1CgAAAAAAAAAAAAAAAAAAbXBhcnRpdGlvbl9wbXJ4OiBtIDB4JTA4eCBzaXpl
+ICV1CgAAAAAAAAAAAAAAAAAAbXBhcnRpdGlvbl9lZGMgKG5vIGV4dG1lbSk6IG0gMHglMDh4IHNp
+emUgJXUKAAAAbXBhcnRpdGlvbl9lZGNfZXN0aW1hdGU6IGh3IG1vZHVsZXMgcmVxdWlyZSAlZCBi
+eXRlcyBpbiBFREMKAAAAAGZvaXNjc2lfYnllOmwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGwy
+ZGV2X2ZjLT5mbG93Y19wY2llX3BmbiBbMHgleF0sIGwyZGV2X2ZjLT5mbG93Y19wY2llX3ZmbiBb
+MHgleF0sIHBvcnQgWzB4JXhdCgAAAAAAAAAAAAAAZm9pc2NzaV9ieWU6dmxhbmRldl9mYy0+Zmxv
+d2NfaWQgWzB4JXhdLCB2bGFuZGV2X2ZjLT5mbG93Y19wY2llX3BmbiBbMHgleF0sIHZsYW5kZXZf
+ZmMtPmZsb3djX3BjaWVfdmZuIFsweCV4XSwgcG9ydCBbMHgleF0KAAAAAABod194Z21fbGVkX2xp
+bmtfdXAgbGVkMCBjb25maWc6ICV1CgAAAAAAAAAAAAAAAABod194Z21fbGVkX2xpbmtfdXAgbGVk
+MSBjb25maWc6ICV1CgAAAAAAAAAAAAAAAABoc3Nfc2lnZGV0WyV1XTogaHNzX3NpZ2RldCBjaGFu
+Z2VkIHRvIDB4JXgKAAAAAABwZm4gJXUgdmZuICV1IGhhcyBwbmR0eG5zICV1IGFmdGVyIDEwMG1z
+CgAAAAAAAABiYWQgbWFpbGJveCBjbWQ6IHBmbiAweCV4IHZmbiAweCV4OyBvcGNvZGUgMHgleCA+
+IExBU1RDMkUgMHgleAoAbWFpbGJveCBjbWQgbm90IHlldCBzdXBwb3J0ZWQ6IHBmbiAweCV4IHZm
+biAweCV4OyBvcGNvZGUgMHgleAoAAGJhZCBtYWlsYm94IGNtZDogcGZuIDB4JXggdmZuIDB4JXg7
+IG9wY29kZSAweCV4IGlzIHZhbGlkIHBvc3QgZGV2aWNlIGluaXQgb25seQoAYmFkIG1haWxib3gg
+Y21kOiBwZm4gMHgleCB2Zm4gMHgleDsgb3Bjb2RlIDB4JTAyeCByYW1hc2sgMHgleCBjbWQgcmFt
+YXNrIDB4JXgKAABiYWQgbWFpbGJveCBjbWQ6IHBmbiAweCV4IHZmbiAweCV4OyBvcGNvZGUgMHgl
+MDJ4IGxlbjE2IDB4JXggdmVyc3VzIGV4cGVjdGVkIGxlbjE2IDB4JXgKAAAAAAAAAABpbnN1ZmZp
+Y2llbnQgY2FwcyB0byBwcm9jZXNzIG1haWxib3ggY21kOiBwZm4gMHgleCB2Zm4gMHgleDsgcl9j
+YXBzIDB4JXggd3hfY2FwcyAweCV4IHJlcXVpcmVkIHJfY2FwcyAweCV4IHdfY2FwcyAweCV4CgAA
+AAAAAAAAAGluc3VmZmljaWVudCBjYXBzIHRvIHByb2Nlc3MgbWFpbGJveCBjbWQ6IHBmbiAweCV4
+IHZmbiAweCV4OyByX2NhcHMgMHgleCB3eF9jYXBzIDB4JXggcmVxdWlyZWQgcl9jYXBzIDB4JXgg
+d19jYXBzIDB4JXgKAAAAAAAAAAAAVlBEIHJlZ2lvbiBpcyB0b28gc21hbGwgKFNFUkNGR19TUl9Q
+Rk5WUERTSVpFIDB4JXgpCgAAAAAAAAAAAAAAAGNmOiBmYWlsZWQgdG8gYWxsb2NhdGVkIG1lbW9y
+eSBmb3IgY29uZmlndXJhdGlvbiBmaWxlLCByZXQgJWQKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAASAAAAAAAAAAggAAAQAAAAAAAAAA
+gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoCAAAAAAAAAAAAAAAAAgAAAAAAAAAAA
+AoAAAAAAAAAAAAACAAMAAAAAAWAIAAAAAAMAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAIAAAAAAAAA
+AAAgAAAAAAAAAAAAAAABAAOAAAAAAAAAAAAAAAIAAAAAAAAAAAAgA4AAAAAAAAAAAAAQAoAAgAAA
+AAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAKAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAKA
+AAAAAAAAAAABAAMAAAAAAAAAAAAAAoMAAAAAAAAAAAAQAoAAAAAAAAAAAAAwAAMAAAAAAAAIAAAw
+AAMAAAAAAAAAAAAwBYMAAAAAAAAIAAAwBYMAAAAAAAAAAAAwBIMAAAAAAAAIAAAwBIMAAAAAAAAA
+AAAwAwMAAAAAAAAIAAAwAwMAAAAAAAAAAAA4AwMAAAAAAAAAAAA4BYMAAAAAAAAAAAA4BIMAAAAA
+AAAAAAA4AAMAAAAAAAAAAAA0BoIAAAAAAAAAAAA8A4IAAAAAAAAAAAA8AAMAAAAAAAAIAAA8AAMA
+AAAAAAAAAAA8BIMAAAAAAAAAAAA8BQMAAAAAAAAAAAA9BAMAAAAAAAAAAAA8A4MAAAAAAAAAAAAs
+AAIAAAAAAAAAAAAsBYIAAAAAAAAAAAAsBQIAAAAAAAAAAAAQBoAAAAAAAAAAAAAQBoLAAAAAAAAA
+AAAQBoKAAAAAAAAAAAAADoIAAAAAAAAAAAAQB4KAAAAAIAAAAAAAB4IAAAAAIAAAAAAQBwKAAAAA
+AAAAAAAQBwKAAAAAAAAAAAAQBwKAAAAAAAAAAAAABwIAAAAAIAAAAAAQF4MAAAAAAAAIAAAQF4MA
+AAAAAAAIAAAQAAAAAAAAAAAAAAAQBgOAAAAAAAAAAAAADgMAAAAAAAAAAAAQBgNAAAAAAAAAAAAQ
+BgMAAAAAAAAAAAAQBgAAAAAAAAAAAAAABgOAAAAAAAAAAAAABgMAAAAAAAAAAAAADgIAAAAAAAAA
+AAAADgIAAAAAAAAAAAAQBgIAAAAAAAAAAAAQBgIAAAAAAAAAAAAQBgKAAAAAAAAAAAAQBgKAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAEAMAAAAAAAAIAAAAAAAA
+AAAAAAAAAAD/////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////8AAAAgAAAAAMAAAAAAAAAgAAAAAOAAAAAAAAAAAgAA
+AAAAAABAAAAAAAAAAAAAAAAAAAEhAAAAAAAAAAAAAQEgAAAAAAAAAAAAAAIAAAAEAAQAAAAABQAA
+AAQAAAAAAAAAAACgAAAAAIAAAAAAgABAAAAAAAACAAAAgAAgAAAAAAACAAABAEAAAAAAAAAAAAAB
+AEIAAAAAAAAAAAAAACAAAAAAAAAAAAACECAAAAAAAAAAAAACDAIAAAAAAAAAAAAAhQIAAAAEAAAA
+AAAAgEIAAAAAAAAAAAACACIAAAAAAAAAAAAAgEEAAAAAAAAAAAAAgEGAAAAAAAAAAAACACEAAAAA
+AAAAAAAAECCAAAAAAAAAAAACJQCAAAAAAAAAAAAABQAAAAAAAAAAAAAIiASAAAAAAAAAAAAIiASA
+AAAAAAAAAAAIogCAAAAAAAAAAAAIogCAAAAAAAAAAAAIowCAAAAAAAAAAAAIowCAAAAAAAAAAAAI
+pICAAAAAAAAAAAAIpICAAAAAAAAAAAAEpIDAAAAAAAAAAAAEogDAAAAAAAAAAAAEowDAAAAAAAAA
+AAAEiATAAAAAAAAAAAAACQGAAAAAAAAAAAACDACAAAAAAAAAAAAAiATAAAAAAAAAAAAAiASAAAAA
+AAAAAAACCwCAAAAAAAAAAAAAioCAAAAAAAAAAAAAC4CAAAAAAAAAAAAAjACAAAAAAAAAAAACIBCA
+AAAAAAAAAAACCgCAAAAAAAAAAAACCoCAAAAAAAAAAAAACQKAAAAAAAAAAAAAAQEAAAAAAAAAAAAA
+AQFAAAAAAAAAAAAAAQCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAIEQAAAAAAAA
+AAAAAIEIAAAAAAAAAAAAAIEEAAAAAAAAAAAAAIGAAAAAAAAAAAAAgADAAAAAAAAAAAAAgACgAAAA
+AAAAAAAAAAgAAAAAAAAAAAAAgYAAAAAAAAAAAAAAgYCAAAAAAAAAAAAAiYCAAAAAAAAAAAAAiYDA
+AAAAAAAAAAAAAYIAAAAAAAAAAAACAYAAAAAAAAAAAAACAYCAAAAAAAAAAAAAQYGAAAAAAAAAAAAC
+AYGAAAAAAAAAAAAASYGAAAAAAAAAAAACCYGAAAAAAAAAAAACAYEAAAAAAAAAAAAAQYEAAAAAAAAA
+AAAgAAAAAAAAAAAAAAAQAAACAAAAAAAAAAAQAAAAAAAAAAAAAAAAgADAAAAAAAAAAAAAAAAAAAAA
+AAAAAAD/////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+//////////////////////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAkgAAAAAAAAAD
+ZgAgAEAAAAAACACSAAAAAAAAAANyASUEQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAAgAAAACAIgD
+hwAAVgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAAAAAAAA
+AAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAIAAAAAgCIA4UAAJYBIABAAAAAAAAA
+AAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAIAAAAAgCIA4UAAJYBIABAAAAA
+AAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAIAAAAAgCIA4UAAJYBIABA
+AAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAACAAOWACYEQAAAAAAIRyABBAAAArIAAtIF
+ICRAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAEcgAQYMoYKwQAGSBCAkQAAAAAAARyABBAygQrOA
+AhIFICRAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAACAAAAAIAiAOFAACWASAAQAAAAAAIAAAAAgCI
+A4UAAJYBIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAADcUSugKwgNMUVIviSkYkQAAAAAAFxRK6
+AreA0xRUi2JJpiRAAAAAAAXFEqIGsIDTFFSL4kpGJEAAAAAADcUSoga3gNMUVItiSaYkQAAAAAAF
+xRKiBrCA0xRUi+JKRiRAAAAAAA3FEqIGt4DTFFSLYkmmJEAAAAAABcUSogawgNMUVIviSkYkQAAA
+AAANxRKiBreA0xRUi2JJpiRAAAAAAAnEEKACAICQAACLYmnGJEAAAAAAAcQQoAawgJMGVItiacYk
+QAAAAAABxBCgBrCAkwZUi2JpxiRAAAAAAAHFELgGsICTFlSLYkjGJEAAAAAACKEQiAIAgVgSAAtS
+AKYkQAAAAAAJwBCQArCAAxZUipIBxiRAAAAAAAnAELgGsIADEJSL4gJGJEAAAAAACcAQuAK0gAMQ
+lItiAaYkQAAAAAAJwBC4ArSAAxCUi2IBpiRAAAAAAAnAELgCtIADEJSLYgGmJEAAAAAACcAQuAK0
+gAMQlItiAaYkQAAAAAABoBCQBrSAAxCUi2IBpiRAAAAAAAHAEIACsIADFFSKUgDGJEAAAAAAAcAQ
+gAKwgAMUVIpSAMYkQAAAAAABwBCAArCAAxRUilIAxiRAAAAAAAhHIAEEAAACsgAC0gUgJEAAAAAA
+AIEAAAIAhVgHQAtSAKYkQAAAAAAAgQAAAgCFWAdAC1IApiRAAAAAAAAAAAAEAKBAAYAB1gAgAEAA
+AAAAAAAAAAYAoYAAQAFWACAAQAAAAAAAAAAABACgQAGAAdYAIABAAAAAAAiBAAACAIVZgAQLUgCm
+JEAAAAAACWFAAAAAABgAAANCASakQAAAAAAIQAAAAAAAAAAAA1IBJiRAAAAAAAAAAAAEAKBAAYAB
+1gAgAEAAAAAACAAAAAIAiAOHAAPWACYEQAAAAAAIAAAAAgCIA4cAA9YAJgRAAAAAAAAAAAAAAAAA
+AAADlgAgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAAAAAAABACgQAGAAdYAIABAAAAAAAnAELgC
+tIADEJSLYgGmJEAAAAAAAAAAAAAAAAACAAOWACYEQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAAgA
+AAACAIgDhQAAlgEgAEAAAAAAAAAAAAQAoEABgAHWACAAQAAAAAAAAAAABACgQAGAAdYAIABAAAAA
+AAAAAAAEAKBAAYAB1gAgAEAAAAAACKEQiAIAgVgQAAkSAaYkQAAAAAAAAAAABACgQAGAAdYAIABA
+AAAAAAAAAAAGAKGAAEABVgAgAEAAAAAACAAAAAIAiAOFQAjSAkYkQAAAAAAJxRKiApSI0hCAiyJI
+piRAAAAAAAnAEIACpIgAh1SLUgGmJEAAAAAACcAQgAa0iAMBFItSAaYkQAAAAAANwAAAArCAwxZU
+i+IDRiRAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIADAABAAAAAIAAAIAJiRA
+AAAAAABHMAAGAyACtwAIAgHAJEAAAAAACAMAAAIGoAq1AAgCAMYkQAAAAAAAAAAAAAAAAAIAAAIA
+JiRAAAAAAAAgUAAEAAAAAgAAAgAmJEAAAAAACGAgAIQAAAAAAAAGACAAQAAAAAAIYCAAhAAAAAIB
+MAIAJiVAAAAAAAhgAAAEAIQBgAQEAgHGJMAAAAAAAcAAAAJDgAMCDIgCAaYkQAAAAAAIAGAABAAA
+AAIAAAIAJiRAAAAAAAgAYAAEAAAAAAAABAEgAEAAAAAAAAAAAAAAAAAAAAAEASAAQAAAAAAECBSA
+BgoAAAcBTAIgpiZAAAAAAAiAAAAGAIQBgAQIAgGmJkAAAAAAAEAAAAIAoAACQAgCAaYkQAAAAAAA
+AAAAAAAAAAIAAAIAJiRAAAAAAAQAAAAChAADAooIAgSmJEAAAAAAAAAAAAAAAAACAAAGASBIQAAA
+AAAAIFAABAAAAAIAAAIAJiRAAAAAAAhgIACEAAAAAgAABgAmBEAAAAAACGAgAIQAAAACAAACASYl
+QAAAAAAIYAAABACEAYAEBAIBxiTAAAAAAAgAYAAEAAAAAAAABAEgAEAAAAAAAAAAAAAAAAAAAAAC
+ACZMcAAAAAAAAAAAAAAAAAAAAAYBIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAcAA
+AAi0kAQJFgQCBMYkQAAAAAABwAAACLSQBAkWBAIExiRAAAAAAAQIdIBMCQAAUABcAmHmJEAAAAAA
+DAh0gEQAAABSAEACYSYkQAAAAAAIAhCgBAAAAAABAAIAJiRAAAAAAAgCEKAEAAAAAAEAAgAmJEAA
+AAAABAh0AEIBAAAHAIgCYMYkQAAAAAANyBQAAgkAAARAnAJg5iRAAAAAAAnIEIAGtJAEApSIAmXG
+JEAAAAAADch0AEi0kAMAlIgCYKYkwAAAAAANyHQASLSQAwCUiAJgpiTAAAAAAAhHAAAEAAAAAAAA
+AgEgJEAAAAAACEcAAAQAAAACAAACBSAkQAAAAAAARyABDAchwrcACAIBwCRAAAAAAABHIAEMByHC
+twAIAgHAJEAAAAAAAEcgAQwHIcK3AAgCAcAkQAAAAAAAACABCACEAAVAiAIBxiTAAAAAAAAAIAEI
+AIQABUCIAgHGJMAAAAAAAAAgAQgAhAAFQIgCAcYkwAAAAAAAACABhoIAAQLAiAIDxiTAAAAAAAAA
+IAGCggAAAsCIAgPGJMAAAAAACcAgAYKkgAEFQIgCAcYkwAAAAAAIAAAADACEAAVAiAIBxiTAAAAA
+AAAAIAGGggABAsCIAgPGJMAAAAAAAAAgAYKCAAAAwIgCAqYkwAAAAAAJwCABgqSAAQVAiAIBxiTA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAQABCQEAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAABbZ2xvYmFsXQpyc3NfZ2xiX2NvbmZpZ19tb2RlPWJhc2ljdmlydHVhbApy
+c3NfZ2xiX2NvbmZpZ19vcHRpb25zPXRubG1hcGVuLGhhc2h0b2VwbGl0eix0bmxhbGxsa3AKcmVn
+WzB4MTAwOF09MHg0MDgxMC8weDIxYzcwCnJlZ1sweDEwMGNdPTB4MjIyMjIyMjIKcmVnWzB4MTBh
+MF09MHgwMTA0MDgxMApyZWdbMHgxMDQ0XT00MDk2CnJlZ1sweDEwNDhdPTY1NTM2CnJlZ1sweDEw
+NGNdPTE1MzYKcmVnWzB4MTA1MF09OTAyNApyZWdbMHgxMDU0XT05MjE2CnJlZ1sweDEwNThdPTIw
+NDgKcmVnWzB4MTA1Y109MTI4CnJlZ1sweDEwNjBdPTgxOTIKcmVnWzB4MTA2NF09MTYzODQKcmVn
+WzB4MTBhNF09MHhhMDAwYTAwMC8weGYwMDBmMDAwCnJlZ1sweDEwYThdPTB4MjAwMC8weDIwMDAK
+c2dlX3RpbWVyX3ZhbHVlPTUsMTAsMjAsNTAsMTAwLDIwMApyZWdbMHg3ZDA0XT0weDAwMDEwMDAw
+LzB4MDAwMTAwMDAKcmVnWzB4N2RjMF09MHg2MmY4ODQ5CmZpbHRlck1vZGU9ZnJhZ21lbnRhdGlv
+bixtcHNoaXR0eXBlLHByb3RvY29sLHZsYW4scG9ydCxmY29lCmZpbHRlck1hc2s9cHJvdG9jb2ws
+ZmNvZQp0cF9wbXJ4PTM0CnRwX3BtcnhfcGFnZXNpemU9NjRLCnRwX25yeGNoPTAKdHBfcG10eD0z
+Mgp0cF9wbXR4X3BhZ2VzaXplPTY0Swp0cF9udHhjaD0wCnRwX210dXM9ODgsMjU2LDUxMiw1NzYs
+ODA4LDEwMjQsMTI4MCwxNDg4LDE1MDAsMjAwMiwyMDQ4LDQwOTYsNDM1Miw4MTkyLDkwMDAsOTYw
+MApbZnVuY3Rpb24iMCJdCm52Zj0xNgp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT0xCm5pcWZs
+aW50PTgKbmV0aGN0cmw9OApuZXE9MTYKbmV4YWN0Zj04CmNtYXNrPWFsbApwbWFzaz0weDEKW2Z1
+bmN0aW9uIjEiXQpudmY9MTYKd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9MQpuaXFmbGludD04
+Cm5ldGhjdHJsPTgKbmVxPTE2Cm5leGFjdGY9OApjbWFzaz1hbGwKcG1hc2s9MHgyCltmdW5jdGlv
+biIyIl0KbnZmPTE2Cnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTEKbmlxZmxpbnQ9OApuZXRo
+Y3RybD04Cm5lcT0xNgpuZXhhY3RmPTgKY21hc2s9YWxsCnBtYXNrPTB4NApbZnVuY3Rpb24iMyJd
+Cm52Zj0xNgp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT0xCm5pcWZsaW50PTgKbmV0aGN0cmw9
+OApuZXE9MTYKbmV4YWN0Zj04CmNtYXNrPWFsbApwbWFzaz0weDgKW2Z1bmN0aW9uIjQiXQp3eF9j
+YXBzPWFsbApyX2NhcHM9YWxsCm52aT0yOApuaXFmbGludD0xNzAKbmV0aGN0cmw9MTAwCm5lcT0y
+NTYKbmV4YWN0Zj00MApjbWFzaz1hbGwKcG1hc2s9YWxsCm5ldGhvZmxkPTEwMjQKbnJvdXRlPTMy
+Cm5jbGlwPTMyCm5maWx0ZXI9NDk2Cm5zZXJ2ZXI9NDk2Cm5oYXNoPTEyMjg4CnByb3RvY29sPW5p
+Y192bSxvZmxkLHJkZHAscmRtYWMsaXNjc2lfaW5pdGlhdG9yX3BkdSxpc2NzaV90YXJnZXRfcGR1
+CnRwX2wydD0zMDcyCnRwX2RkcD0zCnRwX2RkcF9pc2NzaT0yCnRwX3N0YWc9Mwp0cF9wYmw9MTAK
+dHBfcnE9MTMKW2Z1bmN0aW9uIjUiXQp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT00Cm5pcWZs
+aW50PTM0Cm5ldGhjdHJsPTMyCm5lcT02NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPWFsbApu
+c2VydmVyPTE2Cm5oYXNoPTIwNDgKdHBfbDJ0PTEwMjQKcHJvdG9jb2w9aXNjc2lfaW5pdGlhdG9y
+X2ZvZmxkCnRwX2RkcF9pc2NzaT0yCmlzY3NpX250YXNrPTIwNDgKaXNjc2lfbnNlc3M9MjA0OApp
+c2NzaV9uY29ubl9wZXJfc2Vzc2lvbj0xCmlzY3NpX25pbml0aWF0b3JfaW5zdGFuY2U9NjQKW2Z1
+bmN0aW9uIjYiXQp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT00Cm5pcWZsaW50PTM0Cm5ldGhj
+dHJsPTMyCm5lcT02NgpuZXhhY3RmPTMyCmNtYXNrPWFsbApwbWFzaz1hbGwKbmhhc2g9MjA0OApw
+cm90b2NvbD1mY29lX2luaXRpYXRvcgp0cF9kZHA9MQpmY29lX25mY2Y9MTYKZmNvZV9udm5wPTMy
+CmZjb2VfbnNzbj0xMDI0CltmdW5jdGlvbiIxMDIzIl0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApu
+dmk9NApjbWFzaz1hbGwKcG1hc2s9YWxsCm5leGFjdGY9OApuZmlsdGVyPTE2CltmdW5jdGlvbiIw
+LyoiXQp3eF9jYXBzPTB4ODIKcl9jYXBzPTB4ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3RybD0y
+Cm5lcT00Cm5leGFjdGY9NApjbWFzaz1hbGwKcG1hc2s9MHgxCltmdW5jdGlvbiIxLyoiXQp3eF9j
+YXBzPTB4ODIKcl9jYXBzPTB4ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3RybD0yCm5lcT00Cm5l
+eGFjdGY9NApjbWFzaz1hbGwKcG1hc2s9MHgyCltmdW5jdGlvbiIyLyoiXQp3eF9jYXBzPTB4ODIK
+cl9jYXBzPTB4ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3RybD0yCm5lcT00Cm5leGFjdGY9NApj
+bWFzaz1hbGwKcG1hc2s9MHg0CltmdW5jdGlvbiIzLyoiXQp3eF9jYXBzPTB4ODIKcl9jYXBzPTB4
+ODYKbnZpPTEKbmlxZmxpbnQ9NApuZXRoY3RybD0yCm5lcT00Cm5leGFjdGY9NApjbWFzaz1hbGwK
+cG1hc2s9MHg4Cltwb3J0IjAiXQpkY2I9cHBwLGRjYngKYmdfbWVtPTI1CmxwYmtfbWVtPTI1Cmh3
+bT0zMApsd209MTUKZHdtPTMwCltwb3J0IjEiXQpkY2I9cHBwLGRjYngKYmdfbWVtPTI1CmxwYmtf
+bWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCltwb3J0IjIiXQpkY2I9cHBwLGRjYngKYmdfbWVt
+PTI1CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCltwb3J0IjMiXQpkY2I9cHBwLGRj
+YngKYmdfbWVtPTI1CmxwYmtfbWVtPTI1Cmh3bT0zMApsd209MTUKZHdtPTMwCltmaW5pXQp2ZXJz
+aW9uPTB4MTQyNTAwMTAKY2hlY2tzdW09MHg1YTU1MjZjMwoAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAFtnbG9iYWxdCnJzc19nbGJfY29uZmlnX21vZGU9YmFzaWN2aXJ0dWFsCnJzc19nbGJf
+Y29uZmlnX29wdGlvbnM9dG5sbWFwZW4saGFzaHRvZXBsaXR6LHRubGFsbGxrcApyZWdbMHgxMDA4
+XT0weDQwODEwLzB4MjFjNzAKcmVnWzB4MTAwY109MHgyMjIyMjIyMgpyZWdbMHgxMGEwXT0weDAx
+MDQwODEwCnJlZ1sweDEwNDRdPTQwOTYKcmVnWzB4MTA0OF09NjU1MzYKcmVnWzB4MTA0Y109MTUz
+NgpyZWdbMHgxMDUwXT05MDI0CnJlZ1sweDEwNTRdPTkyMTYKcmVnWzB4MTA1OF09MjA0OApyZWdb
+MHgxMDVjXT0xMjgKcmVnWzB4MTA2MF09ODE5MgpyZWdbMHgxMDY0XT0xNjM4NApyZWdbMHgxMGE0
+XT0weGEwMDBhMDAwLzB4ZjAwMGYwMDAKcmVnWzB4MTBhOF09MHgyMDAwLzB4MjAwMApzZ2VfdGlt
+ZXJfdmFsdWU9NSwxMCwyMCw1MCwxMDAsMjAwCnJlZ1sweDdkMDRdPTB4MDAwMTAwMDAvMHgwMDAx
+MDAwMApyZWdbMHg3ZGMwXT0weDYyZjg4NDkKZmlsdGVyTW9kZT1mcmFnbWVudGF0aW9uLG1wc2hp
+dHR5cGUscHJvdG9jb2wsdmxhbixwb3J0LGZjb2UKZmlsdGVyTWFzaz1wcm90b2NvbCxmY29lCnRw
+X3Btcng9MzAKdHBfcG1yeF9wYWdlc2l6ZT02NEsKdHBfbnJ4Y2g9MAp0cF9wbXR4PTUwCnRwX3Bt
+dHhfcGFnZXNpemU9NjRLCnRwX250eGNoPTAKdHBfbXR1cz04OCwyNTYsNTEyLDU3Niw4MDgsMTAy
+NCwxMjgwLDE0ODgsMTUwMCwyMDAyLDIwNDgsNDA5Niw0MzUyLDgxOTIsOTAwMCw5NjAwCltmdW5j
+dGlvbiIwIl0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9MjgKbmlxZmxpbnQ9MTcwCm5ldGhj
+dHJsPTk2Cm5lcT0yNTIKbmV4YWN0Zj00MApjbWFzaz1hbGwKcG1hc2s9YWxsCm5ldGhvZmxkPTEw
+MjQKbnJvdXRlPTMyCm5jbGlwPTMyCm5maWx0ZXI9NDgKbnNlcnZlcj0zMgpuaGFzaD0wCnByb3Rv
+Y29sPW5pY192bSxvZmxkLHJkZHAscmRtYWMsaXNjc2lfaW5pdGlhdG9yX3BkdSxpc2NzaV90YXJn
+ZXRfcGR1CnRwX2wydD0zMDcyCnRwX2RkcD0yCnRwX2RkcF9pc2NzaT0yCnRwX3N0YWc9Mgp0cF9w
+Ymw9NQp0cF9ycT03CltmdW5jdGlvbiIxIl0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9NApu
+aXFmbGludD0zNApuZXRoY3RybD0zMgpuZXE9NjYKbmV4YWN0Zj0zMgpjbWFzaz1hbGwKcG1hc2s9
+YWxsCm5oYXNoPTAKcHJvdG9jb2w9ZmNvZV9pbml0aWF0b3IKdHBfZGRwPTIKZmNvZV9uZmNmPTE2
+CmZjb2VfbnZucD0zMgpmY29lX25zc249MTAyNApbZnVuY3Rpb24iMTAyMyJdCnd4X2NhcHM9YWxs
+CnJfY2Fwcz1hbGwKbnZpPTQKY21hc2s9YWxsCnBtYXNrPWFsbApuZXhhY3RmPTgKbmZpbHRlcj0x
+NgpbZnVuY3Rpb24iMC8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52aT0xCm5pcWZsaW50
+PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPTB4MQpbZnVuY3Rp
+b24iMS8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52aT0xCm5pcWZsaW50PTQKbmV0aGN0
+cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPTB4MgpbcG9ydCIwIl0KZGNiPXBw
+cCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209MzAKbHdtPTE1CmR3bT0zMApbcG9ydCIx
+Il0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209MzAKbHdtPTE1CmR3bT0z
+MApbcG9ydCIyIl0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209MzAKbHdt
+PTE1CmR3bT0zMApbcG9ydCIzIl0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpo
+d209MzAKbHdtPTE1CmR3bT0zMApbZmluaV0KdmVyc2lvbj0weDE0MjUwMDEwCmNoZWNrc3VtPTB4
+OTBmNjQ3ZjgKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAA
+====
diff --git a/sys/dev/cxgbe/firmware/t4fw_cfg.txt b/sys/dev/cxgbe/firmware/t4fw_cfg.txt
index be55453a641..4e7130f682c 100644
--- a/sys/dev/cxgbe/firmware/t4fw_cfg.txt
+++ b/sys/dev/cxgbe/firmware/t4fw_cfg.txt
@@ -14,10 +14,14 @@
 
 	sge_timer_value = 1, 5, 10, 50, 100, 200	# usecs
 
+	# enable TP_OUT_CONFIG.IPIDSPLITMODE
+	reg[0x7d04] = 0x00010000/0x00010000
+
 	# TP_SHIFT_CNT
 	reg[0x7dc0] = 0x62f8849
 
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
+	filterMask = protocol, fcoe
 
 	# TP rx and tx channels (0 = auto).
 	tp_nrxch = 0
@@ -29,6 +33,9 @@
 	tp_pmrx_pagesize = 64K
 	tp_pmtx_pagesize = 64K
 
+	# TP OFLD MTUs
+	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
+
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.  Not used here at all.
 [function "0"]
@@ -141,7 +148,7 @@
 
 [fini]
 	version = 0x1
-	checksum = 0x6cc2514b
+	checksum = 0x6f516705
 #
 # $FreeBSD$
 #
diff --git a/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt b/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
index 30a9f9fbe3f..1c81f2aa359 100644
--- a/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
+++ b/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt
@@ -1,6 +1,6 @@
 # Chelsio T4 Factory Default configuration file.
 #
-# Copyright (C) 2010-2012 Chelsio Communications.  All rights reserved.
+# Copyright (C) 2010-2013 Chelsio Communications.  All rights reserved.
 #
 #   DO NOT MODIFY THIS FILE UNDER ANY CIRCUMSTANCES.  MODIFICATION OF
 #   THIS FILE WILL RESULT IN A NON-FUNCTIONAL T4 ADAPTER AND MAY RESULT
@@ -109,17 +109,23 @@
 	reg[0x10a8] = 0x2000/0x2000	# SGE_DOORBELL_CONTROL
 	sge_timer_value = 5, 10, 20, 50, 100, 200 # SGE_TIMER_VALUE* in usecs
 
+	# enable TP_OUT_CONFIG.IPIDSPLITMODE
+	reg[0x7d04] = 0x00010000/0x00010000
+
 	reg[0x7dc0] = 0x62f8849		# TP_SHIFT_CNT
 
-	# Selection of tuples for LE filter lookup, fields (and widths which
-	# must sum to <= 36): { IP Fragment (1), MPS Match Type (3),
-	# IP Protocol (8), [Inner] VLAN (17), Port (3), FCoE (1) }
-	#
+	# TP_VLAN_PRI_MAP to select filter tuples
+	# filter tuples : fragmentation, mpshittype, macmatch, ethertype,
+	#		  protocol, tos, vlan, vnic_id, port, fcoe
+	# valid filterModes are described the Terminator 4 Data Book
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 
+	# filter tuples enforced in LE active region (equal to or subset of filterMode)
+	filterMask = protocol, fcoe
+
 	# Percentage of dynamic memory (in either the EDRAM or external MEM)
 	# to use for TP RX payload
-	tp_pmrx = 30
+	tp_pmrx = 34 
 
 	# TP RX payload page size
 	tp_pmrx_pagesize = 64K
@@ -129,7 +135,7 @@
 
 	# Percentage of dynamic memory (in either the EDRAM or external MEM)
 	# to use for TP TX payload
-	tp_pmtx = 50
+	tp_pmtx = 32
 
 	# TP TX payload page size
 	tp_pmtx_pagesize = 64K
@@ -137,6 +143,9 @@
 	# TP number of TX channels
 	tp_ntxch = 0		# 0 (auto) = equal number of ports
 
+	# TP OFLD MTUs
+	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
+
 # Some "definitions" to make the rest of this a bit more readable.  We support
 # 4 ports, 3 functions (NIC, FCoE and iSCSI), scaling up to 8 "CPU Queue Sets"
 # per function per port ...
@@ -361,11 +370,11 @@
 	nhash = 12288		# number of hash region entries
 	protocol = nic_vm, ofld, rddp, rdmac, iscsi_initiator_pdu, iscsi_target_pdu
 	tp_l2t = 3072
-	tp_ddp = 2
+	tp_ddp = 3
 	tp_ddp_iscsi = 2
-	tp_stag = 2
-	tp_pbl = 5
-	tp_rq = 7
+	tp_stag = 3
+	tp_pbl = 10
+	tp_rq = 13
 
 # We have FCoE and iSCSI storage functions on PF5 and PF6 each of which may
 # need to have Virtual Interfaces on each of the four ports with up to NCPUS
@@ -405,7 +414,7 @@
 	pmask = all		# access to all four ports ...
 	nhash = 2048
 	protocol = fcoe_initiator
-	tp_ddp = 2
+	tp_ddp = 1
 	fcoe_nfcf = 16
 	fcoe_nvnp = 32
 	fcoe_nssn = 1024
@@ -520,8 +529,8 @@
 	dwm = 30
 
 [fini]
-	version = 0x1425000d
-	checksum = 0x25c2f782
+	version = 0x14250010
+	checksum = 0x5a5526c3
 
 # Total resources used by above allocations:
 #   Virtual Interfaces: 104
diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h b/sys/dev/cxgbe/firmware/t4fw_interface.h
index d9e49979cd9..93e99778e9b 100644
--- a/sys/dev/cxgbe/firmware/t4fw_interface.h
+++ b/sys/dev/cxgbe/firmware/t4fw_interface.h
@@ -75,6 +75,19 @@ enum fw_retval {
 	FW_SCSI_TASK_ERR	= 142,	/* No SCSI tasks available */
 };
 
+/******************************************************************************
+ *   M E M O R Y   T Y P E s
+ ******************************/
+
+enum fw_memtype {
+	FW_MEMTYPE_EDC0		= 0x0,
+	FW_MEMTYPE_EDC1		= 0x1,
+	FW_MEMTYPE_EXTMEM	= 0x2,
+	FW_MEMTYPE_FLASH	= 0x4,
+	FW_MEMTYPE_INTERNAL	= 0x5,
+	FW_MEMTYPE_EXTMEM1	= 0x6,
+};
+
 /******************************************************************************
  *   W O R K   R E Q U E S T s
  ********************************/
@@ -85,6 +98,7 @@ enum fw_wr_opcodes {
 	FW_ULPTX_WR		= 0x04,
 	FW_TP_WR		= 0x05,
 	FW_ETH_TX_PKT_WR	= 0x08,
+	FW_ETH_TX_PKT2_WR	= 0x44,
 	FW_ETH_TX_PKTS_WR	= 0x09,
 	FW_ETH_TX_UO_WR		= 0x1c,
 	FW_EQ_FLUSH_WR		= 0x1b,
@@ -566,6 +580,64 @@ struct fw_eth_tx_pkt_wr {
 #define G_FW_ETH_TX_PKT_WR_IMMDLEN(x)	\
     (((x) >> S_FW_ETH_TX_PKT_WR_IMMDLEN) & M_FW_ETH_TX_PKT_WR_IMMDLEN)
 
+struct fw_eth_tx_pkt2_wr {
+	__be32 op_immdlen;
+	__be32 equiq_to_len16;
+	__be32 r3;
+	__be32 L4ChkDisable_to_IpHdrLen;
+};
+
+#define S_FW_ETH_TX_PKT2_WR_IMMDLEN	0
+#define M_FW_ETH_TX_PKT2_WR_IMMDLEN	0x1ff
+#define V_FW_ETH_TX_PKT2_WR_IMMDLEN(x)	((x) << S_FW_ETH_TX_PKT2_WR_IMMDLEN)
+#define G_FW_ETH_TX_PKT2_WR_IMMDLEN(x)	\
+    (((x) >> S_FW_ETH_TX_PKT2_WR_IMMDLEN) & M_FW_ETH_TX_PKT2_WR_IMMDLEN)
+
+#define S_FW_ETH_TX_PKT2_WR_L4CHKDISABLE	31
+#define M_FW_ETH_TX_PKT2_WR_L4CHKDISABLE	0x1
+#define V_FW_ETH_TX_PKT2_WR_L4CHKDISABLE(x)	\
+    ((x) << S_FW_ETH_TX_PKT2_WR_L4CHKDISABLE)
+#define G_FW_ETH_TX_PKT2_WR_L4CHKDISABLE(x)	\
+    (((x) >> S_FW_ETH_TX_PKT2_WR_L4CHKDISABLE) & \
+     M_FW_ETH_TX_PKT2_WR_L4CHKDISABLE)
+#define F_FW_ETH_TX_PKT2_WR_L4CHKDISABLE	\
+    V_FW_ETH_TX_PKT2_WR_L4CHKDISABLE(1U)
+
+#define S_FW_ETH_TX_PKT2_WR_L3CHKDISABLE	30
+#define M_FW_ETH_TX_PKT2_WR_L3CHKDISABLE	0x1
+#define V_FW_ETH_TX_PKT2_WR_L3CHKDISABLE(x)	\
+    ((x) << S_FW_ETH_TX_PKT2_WR_L3CHKDISABLE)
+#define G_FW_ETH_TX_PKT2_WR_L3CHKDISABLE(x)	\
+    (((x) >> S_FW_ETH_TX_PKT2_WR_L3CHKDISABLE) & \
+     M_FW_ETH_TX_PKT2_WR_L3CHKDISABLE)
+#define F_FW_ETH_TX_PKT2_WR_L3CHKDISABLE	\
+    V_FW_ETH_TX_PKT2_WR_L3CHKDISABLE(1U)
+
+#define S_FW_ETH_TX_PKT2_WR_IVLAN	28
+#define M_FW_ETH_TX_PKT2_WR_IVLAN	0x1
+#define V_FW_ETH_TX_PKT2_WR_IVLAN(x)	((x) << S_FW_ETH_TX_PKT2_WR_IVLAN)
+#define G_FW_ETH_TX_PKT2_WR_IVLAN(x)	\
+    (((x) >> S_FW_ETH_TX_PKT2_WR_IVLAN) & M_FW_ETH_TX_PKT2_WR_IVLAN)
+#define F_FW_ETH_TX_PKT2_WR_IVLAN	V_FW_ETH_TX_PKT2_WR_IVLAN(1U)
+
+#define S_FW_ETH_TX_PKT2_WR_IVLANTAG	12
+#define M_FW_ETH_TX_PKT2_WR_IVLANTAG	0xffff
+#define V_FW_ETH_TX_PKT2_WR_IVLANTAG(x)	((x) << S_FW_ETH_TX_PKT2_WR_IVLANTAG)
+#define G_FW_ETH_TX_PKT2_WR_IVLANTAG(x)	\
+    (((x) >> S_FW_ETH_TX_PKT2_WR_IVLANTAG) & M_FW_ETH_TX_PKT2_WR_IVLANTAG)
+
+#define S_FW_ETH_TX_PKT2_WR_CHKTYPE	8
+#define M_FW_ETH_TX_PKT2_WR_CHKTYPE	0xf
+#define V_FW_ETH_TX_PKT2_WR_CHKTYPE(x)	((x) << S_FW_ETH_TX_PKT2_WR_CHKTYPE)
+#define G_FW_ETH_TX_PKT2_WR_CHKTYPE(x)	\
+    (((x) >> S_FW_ETH_TX_PKT2_WR_CHKTYPE) & M_FW_ETH_TX_PKT2_WR_CHKTYPE)
+
+#define S_FW_ETH_TX_PKT2_WR_IPHDRLEN	0
+#define M_FW_ETH_TX_PKT2_WR_IPHDRLEN	0xff
+#define V_FW_ETH_TX_PKT2_WR_IPHDRLEN(x)	((x) << S_FW_ETH_TX_PKT2_WR_IPHDRLEN)
+#define G_FW_ETH_TX_PKT2_WR_IPHDRLEN(x)	\
+    (((x) >> S_FW_ETH_TX_PKT2_WR_IPHDRLEN) & M_FW_ETH_TX_PKT2_WR_IPHDRLEN)
+
 struct fw_eth_tx_pkts_wr {
 	__be32 op_pkd;
 	__be32 equiq_to_len16;
@@ -773,9 +845,36 @@ struct fw_ofld_tx_data_wr {
 	__be32 op_to_immdlen;
 	__be32 flowid_len16;
 	__be32 plen;
-	__be32 tunnel_to_proxy;
+	__be32 lsodisable_to_proxy;
 };
 
+#define S_FW_OFLD_TX_DATA_WR_LSODISABLE		31
+#define M_FW_OFLD_TX_DATA_WR_LSODISABLE		0x1
+#define V_FW_OFLD_TX_DATA_WR_LSODISABLE(x)	\
+    ((x) << S_FW_OFLD_TX_DATA_WR_LSODISABLE)
+#define G_FW_OFLD_TX_DATA_WR_LSODISABLE(x)	\
+    (((x) >> S_FW_OFLD_TX_DATA_WR_LSODISABLE) & \
+     M_FW_OFLD_TX_DATA_WR_LSODISABLE)
+#define F_FW_OFLD_TX_DATA_WR_LSODISABLE	V_FW_OFLD_TX_DATA_WR_LSODISABLE(1U)
+
+#define S_FW_OFLD_TX_DATA_WR_ALIGNPLD		30
+#define M_FW_OFLD_TX_DATA_WR_ALIGNPLD		0x1
+#define V_FW_OFLD_TX_DATA_WR_ALIGNPLD(x)	\
+    ((x) << S_FW_OFLD_TX_DATA_WR_ALIGNPLD)
+#define G_FW_OFLD_TX_DATA_WR_ALIGNPLD(x)	\
+    (((x) >> S_FW_OFLD_TX_DATA_WR_ALIGNPLD) & M_FW_OFLD_TX_DATA_WR_ALIGNPLD)
+#define F_FW_OFLD_TX_DATA_WR_ALIGNPLD	V_FW_OFLD_TX_DATA_WR_ALIGNPLD(1U)
+
+#define S_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE	29
+#define M_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE	0x1
+#define V_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE(x)	\
+    ((x) << S_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE)
+#define G_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE(x)	\
+    (((x) >> S_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE) & \
+     M_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE)
+#define F_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE	\
+    V_FW_OFLD_TX_DATA_WR_ALIGNPLDSHOVE(1U)
+
 #define S_FW_OFLD_TX_DATA_WR_TUNNEL	19
 #define M_FW_OFLD_TX_DATA_WR_TUNNEL	0x1
 #define V_FW_OFLD_TX_DATA_WR_TUNNEL(x)	((x) << S_FW_OFLD_TX_DATA_WR_TUNNEL)
@@ -3396,6 +3495,8 @@ enum fw_caps_config_nic {
 	FW_CAPS_CONFIG_NIC_IDS		= 0x00000004,
 	FW_CAPS_CONFIG_NIC_UM		= 0x00000008,
 	FW_CAPS_CONFIG_NIC_UM_ISGL	= 0x00000010,
+	FW_CAPS_CONFIG_NIC_HASHFILTER	= 0x00000020,
+	FW_CAPS_CONFIG_NIC_ETHOFLD	= 0x00000040,
 };
 
 enum fw_caps_config_toe {
@@ -3424,15 +3525,6 @@ enum fw_caps_config_fcoe {
 	FW_CAPS_CONFIG_POFCOE_TARGET    = 0x00000010,
 };
 
-enum fw_memtype_cf {
-	FW_MEMTYPE_CF_EDC0		= 0x0,
-	FW_MEMTYPE_CF_EDC1		= 0x1,
-	FW_MEMTYPE_CF_EXTMEM		= 0x2,
-	FW_MEMTYPE_CF_FLASH		= 0x4,
-	FW_MEMTYPE_CF_INTERNAL		= 0x5,
-	FW_MEMTYPE_CF_EXTMEM1		= 0x6,
-};
-
 struct fw_caps_config_cmd {
 	__be32 op_to_write;
 	__be32 cfvalid_to_len16;
@@ -5924,6 +6016,7 @@ enum fw_port_mod_sub_type {
 	FW_PORT_MOD_SUB_TYPE_AQ1202=0x3,
 	FW_PORT_MOD_SUB_TYPE_88x3120=0x4,
 	FW_PORT_MOD_SUB_TYPE_BCM84834=0x5,
+	FW_PORT_MOD_SUB_TYPE_BCM5482=0x6,
 	FW_PORT_MOD_SUB_TYPE_BT_VSC8634=0x8,
 
 	/*
@@ -7627,13 +7720,13 @@ enum fw_hdr_chip {
 
 enum {
 	T4FW_VERSION_MAJOR	= 0x01,
-	T4FW_VERSION_MINOR	= 0x08,
-	T4FW_VERSION_MICRO	= 0x0b,
+	T4FW_VERSION_MINOR	= 0x09,
+	T4FW_VERSION_MICRO	= 0x0c,
 	T4FW_VERSION_BUILD	= 0x00,
 
 	T5FW_VERSION_MAJOR	= 0x01,
-	T5FW_VERSION_MINOR	= 0x08,
-	T5FW_VERSION_MICRO	= 0x16,
+	T5FW_VERSION_MINOR	= 0x09,
+	T5FW_VERSION_MICRO	= 0x0c,
 	T5FW_VERSION_BUILD	= 0x00,
 };
 
diff --git a/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu b/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu
deleted file mode 100644
index bfc993f97b1..00000000000
--- a/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu
+++ /dev/null
@@ -1,8112 +0,0 @@
-/*-
- * Copyright (c) 2013 Chelsio Communications, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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.
- */
-begin-base64 644 t5fw
-AAEDhAEIFgAAAQQFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAA2kDeAN/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAENoZWxzaW8gRlcgUlVOTUVNIERFQlVHPTAgKEJ1aWx0IE1vbiBKdWwgIDEgMTI6
-MDk6MzEgUERUIDIwMTMgb24gY2xlb3BhdHJhLmFzaWNkZXNpZ25lcnMuY29tOi9ob21lL2Zpcm13
-YXJlL2N2cy9mdy1yZWxlYXNlKSwgVmVyc2lvbiBUNXh4IDAxLjA4LjE2LjAwAAAAAAAAAErb7x1g
-AMAAH/zhSOEAMLh4////H/zhQIAAAAHhAHtwAAAQAB//9sggAAAA4QGcBOEFAAAAAgBA4QUIAAAG
-AEAAAgAMAAYADOEFAAQACgAAgAABAuEAezzhAHtE4QB75OIAAAAAAQAA4QB7kCAAAAAAAIAA4QB7
-AAAAQAHhAHucAABAAERERELgAAAA4wAEc0REREDjAAgAIAACXAAAAAAf/49gAAAAAB//j2QAAAAA
-H/+PaAAAAAAf/49sH//AAAAAAAAAAAAAwAAR/88iCoeSEIIQEv/OE//OhCAEMwGTIBH/zBL/zZIQ
-Ef/MEv/NkhAR/8wB9DEA5DEABTEBAgAS/8oC5zECFgAR/8iBEAEBX8AhAhEByRMR/8YS/8aSEBH/
-xhL/xpIQYAARAAAR/8AS/8SSEBH/wBL/w5IQgRAR/8LAIJIREv/BkhLAIJITEv/AkhCCEALyUGUv
-9xH/vscvkhAR/72SEBL/vRP/vZMgwDKTIRP/vJMigiIS/7sT/7uTICMiIRT/ugQzAck4E/+5gzAD
-gxQIMxEU/7ekM5MhE/+rkyJgAAjCMJMhE/+okyIS/7KQIJAhkCKQI5AkkCWQJpAnkCiQKZAqkCuQ
-LJAtkC6QLyAmECAmEYIiEv+lwDAtNzAtNzQtNzgtNzwjPQFyM+0AAgAS/6IjCgAvNwAvNxAvNyAv
-NzAjPQFyM+0AAgAS/5fAMCg3MCg3NCg3OCg3PCM9AXIz7QMCABL/lcAwJzcAJzcQJzcgJzcwIz0B
-cjPtAwIAEv+PFf+QFv+QwDDXIAVmAWAAHgAAAAAAAAAAAAAAAAQ2BQACANMP0w8FMwxuOxQHRxQH
-BEN2MeYENgUFMwxvO+0AAgAS/4EV/38jCgACJwIHBEMEPgUFMwwHRxRvO/ADAgAS/3vJLoMghCGF
-IrwidDsOhlC0VZYwtDN0M/Rj/+YAZT/iZV/fEv9vwDIDLgUDAgAS/2bAMCg3QCg3RCg3SCg3TCM9
-AXIz7QMCAAACABL/aS0nAMARAUkxAEgxAQIAwAAU/2UE0jEV/2SUUBT/ZATTMRX/ZJRQFP9jBNQx
-Ff9jlFAU/2ME1TEV/2KUUBD/YgMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAA
-H/wAAOMACfgf/AAAH/wAAOMACfgf/AAAH/wAAOMACfgf/4AAH/+H8OMACfgf/4fwH/+H8OMAEegf
-/4fwH/+H8OMAEegf/4fwH/+JoOMAEegf/4mgH/+PYOMAE5gf/49gH/+rjOMAGVgf/6uMH/+rjOMA
-NYQf/8AAH//3xeMANYQgAAAAIAABauMAbUwgAAF4IAABfOMAbrggAAF8IAABheMAbrwgAAGYIAAB
-nOMAbsggAAGcIAABpeMAbswgAAG4IAABvOMAbtggAAG8IAABxeMAbtwgAAHYIAAB2OMAbuggAAHc
-IAAB4uMAbuggAAH4IAAB+OMAbvAgAAH8IAAB/OMAbvAgAAIYIAACGOMAbvAgAAIcIAACHOMAbvAg
-AAI4IAACOOMAbvAgAAI8IAACPOMAbvAgAAJYIAACWOMAbvAgAAJcIAACYuMAbvAgAAJ4IAACeOMA
-bvggAAJ8IAACguMAbvggAAKYIAGDZuMAbwAgAoAAIAKXlOMB79AgApeUIAKXlOMCB2QgApeYIAXg
-GOMCB2ggBeAgIAXkAOMFT/AgBoAAIAaZwOMFU9AgBpnAIAd+UOMFbZAgB35QIAd/0OMGUiAgCMAA
-IAjAAOMGU6AgCMAAIAjAAOMGU6AgCMAAIAk9z+MGU6AAAAAAAAAAAAAAAAAgAA/uIAAP4CAAE/kg
-AA/gIAATZSAAD+AgABCVIAAS/SAAEoUgAA/gIAASMCAAEeIgABF1IAAPzSAAER8gAA/gIAAP4CAA
-D+AgABC1AAAAAP///////w/8///w////APwgAId9IACIpyAAiNggAIifIACIZSAAiF4gAIgiIACI
-GiAAiBIgAIfDIACI1iAAh7sgAIekAAAAAAAAAAAAAAAAAAAACgAAAAoAAAAUAAAACgAAAAoAAAAK
-AAAACgAAAAoAAAAKAAAAAAAAAAAAAAAAAAAIAAAAEAAAAEAAAAEAAAAACAAAABAAAABAAAABAAAA
-BAAAABAAAABAAAABAAAA/xgwYGAAAAD/AAECAgAAABAgQAAAAAAAAAAAAAAAAAAEAAIAAQAAgABA
-ACAAEAAIIAKO5AAAAAEgAo7oAAAAAiACkbQAAAD/IAKNBAAAAP8gAo0EAAAAACACkbQAAAAAIAKO
-HAAAAAEgAo4kAAAABCACjiwAAAAIIAKOOAAAABAgAo5AAAAAICACjkgAAABAIAKOUAAAAIAgAo5k
-AAABACACjngAAAIAIAKOkAAABAAgAo6kAAAIACACjrQAABAAIAKOwAAAIAAgAo7UAABAAAgEAgAA
-AAAAAAAAAAAAAAAgAo4IAAAAECACjhAAAAARIAKNiAAAAQAgAo2UAAAAgCACjaQAAABAIAKNtAAA
-ACAgAo3EAAAAECACjdQAAAAIIAKN4AAAAAQgAo3sAAAAAiACjfgAAAABAIDA/wAAAAAgAV5pIAFe
-/yABXikgAV7SIAFesSABXowgAV4/AAAAACAHZ1ggB2cSIAdnTiAHZ04gB2cSIAdnEiAHZ1ggB2dY
-IAdnEiAHZ1ggB2cSIAdnWCAHZ04gB2cSIAdnEiAHZxIgB2cSIAdnEiAHZ1ggB2cSIAdnEiAHZxIg
-B2cSIAdnEiAHZ1ggB2dYIAdnWCAHZ1ggB2dYIAdnWCAHZ1ggB2dYIAdnEiAHZxIgB2cSIAdnEiAH
-ZxIgB2cSIAdnEiAHZxIgB2cSIAdnEiAHZxIgB2cSIAdnEiAHZxIgB2cSIAdnEgACAgUFCAgLCw4O
-EREUFBcXGhodHSAgIyMmJikpLCwvLzIyNTU4ODs7AAAAAAAAAAEDEREICBAJAwEAAAAAAAAgA+38
-IAFGcCAANdAgASw4IAFCWCABPRAgARGoIAMgtB//5Wgf/+IkIACJZB//1tAgAFmwIABM2AAAAAAA
-AAAAIAEtmCAAd9gAAAAAAAAAAB//0ewf/8WIH//DZB//wXAgAElEIABB5CAAQEggAIBwH//bSCAF
-sRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAFMcCABNhggAJCsIACP
-0B//6ggf/804H//J0CAAdZAgBET4IAD1eCAA2JAgAMP4IAC+KCAArmggAKTcIACSpCAD8BwgAz4w
-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
-AE01oAAASLkf/5UcH/+ZHOEALgAf/5kg4QMGAP//v//hAA4AH/+aJAAAC2gf/5toH/+bZAAADaAA
-AP+AH/+bXB//m8gD/wAA/7///x/8v/88AAAAAAf//4MAAAAgCQuwIAF2KB//msQAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAACBgAAAAAAAAB//9NAf//TQH//0kB//9JAf//SQH//0kB//7mAf//K0H//w8B//8PAf//Dw
-IAWy+AAAAAAAAAAAAAAAAAAAAAAgBbVoIAW1aAAAAAAAAAAAAAAAAAAAAAAgAWA8IAWy+B//87Qf
-//O0H//ztB//87Qf//O0H//ztAAAAAAf/+5oAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAAAAAAAAAAA
-AAAEAAAAAAAAAIGAAAAAAAAQBAAAAAAAAAKBAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-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
-cJmh0Q8cgb6cMIsg+LsRAAEQYDD0NgIqCQBm8Jsx0Q9sEARkIGJkMF9kUFyIIvmBqhA+AlDw+koU
-AE8AtiAECEcMiBGpiCmCOnqTQCyCORmByfjMAAA3ADcgAAmLbakCAEhhHoGinsCNIJpQG4Gj88YD
-LYAEP2D7xgIsCQBusP3GASAgAhMw0Q/AINEP2iD7TBgiAABgsFv94cAg0Q8AACAC0HUgAtCLIALS
-GCAC0qcgAtMnIALToiAC1JggAtVUARAYAQABAAAAAAAAAAAAACADZuIgA2biIANk7iADZuIgA2Tu
-IANmvSADZpYgA2TuIANlySADZO4gA2TuIANlwCADZO4gA2biIANk7iADZO4gA2biIANk+wAAAAAA
-AAAAAwEAAgAAAAAAAAAAAAAAACAD5fIgA+YgIAPnpCAD5fIgA+ecIAPnhSAD5fIgA+XyIAPl8iAD
-5fIgA+XyIAPl8iAD5fIgA+XyIAPl8iAD5fIgA+d6IAPnbyAD5fIgA+XyIAPl8iAD5fIgA+XyIAPl
-8iAD5fIgA+XyIAPl8iAD5fIgA+XyIAPl8iAD5fIgA+XyIAPnRCAD5fIgA+c8IAPnPCAD5fIgA+Xy
-IAPnHyAD5fIgA+c8IAPl8iAD5fIgA+XyIAPl8iAD5fIgA+XyIAPl8iAD5fIgA+XyIAPl8iAD5fIg
-A+XyIAPl8iAD5fIgA+XyIAPl8iAD5fIgA+XyIAPl8iAD5fIgA+XyIAPl8iAD5fIgA+cCAAAAAAAA
-AAAAAAAAIAQD2CAEA9ggBAMkIAQD2CAD/uggBAPQIAQDriAD/uggA/7oIAP+6CAD/uggA/7oIAQD
-ByAEA9ggA/7oIAQDByAEA9gAAAAAAAAAAAAAAAAgBBCRIAQQ5yAEEzwgBBLqIAQSniAEEnIgBBJi
-IAQSXCAEEbgAAAAAAAAAAAAAAAABEBgBAAIAAAEQGAEAAgAAIARhziAEYaMgBGALIARhayAEYWsg
-BGFrIARgCyAEYWsgBGALIARhTCAEYAsgBGALIARhTCAEYWsAAAAAAAAAACAEhbggBIFxIASFjCAE
-hWAgBIU0IASBkyAEgZMgBIGqIASFGyAEgd8gBIHLIASBkyAEgd8gBIGTIASBkyAEgZMgBIW4AAAA
-AAAAAAAAAAAAAAAAACAEzaAgBMgAIATHqCAExcgAAAAAAAAAAAAAAAAgBMfoIATH4iAEx+IgBMfi
-IATH6CAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+Ig
-BMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAE
-x+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH
-4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfo
-IATH4iAEx+IgBMfiIATH6CAEx+IgBMfiIATH4iAEx+ggBMfiIATH4iAEx+IgBMfoIATH4iAEx+Ig
-BMfiIATH6CAEx+IgBMfiIATH4iAEx+ggBMfiIATH4iAEx+IgBMfoIATH4iAEx+IgBMfiIATH6CAE
-x+IgBMfiIATH4iAEx+ggBMfiIATH4iAEx+IgBMfoIATH4iAEx+IgBMfiIATH6CAEx+IgBMfiIATH
-4iAEx+ggBMfiIATH4iAEx+IgBMfoIATH4iAEx+IgBMfiIATH6CAEx+IgBMfiIATH4iAEx+ggBMfi
-IATH4iAEx+IgBMfoIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+Ig
-BMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+ggBMfiIATH4iAEx+IgBMfiIATH4iAE
-x+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+ggBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH
-4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfiIATH4iAEx+IgBMfi
-IATH4iAEx+ggBMfiIATH4iAEx+IgBMfoIATH4iAEx+IgBMfiIATH6AAAAAAAAAAAAAAAACAEyDgg
-BMmNIATLOyAEyy0gBMsYIATLCiAEyvUgBMrnIATK0iAEysUgBMqyIATKpSAEypIgBMqFIATKciAE
-yDAgBMpfIATKUiAEyj8gBMoyIATKHiAEyhQgBMoDIATJ+SAEyeggBMgwIATIMCAEyDAgBMgwIATI
-MCAEyDAgBMnbIATIUSAEyDAgBMgwIATIMCAEyb4gBMmlIATJmyAEyXwgBMgwIATJaSAEyU8gBMk8
-IATJIiAEyQ8gBMj3IATI5CAEyNEgBMhrAAAAAAAAAAAgBM3gIATN6iAEzzogBM8PIATPCCAEzwEg
-BM76IATO8yAEzuwgBM7lIATO3iAEztQgBM7KIATOrCAEzkIgBM3VIATOOSAEziMgBM4ZIATOEiAE
-zgUgBM3+IATN0iAEzfcgBQJqIAUCYCAFAmYgBQJqIAUCYCAFAmAgBQJgIAUCZiAFAmogBQJqIAUC
-aiAFAmAgBQJqIAUCYCAFAmQgBQJqAAAAAAAAAAAAAAAAAAAAACAFKsIgBSrYIAUsZiAFLPYgBS11
-IAUt6SAFLs4gBS+LIAVPeCAFTNwgBUtwIAVJVCAFR2AgBUCwIAVBYCAFRjAgBUAoAAAAAAMPCBKD
-jpOSIAV+PSAFfpwgBX6PIAV+giAFfnEgBX5kIAV+VyAFfkogBX7JIAV/NCAFfycgBX8aIAV/DSAF
-fvwgBX7rIAV+2iAFf2EgBX/IIAV/tyAFf6YgBX+VIAV/iCAFf3sgBX9uIAV/+SAFgFwgBYBPIAWA
-QiAFgDUgBYAkIAWAEyAFgAYgBYCJIAWA7CAFgN8gBYDSIAWAxSAFgLggBYCnIAWAliAFj1AgBY/K
-IAWPvCAFj64gBY+aIAWPhiAFj3IgBY9eIAWP2CAFkG4gBZBaIAWQRiAFkDIgBZAeIAWQBSAFj+wg
-BZCCIAWRLCAFkRMgBZD6IAWQ4SAFkMggBZC0IAWQmyAFkUUgBZHvIAWR1iAFkb0gBZGkIAWRiyAF
-kXIgBZFeIAWSCCAFkrIgBZKZIAWSgCAFkmcgBZJOIAWSNSAFkhwgBZLLIAWTeiAFk2EgBZNIIAWT
-LyAFkxYgBZL9IAWS5CAFk4ggBZQnIAWUGSAFlAUgBZPsIAWT0yAFk7ogBZOhIAWUQCAFlOogBZTR
-IAWUuCAFlKQgBZSLIAWUciAFlFkgBZUDIAWVrSAFlZQgBZV7IAWVYiAFlU4gBZU1IAWVHCAFlcYg
-BZZwIAWWVyAFlj4gBZYlIAWWDCAFlfggBZXfIAWWiSAFlzMgBZcaIAWXASAFluggBZbPIAWWtiAF
-lqIgBZdMIAWX5iAFl9IgBZe+IAWXpSAFl4wgBZdzIAWXWiAFl/ogBZieIAWYhSAFmGwgBZheIAWY
-RSAFmCwgBZgTIAWGDyAFjwsgBZkvIAWZFiAFmP0gBZjpIAWY0CAFmLcgBaFIIAWh9yAFod4gBaHF
-IAWhrCAFoZMgBaF6IAWhYSAFogsgBaK6IAWioSAFooggBaJvIAWiViAFoj0gBaIkIAWi0yAFo4Ig
-BaNpIAWjUCAFozcgBaMeIAWjBSAFouwgBaObIAWkRSAFpCwgBaQTIAWj+iAFo+EgBaPIIAWjryAF
-pF4gBaUNIAWk9CAFpNsgBaTCIAWkqSAFpJAgBaR3IAWlJiAFpcogBaW8IAWloyAFpYogBaVxIAWl
-WCAFpT8gBaXjIAWmkiAFpnkgBaZgIAWmRyAFpi4gBaYVIAWl/CAFpqsgBadKIAWnMSAFpyMgBacP
-IAWm9iAFpt0gBabEIAWnYyAFqAcgBafuIAWn1SAFp7wgBaejIAWniiAFp3wgBYo3IAWKUCAFqJ0g
-BaiEIAWoayAFqFIgBag5IAWoICAFmUggBZn3IAWZ3iAFmcUgBZmsIAWZkyAFmXogBZlhIAWKryAF
-itAgBZqIIAWabyAFmlYgBZo9IAWaJCAFmgsgBZqcIAWbQSAFmyggBZsUIAWbACAFmucgBZrOIAWa
-tSAFm1ogBZv6IAWb5iAFm80gBZu0IAWbmyAFm4IgBZtuIAWcDiAFnLggBZyfIAWchiAFnG0gBZxU
-IAWcQCAFnCcgBZzRIAWdeyAFnWIgBZ1JIAWdMCAFnRwgBZ0DIAWc6iAFnZQgBZ4zIAWeGiAFngYg
-BZ34IAWd3yAFncYgBZ2tIAWeTCAFnvYgBZ7iIAWeySAFnrAgBZ6XIAWefiAFnmUgBZ8PIAWfviAF
-n6UgBZ+MIAWfcyAFn1ogBZ9BIAWfKCAFn9IgBaB8IAWgYyAFoEogBaAxIAWgGCAFn/8gBZ/mIAWg
-lSAFoS8gBaEWIAWg/SAFoOQgBaDQIAWgvCAFoK5SVgAAAAAAAEHNzWUAAAAAQS6EgAAAAAAQAAAA
-Y29uZmlndXJhdGlvbiBmaWxlIHBhcnNlciBmb3VuZCBhZGRpdGlvbmFsIGNvbmZpZ3VyYXRpb24g
-YWZ0ZXIgW2ZpbmldCgAAMAAAAGZjb2UAAAAAdm5pY19pZAB2bGFuAAAAAHRvcwBldGhlcnR5cGUA
-AABtYWNtYXRjaAAAAABtcHNoaXR0eXBlAABmcmFnbWVudGF0aW9uAAAAc3J2cnNyYW0AAAAAZmNv
-ZW1hc2sAAAAAY29tcGFjdABiYXNpY3ZpcnR1YWwAAAAAc3lubWFwZW4AAAAAc3luNHR1cGVuaXB2
-NgAAAHN5bjJ0dXBlbmlwdjYAAABzeW40dHVwZW5pcHY0AAAAc3luMnR1cGVuaXB2NAAAAG9mZG1h
-cGVuAAAAAHRubG1hcGVuAAAAAHRubGFsbGxrcAAAAGhhc2h0b2VwbGl0egAAAAB0cF9waW8AAHRw
-X3RtX3BpbwAAAG5pY192bQAAbmljX3VtAABuaWNfdW1faXNnbABvZmxkAAAAAHJkZHAAAAAAcmRt
-YWMAAABpc2NzaV9pbml0aWF0b3JfcGR1AGlzY3NpX3RhcmdldF9wZHUAAAAAaXNjc2lfaW5pdGlh
-dG9yX2ZvZmxkAAAAaXNjc2lfdGFyZ2V0X2ZvZmxkAABmY29lX2luaXRpYXRvcgAAZmNvZV90YXJn
-ZXQAcG9mY29lX2luaXRpYXRvcgAAAABwb2Zjb2VfdGFyZ2V0AAAAcHBwAGRjYngAAAAAIAKXNAAE
-AAAAAAQAAAQAACAFx+wgBXooIAXH2CAFejggBXpMIAV5kCAFetAgBXlsAAECAwAAAAAAAAAAAAAA
-ACADNbQgAzVAIAQKEAAAAAAgAzU4IAM1MCADNSgAAAAAMDEyMzQ1Njc4OWFiY2RlZkFCQ0RFRgAA
-AAAAAAAAAABBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWmFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3
-eHl6MDEyMzQ1Njc4OSsvAAAAAAAAAAAAAAAAAAAAACAAH+AAAQAAIAAfwAAFAAEgAB+kAAMABSAA
-H4QABwAAY4JTYwAAAAD///////8AAAAEBAgAB0MAAAAAAAAAAAAAIQAJAIEAQQAhAAkAIQAJAIEA
-QQCBAEEAgQBBAIEAQQAhAAkAgQBBACEACQAhABEAgQBBAIEAQQAhAAkAgQBBACEACQAhAAkBAQBB
-AIEAIQCBACEAEBBhAQEAgQEBAIEDAgEAIECAAAAAAAAAAAAAIAKNBAAAAAAgApG0AAAAACACjQgA
-AAABIAKRwAAAAAIgAo0QAAAABCACjRgAAAAIIAKNIAAAABAgApHIAAAAICACjSQAAABAIAKNMAAA
-AIAgAo08AAABACACjUgAAAIAIAKNWAAAIAAgAo1kAABAACACjXAAAIAAAAAAAAAAAAAAAAIEAAAA
-RAAAAAQAAABAIAVTsCAFU2wgBVJEIAVQ+CAFULQgBVCIIAVQ4AAAAAAAAAIAAAAEAAAACABOQQAA
-VjAAAFYxAABWMgAAVjMAAFY0AABWNQAAVjYAAFY3AABWOAAAVjkAAFZBAABWQgAAVkMAAFZEAABW
-RQAAVkYAAFZHAABWSAAAVkkAAFZKAABWSwAAVkwAAFZNAABWTgAAVk8AAFZQAABWUQAAVlIAAFZT
-AABWVAAAVlUAAGFsbAAqAAAAbm9uZQAAAAAweAAAcG9ydAAAAABwcm90b2NvbAAAAABnbG9iYWwA
-AGZ1bmN0aW9uAAAAAGZpbmkAAAAAcmVnAGZpbHRlck1vZGUAAGZpbHRlck1hc2sAAHJzc19nbGJf
-Y29uZmlnX21vZGUAcnNzX2dsYl9jb25maWdfb3B0aW9ucwAAc2dlX3RpbWVyX3ZhbHVlAHRwX3Bt
-cngAdHBfcG1yeF9wYWdlc2l6ZQAAAAB0cF9ucnhjaAAAAAB0cF9wbXR4AHRwX3BtdHhfcGFnZXNp
-emUAAAAAdHBfbnR4Y2gAAAAAbXR1cwAAAABwY2llX21hX3JzcF90aW1lcnZhbHVlAABwbF90aW1l
-b3V0X3ZhbHVlAAAAAGJhcjJ0aHJvdHRsZWNvdW50AAAAY3BsdHhkYXRhX21lbWFsaWduAABudmYA
-d3hfY2FwcwByX2NhcHMAAG5pcWZsaW50AAAAAG5lcQBuZXRoY3RybAAAAABudmkAcnNzbnZpAABu
-ZXhhY3RmAGNtYXNrAAAAcG1hc2sAAABuZXRob2ZsZAAAAABucm91dGUAAG5jbGlwAAAAbmZpbHRl
-cgBuc2VydmVyAG5oYXNoAAAAdHBfbDJ0AAB0cF9kZHAAAHRwX2RkcF9pc2NzaQAAAAB0cF9zdGFn
-AHRwX3BibAAAdHBfcnEAAABpc2NzaV9udGFzawBpc2NzaV9uc2VzcwBpc2NzaV9uY29ubl9wZXJf
-c2Vzc2lvbgBpc2NzaV9uaW5pdGlhdG9yX2luc3RhbmNlAAAAaXNjc2lfbWF4X3NnZQAAAHBwbV9t
-YXhfem9uZXMAAABwcG1fem9uZV9yYW5nZTAAcHBtX3pvbmVfcmFuZ2UxAHBwbV96b25lX3Jhbmdl
-MgBwcG1fem9uZV9yYW5nZTMAZmNvZV9uZmNmAAAAZmNvZV9udm5wAAAAZmNvZV9uc3NuAAAAZGNi
-AGJnX21lbQAAbHBia19tZW0AAAAAaHdtAGx3bQBkd20AdmVyc2lvbgBjaGVja3N1bQAAAAAwMTIz
-NDU2Nzg5YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoAAAAAWWVzAFNlc3Npb25UeXBlAE9GTWFy
-a2VyAAAAAElGTWFya2VyAAAAAERhdGFEaWdlc3QAAEhlYWRlckRpZ2VzdAAAAABFcnJvclJlY292
-ZXJ5TGV2ZWwAAEltbWVkaWF0ZURhdGEAAABEYXRhUERVSW5PcmRlcgAARGF0YVNlcXVlbmNlSW5P
-cmRlcgBJbml0aWFsUjJUAABNYXhDb25uZWN0aW9ucwAATWF4UmVjdkRhdGFTZWdtZW50TGVuZ3Ro
-AAAAAEluaXRpYXRvck5hbWUAAABJbml0aWF0b3JBbGlhcwAARGVmYXVsdFRpbWUyV2FpdAAAAABE
-ZWZhdWx0VGltZTJSZXRhaW4AAE1heEJ1cnN0TGVuZ3RoAABGaXJzdEJ1cnN0TGVuZ3RoAAAAAE1h
-eE91dHN0YW5kaW5nUjJUAAAAVGFyZ2V0TmFtZQAAVGFyZ2V0QWxpYXMAVGFyZ2V0QWRkcmVzcwAA
-AFRhcmdldFBvcnRhbEdyb3VwVGFnAAAAAEF1dGhNZXRob2QAAFNlbmRUYXJnZXRzPUFsbABDSEFQ
-X0EAAENIQVBfSQAAQ0hBUF9DAABDSEFQX04AAENIQVBfUgAARGlzY292ZXJ5AAAATm9ybWFsAABO
-b25lAAAAAENSQzMyQwAAQ1JDMzJDLE5vbmUATm9uZSxDUkMzMkMAQ0hBUAAAAABDSEFQLE5vbmUA
-AABOb25lLENIQVAAAABOb3RVbmRlcnN0b29kAAAASXJyZWxldmFudAAAUmVqZWN0AABObwAANQAA
-AENITmV0IDEuMDAAAAAAAAwAAAAAAQABfAAMAQAAAAAQAAAAFCAF23AAAAL9DkAAAB/8AAAf/AAA
-H/+rkB//q5AgBeQAIAXncCAHf9AgB3/QIAfAACAIEEAgCEAAIAjAAAAAAAAgCQyAIAkM4AgAAAAf
-/OLkIAKm0B//mbAf/5vwAQAAACgAAAAgCMAA4QAAAAAgAAAf/4SwH/+FoB//gyAgCMBQIAjAkCAI
-wNAgAo8gIAKMoCACj3AgAo7wIAkPMCACjtAgCQ9gIAkPgAAAgAAAD0JAIAAgAAACAADgAAAAIAjD
-ECAIwuAACAAAIAjDcCAIw0AgAt58IAkOEB//j7Af/5mkAP///yAIw7AgCQ+wIAjD4CAIxCAgCMSA
-IAjFICAIxFAgCQ1QIAkNsCAC9IwgCQ7QIAL5UCAIxNAgCMXwIAXiAAAP/AAf/5UUAAAwACAIxiAg
-CMawIAjHUFUAAAAgCRBADgAAABAAAAAgAo/oAAAIBgAACAAgCMeAH/+Y8AAAD/4gCMhAAAD//yAJ
-EGAgCMfgIALLTCACwkAgCMigIAjJECAIyWAgCREwIALWGCAC2YwgCRDwQAAAACAIyaAgCMoQIAjK
-cCAIyuAgBecwIAjLYCAF5EAgCMuQ7////yAIy/AgBeZAIAKAACAJE7AgCRGAAABQACAF5vAUsAAA
-AAAQAIAAAAQgAs+QIAXm+iAJEcAgCRIgFaAAAAAAj/4gCRJwFqAAACMoFQAgoAAAP/AAACOgAAAD
-/wAfIAXgIB//mZAf/5CcIAkS0BeQAACAAAAAIAkTEBSQAABAAAAEIAkTgCAIzKAgCM7gIAjOMCAI
-zpAgCM0AIAjNcCAIzdAgAtv8IAkUIAAAQAAgAo/gH/ziAAQAAAgMAAAAgQAAAB//hRAf/4YQIAKU
-vB//hPAgCM9AIAjPgD/////P////IAjPwB//hcwgCNAAIAjQQCAJFEAgCNDA///QTf//LlwAANGk
-AACcTn///6sgCNFAIAjRACAI0IAf/4UMIAjRgAAASAAgCNJAIAjSEB//hQgf/4VwIAjScCAI00Ag
-CNQAIAjT0B//mZT//f//AJiWgCADC7AgCNQwIAjUgCAJFGAD/9AAAEAAAABQDAAAAA//AAEAACAJ
-FOAf/5nMIAkVECADBFQgCNSg//9AAB//mPwgCNTgAAAf/iAI1SAgCRYgwAAAACAJFmAAACAAIAjV
-UCAJEBAgCQ/gIAjWUB//maAgAwz8IAL96AAAwAAgAwFYIAkVcCAJFbAgCNkQAgAAACAI2aAAABdw
-IAkXMCAJFxAAACcQIAMZ2CAJF2AgCReAH/+ZmCAI2dAgCNnw4QBeACAI2hAf/5jUIAjaQB//mADh
-AH4AH/+ZMAAA8/8EAAAAH/+cABQAAAAqAAAAIAMhVP/3//8gCRegH/+ZBCAJGGAgCRkwH/+mwBoA
-AAAgCNrwIAkZsB//mhAf/6foMAAAECAJGfAgCRpQH/+RYCAJGoAgCRsA4QL+AB//lNCIiIiIH/+p
-ZCAI20AAAAy8AACJBiAI23DgAAYAAJwAAOAACSQgCNuQIAjb4AADBMDg//4A4QCOAAAAloAAAJZA
-IAXkEAAAlqAAAJZg4QMALAADAAAf/N4A4QB6AAAB4ADhAZIAAAHjAB//mbQgCNwAIAjcMAAAGlAf
-/6gEAA///x//p7Qf/5EEIAXmsAAAYAAgBea6AAAaOgAAg/8gAoAgCFABAADAAAQf/6loIAWzsCAD
-TtggBbN03q2+/xrAAAAgBeW4AAD/6iAF5sAAAAgUAACIAB//mZwAEAAAH/+YKAAehIAgA2SoOAAA
-ADAAAHQgAoAwIAjcYDAAAAgwAAAMNAAACNAAAAAAAIkUOwAACDSQAAAAMAAA/wf//wVdSoAgA2pU
-ABgAAAA4AAAgCRuwBgAAACADdxz4AAAAAf//5wABwAAgAACABAAQAB//mBDhAZoA4QGaQOEBmjzh
-AZo44QGaNOEBmjCAAAADgAAAAgAAht3//P//4QEOAAAAFuAf/5moH/+RCB//kYggA4S4IAkhICAJ
-HtAgCR8QIAkgwCAJIPAgCR9AIAkfgCAJH7AgCR/wIAkgICAJIGAgCR6g//8AAA////D/8AAAIAkh
-oB//qBAf/5YwIAkhYCADk7AgCSKgIAki0CAJIkAgCSHgAAAu4B//lTgf/5ZgAAD/gCAI3dD/+///
-AAQAAOEB4sCQAADw/P+A7yAI3iAgCN5gAAD4AAADAQwAAwEIj////wAA8AAgCN6wIAjfACAI3zAg
-CN9w4QDeAAADAwgAAwIA///wAOEA7gAf/5m8//9//wAA4AAAAPwAAAAMAAADAwR/////AAERHAAB
-ERgAEAgAgAAIAAADAQQf/5msH/+YQP//wAAAAP/+AAAlgAADAwAf/5kc4P/iwCAJIyAgCSNQIAkj
-cCAJIwDhAY4AAAGRDCAJJCAAAP/zIAkkkP//8/8gCSRwIAkksCAJJNAAABIAIAklECAJJEAAACow
-IAkk8AAA//gAAP+PAABStQAASAoAAI+CAACPhgAAOAAAAI+KAADjPwAAg64AAP/xIAjfwP//z78A
-ABBA4QMGAAAA//sgAoCA4QMKACAI3/AgCOAwIAKAkCAI4NAgCOCgIAklMAAA+f8AAP8/AAD+/wCA
-AAAAAP/AIAklgCAI4GAgCSYwIAkl4CAI4YAgCOFAIAjhECAI4aAf/6oAIAjh8AAAGkgAAN6tH/+n
-rCACgaAEAQAIAACDACAI5DAQAAUN7gAAAAHAgAAJAAAAAACCACAI41AgCOOgIAjj4BAABwIAAPz/
-IAjkkBsAAAAABQACIAjkwCAI5OAgAoHwIAjlACADM7AgAy/cIAMycCAJJ6AA/8AAEgAAACAEHmgg
-CShQIAkoECAI5SAgCOWAIAkokCAI5qAgAo9gIAjmwCAI5dAgCOYwAP///AAAEDb//+//IAKCIB//
-p/ggA3PEAAAIUCACgigyAAAAAAAIQCAJKXAgCSmwIAkp8AD///oAAIAFAACABzOQAADerb7vgYAA
-AAAAg/0wAAAcMAAABDAAABQAAP/v//7//x//qKQgAoIwAP/wAAAoAAAgCOcAMAAAADAAADQAAIAB
-IAKCcAAAgAIQAAUQmQAAADQAAAAgCSoQIAjnQAAZAAAgCOeQH/+YpCACj/QAABshAACAwv//9/8D
-FQAABQAAAIP/ABsgCOgAIAjoUAABkazhAZGsv////9////8gCOiwCwAAACAErnggCOkgIAjpkCAI
-6gAgCOowIAkrQCAJK+Af/5pwIAPQxOEADgDhABIAH/+XhAABOIAAAicQIAksgH///w8f/5rY4QAu
-APwA///hAJYA4QCaAAAACf/hAJ4AAACwAB//mgggAoLAAwAAAOEAEgThABII4QASDOEAEhDhABIU
-EwAAABEAAAAf/AAAH/+ZZCAI6rAgCS2wAAGUjwABlM///+/4IAKC4B//mIQgAoXQIAjq8CAI6yAf
-/5icIAKGoB//l3gf/5acH/+YaOEBngD/v///AAGfNCAI7BAgCOxQIAjtsB//l2gAP///AAD/9wAA
-/9UAAP/9AADql8IAAA4F3AEAA/8AAMAAAAEgCO4QIAjuUCAI7qAgCO7gIAjvMCAI73Af/6WwAA8D
-/wMRAAAf/5rE/f//0B//j9gf/5WwH/+RTAAC//8AAJxAIAkbUCAI8pAgCPMAAAD+ACAE31wgCPPA
-AAAhACAE50ggBeCoIAXguCAF4MggBeDYIAXg6CAF4PggBeEIH/+ZIB//kWQgCPPwAAMAAiAI9HAg
-CPQg9////wEwGGAAAYagACYloAJiWgAF9eEAAAAgBOEDLgD//984IAj14CAI9mAgCPSQIAj2MCAI
-9NAgCPWwIAkzcCAJM/AgCTOwIAT9YCAChwDhAwAEIAKHQOEDADDhAwIA4QQCAAAEBe7hAwEE4QHi
-AB//mUwf/5h0H/+aFAAFAAQf/5FwH/+YfB//mVAAF///AAQUAB//mFQf/5f0H/+Z7CAGgAAAABQA
-IAausCAG7wAgBoZgIAaFUCAGhEAgBoMwIAaCICAGgRAf/5iwH/+Y9B////Af/6awH/+p4CACjqAf
-/6f8H/+quB//qfhJAAAAIAkzMCAJMoAgCTLgLgA2AB//mHAf/5dsH/+ZOB//mUjhAHYAIAk1kB//
-mRQgCPnQH/+ZuCACh1AgCTYAIAk2gCAF5jgf/6eo/+gP/wAQgAAgCPtAIAU+MCAAAAAgAodw4QBa
-AAHIQAbhAZngIAXkMCAI+2AAAZD4//z4fyAF5DggCPugIAj8ECAJI/AAAH5QAAB+QAAAfhggBUzc
-H/+Y7CACkawgApGwIAKRtCACkbwAUCAG4QGaDABwIAb/4AAAAAIgBiAI/SDhAZoE4QGaCAAEIAYg
-CP1QIAk3oOEDMgD//8j////x////388gAoeYIAj9sCAI/YAgCP4QIAj94P//v/8gCP6AIAk3ACAJ
-N3Af/5pIAAST4P/7bCD/4XuAIAj+sCAI/uD7///OBAAAAf4+AA8AACAM///fMAADMADhAw4AABgA
-AwAAuZMAAD/g4QMSAPP/5//hA0YAIAk0MCAI/xAAAwg0H/+UsOAAAQDf//4AIAXksOEB4kAABAAE
-AAQACCAI/0AABACAAAP/ACAI/3Dh//4AIAKHoCACh8AgAofgIAKIACACiCAf/5EAAAAxgAAALUDA
-AAAGIAKIQCACiGAgAoiAIAKIoCACiMAgAojgIAKJACACiSAgAolAIAKJYCACiYAgAomgIAKJwCAC
-ieAAH///IAKKACACiiAgAopAIAKKYCACioAgAoqgIAKKwCACiuAgAosAIAKLICACi0AgAotgIAKL
-gCACi6AgAovAIAKL4CACjAAgAowgIAKMQCACjGAgAoyARIAAUAAAH/8gBai4H/+RgCAJBsAAADGE
-AAAtRB//mjRAAABEH/+RdCAJORD/7///4QBW4CAJBvAf/5koH/+QmB//kTAAADFEAAA1hCAJBzDh
-AFYAHQAAAB//mgwgBeIkIAKPBCAJOgAgCTqwIAk5MCAJOXAgCTswIAk6UCAJObAf/5loIAkIsCAF
-rOAf/5uQH/+rRB//q1wf/6t0H/+dUB//q0gf/6tgH/+reB//miQf/5wgH/+ZJO3/////5b//ABhA
-AP/AAAAAExwc//wAAAABqhkAAwkEIAkI4OEDCAgf/5Z4H/+WdOAACgDgAA2EIAkJACAHwAAf/5CA
-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
-AAAAAAAAAAAAAABrAAAAeQAAAAcAAAAAAAAAOwAAAAAAAAACAAAAAAAAADgAAAAAAAAABAAAAAMA
-AAA7AAAAAQAAATYAAAFsAAABlgAAAPAAAAEgAAABUwAAAOEAAAExAAABYQAAALwAAADkAAABCwAA
-APUAAAEiAAABSQAAAMYAAADrAAABDwAAAMIAAADqAAABEwAAAJ0AAAC/AAAA3gAAAMsAAADtAAAB
-DQAAAKoAAADJAAAA5AAAAKMAAADEAAAA4AAAAIEAAACiAAAAvQAAAK8AAADMAAAA4wAAAJQAAACw
-AAAAxgAAAIsAAACoAAAAvwAAAAAAAACBAAAAnQAAAJoAAACzAAAAxwAAAIEAAACbAAAArwAAAG4A
-AACPAAAApQAAAAAAAAAAAAAAAAAAAIkAAACfAAAAsQAAAG0AAACIAAAAmwAAAAAAAABhAAAAcgAA
-AAAAAAAAAAAAAAAAAHoAAACPAAAAnwAAAAAAAAByAAAAhwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAPsAAAEmAAABagAAANkAAAD/AAABNgAAAO4AAAEuAAABjAAAAKsAAADTAAABEwAAANYAAAD5
-AAABKgAAALkAAADaAAABCgAAALcAAADiAAABMAAAAIwAAACtAAAA4QAAALoAAADZAAABBgAAAKIA
-AAC+AAAA5wAAAJYAAAC3AAAA6gAAAGUAAACMAAAAugAAAKQAAAC/AAAA5gAAAI4AAACoAAAAzQAA
-AHoAAACYAAAAwwAAAAAAAAAAAAAAlAAAAJEAAACqAAAAzQAAAHsAAACVAAAAtwAAAAAAAAB6AAAA
-owAAAAAAAAAAAAAAAAAAAIAAAACYAAAAuAAAAGQAAACBAAAAowAAAAAAAAAAAAAAfQAAAAAAAAAA
-AAAAAAAAAG0AAACGAAAApQAAAAAAAABmAAAAjgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAA
-AAEpAAABVQAAAM4AAADzAAABFQAAAMcAAADuAAABFgAAAKEAAADDAAAA4AAAAM0AAADtAAABDAAA
-AKsAAADKAAAA4wAAAKIAAADBAAAA3QAAAH0AAACeAAAAtwAAAK0AAADJAAAA3wAAAJMAAACtAAAA
-wQAAAIYAAACiAAAAuQAAAAAAAAAAAAAAiwAAAJcAAACuAAAAwAAAAH0AAACWAAAAqQAAAEwAAACB
-AAAAmQAAAAAAAAAAAAAAAAAAAIUAAACaAAAAqwAAAGIAAAB/AAAAkwAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAHYAAACJAAAAmQAAAAAAAABWAAAAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AGYAAAB6AAAAiQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAN8AAAEDAAAB
-MQAAAL8AAADfAAABEAAAALwAAADkAAABLAAAAI8AAACvAAAA4gAAAL0AAADcAAABBwAAAKQAAAC/
-AAAA5wAAAJYAAAC2AAAA5gAAAFcAAACGAAAAtAAAAKQAAAC/AAAA5AAAAI4AAACmAAAAygAAAHYA
-AACTAAAAvAAAAAAAAAAAAAAAAAAAAI8AAACnAAAAyAAAAHgAAACRAAAAsgAAAAAAAABtAAAAmQAA
-AAAAAAAAAAAAAAAAAHwAAACUAAAAsgAAAFoAAAB6AAAAmAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAGcAAACAAAAAngAAAAAAAAAAAAAAgQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABq
-AAAAigAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANsAAAEAAAABGwAAALcA
-AADXAAAA8AAAALAAAADPAAAA6AAAAJAAAACuAAAAxgAAALMAAADOAAAA5AAAAJkAAACyAAAAxgAA
-AI0AAACnAAAAvAAAAAAAAAAAAAAAjQAAAJkAAACvAAAAwAAAAIAAAACXAAAAqQAAAAAAAAB8AAAA
-lAAAAAAAAAAAAAAAAAAAAIUAAACZAAAAqAAAAFoAAAB7AAAAjwAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAHQAAACHAAAAlQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGEA
-AAB1AAAAgwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABgAAAAcQAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAADrAAABGAAAALIAAADPAAAA
-9gAAAKkAAADMAAABAAAAAIIAAAChAAAAygAAAK0AAADIAAAA7QAAAJgAAACxAAAA1QAAAIMAAACg
-AAAAxwAAAAAAAAAAAAAAlgAAAJUAAACtAAAAzgAAAIAAAACYAAAAuQAAAAAAAAB1AAAAnQAAAAAA
-AAAAAAAAAAAAAH8AAACWAAAAtAAAAFUAAAB9AAAAnwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AGYAAACAAAAAnQAAAAAAAAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiAAAA
-hgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAXwAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAD/AAAADwAAAP8AAAAPAAAA/AAAAAAA
-AAD/AAAADwAAAPgAAAAJAAAA2wAAAA8AAADwAAAADwAAAKUAAAAPAAAA4AAAAAkAAACZAAAADwAA
-AMAAAAAAAAAAmQAAAA8AAACAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAADwAAAPwAAAAPAAAA
-/AAAAA8AAAD4AAAABQAAAPwAAAAPAAAA8AAAAA8AAAC0AAAADwAAAOAAAAAFAAAAtAAAAA8AAADA
-AAAAAAAAALQAAAAPAAAAgAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAA
-AAAPAAAAwAAAAAAAAAAAAAAADgAAAMAAAAAAAAAAAAAAAA8AAACAAAAAAAAAAAAAAAAOAAAAgAAA
-AAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA4AAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAA
-AQAAAAAAAAAAAAAAAAABOIAAAGgqAABOIAABhqAAAYagAAII1QACCNUAAAAoAAAAMgABBGoAAGgq
-AABKZwABhqAAAYagAAII1QACCNUAAAAoAAAAMgABWwEAAGgqAABQIAACCNUAAYagAAII1QACtnEA
-AAAmAAAAMgABKW4AAGgqAABNKQACCNUAAYagAAII1QACtnEAAAAmAAAAMgABBEEAAGgqAABKZwAC
-CNUAAYagAAII1QACtnEAAAAmAAAAMgABdAYAAGyBAABUAQACiwoAAgjVAAKLCgACtnEAAAAeAAAA
-LQABRYUAAGyBAABRYQACiwoAAgjVAAKLCgACtnEAAAAeAAAALQABIVoAAGyBAABO6gACiwoAAgjV
-AAKLCgACtnEAAAAeAAAALQABBGoAAGyBAABMlwACiwoAAgjVAAKLCgACtnEAAAAeAAAALQABhqAA
-AG+bAABWzgACiwoAAgjVAAKLCgADDUAAAAAeAAAAKAABWzgAAG+bAABUdQACiwoAAgjVAAKLCgAD
-DUAAAAAeAAAAKAABOIAAAG+bAABSPAACiwoAAgjVAAKLCgADDUAAAAAeAAAAKAABHBgAAG+cAABQ
-IQACiwoAAgjWAAKLCgADDUAAAAAeAAAAKAABbHQAAHLjAABXYwADDUAAAosKAAKLCgADDUAAAAAb
-AAAAIwABS1IAAHLjAABVWAADDUAAAosKAAKLCgADDUAAAAAbAAAAIwABL7YAAHLjAABTZQADDUAA
-AosKAAKLCgADDUAAAAAbAAAAIwABGFkAAHLjAABRiAADDUAAAosKAAKLCgADDUAAAAAbAAAAIwAB
-eroAAHZfAABaPgADDUAAAosKAAKLCgADDUAAAAAZAAAAIwABWysAAHZfAABYVgADDUAAAosKAAKL
-CgADDUAAAAAZAAAAIwABQV4AAHZfAABWgQADDUAAAosKAAKLCgADDUAAAAAZAAAAIwABKZMAAHZg
-AABUwQADDUEAAosLAAKLCwADDUEAAAAZAAAAIwABESoAAG+bAABP3QACCNUAAgjVAAKLCgADDUAA
-AAAeAAAAKAABFwQAAGyBAABOIAACiwoAAosKAAKLCgADDUAAAAAbAAAAIwAAAAAAACtoAAAjgwAA
-GGoAAA0GAAALKgAAAAAAAAAAAAAAAAABABAAEQAeAA0AEgAHAB8ADgALABMAFQAbAAgAFwAgAA8A
-HQAMAAYACgAUABoAFgAcAAUACQAZAAQAGAADAAIAAQB7AHUA+wD1AEUAbwB9AHcAXwBpAMUA7wCj
-AD8A/QD3ALsAOQDfAOkAzwCdAEcAcQAPAFkAJQC/ABMAYwB/AHkAbQBdAD0AuQCbAA0AYQBrAAsA
-CQBRAB8AMQBTAMcA8QAhALUAjwDZAK0AMwClAEEAVQCXAJMA4wApAMkA/wD5APMAwwDtAN0A5wAj
-AL0AOwC3AE8AHQCNANcAkQDhAOsA2wAbAIsAiQCHAK8A0QCfADUALQCxANMAFwCnAEkAcwBDAGcA
-oQA3AM0AVwARAFsAmQAHAC8AswCrAJUAJwDBAOUATQDVABkAhQArABUAZQDLAAUAqQBLAIMAAwCB
-AAAA+gD0AHwAdgDEAO4A/AD2AN4A6ABGAHAAJAC+AH4AeAA8ALgAYABqAFAAHgDGAPAAjgDYAKQA
-QACSAOIA/gD4AOwA3AC8ADoAHACMAOAA6gCKAIgA0ACeALAA0gBIAHIAoAA2ABAAWgAuALIAJgDA
-ANQAGAAUAGQAqABKAIAAegB0AEQAbgBeAGgAogA+ALoAOADOAJwADgBYABIAYgBsAFwAmgAMAAoA
-CAAwAFIAIAC0AKwAMgBUAJYAKADIAPIAwgDmACIAtgBOANYAkADaABoAhgCuADQALAAWAKYAQgBm
-AMwAVgCYAAYAqgCUAOQATACEACoAygAEAIIAAgABAAMAAgAEAAAAAAAAAAAAAQACABwAGwAWABUA
-HgAdABgAFwAMAAsAEAAPACAAHwAaABkAFAATAAoACQAOAA0AEgARAAgABwAGAAUABAADAAEAAAAC
-AAQAAAAAAAAAACACkfAgByPYIAKR9CAHKwwgApIAIAcqICACkgwgBynQIAKSICAHKSQgApI4IAcn
-sCACkkggByeIIAKSUCAHJ2AgApJkIAcnMCACknAgBycIIAKSeCAHJuAgApKMIAcmrCACkpggByvY
-IAKSoCAHI1AgApK4IAcjDCACkswgByJ4IAKS4CAHIlAAAAAAAAAAACACkvQgByIEIAKS+CAHIYgg
-ApMAIAchUCACkwggByEYIAKTFCAHIOAgApMYIAcgqCACkyQgByBwIAKTKCAHIcAgApMwIAcgOCAC
-kzggByAAIAKTQCAHHhQgApNIIAcfyCACk1QgBx+QIAKTXCAHH1ggApNkIAcfICACk2wgBx7oIAKT
-dCAHHrAgApHIIAccICACk3wgBxvoIAKThCAHG7AgApOMIAcbeCACk5wgBxtAIAKTpCAHGwggApOs
-IAca0CACk7QgBxqoIAKTwCAHGoAgApPMIAcaUCACk+QgBxooIAKUACAHGgAgApQQIAcZ2CAClCAg
-BxmwIAKUMCAHGYggApRAIAcZYCAClFAgBxk4IAKUYCAHGRAgApRsIAcY6CAClHggBxjAAAAAAAAA
-AAAgApSEIAcXlCAClIggBxdgIAKUkCAHFywgApScIAcW+CAClKAgBxbEIAKUpCAHFpAgApSoIAcW
-aCAClLAgBxZAIAKR1CAHLgAgApHcIActNCACkcAgByyEIAKR6CAHK+AAADAEAAAwEAAAWdwAAFqA
-AABahAAAWogAAFqMAABakAABlDAAABAkAAAQMAAAEDwAABDcAAARDAAAeywAAHs0AAHijAAB5owA
-AeqMAAHujAAB8owAAfaMAAH6jAAB/owAAI3MAACOgAAAfnQAAI/cAAGRWAABknAAAI/8AAQTHAAE
-ExgABBMQAASTHAAEkxgABJMQAAB34AAAd+QAAHf0AAB4BAABnDwAARB0AAEQhAAAlAgAAJhcAACW
-DAAAlhQAAJYgAACWLAAAlsQAANAoAACQCAADCNwAA0jcAAOI3AADyNwAAwjkAANI5AADiOQAA8jk
-AAGQVAAAYBwAAaDYAAGQkAAAd+AAAHfkAAB39AAAeAQAAHjYAAB44AAAePQABQB4AAUIeAAFEwgA
-AZQEAAHjwAAB58AAAevAAAHvwAAB88AAAffAAAH7wAAB/8AAAZQMAAAAAAAAAAAAAAAAAAAwAL//
-/0AAADAIv///QAABlBCf////AAGUNAAAABAAAZQIn//j/wABlDgAAAAQAAAQKOH///8AABAs4f//
-/wAAEDQB////AAAQOAH///8AABBAAAQAAAAAERAA////AAARFAD///8AAHsoAH3/4gAAezA//+7/
-AAB7OAAAAAEAAHtAP//u/wAAfCQAff/iAAHiiAAIAAAAAeaIAAgAAAAB6ogACAAAAAHuiAAIAAAA
-AfKIAAgAAAAB9ogACAAAAAH6iAAIAAAAAf6IAAgAAAAAjcj////wAACN0P////AAAI58AAAA/wAA
-joQAAAD/AAB+cH+//38AAH54f7//fwAAfgAAwAAAAAGRVAH///8AAZGcAf///wAAj9gDf///AACP
-+P////8ABBMUAAAABwAEEwwAAAALAASTFAAAAAcABJMMAAAACwAAd9wAAAADAAB39P////8AAHgE
-AAAAAwABnDgAAcBAAAGc+AABwEAAAJAEAAAAPgABEHgA////AAEQfAD///8AARCIAAAAAAAAlAQA
-AP//AACUEAAA//8AAJhUAAAB/wAAmFgAAAH/AACWCAAAAAAAAJYcAP///wAAliQA////AACWKAD/
-//8AAJYwAP///wAA0CAAAAAHAADQJAAAAAcAAwjYAAAAAwADSNgAAAADAAOI2AAAAAMAA8jYAAAA
-AwADCOQAAAADAANI5AAAAAMAA4jkAAAAAwADyOQAAAADAAGQUAAAAO8AAaDUAAABgwABkIwAOAAA
-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
-AABVVQAEcgQABAD4AAQA3AAEANgABHJIAAQBOAAEARgABHJMAAQA9AAEclAABHQIAARyCAAEQEgA
-BErcIAkEUCAJBJAgCQTQAARBLAAEQTwABEDgIAkFEAAEQQAgCQVAAARwSAAEcGAABHIgAAR2DAAE
-eAQAAYaggBAAACAJOMAgApDwgBIAAwAEAOiAEAADAAQAwAAATiAABADMAAQAxAAEAMgABAE0IAaL
-1CAGjxRBLoSAAAIAIQAP/ykABABEIAkFcAAEAkQABAJMAAQCSAYGAAAABAGAAAAeeAABMLAABADQ
-AAQA1AAEAPAABAD8AAII1QABBGoABAEMAAQBEAAAosIABAEUAAAw1AAEARwABAEkAAQBKAAEASwA
-BAFAAAQBRAAEAlAABAEgAAQCYAAEAmQABAJUAAEAIQAEQfwABEv8AACAIAAACAgABHAwAARgwAAE
-YMQAAIgAAARB1AAES9QABEHYAARL2AAEQdwABEvcAARwOAAEcAAgCQWgAARwBAAAwAAgCQXgAARg
-yAAAgCQABEAcAARKHAAAFywgCQYgIAkGUEHNzWUABGDkAARg0CAJBoAABEAAAARABAAEQAwABEAI
-AARKBAAEcDQABHAIAARQAAAEVAAABGDMAAB/AAAEQdAABEvQAARwUAAEUGgABFBAAARUaCAGilgA
-BFBQAARUUAAEUiQABFIoAARSLAAEQBAABEgQAADDAAAEQBQABEgUIAaK2AAEQeAABEvgIAaLWAAE
-QegABEvoAARB5AAES+QABEHsAARL7AAEQBgABEoYAADu8AAEUGAABFRgAAARAAAAETAAABAwIAaD
-kCAGgIwgBoYwIAaE5CAGiNAgBoeEAAP//wAEEwQABBMkAP///wCBAiDhAeJA/8AMAB//kEAgCQlA
-H/+VaAAA4+8ABFCwAARUsAAEYOAAAMHzH/+aSB//gmD//H//AAB+6IAABwCAAAUAgAAGAIAABACA
-AAEAgAACACAHflAgCQmQH/+QjCAHf9AgAoygIAkJwEAAAAAf/5m0VVVVX1VVVVUAD///IAXguB//
-kJcAVgAA4QT+AOEFBgAAJgAA4QHeAOEAWgDf//4AAACAYAAAQAkAAAnEIAk74CAJPDAgCTxgIAk9
-ICAJPPAgCTuwH/+XiN6tvu8gBpB0IAaSxAAJiWggBpJ0IAaQNCACkSDiAAYA4gAGCOIAAgDiAAII
-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
-ASAAEEgw+VR9IAoQQDD4VHwiAABgcFvGRhv3uMCh+rSIIADLLaAf97Uv8h3+CgAiAABY8P8qFAAA
-EGAw9KOYaGIBeDAKShRtiQuJsLHu+7wELAAgYnBkoRKJtIiwhLH9sgIgIAJzsPyyAygAIGIw+LIF
-JAAgQTD0sgYsACAncP2yBywAIGsw/LIIKAAgZnD5sgkoACBKMPiyCiQAIEEw9LILLAAgJ3D9sgws
-ACBrMPyyDSgAIGZw+YgIAf4CSrD4vEAkACBBMPSyDywAICdw/bIOLAAgazAPAgAPAgBtmYf5ggAg
-IAJzsPyCASwAIGdw/YICKgAgaTD5ggMkACBScPyCBCQAICMw/YIFJAAgI3D5ggYkACAicPyCByQA
-ICMw/YIIJAAgI3D5ggkkACAicPyCCiQAICMw/YILJAAgI3D5ggwkACAicPyCDSQAICMw/YIOJAAg
-I3D0gg8oACAmcPnMCACAAkIwrNysTPv3ZB4gAXww+B0BID0AN+Dz6QoABBBQMP+qDAAgAkIw+ZIA
-KAAgQ/DTD/kWRCAAEEgwDwIA0w/TD22pB/mEACACAkIwKhJErKwsth4d91HAwSzUiMg2/wIABADd
-AKDSYNEPAAAe90wANRGuU/5cAAAEEFAw/PdJEAEQWDD9LAACAAB48FvFz8Cl+woBIgAAYPBbxcwt
-MAAjFkD1CgAhCAJgcPTRLmD/EHgw/wIABgCbf1DA0P0WRSAAEFgwKxZH8AA+b+oQMDAAAC4SR9MP
-ZO2dKxJBiOEsEkL9EkMiAABQcAuAAPahDGIAADKwLBJA0w8swADVcPTAf2D/EGgwfcF3+x0BIgAA
-UHBb/NUsEAD6FkYgAgI5cA8CAP0KWy/OADcgfcmjKByEqKUuUHsvCl0PAgB/6ZItHQH73AQiAABQ
-cPzcCCAYAmtwW/xi+hZHITwANqAvEkVl8SQZ9xCIoXmJiSsSQPz3ChABEFAwKhZFA7sMK8YdY/9y
-ZmB3HfcFwMEs1Ihj/TIV9wYY9wYAMxGlNfP+1mIAIETwAAAV9wMY9wMAMxGlNfP+wWIAIETwGPZz
-KIDRGvb++fb/EJAAfjAjkcQHMxHz/qJiACBU8AAAAAAAAPXMAAAAEDgw8/ydb+oQMDD1zAAAABA4
-MPP8jW/qEDAwJRJGKByE8/x/ZAAgRXAAACORwwczEfP+XmIAIFTwAAD79pkSAABQ8FvHvvoKBiAA
-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
-AAAAaWQDpaiXgHJLKPo8AAIAAFkwW5Uy+GESYAICITD5Yt9oACAusCeVAGP/26WrJ7QAY//T0Q8r
-ongpooCjuwm7Efhha2gAIF5waGJqaWTkpZyXwNEPAPhANGACAhEwckOpY//PAAAsoniEESmyg6PM
-+cwRAAICITD4YR1oACBmcGhiHWhkInJDgWP/pwAAGcfeqTkpkOVj/0+lmiekAGP/5KWbJ7UAY//c
-pZyXwGP/1aWdJ9QA0Q+lniflANEPIAKRLAzAAAIgBbo0IAKRMAjAAAggBbo0IAKRNDzAAAwgBbmE
-IAKROAbAADQgBbuQIAKRPAjAADggBbo0IAKRQALAADwgBbuQIAKRRAjAAEAgBbo0IAKRSAhAAEgg
-Bbq8IAKRTAhAAEwgBbq8IAKRUAhAAFAgBbq8IAKRVAhAAFQgBbq8IAKRWCBAAFggBbq8IAKRXCBA
-AGggBbq8IAKRYCBAAHggBbq8IAKRZCBAAIggBbq8IAKRaCBAAJggBbq8IAKRbCBAAKggBbq8IAKR
-cCBAALggBbq8IAKRdCBAAMggBbq8IAKReAxAANggBbkEIAKRfAxAAOQgBbkEIAKRgAxAAPAgBbkE
-IAKRhAxAAPwgBbkEIAKRiAxAAQggBbkEIAKRjAxAARQgBbkEIAKRkAxAASAgBbkEIAKRlAxAASwg
-BbkEIAKRmAhAATggBbq8IAKRnAhAATwgBbq8IAKRoAhAAUAgBbq8IAKRpBBAAUQgBbq8IAKRqBBA
-AUwgBbq8aW5vZGVfZmMtPmZsb3djX2ZsYWdzIFsweCV4XSwgaW5vZGVfZmMtPmZsb3djX2J1Zi0+
-Zmlmby5udW1fYnl0ZXMgWyV1XQoAAAAAAAAAAABhdXRoZW50aWNhdGVfdGFyZ2V0OiBLRVlfQ0hB
-UF9SRVNQIC0gWzB4JXgleCV4JXgleCV4JXgleF0KAAAAAAAAYXV0aGVudGljYXRlX3RhcmdldDog
-S0VZX0NIQVBfUkVTUCAtIFsweCV4JXgleCV4JXgleCV4JXhdCgAAAAAAAGF1dGhlbnRpY2F0ZV90
-YXJnZXQ6IEluY29ycmVjdCBwYXNzd29yZAoAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogS2V5IENI
-QVBfQSwgdmFsIFslZF0KAAAAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogS2V5IENIQVBfSSwgdmFs
-IFslZF0KAAAAAAAAAAAAAENIQVBfQzogZGlnZXN0IGV4cGFuc2lvbiBlcnJvcgoAdmFsaWRhdGVf
-a2V5dmFsOiBLRVlfQ0hBUF9OQU1FLCBsZW4gWzB4JXhdCgAAAAAAQ0hBUF9OOiBUYXJnZXQgdXNl
-cmlkIG1pc21hdGNoCgBDSEFQX1I6IGRpZ2VzdCBleHBhbnNpb24gZXJyb3IKAFJlY2lldmVkIEF1
-dGhNZXRob2QgdmFsdWUKAAAAAAAAdmFsaWRhdGVfa2V5dmFsOiBmbG93Y19mb2lzY3NpX2Nvbm5f
-ZmxhZ3MgWzB4JXhdCgAAAAAAAAAAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogZmxvd2NfZm9pc2Nz
-aV9jb25uX2ZsYWdzIFsweCV4XQoAAAAAAAAAAAAAAAAAAABOZWdvIEZCTCBbJXVdCgAAS0VZX01B
-WFJDVkRTTCBbJXVdCgAAAAAAAAAAAAAAAABEdXBsaWNhdGUgaXNjc2kga2V5CgAAAAAAAAAAAAAA
-AGZvaXNjc2lfcGFyc2VfcmN2ZF9wYXJhbXM6IGVycm9yCgAAAAAAAAAAAAAAAAAAAGZvaXNjc2lf
-cGFyc2VfcmN2ZF9wYXJhbXM6IHJsZW4gJWQKAAAAAAAAAAAAAAAAAGFzeW5jX3BkdTogbG9nb3V0
-IHJlcXVlc3RlZCBibG9ja2luZyBzZXNzaW9uCgAAAGFzeW5jX3BkdTogc2Vzcy9jb25uIGRyb3Ag
-cmVxdWVzdGVkIGJsb2NraW5nIHNlc3Npb24KAAAAAAAAAAAAAABsb2dpbl9yZXNwOiBmbG93Y19m
-b2lzY3NpX2Nvbm5fZmxhZ3MgWzB4JXhdCgAAAABsb2dpbl9yZXNwOiBmbG93Y19mb2lzY3NpX2Nv
-bm5fZmxhZ3MgWzB4JXhdLCByYyBbMHgleF0KAAAAAAAAAAAAaVNDU0kgU2VjLXBhcmFtcyByZWNl
-aXZlZGhhdmUgZXJyb3JzISEKAAAAAAAAAAAAVGFyZ2V0IG1vdmVkIHRlbXAuIGNvbm4gJXgsIHNl
-c3MgJXgKAAAAAAAAAAAAAAAATG9naW4gRmFpbGVkISEuIGNvbm5fZmMgWzB4JXhdLCBzZXNzX2Zj
-IFsweCV4XSwgc3RhdHVzX2NsYXNzIFsweCV4XQoAAAAAAAAAAAAAAABsb2dpbl9yZXNwOiBzZXNz
-X2ZjLT5mbG93Y19pZCBbJXVdLCBjb25uX2ZjLT5mbG93Y19pZCBbJXVdIGxvZ2dlZCBpbgoAAAAA
-AAAAAAAAAFByb3RvY29sIEVycm9yIGNiaXQgJWQgdGJpdCAlZCBjc2cgJWQgbnNnICVkCgAAAGNv
-bm4gdGlkIFsweCV4XSwgcnhfZGF0YS0+c2VxIFsweCV4XSwgcnhfZGF0YS0+bGVuIFsweCV4XSwg
-cnhfZGF0YS0+c3RhdHVzIFsweCV4XQoAAAAAAAAAAAAAAAAAAGNza19mYy0+Zmxvd2NfY3NvY2tf
-b2Zmc2V0IFsweCV4XSwgZGxlbjE2IFsweCV4XQoAAAAAAAAAAAAAAAAAAABhY3RfZXN0OiBmbG93
-Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4JXhdCgAAAAAAAABhY3RfZXN0YWI6IHRjYl9mYy0+Zmxv
-d2NfYnVmIFsweCV4XSwgdGNiX2ZjLT5mbG93Y190eXBlIFsweCV4XSB0Y2JfZmMtPmZsb3djX3N0
-YXRlIFsweCV4XSwgbnBhZ2VzIFsweCV4XSwgZmxvd2NfdHBfc25kX21heCBbMHgleF0KAAAAAAAA
-AAAAAAAAAABhY3RfZXN0YWI6IGF0aWQgWzB4JXhdLCB0aWQgWzB4JXhdLCBvcCBbMHgleF0sIHJj
-dl9pc24gWzB4JXhdLCBzbmRfaXNuIFsweCV4XSwgY3NvY2stPmZsb3djX3N0YXRlIFsweCV4XSwg
-dGNwX29wdCBbMHgleF0sIHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdIAoAAAAAAAAAAAAAAAAAY3Nr
-X2ZjLT5mbG93Y19jc29ja19jb29raWUgWzB4JXhdIAoAAAAAAAAAAAAAAAAAbDNpbjRfZGV2X2Nv
-bmZpZzogd3ItPnBhcmFtLnZsYW5pZCBbJXVdLCBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X3Zs
-YW5kZXYgWzB4JXhdCgAAAAAAAAAAAAAAAAAAbmV0X2wzaW40X2Rldl9jb25maWc6IGwyZGV2X2Zj
-LT5mbG93Y19pZCBbMHgleF0sIGFkZHJlc3MgYWxyZWFkeSB1c2VkIGJ5IHBvcnQgJWQKAAAAAAAA
-AAAAAAAAAAAAbmV0X2wzaW40X2Rldl9jb25maWc6ICBhZGRyIFsweCV4XSwgbWFzayBbMHgleF0s
-IGd3IFsweCV4XSwgcmVmX2NudCBbMHgleF0gaW4gdXNlCgAAAAAAAAAAAAAAAAAAd3JoX2NobmV0
-X2lmY29uZjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgbDJkZXZfZmMtPmZsb3djX3R5cGUg
-WyUweF0sIGlmY29uZl93ci0+c3Vib3AgWzB4JXhdCgAAAAAAAAAAAAAAAAAAAHdyaF9jaG5ldF9p
-ZmNvbmY6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIHVua25vd24gc3Vib3AgWzB4JXhdCgAA
-AAAAAAAAAAAAAAAAd3JoX2NobmV0X2lmY29uZjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwg
-cmMgJWQKAAAAAAAAAAAAAAAAAG5ldGlmX2lwX2NvbmZsaWN0X3RpbWVyX2NiOiBsMmRldl9mYy0+
-Zmxvd2NfaWQgWzB4JXhdLCBpbmRldmN0eHQtPnN0YXRlIFslZF0sIGluZGV2Y3R4dC0+cmV0cnlf
-Y250IFslZF0KAAAAAAAAAABuZXRpZl9pcF9jb25mbGljdF90aW1lcl9jYjogbDJkZXZfZmMtPmZs
-b3djX2lkIFsweCV4XSwgaW5kZXZjdHh0IFsweCV4XSwgaW4gZnJlZSBzdGF0ZQoAAAAAAAAAAABj
-bWRoX2NobmV0X2lmYWNlOiBmYyBbMHgleF0sIGZjLT5mbG93Y19pZCBbMHgleF0sIGZjLT5mbG93
-Y190eXBlIFsweCV4XSwgcCBbMHgleF0sIGxlbjE2IFsldV0sIGxvYyBbMHgleF0KAAAAAAAAY21k
-aF9jaG5ldF9pZmFjZTpsMmRldl9mYyBbMHgleF0sIGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0s
-IGwyZGV2LT5mbG93Y190eXBlIFsldV0sIGwyZGV2X2ZjLT5mbG93Y19uZXRfbDJkZXZfZmxhZ3Mg
-WyUweF0KAAAAAABjbWRoX2NobmV0X2lmYWNlOiByMlswXSAldSByMlsxXSAldQoAAAAAAAAAAAAA
-AABjbWRoX2NobmV0X2lmYWNlOiBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X2ZsYWdzIGNoYW5n
-ZWQgZnJvbSBbJTB4XSB0byBbJTB4XSwgcmMgWyVkXQoAAAAAAAAAAABjaG5ldF9sMmRldl91cF9t
-Yl9jYjogcmMgWyVkXSwgcG9ydCBbJXVdLCBzdGF0ZSBbJXVdLCBjb29raWUgWzB4JXhdCgAAAAAA
-AAAAAAAAAGNobmV0X3F1ZXVlX3htaXQ6IGZjLT5mbG93Y19pZCBbMHgleF0sIGJ1Zl9sZW4gWzB4
-JXhdLCBidWZmZXJlZCBbMHgleF0sIGZpZm8ubnVtX2J5dGVzIFslMHhdCgAAAGRoY3BfcHJvY2Vz
-c19jYjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgZGhjdHh0LT5zdGF0ZSBbJTB4XSwgZGhj
-dHh0LT5ydHJ5X2NudCBbJXVdCgAAAAAAAAAAAGRoY3BfdGltZXJfY2I6IERIQ1BESVNDT1ZFUiBz
-ZW50LCBidXQgbm8gcmVwbHkgZnJvbSBhbnkgcG9zc2libGUgc2VydmVyIG9uIHRoZSBuZXR3b3Jr
-LiBSZXRyeWluZyBhZ2FpbgoAAAAAAAAAAABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2Nf
-aWQgWzB4JXhdLCBzZW5kaW5nIERIQ1BESVNDT1ZFUiBmb3IgZGhjdHh0IFsweCV4XSBvbiBwaWQg
-WyVkXQoAAABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBESENQT0ZG
-RVIgcmVjZWl2ZWQgZm9yIGRoY3R4dCBbJXhdIHBpZCBbJWRdCgAAAAAAAAAAAABkaGNwX3RpbWVy
-X2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCAgREhDUEFDSyByZWNlaXZlZCBmb3IgZGhj
-dHh0IFsleF0sIHBpZCBbJWRdCgAAAAAAAAAAAABkaGNwX3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxv
-d2NfaWQgWzB4JXhdLCBkaGN0eHQtPmlwYWRkciBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAGRoY3Bf
-dGltZXJfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIG5vIHJlcGx5IGZyb20gZGhjcCBz
-ZXJ2ZXIsIHRpbWluZyBvdXQKAAAAAAAAAAAAAAAAAAAAAGxvZ2luX3BhcmFtczogY29ubl9mYy0+
-Zmxvd2NfZm9pc2NzaV9jb25uX2ZsYWdzIFsweCV4XQoAAAAAAAAAAABsb2dpbl9wYXJhbXM6IGNv
-bm5fZmMtPmZsb3djX2ZvaXNjc2lfY29ubl9mbGFncyBbMHgleF0KAAAAAAAAAAAAYXV0aF9uZWdv
-X3NlY3VyaXR5OiBzZW5kX2ZsYWcgWzB4JXhdLCBhdXRoX3BvbGljeSBbMHgleF0KAAAAAAAAAGF1
-dGhfbmVnb19zZWN1cml0eTogS0VZX0NIQVBfUkVTUCAtIGhhc2hbMHgleCV4JXgleCV4JXgleCV4
-XQoAAABhdXRoX25lZ29fc2VjdXJpdHk6IEtFWV9DSEFQX1JFU1AgLSBoYXNoWzB4JXgleCV4JXgl
-eCV4JXgleF0KAAAAYXV0aF9uZWdvX3NlY3VyaXR5OiBLRVlfQ0hBUF9SRVNQIC0gZXJyb3IgZW5j
-b2RpbmcgdG8gaGV4CgAAAAAAAGF1dGhfbmVnb19zZWN1cml0eTogS0VZX0NIQVBfUkVTUCAtIGVs
-ZW4gWzB4JXhdCgAAAAAAAAAAAAAAAAAAAABhdXRoX25lZ29fc2VjdXJpdHk6IEtFWV9DSEFQX0NI
-QUwgLSBlcnJvciBlbmNvZGluZyB0byBoZXgKAAAAAAAAYXV0aF9uZWdvX3NlY3VyaXR5OiBLRVlf
-Q0hBUF9DSEFMIC0gZWxlbiBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAHNlbmRfbG9naW5fcmVxdWVz
-dDpjb25uX2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlc3NfZmMtPmZsb3djX2lkIFsweCV4XSwgY3Ry
-bF94bWl0IFsweCV4XSwgc2Vzc19mYy0+Zmxvd2NfZm9pc2NzaV9zZXNzX3R5cGUgWzB4JXhdCgAA
-AAAAAAAAAAAAAAAAAHNlbmRfbG9naW5fcmVxdWVzdDogZmxhZyBbMHgleF0uCgAAAAAAAAAAAAAA
-AAAAAHNlbmRfbG9naW5fcmVxdWVzdDogdHhfbGVuIFsldV0KAAAAAAAAAAAAAAAAAAAAAHhtaXRf
-c2VuZHRhcmdldHM6IGNvbm4gdGlkIFsweCV4XSwgY3RybF94bWl0LT50dHQgWzB4JXhdLCBkYXRh
-X2xlbiBbJXVdLCBwYWRfbGVuIFsldV0KAAAAAAAAAAAAAHBpbmdfdGFyZ2V0OiBwaW5nIHRpbWVv
-dXQgYmxvY2tpbmcgc2Vzc2lvbgoAAAAAAHNlbmRfbm9wX291dDogY29ubiBmbG93X2lkIFsweCV4
-XSwgcmVxIFsldV0sIHR0dCBbMHgleF0KAAAAAAAAAABjc29ja19mYWlsZWQ6IGNza19mYy0+Zmxv
-d2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgc2Vzc19mYy0+Zmxvd2Nf
-aWQgWzB4JXhdLCBzZXNzX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGV2dCBbMHgleF0KAAAAAAAA
-AAAAAABjb3NrY19mYWlsZWQ6IHNlc3Npb24gYmxvY2ssIGV2ZW50IFsweCV4XQoAAAAAAABjb3Nr
-Y19mYWlsZWQ6IHNlc3Npb24gYmxvY2ssIGV2ZW50IFsweCV4XQoAAAAAAABjaG5ldF9maW5kX2wy
-dF9lbnRyeTogZGFkZHIgWyUwOHhdLCBbMHglMDh4XSwgbG9jYWwgbmV0d29yayBbJWRdCgAAAAAA
-AAAAAAAAAAAAAGwydGVudCBbJTB4XSwgbDJ0ZW50LT5pZHggWyVkXQoAcmMgWyVkXSwgY3NrX2Zj
-IFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAGNzb2NrX2Zy
-ZWU6IHNpemVvZihjc2tfZmMtPnUuY3NvY2spIFsldV0sIGJ5dGVzCgAAAAAAAAAAAAAAAAAAAABU
-Q1AgY29ubiBlc3RhYmxpc2htZW50IGZhaWxlZCAlZAoAAAAAAAAAAAAAAAAAAABJbnZhbGlkIG9w
-Y29kZSAweCV4IGluIGN0cmwgcGF0aAoAAAAAAAAAAAAAAAAAAABERFAgZXJyb3IgWzB4JXhdLCBh
-Ym9ydGluZyBjb25ubiBbMHgleF0KAAAAAAAAAABpc2NzaV9oZHI6IGJhZCB0Y2Igc3RhdGUgdG8g
-cnggZGF0YSwgdGNiX2ZjLT5mbG93Y19pZCBbMHgleF0sIHRjYl9mYy0+Zmxvd2Nfc3RhdGUgWzB4
-JXhdCgAAAAAAAABpc2NzaV9oZHJfcng6IEludmFsaWQgdGFzayBzdGF0ZSAweCV4IGZvciB0YXNr
-IDB4JXgKAAAAAAAAAAAAAAAAaXNjc2lfZGF0YTogcmN2ZCBwYXlsb2FkCgAAAAAAAABkcm9wX2Fs
-bF90YXNrOiByZXF1ZXN0ZWQgbGlkeCBbJXVdCgAAAAAAAAAAAAAAAABnZXRfcmVmX3Rhc2s6IGlz
-dGFzay0+Zmxvd2NfaWQgWzB4JXhdLCBpc3Rhc2tfZmMtPmZsb3djX3N0YXRlIFsldV0sIGFicnRf
-bGlkeCBbMHgleF0sIGxpZHggWzB4JXhdCgAAAAAAAAAAAAAAAAAAcHJvY2Vzc190bWZfcmVzcG9u
-c2U6IGlzdGFza19mYy0+Zmxvd2NfYnVmLT5zY2hlZF9ub2RlLm5leHQgWzB4JXhdLCBpc3Rhc2tf
-ZmMgWzB4JXhdLCBpc3Rhc2tfZmMtPmZsb3djX2lkIFsldV0KAHByb2Nlc3NfdG1mX3Jlc3BvbnNl
-OiB1bHB0eHBsZW4xNiBbJXVdCgAAAAAAAAAAAHByb2Nlc3NfdG1mX3Jlc3BvbnNlOiBkZWxheV9w
-cm9jZXNzaW5nLCBvcCBbJXhdCgAAAAAAAAAAAAAAAAAAAABwcm9jZXNzX3RtZl9yZXNwb25zZTo6
-IHdyIG9wY29kZSBbMHgleF0KAAAAAAAAAABwcm9jZXNzX3RtZl9yZXNwb25zZTo6IHRhc2sgZnVu
-Y3Rpb24gWzB4JXhdCgAAAABjYWxsaW5nIGRyb3BfdGFzaywgbGlkeCBbMHgleF0KAHdyaF9mb2lz
-Y3NpX25vZGU6IG5vZGVfd3ItPmZsb3dpZF9sZW4xNiAyIFsleF0KAHdyaF9mb2lzY3NpX2NoYXA6
-IGlkX2xlbiBbJXhdLCBzZWNfbGVuIFsleF0KAAAAAHdyaF9mb2lzY3NpX2NoYXA6IHRndF9pZF9s
-ZW4gWyV4XSwgdGd0X3NlY19sZW4gWyV4XQoAAAAAAAAAAAAAAABwZWVyX2NvbjogY3NrX2ZjID0+
-IGZsb3dpZCBbMHgleF0sIGZsb3djX2J1ZiBbMHgleF0KAAAAAAAAAAAAAAAAZm9pc2NzaV9jdHJs
-OiBzdWJvcCBbMHgleF0sIHNlc3NfdHlwZV90b19lcmwgWzB4JXhdLCBzZXNzX3R5cGUgWzB4JXhd
-CgAAAAAAAAAAAAB3YXRjaGRvZyBjbWQgaGFuZGxlciAodGltZSAldSBhY3Rpb24gJXUpCgAAAAAA
-AABXQVRDSERPRzogZGV2aWNlIHNodXRkb3duCgAAAAAAAFdBVENIRE9HOiBieXBhc3MgdGltZW91
-dAoAAAAAAAAAV0FUQ0hET0c6IEZMUiAtIG5vdCBpbXBsZW1lbnRlZCB5ZXQKAAAAAAAAAAAAAAAA
-V0FUQ0hET0c6IHRlbXBlcmF0dXJlIG9mICVkQyBleGNlZWRzIHRocmVzaG9sZCBvZiAlZEMKAAAA
-AAAAAAAAAGZpbHRlcjogcG9yZ3JhbW1pbmcgdGlkICV1IChsZSB0Y2FtIGluZGV4ICV1KS4uLgoA
-AAAAAAAAAAAAAAAAAABmaWx0ZXI6IHJlcXVlc3RpbmcgY29tcGxldGlvbi4uLgoAAAAAAAAAAAAA
-AAAAAABGQ09FIEZyZWU6IHN0aWxsIHlpZWxkZWQgd2hlbiBmcmVlaW5nLi4uZmxvd2NfaWQgJXgg
-Zmxvd2NfZmxhZ3MgJXggCgAAAAAAAAAAAAAAAHBvcnQgJWQgcHJpb3IgJWQgc2VsZWN0ICVkIHBy
-b3RvY29sSUQgMHglMDR4CgAAAHBvcnQgJWQgc2V0IHBmY19lbiA9IDB4JXgKAAAAAAAAcG9ydCAl
-ZCBzZXQgcGdpZF8wXzcgPSAweCUwOHggcGdfcGVyY2VudGFnZSAweCUwOHhfJTA4eCBudW1fdGNz
-X3N1cHBvcnRlZCAlZAoAAABwb3J0ICVkIHNldCBwZmNfZW4gPSAweCV4CgAAAAAAAEZDb0UgRERQ
-IGZhaWxlZCA6IG94X2lkIDB4JXggcnhfaWQgMHgleAoAAAAAAAAAAEZDb0UgRERQIGZhaWxlZCA6
-IERkcFJlcG9ydCAweCV4IERkcFZhbGlkIDB4JXgKAFBSTEkgUnNwIHRpbWVkb3V0IDogZmxvd2Nf
-aWQgMHgleCBveF9pZCAweCV4IHJ4X2lkIDB4JXggCgAAAAAAAABjYW5ub3QgYWxsb2NhdGUgb2Zm
-bG9hZGVkIGZpbHRlciBjb25uZWN0aW9uCgAAAABjYW5ub3QgYWxsb2NhdGUgb2ZmbG9hZGVkIGZp
-bHRlciBJUHY2IGNvbm5lY3Rpb24KAAAAAAAAAAAAAAAAAAAAdW9bJXVdOiB3ciAlcCB3ci0+bGVu
-Z3RoICV1IG1zcyAldQoAAAAAAAAAAAAAAAAAdW9bJXVdOiBmIDB4JTA4eCBkc3RfY3BsIDB4JTA4
-eCBzcmNfY3BsIDB4JTA4eCBpbW1kbGVuMTYgJXUKAAAAAHVvWyV1XTogbGFzdCBtc3MgJXUKAAAA
-AAAAAAAAAAAAdW9bJXVdOiAhbGFzdCB3ci0+c2NoZWRwa3RzaXplICV1CgAAAAAAAAAAAAAAAAAA
-aW52YWxpZCBidWZmZXIgZ3JvdXBbJXVdIGNvbmZpZ3VyYXRpb246IG10dSAldSBsd20gJXUgaHdt
-ICV1IGR3bSAldQoAAAAAAAAAAAAAAABmYyAldSB2ZiAldSBnb3QgaXZmPTB4JXgscmFuZ2U6ICUj
-eC0lI3ggKCV1LyV1IHVzZWQpCgAAAAAAAAAAAAAAVkkgJXUgY2Fubm90IGdldCBSU1Mgc2xpY2U6
-IE5vIG1vcmUgc2xpY2VzIGF2YWlsYWJsZSAodXNlZCAldS8ldSkKAAAAAAAAAAAAAAAAAABwZm4g
-JXUgdmZuICV1IHdpdGggcG9ydCBtYXNrIDB4JXggY2Fubm90IGFjY2VzcyBwb3J0ICV1LCByZXQg
-JWQKAAAAAAAAAAAAAAAAAAAAAHBmbiAldSB2Zm4gJXUgY291bGQgbm90IGFsbG9jYXRlIHZpaWQs
-IHJldCAlZAoAAHBmbiAldSB2Zm4gJXUgY291bGQgbWFwIHZpaWQgIDB4JXggdG8gZmxvd2MsIHJl
-dCAlZAoAAAAAAAAAAAAAAABwZm4gJXUgdmZuICV1IGNvdWxkIG5vdCBhbGxvY2F0ZSB1d2lyZSBm
-dW5jICVkIG1hYyBhZGRyLCByZXQgJWQKAAAAAAAAAAAAAAAAAAAAAG1paV9mb3JjZV9zcGVlZFsl
-dV06IHJjYXBzIDB4JXgKAAAAAAAAAAAAAAAAAAAAAG1paV9saW5rX3N0YXR1c1sldV06IGJtc3Ig
-MHglMDh4IHN0YXR1cyAldSBtYWNfbHMgMHglMDh4CgAAAAAAAABwb3J0X2NtZF9oYW5kbGVyOiB1
-bmtub3duIHUuZGNiLnR5cGUgMHgleAoAAAAAAABwb3J0WyV1OjB4JTAyeDoweCUwMnhdOiBwaHkg
-cmVzZXQgbm90IGF2YWlsYWJsZQoAAAAAAAAAAAAAAAAAAAAAcG9ydFsldToweCUwMng6MHglMDJ4
-XTogdW5rbm93biBhY3Rpb24gMHgleAoAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogdW5rbm93
-biByZWFkIGFjdGlvbiAweCV4CgAAAAAAAAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5OiB0aWQgJXUg
-Y3BsIDB4JTA4eCUwOHgKAAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5OiB0aWQgJXUgY3BsIDB4JTA4
-eCUwOHggMHglMDh4JTA4eAoAAAAAAAAAAAAAAAAAAABjcGxfZXJyX25vdGlmeTogdGlkICV1IGxl
-biAldQoAAEZDT0UgRnJlZTogc3RpbGwgeWllbGRlZCB3aGVuIGZyZWVpbmcuLi5mbG93Y19pZCAl
-eCBmbG93Y19mbGFncyAleCAKAAAAAAAAAAAAAAAARkNPRSBCUCBXUiBFUlI6IFdSIHdpdGggY29v
-a2llICV4JXggZXJyb3JlZCBiYWNrIAoAAAAAAAAAAAAAAAAAAHNjc2lfYWJvcnQ6IEVudGVyaW5n
-IEFib3J0X3Rhc2ssIGJ1ZmZlcmVkIFsldV0KAHNjc2lfYWJvcnQ6OiB3ci0+aXFpZCBbMHgleF0s
-IGlzdGFza19mYy0+Zmxvd2Nfc2dlX2lxaWQgWzB4JXhdCgBzY3NpX2Fib3J0OjogbHVuX2lkeCBb
-MHgleF0KAAAAAHNjc2lfYWJvcnQ6IHJlZiB0YXNrIG5vdCBvdXRzdGFuZGluZwoAAAAAAAAAAAAA
-AHNjc2lfYWJvcnQ6IHNyZXEtPm9wY29kZSBbMHgleF0gZmxhZ3MgWzB4JXhdCgAAAHNjc2lfYWJv
-cnQ6IHRhc2tfaWR4IFsldV0sIGl0dCBbMHgleF0KAAAAAAAAAAAAAGFib3J0L2Nsb3NlIFdSIHdp
-dGggY29va2llIDB4JWx4IHdhcyBpc3N1ZWQgb24gc3NuIDB4JXggaW4gd3Jvbmcgc3RhdGUgMHgl
-eAoAAAAAYWJvcnQgV1Igb24gc3NuIDB4JXggZGlkIG5vdCBmaW5kIFdSIHdpdGggY29va2llIDB4
-JXgleAoAAAAAAAAAAGNsb3NlIFdSIHdpdGggY29va2llIDB4JWx4IG9uIHNzbiAweCV4O2RpZCBu
-b3QgZmluZCBXUiB3aXRoIGNvb2tpZSAweCVseAoAAAAAAAAAYWJvcnQgV1Igb24gc3NuIDB4JXgg
-d2FzIGlzc3VlZCBvbiB4Y2hnIDB4JXggd2l0aCByeF9pZCAweCV4IGluIHdyb25nIHN0YXRlIDB4
-JXgKAAAAAAAAAAAAAAAAAAAAcG9ydCAlZCBhcHBsSUQgMHglMDR4IG91aSAweCUwNnggdXNlcl9w
-cmlvciAlZAoAc2VuZCBkY2J4IGluZm86Zmxvd2NpZCAldQoAAAAAAABzZW5kIGRjYnggY29tcGxl
-dGUKAAAAAAAAAAAAAAAAAERDQlggcG9ydCAldSBhbGxfc3luY2QgPSAldQoAAAAAY2huZXRfbDJ0
-X3VwZGF0ZTogbDJ0X3VwZGF0ZSByZXF1ZXN0IHNlbnQgbDJ0ZW50IFslMDh4XSwgbDJ0ZW50LT5p
-ZHggWyVkXSwgbDJ0ZW50LT52bGFuIFslZF0KAAAAbmV0aWZfcHJvY2Vzc19kaGNwOiBsMmRldl9m
-Yy0+Zmxvd2NfaWQgWzB4JXhdLCBwcm9jZXNzaW5nLCBvcHRfbGVuICV1CgAAAAAAAAAAAABjaG5l
-dF9kaGNwX3JlY3Y6IHZsYW5pZCBbJXVdLCBsMmRldl9waWRfZmMtPmZsb3djX25ldF9sMmRldl92
-bGFuZGV2IFsweCV4XSwgbDJkZXZfZmMgWzB4JXhdCgAAAABjaG5ldF9kaGNwX3JlY3Y6IGwyZGV2
-X2ZjLT5mbG93Y19pZCBbMHgleF0sIGRoY3R4dC0+c3RhdGUgWyVkXSwgbWFsYWNpb3VzIGRoY3Ag
-cmVjdiBmb3Igbm8gcmVxdWVzdAoAAAAAAAAAAAAAAAAAZGhjdHh0LT5zdGF0ZSA6ICVkCgAAAAAA
-AAAAAAAAAABsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBCYWQgREhDUCBjb29raWUgcmVjaWV2
-ZWQsIGFib3J0aW5nCgAATl9QT1JUIDB4JXgleCV4IHJlamVjdGVkIFBMT0dJIHdpdGggcmVhc29u
-IGNvZGUgJXgKAAAAAAAAAAAAAAAAAEFCVFMgd2hpbGUgYXdhaXRpbmcgUFJMSSBSc3A6IGZsb3dj
-X2lkIDB4JXggb3hfaWQgMHgleCByeF9pZCAweCV4IAoAAAAAAAAAAAAAAAAAQUJUUyBmYWtlIFJz
-cDogbG9jIDB4JXggb3hfaWQgMHgleCByeF9pZCAweCV4CgAAcmVsZWFzZV90aWQ6IHNpemVvZih0
-Y2JfZmMtPmZsb3djX2ZvaXNjc2lfY29ubikgWyV1XSwgYnl0ZXMKAAAAAGFjdF9vcGVuX3JwbDog
-YXRpZCBbMHgleF0sIHRpZCBbMHgleF0sIG9wIFsweCV4XSwgc3RhdHVzIFsweCV4XQoAAAAAAAAA
-AAAAAAAAAAAAYWN0X29wZW5fcnBsOiBjc2tfZmMtPnRjYl9zdGF0ZSBbMHgleF0sIGNza19mYy0+
-ZmxhZ3MgWzB4JXhdLCB0Y2JfZmMtPmZsb3djX3N0YXRlIFsweCV4XQoAAAAAAAAAc2VuZF9hYm9y
-dF9ycGw6IGNza19mYy0+Zmxvd2NfdHlwZSBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhd
-LCB0aWQgWzB4JXhdLCB1bHB0eGNoIFsldV0sIGJ1ZmZlcmVkIFsldV0KAAAAAHdyaF9vZmxkX3Rj
-cF9jbG9zZV9jb25fcmVwbHk6IHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCB0Y2JfZmMtPmZsb3dj
-X3R5cGUgWzB4JXhdLCBsZW4xNiBbJXVdLCBsb2MgWyV1XQoAAAAAAAAAAAB3cmhfb2ZsZF90Y3Bf
-Y2xvc2VfY29uX3JlcGx5OiBycGwtPm9wX1RpZCBbMHgleF0sIHJwbD5zdGF0dXMgWzB4JXhdLCBy
-cGwtPnNuZF9ueHQgWzB4JXhdLCBycGwtPnJjdl9ueHQgWzB4JXhdCgAAdGNwX2Fib3J0X3JwbF9y
-c3M6IHRpZCBbMHgleF0sIHN0YXR1cyBbMHgleF0KAAAAdGNwX2Fib3J0X3JlcV9yc3M6IHRpZCBb
-MHgleF0sIHN0YXR1cyBbMHgleF0KAAAAcGt0c2NoZWRfY2xfcmxbJXU6JXVdOiBtb2RlIHwgdW5p
-dCB8IHJhdGUgMHglMDZ4IG1pbiAldSBtYXggJXUgcGt0c2l6ZSAldQoAAAAAAABwYXJhbV9kbWFx
-WzB4JXg6MHgleF06IGRtYXEgMHgleCByZWFkICV1IHBmICV1IHJldCAlZAoAAAAAAAAAAAAATUNb
-JXVdIGluaXRfc3RhdGVfbWFjaGluZSAweCUwMngKAAAAAAAAAAAAAAAAAAAATUMgaW5pdGlhbGl6
-YXRpb24gbm90IGNvbXBsZXRpbmcsIE1DIGN1cnJlbnQgaW5pdCBzdGF0ZSBpcyAweCUwMngKAAAA
-AAAAAAAAAAAAAABNQ1sldV0gX2h3X21jX2luaXRfbWMKAAAAAAAAAAAAAF9od19tY19pbml0X21j
-X2ZwZ2FbJXVdOiBlcnJvciAlZAoAAAAAAAAAAAAAAAAAAGh3X2xlX2ZpbHRlcl9jdHVwbGU6IHR1
-cGxlICV1IG5vdCBzcGVjaWZpZWQgYnV0IHJlcXVpcmVkIGZvciBtYXNrIDB4JXgKAAAAAAAAAAAA
-bGUgY29uZmlndXJhdGlvbjogaGFzaCByZWdpb24gdG9vIGxhcmdlIHRvIGVuYWJsZSBzZXJ2ZXIg
-c3JhbQoAAGxlIGNvbmZpZ3VyYXRpb246IGNhbm5vdCBlbmFibGUgc2VydmVyIHNyYW0gd2hlbiBo
-YXNoIHJlZ2lvbiBpcyBkaXNhYmxlZAoAAAAAAAAAbGUgY29uZmlndXJhdGlvbjogbmVudHJpZXMg
-JXUgcm91dGUgJXUgY2xpcCAldSBmaWx0ZXIgJXUgYWN0aXZlICV1IHNlcnZlciAldSBoYXNoICV1
-CgAAAAAAAAAAAAAAbGUgY29uZmlndXJhdGlvbjogbmVudHJpZXMgJXUgcm91dGUgJXUgY2xpcCAl
-dSBmaWx0ZXIgJXUgc2VydmVyICV1IGFjdGl2ZSAldSBoYXNoICV1IG5zZXJ2ZXJzcmFtICV1CgAA
-AAAAAAAAAAAAAGNmX3BhcnNlOiBmaWxlIG1lbXR5cGUgMHgleCBtZW1hZGRyIDB4JXggbWFwcGVk
-IEAgJXA6CgAAAAAAAAAAAABjb25maWd1cmVkIHdpdGggY2FwcyBuYm18bGluayAweCUwOHggc3dp
-dGNofG5pYyAweCUwOHggdG9lfHJkbWEgMHglMDh4IGlzY3NpfGZjb2UgMHglMDh4CgAAAAAAAABu
-ZXQgVkkgYWxsb2NhdGlvbiBmYWlsZWQgZm9yIGZjX2lkICV1IHdpdGggZXJyb3IgJWQKAAAAAAAA
-AAAAAAAAbmV0IFZJIG1hYyBhZGRyZXNzIHByb2dyYW1taW5nIGZhaWxlZCBmb3IgZmNfaWQgJXUg
-d2l0aCBlcnJvciAlZAoAAAAAAAAAAAAAAAAAAABuZXQgVkkgcnhtb2RlIHByb2dyYW1taW5nIGZh
-aWxlZCBmb3IgZmNfaWQgJXUgd2l0aCBlcnJvciAlZAoAAAAAbmV0IFZJIHJzcyBpbmRpcmVjdGlv
-biB0YWJsZSBwcm9ncmFtbWluZyBmb3IgZmNfaWQgJXUgZmFpbGVkIHdpdGggZXJyb3IgJWQKAAAA
-AABuZXQgVkkgcnNzIGNvbmZpZyBjb21tYW5kIGZhaWxlZCBmb3IgZmNfaWQgJXUgd2l0aCBlcnJv
-ciAlZAoAAAAAbmV0IFZJIGNvbW1hbmQgZmFpbGVkIGZvciBmY19pZCAldSB3aXRoIGVycm9yICVk
-CgAAAAAAAAAAAAAAAAAAAHBwbWF4IFsldV0sIGJpdHMgWyV1XSwgRldfSVNDU0lfUEFHRVBPRF9U
-QUdfSURYX01BWF9TSVpFIFsldV0KAABkZWZhdWx0IHRhZ21hc2sgWzB4JTB4XQoAAAAAAAAAAHBy
-b2dyYW1tZWQgdGFnbWFzayBbMHglMHhdCgAAAAAAcHBtLT5kZHBfaW5mby5sbGltaXQgWzB4JTB4
-XSwgcHBtLT5kZHBfaW5mby51bGltaXQgWzB4JTB4XSwgcHBtLT5kZHBfaW5mby5zaXplIFsweCUw
-eF0KAAAAAAAAAAAAcHBtLT5kZHBfaW5mby5tYXhfdHhzeiBbMHglMHhdIHBwbS0+ZGRwX2luZm8u
-bWF4X3J4c3ogWzB4JTB4XSBpb3NpemUgWzB4JTB4XQoAAABwcG1heCBbJXVdLCBpZHhfYml0cyBb
-JXVdLCBpZHhfbWFzayBbMHglMHhdLCByZXN2ZF90YWdfbWFzayBbMHglMHhdLCB0YWdtYXNrIFsw
-eCUweF0KAAAAAAAAAAAAAAB0YWcgaXR0IDB4JTB4LCBiaXRzICV1LCBhZ2UgMHglMHgsIGJpdHMg
-JXUKAAAAAABjeGNuaWMtPmlzY3NpX3BwbSBbMHglMHhdCgAAAAAAAHNjc2lfcGxkX3NpemUgWyV1
-XSwgQUxJR04oc2NzaV9wbGRfc2l6ZSwgMTYpIFsldV0KAAAAAAAAAAAAAAAAAABtYXhfcHBvZF96
-b25lcyBbJXVdCgAAAAAAAAAAAAAAAGZvaXNjc2lfaW5pdDogZm9pc2NzaV9pbml0X2RvbmUgWyV1
-XSwgZGV2LnJlcy5mb2lzY3NpX250YXNrcyBbJXVdLCBkZXYucmVzLmZvaXNjc2lfbnNlc3MgWyV1
-XSwgZGV2LnJlcy5uY3NvY2sgWyV1XSwgZGV2LnJlcy5mb2lzY3NpX25pbml0IFsldV0sIHJjIFsl
-ZF0KAAAAAAAAAABjaF9jbF9yYXRlWyV1LyV1XTogY2FwcGVkIGNsYXNzIHJhdGUgZnJvbSByZXF1
-ZXN0ZWQgJXUgdG8gY29uZmlndXJlZCAoZWZmZWN0aXZlKSBjaGFubmVsIHJhdGUgJXUKAAAAAAAA
-AAAAAAAAAAAAY2hfY2xfcmF0ZVsldS8ldV06IGluY3JlYXNlZCBkZWZpY2l0X2luY3IgZnJvbSBy
-ZXF1ZXN0ZWQgJXUgdG8gcmVxdWlyZWQgbWluIG9mICV1OyByYXRlICV1IChlZmYgJXUpIGRlZmlj
-aXRfbWF4ICV1CgAAAAAAAAAAAAAAAABwa3RzY2hlZCBjaGFubmVsICV1IHNldHMgc3BlZWQgKGZy
-b20gJXUpIHRvICV1IGticHMKAAAAAAAAAAAAAAAAcG9ydF9jbWRfaGFuZGxlcjogdW5rbm93biB1
-LmRjYi50eXBlIDB4JXgKAAAAAAAAaTJjIGVycm9yIGNhdXNlZCBieSBtb2R1bGUgdW5wbHVnCgAA
-AAAAAAAAAAAAAAAAc2VuZHRvIHBlbmRpbmc6IHdyX3BlbmQgJXAgZm9yIHBvcnQgJXUsICB3YW50
-IHRvIHNlbmQgdG8gcG9ydCAldQoAAAAAAAAAAAAAAAAAAABzZW5kdG86Zmxvd2NpZCAldQoAAAAA
-AAAAAAAAAAAAAHBvcnRfbGlua19zdGF0ZV9oYW5kbGVyWyV1XSBsZWF2aW5nIFNUQVRFX1VQICg9
-PnBvd2VyZG93bikKAAAAAABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlclsldV0gcG93ZXJpbmcgZG93
-bgoAAAAAAABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlclsldV0gbGVhdmluZyBwb3dlcmRvd24gKD0+
-ZG93bikKAAAAAAAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXJbJXVdIGxlYXZpbmcgU1RBVEVf
-RE9XTiAoPT5wb3dlcnVwKQoAAAAAAHBvcnRfbGlua19zdGF0ZV9oYW5kbGVyWyV1XSBwb3dlcmlu
-ZyB1cAoAAAAAAAAAAHBvcnRfbGlua19zdGF0ZV9oYW5kbGVyIGxlYXZpbmcgcG93ZXJ1cCAoPT51
-cCkKAHBvcnRfbGlua19zdGF0ZV9oYW5kbGVyWyV1XSBvaCBteSB3aGF0IGlzIGdvaW5nIG9uIChz
-dGF0ZSA9ICUjeAoAAAAAAAAAAAAAAAAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXIgZ290IHJl
-c2NoZWR1bGVkCgAAAAAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXI6IFNvbWV0aGluZyB3ZW50
-IHRlcnJpYmx5IHdyb25nLiByZXQgPSAlZAoAAAAAAAAAAAAAAAAAAABod19zZ2VfbWFtZW1faW5p
-dDogZW5jb3VudGVyZWQgZXJyb3IgJWQKAAAAAAAAAABsZSBpbml0aWFsaXphdGlvbjogbmVudHJp
-ZXMgJXUgcm91dGUgJXUgY2xpcCAldSBmaWx0ZXIgJXUgYWN0aXZlICV1IHNlcnZlciAldSBoYXNo
-ICV1CgAAAAAAAAAAAABsZSBpbml0aWFsaXphdGlvbjogbmVudHJpZXMgJXUgcm91dGUgJXUgY2xp
-cCAldSBmaWx0ZXIgJXUgc2VydmVyICV1IGFjdGl2ZSAldSBoYXNoICV1IG5zZXJ2ZXJzcmFtICV1
-CgAAAAAAAAAAAAAAdHAgY2hhbm5lbCBjb25maWd1cmF0aW9uOiAldSByeCBhbmQgJXUgdHggY2hh
-bm5lbHMKAAAAAAAAAAAAAAAAAHRwIG1lbSBkaXN0cmlidXRpb25bJSVdIHBtdHggJXUgcG1yeCAl
-dSBkZHAgJXUgZGRwX2lzY3NpICV1IHN0YWcgJXUgcGJsICV1IHJxICV1IHJxdWRwICV1CgAAAAAA
-AFRQX1BNTV9SWF9QQUdFX1NJWkUgJXUgaXMgbm90IHN1cHBvcnRlZAoAAAAAAAAAAFRQX1BNTV9U
-WF9QQUdFX1NJWkUgJXUgaXMgbm90IHN1cHBvcnRlZAoAAAAAAAAAAGN4Y25pY19kZXZpY2VfaW5p
-dDogY3hjbmljIFsweCUweF0sIGN4Y25pYy0+ZmlsdGVyIFslMHhdCgAAAAAAAABjeGNuaWNfZGV2
-aWNlX2luaXQ6IGRldi50cC5udW1fdHhfcGFnZXMgWyV1XSwgZGV2Lm1jWzBdLnNpemUgWyV1XSwg
-ZGV2LnRwLnR4X3BhZ2Vfc3ogWyV1XSwgY3hjbmljIHNpemUgWyVkXSwgcmMgWyVkXQoAAAAAAAAA
-AAAAAFBvcnRbJXVdOiBVbmtub3duIFNHTUlJIHN1Yi10eXBlICUjeAoAAAAAAAAAAAAAAHBvcnRf
-aW5pdFsldV06IHBvcnQgdHlwZSAweCV4IGlzIG5vdCBzdXBwb3J0ZWQKAEVRIHBmbiAldSB2Zm4g
-JXU6IGRlc3Ryb3lpbmcgZXFpZCAldSB3aXRoIHBlbmRpbmcgV1IocykgKG51bV9ieXRlcyAldSBh
-bmQgZmxhZ3MgMHglMDh4CgAAAAAAAAAAAGwyZGV2X2ZjLT5mbG93Y19pZCBbJXVdLCBsMmRjLT5w
-Zm4gWyV1XSwgbDJkYy0+dmZuIFsldV0sIGwyZGMtPmxwb3J0IFsldV0sIGwyZGV2X2ZjLT5mbG93
-aWQgWyV1XSBsMmRjLT50eF9jaCBbJXVdLCBkZXYudnBkLnBvcnR2ZWMgWyV4XQoAAAAAAAAAAHBv
-cnR2ZWMgWyV1XQoAAABBaCBoYS4uLmRvdWJsZSBmcmVlIG94X2lkIDB4JXgsIHJ4X2lkIDB4JXgK
-AAAAAABIb3N0IFBSTEkgUmVzcG9uc2UgdGltZWRvdXQ6IG94X2lkIDB4JXggcnhfaWQgMHgleAoA
-AAAAAAAAAAAAAAAAcGZuICV1IHZmbiAldSB2aWEgY29tbWFuZAoAAAAAAABod19pMmNfdHJhbnNh
-Y3Rpb246IG5kYXRhICV1IGFkZHJfb3AgMHgleCBkYXRhWzBdIDB4JXggZGlmZiAldQoAaHdfaTJj
-X3RyYW5zYWN0aW9uOiBuZGF0YSAldSBhZGRyX29wIDB4JXggZGF0YVswXSAweCV4IGRpZmYgJXUg
-ZHBvcyAldSBjb250ICV1IGZhaWxlZCB3aXRoIGVyciAlZAoAAAAAAAAAAAAAAAAAAGkyYyB0cmFu
-c2FjdGlvbiBmYWlsZWQgdG8gY29tcGxldGUKAAAAAAAAAAAAAAAAAFBMX1BDSUVfTElOSy5zcGVl
-ZCBvZiAldSBpcyBub3Qgc3VwcG9ydGVkCmZpbGUsIHJldCBGV19FSU8KAAAAAABjb25maWd1cmF0
-aW9uIGZpbGUgcGFyc2VyOiBzZ2UgdGltZXIgdmFsdWVbJWldIGlzIHRvbyBsYXJnZSwgY2hhbmdp
-bmcgZnJvbSAldSB0byAldXVzZWNzCgAAAAAAAABmaWx0ZXJtYXNrIDB4JXggaXMgbm90IGVxdWFs
-L3N1YnNldCB0by9vZiBmaWx0ZXJtb2RlCgAAAAAAAAAAAAAAaHdfbGVfY2xpcF9oYW5kbGVyOiBy
-ZW1vdmVkIHBvcz0ldSAoPWlkeCAldSkKAAAAaHdfbGVfY2xpcF9oYW5kbGVyOiBhZGRpbmcgdG8g
-cG9zPSV1ICg9aWR4ICV1KQoAbW9kdWxlWyV1XTogcG9ydCBtb2R1bGUgaW5zZXJ0ZWQgYW5kIHJl
-YWR5CgAAAAAAbW9kdWxlWyV1XTogcG9ydCBtb2R1bGUgcmVtb3ZlZAoAAAAAAAAAAAAAAAAAAAAA
-bW9kdWxlWyV1XTogdW5rbm93biBtb2R1bGUgaWRlbnRpZmllciAweCUwMngKAAAAbW9kdWxlWyV1
-XTogZ3BpbyAldSB0cmFucyAxMEcgMHglMDJ4IDFHIDB4JTAyeCAobGVuZ3RoICV1KSBjYWJsZSAw
-eCUwMnggKGxlbmd0aCAldSkgbW9kdWxlX3R5cGUgMHglMDJ4CgAAAAAAAAAAAGN4NF9jcl9wZG93
-blsldV06IGVuICV1IHZpX2VuX2NudCAldQoAAAAAAAAAAAAAAGhzc19zaWdkZXRbJXVdOiBoc3Nf
-c2lnZGV0IGNoYW5nZWQgdG8gMHgleAoAAAAAAGNyX21vZHVsZV9yeF9sb3NbJXVdOiByeF9sb3Mg
-Y2hhbmdlZCB0byAldQoAAAAAAGN4NF9jclsldV06IHJldCAlZCBzdGF0dXMgJXUgeGdtX2xzIDB4
-JTA4eAoAAAAAAE1DOiBleHBlY3RlZCBzdGF0ZSB0byBzd2l0Y2ggdG8gQ0ZHLgAAAAAAAAAAAAAA
-AE1DOiBleHBlY3RlZCBzdGF0ZSB0byBzd2l0Y2ggdG8gQWNjZXNzLgAAAAAAAAAAAE1DOiBleHBl
-Y3RlZCBzdGF0ZSB0byBzd2l0Y2ggdG8gQ0ZHLgAAAAAAAAAAAAAAAE1DOiBleHBlY3RlZCBzdGF0
-ZSB0byBzd2l0Y2ggdG8gQWNjZXNzLgAAAAAAAAAAAElJLjEuYnggZHAxOFsldV0gcVsldV0gJSN4
-ICUjeCAlI3ggJSN4IG1pbiAlI3ggbWF4ICUjeAoAAAAAAAAAAABJSS4xLmMtZC4gJSN4ICUjeCAl
-I3ggJSN4IGFsbCAgJSN4CgAAAAAAAAAAAAAAAABJSS4yLmIgKCUjeCAtICUjeCArICUjeCkgJSAx
-MjggPSAlI3gKAAAAAAAAAAAAAABJSS4zIGluZXdfMWUgYWZ0ZXIgbGltaXQgY29tcHV0ZSBpdGVt
-cF8xZSAleCwgaW5ld18xZSAleAoAAAAAAAAASUkuMy4gaXRlbXBfMWUgJSN4IGluZXdfMWUgJSN4
-IGluZXdfMWUgJWQKAAAAAAAASUkuNC4gc2V0XzFlICUjeAoAAAAAAAAAAAAAAAAAAABNQzogY2Fs
-aWJyYXRpb24gZmFpbGVkIGZvciBlcnJhdGEyOSBkcDE4ICV1CgAAAABJVi4xLiBkcDE4WyV1XSBw
-aGFzZV9zZWwgYmVmb3JlICUjeCBhZnRlciAlI3gsIGdhdGVfZGVsYXkgJSN4CgAATUMgZXJyYXRh
-MjkgaXNzdWU6IGRwMTggJXUgcXVhZCAldSBjYW5ub3QgYmUgZGVjcmVhc2VkCgAAAAAAAAAAAE1D
-IGVycmF0YTI5IGlzc3VlOiBkcDE4ICV1IHF1YWQgJXUgY2Fubm90IGJlIGRlY3JlYXNlZAoAAAAA
-AAAAAABNQyBlcnJhdGEyOSBpc3N1ZTogZHAxOCAldSBxdWFkICV1IGNhbm5vdCBiZSBkZWNyZWFz
-ZWQKAAAAAAAAAAAATUMgZXJyYXRhMjkgaXNzdWU6IGRwMTggJXUgcXVhZCAldSBjYW5ub3QgYmUg
-ZGVjcmVhc2VkCgAAAAAAAAAAAHRlbXAyXzFlKzB4MTAgPSAlI3gKAAAAAAAAAAAAAAAATUM6IGNh
-bGlicmF0aW9uIGZhaWxlZCBmb3IgZXJyYXRhMjEgaXRlcmF0aW9uICV1CgAAAAAAAAAAAAAAAAAA
-AE1DIGVycmF0YSAyMTogZHAxOFsldV0gcHIwIG4wMiBmYWlsZWQgdG8gZ2V0IGF2ZXJhZ2UKAAAA
-AAAAAAAAAABNQyBlcnJhdGEgMjE6IGRwMThbJXVdIHByMCBuMTMgZmFpbGVkIHRvIGdldCBhdmVy
-YWdlCgAAAAAAAAAAAAAATUMgZXJyYXRhIDIxOiBkcDE4WyV1XSBwcjEgbjAyIGZhaWxlZCB0byBn
-ZXQgYXZlcmFnZQoAAAAAAAAAAAAAAE1DIGVycmF0YSAyMTogZHAxOFsldV0gcHIxIG4xMyBmYWls
-ZWQgdG8gZ2V0IGF2ZXJhZ2UKAAAAAAAAAAAAAABNQyBpbml0aWFsaXphdGlvbiBmYWlsZWQ6IENh
-bGlicmF0aW9uIGNvbXBsZXRlIGJpdCBub3QgdG9nZ2xpbmcKAAAAAAAAAAAAAAAAAAAAAE1DIGlu
-aXRpYWxpemF0aW9uIGZhaWxlZDogREZJIGluaXQgbm90IGdvaW5nIHRvIDAKAAAAAAAAAAAAAAAA
-AABNQyBpbml0aWFsaXphdGlvbiBmYWlsZWQ6IERGSSBpbml0IG5vdCBjb21wbGV0aW5nCgAAAAAA
-AAAAAAAAAAAATUMgaW5pdGlhbGl6YXRpb24gZmFpbGVkOiBDYWxpYnJhdGlvbiBkaWRuJ3QgY29t
-cGxldGUuCgAAAAAAAAAAAERQMTggJXUsIGJ5dGVfbGFuZSAldSwgYml0X3NlbGVjdCAldQoAAAAA
-AAAAAAAAAERQMTggJXUsIGJ5dGVfbGFuZSAldSwgYml0X3NlbGVjdCAldQoAAAAAAAAAAAAAAE1D
-IGZhaWxlZCB0byBnZXQgVVBDVEwgcG93ZXIgdXAgZG9uZQoAAAAAAAAAAAAAAE1DIGluaXRpYWxp
-emF0aW9uIGZhaWxlZDogRGlkbid0IGdldCBhbGwgRFAxOHMgbG9ja2VkCgAAAAAAAAAAAABNQyBp
-bml0aWFsaXphdGlvbiBmYWlsZWQ6IERpZG4ndCBnZXQgYm90aCBBRFJzIGxvY2tlZAoAAAAAAAAA
-AAAAQ3VycmVudCBTbGV3IHR4X3JvdyAlZDogdHhfY29sICVkLCB2YWwgJWQKAAAAAAAAQ3VycmVu
-dCBTbGV3IGFkZHJfcm93ICVkOiBhZGRyX2NvbCAlZCwgdmFsICVkCgAATUMgaW5pdGlhbGl6YXRp
-b24gZmFpbGVkOiBTTEVXX0RPTkVfU1RBVFVTIG5ldmVyIHRvZ2dsZWQAAAAAAAAAAGZscl9wZnZm
-X2ZzbVsldToldV06IHVua25vd24gc3RhdGUgJXUKAAAAAAAAAAAAAGh3IHBmIGJpdG1hcCAweCUw
-MnggdmZpZCBiaXRtYXAgMHglMDh4OjB4JTA4eDoweCUwOHg6MHglMDh4CgAAAABhZnRlciB2Zmlk
-IGZpeHVwLCB2ZmlkIGJpdG1hcCAweCUwOHg6MHglMDh4OjB4JTA4eDoweCUwOHgKAAAAAAAATUNb
-JXVdOiBmYWlsZWQgdG8gc3dpdGNoIGNvbnRyb2xsZXIgdG8gQ0ZHIHN0YXRlCgAAAAAAAAAAAAAA
-AAAAAE1DWyV1XTogZmFpbGVkIHRvIHN3aXRjaCBjb250cm9sbGVyIHRvIElOSVRfTUVNIHN0YXRl
-CgAAAAAAAAAAAABNQ1sldV06IGZhaWxlZCB0byBzd2l0Y2ggY29udHJvbGxlciB0byBDRkcgc3Rh
-dGUKAAAAAAAAAAAAAAAAAAAATUNbJXVdOiBwZXJpb2RpYyBjYWxpYnJhdGlvbiBmYWlsZWQgd2l0
-aCBlcnJvciAldQoAAAAAAAAAAAAAAAAAAHRpbWVyIHF1ZXVlICV1IGxvc3QgYSB0aWNrISBuZXh0
-ICVwIGxhc3QgJXAgbnVtZSAldQoAAAAAAAAAAAAAAABmbHJfdGltZXJfc3RhcnQ6IGZsb3djX2lk
-ICV1ICVwIGJ1ZiAlcAoAAAAAAAAAAABNQUM6IFBMTHMgZGlkbid0IGxvY2sKAAAAAAAAAAAAAHBj
-aWU6IHJlYWQgZnJvbSBzZXJjZmcgcGNpZV9pcF91cl9tYXhmdW5jIDB4JXggcGZiaXRtYXAgMHgl
-eAoAAABwY2llOiBucGYgJXUgKHBmYml0bWFwIDB4JTAyeCkgbnZmICV1IChwZiAwLi4zIDB4JTAy
-eCAweCUwMnggMHglMDJ4IDB4JTAyeCkKAAAAAGZhaWxlZCB0byBmaW5kIHRoZSAlYyVjIFZQRCBw
-YXJhbWV0ZXIKAAAAAAAAAAAAAGZhaWxlZCB0byBwYXJzZSB0aGUgJWMlYyBWUEQgcGFyYW1ldGVy
-CgAAAAAAAAAAAGZhaWxlZCB0byBzdWNjZXNzZnVsbHkgZmluZCBDaGVsc2lvIFZQRAoAAAAAAAAA
-AGxvZyBpbml0aWFsaXplZCBAIDB4JTA4eCBzaXplICV1ICgldSBlbnRyaWVzKQoAAGJvb3RzdHJh
-cCBmaXJtd2FyZSB0b29rICV1IG1zZWNzIHRvIHJ1bgoAAAAAAAAAAGZsb3djICV1IChTR0UgZXFp
-ZCAldSkgKEVUSENUUkwgcXVldWUpIGV4cGVyaWVuY2VkIGEgUENJIERNQSBSRUFEIHdvcmsgcmVx
-dWVzdCBlcnJvciAoaW5ib3VuZCBxdWV1ZSAldSkKAAAAAAAAAABmbG93YyAldSAoU0dFIGVxaWQg
-JXUpIGV4cGVyaWVuY2VkIGFuIHVuZXhwZWN0ZWQgUENJIERNQSBSRUFEIHdvcmsgcmVxdWVzdCBl
-cnJvciAoaW5ib3VuZCBxdWV1ZSAldSkKAAAAAAAAAAAAAAAAZmxvd2MgJXUgZXhwZXJpZW5jZWQg
-YW4gdW5leHBlY3RlZCBQQ0kgRE1BIFJFQUQgZXJyb3IgKGluYm91bmQgcXVldWUgJXUpCgAAAAAA
-AAB3cmhfZm9pc2NzaV9zY3NpX2Vycjogd3IgWzB4JXhdLCBxdWV1ZWQgb24gZmxvd2MgWzB4JXhd
-LCBmaWZvIFsweCV4XSBieXRlc19hdmFpbGFibGUKAAAAAAAAAAAAAABzZW5kX2Fib3J0X3JlcTog
-Y3NrX2ZjLT5mbG93Y190eXBlIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIHRpZCBb
-MHgleF0sIHVscHR4Y2ggWyV1XSwgYnVmZmVyZWQgWyV1XQoAAAAAc2VuZF9jbG9zZV9yZXE6IGNz
-a19mYy0+Zmxvd2NfdHlwZSBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMt
-PnRjYl9zdGF0ZSBbMHgleF0KAAAAc2VuZF9jbG9zZV9yZXE6IGNza19mYy0+Zmxvd2NfdHlwZSBb
-MHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCB0aWQgWzB4JXhdLCB1bHB0eGNoIFsldV0s
-YnVmZmVyZWQgWyV1XQoAAAAAAG9mbGRfdGNwX2RvX2FjdGl2ZV9jbG9zZTogY3NrX2ZjIFsweCV4
-XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+dGNiX3N0YXRlIFsweCV4XQoAAAAA
-AG9mbGRfdGNwX2RvX2FjdGl2ZV9jbG9zZTogY3NrX2ZjIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19p
-ZCBbMHgleF0sIGNza19mYy0+dGNiX3N0YXRlIFsweCV4XQoAAAAAAHNlc3Npb25fYmxvY2s6IHNl
-c3NfZmMtPmZsb3djX2lkIFsweCV4XSwgc2Vzc19mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBjb25u
-X2ZjLT5mbG93Y19pZCBbMHgleF0sIGNvbm5fZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgY3NrX2Zj
-LT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdCgAAAAAAAAAAAAAA
-AAAAAG9mbGRfdGNwX2Rpc2Nvbm5lY3Q6IHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMt
-PmZsb3djX2lkIFsweCV4XSwgY3NrLT50Y2Jfc3RhdGUgWzB4JXhdCgAAAGRlY29kZV9iYXNlNjRf
-c3RyaW5nOiBkbGVuIFslZF0KAAAAAAAAAAAAAAAAAAAAAGRlY29kZV9oZXhfc3RyaW5nOiBkbGVu
-IFslZF0KAAAAbG9nZ2VkX2luOiBmbG93Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4JXhdCgAAAAAA
-Zm9pc2NzaV92YWxpZGF0ZV9sb2dpbl9zdGFnZTogLSAxCgAAAAAAAAAAAAAAAAAAU2VxICMgbWlz
-bWF0Y2ggc3RhdHNuID0gMHgleCBleHBzdGF0c24gPSAweCV4CgAAdGV4dF9yZXNwOiBjX2JpdCBb
-MHgleF0sIGZfYml0IFsweCV4XQoAAAAAAAAAAAAAY3BsX3R4X3BrdDogaW50ZiBbMHgleF0KAAAA
-AAAAAABuZXRfbDJkZXZfZmluZF9ieV9hZGRyOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBs
-MmRjLT5scG9ydCBbJXVdLCBsMmRfZmMtPmZsb3djX2lkIFsweCV4XSwgbDJkYy0+aW40X2Rldi5p
-bl9hZGRyLmFkZHIgWzB4JXhdLCBhZGRyIFsweCV4XQoAAABuZXRfbDJkZXZfbXR1X2NvbmZpZzog
-bDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgbXR1ICV1CgAAAAAAAAAAbmV0aWZfZG9fZGhjcDog
-d3ItPnBhcmFtLnZsYW5pZCBbJXVdLCBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5kZXYg
-WzB4JXhdCgBsMmRldl92aV9mc206IG1iIFsweCV4XSwgZGVmZXJyZWQsIHN0YXRlIFsweCV4XSwg
-cG9ydCBbMHgleF0KAAAAbDJkZXZfdmlfZnNtOiB2aWlkIFsweCV4XSBwb3J0IFsweCV4XSwgbWFj
-LWlkIFslMDJ4OiUwMng6JTAyeDolMDJ4OiUwMng6JTAyeF0uIAoAAAAAAAAAAAAAAAAAAAAAbDJk
-ZXZfdmlfZnNtOiBzZ2VfZXFpZCBbMHgleF0sIHNnZV9pcWlkIFsweCV4XSwgc2dlX2VxY3IgWzB4
-JXhdLCByc3Nfc3ogWzB4JXhdCgBsMmRldl92aV9mc206IGwyZGV2X2ZjLT5mbG93Y19uZXRfbDJk
-ZXZfbXR1IFsldV0sIG1iX3NjcmF0Y2ggWzB4JXhdLCBwb3J0IFsweCV4XQoAAAAAAAAAAAAAAAAA
-AABsMmRldl92aV9mc206IHZpaWQgWyVkXSwgdmlfZmMtPmZsb3djX3ZpX2ZsYWdzIFsweCV4XQoA
-AAAAAAAAAAAAbDJkZXZfdmlfZnNtOiBwZm4gWzB4JXhdLCB2Zm4gWzB4JXhdLCBsMmRldl9mYy0+
-Zmxvd2NfaWQgWzB4JXhdLCBscG9ydCBbMHgleF0sIHZpaWQgWzB4JXhdLCBmbGFncyBbMHgleF0K
-AAAAAAAAAGwyZGV2X3ZpX2ZzbTogRXJyb3IgZnJlZWluZyBWSSwgcmMgWzB4JXhdCgAAAAAAAGwy
-ZGV2X3ZpX2ZzbTogcGlkIFsweCV4XSwgdmlpZCBbMHgleF0sIG1iX2xvYyBbMHgleF0sIG1iX29y
-aWdbMHgleF0sIGwyZGV2X2ZsYWdzIFsweCV4XSwgcmMgWzB4JXhdCgAAAAAAAAAAAAAAAABjcGxf
-dHhfcGt0OiBpbnRmIFsweCV4XQoAAAAAAAAAAGVuY29kZSBoZXggc3RyaW5nOiBkbGVuIFslZF0K
-AAAAdGNwX3NlbmRfYW9wZW5fcmVxOiBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT5m
-bG93Y19zdGF0ZSBbMHgleF0sIGJ1ZmZlcmVkIFsldV0sIHJlc19jbnQgWzB4JXhdLCBpcV9pZHgg
-WzB4JXhdCgAAAAAAAAAAAABhb3Blbl9yZXE6IGh3X2xlX2ZpbHRlcl9jdHVwbGUgZmFpbGVkCgAA
-AAAAAAAAAABvZmxkX3RjcF9zZW5kX2FvcGVuX3JlcTogY3BsX3JlcS0+RmlsdGVyIFsweCUweF0s
-IGN0dXBsZXNbMF0gWzB4JXhdLCBjdHVwbGVzWzFdIFsweCV4XQoAAAAAAAAAAABjc29ja19hbGxv
-YzogdHhfY2ggWzB4JXhdLCBscG9ydCBbMHgleF0sIGNvb2tpZSBbJTA4eF0KAAAAAAAAAAAAY3Nv
-Y2tfYWxsb2M6IGF2YWlsYWJsZSBbJXVdLCBuY3NvY2sgWyV1XSwgcG9zOmF0aWQgWzB4JXhdLCBj
-c2tfZmMgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgc3BvcnQgWyV1XQoAAGZvaXNj
-c2lfcGVlcl9pbml0OiBjb25uX2F0dHItPmhkaWdlc3RfdG9fZGRwX3Bnc3ogWzB4JXhdCgAAAAAA
-AABmb2lzY3NpX3BlZXJfaW5pdDogY29ubl9mYy0+Zmxvd2NfZm9pc2NzaV9jb25uX2ZsYWdzIFsw
-eCV4XQoAAAAAdGFza19mcmVlOiB0cnlpbmcgdG8gZnJlZSBxdWV1ZWQgdGFzayBbMHgleF0hISEK
-AAAAAAAAAAAAAAAAAAAAAFdBVENIRE9HOiBObyB0ZW1wZXJhdHVyZSBzZW5zb3IgYXZhaWxhYmxl
-LgoAAAAAAFdBVENIRE9HOiBBY3RpdmF0aW5nCgAAAAAAAAAAAAAAV0FUQ0hET0cgLSBFbmFibGUg
-YWN0aW9uICV1IHRpbWUgJXUKAAAAAAAAAAAAAAAAV0FUQ0hET0cgLSBEaXNhYmxlIGFjdGlvbiAl
-dQoAAABXQVRDSERPRzogRGUtYWN0aXZhdGluZwoAAAAAAAAAAHNlc3Npb25fdW5ibG9jazogc2Vz
-c19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBzZXNzX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGNvbm5f
-ZmMtPmZsb3djX2lkIFsweCV4XSwgY29ubl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBjc2tfZmMt
-PmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0KAAAAAAAAAAAAAAAA
-AHNlc3Npb25fbGlua19ub3RpZnk6IHBvcnQgWzB4JXhdIGxpbmsgZG93biBwaW5nIHJlY292ZXJ5
-IGRpc2FibGVkLCB0cnlpbmcgdG8gcmVjb3ZlciBzZXNzaW9uIFsweCV4XSBjb25uIFsweCV4XQoA
-AAAAAAAAAAAAAAAAAAAAc2Vzc2lvbl9saW5rX25vdGlmeTogcG9ydCBbMHgleF0gbGluayB1cCBz
-ZXNzaW9uIFsweCV4XSBjb25uIFsweCV4XQoAAAAAAAAAAAAAAABmb2lzY3NpIGNvbm5fZmMgWzB4
-JXhdLCBmbG93Y19zY2hlZGNsIFsweCV4XSwgaW5nX2NoIFsweCV4XSwgZWdyX2NoIFsweCV4XQoA
-AAAAAGwyZGV2X25vdGlmeSB3aXRoIHVua25vd24gZmxhZyBbMHgleF0KAAAAAAAAAAAAAEZDb0Ug
-RkNCIGxpbmtkb3duOiBpb19yZXEgMHgleCV4IGlxaWQgMHgleCBmbG93aWQgMHgleCBvcCAweCV4
-CgBmY29lIG5vdGlmeSA6IFVwZGF0ZSBuZXcgRENCWCB2YWx1ZXMgVkkgc3RhdGUgMHgleCBwcmkg
-MHgleCBzY2hlZGNsIDB4JXggZGNieF9kb25lIDB4JXgKAAAAAAAAAABmY29lIG5vdGlmeSA6IEZD
-RiBmbG93aWQgMHgleCwgdWxwY2ggMHgleCAKAAAAAABuZXRfbDJkZXZfbm90aWZ5OiBFdmVudCBv
-biBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBwb3J0IFslZF0sIGV2ZW50IFsweCV4XSwgdWxw
-dHhjaCBbJXVdLCBjbGFzcyBbMHgleF0sIHByaW9yaXR5IFsweCV4XQoAAAAAAGZjb2Ugbm90aWZ5
-IDogRENCWCA6IHBvcnQgMHgleCwgcHJpb3JpdHkgMHgleCB1bHB0eGNoIDB4JXggY2xhc3MgMHgl
-eAoAAAAAAAAAAAAAY2hfY2xfcmF0ZVsldS8ldV06IGNhcHBlZCBkZWZpY2l0X2luY3IgZnJvbSBy
-ZXF1aXJlZCAldSB0byAldTsgcmF0ZSAldSAoZWZmICV1KSBkZWZpY2l0X21heCAldQoARkNvRSBG
-Q0YgdGltZXI6IGZsb3djIHN0YXRlIDB4JXgsIHBvcnQgMHgleCAsZmNmIDB4JXgsIGZsb3djX2lk
-IDB4JXgKAAAAAAAAAAAAAABjb3JlX3Byb2dyYW1fdGNiOiB0aWQgJSN4IHRfc3RhdGUgJSN4IHJj
-dl9hZHYgMHglMDh4IHJjdl9zY2FsZSAlI3ggdHhfbWF4ICUjeCByY3Zfbnh0ICUjeCBhdGlkICUj
-eAoAAAAAAAAAAAAAAAAACW9wdDAgJSN4JXggb3B0MiAlI3ggaXB2NiAlI3ggZmxhZ3NfdGltZXIg
-MHglMDh4CgAAAAAAAAAAAAAAAAAAAG9mbGRfY29ubmVjdGlvbl93cjogY29ubmVjdGlvbiB3aXRo
-IDUtdHVwbGUgbHAgMHglMDR4IGZwIDB4JTA0eCBsaXAgMHglMDh4JTA4eCBwaXAgMHglMDh4JTA4
-eCBmaWx0ZXIgMHglMDh4IGV4aXN0cyBAIExFIGluZGV4ICV1CgAAAAAAAAAAAAAAAAAAAG9mbGRf
-Y29ubmVjdGlvbl93cjogY29ubmVjdGlvbiB3aXRoIDUtdHVwbGUgbHAgMHglMDR4IGZwIDB4JTA0
-eCBsaXAgMHglMDh4IHBpcCAweCUwOHggZmlsdGVyIDB4JTA4eCBleGlzdHMgQCBMRSBpbmRleCAl
-dQoAAAAAAAAAb2ZsZF9jb25uZWN0aW9uX3dyOiBjb25uZWN0aW9uIHdpdGggNS10dXBsZSBscCAw
-eCUwNHggZnAgMHglMDR4IGxpcCAweCUwOHglMDh4IHBpcCAweCUwOHglMDh4IGZpbHRlciAweCUw
-OHgKAAAAAG9mbGRfY29ubmVjdGlvbl93cjogY29ubmVjdGlvbiB3aXRoIDUtdHVwbGUgbHAgMHgl
-MDR4IGZwIDB4JTA0eCBsaXAgMHglMDh4IHBpcCAweCUwOHggZmlsdGVyIDB4JTA4eAoAAAAAAAAA
-AAAAAABJUUZMSU5UIHBmbiAldSB2Zm4gJXU6IGlxZXNpemUgJXUgdG9vIHNtYWxsCgAAAABJUUZM
-SU5UIHBmbiAldSB2Zm4gJXU6IGlxaWQgJXUgdG9vIGxhcmdlIChtYXggJXUpCgAAAAAAAAAAAAAA
-AAAASVFGTElOVCBwZm4gJXUgdmZuICV1OiBpcWlkICV1IG5vdCBhbGxvY2F0ZWQKAAAASVFGTElO
-VCBwZm4gJXUgdmZuICV1OiBmbDBpZCAldSB0b28gbGFyZ2UgKG1heCAldSkKAAAAAAAAAAAAAAAA
-AElRRkxJTlQgcGZuICV1IHZmbiAldTogZmwwaWQgJXUgbm90IGFsbG9jYXRlZAoAAElRRkxJTlQg
-cGZuICV1IHZmbiAldTogZmwxaWQgJXUgdG9vIGxhcmdlIChtYXggJXUpCgAAAAAAAAAAAAAAAABJ
-UUZMSU5UIHBmbiAldSB2Zm4gJXU6IGZsMWlkICV1IG5vdCBhbGxvY2F0ZWQKAABJUUZMSU5UIHBm
-biAldSB2Zm4gJXU6IGZsMWlkICV1IGlzIHZhbGlkIGJ1dCBub3QgZmwwaWQgJXUKAAAAAAAASVFG
-TElOVCBwZm4gJXUgdmZuICV1OiBmbDFpZCAldSBpcyB2YWxpZCBidXQgaGVhZGVyIHNwbGl0IGZl
-YXR1cmUgaXMgbm90IGVuYWJsZWQKAAAAAAAAAAAAAAAAAAAASVEgcGZuICV1IHZmbiAldTogaXFp
-ZCAldSB0b28gbGFyZ2UgKG1heCAldSkKAAAASVEgcGZuICV1IHZmbiAldTogaXFpZCAldSBub3Qg
-YWxsb2NhdGVkCgAAAAAAAAAASVEgcGZuICV1IHZmbiAldTogZmwwaWQgJXUgZmwxaWQgJXUgYnV0
-IG5vdCBzdXBwb3J0ZWQKAAAAAAAAAAAAAGh3X3VscHR4X3dvcmthcm91bmRfcHIxNjk0OV9lbmFi
-bGVkX3BmOiBwZiAldSBlbmFibGVkICV1CgAAAAAAAABod191bHB0eF93b3JrYXJvdW5kX3ByMTY5
-NDlfZW5hYmxlZF92ZmlkOiB2ZmlkICV1IGVuYWJsZWQgJXUKAAAARVEgcGZuICV1IHZmbiAldTog
-Y3JlYXRpbmcgRVRIIGVxaWQgJXUgd2l0aCBwZW5kaW5nIFdSKHMpIChudW1fYnl0ZXMgJXUgYW5k
-IGZsYWdzIDB4JTA4eAoAAAAAAAAARVEgcGZuICV1IHZmbiAldTogY3JlYXRpbmcgQ1RSTCBlcWlk
-ICV1IHdpdGggcGVuZGluZyBXUihzKSAobnVtX2J5dGVzICV1IGFuZCBmbGFncyAweCUwOHgKAAAA
-AAAARVEgcGZuICV1IHZmbiAldTogZXFpZCAldSB0b28gbGFyZ2UgKG1heCAldSkKAAAARVEgcGZu
-ICV1IHZmbiAldTogZXFpZCAldSBub3QgYWxsb2NhdGVkCgAAAAAAAAAAcG9ydF9ibGlua19sZWRf
-cmVzdG9yZQoAAAAAAAAAAABwb3J0X2JsaW5rOiBibGlua2R1cj0weCV4IGJsaW5rX3JlZmNudAoA
-AAAAAAAAAABwb3J0X2JsaW5rOiAJYmxpbmtfcmVmY250PTB4JXgKAHBvcnRfYmxpbms6IAlibGlu
-a19yZWZjbnQ9MHgleAoAaHcgcmVnaXN0ZXIgb3BlcmF0aW9uIG5vdCBjb21wbGV0aW5nLCByZWcg
-MHglMDh4IG1hc2sgMHglMDh4IHZhbHVlIDB4JTA4eCAocmVnIDB4JTA4eCkKAAAAAAAAAAAATURJ
-TyBDTDQ1OiBmYWlsZWQgdG8gc2V0IHVwIE1NRCBhZGRyCgAAAAAAAAAAAAAATURJTzogZmFpbGVk
-IHRvIHJlYWQKAAAAAAAAAAAAAABNRElPIENMNDU6IGZhaWxlZCB0byBzZXQgdXAgTU1EIGFkZHIK
-AAAAAAAAAAAAAABNRElPOiBmYWlsZWQgdG8gd3JpdGUKAAAAAAAAAAAAAG1paV9hZHZfZmNbJXVd
-OiByY2FwcyAweCV4CgAAAAAAbWlpX2Fkdl9zcGVlZFsldV06IHJjYXBzIDB4JXgKAABtaWlfYW5y
-ZXN0YXJ0WyV1XTogYWNhcHMgMHgleAoAAG1paV9pbml0WyV1XTogYWNhcHMgMHgleAoAAAAAAAAA
-bWlpX3Bkb3duWyV1XTogcG93ZXJkb3duIGVuICV1CgBwb3J0WyV1OjB4JTAyeDoweCUwMnhdOiBs
-MWNmZywgcGNhcHMgMHgleCBhY2FwcyAweCV4IHJjYXBzIDB4JXgKAAAAAAAAAAAAAAAAAAAAAHBv
-cnRbJXU6MHglMDJ4OjB4JTAyeF06IGwxY2ZnLCBpbnZhbGlkIHJlcXVlc3QsIHBjYXBzIDB4JXgg
-YWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAAAAAAAAAAAAAAAHBvcnRbJXU6MHglMDJ4OjB4JTAy
-eF06IGwxY2ZnLCBtZGkgbi9hIHBjYXBzIDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAA
-AAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogbDFjZmcsIGNhbm5vdCBmb3JjZSBuby9tdWx0aXBs
-ZSBzcGVlZChzKSwgcGNhcHMgMHgleCBhY2FwcyAweCV4IHJjYXBzIDB4JXgKAAAAAAAAAAAAAAAA
-AGdldF9yZWZfdGFzazogcmVxdWVzdGVkIGNvb2tpZTogaGlnaCBbMHglMDh4XSwgbG93IFsweCUw
-OHhdCgAAAABnZXRfcmVmX3Rhc2s6IHRhc2sgY29va2llOiBoaWdoIFsweCUwOHhdLCBsb3cgWzB4
-JTA4eF0KAAAAAAAAAAAAZ2V0X3JlZl90YXNrOiBpc3Rhc2stPmZsb3djX2lkIFsweCV4XSwgaXN0
-YXNrX2ZjLT5mbG93Y19zdGF0ZSBbJXVdCgAAAAAAAAAAAAAAAABnZXRfcmVmX3Rhc2s6IHRhc2sg
-bm90IGZvciBjb29raWUgJWx4CgAAAAAAAAAAAABjaG5ldF9sMnRfdXBkYXRlOiBsMmRldl9mYyBb
-MHgleF0sIGwyZGV2X2ZjLT5mbG93Y19pZCBbJXVdIGwyZGV2X2ZjLT5mbG93Y19mbGFncyBbMHgl
-eF0sIGludGYgWzB4JXhdCgAAAAAAAAAAAAAAY2huZXRfbDJ0X3VwZGF0ZTogbDJkZXZfZmMtPmZs
-b3djX2lkIFsldV0gYWxyZWFkeSBzY2hlZHVsZWQKAAAAAGNobmV0X2wydF91cGRhdGU6IGluIGRl
-bGF5ZWRfcHJvY2Vzc2luZywgbDJ0ZW50IFslMDh4XQoAAAAAAAAAAABwcm9jZXNzX2RoY3Bfb3B0
-czogcm9vdCBwYXRoIGxlbiBbJWRdIGJ5dGVzCgAAAABuZXRpZl9wcm9jZXNzX2RoY3Bfb3B0czog
-bDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgTVNHX1RZUEUgWyVkXSwgZGhjdHh0LT5zdGF0ZSBb
-JWRdCgAAAAAAAAAAAABpY21wX3JlY3Y6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIHBpZCBb
-MHgleF0sIGljbXAgdHlwZSBbMHgleF0KAAAAAAAAAAAAAAAAAGZjX3NlbmRfYWxsb2NfY3BsOiBm
-YWlsZWQgdG8gc2V0dXAgZmlsdGVyIGN0dXBsZQoAAAAAAAAAAAAAAAAAAABmY29lX2NvbXB1dGVf
-Y3R1cGxlIHZsYW4gJXggdmlpZCAleCBwb3J0ICV4IG1wc19pZHggJXgKAAAAAAAAAAAAZmNvZV9j
-b21wdXRlX2N0dXBsZSAweCV4OiV4CgAAAABBQlRTIEFDQyBhd2FpdGluZyBQUkxJIFJzcDogZmxv
-d2NfaWQgMHgleCBveF9pZCAweCV4IHJ4X2lkIDB4JXggaXFpZCAweCV4CgAAAAAAAGFycF9yZWN2
-OiBpcGlkIFsweCV4XSwgaW5fYWRkci5hZGRyIFsweCV4XSwgc2lwIFsweCV4XSwgcmlwIFsweCV4
-XSwgYXJwX29wIFsweCV4XQoAAAAAAAAAAAAAAAAAAGNobmV0X2FycF9yZWN2OiBpcCBjb25mbGlj
-dCBkZXRlY3RlZAoAAAAAAAAAAAAAAGNobmV0X2FycF9yZWN2OiBwaWQgWyV1XSwgdmxhbiBbMHgl
-eF0sIGFycCBvcCBbMHgleF0sIHNpcCBbMHgleF0sIHJpcCBbMHgleF0KAAAAY3NvY2tfcGVlcl9j
-bG9zZTogY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+dGNiX2ZjLT5mbG93Y19pZCBb
-MHgleF0sIGNza19mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2Nzb2NrX3Rj
-Yl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdCgAAAAAAAAAAAGNzb2NrX3BlZXJfY2xvc2U6IGNza19m
-Yy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlICBbMHgleF0KAAAAAAAAAAAA
-dGNiX2ZjLT5mbG93Y19pZCBbMHglMDZ4XSwgdGNiX2ZjLT5mbG93Y190eXBlIFsweCV4XSwgY3Bs
-b3AgWzB4JXhdIAoAAAAAAAAAAAAAAABjaF9yYXRlWyV1XTogY2FwcGVkIHRpY2sgZnJvbSByZXF1
-aXJlZCAldSB0byBzdXBwb3J0ZWQgJXU7IHJhdGUgJXUgKGVmZiAldSkgZGVmaWNpdF9pbmNyICV1
-IHRpY2sgJXUKAAAAAAAAAAAAAAAAcGt0c2NoZWRfY2hfcmxbJXVdOiBjaGFubmVsIHJsIG5vdCBh
-dmFpbGFibGUgaW4gY29uanVuY3Rpb24gd2l0aCBmbG93IHNoYXBpbmcKAABwa3RzY2hlZF9jaF9y
-bFsldV06IHJhdGUgJXUgbWF4ICV1CgAAAAAAAAAAAAAAAABwa3RzY2hlZF9jbF93cnJbJXU6JXVd
-OiB3ZWlnaHQgJXUgd2VpZ2h0ZWRfbWFzayAweCV4CgAAAAAAAAAAAAAAZXFfcGFyYW1zWzB4JXg6
-MHgleF06IGRtYXEgMHgleCByZWFkICV1IHBmICV1IGVxaWRfYXBpICV1IHJldCAlZAoAAAAAAAAA
-AAAAAAAAAABNQyBDTEsgc2V0dGluZyBmYWlsZWQ6IFBMTF9NX0xPQ0sgbmV2ZXIgdG9nZ2xlZAoA
-AAAAAAAAAAAAAAAAAAAAd2FpdF9mb3JfY2FsaWJfZG9uZTogcmV0ICVkIGluICV1IGF0dGVtcHRz
-CgAAAAAAbWFsbG9jX2RlY1sldV06IHN0YXJ0ICVwIGVuZCAlcCBuZXh0ICVwIHNpemUgMHgleCBh
-bGlnbWVudCAweCV4IHAgJXAKAAAAAAAAAAAAAABtYWxsb2NfaW5jWyV1XTogc3RhcnQgJXAgZW5k
-ICVwIG5leHQgJXAgc2l6ZSAweCV4IGFsaWdtZW50IDB4JXggcCAlcAoAAAAAAAAAAAAAAGxlIGNv
-bmZpZ3VyYXRpb246IGhhc2ggbW9kZSByZXF1aXJlcyBhdCBsZWFzdCAxNiBlbnRyaWVzLCBuaGFz
-aCAldQoAAAAAAAAAAAAAAAAAbGUgY29uZmlndXJhdGlvbjogaGFzaCBtb2RlIHJlcXVpcmVzIGF0
-IGVudHJpZXMgdG8gYmUgYSBwb3dlciBvZiAyLCBuaGFzaCAldQoAAABsZSBjb25maWd1cmF0aW9u
-OiByZXF1ZXN0ZWQgJXUgdGNhbSBlbnRyaWVzIGJ1dCBvbmx5ICV1IGF2YWlsYWJsZQoAAAAAAAAA
-AAAAAAAAAGxlIGNvbmZpZ3VyYXRpb246IHRjYW0gcmVnaW9ucyBtdXN0IGhhdmUgbXVsdGlwbGUg
-b2YgMzIgZW50cmllcywgbnJvdXRlICV1IG5jbGlwICV1IG5maWx0ZXIgJXUgbnNlcnZlciAldQoA
-AAAAAABvZmxkIHRwIHRpbWVyIHNldHRpbmdzIFRQX01TTCAweCUwOHggVFBfUlhUX01JTiAweCUw
-OHggVFBfUlhUX01BWCAweCUwOHggVFBfUEVSU19NSU4gMHglMDh4IFRQX1BFUlNfTUFYIDB4JTA4
-eAoAICAgICAgICAgICAgICAgICAgICAgICBUUF9LRUVQX0lETEUgMHglMDh4IFRQX0tFRVBfSU5U
-VkwgMHglMDh4IFRQX0lOSVRfU1JUVC5pbml0X3NydHRfbWF4cnR0IDB4JTA0eCBUUF9JTklUX1NS
-VFQuaW5pdF9zcnR0X2luaXRzcnR0IDB4JTA0eCBUUF9GSU5XQUlUMl9USU1FUiAweCUwOHgKAAAA
-AAAAAAAAAABjb25maWd1cmF0aW9uIGZpbGUgcGFyc2VyIGVuY291bnRlcmVkIGVycm9yIEAgbGlu
-ZSAldToKAAAAAAAAAAAASE9TVCBQQUdFX1NJWkUgWzB4JTBseF0gdG9vIHNtYWxsLCBtaW4gWzB4
-JTBseF0gcmVxdWlyZWQKAAAAAAAAAHBhZ2Ugc2l6ZSBbJWx1XSBtaXNtYXRjaAoAAAAAAAAAUEFH
-RSBzaXplICVsdSB1bnN1cHBvcnRlZCwgZGRwIGRpc2FibGVkCgAAAAAAAAAASG9zdCBwYWdlX3Np
-emUgJWx1LCBkZHBfaWR4ICV1CgBGQ29FIEREUCBpbml0OiBmY29lIGxsaW1pdCAweCV4LCBmY29l
-IHVsaW1pdCAweCV4IGdibCBsbGltaXQgMHgleCBnYmwgdWxpbWl0IDB4JXggcGNic3ogJXgKAAAA
-AABGQ29FIEREUCBpbml0OiBmY29lIHBwb2Qgb2ZmIDB4JXgsIGZjb2Ugc3QgcHBvZCBhZGRyIDB4
-JXggZmNvZSBudW0gcHBvZHMgMHgleAoAAGZjb2UgeGNoZyBtZ3IgaW5pdDogTnVtYmVyIG9mIGV4
-Y2hhbmdlcyBmb3IgRkNvRSBpcyAleAoAAAAAAAAAAABRU0ZQIG1vZHVsZSB1bnBsdWcgLSByZWlu
-aXRpYWxpemluZyByeF9sb3MgIHRvIDB4ZmYKAAAAAAAAAAAAAAAAZ3Bpb19xc2ZwX21vZHVsZV91
-cGRhdGU6IGNoYW5nZWQgcnhfbG9zIGZyb20gMHgleCB0byAweCV4CgAAAAAAAGdwaW9fcXNmcF9t
-b2R1bGVfdXBkYXRlOiBjaGFuZ2VkIHR4X2RpcyBmcm9tIDB4JXggdG8gMHgleAoAAAAAAABNQUMg
-ZmFpbGVkIHRvIHJlc3luYyB0eAoAAAAAAAAAAENhbGN1bGF0aW9uIG91dCBvZiBib3VuZHMgZnVy
-aW5nIGluaXQ6ICUjeCAlI3ggJSN4CgAAAAAAAAAAAAAAAABod19zZ2VfbWFtZW1fY2FsYzogZW5j
-b3VudGVyZWQgZXJyb3IgJWQKAAAAAAAAAABzZ2UgcmVxdWlyZSBuZXEgJXUgbmlxICV1IHJvdW5k
-aW5nIHRvICV1ICV1CgAAAABod19lZGNfYmlzdFsldV06IGJpc3RfY21kWzB4JTA4eF0gYWRkciAw
-eCV4IGxlbiAweCV4CgAAAAAAAAAAAAAAaHdfZWRjX2Jpc3RbJXVdOiBkb25lLCBlbmNvdW50ZXJl
-ZCAldSBlcnJvcnMgb24gZmlyc3QgYW5kICV1IGVycm9ycyBvbiBzZWNvbmQgYXR0ZW1wdAoAAAAA
-AAAAAAAAVGVtcGVyYXR1cmUvVm9sdGFnZSBTZW5zb3I6IENvcmUgY2xvY2sgJWQgPiA1MDA7IHVz
-aW5nIDUwMCB0byBzdGF5IGluIGNvbXBsaWFuY2Ugd2l0aCBoYXJkd2FyZS4KAAAAAAAAAAAAAAAA
-AAAAAGZvaXNjc2lfYnllOmwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGwyZGV2X2ZjLT5mbG93
-Y19wY2llX3BmbiBbMHgleF0sIGwyZGV2X2ZjLT5mbG93Y19wY2llX3ZmbiBbMHgleF0sIHBvcnQg
-WzB4JXhdCgAAAAAAAAAAAAAAZm9pc2NzaV9ieWU6dmxhbmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhd
-LCB2bGFuZGV2X2ZjLT5mbG93Y19wY2llX3BmbiBbMHgleF0sIHZsYW5kZXZfZmMtPmZsb3djX3Bj
-aWVfdmZuIFsweCV4XSwgcG9ydCBbMHgleF0KAAAAAABpbml0X3BvcnRbJXVdOiAgbGluayBzdGF0
-dXMgMHgleCBtb2RfdHlwZSAweCV4IHZpX2VuX2NudCAldSByeF9sb3MgJXUgaHNzX3NpZ2RldCAl
-dSBwb3J0X2NmZy5zaWdkZXQgJXUKAAAAAAAAAAAAaW5pdF9wb3J0WyV1XTogIGxpbmsgc3RhdHVz
-IDB4JXgKAAAAAAAAAAAAAAAAAAAAcnhjZmdfdnBkIHBvcnQgJXUgbGFuZSAldSBwdHlwZSAldSA9
-PiBpZHg9ICV1ID0+IHJ4Y2ZnID0gJSN4CgAAAFJhbmdlIGNhbGM6IEF2ZXJhZ2VkICUjeCBidXQg
-aWdub3JlZCB2YWx1ZSAlI3ggKGl0ZXJhdGlvbiAldSkKAABNQyBjYWxpYnJhdGlvbiBmYWlsZWQ6
-IERGSSBpbml0IG5vdCBnb2luZyB0byAwCgBNQyBjYWxpYnJhdGlvbiBmYWlsZWQ6IERGSSBpbml0
-IG5vdCBjb21wbGV0aW5nCgBNQyBjYWxpYnJhdGlvbiBmYWlsZWQ6IENhbGlicmF0aW9uIGRpZG4n
-dCBjb21wbGV0ZS4KAAAAAAAAAAAAAAAATUMgY29tbWFuZCBmYWlsZWQgdG8gY29tcGxldGUob3Bj
-b2RlICUjeCBjYWRkciAlI3ggYmFkZHIgJSN4IGRlbGF5ICVkKQoAAAAAAAAAAABwZm5fYml0bWFw
-IDB4JXgKAAAAAAAAAAAAAAAAAAAAAGJhZCBtYWlsYm94IGNtZDogcGZuIDB4JXggdmZuIDB4JXg7
-IG9wY29kZSAweCV4ID4gTEFTVEMyRSAweCV4CgBtYWlsYm94IGNtZCBub3QgeWV0IHN1cHBvcnRl
-ZDogcGZuIDB4JXggdmZuIDB4JXg7IG9wY29kZSAweCV4CgAAYmFkIG1haWxib3ggY21kOiBwZm4g
-MHgleCB2Zm4gMHgleDsgb3Bjb2RlIDB4JXggaXMgdmFsaWQgcG9zdCBkZXZpY2UgaW5pdCBvbmx5
-CgBiYWQgbWFpbGJveCBjbWQ6IHBmbiAweCV4IHZmbiAweCV4OyBvcGNvZGUgMHglMDJ4IHJhbWFz
-ayAweCV4IGNtZCByYW1hc2sgMHgleAoAAGJhZCBtYWlsYm94IGNtZDogcGZuIDB4JXggdmZuIDB4
-JXg7IG9wY29kZSAweCUwMnggbGVuMTYgMHgleCB2ZXJzdXMgZXhwZWN0ZWQgbGVuMTYgMHgleAoA
-AAAAAAAAAGluc3VmZmljaWVudCBjYXBzIHRvIHByb2Nlc3MgbWFpbGJveCBjbWQ6IHBmbiAweCV4
-IHZmbiAweCV4OyByX2NhcHMgMHgleCB3eF9jYXBzIDB4JXggcmVxdWlyZWQgcl9jYXBzIDB4JXgg
-d19jYXBzIDB4JXgKAAAAAAAAAAAAaW5zdWZmaWNpZW50IGNhcHMgdG8gcHJvY2VzcyBtYWlsYm94
-IGNtZDogcGZuIDB4JXggdmZuIDB4JXg7IHJfY2FwcyAweCV4IHd4X2NhcHMgMHgleCByZXF1aXJl
-ZCByX2NhcHMgMHgleCB3X2NhcHMgMHgleAoAAAAAAAAAAABod19wb3dlcl9wcmVwOiBWREQ9Tk9O
-RSBidXQgVkNTPSVkCgAAAAAAAAAAAAAAAABod19wb3dlcl9wcmVwOiB1bnN1cHBvcnRlZCBleHRl
-cm5hbCBhZGp1c3RhYmxlIHBvd2VyIHJlZ3VsYXRvcnMgVkREPSVkLCBWQ1M9JWQKAGh3X3Bvd2Vy
-X3ByZXA6IHVuc3VwcG9ydGVkIFZERD0lZAoAAAAAAAAAAAAAAAAAAGh3X3Bvd2VyX3ByZXA6IHVu
-c3VwcG9ydGVkIFZDUz0lZAoAAAAAAAAAAAAAAAAAAGh3X3Bvd2VyX3ByZXA6IGkyYyB3cml0ZSBl
-cnJvciwgVkREPSVkLHJldD0lZAoAAGh3X3Bvd2VyX3ByZXA6IHVuc3VwcG9ydGVkIFZERD0lZAoA
-AAAAAAAAAAAAAAAAAGh3X3Bvd2VyX3ByZXA6IGkyYyB3cml0ZSBlcnJvciwgVkNTPSVkLHJldD0l
-ZAoAAGh3X3Bvd2VyX3ByZXA6IHVuc3VwcG9ydGVkIFZDUz0lZAoAAAAAAAAAAAAAAAAAAFZQRCBy
-ZWdpb24gaXMgdG9vIHNtYWxsIChTRVJDRkdfU1JfUEZOVlBEU0laRSAweCV4KQoAAAAAAAAAAAAA
-AABjZjogZmFpbGVkIHRvIGFsbG9jYXRlZCBtZW1vcnkgZm9yIGNvbmZpZ3VyYXRpb24gZmlsZSwg
-cmV0ICVkCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAggAAASAAAAAAAAAAggAA
-AQAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoCAAAAAAAAAAAAAAAAA
-gAAAAAAAAAAAAQAAAAAQAAAAAAAAAAMAAAAAAAAAAAAAAAMAAAAAAAAAAAAAEAAAAAAAAAAIAAAA
-AAIAAAAAAAAAAAAgAAAAAAAAAAAAAAABAAOAAAAAAAAAAAAAAAIAAAAAAAAAAAAgA4AAAAAAAAAA
-AAAQAoAAgAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAgAAAAAAAA
-AAAAAACAAAKAAAAAAAAAAAAAAAKAAAAAAAAAAACAAAIAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAKA
-AAAAAAAAAAABAAMAAAAAAAAAAAAAAoMAAAAAAAAAAAAQAoAAAAAAAAAAAAAwAAMAAAAAAAAIAAAw
-AAMAAAAAAAAAAAAwBYMAAAAAAAAIAAAwBYMAAAAAAAAAAAAwBIMAAAAAAAAIAAAwBIMAAAAAAAAA
-AAAwAwMAAAAAAAAIAAAwAwMAAAAAAAAAAAA4AwMAAAAAAAAAAAA4BYMAAAAAAAAAAAA4BIMAAAAA
-AAAAAAA4AAMAAAAAAAAAAAA0BoIAAAAAAAAAAAA8A4IAAAAAAAAAAAA8AAMAAAAAAAAIAAA8AAMA
-AAAAAAAAAAA8BIMAAAAAAAAAAAA8BQMAAAAAAAAAAAA9BAMAAAAAAAAAAAA8A4MAAAAAAAAAAAAs
-AAIAAAAAAAAAAAAsBYIAAAAAAAAAAAAsBQIAAAAAAAAAAAAQBoAAAAAAAAAAAAAQBoKAAAAAAAAA
-AAAADoIAAAAAAAAAAAAQB4KAAAAAIAAAAAAAB4IAAAAAIAAAAAAQBwKAAAAAAAAAAAAQBwKAAAAA
-AAAAAAAQBwKAAAAAAAAAAAAABwIAAAAAIAAAAAAQF4MAAAAAAAAIAAAQF4MAAAAAAAAIAAAQAAAA
-AAAAAAAAAAAQBgOAAAAAAAAAAAAADgMAAAAAAAAAAAAQBgNAAAAAAAAAAAAQBgMAAAAAAAAAAAAQ
-BgAAAAAAAAAAAAAABgOAAAAAAAAAAAAABgMAAAAAAAAAAAAADgIAAAAAAAAAAAAADgIAAAAAAAAA
-AAAQBgIAAAAAAAAAAAAQBgIAAAAAAAAAAAAQBgKAAAAAAAAAAAAQBgKAAAAAAAAAAAAAAAIAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAEAMAAAAAAAAIAAAAAAAAAAAAAAAAAAD/////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////8AAAAgAAAAAMAAAAAAAAAgAAAAAOAA
-AAAAAAAAAgAAAAAAAABAAAAAAAAAAAAAAAAAAAEhAAAAAAAAAAAAAQEgAAAAAAAAAAAAAAIAAAAE
-AAQAAAAABoAAAAQAAAAAAAAAgABAAAAAAAACAAAAgAAgAAAAAAACAAAIgAAAAAAAQAAAAAABAEAA
-AAAAAAAAAAABAEIAAAAAAAAAAAAAACAAAAAAAAAAAAACECAAAAAAAAAAAAACDAIAAAAAAAAAAAAA
-hQIAAAAEAAAAAAAAgEIAAAAAAAAAAACAgEIAQAAAAAAAAACAgEIAAAAAAAAAAAACACIAAAAAAAAA
-AAAAgEEAAAAAAAAAAACAgEEAAAAAAAAAAAAAgEGAAAAAAAAAAACAgEGAAAAAAAAAAAACACEAAAAA
-AAAAAAAAECCAAAAAAAAAAAACJQCAAAAAAAAAAAAABQAAAAAAAAAAAAAIiASAAAAAAAAAAAAIiASA
-AAAAAAAAAAAIogCAAAAAAAAAAAAIogCAAAAAAAAAAAAIowCAAAAAAAAAAAAIowCAAAAAAAAAAAAI
-pICAAAAAAAAAAAAIpICAAAAAAAAAAAAEpIDAAAAAAAAAAAAEogDAAAAAAAAAAAAEowDAAAAAAAAA
-AAAEiATAAAAAAAAAAAAACQGAAAAAAAAAAAACDACAAAAAAAAAAAAAiATAAAAAAAAAAAAAiASAAAAA
-AAAAAAACCwCAAAAAAAAAAAAAioCAAAAAAAAAAAAAC4CAAAAAAAAAAAAAjACAAAAAAAAAAAACIBCA
-AAAAAAAAAAACCgCAAAAAAAAAAAACCoCAAAAAAAAAAAAACQKAAAAAAAAAAAAAAQEAAAAAAAAAAAAA
-AQCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAIEQAAAAAAAAAAAAAIEIAAAAAAAA
-AAAAAIEEAAAAAAAAAAAAAIGAAAAAAAAAAAAAgADAAAAAAAAAAAAAgACgAAAAAAAAAAAAAAgAAAAA
-AAAAAAAAgYAAAAAAAAAAAAAAgYCAAAAAAAAAAAAAiYCAAAAAAAAAAAAAiYDAAAAAAAAAAAAAAYIA
-AAAAAAAAAAACAYAAAAAAAAAAAAACAYCAAAAAAAAAAAAAQYGAAAAAAAAAAAACAYGAAAAAAAAAAAAA
-SYGAAAAAAAAAAAACCYGAAAAAAAAAAAACAYEAAAAAAAAAAAAAQYEAAAAAAAAAAAAgAAAAAAAAAAAA
-AAAQAAACAAAAAAAAAAAQAAAAAAAAAAAAAAAAgADAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-////////////////////////////////////////////////////////////////////////////
-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
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIADAABAAA
-AAIAAAIAJiRAAAAAAABHMAAGAyACtwAIAgHAJEAAAAAACAMAAAIGoAq3AAgCAcYkRgAAAAAAAAAA
-AAAAAAIAAAIAJiRAAAAAAAAgUAAEAAAAAAAAAgEmJEYAAAAACGAgAIQAAAAAAAAGACAAQAAAAAAI
-YCAAhAAAAAIBMAIAJiVAAAAAAAhgAAAEAIQBggQEAgHGJMIAAAAAAcAAAAJDgAMCDIgCAaYkQAAA
-AAAIAGAABAAAAAIAAAIAJiRAAAAAAAgAYAAEAAAAAAAABAEgAEAAAAAAAAAAAAAAAAAAAAAEASAA
-QAAAAAAECBSABgoAAAcBTAIgpiZAAAAAAAiAAAAGAIQBgAQIAgGmJMAAAAAAAEAAAAIAoAAAQAgC
-AKYkRgAAAAAAAAAAAAAAAAIAAAIAJiRAAAAAAAQAAAAChAADAooIAgTAJEAAAAAAAAAAAAAAAAAC
-AAAGASBIQAAAAAAAIFAABAAAAAIAAAIAJiRAAAAAAAhgIACEAAAAAgAABgAmBEAAAAAACGAgAIQA
-AAACAAACASYlQAAAAAAIYAAABACEAYAEBAIBxiTAAAAAAAgAYAAEAAAAAAAABAEgAEAAAAAAAACA
-ACAAAAAAAAACACZMcAAAAAAAAIAAIAAAAAAAAAYBIAAAAAAAAAAAgAAgAAAAAAAAAgAmTHAAAAAA
-AACAACAAAAAAAAAGASAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAACcAAAAi0jAQJFgQCBMYkQAAAAAAJwAAADDSABAkWBAIExiRAAAAAAAQIdIBMCQAAUABc
-AmHmJEAAAAAADAh0gEQAAABSAEACYSYkQAAAAAAIAhCgBAAAAAABAAIAJiRAAAAAAAgCEKAEAAAA
-AAEAAgAmJEAAAAAABAh0AEIBAAAHAIgCYMYkQAAAAAANyBQAAgkAAARAnAJg5iRAAAAAAAnIEIAC
-tIAEApSIAmXGJEAAAAAADch0AEy0gAMAlIgCYKYkwAAAAAAFyHQASDSQAwCUiAJgpiTAAAAAAAhH
-AAAEAAAAAAAAAgEgJEAAAAAACEcAAAQAAAAAAAACBEAkQAAAAAAARyABDAchwrcACAIAwCREAAAA
-AABHIAEMByHCtwAIAgDAJEQAAAAAAEcgAQwHIcK3AAgCAMAkRAAAAAAAACABCACEAAVAiAIBxiTA
-AAAAAAAAIAEIAIQABUCIAgHGJMAAAAAAAAAgAQgAhAAFQIgCAcYkwAAAAAAAACABhoIAAQLAiAID
-xiTAAAAAAAAAIAGCggAAAsCIAgPGJMAAAAAACcAgAYKkgAEFQIgCAcYkwAAAAAAIAAAADACEAAVA
-iAIBxiTAAAAAAAAAIAGGggABAsCIAgPGJMAAAAAAAAAgAYKCAAAAwIgCAqYkwAAAAAAJwCABgqSA
-AQVAiAIBxiTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAUAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAABbZ2xvYmFsXQpyc3NfZ2xiX2NvbmZpZ19tb2RlPWJhc2lj
-dmlydHVhbApyc3NfZ2xiX2NvbmZpZ19vcHRpb25zPXRubG1hcGVuLGhhc2h0b2VwbGl0eix0bmxh
-bGxsa3AKcGxfdGltZW91dF92YWx1ZT0yMDAKcmVnWzB4MTAwOF09MHg0MDgxMC8weDIxYzcwCnJl
-Z1sweDEwMGNdPTB4MjIyMjIyMjIKcmVnWzB4MTBhMF09MHgwMTA0MDgxMApyZWdbMHgxMDQ0XT00
-MDk2CnJlZ1sweDEwNDhdPTY1NTM2CnJlZ1sweDEwNGNdPTE1MzYKcmVnWzB4MTA1MF09OTAyNApy
-ZWdbMHgxMDU0XT05MjE2CnJlZ1sweDEwNThdPTIwNDgKcmVnWzB4MTA1Y109MTI4CnJlZ1sweDEw
-NjBdPTgxOTIKcmVnWzB4MTA2NF09MTYzODQKcmVnWzB4MTBhNF09MHhhMDAwYTAwMC8weGYwMDBm
-MDAwCnJlZ1sweDEwYThdPTB4NDAyMDAwLzB4NDAyMDAwCmJhcjJ0aHJvdHRsZWNvdW50PTUwMApz
-Z2VfdGltZXJfdmFsdWU9NSwxMCwyMCw1MCwxMDAsMjAwCnJlZ1sweDExMjRdPTB4MDAwMDA0MDAv
-MHgwMDAwMDQwMApyZWdbMHgxMTMwXT0weDAwZDVmZmViCnJlZ1sweDExM2NdPTB4MDAwMmZmYzAK
-cmVnWzB4N2RjMF09MHgwNjJmODg0OQpmaWx0ZXJNb2RlPXNydnJzcmFtLGZyYWdtZW50YXRpb24s
-bXBzaGl0dHlwZSxwcm90b2NvbCx2bGFuLHBvcnQsZmNvZQpmaWx0ZXJNYXNrPXByb3RvY29sLGZj
-b2UKdHBfcG1yeD0zMAp0cF9wbXJ4X3BhZ2VzaXplPTY0Swp0cF9ucnhjaD0wCnRwX3BtdHg9NTAK
-dHBfcG10eF9wYWdlc2l6ZT02NEsKdHBfbnR4Y2g9MApyZWdbMHg3ZDA4XT0weDAwMDAwODAwLzB4
-MDAwMDA4MDAKcmVnWzB4MTljMDRdPTB4MDA0MDAwMDAvMHgwMDQwMDAwMApbZnVuY3Rpb24iMCJd
-Cm52Zj0xNgp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT0xCm5pcWZsaW50PTgKbmV0aGN0cmw9
-OApuZXE9MTYKbmV4YWN0Zj04CmNtYXNrPWFsbApwbWFzaz0weDEKW2Z1bmN0aW9uIjEiXQpudmY9
-MTYKd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9MQpuaXFmbGludD04Cm5ldGhjdHJsPTgKbmVx
-PTE2Cm5leGFjdGY9OApjbWFzaz1hbGwKcG1hc2s9MHgyCltmdW5jdGlvbiIyIl0KbnZmPTE2Cnd4
-X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTEKbmlxZmxpbnQ9OApuZXRoY3RybD04Cm5lcT0xNgpu
-ZXhhY3RmPTgKY21hc2s9YWxsCnBtYXNrPTB4NApbZnVuY3Rpb24iMyJdCm52Zj0xNgp3eF9jYXBz
-PWFsbApyX2NhcHM9YWxsCm52aT0xCm5pcWZsaW50PTgKbmV0aGN0cmw9OApuZXE9MTYKbmV4YWN0
-Zj04CmNtYXNrPWFsbApwbWFzaz0weDgKW2Z1bmN0aW9uIjQiXQp3eF9jYXBzPWFsbApyX2NhcHM9
-YWxsCm52aT0yOApuaXFmbGludD0xNzAKbmV0aGN0cmw9MTAwCm5lcT0yNTYKbmV4YWN0Zj00MApj
-bWFzaz1hbGwKcG1hc2s9YWxsCm5ldGhvZmxkPTEwMjQKbnJvdXRlPTMyCm5jbGlwPTMyCm5maWx0
-ZXI9NDk2Cm5zZXJ2ZXI9NDk2Cm5oYXNoPTEyMjg4CnByb3RvY29sPW5pY192bSxvZmxkLHJkZHAs
-cmRtYWMsaXNjc2lfaW5pdGlhdG9yX3BkdSxpc2NzaV90YXJnZXRfcGR1CnRwX2wydD0zMDcyCnRw
-X2RkcD0yCnRwX2RkcF9pc2NzaT0yCnRwX3N0YWc9Mgp0cF9wYmw9NQp0cF9ycT03CltmdW5jdGlv
-biI1Il0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9NApuaXFmbGludD0zNApuZXRoY3RybD0z
-MgpuZXE9NjQKbmV4YWN0Zj00CmNtYXNrPWFsbApwbWFzaz1hbGwKbnNlcnZlcj0xNgpuaGFzaD0y
-MDQ4CnRwX2wydD0xMDI0CnByb3RvY29sPWlzY3NpX2luaXRpYXRvcl9mb2ZsZAp0cF9kZHBfaXNj
-c2k9Mgppc2NzaV9udGFzaz0yMDQ4CmlzY3NpX25zZXNzPTIwNDgKaXNjc2lfbmNvbm5fcGVyX3Nl
-c3Npb249MQppc2NzaV9uaW5pdGlhdG9yX2luc3RhbmNlPTY0CltmdW5jdGlvbiI2Il0Kd3hfY2Fw
-cz1hbGwKcl9jYXBzPWFsbApudmk9NApuaXFmbGludD0zNApuZXRoY3RybD0zMgpuZXE9NjYKbmV4
-YWN0Zj0zMgpjbWFzaz1hbGwKcG1hc2s9YWxsCm5oYXNoPTIwNDgKcHJvdG9jb2w9ZmNvZV9pbml0
-aWF0b3IKdHBfZGRwPTIKZmNvZV9uZmNmPTE2CmZjb2VfbnZucD0zMgpmY29lX25zc249MTAyNApb
-ZnVuY3Rpb24iMTAyMyJdCnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTQKY21hc2s9YWxsCnBt
-YXNrPWFsbApuZXhhY3RmPTgKbmZpbHRlcj0xNgpbZnVuY3Rpb24iMC8qIl0Kd3hfY2Fwcz0weDgy
-CnJfY2Fwcz0weDg2Cm52aT0xCm5pcWZsaW50PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQK
-Y21hc2s9YWxsCnBtYXNrPTB4MQpbZnVuY3Rpb24iMS8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0w
-eDg2Cm52aT0xCm5pcWZsaW50PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxs
-CnBtYXNrPTB4MgpbZnVuY3Rpb24iMi8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52aT0x
-Cm5pcWZsaW50PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPTB4
-NApbZnVuY3Rpb24iMy8qIl0Kd3hfY2Fwcz0weDgyCnJfY2Fwcz0weDg2Cm52aT0xCm5pcWZsaW50
-PTQKbmV0aGN0cmw9MgpuZXE9NApuZXhhY3RmPTQKY21hc2s9YWxsCnBtYXNrPTB4OApbcG9ydCIw
-Il0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209MzAKbHdtPTE1CmR3bT0z
-MApbcG9ydCIxIl0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpod209MzAKbHdt
-PTE1CmR3bT0zMApbcG9ydCIyIl0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJrX21lbT0yNQpo
-d209MzAKbHdtPTE1CmR3bT0zMApbcG9ydCIzIl0KZGNiPXBwcCxkY2J4CmJnX21lbT0yNQpscGJr
-X21lbT0yNQpod209MzAKbHdtPTE1CmR3bT0zMApbZmluaV0KdmVyc2lvbj0weDE0MjUwMDBmCmNo
-ZWNrc3VtPTB4MjNhMmQ4NTAKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAFtnbG9iYWxdCnJzc19nbGJfY29uZmlnX21vZGU9YmFzaWN2aXJ0dWFs
-CnJzc19nbGJfY29uZmlnX29wdGlvbnM9dG5sbWFwZW4saGFzaHRvZXBsaXR6LHRubGFsbGxrcApw
-Y2llX21hX3JzcF90aW1lcnZhbHVlPTUwMApyZWdbMHg1OWM0XT0weDMvMHgzCnBsX3RpbWVvdXRf
-dmFsdWU9MjAwCnJlZ1sweDEwMDhdPTB4NDA4MTAvMHgyMWM3MApyZWdbMHgxMDBjXT0weDIyMjIy
-MjIyCnJlZ1sweDEwYTBdPTB4MDEwNDA4MTAKcmVnWzB4MTA0NF09NDA5NgpyZWdbMHgxMDQ4XT02
-NTUzNgpyZWdbMHgxMDRjXT0xNTM2CnJlZ1sweDEwNTBdPTkwMjQKcmVnWzB4MTA1NF09OTIxNgpy
-ZWdbMHgxMDU4XT0yMDQ4CnJlZ1sweDEwNWNdPTEyOApyZWdbMHgxMDYwXT04MTkyCnJlZ1sweDEw
-NjRdPTE2Mzg0CnJlZ1sweDEwYTRdPTB4YTAwMGEwMDAvMHhmMDAwZjAwMApyZWdbMHgxMGE4XT0w
-eDQwMjAwMC8weDQwMjAwMApiYXIydGhyb3R0bGVjb3VudD01MDAKc2dlX3RpbWVyX3ZhbHVlPTUs
-MTAsMjAsNTAsMTAwLDIwMApyZWdbMHgxMTI0XT0weDAwMDAwNDAwLzB4MDAwMDA0MDAKcmVnWzB4
-MTEzMF09MHgwMGQ1ZmZlYgpyZWdbMHgxMTNjXT0weDAwMDJmZmMwCnJlZ1sweDdkYzBdPTB4MDYy
-Zjg4NDkKZmlsdGVyTW9kZT1mcmFnbWVudGF0aW9uLG1wc2hpdHR5cGUscHJvdG9jb2wsdmxhbixw
-b3J0LGZjb2Usc3J2cnNyYW0KdHBfcG1yeD0zMAp0cF9wbXJ4X3BhZ2VzaXplPTY0Swp0cF9ucnhj
-aD0wCnRwX3BtdHg9NTAKdHBfcG10eF9wYWdlc2l6ZT02NEsKdHBfbnR4Y2g9MApyZWdbMHgxOWMw
-NF09MHgwMDQwMDAwMC8weDAwNDAwMDAwCltmdW5jdGlvbiIwIl0Kd3hfY2Fwcz1hbGwKcl9jYXBz
-PWFsbApudmk9MjgKbmlxZmxpbnQ9MTcwCm5ldGhjdHJsPTk2Cm5lcT0yNTIKbmV4YWN0Zj00MApj
-bWFzaz1hbGwKcG1hc2s9YWxsCm5yb3V0ZT0zMgpuY2xpcD0zMgpuZmlsdGVyPTQ4Cm5zZXJ2ZXI9
-MzIKbmhhc2g9MjA0OApwcm90b2NvbD1uaWNfdm0sb2ZsZCxyZGRwLHJkbWFjLGlzY3NpX2luaXRp
-YXRvcl9wZHUsaXNjc2lfdGFyZ2V0X3BkdQp0cF9sMnQ9MzA3Mgp0cF9kZHA9Mgp0cF9kZHBfaXNj
-c2k9Mgp0cF9zdGFnPTIKdHBfcGJsPTUKdHBfcnE9NwpbZnVuY3Rpb24iMSJdCnd4X2NhcHM9YWxs
-CnJfY2Fwcz1hbGwKbnZpPTQKbmlxZmxpbnQ9MzQKbmV0aGN0cmw9MzIKbmVxPTY2Cm5leGFjdGY9
-MzIKY21hc2s9YWxsCnBtYXNrPWFsbApuaGFzaD0yMDQ4CnByb3RvY29sPWZjb2VfaW5pdGlhdG9y
-CnRwX2RkcD0yCmZjb2VfbmZjZj0xNgpmY29lX252bnA9MzIKZmNvZV9uc3NuPTEwMjQKW2Z1bmN0
-aW9uIjEwMjMiXQp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT00CmNtYXNrPWFsbApwbWFzaz1h
-bGwKbmV4YWN0Zj04Cm5maWx0ZXI9MTYKW2Z1bmN0aW9uIjAvKiJdCnd4X2NhcHM9MHg4MgpyX2Nh
-cHM9MHg4Ngpudmk9MQpuaXFmbGludD00Cm5ldGhjdHJsPTIKbmVxPTQKbmV4YWN0Zj00CmNtYXNr
-PWFsbApwbWFzaz0weDEKW2Z1bmN0aW9uIjEvKiJdCnd4X2NhcHM9MHg4MgpyX2NhcHM9MHg4Ngpu
-dmk9MQpuaXFmbGludD00Cm5ldGhjdHJsPTIKbmVxPTQKbmV4YWN0Zj00CmNtYXNrPWFsbApwbWFz
-az0weDIKW3BvcnQiMCJdCmRjYj1wcHAsZGNieApiZ19tZW09MjUKbHBia19tZW09MjUKaHdtPTMw
-Cmx3bT0xNQpkd209MzAKW3BvcnQiMSJdCmRjYj1wcHAsZGNieApiZ19tZW09MjUKbHBia19tZW09
-MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKW3BvcnQiMiJdCmRjYj1wcHAsZGNieApiZ19tZW09MjUK
-bHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKW3BvcnQiMyJdCmRjYj1wcHAsZGNieApi
-Z19tZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKW2ZpbmldCnZlcnNpb249
-MHgxNDI1MDAwZApjaGVja3N1bT0weGU1NmNiOTk5CgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-AAAAAAAAAAAAAAAA
-====
diff --git a/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu b/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu
new file mode 100644
index 00000000000..39c5f0806ea
--- /dev/null
+++ b/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu
@@ -0,0 +1,8417 @@
+/*-
+ * Copyright (c) 2013 Chelsio Communications, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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.
+ */
+begin-base64 644 t5fw
+AAEDpgEJDAAAAQQFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAA4oDmQOgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAENoZWxzaW8gRlcgUlVOTUVNIERFQlVHPTAgKEJ1aWx0IFNhdCBPY3QgMTIgMDA6
+NDI6MzQgUERUIDIwMTMgb24gY2xlb3BhdHJhLmFzaWNkZXNpZ25lcnMuY29tOi9ob21lL2Zpcm13
+YXJlL2N2cy9mdy1yZWxlYXNlKSwgVmVyc2lvbiBUNXh4IDAxLjA5LjBjLjAwAAAAAAAAAJyteTlg
+AMgAH/zhSOEAe/AAEAAA4QAwuHj///8f/OFAgAAAAeEAe3AAABAAH//3SCAAAADhAZwE4QUAAAAC
+AEDhBQgAAAYAQAACAAwABgAM4QUABAAKAACAAAEC4QB7POEAe0ThAHvk4gAAAAABAADhAHuQIAAA
+AAAAgADhAHsAAABAAeEAe5wAAEAAREREQuAAAADjAASDREREQOMACAAgAAJcAAAAAB//kIAAAAAA
+H/+QhAAAAAAf/5CIAAAAAB//kIwf/8AAAAAAAAAAAADAABH/zSIKh5IQghAS/8wT/8yTIBL/zBP/
+zIQgBDMBkyAR/8oS/8uSEBH/yhL/y5IQEf/KAfQxAOQxAAUxAQIAEv/IAucxAhYAEf/GgRABAV/A
+IQIRAckTEf/EEv/EkhAR/8QS/8SSEGAAEQAAEf++Ev/CkhAR/74S/8GSEIEQEf/AwCCSERL/v5IS
+wCCSExL/vpIQghAC8lBlL/cR/7zHL5IQEf+7khAS/7sT/7uTIMAykyET/7qTIoIiEv+5E/+5kyAj
+IiEU/7gEMwHJOBP/t4MwA4MUCDMRFP+1pDOTIRP/qZMiYAAIwjCTIRP/ppMiEv+wkCCQIZAikCOQ
+JJAlkCaQJ5AokCmQKpArkCyQLZAukC8gJhAgJhGCIhL/o8AwLTcwLTc0LTc4LTc8Iz0BcjPtAAIA
+Ev+gIwoALzcALzcQLzcgLzcwIz0BcjPtAAIAEv+VwDAoNzAoNzQoNzgoNzwjPQFyM+0DAgAS/5PA
+MCc3ACc3ECc3ICc3MCM9AXIz7QMCABL/jRX/jhb/jsAw1yAFZgFgAB4AAAAAAAAAAAAAAAAENgUA
+AgDTD9MPBTMMbjsUB0cUBwRDdjHmBDYFBTMMbzvtAAIAEv9/Ff99IwoAAicCBwRDBD4FBTMMB0cU
+bzvwAwIAEv95yS6DIIQhhSK8InQ7DoZQtFWWMLQzdDP0Y//mAGU/4mVf3xL/bcAyAy4FAwIAEv9k
+wDAoN0AoN0QoN0goN0wjPQFyM+0DAgAAAgAS/2ctJwDAEQFJMQBIMQECAMAAFP9jBNIxFf9ilFAU
+/2IE0zEV/2KUUBT/YQTUMRX/YZRQFP9hBNUxFf9glFAQ/2ADAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAf/AAA
+H/wAAOMACfgf/AAAH/wAAOMACfgf/AAAH/wAAOMACfgf/4AAH/+I4OMACfgf/4jgH/+I4OMAEtgf
+/4jgH/+I4OMAEtgf/4jgH/+KiOMAEtgf/4qIH/+QdOMAFIAf/5CAH/+tPOMAGngf/608H/+tPOMA
+NzQf/8AAH//4ReMANzQgAAAAIAABauMAb3wgAAF4IAABfOMAcOggAAF8IAABheMAcOwgAAGYIAAB
+nOMAcPggAAGcIAABpeMAcPwgAAG4IAABvOMAcQggAAG8IAABxeMAcQwgAAHYIAAB2OMAcRggAAHc
+IAAB4uMAcRggAAH4IAAB+OMAcSAgAAH8IAAB/OMAcSAgAAIYIAACGOMAcSAgAAIcIAACHOMAcSAg
+AAI4IAACOOMAcSAgAAI8IAACPOMAcSAgAAJYIAACWOMAcSAgAAJcIAACYuMAcSAgAAJ4IAACeOMA
+cSggAAJ8IAACguMAcSggAAKYIAGQOOMAcTAgAoAAIAKXsOMB/tAgApewIAKXsOMCFoAgApewIAXq
+COMCFoAgBeoQIAXuMOMFaOAgBoAAIAaZ0OMFbQAgBpnQIAeTUOMFhtAgB5NQIAeU0OMGgFAgCMAA
+IAjAAOMGgdAgCMAAIAjAAOMGgdAgCMAAIAlQX+MGgdAAAAAAAAAAAAAAAAAgABCGIAAQeCAAFJEg
+ABB4IAAT/SAAEHggABEtIAATlSAAEx0gABB4IAASyCAAEnogABINIAAQZSAAEbcgABB4IAAQeCAA
+EHggABFNAAAAAP///////w/8///w////APwgAIxVIACNfyAAjbAgAI13IACNPSAAjTYgAIz6IACM
+8iAAjOogAIybIACNriAAjJMgAIx8AAAAAAAAAAAAAAAAAAAACgAAAAoAAAAUAAAACgAAAAoAAAAK
+AAAACgAAAAoAAAAKAAAAAAAAAAAAAAAAAAEAAQABAAEAAQABAAEAAQABAAIAAwAEAAUABgAHAAgA
+CQAKAA4AEQAVABkAHgAjAC0APABQAGQAyAEsAZAB9AAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAgAC
+AAMAAwADAAMABAAEAAQABAAEAAUABQAFAAUABQAFAAYABgAHAAcAAAACAAAABgAAAAoAAAAOAAAA
+FAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAAAFAQAABwAAAAoA
+AAAOAAAAFAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAAAFAAAABwAAAAoAAAAOAAP8AAQIC
+AAAAAAAAAAAAAAAQIEAAAAAAAAAAAAAAAAAABAACAAEAAIAAQAAgABAACCBAgAAAAAAAAAAAAAAA
+AAAgAo7UAAAAASACjtgAAAACIAKRpAAAAP8gAozkAAAA/yACjOQAAAAAIAKRpAAAAAAgAo38AAAA
+ASACjgQAAAAEIAKODAAAAAggAo4YAAAAICACjigAAABAIAKOMAAAAIAgAo44AAABACACjkAAAAIA
+IAKOVAAABAAgAo5oAAAIACACjoAAABAAIAKOlAAAIAAgAo6kAABAACACjrAAAIAAIAKOxAABAAAA
+AAAAAAAAAAgEAgAAAAAAAAAAAAAAAAAgAo3oAAAAECACjfAAAAARIAKNaAAAAQAgAo10AAAAgCAC
+jYQAAABAIAKNlAAAACAgAo2kAAAAECACjbQAAAAIIAKNwAAAAAQgAo3MAAAAAiACjdgAAAABAIDA
+/wAAAAAgAWmJIAFqHyABaUkgAWnyIAFp0SABaawgAWlfAAAAACAHe+AgB3uaIAd71iAHe9YgB3ua
+IAd7miAHe+AgB3vgIAd7miAHe+AgB3uaIAd74CAHe9YgB3uaIAd7miAHe5ogB3uaIAd7miAHe+Ag
+B3uaIAd7miAHe5ogB3uaIAd7miAHe+AgB3vgIAd74CAHe+AgB3vgIAd74CAHe+AgB3vgIAd7miAH
+e5ogB3uaIAd7miAHe5ogB3uaIAd7miAHe5ogB3uaIAd7miAHe5ogB3uaIAd7miAHe5ogB3uaIAd7
+mgACAgUFCAgLCw4OEREUFBcXGhodHSAgIyMmJikpLCwvLzIyNTU4ODs7AAAAAAAAAAEDEREICBAJ
+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
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgCgAR
+8jcT8jfTDwPmMQECABbyNRfyNndrBpBgtGZ3Y/hUDWhVilEPFABj//kAAABsEAQX8i8rIAcV8i4L
+KED5IQgkBQBF8PU2ACIAADDw8/IqEAAQYDD18ikaIAFcMPoiACsABD7g8zCAKAkAXnD8ZgUoCQAu
+cJlk+fIhEG4COPD3RxQLgAQ6oPlmAiH+AkHw+noCCcAEOiD6ZgEh8AJCMJhjGPIYAEKNlWaTZwIG
+jwNDFCkhCSlmCvRmCyBgAimw8AgHAgAAEfBtOQIARWHRDwAAAGwQBB/yBi0gBx7yBRjyCPchCCQC
+AWww+/IIHgUAK/CeMB7yBPwiACADEEgw+zYGIAAQMDD2NgcgIBBQMPY2BSwgAWww+jYDLQAEP2D4
+NgIsCQBt8PjMEQwJAHdw/TYELAkASzCcMSUgB5Y5JiEJ9fHzEiABKDAAIhECcgL0NgsiCQAosPI2
+CCYJACmw9jYKIgAAEnDRDwAAAAAAAGwQBikgBSogB/gxBSAUEFgw+gpBDgCp2lCLIi4gFBzx4fcK
+CSEbALbgDKYRrGYtYjr/AgAKAKG/UC1iOfvcAAFCADdgKcJKZJENLcJJZNEHDuSH/iQUKgCxF6Af
+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
+IgqEJoIhBUQoCkQRpCLRD2wQBCoiEiwgB/roUQADEHAw/AxBAABjhiAKzVH/AgAAAGQHYB3g1wzL
+Ea27L7I6/wIAAgBgx+Atsjlk0LYvIQcY4NUPD0oM/xH44NMeCQBH8P/WACwoAVAw/yIAIAAQUDCa
+2PrWBi3ABDsg/NYJIDAQYDD81gcpgAQ/4PjgyR4JAEfwGuDGn9Sa1fjWAigJAHZw+dYBIBgQSDCZ
+0x/gwi62OS4iEvoiEC4JAHuw/iYSIgAAWLBYrgQFCEdoghmKJ/sKASAAEGAw+qwgIAEQaDBYV+/S
+oNEPAMAg0Q8rGgALqgIqJhJj/zAtKgANqgIqJhJj/y+OIsjoBQ9HaPIUwCDRDyvMGPosAAIAAGCw
+WF/BY//kjCf5yRQvwBBYMPrCCSBAAkMwC4gB+IxAICACSnD5xRQh4AJSsPrGCSoAGkKQLcEV+OCZ
+GgAgU3CayZigjyAe4Jb4/xEAARAQMP6mAi4JABfw/6YBIAAQEDDRDwAAGOCOmKCPIB7gjfj/EQAB
+EBAw/qYCLgkAF/D/pgEgABAQMNEPbBAYkhCOIBXghYkjiyGKIioWIisWJPkWIyABECAw9BYHIAAQ
+QDD4FgUgBBBgMPwWCiADEGgwnRn1FgYgAhB4MJ8Y9eB3EAoQeDD/FhAgCxBoMP0WESAMEGAw/BYS
+IAgQQDD4Fg4gCRAgMPQWDyAHEEgw+RYNIAUQWDD7FgsgBhBQMPoWDCANEFgw+xYTIA4QUDAqFhT0
+4GMQDxBIMPkWFSAEEEAwKBYEhhaJFSdhfiJhfweZKCsSJPwSIigAIEyw+ELkKGABTDADmQr+kgAi
+AABTsCZiPi0SI/9QgC4AIEOwC2AAjhcH7igsEiT9EiIuACBwsPhC5S5gAXAwA+4KjuAvUIH6FhYi
+AABasPoSIy4AIEOwC2AAjhgH7igsEhb9EiQuACBwsPhC5i5gAXAwA+4KjuAvUIL6FhciAABasPoS
+Ii4AIEOwC2AAjhkH7igsEhf9EhYuACBwsPhC5y5gAXAwA+4KLuIAL1CD+hYYIgAAWrD6EiQuACBD
+sAtgAI4aB+4oLBIY/RIXLgAgcLD4QuguYAFwMAPuCo7gL1CE+hYZIgAAWrD6EhYuACBDsAtgAI4b
+B+4oLBIZ/RIYLgAgcLD4QukuYAFwMAPuCo7gL1CF+hYaIgAAWrD6EhcuACBDsAtgAI4cB+4oLBIa
+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
+84YJKgAUqNAqgRX7fvMaACAasJqJm6CJIPiZEQABEFgw9KYCKAkAXnCZodEPHH7qnDCLIPi7EQAB
+EGAw9DYCKgkAZvCbMdEPbBAEZCBiZDBfZFBciCL5ftYQPgJQ8PpKFABPALYgBAhHDIgRqYgpgjp6
+k0AsgjkZfvb4zAAANwA3IAAJi22pAgBIYR5+zp7AjSCaUBt+z/PGAy2ABD9g+8YCLAkAbrD9xgEg
+IAITMNEPwCDRD9og+0wYIgAAYLBb/eHAINEPAABsEAQABIvIVgMiYAAEYdEPAyJg0Q8AAABsEAQo
+IQQlIQUpIQKEIPiM/yXABD1g/IgRAf4CSnD5JQIkACBBMAVEDPAAMGAAEEAwJSEFJiEE9CIAIAIC
+KXD1BU8B/gJJsPUlBSnABD5g9WEidAAgSTAMVxEHRAwABIsIWGDwBIAPlAC5YCIhBQkiEaJS0Q8o
+JQXz/9tgABAoMAEQGAEAAQAAAAAAAAAAAAAgA3CSIANwkiADbp4gA3CSIANuniADcG0gA3BGIANu
+niADb3kgA26eIANuniADb3AgA26eIANwkiADbp4gA26eIANwkiADbqsAAAAAAAAAAAMBAAIAAAAA
+AAAAAAAAAAAgA/BiIAPwkCAD8hQgA/BiIAPyDCAD8fUgA/BiIAPwYiAD8GIgA/BiIAPwYiAD8GIg
+A/BiIAPwYiAD8GIgA/BiIAPx6iAD8d8gA/BiIAPwYiAD8GIgA/BiIAPwYiAD8GIgA/BiIAPwYiAD
+8GIgA/BiIAPwYiAD8GIgA/BiIAPwYiAD8bQgA/BiIAPxrCAD8awgA/BiIAPwYiAD8Y8gA/BiIAPx
+rCAD8GIgA/BiIAPwYiAD8GIgA/BiIAPwYiAD8GIgA/BiIAPwYiAD8GIgA/BiIAPwYiAD8GIgA/Bi
+IAPwYiAD8GIgA/BiIAPwYiAD8GIgA/BiIAPwYiAD8GIgA/BiIAPxcgAAAAAAAAAAAAAAACAEDhAg
+BA4QIAQNXCAEDhAgBAkgIAQOCCAEDeYgBAkgIAQJICAECSAgBAkgIAQJICAEDT8gBA4QIAQJICAE
+DT8gBA4QAAAAAAAAAAAAAAAAIAQbaSAEG78gBB4UIAQdwiAEHXYgBB1KIAQdOiAEHTQgBByQAAAA
+AAAAAAAAAAAAARAYAQACAAABEBgBAAIAACAEbMYgBGybIARrCyAEbGMgBGxjIARsYyAEawsgBGxj
+IARrCyAEbEMgBGsLIARrCyAEbEMgBGxjAAAAAAAAAAAgBJCgIASMWSAEkHQgBJBIIASQHCAEjHsg
+BIx7IASMkiAEkAMgBIzHIASMsyAEjHsgBIzHIASMeyAEjHsgBIx7IASQoAAAAAAAAAAAAAAAAAAA
+AAAgBNioIATTACAE0qggBNDEAAAAAAAAAAAAAAAAIATS6CAE0uIgBNLiIATS4iAE0uggBNLiIATS
+4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLi
+IATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIg
+BNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE
+0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS6CAE0uIgBNLiIATS
+4iAE0uggBNLiIATS4iAE0uIgBNLoIATS4iAE0uIgBNLiIATS6CAE0uIgBNLiIATS4iAE0uggBNLi
+IATS4iAE0uIgBNLoIATS4iAE0uIgBNLiIATS6CAE0uIgBNLiIATS4iAE0uggBNLiIATS4iAE0uIg
+BNLoIATS4iAE0uIgBNLiIATS6CAE0uIgBNLiIATS4iAE0uggBNLiIATS4iAE0uIgBNLoIATS4iAE
+0uIgBNLiIATS6CAE0uIgBNLiIATS4iAE0uggBNLiIATS4iAE0uIgBNLoIATS4iAE0uIgBNLiIATS
+6CAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLi
+IATS4iAE0uIgBNLiIATS4iAE0uIgBNLoIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIg
+BNLiIATS4iAE0uIgBNLoIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE
+0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLiIATS4iAE0uIgBNLoIATS
+4iAE0uIgBNLiIATS6CAE0uIgBNLiIATS4iAE0ugAAAAAAAAAAAAAAAAgBNM4IATUjSAE1jsgBNYt
+IATWGCAE1gogBNX1IATV5yAE1dIgBNXFIATVsiAE1aUgBNWSIATVhSAE1XIgBNMwIATVXyAE1VIg
+BNU/IATVMiAE1R4gBNUUIATVAyAE1PkgBNToIATTMCAE0zAgBNMwIATTMCAE0zAgBNMwIATU2yAE
+01EgBNMwIATTMCAE0zAgBNS+IATUpSAE1JsgBNR8IATTMCAE1GkgBNRPIATUPCAE1CIgBNQPIATT
+9yAE0+QgBNPRIATTawAAAAAAAAAAIATY6CAE2PIgBNo6IATaESAE2gogBNoDIATZ/CAE2fUgBNnu
+IATZ5yAE2eAgBNnWIATZzCAE2bQgBNlKIATY3SAE2UEgBNkrIATZISAE2RogBNkNIATZBiAE2Nog
+BNj/IAUO4iAFDtggBQ7eIAUO4iAFDtggBQ7YIAUO2CAFDt4gBQ7iIAUO4iAFDuIgBQ7YIAUO4iAF
+DtggBQ7cIAUO4gAAAAAAAAAAAAAAAAAAAAAgBTeaIAU3rSAFOT8gBToPIAU6yCAFO3MgBTwNIAU8
+2SAFXPggBVpcIAVY8CAFVsQgBVTQIAVOICAFTtAgBVOgIAVNmAAAAAADDwgSg46TkiAFhl0gBYa8
+IAWGryAFhqIgBYaRIAWGhCAFhncgBYZqIAWG6SAFh1QgBYdHIAWHOiAFhy0gBYccIAWHCyAFhvog
+BYeBIAWH6CAFh9cgBYfGIAWHtSAFh6ggBYebIAWHjiAFiBkgBYh8IAWIbyAFiGIgBYhVIAWIRCAF
+iDMgBYgmIAWIqSAFiQwgBYj/IAWI8iAFiOUgBYjYIAWIxyAFiLYgBZcwIAWXqiAFl5wgBZeOIAWX
+eiAFl2YgBZdSIAWXPiAFl7ggBZhOIAWYOiAFmCYgBZgSIAWX/iAFl+UgBZfMIAWYYiAFmQwgBZjz
+IAWY2iAFmMEgBZioIAWYlCAFmHsgBZklIAWZzyAFmbYgBZmdIAWZhCAFmWsgBZlSIAWZPiAFmegg
+BZqSIAWaeSAFmmAgBZpHIAWaLiAFmhUgBZn8IAWaqyAFm1ogBZtBIAWbKCAFmw8gBZr2IAWa3SAF
+msQgBZtoIAWcByAFm/kgBZvlIAWbzCAFm7MgBZuaIAWbgSAFnCAgBZzKIAWcsSAFnJggBZyEIAWc
+ayAFnFIgBZw5IAWc4yAFnY0gBZ10IAWdWyAFnUIgBZ0uIAWdFSAFnPwgBZ2mIAWeUCAFnjcgBZ4e
+IAWeBSAFnewgBZ3YIAWdvyAFnmkgBZ8TIAWe+iAFnuEgBZ7IIAWeryAFnpYgBZ6CIAWfLCAFn8Yg
+BZ+yIAWfniAFn4UgBZ9sIAWfUyAFnzogBZ/aIAWgfiAFoGUgBaBMIAWgPiAFoCUgBaAMIAWf8yAF
+je8gBZbrIAWhDyAFoPYgBaDdIAWgySAFoLAgBaCXIAWpKCAFqdcgBam+IAWppSAFqYwgBalzIAWp
+WiAFqUEgBanrIAWqmiAFqoEgBapoIAWqTyAFqjYgBaodIAWqBCAFqrMgBatiIAWrSSAFqzAgBasX
+IAWq/iAFquUgBarMIAWreyAFrCUgBawMIAWr8yAFq9ogBavBIAWrqCAFq48gBaw+IAWs7SAFrNQg
+Bay7IAWsoiAFrIkgBaxwIAWsVyAFrQYgBa2qIAWtnCAFrYMgBa1qIAWtUSAFrTggBa0fIAWtwyAF
+rnIgBa5ZIAWuQCAFricgBa4OIAWt9SAFrdwgBa6LIAWvKiAFrxEgBa8DIAWu7yAFrtYgBa69IAWu
+pCAFr0MgBa/nIAWvziAFr7UgBa+cIAWvgyAFr2ogBa9cIAWSFyAFkjAgBbB9IAWwZCAFsEsgBbAy
+IAWwGSAFsAAgBaEoIAWh1yAFob4gBaGlIAWhjCAFoXMgBaFaIAWhQSAFko8gBZKwIAWiaCAFok8g
+BaI2IAWiHSAFogQgBaHrIAWifCAFoyEgBaMIIAWi9CAFouAgBaLHIAWiriAFopUgBaM6IAWj2iAF
+o8YgBaOtIAWjlCAFo3sgBaNiIAWjTiAFo+4gBaSYIAWkfyAFpGYgBaRNIAWkNCAFpCAgBaQHIAWk
+sSAFpVsgBaVCIAWlKSAFpRAgBaT8IAWk4yAFpMogBaV0IAWmEyAFpfogBaXmIAWl2CAFpb8gBaWm
+IAWljSAFpiwgBabWIAWmwiAFpqkgBaaQIAWmdyAFpl4gBaZFIAWm7yAFp54gBaeFIAWnbCAFp1Mg
+Bac6IAWnISAFpwggBaeyIAWoXCAFqEMgBagqIAWoESAFp/ggBaffIAWnxiAFqHUgBakPIAWo9iAF
+qN0gBajEIAWosCAFqJwgBaiOUlYAAAAAAABBzc1lAAAAAEEuhIAAAAAAEAAAAGNvbmZpZ3VyYXRp
+b24gZmlsZSBwYXJzZXIgZm91bmQgYWRkaXRpb25hbCBjb25maWd1cmF0aW9uIGFmdGVyIFtmaW5p
+XQoAADAAAABmY29lAAAAAHZuaWNfaWQAdmxhbgAAAAB0b3MAZXRoZXJ0eXBlAAAAbWFjbWF0Y2gA
+AAAAbXBzaGl0dHlwZQAAZnJhZ21lbnRhdGlvbgAAAHNydnJzcmFtAAAAAGZjb2VtYXNrAAAAAGNv
+bXBhY3QAYmFzaWN2aXJ0dWFsAAAAAHN5bm1hcGVuAAAAAHN5bjR0dXBlbmlwdjYAAABzeW4ydHVw
+ZW5pcHY2AAAAc3luNHR1cGVuaXB2NAAAAHN5bjJ0dXBlbmlwdjQAAABvZmRtYXBlbgAAAAB0bmxt
+YXBlbgAAAAB0bmxhbGxsa3AAAABoYXNodG9lcGxpdHoAAAAAdHBfcGlvAAB0cF90bV9waW8AAABu
+aWNfdm0AAG5pY191bQAAbmljX3VtX2lzZ2wAbmljX2hhc2hmaWx0ZXIAAG9mbGQAAAAAcmRkcAAA
+AAByZG1hYwAAAGlzY3NpX2luaXRpYXRvcl9wZHUAaXNjc2lfdGFyZ2V0X3BkdQAAAABpc2NzaV9p
+bml0aWF0b3JfZm9mbGQAAABpc2NzaV90YXJnZXRfZm9mbGQAAGZjb2VfaW5pdGlhdG9yAABmY29l
+X3RhcmdldABwb2Zjb2VfaW5pdGlhdG9yAAAAAHBvZmNvZV90YXJnZXQAAABwcHAAZGNieAAAAAAg
+ApdQAAQAAAAABAAABAAAIAXPxCAFgkggBc+wIAWCWCAFgmwgBYG0IAWC8CAFgZD/GDBgYAAAAAAB
+AgMAAAAAIAM/dCADPwAgBBRQAAAAACADPvggAz7wIAM+6AAAAAAwMTIzNDU2Nzg5YWJjZGVmQUJD
+REVGAAAAAAAAAAAAAEFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFlaYWJjZGVmZ2hpamtsbW5vcHFy
+c3R1dnd4eXowMTIzNDU2Nzg5Ky8AAAAAAAAAAAAAAAAAAAAAIAAgsAABAAAgACCQAAUAASAAIHQA
+AwAFIAAgVAAHAABjglNjAAAAAP///////wAAAAQECAAHQwAAAAAAAAAAAAAhAAkAgQBBACEACQAh
+AAkAgQBBAIEAQQCBAEEAgQBBACEACQCBAEEAIQAJACEAEQCBAEEAgQBBACEACQCBAEEAIQAJACEA
+CQEBAEEAgQAhAIEAIQAQEGEBAQCBAQEAgQMCAQAAAAAAAAAAAAAAAAAgAozkAAAAACACkaQAAAAA
+IAKM6AAAAAEgApHEAAAAAiACjPAAAAAEIAKM+AAAAAggAo0AAAAAECACkcwAAAAgIAKNBAAAAEAg
+Ao0QAAAAgCACjRwAAAEAIAKNKAAAAgAgAo04AAAgACACjUQAAEAAIAKNUAAAgAAAAAAAAAAAAAAA
+AgQAAABEAAAABAAAAEAgBWE8IAVg+CAFX8wgBV54IAVeNCAFXgggBV5gAAAAAAAAAgAAAAQAAAAI
+AE5BAABWMAAAVjEAAFYyAABWMwAAVjQAAFY1AABWNgAAVjcAAFY4AABWOQAAVkEAAFZCAABWQwAA
+VkQAAFZFAABWRgAAVkcAAFZIAABWSQAAVkoAAFZLAABWTAAAVk0AAFZOAABWTwAAVlAAAFZRAABW
+UgAAVlMAAFZUAABWVQAAYWxsACoAAABub25lAAAAAGRpc2FibGVkAAAAAGVuYWJsZWQAMHgAAHBv
+cnQAAAAAcHJvdG9jb2wAAAAAZ2xvYmFsAABmdW5jdGlvbgAAAABmaW5pAAAAAHJlZwBmaWx0ZXJN
+b2RlAABmaWx0ZXJNYXNrAAByc3NfZ2xiX2NvbmZpZ19tb2RlAHJzc19nbGJfY29uZmlnX29wdGlv
+bnMAAHNnZV90aW1lcl92YWx1ZQB0cF9wbXJ4AHRwX3BtcnhfcGFnZXNpemUAAAAAdHBfbnJ4Y2gA
+AAAAdHBfcG10eAB0cF9wbXR4X3BhZ2VzaXplAAAAAHRwX250eGNoAAAAAHRwX210dXMAcGNpZV9t
+YV9yc3BfdGltZXJ2YWx1ZQAAcGxfdGltZW91dF92YWx1ZQAAAABiYXIydGhyb3R0bGVjb3VudAAA
+AGNwbHR4ZGF0YV9tZW1hbGlnbgAAbWMAAG1jX21vZGVfYnJjAG1jX3BkAAAAbnZmAHd4X2NhcHMA
+cl9jYXBzAABuaXFmbGludAAAAABuZXEAbmV0aGN0cmwAAAAAbnZpAHJzc252aQAAbmV4YWN0ZgBj
+bWFzawAAAHBtYXNrAAAAbmV0aG9mbGQAAAAAbnJvdXRlAABuY2xpcAAAAG5maWx0ZXIAbnNlcnZl
+cgBuaGFzaAAAAHRwX2wydAAAdHBfZGRwAAB0cF9kZHBfaXNjc2kAAAAAdHBfc3RhZwB0cF9wYmwA
+AHRwX3JxAAAAaXNjc2lfbnRhc2sAaXNjc2lfbnNlc3MAaXNjc2lfbmNvbm5fcGVyX3Nlc3Npb24A
+aXNjc2lfbmluaXRpYXRvcl9pbnN0YW5jZQAAAGlzY3NpX21heF9zZ2UAAABwcG1fbWF4X3pvbmVz
+AAAAcHBtX3pvbmVfcmFuZ2UwAHBwbV96b25lX3JhbmdlMQBwcG1fem9uZV9yYW5nZTIAcHBtX3pv
+bmVfcmFuZ2UzAGZjb2VfbmZjZgAAAGZjb2VfbnZucAAAAGZjb2VfbnNzbgAAAGRjYgBiZ19tZW0A
+AGxwYmtfbWVtAAAAAGh3bQBsd20AZHdtAHZlcnNpb24AY2hlY2tzdW0AAAAAMDEyMzQ1Njc4OWFi
+Y2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6AAAAAFllcwBTZXNzaW9uVHlwZQBPRk1hcmtlcgAAAABJ
+Rk1hcmtlcgAAAABEYXRhRGlnZXN0AABIZWFkZXJEaWdlc3QAAAAARXJyb3JSZWNvdmVyeUxldmVs
+AABJbW1lZGlhdGVEYXRhAAAARGF0YVBEVUluT3JkZXIAAERhdGFTZXF1ZW5jZUluT3JkZXIASW5p
+dGlhbFIyVAAATWF4Q29ubmVjdGlvbnMAAE1heFJlY3ZEYXRhU2VnbWVudExlbmd0aAAAAABJbml0
+aWF0b3JOYW1lAAAASW5pdGlhdG9yQWxpYXMAAERlZmF1bHRUaW1lMldhaXQAAAAARGVmYXVsdFRp
+bWUyUmV0YWluAABNYXhCdXJzdExlbmd0aAAARmlyc3RCdXJzdExlbmd0aAAAAABNYXhPdXRzdGFu
+ZGluZ1IyVAAAAFRhcmdldE5hbWUAAFRhcmdldEFsaWFzAFRhcmdldEFkZHJlc3MAAABUYXJnZXRQ
+b3J0YWxHcm91cFRhZwAAAABBdXRoTWV0aG9kAABTZW5kVGFyZ2V0cz1BbGwAQ0hBUF9BAABDSEFQ
+X0kAAENIQVBfQwAAQ0hBUF9OAABDSEFQX1IAAERpc2NvdmVyeQAAAE5vcm1hbAAATm9uZQAAAABD
+UkMzMkMAAENSQzMyQyxOb25lAE5vbmUsQ1JDMzJDAENIQVAAAAAAQ0hBUCxOb25lAAAATm9uZSxD
+SEFQAAAATm90VW5kZXJzdG9vZAAAAElycmVsZXZhbnQAAFJlamVjdAAATm8AADUAAABDSE5ldCAx
+LjAwAAAAAAAMAAAAAAEAAXwADAEAAAAAEAAAABQgBeVgAAAC/Q5AAAAf/AAAH/wAAB//rUAf/61A
+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
+IAKJQCACiWAgAomAIAKJoCACicAAH///IAKJ4CACigAgAoogIAKKQCACimAgAoqAIAKKoCACisAg
+AorgIAKLACACiyAgAotAIAKLYCACi4AgAougIAKLwCACi+AgAowAIAKMICACjEAgAoxgRIAAUAAA
+H/8gBbCYH/+SoCAJFiAAADGEAAAtRB//m9xAAABEH/+SlCAJStD/7///4QBW4CAJFlAf/5qwH/+R
+uB//klAAADFEAAA1hCAJFpDhAFYAHQAAAB//m7wgBexUIAKO9CAJS8AgCUxwIAlK8CAJSzAgCUzw
+IAlMECAJS3Af/5rwIAkYECAFtMAf/51AH/+s9B//rQwf/60kH/+fAB//rPgf/60QH/+tKB//m9Qf
+/53Q7f/////lv/8AGEAAAAJiWv/AAAAAExwc//wAAAABqgAAAwkEIAkYQOEDOgDhAwgIH/+X7B//
+l/TgAAoA4AANhCAJGGAgB8AAH/+RoB//mRggCRmwv//w/yAJUCAf/5Lg/w///yAJGlAgCRngIAka
+wCAJGxAgCRtAIAXuXCAJG7AKAAAAIAXhfH/wAAAAAAAAbBAEwKT8/AoQFBBYMP0gIiIAAHDwWM4v
+aDE8aDIGaDMDwCDRDyogIRz8A/38AhAQEFgwWFAUZqAz+iAhLAABHDD53REAHhBYMPwKgC3gAWww
+WFAM0qDRDxz79yogIfsKECAAEGgwWFAH0qDRD9Kg0Q8AAABsEAQX+/AmcoEY++/6CgsgCRBIMPdy
+fSCcADWgoncJdxGnZyJwI2siOmYgNyJwLGglUmghT2giTGgmSWgjRmkkNiJwNnkhMP8CAAgARwSg
+eiECaSoiwCICMgoIIgoiIk3RDwAAeSHEayoCaykm+Cq7YA4QWDB7IbPAIAIyCggiCiIiTdEPwCMC
+MgoIIgoiIk3RDwAAaEU0aEcj+EgKYAAQEDBoSRh6QRUCMgoIIgoiIk3RDwAMIhGigiIiTdEPwCIC
+MgoIIgoiIk3RDwDAIQIyCggiCiIiTdEPwCECMgoIIgoiIk3RDwAAbBAGGvu2KaKBHvu1/QoLIAkQ
+YDD7on0hdwA2YKK7CbsRq5sqsCP/AgACAKEKoGahOiqwLNMPaKIaaKUX/wIABADIAqD/AgAAAM4G
+oP8CAAQAzgKgwND8+6MQBBBQMPRFCQAAEFgw/RYAJAAgL3D+VQoCAAB48PhSbSIAAGiw+BYBIgAA
+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
+Dotni74sshCLv6y7sLubMdEPZE36jGeMzozPnDHRD2RN7Y1njd6O3I3brt2w3Z0x0Q9kTdqOZ47u
+juueMdEPZE3Nj2eP/oj+j/2o/7D/nzHRD2RNuohniI6JioiJqYiwiJgx0Q9kTaeJZ4meiZmZMdEP
+ZE2aimeKrouoiqerqrCqmjHRD2RNh4tni76Lt5sx0Q9kTXqMZ4zOjcaMxa3MsMycMdEPZE1njWeN
+3o3VnTHRD2RNWo5nju4v4Sku4Siv7rDunjHRD2RNRY9nj/4v8SifMdEPZE03iGeIjimBJyiBJqmI
+sIiYMdEPZE0iiWeJnimRJpkx0Q9kTRSKZ4quK6ElKqEkq6qwqpox0Q9kTP+LZ4u+K7EkmzHRD2RM
+8YxnjM4twSMswSKtzLDMnDHRD2RQydpgWBegLWAMCN0R/gqALAkAbrAO3QL9NgEgABAQMNEPZFCm
+jjEuZCAOjhT+ZCEgABAQMNEPZFCRjzEvZGEPjxT/ZGAgABAQMNEPZJEfL8LDjmAP7gwOWRQOmRH5
+2QwEcBBYMKuZ+JKzLoABcDAA4QQAqxoLiAL4lrMgABAQMNEPAGRQRSkyAWiQAgmeAv5keiIAAFGw
+Wx/ewCDRDwAowYRkjQkqwXcpwXaqmbCZ+TYBIAAQEDDRDyvBhGS9By3Bdv02ASAAEBAw0Q/HL9EP
+AAAALWAMLrCAANAE/g4bAAUQUDD+AkACAABYsPxxvBIAAHCwWEJD8jYBIAAQEDDRD49nj/6I84/y
+qP+w//82ASAAEBAw0Q+IZ4iOiIL4NgEgABAQMNEPim+pqrCq+jYBIAAQEDDRD4tv+zYBIAAQEDDR
+DyxhE6nMsMz8NgEgABAQMNEPLWET/TYBIAAQEDDRDwAAAAAAAPP7pW//EEgwKGAMLrCAAIEEAK8a
+D+4C/rSAIAAQEDDRDwAAAGwQBiUwCicwCxxygfYwCCAFEFAw9DECIAgQWDD0FgAiAABosP5sAAIA
+ACGwWEISG3EpwKD7awsALAC1YCyymf0SACoAEOXQ/9tpb/UQEDAuMQIqNAv6NAggAgJzsC41AtEP
+AAAospjaIAuAAMuk9GEacAAQUDAkNAj6NAsgARBIMPk0Ci/1EBAw0Q8AKzALwMD8NAogAgJa8Ps0
+Cy/1EBAw0Q8AsWRpR8TAINEPAAAAAAAAAP1sAAABEFAw/HJWEAgQWDBYQezHK9EPAGwQBP9v6hAy
+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
+AAAAKAABbHQAAHLjAABXYwADDUAAAosKAAKLCgADDUAAAAAbAAAAIwABS1IAAHLjAABVWAADDUAA
+AosKAAKLCgADDUAAAAAbAAAAIwABL7YAAHLjAABTZQADDUAAAosKAAKLCgADDUAAAAAbAAAAIwAB
+GFkAAHLjAABRiAADDUAAAosKAAKLCgADDUAAAAAbAAAAIwABeroAAHZfAABaPgADDUAAAosKAAKL
+CgADDUAAAAAZAAAAIwABWysAAHZfAABYVgADDUAAAosKAAKLCgADDUAAAAAZAAAAIwABQV4AAHZf
+AABWgQADDUAAAosKAAKLCgADDUAAAAAZAAAAIwABKZMAAHZgAABUwQADDUEAAosLAAKLCwADDUEA
+AAAZAAAAIwABESoAAG+bAABP3QACCNUAAgjVAAKLCgADDUAAAAAeAAAAKAABFwQAAGyBAABOIAAC
+iwoAAosKAAKLCgADDUAAAAAbAAAAIwAAAAAAACtoAAAjgwAAGGoAAA0GAAALKgAAAAAAAAAAAAAA
+AAABABAAEQAeAA0AEgAHAB8ADgALABMAFQAbAAgAFwAgAA8AHQAMAAYACgAUABoAFgAcAAUACQAZ
+AAQAGAADAAIAAQB7AHUA+wD1AEUAbwB9AHcAXwBpAMUA7wCjAD8A/QD3ALsAOQDfAOkAzwCdAEcA
+cQAPAFkAJQC/ABMAYwB/AHkAbQBdAD0AuQCbAA0AYQBrAAsACQBRAB8AMQBTAMcA8QAhALUAjwDZ
+AK0AMwClAEEAVQCXAJMA4wApAMkA/wD5APMAwwDtAN0A5wAjAL0AOwC3AE8AHQCNANcAkQDhAOsA
+2wAbAIsAiQCHAK8A0QCfADUALQCxANMAFwCnAEkAcwBDAGcAoQA3AM0AVwARAFsAmQAHAC8AswCr
+AJUAJwDBAOUATQDVABkAhQArABUAZQDLAAUAqQBLAIMAAwCBAAAA+gD0AHwAdgDEAO4A/AD2AN4A
+6ABGAHAAJAC+AH4AeAA8ALgAYABqAFAAHgDGAPAAjgDYAKQAQACSAOIA/gD4AOwA3AC8ADoAHACM
+AOAA6gCKAIgA0ACeALAA0gBIAHIAoAA2ABAAWgAuALIAJgDAANQAGAAUAGQAqABKAIAAegB0AEQA
+bgBeAGgAogA+ALoAOADOAJwADgBYABIAYgBsAFwAmgAMAAoACAAwAFIAIAC0AKwAMgBUAJYAKADI
+APIAwgDmACIAtgBOANYAkADaABoAhgCuADQALAAWAKYAQgBmAMwAVgCYAAYAqgCUAOQATACEACoA
+ygAEAIIAAgABAAMAAgAEAAAAAAAAAAAAAQACABwAGwAWABUAHgAdABgAFwAMAAsAEAAPACAAHwAa
+ABkAFAATAAoACQAOAA0AEgARAAgABwAGAAUABAADAAEAAAACAAQAAAAAAAAAACACkfQgBziEIAKR
++CAHQRwgApIEIAdAMCACkhAgBz/gIAKSJCAHPzQgApI8IAc9vCACkkwgBz2UIAKSVCAHPWwgApJo
+IAc9PCACknQgBz0UIAKSfCAHPOwgApKQIAc8uCACkpwgBztUIAKSpCAHOAAgApK8IAc3uCACktAg
+BzckIAKS5CAHNvwgApL4IAc1+CACkvwgBzUEIAKTCCAHNAAgApMQIAcztCACkxQgBzM4IAKTHCAH
+MwAgApMkIAcyyCACkzAgBzKQIAKTNCAHMlggApNAIAcyICACk0QgBzNwIAKTTCAHMeggApNUIAcx
+sCACk1wgBy/YIAKTZCAHMWAgApNwIAcxWCACk3ggBzEgIAKTgCAHMOggApOIIAcwsCACk5AgBzB4
+IAKRzCAHLdggApOYIActoCACk6AgBy1oIAKTqCAHLTAgApO4IAcs+CACk8AgByzAIAKTyCAHLIgg
+ApPQIAcsYCACk9wgByw4IAKT6CAHLAggApQAIAcr4CAClBwgByu4IAKULCAHK5AgApQ8IAcraCAC
+lEwgBytAIAKUXCAHKxggApRsIAcq8CAClHwgByrIIAKUiCAHKqAgApSUIAcqeAAAAAAAAAAAIAKU
+oCAHKUwgApSkIAcpGCAClKwgByjkIAKUuCAHKLAgApS8IAcofCAClMAgByhIIAKUxCAHKCAgApTM
+IAcn+CACkdggB0QQIAKR4CAHQ0QgApHEIAdClCACkewgB0HwAAAwBAAAMBAAAFncAABagAAAWoQA
+AFqIAABajAAAWpAAAZQwAAAQJAAAEDAAABA8AAAQ3AAAEQwAAHssAAB7NAAB4owAAeaMAAHqjAAB
+7owAAfKMAAH2jAAB+owAAf6MAACNzAAAjoAAAH50AACP3AABkVgAAZJwAACP/AAEExwABBMYAAQT
+EAAEkxwABJMYAASTEAAAd+AAAHfkAAB39AAAeAQAAZw8AAEQdAABEIQAAJQIAACYXAAAlgwAAJYU
+AACWIAAAliwAAJbEAADQKAAAkAgAAwjcAANI3AADiNwAA8jcAAMI5AADSOQAA4jkAAPI5AABkFQA
+AGAcAAGg2AABkJAAAHfgAAB35AAAd/QAAHgEAAB42AAAeOAAAHj0AAUAeAAFCHgABRMIAAGUBAAB
+48AAAefAAAHrwAAB78AAAfPAAAH3wAAB+8AAAf/AAAGUDAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAA
+AQAAAAAAAAACAQAAAAAAAAQCAAAAAAAABhQAAAAAAAAHEgAAAAAAAAgDAAAAAAAAChUAAAAAAAAP
+EwAAAAAAABAEAAAAAAAAIAUAAAAAAABABgAAAAAAAIAHAAAAAAAAwBYAAAAAAAEACAAAAAAAAgAJ
+AAAAAAADABcAAAAAAAQACgAAAAAACAALAAAAAAAMABgAAAAAABAADAAAAAAAGAAaAAAAAAAgAA0A
+AAAAAEAADgAAAAAAgAAPAAAAAADAABoAAAAAAOAAGwAAAAABAAAQAAAAAAGAABwAAAAAAcAAHQAA
+AAAB4AAeAAAAAAIAABEAAAAAADAAv///QAAAMAi///9AAAGUEJ////8AAZQ0AAAAEAABlAif/+P/
+AAGUOAAAABAAABAo4f///wAAECzh////AAAQNAH///8AABA4Af///wAAEEAABAAAAAAREAD///8A
+ABEUAP///wAAeygAff/iAAB7MD//7v8AAHs4AAAAAQAAe0A//+7/AAB8JAB9/+IAAeKIAAgAAAAB
+5ogACAAAAAHqiAAIAAAAAe6IAAgAAAAB8ogACAAAAAH2iAAIAAAAAfqIAAgAAAAB/ogACAAAAACN
+yP////AAAI3Q////8AAAjnwAAADwAACOhAAAAPAAAH5wf7//fwAAfnh/v/9/AAB+AADAAAAAAZFU
+Af///wABkZwB////AACP2AN///8AAI/4/////wAEExQAAAAHAAQTDAAAAAsABJMUAAAABwAEkwwA
+AAALAAB33AAAAAMAAHf0/////wAAeAQAAAADAAGcOAABwEAAAZz4AAHAQAAAkAQAAAA+AAEQeAD/
+//8AARB8AP///wABEIgAAAAAAACUBAAA//8AAJQQAAD//wAAmFQAAAH/AACYWAAAAf8AAJYIAAAA
+AAAAlhwA////AACWJAD///8AAJYoAP///wAAljAA////AADQIAAAAAcAANAkAAAABwADCNgAAAAD
+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
+IAkPsCAJD/AgCRAgAARwWAAAECgABEFgIAkREAAAd3cAADMzIAkSUCAJEZAgCRFQIAkR0CAJEhAg
+CRDgAAAgKAAEdBgABErAAARAwAAEQMQABEHwAARB9AAEdBQAACAgIAlJoCAJE3AgCRMwIAkS8CAJ
+ErAgCRJwAAQCcAAACPAABAJ0AAQCfAAEApAAAL8oAARwXAAEdAAAAPAGAARL8AAEcigAAZsvAAFj
+HQAEATAABADsAAQBCAAEdgAAAP/+AAQBBAAEdgQAAP/4AAQBAAAEAOQABHYIAAD/wQAEcgAAAFVV
+AARyBAAEAPgABADcAAQA2AAEckgABAE4AAQBGAAEckwABAD0AARyUAAEdAgABHIIAARASAAEStwg
+CROwIAkT8CAJFDAABEEsAARBPAAEQOAgCRRwAARBACAJFKAABHBIAARwYAAEciAABHYMAAR4BAAB
+hqCAEAAAIAlKgCACkOCAEgADAAQA6IAQAAMABADAAABOIAAEAMwABADEAAQAyAAEATQgBorUIAaO
+FEEuhIAAAgAhAA//KQAEAEQgCRTQAAQCRAAEAkwABAJIBgYAAAAEAYAAAB54AAEwsAAEANAABADU
+AAQA8AAEAPwAAgjVAAEEagAEAQwABAEQAACiwgAEARQAADDUAAQBHAAEASQABAEoAAQBLAAEAUAA
+BAFEAAQCUAAEASAABAJgAAQCZAAEAlQAAQAhdzWUAAAEQfwABEv8AACAIAAACAgABHAwAARgwAAE
+YMQAAIgAAARB1AAES9QABEHYAARL2AAEQdwABEvcAARwOAAEcAAgCRUAAARwBAAAwAAgCRVAAARg
+yAAAgCQABEAcAARKHAAAFywgCRWAIAkVsEHNzWUABGDkAARg0CAJFeAABEAAAARABAAEQAwABEAI
+AARKBAAEcDQABHAIAARQAAAEVAAABGDMAAB/AAAEQdAABEvQAARwUAAEUGgABFBAAARUaCAGiVgA
+BFBQAARUUAAEUiQABFIoAARSLAAEQBAABEgQAADDAAAEQBQABEgUIAaJ2AAEQeAABEvgIAaKWAAE
+QegABEvoAARB5AAES+QABEHsAARL7AAEQBgABEoYAADu8AAEUGAABFRgAAARAAAAETAAABAwIAaC
+kCAGf4wgBoUwIAaD5CAGh9AgBoaEAAP//wAEEwQABBMkAP///wCBAiAgCU1wIAlNsB//m2AgCU4A
+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
++WLfaAAgLrAnlQBj/9ulqye0AGP/09EPK6J7KaKDo7sJuxH4YWtoACBecGhiamlk5KWcl8DRDwD4
+QDRgAgIRMHJDqWP/zwAALLKLhBEpooOjzPnMEQACAiEw+GEdaAAgZnBoYh1oZCJyQ4Fj/6cAABnC
+nKk5KZDlY/9PpZonpABj/+Slmye1AGP/3KWcl8Bj/9WlnSfUANEPpZ4n5QDRDyACkRwMwAACIAXC
+FCACkSAIwAAIIAXCFCACkSQ8wAAMIAXBZCACkSgGwAA0IAXDcCACkSwIwAA4IAXCFCACkTACwAA8
+IAXDcCACkTQIwABAIAXCFCACkTgIQABIIAXCnCACkTwIQABMIAXCnCACkUAIQABQIAXCnCACkUQI
+QABUIAXCnCACkUggQABYIAXCnCACkUwgQABoIAXCnCACkVAgQAB4IAXCnCACkVQgQACIIAXCnCAC
+kVggQACYIAXCnCACkVwgQACoIAXCnCACkWAgQAC4IAXCnCACkWQgQADIIAXCnCACkWgMQADYIAXA
+5CACkWwMQADkIAXA5CACkXAMQADwIAXA5CACkXQMQAD8IAXA5CACkXgMQAEIIAXA5CACkXwMQAEU
+IAXA5CACkYAMQAEgIAXA5CACkYQMQAEsIAXA5CACkYgIQAE4IAXCnCACkYwIQAE8IAXCnCACkZAI
+QAFAIAXCnCACkZQQQAFEIAXCnCACkZgQQAFMIAXCnGh3X2JjbTU0ODJfY2ZnbWRpWyV1XSBzZXR0
+aW5nIHR5cGUgJXUKAAAAAAAAAAAAAGh3X2JjbTU0ODJfbGlua19zdGF0dXNbJXVdOiBibXNyIDB4
+JTA4eCBzdGF0dXMgJXUgbWFjX2xzIDB4JTA4eAoAAAAAAAAAAAAAAAAAAAAAZ2F0aGVyX3Rhc2tz
+X3RvX3R4X2xpc3Q6IHRhc2sgaW4gdXNlIFsldV0KAAAAAAAAZ2F0aGVyX3Rhc2tzX3RvX3R4X2xp
+c3Q6IGlkeCBbJXVdLCB0YXNrIGZpZCBbMHgleF0sIHRhc2sgc3RhdGUgWzB4JXhdLCB0YXNrIGNv
+bm4gWzB4JXhdLCB0YXNrIGZmbGFncyBbMHgleF0sIGNvbm4gZmlkIFsweCV4XSwgZGRwIFslZF0K
+AAAAAAAAAAAAZ2F0aGVyX3Rhc2tzX3RvX3R4X2xpc3Q6IHRhc2sgWzB4JXhdLCBzdGF0ZSBbMHgl
+eF0gb24gY29ubiBbMHgleF0gbm90IHZhbGlkIHRvIGdhdGhlciwgc2tpcHBpbmcKAAAAAAAAAAAA
+AAAAAAAAAGdhdGhlcl90YXNrc190b190eF9saXN0OiBjb25uX2ZjLT5mbG93Y19mbGFncyBbMHgl
+eF0sIGxpc3RfZW1wdHkgWzB4JXhdLCBhZGRfdGFza19jb3VudCBbMHgleF0KAHRvX3R4X2xpc3Q6
+IG5vIHRhc2sgdG8gY2xvc2UgZm9yIGNvbm4gWzB4JXhdLCBiYWlsaW5nIHRvIHJlY292ZXJ5IHN0
+YXRlIFsweCV4XQoAaW5vZGVfZmMtPmZsb3djX2ZsYWdzIFsweCV4XSwgaW5vZGVfZmMtPmZsb3dj
+X2J1Zi0+Zmlmby5udW1fYnl0ZXMgWyV1XQoAAAAAAAAAAABhdXRoZW50aWNhdGVfdGFyZ2V0OiBL
+RVlfQ0hBUF9SRVNQIC0gWzB4JXgleCV4JXgleCV4JXgleF0KAAAAAAAAYXV0aGVudGljYXRlX3Rh
+cmdldDogS0VZX0NIQVBfUkVTUCAtIFsweCV4JXgleCV4JXgleCV4JXhdCgAAAAAAAGF1dGhlbnRp
+Y2F0ZV90YXJnZXQ6IEluY29ycmVjdCBwYXNzd29yZAoAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDog
+S2V5IENIQVBfQSwgdmFsIFslZF0KAAAAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogS2V5IENIQVBf
+SSwgdmFsIFslZF0KAAAAAAAAAAAAAENIQVBfQzogZGlnZXN0IGV4cGFuc2lvbiBlcnJvcgoAdmFs
+aWRhdGVfa2V5dmFsOiBLRVlfQ0hBUF9OQU1FLCBsZW4gWzB4JXhdCgAAAAAAQ0hBUF9OOiBUYXJn
+ZXQgdXNlcmlkIG1pc21hdGNoCgBDSEFQX1I6IGRpZ2VzdCBleHBhbnNpb24gZXJyb3IKAFJlY2ll
+dmVkIEF1dGhNZXRob2QgdmFsdWUKAAAAAAAAdmFsaWRhdGVfa2V5dmFsOiBmbG93Y19mb2lzY3Np
+X2Nvbm5fZmxhZ3MgWzB4JXhdCgAAAAAAAAAAAAAAAAAAAHZhbGlkYXRlX2tleXZhbDogZmxvd2Nf
+Zm9pc2NzaV9jb25uX2ZsYWdzIFsweCV4XQoAAAAAAAAAAAAAAAAAAABOZWdvIEZCTCBbJXVdCgAA
+S0VZX01BWFJDVkRTTCBbJXVdCgAAAAAAAAAAAAAAAABEdXBsaWNhdGUgaXNjc2kga2V5CgAAAAAA
+AAAAAAAAAGZvaXNjc2lfcGFyc2VfcmN2ZF9wYXJhbXM6IGVycm9yCgAAAAAAAAAAAAAAAAAAAGZv
+aXNjc2lfcGFyc2VfcmN2ZF9wYXJhbXM6IHJsZW4gJWQKAAAAAAAAAAAAAAAAAGxvZ2luX3Jlc3A6
+IGZsb3djX2ZvaXNjc2lfY29ubl9mbGFncyBbMHgleF0KAAAAAGxvZ2luX3Jlc3A6IGZsb3djX2Zv
+aXNjc2lfY29ubl9mbGFncyBbMHgleF0sIHJjIFsweCV4XQoAAAAAAAAAAABpU0NTSSBTZWMtcGFy
+YW1zIHJlY2VpdmVkaGF2ZSBlcnJvcnMhIQoAAAAAAAAAAABUYXJnZXQgbW92ZWQgdGVtcC4gY29u
+biAleCwgc2VzcyAleAoAAAAAAAAAAAAAAABMb2dpbiBGYWlsZWQhIS4gY29ubl9mYyBbMHgleF0s
+IHNlc3NfZmMgWzB4JXhdLCBzdGF0dXNfY2xhc3MgWzB4JXhdCgAAAAAAAAAAAAAAAGxvZ2luX3Jl
+c3A6IHNlc3NfZmMtPmZsb3djX2lkIFsldV0sIGNvbm5fZmMtPmZsb3djX2lkIFsldV0gbG9nZ2Vk
+IGluCgAAAAAAAAAAAAAAUHJvdG9jb2wgRXJyb3IgY2JpdCAlZCB0Yml0ICVkIGNzZyAlZCBuc2cg
+JWQKAAAAcmVjdl9ub3BpbjogY3RybCB0YXNrIGFscmVhZHkgcGVuZGluZwoAAAAAAAAAAAAAd3Jo
+X29mbGRfcnhfZGF0YTogYWllZSwgaXNjc2kgY29ubiBbMHgleF0gZm9yIHNlc3MgWzB4JXhdLCB0
+eXBlIFsweCV4XSB0cmFuc2l0ZWQgaW4gdG9lIG1vZGUuIEtpY2tpbmcgcmVjb3ZlcnkgCgAAAAAA
+AAAAAAAAAAAAAABjb25uIHRpZCBbMHgleF0sIHJ4X2RhdGEtPnNlcSBbMHgleF0sIHJ4X2RhdGEt
+PmxlbiBbMHgleF0sIHJ4X2RhdGEtPnN0YXR1cyBbMHgleF0KAAAAAAAAAAAAAAAAAABjc2tfZmMt
+PmZsb3djX2Nzb2NrX29mZnNldCBbMHgleF0sIGRsZW4xNiBbMHgleF0KAAAAAAAAAAAAAAAAAAAA
+YWN0X2VzdDogdGNiX2ZjIFsweCV4XSwgZmxvd2NfZm9pc2NzaV9jb25uX2ZsYWdzIFsweCV4XQoA
+AAAAAAAAAGFjdF9lc3RhYjogdGNiX2ZjLT5mbG93Y19idWYgWzB4JXhdLCB0Y2JfZmMtPmZsb3dj
+X3R5cGUgWzB4JXhdIHRjYl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBucGFnZXMgWzB4JXhdLCBm
+bG93Y190cF9zbmRfbWF4IFsweCV4XQoAAAAAAAAAAAAAAAAAAGFjdF9lc3RhYjogYXRpZCBbMHgl
+eF0sIHRpZCBbMHgleF0sIG9wIFsweCV4XSwgcmN2X2lzbiBbMHgleF0sIHNuZF9pc24gWzB4JXhd
+LCBjc29jay0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCB0Y3Bfb3B0IFsweCV4XSwgdGNiX2ZjLT5mbG93
+Y19pZCBbMHgleF0gCgAAAAAAAAAAAAAAAABjc2tfZmMtPmZsb3djX2Nzb2NrX2Nvb2tpZSBbMHgl
+eF0gCgAAAAAAAAAAAAAAAABsM2luNF9kZXZfY29uZmlnOiB3ci0+cGFyYW0udmxhbmlkIFsldV0s
+IGwyZGV2X2ZjLT5mbG93Y19uZXRfbDJkZXZfdmxhbmRldiBbMHgleF0KAAAAAAAAAAAAAAAAAABu
+ZXRfbDNpbjRfZGV2X2NvbmZpZzogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgYWRkcmVzcyBh
+bHJlYWR5IHVzZWQgYnkgcG9ydCAlZAoAAAAAAAAAAAAAAAAAAABuZXRfbDNpbjRfZGV2X2NvbmZp
+ZzogIGFkZHIgWzB4JXhdLCBtYXNrIFsweCV4XSwgZ3cgWzB4JXhdLCByZWZfY250IFsweCV4XSBp
+biB1c2UKAAAAAAAAAAAAAAAAAAB3cmhfY2huZXRfaWZjb25mOiBsMmRldl9mYy0+Zmxvd2NfaWQg
+WzB4JXhdLCBsMmRldl9mYy0+Zmxvd2NfdHlwZSBbJTB4XSwgaWZjb25mX3dyLT5zdWJvcCBbMHgl
+eF0KAAAAAAAAAAAAAAAAAAAAd3JoX2NobmV0X2lmY29uZjogbDJkZXZfZmMtPmZsb3djX2lkIFsw
+eCV4XSwgdW5rbm93biBzdWJvcCBbMHgleF0KAAAAAAAAAAAAAAAAAAB3cmhfY2huZXRfaWZjb25m
+OiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCByYyAlZAoAAAAAAAAAAAAAAAAAbmV0aWZfaXBf
+Y29uZmxpY3RfdGltZXJfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGluZGV2Y3R4dC0+
+c3RhdGUgWyVkXSwgaW5kZXZjdHh0LT5yZXRyeV9jbnQgWyVkXQoAAAAAAAAAAG5ldGlmX2lwX2Nv
+bmZsaWN0X3RpbWVyX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBpbmRldmN0eHQgWzB4
+JXhdLCBpbiBmcmVlIHN0YXRlCgAAAAAAAAAAAGNtZGhfY2huZXRfaWZhY2U6IGZjIFsweCV4XSwg
+ZmMtPmZsb3djX2lkIFsweCV4XSwgZmMtPmZsb3djX3R5cGUgWzB4JXhdLCBwIFsweCV4XSwgbGVu
+MTYgWyV1XSwgbG9jIFsweCV4XQoAAAAAAABjbWRoX2NobmV0X2lmYWNlOmwyZGV2X2ZjIFsweCV4
+XSwgbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgbDJkZXYtPmZsb3djX3R5cGUgWyV1XSwgbDJk
+ZXZfZmMtPmZsb3djX25ldF9sMmRldl9mbGFncyBbJTB4XQoAAAAAAGNtZGhfY2huZXRfaWZhY2U6
+IHIyWzBdICV1IHIyWzFdICV1CgAAAAAAAAAAAAAAAGNtZGhfY2huZXRfaWZhY2U6IGwyZGV2X2Zj
+LT5mbG93Y19uZXRfbDJkZXZfZmxhZ3MgY2hhbmdlZCBmcm9tIFslMHhdIHRvIFslMHhdLCByYyBb
+JWRdCgAAAAAAAAAAAGNobmV0X2wyZGV2X3VwX21iX2NiOiByYyBbJWRdLCBwb3J0IFsldV0sIHN0
+YXRlIFsldV0sIGNvb2tpZSBbMHgleF0KAAAAAAAAAAAAAAAAY2huZXRfcXVldWVfeG1pdDogZmMt
+PmZsb3djX2lkIFsweCV4XSwgYnVmX2xlbiBbMHgleF0sIGJ1ZmZlcmVkIFsweCV4XSwgZmlmby5u
+dW1fYnl0ZXMgWyUweF0KAAAAZGhjcF9wcm9jZXNzX2NiOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4
+JXhdLCBkaGN0eHQtPnN0YXRlIFslMHhdLCBkaGN0eHQtPnJ0cnlfY250IFsldV0KAAAAAAAAAAAA
+ZGhjcF90aW1lcl9jYjogREhDUERJU0NPVkVSIHNlbnQsIGJ1dCBubyByZXBseSBmcm9tIGFueSBw
+b3NzaWJsZSBzZXJ2ZXIgb24gdGhlIG5ldHdvcmsuIFJldHJ5aW5nIGFnYWluCgAAAAAAAAAAAGRo
+Y3BfdGltZXJfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlbmRpbmcgREhDUERJU0NP
+VkVSIGZvciBkaGN0eHQgWzB4JXhdIG9uIHBpZCBbJWRdCgAAAGRoY3BfdGltZXJfY2I6IGwyZGV2
+X2ZjLT5mbG93Y19pZCBbMHgleF0sIERIQ1BPRkZFUiByZWNlaXZlZCBmb3IgZGhjdHh0IFsleF0g
+cGlkIFslZF0KAAAAAAAAAAAAAGRoY3BfdGltZXJfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgl
+eF0sICBESENQQUNLIHJlY2VpdmVkIGZvciBkaGN0eHQgWyV4XSwgcGlkIFslZF0KAAAAAAAAAAAA
+AGRoY3BfdGltZXJfY2I6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIGRoY3R4dC0+aXBhZGRy
+IFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAZGhjcF90aW1lcl9jYjogbDJkZXZfZmMtPmZsb3djX2lk
+IFsweCV4XSwgbm8gcmVwbHkgZnJvbSBkaGNwIHNlcnZlciwgdGltaW5nIG91dAoAAAAAAAAAAAAA
+AAAAAAAAbG9naW5fcGFyYW1zOiBjb25uX2ZjLT5mbG93Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4
+JXhdCgAAAAAAAAAAAGxvZ2luX3BhcmFtczogY29ubl9mYy0+Zmxvd2NfZm9pc2NzaV9jb25uX2Zs
+YWdzIFsweCV4XQoAAAAAAAAAAABhdXRoX25lZ29fc2VjdXJpdHk6IHNlbmRfZmxhZyBbMHgleF0s
+IGF1dGhfcG9saWN5IFsweCV4XQoAAAAAAAAAYXV0aF9uZWdvX3NlY3VyaXR5OiBLRVlfQ0hBUF9S
+RVNQIC0gaGFzaFsweCV4JXgleCV4JXgleCV4JXhdCgAAAGF1dGhfbmVnb19zZWN1cml0eTogS0VZ
+X0NIQVBfUkVTUCAtIGhhc2hbMHgleCV4JXgleCV4JXgleCV4XQoAAABhdXRoX25lZ29fc2VjdXJp
+dHk6IEtFWV9DSEFQX1JFU1AgLSBlcnJvciBlbmNvZGluZyB0byBoZXgKAAAAAAAAYXV0aF9uZWdv
+X3NlY3VyaXR5OiBLRVlfQ0hBUF9SRVNQIC0gZWxlbiBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAGF1
+dGhfbmVnb19zZWN1cml0eTogS0VZX0NIQVBfQ0hBTCAtIGVycm9yIGVuY29kaW5nIHRvIGhleAoA
+AAAAAABhdXRoX25lZ29fc2VjdXJpdHk6IEtFWV9DSEFQX0NIQUwgLSBlbGVuIFsweCV4XQoAAAAA
+AAAAAAAAAAAAAAAAc2VuZF9sb2dpbl9yZXF1ZXN0OmNvbm5fZmMtPmZsb3djX2lkIFsweCV4XSwg
+c2Vzc19mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjdHJsX3htaXQgWzB4JXhdLCBzZXNzX2ZjLT5mbG93
+Y19mb2lzY3NpX3Nlc3NfdHlwZSBbMHgleF0KAAAAAAAAAAAAAAAAAAAAc2VuZF9sb2dpbl9yZXF1
+ZXN0OiBmbGFnIFsweCV4XS4KAAAAAAAAAAAAAAAAAAAAc2VuZF9sb2dpbl9yZXF1ZXN0OiB0eF9s
+ZW4gWyV1XQoAAAAAAAAAAAAAAAAAAAAAeG1pdF9zZW5kdGFyZ2V0czogY29ubiB0aWQgWzB4JXhd
+LCBjdHJsX3htaXQtPnR0dCBbMHgleF0sIGRhdGFfbGVuIFsldV0sIHBhZF9sZW4gWyV1XQoAAAAA
+AAAAAAAAcGluZ190YXJnZXQ6IHBpbmcgdGltZW91dCwga2lja2luZyByZWNvdmVyeSBmb3Igc2Vz
+cyBbMHgleF0KAAAAAHNlbmRfbm9wX291dDogY29ubiBmbG93X2lkIFsweCV4XSwgcmVxIFsldV0s
+IHR0dCBbMHgleF0KAAAAAAAAAABzZW5kX25vcF9vdXQ6IHR0dCBbMCV4XSwgaXR0IFsweCV4XSwg
+Y21kc24gWzB4JXhdLCBleHBfc3RhdHNuIFsweCV4XQoAAAAAAAAAAAAAAGNzb2NrX2ZhaWxlZDog
+Y3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBzZXNz
+X2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlc3NfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgZXZ0IFsw
+eCV4XQoAAAAAAAAAAAAAAGNobmV0X2ZpbmRfbDJ0X2VudHJ5OiBkYWRkciBbJTA4eF0sIFsweCUw
+OHhdLCBsb2NhbCBuZXR3b3JrIFslZF0KAAAAAAAAAAAAAAAAAAAAbDJ0ZW50IFslMHhdLCBsMnRl
+bnQtPmlkeCBbJWRdCgByYyBbJWRdLCBjc2tfZmMgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsw
+eCV4XQoAAAAAAAAAAAAAAAAAAAAAY3NvY2tfZnJlZTogc2l6ZW9mKGNza19mYy0+dS5jc29jaykg
+WyV1XSwgYnl0ZXMKAAAAAAAAAAAAAAAAAAAAAGZvaXNjc2k6IFJlY292ZXJ5IHRpbWVkIG91dCBh
+ZnRlciBbJXVdIHJldHJ5LCBiYWlsaW5nIG91dAoAAAAAAAByZWNvdmVyeV90aW1lb3V0OiBzZXNz
+X2ZjLT5mbG93Y19pZCBbMHgleF0sIHJldHJ5IGNvdW50IFslZF0sIHNlc3NfZmMtPmZsb3djX3N0
+YXRlIFsweCV4XQoAAAAAAAByZWNvdmVyeV90aW1lb3V0OiBzZXNzX2ZjLT5mbG93Y19mb2lzY3Np
+X3Nlc3NfZmxhZ3MgWzB4JXhdLCBjb25uZWN0aW9uIHJlcXVlc3QgcGVuZGluZywgYmFpbGluZyBv
+dXQKAAAAAAAAAAAAAAAAVENQIGNvbm4gZXN0YWJsaXNobWVudCBmYWlsZWQgJWQKAAAAAAAAAAAA
+AAAAAAAASW52YWxpZCBvcGNvZGUgMHgleCBpbiBjdHJsIHBhdGgKAAAAAAAAAAAAAAAAAAAARERQ
+IGVycm9yIFsweCV4XSwgYWJvcnRpbmcgY29ubm4gWzB4JXhdCgAAAAAAAAAAcnhfZGF0YV9kZHA6
+IFJlc3BvbmNlIHJlY2lldmVkIGZvciB0YXNrIFswJXhdIHdoaWxlIGludmFsaWQgdGFzayBvciBj
+b25uZWN0aW9uIHN0YXRlLiB0YXNrIHN0YXRlIFsweCV4XSwgY29ubiBzdGF0ZSBbMHgleF0KAAAA
+AABpc2NzaV9oZHJfcng6IFJlc3BvbmNlIHJlY2lldmVkIGZvciB0YXNrIFswJXhdIHdoaWxlIGlu
+dmFsaWQgdGFzayBvciBjb25uZWN0aW9uIHN0YXRlLiB0YXNrIHN0YXRlIFsweCV4XSwgY29ubiBz
+dGF0ZSBbMHgleF0KAAAAAGlzY3NpX2hkcl9yeDogSW52YWxpZCB0YXNrIHN0YXRlIDB4JXggZm9y
+IHRhc2sgMHgleCwgaXR0IFsweCV4XSwgb3BjIFsweCV4XQoAAAAAcHJvY2Vzc190bWZfcmVzcG9u
+c2U6IGlzdGFza19mYy0+Zmxvd2NfYnVmLT5zY2hlZF9ub2RlLm5leHQgWzB4JXhdLCBpc3Rhc2tf
+ZmMgWzB4JXhdLCBpc3Rhc2tfZmMtPmZsb3djX2lkIFsldV0KAHByb2Nlc3NfdG1mX3Jlc3BvbnNl
+OiB3ciBvcGNvZGUgWzB4JXhdCgAAAAAAAAAAAHByb2Nlc3NfdG1mX3Jlc3BvbnNlOjogdGFzayBm
+dW5jdGlvbiBbMHgleF0KAAAAAHByb2Nlc3NfdG1mX3Jlc3BvbnNlOiBkZWxheV9wcm9jZXNzaW5n
+LCBvcCBbJXhdCgAAAAAAAAAAAAAAAAAAAABjYWxsaW5nIGRyb3BfdGFzaywgbGlkeCBbMHgleF0K
+AHNjc2lfYWJvcnQ6IGZyZWVpbmcgYWJvcnRlZCB0YXNrIFsweCV4XSBvbiBsdW4gWzB4JXhdIG9u
+IGNvbm4gWzB4JXhdCgAAAAAAAAAAAAAAcmV0dXJuX3BlbmRpbmdfdGFzazogY29va2llIFsweCUw
+OHhdLCBbMHglMDh4XQoAcmV0dXJuX3BlbmRpbmdfdGFzazogZGVsYXkgcHJvY2Vzc2luZywgY29u
+biBmbGFncyBbMHgleF0KAAAAAAAAAHJldHVybl9wZW5kaW5nX3Rhc2s6IERvbmUgc2VuZGluZyB0
+YXNrIGVycm9yIHRvIGhvc3QsIHVscHR4bGVuMTYgWyV1XQoAAAAAAAAAAAAAcmV0dXJuX3BlbmRp
+bmdfdGFzazogZGVxdWV1ZSB0YXNrIFsweCV4XSwgc3RhdGUgWzB4JXhdIGZyb20gdHhfbGlzdAoA
+AAAAAAAAAAAAAAByZXR1cm5fcGVuZGluZ190YXNrOiBhbGwgdGFza3MgcmV0dXJuZWQsIHJlY292
+ZXJ5IHN0YXRlIHRyYW5zIHRvIFsweCV4XQoAAAAAAAAAAGNsZWFyX2RkcF9tYXA6IGlzdGFza19m
+YyBbMHgleF0sIGlzdGFza19mYy0+Zmxvd2NfaWQgWzB4JXhdIGJ1ZmZlcmVkICV1CgAAAAAAAAAA
+Y2xlYXJfZGRwX21hcDogaXN0YXNrX2ZjLT5mbG93Y19mb2lzY3NpX3Rhc2tfbnBwb2QgJXUsIG5w
+cG9kICV1LCBwcGRhZGRyIFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAY2xlYXJfZGRwX21hcDogYWxs
+IHJldHVybmVkIHRhc2tzIGRkcCBjbGVhcmVkLCByZWNvdmVyeSBzdGF0ZSB0cmFucyB0byBbMHgl
+eF0KAAB3cmhfZm9pc2NzaV9ub2RlOiBub2RlX3dyLT5mbG93aWRfbGVuMTYgMiBbJXhdCgB3cmhf
+Zm9pc2NzaV9jaGFwOiBpZF9sZW4gWyV4XSwgc2VjX2xlbiBbJXhdCgAAAAB3cmhfZm9pc2NzaV9j
+aGFwOiB0Z3RfaWRfbGVuIFsleF0sIHRndF9zZWNfbGVuIFsleF0KAAAAAAAAAAAAAAAAcGVlcl9j
+b246IGNza19mYyA9PiBmbG93aWQgWzB4JXhdLCBmbG93Y19idWYgWzB4JXhdCgAAAAAAAAAAAAAA
+AGZvaXNjc2lfY3RybDogc3Vib3AgWzB4JXhdLCBzZXNzX3R5cGVfdG9fZXJsIFsweCV4XSwgc2Vz
+c190eXBlIFsweCV4XQoAAAAAAAAAAAAAd2F0Y2hkb2cgY21kIGhhbmRsZXIgKHRpbWUgJXUgYWN0
+aW9uICV1KQoAAAAAAAAAV0FUQ0hET0c6IGRldmljZSBzaHV0ZG93bgoAAAAAAABXQVRDSERPRzog
+YnlwYXNzIHRpbWVvdXQKAAAAAAAAAFdBVENIRE9HOiBGTFIgLSBub3QgaW1wbGVtZW50ZWQgeWV0
+CgAAAAAAAAAAAAAAAFdBVENIRE9HOiB0ZW1wZXJhdHVyZSBvZiAlZEMgZXhjZWVkcyB0aHJlc2hv
+bGQgb2YgJWRDCgAAAAAAAAAAAABmaWx0ZXI6IHBvcmdyYW1taW5nIHRpZCAldSAobGUgdGNhbSBp
+bmRleCAldSkuLi4KAAAAAAAAAAAAAAAAAAAAZmlsdGVyOiByZXF1ZXN0aW5nIGNvbXBsZXRpb24u
+Li4KAAAAAAAAAAAAAAAAAAAAc2Vzc2lvbl9ibG9jazogc2Vzc19mYy0+Zmxvd2NfaWQgWzB4JXhd
+LCBzZXNzX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGNvbm5fZmMtPmZsb3djX2lkIFsweCV4XSwg
+Y29ubl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3Nr
+X2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0KAAAAAAAAAAAAAAAAAAAAc2Vzc2lvbl91bmJsb2NrOiBz
+ZXNzX2ZjLT5mbG93Y19pZCBbMHgleF0sIHNlc3NfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgY29u
+bl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBjb25uX2ZjLT5mbG93Y19zdGF0ZSBbMHgleF0sIGNza19m
+Yy0+Zmxvd2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4XQoAAAAAAAAAAAAA
+AAAARkNPRSBGcmVlOiBzdGlsbCB5aWVsZGVkIHdoZW4gZnJlZWluZy4uLmZsb3djX2lkICV4IGZs
+b3djX2ZsYWdzICV4IAoAAAAAAAAAAAAAAABwb3J0ICVkIHByaW9yICVkIHNlbGVjdCAlZCBwcm90
+b2NvbElEIDB4JTA0eAoAAABwb3J0ICVkIHNldCBwZmNfZW4gPSAweCV4CgAAAAAAAHBvcnQgJWQg
+c2V0IHBnaWRfMF83ID0gMHglMDh4IHBnX3BlcmNlbnRhZ2UgMHglMDh4XyUwOHggbnVtX3Rjc19z
+dXBwb3J0ZWQgJWQKAAAAcG9ydCAlZCBzZXQgcGZjX2VuID0gMHgleAoAAAAAAABGQ29FIEREUCBm
+YWlsZWQgOiBveF9pZCAweCV4IHJ4X2lkIDB4JXgKAAAAAAAAAABGQ29FIEREUCBmYWlsZWQgOiBE
+ZHBSZXBvcnQgMHgleCBEZHBWYWxpZCAweCV4CgBQUkxJIFJzcCB0aW1lZG91dCA6IGZsb3djX2lk
+IDB4JXggb3hfaWQgMHgleCByeF9pZCAweCV4IAoAAAAAAAAAY2Fubm90IGFsbG9jYXRlIG9mZmxv
+YWRlZCBmaWx0ZXIgY29ubmVjdGlvbgoAAAAAY2Fubm90IGFsbG9jYXRlIG9mZmxvYWRlZCBmaWx0
+ZXIgSVB2NiBjb25uZWN0aW9uCgAAAAAAAAAAAAAAAAAAAHBrdHNjaGVkX3lpZWxkWyV1OiV1XTog
+d2VpZ2h0X2VuYWJsZWQgMHgleCB3ZWlnaHRfbGltaXRlZCAweCV4IFJFTE9BRCAldQoAAAAAAAAA
+cGt0c2NoZWRfeWllbGRbJXU6JXVdOiBmb3JjZSBSRUxPQUQgUkRZIDB4JXggV0FUQ0hfUkRZIDB4
+JXggV0FUQ0hfTElTVCAweCV4IC0+IDB4JXgKAAAAAAAAAAAAAAAAcGt0c2NoZWRfeWllbGRbJXU6
+JXVdOiBSRUxPQURlZCBSRFkgMHgleCBXQVRDSF9SRFkgMHgleCBXQVRDSF9MSVNUIDB4JXgKAAAA
+AAAAAABpbnZhbGlkIGJ1ZmZlciBncm91cFsldV0gY29uZmlndXJhdGlvbjogbXR1ICV1IGx3bSAl
+dSBod20gJXUgZHdtICV1CgAAAAAAAAAAAAAAAGZjICV1IHZmICV1IGdvdCBpdmY9MHgleCxyYW5n
+ZTogJSN4LSUjeCAoJXUvJXUgdXNlZCkKAAAAAAAAAAAAAABWSSAldSBjYW5ub3QgZ2V0IFJTUyBz
+bGljZTogTm8gbW9yZSBzbGljZXMgYXZhaWxhYmxlICh1c2VkICV1LyV1KQoAAAAAAAAAAAAAAAAA
+AHBmbiAldSB2Zm4gJXUgd2l0aCBwb3J0IG1hc2sgMHgleCBjYW5ub3QgYWNjZXNzIHBvcnQgJXUs
+IHJldCAlZAoAAAAAAAAAAAAAAAAAAAAAcGZuICV1IHZmbiAldSBjb3VsZCBub3QgYWxsb2NhdGUg
+dmlpZCwgcmV0ICVkCgAAcGZuICV1IHZmbiAldSBjb3VsZCBtYXAgdmlpZCAgMHgleCB0byBmbG93
+YywgcmV0ICVkCgAAAAAAAAAAAAAAAHBmbiAldSB2Zm4gJXUgY291bGQgbm90IGFsbG9jYXRlIHV3
+aXJlIGZ1bmMgJWQgbWFjIGFkZHIsIHJldCAlZAoAAAAAAAAAAAAAAAAAAAAAbWlpX2luaXRbJXVd
+OiBhY2FwcyAweCV4CgAAAAAAAABtaWlfcGRvd25bJXVdOiBwb3dlcmRvd24gZW4gJXUKAG1paV9m
+b3JjZV9zcGVlZFsldV06IHJjYXBzIDB4JXgKAAAAAAAAAAAAAAAAAAAAAG1paV9saW5rX3N0YXR1
+c1sldV06IGJtc3IgMHglMDh4IHN0YXR1cyAldSBtYWNfbHMgMHglMDh4CgAAAAAAAABwb3J0X2Nt
+ZF9oYW5kbGVyOiB1bmtub3duIHUuZGNiLnR5cGUgMHgleAoAAAAAAABwb3J0WyV1OjB4JTAyeDow
+eCUwMnhdOiBwaHkgcmVzZXQgbm90IGF2YWlsYWJsZQoAAAAAAAAAAAAAAAAAAAAAcG9ydFsldTow
+eCUwMng6MHglMDJ4XTogdW5rbm93biBhY3Rpb24gMHgleAoAAAAAcG9ydFsldToweCUwMng6MHgl
+MDJ4XTogdW5rbm93biByZWFkIGFjdGlvbiAweCV4CgAAAAAAAAAAAAAAAAAAAGNwbF9lcnJfbm90
+aWZ5OiB0aWQgJXUgY3BsIDB4JTA4eCUwOHgKAAAAAAAAAAAAAGNwbF9lcnJfbm90aWZ5OiB0aWQg
+JXUgY3BsIDB4JTA4eCUwOHggMHglMDh4JTA4eAoAAAAAAAAAAAAAAAAAAABjcGxfZXJyX25vdGlm
+eTogdGlkICV1IGxlbiAldQoAAEZDT0UgRnJlZTogc3RpbGwgeWllbGRlZCB3aGVuIGZyZWVpbmcu
+Li5mbG93Y19pZCAleCBmbG93Y19mbGFncyAleCAKAAAAAAAAAAAAAAAARkNPRSBCUCBXUiBFUlI6
+IFdSIHdpdGggY29va2llICV4JXggZXJyb3JlZCBiYWNrIAoAAAAAAAAAAAAAAAAAAGdldF9yZWZf
+dGFzazogcmVxdWVzdGVkIGNvb2tpZTogaGlnaCBbMHglMDh4XSwgbG93IFsweCUwOHhdCgAAAABn
+ZXRfcmVmX3Rhc2s6IHRhc2sgY29va2llOiBoaWdoIFsweCUwOHhdLCBsb3cgWzB4JTA4eF0KAAAA
+AAAAAAAAZ2V0X3JlZl90YXNrOiBpc3Rhc2stPmZsb3djX2lkIFsweCV4XSwgaXN0YXNrX2ZjLT5m
+bG93Y19zdGF0ZSBbMHgleF0sIGlzdGFza19mYy0+Zmxvd2NfZm9pc2NzaV90YXNrX2NtZHNuIFsw
+eCV4XQoAAAAAAAAAAAAAAAAAAABnZXRfcmVmX3Rhc2s6IHRhc2sgbm90IGZvciBjb29raWUgJWx4
+CgAAAAAAAAAAAABzY3NpX2Fib3J0OiBFbnRlcmluZyBBYm9ydF90YXNrLCBidWZmZXJlZCBbJXVd
+CgBzY3NpX2Fib3J0OiBpZGF0YS0+b3AgWzB4JXhdLCBmbGFncyBbMHgleF0sIGZ1bmMgWzB4JXhd
+LCBsdW5faWR4IFsweCV4XQoAAAAAAAAAAHNjc2lfYWJvcnQ6IHdyLT5pcWlkIFsweCV4XSwgaXN0
+YXNrX2ZjLT5mbG93Y19zZ2VfaXFpZCBbMHgleF0sIGlzdGFza19mYyB0YXNrIGZsYWdzIFsweCV4
+XQoAAAAAAHNjc2lfYWJvcnQ6IHJlZiB0YXNrIG5vdCBvdXRzdGFuZGluZwoAAAAAAAAAAAAAAHNj
+c2lfYWJvcnQ6IGNvbm4gWzB4JXhdLCBjbWRzbiBbMHgleF0sIHNlbnRfY21kc24gWzB4JXhdLCBt
+YXhfY21kc24gWzB4JXhdLCBpdHQgWzB4JXhdCgAAAAAAAAAAAGFib3J0L2Nsb3NlIFdSIHdpdGgg
+Y29va2llIDB4JWx4IHdhcyBpc3N1ZWQgb24gc3NuIDB4JXggaW4gd3Jvbmcgc3RhdGUgMHgleAoA
+AAAAYWJvcnQgV1Igb24gc3NuIDB4JXggZGlkIG5vdCBmaW5kIFdSIHdpdGggY29va2llIDB4JXgl
+eAoAAAAAAAAAAGNsb3NlIFdSIHdpdGggY29va2llIDB4JWx4IG9uIHNzbiAweCV4O2RpZCBub3Qg
+ZmluZCBXUiB3aXRoIGNvb2tpZSAweCVseAoAAAAAAAAAYWJvcnQgV1Igb24gc3NuIDB4JXggd2Fz
+IGlzc3VlZCBvbiB4Y2hnIDB4JXggd2l0aCByeF9pZCAweCV4IGluIHdyb25nIHN0YXRlIDB4JXgK
+AAAAAAAAAAAAAAAAAAAAcG9ydCAlZCBhcHBsSUQgMHglMDR4IG91aSAweCUwNnggdXNlcl9wcmlv
+ciAlZAoAZGNieCB1cGRhdGVbJXVdIHNlbnQgdG8gZHJpdmVyICh0eXBlICUjeCBzdWJ0eXBlICUj
+eCBmbG93Y2lkICV1KQoAAAAAAAAAAAAAAAAAAABjaG5ldF9sMnRfdXBkYXRlOiBsMnRfdXBkYXRl
+IHJlcXVlc3Qgc2VudCBsMnRlbnQgWyUwOHhdLCBsMnRlbnQtPmlkeCBbJWRdLCBsMnRlbnQtPnZs
+YW4gWyVkXQoAAABuZXRpZl9wcm9jZXNzX2RoY3A6IGwyZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0s
+IHByb2Nlc3NpbmcsIG9wdF9sZW4gJXUKAAAAAAAAAAAAAGNobmV0X2RoY3BfcmVjdjogdmxhbmlk
+IFsldV0sIGwyZGV2X3BpZF9mYy0+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5kZXYgWzB4JXhdLCBsMmRl
+dl9mYyBbMHgleF0KAAAAAGNobmV0X2RoY3BfcmVjdjogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4
+XSwgZGhjdHh0LT5zdGF0ZSBbJWRdLCBtYWxhY2lvdXMgZGhjcCByZWN2IGZvciBubyByZXF1ZXN0
+CgAAAAAAAAAAAAAAAABkaGN0eHQtPnN0YXRlIDogJWQKAAAAAAAAAAAAAAAAAGwyZGV2X2ZjLT5m
+bG93Y19pZCBbMHgleF0sIEJhZCBESENQIGNvb2tpZSByZWNpZXZlZCwgYWJvcnRpbmcKAABpZ25v
+cmluZyBmaXAgcmVjdiBmb3IgZmNmIGZsb3c6JXggaW4gb2ZmbGluZSBzdGF0ZQoAAAAAAAAAAAAA
+AAAATl9QT1JUIDB4JXgleCV4IHJlamVjdGVkIFBMT0dJIHdpdGggcmVhc29uIGNvZGUgJXgKAAAA
+AAAAAAAAAAAAAEFCVFMgd2hpbGUgYXdhaXRpbmcgUFJMSSBSc3A6IGZsb3djX2lkIDB4JXggb3hf
+aWQgMHgleCByeF9pZCAweCV4IAoAAAAAAAAAAAAAAAAAQUJUUyBmYWtlIFJzcDogbG9jIDB4JXgg
+b3hfaWQgMHgleCByeF9pZCAweCV4CgAAcmVsZWFzZV90aWQ6IHNpemVvZih0Y2JfZmMtPmZsb3dj
+X2ZvaXNjc2lfY29ubikgWyV1XSwgYnl0ZXMKAAAAAGFjdF9vcGVuX3JwbDogYXRpZCBbMHgleF0s
+IHRpZCBbMHgleF0sIG9wIFsweCV4XSwgc3RhdHVzIFsweCV4XQoAAAAAAAAAAAAAAAAAAAAAYWN0
+X29wZW5fcnBsOiBjc2tfZmMtPnRjYl9zdGF0ZSBbMHgleF0sIGNza19mYy0+ZmxhZ3MgWzB4JXhd
+LCB0Y2JfZmMtPmZsb3djX3N0YXRlIFsweCV4XQoAAAAAAAAAc2VuZF9hYm9ydF9ycGw6IGNza19m
+Yy0+Zmxvd2NfdHlwZSBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4JXhdLCB0aWQgWzB4JXhd
+LCB1bHB0eGNoIFsldV0sIGJ1ZmZlcmVkIFsldV0KAAAAAHdyaF9vZmxkX3RjcF9jbG9zZV9jb25f
+cmVwbHk6IHRjYl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCB0Y2JfZmMtPmZsb3djX3R5cGUgWzB4JXhd
+LCBsZW4xNiBbJXVdLCBsb2MgWyV1XQoAAAAAAAAAAAB3cmhfb2ZsZF90Y3BfY2xvc2VfY29uX3Jl
+cGx5OiBycGwtPm9wX1RpZCBbMHgleF0sIHJwbD5zdGF0dXMgWzB4JXhdLCBycGwtPnNuZF9ueHQg
+WzB4JXhdLCBycGwtPnJjdl9ueHQgWzB4JXhdCgAAdGNwX2Fib3J0X3JwbF9yc3M6IHRpZCBbMHgl
+eF0sIHN0YXR1cyBbMHgleF0KAAAAdGNwX2Fib3J0X3JlcV9yc3M6IHRpZCBbMHgleF0sIHN0YXR1
+cyBbMHgleF0KAAAAcGt0c2NoZWRfY2xfcmxbJXU6JXVdOiBtb2RlIHwgdW5pdCB8IHJhdGUgMHgl
+MDZ4IG1pbiAldSBtYXggJXUgcGt0c2l6ZSAldQoAAAAAAABwYXJhbV9kbWFxWzB4JXg6MHgleF06
+IGRtYXEgMHgleCByZWFkICV1IHBmICV1IHJldCAlZAoAAAAAAAAAAAAATUNbJXVdIGluaXRfc3Rh
+dGVfbWFjaGluZSAweCUwMngKAAAAAAAAAAAAAAAAAAAATUMgaW5pdGlhbGl6YXRpb24gbm90IGNv
+bXBsZXRpbmcsIE1DIGN1cnJlbnQgaW5pdCBzdGF0ZSBpcyAweCUwMngKAAAAAAAAAAAAAAAAAABN
+Q1sldV0gX2h3X21jX2luaXRfbWMKAAAAAAAAAAAAAF9od19tY19pbml0X21jX2ZwZ2FbJXVdOiBl
+cnJvciAlZAoAAAAAAAAAAAAAAAAAAGh3X2xlX2ZpbHRlcl9jdHVwbGU6IHR1cGxlICV1IG5vdCBz
+cGVjaWZpZWQgYnV0IHJlcXVpcmVkIGZvciBtYXNrIDB4JXgKAAAAAAAAAAAAbGUgY29uZmlndXJh
+dGlvbjogaGFzaCByZWdpb24gdG9vIGxhcmdlIHRvIGVuYWJsZSBzZXJ2ZXIgc3JhbQoAAGxlIGNv
+bmZpZ3VyYXRpb246IGNhbm5vdCBlbmFibGUgc2VydmVyIHNyYW0gd2hlbiBoYXNoIHJlZ2lvbiBp
+cyBkaXNhYmxlZAoAAAAAAAAAbGUgY29uZmlndXJhdGlvbjogbmVudHJpZXMgJXUgcm91dGUgJXUg
+Y2xpcCAldSBmaWx0ZXIgJXUgYWN0aXZlICV1IHNlcnZlciAldSBoYXNoICV1CgAAAAAAAAAAAAAA
+bGUgY29uZmlndXJhdGlvbjogbmVudHJpZXMgJXUgcm91dGUgJXUgY2xpcCAldSBmaWx0ZXIgJXUg
+c2VydmVyICV1IGFjdGl2ZSAldSBoYXNoICV1IG5zZXJ2ZXJzcmFtICV1CgAAAAAAAAAAAAAAAGNm
+X3BhcnNlOiBmaWxlIG1lbXR5cGUgMHgleCBtZW1hZGRyIDB4JXggbWFwcGVkIEAgJXA6CgAAAAAA
+AAAAAABjb25maWd1cmVkIHdpdGggY2FwcyBuYm18bGluayAweCUwOHggc3dpdGNofG5pYyAweCUw
+OHggdG9lfHJkbWEgMHglMDh4IGlzY3NpfGZjb2UgMHglMDh4CgAAAAAAAABuZXQgVkkgYWxsb2Nh
+dGlvbiBmYWlsZWQgZm9yIGZjX2lkICV1IHdpdGggZXJyb3IgJWQKAAAAAAAAAAAAAAAAbmV0IFZJ
+IG1hYyBhZGRyZXNzIHByb2dyYW1taW5nIGZhaWxlZCBmb3IgZmNfaWQgJXUgd2l0aCBlcnJvciAl
+ZAoAAAAAAAAAAAAAAAAAAABuZXQgVkkgcnhtb2RlIHByb2dyYW1taW5nIGZhaWxlZCBmb3IgZmNf
+aWQgJXUgd2l0aCBlcnJvciAlZAoAAAAAbmV0IFZJIHJzcyBpbmRpcmVjdGlvbiB0YWJsZSBwcm9n
+cmFtbWluZyBmb3IgZmNfaWQgJXUgZmFpbGVkIHdpdGggZXJyb3IgJWQKAAAAAABuZXQgVkkgcnNz
+IGNvbmZpZyBjb21tYW5kIGZhaWxlZCBmb3IgZmNfaWQgJXUgd2l0aCBlcnJvciAlZAoAAAAAbmV0
+IFZJIGNvbW1hbmQgZmFpbGVkIGZvciBmY19pZCAldSB3aXRoIGVycm9yICVkCgAAAAAAAAAAAAAA
+AAAAAHBwbWF4IFsldV0sIGJpdHMgWyV1XSwgRldfSVNDU0lfUEFHRVBPRF9UQUdfSURYX01BWF9T
+SVpFIFsldV0KAABkZWZhdWx0IHRhZ21hc2sgWzB4JTB4XQoAAAAAAAAAAHByb2dyYW1tZWQgdGFn
+bWFzayBbMHglMHhdCgAAAAAAcHBtLT5kZHBfaW5mby5sbGltaXQgWzB4JTB4XSwgcHBtLT5kZHBf
+aW5mby51bGltaXQgWzB4JTB4XSwgcHBtLT5kZHBfaW5mby5zaXplIFsweCUweF0KAAAAAAAAAAAA
+cHBtLT5kZHBfaW5mby5tYXhfdHhzeiBbMHglMHhdIHBwbS0+ZGRwX2luZm8ubWF4X3J4c3ogWzB4
+JTB4XSBpb3NpemUgWzB4JTB4XQoAAABwcG1heCBbJXVdLCBpZHhfYml0cyBbJXVdLCBpZHhfbWFz
+ayBbMHglMHhdLCByZXN2ZF90YWdfbWFzayBbMHglMHhdLCB0YWdtYXNrIFsweCUweF0KAAAAAAAA
+AAAAAAB0YWcgaXR0IDB4JTB4LCBiaXRzICV1LCBhZ2UgMHglMHgsIGJpdHMgJXUKAAAAAABjeGNu
+aWMtPmlzY3NpX3BwbSBbMHglMHhdCgAAAAAAAHNjc2lfcGxkX3NpemUgWyV1XSwgQUxJR04oc2Nz
+aV9wbGRfc2l6ZSwgMTYpIFsldV0KAAAAAAAAAAAAAAAAAABtYXhfcHBvZF96b25lcyBbJXVdCgAA
+AAAAAAAAAAAAAGZvaXNjc2lfaW5pdDogZm9pc2NzaV9pbml0X2RvbmUgWyV1XSwgZGV2LnJlcy5m
+b2lzY3NpX250YXNrcyBbJXVdLCBkZXYucmVzLmZvaXNjc2lfbnNlc3MgWyV1XSwgZGV2LnJlcy5u
+Y3NvY2sgWyV1XSwgZGV2LnJlcy5mb2lzY3NpX25pbml0IFsldV0sIHJjIFslZF0KAAAAAAAAAABj
+aF9jbF9yYXRlWyV1LyV1XTogY2FwcGVkIGNsYXNzIHJhdGUgZnJvbSByZXF1ZXN0ZWQgJXUgdG8g
+Y29uZmlndXJlZCAoZWZmZWN0aXZlKSBjaGFubmVsIHJhdGUgJXUKAAAAAAAAAAAAAAAAAAAAY2hf
+Y2xfcmF0ZVsldS8ldV06IGluY3JlYXNlZCBkZWZpY2l0X2luY3IgZnJvbSByZXF1ZXN0ZWQgJXUg
+dG8gcmVxdWlyZWQgbWluIG9mICV1OyByYXRlICV1IChlZmYgJXUpIGRlZmljaXRfbWF4ICV1CgAA
+AAAAAAAAAAAAAABwa3RzY2hlZCBjaGFubmVsICV1IHNldHMgc3BlZWQgKGZyb20gJXUpIHRvICV1
+IGticHMKAAAAAAAAAAAAAAAAcG9ydF9jbWRfaGFuZGxlcjogdW5rbm93biB1LmRjYi50eXBlIDB4
+JXgKAAAAAAAAaTJjIGVycm9yIGNhdXNlZCBieSBtb2R1bGUgdW5wbHVnCgAAAAAAAAAAAAAAAAAA
+c2VuZHRvIHBlbmRpbmc6IHdyX3BlbmQgJXAgZm9yIHBvcnQgJXUsICB3YW50IHRvIHNlbmQgdG8g
+cG9ydCAldQoAAAAAAAAAAAAAAAAAAABzZW5kdG86Zmxvd2NpZCAldQoAAAAAAAAAAAAAAAAAAHBv
+cnRfbGlua19zdGF0ZV9oYW5kbGVyWyV1XSBsZWF2aW5nIFNUQVRFX1VQICg9PnBvd2VyZG93bikK
+AAAAAABwb3J0X2xpbmtfc3RhdGVfaGFuZGxlclsldV0gcG93ZXJpbmcgZG93bgoAAAAAAABwb3J0
+X2xpbmtfc3RhdGVfaGFuZGxlclsldV0gbGVhdmluZyBwb3dlcmRvd24gKD0+ZG93bikKAAAAAAAA
+AAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXJbJXVdIGxlYXZpbmcgU1RBVEVfRE9XTiAoPT5wb3dl
+cnVwKQoAAAAAAHBvcnRfbGlua19zdGF0ZV9oYW5kbGVyWyV1XSBwb3dlcmluZyB1cAoAAAAAAAAA
+AHBvcnRfbGlua19zdGF0ZV9oYW5kbGVyIGxlYXZpbmcgcG93ZXJ1cCAoPT51cCkKAHBvcnRfbGlu
+a19zdGF0ZV9oYW5kbGVyWyV1XSBvaCBteSB3aGF0IGlzIGdvaW5nIG9uIChzdGF0ZSA9ICUjeAoA
+AAAAAAAAAAAAAAAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXIgZ290IHJlc2NoZWR1bGVkCgAA
+AAAAAAAAcG9ydF9saW5rX3N0YXRlX2hhbmRsZXI6IFNvbWV0aGluZyB3ZW50IHRlcnJpYmx5IHdy
+b25nLiByZXQgPSAlZAoAAAAAAAAAAAAAAAAAAABod19zZ2VfbWFtZW1faW5pdDogZW5jb3VudGVy
+ZWQgZXJyb3IgJWQKAAAAAAAAAABsZSBpbml0aWFsaXphdGlvbjogbmVudHJpZXMgJXUgcm91dGUg
+JXUgY2xpcCAldSBmaWx0ZXIgJXUgYWN0aXZlICV1IHNlcnZlciAldSBoYXNoICV1CgAAAAAAAAAA
+AABsZSBpbml0aWFsaXphdGlvbjogbmVudHJpZXMgJXUgcm91dGUgJXUgY2xpcCAldSBmaWx0ZXIg
+JXUgc2VydmVyICV1IGFjdGl2ZSAldSBoYXNoICV1IG5zZXJ2ZXJzcmFtICV1CgAAAAAAAAAAAAAA
+aHdfdHBfaW5pdDogdGNiIHJlZ2lvbiAoc3RhcnQgMHglMDhzIHNpemUgJXUpIG11c3QgYmUgaW4g
+Zmlyc3QgMjU2TUIgb2YgTUEgbWVtb3J5CgAAAAAAAAAAAAAAAAAAaHdfdHBfaW5pdDogcGdtbmd0
+IHJlZ2lvbiAoc3RhcnQgMHglMDhzIHNpemUgJXUpIG11c3QgYmUgaW4gZmlyc3QgMjU2TUIgb2Yg
+TUEgbWVtb3J5CgAAAAAAAAAAAAAAaHdfdHBfaW5pdDogVFAgcGdtbmd0IGluaXRpYWxpemF0aW9u
+IGRpZCBub3QgY29tcGxldGUKAAAAAAAAAAAAAGJ1Zm1faW5pdDogbiAldSBidWZsbDY0aW50X3Np
+emUgMHgleAoAAAAAAAAAAAAAAGJ1Zm1faW5pdDogbm90IGVub3VnaCBtZW1vcnkgdG8gYWxsb2Nh
+dGUgaW50ZXJuYWwgYnVmbGw2NCBidWZmZXJzCgAAAAAAAAAAAAAAAAAAYnVmbV9pbml0OiBub3Qg
+ZW5vdWdoIG1lbW9yeSB0byBhbGxvY2F0ZSBidWZsbDY0IGJ1ZmZlcnMKAAAAAAAAAG1lbV9pbml0
+X2J1Zjogbm90IGVub3VnaCBtZW1vcnkgdG8gYWxsb2NhdGUgZmxvdyBidWZmZXJzCgAAAAAAAABt
+ZW1faW5pdF9idWY6IG5vdCBlbm91Z2ggbWVtb3J5IHRvIGFsbG9jYXRlIHRjYl9jYWNoZSAob2Zm
+ZXJlZCAldSB0cnlpbmcgdG8gdXNlICV1IGF2YWlsYWJsZSAldSkKAAAAAAAAAAAAAAAAAAAAbXBh
+cnRpdGlvbl9vdGhlcnM6IHN0YXJ0IDB4JTA4eCBzaXplICV1ICh1bnVzZWQgJXUpCgAAAAAAAAAA
+AAAAAG1wYXJ0aXRpb25fb3RoZXJzOiBzdGFydCAweCUwOHggc2l6ZSAldSAodW51c2VkICV1KQoA
+AAAAAAAAAAAAAABtZW1faW5pdDogRURDIG92ZXJjb21taXR0ZWQgYnkgJWQgYnl0ZXMKAAAAAAAA
+AABtZW1faW5pdDogbm90IGVub3VnaCBtZW1vcnkgdG8gYWxsb2NhdGUgZmxvdyB0YWJsZQoAAAAA
+AAAAAAAAAAAAY3hjbmljX2RldmljZV9pbml0OiBjeGNuaWMgWzB4JTB4XSwgY3hjbmljLT5maWx0
+ZXIgWyUweF0KAAAAAAAAAGN4Y25pY19kZXZpY2VfaW5pdDogZGV2LnRwLm51bV90eF9wYWdlcyBb
+JXVdLCBkZXYubWNbMF0uc2l6ZSBbJXVdLCBkZXYudHAudHhfcGFnZV9zeiBbJXVdLCBjeGNuaWMg
+c2l6ZSBbJWRdLCByYyBbJWRdCgAAAAAAAAAAAAAAUG9ydFsldV06IFVua25vd24gU0dNSUkgc3Vi
+LXR5cGUgJSN4CgAAAAAAAAAAAAAAcG9ydF9pbml0WyV1XTogcG9ydCB0eXBlIDB4JXggaXMgbm90
+IHN1cHBvcnRlZAoAbXBhcnRpdGlvbl9pbml0OiBtb3ZlZCBwbXJ4X3N0YXJ0IGZyb20gMHglMDh4
+IHRvIDB4JTA4eCB0byBtYWtlIHJvb20gZm9yIExFIEhBU0ggYW5kL29yIFRQIFRDQnMKAAAAAAAA
+AAAAAAAAAAAAAG1wYXJ0aXRpb25faW5pdDogbW92ZWQgcG1yeF9zdGFydCBmcm9tIDB4JTA4eCB0
+byAweCUwOHggKEVEUkFNKQoAAAAAAAAAAAAAAAAAAAAARVEgcGZuICV1IHZmbiAldTogZGVzdHJv
+eWluZyBlcWlkICV1IHdpdGggcGVuZGluZyBXUihzKSAobnVtX2J5dGVzICV1IGFuZCBmbGFncyAw
+eCUwOHgKAAAAAAAAAAAAbDJkZXZfZmMtPmZsb3djX2lkIFsldV0sIGwyZGMtPnBmbiBbJXVdLCBs
+MmRjLT52Zm4gWyV1XSwgbDJkYy0+bHBvcnQgWyV1XSwgbDJkZXZfZmMtPmZsb3dpZCBbJXVdIGwy
+ZGMtPnR4X2NoIFsldV0sIGRldi52cGQucG9ydHZlYyBbJXhdCgAAAAAAAAAAcG9ydHZlYyBbJXVd
+CgAAAGwyZGV2X3ZpX2ZzbTogbWIgWzB4JXhdLCBkZWZlcnJlZCwgc3RhdGUgWzB4JXhdLCBwb3J0
+IFsweCV4XQoAAABsMmRldl92aV9mc206IHZpaWQgWzB4JXhdIHBvcnQgWzB4JXhdLCBtYWMtaWQg
+WyUwMng6JTAyeDolMDJ4OiUwMng6JTAyeDolMDJ4XS4gCgAAAAAAAAAAAAAAAAAAAABsMmRldl92
+aV9mc206IHNnZV9lcWlkIFsweCV4XSwgc2dlX2lxaWQgWzB4JXhdLCBzZ2VfZXFjciBbMHgleF0s
+IHJzc19zeiBbMHgleF0KAGwyZGV2X3ZpX2ZzbTogbDJkZXZfZmMtPmZsb3djX25ldF9sMmRldl9t
+dHUgWyV1XSwgbWJfc2NyYXRjaCBbMHgleF0sIHBvcnQgWzB4JXhdCgAAAAAAAAAAAAAAAAAAAGwy
+ZGV2X3ZpX2ZzbTogdmlpZCBbJWRdLCB2aV9mYy0+Zmxvd2NfdmlfZmxhZ3MgWzB4JXhdCgAAAAAA
+AAAAAABsMmRldl92aV9mc206IHBmbiBbMHgleF0sIHZmbiBbMHgleF0sIGwyZGV2X2ZjLT5mbG93
+Y19pZCBbMHgleF0sIGxwb3J0IFsweCV4XSwgdmlpZCBbMHgleF0sIGZsYWdzIFsweCV4XQoAAAAA
+AAAAbDJkZXZfdmlfZnNtOiBFcnJvciBmcmVlaW5nIFZJLCByYyBbMHgleF0KAAAAAAAAbDJkZXZf
+dmlfZnNtOiBwaWQgWzB4JXhdLCB2aWlkIFsweCV4XSwgbWJfbG9jIFsweCV4XSwgbWJfb3JpZ1sw
+eCV4XSwgbDJkZXZfZmxhZ3MgWzB4JXhdLCByYyBbMHgleF0KAAAAAAAAAAAAAAAAAEFoIGhhLi4u
+ZG91YmxlIGZyZWUgb3hfaWQgMHgleCwgcnhfaWQgMHgleAoAAAAAAEhvc3QgUFJMSSBSZXNwb25z
+ZSB0aW1lZG91dDogb3hfaWQgMHgleCByeF9pZCAweCV4CgAAAAAAAAAAAAAAAABwZm4gJXUgdmZu
+ICV1IHZpYSBjb21tYW5kCgAAAAAAAGh3X2kyY190cmFuc2FjdGlvbjogbmRhdGEgJXUgYWRkcl9v
+cCAweCV4IGRhdGFbMF0gMHgleCBkaWZmICV1CgBod19pMmNfdHJhbnNhY3Rpb246IG5kYXRhICV1
+IGFkZHJfb3AgMHgleCBkYXRhWzBdIDB4JXggZGlmZiAldSBkcG9zICV1IGNvbnQgJXUgZmFpbGVk
+IHdpdGggZXJyICVkCgAAAAAAAAAAAAAAAAAAaTJjIHRyYW5zYWN0aW9uIGZhaWxlZCB0byBjb21w
+bGV0ZQoAAAAAAAAAAAAAAAAAUExfUENJRV9MSU5LLnNwZWVkIG9mICV1IGlzIG5vdCBzdXBwb3J0
+ZWQKZmlsZSwgcmV0IEZXX0VJTwoAAAAAAHRwX210dXMgaGFzICV1IGVudHJpZXMgb25seSwgcmVx
+dWlyZSAldSBlbnRyaWVzCgAAAAAAAAAAAAAAAAAAAAB0cF9tdHVzWyV1XSBpcyAldSBieXRlcyB3
+aGljaCBpcyBub3Qgc3VwcG9ydGVkCgBjb25maWd1cmF0aW9uIGZpbGUgcGFyc2VyOiBzZ2UgdGlt
+ZXIgdmFsdWVbJWldIGlzIHRvbyBsYXJnZSwgY2hhbmdpbmcgZnJvbSAldSB0byAldXVzZWNzCgAA
+AAAAAABmaWx0ZXJtYXNrIDB4JXggaXMgbm90IGVxdWFsL3N1YnNldCB0by9vZiBmaWx0ZXJtb2Rl
+CgAAAAAAAAAAAAAAaHdfbGVfY2xpcF9oYW5kbGVyOiByZW1vdmVkIHBvcz0ldSAoPWlkeCAldSkK
+AAAAaHdfbGVfY2xpcF9oYW5kbGVyOiBhZGRpbmcgdG8gcG9zPSV1ICg9aWR4ICV1KQoAbW9kdWxl
+WyV1XTogcG9ydCBtb2R1bGUgaW5zZXJ0ZWQgYW5kIHJlYWR5CgAAAAAAbW9kdWxlWyV1XTogcG9y
+dCBtb2R1bGUgcmVtb3ZlZAoAAAAAAAAAAAAAAAAAAAAAbW9kdWxlWyV1XTogdW5rbm93biBtb2R1
+bGUgaWRlbnRpZmllciAweCUwMngKAAAAbW9kdWxlWyV1XTogZ3BpbyAldSB0cmFucyAxMEcgMHgl
+MDJ4IDFHIDB4JTAyeCAobGVuZ3RoICV1KSBjYWJsZSAweCUwMnggKGxlbmd0aCAldSkgbW9kdWxl
+X3R5cGUgMHglMDJ4CgAAAAAAAAAAAGN4NF9jcl9wZG93blsldV06IGVuICV1IHZpX2VuX2NudCAl
+dQoAAAAAAAAAAAAAAGN4NF9jclsldV06IHJldCAlZCBzdGF0dXMgJXUgeGdtX2xzIDB4JTA4eAoA
+AAAAAE1DOiBleHBlY3RlZCBzdGF0ZSB0byBzd2l0Y2ggdG8gQ0ZHLgAAAAAAAAAAAAAAAE1DOiBl
+eHBlY3RlZCBzdGF0ZSB0byBzd2l0Y2ggdG8gQWNjZXNzLgAAAAAAAAAAAE1DOiBleHBlY3RlZCBz
+dGF0ZSB0byBzd2l0Y2ggdG8gQ0ZHLgAAAAAAAAAAAAAAAE1DOiBleHBlY3RlZCBzdGF0ZSB0byBz
+d2l0Y2ggdG8gQWNjZXNzLgAAAAAAAAAAAElJLjEuYnggZHAxOFsldV0gcVsldV0gJSN4ICUjeCAl
+I3ggJSN4IG1pbiAlI3ggbWF4ICUjeAoAAAAAAAAAAABJSS4xLmMtZC4gJSN4ICUjeCAlI3ggJSN4
+IGFsbCAgJSN4CgAAAAAAAAAAAAAAAABJSS4yLmIgKCUjeCAtICUjeCArICUjeCkgJSAxMjggPSAl
+I3gKAAAAAAAAAAAAAABJSS4zIGluZXdfMWUgYWZ0ZXIgbGltaXQgY29tcHV0ZSBpdGVtcF8xZSAl
+eCwgaW5ld18xZSAleAoAAAAAAAAASUkuMy4gaXRlbXBfMWUgJSN4IGluZXdfMWUgJSN4IGluZXdf
+MWUgJWQKAAAAAAAASUkuNC4gc2V0XzFlICUjeAoAAAAAAAAAAAAAAAAAAABNQzogY2FsaWJyYXRp
+b24gZmFpbGVkIGZvciBlcnJhdGEyOSBkcDE4ICV1CgAAAABJVi4xLiBkcDE4WyV1XSBwaGFzZV9z
+ZWwgYmVmb3JlICUjeCBhZnRlciAlI3gsIGdhdGVfZGVsYXkgJSN4CgAATUMgZXJyYXRhMjkgaXNz
+dWU6IGRwMTggJXUgcXVhZCAldSBjYW5ub3QgYmUgZGVjcmVhc2VkCgAAAAAAAAAAAE1DIGVycmF0
+YTI5IGlzc3VlOiBkcDE4ICV1IHF1YWQgJXUgY2Fubm90IGJlIGRlY3JlYXNlZAoAAAAAAAAAAABN
+QyBlcnJhdGEyOSBpc3N1ZTogZHAxOCAldSBxdWFkICV1IGNhbm5vdCBiZSBkZWNyZWFzZWQKAAAA
+AAAAAAAATUMgZXJyYXRhMjkgaXNzdWU6IGRwMTggJXUgcXVhZCAldSBjYW5ub3QgYmUgZGVjcmVh
+c2VkCgAAAAAAAAAAAHRlbXAyXzFlKzB4MTAgPSAlI3gKAAAAAAAAAAAAAAAATUM6IGNhbGlicmF0
+aW9uIGZhaWxlZCBmb3IgZXJyYXRhMjEgaXRlcmF0aW9uICV1CgAAAAAAAAAAAAAAAAAAAE1DIGVy
+cmF0YSAyMTogZHAxOFsldV0gcHIwIG4wMiBmYWlsZWQgdG8gZ2V0IGF2ZXJhZ2UKAAAAAAAAAAAA
+AABNQyBlcnJhdGEgMjE6IGRwMThbJXVdIHByMCBuMTMgZmFpbGVkIHRvIGdldCBhdmVyYWdlCgAA
+AAAAAAAAAAAATUMgZXJyYXRhIDIxOiBkcDE4WyV1XSBwcjEgbjAyIGZhaWxlZCB0byBnZXQgYXZl
+cmFnZQoAAAAAAAAAAAAAAE1DIGVycmF0YSAyMTogZHAxOFsldV0gcHIxIG4xMyBmYWlsZWQgdG8g
+Z2V0IGF2ZXJhZ2UKAAAAAAAAAAAAAABNQyBpbml0aWFsaXphdGlvbiBmYWlsZWQ6IERGSSBpbml0
+IG5vdCBnb2luZyB0byAwCgAAAAAAAAAAAAAAAAAATUMgaW5pdGlhbGl6YXRpb24gZmFpbGVkOiBE
+RkkgaW5pdCBub3QgY29tcGxldGluZwoAAAAAAAAAAAAAAAAAAE1DIGluaXRpYWxpemF0aW9uIGZh
+aWxlZDogQ2FsaWJyYXRpb24gZGlkbid0IGNvbXBsZXRlLgoAAAAAAAAAAABEUDE4ICV1LCBieXRl
+X2xhbmUgJXUsIGJpdF9zZWxlY3QgJXUKAAAAAAAAAAAAAABEUDE4ICV1LCBieXRlX2xhbmUgJXUs
+IGJpdF9zZWxlY3QgJXUKAAAAAAAAAAAAAABNQyBmYWlsZWQgdG8gZ2V0IFVQQ1RMIHBvd2VyIHVw
+IGRvbmUKAAAAAAAAAAAAAABNQyBpbml0aWFsaXphdGlvbiBmYWlsZWQ6IERpZG4ndCBnZXQgYWxs
+IERQMThzIGxvY2tlZAoAAAAAAAAAAAAATUMgaW5pdGlhbGl6YXRpb24gZmFpbGVkOiBEaWRuJ3Qg
+Z2V0IGJvdGggQURScyBsb2NrZWQKAAAAAAAAAAAAAEN1cnJlbnQgU2xldyB0eF9yb3cgJWQ6IHR4
+X2NvbCAlZCwgdmFsICVkCgAAAAAAAEN1cnJlbnQgU2xldyBhZGRyX3JvdyAlZDogYWRkcl9jb2wg
+JWQsIHZhbCAlZAoAAE1DIGluaXRpYWxpemF0aW9uIGZhaWxlZDogU0xFV19ET05FX1NUQVRVUyBu
+ZXZlciB0b2dnbGVkAAAAAAAAAABmbHJfcGZ2Zl9mc21bJXU6JXVdOiB1bmtub3duIHN0YXRlICV1
+CgAAAAAAAAAAAABodyBwZiBiaXRtYXAgMHglMDJ4IHZmaWQgYml0bWFwIDB4JTA4eDoweCUwOHg6
+MHglMDh4OjB4JTA4eAoAAAAAYWZ0ZXIgdmZpZCBmaXh1cCwgdmZpZCBiaXRtYXAgMHglMDh4OjB4
+JTA4eDoweCUwOHg6MHglMDh4CgAAAAAAAE1DWyV1XTogZmFpbGVkIHRvIHN3aXRjaCBjb250cm9s
+bGVyIHRvIENGRyBzdGF0ZQoAAAAAAAAAAAAAAAAAAABNQ1sldV06IGZhaWxlZCB0byBzd2l0Y2gg
+Y29udHJvbGxlciB0byBJTklUX01FTSBzdGF0ZQoAAAAAAAAAAAAATUNbJXVdOiBmYWlsZWQgdG8g
+c3dpdGNoIGNvbnRyb2xsZXIgdG8gQ0ZHIHN0YXRlCgAAAAAAAAAAAAAAAAAAAE1DWyV1XTogcGVy
+aW9kaWMgY2FsaWJyYXRpb24gZmFpbGVkIHdpdGggZXJyb3IgJXUKAAAAAAAAAAAAAAAAAAB0aW1l
+ciBxdWV1ZSAldSBsb3N0IGEgdGljayEgbmV4dCAlcCBsYXN0ICVwIG51bWUgJXUKAAAAAAAAAAAA
+AAAAZmxyX3RpbWVyX3N0YXJ0OiBmbG93Y19pZCAldSAlcCBidWYgJXAKAAAAAAAAAAAATUFDOiBQ
+TExzIGRpZG4ndCBsb2NrCgAAAAAAAAAAAABwY2llOiByZWFkIGZyb20gc2VyY2ZnIHBjaWVfaXBf
+dXJfbWF4ZnVuYyAweCV4IHBmYml0bWFwIDB4JXgKAAAAcGNpZTogbnBmICV1IChwZmJpdG1hcCAw
+eCUwMngpIG52ZiAldSAocGYgMC4uMyAweCUwMnggMHglMDJ4IDB4JTAyeCAweCUwMngpCgAAAABm
+YWlsZWQgdG8gZmluZCB0aGUgJWMlYyBWUEQgcGFyYW1ldGVyCgAAAAAAAAAAAABmYWlsZWQgdG8g
+cGFyc2UgdGhlICVjJWMgVlBEIHBhcmFtZXRlcgoAAAAAAAAAAABmYWlsZWQgdG8gc3VjY2Vzc2Z1
+bGx5IGZpbmQgQ2hlbHNpbyBWUEQKAAAAAAAAAABsb2cgaW5pdGlhbGl6ZWQgQCAweCUwOHggc2l6
+ZSAldSAoJXUgZW50cmllcykKAABib290c3RyYXAgZmlybXdhcmUgdG9vayAldSBtc2VjcyB0byBy
+dW4KAAAAAAAAAABmbG93YyAldSAoU0dFIGVxaWQgJXUpIChFVEhDVFJMIHF1ZXVlKSBleHBlcmll
+bmNlZCBhIFBDSSBETUEgUkVBRCB3b3JrIHJlcXVlc3QgZXJyb3IgKGluYm91bmQgcXVldWUgJXUp
+CgAAAAAAAAAAZmxvd2MgJXUgKFNHRSBlcWlkICV1KSBleHBlcmllbmNlZCBhbiB1bmV4cGVjdGVk
+IFBDSSBETUEgUkVBRCB3b3JrIHJlcXVlc3QgZXJyb3IgKGluYm91bmQgcXVldWUgJXUpCgAAAAAA
+AAAAAAAAAGZsb3djICV1IGV4cGVyaWVuY2VkIGFuIHVuZXhwZWN0ZWQgUENJIERNQSBSRUFEIGVy
+cm9yIChpbmJvdW5kIHF1ZXVlICV1KQoAAAAAAAAAZHJvcF9hbGxfdGFzazogcmVxdWVzdGVkIGxp
+ZHggWyV1XQoAAAAAAAAAAAAAAAAAZ2V0X3JlZl90YXNrOiBpc3Rhc2stPmZsb3djX2lkIFsweCV4
+XSwgaXN0YXNrX2ZjLT5mbG93Y19zdGF0ZSBbJXVdLCBhYnJ0X2xpZHggWzB4JXhdLCBsaWR4IFsw
+eCV4XQoAAAAAAAAAAAAAAAAAAHNlbmRfYWJvcnRfcmVxOiBjc2tfZmMtPmZsb3djX3R5cGUgWzB4
+JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgdGlkIFsweCV4XSwgdWxwdHhjaCBbJXVdLCBi
+dWZmZXJlZCBbJXVdCgAAAABodyByZWdpc3RlciBvcGVyYXRpb24gbm90IGNvbXBsZXRpbmcsIHJl
+ZyAweCUwOHggbWFzayAweCUwOHggdmFsdWUgMHglMDh4IChyZWcgMHglMDh4KQoAAAAAAAAAAABN
+RElPIENMNDU6IGZhaWxlZCB0byBzZXQgdXAgTU1EIGFkZHIKAAAAAAAAAAAAAABNRElPOiBmYWls
+ZWQgdG8gd3JpdGUKAAAAAAAAAAAAAE1ESU8gQ0w0NTogZmFpbGVkIHRvIHNldCB1cCBNTUQgYWRk
+cgoAAAAAAAAAAAAAAE1ESU86IGZhaWxlZCB0byByZWFkCgAAAAAAAAAAAAAAcnhjZmdfdnBkIHBv
+cnQgJXUgbGFuZSAldSBwdHlwZSAldSA9PiBpZHg9ICV1ID0+IHJ4Y2ZnID0gJSN4CgAAAG1paV9h
+ZHZfZmNbJXVdOiByY2FwcyAweCV4CgAAAAAAbWlpX2Fkdl9zcGVlZFsldV06IHJjYXBzIDB4JXgK
+AABzZW5kX2Nsb3NlX3JlcTogY3NrX2ZjLT5mbG93Y190eXBlIFsweCV4XSwgY3NrX2ZjLT5mbG93
+Y19pZCBbMHgleF0sIGNza19mYy0+dGNiX3N0YXRlIFsweCV4XQoAAABzZW5kX2Nsb3NlX3JlcTog
+Y3NrX2ZjLT5mbG93Y190eXBlIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIHRpZCBb
+MHgleF0sIHVscHR4Y2ggWyV1XSxidWZmZXJlZCBbJXVdCgAAAAAAb2ZsZF90Y3BfZG9fYWN0aXZl
+X2Nsb3NlOiBjc2tfZmMgWzB4JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT50
+Y2Jfc3RhdGUgWzB4JXhdCgAAAAAAb2ZsZF90Y3BfZG9fYWN0aXZlX2Nsb3NlOiBjc2tfZmMgWzB4
+JXhdLCBjc2tfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT50Y2Jfc3RhdGUgWzB4JXhdCgAA
+AAAAb2ZsZF90Y3BfZGlzY29ubmVjdDogdGNiX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+
+Zmxvd2NfaWQgWzB4JXhdLCBjc2stPnRjYl9zdGF0ZSBbMHgleF0KAAAAZGVjb2RlX2Jhc2U2NF9z
+dHJpbmc6IGRsZW4gWyVkXQoAAAAAAAAAAAAAAAAAAAAAZGVjb2RlX2hleF9zdHJpbmc6IGRsZW4g
+WyVkXQoAAABsb2dnZWRfaW46IGZsb3djX2ZvaXNjc2lfY29ubl9mbGFncyBbMHgleF0KAAAAAABs
+b2dnZWRfaW46IHNlc3Mgc3RhdGUgWzB4JXhdLCBjbWRzbiBbMHgleF0sIGV4cGNtZHNuIFsweCV4
+XSwgbWF4Y21kc24gWzB4JXhdLCBpdHQgWzB4JXhdLCB0eXBlIFsweCV4XQoAAAAAAAAAAAAAZm9p
+c2NzaV92YWxpZGF0ZV9sb2dpbl9zdGFnZTogLSAxCgAAAAAAAAAAAAAAAAAAYXN5bmNfcGR1OiBs
+b2dvdXQgcmVxdWVzdGVkIGJsb2NraW5nIHNlc3Npb24KAAAAYXN5bmNfcGR1OiBzZXNzL2Nvbm4g
+ZHJvcCByZXF1ZXN0ZWQgYmxvY2tpbmcgc2Vzc2lvbgoAAAAAAAAAAAAAAHRleHRfcmVzcDogY19i
+aXQgWzB4JXhdLCBmX2JpdCBbMHgleF0KAAAAAAAAAAAAAGNwbF90eF9wa3Q6IGludGYgWzB4JXhd
+CgAAAAAAAAAAY3BsX3R4X3BrdDogdmxhbmlkIFsweCV4XQoAAAAAAABuZXRfbDJkZXZfZmluZF9i
+eV9hZGRyOiBsMmRldl9mYy0+Zmxvd2NfaWQgWzB4JXhdLCBsMmRjLT5scG9ydCBbJXVdLCBsMmRf
+ZmMtPmZsb3djX2lkIFsweCV4XSwgbDJkYy0+aW40X2Rldi5pbl9hZGRyLmFkZHIgWzB4JXhdLCBh
+ZGRyIFsweCV4XQoAAABuZXRfbDJkZXZfbXR1X2NvbmZpZzogbDJkZXZfZmMtPmZsb3djX2lkIFsw
+eCV4XSwgbXR1ICV1CgAAAAAAAAAAbmV0aWZfZG9fZGhjcDogd3ItPnBhcmFtLnZsYW5pZCBbJXVd
+LCBsMmRldl9mYy0+Zmxvd2NfbmV0X2wyZGV2X3ZsYW5kZXYgWzB4JXhdCgBjcGxfdHhfcGt0OiBp
+bnRmIFsweCV4XQoAAAAAAAAAAGNwbF90eF9wa3Q6IHZsYW5pZCBbMHgleF0KAAAAAAAAZW5jb2Rl
+IGhleCBzdHJpbmc6IGRsZW4gWyVkXQoAAAB0Y3Bfc2VuZF9hb3Blbl9yZXE6IGNza19mYy0+Zmxv
+d2NfaWQgWzB4JXhdLCBjc2tfZmMtPmZsb3djX3N0YXRlIFsweCV4XSwgYnVmZmVyZWQgWyV1XSwg
+cmVzX2NudCBbMHgleF0sIGlxX2lkeCBbMHgleF0KAAAAAAAAAAAAAGFvcGVuX3JlcTogaHdfbGVf
+ZmlsdGVyX2N0dXBsZSBmYWlsZWQKAAAAAAAAAAAAAG9mbGRfdGNwX3NlbmRfYW9wZW5fcmVxOiBj
+cGxfcmVxLT5GaWx0ZXIgWzB4JTB4XSwgY3R1cGxlc1swXSBbMHgleF0sIGN0dXBsZXNbMV0gWzB4
+JXhdCgAAAAAAAAAAAGNzb2NrX2FsbG9jOiB0eF9jaCBbMHgleF0sIGxwb3J0IFsweCV4XSwgY29v
+a2llIFslMDh4XQoAAAAAAAAAAABjc29ja19hbGxvYzogYXZhaWxhYmxlIFsldV0sIG5jc29jayBb
+JXVdLCBwb3M6YXRpZCBbMHgleF0sIGNza19mYyBbMHgleF0sIGNza19mYy0+Zmxvd2NfaWQgWzB4
+JXhdLCBzcG9ydCBbJXVdCgAAZm9pc2NzaV9wZWVyX2luaXQ6IGNvbm5fYXR0ci0+aGRpZ2VzdF90
+b19kZHBfcGdzeiBbMHgleF0KAAAAAAAAAGZvaXNjc2lfcGVlcl9pbml0OiBQcmUtaW5pdCBjb25u
+X2ZjLT5mbG93Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4JXhdCgAAAAAAAAAAAAAAZm9pc2NzaV9w
+ZWVyX2luaXQ6IFBvc3QtaW5pdCBjb25uX2ZjLT5mbG93Y19mb2lzY3NpX2Nvbm5fZmxhZ3MgWzB4
+JXhdCgAAAAAAAAAAAABXQVRDSERPRzogTm8gdGVtcGVyYXR1cmUgc2Vuc29yIGF2YWlsYWJsZS4K
+AAAAAABXQVRDSERPRzogQWN0aXZhdGluZwoAAAAAAAAAAAAAAFdBVENIRE9HIC0gRW5hYmxlIGFj
+dGlvbiAldSB0aW1lICV1CgAAAAAAAAAAAAAAAFdBVENIRE9HIC0gRGlzYWJsZSBhY3Rpb24gJXUK
+AAAAV0FUQ0hET0c6IERlLWFjdGl2YXRpbmcKAAAAAAAAAABzZXNzaW9uX2xpbmtfbm90aWZ5OiBw
+b3J0IFsweCV4XSBsaW5rIGRvd24gcGluZyByZWNvdmVyeSBkaXNhYmxlZCwgdHJ5aW5nIHRvIHJl
+Y292ZXIgc2Vzc2lvbiBbMHgleF0gY29ubiBbMHgleF0KAAAAAAAAAAAAAAAAAAAAAHNlc3Npb25f
+bGlua19ub3RpZnk6IHBvcnQgWzB4JXhdIGxpbmsgdXAgc2Vzc2lvbiBbMHgleF0gY29ubiBbMHgl
+eF0KAAAAAAAAAAAAAAAAZm9pc2NzaSBjb25uX2ZjIFsweCV4XSwgZmxvd2Nfc2NoZWRjbCBbMHgl
+eF0sIGluZ19jaCBbMHgleF0sIGVncl9jaCBbMHgleF0KAAAAAABsMmRldl9ub3RpZnkgd2l0aCB1
+bmtub3duIGZsYWcgWzB4JXhdCgAAAAAAAAAAAABGQ29FIEZDQiBsaW5rZG93bjogaW9fcmVxIDB4
+JXgleCBpcWlkIDB4JXggZmxvd2lkIDB4JXggb3AgMHgleAoAZmNvZSBub3RpZnkgOiBVcGRhdGUg
+bmV3IERDQlggdmFsdWVzIFZJIHN0YXRlIDB4JXggcHJpIDB4JXggc2NoZWRjbCAweCV4IGRjYnhf
+ZG9uZSAweCV4CgAAAAAAAAAAZmNvZSBub3RpZnkgOiBGQ0YgZmxvd2lkIDB4JXgsIHVscGNoIDB4
+JXggCgAAAAAAbmV0X2wyZGV2X25vdGlmeTogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwgcG9y
+dCBbJWRdLCBldmVudCBbMHgleF0sIHVscHR4Y2ggWyV1XSwgY2xhc3MgWzB4JXhdLCB2cHJpbyBb
+MHgleF0sIHZpZCBbMHgleF0sIHZpX3JlYWR5IFsldV0KAAAAAAAAbmV0X2wyZGV2X25vdGlmeTog
+cGdpZCBbMHgleF0sIHByaW8gWzB4JXhdLCBjaCBbMHgleF0KAAAAAAAAAAAAAGZjb2Ugbm90aWZ5
+IDogRENCWCA6IHBvcnQgMHgleCwgcHJpb3JpdHkgMHgleCB1bHB0eGNoIDB4JXggY2xhc3MgMHgl
+eAoAAAAAAAAAAAAAY2hfY2xfcmF0ZVsldS8ldV06IGNhcHBlZCBkZWZpY2l0X2luY3IgZnJvbSBy
+ZXF1aXJlZCAldSB0byAldTsgcmF0ZSAldSAoZWZmICV1KSBkZWZpY2l0X21heCAldQoARkNvRSBG
+Q0YgdGltZXI6IGZsb3djIHN0YXRlIDB4JXgsIHBvcnQgMHgleCAsZmNmIDB4JXgsIGZsb3djX2lk
+IDB4JXgKAAAAAAAAAAAAAAByaV93cl9pbml0WyV1XTogbXNzICV1IGlzIG5vdCA4LWJ5dGUgYWxp
+Z25lZAoAAABjb3JlX3Byb2dyYW1fdGNiOiB0aWQgJSN4IHRfc3RhdGUgJSN4IHJjdl9hZHYgMHgl
+MDh4IHJjdl9zY2FsZSAlI3ggdHhfbWF4ICUjeCByY3Zfbnh0ICUjeCBhdGlkICUjeAoAAAAAAAAA
+AAAAAAAACW9wdDAgJSN4JXggb3B0MiAlI3ggaXB2NiAlI3ggZmxhZ3NfdGltZXIgMHglMDh4CgAA
+AAAAAAAAAAAAAAAAAG9mbGRfY29ubmVjdGlvbl93cjogY29ubmVjdGlvbiB3aXRoIDUtdHVwbGUg
+bHAgMHglMDR4IGZwIDB4JTA0eCBsaXAgMHglMDh4JTA4eCBwaXAgMHglMDh4JTA4eCBmaWx0ZXIg
+MHglMDh4IGV4aXN0cyBAIExFIGluZGV4ICV1CgAAAAAAAAAAAAAAAAAAAG9mbGRfY29ubmVjdGlv
+bl93cjogY29ubmVjdGlvbiB3aXRoIDUtdHVwbGUgbHAgMHglMDR4IGZwIDB4JTA0eCBsaXAgMHgl
+MDh4IHBpcCAweCUwOHggZmlsdGVyIDB4JTA4eCBleGlzdHMgQCBMRSBpbmRleCAldQoAAAAAAAAA
+b2ZsZF9jb25uZWN0aW9uX3dyOiBjb25uZWN0aW9uIHdpdGggNS10dXBsZSBscCAweCUwNHggZnAg
+MHglMDR4IGxpcCAweCUwOHglMDh4IHBpcCAweCUwOHglMDh4IGZpbHRlciAweCUwOHgKAAAAAG9m
+bGRfY29ubmVjdGlvbl93cjogY29ubmVjdGlvbiB3aXRoIDUtdHVwbGUgbHAgMHglMDR4IGZwIDB4
+JTA0eCBsaXAgMHglMDh4IHBpcCAweCUwOHggZmlsdGVyIDB4JTA4eAoAAAAAAAAAAAAAAABJUUZM
+SU5UIHBmbiAldSB2Zm4gJXU6IGlxZXNpemUgJXUgdG9vIHNtYWxsCgAAAABJUUZMSU5UIHBmbiAl
+dSB2Zm4gJXU6IGlxaWQgJXUgdG9vIGxhcmdlIChtYXggJXUpCgAAAAAAAAAAAAAAAAAASVFGTElO
+VCBwZm4gJXUgdmZuICV1OiBpcWlkICV1IG5vdCBhbGxvY2F0ZWQKAAAASVFGTElOVCBwZm4gJXUg
+dmZuICV1OiBmbDBpZCAldSB0b28gbGFyZ2UgKG1heCAldSkKAAAAAAAAAAAAAAAAAElRRkxJTlQg
+cGZuICV1IHZmbiAldTogZmwwaWQgJXUgbm90IGFsbG9jYXRlZAoAAElRRkxJTlQgcGZuICV1IHZm
+biAldTogZmwxaWQgJXUgdG9vIGxhcmdlIChtYXggJXUpCgAAAAAAAAAAAAAAAABJUUZMSU5UIHBm
+biAldSB2Zm4gJXU6IGZsMWlkICV1IG5vdCBhbGxvY2F0ZWQKAABJUUZMSU5UIHBmbiAldSB2Zm4g
+JXU6IGZsMWlkICV1IGlzIHZhbGlkIGJ1dCBub3QgZmwwaWQgJXUKAAAAAAAASVFGTElOVCBwZm4g
+JXUgdmZuICV1OiBmbDFpZCAldSBpcyB2YWxpZCBidXQgaGVhZGVyIHNwbGl0IGZlYXR1cmUgaXMg
+bm90IGVuYWJsZWQKAAAAAAAAAAAAAAAAAAAASVEgcGZuICV1IHZmbiAldTogaXFpZCAldSB0b28g
+bGFyZ2UgKG1heCAldSkKAAAASVEgcGZuICV1IHZmbiAldTogaXFpZCAldSBub3QgYWxsb2NhdGVk
+CgAAAAAAAAAASVEgcGZuICV1IHZmbiAldTogZmwwaWQgJXUgZmwxaWQgJXUgYnV0IG5vdCBzdXBw
+b3J0ZWQKAAAAAAAAAAAAAGh3X3VscHR4X3dvcmthcm91bmRfcHIxNjk0OV9lbmFibGVkX3BmOiBw
+ZiAldSBlbmFibGVkICV1CgAAAAAAAABod191bHB0eF93b3JrYXJvdW5kX3ByMTY5NDlfZW5hYmxl
+ZF92ZmlkOiB2ZmlkICV1IGVuYWJsZWQgJXUKAAAARVEgcGZuICV1IHZmbiAldTogY3JlYXRpbmcg
+RVRIIGVxaWQgJXUgd2l0aCBwZW5kaW5nIFdSKHMpIChudW1fYnl0ZXMgJXUgYW5kIGZsYWdzIDB4
+JTA4eAoAAAAAAAAARVEgcGZuICV1IHZmbiAldTogY3JlYXRpbmcgQ1RSTCBlcWlkICV1IHdpdGgg
+cGVuZGluZyBXUihzKSAobnVtX2J5dGVzICV1IGFuZCBmbGFncyAweCUwOHgKAAAAAAAARVEgcGZu
+ICV1IHZmbiAldTogZXFpZCAldSB0b28gbGFyZ2UgKG1heCAldSkKAAAARVEgcGZuICV1IHZmbiAl
+dTogZXFpZCAldSBub3QgYWxsb2NhdGVkCgAAAAAAAAAAcG9ydF9ibGlua19sZWRfcmVzdG9yZQoA
+AAAAAAAAAABwb3J0X2JsaW5rOiBibGlua2R1cj0weCV4IGJsaW5rX3JlZmNudAoAAAAAAAAAAABw
+b3J0X2JsaW5rOiAJYmxpbmtfcmVmY250PTB4JXgKAHBvcnRfYmxpbms6IAlibGlua19yZWZjbnQ9
+MHgleAoAbWlpX2FucmVzdGFydFsldV06IGFjYXBzIDB4JXgKAABwb3J0WyV1OjB4JTAyeDoweCUw
+MnhdOiBsMWNmZywgcGNhcHMgMHgleCBhY2FwcyAweCV4IHJjYXBzIDB4JXgKAAAAAAAAAAAAAAAA
+AAAAAHBvcnRbJXU6MHglMDJ4OjB4JTAyeF06IGwxY2ZnLCBpbnZhbGlkIHJlcXVlc3QsIHBjYXBz
+IDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4CgAAAAAAAAAAAAAAAAAAAHBvcnRbJXU6MHglMDJ4
+OjB4JTAyeF06IGwxY2ZnLCBtZGkgbi9hIHBjYXBzIDB4JXggYWNhcHMgMHgleCByY2FwcyAweCV4
+CgAAAAAAAAAAcG9ydFsldToweCUwMng6MHglMDJ4XTogbDFjZmcsIGNhbm5vdCBmb3JjZSBuby9t
+dWx0aXBsZSBzcGVlZChzKSwgcGNhcHMgMHgleCBhY2FwcyAweCV4IHJjYXBzIDB4JXgKAAAAAAAA
+AAAAAAAAAHNjc2lfY21kOiBjb21tYW5kIHJlY2lldmVkIG9uIGludmFsaWQgY29ubiB0eXBlIFsw
+eCV4XS4KAAAAAAAAAABzY3NpX2NtZDogYnVmZmVyZWQgWzB4JXhdLCBjb25uIHN0YXRlIFsweCV4
+XQoAAABzY3NpX2NtZDogaVNDU0kgY29tbWFuZCBzZXF1ZW5jZSB3aW5kb3cgY2xvc2VkLiBjb25u
+IFsweCV4XSwgb3AgWzB4JXhdLCAgY21kc24gWzB4JXhdLCBzZW50X2NtZHNuIFsweCV4XSwgbWF4
+X2NtZHNuIFsweCV4XSwgaXR0IFsweCV4XQoAAAAAAAAAAABzY3NpX3JlYWQ6IGNvbW1hbmQgcmVj
+aWV2ZWQgb24gaW52YWxpZCBjb25uIHR5cGUgWzB4JXhdLgoAAAAAAAAAc2NzaV9yZWFkOiBidWZm
+ZXJlZCBbMHgleF0sIGNvbm4gc3RhdGUgWzB4JXhdCgAAc2NzaV9yZWFkOiBpU0NTSSBjb21tYW5k
+IHNlcXVlbmNlIHdpbmRvdyBjbG9zZWQuIGNvbm4gWzB4JXhdLCBjbWRzbiBbMHgleF0sIHNlbnRf
+Y21kc24gWzB4JXhdLCBtYXhfY21kc24gWzB4JXhdCgAAAAAAAAAAAAAAAAAAAABzY3NpX3dyaXRl
+OiBjb21tYW5kIHJlY2lldmVkIG9uIGludmFsaWQgY29ubiB0eXBlIFsweCV4XS4KAAAAAAAAc2Nz
+aV93cml0ZTogYnVmZmVyZWQgWzB4JXhdLCBjb25uIHN0YXRlIFsweCV4XQoAc2NzaV93cml0ZTog
+aVNDU0kgY29tbWFuZCBzZXF1ZW5jZSB3aW5kb3cgY2xvc2VkLiBjb25uIFsweCV4XSwgY21kc24g
+WzB4JXhdLCBzZW50X2NtZHNuIFsweCV4XSwgbWF4X2NtZHNuIFsweCV4XSwgaXR0IFsweCV4XQoA
+AABjaG5ldF9sMnRfdXBkYXRlOiBsMmRldl9mYyBbMHgleF0sIGwyZGV2X2ZjLT5mbG93Y19pZCBb
+JXVdIGwyZGV2X2ZjLT5mbG93Y19mbGFncyBbMHgleF0sIGludGYgWzB4JXhdCgAAAAAAAAAAAAAA
+Y2huZXRfbDJ0X3VwZGF0ZTogbDJkZXZfZmMtPmZsb3djX2lkIFsldV0gYWxyZWFkeSBzY2hlZHVs
+ZWQKAAAAAGNobmV0X2wydF91cGRhdGU6IGluIGRlbGF5ZWRfcHJvY2Vzc2luZywgbDJ0ZW50IFsl
+MDh4XQoAAAAAAAAAAABwcm9jZXNzX2RoY3Bfb3B0czogcm9vdCBwYXRoIGxlbiBbJWRdIGJ5dGVz
+CgAAAABuZXRpZl9wcm9jZXNzX2RoY3Bfb3B0czogbDJkZXZfZmMtPmZsb3djX2lkIFsweCV4XSwg
+TVNHX1RZUEUgWyVkXSwgZGhjdHh0LT5zdGF0ZSBbJWRdCgAAAAAAAAAAAABpY21wX3JlY3Y6IGwy
+ZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIHBpZCBbMHgleF0sIGljbXAgdHlwZSBbMHgleF0KAAAA
+AAAAAAAAAAAAAGZjX3NlbmRfYWxsb2NfY3BsOiBmYWlsZWQgdG8gc2V0dXAgZmlsdGVyIGN0dXBs
+ZQoAAAAAAAAAAAAAAAAAAABmY29lX2NvbXB1dGVfY3R1cGxlIHZsYW4gJXggdmlpZCAleCBwb3J0
+ICV4IG1wc19pZHggJXgKAAAAAAAAAAAAZmNvZV9jb21wdXRlX2N0dXBsZSAweCV4OiV4CgAAAABp
+Z25vcmluZyBmaXAgcmVjdiBmb3IgcGNiIGZsb3c6JXggaW4gb2ZmbGluZSBzdGF0ZQoAAAAAAAAA
+AAAAAAAAQUJUUyBBQ0MgYXdhaXRpbmcgUFJMSSBSc3A6IGZsb3djX2lkIDB4JXggb3hfaWQgMHgl
+eCByeF9pZCAweCV4IGlxaWQgMHgleAoAAAAAAABhcnBfcmVjdjogaXBpZCBbMHgleF0sIGluX2Fk
+ZHIuYWRkciBbMHgleF0sIHNpcCBbMHgleF0sIHJpcCBbMHgleF0sIGFycF9vcCBbMHgleF0KAAAA
+AAAAAAAAAAAAAABjaG5ldF9hcnBfcmVjdjogaXAgY29uZmxpY3QgZGV0ZWN0ZWQKAAAAAAAAAAAA
+AABjaG5ldF9hcnBfcmVjdjogcGlkIFsldV0sIHZsYW4gWzB4JXhdLCBhcnAgb3AgWzB4JXhdLCBz
+aXAgWzB4JXhdLCByaXAgWzB4JXhdCgAAAGNzb2NrX3BlZXJfY2xvc2U6IGNza19mYy0+Zmxvd2Nf
+aWQgWzB4JXhdLCB0Y2JfZmMtPmZsb3djX2lkIFsweCV4XSwgY3NrX2ZjLT5mbG93Y19zdGF0ZSBb
+MHgleF0sIHRjYl9mYy0+Zmxvd2Nfc3RhdGUgWzB4JXhdCgAAAAAAY3NvY2tfcGVlcl9jbG9zZTog
+Y3NrX2ZjLT5mbG93Y19pZCBbMHgleF0sIGNza19mYy0+Zmxvd2Nfc3RhdGUgIFsweCV4XQoAAAAA
+AAAAAAB0Y3BfY2xzX2FicnRfcnBsOiB0Y2IgdGlkIFsweCUwNnhdLCBmbG93Y190eXBlIFsweCV4
+XSwgY3Bsb3AgWzB4JXhdIAoAAAAAAAAAAAAAAGNoX3JhdGVbJXVdOiBjYXBwZWQgdGljayBmcm9t
+IHJlcXVpcmVkICV1IHRvIHN1cHBvcnRlZCAldTsgcmF0ZSAldSAoZWZmICV1KSBkZWZpY2l0X2lu
+Y3IgJXUgdGljayAldQoAAAAAAAAAAAAAAABwa3RzY2hlZF9jaF9ybFsldV06IGNoYW5uZWwgcmwg
+bm90IGF2YWlsYWJsZSBpbiBjb25qdW5jdGlvbiB3aXRoIGZsb3cgc2hhcGluZwoAAHBrdHNjaGVk
+X2NoX3JsWyV1XTogcmF0ZSAldSBtYXggJXUKAAAAAAAAAAAAAAAAAHBrdHNjaGVkX2NsX3dyclsl
+dToldV06IHdlaWdodCAldSB3ZWlnaHRlZF9tYXNrIDB4JXgKAAAAAAAAAAAAAABlcV9wYXJhbXNb
+MHgleDoweCV4XTogZG1hcSAweCV4IHJlYWQgJXUgcGYgJXUgZXFpZF9hcGkgJXUgcmV0ICVkCgAA
+AAAAAAAAAAAAAAAAAE1DIENMSyBzZXR0aW5nIGZhaWxlZDogUExMX01fTE9DSyBuZXZlciB0b2dn
+bGVkCgAAAAAAAAAAAAAAAAAAAAB3YWl0X2Zvcl9jYWxpYl9kb25lOiByZXQgJWQgaW4gJXUgYXR0
+ZW1wdHMKAAAAAABtZW1fbWFsbG9jOiBmYWlsZWQgdG8gYWxsb2NhdGUgJXUgYnl0ZXMsIHJldHVy
+bmluZyBOVUxMCgAAAAAAAAAAbGUgY29uZmlndXJhdGlvbjogaGFzaCBtb2RlIHJlcXVpcmVzIGF0
+IGxlYXN0IDE2IGVudHJpZXMsIG5oYXNoICV1CgAAAAAAAAAAAAAAAABsZSBjb25maWd1cmF0aW9u
+OiBoYXNoIG1vZGUgcmVxdWlyZXMgYXQgZW50cmllcyB0byBiZSBhIHBvd2VyIG9mIDIsIG5oYXNo
+ICV1CgAAAGxlIGNvbmZpZ3VyYXRpb246IHJlcXVlc3RlZCAldSB0Y2FtIGVudHJpZXMgYnV0IG9u
+bHkgJXUgYXZhaWxhYmxlIChucm91dGUgJXUgbmNsaXAgJXUgbmZpbHRlciAldSBuc2VydmVyICV1
+CgAAAABsZSBjb25maWd1cmF0aW9uOiB0Y2FtIHJlZ2lvbnMgbXVzdCBoYXZlIG11bHRpcGxlIG9m
+IDMyIGVudHJpZXMsIG5yb3V0ZSAldSBuY2xpcCAldSBuZmlsdGVyICV1IG5zZXJ2ZXIgJXUKAAAA
+AAAAb2ZsZCB0cCB0aW1lciBzZXR0aW5ncyBUUF9NU0wgMHglMDh4IFRQX1JYVF9NSU4gMHglMDh4
+IFRQX1JYVF9NQVggMHglMDh4IFRQX1BFUlNfTUlOIDB4JTA4eCBUUF9QRVJTX01BWCAweCUwOHgK
+ACAgICAgICAgICAgICAgICAgICAgICAgVFBfS0VFUF9JRExFIDB4JTA4eCBUUF9LRUVQX0lOVFZM
+IDB4JTA4eCBUUF9JTklUX1NSVFQuaW5pdF9zcnR0X21heHJ0dCAweCUwNHggVFBfSU5JVF9TUlRU
+LmluaXRfc3J0dF9pbml0c3J0dCAweCUwNHggVFBfRklOV0FJVDJfVElNRVIgMHglMDh4CgAAAAAA
+AAAAAAAAY29uZmlndXJhdGlvbiBmaWxlIHBhcnNlciBlbmNvdW50ZXJlZCBlcnJvciBAIGxpbmUg
+JXU6CgAAAAAAAAAAAEhPU1QgUEFHRV9TSVpFIFsweCUwbHhdIHRvbyBzbWFsbCwgbWluIFsweCUw
+bHhdIHJlcXVpcmVkCgAAAAAAAABwYWdlIHNpemUgWyVsdV0gbWlzbWF0Y2gKAAAAAAAAAFBBR0Ug
+c2l6ZSAlbHUgdW5zdXBwb3J0ZWQsIGRkcCBkaXNhYmxlZAoAAAAAAAAAAEhvc3QgcGFnZV9zaXpl
+ICVsdSwgZGRwX2lkeCAldQoARkNvRSBERFAgaW5pdDogZmNvZSBsbGltaXQgMHgleCwgZmNvZSB1
+bGltaXQgMHgleCBnYmwgbGxpbWl0IDB4JXggZ2JsIHVsaW1pdCAweCV4IHBjYnN6ICV4CgAAAAAA
+RkNvRSBERFAgaW5pdDogZmNvZSBwcG9kIG9mZiAweCV4LCBmY29lIHN0IHBwb2QgYWRkciAweCV4
+IGZjb2UgbnVtIHBwb2RzIDB4JXgKAABmY29lIHhjaGcgbWdyIGluaXQ6IE51bWJlciBvZiBleGNo
+YW5nZXMgZm9yIEZDb0UgaXMgJXgKAAAAAAAAAAAAUVNGUCBtb2R1bGUgdW5wbHVnIC0gcmVpbml0
+aWFsaXppbmcgcnhfbG9zICB0byAweGZmCgAAAAAAAAAAAAAAAGdwaW9fcXNmcF9tb2R1bGVfdXBk
+YXRlOiBjaGFuZ2VkIHJ4X2xvcyBmcm9tIDB4JXggdG8gMHgleAoAAAAAAABncGlvX3FzZnBfbW9k
+dWxlX3VwZGF0ZTogY2hhbmdlZCB0eF9kaXMgZnJvbSAweCV4IHRvIDB4JXgKAAAAAAAATUFDIGZh
+aWxlZCB0byByZXN5bmMgdHgKAAAAAAAAAABkaXNhYmxpbmcgdHggJSN4IHJ4ICUjeAoAAAAAAAAA
+AENhbGN1bGF0aW9uIG91dCBvZiBib3VuZHMgZnVyaW5nIGluaXQ6ICUjeCAlI3ggJSN4CgAAAAAA
+AAAAAAAAAABfaHdfdHBfcGdtbmd0OiB0eF9wYWdlX21heCAldSByeF9wYWdlX21heCAldSBwc3Ry
+dWN0cyAldSBzaXplICV1CgAAAAAAAAAAAAAAAAAAAG1wYXJ0aXRpb25fb3RoZXJzX3RvdGFsOiBk
+ZHAgJXUgZGRwX2lzY3NpICV1IHN0YWcgJXUgcGJsICV1IHJxICV1IHJxdWRwICV1IC0+ICV1CgAA
+AAAAAAAAAAAAAAAAAF9tcGFydGl0aW9uX2JhbmtzX21jWDogbmJhbmtzX3BtdHggJXUgKCV1TUIp
+IG5iYW5rc19wbXJ4ICV1ICgldU1CKSBuYmFua3Nfb3RoZXJzICV1ICgldU1CKSBuYmFua3NfZncg
+JXUgKCV1TUIpCgBfbXBhcnRpdGlvbl9iYW5rc19tYzE6IG5iYW5rc19wbXR4ICV1ICgldU1CKSBu
+YmFua3NfZncgJXUgKCV1TUIpCgAAAAAAAAAAAAAAAAAAAF9tcGFydGl0aW9uX2JhbmtzX21jMDog
+bmJhbmtzX3BtcnggJXUgKCV1TUIpIG5iYW5rc19vdGhlciAldSAoJXVNQikKAAAAAAAAAAAAAAAA
+bWVtX21hbGxvY19pbnRlcm5hbDogZmFpbGVkIHRvIGFsbG9jYXRlICV1IGJ5dGVzLCByZXR1cm5p
+bmcgTlVMTAoAAAAAAAAAAAAAAAAAAABod19lZGNfYmlzdFsldV06IGJpc3RfY21kWzB4JTA4eF0g
+YWRkciAweCV4IGxlbiAweCV4CgAAAAAAAAAAAAAAaHdfZWRjX2Jpc3RbJXVdOiBkb25lLCBlbmNv
+dW50ZXJlZCAldSBlcnJvcnMgb24gZmlyc3QgYW5kICV1IGVycm9ycyBvbiBzZWNvbmQgYXR0ZW1w
+dAoAAAAAAAAAAAAAaHdfbWNfYmlzdF9zeW5jWyV1XTogd2FpdGVkICV1bnMgZm9yIGJpc3QgdG8g
+Y29tcGxldGUKAAAAAAAAAAAAAG1lbV9pbml0X2NhY2hlczogY2FjaGVfc2l6ZSAldSBmbG93Y19i
+dWZfdGNiX2NhY2hlX3NpemUgJXUgYnVmbGw2NF9jYWNoZV9zaXplICV1CgAAAAAAAAAAAAAAAAAA
+AHNnZSByZXF1aXJlIG5lcSAldSBuaXEgJXUgcm91bmRpbmcgdG8gJXUgJXUKAAAAAG1wYXJ0aXRp
+b25fcG10eDogbSAweCUwOHggc2l6ZSAldQoAAAAAAAAAAAAAAAAAAG1wYXJ0aXRpb25fcG1yeDog
+bSAweCUwOHggc2l6ZSAldQoAAAAAAAAAAAAAAAAAAG1wYXJ0aXRpb25fZWRjIChubyBleHRtZW0p
+OiBtIDB4JTA4eCBzaXplICV1CgAAAG1wYXJ0aXRpb25fZWRjX2VzdGltYXRlOiBodyBtb2R1bGVz
+IHJlcXVpcmUgJWQgYnl0ZXMgaW4gRURDCgAAAABUZW1wZXJhdHVyZS9Wb2x0YWdlIFNlbnNvcjog
+Q29yZSBjbG9jayAlZCA+IDUwMDsgdXNpbmcgNTAwIHRvIHN0YXkgaW4gY29tcGxpYW5jZSB3aXRo
+IGhhcmR3YXJlLgoAAAAAAAAAAAAAAAAAAAAAZm9pc2NzaV9ieWU6bDJkZXZfZmMtPmZsb3djX2lk
+IFsweCV4XSwgbDJkZXZfZmMtPmZsb3djX3BjaWVfcGZuIFsweCV4XSwgbDJkZXZfZmMtPmZsb3dj
+X3BjaWVfdmZuIFsweCV4XSwgcG9ydCBbMHgleF0KAAAAAAAAAAAAAABmb2lzY3NpX2J5ZTp2bGFu
+ZGV2X2ZjLT5mbG93Y19pZCBbMHgleF0sIHZsYW5kZXZfZmMtPmZsb3djX3BjaWVfcGZuIFsweCV4
+XSwgdmxhbmRldl9mYy0+Zmxvd2NfcGNpZV92Zm4gWzB4JXhdLCBwb3J0IFsweCV4XQoAAAAAAGhz
+c19zaWdkZXRbJXVdOiBoc3Nfc2lnZGV0IGNoYW5nZWQgdG8gMHgleAoAAAAAAGNyX21vZHVsZV9y
+eF9sb3NbJXVdOiByeF9sb3MgY2hhbmdlZCB0byAldQoAAAAAAFJhbmdlIGNhbGM6IEF2ZXJhZ2Vk
+ICUjeCBidXQgaWdub3JlZCB2YWx1ZSAlI3ggKGl0ZXJhdGlvbiAldSkKAABNQyBjYWxpYnJhdGlv
+biBmYWlsZWQ6IERGSSBpbml0IG5vdCBnb2luZyB0byAwCgBNQyBjYWxpYnJhdGlvbiBmYWlsZWQ6
+IERGSSBpbml0IG5vdCBjb21wbGV0aW5nCgBNQyBjYWxpYnJhdGlvbiBmYWlsZWQ6IENhbGlicmF0
+aW9uIGRpZG4ndCBjb21wbGV0ZS4KAAAAAAAAAAAAAAAATUMgY29tbWFuZCBmYWlsZWQgdG8gY29t
+cGxldGUob3Bjb2RlICUjeCBjYWRkciAlI3ggYmFkZHIgJSN4IGRlbGF5ICVkKQoAAAAAAAAAAABw
+Zm5fYml0bWFwIDB4JXgKAAAAAAAAAAAAAAAAAAAAAGJhZCBtYWlsYm94IGNtZDogcGZuIDB4JXgg
+dmZuIDB4JXg7IG9wY29kZSAweCV4ID4gTEFTVEMyRSAweCV4CgBtYWlsYm94IGNtZCBub3QgeWV0
+IHN1cHBvcnRlZDogcGZuIDB4JXggdmZuIDB4JXg7IG9wY29kZSAweCV4CgAAYmFkIG1haWxib3gg
+Y21kOiBwZm4gMHgleCB2Zm4gMHgleDsgb3Bjb2RlIDB4JXggaXMgdmFsaWQgcG9zdCBkZXZpY2Ug
+aW5pdCBvbmx5CgBiYWQgbWFpbGJveCBjbWQ6IHBmbiAweCV4IHZmbiAweCV4OyBvcGNvZGUgMHgl
+MDJ4IHJhbWFzayAweCV4IGNtZCByYW1hc2sgMHgleAoAAGJhZCBtYWlsYm94IGNtZDogcGZuIDB4
+JXggdmZuIDB4JXg7IG9wY29kZSAweCUwMnggbGVuMTYgMHgleCB2ZXJzdXMgZXhwZWN0ZWQgbGVu
+MTYgMHgleAoAAAAAAAAAAGluc3VmZmljaWVudCBjYXBzIHRvIHByb2Nlc3MgbWFpbGJveCBjbWQ6
+IHBmbiAweCV4IHZmbiAweCV4OyByX2NhcHMgMHgleCB3eF9jYXBzIDB4JXggcmVxdWlyZWQgcl9j
+YXBzIDB4JXggd19jYXBzIDB4JXgKAAAAAAAAAAAAaW5zdWZmaWNpZW50IGNhcHMgdG8gcHJvY2Vz
+cyBtYWlsYm94IGNtZDogcGZuIDB4JXggdmZuIDB4JXg7IHJfY2FwcyAweCV4IHd4X2NhcHMgMHgl
+eCByZXF1aXJlZCByX2NhcHMgMHgleCB3X2NhcHMgMHgleAoAAAAAAAAAAABod19tYV9hZGRyX3Rv
+X21lbV90eXBlX29mZjogTUEgYWRkcmVzcyAweCUwOHggaXMgbm90IG1hcHBlZAoAAAAAaHdfbWFf
+YWRkcl90b19tZW1fdHlwZV9vZmY6IE1BIGFkZHJlc3MgMHglMDh4IG1hcHMgdG8gdHlwZSAldSBv
+ZmZzZXQgMHgleAoAAAAAAABtZW1fbWFsbG9jX3RlbXA6IGZhaWxlZCB0byBhbGxvY2F0ZSAldSBi
+eXRlcywgcmV0dXJuaW5nIE5VTEwKAAAAaHdfcG93ZXJfcHJlcDogVkREPU5PTkUgYnV0IFZDUz0l
+ZAoAAAAAAAAAAAAAAAAAaHdfcG93ZXJfcHJlcDogdW5zdXBwb3J0ZWQgZXh0ZXJuYWwgYWRqdXN0
+YWJsZSBwb3dlciByZWd1bGF0b3JzIFZERD0lZCwgVkNTPSVkCgBod19wb3dlcl9wcmVwOiB1bnN1
+cHBvcnRlZCBWREQ9JWQKAAAAAAAAAAAAAAAAAABod19wb3dlcl9wcmVwOiB1bnN1cHBvcnRlZCBW
+Q1M9JWQKAAAAAAAAAAAAAAAAAABod19wb3dlcl9wcmVwOiBpMmMgd3JpdGUgZXJyb3IsIFZERD0l
+ZCxyZXQ9JWQKAABod19wb3dlcl9wcmVwOiB1bnN1cHBvcnRlZCBWREQ9JWQKAAAAAAAAAAAAAAAA
+AABod19wb3dlcl9wcmVwOiBpMmMgd3JpdGUgZXJyb3IsIFZDUz0lZCxyZXQ9JWQKAABod19wb3dl
+cl9wcmVwOiB1bnN1cHBvcnRlZCBWQ1M9JWQKAAAAAAAAAAAAAAAAAABWUEQgcmVnaW9uIGlzIHRv
+byBzbWFsbCAoU0VSQ0ZHX1NSX1BGTlZQRFNJWkUgMHgleCkKAAAAAAAAAAAAAAAAY2Y6IGZhaWxl
+ZCB0byBhbGxvY2F0ZWQgbWVtb3J5IGZvciBjb25maWd1cmF0aW9uIGZpbGUsIHJldCAlZAoAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAggAAASAAAAAAAAAAggAAAQAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAABoCAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAQAAAAAQAAAAAAAAAAMAAAAAAAAAAAAA
+AAMAAAAAAAAAAAAAEAAAAAAAAAAIAAAAAAIAAAAAAAAAAAAgAAAAAAAAAAAAAAABAAOAAAAAAAAA
+AAAAAAIAAAAAAAAAAAAgA4AAAAAAAAAAAAAQAoAAgAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAQAAAAAAAAAAgAAAAAAAAAAAAAACAAAKAAAAAAAAAAAAAAAKAAAAAAAAAAACAAAIA
+AAAAAAAAAAAAAAIAAAAAAAAAAAAAAAKAAAAAAAAAAAABAAMAAAAAAAAAAAAAAoMAAAAAAAAAAAAQ
+AoAAAAAAAAAAAAAwAAMAAAAAAAAIAAAwAAMAAAAAAAAAAAAwBYMAAAAAAAAIAAAwBYMAAAAAAAAA
+AAAwBIMAAAAAAAAIAAAwBIMAAAAAAAAAAAAwAwMAAAAAAAAIAAAwAwMAAAAAAAAAAAA4AwMAAAAA
+AAAAAAA4BYMAAAAAAAAAAAA4BIMAAAAAAAAAAAA4AAMAAAAAAAAAAAA0BoIAAAAAAAAAAAA8A4IA
+AAAAAAAAAAA8AAMAAAAAAAAIAAA8AAMAAAAAAAAAAAA8BIMAAAAAAAAAAAA8BQMAAAAAAAAAAAA9
+BAMAAAAAAAAAAAA8A4MAAAAAAAAAAAAsAAIAAAAAAAAAAAAsBYIAAAAAAAAAAAAsBQIAAAAAAAAA
+AAAQBoAAAAAAAAAAAAAQBoKAAAAAAAAAAAAADoIAAAAAAAAAAAAQB4KAAAAAIAAAAAAAB4IAAAAA
+IAAAAAAQBwKAAAAAAAAAAAAQBwKAAAAAAAAAAAAQBwKAAAAAAAAAAAAABwIAAAAAIAAAAAAQF4MA
+AAAAAAAIAAAQF4MAAAAAAAAIAAAQAAAAAAAAAAAAAAAQBgOAAAAAAAAAAAAADgMAAAAAAAAAAAAQ
+BgNAAAAAAAAAAAAQBgMAAAAAAAAAAAAQBgAAAAAAAAAAAAAABgOAAAAAAAAAAAAABgMAAAAAAAAA
+AAAADgIAAAAAAAAAAAAADgIAAAAAAAAAAAAQBgIAAAAAAAAAAAAQBgIAAAAAAAAAAAAQBgKAAAAA
+AAAAAAAQBgKAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAEAMA
+AAAAAAAIAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+//8AAAAgAAAAAMAAAAAAAAAgAAAAAOAAAAAAAAAAAgAAAAAAAABAAAAAAAAAAAAAAAAAAAEhAAAA
+AAAAAAAAAQEgAAAAAAAAAAAAAAIAAAAEAAQAAAAABoAAAAQAAAAAAAAAgABAAAAAAAACAAAAgAAg
+AAAAAAACAAAIgAAAAAAAQAAAAAABAEAAAAAAAAAAAAABAEIAAAAAAAAAAAAAACAAAAAAAAAAAAAC
+ECAAAAAAAAAAAAACDAIAAAAAAAAAAAAAhQIAAAAEAAAAAAAAgEIAAAAAAAAAAACAgEIAQAAAAAAA
+AACAgEIAAAAAAAAAAAACACIAAAAAAAAAAAAAgEEAAAAAAAAAAACAgEEAAAAAAAAAAAAAgEGAAAAA
+AAAAAACAgEGAAAAAAAAAAAACACEAAAAAAAAAAAAAECCAAAAAAAAAAAACJQCAAAAAAAAAAAAABQAA
+AAAAAAAAAAAIiASAAAAAAAAAAAAIiASAAAAAAAAAAAAIogCAAAAAAAAAAAAIogCAAAAAAAAAAAAI
+owCAAAAAAAAAAAAIowCAAAAAAAAAAAAIpICAAAAAAAAAAAAIpICAAAAAAAAAAAAEpIDAAAAAAAAA
+AAAEogDAAAAAAAAAAAAEowDAAAAAAAAAAAAEiATAAAAAAAAAAAAACQGAAAAAAAAAAAACDACAAAAA
+AAAAAAAAiATAAAAAAAAAAAAAiASAAAAAAAAAAAACCwCAAAAAAAAAAAAAioCAAAAAAAAAAAAAC4CA
+AAAAAAAAAAAAjACAAAAAAAAAAAACIBCAAAAAAAAAAAACCgCAAAAAAAAAAAACCoCAAAAAAAAAAAAA
+CQKAAAAAAAAAAAAAAQEAAAAAAAAAAAAAAQCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAA
+AAAAAIEQAAAAAAAAAAAAAIEIAAAAAAAAAAAAAIEEAAAAAAAAAAAAAIGAAAAAAAAAAAAAgADAAAAA
+AAAAAAAAgACgAAAAAAAAAAAAAAgAAAAAAAAAAAAAgYAAAAAAAAAAAAAAgYCAAAAAAAAAAAAAiYCA
+AAAAAAAAAAAAiYDAAAAAAAAAAAAAAYIAAAAAAAAAAAACAYAAAAAAAAAAAAACAYCAAAAAAAAAAAAA
+QYGAAAAAAAAAAAACAYGAAAAAAAAAAAAASYGAAAAAAAAAAAACCYGAAAAAAAAAAAACAYEAAAAAAAAA
+AAAAQYEAAAAAAAAAAAAgAAAAAAAAAAAAAAAQAAACAAAAAAAAAAAQAAAAAAAAAAAAAAAAgADAAAAA
+AAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////////8A
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAkgAAAAAAAAADZgAgAEAAAAAACACSAAAAAAAAAANyASUE
+QAAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAAgAAAACAIgDhwAAVgAgAEAAAAAAAAAAAAAAAAAAAAOW
+ACAAQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAA
+AAOWACAAQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAA
+AAAAAAOWACAAQAAAAAAIAAAAAgCIA4UAAJYBIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAA
+AAAAAAAAAAOWACAAQAAAAAAIAAAAAgCIA4UAAJYBIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAA
+AAAAAAAAAAACAAOWACYEQAAAAAAIRyABBAAAArAAAtIFQCREAAAAAAhHIAEEAAACsgAC0gVGJEAA
+AAAACAAAAAIAiAOHAACWASYEQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAABHIAEGDKGCskABkgRA
+JEQAAAAACAAAAAIAiAOHAACWASYEQAAAAAAARyABBAygQrGAAhIFQCREAAAAAAgAAAACAIgDhwAA
+lgEmBEAAAAAACAAAAAIAiAOFAACWASAAQAAAAAAIAAAAAgCIA4UAAJYBIABAAAAAAAgAAAACAIgD
+hQAAlgEgAEAAAAAAAAAAAAAAAAAAAAOWACAAQAAAAAANxRK6ArCA0xRUi+JKRiRAAAAAAAXFEroC
+t4DTFFSLYkmmJEAAAAAABcUSogawgNMUVIviSkYkQAAAAAANxRKiBreA0xRUi2JJpiRAAAAAAAXF
+EqIGsIDTFFSL4kpGJEAAAAAADcUSoga3gNMUVItiSaYkQAAAAAAFxRKiBrCA0xRUi+JKRiRAAAAA
+AA3FEqIGt4DTFFSLYkmmJEAAAAAACcQQoAIAgJAAAItiacYkQAAAAAABxBCgBrCAkwZUi2JpxiRA
+AAAAAAHEEKAGsICTBlSLYmnGJEAAAAAAAcUQuAawgJMWVItiSMYkQAAAAAAIoRCIAgCBWBIAC1IA
+piRAAAAAAAnAEJACsIADFlSKkgHGJEAAAAAACcAQuAawgAMQlIviAkYkQAAAAAAJwBC4ArSAAxCU
+i2IBpiRAAAAAAAnAELgCtIADEJSLYgGmJEAAAAAACcAQuAK0gAMQlItiAaYkQAAAAAAJwBC4ArSA
+AxCUi2IBpiRAAAAAAAGgEJAGtIADEJSLYgGmJEAAAAAAAcAQgAKwgAMUVIpSAMYkQAAAAAABwBCA
+ArCAAxRUilIAxiRAAAAAAAHAEIACsIADFFSKUgDGJEAAAAAACEcgAQQAAAKwAALSBEAkQAAAAAAA
+gQAAAgCFWAdAC1IApiRAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAAAAAAAAYAoYAAQAFWACAAQAAA
+AAAAAAAABACgQAGAAdYAIABAAAAAAAiBAAACAIVZgAQLUgCmJEAAAAAACgFAAAAAABgCAANCASak
+QgAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAACAAAAAIAiAOFAAPW
+ACAAQAAAAAAIAAAAAgCIA4UAA9YAIABAAAAAAAAAAAAAAAAAAAADlgAgAEAAAAAAAAAAAAAAAAAA
+AAOWACAAQAAAAAAAAAAABACgQAGAAdYAIABAAAAAAAnAELgCtIADEJSLYgGmJEAAAAAAAAAAAAAA
+AAACAAOWACYEQAAAAAAAAAAAAAAAAAAAA5YAIABAAAAAAAgAAAACAIgDhQAAlgEgAEAAAAAAAAAA
+AAQAoEABgAHWACAAQAAAAAAAAAAABACgQAGAAdYAIABAAAAAAAAAAAAEAKBAAYAB1gAgAEAAAAAA
+CKEQiAIAgVgQAAkSAaYkQAAAAAAAAAAABACgQAGAAdYAIABAAAAAAAAAAAAGAKGAAEABVgAgAEAA
+AAAACAAAAAIAiAOHQAjSAkYkQgAAAAAJxRKiApSI0hKAiyJJxiRAAAAAAAnAEIACpIgAhVSLUgDG
+JEAAAAAACcAQgAa0iAMBFItSAaYkQAAAAAANwAAAArCAwxZUi+IDRiRAAAAAAAAAAAAAAAAAAAAD
+lgAgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAIADAABAAAAAIAAAIAJiRAAAAAAABHMAAGAyACtwAIAgHAJEAAAAAA
+CAMAAAIGoAq3AAgCAcYkRgAAAAAAAAAAAAAAAAIAAAIAJiRAAAAAAAAgUAAEAAAAAAAAAgEmJEYA
+AAAACGAgAIQAAAAAAAAGACAAQAAAAAAIYCAAhAAAAAIBMAIAJiVAAAAAAAhgAAAEAIQBggQEAgHG
+JMIAAAAAAcAAAAJDgAMCDIgCAaYkQAAAAAAIAGAABAAAAAIAAAIAJiRAAAAAAAgAYAAEAAAAAAAA
+BAEgAEAAAAAAAAAAAAAAAAAAAAAEASAAQAAAAAAECBSABgoAAAcBTAIgpiZAAAAAAAiAAAAGAIQB
+gAQIAgGmJMAAAAAAAEAAAAIAoAAAQAgCAKYkRgAAAAAAAAAAAAAAAAIAAAIAJiRAAAAAAAQAAAAC
+hAADAooIAgTAJEAAAAAAAAAAAAAAAAACAAAGASBIQAAAAAAAIFAABAAAAAIAAAIAJiRAAAAAAAhg
+IACEAAAAAgAABgAmBEAAAAAACGAgAIQAAAACAAACASYlQAAAAAAIYAAABACEAYAEBAIBxiTAAAAA
+AAgAYAAEAAAAAAAABAEgAEAAAAAAAACAACAAAAAAAAACACZMcAAAAAAAAIAAIAAAAAAAAAYBIAAA
+AAAAAAAAgAAgAAAAAAAAAgAmTHAAAAAAAACAACAAAAAAAAAGASAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACcAAAAi0jAQJFgQCBMYkQAAAAAAJwAAADDSA
+BAkWBAIExiRAAAAAAAQIdIBMCQAAUABcAmHmJEAAAAAADAh0gEQAAABSAEACYSYkQAAAAAAIAhCg
+BAAAAAABAAIAJiRAAAAAAAgCEKAEAAAAAAEAAgAmJEAAAAAABAh0AEIBAAAHAIgCYMYkQAAAAAAN
+yBQAAgkAAARAnAJg5iRAAAAAAAnIEIACtIAEApSIAmXGJEAAAAAADch0AEy0gAMAlIgCYKYkwAAA
+AAAFyHQASDSQAwCUiAJgpiTAAAAAAAhHAAAEAAAAAAAAAgEgJEAAAAAACEcAAAQAAAAAAAACBEAk
+QAAAAAAARyABDAchwrcACAIAwCREAAAAAABHIAEMByHCtwAIAgDAJEQAAAAAAEcgAQwHIcK3AAgC
+AMAkRAAAAAAAACABCACEAAVAiAIBxiTAAAAAAAAAIAEIAIQABUCIAgHGJMAAAAAAAAAgAQgAhAAF
+QIgCAcYkwAAAAAAAACABhoIAAQLAiAIDxiTAAAAAAAAAIAGCggAAAsCIAgPGJMAAAAAACcAgAYKk
+gAEFQIgCAcYkwAAAAAAIAAAADACEAAVAiAIBxiTAAAAAAAAAIAGGggABAsCIAgPGJMAAAAAAAAAg
+AYKCAAAAwIgCAqYkwAAAAAAJwCABgqSAAQVAiAIBxiTAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAABBAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABbZ2xvYmFsXQpy
+c3NfZ2xiX2NvbmZpZ19tb2RlPWJhc2ljdmlydHVhbApyc3NfZ2xiX2NvbmZpZ19vcHRpb25zPXRu
+bG1hcGVuLGhhc2h0b2VwbGl0eix0bmxhbGxsa3AKcGxfdGltZW91dF92YWx1ZT0yMDAKcmVnWzB4
+MTAwOF09MHg0MDgxMC8weDIxYzcwCnJlZ1sweDEwMGNdPTB4MjIyMjIyMjIKcmVnWzB4MTBhMF09
+MHgwMTA0MDgxMApyZWdbMHgxMDQ0XT00MDk2CnJlZ1sweDEwNDhdPTY1NTM2CnJlZ1sweDEwNGNd
+PTE1MzYKcmVnWzB4MTA1MF09OTAyNApyZWdbMHgxMDU0XT05MjE2CnJlZ1sweDEwNThdPTIwNDgK
+cmVnWzB4MTA1Y109MTI4CnJlZ1sweDEwNjBdPTgxOTIKcmVnWzB4MTA2NF09MTYzODQKcmVnWzB4
+MTBhNF09MHhhMDAwYTAwMC8weGYwMDBmMDAwCnJlZ1sweDEwYThdPTB4NDAyMDAwLzB4NDAyMDAw
+CmJhcjJ0aHJvdHRsZWNvdW50PTUwMApzZ2VfdGltZXJfdmFsdWU9NSwxMCwyMCw1MCwxMDAsMjAw
+CnJlZ1sweDExMjRdPTB4MDAwMDA0MDAvMHgwMDAwMDQwMApyZWdbMHgxMTMwXT0weDAwZDVmZmVi
+CnJlZ1sweDExM2NdPTB4MDAwMmZmYzAKcmVnWzB4N2QwNF09MHgwMDAxMDAwMC8weDAwMDEwMDAw
+CnJlZ1sweDdkYzBdPTB4MDYyZjg4NDkKZmlsdGVyTW9kZT1zcnZyc3JhbSxmcmFnbWVudGF0aW9u
+LG1wc2hpdHR5cGUscHJvdG9jb2wsdmxhbixwb3J0LGZjb2UKZmlsdGVyTWFzaz1wcm90b2NvbCxm
+Y29lCnRwX3Btcng9MzAKdHBfcG1yeF9wYWdlc2l6ZT02NEsKdHBfbnJ4Y2g9MAp0cF9wbXR4PTUw
+CnRwX3BtdHhfcGFnZXNpemU9NjRLCnRwX250eGNoPTAKdHBfbXR1cz04OCwyNTYsNTEyLDU3Niw4
+MDgsMTAyNCwxMjgwLDE0ODgsMTUwMCwyMDAyLDIwNDgsNDA5Niw0MzUyLDgxOTIsOTAwMCw5NjAw
+CnJlZ1sweDdkMDhdPTB4MDAwMDA4MDAvMHgwMDAwMDgwMApyZWdbMHg3ZDYwXT0weDA2MDAwMDAw
+LzB4MDcwMDAwMDAKcmVnWzB4MTljMDRdPTB4MDA0MDAwMDAvMHgwMDQwMDAwMAptY19tb2RlX2Jy
+Y1swXT0xCm1jX21vZGVfYnJjWzFdPTEKW2Z1bmN0aW9uIjAiXQpudmY9MTYKd3hfY2Fwcz1hbGwK
+cl9jYXBzPWFsbApudmk9MQpuaXFmbGludD04Cm5ldGhjdHJsPTgKbmVxPTE2Cm5leGFjdGY9OApj
+bWFzaz1hbGwKcG1hc2s9MHgxCltmdW5jdGlvbiIxIl0KbnZmPTE2Cnd4X2NhcHM9YWxsCnJfY2Fw
+cz1hbGwKbnZpPTEKbmlxZmxpbnQ9OApuZXRoY3RybD04Cm5lcT0xNgpuZXhhY3RmPTgKY21hc2s9
+YWxsCnBtYXNrPTB4MgpbZnVuY3Rpb24iMiJdCm52Zj0xNgp3eF9jYXBzPWFsbApyX2NhcHM9YWxs
+Cm52aT0xCm5pcWZsaW50PTgKbmV0aGN0cmw9OApuZXE9MTYKbmV4YWN0Zj04CmNtYXNrPWFsbApw
+bWFzaz0weDQKW2Z1bmN0aW9uIjMiXQpudmY9MTYKd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9
+MQpuaXFmbGludD04Cm5ldGhjdHJsPTgKbmVxPTE2Cm5leGFjdGY9OApjbWFzaz1hbGwKcG1hc2s9
+MHg4CltmdW5jdGlvbiI0Il0Kd3hfY2Fwcz1hbGwKcl9jYXBzPWFsbApudmk9MjgKbmlxZmxpbnQ9
+MTcwCm5ldGhjdHJsPTEwMApuZXE9MjU2Cm5leGFjdGY9NDAKY21hc2s9YWxsCnBtYXNrPWFsbApu
+ZXRob2ZsZD0xMDI0Cm5yb3V0ZT0zMgpuY2xpcD0zMgpuZmlsdGVyPTQ5Ngpuc2VydmVyPTQ5Ngpu
+aGFzaD0xMjI4OApwcm90b2NvbD1uaWNfdm0sb2ZsZCxyZGRwLHJkbWFjLGlzY3NpX2luaXRpYXRv
+cl9wZHUsaXNjc2lfdGFyZ2V0X3BkdQp0cF9sMnQ9MzA3Mgp0cF9kZHA9Mgp0cF9kZHBfaXNjc2k9
+Mgp0cF9zdGFnPTIKdHBfcGJsPTUKdHBfcnE9NwpbZnVuY3Rpb24iNSJdCnd4X2NhcHM9YWxsCnJf
+Y2Fwcz1hbGwKbnZpPTQKbmlxZmxpbnQ9MzQKbmV0aGN0cmw9MzIKbmVxPTY0Cm5leGFjdGY9NApj
+bWFzaz1hbGwKcG1hc2s9YWxsCm5zZXJ2ZXI9MTYKbmhhc2g9MjA0OAp0cF9sMnQ9MTAyNApwcm90
+b2NvbD1pc2NzaV9pbml0aWF0b3JfZm9mbGQKdHBfZGRwX2lzY3NpPTIKaXNjc2lfbnRhc2s9MjA0
+OAppc2NzaV9uc2Vzcz0yMDQ4CmlzY3NpX25jb25uX3Blcl9zZXNzaW9uPTEKaXNjc2lfbmluaXRp
+YXRvcl9pbnN0YW5jZT02NApbZnVuY3Rpb24iNiJdCnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZp
+PTQKbmlxZmxpbnQ9MzQKbmV0aGN0cmw9MzIKbmVxPTY2Cm5leGFjdGY9MzIKY21hc2s9YWxsCnBt
+YXNrPWFsbApuaGFzaD0yMDQ4CnByb3RvY29sPWZjb2VfaW5pdGlhdG9yCnRwX2RkcD0yCmZjb2Vf
+bmZjZj0xNgpmY29lX252bnA9MzIKZmNvZV9uc3NuPTEwMjQKW2Z1bmN0aW9uIjEwMjMiXQp3eF9j
+YXBzPWFsbApyX2NhcHM9YWxsCm52aT00CmNtYXNrPWFsbApwbWFzaz1hbGwKbmV4YWN0Zj04Cm5m
+aWx0ZXI9MTYKW2Z1bmN0aW9uIjAvKiJdCnd4X2NhcHM9MHg4MgpyX2NhcHM9MHg4Ngpudmk9MQpu
+aXFmbGludD00Cm5ldGhjdHJsPTIKbmVxPTQKbmV4YWN0Zj00CmNtYXNrPWFsbApwbWFzaz0weDEK
+W2Z1bmN0aW9uIjEvKiJdCnd4X2NhcHM9MHg4MgpyX2NhcHM9MHg4Ngpudmk9MQpuaXFmbGludD00
+Cm5ldGhjdHJsPTIKbmVxPTQKbmV4YWN0Zj00CmNtYXNrPWFsbApwbWFzaz0weDIKW2Z1bmN0aW9u
+IjIvKiJdCnd4X2NhcHM9MHg4MgpyX2NhcHM9MHg4Ngpudmk9MQpuaXFmbGludD00Cm5ldGhjdHJs
+PTIKbmVxPTQKbmV4YWN0Zj00CmNtYXNrPWFsbApwbWFzaz0weDQKW2Z1bmN0aW9uIjMvKiJdCnd4
+X2NhcHM9MHg4MgpyX2NhcHM9MHg4Ngpudmk9MQpuaXFmbGludD00Cm5ldGhjdHJsPTIKbmVxPTQK
+bmV4YWN0Zj00CmNtYXNrPWFsbApwbWFzaz0weDgKW3BvcnQiMCJdCmRjYj1wcHAsZGNieApiZ19t
+ZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKW3BvcnQiMSJdCmRjYj1wcHAs
+ZGNieApiZ19tZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKW3BvcnQiMiJd
+CmRjYj1wcHAsZGNieApiZ19tZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAK
+W3BvcnQiMyJdCmRjYj1wcHAsZGNieApiZ19tZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0x
+NQpkd209MzAKW2ZpbmldCnZlcnNpb249MHgxNDI1MDAxMwpjaGVja3N1bT0weGQ2NmY1YjIzCgAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFtnbG9iYWxdCnJzc19nbGJf
+Y29uZmlnX21vZGU9YmFzaWN2aXJ0dWFsCnJzc19nbGJfY29uZmlnX29wdGlvbnM9dG5sbWFwZW4s
+aGFzaHRvZXBsaXR6LHRubGFsbGxrcApwbF90aW1lb3V0X3ZhbHVlPTIwMApyZWdbMHgxMDA4XT0w
+eDQwODEwLzB4MjFjNzAKcmVnWzB4MTAwY109MHgyMjIyMjIyMgpyZWdbMHgxMGEwXT0weDAxMDQw
+ODEwCnJlZ1sweDEwNDRdPTQwOTYKcmVnWzB4MTA0OF09NjU1MzYKcmVnWzB4MTA0Y109MTUzNgpy
+ZWdbMHgxMDUwXT05MDI0CnJlZ1sweDEwNTRdPTkyMTYKcmVnWzB4MTA1OF09MjA0OApyZWdbMHgx
+MDVjXT0xMjgKcmVnWzB4MTA2MF09ODE5MgpyZWdbMHgxMDY0XT0xNjM4NApyZWdbMHgxMGE0XT0w
+eGEwMDBhMDAwLzB4ZjAwMGYwMDAKcmVnWzB4MTBhOF09MHg0MDIwMDAvMHg0MDIwMDAKYmFyMnRo
+cm90dGxlY291bnQ9NTAwCnNnZV90aW1lcl92YWx1ZT01LDEwLDIwLDUwLDEwMCwyMDAKcmVnWzB4
+MTEyNF09MHgwMDAwMDQwMC8weDAwMDAwNDAwCnJlZ1sweDExMzBdPTB4MDBkNWZmZWIKcmVnWzB4
+MTEzY109MHgwMDAyZmZjMApyZWdbMHg3ZDA0XT0weDAwMDEwMDAwLzB4MDAwMTAwMDAKcmVnWzB4
+N2RjMF09MHgwNjJmODg0OQpmaWx0ZXJNb2RlPXNydnJzcmFtLGZyYWdtZW50YXRpb24sbXBzaGl0
+dHlwZSxwcm90b2NvbCx2bGFuLHBvcnQsZmNvZQpmaWx0ZXJNYXNrPXByb3RvY29sLGZjb2UKdHBf
+cG1yeD0zMAp0cF9wbXJ4X3BhZ2VzaXplPTY0Swp0cF9ucnhjaD0wCnRwX3BtdHg9NTAKdHBfcG10
+eF9wYWdlc2l6ZT02NEsKdHBfbnR4Y2g9MAp0cF9tdHVzPTg4LDI1Niw1MTIsNTc2LDgwOCwxMDI0
+LDEyODAsMTQ4OCwxNTAwLDIwMDIsMjA0OCw0MDk2LDQzNTIsODE5Miw5MDAwLDk2MDAKcmVnWzB4
+N2QwOF09MHgwMDAwMDgwMC8weDAwMDAwODAwCnJlZ1sweDdkNjBdPTB4MDYwMDAwMDAvMHgwNzAw
+MDAwMApyZWdbMHgxOWMwNF09MHgwMDQwMDAwMC8weDAwNDAwMDAwCm1jX21vZGVfYnJjWzBdPTEK
+bWNfbW9kZV9icmNbMV09MQpbZnVuY3Rpb24iMCJdCnd4X2NhcHM9YWxsCnJfY2Fwcz1hbGwKbnZp
+PTI4Cm5pcWZsaW50PTE3MApuZXRoY3RybD05NgpuZXE9MjUyCm5leGFjdGY9NDAKY21hc2s9YWxs
+CnBtYXNrPWFsbApuZXRob2ZsZD0xMDI0Cm5yb3V0ZT0zMgpuY2xpcD0zMgpuZmlsdGVyPTQ4Cm5z
+ZXJ2ZXI9MzIKbmhhc2g9MjA0OApwcm90b2NvbD1uaWNfdm0sb2ZsZCxyZGRwLHJkbWFjLGlzY3Np
+X2luaXRpYXRvcl9wZHUsaXNjc2lfdGFyZ2V0X3BkdQp0cF9sMnQ9MzA3Mgp0cF9kZHA9Mgp0cF9k
+ZHBfaXNjc2k9Mgp0cF9zdGFnPTIKdHBfcGJsPTUKdHBfcnE9NwpbZnVuY3Rpb24iMSJdCnd4X2Nh
+cHM9YWxsCnJfY2Fwcz1hbGwKbnZpPTQKbmlxZmxpbnQ9MzQKbmV0aGN0cmw9MzIKbmVxPTY2Cm5l
+eGFjdGY9MzIKY21hc2s9YWxsCnBtYXNrPWFsbApuaGFzaD0yMDQ4CnByb3RvY29sPWZjb2VfaW5p
+dGlhdG9yCnRwX2RkcD0yCmZjb2VfbmZjZj0xNgpmY29lX252bnA9MzIKZmNvZV9uc3NuPTEwMjQK
+W2Z1bmN0aW9uIjEwMjMiXQp3eF9jYXBzPWFsbApyX2NhcHM9YWxsCm52aT00CmNtYXNrPWFsbApw
+bWFzaz1hbGwKbmV4YWN0Zj04Cm5maWx0ZXI9MTYKW2Z1bmN0aW9uIjAvKiJdCnd4X2NhcHM9MHg4
+MgpyX2NhcHM9MHg4Ngpudmk9MQpuaXFmbGludD00Cm5ldGhjdHJsPTIKbmVxPTQKbmV4YWN0Zj00
+CmNtYXNrPWFsbApwbWFzaz0weDEKW2Z1bmN0aW9uIjEvKiJdCnd4X2NhcHM9MHg4MgpyX2NhcHM9
+MHg4Ngpudmk9MQpuaXFmbGludD00Cm5ldGhjdHJsPTIKbmVxPTQKbmV4YWN0Zj00CmNtYXNrPWFs
+bApwbWFzaz0weDIKW3BvcnQiMCJdCmRjYj1wcHAsZGNieApiZ19tZW09MjUKbHBia19tZW09MjUK
+aHdtPTMwCmx3bT0xNQpkd209MzAKW3BvcnQiMSJdCmRjYj1wcHAsZGNieApiZ19tZW09MjUKbHBi
+a19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKW3BvcnQiMiJdCmRjYj1wcHAsZGNieApiZ19t
+ZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKW3BvcnQiMyJdCmRjYj1wcHAs
+ZGNieApiZ19tZW09MjUKbHBia19tZW09MjUKaHdtPTMwCmx3bT0xNQpkd209MzAKW2ZpbmldCnZl
+cnNpb249MHgxNDI1MDAxMwpjaGVja3N1bT0weDFkNGVkZTQ2CgAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=
+====
diff --git a/sys/dev/cxgbe/firmware/t5fw_cfg.txt b/sys/dev/cxgbe/firmware/t5fw_cfg.txt
index 2d3e5723e13..fd726d1b8da 100644
--- a/sys/dev/cxgbe/firmware/t5fw_cfg.txt
+++ b/sys/dev/cxgbe/firmware/t5fw_cfg.txt
@@ -17,12 +17,18 @@
 
 	sge_timer_value = 1, 5, 10, 50, 100, 200	# usecs
 
+	# enable TP_OUT_CONFIG.IPIDSPLITMODE
+	reg[0x7d04] = 0x00010000/0x00010000
+
 	# TP_SHIFT_CNT
 	reg[0x7dc0] = 0x62f8849
 
 	# TP_GLOBAL_CONFIG
 	reg[0x7d08] = 0x00000800/0x00000800 # set IssFromCplEnable
 
+	# TP_PARA_REG0
+	reg[0x7d60] = 0x06000000/0x07000000 # set InitCWND to 6
+
 	filterMode = fragmentation, mpshittype, protocol, vlan, port, fcoe
 	filterMask = protocol, fcoe
 
@@ -36,6 +42,13 @@
 	tp_pmrx_pagesize = 64K
 	tp_pmtx_pagesize = 64K
 
+	# TP OFLD MTUs
+	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
+
+	# MC configuration
+	mc_mode_brc[0] = 1		# mc0 - 1: enable BRC, 0: enable RBC
+	mc_mode_brc[1] = 1		# mc1 - 1: enable BRC, 0: enable RBC
+
 # PFs 0-3.  These get 8 MSI/8 MSI-X vectors each.  VFs are supported by
 # these 4 PFs only.  Not used here at all.
 [function "0"]
@@ -148,7 +161,7 @@
 
 [fini]
 	version = 0x1
-	checksum = 0x93f11b53
+	checksum = 0x9f27febc
 #
 # $FreeBSD$
 #
diff --git a/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt b/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
index fd68b72bff4..7c99ae8df79 100644
--- a/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
+++ b/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt
@@ -135,13 +135,20 @@
 					# function of number of egress queues
 					# used 
 
+	# enable TP_OUT_CONFIG.IPIDSPLITMODE
+	reg[0x7d04] = 0x00010000/0x00010000
+
 	reg[0x7dc0] = 0x062f8849	# TP_SHIFT_CNT
 
-	# Selection of tuples for LE filter lookup, fields (and widths which
-	# must sum to <= 36): { IP Fragment (1), MPS Match Type (3),
-	# IP Protocol (8), [Inner] VLAN (17), Port (3), FCoE (1) }
-	#
+	# TP_VLAN_PRI_MAP to select filter tuples and enable ServerSram
+	# filter control: compact, fcoemask
+	# server sram   : srvrsram
+	# filter tuples : fragmentation, mpshittype, macmatch, ethertype,
+	#		  protocol, tos, vlan, vnic_id, port, fcoe
+	# valid filterModes are described the Terminator 5 Data Book
 	filterMode = srvrsram, fragmentation, mpshittype, protocol, vlan, port, fcoe
+
+	# filter tuples enforced in LE active region (equal to or subset of filterMode)
 	filterMask = protocol, fcoe
 
 	# Percentage of dynamic memory (in either the EDRAM or external MEM)
@@ -164,12 +171,22 @@
 	# TP number of TX channels
 	tp_ntxch = 0		# 0 (auto) = equal number of ports
 
+	# TP OFLD MTUs
+	tp_mtus = 88, 256, 512, 576, 808, 1024, 1280, 1488, 1500, 2002, 2048, 4096, 4352, 8192, 9000, 9600
+
 	# TP_GLOBAL_CONFIG
 	reg[0x7d08] = 0x00000800/0x00000800 # set IssFromCplEnable
 
+	# TP_PARA_REG0
+	reg[0x7d60] = 0x06000000/0x07000000 # set InitCWND to 6
+
 	# LE_DB_CONFIG
 	reg[0x19c04] = 0x00400000/0x00400000 # LE Server SRAM Enable
 
+	# MC configuration
+	mc_mode_brc[0] = 1		# mc0 - 1: enable BRC, 0: enable RBC
+	mc_mode_brc[1] = 1		# mc1 - 1: enable BRC, 0: enable RBC
+
 # Some "definitions" to make the rest of this a bit more readable.  We support
 # 4 ports, 3 functions (NIC, FCoE and iSCSI), scaling up to 8 "CPU Queue Sets"
 # per function per port ...
@@ -553,8 +570,8 @@
 	dwm = 30
 
 [fini]
-	version = 0x1425000f
-	checksum = 0x23a2d850
+	version = 0x14250013
+	checksum = 0xd66f5b23
 
 # Total resources used by above allocations:
 #   Virtual Interfaces: 104
diff --git a/sys/dev/cxgbe/iw_cxgbe/cm.c b/sys/dev/cxgbe/iw_cxgbe/cm.c
new file mode 100644
index 00000000000..03652a396a3
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/cm.c
@@ -0,0 +1,2458 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+
+#ifdef TCP_OFFLOAD
+#include <sys/types.h>
+#include <sys/malloc.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/sockio.h>
+#include <sys/taskqueue.h>
+#include <netinet/in.h>
+#include <net/neighbour.h>
+#include <net/route.h>
+
+#include <netinet/in_systm.h>
+#include <netinet/in_pcb.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/tcp_var.h>
+#include <netinet/tcp.h>
+#include <netinet/tcpip.h>
+
+#include <netinet/toecore.h>
+
+struct sge_iq;
+struct rss_header;
+#include <linux/types.h>
+#include "offload.h"
+#include "tom/t4_tom.h"
+
+#define TOEPCB(so)  ((struct toepcb *)(so_sototcpcb((so))->t_toe))
+
+#include "iw_cxgbe.h"
+#include <linux/module.h>
+#include <linux/workqueue.h>
+#include <linux/notifier.h>
+#include <linux/inetdevice.h>
+#include <linux/if_vlan.h>
+#include <net/netevent.h>
+
+static spinlock_t req_lock;
+static TAILQ_HEAD(c4iw_ep_list, c4iw_ep_common) req_list;
+static struct work_struct c4iw_task;
+static struct workqueue_struct *c4iw_taskq;
+static LIST_HEAD(timeout_list);
+static spinlock_t timeout_lock;
+
+static void process_req(struct work_struct *ctx);
+static void start_ep_timer(struct c4iw_ep *ep);
+static void stop_ep_timer(struct c4iw_ep *ep);
+static int set_tcpinfo(struct c4iw_ep *ep);
+static enum c4iw_ep_state state_read(struct c4iw_ep_common *epc);
+static void __state_set(struct c4iw_ep_common *epc, enum c4iw_ep_state tostate);
+static void state_set(struct c4iw_ep_common *epc, enum c4iw_ep_state tostate);
+static void *alloc_ep(int size, gfp_t flags);
+void __free_ep(struct c4iw_ep_common *epc);
+static struct rtentry * find_route(__be32 local_ip, __be32 peer_ip, __be16 local_port,
+		__be16 peer_port, u8 tos);
+static int close_socket(struct c4iw_ep_common *epc, int close);
+static int shutdown_socket(struct c4iw_ep_common *epc);
+static void abort_socket(struct c4iw_ep *ep);
+static void send_mpa_req(struct c4iw_ep *ep);
+static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen);
+static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen);
+static void close_complete_upcall(struct c4iw_ep *ep);
+static int abort_connection(struct c4iw_ep *ep);
+static void peer_close_upcall(struct c4iw_ep *ep);
+static void peer_abort_upcall(struct c4iw_ep *ep);
+static void connect_reply_upcall(struct c4iw_ep *ep, int status);
+static void connect_request_upcall(struct c4iw_ep *ep);
+static void established_upcall(struct c4iw_ep *ep);
+static void process_mpa_reply(struct c4iw_ep *ep);
+static void process_mpa_request(struct c4iw_ep *ep);
+static void process_peer_close(struct c4iw_ep *ep);
+static void process_conn_error(struct c4iw_ep *ep);
+static void process_close_complete(struct c4iw_ep *ep);
+static void ep_timeout(unsigned long arg);
+static void init_sock(struct c4iw_ep_common *epc);
+static void process_data(struct c4iw_ep *ep);
+static void process_connected(struct c4iw_ep *ep);
+static struct socket * dequeue_socket(struct socket *head, struct sockaddr_in **remote, struct c4iw_ep *child_ep);
+static void process_newconn(struct c4iw_ep *parent_ep);
+static int c4iw_so_upcall(struct socket *so, void *arg, int waitflag);
+static void process_socket_event(struct c4iw_ep *ep);
+static void release_ep_resources(struct c4iw_ep *ep);
+
+#define START_EP_TIMER(ep) \
+    do { \
+	    CTR3(KTR_IW_CXGBE, "start_ep_timer (%s:%d) ep %p", \
+		__func__, __LINE__, (ep)); \
+	    start_ep_timer(ep); \
+    } while (0)
+
+#define STOP_EP_TIMER(ep) \
+    do { \
+	    CTR3(KTR_IW_CXGBE, "stop_ep_timer (%s:%d) ep %p", \
+		__func__, __LINE__, (ep)); \
+	    stop_ep_timer(ep); \
+    } while (0)
+
+#ifdef KTR
+static char *states[] = {
+	"idle",
+	"listen",
+	"connecting",
+	"mpa_wait_req",
+	"mpa_req_sent",
+	"mpa_req_rcvd",
+	"mpa_rep_sent",
+	"fpdu_mode",
+	"aborting",
+	"closing",
+	"moribund",
+	"dead",
+	NULL,
+};
+#endif
+
+static void
+process_req(struct work_struct *ctx)
+{
+	struct c4iw_ep_common *epc;
+
+	spin_lock(&req_lock);
+	while (!TAILQ_EMPTY(&req_list)) {
+		epc = TAILQ_FIRST(&req_list);
+		TAILQ_REMOVE(&req_list, epc, entry);
+		epc->entry.tqe_prev = NULL;
+		spin_unlock(&req_lock);
+		if (epc->so)
+			process_socket_event((struct c4iw_ep *)epc);
+		c4iw_put_ep(epc);
+		spin_lock(&req_lock);
+	}
+	spin_unlock(&req_lock);
+}
+
+/*
+ * XXX: doesn't belong here in the iWARP driver.
+ * XXX: assumes that the connection was offloaded by cxgbe/t4_tom if TF_TOE is
+ *      set.  Is this a valid assumption for active open?
+ */
+static int
+set_tcpinfo(struct c4iw_ep *ep)
+{
+	struct socket *so = ep->com.so;
+	struct inpcb *inp = sotoinpcb(so);
+	struct tcpcb *tp;
+	struct toepcb *toep;
+	int rc = 0;
+
+	INP_WLOCK(inp);
+	tp = intotcpcb(inp);
+	if ((tp->t_flags & TF_TOE) == 0) {
+		rc = EINVAL;
+		log(LOG_ERR, "%s: connection not offloaded (so %p, ep %p)\n",
+		    __func__, so, ep);
+		goto done;
+	}
+	toep = TOEPCB(so);
+
+	ep->hwtid = toep->tid;
+	ep->snd_seq = tp->snd_nxt;
+	ep->rcv_seq = tp->rcv_nxt;
+	ep->emss = max(tp->t_maxseg, 128);
+done:
+	INP_WUNLOCK(inp);
+	return (rc);
+
+}
+
+static struct rtentry *
+find_route(__be32 local_ip, __be32 peer_ip, __be16 local_port,
+		__be16 peer_port, u8 tos)
+{
+	struct route iproute;
+	struct sockaddr_in *dst = (struct sockaddr_in *)&iproute.ro_dst;
+
+	CTR5(KTR_IW_CXGBE, "%s:frtB %x, %x, %d, %d", __func__, local_ip,
+	    peer_ip, ntohs(local_port), ntohs(peer_port));
+	bzero(&iproute, sizeof iproute);
+	dst->sin_family = AF_INET;
+	dst->sin_len = sizeof *dst;
+	dst->sin_addr.s_addr = peer_ip;
+
+	rtalloc(&iproute);
+	CTR2(KTR_IW_CXGBE, "%s:frtE %p", __func__, (uint64_t)iproute.ro_rt);
+	return iproute.ro_rt;
+}
+
+static int
+close_socket(struct c4iw_ep_common *epc, int close)
+{
+	struct socket *so = epc->so;
+	int rc;
+
+	CTR4(KTR_IW_CXGBE, "%s: so %p, ep %p, state %s", __func__, epc, so,
+	    states[epc->state]);
+
+	SOCK_LOCK(so);
+	soupcall_clear(so, SO_RCV);
+	SOCK_UNLOCK(so);
+
+	if (close)
+                rc = soclose(so);
+        else
+                rc = soshutdown(so, SHUT_WR | SHUT_RD);
+	epc->so = NULL;
+
+	return (rc);
+}
+
+static int
+shutdown_socket(struct c4iw_ep_common *epc)
+{
+
+	CTR4(KTR_IW_CXGBE, "%s: so %p, ep %p, state %s", __func__, epc->so, epc,
+	    states[epc->state]);
+
+	return (soshutdown(epc->so, SHUT_WR));
+}
+
+static void
+abort_socket(struct c4iw_ep *ep)
+{
+	struct sockopt sopt;
+	int rc;
+	struct linger l;
+
+	CTR4(KTR_IW_CXGBE, "%s ep %p so %p state %s", __func__, ep, ep->com.so,
+	    states[ep->com.state]);
+
+	l.l_onoff = 1;
+	l.l_linger = 0;
+
+	/* linger_time of 0 forces RST to be sent */
+	sopt.sopt_dir = SOPT_SET;
+	sopt.sopt_level = SOL_SOCKET;
+	sopt.sopt_name = SO_LINGER;
+	sopt.sopt_val = (caddr_t)&l;
+	sopt.sopt_valsize = sizeof l;
+	sopt.sopt_td = NULL;
+	rc = sosetopt(ep->com.so, &sopt);
+	if (rc) {
+		log(LOG_ERR, "%s: can't set linger to 0, no RST! err %d\n",
+		    __func__, rc);
+	}
+}
+
+static void
+process_peer_close(struct c4iw_ep *ep)
+{
+	struct c4iw_qp_attributes attrs;
+	int disconnect = 1;
+	int release = 0;
+
+	CTR4(KTR_IW_CXGBE, "%s:ppcB ep %p so %p state %s", __func__, ep,
+	    ep->com.so, states[ep->com.state]);
+
+	mutex_lock(&ep->com.mutex);
+	switch (ep->com.state) {
+
+		case MPA_REQ_WAIT:
+			CTR2(KTR_IW_CXGBE, "%s:ppc1 %p MPA_REQ_WAIT CLOSING",
+			    __func__, ep);
+			__state_set(&ep->com, CLOSING);
+			break;
+
+		case MPA_REQ_SENT:
+			CTR2(KTR_IW_CXGBE, "%s:ppc2 %p MPA_REQ_SENT CLOSING",
+			    __func__, ep);
+			__state_set(&ep->com, DEAD);
+			connect_reply_upcall(ep, -ECONNABORTED);
+
+			disconnect = 0;
+			STOP_EP_TIMER(ep);
+			close_socket(&ep->com, 0);
+			ep->com.cm_id->rem_ref(ep->com.cm_id);
+			ep->com.cm_id = NULL;
+			ep->com.qp = NULL;
+			release = 1;
+			break;
+
+		case MPA_REQ_RCVD:
+
+			/*
+			 * We're gonna mark this puppy DEAD, but keep
+			 * the reference on it until the ULP accepts or
+			 * rejects the CR.
+			 */
+			CTR2(KTR_IW_CXGBE, "%s:ppc3 %p MPA_REQ_RCVD CLOSING",
+			    __func__, ep);
+			__state_set(&ep->com, CLOSING);
+			c4iw_get_ep(&ep->com);
+			break;
+
+		case MPA_REP_SENT:
+			CTR2(KTR_IW_CXGBE, "%s:ppc4 %p MPA_REP_SENT CLOSING",
+			    __func__, ep);
+			__state_set(&ep->com, CLOSING);
+			break;
+
+		case FPDU_MODE:
+			CTR2(KTR_IW_CXGBE, "%s:ppc5 %p FPDU_MODE CLOSING",
+			    __func__, ep);
+			START_EP_TIMER(ep);
+			__state_set(&ep->com, CLOSING);
+			attrs.next_state = C4IW_QP_STATE_CLOSING;
+			c4iw_modify_qp(ep->com.dev, ep->com.qp,
+					C4IW_QP_ATTR_NEXT_STATE, &attrs, 1);
+			peer_close_upcall(ep);
+			break;
+
+		case ABORTING:
+			CTR2(KTR_IW_CXGBE, "%s:ppc6 %p ABORTING (disconn)",
+			    __func__, ep);
+			disconnect = 0;
+			break;
+
+		case CLOSING:
+			CTR2(KTR_IW_CXGBE, "%s:ppc7 %p CLOSING MORIBUND",
+			    __func__, ep);
+			__state_set(&ep->com, MORIBUND);
+			disconnect = 0;
+			break;
+
+		case MORIBUND:
+			CTR2(KTR_IW_CXGBE, "%s:ppc8 %p MORIBUND DEAD", __func__,
+			    ep);
+			STOP_EP_TIMER(ep);
+			if (ep->com.cm_id && ep->com.qp) {
+				attrs.next_state = C4IW_QP_STATE_IDLE;
+				c4iw_modify_qp(ep->com.qp->rhp, ep->com.qp,
+						C4IW_QP_ATTR_NEXT_STATE, &attrs, 1);
+			}
+			close_socket(&ep->com, 0);
+			close_complete_upcall(ep);
+			__state_set(&ep->com, DEAD);
+			release = 1;
+			disconnect = 0;
+			break;
+
+		case DEAD:
+			CTR2(KTR_IW_CXGBE, "%s:ppc9 %p DEAD (disconn)",
+			    __func__, ep);
+			disconnect = 0;
+			break;
+
+		default:
+			panic("%s: ep %p state %d", __func__, ep,
+			    ep->com.state);
+			break;
+	}
+
+	mutex_unlock(&ep->com.mutex);
+
+	if (disconnect) {
+
+		CTR2(KTR_IW_CXGBE, "%s:ppca %p", __func__, ep);
+		c4iw_ep_disconnect(ep, 0, M_NOWAIT);
+	}
+	if (release) {
+
+		CTR2(KTR_IW_CXGBE, "%s:ppcb %p", __func__, ep);
+		c4iw_put_ep(&ep->com);
+	}
+	CTR2(KTR_IW_CXGBE, "%s:ppcE %p", __func__, ep);
+	return;
+}
+
+static void
+process_conn_error(struct c4iw_ep *ep)
+{
+	struct c4iw_qp_attributes attrs;
+	int ret;
+	int state;
+
+	state = state_read(&ep->com);
+	CTR5(KTR_IW_CXGBE, "%s:pceB ep %p so %p so->so_error %u state %s",
+	    __func__, ep, ep->com.so, ep->com.so->so_error,
+	    states[ep->com.state]);
+
+	switch (state) {
+
+		case MPA_REQ_WAIT:
+			STOP_EP_TIMER(ep);
+			break;
+
+		case MPA_REQ_SENT:
+			STOP_EP_TIMER(ep);
+			connect_reply_upcall(ep, -ECONNRESET);
+			break;
+
+		case MPA_REP_SENT:
+			ep->com.rpl_err = ECONNRESET;
+			CTR1(KTR_IW_CXGBE, "waking up ep %p", ep);
+			break;
+
+		case MPA_REQ_RCVD:
+
+			/*
+			 * We're gonna mark this puppy DEAD, but keep
+			 * the reference on it until the ULP accepts or
+			 * rejects the CR.
+			 */
+			c4iw_get_ep(&ep->com);
+			break;
+
+		case MORIBUND:
+		case CLOSING:
+			STOP_EP_TIMER(ep);
+			/*FALLTHROUGH*/
+		case FPDU_MODE:
+
+			if (ep->com.cm_id && ep->com.qp) {
+
+				attrs.next_state = C4IW_QP_STATE_ERROR;
+				ret = c4iw_modify_qp(ep->com.qp->rhp,
+					ep->com.qp, C4IW_QP_ATTR_NEXT_STATE,
+					&attrs, 1);
+				if (ret)
+					log(LOG_ERR,
+							"%s - qp <- error failed!\n",
+							__func__);
+			}
+			peer_abort_upcall(ep);
+			break;
+
+		case ABORTING:
+			break;
+
+		case DEAD:
+			CTR2(KTR_IW_CXGBE, "%s so_error %d IN DEAD STATE!!!!",
+			    __func__, ep->com.so->so_error);
+			return;
+
+		default:
+			panic("%s: ep %p state %d", __func__, ep, state);
+			break;
+	}
+
+	if (state != ABORTING) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pce1 %p", __func__, ep);
+		close_socket(&ep->com, 0);
+		state_set(&ep->com, DEAD);
+		c4iw_put_ep(&ep->com);
+	}
+	CTR2(KTR_IW_CXGBE, "%s:pceE %p", __func__, ep);
+	return;
+}
+
+static void
+process_close_complete(struct c4iw_ep *ep)
+{
+	struct c4iw_qp_attributes attrs;
+	int release = 0;
+
+	CTR4(KTR_IW_CXGBE, "%s:pccB ep %p so %p state %s", __func__, ep,
+	    ep->com.so, states[ep->com.state]);
+
+	/* The cm_id may be null if we failed to connect */
+	mutex_lock(&ep->com.mutex);
+
+	switch (ep->com.state) {
+
+		case CLOSING:
+			CTR2(KTR_IW_CXGBE, "%s:pcc1 %p CLOSING MORIBUND",
+			    __func__, ep);
+			__state_set(&ep->com, MORIBUND);
+			break;
+
+		case MORIBUND:
+			CTR2(KTR_IW_CXGBE, "%s:pcc1 %p MORIBUND DEAD", __func__,
+			    ep);
+			STOP_EP_TIMER(ep);
+
+			if ((ep->com.cm_id) && (ep->com.qp)) {
+
+				CTR2(KTR_IW_CXGBE, "%s:pcc2 %p QP_STATE_IDLE",
+				    __func__, ep);
+				attrs.next_state = C4IW_QP_STATE_IDLE;
+				c4iw_modify_qp(ep->com.dev,
+						ep->com.qp,
+						C4IW_QP_ATTR_NEXT_STATE,
+						&attrs, 1);
+			}
+
+			if (ep->parent_ep) {
+
+				CTR2(KTR_IW_CXGBE, "%s:pcc3 %p", __func__, ep);
+				close_socket(&ep->com, 1);
+			}
+			else {
+
+				CTR2(KTR_IW_CXGBE, "%s:pcc4 %p", __func__, ep);
+				close_socket(&ep->com, 0);
+			}
+			close_complete_upcall(ep);
+			__state_set(&ep->com, DEAD);
+			release = 1;
+			break;
+
+		case ABORTING:
+			CTR2(KTR_IW_CXGBE, "%s:pcc5 %p ABORTING", __func__, ep);
+			break;
+
+		case DEAD:
+		default:
+			CTR2(KTR_IW_CXGBE, "%s:pcc6 %p DEAD", __func__, ep);
+			panic("%s:pcc6 %p DEAD", __func__, ep);
+			break;
+	}
+	mutex_unlock(&ep->com.mutex);
+
+	if (release) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pcc7 %p", __func__, ep);
+		c4iw_put_ep(&ep->com);
+	}
+	CTR2(KTR_IW_CXGBE, "%s:pccE %p", __func__, ep);
+	return;
+}
+
+static void
+init_sock(struct c4iw_ep_common *epc)
+{
+	int rc;
+	struct sockopt sopt;
+	struct socket *so = epc->so;
+	int on = 1;
+
+	SOCK_LOCK(so);
+	soupcall_set(so, SO_RCV, c4iw_so_upcall, epc);
+	so->so_state |= SS_NBIO;
+	SOCK_UNLOCK(so);
+	sopt.sopt_dir = SOPT_SET;
+	sopt.sopt_level = IPPROTO_TCP;
+	sopt.sopt_name = TCP_NODELAY;
+	sopt.sopt_val = (caddr_t)&on;
+	sopt.sopt_valsize = sizeof on;
+	sopt.sopt_td = NULL;
+	rc = sosetopt(so, &sopt);
+	if (rc) {
+		log(LOG_ERR, "%s: can't set TCP_NODELAY on so %p (%d)\n",
+		    __func__, so, rc);
+	}
+}
+
+static void
+process_data(struct c4iw_ep *ep)
+{
+	struct sockaddr_in *local, *remote;
+
+	CTR5(KTR_IW_CXGBE, "%s: so %p, ep %p, state %s, sb_cc %d", __func__,
+	    ep->com.so, ep, states[ep->com.state], ep->com.so->so_rcv.sb_cc);
+
+	switch (state_read(&ep->com)) {
+	case MPA_REQ_SENT:
+		process_mpa_reply(ep);
+		break;
+	case MPA_REQ_WAIT:
+		in_getsockaddr(ep->com.so, (struct sockaddr **)&local);
+		in_getpeeraddr(ep->com.so, (struct sockaddr **)&remote);
+		ep->com.local_addr = *local;
+		ep->com.remote_addr = *remote;
+		free(local, M_SONAME);
+		free(remote, M_SONAME);
+		process_mpa_request(ep);
+		break;
+	default:
+		if (ep->com.so->so_rcv.sb_cc)
+			log(LOG_ERR, "%s: Unexpected streaming data.  "
+			    "ep %p, state %d, so %p, so_state 0x%x, sb_cc %u\n",
+			    __func__, ep, state_read(&ep->com), ep->com.so,
+			    ep->com.so->so_state, ep->com.so->so_rcv.sb_cc);
+		break;
+	}
+}
+
+static void
+process_connected(struct c4iw_ep *ep)
+{
+
+	if ((ep->com.so->so_state & SS_ISCONNECTED) && !ep->com.so->so_error)
+		send_mpa_req(ep);
+	else {
+		connect_reply_upcall(ep, -ep->com.so->so_error);
+		close_socket(&ep->com, 0);
+		state_set(&ep->com, DEAD);
+		c4iw_put_ep(&ep->com);
+	}
+}
+
+static struct socket *
+dequeue_socket(struct socket *head, struct sockaddr_in **remote,
+    struct c4iw_ep *child_ep)
+{
+	struct socket *so;
+
+	ACCEPT_LOCK();
+	so = TAILQ_FIRST(&head->so_comp);
+	if (!so) {
+		ACCEPT_UNLOCK();
+		return (NULL);
+	}
+	TAILQ_REMOVE(&head->so_comp, so, so_list);
+	head->so_qlen--;
+	SOCK_LOCK(so);
+	so->so_qstate &= ~SQ_COMP;
+	so->so_head = NULL;
+	soref(so);
+	soupcall_set(so, SO_RCV, c4iw_so_upcall, child_ep);
+	so->so_state |= SS_NBIO;
+	SOCK_UNLOCK(so);
+	ACCEPT_UNLOCK();
+	soaccept(so, (struct sockaddr **)remote);
+
+	return (so);
+}
+
+static void
+process_newconn(struct c4iw_ep *parent_ep)
+{
+	struct socket *child_so;
+	struct c4iw_ep *child_ep;
+	struct sockaddr_in *remote;
+
+	child_ep = alloc_ep(sizeof(*child_ep), M_NOWAIT);
+	if (!child_ep) {
+		CTR3(KTR_IW_CXGBE, "%s: parent so %p, parent ep %p, ENOMEM",
+		    __func__, parent_ep->com.so, parent_ep);
+		log(LOG_ERR, "%s: failed to allocate ep entry\n", __func__);
+		return;
+	}
+
+	child_so = dequeue_socket(parent_ep->com.so, &remote, child_ep);
+	if (!child_so) {
+		CTR4(KTR_IW_CXGBE,
+		    "%s: parent so %p, parent ep %p, child ep %p, dequeue err",
+		    __func__, parent_ep->com.so, parent_ep, child_ep);
+		log(LOG_ERR, "%s: failed to dequeue child socket\n", __func__);
+		__free_ep(&child_ep->com);
+		return;
+
+	}
+
+	CTR5(KTR_IW_CXGBE,
+	    "%s: parent so %p, parent ep %p, child so %p, child ep %p",
+	     __func__, parent_ep->com.so, parent_ep, child_so, child_ep);
+
+	child_ep->com.local_addr = parent_ep->com.local_addr;
+	child_ep->com.remote_addr = *remote;
+	child_ep->com.dev = parent_ep->com.dev;
+	child_ep->com.so = child_so;
+	child_ep->com.cm_id = NULL;
+	child_ep->com.thread = parent_ep->com.thread;
+	child_ep->parent_ep = parent_ep;
+
+	free(remote, M_SONAME);
+	c4iw_get_ep(&parent_ep->com);
+	child_ep->parent_ep = parent_ep;
+	init_timer(&child_ep->timer);
+	state_set(&child_ep->com, MPA_REQ_WAIT);
+	START_EP_TIMER(child_ep);
+
+	/* maybe the request has already been queued up on the socket... */
+	process_mpa_request(child_ep);
+}
+
+static int
+c4iw_so_upcall(struct socket *so, void *arg, int waitflag)
+{
+	struct c4iw_ep *ep = arg;
+
+	spin_lock(&req_lock);
+
+	CTR6(KTR_IW_CXGBE,
+	    "%s: so %p, so_state 0x%x, ep %p, ep_state %s, tqe_prev %p",
+	    __func__, so, so->so_state, ep, states[ep->com.state],
+	    ep->com.entry.tqe_prev);
+
+	if (ep && ep->com.so && !ep->com.entry.tqe_prev) {
+		KASSERT(ep->com.so == so, ("%s: XXX review.", __func__));
+		c4iw_get_ep(&ep->com);
+		TAILQ_INSERT_TAIL(&req_list, &ep->com, entry);
+		queue_work(c4iw_taskq, &c4iw_task);
+	}
+
+	spin_unlock(&req_lock);
+	return (SU_OK);
+}
+
+static void
+process_socket_event(struct c4iw_ep *ep)
+{
+	int state = state_read(&ep->com);
+	struct socket *so = ep->com.so;
+
+	CTR6(KTR_IW_CXGBE, "process_socket_event: so %p, so_state 0x%x, "
+	    "so_err %d, sb_state 0x%x, ep %p, ep_state %s", so, so->so_state,
+	    so->so_error, so->so_rcv.sb_state, ep, states[state]);
+
+	if (state == CONNECTING) {
+		process_connected(ep);
+		return;
+	}
+
+	if (state == LISTEN) {
+		process_newconn(ep);
+		return;
+	}
+
+	/* connection error */
+	if (so->so_error) {
+		process_conn_error(ep);
+		return;
+	}
+
+	/* peer close */
+	if ((so->so_rcv.sb_state & SBS_CANTRCVMORE) && state < CLOSING) {
+		process_peer_close(ep);
+		return;
+	}
+
+	/* close complete */
+	if (so->so_state & SS_ISDISCONNECTED) {
+		process_close_complete(ep);
+		return;
+	}
+
+	/* rx data */
+	process_data(ep);
+}
+
+SYSCTL_NODE(_hw, OID_AUTO, iw_cxgbe, CTLFLAG_RD, 0, "iw_cxgbe driver parameters");
+
+int db_delay_usecs = 1;
+TUNABLE_INT("hw.iw_cxgbe.db_delay_usecs", &db_delay_usecs);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, db_delay_usecs, CTLFLAG_RW, &db_delay_usecs, 0,
+		"Usecs to delay awaiting db fifo to drain");
+
+static int dack_mode = 1;
+TUNABLE_INT("hw.iw_cxgbe.dack_mode", &dack_mode);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, dack_mode, CTLFLAG_RW, &dack_mode, 0,
+		"Delayed ack mode (default = 1)");
+
+int c4iw_max_read_depth = 8;
+TUNABLE_INT("hw.iw_cxgbe.c4iw_max_read_depth", &c4iw_max_read_depth);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, c4iw_max_read_depth, CTLFLAG_RW, &c4iw_max_read_depth, 0,
+		"Per-connection max ORD/IRD (default = 8)");
+
+static int enable_tcp_timestamps;
+TUNABLE_INT("hw.iw_cxgbe.enable_tcp_timestamps", &enable_tcp_timestamps);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, enable_tcp_timestamps, CTLFLAG_RW, &enable_tcp_timestamps, 0,
+		"Enable tcp timestamps (default = 0)");
+
+static int enable_tcp_sack;
+TUNABLE_INT("hw.iw_cxgbe.enable_tcp_sack", &enable_tcp_sack);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, enable_tcp_sack, CTLFLAG_RW, &enable_tcp_sack, 0,
+		"Enable tcp SACK (default = 0)");
+
+static int enable_tcp_window_scaling = 1;
+TUNABLE_INT("hw.iw_cxgbe.enable_tcp_window_scaling", &enable_tcp_window_scaling);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, enable_tcp_window_scaling, CTLFLAG_RW, &enable_tcp_window_scaling, 0,
+		"Enable tcp window scaling (default = 1)");
+
+int c4iw_debug = 1;
+TUNABLE_INT("hw.iw_cxgbe.c4iw_debug", &c4iw_debug);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, c4iw_debug, CTLFLAG_RW, &c4iw_debug, 0,
+		"Enable debug logging (default = 0)");
+
+static int peer2peer;
+TUNABLE_INT("hw.iw_cxgbe.peer2peer", &peer2peer);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, peer2peer, CTLFLAG_RW, &peer2peer, 0,
+		"Support peer2peer ULPs (default = 0)");
+
+static int p2p_type = FW_RI_INIT_P2PTYPE_READ_REQ;
+TUNABLE_INT("hw.iw_cxgbe.p2p_type", &p2p_type);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, p2p_type, CTLFLAG_RW, &p2p_type, 0,
+		"RDMAP opcode to use for the RTR message: 1 = RDMA_READ 0 = RDMA_WRITE (default 1)");
+
+static int ep_timeout_secs = 60;
+TUNABLE_INT("hw.iw_cxgbe.ep_timeout_secs", &ep_timeout_secs);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, ep_timeout_secs, CTLFLAG_RW, &ep_timeout_secs, 0,
+		"CM Endpoint operation timeout in seconds (default = 60)");
+
+static int mpa_rev = 1;
+TUNABLE_INT("hw.iw_cxgbe.mpa_rev", &mpa_rev);
+#ifdef IW_CM_MPAV2
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, mpa_rev, CTLFLAG_RW, &mpa_rev, 0,
+		"MPA Revision, 0 supports amso1100, 1 is RFC0544 spec compliant, 2 is IETF MPA Peer Connect Draft compliant (default = 1)");
+#else
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, mpa_rev, CTLFLAG_RW, &mpa_rev, 0,
+		"MPA Revision, 0 supports amso1100, 1 is RFC0544 spec compliant (default = 1)");
+#endif
+
+static int markers_enabled;
+TUNABLE_INT("hw.iw_cxgbe.markers_enabled", &markers_enabled);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, markers_enabled, CTLFLAG_RW, &markers_enabled, 0,
+		"Enable MPA MARKERS (default(0) = disabled)");
+
+static int crc_enabled = 1;
+TUNABLE_INT("hw.iw_cxgbe.crc_enabled", &crc_enabled);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, crc_enabled, CTLFLAG_RW, &crc_enabled, 0,
+		"Enable MPA CRC (default(1) = enabled)");
+
+static int rcv_win = 256 * 1024;
+TUNABLE_INT("hw.iw_cxgbe.rcv_win", &rcv_win);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, rcv_win, CTLFLAG_RW, &rcv_win, 0,
+		"TCP receive window in bytes (default = 256KB)");
+
+static int snd_win = 128 * 1024;
+TUNABLE_INT("hw.iw_cxgbe.snd_win", &snd_win);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, snd_win, CTLFLAG_RW, &snd_win, 0,
+		"TCP send window in bytes (default = 128KB)");
+
+int db_fc_threshold = 2000;
+TUNABLE_INT("hw.iw_cxgbe.db_fc_threshold", &db_fc_threshold);
+SYSCTL_INT(_hw_iw_cxgbe, OID_AUTO, db_fc_threshold, CTLFLAG_RW, &db_fc_threshold, 0,
+		"QP count/threshold that triggers automatic");
+
+static void
+start_ep_timer(struct c4iw_ep *ep)
+{
+
+	if (timer_pending(&ep->timer)) {
+		CTR2(KTR_IW_CXGBE, "%s: ep %p, already started", __func__, ep);
+		printk(KERN_ERR "%s timer already started! ep %p\n", __func__,
+		    ep);
+		return;
+	}
+	clear_bit(TIMEOUT, &ep->com.flags);
+	c4iw_get_ep(&ep->com);
+	ep->timer.expires = jiffies + ep_timeout_secs * HZ;
+	ep->timer.data = (unsigned long)ep;
+	ep->timer.function = ep_timeout;
+	add_timer(&ep->timer);
+}
+
+static void
+stop_ep_timer(struct c4iw_ep *ep)
+{
+
+	del_timer_sync(&ep->timer);
+	if (!test_and_set_bit(TIMEOUT, &ep->com.flags)) {
+		c4iw_put_ep(&ep->com);
+	}
+}
+
+static enum
+c4iw_ep_state state_read(struct c4iw_ep_common *epc)
+{
+	enum c4iw_ep_state state;
+
+	mutex_lock(&epc->mutex);
+	state = epc->state;
+	mutex_unlock(&epc->mutex);
+
+	return (state);
+}
+
+static void
+__state_set(struct c4iw_ep_common *epc, enum c4iw_ep_state new)
+{
+
+	epc->state = new;
+}
+
+static void
+state_set(struct c4iw_ep_common *epc, enum c4iw_ep_state new)
+{
+
+	mutex_lock(&epc->mutex);
+	__state_set(epc, new);
+	mutex_unlock(&epc->mutex);
+}
+
+static void *
+alloc_ep(int size, gfp_t gfp)
+{
+	struct c4iw_ep_common *epc;
+
+	epc = kzalloc(size, gfp);
+	if (epc == NULL)
+		return (NULL);
+
+	kref_init(&epc->kref);
+	mutex_init(&epc->mutex);
+	c4iw_init_wr_wait(&epc->wr_wait);
+
+	return (epc);
+}
+
+void
+__free_ep(struct c4iw_ep_common *epc)
+{
+	CTR2(KTR_IW_CXGBE, "%s:feB %p", __func__, epc);
+	KASSERT(!epc->so, ("%s warning ep->so %p \n", __func__, epc->so));
+	KASSERT(!epc->entry.tqe_prev, ("%s epc %p still on req list!\n", __func__, epc));
+	free(epc, M_DEVBUF);
+	CTR2(KTR_IW_CXGBE, "%s:feE %p", __func__, epc);
+}
+
+void _c4iw_free_ep(struct kref *kref)
+{
+	struct c4iw_ep *ep;
+	struct c4iw_ep_common *epc;
+
+	ep = container_of(kref, struct c4iw_ep, com.kref);
+	epc = &ep->com;
+	KASSERT(!epc->so, ("%s ep->so %p", __func__, epc->so));
+	KASSERT(!epc->entry.tqe_prev, ("%s epc %p still on req list",
+	    __func__, epc));
+	kfree(ep);
+}
+
+static void release_ep_resources(struct c4iw_ep *ep)
+{
+	CTR2(KTR_IW_CXGBE, "%s:rerB %p", __func__, ep);
+	set_bit(RELEASE_RESOURCES, &ep->com.flags);
+	c4iw_put_ep(&ep->com);
+	CTR2(KTR_IW_CXGBE, "%s:rerE %p", __func__, ep);
+}
+
+static void
+send_mpa_req(struct c4iw_ep *ep)
+{
+	int mpalen;
+	struct mpa_message *mpa;
+	struct mpa_v2_conn_params mpa_v2_params;
+	struct mbuf *m;
+	char mpa_rev_to_use = mpa_rev;
+	int err;
+
+	if (ep->retry_with_mpa_v1)
+		mpa_rev_to_use = 1;
+	mpalen = sizeof(*mpa) + ep->plen;
+	if (mpa_rev_to_use == 2)
+		mpalen += sizeof(struct mpa_v2_conn_params);
+
+	if (mpalen > MHLEN)
+		CXGBE_UNIMPLEMENTED(__func__);
+
+	m = m_gethdr(M_NOWAIT, MT_DATA);
+	if (m == NULL) {
+		connect_reply_upcall(ep, -ENOMEM);
+		return;
+	}
+
+	mpa = mtod(m, struct mpa_message *);
+	m->m_len = mpalen;
+	m->m_pkthdr.len = mpalen;
+	memcpy(mpa->key, MPA_KEY_REQ, sizeof(mpa->key));
+	mpa->flags = (crc_enabled ? MPA_CRC : 0) |
+		(markers_enabled ? MPA_MARKERS : 0) |
+		(mpa_rev_to_use == 2 ? MPA_ENHANCED_RDMA_CONN : 0);
+	mpa->private_data_size = htons(ep->plen);
+	mpa->revision = mpa_rev_to_use;
+
+	if (mpa_rev_to_use == 1) {
+		ep->tried_with_mpa_v1 = 1;
+		ep->retry_with_mpa_v1 = 0;
+	}
+
+	if (mpa_rev_to_use == 2) {
+		mpa->private_data_size +=
+			htons(sizeof(struct mpa_v2_conn_params));
+		mpa_v2_params.ird = htons((u16)ep->ird);
+		mpa_v2_params.ord = htons((u16)ep->ord);
+
+		if (peer2peer) {
+			mpa_v2_params.ird |= htons(MPA_V2_PEER2PEER_MODEL);
+
+			if (p2p_type == FW_RI_INIT_P2PTYPE_RDMA_WRITE) {
+				mpa_v2_params.ord |=
+				    htons(MPA_V2_RDMA_WRITE_RTR);
+			} else if (p2p_type == FW_RI_INIT_P2PTYPE_READ_REQ) {
+				mpa_v2_params.ord |=
+					htons(MPA_V2_RDMA_READ_RTR);
+			}
+		}
+		memcpy(mpa->private_data, &mpa_v2_params,
+			sizeof(struct mpa_v2_conn_params));
+
+		if (ep->plen) {
+
+			memcpy(mpa->private_data +
+				sizeof(struct mpa_v2_conn_params),
+				ep->mpa_pkt + sizeof(*mpa), ep->plen);
+		}
+	} else {
+
+		if (ep->plen)
+			memcpy(mpa->private_data,
+					ep->mpa_pkt + sizeof(*mpa), ep->plen);
+		CTR2(KTR_IW_CXGBE, "%s:smr7 %p", __func__, ep);
+	}
+
+	err = sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT, ep->com.thread);
+	if (err) {
+		connect_reply_upcall(ep, -ENOMEM);
+		return;
+	}
+
+	START_EP_TIMER(ep);
+	state_set(&ep->com, MPA_REQ_SENT);
+	ep->mpa_attr.initiator = 1;
+}
+
+static int send_mpa_reject(struct c4iw_ep *ep, const void *pdata, u8 plen)
+{
+	int mpalen ;
+	struct mpa_message *mpa;
+	struct mpa_v2_conn_params mpa_v2_params;
+	struct mbuf *m;
+	int err;
+
+	CTR4(KTR_IW_CXGBE, "%s:smrejB %p %u %d", __func__, ep, ep->hwtid,
+	    ep->plen);
+
+	mpalen = sizeof(*mpa) + plen;
+
+	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) {
+
+		mpalen += sizeof(struct mpa_v2_conn_params);
+		CTR4(KTR_IW_CXGBE, "%s:smrej1 %p %u %d", __func__, ep,
+		    ep->mpa_attr.version, mpalen);
+	}
+
+	if (mpalen > MHLEN)
+		CXGBE_UNIMPLEMENTED(__func__);
+
+	m = m_gethdr(M_NOWAIT, MT_DATA);
+	if (m == NULL) {
+
+		printf("%s - cannot alloc mbuf!\n", __func__);
+		CTR2(KTR_IW_CXGBE, "%s:smrej2 %p", __func__, ep);
+		return (-ENOMEM);
+	}
+
+
+	mpa = mtod(m, struct mpa_message *);
+	m->m_len = mpalen;
+	m->m_pkthdr.len = mpalen;
+	memset(mpa, 0, sizeof(*mpa));
+	memcpy(mpa->key, MPA_KEY_REP, sizeof(mpa->key));
+	mpa->flags = MPA_REJECT;
+	mpa->revision = mpa_rev;
+	mpa->private_data_size = htons(plen);
+
+	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) {
+
+		mpa->flags |= MPA_ENHANCED_RDMA_CONN;
+		mpa->private_data_size +=
+			htons(sizeof(struct mpa_v2_conn_params));
+		mpa_v2_params.ird = htons(((u16)ep->ird) |
+				(peer2peer ? MPA_V2_PEER2PEER_MODEL :
+				 0));
+		mpa_v2_params.ord = htons(((u16)ep->ord) | (peer2peer ?
+					(p2p_type ==
+					 FW_RI_INIT_P2PTYPE_RDMA_WRITE ?
+					 MPA_V2_RDMA_WRITE_RTR : p2p_type ==
+					 FW_RI_INIT_P2PTYPE_READ_REQ ?
+					 MPA_V2_RDMA_READ_RTR : 0) : 0));
+		memcpy(mpa->private_data, &mpa_v2_params,
+				sizeof(struct mpa_v2_conn_params));
+
+		if (ep->plen)
+			memcpy(mpa->private_data +
+					sizeof(struct mpa_v2_conn_params), pdata, plen);
+		CTR5(KTR_IW_CXGBE, "%s:smrej3 %p %d %d %d", __func__, ep,
+		    mpa_v2_params.ird, mpa_v2_params.ord, ep->plen);
+	} else
+		if (plen)
+			memcpy(mpa->private_data, pdata, plen);
+
+	err = sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT, ep->com.thread);
+	if (!err)
+		ep->snd_seq += mpalen;
+	CTR4(KTR_IW_CXGBE, "%s:smrejE %p %u %d", __func__, ep, ep->hwtid, err);
+	return err;
+}
+
+static int send_mpa_reply(struct c4iw_ep *ep, const void *pdata, u8 plen)
+{
+	int mpalen;
+	struct mpa_message *mpa;
+	struct mbuf *m;
+	struct mpa_v2_conn_params mpa_v2_params;
+	int err;
+
+	CTR2(KTR_IW_CXGBE, "%s:smrepB %p", __func__, ep);
+
+	mpalen = sizeof(*mpa) + plen;
+
+	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) {
+
+		CTR3(KTR_IW_CXGBE, "%s:smrep1 %p %d", __func__, ep,
+		    ep->mpa_attr.version);
+		mpalen += sizeof(struct mpa_v2_conn_params);
+	}
+
+	if (mpalen > MHLEN)
+		CXGBE_UNIMPLEMENTED(__func__);
+
+	m = m_gethdr(M_NOWAIT, MT_DATA);
+	if (m == NULL) {
+
+		CTR2(KTR_IW_CXGBE, "%s:smrep2 %p", __func__, ep);
+		printf("%s - cannot alloc mbuf!\n", __func__);
+		return (-ENOMEM);
+	}
+
+
+	mpa = mtod(m, struct mpa_message *);
+	m->m_len = mpalen;
+	m->m_pkthdr.len = mpalen;
+	memset(mpa, 0, sizeof(*mpa));
+	memcpy(mpa->key, MPA_KEY_REP, sizeof(mpa->key));
+	mpa->flags = (ep->mpa_attr.crc_enabled ? MPA_CRC : 0) |
+		(markers_enabled ? MPA_MARKERS : 0);
+	mpa->revision = ep->mpa_attr.version;
+	mpa->private_data_size = htons(plen);
+
+	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) {
+
+		mpa->flags |= MPA_ENHANCED_RDMA_CONN;
+		mpa->private_data_size +=
+			htons(sizeof(struct mpa_v2_conn_params));
+		mpa_v2_params.ird = htons((u16)ep->ird);
+		mpa_v2_params.ord = htons((u16)ep->ord);
+		CTR5(KTR_IW_CXGBE, "%s:smrep3 %p %d %d %d", __func__, ep,
+		    ep->mpa_attr.version, mpa_v2_params.ird, mpa_v2_params.ord);
+
+		if (peer2peer && (ep->mpa_attr.p2p_type !=
+			FW_RI_INIT_P2PTYPE_DISABLED)) {
+
+			mpa_v2_params.ird |= htons(MPA_V2_PEER2PEER_MODEL);
+
+			if (p2p_type == FW_RI_INIT_P2PTYPE_RDMA_WRITE) {
+
+				mpa_v2_params.ord |=
+					htons(MPA_V2_RDMA_WRITE_RTR);
+				CTR5(KTR_IW_CXGBE, "%s:smrep4 %p %d %d %d",
+				    __func__, ep, p2p_type, mpa_v2_params.ird,
+				    mpa_v2_params.ord);
+			}
+			else if (p2p_type == FW_RI_INIT_P2PTYPE_READ_REQ) {
+
+				mpa_v2_params.ord |=
+					htons(MPA_V2_RDMA_READ_RTR);
+				CTR5(KTR_IW_CXGBE, "%s:smrep5 %p %d %d %d",
+				    __func__, ep, p2p_type, mpa_v2_params.ird,
+				    mpa_v2_params.ord);
+			}
+		}
+
+		memcpy(mpa->private_data, &mpa_v2_params,
+			sizeof(struct mpa_v2_conn_params));
+
+		if (ep->plen)
+			memcpy(mpa->private_data +
+				sizeof(struct mpa_v2_conn_params), pdata, plen);
+	} else
+		if (plen)
+			memcpy(mpa->private_data, pdata, plen);
+
+	state_set(&ep->com, MPA_REP_SENT);
+	ep->snd_seq += mpalen;
+	err = sosend(ep->com.so, NULL, NULL, m, NULL, MSG_DONTWAIT,
+			ep->com.thread);
+	CTR3(KTR_IW_CXGBE, "%s:smrepE %p %d", __func__, ep, err);
+	return err;
+}
+
+
+
+static void close_complete_upcall(struct c4iw_ep *ep)
+{
+	struct iw_cm_event event;
+
+	CTR2(KTR_IW_CXGBE, "%s:ccuB %p", __func__, ep);
+	memset(&event, 0, sizeof(event));
+	event.event = IW_CM_EVENT_CLOSE;
+
+	if (ep->com.cm_id) {
+
+		CTR2(KTR_IW_CXGBE, "%s:ccu1 %1", __func__, ep);
+		ep->com.cm_id->event_handler(ep->com.cm_id, &event);
+		ep->com.cm_id->rem_ref(ep->com.cm_id);
+		ep->com.cm_id = NULL;
+		ep->com.qp = NULL;
+		set_bit(CLOSE_UPCALL, &ep->com.history);
+	}
+	CTR2(KTR_IW_CXGBE, "%s:ccuE %p", __func__, ep);
+}
+
+static int abort_connection(struct c4iw_ep *ep)
+{
+	int err;
+
+	CTR2(KTR_IW_CXGBE, "%s:abB %p", __func__, ep);
+	close_complete_upcall(ep);
+	state_set(&ep->com, ABORTING);
+	abort_socket(ep);
+	err = close_socket(&ep->com, 0);
+	set_bit(ABORT_CONN, &ep->com.history);
+	CTR2(KTR_IW_CXGBE, "%s:abE %p", __func__, ep);
+	return err;
+}
+
+static void peer_close_upcall(struct c4iw_ep *ep)
+{
+	struct iw_cm_event event;
+
+	CTR2(KTR_IW_CXGBE, "%s:pcuB %p", __func__, ep);
+	memset(&event, 0, sizeof(event));
+	event.event = IW_CM_EVENT_DISCONNECT;
+
+	if (ep->com.cm_id) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pcu1 %p", __func__, ep);
+		ep->com.cm_id->event_handler(ep->com.cm_id, &event);
+		set_bit(DISCONN_UPCALL, &ep->com.history);
+	}
+	CTR2(KTR_IW_CXGBE, "%s:pcuE %p", __func__, ep);
+}
+
+static void peer_abort_upcall(struct c4iw_ep *ep)
+{
+	struct iw_cm_event event;
+
+	CTR2(KTR_IW_CXGBE, "%s:pauB %p", __func__, ep);
+	memset(&event, 0, sizeof(event));
+	event.event = IW_CM_EVENT_CLOSE;
+	event.status = -ECONNRESET;
+
+	if (ep->com.cm_id) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pau1 %p", __func__, ep);
+		ep->com.cm_id->event_handler(ep->com.cm_id, &event);
+		ep->com.cm_id->rem_ref(ep->com.cm_id);
+		ep->com.cm_id = NULL;
+		ep->com.qp = NULL;
+		set_bit(ABORT_UPCALL, &ep->com.history);
+	}
+	CTR2(KTR_IW_CXGBE, "%s:pauE %p", __func__, ep);
+}
+
+static void connect_reply_upcall(struct c4iw_ep *ep, int status)
+{
+	struct iw_cm_event event;
+
+	CTR3(KTR_IW_CXGBE, "%s:cruB %p", __func__, ep, status);
+	memset(&event, 0, sizeof(event));
+	event.event = IW_CM_EVENT_CONNECT_REPLY;
+	event.status = (status ==-ECONNABORTED)?-ECONNRESET: status;
+	event.local_addr = ep->com.local_addr;
+	event.remote_addr = ep->com.remote_addr;
+
+	if ((status == 0) || (status == -ECONNREFUSED)) {
+
+		if (!ep->tried_with_mpa_v1) {
+
+			CTR2(KTR_IW_CXGBE, "%s:cru1 %p", __func__, ep);
+			/* this means MPA_v2 is used */
+			event.private_data_len = ep->plen -
+				sizeof(struct mpa_v2_conn_params);
+			event.private_data = ep->mpa_pkt +
+				sizeof(struct mpa_message) +
+				sizeof(struct mpa_v2_conn_params);
+		} else {
+
+			CTR2(KTR_IW_CXGBE, "%s:cru2 %p", __func__, ep);
+			/* this means MPA_v1 is used */
+			event.private_data_len = ep->plen;
+			event.private_data = ep->mpa_pkt +
+				sizeof(struct mpa_message);
+		}
+	}
+
+	if (ep->com.cm_id) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cru3 %p", __func__, ep);
+		set_bit(CONN_RPL_UPCALL, &ep->com.history);
+		ep->com.cm_id->event_handler(ep->com.cm_id, &event);
+	}
+
+	if(status == -ECONNABORTED) {
+
+		CTR3(KTR_IW_CXGBE, "%s:cruE %p %d", __func__, ep, status);
+		return;
+	}
+
+	if (status < 0) {
+
+		CTR3(KTR_IW_CXGBE, "%s:cru4 %p %d", __func__, ep, status);
+		ep->com.cm_id->rem_ref(ep->com.cm_id);
+		ep->com.cm_id = NULL;
+		ep->com.qp = NULL;
+	}
+
+	CTR2(KTR_IW_CXGBE, "%s:cruE %p", __func__, ep);
+}
+
+static void connect_request_upcall(struct c4iw_ep *ep)
+{
+	struct iw_cm_event event;
+
+	CTR3(KTR_IW_CXGBE, "%s: ep %p, mpa_v1 %d", __func__, ep,
+	    ep->tried_with_mpa_v1);
+
+	memset(&event, 0, sizeof(event));
+	event.event = IW_CM_EVENT_CONNECT_REQUEST;
+	event.local_addr = ep->com.local_addr;
+	event.remote_addr = ep->com.remote_addr;
+	event.provider_data = ep;
+	event.so = ep->com.so;
+
+	if (!ep->tried_with_mpa_v1) {
+		/* this means MPA_v2 is used */
+#ifdef IW_CM_MPAV2
+		event.ord = ep->ord;
+		event.ird = ep->ird;
+#endif
+		event.private_data_len = ep->plen -
+			sizeof(struct mpa_v2_conn_params);
+		event.private_data = ep->mpa_pkt + sizeof(struct mpa_message) +
+			sizeof(struct mpa_v2_conn_params);
+	} else {
+
+		/* this means MPA_v1 is used. Send max supported */
+#ifdef IW_CM_MPAV2
+		event.ord = c4iw_max_read_depth;
+		event.ird = c4iw_max_read_depth;
+#endif
+		event.private_data_len = ep->plen;
+		event.private_data = ep->mpa_pkt + sizeof(struct mpa_message);
+	}
+
+	c4iw_get_ep(&ep->com);
+	ep->parent_ep->com.cm_id->event_handler(ep->parent_ep->com.cm_id,
+	    &event);
+	set_bit(CONNREQ_UPCALL, &ep->com.history);
+	c4iw_put_ep(&ep->parent_ep->com);
+}
+
+static void established_upcall(struct c4iw_ep *ep)
+{
+	struct iw_cm_event event;
+
+	CTR2(KTR_IW_CXGBE, "%s:euB %p", __func__, ep);
+	memset(&event, 0, sizeof(event));
+	event.event = IW_CM_EVENT_ESTABLISHED;
+#ifdef IW_CM_MPAV2
+	event.ird = ep->ird;
+	event.ord = ep->ord;
+#endif
+	if (ep->com.cm_id) {
+
+		CTR2(KTR_IW_CXGBE, "%s:eu1 %p", __func__, ep);
+		ep->com.cm_id->event_handler(ep->com.cm_id, &event);
+		set_bit(ESTAB_UPCALL, &ep->com.history);
+	}
+	CTR2(KTR_IW_CXGBE, "%s:euE %p", __func__, ep);
+}
+
+
+
+static void process_mpa_reply(struct c4iw_ep *ep)
+{
+	struct mpa_message *mpa;
+	struct mpa_v2_conn_params *mpa_v2_params;
+	u16 plen;
+	u16 resp_ird, resp_ord;
+	u8 rtr_mismatch = 0, insuff_ird = 0;
+	struct c4iw_qp_attributes attrs;
+	enum c4iw_qp_attr_mask mask;
+	int err;
+	struct mbuf *top, *m;
+	int flags = MSG_DONTWAIT;
+	struct uio uio;
+
+	CTR2(KTR_IW_CXGBE, "%s:pmrB %p", __func__, ep);
+
+	/*
+	 * Stop mpa timer.  If it expired, then the state has
+	 * changed and we bail since ep_timeout already aborted
+	 * the connection.
+	 */
+	STOP_EP_TIMER(ep);
+	if (state_read(&ep->com) != MPA_REQ_SENT)
+		return;
+
+	uio.uio_resid = 1000000;
+	uio.uio_td = ep->com.thread;
+	err = soreceive(ep->com.so, NULL, &uio, &top, NULL, &flags);
+
+	if (err) {
+
+		if (err == EWOULDBLOCK) {
+
+			CTR2(KTR_IW_CXGBE, "%s:pmr1 %p", __func__, ep);
+			START_EP_TIMER(ep);
+			return;
+		}
+		err = -err;
+		CTR2(KTR_IW_CXGBE, "%s:pmr2 %p", __func__, ep);
+		goto err;
+	}
+
+	if (ep->com.so->so_rcv.sb_mb) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmr3 %p", __func__, ep);
+		printf("%s data after soreceive called! so %p sb_mb %p top %p\n",
+		       __func__, ep->com.so, ep->com.so->so_rcv.sb_mb, top);
+	}
+
+	m = top;
+
+	do {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmr4 %p", __func__, ep);
+		/*
+		 * If we get more than the supported amount of private data
+		 * then we must fail this connection.
+		 */
+		if (ep->mpa_pkt_len + m->m_len > sizeof(ep->mpa_pkt)) {
+
+			CTR3(KTR_IW_CXGBE, "%s:pmr5 %p %d", __func__, ep,
+			    ep->mpa_pkt_len + m->m_len);
+			err = (-EINVAL);
+			goto err;
+		}
+
+		/*
+		 * copy the new data into our accumulation buffer.
+		 */
+		m_copydata(m, 0, m->m_len, &(ep->mpa_pkt[ep->mpa_pkt_len]));
+		ep->mpa_pkt_len += m->m_len;
+		if (!m->m_next)
+			m = m->m_nextpkt;
+		else
+			m = m->m_next;
+	} while (m);
+
+	m_freem(top);
+	/*
+	 * if we don't even have the mpa message, then bail.
+	 */
+	if (ep->mpa_pkt_len < sizeof(*mpa))
+		return;
+	mpa = (struct mpa_message *) ep->mpa_pkt;
+
+	/* Validate MPA header. */
+	if (mpa->revision > mpa_rev) {
+
+		CTR4(KTR_IW_CXGBE, "%s:pmr6 %p %d %d", __func__, ep,
+		    mpa->revision, mpa_rev);
+		printk(KERN_ERR MOD "%s MPA version mismatch. Local = %d, "
+				" Received = %d\n", __func__, mpa_rev, mpa->revision);
+		err = -EPROTO;
+		goto err;
+	}
+
+	if (memcmp(mpa->key, MPA_KEY_REP, sizeof(mpa->key))) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmr7 %p", __func__, ep);
+		err = -EPROTO;
+		goto err;
+	}
+
+	plen = ntohs(mpa->private_data_size);
+
+	/*
+	 * Fail if there's too much private data.
+	 */
+	if (plen > MPA_MAX_PRIVATE_DATA) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmr8 %p", __func__, ep);
+		err = -EPROTO;
+		goto err;
+	}
+
+	/*
+	 * If plen does not account for pkt size
+	 */
+	if (ep->mpa_pkt_len > (sizeof(*mpa) + plen)) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmr9 %p", __func__, ep);
+		err = -EPROTO;
+		goto err;
+	}
+
+	ep->plen = (u8) plen;
+
+	/*
+	 * If we don't have all the pdata yet, then bail.
+	 * We'll continue process when more data arrives.
+	 */
+	if (ep->mpa_pkt_len < (sizeof(*mpa) + plen)) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmra %p", __func__, ep);
+		return;
+	}
+
+	if (mpa->flags & MPA_REJECT) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmrb %p", __func__, ep);
+		err = -ECONNREFUSED;
+		goto err;
+	}
+
+	/*
+	 * If we get here we have accumulated the entire mpa
+	 * start reply message including private data. And
+	 * the MPA header is valid.
+	 */
+	state_set(&ep->com, FPDU_MODE);
+	ep->mpa_attr.crc_enabled = (mpa->flags & MPA_CRC) | crc_enabled ? 1 : 0;
+	ep->mpa_attr.recv_marker_enabled = markers_enabled;
+	ep->mpa_attr.xmit_marker_enabled = mpa->flags & MPA_MARKERS ? 1 : 0;
+	ep->mpa_attr.version = mpa->revision;
+	ep->mpa_attr.p2p_type = FW_RI_INIT_P2PTYPE_DISABLED;
+
+	if (mpa->revision == 2) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmrc %p", __func__, ep);
+		ep->mpa_attr.enhanced_rdma_conn =
+			mpa->flags & MPA_ENHANCED_RDMA_CONN ? 1 : 0;
+
+		if (ep->mpa_attr.enhanced_rdma_conn) {
+
+			CTR2(KTR_IW_CXGBE, "%s:pmrd %p", __func__, ep);
+			mpa_v2_params = (struct mpa_v2_conn_params *)
+				(ep->mpa_pkt + sizeof(*mpa));
+			resp_ird = ntohs(mpa_v2_params->ird) &
+				MPA_V2_IRD_ORD_MASK;
+			resp_ord = ntohs(mpa_v2_params->ord) &
+				MPA_V2_IRD_ORD_MASK;
+
+			/*
+			 * This is a double-check. Ideally, below checks are
+			 * not required since ird/ord stuff has been taken
+			 * care of in c4iw_accept_cr
+			 */
+			if ((ep->ird < resp_ord) || (ep->ord > resp_ird)) {
+
+				CTR2(KTR_IW_CXGBE, "%s:pmre %p", __func__, ep);
+				err = -ENOMEM;
+				ep->ird = resp_ord;
+				ep->ord = resp_ird;
+				insuff_ird = 1;
+			}
+
+			if (ntohs(mpa_v2_params->ird) &
+				MPA_V2_PEER2PEER_MODEL) {
+
+				CTR2(KTR_IW_CXGBE, "%s:pmrf %p", __func__, ep);
+				if (ntohs(mpa_v2_params->ord) &
+					MPA_V2_RDMA_WRITE_RTR) {
+
+					CTR2(KTR_IW_CXGBE, "%s:pmrg %p", __func__, ep);
+					ep->mpa_attr.p2p_type =
+						FW_RI_INIT_P2PTYPE_RDMA_WRITE;
+				}
+				else if (ntohs(mpa_v2_params->ord) &
+					MPA_V2_RDMA_READ_RTR) {
+
+					CTR2(KTR_IW_CXGBE, "%s:pmrh %p", __func__, ep);
+					ep->mpa_attr.p2p_type =
+						FW_RI_INIT_P2PTYPE_READ_REQ;
+				}
+			}
+		}
+	} else {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmri %p", __func__, ep);
+
+		if (mpa->revision == 1) {
+
+			CTR2(KTR_IW_CXGBE, "%s:pmrj %p", __func__, ep);
+
+			if (peer2peer) {
+
+				CTR2(KTR_IW_CXGBE, "%s:pmrk %p", __func__, ep);
+				ep->mpa_attr.p2p_type = p2p_type;
+			}
+		}
+	}
+
+	if (set_tcpinfo(ep)) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmrl %p", __func__, ep);
+		printf("%s set_tcpinfo error\n", __func__);
+		goto err;
+	}
+
+	CTR6(KTR_IW_CXGBE, "%s - crc_enabled = %d, recv_marker_enabled = %d, "
+	    "xmit_marker_enabled = %d, version = %d p2p_type = %d", __func__,
+	    ep->mpa_attr.crc_enabled, ep->mpa_attr.recv_marker_enabled,
+	    ep->mpa_attr.xmit_marker_enabled, ep->mpa_attr.version,
+	    ep->mpa_attr.p2p_type);
+
+	/*
+	 * If responder's RTR does not match with that of initiator, assign
+	 * FW_RI_INIT_P2PTYPE_DISABLED in mpa attributes so that RTR is not
+	 * generated when moving QP to RTS state.
+	 * A TERM message will be sent after QP has moved to RTS state
+	 */
+	if ((ep->mpa_attr.version == 2) && peer2peer &&
+		(ep->mpa_attr.p2p_type != p2p_type)) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmrm %p", __func__, ep);
+		ep->mpa_attr.p2p_type = FW_RI_INIT_P2PTYPE_DISABLED;
+		rtr_mismatch = 1;
+	}
+
+
+	//ep->ofld_txq = TOEPCB(ep->com.so)->ofld_txq;
+	attrs.mpa_attr = ep->mpa_attr;
+	attrs.max_ird = ep->ird;
+	attrs.max_ord = ep->ord;
+	attrs.llp_stream_handle = ep;
+	attrs.next_state = C4IW_QP_STATE_RTS;
+
+	mask = C4IW_QP_ATTR_NEXT_STATE |
+		C4IW_QP_ATTR_LLP_STREAM_HANDLE | C4IW_QP_ATTR_MPA_ATTR |
+		C4IW_QP_ATTR_MAX_IRD | C4IW_QP_ATTR_MAX_ORD;
+
+	/* bind QP and TID with INIT_WR */
+	err = c4iw_modify_qp(ep->com.qp->rhp, ep->com.qp, mask, &attrs, 1);
+
+	if (err) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmrn %p", __func__, ep);
+		goto err;
+	}
+
+	/*
+	 * If responder's RTR requirement did not match with what initiator
+	 * supports, generate TERM message
+	 */
+	if (rtr_mismatch) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmro %p", __func__, ep);
+		printk(KERN_ERR "%s: RTR mismatch, sending TERM\n", __func__);
+		attrs.layer_etype = LAYER_MPA | DDP_LLP;
+		attrs.ecode = MPA_NOMATCH_RTR;
+		attrs.next_state = C4IW_QP_STATE_TERMINATE;
+		err = c4iw_modify_qp(ep->com.qp->rhp, ep->com.qp,
+			C4IW_QP_ATTR_NEXT_STATE, &attrs, 0);
+		err = -ENOMEM;
+		goto out;
+	}
+
+	/*
+	 * Generate TERM if initiator IRD is not sufficient for responder
+	 * provided ORD. Currently, we do the same behaviour even when
+	 * responder provided IRD is also not sufficient as regards to
+	 * initiator ORD.
+	 */
+	if (insuff_ird) {
+
+		CTR2(KTR_IW_CXGBE, "%s:pmrp %p", __func__, ep);
+		printk(KERN_ERR "%s: Insufficient IRD, sending TERM\n",
+				__func__);
+		attrs.layer_etype = LAYER_MPA | DDP_LLP;
+		attrs.ecode = MPA_INSUFF_IRD;
+		attrs.next_state = C4IW_QP_STATE_TERMINATE;
+		err = c4iw_modify_qp(ep->com.qp->rhp, ep->com.qp,
+			C4IW_QP_ATTR_NEXT_STATE, &attrs, 0);
+		err = -ENOMEM;
+		goto out;
+	}
+	goto out;
+err:
+	state_set(&ep->com, ABORTING);
+	abort_connection(ep);
+out:
+	connect_reply_upcall(ep, err);
+	CTR2(KTR_IW_CXGBE, "%s:pmrE %p", __func__, ep);
+	return;
+}
+
+static void
+process_mpa_request(struct c4iw_ep *ep)
+{
+	struct mpa_message *mpa;
+	u16 plen;
+	int flags = MSG_DONTWAIT;
+	int rc;
+	struct iovec iov;
+	struct uio uio;
+	enum c4iw_ep_state state = state_read(&ep->com);
+
+	CTR3(KTR_IW_CXGBE, "%s: ep %p, state %s", __func__, ep, states[state]);
+
+	if (state != MPA_REQ_WAIT)
+		return;
+
+	iov.iov_base = &ep->mpa_pkt[ep->mpa_pkt_len];
+	iov.iov_len = sizeof(ep->mpa_pkt) - ep->mpa_pkt_len;
+	uio.uio_iov = &iov;
+	uio.uio_iovcnt = 1;
+	uio.uio_offset = 0;
+	uio.uio_resid = sizeof(ep->mpa_pkt) - ep->mpa_pkt_len;
+	uio.uio_segflg = UIO_SYSSPACE;
+	uio.uio_rw = UIO_READ;
+	uio.uio_td = NULL; /* uio.uio_td = ep->com.thread; */
+
+	rc = soreceive(ep->com.so, NULL, &uio, NULL, NULL, &flags);
+	if (rc == EAGAIN)
+		return;
+	else if (rc) {
+abort:
+		STOP_EP_TIMER(ep);
+		abort_connection(ep);
+		return;
+	}
+	KASSERT(uio.uio_offset > 0, ("%s: sorecieve on so %p read no data",
+	    __func__, ep->com.so));
+	ep->mpa_pkt_len += uio.uio_offset;
+
+	/*
+	 * If we get more than the supported amount of private data then we must
+	 * fail this connection.  XXX: check so_rcv->sb_cc, or peek with another
+	 * soreceive, or increase the size of mpa_pkt by 1 and abort if the last
+	 * byte is filled by the soreceive above.
+	 */
+
+	/* Don't even have the MPA message.  Wait for more data to arrive. */
+	if (ep->mpa_pkt_len < sizeof(*mpa))
+		return;
+	mpa = (struct mpa_message *) ep->mpa_pkt;
+
+	/*
+	 * Validate MPA Header.
+	 */
+	if (mpa->revision > mpa_rev) {
+		log(LOG_ERR, "%s: MPA version mismatch. Local = %d,"
+		    " Received = %d\n", __func__, mpa_rev, mpa->revision);
+		goto abort;
+	}
+
+	if (memcmp(mpa->key, MPA_KEY_REQ, sizeof(mpa->key)))
+		goto abort;
+
+	/*
+	 * Fail if there's too much private data.
+	 */
+	plen = ntohs(mpa->private_data_size);
+	if (plen > MPA_MAX_PRIVATE_DATA)
+		goto abort;
+
+	/*
+	 * If plen does not account for pkt size
+	 */
+	if (ep->mpa_pkt_len > (sizeof(*mpa) + plen))
+		goto abort;
+
+	ep->plen = (u8) plen;
+
+	/*
+	 * If we don't have all the pdata yet, then bail.
+	 */
+	if (ep->mpa_pkt_len < (sizeof(*mpa) + plen))
+		return;
+
+	/*
+	 * If we get here we have accumulated the entire mpa
+	 * start reply message including private data.
+	 */
+	ep->mpa_attr.initiator = 0;
+	ep->mpa_attr.crc_enabled = (mpa->flags & MPA_CRC) | crc_enabled ? 1 : 0;
+	ep->mpa_attr.recv_marker_enabled = markers_enabled;
+	ep->mpa_attr.xmit_marker_enabled = mpa->flags & MPA_MARKERS ? 1 : 0;
+	ep->mpa_attr.version = mpa->revision;
+	if (mpa->revision == 1)
+		ep->tried_with_mpa_v1 = 1;
+	ep->mpa_attr.p2p_type = FW_RI_INIT_P2PTYPE_DISABLED;
+
+	if (mpa->revision == 2) {
+		ep->mpa_attr.enhanced_rdma_conn =
+		    mpa->flags & MPA_ENHANCED_RDMA_CONN ? 1 : 0;
+		if (ep->mpa_attr.enhanced_rdma_conn) {
+			struct mpa_v2_conn_params *mpa_v2_params;
+			u16 ird, ord;
+
+			mpa_v2_params = (void *)&ep->mpa_pkt[sizeof(*mpa)];
+			ird = ntohs(mpa_v2_params->ird);
+			ord = ntohs(mpa_v2_params->ord);
+
+			ep->ird = ird & MPA_V2_IRD_ORD_MASK;
+			ep->ord = ord & MPA_V2_IRD_ORD_MASK;
+			if (ird & MPA_V2_PEER2PEER_MODEL && peer2peer) {
+				if (ord & MPA_V2_RDMA_WRITE_RTR) {
+					ep->mpa_attr.p2p_type =
+					    FW_RI_INIT_P2PTYPE_RDMA_WRITE;
+				} else if (ord & MPA_V2_RDMA_READ_RTR) {
+					ep->mpa_attr.p2p_type =
+					    FW_RI_INIT_P2PTYPE_READ_REQ;
+				}
+			}
+		}
+	} else if (mpa->revision == 1 && peer2peer)
+		ep->mpa_attr.p2p_type = p2p_type;
+
+	if (set_tcpinfo(ep))
+		goto abort;
+
+	CTR5(KTR_IW_CXGBE, "%s: crc_enabled = %d, recv_marker_enabled = %d, "
+	    "xmit_marker_enabled = %d, version = %d", __func__,
+	    ep->mpa_attr.crc_enabled, ep->mpa_attr.recv_marker_enabled,
+	    ep->mpa_attr.xmit_marker_enabled, ep->mpa_attr.version);
+
+	state_set(&ep->com, MPA_REQ_RCVD);
+	STOP_EP_TIMER(ep);
+
+	/* drive upcall */
+	mutex_lock(&ep->parent_ep->com.mutex);
+	if (ep->parent_ep->com.state != DEAD)
+		connect_request_upcall(ep);
+	else
+		abort_connection(ep);
+	mutex_unlock(&ep->parent_ep->com.mutex);
+}
+
+/*
+ * Upcall from the adapter indicating data has been transmitted.
+ * For us its just the single MPA request or reply.  We can now free
+ * the skb holding the mpa message.
+ */
+int c4iw_reject_cr(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
+{
+	int err;
+	struct c4iw_ep *ep = to_ep(cm_id);
+	CTR2(KTR_IW_CXGBE, "%s:crcB %p", __func__, ep);
+
+	if (state_read(&ep->com) == DEAD) {
+
+		CTR2(KTR_IW_CXGBE, "%s:crc1 %p", __func__, ep);
+		c4iw_put_ep(&ep->com);
+		return -ECONNRESET;
+	}
+	set_bit(ULP_REJECT, &ep->com.history);
+	BUG_ON(state_read(&ep->com) != MPA_REQ_RCVD);
+
+	if (mpa_rev == 0) {
+
+		CTR2(KTR_IW_CXGBE, "%s:crc2 %p", __func__, ep);
+		abort_connection(ep);
+	}
+	else {
+
+		CTR2(KTR_IW_CXGBE, "%s:crc3 %p", __func__, ep);
+		err = send_mpa_reject(ep, pdata, pdata_len);
+		err = soshutdown(ep->com.so, 3);
+	}
+	c4iw_put_ep(&ep->com);
+	CTR2(KTR_IW_CXGBE, "%s:crc4 %p", __func__, ep);
+	return 0;
+}
+
+int c4iw_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+{
+	int err;
+	struct c4iw_qp_attributes attrs;
+	enum c4iw_qp_attr_mask mask;
+	struct c4iw_ep *ep = to_ep(cm_id);
+	struct c4iw_dev *h = to_c4iw_dev(cm_id->device);
+	struct c4iw_qp *qp = get_qhp(h, conn_param->qpn);
+
+	CTR2(KTR_IW_CXGBE, "%s:cacB %p", __func__, ep);
+
+	if (state_read(&ep->com) == DEAD) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cac1 %p", __func__, ep);
+		err = -ECONNRESET;
+		goto err;
+	}
+
+	BUG_ON(state_read(&ep->com) != MPA_REQ_RCVD);
+	BUG_ON(!qp);
+
+	set_bit(ULP_ACCEPT, &ep->com.history);
+
+	if ((conn_param->ord > c4iw_max_read_depth) ||
+		(conn_param->ird > c4iw_max_read_depth)) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cac2 %p", __func__, ep);
+		abort_connection(ep);
+		err = -EINVAL;
+		goto err;
+	}
+
+	if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cac3 %p", __func__, ep);
+
+		if (conn_param->ord > ep->ird) {
+
+			CTR2(KTR_IW_CXGBE, "%s:cac4 %p", __func__, ep);
+			ep->ird = conn_param->ird;
+			ep->ord = conn_param->ord;
+			send_mpa_reject(ep, conn_param->private_data,
+					conn_param->private_data_len);
+			abort_connection(ep);
+			err = -ENOMEM;
+			goto err;
+		}
+
+		if (conn_param->ird > ep->ord) {
+
+			CTR2(KTR_IW_CXGBE, "%s:cac5 %p", __func__, ep);
+
+			if (!ep->ord) {
+
+				CTR2(KTR_IW_CXGBE, "%s:cac6 %p", __func__, ep);
+				conn_param->ird = 1;
+			}
+			else {
+				CTR2(KTR_IW_CXGBE, "%s:cac7 %p", __func__, ep);
+				abort_connection(ep);
+				err = -ENOMEM;
+				goto err;
+			}
+		}
+
+	}
+	ep->ird = conn_param->ird;
+	ep->ord = conn_param->ord;
+
+	if (ep->mpa_attr.version != 2) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cac8 %p", __func__, ep);
+
+		if (peer2peer && ep->ird == 0) {
+
+			CTR2(KTR_IW_CXGBE, "%s:cac9 %p", __func__, ep);
+			ep->ird = 1;
+		}
+	}
+
+
+	cm_id->add_ref(cm_id);
+	ep->com.cm_id = cm_id;
+	ep->com.qp = qp;
+	//ep->ofld_txq = TOEPCB(ep->com.so)->ofld_txq;
+
+	/* bind QP to EP and move to RTS */
+	attrs.mpa_attr = ep->mpa_attr;
+	attrs.max_ird = ep->ird;
+	attrs.max_ord = ep->ord;
+	attrs.llp_stream_handle = ep;
+	attrs.next_state = C4IW_QP_STATE_RTS;
+
+	/* bind QP and TID with INIT_WR */
+	mask = C4IW_QP_ATTR_NEXT_STATE |
+		C4IW_QP_ATTR_LLP_STREAM_HANDLE |
+		C4IW_QP_ATTR_MPA_ATTR |
+		C4IW_QP_ATTR_MAX_IRD |
+		C4IW_QP_ATTR_MAX_ORD;
+
+	err = c4iw_modify_qp(ep->com.qp->rhp, ep->com.qp, mask, &attrs, 1);
+
+	if (err) {
+
+		CTR2(KTR_IW_CXGBE, "%s:caca %p", __func__, ep);
+		goto err1;
+	}
+	err = send_mpa_reply(ep, conn_param->private_data,
+			conn_param->private_data_len);
+
+	if (err) {
+
+		CTR2(KTR_IW_CXGBE, "%s:caca %p", __func__, ep);
+		goto err1;
+	}
+
+	state_set(&ep->com, FPDU_MODE);
+	established_upcall(ep);
+	c4iw_put_ep(&ep->com);
+	CTR2(KTR_IW_CXGBE, "%s:cacE %p", __func__, ep);
+	return 0;
+err1:
+	ep->com.cm_id = NULL;
+	ep->com.qp = NULL;
+	cm_id->rem_ref(cm_id);
+err:
+	c4iw_put_ep(&ep->com);
+	CTR2(KTR_IW_CXGBE, "%s:cacE err %p", __func__, ep);
+	return err;
+}
+
+
+
+int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
+{
+	int err = 0;
+	struct c4iw_dev *dev = to_c4iw_dev(cm_id->device);
+	struct c4iw_ep *ep = NULL;
+	struct rtentry *rt;
+	struct toedev *tdev;
+
+	CTR2(KTR_IW_CXGBE, "%s:ccB %p", __func__, cm_id);
+
+	if ((conn_param->ord > c4iw_max_read_depth) ||
+		(conn_param->ird > c4iw_max_read_depth)) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cc1 %p", __func__, cm_id);
+		err = -EINVAL;
+		goto out;
+	}
+	ep = alloc_ep(sizeof(*ep), M_NOWAIT);
+
+	if (!ep) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cc2 %p", __func__, cm_id);
+		printk(KERN_ERR MOD "%s - cannot alloc ep.\n", __func__);
+		err = -ENOMEM;
+		goto out;
+	}
+	init_timer(&ep->timer);
+	ep->plen = conn_param->private_data_len;
+
+	if (ep->plen) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cc3 %p", __func__, ep);
+		memcpy(ep->mpa_pkt + sizeof(struct mpa_message),
+				conn_param->private_data, ep->plen);
+	}
+	ep->ird = conn_param->ird;
+	ep->ord = conn_param->ord;
+
+	if (peer2peer && ep->ord == 0) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cc4 %p", __func__, ep);
+		ep->ord = 1;
+	}
+
+	cm_id->add_ref(cm_id);
+	ep->com.dev = dev;
+	ep->com.cm_id = cm_id;
+	ep->com.qp = get_qhp(dev, conn_param->qpn);
+
+	if (!ep->com.qp) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cc5 %p", __func__, ep);
+		err = -EINVAL;
+		goto fail2;
+	}
+	ep->com.thread = curthread;
+	ep->com.so = cm_id->so;
+
+	init_sock(&ep->com);
+
+	/* find a route */
+	rt = find_route(
+		cm_id->local_addr.sin_addr.s_addr,
+		cm_id->remote_addr.sin_addr.s_addr,
+		cm_id->local_addr.sin_port,
+		cm_id->remote_addr.sin_port, 0);
+
+	if (!rt) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cc7 %p", __func__, ep);
+		printk(KERN_ERR MOD "%s - cannot find route.\n", __func__);
+		err = -EHOSTUNREACH;
+		goto fail3;
+	}
+
+
+	if (!(rt->rt_ifp->if_flags & IFCAP_TOE)) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cc8 %p", __func__, ep);
+		printf("%s - interface not TOE capable.\n", __func__);
+		goto fail3;
+	}
+	tdev = TOEDEV(rt->rt_ifp);
+
+	if (tdev == NULL) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cc9 %p", __func__, ep);
+		printf("%s - No toedev for interface.\n", __func__);
+		goto fail3;
+	}
+	RTFREE(rt);
+
+	state_set(&ep->com, CONNECTING);
+	ep->tos = 0;
+	ep->com.local_addr = cm_id->local_addr;
+	ep->com.remote_addr = cm_id->remote_addr;
+	err = soconnect(ep->com.so, (struct sockaddr *)&ep->com.remote_addr,
+		ep->com.thread);
+
+	if (!err) {
+
+		CTR2(KTR_IW_CXGBE, "%s:cca %p", __func__, ep);
+		goto out;
+	}
+
+fail3:
+	CTR2(KTR_IW_CXGBE, "%s:ccb %p", __func__, ep);
+	RTFREE(rt);
+fail2:
+	cm_id->rem_ref(cm_id);
+	c4iw_put_ep(&ep->com);
+out:
+	CTR2(KTR_IW_CXGBE, "%s:ccE %p", __func__, ep);
+	return err;
+}
+
+/*
+ * iwcm->create_listen.  Returns -errno on failure.
+ */
+int
+c4iw_create_listen(struct iw_cm_id *cm_id, int backlog)
+{
+	int rc;
+	struct c4iw_dev *dev = to_c4iw_dev(cm_id->device);
+	struct c4iw_listen_ep *ep;
+	struct socket *so = cm_id->so;
+
+	ep = alloc_ep(sizeof(*ep), GFP_KERNEL);
+	CTR5(KTR_IW_CXGBE, "%s: cm_id %p, lso %p, ep %p, inp %p", __func__,
+	    cm_id, so, ep, so->so_pcb);
+	if (ep == NULL) {
+		log(LOG_ERR, "%s: failed to alloc memory for endpoint\n",
+		    __func__);
+		rc = ENOMEM;
+		goto failed;
+	}
+
+	cm_id->add_ref(cm_id);
+	ep->com.cm_id = cm_id;
+	ep->com.dev = dev;
+	ep->backlog = backlog;
+	ep->com.local_addr = cm_id->local_addr;
+	ep->com.thread = curthread;
+	state_set(&ep->com, LISTEN);
+	ep->com.so = so;
+	init_sock(&ep->com);
+
+	rc = solisten(so, ep->backlog, ep->com.thread);
+	if (rc != 0) {
+		log(LOG_ERR, "%s: failed to start listener: %d\n", __func__,
+		    rc);
+		close_socket(&ep->com, 0);
+		cm_id->rem_ref(cm_id);
+		c4iw_put_ep(&ep->com);
+		goto failed;
+	}
+
+	cm_id->provider_data = ep;
+	return (0);
+
+failed:
+	CTR3(KTR_IW_CXGBE, "%s: cm_id %p, FAILED (%d)", __func__, cm_id, rc);
+	return (-rc);
+}
+
+int
+c4iw_destroy_listen(struct iw_cm_id *cm_id)
+{
+	int rc;
+	struct c4iw_listen_ep *ep = to_listen_ep(cm_id);
+
+	CTR4(KTR_IW_CXGBE, "%s: cm_id %p, so %p, inp %p", __func__, cm_id,
+	    cm_id->so, cm_id->so->so_pcb);
+
+	state_set(&ep->com, DEAD);
+	rc = close_socket(&ep->com, 0);
+	cm_id->rem_ref(cm_id);
+	c4iw_put_ep(&ep->com);
+
+	return (rc);
+}
+
+int c4iw_ep_disconnect(struct c4iw_ep *ep, int abrupt, gfp_t gfp)
+{
+	int ret = 0;
+	int close = 0;
+	int fatal = 0;
+	struct c4iw_rdev *rdev;
+
+	mutex_lock(&ep->com.mutex);
+
+	CTR2(KTR_IW_CXGBE, "%s:cedB %p", __func__, ep);
+
+	rdev = &ep->com.dev->rdev;
+
+	if (c4iw_fatal_error(rdev)) {
+
+		CTR2(KTR_IW_CXGBE, "%s:ced1 %p", __func__, ep);
+		fatal = 1;
+		close_complete_upcall(ep);
+		ep->com.state = DEAD;
+	}
+	CTR3(KTR_IW_CXGBE, "%s:ced2 %p %s", __func__, ep,
+	    states[ep->com.state]);
+
+	switch (ep->com.state) {
+
+		case MPA_REQ_WAIT:
+		case MPA_REQ_SENT:
+		case MPA_REQ_RCVD:
+		case MPA_REP_SENT:
+		case FPDU_MODE:
+			close = 1;
+			if (abrupt)
+				ep->com.state = ABORTING;
+			else {
+				ep->com.state = CLOSING;
+				START_EP_TIMER(ep);
+			}
+			set_bit(CLOSE_SENT, &ep->com.flags);
+			break;
+
+		case CLOSING:
+
+			if (!test_and_set_bit(CLOSE_SENT, &ep->com.flags)) {
+
+				close = 1;
+				if (abrupt) {
+					STOP_EP_TIMER(ep);
+					ep->com.state = ABORTING;
+				} else
+					ep->com.state = MORIBUND;
+			}
+			break;
+
+		case MORIBUND:
+		case ABORTING:
+		case DEAD:
+			CTR3(KTR_IW_CXGBE,
+			    "%s ignoring disconnect ep %p state %u", __func__,
+			    ep, ep->com.state);
+			break;
+
+		default:
+			BUG();
+			break;
+	}
+
+	mutex_unlock(&ep->com.mutex);
+
+	if (close) {
+
+		CTR2(KTR_IW_CXGBE, "%s:ced3 %p", __func__, ep);
+
+		if (abrupt) {
+
+			CTR2(KTR_IW_CXGBE, "%s:ced4 %p", __func__, ep);
+			set_bit(EP_DISC_ABORT, &ep->com.history);
+			ret = abort_connection(ep);
+		} else {
+
+			CTR2(KTR_IW_CXGBE, "%s:ced5 %p", __func__, ep);
+			set_bit(EP_DISC_CLOSE, &ep->com.history);
+
+			if (!ep->parent_ep)
+				__state_set(&ep->com, MORIBUND);
+			ret = shutdown_socket(&ep->com);
+		}
+
+		if (ret) {
+
+			fatal = 1;
+		}
+	}
+
+	if (fatal) {
+
+		release_ep_resources(ep);
+		CTR2(KTR_IW_CXGBE, "%s:ced6 %p", __func__, ep);
+	}
+	CTR2(KTR_IW_CXGBE, "%s:cedE %p", __func__, ep);
+	return ret;
+}
+
+#ifdef C4IW_EP_REDIRECT
+int c4iw_ep_redirect(void *ctx, struct dst_entry *old, struct dst_entry *new,
+		struct l2t_entry *l2t)
+{
+	struct c4iw_ep *ep = ctx;
+
+	if (ep->dst != old)
+		return 0;
+
+	PDBG("%s ep %p redirect to dst %p l2t %p\n", __func__, ep, new,
+			l2t);
+	dst_hold(new);
+	cxgb4_l2t_release(ep->l2t);
+	ep->l2t = l2t;
+	dst_release(old);
+	ep->dst = new;
+	return 1;
+}
+#endif
+
+
+
+static void ep_timeout(unsigned long arg)
+{
+	struct c4iw_ep *ep = (struct c4iw_ep *)arg;
+	int kickit = 0;
+
+	CTR2(KTR_IW_CXGBE, "%s:etB %p", __func__, ep);
+	spin_lock(&timeout_lock);
+
+	if (!test_and_set_bit(TIMEOUT, &ep->com.flags)) {
+
+		list_add_tail(&ep->entry, &timeout_list);
+		kickit = 1;
+	}
+	spin_unlock(&timeout_lock);
+
+	if (kickit) {
+
+		CTR2(KTR_IW_CXGBE, "%s:et1 %p", __func__, ep);
+		queue_work(c4iw_taskq, &c4iw_task);
+	}
+	CTR2(KTR_IW_CXGBE, "%s:etE %p", __func__, ep);
+}
+
+static int fw6_wr_rpl(struct adapter *sc, const __be64 *rpl)
+{
+	uint64_t val = be64toh(*rpl);
+	int ret;
+	struct c4iw_wr_wait *wr_waitp;
+
+	ret = (int)((val >> 8) & 0xff);
+	wr_waitp = (struct c4iw_wr_wait *)rpl[1];
+	CTR3(KTR_IW_CXGBE, "%s wr_waitp %p ret %u", __func__, wr_waitp, ret);
+	if (wr_waitp)
+		c4iw_wake_up(wr_waitp, ret ? -ret : 0);
+
+	return (0);
+}
+
+static int fw6_cqe_handler(struct adapter *sc, const __be64 *rpl)
+{
+	struct t4_cqe cqe =*(const struct t4_cqe *)(&rpl[0]);
+
+	CTR2(KTR_IW_CXGBE, "%s rpl %p", __func__, rpl);
+	c4iw_ev_dispatch(sc->iwarp_softc, &cqe);
+
+	return (0);
+}
+
+static int terminate(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m)
+{
+
+	struct adapter *sc = iq->adapter;
+
+	const struct cpl_rdma_terminate *rpl = (const void *)(rss + 1);
+	unsigned int tid = GET_TID(rpl);
+	struct c4iw_qp_attributes attrs;
+	struct toepcb *toep = lookup_tid(sc, tid);
+	struct socket *so = inp_inpcbtosocket(toep->inp);
+	struct c4iw_ep *ep = so->so_rcv.sb_upcallarg;
+
+	CTR2(KTR_IW_CXGBE, "%s:tB %p %d", __func__, ep);
+
+	if (ep && ep->com.qp) {
+
+		printk(KERN_WARNING MOD "TERM received tid %u qpid %u\n", tid,
+				ep->com.qp->wq.sq.qid);
+		attrs.next_state = C4IW_QP_STATE_TERMINATE;
+		c4iw_modify_qp(ep->com.dev, ep->com.qp, C4IW_QP_ATTR_NEXT_STATE, &attrs,
+				1);
+	} else
+		printk(KERN_WARNING MOD "TERM received tid %u no ep/qp\n", tid);
+	CTR2(KTR_IW_CXGBE, "%s:tE %p %d", __func__, ep);
+
+	return 0;
+}
+
+	void
+c4iw_cm_init_cpl(struct adapter *sc)
+{
+
+	t4_register_cpl_handler(sc, CPL_RDMA_TERMINATE, terminate);
+	t4_register_fw_msg_handler(sc, FW6_TYPE_WR_RPL, fw6_wr_rpl);
+	t4_register_fw_msg_handler(sc, FW6_TYPE_CQE, fw6_cqe_handler);
+	t4_register_an_handler(sc, c4iw_ev_handler);
+}
+
+	void
+c4iw_cm_term_cpl(struct adapter *sc)
+{
+
+	t4_register_cpl_handler(sc, CPL_RDMA_TERMINATE, NULL);
+	t4_register_fw_msg_handler(sc, FW6_TYPE_WR_RPL, NULL);
+	t4_register_fw_msg_handler(sc, FW6_TYPE_CQE, NULL);
+}
+
+int __init c4iw_cm_init(void)
+{
+
+	TAILQ_INIT(&req_list);
+	spin_lock_init(&req_lock);
+	INIT_LIST_HEAD(&timeout_list);
+	spin_lock_init(&timeout_lock);
+
+	INIT_WORK(&c4iw_task, process_req);
+
+	c4iw_taskq = create_singlethread_workqueue("iw_cxgbe");
+	if (!c4iw_taskq)
+		return -ENOMEM;
+
+
+	return 0;
+}
+
+void __exit c4iw_cm_term(void)
+{
+	WARN_ON(!TAILQ_EMPTY(&req_list));
+	WARN_ON(!list_empty(&timeout_list));
+	flush_workqueue(c4iw_taskq);
+	destroy_workqueue(c4iw_taskq);
+}
+#endif
diff --git a/sys/dev/cxgbe/iw_cxgbe/cq.c b/sys/dev/cxgbe/iw_cxgbe/cq.c
new file mode 100644
index 00000000000..ec72a6c7b75
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/cq.c
@@ -0,0 +1,926 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+
+#ifdef TCP_OFFLOAD
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/bus.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/rwlock.h>
+#include <sys/socket.h>
+#include <sys/sbuf.h>
+
+#include "iw_cxgbe.h"
+#include "user.h"
+
+static int destroy_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
+		      struct c4iw_dev_ucontext *uctx)
+{
+	struct adapter *sc = rdev->adap;
+	struct fw_ri_res_wr *res_wr;
+	struct fw_ri_res *res;
+	int wr_len;
+	struct c4iw_wr_wait wr_wait;
+	struct wrqe *wr;
+
+	wr_len = sizeof *res_wr + sizeof *res;
+	wr = alloc_wrqe(wr_len, &sc->sge.mgmtq);
+                if (wr == NULL)
+                        return (0);
+        res_wr = wrtod(wr);
+	memset(res_wr, 0, wr_len);
+	res_wr->op_nres = cpu_to_be32(
+			V_FW_WR_OP(FW_RI_RES_WR) |
+			V_FW_RI_RES_WR_NRES(1) |
+			F_FW_WR_COMPL);
+	res_wr->len16_pkd = cpu_to_be32(DIV_ROUND_UP(wr_len, 16));
+	res_wr->cookie = (unsigned long) &wr_wait;
+	res = res_wr->res;
+	res->u.cq.restype = FW_RI_RES_TYPE_CQ;
+	res->u.cq.op = FW_RI_RES_OP_RESET;
+	res->u.cq.iqid = cpu_to_be32(cq->cqid);
+
+	c4iw_init_wr_wait(&wr_wait);
+
+	t4_wrq_tx(sc, wr);
+
+	c4iw_wait_for_reply(rdev, &wr_wait, 0, 0, __func__);
+
+	kfree(cq->sw_queue);
+	contigfree(cq->queue, cq->memsize, M_DEVBUF);
+	c4iw_put_cqid(rdev, cq->cqid, uctx);
+	return 0;
+}
+
+static int
+create_cq(struct c4iw_rdev *rdev, struct t4_cq *cq,
+    struct c4iw_dev_ucontext *uctx)
+{
+	struct adapter *sc = rdev->adap;
+	struct fw_ri_res_wr *res_wr;
+	struct fw_ri_res *res;
+	int wr_len;
+	int user = (uctx != &rdev->uctx);
+	struct c4iw_wr_wait wr_wait;
+	int ret;
+	struct wrqe *wr;
+
+	cq->cqid = c4iw_get_cqid(rdev, uctx);
+	if (!cq->cqid) {
+		ret = -ENOMEM;
+		goto err1;
+	}
+
+	if (!user) {
+		cq->sw_queue = kzalloc(cq->memsize, GFP_KERNEL);
+		if (!cq->sw_queue) {
+			ret = -ENOMEM;
+			goto err2;
+		}
+	}
+
+	cq->queue = contigmalloc(cq->memsize, M_DEVBUF, M_NOWAIT, 0ul, ~0ul,
+	    PAGE_SIZE, 0);
+        if (cq->queue)
+                cq->dma_addr = vtophys(cq->queue);
+        else {
+		ret = -ENOMEM;
+                goto err3;
+	}
+
+	pci_unmap_addr_set(cq, mapping, cq->dma_addr);
+	memset(cq->queue, 0, cq->memsize);
+
+	/* build fw_ri_res_wr */
+	wr_len = sizeof *res_wr + sizeof *res;
+
+	wr = alloc_wrqe(wr_len, &sc->sge.mgmtq);
+	if (wr == NULL)
+        	return (0);
+        res_wr = wrtod(wr);
+
+	memset(res_wr, 0, wr_len);
+	res_wr->op_nres = cpu_to_be32(
+			V_FW_WR_OP(FW_RI_RES_WR) |
+			V_FW_RI_RES_WR_NRES(1) |
+			F_FW_WR_COMPL);
+	res_wr->len16_pkd = cpu_to_be32(DIV_ROUND_UP(wr_len, 16));
+	res_wr->cookie = (unsigned long) &wr_wait;
+	res = res_wr->res;
+	res->u.cq.restype = FW_RI_RES_TYPE_CQ;
+	res->u.cq.op = FW_RI_RES_OP_WRITE;
+	res->u.cq.iqid = cpu_to_be32(cq->cqid);
+	//Fixme: Always use first queue id for IQANDSTINDEX. Linux does the same.
+	res->u.cq.iqandst_to_iqandstindex = cpu_to_be32(
+			V_FW_RI_RES_WR_IQANUS(0) |
+			V_FW_RI_RES_WR_IQANUD(1) |
+			F_FW_RI_RES_WR_IQANDST |
+			V_FW_RI_RES_WR_IQANDSTINDEX(sc->sge.ofld_rxq[0].iq.abs_id));
+	res->u.cq.iqdroprss_to_iqesize = cpu_to_be16(
+			F_FW_RI_RES_WR_IQDROPRSS |
+			V_FW_RI_RES_WR_IQPCIECH(2) |
+			V_FW_RI_RES_WR_IQINTCNTTHRESH(0) |
+			F_FW_RI_RES_WR_IQO |
+			V_FW_RI_RES_WR_IQESIZE(1));
+	res->u.cq.iqsize = cpu_to_be16(cq->size);
+	res->u.cq.iqaddr = cpu_to_be64(cq->dma_addr);
+
+	c4iw_init_wr_wait(&wr_wait);
+
+	t4_wrq_tx(sc, wr);
+
+	CTR2(KTR_IW_CXGBE, "%s wait_event wr_wait %p", __func__, &wr_wait);
+	ret = c4iw_wait_for_reply(rdev, &wr_wait, 0, 0, __func__);
+	if (ret)
+		goto err4;
+
+	cq->gen = 1;
+	cq->gts = (void *)((unsigned long)rman_get_virtual(sc->regs_res) +
+	    MYPF_REG(SGE_PF_GTS));
+	cq->rdev = rdev;
+
+	if (user) {
+		cq->ugts = (u64)((char*)rman_get_virtual(sc->udbs_res) +
+		    (cq->cqid << rdev->cqshift));
+		cq->ugts &= PAGE_MASK;
+		CTR5(KTR_IW_CXGBE,
+		    "%s: UGTS %p cqid %x cqshift %d page_mask %x", __func__,
+		    cq->ugts, cq->cqid, rdev->cqshift, PAGE_MASK);
+	}
+	return 0;
+err4:
+	contigfree(cq->queue, cq->memsize, M_DEVBUF);
+err3:
+	kfree(cq->sw_queue);
+err2:
+	c4iw_put_cqid(rdev, cq->cqid, uctx);
+err1:
+	return ret;
+}
+
+static void insert_recv_cqe(struct t4_wq *wq, struct t4_cq *cq)
+{
+	struct t4_cqe cqe;
+
+	CTR5(KTR_IW_CXGBE, "%s wq %p cq %p sw_cidx %u sw_pidx %u", __func__, wq,
+	    cq, cq->sw_cidx, cq->sw_pidx);
+	memset(&cqe, 0, sizeof(cqe));
+	cqe.header = cpu_to_be32(V_CQE_STATUS(T4_ERR_SWFLUSH) |
+				 V_CQE_OPCODE(FW_RI_SEND) |
+				 V_CQE_TYPE(0) |
+				 V_CQE_SWCQE(1) |
+				 V_CQE_QPID(wq->sq.qid));
+	cqe.bits_type_ts = cpu_to_be64(V_CQE_GENBIT((u64)cq->gen));
+	cq->sw_queue[cq->sw_pidx] = cqe;
+	t4_swcq_produce(cq);
+}
+
+int c4iw_flush_rq(struct t4_wq *wq, struct t4_cq *cq, int count)
+{
+	int flushed = 0;
+	int in_use = wq->rq.in_use - count;
+
+	BUG_ON(in_use < 0);
+	CTR5(KTR_IW_CXGBE, "%s wq %p cq %p rq.in_use %u skip count %u",
+	    __func__, wq, cq, wq->rq.in_use, count);
+	while (in_use--) {
+		insert_recv_cqe(wq, cq);
+		flushed++;
+	}
+	return flushed;
+}
+
+static void insert_sq_cqe(struct t4_wq *wq, struct t4_cq *cq,
+			  struct t4_swsqe *swcqe)
+{
+	struct t4_cqe cqe;
+
+	CTR5(KTR_IW_CXGBE, "%s wq %p cq %p sw_cidx %u sw_pidx %u", __func__, wq,
+	    cq, cq->sw_cidx, cq->sw_pidx);
+	memset(&cqe, 0, sizeof(cqe));
+	cqe.header = cpu_to_be32(V_CQE_STATUS(T4_ERR_SWFLUSH) |
+				 V_CQE_OPCODE(swcqe->opcode) |
+				 V_CQE_TYPE(1) |
+				 V_CQE_SWCQE(1) |
+				 V_CQE_QPID(wq->sq.qid));
+	CQE_WRID_SQ_IDX(&cqe) = swcqe->idx;
+	cqe.bits_type_ts = cpu_to_be64(V_CQE_GENBIT((u64)cq->gen));
+	cq->sw_queue[cq->sw_pidx] = cqe;
+	t4_swcq_produce(cq);
+}
+
+int c4iw_flush_sq(struct t4_wq *wq, struct t4_cq *cq, int count)
+{
+	int flushed = 0;
+	struct t4_swsqe *swsqe = &wq->sq.sw_sq[wq->sq.cidx + count];
+	int in_use = wq->sq.in_use - count;
+
+	BUG_ON(in_use < 0);
+	while (in_use--) {
+		swsqe->signaled = 0;
+		insert_sq_cqe(wq, cq, swsqe);
+		swsqe++;
+		if (swsqe == (wq->sq.sw_sq + wq->sq.size))
+			swsqe = wq->sq.sw_sq;
+		flushed++;
+	}
+	return flushed;
+}
+
+/*
+ * Move all CQEs from the HWCQ into the SWCQ.
+ */
+void c4iw_flush_hw_cq(struct t4_cq *cq)
+{
+	struct t4_cqe *cqe = NULL, *swcqe;
+	int ret;
+
+	CTR3(KTR_IW_CXGBE, "%s cq %p cqid 0x%x", __func__, cq, cq->cqid);
+	ret = t4_next_hw_cqe(cq, &cqe);
+	while (!ret) {
+		CTR3(KTR_IW_CXGBE, "%s flushing hwcq cidx 0x%x swcq pidx 0x%x",
+		    __func__, cq->cidx, cq->sw_pidx);
+		swcqe = &cq->sw_queue[cq->sw_pidx];
+		*swcqe = *cqe;
+		swcqe->header |= cpu_to_be32(V_CQE_SWCQE(1));
+		t4_swcq_produce(cq);
+		t4_hwcq_consume(cq);
+		ret = t4_next_hw_cqe(cq, &cqe);
+	}
+}
+
+static int cqe_completes_wr(struct t4_cqe *cqe, struct t4_wq *wq)
+{
+	if (CQE_OPCODE(cqe) == FW_RI_TERMINATE)
+		return 0;
+
+	if ((CQE_OPCODE(cqe) == FW_RI_RDMA_WRITE) && RQ_TYPE(cqe))
+		return 0;
+
+	if ((CQE_OPCODE(cqe) == FW_RI_READ_RESP) && SQ_TYPE(cqe))
+		return 0;
+
+	if (CQE_SEND_OPCODE(cqe) && RQ_TYPE(cqe) && t4_rq_empty(wq))
+		return 0;
+	return 1;
+}
+
+void c4iw_count_scqes(struct t4_cq *cq, struct t4_wq *wq, int *count)
+{
+	struct t4_cqe *cqe;
+	u32 ptr;
+
+	*count = 0;
+	ptr = cq->sw_cidx;
+	while (ptr != cq->sw_pidx) {
+		cqe = &cq->sw_queue[ptr];
+		if ((SQ_TYPE(cqe) || ((CQE_OPCODE(cqe) == FW_RI_READ_RESP) &&
+				      wq->sq.oldest_read)) &&
+		    (CQE_QPID(cqe) == wq->sq.qid))
+			(*count)++;
+		if (++ptr == cq->size)
+			ptr = 0;
+	}
+	CTR3(KTR_IW_CXGBE, "%s cq %p count %d", __func__, cq, *count);
+}
+
+void c4iw_count_rcqes(struct t4_cq *cq, struct t4_wq *wq, int *count)
+{
+	struct t4_cqe *cqe;
+	u32 ptr;
+
+	*count = 0;
+	CTR2(KTR_IW_CXGBE, "%s count zero %d", __func__, *count);
+	ptr = cq->sw_cidx;
+	while (ptr != cq->sw_pidx) {
+		cqe = &cq->sw_queue[ptr];
+		if (RQ_TYPE(cqe) && (CQE_OPCODE(cqe) != FW_RI_READ_RESP) &&
+		    (CQE_QPID(cqe) == wq->sq.qid) && cqe_completes_wr(cqe, wq))
+			(*count)++;
+		if (++ptr == cq->size)
+			ptr = 0;
+	}
+	CTR3(KTR_IW_CXGBE, "%s cq %p count %d", __func__, cq, *count);
+}
+
+static void flush_completed_wrs(struct t4_wq *wq, struct t4_cq *cq)
+{
+	struct t4_swsqe *swsqe;
+	u16 ptr = wq->sq.cidx;
+	int count = wq->sq.in_use;
+	int unsignaled = 0;
+
+	swsqe = &wq->sq.sw_sq[ptr];
+	while (count--)
+		if (!swsqe->signaled) {
+			if (++ptr == wq->sq.size)
+				ptr = 0;
+			swsqe = &wq->sq.sw_sq[ptr];
+			unsignaled++;
+		} else if (swsqe->complete) {
+
+			/*
+			 * Insert this completed cqe into the swcq.
+			 */
+			CTR3(KTR_IW_CXGBE,
+			    "%s moving cqe into swcq sq idx %u cq idx %u",
+			    __func__, ptr, cq->sw_pidx);
+			swsqe->cqe.header |= htonl(V_CQE_SWCQE(1));
+			cq->sw_queue[cq->sw_pidx] = swsqe->cqe;
+			t4_swcq_produce(cq);
+			swsqe->signaled = 0;
+			wq->sq.in_use -= unsignaled;
+			break;
+		} else
+			break;
+}
+
+static void create_read_req_cqe(struct t4_wq *wq, struct t4_cqe *hw_cqe,
+				struct t4_cqe *read_cqe)
+{
+	read_cqe->u.scqe.cidx = wq->sq.oldest_read->idx;
+	read_cqe->len = cpu_to_be32(wq->sq.oldest_read->read_len);
+	read_cqe->header = htonl(V_CQE_QPID(CQE_QPID(hw_cqe)) |
+				 V_CQE_SWCQE(SW_CQE(hw_cqe)) |
+				 V_CQE_OPCODE(FW_RI_READ_REQ) |
+				 V_CQE_TYPE(1));
+	read_cqe->bits_type_ts = hw_cqe->bits_type_ts;
+}
+
+/*
+ * Return a ptr to the next read wr in the SWSQ or NULL.
+ */
+static void advance_oldest_read(struct t4_wq *wq)
+{
+
+	u32 rptr = wq->sq.oldest_read - wq->sq.sw_sq + 1;
+
+	if (rptr == wq->sq.size)
+		rptr = 0;
+	while (rptr != wq->sq.pidx) {
+		wq->sq.oldest_read = &wq->sq.sw_sq[rptr];
+
+		if (wq->sq.oldest_read->opcode == FW_RI_READ_REQ)
+			return;
+		if (++rptr == wq->sq.size)
+			rptr = 0;
+	}
+	wq->sq.oldest_read = NULL;
+}
+
+/*
+ * poll_cq
+ *
+ * Caller must:
+ *     check the validity of the first CQE,
+ *     supply the wq assicated with the qpid.
+ *
+ * credit: cq credit to return to sge.
+ * cqe_flushed: 1 iff the CQE is flushed.
+ * cqe: copy of the polled CQE.
+ *
+ * return value:
+ *    0		    CQE returned ok.
+ *    -EAGAIN       CQE skipped, try again.
+ *    -EOVERFLOW    CQ overflow detected.
+ */
+static int poll_cq(struct t4_wq *wq, struct t4_cq *cq, struct t4_cqe *cqe,
+		   u8 *cqe_flushed, u64 *cookie, u32 *credit)
+{
+	int ret = 0;
+	struct t4_cqe *hw_cqe, read_cqe;
+
+	*cqe_flushed = 0;
+	*credit = 0;
+	ret = t4_next_cqe(cq, &hw_cqe);
+	if (ret)
+		return ret;
+
+	CTR6(KTR_IW_CXGBE,
+	    "%s CQE OVF %u qpid 0x%0x genbit %u type %u status 0x%0x", __func__,
+	    CQE_OVFBIT(hw_cqe), CQE_QPID(hw_cqe), CQE_GENBIT(hw_cqe),
+	    CQE_TYPE(hw_cqe), CQE_STATUS(hw_cqe));
+	CTR5(KTR_IW_CXGBE,
+	    "%s opcode 0x%0x len 0x%0x wrid_hi_stag 0x%x wrid_low_msn 0x%x",
+	    __func__, CQE_OPCODE(hw_cqe), CQE_LEN(hw_cqe), CQE_WRID_HI(hw_cqe),
+	    CQE_WRID_LOW(hw_cqe));
+
+	/*
+	 * skip cqe's not affiliated with a QP.
+	 */
+	if (wq == NULL) {
+		ret = -EAGAIN;
+		goto skip_cqe;
+	}
+
+	/*
+	 * Gotta tweak READ completions:
+	 *	1) the cqe doesn't contain the sq_wptr from the wr.
+	 *	2) opcode not reflected from the wr.
+	 *	3) read_len not reflected from the wr.
+	 *	4) cq_type is RQ_TYPE not SQ_TYPE.
+	 */
+	if (RQ_TYPE(hw_cqe) && (CQE_OPCODE(hw_cqe) == FW_RI_READ_RESP)) {
+
+		/*
+		 * If this is an unsolicited read response, then the read
+		 * was generated by the kernel driver as part of peer-2-peer
+		 * connection setup.  So ignore the completion.
+		 */
+		if (!wq->sq.oldest_read) {
+			if (CQE_STATUS(hw_cqe))
+				t4_set_wq_in_error(wq);
+			ret = -EAGAIN;
+			goto skip_cqe;
+		}
+
+		/*
+		 * Don't write to the HWCQ, so create a new read req CQE
+		 * in local memory.
+		 */
+		create_read_req_cqe(wq, hw_cqe, &read_cqe);
+		hw_cqe = &read_cqe;
+		advance_oldest_read(wq);
+	}
+
+	if (CQE_STATUS(hw_cqe) || t4_wq_in_error(wq)) {
+		*cqe_flushed = t4_wq_in_error(wq);
+		t4_set_wq_in_error(wq);
+		goto proc_cqe;
+	}
+
+	if (CQE_OPCODE(hw_cqe) == FW_RI_TERMINATE) {
+		ret = -EAGAIN;
+		goto skip_cqe;
+	}
+
+	/*
+	 * RECV completion.
+	 */
+	if (RQ_TYPE(hw_cqe)) {
+
+		/*
+		 * HW only validates 4 bits of MSN.  So we must validate that
+		 * the MSN in the SEND is the next expected MSN.  If its not,
+		 * then we complete this with T4_ERR_MSN and mark the wq in
+		 * error.
+		 */
+
+		if (t4_rq_empty(wq)) {
+			t4_set_wq_in_error(wq);
+			ret = -EAGAIN;
+			goto skip_cqe;
+		}
+		if (unlikely((CQE_WRID_MSN(hw_cqe) != (wq->rq.msn)))) {
+			t4_set_wq_in_error(wq);
+			hw_cqe->header |= htonl(V_CQE_STATUS(T4_ERR_MSN));
+			goto proc_cqe;
+		}
+		goto proc_cqe;
+	}
+
+	/*
+	 * If we get here its a send completion.
+	 *
+	 * Handle out of order completion. These get stuffed
+	 * in the SW SQ. Then the SW SQ is walked to move any
+	 * now in-order completions into the SW CQ.  This handles
+	 * 2 cases:
+	 *	1) reaping unsignaled WRs when the first subsequent
+	 *	   signaled WR is completed.
+	 *	2) out of order read completions.
+	 */
+	if (!SW_CQE(hw_cqe) && (CQE_WRID_SQ_IDX(hw_cqe) != wq->sq.cidx)) {
+		struct t4_swsqe *swsqe;
+
+		CTR2(KTR_IW_CXGBE,
+		    "%s out of order completion going in sw_sq at idx %u",
+		    __func__, CQE_WRID_SQ_IDX(hw_cqe));
+		swsqe = &wq->sq.sw_sq[CQE_WRID_SQ_IDX(hw_cqe)];
+		swsqe->cqe = *hw_cqe;
+		swsqe->complete = 1;
+		ret = -EAGAIN;
+		goto flush_wq;
+	}
+
+proc_cqe:
+	*cqe = *hw_cqe;
+
+	/*
+	 * Reap the associated WR(s) that are freed up with this
+	 * completion.
+	 */
+	if (SQ_TYPE(hw_cqe)) {
+		wq->sq.cidx = CQE_WRID_SQ_IDX(hw_cqe);
+		CTR2(KTR_IW_CXGBE, "%s completing sq idx %u",
+		     __func__, wq->sq.cidx);
+		*cookie = wq->sq.sw_sq[wq->sq.cidx].wr_id;
+		t4_sq_consume(wq);
+	} else {
+		CTR2(KTR_IW_CXGBE, "%s completing rq idx %u",
+		     __func__, wq->rq.cidx);
+		*cookie = wq->rq.sw_rq[wq->rq.cidx].wr_id;
+		BUG_ON(t4_rq_empty(wq));
+		t4_rq_consume(wq);
+	}
+
+flush_wq:
+	/*
+	 * Flush any completed cqes that are now in-order.
+	 */
+	flush_completed_wrs(wq, cq);
+
+skip_cqe:
+	if (SW_CQE(hw_cqe)) {
+		CTR4(KTR_IW_CXGBE, "%s cq %p cqid 0x%x skip sw cqe cidx %u",
+		     __func__, cq, cq->cqid, cq->sw_cidx);
+		t4_swcq_consume(cq);
+	} else {
+		CTR4(KTR_IW_CXGBE, "%s cq %p cqid 0x%x skip hw cqe cidx %u",
+		     __func__, cq, cq->cqid, cq->cidx);
+		t4_hwcq_consume(cq);
+	}
+	return ret;
+}
+
+/*
+ * Get one cq entry from c4iw and map it to openib.
+ *
+ * Returns:
+ *	0			cqe returned
+ *	-ENODATA		EMPTY;
+ *	-EAGAIN			caller must try again
+ *	any other -errno	fatal error
+ */
+static int c4iw_poll_cq_one(struct c4iw_cq *chp, struct ib_wc *wc)
+{
+	struct c4iw_qp *qhp = NULL;
+	struct t4_cqe cqe = {0, 0}, *rd_cqe;
+	struct t4_wq *wq;
+	u32 credit = 0;
+	u8 cqe_flushed;
+	u64 cookie = 0;
+	int ret;
+
+	ret = t4_next_cqe(&chp->cq, &rd_cqe);
+
+	if (ret)
+		return ret;
+
+	qhp = get_qhp(chp->rhp, CQE_QPID(rd_cqe));
+	if (!qhp)
+		wq = NULL;
+	else {
+		spin_lock(&qhp->lock);
+		wq = &(qhp->wq);
+	}
+	ret = poll_cq(wq, &(chp->cq), &cqe, &cqe_flushed, &cookie, &credit);
+	if (ret)
+		goto out;
+
+	wc->wr_id = cookie;
+	wc->qp = &qhp->ibqp;
+	wc->vendor_err = CQE_STATUS(&cqe);
+	wc->wc_flags = 0;
+
+	CTR5(KTR_IW_CXGBE, "%s qpid 0x%x type %d opcode %d status 0x%x",
+	    __func__, CQE_QPID(&cqe), CQE_TYPE(&cqe), CQE_OPCODE(&cqe),
+	    CQE_STATUS(&cqe));
+	CTR5(KTR_IW_CXGBE, "%s len %u wrid hi 0x%x lo 0x%x cookie 0x%llx",
+	    __func__, CQE_LEN(&cqe), CQE_WRID_HI(&cqe), CQE_WRID_LOW(&cqe),
+	    (unsigned long long)cookie);
+
+	if (CQE_TYPE(&cqe) == 0) {
+		if (!CQE_STATUS(&cqe))
+			wc->byte_len = CQE_LEN(&cqe);
+		else
+			wc->byte_len = 0;
+		wc->opcode = IB_WC_RECV;
+		if (CQE_OPCODE(&cqe) == FW_RI_SEND_WITH_INV ||
+		    CQE_OPCODE(&cqe) == FW_RI_SEND_WITH_SE_INV) {
+			wc->ex.invalidate_rkey = CQE_WRID_STAG(&cqe);
+			wc->wc_flags |= IB_WC_WITH_INVALIDATE;
+		}
+	} else {
+		switch (CQE_OPCODE(&cqe)) {
+		case FW_RI_RDMA_WRITE:
+			wc->opcode = IB_WC_RDMA_WRITE;
+			break;
+		case FW_RI_READ_REQ:
+			wc->opcode = IB_WC_RDMA_READ;
+			wc->byte_len = CQE_LEN(&cqe);
+			break;
+		case FW_RI_SEND_WITH_INV:
+		case FW_RI_SEND_WITH_SE_INV:
+			wc->opcode = IB_WC_SEND;
+			wc->wc_flags |= IB_WC_WITH_INVALIDATE;
+			break;
+		case FW_RI_SEND:
+		case FW_RI_SEND_WITH_SE:
+			wc->opcode = IB_WC_SEND;
+			break;
+		case FW_RI_BIND_MW:
+			wc->opcode = IB_WC_BIND_MW;
+			break;
+
+		case FW_RI_LOCAL_INV:
+			wc->opcode = IB_WC_LOCAL_INV;
+			break;
+		case FW_RI_FAST_REGISTER:
+			wc->opcode = IB_WC_FAST_REG_MR;
+			break;
+		default:
+			printf("Unexpected opcode %d "
+			       "in the CQE received for QPID = 0x%0x\n",
+			       CQE_OPCODE(&cqe), CQE_QPID(&cqe));
+			ret = -EINVAL;
+			goto out;
+		}
+	}
+
+	if (cqe_flushed)
+		wc->status = IB_WC_WR_FLUSH_ERR;
+	else {
+
+		switch (CQE_STATUS(&cqe)) {
+		case T4_ERR_SUCCESS:
+			wc->status = IB_WC_SUCCESS;
+			break;
+		case T4_ERR_STAG:
+			wc->status = IB_WC_LOC_ACCESS_ERR;
+			break;
+		case T4_ERR_PDID:
+			wc->status = IB_WC_LOC_PROT_ERR;
+			break;
+		case T4_ERR_QPID:
+		case T4_ERR_ACCESS:
+			wc->status = IB_WC_LOC_ACCESS_ERR;
+			break;
+		case T4_ERR_WRAP:
+			wc->status = IB_WC_GENERAL_ERR;
+			break;
+		case T4_ERR_BOUND:
+			wc->status = IB_WC_LOC_LEN_ERR;
+			break;
+		case T4_ERR_INVALIDATE_SHARED_MR:
+		case T4_ERR_INVALIDATE_MR_WITH_MW_BOUND:
+			wc->status = IB_WC_MW_BIND_ERR;
+			break;
+		case T4_ERR_CRC:
+		case T4_ERR_MARKER:
+		case T4_ERR_PDU_LEN_ERR:
+		case T4_ERR_OUT_OF_RQE:
+		case T4_ERR_DDP_VERSION:
+		case T4_ERR_RDMA_VERSION:
+		case T4_ERR_DDP_QUEUE_NUM:
+		case T4_ERR_MSN:
+		case T4_ERR_TBIT:
+		case T4_ERR_MO:
+		case T4_ERR_MSN_RANGE:
+		case T4_ERR_IRD_OVERFLOW:
+		case T4_ERR_OPCODE:
+		case T4_ERR_INTERNAL_ERR:
+			wc->status = IB_WC_FATAL_ERR;
+			break;
+		case T4_ERR_SWFLUSH:
+			wc->status = IB_WC_WR_FLUSH_ERR;
+			break;
+		default:
+			printf("Unexpected cqe_status 0x%x for QPID = 0x%0x\n",
+			       CQE_STATUS(&cqe), CQE_QPID(&cqe));
+			ret = -EINVAL;
+		}
+	}
+out:
+	if (wq)
+		spin_unlock(&qhp->lock);
+	return ret;
+}
+
+int c4iw_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc)
+{
+	struct c4iw_cq *chp;
+	unsigned long flags;
+	int npolled;
+	int err = 0;
+
+	chp = to_c4iw_cq(ibcq);
+
+	spin_lock_irqsave(&chp->lock, flags);
+	for (npolled = 0; npolled < num_entries; ++npolled) {
+		do {
+			err = c4iw_poll_cq_one(chp, wc + npolled);
+		} while (err == -EAGAIN);
+		if (err)
+			break;
+	}
+	spin_unlock_irqrestore(&chp->lock, flags);
+	return !err || err == -ENODATA ? npolled : err;
+}
+
+int c4iw_destroy_cq(struct ib_cq *ib_cq)
+{
+	struct c4iw_cq *chp;
+	struct c4iw_ucontext *ucontext;
+
+	CTR2(KTR_IW_CXGBE, "%s ib_cq %p", __func__, ib_cq);
+	chp = to_c4iw_cq(ib_cq);
+
+	remove_handle(chp->rhp, &chp->rhp->cqidr, chp->cq.cqid);
+	atomic_dec(&chp->refcnt);
+	wait_event(chp->wait, !atomic_read(&chp->refcnt));
+
+	ucontext = ib_cq->uobject ? to_c4iw_ucontext(ib_cq->uobject->context)
+				  : NULL;
+	destroy_cq(&chp->rhp->rdev, &chp->cq,
+		   ucontext ? &ucontext->uctx : &chp->cq.rdev->uctx);
+	kfree(chp);
+	return 0;
+}
+
+struct ib_cq *
+c4iw_create_cq(struct ib_device *ibdev, int entries, int vector,
+    struct ib_ucontext *ib_context, struct ib_udata *udata)
+{
+	struct c4iw_dev *rhp;
+	struct c4iw_cq *chp;
+	struct c4iw_create_cq_resp uresp;
+	struct c4iw_ucontext *ucontext = NULL;
+	int ret;
+	size_t memsize, hwentries;
+	struct c4iw_mm_entry *mm, *mm2;
+
+	CTR3(KTR_IW_CXGBE, "%s ib_dev %p entries %d", __func__, ibdev, entries);
+
+	rhp = to_c4iw_dev(ibdev);
+
+	chp = kzalloc(sizeof(*chp), GFP_KERNEL);
+	if (!chp)
+		return ERR_PTR(-ENOMEM);
+
+	if (ib_context)
+		ucontext = to_c4iw_ucontext(ib_context);
+
+	/* account for the status page. */
+	entries++;
+
+	/* IQ needs one extra entry to differentiate full vs empty. */
+	entries++;
+
+	/*
+	 * entries must be multiple of 16 for HW.
+	 */
+	entries = roundup(entries, 16);
+
+	/*
+	 * Make actual HW queue 2x to avoid cidx_inc overflows.
+	 */
+	hwentries = entries * 2;
+
+	/*
+	 * Make HW queue at least 64 entries so GTS updates aren't too
+	 * frequent.
+	 */
+	if (hwentries < 64)
+		hwentries = 64;
+
+	memsize = hwentries * sizeof *chp->cq.queue;
+
+	/*
+	 * memsize must be a multiple of the page size if its a user cq.
+	 */
+	if (ucontext) {
+		memsize = roundup(memsize, PAGE_SIZE);
+		hwentries = memsize / sizeof *chp->cq.queue;
+		while (hwentries > T4_MAX_IQ_SIZE) {
+			memsize -= PAGE_SIZE;
+			hwentries = memsize / sizeof *chp->cq.queue;
+		}
+	}
+	chp->cq.size = hwentries;
+	chp->cq.memsize = memsize;
+
+	ret = create_cq(&rhp->rdev, &chp->cq,
+			ucontext ? &ucontext->uctx : &rhp->rdev.uctx);
+	if (ret)
+		goto err1;
+
+	chp->rhp = rhp;
+	chp->cq.size--;				/* status page */
+	chp->ibcq.cqe = entries - 2;
+	spin_lock_init(&chp->lock);
+	spin_lock_init(&chp->comp_handler_lock);
+	atomic_set(&chp->refcnt, 1);
+	init_waitqueue_head(&chp->wait);
+	ret = insert_handle(rhp, &rhp->cqidr, chp, chp->cq.cqid);
+	if (ret)
+		goto err2;
+
+	if (ucontext) {
+		mm = kmalloc(sizeof *mm, GFP_KERNEL);
+		if (!mm)
+			goto err3;
+		mm2 = kmalloc(sizeof *mm2, GFP_KERNEL);
+		if (!mm2)
+			goto err4;
+
+		uresp.qid_mask = rhp->rdev.cqmask;
+		uresp.cqid = chp->cq.cqid;
+		uresp.size = chp->cq.size;
+		uresp.memsize = chp->cq.memsize;
+		spin_lock(&ucontext->mmap_lock);
+		uresp.key = ucontext->key;
+		ucontext->key += PAGE_SIZE;
+		uresp.gts_key = ucontext->key;
+		ucontext->key += PAGE_SIZE;
+		spin_unlock(&ucontext->mmap_lock);
+		ret = ib_copy_to_udata(udata, &uresp, sizeof uresp);
+		if (ret)
+			goto err5;
+
+		mm->key = uresp.key;
+		mm->addr = vtophys(chp->cq.queue);
+		mm->len = chp->cq.memsize;
+		insert_mmap(ucontext, mm);
+
+		mm2->key = uresp.gts_key;
+		mm2->addr = chp->cq.ugts;
+		mm2->len = PAGE_SIZE;
+		insert_mmap(ucontext, mm2);
+	}
+	CTR6(KTR_IW_CXGBE,
+	    "%s cqid 0x%0x chp %p size %u memsize %zu, dma_addr 0x%0llx",
+	    __func__, chp->cq.cqid, chp, chp->cq.size, chp->cq.memsize,
+	    (unsigned long long) chp->cq.dma_addr);
+	return &chp->ibcq;
+err5:
+	kfree(mm2);
+err4:
+	kfree(mm);
+err3:
+	remove_handle(rhp, &rhp->cqidr, chp->cq.cqid);
+err2:
+	destroy_cq(&chp->rhp->rdev, &chp->cq,
+		   ucontext ? &ucontext->uctx : &rhp->rdev.uctx);
+err1:
+	kfree(chp);
+	return ERR_PTR(ret);
+}
+
+int c4iw_resize_cq(struct ib_cq *cq, int cqe, struct ib_udata *udata)
+{
+	return -ENOSYS;
+}
+
+int c4iw_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags)
+{
+	struct c4iw_cq *chp;
+	int ret;
+	unsigned long flag;
+
+	chp = to_c4iw_cq(ibcq);
+	spin_lock_irqsave(&chp->lock, flag);
+	ret = t4_arm_cq(&chp->cq,
+			(flags & IB_CQ_SOLICITED_MASK) == IB_CQ_SOLICITED);
+	spin_unlock_irqrestore(&chp->lock, flag);
+	if (ret && !(flags & IB_CQ_REPORT_MISSED_EVENTS))
+		ret = 0;
+	return ret;
+}
+#endif
diff --git a/sys/dev/cxgbe/iw_cxgbe/device.c b/sys/dev/cxgbe/iw_cxgbe/device.c
new file mode 100644
index 00000000000..adb283d8f71
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/device.c
@@ -0,0 +1,369 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+
+#include <sys/ktr.h>
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+
+#include <rdma/ib_verbs.h>
+#include <linux/idr.h>
+
+#ifdef TCP_OFFLOAD
+#include "iw_cxgbe.h"
+
+int spg_creds = 2; /* Default status page size is 2 credits = 128B */
+
+void
+c4iw_release_dev_ucontext(struct c4iw_rdev *rdev,
+    struct c4iw_dev_ucontext *uctx)
+{
+	struct list_head *pos, *nxt;
+	struct c4iw_qid_list *entry;
+
+	mutex_lock(&uctx->lock);
+	list_for_each_safe(pos, nxt, &uctx->qpids) {
+		entry = list_entry(pos, struct c4iw_qid_list, entry);
+		list_del_init(&entry->entry);
+		if (!(entry->qid & rdev->qpmask)) {
+			c4iw_put_resource(&rdev->resource.qid_table,
+					  entry->qid);
+			mutex_lock(&rdev->stats.lock);
+			rdev->stats.qid.cur -= rdev->qpmask + 1;
+			mutex_unlock(&rdev->stats.lock);
+		}
+		kfree(entry);
+	}
+
+	list_for_each_safe(pos, nxt, &uctx->qpids) {
+		entry = list_entry(pos, struct c4iw_qid_list, entry);
+		list_del_init(&entry->entry);
+		kfree(entry);
+	}
+	mutex_unlock(&uctx->lock);
+}
+
+void
+c4iw_init_dev_ucontext(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
+{
+
+	INIT_LIST_HEAD(&uctx->qpids);
+	INIT_LIST_HEAD(&uctx->cqids);
+	mutex_init(&uctx->lock);
+}
+
+static int
+c4iw_rdev_open(struct c4iw_rdev *rdev)
+{
+	struct adapter *sc = rdev->adap;
+	int rc;
+
+	c4iw_init_dev_ucontext(rdev, &rdev->uctx);
+
+	/* Save the status page size set by if_cxgbe */
+	spg_creds = (t4_read_reg(sc, A_SGE_CONTROL) & F_EGRSTATUSPAGESIZE) ?
+	    2 : 1;
+
+	/* XXX: we can probably make this work */
+	if (sc->sge.eq_s_qpp > PAGE_SHIFT || sc->sge.iq_s_qpp > PAGE_SHIFT) {
+		device_printf(sc->dev,
+		    "doorbell density too high (eq %d, iq %d, pg %d).\n",
+		    sc->sge.eq_s_qpp, sc->sge.eq_s_qpp, PAGE_SHIFT);
+		rc = -EINVAL;
+		goto err1;
+	}
+
+	rdev->qpshift = PAGE_SHIFT - sc->sge.eq_s_qpp;
+	rdev->qpmask = (1 << sc->sge.eq_s_qpp) - 1;
+	rdev->cqshift = PAGE_SHIFT - sc->sge.iq_s_qpp;
+	rdev->cqmask = (1 << sc->sge.iq_s_qpp) - 1;
+
+	if (c4iw_num_stags(rdev) == 0) {
+		rc = -EINVAL;
+		goto err1;
+	}
+
+	rdev->stats.pd.total = T4_MAX_NUM_PD;
+	rdev->stats.stag.total = sc->vres.stag.size;
+	rdev->stats.pbl.total = sc->vres.pbl.size;
+	rdev->stats.rqt.total = sc->vres.rq.size;
+	rdev->stats.qid.total = sc->vres.qp.size;
+
+	rc = c4iw_init_resource(rdev, c4iw_num_stags(rdev), T4_MAX_NUM_PD);
+	if (rc) {
+		device_printf(sc->dev, "error %d initializing resources\n", rc);
+		goto err1;
+	}
+	rc = c4iw_pblpool_create(rdev);
+	if (rc) {
+		device_printf(sc->dev, "error %d initializing pbl pool\n", rc);
+		goto err2;
+	}
+	rc = c4iw_rqtpool_create(rdev);
+	if (rc) {
+		device_printf(sc->dev, "error %d initializing rqt pool\n", rc);
+		goto err3;
+	}
+
+	return (0);
+err3:
+	c4iw_pblpool_destroy(rdev);
+err2:
+	c4iw_destroy_resource(&rdev->resource);
+err1:
+	return (rc);
+}
+
+static void c4iw_rdev_close(struct c4iw_rdev *rdev)
+{
+	c4iw_pblpool_destroy(rdev);
+	c4iw_rqtpool_destroy(rdev);
+	c4iw_destroy_resource(&rdev->resource);
+}
+
+static void
+c4iw_dealloc(struct c4iw_dev *iwsc)
+{
+
+	c4iw_rdev_close(&iwsc->rdev);
+	idr_destroy(&iwsc->cqidr);
+	idr_destroy(&iwsc->qpidr);
+	idr_destroy(&iwsc->mmidr);
+	ib_dealloc_device(&iwsc->ibdev);
+}
+
+static struct c4iw_dev *
+c4iw_alloc(struct adapter *sc)
+{
+	struct c4iw_dev *iwsc;
+	int rc;
+
+	iwsc = (struct c4iw_dev *)ib_alloc_device(sizeof(*iwsc));
+	if (iwsc == NULL) {
+		device_printf(sc->dev, "Cannot allocate ib device.\n");
+		return (ERR_PTR(-ENOMEM));
+	}
+	iwsc->rdev.adap = sc;
+
+	rc = c4iw_rdev_open(&iwsc->rdev);
+	if (rc != 0) {
+		device_printf(sc->dev, "Unable to open CXIO rdev (%d)\n", rc);
+		ib_dealloc_device(&iwsc->ibdev);
+		return (ERR_PTR(rc));
+	}
+
+	idr_init(&iwsc->cqidr);
+	idr_init(&iwsc->qpidr);
+	idr_init(&iwsc->mmidr);
+	spin_lock_init(&iwsc->lock);
+	mutex_init(&iwsc->rdev.stats.lock);
+
+	return (iwsc);
+}
+
+static int c4iw_mod_load(void);
+static int c4iw_mod_unload(void);
+static int c4iw_activate(struct adapter *);
+static int c4iw_deactivate(struct adapter *);
+
+static struct uld_info c4iw_uld_info = {
+	.uld_id = ULD_IWARP,
+	.activate = c4iw_activate,
+	.deactivate = c4iw_deactivate,
+};
+
+static int
+c4iw_activate(struct adapter *sc)
+{
+	struct c4iw_dev *iwsc;
+	int rc;
+
+	ASSERT_SYNCHRONIZED_OP(sc);
+
+	if (isset(&sc->offload_map, MAX_NPORTS)) {
+		KASSERT(0, ("%s: RDMA already eanbled on sc %p", __func__, sc));
+		return (0);
+	}
+
+	if (sc->rdmacaps == 0) {
+		device_printf(sc->dev,
+		    "RDMA not supported or RDMA cap is not enabled.\n");
+		return (ENOSYS);
+	}
+
+	iwsc = c4iw_alloc(sc);
+	if (IS_ERR(iwsc)) {
+		rc = -PTR_ERR(iwsc);
+		device_printf(sc->dev, "initialization failed: %d\n", rc);
+		return (rc);
+	}
+
+	sc->iwarp_softc = iwsc;
+	c4iw_cm_init_cpl(sc);
+
+	rc = -c4iw_register_device(iwsc);
+	if (rc) {
+		device_printf(sc->dev, "RDMA registration failed: %d\n", rc);
+		c4iw_dealloc(iwsc);
+		sc->iwarp_softc = NULL;
+	}
+
+	return (rc);
+}
+
+static int
+c4iw_deactivate(struct adapter *sc)
+{
+	struct c4iw_dev *iwsc = sc->iwarp_softc;
+
+	ASSERT_SYNCHRONIZED_OP(sc);
+
+	c4iw_unregister_device(iwsc);
+	c4iw_dealloc(iwsc);
+	sc->iwarp_softc = NULL;
+
+	return (0);
+}
+
+static void
+c4iw_activate_all(struct adapter *sc, void *arg __unused)
+{
+
+	if (begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4iwact") != 0)
+		return;
+
+	if (!isset(&sc->offload_map, MAX_NPORTS) &&
+	    t4_activate_uld(sc, ULD_IWARP) == 0)
+		setbit(&sc->offload_map, MAX_NPORTS);
+
+	end_synchronized_op(sc, 0);
+}
+
+static void
+c4iw_deactivate_all(struct adapter *sc, void *arg __unused)
+{
+
+	if (begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4iwdea") != 0)
+		return;
+
+	if (isset(&sc->offload_map, MAX_NPORTS) &&
+	    t4_deactivate_uld(sc, ULD_IWARP) == 0)
+		clrbit(&sc->offload_map, MAX_NPORTS);
+
+	end_synchronized_op(sc, 0);
+}
+
+static int
+c4iw_mod_load(void)
+{
+	int rc;
+
+	rc = -c4iw_cm_init();
+	if (rc != 0)
+		return (rc);
+
+	rc = t4_register_uld(&c4iw_uld_info);
+	if (rc != 0) {
+		c4iw_cm_term();
+		return (rc);
+	}
+
+	t4_iterate(c4iw_activate_all, NULL);
+
+	return (rc);
+}
+
+static int
+c4iw_mod_unload(void)
+{
+
+	t4_iterate(c4iw_deactivate_all, NULL);
+
+	c4iw_cm_term();
+
+	if (t4_unregister_uld(&c4iw_uld_info) == EBUSY)
+		return (EBUSY);
+
+	return (0);
+}
+
+#endif
+#undef MODULE_VERSION
+#include <sys/module.h>
+
+/*
+ * t4_tom won't load on kernels without TCP_OFFLOAD and this module's dependency
+ * on t4_tom ensures that it won't either.  So we don't directly check for
+ * TCP_OFFLOAD here.
+ */
+static int
+c4iw_modevent(module_t mod, int cmd, void *arg)
+{
+	int rc = 0;
+
+#ifdef TCP_OFFLOAD
+	switch (cmd) {
+	case MOD_LOAD:
+		rc = c4iw_mod_load();
+		if (rc == 0)
+			printf("iw_cxgbe: Chelsio T4/T5 RDMA driver loaded.\n");
+		break;
+
+	case MOD_UNLOAD:
+		rc = c4iw_mod_unload();
+		break;
+
+	default:
+		rc = EINVAL;
+	}
+#else
+	printf("t4_tom: compiled without TCP_OFFLOAD support.\n");
+	rc = EOPNOTSUPP;
+#endif
+	return (rc);
+}
+
+static moduledata_t c4iw_mod_data = {
+	"iw_cxgbe",
+	c4iw_modevent,
+	0
+};
+
+MODULE_VERSION(iw_cxgbe, 1);
+MODULE_DEPEND(iw_cxgbe, t4nex, 1, 1, 1);
+MODULE_DEPEND(iw_cxgbe, t4_tom, 1, 1, 1);
+MODULE_DEPEND(iw_cxgbe, ibcore, 1, 1, 1);
+DECLARE_MODULE(iw_cxgbe, c4iw_mod_data, SI_SUB_EXEC, SI_ORDER_ANY);
diff --git a/sys/dev/cxgbe/iw_cxgbe/ev.c b/sys/dev/cxgbe/iw_cxgbe/ev.c
new file mode 100644
index 00000000000..b0a9e13d6c3
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/ev.c
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+
+#ifdef TCP_OFFLOAD
+#include <linux/slab.h>
+
+#include "iw_cxgbe.h"
+
+static void post_qp_event(struct c4iw_dev *dev, struct c4iw_cq *chp,
+			  struct c4iw_qp *qhp,
+			  struct t4_cqe *err_cqe,
+			  enum ib_event_type ib_event)
+{
+	struct ib_event event;
+	struct c4iw_qp_attributes attrs;
+	unsigned long flag;
+
+	if ((qhp->attr.state == C4IW_QP_STATE_ERROR) ||
+	    (qhp->attr.state == C4IW_QP_STATE_TERMINATE)) {
+		CTR4(KTR_IW_CXGBE, "%s AE received after RTS - "
+		     "qp state %d qpid 0x%x status 0x%x", __func__,
+		     qhp->attr.state, qhp->wq.sq.qid, CQE_STATUS(err_cqe));
+		return;
+	}
+
+	printf("AE qpid 0x%x opcode %d status 0x%x "
+	       "type %d wrid.hi 0x%x wrid.lo 0x%x\n",
+	       CQE_QPID(err_cqe), CQE_OPCODE(err_cqe),
+	       CQE_STATUS(err_cqe), CQE_TYPE(err_cqe),
+	       CQE_WRID_HI(err_cqe), CQE_WRID_LOW(err_cqe));
+
+	if (qhp->attr.state == C4IW_QP_STATE_RTS) {
+		attrs.next_state = C4IW_QP_STATE_TERMINATE;
+		c4iw_modify_qp(qhp->rhp, qhp, C4IW_QP_ATTR_NEXT_STATE,
+			       &attrs, 0);
+	}
+
+	event.event = ib_event;
+	event.device = chp->ibcq.device;
+	if (ib_event == IB_EVENT_CQ_ERR)
+		event.element.cq = &chp->ibcq;
+	else
+		event.element.qp = &qhp->ibqp;
+	if (qhp->ibqp.event_handler)
+		(*qhp->ibqp.event_handler)(&event, qhp->ibqp.qp_context);
+
+	spin_lock_irqsave(&chp->comp_handler_lock, flag);
+	(*chp->ibcq.comp_handler)(&chp->ibcq, chp->ibcq.cq_context);
+	spin_unlock_irqrestore(&chp->comp_handler_lock, flag);
+}
+
+void c4iw_ev_dispatch(struct c4iw_dev *dev, struct t4_cqe *err_cqe)
+{
+	struct c4iw_cq *chp;
+	struct c4iw_qp *qhp;
+	u32 cqid;
+
+	spin_lock_irq(&dev->lock);
+	qhp = get_qhp(dev, CQE_QPID(err_cqe));
+	if (!qhp) {
+		printf("BAD AE qpid 0x%x opcode %d "
+		       "status 0x%x type %d wrid.hi 0x%x wrid.lo 0x%x\n",
+		       CQE_QPID(err_cqe),
+		       CQE_OPCODE(err_cqe), CQE_STATUS(err_cqe),
+		       CQE_TYPE(err_cqe), CQE_WRID_HI(err_cqe),
+		       CQE_WRID_LOW(err_cqe));
+		spin_unlock_irq(&dev->lock);
+		goto out;
+	}
+
+	if (SQ_TYPE(err_cqe))
+		cqid = qhp->attr.scq;
+	else
+		cqid = qhp->attr.rcq;
+	chp = get_chp(dev, cqid);
+	if (!chp) {
+		printf("BAD AE cqid 0x%x qpid 0x%x opcode %d "
+		       "status 0x%x type %d wrid.hi 0x%x wrid.lo 0x%x\n",
+		       cqid, CQE_QPID(err_cqe),
+		       CQE_OPCODE(err_cqe), CQE_STATUS(err_cqe),
+		       CQE_TYPE(err_cqe), CQE_WRID_HI(err_cqe),
+		       CQE_WRID_LOW(err_cqe));
+		spin_unlock_irq(&dev->lock);
+		goto out;
+	}
+
+	c4iw_qp_add_ref(&qhp->ibqp);
+	atomic_inc(&chp->refcnt);
+	spin_unlock_irq(&dev->lock);
+
+	/* Bad incoming write */
+	if (RQ_TYPE(err_cqe) &&
+	    (CQE_OPCODE(err_cqe) == FW_RI_RDMA_WRITE)) {
+		post_qp_event(dev, chp, qhp, err_cqe, IB_EVENT_QP_REQ_ERR);
+		goto done;
+	}
+
+	switch (CQE_STATUS(err_cqe)) {
+
+	/* Completion Events */
+	case T4_ERR_SUCCESS:
+		printf(KERN_ERR MOD "AE with status 0!\n");
+		break;
+
+	case T4_ERR_STAG:
+	case T4_ERR_PDID:
+	case T4_ERR_QPID:
+	case T4_ERR_ACCESS:
+	case T4_ERR_WRAP:
+	case T4_ERR_BOUND:
+	case T4_ERR_INVALIDATE_SHARED_MR:
+	case T4_ERR_INVALIDATE_MR_WITH_MW_BOUND:
+		post_qp_event(dev, chp, qhp, err_cqe, IB_EVENT_QP_ACCESS_ERR);
+		break;
+
+	/* Device Fatal Errors */
+	case T4_ERR_ECC:
+	case T4_ERR_ECC_PSTAG:
+	case T4_ERR_INTERNAL_ERR:
+		post_qp_event(dev, chp, qhp, err_cqe, IB_EVENT_DEVICE_FATAL);
+		break;
+
+	/* QP Fatal Errors */
+	case T4_ERR_OUT_OF_RQE:
+	case T4_ERR_PBL_ADDR_BOUND:
+	case T4_ERR_CRC:
+	case T4_ERR_MARKER:
+	case T4_ERR_PDU_LEN_ERR:
+	case T4_ERR_DDP_VERSION:
+	case T4_ERR_RDMA_VERSION:
+	case T4_ERR_OPCODE:
+	case T4_ERR_DDP_QUEUE_NUM:
+	case T4_ERR_MSN:
+	case T4_ERR_TBIT:
+	case T4_ERR_MO:
+	case T4_ERR_MSN_GAP:
+	case T4_ERR_MSN_RANGE:
+	case T4_ERR_RQE_ADDR_BOUND:
+	case T4_ERR_IRD_OVERFLOW:
+		post_qp_event(dev, chp, qhp, err_cqe, IB_EVENT_QP_FATAL);
+		break;
+
+	default:
+		printf("Unknown T4 status 0x%x QPID 0x%x\n",
+		       CQE_STATUS(err_cqe), qhp->wq.sq.qid);
+		post_qp_event(dev, chp, qhp, err_cqe, IB_EVENT_QP_FATAL);
+		break;
+	}
+done:
+	if (atomic_dec_and_test(&chp->refcnt))
+		wake_up(&chp->wait);
+	c4iw_qp_rem_ref(&qhp->ibqp);
+out:
+	return;
+}
+
+int c4iw_ev_handler(struct sge_iq *iq, const struct rsp_ctrl *rc)
+{
+	struct c4iw_dev *dev = iq->adapter->iwarp_softc;
+	u32 qid = be32_to_cpu(rc->pldbuflen_qid);
+	struct c4iw_cq *chp;
+	unsigned long flag;
+
+	chp = get_chp(dev, qid);
+	if (chp) {
+		spin_lock_irqsave(&chp->comp_handler_lock, flag);
+		(*chp->ibcq.comp_handler)(&chp->ibcq, chp->ibcq.cq_context);
+		spin_unlock_irqrestore(&chp->comp_handler_lock, flag);
+	} else
+		CTR2(KTR_IW_CXGBE, "%s unknown cqid 0x%x", __func__, qid);
+	return 0;
+}
+#endif
diff --git a/sys/dev/cxgbe/iw_cxgbe/id_table.c b/sys/dev/cxgbe/iw_cxgbe/id_table.c
new file mode 100644
index 00000000000..6fab5dc8eb4
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/id_table.c
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2011-2013 Chelsio Communications.  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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+
+#ifdef TCP_OFFLOAD
+#include <sys/libkern.h>
+#include "iw_cxgbe.h"
+
+#define RANDOM_SKIP 16
+
+/*
+ * Trivial bitmap-based allocator. If the random flag is set, the
+ * allocator is designed to:
+ * - pseudo-randomize the id returned such that it is not trivially predictable.
+ * - avoid reuse of recently used id (at the expense of predictability)
+ */
+u32 c4iw_id_alloc(struct c4iw_id_table *alloc)
+{
+	unsigned long flags;
+	u32 obj;
+
+	spin_lock_irqsave(&alloc->lock, flags);
+
+	obj = find_next_zero_bit(alloc->table, alloc->max, alloc->last);
+	if (obj >= alloc->max)
+		obj = find_first_zero_bit(alloc->table, alloc->max);
+
+	if (obj < alloc->max) {
+		if (alloc->flags & C4IW_ID_TABLE_F_RANDOM)
+			alloc->last += arc4random() % RANDOM_SKIP;
+		else
+			alloc->last = obj + 1;
+		if (alloc->last >= alloc->max)
+			alloc->last = 0;
+		set_bit(obj, alloc->table);
+		obj += alloc->start;
+	} else
+		obj = -1;
+
+	spin_unlock_irqrestore(&alloc->lock, flags);
+	return obj;
+}
+
+void c4iw_id_free(struct c4iw_id_table *alloc, u32 obj)
+{
+	unsigned long flags;
+
+	obj -= alloc->start;
+	BUG_ON((int)obj < 0);
+
+	spin_lock_irqsave(&alloc->lock, flags);
+	clear_bit(obj, alloc->table);
+	spin_unlock_irqrestore(&alloc->lock, flags);
+}
+
+int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num,
+			u32 reserved, u32 flags)
+{
+	int i;
+
+	alloc->start = start;
+	alloc->flags = flags;
+	if (flags & C4IW_ID_TABLE_F_RANDOM)
+		alloc->last = arc4random() % RANDOM_SKIP;
+	else
+		alloc->last = 0;
+	alloc->max  = num;
+	spin_lock_init(&alloc->lock);
+	alloc->table = kmalloc(BITS_TO_LONGS(num) * sizeof(long),
+				GFP_KERNEL);
+	if (!alloc->table)
+		return -ENOMEM;
+
+	bitmap_zero(alloc->table, num);
+	if (!(alloc->flags & C4IW_ID_TABLE_F_EMPTY))
+		for (i = 0; i < reserved; ++i)
+			set_bit(i, alloc->table);
+
+	return 0;
+}
+
+void c4iw_id_table_free(struct c4iw_id_table *alloc)
+{
+	kfree(alloc->table);
+}
+#endif
diff --git a/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
new file mode 100644
index 00000000000..0201a79b7bc
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h
@@ -0,0 +1,1046 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ *
+ * $FreeBSD$
+ */
+#ifndef __IW_CXGB4_H__
+#define __IW_CXGB4_H__
+
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/idr.h>
+#include <linux/completion.h>
+#include <linux/netdevice.h>
+#include <linux/sched.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/inet.h>
+#include <linux/wait.h>
+#include <linux/kref.h>
+#include <linux/timer.h>
+#include <linux/io.h>
+
+#include <asm/byteorder.h>
+
+#include <netinet/in.h>
+#include <netinet/toecore.h>
+
+#include <rdma/ib_verbs.h>
+#include <rdma/iw_cm.h>
+
+#undef prefetch
+
+#include "common/common.h"
+#include "common/t4_msg.h"
+#include "common/t4_regs.h"
+#include "common/t4_tcb.h"
+#include "t4_l2t.h"
+
+#define DRV_NAME "iw_cxgbe"
+#define MOD DRV_NAME ":"
+#define KTR_IW_CXGBE	KTR_SPARE3
+
+extern int c4iw_debug;
+#define PDBG(fmt, args...) \
+do { \
+	if (c4iw_debug) \
+		printf(MOD fmt, ## args); \
+} while (0)
+
+#include "t4.h"
+
+static inline void *cplhdr(struct mbuf *m)
+{
+	return mtod(m, void*);
+}
+
+#define PBL_OFF(rdev_p, a) ((a) - (rdev_p)->adap->vres.pbl.start)
+#define RQT_OFF(rdev_p, a) ((a) - (rdev_p)->adap->vres.rq.start)
+
+#define C4IW_ID_TABLE_F_RANDOM 1       /* Pseudo-randomize the id's returned */
+#define C4IW_ID_TABLE_F_EMPTY  2       /* Table is initially empty */
+
+struct c4iw_id_table {
+	u32 flags;
+	u32 start;              /* logical minimal id */
+	u32 last;               /* hint for find */
+	u32 max;
+	spinlock_t lock;
+	unsigned long *table;
+};
+
+struct c4iw_resource {
+	struct c4iw_id_table tpt_table;
+	struct c4iw_id_table qid_table;
+	struct c4iw_id_table pdid_table;
+};
+
+struct c4iw_qid_list {
+	struct list_head entry;
+	u32 qid;
+};
+
+struct c4iw_dev_ucontext {
+	struct list_head qpids;
+	struct list_head cqids;
+	struct mutex lock;
+};
+
+enum c4iw_rdev_flags {
+	T4_FATAL_ERROR = (1<<0),
+};
+
+struct c4iw_stat {
+	u64 total;
+	u64 cur;
+	u64 max;
+	u64 fail;
+};
+
+struct c4iw_stats {
+	struct mutex lock;
+	struct c4iw_stat qid;
+	struct c4iw_stat pd;
+	struct c4iw_stat stag;
+	struct c4iw_stat pbl;
+	struct c4iw_stat rqt;
+	u64  db_full;
+	u64  db_empty;
+	u64  db_drop;
+	u64  db_state_transitions;
+};
+
+struct c4iw_rdev {
+	struct adapter *adap;
+	struct c4iw_resource resource;
+	unsigned long qpshift;
+	u32 qpmask;
+	unsigned long cqshift;
+	u32 cqmask;
+	struct c4iw_dev_ucontext uctx;
+	struct gen_pool *pbl_pool;
+	struct gen_pool *rqt_pool;
+	u32 flags;
+	struct c4iw_stats stats;
+};
+
+static inline int c4iw_fatal_error(struct c4iw_rdev *rdev)
+{
+	return rdev->flags & T4_FATAL_ERROR;
+}
+
+static inline int c4iw_num_stags(struct c4iw_rdev *rdev)
+{
+	return min((int)T4_MAX_NUM_STAG, (int)(rdev->adap->vres.stag.size >> 5));
+}
+
+#define C4IW_WR_TO (10*HZ)
+
+struct c4iw_wr_wait {
+	int ret;
+	atomic_t completion;
+};
+
+static inline void c4iw_init_wr_wait(struct c4iw_wr_wait *wr_waitp)
+{
+	wr_waitp->ret = 0;
+	atomic_set(&wr_waitp->completion, 0);
+}
+
+static inline void c4iw_wake_up(struct c4iw_wr_wait *wr_waitp, int ret)
+{
+	wr_waitp->ret = ret;
+	atomic_set(&wr_waitp->completion, 1);
+	wakeup(wr_waitp);
+}
+
+static inline int
+c4iw_wait_for_reply(struct c4iw_rdev *rdev, struct c4iw_wr_wait *wr_waitp,
+    u32 hwtid, u32 qpid, const char *func)
+{
+	struct adapter *sc = rdev->adap;
+	unsigned to = C4IW_WR_TO;
+
+	while (!atomic_read(&wr_waitp->completion)) {
+                tsleep(wr_waitp, 0, "c4iw_wait", to);
+                if (SIGPENDING(curthread)) {
+			printf("%s - Device %s not responding - "
+			    "tid %u qpid %u\n", func,
+			    device_get_nameunit(sc->dev), hwtid, qpid);
+                        if (c4iw_fatal_error(rdev)) {
+                                wr_waitp->ret = -EIO;
+                                break;
+                        }
+                        to = to << 2;
+                }
+        }
+	if (wr_waitp->ret)
+		CTR4(KTR_IW_CXGBE, "%s: FW reply %d tid %u qpid %u",
+		    device_get_nameunit(sc->dev), wr_waitp->ret, hwtid, qpid);
+	return (wr_waitp->ret);
+}
+
+enum db_state {
+	NORMAL = 0,
+	FLOW_CONTROL = 1,
+	RECOVERY = 2
+};
+
+struct c4iw_dev {
+	struct ib_device ibdev;
+	struct c4iw_rdev rdev;
+	u32 device_cap_flags;
+	struct idr cqidr;
+	struct idr qpidr;
+	struct idr mmidr;
+	spinlock_t lock;
+	struct dentry *debugfs_root;
+	enum db_state db_state;
+	int qpcnt;
+};
+
+static inline struct c4iw_dev *to_c4iw_dev(struct ib_device *ibdev)
+{
+	return container_of(ibdev, struct c4iw_dev, ibdev);
+}
+
+static inline struct c4iw_dev *rdev_to_c4iw_dev(struct c4iw_rdev *rdev)
+{
+	return container_of(rdev, struct c4iw_dev, rdev);
+}
+
+static inline struct c4iw_cq *get_chp(struct c4iw_dev *rhp, u32 cqid)
+{
+	return idr_find(&rhp->cqidr, cqid);
+}
+
+static inline struct c4iw_qp *get_qhp(struct c4iw_dev *rhp, u32 qpid)
+{
+	return idr_find(&rhp->qpidr, qpid);
+}
+
+static inline struct c4iw_mr *get_mhp(struct c4iw_dev *rhp, u32 mmid)
+{
+	return idr_find(&rhp->mmidr, mmid);
+}
+
+static inline int _insert_handle(struct c4iw_dev *rhp, struct idr *idr,
+				 void *handle, u32 id, int lock)
+{
+	int ret;
+	int newid;
+
+	do {
+		if (!idr_pre_get(idr, lock ? GFP_KERNEL : GFP_ATOMIC))
+			return -ENOMEM;
+		if (lock)
+			spin_lock_irq(&rhp->lock);
+		ret = idr_get_new_above(idr, handle, id, &newid);
+		BUG_ON(!ret && newid != id);
+		if (lock)
+			spin_unlock_irq(&rhp->lock);
+	} while (ret == -EAGAIN);
+
+	return ret;
+}
+
+static inline int insert_handle(struct c4iw_dev *rhp, struct idr *idr,
+				void *handle, u32 id)
+{
+	return _insert_handle(rhp, idr, handle, id, 1);
+}
+
+static inline int insert_handle_nolock(struct c4iw_dev *rhp, struct idr *idr,
+				       void *handle, u32 id)
+{
+	return _insert_handle(rhp, idr, handle, id, 0);
+}
+
+static inline void _remove_handle(struct c4iw_dev *rhp, struct idr *idr,
+				   u32 id, int lock)
+{
+	if (lock)
+		spin_lock_irq(&rhp->lock);
+	idr_remove(idr, id);
+	if (lock)
+		spin_unlock_irq(&rhp->lock);
+}
+
+static inline void remove_handle(struct c4iw_dev *rhp, struct idr *idr, u32 id)
+{
+	_remove_handle(rhp, idr, id, 1);
+}
+
+static inline void remove_handle_nolock(struct c4iw_dev *rhp,
+					 struct idr *idr, u32 id)
+{
+	_remove_handle(rhp, idr, id, 0);
+}
+
+struct c4iw_pd {
+	struct ib_pd ibpd;
+	u32 pdid;
+	struct c4iw_dev *rhp;
+};
+
+static inline struct c4iw_pd *to_c4iw_pd(struct ib_pd *ibpd)
+{
+	return container_of(ibpd, struct c4iw_pd, ibpd);
+}
+
+struct tpt_attributes {
+	u64 len;
+	u64 va_fbo;
+	enum fw_ri_mem_perms perms;
+	u32 stag;
+	u32 pdid;
+	u32 qpid;
+	u32 pbl_addr;
+	u32 pbl_size;
+	u32 state:1;
+	u32 type:2;
+	u32 rsvd:1;
+	u32 remote_invaliate_disable:1;
+	u32 zbva:1;
+	u32 mw_bind_enable:1;
+	u32 page_size:5;
+};
+
+struct c4iw_mr {
+	struct ib_mr ibmr;
+	struct ib_umem *umem;
+	struct c4iw_dev *rhp;
+	u64 kva;
+	struct tpt_attributes attr;
+};
+
+static inline struct c4iw_mr *to_c4iw_mr(struct ib_mr *ibmr)
+{
+	return container_of(ibmr, struct c4iw_mr, ibmr);
+}
+
+struct c4iw_mw {
+	struct ib_mw ibmw;
+	struct c4iw_dev *rhp;
+	u64 kva;
+	struct tpt_attributes attr;
+};
+
+static inline struct c4iw_mw *to_c4iw_mw(struct ib_mw *ibmw)
+{
+	return container_of(ibmw, struct c4iw_mw, ibmw);
+}
+
+struct c4iw_fr_page_list {
+	struct ib_fast_reg_page_list ibpl;
+	DECLARE_PCI_UNMAP_ADDR(mapping);
+	dma_addr_t dma_addr;
+	struct c4iw_dev *dev;
+	int size;
+};
+
+static inline struct c4iw_fr_page_list *to_c4iw_fr_page_list(
+					struct ib_fast_reg_page_list *ibpl)
+{
+	return container_of(ibpl, struct c4iw_fr_page_list, ibpl);
+}
+
+struct c4iw_cq {
+	struct ib_cq ibcq;
+	struct c4iw_dev *rhp;
+	struct t4_cq cq;
+	spinlock_t lock;
+	spinlock_t comp_handler_lock;
+	atomic_t refcnt;
+	wait_queue_head_t wait;
+};
+
+static inline struct c4iw_cq *to_c4iw_cq(struct ib_cq *ibcq)
+{
+	return container_of(ibcq, struct c4iw_cq, ibcq);
+}
+
+struct c4iw_mpa_attributes {
+	u8 initiator;
+	u8 recv_marker_enabled;
+	u8 xmit_marker_enabled;
+	u8 crc_enabled;
+	u8 enhanced_rdma_conn;
+	u8 version;
+	u8 p2p_type;
+};
+
+struct c4iw_qp_attributes {
+	u32 scq;
+	u32 rcq;
+	u32 sq_num_entries;
+	u32 rq_num_entries;
+	u32 sq_max_sges;
+	u32 sq_max_sges_rdma_write;
+	u32 rq_max_sges;
+	u32 state;
+	u8 enable_rdma_read;
+	u8 enable_rdma_write;
+	u8 enable_bind;
+	u8 enable_mmid0_fastreg;
+	u32 max_ord;
+	u32 max_ird;
+	u32 pd;
+	u32 next_state;
+	char terminate_buffer[52];
+	u32 terminate_msg_len;
+	u8 is_terminate_local;
+	struct c4iw_mpa_attributes mpa_attr;
+	struct c4iw_ep *llp_stream_handle;
+	u8 layer_etype;
+	u8 ecode;
+	u16 sq_db_inc;
+	u16 rq_db_inc;
+};
+
+struct c4iw_qp {
+	struct ib_qp ibqp;
+	struct c4iw_dev *rhp;
+	struct c4iw_ep *ep;
+	struct c4iw_qp_attributes attr;
+	struct t4_wq wq;
+	spinlock_t lock;
+	struct mutex mutex;
+	atomic_t refcnt;
+	wait_queue_head_t wait;
+	struct timer_list timer;
+};
+
+static inline struct c4iw_qp *to_c4iw_qp(struct ib_qp *ibqp)
+{
+	return container_of(ibqp, struct c4iw_qp, ibqp);
+}
+
+struct c4iw_ucontext {
+	struct ib_ucontext ibucontext;
+	struct c4iw_dev_ucontext uctx;
+	u32 key;
+	spinlock_t mmap_lock;
+	struct list_head mmaps;
+};
+
+static inline struct c4iw_ucontext *to_c4iw_ucontext(struct ib_ucontext *c)
+{
+	return container_of(c, struct c4iw_ucontext, ibucontext);
+}
+
+struct c4iw_mm_entry {
+	struct list_head entry;
+	u64 addr;
+	u32 key;
+	unsigned len;
+};
+
+static inline struct c4iw_mm_entry *remove_mmap(struct c4iw_ucontext *ucontext,
+						u32 key, unsigned len)
+{
+	struct list_head *pos, *nxt;
+	struct c4iw_mm_entry *mm;
+
+	spin_lock(&ucontext->mmap_lock);
+	list_for_each_safe(pos, nxt, &ucontext->mmaps) {
+
+		mm = list_entry(pos, struct c4iw_mm_entry, entry);
+		if (mm->key == key && mm->len == len) {
+			list_del_init(&mm->entry);
+			spin_unlock(&ucontext->mmap_lock);
+			CTR4(KTR_IW_CXGBE, "%s key 0x%x addr 0x%llx len %d",
+			     __func__, key, (unsigned long long) mm->addr,
+			     mm->len);
+			return mm;
+		}
+	}
+	spin_unlock(&ucontext->mmap_lock);
+	return NULL;
+}
+
+static inline void insert_mmap(struct c4iw_ucontext *ucontext,
+			       struct c4iw_mm_entry *mm)
+{
+	spin_lock(&ucontext->mmap_lock);
+	CTR4(KTR_IW_CXGBE, "%s key 0x%x addr 0x%llx len %d", __func__, mm->key,
+	    (unsigned long long) mm->addr, mm->len);
+	list_add_tail(&mm->entry, &ucontext->mmaps);
+	spin_unlock(&ucontext->mmap_lock);
+}
+
+enum c4iw_qp_attr_mask {
+	C4IW_QP_ATTR_NEXT_STATE = 1 << 0,
+	C4IW_QP_ATTR_SQ_DB = 1<<1,
+	C4IW_QP_ATTR_RQ_DB = 1<<2,
+	C4IW_QP_ATTR_ENABLE_RDMA_READ = 1 << 7,
+	C4IW_QP_ATTR_ENABLE_RDMA_WRITE = 1 << 8,
+	C4IW_QP_ATTR_ENABLE_RDMA_BIND = 1 << 9,
+	C4IW_QP_ATTR_MAX_ORD = 1 << 11,
+	C4IW_QP_ATTR_MAX_IRD = 1 << 12,
+	C4IW_QP_ATTR_LLP_STREAM_HANDLE = 1 << 22,
+	C4IW_QP_ATTR_STREAM_MSG_BUFFER = 1 << 23,
+	C4IW_QP_ATTR_MPA_ATTR = 1 << 24,
+	C4IW_QP_ATTR_QP_CONTEXT_ACTIVATE = 1 << 25,
+	C4IW_QP_ATTR_VALID_MODIFY = (C4IW_QP_ATTR_ENABLE_RDMA_READ |
+				     C4IW_QP_ATTR_ENABLE_RDMA_WRITE |
+				     C4IW_QP_ATTR_MAX_ORD |
+				     C4IW_QP_ATTR_MAX_IRD |
+				     C4IW_QP_ATTR_LLP_STREAM_HANDLE |
+				     C4IW_QP_ATTR_STREAM_MSG_BUFFER |
+				     C4IW_QP_ATTR_MPA_ATTR |
+				     C4IW_QP_ATTR_QP_CONTEXT_ACTIVATE)
+};
+
+int c4iw_modify_qp(struct c4iw_dev *rhp,
+				struct c4iw_qp *qhp,
+				enum c4iw_qp_attr_mask mask,
+				struct c4iw_qp_attributes *attrs,
+				int internal);
+
+enum c4iw_qp_state {
+	C4IW_QP_STATE_IDLE,
+	C4IW_QP_STATE_RTS,
+	C4IW_QP_STATE_ERROR,
+	C4IW_QP_STATE_TERMINATE,
+	C4IW_QP_STATE_CLOSING,
+	C4IW_QP_STATE_TOT
+};
+
+static inline int c4iw_convert_state(enum ib_qp_state ib_state)
+{
+	switch (ib_state) {
+	case IB_QPS_RESET:
+	case IB_QPS_INIT:
+		return C4IW_QP_STATE_IDLE;
+	case IB_QPS_RTS:
+		return C4IW_QP_STATE_RTS;
+	case IB_QPS_SQD:
+		return C4IW_QP_STATE_CLOSING;
+	case IB_QPS_SQE:
+		return C4IW_QP_STATE_TERMINATE;
+	case IB_QPS_ERR:
+		return C4IW_QP_STATE_ERROR;
+	default:
+		return -1;
+	}
+}
+
+static inline int to_ib_qp_state(int c4iw_qp_state)
+{
+	switch (c4iw_qp_state) {
+	case C4IW_QP_STATE_IDLE:
+		return IB_QPS_INIT;
+	case C4IW_QP_STATE_RTS:
+		return IB_QPS_RTS;
+	case C4IW_QP_STATE_CLOSING:
+		return IB_QPS_SQD;
+	case C4IW_QP_STATE_TERMINATE:
+		return IB_QPS_SQE;
+	case C4IW_QP_STATE_ERROR:
+		return IB_QPS_ERR;
+	}
+	return IB_QPS_ERR;
+}
+
+static inline u32 c4iw_ib_to_tpt_access(int a)
+{
+	return (a & IB_ACCESS_REMOTE_WRITE ? FW_RI_MEM_ACCESS_REM_WRITE : 0) |
+	       (a & IB_ACCESS_REMOTE_READ ? FW_RI_MEM_ACCESS_REM_READ : 0) |
+	       (a & IB_ACCESS_LOCAL_WRITE ? FW_RI_MEM_ACCESS_LOCAL_WRITE : 0) |
+	       FW_RI_MEM_ACCESS_LOCAL_READ;
+}
+
+static inline u32 c4iw_ib_to_tpt_bind_access(int acc)
+{
+	return (acc & IB_ACCESS_REMOTE_WRITE ? FW_RI_MEM_ACCESS_REM_WRITE : 0) |
+	       (acc & IB_ACCESS_REMOTE_READ ? FW_RI_MEM_ACCESS_REM_READ : 0);
+}
+
+enum c4iw_mmid_state {
+	C4IW_STAG_STATE_VALID,
+	C4IW_STAG_STATE_INVALID
+};
+
+#define C4IW_NODE_DESC "iw_cxgbe Chelsio Communications"
+
+#define MPA_KEY_REQ "MPA ID Req Frame"
+#define MPA_KEY_REP "MPA ID Rep Frame"
+
+#define MPA_MAX_PRIVATE_DATA	256
+#define MPA_ENHANCED_RDMA_CONN	0x10
+#define MPA_REJECT		0x20
+#define MPA_CRC			0x40
+#define MPA_MARKERS		0x80
+#define MPA_FLAGS_MASK		0xE0
+
+#define MPA_V2_PEER2PEER_MODEL          0x8000
+#define MPA_V2_ZERO_LEN_FPDU_RTR        0x4000
+#define MPA_V2_RDMA_WRITE_RTR           0x8000
+#define MPA_V2_RDMA_READ_RTR            0x4000
+#define MPA_V2_IRD_ORD_MASK             0x3FFF
+
+/* Fixme: Use atomic_read for kref.count as same as Linux */
+#define c4iw_put_ep(ep) { \
+	CTR4(KTR_IW_CXGBE, "put_ep (%s:%u) ep %p, refcnt %d", \
+	     __func__, __LINE__, ep, (ep)->kref.count); \
+	WARN_ON((ep)->kref.count < 1); \
+        kref_put(&((ep)->kref), _c4iw_free_ep); \
+}
+
+/* Fixme: Use atomic_read for kref.count as same as Linux */
+#define c4iw_get_ep(ep) { \
+	CTR4(KTR_IW_CXGBE, "get_ep (%s:%u) ep %p, refcnt %d", \
+	      __func__, __LINE__, ep, (ep)->kref.count); \
+        kref_get(&((ep)->kref));  \
+}
+
+void _c4iw_free_ep(struct kref *kref);
+
+struct mpa_message {
+	u8 key[16];
+	u8 flags;
+	u8 revision;
+	__be16 private_data_size;
+	u8 private_data[0];
+};
+
+struct mpa_v2_conn_params {
+	__be16 ird;
+	__be16 ord;
+};
+
+struct terminate_message {
+	u8 layer_etype;
+	u8 ecode;
+	__be16 hdrct_rsvd;
+	u8 len_hdrs[0];
+};
+
+#define TERM_MAX_LENGTH (sizeof(struct terminate_message) + 2 + 18 + 28)
+
+enum c4iw_layers_types {
+	LAYER_RDMAP		= 0x00,
+	LAYER_DDP		= 0x10,
+	LAYER_MPA		= 0x20,
+	RDMAP_LOCAL_CATA	= 0x00,
+	RDMAP_REMOTE_PROT	= 0x01,
+	RDMAP_REMOTE_OP		= 0x02,
+	DDP_LOCAL_CATA		= 0x00,
+	DDP_TAGGED_ERR		= 0x01,
+	DDP_UNTAGGED_ERR	= 0x02,
+	DDP_LLP			= 0x03
+};
+
+enum c4iw_rdma_ecodes {
+	RDMAP_INV_STAG		= 0x00,
+	RDMAP_BASE_BOUNDS	= 0x01,
+	RDMAP_ACC_VIOL		= 0x02,
+	RDMAP_STAG_NOT_ASSOC	= 0x03,
+	RDMAP_TO_WRAP		= 0x04,
+	RDMAP_INV_VERS		= 0x05,
+	RDMAP_INV_OPCODE	= 0x06,
+	RDMAP_STREAM_CATA	= 0x07,
+	RDMAP_GLOBAL_CATA	= 0x08,
+	RDMAP_CANT_INV_STAG	= 0x09,
+	RDMAP_UNSPECIFIED	= 0xff
+};
+
+enum c4iw_ddp_ecodes {
+	DDPT_INV_STAG		= 0x00,
+	DDPT_BASE_BOUNDS	= 0x01,
+	DDPT_STAG_NOT_ASSOC	= 0x02,
+	DDPT_TO_WRAP		= 0x03,
+	DDPT_INV_VERS		= 0x04,
+	DDPU_INV_QN		= 0x01,
+	DDPU_INV_MSN_NOBUF	= 0x02,
+	DDPU_INV_MSN_RANGE	= 0x03,
+	DDPU_INV_MO		= 0x04,
+	DDPU_MSG_TOOBIG		= 0x05,
+	DDPU_INV_VERS		= 0x06
+};
+
+enum c4iw_mpa_ecodes {
+	MPA_CRC_ERR		= 0x02,
+	MPA_MARKER_ERR		= 0x03,
+	MPA_LOCAL_CATA          = 0x05,
+	MPA_INSUFF_IRD          = 0x06,
+	MPA_NOMATCH_RTR         = 0x07,
+};
+
+enum c4iw_ep_state {
+	IDLE = 0,
+	LISTEN,
+	CONNECTING,
+	MPA_REQ_WAIT,
+	MPA_REQ_SENT,
+	MPA_REQ_RCVD,
+	MPA_REP_SENT,
+	FPDU_MODE,
+	ABORTING,
+	CLOSING,
+	MORIBUND,
+	DEAD,
+};
+
+enum c4iw_ep_flags {
+	PEER_ABORT_IN_PROGRESS	= 0,
+	ABORT_REQ_IN_PROGRESS	= 1,
+	RELEASE_RESOURCES	= 2,
+	CLOSE_SENT		= 3,
+	TIMEOUT                 = 4
+};
+
+enum c4iw_ep_history {
+        ACT_OPEN_REQ            = 0,
+        ACT_OFLD_CONN           = 1,
+        ACT_OPEN_RPL            = 2,
+        ACT_ESTAB               = 3,
+        PASS_ACCEPT_REQ         = 4,
+        PASS_ESTAB              = 5,
+        ABORT_UPCALL            = 6,
+        ESTAB_UPCALL            = 7,
+        CLOSE_UPCALL            = 8,
+        ULP_ACCEPT              = 9,
+        ULP_REJECT              = 10,
+        TIMEDOUT                = 11,
+        PEER_ABORT              = 12,
+        PEER_CLOSE              = 13,
+        CONNREQ_UPCALL          = 14,
+        ABORT_CONN              = 15,
+        DISCONN_UPCALL          = 16,
+        EP_DISC_CLOSE           = 17,
+        EP_DISC_ABORT           = 18,
+        CONN_RPL_UPCALL         = 19,
+        ACT_RETRY_NOMEM         = 20,
+        ACT_RETRY_INUSE         = 21
+};
+
+struct c4iw_ep_common {
+	TAILQ_ENTRY(c4iw_ep_common) entry;	/* Work queue attachment */
+	struct iw_cm_id *cm_id;
+	struct c4iw_qp *qp;
+	struct c4iw_dev *dev;
+	enum c4iw_ep_state state;
+	struct kref kref;
+	struct mutex mutex;
+	struct sockaddr_in local_addr;
+	struct sockaddr_in remote_addr;
+	struct c4iw_wr_wait wr_wait;
+	unsigned long flags;
+	unsigned long history;
+        int rpl_err;
+        int rpl_done;
+        struct thread *thread;
+        struct socket *so;
+};
+
+struct c4iw_listen_ep {
+	struct c4iw_ep_common com;
+	unsigned int stid;
+	int backlog;
+};
+
+struct c4iw_ep {
+	struct c4iw_ep_common com;
+	struct c4iw_ep *parent_ep;
+	struct timer_list timer;
+	struct list_head entry;
+	unsigned int atid;
+	u32 hwtid;
+	u32 snd_seq;
+	u32 rcv_seq;
+	struct l2t_entry *l2t;
+	struct dst_entry *dst;
+	struct c4iw_mpa_attributes mpa_attr;
+	u8 mpa_pkt[sizeof(struct mpa_message) + MPA_MAX_PRIVATE_DATA];
+	unsigned int mpa_pkt_len;
+	u32 ird;
+	u32 ord;
+	u32 smac_idx;
+	u32 tx_chan;
+	u32 mtu;
+	u16 mss;
+	u16 emss;
+	u16 plen;
+	u16 rss_qid;
+	u16 txq_idx;
+	u16 ctrlq_idx;
+	u8 tos;
+	u8 retry_with_mpa_v1;
+	u8 tried_with_mpa_v1;
+};
+
+static inline struct c4iw_ep *to_ep(struct iw_cm_id *cm_id)
+{
+	return cm_id->provider_data;
+}
+
+static inline struct c4iw_listen_ep *to_listen_ep(struct iw_cm_id *cm_id)
+{
+	return cm_id->provider_data;
+}
+
+static inline int compute_wscale(int win)
+{
+	int wscale = 0;
+
+	while (wscale < 14 && (65535<<wscale) < win)
+		wscale++;
+	return wscale;
+}
+
+u32 c4iw_id_alloc(struct c4iw_id_table *alloc);
+void c4iw_id_free(struct c4iw_id_table *alloc, u32 obj);
+int c4iw_id_table_alloc(struct c4iw_id_table *alloc, u32 start, u32 num,
+			u32 reserved, u32 flags);
+void c4iw_id_table_free(struct c4iw_id_table *alloc);
+
+typedef int (*c4iw_handler_func)(struct c4iw_dev *dev, struct mbuf *m);
+
+int c4iw_ep_redirect(void *ctx, struct dst_entry *old, struct dst_entry *new,
+		     struct l2t_entry *l2t);
+u32 c4iw_get_resource(struct c4iw_id_table *id_table);
+void c4iw_put_resource(struct c4iw_id_table *id_table, u32 entry);
+int c4iw_init_resource(struct c4iw_rdev *rdev, u32 nr_tpt, u32 nr_pdid);
+int c4iw_init_ctrl_qp(struct c4iw_rdev *rdev);
+int c4iw_pblpool_create(struct c4iw_rdev *rdev);
+int c4iw_rqtpool_create(struct c4iw_rdev *rdev);
+void c4iw_pblpool_destroy(struct c4iw_rdev *rdev);
+void c4iw_rqtpool_destroy(struct c4iw_rdev *rdev);
+void c4iw_destroy_resource(struct c4iw_resource *rscp);
+int c4iw_destroy_ctrl_qp(struct c4iw_rdev *rdev);
+int c4iw_register_device(struct c4iw_dev *dev);
+void c4iw_unregister_device(struct c4iw_dev *dev);
+int __init c4iw_cm_init(void);
+void __exit c4iw_cm_term(void);
+void c4iw_release_dev_ucontext(struct c4iw_rdev *rdev,
+			       struct c4iw_dev_ucontext *uctx);
+void c4iw_init_dev_ucontext(struct c4iw_rdev *rdev,
+			    struct c4iw_dev_ucontext *uctx);
+int c4iw_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc);
+int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
+		      struct ib_send_wr **bad_wr);
+int c4iw_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
+		      struct ib_recv_wr **bad_wr);
+int c4iw_bind_mw(struct ib_qp *qp, struct ib_mw *mw,
+		 struct ib_mw_bind *mw_bind);
+int c4iw_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param);
+int c4iw_create_listen(struct iw_cm_id *cm_id, int backlog);
+int c4iw_destroy_listen(struct iw_cm_id *cm_id);
+int c4iw_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param);
+int c4iw_reject_cr(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len);
+void c4iw_qp_add_ref(struct ib_qp *qp);
+void c4iw_qp_rem_ref(struct ib_qp *qp);
+void c4iw_free_fastreg_pbl(struct ib_fast_reg_page_list *page_list);
+struct ib_fast_reg_page_list *c4iw_alloc_fastreg_pbl(
+					struct ib_device *device,
+					int page_list_len);
+struct ib_mr *c4iw_alloc_fast_reg_mr(struct ib_pd *pd, int pbl_depth);
+int c4iw_dealloc_mw(struct ib_mw *mw);
+struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd);
+struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, u64
+    virt, int acc, struct ib_udata *udata, int mr_id);
+struct ib_mr *c4iw_get_dma_mr(struct ib_pd *pd, int acc);
+struct ib_mr *c4iw_register_phys_mem(struct ib_pd *pd,
+					struct ib_phys_buf *buffer_list,
+					int num_phys_buf,
+					int acc,
+					u64 *iova_start);
+int c4iw_reregister_phys_mem(struct ib_mr *mr,
+				     int mr_rereg_mask,
+				     struct ib_pd *pd,
+				     struct ib_phys_buf *buffer_list,
+				     int num_phys_buf,
+				     int acc, u64 *iova_start);
+int c4iw_dereg_mr(struct ib_mr *ib_mr);
+int c4iw_destroy_cq(struct ib_cq *ib_cq);
+struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries,
+					int vector,
+					struct ib_ucontext *ib_context,
+					struct ib_udata *udata);
+int c4iw_resize_cq(struct ib_cq *cq, int cqe, struct ib_udata *udata);
+int c4iw_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags);
+int c4iw_destroy_qp(struct ib_qp *ib_qp);
+struct ib_qp *c4iw_create_qp(struct ib_pd *pd,
+			     struct ib_qp_init_attr *attrs,
+			     struct ib_udata *udata);
+int c4iw_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
+				 int attr_mask, struct ib_udata *udata);
+int c4iw_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
+		     int attr_mask, struct ib_qp_init_attr *init_attr);
+struct ib_qp *c4iw_get_qp(struct ib_device *dev, int qpn);
+u32 c4iw_rqtpool_alloc(struct c4iw_rdev *rdev, int size);
+void c4iw_rqtpool_free(struct c4iw_rdev *rdev, u32 addr, int size);
+u32 c4iw_pblpool_alloc(struct c4iw_rdev *rdev, int size);
+void c4iw_pblpool_free(struct c4iw_rdev *rdev, u32 addr, int size);
+int c4iw_ofld_send(struct c4iw_rdev *rdev, struct mbuf *m);
+void c4iw_flush_hw_cq(struct t4_cq *cq);
+void c4iw_count_rcqes(struct t4_cq *cq, struct t4_wq *wq, int *count);
+void c4iw_count_scqes(struct t4_cq *cq, struct t4_wq *wq, int *count);
+int c4iw_ep_disconnect(struct c4iw_ep *ep, int abrupt, gfp_t gfp);
+int c4iw_flush_rq(struct t4_wq *wq, struct t4_cq *cq, int count);
+int c4iw_flush_sq(struct t4_wq *wq, struct t4_cq *cq, int count);
+int c4iw_ev_handler(struct sge_iq *, const struct rsp_ctrl *);
+u16 c4iw_rqes_posted(struct c4iw_qp *qhp);
+int c4iw_post_terminate(struct c4iw_qp *qhp, struct t4_cqe *err_cqe);
+u32 c4iw_get_cqid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx);
+void c4iw_put_cqid(struct c4iw_rdev *rdev, u32 qid,
+		struct c4iw_dev_ucontext *uctx);
+u32 c4iw_get_qpid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx);
+void c4iw_put_qpid(struct c4iw_rdev *rdev, u32 qid,
+		struct c4iw_dev_ucontext *uctx);
+void c4iw_ev_dispatch(struct c4iw_dev *dev, struct t4_cqe *err_cqe);
+
+extern struct cxgb4_client t4c_client;
+extern c4iw_handler_func c4iw_handlers[NUM_CPL_CMDS];
+extern int c4iw_max_read_depth;
+
+#include <sys/blist.h>
+struct gen_pool {
+        blist_t         gen_list;
+        daddr_t         gen_base;
+        int             gen_chunk_shift;
+        struct mutex      gen_lock;
+};
+
+static __inline struct gen_pool *
+gen_pool_create(daddr_t base, u_int chunk_shift, u_int len)
+{
+        struct gen_pool *gp;
+
+        gp = malloc(sizeof(struct gen_pool), M_DEVBUF, M_NOWAIT);
+        if (gp == NULL)
+                return (NULL);
+
+        memset(gp, 0, sizeof(struct gen_pool));
+        gp->gen_list = blist_create(len >> chunk_shift, M_NOWAIT);
+        if (gp->gen_list == NULL) {
+                free(gp, M_DEVBUF);
+                return (NULL);
+        }
+        blist_free(gp->gen_list, 0, len >> chunk_shift);
+        gp->gen_base = base;
+        gp->gen_chunk_shift = chunk_shift;
+        //mutex_init(&gp->gen_lock, "genpool", NULL, MTX_DUPOK|MTX_DEF);
+        mutex_init(&gp->gen_lock);
+
+        return (gp);
+}
+
+static __inline unsigned long
+gen_pool_alloc(struct gen_pool *gp, int size)
+{
+        int chunks;
+        daddr_t blkno;
+
+        chunks = (size + (1<<gp->gen_chunk_shift) - 1) >> gp->gen_chunk_shift;
+        mutex_lock(&gp->gen_lock);
+        blkno = blist_alloc(gp->gen_list, chunks);
+        mutex_unlock(&gp->gen_lock);
+
+        if (blkno == SWAPBLK_NONE)
+                return (0);
+
+        return (gp->gen_base + ((1 << gp->gen_chunk_shift) * blkno));
+}
+
+static __inline void
+gen_pool_free(struct gen_pool *gp, daddr_t address, int size)
+{
+        int chunks;
+        daddr_t blkno;
+
+        chunks = (size + (1<<gp->gen_chunk_shift) - 1) >> gp->gen_chunk_shift;
+        blkno = (address - gp->gen_base) / (1 << gp->gen_chunk_shift);
+        mutex_lock(&gp->gen_lock);
+        blist_free(gp->gen_list, blkno, chunks);
+        mutex_unlock(&gp->gen_lock);
+}
+
+static __inline void
+gen_pool_destroy(struct gen_pool *gp)
+{
+        blist_destroy(gp->gen_list);
+        free(gp, M_DEVBUF);
+}
+
+#if defined(__i386__) || defined(__amd64__)
+#define L1_CACHE_BYTES 128
+#else
+#define L1_CACHE_BYTES 32
+#endif
+
+static inline
+int idr_for_each(struct idr *idp,
+                 int (*fn)(int id, void *p, void *data), void *data)
+{
+        int n, id, max, error = 0;
+        struct idr_layer *p;
+        struct idr_layer *pa[MAX_LEVEL];
+        struct idr_layer **paa = &pa[0];
+
+        n = idp->layers * IDR_BITS;
+        p = idp->top;
+        max = 1 << n;
+
+        id = 0;
+        while (id < max) {
+                while (n > 0 && p) {
+                        n -= IDR_BITS;
+                        *paa++ = p;
+                        p = p->ary[(id >> n) & IDR_MASK];
+                }
+
+                if (p) {
+                        error = fn(id, (void *)p, data);
+                        if (error)
+                                break;
+                }
+
+                id += 1 << n;
+                while (n < fls(id)) {
+                        n += IDR_BITS;
+                        p = *--paa;
+                }
+        }
+
+        return error;
+}
+
+void c4iw_cm_init_cpl(struct adapter *);
+void c4iw_cm_term_cpl(struct adapter *);
+
+void your_reg_device(struct c4iw_dev *dev);
+
+#define SGE_CTRLQ_NUM	0
+
+extern int spg_creds;/* Status Page size in credit units(1 unit = 64) */
+#endif
diff --git a/sys/dev/cxgbe/iw_cxgbe/mem.c b/sys/dev/cxgbe/iw_cxgbe/mem.c
new file mode 100644
index 00000000000..50c5ed0c1f8
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/mem.c
@@ -0,0 +1,828 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+
+#ifdef TCP_OFFLOAD
+#include <linux/types.h>
+#include <linux/kref.h>
+#include <rdma/ib_umem.h>
+#include <asm/atomic.h>
+
+#include <common/t4_msg.h>
+#include "iw_cxgbe.h"
+
+#define T4_ULPTX_MIN_IO 32
+#define C4IW_MAX_INLINE_SIZE 96
+
+static int
+write_adapter_mem(struct c4iw_rdev *rdev, u32 addr, u32 len, void *data)
+{
+	struct adapter *sc = rdev->adap;
+	struct ulp_mem_io *ulpmc;
+	struct ulptx_idata *ulpsc;
+	u8 wr_len, *to_dp, *from_dp;
+	int copy_len, num_wqe, i, ret = 0;
+	struct c4iw_wr_wait wr_wait;
+	struct wrqe *wr;
+	u32 cmd;
+
+	cmd = cpu_to_be32(V_ULPTX_CMD(ULP_TX_MEM_WRITE));
+	if (is_t4(sc))
+		cmd |= cpu_to_be32(F_ULP_MEMIO_ORDER);
+	else
+		cmd |= cpu_to_be32(F_T5_ULP_MEMIO_IMM);
+
+	addr &= 0x7FFFFFF;
+	CTR3(KTR_IW_CXGBE, "%s addr 0x%x len %u", __func__, addr, len);
+	num_wqe = DIV_ROUND_UP(len, C4IW_MAX_INLINE_SIZE);
+	c4iw_init_wr_wait(&wr_wait);
+	for (i = 0; i < num_wqe; i++) {
+
+		copy_len = min(len, C4IW_MAX_INLINE_SIZE);
+		wr_len = roundup(sizeof *ulpmc + sizeof *ulpsc +
+				 roundup(copy_len, T4_ULPTX_MIN_IO), 16);
+
+		wr = alloc_wrqe(wr_len, &sc->sge.mgmtq);
+		if (wr == NULL)
+			return (0);
+		ulpmc = wrtod(wr);
+
+		memset(ulpmc, 0, wr_len);
+		INIT_ULPTX_WR(ulpmc, wr_len, 0, 0);
+
+		if (i == (num_wqe-1)) {
+			ulpmc->wr.wr_hi = cpu_to_be32(V_FW_WR_OP(FW_ULPTX_WR) |
+						    F_FW_WR_COMPL);
+			ulpmc->wr.wr_lo = (__force __be64)(unsigned long) &wr_wait;
+		} else
+			ulpmc->wr.wr_hi = cpu_to_be32(V_FW_WR_OP(FW_ULPTX_WR));
+		ulpmc->wr.wr_mid = cpu_to_be32(
+				       V_FW_WR_LEN16(DIV_ROUND_UP(wr_len, 16)));
+
+		ulpmc->cmd = cmd;
+		ulpmc->dlen = cpu_to_be32(V_ULP_MEMIO_DATA_LEN(
+		    DIV_ROUND_UP(copy_len, T4_ULPTX_MIN_IO)));
+		ulpmc->len16 = cpu_to_be32(DIV_ROUND_UP(wr_len-sizeof(ulpmc->wr),
+						      16));
+		ulpmc->lock_addr = cpu_to_be32(V_ULP_MEMIO_ADDR(addr + i * 3));
+
+		ulpsc = (struct ulptx_idata *)(ulpmc + 1);
+		ulpsc->cmd_more = cpu_to_be32(V_ULPTX_CMD(ULP_TX_SC_IMM));
+		ulpsc->len = cpu_to_be32(roundup(copy_len, T4_ULPTX_MIN_IO));
+
+		to_dp = (u8 *)(ulpsc + 1);
+		from_dp = (u8 *)data + i * C4IW_MAX_INLINE_SIZE;
+		if (data)
+			memcpy(to_dp, from_dp, copy_len);
+		else
+			memset(to_dp, 0, copy_len);
+		if (copy_len % T4_ULPTX_MIN_IO)
+			memset(to_dp + copy_len, 0, T4_ULPTX_MIN_IO -
+			       (copy_len % T4_ULPTX_MIN_IO));
+		t4_wrq_tx(sc, wr);
+		len -= C4IW_MAX_INLINE_SIZE;
+	}
+
+	ret = c4iw_wait_for_reply(rdev, &wr_wait, 0, 0, __func__);
+	return ret;
+}
+
+/*
+ * Build and write a TPT entry.
+ * IN: stag key, pdid, perm, bind_enabled, zbva, to, len, page_size,
+ *     pbl_size and pbl_addr
+ * OUT: stag index
+ */
+static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
+			   u32 *stag, u8 stag_state, u32 pdid,
+			   enum fw_ri_stag_type type, enum fw_ri_mem_perms perm,
+			   int bind_enabled, u32 zbva, u64 to,
+			   u64 len, u8 page_size, u32 pbl_size, u32 pbl_addr)
+{
+	int err;
+	struct fw_ri_tpte tpt;
+	u32 stag_idx;
+	static atomic_t key;
+
+	if (c4iw_fatal_error(rdev))
+		return -EIO;
+
+	stag_state = stag_state > 0;
+	stag_idx = (*stag) >> 8;
+
+	if ((!reset_tpt_entry) && (*stag == T4_STAG_UNSET)) {
+		stag_idx = c4iw_get_resource(&rdev->resource.tpt_table);
+		if (!stag_idx)
+			return -ENOMEM;
+		mutex_lock(&rdev->stats.lock);
+		rdev->stats.stag.cur += 32;
+		if (rdev->stats.stag.cur > rdev->stats.stag.max)
+			rdev->stats.stag.max = rdev->stats.stag.cur;
+		mutex_unlock(&rdev->stats.lock);
+		*stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
+	}
+	CTR5(KTR_IW_CXGBE,
+	    "%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x",
+	    __func__, stag_state, type, pdid, stag_idx);
+
+	/* write TPT entry */
+	if (reset_tpt_entry)
+		memset(&tpt, 0, sizeof(tpt));
+	else {
+		tpt.valid_to_pdid = cpu_to_be32(F_FW_RI_TPTE_VALID |
+			V_FW_RI_TPTE_STAGKEY((*stag & M_FW_RI_TPTE_STAGKEY)) |
+			V_FW_RI_TPTE_STAGSTATE(stag_state) |
+			V_FW_RI_TPTE_STAGTYPE(type) | V_FW_RI_TPTE_PDID(pdid));
+		tpt.locread_to_qpid = cpu_to_be32(V_FW_RI_TPTE_PERM(perm) |
+			(bind_enabled ? F_FW_RI_TPTE_MWBINDEN : 0) |
+			V_FW_RI_TPTE_ADDRTYPE((zbva ? FW_RI_ZERO_BASED_TO :
+						      FW_RI_VA_BASED_TO))|
+			V_FW_RI_TPTE_PS(page_size));
+		tpt.nosnoop_pbladdr = !pbl_size ? 0 : cpu_to_be32(
+			V_FW_RI_TPTE_PBLADDR(PBL_OFF(rdev, pbl_addr)>>3));
+		tpt.len_lo = cpu_to_be32((u32)(len & 0xffffffffUL));
+		tpt.va_hi = cpu_to_be32((u32)(to >> 32));
+		tpt.va_lo_fbo = cpu_to_be32((u32)(to & 0xffffffffUL));
+		tpt.dca_mwbcnt_pstag = cpu_to_be32(0);
+		tpt.len_hi = cpu_to_be32((u32)(len >> 32));
+	}
+	err = write_adapter_mem(rdev, stag_idx +
+				(rdev->adap->vres.stag.start >> 5),
+				sizeof(tpt), &tpt);
+
+	if (reset_tpt_entry) {
+		c4iw_put_resource(&rdev->resource.tpt_table, stag_idx);
+		mutex_lock(&rdev->stats.lock);
+		rdev->stats.stag.cur -= 32;
+		mutex_unlock(&rdev->stats.lock);
+	}
+	return err;
+}
+
+static int write_pbl(struct c4iw_rdev *rdev, __be64 *pbl,
+		     u32 pbl_addr, u32 pbl_size)
+{
+	int err;
+
+	CTR4(KTR_IW_CXGBE, "%s *pdb_addr 0x%x, pbl_base 0x%x, pbl_size %d",
+	     __func__, pbl_addr, rdev->adap->vres.pbl.start, pbl_size);
+
+	err = write_adapter_mem(rdev, pbl_addr >> 5, pbl_size << 3, pbl);
+	return err;
+}
+
+static int dereg_mem(struct c4iw_rdev *rdev, u32 stag, u32 pbl_size,
+		     u32 pbl_addr)
+{
+	return write_tpt_entry(rdev, 1, &stag, 0, 0, 0, 0, 0, 0, 0UL, 0, 0,
+			       pbl_size, pbl_addr);
+}
+
+static int allocate_window(struct c4iw_rdev *rdev, u32 * stag, u32 pdid)
+{
+	*stag = T4_STAG_UNSET;
+	return write_tpt_entry(rdev, 0, stag, 0, pdid, FW_RI_STAG_MW, 0, 0, 0,
+			       0UL, 0, 0, 0, 0);
+}
+
+static int deallocate_window(struct c4iw_rdev *rdev, u32 stag)
+{
+	return write_tpt_entry(rdev, 1, &stag, 0, 0, 0, 0, 0, 0, 0UL, 0, 0, 0,
+			       0);
+}
+
+static int allocate_stag(struct c4iw_rdev *rdev, u32 *stag, u32 pdid,
+			 u32 pbl_size, u32 pbl_addr)
+{
+	*stag = T4_STAG_UNSET;
+	return write_tpt_entry(rdev, 0, stag, 0, pdid, FW_RI_STAG_NSMR, 0, 0, 0,
+			       0UL, 0, 0, pbl_size, pbl_addr);
+}
+
+static int finish_mem_reg(struct c4iw_mr *mhp, u32 stag)
+{
+	u32 mmid;
+
+	mhp->attr.state = 1;
+	mhp->attr.stag = stag;
+	mmid = stag >> 8;
+	mhp->ibmr.rkey = mhp->ibmr.lkey = stag;
+	CTR3(KTR_IW_CXGBE, "%s mmid 0x%x mhp %p", __func__, mmid, mhp);
+	return insert_handle(mhp->rhp, &mhp->rhp->mmidr, mhp, mmid);
+}
+
+static int register_mem(struct c4iw_dev *rhp, struct c4iw_pd *php,
+		      struct c4iw_mr *mhp, int shift)
+{
+	u32 stag = T4_STAG_UNSET;
+	int ret;
+
+	ret = write_tpt_entry(&rhp->rdev, 0, &stag, 1, mhp->attr.pdid,
+			      FW_RI_STAG_NSMR, mhp->attr.perms,
+			      mhp->attr.mw_bind_enable, mhp->attr.zbva,
+			      mhp->attr.va_fbo, mhp->attr.len, shift - 12,
+			      mhp->attr.pbl_size, mhp->attr.pbl_addr);
+	if (ret)
+		return ret;
+
+	ret = finish_mem_reg(mhp, stag);
+	if (ret)
+		dereg_mem(&rhp->rdev, mhp->attr.stag, mhp->attr.pbl_size,
+		       mhp->attr.pbl_addr);
+	return ret;
+}
+
+static int reregister_mem(struct c4iw_dev *rhp, struct c4iw_pd *php,
+			  struct c4iw_mr *mhp, int shift, int npages)
+{
+	u32 stag;
+	int ret;
+
+	if (npages > mhp->attr.pbl_size)
+		return -ENOMEM;
+
+	stag = mhp->attr.stag;
+	ret = write_tpt_entry(&rhp->rdev, 0, &stag, 1, mhp->attr.pdid,
+			      FW_RI_STAG_NSMR, mhp->attr.perms,
+			      mhp->attr.mw_bind_enable, mhp->attr.zbva,
+			      mhp->attr.va_fbo, mhp->attr.len, shift - 12,
+			      mhp->attr.pbl_size, mhp->attr.pbl_addr);
+	if (ret)
+		return ret;
+
+	ret = finish_mem_reg(mhp, stag);
+	if (ret)
+		dereg_mem(&rhp->rdev, mhp->attr.stag, mhp->attr.pbl_size,
+		       mhp->attr.pbl_addr);
+
+	return ret;
+}
+
+static int alloc_pbl(struct c4iw_mr *mhp, int npages)
+{
+	mhp->attr.pbl_addr = c4iw_pblpool_alloc(&mhp->rhp->rdev,
+						    npages << 3);
+
+	if (!mhp->attr.pbl_addr)
+		return -ENOMEM;
+
+	mhp->attr.pbl_size = npages;
+
+	return 0;
+}
+
+static int build_phys_page_list(struct ib_phys_buf *buffer_list,
+				int num_phys_buf, u64 *iova_start,
+				u64 *total_size, int *npages,
+				int *shift, __be64 **page_list)
+{
+	u64 mask;
+	int i, j, n;
+
+	mask = 0;
+	*total_size = 0;
+	for (i = 0; i < num_phys_buf; ++i) {
+		if (i != 0 && buffer_list[i].addr & ~PAGE_MASK)
+			return -EINVAL;
+		if (i != 0 && i != num_phys_buf - 1 &&
+		    (buffer_list[i].size & ~PAGE_MASK))
+			return -EINVAL;
+		*total_size += buffer_list[i].size;
+		if (i > 0)
+			mask |= buffer_list[i].addr;
+		else
+			mask |= buffer_list[i].addr & PAGE_MASK;
+		if (i != num_phys_buf - 1)
+			mask |= buffer_list[i].addr + buffer_list[i].size;
+		else
+			mask |= (buffer_list[i].addr + buffer_list[i].size +
+				PAGE_SIZE - 1) & PAGE_MASK;
+	}
+
+	if (*total_size > 0xFFFFFFFFULL)
+		return -ENOMEM;
+
+	/* Find largest page shift we can use to cover buffers */
+	for (*shift = PAGE_SHIFT; *shift < 27; ++(*shift))
+		if ((1ULL << *shift) & mask)
+			break;
+
+	buffer_list[0].size += buffer_list[0].addr & ((1ULL << *shift) - 1);
+	buffer_list[0].addr &= ~0ull << *shift;
+
+	*npages = 0;
+	for (i = 0; i < num_phys_buf; ++i)
+		*npages += (buffer_list[i].size +
+			(1ULL << *shift) - 1) >> *shift;
+
+	if (!*npages)
+		return -EINVAL;
+
+	*page_list = kmalloc(sizeof(u64) * *npages, GFP_KERNEL);
+	if (!*page_list)
+		return -ENOMEM;
+
+	n = 0;
+	for (i = 0; i < num_phys_buf; ++i)
+		for (j = 0;
+		     j < (buffer_list[i].size + (1ULL << *shift) - 1) >> *shift;
+		     ++j)
+			(*page_list)[n++] = cpu_to_be64(buffer_list[i].addr +
+			    ((u64) j << *shift));
+
+	CTR6(KTR_IW_CXGBE,
+	    "%s va 0x%llx mask 0x%llx shift %d len %lld pbl_size %d", __func__,
+	    (unsigned long long)*iova_start, (unsigned long long)mask, *shift,
+	    (unsigned long long)*total_size, *npages);
+
+	return 0;
+
+}
+
+int c4iw_reregister_phys_mem(struct ib_mr *mr, int mr_rereg_mask,
+			     struct ib_pd *pd, struct ib_phys_buf *buffer_list,
+			     int num_phys_buf, int acc, u64 *iova_start)
+{
+
+	struct c4iw_mr mh, *mhp;
+	struct c4iw_pd *php;
+	struct c4iw_dev *rhp;
+	__be64 *page_list = NULL;
+	int shift = 0;
+	u64 total_size;
+	int npages = 0;
+	int ret;
+
+	CTR3(KTR_IW_CXGBE, "%s ib_mr %p ib_pd %p", __func__, mr, pd);
+
+	/* There can be no memory windows */
+	if (atomic_read(&mr->usecnt))
+		return -EINVAL;
+
+	mhp = to_c4iw_mr(mr);
+	rhp = mhp->rhp;
+	php = to_c4iw_pd(mr->pd);
+
+	/* make sure we are on the same adapter */
+	if (rhp != php->rhp)
+		return -EINVAL;
+
+	memcpy(&mh, mhp, sizeof *mhp);
+
+	if (mr_rereg_mask & IB_MR_REREG_PD)
+		php = to_c4iw_pd(pd);
+	if (mr_rereg_mask & IB_MR_REREG_ACCESS) {
+		mh.attr.perms = c4iw_ib_to_tpt_access(acc);
+		mh.attr.mw_bind_enable = (acc & IB_ACCESS_MW_BIND) ==
+					 IB_ACCESS_MW_BIND;
+	}
+	if (mr_rereg_mask & IB_MR_REREG_TRANS) {
+		ret = build_phys_page_list(buffer_list, num_phys_buf,
+						iova_start,
+						&total_size, &npages,
+						&shift, &page_list);
+		if (ret)
+			return ret;
+	}
+
+	ret = reregister_mem(rhp, php, &mh, shift, npages);
+	kfree(page_list);
+	if (ret)
+		return ret;
+	if (mr_rereg_mask & IB_MR_REREG_PD)
+		mhp->attr.pdid = php->pdid;
+	if (mr_rereg_mask & IB_MR_REREG_ACCESS)
+		mhp->attr.perms = c4iw_ib_to_tpt_access(acc);
+	if (mr_rereg_mask & IB_MR_REREG_TRANS) {
+		mhp->attr.zbva = 0;
+		mhp->attr.va_fbo = *iova_start;
+		mhp->attr.page_size = shift - 12;
+		mhp->attr.len = (u32) total_size;
+		mhp->attr.pbl_size = npages;
+	}
+
+	return 0;
+}
+
+struct ib_mr *c4iw_register_phys_mem(struct ib_pd *pd,
+				     struct ib_phys_buf *buffer_list,
+				     int num_phys_buf, int acc, u64 *iova_start)
+{
+	__be64 *page_list;
+	int shift;
+	u64 total_size;
+	int npages;
+	struct c4iw_dev *rhp;
+	struct c4iw_pd *php;
+	struct c4iw_mr *mhp;
+	int ret;
+
+	CTR2(KTR_IW_CXGBE, "%s ib_pd %p", __func__, pd);
+	php = to_c4iw_pd(pd);
+	rhp = php->rhp;
+
+	mhp = kzalloc(sizeof(*mhp), GFP_KERNEL);
+	if (!mhp)
+		return ERR_PTR(-ENOMEM);
+
+	mhp->rhp = rhp;
+
+	/* First check that we have enough alignment */
+	if ((*iova_start & ~PAGE_MASK) != (buffer_list[0].addr & ~PAGE_MASK)) {
+		ret = -EINVAL;
+		goto err;
+	}
+
+	if (num_phys_buf > 1 &&
+	    ((buffer_list[0].addr + buffer_list[0].size) & ~PAGE_MASK)) {
+		ret = -EINVAL;
+		goto err;
+	}
+
+	ret = build_phys_page_list(buffer_list, num_phys_buf, iova_start,
+					&total_size, &npages, &shift,
+					&page_list);
+	if (ret)
+		goto err;
+
+	ret = alloc_pbl(mhp, npages);
+	if (ret) {
+		kfree(page_list);
+		goto err_pbl;
+	}
+
+	ret = write_pbl(&mhp->rhp->rdev, page_list, mhp->attr.pbl_addr,
+			     npages);
+	kfree(page_list);
+	if (ret)
+		goto err_pbl;
+
+	mhp->attr.pdid = php->pdid;
+	mhp->attr.zbva = 0;
+
+	mhp->attr.perms = c4iw_ib_to_tpt_access(acc);
+	mhp->attr.va_fbo = *iova_start;
+	mhp->attr.page_size = shift - 12;
+
+	mhp->attr.len = (u32) total_size;
+	mhp->attr.pbl_size = npages;
+	ret = register_mem(rhp, php, mhp, shift);
+	if (ret)
+		goto err_pbl;
+
+	return &mhp->ibmr;
+
+err_pbl:
+	c4iw_pblpool_free(&mhp->rhp->rdev, mhp->attr.pbl_addr,
+			      mhp->attr.pbl_size << 3);
+
+err:
+	kfree(mhp);
+	return ERR_PTR(ret);
+
+}
+
+struct ib_mr *c4iw_get_dma_mr(struct ib_pd *pd, int acc)
+{
+	struct c4iw_dev *rhp;
+	struct c4iw_pd *php;
+	struct c4iw_mr *mhp;
+	int ret;
+	u32 stag = T4_STAG_UNSET;
+
+	CTR2(KTR_IW_CXGBE, "%s ib_pd %p", __func__, pd);
+	php = to_c4iw_pd(pd);
+	rhp = php->rhp;
+
+	mhp = kzalloc(sizeof(*mhp), GFP_KERNEL);
+	if (!mhp)
+		return ERR_PTR(-ENOMEM);
+
+	mhp->rhp = rhp;
+	mhp->attr.pdid = php->pdid;
+	mhp->attr.perms = c4iw_ib_to_tpt_access(acc);
+	mhp->attr.mw_bind_enable = (acc&IB_ACCESS_MW_BIND) == IB_ACCESS_MW_BIND;
+	mhp->attr.zbva = 0;
+	mhp->attr.va_fbo = 0;
+	mhp->attr.page_size = 0;
+	mhp->attr.len = ~0UL;
+	mhp->attr.pbl_size = 0;
+
+	ret = write_tpt_entry(&rhp->rdev, 0, &stag, 1, php->pdid,
+			      FW_RI_STAG_NSMR, mhp->attr.perms,
+			      mhp->attr.mw_bind_enable, 0, 0, ~0UL, 0, 0, 0);
+	if (ret)
+		goto err1;
+
+	ret = finish_mem_reg(mhp, stag);
+	if (ret)
+		goto err2;
+	return &mhp->ibmr;
+err2:
+	dereg_mem(&rhp->rdev, mhp->attr.stag, mhp->attr.pbl_size,
+		  mhp->attr.pbl_addr);
+err1:
+	kfree(mhp);
+	return ERR_PTR(ret);
+}
+
+struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start, u64 length,
+    u64 virt, int acc, struct ib_udata *udata, int mr_id)
+{
+	__be64 *pages;
+	int shift, n, len;
+	int i, j, k;
+	int err = 0;
+	struct ib_umem_chunk *chunk;
+	struct c4iw_dev *rhp;
+	struct c4iw_pd *php;
+	struct c4iw_mr *mhp;
+
+	CTR2(KTR_IW_CXGBE, "%s ib_pd %p", __func__, pd);
+
+	if (length == ~0ULL)
+		return ERR_PTR(-EINVAL);
+
+	if ((length + start) < start)
+		return ERR_PTR(-EINVAL);
+
+	php = to_c4iw_pd(pd);
+	rhp = php->rhp;
+	mhp = kzalloc(sizeof(*mhp), GFP_KERNEL);
+	if (!mhp)
+		return ERR_PTR(-ENOMEM);
+
+	mhp->rhp = rhp;
+
+	mhp->umem = ib_umem_get(pd->uobject->context, start, length, acc, 0);
+	if (IS_ERR(mhp->umem)) {
+		err = PTR_ERR(mhp->umem);
+		kfree(mhp);
+		return ERR_PTR(err);
+	}
+
+	shift = ffs(mhp->umem->page_size) - 1;
+
+	n = 0;
+	list_for_each_entry(chunk, &mhp->umem->chunk_list, list)
+		n += chunk->nents;
+
+	err = alloc_pbl(mhp, n);
+	if (err)
+		goto err;
+
+	pages = (__be64 *) __get_free_page(GFP_KERNEL);
+	if (!pages) {
+		err = -ENOMEM;
+		goto err_pbl;
+	}
+
+	i = n = 0;
+
+	list_for_each_entry(chunk, &mhp->umem->chunk_list, list)
+		for (j = 0; j < chunk->nmap; ++j) {
+			len = sg_dma_len(&chunk->page_list[j]) >> shift;
+			for (k = 0; k < len; ++k) {
+				pages[i++] = cpu_to_be64(sg_dma_address(
+					&chunk->page_list[j]) +
+					mhp->umem->page_size * k);
+				if (i == PAGE_SIZE / sizeof *pages) {
+					err = write_pbl(&mhp->rhp->rdev,
+					      pages,
+					      mhp->attr.pbl_addr + (n << 3), i);
+					if (err)
+						goto pbl_done;
+					n += i;
+					i = 0;
+				}
+			}
+		}
+
+	if (i)
+		err = write_pbl(&mhp->rhp->rdev, pages,
+				     mhp->attr.pbl_addr + (n << 3), i);
+
+pbl_done:
+	free_page((unsigned long) pages);
+	if (err)
+		goto err_pbl;
+
+	mhp->attr.pdid = php->pdid;
+	mhp->attr.zbva = 0;
+	mhp->attr.perms = c4iw_ib_to_tpt_access(acc);
+	mhp->attr.va_fbo = virt;
+	mhp->attr.page_size = shift - 12;
+	mhp->attr.len = length;
+
+	err = register_mem(rhp, php, mhp, shift);
+	if (err)
+		goto err_pbl;
+
+	return &mhp->ibmr;
+
+err_pbl:
+	c4iw_pblpool_free(&mhp->rhp->rdev, mhp->attr.pbl_addr,
+			      mhp->attr.pbl_size << 3);
+
+err:
+	ib_umem_release(mhp->umem);
+	kfree(mhp);
+	return ERR_PTR(err);
+}
+
+struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd)
+{
+	struct c4iw_dev *rhp;
+	struct c4iw_pd *php;
+	struct c4iw_mw *mhp;
+	u32 mmid;
+	u32 stag = 0;
+	int ret;
+
+	php = to_c4iw_pd(pd);
+	rhp = php->rhp;
+	mhp = kzalloc(sizeof(*mhp), GFP_KERNEL);
+	if (!mhp)
+		return ERR_PTR(-ENOMEM);
+	ret = allocate_window(&rhp->rdev, &stag, php->pdid);
+	if (ret) {
+		kfree(mhp);
+		return ERR_PTR(ret);
+	}
+	mhp->rhp = rhp;
+	mhp->attr.pdid = php->pdid;
+	mhp->attr.type = FW_RI_STAG_MW;
+	mhp->attr.stag = stag;
+	mmid = (stag) >> 8;
+	mhp->ibmw.rkey = stag;
+	if (insert_handle(rhp, &rhp->mmidr, mhp, mmid)) {
+		deallocate_window(&rhp->rdev, mhp->attr.stag);
+		kfree(mhp);
+		return ERR_PTR(-ENOMEM);
+	}
+	CTR4(KTR_IW_CXGBE, "%s mmid 0x%x mhp %p stag 0x%x", __func__, mmid, mhp,
+	    stag);
+	return &(mhp->ibmw);
+}
+
+int c4iw_dealloc_mw(struct ib_mw *mw)
+{
+	struct c4iw_dev *rhp;
+	struct c4iw_mw *mhp;
+	u32 mmid;
+
+	mhp = to_c4iw_mw(mw);
+	rhp = mhp->rhp;
+	mmid = (mw->rkey) >> 8;
+	remove_handle(rhp, &rhp->mmidr, mmid);
+	deallocate_window(&rhp->rdev, mhp->attr.stag);
+	kfree(mhp);
+	CTR4(KTR_IW_CXGBE, "%s ib_mw %p mmid 0x%x ptr %p", __func__, mw, mmid,
+	    mhp);
+	return 0;
+}
+
+struct ib_mr *c4iw_alloc_fast_reg_mr(struct ib_pd *pd, int pbl_depth)
+{
+	struct c4iw_dev *rhp;
+	struct c4iw_pd *php;
+	struct c4iw_mr *mhp;
+	u32 mmid;
+	u32 stag = 0;
+	int ret = 0;
+
+	php = to_c4iw_pd(pd);
+	rhp = php->rhp;
+	mhp = kzalloc(sizeof(*mhp), GFP_KERNEL);
+	if (!mhp) {
+		ret = -ENOMEM;
+		goto err;
+	}
+
+	mhp->rhp = rhp;
+	ret = alloc_pbl(mhp, pbl_depth);
+	if (ret)
+		goto err1;
+	mhp->attr.pbl_size = pbl_depth;
+	ret = allocate_stag(&rhp->rdev, &stag, php->pdid,
+				 mhp->attr.pbl_size, mhp->attr.pbl_addr);
+	if (ret)
+		goto err2;
+	mhp->attr.pdid = php->pdid;
+	mhp->attr.type = FW_RI_STAG_NSMR;
+	mhp->attr.stag = stag;
+	mhp->attr.state = 1;
+	mmid = (stag) >> 8;
+	mhp->ibmr.rkey = mhp->ibmr.lkey = stag;
+	if (insert_handle(rhp, &rhp->mmidr, mhp, mmid)) {
+		ret = -ENOMEM;
+		goto err3;
+	}
+
+	CTR4(KTR_IW_CXGBE, "%s mmid 0x%x mhp %p stag 0x%x", __func__, mmid, mhp,
+	    stag);
+	return &(mhp->ibmr);
+err3:
+	dereg_mem(&rhp->rdev, stag, mhp->attr.pbl_size,
+		       mhp->attr.pbl_addr);
+err2:
+	c4iw_pblpool_free(&mhp->rhp->rdev, mhp->attr.pbl_addr,
+			      mhp->attr.pbl_size << 3);
+err1:
+	kfree(mhp);
+err:
+	return ERR_PTR(ret);
+}
+
+struct ib_fast_reg_page_list *c4iw_alloc_fastreg_pbl(struct ib_device *device,
+						     int page_list_len)
+{
+	struct c4iw_fr_page_list *c4pl;
+	struct c4iw_dev *dev = to_c4iw_dev(device);
+	bus_addr_t dma_addr;
+	int size = sizeof *c4pl + page_list_len * sizeof(u64);
+
+	c4pl = contigmalloc(size,
+            M_DEVBUF, M_NOWAIT, 0ul, ~0ul, 4096, 0);
+        if (c4pl)
+                dma_addr = vtophys(c4pl);
+        else
+                return ERR_PTR(-ENOMEM);;
+
+	pci_unmap_addr_set(c4pl, mapping, dma_addr);
+	c4pl->dma_addr = dma_addr;
+	c4pl->dev = dev;
+	c4pl->size = size;
+	c4pl->ibpl.page_list = (u64 *)(c4pl + 1);
+	c4pl->ibpl.max_page_list_len = page_list_len;
+
+	return &c4pl->ibpl;
+}
+
+void c4iw_free_fastreg_pbl(struct ib_fast_reg_page_list *ibpl)
+{
+	struct c4iw_fr_page_list *c4pl = to_c4iw_fr_page_list(ibpl);
+	contigfree(c4pl, c4pl->size, M_DEVBUF);
+}
+
+int c4iw_dereg_mr(struct ib_mr *ib_mr)
+{
+	struct c4iw_dev *rhp;
+	struct c4iw_mr *mhp;
+	u32 mmid;
+
+	CTR2(KTR_IW_CXGBE, "%s ib_mr %p", __func__, ib_mr);
+	/* There can be no memory windows */
+	if (atomic_read(&ib_mr->usecnt))
+		return -EINVAL;
+
+	mhp = to_c4iw_mr(ib_mr);
+	rhp = mhp->rhp;
+	mmid = mhp->attr.stag >> 8;
+	remove_handle(rhp, &rhp->mmidr, mmid);
+	dereg_mem(&rhp->rdev, mhp->attr.stag, mhp->attr.pbl_size,
+		       mhp->attr.pbl_addr);
+	if (mhp->attr.pbl_size)
+		c4iw_pblpool_free(&mhp->rhp->rdev, mhp->attr.pbl_addr,
+				  mhp->attr.pbl_size << 3);
+	if (mhp->kva)
+		kfree((void *) (unsigned long) mhp->kva);
+	if (mhp->umem)
+		ib_umem_release(mhp->umem);
+	CTR3(KTR_IW_CXGBE, "%s mmid 0x%x ptr %p", __func__, mmid, mhp);
+	kfree(mhp);
+	return 0;
+}
+#endif
diff --git a/sys/dev/cxgbe/iw_cxgbe/provider.c b/sys/dev/cxgbe/iw_cxgbe/provider.c
new file mode 100644
index 00000000000..2a25ad8e39d
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/provider.c
@@ -0,0 +1,498 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+
+#ifdef TCP_OFFLOAD
+#include <asm/pgtable.h>
+#include <linux/page.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_user_verbs.h>
+
+#include "iw_cxgbe.h"
+#include "user.h"
+
+static int fastreg_support = 1;
+module_param(fastreg_support, int, 0644);
+MODULE_PARM_DESC(fastreg_support, "Advertise fastreg support (default = 1)");
+
+static int c4iw_modify_port(struct ib_device *ibdev,
+			    u8 port, int port_modify_mask,
+			    struct ib_port_modify *props)
+{
+	return -ENOSYS;
+}
+
+static struct ib_ah *c4iw_ah_create(struct ib_pd *pd,
+				    struct ib_ah_attr *ah_attr)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
+static int c4iw_ah_destroy(struct ib_ah *ah)
+{
+	return -ENOSYS;
+}
+
+static int c4iw_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
+{
+	return -ENOSYS;
+}
+
+static int c4iw_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
+{
+	return -ENOSYS;
+}
+
+static int c4iw_process_mad(struct ib_device *ibdev, int mad_flags,
+			    u8 port_num, struct ib_wc *in_wc,
+			    struct ib_grh *in_grh, struct ib_mad *in_mad,
+			    struct ib_mad *out_mad)
+{
+	return -ENOSYS;
+}
+
+static int c4iw_dealloc_ucontext(struct ib_ucontext *context)
+{
+	struct c4iw_dev *rhp = to_c4iw_dev(context->device);
+	struct c4iw_ucontext *ucontext = to_c4iw_ucontext(context);
+	struct c4iw_mm_entry *mm, *tmp;
+
+	CTR2(KTR_IW_CXGBE, "%s context %p", __func__, context);
+	list_for_each_entry_safe(mm, tmp, &ucontext->mmaps, entry)
+		kfree(mm);
+	c4iw_release_dev_ucontext(&rhp->rdev, &ucontext->uctx);
+	kfree(ucontext);
+	return 0;
+}
+
+static struct ib_ucontext *c4iw_alloc_ucontext(struct ib_device *ibdev,
+					       struct ib_udata *udata)
+{
+	struct c4iw_ucontext *context;
+	struct c4iw_dev *rhp = to_c4iw_dev(ibdev);
+
+	CTR2(KTR_IW_CXGBE, "%s ibdev %p", __func__, ibdev);
+	context = kzalloc(sizeof(*context), GFP_KERNEL);
+	if (!context)
+		return ERR_PTR(-ENOMEM);
+	c4iw_init_dev_ucontext(&rhp->rdev, &context->uctx);
+	INIT_LIST_HEAD(&context->mmaps);
+	spin_lock_init(&context->mmap_lock);
+	return &context->ibucontext;
+}
+
+static inline pgprot_t t4_pgprot_wc(pgprot_t prot)
+{
+    return pgprot_writecombine(prot);
+}
+
+static int c4iw_mmap(struct ib_ucontext *context, struct vm_area_struct *vma)
+{
+	int len = vma->vm_end - vma->vm_start;
+	u32 key = vma->vm_pgoff << PAGE_SHIFT;
+	struct c4iw_rdev *rdev;
+	int ret = 0;
+	struct c4iw_mm_entry *mm;
+	struct c4iw_ucontext *ucontext;
+	u64 addr, paddr;
+
+	u64 va_regs_res = 0, va_udbs_res = 0;
+	u64 len_regs_res = 0, len_udbs_res = 0;
+
+	CTR3(KTR_IW_CXGBE, "%s:1 ctx %p vma %p", __func__, context, vma);
+
+	CTR4(KTR_IW_CXGBE, "%s:1a pgoff 0x%lx key 0x%x len %d", __func__,
+	    vma->vm_pgoff, key, len);
+
+	if (vma->vm_start & (PAGE_SIZE-1)) {
+		CTR3(KTR_IW_CXGBE, "%s:2 unaligned vm_start %u vma %p",
+		    __func__, vma->vm_start, vma);
+		return -EINVAL;
+	}
+
+	rdev = &(to_c4iw_dev(context->device)->rdev);
+	ucontext = to_c4iw_ucontext(context);
+
+	mm = remove_mmap(ucontext, key, len);
+	if (!mm) {
+		CTR4(KTR_IW_CXGBE, "%s:3 ucontext %p key %u len %u", __func__,
+		    ucontext, key, len);
+		return -EINVAL;
+	}
+	addr = mm->addr;
+	kfree(mm);
+
+	va_regs_res = (u64)rman_get_virtual(rdev->adap->regs_res);
+	len_regs_res = (u64)rman_get_size(rdev->adap->regs_res);
+	va_udbs_res = (u64)rman_get_virtual(rdev->adap->udbs_res);
+	len_udbs_res = (u64)rman_get_size(rdev->adap->udbs_res);
+
+	CTR6(KTR_IW_CXGBE,
+	    "%s:4 addr %p, masync region %p:%p, udb region %p:%p", __func__,
+	    addr, va_regs_res, va_regs_res+len_regs_res, va_udbs_res,
+	    va_udbs_res+len_udbs_res);
+
+	if (addr >= va_regs_res && addr < va_regs_res + len_regs_res) {
+		CTR4(KTR_IW_CXGBE, "%s:5 MA_SYNC addr %p region %p, reglen %u",
+		    __func__, addr, va_regs_res, len_regs_res);
+		/*
+		 * MA_SYNC register...
+		 */
+		paddr = vtophys(addr);
+		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+		ret = io_remap_pfn_range(vma, vma->vm_start,
+				paddr >> PAGE_SHIFT,
+				len, vma->vm_page_prot);
+	} else {
+
+		if (addr >= va_udbs_res && addr < va_udbs_res + len_udbs_res) {
+			/*
+			* Map user DB or OCQP memory...
+			*/
+			paddr = vtophys(addr);
+			CTR4(KTR_IW_CXGBE,
+			    "%s:6 USER DB-GTS addr %p region %p, reglen %u",
+			    __func__, addr, va_udbs_res, len_udbs_res);
+#ifdef DOT5
+			if (is_t5(rdev->lldi.adapter_type) && map_udb_as_wc)
+				vma->vm_page_prot = t4_pgprot_wc(vma->vm_page_prot);
+			else
+#endif
+				vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+			ret = io_remap_pfn_range(vma, vma->vm_start,
+					paddr >> PAGE_SHIFT,
+					len, vma->vm_page_prot);
+		} else {
+			/*
+			 * Map WQ or CQ contig dma memory...
+			 */
+			CTR4(KTR_IW_CXGBE,
+			    "%s:7 WQ/CQ addr %p vm_start %u vma %p", __func__,
+			    addr, vma->vm_start, vma);
+			ret = io_remap_pfn_range(vma, vma->vm_start,
+				addr >> PAGE_SHIFT,
+				len, vma->vm_page_prot);
+		}
+	}
+	CTR4(KTR_IW_CXGBE, "%s:8 ctx %p vma %p ret %u", __func__, context, vma,
+	    ret);
+	return ret;
+}
+
+static int
+c4iw_deallocate_pd(struct ib_pd *pd)
+{
+	struct c4iw_pd *php = to_c4iw_pd(pd);
+	struct c4iw_dev *rhp = php->rhp;
+
+	CTR3(KTR_IW_CXGBE, "%s: pd %p, pdid 0x%x", __func__, pd, php->pdid);
+
+	c4iw_put_resource(&rhp->rdev.resource.pdid_table, php->pdid);
+	mutex_lock(&rhp->rdev.stats.lock);
+	rhp->rdev.stats.pd.cur--;
+	mutex_unlock(&rhp->rdev.stats.lock);
+	kfree(php);
+
+	return (0);
+}
+
+static struct ib_pd *
+c4iw_allocate_pd(struct ib_device *ibdev, struct ib_ucontext *context,
+    struct ib_udata *udata)
+{
+	struct c4iw_pd *php;
+	u32 pdid;
+	struct c4iw_dev *rhp;
+
+	CTR4(KTR_IW_CXGBE, "%s: ibdev %p, context %p, data %p", __func__, ibdev,
+	    context, udata);
+	rhp = (struct c4iw_dev *) ibdev;
+	pdid =  c4iw_get_resource(&rhp->rdev.resource.pdid_table);
+	if (!pdid)
+		return ERR_PTR(-EINVAL);
+	php = kzalloc(sizeof(*php), GFP_KERNEL);
+	if (!php) {
+		c4iw_put_resource(&rhp->rdev.resource.pdid_table, pdid);
+		return ERR_PTR(-ENOMEM);
+	}
+	php->pdid = pdid;
+	php->rhp = rhp;
+	if (context) {
+		if (ib_copy_to_udata(udata, &php->pdid, sizeof(u32))) {
+			c4iw_deallocate_pd(&php->ibpd);
+			return ERR_PTR(-EFAULT);
+		}
+	}
+	mutex_lock(&rhp->rdev.stats.lock);
+	rhp->rdev.stats.pd.cur++;
+	if (rhp->rdev.stats.pd.cur > rhp->rdev.stats.pd.max)
+		rhp->rdev.stats.pd.max = rhp->rdev.stats.pd.cur;
+	mutex_unlock(&rhp->rdev.stats.lock);
+
+	CTR6(KTR_IW_CXGBE,
+	    "%s: ibdev %p, context %p, data %p, pddid 0x%x, pd %p", __func__,
+	    ibdev, context, udata, pdid, php);
+	return (&php->ibpd);
+}
+
+static int
+c4iw_query_pkey(struct ib_device *ibdev, u8 port, u16 index, u16 *pkey)
+{
+
+	CTR5(KTR_IW_CXGBE, "%s ibdev %p, port %d, index %d, pkey %p", __func__,
+	    ibdev, port, index, pkey);
+
+	*pkey = 0;
+	return (0);
+}
+
+static int
+c4iw_query_gid(struct ib_device *ibdev, u8 port, int index, union ib_gid *gid)
+{
+	struct c4iw_dev *dev;
+	struct port_info *pi;
+	struct adapter *sc;
+
+	CTR5(KTR_IW_CXGBE, "%s ibdev %p, port %d, index %d, gid %p", __func__,
+	    ibdev, port, index, gid);
+
+	memset(&gid->raw[0], 0, sizeof(gid->raw));
+	dev = to_c4iw_dev(ibdev);
+	sc = dev->rdev.adap;
+	if (port == 0 || port > sc->params.nports)
+		return (-EINVAL);
+	pi = sc->port[port - 1];
+	memcpy(&gid->raw[0], pi->hw_addr, sizeof(pi->hw_addr));
+	return (0);
+}
+
+static int
+c4iw_query_device(struct ib_device *ibdev, struct ib_device_attr *props)
+{
+	struct c4iw_dev *dev = to_c4iw_dev(ibdev);
+	struct adapter *sc = dev->rdev.adap;
+
+	CTR3(KTR_IW_CXGBE, "%s ibdev %p, props %p", __func__, ibdev, props);
+
+	memset(props, 0, sizeof *props);
+	memcpy(&props->sys_image_guid, sc->port[0]->hw_addr, 6);
+	props->hw_ver = sc->params.chipid;
+	props->fw_ver = sc->params.fw_vers;
+	props->device_cap_flags = dev->device_cap_flags;
+	props->page_size_cap = T4_PAGESIZE_MASK;
+	props->vendor_id = pci_get_vendor(sc->dev);
+	props->vendor_part_id = pci_get_device(sc->dev);
+	props->max_mr_size = T4_MAX_MR_SIZE;
+	props->max_qp = T4_MAX_NUM_QP;
+	props->max_qp_wr = T4_MAX_QP_DEPTH;
+	props->max_sge = T4_MAX_RECV_SGE;
+	props->max_sge_rd = 1;
+	props->max_qp_rd_atom = c4iw_max_read_depth;
+	props->max_qp_init_rd_atom = c4iw_max_read_depth;
+	props->max_cq = T4_MAX_NUM_CQ;
+	props->max_cqe = T4_MAX_CQ_DEPTH;
+	props->max_mr = c4iw_num_stags(&dev->rdev);
+	props->max_pd = T4_MAX_NUM_PD;
+	props->local_ca_ack_delay = 0;
+	props->max_fast_reg_page_list_len = T4_MAX_FR_DEPTH;
+
+	return (0);
+}
+
+/*
+ * Returns -errno on failure.
+ */
+static int
+c4iw_query_port(struct ib_device *ibdev, u8 port, struct ib_port_attr *props)
+{
+	struct c4iw_dev *dev;
+	struct adapter *sc;
+	struct port_info *pi;
+	struct ifnet *ifp;
+
+	CTR4(KTR_IW_CXGBE, "%s ibdev %p, port %d, props %p", __func__, ibdev,
+	    port, props);
+
+	dev = to_c4iw_dev(ibdev);
+	sc = dev->rdev.adap;
+	if (port > sc->params.nports)
+		return (-EINVAL);
+	pi = sc->port[port - 1];
+	ifp = pi->ifp;
+
+	memset(props, 0, sizeof(struct ib_port_attr));
+	props->max_mtu = IB_MTU_4096;
+	if (ifp->if_mtu >= 4096)
+		props->active_mtu = IB_MTU_4096;
+	else if (ifp->if_mtu >= 2048)
+		props->active_mtu = IB_MTU_2048;
+	else if (ifp->if_mtu >= 1024)
+		props->active_mtu = IB_MTU_1024;
+	else if (ifp->if_mtu >= 512)
+		props->active_mtu = IB_MTU_512;
+	else
+		props->active_mtu = IB_MTU_256;
+	props->state = pi->link_cfg.link_ok ? IB_PORT_ACTIVE : IB_PORT_DOWN;
+	props->port_cap_flags =
+	    IB_PORT_CM_SUP |
+	    IB_PORT_SNMP_TUNNEL_SUP |
+	    IB_PORT_REINIT_SUP |
+	    IB_PORT_DEVICE_MGMT_SUP |
+	    IB_PORT_VENDOR_CLASS_SUP | IB_PORT_BOOT_MGMT_SUP;
+	props->gid_tbl_len = 1;
+	props->pkey_tbl_len = 1;
+	props->active_width = 2;
+	props->active_speed = 2;
+	props->max_msg_sz = -1;
+
+	return 0;
+}
+
+/*
+ * Returns -errno on error.
+ */
+int
+c4iw_register_device(struct c4iw_dev *dev)
+{
+	struct adapter *sc = dev->rdev.adap;
+	struct ib_device *ibdev = &dev->ibdev;
+	struct iw_cm_verbs *iwcm;
+	int ret;
+
+	CTR3(KTR_IW_CXGBE, "%s c4iw_dev %p, adapter %p", __func__, dev, sc);
+	BUG_ON(!sc->port[0]);
+	strlcpy(ibdev->name, device_get_nameunit(sc->dev), sizeof(ibdev->name));
+	memset(&ibdev->node_guid, 0, sizeof(ibdev->node_guid));
+	memcpy(&ibdev->node_guid, sc->port[0]->hw_addr, 6);
+	ibdev->owner = THIS_MODULE;
+	dev->device_cap_flags = IB_DEVICE_LOCAL_DMA_LKEY | IB_DEVICE_MEM_WINDOW;
+	if (fastreg_support)
+		dev->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;
+	ibdev->local_dma_lkey = 0;
+	ibdev->uverbs_cmd_mask =
+	    (1ull << IB_USER_VERBS_CMD_GET_CONTEXT) |
+	    (1ull << IB_USER_VERBS_CMD_QUERY_DEVICE) |
+	    (1ull << IB_USER_VERBS_CMD_QUERY_PORT) |
+	    (1ull << IB_USER_VERBS_CMD_ALLOC_PD) |
+	    (1ull << IB_USER_VERBS_CMD_DEALLOC_PD) |
+	    (1ull << IB_USER_VERBS_CMD_REG_MR) |
+	    (1ull << IB_USER_VERBS_CMD_DEREG_MR) |
+	    (1ull << IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL) |
+	    (1ull << IB_USER_VERBS_CMD_CREATE_CQ) |
+	    (1ull << IB_USER_VERBS_CMD_DESTROY_CQ) |
+	    (1ull << IB_USER_VERBS_CMD_REQ_NOTIFY_CQ) |
+	    (1ull << IB_USER_VERBS_CMD_CREATE_QP) |
+	    (1ull << IB_USER_VERBS_CMD_MODIFY_QP) |
+	    (1ull << IB_USER_VERBS_CMD_QUERY_QP) |
+	    (1ull << IB_USER_VERBS_CMD_POLL_CQ) |
+	    (1ull << IB_USER_VERBS_CMD_DESTROY_QP) |
+	    (1ull << IB_USER_VERBS_CMD_POST_SEND) |
+	    (1ull << IB_USER_VERBS_CMD_POST_RECV);
+	ibdev->node_type = RDMA_NODE_RNIC;
+	strlcpy(ibdev->node_desc, C4IW_NODE_DESC, sizeof(ibdev->node_desc));
+	ibdev->phys_port_cnt = sc->params.nports;
+	ibdev->num_comp_vectors = 1;
+	ibdev->dma_device = sc->dev;
+	ibdev->query_device = c4iw_query_device;
+	ibdev->query_port = c4iw_query_port;
+	ibdev->modify_port = c4iw_modify_port;
+	ibdev->query_pkey = c4iw_query_pkey;
+	ibdev->query_gid = c4iw_query_gid;
+	ibdev->alloc_ucontext = c4iw_alloc_ucontext;
+	ibdev->dealloc_ucontext = c4iw_dealloc_ucontext;
+	ibdev->mmap = c4iw_mmap;
+	ibdev->alloc_pd = c4iw_allocate_pd;
+	ibdev->dealloc_pd = c4iw_deallocate_pd;
+	ibdev->create_ah = c4iw_ah_create;
+	ibdev->destroy_ah = c4iw_ah_destroy;
+	ibdev->create_qp = c4iw_create_qp;
+	ibdev->modify_qp = c4iw_ib_modify_qp;
+	ibdev->query_qp = c4iw_ib_query_qp;
+	ibdev->destroy_qp = c4iw_destroy_qp;
+	ibdev->create_cq = c4iw_create_cq;
+	ibdev->destroy_cq = c4iw_destroy_cq;
+	ibdev->resize_cq = c4iw_resize_cq;
+	ibdev->poll_cq = c4iw_poll_cq;
+	ibdev->get_dma_mr = c4iw_get_dma_mr;
+	ibdev->reg_phys_mr = c4iw_register_phys_mem;
+	ibdev->rereg_phys_mr = c4iw_reregister_phys_mem;
+	ibdev->reg_user_mr = c4iw_reg_user_mr;
+	ibdev->dereg_mr = c4iw_dereg_mr;
+	ibdev->alloc_mw = c4iw_alloc_mw;
+	ibdev->bind_mw = c4iw_bind_mw;
+	ibdev->dealloc_mw = c4iw_dealloc_mw;
+	ibdev->alloc_fast_reg_mr = c4iw_alloc_fast_reg_mr;
+	ibdev->alloc_fast_reg_page_list = c4iw_alloc_fastreg_pbl;
+	ibdev->free_fast_reg_page_list = c4iw_free_fastreg_pbl;
+	ibdev->attach_mcast = c4iw_multicast_attach;
+	ibdev->detach_mcast = c4iw_multicast_detach;
+	ibdev->process_mad = c4iw_process_mad;
+	ibdev->req_notify_cq = c4iw_arm_cq;
+	ibdev->post_send = c4iw_post_send;
+	ibdev->post_recv = c4iw_post_receive;
+	ibdev->uverbs_abi_ver = C4IW_UVERBS_ABI_VERSION;
+
+	iwcm = kmalloc(sizeof(*iwcm), GFP_KERNEL);
+	if (iwcm == NULL)
+		return (-ENOMEM);
+
+	iwcm->connect = c4iw_connect;
+	iwcm->accept = c4iw_accept_cr;
+	iwcm->reject = c4iw_reject_cr;
+	iwcm->create_listen = c4iw_create_listen;
+	iwcm->destroy_listen = c4iw_destroy_listen;
+	iwcm->add_ref = c4iw_qp_add_ref;
+	iwcm->rem_ref = c4iw_qp_rem_ref;
+	iwcm->get_qp = c4iw_get_qp;
+	ibdev->iwcm = iwcm;
+
+	ret = ib_register_device(&dev->ibdev, NULL);
+	if (ret)
+		kfree(iwcm);
+
+	return (ret);
+}
+
+void
+c4iw_unregister_device(struct c4iw_dev *dev)
+{
+
+	CTR3(KTR_IW_CXGBE, "%s c4iw_dev %p, adapter %p", __func__, dev,
+	    dev->rdev.adap);
+	ib_unregister_device(&dev->ibdev);
+	kfree(dev->ibdev.iwcm);
+	return;
+}
+#endif
diff --git a/sys/dev/cxgbe/iw_cxgbe/qp.c b/sys/dev/cxgbe/iw_cxgbe/qp.c
new file mode 100644
index 00000000000..f983d556e13
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/qp.c
@@ -0,0 +1,1707 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+
+#ifdef TCP_OFFLOAD
+#include <sys/types.h>
+#include <sys/malloc.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/sockio.h>
+#include <sys/taskqueue.h>
+#include <netinet/in.h>
+#include <net/neighbour.h>
+#include <net/route.h>
+
+#include <netinet/in_systm.h>
+#include <netinet/in_pcb.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/tcp_var.h>
+#include <netinet/tcp.h>
+#include <netinet/tcpip.h>
+
+#include <netinet/toecore.h>
+
+struct sge_iq;
+struct rss_header;
+#include <linux/types.h>
+#include "offload.h"
+#include "tom/t4_tom.h"
+
+#include "iw_cxgbe.h"
+#include "user.h"
+
+extern int db_delay_usecs;
+extern int db_fc_threshold;
+static void creds(struct toepcb *toep, size_t wrsize);
+
+
+static void set_state(struct c4iw_qp *qhp, enum c4iw_qp_state state)
+{
+	unsigned long flag;
+	spin_lock_irqsave(&qhp->lock, flag);
+	qhp->attr.state = state;
+	spin_unlock_irqrestore(&qhp->lock, flag);
+}
+
+static void dealloc_host_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
+{
+
+	contigfree(sq->queue, sq->memsize, M_DEVBUF);
+}
+
+static void dealloc_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
+{
+
+	dealloc_host_sq(rdev, sq);
+}
+
+static int alloc_host_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
+{
+	sq->queue = contigmalloc(sq->memsize, M_DEVBUF, M_NOWAIT, 0ul, ~0ul,
+	    4096, 0);
+
+	if (sq->queue)
+		sq->dma_addr = vtophys(sq->queue);
+	else
+		return -ENOMEM;
+	sq->phys_addr = vtophys(sq->queue);
+	pci_unmap_addr_set(sq, mapping, sq->dma_addr);
+	CTR4(KTR_IW_CXGBE, "%s sq %p dma_addr %p phys_addr %p", __func__,
+	    sq->queue, sq->dma_addr, sq->phys_addr);
+	return 0;
+}
+
+static int destroy_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
+		      struct c4iw_dev_ucontext *uctx)
+{
+	/*
+	 * uP clears EQ contexts when the connection exits rdma mode,
+	 * so no need to post a RESET WR for these EQs.
+	 */
+	contigfree(wq->rq.queue, wq->rq.memsize, M_DEVBUF);
+	dealloc_sq(rdev, &wq->sq);
+	c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);
+	kfree(wq->rq.sw_rq);
+	kfree(wq->sq.sw_sq);
+	c4iw_put_qpid(rdev, wq->rq.qid, uctx);
+	c4iw_put_qpid(rdev, wq->sq.qid, uctx);
+	return 0;
+}
+
+static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
+		     struct t4_cq *rcq, struct t4_cq *scq,
+		     struct c4iw_dev_ucontext *uctx)
+{
+	struct adapter *sc = rdev->adap;
+	int user = (uctx != &rdev->uctx);
+	struct fw_ri_res_wr *res_wr;
+	struct fw_ri_res *res;
+	int wr_len;
+	struct c4iw_wr_wait wr_wait;
+	int ret;
+	int eqsize;
+	struct wrqe *wr;
+
+	wq->sq.qid = c4iw_get_qpid(rdev, uctx);
+	if (!wq->sq.qid)
+		return -ENOMEM;
+
+	wq->rq.qid = c4iw_get_qpid(rdev, uctx);
+	if (!wq->rq.qid)
+		goto err1;
+
+	if (!user) {
+		wq->sq.sw_sq = kzalloc(wq->sq.size * sizeof *wq->sq.sw_sq,
+				 GFP_KERNEL);
+		if (!wq->sq.sw_sq)
+			goto err2;
+
+		wq->rq.sw_rq = kzalloc(wq->rq.size * sizeof *wq->rq.sw_rq,
+				 GFP_KERNEL);
+		if (!wq->rq.sw_rq)
+			goto err3;
+	}
+
+	/* RQT must be a power of 2. */
+	wq->rq.rqt_size = roundup_pow_of_two(wq->rq.size);
+	wq->rq.rqt_hwaddr = c4iw_rqtpool_alloc(rdev, wq->rq.rqt_size);
+	if (!wq->rq.rqt_hwaddr)
+		goto err4;
+
+	if (alloc_host_sq(rdev, &wq->sq))
+		goto err5;
+
+	memset(wq->sq.queue, 0, wq->sq.memsize);
+	pci_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
+
+	wq->rq.queue = contigmalloc(wq->rq.memsize,
+            M_DEVBUF, M_NOWAIT, 0ul, ~0ul, 4096, 0);
+        if (wq->rq.queue)
+                wq->rq.dma_addr = vtophys(wq->rq.queue);
+        else
+                goto err6;
+	CTR5(KTR_IW_CXGBE,
+	    "%s sq base va 0x%p pa 0x%llx rq base va 0x%p pa 0x%llx", __func__,
+	    wq->sq.queue, (unsigned long long)vtophys(wq->sq.queue),
+	    wq->rq.queue, (unsigned long long)vtophys(wq->rq.queue));
+	memset(wq->rq.queue, 0, wq->rq.memsize);
+	pci_unmap_addr_set(&wq->rq, mapping, wq->rq.dma_addr);
+
+	wq->db = (void *)((unsigned long)rman_get_virtual(sc->regs_res) +
+	    MYPF_REG(SGE_PF_KDOORBELL));
+	wq->gts = (void *)((unsigned long)rman_get_virtual(rdev->adap->regs_res)
+			   + MYPF_REG(SGE_PF_GTS));
+	if (user) {
+		wq->sq.udb = (u64)((char*)rman_get_virtual(rdev->adap->udbs_res) +
+						(wq->sq.qid << rdev->qpshift));
+		wq->sq.udb &= PAGE_MASK;
+		wq->rq.udb = (u64)((char*)rman_get_virtual(rdev->adap->udbs_res) +
+						(wq->rq.qid << rdev->qpshift));
+		wq->rq.udb &= PAGE_MASK;
+	}
+	wq->rdev = rdev;
+	wq->rq.msn = 1;
+
+	/* build fw_ri_res_wr */
+	wr_len = sizeof *res_wr + 2 * sizeof *res;
+
+	wr = alloc_wrqe(wr_len, &sc->sge.mgmtq);
+        if (wr == NULL)
+		return (0);
+        res_wr = wrtod(wr);
+
+	memset(res_wr, 0, wr_len);
+	res_wr->op_nres = cpu_to_be32(
+			V_FW_WR_OP(FW_RI_RES_WR) |
+			V_FW_RI_RES_WR_NRES(2) |
+			F_FW_WR_COMPL);
+	res_wr->len16_pkd = cpu_to_be32(DIV_ROUND_UP(wr_len, 16));
+	res_wr->cookie = (unsigned long) &wr_wait;
+	res = res_wr->res;
+	res->u.sqrq.restype = FW_RI_RES_TYPE_SQ;
+	res->u.sqrq.op = FW_RI_RES_OP_WRITE;
+
+	/* eqsize is the number of 64B entries plus the status page size. */
+	eqsize = wq->sq.size * T4_SQ_NUM_SLOTS + spg_creds;
+
+	res->u.sqrq.fetchszm_to_iqid = cpu_to_be32(
+		V_FW_RI_RES_WR_HOSTFCMODE(0) |	/* no host cidx updates */
+		V_FW_RI_RES_WR_CPRIO(0) |	/* don't keep in chip cache */
+		V_FW_RI_RES_WR_PCIECHN(0) |	/* set by uP at ri_init time */
+		V_FW_RI_RES_WR_IQID(scq->cqid));
+	res->u.sqrq.dcaen_to_eqsize = cpu_to_be32(
+		V_FW_RI_RES_WR_DCAEN(0) |
+		V_FW_RI_RES_WR_DCACPU(0) |
+		V_FW_RI_RES_WR_FBMIN(2) |
+		V_FW_RI_RES_WR_FBMAX(2) |
+		V_FW_RI_RES_WR_CIDXFTHRESHO(0) |
+		V_FW_RI_RES_WR_CIDXFTHRESH(0) |
+		V_FW_RI_RES_WR_EQSIZE(eqsize));
+	res->u.sqrq.eqid = cpu_to_be32(wq->sq.qid);
+	res->u.sqrq.eqaddr = cpu_to_be64(wq->sq.dma_addr);
+	res++;
+	res->u.sqrq.restype = FW_RI_RES_TYPE_RQ;
+	res->u.sqrq.op = FW_RI_RES_OP_WRITE;
+
+	/* eqsize is the number of 64B entries plus the status page size. */
+	eqsize = wq->rq.size * T4_RQ_NUM_SLOTS + spg_creds ;
+	res->u.sqrq.fetchszm_to_iqid = cpu_to_be32(
+		V_FW_RI_RES_WR_HOSTFCMODE(0) |	/* no host cidx updates */
+		V_FW_RI_RES_WR_CPRIO(0) |	/* don't keep in chip cache */
+		V_FW_RI_RES_WR_PCIECHN(0) |	/* set by uP at ri_init time */
+		V_FW_RI_RES_WR_IQID(rcq->cqid));
+	res->u.sqrq.dcaen_to_eqsize = cpu_to_be32(
+		V_FW_RI_RES_WR_DCAEN(0) |
+		V_FW_RI_RES_WR_DCACPU(0) |
+		V_FW_RI_RES_WR_FBMIN(2) |
+		V_FW_RI_RES_WR_FBMAX(2) |
+		V_FW_RI_RES_WR_CIDXFTHRESHO(0) |
+		V_FW_RI_RES_WR_CIDXFTHRESH(0) |
+		V_FW_RI_RES_WR_EQSIZE(eqsize));
+	res->u.sqrq.eqid = cpu_to_be32(wq->rq.qid);
+	res->u.sqrq.eqaddr = cpu_to_be64(wq->rq.dma_addr);
+
+	c4iw_init_wr_wait(&wr_wait);
+
+	t4_wrq_tx(sc, wr);
+	ret = c4iw_wait_for_reply(rdev, &wr_wait, 0, wq->sq.qid, __func__);
+	if (ret)
+		goto err7;
+
+	CTR6(KTR_IW_CXGBE,
+	    "%s sqid 0x%x rqid 0x%x kdb 0x%p squdb 0x%llx rqudb 0x%llx",
+	    __func__, wq->sq.qid, wq->rq.qid, wq->db,
+	    (unsigned long long)wq->sq.udb, (unsigned long long)wq->rq.udb);
+
+	return 0;
+err7:
+	contigfree(wq->rq.queue, wq->rq.memsize, M_DEVBUF);
+err6:
+	dealloc_sq(rdev, &wq->sq);
+err5:
+	c4iw_rqtpool_free(rdev, wq->rq.rqt_hwaddr, wq->rq.rqt_size);
+err4:
+	kfree(wq->rq.sw_rq);
+err3:
+	kfree(wq->sq.sw_sq);
+err2:
+	c4iw_put_qpid(rdev, wq->rq.qid, uctx);
+err1:
+	c4iw_put_qpid(rdev, wq->sq.qid, uctx);
+	return -ENOMEM;
+}
+
+static int build_immd(struct t4_sq *sq, struct fw_ri_immd *immdp,
+		      struct ib_send_wr *wr, int max, u32 *plenp)
+{
+	u8 *dstp, *srcp;
+	u32 plen = 0;
+	int i;
+	int rem, len;
+
+	dstp = (u8 *)immdp->data;
+	for (i = 0; i < wr->num_sge; i++) {
+		if ((plen + wr->sg_list[i].length) > max)
+			return -EMSGSIZE;
+		srcp = (u8 *)(unsigned long)wr->sg_list[i].addr;
+		plen += wr->sg_list[i].length;
+		rem = wr->sg_list[i].length;
+		while (rem) {
+			if (dstp == (u8 *)&sq->queue[sq->size])
+				dstp = (u8 *)sq->queue;
+			if (rem <= (u8 *)&sq->queue[sq->size] - dstp)
+				len = rem;
+			else
+				len = (u8 *)&sq->queue[sq->size] - dstp;
+			memcpy(dstp, srcp, len);
+			dstp += len;
+			srcp += len;
+			rem -= len;
+		}
+	}
+	len = roundup(plen + sizeof *immdp, 16) - (plen + sizeof *immdp);
+	if (len)
+		memset(dstp, 0, len);
+	immdp->op = FW_RI_DATA_IMMD;
+	immdp->r1 = 0;
+	immdp->r2 = 0;
+	immdp->immdlen = cpu_to_be32(plen);
+	*plenp = plen;
+	return 0;
+}
+
+static int build_isgl(__be64 *queue_start, __be64 *queue_end,
+		      struct fw_ri_isgl *isglp, struct ib_sge *sg_list,
+		      int num_sge, u32 *plenp)
+
+{
+	int i;
+	u32 plen = 0;
+	__be64 *flitp = (__be64 *)isglp->sge;
+
+	for (i = 0; i < num_sge; i++) {
+		if ((plen + sg_list[i].length) < plen)
+			return -EMSGSIZE;
+		plen += sg_list[i].length;
+		*flitp = cpu_to_be64(((u64)sg_list[i].lkey << 32) |
+				     sg_list[i].length);
+		if (++flitp == queue_end)
+			flitp = queue_start;
+		*flitp = cpu_to_be64(sg_list[i].addr);
+		if (++flitp == queue_end)
+			flitp = queue_start;
+	}
+	*flitp = (__force __be64)0;
+	isglp->op = FW_RI_DATA_ISGL;
+	isglp->r1 = 0;
+	isglp->nsge = cpu_to_be16(num_sge);
+	isglp->r2 = 0;
+	if (plenp)
+		*plenp = plen;
+	return 0;
+}
+
+static int build_rdma_send(struct t4_sq *sq, union t4_wr *wqe,
+			   struct ib_send_wr *wr, u8 *len16)
+{
+	u32 plen;
+	int size;
+	int ret;
+
+	if (wr->num_sge > T4_MAX_SEND_SGE)
+		return -EINVAL;
+	switch (wr->opcode) {
+	case IB_WR_SEND:
+		if (wr->send_flags & IB_SEND_SOLICITED)
+			wqe->send.sendop_pkd = cpu_to_be32(
+				V_FW_RI_SEND_WR_SENDOP(FW_RI_SEND_WITH_SE));
+		else
+			wqe->send.sendop_pkd = cpu_to_be32(
+				V_FW_RI_SEND_WR_SENDOP(FW_RI_SEND));
+		wqe->send.stag_inv = 0;
+		break;
+	case IB_WR_SEND_WITH_INV:
+		if (wr->send_flags & IB_SEND_SOLICITED)
+			wqe->send.sendop_pkd = cpu_to_be32(
+				V_FW_RI_SEND_WR_SENDOP(FW_RI_SEND_WITH_SE_INV));
+		else
+			wqe->send.sendop_pkd = cpu_to_be32(
+				V_FW_RI_SEND_WR_SENDOP(FW_RI_SEND_WITH_INV));
+		wqe->send.stag_inv = cpu_to_be32(wr->ex.invalidate_rkey);
+		break;
+
+	default:
+		return -EINVAL;
+	}
+
+	plen = 0;
+	if (wr->num_sge) {
+		if (wr->send_flags & IB_SEND_INLINE) {
+			ret = build_immd(sq, wqe->send.u.immd_src, wr,
+					 T4_MAX_SEND_INLINE, &plen);
+			if (ret)
+				return ret;
+			size = sizeof wqe->send + sizeof(struct fw_ri_immd) +
+			       plen;
+		} else {
+			ret = build_isgl((__be64 *)sq->queue,
+					 (__be64 *)&sq->queue[sq->size],
+					 wqe->send.u.isgl_src,
+					 wr->sg_list, wr->num_sge, &plen);
+			if (ret)
+				return ret;
+			size = sizeof wqe->send + sizeof(struct fw_ri_isgl) +
+			       wr->num_sge * sizeof(struct fw_ri_sge);
+		}
+	} else {
+		wqe->send.u.immd_src[0].op = FW_RI_DATA_IMMD;
+		wqe->send.u.immd_src[0].r1 = 0;
+		wqe->send.u.immd_src[0].r2 = 0;
+		wqe->send.u.immd_src[0].immdlen = 0;
+		size = sizeof wqe->send + sizeof(struct fw_ri_immd);
+		plen = 0;
+	}
+	*len16 = DIV_ROUND_UP(size, 16);
+	wqe->send.plen = cpu_to_be32(plen);
+	return 0;
+}
+
+static int build_rdma_write(struct t4_sq *sq, union t4_wr *wqe,
+			    struct ib_send_wr *wr, u8 *len16)
+{
+	u32 plen;
+	int size;
+	int ret;
+
+	if (wr->num_sge > T4_MAX_SEND_SGE)
+		return -EINVAL;
+	wqe->write.r2 = 0;
+	wqe->write.stag_sink = cpu_to_be32(wr->wr.rdma.rkey);
+	wqe->write.to_sink = cpu_to_be64(wr->wr.rdma.remote_addr);
+	if (wr->num_sge) {
+		if (wr->send_flags & IB_SEND_INLINE) {
+			ret = build_immd(sq, wqe->write.u.immd_src, wr,
+					 T4_MAX_WRITE_INLINE, &plen);
+			if (ret)
+				return ret;
+			size = sizeof wqe->write + sizeof(struct fw_ri_immd) +
+			       plen;
+		} else {
+			ret = build_isgl((__be64 *)sq->queue,
+					 (__be64 *)&sq->queue[sq->size],
+					 wqe->write.u.isgl_src,
+					 wr->sg_list, wr->num_sge, &plen);
+			if (ret)
+				return ret;
+			size = sizeof wqe->write + sizeof(struct fw_ri_isgl) +
+			       wr->num_sge * sizeof(struct fw_ri_sge);
+		}
+	} else {
+		wqe->write.u.immd_src[0].op = FW_RI_DATA_IMMD;
+		wqe->write.u.immd_src[0].r1 = 0;
+		wqe->write.u.immd_src[0].r2 = 0;
+		wqe->write.u.immd_src[0].immdlen = 0;
+		size = sizeof wqe->write + sizeof(struct fw_ri_immd);
+		plen = 0;
+	}
+	*len16 = DIV_ROUND_UP(size, 16);
+	wqe->write.plen = cpu_to_be32(plen);
+	return 0;
+}
+
+static int build_rdma_read(union t4_wr *wqe, struct ib_send_wr *wr, u8 *len16)
+{
+	if (wr->num_sge > 1)
+		return -EINVAL;
+	if (wr->num_sge) {
+		wqe->read.stag_src = cpu_to_be32(wr->wr.rdma.rkey);
+		wqe->read.to_src_hi = cpu_to_be32((u32)(wr->wr.rdma.remote_addr
+							>> 32));
+		wqe->read.to_src_lo = cpu_to_be32((u32)wr->wr.rdma.remote_addr);
+		wqe->read.stag_sink = cpu_to_be32(wr->sg_list[0].lkey);
+		wqe->read.plen = cpu_to_be32(wr->sg_list[0].length);
+		wqe->read.to_sink_hi = cpu_to_be32((u32)(wr->sg_list[0].addr
+							 >> 32));
+		wqe->read.to_sink_lo = cpu_to_be32((u32)(wr->sg_list[0].addr));
+	} else {
+		wqe->read.stag_src = cpu_to_be32(2);
+		wqe->read.to_src_hi = 0;
+		wqe->read.to_src_lo = 0;
+		wqe->read.stag_sink = cpu_to_be32(2);
+		wqe->read.plen = 0;
+		wqe->read.to_sink_hi = 0;
+		wqe->read.to_sink_lo = 0;
+	}
+	wqe->read.r2 = 0;
+	wqe->read.r5 = 0;
+	*len16 = DIV_ROUND_UP(sizeof wqe->read, 16);
+	return 0;
+}
+
+static int build_rdma_recv(struct c4iw_qp *qhp, union t4_recv_wr *wqe,
+			   struct ib_recv_wr *wr, u8 *len16)
+{
+	int ret;
+
+	ret = build_isgl((__be64 *)qhp->wq.rq.queue,
+			 (__be64 *)&qhp->wq.rq.queue[qhp->wq.rq.size],
+			 &wqe->recv.isgl, wr->sg_list, wr->num_sge, NULL);
+	if (ret)
+		return ret;
+	*len16 = DIV_ROUND_UP(sizeof wqe->recv +
+			      wr->num_sge * sizeof(struct fw_ri_sge), 16);
+	return 0;
+}
+
+static int build_fastreg(struct t4_sq *sq, union t4_wr *wqe,
+			 struct ib_send_wr *wr, u8 *len16)
+{
+
+	struct fw_ri_immd *imdp;
+	__be64 *p;
+	int i;
+	int pbllen = roundup(wr->wr.fast_reg.page_list_len * sizeof(u64), 32);
+	int rem;
+
+	if (wr->wr.fast_reg.page_list_len > T4_MAX_FR_DEPTH)
+		return -EINVAL;
+
+	wqe->fr.qpbinde_to_dcacpu = 0;
+	wqe->fr.pgsz_shift = wr->wr.fast_reg.page_shift - 12;
+	wqe->fr.addr_type = FW_RI_VA_BASED_TO;
+	wqe->fr.mem_perms = c4iw_ib_to_tpt_access(wr->wr.fast_reg.access_flags);
+	wqe->fr.len_hi = 0;
+	wqe->fr.len_lo = cpu_to_be32(wr->wr.fast_reg.length);
+	wqe->fr.stag = cpu_to_be32(wr->wr.fast_reg.rkey);
+	wqe->fr.va_hi = cpu_to_be32(wr->wr.fast_reg.iova_start >> 32);
+	wqe->fr.va_lo_fbo = cpu_to_be32(wr->wr.fast_reg.iova_start &
+					0xffffffff);
+	WARN_ON(pbllen > T4_MAX_FR_IMMD);
+	imdp = (struct fw_ri_immd *)(&wqe->fr + 1);
+	imdp->op = FW_RI_DATA_IMMD;
+	imdp->r1 = 0;
+	imdp->r2 = 0;
+	imdp->immdlen = cpu_to_be32(pbllen);
+	p = (__be64 *)(imdp + 1);
+	rem = pbllen;
+	for (i = 0; i < wr->wr.fast_reg.page_list_len; i++) {
+		*p = cpu_to_be64((u64)wr->wr.fast_reg.page_list->page_list[i]);
+		rem -= sizeof *p;
+		if (++p == (__be64 *)&sq->queue[sq->size])
+			p = (__be64 *)sq->queue;
+	}
+	BUG_ON(rem < 0);
+	while (rem) {
+		*p = 0;
+		rem -= sizeof *p;
+		if (++p == (__be64 *)&sq->queue[sq->size])
+			p = (__be64 *)sq->queue;
+	}
+	*len16 = DIV_ROUND_UP(sizeof wqe->fr + sizeof *imdp + pbllen, 16);
+	return 0;
+}
+
+static int build_inv_stag(union t4_wr *wqe, struct ib_send_wr *wr,
+			  u8 *len16)
+{
+	wqe->inv.stag_inv = cpu_to_be32(wr->ex.invalidate_rkey);
+	wqe->inv.r2 = 0;
+	*len16 = DIV_ROUND_UP(sizeof wqe->inv, 16);
+	return 0;
+}
+
+void c4iw_qp_add_ref(struct ib_qp *qp)
+{
+	CTR2(KTR_IW_CXGBE, "%s ib_qp %p", __func__, qp);
+	atomic_inc(&(to_c4iw_qp(qp)->refcnt));
+}
+
+void c4iw_qp_rem_ref(struct ib_qp *qp)
+{
+	CTR2(KTR_IW_CXGBE, "%s ib_qp %p", __func__, qp);
+	if (atomic_dec_and_test(&(to_c4iw_qp(qp)->refcnt)))
+		wake_up(&(to_c4iw_qp(qp)->wait));
+}
+
+int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
+		   struct ib_send_wr **bad_wr)
+{
+	int err = 0;
+	u8 len16 = 0;
+	enum fw_wr_opcodes fw_opcode = 0;
+	enum fw_ri_wr_flags fw_flags;
+	struct c4iw_qp *qhp;
+	union t4_wr *wqe;
+	u32 num_wrs;
+	struct t4_swsqe *swsqe;
+	unsigned long flag;
+	u16 idx = 0;
+
+	qhp = to_c4iw_qp(ibqp);
+	spin_lock_irqsave(&qhp->lock, flag);
+	if (t4_wq_in_error(&qhp->wq)) {
+		spin_unlock_irqrestore(&qhp->lock, flag);
+		return -EINVAL;
+	}
+	num_wrs = t4_sq_avail(&qhp->wq);
+	if (num_wrs == 0) {
+		spin_unlock_irqrestore(&qhp->lock, flag);
+		return -ENOMEM;
+	}
+	while (wr) {
+		if (num_wrs == 0) {
+			err = -ENOMEM;
+			*bad_wr = wr;
+			break;
+		}
+		wqe = (union t4_wr *)((u8 *)qhp->wq.sq.queue +
+		      qhp->wq.sq.wq_pidx * T4_EQ_ENTRY_SIZE);
+
+		fw_flags = 0;
+		if (wr->send_flags & IB_SEND_SOLICITED)
+			fw_flags |= FW_RI_SOLICITED_EVENT_FLAG;
+		if (wr->send_flags & IB_SEND_SIGNALED)
+			fw_flags |= FW_RI_COMPLETION_FLAG;
+		swsqe = &qhp->wq.sq.sw_sq[qhp->wq.sq.pidx];
+		switch (wr->opcode) {
+		case IB_WR_SEND_WITH_INV:
+		case IB_WR_SEND:
+			if (wr->send_flags & IB_SEND_FENCE)
+				fw_flags |= FW_RI_READ_FENCE_FLAG;
+			fw_opcode = FW_RI_SEND_WR;
+			if (wr->opcode == IB_WR_SEND)
+				swsqe->opcode = FW_RI_SEND;
+			else
+				swsqe->opcode = FW_RI_SEND_WITH_INV;
+			err = build_rdma_send(&qhp->wq.sq, wqe, wr, &len16);
+			break;
+		case IB_WR_RDMA_WRITE:
+			fw_opcode = FW_RI_RDMA_WRITE_WR;
+			swsqe->opcode = FW_RI_RDMA_WRITE;
+			err = build_rdma_write(&qhp->wq.sq, wqe, wr, &len16);
+			break;
+		case IB_WR_RDMA_READ:
+		case IB_WR_RDMA_READ_WITH_INV:
+			fw_opcode = FW_RI_RDMA_READ_WR;
+			swsqe->opcode = FW_RI_READ_REQ;
+			if (wr->opcode == IB_WR_RDMA_READ_WITH_INV)
+				fw_flags = FW_RI_RDMA_READ_INVALIDATE;
+			else
+				fw_flags = 0;
+			err = build_rdma_read(wqe, wr, &len16);
+			if (err)
+				break;
+			swsqe->read_len = wr->sg_list[0].length;
+			if (!qhp->wq.sq.oldest_read)
+				qhp->wq.sq.oldest_read = swsqe;
+			break;
+		case IB_WR_FAST_REG_MR:
+			fw_opcode = FW_RI_FR_NSMR_WR;
+			swsqe->opcode = FW_RI_FAST_REGISTER;
+			err = build_fastreg(&qhp->wq.sq, wqe, wr, &len16);
+			break;
+		case IB_WR_LOCAL_INV:
+			if (wr->send_flags & IB_SEND_FENCE)
+				fw_flags |= FW_RI_LOCAL_FENCE_FLAG;
+			fw_opcode = FW_RI_INV_LSTAG_WR;
+			swsqe->opcode = FW_RI_LOCAL_INV;
+			err = build_inv_stag(wqe, wr, &len16);
+			break;
+		default:
+			CTR2(KTR_IW_CXGBE, "%s post of type =%d TBD!", __func__,
+			     wr->opcode);
+			err = -EINVAL;
+		}
+		if (err) {
+			*bad_wr = wr;
+			break;
+		}
+		swsqe->idx = qhp->wq.sq.pidx;
+		swsqe->complete = 0;
+		swsqe->signaled = (wr->send_flags & IB_SEND_SIGNALED);
+		swsqe->wr_id = wr->wr_id;
+
+		init_wr_hdr(wqe, qhp->wq.sq.pidx, fw_opcode, fw_flags, len16);
+
+		CTR5(KTR_IW_CXGBE,
+		    "%s cookie 0x%llx pidx 0x%x opcode 0x%x read_len %u",
+		    __func__, (unsigned long long)wr->wr_id, qhp->wq.sq.pidx,
+		    swsqe->opcode, swsqe->read_len);
+		wr = wr->next;
+		num_wrs--;
+		t4_sq_produce(&qhp->wq, len16);
+		idx += DIV_ROUND_UP(len16*16, T4_EQ_ENTRY_SIZE);
+	}
+	if (t4_wq_db_enabled(&qhp->wq))
+		t4_ring_sq_db(&qhp->wq, idx);
+	spin_unlock_irqrestore(&qhp->lock, flag);
+	return err;
+}
+
+int c4iw_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
+		      struct ib_recv_wr **bad_wr)
+{
+	int err = 0;
+	struct c4iw_qp *qhp;
+	union t4_recv_wr *wqe;
+	u32 num_wrs;
+	u8 len16 = 0;
+	unsigned long flag;
+	u16 idx = 0;
+
+	qhp = to_c4iw_qp(ibqp);
+	spin_lock_irqsave(&qhp->lock, flag);
+	if (t4_wq_in_error(&qhp->wq)) {
+		spin_unlock_irqrestore(&qhp->lock, flag);
+		return -EINVAL;
+	}
+	num_wrs = t4_rq_avail(&qhp->wq);
+	if (num_wrs == 0) {
+		spin_unlock_irqrestore(&qhp->lock, flag);
+		return -ENOMEM;
+	}
+	while (wr) {
+		if (wr->num_sge > T4_MAX_RECV_SGE) {
+			err = -EINVAL;
+			*bad_wr = wr;
+			break;
+		}
+		wqe = (union t4_recv_wr *)((u8 *)qhp->wq.rq.queue +
+					   qhp->wq.rq.wq_pidx *
+					   T4_EQ_ENTRY_SIZE);
+		if (num_wrs)
+			err = build_rdma_recv(qhp, wqe, wr, &len16);
+		else
+			err = -ENOMEM;
+		if (err) {
+			*bad_wr = wr;
+			break;
+		}
+
+		qhp->wq.rq.sw_rq[qhp->wq.rq.pidx].wr_id = wr->wr_id;
+
+		wqe->recv.opcode = FW_RI_RECV_WR;
+		wqe->recv.r1 = 0;
+		wqe->recv.wrid = qhp->wq.rq.pidx;
+		wqe->recv.r2[0] = 0;
+		wqe->recv.r2[1] = 0;
+		wqe->recv.r2[2] = 0;
+		wqe->recv.len16 = len16;
+		CTR3(KTR_IW_CXGBE, "%s cookie 0x%llx pidx %u", __func__,
+		     (unsigned long long) wr->wr_id, qhp->wq.rq.pidx);
+		t4_rq_produce(&qhp->wq, len16);
+		idx += DIV_ROUND_UP(len16*16, T4_EQ_ENTRY_SIZE);
+		wr = wr->next;
+		num_wrs--;
+	}
+	if (t4_wq_db_enabled(&qhp->wq))
+		t4_ring_rq_db(&qhp->wq, idx);
+	spin_unlock_irqrestore(&qhp->lock, flag);
+	return err;
+}
+
+int c4iw_bind_mw(struct ib_qp *qp, struct ib_mw *mw, struct ib_mw_bind *mw_bind)
+{
+	return -ENOSYS;
+}
+
+static inline void build_term_codes(struct t4_cqe *err_cqe, u8 *layer_type,
+				    u8 *ecode)
+{
+	int status;
+	int tagged;
+	int opcode;
+	int rqtype;
+	int send_inv;
+
+	if (!err_cqe) {
+		*layer_type = LAYER_RDMAP|DDP_LOCAL_CATA;
+		*ecode = 0;
+		return;
+	}
+
+	status = CQE_STATUS(err_cqe);
+	opcode = CQE_OPCODE(err_cqe);
+	rqtype = RQ_TYPE(err_cqe);
+	send_inv = (opcode == FW_RI_SEND_WITH_INV) ||
+		   (opcode == FW_RI_SEND_WITH_SE_INV);
+	tagged = (opcode == FW_RI_RDMA_WRITE) ||
+		 (rqtype && (opcode == FW_RI_READ_RESP));
+
+	switch (status) {
+	case T4_ERR_STAG:
+		if (send_inv) {
+			*layer_type = LAYER_RDMAP|RDMAP_REMOTE_OP;
+			*ecode = RDMAP_CANT_INV_STAG;
+		} else {
+			*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
+			*ecode = RDMAP_INV_STAG;
+		}
+		break;
+	case T4_ERR_PDID:
+		*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
+		if ((opcode == FW_RI_SEND_WITH_INV) ||
+		    (opcode == FW_RI_SEND_WITH_SE_INV))
+			*ecode = RDMAP_CANT_INV_STAG;
+		else
+			*ecode = RDMAP_STAG_NOT_ASSOC;
+		break;
+	case T4_ERR_QPID:
+		*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
+		*ecode = RDMAP_STAG_NOT_ASSOC;
+		break;
+	case T4_ERR_ACCESS:
+		*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
+		*ecode = RDMAP_ACC_VIOL;
+		break;
+	case T4_ERR_WRAP:
+		*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
+		*ecode = RDMAP_TO_WRAP;
+		break;
+	case T4_ERR_BOUND:
+		if (tagged) {
+			*layer_type = LAYER_DDP|DDP_TAGGED_ERR;
+			*ecode = DDPT_BASE_BOUNDS;
+		} else {
+			*layer_type = LAYER_RDMAP|RDMAP_REMOTE_PROT;
+			*ecode = RDMAP_BASE_BOUNDS;
+		}
+		break;
+	case T4_ERR_INVALIDATE_SHARED_MR:
+	case T4_ERR_INVALIDATE_MR_WITH_MW_BOUND:
+		*layer_type = LAYER_RDMAP|RDMAP_REMOTE_OP;
+		*ecode = RDMAP_CANT_INV_STAG;
+		break;
+	case T4_ERR_ECC:
+	case T4_ERR_ECC_PSTAG:
+	case T4_ERR_INTERNAL_ERR:
+		*layer_type = LAYER_RDMAP|RDMAP_LOCAL_CATA;
+		*ecode = 0;
+		break;
+	case T4_ERR_OUT_OF_RQE:
+		*layer_type = LAYER_DDP|DDP_UNTAGGED_ERR;
+		*ecode = DDPU_INV_MSN_NOBUF;
+		break;
+	case T4_ERR_PBL_ADDR_BOUND:
+		*layer_type = LAYER_DDP|DDP_TAGGED_ERR;
+		*ecode = DDPT_BASE_BOUNDS;
+		break;
+	case T4_ERR_CRC:
+		*layer_type = LAYER_MPA|DDP_LLP;
+		*ecode = MPA_CRC_ERR;
+		break;
+	case T4_ERR_MARKER:
+		*layer_type = LAYER_MPA|DDP_LLP;
+		*ecode = MPA_MARKER_ERR;
+		break;
+	case T4_ERR_PDU_LEN_ERR:
+		*layer_type = LAYER_DDP|DDP_UNTAGGED_ERR;
+		*ecode = DDPU_MSG_TOOBIG;
+		break;
+	case T4_ERR_DDP_VERSION:
+		if (tagged) {
+			*layer_type = LAYER_DDP|DDP_TAGGED_ERR;
+			*ecode = DDPT_INV_VERS;
+		} else {
+			*layer_type = LAYER_DDP|DDP_UNTAGGED_ERR;
+			*ecode = DDPU_INV_VERS;
+		}
+		break;
+	case T4_ERR_RDMA_VERSION:
+		*layer_type = LAYER_RDMAP|RDMAP_REMOTE_OP;
+		*ecode = RDMAP_INV_VERS;
+		break;
+	case T4_ERR_OPCODE:
+		*layer_type = LAYER_RDMAP|RDMAP_REMOTE_OP;
+		*ecode = RDMAP_INV_OPCODE;
+		break;
+	case T4_ERR_DDP_QUEUE_NUM:
+		*layer_type = LAYER_DDP|DDP_UNTAGGED_ERR;
+		*ecode = DDPU_INV_QN;
+		break;
+	case T4_ERR_MSN:
+	case T4_ERR_MSN_GAP:
+	case T4_ERR_MSN_RANGE:
+	case T4_ERR_IRD_OVERFLOW:
+		*layer_type = LAYER_DDP|DDP_UNTAGGED_ERR;
+		*ecode = DDPU_INV_MSN_RANGE;
+		break;
+	case T4_ERR_TBIT:
+		*layer_type = LAYER_DDP|DDP_LOCAL_CATA;
+		*ecode = 0;
+		break;
+	case T4_ERR_MO:
+		*layer_type = LAYER_DDP|DDP_UNTAGGED_ERR;
+		*ecode = DDPU_INV_MO;
+		break;
+	default:
+		*layer_type = LAYER_RDMAP|DDP_LOCAL_CATA;
+		*ecode = 0;
+		break;
+	}
+}
+
+static void post_terminate(struct c4iw_qp *qhp, struct t4_cqe *err_cqe,
+			   gfp_t gfp)
+{
+	struct fw_ri_wr *wqe;
+	struct terminate_message *term;
+	struct wrqe *wr;
+	struct socket *so = qhp->ep->com.so;
+        struct inpcb *inp = sotoinpcb(so);
+        struct tcpcb *tp = intotcpcb(inp);
+        struct toepcb *toep = tp->t_toe;
+
+	CTR4(KTR_IW_CXGBE, "%s qhp %p qid 0x%x tid %u", __func__, qhp,
+	    qhp->wq.sq.qid, qhp->ep->hwtid);
+
+	wr = alloc_wrqe(sizeof(*wqe), toep->ofld_txq);
+	if (wr == NULL)
+		return;
+        wqe = wrtod(wr);
+
+	memset(wqe, 0, sizeof *wqe);
+	wqe->op_compl = cpu_to_be32(V_FW_WR_OP(FW_RI_WR));
+	wqe->flowid_len16 = cpu_to_be32(
+		V_FW_WR_FLOWID(qhp->ep->hwtid) |
+		V_FW_WR_LEN16(DIV_ROUND_UP(sizeof *wqe, 16)));
+
+	wqe->u.terminate.type = FW_RI_TYPE_TERMINATE;
+	wqe->u.terminate.immdlen = cpu_to_be32(sizeof *term);
+	term = (struct terminate_message *)wqe->u.terminate.termmsg;
+	if (qhp->attr.layer_etype == (LAYER_MPA|DDP_LLP)) {
+		term->layer_etype = qhp->attr.layer_etype;
+		term->ecode = qhp->attr.ecode;
+	} else
+		build_term_codes(err_cqe, &term->layer_etype, &term->ecode);
+        creds(toep, sizeof(*wqe));
+	t4_wrq_tx(qhp->rhp->rdev.adap, wr);
+}
+
+/* Assumes qhp lock is held. */
+static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
+		       struct c4iw_cq *schp)
+{
+	int count;
+	int flushed;
+	unsigned long flag;
+
+	CTR4(KTR_IW_CXGBE, "%s qhp %p rchp %p schp %p", __func__, qhp, rchp,
+	    schp);
+
+	/* locking hierarchy: cq lock first, then qp lock. */
+	spin_lock_irqsave(&rchp->lock, flag);
+	spin_lock(&qhp->lock);
+	c4iw_flush_hw_cq(&rchp->cq);
+	c4iw_count_rcqes(&rchp->cq, &qhp->wq, &count);
+	flushed = c4iw_flush_rq(&qhp->wq, &rchp->cq, count);
+	spin_unlock(&qhp->lock);
+	spin_unlock_irqrestore(&rchp->lock, flag);
+	if (flushed) {
+		spin_lock_irqsave(&rchp->comp_handler_lock, flag);
+		(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
+		spin_unlock_irqrestore(&rchp->comp_handler_lock, flag);
+	}
+
+	/* locking hierarchy: cq lock first, then qp lock. */
+	spin_lock_irqsave(&schp->lock, flag);
+	spin_lock(&qhp->lock);
+	c4iw_flush_hw_cq(&schp->cq);
+	c4iw_count_scqes(&schp->cq, &qhp->wq, &count);
+	flushed = c4iw_flush_sq(&qhp->wq, &schp->cq, count);
+	spin_unlock(&qhp->lock);
+	spin_unlock_irqrestore(&schp->lock, flag);
+	if (flushed) {
+		spin_lock_irqsave(&schp->comp_handler_lock, flag);
+		(*schp->ibcq.comp_handler)(&schp->ibcq, schp->ibcq.cq_context);
+		spin_unlock_irqrestore(&schp->comp_handler_lock, flag);
+	}
+}
+
+static void flush_qp(struct c4iw_qp *qhp)
+{
+	struct c4iw_cq *rchp, *schp;
+	unsigned long flag;
+
+	rchp = get_chp(qhp->rhp, qhp->attr.rcq);
+	schp = get_chp(qhp->rhp, qhp->attr.scq);
+
+	if (qhp->ibqp.uobject) {
+		t4_set_wq_in_error(&qhp->wq);
+		t4_set_cq_in_error(&rchp->cq);
+		spin_lock_irqsave(&rchp->comp_handler_lock, flag);
+		(*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
+		spin_unlock_irqrestore(&rchp->comp_handler_lock, flag);
+		if (schp != rchp) {
+			t4_set_cq_in_error(&schp->cq);
+			spin_lock_irqsave(&schp->comp_handler_lock, flag);
+			(*schp->ibcq.comp_handler)(&schp->ibcq,
+					schp->ibcq.cq_context);
+			spin_unlock_irqrestore(&schp->comp_handler_lock, flag);
+		}
+		return;
+	}
+	__flush_qp(qhp, rchp, schp);
+}
+
+static int
+rdma_fini(struct c4iw_dev *rhp, struct c4iw_qp *qhp, struct c4iw_ep *ep)
+{
+	struct c4iw_rdev *rdev = &rhp->rdev;
+	struct adapter *sc = rdev->adap;
+	struct fw_ri_wr *wqe;
+	int ret;
+	struct wrqe *wr;
+	struct socket *so = ep->com.so;
+        struct inpcb *inp = sotoinpcb(so);
+        struct tcpcb *tp = intotcpcb(inp);
+        struct toepcb *toep = tp->t_toe;
+
+	KASSERT(rhp == qhp->rhp && ep == qhp->ep, ("%s: EDOOFUS", __func__));
+
+	CTR4(KTR_IW_CXGBE, "%s qhp %p qid 0x%x tid %u", __func__, qhp,
+	    qhp->wq.sq.qid, ep->hwtid);
+
+	wr = alloc_wrqe(sizeof(*wqe), toep->ofld_txq);
+	if (wr == NULL)
+		return (0);
+	wqe = wrtod(wr);
+
+	memset(wqe, 0, sizeof *wqe);
+
+	wqe->op_compl = cpu_to_be32(V_FW_WR_OP(FW_RI_WR) | F_FW_WR_COMPL);
+	wqe->flowid_len16 = cpu_to_be32(V_FW_WR_FLOWID(ep->hwtid) |
+	    V_FW_WR_LEN16(DIV_ROUND_UP(sizeof *wqe, 16)));
+	wqe->cookie = (unsigned long) &ep->com.wr_wait;
+	wqe->u.fini.type = FW_RI_TYPE_FINI;
+
+	c4iw_init_wr_wait(&ep->com.wr_wait);
+
+        creds(toep, sizeof(*wqe));
+	t4_wrq_tx(sc, wr);
+
+	ret = c4iw_wait_for_reply(rdev, &ep->com.wr_wait, ep->hwtid,
+	    qhp->wq.sq.qid, __func__);
+	return ret;
+}
+
+static void build_rtr_msg(u8 p2p_type, struct fw_ri_init *init)
+{
+	CTR2(KTR_IW_CXGBE, "%s p2p_type = %d", __func__, p2p_type);
+	memset(&init->u, 0, sizeof init->u);
+	switch (p2p_type) {
+	case FW_RI_INIT_P2PTYPE_RDMA_WRITE:
+		init->u.write.opcode = FW_RI_RDMA_WRITE_WR;
+		init->u.write.stag_sink = cpu_to_be32(1);
+		init->u.write.to_sink = cpu_to_be64(1);
+		init->u.write.u.immd_src[0].op = FW_RI_DATA_IMMD;
+		init->u.write.len16 = DIV_ROUND_UP(sizeof init->u.write +
+						   sizeof(struct fw_ri_immd),
+						   16);
+		break;
+	case FW_RI_INIT_P2PTYPE_READ_REQ:
+		init->u.write.opcode = FW_RI_RDMA_READ_WR;
+		init->u.read.stag_src = cpu_to_be32(1);
+		init->u.read.to_src_lo = cpu_to_be32(1);
+		init->u.read.stag_sink = cpu_to_be32(1);
+		init->u.read.to_sink_lo = cpu_to_be32(1);
+		init->u.read.len16 = DIV_ROUND_UP(sizeof init->u.read, 16);
+		break;
+	}
+}
+
+static void
+creds(struct toepcb *toep, size_t wrsize)
+{
+	struct ofld_tx_sdesc *txsd;
+
+	CTR3(KTR_IW_CXGBE, "%s:creB  %p %u", __func__, toep , wrsize);
+	INP_WLOCK(toep->inp);
+	txsd = &toep->txsd[toep->txsd_pidx];
+	txsd->tx_credits = howmany(wrsize, 16);
+	txsd->plen = 0;
+	KASSERT(toep->tx_credits >= txsd->tx_credits && toep->txsd_avail > 0,
+			("%s: not enough credits (%d)", __func__, toep->tx_credits));
+	toep->tx_credits -= txsd->tx_credits;
+	if (__predict_false(++toep->txsd_pidx == toep->txsd_total))
+		toep->txsd_pidx = 0;
+	toep->txsd_avail--;
+	INP_WUNLOCK(toep->inp);
+	CTR5(KTR_IW_CXGBE, "%s:creE  %p %u %u %u", __func__, toep ,
+	    txsd->tx_credits, toep->tx_credits, toep->txsd_pidx);
+}
+
+static int rdma_init(struct c4iw_dev *rhp, struct c4iw_qp *qhp)
+{
+	struct fw_ri_wr *wqe;
+	int ret;
+	struct wrqe *wr;
+	struct c4iw_ep *ep = qhp->ep;
+	struct c4iw_rdev *rdev = &qhp->rhp->rdev;
+	struct adapter *sc = rdev->adap;
+	struct socket *so = ep->com.so;
+        struct inpcb *inp = sotoinpcb(so);
+        struct tcpcb *tp = intotcpcb(inp);
+        struct toepcb *toep = tp->t_toe;
+
+	CTR4(KTR_IW_CXGBE, "%s qhp %p qid 0x%x tid %u", __func__, qhp,
+	    qhp->wq.sq.qid, ep->hwtid);
+
+	wr = alloc_wrqe(sizeof(*wqe), toep->ofld_txq);
+	if (wr == NULL)
+		return (0);
+	wqe = wrtod(wr);
+
+	memset(wqe, 0, sizeof *wqe);
+
+	wqe->op_compl = cpu_to_be32(
+		V_FW_WR_OP(FW_RI_WR) |
+		F_FW_WR_COMPL);
+	wqe->flowid_len16 = cpu_to_be32(V_FW_WR_FLOWID(ep->hwtid) |
+	    V_FW_WR_LEN16(DIV_ROUND_UP(sizeof *wqe, 16)));
+
+	wqe->cookie = (unsigned long) &ep->com.wr_wait;
+
+	wqe->u.init.type = FW_RI_TYPE_INIT;
+	wqe->u.init.mpareqbit_p2ptype =
+		V_FW_RI_WR_MPAREQBIT(qhp->attr.mpa_attr.initiator) |
+		V_FW_RI_WR_P2PTYPE(qhp->attr.mpa_attr.p2p_type);
+	wqe->u.init.mpa_attrs = FW_RI_MPA_IETF_ENABLE;
+	if (qhp->attr.mpa_attr.recv_marker_enabled)
+		wqe->u.init.mpa_attrs |= FW_RI_MPA_RX_MARKER_ENABLE;
+	if (qhp->attr.mpa_attr.xmit_marker_enabled)
+		wqe->u.init.mpa_attrs |= FW_RI_MPA_TX_MARKER_ENABLE;
+	if (qhp->attr.mpa_attr.crc_enabled)
+		wqe->u.init.mpa_attrs |= FW_RI_MPA_CRC_ENABLE;
+
+	wqe->u.init.qp_caps = FW_RI_QP_RDMA_READ_ENABLE |
+			    FW_RI_QP_RDMA_WRITE_ENABLE |
+			    FW_RI_QP_BIND_ENABLE;
+	if (!qhp->ibqp.uobject)
+		wqe->u.init.qp_caps |= FW_RI_QP_FAST_REGISTER_ENABLE |
+				     FW_RI_QP_STAG0_ENABLE;
+	wqe->u.init.nrqe = cpu_to_be16(t4_rqes_posted(&qhp->wq));
+	wqe->u.init.pdid = cpu_to_be32(qhp->attr.pd);
+	wqe->u.init.qpid = cpu_to_be32(qhp->wq.sq.qid);
+	wqe->u.init.sq_eqid = cpu_to_be32(qhp->wq.sq.qid);
+	wqe->u.init.rq_eqid = cpu_to_be32(qhp->wq.rq.qid);
+	wqe->u.init.scqid = cpu_to_be32(qhp->attr.scq);
+	wqe->u.init.rcqid = cpu_to_be32(qhp->attr.rcq);
+	wqe->u.init.ord_max = cpu_to_be32(qhp->attr.max_ord);
+	wqe->u.init.ird_max = cpu_to_be32(qhp->attr.max_ird);
+	wqe->u.init.iss = cpu_to_be32(ep->snd_seq);
+	wqe->u.init.irs = cpu_to_be32(ep->rcv_seq);
+	wqe->u.init.hwrqsize = cpu_to_be32(qhp->wq.rq.rqt_size);
+	wqe->u.init.hwrqaddr = cpu_to_be32(qhp->wq.rq.rqt_hwaddr -
+	    sc->vres.rq.start);
+	if (qhp->attr.mpa_attr.initiator)
+		build_rtr_msg(qhp->attr.mpa_attr.p2p_type, &wqe->u.init);
+
+	c4iw_init_wr_wait(&ep->com.wr_wait);
+
+	creds(toep, sizeof(*wqe));
+	t4_wrq_tx(sc, wr);
+
+	ret = c4iw_wait_for_reply(rdev, &ep->com.wr_wait, ep->hwtid,
+	    qhp->wq.sq.qid, __func__);
+
+	toep->ulp_mode = ULP_MODE_RDMA;
+
+	return ret;
+}
+
+int c4iw_modify_qp(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
+		   enum c4iw_qp_attr_mask mask,
+		   struct c4iw_qp_attributes *attrs,
+		   int internal)
+{
+	int ret = 0;
+	struct c4iw_qp_attributes newattr = qhp->attr;
+	int disconnect = 0;
+	int terminate = 0;
+	int abort = 0;
+	int free = 0;
+	struct c4iw_ep *ep = NULL;
+
+	CTR5(KTR_IW_CXGBE, "%s qhp %p sqid 0x%x rqid 0x%x ep %p", __func__, qhp,
+	    qhp->wq.sq.qid, qhp->wq.rq.qid, qhp->ep);
+	CTR3(KTR_IW_CXGBE, "%s state %d -> %d", __func__, qhp->attr.state,
+	    (mask & C4IW_QP_ATTR_NEXT_STATE) ? attrs->next_state : -1);
+
+	mutex_lock(&qhp->mutex);
+
+	/* Process attr changes if in IDLE */
+	if (mask & C4IW_QP_ATTR_VALID_MODIFY) {
+		if (qhp->attr.state != C4IW_QP_STATE_IDLE) {
+			ret = -EIO;
+			goto out;
+		}
+		if (mask & C4IW_QP_ATTR_ENABLE_RDMA_READ)
+			newattr.enable_rdma_read = attrs->enable_rdma_read;
+		if (mask & C4IW_QP_ATTR_ENABLE_RDMA_WRITE)
+			newattr.enable_rdma_write = attrs->enable_rdma_write;
+		if (mask & C4IW_QP_ATTR_ENABLE_RDMA_BIND)
+			newattr.enable_bind = attrs->enable_bind;
+		if (mask & C4IW_QP_ATTR_MAX_ORD) {
+			if (attrs->max_ord > c4iw_max_read_depth) {
+				ret = -EINVAL;
+				goto out;
+			}
+			newattr.max_ord = attrs->max_ord;
+		}
+		if (mask & C4IW_QP_ATTR_MAX_IRD) {
+			if (attrs->max_ird > c4iw_max_read_depth) {
+				ret = -EINVAL;
+				goto out;
+			}
+			newattr.max_ird = attrs->max_ird;
+		}
+		qhp->attr = newattr;
+	}
+
+	if (!(mask & C4IW_QP_ATTR_NEXT_STATE))
+		goto out;
+	if (qhp->attr.state == attrs->next_state)
+		goto out;
+
+	switch (qhp->attr.state) {
+	case C4IW_QP_STATE_IDLE:
+		switch (attrs->next_state) {
+		case C4IW_QP_STATE_RTS:
+			if (!(mask & C4IW_QP_ATTR_LLP_STREAM_HANDLE)) {
+				ret = -EINVAL;
+				goto out;
+			}
+			if (!(mask & C4IW_QP_ATTR_MPA_ATTR)) {
+				ret = -EINVAL;
+				goto out;
+			}
+			qhp->attr.mpa_attr = attrs->mpa_attr;
+			qhp->attr.llp_stream_handle = attrs->llp_stream_handle;
+			qhp->ep = qhp->attr.llp_stream_handle;
+			set_state(qhp, C4IW_QP_STATE_RTS);
+
+			/*
+			 * Ref the endpoint here and deref when we
+			 * disassociate the endpoint from the QP.  This
+			 * happens in CLOSING->IDLE transition or *->ERROR
+			 * transition.
+			 */
+			c4iw_get_ep(&qhp->ep->com);
+			ret = rdma_init(rhp, qhp);
+			if (ret)
+				goto err;
+			break;
+		case C4IW_QP_STATE_ERROR:
+			set_state(qhp, C4IW_QP_STATE_ERROR);
+			flush_qp(qhp);
+			break;
+		default:
+			ret = -EINVAL;
+			goto out;
+		}
+		break;
+	case C4IW_QP_STATE_RTS:
+		switch (attrs->next_state) {
+		case C4IW_QP_STATE_CLOSING:
+			//Fixme: Use atomic_read as same as Linux
+			BUG_ON(qhp->ep->com.kref.count < 2);
+			set_state(qhp, C4IW_QP_STATE_CLOSING);
+			ep = qhp->ep;
+			if (!internal) {
+				abort = 0;
+				disconnect = 1;
+				c4iw_get_ep(&qhp->ep->com);
+			}
+			if (qhp->ibqp.uobject)
+				t4_set_wq_in_error(&qhp->wq);
+			ret = rdma_fini(rhp, qhp, ep);
+			if (ret)
+				goto err;
+			break;
+		case C4IW_QP_STATE_TERMINATE:
+			set_state(qhp, C4IW_QP_STATE_TERMINATE);
+			qhp->attr.layer_etype = attrs->layer_etype;
+			qhp->attr.ecode = attrs->ecode;
+			if (qhp->ibqp.uobject)
+				t4_set_wq_in_error(&qhp->wq);
+			ep = qhp->ep;
+			if (!internal)
+				terminate = 1;
+			disconnect = 1;
+			c4iw_get_ep(&qhp->ep->com);
+			break;
+		case C4IW_QP_STATE_ERROR:
+			set_state(qhp, C4IW_QP_STATE_ERROR);
+			if (qhp->ibqp.uobject)
+				t4_set_wq_in_error(&qhp->wq);
+			if (!internal) {
+				abort = 1;
+				disconnect = 1;
+				ep = qhp->ep;
+				c4iw_get_ep(&qhp->ep->com);
+			}
+			goto err;
+			break;
+		default:
+			ret = -EINVAL;
+			goto out;
+		}
+		break;
+	case C4IW_QP_STATE_CLOSING:
+		if (!internal) {
+			ret = -EINVAL;
+			goto out;
+		}
+		switch (attrs->next_state) {
+		case C4IW_QP_STATE_IDLE:
+			flush_qp(qhp);
+			set_state(qhp, C4IW_QP_STATE_IDLE);
+			qhp->attr.llp_stream_handle = NULL;
+			c4iw_put_ep(&qhp->ep->com);
+			qhp->ep = NULL;
+			wake_up(&qhp->wait);
+			break;
+		case C4IW_QP_STATE_ERROR:
+			goto err;
+		default:
+			ret = -EINVAL;
+			goto err;
+		}
+		break;
+	case C4IW_QP_STATE_ERROR:
+		if (attrs->next_state != C4IW_QP_STATE_IDLE) {
+			ret = -EINVAL;
+			goto out;
+		}
+		if (!t4_sq_empty(&qhp->wq) || !t4_rq_empty(&qhp->wq)) {
+			ret = -EINVAL;
+			goto out;
+		}
+		set_state(qhp, C4IW_QP_STATE_IDLE);
+		break;
+	case C4IW_QP_STATE_TERMINATE:
+		if (!internal) {
+			ret = -EINVAL;
+			goto out;
+		}
+		goto err;
+		break;
+	default:
+		printf("%s in a bad state %d\n",
+		       __func__, qhp->attr.state);
+		ret = -EINVAL;
+		goto err;
+		break;
+	}
+	goto out;
+err:
+	CTR3(KTR_IW_CXGBE, "%s disassociating ep %p qpid 0x%x", __func__,
+	    qhp->ep, qhp->wq.sq.qid);
+
+	/* disassociate the LLP connection */
+	qhp->attr.llp_stream_handle = NULL;
+	if (!ep)
+		ep = qhp->ep;
+	qhp->ep = NULL;
+	set_state(qhp, C4IW_QP_STATE_ERROR);
+	free = 1;
+	wake_up(&qhp->wait);
+	BUG_ON(!ep);
+	flush_qp(qhp);
+out:
+	mutex_unlock(&qhp->mutex);
+
+	if (terminate)
+		post_terminate(qhp, NULL, internal ? GFP_ATOMIC : GFP_KERNEL);
+
+	/*
+	 * If disconnect is 1, then we need to initiate a disconnect
+	 * on the EP.  This can be a normal close (RTS->CLOSING) or
+	 * an abnormal close (RTS/CLOSING->ERROR).
+	 */
+	if (disconnect) {
+		c4iw_ep_disconnect(ep, abort, internal ? GFP_ATOMIC :
+							 GFP_KERNEL);
+		c4iw_put_ep(&ep->com);
+	}
+
+	/*
+	 * If free is 1, then we've disassociated the EP from the QP
+	 * and we need to dereference the EP.
+	 */
+	if (free)
+		c4iw_put_ep(&ep->com);
+	CTR2(KTR_IW_CXGBE, "%s exit state %d", __func__, qhp->attr.state);
+	return ret;
+}
+
+static int enable_qp_db(int id, void *p, void *data)
+{
+	struct c4iw_qp *qp = p;
+
+	t4_enable_wq_db(&qp->wq);
+	return 0;
+}
+
+int c4iw_destroy_qp(struct ib_qp *ib_qp)
+{
+	struct c4iw_dev *rhp;
+	struct c4iw_qp *qhp;
+	struct c4iw_qp_attributes attrs;
+	struct c4iw_ucontext *ucontext;
+
+	CTR2(KTR_IW_CXGBE, "%s ib_qp %p", __func__, ib_qp);
+	qhp = to_c4iw_qp(ib_qp);
+	rhp = qhp->rhp;
+
+	attrs.next_state = C4IW_QP_STATE_ERROR;
+	if (qhp->attr.state == C4IW_QP_STATE_TERMINATE)
+		c4iw_modify_qp(rhp, qhp, C4IW_QP_ATTR_NEXT_STATE, &attrs, 1);
+	else
+		c4iw_modify_qp(rhp, qhp, C4IW_QP_ATTR_NEXT_STATE, &attrs, 0);
+	wait_event(qhp->wait, !qhp->ep);
+
+	spin_lock_irq(&rhp->lock);
+	remove_handle_nolock(rhp, &rhp->qpidr, qhp->wq.sq.qid);
+	rhp->qpcnt--;
+	BUG_ON(rhp->qpcnt < 0);
+	if (rhp->qpcnt <= db_fc_threshold && rhp->db_state == FLOW_CONTROL) {
+		rhp->rdev.stats.db_state_transitions++;
+		rhp->db_state = NORMAL;
+		idr_for_each(&rhp->qpidr, enable_qp_db, NULL);
+	}
+	spin_unlock_irq(&rhp->lock);
+	atomic_dec(&qhp->refcnt);
+	wait_event(qhp->wait, !atomic_read(&qhp->refcnt));
+
+	ucontext = ib_qp->uobject ?
+		   to_c4iw_ucontext(ib_qp->uobject->context) : NULL;
+	destroy_qp(&rhp->rdev, &qhp->wq,
+		   ucontext ? &ucontext->uctx : &rhp->rdev.uctx);
+
+	CTR3(KTR_IW_CXGBE, "%s ib_qp %p qpid 0x%0x", __func__, ib_qp,
+	    qhp->wq.sq.qid);
+	kfree(qhp);
+	return 0;
+}
+
+static int disable_qp_db(int id, void *p, void *data)
+{
+	struct c4iw_qp *qp = p;
+
+	t4_disable_wq_db(&qp->wq);
+	return 0;
+}
+
+struct ib_qp *
+c4iw_create_qp(struct ib_pd *pd, struct ib_qp_init_attr *attrs,
+    struct ib_udata *udata)
+{
+	struct c4iw_dev *rhp;
+	struct c4iw_qp *qhp;
+	struct c4iw_pd *php;
+	struct c4iw_cq *schp;
+	struct c4iw_cq *rchp;
+	struct c4iw_create_qp_resp uresp;
+	int sqsize, rqsize;
+	struct c4iw_ucontext *ucontext;
+	int ret;
+	struct c4iw_mm_entry *mm1, *mm2, *mm3, *mm4;
+
+	CTR2(KTR_IW_CXGBE, "%s ib_pd %p", __func__, pd);
+
+	if (attrs->qp_type != IB_QPT_RC)
+		return ERR_PTR(-EINVAL);
+
+	php = to_c4iw_pd(pd);
+	rhp = php->rhp;
+	schp = get_chp(rhp, ((struct c4iw_cq *)attrs->send_cq)->cq.cqid);
+	rchp = get_chp(rhp, ((struct c4iw_cq *)attrs->recv_cq)->cq.cqid);
+	if (!schp || !rchp)
+		return ERR_PTR(-EINVAL);
+
+	if (attrs->cap.max_inline_data > T4_MAX_SEND_INLINE)
+		return ERR_PTR(-EINVAL);
+
+	rqsize = roundup(attrs->cap.max_recv_wr + 1, 16);
+	if (rqsize > T4_MAX_RQ_SIZE)
+		return ERR_PTR(-E2BIG);
+
+	sqsize = roundup(attrs->cap.max_send_wr + 1, 16);
+	if (sqsize > T4_MAX_SQ_SIZE)
+		return ERR_PTR(-E2BIG);
+
+	ucontext = pd->uobject ? to_c4iw_ucontext(pd->uobject->context) : NULL;
+
+
+	qhp = kzalloc(sizeof(*qhp), GFP_KERNEL);
+	if (!qhp)
+		return ERR_PTR(-ENOMEM);
+	qhp->wq.sq.size = sqsize;
+	qhp->wq.sq.memsize = (sqsize + 1) * sizeof *qhp->wq.sq.queue;
+	qhp->wq.rq.size = rqsize;
+	qhp->wq.rq.memsize = (rqsize + 1) * sizeof *qhp->wq.rq.queue;
+
+	if (ucontext) {
+		qhp->wq.sq.memsize = roundup(qhp->wq.sq.memsize, PAGE_SIZE);
+		qhp->wq.rq.memsize = roundup(qhp->wq.rq.memsize, PAGE_SIZE);
+	}
+
+	CTR5(KTR_IW_CXGBE, "%s sqsize %u sqmemsize %zu rqsize %u rqmemsize %zu",
+	    __func__, sqsize, qhp->wq.sq.memsize, rqsize, qhp->wq.rq.memsize);
+
+	ret = create_qp(&rhp->rdev, &qhp->wq, &schp->cq, &rchp->cq,
+			ucontext ? &ucontext->uctx : &rhp->rdev.uctx);
+	if (ret)
+		goto err1;
+
+	attrs->cap.max_recv_wr = rqsize - 1;
+	attrs->cap.max_send_wr = sqsize - 1;
+	attrs->cap.max_inline_data = T4_MAX_SEND_INLINE;
+
+	qhp->rhp = rhp;
+	qhp->attr.pd = php->pdid;
+	qhp->attr.scq = ((struct c4iw_cq *) attrs->send_cq)->cq.cqid;
+	qhp->attr.rcq = ((struct c4iw_cq *) attrs->recv_cq)->cq.cqid;
+	qhp->attr.sq_num_entries = attrs->cap.max_send_wr;
+	qhp->attr.rq_num_entries = attrs->cap.max_recv_wr;
+	qhp->attr.sq_max_sges = attrs->cap.max_send_sge;
+	qhp->attr.sq_max_sges_rdma_write = attrs->cap.max_send_sge;
+	qhp->attr.rq_max_sges = attrs->cap.max_recv_sge;
+	qhp->attr.state = C4IW_QP_STATE_IDLE;
+	qhp->attr.next_state = C4IW_QP_STATE_IDLE;
+	qhp->attr.enable_rdma_read = 1;
+	qhp->attr.enable_rdma_write = 1;
+	qhp->attr.enable_bind = 1;
+	qhp->attr.max_ord = 1;
+	qhp->attr.max_ird = 1;
+	spin_lock_init(&qhp->lock);
+	mutex_init(&qhp->mutex);
+	init_waitqueue_head(&qhp->wait);
+	atomic_set(&qhp->refcnt, 1);
+
+	spin_lock_irq(&rhp->lock);
+	if (rhp->db_state != NORMAL)
+		t4_disable_wq_db(&qhp->wq);
+	if (++rhp->qpcnt > db_fc_threshold && rhp->db_state == NORMAL) {
+		rhp->rdev.stats.db_state_transitions++;
+		rhp->db_state = FLOW_CONTROL;
+		idr_for_each(&rhp->qpidr, disable_qp_db, NULL);
+	}
+	ret = insert_handle_nolock(rhp, &rhp->qpidr, qhp, qhp->wq.sq.qid);
+	spin_unlock_irq(&rhp->lock);
+	if (ret)
+		goto err2;
+
+	if (udata) {
+		mm1 = kmalloc(sizeof *mm1, GFP_KERNEL);
+		if (!mm1) {
+			ret = -ENOMEM;
+			goto err3;
+		}
+		mm2 = kmalloc(sizeof *mm2, GFP_KERNEL);
+		if (!mm2) {
+			ret = -ENOMEM;
+			goto err4;
+		}
+		mm3 = kmalloc(sizeof *mm3, GFP_KERNEL);
+		if (!mm3) {
+			ret = -ENOMEM;
+			goto err5;
+		}
+		mm4 = kmalloc(sizeof *mm4, GFP_KERNEL);
+		if (!mm4) {
+			ret = -ENOMEM;
+			goto err6;
+		}
+		uresp.flags = 0;
+		uresp.qid_mask = rhp->rdev.qpmask;
+		uresp.sqid = qhp->wq.sq.qid;
+		uresp.sq_size = qhp->wq.sq.size;
+		uresp.sq_memsize = qhp->wq.sq.memsize;
+		uresp.rqid = qhp->wq.rq.qid;
+		uresp.rq_size = qhp->wq.rq.size;
+		uresp.rq_memsize = qhp->wq.rq.memsize;
+		spin_lock(&ucontext->mmap_lock);
+		uresp.sq_key = ucontext->key;
+		ucontext->key += PAGE_SIZE;
+		uresp.rq_key = ucontext->key;
+		ucontext->key += PAGE_SIZE;
+		uresp.sq_db_gts_key = ucontext->key;
+		ucontext->key += PAGE_SIZE;
+		uresp.rq_db_gts_key = ucontext->key;
+		ucontext->key += PAGE_SIZE;
+		spin_unlock(&ucontext->mmap_lock);
+		ret = ib_copy_to_udata(udata, &uresp, sizeof uresp);
+		if (ret)
+			goto err7;
+		mm1->key = uresp.sq_key;
+		mm1->addr = qhp->wq.sq.phys_addr;
+		mm1->len = PAGE_ALIGN(qhp->wq.sq.memsize);
+		CTR4(KTR_IW_CXGBE, "%s mm1 %x, %x, %d", __func__, mm1->key,
+		    mm1->addr, mm1->len);
+		insert_mmap(ucontext, mm1);
+		mm2->key = uresp.rq_key;
+		mm2->addr = vtophys(qhp->wq.rq.queue);
+		mm2->len = PAGE_ALIGN(qhp->wq.rq.memsize);
+		CTR4(KTR_IW_CXGBE, "%s mm2 %x, %x, %d", __func__, mm2->key,
+		    mm2->addr, mm2->len);
+		insert_mmap(ucontext, mm2);
+		mm3->key = uresp.sq_db_gts_key;
+		mm3->addr = qhp->wq.sq.udb;
+		mm3->len = PAGE_SIZE;
+		CTR4(KTR_IW_CXGBE, "%s mm3 %x, %x, %d", __func__, mm3->key,
+		    mm3->addr, mm3->len);
+		insert_mmap(ucontext, mm3);
+		mm4->key = uresp.rq_db_gts_key;
+		mm4->addr = qhp->wq.rq.udb;
+		mm4->len = PAGE_SIZE;
+		CTR4(KTR_IW_CXGBE, "%s mm4 %x, %x, %d", __func__, mm4->key,
+		    mm4->addr, mm4->len);
+		insert_mmap(ucontext, mm4);
+	}
+	qhp->ibqp.qp_num = qhp->wq.sq.qid;
+	init_timer(&(qhp->timer));
+	CTR5(KTR_IW_CXGBE,
+	    "%s qhp %p sq_num_entries %d, rq_num_entries %d qpid 0x%0x",
+	    __func__, qhp, qhp->attr.sq_num_entries, qhp->attr.rq_num_entries,
+	    qhp->wq.sq.qid);
+	return &qhp->ibqp;
+err7:
+	kfree(mm4);
+err6:
+	kfree(mm3);
+err5:
+	kfree(mm2);
+err4:
+	kfree(mm1);
+err3:
+	remove_handle(rhp, &rhp->qpidr, qhp->wq.sq.qid);
+err2:
+	destroy_qp(&rhp->rdev, &qhp->wq,
+		   ucontext ? &ucontext->uctx : &rhp->rdev.uctx);
+err1:
+	kfree(qhp);
+	return ERR_PTR(ret);
+}
+
+int c4iw_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
+		      int attr_mask, struct ib_udata *udata)
+{
+	struct c4iw_dev *rhp;
+	struct c4iw_qp *qhp;
+	enum c4iw_qp_attr_mask mask = 0;
+	struct c4iw_qp_attributes attrs;
+
+	CTR2(KTR_IW_CXGBE, "%s ib_qp %p", __func__, ibqp);
+
+	/* iwarp does not support the RTR state */
+	if ((attr_mask & IB_QP_STATE) && (attr->qp_state == IB_QPS_RTR))
+		attr_mask &= ~IB_QP_STATE;
+
+	/* Make sure we still have something left to do */
+	if (!attr_mask)
+		return 0;
+
+	memset(&attrs, 0, sizeof attrs);
+	qhp = to_c4iw_qp(ibqp);
+	rhp = qhp->rhp;
+
+	attrs.next_state = c4iw_convert_state(attr->qp_state);
+	attrs.enable_rdma_read = (attr->qp_access_flags &
+			       IB_ACCESS_REMOTE_READ) ?  1 : 0;
+	attrs.enable_rdma_write = (attr->qp_access_flags &
+				IB_ACCESS_REMOTE_WRITE) ? 1 : 0;
+	attrs.enable_bind = (attr->qp_access_flags & IB_ACCESS_MW_BIND) ? 1 : 0;
+
+
+	mask |= (attr_mask & IB_QP_STATE) ? C4IW_QP_ATTR_NEXT_STATE : 0;
+	mask |= (attr_mask & IB_QP_ACCESS_FLAGS) ?
+			(C4IW_QP_ATTR_ENABLE_RDMA_READ |
+			 C4IW_QP_ATTR_ENABLE_RDMA_WRITE |
+			 C4IW_QP_ATTR_ENABLE_RDMA_BIND) : 0;
+
+	/*
+	 * Use SQ_PSN and RQ_PSN to pass in IDX_INC values for
+	 * ringing the queue db when we're in DB_FULL mode.
+	 */
+	attrs.sq_db_inc = attr->sq_psn;
+	attrs.rq_db_inc = attr->rq_psn;
+	mask |= (attr_mask & IB_QP_SQ_PSN) ? C4IW_QP_ATTR_SQ_DB : 0;
+	mask |= (attr_mask & IB_QP_RQ_PSN) ? C4IW_QP_ATTR_RQ_DB : 0;
+
+	return c4iw_modify_qp(rhp, qhp, mask, &attrs, 0);
+}
+
+struct ib_qp *c4iw_get_qp(struct ib_device *dev, int qpn)
+{
+	CTR3(KTR_IW_CXGBE, "%s ib_dev %p qpn 0x%x", __func__, dev, qpn);
+	return (struct ib_qp *)get_qhp(to_c4iw_dev(dev), qpn);
+}
+
+int c4iw_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
+		     int attr_mask, struct ib_qp_init_attr *init_attr)
+{
+	struct c4iw_qp *qhp = to_c4iw_qp(ibqp);
+
+	memset(attr, 0, sizeof *attr);
+	memset(init_attr, 0, sizeof *init_attr);
+	attr->qp_state = to_ib_qp_state(qhp->attr.state);
+	return 0;
+}
+#endif
diff --git a/sys/dev/cxgbe/iw_cxgbe/resource.c b/sys/dev/cxgbe/iw_cxgbe/resource.c
new file mode 100644
index 00000000000..7d3694cb592
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/resource.c
@@ -0,0 +1,342 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ */
+/* Crude resource management */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_inet.h"
+
+#ifdef TCP_OFFLOAD
+#include <linux/spinlock.h>
+#include "iw_cxgbe.h"
+
+static int c4iw_init_qid_table(struct c4iw_rdev *rdev)
+{
+	u32 i;
+
+	if (c4iw_id_table_alloc(&rdev->resource.qid_table,
+				rdev->adap->vres.qp.start,
+				rdev->adap->vres.qp.size,
+				rdev->adap->vres.qp.size, 0)) {
+		printf("%s: return ENOMEM\n", __func__);
+		return -ENOMEM;
+	}
+
+	for (i = rdev->adap->vres.qp.start;
+		i < rdev->adap->vres.qp.start + rdev->adap->vres.qp.size; i++)
+		if (!(i & rdev->qpmask))
+			c4iw_id_free(&rdev->resource.qid_table, i);
+	return 0;
+}
+
+/* nr_* must be power of 2 */
+int c4iw_init_resource(struct c4iw_rdev *rdev, u32 nr_tpt, u32 nr_pdid)
+{
+	int err = 0;
+	err = c4iw_id_table_alloc(&rdev->resource.tpt_table, 0, nr_tpt, 1,
+					C4IW_ID_TABLE_F_RANDOM);
+	if (err)
+		goto tpt_err;
+	err = c4iw_init_qid_table(rdev);
+	if (err)
+		goto qid_err;
+	err = c4iw_id_table_alloc(&rdev->resource.pdid_table, 0,
+					nr_pdid, 1, 0);
+	if (err)
+		goto pdid_err;
+	return 0;
+ pdid_err:
+	c4iw_id_table_free(&rdev->resource.qid_table);
+ qid_err:
+	c4iw_id_table_free(&rdev->resource.tpt_table);
+ tpt_err:
+	return -ENOMEM;
+}
+
+/*
+ * returns 0 if no resource available
+ */
+u32 c4iw_get_resource(struct c4iw_id_table *id_table)
+{
+	u32 entry;
+	entry = c4iw_id_alloc(id_table);
+	if (entry == (u32)(-1)) {
+		return 0;
+	}
+	return entry;
+}
+
+void c4iw_put_resource(struct c4iw_id_table *id_table, u32 entry)
+{
+	CTR2(KTR_IW_CXGBE, "%s entry 0x%x", __func__, entry);
+	c4iw_id_free(id_table, entry);
+}
+
+u32 c4iw_get_cqid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
+{
+	struct c4iw_qid_list *entry;
+	u32 qid;
+	int i;
+
+	mutex_lock(&uctx->lock);
+	if (!list_empty(&uctx->cqids)) {
+		entry = list_entry(uctx->cqids.next, struct c4iw_qid_list,
+				   entry);
+		list_del(&entry->entry);
+		qid = entry->qid;
+		kfree(entry);
+	} else {
+		qid = c4iw_get_resource(&rdev->resource.qid_table);
+		if (!qid)
+			goto out;
+		mutex_lock(&rdev->stats.lock);
+		rdev->stats.qid.cur += rdev->qpmask + 1;
+		mutex_unlock(&rdev->stats.lock);
+		for (i = qid+1; i & rdev->qpmask; i++) {
+			entry = kmalloc(sizeof *entry, GFP_KERNEL);
+			if (!entry)
+				goto out;
+			entry->qid = i;
+			list_add_tail(&entry->entry, &uctx->cqids);
+		}
+
+		/*
+		 * now put the same ids on the qp list since they all
+		 * map to the same db/gts page.
+		 */
+		entry = kmalloc(sizeof *entry, GFP_KERNEL);
+		if (!entry)
+			goto out;
+		entry->qid = qid;
+		list_add_tail(&entry->entry, &uctx->qpids);
+		for (i = qid+1; i & rdev->qpmask; i++) {
+			entry = kmalloc(sizeof *entry, GFP_KERNEL);
+			if (!entry)
+				goto out;
+			entry->qid = i;
+			list_add_tail(&entry->entry, &uctx->qpids);
+		}
+	}
+out:
+	mutex_unlock(&uctx->lock);
+	CTR2(KTR_IW_CXGBE, "%s: qid 0x%x", __func__, qid);
+	mutex_lock(&rdev->stats.lock);
+	if (rdev->stats.qid.cur > rdev->stats.qid.max)
+		rdev->stats.qid.max = rdev->stats.qid.cur;
+	mutex_unlock(&rdev->stats.lock);
+	return qid;
+}
+
+void c4iw_put_cqid(struct c4iw_rdev *rdev, u32 qid,
+		   struct c4iw_dev_ucontext *uctx)
+{
+	struct c4iw_qid_list *entry;
+
+	entry = kmalloc(sizeof *entry, GFP_KERNEL);
+	if (!entry)
+		return;
+	CTR2(KTR_IW_CXGBE, "%s qid 0x%x", __func__, qid);
+	entry->qid = qid;
+	mutex_lock(&uctx->lock);
+	list_add_tail(&entry->entry, &uctx->cqids);
+	mutex_unlock(&uctx->lock);
+}
+
+u32 c4iw_get_qpid(struct c4iw_rdev *rdev, struct c4iw_dev_ucontext *uctx)
+{
+	struct c4iw_qid_list *entry;
+	u32 qid;
+	int i;
+
+	mutex_lock(&uctx->lock);
+	if (!list_empty(&uctx->qpids)) {
+		entry = list_entry(uctx->qpids.next, struct c4iw_qid_list,
+				   entry);
+		list_del(&entry->entry);
+		qid = entry->qid;
+		kfree(entry);
+	} else {
+		qid = c4iw_get_resource(&rdev->resource.qid_table);
+		if (!qid)
+			goto out;
+		mutex_lock(&rdev->stats.lock);
+		rdev->stats.qid.cur += rdev->qpmask + 1;
+		mutex_unlock(&rdev->stats.lock);
+		for (i = qid+1; i & rdev->qpmask; i++) {
+			entry = kmalloc(sizeof *entry, GFP_KERNEL);
+			if (!entry)
+				goto out;
+			entry->qid = i;
+			list_add_tail(&entry->entry, &uctx->qpids);
+		}
+
+		/*
+		 * now put the same ids on the cq list since they all
+		 * map to the same db/gts page.
+		 */
+		entry = kmalloc(sizeof *entry, GFP_KERNEL);
+		if (!entry)
+			goto out;
+		entry->qid = qid;
+		list_add_tail(&entry->entry, &uctx->cqids);
+		for (i = qid; i & rdev->qpmask; i++) {
+			entry = kmalloc(sizeof *entry, GFP_KERNEL);
+			if (!entry)
+				goto out;
+			entry->qid = i;
+			list_add_tail(&entry->entry, &uctx->cqids);
+		}
+	}
+out:
+	mutex_unlock(&uctx->lock);
+	CTR2(KTR_IW_CXGBE, "%s qid 0x%x", __func__, qid);
+	mutex_lock(&rdev->stats.lock);
+	if (rdev->stats.qid.cur > rdev->stats.qid.max)
+		rdev->stats.qid.max = rdev->stats.qid.cur;
+	mutex_unlock(&rdev->stats.lock);
+	return qid;
+}
+
+void c4iw_put_qpid(struct c4iw_rdev *rdev, u32 qid,
+		   struct c4iw_dev_ucontext *uctx)
+{
+	struct c4iw_qid_list *entry;
+
+	entry = kmalloc(sizeof *entry, GFP_KERNEL);
+	if (!entry)
+		return;
+	CTR2(KTR_IW_CXGBE, "%s qid 0x%x", __func__, qid);
+	entry->qid = qid;
+	mutex_lock(&uctx->lock);
+	list_add_tail(&entry->entry, &uctx->qpids);
+	mutex_unlock(&uctx->lock);
+}
+
+void c4iw_destroy_resource(struct c4iw_resource *rscp)
+{
+	c4iw_id_table_free(&rscp->tpt_table);
+	c4iw_id_table_free(&rscp->qid_table);
+	c4iw_id_table_free(&rscp->pdid_table);
+}
+
+/* PBL Memory Manager.  Uses Linux generic allocator. */
+
+#define MIN_PBL_SHIFT 8			/* 256B == min PBL size (32 entries) */
+
+u32 c4iw_pblpool_alloc(struct c4iw_rdev *rdev, int size)
+{
+	unsigned long addr = gen_pool_alloc(rdev->pbl_pool, size);
+	CTR3(KTR_IW_CXGBE, "%s addr 0x%x size %d", __func__, (u32)addr, size);
+	mutex_lock(&rdev->stats.lock);
+	if (addr) {
+		rdev->stats.pbl.cur += roundup(size, 1 << MIN_PBL_SHIFT);
+		if (rdev->stats.pbl.cur > rdev->stats.pbl.max)
+			rdev->stats.pbl.max = rdev->stats.pbl.cur;
+	} else
+		rdev->stats.pbl.fail++;
+	mutex_unlock(&rdev->stats.lock);
+	return (u32)addr;
+}
+
+void c4iw_pblpool_free(struct c4iw_rdev *rdev, u32 addr, int size)
+{
+	CTR3(KTR_IW_CXGBE, "%s addr 0x%x size %d", __func__, addr, size);
+	mutex_lock(&rdev->stats.lock);
+	rdev->stats.pbl.cur -= roundup(size, 1 << MIN_PBL_SHIFT);
+	mutex_unlock(&rdev->stats.lock);
+	gen_pool_free(rdev->pbl_pool, (unsigned long)addr, size);
+}
+
+int c4iw_pblpool_create(struct c4iw_rdev *rdev)
+{
+	rdev->pbl_pool = gen_pool_create(rdev->adap->vres.pbl.start,
+					 MIN_PBL_SHIFT,
+					 rdev->adap->vres.pbl.size);
+	if (!rdev->pbl_pool)
+		return -ENOMEM;
+
+	return 0;
+}
+
+void c4iw_pblpool_destroy(struct c4iw_rdev *rdev)
+{
+	gen_pool_destroy(rdev->pbl_pool);
+}
+
+/* RQT Memory Manager.  Uses Linux generic allocator. */
+
+#define MIN_RQT_SHIFT 10	/* 1KB == min RQT size (16 entries) */
+
+u32 c4iw_rqtpool_alloc(struct c4iw_rdev *rdev, int size)
+{
+	unsigned long addr = gen_pool_alloc(rdev->rqt_pool, size << 6);
+	CTR3(KTR_IW_CXGBE, "%s addr 0x%x size %d", __func__, (u32)addr,
+	    size << 6);
+	if (!addr)
+		printf("%s: Out of RQT memory\n",
+		       device_get_nameunit(rdev->adap->dev));
+	mutex_lock(&rdev->stats.lock);
+	if (addr) {
+		rdev->stats.rqt.cur += roundup(size << 6, 1 << MIN_RQT_SHIFT);
+		if (rdev->stats.rqt.cur > rdev->stats.rqt.max)
+			rdev->stats.rqt.max = rdev->stats.rqt.cur;
+	} else
+		rdev->stats.rqt.fail++;
+	mutex_unlock(&rdev->stats.lock);
+	return (u32)addr;
+}
+
+void c4iw_rqtpool_free(struct c4iw_rdev *rdev, u32 addr, int size)
+{
+	CTR3(KTR_IW_CXGBE, "%s addr 0x%x size %d", __func__, addr, size << 6);
+	mutex_lock(&rdev->stats.lock);
+	rdev->stats.rqt.cur -= roundup(size << 6, 1 << MIN_RQT_SHIFT);
+	mutex_unlock(&rdev->stats.lock);
+	gen_pool_free(rdev->rqt_pool, (unsigned long)addr, size << 6);
+}
+
+int c4iw_rqtpool_create(struct c4iw_rdev *rdev)
+{
+	rdev->rqt_pool = gen_pool_create(rdev->adap->vres.rq.start,
+					 MIN_RQT_SHIFT,
+					 rdev->adap->vres.rq.size);
+	if (!rdev->rqt_pool)
+		return -ENOMEM;
+
+	return 0;
+}
+
+void c4iw_rqtpool_destroy(struct c4iw_rdev *rdev)
+{
+	gen_pool_destroy(rdev->rqt_pool);
+}
+#endif
diff --git a/sys/dev/cxgbe/iw_cxgbe/t4.h b/sys/dev/cxgbe/iw_cxgbe/t4.h
new file mode 100644
index 00000000000..023c607f8bf
--- /dev/null
+++ b/sys/dev/cxgbe/iw_cxgbe/t4.h
@@ -0,0 +1,597 @@
+/*
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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.
+ *
+ * $FreeBSD$
+ */
+#ifndef __T4_H__
+#define __T4_H__
+
+/*
+ * Fixme: Adding missing defines
+ */
+#define SGE_PF_KDOORBELL 0x0
+#define  QID_MASK    0xffff8000U
+#define  QID_SHIFT   15
+#define  QID(x)      ((x) << QID_SHIFT)
+#define  DBPRIO      0x00004000U
+#define  PIDX_MASK   0x00003fffU
+#define  PIDX_SHIFT  0
+#define  PIDX(x)     ((x) << PIDX_SHIFT)
+
+#define SGE_PF_GTS 0x4
+#define  INGRESSQID_MASK   0xffff0000U
+#define  INGRESSQID_SHIFT  16
+#define  INGRESSQID(x)     ((x) << INGRESSQID_SHIFT)
+#define  TIMERREG_MASK     0x0000e000U
+#define  TIMERREG_SHIFT    13
+#define  TIMERREG(x)       ((x) << TIMERREG_SHIFT)
+#define  SEINTARM_MASK     0x00001000U
+#define  SEINTARM_SHIFT    12
+#define  SEINTARM(x)       ((x) << SEINTARM_SHIFT)
+#define  CIDXINC_MASK      0x00000fffU
+#define  CIDXINC_SHIFT     0
+#define  CIDXINC(x)        ((x) << CIDXINC_SHIFT)
+
+#define T4_MAX_NUM_QP (1<<16)
+#define T4_MAX_NUM_CQ (1<<15)
+#define T4_MAX_NUM_PD (1<<15)
+#define T4_EQ_STATUS_ENTRIES (L1_CACHE_BYTES > 64 ? 2 : 1)
+#define T4_MAX_EQ_SIZE (65520 - T4_EQ_STATUS_ENTRIES)
+#define T4_MAX_IQ_SIZE (65520 - 1)
+#define T4_MAX_RQ_SIZE (8192 - T4_EQ_STATUS_ENTRIES)
+#define T4_MAX_SQ_SIZE (T4_MAX_EQ_SIZE - 1)
+#define T4_MAX_QP_DEPTH (T4_MAX_RQ_SIZE - 1)
+#define T4_MAX_CQ_DEPTH (T4_MAX_IQ_SIZE - 1)
+#define T4_MAX_NUM_STAG (1<<15)
+#define T4_MAX_MR_SIZE (~0ULL - 1)
+#define T4_PAGESIZE_MASK 0xffff000  /* 4KB-128MB */
+#define T4_STAG_UNSET 0xffffffff
+#define T4_FW_MAJ 0
+#define T4_EQ_STATUS_ENTRIES (L1_CACHE_BYTES > 64 ? 2 : 1)
+#define A_PCIE_MA_SYNC 0x30b4
+
+struct t4_status_page {
+	__be32 rsvd1;	/* flit 0 - hw owns */
+	__be16 rsvd2;
+	__be16 qid;
+	__be16 cidx;
+	__be16 pidx;
+	u8 qp_err;	/* flit 1 - sw owns */
+	u8 db_off;
+	u8 pad;
+	u16 host_wq_pidx;
+	u16 host_cidx;
+	u16 host_pidx;
+};
+
+#define T4_EQ_ENTRY_SIZE 64
+
+#define T4_SQ_NUM_SLOTS 5
+#define T4_SQ_NUM_BYTES (T4_EQ_ENTRY_SIZE * T4_SQ_NUM_SLOTS)
+#define T4_MAX_SEND_SGE ((T4_SQ_NUM_BYTES - sizeof(struct fw_ri_send_wr) - \
+			sizeof(struct fw_ri_isgl)) / sizeof(struct fw_ri_sge))
+#define T4_MAX_SEND_INLINE ((T4_SQ_NUM_BYTES - sizeof(struct fw_ri_send_wr) - \
+			sizeof(struct fw_ri_immd)))
+#define T4_MAX_WRITE_INLINE ((T4_SQ_NUM_BYTES - \
+			sizeof(struct fw_ri_rdma_write_wr) - \
+			sizeof(struct fw_ri_immd)))
+#define T4_MAX_WRITE_SGE ((T4_SQ_NUM_BYTES - \
+			sizeof(struct fw_ri_rdma_write_wr) - \
+			sizeof(struct fw_ri_isgl)) / sizeof(struct fw_ri_sge))
+#define T4_MAX_FR_IMMD ((T4_SQ_NUM_BYTES - sizeof(struct fw_ri_fr_nsmr_wr) - \
+			sizeof(struct fw_ri_immd)) & ~31UL)
+#define T4_MAX_FR_DEPTH (T4_MAX_FR_IMMD / sizeof(u64))
+
+#define T4_RQ_NUM_SLOTS 2
+#define T4_RQ_NUM_BYTES (T4_EQ_ENTRY_SIZE * T4_RQ_NUM_SLOTS)
+#define T4_MAX_RECV_SGE 4
+
+union t4_wr {
+	struct fw_ri_res_wr res;
+	struct fw_ri_wr ri;
+	struct fw_ri_rdma_write_wr write;
+	struct fw_ri_send_wr send;
+	struct fw_ri_rdma_read_wr read;
+	struct fw_ri_bind_mw_wr bind;
+	struct fw_ri_fr_nsmr_wr fr;
+	struct fw_ri_inv_lstag_wr inv;
+	struct t4_status_page status;
+	__be64 flits[T4_EQ_ENTRY_SIZE / sizeof(__be64) * T4_SQ_NUM_SLOTS];
+};
+
+union t4_recv_wr {
+	struct fw_ri_recv_wr recv;
+	struct t4_status_page status;
+	__be64 flits[T4_EQ_ENTRY_SIZE / sizeof(__be64) * T4_RQ_NUM_SLOTS];
+};
+
+static inline void init_wr_hdr(union t4_wr *wqe, u16 wrid,
+			       enum fw_wr_opcodes opcode, u8 flags, u8 len16)
+{
+	wqe->send.opcode = (u8)opcode;
+	wqe->send.flags = flags;
+	wqe->send.wrid = wrid;
+	wqe->send.r1[0] = 0;
+	wqe->send.r1[1] = 0;
+	wqe->send.r1[2] = 0;
+	wqe->send.len16 = len16;
+}
+
+/* CQE/AE status codes */
+#define T4_ERR_SUCCESS                     0x0
+#define T4_ERR_STAG                        0x1	/* STAG invalid: either the */
+						/* STAG is offlimt, being 0, */
+						/* or STAG_key mismatch */
+#define T4_ERR_PDID                        0x2	/* PDID mismatch */
+#define T4_ERR_QPID                        0x3	/* QPID mismatch */
+#define T4_ERR_ACCESS                      0x4	/* Invalid access right */
+#define T4_ERR_WRAP                        0x5	/* Wrap error */
+#define T4_ERR_BOUND                       0x6	/* base and bounds voilation */
+#define T4_ERR_INVALIDATE_SHARED_MR        0x7	/* attempt to invalidate a  */
+						/* shared memory region */
+#define T4_ERR_INVALIDATE_MR_WITH_MW_BOUND 0x8	/* attempt to invalidate a  */
+						/* shared memory region */
+#define T4_ERR_ECC                         0x9	/* ECC error detected */
+#define T4_ERR_ECC_PSTAG                   0xA	/* ECC error detected when  */
+						/* reading PSTAG for a MW  */
+						/* Invalidate */
+#define T4_ERR_PBL_ADDR_BOUND              0xB	/* pbl addr out of bounds:  */
+						/* software error */
+#define T4_ERR_SWFLUSH			   0xC	/* SW FLUSHED */
+#define T4_ERR_CRC                         0x10 /* CRC error */
+#define T4_ERR_MARKER                      0x11 /* Marker error */
+#define T4_ERR_PDU_LEN_ERR                 0x12 /* invalid PDU length */
+#define T4_ERR_OUT_OF_RQE                  0x13 /* out of RQE */
+#define T4_ERR_DDP_VERSION                 0x14 /* wrong DDP version */
+#define T4_ERR_RDMA_VERSION                0x15 /* wrong RDMA version */
+#define T4_ERR_OPCODE                      0x16 /* invalid rdma opcode */
+#define T4_ERR_DDP_QUEUE_NUM               0x17 /* invalid ddp queue number */
+#define T4_ERR_MSN                         0x18 /* MSN error */
+#define T4_ERR_TBIT                        0x19 /* tag bit not set correctly */
+#define T4_ERR_MO                          0x1A /* MO not 0 for TERMINATE  */
+						/* or READ_REQ */
+#define T4_ERR_MSN_GAP                     0x1B
+#define T4_ERR_MSN_RANGE                   0x1C
+#define T4_ERR_IRD_OVERFLOW                0x1D
+#define T4_ERR_RQE_ADDR_BOUND              0x1E /* RQE addr out of bounds:  */
+						/* software error */
+#define T4_ERR_INTERNAL_ERR                0x1F /* internal error (opcode  */
+						/* mismatch) */
+/*
+ * CQE defs
+ */
+struct t4_cqe {
+	__be32 header;
+	__be32 len;
+	union {
+		struct {
+			__be32 stag;
+			__be32 msn;
+		} rcqe;
+		struct {
+			u32 nada1;
+			u16 nada2;
+			u16 cidx;
+		} scqe;
+		struct {
+			__be32 wrid_hi;
+			__be32 wrid_low;
+		} gen;
+	} u;
+	__be64 reserved;
+	__be64 bits_type_ts;
+};
+
+/* macros for flit 0 of the cqe */
+
+#define S_CQE_QPID        12
+#define M_CQE_QPID        0xFFFFF
+#define G_CQE_QPID(x)     ((((x) >> S_CQE_QPID)) & M_CQE_QPID)
+#define V_CQE_QPID(x)	  ((x)<<S_CQE_QPID)
+
+#define S_CQE_SWCQE       11
+#define M_CQE_SWCQE       0x1
+#define G_CQE_SWCQE(x)    ((((x) >> S_CQE_SWCQE)) & M_CQE_SWCQE)
+#define V_CQE_SWCQE(x)	  ((x)<<S_CQE_SWCQE)
+
+#define S_CQE_STATUS      5
+#define M_CQE_STATUS      0x1F
+#define G_CQE_STATUS(x)   ((((x) >> S_CQE_STATUS)) & M_CQE_STATUS)
+#define V_CQE_STATUS(x)   ((x)<<S_CQE_STATUS)
+
+#define S_CQE_TYPE        4
+#define M_CQE_TYPE        0x1
+#define G_CQE_TYPE(x)     ((((x) >> S_CQE_TYPE)) & M_CQE_TYPE)
+#define V_CQE_TYPE(x)     ((x)<<S_CQE_TYPE)
+
+#define S_CQE_OPCODE      0
+#define M_CQE_OPCODE      0xF
+#define G_CQE_OPCODE(x)   ((((x) >> S_CQE_OPCODE)) & M_CQE_OPCODE)
+#define V_CQE_OPCODE(x)   ((x)<<S_CQE_OPCODE)
+
+#define SW_CQE(x)         (G_CQE_SWCQE(be32_to_cpu((x)->header)))
+#define CQE_QPID(x)       (G_CQE_QPID(be32_to_cpu((x)->header)))
+#define CQE_TYPE(x)       (G_CQE_TYPE(be32_to_cpu((x)->header)))
+#define SQ_TYPE(x)	  (CQE_TYPE((x)))
+#define RQ_TYPE(x)	  (!CQE_TYPE((x)))
+#define CQE_STATUS(x)     (G_CQE_STATUS(be32_to_cpu((x)->header)))
+#define CQE_OPCODE(x)     (G_CQE_OPCODE(be32_to_cpu((x)->header)))
+
+#define CQE_SEND_OPCODE(x)(\
+	(G_CQE_OPCODE(be32_to_cpu((x)->header)) == FW_RI_SEND) || \
+	(G_CQE_OPCODE(be32_to_cpu((x)->header)) == FW_RI_SEND_WITH_SE) || \
+	(G_CQE_OPCODE(be32_to_cpu((x)->header)) == FW_RI_SEND_WITH_INV) || \
+	(G_CQE_OPCODE(be32_to_cpu((x)->header)) == FW_RI_SEND_WITH_SE_INV))
+
+#define CQE_LEN(x)        (be32_to_cpu((x)->len))
+
+/* used for RQ completion processing */
+#define CQE_WRID_STAG(x)  (be32_to_cpu((x)->u.rcqe.stag))
+#define CQE_WRID_MSN(x)   (be32_to_cpu((x)->u.rcqe.msn))
+
+/* used for SQ completion processing */
+#define CQE_WRID_SQ_IDX(x)	((x)->u.scqe.cidx)
+
+/* generic accessor macros */
+#define CQE_WRID_HI(x)		((x)->u.gen.wrid_hi)
+#define CQE_WRID_LOW(x)		((x)->u.gen.wrid_low)
+
+/* macros for flit 3 of the cqe */
+#define S_CQE_GENBIT	63
+#define M_CQE_GENBIT	0x1
+#define G_CQE_GENBIT(x)	(((x) >> S_CQE_GENBIT) & M_CQE_GENBIT)
+#define V_CQE_GENBIT(x) ((x)<<S_CQE_GENBIT)
+
+#define S_CQE_OVFBIT	62
+#define M_CQE_OVFBIT	0x1
+#define G_CQE_OVFBIT(x)	((((x) >> S_CQE_OVFBIT)) & M_CQE_OVFBIT)
+
+#define S_CQE_IQTYPE	60
+#define M_CQE_IQTYPE	0x3
+#define G_CQE_IQTYPE(x)	((((x) >> S_CQE_IQTYPE)) & M_CQE_IQTYPE)
+
+#define M_CQE_TS	0x0fffffffffffffffULL
+#define G_CQE_TS(x)	((x) & M_CQE_TS)
+
+#define CQE_OVFBIT(x)	((unsigned)G_CQE_OVFBIT(be64_to_cpu((x)->bits_type_ts)))
+#define CQE_GENBIT(x)	((unsigned)G_CQE_GENBIT(be64_to_cpu((x)->bits_type_ts)))
+#define CQE_TS(x)	(G_CQE_TS(be64_to_cpu((x)->bits_type_ts)))
+
+struct t4_swsqe {
+	u64			wr_id;
+	struct t4_cqe		cqe;
+	int			read_len;
+	int			opcode;
+	int			complete;
+	int			signaled;
+	u16			idx;
+};
+
+struct t4_sq {
+	union t4_wr *queue;
+	bus_addr_t dma_addr;
+	DECLARE_PCI_UNMAP_ADDR(mapping);
+	unsigned long phys_addr;
+	struct t4_swsqe *sw_sq;
+	struct t4_swsqe *oldest_read;
+	u64 udb;
+	size_t memsize;
+	u32 qid;
+	u16 in_use;
+	u16 size;
+	u16 cidx;
+	u16 pidx;
+	u16 wq_pidx;
+	u16 flags;
+};
+
+struct t4_swrqe {
+	u64 wr_id;
+};
+
+struct t4_rq {
+	union  t4_recv_wr *queue;
+	bus_addr_t dma_addr;
+	DECLARE_PCI_UNMAP_ADDR(mapping);
+	struct t4_swrqe *sw_rq;
+	u64 udb;
+	size_t memsize;
+	u32 qid;
+	u32 msn;
+	u32 rqt_hwaddr;
+	u16 rqt_size;
+	u16 in_use;
+	u16 size;
+	u16 cidx;
+	u16 pidx;
+	u16 wq_pidx;
+};
+
+struct t4_wq {
+	struct t4_sq sq;
+	struct t4_rq rq;
+	void __iomem *db;
+	void __iomem *gts;
+	struct c4iw_rdev *rdev;
+};
+
+static inline int t4_rqes_posted(struct t4_wq *wq)
+{
+	return wq->rq.in_use;
+}
+
+static inline int t4_rq_empty(struct t4_wq *wq)
+{
+	return wq->rq.in_use == 0;
+}
+
+static inline int t4_rq_full(struct t4_wq *wq)
+{
+	return wq->rq.in_use == (wq->rq.size - 1);
+}
+
+static inline u32 t4_rq_avail(struct t4_wq *wq)
+{
+	return wq->rq.size - 1 - wq->rq.in_use;
+}
+
+static inline void t4_rq_produce(struct t4_wq *wq, u8 len16)
+{
+	wq->rq.in_use++;
+	if (++wq->rq.pidx == wq->rq.size)
+		wq->rq.pidx = 0;
+	wq->rq.wq_pidx += DIV_ROUND_UP(len16*16, T4_EQ_ENTRY_SIZE);
+	if (wq->rq.wq_pidx >= wq->rq.size * T4_RQ_NUM_SLOTS)
+		wq->rq.wq_pidx %= wq->rq.size * T4_RQ_NUM_SLOTS;
+}
+
+static inline void t4_rq_consume(struct t4_wq *wq)
+{
+	wq->rq.in_use--;
+	wq->rq.msn++;
+	if (++wq->rq.cidx == wq->rq.size)
+		wq->rq.cidx = 0;
+}
+
+static inline u16 t4_rq_host_wq_pidx(struct t4_wq *wq)
+{
+	return wq->rq.queue[wq->rq.size].status.host_wq_pidx;
+}
+
+static inline u16 t4_rq_wq_size(struct t4_wq *wq)
+{
+		return wq->rq.size * T4_RQ_NUM_SLOTS;
+}
+
+static inline int t4_sq_empty(struct t4_wq *wq)
+{
+	return wq->sq.in_use == 0;
+}
+
+static inline int t4_sq_full(struct t4_wq *wq)
+{
+	return wq->sq.in_use == (wq->sq.size - 1);
+}
+
+static inline u32 t4_sq_avail(struct t4_wq *wq)
+{
+	return wq->sq.size - 1 - wq->sq.in_use;
+}
+
+static inline void t4_sq_produce(struct t4_wq *wq, u8 len16)
+{
+	wq->sq.in_use++;
+	if (++wq->sq.pidx == wq->sq.size)
+		wq->sq.pidx = 0;
+	wq->sq.wq_pidx += DIV_ROUND_UP(len16*16, T4_EQ_ENTRY_SIZE);
+	if (wq->sq.wq_pidx >= wq->sq.size * T4_SQ_NUM_SLOTS)
+		wq->sq.wq_pidx %= wq->sq.size * T4_SQ_NUM_SLOTS;
+}
+
+static inline void t4_sq_consume(struct t4_wq *wq)
+{
+	wq->sq.in_use--;
+	if (++wq->sq.cidx == wq->sq.size)
+		wq->sq.cidx = 0;
+}
+
+static inline u16 t4_sq_host_wq_pidx(struct t4_wq *wq)
+{
+	return wq->sq.queue[wq->sq.size].status.host_wq_pidx;
+}
+
+static inline u16 t4_sq_wq_size(struct t4_wq *wq)
+{
+		return wq->sq.size * T4_SQ_NUM_SLOTS;
+}
+
+static inline void t4_ring_sq_db(struct t4_wq *wq, u16 inc)
+{
+	wmb();
+	writel(QID(wq->sq.qid) | PIDX(inc), wq->db);
+}
+
+static inline void t4_ring_rq_db(struct t4_wq *wq, u16 inc)
+{
+	wmb();
+	writel(QID(wq->rq.qid) | PIDX(inc), wq->db);
+}
+
+static inline int t4_wq_in_error(struct t4_wq *wq)
+{
+	return wq->rq.queue[wq->rq.size].status.qp_err;
+}
+
+static inline void t4_set_wq_in_error(struct t4_wq *wq)
+{
+	wq->rq.queue[wq->rq.size].status.qp_err = 1;
+}
+
+static inline void t4_disable_wq_db(struct t4_wq *wq)
+{
+	wq->rq.queue[wq->rq.size].status.db_off = 1;
+}
+
+static inline void t4_enable_wq_db(struct t4_wq *wq)
+{
+	wq->rq.queue[wq->rq.size].status.db_off = 0;
+}
+
+static inline int t4_wq_db_enabled(struct t4_wq *wq)
+{
+	return !wq->rq.queue[wq->rq.size].status.db_off;
+}
+
+struct t4_cq {
+	struct t4_cqe *queue;
+	bus_addr_t dma_addr;
+	DECLARE_PCI_UNMAP_ADDR(mapping);
+	struct t4_cqe *sw_queue;
+	void __iomem *gts;
+	struct c4iw_rdev *rdev;
+	u64 ugts;
+	size_t memsize;
+	__be64 bits_type_ts;
+	u32 cqid;
+	u16 size; /* including status page */
+	u16 cidx;
+	u16 sw_pidx;
+	u16 sw_cidx;
+	u16 sw_in_use;
+	u16 cidx_inc;
+	u8 gen;
+	u8 error;
+};
+
+static inline int t4_arm_cq(struct t4_cq *cq, int se)
+{
+	u32 val;
+
+	while (cq->cidx_inc > CIDXINC_MASK) {
+		val = SEINTARM(0) | CIDXINC(CIDXINC_MASK) | TIMERREG(7) |
+		      INGRESSQID(cq->cqid);
+		writel(val, cq->gts);
+		cq->cidx_inc -= CIDXINC_MASK;
+	}
+	val = SEINTARM(se) | CIDXINC(cq->cidx_inc) | TIMERREG(6) |
+	      INGRESSQID(cq->cqid);
+	writel(val, cq->gts);
+	cq->cidx_inc = 0;
+	return 0;
+}
+
+static inline void t4_swcq_produce(struct t4_cq *cq)
+{
+	cq->sw_in_use++;
+	if (++cq->sw_pidx == cq->size)
+		cq->sw_pidx = 0;
+}
+
+static inline void t4_swcq_consume(struct t4_cq *cq)
+{
+	cq->sw_in_use--;
+	if (++cq->sw_cidx == cq->size)
+		cq->sw_cidx = 0;
+}
+
+static inline void t4_hwcq_consume(struct t4_cq *cq)
+{
+	cq->bits_type_ts = cq->queue[cq->cidx].bits_type_ts;
+	if (++cq->cidx_inc == (cq->size >> 4)) {
+		u32 val;
+
+		val = SEINTARM(0) | CIDXINC(cq->cidx_inc) | TIMERREG(7) |
+		      INGRESSQID(cq->cqid);
+		writel(val, cq->gts);
+		cq->cidx_inc = 0;
+	}
+	if (++cq->cidx == cq->size) {
+		cq->cidx = 0;
+		cq->gen ^= 1;
+	}
+}
+
+static inline int t4_valid_cqe(struct t4_cq *cq, struct t4_cqe *cqe)
+{
+	return (CQE_GENBIT(cqe) == cq->gen);
+}
+
+static inline int t4_next_hw_cqe(struct t4_cq *cq, struct t4_cqe **cqe)
+{
+	int ret;
+	u16 prev_cidx;
+
+	if (cq->cidx == 0)
+		prev_cidx = cq->size - 1;
+	else
+		prev_cidx = cq->cidx - 1;
+
+	if (cq->queue[prev_cidx].bits_type_ts != cq->bits_type_ts) {
+		ret = -EOVERFLOW;
+		cq->error = 1;
+		printk(KERN_ERR MOD "cq overflow cqid %u\n", cq->cqid);
+	} else if (t4_valid_cqe(cq, &cq->queue[cq->cidx])) {
+		*cqe = &cq->queue[cq->cidx];
+		ret = 0;
+	} else
+		ret = -ENODATA;
+	return ret;
+}
+
+static inline struct t4_cqe *t4_next_sw_cqe(struct t4_cq *cq)
+{
+	if (cq->sw_in_use)
+		return &cq->sw_queue[cq->sw_cidx];
+	return NULL;
+}
+
+static inline int t4_next_cqe(struct t4_cq *cq, struct t4_cqe **cqe)
+{
+	int ret = 0;
+
+	if (cq->error)
+		ret = -ENODATA;
+	else if (cq->sw_in_use)
+		*cqe = &cq->sw_queue[cq->sw_cidx];
+	else
+		ret = t4_next_hw_cqe(cq, cqe);
+	return ret;
+}
+
+static inline int t4_cq_in_error(struct t4_cq *cq)
+{
+	return ((struct t4_status_page *)&cq->queue[cq->size])->qp_err;
+}
+
+static inline void t4_set_cq_in_error(struct t4_cq *cq)
+{
+	((struct t4_status_page *)&cq->queue[cq->size])->qp_err = 1;
+}
+#endif
diff --git a/sys/contrib/rdma/core_priv.h b/sys/dev/cxgbe/iw_cxgbe/user.h
similarity index 63%
rename from sys/contrib/rdma/core_priv.h
rename to sys/dev/cxgbe/iw_cxgbe/user.h
index 5d6c9d805e3..59a1f43642f 100644
--- a/sys/contrib/rdma/core_priv.h
+++ b/sys/dev/cxgbe/iw_cxgbe/user.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004 Topspin Communications.  All rights reserved.
+ * Copyright (c) 2009-2013 Chelsio, Inc. 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
@@ -29,27 +29,42 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  *
- * $Id: core_priv.h 1349 2004-12-16 21:09:43Z roland $
- *
  * $FreeBSD$
  */
+#ifndef __C4IW_USER_H__
+#define __C4IW_USER_H__
 
-#ifndef _CORE_PRIV_H
-#define _CORE_PRIV_H
-#include <sys/mutex.h>
-#include <sys/lock.h>
+#define C4IW_UVERBS_ABI_VERSION	2
 
-#include <contrib/rdma/ib_verbs.h>
+/*
+ * Make sure that all structs defined in this file remain laid out so
+ * that they pack the same way on 32-bit and 64-bit architectures (to
+ * avoid incompatibility between 32-bit userspace and 64-bit kernels).
+ * In particular do not use pointer types -- pass pointers in __u64
+ * instead.
+ */
+struct c4iw_create_cq_resp {
+	__u64 key;
+	__u64 gts_key;
+	__u64 memsize;
+	__u32 cqid;
+	__u32 size;
+	__u32 qid_mask;
+};
 
-#ifdef notyet
-int  ib_device_register_sysfs(struct ib_device *device);
-void ib_device_unregister_sysfs(struct ib_device *device);
-
-int  ib_sysfs_setup(void);
-void ib_sysfs_cleanup(void);
+struct c4iw_create_qp_resp {
+	__u64 ma_sync_key;
+	__u64 sq_key;
+	__u64 rq_key;
+	__u64 sq_db_gts_key;
+	__u64 rq_db_gts_key;
+	__u64 sq_memsize;
+	__u64 rq_memsize;
+	__u32 sqid;
+	__u32 rqid;
+	__u32 sq_size;
+	__u32 rq_size;
+	__u32 qid_mask;
+	__u32 flags;
+};
 #endif
-
-int  ib_cache_setup(void);
-void ib_cache_cleanup(void);
-
-#endif /* _CORE_PRIV_H */
diff --git a/sys/dev/cxgbe/t4_ioctl.h b/sys/dev/cxgbe/t4_ioctl.h
index a080f64bc36..0d6dec5d70c 100644
--- a/sys/dev/cxgbe/t4_ioctl.h
+++ b/sys/dev/cxgbe/t4_ioctl.h
@@ -208,6 +208,74 @@ struct t4_filter {
 	struct t4_filter_specification fs;
 };
 
+/*
+ * Support for "sched-class" command to allow a TX Scheduling Class to be
+ * programmed with various parameters.
+ */
+struct t4_sched_params {
+	int8_t   subcmd;		/* sub-command */
+	int8_t   type;			/* packet or flow */
+	union {
+		struct {		/* sub-command SCHED_CLASS_CONFIG */
+			int8_t   minmax;	/* minmax enable */
+		} config;
+		struct {		/* sub-command SCHED_CLASS_PARAMS */
+			int8_t   level;		/* scheduler hierarchy level */
+			int8_t   mode;		/* per-class or per-flow */
+			int8_t   rateunit;	/* bit or packet rate */
+			int8_t   ratemode;	/* %port relative or kbps
+						   absolute */
+			int8_t   channel;	/* scheduler channel [0..N] */
+			int8_t   cl;		/* scheduler class [0..N] */
+			int32_t  minrate;	/* minimum rate */
+			int32_t  maxrate;	/* maximum rate */
+			int16_t  weight;	/* percent weight */
+			int16_t  pktsize;	/* average packet size */
+		} params;
+		uint8_t     reserved[6 + 8 * 8];
+	} u;
+};
+
+enum {
+	SCHED_CLASS_SUBCMD_CONFIG,	/* config sub-command */
+	SCHED_CLASS_SUBCMD_PARAMS,	/* params sub-command */
+};
+
+enum {
+	SCHED_CLASS_TYPE_PACKET,
+};
+
+enum {
+	SCHED_CLASS_LEVEL_CL_RL,	/* class rate limiter */
+	SCHED_CLASS_LEVEL_CL_WRR,	/* class weighted round robin */
+	SCHED_CLASS_LEVEL_CH_RL,	/* channel rate limiter */
+};
+
+enum {
+	SCHED_CLASS_MODE_CLASS,		/* per-class scheduling */
+	SCHED_CLASS_MODE_FLOW,		/* per-flow scheduling */
+};
+
+enum {
+	SCHED_CLASS_RATEUNIT_BITS,	/* bit rate scheduling */
+	SCHED_CLASS_RATEUNIT_PKTS,	/* packet rate scheduling */
+};
+
+enum {
+	SCHED_CLASS_RATEMODE_REL,	/* percent of port bandwidth */
+	SCHED_CLASS_RATEMODE_ABS,	/* Kb/s */
+};
+
+/*
+ * Support for "sched_queue" command to allow one or more NIC TX Queues to be
+ * bound to a TX Scheduling Class.
+ */
+struct t4_sched_queue {
+	uint8_t  port;
+	int8_t   queue;	/* queue index; -1 => all queues */
+	int8_t   cl;	/* class index; -1 => unbind */
+};
+
 #define T4_SGE_CONTEXT_SIZE 24
 enum {
 	SGE_CONTEXT_EGRESS,
@@ -261,6 +329,10 @@ struct t4_tracer {
 #define CHELSIO_T4_GET_MEM	_IOW('f', T4_GET_MEM, struct t4_mem_range)
 #define CHELSIO_T4_GET_I2C	_IOWR('f', T4_GET_I2C, struct t4_i2c_data)
 #define CHELSIO_T4_CLEAR_STATS	_IOW('f', T4_CLEAR_STATS, uint32_t)
+#define CHELSIO_T4_SCHED_CLASS  _IOW('f', T4_SET_SCHED_CLASS, \
+    struct t4_sched_params)
+#define CHELSIO_T4_SCHED_QUEUE  _IOW('f', T4_SET_SCHED_QUEUE, \
+    struct t4_sched_queue)
 #define CHELSIO_T4_GET_TRACER	_IOWR('f', T4_GET_TRACER, struct t4_tracer)
 #define CHELSIO_T4_SET_TRACER	_IOW('f', T4_SET_TRACER, struct t4_tracer)
 #endif
diff --git a/sys/dev/cxgbe/t4_l2t.c b/sys/dev/cxgbe/t4_l2t.c
index dcff5e8a6a4..6f7378a54be 100644
--- a/sys/dev/cxgbe/t4_l2t.c
+++ b/sys/dev/cxgbe/t4_l2t.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
index d905cd5aabd..b1cfb2a20a2 100644
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -161,10 +161,10 @@ MALLOC_DEFINE(M_CXGBE, "cxgbe", "Chelsio T4/T5 Ethernet driver and services");
  * then ADAPTER_LOCK, then t4_uld_list_lock.
  */
 static struct sx t4_list_lock;
-static SLIST_HEAD(, adapter) t4_list;
+SLIST_HEAD(, adapter) t4_list;
 #ifdef TCP_OFFLOAD
 static struct sx t4_uld_list_lock;
-static SLIST_HEAD(, uld_info) t4_uld_list;
+SLIST_HEAD(, uld_info) t4_uld_list;
 #endif
 
 /*
@@ -332,6 +332,7 @@ static int map_bars_0_and_4(struct adapter *);
 static int map_bar_2(struct adapter *);
 static void setup_memwin(struct adapter *);
 static int validate_mem_range(struct adapter *, uint32_t, int);
+static int fwmtype_to_hwmtype(int);
 static int validate_mt_off_len(struct adapter *, int, uint32_t, int,
     uint32_t *);
 static void memwin_info(struct adapter *, int, uint32_t *, uint32_t *);
@@ -424,6 +425,8 @@ static int get_sge_context(struct adapter *, struct t4_sge_context *);
 static int load_fw(struct adapter *, struct t4_data *);
 static int read_card_mem(struct adapter *, int, struct t4_mem_range *);
 static int read_i2c(struct adapter *, struct t4_i2c_data *);
+static int set_sched_class(struct adapter *, struct t4_sched_params *);
+static int set_sched_queue(struct adapter *, struct t4_sched_queue *);
 #ifdef TCP_OFFLOAD
 static int toe_capability(struct port_info *, int);
 #endif
@@ -546,6 +549,7 @@ t4_attach(device_t dev)
 #ifdef TCP_OFFLOAD
 	int ofld_rqidx, ofld_tqidx;
 #endif
+	const char *pcie_ts;
 
 	sc = device_get_softc(dev);
 	sc->dev = dev;
@@ -813,9 +817,24 @@ t4_attach(device_t dev)
 		goto done;
 	}
 
+	switch (sc->params.pci.speed) {
+		case 0x1:
+			pcie_ts = "2.5";
+			break;
+		case 0x2:
+			pcie_ts = "5.0";
+			break;
+		case 0x3:
+			pcie_ts = "8.0";
+			break;
+		default:
+			pcie_ts = "??";
+			break;
+	}
 	device_printf(dev,
-	    "PCIe x%d, %d ports, %d %s interrupt%s, %d eq, %d iq\n",
-	    sc->params.pci.width, sc->params.nports, sc->intr_count,
+	    "PCIe x%d (%s GTS/s) (%d), %d ports, %d %s interrupt%s, %d eq, %d iq\n",
+	    sc->params.pci.width, pcie_ts, sc->params.pci.speed,
+	    sc->params.nports, sc->intr_count,
 	    sc->intr_type == INTR_MSIX ? "MSI-X" :
 	    (sc->intr_type == INTR_MSI ? "MSI" : "INTx"),
 	    sc->intr_count > 1 ? "s" : "", sc->sge.neq, sc->sge.niq);
@@ -950,7 +969,7 @@ cxgbe_probe(device_t dev)
 
 #define T4_CAP (IFCAP_VLAN_HWTAGGING | IFCAP_VLAN_MTU | IFCAP_HWCSUM | \
     IFCAP_VLAN_HWCSUM | IFCAP_TSO | IFCAP_JUMBO_MTU | IFCAP_LRO | \
-    IFCAP_VLAN_HWTSO | IFCAP_LINKSTATE | IFCAP_HWCSUM_IPV6)
+    IFCAP_VLAN_HWTSO | IFCAP_LINKSTATE | IFCAP_HWCSUM_IPV6 | IFCAP_HWSTATS)
 #define T4_CAP_ENABLE (T4_CAP)
 
 static int
@@ -1576,6 +1595,24 @@ validate_mem_range(struct adapter *sc, uint32_t addr, int len)
 	return (EFAULT);
 }
 
+static int
+fwmtype_to_hwmtype(int mtype)
+{
+
+	switch (mtype) {
+	case FW_MEMTYPE_EDC0:
+		return (MEM_EDC0);
+	case FW_MEMTYPE_EDC1:
+		return (MEM_EDC1);
+	case FW_MEMTYPE_EXTMEM:
+		return (MEM_MC0);
+	case FW_MEMTYPE_EXTMEM1:
+		return (MEM_MC1);
+	default:
+		panic("%s: cannot translate fw mtype %d.", __func__, mtype);
+	}
+}
+
 /*
  * Verify that the memory range specified by the memtype/offset/len pair is
  * valid and lies entirely within the memtype specified.  The global address of
@@ -1592,7 +1629,7 @@ validate_mt_off_len(struct adapter *sc, int mtype, uint32_t off, int len,
 		return (EINVAL);
 
 	em = t4_read_reg(sc, A_MA_TARGET_MEM_ENABLE);
-	switch (mtype) {
+	switch (fwmtype_to_hwmtype(mtype)) {
 	case MEM_EDC0:
 		if (!(em & F_EDRAM0_ENABLE))
 			return (EINVAL);
@@ -2293,7 +2330,7 @@ partition_resources(struct adapter *sc, const struct firmware *default_cfg,
 		}
 	} else {
 use_config_on_flash:
-		mtype = FW_MEMTYPE_CF_FLASH;
+		mtype = FW_MEMTYPE_FLASH;
 		moff = t4_flash_cfg_addr(sc);
 	}
 
@@ -3136,7 +3173,7 @@ port_full_init(struct port_info *pi)
 	struct ifnet *ifp = pi->ifp;
 	uint16_t *rss;
 	struct sge_rxq *rxq;
-	int rc, i;
+	int rc, i, j;
 
 	ASSERT_SYNCHRONIZED_OP(sc);
 	KASSERT((pi->flags & PORT_INIT_DONE) == 0,
@@ -3153,21 +3190,25 @@ port_full_init(struct port_info *pi)
 		goto done;	/* error message displayed already */
 
 	/*
-	 * Setup RSS for this port.
+	 * Setup RSS for this port.  Save a copy of the RSS table for later use.
 	 */
-	rss = malloc(pi->nrxq * sizeof (*rss), M_CXGBE,
-	    M_ZERO | M_WAITOK);
-	for_each_rxq(pi, i, rxq) {
-		rss[i] = rxq->iq.abs_id;
+	rss = malloc(pi->rss_size * sizeof (*rss), M_CXGBE, M_ZERO | M_WAITOK);
+	for (i = 0; i < pi->rss_size;) {
+		for_each_rxq(pi, j, rxq) {
+			rss[i++] = rxq->iq.abs_id;
+			if (i == pi->rss_size)
+				break;
+		}
 	}
-	rc = -t4_config_rss_range(sc, sc->mbox, pi->viid, 0,
-	    pi->rss_size, rss, pi->nrxq);
-	free(rss, M_CXGBE);
+
+	rc = -t4_config_rss_range(sc, sc->mbox, pi->viid, 0, pi->rss_size, rss,
+	    pi->rss_size);
 	if (rc != 0) {
 		if_printf(ifp, "rss_config failed: %d\n", rc);
 		goto done;
 	}
 
+	pi->rss = rss;
 	pi->flags |= PORT_INIT_DONE;
 done:
 	if (rc != 0)
@@ -3216,6 +3257,7 @@ port_full_uninit(struct port_info *pi)
 			quiesce_fl(sc, &ofld_rxq->fl);
 		}
 #endif
+		free(pi->rss, M_CXGBE);
 	}
 
 	t4_teardown_port_queues(pi);
@@ -3382,7 +3424,8 @@ t4_get_regs(struct adapter *sc, struct t4_regdump *regs, uint8_t *buf)
 		0xd004, 0xd03c,
 		0xdfc0, 0xdfe0,
 		0xe000, 0xea7c,
-		0xf000, 0x11190,
+		0xf000, 0x11110,
+		0x11118, 0x11190,
 		0x19040, 0x1906c,
 		0x19078, 0x19080,
 		0x1908c, 0x19124,
@@ -3588,7 +3631,8 @@ t4_get_regs(struct adapter *sc, struct t4_regdump *regs, uint8_t *buf)
 		0xd004, 0xd03c,
 		0xdfc0, 0xdfe0,
 		0xe000, 0x11088,
-		0x1109c, 0x1117c,
+		0x1109c, 0x11110,
+		0x11118, 0x1117c,
 		0x11190, 0x11204,
 		0x19040, 0x1906c,
 		0x19078, 0x19080,
@@ -4146,13 +4190,15 @@ t4_sysctls(struct adapter *sc)
 	struct sysctl_oid_list *children, *c0;
 	static char *caps[] = {
 		"\20\1PPP\2QFC\3DCBX",			/* caps[0] linkcaps */
-		"\20\1NIC\2VM\3IDS\4UM\5UM_ISGL",	/* caps[1] niccaps */
+		"\20\1NIC\2VM\3IDS\4UM\5UM_ISGL"	/* caps[1] niccaps */
+		    "\6HASHFILTER\7ETHOFLD",
 		"\20\1TOE",				/* caps[2] toecaps */
 		"\20\1RDDP\2RDMAC",			/* caps[3] rdmacaps */
 		"\20\1INITIATOR_PDU\2TARGET_PDU"	/* caps[4] iscsicaps */
 		    "\3INITIATOR_CNXOFLD\4TARGET_CNXOFLD"
 		    "\5INITIATOR_SSNOFLD\6TARGET_SSNOFLD",
 		"\20\1INITIATOR\2TARGET\3CTRL_OFLD"	/* caps[5] fcoecaps */
+		    "\4PO_INITIAOR\5PO_TARGET"
 	};
 	static char *doorbells = {"\20\1UDB\2WCWR\3UDBWC\4KDB"};
 
@@ -5306,12 +5352,12 @@ sysctl_devlog(SYSCTL_HANDLER_ARGS)
 	struct adapter *sc = arg1;
 	struct devlog_params *dparams = &sc->params.devlog;
 	struct fw_devlog_e *buf, *e;
-	int i, j, rc, nentries, first = 0;
+	int i, j, rc, nentries, first = 0, m;
 	struct sbuf *sb;
 	uint64_t ftstamp = UINT64_MAX;
 
 	if (dparams->start == 0) {
-		dparams->memtype = 0;
+		dparams->memtype = FW_MEMTYPE_EDC0;
 		dparams->start = 0x84000;
 		dparams->size = 32768;
 	}
@@ -5322,8 +5368,8 @@ sysctl_devlog(SYSCTL_HANDLER_ARGS)
 	if (buf == NULL)
 		return (ENOMEM);
 
-	rc = -t4_mem_read(sc, dparams->memtype, dparams->start, dparams->size,
-	    (void *)buf);
+	m = fwmtype_to_hwmtype(dparams->memtype);
+	rc = -t4_mem_read(sc, m, dparams->start, dparams->size, (void *)buf);
 	if (rc != 0)
 		goto done;
 
@@ -5934,10 +5980,13 @@ sysctl_pm_stats(SYSCTL_HANDLER_ARGS)
 	struct adapter *sc = arg1;
 	struct sbuf *sb;
 	int rc, i;
-	uint32_t tx_cnt[PM_NSTATS], rx_cnt[PM_NSTATS];
-	uint64_t tx_cyc[PM_NSTATS], rx_cyc[PM_NSTATS];
-	static const char *pm_stats[] = {
-		"Read:", "Write bypass:", "Write mem:", "Flush:", "FIFO wait:"
+	uint32_t cnt[PM_NSTATS];
+	uint64_t cyc[PM_NSTATS];
+	static const char *rx_stats[] = {
+		"Read:", "Write bypass:", "Write mem:", "Flush:"
+	};
+	static const char *tx_stats[] = {
+		"Read:", "Write bypass:", "Write mem:", "Bypass + mem:"
 	};
 
 	rc = sysctl_wire_old_buffer(req, 0);
@@ -5948,14 +5997,17 @@ sysctl_pm_stats(SYSCTL_HANDLER_ARGS)
 	if (sb == NULL)
 		return (ENOMEM);
 
-	t4_pmtx_get_stats(sc, tx_cnt, tx_cyc);
-	t4_pmrx_get_stats(sc, rx_cnt, rx_cyc);
+	t4_pmtx_get_stats(sc, cnt, cyc);
+	sbuf_printf(sb, "                Tx pcmds             Tx bytes");
+	for (i = 0; i < ARRAY_SIZE(tx_stats); i++)
+		sbuf_printf(sb, "\n%-13s %10u %20ju", tx_stats[i], cnt[i],
+		    cyc[i]);
 
-	sbuf_printf(sb, "                Tx count            Tx cycles    "
-	    "Rx count            Rx cycles");
-	for (i = 0; i < PM_NSTATS; i++)
-		sbuf_printf(sb, "\n%-13s %10u %20ju  %10u %20ju",
-		    pm_stats[i], tx_cnt[i], tx_cyc[i], rx_cnt[i], rx_cyc[i]);
+	t4_pmrx_get_stats(sc, cnt, cyc);
+	sbuf_printf(sb, "\n                Rx pcmds             Rx bytes");
+	for (i = 0; i < ARRAY_SIZE(rx_stats); i++)
+		sbuf_printf(sb, "\n%-13s %10u %20ju", rx_stats[i], cnt[i],
+		    cyc[i]);
 
 	rc = sbuf_finish(sb);
 	sbuf_delete(sb);
@@ -7266,6 +7318,228 @@ read_i2c(struct adapter *sc, struct t4_i2c_data *i2cd)
 	return (rc);
 }
 
+static int
+in_range(int val, int lo, int hi)
+{
+
+	return (val < 0 || (val <= hi && val >= lo));
+}
+
+static int
+set_sched_class(struct adapter *sc, struct t4_sched_params *p)
+{
+	int fw_subcmd, fw_type, rc;
+
+	rc = begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4setsc");
+	if (rc)
+		return (rc);
+
+	if (!(sc->flags & FULL_INIT_DONE)) {
+		rc = EAGAIN;
+		goto done;
+	}
+
+	/*
+	 * Translate the cxgbetool parameters into T4 firmware parameters.  (The
+	 * sub-command and type are in common locations.)
+	 */
+	if (p->subcmd == SCHED_CLASS_SUBCMD_CONFIG)
+		fw_subcmd = FW_SCHED_SC_CONFIG;
+	else if (p->subcmd == SCHED_CLASS_SUBCMD_PARAMS)
+		fw_subcmd = FW_SCHED_SC_PARAMS;
+	else {
+		rc = EINVAL;
+		goto done;
+	}
+	if (p->type == SCHED_CLASS_TYPE_PACKET)
+		fw_type = FW_SCHED_TYPE_PKTSCHED;
+	else {
+		rc = EINVAL;
+		goto done;
+	}
+
+	if (fw_subcmd == FW_SCHED_SC_CONFIG) {
+		/* Vet our parameters ..*/
+		if (p->u.config.minmax < 0) {
+			rc = EINVAL;
+			goto done;
+		}
+
+		/* And pass the request to the firmware ...*/
+		rc = -t4_sched_config(sc, fw_type, p->u.config.minmax);
+		goto done;
+	}
+
+	if (fw_subcmd == FW_SCHED_SC_PARAMS) {
+		int fw_level;
+		int fw_mode;
+		int fw_rateunit;
+		int fw_ratemode;
+
+		if (p->u.params.level == SCHED_CLASS_LEVEL_CL_RL)
+			fw_level = FW_SCHED_PARAMS_LEVEL_CL_RL;
+		else if (p->u.params.level == SCHED_CLASS_LEVEL_CL_WRR)
+			fw_level = FW_SCHED_PARAMS_LEVEL_CL_WRR;
+		else if (p->u.params.level == SCHED_CLASS_LEVEL_CH_RL)
+			fw_level = FW_SCHED_PARAMS_LEVEL_CH_RL;
+		else {
+			rc = EINVAL;
+			goto done;
+		}
+
+		if (p->u.params.mode == SCHED_CLASS_MODE_CLASS)
+			fw_mode = FW_SCHED_PARAMS_MODE_CLASS;
+		else if (p->u.params.mode == SCHED_CLASS_MODE_FLOW)
+			fw_mode = FW_SCHED_PARAMS_MODE_FLOW;
+		else {
+			rc = EINVAL;
+			goto done;
+		}
+
+		if (p->u.params.rateunit == SCHED_CLASS_RATEUNIT_BITS)
+			fw_rateunit = FW_SCHED_PARAMS_UNIT_BITRATE;
+		else if (p->u.params.rateunit == SCHED_CLASS_RATEUNIT_PKTS)
+			fw_rateunit = FW_SCHED_PARAMS_UNIT_PKTRATE;
+		else {
+			rc = EINVAL;
+			goto done;
+		}
+
+		if (p->u.params.ratemode == SCHED_CLASS_RATEMODE_REL)
+			fw_ratemode = FW_SCHED_PARAMS_RATE_REL;
+		else if (p->u.params.ratemode == SCHED_CLASS_RATEMODE_ABS)
+			fw_ratemode = FW_SCHED_PARAMS_RATE_ABS;
+		else {
+			rc = EINVAL;
+			goto done;
+		}
+
+		/* Vet our parameters ... */
+		if (!in_range(p->u.params.channel, 0, 3) ||
+		    !in_range(p->u.params.cl, 0, is_t4(sc) ? 15 : 16) ||
+		    !in_range(p->u.params.minrate, 0, 10000000) ||
+		    !in_range(p->u.params.maxrate, 0, 10000000) ||
+		    !in_range(p->u.params.weight, 0, 100)) {
+			rc = ERANGE;
+			goto done;
+		}
+
+		/*
+		 * Translate any unset parameters into the firmware's
+		 * nomenclature and/or fail the call if the parameters
+		 * are required ...
+		 */
+		if (p->u.params.rateunit < 0 || p->u.params.ratemode < 0 ||
+		    p->u.params.channel < 0 || p->u.params.cl < 0) {
+			rc = EINVAL;
+			goto done;
+		}
+		if (p->u.params.minrate < 0)
+			p->u.params.minrate = 0;
+		if (p->u.params.maxrate < 0) {
+			if (p->u.params.level == SCHED_CLASS_LEVEL_CL_RL ||
+			    p->u.params.level == SCHED_CLASS_LEVEL_CH_RL) {
+				rc = EINVAL;
+				goto done;
+			} else
+				p->u.params.maxrate = 0;
+		}
+		if (p->u.params.weight < 0) {
+			if (p->u.params.level == SCHED_CLASS_LEVEL_CL_WRR) {
+				rc = EINVAL;
+				goto done;
+			} else
+				p->u.params.weight = 0;
+		}
+		if (p->u.params.pktsize < 0) {
+			if (p->u.params.level == SCHED_CLASS_LEVEL_CL_RL ||
+			    p->u.params.level == SCHED_CLASS_LEVEL_CH_RL) {
+				rc = EINVAL;
+				goto done;
+			} else
+				p->u.params.pktsize = 0;
+		}
+
+		/* See what the firmware thinks of the request ... */
+		rc = -t4_sched_params(sc, fw_type, fw_level, fw_mode,
+		    fw_rateunit, fw_ratemode, p->u.params.channel,
+		    p->u.params.cl, p->u.params.minrate, p->u.params.maxrate,
+		    p->u.params.weight, p->u.params.pktsize);
+		goto done;
+	}
+
+	rc = EINVAL;
+done:
+	end_synchronized_op(sc, 0);
+	return (rc);
+}
+
+static int
+set_sched_queue(struct adapter *sc, struct t4_sched_queue *p)
+{
+	struct port_info *pi = NULL;
+	struct sge_txq *txq;
+	uint32_t fw_mnem, fw_queue, fw_class;
+	int i, rc;
+
+	rc = begin_synchronized_op(sc, NULL, SLEEP_OK | INTR_OK, "t4setsq");
+	if (rc)
+		return (rc);
+
+	if (!(sc->flags & FULL_INIT_DONE)) {
+		rc = EAGAIN;
+		goto done;
+	}
+
+	if (p->port >= sc->params.nports) {
+		rc = EINVAL;
+		goto done;
+	}
+
+	pi = sc->port[p->port];
+	if (!in_range(p->queue, 0, pi->ntxq - 1) || !in_range(p->cl, 0, 7)) {
+		rc = EINVAL;
+		goto done;
+	}
+
+	/*
+	 * Create a template for the FW_PARAMS_CMD mnemonic and value (TX
+	 * Scheduling Class in this case).
+	 */
+	fw_mnem = (V_FW_PARAMS_MNEM(FW_PARAMS_MNEM_DMAQ) |
+	    V_FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_DMAQ_EQ_SCHEDCLASS_ETH));
+	fw_class = p->cl < 0 ? 0xffffffff : p->cl;
+
+	/*
+	 * If op.queue is non-negative, then we're only changing the scheduling
+	 * on a single specified TX queue.
+	 */
+	if (p->queue >= 0) {
+		txq = &sc->sge.txq[pi->first_txq + p->queue];
+		fw_queue = (fw_mnem | V_FW_PARAMS_PARAM_YZ(txq->eq.cntxt_id));
+		rc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, &fw_queue,
+		    &fw_class);
+		goto done;
+	}
+
+	/*
+	 * Change the scheduling on all the TX queues for the
+	 * interface.
+	 */
+	for_each_txq(pi, i, txq) {
+		fw_queue = (fw_mnem | V_FW_PARAMS_PARAM_YZ(txq->eq.cntxt_id));
+		rc = -t4_set_params(sc, sc->mbox, sc->pf, 0, 1, &fw_queue,
+		    &fw_class);
+		if (rc)
+			goto done;
+	}
+
+	rc = 0;
+done:
+	end_synchronized_op(sc, 0);
+	return (rc);
+}
+
 int
 t4_os_find_pci_capability(struct adapter *sc, int cap)
 {
@@ -7509,6 +7783,12 @@ t4_ioctl(struct cdev *dev, unsigned long cmd, caddr_t data, int fflag,
 		}
 		break;
 	}
+	case CHELSIO_T4_SCHED_CLASS:
+		rc = set_sched_class(sc, (struct t4_sched_params *)data);
+		break;
+	case CHELSIO_T4_SCHED_QUEUE:
+		rc = set_sched_queue(sc, (struct t4_sched_queue *)data);
+		break;
 	case CHELSIO_T4_GET_TRACER:
 		rc = t4_get_tracer(sc, (struct t4_tracer *)data);
 		break;
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
index 776b6c5a734..fd40d3e7269 100644
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 
 #include <sys/types.h>
+#include <sys/eventhandler.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/kernel.h>
@@ -50,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 #include <netinet/tcp.h>
+#include <machine/md_var.h>
 
 #include "common/common.h"
 #include "common/t4_regs.h"
@@ -215,10 +217,6 @@ static int handle_fw_msg(struct sge_iq *, const struct rss_header *,
 
 static int sysctl_uint16(SYSCTL_HANDLER_ARGS);
 
-#if defined(__i386__) || defined(__amd64__)
-extern u_int cpu_clflush_line_size;
-#endif
-
 /*
  * Called on MOD_LOAD.  Validates and calculates the SGE tunables.
  */
@@ -572,12 +570,17 @@ t4_read_chip_settings(struct adapter *sc)
 	r = t4_read_reg(sc, A_SGE_CONM_CTRL);
 	s->fl_starve_threshold = G_EGRTHRESHOLD(r) * 2 + 1;
 
-	if (is_t5(sc)) {
-		r = t4_read_reg(sc, A_SGE_EGRESS_QUEUES_PER_PAGE_PF);
-		r >>= S_QUEUESPERPAGEPF0 +
-		    (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * sc->pf;
-		s->s_qpp = r & M_QUEUESPERPAGEPF0;
-	}
+	/* egress queues: log2 of # of doorbells per BAR2 page */
+	r = t4_read_reg(sc, A_SGE_EGRESS_QUEUES_PER_PAGE_PF);
+	r >>= S_QUEUESPERPAGEPF0 +
+	    (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * sc->pf;
+	s->eq_s_qpp = r & M_QUEUESPERPAGEPF0;
+
+	/* ingress queues: log2 of # of doorbells per BAR2 page */
+	r = t4_read_reg(sc, A_SGE_INGRESS_QUEUES_PER_PAGE_PF);
+	r >>= S_QUEUESPERPAGEPF0 +
+	    (S_QUEUESPERPAGEPF1 - S_QUEUESPERPAGEPF0) * sc->pf;
+	s->iq_s_qpp = r & M_QUEUESPERPAGEPF0;
 
 	t4_init_tp_params(sc);
 
@@ -1389,7 +1392,7 @@ rxb_free(struct mbuf *m, void *arg1, void *arg2)
 {
 	uma_zone_t zone = arg1;
 	caddr_t cl = arg2;
-#ifdef INVARIANTS
+#ifdef notyet
 	u_int refcount;
 
 	refcount = *find_buf_refcnt(cl);
@@ -1675,7 +1678,7 @@ t4_eth_rx(struct sge_iq *iq, const struct rss_header *rss, struct mbuf *m0)
 
 	m0->m_pkthdr.rcvif = ifp;
 	m0->m_flags |= M_FLOWID;
-	m0->m_pkthdr.flowid = rss->hash_val;
+	m0->m_pkthdr.flowid = be32toh(rss->hash_val);
 
 	if (cpl->csum_calc && !cpl->err_vec) {
 		if (ifp->if_capenable & IFCAP_RXCSUM &&
@@ -2802,7 +2805,7 @@ alloc_eq(struct adapter *sc, struct port_info *pi, struct sge_eq *eq)
 	if (isset(&eq->doorbells, DOORBELL_UDB) ||
 	    isset(&eq->doorbells, DOORBELL_UDBWC) ||
 	    isset(&eq->doorbells, DOORBELL_WCWR)) {
-		uint32_t s_qpp = sc->sge.s_qpp;
+		uint32_t s_qpp = sc->sge.eq_s_qpp;
 		uint32_t mask = (1 << s_qpp) - 1;
 		volatile uint8_t *udb;
 
diff --git a/sys/dev/cxgbe/t4_tracer.c b/sys/dev/cxgbe/t4_tracer.c
index e9727f5f1fe..c16fb90df17 100644
--- a/sys/dev/cxgbe/t4_tracer.c
+++ b/sys/dev/cxgbe/t4_tracer.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/lock.h>
 #include <sys/types.h>
 #include <sys/mbuf.h>
diff --git a/sys/dev/cxgbe/tom/t4_connect.c b/sys/dev/cxgbe/tom/t4_connect.c
index 08267cdf9f5..9973fa57ed6 100644
--- a/sys/dev/cxgbe/tom/t4_connect.c
+++ b/sys/dev/cxgbe/tom/t4_connect.c
@@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$");
 
 #ifdef TCP_OFFLOAD
 #include <sys/param.h>
-#include <sys/types.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/module.h>
diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
index 2409b5d33cf..046482e3890 100644
--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -452,7 +452,7 @@ write_tx_wr(void *dst, struct toepcb *toep, unsigned int immdlen,
 	    V_FW_WR_IMMDLEN(immdlen));
 	txwr->flowid_len16 = htobe32(V_FW_WR_FLOWID(toep->tid) |
 	    V_FW_WR_LEN16(credits));
-	txwr->tunnel_to_proxy =
+	txwr->lsodisable_to_proxy =
 	    htobe32(V_FW_OFLD_TX_DATA_WR_ULPMODE(toep->ulp_mode) |
 		V_FW_OFLD_TX_DATA_WR_URGENT(0) |	/* XXX */
 		V_FW_OFLD_TX_DATA_WR_SHOVE(shove));
diff --git a/sys/dev/cxgbe/tom/t4_tom.c b/sys/dev/cxgbe/tom/t4_tom.c
index 8c787a75e3f..109543a6ec5 100644
--- a/sys/dev/cxgbe/tom/t4_tom.c
+++ b/sys/dev/cxgbe/tom/t4_tom.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/taskqueue.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
 #include <netinet/in_var.h>
diff --git a/sys/dev/dc/dcphy.c b/sys/dev/dc/dcphy.c
index a05f2ed4f33..cb5fcda8c59 100644
--- a/sys/dev/dc/dcphy.c
+++ b/sys/dev/dc/dcphy.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 2c8d1ca250d..65c6e9438ba 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -107,6 +107,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/dc/pnphy.c b/sys/dev/dc/pnphy.c
index 98e721da2cb..141f250f9bf 100644
--- a/sys/dev/dc/pnphy.c
+++ b/sys/dev/dc/pnphy.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index ace5542c501..5e8886bec43 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_media.h>
diff --git a/sys/dev/drm/i915_reg.h b/sys/dev/drm/i915_reg.h
index fce9992f3d9..0e2ff2182ef 100644
--- a/sys/dev/drm/i915_reg.h
+++ b/sys/dev/drm/i915_reg.h
@@ -349,7 +349,7 @@ __FBSDID("$FreeBSD$");
 #define   VGA1_PD_P1_MASK	(0x1f << 8)
 #define DPLL_A	0x06014
 #define DPLL_B	0x06018
-#define   DPLL_VCO_ENABLE		(1 << 31)
+#define   DPLL_VCO_ENABLE		(1U << 31)
 #define   DPLL_DVO_HIGH_SPEED		(1 << 30)
 #define   DPLL_SYNCLOCK_ENABLE		(1 << 29)
 #define   DPLL_VGA_MODE_DIS		(1 << 28)
@@ -653,7 +653,7 @@ __FBSDID("$FreeBSD$");
 /* SDVO port control */
 #define SDVOB			0x61140
 #define SDVOC			0x61160
-#define   SDVO_ENABLE		(1 << 31)
+#define   SDVO_ENABLE		(1U << 31)
 #define   SDVO_PIPE_B_SELECT	(1 << 30)
 #define   SDVO_STALL_SELECT	(1 << 29)
 #define   SDVO_INTERRUPT_ENABLE	(1 << 26)
@@ -690,7 +690,7 @@ __FBSDID("$FreeBSD$");
 #define DVOA			0x61120
 #define DVOB			0x61140
 #define DVOC			0x61160
-#define   DVO_ENABLE			(1 << 31)
+#define   DVO_ENABLE			(1U << 31)
 #define   DVO_PIPE_B_SELECT		(1 << 30)
 #define   DVO_PIPE_STALL_UNUSED		(0 << 28)
 #define   DVO_PIPE_STALL		(1 << 28)
@@ -726,7 +726,7 @@ __FBSDID("$FreeBSD$");
  * Enables the LVDS port.  This bit must be set before DPLLs are enabled, as
  * the DPLL semantics change when the LVDS is assigned to that pipe.
  */
-#define   LVDS_PORT_EN			(1 << 31)
+#define   LVDS_PORT_EN			(1U << 31)
 /* Selects pipe B for LVDS data.  Must be set on pre-965. */
 #define   LVDS_PIPEB_SELECT		(1 << 30)
 /*
@@ -762,7 +762,7 @@ __FBSDID("$FreeBSD$");
 
 /* Panel power sequencing */
 #define PP_STATUS	0x61200
-#define   PP_ON		(1 << 31)
+#define   PP_ON		(1U << 31)
 /*
  * Indicates that all dependencies of the panel are on:
  *
@@ -783,7 +783,7 @@ __FBSDID("$FreeBSD$");
 
 /* Panel fitting */
 #define PFIT_CONTROL	0x61230
-#define   PFIT_ENABLE		(1 << 31)
+#define   PFIT_ENABLE		(1U << 31)
 #define   PFIT_PIPE_MASK	(3 << 29)
 #define   PFIT_PIPE_SHIFT	29
 #define   VERT_INTERP_DISABLE	(0 << 10)
@@ -826,7 +826,7 @@ __FBSDID("$FreeBSD$");
 /* TV port control */
 #define TV_CTL			0x68000
 /** Enables the TV encoder */
-# define TV_ENC_ENABLE			(1 << 31)
+# define TV_ENC_ENABLE			(1U << 31)
 /** Sources the TV encoder input from pipe B instead of A. */
 # define TV_ENC_PIPEB_SELECT		(1 << 30)
 /** Outputs composite video (DAC A only) */
@@ -897,7 +897,7 @@ __FBSDID("$FreeBSD$");
  *
  * This gets cleared when TV_DAC_STATE_EN is cleared
 */
-# define TVDAC_STATE_CHG		(1 << 31)
+# define TVDAC_STATE_CHG		(1U << 31)
 # define TVDAC_SENSE_MASK		(7 << 28)
 /** Reports that DAC A voltage is above the detect threshold */
 # define TVDAC_A_SENSE			(1 << 30)
@@ -1024,7 +1024,7 @@ __FBSDID("$FreeBSD$");
 
 #define TV_H_CTL_2		0x68034
 /** Enables the colorburst (needed for non-component color) */
-# define TV_BURST_ENA			(1 << 31)
+# define TV_BURST_ENA			(1U << 31)
 /** Offset of the colorburst from the start of hsync, in pixels minus one. */
 # define TV_HBURST_START_SHIFT		16
 # define TV_HBURST_START_MASK		0x1fff0000
@@ -1069,7 +1069,7 @@ __FBSDID("$FreeBSD$");
 
 #define TV_V_CTL_3		0x68044
 /** Enables generation of the equalization signal */
-# define TV_EQUAL_ENA			(1 << 31)
+# define TV_EQUAL_ENA			(1U << 31)
 /** Length of vsync, in half lines */
 # define TV_VEQ_LEN_MASK		0x007f0000
 # define TV_VEQ_LEN_SHIFT		16
@@ -1143,7 +1143,7 @@ __FBSDID("$FreeBSD$");
 
 #define TV_SC_CTL_1		0x68060
 /** Turns on the first subcarrier phase generation DDA */
-# define TV_SC_DDA1_EN			(1 << 31)
+# define TV_SC_DDA1_EN			(1U << 31)
 /** Turns on the first subcarrier phase generation DDA */
 # define TV_SC_DDA2_EN			(1 << 30)
 /** Turns on the first subcarrier phase generation DDA */
@@ -1206,7 +1206,7 @@ __FBSDID("$FreeBSD$");
  * If set, the rest of the registers are ignored, and the calculated values can
  * be read back from the register.
  */
-# define TV_AUTO_SCALE			(1 << 31)
+# define TV_AUTO_SCALE			(1U << 31)
 /**
  * Disables the vertical filter.
  *
@@ -1269,7 +1269,7 @@ __FBSDID("$FreeBSD$");
 # define TV_VSCALE_IP_FRAC_SHIFT		0
 
 #define TV_CC_CONTROL		0x68090
-# define TV_CC_ENABLE			(1 << 31)
+# define TV_CC_ENABLE			(1U << 31)
 /**
  * Specifies which field to send the CC data in.
  *
@@ -1285,7 +1285,7 @@ __FBSDID("$FreeBSD$");
 # define TV_CC_LINE_SHIFT		0
 
 #define TV_CC_DATA		0x68094
-# define TV_CC_RDY			(1 << 31)
+# define TV_CC_RDY			(1U << 31)
 /** Second word of CC data to be transmitted. */
 # define TV_CC_DATA_2_MASK		0x007f0000
 # define TV_CC_DATA_2_SHIFT		16
@@ -1469,7 +1469,7 @@ __FBSDID("$FreeBSD$");
 
 /* VBIOS regs */
 #define VGACNTRL		0x71400
-# define VGA_DISP_DISABLE			(1 << 31)
+# define VGA_DISP_DISABLE			(1U << 31)
 # define VGA_2X_MODE				(1 << 30)
 # define VGA_PIPE_B_SELECT			(1 << 29)
 
diff --git a/sys/dev/drm/mach64_drv.h b/sys/dev/drm/mach64_drv.h
index 7d68c4607c0..14c590e1263 100644
--- a/sys/dev/drm/mach64_drv.h
+++ b/sys/dev/drm/mach64_drv.h
@@ -202,7 +202,7 @@ extern void mach64_driver_irq_uninstall(struct drm_device *dev);
 #	define MACH64_CIRCULAR_BUF_SIZE_32KB		(1 << 0)
 #	define MACH64_CIRCULAR_BUF_SIZE_64KB		(2 << 0)
 #	define MACH64_CIRCULAR_BUF_SIZE_128KB		(3 << 0)
-#	define MACH64_LAST_DESCRIPTOR			(1 << 31)
+#	define MACH64_LAST_DESCRIPTOR			(1U << 31)
 #define MACH64_BM_HOSTDATA			0x0644
 #define MACH64_BM_STATUS			0x018c
 #define MACH64_BM_SYSTEM_MEM_ADDR		0x0184
@@ -316,7 +316,7 @@ extern void mach64_driver_irq_uninstall(struct drm_device *dev);
 
 #define MACH64_FIFO_STAT			0x0710
 #	define MACH64_FIFO_SLOT_MASK			0x0000ffff
-#	define MACH64_FIFO_ERR				(1 << 31)
+#	define MACH64_FIFO_ERR				(1U << 31)
 
 #define MACH64_GEN_TEST_CNTL			0x04d0
 #	define MACH64_GUI_ENGINE_ENABLE			(1 << 8)
@@ -442,7 +442,7 @@ extern void mach64_driver_irq_uninstall(struct drm_device *dev);
 #	define MACH64_CRTC2_VLINE_SYNC			(1 << 28) /* LT Pro */	/* 0=even, 1=odd */
 #	define MACH64_CRTC_SNAPSHOT2_INT_EN		(1 << 29)	/* LT Pro */
 #	define MACH64_CRTC_SNAPSHOT2_INT		(1 << 30)	/* LT Pro */
-#	define MACH64_CRTC_VBLANK2_INT			(1 << 31)
+#	define MACH64_CRTC_VBLANK2_INT			(1U << 31)
 #	define MACH64_CRTC_INT_ENS				\
 		(						\
 			MACH64_CRTC_VBLANK_INT_EN |		\
diff --git a/sys/dev/drm/mga_drv.h b/sys/dev/drm/mga_drv.h
index 01c5c9df9c2..52a7baf85cb 100644
--- a/sys/dev/drm/mga_drv.h
+++ b/sys/dev/drm/mga_drv.h
@@ -458,7 +458,7 @@ do {									\
 #	define MGA_BLTMOD_BU24RGB		(15 << 25)
 #	define MGA_PATTERN			(1 << 29)
 #	define MGA_TRANSC			(1 << 30)
-#	define MGA_CLIPDIS			(1 << 31)
+#	define MGA_CLIPDIS			(1U << 31)
 #define MGA_DWGSYNC			0x2c4c
 
 #define MGA_FCOL			0x1c24
@@ -526,7 +526,7 @@ do {									\
 #define MGA_TEXCTL2			0x2c3c
 #	define MGA_DUALTEX			(1 << 7)
 #	define MGA_G400_TC2_MAGIC		(1 << 15)
-#	define MGA_MAP1_ENABLE			(1 << 31)
+#	define MGA_MAP1_ENABLE			(1U << 31)
 #define MGA_TEXFILTER			0x2c58
 #define MGA_TEXHEIGHT			0x2c2c
 #define MGA_TEXORG			0x2c24
diff --git a/sys/dev/drm/r128_drv.h b/sys/dev/drm/r128_drv.h
index ee7d8f9c684..7ad34967fc4 100644
--- a/sys/dev/drm/r128_drv.h
+++ b/sys/dev/drm/r128_drv.h
@@ -227,7 +227,7 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd,
 #	define R128_ROP3_P			0x00f00000
 #define R128_DP_WRITE_MASK		0x16cc
 #define R128_DST_PITCH_OFFSET_C		0x1c80
-#	define R128_DST_TILE			(1 << 31)
+#	define R128_DST_TILE			(1U << 31)
 
 #define R128_GEN_INT_CNTL		0x0040
 #	define R128_CRTC_VBLANK_INT_EN		(1 <<  0)
@@ -246,7 +246,7 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd,
 
 #define R128_GUI_STAT			0x1740
 #	define R128_GUI_FIFOCNT_MASK		0x0fff
-#	define R128_GUI_ACTIVE			(1 << 31)
+#	define R128_GUI_ACTIVE			(1U << 31)
 
 #define R128_MCLK_CNTL			0x000f
 #	define R128_FORCE_GCP			(1 << 16)
@@ -258,7 +258,7 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd,
 #	define R128_PC_FLUSH_GUI		(3 << 0)
 #	define R128_PC_RI_GUI			(1 << 2)
 #	define R128_PC_FLUSH_ALL		0x00ff
-#	define R128_PC_BUSY			(1 << 31)
+#	define R128_PC_BUSY			(1U << 31)
 
 #define R128_PCI_GART_PAGE		0x017c
 #define R128_PRIM_TEX_CNTL_C		0x1cb0
@@ -302,7 +302,7 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd,
 #define R128_PM4_BUFFER_DL_RPTR_ADDR	0x070c
 #define R128_PM4_BUFFER_DL_RPTR		0x0710
 #define R128_PM4_BUFFER_DL_WPTR		0x0714
-#	define R128_PM4_BUFFER_DL_DONE		(1 << 31)
+#	define R128_PM4_BUFFER_DL_DONE		(1U << 31)
 
 #define R128_PM4_VC_FPU_SETUP		0x071c
 
@@ -312,7 +312,7 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd,
 #define R128_PM4_STAT			0x07b8
 #	define R128_PM4_FIFOCNT_MASK		0x0fff
 #	define R128_PM4_BUSY			(1 << 16)
-#	define R128_PM4_GUI_ACTIVE		(1 << 31)
+#	define R128_PM4_GUI_ACTIVE		(1U << 31)
 
 #define R128_PM4_MICROCODE_ADDR		0x07d4
 #define R128_PM4_MICROCODE_RADDR	0x07d8
diff --git a/sys/dev/drm/r300_reg.h b/sys/dev/drm/r300_reg.h
index 6df4611b436..0508771917a 100644
--- a/sys/dev/drm/r300_reg.h
+++ b/sys/dev/drm/r300_reg.h
@@ -1205,7 +1205,7 @@ __FBSDID("$FreeBSD$");
 #       define R300_FPI0_OUTC_FRC                (9 << 23)
 #       define R300_FPI0_OUTC_REPL_ALPHA         (10 << 23)
 #       define R300_FPI0_OUTC_SAT                (1 << 30)
-#       define R300_FPI0_INSERT_NOP              (1 << 31)
+#       define R300_FPI0_INSERT_NOP              (1U << 31)
 
 #define R300_PFS_INSTR2_0                   0x49C0
 #       define R300_FPI2_ARGA_SRC0C_X            0
@@ -1252,7 +1252,7 @@ __FBSDID("$FreeBSD$");
 #       define R300_FPI2_OUTA_RCP                (10 << 23)
 #       define R300_FPI2_OUTA_RSQ                (11 << 23)
 #       define R300_FPI2_OUTA_SAT                (1 << 30)
-#       define R300_FPI2_UNKNOWN_31              (1 << 31)
+#       define R300_FPI2_UNKNOWN_31              (1U << 31)
 /* END: Fragment program instruction set */
 
 /* Fog state and color */
@@ -1452,7 +1452,7 @@ __FBSDID("$FreeBSD$");
 #       define R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_NO_EFFECT       (0 << 1)
 #       define R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE            (1 << 1)
 #       define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_IDLE            (0 << 31)
-#       define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_BUSY            (1 << 31)
+#       define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_BUSY            (1U << 31)
 
 #define R300_ZB_BW_CNTL                     0x4f1c
 #	define R300_HIZ_DISABLE                              (0 << 0)
diff --git a/sys/dev/drm/r600_blit.c b/sys/dev/drm/r600_blit.c
index d3c41ae9fc5..f6097eed8f1 100644
--- a/sys/dev/drm/r600_blit.c
+++ b/sys/dev/drm/r600_blit.c
@@ -1428,12 +1428,12 @@ set_scissors(drm_radeon_private_t *dev_priv, int x1, int y1, int x2, int y2)
 
 	OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 2));
         OUT_RING((R600_PA_SC_GENERIC_SCISSOR_TL - R600_SET_CONTEXT_REG_OFFSET) >> 2);
-	OUT_RING((x1 << 0) | (y1 << 16) | (1 << 31));
+	OUT_RING((x1 << 0) | (y1 << 16) | (1U << 31));
 	OUT_RING((x2 << 0) | (y2 << 16));
 
 	OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 2));
         OUT_RING((R600_PA_SC_WINDOW_SCISSOR_TL - R600_SET_CONTEXT_REG_OFFSET) >> 2);
-	OUT_RING((x1 << 0) | (y1 << 16) | (1 << 31));
+	OUT_RING((x1 << 0) | (y1 << 16) | (1U << 31));
 	OUT_RING((x2 << 0) | (y2 << 16));
 	ADVANCE_RING();
 }
diff --git a/sys/dev/drm/radeon_cp.c b/sys/dev/drm/radeon_cp.c
index 0a486afa4bd..5d2f4c71623 100644
--- a/sys/dev/drm/radeon_cp.c
+++ b/sys/dev/drm/radeon_cp.c
@@ -542,7 +542,7 @@ static void radeon_do_cp_flush(drm_radeon_private_t * dev_priv)
 #if 0
 	u32 tmp;
 
-	tmp = RADEON_READ(RADEON_CP_RB_WPTR) | (1 << 31);
+	tmp = RADEON_READ(RADEON_CP_RB_WPTR) | (1U << 31);
 	RADEON_WRITE(RADEON_CP_RB_WPTR, tmp);
 #endif
 }
diff --git a/sys/dev/drm/radeon_drv.h b/sys/dev/drm/radeon_drv.h
index d90d7cf048d..e830a83f805 100644
--- a/sys/dev/drm/radeon_drv.h
+++ b/sys/dev/drm/radeon_drv.h
@@ -659,7 +659,7 @@ extern int r600_cs_init(struct drm_device *dev);
 #	define RS480_GTW_LAC_EN	        (1 << 25)
 #	define RS480_2LEVEL_GART	(0 << 30)
 #	define RS480_1LEVEL_GART	(1 << 30)
-#	define RS480_PDC_EN	        (1 << 31)
+#	define RS480_PDC_EN	        (1U << 31)
 #define RS480_GART_BASE                 0x2c
 #define RS480_GART_CACHE_CNTRL          0x2e
 #	define RS480_GART_CACHE_INVALIDATE (1 << 0) /* wait for it to clear */
@@ -775,7 +775,7 @@ extern int r600_cs_init(struct drm_device *dev);
 #       define R300_SUBPIXEL_1_12       (0 << 16)
 #       define R300_SUBPIXEL_1_16       (1 << 16)
 #define R300_DST_PIPE_CONFIG            0x170c
-#       define R300_PIPE_AUTO_CONFIG    (1 << 31)
+#       define R300_PIPE_AUTO_CONFIG    (1U << 31)
 #define R300_RB2D_DSTCACHE_MODE         0x3428
 #       define R300_DC_AUTOFLUSH_ENABLE (1 << 8)
 #       define R300_DC_DC_DISABLE_IGNORE_PE (1 << 17)
@@ -807,8 +807,8 @@ extern int r600_cs_init(struct drm_device *dev);
 #define RADEON_DST_PITCH_OFFSET_C	0x1c80
 #	define RADEON_DST_TILE_LINEAR		(0 << 30)
 #	define RADEON_DST_TILE_MACRO		(1 << 30)
-#	define RADEON_DST_TILE_MICRO		(2 << 30)
-#	define RADEON_DST_TILE_BOTH		(3 << 30)
+#	define RADEON_DST_TILE_MICRO		(2U << 30)
+#	define RADEON_DST_TILE_BOTH		(3U << 30)
 
 #define RADEON_SCRATCH_REG0		0x15e0
 #define RADEON_SCRATCH_REG1		0x15e4
@@ -902,7 +902,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #	define R300_RB2D_DC_FLUSH		(3 << 0)
 #	define R300_RB2D_DC_FREE		(3 << 2)
 #	define R300_RB2D_DC_FLUSH_ALL		0xf
-#	define R300_RB2D_DC_BUSY		(1 << 31)
+#	define R300_RB2D_DC_BUSY		(1U << 31)
 #define RADEON_RB3D_CNTL		0x1c3c
 #	define RADEON_ALPHA_BLEND_ENABLE	(1 << 0)
 #	define RADEON_PLANE_MASK_ENABLE		(1 << 1)
@@ -924,16 +924,16 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #	define RADEON_RB3D_ZC_FLUSH		(1 << 0)
 #	define RADEON_RB3D_ZC_FREE		(1 << 2)
 #	define RADEON_RB3D_ZC_FLUSH_ALL		0x5
-#	define RADEON_RB3D_ZC_BUSY		(1 << 31)
+#	define RADEON_RB3D_ZC_BUSY		(1U << 31)
 #define R300_ZB_ZCACHE_CTLSTAT                  0x4f18
 #	define R300_ZC_FLUSH		        (1 << 0)
 #	define R300_ZC_FREE		        (1 << 1)
-#	define R300_ZC_BUSY		        (1 << 31)
+#	define R300_ZC_BUSY		        (1U << 31)
 #define RADEON_RB3D_DSTCACHE_CTLSTAT	0x325c
 #	define RADEON_RB3D_DC_FLUSH		(3 << 0)
 #	define RADEON_RB3D_DC_FREE		(3 << 2)
 #	define RADEON_RB3D_DC_FLUSH_ALL		0xf
-#	define RADEON_RB3D_DC_BUSY		(1 << 31)
+#	define RADEON_RB3D_DC_BUSY		(1U << 31)
 #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c
 #	define R300_RB3D_DC_FLUSH		(2 << 0)
 #	define R300_RB3D_DC_FREE		(2 << 2)
@@ -949,7 +949,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #	define RADEON_Z_COMPRESSION_ENABLE	(1 << 28)
 #	define RADEON_FORCE_Z_DIRTY		(1 << 29)
 #	define RADEON_Z_WRITE_ENABLE		(1 << 30)
-#	define RADEON_Z_DECOMPRESSION_ENABLE	(1 << 31)
+#	define RADEON_Z_DECOMPRESSION_ENABLE	(1U << 31)
 #define RADEON_RBBM_SOFT_RESET		0x00f0
 #	define RADEON_SOFT_RESET_CP		(1 <<  0)
 #	define RADEON_SOFT_RESET_HI		(1 <<  1)
@@ -1003,7 +1003,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #	define RADEON_TIM_BUSY		(1 << 25) /* not used on r300 */
 #	define RADEON_GA_BUSY		(1 << 26)
 #	define RADEON_CBA2D_BUSY	(1 << 27)
-#	define RADEON_RBBM_ACTIVE	(1 << 31)
+#	define RADEON_RBBM_ACTIVE	(1U << 31)
 #define RADEON_RE_LINE_PATTERN		0x1cd0
 #define RADEON_RE_MISC			0x26c4
 #define RADEON_RE_TOP_LEFT		0x26c0
@@ -1117,7 +1117,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #define RADEON_CP_RB_CNTL		0x0704
 #	define RADEON_BUF_SWAP_32BIT		(2 << 16)
 #	define RADEON_RB_NO_UPDATE		(1 << 27)
-#	define RADEON_RB_RPTR_WR_ENA		(1 << 31)
+#	define RADEON_RB_RPTR_WR_ENA		(1U << 31)
 #define RADEON_CP_RB_RPTR_ADDR		0x070c
 #define RADEON_CP_RB_RPTR		0x0710
 #define RADEON_CP_RB_WPTR		0x0714
@@ -1193,7 +1193,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #define RADEON_CP_PACKET1_REG0_MASK	0x000007ff
 #define RADEON_CP_PACKET1_REG1_MASK	0x003ff800
 
-#define RADEON_VTX_Z_PRESENT			(1 << 31)
+#define RADEON_VTX_Z_PRESENT			(1U << 31)
 #define RADEON_VTX_PKCOLOR_PRESENT		(1 << 3)
 
 #define RADEON_PRIM_TYPE_NONE			(0 << 0)
@@ -1524,7 +1524,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #define R600_GRBM_STATUS                                       0x8010
 #       define R600_CMDFIFO_AVAIL_MASK                         0x1f
 #       define R700_CMDFIFO_AVAIL_MASK                         0xf
-#       define R600_GUI_ACTIVE                                 (1 << 31)
+#       define R600_GUI_ACTIVE                                 (1U << 31)
 #define R600_GRBM_STATUS2                                      0x8014
 #define R600_GRBM_SOFT_RESET                                   0x8020
 #       define R600_SOFT_RESET_CP                              (1 << 0)
@@ -1546,7 +1546,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #       define R600_RB_BUFSZ(x)                                ((x) << 0)
 #       define R600_RB_BLKSZ(x)                                ((x) << 8)
 #       define R600_RB_NO_UPDATE                               (1 << 27)
-#       define R600_RB_RPTR_WR_ENA                             (1 << 31)
+#       define R600_RB_RPTR_WR_ENA                             (1U << 31)
 #define R600_CP_RB_RPTR_WR                                     0xc108
 #define R600_CP_RB_RPTR_ADDR                                   0xc10c
 #define R600_CP_RB_RPTR_ADDR_HI                                0xc110
@@ -1619,7 +1619,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #define R600_SX_MISC                                           0x28350
 
 #define R600_DB_DEBUG                                          0x9830
-#       define R600_PREZ_MUST_WAIT_FOR_POSTZ_DONE              (1 << 31)
+#       define R600_PREZ_MUST_WAIT_FOR_POSTZ_DONE              (1U << 31)
 #define R600_DB_WATERMARKS                                     0x9838
 #       define R600_DEPTH_FREE(x)                              ((x) << 0)
 #       define R600_DEPTH_FLUSH(x)                             ((x) << 5)
@@ -1679,7 +1679,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #       define R600_SYNC_WALKER                                (1 << 25)
 #       define R600_SYNC_ALIGNER                               (1 << 26)
 #       define R600_BILINEAR_PRECISION_6_BIT                   (0 << 31)
-#       define R600_BILINEAR_PRECISION_8_BIT                   (1 << 31)
+#       define R600_BILINEAR_PRECISION_8_BIT                   (1U << 31)
 
 #define R700_TCP_CNTL                                          0x9610
 
@@ -1753,7 +1753,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #       define R600_PERSP_GRADIENT_ENA                         (1 << 28)
 #       define R600_LINEAR_GRADIENT_ENA                        (1 << 29)
 #       define R600_POSITION_SAMPLE                            (1 << 30)
-#       define R600_BARYC_AT_SAMPLE_ENA                        (1 << 31)
+#       define R600_BARYC_AT_SAMPLE_ENA                        (1U << 31)
 #define R600_SPI_PS_IN_CONTROL_1                               0x286d0
 #       define R600_GEN_INDEX_PIX                              (1 << 0)
 #       define R600_GEN_INDEX_PIX_ADDR(x)                      ((x) << 1)
diff --git a/sys/dev/drm/via_irq.c b/sys/dev/drm/via_irq.c
index 20ec77a64ab..0ebda406414 100644
--- a/sys/dev/drm/via_irq.c
+++ b/sys/dev/drm/via_irq.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #define VIA_REG_INTERRUPT       0x200
 
 /* VIA_REG_INTERRUPT */
-#define VIA_IRQ_GLOBAL	  (1 << 31)
+#define VIA_IRQ_GLOBAL	  (1U << 31)
 #define VIA_IRQ_VBLANK_ENABLE   (1 << 19)
 #define VIA_IRQ_VBLANK_PENDING  (1 << 3)
 #define VIA_IRQ_HQV0_ENABLE     (1 << 11)
diff --git a/sys/dev/drm2/drm.h b/sys/dev/drm2/drm.h
index d7e57adda23..d2eac916046 100644
--- a/sys/dev/drm2/drm.h
+++ b/sys/dev/drm2/drm.h
@@ -1015,6 +1015,8 @@ struct drm_event_vblank {
 #define DRM_CAP_VBLANK_HIGH_CRTC 0x2
 #define DRM_CAP_DUMB_PREFERRED_DEPTH 0x3
 #define DRM_CAP_DUMB_PREFER_SHADOW 0x4
+#define DRM_CAP_PRIME 0x5
+#define DRM_CAP_TIMESTAMP_MONOTONIC 0x6
 
 #include "drm_mode.h"
 
diff --git a/sys/dev/drm2/drmP.h b/sys/dev/drm2/drmP.h
index 25765c4902b..c724a2dc7d7 100644
--- a/sys/dev/drm2/drmP.h
+++ b/sys/dev/drm2/drmP.h
@@ -113,6 +113,7 @@ struct drm_device;
 
 #include "opt_compat.h"
 #include "opt_drm.h"
+#include "opt_syscons.h"
 #ifdef DRM_DEBUG
 #undef DRM_DEBUG
 #define DRM_DEBUG_DEFAULT_ON 1
@@ -1067,6 +1068,7 @@ extern int	drm_debug_flag;
 extern int	drm_notyet_flag;
 extern unsigned int drm_vblank_offdelay;
 extern unsigned int drm_timestamp_precision;
+extern unsigned int drm_timestamp_monotonic;
 
 /* Device setup support (drm_drv.c) */
 int	drm_probe(device_t kdev, drm_pci_id_list_t *idlist);
diff --git a/sys/dev/drm2/drm_crtc.c b/sys/dev/drm2/drm_crtc.c
index ae40eb2e283..7c6cb5d1b5b 100644
--- a/sys/dev/drm2/drm_crtc.c
+++ b/sys/dev/drm2/drm_crtc.c
@@ -2317,6 +2317,7 @@ int drm_mode_getfb(struct drm_device *dev,
 	r->depth = fb->depth;
 	r->bpp = fb->bits_per_pixel;
 	r->pitch = fb->pitches[0];
+	r->handle = 0;
 	fb->funcs->create_handle(fb, file_priv, &r->handle);
 
 out:
diff --git a/sys/dev/drm2/drm_drv.c b/sys/dev/drm2/drm_drv.c
index c84c72a4dd5..7b00bcf8cf4 100644
--- a/sys/dev/drm2/drm_drv.c
+++ b/sys/dev/drm2/drm_drv.c
@@ -56,6 +56,12 @@ int drm_notyet_flag = 0;
 unsigned int drm_vblank_offdelay = 5000;    /* Default to 5000 msecs. */
 unsigned int drm_timestamp_precision = 20;  /* Default to 20 usecs. */
 
+/*
+ * Default to use monotonic timestamps for wait-for-vblank and page-flip
+ * complete events.
+ */
+unsigned int drm_timestamp_monotonic = 1;
+
 static int drm_load(struct drm_device *dev);
 static void drm_unload(struct drm_device *dev);
 static drm_pci_id_list_t *drm_find_description(int vendor, int device,
diff --git a/sys/dev/drm2/drm_fb_helper.c b/sys/dev/drm2/drm_fb_helper.c
index 37b50cf2548..90a00987a1b 100644
--- a/sys/dev/drm2/drm_fb_helper.c
+++ b/sys/dev/drm2/drm_fb_helper.c
@@ -36,6 +36,41 @@ __FBSDID("$FreeBSD$");
 #include <dev/drm2/drm_fb_helper.h>
 #include <dev/drm2/drm_crtc_helper.h>
 
+#if defined(__FreeBSD__)
+struct vt_kms_softc {
+	struct drm_fb_helper *fb_helper;
+	struct task	fb_mode_task;
+};
+
+static fb_enter_t	vt_kms_postswitch;
+static void vt_restore_fbdev_mode(void *, int);
+
+/* Call restore out of vt(9) locks. */
+static void
+vt_restore_fbdev_mode(void *arg, int pending)
+{
+	struct drm_fb_helper *fb_helper;
+	struct vt_kms_softc *sc;
+
+	sc = (struct vt_kms_softc *)arg;
+	fb_helper = sc->fb_helper;
+	sx_xlock(&fb_helper->dev->mode_config.mutex);
+	drm_fb_helper_restore_fbdev_mode(fb_helper);
+	sx_xunlock(&fb_helper->dev->mode_config.mutex);
+}
+
+static int
+vt_kms_postswitch(void *arg)
+{
+	struct vt_kms_softc *sc;
+
+	sc = (struct vt_kms_softc *)arg;
+	taskqueue_enqueue_fast(taskqueue_thread, &sc->fb_mode_task);
+
+	return (0);
+}
+#endif
+
 static DRM_LIST_HEAD(kernel_fb_helper_list);
 
 /* simple single crtc case helper function */
@@ -216,6 +251,10 @@ static int
 fb_get_options(const char *connector_name, char **option)
 {
 
+	/*
+	 * TODO: store mode options pointer in ${option} for connector with
+	 * name ${connector_name}
+	 */
 	return (1);
 }
 
@@ -892,11 +931,13 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 	int new_fb = 0;
 	int crtc_count = 0;
 	int i;
-#if 0
 	struct fb_info *info;
-#endif
 	struct drm_fb_helper_surface_size sizes;
 	int gamma_size = 0;
+#if defined(__FreeBSD__)
+	struct vt_kms_softc *sc;
+	device_t kdev;
+#endif
 
 	memset(&sizes, 0, sizeof(struct drm_fb_helper_surface_size));
 	sizes.surface_depth = 24;
@@ -973,8 +1014,21 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 	if (new_fb < 0)
 		return new_fb;
 
-#if 0
+#if defined(__FreeBSD__)
+	sc = malloc(sizeof(struct vt_kms_softc), DRM_MEM_KMS,
+	    M_WAITOK | M_ZERO);
+	sc->fb_helper = fb_helper;
+	TASK_INIT(&sc->fb_mode_task, 0, vt_restore_fbdev_mode, sc);
+
 	info = fb_helper->fbdev;
+
+	info->fb_name = device_get_nameunit(fb_helper->dev->device);
+	info->fb_depth = fb_helper->fb->bits_per_pixel;
+	info->fb_height = fb_helper->fb->height;
+	info->fb_width = fb_helper->fb->width;
+	info->fb_stride = fb_helper->fb->pitches[0];
+	info->fb_priv = sc;
+	info->enter = &vt_kms_postswitch;
 #endif
 
 	/* set the fb pointer */
@@ -982,7 +1036,20 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 		fb_helper->crtc_info[i].mode_set.fb = fb_helper->fb;
 	}
 
-#if 0
+#if defined(__FreeBSD__)
+	if (new_fb) {
+		device_t fbd;
+		int ret;
+
+		kdev = fb_helper->dev->device;
+		fbd = device_add_child(kdev, "fbd", device_get_unit(kdev));
+		ret = device_probe_and_attach(fbd);
+#ifdef DEV_VT
+		if (ret != 0)
+			DRM_ERROR("Failed to attach fbd device: %d\n", ret);
+#endif
+	}
+#else
 	if (new_fb) {
 		info->var.pixclock = 0;
 		if (register_framebuffer(info) < 0) {
@@ -1006,7 +1073,6 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
 	if (new_fb)
 		list_add(&fb_helper->kernel_fb_list, &kernel_fb_helper_list);
 #endif
-
 	return 0;
 }
 
diff --git a/sys/dev/drm2/drm_ioctl.c b/sys/dev/drm2/drm_ioctl.c
index 96dcac2be0c..c0af3761d29 100644
--- a/sys/dev/drm2/drm_ioctl.c
+++ b/sys/dev/drm2/drm_ioctl.c
@@ -250,6 +250,9 @@ int drm_getcap(struct drm_device *dev, void *data, struct drm_file *file_priv)
 	case DRM_CAP_DUMB_PREFER_SHADOW:
 		req->value = dev->mode_config.prefer_shadow;
 		break;
+	case DRM_CAP_TIMESTAMP_MONOTONIC:
+		req->value = drm_timestamp_monotonic;
+		break;
 	default:
 		return EINVAL;
 	}
diff --git a/sys/dev/drm2/drm_linux_list_sort.c b/sys/dev/drm2/drm_linux_list_sort.c
index 973ce4a4be9..19c5c9ecc8e 100644
--- a/sys/dev/drm2/drm_linux_list_sort.c
+++ b/sys/dev/drm2/drm_linux_list_sort.c
@@ -42,8 +42,8 @@ drm_le_cmp(void *priv, const void *d1, const void *d2)
 	struct drm_list_sort_thunk *thunk;
 
 	thunk = priv;
-	le1 = __DECONST(struct list_head *, d1);
-	le2 = __DECONST(struct list_head *, d2);
+	le1 = *(__DECONST(struct list_head **, d1));
+	le2 = *(__DECONST(struct list_head **, d2));
 	return ((thunk->cmp)(thunk->priv, le1, le2));
 }
 
diff --git a/sys/dev/drm2/drm_os_freebsd.h b/sys/dev/drm2/drm_os_freebsd.h
index d3d987af984..af03f8dc44b 100644
--- a/sys/dev/drm2/drm_os_freebsd.h
+++ b/sys/dev/drm2/drm_os_freebsd.h
@@ -6,6 +6,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <sys/fbio.h>
+
 #if _BYTE_ORDER == _BIG_ENDIAN
 #define	__BIG_ENDIAN 4321
 #else
diff --git a/sys/dev/drm2/drm_pci.c b/sys/dev/drm2/drm_pci.c
index ab45278d1af..ac9d4e6be98 100644
--- a/sys/dev/drm2/drm_pci.c
+++ b/sys/dev/drm2/drm_pci.c
@@ -134,7 +134,11 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
 	if (!drm_device_is_pcie(dev))
 		return -EINVAL;
 
-	root = device_get_parent(dev->device);
+	root =
+	    device_get_parent( /* pcib             */
+	    device_get_parent( /* `-- pci          */
+	    device_get_parent( /*     `-- vgapci   */
+	    dev->device)));    /*         `-- drmn */
 
 	pos = 0;
 	pci_find_cap(root, PCIY_EXPRESS, &pos);
diff --git a/sys/dev/drm2/i915/i915_drv.c b/sys/dev/drm2/i915/i915_drv.c
index c90d1d1ece0..85ac10e0f97 100644
--- a/sys/dev/drm2/i915/i915_drv.c
+++ b/sys/dev/drm2/i915/i915_drv.c
@@ -40,6 +40,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/drm2/drm_pciids.h>
 #include <dev/drm2/i915/intel_drv.h>
 
+#include "fb_if.h"
+
 /* drv_PCI_IDs comes from drm_pciids.h, generated from drm_pciids.txt. */
 static drm_pci_id_list_t i915_pciidlist[] = {
 	i915_PCI_IDS
@@ -380,6 +382,25 @@ i915_attach(device_t kdev)
 	return (drm_attach(kdev, i915_pciidlist));
 }
 
+static struct fb_info *
+i915_fb_helper_getinfo(device_t kdev)
+{
+	struct intel_fbdev *ifbdev;
+	drm_i915_private_t *dev_priv;
+	struct drm_device *dev;
+	struct fb_info *info;
+
+	dev = device_get_softc(kdev);
+	dev_priv = dev->dev_private;
+	ifbdev = dev_priv->fbdev;
+	if (ifbdev == NULL)
+		return (NULL);
+
+	info = ifbdev->helper.fbdev;
+
+	return (info);
+}
+
 const struct intel_device_info *
 i915_get_device_id(int device)
 {
@@ -400,6 +421,10 @@ static device_method_t i915_methods[] = {
 	DEVMETHOD(device_suspend,	i915_suspend),
 	DEVMETHOD(device_resume,	i915_resume),
 	DEVMETHOD(device_detach,	drm_detach),
+
+	/* Framebuffer service methods */
+	DEVMETHOD(fb_getinfo,		i915_fb_helper_getinfo),
+
 	DEVMETHOD_END
 };
 
@@ -685,7 +710,7 @@ gen6_do_reset(struct drm_device *dev, u8 flags)
 
 	/* Spin waiting for the device to ack the reset request */
 	ret = _intel_wait_for(dev,
-	    (I915_READ(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0,
+	    (I915_READ_NOTRACE(GEN6_GDRST) & GEN6_GRDOM_FULL) == 0,
 	    500, 1, "915rst");
 
 	/* If reset with a user forcewake, try to restore, otherwise turn it off */
diff --git a/sys/dev/drm2/i915/intel_fb.c b/sys/dev/drm2/i915/intel_fb.c
index e41a49fe0d4..29579203e9e 100644
--- a/sys/dev/drm2/i915/intel_fb.c
+++ b/sys/dev/drm2/i915/intel_fb.c
@@ -41,8 +41,8 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 	struct drm_device *dev = ifbdev->helper.dev;
 #if 0
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct fb_info *info;
 #endif
+	struct fb_info *info;
 	struct drm_framebuffer *fb;
 	struct drm_mode_fb_cmd2 mode_cmd;
 	struct drm_i915_gem_object *obj;
@@ -86,6 +86,16 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 	}
 
 	info->par = ifbdev;
+#else
+	info = malloc(sizeof(struct fb_info), DRM_MEM_KMS, M_WAITOK | M_ZERO);
+	info->fb_size = size;
+	info->fb_bpp = sizes->surface_bpp;
+	info->fb_width = sizes->fb_width;
+	info->fb_height = sizes->fb_height;
+	info->fb_pbase = dev->agp->base + obj->gtt_offset;
+	info->fb_vbase = (vm_offset_t)pmap_mapdev_attr(info->fb_pbase, size,
+	    PAT_WRITE_COMBINING);
+
 #endif
 
 	ret = intel_framebuffer_init(dev, &ifbdev->ifb, &mode_cmd, obj);
@@ -95,8 +105,8 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 	fb = &ifbdev->ifb.base;
 
 	ifbdev->helper.fb = fb;
-#if 0
 	ifbdev->helper.fbdev = info;
+#if 0
 
 	strcpy(info->fix.id, "inteldrmfb");
 
@@ -135,9 +145,8 @@ static int intelfb_create(struct intel_fbdev *ifbdev,
 
 	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
 #endif
-
-	DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08x, bo %p\n",
-		      fb->width, fb->height,
+	DRM_DEBUG_KMS("allocated %dx%d (s %dbits) fb: 0x%08x, bo %p\n",
+		      fb->width, fb->height, fb->depth,
 		      obj->gtt_offset, obj);
 
 	DRM_UNLOCK(dev);
diff --git a/sys/dev/drm2/radeon/atombios_dp.c b/sys/dev/drm2/radeon/atombios_dp.c
index 3c0f7f563da..f92df621cbb 100644
--- a/sys/dev/drm2/radeon/atombios_dp.c
+++ b/sys/dev/drm2/radeon/atombios_dp.c
@@ -272,7 +272,7 @@ int radeon_dp_i2c_aux_ch(device_t dev, int mode, u8 write_byte, u8 *read_byte)
 		case AUX_I2C_REPLY_ACK:
 			if (mode == MODE_I2C_READ)
 				*read_byte = reply[0];
-			return ret;
+			return (0); /* Return ret on Linux. */
 		case AUX_I2C_REPLY_NACK:
 			DRM_DEBUG_KMS("aux_i2c nack\n");
 			return -EREMOTEIO;
diff --git a/sys/dev/drm2/radeon/evergreen_blit_kms.c b/sys/dev/drm2/radeon/evergreen_blit_kms.c
index 1012f3f35f3..f89f8b5bb31 100644
--- a/sys/dev/drm2/radeon/evergreen_blit_kms.c
+++ b/sys/dev/drm2/radeon/evergreen_blit_kms.c
@@ -241,12 +241,12 @@ set_scissors(struct radeon_device *rdev, int x1, int y1,
 
 	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));
 	radeon_ring_write(ring, (PA_SC_GENERIC_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_START) >> 2);
-	radeon_ring_write(ring, (x1 << 0) | (y1 << 16) | (1 << 31));
+	radeon_ring_write(ring, (x1 << 0) | (y1 << 16) | (1U << 31));
 	radeon_ring_write(ring, (x2 << 0) | (y2 << 16));
 
 	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));
 	radeon_ring_write(ring, (PA_SC_WINDOW_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_START) >> 2);
-	radeon_ring_write(ring, (x1 << 0) | (y1 << 16) | (1 << 31));
+	radeon_ring_write(ring, (x1 << 0) | (y1 << 16) | (1U << 31));
 	radeon_ring_write(ring, (x2 << 0) | (y2 << 16));
 }
 
diff --git a/sys/dev/drm2/radeon/evergreen_cs.c b/sys/dev/drm2/radeon/evergreen_cs.c
index 693c38c2900..1dac2654861 100644
--- a/sys/dev/drm2/radeon/evergreen_cs.c
+++ b/sys/dev/drm2/radeon/evergreen_cs.c
@@ -2949,7 +2949,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p)
 					switch (misc) {
 					case 0:
 						/* L2T, frame to fields */
-						if (idx_value & (1 << 31)) {
+						if (idx_value & (1U << 31)) {
 							DRM_ERROR("bad L2T, frame to fields DMA_PACKET_COPY\n");
 							return -EINVAL;
 						}
@@ -2992,7 +2992,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p)
 							return -EINVAL;
 						}
 						/* detile bit */
-						if (idx_value & (1 << 31)) {
+						if (idx_value & (1U << 31)) {
 							/* tiled src, linear dst */
 							ib[idx+1] += (u32)(src_reloc->lobj.gpu_offset >> 8);
 
@@ -3009,7 +3009,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p)
 						break;
 					case 3:
 						/* L2T, broadcast */
-						if (idx_value & (1 << 31)) {
+						if (idx_value & (1U << 31)) {
 							DRM_ERROR("bad L2T, broadcast DMA_PACKET_COPY\n");
 							return -EINVAL;
 						}
@@ -3048,7 +3048,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p)
 					case 4:
 						/* L2T, T2L */
 						/* detile bit */
-						if (idx_value & (1 << 31)) {
+						if (idx_value & (1U << 31)) {
 							/* tiled src, linear dst */
 							src_offset = radeon_get_ib_value(p, idx+1);
 							src_offset <<= 8;
@@ -3093,7 +3093,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p)
 						break;
 					case 7:
 						/* L2T, broadcast */
-						if (idx_value & (1 << 31)) {
+						if (idx_value & (1U << 31)) {
 							DRM_ERROR("bad L2T, broadcast DMA_PACKET_COPY\n");
 							return -EINVAL;
 						}
@@ -3137,7 +3137,7 @@ int evergreen_dma_cs_parse(struct radeon_cs_parser *p)
 					switch (misc) {
 					case 0:
 						/* detile bit */
-						if (idx_value & (1 << 31)) {
+						if (idx_value & (1U << 31)) {
 							/* tiled src, linear dst */
 							src_offset = radeon_get_ib_value(p, idx+1);
 							src_offset <<= 8;
diff --git a/sys/dev/drm2/radeon/evergreend.h b/sys/dev/drm2/radeon/evergreend.h
index 3fd74ce1e49..044351ad293 100644
--- a/sys/dev/drm2/radeon/evergreend.h
+++ b/sys/dev/drm2/radeon/evergreend.h
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
 #define		INSTANCE_INDEX(x)			((x) << 0)
 #define		SE_INDEX(x)     			((x) << 16)
 #define		INSTANCE_BROADCAST_WRITES      		(1 << 30)
-#define		SE_BROADCAST_WRITES      		(1 << 31)
+#define		SE_BROADCAST_WRITES      		(1U << 31)
 #define RLC_GFX_INDEX           			0x3fC4
 #define CC_GC_SHADER_PIPE_CONFIG			0x8950
 #define		WRITE_DIS      				(1 << 0)
@@ -125,7 +125,7 @@ __FBSDID("$FreeBSD$");
 #define		RB_BUFSZ(x)					((x) << 0)
 #define		RB_BLKSZ(x)					((x) << 8)
 #define		RB_NO_UPDATE					(1 << 27)
-#define		RB_RPTR_WR_ENA					(1 << 31)
+#define		RB_RPTR_WR_ENA					(1U << 31)
 #define		BUF_SWAP_32BIT					(2 << 16)
 #define	CP_RB_RPTR					0x8700
 #define	CP_RB_RPTR_ADDR					0xC10C
@@ -187,7 +187,7 @@ __FBSDID("$FreeBSD$");
 #       define HDMI_ACR_X1                   1
 #       define HDMI_ACR_X2                   2
 #       define HDMI_ACR_X4                   4
-#       define HDMI_ACR_AUDIO_PRIORITY       (1 << 31)
+#       define HDMI_ACR_AUDIO_PRIORITY       (1U << 31)
 #define HDMI_VBI_PACKET_CONTROL              0x7040
 #       define HDMI_NULL_SEND                (1 << 0)
 #       define HDMI_GC_SEND                  (1 << 4)
@@ -322,7 +322,7 @@ __FBSDID("$FreeBSD$");
 #       define AFMT_AUDIO_CRC_EN             (1 << 0)
 #define AFMT_RAMP_CONTROL0                   0x7110
 #       define AFMT_RAMP_MAX_COUNT(x)        (((x) & 0xffffff) << 0)
-#       define AFMT_RAMP_DATA_SIGN           (1 << 31)
+#       define AFMT_RAMP_DATA_SIGN           (1U << 31)
 #define AFMT_RAMP_CONTROL1                   0x7114
 #       define AFMT_RAMP_MIN_COUNT(x)        (((x) & 0xffffff) << 0)
 #       define AFMT_AUDIO_TEST_CH_DISABLE(x) (((x) & 0xff) << 24)
@@ -406,7 +406,7 @@ __FBSDID("$FreeBSD$");
 #       define PIN1_AUDIO_ENABLED                         (1 << 25)
 #       define PIN2_AUDIO_ENABLED                         (1 << 26)
 #       define PIN3_AUDIO_ENABLED                         (1 << 27)
-#       define AUDIO_ENABLED                              (1 << 31)
+#       define AUDIO_ENABLED                              (1U << 31)
 
 
 #define	GC_USER_SHADER_PIPE_CONFIG			0x8954
@@ -452,7 +452,7 @@ __FBSDID("$FreeBSD$");
 #define		CP_COHERENCY_BUSY      				(1 << 28)
 #define		CP_BUSY 					(1 << 29)
 #define		CB_BUSY 					(1 << 30)
-#define		GUI_ACTIVE					(1 << 31)
+#define		GUI_ACTIVE					(1U << 31)
 #define	GRBM_STATUS_SE0					0x8014
 #define	GRBM_STATUS_SE1					0x8018
 #define		SE_SX_CLEAN					(1 << 0)
@@ -464,7 +464,7 @@ __FBSDID("$FreeBSD$");
 #define		SE_SH_BUSY					(1 << 28)
 #define		SE_SC_BUSY					(1 << 29)
 #define		SE_DB_BUSY					(1 << 30)
-#define		SE_CB_BUSY					(1 << 31)
+#define		SE_CB_BUSY					(1U << 31)
 /* evergreen */
 #define	CG_THERMAL_CTRL					0x72c
 #define		TOFFSET_MASK			        0x00003FE0
@@ -771,7 +771,7 @@ __FBSDID("$FreeBSD$");
 #       define IH_WPTR_WRITEBACK_ENABLE                   (1 << 8)
 #       define IH_WPTR_WRITEBACK_TIMER(x)                 ((x) << 9) /* log2 */
 #       define IH_WPTR_OVERFLOW_ENABLE                    (1 << 16)
-#       define IH_WPTR_OVERFLOW_CLEAR                     (1 << 31)
+#       define IH_WPTR_OVERFLOW_CLEAR                     (1U << 31)
 #define IH_RB_BASE                                        0x3e04
 #define IH_RB_RPTR                                        0x3e08
 #define IH_RB_WPTR                                        0x3e0c
@@ -797,13 +797,13 @@ __FBSDID("$FreeBSD$");
 #       define TIME_STAMP_INT_ENABLE                    (1 << 26)
 #       define IB2_INT_ENABLE                           (1 << 29)
 #       define IB1_INT_ENABLE                           (1 << 30)
-#       define RB_INT_ENABLE                            (1 << 31)
+#       define RB_INT_ENABLE                            (1U << 31)
 #define CP_INT_STATUS                                   0xc128
 #       define SCRATCH_INT_STAT                         (1 << 25)
 #       define TIME_STAMP_INT_STAT                      (1 << 26)
 #       define IB2_INT_STAT                             (1 << 29)
 #       define IB1_INT_STAT                             (1 << 30)
-#       define RB_INT_STAT                              (1 << 31)
+#       define RB_INT_STAT                              (1U << 31)
 
 #define GRBM_INT_CNTL                                   0x8060
 #       define RDERR_INT_ENABLE                         (1 << 0)
@@ -1062,7 +1062,7 @@ __FBSDID("$FreeBSD$");
 		 * 1 - GDS
 		 * 2 - DATA
 		 */
-#              define PACKET3_CP_DMA_CP_SYNC       (1 << 31)
+#              define PACKET3_CP_DMA_CP_SYNC       (1U << 31)
 /* COMMAND */
 #              define PACKET3_CP_DMA_DIS_WC        (1 << 21)
 #              define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23)
diff --git a/sys/dev/drm2/radeon/nid.h b/sys/dev/drm2/radeon/nid.h
index afe7a328698..89c02373571 100644
--- a/sys/dev/drm2/radeon/nid.h
+++ b/sys/dev/drm2/radeon/nid.h
@@ -219,7 +219,7 @@ __FBSDID("$FreeBSD$");
 #define		CP_COHERENCY_BUSY      				(1 << 28)
 #define		CP_BUSY 					(1 << 29)
 #define		CB_BUSY 					(1 << 30)
-#define		GUI_ACTIVE					(1 << 31)
+#define		GUI_ACTIVE					(1U << 31)
 #define	GRBM_STATUS_SE0					0x8014
 #define	GRBM_STATUS_SE1					0x8018
 #define		SE_SX_CLEAN					(1 << 0)
@@ -233,7 +233,7 @@ __FBSDID("$FreeBSD$");
 #define		SE_SH_BUSY					(1 << 28)
 #define		SE_SC_BUSY					(1 << 29)
 #define		SE_DB_BUSY					(1 << 30)
-#define		SE_CB_BUSY					(1 << 31)
+#define		SE_CB_BUSY					(1U << 31)
 #define	GRBM_SOFT_RESET					0x8020
 #define		SOFT_RESET_CP					(1 << 0)
 #define		SOFT_RESET_CB					(1 << 1)
@@ -253,7 +253,7 @@ __FBSDID("$FreeBSD$");
 #define		INSTANCE_INDEX(x)			((x) << 0)
 #define		SE_INDEX(x)     			((x) << 16)
 #define		INSTANCE_BROADCAST_WRITES      		(1 << 30)
-#define		SE_BROADCAST_WRITES      		(1 << 31)
+#define		SE_BROADCAST_WRITES      		(1U << 31)
 
 #define	SCRATCH_REG0					0x8500
 #define	SCRATCH_REG1					0x8504
@@ -442,7 +442,7 @@ __FBSDID("$FreeBSD$");
 #define		RB_BUFSZ(x)					((x) << 0)
 #define		RB_BLKSZ(x)					((x) << 8)
 #define		RB_NO_UPDATE					(1 << 27)
-#define		RB_RPTR_WR_ENA					(1 << 31)
+#define		RB_RPTR_WR_ENA					(1U << 31)
 #define		BUF_SWAP_32BIT					(2 << 16)
 #define	CP_RB0_RPTR_ADDR				0xC10C
 #define	CP_RB0_RPTR_ADDR_HI				0xC110
@@ -641,7 +641,7 @@ __FBSDID("$FreeBSD$");
 #define DMA_IB_CNTL                                       0xd024
 #       define DMA_IB_ENABLE                              (1 << 0)
 #       define DMA_IB_SWAP_ENABLE                         (1 << 4)
-#       define CMD_VMID_FORCE                             (1 << 31)
+#       define CMD_VMID_FORCE                             (1U << 31)
 #define DMA_IB_RPTR                                       0xd028
 #define DMA_CNTL                                          0xd02c
 #       define TRAP_ENABLE                                (1 << 0)
diff --git a/sys/dev/drm2/radeon/r200.c b/sys/dev/drm2/radeon/r200.c
index fe8b768046c..566645fddb9 100644
--- a/sys/dev/drm2/radeon/r200.c
+++ b/sys/dev/drm2/radeon/r200.c
@@ -116,7 +116,7 @@ int r200_copy_dma(struct radeon_device *rdev,
 		radeon_ring_write(ring, PACKET0(0x720, 2));
 		radeon_ring_write(ring, src_offset);
 		radeon_ring_write(ring, dst_offset);
-		radeon_ring_write(ring, cur_size | (1 << 31) | (1 << 30));
+		radeon_ring_write(ring, cur_size | (1U << 31) | (1 << 30));
 		src_offset += cur_size;
 		dst_offset += cur_size;
 	}
diff --git a/sys/dev/drm2/radeon/r300.c b/sys/dev/drm2/radeon/r300.c
index aa9073cf270..56810354c72 100644
--- a/sys/dev/drm2/radeon/r300.c
+++ b/sys/dev/drm2/radeon/r300.c
@@ -1041,7 +1041,7 @@ static int r300_packet0_check(struct radeon_cs_parser *p,
 		track->textures[i].height = tmp + 1;
 		tmp = (idx_value >> 26) & 0xF;
 		track->textures[i].num_levels = tmp;
-		tmp = idx_value & (1 << 31);
+		tmp = idx_value & (1U << 31);
 		track->textures[i].use_pitch = !!tmp;
 		tmp = (idx_value >> 22) & 0xF;
 		track->textures[i].txdepth = tmp;
diff --git a/sys/dev/drm2/radeon/r300_reg.h b/sys/dev/drm2/radeon/r300_reg.h
index 3478d00920d..3dc2b430c79 100644
--- a/sys/dev/drm2/radeon/r300_reg.h
+++ b/sys/dev/drm2/radeon/r300_reg.h
@@ -1210,7 +1210,7 @@ __FBSDID("$FreeBSD$");
 #       define R300_FPI0_OUTC_FRC                (9 << 23)
 #       define R300_FPI0_OUTC_REPL_ALPHA         (10 << 23)
 #       define R300_FPI0_OUTC_SAT                (1 << 30)
-#       define R300_FPI0_INSERT_NOP              (1 << 31)
+#       define R300_FPI0_INSERT_NOP              (1U << 31)
 
 #define R300_PFS_INSTR2_0                   0x49C0
 #       define R300_FPI2_ARGA_SRC0C_X            0
@@ -1257,7 +1257,7 @@ __FBSDID("$FreeBSD$");
 #       define R300_FPI2_OUTA_RCP                (10 << 23)
 #       define R300_FPI2_OUTA_RSQ                (11 << 23)
 #       define R300_FPI2_OUTA_SAT                (1 << 30)
-#       define R300_FPI2_UNKNOWN_31              (1 << 31)
+#       define R300_FPI2_UNKNOWN_31              (1U << 31)
 /* END: Fragment program instruction set */
 
 /* Fog state and color */
@@ -1460,7 +1460,7 @@ __FBSDID("$FreeBSD$");
 #       define R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_NO_EFFECT       (0 << 1)
 #       define R300_ZB_ZCACHE_CTLSTAT_ZC_FREE_FREE            (1 << 1)
 #       define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_IDLE            (0 << 31)
-#       define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_BUSY            (1 << 31)
+#       define R300_ZB_ZCACHE_CTLSTAT_ZC_BUSY_BUSY            (1U << 31)
 
 #define R300_ZB_BW_CNTL                     0x4f1c
 #	define R300_HIZ_DISABLE                              (0 << 0)
diff --git a/sys/dev/drm2/radeon/r500_reg.h b/sys/dev/drm2/radeon/r500_reg.h
index c56088b8652..7b7130ec227 100644
--- a/sys/dev/drm2/radeon/r500_reg.h
+++ b/sys/dev/drm2/radeon/r500_reg.h
@@ -88,7 +88,7 @@ __FBSDID("$FreeBSD$");
 #       define R300_SUBPIXEL_1_12       (0 << 16)
 #       define R300_SUBPIXEL_1_16       (1 << 16)
 #define R300_DST_PIPE_CONFIG            0x170c
-#       define R300_PIPE_AUTO_CONFIG    (1 << 31)
+#       define R300_PIPE_AUTO_CONFIG    (1U << 31)
 #define R300_RB2D_DSTCACHE_MODE         0x3428
 #       define R300_DC_AUTOFLUSH_ENABLE (1 << 8)
 #       define R300_DC_DC_DISABLE_IGNORE_PE (1 << 17)
@@ -148,7 +148,7 @@ __FBSDID("$FreeBSD$");
 #	define RS480_GTW_LAC_EN	        (1 << 25)
 #	define RS480_2LEVEL_GART	(0 << 30)
 #	define RS480_1LEVEL_GART	(1 << 30)
-#	define RS480_PDC_EN	        (1 << 31)
+#	define RS480_PDC_EN	        (1U << 31)
 #define RS480_GART_BASE                 0x2c
 #define RS480_GART_CACHE_CNTRL          0x2e
 #	define RS480_GART_CACHE_INVALIDATE (1 << 0) /* wait for it to clear */
@@ -639,7 +639,7 @@ __FBSDID("$FreeBSD$");
 #       define AVIVO_TMDSA_TRANSMITTER_CONTROL_CLK_PATTERN_SHIFT (16)
 #	define AVIVO_TMDSA_TRANSMITTER_CONTROL_BYPASS_PLL	(1 << 28)
 #       define AVIVO_TMDSA_TRANSMITTER_CONTROL_USE_CLK_DATA     (1 << 29)
-#	define AVIVO_TMDSA_TRANSMITTER_CONTROL_INPUT_TEST_CLK_SEL	(1 << 31)
+#	define AVIVO_TMDSA_TRANSMITTER_CONTROL_INPUT_TEST_CLK_SEL	(1U << 31)
 
 #define AVIVO_LVTMA_CNTL					0x7a80
 #   define AVIVO_LVTMA_CNTL_ENABLE               (1 << 0)
@@ -705,7 +705,7 @@ __FBSDID("$FreeBSD$");
 #       define AVIVO_LVTMA_TRANSMITTER_CONTROL_CLK_PATTERN_SHIFT  (16)
 #	define AVIVO_LVTMA_TRANSMITTER_CONTROL_BYPASS_PLL	  (1 << 28)
 #       define AVIVO_LVTMA_TRANSMITTER_CONTROL_USE_CLK_DATA       (1 << 29)
-#	define AVIVO_LVTMA_TRANSMITTER_CONTROL_INPUT_TEST_CLK_SEL (1 << 31)
+#	define AVIVO_LVTMA_TRANSMITTER_CONTROL_INPUT_TEST_CLK_SEL (1U << 31)
 
 #define R500_LVTMA_PWRSEQ_CNTL						0x7af0
 #define R600_LVTMA_PWRSEQ_CNTL						0x7af4
diff --git a/sys/dev/drm2/radeon/r600_blit.c b/sys/dev/drm2/radeon/r600_blit.c
index f9658d49ed2..f44fd797a89 100644
--- a/sys/dev/drm2/radeon/r600_blit.c
+++ b/sys/dev/drm2/radeon/r600_blit.c
@@ -196,7 +196,7 @@ set_vtx_resource(drm_radeon_private_t *dev_priv, u64 gpu_addr)
 
 	sq_vtx_constant_word2 = (((gpu_addr >> 32) & 0xff) | (16 << 8));
 #ifdef __BIG_ENDIAN
-	sq_vtx_constant_word2 |= (2 << 30);
+	sq_vtx_constant_word2 |= (2U << 30);
 #endif
 
 	BEGIN_RING(9);
@@ -275,12 +275,12 @@ set_scissors(drm_radeon_private_t *dev_priv, int x1, int y1, int x2, int y2)
 
 	OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 2));
 	OUT_RING((R600_PA_SC_GENERIC_SCISSOR_TL - R600_SET_CONTEXT_REG_OFFSET) >> 2);
-	OUT_RING((x1 << 0) | (y1 << 16) | (1 << 31));
+	OUT_RING((x1 << 0) | (y1 << 16) | (1U << 31));
 	OUT_RING((x2 << 0) | (y2 << 16));
 
 	OUT_RING(CP_PACKET3(R600_IT_SET_CONTEXT_REG, 2));
 	OUT_RING((R600_PA_SC_WINDOW_SCISSOR_TL - R600_SET_CONTEXT_REG_OFFSET) >> 2);
-	OUT_RING((x1 << 0) | (y1 << 16) | (1 << 31));
+	OUT_RING((x1 << 0) | (y1 << 16) | (1U << 31));
 	OUT_RING((x2 << 0) | (y2 << 16));
 	ADVANCE_RING();
 }
diff --git a/sys/dev/drm2/radeon/r600_blit_kms.c b/sys/dev/drm2/radeon/r600_blit_kms.c
index e2ace6936a9..47af99028df 100644
--- a/sys/dev/drm2/radeon/r600_blit_kms.c
+++ b/sys/dev/drm2/radeon/r600_blit_kms.c
@@ -244,12 +244,12 @@ set_scissors(struct radeon_device *rdev, int x1, int y1,
 
 	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));
 	radeon_ring_write(ring, (PA_SC_GENERIC_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
-	radeon_ring_write(ring, (x1 << 0) | (y1 << 16) | (1 << 31));
+	radeon_ring_write(ring, (x1 << 0) | (y1 << 16) | (1U << 31));
 	radeon_ring_write(ring, (x2 << 0) | (y2 << 16));
 
 	radeon_ring_write(ring, PACKET3(PACKET3_SET_CONTEXT_REG, 2));
 	radeon_ring_write(ring, (PA_SC_WINDOW_SCISSOR_TL - PACKET3_SET_CONTEXT_REG_OFFSET) >> 2);
-	radeon_ring_write(ring, (x1 << 0) | (y1 << 16) | (1 << 31));
+	radeon_ring_write(ring, (x1 << 0) | (y1 << 16) | (1U << 31));
 	radeon_ring_write(ring, (x2 << 0) | (y2 << 16));
 }
 
diff --git a/sys/dev/drm2/radeon/r600_cs.c b/sys/dev/drm2/radeon/r600_cs.c
index 6ba46143266..9000b3c7d02 100644
--- a/sys/dev/drm2/radeon/r600_cs.c
+++ b/sys/dev/drm2/radeon/r600_cs.c
@@ -2664,7 +2664,7 @@ int r600_dma_cs_parse(struct radeon_cs_parser *p)
 			if (tiled) {
 				idx_value = radeon_get_ib_value(p, idx + 2);
 				/* detile bit */
-				if (idx_value & (1 << 31)) {
+				if (idx_value & (1U << 31)) {
 					/* tiled src, linear dst */
 					src_offset = radeon_get_ib_value(p, idx+1);
 					src_offset <<= 8;
diff --git a/sys/dev/drm2/radeon/r600d.h b/sys/dev/drm2/radeon/r600d.h
index 41cc7c6dd89..174b1feda4a 100644
--- a/sys/dev/drm2/radeon/r600d.h
+++ b/sys/dev/drm2/radeon/r600d.h
@@ -204,7 +204,7 @@ __FBSDID("$FreeBSD$");
 #define		RB_BUFSZ(x)					((x) << 0)
 #define		RB_BLKSZ(x)					((x) << 8)
 #define		RB_NO_UPDATE					(1 << 27)
-#define		RB_RPTR_WR_ENA					(1 << 31)
+#define		RB_RPTR_WR_ENA					(1U << 31)
 #define		BUF_SWAP_32BIT					(2 << 16)
 #define	CP_RB_RPTR					0x8700
 #define	CP_RB_RPTR_ADDR					0xC10C
@@ -220,7 +220,7 @@ __FBSDID("$FreeBSD$");
 #define	CP_SEM_WAIT_TIMER				0x85BC
 
 #define	DB_DEBUG					0x9830
-#define		PREZ_MUST_WAIT_FOR_POSTZ_DONE			(1 << 31)
+#define		PREZ_MUST_WAIT_FOR_POSTZ_DONE			(1U << 31)
 #define	DB_DEPTH_BASE					0x2800C
 #define	DB_HTILE_DATA_BASE				0x28014
 #define	DB_HTILE_SURFACE				0x28D24
@@ -507,7 +507,7 @@ __FBSDID("$FreeBSD$");
 #define		SYNC_WALKER					(1 << 25)
 #define		SYNC_ALIGNER					(1 << 26)
 #define		BILINEAR_PRECISION_6_BIT			(0 << 31)
-#define		BILINEAR_PRECISION_8_BIT			(1 << 31)
+#define		BILINEAR_PRECISION_8_BIT			(1U << 31)
 
 #define	TC_CNTL						0x9608
 #define		TC_L2_SIZE(x)					((x)<<5)
@@ -650,7 +650,7 @@ __FBSDID("$FreeBSD$");
 #       define IH_WPTR_WRITEBACK_ENABLE                   (1 << 8)
 #       define IH_WPTR_WRITEBACK_TIMER(x)                 ((x) << 9) /* log2 */
 #       define IH_WPTR_OVERFLOW_ENABLE                    (1 << 16)
-#       define IH_WPTR_OVERFLOW_CLEAR                     (1 << 31)
+#       define IH_WPTR_OVERFLOW_CLEAR                     (1U << 31)
 #define IH_RB_BASE                                        0x3e04
 #define IH_RB_RPTR                                        0x3e08
 #define IH_RB_WPTR                                        0x3e0c
@@ -701,13 +701,13 @@ __FBSDID("$FreeBSD$");
 #       define TIME_STAMP_INT_ENABLE                      (1 << 26)
 #       define IB2_INT_ENABLE                             (1 << 29)
 #       define IB1_INT_ENABLE                             (1 << 30)
-#       define RB_INT_ENABLE                              (1 << 31)
+#       define RB_INT_ENABLE                              (1U << 31)
 #define CP_INT_STATUS                                     0xc128
 #       define SCRATCH_INT_STAT                           (1 << 25)
 #       define TIME_STAMP_INT_STAT                        (1 << 26)
 #       define IB2_INT_STAT                               (1 << 29)
 #       define IB1_INT_STAT                               (1 << 30)
-#       define RB_INT_STAT                                (1 << 31)
+#       define RB_INT_STAT                                (1U << 31)
 
 #define GRBM_INT_CNTL                                     0x8060
 #       define RDERR_INT_ENABLE                           (1 << 0)
@@ -914,7 +914,7 @@ __FBSDID("$FreeBSD$");
 #define DCCG_AUDIO_DTO0_PHASE             0x0514
 #define DCCG_AUDIO_DTO0_MODULE            0x0518
 #define DCCG_AUDIO_DTO0_LOAD              0x051c
-#       define DTO_LOAD                   (1 << 31)
+#       define DTO_LOAD                   (1U << 31)
 #define DCCG_AUDIO_DTO0_CNTL              0x0520
 
 #define DCCG_AUDIO_DTO1_PHASE             0x0524
@@ -1197,7 +1197,7 @@ __FBSDID("$FreeBSD$");
  * 5. DST_ADDR_HI [7:0]
  * 6. COMMAND [29:22] | BYTE_COUNT [20:0]
  */
-#              define PACKET3_CP_DMA_CP_SYNC       (1 << 31)
+#              define PACKET3_CP_DMA_CP_SYNC       (1U << 31)
 /* COMMAND */
 #              define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23)
                 /* 0 - none
diff --git a/sys/dev/drm2/radeon/radeon.h b/sys/dev/drm2/radeon/radeon.h
index 88a5c5a37f6..aabe9aa4f41 100644
--- a/sys/dev/drm2/radeon/radeon.h
+++ b/sys/dev/drm2/radeon/radeon.h
@@ -2041,6 +2041,9 @@ void	radeon_pm_acpi_event_handler(struct radeon_device *rdev);
 int	radeon_ttm_init(struct radeon_device *rdev);
 void	radeon_ttm_fini(struct radeon_device *rdev);
 
+/* radeon_fb.c */
+struct fb_info *	radeon_fb_helper_getinfo(device_t kdev);
+
 /* r600.c */
 int r600_ih_ring_alloc(struct radeon_device *rdev);
 void r600_ih_ring_fini(struct radeon_device *rdev);
diff --git a/sys/dev/drm2/radeon/radeon_agp.c b/sys/dev/drm2/radeon/radeon_agp.c
index dec4045065c..0ac376b5343 100644
--- a/sys/dev/drm2/radeon/radeon_agp.c
+++ b/sys/dev/drm2/radeon/radeon_agp.c
@@ -153,11 +153,11 @@ int radeon_agp_init(struct radeon_device *rdev)
 		return ret;
 	}
 
-	if (rdev->ddev->agp->info.ai_aperture_size < 32) {
+	if ((rdev->ddev->agp->info.ai_aperture_size >> 20) < 32) {
 		drm_agp_release(rdev->ddev);
 		dev_warn(rdev->dev, "AGP aperture too small (%zuM) "
 			"need at least 32M, disabling AGP\n",
-			rdev->ddev->agp->info.ai_aperture_size);
+			rdev->ddev->agp->info.ai_aperture_size >> 20);
 		return -EINVAL;
 	}
 
@@ -246,7 +246,7 @@ int radeon_agp_init(struct radeon_device *rdev)
 	}
 
 	rdev->mc.agp_base = rdev->ddev->agp->info.ai_aperture_base;
-	rdev->mc.gtt_size = rdev->ddev->agp->info.ai_aperture_size << 20;
+	rdev->mc.gtt_size = rdev->ddev->agp->info.ai_aperture_size;
 	rdev->mc.gtt_start = rdev->mc.agp_base;
 	rdev->mc.gtt_end = rdev->mc.gtt_start + rdev->mc.gtt_size - 1;
 	dev_info(rdev->dev, "GTT: %juM 0x%08jX - 0x%08jX\n",
diff --git a/sys/dev/drm2/radeon/radeon_cp.c b/sys/dev/drm2/radeon/radeon_cp.c
index 4a036336cdb..4ec2773fd08 100644
--- a/sys/dev/drm2/radeon/radeon_cp.c
+++ b/sys/dev/drm2/radeon/radeon_cp.c
@@ -564,7 +564,7 @@ static void radeon_do_cp_flush(drm_radeon_private_t * dev_priv)
 #if 0
 	u32 tmp;
 
-	tmp = RADEON_READ(RADEON_CP_RB_WPTR) | (1 << 31);
+	tmp = RADEON_READ(RADEON_CP_RB_WPTR) | (1U << 31);
 	RADEON_WRITE(RADEON_CP_RB_WPTR, tmp);
 #endif
 }
diff --git a/sys/dev/drm2/radeon/radeon_display.c b/sys/dev/drm2/radeon/radeon_display.c
index 45c3b0cef68..ee74ed453a2 100644
--- a/sys/dev/drm2/radeon/radeon_display.c
+++ b/sys/dev/drm2/radeon/radeon_display.c
@@ -336,9 +336,7 @@ void radeon_crtc_handle_flip(struct radeon_device *rdev, int crtc_id)
 		e->event.tv_sec = now.tv_sec;
 		e->event.tv_usec = now.tv_usec;
 		list_add_tail(&e->base.link, &e->base.file_priv->event_list);
-#ifdef DUMBBELL_WIP
-		wake_up_interruptible(&e->base.file_priv->event_wait);
-#endif /* DUMBBELL_WIP */
+		drm_event_wakeup(&e->base);
 	}
 	DRM_SPINUNLOCK_IRQRESTORE(&rdev->ddev->event_lock, flags);
 
diff --git a/sys/dev/drm2/radeon/radeon_drv.c b/sys/dev/drm2/radeon/radeon_drv.c
index 2ef5426f9cc..0cf96d2aac5 100644
--- a/sys/dev/drm2/radeon/radeon_drv.c
+++ b/sys/dev/drm2/radeon/radeon_drv.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/drm2/drm_pciids.h>
 
+#include "fb_if.h"
 
 /*
  * KMS wrapper.
@@ -338,6 +339,12 @@ static const struct file_operations radeon_driver_kms_fops = {
 };
 #endif /* DUMBBELL_WIP */
 
+static int radeon_sysctl_init(struct drm_device *dev, struct sysctl_ctx_list *ctx,
+			      struct sysctl_oid *top)
+{
+	return drm_add_busid_modesetting(dev, ctx, top);
+}
+
 static struct drm_driver_info kms_driver = {
 	.driver_features =
 	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
@@ -367,6 +374,7 @@ static struct drm_driver_info kms_driver = {
 	.irq_postinstall = radeon_driver_irq_postinstall_kms,
 	.irq_uninstall = radeon_driver_irq_uninstall_kms,
 	.irq_handler = radeon_driver_irq_handler_kms,
+	.sysctl_init = radeon_sysctl_init,
 	.ioctls = radeon_ioctls_kms,
 	.gem_init_object = radeon_gem_object_init,
 	.gem_free_object = radeon_gem_object_free,
@@ -488,6 +496,8 @@ radeon_resume(device_t kdev)
 	return (-ret);
 }
 
+extern struct fb_info *	radeon_fb_helper_getinfo(device_t kdev);
+
 static device_method_t radeon_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		radeon_probe),
@@ -495,6 +505,10 @@ static device_method_t radeon_methods[] = {
 	DEVMETHOD(device_suspend,	radeon_suspend),
 	DEVMETHOD(device_resume,	radeon_resume),
 	DEVMETHOD(device_detach,	drm_detach),
+
+	/* Framebuffer service methods */
+	DEVMETHOD(fb_getinfo,		radeon_fb_helper_getinfo),
+
 	DEVMETHOD_END
 };
 
@@ -512,3 +526,4 @@ MODULE_DEPEND(radeonkms, agp, 1, 1, 1);
 MODULE_DEPEND(radeonkms, iicbus, 1, 1, 1);
 MODULE_DEPEND(radeonkms, iic, 1, 1, 1);
 MODULE_DEPEND(radeonkms, iicbb, 1, 1, 1);
+MODULE_DEPEND(radeonkms, firmware, 1, 1, 1);
diff --git a/sys/dev/drm2/radeon/radeon_drv.h b/sys/dev/drm2/radeon/radeon_drv.h
index f33ea189f6e..99c6aa402b0 100644
--- a/sys/dev/drm2/radeon/radeon_drv.h
+++ b/sys/dev/drm2/radeon/radeon_drv.h
@@ -572,7 +572,7 @@ void radeon_unregister_atpx_handler(void);
 #	define RS480_GTW_LAC_EN	        (1 << 25)
 #	define RS480_2LEVEL_GART	(0 << 30)
 #	define RS480_1LEVEL_GART	(1 << 30)
-#	define RS480_PDC_EN	        (1 << 31)
+#	define RS480_PDC_EN	        (1U << 31)
 #define RS480_GART_BASE                 0x2c
 #define RS480_GART_CACHE_CNTRL          0x2e
 #	define RS480_GART_CACHE_INVALIDATE (1 << 0) /* wait for it to clear */
@@ -688,7 +688,7 @@ void radeon_unregister_atpx_handler(void);
 #       define R300_SUBPIXEL_1_12       (0 << 16)
 #       define R300_SUBPIXEL_1_16       (1 << 16)
 #define R300_DST_PIPE_CONFIG            0x170c
-#       define R300_PIPE_AUTO_CONFIG    (1 << 31)
+#       define R300_PIPE_AUTO_CONFIG    (1U << 31)
 #define R300_RB2D_DSTCACHE_MODE         0x3428
 #       define R300_DC_AUTOFLUSH_ENABLE (1 << 8)
 #       define R300_DC_DC_DISABLE_IGNORE_PE (1 << 17)
@@ -720,8 +720,8 @@ void radeon_unregister_atpx_handler(void);
 #define RADEON_DST_PITCH_OFFSET_C	0x1c80
 #	define RADEON_DST_TILE_LINEAR		(0 << 30)
 #	define RADEON_DST_TILE_MACRO		(1 << 30)
-#	define RADEON_DST_TILE_MICRO		(2 << 30)
-#	define RADEON_DST_TILE_BOTH		(3 << 30)
+#	define RADEON_DST_TILE_MICRO		(2U << 30)
+#	define RADEON_DST_TILE_BOTH		(3U << 30)
 
 #define RADEON_SCRATCH_REG0		0x15e0
 #define RADEON_SCRATCH_REG1		0x15e4
@@ -815,7 +815,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #	define R300_RB2D_DC_FLUSH		(3 << 0)
 #	define R300_RB2D_DC_FREE		(3 << 2)
 #	define R300_RB2D_DC_FLUSH_ALL		0xf
-#	define R300_RB2D_DC_BUSY		(1 << 31)
+#	define R300_RB2D_DC_BUSY		(1U << 31)
 #define RADEON_RB3D_CNTL		0x1c3c
 #	define RADEON_ALPHA_BLEND_ENABLE	(1 << 0)
 #	define RADEON_PLANE_MASK_ENABLE		(1 << 1)
@@ -837,16 +837,16 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #	define RADEON_RB3D_ZC_FLUSH		(1 << 0)
 #	define RADEON_RB3D_ZC_FREE		(1 << 2)
 #	define RADEON_RB3D_ZC_FLUSH_ALL		0x5
-#	define RADEON_RB3D_ZC_BUSY		(1 << 31)
+#	define RADEON_RB3D_ZC_BUSY		(1U << 31)
 #define R300_ZB_ZCACHE_CTLSTAT                  0x4f18
 #	define R300_ZC_FLUSH		        (1 << 0)
 #	define R300_ZC_FREE		        (1 << 1)
-#	define R300_ZC_BUSY		        (1 << 31)
+#	define R300_ZC_BUSY		        (1U << 31)
 #define RADEON_RB3D_DSTCACHE_CTLSTAT	0x325c
 #	define RADEON_RB3D_DC_FLUSH		(3 << 0)
 #	define RADEON_RB3D_DC_FREE		(3 << 2)
 #	define RADEON_RB3D_DC_FLUSH_ALL		0xf
-#	define RADEON_RB3D_DC_BUSY		(1 << 31)
+#	define RADEON_RB3D_DC_BUSY		(1U << 31)
 #define R300_RB3D_DSTCACHE_CTLSTAT              0x4e4c
 #	define R300_RB3D_DC_FLUSH		(2 << 0)
 #	define R300_RB3D_DC_FREE		(2 << 2)
@@ -862,7 +862,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #	define RADEON_Z_COMPRESSION_ENABLE	(1 << 28)
 #	define RADEON_FORCE_Z_DIRTY		(1 << 29)
 #	define RADEON_Z_WRITE_ENABLE		(1 << 30)
-#	define RADEON_Z_DECOMPRESSION_ENABLE	(1 << 31)
+#	define RADEON_Z_DECOMPRESSION_ENABLE	(1U << 31)
 #define RADEON_RBBM_SOFT_RESET		0x00f0
 #	define RADEON_SOFT_RESET_CP		(1 <<  0)
 #	define RADEON_SOFT_RESET_HI		(1 <<  1)
@@ -916,7 +916,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #	define RADEON_TIM_BUSY		(1 << 25) /* not used on r300 */
 #	define RADEON_GA_BUSY		(1 << 26)
 #	define RADEON_CBA2D_BUSY	(1 << 27)
-#	define RADEON_RBBM_ACTIVE	(1 << 31)
+#	define RADEON_RBBM_ACTIVE	(1U << 31)
 #define RADEON_RE_LINE_PATTERN		0x1cd0
 #define RADEON_RE_MISC			0x26c4
 #define RADEON_RE_TOP_LEFT		0x26c0
@@ -1030,7 +1030,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #define RADEON_CP_RB_CNTL		0x0704
 #	define RADEON_BUF_SWAP_32BIT		(2 << 16)
 #	define RADEON_RB_NO_UPDATE		(1 << 27)
-#	define RADEON_RB_RPTR_WR_ENA		(1 << 31)
+#	define RADEON_RB_RPTR_WR_ENA		(1U << 31)
 #define RADEON_CP_RB_RPTR_ADDR		0x070c
 #define RADEON_CP_RB_RPTR		0x0710
 #define RADEON_CP_RB_WPTR		0x0714
@@ -1166,7 +1166,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #define RADEON_CP_PACKET1_REG0_MASK	0x000007ff
 #define RADEON_CP_PACKET1_REG1_MASK	0x003ff800
 
-#define RADEON_VTX_Z_PRESENT			(1 << 31)
+#define RADEON_VTX_Z_PRESENT			(1U << 31)
 #define RADEON_VTX_PKCOLOR_PRESENT		(1 << 3)
 
 #define RADEON_PRIM_TYPE_NONE			(0 << 0)
@@ -1497,7 +1497,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #define R600_GRBM_STATUS                                       0x8010
 #       define R600_CMDFIFO_AVAIL_MASK                         0x1f
 #       define R700_CMDFIFO_AVAIL_MASK                         0xf
-#       define R600_GUI_ACTIVE                                 (1 << 31)
+#       define R600_GUI_ACTIVE                                 (1U << 31)
 #define R600_GRBM_STATUS2                                      0x8014
 #define R600_GRBM_SOFT_RESET                                   0x8020
 #       define R600_SOFT_RESET_CP                              (1 << 0)
@@ -1520,7 +1520,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #       define R600_RB_BLKSZ(x)                                ((x) << 8)
 #	define R600_BUF_SWAP_32BIT		               (2 << 16)
 #       define R600_RB_NO_UPDATE                               (1 << 27)
-#       define R600_RB_RPTR_WR_ENA                             (1 << 31)
+#       define R600_RB_RPTR_WR_ENA                             (1U << 31)
 #define R600_CP_RB_RPTR_WR                                     0xc108
 #define R600_CP_RB_RPTR_ADDR                                   0xc10c
 #define R600_CP_RB_RPTR_ADDR_HI                                0xc110
@@ -1593,7 +1593,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #define R600_SX_MISC                                           0x28350
 
 #define R600_DB_DEBUG                                          0x9830
-#       define R600_PREZ_MUST_WAIT_FOR_POSTZ_DONE              (1 << 31)
+#       define R600_PREZ_MUST_WAIT_FOR_POSTZ_DONE              (1U << 31)
 #define R600_DB_WATERMARKS                                     0x9838
 #       define R600_DEPTH_FREE(x)                              ((x) << 0)
 #       define R600_DEPTH_FLUSH(x)                             ((x) << 5)
@@ -1699,7 +1699,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #       define R600_SYNC_WALKER                                (1 << 25)
 #       define R600_SYNC_ALIGNER                               (1 << 26)
 #       define R600_BILINEAR_PRECISION_6_BIT                   (0 << 31)
-#       define R600_BILINEAR_PRECISION_8_BIT                   (1 << 31)
+#       define R600_BILINEAR_PRECISION_8_BIT                   (1U << 31)
 
 #define R700_TCP_CNTL                                          0x9610
 
@@ -1773,7 +1773,7 @@ extern u32 radeon_get_scratch(drm_radeon_private_t *dev_priv, int index);
 #       define R600_PERSP_GRADIENT_ENA                         (1 << 28)
 #       define R600_LINEAR_GRADIENT_ENA                        (1 << 29)
 #       define R600_POSITION_SAMPLE                            (1 << 30)
-#       define R600_BARYC_AT_SAMPLE_ENA                        (1 << 31)
+#       define R600_BARYC_AT_SAMPLE_ENA                        (1U << 31)
 #define R600_SPI_PS_IN_CONTROL_1                               0x286d0
 #       define R600_GEN_INDEX_PIX                              (1 << 0)
 #       define R600_GEN_INDEX_PIX_ADDR(x)                      ((x) << 1)
diff --git a/sys/dev/drm2/radeon/radeon_fb.c b/sys/dev/drm2/radeon/radeon_fb.c
index fc247e2bbc6..ec5b2e84df8 100644
--- a/sys/dev/drm2/radeon/radeon_fb.c
+++ b/sys/dev/drm2/radeon/radeon_fb.c
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include <machine/_inttypes.h>
+
 #include <dev/drm2/drmP.h>
 #include <dev/drm2/drm_crtc.h>
 #include <dev/drm2/drm_crtc_helper.h>
@@ -46,7 +48,7 @@ struct radeon_fbdev {
 	struct radeon_device *rdev;
 };
 
-#ifdef DUMBBELL_WIP
+#if defined(__linux__)
 static struct fb_ops radeonfb_ops = {
 	.owner = THIS_MODULE,
 	.fb_check_var = drm_fb_helper_check_var,
@@ -60,7 +62,7 @@ static struct fb_ops radeonfb_ops = {
 	.fb_debug_enter = drm_fb_helper_debug_enter,
 	.fb_debug_leave = drm_fb_helper_debug_leave,
 };
-#endif /* DUMBBELL_WIP */
+#endif
 
 
 int radeon_align_pitch(struct radeon_device *rdev, int width, int bpp, bool tiled)
@@ -191,20 +193,13 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,
 			   struct drm_fb_helper_surface_size *sizes)
 {
 	struct radeon_device *rdev = rfbdev->rdev;
-#ifdef DUMBBELL_WIP
 	struct fb_info *info;
-#endif /* DUMBBELL_WIP */
 	struct drm_framebuffer *fb = NULL;
 	struct drm_mode_fb_cmd2 mode_cmd;
 	struct drm_gem_object *gobj = NULL;
 	struct radeon_bo *rbo = NULL;
-#ifdef DUMBBELL_WIP
-	device_t device = rdev->dev;
-#endif /* DUMBBELL_WIP */
 	int ret;
-#ifdef DUMBBELL_WIP
 	unsigned long tmp;
-#endif /* DUMBBELL_WIP */
 
 	mode_cmd.width = sizes->surface_width;
 	mode_cmd.height = sizes->surface_height;
@@ -224,16 +219,7 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,
 
 	rbo = gem_to_radeon_bo(gobj);
 
-#ifdef DUMBBELL_WIP
-	/* okay we have an object now allocate the framebuffer */
-	info = framebuffer_alloc(0, device);
-	if (info == NULL) {
-		ret = -ENOMEM;
-		goto out_unref;
-	}
-
-	info->par = rfbdev;
-#endif /* DUMBBELL_WIP */
+	info = malloc(sizeof(*info), DRM_MEM_KMS, M_WAITOK | M_ZERO);
 
 	ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
 	if (ret) {
@@ -245,61 +231,29 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev,
 
 	/* setup helper */
 	rfbdev->helper.fb = fb;
-#ifdef DUMBBELL_WIP
 	rfbdev->helper.fbdev = info;
 
-	memset_io(rbo->kptr, 0x0, radeon_bo_size(rbo));
-
-	strcpy(info->fix.id, "radeondrmfb");
-
-	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
-
-	info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
-	info->fbops = &radeonfb_ops;
+	memset(rbo->kptr, 0x0, radeon_bo_size(rbo));
 
 	tmp = radeon_bo_gpu_offset(rbo) - rdev->mc.vram_start;
-	info->fix.smem_start = rdev->mc.aper_base + tmp;
-	info->fix.smem_len = radeon_bo_size(rbo);
-	info->screen_base = rbo->kptr;
-	info->screen_size = radeon_bo_size(rbo);
+	info->fb_size  = radeon_bo_size(rbo);
+	info->fb_bpp = sizes->surface_bpp;
+	info->fb_width = sizes->surface_width;
+	info->fb_height = sizes->surface_height;
+	info->fb_pbase = rdev->mc.aper_base + tmp;
+	info->fb_vbase = (vm_offset_t)rbo->kptr;
 
-	drm_fb_helper_fill_var(info, &rfbdev->helper, sizes->fb_width, sizes->fb_height);
-
-	/* setup aperture base/size for vesafb takeover */
-	info->apertures = alloc_apertures(1);
-	if (!info->apertures) {
-		ret = -ENOMEM;
-		goto out_unref;
-	}
-	info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;
-	info->apertures->ranges[0].size = rdev->mc.aper_size;
-
-	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */
-
-	if (info->screen_base == NULL) {
-		ret = -ENOSPC;
-		goto out_unref;
-	}
-
-	ret = fb_alloc_cmap(&info->cmap, 256, 0);
-	if (ret) {
-		ret = -ENOMEM;
-		goto out_unref;
-	}
-
-	DRM_INFO("fb mappable at 0x%lX\n",  info->fix.smem_start);
+	DRM_INFO("fb mappable at 0x%" PRIXPTR "\n",  info->fb_pbase);
 	DRM_INFO("vram apper at 0x%lX\n",  (unsigned long)rdev->mc.aper_base);
 	DRM_INFO("size %lu\n", (unsigned long)radeon_bo_size(rbo));
 	DRM_INFO("fb depth is %d\n", fb->depth);
 	DRM_INFO("   pitch is %d\n", fb->pitches[0]);
 
-	vga_switcheroo_client_fb_set(rdev->ddev->pdev, info);
-#endif /* DUMBBELL_WIP */
 	return 0;
 
 out_unref:
 	if (rbo) {
-
+		/* TODO? dumbbell@ */
 	}
 	if (fb && ret) {
 		drm_gem_object_unreference(gobj);
@@ -332,21 +286,13 @@ void radeon_fb_output_poll_changed(struct radeon_device *rdev)
 
 static int radeon_fbdev_destroy(struct drm_device *dev, struct radeon_fbdev *rfbdev)
 {
-#ifdef DUMBBELL_WIP
 	struct fb_info *info;
-#endif /* DUMBBELL_WIP */
 	struct radeon_framebuffer *rfb = &rfbdev->rfb;
 
-#ifdef DUMBBELL_WIP
 	if (rfbdev->helper.fbdev) {
 		info = rfbdev->helper.fbdev;
-
-		unregister_framebuffer(info);
-		if (info->cmap.len)
-			fb_dealloc_cmap(&info->cmap);
-		framebuffer_release(info);
+		free(info, DRM_MEM_KMS);
 	}
-#endif /* DUMBBELL_WIP */
 
 	if (rfb->obj) {
 		DRM_UNLOCK(dev); /* Work around lock recursion. dumbbell@ */
@@ -431,3 +377,22 @@ bool radeon_fbdev_robj_is_fb(struct radeon_device *rdev, struct radeon_bo *robj)
 		return true;
 	return false;
 }
+
+struct fb_info *
+radeon_fb_helper_getinfo(device_t kdev)
+{
+	struct drm_device *dev;
+	struct radeon_device *rdev;
+	struct radeon_fbdev *rfbdev;
+	struct fb_info *info;
+
+	dev = device_get_softc(kdev);
+	rdev = dev->dev_private;
+	rfbdev = rdev->mode_info.rfbdev;
+	if (rfbdev == NULL)
+		return (NULL);
+
+	info = rfbdev->helper.fbdev;
+
+	return (info);
+}
diff --git a/sys/dev/drm2/radeon/radeon_gem.c b/sys/dev/drm2/radeon/radeon_gem.c
index 390298edfd4..e8975bd3f03 100644
--- a/sys/dev/drm2/radeon/radeon_gem.c
+++ b/sys/dev/drm2/radeon/radeon_gem.c
@@ -567,6 +567,7 @@ int radeon_mode_dumb_create(struct drm_file *file_priv,
 	if (r)
 		return -ENOMEM;
 
+	handle = 0;
 	r = drm_gem_handle_create(file_priv, gobj, &handle);
 	/* drop reference from allocate - handle holds it now */
 	drm_gem_object_unreference_unlocked(gobj);
diff --git a/sys/dev/drm2/radeon/radeon_pm.c b/sys/dev/drm2/radeon/radeon_pm.c
index 47042dbd8e2..0caa1b74024 100644
--- a/sys/dev/drm2/radeon/radeon_pm.c
+++ b/sys/dev/drm2/radeon/radeon_pm.c
@@ -248,7 +248,7 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)
 	    (rdev->pm.requested_power_state_index == rdev->pm.current_power_state_index))
 		return;
 
-	DRM_LOCK(rdev->ddev);
+	//DRM_LOCK(rdev->ddev); XXX Recursion, already locked in drm_attach/drm_load -- dumbbell@
 	sx_xlock(&rdev->pm.mclk_lock);
 	sx_xlock(&rdev->ring_lock);
 
@@ -263,7 +263,7 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)
 			/* needs a GPU reset dont reset here */
 			sx_xunlock(&rdev->ring_lock);
 			sx_xunlock(&rdev->pm.mclk_lock);
-			DRM_UNLOCK(rdev->ddev);
+			//DRM_UNLOCK(rdev->ddev); XXX Recursion, already locked in drm_attach/drm_load -- dumbbell@
 			return;
 		}
 	}
@@ -299,7 +299,7 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)
 
 	sx_xunlock(&rdev->ring_lock);
 	sx_xunlock(&rdev->pm.mclk_lock);
-	DRM_UNLOCK(rdev->ddev);
+	//DRM_UNLOCK(rdev->ddev); XXX Recursion, already locked in drm_attach/drm_load -- dumbbell@
 }
 
 static void radeon_pm_print_states(struct radeon_device *rdev)
diff --git a/sys/dev/drm2/radeon/radeon_reg.h b/sys/dev/drm2/radeon/radeon_reg.h
index 8697e0f27e7..22ab717f018 100644
--- a/sys/dev/drm2/radeon/radeon_reg.h
+++ b/sys/dev/drm2/radeon/radeon_reg.h
@@ -361,7 +361,7 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_CG_NO1_DEBUG_MASK     (0x1f << 24)
 #       define RADEON_DYN_STOP_MODE_MASK    (7 << 21)
 #       define RADEON_TVPLL_PWRMGT_OFF      (1 << 30)
-#       define RADEON_TVCLK_TURNOFF         (1 << 31)
+#       define RADEON_TVCLK_TURNOFF         (1U << 31)
 #define RADEON_PLL_PWRMGT_CNTL              0x0015 /* PLL */
 #	define RADEON_PM_MODE_SEL           (1 << 13)
 #       define RADEON_TCL_BYPASS_DISABLE    (1 << 20)
@@ -585,13 +585,13 @@ __FBSDID("$FreeBSD$");
 #define RADEON_CUR_HORZ_VERT_OFF            0x0268
 #define RADEON_CUR_HORZ_VERT_POSN           0x0264
 #define RADEON_CUR_OFFSET                   0x0260
-#       define RADEON_CUR_LOCK              (1 << 31)
+#       define RADEON_CUR_LOCK              (1U << 31)
 #define RADEON_CUR2_CLR0                    0x036c
 #define RADEON_CUR2_CLR1                    0x0370
 #define RADEON_CUR2_HORZ_VERT_OFF           0x0368
 #define RADEON_CUR2_HORZ_VERT_POSN          0x0364
 #define RADEON_CUR2_OFFSET                  0x0360
-#       define RADEON_CUR2_LOCK             (1 << 31)
+#       define RADEON_CUR2_LOCK             (1U << 31)
 
 #define RADEON_DAC_CNTL                     0x0058
 #       define RADEON_DAC_RANGE_CNTL        (3 <<  0)
@@ -670,7 +670,7 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_TV_DAC_BDACPD         (1 <<  26)
 #       define RADEON_TV_DAC_RDACDET        (1 << 29)
 #       define RADEON_TV_DAC_GDACDET        (1 << 30)
-#       define RADEON_TV_DAC_BDACDET        (1 << 31)
+#       define RADEON_TV_DAC_BDACDET        (1U << 31)
 #       define R420_TV_DAC_DACADJ_MASK      (0x1f <<  20)
 #       define R420_TV_DAC_RDACPD           (1 <<  25)
 #       define R420_TV_DAC_GDACPD           (1 <<  26)
@@ -745,7 +745,7 @@ __FBSDID("$FreeBSD$");
 #define RADEON_DP_CNTL_XDIR_YDIR_YMAJOR     0x16d0
 #       define RADEON_DST_Y_MAJOR             (1 <<  2)
 #       define RADEON_DST_Y_DIR_TOP_TO_BOTTOM (1 << 15)
-#       define RADEON_DST_X_DIR_LEFT_TO_RIGHT (1 << 31)
+#       define RADEON_DST_X_DIR_LEFT_TO_RIGHT (1U << 31)
 #define RADEON_DP_DATATYPE                  0x16c4
 #       define RADEON_HOST_BIG_ENDIAN_EN    (1 << 29)
 #define RADEON_DP_GUI_MASTER_CNTL           0x146c
@@ -854,8 +854,8 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_PITCH_SHIFT           21
 #       define RADEON_DST_TILE_LINEAR       (0 << 30)
 #       define RADEON_DST_TILE_MACRO        (1 << 30)
-#       define RADEON_DST_TILE_MICRO        (2 << 30)
-#       define RADEON_DST_TILE_BOTH         (3 << 30)
+#       define RADEON_DST_TILE_MICRO        (2U << 30)
+#       define RADEON_DST_TILE_BOTH         (3U << 30)
 #define RADEON_DST_WIDTH                    0x140c
 #define RADEON_DST_WIDTH_HEIGHT             0x1598
 #define RADEON_DST_WIDTH_X                  0x1588
@@ -1230,7 +1230,7 @@ __FBSDID("$FreeBSD$");
 #define RADEON_MIN_GRANT                    0x0f3e /* PCI */
 #define RADEON_MM_DATA                      0x0004
 #define RADEON_MM_INDEX                     0x0000
-#	define RADEON_MM_APER		(1 << 31)
+#	define RADEON_MM_APER		(1U << 31)
 #define RADEON_MPLL_CNTL                    0x000e /* PLL */
 #define RADEON_MPP_TB_CONFIG                0x01c0 /* ? */
 #define RADEON_MPP_GP_CONFIG                0x01c8 /* ? */
@@ -1600,12 +1600,12 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_SOFT_RESET_HDP        (1 <<  7)
 #define RADEON_RBBM_STATUS                  0x0e40
 #       define RADEON_RBBM_FIFOCNT_MASK     0x007f
-#       define RADEON_RBBM_ACTIVE           (1 << 31)
+#       define RADEON_RBBM_ACTIVE           (1U << 31)
 #define RADEON_RB2D_DSTCACHE_CTLSTAT        0x342c
 #       define RADEON_RB2D_DC_FLUSH         (3 << 0)
 #       define RADEON_RB2D_DC_FREE          (3 << 2)
 #       define RADEON_RB2D_DC_FLUSH_ALL     0xf
-#       define RADEON_RB2D_DC_BUSY          (1 << 31)
+#       define RADEON_RB2D_DC_BUSY          (1U << 31)
 #define RADEON_RB2D_DSTCACHE_MODE           0x3428
 #define RADEON_DSTCACHE_CTLSTAT             0x1714
 
@@ -1631,7 +1631,7 @@ __FBSDID("$FreeBSD$");
 # define RADEON_RB3D_DC_FLUSH                   (3 << 0)
 # define RADEON_RB3D_DC_FREE                    (3 << 2)
 # define RADEON_RB3D_DC_FLUSH_ALL               0xf
-# define RADEON_RB3D_DC_BUSY                    (1 << 31)
+# define RADEON_RB3D_DC_BUSY                    (1U << 31)
 
 #define RADEON_REG_BASE                     0x0f18 /* PCI */
 #define RADEON_REGPROG_INF                  0x0f09 /* PCI */
@@ -1854,7 +1854,7 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_WAIT_VAP_IDLE         (1 << 28)
 #       define RADEON_WAIT_BOTH_CRTC_PFLIP  (1 << 30)
 #       define RADEON_ENG_DISPLAY_SELECT_CRTC0    (0 << 31)
-#       define RADEON_ENG_DISPLAY_SELECT_CRTC1    (1 << 31)
+#       define RADEON_ENG_DISPLAY_SELECT_CRTC1    (1U << 31)
 
 #define RADEON_X_MPLL_REF_FB_DIV            0x000a /* PLL */
 #define RADEON_XCLK_CNTL                    0x000d /* PLL */
@@ -1896,7 +1896,7 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_BUMPED_MAP_T2         (2 << 27)
 #       define RADEON_TEX_3D_ENABLE_0       (1 << 29)
 #       define RADEON_TEX_3D_ENABLE_1       (1 << 30)
-#       define RADEON_MC_ENABLE             (1 << 31)
+#       define RADEON_MC_ENABLE             (1U << 31)
 #define RADEON_PP_FOG_COLOR                 0x1c18
 #       define RADEON_FOG_COLOR_MASK        0x00ffffff
 #       define RADEON_FOG_VERTEX            (0 << 24)
@@ -2091,7 +2091,7 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_TEX_VSIZE_SHIFT       16
 #       define RADEON_SIGNED_RGB_MASK       (1 << 30)
 #       define RADEON_SIGNED_RGB_SHIFT      30
-#       define RADEON_SIGNED_ALPHA_MASK     (1 << 31)
+#       define RADEON_SIGNED_ALPHA_MASK     (1U << 31)
 #       define RADEON_SIGNED_ALPHA_SHIFT    31
 #define RADEON_PP_TEX_PITCH_0               0x1d08  /* NPOT */
 #define RADEON_PP_TEX_PITCH_1               0x1d10  /* NPOT */
@@ -2558,7 +2558,7 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_TCL_VTX_Z1                 (1 << 28)
 #       define RADEON_TCL_VTX_W1                 (1 << 29)
 #       define RADEON_TCL_VTX_NORM1              (1 << 30)
-#       define RADEON_TCL_VTX_Z0                 (1 << 31)
+#       define RADEON_TCL_VTX_Z0                 (1U << 31)
 
 #define RADEON_SE_TCL_OUTPUT_VTX_SEL        0x2258
 #       define RADEON_TCL_COMPUTE_XYZW           (1 << 0)
@@ -2667,7 +2667,7 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_CULL_FRONT_IS_CCW            (1 << 28)
 #       define RADEON_CULL_FRONT                   (1 << 29)
 #       define RADEON_CULL_BACK                    (1 << 30)
-#       define RADEON_FORCE_W_TO_ONE               (1 << 31)
+#       define RADEON_FORCE_W_TO_ONE               (1U << 31)
 
 #define RADEON_SE_VPORT_XSCALE              0x1d98
 #define RADEON_SE_VPORT_XOFFSET             0x1d9c
@@ -3306,7 +3306,7 @@ __FBSDID("$FreeBSD$");
 #	define RADEON_MAX_FETCH_SHIFT		18
 #	define RADEON_MAX_FETCH_MASK		(0x3 << 18)
 #	define RADEON_RB_NO_UPDATE		(1 << 27)
-#	define RADEON_RB_RPTR_WR_ENA		(1 << 31)
+#	define RADEON_RB_RPTR_WR_ENA		(1U << 31)
 #define RADEON_CP_RB_RPTR_ADDR              0x070c
 #define RADEON_CP_RB_RPTR                   0x0710
 #define RADEON_CP_RB_WPTR                   0x0714
@@ -3320,7 +3320,7 @@ __FBSDID("$FreeBSD$");
 #       define R600_RB_BUFSZ(x)             ((x) << 0)
 #       define R600_RB_BLKSZ(x)             ((x) << 8)
 #       define R600_RB_NO_UPDATE            (1 << 27)
-#       define R600_RB_RPTR_WR_ENA          (1 << 31)
+#       define R600_RB_RPTR_WR_ENA          (1U << 31)
 #define R600_CP_RB_RPTR_WR                  0xc108
 #define R600_CP_RB_RPTR_ADDR                0xc10c
 #define R600_CP_RB_RPTR_ADDR_HI             0xc110
@@ -3519,7 +3519,7 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_TV_FIFO_CE_EN              (1 << 10)
 #       define RADEON_RE_SYNC_NOW_SEL_MASK       (3 << 14)
 #       define RADEON_TVCLK_ALWAYS_ONb           (1 << 30)
-#	define RADEON_TV_ON			 (1 << 31)
+#	define RADEON_TV_ON			 (1U << 31)
 #define RADEON_TV_PRE_DAC_MUX_CNTL               0x0888
 #       define RADEON_Y_RED_EN                   (1 << 0)
 #       define RADEON_C_GRN_EN                   (1 << 1)
@@ -3651,7 +3651,7 @@ __FBSDID("$FreeBSD$");
 #       define RADEON_TVPVG_MASK                 (7 << 11)
 #       define RADEON_TVPDC_SHIFT                14
 #       define RADEON_TVPDC_MASK                 (3 << 14)
-#       define RADEON_TVPLL_TEST_DIS             (1 << 31)
+#       define RADEON_TVPLL_TEST_DIS             (1U << 31)
 #       define RADEON_TVCLK_SRC_SEL_TVPLL        (1 << 30)
 
 #define RS400_DISP2_REQ_CNTL1			0xe30
diff --git a/sys/dev/drm2/radeon/rv770d.h b/sys/dev/drm2/radeon/rv770d.h
index 1f2c23c554f..e281444f833 100644
--- a/sys/dev/drm2/radeon/rv770d.h
+++ b/sys/dev/drm2/radeon/rv770d.h
@@ -82,7 +82,7 @@ __FBSDID("$FreeBSD$");
 #define		RB_BUFSZ(x)					((x) << 0)
 #define		RB_BLKSZ(x)					((x) << 8)
 #define		RB_NO_UPDATE					(1 << 27)
-#define		RB_RPTR_WR_ENA					(1 << 31)
+#define		RB_RPTR_WR_ENA					(1U << 31)
 #define		BUF_SWAP_32BIT					(2 << 16)
 #define	CP_RB_RPTR					0x8700
 #define	CP_RB_RPTR_ADDR					0xC10C
@@ -312,7 +312,7 @@ __FBSDID("$FreeBSD$");
 #define		SYNC_WALKER					(1 << 25)
 #define		SYNC_ALIGNER					(1 << 26)
 #define		BILINEAR_PRECISION_6_BIT			(0 << 31)
-#define		BILINEAR_PRECISION_8_BIT			(1 << 31)
+#define		BILINEAR_PRECISION_8_BIT			(1U << 31)
 
 #define	TCP_CNTL					0x9610
 #define	TCP_CHAN_STEER					0x9614
@@ -537,7 +537,7 @@ __FBSDID("$FreeBSD$");
 #       define AFMT_AUDIO_CRC_EN             (1 << 0)
 #define AFMT_RAMP_CONTROL0                   0x74e0
 #       define AFMT_RAMP_MAX_COUNT(x)        (((x) & 0xffffff) << 0)
-#       define AFMT_RAMP_DATA_SIGN           (1 << 31)
+#       define AFMT_RAMP_DATA_SIGN           (1U << 31)
 #define AFMT_RAMP_CONTROL1                   0x74e4
 #       define AFMT_RAMP_MIN_COUNT(x)        (((x) & 0xffffff) << 0)
 #       define AFMT_AUDIO_TEST_CH_DISABLE(x) (((x) & 0xff) << 24)
@@ -622,7 +622,7 @@ __FBSDID("$FreeBSD$");
 #       define PIN1_AUDIO_ENABLED                         (1 << 25)
 #       define PIN2_AUDIO_ENABLED                         (1 << 26)
 #       define PIN3_AUDIO_ENABLED                         (1 << 27)
-#       define AUDIO_ENABLED                              (1 << 31)
+#       define AUDIO_ENABLED                              (1U << 31)
 
 
 #define D1GRPH_PRIMARY_SURFACE_ADDRESS                    0x6110
diff --git a/sys/dev/drm2/radeon/sid.h b/sys/dev/drm2/radeon/sid.h
index 028916f17eb..7aa21c1442a 100644
--- a/sys/dev/drm2/radeon/sid.h
+++ b/sys/dev/drm2/radeon/sid.h
@@ -199,7 +199,7 @@ __FBSDID("$FreeBSD$");
 
 #define	MC_SEQ_TRAIN_WAKEUP_CNTL			0x2808
 #define		TRAIN_DONE_D0      			(1 << 30)
-#define		TRAIN_DONE_D1      			(1 << 31)
+#define		TRAIN_DONE_D1      			(1U << 31)
 
 #define MC_SEQ_SUP_CNTL           			0x28c8
 #define		RUN_MASK      				(1 << 0)
@@ -227,7 +227,7 @@ __FBSDID("$FreeBSD$");
 #       define IH_WPTR_WRITEBACK_ENABLE                   (1 << 8)
 #       define IH_WPTR_WRITEBACK_TIMER(x)                 ((x) << 9) /* log2 */
 #       define IH_WPTR_OVERFLOW_ENABLE                    (1 << 16)
-#       define IH_WPTR_OVERFLOW_CLEAR                     (1 << 31)
+#       define IH_WPTR_OVERFLOW_CLEAR                     (1U << 31)
 #define IH_RB_BASE                                        0x3e04
 #define IH_RB_RPTR                                        0x3e08
 #define IH_RB_WPTR                                        0x3e0c
@@ -414,7 +414,7 @@ __FBSDID("$FreeBSD$");
 #define		CP_COHERENCY_BUSY      				(1 << 28)
 #define		CP_BUSY 					(1 << 29)
 #define		CB_BUSY 					(1 << 30)
-#define		GUI_ACTIVE					(1 << 31)
+#define		GUI_ACTIVE					(1U << 31)
 #define	GRBM_STATUS_SE0					0x8014
 #define	GRBM_STATUS_SE1					0x8018
 #define		SE_DB_CLEAN					(1 << 1)
@@ -427,7 +427,7 @@ __FBSDID("$FreeBSD$");
 #define		SE_SPI_BUSY					(1 << 27)
 #define		SE_SC_BUSY					(1 << 29)
 #define		SE_DB_BUSY					(1 << 30)
-#define		SE_CB_BUSY					(1 << 31)
+#define		SE_CB_BUSY					(1U << 31)
 
 #define	GRBM_SOFT_RESET					0x8020
 #define		SOFT_RESET_CP					(1 << 0)
@@ -451,7 +451,7 @@ __FBSDID("$FreeBSD$");
 #define		SE_INDEX(x)     			((x) << 16)
 #define		SH_BROADCAST_WRITES      		(1 << 29)
 #define		INSTANCE_BROADCAST_WRITES      		(1 << 30)
-#define		SE_BROADCAST_WRITES      		(1 << 31)
+#define		SE_BROADCAST_WRITES      		(1U << 31)
 
 #define GRBM_INT_CNTL                                   0x8060
 #       define RDERR_INT_ENABLE                         (1 << 0)
@@ -672,7 +672,7 @@ __FBSDID("$FreeBSD$");
 #define		RB_BLKSZ(x)					((x) << 8)
 #define		BUF_SWAP_32BIT					(2 << 16)
 #define		RB_NO_UPDATE					(1 << 27)
-#define		RB_RPTR_WR_ENA					(1 << 31)
+#define		RB_RPTR_WR_ENA					(1U << 31)
 
 #define	CP_RB0_RPTR_ADDR				0xC10C
 #define	CP_RB0_RPTR_ADDR_HI				0xC110
@@ -706,7 +706,7 @@ __FBSDID("$FreeBSD$");
 #       define TIME_STAMP_INT_ENABLE                    (1 << 26)
 #       define CP_RINGID2_INT_ENABLE                    (1 << 29)
 #       define CP_RINGID1_INT_ENABLE                    (1 << 30)
-#       define CP_RINGID0_INT_ENABLE                    (1 << 31)
+#       define CP_RINGID0_INT_ENABLE                    (1U << 31)
 #define CP_INT_STATUS_RING0                             0xC1B4
 #define CP_INT_STATUS_RING1                             0xC1B8
 #define CP_INT_STATUS_RING2                             0xC1BC
@@ -714,7 +714,7 @@ __FBSDID("$FreeBSD$");
 #       define TIME_STAMP_INT_STAT                      (1 << 26)
 #       define CP_RINGID2_INT_STAT                      (1 << 29)
 #       define CP_RINGID1_INT_STAT                      (1 << 30)
-#       define CP_RINGID0_INT_STAT                      (1 << 31)
+#       define CP_RINGID0_INT_STAT                      (1U << 31)
 
 #define	CP_DEBUG					0xC1FC
 
@@ -890,7 +890,7 @@ __FBSDID("$FreeBSD$");
 		 * 1 - GDS
 		 * 2 - DATA
 		 */
-#              define PACKET3_CP_DMA_CP_SYNC       (1 << 31)
+#              define PACKET3_CP_DMA_CP_SYNC       (1U << 31)
 /* COMMAND */
 #              define PACKET3_CP_DMA_DIS_WC        (1 << 21)
 #              define PACKET3_CP_DMA_CMD_SRC_SWAP(x) ((x) << 23)
diff --git a/sys/dev/drm2/ttm/ttm_bo.c b/sys/dev/drm2/ttm/ttm_bo.c
index 3b135404ed6..c1c4fbf57e1 100644
--- a/sys/dev/drm2/ttm/ttm_bo.c
+++ b/sys/dev/drm2/ttm/ttm_bo.c
@@ -216,7 +216,7 @@ int ttm_bo_reserve_nolru(struct ttm_buffer_object *bo,
 			 * Already reserved by a thread that will not back
 			 * off for us. We need to back off.
 			 */
-			if (unlikely(sequence - bo->val_seq < (1 << 31)))
+			if (unlikely(sequence - bo->val_seq < (1U << 31)))
 				return -EAGAIN;
 		}
 
@@ -235,7 +235,7 @@ int ttm_bo_reserve_nolru(struct ttm_buffer_object *bo,
 		 * Wake up waiters that may need to recheck for deadlock,
 		 * if we decreased the sequence number.
 		 */
-		if (unlikely((bo->val_seq - sequence < (1 << 31))
+		if (unlikely((bo->val_seq - sequence < (1U << 31))
 			     || !bo->seq_valid))
 			wake_up = true;
 
@@ -313,7 +313,7 @@ int ttm_bo_reserve_slowpath_nolru(struct ttm_buffer_object *bo,
 			return ret;
 	}
 
-	if ((bo->val_seq - sequence < (1 << 31)) || !bo->seq_valid)
+	if ((bo->val_seq - sequence < (1U << 31)) || !bo->seq_valid)
 		wake_up = true;
 
 	/**
diff --git a/sys/dev/e1000/e1000_80003es2lan.c b/sys/dev/e1000/e1000_80003es2lan.c
index bdbb31cfdbb..076e02be9b0 100644
--- a/sys/dev/e1000/e1000_80003es2lan.c
+++ b/sys/dev/e1000/e1000_80003es2lan.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2011, Intel Corporation 
+  Copyright (c) 2001-2013, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -32,16 +32,12 @@
 ******************************************************************************/
 /*$FreeBSD$*/
 
-/*
- * 80003ES2LAN Gigabit Ethernet Controller (Copper)
+/* 80003ES2LAN Gigabit Ethernet Controller (Copper)
  * 80003ES2LAN Gigabit Ethernet Controller (Serdes)
  */
 
 #include "e1000_api.h"
 
-static s32  e1000_init_phy_params_80003es2lan(struct e1000_hw *hw);
-static s32  e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw);
-static s32  e1000_init_mac_params_80003es2lan(struct e1000_hw *hw);
 static s32  e1000_acquire_phy_80003es2lan(struct e1000_hw *hw);
 static void e1000_release_phy_80003es2lan(struct e1000_hw *hw);
 static s32  e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw);
@@ -71,14 +67,12 @@ static s32  e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
 					    u16 *data);
 static s32  e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
 					     u16 data);
-static s32  e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw);
 static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw);
 static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask);
 static s32  e1000_read_mac_addr_80003es2lan(struct e1000_hw *hw);
 static void e1000_power_down_phy_copper_80003es2lan(struct e1000_hw *hw);
 
-/*
- * A table for the GG82563 cable length where the range is defined
+/* A table for the GG82563 cable length where the range is defined
  * with a lower bound at "index" and the upper bound at
  * "index + 5".
  */
@@ -95,13 +89,13 @@ static const u16 e1000_gg82563_cable_length_table[] = {
 static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw)
 {
 	struct e1000_phy_info *phy = &hw->phy;
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 
 	DEBUGFUNC("e1000_init_phy_params_80003es2lan");
 
 	if (hw->phy.media_type != e1000_media_type_copper) {
 		phy->type = e1000_phy_none;
-		goto out;
+		return E1000_SUCCESS;
 	} else {
 		phy->ops.power_up = e1000_power_up_phy_copper;
 		phy->ops.power_down = e1000_power_down_phy_copper_80003es2lan;
@@ -133,12 +127,9 @@ static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw)
 	ret_val = e1000_get_phy_id(hw);
 
 	/* Verify phy id */
-	if (phy->id != GG82563_E_PHY_ID) {
-		ret_val = -E1000_ERR_PHY;
-		goto out;
-	}
+	if (phy->id != GG82563_E_PHY_ID)
+		return -E1000_ERR_PHY;
 
-out:
 	return ret_val;
 }
 
@@ -176,8 +167,7 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw)
 	size = (u16)((eecd & E1000_EECD_SIZE_EX_MASK) >>
 		     E1000_EECD_SIZE_EX_SHIFT);
 
-	/*
-	 * Added to a constant, "size" becomes the left-shift value
+	/* Added to a constant, "size" becomes the left-shift value
 	 * for setting word_size.
 	 */
 	size += NVM_WORD_SIZE_BASE_SHIFT;
@@ -234,8 +224,8 @@ static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw)
 	/* FWSM register */
 	mac->has_fwsm = TRUE;
 	/* ARC supported; valid only if manageability features are enabled. */
-	mac->arc_subsystem_valid = (E1000_READ_REG(hw, E1000_FWSM) &
-				    E1000_FWSM_MODE_MASK) ? TRUE : FALSE;
+	mac->arc_subsystem_valid = !!(E1000_READ_REG(hw, E1000_FWSM) &
+				      E1000_FWSM_MODE_MASK);
 	/* Adaptive IFS not supported */
 	mac->adaptive_ifs = FALSE;
 
@@ -377,14 +367,13 @@ static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw)
 
 	ret_val = e1000_acquire_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	ret_val = e1000_acquire_nvm_generic(hw);
 
 	if (ret_val)
 		e1000_release_swfw_sync_80003es2lan(hw, E1000_SWFW_EEP_SM);
 
-out:
 	return ret_val;
 }
 
@@ -415,23 +404,20 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
 	u32 swfw_sync;
 	u32 swmask = mask;
 	u32 fwmask = mask << 16;
-	s32 ret_val = E1000_SUCCESS;
-	s32 i = 0, timeout = 50;
+	s32 i = 0;
+	s32 timeout = 50;
 
 	DEBUGFUNC("e1000_acquire_swfw_sync_80003es2lan");
 
 	while (i < timeout) {
-		if (e1000_get_hw_semaphore_generic(hw)) {
-			ret_val = -E1000_ERR_SWFW_SYNC;
-			goto out;
-		}
+		if (e1000_get_hw_semaphore_generic(hw))
+			return -E1000_ERR_SWFW_SYNC;
 
 		swfw_sync = E1000_READ_REG(hw, E1000_SW_FW_SYNC);
 		if (!(swfw_sync & (fwmask | swmask)))
 			break;
 
-		/*
-		 * Firmware currently using resource (fwmask)
+		/* Firmware currently using resource (fwmask)
 		 * or other software thread using resource (swmask)
 		 */
 		e1000_put_hw_semaphore_generic(hw);
@@ -441,8 +427,7 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
 
 	if (i == timeout) {
 		DEBUGOUT("Driver can't access resource, SW_FW_SYNC timeout.\n");
-		ret_val = -E1000_ERR_SWFW_SYNC;
-		goto out;
+		return -E1000_ERR_SWFW_SYNC;
 	}
 
 	swfw_sync |= swmask;
@@ -450,8 +435,7 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask)
 
 	e1000_put_hw_semaphore_generic(hw);
 
-out:
-	return ret_val;
+	return E1000_SUCCESS;
 }
 
 /**
@@ -497,14 +481,13 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
 
 	ret_val = e1000_acquire_phy_80003es2lan(hw);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	/* Select Configuration Page */
 	if ((offset & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
 		page_select = GG82563_PHY_PAGE_SELECT;
 	} else {
-		/*
-		 * Use Alternative Page Select register to access
+		/* Use Alternative Page Select register to access
 		 * registers 30 and 31
 		 */
 		page_select = GG82563_PHY_PAGE_SELECT_ALT;
@@ -514,12 +497,11 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
 	ret_val = e1000_write_phy_reg_mdic(hw, page_select, temp);
 	if (ret_val) {
 		e1000_release_phy_80003es2lan(hw);
-		goto out;
+		return ret_val;
 	}
 
-	if (hw->dev_spec._80003es2lan.mdic_wa_enable == TRUE) {
-		/*
-		 * The "ready" bit in the MDIC register may be incorrectly set
+	if (hw->dev_spec._80003es2lan.mdic_wa_enable) {
+		/* The "ready" bit in the MDIC register may be incorrectly set
 		 * before the device has completed the "Page Select" MDI
 		 * transaction.  So we wait 200us after each MDI command...
 		 */
@@ -529,9 +511,8 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
 		ret_val = e1000_read_phy_reg_mdic(hw, page_select, &temp);
 
 		if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
-			ret_val = -E1000_ERR_PHY;
 			e1000_release_phy_80003es2lan(hw);
-			goto out;
+			return -E1000_ERR_PHY;
 		}
 
 		usec_delay(200);
@@ -549,7 +530,6 @@ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
 
 	e1000_release_phy_80003es2lan(hw);
 
-out:
 	return ret_val;
 }
 
@@ -572,14 +552,13 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
 
 	ret_val = e1000_acquire_phy_80003es2lan(hw);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	/* Select Configuration Page */
 	if ((offset & MAX_PHY_REG_ADDRESS) < GG82563_MIN_ALT_REG) {
 		page_select = GG82563_PHY_PAGE_SELECT;
 	} else {
-		/*
-		 * Use Alternative Page Select register to access
+		/* Use Alternative Page Select register to access
 		 * registers 30 and 31
 		 */
 		page_select = GG82563_PHY_PAGE_SELECT_ALT;
@@ -589,12 +568,11 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
 	ret_val = e1000_write_phy_reg_mdic(hw, page_select, temp);
 	if (ret_val) {
 		e1000_release_phy_80003es2lan(hw);
-		goto out;
+		return ret_val;
 	}
 
-	if (hw->dev_spec._80003es2lan.mdic_wa_enable == TRUE) {
-		/*
-		 * The "ready" bit in the MDIC register may be incorrectly set
+	if (hw->dev_spec._80003es2lan.mdic_wa_enable) {
+		/* The "ready" bit in the MDIC register may be incorrectly set
 		 * before the device has completed the "Page Select" MDI
 		 * transaction.  So we wait 200us after each MDI command...
 		 */
@@ -604,9 +582,8 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
 		ret_val = e1000_read_phy_reg_mdic(hw, page_select, &temp);
 
 		if (((u16)offset >> GG82563_PAGE_SHIFT) != temp) {
-			ret_val = -E1000_ERR_PHY;
 			e1000_release_phy_80003es2lan(hw);
-			goto out;
+			return -E1000_ERR_PHY;
 		}
 
 		usec_delay(200);
@@ -624,7 +601,6 @@ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw,
 
 	e1000_release_phy_80003es2lan(hw);
 
-out:
 	return ret_val;
 }
 
@@ -655,7 +631,6 @@ static s32 e1000_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset,
 static s32 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw)
 {
 	s32 timeout = PHY_CFG_TIMEOUT;
-	s32 ret_val = E1000_SUCCESS;
 	u32 mask = E1000_NVM_CFG_DONE_PORT_0;
 
 	DEBUGFUNC("e1000_get_cfg_done_80003es2lan");
@@ -671,12 +646,10 @@ static s32 e1000_get_cfg_done_80003es2lan(struct e1000_hw *hw)
 	}
 	if (!timeout) {
 		DEBUGOUT("MNG configuration cycle has not completed.\n");
-		ret_val = -E1000_ERR_RESET;
-		goto out;
+		return -E1000_ERR_RESET;
 	}
 
-out:
-	return ret_val;
+	return E1000_SUCCESS;
 }
 
 /**
@@ -688,33 +661,32 @@ out:
  **/
 static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 	u16 phy_data;
 	bool link;
 
 	DEBUGFUNC("e1000_phy_force_speed_duplex_80003es2lan");
 
 	if (!(hw->phy.ops.read_reg))
-		goto out;
+		return E1000_SUCCESS;
 
-	/*
-	 * Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
+	/* Clear Auto-Crossover to force MDI manually.  M88E1000 requires MDI
 	 * forced whenever speed and duplex are forced.
 	 */
 	ret_val = hw->phy.ops.read_reg(hw, M88E1000_PHY_SPEC_CTRL, &phy_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	phy_data &= ~GG82563_PSCR_CROSSOVER_MODE_AUTO;
 	ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_SPEC_CTRL, phy_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	DEBUGOUT1("GG82563 PSCR: %X\n", phy_data);
 
 	ret_val = hw->phy.ops.read_reg(hw, PHY_CONTROL, &phy_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	e1000_phy_force_speed_duplex_setup(hw, &phy_data);
 
@@ -723,7 +695,7 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
 
 	ret_val = hw->phy.ops.write_reg(hw, PHY_CONTROL, phy_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	usec_delay(1);
 
@@ -733,32 +705,30 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
 		ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
 						     100000, &link);
 		if (ret_val)
-			goto out;
+			return ret_val;
 
 		if (!link) {
-			/*
-			 * We didn't get link.
+			/* We didn't get link.
 			 * Reset the DSP and cross our fingers.
 			 */
 			ret_val = e1000_phy_reset_dsp_generic(hw);
 			if (ret_val)
-				goto out;
+				return ret_val;
 		}
 
 		/* Try once more */
 		ret_val = e1000_phy_has_link_generic(hw, PHY_FORCE_LIMIT,
 						     100000, &link);
 		if (ret_val)
-			goto out;
+			return ret_val;
 	}
 
 	ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_MAC_SPEC_CTRL,
 				       &phy_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
-	/*
-	 * Resetting the phy means we need to verify the TX_CLK corresponds
+	/* Resetting the phy means we need to verify the TX_CLK corresponds
 	 * to the link speed.  10Mbps -> 2.5MHz, else 25MHz.
 	 */
 	phy_data &= ~GG82563_MSCR_TX_CLK_MASK;
@@ -767,15 +737,13 @@ static s32 e1000_phy_force_speed_duplex_80003es2lan(struct e1000_hw *hw)
 	else
 		phy_data |= GG82563_MSCR_TX_CLK_100MBPS_25;
 
-	/*
-	 * In addition, we must re-enable CRS on Tx for both half and full
+	/* In addition, we must re-enable CRS on Tx for both half and full
 	 * duplex.
 	 */
 	phy_data |= GG82563_MSCR_ASSERT_CRS_ON_TX;
 	ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_MAC_SPEC_CTRL,
 					phy_data);
 
-out:
 	return ret_val;
 }
 
@@ -789,32 +757,29 @@ out:
 static s32 e1000_get_cable_length_80003es2lan(struct e1000_hw *hw)
 {
 	struct e1000_phy_info *phy = &hw->phy;
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 	u16 phy_data, index;
 
 	DEBUGFUNC("e1000_get_cable_length_80003es2lan");
 
 	if (!(hw->phy.ops.read_reg))
-		goto out;
+		return E1000_SUCCESS;
 
 	ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_DSP_DISTANCE, &phy_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	index = phy_data & GG82563_DSPD_CABLE_LENGTH;
 
-	if (index >= GG82563_CABLE_LENGTH_TABLE_SIZE - 5) {
-		ret_val = -E1000_ERR_PHY;
-		goto out;
-	}
+	if (index >= GG82563_CABLE_LENGTH_TABLE_SIZE - 5)
+		return -E1000_ERR_PHY;
 
 	phy->min_cable_length = e1000_gg82563_cable_length_table[index];
 	phy->max_cable_length = e1000_gg82563_cable_length_table[index + 5];
 
 	phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
 
-out:
-	return ret_val;
+	return E1000_SUCCESS;
 }
 
 /**
@@ -855,11 +820,11 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
 {
 	u32 ctrl;
 	s32 ret_val;
+	u16 kum_reg_data;
 
 	DEBUGFUNC("e1000_reset_hw_80003es2lan");
 
-	/*
-	 * Prevent the PCI-E bus from sticking if there is no TLP connection
+	/* Prevent the PCI-E bus from sticking if there is no TLP connection
 	 * on the last TLP read/write transaction when MAC is reset.
 	 */
 	ret_val = e1000_disable_pcie_master_generic(hw);
@@ -878,23 +843,30 @@ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw)
 	ctrl = E1000_READ_REG(hw, E1000_CTRL);
 
 	ret_val = e1000_acquire_phy_80003es2lan(hw);
+	if (ret_val)
+		return ret_val;
+
 	DEBUGOUT("Issuing a global reset to MAC\n");
 	E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_RST);
 	e1000_release_phy_80003es2lan(hw);
 
+	/* Disable IBIST slave mode (far-end loopback) */
+	e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+					&kum_reg_data);
+	kum_reg_data |= E1000_KMRNCTRLSTA_IBIST_DISABLE;
+	e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
+					kum_reg_data);
+
 	ret_val = e1000_get_auto_rd_done_generic(hw);
 	if (ret_val)
 		/* We don't want to continue accessing MAC registers. */
-		goto out;
+		return ret_val;
 
 	/* Clear any pending interrupt events. */
 	E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff);
 	E1000_READ_REG(hw, E1000_ICR);
 
-	ret_val = e1000_check_alt_mac_addr_generic(hw);
-
-out:
-	return ret_val;
+	return e1000_check_alt_mac_addr_generic(hw);
 }
 
 /**
@@ -917,9 +889,9 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
 
 	/* Initialize identification LED */
 	ret_val = mac->ops.id_led_init(hw);
+	/* An error is not fatal and we should not stop init due to this */
 	if (ret_val)
 		DEBUGOUT("Error initializing identification LED\n");
-		/* This is not fatal and we should not stop init due to this */
 
 	/* Disabling VLAN filtering */
 	DEBUGOUT("Initializing the IEEE VLAN\n");
@@ -935,6 +907,8 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
 
 	/* Setup link and flow control */
 	ret_val = mac->ops.setup_link(hw);
+	if (ret_val)
+		return ret_val;
 
 	/* Disable IBIST slave mode (far-end loopback) */
 	e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_INBAND_PARAM,
@@ -945,14 +919,14 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
 
 	/* Set the transmit descriptor write-back policy */
 	reg_data = E1000_READ_REG(hw, E1000_TXDCTL(0));
-	reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-		   E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
+	reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |
+		    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC);
 	E1000_WRITE_REG(hw, E1000_TXDCTL(0), reg_data);
 
 	/* ...for both queues. */
 	reg_data = E1000_READ_REG(hw, E1000_TXDCTL(1));
-	reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-		   E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
+	reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |
+		    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC);
 	E1000_WRITE_REG(hw, E1000_TXDCTL(1), reg_data);
 
 	/* Enable retransmit on late collisions */
@@ -979,18 +953,16 @@ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw)
 	/* default to TRUE to enable the MDIC W/A */
 	hw->dev_spec._80003es2lan.mdic_wa_enable = TRUE;
 
-	ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-						 E1000_KMRNCTRLSTA_OFFSET >>
-						 E1000_KMRNCTRLSTA_OFFSET_SHIFT,
-						 &i);
+	ret_val =
+	    e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET >>
+					    E1000_KMRNCTRLSTA_OFFSET_SHIFT, &i);
 	if (!ret_val) {
 		if ((i & E1000_KMRNCTRLSTA_OPMODE_MASK) ==
 		     E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO)
 			hw->dev_spec._80003es2lan.mdic_wa_enable = FALSE;
 	}
 
-	/*
-	 * Clear all of the statistics registers (clear on read).  It is
+	/* Clear all of the statistics registers (clear on read).  It is
 	 * important that we do this after we have tried to establish link
 	 * because the symbol error count will increment wildly if there
 	 * is no link.
@@ -1037,6 +1009,13 @@ static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw)
 		reg |= (1 << 28);
 	E1000_WRITE_REG(hw, E1000_TARC(1), reg);
 
+	/* Disable IPv6 extension header parsing because some malformed
+	 * IPv6 headers can hang the Rx.
+	 */
+	reg = E1000_READ_REG(hw, E1000_RFCTL);
+	reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
+	E1000_WRITE_REG(hw, E1000_RFCTL, reg);
+
 	return;
 }
 
@@ -1050,14 +1029,14 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
 {
 	struct e1000_phy_info *phy = &hw->phy;
 	s32 ret_val;
-	u32 ctrl_ext;
+	u32 reg;
 	u16 data;
 
 	DEBUGFUNC("e1000_copper_link_setup_gg82563_80003es2lan");
 
 	ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_MAC_SPEC_CTRL, &data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	data |= GG82563_MSCR_ASSERT_CRS_ON_TX;
 	/* Use 25MHz for both link down and 1000Base-T for Tx clock. */
@@ -1065,10 +1044,9 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
 
 	ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_MAC_SPEC_CTRL, data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
-	/*
-	 * Options:
+	/* Options:
 	 *   MDI/MDI-X = 0 (default)
 	 *   0 - Auto for all speeds
 	 *   1 - MDI mode
@@ -1077,7 +1055,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
 	 */
 	ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_SPEC_CTRL, &data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	data &= ~GG82563_PSCR_CROSSOVER_MODE_MASK;
 
@@ -1094,8 +1072,7 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
 		break;
 	}
 
-	/*
-	 * Options:
+	/* Options:
 	 *   disable_polarity_correction = 0 (default)
 	 *       Automatic Correction for Reversed Cable Polarity
 	 *   0 - Disabled
@@ -1107,90 +1084,86 @@ static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw)
 
 	ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_SPEC_CTRL, data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	/* SW Reset the PHY so all changes take effect */
 	ret_val = hw->phy.ops.commit(hw);
 	if (ret_val) {
 		DEBUGOUT("Error Resetting the PHY\n");
-		goto out;
+		return ret_val;
 	}
 
 	/* Bypass Rx and Tx FIFO's */
-	ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-					E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL,
-					E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS |
-					E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS);
+	reg = E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL;
+	data = (E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS |
+		E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS);
+	ret_val = e1000_write_kmrn_reg_80003es2lan(hw, reg, data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
-	ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-				E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE, &data);
+	reg = E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE;
+	ret_val = e1000_read_kmrn_reg_80003es2lan(hw, reg, &data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 	data |= E1000_KMRNCTRLSTA_OPMODE_E_IDLE;
-	ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-				E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE, data);
+	ret_val = e1000_write_kmrn_reg_80003es2lan(hw, reg, data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_SPEC_CTRL_2, &data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	data &= ~GG82563_PSCR2_REVERSE_AUTO_NEG;
 	ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_SPEC_CTRL_2, data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
-	ctrl_ext = E1000_READ_REG(hw, E1000_CTRL_EXT);
-	ctrl_ext &= ~(E1000_CTRL_EXT_LINK_MODE_MASK);
-	E1000_WRITE_REG(hw, E1000_CTRL_EXT, ctrl_ext);
+	reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
+	reg &= ~E1000_CTRL_EXT_LINK_MODE_MASK;
+	E1000_WRITE_REG(hw, E1000_CTRL_EXT, reg);
 
 	ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_PWR_MGMT_CTRL, &data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
-	/*
-	 * Do not init these registers when the HW is in IAMT mode, since the
+	/* Do not init these registers when the HW is in IAMT mode, since the
 	 * firmware will have already initialized them.  We only initialize
 	 * them if the HW is not in IAMT mode.
 	 */
-	if (!(hw->mac.ops.check_mng_mode(hw))) {
+	if (!hw->mac.ops.check_mng_mode(hw)) {
 		/* Enable Electrical Idle on the PHY */
 		data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE;
 		ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_PWR_MGMT_CTRL,
 						data);
 		if (ret_val)
-			goto out;
+			return ret_val;
 
 		ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
 					       &data);
 		if (ret_val)
-			goto out;
+			return ret_val;
 
 		data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
 		ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
 						data);
 		if (ret_val)
-			goto out;
+			return ret_val;
 	}
 
-	/*
-	 * Workaround: Disable padding in Kumeran interface in the MAC
+	/* Workaround: Disable padding in Kumeran interface in the MAC
 	 * and in the PHY to avoid CRC errors.
 	 */
 	ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_INBAND_CTRL, &data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	data |= GG82563_ICR_DIS_PADDING;
 	ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_INBAND_CTRL, data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
-out:
-	return ret_val;
+	return E1000_SUCCESS;
 }
 
 /**
@@ -1213,42 +1186,42 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw)
 	ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
 	E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
 
-	/*
-	 * Set the mac to wait the maximum time between each
+	/* Set the mac to wait the maximum time between each
 	 * iteration and increase the max iterations when
 	 * polling the phy; this fixes erroneous timeouts at 10Mbps.
 	 */
 	ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4),
 						   0xFFFF);
 	if (ret_val)
-		goto out;
+		return ret_val;
 	ret_val = e1000_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
 						  &reg_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 	reg_data |= 0x3F;
 	ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9),
 						   reg_data);
 	if (ret_val)
-		goto out;
-	ret_val = e1000_read_kmrn_reg_80003es2lan(hw,
-				E1000_KMRNCTRLSTA_OFFSET_INB_CTRL, &reg_data);
+		return ret_val;
+	ret_val =
+	    e1000_read_kmrn_reg_80003es2lan(hw,
+					    E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
+					    &reg_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 	reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING;
-	ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-				E1000_KMRNCTRLSTA_OFFSET_INB_CTRL, reg_data);
+	ret_val =
+	    e1000_write_kmrn_reg_80003es2lan(hw,
+					     E1000_KMRNCTRLSTA_OFFSET_INB_CTRL,
+					     reg_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	ret_val = e1000_copper_link_setup_gg82563_80003es2lan(hw);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
-	ret_val = e1000_setup_copper_link_generic(hw);
-
-out:
-	return ret_val;
+	return e1000_setup_copper_link_generic(hw);
 }
 
 /**
@@ -1271,7 +1244,7 @@ static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw)
 		ret_val = e1000_get_speed_and_duplex_copper_generic(hw, &speed,
 								    &duplex);
 		if (ret_val)
-			goto out;
+			return ret_val;
 
 		if (speed == SPEED_1000)
 			ret_val = e1000_cfg_kmrn_1000_80003es2lan(hw);
@@ -1279,7 +1252,6 @@ static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw)
 			ret_val = e1000_cfg_kmrn_10_100_80003es2lan(hw, duplex);
 	}
 
-out:
 	return ret_val;
 }
 
@@ -1293,7 +1265,7 @@ out:
  **/
 static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 	u32 tipg;
 	u32 i = 0;
 	u16 reg_data, reg_data2;
@@ -1301,11 +1273,12 @@ static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
 	DEBUGFUNC("e1000_configure_kmrn_for_10_100");
 
 	reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT;
-	ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-				       E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
-				       reg_data);
+	ret_val =
+	    e1000_write_kmrn_reg_80003es2lan(hw,
+					     E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+					     reg_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	/* Configure Transmit Inter-Packet Gap */
 	tipg = E1000_READ_REG(hw, E1000_TIPG);
@@ -1317,12 +1290,12 @@ static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
 		ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
 					       &reg_data);
 		if (ret_val)
-			goto out;
+			return ret_val;
 
 		ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
 					       &reg_data2);
 		if (ret_val)
-			goto out;
+			return ret_val;
 		i++;
 	} while ((reg_data != reg_data2) && (i < GG82563_MAX_KMRN_RETRY));
 
@@ -1331,11 +1304,7 @@ static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex)
 	else
 		reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
 
-	ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
-					reg_data);
-
-out:
-	return ret_val;
+	return hw->phy.ops.write_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
 }
 
 /**
@@ -1347,7 +1316,7 @@ out:
  **/
 static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 	u16 reg_data, reg_data2;
 	u32 tipg;
 	u32 i = 0;
@@ -1355,10 +1324,12 @@ static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
 	DEBUGFUNC("e1000_configure_kmrn_for_1000");
 
 	reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT;
-	ret_val = e1000_write_kmrn_reg_80003es2lan(hw,
-				E1000_KMRNCTRLSTA_OFFSET_HD_CTRL, reg_data);
+	ret_val =
+	    e1000_write_kmrn_reg_80003es2lan(hw,
+					     E1000_KMRNCTRLSTA_OFFSET_HD_CTRL,
+					     reg_data);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	/* Configure Transmit Inter-Packet Gap */
 	tipg = E1000_READ_REG(hw, E1000_TIPG);
@@ -1370,21 +1341,18 @@ static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw)
 		ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
 					       &reg_data);
 		if (ret_val)
-			goto out;
+			return ret_val;
 
 		ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
 					       &reg_data2);
 		if (ret_val)
-			goto out;
+			return ret_val;
 		i++;
 	} while ((reg_data != reg_data2) && (i < GG82563_MAX_KMRN_RETRY));
 
 	reg_data &= ~GG82563_KMCR_PASS_FALSE_CARRIER;
-	ret_val = hw->phy.ops.write_reg(hw, GG82563_PHY_KMRN_MODE_CTRL,
-					reg_data);
 
-out:
-	return ret_val;
+	return hw->phy.ops.write_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, reg_data);
 }
 
 /**
@@ -1401,13 +1369,13 @@ static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
 					   u16 *data)
 {
 	u32 kmrnctrlsta;
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 
 	DEBUGFUNC("e1000_read_kmrn_reg_80003es2lan");
 
 	ret_val = e1000_acquire_mac_csr_80003es2lan(hw);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
 		       E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN;
@@ -1421,7 +1389,6 @@ static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
 
 	e1000_release_mac_csr_80003es2lan(hw);
 
-out:
 	return ret_val;
 }
 
@@ -1439,13 +1406,13 @@ static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
 					    u16 data)
 {
 	u32 kmrnctrlsta;
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 
 	DEBUGFUNC("e1000_write_kmrn_reg_80003es2lan");
 
 	ret_val = e1000_acquire_mac_csr_80003es2lan(hw);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
 	kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) &
 		       E1000_KMRNCTRLSTA_OFFSET) | data;
@@ -1456,7 +1423,6 @@ static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset,
 
 	e1000_release_mac_csr_80003es2lan(hw);
 
-out:
 	return ret_val;
 }
 
@@ -1466,23 +1432,19 @@ out:
  **/
 static s32 e1000_read_mac_addr_80003es2lan(struct e1000_hw *hw)
 {
-	s32 ret_val = E1000_SUCCESS;
+	s32 ret_val;
 
 	DEBUGFUNC("e1000_read_mac_addr_80003es2lan");
 
-	/*
-	 * If there's an alternate MAC address place it in RAR0
+	/* If there's an alternate MAC address place it in RAR0
 	 * so that it will override the Si installed default perm
 	 * address.
 	 */
 	ret_val = e1000_check_alt_mac_addr_generic(hw);
 	if (ret_val)
-		goto out;
+		return ret_val;
 
-	ret_val = e1000_read_mac_addr_generic(hw);
-
-out:
-	return ret_val;
+	return e1000_read_mac_addr_generic(hw);
 }
 
 /**
diff --git a/sys/dev/e1000/e1000_80003es2lan.h b/sys/dev/e1000/e1000_80003es2lan.h
index 157468e485d..3807e46305d 100644
--- a/sys/dev/e1000/e1000_80003es2lan.h
+++ b/sys/dev/e1000/e1000_80003es2lan.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2011, Intel Corporation 
+  Copyright (c) 2001-2013, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -51,34 +51,32 @@
 #define E1000_KMRNCTRLSTA_OPMODE_MASK		0x000C
 #define E1000_KMRNCTRLSTA_OPMODE_INBAND_MDIO	0x0004
 
-#define E1000_TCTL_EXT_GCEX_MASK 0x000FFC00 /* Gigabit Carry Extend Padding */
+#define E1000_TCTL_EXT_GCEX_MASK 0x000FFC00 /* Gig Carry Extend Padding */
 #define DEFAULT_TCTL_EXT_GCEX_80003ES2LAN	0x00010000
 
 #define DEFAULT_TIPG_IPGT_1000_80003ES2LAN	0x8
 #define DEFAULT_TIPG_IPGT_10_100_80003ES2LAN	0x9
 
 /* GG82563 PHY Specific Status Register (Page 0, Register 16 */
-#define GG82563_PSCR_POLARITY_REVERSAL_DISABLE	0x0002 /* 1=Reversal Disabled */
+#define GG82563_PSCR_POLARITY_REVERSAL_DISABLE	0x0002 /* 1=Reversal Dis */
 #define GG82563_PSCR_CROSSOVER_MODE_MASK	0x0060
 #define GG82563_PSCR_CROSSOVER_MODE_MDI		0x0000 /* 00=Manual MDI */
 #define GG82563_PSCR_CROSSOVER_MODE_MDIX	0x0020 /* 01=Manual MDIX */
 #define GG82563_PSCR_CROSSOVER_MODE_AUTO	0x0060 /* 11=Auto crossover */
 
 /* PHY Specific Control Register 2 (Page 0, Register 26) */
-#define GG82563_PSCR2_REVERSE_AUTO_NEG		0x2000 /* 1=Reverse Auto-Nego */
+#define GG82563_PSCR2_REVERSE_AUTO_NEG		0x2000 /* 1=Reverse Auto-Neg */
 
 /* MAC Specific Control Register (Page 2, Register 21) */
 /* Tx clock speed for Link Down and 1000BASE-T for the following speeds */
 #define GG82563_MSCR_TX_CLK_MASK		0x0007
 #define GG82563_MSCR_TX_CLK_10MBPS_2_5		0x0004
 #define GG82563_MSCR_TX_CLK_100MBPS_25		0x0005
-#define GG82563_MSCR_TX_CLK_1000MBPS_2_5	0x0006
 #define GG82563_MSCR_TX_CLK_1000MBPS_25		0x0007
 
 #define GG82563_MSCR_ASSERT_CRS_ON_TX		0x0010 /* 1=Assert */
 
-/* DSP Distance Register (Page 5, Register 26) */
-/*
+/* DSP Distance Register (Page 5, Register 26)
  * 0 = <50M
  * 1 = 50-80M
  * 2 = 80-100M
diff --git a/sys/dev/e1000/e1000_82571.c b/sys/dev/e1000/e1000_82571.c
index ca7a1d021f7..2c985900834 100644
--- a/sys/dev/e1000/e1000_82571.c
+++ b/sys/dev/e1000/e1000_82571.c
@@ -927,9 +927,9 @@ static s32 e1000_write_nvm_eewr_82571(struct e1000_hw *hw, u16 offset,
 	}
 
 	for (i = 0; i < words; i++) {
-		eewr = (data[i] << E1000_NVM_RW_REG_DATA) |
-		       ((offset+i) << E1000_NVM_RW_ADDR_SHIFT) |
-		       E1000_NVM_RW_REG_START;
+		eewr = ((data[i] << E1000_NVM_RW_REG_DATA) |
+			((offset + i) << E1000_NVM_RW_ADDR_SHIFT) |
+			E1000_NVM_RW_REG_START);
 
 		ret_val = e1000_poll_eerd_eewr_done(hw, E1000_NVM_POLL_WRITE);
 		if (ret_val)
@@ -1101,8 +1101,6 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 	default:
 		break;
 	}
-	if (ret_val)
-		DEBUGOUT("Cannot acquire MDIO ownership\n");
 
 	ctrl = E1000_READ_REG(hw, E1000_CTRL);
 
@@ -1111,9 +1109,16 @@ static s32 e1000_reset_hw_82571(struct e1000_hw *hw)
 
 	/* Must release MDIO ownership and mutex after MAC reset. */
 	switch (hw->mac.type) {
+	case e1000_82573:
+		/* Release mutex only if the hw semaphore is acquired */
+		if (!ret_val)
+			e1000_put_hw_semaphore_82573(hw);
+		break;
 	case e1000_82574:
 	case e1000_82583:
-		e1000_put_hw_semaphore_82574(hw);
+		/* Release mutex only if the hw semaphore is acquired */
+		if (!ret_val)
+			e1000_put_hw_semaphore_82574(hw);
 		break;
 	default:
 		break;
@@ -1222,8 +1227,8 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
 
 	/* Set the transmit descriptor write-back policy */
 	reg_data = E1000_READ_REG(hw, E1000_TXDCTL(0));
-	reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-		   E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC;
+	reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |
+		    E1000_TXDCTL_FULL_TX_DESC_WB | E1000_TXDCTL_COUNT_DESC);
 	E1000_WRITE_REG(hw, E1000_TXDCTL(0), reg_data);
 
 	/* ...for both queues. */
@@ -1239,9 +1244,9 @@ static s32 e1000_init_hw_82571(struct e1000_hw *hw)
 		break;
 	default:
 		reg_data = E1000_READ_REG(hw, E1000_TXDCTL(1));
-		reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
-			   E1000_TXDCTL_FULL_TX_DESC_WB |
-			   E1000_TXDCTL_COUNT_DESC;
+		reg_data = ((reg_data & ~E1000_TXDCTL_WTHRESH) |
+			    E1000_TXDCTL_FULL_TX_DESC_WB |
+			    E1000_TXDCTL_COUNT_DESC);
 		E1000_WRITE_REG(hw, E1000_TXDCTL(1), reg_data);
 		break;
 	}
diff --git a/sys/dev/e1000/e1000_82575.c b/sys/dev/e1000/e1000_82575.c
index 5722f4688ca..1707236e097 100644
--- a/sys/dev/e1000/e1000_82575.c
+++ b/sys/dev/e1000/e1000_82575.c
@@ -52,6 +52,7 @@ static void e1000_release_phy_82575(struct e1000_hw *hw);
 static s32  e1000_acquire_nvm_82575(struct e1000_hw *hw);
 static void e1000_release_nvm_82575(struct e1000_hw *hw);
 static s32  e1000_check_for_link_82575(struct e1000_hw *hw);
+static s32  e1000_check_for_link_media_swap(struct e1000_hw *hw);
 static s32  e1000_get_cfg_done_82575(struct e1000_hw *hw);
 static s32  e1000_get_link_up_info_82575(struct e1000_hw *hw, u16 *speed,
 					 u16 *duplex);
@@ -144,6 +145,7 @@ static bool e1000_sgmii_uses_mdio_82575(struct e1000_hw *hw)
 		break;
 	case e1000_82580:
 	case e1000_i350:
+	case e1000_i354:
 	case e1000_i210:
 	case e1000_i211:
 		reg = E1000_READ_REG(hw, E1000_MDICNFG);
@@ -207,6 +209,7 @@ static s32 e1000_init_phy_params_82575(struct e1000_hw *hw)
 		switch (hw->mac.type) {
 		case e1000_82580:
 		case e1000_i350:
+		case e1000_i354:
 			phy->ops.read_reg = e1000_read_phy_reg_82580;
 			phy->ops.write_reg = e1000_write_phy_reg_82580;
 			break;
@@ -226,6 +229,8 @@ static s32 e1000_init_phy_params_82575(struct e1000_hw *hw)
 
 	/* Verify phy id and set remaining function pointers */
 	switch (phy->id) {
+	case M88E1543_E_PHY_ID:
+	case M88E1512_E_PHY_ID:
 	case I347AT4_E_PHY_ID:
 	case M88E1112_E_PHY_ID:
 	case M88E1340M_E_PHY_ID:
@@ -238,9 +243,36 @@ static s32 e1000_init_phy_params_82575(struct e1000_hw *hw)
 		    phy->id == M88E1340M_E_PHY_ID)
 			phy->ops.get_cable_length =
 					 e1000_get_cable_length_m88_gen2;
+		else if (phy->id == M88E1543_E_PHY_ID ||
+			 phy->id == M88E1512_E_PHY_ID)
+			phy->ops.get_cable_length =
+					 e1000_get_cable_length_m88_gen2;
 		else
 			phy->ops.get_cable_length = e1000_get_cable_length_m88;
 		phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_m88;
+		/* Check if this PHY is confgured for media swap. */
+		if (phy->id == M88E1112_E_PHY_ID) {
+			u16 data;
+
+			ret_val = phy->ops.write_reg(hw,
+						     E1000_M88E1112_PAGE_ADDR,
+						     2);
+			if (ret_val)
+				goto out;
+
+			ret_val = phy->ops.read_reg(hw,
+						    E1000_M88E1112_MAC_CTRL_1,
+						    &data);
+			if (ret_val)
+				goto out;
+
+			data = (data & E1000_M88E1112_MAC_CTRL_1_MODE_MASK) >>
+			       E1000_M88E1112_MAC_CTRL_1_MODE_SHIFT;
+			if (data == E1000_M88E1112_AUTO_COPPER_SGMII ||
+			    data == E1000_M88E1112_AUTO_COPPER_BASEX)
+				hw->mac.ops.check_for_link =
+						e1000_check_for_link_media_swap;
+		}
 		break;
 	case IGP03E1000_E_PHY_ID:
 	case IGP04E1000_E_PHY_ID:
@@ -355,6 +387,7 @@ s32 e1000_init_nvm_params_82575(struct e1000_hw *hw)
 		nvm->ops.update = e1000_update_nvm_checksum_82580;
 		break;
 	case e1000_i350:
+	case e1000_i354:
 		nvm->ops.validate = e1000_validate_nvm_checksum_i350;
 		nvm->ops.update = e1000_update_nvm_checksum_i350;
 		break;
@@ -388,7 +421,7 @@ static s32 e1000_init_mac_params_82575(struct e1000_hw *hw)
 		mac->rar_entry_count = E1000_RAR_ENTRIES_82576;
 	if (mac->type == e1000_82580)
 		mac->rar_entry_count = E1000_RAR_ENTRIES_82580;
-	if (mac->type == e1000_i350)
+	if (mac->type == e1000_i350 || mac->type == e1000_i354)
 		mac->rar_entry_count = E1000_RAR_ENTRIES_I350;
 
 	/* Enable EEE default settings for EEE supported devices */
@@ -436,7 +469,7 @@ static s32 e1000_init_mac_params_82575(struct e1000_hw *hw)
 	mac->ops.config_collision_dist = e1000_config_collision_dist_82575;
 	/* multicast address update */
 	mac->ops.update_mc_addr_list = e1000_update_mc_addr_list_generic;
-	if (mac->type == e1000_i350) {
+	if (hw->mac.type == e1000_i350 || mac->type == e1000_i354) {
 		/* writing VFTA */
 		mac->ops.write_vfta = e1000_write_vfta_i350;
 		/* clearing VFTA */
@@ -622,6 +655,10 @@ static s32 e1000_get_phy_id_82575(struct e1000_hw *hw)
 
 	DEBUGFUNC("e1000_get_phy_id_82575");
 
+	/* some i354 devices need an extra read for phy id */
+	if (hw->mac.type == e1000_i354)
+		e1000_get_phy_id(hw);
+
 	/*
 	 * For SGMII PHYs, we try the list of possible addresses until
 	 * we find one that works.  For non-SGMII PHYs
@@ -645,6 +682,7 @@ static s32 e1000_get_phy_id_82575(struct e1000_hw *hw)
 			break;
 		case e1000_82580:
 		case e1000_i350:
+		case e1000_i354:
 		case e1000_i210:
 		case e1000_i211:
 			mdic = E1000_READ_REG(hw, E1000_MDICNFG);
@@ -1172,6 +1210,61 @@ static s32 e1000_check_for_link_82575(struct e1000_hw *hw)
 	return ret_val;
 }
 
+/**
+ *  e1000_check_for_link_media_swap - Check which M88E1112 interface linked
+ *  @hw: pointer to the HW structure
+ *
+ *  Poll the M88E1112 interfaces to see which interface achieved link.
+ */
+static s32 e1000_check_for_link_media_swap(struct e1000_hw *hw)
+{
+	struct e1000_phy_info *phy = &hw->phy;
+	s32 ret_val;
+	u16 data;
+	u8 port = 0;
+
+	DEBUGFUNC("e1000_check_for_link_media_swap");
+
+	/* Check the copper medium. */
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1112_PAGE_ADDR, 0);
+	if (ret_val)
+		return ret_val;
+
+	ret_val = phy->ops.read_reg(hw, E1000_M88E1112_STATUS, &data);
+	if (ret_val)
+		return ret_val;
+
+	if (data & E1000_M88E1112_STATUS_LINK)
+		port = E1000_MEDIA_PORT_COPPER;
+
+	/* Check the other medium. */
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1112_PAGE_ADDR, 1);
+	if (ret_val)
+		return ret_val;
+
+	ret_val = phy->ops.read_reg(hw, E1000_M88E1112_STATUS, &data);
+	if (ret_val)
+		return ret_val;
+
+	/* reset page to 0 */
+	ret_val = phy->ops.write_reg(hw, E1000_M88E1112_PAGE_ADDR, 0);
+	if (ret_val)
+		return ret_val;
+
+	if (data & E1000_M88E1112_STATUS_LINK)
+		port = E1000_MEDIA_PORT_OTHER;
+
+	/* Determine if a swap needs to happen. */
+	if (port && (hw->dev_spec._82575.media_port != port)) {
+		hw->dev_spec._82575.media_port = port;
+		hw->dev_spec._82575.media_changed = TRUE;
+	} else {
+		ret_val = e1000_check_for_link_82575(hw);
+	}
+
+	return E1000_SUCCESS;
+}
+
 /**
  *  e1000_power_up_serdes_link_82575 - Power up the serdes link after shutdown
  *  @hw: pointer to the HW structure
@@ -1215,6 +1308,7 @@ static s32 e1000_get_pcs_speed_and_duplex_82575(struct e1000_hw *hw,
 {
 	struct e1000_mac_info *mac = &hw->mac;
 	u32 pcs;
+	u32 status;
 
 	DEBUGFUNC("e1000_get_pcs_speed_and_duplex_82575");
 
@@ -1245,6 +1339,18 @@ static s32 e1000_get_pcs_speed_and_duplex_82575(struct e1000_hw *hw,
 		else
 			*duplex = HALF_DUPLEX;
 
+		/* Check if it is an I354 2.5Gb backplane connection. */
+		if (mac->type == e1000_i354) {
+			status = E1000_READ_REG(hw, E1000_STATUS);
+			if ((status & E1000_STATUS_2P5_SKU) &&
+			    !(status & E1000_STATUS_2P5_SKU_OVER)) {
+				*speed = SPEED_2500;
+				*duplex = FULL_DUPLEX;
+				DEBUGOUT("2500 Mbs, ");
+				DEBUGOUT("Full Duplex\n");
+			}
+		}
+
 	} else {
 		mac->serdes_has_link = FALSE;
 		*speed = 0;
@@ -1430,11 +1536,18 @@ static s32 e1000_setup_copper_link_82575(struct e1000_hw *hw)
 	ctrl &= ~(E1000_CTRL_FRCSPD | E1000_CTRL_FRCDPX);
 	E1000_WRITE_REG(hw, E1000_CTRL, ctrl);
 
-	/* Clear Go Link Disconnect bit */
-	if (hw->mac.type >= e1000_82580) {
+	/* Clear Go Link Disconnect bit on supported devices */
+	switch (hw->mac.type) {
+	case e1000_82580:
+	case e1000_i350:
+	case e1000_i210:
+	case e1000_i211:
 		phpm_reg = E1000_READ_REG(hw, E1000_82580_PHY_POWER_MGMT);
 		phpm_reg &= ~E1000_82580_PM_GO_LINKD;
 		E1000_WRITE_REG(hw, E1000_82580_PHY_POWER_MGMT, phpm_reg);
+		break;
+	default:
+		break;
 	}
 
 	ret_val = e1000_setup_serdes_link_82575(hw);
@@ -1458,6 +1571,8 @@ static s32 e1000_setup_copper_link_82575(struct e1000_hw *hw)
 		case I347AT4_E_PHY_ID:
 		case M88E1112_E_PHY_ID:
 		case M88E1340M_E_PHY_ID:
+		case M88E1543_E_PHY_ID:
+		case M88E1512_E_PHY_ID:
 		case I210_I_PHY_ID:
 			ret_val = e1000_copper_link_setup_m88_gen2(hw);
 			break;
@@ -2132,42 +2247,33 @@ out:
  **/
 void e1000_vmdq_set_anti_spoofing_pf(struct e1000_hw *hw, bool enable, int pf)
 {
-	u32 dtxswc;
+	u32 reg_val, reg_offset;
 
 	switch (hw->mac.type) {
 	case e1000_82576:
-		dtxswc = E1000_READ_REG(hw, E1000_DTXSWC);
-		if (enable) {
-			dtxswc |= (E1000_DTXSWC_MAC_SPOOF_MASK |
-				   E1000_DTXSWC_VLAN_SPOOF_MASK);
-			/* The PF can spoof - it has to in order to
-			 * support emulation mode NICs */
-			dtxswc ^= (1 << pf | 1 << (pf +
-				   E1000_DTXSWC_VLAN_SPOOF_SHIFT));
-		} else {
-			dtxswc &= ~(E1000_DTXSWC_MAC_SPOOF_MASK |
-				    E1000_DTXSWC_VLAN_SPOOF_MASK);
-		}
-		E1000_WRITE_REG(hw, E1000_DTXSWC, dtxswc);
+		reg_offset = E1000_DTXSWC;
 		break;
 	case e1000_i350:
-		dtxswc = E1000_READ_REG(hw, E1000_TXSWC);
-		if (enable) {
-			dtxswc |= (E1000_DTXSWC_MAC_SPOOF_MASK |
-				   E1000_DTXSWC_VLAN_SPOOF_MASK);
-			/* The PF can spoof - it has to in order to
-			 * support emulation mode NICs
-			 */
-			dtxswc ^= (1 << pf | 1 << (pf +
-				   E1000_DTXSWC_VLAN_SPOOF_SHIFT));
-		} else {
-			dtxswc &= ~(E1000_DTXSWC_MAC_SPOOF_MASK |
-				    E1000_DTXSWC_VLAN_SPOOF_MASK);
-		}
-		E1000_WRITE_REG(hw, E1000_TXSWC, dtxswc);
-	default:
+	case e1000_i354:
+		reg_offset = E1000_TXSWC;
 		break;
+	default:
+		return;
 	}
+
+	reg_val = E1000_READ_REG(hw, reg_offset);
+	if (enable) {
+		reg_val |= (E1000_DTXSWC_MAC_SPOOF_MASK |
+			     E1000_DTXSWC_VLAN_SPOOF_MASK);
+		/* The PF can spoof - it has to in order to
+		 * support emulation mode NICs
+		 */
+		reg_val ^= (1 << pf | 1 << (pf + MAX_NUM_VFS));
+	} else {
+		reg_val &= ~(E1000_DTXSWC_MAC_SPOOF_MASK |
+			     E1000_DTXSWC_VLAN_SPOOF_MASK);
+	}
+	E1000_WRITE_REG(hw, reg_offset, reg_val);
 }
 
 /**
@@ -2191,6 +2297,7 @@ void e1000_vmdq_set_loopback_pf(struct e1000_hw *hw, bool enable)
 		E1000_WRITE_REG(hw, E1000_DTXSWC, dtxswc);
 		break;
 	case e1000_i350:
+	case e1000_i354:
 		dtxswc = E1000_READ_REG(hw, E1000_TXSWC);
 		if (enable)
 			dtxswc |= E1000_DTXSWC_VMDQ_LOOPBACK_EN;
@@ -2387,10 +2494,6 @@ static s32 e1000_reset_hw_82580(struct e1000_hw *hw)
 		DEBUGOUT("Auto Read Done did not complete\n");
 	}
 
-	/* If EEPROM is not present, run manual init scripts */
-	if (!(E1000_READ_REG(hw, E1000_EECD) & E1000_EECD_PRES))
-		e1000_reset_init_script_82575(hw);
-
 	/* clear global device reset status bit */
 	E1000_WRITE_REG(hw, E1000_STATUS, E1000_STAT_DEV_RST_SET);
 
@@ -2644,6 +2747,45 @@ out:
 	return ret_val;
 }
 
+/**
+ *  __e1000_access_emi_reg - Read/write EMI register
+ *  @hw: pointer to the HW structure
+ *  @addr: EMI address to program
+ *  @data: pointer to value to read/write from/to the EMI address
+ *  @read: boolean flag to indicate read or write
+ **/
+static s32 __e1000_access_emi_reg(struct e1000_hw *hw, u16 address,
+				  u16 *data, bool read)
+{
+	s32 ret_val = E1000_SUCCESS;
+
+	DEBUGFUNC("__e1000_access_emi_reg");
+
+	ret_val = hw->phy.ops.write_reg(hw, E1000_EMIADD, address);
+	if (ret_val)
+		return ret_val;
+
+	if (read)
+		ret_val = hw->phy.ops.read_reg(hw, E1000_EMIDATA, data);
+	else
+		ret_val = hw->phy.ops.write_reg(hw, E1000_EMIDATA, *data);
+
+	return ret_val;
+}
+
+/**
+ *  e1000_read_emi_reg - Read Extended Management Interface register
+ *  @hw: pointer to the HW structure
+ *  @addr: EMI address to program
+ *  @data: value to be read from the EMI address
+ **/
+s32 e1000_read_emi_reg(struct e1000_hw *hw, u16 addr, u16 *data)
+{
+	DEBUGFUNC("e1000_read_emi_reg");
+
+	return __e1000_access_emi_reg(hw, addr, data, TRUE);
+}
+
 /**
  *  e1000_set_eee_i350 - Enable/disable EEE support
  *  @hw: pointer to the HW structure
@@ -2689,6 +2831,114 @@ out:
 	return ret_val;
 }
 
+/**
+ *  e1000_set_eee_i354 - Enable/disable EEE support
+ *  @hw: pointer to the HW structure
+ *
+ *  Enable/disable EEE legacy mode based on setting in dev_spec structure.
+ *
+ **/
+s32 e1000_set_eee_i354(struct e1000_hw *hw)
+{
+	struct e1000_phy_info *phy = &hw->phy;
+	s32 ret_val = E1000_SUCCESS;
+	u16 phy_data;
+
+	DEBUGFUNC("e1000_set_eee_i354");
+
+	if ((hw->phy.media_type != e1000_media_type_copper) ||
+	    ((phy->id != M88E1543_E_PHY_ID) &&
+	    (phy->id != M88E1512_E_PHY_ID)))
+		goto out;
+
+	if (!hw->dev_spec._82575.eee_disable) {
+		/* Switch to PHY page 18. */
+		ret_val = phy->ops.write_reg(hw, E1000_M88E1543_PAGE_ADDR, 18);
+		if (ret_val)
+			goto out;
+
+		ret_val = phy->ops.read_reg(hw, E1000_M88E1543_EEE_CTRL_1,
+					    &phy_data);
+		if (ret_val)
+			goto out;
+
+		phy_data |= E1000_M88E1543_EEE_CTRL_1_MS;
+		ret_val = phy->ops.write_reg(hw, E1000_M88E1543_EEE_CTRL_1,
+					     phy_data);
+		if (ret_val)
+			goto out;
+
+		/* Return the PHY to page 0. */
+		ret_val = phy->ops.write_reg(hw, E1000_M88E1543_PAGE_ADDR, 0);
+		if (ret_val)
+			goto out;
+
+		/* Turn on EEE advertisement. */
+		ret_val = e1000_read_xmdio_reg(hw, E1000_EEE_ADV_ADDR_I354,
+					       E1000_EEE_ADV_DEV_I354,
+					       &phy_data);
+		if (ret_val)
+			goto out;
+
+		phy_data |= E1000_EEE_ADV_100_SUPPORTED |
+			    E1000_EEE_ADV_1000_SUPPORTED;
+		ret_val = e1000_write_xmdio_reg(hw, E1000_EEE_ADV_ADDR_I354,
+						E1000_EEE_ADV_DEV_I354,
+						phy_data);
+	} else {
+		/* Turn off EEE advertisement. */
+		ret_val = e1000_read_xmdio_reg(hw, E1000_EEE_ADV_ADDR_I354,
+					       E1000_EEE_ADV_DEV_I354,
+					       &phy_data);
+		if (ret_val)
+			goto out;
+
+		phy_data &= ~(E1000_EEE_ADV_100_SUPPORTED |
+			      E1000_EEE_ADV_1000_SUPPORTED);
+		ret_val = e1000_write_xmdio_reg(hw, E1000_EEE_ADV_ADDR_I354,
+						E1000_EEE_ADV_DEV_I354,
+						phy_data);
+	}
+
+out:
+	return ret_val;
+}
+
+/**
+ *  e1000_get_eee_status_i354 - Get EEE status
+ *  @hw: pointer to the HW structure
+ *  @status: EEE status
+ *
+ *  Get EEE status by guessing based on whether Tx or Rx LPI indications have
+ *  been received.
+ **/
+s32 e1000_get_eee_status_i354(struct e1000_hw *hw, bool *status)
+{
+	struct e1000_phy_info *phy = &hw->phy;
+	s32 ret_val = E1000_SUCCESS;
+	u16 phy_data;
+
+	DEBUGFUNC("e1000_get_eee_status_i354");
+
+	/* Check if EEE is supported on this device. */
+	if ((hw->phy.media_type != e1000_media_type_copper) ||
+	    ((phy->id != M88E1543_E_PHY_ID) &&
+	    (phy->id != M88E1512_E_PHY_ID)))
+		goto out;
+
+	ret_val = e1000_read_xmdio_reg(hw, E1000_PCS_STATUS_ADDR_I354,
+				       E1000_PCS_STATUS_DEV_I354,
+				       &phy_data);
+	if (ret_val)
+		goto out;
+
+	*status = phy_data & (E1000_PCS_STATUS_TX_LPI_RCVD |
+			      E1000_PCS_STATUS_RX_LPI_RCVD) ? TRUE : FALSE;
+
+out:
+	return ret_val;
+}
+
 /* Due to a hw errata, if the host tries to  configure the VFTA register
  * while performing queries from the BMC or DMA, then the VFTA in some
  * cases won't be written.
@@ -3286,4 +3536,3 @@ void e1000_i2c_bus_clear(struct e1000_hw *hw)
 	e1000_i2c_stop(hw);
 }
 
-
diff --git a/sys/dev/e1000/e1000_82575.h b/sys/dev/e1000/e1000_82575.h
index c6bbe186c0d..9d8d3fc5a4d 100644
--- a/sys/dev/e1000/e1000_82575.h
+++ b/sys/dev/e1000/e1000_82575.h
@@ -245,6 +245,8 @@ union e1000_adv_rx_desc {
 #define E1000_RXDADV_RSSTYPE_IPV6_UDP_EX 0x00000009
 
 /* RSS Packet Types as indicated in the receive descriptor */
+#define E1000_RXDADV_PKTTYPE_ILMASK	0x000000F0
+#define E1000_RXDADV_PKTTYPE_TLMASK	0x00000F00
 #define E1000_RXDADV_PKTTYPE_NONE	0x00000000
 #define E1000_RXDADV_PKTTYPE_IPV4	0x00000010 /* IPV4 hdr present */
 #define E1000_RXDADV_PKTTYPE_IPV4_EX	0x00000020 /* IPV4 hdr + extensions */
@@ -382,7 +384,7 @@ struct e1000_adv_tx_context_desc {
 #define E1000_ETQF_FILTER_ENABLE	(1 << 26)
 #define E1000_ETQF_IMM_INT		(1 << 29)
 #define E1000_ETQF_1588			(1 << 30)
-#define E1000_ETQF_QUEUE_ENABLE		(1 << 31)
+#define E1000_ETQF_QUEUE_ENABLE		(1U << 31)
 /*
  * ETQF filter list: one static filter per filter consumer. This is
  *                   to avoid filter collisions later. Add new filters
@@ -409,7 +411,7 @@ struct e1000_adv_tx_context_desc {
 #define E1000_DTXSWC_LLE_MASK		0x00FF0000 /* Per VF Local LB enables */
 #define E1000_DTXSWC_VLAN_SPOOF_SHIFT	8
 #define E1000_DTXSWC_LLE_SHIFT		16
-#define E1000_DTXSWC_VMDQ_LOOPBACK_EN	(1 << 31)  /* global VF LB enable */
+#define E1000_DTXSWC_VMDQ_LOOPBACK_EN	(1U << 31)  /* global VF LB enable */
 
 /* Easy defines for setting default pool, would normally be left a zero */
 #define E1000_VT_CTL_DEFAULT_POOL_SHIFT	7
@@ -491,7 +493,10 @@ void e1000_vfta_set_vf(struct e1000_hw *, u16, bool);
 void e1000_rlpml_set_vf(struct e1000_hw *, u16);
 s32 e1000_promisc_set_vf(struct e1000_hw *, enum e1000_promisc_type type);
 u16 e1000_rxpbs_adjust_82580(u32 data);
+s32 e1000_read_emi_reg(struct e1000_hw *hw, u16 addr, u16 *data);
 s32 e1000_set_eee_i350(struct e1000_hw *);
+s32 e1000_set_eee_i354(struct e1000_hw *);
+s32 e1000_get_eee_status_i354(struct e1000_hw *, bool *);
 
 /* I2C SDA and SCL timing parameters for standard mode */
 #define E1000_I2C_T_HD_STA	4
diff --git a/sys/dev/e1000/e1000_api.c b/sys/dev/e1000/e1000_api.c
index 158191304ba..c1ca5fd51fb 100644
--- a/sys/dev/e1000/e1000_api.c
+++ b/sys/dev/e1000/e1000_api.c
@@ -329,9 +329,8 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
 	case E1000_DEV_ID_I350_DA4:
 		mac->type = e1000_i350;
 		break;
-#if defined(QV_RELEASE) && defined(SPRINGVILLE_FLASHLESS_HW)
-	case E1000_DEV_ID_I210_NVMLESS:
-#endif /* QV_RELEASE && SPRINGVILLE_FLASHLESS_HW */
+	case E1000_DEV_ID_I210_COPPER_FLASHLESS:
+	case E1000_DEV_ID_I210_SERDES_FLASHLESS:
 	case E1000_DEV_ID_I210_COPPER:
 	case E1000_DEV_ID_I210_COPPER_OEM1:
 	case E1000_DEV_ID_I210_COPPER_IT:
@@ -352,6 +351,11 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
 		mac->type = e1000_vfadapt_i350;
 		break;
 
+	case E1000_DEV_ID_I354_BACKPLANE_1GBPS:
+	case E1000_DEV_ID_I354_SGMII:
+	case E1000_DEV_ID_I354_BACKPLANE_2_5GBPS:
+		mac->type = e1000_i354;
+		break;
 	default:
 		/* Should never have loaded on this device */
 		ret_val = -E1000_ERR_MAC_INIT;
@@ -447,6 +451,7 @@ s32 e1000_setup_init_funcs(struct e1000_hw *hw, bool init_device)
 	case e1000_82576:
 	case e1000_82580:
 	case e1000_i350:
+	case e1000_i354:
 		e1000_init_function_pointers_82575(hw);
 		break;
 	case e1000_i210:
diff --git a/sys/dev/e1000/e1000_defines.h b/sys/dev/e1000/e1000_defines.h
index 48c04b013db..d4b2e561d2f 100644
--- a/sys/dev/e1000/e1000_defines.h
+++ b/sys/dev/e1000/e1000_defines.h
@@ -43,6 +43,8 @@
 /* Wake Up Control */
 #define E1000_WUC_APME		0x00000001 /* APM Enable */
 #define E1000_WUC_PME_EN	0x00000002 /* PME Enable */
+#define E1000_WUC_PME_STATUS	0x00000004 /* PME Status */
+#define E1000_WUC_APMPME	0x00000008 /* Assert PME on APM Wakeup */
 #define E1000_WUC_PHY_WAKE	0x00000100 /* if PHY supports wakeup */
 
 /* Wake Up Filter Control */
@@ -287,7 +289,10 @@
 
 #define E1000_CONNSW_ENRGSRC		0x4
 #define E1000_CONNSW_PHYSD		0x400
+#define E1000_CONNSW_PHY_PDN		0x800
 #define E1000_CONNSW_SERDESD		0x200
+#define E1000_CONNSW_AUTOSENSE_CONF	0x2
+#define E1000_CONNSW_AUTOSENSE_EN	0x1
 #define E1000_PCS_CFG_PCS_EN		8
 #define E1000_PCS_LCTL_FLV_LINK_UP	1
 #define E1000_PCS_LCTL_FSV_10		0
@@ -325,6 +330,8 @@
 #define E1000_STATUS_GIO_MASTER_ENABLE	0x00080000 /* Master request status */
 #define E1000_STATUS_PCI66		0x00000800 /* In 66Mhz slot */
 #define E1000_STATUS_BUS64		0x00001000 /* In 64 bit slot */
+#define E1000_STATUS_2P5_SKU		0x00001000 /* Val of 2.5GBE SKU strap */
+#define E1000_STATUS_2P5_SKU_OVER	0x00002000 /* Val of 2.5GBE SKU Over */
 #define E1000_STATUS_PCIX_MODE		0x00002000 /* PCI-X mode */
 #define E1000_STATUS_PCIX_SPEED		0x0000C000 /* PCI-X bus speed */
 
@@ -336,6 +343,7 @@
 #define SPEED_10	10
 #define SPEED_100	100
 #define SPEED_1000	1000
+#define SPEED_2500	2500
 #define HALF_DUPLEX	1
 #define FULL_DUPLEX	2
 
@@ -650,6 +658,7 @@
 #define E1000_EITR_ITR_INT_MASK	0x0000FFFF
 /* E1000_EITR_CNT_IGNR is only for 82576 and newer */
 #define E1000_EITR_CNT_IGNR	0x80000000 /* Don't reset counters on write */
+#define E1000_EITR_INTERVAL 0x00007FFC
 
 /* Transmit Descriptor Control */
 #define E1000_TXDCTL_PTHRESH	0x0000003F /* TXDCTL Prefetch Threshold */
@@ -805,6 +814,17 @@
 #define E1000_MDICNFG_PHY_MASK		0x03E00000
 #define E1000_MDICNFG_PHY_SHIFT		21
 
+#define E1000_MEDIA_PORT_COPPER			1
+#define E1000_MEDIA_PORT_OTHER			2
+#define E1000_M88E1112_AUTO_COPPER_SGMII	0x2
+#define E1000_M88E1112_AUTO_COPPER_BASEX	0x3
+#define E1000_M88E1112_STATUS_LINK		0x0004 /* Interface Link Bit */
+#define E1000_M88E1112_MAC_CTRL_1		0x10
+#define E1000_M88E1112_MAC_CTRL_1_MODE_MASK	0x0380 /* Mode Select */
+#define E1000_M88E1112_MAC_CTRL_1_MODE_SHIFT	7
+#define E1000_M88E1112_PAGE_ADDR		0x16
+#define E1000_M88E1112_STATUS			0x01
+
 #define E1000_THSTAT_LOW_EVENT		0x20000000 /* Low thermal threshold */
 #define E1000_THSTAT_MID_EVENT		0x00200000 /* Mid thermal threshold */
 #define E1000_THSTAT_HIGH_EVENT		0x00002000 /* High thermal threshold */
@@ -821,7 +841,21 @@
 #define E1000_EEER_EEE_NEG		0x20000000 /* EEE capability nego */
 #define E1000_EEER_RX_LPI_STATUS	0x40000000 /* Rx in LPI state */
 #define E1000_EEER_TX_LPI_STATUS	0x80000000 /* Tx in LPI state */
+#define E1000_EEE_LP_ADV_ADDR_I350	0x040F     /* EEE LP Advertisement */
+#define E1000_M88E1543_PAGE_ADDR	0x16       /* Page Offset Register */
+#define E1000_M88E1543_EEE_CTRL_1	0x0
+#define E1000_M88E1543_EEE_CTRL_1_MS	0x0001     /* EEE Master/Slave */
+#define E1000_EEE_ADV_DEV_I354		7
+#define E1000_EEE_ADV_ADDR_I354		60
+#define E1000_EEE_ADV_100_SUPPORTED	(1 << 1)   /* 100BaseTx EEE Supported */
+#define E1000_EEE_ADV_1000_SUPPORTED	(1 << 2)   /* 1000BaseT EEE Supported */
+#define E1000_PCS_STATUS_DEV_I354	3
+#define E1000_PCS_STATUS_ADDR_I354	1
+#define E1000_PCS_STATUS_RX_LPI_RCVD	0x0400
+#define E1000_PCS_STATUS_TX_LPI_RCVD	0x0800
 #define E1000_EEE_SU_LPI_CLK_STP	0x00800000 /* EEE LPI Clock Stop */
+#define E1000_EEE_LP_ADV_DEV_I210	7          /* EEE LP Adv Device */
+#define E1000_EEE_LP_ADV_ADDR_I210	61         /* EEE LP Adv Register */
 /* PCI Express Control */
 #define E1000_GCR_RXD_NO_SNOOP		0x00000001
 #define E1000_GCR_RXDSCW_NO_SNOOP	0x00000002
@@ -841,6 +875,8 @@
 				 E1000_GCR_TXDSCW_NO_SNOOP | \
 				 E1000_GCR_TXDSCR_NO_SNOOP)
 
+#define E1000_MMDAC_FUNC_DATA	0x4000 /* Data, no post increment */
+
 /* mPHY address control and data registers */
 #define E1000_MPHY_ADDR_CTL		0x0024 /* Address Control Reg */
 #define E1000_MPHY_ADDR_CTL_OFFSET_MASK	0xFFFF0000
@@ -1169,6 +1205,8 @@
 #define M88E1011_I_PHY_ID	0x01410C20
 #define IGP01E1000_I_PHY_ID	0x02A80380
 #define M88E1111_I_PHY_ID	0x01410CC0
+#define M88E1543_E_PHY_ID	0x01410EA0
+#define M88E1512_E_PHY_ID	0x01410DD0
 #define M88E1112_E_PHY_ID	0x01410C90
 #define I347AT4_E_PHY_ID	0x01410DC0
 #define M88E1340M_E_PHY_ID	0x01410DF0
@@ -1416,4 +1454,6 @@
 /* Lan ID bit field offset in status register */
 #define E1000_STATUS_LAN_ID_OFFSET	2
 #define E1000_VFTA_ENTRIES		128
+#define E1000_UNUSEDARG
+#define ERROR_REPORT(fmt)	do { } while (0)
 #endif /* _E1000_DEFINES_H_ */
diff --git a/sys/dev/e1000/e1000_hw.h b/sys/dev/e1000/e1000_hw.h
index e8a8c174ca0..8901ccd11a8 100644
--- a/sys/dev/e1000/e1000_hw.h
+++ b/sys/dev/e1000/e1000_hw.h
@@ -165,7 +165,12 @@ struct e1000_hw;
 #define E1000_DEV_ID_I210_FIBER			0x1536
 #define E1000_DEV_ID_I210_SERDES		0x1537
 #define E1000_DEV_ID_I210_SGMII			0x1538
+#define E1000_DEV_ID_I210_COPPER_FLASHLESS	0x157B
+#define E1000_DEV_ID_I210_SERDES_FLASHLESS	0x157C
 #define E1000_DEV_ID_I211_COPPER		0x1539
+#define E1000_DEV_ID_I354_BACKPLANE_1GBPS	0x1F40
+#define E1000_DEV_ID_I354_SGMII			0x1F41
+#define E1000_DEV_ID_I354_BACKPLANE_2_5GBPS	0x1F45
 #define E1000_DEV_ID_DH89XXCC_SGMII		0x0438
 #define E1000_DEV_ID_DH89XXCC_SERDES		0x043A
 #define E1000_DEV_ID_DH89XXCC_BACKPLANE		0x043C
@@ -217,6 +222,7 @@ enum e1000_mac_type {
 	e1000_82576,
 	e1000_82580,
 	e1000_i350,
+	e1000_i354,
 	e1000_i210,
 	e1000_i211,
 	e1000_vfadapt,
@@ -238,6 +244,7 @@ enum e1000_nvm_type {
 	e1000_nvm_eeprom_spi,
 	e1000_nvm_eeprom_microwire,
 	e1000_nvm_flash_hw,
+	e1000_nvm_invm,
 	e1000_nvm_flash_sw
 };
 
@@ -391,6 +398,10 @@ union e1000_rx_desc_extended {
 };
 
 #define MAX_PS_BUFFERS 4
+
+/* Number of packet split data buffers (not including the header buffer) */
+#define PS_PAGE_BUFFERS	(MAX_PS_BUFFERS - 1)
+
 /* Receive Descriptor - Packet Split */
 union e1000_rx_desc_packet_split {
 	struct {
@@ -415,7 +426,8 @@ union e1000_rx_desc_packet_split {
 		} middle;
 		struct {
 			__le16 header_status;
-			__le16 length[3];     /* length of buffers 1-3 */
+			/* length of buffers 1-3 */
+			__le16 length[PS_PAGE_BUFFERS];
 		} upper;
 		__le64 reserved;
 	} wb; /* writeback */
@@ -940,6 +952,8 @@ struct e1000_dev_spec_82575 {
 	bool clear_semaphore_once;
 	u32 mtu;
 	struct sfp_e1000_flags eth_flags;
+	u8 media_port;
+	bool media_changed;
 };
 
 struct e1000_dev_spec_vf {
diff --git a/sys/dev/e1000/e1000_i210.c b/sys/dev/e1000/e1000_i210.c
index 63302c0d376..019e4a9b080 100644
--- a/sys/dev/e1000/e1000_i210.c
+++ b/sys/dev/e1000/e1000_i210.c
@@ -42,8 +42,6 @@ static s32 e1000_write_nvm_srwr(struct e1000_hw *hw, u16 offset, u16 words,
 				u16 *data);
 static s32 e1000_pool_flash_update_done_i210(struct e1000_hw *hw);
 static s32 e1000_valid_led_default_i210(struct e1000_hw *hw, u16 *data);
-static s32 e1000_read_nvm_i211(struct e1000_hw *hw, u16 offset, u16 words,
-			       u16 *data);
 
 /**
  *  e1000_acquire_nvm_i210 - Request for access to EEPROM
@@ -180,9 +178,8 @@ static s32 e1000_get_hw_semaphore_i210(struct e1000_hw *hw)
 	}
 
 	if (i == timeout) {
-		/*
-		 * In rare circumstances, the driver may not have released the
-		 * SW semaphore. Clear the semaphore once before giving up.
+		/* In rare circumstances, the SW semaphore may already be held
+		 * unintentionally. Clear the semaphore once before giving up.
 		 */
 		if (hw->dev_spec._82575.clear_semaphore_once) {
 			hw->dev_spec._82575.clear_semaphore_once = FALSE;
@@ -368,87 +365,7 @@ out:
 	return ret_val;
 }
 
-/**
- *  e1000_read_nvm_i211 - Read NVM wrapper function for I211
- *  @hw: pointer to the HW structure
- *  @address: the word address (aka eeprom offset) to read
- *  @data: pointer to the data read
- *
- *  Wrapper function to return data formerly found in the NVM.
- **/
-static s32 e1000_read_nvm_i211(struct e1000_hw *hw, u16 offset,
-			       u16 words, u16 *data)
-{
-	s32 ret_val = E1000_SUCCESS;
-
-	DEBUGFUNC("e1000_read_nvm_i211");
-
-	/* Only the MAC addr is required to be present in the iNVM */
-	switch (offset) {
-	case NVM_MAC_ADDR:
-		ret_val = e1000_read_invm_i211(hw, (u8)offset, &data[0]);
-		ret_val |= e1000_read_invm_i211(hw, (u8)offset+1, &data[1]);
-		ret_val |= e1000_read_invm_i211(hw, (u8)offset+2, &data[2]);
-		if (ret_val != E1000_SUCCESS)
-			DEBUGOUT("MAC Addr not found in iNVM\n");
-		break;
-	case NVM_INIT_CTRL_2:
-		ret_val = e1000_read_invm_i211(hw, (u8)offset, data);
-		if (ret_val != E1000_SUCCESS) {
-			*data = NVM_INIT_CTRL_2_DEFAULT_I211;
-			ret_val = E1000_SUCCESS;
-		}
-		break;
-	case NVM_INIT_CTRL_4:
-		ret_val = e1000_read_invm_i211(hw, (u8)offset, data);
-		if (ret_val != E1000_SUCCESS) {
-			*data = NVM_INIT_CTRL_4_DEFAULT_I211;
-			ret_val = E1000_SUCCESS;
-		}
-		break;
-	case NVM_LED_1_CFG:
-		ret_val = e1000_read_invm_i211(hw, (u8)offset, data);
-		if (ret_val != E1000_SUCCESS) {
-			*data = NVM_LED_1_CFG_DEFAULT_I211;
-			ret_val = E1000_SUCCESS;
-		}
-		break;
-	case NVM_LED_0_2_CFG:
-		ret_val = e1000_read_invm_i211(hw, (u8)offset, data);
-		if (ret_val != E1000_SUCCESS) {
-			*data = NVM_LED_0_2_CFG_DEFAULT_I211;
-			ret_val = E1000_SUCCESS;
-		}
-		break;
-	case NVM_ID_LED_SETTINGS:
-		ret_val = e1000_read_invm_i211(hw, (u8)offset, data);
-		if (ret_val != E1000_SUCCESS) {
-			*data = ID_LED_RESERVED_FFFF;
-			ret_val = E1000_SUCCESS;
-		}
-		break;
-	case NVM_SUB_DEV_ID:
-		*data = hw->subsystem_device_id;
-		break;
-	case NVM_SUB_VEN_ID:
-		*data = hw->subsystem_vendor_id;
-		break;
-	case NVM_DEV_ID:
-		*data = hw->device_id;
-		break;
-	case NVM_VEN_ID:
-		*data = hw->vendor_id;
-		break;
-	default:
-		DEBUGOUT1("NVM word 0x%02x is not mapped.\n", offset);
-		*data = NVM_RESERVED_WORD;
-		break;
-	}
-	return ret_val;
-}
-
-/**
- *  e1000_read_invm_i211 - Reads OTP
+/** e1000_read_invm_word_i210 - Reads OTP
  *  @hw: pointer to the HW structure
  *  @address: the word address (aka eeprom offset) to read
  *  @data: pointer to the data read
@@ -456,14 +373,14 @@ static s32 e1000_read_nvm_i211(struct e1000_hw *hw, u16 offset,
  *  Reads 16-bit words from the OTP. Return error when the word is not
  *  stored in OTP.
  **/
-s32 e1000_read_invm_i211(struct e1000_hw *hw, u8 address, u16 *data)
+static s32 e1000_read_invm_word_i210(struct e1000_hw *hw, u8 address, u16 *data)
 {
 	s32 status = -E1000_ERR_INVM_VALUE_NOT_FOUND;
 	u32 invm_dword;
 	u16 i;
 	u8 record_type, word_address;
 
-	DEBUGFUNC("e1000_read_invm_i211");
+	DEBUGFUNC("e1000_read_invm_word_i210");
 
 	for (i = 0; i < E1000_INVM_SIZE; i++) {
 		invm_dword = E1000_READ_REG(hw, E1000_INVM_DATA_REG(i));
@@ -491,6 +408,86 @@ s32 e1000_read_invm_i211(struct e1000_hw *hw, u8 address, u16 *data)
 	return status;
 }
 
+/** e1000_read_invm_i210 - Read invm wrapper function for I210/I211
+ *  @hw: pointer to the HW structure
+ *  @address: the word address (aka eeprom offset) to read
+ *  @data: pointer to the data read
+ *
+ *  Wrapper function to return data formerly found in the NVM.
+ **/
+static s32 e1000_read_invm_i210(struct e1000_hw *hw, u16 offset,
+				u16 E1000_UNUSEDARG words, u16 *data)
+{
+	s32 ret_val = E1000_SUCCESS;
+
+	DEBUGFUNC("e1000_read_invm_i210");
+
+	/* Only the MAC addr is required to be present in the iNVM */
+	switch (offset) {
+	case NVM_MAC_ADDR:
+		ret_val = e1000_read_invm_word_i210(hw, (u8)offset, &data[0]);
+		ret_val |= e1000_read_invm_word_i210(hw, (u8)offset+1,
+						     &data[1]);
+		ret_val |= e1000_read_invm_word_i210(hw, (u8)offset+2,
+						     &data[2]);
+		if (ret_val != E1000_SUCCESS)
+			DEBUGOUT("MAC Addr not found in iNVM\n");
+		break;
+	case NVM_INIT_CTRL_2:
+		ret_val = e1000_read_invm_word_i210(hw, (u8)offset, data);
+		if (ret_val != E1000_SUCCESS) {
+			*data = NVM_INIT_CTRL_2_DEFAULT_I211;
+			ret_val = E1000_SUCCESS;
+		}
+		break;
+	case NVM_INIT_CTRL_4:
+		ret_val = e1000_read_invm_word_i210(hw, (u8)offset, data);
+		if (ret_val != E1000_SUCCESS) {
+			*data = NVM_INIT_CTRL_4_DEFAULT_I211;
+			ret_val = E1000_SUCCESS;
+		}
+		break;
+	case NVM_LED_1_CFG:
+		ret_val = e1000_read_invm_word_i210(hw, (u8)offset, data);
+		if (ret_val != E1000_SUCCESS) {
+			*data = NVM_LED_1_CFG_DEFAULT_I211;
+			ret_val = E1000_SUCCESS;
+		}
+		break;
+	case NVM_LED_0_2_CFG:
+		ret_val = e1000_read_invm_word_i210(hw, (u8)offset, data);
+		if (ret_val != E1000_SUCCESS) {
+			*data = NVM_LED_0_2_CFG_DEFAULT_I211;
+			ret_val = E1000_SUCCESS;
+		}
+		break;
+	case NVM_ID_LED_SETTINGS:
+		ret_val = e1000_read_invm_word_i210(hw, (u8)offset, data);
+		if (ret_val != E1000_SUCCESS) {
+			*data = ID_LED_RESERVED_FFFF;
+			ret_val = E1000_SUCCESS;
+		}
+		break;
+	case NVM_SUB_DEV_ID:
+		*data = hw->subsystem_device_id;
+		break;
+	case NVM_SUB_VEN_ID:
+		*data = hw->subsystem_vendor_id;
+		break;
+	case NVM_DEV_ID:
+		*data = hw->device_id;
+		break;
+	case NVM_VEN_ID:
+		*data = hw->vendor_id;
+		break;
+	default:
+		DEBUGOUT1("NVM word 0x%02x is not mapped.\n", offset);
+		*data = NVM_RESERVED_WORD;
+		break;
+	}
+	return ret_val;
+}
+
 /**
  *  e1000_validate_nvm_checksum_i210 - Validate EEPROM checksum
  *  @hw: pointer to the HW structure
@@ -591,6 +588,26 @@ out:
 	return ret_val;
 }
 
+/**
+ *  e1000_get_flash_presence_i210 - Check if flash device is detected.
+ *  @hw: pointer to the HW structure
+ *
+ **/
+bool e1000_get_flash_presence_i210(struct e1000_hw *hw)
+{
+	u32 eec = 0;
+	bool ret_val = FALSE;
+
+	DEBUGFUNC("e1000_get_flash_presence_i210");
+
+	eec = E1000_READ_REG(hw, E1000_EECD);
+
+	if (eec & E1000_EECD_FLASH_DETECTED_I210)
+		ret_val = TRUE;
+
+	return ret_val;
+}
+
 /**
  *  e1000_update_flash_i210 - Commit EEPROM to the flash
  *  @hw: pointer to the HW structure
@@ -650,7 +667,7 @@ s32 e1000_pool_flash_update_done_i210(struct e1000_hw *hw)
  *  e1000_init_nvm_params_i210 - Initialize i210 NVM function pointers
  *  @hw: pointer to the HW structure
  *
- *  Initialize the i210 NVM parameters and function pointers.
+ *  Initialize the i210/i211 NVM parameters and function pointers.
  **/
 static s32 e1000_init_nvm_params_i210(struct e1000_hw *hw)
 {
@@ -660,41 +677,25 @@ static s32 e1000_init_nvm_params_i210(struct e1000_hw *hw)
 	DEBUGFUNC("e1000_init_nvm_params_i210");
 
 	ret_val = e1000_init_nvm_params_82575(hw);
-
 	nvm->ops.acquire = e1000_acquire_nvm_i210;
 	nvm->ops.release = e1000_release_nvm_i210;
-	nvm->ops.read    = e1000_read_nvm_srrd_i210;
-	nvm->ops.write   = e1000_write_nvm_srwr_i210;
 	nvm->ops.valid_led_default = e1000_valid_led_default_i210;
-	nvm->ops.validate = e1000_validate_nvm_checksum_i210;
-	nvm->ops.update   = e1000_update_nvm_checksum_i210;
-
+	if (e1000_get_flash_presence_i210(hw)) {
+		hw->nvm.type = e1000_nvm_flash_hw;
+		nvm->ops.read    = e1000_read_nvm_srrd_i210;
+		nvm->ops.write   = e1000_write_nvm_srwr_i210;
+		nvm->ops.validate = e1000_validate_nvm_checksum_i210;
+		nvm->ops.update   = e1000_update_nvm_checksum_i210;
+	} else {
+		hw->nvm.type = e1000_nvm_invm;
+		nvm->ops.read     = e1000_read_invm_i210;
+		nvm->ops.write    = e1000_null_write_nvm;
+		nvm->ops.validate = e1000_null_ops_generic;
+		nvm->ops.update   = e1000_null_ops_generic;
+	}
 	return ret_val;
 }
 
-/**
- *  e1000_init_nvm_params_i211 - Initialize i211 NVM function pointers
- *  @hw: pointer to the HW structure
- *
- *  Initialize the NVM parameters and function pointers for i211.
- **/
-static s32 e1000_init_nvm_params_i211(struct e1000_hw *hw)
-{
-	struct e1000_nvm_info *nvm = &hw->nvm;
-
-	DEBUGFUNC("e1000_init_nvm_params_i211");
-
-	nvm->ops.acquire  = e1000_acquire_nvm_i210;
-	nvm->ops.release  = e1000_release_nvm_i210;
-	nvm->ops.read     = e1000_read_nvm_i211;
-	nvm->ops.valid_led_default = e1000_valid_led_default_i210;
-	nvm->ops.write    = e1000_null_write_nvm;
-	nvm->ops.validate = e1000_null_ops_generic;
-	nvm->ops.update   = e1000_null_ops_generic;
-
-	return E1000_SUCCESS;
-}
-
 /**
  *  e1000_init_function_pointers_i210 - Init func ptrs.
  *  @hw: pointer to the HW structure
@@ -704,17 +705,8 @@ static s32 e1000_init_nvm_params_i211(struct e1000_hw *hw)
 void e1000_init_function_pointers_i210(struct e1000_hw *hw)
 {
 	e1000_init_function_pointers_82575(hw);
+	hw->nvm.ops.init_params = e1000_init_nvm_params_i210;
 
-	switch (hw->mac.type) {
-	case e1000_i210:
-		hw->nvm.ops.init_params = e1000_init_nvm_params_i210;
-		break;
-	case e1000_i211:
-		hw->nvm.ops.init_params = e1000_init_nvm_params_i211;
-		break;
-	default:
-		break;
-	}
 	return;
 }
 
@@ -752,3 +744,74 @@ static s32 e1000_valid_led_default_i210(struct e1000_hw *hw, u16 *data)
 out:
 	return ret_val;
 }
+
+/**
+ *  __e1000_access_xmdio_reg - Read/write XMDIO register
+ *  @hw: pointer to the HW structure
+ *  @address: XMDIO address to program
+ *  @dev_addr: device address to program
+ *  @data: pointer to value to read/write from/to the XMDIO address
+ *  @read: boolean flag to indicate read or write
+ **/
+static s32 __e1000_access_xmdio_reg(struct e1000_hw *hw, u16 address,
+				    u8 dev_addr, u16 *data, bool read)
+{
+	s32 ret_val = E1000_SUCCESS;
+
+	DEBUGFUNC("__e1000_access_xmdio_reg");
+
+	ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, dev_addr);
+	if (ret_val)
+		return ret_val;
+
+	ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAAD, address);
+	if (ret_val)
+		return ret_val;
+
+	ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, E1000_MMDAC_FUNC_DATA |
+							 dev_addr);
+	if (ret_val)
+		return ret_val;
+
+	if (read)
+		ret_val = hw->phy.ops.read_reg(hw, E1000_MMDAAD, data);
+	else
+		ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAAD, *data);
+	if (ret_val)
+		return ret_val;
+
+	/* Recalibrate the device back to 0 */
+	ret_val = hw->phy.ops.write_reg(hw, E1000_MMDAC, 0);
+	if (ret_val)
+		return ret_val;
+
+	return ret_val;
+}
+
+/**
+ *  e1000_read_xmdio_reg - Read XMDIO register
+ *  @hw: pointer to the HW structure
+ *  @addr: XMDIO address to program
+ *  @dev_addr: device address to program
+ *  @data: value to be read from the EMI address
+ **/
+s32 e1000_read_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 *data)
+{
+	DEBUGFUNC("e1000_read_xmdio_reg");
+
+	return __e1000_access_xmdio_reg(hw, addr, dev_addr, data, TRUE);
+}
+
+/**
+ *  e1000_write_xmdio_reg - Write XMDIO register
+ *  @hw: pointer to the HW structure
+ *  @addr: XMDIO address to program
+ *  @dev_addr: device address to program
+ *  @data: value to be written to the XMDIO address
+ **/
+s32 e1000_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr, u16 data)
+{
+	DEBUGFUNC("e1000_read_xmdio_reg");
+
+	return __e1000_access_xmdio_reg(hw, addr, dev_addr, &data, FALSE);
+}
diff --git a/sys/dev/e1000/e1000_i210.h b/sys/dev/e1000/e1000_i210.h
index d7711fe093f..d8de1bd730f 100644
--- a/sys/dev/e1000/e1000_i210.h
+++ b/sys/dev/e1000/e1000_i210.h
@@ -35,6 +35,7 @@
 #ifndef _E1000_I210_H_
 #define _E1000_I210_H_
 
+bool e1000_get_flash_presence_i210(struct e1000_hw *hw);
 s32 e1000_update_flash_i210(struct e1000_hw *hw);
 s32 e1000_update_nvm_checksum_i210(struct e1000_hw *hw);
 s32 e1000_validate_nvm_checksum_i210(struct e1000_hw *hw);
@@ -42,9 +43,12 @@ s32 e1000_write_nvm_srwr_i210(struct e1000_hw *hw, u16 offset,
 			      u16 words, u16 *data);
 s32 e1000_read_nvm_srrd_i210(struct e1000_hw *hw, u16 offset,
 			     u16 words, u16 *data);
-s32 e1000_read_invm_i211(struct e1000_hw *hw, u8 address, u16 *data);
 s32 e1000_acquire_swfw_sync_i210(struct e1000_hw *hw, u16 mask);
 void e1000_release_swfw_sync_i210(struct e1000_hw *hw, u16 mask);
+s32 e1000_read_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr,
+			 u16 *data);
+s32 e1000_write_xmdio_reg(struct e1000_hw *hw, u16 addr, u8 dev_addr,
+			  u16 data);
 
 #define E1000_STM_OPCODE		0xDB00
 #define E1000_EEPROM_FLASH_SIZE_WORD	0x11
@@ -82,7 +86,7 @@ enum E1000_INVM_STRUCTURE_TYPE {
 					 (ID_LED_OFF1_OFF2))
 #define ID_LED_DEFAULT_I210_SERDES	((ID_LED_DEF1_DEF2 << 8) | \
 					 (ID_LED_DEF1_DEF2 <<  4) | \
-					 (ID_LED_DEF1_DEF2))
+					 (ID_LED_OFF1_ON2))
 
 /* NVM offset defaults for I211 devices */
 #define NVM_INIT_CTRL_2_DEFAULT_I211	0X7243
diff --git a/sys/dev/e1000/e1000_ich8lan.c b/sys/dev/e1000/e1000_ich8lan.c
index bd943555275..81772263290 100644
--- a/sys/dev/e1000/e1000_ich8lan.c
+++ b/sys/dev/e1000/e1000_ich8lan.c
@@ -59,6 +59,10 @@
  * 82578DC Gigabit Network Connection
  * 82579LM Gigabit Network Connection
  * 82579V Gigabit Network Connection
+ * Ethernet Connection I217-LM
+ * Ethernet Connection I217-V
+ * Ethernet Connection I218-V
+ * Ethernet Connection I218-LM
  */
 
 #include "e1000_api.h"
@@ -71,6 +75,7 @@ static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw);
 static bool e1000_check_mng_mode_pchlan(struct e1000_hw *hw);
 static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index);
 static void e1000_rar_set_pch_lpt(struct e1000_hw *hw, u8 *addr, u32 index);
+static s32 e1000_sw_lcd_config_ich8lan(struct e1000_hw *hw);
 static void e1000_update_mc_addr_list_pch2lan(struct e1000_hw *hw,
 					      u8 *mc_addr_list,
 					      u32 mc_addr_count);
@@ -181,8 +186,9 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw)
 {
 	u16 phy_reg = 0;
 	u32 phy_id = 0;
-	s32 ret_val;
+	s32 ret_val = 0;
 	u16 retry_count;
+	u32 mac_reg = 0;
 
 	for (retry_count = 0; retry_count < 2; retry_count++) {
 		ret_val = hw->phy.ops.read_reg_locked(hw, PHY_ID1, &phy_reg);
@@ -201,23 +207,84 @@ static bool e1000_phy_is_accessible_pchlan(struct e1000_hw *hw)
 
 	if (hw->phy.id) {
 		if  (hw->phy.id == phy_id)
-			return TRUE;
+			goto out;
 	} else if (phy_id) {
 		hw->phy.id = phy_id;
 		hw->phy.revision = (u32)(phy_reg & ~PHY_REVISION_MASK);
-		return TRUE;
+		goto out;
 	}
 
 	/* In case the PHY needs to be in mdio slow mode,
 	 * set slow mode and try to get the PHY id again.
 	 */
-	hw->phy.ops.release(hw);
-	ret_val = e1000_set_mdio_slow_mode_hv(hw);
-	if (!ret_val)
-		ret_val = e1000_get_phy_id(hw);
-	hw->phy.ops.acquire(hw);
+	if (hw->mac.type < e1000_pch_lpt) {
+		hw->phy.ops.release(hw);
+		ret_val = e1000_set_mdio_slow_mode_hv(hw);
+		if (!ret_val)
+			ret_val = e1000_get_phy_id(hw);
+		hw->phy.ops.acquire(hw);
+	}
 
-	return !ret_val;
+	if (ret_val)
+		return FALSE;
+out:
+	if (hw->mac.type == e1000_pch_lpt) {
+		/* Unforce SMBus mode in PHY */
+		hw->phy.ops.read_reg_locked(hw, CV_SMB_CTRL, &phy_reg);
+		phy_reg &= ~CV_SMB_CTRL_FORCE_SMBUS;
+		hw->phy.ops.write_reg_locked(hw, CV_SMB_CTRL, phy_reg);
+
+		/* Unforce SMBus mode in MAC */
+		mac_reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
+		mac_reg &= ~E1000_CTRL_EXT_FORCE_SMBUS;
+		E1000_WRITE_REG(hw, E1000_CTRL_EXT, mac_reg);
+	}
+
+	return TRUE;
+}
+
+/**
+ *  e1000_toggle_lanphypc_pch_lpt - toggle the LANPHYPC pin value
+ *  @hw: pointer to the HW structure
+ *
+ *  Toggling the LANPHYPC pin value fully power-cycles the PHY and is
+ *  used to reset the PHY to a quiescent state when necessary.
+ **/
+void e1000_toggle_lanphypc_pch_lpt(struct e1000_hw *hw)
+{
+	u32 mac_reg;
+
+	DEBUGFUNC("e1000_toggle_lanphypc_pch_lpt");
+
+	/* Set Phy Config Counter to 50msec */
+	mac_reg = E1000_READ_REG(hw, E1000_FEXTNVM3);
+	mac_reg &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;
+	mac_reg |= E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC;
+	E1000_WRITE_REG(hw, E1000_FEXTNVM3, mac_reg);
+
+	/* Toggle LANPHYPC Value bit */
+	mac_reg = E1000_READ_REG(hw, E1000_CTRL);
+	mac_reg |= E1000_CTRL_LANPHYPC_OVERRIDE;
+	mac_reg &= ~E1000_CTRL_LANPHYPC_VALUE;
+	E1000_WRITE_REG(hw, E1000_CTRL, mac_reg);
+	E1000_WRITE_FLUSH(hw);
+	usec_delay(10);
+	mac_reg &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
+	E1000_WRITE_REG(hw, E1000_CTRL, mac_reg);
+	E1000_WRITE_FLUSH(hw);
+
+	if (hw->mac.type < e1000_pch_lpt) {
+		msec_delay(50);
+	} else {
+		u16 count = 20;
+
+		do {
+			msec_delay(5);
+		} while (!(E1000_READ_REG(hw, E1000_CTRL_EXT) &
+			   E1000_CTRL_EXT_LPCD) && count--);
+
+		msec_delay(30);
+	}
 }
 
 /**
@@ -231,7 +298,6 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
 {
 	u32 mac_reg, fwsm = E1000_READ_REG(hw, E1000_FWSM);
 	s32 ret_val;
-	u16 phy_reg;
 
 	DEBUGFUNC("e1000_init_phy_workarounds_pchlan");
 
@@ -262,24 +328,16 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
 		mac_reg |= E1000_CTRL_EXT_FORCE_SMBUS;
 		E1000_WRITE_REG(hw, E1000_CTRL_EXT, mac_reg);
 
+		/* Wait 50 milliseconds for MAC to finish any retries
+		 * that it might be trying to perform from previous
+		 * attempts to acknowledge any phy read requests.
+		 */
+		 msec_delay(50);
+
 		/* fall-through */
 	case e1000_pch2lan:
-		if (e1000_phy_is_accessible_pchlan(hw)) {
-			if (hw->mac.type == e1000_pch_lpt) {
-				/* Unforce SMBus mode in PHY */
-				hw->phy.ops.read_reg_locked(hw, CV_SMB_CTRL,
-							    &phy_reg);
-				phy_reg &= ~CV_SMB_CTRL_FORCE_SMBUS;
-				hw->phy.ops.write_reg_locked(hw, CV_SMB_CTRL,
-							     phy_reg);
-
-				/* Unforce SMBus mode in MAC */
-				mac_reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
-				mac_reg &= ~E1000_CTRL_EXT_FORCE_SMBUS;
-				E1000_WRITE_REG(hw, E1000_CTRL_EXT, mac_reg);
-			}
+		if (e1000_phy_is_accessible_pchlan(hw))
 			break;
-		}
 
 		/* fall-through */
 	case e1000_pchlan:
@@ -289,44 +347,27 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
 
 		if (hw->phy.ops.check_reset_block(hw)) {
 			DEBUGOUT("Required LANPHYPC toggle blocked by ME\n");
+			ret_val = -E1000_ERR_PHY;
 			break;
 		}
 
-		DEBUGOUT("Toggling LANPHYPC\n");
+		/* Toggle LANPHYPC Value bit */
+		e1000_toggle_lanphypc_pch_lpt(hw);
+		if (hw->mac.type >= e1000_pch_lpt) {
+			if (e1000_phy_is_accessible_pchlan(hw))
+				break;
 
-		/* Set Phy Config Counter to 50msec */
-		mac_reg = E1000_READ_REG(hw, E1000_FEXTNVM3);
-		mac_reg &= ~E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK;
-		mac_reg |= E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC;
-		E1000_WRITE_REG(hw, E1000_FEXTNVM3, mac_reg);
-
-		if (hw->mac.type == e1000_pch_lpt) {
 			/* Toggling LANPHYPC brings the PHY out of SMBus mode
-			 * So ensure that the MAC is also out of SMBus mode
+			 * so ensure that the MAC is also out of SMBus mode
 			 */
 			mac_reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
 			mac_reg &= ~E1000_CTRL_EXT_FORCE_SMBUS;
 			E1000_WRITE_REG(hw, E1000_CTRL_EXT, mac_reg);
-		}
 
-		/* Toggle LANPHYPC Value bit */
-		mac_reg = E1000_READ_REG(hw, E1000_CTRL);
-		mac_reg |= E1000_CTRL_LANPHYPC_OVERRIDE;
-		mac_reg &= ~E1000_CTRL_LANPHYPC_VALUE;
-		E1000_WRITE_REG(hw, E1000_CTRL, mac_reg);
-		E1000_WRITE_FLUSH(hw);
-		usec_delay(10);
-		mac_reg &= ~E1000_CTRL_LANPHYPC_OVERRIDE;
-		E1000_WRITE_REG(hw, E1000_CTRL, mac_reg);
-		E1000_WRITE_FLUSH(hw);
-		if (hw->mac.type < e1000_pch_lpt) {
-			msec_delay(50);
-		} else {
-			u16 count = 20;
-			do {
-				msec_delay(5);
-			} while (!(E1000_READ_REG(hw, E1000_CTRL_EXT) &
-				   E1000_CTRL_EXT_LPCD) && count--);
+			if (e1000_phy_is_accessible_pchlan(hw))
+				break;
+
+			ret_val = -E1000_ERR_PHY;
 		}
 		break;
 	default:
@@ -334,13 +375,33 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
 	}
 
 	hw->phy.ops.release(hw);
+	if (!ret_val) {
 
-	/* Reset the PHY before any access to it.  Doing so, ensures
-	 * that the PHY is in a known good state before we read/write
-	 * PHY registers.  The generic reset is sufficient here,
-	 * because we haven't determined the PHY type yet.
-	 */
-	ret_val = e1000_phy_hw_reset_generic(hw);
+		/* Check to see if able to reset PHY.  Print error if not */
+		if (hw->phy.ops.check_reset_block(hw)) {
+			ERROR_REPORT("Reset blocked by ME\n");
+			goto out;
+		}
+
+		/* Reset the PHY before any access to it.  Doing so, ensures
+		 * that the PHY is in a known good state before we read/write
+		 * PHY registers.  The generic reset is sufficient here,
+		 * because we haven't determined the PHY type yet.
+		 */
+		ret_val = e1000_phy_hw_reset_generic(hw);
+		if (ret_val)
+			goto out;
+
+		/* On a successful reset, possibly need to wait for the PHY
+		 * to quiesce to an accessible state before returning control
+		 * to the calling function.  If the PHY does not quiesce, then
+		 * return E1000E_BLK_PHY_RESET, as this is the condition that
+		 *  the PHY is in.
+		 */
+		ret_val = hw->phy.ops.check_reset_block(hw);
+		if (ret_val)
+			ERROR_REPORT("ME blocked access to PHY after reset\n");
+	}
 
 out:
 	/* Ungate automatic PHY configuration on non-managed 82579 */
@@ -572,8 +633,8 @@ static s32 e1000_init_nvm_params_ich8lan(struct e1000_hw *hw)
 	/* find total size of the NVM, then cut in half since the total
 	 * size represents two separate NVM banks.
 	 */
-	nvm->flash_bank_size = (sector_end_addr - sector_base_addr)
-				<< FLASH_SECTOR_ADDR_SHIFT;
+	nvm->flash_bank_size = ((sector_end_addr - sector_base_addr)
+				<< FLASH_SECTOR_ADDR_SHIFT);
 	nvm->flash_bank_size /= 2;
 	/* Adjust to word count */
 	nvm->flash_bank_size /= sizeof(u16);
@@ -766,7 +827,7 @@ s32 e1000_read_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 *data)
  *
  *  Assumes the SW/FW/HW Semaphore is already acquired.
  **/
-static s32 e1000_write_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 data)
+s32 e1000_write_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 data)
 {
 	DEBUGFUNC("e1000_read_emi_reg_locked");
 
@@ -780,18 +841,35 @@ static s32 e1000_write_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 data)
  *  Enable/disable EEE based on setting in dev_spec structure, the duplex of
  *  the link and the EEE capabilities of the link partner.  The LPI Control
  *  register bits will remain set only if/when link is up.
+ *
+ *  EEE LPI must not be asserted earlier than one second after link is up.
+ *  On 82579, EEE LPI should not be enabled until such time otherwise there
+ *  can be link issues with some switches.  Other devices can have EEE LPI
+ *  enabled immediately upon link up since they have a timer in hardware which
+ *  prevents LPI from being asserted too early.
  **/
-static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
+s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
 {
 	struct e1000_dev_spec_ich8lan *dev_spec = &hw->dev_spec.ich8lan;
 	s32 ret_val;
-	u16 lpi_ctrl;
+	u16 lpa, pcs_status, adv, adv_addr, lpi_ctrl, data;
 
 	DEBUGFUNC("e1000_set_eee_pchlan");
 
-	if ((hw->phy.type != e1000_phy_82579) &&
-	    (hw->phy.type != e1000_phy_i217))
+	switch (hw->phy.type) {
+	case e1000_phy_82579:
+		lpa = I82579_EEE_LP_ABILITY;
+		pcs_status = I82579_EEE_PCS_STATUS;
+		adv_addr = I82579_EEE_ADVERTISEMENT;
+		break;
+	case e1000_phy_i217:
+		lpa = I217_EEE_LP_ABILITY;
+		pcs_status = I217_EEE_PCS_STATUS;
+		adv_addr = I217_EEE_ADVERTISEMENT;
+		break;
+	default:
 		return E1000_SUCCESS;
+	}
 
 	ret_val = hw->phy.ops.acquire(hw);
 	if (ret_val)
@@ -806,34 +884,24 @@ static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
 
 	/* Enable EEE if not disabled by user */
 	if (!dev_spec->eee_disable) {
-		u16 lpa, pcs_status, data;
-
 		/* Save off link partner's EEE ability */
-		switch (hw->phy.type) {
-		case e1000_phy_82579:
-			lpa = I82579_EEE_LP_ABILITY;
-			pcs_status = I82579_EEE_PCS_STATUS;
-			break;
-		case e1000_phy_i217:
-			lpa = I217_EEE_LP_ABILITY;
-			pcs_status = I217_EEE_PCS_STATUS;
-			break;
-		default:
-			ret_val = -E1000_ERR_PHY;
-			goto release;
-		}
 		ret_val = e1000_read_emi_reg_locked(hw, lpa,
 						    &dev_spec->eee_lp_ability);
 		if (ret_val)
 			goto release;
 
+		/* Read EEE advertisement */
+		ret_val = e1000_read_emi_reg_locked(hw, adv_addr, &adv);
+		if (ret_val)
+			goto release;
+
 		/* Enable EEE only for speeds in which the link partner is
-		 * EEE capable.
+		 * EEE capable and for which we advertise EEE.
 		 */
-		if (dev_spec->eee_lp_ability & I82579_EEE_1000_SUPPORTED)
+		if (adv & dev_spec->eee_lp_ability & I82579_EEE_1000_SUPPORTED)
 			lpi_ctrl |= I82579_LPI_CTRL_1000_ENABLE;
 
-		if (dev_spec->eee_lp_ability & I82579_EEE_100_SUPPORTED) {
+		if (adv & dev_spec->eee_lp_ability & I82579_EEE_100_SUPPORTED) {
 			hw->phy.ops.read_reg_locked(hw, PHY_LP_ABILITY, &data);
 			if (data & NWAY_LPAR_100TX_FD_CAPS)
 				lpi_ctrl |= I82579_LPI_CTRL_100_ENABLE;
@@ -845,13 +913,13 @@ static s32 e1000_set_eee_pchlan(struct e1000_hw *hw)
 				dev_spec->eee_lp_ability &=
 				    ~I82579_EEE_100_SUPPORTED;
 		}
-
-		/* R/Clr IEEE MMD 3.1 bits 11:10 - Tx/Rx LPI Received */
-		ret_val = e1000_read_emi_reg_locked(hw, pcs_status, &data);
-		if (ret_val)
-			goto release;
 	}
 
+	/* R/Clr IEEE MMD 3.1 bits 11:10 - Tx/Rx LPI Received */
+	ret_val = e1000_read_emi_reg_locked(hw, pcs_status, &data);
+	if (ret_val)
+		goto release;
+
 	ret_val = hw->phy.ops.write_reg_locked(hw, I82579_LPI_CTRL, lpi_ctrl);
 release:
 	hw->phy.ops.release(hw);
@@ -867,30 +935,31 @@ release:
  *  When K1 is enabled for 1Gbps, the MAC can miss 2 DMA completion indications
  *  preventing further DMA write requests.  Workaround the issue by disabling
  *  the de-assertion of the clock request when in 1Gpbs mode.
+ *  Also, set appropriate Tx re-transmission timeouts for 10 and 100Half link
+ *  speeds in order to avoid Tx hangs.
  **/
 static s32 e1000_k1_workaround_lpt_lp(struct e1000_hw *hw, bool link)
 {
 	u32 fextnvm6 = E1000_READ_REG(hw, E1000_FEXTNVM6);
+	u32 status = E1000_READ_REG(hw, E1000_STATUS);
 	s32 ret_val = E1000_SUCCESS;
+	u16 reg;
 
-	if (link && (E1000_READ_REG(hw, E1000_STATUS) &
-		     E1000_STATUS_SPEED_1000)) {
-		u16 kmrn_reg;
-
+	if (link && (status & E1000_STATUS_SPEED_1000)) {
 		ret_val = hw->phy.ops.acquire(hw);
 		if (ret_val)
 			return ret_val;
 
 		ret_val =
 		    e1000_read_kmrn_reg_locked(hw, E1000_KMRNCTRLSTA_K1_CONFIG,
-					       &kmrn_reg);
+					       &reg);
 		if (ret_val)
 			goto release;
 
 		ret_val =
 		    e1000_write_kmrn_reg_locked(hw,
 						E1000_KMRNCTRLSTA_K1_CONFIG,
-						kmrn_reg &
+						reg &
 						~E1000_KMRNCTRLSTA_K1_ENABLE);
 		if (ret_val)
 			goto release;
@@ -903,13 +972,45 @@ static s32 e1000_k1_workaround_lpt_lp(struct e1000_hw *hw, bool link)
 		ret_val =
 		    e1000_write_kmrn_reg_locked(hw,
 						E1000_KMRNCTRLSTA_K1_CONFIG,
-						kmrn_reg);
+						reg);
 release:
 		hw->phy.ops.release(hw);
 	} else {
 		/* clear FEXTNVM6 bit 8 on link down or 10/100 */
-		E1000_WRITE_REG(hw, E1000_FEXTNVM6,
-				fextnvm6 & ~E1000_FEXTNVM6_REQ_PLL_CLK);
+		fextnvm6 &= ~E1000_FEXTNVM6_REQ_PLL_CLK;
+
+		if (!link || ((status & E1000_STATUS_SPEED_100) &&
+			      (status & E1000_STATUS_FD)))
+			goto update_fextnvm6;
+
+		ret_val = hw->phy.ops.read_reg(hw, I217_INBAND_CTRL, &reg);
+		if (ret_val)
+			return ret_val;
+
+		/* Clear link status transmit timeout */
+		reg &= ~I217_INBAND_CTRL_LINK_STAT_TX_TIMEOUT_MASK;
+
+		if (status & E1000_STATUS_SPEED_100) {
+			/* Set inband Tx timeout to 5x10us for 100Half */
+			reg |= 5 << I217_INBAND_CTRL_LINK_STAT_TX_TIMEOUT_SHIFT;
+
+			/* Do not extend the K1 entry latency for 100Half */
+			fextnvm6 &= ~E1000_FEXTNVM6_ENABLE_K1_ENTRY_CONDITION;
+		} else {
+			/* Set inband Tx timeout to 50x10us for 10Full/Half */
+			reg |= 50 <<
+			       I217_INBAND_CTRL_LINK_STAT_TX_TIMEOUT_SHIFT;
+
+			/* Extend the K1 entry latency for 10 Mbps */
+			fextnvm6 |= E1000_FEXTNVM6_ENABLE_K1_ENTRY_CONDITION;
+		}
+
+		ret_val = hw->phy.ops.write_reg(hw, I217_INBAND_CTRL, reg);
+		if (ret_val)
+			return ret_val;
+
+update_fextnvm6:
+		E1000_WRITE_REG(hw, E1000_FEXTNVM6, fextnvm6);
 	}
 
 	return ret_val;
@@ -1018,7 +1119,6 @@ static s32 e1000_platform_pm_pch_lpt(struct e1000_hw *hw, bool link)
 			lat_ns /= 1000000000;
 			obff_hwm = (s32)(rxa - lat_ns);
 		}
-
 		if ((obff_hwm < 0) || (obff_hwm > E1000_SVT_OFF_HWM_MASK)) {
 			DEBUGOUT1("Invalid high water mark %d\n", obff_hwm);
 			return -E1000_ERR_CONFIG;
@@ -1103,13 +1203,13 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
 	if (!mac->get_link_status)
 		return E1000_SUCCESS;
 
-	/* First we want to see if the MII Status Register reports
-	 * link.  If so, then we want to get the current speed/duplex
-	 * of the PHY.
-	 */
-	ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
-	if (ret_val)
-		return ret_val;
+		/* First we want to see if the MII Status Register reports
+		 * link.  If so, then we want to get the current speed/duplex
+		 * of the PHY.
+		 */
+		ret_val = e1000_phy_has_link_generic(hw, 1, 0, &link);
+		if (ret_val)
+			return ret_val;
 
 	if (hw->mac.type == e1000_pchlan) {
 		ret_val = e1000_k1_gig_workaround_hv(hw, link);
@@ -1153,8 +1253,9 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
 	}
 
 	if (hw->mac.type == e1000_pch_lpt) {
-		/* Set platform power management values for Latency Tolerance
-		 * Reporting (LTR) and Optimized Buffer Flush/Fill (OBFF).
+		/* Set platform power management values for
+		 * Latency Tolerance Reporting (LTR)
+		 * Optimized Buffer Flush/Fill (OBFF)
 		 */
 		ret_val = e1000_platform_pm_pch_lpt(hw, link);
 		if (ret_val)
@@ -1206,9 +1307,11 @@ static s32 e1000_check_for_copper_link_ich8lan(struct e1000_hw *hw)
 	e1000_check_downshift_generic(hw);
 
 	/* Enable/Disable EEE after link up */
-	ret_val = e1000_set_eee_pchlan(hw);
-	if (ret_val)
-		return ret_val;
+	if (hw->phy.type > e1000_phy_82579) {
+		ret_val = e1000_set_eee_pchlan(hw);
+		if (ret_val)
+			return ret_val;
+	}
 
 	/* If we are forcing speed/duplex, then we simply return since
 	 * we have already determined whether we have link or not.
@@ -1396,9 +1499,9 @@ static bool e1000_check_mng_mode_ich8lan(struct e1000_hw *hw)
 
 	fwsm = E1000_READ_REG(hw, E1000_FWSM);
 
-	return (fwsm & E1000_ICH_FWSM_FW_VALID) &&
-	       ((fwsm & E1000_FWSM_MODE_MASK) ==
-		(E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT));
+	return ((fwsm & E1000_ICH_FWSM_FW_VALID) &&
+		((fwsm & E1000_FWSM_MODE_MASK) ==
+		 (E1000_ICH_MNG_IAMT_MODE << E1000_FWSM_MODE_SHIFT)));
 }
 
 /**
@@ -1459,7 +1562,10 @@ static void e1000_rar_set_pch2lan(struct e1000_hw *hw, u8 *addr, u32 index)
 		return;
 	}
 
-	if (index < hw->mac.rar_entry_count) {
+	/* RAR[1-6] are owned by manageability.  Skip those and program the
+	 * next address into the SHRA register array.
+	 */
+	if (index < (u32) (hw->mac.rar_entry_count - 6)) {
 		s32 ret_val;
 
 		ret_val = e1000_acquire_swflag_ich8lan(hw);
@@ -1619,13 +1725,21 @@ release:
 static s32 e1000_check_reset_block_ich8lan(struct e1000_hw *hw)
 {
 	u32 fwsm;
+	bool blocked = FALSE;
+	int i = 0;
 
 	DEBUGFUNC("e1000_check_reset_block_ich8lan");
 
-	fwsm = E1000_READ_REG(hw, E1000_FWSM);
-
-	return (fwsm & E1000_ICH_FWSM_RSPCIPHY) ? E1000_SUCCESS
-						: E1000_BLK_PHY_RESET;
+	do {
+		fwsm = E1000_READ_REG(hw, E1000_FWSM);
+		if (!(fwsm & E1000_ICH_FWSM_RSPCIPHY)) {
+			blocked = TRUE;
+			msec_delay(10);
+			continue;
+		}
+		blocked = FALSE;
+	} while (blocked && (i++ < 10));
+	return blocked ? E1000_BLK_PHY_RESET : E1000_SUCCESS;
 }
 
 /**
@@ -1825,9 +1939,9 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
 			if (ret_val)
 				goto release;
 
-			status_reg &= BM_CS_STATUS_LINK_UP |
-				      BM_CS_STATUS_RESOLVED |
-				      BM_CS_STATUS_SPEED_MASK;
+			status_reg &= (BM_CS_STATUS_LINK_UP |
+				       BM_CS_STATUS_RESOLVED |
+				       BM_CS_STATUS_SPEED_MASK);
 
 			if (status_reg == (BM_CS_STATUS_LINK_UP |
 					   BM_CS_STATUS_RESOLVED |
@@ -1841,9 +1955,9 @@ static s32 e1000_k1_gig_workaround_hv(struct e1000_hw *hw, bool link)
 			if (ret_val)
 				goto release;
 
-			status_reg &= HV_M_STATUS_LINK_UP |
-				      HV_M_STATUS_AUTONEG_COMPLETE |
-				      HV_M_STATUS_SPEED_MASK;
+			status_reg &= (HV_M_STATUS_LINK_UP |
+				       HV_M_STATUS_AUTONEG_COMPLETE |
+				       HV_M_STATUS_SPEED_MASK);
 
 			if (status_reg == (HV_M_STATUS_LINK_UP |
 					   HV_M_STATUS_AUTONEG_COMPLETE |
@@ -2125,8 +2239,8 @@ void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw)
 	if (ret_val)
 		goto release;
 
-	/* Copy both RAL/H (rar_entry_count) and SHRAL/H (+4) to PHY */
-	for (i = 0; i < (hw->mac.rar_entry_count + 4); i++) {
+	/* Copy both RAL/H (rar_entry_count) and SHRAL/H to PHY */
+	for (i = 0; i < (hw->mac.rar_entry_count); i++) {
 		mac_reg = E1000_READ_REG(hw, E1000_RAL(i));
 		hw->phy.ops.write_reg_page(hw, BM_RAR_L(i),
 					   (u16)(mac_reg & 0xFFFF));
@@ -2191,10 +2305,10 @@ s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable)
 		return ret_val;
 
 	if (enable) {
-		/* Write Rx addresses (rar_entry_count for RAL/H, +4 for
+		/* Write Rx addresses (rar_entry_count for RAL/H, and
 		 * SHRAL/H) and initial CRC values to the MAC
 		 */
-		for (i = 0; i < (hw->mac.rar_entry_count + 4); i++) {
+		for (i = 0; i < hw->mac.rar_entry_count; i++) {
 			u8 mac_addr[ETH_ADDR_LEN] = {0};
 			u32 addr_high, addr_low;
 
@@ -3112,11 +3226,11 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 
 	DEBUGFUNC("e1000_read_flash_data_ich8lan");
 
-	if (size < 1  || size > 2 || offset > ICH_FLASH_LINEAR_ADDR_MASK)
+	if (size < 1 || size > 2 || offset > ICH_FLASH_LINEAR_ADDR_MASK)
 		return -E1000_ERR_NVM;
 
-	flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
-			    hw->nvm.flash_base_addr;
+	flash_linear_addr = ((ICH_FLASH_LINEAR_ADDR_MASK & offset) +
+			     hw->nvm.flash_base_addr);
 
 	do {
 		usec_delay(1);
@@ -3133,8 +3247,9 @@ static s32 e1000_read_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 
 		E1000_WRITE_FLASH_REG(hw, ICH_FLASH_FADDR, flash_linear_addr);
 
-		ret_val = e1000_flash_cycle_ich8lan(hw,
-						ICH_FLASH_READ_COMMAND_TIMEOUT);
+		ret_val =
+		    e1000_flash_cycle_ich8lan(hw,
+					      ICH_FLASH_READ_COMMAND_TIMEOUT);
 
 		/* Check if FCERR is set to 1, if set to 1, clear it
 		 * and try the whole sequence a few more times, else
@@ -3437,8 +3552,8 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 	    offset > ICH_FLASH_LINEAR_ADDR_MASK)
 		return -E1000_ERR_NVM;
 
-	flash_linear_addr = (ICH_FLASH_LINEAR_ADDR_MASK & offset) +
-			    hw->nvm.flash_base_addr;
+	flash_linear_addr = ((ICH_FLASH_LINEAR_ADDR_MASK & offset) +
+			     hw->nvm.flash_base_addr);
 
 	do {
 		usec_delay(1);
@@ -3465,8 +3580,9 @@ static s32 e1000_write_flash_data_ich8lan(struct e1000_hw *hw, u32 offset,
 		/* check if FCERR is set to 1 , if set to 1, clear it
 		 * and try the whole sequence a few more times else done
 		 */
-		ret_val = e1000_flash_cycle_ich8lan(hw,
-					       ICH_FLASH_WRITE_COMMAND_TIMEOUT);
+		ret_val =
+		    e1000_flash_cycle_ich8lan(hw,
+					      ICH_FLASH_WRITE_COMMAND_TIMEOUT);
 		if (ret_val == E1000_SUCCESS)
 			break;
 
@@ -3602,8 +3718,10 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
 	flash_linear_addr = hw->nvm.flash_base_addr;
 	flash_linear_addr += (bank) ? flash_bank_size : 0;
 
-	for (j = 0; j < iteration ; j++) {
+	for (j = 0; j < iteration; j++) {
 		do {
+			u32 timeout = ICH_FLASH_ERASE_COMMAND_TIMEOUT;
+
 			/* Steps */
 			ret_val = e1000_flash_cycle_init_ich8lan(hw);
 			if (ret_val)
@@ -3626,8 +3744,7 @@ static s32 e1000_erase_flash_bank_ich8lan(struct e1000_hw *hw, u32 bank)
 			E1000_WRITE_FLASH_REG(hw, ICH_FLASH_FADDR,
 					      flash_linear_addr);
 
-			ret_val = e1000_flash_cycle_ich8lan(hw,
-					       ICH_FLASH_ERASE_COMMAND_TIMEOUT);
+			ret_val = e1000_flash_cycle_ich8lan(hw, timeout);
 			if (ret_val == E1000_SUCCESS)
 				break;
 
@@ -3947,16 +4064,16 @@ static s32 e1000_init_hw_ich8lan(struct e1000_hw *hw)
 
 	/* Set the transmit descriptor write-back policy for both queues */
 	txdctl = E1000_READ_REG(hw, E1000_TXDCTL(0));
-	txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
-		 E1000_TXDCTL_FULL_TX_DESC_WB;
-	txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
-		 E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
+	txdctl = ((txdctl & ~E1000_TXDCTL_WTHRESH) |
+		  E1000_TXDCTL_FULL_TX_DESC_WB);
+	txdctl = ((txdctl & ~E1000_TXDCTL_PTHRESH) |
+		  E1000_TXDCTL_MAX_TX_DESC_PREFETCH);
 	E1000_WRITE_REG(hw, E1000_TXDCTL(0), txdctl);
 	txdctl = E1000_READ_REG(hw, E1000_TXDCTL(1));
-	txdctl = (txdctl & ~E1000_TXDCTL_WTHRESH) |
-		 E1000_TXDCTL_FULL_TX_DESC_WB;
-	txdctl = (txdctl & ~E1000_TXDCTL_PTHRESH) |
-		 E1000_TXDCTL_MAX_TX_DESC_PREFETCH;
+	txdctl = ((txdctl & ~E1000_TXDCTL_WTHRESH) |
+		  E1000_TXDCTL_FULL_TX_DESC_WB);
+	txdctl = ((txdctl & ~E1000_TXDCTL_PTHRESH) |
+		  E1000_TXDCTL_MAX_TX_DESC_PREFETCH);
 	E1000_WRITE_REG(hw, E1000_TXDCTL(1), txdctl);
 
 	/* ICH8 has opposite polarity of no_snoop bits.
@@ -4032,7 +4149,7 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
 	/* Device Status */
 	if (hw->mac.type == e1000_ich8lan) {
 		reg = E1000_READ_REG(hw, E1000_STATUS);
-		reg &= ~(1 << 31);
+		reg &= ~(1U << 31);
 		E1000_WRITE_REG(hw, E1000_STATUS, reg);
 	}
 
@@ -4041,6 +4158,7 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw)
 	 */
 	reg = E1000_READ_REG(hw, E1000_RFCTL);
 	reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS);
+
 	/* Disable IPv6 extension header parsing because some malformed
 	 * IPv6 headers can hang the Rx.
 	 */
@@ -4502,14 +4620,25 @@ void e1000_suspend_workarounds_ich8lan(struct e1000_hw *hw)
 
 			/* Disable LPLU if both link partners support 100BaseT
 			 * EEE and 100Full is advertised on both ends of the
-			 * link.
+			 * link, and enable Auto Enable LPI since there will
+			 * be no driver to enable LPI while in Sx.
 			 */
 			if ((eee_advert & I82579_EEE_100_SUPPORTED) &&
 			    (dev_spec->eee_lp_ability &
 			     I82579_EEE_100_SUPPORTED) &&
-			    (hw->phy.autoneg_advertised & ADVERTISE_100_FULL))
+			    (hw->phy.autoneg_advertised & ADVERTISE_100_FULL)) {
 				phy_ctrl &= ~(E1000_PHY_CTRL_D0A_LPLU |
 					      E1000_PHY_CTRL_NOND0A_LPLU);
+
+				/* Set Auto Enable LPI after link up */
+				hw->phy.ops.read_reg_locked(hw,
+							    I217_LPI_GPIO_CTRL,
+							    &phy_reg);
+				phy_reg |= I217_LPI_GPIO_CTRL_AUTO_EN_LPI;
+				hw->phy.ops.write_reg_locked(hw,
+							     I217_LPI_GPIO_CTRL,
+							     phy_reg);
+			}
 		}
 
 		/* For i217 Intel Rapid Start Technology support,
@@ -4613,6 +4742,11 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)
 			return;
 		}
 
+		/* Clear Auto Enable LPI after link up */
+		hw->phy.ops.read_reg_locked(hw, I217_LPI_GPIO_CTRL, &phy_reg);
+		phy_reg &= ~I217_LPI_GPIO_CTRL_AUTO_EN_LPI;
+		hw->phy.ops.write_reg_locked(hw, I217_LPI_GPIO_CTRL, phy_reg);
+
 		if (!(E1000_READ_REG(hw, E1000_FWSM) &
 		    E1000_ICH_FWSM_FW_VALID)) {
 			/* Restore clear on SMB if no manageability engine
diff --git a/sys/dev/e1000/e1000_ich8lan.h b/sys/dev/e1000/e1000_ich8lan.h
index bf928981709..2dbf8127664 100644
--- a/sys/dev/e1000/e1000_ich8lan.h
+++ b/sys/dev/e1000/e1000_ich8lan.h
@@ -60,10 +60,10 @@
 #define ICH_FLASH_SEG_SIZE_8K		8192
 #define ICH_FLASH_SEG_SIZE_64K		65536
 
-#define E1000_ICH_FWSM_RSPCIPHY		0x00000040 /* Reset PHY on PCI Reset */
+#define E1000_ICH_FWSM_RSPCIPHY	0x00000040 /* Reset PHY on PCI Reset */
 /* FW established a valid mode */
-#define E1000_ICH_FWSM_FW_VALID		0x00008000
-#define E1000_ICH_FWSM_PCIM2PCI		0x01000000 /* ME PCIm-to-PCI active */
+#define E1000_ICH_FWSM_FW_VALID	0x00008000
+#define E1000_ICH_FWSM_PCIM2PCI	0x01000000 /* ME PCIm-to-PCI active */
 #define E1000_ICH_FWSM_PCIM2PCI_COUNT	2000
 
 #define E1000_ICH_MNG_IAMT_MODE		0x2
@@ -88,7 +88,7 @@
 #define E1000_ICH8_LAN_INIT_TIMEOUT	1500
 
 #define E1000_FEXTNVM_SW_CONFIG		1
-#define E1000_FEXTNVM_SW_CONFIG_ICH8M	(1 << 27) /* Bit redefined for ICH8M */
+#define E1000_FEXTNVM_SW_CONFIG_ICH8M	(1 << 27) /* different on ICH8M */
 
 #define E1000_FEXTNVM3_PHY_CFG_COUNTER_MASK	0x0C000000
 #define E1000_FEXTNVM3_PHY_CFG_COUNTER_50MSEC	0x08000000
@@ -98,18 +98,19 @@
 #define E1000_FEXTNVM4_BEACON_DURATION_16USEC	0x3
 
 #define E1000_FEXTNVM6_REQ_PLL_CLK	0x00000100
+#define E1000_FEXTNVM6_ENABLE_K1_ENTRY_CONDITION	0x00000200
 
 #define PCIE_ICH8_SNOOP_ALL	PCIE_NO_SNOOP_ALL
 
 #define E1000_ICH_RAR_ENTRIES	7
-#define E1000_PCH2_RAR_ENTRIES	5 /* RAR[0], SHRA[0-3] */
+#define E1000_PCH2_RAR_ENTRIES	11 /* RAR[0-6], SHRA[0-3] */
 #define E1000_PCH_LPT_RAR_ENTRIES	12 /* RAR[0], SHRA[0-10] */
 
 #define PHY_PAGE_SHIFT		5
 #define PHY_REG(page, reg)	(((page) << PHY_PAGE_SHIFT) | \
 				 ((reg) & MAX_PHY_REG_ADDRESS))
-#define IGP3_KMRN_DIAG		PHY_REG(770, 19) /* KMRN Diagnostic */
-#define IGP3_VR_CTRL		PHY_REG(776, 18) /* Voltage Regulator Control */
+#define IGP3_KMRN_DIAG	PHY_REG(770, 19) /* KMRN Diagnostic */
+#define IGP3_VR_CTRL	PHY_REG(776, 18) /* Voltage Regulator Control */
 
 #define IGP3_KMRN_DIAG_PCS_LOCK_LOSS		0x0002
 #define IGP3_VR_CTRL_DEV_POWERDOWN_MODE_MASK	0x0300
@@ -140,19 +141,20 @@
 #define HV_MUX_DATA_CTRL_GEN_TO_MAC	0x0400
 #define HV_MUX_DATA_CTRL_FORCE_SPEED	0x0004
 #define HV_STATS_PAGE	778
-#define HV_SCC_UPPER	PHY_REG(HV_STATS_PAGE, 16) /* Single Collision Count */
+/* Half-duplex collision counts */
+#define HV_SCC_UPPER	PHY_REG(HV_STATS_PAGE, 16) /* Single Collision */
 #define HV_SCC_LOWER	PHY_REG(HV_STATS_PAGE, 17)
-#define HV_ECOL_UPPER	PHY_REG(HV_STATS_PAGE, 18) /* Excessive Coll. Count */
+#define HV_ECOL_UPPER	PHY_REG(HV_STATS_PAGE, 18) /* Excessive Coll. */
 #define HV_ECOL_LOWER	PHY_REG(HV_STATS_PAGE, 19)
-#define HV_MCC_UPPER	PHY_REG(HV_STATS_PAGE, 20) /* Multiple Coll. Count */
+#define HV_MCC_UPPER	PHY_REG(HV_STATS_PAGE, 20) /* Multiple Collision */
 #define HV_MCC_LOWER	PHY_REG(HV_STATS_PAGE, 21)
-#define HV_LATECOL_UPPER PHY_REG(HV_STATS_PAGE, 23) /* Late Collision Count */
+#define HV_LATECOL_UPPER PHY_REG(HV_STATS_PAGE, 23) /* Late Collision */
 #define HV_LATECOL_LOWER PHY_REG(HV_STATS_PAGE, 24)
-#define HV_COLC_UPPER	PHY_REG(HV_STATS_PAGE, 25) /* Collision Count */
+#define HV_COLC_UPPER	PHY_REG(HV_STATS_PAGE, 25) /* Collision */
 #define HV_COLC_LOWER	PHY_REG(HV_STATS_PAGE, 26)
 #define HV_DC_UPPER	PHY_REG(HV_STATS_PAGE, 27) /* Defer Count */
 #define HV_DC_LOWER	PHY_REG(HV_STATS_PAGE, 28)
-#define HV_TNCRS_UPPER	PHY_REG(HV_STATS_PAGE, 29) /* Transmit with no CRS */
+#define HV_TNCRS_UPPER	PHY_REG(HV_STATS_PAGE, 29) /* Tx with no CRS */
 #define HV_TNCRS_LOWER	PHY_REG(HV_STATS_PAGE, 30)
 
 #define E1000_FCRTV_PCH	0x05F40 /* PCH Flow Control Refresh Timer Value */
@@ -201,6 +203,15 @@
 
 #define SW_FLAG_TIMEOUT		1000 /* SW Semaphore flag timeout in ms */
 
+/* Inband Control */
+#define I217_INBAND_CTRL				PHY_REG(770, 18)
+#define I217_INBAND_CTRL_LINK_STAT_TX_TIMEOUT_MASK	0x3F00
+#define I217_INBAND_CTRL_LINK_STAT_TX_TIMEOUT_SHIFT	8
+
+/* Low Power Idle GPIO Control */
+#define I217_LPI_GPIO_CTRL			PHY_REG(772, 18)
+#define I217_LPI_GPIO_CTRL_AUTO_EN_LPI		0x0800
+
 /* PHY Low Power Idle Control */
 #define I82579_LPI_CTRL				PHY_REG(772, 20)
 #define I82579_LPI_CTRL_100_ENABLE		0x2000
@@ -208,6 +219,10 @@
 #define I82579_LPI_CTRL_ENABLE_MASK		0x6000
 #define I82579_LPI_CTRL_FORCE_PLL_LOCK_COUNT	0x80
 
+/* 82579 DFT Control */
+#define I82579_DFT_CTRL			PHY_REG(769, 20)
+#define I82579_DFT_CTRL_GATE_PHY_RESET	0x0040 /* Gate PHY Reset on MAC Reset */
+
 /* Extended Management Interface (EMI) Registers */
 #define I82579_EMI_ADDR		0x10
 #define I82579_EMI_DATA		0x11
@@ -216,12 +231,12 @@
 #define I82577_MSE_THRESHOLD	0x0887 /* 82577 Mean Square Error Threshold */
 #define I82579_MSE_LINK_DOWN	0x2411 /* MSE count before dropping link */
 #define I82579_RX_CONFIG		0x3412 /* Receive configuration */
-#define I82579_EEE_PCS_STATUS		0x182D	/* IEEE MMD Register 3.1 >> 8 */
+#define I82579_EEE_PCS_STATUS		0x182E	/* IEEE MMD Register 3.1 >> 8 */
 #define I82579_EEE_CAPABILITY		0x0410 /* IEEE MMD Register 3.20 */
 #define I82579_EEE_ADVERTISEMENT	0x040E /* IEEE MMD Register 7.60 */
 #define I82579_EEE_LP_ABILITY		0x040F /* IEEE MMD Register 7.61 */
-#define I82579_EEE_100_SUPPORTED	(1 << 1) /* 100BaseTx EEE supported */
-#define I82579_EEE_1000_SUPPORTED	(1 << 2) /* 1000BaseTx EEE supported */
+#define I82579_EEE_100_SUPPORTED	(1 << 1) /* 100BaseTx EEE */
+#define I82579_EEE_1000_SUPPORTED	(1 << 2) /* 1000BaseTx EEE */
 #define I217_EEE_PCS_STATUS	0x9401   /* IEEE MMD Register 3.1 */
 #define I217_EEE_CAPABILITY	0x8000   /* IEEE MMD Register 3.20 */
 #define I217_EEE_ADVERTISEMENT	0x8001   /* IEEE MMD Register 7.60 */
@@ -274,4 +289,7 @@ s32 e1000_configure_k1_ich8lan(struct e1000_hw *hw, bool k1_enable);
 void e1000_copy_rx_addrs_to_phy_ich8lan(struct e1000_hw *hw);
 s32 e1000_lv_jumbo_workaround_ich8lan(struct e1000_hw *hw, bool enable);
 s32 e1000_read_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 *data);
+s32 e1000_write_emi_reg_locked(struct e1000_hw *hw, u16 addr, u16 data);
+s32 e1000_set_eee_pchlan(struct e1000_hw *hw);
+void e1000_toggle_lanphypc_pch_lpt(struct e1000_hw *hw);
 #endif /* _E1000_ICH8LAN_H_ */
diff --git a/sys/dev/e1000/e1000_mac.c b/sys/dev/e1000/e1000_mac.c
index 9e6b30c49f5..cba3feaf862 100644
--- a/sys/dev/e1000/e1000_mac.c
+++ b/sys/dev/e1000/e1000_mac.c
@@ -85,7 +85,7 @@ void e1000_init_mac_ops_generic(struct e1000_hw *hw)
  *  e1000_null_ops_generic - No-op function, returns 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_ops_generic(struct e1000_hw *hw)
+s32 e1000_null_ops_generic(struct e1000_hw E1000_UNUSEDARG *hw)
 {
 	DEBUGFUNC("e1000_null_ops_generic");
 	return E1000_SUCCESS;
@@ -95,7 +95,7 @@ s32 e1000_null_ops_generic(struct e1000_hw *hw)
  *  e1000_null_mac_generic - No-op function, return void
  *  @hw: pointer to the HW structure
  **/
-void e1000_null_mac_generic(struct e1000_hw *hw)
+void e1000_null_mac_generic(struct e1000_hw E1000_UNUSEDARG *hw)
 {
 	DEBUGFUNC("e1000_null_mac_generic");
 	return;
@@ -105,7 +105,8 @@ void e1000_null_mac_generic(struct e1000_hw *hw)
  *  e1000_null_link_info - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_link_info(struct e1000_hw *hw, u16 *s, u16 *d)
+s32 e1000_null_link_info(struct e1000_hw E1000_UNUSEDARG *hw,
+			 u16 E1000_UNUSEDARG *s, u16 E1000_UNUSEDARG *d)
 {
 	DEBUGFUNC("e1000_null_link_info");
 	return E1000_SUCCESS;
@@ -115,7 +116,8 @@ s32 e1000_null_link_info(struct e1000_hw *hw, u16 *s, u16 *d)
  *  e1000_null_mng_mode - No-op function, return FALSE
  *  @hw: pointer to the HW structure
  **/
-bool e1000_null_mng_mode(struct e1000_hw *hw) {
+bool e1000_null_mng_mode(struct e1000_hw E1000_UNUSEDARG *hw)
+{
 	DEBUGFUNC("e1000_null_mng_mode");
 	return FALSE;
 }
@@ -124,7 +126,8 @@ bool e1000_null_mng_mode(struct e1000_hw *hw) {
  *  e1000_null_update_mc - No-op function, return void
  *  @hw: pointer to the HW structure
  **/
-void e1000_null_update_mc(struct e1000_hw *hw, u8 *h, u32 a)
+void e1000_null_update_mc(struct e1000_hw E1000_UNUSEDARG *hw,
+			  u8 E1000_UNUSEDARG *h, u32 E1000_UNUSEDARG a)
 {
 	DEBUGFUNC("e1000_null_update_mc");
 	return;
@@ -134,7 +137,8 @@ void e1000_null_update_mc(struct e1000_hw *hw, u8 *h, u32 a)
  *  e1000_null_write_vfta - No-op function, return void
  *  @hw: pointer to the HW structure
  **/
-void e1000_null_write_vfta(struct e1000_hw *hw, u32 a, u32 b)
+void e1000_null_write_vfta(struct e1000_hw E1000_UNUSEDARG *hw,
+			   u32 E1000_UNUSEDARG a, u32 E1000_UNUSEDARG b)
 {
 	DEBUGFUNC("e1000_null_write_vfta");
 	return;
@@ -144,7 +148,8 @@ void e1000_null_write_vfta(struct e1000_hw *hw, u32 a, u32 b)
  *  e1000_null_rar_set - No-op function, return void
  *  @hw: pointer to the HW structure
  **/
-void e1000_null_rar_set(struct e1000_hw *hw, u8 *h, u32 a)
+void e1000_null_rar_set(struct e1000_hw E1000_UNUSEDARG *hw,
+			u8 E1000_UNUSEDARG *h, u32 E1000_UNUSEDARG a)
 {
 	DEBUGFUNC("e1000_null_rar_set");
 	return;
@@ -154,7 +159,8 @@ void e1000_null_rar_set(struct e1000_hw *hw, u8 *h, u32 a)
  *  e1000_null_set_obff_timer - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_set_obff_timer(struct e1000_hw *hw, u32 a)
+s32 e1000_null_set_obff_timer(struct e1000_hw E1000_UNUSEDARG *hw,
+			      u32 E1000_UNUSEDARG a)
 {
 	DEBUGFUNC("e1000_null_set_obff_timer");
 	return E1000_SUCCESS;
@@ -940,6 +946,7 @@ s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
 {
 	s32 ret_val;
 	u16 nvm_data;
+	u16 nvm_offset = 0;
 
 	DEBUGFUNC("e1000_set_default_fc_generic");
 
@@ -951,7 +958,18 @@ s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
 	 * control setting, then the variable hw->fc will
 	 * be initialized based on a value in the EEPROM.
 	 */
-	ret_val = hw->nvm.ops.read(hw, NVM_INIT_CONTROL2_REG, 1, &nvm_data);
+	if (hw->mac.type == e1000_i350) {
+		nvm_offset = NVM_82580_LAN_FUNC_OFFSET(hw->bus.func);
+		ret_val = hw->nvm.ops.read(hw,
+					   NVM_INIT_CONTROL2_REG +
+					   nvm_offset,
+					   1, &nvm_data);
+	} else {
+		ret_val = hw->nvm.ops.read(hw,
+					   NVM_INIT_CONTROL2_REG,
+					   1, &nvm_data);
+	}
+
 
 	if (ret_val) {
 		DEBUGOUT("NVM Read Error\n");
@@ -1675,7 +1693,7 @@ s32 e1000_get_speed_and_duplex_copper_generic(struct e1000_hw *hw, u16 *speed,
  *  Sets the speed and duplex to gigabit full duplex (the only possible option)
  *  for fiber/serdes links.
  **/
-s32 e1000_get_speed_and_duplex_fiber_serdes_generic(struct e1000_hw *hw,
+s32 e1000_get_speed_and_duplex_fiber_serdes_generic(struct e1000_hw E1000_UNUSEDARG *hw,
 						    u16 *speed, u16 *duplex)
 {
 	DEBUGFUNC("e1000_get_speed_and_duplex_fiber_serdes_generic");
@@ -2187,7 +2205,7 @@ static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw)
  *  Validate the MDI/MDIx setting, allowing for auto-crossover during forced
  *  operation.
  **/
-s32 e1000_validate_mdi_setting_crossover_generic(struct e1000_hw *hw)
+s32 e1000_validate_mdi_setting_crossover_generic(struct e1000_hw E1000_UNUSEDARG *hw)
 {
 	DEBUGFUNC("e1000_validate_mdi_setting_crossover_generic");
 
diff --git a/sys/dev/e1000/e1000_osdep.h b/sys/dev/e1000/e1000_osdep.h
index dd19613e0b3..9cf710e232a 100644
--- a/sys/dev/e1000/e1000_osdep.h
+++ b/sys/dev/e1000/e1000_osdep.h
@@ -60,6 +60,7 @@
 #define ASSERT(x) if(!(x)) panic("EM: x")
 
 #define usec_delay(x) DELAY(x)
+#define usec_delay_irq(x) DELAY(x)
 #define msec_delay(x) DELAY(1000*(x))
 #define msec_delay_irq(x) DELAY(1000*(x))
 
diff --git a/sys/dev/e1000/e1000_phy.c b/sys/dev/e1000/e1000_phy.c
index 241c1d5d307..38204109b98 100644
--- a/sys/dev/e1000/e1000_phy.c
+++ b/sys/dev/e1000/e1000_phy.c
@@ -104,7 +104,8 @@ void e1000_init_phy_ops_generic(struct e1000_hw *hw)
  *  e1000_null_set_page - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_set_page(struct e1000_hw *hw, u16 data)
+s32 e1000_null_set_page(struct e1000_hw E1000_UNUSEDARG *hw,
+			u16 E1000_UNUSEDARG data)
 {
 	DEBUGFUNC("e1000_null_set_page");
 	return E1000_SUCCESS;
@@ -114,7 +115,8 @@ s32 e1000_null_set_page(struct e1000_hw *hw, u16 data)
  *  e1000_null_read_reg - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_read_reg(struct e1000_hw *hw, u32 offset, u16 *data)
+s32 e1000_null_read_reg(struct e1000_hw E1000_UNUSEDARG *hw,
+			u32 E1000_UNUSEDARG offset, u16 E1000_UNUSEDARG *data)
 {
 	DEBUGFUNC("e1000_null_read_reg");
 	return E1000_SUCCESS;
@@ -124,7 +126,7 @@ s32 e1000_null_read_reg(struct e1000_hw *hw, u32 offset, u16 *data)
  *  e1000_null_phy_generic - No-op function, return void
  *  @hw: pointer to the HW structure
  **/
-void e1000_null_phy_generic(struct e1000_hw *hw)
+void e1000_null_phy_generic(struct e1000_hw E1000_UNUSEDARG *hw)
 {
 	DEBUGFUNC("e1000_null_phy_generic");
 	return;
@@ -134,7 +136,8 @@ void e1000_null_phy_generic(struct e1000_hw *hw)
  *  e1000_null_lplu_state - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_lplu_state(struct e1000_hw *hw, bool active)
+s32 e1000_null_lplu_state(struct e1000_hw E1000_UNUSEDARG *hw,
+			  bool E1000_UNUSEDARG active)
 {
 	DEBUGFUNC("e1000_null_lplu_state");
 	return E1000_SUCCESS;
@@ -144,7 +147,8 @@ s32 e1000_null_lplu_state(struct e1000_hw *hw, bool active)
  *  e1000_null_write_reg - No-op function, return 0
  *  @hw: pointer to the HW structure
  **/
-s32 e1000_null_write_reg(struct e1000_hw *hw, u32 offset, u16 data)
+s32 e1000_null_write_reg(struct e1000_hw E1000_UNUSEDARG *hw,
+			 u32 E1000_UNUSEDARG offset, u16 E1000_UNUSEDARG data)
 {
 	DEBUGFUNC("e1000_null_write_reg");
 	return E1000_SUCCESS;
@@ -158,8 +162,10 @@ s32 e1000_null_write_reg(struct e1000_hw *hw, u32 offset, u16 data)
  *  @data: data value read
  *
  **/
-s32 e1000_read_i2c_byte_null(struct e1000_hw *hw, u8 byte_offset,
-			     u8 dev_addr, u8 *data)
+s32 e1000_read_i2c_byte_null(struct e1000_hw E1000_UNUSEDARG *hw,
+			     u8 E1000_UNUSEDARG byte_offset,
+			     u8 E1000_UNUSEDARG dev_addr,
+			     u8 E1000_UNUSEDARG *data)
 {
 	DEBUGFUNC("e1000_read_i2c_byte_null");
 	return E1000_SUCCESS;
@@ -173,10 +179,10 @@ s32 e1000_read_i2c_byte_null(struct e1000_hw *hw, u8 byte_offset,
  *  @data: data value to write
  *
  **/
-s32 e1000_write_i2c_byte_null(struct e1000_hw *hw,
-			      u8 byte_offset,
-			      u8 dev_addr,
-			      u8 data)
+s32 e1000_write_i2c_byte_null(struct e1000_hw E1000_UNUSEDARG *hw,
+			      u8 E1000_UNUSEDARG byte_offset,
+			      u8 E1000_UNUSEDARG dev_addr,
+			      u8 E1000_UNUSEDARG data)
 {
 	DEBUGFUNC("e1000_write_i2c_byte_null");
 	return E1000_SUCCESS;
@@ -302,7 +308,7 @@ s32 e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
 	 * the lower time out
 	 */
 	for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-		usec_delay(50);
+		usec_delay_irq(50);
 		mdic = E1000_READ_REG(hw, E1000_MDIC);
 		if (mdic & E1000_MDIC_READY)
 			break;
@@ -327,7 +333,7 @@ s32 e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
 	 * reading duplicate data in the next MDIC transaction.
 	 */
 	if (hw->mac.type == e1000_pch2lan)
-		usec_delay(100);
+		usec_delay_irq(100);
 
 	return E1000_SUCCESS;
 }
@@ -368,7 +374,7 @@ s32 e1000_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
 	 * the lower time out
 	 */
 	for (i = 0; i < (E1000_GEN_POLL_TIMEOUT * 3); i++) {
-		usec_delay(50);
+		usec_delay_irq(50);
 		mdic = E1000_READ_REG(hw, E1000_MDIC);
 		if (mdic & E1000_MDIC_READY)
 			break;
@@ -392,7 +398,7 @@ s32 e1000_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
 	 * reading duplicate data in the next MDIC transaction.
 	 */
 	if (hw->mac.type == e1000_pch2lan)
-		usec_delay(100);
+		usec_delay_irq(100);
 
 	return E1000_SUCCESS;
 }
@@ -1054,16 +1060,12 @@ s32 e1000_copper_link_setup_82577(struct e1000_hw *hw)
 		}
 	}
 
-	/* Enable CRS on Tx. This must be set for half-duplex operation.
-	 * Not required on some PHYs.
-	 */
+	/* Enable CRS on Tx. This must be set for half-duplex operation. */
 	ret_val = hw->phy.ops.read_reg(hw, I82577_CFG_REG, &phy_data);
 	if (ret_val)
 		return ret_val;
 
-	if ((hw->phy.type != e1000_phy_82579) &&
-	    (hw->phy.type != e1000_phy_i217))
-		phy_data |= I82577_CFG_ASSERT_CRS_ON_TX;
+	phy_data |= I82577_CFG_ASSERT_CRS_ON_TX;
 
 	/* Enable downshift */
 	phy_data |= I82577_CFG_ENABLE_DOWNSHIFT;
@@ -1249,12 +1251,6 @@ s32 e1000_copper_link_setup_m88(struct e1000_hw *hw)
 			return ret_val;
 	}
 
-	if (phy->type == e1000_phy_i210) {
-		ret_val = e1000_set_master_slave_mode(hw);
-		if (ret_val)
-			return ret_val;
-	}
-
 	return E1000_SUCCESS;
 }
 
@@ -1318,6 +1314,20 @@ s32 e1000_copper_link_setup_m88_gen2(struct e1000_hw *hw)
 		phy_data |= M88E1000_PSCR_POLARITY_REVERSAL;
 
 	/* Enable downshift and setting it to X6 */
+	if (phy->id == M88E1543_E_PHY_ID) {
+		phy_data &= ~I347AT4_PSCR_DOWNSHIFT_ENABLE;
+		ret_val =
+		    phy->ops.write_reg(hw, M88E1000_PHY_SPEC_CTRL, phy_data);
+		if (ret_val)
+			return ret_val;
+
+		ret_val = phy->ops.commit(hw);
+		if (ret_val) {
+			DEBUGOUT("Error committing the PHY changes\n");
+			return ret_val;
+		}
+	}
+
 	phy_data &= ~I347AT4_PSCR_DOWNSHIFT_MASK;
 	phy_data |= I347AT4_PSCR_DOWNSHIFT_6X;
 	phy_data |= I347AT4_PSCR_DOWNSHIFT_ENABLE;
@@ -1333,6 +1343,10 @@ s32 e1000_copper_link_setup_m88_gen2(struct e1000_hw *hw)
 		return ret_val;
 	}
 
+	ret_val = e1000_set_master_slave_mode(hw);
+	if (ret_val)
+		return ret_val;
+
 	return E1000_SUCCESS;
 }
 
@@ -1847,6 +1861,8 @@ s32 e1000_phy_force_speed_duplex_m88(struct e1000_hw *hw)
 			case I347AT4_E_PHY_ID:
 			case M88E1340M_E_PHY_ID:
 			case M88E1112_E_PHY_ID:
+			case M88E1543_E_PHY_ID:
+			case M88E1512_E_PHY_ID:
 			case I210_I_PHY_ID:
 				reset_dsp = FALSE;
 				break;
@@ -1889,6 +1905,9 @@ s32 e1000_phy_force_speed_duplex_m88(struct e1000_hw *hw)
 		return E1000_SUCCESS;
 	if (hw->phy.id == I210_I_PHY_ID)
 		return E1000_SUCCESS;
+	if ((hw->phy.id == M88E1543_E_PHY_ID) ||
+	    (hw->phy.id == M88E1512_E_PHY_ID))
+		return E1000_SUCCESS;
 	ret_val = phy->ops.read_reg(hw, M88E1000_EXT_PHY_SPEC_CTRL, &phy_data);
 	if (ret_val)
 		return ret_val;
@@ -2194,9 +2213,9 @@ s32 e1000_check_polarity_m88(struct e1000_hw *hw)
 	ret_val = phy->ops.read_reg(hw, M88E1000_PHY_SPEC_STATUS, &data);
 
 	if (!ret_val)
-		phy->cable_polarity = (data & M88E1000_PSSR_REV_POLARITY)
-				      ? e1000_rev_polarity_reversed
-				      : e1000_rev_polarity_normal;
+		phy->cable_polarity = ((data & M88E1000_PSSR_REV_POLARITY)
+				       ? e1000_rev_polarity_reversed
+				       : e1000_rev_polarity_normal);
 
 	return ret_val;
 }
@@ -2240,9 +2259,9 @@ s32 e1000_check_polarity_igp(struct e1000_hw *hw)
 	ret_val = phy->ops.read_reg(hw, offset, &data);
 
 	if (!ret_val)
-		phy->cable_polarity = (data & mask)
-				      ? e1000_rev_polarity_reversed
-				      : e1000_rev_polarity_normal;
+		phy->cable_polarity = ((data & mask)
+				       ? e1000_rev_polarity_reversed
+				       : e1000_rev_polarity_normal);
 
 	return ret_val;
 }
@@ -2274,9 +2293,9 @@ s32 e1000_check_polarity_ife(struct e1000_hw *hw)
 	ret_val = phy->ops.read_reg(hw, offset, &phy_data);
 
 	if (!ret_val)
-		phy->cable_polarity = (phy_data & mask)
+		phy->cable_polarity = ((phy_data & mask)
 				       ? e1000_rev_polarity_reversed
-				       : e1000_rev_polarity_normal;
+				       : e1000_rev_polarity_normal);
 
 	return ret_val;
 }
@@ -2392,8 +2411,8 @@ s32 e1000_get_cable_length_m88(struct e1000_hw *hw)
 	if (ret_val)
 		return ret_val;
 
-	index = (phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
-		M88E1000_PSSR_CABLE_LENGTH_SHIFT;
+	index = ((phy_data & M88E1000_PSSR_CABLE_LENGTH) >>
+		 M88E1000_PSSR_CABLE_LENGTH_SHIFT);
 
 	if (index >= M88E1000_CABLE_LENGTH_TABLE_SIZE - 1)
 		return -E1000_ERR_PHY;
@@ -2437,6 +2456,8 @@ s32 e1000_get_cable_length_m88_gen2(struct e1000_hw *hw)
 		phy->max_cable_length = phy_data / (is_cm ? 100 : 1);
 		phy->cable_length = phy_data / (is_cm ? 100 : 1);
 		break;
+	case M88E1543_E_PHY_ID:
+	case M88E1512_E_PHY_ID:
 	case M88E1340M_E_PHY_ID:
 	case I347AT4_E_PHY_ID:
 		/* Remember the original page select and set it to 7 */
@@ -2554,8 +2575,8 @@ s32 e1000_get_cable_length_igp_2(struct e1000_hw *hw)
 		 * that can be put into the lookup table to obtain the
 		 * approximate cable length.
 		 */
-		cur_agc_index = (phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
-				IGP02E1000_AGC_LENGTH_MASK;
+		cur_agc_index = ((phy_data >> IGP02E1000_AGC_LENGTH_SHIFT) &
+				 IGP02E1000_AGC_LENGTH_MASK);
 
 		/* Array index bound check. */
 		if ((cur_agc_index >= IGP02E1000_CABLE_LENGTH_TABLE_SIZE) ||
@@ -2578,8 +2599,8 @@ s32 e1000_get_cable_length_igp_2(struct e1000_hw *hw)
 	agc_value /= (IGP02E1000_PHY_CHANNEL_NUM - 2);
 
 	/* Calculate cable length with the error range of +/- 10 meters. */
-	phy->min_cable_length = ((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
-				 (agc_value - IGP02E1000_AGC_RANGE) : 0;
+	phy->min_cable_length = (((agc_value - IGP02E1000_AGC_RANGE) > 0) ?
+				 (agc_value - IGP02E1000_AGC_RANGE) : 0);
 	phy->max_cable_length = agc_value + IGP02E1000_AGC_RANGE;
 
 	phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2;
@@ -2763,9 +2784,9 @@ s32 e1000_get_phy_info_ife(struct e1000_hw *hw)
 			return ret_val;
 	} else {
 		/* Polarity is forced */
-		phy->cable_polarity = (data & IFE_PSC_FORCE_POLARITY)
-				      ? e1000_rev_polarity_reversed
-				      : e1000_rev_polarity_normal;
+		phy->cable_polarity = ((data & IFE_PSC_FORCE_POLARITY)
+				       ? e1000_rev_polarity_reversed
+				       : e1000_rev_polarity_normal);
 	}
 
 	ret_val = phy->ops.read_reg(hw, IFE_PHY_MDIX_CONTROL, &data);
@@ -2863,7 +2884,7 @@ s32 e1000_phy_hw_reset_generic(struct e1000_hw *hw)
  *  Generic function to wait 10 milli-seconds for configuration to complete
  *  and return success.
  **/
-s32 e1000_get_cfg_done_generic(struct e1000_hw *hw)
+s32 e1000_get_cfg_done_generic(struct e1000_hw E1000_UNUSEDARG *hw)
 {
 	DEBUGFUNC("e1000_get_cfg_done_generic");
 
@@ -2970,6 +2991,8 @@ enum e1000_phy_type e1000_get_phy_type_from_id(u32 phy_id)
 	case M88E1000_E_PHY_ID:
 	case M88E1111_I_PHY_ID:
 	case M88E1011_I_PHY_ID:
+	case M88E1543_E_PHY_ID:
+	case M88E1512_E_PHY_ID:
 	case I347AT4_E_PHY_ID:
 	case M88E1112_E_PHY_ID:
 	case M88E1340M_E_PHY_ID:
@@ -3776,8 +3799,8 @@ static s32 e1000_access_phy_debug_regs_hv(struct e1000_hw *hw, u32 offset,
 	DEBUGFUNC("e1000_access_phy_debug_regs_hv");
 
 	/* This takes care of the difference with desktop vs mobile phy */
-	addr_reg = (hw->phy.type == e1000_phy_82578) ?
-		   I82578_ADDR_REG : I82577_ADDR_REG;
+	addr_reg = ((hw->phy.type == e1000_phy_82578) ?
+		    I82578_ADDR_REG : I82577_ADDR_REG);
 	data_reg = addr_reg + 1;
 
 	/* All operations in this function are phy address 2 */
@@ -3833,8 +3856,8 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
 	if (ret_val)
 		return ret_val;
 
-	data &= BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
-		BM_CS_STATUS_SPEED_MASK;
+	data &= (BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
+		 BM_CS_STATUS_SPEED_MASK);
 
 	if (data != (BM_CS_STATUS_LINK_UP | BM_CS_STATUS_RESOLVED |
 		     BM_CS_STATUS_SPEED_1000))
@@ -3872,9 +3895,9 @@ s32 e1000_check_polarity_82577(struct e1000_hw *hw)
 	ret_val = phy->ops.read_reg(hw, I82577_PHY_STATUS_2, &data);
 
 	if (!ret_val)
-		phy->cable_polarity = (data & I82577_PHY_STATUS2_REV_POLARITY)
-				      ? e1000_rev_polarity_reversed
-				      : e1000_rev_polarity_normal;
+		phy->cable_polarity = ((data & I82577_PHY_STATUS2_REV_POLARITY)
+				       ? e1000_rev_polarity_reversed
+				       : e1000_rev_polarity_normal);
 
 	return ret_val;
 }
@@ -4009,8 +4032,8 @@ s32 e1000_get_cable_length_82577(struct e1000_hw *hw)
 	if (ret_val)
 		return ret_val;
 
-	length = (phy_data & I82577_DSTATUS_CABLE_LENGTH) >>
-		 I82577_DSTATUS_CABLE_LENGTH_SHIFT;
+	length = ((phy_data & I82577_DSTATUS_CABLE_LENGTH) >>
+		  I82577_DSTATUS_CABLE_LENGTH_SHIFT);
 
 	if (length == E1000_CABLE_LENGTH_UNDEFINED)
 		return -E1000_ERR_PHY;
@@ -4083,3 +4106,157 @@ release:
 	return ret_val;
 }
 
+/**
+ *  e1000_read_phy_reg_mphy - Read mPHY control register
+ *  @hw: pointer to the HW structure
+ *  @address: address to be read
+ *  @data: pointer to the read data
+ *
+ *  Reads the mPHY control register in the PHY at offset and stores the
+ *  information read to data.
+ **/
+s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data)
+{
+	u32 mphy_ctrl = 0;
+	bool locked = FALSE;
+	bool ready = FALSE;
+
+	DEBUGFUNC("e1000_read_phy_reg_mphy");
+
+	/* Check if mPHY is ready to read/write operations */
+	ready = e1000_is_mphy_ready(hw);
+	if (!ready)
+		return -E1000_ERR_PHY;
+
+	/* Check if mPHY access is disabled and enable it if so */
+	mphy_ctrl = E1000_READ_REG(hw, E1000_MPHY_ADDR_CTRL);
+	if (mphy_ctrl & E1000_MPHY_DIS_ACCESS) {
+		locked = TRUE;
+		ready = e1000_is_mphy_ready(hw);
+		if (!ready)
+			return -E1000_ERR_PHY;
+		mphy_ctrl |= E1000_MPHY_ENA_ACCESS;
+		E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, mphy_ctrl);
+	}
+
+	/* Set the address that we want to read */
+	ready = e1000_is_mphy_ready(hw);
+	if (!ready)
+		return -E1000_ERR_PHY;
+
+	/* We mask address, because we want to use only current lane */
+	mphy_ctrl = (mphy_ctrl & ~E1000_MPHY_ADDRESS_MASK &
+		~E1000_MPHY_ADDRESS_FNC_OVERRIDE) |
+		(address & E1000_MPHY_ADDRESS_MASK);
+	E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, mphy_ctrl);
+
+	/* Read data from the address */
+	ready = e1000_is_mphy_ready(hw);
+	if (!ready)
+		return -E1000_ERR_PHY;
+	*data = E1000_READ_REG(hw, E1000_MPHY_DATA);
+
+	/* Disable access to mPHY if it was originally disabled */
+	if (locked)
+		ready = e1000_is_mphy_ready(hw);
+		if (!ready)
+			return -E1000_ERR_PHY;
+		E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
+				E1000_MPHY_DIS_ACCESS);
+
+	return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_write_phy_reg_mphy - Write mPHY control register
+ *  @hw: pointer to the HW structure
+ *  @address: address to write to
+ *  @data: data to write to register at offset
+ *  @line_override: used when we want to use different line than default one
+ *
+ *  Writes data to mPHY control register.
+ **/
+s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data,
+			     bool line_override)
+{
+	u32 mphy_ctrl = 0;
+	bool locked = FALSE;
+	bool ready = FALSE;
+
+	DEBUGFUNC("e1000_write_phy_reg_mphy");
+
+	/* Check if mPHY is ready to read/write operations */
+	ready = e1000_is_mphy_ready(hw);
+	if (!ready)
+		return -E1000_ERR_PHY;
+
+	/* Check if mPHY access is disabled and enable it if so */
+	mphy_ctrl = E1000_READ_REG(hw, E1000_MPHY_ADDR_CTRL);
+	if (mphy_ctrl & E1000_MPHY_DIS_ACCESS) {
+		locked = TRUE;
+		ready = e1000_is_mphy_ready(hw);
+		if (!ready)
+			return -E1000_ERR_PHY;
+		mphy_ctrl |= E1000_MPHY_ENA_ACCESS;
+		E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, mphy_ctrl);
+	}
+
+	/* Set the address that we want to read */
+	ready = e1000_is_mphy_ready(hw);
+	if (!ready)
+		return -E1000_ERR_PHY;
+
+	/* We mask address, because we want to use only current lane */
+	if (line_override)
+		mphy_ctrl |= E1000_MPHY_ADDRESS_FNC_OVERRIDE;
+	else
+		mphy_ctrl &= ~E1000_MPHY_ADDRESS_FNC_OVERRIDE;
+	mphy_ctrl = (mphy_ctrl & ~E1000_MPHY_ADDRESS_MASK) |
+		(address & E1000_MPHY_ADDRESS_MASK);
+	E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, mphy_ctrl);
+
+	/* Read data from the address */
+	ready = e1000_is_mphy_ready(hw);
+	if (!ready)
+		return -E1000_ERR_PHY;
+	E1000_WRITE_REG(hw, E1000_MPHY_DATA, data);
+
+	/* Disable access to mPHY if it was originally disabled */
+	if (locked)
+		ready = e1000_is_mphy_ready(hw);
+		if (!ready)
+			return -E1000_ERR_PHY;
+		E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
+				E1000_MPHY_DIS_ACCESS);
+
+	return E1000_SUCCESS;
+}
+
+/**
+ *  e1000_is_mphy_ready - Check if mPHY control register is not busy
+ *  @hw: pointer to the HW structure
+ *
+ *  Returns mPHY control register status.
+ **/
+bool e1000_is_mphy_ready(struct e1000_hw *hw)
+{
+	u16 retry_count = 0;
+	u32 mphy_ctrl = 0;
+	bool ready = FALSE;
+
+	while (retry_count < 2) {
+		mphy_ctrl = E1000_READ_REG(hw, E1000_MPHY_ADDR_CTRL);
+		if (mphy_ctrl & E1000_MPHY_BUSY) {
+			usec_delay(20);
+			retry_count++;
+			continue;
+		}
+		ready = TRUE;
+		break;
+	}
+
+	if (!ready)
+		DEBUGOUT("ERROR READING mPHY control register, phy is busy.\n");
+
+	return ready;
+}
diff --git a/sys/dev/e1000/e1000_phy.h b/sys/dev/e1000/e1000_phy.h
index 9911df772d9..32685eeee81 100644
--- a/sys/dev/e1000/e1000_phy.h
+++ b/sys/dev/e1000/e1000_phy.h
@@ -116,6 +116,10 @@ s32  e1000_phy_force_speed_duplex_82577(struct e1000_hw *hw);
 s32  e1000_get_cable_length_82577(struct e1000_hw *hw);
 s32  e1000_write_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 data);
 s32  e1000_read_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 *data);
+s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data);
+s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data,
+			     bool line_override);
+bool e1000_is_mphy_ready(struct e1000_hw *hw);
 
 #define E1000_MAX_PHY_ADDR		8
 
@@ -170,7 +174,7 @@ s32  e1000_read_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 *data);
 #define I82577_ADDR_REG			16
 #define I82577_CFG_REG			22
 #define I82577_CFG_ASSERT_CRS_ON_TX	(1 << 15)
-#define I82577_CFG_ENABLE_DOWNSHIFT	(3 << 10) /* auto downshift 100/10 */
+#define I82577_CFG_ENABLE_DOWNSHIFT	(3 << 10) /* auto downshift */
 #define I82577_CTRL_REG			23
 
 /* 82577 specific PHY registers */
@@ -201,6 +205,12 @@ s32  e1000_read_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 *data);
 #define E1000_82580_PM_D3_LPLU		0x0004 /* For all other states */
 #define E1000_82580_PM_GO_LINKD		0x0020 /* Go Link Disconnect */
 
+#define E1000_MPHY_DIS_ACCESS		0x80000000 /* disable_access bit */
+#define E1000_MPHY_ENA_ACCESS		0x40000000 /* enable_access bit */
+#define E1000_MPHY_BUSY			0x00010000 /* busy bit */
+#define E1000_MPHY_ADDRESS_FNC_OVERRIDE	0x20000000 /* fnc_override bit */
+#define E1000_MPHY_ADDRESS_MASK		0x0000FFFF /* address mask */
+
 /* BM PHY Copper Specific Control 1 */
 #define BM_CS_CTRL1			16
 
@@ -247,7 +257,7 @@ s32  e1000_read_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 *data);
 #define IGP02E1000_PHY_AGC_C		0x14B1
 #define IGP02E1000_PHY_AGC_D		0x18B1
 
-#define IGP02E1000_AGC_LENGTH_SHIFT	9   /* Course - 15:13, Fine - 12:9 */
+#define IGP02E1000_AGC_LENGTH_SHIFT	9   /* Course=15:13, Fine=12:9 */
 #define IGP02E1000_AGC_LENGTH_MASK	0x7F
 #define IGP02E1000_AGC_RANGE		15
 
@@ -267,8 +277,8 @@ s32  e1000_read_phy_reg_gs40g(struct e1000_hw *hw, u32 offset, u16 *data);
 #define E1000_KMRNCTRLSTA_HD_CTRL	0x10   /* Kumeran HD Control */
 
 #define IFE_PHY_EXTENDED_STATUS_CONTROL	0x10
-#define IFE_PHY_SPECIAL_CONTROL		0x11 /* 100BaseTx PHY Special Control */
-#define IFE_PHY_SPECIAL_CONTROL_LED	0x1B /* PHY Special and LED Control */
+#define IFE_PHY_SPECIAL_CONTROL		0x11 /* 100BaseTx PHY Special Ctrl */
+#define IFE_PHY_SPECIAL_CONTROL_LED	0x1B /* PHY Special and LED Ctrl */
 #define IFE_PHY_MDIX_CONTROL		0x1C /* MDI/MDI-X Control */
 
 /* IFE PHY Extended Status Control */
diff --git a/sys/dev/e1000/e1000_regs.h b/sys/dev/e1000/e1000_regs.h
index 516d377af40..a88220f1e5f 100644
--- a/sys/dev/e1000/e1000_regs.h
+++ b/sys/dev/e1000/e1000_regs.h
@@ -50,6 +50,10 @@
 #define E1000_BARCTRL			0x5BBC /* BAR ctrl reg */
 #define E1000_BARCTRL_FLSIZE		0x0700 /* BAR ctrl Flsize */
 #define E1000_BARCTRL_CSRSIZE		0x2000 /* BAR ctrl CSR size */
+#define E1000_MPHY_ADDR_CTRL	0x0024 /* GbE MPHY Address Control */
+#define E1000_MPHY_DATA		0x0E10 /* GBE MPHY Data */
+#define E1000_MPHY_STAT		0x0E0C /* GBE MPHY Statistics */
+#define E1000_PPHY_CTRL		0x5b48 /* PCIe PHY Control */
 #define E1000_I350_BARCTRL		0x5BFC /* BAR ctrl reg */
 #define E1000_I350_DTXMXPKTSZ		0x355C /* Maximum sent packet size reg*/
 #define E1000_SCTL	0x00024  /* SerDes Control - RW */
@@ -94,6 +98,7 @@
 #define E1000_TBT	0x00448  /* Tx Burst Timer - RW */
 #define E1000_AIT	0x00458  /* Adaptive Interframe Spacing Throttle - RW */
 #define E1000_LEDCTL	0x00E00  /* LED Control - RW */
+#define E1000_LEDMUX	0x08130  /* LED MUX Control */
 #define E1000_EXTCNF_CTRL	0x00F00  /* Extended Configuration Control */
 #define E1000_EXTCNF_SIZE	0x00F08  /* Extended Configuration Size */
 #define E1000_PHY_CTRL	0x00F10  /* PHY Control Register in CSR */
@@ -152,6 +157,8 @@
 #define E1000_PBRWAC	0x024E8 /* Rx packet buffer wrap around counter - RO */
 #define E1000_RDTR	0x02820  /* Rx Delay Timer - RW */
 #define E1000_RADV	0x0282C  /* Rx Interrupt Absolute Delay Timer - RW */
+#define E1000_EMIADD	0x10     /* Extended Memory Indirect Address */
+#define E1000_EMIDATA	0x11     /* Extended Memory Indirect Data */
 #define E1000_SRWR		0x12018  /* Shadow Ram Write Register - RW */
 #define E1000_I210_FLMNGCTL	0x12038
 #define E1000_I210_FLMNGDATA	0x1203C
@@ -200,7 +207,7 @@
 /* QAV Tx mode control register bitfields masks */
 #define E1000_TQAVCC_IDLE_SLOPE		0xFFFF /* Idle slope */
 #define E1000_TQAVCC_KEEP_CREDITS	(1 << 30) /* Keep credits opt enable */
-#define E1000_TQAVCC_QUEUE_MODE		(1 << 31) /* SP vs. SR Tx mode */
+#define E1000_TQAVCC_QUEUE_MODE		(1U << 31) /* SP vs. SR Tx mode */
 
 /* Good transmitted packets counter registers */
 #define E1000_PQGPTC(_n)		(0x010014 + (0x100 * (_n)))
@@ -208,6 +215,9 @@
 /* Queues packet buffer size masks where _n can be 0-3 and _s 0-63 [kB] */
 #define E1000_I210_TXPBS_SIZE(_n, _s)	((_s) << (6 * _n))
 
+#define E1000_MMDAC			13 /* MMD Access Control */
+#define E1000_MMDAAD			14 /* MMD Access Address/Data */
+
 /* Convenience macros
  *
  * Note: "_n" is the queue number of the register to be written to.
@@ -484,8 +494,6 @@
 #define E1000_PBACL	0x05B68  /* MSIx PBA Clear - Read/Write 1's to clear */
 #define E1000_FFLT	0x05F00  /* Flexible Filter Length Table - RW Array */
 #define E1000_HOST_IF	0x08800  /* Host Interface */
-#define E1000_FFMT	0x09000  /* Flexible Filter Mask Table - RW Array */
-#define E1000_FFVT	0x09800  /* Flexible Filter Value Table - RW Array */
 #define E1000_HIBBA	0x8F40   /* Host Interface Buffer Base Address */
 /* Flexible Host Filter Table */
 #define E1000_FHFT(_n)	(0x09000 + ((_n) * 0x100))
diff --git a/sys/dev/e1000/e1000_vf.h b/sys/dev/e1000/e1000_vf.h
index 0ee73aec628..4dfebe7a4bd 100644
--- a/sys/dev/e1000/e1000_vf.h
+++ b/sys/dev/e1000/e1000_vf.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2010, Intel Corporation 
+  Copyright (c) 2001-2013, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -41,48 +41,50 @@
 
 struct e1000_hw;
 
-#define E1000_DEV_ID_82576_VF                 0x10CA
-#define E1000_DEV_ID_I350_VF                  0x1520
+#define E1000_DEV_ID_82576_VF		0x10CA
+#define E1000_DEV_ID_I350_VF		0x1520
 
-#define E1000_VF_INIT_TIMEOUT 200 /* Number of retries to clear RSTI */
+#define E1000_VF_INIT_TIMEOUT		200 /* Num of retries to clear RSTI */
 
 /* Additional Descriptor Control definitions */
-#define E1000_TXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Tx Queue */
-#define E1000_RXDCTL_QUEUE_ENABLE  0x02000000 /* Enable specific Rx Queue */
+#define E1000_TXDCTL_QUEUE_ENABLE	0x02000000 /* Ena specific Tx Queue */
+#define E1000_RXDCTL_QUEUE_ENABLE	0x02000000 /* Ena specific Rx Queue */
 
 /* SRRCTL bit definitions */
-#define E1000_SRRCTL_BSIZEPKT_SHIFT                     10 /* Shift _right_ */
-#define E1000_SRRCTL_BSIZEHDRSIZE_MASK                  0x00000F00
-#define E1000_SRRCTL_BSIZEHDRSIZE_SHIFT                 2  /* Shift _left_ */
-#define E1000_SRRCTL_DESCTYPE_LEGACY                    0x00000000
-#define E1000_SRRCTL_DESCTYPE_ADV_ONEBUF                0x02000000
-#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT                 0x04000000
-#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS          0x0A000000
-#define E1000_SRRCTL_DESCTYPE_HDR_REPLICATION           0x06000000
+#define E1000_SRRCTL(_n)	((_n) < 4 ? (0x0280C + ((_n) * 0x100)) : \
+				 (0x0C00C + ((_n) * 0x40)))
+#define E1000_SRRCTL_BSIZEPKT_SHIFT		10 /* Shift _right_ */
+#define E1000_SRRCTL_BSIZEHDRSIZE_MASK		0x00000F00
+#define E1000_SRRCTL_BSIZEHDRSIZE_SHIFT		2  /* Shift _left_ */
+#define E1000_SRRCTL_DESCTYPE_LEGACY		0x00000000
+#define E1000_SRRCTL_DESCTYPE_ADV_ONEBUF	0x02000000
+#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT		0x04000000
+#define E1000_SRRCTL_DESCTYPE_HDR_SPLIT_ALWAYS	0x0A000000
+#define E1000_SRRCTL_DESCTYPE_HDR_REPLICATION	0x06000000
 #define E1000_SRRCTL_DESCTYPE_HDR_REPLICATION_LARGE_PKT 0x08000000
-#define E1000_SRRCTL_DESCTYPE_MASK                      0x0E000000
-#define E1000_SRRCTL_DROP_EN                            0x80000000
+#define E1000_SRRCTL_DESCTYPE_MASK		0x0E000000
+#define E1000_SRRCTL_DROP_EN			0x80000000
 
-#define E1000_SRRCTL_BSIZEPKT_MASK      0x0000007F
-#define E1000_SRRCTL_BSIZEHDR_MASK      0x00003F00
+#define E1000_SRRCTL_BSIZEPKT_MASK	0x0000007F
+#define E1000_SRRCTL_BSIZEHDR_MASK	0x00003F00
 
 /* Interrupt Defines */
-#define E1000_EICR     0x01580  /* Ext. Interrupt Cause Read - R/clr */
-#define E1000_EITR(_n) (0x01680 + ((_n) << 2))
-#define E1000_EICS     0x01520  /* Ext. Interrupt Cause Set - W0 */
-#define E1000_EIMS     0x01524  /* Ext. Interrupt Mask Set/Read - RW */
-#define E1000_EIMC     0x01528  /* Ext. Interrupt Mask Clear - WO */
-#define E1000_EIAC     0x0152C  /* Ext. Interrupt Auto Clear - RW */
-#define E1000_EIAM     0x01530  /* Ext. Interrupt Ack Auto Clear Mask - RW */
-#define E1000_IVAR0    0x01700  /* Interrupt Vector Allocation (array) - RW */
-#define E1000_IVAR_MISC 0x01740 /* IVAR for "other" causes - RW */
-#define E1000_IVAR_VALID        0x80
+#define E1000_EICR		0x01580 /* Ext. Interrupt Cause Read - R/clr */
+#define E1000_EITR(_n)		(0x01680 + ((_n) << 2))
+#define E1000_EICS		0x01520 /* Ext. Intr Cause Set -W0 */
+#define E1000_EIMS		0x01524 /* Ext. Intr Mask Set/Read -RW */
+#define E1000_EIMC		0x01528 /* Ext. Intr Mask Clear -WO */
+#define E1000_EIAC		0x0152C /* Ext. Intr Auto Clear -RW */
+#define E1000_EIAM		0x01530 /* Ext. Intr Ack Auto Clear Mask -RW */
+#define E1000_IVAR0		0x01700 /* Intr Vector Alloc (array) -RW */
+#define E1000_IVAR_MISC		0x01740 /* IVAR for "other" causes -RW */
+#define E1000_IVAR_VALID	0x80
 
 /* Receive Descriptor - Advanced */
 union e1000_adv_rx_desc {
 	struct {
-		u64 pkt_addr;             /* Packet buffer address */
-		u64 hdr_addr;             /* Header buffer address */
+		u64 pkt_addr; /* Packet buffer address */
+		u64 hdr_addr; /* Header buffer address */
 	} read;
 	struct {
 		struct {
@@ -96,23 +98,23 @@ union e1000_adv_rx_desc {
 				} hs_rss;
 			} lo_dword;
 			union {
-				u32 rss;          /* RSS Hash */
+				u32 rss; /* RSS Hash */
 				struct {
-					u16 ip_id;    /* IP id */
-					u16 csum;     /* Packet Checksum */
+					u16 ip_id; /* IP id */
+					u16 csum; /* Packet Checksum */
 				} csum_ip;
 			} hi_dword;
 		} lower;
 		struct {
-			u32 status_error;     /* ext status/error */
-			u16 length;           /* Packet length */
-			u16 vlan;             /* VLAN tag */
+			u32 status_error; /* ext status/error */
+			u16 length; /* Packet length */
+			u16 vlan; /* VLAN tag */
 		} upper;
 	} wb;  /* writeback */
 };
 
-#define E1000_RXDADV_HDRBUFLEN_MASK      0x7FE0
-#define E1000_RXDADV_HDRBUFLEN_SHIFT     5
+#define E1000_RXDADV_HDRBUFLEN_MASK	0x7FE0
+#define E1000_RXDADV_HDRBUFLEN_SHIFT	5
 
 /* Transmit Descriptor - Advanced */
 union e1000_adv_tx_desc {
@@ -129,15 +131,15 @@ union e1000_adv_tx_desc {
 };
 
 /* Adv Transmit Descriptor Config Masks */
-#define E1000_ADVTXD_DTYP_CTXT    0x00200000 /* Advanced Context Descriptor */
-#define E1000_ADVTXD_DTYP_DATA    0x00300000 /* Advanced Data Descriptor */
-#define E1000_ADVTXD_DCMD_EOP     0x01000000 /* End of Packet */
-#define E1000_ADVTXD_DCMD_IFCS    0x02000000 /* Insert FCS (Ethernet CRC) */
-#define E1000_ADVTXD_DCMD_RS      0x08000000 /* Report Status */
-#define E1000_ADVTXD_DCMD_DEXT    0x20000000 /* Descriptor extension (1=Adv) */
-#define E1000_ADVTXD_DCMD_VLE     0x40000000 /* VLAN pkt enable */
-#define E1000_ADVTXD_DCMD_TSE     0x80000000 /* TCP Seg enable */
-#define E1000_ADVTXD_PAYLEN_SHIFT    14 /* Adv desc PAYLEN shift */
+#define E1000_ADVTXD_DTYP_CTXT	0x00200000 /* Advanced Context Descriptor */
+#define E1000_ADVTXD_DTYP_DATA	0x00300000 /* Advanced Data Descriptor */
+#define E1000_ADVTXD_DCMD_EOP	0x01000000 /* End of Packet */
+#define E1000_ADVTXD_DCMD_IFCS	0x02000000 /* Insert FCS (Ethernet CRC) */
+#define E1000_ADVTXD_DCMD_RS	0x08000000 /* Report Status */
+#define E1000_ADVTXD_DCMD_DEXT	0x20000000 /* Descriptor extension (1=Adv) */
+#define E1000_ADVTXD_DCMD_VLE	0x40000000 /* VLAN pkt enable */
+#define E1000_ADVTXD_DCMD_TSE	0x80000000 /* TCP Seg enable */
+#define E1000_ADVTXD_PAYLEN_SHIFT	14 /* Adv desc PAYLEN shift */
 
 /* Context descriptors */
 struct e1000_adv_tx_context_desc {
@@ -147,11 +149,11 @@ struct e1000_adv_tx_context_desc {
 	u32 mss_l4len_idx;
 };
 
-#define E1000_ADVTXD_MACLEN_SHIFT    9  /* Adv ctxt desc mac len shift */
-#define E1000_ADVTXD_TUCMD_IPV4    0x00000400  /* IP Packet Type: 1=IPv4 */
-#define E1000_ADVTXD_TUCMD_L4T_TCP 0x00000800  /* L4 Packet TYPE of TCP */
-#define E1000_ADVTXD_L4LEN_SHIFT     8  /* Adv ctxt L4LEN shift */
-#define E1000_ADVTXD_MSS_SHIFT      16  /* Adv ctxt MSS shift */
+#define E1000_ADVTXD_MACLEN_SHIFT	9  /* Adv ctxt desc mac len shift */
+#define E1000_ADVTXD_TUCMD_IPV4		0x00000400  /* IP Packet Type: 1=IPv4 */
+#define E1000_ADVTXD_TUCMD_L4T_TCP	0x00000800  /* L4 Packet TYPE of TCP */
+#define E1000_ADVTXD_L4LEN_SHIFT	8  /* Adv ctxt L4LEN shift */
+#define E1000_ADVTXD_MSS_SHIFT		16  /* Adv ctxt MSS shift */
 
 enum e1000_mac_type {
 	e1000_undefined = 0,
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 16e1d6f565b..580407a529f 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -63,6 +63,7 @@
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -3835,8 +3836,7 @@ em_txeof(struct tx_ring *txr)
 
 	EM_TX_LOCK_ASSERT(txr);
 #ifdef DEV_NETMAP
-	if (netmap_tx_irq(ifp, txr->me |
-	    (NETMAP_LOCKED_ENTER | NETMAP_LOCKED_EXIT)))
+	if (netmap_tx_irq(ifp, txr->me))
 		return;
 #endif /* DEV_NETMAP */
 
@@ -4059,8 +4059,7 @@ em_allocate_receive_buffers(struct rx_ring *rxr)
 	rxbuf = rxr->rx_buffers;
 	for (int i = 0; i < adapter->num_rx_desc; i++, rxbuf++) {
 		rxbuf = &rxr->rx_buffers[i];
-		error = bus_dmamap_create(rxr->rxtag, BUS_DMA_NOWAIT,
-		    &rxbuf->map);
+		error = bus_dmamap_create(rxr->rxtag, 0, &rxbuf->map);
 		if (error) {
 			device_printf(dev, "%s: bus_dmamap_create failed: %d\n",
 			    __func__, error);
@@ -4100,7 +4099,7 @@ em_setup_receive_ring(struct rx_ring *rxr)
 	    sizeof(struct e1000_rx_desc), EM_DBA_ALIGN);
 	bzero((void *)rxr->rx_base, rsize);
 #ifdef DEV_NETMAP
-	slot = netmap_reset(na, NR_RX, 0, 0);
+	slot = netmap_reset(na, NR_RX, rxr->me, 0);
 #endif
 
 	/*
@@ -4432,8 +4431,10 @@ em_rxeof(struct rx_ring *rxr, int count, int *done)
 	EM_RX_LOCK(rxr);
 
 #ifdef DEV_NETMAP
-	if (netmap_rx_irq(ifp, rxr->me | NETMAP_LOCKED_ENTER, &processed))
+	if (netmap_rx_irq(ifp, rxr->me, &processed)) {
+		EM_RX_UNLOCK(rxr);
 		return (FALSE);
+	}
 #endif /* DEV_NETMAP */
 
 	for (i = rxr->next_to_check, processed = 0; count != 0;) {
@@ -4465,6 +4466,7 @@ em_rxeof(struct rx_ring *rxr, int count, int *done)
 			em_rx_discard(rxr, i);
 			goto next_desc;
 		}
+		bus_dmamap_unload(rxr->rxtag, rxr->rx_buffers[i].map);
 
 		/* Assign correct length to the current fragment */
 		mp = rxr->rx_buffers[i].m_head;
@@ -4551,6 +4553,8 @@ em_rx_discard(struct rx_ring *rxr, int i)
 	struct em_buffer	*rbuf;
 
 	rbuf = &rxr->rx_buffers[i];
+	bus_dmamap_unload(rxr->rxtag, rbuf->map);
+
 	/* Free any previous pieces */
 	if (rxr->fmp != NULL) {
 		rxr->fmp->m_flags |= M_PKTHDR;
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c
index 600c2de28d3..57e4f893ab3 100644
--- a/sys/dev/e1000/if_igb.c
+++ b/sys/dev/e1000/if_igb.c
@@ -68,6 +68,7 @@
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -101,7 +102,7 @@ int	igb_display_debug_stats = 0;
 /*********************************************************************
  *  Driver version:
  *********************************************************************/
-char igb_driver_version[] = "version - 2.3.10";
+char igb_driver_version[] = "version - 2.4.0";
 
 
 /*********************************************************************
@@ -155,10 +156,19 @@ static igb_vendor_info_t igb_vendor_info_array[] =
 	{ 0x8086, E1000_DEV_ID_I210_COPPER_IT,	PCI_ANY_ID, PCI_ANY_ID, 0},
 	{ 0x8086, E1000_DEV_ID_I210_COPPER_OEM1,
 						PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_I210_COPPER_FLASHLESS,
+						PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_I210_SERDES_FLASHLESS,
+						PCI_ANY_ID, PCI_ANY_ID, 0},
 	{ 0x8086, E1000_DEV_ID_I210_FIBER,	PCI_ANY_ID, PCI_ANY_ID, 0},
 	{ 0x8086, E1000_DEV_ID_I210_SERDES,	PCI_ANY_ID, PCI_ANY_ID, 0},
 	{ 0x8086, E1000_DEV_ID_I210_SGMII,	PCI_ANY_ID, PCI_ANY_ID, 0},
 	{ 0x8086, E1000_DEV_ID_I211_COPPER,	PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_I354_BACKPLANE_1GBPS,
+						PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_I354_BACKPLANE_2_5GBPS,
+						PCI_ANY_ID, PCI_ANY_ID, 0},
+	{ 0x8086, E1000_DEV_ID_I354_SGMII,	PCI_ANY_ID, PCI_ANY_ID, 0},
 	/* required last entry */
 	{ 0, 0, 0, 0, 0}
 };
@@ -233,9 +243,10 @@ static __inline void igb_rx_input(struct rx_ring *,
 
 static bool	igb_rxeof(struct igb_queue *, int, int *);
 static void	igb_rx_checksum(u32, struct mbuf *, u32);
-static bool	igb_tx_ctx_setup(struct tx_ring *, struct mbuf *);
-static bool	igb_tso_setup(struct tx_ring *, struct mbuf *, int,
-		    struct ip *, struct tcphdr *);
+static int	igb_tx_ctx_setup(struct tx_ring *,
+		    struct mbuf *, u32 *, u32 *);
+static int	igb_tso_setup(struct tx_ring *,
+		    struct mbuf *, u32 *, u32 *);
 static void	igb_set_promisc(struct adapter *);
 static void	igb_disable_promisc(struct adapter *);
 static void	igb_set_multi(struct adapter *);
@@ -351,7 +362,7 @@ TUNABLE_INT("hw.igb.max_interrupt_rate", &igb_max_interrupt_rate);
 SYSCTL_INT(_hw_igb, OID_AUTO, max_interrupt_rate, CTLFLAG_RDTUN,
     &igb_max_interrupt_rate, 0, "Maximum interrupts per second");
 
-#if __FreeBSD_version >= 800000
+#ifndef IGB_LEGACY_TX
 /*
 ** Tuneable number of buffers in the buf-ring (drbr_xxx)
 */
@@ -557,7 +568,6 @@ igb_attach(device_t dev)
 	 * standard ethernet sized frames.
 	 */
 	adapter->max_frame_size = ETHERMTU + ETHER_HDR_LEN + ETHERNET_FCS_SIZE;
-	adapter->min_frame_size = ETH_ZLEN + ETHERNET_FCS_SIZE;
 
 	/*
 	** Allocate and Setup Queues
@@ -603,8 +613,12 @@ igb_attach(device_t dev)
 		    OID_AUTO, "eee_disabled", CTLTYPE_INT|CTLFLAG_RW,
 		    adapter, 0, igb_sysctl_eee, "I",
 		    "Disable Energy Efficient Ethernet");
-		if (adapter->hw.phy.media_type == e1000_media_type_copper)
-			e1000_set_eee_i350(&adapter->hw);
+		if (adapter->hw.phy.media_type == e1000_media_type_copper) {
+			if (adapter->hw.mac.type == e1000_i354)
+				e1000_set_eee_i354(&adapter->hw);
+			else
+				e1000_set_eee_i350(&adapter->hw);
+		}
 	}
 
 	/*
@@ -988,7 +1002,7 @@ igb_mq_start_locked(struct ifnet *ifp, struct tx_ring *txr)
 {
 	struct adapter  *adapter = txr->adapter;
         struct mbuf     *next;
-        int             err = 0, enq;
+        int             err = 0, enq = 0;
 
 	IGB_TX_LOCK_ASSERT(txr);
 
@@ -996,7 +1010,6 @@ igb_mq_start_locked(struct ifnet *ifp, struct tx_ring *txr)
 	    adapter->link_active == 0)
 		return (ENETDOWN);
 
-	enq = 0;
 
 	/* Process the queue */
 	while ((next = drbr_peek(ifp, txr->br)) != NULL) {
@@ -1224,6 +1237,10 @@ igb_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 			ifp->if_capenable ^= IFCAP_TSO4;
 			reinit = 1;
 		}
+		if (mask & IFCAP_TSO6) {
+			ifp->if_capenable ^= IFCAP_TSO6;
+			reinit = 1;
+		}
 		if (mask & IFCAP_VLAN_HWTAGGING) {
 			ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING;
 			reinit = 1;
@@ -1301,7 +1318,7 @@ igb_init_locked(struct adapter *adapter)
 #endif
 	}
 
-	if (ifp->if_capenable & IFCAP_TSO4)
+	if (ifp->if_capenable & IFCAP_TSO)
 		ifp->if_hwassist |= CSUM_TSO;
 
 	/* Configure for OS presence */
@@ -1365,8 +1382,12 @@ igb_init_locked(struct adapter *adapter)
 	}
 
 	/* Set Energy Efficient Ethernet */
-	if (adapter->hw.phy.media_type == e1000_media_type_copper)
-		e1000_set_eee_i350(&adapter->hw);
+	if (adapter->hw.phy.media_type == e1000_media_type_copper) {
+		if (adapter->hw.mac.type == e1000_i354)
+			e1000_set_eee_i354(&adapter->hw);
+		else
+			e1000_set_eee_i350(&adapter->hw);
+	}
 }
 
 static void
@@ -1734,6 +1755,9 @@ igb_media_status(struct ifnet *ifp, struct ifmediareq *ifmr)
 	case 1000:
 		ifmr->ifm_active |= IFM_1000_T;
 		break;
+	case 2500:
+		ifmr->ifm_active |= IFM_2500_SX;
+		break;
 	}
 
 	if (adapter->link_duplex == FULL_DUPLEX)
@@ -1810,273 +1834,142 @@ igb_media_change(struct ifnet *ifp)
 static int
 igb_xmit(struct tx_ring *txr, struct mbuf **m_headp)
 {
-	struct adapter		*adapter = txr->adapter;
-	bus_dma_segment_t	segs[IGB_MAX_SCATTER];
-	bus_dmamap_t		map;
-	struct igb_tx_buffer	*tx_buffer, *tx_buffer_mapped;
-	union e1000_adv_tx_desc	*txd = NULL;
-	struct mbuf		*m_head = *m_headp;
-	struct ether_vlan_header *eh = NULL;
-	struct ip		*ip = NULL;
-	struct tcphdr		*th = NULL;
-	u32			hdrlen, cmd_type_len, olinfo_status = 0;
-	int			ehdrlen, poff;
-	int			nsegs, i, first, last = 0;
-	int			error, do_tso, remap = 1;
+	struct adapter  *adapter = txr->adapter;
+	u32		olinfo_status = 0, cmd_type_len;
+	int             i, j, error, nsegs;
+	int		first;
+	bool		remap = TRUE;
+	struct mbuf	*m_head;
+	bus_dma_segment_t segs[IGB_MAX_SCATTER];
+	bus_dmamap_t	map;
+	struct igb_tx_buf *txbuf;
+	union e1000_adv_tx_desc *txd = NULL;
 
-	/* Set basic descriptor constants */
-	cmd_type_len = E1000_ADVTXD_DTYP_DATA;
-	cmd_type_len |= E1000_ADVTXD_DCMD_IFCS | E1000_ADVTXD_DCMD_DEXT;
-	if (m_head->m_flags & M_VLANTAG)
-		cmd_type_len |= E1000_ADVTXD_DCMD_VLE;
-
-retry:
 	m_head = *m_headp;
-	do_tso = ((m_head->m_pkthdr.csum_flags & CSUM_TSO) != 0);
-	hdrlen = ehdrlen = poff = 0;
+
+	/* Basic descriptor defines */
+        cmd_type_len = (E1000_ADVTXD_DTYP_DATA |
+	    E1000_ADVTXD_DCMD_IFCS | E1000_ADVTXD_DCMD_DEXT);
+
+	if (m_head->m_flags & M_VLANTAG)
+        	cmd_type_len |= E1000_ADVTXD_DCMD_VLE;
+
+        /*
+         * Important to capture the first descriptor
+         * used because it will contain the index of
+         * the one we tell the hardware to report back
+         */
+        first = txr->next_avail_desc;
+	txbuf = &txr->tx_buffers[first];
+	map = txbuf->map;
 
 	/*
-	 * Intel recommends entire IP/TCP header length reside in a single
-	 * buffer. If multiple descriptors are used to describe the IP and
-	 * TCP header, each descriptor should describe one or more
-	 * complete headers; descriptors referencing only parts of headers
-	 * are not supported. If all layer headers are not coalesced into
-	 * a single buffer, each buffer should not cross a 4KB boundary,
-	 * or be larger than the maximum read request size.
-	 * Controller also requires modifing IP/TCP header to make TSO work
-	 * so we firstly get a writable mbuf chain then coalesce ethernet/
-	 * IP/TCP header into a single buffer to meet the requirement of
-	 * controller. This also simplifies IP/TCP/UDP checksum offloading
-	 * which also has similiar restrictions.
+	 * Map the packet for DMA.
 	 */
-	if (do_tso || m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD) {
-		if (do_tso || (m_head->m_next != NULL && 
-		    m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD)) {
-			if (M_WRITABLE(*m_headp) == 0) {
-				m_head = m_dup(*m_headp, M_NOWAIT);
-				m_freem(*m_headp);
-				if (m_head == NULL) {
-					*m_headp = NULL;
-					return (ENOBUFS);
-				}
-				*m_headp = m_head;
-			}
-		}
-		/*
-		 * Assume IPv4, we don't have TSO/checksum offload support
-		 * for IPv6 yet.
-		 */
-		ehdrlen = sizeof(struct ether_header);
-		m_head = m_pullup(m_head, ehdrlen);
-		if (m_head == NULL) {
-			*m_headp = NULL;
-			return (ENOBUFS);
-		}
-		eh = mtod(m_head, struct ether_vlan_header *);
-		if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) {
-			ehdrlen = sizeof(struct ether_vlan_header);
-			m_head = m_pullup(m_head, ehdrlen);
-			if (m_head == NULL) {
-				*m_headp = NULL;
-				return (ENOBUFS);
-			}
-		}
-		m_head = m_pullup(m_head, ehdrlen + sizeof(struct ip));
-		if (m_head == NULL) {
-			*m_headp = NULL;
-			return (ENOBUFS);
-		}
-		ip = (struct ip *)(mtod(m_head, char *) + ehdrlen);
-		poff = ehdrlen + (ip->ip_hl << 2);
-		if (do_tso) {
-			m_head = m_pullup(m_head, poff + sizeof(struct tcphdr));
-			if (m_head == NULL) {
-				*m_headp = NULL;
-				return (ENOBUFS);
-			}
-			/*
-			 * The pseudo TCP checksum does not include TCP payload
-			 * length so driver should recompute the checksum here
-			 * what hardware expect to see. This is adherence of
-			 * Microsoft's Large Send specification.
-			 */
-			th = (struct tcphdr *)(mtod(m_head, char *) + poff);
-			th->th_sum = in_pseudo(ip->ip_src.s_addr,
-			    ip->ip_dst.s_addr, htons(IPPROTO_TCP));
-			/* Keep track of the full header length */
-			hdrlen = poff + (th->th_off << 2);
-		} else if (m_head->m_pkthdr.csum_flags & CSUM_TCP) {
-			m_head = m_pullup(m_head, poff + sizeof(struct tcphdr));
-			if (m_head == NULL) {
-				*m_headp = NULL;
-				return (ENOBUFS);
-			}
-			th = (struct tcphdr *)(mtod(m_head, char *) + poff);
-			m_head = m_pullup(m_head, poff + (th->th_off << 2));
-			if (m_head == NULL) {
-				*m_headp = NULL;
-				return (ENOBUFS);
-			}
-			ip = (struct ip *)(mtod(m_head, char *) + ehdrlen);
-			th = (struct tcphdr *)(mtod(m_head, char *) + poff);
-		} else if (m_head->m_pkthdr.csum_flags & CSUM_UDP) {
-			m_head = m_pullup(m_head, poff + sizeof(struct udphdr));
-			if (m_head == NULL) {
-				*m_headp = NULL;
-				return (ENOBUFS);
-			}
-			ip = (struct ip *)(mtod(m_head, char *) + ehdrlen);
-		}
-		*m_headp = m_head;
-	}
-
-	/*
-	 * Map the packet for DMA
-	 *
-	 * Capture the first descriptor index,
-	 * this descriptor will have the index
-	 * of the EOP which is the only one that
-	 * now gets a DONE bit writeback.
-	 */
-	first = txr->next_avail_desc;
-	tx_buffer = &txr->tx_buffers[first];
-	tx_buffer_mapped = tx_buffer;
-	map = tx_buffer->map;
-
+retry:
 	error = bus_dmamap_load_mbuf_sg(txr->txtag, map,
 	    *m_headp, segs, &nsegs, BUS_DMA_NOWAIT);
 
-	/*
-	 * There are two types of errors we can (try) to handle:
-	 * - EFBIG means the mbuf chain was too long and bus_dma ran
-	 *   out of segments.  Defragment the mbuf chain and try again.
-	 * - ENOMEM means bus_dma could not obtain enough bounce buffers
-	 *   at this point in time.  Defer sending and try again later.
-	 * All other errors, in particular EINVAL, are fatal and prevent the
-	 * mbuf chain from ever going through.  Drop it and report error.
-	 */
-	if (error == EFBIG && remap) {
+	if (__predict_false(error)) {
 		struct mbuf *m;
 
-		m = m_defrag(*m_headp, M_NOWAIT);
-		if (m == NULL) {
-			adapter->mbuf_defrag_failed++;
+		switch (error) {
+		case EFBIG:
+			/* Try it again? - one try */
+			if (remap == TRUE) {
+				remap = FALSE;
+				m = m_defrag(*m_headp, M_NOWAIT);
+				if (m == NULL) {
+					adapter->mbuf_defrag_failed++;
+					m_freem(*m_headp);
+					*m_headp = NULL;
+					return (ENOBUFS);
+				}
+				*m_headp = m;
+				goto retry;
+			} else
+				return (error);
+		case ENOMEM:
+			txr->no_tx_dma_setup++;
+			return (error);
+		default:
+			txr->no_tx_dma_setup++;
 			m_freem(*m_headp);
 			*m_headp = NULL;
-			return (ENOBUFS);
+			return (error);
 		}
-		*m_headp = m;
+	}
 
-		/* Try it again, but only once */
-		remap = 0;
-		goto retry;
-	} else if (error == ENOMEM) {
-		adapter->no_tx_dma_setup++;
-		return (error);
-	} else if (error != 0) {
-		adapter->no_tx_dma_setup++;
+	/* Make certain there are enough descriptors */
+	if (nsegs > txr->tx_avail - 2) {
+		txr->no_desc_avail++;
+		bus_dmamap_unload(txr->txtag, map);
+		return (ENOBUFS);
+	}
+	m_head = *m_headp;
+
+	/*
+	** Set up the appropriate offload context
+	** this will consume the first descriptor
+	*/
+	error = igb_tx_ctx_setup(txr, m_head, &cmd_type_len, &olinfo_status);
+	if (__predict_false(error)) {
 		m_freem(*m_headp);
 		*m_headp = NULL;
 		return (error);
 	}
 
-	/*
-	** Make sure we don't overrun the ring,
-	** we need nsegs descriptors and one for
-	** the context descriptor used for the
-	** offloads.
-	*/
-        if ((nsegs + 1) > (txr->tx_avail - 2)) {
-                txr->no_desc_avail++;
-		bus_dmamap_unload(txr->txtag, map);
-		return (ENOBUFS);
-        }
-	m_head = *m_headp;
-
-	/* Do hardware assists:
-         * Set up the context descriptor, used
-         * when any hardware offload is done.
-         * This includes CSUM, VLAN, and TSO.
-         * It will use the first descriptor.
-         */
-
-	if (m_head->m_pkthdr.csum_flags & CSUM_TSO) {
-		if (igb_tso_setup(txr, m_head, ehdrlen, ip, th)) {
-			cmd_type_len |= E1000_ADVTXD_DCMD_TSE;
-			olinfo_status |= E1000_TXD_POPTS_IXSM << 8;
-			olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
-		} else
-			return (ENXIO);
-	} else if (igb_tx_ctx_setup(txr, m_head))
-			olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
-
-	/* Calculate payload length */
-	olinfo_status |= ((m_head->m_pkthdr.len - hdrlen)
-	    << E1000_ADVTXD_PAYLEN_SHIFT);
-
 	/* 82575 needs the queue index added */
 	if (adapter->hw.mac.type == e1000_82575)
 		olinfo_status |= txr->me << 4;
 
-	/* Set up our transmit descriptors */
 	i = txr->next_avail_desc;
-	for (int j = 0; j < nsegs; j++) {
-		bus_size_t seg_len;
-		bus_addr_t seg_addr;
+	for (j = 0; j < nsegs; j++) {
+		bus_size_t seglen;
+		bus_addr_t segaddr;
 
-		tx_buffer = &txr->tx_buffers[i];
-		txd = (union e1000_adv_tx_desc *)&txr->tx_base[i];
-		seg_addr = segs[j].ds_addr;
-		seg_len  = segs[j].ds_len;
+		txbuf = &txr->tx_buffers[i];
+		txd = &txr->tx_base[i];
+		seglen = segs[j].ds_len;
+		segaddr = htole64(segs[j].ds_addr);
 
-		txd->read.buffer_addr = htole64(seg_addr);
-		txd->read.cmd_type_len = htole32(cmd_type_len | seg_len);
+		txd->read.buffer_addr = segaddr;
+		txd->read.cmd_type_len = htole32(E1000_TXD_CMD_IFCS |
+		    cmd_type_len | seglen);
 		txd->read.olinfo_status = htole32(olinfo_status);
-		last = i;
-		if (++i == adapter->num_tx_desc)
+
+		if (++i == txr->num_desc)
 			i = 0;
-		tx_buffer->m_head = NULL;
-		tx_buffer->next_eop = -1;
 	}
 
-	txr->next_avail_desc = i;
+	txd->read.cmd_type_len |=
+	    htole32(E1000_TXD_CMD_EOP | E1000_TXD_CMD_RS);
 	txr->tx_avail -= nsegs;
-        tx_buffer->m_head = m_head;
+	txr->next_avail_desc = i;
 
+	txbuf->m_head = m_head;
 	/*
 	** Here we swap the map so the last descriptor,
 	** which gets the completion interrupt has the
 	** real map, and the first descriptor gets the
 	** unused map from this descriptor.
 	*/
-	tx_buffer_mapped->map = tx_buffer->map;
-	tx_buffer->map = map;
-        bus_dmamap_sync(txr->txtag, map, BUS_DMASYNC_PREWRITE);
+	txr->tx_buffers[first].map = txbuf->map;
+	txbuf->map = map;
+	bus_dmamap_sync(txr->txtag, map, BUS_DMASYNC_PREWRITE);
 
-        /*
-         * Last Descriptor of Packet
-	 * needs End Of Packet (EOP)
-	 * and Report Status (RS)
-         */
-        txd->read.cmd_type_len |=
-	    htole32(E1000_ADVTXD_DCMD_EOP | E1000_ADVTXD_DCMD_RS);
-	/*
-	 * Keep track in the first buffer which
-	 * descriptor will be written back
-	 */
-	tx_buffer = &txr->tx_buffers[first];
-	tx_buffer->next_eop = last;
-	/* Update the watchdog time early and often */
-	txr->watchdog_time = ticks;
+        /* Set the EOP descriptor that will be marked done */
+        txbuf = &txr->tx_buffers[first];
+	txbuf->eop = txd;
 
+        bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map,
+            BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 	/*
-	 * Advance the Transmit Descriptor Tail (TDT), this tells the E1000
-	 * that this frame is available to transmit.
+	 * Advance the Transmit Descriptor Tail (Tdt), this tells the
+	 * hardware that this frame is available to transmit.
 	 */
-	bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map,
-	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+	++txr->total_packets;
 	E1000_WRITE_REG(&adapter->hw, E1000_TDT(txr->me), i);
-	++txr->tx_packets;
 
 	return (0);
 }
@@ -2345,6 +2238,17 @@ igb_update_link_status(struct adapter *adapter)
 		if ((ctrl & E1000_CTRL_EXT_LINK_MODE_GMII) &&
 		    (thstat & E1000_THSTAT_LINK_THROTTLE))
 			device_printf(dev, "Link: thermal downshift\n");
+		/* Delay Link Up for Phy update */
+		if (((hw->mac.type == e1000_i210) ||
+		    (hw->mac.type == e1000_i211)) &&
+		    (hw->phy.id == I210_I_PHY_ID))
+			msec_delay(I210_LINK_DELAY);
+		/* Reset if the media type changed. */
+		if (hw->dev_spec._82575.media_changed) {
+			hw->dev_spec._82575.media_changed = false;
+			adapter->flags |= IGB_MEDIA_RESET;
+			igb_reset(adapter);
+		}	
 		/* This can sleep */
 		if_link_state_change(ifp, LINK_STATE_UP);
 	} else if (!link_check && (adapter->link_active == 1)) {
@@ -2477,6 +2381,7 @@ igb_allocate_legacy(struct adapter *adapter)
 {
 	device_t		dev = adapter->dev;
 	struct igb_queue	*que = adapter->queues;
+	struct tx_ring		*txr = adapter->tx_rings;
 	int			error, rid = 0;
 
 	/* Turn off all interrupts */
@@ -2496,7 +2401,7 @@ igb_allocate_legacy(struct adapter *adapter)
 	}
 
 #ifndef IGB_LEGACY_TX
-	TASK_INIT(&que->txr->txq_task, 0, igb_deferred_mq_start, que->txr);
+	TASK_INIT(&txr->txq_task, 0, igb_deferred_mq_start, txr);
 #endif
 
 	/*
@@ -2633,6 +2538,7 @@ igb_configure_queues(struct adapter *adapter)
 	switch (adapter->hw.mac.type) {
 	case e1000_82580:
 	case e1000_i350:
+	case e1000_i354:
 	case e1000_i210:
 	case e1000_i211:
 	case e1000_vfadapt:
@@ -2818,7 +2724,7 @@ mem:
 
 	if (adapter->msix_mem != NULL)
 		bus_release_resource(dev, SYS_RES_MEMORY,
-		    PCIR_BAR(IGB_MSIX_BAR), adapter->msix_mem);
+		    adapter->memrid, adapter->msix_mem);
 
 	if (adapter->pci_mem != NULL)
 		bus_release_resource(dev, SYS_RES_MEMORY,
@@ -2832,8 +2738,8 @@ mem:
 static int
 igb_setup_msix(struct adapter *adapter)
 {
-	device_t dev = adapter->dev;
-	int rid, want, queues, msgs, maxqueues;
+	device_t	dev = adapter->dev;
+	int		bar, want, queues, msgs, maxqueues;
 
 	/* tuneable override */
 	if (igb_enable_msix == 0)
@@ -2843,9 +2749,17 @@ igb_setup_msix(struct adapter *adapter)
 	msgs = pci_msix_count(dev); 
 	if (msgs == 0)
 		goto msi;
-	rid = PCIR_BAR(IGB_MSIX_BAR);
+	/*
+	** Some new devices, as with ixgbe, now may
+	** use a different BAR, so we need to keep
+	** track of which is used.
+	*/
+	adapter->memrid = PCIR_BAR(IGB_MSIX_BAR);
+	bar = pci_read_config(dev, adapter->memrid, 4);
+	if (bar == 0) /* use next bar */
+		adapter->memrid += 4;
 	adapter->msix_mem = bus_alloc_resource_any(dev,
-	    SYS_RES_MEMORY, &rid, RF_ACTIVE);
+	    SYS_RES_MEMORY, &adapter->memrid, RF_ACTIVE);
        	if (adapter->msix_mem == NULL) {
 		/* May not be enabled */
 		device_printf(adapter->dev,
@@ -2868,6 +2782,7 @@ igb_setup_msix(struct adapter *adapter)
 		case e1000_82576:
 		case e1000_82580:
 		case e1000_i350:
+		case e1000_i354:
 			maxqueues = 8;
 			break;
 		case e1000_i210:
@@ -2883,8 +2798,9 @@ igb_setup_msix(struct adapter *adapter)
 	if (queues > maxqueues)
 		queues = maxqueues;
 
-	/* reflect correct sysctl value */
-	igb_num_queues = queues;
+	/* Manual override */
+	if (igb_num_queues != 0)
+		queues = igb_num_queues;
 
 	/*
 	** One vector (RX/TX pair) per queue
@@ -2927,6 +2843,129 @@ msi:
 	return (0);
 }
 
+/*********************************************************************
+ *
+ *  Initialize the DMA Coalescing feature
+ *
+ **********************************************************************/
+static void
+igb_init_dmac(struct adapter *adapter, u32 pba)
+{
+	device_t	dev = adapter->dev;
+	struct e1000_hw *hw = &adapter->hw;
+	u32 		dmac, reg = ~E1000_DMACR_DMAC_EN;
+	u16		hwm;
+
+	if (hw->mac.type == e1000_i211)
+		return;
+
+	if (hw->mac.type > e1000_82580) {
+
+		if (adapter->dmac == 0) { /* Disabling it */
+			E1000_WRITE_REG(hw, E1000_DMACR, reg);
+			return;
+		} else
+			device_printf(dev, "DMA Coalescing enabled\n");
+
+		/* Set starting threshold */
+		E1000_WRITE_REG(hw, E1000_DMCTXTH, 0);
+
+		hwm = 64 * pba - adapter->max_frame_size / 16;
+		if (hwm < 64 * (pba - 6))
+			hwm = 64 * (pba - 6);
+		reg = E1000_READ_REG(hw, E1000_FCRTC);
+		reg &= ~E1000_FCRTC_RTH_COAL_MASK;
+		reg |= ((hwm << E1000_FCRTC_RTH_COAL_SHIFT)
+		    & E1000_FCRTC_RTH_COAL_MASK);
+		E1000_WRITE_REG(hw, E1000_FCRTC, reg);
+
+
+		dmac = pba - adapter->max_frame_size / 512;
+		if (dmac < pba - 10)
+			dmac = pba - 10;
+		reg = E1000_READ_REG(hw, E1000_DMACR);
+		reg &= ~E1000_DMACR_DMACTHR_MASK;
+		reg = ((dmac << E1000_DMACR_DMACTHR_SHIFT)
+		    & E1000_DMACR_DMACTHR_MASK);
+
+		/* transition to L0x or L1 if available..*/
+		reg |= (E1000_DMACR_DMAC_EN | E1000_DMACR_DMAC_LX_MASK);
+
+		/* Check if status is 2.5Gb backplane connection
+		* before configuration of watchdog timer, which is
+		* in msec values in 12.8usec intervals
+		* watchdog timer= msec values in 32usec intervals
+		* for non 2.5Gb connection
+		*/
+		if (hw->mac.type == e1000_i354) {
+			int status = E1000_READ_REG(hw, E1000_STATUS);
+			if ((status & E1000_STATUS_2P5_SKU) &&
+			    (!(status & E1000_STATUS_2P5_SKU_OVER)))
+				reg |= ((adapter->dmac * 5) >> 6);
+			else
+				reg |= (adapter->dmac >> 5);
+		} else {
+			reg |= (adapter->dmac >> 5);
+		}
+
+		E1000_WRITE_REG(hw, E1000_DMACR, reg);
+
+#ifdef I210_OBFF_SUPPORT
+		/*
+		 * Set the OBFF Rx threshold to DMA Coalescing Rx
+		 * threshold - 2KB and enable the feature in the
+		 * hardware for I210.
+		 */
+		if (hw->mac.type == e1000_i210) {
+			int obff = dmac - 2;
+			reg = E1000_READ_REG(hw, E1000_DOBFFCTL);
+			reg &= ~E1000_DOBFFCTL_OBFFTHR_MASK;
+			reg |= (obff & E1000_DOBFFCTL_OBFFTHR_MASK)
+			    | E1000_DOBFFCTL_EXIT_ACT_MASK;
+			E1000_WRITE_REG(hw, E1000_DOBFFCTL, reg);
+		}
+#endif
+		E1000_WRITE_REG(hw, E1000_DMCRTRH, 0);
+
+		/* Set the interval before transition */
+		reg = E1000_READ_REG(hw, E1000_DMCTLX);
+		if (hw->mac.type == e1000_i350)
+			reg |= IGB_DMCTLX_DCFLUSH_DIS;
+		/*
+		** in 2.5Gb connection, TTLX unit is 0.4 usec
+		** which is 0x4*2 = 0xA. But delay is still 4 usec
+		*/
+		if (hw->mac.type == e1000_i354) {
+			int status = E1000_READ_REG(hw, E1000_STATUS);
+			if ((status & E1000_STATUS_2P5_SKU) &&
+			    (!(status & E1000_STATUS_2P5_SKU_OVER)))
+				reg |= 0xA;
+			else
+				reg |= 0x4;
+		} else {
+			reg |= 0x4;
+		}
+
+		E1000_WRITE_REG(hw, E1000_DMCTLX, reg);
+
+		/* free space in tx packet buffer to wake from DMA coal */
+		E1000_WRITE_REG(hw, E1000_DMCTXTH, (IGB_TXPBSIZE -
+		    (2 * adapter->max_frame_size)) >> 6);
+
+		/* make low power state decision controlled by DMA coal */
+		reg = E1000_READ_REG(hw, E1000_PCIEMISC);
+		reg &= ~E1000_PCIEMISC_LX_DECISION;
+		E1000_WRITE_REG(hw, E1000_PCIEMISC, reg);
+
+	} else if (hw->mac.type == e1000_82580) {
+		u32 reg = E1000_READ_REG(hw, E1000_PCIEMISC);
+		E1000_WRITE_REG(hw, E1000_PCIEMISC,
+		    reg & ~E1000_PCIEMISC_LX_DECISION);
+		E1000_WRITE_REG(hw, E1000_DMACR, 0);
+	}
+}
+
+
 /*********************************************************************
  *
  *  Set up an fresh starting state
@@ -2963,6 +3002,7 @@ igb_reset(struct adapter *adapter)
 		break;
 	case e1000_82580:
 	case e1000_i350:
+	case e1000_i354:
 	case e1000_vfadapt_i350:
 		pba = E1000_READ_REG(hw, E1000_RXPBS);
 		pba = e1000_rxpbs_adjust_82580(pba);
@@ -3033,70 +3073,19 @@ igb_reset(struct adapter *adapter)
 	e1000_reset_hw(hw);
 	E1000_WRITE_REG(hw, E1000_WUC, 0);
 
+	/* Reset for AutoMediaDetect */
+	if (adapter->flags & IGB_MEDIA_RESET) {
+		e1000_setup_init_funcs(hw, TRUE);
+		e1000_get_bus_info(hw);
+		adapter->flags &= ~IGB_MEDIA_RESET;
+	}
+
 	if (e1000_init_hw(hw) < 0)
 		device_printf(dev, "Hardware Initialization Failed\n");
 
 	/* Setup DMA Coalescing */
-	if ((hw->mac.type > e1000_82580) &&
-	    (hw->mac.type != e1000_i211)) {
-		u32 dmac;
-		u32 reg = ~E1000_DMACR_DMAC_EN;
+	igb_init_dmac(adapter, pba);
 
-		if (adapter->dmac == 0) { /* Disabling it */
-			E1000_WRITE_REG(hw, E1000_DMACR, reg);
-			goto reset_out;
-		}
-
-		/* Set starting thresholds */
-		E1000_WRITE_REG(hw, E1000_DMCTXTH, 0);
-		E1000_WRITE_REG(hw, E1000_DMCRTRH, 0);
-
-		hwm = 64 * pba - adapter->max_frame_size / 16;
-		if (hwm < 64 * (pba - 6))
-			hwm = 64 * (pba - 6);
-		reg = E1000_READ_REG(hw, E1000_FCRTC);
-		reg &= ~E1000_FCRTC_RTH_COAL_MASK;
-		reg |= ((hwm << E1000_FCRTC_RTH_COAL_SHIFT)
-		    & E1000_FCRTC_RTH_COAL_MASK);
-		E1000_WRITE_REG(hw, E1000_FCRTC, reg);
-
-
-		dmac = pba - adapter->max_frame_size / 512;
-		if (dmac < pba - 10)
-			dmac = pba - 10;
-		reg = E1000_READ_REG(hw, E1000_DMACR);
-		reg &= ~E1000_DMACR_DMACTHR_MASK;
-		reg = ((dmac << E1000_DMACR_DMACTHR_SHIFT)
-		    & E1000_DMACR_DMACTHR_MASK);
-		/* transition to L0x or L1 if available..*/
-		reg |= (E1000_DMACR_DMAC_EN | E1000_DMACR_DMAC_LX_MASK);
-		/* timer = value in adapter->dmac in 32usec intervals */
-		reg |= (adapter->dmac >> 5);
-		E1000_WRITE_REG(hw, E1000_DMACR, reg);
-
-		/* Set the interval before transition */
-		reg = E1000_READ_REG(hw, E1000_DMCTLX);
-		reg |= 0x80000004;
-		E1000_WRITE_REG(hw, E1000_DMCTLX, reg);
-
-		/* free space in tx packet buffer to wake from DMA coal */
-		E1000_WRITE_REG(hw, E1000_DMCTXTH,
-		    (20480 - (2 * adapter->max_frame_size)) >> 6);
-
-		/* make low power state decision controlled by DMA coal */
-		reg = E1000_READ_REG(hw, E1000_PCIEMISC);
-		reg &= ~E1000_PCIEMISC_LX_DECISION;
-		E1000_WRITE_REG(hw, E1000_PCIEMISC, reg);
-		device_printf(dev, "DMA Coalescing enabled\n");
-
-	} else if (hw->mac.type == e1000_82580) {
-		u32 reg = E1000_READ_REG(hw, E1000_PCIEMISC);
-		E1000_WRITE_REG(hw, E1000_DMACR, 0);
-		E1000_WRITE_REG(hw, E1000_PCIEMISC,
-		    reg & ~E1000_PCIEMISC_LX_DECISION);
-	}
-
-reset_out:
 	E1000_WRITE_REG(&adapter->hw, E1000_VET, ETHERTYPE_VLAN);
 	e1000_get_phy_info(hw);
 	e1000_check_for_link(hw);
@@ -3140,7 +3129,7 @@ igb_setup_interface(device_t dev, struct adapter *adapter)
 	ifp->if_capabilities = ifp->if_capenable = 0;
 
 	ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM;
-	ifp->if_capabilities |= IFCAP_TSO4;
+	ifp->if_capabilities |= IFCAP_TSO;
 	ifp->if_capabilities |= IFCAP_JUMBO_MTU;
 	ifp->if_capenable = ifp->if_capabilities;
 
@@ -3346,6 +3335,7 @@ igb_allocate_queues(struct adapter *adapter)
 		txr = &adapter->tx_rings[i];
 		txr->adapter = adapter;
 		txr->me = i;
+		txr->num_desc = adapter->num_tx_desc;
 
 		/* Initialize the TX lock */
 		snprintf(txr->mtx_name, sizeof(txr->mtx_name), "%s:tx(%d)",
@@ -3359,7 +3349,7 @@ igb_allocate_queues(struct adapter *adapter)
 			error = ENOMEM;
 			goto err_tx_desc;
 		}
-		txr->tx_base = (struct e1000_tx_desc *)txr->txdma.dma_vaddr;
+		txr->tx_base = (union e1000_adv_tx_desc *)txr->txdma.dma_vaddr;
 		bzero((void *)txr->tx_base, tsize);
 
         	/* Now allocate transmit buffers for the ring */
@@ -3452,7 +3442,7 @@ igb_allocate_transmit_buffers(struct tx_ring *txr)
 {
 	struct adapter *adapter = txr->adapter;
 	device_t dev = adapter->dev;
-	struct igb_tx_buffer *txbuf;
+	struct igb_tx_buf *txbuf;
 	int error, i;
 
 	/*
@@ -3475,7 +3465,7 @@ igb_allocate_transmit_buffers(struct tx_ring *txr)
 	}
 
 	if (!(txr->tx_buffers =
-	    (struct igb_tx_buffer *) malloc(sizeof(struct igb_tx_buffer) *
+	    (struct igb_tx_buf *) malloc(sizeof(struct igb_tx_buf) *
 	    adapter->num_tx_desc, M_DEVBUF, M_NOWAIT | M_ZERO))) {
 		device_printf(dev, "Unable to allocate tx_buffer memory\n");
 		error = ENOMEM;
@@ -3508,7 +3498,7 @@ static void
 igb_setup_transmit_ring(struct tx_ring *txr)
 {
 	struct adapter *adapter = txr->adapter;
-	struct igb_tx_buffer *txbuf;
+	struct igb_tx_buf *txbuf;
 	int i;
 #ifdef DEV_NETMAP
 	struct netmap_adapter *na = NA(adapter->ifp);
@@ -3544,7 +3534,7 @@ igb_setup_transmit_ring(struct tx_ring *txr)
 		}
 #endif /* DEV_NETMAP */
 		/* clear the watch index */
-		txbuf->next_eop = -1;
+		txbuf->eop = NULL;
         }
 
 	/* Set number of descriptors available */
@@ -3658,7 +3648,7 @@ static void
 igb_free_transmit_buffers(struct tx_ring *txr)
 {
 	struct adapter *adapter = txr->adapter;
-	struct igb_tx_buffer *tx_buffer;
+	struct igb_tx_buf *tx_buffer;
 	int             i;
 
 	INIT_DEBUGOUT("free_transmit_ring: begin");
@@ -3705,44 +3695,100 @@ igb_free_transmit_buffers(struct tx_ring *txr)
 
 /**********************************************************************
  *
- *  Setup work for hardware segmentation offload (TSO)
+ *  Setup work for hardware segmentation offload (TSO) on
+ *  adapters using advanced tx descriptors
  *
  **********************************************************************/
-static bool
-igb_tso_setup(struct tx_ring *txr, struct mbuf *mp, int ehdrlen,
-	struct ip *ip, struct tcphdr *th)
+static int
+igb_tso_setup(struct tx_ring *txr, struct mbuf *mp,
+    u32 *cmd_type_len, u32 *olinfo_status)
 {
 	struct adapter *adapter = txr->adapter;
 	struct e1000_adv_tx_context_desc *TXD;
-	struct igb_tx_buffer        *tx_buffer;
 	u32 vlan_macip_lens = 0, type_tucmd_mlhl = 0;
-	u32 mss_l4len_idx = 0;
-	u16 vtag = 0;
-	int ctxd, ip_hlen, tcp_hlen;
+	u32 mss_l4len_idx = 0, paylen;
+	u16 vtag = 0, eh_type;
+	int ctxd, ehdrlen, ip_hlen, tcp_hlen;
+	struct ether_vlan_header *eh;
+#ifdef INET6
+	struct ip6_hdr *ip6;
+#endif
+#ifdef INET
+	struct ip *ip;
+#endif
+	struct tcphdr *th;
+
+
+	/*
+	 * Determine where frame payload starts.
+	 * Jump over vlan headers if already present
+	 */
+	eh = mtod(mp, struct ether_vlan_header *);
+	if (eh->evl_encap_proto == htons(ETHERTYPE_VLAN)) {
+		ehdrlen = ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN;
+		eh_type = eh->evl_proto;
+	} else {
+		ehdrlen = ETHER_HDR_LEN;
+		eh_type = eh->evl_encap_proto;
+	}
+
+	switch (ntohs(eh_type)) {
+#ifdef INET6
+	case ETHERTYPE_IPV6:
+		ip6 = (struct ip6_hdr *)(mp->m_data + ehdrlen);
+		/* XXX-BZ For now we do not pretend to support ext. hdrs. */
+		if (ip6->ip6_nxt != IPPROTO_TCP)
+			return (ENXIO);
+		ip_hlen = sizeof(struct ip6_hdr);
+		ip6 = (struct ip6_hdr *)(mp->m_data + ehdrlen);
+		th = (struct tcphdr *)((caddr_t)ip6 + ip_hlen);
+		th->th_sum = in6_cksum_pseudo(ip6, 0, IPPROTO_TCP, 0);
+		type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_IPV6;
+		break;
+#endif
+#ifdef INET
+	case ETHERTYPE_IP:
+		ip = (struct ip *)(mp->m_data + ehdrlen);
+		if (ip->ip_p != IPPROTO_TCP)
+			return (ENXIO);
+		ip->ip_sum = 0;
+		ip_hlen = ip->ip_hl << 2;
+		th = (struct tcphdr *)((caddr_t)ip + ip_hlen);
+		th->th_sum = in_pseudo(ip->ip_src.s_addr,
+		    ip->ip_dst.s_addr, htons(IPPROTO_TCP));
+		type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_IPV4;
+		/* Tell transmit desc to also do IPv4 checksum. */
+		*olinfo_status |= E1000_TXD_POPTS_IXSM << 8;
+		break;
+#endif
+	default:
+		panic("%s: CSUM_TSO but no supported IP version (0x%04x)",
+		    __func__, ntohs(eh_type));
+		break;
+	}
 
 	ctxd = txr->next_avail_desc;
-	tx_buffer = &txr->tx_buffers[ctxd];
 	TXD = (struct e1000_adv_tx_context_desc *) &txr->tx_base[ctxd];
 
-	ip->ip_sum = 0;
-	ip_hlen = ip->ip_hl << 2;
 	tcp_hlen = th->th_off << 2;
 
+	/* This is used in the transmit desc in encap */
+	paylen = mp->m_pkthdr.len - ehdrlen - ip_hlen - tcp_hlen;
+
 	/* VLAN MACLEN IPLEN */
 	if (mp->m_flags & M_VLANTAG) {
 		vtag = htole16(mp->m_pkthdr.ether_vtag);
-		vlan_macip_lens |= (vtag << E1000_ADVTXD_VLAN_SHIFT);
+                vlan_macip_lens |= (vtag << E1000_ADVTXD_VLAN_SHIFT);
 	}
 
-	vlan_macip_lens |= (ehdrlen << E1000_ADVTXD_MACLEN_SHIFT);
+	vlan_macip_lens |= ehdrlen << E1000_ADVTXD_MACLEN_SHIFT;
 	vlan_macip_lens |= ip_hlen;
-	TXD->vlan_macip_lens |= htole32(vlan_macip_lens);
+	TXD->vlan_macip_lens = htole32(vlan_macip_lens);
 
 	/* ADV DTYPE TUCMD */
 	type_tucmd_mlhl |= E1000_ADVTXD_DCMD_DEXT | E1000_ADVTXD_DTYP_CTXT;
 	type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_TCP;
-	type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_IPV4;
-	TXD->type_tucmd_mlhl |= htole32(type_tucmd_mlhl);
+	TXD->type_tucmd_mlhl = htole32(type_tucmd_mlhl);
 
 	/* MSS L4LEN IDX */
 	mss_l4len_idx |= (mp->m_pkthdr.tso_segsz << E1000_ADVTXD_MSS_SHIFT);
@@ -3753,57 +3799,65 @@ igb_tso_setup(struct tx_ring *txr, struct mbuf *mp, int ehdrlen,
 	TXD->mss_l4len_idx = htole32(mss_l4len_idx);
 
 	TXD->seqnum_seed = htole32(0);
-	tx_buffer->m_head = NULL;
-	tx_buffer->next_eop = -1;
 
-	if (++ctxd == adapter->num_tx_desc)
+	if (++ctxd == txr->num_desc)
 		ctxd = 0;
 
 	txr->tx_avail--;
 	txr->next_avail_desc = ctxd;
-	return TRUE;
+	*cmd_type_len |= E1000_ADVTXD_DCMD_TSE;
+	*olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
+	*olinfo_status |= paylen << E1000_ADVTXD_PAYLEN_SHIFT;
+	++txr->tso_tx;
+	return (0);
 }
 
-
 /*********************************************************************
  *
- *  Context Descriptor setup for VLAN or CSUM
+ *  Advanced Context Descriptor setup for VLAN, CSUM or TSO
  *
  **********************************************************************/
 
-static bool
-igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp)
+static int
+igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp,
+    u32 *cmd_type_len, u32 *olinfo_status)
 {
-	struct adapter *adapter = txr->adapter;
 	struct e1000_adv_tx_context_desc *TXD;
-	struct igb_tx_buffer        *tx_buffer;
-	u32 vlan_macip_lens, type_tucmd_mlhl, mss_l4len_idx;
+	struct adapter *adapter = txr->adapter;
 	struct ether_vlan_header *eh;
-	struct ip *ip = NULL;
+	struct ip *ip;
 	struct ip6_hdr *ip6;
-	int  ehdrlen, ctxd, ip_hlen = 0;
-	u16	etype, vtag = 0;
+	u32 vlan_macip_lens = 0, type_tucmd_mlhl = 0, mss_l4len_idx = 0;
+	int	ehdrlen, ip_hlen = 0;
+	u16	etype;
 	u8	ipproto = 0;
-	bool	offload = TRUE;
+	int	offload = TRUE;
+	int	ctxd = txr->next_avail_desc;
+	u16	vtag = 0;
+
+	/* First check if TSO is to be used */
+	if (mp->m_pkthdr.csum_flags & CSUM_TSO)
+		return (igb_tso_setup(txr, mp, cmd_type_len, olinfo_status));
 
 	if ((mp->m_pkthdr.csum_flags & CSUM_OFFLOAD) == 0)
 		offload = FALSE;
 
-	vlan_macip_lens = type_tucmd_mlhl = mss_l4len_idx = 0;
-	ctxd = txr->next_avail_desc;
-	tx_buffer = &txr->tx_buffers[ctxd];
+	/* Indicate the whole packet as payload when not doing TSO */
+       	*olinfo_status |= mp->m_pkthdr.len << E1000_ADVTXD_PAYLEN_SHIFT;
+
+	/* Now ready a context descriptor */
 	TXD = (struct e1000_adv_tx_context_desc *) &txr->tx_base[ctxd];
 
 	/*
 	** In advanced descriptors the vlan tag must 
-	** be placed into the context descriptor, thus
-	** we need to be here just for that setup.
+	** be placed into the context descriptor. Hence
+	** we need to make one even if not doing offloads.
 	*/
 	if (mp->m_flags & M_VLANTAG) {
 		vtag = htole16(mp->m_pkthdr.ether_vtag);
 		vlan_macip_lens |= (vtag << E1000_ADVTXD_VLAN_SHIFT);
-	} else if (offload == FALSE)
-		return FALSE;
+	} else if (offload == FALSE) /* ... no offload to do */
+		return (0);
 
 	/*
 	 * Determine where frame payload starts.
@@ -3826,16 +3880,13 @@ igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp)
 		case ETHERTYPE_IP:
 			ip = (struct ip *)(mp->m_data + ehdrlen);
 			ip_hlen = ip->ip_hl << 2;
-			if (mp->m_len < ehdrlen + ip_hlen) {
-				offload = FALSE;
-				break;
-			}
 			ipproto = ip->ip_p;
 			type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_IPV4;
 			break;
 		case ETHERTYPE_IPV6:
 			ip6 = (struct ip6_hdr *)(mp->m_data + ehdrlen);
 			ip_hlen = sizeof(struct ip6_hdr);
+			/* XXX-BZ this will go badly in case of ext hdrs. */
 			ipproto = ip6->ip6_nxt;
 			type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_IPV6;
 			break;
@@ -3856,6 +3907,7 @@ igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp)
 			if (mp->m_pkthdr.csum_flags & CSUM_UDP)
 				type_tucmd_mlhl |= E1000_ADVTXD_TUCMD_L4T_UDP;
 			break;
+
 #if __FreeBSD_version >= 800000
 		case IPPROTO_SCTP:
 			if (mp->m_pkthdr.csum_flags & CSUM_SCTP)
@@ -3867,29 +3919,28 @@ igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp)
 			break;
 	}
 
+	if (offload) /* For the TX descriptor setup */
+		*olinfo_status |= E1000_TXD_POPTS_TXSM << 8;
+
 	/* 82575 needs the queue index added */
 	if (adapter->hw.mac.type == e1000_82575)
 		mss_l4len_idx = txr->me << 4;
 
 	/* Now copy bits into descriptor */
-	TXD->vlan_macip_lens |= htole32(vlan_macip_lens);
-	TXD->type_tucmd_mlhl |= htole32(type_tucmd_mlhl);
+	TXD->vlan_macip_lens = htole32(vlan_macip_lens);
+	TXD->type_tucmd_mlhl = htole32(type_tucmd_mlhl);
 	TXD->seqnum_seed = htole32(0);
 	TXD->mss_l4len_idx = htole32(mss_l4len_idx);
 
-	tx_buffer->m_head = NULL;
-	tx_buffer->next_eop = -1;
-
 	/* We've consumed the first desc, adjust counters */
-	if (++ctxd == adapter->num_tx_desc)
+	if (++ctxd == txr->num_desc)
 		ctxd = 0;
 	txr->next_avail_desc = ctxd;
 	--txr->tx_avail;
 
-        return (offload);
+        return (0);
 }
 
-
 /**********************************************************************
  *
  *  Examine each tx_buffer in the used queue. If the hardware is done
@@ -3901,90 +3952,103 @@ igb_tx_ctx_setup(struct tx_ring *txr, struct mbuf *mp)
 static bool
 igb_txeof(struct tx_ring *txr)
 {
-	struct adapter	*adapter = txr->adapter;
-        int first, last, done, processed;
-        struct igb_tx_buffer *tx_buffer;
-        struct e1000_tx_desc   *tx_desc, *eop_desc;
-	struct ifnet   *ifp = adapter->ifp;
+	struct adapter		*adapter = txr->adapter;
+	struct ifnet		*ifp = adapter->ifp;
+	u32			work, processed = 0;
+	u16			limit = txr->process_limit;
+	struct igb_tx_buf	*buf;
+	union e1000_adv_tx_desc *txd;
 
-	IGB_TX_LOCK_ASSERT(txr);
+	mtx_assert(&txr->tx_mtx, MA_OWNED);
 
 #ifdef DEV_NETMAP
-	if (netmap_tx_irq(ifp, txr->me |
-	    (NETMAP_LOCKED_ENTER|NETMAP_LOCKED_EXIT)))
+	if (netmap_tx_irq(ifp, txr->me))
 		return (FALSE);
 #endif /* DEV_NETMAP */
-        if (txr->tx_avail == adapter->num_tx_desc) {
+
+	if (txr->tx_avail == txr->num_desc) {
 		txr->queue_status = IGB_QUEUE_IDLE;
-                return FALSE;
+		return FALSE;
 	}
 
-	processed = 0;
-        first = txr->next_to_clean;
-        tx_desc = &txr->tx_base[first];
-        tx_buffer = &txr->tx_buffers[first];
-	last = tx_buffer->next_eop;
-        eop_desc = &txr->tx_base[last];
-
-	/*
-	 * What this does is get the index of the
-	 * first descriptor AFTER the EOP of the 
-	 * first packet, that way we can do the
-	 * simple comparison on the inner while loop.
-	 */
-	if (++last == adapter->num_tx_desc)
- 		last = 0;
-	done = last;
-
+	/* Get work starting point */
+	work = txr->next_to_clean;
+	buf = &txr->tx_buffers[work];
+	txd = &txr->tx_base[work];
+	work -= txr->num_desc; /* The distance to ring end */
         bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map,
             BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
+	do {
+		union e1000_adv_tx_desc *eop = buf->eop;
+		if (eop == NULL) /* No work */
+			break;
 
-        while (eop_desc->upper.fields.status & E1000_TXD_STAT_DD) {
-		/* We clean the range of the packet */
-		while (first != done) {
-                	tx_desc->upper.data = 0;
-                	tx_desc->lower.data = 0;
-                	tx_desc->buffer_addr = 0;
-                	++txr->tx_avail;
-			++processed;
+		if ((eop->wb.status & E1000_TXD_STAT_DD) == 0)
+			break;	/* I/O not complete */
 
-			if (tx_buffer->m_head) {
+		if (buf->m_head) {
+			txr->bytes +=
+			    buf->m_head->m_pkthdr.len;
+			bus_dmamap_sync(txr->txtag,
+			    buf->map,
+			    BUS_DMASYNC_POSTWRITE);
+			bus_dmamap_unload(txr->txtag,
+			    buf->map);
+			m_freem(buf->m_head);
+			buf->m_head = NULL;
+		}
+		buf->eop = NULL;
+		++txr->tx_avail;
+
+		/* We clean the range if multi segment */
+		while (txd != eop) {
+			++txd;
+			++buf;
+			++work;
+			/* wrap the ring? */
+			if (__predict_false(!work)) {
+				work -= txr->num_desc;
+				buf = txr->tx_buffers;
+				txd = txr->tx_base;
+			}
+			if (buf->m_head) {
 				txr->bytes +=
-				    tx_buffer->m_head->m_pkthdr.len;
+				    buf->m_head->m_pkthdr.len;
 				bus_dmamap_sync(txr->txtag,
-				    tx_buffer->map,
+				    buf->map,
 				    BUS_DMASYNC_POSTWRITE);
 				bus_dmamap_unload(txr->txtag,
-				    tx_buffer->map);
+				    buf->map);
+				m_freem(buf->m_head);
+				buf->m_head = NULL;
+			}
+			++txr->tx_avail;
+			buf->eop = NULL;
 
-                        	m_freem(tx_buffer->m_head);
-                        	tx_buffer->m_head = NULL;
-                	}
-			tx_buffer->next_eop = -1;
-			txr->watchdog_time = ticks;
-
-	                if (++first == adapter->num_tx_desc)
-				first = 0;
-
-	                tx_buffer = &txr->tx_buffers[first];
-			tx_desc = &txr->tx_base[first];
 		}
 		++txr->packets;
+		++processed;
 		++ifp->if_opackets;
-		/* See if we can continue to the next packet */
-		last = tx_buffer->next_eop;
-		if (last != -1) {
-        		eop_desc = &txr->tx_base[last];
-			/* Get new done point */
-			if (++last == adapter->num_tx_desc) last = 0;
-			done = last;
-		} else
-			break;
-        }
-        bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map,
-            BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+		txr->watchdog_time = ticks;
 
-        txr->next_to_clean = first;
+		/* Try the next packet */
+		++txd;
+		++buf;
+		++work;
+		/* reset with a wrap */
+		if (__predict_false(!work)) {
+			work -= txr->num_desc;
+			buf = txr->tx_buffers;
+			txd = txr->tx_base;
+		}
+		prefetch(txd);
+	} while (__predict_true(--limit));
+
+	bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map,
+	    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
+
+	work += txr->num_desc;
+	txr->next_to_clean = work;
 
 	/*
 	** Watchdog calculation, we know there's
@@ -3994,18 +4058,14 @@ igb_txeof(struct tx_ring *txr)
 	*/
 	if ((!processed) && ((ticks - txr->watchdog_time) > IGB_WATCHDOG))
 		txr->queue_status |= IGB_QUEUE_HUNG;
-        /*
-         * If we have a minimum free,
-         * clear depleted state bit
-         */
-        if (txr->tx_avail >= IGB_QUEUE_THRESHOLD)          
-                txr->queue_status &= ~IGB_QUEUE_DEPLETED;
 
-	/* All clean, turn off the watchdog */
-	if (txr->tx_avail == adapter->num_tx_desc) {
+	if (txr->tx_avail >= IGB_QUEUE_THRESHOLD)
+		txr->queue_status &= ~IGB_QUEUE_DEPLETED;	
+
+	if (txr->tx_avail == txr->num_desc) {
 		txr->queue_status = IGB_QUEUE_IDLE;
 		return (FALSE);
-        }
+	}
 
 	return (TRUE);
 }
@@ -4168,15 +4228,13 @@ igb_allocate_receive_buffers(struct rx_ring *rxr)
 
 	for (i = 0; i < adapter->num_rx_desc; i++) {
 		rxbuf = &rxr->rx_buffers[i];
-		error = bus_dmamap_create(rxr->htag,
-		    BUS_DMA_NOWAIT, &rxbuf->hmap);
+		error = bus_dmamap_create(rxr->htag, 0, &rxbuf->hmap);
 		if (error) {
 			device_printf(dev,
 			    "Unable to create RX head DMA maps\n");
 			goto fail;
 		}
-		error = bus_dmamap_create(rxr->ptag,
-		    BUS_DMA_NOWAIT, &rxbuf->pmap);
+		error = bus_dmamap_create(rxr->ptag, 0, &rxbuf->pmap);
 		if (error) {
 			device_printf(dev,
 			    "Unable to create RX packet DMA maps\n");
@@ -4696,11 +4754,13 @@ igb_rx_discard(struct rx_ring *rxr, int i)
 	if (rbuf->m_head) {
 		m_free(rbuf->m_head);
 		rbuf->m_head = NULL;
+		bus_dmamap_unload(rxr->htag, rbuf->hmap);
 	}
 
 	if (rbuf->m_pack) {
 		m_free(rbuf->m_pack);
 		rbuf->m_pack = NULL;
+		bus_dmamap_unload(rxr->ptag, rbuf->pmap);
 	}
 
 	return;
@@ -4766,8 +4826,10 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 	    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
 
 #ifdef DEV_NETMAP
-	if (netmap_rx_irq(ifp, rxr->me | NETMAP_LOCKED_ENTER, &processed))
+	if (netmap_rx_irq(ifp, rxr->me, &processed)) {
+		IGB_RX_UNLOCK(rxr);
 		return (FALSE);
+	}
 #endif /* DEV_NETMAP */
 
 	/* Main clean loop */
@@ -4789,7 +4851,8 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 		rxbuf = &rxr->rx_buffers[i];
 		plen = le16toh(cur->wb.upper.length);
 		ptype = le32toh(cur->wb.lower.lo_dword.data) & IGB_PKTTYPE_MASK;
-		if ((adapter->hw.mac.type == e1000_i350) &&
+		if (((adapter->hw.mac.type == e1000_i350) ||
+		    (adapter->hw.mac.type == e1000_i354)) &&
 		    (staterr & E1000_RXDEXT_STATERR_LB))
 			vtag = be16toh(cur->wb.upper.vlan);
 		else
@@ -4822,6 +4885,7 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 		** case only the first header is valid.
 		*/
 		if (rxr->hdr_split && rxr->fmp == NULL) {
+			bus_dmamap_unload(rxr->htag, rxbuf->hmap);
 			hlen = (hdr & E1000_RXDADV_HDRBUFLEN_MASK) >>
 			    E1000_RXDADV_HDRBUFLEN_SHIFT;
 			if (hlen > IGB_HDR_BUF)
@@ -4854,6 +4918,7 @@ igb_rxeof(struct igb_queue *que, int count, int *done)
 			/* clear buf info for refresh */
 			rxbuf->m_pack = NULL;
 		}
+		bus_dmamap_unload(rxr->ptag, rxbuf->pmap);
 
 		++processed; /* So we know when to refresh */
 
@@ -5590,8 +5655,8 @@ igb_add_hw_stats(struct adapter *adapter)
 		SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "no_desc_avail", 
 				CTLFLAG_RD, &txr->no_desc_avail,
 				"Queue No Descriptor Available");
-		SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "tx_packets",
-				CTLFLAG_RD, &txr->tx_packets,
+		SYSCTL_ADD_UQUAD(ctx, queue_list, OID_AUTO, "tx_packets",
+				CTLFLAG_RD, &txr->total_packets,
 				"Queue Packets Transmitted");
 
 		SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_head", 
@@ -6032,7 +6097,7 @@ igb_sysctl_dmac(SYSCTL_HANDLER_ARGS)
 		default:
 			/* Do nothing, illegal value */
 			adapter->dmac = 0;
-			return (error);
+			return (EINVAL);
 	}
 	/* Reinit the interface */
 	igb_init(adapter);
diff --git a/sys/dev/e1000/if_igb.h b/sys/dev/e1000/if_igb.h
index 6f3a3a54efb..0c4474126f7 100644
--- a/sys/dev/e1000/if_igb.h
+++ b/sys/dev/e1000/if_igb.h
@@ -1,6 +1,6 @@
 /******************************************************************************
 
-  Copyright (c) 2001-2011, Intel Corporation 
+  Copyright (c) 2001-2013, Intel Corporation 
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without 
@@ -162,6 +162,9 @@
 /* PHY master/slave setting */
 #define IGB_MASTER_SLAVE		e1000_ms_hw_default
 
+/* Support AutoMediaDetect for Marvell M88 PHY in i354 */
+#define IGB_MEDIA_RESET			(1 << 0)
+
 /*
  * Micellaneous constants
  */
@@ -173,11 +176,13 @@
 #define IGB_SMARTSPEED_MAX		15
 #define IGB_MAX_LOOP			10
 
-#define IGB_RX_PTHRESH			(hw->mac.type <= e1000_82576 ? 16 : 8)
+#define IGB_RX_PTHRESH			((hw->mac.type == e1000_i354) ? 12 : \
+					  ((hw->mac.type <= e1000_82576) ? 16 : 8))
 #define IGB_RX_HTHRESH			8
-#define IGB_RX_WTHRESH			1
+#define IGB_RX_WTHRESH			((hw->mac.type == e1000_82576 && \
+					  adapter->msix_mem) ? 1 : 4)
 
-#define IGB_TX_PTHRESH			8
+#define IGB_TX_PTHRESH			((hw->mac.type == e1000_i354) ? 20 : 8)
 #define IGB_TX_HTHRESH			1
 #define IGB_TX_WTHRESH			((hw->mac.type != e1000_82575 && \
                                           adapter->msix_mem) ? 1 : 16)
@@ -190,11 +195,6 @@
 #define IGB_EEPROM_APME			0x400;
 /* Queue minimum free for use */
 #define IGB_QUEUE_THRESHOLD		(adapter->num_tx_desc / 8)
-/* Queue bit defines */
-#define IGB_QUEUE_IDLE			1
-#define IGB_QUEUE_WORKING		2
-#define IGB_QUEUE_HUNG			4
-#define IGB_QUEUE_DEPLETED		8
 
 /*
  * TDBA/RDBA should be aligned on 16 byte boundary. But TDLEN/RDLEN should be
@@ -228,8 +228,10 @@
 #define IGB_BR_SIZE		4096	/* ring buf size */
 #define IGB_TSO_SIZE		(65535 + sizeof(struct ether_vlan_header))
 #define IGB_TSO_SEG_SIZE	4096	/* Max dma segment size */
+#define IGB_TXPBSIZE		20408
 #define IGB_HDR_BUF		128
 #define IGB_PKTTYPE_MASK	0x0000FFF0
+#define IGB_DMCTLX_DCFLUSH_DIS	0x80000000  /* Disable DMA Coalesce Flush */
 #define ETH_ZLEN		60
 #define ETH_ADDR_LEN		6
 
@@ -245,6 +247,7 @@
 #define IGB_DEFAULT_ITR         ((1000000/IGB_INTS_PER_SEC) << 2)
 
 #define IGB_LINK_ITR            2000
+#define I210_LINK_DELAY		1000
 
 /* Precision Time Sync (IEEE 1588) defines */
 #define ETHERTYPE_IEEE1588	0x88F7
@@ -284,34 +287,42 @@ struct igb_queue {
 };
 
 /*
- * Transmit ring: one per queue
+ * The transmit ring, one per queue
  */
 struct tx_ring {
-	struct adapter		*adapter;
-	u32			me;
+        struct adapter		*adapter;
 	struct mtx		tx_mtx;
-	char			mtx_name[16];
+	u32			me;
+	int			watchdog_time;
+	union e1000_adv_tx_desc	*tx_base;
+	struct igb_tx_buf	*tx_buffers;
 	struct igb_dma_alloc	txdma;
-	struct e1000_tx_desc	*tx_base;
-	u32			next_avail_desc;
-	u32			next_to_clean;
 	volatile u16		tx_avail;
-	struct igb_tx_buffer	*tx_buffers;
+	u16			next_avail_desc;
+	u16			next_to_clean;
+	u16			process_limit;
+	u16			num_desc;
+	enum {
+	    IGB_QUEUE_IDLE = 1,
+	    IGB_QUEUE_WORKING = 2,
+	    IGB_QUEUE_HUNG = 4,
+	    IGB_QUEUE_DEPLETED = 8,
+	}			queue_status;
+	u32			txd_cmd;
+	bus_dma_tag_t		txtag;
+	char			mtx_name[16];
 #ifndef IGB_LEGACY_TX
 	struct buf_ring		*br;
 	struct task		txq_task;
 #endif
-	bus_dma_tag_t		txtag;
-
-	u32			bytes;
+	u32			bytes;  /* used for AIM */
 	u32			packets;
-
-	int			queue_status;
-	int			watchdog_time;
-	int			tdt;
-	int			tdh;
+	/* Soft Stats */
+	unsigned long   	tso_tx;
+	unsigned long   	no_tx_map_avail;
+	unsigned long   	no_tx_dma_setup;
 	u64			no_desc_avail;
-	u64			tx_packets;
+	u64			total_packets;
 };
 
 /*
@@ -353,43 +364,38 @@ struct rx_ring {
 };
 
 struct adapter {
-	struct ifnet	*ifp;
-	struct e1000_hw	hw;
+	struct ifnet		*ifp;
+	struct e1000_hw		hw;
 
-	struct e1000_osdep osdep;
-	struct device	*dev;
-	struct cdev	*led_dev;
+	struct e1000_osdep	osdep;
+	struct device		*dev;
+	struct cdev		*led_dev;
 
-	struct resource *pci_mem;
-	struct resource *msix_mem;
-	struct resource	*res;
-	void		*tag;
-	u32		que_mask;
+	struct resource		*pci_mem;
+	struct resource		*msix_mem;
+	int			memrid;
 
-	int		linkvec;
-	int		link_mask;
-	struct task	link_task;
-	int		link_irq;
+	/*
+	 * Interrupt resources: this set is
+	 * either used for legacy, or for Link
+	 * when doing MSIX
+	 */
+	void			*tag;
+	struct resource 	*res;
 
-	struct ifmedia	media;
-	struct callout	timer;
-	int		msix;	/* total vectors allocated */
-	int		if_flags;
-	int		max_frame_size;
-	int		min_frame_size;
-	int		pause_frames;
-	struct mtx	core_mtx;
-	int		igb_insert_vlan_header;
-        u16		num_queues;
-	u16		vf_ifp;  /* a VF interface */
+	struct ifmedia		media;
+	struct callout		timer;
+	int			msix;
+	int			if_flags;
+	int			pause_frames;
 
-	eventhandler_tag vlan_attach;
-	eventhandler_tag vlan_detach;
-	u32		num_vlans;
+	struct mtx		core_mtx;
 
-	/* Management and WOL features */
-	int		wol;
-	int		has_manage;
+	eventhandler_tag 	vlan_attach;
+	eventhandler_tag 	vlan_detach;
+
+	u16			num_vlans;
+	u16			num_queues;
 
 	/*
 	** Shadow VFTA table, this is needed because
@@ -397,66 +403,86 @@ struct adapter {
 	** a soft reset and the driver needs to be able
 	** to repopulate it.
 	*/
-	u32		shadow_vfta[IGB_VFTA_SIZE];
+	u32			shadow_vfta[IGB_VFTA_SIZE];
 
 	/* Info about the interface */
-	u16		link_active;
-	u16		fc;
-	u16		link_speed;
-	u16		link_duplex;
-	u32		smartspeed;
-	u32		dmac;
-	int		enable_aim;
+	u32			optics;
+	u32			fc; /* local flow ctrl setting */
+	int			advertise;  /* link speeds */
+	bool			link_active;
+	u16			max_frame_size;
+	u16			num_segs;
+	u16			link_speed;
+	bool			link_up;
+	u32 			linkvec;
+	u16			link_duplex;
+	u32			dmac;
+	int			link_mask;
 
-	/* Interface queues */
+	/* Flags */
+	u32			flags;
+
+	/* Mbuf cluster size */
+	u32			rx_mbuf_sz;
+
+	/* Support for pluggable optics */
+	bool			sfp_probe;
+	struct task     	link_task;  /* Link tasklet */
+	struct task     	mod_task;   /* SFP tasklet */
+	struct task     	msf_task;   /* Multispeed Fiber */
+	struct taskqueue	*tq;
+
+	/*
+	** Queues: 
+	**   This is the irq holder, it has
+	**   and RX/TX pair or rings associated
+	**   with it.
+	*/
 	struct igb_queue	*queues;
 
 	/*
-	 * Transmit rings
+	 * Transmit rings:
+	 *	Allocated at run time, an array of rings.
 	 */
 	struct tx_ring		*tx_rings;
-        u16			num_tx_desc;
+	u32			num_tx_desc;
 
-	/* Multicast array pointer */
-	u8			*mta;
-
-	/* 
-	 * Receive rings
+	/*
+	 * Receive rings:
+	 *	Allocated at run time, an array of rings.
 	 */
 	struct rx_ring		*rx_rings;
-	bool			rx_hdr_split;
-        u16			num_rx_desc;
-	int			rx_process_limit;
-	u32			rx_mbuf_sz;
-	u32			rx_mask;
+	u64			que_mask;
+	u32			num_rx_desc;
+
+	/* Multicast array memory */
+	u8			*mta;
 
 	/* Misc stats maintained by the driver */
-	unsigned long	dropped_pkts;
-	unsigned long	mbuf_defrag_failed;
-	unsigned long	mbuf_header_failed;
-	unsigned long	mbuf_packet_failed;
-	unsigned long	no_tx_map_avail;
-        unsigned long	no_tx_dma_setup;
-	unsigned long	watchdog_events;
-	unsigned long	rx_overruns;
-	unsigned long	device_control;
-	unsigned long	rx_control;
-	unsigned long	int_mask;
-	unsigned long	eint_mask;
-	unsigned long	packet_buf_alloc_rx;
-	unsigned long	packet_buf_alloc_tx;
+	unsigned long   	dropped_pkts;
+	unsigned long   	mbuf_defrag_failed;
+	unsigned long   	mbuf_header_failed;
+	unsigned long   	mbuf_packet_failed;
+	unsigned long		no_tx_dma_setup;
+	unsigned long   	watchdog_events;
+	unsigned long		link_irq;
+	unsigned long		rx_overruns;
+	unsigned long		device_control;
+	unsigned long		rx_control;
+	unsigned long		int_mask;
+	unsigned long		eint_mask;
+	unsigned long		packet_buf_alloc_rx;
+	unsigned long		packet_buf_alloc_tx;
+	/* Used in pf and vf */
+	void			*stats;
 
-	boolean_t       in_detach;
+	int			enable_aim;
+	int			has_manage;
+	int			wol;
+	int			rx_process_limit;
+	u16			vf_ifp;  /* a VF interface */
+	bool			in_detach; /* Used only in igb_ioctl */
 
-#ifdef IGB_IEEE1588
-	/* IEEE 1588 precision time support */
-	struct cyclecounter     cycles;
-	struct nettimer         clock;
-	struct nettime_compare  compare;
-	struct hwtstamp_ctrl    hwtstamp;
-#endif
-
-	void 			*stats;
 };
 
 /* ******************************************************************************
@@ -474,11 +500,10 @@ typedef struct _igb_vendor_info_t {
 	unsigned int index;
 } igb_vendor_info_t;
 
-
-struct igb_tx_buffer {
-	int		next_eop;  /* Index of the desc to watch */
-        struct mbuf    *m_head;
-        bus_dmamap_t    map;         /* bus_dma map for packet */
+struct igb_tx_buf {
+	union e1000_adv_tx_desc	*eop;
+	struct mbuf	*m_head;
+	bus_dmamap_t	map;
 };
 
 struct igb_rx_buf {
diff --git a/sys/dev/e1000/if_lem.c b/sys/dev/e1000/if_lem.c
index 57e88a48c1f..1df8de951ab 100644
--- a/sys/dev/e1000/if_lem.c
+++ b/sys/dev/e1000/if_lem.c
@@ -60,6 +60,7 @@
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -2985,7 +2986,7 @@ lem_txeof(struct adapter *adapter)
 	EM_TX_LOCK_ASSERT(adapter);
 
 #ifdef DEV_NETMAP
-	if (netmap_tx_irq(ifp, 0 | (NETMAP_LOCKED_ENTER|NETMAP_LOCKED_EXIT)))
+	if (netmap_tx_irq(ifp, 0))
 		return;
 #endif /* DEV_NETMAP */
         if (adapter->num_tx_desc_avail == adapter->num_tx_desc)
@@ -3182,8 +3183,7 @@ lem_allocate_receive_structures(struct adapter *adapter)
 	}
 
 	/* Create the spare map (used by getbuf) */
-	error = bus_dmamap_create(adapter->rxtag, BUS_DMA_NOWAIT,
-	     &adapter->rx_sparemap);
+	error = bus_dmamap_create(adapter->rxtag, 0, &adapter->rx_sparemap);
 	if (error) {
 		device_printf(dev, "%s: bus_dmamap_create failed: %d\n",
 		    __func__, error);
@@ -3192,8 +3192,7 @@ lem_allocate_receive_structures(struct adapter *adapter)
 
 	rx_buffer = adapter->rx_buffer_area;
 	for (i = 0; i < adapter->num_rx_desc; i++, rx_buffer++) {
-		error = bus_dmamap_create(adapter->rxtag, BUS_DMA_NOWAIT,
-		    &rx_buffer->map);
+		error = bus_dmamap_create(adapter->rxtag, 0, &rx_buffer->map);
 		if (error) {
 			device_printf(dev, "%s: bus_dmamap_create failed: %d\n",
 			    __func__, error);
@@ -3454,8 +3453,10 @@ lem_rxeof(struct adapter *adapter, int count, int *done)
 	    BUS_DMASYNC_POSTREAD);
 
 #ifdef DEV_NETMAP
-	if (netmap_rx_irq(ifp, 0 | NETMAP_LOCKED_ENTER, &rx_sent))
+	if (netmap_rx_irq(ifp, 0, &rx_sent)) {
+		EM_RX_UNLOCK(adapter);
 		return (FALSE);
+	}
 #endif /* DEV_NETMAP */
 
 	if (!((current_desc->status) & E1000_RXD_STAT_DD)) {
diff --git a/sys/dev/e1000/if_lem.h b/sys/dev/e1000/if_lem.h
index 235277d740c..db6b5f0acab 100644
--- a/sys/dev/e1000/if_lem.h
+++ b/sys/dev/e1000/if_lem.h
@@ -265,6 +265,13 @@
 #define PICOSECS_PER_TICK	20833
 #define TSYNC_PORT		319 /* UDP port for the protocol */
 
+#ifdef NIC_PARAVIRT
+#define	E1000_PARA_SUBDEV	0x1101		/* special id */
+#define	E1000_CSBAL		0x02830		/* csb phys. addr. low */
+#define	E1000_CSBAH		0x02834		/* csb phys. addr. hi */
+#include <net/paravirt.h>
+#endif /* NIC_PARAVIRT */
+
 /*
  * Bus dma allocation structure used by
  * e1000_dma_malloc and e1000_dma_free.
@@ -437,6 +444,26 @@ struct adapter {
 	boolean_t       pcix_82544;
 	boolean_t       in_detach;
 
+#ifdef NIC_SEND_COMBINING
+	/* 0 = idle; 1xxxx int-pending; 3xxxx int + d pending + tdt */
+#define MIT_PENDING_INT	0x10000	/* pending interrupt */
+#define MIT_PENDING_TDT	0x30000	/* both intr and tdt write are pending */
+	uint32_t shadow_tdt;
+	uint32_t sc_enable;
+#endif /* NIC_SEND_COMBINING */
+#ifdef BATCH_DISPATCH
+	uint32_t batch_enable;
+#endif /* BATCH_DISPATCH */
+
+#ifdef NIC_PARAVIRT
+	struct em_dma_alloc	csb_mem;	/* phys address */
+	struct paravirt_csb	*csb;		/* virtual addr */
+	uint32_t rx_retries;	/* optimize rx loop */
+	uint32_t		tdt_csb_count;// XXX stat
+	uint32_t		tdt_reg_count;// XXX stat
+	uint32_t		tdt_int_count;// XXX stat
+	uint32_t		guest_need_kick_count;// XXX stat
+#endif /* NIC_PARAVIRT */
 
 	struct e1000_hw_stats stats;
 };
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index a84fc758f0b..7166d90517a 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_mib.h>
diff --git a/sys/dev/ed/if_ed_3c503.c b/sys/dev/ed/if_ed_3c503.c
index 152b863698a..491c134a8ac 100644
--- a/sys/dev/ed/if_ed_3c503.c
+++ b/sys/dev/ed/if_ed_3c503.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>		/* XXX: ed_3c503_mediachg() */
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_mib.h>
diff --git a/sys/dev/ed/if_ed_hpp.c b/sys/dev/ed/if_ed_hpp.c
index 12b59c372c1..1c9d4bb2208 100644
--- a/sys/dev/ed/if_ed_hpp.c
+++ b/sys/dev/ed/if_ed_hpp.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>		/* XXX: ed_hpp_set_physical_link() */
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_mib.h>
diff --git a/sys/dev/ed/if_ed_pccard.c b/sys/dev/ed/if_ed_pccard.c
index 780f5f33225..78f5dea5b9d 100644
--- a/sys/dev/ed/if_ed_pccard.c
+++ b/sys/dev/ed/if_ed_pccard.c
@@ -86,6 +86,7 @@
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_mib.h>
 #include <net/if_media.h>
diff --git a/sys/dev/ed/if_ed_rtl80x9.c b/sys/dev/ed/if_ed_rtl80x9.c
index 69563075620..c5753caf8f3 100644
--- a/sys/dev/ed/if_ed_rtl80x9.c
+++ b/sys/dev/ed/if_ed_rtl80x9.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_mib.h>
diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c
index 3886c9e4137..d164dc49f94 100644
--- a/sys/dev/en/if_en_pci.c
+++ b/sys/dev/en/if_en_pci.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_atm.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index ee12b201b97..18813e7af90 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -138,6 +138,7 @@ enum {
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index 183c5f48422..863c545fae7 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/ep/if_ep_mca.c b/sys/dev/ep/if_ep_mca.c
index 17097ab7cc8..3a044bfca3c 100644
--- a/sys/dev/ep/if_ep_mca.c
+++ b/sys/dev/ep/if_ep_mca.c
@@ -28,9 +28,12 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/bus.h>
 
 #include <machine/bus.h>
@@ -38,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <dev/mca/mca_busreg.h>
diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c
index 3d73c9c5c14..abca42781d8 100644
--- a/sys/dev/et/if_et.c
+++ b/sys/dev/et/if_et.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/bpf.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
index 41139a35f4c..ad8ca5b5337 100644
--- a/sys/dev/etherswitch/arswitch/arswitch.c
+++ b/sys/dev/etherswitch/arswitch/arswitch.c
@@ -31,6 +31,7 @@
 #include <sys/bus.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
@@ -38,6 +39,7 @@
 #include <sys/systm.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -64,6 +66,7 @@
 #include <dev/etherswitch/arswitch/arswitch_8216.h>
 #include <dev/etherswitch/arswitch/arswitch_8226.h>
 #include <dev/etherswitch/arswitch/arswitch_8316.h>
+#include <dev/etherswitch/arswitch/arswitch_9340.h>
 
 #include "mdio_if.h"
 #include "miibus_if.h"
@@ -93,23 +96,34 @@ arswitch_probe(device_t dev)
 	if (ar7240_probe(dev) == 0) {
 		chipname = "AR7240";
 		sc->sc_switchtype = AR8X16_SWITCH_AR7240;
+		sc->is_internal_switch = 1;
+		id = 0;
+		goto done;
+	}
+
+	/* AR9340 probe */
+	if (ar9340_probe(dev) == 0) {
+		chipname = "AR9340";
+		sc->sc_switchtype = AR8X16_SWITCH_AR9340;
+		sc->is_internal_switch = 1;
 		id = 0;
 		goto done;
 	}
 
 	/* AR8xxx probe */
 	id = arswitch_readreg(dev, AR8X16_REG_MASK_CTRL);
-	switch ((id & AR8X16_MASK_CTRL_VER_MASK) >>
-	    AR8X16_MASK_CTRL_VER_SHIFT) {
-	case 1:
+	switch (id & (AR8X16_MASK_CTRL_VER_MASK | AR8X16_MASK_CTRL_REV_MASK)) {
+	case 0x0101:
 		chipname = "AR8216";
 		sc->sc_switchtype = AR8X16_SWITCH_AR8216;
 		break;
-	case 2:
+	case 0x0201:
 		chipname = "AR8226";
 		sc->sc_switchtype = AR8X16_SWITCH_AR8226;
 		break;
-	case 16:
+	/* 0x0301 - AR8236 */
+	case 0x1000:
+	case 0x1001:
 		chipname = "AR8316";
 		sc->sc_switchtype = AR8X16_SWITCH_AR8316;
 		break;
@@ -118,8 +132,8 @@ arswitch_probe(device_t dev)
 	}
 
 done:
-	DPRINTF(dev, "chipname=%s, rev=%02x\n", chipname,
-	    id & AR8X16_MASK_CTRL_REV_MASK);
+
+	DPRINTF(dev, "chipname=%s, id=%08x\n", chipname, id);
 	if (chipname != NULL) {
 		snprintf(desc, sizeof(desc),
 		    "Atheros %s Ethernet Switch",
@@ -250,6 +264,8 @@ arswitch_attach(device_t dev)
 	 */
 	if (AR8X16_IS_SWITCH(sc, AR7240))
 		ar7240_attach(sc);
+	else if (AR8X16_IS_SWITCH(sc, AR9340))
+		ar9340_attach(sc);
 	else if (AR8X16_IS_SWITCH(sc, AR8216))
 		ar8216_attach(sc);
 	else if (AR8X16_IS_SWITCH(sc, AR8226))
@@ -267,6 +283,7 @@ arswitch_attach(device_t dev)
 	sc->phy4cpu = 1;
 	sc->is_rgmii = 1;
 	sc->is_gmii = 0;
+	sc->is_mii = 0;
 
 	(void) resource_int_value(device_get_name(dev), device_get_unit(dev),
 	    "numphys", &sc->numphys);
@@ -276,6 +293,8 @@ arswitch_attach(device_t dev)
 	    "is_rgmii", &sc->is_rgmii);
 	(void) resource_int_value(device_get_name(dev), device_get_unit(dev),
 	    "is_gmii", &sc->is_gmii);
+	(void) resource_int_value(device_get_name(dev), device_get_unit(dev),
+	    "is_mii", &sc->is_mii);
 
 	if (sc->numphys > AR8X16_NUM_PHYS)
 		sc->numphys = AR8X16_NUM_PHYS;
@@ -284,6 +303,10 @@ arswitch_attach(device_t dev)
 	if (arswitch_reset(dev))
 		return (ENXIO);
 
+	err = sc->hal.arswitch_hw_setup(sc);
+	if (err != 0)
+		return (err);
+
 	err = sc->hal.arswitch_hw_global_setup(sc);
 	if (err != 0)
 		return (err);
@@ -303,10 +326,6 @@ arswitch_attach(device_t dev)
 	if (err != 0)
 		return (err);
 
-	err = sc->hal.arswitch_hw_setup(sc);
-	if (err != 0)
-		return (err);
-
 	bus_generic_probe(dev);
 	bus_enumerate_hinted_children(dev);
 	err = bus_generic_attach(dev);
@@ -435,7 +454,7 @@ arswitch_miipollstat(struct arswitch_softc *sc)
 		    AR8X16_REG_PORT_STS(arswitch_portforphy(i)));
 #if 0
 		DPRINTF(sc->sc_dev, "p[%d]=%b\n",
-		    arge_portforphy(i),
+		    i,
 		    portstatus,
 		    "\20\3TXMAC\4RXMAC\5TXFLOW\6RXFLOW\7"
 		    "DUPLEX\11LINK_UP\12LINK_AUTO\13LINK_PAUSE");
diff --git a/sys/dev/etherswitch/arswitch/arswitch_9340.c b/sys/dev/etherswitch/arswitch/arswitch_9340.c
new file mode 100644
index 00000000000..4de76e2d9ec
--- /dev/null
+++ b/sys/dev/etherswitch/arswitch/arswitch_9340.c
@@ -0,0 +1,203 @@
+/*-
+ * Copyright (c) 2011-2012 Stefan Bethke.
+ * Copyright (c) 2013 Adrian Chadd <adrian@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/bus.h>
+#include <sys/errno.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
+
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.h>
+
+#include <machine/bus.h>
+#include <dev/iicbus/iic.h>
+#include <dev/iicbus/iiconf.h>
+#include <dev/iicbus/iicbus.h>
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include <dev/etherswitch/mdio.h>
+
+#include <dev/etherswitch/etherswitch.h>
+
+#include <dev/etherswitch/arswitch/arswitchreg.h>
+#include <dev/etherswitch/arswitch/arswitchvar.h>
+#include <dev/etherswitch/arswitch/arswitch_reg.h>
+#include <dev/etherswitch/arswitch/arswitch_phy.h>	/* XXX for probe */
+#include <dev/etherswitch/arswitch/arswitch_9340.h>
+
+#include "mdio_if.h"
+#include "miibus_if.h"
+#include "etherswitch_if.h"
+
+/*
+ * AR9340 specific functions
+ */
+static int
+ar9340_hw_setup(struct arswitch_softc *sc)
+{
+
+	return (0);
+}
+
+/*
+ * Initialise other global values for the AR9340.
+ */
+static int
+ar9340_hw_global_setup(struct arswitch_softc *sc)
+{
+
+	/* Enable CPU port; disable mirror port */
+	arswitch_writereg(sc->sc_dev, AR8X16_REG_CPU_PORT,
+	    AR8X16_CPU_PORT_EN | AR8X16_CPU_MIRROR_DIS);
+
+	/* Setup TAG priority mapping */
+	arswitch_writereg(sc->sc_dev, AR8X16_REG_TAG_PRIO, 0xfa50);
+
+	/* Enable aging, MAC replacing */
+	arswitch_writereg(sc->sc_dev, AR934X_REG_AT_CTRL,
+	    0x2b /* 5 min age time */ |
+	    AR934X_AT_CTRL_AGE_EN |
+	    AR934X_AT_CTRL_LEARN_CHANGE);
+
+	/* Enable ARP frame acknowledge */
+	arswitch_modifyreg(sc->sc_dev, AR934X_REG_QM_CTRL,
+	    AR934X_QM_CTRL_ARP_EN, AR934X_QM_CTRL_ARP_EN);
+
+	/* Enable Broadcast frames transmitted to the CPU */
+	arswitch_modifyreg(sc->sc_dev, AR934X_REG_FLOOD_MASK,
+	    AR934X_FLOOD_MASK_BC_DP(0),
+	    AR934X_FLOOD_MASK_BC_DP(0));
+	arswitch_modifyreg(sc->sc_dev, AR934X_REG_FLOOD_MASK,
+	    AR934X_FLOOD_MASK_MC_DP(0),
+	    AR934X_FLOOD_MASK_MC_DP(0));
+
+	/* Enable MIB counters */
+	arswitch_modifyreg(sc->sc_dev, AR8X16_REG_MIB_FUNC0,
+	    AR934X_MIB_ENABLE, AR934X_MIB_ENABLE);
+
+	/* Setup MTU */
+	arswitch_modifyreg(sc->sc_dev, AR8X16_REG_GLOBAL_CTRL,
+	    AR7240_GLOBAL_CTRL_MTU_MASK,
+	    SM(1536, AR7240_GLOBAL_CTRL_MTU_MASK));
+
+	/* Service Tag */
+	arswitch_modifyreg(sc->sc_dev, AR8X16_REG_SERVICE_TAG,
+	    AR8X16_SERVICE_TAG_MASK, 0);
+
+	/* Settle time */
+	DELAY(1000);
+
+	/*
+	 * Check PHY mode bits.
+	 *
+	 * This dictates whether the connected port is to be wired
+	 * up via GMII or MII.  I'm not sure why - this is an internal
+	 * wiring issue.
+	 */
+	if (sc->is_gmii) {
+		device_printf(sc->sc_dev, "%s: GMII\n", __func__);
+		arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE0,
+		    AR934X_OPER_MODE0_MAC_GMII_EN,
+		    AR934X_OPER_MODE0_MAC_GMII_EN);
+	} else if (sc->is_mii) {
+		device_printf(sc->sc_dev, "%s: MII\n", __func__);
+		arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE0,
+		    AR934X_OPER_MODE0_PHY_MII_EN,
+		    AR934X_OPER_MODE0_PHY_MII_EN);
+	} else {
+		device_printf(sc->sc_dev, "%s: need is_gmii or is_mii set\n",
+		    __func__);
+		return (ENXIO);
+	}
+
+	/*
+	 * Whether to connect PHY 4 via MII (ie a switch port) or
+	 * treat it as a CPU port.
+	 */
+	if (sc->phy4cpu) {
+		device_printf(sc->sc_dev, "%s: PHY4 - CPU\n", __func__);
+		arswitch_modifyreg(sc->sc_dev, AR934X_REG_OPER_MODE1,
+		    AR934X_REG_OPER_MODE1_PHY4_MII_EN,
+		    AR934X_REG_OPER_MODE1_PHY4_MII_EN);
+		sc->info.es_nports = 4;
+	} else {
+		device_printf(sc->sc_dev, "%s: PHY4 - Local\n", __func__);
+		sc->info.es_nports = 5;
+	}
+
+	/* Settle time */
+	DELAY(1000);
+
+	return (0);
+}
+
+/*
+ * The AR9340 switch probes (almost) the same as the AR7240 on-chip switch.
+ *
+ * However, the support is slightly different.
+ *
+ * So instead of checking the PHY revision or mask register contents,
+ * we simply fall back to a hint check.
+ */
+int
+ar9340_probe(device_t dev)
+{
+	int is_9340 = 0;
+
+	if (resource_int_value(device_get_name(dev), device_get_unit(dev),
+	    "is_9340", &is_9340) != 0)
+		return (ENXIO);
+
+	if (is_9340 == 0)
+		return (ENXIO);
+
+	return (0);
+}
+
+void
+ar9340_attach(struct arswitch_softc *sc)
+{
+
+	sc->hal.arswitch_hw_setup = ar9340_hw_setup;
+	sc->hal.arswitch_hw_global_setup = ar9340_hw_global_setup;
+
+	/* Set the switch vlan capabilities. */
+	sc->info.es_vlan_caps = ETHERSWITCH_VLAN_DOT1Q |
+	    ETHERSWITCH_VLAN_PORT | ETHERSWITCH_VLAN_DOUBLE_TAG;
+	sc->info.es_nvlangroups = AR8X16_MAX_VLANS;
+}
diff --git a/sys/dev/etherswitch/arswitch/arswitch_9340.h b/sys/dev/etherswitch/arswitch/arswitch_9340.h
new file mode 100644
index 00000000000..cd7e8e3384e
--- /dev/null
+++ b/sys/dev/etherswitch/arswitch/arswitch_9340.h
@@ -0,0 +1,35 @@
+/*-
+ * Copyright (c) 2011-2012 Stefan Bethke.
+ * Copyright (c) 2031 Adrian Chadd <adrian@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	__ARSWITCH_9340_H__
+#define	__ARSWITCH_9340_H__
+
+extern	int ar9340_probe(device_t dev);
+extern	void ar9340_attach(struct arswitch_softc *sc);
+
+#endif	/* __ARSWITCH_9340_H__ */
diff --git a/sys/dev/etherswitch/arswitch/arswitch_phy.c b/sys/dev/etherswitch/arswitch/arswitch_phy.c
index 8e190e2d92b..62eeb1d93ef 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_phy.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_phy.c
@@ -31,18 +31,16 @@
 #include <sys/bus.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
-#include <net/if_types.h>
 
 #include <machine/bus.h>
 #include <dev/iicbus/iic.h>
diff --git a/sys/dev/etherswitch/arswitch/arswitch_vlans.c b/sys/dev/etherswitch/arswitch/arswitch_vlans.c
index 2307f710244..f981614077a 100644
--- a/sys/dev/etherswitch/arswitch/arswitch_vlans.c
+++ b/sys/dev/etherswitch/arswitch/arswitch_vlans.c
@@ -31,12 +31,13 @@
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/errno.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
+#include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 
 #include <net/if.h>
-
 #include <dev/mii/mii.h>
 
 #include <dev/etherswitch/etherswitch.h>
@@ -49,6 +50,12 @@
 #include "miibus_if.h"
 #include "etherswitch_if.h"
 
+/*
+ * XXX TODO: teach about the AR933x SoC switch
+ * XXX TODO: teach about the AR934x SoC switch
+ * XXX TODO: teach about the AR8327 external switch
+ */
+
 static int
 arswitch_vlan_op(struct arswitch_softc *sc, uint32_t op, uint32_t vid,
 	uint32_t data)
diff --git a/sys/dev/etherswitch/arswitch/arswitchreg.h b/sys/dev/etherswitch/arswitch/arswitchreg.h
index 38be689e9d1..f221014f0da 100644
--- a/sys/dev/etherswitch/arswitch/arswitchreg.h
+++ b/sys/dev/etherswitch/arswitch/arswitchreg.h
@@ -46,7 +46,7 @@
 #define		AR8X16_MASK_CTRL_REV_MASK	0x000000ff
 #define		AR8X16_MASK_CTRL_VER_MASK	0x0000ff00
 #define		AR8X16_MASK_CTRL_VER_SHIFT	8
-#define		AR8X16_MASK_CTRL_SOFT_RESET	(1 << 31)
+#define		AR8X16_MASK_CTRL_SOFT_RESET	(1U << 31)
 
 #define	AR8X16_REG_MODE			0x0008
 /* DIR-615 E4 U-Boot */
@@ -111,7 +111,7 @@
 #define		AR8X16_VLAN_VID_SHIFT		16
 #define		AR8X16_VLAN_PRIO		0x70000000
 #define		AR8X16_VLAN_PRIO_SHIFT		28
-#define		AR8X16_VLAN_PRIO_EN		(1 << 31)
+#define		AR8X16_VLAN_PRIO_EN		(1U << 31)
 
 #define	AR8X16_REG_VLAN_DATA		0x0044
 #define		AR8X16_VLAN_MEMBER		0x0000003f
@@ -151,6 +151,8 @@
 #define		AR8X16_MIB_FUNC_CAPTURE		0x3
 #define		AR8X16_MIB_FUNC_XXX		(1 << 30) /* 0x40000000 */
 
+#define		AR934X_MIB_ENABLE		(1 << 30)
+
 #define	AR8X16_REG_MDIO_HIGH_ADDR	0x0094
 
 #define	AR8X16_REG_MDIO_CTRL		0x0098
@@ -160,7 +162,7 @@
 #define		AR8X16_MDIO_CTRL_CMD_WRITE	0
 #define		AR8X16_MDIO_CTRL_CMD_READ	(1 << 27)
 #define		AR8X16_MDIO_CTRL_MASTER_EN	(1 << 30)
-#define		AR8X16_MDIO_CTRL_BUSY		(1 << 31)
+#define		AR8X16_MDIO_CTRL_BUSY		(1U << 31)
 
 #define	AR8X16_REG_PORT_BASE(_p)	(0x0100 + (_p) * 0x0100)
 
@@ -287,5 +289,218 @@
 
 #define	AR8X16_MAX_VLANS		16
 
-#endif /* __AR8X16_SWITCHREG_H__ */
+/*
+ * AR9340 switch specific definitions.
+ */
 
+/* XXX Linux define compatibility stuff */
+#define	BITM(_count)			((1 << _count) - 1)
+#define	BITS(_shift, _count)		(BITM(_count) << _shift)
+
+#define	AR934X_REG_OPER_MODE0		0x04
+#define		AR934X_OPER_MODE0_MAC_GMII_EN	(1 << 6)
+#define		AR934X_OPER_MODE0_PHY_MII_EN	(1 << 10)
+
+#define	AR934X_REG_OPER_MODE1		0x08
+#define		AR934X_REG_OPER_MODE1_PHY4_MII_EN	(1 << 28)
+
+#define	AR934X_REG_FLOOD_MASK		0x2c
+#define		AR934X_FLOOD_MASK_MC_DP(_p)	(1 << (16 + (_p)))
+#define		AR934X_FLOOD_MASK_BC_DP(_p)	(1 << (25 + (_p)))
+
+#define	AR934X_REG_QM_CTRL		0x3c
+#define		AR934X_QM_CTRL_ARP_EN	(1 << 15)
+
+#define	AR934X_REG_AT_CTRL		0x5c
+#define		AR934X_AT_CTRL_AGE_TIME		BITS(0, 15)
+#define		AR934X_AT_CTRL_AGE_EN		(1 << 17)
+#define		AR934X_AT_CTRL_LEARN_CHANGE	(1 << 18)
+
+#define	AR934X_REG_PORT_BASE(_port)	(0x100 + (_port) * 0x100)
+
+#define	AR934X_REG_PORT_VLAN1(_port)	(AR934X_REG_PORT_BASE((_port)) + 0x08)
+#define		AR934X_PORT_VLAN1_DEFAULT_SVID_S		0
+#define		AR934X_PORT_VLAN1_FORCE_DEFAULT_VID_EN		(1 << 12)
+#define		AR934X_PORT_VLAN1_PORT_TLS_MODE			(1 << 13)
+#define		AR934X_PORT_VLAN1_PORT_VLAN_PROP_EN		(1 << 14)
+#define		AR934X_PORT_VLAN1_PORT_CLONE_EN			(1 << 15)
+#define		AR934X_PORT_VLAN1_DEFAULT_CVID_S		16
+#define		AR934X_PORT_VLAN1_FORCE_PORT_VLAN_EN		(1 << 28)
+#define		AR934X_PORT_VLAN1_ING_PORT_PRI_S		29
+
+#define	AR934X_REG_PORT_VLAN2(_port)	(AR934X_REG_PORT_BASE((_port)) + 0x0c)
+#define		AR934X_PORT_VLAN2_PORT_VID_MEM_S		16
+#define		AR934X_PORT_VLAN2_8021Q_MODE_S			30
+#define		AR934X_PORT_VLAN2_8021Q_MODE_PORT_ONLY		0
+#define		AR934X_PORT_VLAN2_8021Q_MODE_PORT_FALLBACK	1
+#define		AR934X_PORT_VLAN2_8021Q_MODE_VLAN_ONLY		2
+#define		AR934X_PORT_VLAN2_8021Q_MODE_SECURE		3
+
+/*
+ * AR8327 specific registers
+ */
+#define	AR8327_NUM_PORTS		7
+#define	AR8327_NUM_PHYS			5
+#define	AR8327_PORTS_ALL		0x7f
+
+#define	AR8327_REG_MASK			0x000
+
+#define	AR8327_REG_PAD0_MODE		0x004
+#define	AR8327_REG_PAD5_MODE		0x008
+#define	AR8327_REG_PAD6_MODE		0x00c
+
+#define		AR8327_PAD_MAC_MII_RXCLK_SEL	(1 << 0)
+#define		AR8327_PAD_MAC_MII_TXCLK_SEL	(1 << 1)
+#define		AR8327_PAD_MAC_MII_EN		(1 << 2)
+#define		AR8327_PAD_MAC_GMII_RXCLK_SEL	(1 << 4)
+#define		AR8327_PAD_MAC_GMII_TXCLK_SEL	(1 << 5)
+#define		AR8327_PAD_MAC_GMII_EN		(1 << 6)
+#define		AR8327_PAD_SGMII_EN		(1 << 7)
+#define		AR8327_PAD_PHY_MII_RXCLK_SEL	(1 << 8)
+#define		AR8327_PAD_PHY_MII_TXCLK_SEL	(1 << 9)
+#define		AR8327_PAD_PHY_MII_EN		(1 << 10)
+#define		AR8327_PAD_PHY_GMII_PIPE_RXCLK_SEL	(1 << 11)
+#define		AR8327_PAD_PHY_GMII_RXCLK_SEL	(1 << 12)
+#define		AR8327_PAD_PHY_GMII_TXCLK_SEL	(1 << 13)
+#define		AR8327_PAD_PHY_GMII_EN		(1 << 14)
+#define		AR8327_PAD_PHYX_GMII_EN		(1 << 16)
+#define		AR8327_PAD_PHYX_RGMII_EN	(1 << 17)
+#define		AR8327_PAD_PHYX_MII_EN		(1 << 18)
+#define		AR8327_PAD_SGMII_DELAY_EN	(1 << 19)
+#define		AR8327_PAD_RGMII_RXCLK_DELAY_SEL	BITS(20, 2)
+#define		AR8327_PAD_RGMII_RXCLK_DELAY_SEL_S		20
+#define		AR8327_PAD_RGMII_TXCLK_DELAY_SEL	BITS(22, 2)
+#define		AR8327_PAD_RGMII_TXCLK_DELAY_SEL_S	22
+#define		AR8327_PAD_RGMII_RXCLK_DELAY_EN	(1 << 24)
+#define		AR8327_PAD_RGMII_TXCLK_DELAY_EN	(1 << 25)
+#define		AR8327_PAD_RGMII_EN		(1 << 26)
+
+#define	AR8327_REG_POWER_ON_STRIP	0x010
+#define		AR8327_POWER_ON_STRIP_POWER_ON_SEL	(1U << 31)
+#define		AR8327_POWER_ON_STRIP_LED_OPEN_EN	(1 << 24)
+#define		AR8327_POWER_ON_STRIP_SERDES_AEN	(1 << 7)
+
+#define	AR8327_REG_INT_STATUS0		0x020
+#define		AR8327_INT0_VT_DONE			(1 << 20)
+
+#define	AR8327_REG_INT_STATUS1		0x024
+#define	AR8327_REG_INT_MASK0		0x028
+#define	AR8327_REG_INT_MASK1		0x02c
+
+#define	AR8327_REG_MODULE_EN		0x030
+#define		AR8327_MODULE_EN_MIB		(1 << 0)
+
+#define	AR8327_REG_MIB_FUNC		0x034
+#define		AR8327_MIB_CPU_KEEP		(1 << 20)
+
+#define	AR8327_REG_SERVICE_TAG		0x048
+#define	AR8327_REG_LED_CTRL0		0x050
+#define	AR8327_REG_LED_CTRL1		0x054
+#define	AR8327_REG_LED_CTRL2		0x058
+#define	AR8327_REG_LED_CTRL3		0x05c
+#define	AR8327_REG_MAC_ADDR0		0x060
+#define	AR8327_REG_MAC_ADDR1		0x064
+
+#define	AR8327_REG_MAX_FRAME_SIZE	0x078
+#define		AR8327_MAX_FRAME_SIZE_MTU	BITS(0, 14)
+
+#define	AR8327_REG_PORT_STATUS(_i)	(0x07c + (_i) * 4)
+
+#define	AR8327_REG_HEADER_CTRL		0x098
+#define	AR8327_REG_PORT_HEADER(_i)		(0x09c + (_i) * 4)
+
+#define	AR8327_REG_SGMII_CTRL		0x0e0
+#define		AR8327_SGMII_CTRL_EN_PLL		(1 << 1)
+#define		AR8327_SGMII_CTRL_EN_RX			(1 << 2)
+#define		AR8327_SGMII_CTRL_EN_TX			(1 << 3)
+
+#define	AR8327_REG_PORT_VLAN0(_i)		(0x420 + (_i) * 0x8)
+#define		AR8327_PORT_VLAN0_DEF_SVID		BITS(0, 12)
+#define		AR8327_PORT_VLAN0_DEF_SVID_S		0
+#define		AR8327_PORT_VLAN0_DEF_CVID		BITS(16, 12)
+#define		AR8327_PORT_VLAN0_DEF_CVID_S		16
+
+#define	AR8327_REG_PORT_VLAN1(_i)		(0x424 + (_i) * 0x8)
+#define		AR8327_PORT_VLAN1_PORT_VLAN_PROP	(1 << 6)
+#define		AR8327_PORT_VLAN1_OUT_MODE		BITS(12, 2)
+#define		AR8327_PORT_VLAN1_OUT_MODE_S		12
+#define		AR8327_PORT_VLAN1_OUT_MODE_UNMOD	0
+#define		AR8327_PORT_VLAN1_OUT_MODE_UNTAG	1
+#define		AR8327_PORT_VLAN1_OUT_MODE_TAG		2
+#define		AR8327_PORT_VLAN1_OUT_MODE_UNTOUCH	3
+
+#define	AR8327_REG_ATU_DATA0		0x600
+#define	AR8327_REG_ATU_DATA1		0x604
+#define	AR8327_REG_ATU_DATA2		0x608
+
+#define	AR8327_REG_ATU_FUNC		0x60c
+#define		AR8327_ATU_FUNC_OP		BITS(0, 4)
+#define		AR8327_ATU_FUNC_OP_NOOP			0x0
+#define		AR8327_ATU_FUNC_OP_FLUSH		0x1
+#define		AR8327_ATU_FUNC_OP_LOAD			0x2
+#define		AR8327_ATU_FUNC_OP_PURGE		0x3
+#define		AR8327_ATU_FUNC_OP_FLUSH_LOCKED		0x4
+#define		AR8327_ATU_FUNC_OP_FLUSH_UNICAST	0x5
+#define		AR8327_ATU_FUNC_OP_GET_NEXT		0x6
+#define		AR8327_ATU_FUNC_OP_SEARCH_MAC		0x7
+#define		AR8327_ATU_FUNC_OP_CHANGE_TRUNK		0x8
+#define		AR8327_ATU_FUNC_BUSY			(1U << 31)
+
+#define	AR8327_REG_VTU_FUNC0		0x0610
+#define		AR8327_VTU_FUNC0_EG_MODE	BITS(4, 14)
+#define		AR8327_VTU_FUNC0_EG_MODE_S(_i)	(4 + (_i) * 2)
+#define		AR8327_VTU_FUNC0_EG_MODE_KEEP	0
+#define		AR8327_VTU_FUNC0_EG_MODE_UNTAG	1
+#define		AR8327_VTU_FUNC0_EG_MODE_TAG	2
+#define		AR8327_VTU_FUNC0_EG_MODE_NOT	3
+#define		AR8327_VTU_FUNC0_IVL		(1 << 19)
+#define		AR8327_VTU_FUNC0_VALID		(1 << 20)
+
+#define	AR8327_REG_VTU_FUNC1		0x0614
+#define		AR8327_VTU_FUNC1_OP		BITS(0, 3)
+#define		AR8327_VTU_FUNC1_OP_NOOP	0
+#define		AR8327_VTU_FUNC1_OP_FLUSH	1
+#define		AR8327_VTU_FUNC1_OP_LOAD	2
+#define		AR8327_VTU_FUNC1_OP_PURGE	3
+#define		AR8327_VTU_FUNC1_OP_REMOVE_PORT	4
+#define		AR8327_VTU_FUNC1_OP_GET_NEXT	5
+#define		AR8327_VTU_FUNC1_OP_GET_ONE	6
+#define		AR8327_VTU_FUNC1_FULL		(1 << 4)
+#define		AR8327_VTU_FUNC1_PORT		(1 << 8, 4)
+#define		AR8327_VTU_FUNC1_PORT_S		8
+#define		AR8327_VTU_FUNC1_VID		(1 << 16, 12)
+#define		AR8327_VTU_FUNC1_VID_S		16
+#define		AR8327_VTU_FUNC1_BUSY		(1U << 31)
+
+#define	AR8327_REG_FWD_CTRL0		0x620
+#define		AR8327_FWD_CTRL0_CPU_PORT_EN	(1 << 10)
+#define		AR8327_FWD_CTRL0_MIRROR_PORT	BITS(4, 4)
+#define		AR8327_FWD_CTRL0_MIRROR_PORT_S	4
+
+#define	AR8327_REG_FWD_CTRL1		0x624
+#define		AR8327_FWD_CTRL1_UC_FLOOD	BITS(0, 7)
+#define		AR8327_FWD_CTRL1_UC_FLOOD_S	0
+#define		AR8327_FWD_CTRL1_MC_FLOOD	BITS(8, 7)
+#define		AR8327_FWD_CTRL1_MC_FLOOD_S	8
+#define		AR8327_FWD_CTRL1_BC_FLOOD	BITS(16, 7)
+#define		AR8327_FWD_CTRL1_BC_FLOOD_S	16
+#define		AR8327_FWD_CTRL1_IGMP		BITS(24, 7)
+#define		AR8327_FWD_CTRL1_IGMP_S		24
+
+#define	AR8327_REG_PORT_LOOKUP(_i)	(0x660 + (_i) * 0xc)
+#define		AR8327_PORT_LOOKUP_MEMBER	BITS(0, 7)
+#define		AR8327_PORT_LOOKUP_IN_MODE	BITS(8, 2)
+#define		AR8327_PORT_LOOKUP_IN_MODE_S	8
+#define		AR8327_PORT_LOOKUP_STATE	BITS(16, 3)
+#define		AR8327_PORT_LOOKUP_STATE_S	16
+#define		AR8327_PORT_LOOKUP_LEARN	(1 << 20)
+#define		AR8327_PORT_LOOKUP_ING_MIRROR_EN	(1 << 25)
+
+#define	AR8327_REG_PORT_PRIO(_i)	(0x664 + (_i) * 0xc)
+
+#define	AR8327_REG_PORT_HOL_CTRL1(_i)		(0x974 + (_i) * 0x8)
+#define		AR8327_PORT_HOL_CTRL1_EG_MIRROR_EN	(1 << 16)
+
+#define	AR8327_REG_PORT_STATS_BASE(_i)		(0x1000 + (_i) * 0x100)
+
+#endif /* __AR8X16_SWITCHREG_H__ */
diff --git a/sys/dev/etherswitch/arswitch/arswitchvar.h b/sys/dev/etherswitch/arswitch/arswitchvar.h
index 2db13ccdbcc..91d755aa492 100644
--- a/sys/dev/etherswitch/arswitch/arswitchvar.h
+++ b/sys/dev/etherswitch/arswitch/arswitchvar.h
@@ -34,6 +34,7 @@ typedef enum {
 	AR8X16_SWITCH_AR8216,
 	AR8X16_SWITCH_AR8226,
 	AR8X16_SWITCH_AR8316,
+	AR8X16_SWITCH_AR9340,
 } ar8x16_switch_type;
 
 /*
@@ -49,7 +50,9 @@ struct arswitch_softc {
 	int		numphys;	/* PHYs we manage */
 	int		is_rgmii;	/* PHY mode is RGMII (XXX which PHY?) */
 	int		is_gmii;	/* PHY mode is GMII (XXX which PHY?) */
+	int		is_mii;		/* PHY mode is MII (XXX which PHY?) */
 	int		page;
+	int		is_internal_switch;
 	ar8x16_switch_type	sc_switchtype;
 	char		*ifname[AR8X16_NUM_PHYS];
 	device_t	miibus[AR8X16_NUM_PHYS];
diff --git a/sys/dev/etherswitch/miiproxy.c b/sys/dev/etherswitch/miiproxy.c
index fe1685db1ed..f05b1215e9e 100644
--- a/sys/dev/etherswitch/miiproxy.c
+++ b/sys/dev/etherswitch/miiproxy.c
@@ -29,17 +29,14 @@
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
-#include <net/if_types.h>
 
 #include <dev/etherswitch/miiproxy.h>
 #include <dev/mii/mii.h>
diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
index 1bc88a64694..eedd3474b35 100644
--- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
+++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
@@ -30,16 +30,18 @@
 #include <sys/bus.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 
diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c
index 8e8b03a8de1..fa65455bda9 100644
--- a/sys/dev/etherswitch/ukswitch/ukswitch.c
+++ b/sys/dev/etherswitch/ukswitch/ukswitch.c
@@ -32,16 +32,18 @@
 #include <sys/bus.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 
diff --git a/sys/dev/ex/if_ex.c b/sys/dev/ex/if_ex.c
index a91a3cc2dcd..e85ee5f580c 100644
--- a/sys/dev/ex/if_ex.c
+++ b/sys/dev/ex/if_ex.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h> 
diff --git a/sys/dev/fatm/if_fatm.c b/sys/dev/fatm/if_fatm.c
index abd8e79750d..b6b4e13db2a 100644
--- a/sys/dev/fatm/if_fatm.c
+++ b/sys/dev/fatm/if_fatm.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/if_atm.h>
diff --git a/sys/dev/fb/fb_if.m b/sys/dev/fb/fb_if.m
new file mode 100644
index 00000000000..f7cb52ce967
--- /dev/null
+++ b/sys/dev/fb/fb_if.m
@@ -0,0 +1,13 @@
+#include <sys/bus.h>
+#include <sys/fbio.h>
+
+INTERFACE fb;
+
+METHOD int pin_max {
+	device_t dev;
+	int *npins;
+};
+
+METHOD struct fb_info * getinfo {
+	device_t dev;
+};
diff --git a/sys/dev/fb/fbd.c b/sys/dev/fb/fbd.c
new file mode 100644
index 00000000000..4fbf5eeb7fa
--- /dev/null
+++ b/sys/dev/fb/fbd.c
@@ -0,0 +1,467 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Aleksandr 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$
+ */
+
+/* Generic framebuffer */
+/* TODO unlink from VT(9) */
+/* TODO done normal /dev/fb methods */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/queue.h>
+#include <sys/fbio.h>
+
+#include <machine/bus.h>
+
+#include <dev/vt/vt.h>
+#include <dev/vt/hw/fb/vt_fb.h>
+
+#include "fb_if.h"
+
+LIST_HEAD(fb_list_head_t, fb_list_entry) fb_list_head =
+    LIST_HEAD_INITIALIZER(fb_list_head);
+struct fb_list_entry {
+	struct fb_info	*fb_info;
+	struct cdev	*fb_si;
+	LIST_ENTRY(fb_list_entry) fb_list;
+};
+
+struct fbd_softc {
+	device_t	sc_dev;
+	struct fb_info	*sc_info;
+};
+
+static void fbd_evh_init(void *);
+/* SI_ORDER_SECOND, just after EVENTHANDLERs initialized. */
+SYSINIT(fbd_evh_init, SI_SUB_CONFIGURE, SI_ORDER_SECOND, fbd_evh_init, NULL);
+
+static d_open_t		fb_open;
+static d_close_t	fb_close;
+static d_read_t		fb_read;
+static d_write_t	fb_write;
+static d_ioctl_t	fb_ioctl;
+static d_mmap_t		fb_mmap;
+
+static struct cdevsw fb_cdevsw = {
+	.d_version =	D_VERSION,
+	.d_flags =	D_NEEDGIANT,
+	.d_open =	fb_open,
+	.d_close =	fb_close,
+	.d_read =	fb_read,
+	.d_write =	fb_write,
+	.d_ioctl =	fb_ioctl,
+	.d_mmap =	fb_mmap,
+	.d_name =	"fb",
+};
+
+static int framebuffer_dev_unit = 0;
+
+static int
+fb_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
+{
+
+	return (0);
+}
+
+static int
+fb_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
+{
+
+	return (0);
+}
+
+static int
+fb_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
+    struct thread *td)
+{
+	struct fb_info *info;
+	int error;
+
+	error = 0;
+	info = dev->si_drv1;
+
+	switch (cmd) {
+	case FBIOGTYPE:
+		bcopy(info, (struct fbtype *)data, sizeof(struct fbtype));
+		break;
+
+	case FBIO_GETWINORG:	/* get frame buffer window origin */
+		*(u_int *)data = 0;
+		break;
+
+	case FBIO_GETDISPSTART:	/* get display start address */
+		((video_display_start_t *)data)->x = 0;
+		((video_display_start_t *)data)->y = 0;
+		break;
+
+	case FBIO_GETLINEWIDTH:	/* get scan line width in bytes */
+		*(u_int *)data = info->fb_stride;
+		break;
+
+	case FBIO_BLANK:	/* blank display */
+		error = 0;	/* TODO */
+		break;
+
+	default:
+		error = ENOIOCTL;
+		break;
+	}
+	return (error);
+}
+
+static int
+fb_read(struct cdev *dev, struct uio *uio, int ioflag)
+{
+
+	return (0); /* XXX nothing to read, yet */
+}
+
+static int
+fb_write(struct cdev *dev, struct uio *uio, int ioflag)
+{
+
+	return (0); /* XXX nothing written */
+}
+
+static int
+fb_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot,
+    vm_memattr_t *memattr)
+{
+	struct fb_info *info;
+
+	info = dev->si_drv1;
+	if (offset < info->fb_size) {
+		*paddr = info->fb_pbase + offset;
+		return (0);
+	}
+	return (EINVAL);
+}
+
+
+static void
+vt_fb_mem_wr1(struct fb_info *sc, uint32_t o, uint8_t v)
+{
+
+	KASSERT((o < sc->fb_size), ("Offset %#08x out of fb size", o));
+	*(uint8_t *)(sc->fb_vbase + o) = v;
+}
+
+static void
+vt_fb_mem_wr2(struct fb_info *sc, uint32_t o, uint16_t v)
+{
+
+	KASSERT((o < sc->fb_size), ("Offset %#08x out of fb size", o));
+	*(uint16_t *)(sc->fb_vbase + o) = v;
+}
+
+static void
+vt_fb_mem_wr4(struct fb_info *sc, uint32_t o, uint32_t v)
+{
+
+	KASSERT((o < sc->fb_size), ("Offset %#08x out of fb size", o));
+	*(uint32_t *)(sc->fb_vbase + o) = v;
+}
+
+static void
+vt_fb_mem_copy(struct fb_info *sc, uint32_t offset_to, uint32_t offset_from,
+    uint32_t size)
+{
+
+	memmove((void *)(sc->fb_vbase + offset_to), (void *)(sc->fb_vbase +
+	    offset_from), size);
+}
+
+static void
+vt_fb_indir_wr1(struct fb_info *sc, uint32_t o, uint8_t v)
+{
+
+	KASSERT((o < sc->fb_size), ("Offset %#08x out of fb size", o));
+	sc->fb_write(sc->fb_priv, o, &v, 1);
+}
+
+static void
+vt_fb_indir_wr2(struct fb_info *sc, uint32_t o, uint16_t v)
+{
+
+	KASSERT((o < sc->fb_size), ("Offset %#08x out of fb size", o));
+	sc->fb_write(sc->fb_priv, o, &v, 2);
+}
+
+static void
+vt_fb_indir_wr4(struct fb_info *sc, uint32_t o, uint32_t v)
+{
+
+	KASSERT((o < sc->fb_size), ("Offset %#08x out of fb size", o));
+	sc->fb_write(sc->fb_priv, o, &v, 4);
+}
+
+static void
+vt_fb_indir_copy(struct fb_info *sc, uint32_t offset_to, uint32_t offset_from,
+    uint32_t size)
+{
+
+	sc->copy(sc->fb_priv, offset_to, offset_from, size);
+}
+
+int
+fb_probe(struct fb_info *info)
+{
+
+	if (info->fb_size == 0)
+		return (ENXIO);
+
+	if (info->fb_write != NULL) {
+		if (info->fb_write == NULL) {
+			return (EINVAL);
+		}
+		info->fb_flags |= FB_FLAG_NOMMAP;
+		info->wr1 = &vt_fb_indir_wr1;
+		info->wr2 = &vt_fb_indir_wr2;
+		info->wr4 = &vt_fb_indir_wr4;
+		info->copy = &vt_fb_indir_copy;
+	} else if (info->fb_vbase != 0) {
+		if (info->fb_pbase == 0)
+			info->fb_flags |= FB_FLAG_NOMMAP;
+		info->wr1 = &vt_fb_mem_wr1;
+		info->wr2 = &vt_fb_mem_wr2;
+		info->wr4 = &vt_fb_mem_wr4;
+		info->copy = &vt_fb_mem_copy;
+	} else
+		return (ENXIO);
+
+	return (0);
+}
+
+
+static int
+fb_init(struct fb_list_entry *entry, int unit)
+{
+	struct fb_info *info;
+
+	info = entry->fb_info;
+	entry->fb_si = make_dev(&fb_cdevsw, unit, UID_ROOT, GID_WHEEL,
+	    0600, "fb%d", unit);
+	entry->fb_si->si_drv1 = info;
+
+	return (0);
+}
+
+int
+fbd_list()
+{
+	struct fb_list_entry *entry;
+
+	if (LIST_EMPTY(&fb_list_head))
+		return (ENOENT);
+
+	LIST_FOREACH(entry, &fb_list_head, fb_list) {
+		printf("FB %s @%p\n", entry->fb_info->fb_name,
+		    (void *)entry->fb_info->fb_pbase);
+	}
+
+	return (0);
+}
+
+static struct fb_list_entry *
+fbd_find(struct fb_info* info)
+{
+	struct fb_list_entry *entry, *tmp;
+
+	LIST_FOREACH_SAFE(entry, &fb_list_head, fb_list, tmp) {
+		if (entry->fb_info == info) {
+			return (entry);
+		}
+	}
+
+	return (NULL);
+}
+
+int
+fbd_register(struct fb_info* info)
+{
+	struct fb_list_entry *entry;
+	int err, first;
+
+	first = 0;
+	if (LIST_EMPTY(&fb_list_head))
+		first++;
+
+	entry = fbd_find(info);
+	if (entry != NULL) {
+		/* XXX Update framebuffer params */
+		return (0);
+	}
+
+	err = fb_probe(info);
+	if (err)
+		return (err);
+
+	entry = malloc(sizeof(struct fb_list_entry), M_DEVBUF, M_WAITOK|M_ZERO);
+	entry->fb_info = info;
+
+	LIST_INSERT_HEAD(&fb_list_head, entry, fb_list);
+
+	err = fb_init(entry, framebuffer_dev_unit++);
+	if (err)
+		return (err);
+
+	if (first)
+		vt_fb_attach(info);
+
+	return (0);
+}
+
+int
+fbd_unregister(struct fb_info* info)
+{
+	struct fb_list_entry *entry, *tmp;
+
+	LIST_FOREACH_SAFE(entry, &fb_list_head, fb_list, tmp) {
+		if (entry->fb_info == info) {
+			LIST_REMOVE(entry, fb_list);
+			free(entry, M_DEVBUF);
+			return (0);
+		}
+	}
+
+	return (ENOENT);
+}
+
+static void
+register_fb_wrap(void *arg, void *ptr)
+{
+
+	fbd_register((struct fb_info *)ptr);
+}
+
+static void
+unregister_fb_wrap(void *arg, void *ptr)
+{
+
+	fbd_unregister((struct fb_info *)ptr);
+}
+
+static void
+fbd_evh_init(void *ctx)
+{
+
+	EVENTHANDLER_REGISTER(register_framebuffer, register_fb_wrap, NULL,
+	    EVENTHANDLER_PRI_ANY);
+	EVENTHANDLER_REGISTER(unregister_framebuffer, unregister_fb_wrap, NULL,
+	    EVENTHANDLER_PRI_ANY);
+}
+
+/* Newbus methods. */
+static int
+fbd_probe(device_t dev)
+{
+
+	return (BUS_PROBE_NOWILDCARD);
+}
+
+static int
+fbd_attach(device_t dev)
+{
+	struct fbd_softc *sc;
+	int err;
+
+	sc = device_get_softc(dev);
+
+	sc->sc_dev = dev;
+	sc->sc_info = FB_GETINFO(device_get_parent(dev));
+	if (sc->sc_info == NULL)
+		return (ENXIO);
+	err = fbd_register(sc->sc_info);
+
+	return (err);
+}
+
+static int
+fbd_detach(device_t dev)
+{
+	struct fbd_softc *sc;
+	int err;
+
+	sc = device_get_softc(dev);
+
+	err = fbd_unregister(sc->sc_info);
+
+	return (err);
+}
+
+static int
+fbd_suspend(device_t dev)
+{
+
+	vt_fb_suspend();
+	return (bus_generic_suspend(dev));
+}
+
+static int
+fbd_resume(device_t dev)
+{
+
+	vt_fb_resume();
+	return (bus_generic_resume(dev));
+}
+
+static device_method_t fbd_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		fbd_probe),
+	DEVMETHOD(device_attach,	fbd_attach),
+	DEVMETHOD(device_detach,	fbd_detach),
+
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	fbd_suspend),
+	DEVMETHOD(device_resume,	fbd_resume),
+
+	{ 0, 0 }
+};
+
+driver_t fbd_driver = {
+	"fbd",
+	fbd_methods,
+	sizeof(struct fbd_softc)
+};
+
+devclass_t	fbd_devclass;
+
+DRIVER_MODULE(fbd, fb, fbd_driver, fbd_devclass, 0, 0);
+DRIVER_MODULE(fbd, drmn, fbd_driver, fbd_devclass, 0, 0);
+MODULE_VERSION(fbd, 1);
+
diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c
index e8cd11f7330..15bf964d326 100644
--- a/sys/dev/fdt/fdt_common.c
+++ b/sys/dev/fdt/fdt_common.c
@@ -63,6 +63,8 @@ vm_paddr_t fdt_immr_pa;
 vm_offset_t fdt_immr_va;
 vm_offset_t fdt_immr_size;
 
+struct fdt_ic_list fdt_ic_list_head = SLIST_HEAD_INITIALIZER(fdt_ic_list_head);
+
 int
 fdt_get_range(phandle_t node, int range_id, u_long *base, u_long *size)
 {
@@ -476,21 +478,31 @@ fdt_intr_decode(phandle_t intr_parent, pcell_t *intr, int *interrupt,
     int *trig, int *pol)
 {
 	fdt_pic_decode_t intr_decode;
+	phandle_t intr_offset;
 	int i, rv;
 
+	intr_offset = OF_xref_phandle(intr_parent);
+
 	for (i = 0; fdt_pic_table[i] != NULL; i++) {
 
 		/* XXX check if pic_handle has interrupt-controller prop? */
 
 		intr_decode = fdt_pic_table[i];
-		rv = intr_decode(intr_parent, intr, interrupt, trig, pol);
+		rv = intr_decode(intr_offset, intr, interrupt, trig, pol);
 
-		if (rv == 0)
+		if (rv == 0) {
 			/* This was recognized as our PIC and decoded. */
+			*interrupt = FDT_MAP_IRQ(intr_parent, *interrupt);
 			return (0);
+		}
 	}
 
-	return (ENXIO);
+	/* Not in table, so guess */
+	*interrupt = FDT_MAP_IRQ(intr_parent, fdt32_to_cpu(*intr));
+	*trig = INTR_TRIGGER_CONFORM;
+	*pol = INTR_POLARITY_CONFORM;
+
+	return (0);
 }
 
 int
@@ -498,11 +510,11 @@ fdt_intr_to_rl(phandle_t node, struct resource_list *rl,
     struct fdt_sense_level *intr_sl)
 {
 	phandle_t intr_par;
-	ihandle_t iph;
+	phandle_t iph;
 	pcell_t *intr;
 	pcell_t intr_cells;
 	int interrupt, trig, pol;
-	int i, intr_num, irq, rv;
+	int i, intr_num, rv;
 
 	if (OF_getproplen(node, "interrupts") <= 0)
 		/* Node does not have 'interrupts' property. */
@@ -511,12 +523,11 @@ fdt_intr_to_rl(phandle_t node, struct resource_list *rl,
 	/*
 	 * Find #interrupt-cells of the interrupt domain.
 	 */
-	if (OF_getprop(node, "interrupt-parent", &iph, sizeof(iph)) <= 0) {
+	if (OF_getencprop(node, "interrupt-parent", &iph, sizeof(iph)) <= 0) {
 		debugf("no intr-parent phandle\n");
 		intr_par = OF_parent(node);
 	} else {
-		iph = fdt32_to_cpu(iph);
-		intr_par = OF_instance_to_package(iph);
+		intr_par = OF_xref_phandle(iph);
 	}
 
 	if (OF_getprop(intr_par, "#interrupt-cells", &intr_cells,
@@ -538,7 +549,7 @@ fdt_intr_to_rl(phandle_t node, struct resource_list *rl,
 		interrupt = -1;
 		trig = pol = 0;
 
-		if (fdt_intr_decode(intr_par, &intr[i * intr_cells],
+		if (fdt_intr_decode(iph, &intr[i * intr_cells],
 		    &interrupt, &trig, &pol) != 0) {
 			rv = ENXIO;
 			goto out;
@@ -555,8 +566,7 @@ fdt_intr_to_rl(phandle_t node, struct resource_list *rl,
 		intr_sl[i].trig = trig;
 		intr_sl[i].pol = pol;
 
-		irq = FDT_MAP_IRQ(intr_par, interrupt);
-		resource_list_add(rl, SYS_RES_IRQ, i, irq, irq, 1);
+		resource_list_add(rl, SYS_RES_IRQ, i, interrupt, interrupt, 1);
 	}
 
 out:
@@ -568,18 +578,15 @@ int
 fdt_get_phyaddr(phandle_t node, device_t dev, int *phy_addr, void **phy_sc)
 {
 	phandle_t phy_node;
-	ihandle_t phy_ihandle;
 	pcell_t phy_handle, phy_reg;
 	uint32_t i;
 	device_t parent, child;
 
-	if (OF_getprop(node, "phy-handle", (void *)&phy_handle,
+	if (OF_getencprop(node, "phy-handle", (void *)&phy_handle,
 	    sizeof(phy_handle)) <= 0)
 		return (ENXIO);
 
-	phy_ihandle = (ihandle_t)phy_handle;
-	phy_ihandle = fdt32_to_cpu(phy_ihandle);
-	phy_node = OF_instance_to_package(phy_ihandle);
+	phy_node = OF_xref_phandle(phy_handle);
 
 	if (OF_getprop(phy_node, "reg", (void *)&phy_reg,
 	    sizeof(phy_reg)) <= 0)
diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h
index d244a17963b..8c16257215a 100644
--- a/sys/dev/fdt/fdt_common.h
+++ b/sys/dev/fdt/fdt_common.h
@@ -70,6 +70,13 @@ struct fdt_fixup_entry {
 };
 extern struct fdt_fixup_entry fdt_fixup_table[];
 
+extern SLIST_HEAD(fdt_ic_list, fdt_ic) fdt_ic_list_head;
+struct fdt_ic {
+	SLIST_ENTRY(fdt_ic)	fdt_ics;
+	ihandle_t		iph;
+	device_t		dev;
+};
+
 extern vm_paddr_t fdt_immr_pa;
 extern vm_offset_t fdt_immr_va;
 extern vm_offset_t fdt_immr_size;
diff --git a/sys/dev/fdt/fdt_ic_if.m b/sys/dev/fdt/fdt_ic_if.m
new file mode 100644
index 00000000000..e11b8f87c81
--- /dev/null
+++ b/sys/dev/fdt/fdt_ic_if.m
@@ -0,0 +1,266 @@
+#-
+# Copyright (c) 2013 SRI International
+# Copyright (c) 1998-2004 Doug Rabson
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this 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 <sys/systm.h>
+#include <sys/bus.h>
+
+/**
+ * @defgroup FST_IC fdt_ic - KObj methods for interrupt controllers
+ * @brief A set of methods required device drivers that are interrupt
+ * controllers.  Derived from sys/kern/bus_if.m.
+ * @{
+ */
+INTERFACE fdt_ic;
+
+/**
+ * @brief Allocate an interrupt resource
+ *
+ * This method is called by child devices of an interrupt controller to
+ * allocate an interrup. The meaning of the resource-ID field varies
+ * from bus to bus and is opaque to the interrupt controller. If a
+ * resource was allocated and the caller did not use the RF_ACTIVE
+ * to specify that it should be activated immediately, the caller is
+ * responsible for calling FDT_IC_ACTIVATE_INTR() when it actually uses
+ * the interupt.
+ *
+ * @param _dev		the interrupt-parent device of @p _child
+ * @param _child	the device which is requesting an allocation
+ * @param _rid		a pointer to the resource identifier
+ * @param _irq		interrupt source to allocate
+ * @param _flags	any extra flags to control the resource
+ *			allocation - see @c RF_XXX flags in
+ *			<sys/rman.h> for details
+ * 
+ * @returns		the interrupt which was allocated or @c NULL if no
+ *			resource could be allocated
+ */
+METHOD struct resource * alloc_intr {
+	device_t	_dev;
+	device_t	_child;
+	int	       *_rid;
+	u_long		_irq;
+	u_int		_flags;
+};
+
+/**
+ * @brief Activate an interrupt
+ *
+ * Activate an interrupt previously allocated with FDT_IC_ALLOC_INTR().
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _r		interrupt to activate
+ */
+METHOD int activate_intr {
+	device_t	_dev;
+	struct resource *_r;
+};
+
+/**
+ * @brief Deactivate an interrupt
+ *
+ * Deactivate a resource previously allocated with FDT_IC_ALLOC_INTR().
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _r		the interrupt to deactivate
+ */
+METHOD int deactivate_intr {
+	device_t	_dev;
+	struct resource *_r;
+};
+
+/**
+ * @brief Release an interrupt
+ *
+ * Free an interupt allocated by the FDT_IC_ALLOC_INTR.
+ *
+ * @param _dev		the parent device of @p _child
+ * @param _r		the resource to release
+ */
+METHOD int release_intr {
+	device_t	_dev;
+	struct resource *_res;
+};
+
+/**
+ * @brief Install an interrupt handler
+ *
+ * This method is used to associate an interrupt handler function with
+ * an irq resource. When the interrupt triggers, the function @p _intr
+ * will be called with the value of @p _arg as its single
+ * argument. The value returned in @p *_cookiep is used to cancel the
+ * interrupt handler - the caller should save this value to use in a
+ * future call to FDT_IC_TEARDOWN_INTR().
+ * 
+ * @param _dev		the interrupt-parent device of @p _child
+ * @param _child	the device which allocated the resource
+ * @param _irq		the resource representing the interrupt
+ * @param _flags	a set of bits from enum intr_type specifying
+ *			the class of interrupt
+ * @param _intr		the function to call when the interrupt
+ *			triggers
+ * @param _arg		a value to use as the single argument in calls
+ *			to @p _intr
+ * @param _cookiep	a pointer to a location to recieve a cookie
+ *			value that may be used to remove the interrupt
+ *			handler
+ */
+METHOD int setup_intr {
+	device_t	_dev;
+	device_t	_child;
+	struct resource *_irq;
+	int		_flags;
+	driver_filter_t	*_filter;
+	driver_intr_t	*_intr;
+	void		*_arg;
+	void		**_cookiep;
+};
+
+/**
+ * @brief Uninstall an interrupt handler
+ *
+ * This method is used to disassociate an interrupt handler function
+ * with an irq resource. The value of @p _cookie must be the value
+ * returned from a previous call to FDT_IC_SETUP_INTR().
+ * 
+ * @param _dev		the interrupt-parent device of @p _child
+ * @param _child	the device which allocated the resource
+ * @param _irq		the resource representing the interrupt
+ * @param _cookie	the cookie value returned when the interrupt
+ *			was originally registered
+ */
+METHOD int teardown_intr {
+	device_t	_dev;
+	device_t	_child;
+	struct resource	*_irq;
+	void		*_cookie;
+};
+
+/**
+ * @brief Allow drivers to request that an interrupt be bound to a specific
+ * CPU.
+ * 
+ * @param _dev		the interrupt-parent device of @p _child
+ * @param _child	the device which allocated the resource
+ * @param _irq		the resource representing the interrupt
+ * @param _cpu		the CPU to bind the interrupt to
+ */
+METHOD int bind_intr {
+	device_t	_dev;
+	device_t	_child;
+	struct resource *_irq;
+	int		_cpu;
+};
+
+/**
+ * @brief Allow drivers to specify the trigger mode and polarity
+ * of the specified interrupt.
+ * 
+ * @param _dev		the interrupt-parent device
+ * @param _irq		the interrupt number to modify
+ * @param _trig		the trigger mode required
+ * @param _pol		the interrupt polarity required
+ */
+METHOD int config_intr {
+	device_t	_dev;
+	int		_irq;
+	enum intr_trigger _trig;
+	enum intr_polarity _pol;
+};
+
+/**
+ * @brief Allow drivers to associate a description with an active
+ * interrupt handler.
+ *
+ * @param _dev		the interrupt-parent device of @p _child
+ * @param _child	the device which allocated the resource
+ * @param _irq		the resource representing the interrupt
+ * @param _cookie	the cookie value returned when the interrupt
+ *			was originally registered
+ * @param _descr	the description to associate with the interrupt
+ */
+METHOD int describe_intr {
+	device_t	_dev;
+	device_t	_child;
+	struct resource *_irq;
+	void		*_cookie;
+	const char	*_descr;
+};
+
+/**
+ * @brief Notify an ic that specified child's IRQ should be remapped.
+ *
+ * @param _dev		the interrupt-parent device
+ * @param _child	the child device
+ * @param _irq		the irq number
+ */
+METHOD int remap_intr {
+	device_t	_dev;
+	device_t	_child;
+	u_int		_irq;
+};
+
+/**
+ * @brief Enable an IPI source.
+ *
+ * @param _dev		the interrupt controller
+ * @param _tid		the thread ID (relative to the interrupt controller)
+ *			to enable IPIs for
+ * @param _ipi_irq	hardware IRQ to send IPIs to
+ */
+METHOD void setup_ipi {
+	device_t	_dev;
+	u_int		_tid;
+	u_int		_irq;
+};
+
+/**
+ * @brief Send an IPI to the specified thread.
+ *
+ * @param _dev		the interrupt controller
+ * @param _tid		the thread ID (relative to the interrupt controller)
+ *			to send IPIs to
+ */
+METHOD void send_ipi {
+	device_t	_dev;
+	u_int		_tid;
+};
+
+/**
+ * @brief Clear the IPI on the specfied thread.  Only call with the
+ * local hardware thread or interrupts may be lost!
+ *
+ * @param _dev		the interrupt controller
+ * @param _tid		the thread ID (relative to the interrupt controller)
+ *			to clear the IPI on
+ */
+METHOD void clear_ipi {
+	device_t	_dev;
+	u_int		_tid;
+};
diff --git a/sys/dev/fdt/fdt_mips.c b/sys/dev/fdt/fdt_mips.c
index 4df31d84164..19045742375 100644
--- a/sys/dev/fdt/fdt_mips.c
+++ b/sys/dev/fdt/fdt_mips.c
@@ -68,7 +68,26 @@ fdt_pic_decode_mips4k_cp0(phandle_t node, pcell_t *intr, int *interrupt,
 	return (0);
 }
 
+/*
+ * CHERI PIC decoder.
+ */
+static int
+fdt_pic_decode_beri(phandle_t node, pcell_t *intr, int *interrupt,
+    int *trig, int *pol)
+{
+
+	if (!fdt_is_compatible(node, "sri-cambridge,beri-pic"))
+		return (ENXIO);
+
+	*interrupt = fdt32_to_cpu(intr[0]);
+	*trig = INTR_TRIGGER_CONFORM;
+	*pol = INTR_POLARITY_CONFORM;
+
+	return (0);
+}
+
 fdt_pic_decode_t fdt_pic_table[] = {
 	&fdt_pic_decode_mips4k_cp0,
+	&fdt_pic_decode_beri,
 	NULL
 };
diff --git a/sys/dev/fdt/fdt_pci.c b/sys/dev/fdt/fdt_pci.c
index 40f12cbf93a..fae5f07aa86 100644
--- a/sys/dev/fdt/fdt_pci.c
+++ b/sys/dev/fdt/fdt_pci.c
@@ -42,6 +42,9 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcireg.h>
 
 #include <machine/fdt.h>
+#if defined(__arm__)
+#include <machine/devmap.h>
+#endif
 
 #include "ofw_bus_if.h"
 #include "pcib_if.h"
@@ -255,7 +258,7 @@ fdt_pci_route_intr(int bus, int slot, int func, int pin,
     struct fdt_pci_intr *intr_info, int *interrupt)
 {
 	pcell_t child_spec[4], masked[4];
-	ihandle_t iph;
+	phandle_t iph;
 	pcell_t intr_par;
 	pcell_t *map_ptr;
 	uint32_t addr;
@@ -280,7 +283,7 @@ fdt_pci_route_intr(int bus, int slot, int func, int pin,
 	i = 0;
 	while (i < map_len) {
 		iph = fdt32_to_cpu(map_ptr[par_idx]);
-		intr_par = OF_instance_to_package(iph);
+		intr_par = OF_xref_phandle(iph);
 
 		err = fdt_addr_cells(intr_par, &par_addr_cells);
 		if (err != 0) {
@@ -317,7 +320,7 @@ fdt_pci_route_intr(int bus, int slot, int func, int pin,
 		    trig, pol);
 
 #if defined(__powerpc__)
-		powerpc_config_intr(FDT_MAP_IRQ(intr_par, *interrupt), trig,
+		powerpc_config_intr(FDT_MAP_IRQ(iph, *interrupt), trig,
 		    pol);
 #endif
 		return (0);
@@ -332,7 +335,7 @@ next:
 
 #if defined(__arm__)
 int
-fdt_pci_devmap(phandle_t node, struct pmap_devmap *devmap, vm_offset_t io_va,
+fdt_pci_devmap(phandle_t node, struct arm_devmap_entry *devmap, vm_offset_t io_va,
     vm_offset_t mem_va)
 {
 	struct fdt_pci_range io_space, mem_space;
diff --git a/sys/dev/fdt/fdt_powerpc.c b/sys/dev/fdt/fdt_powerpc.c
index ac81c08b33b..d3e9d4e77d9 100644
--- a/sys/dev/fdt/fdt_powerpc.c
+++ b/sys/dev/fdt/fdt_powerpc.c
@@ -123,7 +123,8 @@ fdt_pic_decode_openpic(phandle_t node, pcell_t *intr, int *interrupt,
     int *trig, int *pol)
 {
 
-	if (!fdt_is_compatible(node, "chrp,open-pic"))
+	if (!fdt_is_compatible(node, "chrp,open-pic") &&
+	    !fdt_is_type(node, "open-pic"))
 		return (ENXIO);
 
 	/*
diff --git a/sys/dev/fdt/fdt_slicer.c b/sys/dev/fdt/fdt_slicer.c
index d32d1595287..9f65f73f747 100644
--- a/sys/dev/fdt/fdt_slicer.c
+++ b/sys/dev/fdt/fdt_slicer.c
@@ -35,9 +35,6 @@ __FBSDID("$FreeBSD$");
 
 #include <dev/fdt/fdt_common.h>
 
-#define DEBUG
-#undef DEBUG
-
 #ifdef DEBUG
 #define debugf(fmt, args...) do { printf("%s(): ", __func__);	\
     printf(fmt,##args); } while (0)
diff --git a/sys/dev/fdt/fdtbus.c b/sys/dev/fdt/fdtbus.c
index 38f8a9a8781..3a6659a6e7d 100644
--- a/sys/dev/fdt/fdtbus.c
+++ b/sys/dev/fdt/fdtbus.c
@@ -42,63 +42,20 @@ __FBSDID("$FreeBSD$");
 #include <machine/fdt.h>
 
 #include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_nexus.h>
 
-#include "fdt_common.h"
 #include "ofw_bus_if.h"
 
-#ifdef DEBUG
-#define debugf(fmt, args...) do { printf("%s(): ", __func__);	\
-    printf(fmt,##args); } while (0)
-#else
-#define debugf(fmt, args...)
-#endif
-
-static MALLOC_DEFINE(M_FDTBUS, "fdtbus", "FDTbus devices information");
-
-struct fdtbus_devinfo {
-	phandle_t		di_node;
-	char			*di_name;
-	char			*di_type;
-	char			*di_compat;
-	struct resource_list	di_res;
-
-	/* Interrupts sense-level info for this device */
-	struct fdt_sense_level	di_intr_sl[DI_MAX_INTR_NUM];
-};
-
-struct fdtbus_softc {
-	struct rman	sc_irq;
-	struct rman	sc_mem;
-};
-
 /*
  * Prototypes.
  */
 static void fdtbus_identify(driver_t *, device_t);
 static int fdtbus_probe(device_t);
-static int fdtbus_attach(device_t);
 
-static int fdtbus_print_child(device_t, device_t);
-static struct resource *fdtbus_alloc_resource(device_t, device_t, int,
-    int *, u_long, u_long, u_long, u_int);
-static int fdtbus_release_resource(device_t, device_t, int, int,
-    struct resource *);
 static int fdtbus_activate_resource(device_t, device_t, int, int,
     struct resource *);
 static int fdtbus_deactivate_resource(device_t, device_t, int, int,
     struct resource *);
-static int fdtbus_setup_intr(device_t, device_t, struct resource *, int,
-    driver_filter_t *, driver_intr_t *, void *, void **);
-
-static const char *fdtbus_ofw_get_name(device_t, device_t);
-static phandle_t fdtbus_ofw_get_node(device_t, device_t);
-static const char *fdtbus_ofw_get_type(device_t, device_t);
-static const char *fdtbus_ofw_get_compat(device_t, device_t);
-
-/*
- * Local routines.
- */
-static void newbus_device_from_fdt_node(device_t, phandle_t);
 
 /*
  * Bus interface definition.
@@ -107,47 +64,26 @@ static device_method_t fdtbus_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_identify,	fdtbus_identify),
 	DEVMETHOD(device_probe,		fdtbus_probe),
-	DEVMETHOD(device_attach,	fdtbus_attach),
-	DEVMETHOD(device_detach,	bus_generic_detach),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
 
 	/* Bus interface */
-	DEVMETHOD(bus_print_child,	fdtbus_print_child),
-	DEVMETHOD(bus_alloc_resource,	fdtbus_alloc_resource),
-	DEVMETHOD(bus_release_resource,	fdtbus_release_resource),
 	DEVMETHOD(bus_activate_resource, fdtbus_activate_resource),
 	DEVMETHOD(bus_deactivate_resource, fdtbus_deactivate_resource),
 	DEVMETHOD(bus_config_intr,	bus_generic_config_intr),
-	DEVMETHOD(bus_setup_intr,	fdtbus_setup_intr),
+	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
-	/* OFW bus interface */
-	DEVMETHOD(ofw_bus_get_node,	fdtbus_ofw_get_node),
-	DEVMETHOD(ofw_bus_get_name,	fdtbus_ofw_get_name),
-	DEVMETHOD(ofw_bus_get_type,	fdtbus_ofw_get_type),
-	DEVMETHOD(ofw_bus_get_compat,	fdtbus_ofw_get_compat),
-
-	{ 0, 0 }
-};
-
-static driver_t fdtbus_driver = {
-	"fdtbus",
-	fdtbus_methods,
-	sizeof(struct fdtbus_softc)
+	DEVMETHOD_END
 };
 
 devclass_t fdtbus_devclass;
-
+DEFINE_CLASS_1(fdtbus, fdtbus_driver, fdtbus_methods,
+    sizeof(struct ofw_nexus_softc), ofw_nexus_driver);
 DRIVER_MODULE(fdtbus, nexus, fdtbus_driver, fdtbus_devclass, 0, 0);
 
 static void
 fdtbus_identify(driver_t *driver, device_t parent)
 {
 
-	debugf("%s(driver=%p, parent=%p)\n", __func__, driver, parent);
-
 	if (device_find_child(parent, "fdtbus", -1) == NULL)
 		BUS_ADD_CHILD(parent, 0, "fdtbus", -1);
 }
@@ -156,461 +92,8 @@ static int
 fdtbus_probe(device_t dev)
 {
 
-	debugf("%s(dev=%p); pass=%u\n", __func__, dev, bus_current_pass);
-
-	device_set_desc(dev, "FDT main bus");
-	if (!bootverbose)
-		device_quiet(dev);
-	return (BUS_PROBE_DEFAULT);
-}
-
-static int
-fdtbus_attach(device_t dev)
-{
-	phandle_t root;
-	phandle_t child;
-	struct fdtbus_softc *sc;
-	u_long start, end;
-	int error;
-
-	if ((root = OF_finddevice("/")) == -1)
-		panic("fdtbus_attach: no root node.");
-
-	sc = device_get_softc(dev);
-
-	/*
-	 * IRQ rman.
-	 */
-	start = 0;
-	end = FDT_INTR_MAX - 1;
-	sc->sc_irq.rm_start = start;
-	sc->sc_irq.rm_end = end;
-	sc->sc_irq.rm_type = RMAN_ARRAY;
-	sc->sc_irq.rm_descr = "Interrupt request lines";
-	if ((error = rman_init(&sc->sc_irq)) != 0) {
-		device_printf(dev, "could not init IRQ rman, error = %d\n",
-		    error);
-		return (error);
-	}
-	if ((error = rman_manage_region(&sc->sc_irq, start, end)) != 0) {
-		device_printf(dev, "could not manage IRQ region, error = %d\n",
-		    error);
-		return (error);
-	}
-
-	/*
-	 * Mem-mapped I/O space rman.
-	 */
-	start = 0;
-	end = ~0ul;
-	sc->sc_mem.rm_start = start;
-	sc->sc_mem.rm_end = end;
-	sc->sc_mem.rm_type = RMAN_ARRAY;
-	sc->sc_mem.rm_descr = "I/O memory";
-	if ((error = rman_init(&sc->sc_mem)) != 0) {
-		device_printf(dev, "could not init I/O mem rman, error = %d\n",
-		    error);
-		return (error);
-	}
-	if ((error = rman_manage_region(&sc->sc_mem, start, end)) != 0) {
-		device_printf(dev, "could not manage I/O mem region, "
-		    "error = %d\n", error);
-		return (error);
-	}
-
-	/*
-	 * Walk the FDT root node and add top-level devices as our children.
-	 */
-	for (child = OF_child(root); child != 0; child = OF_peer(child)) {
-		/* Check and process 'status' property. */
-		if (!(fdt_is_enabled(child)))
-			continue;
-
-		newbus_device_from_fdt_node(dev, child);
-	}
-
-	return (bus_generic_attach(dev));
-}
-
-static int
-fdtbus_print_child(device_t dev, device_t child)
-{
-	struct fdtbus_devinfo *di;
-	struct resource_list *rl;
-	int rv;
-
-	di = device_get_ivars(child);
-	rl = &di->di_res;
-
-	rv = 0;
-	rv += bus_print_child_header(dev, child);
-	rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
-	rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
-	rv += bus_print_child_footer(dev, child);
-
-	return (rv);
-}
-
-static void
-newbus_device_destroy(device_t dev)
-{
-	struct fdtbus_devinfo *di;
-
-	di = device_get_ivars(dev);
-	if (di == NULL)
-		return;
-
-	free(di->di_name, M_OFWPROP);
-	free(di->di_type, M_OFWPROP);
-	free(di->di_compat, M_OFWPROP);
-
-	resource_list_free(&di->di_res);
-	free(di, M_FDTBUS);
-}
-
-static device_t
-newbus_device_create(device_t dev_par, phandle_t node, char *name, char *type,
-    char *compat)
-{
-	device_t child;
-	struct fdtbus_devinfo *di;
-
-	child = device_add_child(dev_par, NULL, -1);
-	if (child == NULL) {
-		free(name, M_OFWPROP);
-		free(type, M_OFWPROP);
-		free(compat, M_OFWPROP);
-		return (NULL);
-	}
-
-	di = malloc(sizeof(*di), M_FDTBUS, M_WAITOK);
-	di->di_node = node;
-	di->di_name = name;
-	di->di_type = type;
-	di->di_compat = compat;
-
-	resource_list_init(&di->di_res);
-
-	if (fdt_reg_to_rl(node, &di->di_res)) {
-		device_printf(child, "could not process 'reg' property\n");
-		newbus_device_destroy(child);
-		child = NULL;
-		goto out;
-	}
-
-	if (fdt_intr_to_rl(node, &di->di_res, di->di_intr_sl)) {
-		device_printf(child, "could not process 'interrupts' "
-		    "property\n");
-		newbus_device_destroy(child);
-		child = NULL;
-		goto out;
-	}
-
-	device_set_ivars(child, di);
-	debugf("added child name='%s', node=%p\n", name, (void *)node);
-
-out:
-	return (child);
-}
-
-static device_t
-newbus_pci_create(device_t dev_par, phandle_t dt_node, u_long par_base,
-    u_long par_size)
-{
-	pcell_t reg[3 + 2];
-	device_t dev_child;
-	u_long start, end, count;
-	struct fdtbus_devinfo *di;
-	char *name, *type, *compat;
-	int len;
-
-	OF_getprop_alloc(dt_node, "device_type", 1, (void **)&type);
-	if (!(type != NULL && strcmp(type, "pci") == 0)) {
-		/* Only process 'pci' subnodes. */
-		free(type, M_OFWPROP);
-		return (NULL);
-	}
-
-	OF_getprop_alloc(dt_node, "name", 1, (void **)&name);
-	OF_getprop_alloc(OF_parent(dt_node), "compatible", 1,
-	    (void **)&compat);
-
-	dev_child = device_add_child(dev_par, NULL, -1);
-	if (dev_child == NULL) {
-		free(name, M_OFWPROP);
-		free(type, M_OFWPROP);
-		free(compat, M_OFWPROP);
-		return (NULL);
-	}
-
-	di = malloc(sizeof(*di), M_FDTBUS, M_WAITOK);
-	di->di_node = dt_node;
-	di->di_name = name;
-	di->di_type = type;
-	di->di_compat = compat;
-
-	resource_list_init(&di->di_res);
-
-	/*
-	 * Produce and set SYS_RES_MEMORY resources.
-	 */
-	start = 0;
-	count = 0;
-
-	len = OF_getprop(dt_node, "reg", &reg, sizeof(reg));
-	if (len > 0) {
-		if (fdt_data_verify((void *)&reg[1], 2) != 0) {
-			device_printf(dev_child, "'reg' address value out of "
-			    "range\n");
-			newbus_device_destroy(dev_child);
-			dev_child = NULL;
-			goto out;
-		}
-		start = fdt_data_get((void *)&reg[1], 2);
-
-		if (fdt_data_verify((void *)&reg[3], 2) != 0) {
-			device_printf(dev_child, "'reg' size value out of "
-			    "range\n");
-			newbus_device_destroy(dev_child);
-			dev_child = NULL;
-			goto out;
-		}
-		count = fdt_data_get((void *)&reg[3], 2);
-	}
-
-	/* Calculate address range relative to base. */
-	par_base &= 0x000ffffful;
-	start &= 0x000ffffful;
-	start += par_base + fdt_immr_va;
-	if (count == 0)
-		count = par_size;
-	end = start + count - 1;
-
-	debugf("start = 0x%08lx, end = 0x%08lx, count = 0x%08lx\n",
-	    start, end, count);
-
-	if (count > par_size) {
-		device_printf(dev_child, "'reg' size value out of range\n");
-		newbus_device_destroy(dev_child);
-		dev_child = NULL;
-		goto out;
-	}
-
-	resource_list_add(&di->di_res, SYS_RES_MEMORY, 0, start, end, count);
-
-	/*
-	 * Set SYS_RES_IRQ resources.
-	 */
-	if (fdt_intr_to_rl(OF_parent(dt_node), &di->di_res, di->di_intr_sl)) {
-		device_printf(dev_child, "could not process 'interrupts' "
-		    "property\n");
-		newbus_device_destroy(dev_child);
-		dev_child = NULL;
-		goto out;
-	}
-
-	device_set_ivars(dev_child, di);
-	debugf("added child name='%s', node=%p\n", name,
-	    (void *)dt_node);
-
-out:
-	return (dev_child);
-}
-
-static void 
-pci_from_fdt_node(device_t dev_par, phandle_t dt_node, char *name,
-    char *type, char *compat)
-{
-	u_long reg_base, reg_size;
-	phandle_t dt_child;
-
-	/*
-	 * Retrieve 'reg' property.
-	 */
-	if (fdt_regsize(dt_node, &reg_base, &reg_size) != 0) {
-		device_printf(dev_par, "could not retrieve 'reg' prop\n");
-		return;
-	}
-
-	/*
-	 * Walk the PCI node and instantiate newbus devices representing
-	 * logical resources (bridges / ports).
-	 */
-	for (dt_child = OF_child(dt_node); dt_child != 0;
-	    dt_child = OF_peer(dt_child)) {
-
-		if (!(fdt_is_enabled(dt_child)))
-			continue;
-
-		newbus_pci_create(dev_par, dt_child, reg_base, reg_size);
-	}
-}
-
-/*
- * These FDT nodes do not need a corresponding newbus device object.
- */
-static char *fdt_devices_skip[] = {
-	"aliases",
-	"chosen",
-	"memory",
-	NULL
-};
-
-static void
-newbus_device_from_fdt_node(device_t dev_par, phandle_t node)
-{
-	char *name, *type, *compat;
-	device_t child;
-	int i;
-
-	OF_getprop_alloc(node, "name", 1, (void **)&name);
-	OF_getprop_alloc(node, "device_type", 1, (void **)&type);
-	OF_getprop_alloc(node, "compatible", 1, (void **)&compat);
-
-	for (i = 0; fdt_devices_skip[i] != NULL; i++)
-		if (name != NULL && strcmp(name, fdt_devices_skip[i]) == 0) {
-			debugf("skipping instantiating FDT device='%s'\n",
-			    name);
-			return;
-		}
-
-	child = newbus_device_create(dev_par, node, name, type, compat);
-	if (type != NULL && strcmp(type, "pci") == 0)
-		pci_from_fdt_node(child, node, name, type, compat);
-}
-
-static struct resource *
-fdtbus_alloc_resource(device_t bus, device_t child, int type, int *rid,
-    u_long start, u_long end, u_long count, u_int flags)
-{
-	struct fdtbus_softc *sc;
-	struct resource *res;
-	struct rman *rm;
-	struct fdtbus_devinfo *di;
-	struct resource_list_entry *rle;
-	int needactivate;
-
-	/*
-	 * Request for the default allocation with a given rid: use resource
-	 * list stored in the local device info.
-	 */
-	if ((start == 0UL) && (end == ~0UL)) {
-		if ((di = device_get_ivars(child)) == NULL)
-			return (NULL);
-
-		if (type == SYS_RES_IOPORT)
-			type = SYS_RES_MEMORY;
-
-		rle = resource_list_find(&di->di_res, type, *rid);
-		if (rle == NULL) {
-			device_printf(bus, "no default resources for "
-			    "rid = %d, type = %d\n", *rid, type);
-			return (NULL);
-		}
-		start = rle->start;
-		end = rle->end;
-		count = rle->count;
-	}
-
-	sc = device_get_softc(bus);
-
-	needactivate = flags & RF_ACTIVE;
-	flags &= ~RF_ACTIVE;
-
-	switch (type) {
-	case SYS_RES_IRQ:
-		rm = &sc->sc_irq;
-		break;
-
-	case SYS_RES_IOPORT:
-	case SYS_RES_MEMORY:
-		rm = &sc->sc_mem;
-		break;
-
-	default:
-		return (NULL);
-	}
-
-	res = rman_reserve_resource(rm, start, end, count, flags, child);
-	if (res == NULL) {
-		device_printf(bus, "failed to reserve resource %#lx - %#lx "
-		    "(%#lx)\n", start, end, count);
-		return (NULL);
-	}
-
-	rman_set_rid(res, *rid);
-
-	if (type == SYS_RES_IOPORT || type == SYS_RES_MEMORY) {
-		/* XXX endianess should be set based on SOC node */
-		rman_set_bustag(res, fdtbus_bs_tag);
-		rman_set_bushandle(res, rman_get_start(res));
-	}
-
-	if (needactivate)
-		if (bus_activate_resource(child, type, *rid, res)) {
-			device_printf(child, "resource activation failed\n");
-			rman_release_resource(res);
-			return (NULL);
-		}
-
-	return (res);
-}
-
-static int
-fdtbus_release_resource(device_t bus, device_t child, int type, int rid,
-    struct resource *res)
-{
-	int err;
-
-	if (rman_get_flags(res) & RF_ACTIVE) {
-		err = bus_deactivate_resource(child, type, rid, res);
-		if (err)
-			return (err);
-	}
-
-	return (rman_release_resource(res));
-}
-
-static int
-fdtbus_setup_intr(device_t bus, device_t child, struct resource *res,
-    int flags, driver_filter_t *filter, driver_intr_t *ihand, void *arg,
-    void **cookiep)
-{
-	struct fdtbus_devinfo *di;
-	enum intr_trigger trig;
-	enum intr_polarity pol;
-	int error, rid;
-
-	if (res == NULL)
-		return (EINVAL);
-
-	/*
-	 * We are responsible for configuring the interrupts of our direct
-	 * children.
-	 */
-	if (device_get_parent(child) == bus) {
-		di = device_get_ivars(child);
-		if (di == NULL)
-			return (ENXIO);
-
-		rid = rman_get_rid(res);
-		if (rid >= DI_MAX_INTR_NUM)
-			return (ENOENT);
-
-		trig = di->di_intr_sl[rid].trig;
-		pol = di->di_intr_sl[rid].pol;
-		if (trig != INTR_TRIGGER_CONFORM ||
-		    pol != INTR_POLARITY_CONFORM) {
-			error = bus_generic_config_intr(bus,
-			    rman_get_start(res), trig, pol);
-			if (error)
-				return (error);
-		}
-	}
-
-	error = bus_generic_setup_intr(bus, child, res, flags, filter, ihand,
-	    arg, cookiep);
-	return (error);
+	device_set_desc(dev, "Flattened Device Tree");
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
@@ -621,6 +104,10 @@ fdtbus_activate_resource(device_t bus, device_t child, int type, int rid,
 	int error;
 
 	if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
+		/* XXX endianess should be set based on SOC node */
+		rman_set_bustag(res, fdtbus_bs_tag);
+		rman_set_bushandle(res, rman_get_start(res));
+
 		error = bus_space_map(rman_get_bustag(res),
 		    rman_get_bushandle(res), rman_get_size(res), 0, &p);
 		if (error)
@@ -639,36 +126,3 @@ fdtbus_deactivate_resource(device_t bus, device_t child, int type, int rid,
 	return (rman_deactivate_resource(res));
 }
 
-static const char *
-fdtbus_ofw_get_name(device_t bus, device_t dev)
-{
-	struct fdtbus_devinfo *di;
-
-	return ((di = device_get_ivars(dev)) == NULL ? NULL : di->di_name);
-}
-
-static phandle_t
-fdtbus_ofw_get_node(device_t bus, device_t dev)
-{
-	struct fdtbus_devinfo *di;
-
-	return ((di = device_get_ivars(dev)) == NULL ? 0 : di->di_node);
-}
-
-static const char *
-fdtbus_ofw_get_type(device_t bus, device_t dev)
-{
-	struct fdtbus_devinfo *di;
-
-	return ((di = device_get_ivars(dev)) == NULL ? NULL : di->di_type);
-}
-
-static const char *
-fdtbus_ofw_get_compat(device_t bus, device_t dev)
-{
-	struct fdtbus_devinfo *di;
-
-	return ((di = device_get_ivars(dev)) == NULL ? NULL : di->di_compat);
-}
-
-
diff --git a/sys/dev/fdt/simplebus.c b/sys/dev/fdt/simplebus.c
index b4e7bfb15b7..92439cda3c0 100644
--- a/sys/dev/fdt/simplebus.c
+++ b/sys/dev/fdt/simplebus.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ofw/openfirm.h>
 
 #include "fdt_common.h"
+#include "fdt_ic_if.h"
 #include "ofw_bus_if.h"
 
 #ifdef DEBUG
@@ -80,9 +81,18 @@ static int simplebus_attach(device_t);
 static int simplebus_print_child(device_t, device_t);
 static int simplebus_setup_intr(device_t, device_t, struct resource *, int,
     driver_filter_t *, driver_intr_t *, void *, void **);
+static int simplebus_teardown_intr(device_t, device_t, struct resource *,
+    void *);
 
+static int simplebus_activate_resource(device_t, device_t, int, int,
+    struct resource *);
 static struct resource *simplebus_alloc_resource(device_t, device_t, int,
     int *, u_long, u_long, u_long, u_int);
+static int simplebus_deactivate_resource(device_t, device_t, int, int,
+    struct resource *);
+static int simplebus_release_resource(device_t, device_t, int, int,
+    struct resource *);
+static device_t simplebus_get_interrupt_parent(device_t);
 static struct resource_list *simplebus_get_resource_list(device_t, device_t);
 
 static ofw_bus_get_devinfo_t simplebus_get_devinfo;
@@ -102,11 +112,11 @@ static device_method_t simplebus_methods[] = {
 	/* Bus interface */
 	DEVMETHOD(bus_print_child,	simplebus_print_child),
 	DEVMETHOD(bus_alloc_resource,	simplebus_alloc_resource),
-	DEVMETHOD(bus_release_resource,	bus_generic_release_resource),
-	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
-	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+	DEVMETHOD(bus_release_resource,	simplebus_release_resource),
+	DEVMETHOD(bus_activate_resource, simplebus_activate_resource),
+	DEVMETHOD(bus_deactivate_resource, simplebus_deactivate_resource),
 	DEVMETHOD(bus_setup_intr,	simplebus_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
+	DEVMETHOD(bus_teardown_intr,	simplebus_teardown_intr),
 	DEVMETHOD(bus_get_resource_list, simplebus_get_resource_list),
 
 	/* OFW bus interface */
@@ -128,7 +138,7 @@ static driver_t simplebus_driver = {
 
 devclass_t simplebus_devclass;
 
-DRIVER_MODULE(simplebus, fdtbus, simplebus_driver, simplebus_devclass, 0, 0);
+DRIVER_MODULE(simplebus, nexus, simplebus_driver, simplebus_devclass, 0, 0);
 DRIVER_MODULE(simplebus, simplebus, simplebus_driver, simplebus_devclass, 0,
     0);
 
@@ -217,6 +227,7 @@ simplebus_attach(device_t dev)
 static int
 simplebus_print_child(device_t dev, device_t child)
 {
+	device_t ip;
 	struct simplebus_devinfo *di;
 	struct resource_list *rl;
 	int rv;
@@ -228,6 +239,8 @@ simplebus_print_child(device_t dev, device_t child)
 	rv += bus_print_child_header(dev, child);
 	rv += resource_list_print_type(rl, "mem", SYS_RES_MEMORY, "%#lx");
 	rv += resource_list_print_type(rl, "irq", SYS_RES_IRQ, "%ld");
+	if ((ip = simplebus_get_interrupt_parent(child)) != NULL)
+		rv += printf(" (%s)", device_get_nameunit(ip));
 	rv += bus_print_child_footer(dev, child);
 
 	return (rv);
@@ -237,6 +250,7 @@ static struct resource *
 simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
 {
+	device_t ic;
 	struct simplebus_devinfo *di;
 	struct resource_list_entry *rle;
 
@@ -263,10 +277,53 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 		count = rle->count;
 	}
 
+	if (type == SYS_RES_IRQ &&
+	    (ic = simplebus_get_interrupt_parent(child)) != NULL)
+		return(FDT_IC_ALLOC_INTR(ic, child, rid, start, flags));
+
 	return (bus_generic_alloc_resource(bus, child, type, rid, start, end,
 	    count, flags));
 }
 
+static int
+simplebus_activate_resource(device_t dev, device_t child, int type, int rid,
+    struct resource *r)
+{
+	device_t ic;
+
+	if (type == SYS_RES_IRQ &&
+	    (ic = simplebus_get_interrupt_parent(child)) != NULL)
+		return (FDT_IC_ACTIVATE_INTR(ic, r));
+
+	return (bus_generic_activate_resource(dev, child, type, rid, r));
+}
+
+static int
+simplebus_deactivate_resource(device_t dev, device_t child, int type, int rid,
+    struct resource *r)
+{
+	device_t ic;
+
+	if (type == SYS_RES_IRQ &&
+	    (ic = simplebus_get_interrupt_parent(child)) != NULL)
+		return (FDT_IC_DEACTIVATE_INTR(ic, r));
+
+	return (bus_generic_deactivate_resource(dev, child, type, rid, r));
+}
+
+static int
+simplebus_release_resource(device_t dev, device_t child, int type, int rid,
+    struct resource *r)
+{
+	device_t ic;
+
+	if (type == SYS_RES_IRQ &&
+	    (ic = simplebus_get_interrupt_parent(child)) != NULL)
+		return (FDT_IC_RELEASE_INTR(ic, r));
+
+	return (bus_generic_release_resource(dev, child, type, rid, r));
+}
+
 static struct resource_list *
 simplebus_get_resource_list(device_t bus, device_t child)
 {
@@ -276,15 +333,43 @@ simplebus_get_resource_list(device_t bus, device_t child)
 	return (&di->di_res);
 }
 
+static device_t
+simplebus_get_interrupt_parent(device_t dev)
+{
+	struct simplebus_devinfo *di;
+	struct fdt_ic *ic;
+	device_t ip;
+	phandle_t ph, iph;
+
+	ip = NULL;
+
+	di = device_get_ivars(dev);
+	if (di == NULL)
+		return (NULL);
+
+	if (OF_getencprop(di->di_ofw.obd_node, "interrupt-parent", &iph,
+	    sizeof(iph)) > 0) {
+		ph = OF_xref_phandle(iph);
+		SLIST_FOREACH(ic, &fdt_ic_list_head, fdt_ics) {
+			if (ic->iph == ph) {
+				ip = ic->dev;
+				break;
+			}
+		}
+	}
+	return (ip);
+}
+
 static int
 simplebus_setup_intr(device_t bus, device_t child, struct resource *res,
     int flags, driver_filter_t *filter, driver_intr_t *ihand, void *arg,
     void **cookiep)
 {
 	struct simplebus_devinfo *di;
+	device_t ic;
 	enum intr_trigger trig;
 	enum intr_polarity pol;
-	int error, rid;
+	int error, irq, rid;
 
 	di = device_get_ivars(child);
 	if (di == NULL)
@@ -297,20 +382,41 @@ simplebus_setup_intr(device_t bus, device_t child, struct resource *res,
 	if (rid >= DI_MAX_INTR_NUM)
 		return (ENOENT);
 
+	ic = simplebus_get_interrupt_parent(child);
+
 	trig = di->di_intr_sl[rid].trig;
 	pol = di->di_intr_sl[rid].pol;
 	if (trig != INTR_TRIGGER_CONFORM || pol != INTR_POLARITY_CONFORM) {
-		error = bus_generic_config_intr(bus, rman_get_start(res),
-		    trig, pol);
+		irq = rman_get_start(res);
+		if (ic != NULL)
+			error = FDT_IC_CONFIG_INTR(ic, irq, trig, pol);
+		else
+			error = bus_generic_config_intr(bus, irq, trig, pol);
 		if (error)
 			return (error);
 	}
 
-	error = bus_generic_setup_intr(bus, child, res, flags, filter, ihand,
-	    arg, cookiep);
+	if (ic != NULL)
+		error = FDT_IC_SETUP_INTR(ic, child, res, flags, filter,
+		    ihand, arg, cookiep);
+	else
+		error = bus_generic_setup_intr(bus, child, res, flags, filter,
+		    ihand, arg, cookiep);
 	return (error);
 }
 
+static int
+simplebus_teardown_intr(device_t bus, device_t child, struct resource *res,
+    void *cookie)
+{
+	device_t ic;
+
+	if ((ic = simplebus_get_interrupt_parent(child)) != NULL)
+		return (FDT_IC_TEARDOWN_INTR(ic, child, res, cookie));
+
+	return (bus_generic_teardown_intr(bus, child, res, cookie));
+}
+
 static const struct ofw_bus_devinfo *
 simplebus_get_devinfo(device_t bus, device_t child)
 {
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 5883b6bc54b..e7d6fa63c30 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -83,6 +83,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_mib.h>
 #include <net/if_media.h>
diff --git a/sys/dev/fe/if_fe_pccard.c b/sys/dev/fe/if_fe_pccard.c
index ee101c641ca..b7c644eaa72 100644
--- a/sys/dev/fe/if_fe_pccard.c
+++ b/sys/dev/fe/if_fe_pccard.c
@@ -28,7 +28,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 
 #include <sys/bus.h>
 #include <machine/bus.h>
@@ -36,6 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_mib.h>
 #include <net/if_media.h>
 
diff --git a/sys/dev/ffec/if_ffec.c b/sys/dev/ffec/if_ffec.c
new file mode 100644
index 00000000000..d3f2e635dc0
--- /dev/null
+++ b/sys/dev/ffec/if_ffec.c
@@ -0,0 +1,1758 @@
+/*-
+ * Copyright (c) 2013 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.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Driver for Freescale Fast Ethernet Controller, found on imx-series SoCs among
+ * others.  Also works for the ENET Gigibit controller found on imx6 and imx28,
+ * but the driver doesn't currently use any of the ENET advanced features other
+ * than enabling gigabit.
+ *
+ * The interface name 'fec' is already taken by netgraph's Fast Etherchannel
+ * (netgraph/ng_fec.c), so we use 'ffec'.
+ *
+ * Requires an FDT entry with at least these properties:
+ *   fec: ethernet@02188000 {
+ *      compatible = "fsl,imxNN-fec";
+ *      reg = <0x02188000 0x4000>;
+ *      interrupts = <150 151>;
+ *      phy-mode = "rgmii";
+ *      phy-disable-preamble; // optional
+ *   };
+ * The second interrupt number is for IEEE-1588, and is not currently used; it
+ * need not be present.  phy-mode must be one of: "mii", "rmii", "rgmii".
+ * There is also an optional property, phy-disable-preamble, which if present
+ * will disable the preamble bits, cutting the size of each mdio transaction
+ * (and thus the busy-wait time) in half.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/endian.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/rman.h>
+#include <sys/socket.h>
+#include <sys/sockio.h>
+#include <sys/sysctl.h>
+
+#include <machine/bus.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 <dev/ffec/if_ffecreg.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/mii/mii.h>
+#include <dev/mii/miivar.h>
+#include "miibus_if.h"
+
+/*
+ * There are small differences in the hardware on various SoCs.  Not every SoC
+ * we support has its own FECTYPE; most work as GENERIC and only the ones that
+ * need different handling get their own entry.  In addition to the types in
+ * this list, there are some flags below that can be ORed into the upper bits.
+ */
+enum {
+	FECTYPE_NONE,
+	FECTYPE_GENERIC,
+	FECTYPE_IMX53,
+	FECTYPE_IMX6,
+};
+
+/*
+ * Flags that describe general differences between the FEC hardware in various
+ * SoCs.  These are ORed into the FECTYPE enum values.
+ */
+#define	FECTYPE_MASK		0x0000ffff
+#define	FECFLAG_GBE		(0x0001 << 16)
+
+/*
+ * Table of supported FDT compat strings and their associated FECTYPE values.
+ */
+static struct ofw_compat_data compat_data[] = {
+	{"fsl,imx51-fec",	FECTYPE_GENERIC},
+	{"fsl,imx53-fec",	FECTYPE_IMX53},
+	{"fsl,imx6q-fec",	FECTYPE_IMX6 | FECFLAG_GBE},
+	{"fsl,mvf600-fec",	FECTYPE_GENERIC},
+	{"fsl,vf-fec",		FECTYPE_GENERIC},
+	{NULL,		 	FECTYPE_NONE},
+};
+
+/*
+ * Driver data and defines.
+ */
+#define	RX_DESC_COUNT	64
+#define	RX_DESC_SIZE	(sizeof(struct ffec_hwdesc) * RX_DESC_COUNT)
+#define	TX_DESC_COUNT	64
+#define	TX_DESC_SIZE	(sizeof(struct ffec_hwdesc) * TX_DESC_COUNT)
+
+#define	WATCHDOG_TIMEOUT_SECS	5
+#define	STATS_HARVEST_INTERVAL	3
+
+struct ffec_bufmap {
+	struct mbuf	*mbuf;
+	bus_dmamap_t	map;
+};
+
+enum {
+	PHY_CONN_UNKNOWN,
+	PHY_CONN_MII,
+	PHY_CONN_RMII,
+	PHY_CONN_RGMII
+};
+
+struct ffec_softc {
+	device_t		dev;
+	device_t		miibus;
+	struct mii_data *	mii_softc;
+	struct ifnet		*ifp;
+	int			if_flags;
+	struct mtx		mtx;
+	struct resource		*irq_res;
+	struct resource		*mem_res;
+	void *			intr_cookie;
+	struct callout		ffec_callout;
+	uint8_t			phy_conn_type;
+	uint8_t			fectype;
+	boolean_t		link_is_up;
+	boolean_t		is_attached;
+	boolean_t		is_detaching;
+	int			tx_watchdog_count;
+	int			stats_harvest_count;
+
+	bus_dma_tag_t		rxdesc_tag;
+	bus_dmamap_t		rxdesc_map;
+	struct ffec_hwdesc	*rxdesc_ring;
+	bus_addr_t		rxdesc_ring_paddr;
+	bus_dma_tag_t		rxbuf_tag;
+	struct ffec_bufmap	rxbuf_map[RX_DESC_COUNT];
+	uint32_t		rx_idx;
+
+	bus_dma_tag_t		txdesc_tag;
+	bus_dmamap_t		txdesc_map;
+	struct ffec_hwdesc	*txdesc_ring;
+	bus_addr_t		txdesc_ring_paddr;
+	bus_dma_tag_t		txbuf_tag;
+	struct ffec_bufmap	txbuf_map[RX_DESC_COUNT];
+	uint32_t		tx_idx_head;
+	uint32_t		tx_idx_tail;
+	int			txcount;
+};
+
+#define	FFEC_LOCK(sc)			mtx_lock(&(sc)->mtx)
+#define	FFEC_UNLOCK(sc)			mtx_unlock(&(sc)->mtx)
+#define	FFEC_LOCK_INIT(sc)		mtx_init(&(sc)->mtx, \
+	    device_get_nameunit((sc)->dev), MTX_NETWORK_LOCK, MTX_DEF)
+#define	FFEC_LOCK_DESTROY(sc)		mtx_destroy(&(sc)->mtx);
+#define	FFEC_ASSERT_LOCKED(sc)		mtx_assert(&(sc)->mtx, MA_OWNED);
+#define	FFEC_ASSERT_UNLOCKED(sc)	mtx_assert(&(sc)->mtx, MA_NOTOWNED);
+
+static void ffec_init_locked(struct ffec_softc *sc);
+static void ffec_stop_locked(struct ffec_softc *sc);
+static void ffec_txstart_locked(struct ffec_softc *sc);
+static void ffec_txfinish_locked(struct ffec_softc *sc);
+
+static inline uint16_t
+RD2(struct ffec_softc *sc, bus_size_t off)
+{
+
+	return (bus_read_2(sc->mem_res, off));
+}
+
+static inline void
+WR2(struct ffec_softc *sc, bus_size_t off, uint16_t val)
+{
+
+	bus_write_2(sc->mem_res, off, val);
+}
+
+static inline uint32_t
+RD4(struct ffec_softc *sc, bus_size_t off)
+{
+
+	return (bus_read_4(sc->mem_res, off));
+}
+
+static inline void
+WR4(struct ffec_softc *sc, bus_size_t off, uint32_t val)
+{
+
+	bus_write_4(sc->mem_res, off, val);
+}
+
+static inline uint32_t
+next_rxidx(struct ffec_softc *sc, uint32_t curidx)
+{
+
+	return ((curidx == RX_DESC_COUNT - 1) ? 0 : curidx + 1);
+}
+
+static inline uint32_t
+next_txidx(struct ffec_softc *sc, uint32_t curidx)
+{
+
+	return ((curidx == TX_DESC_COUNT - 1) ? 0 : curidx + 1);
+}
+
+static void
+ffec_get1paddr(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
+{
+
+	if (error != 0)
+		return;
+	*(bus_addr_t *)arg = segs[0].ds_addr;
+}
+
+static void
+ffec_miigasket_setup(struct ffec_softc *sc)
+{
+	uint32_t ifmode;
+
+	/*
+	 * We only need the gasket for MII and RMII connections on certain SoCs.
+	 */
+
+	switch (sc->fectype & FECTYPE_MASK)
+	{
+	case FECTYPE_IMX53:
+		break;
+	default:
+		return;
+	}
+
+	switch (sc->phy_conn_type)
+	{
+	case PHY_CONN_MII:
+		ifmode = 0;
+		break;
+	case PHY_CONN_RMII:
+		ifmode = FEC_MIIGSK_CFGR_IF_MODE_RMII;
+		break;
+	default:
+		return;
+	}
+
+	/*
+	 * Disable the gasket, configure for either MII or RMII, then enable.
+	 */
+
+	WR2(sc, FEC_MIIGSK_ENR, 0);
+	while (RD2(sc, FEC_MIIGSK_ENR) & FEC_MIIGSK_ENR_READY)
+		continue;
+
+	WR2(sc, FEC_MIIGSK_CFGR, ifmode);
+
+	WR2(sc, FEC_MIIGSK_ENR, FEC_MIIGSK_ENR_EN);
+	while (!(RD2(sc, FEC_MIIGSK_ENR) & FEC_MIIGSK_ENR_READY))
+		continue;
+}
+
+static boolean_t
+ffec_miibus_iowait(struct ffec_softc *sc)
+{
+	uint32_t timeout;
+
+	for (timeout = 10000; timeout != 0; --timeout)
+		if (RD4(sc, FEC_IER_REG) & FEC_IER_MII)
+			return (true);
+
+	return (false);
+}
+
+static int
+ffec_miibus_readreg(device_t dev, int phy, int reg)
+{
+	struct ffec_softc *sc;
+	int val;
+
+	sc = device_get_softc(dev);
+
+	WR4(sc, FEC_IER_REG, FEC_IER_MII);
+
+	WR4(sc, FEC_MMFR_REG, FEC_MMFR_OP_READ |
+	    FEC_MMFR_ST_VALUE | FEC_MMFR_TA_VALUE |
+	    ((phy << FEC_MMFR_PA_SHIFT) & FEC_MMFR_PA_MASK) |
+	    ((reg << FEC_MMFR_RA_SHIFT) & FEC_MMFR_RA_MASK));
+
+	if (!ffec_miibus_iowait(sc)) {
+		device_printf(dev, "timeout waiting for mii read\n");
+		return (-1); /* All-ones is a symptom of bad mdio. */
+	}
+
+	val = RD4(sc, FEC_MMFR_REG) & FEC_MMFR_DATA_MASK;
+
+	return (val);
+}
+
+static int
+ffec_miibus_writereg(device_t dev, int phy, int reg, int val)
+{
+	struct ffec_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	WR4(sc, FEC_IER_REG, FEC_IER_MII);
+
+	WR4(sc, FEC_MMFR_REG, FEC_MMFR_OP_WRITE |
+	    FEC_MMFR_ST_VALUE | FEC_MMFR_TA_VALUE |
+	    ((phy << FEC_MMFR_PA_SHIFT) & FEC_MMFR_PA_MASK) |
+	    ((reg << FEC_MMFR_RA_SHIFT) & FEC_MMFR_RA_MASK) |
+	    (val & FEC_MMFR_DATA_MASK));
+
+	if (!ffec_miibus_iowait(sc)) {
+		device_printf(dev, "timeout waiting for mii write\n");
+		return (-1);
+	}
+
+	return (0);
+}
+
+static void
+ffec_miibus_statchg(device_t dev)
+{
+	struct ffec_softc *sc;
+	struct mii_data *mii;
+	uint32_t ecr, rcr, tcr;
+
+	/*
+	 * Called by the MII bus driver when the PHY establishes link to set the
+	 * MAC interface registers.
+	 */
+
+	sc = device_get_softc(dev);
+
+	FFEC_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;
+
+	ecr = RD4(sc, FEC_ECR_REG) & ~FEC_ECR_SPEED;
+	rcr = RD4(sc, FEC_RCR_REG) & ~(FEC_RCR_RMII_10T | FEC_RCR_RMII_MODE |
+	    FEC_RCR_RGMII_EN | FEC_RCR_DRT | FEC_RCR_FCE);
+	tcr = RD4(sc, FEC_TCR_REG) & ~FEC_TCR_FDEN;
+
+	rcr |= FEC_RCR_MII_MODE; /* Must always be on even for R[G]MII. */
+	switch (sc->phy_conn_type) {
+	case PHY_CONN_MII:
+		break;
+	case PHY_CONN_RMII:
+		rcr |= FEC_RCR_RMII_MODE;
+		break;
+	case PHY_CONN_RGMII:
+		rcr |= FEC_RCR_RGMII_EN;
+		break;
+	}
+
+	switch (IFM_SUBTYPE(mii->mii_media_active)) {
+	case IFM_1000_T:
+	case IFM_1000_SX:
+		ecr |= FEC_ECR_SPEED;
+		break;
+	case IFM_100_TX:
+		/* Not-FEC_ECR_SPEED + not-FEC_RCR_RMII_10T means 100TX */
+		break;
+	case IFM_10_T:
+		rcr |= FEC_RCR_RMII_10T;
+		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)
+		tcr |= FEC_TCR_FDEN;
+	else
+		rcr |= FEC_RCR_DRT;
+
+	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FLOW) != 0)
+		rcr |= FEC_RCR_FCE;
+
+	WR4(sc, FEC_RCR_REG, rcr);
+	WR4(sc, FEC_TCR_REG, tcr);
+	WR4(sc, FEC_ECR_REG, ecr);
+}
+
+static void
+ffec_media_status(struct ifnet * ifp, struct ifmediareq *ifmr)
+{
+	struct ffec_softc *sc;
+	struct mii_data *mii;
+
+
+	sc = ifp->if_softc;
+	mii = sc->mii_softc;
+	FFEC_LOCK(sc);
+	mii_pollstat(mii);
+	ifmr->ifm_active = mii->mii_media_active;
+	ifmr->ifm_status = mii->mii_media_status;
+	FFEC_UNLOCK(sc);
+}
+
+static int
+ffec_media_change_locked(struct ffec_softc *sc)
+{
+
+	return (mii_mediachg(sc->mii_softc));
+}
+
+static int
+ffec_media_change(struct ifnet * ifp)
+{
+	struct ffec_softc *sc;
+	int error;
+
+	sc = ifp->if_softc;
+
+	FFEC_LOCK(sc);
+	error = ffec_media_change_locked(sc);
+	FFEC_UNLOCK(sc);
+	return (error);
+}
+
+static void ffec_clear_stats(struct ffec_softc *sc)
+{
+
+	WR4(sc, FEC_RMON_R_PACKETS, 0);
+	WR4(sc, FEC_RMON_R_MC_PKT, 0);
+	WR4(sc, FEC_RMON_R_CRC_ALIGN, 0);
+	WR4(sc, FEC_RMON_R_UNDERSIZE, 0);
+	WR4(sc, FEC_RMON_R_OVERSIZE, 0);
+	WR4(sc, FEC_RMON_R_FRAG, 0);
+	WR4(sc, FEC_RMON_R_JAB, 0);
+	WR4(sc, FEC_RMON_T_PACKETS, 0);
+	WR4(sc, FEC_RMON_T_MC_PKT, 0);
+	WR4(sc, FEC_RMON_T_CRC_ALIGN, 0);
+	WR4(sc, FEC_RMON_T_UNDERSIZE, 0);
+	WR4(sc, FEC_RMON_T_OVERSIZE , 0);
+	WR4(sc, FEC_RMON_T_FRAG, 0);
+	WR4(sc, FEC_RMON_T_JAB, 0);
+	WR4(sc, FEC_RMON_T_COL, 0);
+}
+
+static void
+ffec_harvest_stats(struct ffec_softc *sc)
+{
+	struct ifnet *ifp;
+
+	/* We don't need to harvest too often. */
+	if (++sc->stats_harvest_count < STATS_HARVEST_INTERVAL)
+		return;
+
+	/*
+	 * Try to avoid harvesting unless the IDLE flag is on, but if it has
+	 * been too long just go ahead and do it anyway, the worst that'll
+	 * happen is we'll lose a packet count or two as we clear at the end.
+	 */
+	if (sc->stats_harvest_count < (2 * STATS_HARVEST_INTERVAL) &&
+	    ((RD4(sc, FEC_MIBC_REG) & FEC_MIBC_IDLE) == 0))
+		return;
+
+	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);
+
+	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);
+
+	ifp->if_collisions += RD4(sc, FEC_RMON_T_COL);
+
+	ffec_clear_stats(sc);
+}
+
+static void
+ffec_tick(void *arg)
+{
+	struct ffec_softc *sc;
+	struct ifnet *ifp;
+	int link_was_up;
+
+	sc = arg;
+
+	FFEC_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) {
+			ffec_txfinish_locked(sc);
+		}
+	}
+
+	/* Gather stats from hardware counters. */
+	ffec_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)
+		ffec_txstart_locked(sc);
+
+	/* Schedule another check one second from now. */
+	callout_reset(&sc->ffec_callout, hz, ffec_tick, sc);
+}
+
+inline static uint32_t
+ffec_setup_txdesc(struct ffec_softc *sc, int idx, bus_addr_t paddr, 
+    uint32_t len)
+{
+	uint32_t nidx;
+	uint32_t flags;
+
+	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 = FEC_TXDESC_READY | FEC_TXDESC_L | FEC_TXDESC_TC;
+		++sc->txcount;
+	}
+	if (nidx == 0)
+		flags |= FEC_TXDESC_WRAP;
+
+	/*
+	 * The hardware requires 32-bit physical addresses.  We set up the dma
+	 * tag to indicate that, so the cast to uint32_t should never lose
+	 * significant bits.
+	 */
+	sc->txdesc_ring[idx].buf_paddr = (uint32_t)paddr;
+	sc->txdesc_ring[idx].flags_len = flags | len; /* Must be set last! */
+
+	return (nidx);
+}
+
+static int
+ffec_setup_txbuf(struct ffec_softc *sc, int idx, struct mbuf **mp)
+{
+	struct mbuf * m;
+	int error, nsegs;
+	struct bus_dma_segment seg;
+
+	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);
+	}
+	bus_dmamap_sync(sc->txbuf_tag, sc->txbuf_map[idx].map, 
+	    BUS_DMASYNC_PREWRITE);
+
+	sc->txbuf_map[idx].mbuf = m;
+	ffec_setup_txdesc(sc, idx, seg.ds_addr, seg.ds_len);
+
+	return (0);
+
+}
+
+static void
+ffec_txstart_locked(struct ffec_softc *sc)
+{
+	struct ifnet *ifp;
+	struct mbuf *m;
+	int enqueued;
+
+	FFEC_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 (ffec_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) {
+		WR4(sc, FEC_TDAR_REG, FEC_TDAR_TDAR);
+		sc->tx_watchdog_count = WATCHDOG_TIMEOUT_SECS;
+	}
+}
+
+static void
+ffec_txstart(struct ifnet *ifp)
+{
+	struct ffec_softc *sc = ifp->if_softc;
+
+	FFEC_LOCK(sc);
+	ffec_txstart_locked(sc);
+	FFEC_UNLOCK(sc);
+}
+
+static void
+ffec_txfinish_locked(struct ffec_softc *sc)
+{
+	struct ifnet *ifp;
+	struct ffec_hwdesc *desc;
+	struct ffec_bufmap *bmap;
+	boolean_t retired_buffer;
+
+	FFEC_ASSERT_LOCKED(sc);
+
+	ifp = sc->ifp;
+	retired_buffer = false;
+	while (sc->tx_idx_tail != sc->tx_idx_head) {
+		desc = &sc->txdesc_ring[sc->tx_idx_tail];
+		if (desc->flags_len & FEC_TXDESC_READY)
+			break;
+		retired_buffer = true;
+		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;
+		ffec_setup_txdesc(sc, sc->tx_idx_tail, 0, 0);
+		sc->tx_idx_tail = next_txidx(sc, sc->tx_idx_tail);
+	}
+
+	/*
+	 * If we retired any buffers, there will be open tx slots available in
+	 * the descriptor ring, go try to start some new output.
+	 */
+	if (retired_buffer) {
+		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+		ffec_txstart_locked(sc);
+	}
+
+	/* If there are no buffers outstanding, muzzle the watchdog. */
+	if (sc->tx_idx_tail == sc->tx_idx_head) {
+		sc->tx_watchdog_count = 0;
+	}
+}
+
+inline static uint32_t
+ffec_setup_rxdesc(struct ffec_softc *sc, int idx, bus_addr_t paddr)
+{
+	uint32_t nidx;
+
+	/*
+	 * The hardware requires 32-bit physical addresses.  We set up the dma
+	 * tag to indicate that, so the cast to uint32_t should never lose
+	 * significant bits.
+	 */
+	nidx = next_rxidx(sc, idx);
+	sc->rxdesc_ring[idx].buf_paddr = (uint32_t)paddr;
+	sc->rxdesc_ring[idx].flags_len = FEC_RXDESC_EMPTY | 
+		((nidx == 0) ? FEC_RXDESC_WRAP : 0);
+
+	return (nidx);
+}
+
+static int
+ffec_setup_rxbuf(struct ffec_softc *sc, int idx, struct mbuf * m)
+{
+	int error, nsegs;
+	struct bus_dma_segment seg;
+
+	/*
+	 * We need to leave at least ETHER_ALIGN bytes free at the beginning of
+	 * the buffer to allow the data to be re-aligned after receiving it (by
+	 * copying it backwards ETHER_ALIGN bytes in the same buffer).  We also
+	 * have to ensure that the beginning of the buffer is aligned to the
+	 * hardware's requirements.
+	 */
+	m_adj(m, roundup(ETHER_ALIGN, FEC_RXBUF_ALIGN));
+
+	error = bus_dmamap_load_mbuf_sg(sc->rxbuf_tag, sc->rxbuf_map[idx].map,
+	    m, &seg, &nsegs, 0);
+	if (error != 0) {
+		return (error);
+	}
+
+	bus_dmamap_sync(sc->rxbuf_tag, sc->rxbuf_map[idx].map, 
+	    BUS_DMASYNC_PREREAD);
+
+	sc->rxbuf_map[idx].mbuf = m;
+	ffec_setup_rxdesc(sc, idx, seg.ds_addr);
+	
+	return (0);
+}
+
+static struct mbuf *
+ffec_alloc_mbufcl(struct ffec_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
+ffec_rxfinish_onebuf(struct ffec_softc *sc, int len)
+{
+	struct mbuf *m, *newmbuf;
+	struct ffec_bufmap *bmap;
+	uint8_t *dst, *src;
+	int error;
+
+	/*
+	 *  First try to get a new mbuf to plug into this slot in the rx ring.
+	 *  If that fails, drop the current packet and recycle the current
+	 *  mbuf, which is still mapped and loaded.
+	 */
+	if ((newmbuf = ffec_alloc_mbufcl(sc)) == NULL) {
+		++sc->ifp->if_iqdrops;
+		ffec_setup_rxdesc(sc, sc->rx_idx, 
+		    sc->rxdesc_ring[sc->rx_idx].buf_paddr);
+		return;
+	}
+
+	/*
+	 *  Unfortunately, the protocol headers need to be aligned on a 32-bit
+	 *  boundary for the upper layers.  The hardware requires receive
+	 *  buffers to be 16-byte aligned.  The ethernet header is 14 bytes,
+	 *  leaving the protocol header unaligned.  We used m_adj() after
+	 *  allocating the buffer to leave empty space at the start of the
+	 *  buffer, now we'll use the alignment agnostic bcopy() routine to
+	 *  shuffle all the data backwards 2 bytes and adjust m_data.
+	 *
+	 *  XXX imx6 hardware is able to do this 2-byte alignment by setting the
+	 *  SHIFT16 bit in the RACC register.  Older hardware doesn't have that
+	 *  feature, but for them could we speed this up by copying just the
+	 *  protocol headers into their own small mbuf then chaining the cluster
+	 *  to it?  That way we'd only need to copy like 64 bytes or whatever
+	 *  the biggest header is, instead of the whole 1530ish-byte frame.
+	 */
+
+	FFEC_UNLOCK(sc);
+
+	bmap = &sc->rxbuf_map[sc->rx_idx];
+	len -= ETHER_CRC_LEN;
+	bus_dmamap_sync(sc->rxbuf_tag, bmap->map, BUS_DMASYNC_POSTREAD);
+	bus_dmamap_unload(sc->rxbuf_tag, bmap->map);
+	m = bmap->mbuf;
+	bmap->mbuf = NULL;
+	m->m_len = len;
+	m->m_pkthdr.len = len;
+	m->m_pkthdr.rcvif = sc->ifp;
+
+	src = mtod(m, uint8_t*);
+	dst = src - ETHER_ALIGN;
+	bcopy(src, dst, len);
+	m->m_data = dst;
+	sc->ifp->if_input(sc->ifp, m);
+
+	FFEC_LOCK(sc);
+
+	if ((error = ffec_setup_rxbuf(sc, sc->rx_idx, newmbuf)) != 0) {
+		device_printf(sc->dev, "ffec_setup_rxbuf error %d\n", error);
+		/* XXX Now what?  We've got a hole in the rx ring. */
+	}
+
+}
+
+static void
+ffec_rxfinish_locked(struct ffec_softc *sc)
+{
+	struct ffec_hwdesc *desc;
+	int len;
+	boolean_t produced_empty_buffer;
+
+	FFEC_ASSERT_LOCKED(sc);
+
+	produced_empty_buffer = false;
+	for (;;) {
+		desc = &sc->rxdesc_ring[sc->rx_idx];
+		if (desc->flags_len & FEC_RXDESC_EMPTY)
+			break;
+		produced_empty_buffer = true;
+		len = (desc->flags_len & FEC_RXDESC_LEN_MASK);
+		if (len < 64) {
+			/*
+			 * Just recycle the descriptor and continue.           .
+			 */
+			ffec_setup_rxdesc(sc, sc->rx_idx,
+			    sc->rxdesc_ring[sc->rx_idx].buf_paddr);
+		} else if ((desc->flags_len & FEC_RXDESC_L) == 0) {
+			/*
+			 * The entire frame is not in this buffer.  Impossible.
+			 * Recycle the descriptor and continue.
+			 *
+			 * XXX what's the right way to handle this? Probably we
+			 * should stop/init the hardware because this should
+			 * just really never happen when we have buffers bigger
+			 * than the maximum frame size.
+			 */
+			device_printf(sc->dev, 
+			    "fec_rxfinish: received frame without LAST bit set");
+			ffec_setup_rxdesc(sc, sc->rx_idx, 
+			    sc->rxdesc_ring[sc->rx_idx].buf_paddr);
+		} else if (desc->flags_len & FEC_RXDESC_ERROR_BITS) {
+			/*
+			 *  Something went wrong with receiving the frame, we
+			 *  don't care what (the hardware has counted the error
+			 *  in the stats registers already), we just reuse the
+			 *  same mbuf, which is still dma-mapped, by resetting
+			 *  the rx descriptor.
+			 */
+			ffec_setup_rxdesc(sc, sc->rx_idx, 
+			    sc->rxdesc_ring[sc->rx_idx].buf_paddr);
+		} else {
+			/*
+			 *  Normal case: a good frame all in one buffer.
+			 */
+			ffec_rxfinish_onebuf(sc, len);
+		}
+		sc->rx_idx = next_rxidx(sc, sc->rx_idx);
+	}
+
+	if (produced_empty_buffer) {
+		WR4(sc, FEC_RDAR_REG, FEC_RDAR_RDAR);
+	}
+}
+
+static void
+ffec_get_hwaddr(struct ffec_softc *sc, uint8_t *hwaddr)
+{
+	uint32_t palr, paur, rnd;
+
+	/*
+	 * 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.
+	 */
+	palr = RD4(sc, FEC_PALR_REG);
+	paur = RD4(sc, FEC_PAUR_REG) & FEC_PAUR_PADDR2_MASK;
+	if ((palr | paur) != 0) {
+		hwaddr[0] = palr >> 24;
+		hwaddr[1] = palr >> 16;
+		hwaddr[2] = palr >>  8;
+		hwaddr[3] = palr >>  0;
+		hwaddr[4] = paur >> 24;
+		hwaddr[5] = paur >> 16;
+	} 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;
+	}
+
+	if (bootverbose) {
+		device_printf(sc->dev,
+		    "MAC address %02x:%02x:%02x:%02x:%02x:%02x:\n",
+		    hwaddr[0], hwaddr[1], hwaddr[2], 
+		    hwaddr[3], hwaddr[4], hwaddr[5]);
+	}
+}
+
+static void
+ffec_setup_rxfilter(struct ffec_softc *sc)
+{
+	struct ifnet *ifp;
+	struct ifmultiaddr *ifma;
+	uint8_t *eaddr;
+	uint32_t crc;
+	uint64_t ghash, ihash;
+
+	FFEC_ASSERT_LOCKED(sc);
+
+	ifp = sc->ifp;
+
+	/*
+	 * Set the multicast (group) filter hash.
+	 */
+	if ((ifp->if_flags & IFF_ALLMULTI))
+		ghash = 0xffffffffffffffffLLU;
+	else {
+		ghash = 0;
+		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_be(LLADDR((struct sockaddr_dl *)
+			    ifma->ifma_addr), ETHER_ADDR_LEN);
+			ghash |= 1 << (crc & 0x3f);
+		}
+		if_maddr_runlock(ifp);
+	}
+	WR4(sc, FEC_GAUR_REG, (uint32_t)(ghash >> 32));
+	WR4(sc, FEC_GALR_REG, (uint32_t)ghash);
+
+	/*
+	 * Set the individual address filter hash.
+	 *
+	 * XXX Is 0 the right value when promiscuous is off?  This hw feature
+	 * seems to support the concept of MAC address aliases, does such a
+	 * thing even exist?
+	 */
+	if ((ifp->if_flags & IFF_PROMISC))
+		ihash = 0xffffffffffffffffLLU;
+	else {
+		ihash = 0;
+	}
+	WR4(sc, FEC_IAUR_REG, (uint32_t)(ihash >> 32));
+	WR4(sc, FEC_IALR_REG, (uint32_t)ihash);
+
+	/*
+	 * Set the primary address.
+	 */
+	eaddr = IF_LLADDR(ifp);
+	WR4(sc, FEC_PALR_REG, (eaddr[0] << 24) | (eaddr[1] << 16) |
+	    (eaddr[2] <<  8) | eaddr[3]);
+	WR4(sc, FEC_PAUR_REG, (eaddr[4] << 24) | (eaddr[5] << 16));
+}
+
+static void
+ffec_stop_locked(struct ffec_softc *sc)
+{
+	struct ifnet *ifp;
+	struct ffec_hwdesc *desc;
+	struct ffec_bufmap *bmap;
+	int idx;
+
+	FFEC_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;
+
+	/* 
+	 * Stop the hardware, mask all interrupts, and clear all current
+	 * interrupt status bits.
+	 */
+	WR4(sc, FEC_ECR_REG, RD4(sc, FEC_ECR_REG) & ~FEC_ECR_ETHEREN);
+	WR4(sc, FEC_IEM_REG, 0x00000000);
+	WR4(sc, FEC_IER_REG, 0xffffffff);
+
+	/*
+	 * Stop the media-check callout.  Do not use callout_drain() because
+	 * we're holding a mutex the callout acquires, and if it's currently
+	 * waiting to acquire it, we'd deadlock.  If it is waiting now, the
+	 * ffec_tick() routine will return without doing anything when it sees
+	 * that IFF_DRV_RUNNING is not set, so avoiding callout_drain() is safe.
+	 */
+	callout_stop(&sc->ffec_callout);
+
+	/*
+	 * Discard all untransmitted buffers.  Each buffer is simply freed;
+	 * it's as if the bits were transmitted and then lost on the wire.
+	 *
+	 * XXX Is this right?  Or should we use IFQ_DRV_PREPEND() to put them
+	 * back on the queue for when we get restarted later?
+	 */
+	idx = sc->tx_idx_tail;
+	while (idx != sc->tx_idx_head) {
+		desc = &sc->txdesc_ring[idx];
+		bmap = &sc->txbuf_map[idx];
+		if (desc->buf_paddr != 0) {
+			bus_dmamap_unload(sc->txbuf_tag, bmap->map);
+			m_freem(bmap->mbuf);
+			bmap->mbuf = NULL;
+			ffec_setup_txdesc(sc, idx, 0, 0);
+		}
+		idx = next_txidx(sc, idx);
+	}
+
+	/*
+	 * Discard all unprocessed receive buffers.  This amounts to just
+	 * pretending that nothing ever got received into them.  We reuse the
+	 * mbuf already mapped for each desc, simply turning the EMPTY flags
+	 * back on so they'll get reused when we start up again.
+	 */
+	for (idx = 0; idx < RX_DESC_COUNT; ++idx) {
+		desc = &sc->rxdesc_ring[idx];
+		ffec_setup_rxdesc(sc, idx, desc->buf_paddr);
+	}
+}
+
+static void
+ffec_init_locked(struct ffec_softc *sc)
+{
+	struct ifnet *ifp = sc->ifp;
+	uint32_t maxbuf, maxfl, regval;
+
+	FFEC_ASSERT_LOCKED(sc);
+
+	/*
+	 * The hardware has a limit of 0x7ff as the max frame length (see
+	 * comments for MRBR below), and we use mbuf clusters as receive
+	 * buffers, and we currently are designed to receive an entire frame
+	 * into a single buffer.
+	 *
+	 * We start with a MCLBYTES-sized cluster, but we have to offset into
+	 * the buffer by ETHER_ALIGN to make room for post-receive re-alignment,
+	 * and then that value has to be rounded up to the hardware's DMA
+	 * alignment requirements, so all in all our buffer is that much smaller
+	 * than MCLBYTES.
+	 *
+	 * The resulting value is used as the frame truncation length and the
+	 * max buffer receive buffer size for now.  It'll become more complex
+	 * when we support jumbo frames and receiving fragments of them into
+	 * separate buffers.
+	 */
+	maxbuf = MCLBYTES - roundup(ETHER_ALIGN, FEC_RXBUF_ALIGN);
+	maxfl = min(maxbuf, 0x7ff);
+
+	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		return;
+
+	/* Mask all interrupts and clear all current interrupt status bits. */
+	WR4(sc, FEC_IEM_REG, 0x00000000);
+	WR4(sc, FEC_IER_REG, 0xffffffff);
+
+	/*
+	 * Go set up palr/puar, galr/gaur, ialr/iaur.
+	 */
+	ffec_setup_rxfilter(sc);
+
+	/*
+	 * TFWR - Transmit FIFO watermark register.
+	 *
+	 * Set the transmit fifo watermark register to "store and forward" mode
+	 * and also set a threshold of 128 bytes in the fifo before transmission
+	 * of a frame begins (to avoid dma underruns).  Recent FEC hardware
+	 * supports STRFWD and when that bit is set, the watermark level in the
+	 * low bits is ignored.  Older hardware doesn't have STRFWD, but writing
+	 * to that bit is innocuous, and the TWFR bits get used instead.
+	 */
+	WR4(sc, FEC_TFWR_REG, FEC_TFWR_STRFWD | FEC_TFWR_TWFR_128BYTE);
+
+	/* RCR - Receive control register.
+	 *
+	 * Set max frame length + clean out anything left from u-boot.
+	 */
+	WR4(sc, FEC_RCR_REG, (maxfl << FEC_RCR_MAX_FL_SHIFT));
+
+	/*
+	 * TCR - Transmit control register.
+	 *
+	 * Clean out anything left from u-boot.  Any necessary values are set in
+	 * ffec_miibus_statchg() based on the media type.
+	 */
+	WR4(sc, FEC_TCR_REG, 0);
+        
+	/*
+	 * OPD - Opcode/pause duration.
+	 *
+	 * XXX These magic numbers come from u-boot.
+	 */
+	WR4(sc, FEC_OPD_REG, 0x00010020);
+
+	/*
+	 * FRSR - Fifo receive start register.
+	 *
+	 * This register does not exist on imx6, it is present on earlier
+	 * hardware. The u-boot code sets this to a non-default value that's 32
+	 * bytes larger than the default, with no clue as to why.  The default
+	 * value should work fine, so there's no code to init it here.
+	 */
+
+	/*
+	 *  MRBR - Max RX buffer size.
+	 *
+	 *  Note: For hardware prior to imx6 this value cannot exceed 0x07ff,
+	 *  but the datasheet says no such thing for imx6.  On the imx6, setting
+	 *  this to 2K without setting EN1588 resulted in a crazy runaway
+	 *  receive loop in the hardware, where every rx descriptor in the ring
+	 *  had its EMPTY flag cleared, no completion or error flags set, and a
+	 *  length of zero.  I think maybe you can only exceed it when EN1588 is
+	 *  set, like maybe that's what enables jumbo frames, because in general
+	 *  the EN1588 flag seems to be the "enable new stuff" vs. "be legacy-
+	 *  compatible" flag.
+	 */
+	WR4(sc, FEC_MRBR_REG, maxfl << FEC_MRBR_R_BUF_SIZE_SHIFT);
+
+	/*
+	 * FTRL - Frame truncation length.
+	 *
+	 * Must be greater than or equal to the value set in FEC_RCR_MAXFL.
+	 */
+	WR4(sc, FEC_FTRL_REG, maxfl);
+
+	/*
+	 * RDSR / TDSR descriptor ring pointers.
+	 *
+	 * When we turn on ECR_ETHEREN at the end, the hardware zeroes its
+	 * internal current descriptor index values for both rings, so we zero
+	 * our index values as well.
+	 */
+	sc->rx_idx = 0;
+	sc->tx_idx_head = sc->tx_idx_tail = 0;
+	sc->txcount = 0;
+	WR4(sc, FEC_RDSR_REG, sc->rxdesc_ring_paddr);
+	WR4(sc, FEC_TDSR_REG, sc->txdesc_ring_paddr);
+
+	/*
+	 * EIM - interrupt mask register.
+	 *
+	 * We always enable the same set of interrupts while running; unlike
+	 * some drivers there's no need to change the mask on the fly depending
+	 * on what operations are in progress.
+	 */
+	WR4(sc, FEC_IEM_REG, FEC_IER_TXF | FEC_IER_RXF | FEC_IER_EBERR);
+
+	/*
+	 * MIBC - MIB control (hardware stats).
+	 */
+	regval = RD4(sc, FEC_MIBC_REG);
+	WR4(sc, FEC_MIBC_REG, regval | FEC_MIBC_DIS);
+	ffec_clear_stats(sc);
+	WR4(sc, FEC_MIBC_REG, regval & ~FEC_MIBC_DIS);
+
+	/*
+	 * ECR - Ethernet control register.
+	 *
+	 * This must happen after all the other config registers are set.  If
+	 * we're running on little-endian hardware, also set the flag for byte-
+	 * swapping descriptor ring entries.  This flag doesn't exist on older
+	 * hardware, but it can be safely set -- the bit position it occupies
+	 * was unused.
+	 */
+	regval = RD4(sc, FEC_ECR_REG);
+#if _BYTE_ORDER == _LITTLE_ENDIAN
+	regval |= FEC_ECR_DBSWP;
+#endif
+	regval |= FEC_ECR_ETHEREN;
+	WR4(sc, FEC_ECR_REG, regval);
+
+	ifp->if_drv_flags |= IFF_DRV_RUNNING;
+
+       /*
+	* Call mii_mediachg() which will call back into ffec_miibus_statchg() to
+	* set up the remaining config registers based on the current media.
+	*/
+	mii_mediachg(sc->mii_softc);
+	callout_reset(&sc->ffec_callout, hz, ffec_tick, sc);
+
+	/*
+	 * Tell the hardware that receive buffers are available.  They were made
+	 * available in ffec_attach() or ffec_stop().
+	 */
+	WR4(sc, FEC_RDAR_REG, FEC_RDAR_RDAR);
+}
+
+static void
+ffec_init(void *if_softc)
+{
+	struct ffec_softc *sc = if_softc;
+
+	FFEC_LOCK(sc);
+	ffec_init_locked(sc);
+	FFEC_UNLOCK(sc);
+}
+
+static void
+ffec_intr(void *arg)
+{
+	struct ffec_softc *sc;
+	uint32_t ier;
+
+	sc = arg;
+
+	FFEC_LOCK(sc);
+
+	ier = RD4(sc, FEC_IER_REG);
+
+	if (ier & FEC_IER_TXF) {
+		WR4(sc, FEC_IER_REG, FEC_IER_TXF);
+		ffec_txfinish_locked(sc);
+	}
+
+	if (ier & FEC_IER_RXF) {
+		WR4(sc, FEC_IER_REG, FEC_IER_RXF);
+		ffec_rxfinish_locked(sc);
+	}
+
+	/*
+	 * We actually don't care about most errors, because the hardware copes
+	 * with them just fine, discarding the incoming bad frame, or forcing a
+	 * bad CRC onto an outgoing bad frame, and counting the errors in the
+	 * stats registers.  The one that really matters is EBERR (DMA bus
+	 * error) because the hardware automatically clears ECR[ETHEREN] and we
+	 * have to restart it here.  It should never happen.
+	 */
+	if (ier & FEC_IER_EBERR) {
+		WR4(sc, FEC_IER_REG, FEC_IER_EBERR);
+		device_printf(sc->dev, 
+		    "Ethernet DMA error, restarting controller.\n");
+		ffec_stop_locked(sc);
+		ffec_init_locked(sc);
+	}
+
+	FFEC_UNLOCK(sc);
+
+}
+
+static int
+ffec_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
+{
+	struct ffec_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:
+		FFEC_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))
+					ffec_setup_rxfilter(sc);
+			} else {
+				if (!sc->is_detaching)
+					ffec_init_locked(sc);
+			}
+		} else {
+			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+				ffec_stop_locked(sc);
+		}
+		sc->if_flags = ifp->if_flags;
+		FFEC_UNLOCK(sc);
+		break;
+
+	case SIOCADDMULTI:
+	case SIOCDELMULTI:
+		if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
+			FFEC_LOCK(sc);
+			ffec_setup_rxfilter(sc);
+			FFEC_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 int
+ffec_detach(device_t dev)
+{
+	struct ffec_softc *sc;
+	bus_dmamap_t map;
+	int idx;
+
+	/*
+	 * NB: This function can be called internally to unwind a failure to
+	 * attach. Make sure a resource got allocated/created before destroying.
+	 */
+
+	sc = device_get_softc(dev);
+
+	if (sc->is_attached) {
+		FFEC_LOCK(sc);
+		sc->is_detaching = true;
+		ffec_stop_locked(sc);
+		FFEC_UNLOCK(sc);
+		callout_drain(&sc->ffec_callout);
+		ether_ifdetach(sc->ifp);
+	}
+
+	/* XXX no miibus detach? */
+
+	/* Clean up RX DMA resources and free mbufs. */
+	for (idx = 0; idx < RX_DESC_COUNT; ++idx) {
+		if ((map = sc->rxbuf_map[idx].map) != NULL) {
+			bus_dmamap_unload(sc->rxbuf_tag, map);
+			bus_dmamap_destroy(sc->rxbuf_tag, map);
+			m_freem(sc->rxbuf_map[idx].mbuf);
+		}
+	}
+	if (sc->rxbuf_tag != NULL)
+		bus_dma_tag_destroy(sc->rxbuf_tag);
+	if (sc->rxdesc_map != NULL) {
+		bus_dmamap_unload(sc->rxdesc_tag, sc->rxdesc_map);
+		bus_dmamap_destroy(sc->rxdesc_tag, sc->rxdesc_map);
+	}
+	if (sc->rxdesc_tag != NULL)
+	bus_dma_tag_destroy(sc->rxdesc_tag);
+
+	/* Clean up TX DMA resources. */
+	for (idx = 0; idx < TX_DESC_COUNT; ++idx) {
+		if ((map = sc->txbuf_map[idx].map) != NULL) {
+			/* TX maps are already unloaded. */
+			bus_dmamap_destroy(sc->txbuf_tag, map);
+		}
+	}
+	if (sc->txbuf_tag != NULL)
+		bus_dma_tag_destroy(sc->txbuf_tag);
+	if (sc->txdesc_map != NULL) {
+		bus_dmamap_unload(sc->txdesc_tag, sc->txdesc_map);
+		bus_dmamap_destroy(sc->txdesc_tag, sc->txdesc_map);
+	}
+	if (sc->txdesc_tag != NULL)
+	bus_dma_tag_destroy(sc->txdesc_tag);
+
+	/* Release bus resources. */
+	if (sc->intr_cookie)
+		bus_teardown_intr(dev, sc->irq_res, sc->intr_cookie);
+
+	if (sc->irq_res != NULL)
+		bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res);
+
+	if (sc->mem_res != NULL)
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->mem_res);
+
+	FFEC_LOCK_DESTROY(sc);
+	return (0);
+}
+
+static int
+ffec_attach(device_t dev)
+{
+	struct ffec_softc *sc;
+	struct ifnet *ifp = NULL;
+	struct mbuf *m;
+	phandle_t ofw_node;
+	int error, rid;
+	uint8_t eaddr[ETHER_ADDR_LEN];
+	char phy_conn_name[32];
+	uint32_t idx, mscr;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	FFEC_LOCK_INIT(sc);
+
+	/*
+	 * There are differences in the implementation and features of the FEC
+	 * hardware on different SoCs, so figure out what type we are.
+	 */
+	sc->fectype = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
+
+	/*
+	 * We have to be told what kind of electrical connection exists between
+	 * the MAC and PHY or we can't operate correctly.
+	 */
+	if ((ofw_node = ofw_bus_get_node(dev)) == -1) {
+		device_printf(dev, "Impossible: Can't find ofw bus node\n");
+		error = ENXIO;
+		goto out;
+	}
+	if (OF_searchprop(ofw_node, "phy-mode", 
+	    phy_conn_name, sizeof(phy_conn_name)) != -1) {
+		if (strcasecmp(phy_conn_name, "mii") == 0)
+			sc->phy_conn_type = PHY_CONN_MII;
+		else if (strcasecmp(phy_conn_name, "rmii") == 0)
+			sc->phy_conn_type = PHY_CONN_RMII;
+		else if (strcasecmp(phy_conn_name, "rgmii") == 0)
+			sc->phy_conn_type = PHY_CONN_RGMII;
+	}
+	if (sc->phy_conn_type == PHY_CONN_UNKNOWN) {
+		device_printf(sc->dev, "No valid 'phy-mode' "
+		    "property found in FDT data for device.\n");
+		error = ENOATTR;
+		goto out;
+	}
+
+	callout_init_mtx(&sc->ffec_callout, &sc->mtx, 0);
+
+	/* Allocate bus resources for accessing the hardware. */
+	rid = 0;
+	sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 
+	    RF_ACTIVE);
+	if (sc->mem_res == NULL) {
+		device_printf(dev, "could not allocate memory resources.\n");
+		error = ENOMEM;
+		goto out;
+	}
+	rid = 0;
+	sc->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE);
+	if (sc->irq_res == NULL) {
+		device_printf(dev, "could not allocate interrupt resources.\n");
+		error = ENOMEM;
+		goto out;
+	}
+
+	/*
+	 * Set up TX descriptor ring, descriptors, and dma maps.
+	 */
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(dev),	/* Parent tag. */
+	    FEC_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, ffec_get1paddr, &sc->txdesc_ring_paddr, 0);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "could not load TX descriptor ring map.\n");
+		goto out;
+	}
+
+	error = bus_dma_tag_create(
+	    bus_get_dma_tag(dev),	/* Parent tag. */
+	    FEC_TXBUF_ALIGN, 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, 0, 
+		    &sc->txbuf_map[idx].map);
+		if (error != 0) {
+			device_printf(sc->dev,
+			    "could not create TX buffer DMA map.\n");
+			goto out;
+		}
+		ffec_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(dev),	/* Parent tag. */
+	    FEC_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, ffec_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(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, 0, 
+		    &sc->rxbuf_map[idx].map);
+		if (error != 0) {
+			device_printf(sc->dev,
+			    "could not create RX buffer DMA map.\n");
+			goto out;
+		}
+		if ((m = ffec_alloc_mbufcl(sc)) == NULL) {
+			device_printf(dev, "Could not alloc mbuf\n");
+			error = ENOMEM;
+			goto out;
+		}
+		if ((error = ffec_setup_rxbuf(sc, idx, m)) != 0) {
+			device_printf(sc->dev,
+			    "could not create new RX buffer.\n");
+			goto out;
+		}
+	}
+
+	/* Try to get the MAC address from the hardware before resetting it. */
+	ffec_get_hwaddr(sc, eaddr);
+
+	/* Reset the hardware.  Disables all interrupts. */
+	WR4(sc, FEC_ECR_REG, FEC_ECR_RESET);
+
+	/* Setup interrupt handler. */
+	error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE,
+	    NULL, ffec_intr, sc, &sc->intr_cookie);
+	if (error != 0) {
+		device_printf(dev, "could not setup interrupt handler.\n");
+		goto out;
+	}
+
+	/*
+	 * Set up the PHY control register.
+	 *
+	 * Speed formula for ENET is md_clock = mac_clock / ((N + 1) * 2).
+	 * Speed formula for FEC is  md_clock = mac_clock / (N * 2)
+	 *
+	 * XXX - Revisit this...
+	 *
+	 * For a Wandboard imx6 (ENET) I was originally using 4, but the uboot
+	 * code uses 10.  Both values seem to work, but I suspect many modern
+	 * PHY parts can do mdio at speeds far above the standard 2.5 MHz.
+	 *
+	 * Different imx manuals use confusingly different terminology (things
+	 * like "system clock" and "internal module clock") with examples that
+	 * use frequencies that have nothing to do with ethernet, giving the
+	 * vague impression that maybe the clock in question is the periphclock
+	 * or something.  In fact, on an imx53 development board (FEC),
+	 * measuring the mdio clock at the pin on the PHY and playing with
+	 * various divisors showed that the root speed was 66 MHz (clk_ipg_root
+	 * aka periphclock) and 13 was the right divisor.
+	 *
+	 * All in all, it seems likely that 13 is a safe divisor for now,
+	 * because if we really do need to base it on the peripheral clock
+	 * speed, then we need a platform-independant get-clock-freq API.
+	 */
+	mscr = 13 << FEC_MSCR_MII_SPEED_SHIFT;
+	if (OF_hasprop(ofw_node, "phy-disable-preamble")) {
+		mscr |= FEC_MSCR_DIS_PRE;
+		if (bootverbose)
+			device_printf(dev, "PHY preamble disabled\n");
+	}
+	WR4(sc, FEC_MSCR_REG, mscr);
+
+	/* 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 = ffec_txstart;
+	ifp->if_ioctl = ffec_ioctl;
+	ifp->if_init = ffec_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_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
+
+#if 0 /* XXX The hardware keeps stats we could use for these. */
+	ifp->if_linkmib = &sc->mibdata;
+	ifp->if_linkmiblen = sizeof(sc->mibdata);
+#endif
+
+	/* Set up the miigasket hardware (if any). */
+	ffec_miigasket_setup(sc);
+
+	/* Attach the mii driver. */
+	error = mii_attach(dev, &sc->miibus, ifp, ffec_media_change,
+	    ffec_media_status, BMSR_DEFCAPMASK, MII_PHY_ANY, MII_OFFSET_ANY, 0);
+	if (error != 0) {
+		device_printf(dev, "PHY attach failed\n");
+		goto out;
+	}
+	sc->mii_softc = device_get_softc(sc->miibus);
+
+	/* All ready to run, attach the ethernet interface. */
+	ether_ifattach(ifp, eaddr);
+	sc->is_attached = true;
+
+	error = 0;
+out:
+
+	if (error != 0)
+		ffec_detach(dev);
+
+	return (error);
+}
+
+static int
+ffec_probe(device_t dev)
+{
+	uintptr_t fectype;
+
+	fectype = ofw_bus_search_compatible(dev, compat_data)->ocd_data;
+	if (fectype == FECTYPE_NONE)
+		return (ENXIO);
+
+	device_set_desc(dev, (fectype & FECFLAG_GBE) ?
+	    "Freescale Gigabit Ethernet Controller" :
+	    "Freescale Fast Ethernet Controller");
+
+	return (BUS_PROBE_DEFAULT);
+}
+
+
+static device_method_t ffec_methods[] = {
+	/* Device interface. */
+	DEVMETHOD(device_probe,		ffec_probe),
+	DEVMETHOD(device_attach,	ffec_attach),
+	DEVMETHOD(device_detach,	ffec_detach),
+
+/*
+	DEVMETHOD(device_shutdown,	ffec_shutdown),
+	DEVMETHOD(device_suspend,	ffec_suspend),
+	DEVMETHOD(device_resume,	ffec_resume),
+*/
+
+	/* MII interface. */
+	DEVMETHOD(miibus_readreg,	ffec_miibus_readreg),
+	DEVMETHOD(miibus_writereg,	ffec_miibus_writereg),
+	DEVMETHOD(miibus_statchg,	ffec_miibus_statchg),
+
+	DEVMETHOD_END
+};
+
+static driver_t ffec_driver = {
+	"ffec",
+	ffec_methods,
+	sizeof(struct ffec_softc)
+};
+
+static devclass_t ffec_devclass;
+
+DRIVER_MODULE(ffec, simplebus, ffec_driver, ffec_devclass, 0, 0);
+DRIVER_MODULE(miibus, ffec, miibus_driver, miibus_devclass, 0, 0);
+
+MODULE_DEPEND(ffec, ether, 1, 1, 1);
+MODULE_DEPEND(ffec, miibus, 1, 1, 1);
diff --git a/sys/dev/ffec/if_ffecreg.h b/sys/dev/ffec/if_ffecreg.h
new file mode 100644
index 00000000000..2233df77004
--- /dev/null
+++ b/sys/dev/ffec/if_ffecreg.h
@@ -0,0 +1,303 @@
+/*-
+ * Copyright (c) 2013 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.
+ *
+ */
+
+#ifndef IF_FFECREG_H
+#define IF_FFECREG_H
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * Hardware defines for Freescale Fast Ethernet Controller.
+ */
+
+/*
+ * MAC registers.
+ */
+#define	FEC_IER_REG			0x0004
+#define	FEC_IEM_REG			0x0008
+#define	  FEC_IER_HBERR			  (1U << 31)
+#define	  FEC_IER_BABR			  (1 << 30)
+#define	  FEC_IER_BABT			  (1 << 29)
+#define	  FEC_IER_GRA			  (1 << 28)
+#define	  FEC_IER_TXF			  (1 << 27)
+#define	  FEC_IER_TXB			  (1 << 26)
+#define	  FEC_IER_RXF			  (1 << 25)
+#define	  FEC_IER_RXB			  (1 << 24)
+#define	  FEC_IER_MII			  (1 << 23)
+#define	  FEC_IER_EBERR			  (1 << 22)
+#define	  FEC_IER_LC			  (1 << 21)
+#define	  FEC_IER_RL			  (1 << 20)
+#define	  FEC_IER_UN			  (1 << 19)
+#define	  FEC_IER_PLR			  (1 << 18)
+#define	  FEC_IER_WAKEUP		  (1 << 17)
+#define	  FEC_IER_AVAIL			  (1 << 16)
+#define	  FEC_IER_TIMER			  (1 << 15)
+
+#define	FEC_RDAR_REG			0x0010
+#define	  FEC_RDAR_RDAR			  (1 << 24)
+
+#define	FEC_TDAR_REG			0x0014
+#define	  FEC_TDAR_TDAR			  (1 << 24)
+
+#define	FEC_ECR_REG			0x0024
+#define	  FEC_ECR_DBSWP			  (1 <<  8)
+#define	  FEC_ECR_STOPEN		  (1 <<  7)
+#define	  FEC_ECR_DBGEN			  (1 <<  6)
+#define	  FEC_ECR_SPEED			  (1 <<  5)
+#define	  FEC_ECR_EN1588		  (1 <<  4)
+#define	  FEC_ECR_SLEEP			  (1 <<  3)
+#define	  FEC_ECR_MAGICEN		  (1 <<  2)
+#define	  FEC_ECR_ETHEREN		  (1 <<  1)
+#define	  FEC_ECR_RESET			  (1 <<  0)
+
+#define	FEC_MMFR_REG			0x0040
+#define	  FEC_MMFR_ST_SHIFT		  30
+#define	  FEC_MMFR_ST_VALUE		  (0x01 << FEC_MMFR_ST_SHIFT)
+#define	  FEC_MMFR_OP_SHIFT		  28
+#define	  FEC_MMFR_OP_WRITE		  (0x01 << FEC_MMFR_OP_SHIFT)
+#define	  FEC_MMFR_OP_READ		  (0x02 << FEC_MMFR_OP_SHIFT)
+#define	  FEC_MMFR_PA_SHIFT		  23
+#define	  FEC_MMFR_PA_MASK		  (0x1f << FEC_MMFR_PA_SHIFT)
+#define	  FEC_MMFR_RA_SHIFT		  18
+#define	  FEC_MMFR_RA_MASK		  (0x1f << FEC_MMFR_RA_SHIFT)
+#define	  FEC_MMFR_TA_SHIFT		  16
+#define	  FEC_MMFR_TA_VALUE		  (0x02 << FEC_MMFR_TA_SHIFT)
+#define	  FEC_MMFR_DATA_SHIFT		  0
+#define	  FEC_MMFR_DATA_MASK		  (0xffff << FEC_MMFR_DATA_SHIFT)
+
+#define	FEC_MSCR_REG			0x0044
+#define	  FEC_MSCR_HOLDTIME_SHIFT	  8
+#define	  FEC_MSCR_HOLDTIME_MASK	  (0x07 << FEC_MSCR_HOLDTIME_SHIFT)
+#define	  FEC_MSCR_DIS_PRE      	  (1 <<  7)
+#define	  FEC_MSCR_MII_SPEED_SHIFT	  1
+#define	  FEC_MSCR_MII_SPEED_MASk	  (0x3f << FEC_MSCR_MII_SPEED_SHIFT)
+
+#define	FEC_MIBC_REG			0x0064
+#define	  FEC_MIBC_DIS			  (1U << 31)
+#define	  FEC_MIBC_IDLE			  (1 << 30)
+#define	  FEC_MIBC_CLEAR		  (1 << 29) /* imx6 only */
+
+#define	FEC_RCR_REG			0x0084
+#define	  FEC_RCR_GRS			  (1U << 31)
+#define	  FEC_RCR_NLC			  (1 << 30)
+#define	  FEC_RCR_MAX_FL_SHIFT		  16
+#define	  FEC_RCR_MAX_FL_MASK		  (0x3fff << FEC_RCR_MAX_FL_SHIFT)
+#define	  FEC_RCR_CFEN			  (1 << 15)
+#define	  FEC_RCR_CRCFWD		  (1 << 14)
+#define	  FEC_RCR_PAUFWD		  (1 << 13)
+#define	  FEC_RCR_PADEN			  (1 << 12)
+#define	  FEC_RCR_RMII_10T		  (1 <<  9)
+#define	  FEC_RCR_RMII_MODE		  (1 <<  8)
+#define	  FEC_RCR_RGMII_EN		  (1 <<  6)
+#define	  FEC_RCR_FCE			  (1 <<  5)
+#define	  FEC_RCR_BC_REJ		  (1 <<  4)
+#define	  FEC_RCR_PROM			  (1 <<  3)
+#define	  FEC_RCR_MII_MODE		  (1 <<  2)
+#define	  FEC_RCR_DRT			  (1 <<  1)
+#define	  FEC_RCR_LOOP			  (1 <<  0)
+
+#define	FEC_TCR_REG			0x00c4
+#define	  FEC_TCR_ADDINS		  (1 <<  9)
+#define	  FEC_TCR_ADDSEL_SHIFT		  5
+#define	  FEC_TCR_ADDSEL_MASK		  (0x07 << FEC_TCR_ADDSEL_SHIFT)
+#define	  FEC_TCR_RFC_PAUSE		  (1 <<  4)
+#define	  FEC_TCR_TFC_PAUSE		  (1 <<  3)
+#define	  FEC_TCR_FDEN			  (1 <<  2)
+#define	  FEC_TCR_GTS			  (1 <<  0)
+
+#define	FEC_PALR_REG			0x00e4
+#define	  FEC_PALR_PADDR1_SHIFT		  0
+#define	  FEC_PALR_PADDR1_MASK		  (0xffffffff << FEC_PALR_PADDR1_SHIFT)
+
+#define	FEC_PAUR_REG			0x00e8
+#define	  FEC_PAUR_PADDR2_SHIFT		  16
+#define	  FEC_PAUR_PADDR2_MASK		  (0xffff << FEC_PAUR_PADDR2_SHIFT)
+#define	  FEC_PAUR_TYPE_VALUE		  (0x8808)
+
+#define	FEC_OPD_REG			0x00ec
+#define	  FEC_OPD_PAUSE_DUR_SHIFT	  0
+#define	  FEC_OPD_PAUSE_DUR_MASK	  (0xffff << FEC_OPD_PAUSE_DUR_SHIFT)
+
+#define	FEC_IAUR_REG			0x0118
+#define	FEC_IALR_REG			0x011c
+
+#define	FEC_GAUR_REG			0x0120
+#define	FEC_GALR_REG			0x0124
+
+#define	FEC_TFWR_REG			0x0144
+#define	  FEC_TFWR_STRFWD		  (1 <<  8)
+#define	  FEC_TFWR_TWFR_SHIFT		  0
+#define	  FEC_TFWR_TWFR_MASK		  (0x3f << FEC_TFWR_TWFR_SHIFT)
+#define	  FEC_TFWR_TWFR_128BYTE		  (0x02 << FEC_TFWR_TWFR_SHIFT)
+
+#define	FEC_RDSR_REG			0x0180
+
+#define	FEC_TDSR_REG			0x0184
+
+#define	FEC_MRBR_REG			0x0188
+#define	  FEC_MRBR_R_BUF_SIZE_SHIFT	  0
+#define	  FEC_MRBR_R_BUF_SIZE_MASK	  (0x3fff << FEC_MRBR_R_BUF_SIZE_SHIFT)
+
+#define	FEC_RSFL_REG			0x0190
+#define	FEC_RSEM_REG			0x0194
+#define	FEC_RAEM_REG			0x0198
+#define	FEC_RAFL_REG			0x019c
+#define	FEC_TSEM_REG			0x01a0
+#define	FEC_TAEM_REG			0x01a4
+#define	FEC_TAFL_REG			0x01a8
+#define	FEC_TIPG_REG			0x01ac
+#define	FEC_FTRL_REG			0x01b0
+
+#define	FEC_TACC_REG			0x01c0
+#define	  FEC_TACC_PROCHK		  (1 <<  4)
+#define	  FEC_TACC_IPCHK		  (1 <<  3)
+#define	  FEC_TACC_SHIFT16		  (1 <<  0)
+
+#define	FEC_RACC_REG			0x01c4
+#define	  FEC_RACC_SHIFT16		  (1 <<  7)
+#define	  FEC_RACC_LINEDIS		  (1 <<  6)
+#define	  FEC_RACC_PRODIS		  (1 <<  2)
+#define	  FEC_RACC_IPDIS		  (1 <<  1)
+#define	  FEC_RACC_PADREM		  (1 <<  0)
+
+/*
+ * Statistics registers
+ */
+#define	FEC_RMON_T_DROP			0x200
+#define	FEC_RMON_T_PACKETS		0x204
+#define	FEC_RMON_T_BC_PKT		0x208
+#define	FEC_RMON_T_MC_PKT		0x20C
+#define	FEC_RMON_T_CRC_ALIGN		0x210
+#define	FEC_RMON_T_UNDERSIZE		0x214
+#define	FEC_RMON_T_OVERSIZE		0x218
+#define	FEC_RMON_T_FRAG			0x21C
+#define	FEC_RMON_T_JAB			0x220
+#define	FEC_RMON_T_COL			0x224
+#define	FEC_RMON_T_P64			0x228
+#define	FEC_RMON_T_P65TO127		0x22C
+#define	FEC_RMON_T_P128TO255		0x230
+#define	FEC_RMON_T_P256TO511		0x234
+#define	FEC_RMON_T_P512TO1023		0x238
+#define	FEC_RMON_T_P1024TO2047		0x23C
+#define	FEC_RMON_T_P_GTE2048		0x240
+#define	FEC_RMON_T_OCTECTS		0x240
+#define	FEC_IEEE_T_DROP			0x248
+#define	FEC_IEEE_T_FRAME_OK		0x24C
+#define	FEC_IEEE_T_1COL			0x250
+#define	FEC_IEEE_T_MCOL			0x254
+#define	FEC_IEEE_T_DEF			0x258
+#define	FEC_IEEE_T_LCOL			0x25C
+#define	FEC_IEEE_T_EXCOL		0x260
+#define	FEC_IEEE_T_MACERR		0x264
+#define	FEC_IEEE_T_CSERR		0x268
+#define	FEC_IEEE_T_SQE			0x26C
+#define	FEC_IEEE_T_FDXFC		0x270
+#define	FEC_IEEE_T_OCTETS_OK		0x274
+#define	FEC_RMON_R_PACKETS		0x284
+#define	FEC_RMON_R_BC_PKT		0x288
+#define	FEC_RMON_R_MC_PKT		0x28C
+#define	FEC_RMON_R_CRC_ALIGN		0x290
+#define	FEC_RMON_R_UNDERSIZE		0x294
+#define	FEC_RMON_R_OVERSIZE		0x298
+#define	FEC_RMON_R_FRAG			0x29C
+#define	FEC_RMON_R_JAB			0x2A0
+#define	FEC_RMON_R_RESVD_0		0x2A4
+#define	FEC_RMON_R_P64			0x2A8
+#define	FEC_RMON_R_P65TO127		0x2AC
+#define	FEC_RMON_R_P128TO255		0x2B0
+#define	FEC_RMON_R_P256TO511		0x2B4
+#define	FEC_RMON_R_P512TO1023		0x2B8
+#define	FEC_RMON_R_P1024TO2047		0x2BC
+#define	FEC_RMON_R_P_GTE2048		0x2C0
+#define	FEC_RMON_R_OCTETS		0x2C4
+#define	FEC_IEEE_R_DROP			0x2C8
+#define	FEC_IEEE_R_FRAME_OK		0x2CC
+#define	FEC_IEEE_R_CRC			0x2D0
+#define	FEC_IEEE_R_ALIGN		0x2D4
+#define	FEC_IEEE_R_MACERR		0x2D8
+#define	FEC_IEEE_R_FDXFC		0x2DC
+#define	FEC_IEEE_R_OCTETS_OK		0x2E0
+
+#define	FEC_MIIGSK_CFGR			0x300
+#define	FEC_MIIGSK_CFGR_FRCONT		(1 << 6)   /* Freq: 0=50MHz, 1=5MHz */
+#define	FEC_MIIGSK_CFGR_LBMODE		(1 << 4)   /* loopback mode */
+#define	FEC_MIIGSK_CFGR_EMODE		(1 << 3)   /* echo mode */
+#define	FEC_MIIGSK_CFGR_IF_MODE_MASK	(0x3 << 0)
+#define	FEC_MIIGSK_CFGR_IF_MODE_MII	  (0 << 0)
+#define	FEC_MIIGSK_CFGR_IF_MODE_RMII	  (1 << 0)
+
+#define	FEC_MIIGSK_ENR			0x308
+#define	FEC_MIIGSK_ENR_READY		(1 << 2)
+#define	FEC_MIIGSK_ENR_EN		(1 << 1)
+
+/*
+ * A hardware buffer descriptor.  Rx and Tx buffers have the same descriptor
+ * layout, but the bits in the flags field have different meanings.
+ */
+struct ffec_hwdesc
+{
+	uint32_t	flags_len;
+	uint32_t	buf_paddr;
+};
+
+#define	FEC_TXDESC_READY		(1U << 31)
+#define	FEC_TXDESC_T01			(1 << 30)
+#define	FEC_TXDESC_WRAP			(1 << 29)
+#define	FEC_TXDESC_T02			(1 << 28)
+#define	FEC_TXDESC_L			(1 << 27)
+#define	FEC_TXDESC_TC			(1 << 26)
+#define	FEC_TXDESC_ABC			(1 << 25)
+#define	FEC_TXDESC_LEN_MASK		(0xffff)
+
+#define	FEC_RXDESC_EMPTY		(1U << 31)
+#define	FEC_RXDESC_R01			(1 << 30)
+#define	FEC_RXDESC_WRAP			(1 << 29)
+#define	FEC_RXDESC_R02			(1 << 28)
+#define	FEC_RXDESC_L			(1 << 27)
+#define	FEC_RXDESC_M			(1 << 24)
+#define	FEC_RXDESC_BC			(1 << 23)
+#define	FEC_RXDESC_MC			(1 << 22)
+#define	FEC_RXDESC_LG			(1 << 21)
+#define	FEC_RXDESC_NO			(1 << 20)
+#define	FEC_RXDESC_CR			(1 << 18)
+#define	FEC_RXDESC_OV			(1 << 17)
+#define	FEC_RXDESC_TR			(1 << 16)
+#define	FEC_RXDESC_LEN_MASK		(0xffff)
+
+#define	FEC_RXDESC_ERROR_BITS	(FEC_RXDESC_LG | FEC_RXDESC_NO | \
+    FEC_RXDESC_OV | FEC_RXDESC_TR)
+
+/*
+ * The hardware imposes alignment restrictions on various objects involved in
+ * DMA transfers.  These values are expressed in bytes (not bits).
+ */
+#define	FEC_DESC_RING_ALIGN		16
+#define	FEC_RXBUF_ALIGN			16
+#define	FEC_TXBUF_ALIGN			16
+
+#endif	/* IF_FFECREG_H */
diff --git a/sys/dev/firewire/firewire.c b/sys/dev/firewire/firewire.c
index f1ebb6df061..0a6180a7a7a 100644
--- a/sys/dev/firewire/firewire.c
+++ b/sys/dev/firewire/firewire.c
@@ -649,7 +649,7 @@ fw_reset_csr(struct firewire_comm *fc)
 	CSRARC(fc, BANDWIDTH_AV) = 4915;
 	CSRARC(fc, CHANNELS_AV_HI) = 0xffffffff;
 	CSRARC(fc, CHANNELS_AV_LO) = 0xffffffff;
-	CSRARC(fc, IP_CHANNELS) = (1 << 31);
+	CSRARC(fc, IP_CHANNELS) = (1U << 31);
 
 	CSRARC(fc, CONF_ROM) = 0x04 << 24;
 	CSRARC(fc, CONF_ROM + 4) = 0x31333934; /* means strings 1394 */
diff --git a/sys/dev/firewire/fwohci.c b/sys/dev/firewire/fwohci.c
index 77886d3adfa..ae753d53d30 100644
--- a/sys/dev/firewire/fwohci.c
+++ b/sys/dev/firewire/fwohci.c
@@ -179,7 +179,7 @@ static void fwohci_task_dma(void *, int);
 #define	OHCI_ATRETRY		0x08
 #define	OHCI_CROMHDR		0x18
 #define	OHCI_BUS_OPT		0x20
-#define	OHCI_BUSIRMC		(1 << 31)
+#define	OHCI_BUSIRMC		(1U << 31)
 #define	OHCI_BUSCMC		(1 << 30)
 #define	OHCI_BUSISC		(1 << 29)
 #define	OHCI_BUSBMC		(1 << 28)
@@ -205,7 +205,7 @@ static void fwohci_task_dma(void *, int);
 
 #define	OHCI_SID_BUF		0x64
 #define	OHCI_SID_CNT		0x68
-#define OHCI_SID_ERR		(1 << 31)
+#define OHCI_SID_ERR		(1U << 31)
 #define OHCI_SID_CNT_MASK	0xffc
 
 #define	OHCI_IT_STAT		0x90
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index 64bbf4f1cff..d8deca8f321 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -241,7 +241,7 @@ struct ohci_registers {
 	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 */
-#define	OHCI_HCC_BIBIV	(1 << 31)	/* BIBimage Valid */
+#define	OHCI_HCC_BIBIV	(1U << 31)	/* BIBimage Valid */
 #define	OHCI_HCC_BIGEND	(1 << 30)	/* noByteSwapData */
 #define	OHCI_HCC_PRPHY	(1 << 23)	/* programPhyEnable */
 #define	OHCI_HCC_PHYEN	(1 << 22)	/* aPhyEnhanceEnable */
@@ -280,7 +280,7 @@ struct ohci_registers {
 	fwohcireg_t	link_cntl_clr;	/* Chip control clear 0xe4*/
 #define FWOHCI_NODEID	0xe8
 	fwohcireg_t	node;		/* Node ID 0xe8 */
-#define	OHCI_NODE_VALID	(1 << 31)
+#define	OHCI_NODE_VALID	(1U << 31)
 #define	OHCI_NODE_ROOT	(1 << 30)
 
 #define	OHCI_ASYSRCBUS	1
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 615cb07bbbe..e6abebdab52 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -54,6 +54,7 @@
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_types.h>
 #ifdef __DragonFly__
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index 7010bc9c7ff..e98f44e237a 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -56,6 +56,7 @@
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/firewire.h>
 #include <net/if_arp.h>
 #include <net/if_types.h>
diff --git a/sys/dev/firewire/sbp.c b/sys/dev/firewire/sbp.c
index 00e780e9002..22ffc947994 100644
--- a/sys/dev/firewire/sbp.c
+++ b/sys/dev/firewire/sbp.c
@@ -1493,12 +1493,13 @@ sbp_print_scsi_cmd(struct sbp_ocb *ocb)
 	struct ccb_scsiio *csio;
 
 	csio = &ocb->ccb->csio;
-	printf("%s:%d:%d XPT_SCSI_IO: "
+	printf("%s:%d:%jx XPT_SCSI_IO: "
 		"cmd: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x"
 		", flags: 0x%02x, "
 		"%db cmd/%db data/%db sense\n",
 		device_get_nameunit(ocb->sdev->target->sbp->fd.dev),
-		ocb->ccb->ccb_h.target_id, ocb->ccb->ccb_h.target_lun,
+		ocb->ccb->ccb_h.target_id,
+		(uintmax_t)ocb->ccb->ccb_h.target_lun,
 		csio->cdb_io.cdb_bytes[0],
 		csio->cdb_io.cdb_bytes[1],
 		csio->cdb_io.cdb_bytes[2],
@@ -2354,8 +2355,8 @@ sbp_action1(struct cam_sim *sim, union ccb *ccb)
 
 SBP_DEBUG(1)
 	if (sdev == NULL)
-		printf("invalid target %d lun %d\n",
-			ccb->ccb_h.target_id, ccb->ccb_h.target_lun);
+		printf("invalid target %d lun %jx\n",
+			ccb->ccb_h.target_id, (uintmax_t)ccb->ccb_h.target_lun);
 END_DEBUG
 
 	switch (ccb->ccb_h.func_code) {
@@ -2366,10 +2367,11 @@ END_DEBUG
 	case XPT_CALC_GEOMETRY:
 		if (sdev == NULL) {
 SBP_DEBUG(1)
-			printf("%s:%d:%d:func_code 0x%04x: "
+			printf("%s:%d:%jx:func_code 0x%04x: "
 				"Invalid target (target needed)\n",
 				device_get_nameunit(sbp->fd.dev),
-				ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
+				ccb->ccb_h.target_id,
+				(uintmax_t)ccb->ccb_h.target_lun,
 				ccb->ccb_h.func_code);
 END_DEBUG
 
@@ -2387,10 +2389,11 @@ END_DEBUG
 		if (sbp == NULL && 
 			ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) {
 SBP_DEBUG(0)
-			printf("%s:%d:%d func_code 0x%04x: "
+			printf("%s:%d:%jx func_code 0x%04x: "
 				"Invalid target (no wildcard)\n",
 				device_get_nameunit(sbp->fd.dev),
-				ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
+				ccb->ccb_h.target_id,
+				(uintmax_t)ccb->ccb_h.target_lun,
 				ccb->ccb_h.func_code);
 END_DEBUG
 			ccb->ccb_h.status = CAM_DEV_NOT_THERE;
@@ -2415,12 +2418,12 @@ END_DEBUG
 		mtx_assert(sim->mtx, MA_OWNED);
 
 SBP_DEBUG(2)
-		printf("%s:%d:%d XPT_SCSI_IO: "
+		printf("%s:%d:%jx XPT_SCSI_IO: "
 			"cmd: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x"
 			", flags: 0x%02x, "
 			"%db cmd/%db data/%db sense\n",
 			device_get_nameunit(sbp->fd.dev),
-			ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
+			ccb->ccb_h.target_id, (uintmax_t)ccb->ccb_h.target_lun,
 			csio->cdb_io.cdb_bytes[0],
 			csio->cdb_io.cdb_bytes[1],
 			csio->cdb_io.cdb_bytes[2],
@@ -2469,7 +2472,7 @@ END_DEBUG
 		ocb->sdev = sdev;
 		ocb->ccb = ccb;
 		ccb->ccb_h.ccb_sdev_ptr = sdev;
-		ocb->orb[0] = htonl(1 << 31);
+		ocb->orb[0] = htonl(1U << 31);
 		ocb->orb[1] = 0;
 		ocb->orb[2] = htonl(((sbp->fd.fc->nodeid | FWLOCALBUS )<< 16) );
 		ocb->orb[3] = htonl(ocb->bus_addr + IND_PTR_OFFSET);
@@ -2521,7 +2524,7 @@ printf("ORB %08x %08x %08x %08x\n", ntohl(ocb->orb[4]), ntohl(ocb->orb[5]), ntoh
 			break;
 		}
 SBP_DEBUG(1)
-		printf("%s:%d:%d:%d:XPT_CALC_GEOMETRY: "
+		printf("%s:%d:%d:%jx:XPT_CALC_GEOMETRY: "
 #if defined(__DragonFly__) || __FreeBSD_version < 500000
 			"Volume size = %d\n",
 #else
@@ -2529,7 +2532,7 @@ SBP_DEBUG(1)
 #endif
 			device_get_nameunit(sbp->fd.dev),
 			cam_sim_path(sbp->sim),
-			ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
+			ccb->ccb_h.target_id, (uintmax_t)ccb->ccb_h.target_lun,
 #if defined(__FreeBSD__) && __FreeBSD_version >= 500000
 			(uintmax_t)
 #endif
@@ -2573,9 +2576,9 @@ END_DEBUG
 		struct ccb_pathinq *cpi = &ccb->cpi;
 		
 SBP_DEBUG(1)
-		printf("%s:%d:%d XPT_PATH_INQ:.\n",
+		printf("%s:%d:%jx XPT_PATH_INQ:.\n",
 			device_get_nameunit(sbp->fd.dev),
-			ccb->ccb_h.target_id, ccb->ccb_h.target_lun);
+			ccb->ccb_h.target_id, (uintmax_t)ccb->ccb_h.target_lun);
 END_DEBUG
 		cpi->version_num = 1; /* XXX??? */
 		cpi->hba_inquiry = PI_TAG_ABLE;
@@ -2617,9 +2620,9 @@ END_DEBUG
 		scsi->valid = CTS_SCSI_VALID_TQ;
 		scsi->flags = CTS_SCSI_FLAGS_TAG_ENB;
 SBP_DEBUG(1)
-		printf("%s:%d:%d XPT_GET_TRAN_SETTINGS:.\n",
+		printf("%s:%d:%jx XPT_GET_TRAN_SETTINGS:.\n",
 			device_get_nameunit(sbp->fd.dev),
-			ccb->ccb_h.target_id, ccb->ccb_h.target_lun);
+			ccb->ccb_h.target_id, (uintmax_t)ccb->ccb_h.target_lun);
 END_DEBUG
 		cts->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
diff --git a/sys/dev/firewire/sbp.h b/sys/dev/firewire/sbp.h
index fcfa514cce8..84d522afba2 100644
--- a/sys/dev/firewire/sbp.h
+++ b/sys/dev/firewire/sbp.h
@@ -35,7 +35,7 @@
  *
  */
 
-#define ORB_NOTIFY	(1 << 31)
+#define ORB_NOTIFY	(1U << 31)
 #define	ORB_FMT_STD	(0 << 29)
 #define	ORB_FMT_VED	(2 << 29)
 #define	ORB_FMT_NOP	(3 << 29)
diff --git a/sys/dev/firewire/sbp_targ.c b/sys/dev/firewire/sbp_targ.c
index 34a75cbbc1d..8026b79dcb6 100644
--- a/sys/dev/firewire/sbp_targ.c
+++ b/sys/dev/firewire/sbp_targ.c
@@ -1483,7 +1483,7 @@ sbp_targ_cmd_handler(struct fw_xfer *xfer)
 	atio->tag_id = orbi->orb_lo;
 	atio->init_id = orbi->login->id;
 
-	atio->ccb_h.flags = CAM_TAG_ACTION_VALID;
+	atio->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 	bytes = (u_char *)&orb[5];
 	if (debug)
 		printf("%s: %p %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",
@@ -1716,7 +1716,7 @@ sbp_targ_pointer_handler(struct fw_xfer *xfer)
 
 	orb0 = ntohl(orbi->orb[0]);
 	orb1 = ntohl(orbi->orb[1]);
-	if ((orb0 & (1 << 31)) != 0) {
+	if ((orb0 & (1U << 31)) != 0) {
 		printf("%s: invalid pointer\n", __func__);
 		goto done;
 	}
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 1896d90af28..52366c78730 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/fxp/inphy.c b/sys/dev/fxp/inphy.c
index 587f3fd6255..07ed8caa599 100644
--- a/sys/dev/fxp/inphy.c
+++ b/sys/dev/fxp/inphy.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>
diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
index 4aa9c6d34f1..f94aca2b3eb 100644
--- a/sys/dev/gem/if_gem.c
+++ b/sys/dev/gem/if_gem.c
@@ -61,6 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/glxsb/glxsb.c b/sys/dev/glxsb/glxsb.c
index 52041534da3..646fe3fe7ea 100644
--- a/sys/dev/glxsb/glxsb.c
+++ b/sys/dev/glxsb/glxsb.c
@@ -476,7 +476,7 @@ glxsb_rnd(void *v)
 	if (status & SB_RNS_TRNG_VALID) {
 		value = bus_read_4(sc->sc_sr, SB_RANDOM_NUM);
 		/* feed with one uint32 */
-		random_harvest(&value, 4, 32/2, 0, RANDOM_PURE);
+		random_harvest(&value, 4, 32/2, RANDOM_PURE_GLXSB);
 	}
 
 	callout_reset(&sc->sc_rngco, sc->sc_rnghz, glxsb_rnd, sc);
diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c
index 6abb10c1e09..3b7525f0373 100644
--- a/sys/dev/gpio/gpiobus.c
+++ b/sys/dev/gpio/gpiobus.c
@@ -175,7 +175,8 @@ static int
 gpiobus_probe(device_t dev)
 {
 	device_set_desc(dev, "GPIO bus");
-	return (0);
+
+	return (BUS_PROBE_GENERIC);
 }
 
 static int
@@ -190,13 +191,13 @@ gpiobus_attach(device_t dev)
 	if (res)
 		return (ENXIO);
 
+	KASSERT(sc->sc_npins != 0, ("GPIO device with no pins"));
+
 	/*
 	 * Increase to get number of pins
 	 */
 	sc->sc_npins++;
 
-	KASSERT(sc->sc_npins != 0, ("GPIO device with no pins"));
-
 	sc->sc_pins_mapped = malloc(sizeof(int) * sc->sc_npins, M_DEVBUF, 
 	    M_NOWAIT | M_ZERO);
 
@@ -209,7 +210,9 @@ gpiobus_attach(device_t dev)
 	/*
 	 * Get parent's pins and mark them as unmapped
 	 */
+	bus_generic_probe(dev);
 	bus_enumerate_hinted_children(dev);
+
 	return (bus_generic_attach(dev));
 }
 
diff --git a/sys/dev/gpio/gpioiic.c b/sys/dev/gpio/gpioiic.c
index 2a6d0932676..37af21cf659 100644
--- a/sys/dev/gpio/gpioiic.c
+++ b/sys/dev/gpio/gpioiic.c
@@ -30,15 +30,10 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
-#include <sys/kthread.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/mutex.h>
 
 #include <sys/gpio.h>
 #include "gpiobus_if.h"
@@ -55,7 +50,6 @@ struct gpioiic_softc
 {
 	device_t	sc_dev;
 	device_t	sc_busdev;
-	struct cdev	*sc_leddev;
 	int		scl_pin;
 	int		sda_pin;
 };
@@ -78,6 +72,7 @@ gpioiic_probe(device_t dev)
 {
 
 	device_set_desc(dev, "GPIO I2C bit-banging driver");
+
 	return (0);
 }
 
@@ -139,7 +134,7 @@ gpioiic_callback(device_t dev, int index, caddr_t data)
 		error = EINVAL;
 	}
 
-	return(error);
+	return (error);
 }
 
 static void
diff --git a/sys/dev/gpio/gpioled.c b/sys/dev/gpio/gpioled.c
index a03c172d106..dd7af6f8e7a 100644
--- a/sys/dev/gpio/gpioled.c
+++ b/sys/dev/gpio/gpioled.c
@@ -75,6 +75,8 @@ gpioled_control(void *priv, int onoff)
 	GPIOLED_LOCK(sc);
 	GPIOBUS_LOCK_BUS(sc->sc_busdev);
 	GPIOBUS_ACQUIRE_BUS(sc->sc_busdev, sc->sc_dev);
+	GPIOBUS_PIN_SETFLAGS(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN,
+	    GPIO_PIN_OUTPUT);
 	GPIOBUS_PIN_SET(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN, 
 	    onoff ? GPIO_PIN_HIGH : GPIO_PIN_LOW);
 	GPIOBUS_RELEASE_BUS(sc->sc_busdev, sc->sc_dev);
@@ -103,9 +105,6 @@ gpioled_attach(device_t dev)
 	    device_get_unit(dev), "name", &name))
 		name = NULL;
 
-	GPIOBUS_PIN_SETFLAGS(sc->sc_busdev, sc->sc_dev, GPIOLED_PIN,
-	    GPIO_PIN_OUTPUT);
-
 	sc->sc_leddev = led_create(gpioled_control, sc, name ? name :
 	    device_get_nameunit(dev));
 
diff --git a/sys/dev/gxemul/disk/gxemul_disk.c b/sys/dev/gxemul/disk/gxemul_disk.c
index 3b7e649c655..7671784ac14 100644
--- a/sys/dev/gxemul/disk/gxemul_disk.c
+++ b/sys/dev/gxemul/disk/gxemul_disk.c
@@ -158,7 +158,7 @@ gxemul_disk_probe(device_t dev)
 {
 	device_set_desc(dev, "GXemul test disk");
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static void
diff --git a/sys/dev/gxemul/ether/if_gx.c b/sys/dev/gxemul/ether/if_gx.c
index 321882f5fd8..647f0210164 100644
--- a/sys/dev/gxemul/ether/if_gx.c
+++ b/sys/dev/gxemul/ether/if_gx.c
@@ -125,7 +125,7 @@ gx_probe(device_t dev)
 
 	device_set_desc(dev, "GXemul test Ethernet");
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/dev/hatm/if_hatm.c b/sys/dev/hatm/if_hatm.c
index b8ad577316a..c022724f4da 100644
--- a/sys/dev/hatm/if_hatm.c
+++ b/sys/dev/hatm/if_hatm.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/if_types.h>
diff --git a/sys/dev/hatm/if_hatm_intr.c b/sys/dev/hatm/if_hatm_intr.c
index 697dd2bdcc5..5220fe511d8 100644
--- a/sys/dev/hatm/if_hatm_intr.c
+++ b/sys/dev/hatm/if_hatm_intr.c
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/route.h>
diff --git a/sys/dev/hatm/if_hatm_ioctl.c b/sys/dev/hatm/if_hatm_ioctl.c
index 5e37b5dc75e..154a2d60943 100644
--- a/sys/dev/hatm/if_hatm_ioctl.c
+++ b/sys/dev/hatm/if_hatm_ioctl.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/route.h>
diff --git a/sys/dev/hatm/if_hatm_rx.c b/sys/dev/hatm/if_hatm_rx.c
index b79b2fcd7c0..bf17294df21 100644
--- a/sys/dev/hatm/if_hatm_rx.c
+++ b/sys/dev/hatm/if_hatm_rx.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/route.h>
diff --git a/sys/dev/hatm/if_hatm_tx.c b/sys/dev/hatm/if_hatm_tx.c
index 455dbb4db32..8e03e9d55cb 100644
--- a/sys/dev/hatm/if_hatm_tx.c
+++ b/sys/dev/hatm/if_hatm_tx.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/route.h>
diff --git a/sys/dev/hatm/if_hatmreg.h b/sys/dev/hatm/if_hatmreg.h
index 9085f07f5a4..401499870d0 100644
--- a/sys/dev/hatm/if_hatmreg.h
+++ b/sys/dev/hatm/if_hatmreg.h
@@ -294,7 +294,7 @@
 
 #define HE_REGO_CON_DAT		0x807F8
 #define HE_REGO_CON_CTL		0x807FC
-#define HE_REGM_CON_MBOX	(2 << 30)
+#define HE_REGM_CON_MBOX	(2U << 30)
 #define HE_REGM_CON_TCM		(1 << 30)
 #define HE_REGM_CON_RCM		(0 << 30)
 #define HE_REGM_CON_WE		(1 << 29)
@@ -444,7 +444,7 @@
 #define HE_REGM_TSR3_CRM		(0xff << 0)
 #define HE_REGS_TSR3_CRM		0
 
-#define HE_REGM_TSR4_FLUSH		(1 << 31)
+#define HE_REGM_TSR4_FLUSH		(1U << 31)
 #define HE_REGM_TSR4_SESS_END		(1 << 30)
 #define HE_REGM_TSR4_OAM_CRC10		(1 << 28)
 #define HE_REGM_TSR4_NULL_CRC10		(1 << 27)
@@ -475,7 +475,7 @@
 #define HE_REGM_TSR13_CRM		0xffff
 #define HE_REGS_TSR13_CRM		0
 
-#define HE_REGM_TSR14_CBR_DELETE	(1 << 31)
+#define HE_REGM_TSR14_CBR_DELETE	(1U << 31)
 #define HE_REGM_TSR14_ABR_CLOSE		(1 << 16)
 
 /*
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index ae6c5ac6353..8954242619d 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -258,7 +258,7 @@ hifn_partname(struct hifn_softc *sc)
 static void
 default_harvest(struct rndtest_state *rsp, void *buf, u_int count)
 {
-	random_harvest(buf, count, count*NBBY/2, 0, RANDOM_PURE);
+	random_harvest(buf, count, count*NBBY/2, RANDOM_PURE_HIFN);
 }
 
 static u_int
diff --git a/sys/dev/hme/if_hme.c b/sys/dev/hme/if_hme.c
index 1249dc4a2e1..2510d5fb612 100644
--- a/sys/dev/hme/if_hme.c
+++ b/sys/dev/hme/if_hme.c
@@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/hme/if_hme_pci.c b/sys/dev/hme/if_hme_pci.c
index d114fd8f6da..79cb31ba585 100644
--- a/sys/dev/hme/if_hme_pci.c
+++ b/sys/dev/hme/if_hme_pci.c
@@ -40,7 +40,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 
diff --git a/sys/dev/hme/if_hme_sbus.c b/sys/dev/hme/if_hme_sbus.c
index 946597e06c6..13e7062c360 100644
--- a/sys/dev/hme/if_hme_sbus.c
+++ b/sys/dev/hme/if_hme_sbus.c
@@ -39,8 +39,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/resource.h>
 #include <sys/socket.h>
 
@@ -52,11 +54,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/rman.h>
 
-#include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #include <dev/mii/mii.h>
 #include <dev/mii/miivar.h>
diff --git a/sys/dev/hptiop/hptiop.c b/sys/dev/hptiop/hptiop.c
index 6b8377456df..b2522997127 100644
--- a/sys/dev/hptiop/hptiop.c
+++ b/sys/dev/hptiop/hptiop.c
@@ -2641,10 +2641,10 @@ static void hptiop_post_scsi_command(void *arg, bus_dma_segment_t *segs,
 	struct hpt_iop_hba *hba = srb->hba;
 
 	if (error || nsegs > hba->max_sg_count) {
-		KdPrint(("hptiop: func_code=%x tid=%x lun=%x nsegs=%d\n",
+		KdPrint(("hptiop: func_code=%x tid=%x lun=%jx nsegs=%d\n",
 			ccb->ccb_h.func_code,
 			ccb->ccb_h.target_id,
-			ccb->ccb_h.target_lun, nsegs));
+			(uintmax_t)ccb->ccb_h.target_lun, nsegs));
 		ccb->ccb_h.status = CAM_BUSY;
 		bus_dmamap_unload(hba->io_dmat, srb->dma_map);
 		hptiop_free_srb(hba, srb);
diff --git a/sys/dev/hwpmc/hwpmc_piv.h b/sys/dev/hwpmc/hwpmc_piv.h
index ebde966167f..4faeadd11e3 100644
--- a/sys/dev/hwpmc/hwpmc_piv.h
+++ b/sys/dev/hwpmc/hwpmc_piv.h
@@ -39,7 +39,7 @@
 #define	P4_MAX_ESCR_PER_EVENT	2
 #define	P4_MAX_PMC_PER_ESCR	3
 
-#define	P4_CCCR_OVF			(1 << 31)
+#define	P4_CCCR_OVF			(1U << 31)
 #define	P4_CCCR_CASCADE			(1 << 30)
 #define	P4_CCCR_OVF_PMI_T1		(1 << 27)
 #define	P4_CCCR_OVF_PMI_T0		(1 << 26)
diff --git a/sys/dev/hyperv/include/hyperv.h b/sys/dev/hyperv/include/hyperv.h
index 36512698fa7..4257b371c71 100644
--- a/sys/dev/hyperv/include/hyperv.h
+++ b/sys/dev/hyperv/include/hyperv.h
@@ -24,6 +24,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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$
  */
 
 /**
@@ -669,6 +671,7 @@ typedef struct hv_vmbus_channel {
 	 * Allocated memory for ring buffer
 	 */
 	void*				ring_buffer_pages;
+	unsigned long			ring_buffer_size;
 	uint32_t			ring_buffer_page_count;
 	/*
 	 * send to parent
diff --git a/sys/dev/hyperv/netvsc/hv_net_vsc.c b/sys/dev/hyperv/netvsc/hv_net_vsc.c
index aeee94d8345..9dffb7669ae 100644
--- a/sys/dev/hyperv/netvsc/hv_net_vsc.c
+++ b/sys/dev/hyperv/netvsc/hv_net_vsc.c
@@ -24,6 +24,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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$
  */
 
 /**
@@ -37,6 +39,7 @@
 #include <sys/socket.h>
 #include <sys/lock.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <machine/bus.h>
 #include <machine/atomic.h>
diff --git a/sys/dev/hyperv/netvsc/hv_net_vsc.h b/sys/dev/hyperv/netvsc/hv_net_vsc.h
index f7e7d00a903..b9f3a1ee9cb 100644
--- a/sys/dev/hyperv/netvsc/hv_net_vsc.h
+++ b/sys/dev/hyperv/netvsc/hv_net_vsc.h
@@ -24,6 +24,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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$
  */
 
 /*
@@ -970,6 +972,8 @@ typedef struct hn_softc {
 	int             hn_if_flags;
 	struct mtx      hn_lock;
 	int             hn_initdone;
+	/* See hv_netvsc_drv_freebsd.c for rules on how to use */
+	int             temp_unusable;
 	struct hv_device  *hn_dev_obj;
 	netvsc_dev  	*net_dev;
 } hn_softc_t;
diff --git a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
index 74700061e54..f0df87b948d 100644
--- a/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
@@ -52,6 +52,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
@@ -72,9 +75,9 @@
 
 #include <net/bpf.h>
 
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
-#include <net/if.h>
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
@@ -187,6 +190,7 @@ netvsc_init(void)
 	if (!cold && !g_netvsc_drv.drv_inited) {
 		g_netvsc_drv.drv_inited = 1;
 		netvsc_drv_init();
+		printf("done!\n");
 	} else {
 		printf("Already initialized!\n");
 	}
@@ -618,13 +622,15 @@ netvsc_recv(struct hv_device *device_ctx, netvsc_packet *packet)
 {
 	hn_softc_t *sc = (hn_softc_t *)device_get_softc(device_ctx->device);
 	struct mbuf *m_new;
-	struct ifnet *ifp = sc->hn_ifp;
+	struct ifnet *ifp;
 	int size;
 	int i;
 
 	if (sc == NULL) {
 		return (0); /* TODO: KYS how can this be! */
 	}
+
+	ifp = sc->hn_ifp;
 	
 	ifp = sc->arpcom.ac_ifp;
 
@@ -701,6 +707,17 @@ netvsc_recv(struct hv_device *device_ctx, netvsc_packet *packet)
 	return (0);
 }
 
+/*
+ * Rules for using sc->temp_unusable:
+ * 1.  sc->temp_unusable can only be read or written while holding NV_LOCK()
+ * 2.  code reading sc->temp_unusable under NV_LOCK(), and finding 
+ *     sc->temp_unusable set, must release NV_LOCK() and exit
+ * 3.  to retain exclusive control of the interface,
+ *     sc->temp_unusable must be set by code before releasing NV_LOCK()
+ * 4.  only code setting sc->temp_unusable can clear sc->temp_unusable
+ * 5.  code setting sc->temp_unusable must eventually clear sc->temp_unusable
+ */
+
 /*
  * Standard ioctl entry point.  Called when the user wants to configure
  * the interface.
@@ -713,7 +730,8 @@ hn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	netvsc_device_info device_info;
 	struct hv_device *hn_dev;
 	int mask, error = 0;
-
+	int retry_cnt = 500;
+	
 	switch(cmd) {
 
 	case SIOCSIFADDR:
@@ -723,38 +741,80 @@ hn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 	case SIOCSIFMTU:
 		hn_dev = vmbus_get_devctx(sc->hn_dev);
 
-		NV_LOCK(sc);
+		/* Check MTU value change */
+		if (ifp->if_mtu == ifr->ifr_mtu)
+			break;
 
 		if (ifr->ifr_mtu > NETVSC_MAX_CONFIGURABLE_MTU) {
 			error = EINVAL;
-			NV_UNLOCK(sc);
 			break;
 		}
+
 		/* Obtain and record requested MTU */
 		ifp->if_mtu = ifr->ifr_mtu;
+ 		
+		do {
+			NV_LOCK(sc);
+			if (!sc->temp_unusable) {
+				sc->temp_unusable = TRUE;
+				retry_cnt = -1;
+			}
+			NV_UNLOCK(sc);
+			if (retry_cnt > 0) {
+				retry_cnt--;
+				DELAY(5 * 1000);
+			}
+		} while (retry_cnt > 0);
 
-		/*
-		 * We must remove and add back the device to cause the new
+		if (retry_cnt == 0) {
+			error = EINVAL;
+			break;
+		}
+
+		/* We must remove and add back the device to cause the new
 		 * MTU to take effect.  This includes tearing down, but not
 		 * deleting the channel, then bringing it back up.
 		 */
 		error = hv_rf_on_device_remove(hn_dev, HV_RF_NV_RETAIN_CHANNEL);
 		if (error) {
+			NV_LOCK(sc);
+			sc->temp_unusable = FALSE;
 			NV_UNLOCK(sc);
 			break;
 		}
 		error = hv_rf_on_device_add(hn_dev, &device_info);
 		if (error) {
+			NV_LOCK(sc);
+			sc->temp_unusable = FALSE;
 			NV_UNLOCK(sc);
 			break;
 		}
 
 		hn_ifinit_locked(sc);
 
+		NV_LOCK(sc);
+		sc->temp_unusable = FALSE;
 		NV_UNLOCK(sc);
 		break;
 	case SIOCSIFFLAGS:
-		NV_LOCK(sc);
+		do {
+                       NV_LOCK(sc);
+                       if (!sc->temp_unusable) {
+                               sc->temp_unusable = TRUE;
+                               retry_cnt = -1;
+                       }
+                       NV_UNLOCK(sc);
+                       if (retry_cnt > 0) {
+                      	        retry_cnt--;
+                        	DELAY(5 * 1000);
+                       }
+                } while (retry_cnt > 0);
+
+                if (retry_cnt == 0) {
+                       error = EINVAL;
+                       break;
+                }
+
 		if (ifp->if_flags & IFF_UP) {
 			/*
 			 * If only the state of the PROMISC flag changed,
@@ -766,21 +826,14 @@ hn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 			 */
 #ifdef notyet
 			/* Fixme:  Promiscuous mode? */
-			/* No promiscuous mode with Xen */
 			if (ifp->if_drv_flags & IFF_DRV_RUNNING &&
 			    ifp->if_flags & IFF_PROMISC &&
 			    !(sc->hn_if_flags & IFF_PROMISC)) {
 				/* do something here for Hyper-V */
-				;
-/*				XN_SETBIT(sc, XN_RX_MODE,		*/
-/*					  XN_RXMODE_RX_PROMISC);	*/
 			} else if (ifp->if_drv_flags & IFF_DRV_RUNNING &&
-				   !(ifp->if_flags & IFF_PROMISC) &&
-				   sc->hn_if_flags & IFF_PROMISC) {
+			    !(ifp->if_flags & IFF_PROMISC) &&
+			    sc->hn_if_flags & IFF_PROMISC) {
 				/* do something here for Hyper-V */
-				;
-/*				XN_CLRBIT(sc, XN_RX_MODE,		*/
-/*					  XN_RXMODE_RX_PROMISC);	*/
 			} else
 #endif
 				hn_ifinit_locked(sc);
@@ -789,8 +842,10 @@ hn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 				hn_stop(sc);
 			}
 		}
-		sc->hn_if_flags = ifp->if_flags;
+		NV_LOCK(sc);
+		sc->temp_unusable = FALSE;
 		NV_UNLOCK(sc);
+		sc->hn_if_flags = ifp->if_flags;
 		error = 0;
 		break;
 	case SIOCSIFCAP:
@@ -838,7 +893,6 @@ hn_stop(hn_softc_t *sc)
 	int ret;
 	struct hv_device *device_ctx = vmbus_get_devctx(sc->hn_dev);
 
-	NV_LOCK_ASSERT(sc);
 	ifp = sc->hn_ifp;
 
 	printf(" Closing Device ...\n");
@@ -859,6 +913,10 @@ hn_start(struct ifnet *ifp)
 
 	sc = ifp->if_softc;
 	NV_LOCK(sc);
+	if (sc->temp_unusable) {
+		NV_UNLOCK(sc);
+		return;
+	}
 	hn_start_locked(ifp);
 	NV_UNLOCK(sc);
 }
@@ -873,8 +931,6 @@ hn_ifinit_locked(hn_softc_t *sc)
 	struct hv_device *device_ctx = vmbus_get_devctx(sc->hn_dev);
 	int ret;
 
-	NV_LOCK_ASSERT(sc);
-
 	ifp = sc->hn_ifp;
 
 	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
@@ -902,7 +958,17 @@ hn_ifinit(void *xsc)
 	hn_softc_t *sc = xsc;
 
 	NV_LOCK(sc);
+	if (sc->temp_unusable) {
+		NV_UNLOCK(sc);
+		return;
+	}
+	sc->temp_unusable = TRUE;
+	NV_UNLOCK(sc);
+
 	hn_ifinit_locked(sc);
+
+	NV_LOCK(sc);
+	sc->temp_unusable = FALSE;
 	NV_UNLOCK(sc);
 }
 
diff --git a/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c b/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
index 9e5cf55c80e..323b4e73acc 100644
--- a/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
+++ b/sys/dev/hyperv/stordisengage/hv_ata_pci_disengage.c
@@ -75,23 +75,18 @@ __FBSDID("$FreeBSD$");
 #include <dev/ata/ata-pci.h>
 #include <ata_if.h>
 
-#define HV_X64_MSR_GUEST_OS_ID	0x40000000
-#define HV_X64_CPUID_MIN	0x40000005
-#define HV_X64_CPUID_MAX	0x4000ffff
-
 /* prototypes */
 static int hv_ata_pci_probe(device_t dev);
 static int hv_ata_pci_attach(device_t dev);
 static int hv_ata_pci_detach(device_t dev);
 
-static int hv_check_for_hyper_v(void);
-
 /*
  * generic PCI ATA device probe
  */
 static int
 hv_ata_pci_probe(device_t dev)
 {
+	device_t parent = device_get_parent(dev);
 	int ata_disk_enable;
 
 	ata_disk_enable = 0;
@@ -99,26 +94,12 @@ hv_ata_pci_probe(device_t dev)
 	/*
 	 * Don't probe if not running in a Hyper-V environment
 	 */
-	if (!hv_check_for_hyper_v())
+	if (vm_guest != VM_GUEST_HV)
 		return (ENXIO);
 
-	if (bootverbose)
-		device_printf(dev,
-		    "hv_ata_pci_probe dev_class/subslcass = %d, %d\n",
-			pci_get_class(dev), pci_get_subclass(dev));
-			
-	/* is this a storage class device ? */
-	if (pci_get_class(dev) != PCIC_STORAGE)
+	if (device_get_unit(parent) != 0 || device_get_ivars(dev) != 0)
 		return (ENXIO);
 
-	/* is this an IDE/ATA type device ? */
-	if (pci_get_subclass(dev) != PCIS_STORAGE_IDE)
-		return (ENXIO);
-
-	if(bootverbose)
-		device_printf(dev,
-		    "Hyper-V probe for disabling ATA-PCI, emulated driver\n");
-
 	/*
 	 * On Hyper-V the default is to use the enlightened driver for
 	 * IDE disks. However, if the user wishes to use the native
@@ -126,15 +107,14 @@ hv_ata_pci_probe(device_t dev)
 	 * hw_ata.disk_enable must be explicitly set to 1.
 	 */
 	if (getenv_int("hw.ata.disk_enable", &ata_disk_enable)) {
-		if(bootverbose)
+		if (bootverbose)
 			device_printf(dev,
 			    "hw.ata.disk_enable flag is disabling Hyper-V"
 			    " ATA driver support\n");
 			return (ENXIO);
 	}
 
-	if (bootverbose)
-		device_printf(dev, "Hyper-V ATA storage driver enabled.\n");
+	device_set_desc(dev, "Hyper-V ATA storage disengage driver");
 
 	return (BUS_PROBE_VENDOR);
 }
@@ -153,33 +133,6 @@ hv_ata_pci_detach(device_t dev)
 	return (0);
 }
 
-/**
-* Detect Hyper-V and enable fast IDE
-* via enlighted storage driver
-*/
-static int
-hv_check_for_hyper_v(void)
-{
-	u_int regs[4];
-	int hyper_v_detected;
-
-	hyper_v_detected = 0;
-	do_cpuid(1, regs);
-	if (regs[2] & 0x80000000) {
-		/*
-		 * if(a hypervisor is detected)
-		 *  make sure this really is Hyper-V
-		 */
-		do_cpuid(HV_X64_MSR_GUEST_OS_ID, regs);
-		hyper_v_detected =
-			regs[0] >= HV_X64_CPUID_MIN &&
-			regs[0] <= HV_X64_CPUID_MAX &&
-			!memcmp("Microsoft Hv", &regs[1], 12);
-	}
-
-	return (hyper_v_detected);
-}
-
 static device_method_t hv_ata_pci_methods[] = {
 	/* device interface */
 	DEVMETHOD(device_probe,	hv_ata_pci_probe),
@@ -193,12 +146,12 @@ static device_method_t hv_ata_pci_methods[] = {
 devclass_t hv_ata_pci_devclass;
 
 static driver_t hv_ata_pci_disengage_driver = {
-	"pciata-disable",
+	"ata",
 	hv_ata_pci_methods,
-	sizeof(struct ata_pci_controller),
+	0,
 };
 
-DRIVER_MODULE(atapci_dis, pci, hv_ata_pci_disengage_driver,
-		hv_ata_pci_devclass, NULL, NULL);
+DRIVER_MODULE(atapci_dis, atapci, hv_ata_pci_disengage_driver,
+    hv_ata_pci_devclass, NULL, NULL);
 MODULE_VERSION(atapci_dis, 1);
 MODULE_DEPEND(atapci_dis, ata, 1, 1, 1);
diff --git a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
index c89f42e0fee..f4418b95d1d 100644
--- a/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
+++ b/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
@@ -32,6 +32,8 @@
  * converted into VSCSI protocol messages which are delivered to the parent
  * partition StorVSP driver over the Hyper-V VMBUS.
  */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -322,10 +324,10 @@ hv_storvsc_channel_init(struct hv_device *dev)
 	vstor_packet->operation = VSTOR_OPERATION_QUERYPROTOCOLVERSION;
 	vstor_packet->flags = REQUEST_COMPLETION_FLAG;
 
-	vstor_packet->version.major_minor = VMSTOR_PROTOCOL_VERSION_CURRENT;
+	vstor_packet->u.version.major_minor = VMSTOR_PROTOCOL_VERSION_CURRENT;
 
 	/* revision is only significant for Windows guests */
-	vstor_packet->version.revision = 0;
+	vstor_packet->u.version.revision = 0;
 
 	ret = hv_vmbus_channel_send_packet(
 			dev->channel,
@@ -532,11 +534,11 @@ hv_storvsc_io_request(struct hv_device *device,
 
 	vstor_packet->flags |= REQUEST_COMPLETION_FLAG;
 
-	vstor_packet->vm_srb.length = sizeof(struct vmscsi_req);
+	vstor_packet->u.vm_srb.length = sizeof(struct vmscsi_req);
 	
-	vstor_packet->vm_srb.sense_info_len = SENSE_BUFFER_SIZE;
+	vstor_packet->u.vm_srb.sense_info_len = SENSE_BUFFER_SIZE;
 
-	vstor_packet->vm_srb.transfer_len = request->data_buf.length;
+	vstor_packet->u.vm_srb.transfer_len = request->data_buf.length;
 
 	vstor_packet->operation = VSTOR_OPERATION_EXECUTESRB;
 
@@ -583,7 +585,7 @@ hv_storvsc_on_iocompletion(struct storvsc_softc *sc,
 {
 	struct vmscsi_req *vm_srb;
 
-	vm_srb = &vstor_packet->vm_srb;
+	vm_srb = &vstor_packet->u.vm_srb;
 
 	request->sense_info_len = 0;
 	if (((vm_srb->scsi_status & 0xFF) == SCSI_STATUS_CHECK_COND) &&
@@ -594,7 +596,7 @@ hv_storvsc_on_iocompletion(struct storvsc_softc *sc,
 				("vm_srb->sense_info_len <= "
 				 "request->sense_info_len"));
 
-		memcpy(request->sense_data, vm_srb->sense_data,
+		memcpy(request->sense_data, vm_srb->u.sense_data,
 			vm_srb->sense_info_len);
 
 		request->sense_info_len = vm_srb->sense_info_len;
@@ -1298,35 +1300,35 @@ create_storvsc_request(union ccb *ccb, struct hv_storvsc_request *reqp)
 	uint32_t pfn;
 	
 	/* refer to struct vmscsi_req for meanings of these two fields */
-	reqp->vstor_packet.vm_srb.port =
+	reqp->vstor_packet.u.vm_srb.port =
 		cam_sim_unit(xpt_path_sim(ccb->ccb_h.path));
-	reqp->vstor_packet.vm_srb.path_id =
+	reqp->vstor_packet.u.vm_srb.path_id =
 		cam_sim_bus(xpt_path_sim(ccb->ccb_h.path));
 
-	reqp->vstor_packet.vm_srb.target_id = ccb->ccb_h.target_id;
-	reqp->vstor_packet.vm_srb.lun = ccb->ccb_h.target_lun;
+	reqp->vstor_packet.u.vm_srb.target_id = ccb->ccb_h.target_id;
+	reqp->vstor_packet.u.vm_srb.lun = ccb->ccb_h.target_lun;
 
-	reqp->vstor_packet.vm_srb.cdb_len = csio->cdb_len;
+	reqp->vstor_packet.u.vm_srb.cdb_len = csio->cdb_len;
 	if(ccb->ccb_h.flags & CAM_CDB_POINTER) {
-		memcpy(&reqp->vstor_packet.vm_srb.cdb, csio->cdb_io.cdb_ptr,
+		memcpy(&reqp->vstor_packet.u.vm_srb.u.cdb, csio->cdb_io.cdb_ptr,
 			csio->cdb_len);
 	} else {
-		memcpy(&reqp->vstor_packet.vm_srb.cdb, csio->cdb_io.cdb_bytes,
+		memcpy(&reqp->vstor_packet.u.vm_srb.u.cdb, csio->cdb_io.cdb_bytes,
 			csio->cdb_len);
 	}
 
 	switch (ccb->ccb_h.flags & CAM_DIR_MASK) {
     	case CAM_DIR_OUT: 
-    		reqp->vstor_packet.vm_srb.data_in = WRITE_TYPE;
+    		reqp->vstor_packet.u.vm_srb.data_in = WRITE_TYPE;
     		break;
     	case CAM_DIR_IN:
-    		reqp->vstor_packet.vm_srb.data_in = READ_TYPE;
+    		reqp->vstor_packet.u.vm_srb.data_in = READ_TYPE;
     		break;
     	case CAM_DIR_NONE:
-    		reqp->vstor_packet.vm_srb.data_in = UNKNOWN_TYPE;
+    		reqp->vstor_packet.u.vm_srb.data_in = UNKNOWN_TYPE;
     		break;
     	default:
-    		reqp->vstor_packet.vm_srb.data_in = UNKNOWN_TYPE;
+    		reqp->vstor_packet.u.vm_srb.data_in = UNKNOWN_TYPE;
     		break;
 	}
 
@@ -1375,7 +1377,7 @@ storvsc_io_done(struct hv_storvsc_request *reqp)
 	union ccb *ccb = reqp->ccb;
 	struct ccb_scsiio *csio = &ccb->csio;
 	struct storvsc_softc *sc = reqp->softc;
-	struct vmscsi_req *vm_srb = &reqp->vstor_packet.vm_srb;
+	struct vmscsi_req *vm_srb = &reqp->vstor_packet.u.vm_srb;
 	
 	if (reqp->retries > 0) {
 		mtx_lock(&sc->hs_lock);
diff --git a/sys/dev/hyperv/storvsc/hv_vstorage.h b/sys/dev/hyperv/storvsc/hv_vstorage.h
index d01d0841147..2632676160c 100644
--- a/sys/dev/hyperv/storvsc/hv_vstorage.h
+++ b/sys/dev/hyperv/storvsc/hv_vstorage.h
@@ -24,6 +24,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 __HV_VSTORAGE_H__
@@ -107,7 +109,7 @@ struct vmscsi_req {
 	    uint8_t sense_data[SENSE_BUFFER_SIZE];
 
 	    uint8_t reserved_array[MAX_DATA_BUFFER_LENGTH_WITH_PADDING];
-	};
+	} u;
 
 } __packed;
 
@@ -191,7 +193,7 @@ struct vstor_packet {
 	     * Used during version negotiations.
 	     */
 	    struct vmstor_proto_ver version;
-	};
+	} u;
 
 } __packed;
 
diff --git a/sys/dev/hyperv/vmbus/hv_channel.c b/sys/dev/hyperv/vmbus/hv_channel.c
index 17dfd761123..103260a6adf 100644
--- a/sys/dev/hyperv/vmbus/hv_channel.c
+++ b/sys/dev/hyperv/vmbus/hv_channel.c
@@ -26,6 +26,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
@@ -70,7 +73,7 @@ vmbus_channel_set_event(hv_vmbus_channel *channel)
 
 		synch_set_bit(channel->monitor_bit,
 			(uint32_t *)&monitor_page->
-				trigger_group[channel->monitor_group].pending);
+				trigger_group[channel->monitor_group].u.pending);
 	} else {
 		hv_vmbus_set_event(channel->offer_msg.child_rel_id);
 	}
@@ -101,17 +104,19 @@ hv_vmbus_channel_open(
 
 	/* Allocate the ring buffer */
 	out = contigmalloc((send_ring_buffer_size + recv_ring_buffer_size),
-		M_DEVBUF, M_ZERO, 0UL, BUS_SPACE_MAXADDR, PAGE_SIZE, 0);
+	    M_DEVBUF, M_ZERO, 0UL, BUS_SPACE_MAXADDR, PAGE_SIZE, 0);
 	KASSERT(out != NULL,
 	    ("Error VMBUS: contigmalloc failed to allocate Ring Buffer!"));
 	if (out == NULL)
-	    return (ENOMEM);
+		return (ENOMEM);
 
 	in = ((uint8_t *) out + send_ring_buffer_size);
 
 	new_channel->ring_buffer_pages = out;
-	new_channel->ring_buffer_page_count = (send_ring_buffer_size
-		+ recv_ring_buffer_size) >> PAGE_SHIFT;
+	new_channel->ring_buffer_page_count = (send_ring_buffer_size +
+	    recv_ring_buffer_size) >> PAGE_SHIFT;
+	new_channel->ring_buffer_size = send_ring_buffer_size +
+	    recv_ring_buffer_size;
 
 	hv_vmbus_ring_buffer_init(
 		&new_channel->outbound,
@@ -536,10 +541,8 @@ hv_vmbus_channel_close(hv_vmbus_channel *channel)
 	hv_ring_buffer_cleanup(&channel->outbound);
 	hv_ring_buffer_cleanup(&channel->inbound);
 
-	contigfree(
-		channel->ring_buffer_pages,
-		channel->ring_buffer_page_count,
-		M_DEVBUF);
+	contigfree(channel->ring_buffer_pages, channel->ring_buffer_size,
+	    M_DEVBUF);
 
 	free(info, M_DEVBUF);
 
diff --git a/sys/dev/hyperv/vmbus/hv_hv.c b/sys/dev/hyperv/vmbus/hv_hv.c
index c31673216c5..80a1f42940c 100644
--- a/sys/dev/hyperv/vmbus/hv_hv.c
+++ b/sys/dev/hyperv/vmbus/hv_hv.c
@@ -218,7 +218,7 @@ hv_vmbus_init(void)
 	    0,
 	    sizeof(hv_vmbus_handle) * MAXCPU);
 
-	if (!hv_vmbus_query_hypervisor_presence())
+	if (vm_guest != VM_GUEST_HV)
 	    goto cleanup;
 
 	max_leaf = hv_vmbus_get_hypervisor_version();
@@ -240,8 +240,8 @@ hv_vmbus_init(void)
 	if (virt_addr == NULL)
 	    goto cleanup;
 
-	hypercall_msr.enable = 1;
-	hypercall_msr.guest_physical_address =
+	hypercall_msr.u.enable = 1;
+	hypercall_msr.u.guest_physical_address =
 	    (hv_get_phys_addr(virt_addr) >> PAGE_SHIFT);
 	wrmsr(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64_t);
 
@@ -251,7 +251,7 @@ hv_vmbus_init(void)
 	hypercall_msr.as_uint64_t = 0;
 	hypercall_msr.as_uint64_t = rdmsr(HV_X64_MSR_HYPERCALL);
 
-	if (!hypercall_msr.enable)
+	if (!hypercall_msr.u.enable)
 	    goto cleanup;
 
 	hv_vmbus_g_context.hypercall_page = virt_addr;
@@ -284,7 +284,7 @@ hv_vmbus_init(void)
 
 	cleanup:
 	if (virt_addr != NULL) {
-	    if (hypercall_msr.enable) {
+	    if (hypercall_msr.u.enable) {
 		hypercall_msr.as_uint64_t = 0;
 		wrmsr(HV_X64_MSR_HYPERCALL,
 					hypercall_msr.as_uint64_t);
@@ -426,8 +426,8 @@ hv_vmbus_synic_init(void *arg)
 	 */
 
 	simp.as_uint64_t = rdmsr(HV_X64_MSR_SIMP);
-	simp.simp_enabled = 1;
-	simp.base_simp_gpa = ((hv_get_phys_addr(
+	simp.u.simp_enabled = 1;
+	simp.u.base_simp_gpa = ((hv_get_phys_addr(
 	    hv_vmbus_g_context.syn_ic_msg_page[cpu])) >> PAGE_SHIFT);
 
 	wrmsr(HV_X64_MSR_SIMP, simp.as_uint64_t);
@@ -436,23 +436,23 @@ hv_vmbus_synic_init(void *arg)
 	 * Setup the Synic's event page
 	 */
 	siefp.as_uint64_t = rdmsr(HV_X64_MSR_SIEFP);
-	siefp.siefp_enabled = 1;
-	siefp.base_siefp_gpa = ((hv_get_phys_addr(
+	siefp.u.siefp_enabled = 1;
+	siefp.u.base_siefp_gpa = ((hv_get_phys_addr(
 	    hv_vmbus_g_context.syn_ic_event_page[cpu])) >> PAGE_SHIFT);
 
 	wrmsr(HV_X64_MSR_SIEFP, siefp.as_uint64_t);
 
 	/*HV_SHARED_SINT_IDT_VECTOR + 0x20; */
-	shared_sint.vector = setup_args->vector;
-	shared_sint.masked = FALSE;
-	shared_sint.auto_eoi = FALSE;
+	shared_sint.u.vector = setup_args->vector;
+	shared_sint.u.masked = FALSE;
+	shared_sint.u.auto_eoi = FALSE;
 
 	wrmsr(HV_X64_MSR_SINT0 + HV_VMBUS_MESSAGE_SINT,
 	    shared_sint.as_uint64_t);
 
 	/* Enable the global synic bit */
 	sctrl.as_uint64_t = rdmsr(HV_X64_MSR_SCONTROL);
-	sctrl.enable = 1;
+	sctrl.u.enable = 1;
 
 	wrmsr(HV_X64_MSR_SCONTROL, sctrl.as_uint64_t);
 
@@ -480,7 +480,7 @@ void hv_vmbus_synic_cleanup(void *arg)
 	shared_sint.as_uint64_t = rdmsr(
 	    HV_X64_MSR_SINT0 + HV_VMBUS_MESSAGE_SINT);
 
-	shared_sint.masked = 1;
+	shared_sint.u.masked = 1;
 
 	/*
 	 * Disable the interrupt
@@ -490,14 +490,14 @@ void hv_vmbus_synic_cleanup(void *arg)
 	    shared_sint.as_uint64_t);
 
 	simp.as_uint64_t = rdmsr(HV_X64_MSR_SIMP);
-	simp.simp_enabled = 0;
-	simp.base_simp_gpa = 0;
+	simp.u.simp_enabled = 0;
+	simp.u.base_simp_gpa = 0;
 
 	wrmsr(HV_X64_MSR_SIMP, simp.as_uint64_t);
 
 	siefp.as_uint64_t = rdmsr(HV_X64_MSR_SIEFP);
-	siefp.siefp_enabled = 0;
-	siefp.base_siefp_gpa = 0;
+	siefp.u.siefp_enabled = 0;
+	siefp.u.base_siefp_gpa = 0;
 
 	wrmsr(HV_X64_MSR_SIEFP, siefp.as_uint64_t);
 }
diff --git a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
index 08c61123b2d..ca28fd5892c 100644
--- a/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
+++ b/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
@@ -29,6 +29,8 @@
 /*
  * VM Bus Driver Implementation
  */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -113,7 +115,7 @@ vmbus_msg_swintr(void *dummy)
 	     */
 	    wmb();
 
-	    if (msg->header.message_flags.message_pending) {
+	    if (msg->header.message_flags.u.message_pending) {
 			/*
 			 * This will cause message queue rescan to possibly
 			 * deliver another msg from the hypervisor
@@ -293,11 +295,15 @@ hv_vmbus_child_device_unregister(struct hv_device *child_dev)
 	return(ret);
 }
 
-static void vmbus_identify(driver_t *driver, device_t parent) {
+static void
+vmbus_identify(driver_t *driver, device_t parent)
+{
+	if (!hv_vmbus_query_hypervisor_presence())
+		return;
+
+	vm_guest = VM_GUEST_HV;
+
 	BUS_ADD_CHILD(parent, 0, "vmbus", 0);
-	if (device_find_child(parent, "vmbus", 0) == NULL) {
-		BUS_ADD_CHILD(parent, 0, "vmbus", 0);
-	}
 }
 
 static int
@@ -305,12 +311,9 @@ vmbus_probe(device_t dev) {
 	if(bootverbose)
 		device_printf(dev, "VMBUS: probe\n");
 
-	if (!hv_vmbus_query_hypervisor_presence())
-		return (ENXIO);
-
 	device_set_desc(dev, "Vmbus Devices");
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 /**
@@ -489,10 +492,13 @@ vmbus_attach(device_t dev)
 static void
 vmbus_init(void)
 {
+	if (vm_guest != VM_GUEST_HV)
+		return;
+
 	/* 
 	 * If the system has already booted and thread
-	 * scheduling is possible indicated by the global
-	 * cold set to zero, we just call the driver
+	 * scheduling is possible, as indicated by the
+	 * global cold set to zero, we just call the driver
 	 * initialization directly.
 	 */
 	if (!cold) 
diff --git a/sys/dev/hyperv/vmbus/hv_vmbus_priv.h b/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
index 4607d507f27..6bc875df1e1 100644
--- a/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
+++ b/sys/dev/hyperv/vmbus/hv_vmbus_priv.h
@@ -24,6 +24,8 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 __HYPERV_PRIV_H__
@@ -285,7 +287,7 @@ typedef union {
 	struct {
 		uint8_t	message_pending:1;
 		uint8_t	reserved:7;
-	};
+	} u;
 } hv_vmbus_msg_flags;
 
 typedef uint64_t hv_vmbus_partition_id;
@@ -393,7 +395,7 @@ typedef union {
 		 */
 		uint64_t os_id			: 8;
 		uint64_t vendor_id		: 16;
-	};
+	} u;
 } hv_vmbus_x64_msr_guest_os_id_contents;
 
 /*
@@ -407,7 +409,7 @@ typedef union {
 		uint64_t enable :1;
 		uint64_t reserved :11;
 		uint64_t guest_physical_address :52;
-	};
+	} u;
 } hv_vmbus_x64_msr_hypercall_contents;
 
 typedef union {
@@ -415,7 +417,7 @@ typedef union {
 	struct {
 		uint32_t group_enable :4;
 		uint32_t rsvd_z :28;
-	};
+	} u;
 } hv_vmbus_monitor_trigger_state;
 
 typedef union {
@@ -423,7 +425,7 @@ typedef union {
 	struct {
 		uint32_t pending;
 		uint32_t armed;
-	};
+	} u;
 } hv_vmbus_monitor_trigger_group;
 
 typedef struct {
@@ -499,7 +501,7 @@ typedef union {
 		uint64_t simp_enabled	: 1;
 		uint64_t preserved	: 11;
 		uint64_t base_simp_gpa	: 52;
-	};
+	} u;
 } hv_vmbus_synic_simp;
 
 /*
@@ -511,7 +513,7 @@ typedef union {
 		uint64_t siefp_enabled	: 1;
 		uint64_t preserved	: 11;
 		uint64_t base_siefp_gpa	: 52;
-	};
+	} u;
 } hv_vmbus_synic_siefp;
 
 /*
@@ -525,7 +527,7 @@ typedef union {
 		uint64_t masked		: 1;
 		uint64_t auto_eoi	: 1;
 		uint64_t reserved2	: 46;
-	};
+	} u;
 } hv_vmbus_synic_sint;
 
 /*
@@ -536,7 +538,7 @@ typedef union _hv_vmbus_synic_scontrol {
     struct {
         uint64_t enable		: 1;
         uint64_t reserved	: 63;
-    };
+    } u;
 } hv_vmbus_synic_scontrol;
 
 /*
diff --git a/sys/dev/ic/ns16550.h b/sys/dev/ic/ns16550.h
index 659f5918497..33a7dd14b82 100644
--- a/sys/dev/ic/ns16550.h
+++ b/sys/dev/ic/ns16550.h
@@ -185,6 +185,7 @@
 #define DW_REG_USR	31	/* DesignWare derived Uart Status Reg */
 #define com_usr		39	/* Octeon 16750/16550 Uart Status Reg */
 #define REG_USR		com_usr
+#define USR_BUSY	1	/* Uart Busy. Serial transfer in progress */
 #define USR_TXFIFO_NOTFULL 2    /* Uart TX FIFO Not full */
 
 /* 16950 register #1.  Access enabled by ACR[7].  Also requires !LCR[7]. */
diff --git a/sys/dev/ichsmb/ichsmb_pci.c b/sys/dev/ichsmb/ichsmb_pci.c
index 049a98b621a..906c41d66c1 100644
--- a/sys/dev/ichsmb/ichsmb_pci.c
+++ b/sys/dev/ichsmb/ichsmb_pci.c
@@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$");
 #define ID_PATSBURG			0x1d228086
 #define ID_CPT				0x1c228086
 #define ID_PPT				0x1e228086
+#define ID_AVOTON			0x1f3c8086
 #define ID_COLETOCRK			0x23B08086 
 #define ID_LPT				0x8c228086
 
@@ -190,6 +191,9 @@ ichsmb_pci_probe(device_t dev)
 	case ID_PPT:
 		device_set_desc(dev, "Intel Panther Point SMBus controller");
 		break;
+	case ID_AVOTON:
+		device_set_desc(dev, "Intel Avoton SMBus controller");
+		break;
 	case ID_LPT:
 		device_set_desc(dev, "Intel Lynx Point SMBus controller");
 		break;
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index e945a060c5e..67ebe6c2024 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -130,6 +130,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 
diff --git a/sys/dev/ie/if_ie_isa.c b/sys/dev/ie/if_ie_isa.c
index d8d88fed567..c0403b1aa5c 100644
--- a/sys/dev/ie/if_ie_isa.c
+++ b/sys/dev/ie/if_ie_isa.c
@@ -41,7 +41,10 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 
 #include <sys/module.h>
@@ -54,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
 #include <net/if_media.h>
 
 #include <isa/isavar.h>
diff --git a/sys/dev/if_ndis/if_ndis.c b/sys/dev/if_ndis/if_ndis.c
index 01388c90cd6..48e1cbb684e 100644
--- a/sys/dev/if_ndis/if_ndis.c
+++ b/sys/dev/if_ndis/if_ndis.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kthread.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index a5a7b5ea538..7f3cd98d402 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -43,8 +43,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index a71b5da9255..c229da045c7 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -36,14 +36,17 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/dev/if_ndis/if_ndis_usb.c b/sys/dev/if_ndis/if_ndis_usb.c
index 21fac0de53b..a9a8d67aabd 100644
--- a/sys/dev/if_ndis/if_ndis_usb.c
+++ b/sys/dev/if_ndis/if_ndis_usb.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/iicbus/ds1631.c b/sys/dev/iicbus/ds1631.c
index 51531ef8dbc..22c8eccc727 100644
--- a/sys/dev/iicbus/ds1631.c
+++ b/sys/dev/iicbus/ds1631.c
@@ -398,7 +398,7 @@ ds1631_sensor_sysctl(SYSCTL_HANDLER_ARGS)
 	device_t dev;
 	struct ds1631_softc *sc;
 	int error;
-	unsigned int temp;
+	int temp;
 
 	dev = arg1;
 	sc = device_get_softc(dev);
diff --git a/sys/dev/iicbus/ds1775.c b/sys/dev/iicbus/ds1775.c
index 0b1a4cb4493..884ac4cc83b 100644
--- a/sys/dev/iicbus/ds1775.c
+++ b/sys/dev/iicbus/ds1775.c
@@ -257,7 +257,7 @@ ds1775_sensor_sysctl(SYSCTL_HANDLER_ARGS)
 	device_t dev;
 	struct ds1775_softc *sc;
 	int error;
-	unsigned int temp;
+	int temp;
 
 	dev = arg1;
 	sc = device_get_softc(dev);
diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
index 530cf648e7a..644a12ced82 100644
--- a/sys/dev/iicbus/if_ic.c
+++ b/sys/dev/iicbus/if_ic.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
 
diff --git a/sys/dev/iicbus/max6690.c b/sys/dev/iicbus/max6690.c
index f6e2bd6686b..5742e179f13 100644
--- a/sys/dev/iicbus/max6690.c
+++ b/sys/dev/iicbus/max6690.c
@@ -362,7 +362,7 @@ max6690_sensor_sysctl(SYSCTL_HANDLER_ARGS)
 	struct max6690_softc *sc;
 	struct max6690_sensor *sens;
 	int error;
-	unsigned int temp;
+	int temp;
 
 	dev = arg1;
 	sc = device_get_softc(dev);
diff --git a/sys/dev/ipmi/ipmi.c b/sys/dev/ipmi/ipmi.c
index c42805de35a..5e30770cb66 100644
--- a/sys/dev/ipmi/ipmi.c
+++ b/sys/dev/ipmi/ipmi.c
@@ -647,6 +647,9 @@ ipmi_wd_event(void *arg, unsigned int cmd, int *error)
 	unsigned int timeout;
 	int e;
 
+	if (dumping)
+		return;
+
 	cmd &= WD_INTERVAL;
 	if (cmd > 0 && cmd <= 63) {
 		timeout = ((uint64_t)1 << cmd) / 1000000000;
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c
index 28fa0fd10af..42391243011 100644
--- a/sys/dev/ipw/if_ipw.c
+++ b/sys/dev/ipw/if_ipw.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/isci/isci.c b/sys/dev/isci/isci.c
index cd20ba1df60..2f0727d088c 100644
--- a/sys/dev/isci/isci.c
+++ b/sys/dev/isci/isci.c
@@ -84,6 +84,7 @@ static driver_t isci_pci_driver = {
 };
 
 DRIVER_MODULE(isci, pci, isci_pci_driver, isci_devclass, 0, 0);
+MODULE_DEPEND(isci, cam, 1, 1, 1);
 
 static struct _pcsid
 {
diff --git a/sys/dev/isci/isci_io_request.c b/sys/dev/isci/isci_io_request.c
index 4486f31d64d..d1f5afe8943 100644
--- a/sys/dev/isci/isci_io_request.c
+++ b/sys/dev/isci/isci_io_request.c
@@ -153,11 +153,16 @@ isci_io_request_complete(SCI_CONTROLLER_HANDLE_T scif_controller,
 
 	case SCI_IO_FAILURE_REMOTE_DEVICE_RESET_REQUIRED:
 		isci_remote_device_reset(isci_remote_device, NULL);
+		ccb->ccb_h.status |= CAM_REQ_TERMIO;
+		isci_log_message(0, "ISCI",
+		    "isci: bus=%x target=%x lun=%x cdb[0]=%x remote device reset required\n",
+		    ccb->ccb_h.path_id, ccb->ccb_h.target_id,
+		    ccb->ccb_h.target_lun, ccb->csio.cdb_io.cdb_bytes[0]);
+		break;
 
-		/* drop through */
 	case SCI_IO_FAILURE_TERMINATED:
 		ccb->ccb_h.status |= CAM_REQ_TERMIO;
-		isci_log_message(1, "ISCI",
+		isci_log_message(0, "ISCI",
 		    "isci: bus=%x target=%x lun=%x cdb[0]=%x terminated\n",
 		    ccb->ccb_h.path_id, ccb->ccb_h.target_id,
 		    ccb->ccb_h.target_lun, ccb->csio.cdb_io.cdb_bytes[0]);
diff --git a/sys/dev/isci/isci_sysctl.c b/sys/dev/isci/isci_sysctl.c
index 6a22e389d3e..4623a8aa396 100644
--- a/sys/dev/isci/isci_sysctl.c
+++ b/sys/dev/isci/isci_sysctl.c
@@ -193,6 +193,35 @@ isci_sysctl_start_phy(SYSCTL_HANDLER_ARGS)
 	return 0;
 }
 
+static int
+isci_sysctl_log_frozen_lun_masks(SYSCTL_HANDLER_ARGS)
+{
+	struct isci_softc	*isci = (struct isci_softc *)arg1;
+	struct ISCI_REMOTE_DEVICE *device;
+	int32_t			log_frozen_devices = 0;
+	int			error, i, j;
+
+	error = sysctl_handle_int(oidp, &log_frozen_devices, 0, req);
+
+	if (error || log_frozen_devices == 0)
+		return (error);
+
+	for (i = 0; i < isci->controller_count; i++) {
+		for (j = 0; j < SCI_MAX_REMOTE_DEVICES; j++) {
+			device = isci->controllers[i].remote_device[j];
+
+			if (device == NULL)
+				continue;
+
+			device_printf(isci->device,
+			    "controller %d device %3d frozen_lun_mask 0x%02x\n",
+			    i, j, device->frozen_lun_mask);
+		}
+	}
+
+	return (0);
+}
+
 void isci_sysctl_initialize(struct isci_softc *isci)
 {
 	struct sysctl_ctx_list *sysctl_ctx = device_get_sysctl_ctx(isci->device);
@@ -225,5 +254,10 @@ void isci_sysctl_initialize(struct isci_softc *isci)
 	SYSCTL_ADD_PROC(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO,
 	    "start_phy", CTLTYPE_UINT| CTLFLAG_RW, isci, 0,
 	    isci_sysctl_start_phy, "IU", "Start PHY on a controller");
+
+	SYSCTL_ADD_PROC(sysctl_ctx, SYSCTL_CHILDREN(sysctl_tree), OID_AUTO,
+	    "log_frozen_lun_masks", CTLTYPE_UINT| CTLFLAG_RW, isci, 0,
+	    isci_sysctl_log_frozen_lun_masks, "IU",
+	    "Log frozen lun masks to kernel log");
 }
 
diff --git a/sys/dev/isci/isci_task_request.c b/sys/dev/isci/isci_task_request.c
index 4ad07319fc4..5d7f63d294b 100644
--- a/sys/dev/isci/isci_task_request.c
+++ b/sys/dev/isci/isci_task_request.c
@@ -194,11 +194,20 @@ isci_task_request_complete(SCI_CONTROLLER_HANDLE_T scif_controller,
 		break;
 
 	case SCI_TASK_FAILURE_INVALID_STATE:
-	case SCI_TASK_FAILURE_INSUFFICIENT_RESOURCES:
-	case SCI_FAILURE_TIMEOUT:
 		retry_task = TRUE;
 		isci_log_message(0, "ISCI",
-		    "unhandled task completion code 0x%x\n", completion_status);
+		    "task failure (invalid state) - retrying\n");
+		break;
+
+	case SCI_TASK_FAILURE_INSUFFICIENT_RESOURCES:
+		retry_task = TRUE;
+		isci_log_message(0, "ISCI",
+		    "task failure (insufficient resources) - retrying\n");
+		break;
+
+	case SCI_FAILURE_TIMEOUT:
+		retry_task = TRUE;
+		isci_log_message(0, "ISCI", "task timeout - retrying\n");
 		break;
 
 	case SCI_TASK_FAILURE:
diff --git a/sys/dev/iscsi/icl.c b/sys/dev/iscsi/icl.c
index 67968783a96..f29f0d2cf3c 100644
--- a/sys/dev/iscsi/icl.c
+++ b/sys/dev/iscsi/icl.c
@@ -564,6 +564,7 @@ icl_conn_receive_pdu(struct icl_conn *ic, size_t *availablep)
 			    "MaxDataSegmentLength %zd; "
 			    "dropping connection",
 			    len, ic->ic_max_data_segment_length);
+			error = EINVAL;
 			break;
 		}
 
@@ -722,11 +723,7 @@ icl_receive_thread(void *arg)
 	for (;;) {
 		if (ic->ic_disconnecting) {
 			//ICL_DEBUG("terminating");
-			ICL_CONN_LOCK(ic);
-			ic->ic_receive_running = false;
-			ICL_CONN_UNLOCK(ic);
-			kthread_exit();
-			return;
+			break;
 		}
 
 		SOCKBUF_LOCK(&so->so_rcv);
@@ -739,6 +736,11 @@ icl_receive_thread(void *arg)
 
 		icl_conn_receive_pdus(ic, available);
 	}
+
+	ICL_CONN_LOCK(ic);
+	ic->ic_receive_running = false;
+	ICL_CONN_UNLOCK(ic);
+	kthread_exit();
 }
 
 static int
@@ -878,22 +880,19 @@ icl_send_thread(void *arg)
 
 	ICL_CONN_LOCK(ic);
 	ic->ic_send_running = true;
-	ICL_CONN_UNLOCK(ic);
 
 	for (;;) {
-		ICL_CONN_LOCK(ic);
 		if (ic->ic_disconnecting) {
 			//ICL_DEBUG("terminating");
-			ic->ic_send_running = false;
-			ICL_CONN_UNLOCK(ic);
-			kthread_exit();
-			return;
+			break;
 		}
-		if (TAILQ_EMPTY(&ic->ic_to_send))
-			cv_wait(&ic->ic_send_cv, &ic->ic_lock);
 		icl_conn_send_pdus(ic);
-		ICL_CONN_UNLOCK(ic);
+		cv_wait(&ic->ic_send_cv, &ic->ic_lock);
 	}
+
+	ic->ic_send_running = false;
+	ICL_CONN_UNLOCK(ic);
+	kthread_exit();
 }
 
 static int
diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c
index 8bd22079cc6..395c8bb2ff3 100644
--- a/sys/dev/iscsi/iscsi.c
+++ b/sys/dev/iscsi/iscsi.c
@@ -726,10 +726,15 @@ iscsi_error_callback(struct icl_conn *ic)
 static void
 iscsi_pdu_handle_nop_in(struct icl_pdu *response)
 {
+	struct iscsi_session *is;
 	struct iscsi_bhs_nop_out *bhsno;
 	struct iscsi_bhs_nop_in *bhsni;
 	struct icl_pdu *request;
+	void *data = NULL;
+	size_t datasize;
+	int error;
 
+	is = PDU_SESSION(response);
 	bhsni = (struct iscsi_bhs_nop_in *)response->ip_bhs;
 
 	if (bhsni->bhsni_target_transfer_tag == 0xffffffff) {
@@ -741,22 +746,47 @@ iscsi_pdu_handle_nop_in(struct icl_pdu *response)
 		return;
 	}
 
+	datasize = icl_pdu_data_segment_length(response);
+	if (datasize > 0) {
+		data = malloc(datasize, M_ISCSI, M_NOWAIT | M_ZERO);
+		if (data == NULL) {
+			ISCSI_SESSION_WARN(is, "failed to allocate memory; "
+			    "reconnecting");
+			icl_pdu_free(response);
+			iscsi_session_reconnect(is);
+			return;
+		}
+		icl_pdu_get_data(response, 0, data, datasize);
+	}
+
 	request = icl_pdu_new_bhs(response->ip_conn, M_NOWAIT);
 	if (request == NULL) {
+		ISCSI_SESSION_WARN(is, "failed to allocate memory; "
+		    "reconnecting");
+		free(data, M_ISCSI);
 		icl_pdu_free(response);
+		iscsi_session_reconnect(is);
 		return;
 	}
 	bhsno = (struct iscsi_bhs_nop_out *)request->ip_bhs;
 	bhsno->bhsno_opcode = ISCSI_BHS_OPCODE_NOP_OUT |
 	    ISCSI_BHS_OPCODE_IMMEDIATE;
 	bhsno->bhsno_flags = 0x80;
-	bhsno->bhsno_initiator_task_tag = 0xffffffff; /* XXX */
+	bhsno->bhsno_initiator_task_tag = 0xffffffff;
 	bhsno->bhsno_target_transfer_tag = bhsni->bhsni_target_transfer_tag;
-
-	request->ip_data_len = response->ip_data_len;
-	request->ip_data_mbuf = response->ip_data_mbuf;
-	response->ip_data_len = 0;
-	response->ip_data_mbuf = NULL;
+	if (datasize > 0) {
+		error = icl_pdu_append_data(request, data, datasize, M_NOWAIT);
+		if (error != 0) {
+			ISCSI_SESSION_WARN(is, "failed to allocate memory; "
+			    "reconnecting");
+			free(data, M_ISCSI);
+			icl_pdu_free(request);
+			icl_pdu_free(response);
+			iscsi_session_reconnect(is);
+			return;
+		}
+		free(data, M_ISCSI);
+	}
 
 	icl_pdu_free(response);
 	iscsi_pdu_queue_locked(request);
@@ -920,40 +950,59 @@ iscsi_pdu_handle_data_in(struct icl_pdu *response)
 
 	csio = &io->io_ccb->csio;
 
-	if (ntohl(bhsdi->bhsdi_buffer_offset) + data_segment_len >
-	    csio->dxfer_len) {
+	if (io->io_received + data_segment_len > csio->dxfer_len) {
 		ISCSI_SESSION_WARN(is, "oversize data segment (%zd bytes "
-		    "at offset %d, buffer is %d)",
-		    data_segment_len, ntohl(bhsdi->bhsdi_buffer_offset),
-		    csio->dxfer_len);
+		    "at offset %zd, buffer is %d)",
+		    data_segment_len, io->io_received, csio->dxfer_len);
 		icl_pdu_free(response);
 		iscsi_session_reconnect(is);
 		return;
 	}
 
-	icl_pdu_get_data(response, 0, csio->data_ptr + ntohl(bhsdi->bhsdi_buffer_offset), data_segment_len);
+	icl_pdu_get_data(response, 0, csio->data_ptr + io->io_received, data_segment_len);
 	io->io_received += data_segment_len;
 
 	/*
 	 * XXX: Check DataSN.
 	 * XXX: Check F.
 	 */
-	if (bhsdi->bhsdi_flags & BHSDI_FLAGS_S) {
-		//ISCSI_SESSION_DEBUG(is, "got S flag; status 0x%x", bhsdi->bhsdi_status);
-		if (bhsdi->bhsdi_status == 0) {
-			io->io_ccb->ccb_h.status = CAM_REQ_CMP;
-		} else {
-			if ((io->io_ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) {
-				xpt_freeze_devq(io->io_ccb->ccb_h.path, 1);
-				ISCSI_SESSION_DEBUG(is, "freezing devq");
-			}
-			io->io_ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR | CAM_DEV_QFRZN;
-			csio->scsi_status = bhsdi->bhsdi_status;
-		}
-		xpt_done(io->io_ccb);
-		iscsi_outstanding_remove(is, io);
+	if ((bhsdi->bhsdi_flags & BHSDI_FLAGS_S) == 0) {
+		/*
+		 * Nothing more to do.
+		 */
+		icl_pdu_free(response);
+		return;
 	}
 
+	//ISCSI_SESSION_DEBUG(is, "got S flag; status 0x%x", bhsdi->bhsdi_status);
+	if (bhsdi->bhsdi_status == 0) {
+		io->io_ccb->ccb_h.status = CAM_REQ_CMP;
+	} else {
+		if ((io->io_ccb->ccb_h.status & CAM_DEV_QFRZN) == 0) {
+			xpt_freeze_devq(io->io_ccb->ccb_h.path, 1);
+			ISCSI_SESSION_DEBUG(is, "freezing devq");
+		}
+		io->io_ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR | CAM_DEV_QFRZN;
+		csio->scsi_status = bhsdi->bhsdi_status;
+	}
+
+	if ((csio->ccb_h.flags & CAM_DIR_MASK) == CAM_DIR_IN) {
+		KASSERT(io->io_received <= csio->dxfer_len,
+		    ("io->io_received > csio->dxfer_len"));
+		if (io->io_received < csio->dxfer_len) {
+			csio->resid = ntohl(bhsdi->bhsdi_residual_count);
+			if (csio->resid != csio->dxfer_len - io->io_received) {
+				ISCSI_SESSION_WARN(is, "underflow mismatch: "
+				    "target indicates %d, we calculated %zd",
+				    csio->resid,
+				    csio->dxfer_len - io->io_received);
+			}
+			csio->resid = csio->dxfer_len - io->io_received;
+		}
+	}
+
+	xpt_done(io->io_ccb);
+	iscsi_outstanding_remove(is, io);
 	icl_pdu_free(response);
 }
 
@@ -1003,8 +1052,24 @@ iscsi_pdu_handle_r2t(struct icl_pdu *response)
 	 */
 
 	io->io_datasn = 0;
+
 	off = ntohl(bhsr2t->bhsr2t_buffer_offset);
+	if (off > csio->dxfer_len) {
+		ISCSI_SESSION_WARN(is, "target requested invalid offset "
+		    "%zd, buffer is is %d; reconnecting", off, csio->dxfer_len);
+		icl_pdu_free(response);
+		iscsi_session_reconnect(is);
+		return;
+	}
+
 	total_len = ntohl(bhsr2t->bhsr2t_desired_data_transfer_length);
+	if (total_len == 0 || total_len > csio->dxfer_len) {
+		ISCSI_SESSION_WARN(is, "target requested invalid length "
+		    "%zd, buffer is %d; reconnecting", total_len, csio->dxfer_len);
+		icl_pdu_free(response);
+		iscsi_session_reconnect(is);
+		return;
+	}
 
 	//ISCSI_SESSION_DEBUG(is, "r2t; off %zd, len %zd", off, total_len);
 
@@ -1015,7 +1080,8 @@ iscsi_pdu_handle_r2t(struct icl_pdu *response)
 			len = is->is_max_data_segment_length;
 
 		if (off + len > csio->dxfer_len) {
-			ISCSI_SESSION_WARN(is, "bad off %zd, len %d",
+			ISCSI_SESSION_WARN(is, "target requested invalid "
+			    "length/offset %zd, buffer is %d; reconnecting",
 			    off + len, csio->dxfer_len);
 			icl_pdu_free(response);
 			iscsi_session_reconnect(is);
@@ -1038,8 +1104,11 @@ iscsi_pdu_handle_r2t(struct icl_pdu *response)
 		    bhsr2t->bhsr2t_target_transfer_tag;
 		bhsdo->bhsdo_datasn = htonl(io->io_datasn++);
 		bhsdo->bhsdo_buffer_offset = htonl(off);
-		error = icl_pdu_append_data(request, csio->data_ptr + off, len, M_NOWAIT);
+		error = icl_pdu_append_data(request, csio->data_ptr + off, len,
+		    M_NOWAIT);
 		if (error != 0) {
+			ISCSI_SESSION_WARN(is, "failed to allocate memory; "
+			    "reconnecting");
 			icl_pdu_free(request);
 			icl_pdu_free(response);
 			iscsi_session_reconnect(is);
@@ -1178,6 +1247,18 @@ iscsi_ioctl_daemon_handoff(struct iscsi_softc *sc,
 		sx_sunlock(&sc->sc_lock);
 		return (EINVAL);
 	}
+	if (is->is_connected) {
+		/*
+		 * This might have happened because another iscsid(8)
+		 * instance handed off the connection in the meantime.
+		 * Just return.
+		 */
+		ISCSI_SESSION_WARN(is, "handoff on already connected "
+		    "session");
+		ISCSI_SESSION_UNLOCK(is);
+		sx_sunlock(&sc->sc_lock);
+		return (EBUSY);
+	}
 
 	strlcpy(is->is_target_alias, handoff->idh_target_alias,
 	    sizeof(is->is_target_alias));
@@ -2041,10 +2122,12 @@ iscsi_load(void)
 	sc->sc_cdev->si_drv1 = sc;
 
 	/*
-	 * XXX: For some reason this doesn't do its job; active sessions still hang out there
-	 * 	after final sync, making the reboot effectively hang.
+	 * Note that this needs to get run before dashutdown().  Otherwise,
+	 * when rebooting with iSCSI session with outstanding requests,
+	 * but disconnected, dashutdown() will hang on cam_periph_runccb().
 	 */
-	sc->sc_shutdown_eh = EVENTHANDLER_REGISTER(shutdown_post_sync, iscsi_shutdown, sc, SHUTDOWN_PRI_DEFAULT);
+	sc->sc_shutdown_eh = EVENTHANDLER_REGISTER(shutdown_post_sync,
+	    iscsi_shutdown, sc, SHUTDOWN_PRI_FIRST);
 
 	return (0);
 }
diff --git a/sys/dev/iscsi_initiator/isc_cam.c b/sys/dev/iscsi_initiator/isc_cam.c
index c3ddd26802a..8f8bd6443b2 100644
--- a/sys/dev/iscsi_initiator/isc_cam.c
+++ b/sys/dev/iscsi_initiator/isc_cam.c
@@ -63,7 +63,7 @@ _inq(struct cam_sim *sim, union ccb *ccb)
      isc_session_t *sp = cam_sim_softc(sim);
 
      debug_called(8);
-     debug(3, "sid=%d target=%d lun=%d", sp->sid, ccb->ccb_h.target_id, ccb->ccb_h.target_lun);
+     debug(3, "sid=%d target=%d lun=%jx", sp->sid, ccb->ccb_h.target_id, (uintmax_t)ccb->ccb_h.target_lun);
 
      cpi->version_num = 1; /* XXX??? */
      cpi->hba_inquiry = PI_SDTR_ABLE | PI_TAG_ABLE | PI_WIDE_32;
@@ -188,9 +188,9 @@ ic_action(struct cam_sim *sim, union ccb *ccb)
      debug_called(8);
 
      ccb_h->spriv_ptr0 = sp;
-     sdebug(4, "func_code=0x%x flags=0x%x status=0x%x target=%d lun=%d retry_count=%d timeout=%d",
+     sdebug(4, "func_code=0x%x flags=0x%x status=0x%x target=%d lun=%jx retry_count=%d timeout=%d",
 	   ccb_h->func_code, ccb->ccb_h.flags, ccb->ccb_h.status,
-	   ccb->ccb_h.target_id, ccb->ccb_h.target_lun, 
+	   ccb->ccb_h.target_id, (uintmax_t)ccb->ccb_h.target_lun, 
 	   ccb->ccb_h.retry_count, ccb_h->timeout);
      if(sp == NULL) {
 	  xdebug("sp == NULL! cannot happen");
@@ -235,8 +235,8 @@ ic_action(struct cam_sim *sim, union ccb *ccb)
 	  struct	ccb_calc_geometry *ccg;
 
 	  ccg = &ccb->ccg;
-	  debug(4, "sid=%d target=%d lun=%d XPT_CALC_GEOMETRY vsize=%jd bsize=%d",
-		sp->sid, ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
+	  debug(4, "sid=%d target=%d lun=%jx XPT_CALC_GEOMETRY vsize=%jd bsize=%d",
+		sp->sid, ccb->ccb_h.target_id, (uintmax_t)ccb->ccb_h.target_lun,
 		ccg->volume_size, ccg->block_size);
 	  if(ccg->block_size == 0 ||
 	     (ccg->volume_size < ccg->block_size)) {
diff --git a/sys/dev/isf/isf.c b/sys/dev/isf/isf.c
deleted file mode 100644
index eaaad159753..00000000000
--- a/sys/dev/isf/isf.c
+++ /dev/null
@@ -1,741 +0,0 @@
-/*-
- * Copyright (c) 2012 Robert N. M. Watson
- * Copyright (c) 2012 SRI International
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/module.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-
-#include <sys/bus.h>
-#include <sys/conf.h>
-#include <sys/endian.h>
-#include <sys/bio.h>
-#include <sys/kthread.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/rman.h>
-#include <sys/taskqueue.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-
-#include <geom/geom_disk.h>
-
-#include <dev/isf/isf.h>
-
-/* Read Mode */
-#define	ISF_CMD_RA	0xFF	/* Read Array mode */
-#define	ISF_CMD_RSR	0x70	/* Read Status Register mode */
-#define	ISF_CMD_RDI	0x90	/* Read Device ID/Config Reg mode */
-#define	ISF_CMD_RQ	0x98	/* Read Query mode */
-#define	ISF_CMD_CSR	0x50	/* Clear Status Register */
-
-/* Write Mode */
-#define	ISF_CMD_WPS	0x40	/* Word Program Setup */
-#define ISF_CMD_BPS	0xE8	/* Buffered Program Setup */
-#define	ISF_CMD_BPC	0xD0	/* Buffered Program Confirm */
-
-/* Erase Mode */
-#define	ISF_CMD_BES	0x20	/* Block Erase Setup */
-#define ISF_CMD_BEC	0xD0	/* Block Erase Confirm */
-
-/* Block Locking/Unlocking */
-#define	ISF_CMD_LBS	0x60	/* Lock Block Setup */
-#define	ISF_CMD_LB	0x01	/* Lock Block */
-#define	ISF_CMD_UB	0xD0	/* Unlock Block */
-
-/*
- * Read Device Identifier registers.
- *
- * NOTE: ISF_RDIR_BLC is relative to the block base address.
- */
-#define	ISF_REG_MC	0x00	/* Manufacture Code */
-#define ISF_REG_ID	0x01	/* Device ID Code */
-#define	ISF_REG_BLC	0x02	/* Block Lock Configuration */
-#define ISF_REG_RCR	0x05	/* Read Configuration Register */
-
-/*
- * Protection Registers
- */
-#define ISF_REG_L0	0x80	/* Lock Register 0 */
-#define ISF_REG_FPP	0x81	/* 64-bit Factory Protection Register */
-#define ISF_REG_UPP	0x85	/* 64-bit User Protection Register */
-#define ISF_REG_L1	0x89	/* Lock Register 1 */
-#define ISF_REG_PP1	0x8A	/* 128-bit Protection Register 1 */
-#define ISF_REG_PP2	0x92	/* 128-bit Protection Register 2 */
-#define ISF_REG_PP3	0x9A	/* 128-bit Protection Register 3 */
-#define ISF_REG_PP4	0xA2	/* 128-bit Protection Register 4 */
-#define ISF_REG_PP5	0xAA	/* 128-bit Protection Register 5 */
-#define ISF_REG_PP6	0xB2	/* 128-bit Protection Register 6 */
-#define ISF_REG_PP7	0xBA	/* 128-bit Protection Register 7 */
-#define ISF_REG_PP8	0xC2	/* 128-bit Protection Register 8 */
-#define ISF_REG_PP9	0xCA	/* 128-bit Protection Register 9 */
-#define ISF_REG_PP10	0xD2	/* 128-bit Protection Register 10 */
-#define ISF_REG_PP11	0xDA	/* 128-bit Protection Register 11 */
-#define ISF_REG_PP12	0xE2	/* 128-bit Protection Register 12 */
-#define ISF_REG_PP13	0xEA	/* 128-bit Protection Register 13 */
-#define ISF_REG_PP14	0xF2	/* 128-bit Protection Register 14 */
-#define ISF_REG_PP15	0xFA	/* 128-bit Protection Register 15 */
-#define ISF_REG_PP16	0x102	/* 128-bit Protection Register 16 */
-
-#define	ISF_SR_BWS	(1 << 0)	/* BEFP Status */
-#define	ISF_SR_BLS	(1 << 1)	/* Block-Locked Status */
-#define ISF_SR_PSS	(1 << 2)	/* Program Suspend Status */
-#define	ISF_SR_VPPS	(1 << 3)	/* Vpp Status */
-#define	ISF_SR_PS	(1 << 4)	/* Program Status */
-#define ISF_SR_ES	(1 << 5)	/* Erase Status */
-#define ISF_SR_ESS	(1 << 6)	/* Erase Suspend Status */
-#define ISF_SR_DWS	(1 << 7)	/* Device Write Status */
-#define ISF_SR_FSC_MASK	(ISF_SR_VPPS | ISF_SR_PS | ISF_SR_BLS)
-
-#define ISF_BUFFER_PROGRAM
-
-MALLOC_DEFINE(M_ISF, "isf_data", "Intel StrateFlash driver");
-static int	isf_debug = 0;
-
-static struct isf_chips {
-	uint16_t	 chip_id;
-	size_t		 chip_size;
-	const char	*chip_desc;
-} chip_ids[] = {
-	{ 0x8817, 0x0800000, "64-Mbit Top Parameter" },
-	{ 0x881A, 0x0800000, "64-Mbit Bottom Parameter" },
-	{ 0x8818, 0x1000000, "128-Mbit Top Parameter" },
-	{ 0x881B, 0x1000000, "128-Mbit Bottom Parameter" },
-	{ 0x8919, 0x2000000, "256-Mbit Top Parameter" },
-	{ 0x891C, 0x2000000, "256-Mbit Bottom Parameter" },
-	{ 0x8961, 0x2000000, "512-Mbit package (half)" },
-	{ 0x0000, 0x0000000, NULL }
-};
-
-static void	isf_task(void *arg);
-
-/* 
- * Device driver for the Intel StrataFlash NOR flash device.  This
- * implementation is known to work with 256Mb instances of the device, but may
- * also work with other 64/128/512Mb parts without much work.  Multiple
- * device instances should be used when multiple parts are in the same
- * physical package, due to variable block size support in the StrataFlash
- * part.
- */
-devclass_t	isf_devclass;
-
-static uint16_t
-isf_read_reg(struct isf_softc *sc, uint16_t reg)
-{
-
-	if (isf_debug)
-		device_printf(sc->isf_dev, "isf_read_reg(0x%02x)\n", reg);
-	return (le16toh(bus_read_2(sc->isf_res, reg * 2)));
-}
-
-static uint64_t
-isf_read_reg64(struct isf_softc *sc, uint16_t reg)
-{
-	uint64_t val;
-	uint16_t *val16 = (uint16_t *)&val;
-
-	if (isf_debug)
-		device_printf(sc->isf_dev, "isf_read_reg64(0x%02x)\n", reg);
-	val16[0] = bus_read_2(sc->isf_res, reg * 2);
-	val16[1] = bus_read_2(sc->isf_res, (reg+1) * 2);
-	val16[2] = bus_read_2(sc->isf_res, (reg+2) * 2);
-	val16[3] = bus_read_2(sc->isf_res, (reg+3) * 2);
-
-	return(le64toh(val));
-}
-
-static uint16_t
-isf_read_off(struct isf_softc *sc, off_t off)
-{
-
-	KASSERT(off >= 0, ("%s: negative offset\n", __func__));
-	KASSERT(off < sc->isf_disk->d_mediasize,
-	    ("%s: offset out side address space 0x%08jx \n", __func__,
-	    (intmax_t)off));
-
-	if (isf_debug)
-		device_printf(sc->isf_dev, "isf_read_off(0x%08jx)\n",
-		    (intmax_t)off);
-	return (le16toh(bus_read_2(sc->isf_res, off)));
-}
-
-static void
-isf_write_cmd(struct isf_softc *sc, off_t off, uint16_t cmd)
-{
-	
-	if (isf_debug)
-		device_printf(sc->isf_dev, "isf_write_cmd(0x%08jx, 0x%02x)\n",
-		    off, cmd);
-	bus_write_2(sc->isf_res, off, htole16(cmd));
-}
-
-static uint16_t
-isf_read_status(struct isf_softc *sc, off_t off)
-{
-	
-	isf_write_cmd(sc, off/2, ISF_CMD_RSR);
-	return isf_read_off(sc, off);
-}
-
-static void
-isf_clear_status(struct isf_softc *sc)
-{
-	
-	isf_write_cmd(sc, 0, ISF_CMD_CSR);
-}
-
-static int
-isf_full_status_check(struct isf_softc *sc, off_t off)
-{
-	int		error = 0;
-	uint16_t	status;
-	
-	status = isf_read_status(sc, off);
-	if (status & ISF_SR_VPPS) {
-		device_printf(sc->isf_dev, "Vpp Range Error\n");
-		error = EIO;
-	} else if (status & ISF_SR_PS) {
-		device_printf(sc->isf_dev, "Program Error\n");
-		error = EIO;
-	} else if (status & ISF_SR_BLS) {
-		device_printf(sc->isf_dev, "Device Protect Error\n");
-		error = EIO;
-	}
-	isf_clear_status(sc);
-
-	return(error);
-}
-
-static int
-isf_full_erase_status_check(struct isf_softc *sc, off_t off)
-{
-	int		error = 0;
-	uint16_t	status;
-	
-	status = isf_read_status(sc, off);
-	if (status & ISF_SR_VPPS) {
-		device_printf(sc->isf_dev, "Vpp Range Error\n");
-		error = EIO;
-	} else if (status & (ISF_SR_PS|ISF_SR_ES)) {
-		device_printf(sc->isf_dev, "Command Sequence Error\n");
-		error = EIO;
-	} else if (status & ISF_SR_ES) {
-		device_printf(sc->isf_dev, "Block Erase Error\n");
-		error = EIO;
-	} else if (status & ISF_SR_BLS) {
-		device_printf(sc->isf_dev, "Block Locked Error\n");
-		error = EIO;
-	}
-	isf_clear_status(sc);
-
-	return(error);
-}
-
-static void
-isf_unlock_block(struct isf_softc *sc, off_t off)
-{
-
-	isf_write_cmd(sc, off, ISF_CMD_LBS);
-	isf_write_cmd(sc, off, ISF_CMD_UB);
-	isf_write_cmd(sc, off, ISF_CMD_RA);
-}
-
-static void
-isf_lock_block(struct isf_softc *sc, off_t off)
-{
-
-	isf_write_cmd(sc, off, ISF_CMD_LBS);
-	isf_write_cmd(sc, off, ISF_CMD_LB);
-	isf_write_cmd(sc, off, ISF_CMD_RA);
-}
-
-static void
-isf_read(struct isf_softc *sc, off_t off, void *data, size_t len)
-{
-
-	KASSERT((uintptr_t)data % 2 == 0,
-	    ("%s: unaligned data %p", __func__, data));
-	KASSERT((len <= ISF_SECTORSIZE) && (len % 2 == 0),
-	    ("%s: invalid length %ju", __func__, len));
-	KASSERT(off % ISF_SECTORSIZE == 0,
-	    ("%s: invalid offset %ju\n", __func__, off));
-
-	/*
-	 * It is not permitted to read blocks that are in the process of
-	 * being erased, but we know they will be all 1's after the
-	 * erase so just report that value if asked about a block that
-	 * is being erased.
-	 */
-	if (sc->isf_bstate[off / ISF_ERASE_BLOCK] == BS_ERASING)
-		memset(data, 0xFF, len);
-	else
-		bus_read_region_2(sc->isf_res, off, (uint16_t *)data, len / 2);
-}
-
-static int
-isf_write(struct isf_softc *sc, off_t off, void *data, size_t len)
-{
-	int		 cycles, error = 0;
-	uint16_t	*dp;
-	uint16_t	 status;
-	off_t		 coff;
-
-	KASSERT((uintptr_t)data % 2 == 0,
-	    ("%s: unaligned data %p", __func__, data));
-	KASSERT((len <= ISF_SECTORSIZE) && (len % 2 == 0),
-	    ("%s: invalid length %ju", __func__, len));
-	KASSERT(off % ISF_SECTORSIZE == 0,
-	    ("%s: invalid offset %ju\n", __func__, off));
-	KASSERT(!sc->isf_erasing,
-	    ("%s: trying to write while erasing\n", __func__));
-	KASSERT(sc->isf_bstate[off / ISF_ERASE_BLOCK] != BS_ERASING,
-	    ("%s: block being erased at %ju\n", __func__, off));
-
-	isf_unlock_block(sc, off);
-
-#ifdef ISF_BUFFER_PROGRAM
-	for (dp = data, coff = off; dp - (uint16_t *)data < len / 2;
-	    dp += 32, coff += 64) {
-		isf_clear_status(sc);
-		isf_write_cmd(sc, coff, ISF_CMD_BPS);
-		cycles = 0xFFFF;
-		while ( !(isf_read_off(sc, coff) & ISF_SR_DWS) ) {
-			if (cycles-- == 0) {
-				device_printf(sc->isf_dev, "timeout waiting"
-				    " for write to start at 0x08%jx\n",
-				    (intmax_t)coff);
-				return (EIO);
-			}
-			isf_write_cmd(sc, coff, ISF_CMD_BPS);
-		}
-
-		/* When writing N blocks, send N-1 as the count */
-		isf_write_cmd(sc, coff, 31);
-		bus_write_region_2(sc->isf_res, coff, dp, 32);
-
-		isf_write_cmd(sc, coff, ISF_CMD_BPC);
-
-		status = isf_read_off(sc, coff);
-		cycles = 0xFFFFF;
-		while ( !(status & ISF_SR_DWS) ) {
-			if (cycles-- == 0) {
-				device_printf(sc->isf_dev, "timeout waiting"
-				    " for write to complete at 0x08%jx\n",
-				    (intmax_t)coff);
-				error = EIO;
-				break;
-			}
-			status = isf_read_off(sc, coff);
-		}
-		isf_full_status_check(sc, off);
-
-		isf_write_cmd(sc, coff, ISF_CMD_RA);
-	}
-#else
-	for (dp = data, coff = off; dp - (uint16_t *)data < len / 2;
-	    dp++, coff += 2) {
-		isf_write_cmd(sc, coff, ISF_CMD_WPS);
-		bus_write_2(sc->isf_res, coff, *dp);
-		status = isf_read_off(sc, coff);
-		cycles=0xFFFFF;
-		while ( !(status & ISF_SR_DWS) ) {
-			if (cycles-- == 0) {
-				device_printf(sc->isf_dev, "timeout waiting"
-				    " for write to complete at 0x08%jx\n",
-				    (intmax_t)coff);
-				error = EIO;
-				break;
-			}
-			status = isf_read_off(sc, coff);
-		}
-
-	}
-	isf_full_status_check(sc, off);
-	isf_write_cmd(sc, coff, ISF_CMD_RA);
-#endif
-
-	isf_lock_block(sc, off);
-
-	return error;
-}
-
-static void
-isf_erase_at(struct isf_softc *sc, off_t off)
-{
-	int		cycles;
-	uint16_t	status;
-
-	isf_unlock_block(sc, off);
-	isf_clear_status(sc);
-
-	isf_write_cmd(sc, off, ISF_CMD_BES);
-	isf_write_cmd(sc, off, ISF_CMD_BEC);
-
-	cycles=0xFFFFFF;
-	status = isf_read_off(sc, off);
-	while ( !(status & ISF_SR_DWS) ) {
-#ifdef NOTYET
-		ISF_SLEEP(sc, sc, hz);
-#endif
-		if (cycles-- == 0) {
-			device_printf(sc->isf_dev,
-			    "Giving up on erase\n");
-			break;
-		}
-		status = isf_read_off(sc, off);
-	}
-
-	isf_full_erase_status_check(sc, off);
-
-	isf_lock_block(sc, off);
-
-	isf_write_cmd(sc, off, ISF_CMD_RA);
-}
-
-static void
-isf_erase_range(struct isf_softc *sc, off_t blk_off, size_t size)
-{
-	off_t		off;
-	off_t		ms = sc->isf_disk->d_mediasize;
-
-	KASSERT(blk_off % ISF_ERASE_BLOCK == 0,
-	    ("%s: invalid offset %ju\n", __func__, blk_off));
-
-	ISF_LOCK_ASSERT(sc);
-
-	for (off = blk_off; off < blk_off + size; off += ISF_ERASE_BLOCK) {
-		sc->isf_bstate[off / ISF_ERASE_BLOCK] = BS_ERASING;
-
-		/*
-		 * The first or last 128K is four blocks depending which
-		 * part this is.  For now, just assume both are and
-		 * erase four times.
-		 */
-		if (off == 0 || ms - off == ISF_ERASE_BLOCK) {
-			isf_erase_at(sc, off);
-			isf_erase_at(sc, off + 0x08000);
-			isf_erase_at(sc, off + 0x10000);
-			isf_erase_at(sc, off + 0x18000);
-		} else
-			isf_erase_at(sc, off);
-
-		sc->isf_bstate[off / ISF_ERASE_BLOCK] = BS_STEADY;
-	}
-}
-
-/*
- * disk(9) methods.
- */
-static int
-isf_disk_ioctl(struct disk *disk, u_long cmd, void *data, int fflag,
-    struct thread *td)
-{
-	int			error = 0;
-	struct isf_softc	*sc = disk->d_drv1;
-	struct isf_range	*ir;
-
-	switch (cmd) {
-	case ISF_ERASE:
-		ir = data;
-		if (ir->ir_off % ISF_ERASE_BLOCK != 0 ||
-		    ir->ir_off >= disk->d_mediasize ||
-		    ir->ir_size == 0 ||
-		    ir->ir_size % ISF_ERASE_BLOCK != 0 ||
-		    ir->ir_off + ir->ir_size > disk->d_mediasize) {
-			error = EINVAL;
-			break;
-		}
-		ISF_LOCK(sc);
-		if (sc->isf_erasing) {
-			ISF_UNLOCK(sc);
-			error = EBUSY;
-			break;
-		}
-		sc->isf_erasing = 1;
-		isf_erase_range(sc, ir->ir_off, ir->ir_size);
-		sc->isf_erasing = 0;
-		ISF_UNLOCK(sc);
-		break;
-	default:
-		error = EINVAL;
-	}
-
-	return (error);
-}
-
-static void
-isf_disk_strategy(struct bio *bp)
-{
-	struct isf_softc *sc = bp->bio_disk->d_drv1;
-
-	/*
-	 * We advertise a block size and maximum I/O size up the stack; catch
-	 * any attempts to not follow the rules.
-	 */
-	KASSERT(bp->bio_bcount == ISF_SECTORSIZE,
-	    ("%s: I/O size not %d", __func__, ISF_SECTORSIZE));
-
-	ISF_LOCK(sc);
-	bioq_disksort(&sc->isf_bioq, bp);
-	ISF_WAKEUP(sc);
-	ISF_UNLOCK(sc);
-}
-
-static void
-isf_task(void *arg)
-{
-	struct isf_softc	*sc = arg;
-	struct bio		*bp;
-	int			ss = sc->isf_disk->d_sectorsize;
-	int			error, i;
-
-	for (;;) {
-		ISF_LOCK(sc);
-		do {
-			bp = bioq_first(&sc->isf_bioq);
-			if (bp == NULL) {
-				if (sc->isf_doomed)
-					kproc_exit(0);
-				else
-					ISF_SLEEP(sc, sc, 0);
-			}
-		} while (bp == NULL);
-		bioq_remove(&sc->isf_bioq, bp);
-
-		error = 0;
-		switch (bp->bio_cmd) {
-		case BIO_READ:
-			isf_read(sc, bp->bio_pblkno * ss, bp->bio_data,
-			    bp->bio_bcount);
-			break;
-
-		case BIO_WRITE:
-			/*
-			 * In principle one could suspend the in-progress
-			 * erase, process any pending writes to other
-			 * blocks and then proceed, but that seems
-			 * overly complex for the likely usage modes.
-			 */
-			if (sc->isf_erasing) {
-				error = EBUSY;
-				break;
-			}
-
-			/*
-			 * Read in the block we want to write and check that
-			 * we're only setting bits to 0.  If an erase would
-			 * be required return an I/O error.
-			 */
-			isf_read(sc, bp->bio_pblkno * ss, sc->isf_rbuf,
-			    bp->bio_bcount);
-			for (i = 0; i < bp->bio_bcount / 2; i++)
-				if ((sc->isf_rbuf[i] &
-				    ((uint16_t *)bp->bio_data)[i]) !=
-				    ((uint16_t *)bp->bio_data)[i]) {
-					device_printf(sc->isf_dev, "write"
-					    " requires erase at 0x%08jx\n",
-					    bp->bio_pblkno * ss);
-					error = EIO;
-					break;
-				}
-			if (error != 0)
-				break;
-
-			error = isf_write(sc, bp->bio_pblkno * ss,
-			    bp->bio_data, bp->bio_bcount);
-			break;
-
-		default:
-			panic("%s: unsupported I/O operation %d", __func__,
-			    bp->bio_cmd);
-		}
-		if (error == 0)
-			biodone(bp);
-		else
-			biofinish(bp, NULL, error);
-		ISF_UNLOCK(sc);
-	}
-}
-
-static void
-isf_dump_info(struct isf_softc *sc)
-{
-	int i;
-	int32_t reg;
-	
-	isf_write_cmd(sc, 0, ISF_CMD_RDI);
-	device_printf(sc->isf_dev, "manufacturer code: 0x%04x\n",
-	    isf_read_reg(sc, ISF_REG_MC));
-	device_printf(sc->isf_dev, "device id code: 0x%04x\n",
-	    isf_read_reg(sc, ISF_REG_ID));
-	device_printf(sc->isf_dev, "read config register: 0x%04x\n",
-	    isf_read_reg(sc, ISF_REG_RCR));
-
-	device_printf(sc->isf_dev, "lock register 0: 0x%04x\n",
-	    isf_read_reg(sc, ISF_REG_L0));
-	device_printf(sc->isf_dev, "lock register 1: 0x%04x\n",
-	    isf_read_reg(sc, ISF_REG_L1));
-
-	device_printf(sc->isf_dev, "factory PPR: 0x%016jx\n",
-	    (uintmax_t)isf_read_reg64(sc, ISF_REG_FPP));
-	device_printf(sc->isf_dev, "user PPR (64-bit): 0x%016jx\n",
-	    (uintmax_t)isf_read_reg64(sc, ISF_REG_UPP));
-
-	for (reg = ISF_REG_PP1, i = 1; reg <= ISF_REG_PP16; reg += 8, i++) {
-		/* XXX: big-endian ordering of uint64_t's */
-		device_printf(sc->isf_dev,
-		    "user PPR [%02d]: 0x%016jx%016jx\n", i,
-		    (uintmax_t)isf_read_reg64(sc, reg+4),
-		    (uintmax_t)isf_read_reg64(sc, reg));
-	}
-
-	isf_write_cmd(sc, 0, ISF_CMD_RA);
-}
-
-static void
-isf_disk_insert(struct isf_softc *sc, off_t mediasize)
-{
-	struct disk *disk;
-
-	sc->isf_doomed = 0;
-	sc->isf_erasing = 0;
-	sc->isf_bstate = malloc(sizeof(*sc->isf_bstate) *
-	    (mediasize / ISF_ERASE_BLOCK), M_ISF, M_ZERO | M_WAITOK);
-	kproc_create(&isf_task, sc, &sc->isf_proc, 0, 0, "isf");
-
-	disk = disk_alloc();
-	disk->d_drv1 = sc;
-	disk->d_name = "isf";
-	disk->d_unit = sc->isf_unit;
-	disk->d_strategy = isf_disk_strategy;
-	disk->d_ioctl = isf_disk_ioctl;
-	disk->d_sectorsize = ISF_SECTORSIZE;
-	disk->d_mediasize = mediasize;
-	disk->d_maxsize = ISF_SECTORSIZE;
-	sc->isf_disk = disk;
-
-	if (bootverbose)
-		isf_dump_info(sc);
-
-	disk_create(disk, DISK_VERSION);
-	device_printf(sc->isf_dev, "%juM flash device\n",
-	    (uintmax_t)disk->d_mediasize / (1024 * 1024));
-
-}
-
-static void
-isf_disk_remove(struct isf_softc *sc)
-{
-	struct disk *disk;
-
-	ISF_LOCK_ASSERT(sc);
-	KASSERT(sc->isf_disk != NULL, ("%s: isf_disk NULL", __func__));
-
-	sc->isf_doomed = 1;
-	ISF_WAKEUP(sc);
-	ISF_SLEEP(sc, sc->isf_proc, 0);
-
-	/*
-	 * XXXRW: Is it OK to call disk_destroy() under the mutex, or should
-	 * we be deferring that to the calling context once it is released?
-	 */
-	disk = sc->isf_disk;
-	disk_gone(disk);
-	disk_destroy(disk);
-	sc->isf_disk = NULL;
-	free(sc->isf_bstate, M_ISF);
-	device_printf(sc->isf_dev, "flash device removed\n");
-}
-
-int
-isf_attach(struct isf_softc *sc)
-{
-	uint16_t		id;
-	u_long			start, size;
-	struct isf_chips	*cp = chip_ids;
-
-	start = rman_get_start(sc->isf_res);
-	if (start % 2 != 0) {
-		device_printf(sc->isf_dev,
-		    "Unsupported flash start alignment %lu\n",
-		    start);
-		return (ENXIO);
-	}
-
-	isf_write_cmd(sc, 0, ISF_CMD_RDI);
-	id = isf_read_reg(sc, ISF_REG_ID);
-	while (cp->chip_id != id)
-		cp++;
-	if (cp->chip_desc == NULL) {
-		device_printf(sc->isf_dev,
-		    "Unsupported device ID 0x%04x\n", id);
-		return (ENXIO);
-	}
-	isf_write_cmd(sc, 0, ISF_CMD_RA);
-
-	size = rman_get_size(sc->isf_res);
-	if (size != cp->chip_size) {
-		device_printf(sc->isf_dev,
-		    "Unsupported flash size %lu\n", size);
-		return (ENXIO);
-	}
-
-	bioq_init(&sc->isf_bioq);
-	ISF_LOCK_INIT(sc);
-	sc->isf_disk = NULL;
-	isf_disk_insert(sc, size);
-	return(0);
-}
-
-void
-isf_detach(struct isf_softc *sc)
-{
-
-	/*
-	 * Simulate a disk removal if one is present to deal with any pending
-	 * or queued I/O.  This will occur as a result of a device driver
-	 * detach -- the Intel StrataFlash has no notion of removal itself.
-	 *
-	 * XXXRW: Is the locking here right?
-	 */
-	ISF_LOCK(sc);
-	isf_disk_remove(sc);
-	bioq_flush(&sc->isf_bioq, NULL, ENXIO);
-	KASSERT(bioq_first(&sc->isf_bioq) == NULL,
-	    ("%s: non-empty bioq", __func__));
-	ISF_UNLOCK(sc);
-	ISF_LOCK_DESTROY(sc);
-}
diff --git a/sys/dev/isf/isf.h b/sys/dev/isf/isf.h
deleted file mode 100644
index bfcca072c15..00000000000
--- a/sys/dev/isf/isf.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*-
- * Copyright (c) 2012 Robert N. M. Watson
- * Copyright (c) 2012 SRI International
- * 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$
- */
-
-#ifndef _DEV_ISF_H_
-#define	_DEV_ISF_H_
-
-struct isf_range {
-	off_t	ir_off;		/* Offset of range to delete (set to 0xFF) */
-	size_t	ir_size;	/* Size of range */
-};
-
-#define	ISF_ERASE	_IOW('I', 1, struct isf_range)
-
-/*
- * Ordinary read and write operations are limited to 512 bytes.
- * We support erasing 128K blocks and ignore the fact that portions of the
- * flash are in fact divided into 32K blocks.
- */
-#define	ISF_SECTORSIZE	(512)
-#define ISF_ERASE_BLOCK	(128 * 1024)
-
-#ifdef _KERNEL
-MALLOC_DECLARE(M_ISF);
-
-enum bstate {
-	BS_STEADY = 0,
-	BS_ERASING
-};
-
-struct isf_softc {
-	device_t		 isf_dev;
-	int			 isf_unit;
-	struct resource		*isf_res;
-	int			 isf_rid;
-	struct mtx		 isf_lock;
-	struct disk		*isf_disk;
-	struct proc		*isf_proc;
-	int			 isf_doomed;
-
-	/*
-	 * Fields relating to in-progress and pending I/O, if any.
-	 */
-	struct bio_queue_head	 isf_bioq;
-	uint16_t		 isf_rbuf[ISF_SECTORSIZE / 2];
-	int			 isf_erasing;
-	enum bstate		*isf_bstate;
-};
-
-#define	ISF_LOCK(sc)		mtx_lock(&(sc)->isf_lock)
-#define	ISF_LOCK_ASSERT(sc)	mtx_assert(&(sc)->isf_lock, MA_OWNED)
-#define	ISF_LOCK_DESTROY(sc)	mtx_destroy(&(sc)->isf_lock)
-#define	ISF_LOCK_INIT(sc)	mtx_init(&(sc)->isf_lock, "isf", NULL,	\
-				    MTX_DEF)
-#define ISF_SLEEP(sc, wait, timo)	mtx_sleep((wait), 		\
-					    &(sc)->isf_lock, PRIBIO, 	\
-					    "isf", (timo))
-#define	ISF_UNLOCK(sc)			mtx_unlock(&(sc)->isf_lock)
-#define	ISF_WAKEUP(sc)			wakeup((sc))
-
-int	isf_attach(struct isf_softc *sc);
-void	isf_detach(struct isf_softc *sc);
-
-extern devclass_t	isf_devclass;
-#endif /* _KERNEL */
-
-#endif	/* _DEV_ISF_H_ */
diff --git a/sys/dev/isf/isf_nexus.c b/sys/dev/isf/isf_nexus.c
deleted file mode 100644
index 7631453d459..00000000000
--- a/sys/dev/isf/isf_nexus.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*-
- * Copyright (c) 2012 Robert N. M. Watson
- * Copyright (c) 2012 SRI International
- * 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.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/condvar.h>
-#include <sys/conf.h>
-#include <sys/bio.h>
-#include <sys/kernel.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/mutex.h>
-#include <sys/rman.h>
-#include <sys/systm.h>
-#include <sys/taskqueue.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-
-#include <geom/geom_disk.h>
-
-#include <dev/isf/isf.h>
-
-/*
- * Nexus bus attachment for the Intel Strata Flash devices.  Appropriate for
- * most Altera FPGA SoC-style configurations in which the part will be exposed
- * to the processor via a memory-mapped Avalon bus.
- */
-static int
-isf_nexus_probe(device_t dev)
-{
-
-	device_set_desc(dev, "Intel StrataFlash NOR flash device");
-	return (BUS_PROBE_DEFAULT);
-}
-
-static int
-isf_nexus_attach(device_t dev)
-{
-	int			 error;
-	struct isf_softc	*sc;
-
-	sc = device_get_softc(dev);
-	sc->isf_dev = dev;
-	sc->isf_unit = device_get_unit(dev);
-	sc->isf_rid = 0;
-	sc->isf_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-	    &sc->isf_rid, RF_ACTIVE);
-	if (sc->isf_res == NULL) {
-		device_printf(dev, "couldn't map memory\n");
-		return (ENXIO);
-	}
-	error = isf_attach(sc);
-	if (error)
-		bus_release_resource(dev, SYS_RES_MEMORY, sc->isf_rid,
-		    sc->isf_res);
-	return (error);
-}
-
-static int
-isf_nexus_detach(device_t dev)
-{
-	struct isf_softc *sc;
-
-	sc = device_get_softc(dev);
-	KASSERT(sc->isf_res != NULL, ("%s: resources not allocated",
-	    __func__));
-	isf_detach(sc);
-	bus_release_resource(dev, SYS_RES_MEMORY, sc->isf_rid, sc->isf_res);
-	return (0);
-}
-
-static device_method_t isf_nexus_methods[] = {
-	DEVMETHOD(device_probe,		isf_nexus_probe),
-	DEVMETHOD(device_attach,	isf_nexus_attach),
-	DEVMETHOD(device_detach,	isf_nexus_detach),
-	{ 0, 0 }
-};
-
-static driver_t isf_nexus_driver = {
-	"isf",
-	isf_nexus_methods,
-	sizeof(struct isf_softc),
-};
-
-DRIVER_MODULE(isf, nexus, isf_nexus_driver, isf_devclass, 0, 0);
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c
index 6a3897a2c69..32ee10a8096 100644
--- a/sys/dev/isp/isp.c
+++ b/sys/dev/isp/isp.c
@@ -1422,7 +1422,7 @@ isp_scsi_init(ispsoftc_t *isp)
 		if (mbs.param[0] != MBOX_COMMAND_COMPLETE) {
 			return;
 		}
-		isp->isp_residx = mbs.param[5];
+		isp->isp_residx = isp->isp_resodx = mbs.param[5];
 
 		MBSINIT(&mbs, MBOX_INIT_REQ_QUEUE_A64, MBLOGALL, 0);
 		mbs.param[1] = RQUEST_QUEUE_LEN(isp);
@@ -1446,7 +1446,7 @@ isp_scsi_init(ispsoftc_t *isp)
 		if (mbs.param[0] != MBOX_COMMAND_COMPLETE) {
 			return;
 		}
-		isp->isp_residx = mbs.param[5];
+		isp->isp_residx = isp->isp_resodx = mbs.param[5];
 
 		MBSINIT(&mbs, MBOX_INIT_REQ_QUEUE, MBLOGALL, 0);
 		mbs.param[1] = RQUEST_QUEUE_LEN(isp);
@@ -1918,6 +1918,7 @@ isp_fibre_init(ispsoftc_t *isp)
 	isp->isp_reqidx = 0;
 	isp->isp_reqodx = 0;
 	isp->isp_residx = 0;
+	isp->isp_resodx = 0;
 
 	/*
 	 * Whatever happens, we're now committed to being here.
@@ -2208,6 +2209,8 @@ isp_fibre_init_2400(ispsoftc_t *isp)
 	isp->isp_reqidx = 0;
 	isp->isp_reqodx = 0;
 	isp->isp_residx = 0;
+	isp->isp_resodx = 0;
+	isp->isp_atioodx = 0;
 
 	/*
 	 * Whatever happens, we're now committed to being here.
@@ -5015,7 +5018,6 @@ isp_intr(ispsoftc_t *isp, uint32_t isr, uint16_t sema, uint16_t mbox)
 	int etype, last_etype = 0;
 
 again:
-	optr = isp->isp_residx;
 	/*
 	 * Is this a mailbox related interrupt?
 	 * The mailbox semaphore will be nonzero if so.
@@ -5067,7 +5069,9 @@ again:
 		/*
 		 * Thank you very much!  *Burrrp*!
 		 */
-		ISP_WRITE(isp, isp->isp_respoutrp, ISP_READ(isp, isp->isp_respinrp));
+		isp->isp_residx = ISP_READ(isp, isp->isp_respinrp);
+		isp->isp_resodx = isp->isp_residx;
+		ISP_WRITE(isp, isp->isp_respoutrp, isp->isp_resodx);
 		if (IS_24XX(isp)) {
 			ISP_DISABLE_INTS(isp);
 		}
@@ -5078,9 +5082,11 @@ again:
 	/*
 	 * Check for ATIO Queue entries.
 	 */
-	if (IS_24XX(isp)) {
+	if (IS_24XX(isp) &&
+	    ((isr & BIU2400_R2HST_ISTAT_MASK) == ISP2400R2HST_ATIO_RSPQ_UPDATE ||
+	     (isr & BIU2400_R2HST_ISTAT_MASK) == ISP2400R2HST_ATIO_RQST_UPDATE)) {
 		iptr = ISP_READ(isp, BIU2400_ATIO_RSPINP);
-		optr = ISP_READ(isp, BIU2400_ATIO_RSPOUTP);
+		optr = isp->isp_atioodx;
 
 		while (optr != iptr) {
 			uint8_t qe[QENTRY_LEN];
@@ -5103,9 +5109,11 @@ again:
 				break;
 			}
 			optr = ISP_NXT_QENTRY(oop, RESULT_QUEUE_LEN(isp));
-			ISP_WRITE(isp, BIU2400_ATIO_RSPOUTP, optr);
 		}
-		optr = isp->isp_residx;
+		if (isp->isp_atioodx != optr) {
+			ISP_WRITE(isp, BIU2400_ATIO_RSPOUTP, optr);
+			isp->isp_atioodx = optr;
+		}
 	}
 #endif
 
@@ -5114,18 +5122,19 @@ again:
 	 *
 	 * If we're a 2300 or 2400, we can ask what hardware what it thinks.
 	 */
+#if 0
 	if (IS_23XX(isp) || IS_24XX(isp)) {
 		optr = ISP_READ(isp, isp->isp_respoutrp);
 		/*
 		 * Debug: to be taken out eventually
 		 */
-		if (isp->isp_residx != optr) {
-			isp_prt(isp, ISP_LOGINFO, "isp_intr: hard optr=%x, soft optr %x", optr, isp->isp_residx);
-			isp->isp_residx = optr;
+		if (isp->isp_resodx != optr) {
+			isp_prt(isp, ISP_LOGINFO, "isp_intr: hard optr=%x, soft optr %x", optr, isp->isp_resodx);
+			isp->isp_resodx = optr;
 		}
-	} else {
-		optr = isp->isp_residx;
-	}
+	} else
+#endif
+		optr = isp->isp_resodx;
 
 	/*
 	 * You *must* read the Response Queue In Pointer
@@ -5147,8 +5156,6 @@ again:
 	} else {
 		iptr = ISP_READ(isp, isp->isp_respinrp);
 	}
-	isp->isp_resodx = iptr;
-
 
 	if (optr == iptr && sema == 0) {
 		/*
@@ -5182,7 +5189,7 @@ again:
 			isp_prt(isp, ISP_LOGDEBUG1, "bogus intr- isr %x (%x) iptr %x optr %x", isr, junk, iptr, optr);
 		}
 	}
-	isp->isp_resodx = iptr;
+	isp->isp_residx = iptr;
 
 	while (optr != iptr) {
 		uint8_t qe[QENTRY_LEN];
@@ -5281,7 +5288,6 @@ again:
 				optr = ISP_NXT_QENTRY(tsto, RESULT_QUEUE_LEN(isp));
 			}
 			if (r > 0) {
-				ISP_WRITE(isp, isp->isp_respoutrp, optr);
 				ISP_MEMZERO(hp, QENTRY_LEN);	/* PERF */
 				last_etype = etype;
 				continue;
@@ -5316,7 +5322,6 @@ again:
 		if (sp->req_header.rqs_flags & RQSFLAG_MASK) {
 			if (sp->req_header.rqs_flags & RQSFLAG_CONTINUATION) {
 				isp_print_bytes(isp, "unexpected continuation segment", QENTRY_LEN, sp);
-				ISP_WRITE(isp, isp->isp_respoutrp, optr);
 				last_etype = etype;
 				continue;
 			}
@@ -5340,7 +5345,6 @@ again:
 			}
 			if (sp->req_header.rqs_flags & RQSFLAG_BADORDER) {
 				isp_print_bytes(isp, "invalid IOCB ordering", QENTRY_LEN, sp);
-				ISP_WRITE(isp, isp->isp_respoutrp, optr);
 				last_etype = etype;
 				continue;
 			}
@@ -5349,7 +5353,6 @@ again:
 		if (!ISP_VALID_HANDLE(isp, sp->req_handle)) {
 			isp_prt(isp, ISP_LOGERR, "bad request handle 0x%x (iocb type 0x%x)", sp->req_handle, etype);
 			ISP_MEMZERO(hp, QENTRY_LEN);	/* PERF */
-			ISP_WRITE(isp, isp->isp_respoutrp, optr);
 			last_etype = etype;
 			continue;
 		}
@@ -5366,7 +5369,6 @@ again:
 				isp_prt(isp, ISP_LOGERR, "cannot find handle 0x%x (status 0x%x)", sp->req_handle, ts);
 			}
 			ISP_MEMZERO(hp, QENTRY_LEN);	/* PERF */
-			ISP_WRITE(isp, isp->isp_respoutrp, optr);
 			last_etype = etype;
 			continue;
 		}
@@ -5552,13 +5554,9 @@ again:
 	 */
 	if (nlooked) {
 		ISP_WRITE(isp, isp->isp_respoutrp, optr);
-		/*
-		 * While we're at it, read the requst queue out pointer.
-		 */
-		isp->isp_reqodx = ISP_READ(isp, isp->isp_rqstoutrp);
-		if (isp->isp_rscchiwater < ndone) {
+		isp->isp_resodx = optr;
+		if (isp->isp_rscchiwater < ndone)
 			isp->isp_rscchiwater = ndone;
-		}
 	}
 
 out:
@@ -5570,7 +5568,6 @@ out:
 		ISP_WRITE(isp, BIU_SEMA, 0);
 	}
 
-	isp->isp_residx = optr;
 	for (i = 0; i < ndone; i++) {
 		xs = complist[i];
 		if (xs) {
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 2d0d64d6bb9..1665c4147e3 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -106,7 +106,7 @@ isp_attach_chan(ispsoftc_t *isp, struct cam_devq *devq, int chan)
 		return (EIO);
 	}
 	ISP_UNLOCK(isp);
-	if (xpt_create_path_unlocked(&path, NULL, cam_sim_path(sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
+	if (xpt_create_path(&path, NULL, cam_sim_path(sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD) != CAM_REQ_CMP) {
 		ISP_LOCK(isp);
 		xpt_bus_deregister(cam_sim_path(sim));
 		ISP_UNLOCK(isp);
@@ -804,6 +804,7 @@ static ISP_INLINE tstate_t *get_lun_statep_from_tag(ispsoftc_t *, int, uint32_t)
 static ISP_INLINE void rls_lun_statep(ispsoftc_t *, tstate_t *);
 static ISP_INLINE inot_private_data_t *get_ntp_from_tagdata(ispsoftc_t *, uint32_t, uint32_t, tstate_t **);
 static ISP_INLINE atio_private_data_t *isp_get_atpd(ispsoftc_t *, tstate_t *, uint32_t);
+static ISP_INLINE atio_private_data_t *isp_find_atpd(ispsoftc_t *, tstate_t *, uint32_t);
 static ISP_INLINE void isp_put_atpd(ispsoftc_t *, tstate_t *, atio_private_data_t *);
 static ISP_INLINE inot_private_data_t *isp_get_ntpd(ispsoftc_t *, tstate_t *);
 static ISP_INLINE inot_private_data_t *isp_find_ntpd(ispsoftc_t *, tstate_t *, uint32_t, uint32_t);
@@ -937,8 +938,8 @@ get_lun_statep_from_tag(ispsoftc_t *isp, int bus, uint32_t tagval)
 		for (i = 0; i < LUN_HASH_SIZE; i++) {
 			ISP_GET_PC_ADDR(isp, bus, lun_hash[i], lhp);
 			SLIST_FOREACH(tptr, lhp, next) {
-				atp = isp_get_atpd(isp, tptr, tagval);
-				if (atp && atp->tag == tagval) {
+				atp = isp_find_atpd(isp, tptr, tagval);
+				if (atp) {
 					tptr->hold++;
 					return (tptr);
 				}
@@ -1034,17 +1035,23 @@ isp_get_atpd(ispsoftc_t *isp, tstate_t *tptr, uint32_t tag)
 {
 	atio_private_data_t *atp;
 
-	if (tag == 0) {
-		atp = tptr->atfree;
-		if (atp) {
-			tptr->atfree = atp->next;
-		}
-		return (atp);
+	atp = LIST_FIRST(&tptr->atfree);
+	if (atp) {
+		LIST_REMOVE(atp, next);
+		atp->tag = tag;
+		LIST_INSERT_HEAD(&tptr->atused[ATPDPHASH(tag)], atp, next);
 	}
-	for (atp = tptr->atpool; atp < &tptr->atpool[ATPDPSIZE]; atp++) {
-		if (atp->tag == tag) {
+	return (atp);
+}
+
+static ISP_INLINE atio_private_data_t *
+isp_find_atpd(ispsoftc_t *isp, tstate_t *tptr, uint32_t tag)
+{
+	atio_private_data_t *atp;
+
+	LIST_FOREACH(atp, &tptr->atused[ATPDPHASH(tag)], next) {
+		if (atp->tag == tag)
 			return (atp);
-		}
 	}
 	return (NULL);
 }
@@ -1055,9 +1062,9 @@ isp_put_atpd(ispsoftc_t *isp, tstate_t *tptr, atio_private_data_t *atp)
 	if (atp->ests) {
 		isp_put_ecmd(isp, atp->ests);
 	}
+	LIST_REMOVE(atp, next);
 	memset(atp, 0, sizeof (*atp));
-	atp->next = tptr->atfree;
-	tptr->atfree = atp;
+	LIST_INSERT_HEAD(&tptr->atfree, atp, next);
 }
 
 static void
@@ -1067,11 +1074,8 @@ isp_dump_atpd(ispsoftc_t *isp, tstate_t *tptr)
 	const char *states[8] = { "Free", "ATIO", "CAM", "CTIO", "LAST_CTIO", "PDON", "?6", "7" };
 
 	for (atp = tptr->atpool; atp < &tptr->atpool[ATPDPSIZE]; atp++) {
-		if (atp->tag == 0) {
-			continue;
-		}
 		xpt_print(tptr->owner, "ATP: [0x%x] origdlen %u bytes_xfrd %u lun %u nphdl 0x%04x s_id 0x%06x d_id 0x%06x oxid 0x%04x state %s\n",
-                    atp->tag, atp->orig_datalen, atp->bytes_xfered, atp->lun, atp->nphdl, atp->sid, atp->portid, atp->oxid, states[atp->state & 0x7]);
+		    atp->tag, atp->orig_datalen, atp->bytes_xfered, atp->lun, atp->nphdl, atp->sid, atp->portid, atp->oxid, states[atp->state & 0x7]);
 	}
 }
 
@@ -1137,11 +1141,13 @@ create_lun_state(ispsoftc_t *isp, int bus, struct cam_path *path, tstate_t **rsl
 	SLIST_INIT(&tptr->atios);
 	SLIST_INIT(&tptr->inots);
 	TAILQ_INIT(&tptr->waitq);
-	for (i = 0; i < ATPDPSIZE-1; i++) {
-		tptr->atpool[i].next = &tptr->atpool[i+1];
+	LIST_INIT(&tptr->atfree);
+	for (i = ATPDPSIZE-1; i >= 0; i--)
+		LIST_INSERT_HEAD(&tptr->atfree, &tptr->atpool[i], next);
+	for (i = 0; i < ATPDPHASHSIZE; i++)
+		LIST_INIT(&tptr->atused[i]);
+	for (i = 0; i < ATPDPSIZE-1; i++)
 		tptr->ntpool[i].next = &tptr->ntpool[i+1];
-	}
-	tptr->atfree = tptr->atpool;
 	tptr->ntfree = tptr->ntpool;
 	tptr->hold = 1;
 	ISP_GET_PC_ADDR(isp, bus, lun_hash[LUN_HASH_FUNC(xpt_path_lun_id(tptr->owner))], lhp);
@@ -1376,7 +1382,7 @@ isp_enable_deferred(ispsoftc_t *isp, int bus, lun_id_t lun)
 	int luns_already_enabled;
 
 	ISP_GET_PC(isp, bus, tm_luns_enabled, luns_already_enabled);
-	isp_prt(isp, ISP_LOGTINFO, "%s: bus %d lun %u luns_enabled %d", __func__, bus, lun, luns_already_enabled);
+	isp_prt(isp, ISP_LOGTINFO, "%s: bus %d lun %jx luns_enabled %d", __func__, bus, (uintmax_t)lun, luns_already_enabled);
 	if (IS_24XX(isp) || (IS_FC(isp) && luns_already_enabled)) {
 		status = CAM_REQ_CMP;
 	} else {
@@ -1400,7 +1406,7 @@ isp_enable_deferred(ispsoftc_t *isp, int bus, lun_id_t lun)
 	}
 	if (status == CAM_REQ_CMP) {
 		ISP_SET_PC(isp, bus, tm_luns_enabled, 1);
-		isp_prt(isp, ISP_LOGCONFIG|ISP_LOGTINFO, "bus %d lun %u now enabled for target mode", bus, lun);
+		isp_prt(isp, ISP_LOGCONFIG|ISP_LOGTINFO, "bus %d lun %jx now enabled for target mode", bus, (uintmax_t)lun);
 	}
 	return (status);
 }
@@ -1620,7 +1626,7 @@ isp_target_start_ctio(ispsoftc_t *isp, union ccb *ccb, enum Start_Ctio_How how)
 			}
 		}
 
-		atp = isp_get_atpd(isp, tptr, cso->tag_id);
+		atp = isp_find_atpd(isp, tptr, cso->tag_id);
 		if (atp == NULL) {
 			isp_prt(isp, ISP_LOGERR, "%s: [0x%x] cannot find private data adjunct in %s", __func__, cso->tag_id, __func__);
 			isp_dump_atpd(isp, tptr);
@@ -2252,7 +2258,7 @@ isp_handle_platform_atio(ispsoftc_t *isp, at_entry_t *aep)
 		}
 	}
 
-	atp = isp_get_atpd(isp, tptr, 0);
+	atp = isp_get_atpd(isp, tptr, aep->at_handle);
 	atiop = (struct ccb_accept_tio *) SLIST_FIRST(&tptr->atios);
 	if (atiop == NULL || atp == NULL) {
 		/*
@@ -2272,7 +2278,6 @@ isp_handle_platform_atio(ispsoftc_t *isp, at_entry_t *aep)
 		rls_lun_statep(isp, tptr);
 		return;
 	}
-	atp->tag = aep->at_handle;
 	atp->rxid = aep->at_tag_val;
 	atp->state = ATPD_STATE_ATIO;
 	SLIST_REMOVE_HEAD(&tptr->atios, sim_links.sle);
@@ -2281,9 +2286,9 @@ isp_handle_platform_atio(ispsoftc_t *isp, at_entry_t *aep)
 	atiop->ccb_h.target_id = aep->at_tgt;
 	atiop->ccb_h.target_lun = aep->at_lun;
 	if (aep->at_flags & AT_NODISC) {
-		atiop->ccb_h.flags = CAM_DIS_DISCONNECT;
+		atiop->ccb_h.flags |= CAM_DIS_DISCONNECT;
 	} else {
-		atiop->ccb_h.flags = 0;
+		atiop->ccb_h.flags &= ~CAM_DIS_DISCONNECT;
 	}
 
 	if (status & QLTM_SVALID) {
@@ -2357,7 +2362,7 @@ isp_handle_platform_atio2(ispsoftc_t *isp, at2_entry_t *aep)
 	if (tptr == NULL) {
 		tptr = get_lun_statep(isp, 0, CAM_LUN_WILDCARD);
 		if (tptr == NULL) {
-			isp_prt(isp, ISP_LOGWARN, "%s: [0x%x] no state pointer for lun %d or wildcard", __func__, aep->at_rxid, lun);
+			isp_prt(isp, ISP_LOGWARN, "%s: [0x%x] no state pointer for lun %jx or wildcard", __func__, aep->at_rxid, (uintmax_t)lun);
 			if (lun == 0) {
 				isp_endcmd(isp, aep, SCSI_STATUS_BUSY, 0);
 			} else {
@@ -2401,12 +2406,11 @@ isp_handle_platform_atio2(ispsoftc_t *isp, at2_entry_t *aep)
 		goto noresrc;
 	}
 
-	atp = isp_get_atpd(isp, tptr, 0);
+	atp = isp_get_atpd(isp, tptr, aep->at_rxid);
 	if (atp == NULL) {
 		goto noresrc;
 	}
 
-	atp->tag = aep->at_rxid;
 	atp->state = ATPD_STATE_ATIO;
 	SLIST_REMOVE_HEAD(&tptr->atios, sim_links.sle);
 	tptr->atio_count--;
@@ -2452,15 +2456,15 @@ isp_handle_platform_atio2(ispsoftc_t *isp, at2_entry_t *aep)
 	atiop->tag_id = atp->tag;
 	switch (aep->at_taskflags & ATIO2_TC_ATTR_MASK) {
 	case ATIO2_TC_ATTR_SIMPLEQ:
-		atiop->ccb_h.flags = CAM_TAG_ACTION_VALID;
+		atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 		atiop->tag_action = MSG_SIMPLE_Q_TAG;
 		break;
 	case ATIO2_TC_ATTR_HEADOFQ:
-		atiop->ccb_h.flags = CAM_TAG_ACTION_VALID;
+		atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 		atiop->tag_action = MSG_HEAD_OF_Q_TAG;
 		break;
 	case ATIO2_TC_ATTR_ORDERED:
-		atiop->ccb_h.flags = CAM_TAG_ACTION_VALID;
+		atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 		atiop->tag_action = MSG_ORDERED_Q_TAG;
 		break;
 	case ATIO2_TC_ATTR_ACAQ:		/* ?? */
@@ -2480,7 +2484,7 @@ isp_handle_platform_atio2(ispsoftc_t *isp, at2_entry_t *aep)
 	atp->tattr = aep->at_taskflags & ATIO2_TC_ATTR_MASK;
 	atp->state = ATPD_STATE_CAM;
 	xpt_done((union ccb *)atiop);
-	isp_prt(isp, ISP_LOGTDEBUG0, "ATIO2[0x%x] CDB=0x%x lun %d datalen %u", aep->at_rxid, atp->cdb0, lun, atp->orig_datalen);
+	isp_prt(isp, ISP_LOGTDEBUG0, "ATIO2[0x%x] CDB=0x%x lun %jx datalen %u", aep->at_rxid, atp->cdb0, (uintmax_t)lun, atp->orig_datalen);
 	rls_lun_statep(isp, tptr);
 	return;
 noresrc:
@@ -2638,12 +2642,7 @@ isp_handle_platform_atio7(ispsoftc_t *isp, at7_entry_t *aep)
 		goto noresrc;
 	}
 
-	atp = isp_get_atpd(isp, tptr, 0);
-	if (atp == NULL) {
-		isp_prt(isp, ISP_LOGTDEBUG0, "[0x%x] out of atps", aep->at_rxid);
-		goto noresrc;
-	}
-	oatp = isp_get_atpd(isp, tptr, aep->at_rxid);
+	oatp = isp_find_atpd(isp, tptr, aep->at_rxid);
 	if (oatp) {
 		isp_prt(isp, ISP_LOGTDEBUG0, "[0x%x] tag wraparound in isp_handle_platforms_atio7 (N-Port Handle 0x%04x S_ID 0x%04x OX_ID 0x%04x) oatp state %d",
 		    aep->at_rxid, nphdl, sid, aep->at_hdr.ox_id, oatp->state);
@@ -2652,8 +2651,12 @@ isp_handle_platform_atio7(ispsoftc_t *isp, at7_entry_t *aep)
 		 */
 		goto noresrc;
 	}
+	atp = isp_get_atpd(isp, tptr, aep->at_rxid);
+	if (atp == NULL) {
+		isp_prt(isp, ISP_LOGTDEBUG0, "[0x%x] out of atps", aep->at_rxid);
+		goto noresrc;
+	}
 	atp->word3 = lp->prli_word3;
-	atp->tag = aep->at_rxid;
 	atp->state = ATPD_STATE_ATIO;
 	SLIST_REMOVE_HEAD(&tptr->atios, sim_links.sle);
 	tptr->atio_count--;
@@ -2673,15 +2676,15 @@ isp_handle_platform_atio7(ispsoftc_t *isp, at7_entry_t *aep)
 	atiop->tag_id = atp->tag;
 	switch (aep->at_cmnd.fcp_cmnd_task_attribute & FCP_CMND_TASK_ATTR_MASK) {
 	case FCP_CMND_TASK_ATTR_SIMPLE:
-		atiop->ccb_h.flags = CAM_TAG_ACTION_VALID;
+		atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 		atiop->tag_action = MSG_SIMPLE_Q_TAG;
 		break;
 	case FCP_CMND_TASK_ATTR_HEAD:
-		atiop->ccb_h.flags = CAM_TAG_ACTION_VALID;
+		atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 		atiop->tag_action = MSG_HEAD_OF_Q_TAG;
 		break;
 	case FCP_CMND_TASK_ATTR_ORDERED:
-		atiop->ccb_h.flags = CAM_TAG_ACTION_VALID;
+		atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 		atiop->tag_action = MSG_ORDERED_Q_TAG;
 		break;
 	default:
@@ -2846,7 +2849,7 @@ isp_handle_srr_notify(ispsoftc_t *isp, void *inot_raw)
 		isp_async(isp, ISPASYNC_TARGET_NOTIFY_ACK, inot);
 		return;
 	}
-	atp = isp_get_atpd(isp, tptr, tag);
+	atp = isp_find_atpd(isp, tptr, tag);
 	if (atp == NULL) {
 		rls_lun_statep(isp, tptr);
 		isp_prt(isp, ISP_LOGERR, "%s: cannot find adjunct for %x in SRR Notify", __func__, tag);
@@ -2905,11 +2908,11 @@ isp_handle_platform_ctio(ispsoftc_t *isp, void *arg)
 	}
 
 	if (IS_24XX(isp)) {
-		atp = isp_get_atpd(isp, tptr, ((ct7_entry_t *)arg)->ct_rxid);
+		atp = isp_find_atpd(isp, tptr, ((ct7_entry_t *)arg)->ct_rxid);
 	} else if (IS_FC(isp)) {
-		atp = isp_get_atpd(isp, tptr, ((ct2_entry_t *)arg)->ct_rxid);
+		atp = isp_find_atpd(isp, tptr, ((ct2_entry_t *)arg)->ct_rxid);
 	} else {
-		atp = isp_get_atpd(isp, tptr, ((ct_entry_t *)arg)->ct_fwhandle);
+		atp = isp_find_atpd(isp, tptr, ((ct_entry_t *)arg)->ct_fwhandle);
 	}
 	if (atp == NULL) {
 		rls_lun_statep(isp, tptr);
@@ -3093,7 +3096,7 @@ isp_handle_platform_notify_fc(ispsoftc_t *isp, in_fcentry_t *inp)
 				return;
 			}
 		}
-		atp = isp_get_atpd(isp, tptr, inp->in_seqid);
+		atp = isp_find_atpd(isp, tptr, inp->in_seqid);
 
 		if (atp) {
 			inot = (struct ccb_immediate_notify *) SLIST_FIRST(&tptr->inots);
@@ -3417,13 +3420,13 @@ isp_handle_platform_target_tmf(ispsoftc_t *isp, isp_notify_t *notify)
 	if (tptr == NULL) {
 		tptr = get_lun_statep(isp, notify->nt_channel, CAM_LUN_WILDCARD);
 		if (tptr == NULL) {
-			isp_prt(isp, ISP_LOGWARN, "%s: no state pointer found for chan %d lun 0x%x", __func__, notify->nt_channel, lun);
+			isp_prt(isp, ISP_LOGWARN, "%s: no state pointer found for chan %d lun %#jx", __func__, notify->nt_channel, (uintmax_t)lun);
 			goto bad;
 		}
 	}
 	inot = (struct ccb_immediate_notify *) SLIST_FIRST(&tptr->inots);
 	if (inot == NULL) {
-		isp_prt(isp, ISP_LOGWARN, "%s: out of immediate notify structures for chan %d lun 0x%x", __func__, notify->nt_channel, lun);
+		isp_prt(isp, ISP_LOGWARN, "%s: out of immediate notify structures for chan %d lun %#jx", __func__, notify->nt_channel, (uintmax_t)lun);
 		goto bad;
 	}
 
@@ -3457,7 +3460,7 @@ isp_handle_platform_target_tmf(ispsoftc_t *isp, isp_notify_t *notify)
 		inot->arg = MSG_TARGET_RESET;
 		break;
 	default:
-		isp_prt(isp, ISP_LOGWARN, "%s: unknown TMF code 0x%x for chan %d lun 0x%x", __func__, notify->nt_ncode, notify->nt_channel, lun);
+		isp_prt(isp, ISP_LOGWARN, "%s: unknown TMF code 0x%x for chan %d lun %#jx", __func__, notify->nt_ncode, notify->nt_channel, (uintmax_t)lun);
 		goto bad;
 	}
 
@@ -3516,7 +3519,7 @@ isp_target_mark_aborted(ispsoftc_t *isp, union ccb *ccb)
 		}
 	}
 
-	atp = isp_get_atpd(isp, tptr, accb->atio.tag_id);
+	atp = isp_find_atpd(isp, tptr, accb->atio.tag_id);
 	if (atp == NULL) {
 		ccb->ccb_h.status = CAM_REQ_INVALID;
 	} else {
@@ -4128,12 +4131,12 @@ isp_target_thread(ispsoftc_t *isp, int chan)
 	periphdriver_register(&isptargdriver);
 	ISP_GET_PC(isp, chan, sim, sim);
 	ISP_GET_PC(isp, chan, path,  path);
-	status = xpt_create_path_unlocked(&wpath, NULL, cam_sim_path(sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD);
+	status = xpt_create_path(&wpath, NULL, cam_sim_path(sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD);
 	if (status != CAM_REQ_CMP) {
 		isp_prt(isp, ISP_LOGERR, "%s: could not allocate wildcard path", __func__);
 		return;
 	}
-	status = xpt_create_path_unlocked(&path, NULL, cam_sim_path(sim), 0, 0);
+	status = xpt_create_path(&path, NULL, cam_sim_path(sim), 0, 0);
 	if (status != CAM_REQ_CMP) {
 		xpt_free_path(wpath);
 		isp_prt(isp, ISP_LOGERR, "%s: could not allocate path", __func__);
@@ -5001,11 +5004,10 @@ isp_action(struct cam_sim *sim, union ccb *ccb)
 		}
 		ccb->ccb_h.spriv_field0 = 0;
 		ccb->ccb_h.spriv_ptr1 = isp;
-		ccb->ccb_h.flags = 0;
 
 		if (ccb->ccb_h.func_code == XPT_ACCEPT_TARGET_IO) {
 			if (ccb->atio.tag_id) {
-				atio_private_data_t *atp = isp_get_atpd(isp, tptr, ccb->atio.tag_id);
+				atio_private_data_t *atp = isp_find_atpd(isp, tptr, ccb->atio.tag_id);
 				if (atp) {
 					isp_put_atpd(isp, tptr, atp);
 				}
@@ -5185,7 +5187,7 @@ isp_action(struct cam_sim *sim, union ccb *ccb)
 			} else {
 				*dptr &= ~DPARM_SYNC;
 			}
-			isp_prt(isp, ISP_LOGDEBUG0, "SET (%d.%d.%d) to flags %x off %x per %x", bus, tgt, cts->ccb_h.target_lun, sdp->isp_devparam[tgt].goal_flags,
+			isp_prt(isp, ISP_LOGDEBUG0, "SET (%d.%d.%jx) to flags %x off %x per %x", bus, tgt, (uintmax_t)cts->ccb_h.target_lun, sdp->isp_devparam[tgt].goal_flags,
 			    sdp->isp_devparam[tgt].goal_offset, sdp->isp_devparam[tgt].goal_period);
 			sdp->isp_devparam[tgt].dev_update = 1;
 			sdp->update = 1;
@@ -5274,8 +5276,8 @@ isp_action(struct cam_sim *sim, union ccb *ccb)
 				}
 				spi->valid |= CTS_SPI_VALID_DISC;
 			}
-			isp_prt(isp, ISP_LOGDEBUG0, "GET %s (%d.%d.%d) to flags %x off %x per %x", IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM",
-			    bus, tgt, cts->ccb_h.target_lun, dval, oval, pval);
+			isp_prt(isp, ISP_LOGDEBUG0, "GET %s (%d.%d.%jx) to flags %x off %x per %x", IS_CURRENT_SETTINGS(cts)? "ACTIVE" : "NVRAM",
+			    bus, tgt, (uintmax_t)cts->ccb_h.target_lun, dval, oval, pval);
 		}
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index d74d859512b..70061ef7b5b 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -95,11 +95,13 @@ void		isp_put_ecmd(struct ispsoftc *, isp_ecmd_t *);
 
 #define	ISP_TARGET_FUNCTIONS	1
 #define	ATPDPSIZE	4096
+#define	ATPDPHASHSIZE	16
+#define	ATPDPHASH(x)	((((x) >> 24) ^ ((x) >> 16) ^ ((x) >> 8) ^ (x)) &  \
+			    ((ATPDPHASHSIZE) - 1))
 
 #include <dev/isp/isp_target.h>
-
-typedef struct {
-	void *		next;
+typedef struct atio_private_data {
+	LIST_ENTRY(atio_private_data)	next;
 	uint32_t	orig_datalen;
 	uint32_t	bytes_xfered;
 	uint32_t	bytes_in_transit;
@@ -173,7 +175,8 @@ typedef struct tstate {
 	inot_private_data_t *	restart_queue;
 	inot_private_data_t *	ntfree;
 	inot_private_data_t	ntpool[ATPDPSIZE];
-	atio_private_data_t *	atfree;
+	LIST_HEAD(, atio_private_data)	atfree;
+	LIST_HEAD(, atio_private_data)	atused[ATPDPHASHSIZE];
 	atio_private_data_t	atpool[ATPDPSIZE];
 } tstate_t;
 
@@ -456,6 +459,39 @@ default:							\
 	break;							\
 }
 
+#define	MEMORYBARRIERW(isp, type, offset, size, chan)		\
+switch (type) {							\
+case SYNC_SFORDEV:						\
+{								\
+	struct isp_fc *fc = ISP_FC_PC(isp, chan);		\
+	bus_dmamap_sync(fc->tdmat, fc->tdmap,			\
+	   BUS_DMASYNC_PREWRITE);				\
+	break;							\
+}								\
+case SYNC_REQUEST:						\
+	bus_dmamap_sync(isp->isp_osinfo.cdmat,			\
+	   isp->isp_osinfo.cdmap, BUS_DMASYNC_PREWRITE);	\
+	break;							\
+case SYNC_SFORCPU:						\
+{								\
+	struct isp_fc *fc = ISP_FC_PC(isp, chan);		\
+	bus_dmamap_sync(fc->tdmat, fc->tdmap,			\
+	   BUS_DMASYNC_POSTWRITE);				\
+	break;							\
+}								\
+case SYNC_RESULT:						\
+	bus_dmamap_sync(isp->isp_osinfo.cdmat, 			\
+	   isp->isp_osinfo.cdmap, BUS_DMASYNC_POSTWRITE);	\
+	break;							\
+case SYNC_REG:							\
+	bus_space_barrier(isp->isp_osinfo.bus_tag,		\
+	    isp->isp_osinfo.bus_handle, offset, size,		\
+	    BUS_SPACE_BARRIER_WRITE);				\
+	break;							\
+default:							\
+	break;							\
+}
+
 #define	MBOX_ACQUIRE			isp_mbox_acquire
 #define	MBOX_WAIT_COMPLETE		isp_mbox_wait_complete
 #define	MBOX_NOTIFY_COMPLETE		isp_mbox_notify_done
@@ -501,7 +537,7 @@ default:							\
 #define	XS_ISP(ccb)		cam_sim_softc(xpt_path_sim((ccb)->ccb_h.path))
 #define	XS_CHANNEL(ccb)		cam_sim_bus(xpt_path_sim((ccb)->ccb_h.path))
 #define	XS_TGT(ccb)		(ccb)->ccb_h.target_id
-#define	XS_LUN(ccb)		(ccb)->ccb_h.target_lun
+#define	XS_LUN(ccb)		(uint32_t)((ccb)->ccb_h.target_lun)
 
 #define	XS_CDBP(ccb)	\
 	(((ccb)->ccb_h.flags & CAM_CDB_POINTER)? \
diff --git a/sys/dev/isp/isp_library.c b/sys/dev/isp/isp_library.c
index d5535f296c8..62c651cbca8 100644
--- a/sys/dev/isp/isp_library.c
+++ b/sys/dev/isp/isp_library.c
@@ -322,9 +322,13 @@ isp_destroy_handle(ispsoftc_t *isp, uint32_t handle)
 void *
 isp_getrqentry(ispsoftc_t *isp)
 {
-	isp->isp_reqodx = ISP_READ(isp, isp->isp_rqstoutrp);
-	if (ISP_NXT_QENTRY(isp->isp_reqidx, RQUEST_QUEUE_LEN(isp)) == isp->isp_reqodx) {
-		return (NULL);
+	uint32_t next;
+
+	next = ISP_NXT_QENTRY(isp->isp_reqidx, RQUEST_QUEUE_LEN(isp));
+	if (next == isp->isp_reqodx) {
+		isp->isp_reqodx = ISP_READ(isp, isp->isp_rqstoutrp);
+		if (next == isp->isp_reqodx)
+			return (NULL);
 	}
 	return (ISP_QUEUE_ENTRY(isp->isp_rquest, isp->isp_reqidx));
 }
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c
index 782178c3ff8..86c5a1db75b 100644
--- a/sys/dev/isp/isp_pci.c
+++ b/sys/dev/isp/isp_pci.c
@@ -1432,6 +1432,15 @@ isp_pci_wr_reg_2400(ispsoftc_t *isp, int regoff, uint32_t val)
 	case BIU2400_GPIOE:
 	case BIU2400_HSEMA:
 		BXW4(isp, IspVirt2Off(isp, regoff), val);
+#ifdef MEMORYBARRIERW
+		if (regoff == BIU2400_REQINP ||
+		    regoff == BIU2400_RSPOUTP ||
+		    regoff == BIU2400_PRI_REQINP ||
+		    regoff == BIU2400_ATIO_RSPOUTP)
+			MEMORYBARRIERW(isp, SYNC_REG,
+			    IspVirt2Off(isp, regoff), 4, -1)
+		else
+#endif
 		MEMORYBARRIER(isp, SYNC_REG, IspVirt2Off(isp, regoff), 4, -1);
 		break;
 	default:
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 2023f61de9d..7c8b251d5bc 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -614,8 +614,9 @@ struct ispsoftc {
 	volatile mbreg_t	isp_curmbx;	/* currently active mailbox command */
 	volatile uint32_t	isp_reqodx;	/* index of last ISP pickup */
 	volatile uint32_t	isp_reqidx;	/* index of next request */
-	volatile uint32_t	isp_residx;	/* index of next result */
+	volatile uint32_t	isp_residx;	/* index of last ISP write */
 	volatile uint32_t	isp_resodx;	/* index of next result */
+	volatile uint32_t	isp_atioodx;	/* index of next ATIO */
 	volatile uint32_t	isp_obits;	/* mailbox command output */
 	volatile uint32_t	isp_serno;	/* rolling serial number */
 	volatile uint16_t	isp_mboxtmp[MAX_MAILBOX];
diff --git a/sys/dev/iwi/if_iwi.c b/sys/dev/iwi/if_iwi.c
index fe1c6436dca..32940d1952d 100644
--- a/sys/dev/iwi/if_iwi.c
+++ b/sys/dev/iwi/if_iwi.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -944,10 +945,13 @@ iwi_media_status(struct ifnet *ifp, struct ifmediareq *imr)
 	struct ieee80211vap *vap = ifp->if_softc;
 	struct ieee80211com *ic = vap->iv_ic;
 	struct iwi_softc *sc = ic->ic_ifp->if_softc;
+	struct ieee80211_node *ni;
 
 	/* read current transmission rate from adapter */
-	vap->iv_bss->ni_txrate =
+	ni = ieee80211_ref_node(vap->iv_bss);
+	ni->ni_txrate =
 	    iwi_cvtrate(CSR_READ_4(sc, IWI_CSR_CURRENT_TX_RATE));
+	ieee80211_free_node(ni);
 	ieee80211_media_status(ifp, imr);
 }
 
@@ -1366,13 +1370,14 @@ iwi_checkforqos(struct ieee80211vap *vap,
 		frm += frm[1] + 2;
 	}
 
-	ni = vap->iv_bss;
+	ni = ieee80211_ref_node(vap->iv_bss);
 	ni->ni_capinfo = capinfo;
 	ni->ni_associd = associd & 0x3fff;
 	if (wme != NULL)
 		ni->ni_flags |= IEEE80211_NODE_QOS;
 	else
 		ni->ni_flags &= ~IEEE80211_NODE_QOS;
+	ieee80211_free_node(ni);
 #undef SUBTYPE
 }
 
@@ -2811,7 +2816,7 @@ iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80211vap *vap)
 {
 	struct ieee80211com *ic = vap->iv_ic;
 	struct ifnet *ifp = vap->iv_ifp;
-	struct ieee80211_node *ni = vap->iv_bss;
+	struct ieee80211_node *ni;
 	struct iwi_configuration config;
 	struct iwi_associate *assoc = &sc->assoc;
 	struct iwi_rateset rs;
@@ -2821,6 +2826,8 @@ iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80211vap *vap)
 
 	IWI_LOCK_ASSERT(sc);
 
+	ni = ieee80211_ref_node(vap->iv_bss);
+
 	if (sc->flags & IWI_FLAG_ASSOCIATED) {
 		DPRINTF(("Already associated\n"));
 		return (-1);
@@ -2979,6 +2986,7 @@ iwi_auth_and_assoc(struct iwi_softc *sc, struct ieee80211vap *vap)
 	    le16toh(assoc->intval)));
 	error = iwi_cmd(sc, IWI_CMD_ASSOCIATE, assoc, sizeof *assoc);
 done:
+	ieee80211_free_node(ni);
 	if (error)
 		IWI_STATE_END(sc, IWI_FW_ASSOCIATING);
 
diff --git a/sys/dev/iwn/if_iwn.c b/sys/dev/iwn/if_iwn.c
index 14fb002864b..157d71f5bb5 100644
--- a/sys/dev/iwn/if_iwn.c
+++ b/sys/dev/iwn/if_iwn.c
@@ -1,11 +1,10 @@
 /*-
- * Copyright (c) 2013 Cedric GROSS <c.gross@kreiz-it.fr>
- * Copyright (c) 2011 Intel Corporation
- * Copyright (c) 2007-2009
- *	Damien Bergamini <damien.bergamini@free.fr>
- * Copyright (c) 2008
- *	Benjamin Close <benjsc@FreeBSD.org>
+ * Copyright (c) 2007-2009 Damien Bergamini <damien.bergamini@free.fr>
+ * Copyright (c) 2008 Benjamin Close <benjsc@FreeBSD.org>
  * Copyright (c) 2008 Sam Leffler, Errno Consulting
+ * Copyright (c) 2011 Intel Corporation
+ * Copyright (c) 2013 Cedric GROSS <c.gross@kreiz-it.fr>
+ * Copyright (c) 2013 Adrian Chadd <adrian@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
@@ -57,6 +56,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -77,6 +77,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/iwn/if_iwnreg.h>
 #include <dev/iwn/if_iwnvar.h>
 #include <dev/iwn/if_iwn_devid.h>
+#include <dev/iwn/if_iwn_chip_cfg.h>
+#include <dev/iwn/if_iwn_debug.h>
 
 struct iwn_ident {
 	uint16_t	vendor;
@@ -97,6 +99,9 @@ static const struct iwn_ident iwn_ident_table[] = {
 	{ 0x8086, IWN_DID_x030_4, "Intel Centrino Advanced-N 6230"		},
 	{ 0x8086, IWN_DID_6150_1, "Intel Centrino Wireless-N + WiMAX 6150"	},
 	{ 0x8086, IWN_DID_6150_2, "Intel Centrino Wireless-N + WiMAX 6150"	},
+	{ 0x8086, IWN_DID_2x00_1, "Intel(R) Centrino(R) Wireless-N 2200 BGN"	},
+	{ 0x8086, IWN_DID_2x00_2, "Intel(R) Centrino(R) Wireless-N 2200 BGN"	},
+	/* XXX 2200D is IWN_SDID_2x00_4; there's no way to express this here! */
 	{ 0x8086, IWN_DID_2x30_1, "Intel Centrino Wireless-N 2230"		},
 	{ 0x8086, IWN_DID_2x30_2, "Intel Centrino Wireless-N 2230"		},
 	{ 0x8086, IWN_DID_130_1, "Intel Centrino Wireless-N 130"		},
@@ -119,6 +124,8 @@ static const struct iwn_ident iwn_ident_table[] = {
 	{ 0x8086, IWN_DID_5x50_2, "Intel WiMAX/WiFi Link 5350"			},
 	{ 0x8086, IWN_DID_5x50_3, "Intel WiMAX/WiFi Link 5150"			},
 	{ 0x8086, IWN_DID_5x50_4, "Intel WiMAX/WiFi Link 5150"			},
+	{ 0x8086, IWN_DID_6035_1, "Intel Centrino Advanced 6235"		},
+	{ 0x8086, IWN_DID_6035_2, "Intel Centrino Advanced 6235"		},
 	{ 0, 0, NULL }
 };
 
@@ -126,6 +133,7 @@ static int	iwn_probe(device_t);
 static int	iwn_attach(device_t);
 static int	iwn4965_attach(struct iwn_softc *, uint16_t);
 static int	iwn5000_attach(struct iwn_softc *, uint16_t);
+static int	iwn_config_specific(struct iwn_softc *, uint16_t);
 static void	iwn_radiotap_attach(struct iwn_softc *);
 static void	iwn_sysctlattach(struct iwn_softc *);
 static struct ieee80211vap *iwn_vap_create(struct ieee80211com *,
@@ -257,14 +265,18 @@ static int	iwn4965_set_gains(struct iwn_softc *);
 static int	iwn5000_set_gains(struct iwn_softc *);
 static void	iwn_tune_sensitivity(struct iwn_softc *,
 		    const struct iwn_rx_stats *);
+static void	iwn_save_stats_counters(struct iwn_softc *,
+		    const struct iwn_stats *);
 static int	iwn_send_sensitivity(struct iwn_softc *);
+static void	iwn_check_rx_recovery(struct iwn_softc *, struct iwn_stats *);
 static int	iwn_set_pslevel(struct iwn_softc *, int, int, int);
 static int	iwn_send_btcoex(struct iwn_softc *);
 static int	iwn_send_advanced_btcoex(struct iwn_softc *);
 static int	iwn5000_runtime_calib(struct iwn_softc *);
 static int	iwn_config(struct iwn_softc *);
 static uint8_t	*ieee80211_add_ssid(uint8_t *, const uint8_t *, u_int);
-static int	iwn_scan(struct iwn_softc *);
+static int	iwn_scan(struct iwn_softc *, struct ieee80211vap *,
+		    struct ieee80211_scan_state *, struct ieee80211_channel *);
 static int	iwn_auth(struct iwn_softc *, struct ieee80211vap *vap);
 static int	iwn_run(struct iwn_softc *, struct ieee80211vap *vap);
 static int	iwn_ampdu_rx_start(struct ieee80211_node *,
@@ -292,6 +304,7 @@ static int	iwn5000_send_calibration(struct iwn_softc *);
 static int	iwn5000_send_wimax_coex(struct iwn_softc *);
 static int	iwn5000_crystal_calib(struct iwn_softc *);
 static int	iwn5000_temp_offset_calib(struct iwn_softc *);
+static int	iwn5000_temp_offset_calibv2(struct iwn_softc *);
 static int	iwn4965_post_alive(struct iwn_softc *);
 static int	iwn5000_post_alive(struct iwn_softc *);
 static int	iwn4965_load_bootcode(struct iwn_softc *, const uint8_t *,
@@ -331,80 +344,6 @@ static char	*iwn_get_csr_string(int);
 static void	iwn_debug_register(struct iwn_softc *);
 #endif
 
-#ifdef	IWN_DEBUG
-enum {
-	IWN_DEBUG_XMIT		= 0x00000001,	/* basic xmit operation */
-	IWN_DEBUG_RECV		= 0x00000002,	/* basic recv operation */
-	IWN_DEBUG_STATE		= 0x00000004,	/* 802.11 state transitions */
-	IWN_DEBUG_TXPOW		= 0x00000008,	/* tx power processing */
-	IWN_DEBUG_RESET		= 0x00000010,	/* reset processing */
-	IWN_DEBUG_OPS		= 0x00000020,	/* iwn_ops processing */
-	IWN_DEBUG_BEACON 	= 0x00000040,	/* beacon handling */
-	IWN_DEBUG_WATCHDOG 	= 0x00000080,	/* watchdog timeout */
-	IWN_DEBUG_INTR		= 0x00000100,	/* ISR */
-	IWN_DEBUG_CALIBRATE	= 0x00000200,	/* periodic calibration */
-	IWN_DEBUG_NODE		= 0x00000400,	/* node management */
-	IWN_DEBUG_LED		= 0x00000800,	/* led management */
-	IWN_DEBUG_CMD		= 0x00001000,	/* cmd submission */
-	IWN_DEBUG_TXRATE	= 0x00002000,	/* TX rate debugging */
-	IWN_DEBUG_PWRSAVE	= 0x00004000,	/* Power save operations */
-	IWN_DEBUG_REGISTER	= 0x20000000,	/* print chipset register */
-	IWN_DEBUG_TRACE		= 0x40000000,	/* Print begin and start driver function */
-	IWN_DEBUG_FATAL		= 0x80000000,	/* fatal errors */
-	IWN_DEBUG_ANY		= 0xffffffff
-};
-
-#define DPRINTF(sc, m, fmt, ...) do {			\
-	if (sc->sc_debug & (m))				\
-		printf(fmt, __VA_ARGS__);		\
-} while (0)
-
-static const char *
-iwn_intr_str(uint8_t cmd)
-{
-	switch (cmd) {
-	/* Notifications */
-	case IWN_UC_READY:		return "UC_READY";
-	case IWN_ADD_NODE_DONE:		return "ADD_NODE_DONE";
-	case IWN_TX_DONE:		return "TX_DONE";
-	case IWN_START_SCAN:		return "START_SCAN";
-	case IWN_STOP_SCAN:		return "STOP_SCAN";
-	case IWN_RX_STATISTICS:		return "RX_STATS";
-	case IWN_BEACON_STATISTICS:	return "BEACON_STATS";
-	case IWN_STATE_CHANGED:		return "STATE_CHANGED";
-	case IWN_BEACON_MISSED:		return "BEACON_MISSED";
-	case IWN_RX_PHY:		return "RX_PHY";
-	case IWN_MPDU_RX_DONE:		return "MPDU_RX_DONE";
-	case IWN_RX_DONE:		return "RX_DONE";
-
-	/* Command Notifications */
-	case IWN_CMD_RXON:		return "IWN_CMD_RXON";
-	case IWN_CMD_RXON_ASSOC:	return "IWN_CMD_RXON_ASSOC";
-	case IWN_CMD_EDCA_PARAMS:	return "IWN_CMD_EDCA_PARAMS";
-	case IWN_CMD_TIMING:		return "IWN_CMD_TIMING";
-	case IWN_CMD_LINK_QUALITY:	return "IWN_CMD_LINK_QUALITY";
-	case IWN_CMD_SET_LED:		return "IWN_CMD_SET_LED";
-	case IWN5000_CMD_WIMAX_COEX:	return "IWN5000_CMD_WIMAX_COEX";
-	case IWN5000_CMD_CALIB_CONFIG:	return "IWN5000_CMD_CALIB_CONFIG";
-	case IWN5000_CMD_CALIB_RESULT:	return "IWN5000_CMD_CALIB_RESULT";
-	case IWN5000_CMD_CALIB_COMPLETE: return "IWN5000_CMD_CALIB_COMPLETE";
-	case IWN_CMD_SET_POWER_MODE:	return "IWN_CMD_SET_POWER_MODE";
-	case IWN_CMD_SCAN:		return "IWN_CMD_SCAN";
-	case IWN_CMD_SCAN_RESULTS:	return "IWN_CMD_SCAN_RESULTS";
-	case IWN_CMD_TXPOWER:		return "IWN_CMD_TXPOWER";
-	case IWN_CMD_TXPOWER_DBM:	return "IWN_CMD_TXPOWER_DBM";
-	case IWN5000_CMD_TX_ANT_CONFIG:	return "IWN5000_CMD_TX_ANT_CONFIG";
-	case IWN_CMD_BT_COEX:		return "IWN_CMD_BT_COEX";
-	case IWN_CMD_SET_CRITICAL_TEMP:	return "IWN_CMD_SET_CRITICAL_TEMP";
-	case IWN_CMD_SET_SENSITIVITY:	return "IWN_CMD_SET_SENSITIVITY";
-	case IWN_CMD_PHY_CALIB:		return "IWN_CMD_PHY_CALIB";
-	}
-	return "UNKNOWN INTR NOTIF/CMD";
-}
-#else
-#define DPRINTF(sc, m, fmt, ...) do { (void) sc; } while (0)
-#endif
-
 static device_method_t iwn_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		iwn_probe),
@@ -524,6 +463,11 @@ iwn_attach(device_t dev)
 	sc->hw_type = (IWN_READ(sc, IWN_HW_REV) >> IWN_HW_REV_TYPE_SHIFT)
 	    & IWN_HW_REV_TYPE_MASK;
 	sc->subdevice_id = pci_get_subdevice(dev);
+
+	/*
+	 * 4965 versus 5000 and later have different methods.
+	 * Let's set those up first.
+	 */
 	if (sc->hw_type == IWN_HW_REV_TYPE_4965)
 		error = iwn4965_attach(sc, pci_get_device(dev));
 	else
@@ -534,6 +478,16 @@ iwn_attach(device_t dev)
 		goto fail;
 	}
 
+	/*
+	 * Next, let's setup the various parameters of each NIC.
+	 */
+	error = iwn_config_specific(sc, pci_get_device(dev));
+	if (error != 0) {
+		device_printf(dev, "could not attach device, error %d\n",
+		    error);
+		goto fail;
+	}
+
 	if ((error = iwn_hw_prepare(sc)) != 0) {
 		device_printf(dev, "hardware not ready, error %d\n", error);
 		goto fail;
@@ -649,6 +603,10 @@ iwn_attach(device_t dev)
 		 * This is a total hack to work around that until some
 		 * per-device method is implemented to return the
 		 * actual stream support.
+		 *
+		 * XXX Note: the 5350 is a 3x3 device; so we shouldn't
+		 * cap this!  But, anything that touches rates in the
+		 * driver needs to be audited first before 3x3 is enabled.
 		 */
 		if (ic->ic_rxstream > 2)
 			ic->ic_rxstream = 2;
@@ -743,6 +701,441 @@ fail:
 	return error;
 }
 
+/*
+ * Define specific configuration based on device id and subdevice id
+ * pid : PCI device id
+ */
+static int
+iwn_config_specific(struct iwn_softc *sc, uint16_t pid)
+{
+
+	switch (pid) {
+/* 4965 series */
+	case IWN_DID_4965_1:
+	case IWN_DID_4965_2:
+	case IWN_DID_4965_3:
+	case IWN_DID_4965_4:
+		sc->base_params = &iwn4965_base_params;
+		sc->limits = &iwn4965_sensitivity_limits;
+		sc->fwname = "iwn4965fw";
+		/* Override chains masks, ROM is known to be broken. */
+		sc->txchainmask = IWN_ANT_AB;
+		sc->rxchainmask = IWN_ANT_ABC;
+		/* Enable normal btcoex */
+		sc->sc_flags |= IWN_FLAG_BTCOEX;
+		break;
+/* 1000 Series */
+	case IWN_DID_1000_1:
+	case IWN_DID_1000_2:
+		switch(sc->subdevice_id) {
+			case	IWN_SDID_1000_1:
+			case	IWN_SDID_1000_2:
+			case	IWN_SDID_1000_3:
+			case	IWN_SDID_1000_4:
+			case	IWN_SDID_1000_5:
+			case	IWN_SDID_1000_6:
+			case	IWN_SDID_1000_7:
+			case	IWN_SDID_1000_8:
+			case	IWN_SDID_1000_9:
+			case	IWN_SDID_1000_10:
+			case	IWN_SDID_1000_11:
+			case	IWN_SDID_1000_12:
+				sc->limits = &iwn1000_sensitivity_limits;
+				sc->base_params = &iwn1000_base_params;
+				sc->fwname = "iwn1000fw";
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 6x00 Series */
+	case IWN_DID_6x00_2:
+	case IWN_DID_6x00_4:
+	case IWN_DID_6x00_1:
+	case IWN_DID_6x00_3:
+		sc->fwname = "iwn6000fw";
+		sc->limits = &iwn6000_sensitivity_limits;
+		switch(sc->subdevice_id) {
+			case IWN_SDID_6x00_1:
+			case IWN_SDID_6x00_2:
+			case IWN_SDID_6x00_8:
+				//iwl6000_3agn_cfg
+				sc->base_params = &iwn_6000_base_params;
+				break;
+			case IWN_SDID_6x00_3:
+			case IWN_SDID_6x00_6:
+			case IWN_SDID_6x00_9:
+				////iwl6000i_2agn
+			case IWN_SDID_6x00_4:
+			case IWN_SDID_6x00_7:
+			case IWN_SDID_6x00_10:
+				//iwl6000i_2abg_cfg
+			case IWN_SDID_6x00_5:
+				//iwl6000i_2bg_cfg
+				sc->base_params = &iwn_6000i_base_params;
+				sc->sc_flags |= IWN_FLAG_INTERNAL_PA;
+				sc->txchainmask = IWN_ANT_BC;
+				sc->rxchainmask = IWN_ANT_BC;
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 6x05 Series */
+	case IWN_DID_6x05_1:
+	case IWN_DID_6x05_2:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_6x05_1:
+			case IWN_SDID_6x05_4:
+			case IWN_SDID_6x05_6:
+				//iwl6005_2agn_cfg
+			case IWN_SDID_6x05_2:
+			case IWN_SDID_6x05_5:
+			case IWN_SDID_6x05_7:
+				//iwl6005_2abg_cfg
+			case IWN_SDID_6x05_3:
+				//iwl6005_2bg_cfg
+			case IWN_SDID_6x05_8:
+			case IWN_SDID_6x05_9:
+				//iwl6005_2agn_sff_cfg
+			case IWN_SDID_6x05_10:
+				//iwl6005_2agn_d_cfg
+			case IWN_SDID_6x05_11:
+				//iwl6005_2agn_mow1_cfg
+			case IWN_SDID_6x05_12:
+				//iwl6005_2agn_mow2_cfg
+				sc->fwname = "iwn6000g2afw";
+				sc->limits = &iwn6000_sensitivity_limits;
+				sc->base_params = &iwn_6000g2_base_params;
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 6x35 Series */
+	case IWN_DID_6035_1:
+	case IWN_DID_6035_2:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_6035_1:
+			case IWN_SDID_6035_2:
+			case IWN_SDID_6035_3:
+			case IWN_SDID_6035_4:
+				sc->fwname = "iwn6000g2bfw";
+				sc->limits = &iwn6235_sensitivity_limits;
+				sc->base_params = &iwn_6235_base_params;
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 6x50 WiFi/WiMax Series */
+	case IWN_DID_6050_1:
+	case IWN_DID_6050_2:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_6050_1:
+			case IWN_SDID_6050_3:
+			case IWN_SDID_6050_5:
+				//iwl6050_2agn_cfg
+			case IWN_SDID_6050_2:
+			case IWN_SDID_6050_4:
+			case IWN_SDID_6050_6:
+				//iwl6050_2abg_cfg
+				sc->fwname = "iwn6050fw";
+				sc->txchainmask = IWN_ANT_AB;
+				sc->rxchainmask = IWN_ANT_AB;
+				sc->limits = &iwn6000_sensitivity_limits;
+				sc->base_params = &iwn_6050_base_params;
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 6150 WiFi/WiMax Series */
+	case IWN_DID_6150_1:
+	case IWN_DID_6150_2:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_6150_1:
+			case IWN_SDID_6150_3:
+			case IWN_SDID_6150_5:
+				// iwl6150_bgn_cfg
+			case IWN_SDID_6150_2:
+			case IWN_SDID_6150_4:
+			case IWN_SDID_6150_6:
+				//iwl6150_bg_cfg
+				sc->fwname = "iwn6050fw";
+				sc->limits = &iwn6000_sensitivity_limits;
+				sc->base_params = &iwn_6150_base_params;
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 6030 Series and 1030 Series */
+	case IWN_DID_x030_1:
+	case IWN_DID_x030_2:
+	case IWN_DID_x030_3:
+	case IWN_DID_x030_4:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_x030_1:
+			case IWN_SDID_x030_3:
+			case IWN_SDID_x030_5:
+			// iwl1030_bgn_cfg
+			case IWN_SDID_x030_2:
+			case IWN_SDID_x030_4:
+			case IWN_SDID_x030_6:
+			//iwl1030_bg_cfg
+			case IWN_SDID_x030_7:
+			case IWN_SDID_x030_10:
+			case IWN_SDID_x030_14:
+			//iwl6030_2agn_cfg
+			case IWN_SDID_x030_8:
+			case IWN_SDID_x030_11:
+			case IWN_SDID_x030_15:
+			// iwl6030_2bgn_cfg
+			case IWN_SDID_x030_9:
+			case IWN_SDID_x030_12:
+			case IWN_SDID_x030_16:
+			// iwl6030_2abg_cfg
+			case IWN_SDID_x030_13:
+			//iwl6030_2bg_cfg
+				sc->fwname = "iwn6000g2bfw";
+				sc->limits = &iwn6000_sensitivity_limits;
+				sc->base_params = &iwn_6000g2b_base_params;
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 130 Series WiFi */
+/* XXX: This series will need adjustment for rate.
+ * see rx_with_siso_diversity in linux kernel
+ */
+	case IWN_DID_130_1:
+	case IWN_DID_130_2:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_130_1:
+			case IWN_SDID_130_3:
+			case IWN_SDID_130_5:
+			//iwl130_bgn_cfg
+			case IWN_SDID_130_2:
+			case IWN_SDID_130_4:
+			case IWN_SDID_130_6:
+			//iwl130_bg_cfg
+				sc->fwname = "iwn6000g2bfw";
+				sc->limits = &iwn6000_sensitivity_limits;
+				sc->base_params = &iwn_6000g2b_base_params;
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 100 Series WiFi */
+	case IWN_DID_100_1:
+	case IWN_DID_100_2:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_100_1:
+			case IWN_SDID_100_2:
+			case IWN_SDID_100_3:
+			case IWN_SDID_100_4:
+			case IWN_SDID_100_5:
+			case IWN_SDID_100_6:
+				sc->limits = &iwn1000_sensitivity_limits;
+				sc->base_params = &iwn1000_base_params;
+				sc->fwname = "iwn100fw";
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+
+/* 2x00 Series */
+	case IWN_DID_2x00_1:
+	case IWN_DID_2x00_2:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_2x00_1:
+			case IWN_SDID_2x00_2:
+			case IWN_SDID_2x00_3:
+			//iwl2000_2bgn_cfg
+			case IWN_SDID_2x00_4:
+			//iwl2000_2bgn_d_cfg
+				sc->limits = &iwn2030_sensitivity_limits;
+				sc->base_params = &iwn2000_base_params;
+				sc->fwname = "iwn2000fw";
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice) \n",
+				    pid, sc->subdevice_id, sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 2x30 Series */
+	case IWN_DID_2x30_1:
+	case IWN_DID_2x30_2:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_2x30_1:
+			case IWN_SDID_2x30_3:
+			case IWN_SDID_2x30_5:
+			//iwl100_bgn_cfg
+			case IWN_SDID_2x30_2:
+			case IWN_SDID_2x30_4:
+			case IWN_SDID_2x30_6:
+			//iwl100_bg_cfg
+				sc->limits = &iwn2030_sensitivity_limits;
+				sc->base_params = &iwn2030_base_params;
+				sc->fwname = "iwn2030fw";
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 5x00 Series */
+	case IWN_DID_5x00_1:
+	case IWN_DID_5x00_2:
+	case IWN_DID_5x00_3:
+	case IWN_DID_5x00_4:
+		sc->limits = &iwn5000_sensitivity_limits;
+		sc->base_params = &iwn5000_base_params;
+		sc->fwname = "iwn5000fw";
+		switch(sc->subdevice_id) {
+			case IWN_SDID_5x00_1:
+			case IWN_SDID_5x00_2:
+			case IWN_SDID_5x00_3:
+			case IWN_SDID_5x00_4:
+			case IWN_SDID_5x00_9:
+			case IWN_SDID_5x00_10:
+			case IWN_SDID_5x00_11:
+			case IWN_SDID_5x00_12:
+			case IWN_SDID_5x00_17:
+			case IWN_SDID_5x00_18:
+			case IWN_SDID_5x00_19:
+			case IWN_SDID_5x00_20:
+			//iwl5100_agn_cfg
+				sc->txchainmask = IWN_ANT_B;
+				sc->rxchainmask = IWN_ANT_AB;
+				break;
+			case IWN_SDID_5x00_5:
+			case IWN_SDID_5x00_6:
+			case IWN_SDID_5x00_13:
+			case IWN_SDID_5x00_14:
+			case IWN_SDID_5x00_21:
+			case IWN_SDID_5x00_22:
+			//iwl5100_bgn_cfg
+				sc->txchainmask = IWN_ANT_B;
+				sc->rxchainmask = IWN_ANT_AB;
+				break;
+			case IWN_SDID_5x00_7:
+			case IWN_SDID_5x00_8:
+			case IWN_SDID_5x00_15:
+			case IWN_SDID_5x00_16:
+			case IWN_SDID_5x00_23:
+			case IWN_SDID_5x00_24:
+			//iwl5100_abg_cfg
+				sc->txchainmask = IWN_ANT_B;
+				sc->rxchainmask = IWN_ANT_AB;
+				break;
+			case IWN_SDID_5x00_25:
+			case IWN_SDID_5x00_26:
+			case IWN_SDID_5x00_27:
+			case IWN_SDID_5x00_28:
+			case IWN_SDID_5x00_29:
+			case IWN_SDID_5x00_30:
+			case IWN_SDID_5x00_31:
+			case IWN_SDID_5x00_32:
+			case IWN_SDID_5x00_33:
+			case IWN_SDID_5x00_34:
+			case IWN_SDID_5x00_35:
+			case IWN_SDID_5x00_36:
+			//iwl5300_agn_cfg
+				sc->txchainmask = IWN_ANT_ABC;
+				sc->rxchainmask = IWN_ANT_ABC;
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+/* 5x50 Series */
+	case IWN_DID_5x50_1:
+	case IWN_DID_5x50_2:
+	case IWN_DID_5x50_3:
+	case IWN_DID_5x50_4:
+		sc->limits = &iwn5000_sensitivity_limits;
+		sc->base_params = &iwn5000_base_params;
+		sc->fwname = "iwn5000fw";
+		switch(sc->subdevice_id) {
+			case IWN_SDID_5x50_1:
+			case IWN_SDID_5x50_2:
+			case IWN_SDID_5x50_3:
+			//iwl5350_agn_cfg
+				sc->limits = &iwn5000_sensitivity_limits;
+				sc->base_params = &iwn5000_base_params;
+				sc->fwname = "iwn5000fw";
+				break;
+			case IWN_SDID_5x50_4:
+			case IWN_SDID_5x50_5:
+			case IWN_SDID_5x50_8:
+			case IWN_SDID_5x50_9:
+			case IWN_SDID_5x50_10:
+			case IWN_SDID_5x50_11:
+			//iwl5150_agn_cfg
+			case IWN_SDID_5x50_6:
+			case IWN_SDID_5x50_7:
+			case IWN_SDID_5x50_12:
+			case IWN_SDID_5x50_13:
+			//iwl5150_abg_cfg
+				sc->limits = &iwn5000_sensitivity_limits;
+				sc->fwname = "iwn5150fw";
+				sc->base_params = &iwn_5x50_base_params;
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+	default:
+		device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id : 0x%04x"
+		    "rev 0x%08x not supported (device)\n", pid, sc->subdevice_id,
+		     sc->hw_type);
+		return ENOTSUP;
+	}
+	return 0;
+}
+
 static int
 iwn4965_attach(struct iwn_softc *sc, uint16_t pid)
 {
@@ -778,6 +1171,8 @@ iwn4965_attach(struct iwn_softc *sc, uint16_t pid)
 	/* Override chains masks, ROM is known to be broken. */
 	sc->txchainmask = IWN_ANT_AB;
 	sc->rxchainmask = IWN_ANT_ABC;
+	/* Enable normal btcoex */
+	sc->sc_flags |= IWN_FLAG_BTCOEX;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "%s: end\n",__func__);
 
@@ -818,58 +1213,6 @@ iwn5000_attach(struct iwn_softc *sc, uint16_t pid)
 	sc->reset_noise_gain = IWN5000_PHY_CALIB_RESET_NOISE_GAIN;
 	sc->noise_gain = IWN5000_PHY_CALIB_NOISE_GAIN;
 
-	switch (sc->hw_type) {
-	case IWN_HW_REV_TYPE_5100:
-		sc->limits = &iwn5000_sensitivity_limits;
-		sc->fwname = "iwn5000fw";
-		/* Override chains masks, ROM is known to be broken. */
-		sc->txchainmask = IWN_ANT_B;
-		sc->rxchainmask = IWN_ANT_AB;
-		break;
-	case IWN_HW_REV_TYPE_5150:
-		sc->limits = &iwn5150_sensitivity_limits;
-		sc->fwname = "iwn5150fw";
-		break;
-	case IWN_HW_REV_TYPE_5300:
-	case IWN_HW_REV_TYPE_5350:
-		sc->limits = &iwn5000_sensitivity_limits;
-		sc->fwname = "iwn5000fw";
-		break;
-	case IWN_HW_REV_TYPE_1000:
-		sc->limits = &iwn1000_sensitivity_limits;
-		sc->fwname = "iwn1000fw";
-		break;
-	case IWN_HW_REV_TYPE_6000:
-		sc->limits = &iwn6000_sensitivity_limits;
-		sc->fwname = "iwn6000fw";
-		if (pid == 0x422c || pid == 0x4239) {
-			sc->sc_flags |= IWN_FLAG_INTERNAL_PA;
-			/* Override chains masks, ROM is known to be broken. */
-			sc->txchainmask = IWN_ANT_BC;
-			sc->rxchainmask = IWN_ANT_BC;
-		}
-		break;
-	case IWN_HW_REV_TYPE_6050:
-		sc->limits = &iwn6000_sensitivity_limits;
-		sc->fwname = "iwn6050fw";
-		/* Override chains masks, ROM is known to be broken. */
-		sc->txchainmask = IWN_ANT_AB;
-		sc->rxchainmask = IWN_ANT_AB;
-		break;
-	case IWN_HW_REV_TYPE_6005:
-		sc->limits = &iwn6000_sensitivity_limits;
-		if (pid != 0x0082 && pid != 0x0085) {
-			sc->fwname = "iwn6000g2bfw";
-			sc->sc_flags |= IWN_FLAG_ADV_BTCOEX;
-		} else
-			sc->fwname = "iwn6000g2afw";
-		break;
-	default:
-		device_printf(sc->sc_dev, "adapter type %d not supported\n",
-		    sc->hw_type);
-		DPRINTF(sc, IWN_DEBUG_TRACE, "->%s: end in error\n",__func__);
-		return ENOTSUP;
-	}
 	return 0;
 }
 
@@ -1192,7 +1535,7 @@ iwn_init_otprom(struct iwn_softc *sc)
 	iwn_nic_unlock(sc);
 
 	/* Set auto clock gate disable bit for HW with OTP shadow RAM. */
-	if (sc->hw_type != IWN_HW_REV_TYPE_1000) {
+	if (sc->base_params->shadow_ram_support) {
 		IWN_SETBITS(sc, IWN_DBG_LINK_PWR_MGMT,
 		    IWN_RESET_LINK_PWR_MGMT_DIS);
 	}
@@ -1205,11 +1548,12 @@ iwn_init_otprom(struct iwn_softc *sc)
 	 * Find the block before last block (contains the EEPROM image)
 	 * for HW without OTP shadow RAM.
 	 */
-	if (sc->hw_type == IWN_HW_REV_TYPE_1000) {
+	if (! sc->base_params->shadow_ram_support) {
 		/* Switch to absolute addressing mode. */
 		IWN_CLRBITS(sc, IWN_OTP_GP, IWN_OTP_GP_RELATIVE_ACCESS);
 		base = prev = 0;
-		for (count = 0; count < IWN1000_OTP_NBLOCKS; count++) {
+		for (count = 0; count < sc->base_params->max_ll_items;
+		    count++) {
 			error = iwn_read_prom_data(sc, base, &next, 2);
 			if (error != 0)
 				return error;
@@ -1218,7 +1562,7 @@ iwn_init_otprom(struct iwn_softc *sc)
 			prev = base;
 			base = le16toh(next);
 		}
-		if (count == 0 || count == IWN1000_OTP_NBLOCKS)
+		if (count == 0 || count == sc->base_params->max_ll_items)
 			return EIO;
 		/* Skip "next" word. */
 		sc->prom_base = prev + 1;
@@ -1776,7 +2120,7 @@ iwn4965_read_eeprom(struct iwn_softc *sc)
 	iwn_read_prom_data(sc, IWN4965_EEPROM_DOMAIN, sc->eeprom_domain, 4);
 
 	/* Read the list of authorized channels (20MHz ones only). */
-	for (i = 0; i < 7; i++) {
+	for (i = 0; i < IWN_NBANDS - 1; i++) {
 		addr = iwn4965_regulatory_bands[i];
 		iwn_read_eeprom_channels(sc, i, addr);
 	}
@@ -1806,7 +2150,7 @@ iwn4965_read_eeprom(struct iwn_softc *sc)
 #ifdef IWN_DEBUG
 	/* Print samples. */
 	if (sc->sc_debug & IWN_DEBUG_ANY) {
-		for (i = 0; i < IWN_NBANDS; i++)
+		for (i = 0; i < IWN_NBANDS - 1; i++)
 			iwn4965_print_power_group(sc, i);
 	}
 #endif
@@ -1867,16 +2211,13 @@ iwn5000_read_eeprom(struct iwn_softc *sc)
 	    sc->eeprom_domain, 4);
 
 	/* Read the list of authorized channels (20MHz ones only). */
-	for (i = 0; i < 7; i++) {
-		if (sc->hw_type >= IWN_HW_REV_TYPE_6000)
-			addr = base + iwn6000_regulatory_bands[i];
-		else
-			addr = base + iwn5000_regulatory_bands[i];
+	for (i = 0; i < IWN_NBANDS - 1; i++) {
+		addr =  base + sc->base_params->regulatory_bands[i];
 		iwn_read_eeprom_channels(sc, i, addr);
 	}
 
 	/* Read enhanced TX power information for 6000 Series. */
-	if (sc->hw_type >= IWN_HW_REV_TYPE_6000)
+	if (sc->base_params->enhanced_TX_power)
 		iwn_read_eeprom_enhinfo(sc);
 
 	iwn_read_prom_data(sc, IWN5000_EEPROM_CAL, &val, 2);
@@ -1887,6 +2228,14 @@ iwn5000_read_eeprom(struct iwn_softc *sc)
 	    hdr.version, hdr.pa_type, le16toh(hdr.volt));
 	sc->calib_ver = hdr.version;
 
+	if (sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSETv2) {
+		sc->eeprom_voltage = le16toh(hdr.volt);
+		iwn_read_prom_data(sc, base + IWN5000_EEPROM_TEMP, &val, 2);
+		sc->eeprom_temp_high=le16toh(val);
+		iwn_read_prom_data(sc, base + IWN5000_EEPROM_VOLT, &val, 2);
+		sc->eeprom_temp = le16toh(val);
+	}
+
 	if (sc->hw_type == IWN_HW_REV_TYPE_5150) {
 		/* Compute temperature offset. */
 		iwn_read_prom_data(sc, base + IWN5000_EEPROM_TEMP, &val, 2);
@@ -2248,7 +2597,7 @@ iwn_rate_to_plcp(struct iwn_softc *sc, struct ieee80211_node *ni,
 	 * If it's an MCS rate, let's set the plcp correctly
 	 * and set the relevant flags based on the node config.
 	 */
-	if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) {
+	if (rate & IEEE80211_RATE_MCS) {
 		/*
 		 * Set the initial PLCP value to be between 0->31 for
 		 * MCS 0 -> MCS 31, then set the "I'm an MCS rate!"
@@ -2736,25 +3085,24 @@ iwn5000_rx_calib_results(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 
 	switch (calib->code) {
 	case IWN5000_PHY_CALIB_DC:
-		if ((sc->sc_flags & IWN_FLAG_INTERNAL_PA) == 0 &&
-		    (sc->hw_type == IWN_HW_REV_TYPE_5150 ||
-		     sc->hw_type >= IWN_HW_REV_TYPE_6000) &&
-		     sc->hw_type != IWN_HW_REV_TYPE_6050)
+		if (sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_DC)
 			idx = 0;
 		break;
 	case IWN5000_PHY_CALIB_LO:
-		idx = 1;
+		if (sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_LO)
+			idx = 1;
 		break;
 	case IWN5000_PHY_CALIB_TX_IQ:
-		idx = 2;
+		if (sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_TX_IQ)
+			idx = 2;
 		break;
 	case IWN5000_PHY_CALIB_TX_IQ_PERIODIC:
-		if (sc->hw_type < IWN_HW_REV_TYPE_6000 &&
-		    sc->hw_type != IWN_HW_REV_TYPE_5150)
+		if (sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_TX_IQ_PERIODIC)
 			idx = 3;
 		break;
 	case IWN5000_PHY_CALIB_BASE_BAND:
-		idx = 4;
+		if (sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_BASE_BAND)
+			idx = 4;
 		break;
 	}
 	if (idx == -1)	/* Ignore other results. */
@@ -2771,7 +3119,7 @@ iwn5000_rx_calib_results(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 		return;
 	}
 	DPRINTF(sc, IWN_DEBUG_CALIBRATE,
-	    "saving calibration result code=%d len=%d\n", calib->code, len);
+	    "saving calibration result idx=%d, code=%d len=%d\n", idx, calib->code, len);
 	sc->calibcmd[idx].len = len;
 	memcpy(sc->calibcmd[idx].buf, calib, len);
 }
@@ -2836,12 +3184,38 @@ iwn_rx_statistics(struct iwn_softc *sc, struct iwn_rx_desc *desc,
 
 	if (calib->state == IWN_CALIB_STATE_ASSOC)
 		iwn_collect_noise(sc, &stats->rx.general);
-	else if (calib->state == IWN_CALIB_STATE_RUN)
+	else if (calib->state == IWN_CALIB_STATE_RUN) {
 		iwn_tune_sensitivity(sc, &stats->rx);
+		/*
+		 * XXX TODO: Only run the RX recovery if we're associated!
+		 */
+		iwn_check_rx_recovery(sc, stats);
+		iwn_save_stats_counters(sc, stats);
+	}
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s: end\n",__func__);
 }
 
+/*
+ * Save the relevant statistic counters for the next calibration
+ * pass.
+ */
+static void
+iwn_save_stats_counters(struct iwn_softc *sc, const struct iwn_stats *rs)
+{
+	struct iwn_calib_state *calib = &sc->calib;
+
+	/* Save counters values for next call. */
+	calib->bad_plcp_cck = le32toh(rs->rx.cck.bad_plcp);
+	calib->fa_cck = le32toh(rs->rx.cck.fa);
+	calib->bad_plcp_ht = le32toh(rs->rx.ht.bad_plcp);
+	calib->bad_plcp_ofdm = le32toh(rs->rx.ofdm.bad_plcp);
+	calib->fa_ofdm = le32toh(rs->rx.ofdm.fa);
+
+	/* Last time we received these tick values */
+	sc->last_calib_ticks = ticks;
+}
+
 /*
  * Process a TX_DONE firmware notification.  Unfortunately, the 4965AGN
  * and 5000 adapters have different incompatible TX status formats.
@@ -2985,12 +3359,19 @@ iwn_tx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, int ackfailcnt,
 static void
 iwn_cmd_done(struct iwn_softc *sc, struct iwn_rx_desc *desc)
 {
-	struct iwn_tx_ring *ring = &sc->txq[4];
+	struct iwn_tx_ring *ring;
 	struct iwn_tx_data *data;
+	int cmd_queue_num;
 
-	if ((desc->qid & 0xf) != 4)
+	if (sc->sc_flags & IWN_FLAG_PAN_SUPPORT)
+		cmd_queue_num = IWN_PAN_CMD_QUEUE;
+	else
+		cmd_queue_num = IWN_CMD_QUEUE_NUM;
+
+	if ((desc->qid & IWN_RX_DESC_QID_MSK) != cmd_queue_num)
 		return;	/* Not a command ack. */
 
+	ring = &sc->txq[cmd_queue_num];
 	data = &ring->data[desc->idx];
 
 	/* If the command was mapped in an mbuf, free it. */
@@ -3025,12 +3406,24 @@ iwn_ampdu_tx_done(struct iwn_softc *sc, int qid, int idx, int nframes,
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 
-#ifdef NOT_YET
 	if (nframes == 1) {
-		if ((*status & 0xff) != 1 && (*status & 0xff) != 2)
+		if ((*status & 0xff) != 1 && (*status & 0xff) != 2) {
+#ifdef	NOT_YET
 			printf("ieee80211_send_bar()\n");
-	}
 #endif
+			/*
+			 * If we completely fail a transmit, make sure a
+			 * notification is pushed up to the rate control
+			 * layer.
+			 */
+			tap = sc->qid2tap[qid];
+			tid = tap->txa_tid;
+			wn = (void *)tap->txa_ni;
+			ni = tap->txa_ni;
+			ieee80211_ratectl_tx_complete(ni->ni_vap, ni,
+			    IEEE80211_RATECTL_TX_FAILURE, &nframes, NULL);
+		}
+	}
 
 	bitmap = 0;
 	start = idx;
@@ -3137,12 +3530,12 @@ iwn_notif_intr(struct iwn_softc *sc)
 		desc = mtod(data->m, struct iwn_rx_desc *);
 
 		DPRINTF(sc, IWN_DEBUG_RECV,
-		    "%s: qid %x idx %d flags %x type %d(%s) len %d\n",
-		    __func__, desc->qid & 0xf, desc->idx, desc->flags,
+		    "%s: cur=%d; qid %x idx %d flags %x type %d(%s) len %d\n",
+		    __func__, sc->rxq.cur, desc->qid & 0xf, desc->idx, desc->flags,
 		    desc->type, iwn_intr_str(desc->type),
 		    le16toh(desc->len));
 
-		if (!(desc->qid & 0x80))	/* Reply to a command. */
+		if (!(desc->qid & IWN_UNSOLICITED_RX_NOTIF))	/* Reply to a command. */
 			iwn_cmd_done(sc, desc);
 
 		switch (desc->type) {
@@ -3237,7 +3630,8 @@ iwn_notif_intr(struct iwn_softc *sc)
 			    BUS_DMASYNC_POSTREAD);
 #ifdef	IWN_DEBUG
 			uint32_t *status = (uint32_t *)(desc + 1);
-			DPRINTF(sc, IWN_DEBUG_INTR, "state changed to %x\n",
+			DPRINTF(sc, IWN_DEBUG_INTR | IWN_DEBUG_STATE,
+			    "state changed to %x\n",
 			    le32toh(*status));
 #endif
 			break;
@@ -3262,11 +3656,11 @@ iwn_notif_intr(struct iwn_softc *sc)
 #ifdef	IWN_DEBUG
 			struct iwn_stop_scan *scan =
 			    (struct iwn_stop_scan *)(desc + 1);
-			DPRINTF(sc, IWN_DEBUG_STATE,
+			DPRINTF(sc, IWN_DEBUG_STATE | IWN_DEBUG_SCAN,
 			    "scan finished nchan=%d status=%d chan=%d\n",
 			    scan->nchan, scan->status, scan->chan);
 #endif
-
+			sc->sc_is_scanning = 0;
 			IWN_UNLOCK(sc);
 			ieee80211_scan_next(vap);
 			IWN_LOCK(sc);
@@ -3549,6 +3943,115 @@ iwn5000_reset_sched(struct iwn_softc *sc, int qid, int idx)
 }
 #endif
 
+/*
+ * Check whether OFDM 11g protection will be enabled for the given rate.
+ *
+ * The original driver code only enabled protection for OFDM rates.
+ * It didn't check to see whether it was operating in 11a or 11bg mode.
+ */
+static int
+iwn_check_rate_needs_protection(struct iwn_softc *sc,
+    struct ieee80211vap *vap, uint8_t rate)
+{
+	struct ieee80211com *ic = vap->iv_ic;
+
+	/*
+	 * Not in 2GHz mode? Then there's no need to enable OFDM
+	 * 11bg protection.
+	 */
+	if (! IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) {
+		return (0);
+	}
+
+	/*
+	 * 11bg protection not enabled? Then don't use it.
+	 */
+	if ((ic->ic_flags & IEEE80211_F_USEPROT) == 0)
+		return (0);
+
+	/*
+	 * If it's an 11n rate, then for now we enable
+	 * protection.
+	 */
+	if (rate & IEEE80211_RATE_MCS) {
+		return (1);
+	}
+
+	/*
+	 * Do a rate table lookup.  If the PHY is CCK,
+	 * don't do protection.
+	 */
+	if (ieee80211_rate2phytype(ic->ic_rt, rate) == IEEE80211_T_CCK)
+		return (0);
+
+	/*
+	 * Yup, enable protection.
+	 */
+	return (1);
+}
+
+/*
+ * return a value between 0 and IWN_MAX_TX_RETRIES-1 as an index into
+ * the link quality table that reflects this particular entry.
+ */
+static int
+iwn_tx_rate_to_linkq_offset(struct iwn_softc *sc, struct ieee80211_node *ni,
+    uint8_t rate)
+{
+	struct ieee80211_rateset *rs;
+	int is_11n;
+	int nr;
+	int i;
+	uint8_t cmp_rate;
+
+	/*
+	 * Figure out if we're using 11n or not here.
+	 */
+	if (IEEE80211_IS_CHAN_HT(ni->ni_chan) && ni->ni_htrates.rs_nrates > 0)
+		is_11n = 1;
+	else
+		is_11n = 0;
+
+	/*
+	 * Use the correct rate table.
+	 */
+	if (is_11n) {
+		rs = (struct ieee80211_rateset *) &ni->ni_htrates;
+		nr = ni->ni_htrates.rs_nrates;
+	} else {
+		rs = &ni->ni_rates;
+		nr = rs->rs_nrates;
+	}
+
+	/*
+	 * Find the relevant link quality entry in the table.
+	 */
+	for (i = 0; i < nr && i < IWN_MAX_TX_RETRIES - 1 ; i++) {
+		/*
+		 * The link quality table index starts at 0 == highest
+		 * rate, so we walk the rate table backwards.
+		 */
+		cmp_rate = rs->rs_rates[(nr - 1) - i];
+		if (rate & IEEE80211_RATE_MCS)
+			cmp_rate |= IEEE80211_RATE_MCS;
+
+#if 0
+		DPRINTF(sc, IWN_DEBUG_XMIT, "%s: idx %d: nr=%d, rate=0x%02x, rateentry=0x%02x\n",
+		    __func__,
+		    i,
+		    nr,
+		    rate,
+		    cmp_rate);
+#endif
+
+		if (cmp_rate == rate)
+			return (i);
+	}
+
+	/* Failed? Start at the end */
+	return (IWN_MAX_TX_RETRIES - 1);
+}
+
 static int
 iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 {
@@ -3569,7 +4072,7 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 	uint16_t qos;
 	u_int hdrlen;
 	bus_dma_segment_t *seg, segs[IWN_MAX_SCATTER];
-	uint8_t tid, ridx, txant, type;
+	uint8_t tid, type;
 	int ac, i, totlen, error, pad, nsegs = 0, rate;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
@@ -3590,6 +4093,7 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 	}
 	ac = M_WME_GETAC(m);
 	if (m->m_flags & M_AMPDU_MPDU) {
+		uint16_t seqno;
 		struct ieee80211_tx_ampdu *tap = &ni->ni_tx_ampdu[ac];
 
 		if (!IEEE80211_AMPDU_RUNNING(tap)) {
@@ -3597,9 +4101,27 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 			return EINVAL;
 		}
 
+		/*
+		 * Queue this frame to the hardware ring that we've
+		 * negotiated AMPDU TX on.
+		 *
+		 * Note that the sequence number must match the TX slot
+		 * being used!
+		 */
 		ac = *(int *)tap->txa_private;
+		seqno = ni->ni_txseqs[tid];
 		*(uint16_t *)wh->i_seq =
-		    htole16(ni->ni_txseqs[tid] << IEEE80211_SEQ_SEQ_SHIFT);
+		    htole16(seqno << IEEE80211_SEQ_SEQ_SHIFT);
+		ring = &sc->txq[ac];
+		if ((seqno % 256) != ring->cur) {
+			device_printf(sc->sc_dev,
+			    "%s: m=%p: seqno (%d) (%d) != ring index (%d) !\n",
+			    __func__,
+			    m,
+			    seqno,
+			    seqno % 256,
+			    ring->cur);
+		}
 		ni->ni_txseqs[tid]++;
 	}
 	ring = &sc->txq[ac];
@@ -3614,13 +4136,13 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 		rate = tp->mcastrate;
 	else if (tp->ucastrate != IEEE80211_FIXED_RATE_NONE)
 		rate = tp->ucastrate;
+	else if (m->m_flags & M_EAPOL)
+		rate = tp->mgmtrate;
 	else {
 		/* XXX pass pktlen */
 		(void) ieee80211_ratectl_rate(ni, NULL, 0);
 		rate = ni->ni_txrate;
 	}
-	ridx = ieee80211_legacy_rate_lookup(ic->ic_rt,
-	    rate & IEEE80211_RATE_VAL);
 
 	/* Encrypt the frame if need be. */
 	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
@@ -3677,13 +4199,15 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 		/* NB: Group frames are sent using CCK in 802.11b/g. */
 		if (totlen + IEEE80211_CRC_LEN > vap->iv_rtsthreshold) {
 			flags |= IWN_TX_NEED_RTS;
-		} else if ((ic->ic_flags & IEEE80211_F_USEPROT) &&
-		    ridx >= IWN_RIDX_OFDM6) {
+		} else if (iwn_check_rate_needs_protection(sc, vap, rate)) {
 			if (ic->ic_protmode == IEEE80211_PROT_CTSONLY)
 				flags |= IWN_TX_NEED_CTS;
 			else if (ic->ic_protmode == IEEE80211_PROT_RTSCTS)
 				flags |= IWN_TX_NEED_RTS;
 		}
+
+		/* XXX HT protection? */
+
 		if (flags & (IWN_TX_NEED_RTS | IWN_TX_NEED_CTS)) {
 			if (sc->hw_type != IWN_HW_REV_TYPE_4965) {
 				/* 5000 autoselects RTS/CTS or CTS-to-self. */
@@ -3730,13 +4254,11 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 	if (tx->id == sc->broadcast_id) {
 		/* Group or management frame. */
 		tx->linkq = 0;
-		/* XXX Alternate between antenna A and B? */
-		txant = IWN_LSB(sc->txchainmask);
-		tx->rate |= htole32(IWN_RFLAG_ANT(txant));
 	} else {
-		tx->linkq = ni->ni_rates.rs_nrates - ridx - 1;
+		tx->linkq = iwn_tx_rate_to_linkq_offset(sc, ni, rate);
 		flags |= IWN_TX_LINKQ;	/* enable MRR */
 	}
+
 	/* Set physical address of "scratch area". */
 	tx->loaddr = htole32(IWN_LOADDR(data->scratch_paddr));
 	tx->hiaddr = IWN_HIADDR(data->scratch_paddr);
@@ -3781,8 +4303,15 @@ iwn_tx_data(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 	data->m = m;
 	data->ni = ni;
 
-	DPRINTF(sc, IWN_DEBUG_XMIT, "%s: qid %d idx %d len %d nsegs %d\n",
-	    __func__, ring->qid, ring->cur, m->m_pkthdr.len, nsegs);
+	DPRINTF(sc, IWN_DEBUG_XMIT,
+	    "%s: qid %d idx %d len %d nsegs %d rate %04x plcp 0x%08x\n",
+	    __func__,
+	    ring->qid,
+	    ring->cur,
+	    m->m_pkthdr.len,
+	    nsegs,
+	    rate,
+	    tx->rate);
 
 	/* Fill TX descriptor. */
 	desc->nsegs = 1;
@@ -3829,9 +4358,9 @@ iwn_tx_data_raw(struct iwn_softc *sc, struct mbuf *m,
     struct ieee80211_node *ni, const struct ieee80211_bpf_params *params)
 {
 	struct iwn_ops *ops = &sc->ops;
-	struct ifnet *ifp = sc->sc_ifp;
+//	struct ifnet *ifp = sc->sc_ifp;
 	struct ieee80211vap *vap = ni->ni_vap;
-	struct ieee80211com *ic = ifp->if_l2com;
+//	struct ieee80211com *ic = ifp->if_l2com;
 	struct iwn_tx_cmd *cmd;
 	struct iwn_cmd_data *tx;
 	struct ieee80211_frame *wh;
@@ -3843,7 +4372,7 @@ iwn_tx_data_raw(struct iwn_softc *sc, struct mbuf *m,
 	uint32_t flags;
 	u_int hdrlen;
 	int ac, totlen, error, pad, nsegs = 0, i, rate;
-	uint8_t ridx, type, txant;
+	uint8_t type;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 
@@ -3859,16 +4388,8 @@ iwn_tx_data_raw(struct iwn_softc *sc, struct mbuf *m,
 	desc = &ring->desc[ring->cur];
 	data = &ring->data[ring->cur];
 
-	/* Choose a TX rate index. */
+	/* Choose a TX rate. */
 	rate = params->ibp_rate0;
-	ridx = ieee80211_legacy_rate_lookup(ic->ic_rt,
-	    rate & IEEE80211_RATE_VAL);
-	if (ridx == (uint8_t)-1) {
-		/* XXX fall back to mcast/mgmt rate? */
-		m_freem(m);
-		return EINVAL;
-	}
-
 	totlen = m->m_pkthdr.len;
 
 	/* Prepare TX firmware command. */
@@ -3938,17 +4459,10 @@ iwn_tx_data_raw(struct iwn_softc *sc, struct mbuf *m,
 	tx->rts_ntries = params->ibp_try1;
 	tx->data_ntries = params->ibp_try0;
 	tx->lifetime = htole32(IWN_LIFETIME_INFINITE);
-
-	/* XXX should just use  iwn_rate_to_plcp() */
-	tx->rate = htole32(rate2plcp(rate));
-	if (ridx < IWN_RIDX_OFDM6 &&
-	    IEEE80211_IS_CHAN_2GHZ(ni->ni_chan))
-		tx->rate |= htole32(IWN_RFLAG_CCK);
+	tx->rate = iwn_rate_to_plcp(sc, ni, rate);
 
 	/* Group or management frame. */
 	tx->linkq = 0;
-	txant = IWN_LSB(sc->txchainmask);
-	tx->rate |= htole32(IWN_RFLAG_ANT(txant));
 
 	/* Set physical address of "scratch area". */
 	tx->loaddr = htole32(IWN_LOADDR(data->scratch_paddr));
@@ -4195,19 +4709,26 @@ iwn_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 static int
 iwn_cmd(struct iwn_softc *sc, int code, const void *buf, int size, int async)
 {
-	struct iwn_tx_ring *ring = &sc->txq[4];
+	struct iwn_tx_ring *ring;
 	struct iwn_tx_desc *desc;
 	struct iwn_tx_data *data;
 	struct iwn_tx_cmd *cmd;
 	struct mbuf *m;
 	bus_addr_t paddr;
 	int totlen, error;
+	int cmd_queue_num;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 
 	if (async == 0)
 		IWN_LOCK_ASSERT(sc);
 
+	if (sc->sc_flags & IWN_FLAG_PAN_SUPPORT)
+		cmd_queue_num = IWN_PAN_CMD_QUEUE;
+	else
+		cmd_queue_num = IWN_CMD_QUEUE_NUM;
+
+	ring = &sc->txq[cmd_queue_num];
 	desc = &ring->desc[ring->cur];
 	data = &ring->data[ring->cur];
 	totlen = 4 + size;
@@ -4301,10 +4822,11 @@ iwn_set_link_quality(struct iwn_softc *sc, struct ieee80211_node *ni)
 {
 #define	RV(v)	((v) & IEEE80211_RATE_VAL)
 	struct iwn_node *wn = (void *)ni;
-	struct ieee80211_rateset *rs = &ni->ni_rates;
+	struct ieee80211_rateset *rs;
 	struct iwn_cmd_link_quality linkq;
 	uint8_t txant;
 	int i, rate, txrate;
+	int is_11n;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 
@@ -4314,29 +4836,100 @@ iwn_set_link_quality(struct iwn_softc *sc, struct ieee80211_node *ni)
 	memset(&linkq, 0, sizeof linkq);
 	linkq.id = wn->id;
 	linkq.antmsk_1stream = txant;
-	linkq.antmsk_2stream = IWN_ANT_AB;
-	linkq.ampdu_max = 64;
+
+	/*
+	 * The '2 stream' setup is a bit .. odd.
+	 *
+	 * For NICs that support only 1 antenna, default to IWN_ANT_AB or
+	 * the firmware panics (eg Intel 5100.)
+	 *
+	 * For NICs that support two antennas, we use ANT_AB.
+	 *
+	 * For NICs that support three antennas, we use the two that
+	 * wasn't the default one.
+	 *
+	 * XXX TODO: if bluetooth (full concurrent) is enabled, restrict
+	 * this to only one antenna.
+	 */
+
+	/* So - if there's no secondary antenna, assume IWN_ANT_AB */
+
+	/* Default - transmit on the other antennas */
+	linkq.antmsk_2stream = (sc->txchainmask & ~IWN_LSB(sc->txchainmask));
+
+	/* Now, if it's zero, set it to IWN_ANT_AB, so to not panic firmware */
+	if (linkq.antmsk_2stream == 0)
+		linkq.antmsk_2stream = IWN_ANT_AB;
+
+	/*
+	 * If the NIC is a two-stream TX NIC, configure the TX mask to
+	 * the default chainmask
+	 */
+	else if (sc->ntxchains == 2)
+		linkq.antmsk_2stream = sc->txchainmask;
+
+	linkq.ampdu_max = 32;		/* XXX negotiated? */
 	linkq.ampdu_threshold = 3;
 	linkq.ampdu_limit = htole16(4000);	/* 4ms */
 
+	DPRINTF(sc, IWN_DEBUG_XMIT,
+	    "%s: 1stream antenna=0x%02x, 2stream antenna=0x%02x, ntxstreams=%d\n",
+	    __func__,
+	    linkq.antmsk_1stream,
+	    linkq.antmsk_2stream,
+	    sc->ntxchains);
+
+	/*
+	 * Are we using 11n rates? Ensure the channel is
+	 * 11n _and_ we have some 11n rates, or don't
+	 * try.
+	 */
+	if (IEEE80211_IS_CHAN_HT(ni->ni_chan) && ni->ni_htrates.rs_nrates > 0) {
+		rs = (struct ieee80211_rateset *) &ni->ni_htrates;
+		is_11n = 1;
+	} else {
+		rs = &ni->ni_rates;
+		is_11n = 0;
+	}
+
 	/* Start at highest available bit-rate. */
-	if (IEEE80211_IS_CHAN_HT(ni->ni_chan))
+	/*
+	 * XXX this is all very dirty!
+	 */
+	if (is_11n)
 		txrate = ni->ni_htrates.rs_nrates - 1;
 	else
 		txrate = rs->rs_nrates - 1;
 	for (i = 0; i < IWN_MAX_TX_RETRIES; i++) {
 		uint32_t plcp;
 
-		if (IEEE80211_IS_CHAN_HT(ni->ni_chan))
-			rate = IEEE80211_RATE_MCS | txrate;
+		if (is_11n)
+			rate = IEEE80211_RATE_MCS | rs->rs_rates[txrate];
 		else
 			rate = RV(rs->rs_rates[txrate]);
 
+		DPRINTF(sc, IWN_DEBUG_XMIT,
+		    "%s: i=%d, txrate=%d, rate=0x%02x\n",
+		    __func__,
+		    i,
+		    txrate,
+		    rate);
+
 		/* Do rate -> PLCP config mapping */
 		plcp = iwn_rate_to_plcp(sc, ni, rate);
 		linkq.retry[i] = plcp;
 
-		/* Special case for dual-stream rates? */
+		/*
+		 * The mimo field is an index into the table which
+		 * indicates the first index where it and subsequent entries
+		 * will not be using MIMO.
+		 *
+		 * Since we're filling linkq from 0..15 and we're filling
+		 * from the higest MCS rates to the lowest rates, if we
+		 * _are_ doing a dual-stream rate, set mimo to idx+1 (ie,
+		 * the next entry.)  That way if the next entry is a non-MIMO
+		 * entry, we're already pointing at it.
+		 */
 		if ((le32toh(plcp) & IWN_RFLAG_MCS) &&
 		    RV(le32toh(plcp)) > 7)
 			linkq.mimo = i + 1;
@@ -4450,6 +5043,12 @@ iwn_set_led(struct iwn_softc *sc, uint8_t which, uint8_t off, uint8_t on)
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->Doing %s\n", __func__);
 
+#if 0
+	/* XXX don't set LEDs during scan? */
+	if (sc->sc_is_scanning)
+		return;
+#endif
+
 	/* Clear microcode LED ownership. */
 	IWN_CLRBITS(sc, IWN_LED, IWN_LED_BSM_CTRL);
 
@@ -4915,6 +5514,10 @@ iwn_collect_noise(struct iwn_softc *sc,
 #ifdef notyet
 	/* XXX Disable RX chains with no antennas connected. */
 	sc->rxon->rxchain = htole16(IWN_RXCHAIN_SEL(sc->chainmask));
+	if (sc->sc_is_scanning)
+		device_printf(sc->sc_dev,
+		    "%s: is_scanning set, before RXON\n",
+		    __func__);
 	(void)iwn_cmd(sc, IWN_CMD_RXON, sc->rxon, sc->rxonsz, 1);
 #endif
 
@@ -5072,10 +5675,6 @@ iwn_tune_sensitivity(struct iwn_softc *sc, const struct iwn_rx_stats *stats)
 	fa += le32toh(stats->ofdm.fa) - calib->fa_ofdm;
 	fa *= 200 * IEEE80211_DUR_TU;	/* 200TU */
 
-	/* Save counters values for next call. */
-	calib->bad_plcp_ofdm = le32toh(stats->ofdm.bad_plcp);
-	calib->fa_ofdm = le32toh(stats->ofdm.fa);
-
 	if (fa > 50 * rxena) {
 		/* High false alarm count, decrease sensitivity. */
 		DPRINTF(sc, IWN_DEBUG_CALIBRATE,
@@ -5129,10 +5728,6 @@ iwn_tune_sensitivity(struct iwn_softc *sc, const struct iwn_rx_stats *stats)
 	fa += le32toh(stats->cck.fa) - calib->fa_cck;
 	fa *= 200 * IEEE80211_DUR_TU;	/* 200TU */
 
-	/* Save counters values for next call. */
-	calib->bad_plcp_cck = le32toh(stats->cck.bad_plcp);
-	calib->fa_cck = le32toh(stats->cck.fa);
-
 	if (fa > 50 * rxena) {
 		/* High false alarm count, decrease sensitivity. */
 		DPRINTF(sc, IWN_DEBUG_CALIBRATE,
@@ -5213,7 +5808,7 @@ iwn_send_sensitivity(struct iwn_softc *sc)
 	cmd.energy_cck         = htole16(calib->energy_cck);
 	/* Barker modulation: use default values. */
 	cmd.corr_barker        = htole16(190);
-	cmd.corr_barker_mrc    = htole16(390);
+	cmd.corr_barker_mrc    = htole16(sc->limits->barker_mrc);
 
 	DPRINTF(sc, IWN_DEBUG_CALIBRATE,
 	    "%s: set sensitivity %d/%d/%d/%d/%d/%d/%d\n", __func__,
@@ -5237,6 +5832,86 @@ send:
 	return iwn_cmd(sc, IWN_CMD_SET_SENSITIVITY, &cmd, len, 1);
 }
 
+/*
+ * Look at the increase of PLCP errors over time; if it exceeds
+ * a programmed threshold then trigger an RF retune.
+ */
+static void
+iwn_check_rx_recovery(struct iwn_softc *sc, struct iwn_stats *rs)
+{
+	int32_t delta_ofdm, delta_ht, delta_cck;
+	struct iwn_calib_state *calib = &sc->calib;
+	int delta_ticks, cur_ticks;
+	int delta_msec;
+	int thresh;
+
+	/*
+	 * Calculate the difference between the current and
+	 * previous statistics.
+	 */
+	delta_cck = le32toh(rs->rx.cck.bad_plcp) - calib->bad_plcp_cck;
+	delta_ofdm = le32toh(rs->rx.ofdm.bad_plcp) - calib->bad_plcp_ofdm;
+	delta_ht = le32toh(rs->rx.ht.bad_plcp) - calib->bad_plcp_ht;
+
+	/*
+	 * Calculate the delta in time between successive statistics
+	 * messages.  Yes, it can roll over; so we make sure that
+	 * this doesn't happen.
+	 *
+	 * XXX go figure out what to do about rollover
+	 * XXX go figure out what to do if ticks rolls over to -ve instead!
+	 * XXX go stab signed integer overflow undefined-ness in the face.
+	 */
+	cur_ticks = ticks;
+	delta_ticks = cur_ticks - sc->last_calib_ticks;
+
+	/*
+	 * If any are negative, then the firmware likely reset; so just
+	 * bail.  We'll pick this up next time.
+	 */
+	if (delta_cck < 0 || delta_ofdm < 0 || delta_ht < 0 || delta_ticks < 0)
+		return;
+
+	/*
+	 * delta_ticks is in ticks; we need to convert it up to milliseconds
+	 * so we can do some useful math with it.
+	 */
+	delta_msec = ticks_to_msecs(delta_ticks);
+
+	/*
+	 * Calculate what our threshold is given the current delta_msec.
+	 */
+	thresh = sc->base_params->plcp_err_threshold * delta_msec;
+
+	DPRINTF(sc, IWN_DEBUG_STATE,
+	    "%s: time delta: %d; cck=%d, ofdm=%d, ht=%d, total=%d, thresh=%d\n",
+	    __func__,
+	    delta_msec,
+	    delta_cck,
+	    delta_ofdm,
+	    delta_ht,
+	    (delta_msec + delta_cck + delta_ofdm + delta_ht),
+	    thresh);
+
+	/*
+	 * If we need a retune, then schedule a single channel scan
+	 * to a channel that isn't the currently active one!
+	 *
+	 * The math from linux iwlwifi:
+	 *
+	 * if ((delta * 100 / msecs) > threshold)
+	 */
+	if (thresh > 0 && (delta_cck + delta_ofdm + delta_ht) * 100 > thresh) {
+		device_printf(sc->sc_dev,
+		    "%s: PLCP error threshold raw (%d) comparison (%d) "
+		    "over limit (%d); retune!\n",
+		    __func__,
+		    (delta_cck + delta_ofdm + delta_ht),
+		    (delta_cck + delta_ofdm + delta_ht) * 100,
+		    thresh);
+	}
+}
+
 /*
  * Set STA mode power saving level (between 0 and 5).
  * Level 0 is CAM (Continuously Aware Mode), 5 is for maximum power saving.
@@ -5322,25 +5997,74 @@ iwn_send_advanced_btcoex(struct iwn_softc *sc)
 		0xc0004000, 0x00004000, 0xf0005000, 0xf0005000,
 	};
 	struct iwn6000_btcoex_config btconfig;
+	struct iwn2000_btcoex_config btconfig2k;
 	struct iwn_btcoex_priotable btprio;
 	struct iwn_btcoex_prot btprot;
 	int error, i;
+	uint8_t flags;
 
 	memset(&btconfig, 0, sizeof btconfig);
-	btconfig.flags = 145;
-	btconfig.max_kill = 5;
-	btconfig.bt3_t7_timer = 1;
-	btconfig.kill_ack = htole32(0xffff0000);
-	btconfig.kill_cts = htole32(0xffff0000);
-	btconfig.sample_time = 2;
-	btconfig.bt3_t2_timer = 0xc;
-	for (i = 0; i < 12; i++)
-		btconfig.lookup_table[i] = htole32(btcoex_3wire[i]);
-	btconfig.valid = htole16(0xff);
-	btconfig.prio_boost = 0xf0;
-	DPRINTF(sc, IWN_DEBUG_RESET,
-	    "%s: configuring advanced bluetooth coexistence\n", __func__);
-	error = iwn_cmd(sc, IWN_CMD_BT_COEX, &btconfig, sizeof(btconfig), 1);
+	memset(&btconfig2k, 0, sizeof btconfig2k);
+
+	flags = IWN_BT_FLAG_COEX6000_MODE_3W <<
+	    IWN_BT_FLAG_COEX6000_MODE_SHIFT; // Done as is in linux kernel 3.2
+
+	if (sc->base_params->bt_sco_disable)
+		flags &= ~IWN_BT_FLAG_SYNC_2_BT_DISABLE;
+	else
+		flags |= IWN_BT_FLAG_SYNC_2_BT_DISABLE;
+
+	flags |= IWN_BT_FLAG_COEX6000_CHAN_INHIBITION;
+
+	/* Default flags result is 145 as old value */
+
+	/*
+	 * Flags value has to be review. Values must change if we
+	 * which to disable it
+	 */
+	if (sc->base_params->bt_session_2) {
+		btconfig2k.flags = flags;
+		btconfig2k.max_kill = 5;
+		btconfig2k.bt3_t7_timer = 1;
+		btconfig2k.kill_ack = htole32(0xffff0000);
+		btconfig2k.kill_cts = htole32(0xffff0000);
+		btconfig2k.sample_time = 2;
+		btconfig2k.bt3_t2_timer = 0xc;
+
+		for (i = 0; i < 12; i++)
+			btconfig2k.lookup_table[i] = htole32(btcoex_3wire[i]);
+		btconfig2k.valid = htole16(0xff);
+		btconfig2k.prio_boost = htole32(0xf0);
+		DPRINTF(sc, IWN_DEBUG_RESET,
+		    "%s: configuring advanced bluetooth coexistence"
+		    " session 2, flags : 0x%x\n",
+		    __func__,
+		    flags);
+		error = iwn_cmd(sc, IWN_CMD_BT_COEX, &btconfig2k,
+		    sizeof(btconfig2k), 1);
+	} else {
+		btconfig.flags = flags;
+		btconfig.max_kill = 5;
+		btconfig.bt3_t7_timer = 1;
+		btconfig.kill_ack = htole32(0xffff0000);
+		btconfig.kill_cts = htole32(0xffff0000);
+		btconfig.sample_time = 2;
+		btconfig.bt3_t2_timer = 0xc;
+
+		for (i = 0; i < 12; i++)
+			btconfig.lookup_table[i] = htole32(btcoex_3wire[i]);
+		btconfig.valid = htole16(0xff);
+		btconfig.prio_boost = 0xf0;
+		DPRINTF(sc, IWN_DEBUG_RESET,
+		    "%s: configuring advanced bluetooth coexistence,"
+		    " flags : 0x%x\n",
+		    __func__,
+		    flags);
+		error = iwn_cmd(sc, IWN_CMD_BT_COEX, &btconfig,
+		    sizeof(btconfig), 1);
+	}
+
+
 	if (error != 0)
 		return error;
 
@@ -5395,13 +6119,32 @@ iwn_config(struct iwn_softc *sc)
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 
-	if (sc->hw_type == IWN_HW_REV_TYPE_6005) {
-		/* Set radio temperature sensor offset. */
+	if ((sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSET)
+	    && (sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSETv2)) {
+		device_printf(sc->sc_dev,"%s: temp_offset and temp_offsetv2 are"
+		    " exclusive each together. Review NIC config file. Conf"
+		    " :  0x%08x Flags :  0x%08x  \n", __func__,
+		    sc->base_params->calib_need,
+		    (IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSET |
+		    IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSETv2));
+		return (EINVAL);
+	}
+
+	/* Compute temperature calib if needed. Will be send by send calib */
+	if (sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSET) {
 		error = iwn5000_temp_offset_calib(sc);
 		if (error != 0) {
 			device_printf(sc->sc_dev,
 			    "%s: could not set temperature offset\n", __func__);
-			return error;
+			return (error);
+		}
+	} else if (sc->base_params->calib_need & IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSETv2) {
+		error = iwn5000_temp_offset_calibv2(sc);
+		if (error != 0) {
+			device_printf(sc->sc_dev,
+			    "%s: could not compute temperature offset v2\n",
+			    __func__);
+			return (error);
 		}
 	}
 
@@ -5432,10 +6175,14 @@ iwn_config(struct iwn_softc *sc)
 	}
 
 	/* Configure bluetooth coexistence. */
-	if (sc->sc_flags & IWN_FLAG_ADV_BTCOEX)
+	error = 0;
+
+	/* Configure bluetooth coexistence if needed. */
+	if (sc->base_params->bt_mode == IWN_BT_ADVANCED)
 		error = iwn_send_advanced_btcoex(sc);
-	else
+	if (sc->base_params->bt_mode == IWN_BT_SIMPLE)
 		error = iwn_send_btcoex(sc);
+
 	if (error != 0) {
 		device_printf(sc->sc_dev,
 		    "%s: could not configure bluetooth coexistence, error %d\n",
@@ -5477,6 +6224,10 @@ iwn_config(struct iwn_softc *sc)
 	    IWN_RXCHAIN_IDLE_COUNT(2);
 	sc->rxon->rxchain = htole16(rxchain);
 	DPRINTF(sc, IWN_DEBUG_RESET, "%s: setting configuration\n", __func__);
+	if (sc->sc_is_scanning)
+		device_printf(sc->sc_dev,
+		    "%s: is_scanning set, before RXON\n",
+		    __func__);
 	error = iwn_cmd(sc, IWN_CMD_RXON, sc->rxon, sc->rxonsz, 0);
 	if (error != 0) {
 		device_printf(sc->sc_dev, "%s: RXON command failed\n",
@@ -5527,27 +6278,109 @@ ieee80211_add_ssid(uint8_t *frm, const uint8_t *ssid, u_int len)
 	return frm + len;
 }
 
+static uint16_t
+iwn_get_active_dwell_time(struct iwn_softc *sc,
+    struct ieee80211_channel *c, uint8_t n_probes)
+{
+	/* No channel? Default to 2GHz settings */
+	if (c == NULL || IEEE80211_IS_CHAN_2GHZ(c)) {
+		return (IWN_ACTIVE_DWELL_TIME_2GHZ +
+		IWN_ACTIVE_DWELL_FACTOR_2GHZ * (n_probes + 1));
+	}
+
+	/* 5GHz dwell time */
+	return (IWN_ACTIVE_DWELL_TIME_5GHZ +
+	    IWN_ACTIVE_DWELL_FACTOR_5GHZ * (n_probes + 1));
+}
+
+/*
+ * Limit the total dwell time to 85% of the beacon interval.
+ *
+ * Returns the dwell time in milliseconds.
+ */
+static uint16_t
+iwn_limit_dwell(struct iwn_softc *sc, uint16_t dwell_time)
+{
+	struct ieee80211com *ic = sc->sc_ifp->if_l2com;
+	struct ieee80211vap *vap = NULL;
+	int bintval = 0;
+
+	/* bintval is in TU (1.024mS) */
+	if (! TAILQ_EMPTY(&ic->ic_vaps)) {
+		vap = TAILQ_FIRST(&ic->ic_vaps);
+		bintval = vap->iv_bss->ni_intval;
+	}
+
+	/*
+	 * If it's non-zero, we should calculate the minimum of
+	 * it and the DWELL_BASE.
+	 *
+	 * XXX Yes, the math should take into account that bintval
+	 * is 1.024mS, not 1mS..
+	 */
+	if (bintval > 0) {
+		DPRINTF(sc, IWN_DEBUG_SCAN,
+		    "%s: bintval=%d\n",
+		    __func__,
+		    bintval);
+		return (MIN(IWN_PASSIVE_DWELL_BASE, ((bintval * 85) / 100)));
+	}
+
+	/* No association context? Default */
+	return (IWN_PASSIVE_DWELL_BASE);
+}
+
+static uint16_t
+iwn_get_passive_dwell_time(struct iwn_softc *sc, struct ieee80211_channel *c)
+{
+	uint16_t passive;
+
+	if (c == NULL || IEEE80211_IS_CHAN_2GHZ(c)) {
+		passive = IWN_PASSIVE_DWELL_BASE + IWN_PASSIVE_DWELL_TIME_2GHZ;
+	} else {
+		passive = IWN_PASSIVE_DWELL_BASE + IWN_PASSIVE_DWELL_TIME_5GHZ;
+	}
+
+	/* Clamp to the beacon interval if we're associated */
+	return (iwn_limit_dwell(sc, passive));
+}
+
 static int
-iwn_scan(struct iwn_softc *sc)
+iwn_scan(struct iwn_softc *sc, struct ieee80211vap *vap,
+    struct ieee80211_scan_state *ss, struct ieee80211_channel *c)
 {
 	struct ifnet *ifp = sc->sc_ifp;
 	struct ieee80211com *ic = ifp->if_l2com;
-	struct ieee80211_scan_state *ss = ic->ic_scan;	/*XXX*/
-	struct ieee80211_node *ni = ss->ss_vap->iv_bss;
+	struct ieee80211_node *ni = vap->iv_bss;
 	struct iwn_scan_hdr *hdr;
 	struct iwn_cmd_data *tx;
 	struct iwn_scan_essid *essid;
 	struct iwn_scan_chan *chan;
 	struct ieee80211_frame *wh;
 	struct ieee80211_rateset *rs;
-	struct ieee80211_channel *c;
 	uint8_t *buf, *frm;
 	uint16_t rxchain;
 	uint8_t txant;
 	int buflen, error;
+	int is_active;
+	uint16_t dwell_active, dwell_passive;
+	uint32_t extra, scan_service_time;
 
 	DPRINTF(sc, IWN_DEBUG_TRACE, "->%s begin\n", __func__);
 
+	/*
+	 * We are absolutely not allowed to send a scan command when another
+	 * scan command is pending.
+	 */
+	if (sc->sc_is_scanning) {
+		device_printf(sc->sc_dev, "%s: called whilst scanning!\n",
+		    __func__);
+		return (EAGAIN);
+	}
+
+	/* Assign the scan channel */
+	c = ic->ic_curchan;
+
 	sc->rxon = &sc->rx_on[IWN_RXON_BSS_CTX];
 	buf = malloc(IWN_SCAN_MAXSZ, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (buf == NULL) {
@@ -5563,13 +6396,29 @@ iwn_scan(struct iwn_softc *sc)
 	 */
 	hdr->quiet_time = htole16(10);		/* timeout in milliseconds */
 	hdr->quiet_threshold = htole16(1);	/* min # of packets */
+	/*
+	 * Max needs to be greater than active and passive and quiet!
+	 * It's also in microseconds!
+	 */
+	hdr->max_svc = htole32(250 * 1024);
+
+	/*
+	 * Reset scan: interval=100
+	 * Normal scan: interval=becaon interval
+	 * suspend_time: 100 (TU)
+	 *
+	 */
+	extra = (100 /* suspend_time */ / 100 /* beacon interval */) << 22;
+	//scan_service_time = extra | ((100 /* susp */ % 100 /* int */) * 1024);
+	scan_service_time = (4 << 22) | (100 * 1024);	/* Hardcode for now! */
+	hdr->pause_svc = htole32(scan_service_time);
 
 	/* Select antennas for scanning. */
 	rxchain =
 	    IWN_RXCHAIN_VALID(sc->rxchainmask) |
 	    IWN_RXCHAIN_FORCE_MIMO_SEL(sc->rxchainmask) |
 	    IWN_RXCHAIN_DRIVER_FORCE;
-	if (IEEE80211_IS_CHAN_A(ic->ic_curchan) &&
+	if (IEEE80211_IS_CHAN_A(c) &&
 	    sc->hw_type == IWN_HW_REV_TYPE_4965) {
 		/* Ant A must be avoided in 5GHz because of an HW bug. */
 		rxchain |= IWN_RXCHAIN_FORCE_SEL(IWN_ANT_B);
@@ -5583,7 +6432,7 @@ iwn_scan(struct iwn_softc *sc)
 	tx->id = sc->broadcast_id;
 	tx->lifetime = htole32(IWN_LIFETIME_INFINITE);
 
-	if (IEEE80211_IS_CHAN_5GHZ(ic->ic_curchan)) {
+	if (IEEE80211_IS_CHAN_5GHZ(c)) {
 		/* Send probe requests at 6Mbps. */
 		tx->rate = htole32(0xd);
 		rs = &ic->ic_sup_rates[IEEE80211_MODE_11A];
@@ -5602,12 +6451,35 @@ iwn_scan(struct iwn_softc *sc)
 	txant = IWN_LSB(sc->txchainmask);
 	tx->rate |= htole32(IWN_RFLAG_ANT(txant));
 
+	/*
+	 * Only do active scanning if we're announcing a probe request
+	 * for a given SSID (or more, if we ever add it to the driver.)
+	 */
+	is_active = 0;
+
+	/*
+	 * If we're scanning for a specific SSID, add it to the command.
+	 *
+	 * XXX maybe look at adding support for scanning multiple SSIDs?
+	 */
 	essid = (struct iwn_scan_essid *)(tx + 1);
-	if (ss->ss_ssid[0].len != 0) {
-		essid[0].id = IEEE80211_ELEMID_SSID;
-		essid[0].len = ss->ss_ssid[0].len;
-		memcpy(essid[0].data, ss->ss_ssid[0].ssid, ss->ss_ssid[0].len);
+	if (ss != NULL) {
+		if (ss->ss_ssid[0].len != 0) {
+			essid[0].id = IEEE80211_ELEMID_SSID;
+			essid[0].len = ss->ss_ssid[0].len;
+			memcpy(essid[0].data, ss->ss_ssid[0].ssid, ss->ss_ssid[0].len);
+		}
+
+		DPRINTF(sc, IWN_DEBUG_SCAN, "%s: ssid_len=%d, ssid=%*s\n",
+		    __func__,
+		    ss->ss_ssid[0].len,
+		    ss->ss_ssid[0].len,
+		    ss->ss_ssid[0].ssid);
+
+		if (ss->ss_nssid > 0)
+			is_active = 1;
 	}
+
 	/*
 	 * Build a probe request frame.  Most of the following code is a
 	 * copy & paste of what is done in net80211.
@@ -5633,53 +6505,102 @@ iwn_scan(struct iwn_softc *sc)
 	/* Set length of probe request. */
 	tx->len = htole16(frm - (uint8_t *)wh);
 
-	c = ic->ic_curchan;
+	/*
+	 * If active scanning is requested but a certain channel is
+	 * marked passive, we can do active scanning if we detect
+	 * transmissions.
+	 *
+	 * There is an issue with some firmware versions that triggers
+	 * a sysassert on a "good CRC threshold" of zero (== disabled),
+	 * on a radar channel even though this means that we should NOT
+	 * send probes.
+	 *
+	 * The "good CRC threshold" is the number of frames that we
+	 * need to receive during our dwell time on a channel before
+	 * sending out probes -- setting this to a huge value will
+	 * mean we never reach it, but at the same time work around
+	 * the aforementioned issue. Thus use IWL_GOOD_CRC_TH_NEVER
+	 * here instead of IWL_GOOD_CRC_TH_DISABLED.
+	 *
+	 * This was fixed in later versions along with some other
+	 * scan changes, and the threshold behaves as a flag in those
+	 * versions.
+	 */
+
+	/*
+	 * If we're doing active scanning, set the crc_threshold
+	 * to a suitable value.  This is different to active veruss
+	 * passive scanning depending upon the channel flags; the
+	 * firmware will obey that particular check for us.
+	 */
+	if (sc->tlv_feature_flags & IWN_UCODE_TLV_FLAGS_NEWSCAN)
+		hdr->crc_threshold = is_active ?
+		    IWN_GOOD_CRC_TH_DEFAULT : IWN_GOOD_CRC_TH_DISABLED;
+	else
+		hdr->crc_threshold = is_active ?
+		    IWN_GOOD_CRC_TH_DEFAULT : IWN_GOOD_CRC_TH_NEVER;
+
 	chan = (struct iwn_scan_chan *)frm;
 	chan->chan = htole16(ieee80211_chan2ieee(ic, c));
 	chan->flags = 0;
 	if (ss->ss_nssid > 0)
 		chan->flags |= htole32(IWN_CHAN_NPBREQS(1));
 	chan->dsp_gain = 0x6e;
+
+	/*
+	 * Set the passive/active flag depending upon the channel mode.
+	 * XXX TODO: take the is_active flag into account as well?
+	 */
+	if (c->ic_flags & IEEE80211_CHAN_PASSIVE)
+		chan->flags |= htole32(IWN_CHAN_PASSIVE);
+	else
+		chan->flags |= htole32(IWN_CHAN_ACTIVE);
+
+	/*
+	 * Calculate the active/passive dwell times.
+	 */
+
+	dwell_active = iwn_get_active_dwell_time(sc, c, ss->ss_nssid);
+	dwell_passive = iwn_get_passive_dwell_time(sc, c);
+
+	/* Make sure they're valid */
+	if (dwell_passive <= dwell_active)
+		dwell_passive = dwell_active + 1;
+
+	chan->active = htole16(dwell_active);
+	chan->passive = htole16(dwell_passive);
+
 	if (IEEE80211_IS_CHAN_5GHZ(c) &&
 	    !(c->ic_flags & IEEE80211_CHAN_PASSIVE)) {
 		chan->rf_gain = 0x3b;
-		chan->active  = htole16(24);
-		chan->passive = htole16(110);
-		chan->flags |= htole32(IWN_CHAN_ACTIVE);
 	} else if (IEEE80211_IS_CHAN_5GHZ(c)) {
 		chan->rf_gain = 0x3b;
-		chan->active  = htole16(24);
-		if (sc->rxon->associd)
-			chan->passive = htole16(78);
-		else
-			chan->passive = htole16(110);
-		hdr->crc_threshold = 0xffff;
 	} else if (!(c->ic_flags & IEEE80211_CHAN_PASSIVE)) {
 		chan->rf_gain = 0x28;
-		chan->active  = htole16(36);
-		chan->passive = htole16(120);
-		chan->flags |= htole32(IWN_CHAN_ACTIVE);
 	} else {
 		chan->rf_gain = 0x28;
-		chan->active  = htole16(36);
-		if (sc->rxon->associd)
-			chan->passive = htole16(88);
-		else
-			chan->passive = htole16(120);
-		hdr->crc_threshold = 0xffff;
 	}
 
 	DPRINTF(sc, IWN_DEBUG_STATE,
 	    "%s: chan %u flags 0x%x rf_gain 0x%x "
-	    "dsp_gain 0x%x active 0x%x passive 0x%x\n", __func__,
+	    "dsp_gain 0x%x active %d passive %d scan_svc_time %d crc 0x%x "
+	    "isactive=%d numssid=%d\n", __func__,
 	    chan->chan, chan->flags, chan->rf_gain, chan->dsp_gain,
-	    chan->active, chan->passive);
+	    dwell_active, dwell_passive, scan_service_time,
+	    hdr->crc_threshold, is_active, ss->ss_nssid);
 
 	hdr->nchan++;
 	chan++;
 	buflen = (uint8_t *)chan - buf;
 	hdr->len = htole16(buflen);
 
+	if (sc->sc_is_scanning) {
+		device_printf(sc->sc_dev,
+		    "%s: called with is_scanning set!\n",
+		    __func__);
+	}
+	sc->sc_is_scanning = 1;
+
 	DPRINTF(sc, IWN_DEBUG_STATE, "sending scan command nchan=%d\n",
 	    hdr->nchan);
 	error = iwn_cmd(sc, IWN_CMD_SCAN, buf, buflen, 1);
@@ -5720,12 +6641,16 @@ iwn_auth(struct iwn_softc *sc, struct ieee80211vap *vap)
 		sc->rxon->ofdm_mask = 0;
 	} else {
 		/* Assume 802.11b/g. */
-		sc->rxon->cck_mask  = 0x0f;
+		sc->rxon->cck_mask  = 0x03;
 		sc->rxon->ofdm_mask = 0x15;
 	}
 	DPRINTF(sc, IWN_DEBUG_STATE, "rxon chan %d flags %x cck %x ofdm %x\n",
 	    sc->rxon->chan, sc->rxon->flags, sc->rxon->cck_mask,
 	    sc->rxon->ofdm_mask);
+	if (sc->sc_is_scanning)
+		device_printf(sc->sc_dev,
+		    "%s: is_scanning set, before RXON\n",
+		    __func__);
 	error = iwn_cmd(sc, IWN_CMD_RXON, sc->rxon, sc->rxonsz, 1);
 	if (error != 0) {
 		device_printf(sc->sc_dev, "%s: RXON command failed, error %d\n",
@@ -5821,6 +6746,10 @@ iwn_run(struct iwn_softc *sc, struct ieee80211vap *vap)
 	sc->rxon->filter |= htole32(IWN_FILTER_BSS);
 	DPRINTF(sc, IWN_DEBUG_STATE, "rxon chan %d flags %x\n",
 	    sc->rxon->chan, sc->rxon->flags);
+	if (sc->sc_is_scanning)
+		device_printf(sc->sc_dev,
+		    "%s: is_scanning set, before RXON\n",
+		    __func__);
 	error = iwn_cmd(sc, IWN_CMD_RXON, sc->rxon, sc->rxonsz, 1);
 	if (error != 0) {
 		device_printf(sc->sc_dev,
@@ -6219,10 +7148,10 @@ iwn5000_query_calibration(struct iwn_softc *sc)
 	int error;
 
 	memset(&cmd, 0, sizeof cmd);
-	cmd.ucode.once.enable = 0xffffffff;
-	cmd.ucode.once.start  = 0xffffffff;
-	cmd.ucode.once.send   = 0xffffffff;
-	cmd.ucode.flags       = 0xffffffff;
+	cmd.ucode.once.enable = htole32(0xffffffff);
+	cmd.ucode.once.start  = htole32(0xffffffff);
+	cmd.ucode.once.send   = htole32(0xffffffff);
+	cmd.ucode.flags       = htole32(0xffffffff);
 	DPRINTF(sc, IWN_DEBUG_CALIBRATE, "%s: sending calibration query\n",
 	    __func__);
 	error = iwn_cmd(sc, IWN5000_CMD_CALIB_CONFIG, &cmd, sizeof cmd, 0);
@@ -6244,9 +7173,20 @@ iwn5000_send_calibration(struct iwn_softc *sc)
 {
 	int idx, error;
 
-	for (idx = 0; idx < 5; idx++) {
-		if (sc->calibcmd[idx].buf == NULL)
-			continue;	/* No results available. */
+	for (idx = 0; idx < IWN5000_PHY_CALIB_MAX_RESULT; idx++) {
+		if (!(sc->base_params->calib_need & (1<<idx))) {
+			DPRINTF(sc, IWN_DEBUG_CALIBRATE,
+			    "No need of calib %d\n",
+			    idx);
+			continue; /* no need for this calib */
+		}
+		if (sc->calibcmd[idx].buf == NULL) {
+			DPRINTF(sc, IWN_DEBUG_CALIBRATE,
+			    "Need calib idx : %d but no available data\n",
+			    idx);
+			continue;
+		}
+
 		DPRINTF(sc, IWN_DEBUG_CALIBRATE,
 		    "send calibration result idx=%d len=%d\n", idx,
 		    sc->calibcmd[idx].len);
@@ -6267,7 +7207,7 @@ iwn5000_send_wimax_coex(struct iwn_softc *sc)
 {
 	struct iwn5000_wimax_coex wimax;
 
-#ifdef notyet
+#if 0
 	if (sc->hw_type == IWN_HW_REV_TYPE_6050) {
 		/* Enable WiMAX coexistence for combo adapters. */
 		wimax.flags =
@@ -6323,6 +7263,33 @@ iwn5000_temp_offset_calib(struct iwn_softc *sc)
 	return iwn_cmd(sc, IWN_CMD_PHY_CALIB, &cmd, sizeof cmd, 0);
 }
 
+static int
+iwn5000_temp_offset_calibv2(struct iwn_softc *sc)
+{
+	struct iwn5000_phy_calib_temp_offsetv2 cmd;
+
+	memset(&cmd, 0, sizeof cmd);
+	cmd.code = IWN5000_PHY_CALIB_TEMP_OFFSET;
+	cmd.ngroups = 1;
+	cmd.isvalid = 1;
+	if (sc->eeprom_temp != 0) {
+		cmd.offset_low = htole16(sc->eeprom_temp);
+		cmd.offset_high = htole16(sc->eeprom_temp_high);
+	} else {
+		cmd.offset_low = htole16(IWN_DEFAULT_TEMP_OFFSET);
+		cmd.offset_high = htole16(IWN_DEFAULT_TEMP_OFFSET);
+	}
+	cmd.burnt_voltage_ref = htole16(sc->eeprom_voltage);
+
+	DPRINTF(sc, IWN_DEBUG_CALIBRATE,
+	    "setting radio sensor low offset to %d, high offset to %d, voltage to %d\n",
+	    le16toh(cmd.offset_low),
+	    le16toh(cmd.offset_high),
+	    le16toh(cmd.burnt_voltage_ref));
+
+	return iwn_cmd(sc, IWN_CMD_PHY_CALIB, &cmd, sizeof cmd, 0);
+}
+
 /*
  * This function is called after the runtime firmware notifies us of its
  * readiness (called in a process context).
@@ -6408,7 +7375,10 @@ iwn5000_post_alive(struct iwn_softc *sc)
 	IWN_SETBITS(sc, IWN_FH_TX_CHICKEN, IWN_FH_TX_CHICKEN_SCHED_RETRY);
 
 	/* Enable chain mode for all queues, except command queue. */
-	iwn_prph_write(sc, IWN5000_SCHED_QCHAIN_SEL, 0xfffef);
+	if (sc->sc_flags & IWN_FLAG_PAN_SUPPORT)
+		iwn_prph_write(sc, IWN5000_SCHED_QCHAIN_SEL, 0xfffdf);
+	else
+		iwn_prph_write(sc, IWN5000_SCHED_QCHAIN_SEL, 0xfffef);
 	iwn_prph_write(sc, IWN5000_SCHED_AGGR_SEL, 0);
 
 	for (qid = 0; qid < IWN5000_NTXQUEUES; qid++) {
@@ -6429,10 +7399,20 @@ iwn5000_post_alive(struct iwn_softc *sc)
 	iwn_prph_write(sc, IWN5000_SCHED_TXFACT, 0xff);
 
 	/* Mark TX rings (4 EDCA + cmd + 2 HCCA) as active. */
-	for (qid = 0; qid < 7; qid++) {
-		static uint8_t qid2fifo[] = { 3, 2, 1, 0, 7, 5, 6 };
-		iwn_prph_write(sc, IWN5000_SCHED_QUEUE_STATUS(qid),
-		    IWN5000_TXQ_STATUS_ACTIVE | qid2fifo[qid]);
+	if (sc->sc_flags & IWN_FLAG_PAN_SUPPORT) {
+		/* Mark TX rings as active. */
+		for (qid = 0; qid < 11; qid++) {
+			static uint8_t qid2fifo[] = { 3, 2, 1, 0, 0, 4, 2, 5, 4, 7, 5 };
+			iwn_prph_write(sc, IWN5000_SCHED_QUEUE_STATUS(qid),
+			    IWN5000_TXQ_STATUS_ACTIVE | qid2fifo[qid]);
+		}
+	} else {
+		/* Mark TX rings (4 EDCA + cmd + 2 HCCA) as active. */
+		for (qid = 0; qid < 7; qid++) {
+			static uint8_t qid2fifo[] = { 3, 2, 1, 0, 7, 5, 6 };
+			iwn_prph_write(sc, IWN5000_SCHED_QUEUE_STATUS(qid),
+			    IWN5000_TXQ_STATUS_ACTIVE | qid2fifo[qid]);
+		}
 	}
 	iwn_nic_unlock(sc);
 
@@ -6797,7 +7777,7 @@ iwn_read_firmware_tlv(struct iwn_softc *sc, struct iwn_fw_info *fw,
 				sc->sc_flags |= IWN_FLAG_ENH_SENS;
 			break;
 		case IWN_FW_TLV_PHY_CALIB:
-			tmp = htole32(*ptr);
+			tmp = le32toh(*ptr);
 			if (tmp < 253) {
 				sc->reset_noise_gain = tmp;
 				sc->noise_gain = tmp + 1;
@@ -6808,8 +7788,16 @@ iwn_read_firmware_tlv(struct iwn_softc *sc, struct iwn_fw_info *fw,
 			DPRINTF(sc, IWN_DEBUG_RESET,
 			    "PAN Support found: %d\n", 1);
 			break;
-		case IWN_FW_TLV_FLAGS :
-			sc->tlv_feature_flags = htole32(*ptr);
+		case IWN_FW_TLV_FLAGS:
+			if (len < sizeof(uint32_t))
+				break;
+			if (len % sizeof(uint32_t))
+				break;
+			sc->tlv_feature_flags = le32toh(*ptr);
+			DPRINTF(sc, IWN_DEBUG_RESET,
+			    "%s: feature: 0x%08x\n",
+			    __func__,
+			    sc->tlv_feature_flags);
 			break;
 		case IWN_FW_TLV_PBREQ_MAXLEN:
 		case IWN_FW_TLV_RUNT_EVTLOG_PTR:
@@ -6945,9 +7933,8 @@ iwn_apm_init(struct iwn_softc *sc)
 	else
 		IWN_CLRBITS(sc, IWN_GIO, IWN_GIO_L0S_ENA);
 
-	if (sc->hw_type != IWN_HW_REV_TYPE_4965 &&
-	    sc->hw_type <= IWN_HW_REV_TYPE_1000)
-		IWN_SETBITS(sc, IWN_ANA_PLL, IWN_ANA_PLL_INIT);
+	if (sc->base_params->pll_cfg_val)
+		IWN_SETBITS(sc, IWN_ANA_PLL, sc->base_params->pll_cfg_val);
 
 	/* Wait for clock stabilization before accessing prph. */
 	if ((error = iwn_clock_wait(sc)) != 0)
@@ -7059,13 +8046,13 @@ iwn5000_nic_config(struct iwn_softc *sc)
 		/* Use internal power amplifier only. */
 		IWN_WRITE(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_RADIO_2X2_IPA);
 	}
-	if ((sc->hw_type == IWN_HW_REV_TYPE_6050 ||
-	     sc->hw_type == IWN_HW_REV_TYPE_6005) && sc->calib_ver >= 6) {
+	if (sc->base_params->additional_nic_config && sc->calib_ver >= 6) {
 		/* Indicate that ROM calibration version is >=6. */
 		IWN_SETBITS(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_CALIB_VER6);
 	}
-	if (sc->hw_type == IWN_HW_REV_TYPE_6005)
-		IWN_SETBITS(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_6050_1X2);
+	if (sc->base_params->additional_gp_drv_bit)
+		IWN_SETBITS(sc, IWN_GP_DRIVER,
+		    sc->base_params->additional_gp_drv_bit);
 	return 0;
 }
 
@@ -7200,7 +8187,7 @@ iwn_hw_init(struct iwn_softc *sc)
 	IWN_WRITE(sc, IWN_UCODE_GP1_CLR, IWN_UCODE_GP1_RFKILL);
 
 	/* Enable shadow registers. */
-	if (sc->hw_type >= IWN_HW_REV_TYPE_6000)
+	if (sc->base_params->shadow_reg_enable)
 		IWN_SETBITS(sc, IWN_SHADOW_REG_CTRL, 0x800fffff);
 
 	if ((error = ops->load_firmware(sc)) != 0) {
@@ -7404,6 +8391,7 @@ iwn_stop_locked(struct iwn_softc *sc)
 
 	IWN_LOCK_ASSERT(sc);
 
+	sc->sc_is_scanning = 0;
 	sc->sc_tx_timer = 0;
 	callout_stop(&sc->watchdog_to);
 	callout_stop(&sc->calib_to);
@@ -7494,10 +8482,11 @@ iwn_scan_curchan(struct ieee80211_scan_state *ss, unsigned long maxdwell)
 {
 	struct ieee80211vap *vap = ss->ss_vap;
 	struct iwn_softc *sc = vap->iv_ic->ic_ifp->if_softc;
+	struct ieee80211com *ic = vap->iv_ic;
 	int error;
 
 	IWN_LOCK(sc);
-	error = iwn_scan(sc);
+	error = iwn_scan(sc, vap, ss, ic->ic_curchan);
 	IWN_UNLOCK(sc);
 	if (error != 0)
 		ieee80211_cancel_scan(vap);
diff --git a/sys/dev/iwn/if_iwn_chip_cfg.h b/sys/dev/iwn/if_iwn_chip_cfg.h
new file mode 100644
index 00000000000..f9307a67beb
--- /dev/null
+++ b/sys/dev/iwn/if_iwn_chip_cfg.h
@@ -0,0 +1,412 @@
+/*-
+ * Copyright (c) 2013 Cedric GROSS <cg@cgross.info>
+ * Copyright (c) 2011 Intel Corporation
+ *
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	__IF_IWN_CHIP_CFG_H__
+#define	__IF_IWN_CHIP_CFG_H__
+
+/* ==========================================================================
+ *                                  NIC PARAMETERS
+ *
+ * ==========================================================================
+ */
+
+/*
+ * Flags for managing calibration result. See calib_need
+ * in iwn_base_params struct
+ *
+ * These are bitmasks that determine which indexes in the calibcmd
+ * array are pushed up.
+ */
+#define IWN_FLG_NEED_PHY_CALIB_DC		(1<<0)
+#define IWN_FLG_NEED_PHY_CALIB_LO		(1<<1)
+#define IWN_FLG_NEED_PHY_CALIB_TX_IQ		(1<<2)
+#define IWN_FLG_NEED_PHY_CALIB_TX_IQ_PERIODIC	(1<<3)
+#define IWN_FLG_NEED_PHY_CALIB_BASE_BAND	(1<<4)
+/*
+ * These aren't (yet) included in the calibcmd array, but
+ * are used as flags for which calibrations to use.
+ *
+ * XXX I think they should be named differently and
+ * stuffed in a different member in the config struct!
+ */
+#define IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSET	(1<<5)
+#define IWN_FLG_NEED_PHY_CALIB_CRYSTAL		(1<<6)
+#define IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSETv2	(1<<7)
+
+/*
+ * Each chip has a different threshold for PLCP errors that should trigger a
+ * retune.
+ */
+#define	IWN_PLCP_ERR_DEFAULT_THRESHOLD		50
+#define	IWN_PLCP_ERR_LONG_THRESHOLD		100
+#define	IWN_PLCP_ERR_EXT_LONG_THRESHOLD		200
+
+/*
+ * Define some parameters for managing different NIC.
+ * Refer to linux specific file like iwl-xxxx.c to determine correct value
+ * for NIC.
+ *
+ * @max_ll_items: max number of OTP blocks
+ * @shadow_ram_support: shadow support for OTP memory
+ * @shadow_reg_enable: HW shadhow register bit
+ * @no_idle_support: do not support idle mode
+ * @advanced_bt_coexist : Advanced BT management
+ * @bt_session_2 : NIC need a new struct for configure BT coexistence. Needed
+ *   only if advanced_bt_coexist is true
+ * @bt_sco_disable :
+ * @additional_nic_config: For 6005 series
+ * @iq_invert : ? But need it for N 2000 series
+ * @regulatory_bands : XXX
+ * @enhanced_TX_power : EEPROM Has advanced TX power options. Set 'True'
+ *    if update_enhanced_txpower = iwl_eeprom_enhanced_txpower.
+ *    See iwl-agn-devices.c file to determine that(enhanced_txpower)
+ * @need_temp_offset_calib : Need to compute some temp offset for calibration.
+ * @calib_need : Use IWN_FLG_NEED_PHY_CALIB_* flags to specify which
+ *    calibration data ucode need. See calib_init_cfg in iwl-xxxx.c
+ *    linux kernel file
+ * @support_hostap: Define IEEE80211_C_HOSTAP for ic_caps
+ * @no_multi_vaps: See iwn_vap_create
+ * @additional_gp_drv_bit : Specific bit to defined during nic_config
+ * @bt_mode: BT configuration mode
+ */
+enum bt_mode_enum {
+	IWN_BT_NONE,
+	IWN_BT_SIMPLE,
+	IWN_BT_ADVANCED
+};
+
+struct iwn_base_params {
+	uint32_t	pll_cfg_val;
+	const uint16_t	max_ll_items;
+#define IWN_OTP_MAX_LL_ITEMS_1000		(3)	/* OTP blocks for 1000 */
+#define IWN_OTP_MAX_LL_ITEMS_6x00		(4)	/* OTP blocks for 6x00 */
+#define IWN_OTP_MAX_LL_ITEMS_6x50		(7)	/* OTP blocks for 6x50 */
+#define IWN_OTP_MAX_LL_ITEMS_2x00		(4)	/* OTP blocks for 2x00 */
+	const bool	shadow_ram_support;
+	const bool	shadow_reg_enable;
+	const bool	bt_session_2;
+	const bool	bt_sco_disable;
+	const bool	additional_nic_config;
+	const uint32_t	*regulatory_bands;
+	const bool	enhanced_TX_power;
+	const uint16_t	calib_need;
+	const bool	support_hostap;
+	const bool	no_multi_vaps;
+	uint8_t	additional_gp_drv_bit;
+	enum bt_mode_enum	bt_mode;
+	uint32_t	plcp_err_threshold;
+};
+
+static const struct iwn_base_params iwn5000_base_params = {
+	.pll_cfg_val = IWN_ANA_PLL_INIT,	/* pll_cfg_val; */
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x00,	/* max_ll_items */
+	.shadow_ram_support = true,	/* shadow_ram_support */
+	.shadow_reg_enable = false,	/* shadow_reg_enable */
+	.bt_session_2 = false,	/* bt_session_2 */
+	.bt_sco_disable = true,	/* bt_sco_disable */
+	.additional_nic_config = false,	/* additional_nic_config */
+	.regulatory_bands = iwn5000_regulatory_bands,	/* regulatory_bands */
+	.enhanced_TX_power = false,	/* enhanced_TX_power */
+	.calib_need =
+	    ( IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ_PERIODIC
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND ),
+	.support_hostap = false,	/* support_hostap */
+	.no_multi_vaps = true,	/* no_multi_vaps */
+	.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,	/* additional_gp_drv_bit */
+	.bt_mode = IWN_BT_NONE,	/* bt_mode */
+	.plcp_err_threshold = IWN_PLCP_ERR_LONG_THRESHOLD,
+};
+
+/*
+ * 4965 support
+ */
+static const struct iwn_base_params iwn4965_base_params = {
+	.pll_cfg_val = 0,				/* pll_cfg_val; */
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x00,	/* max_ll_items - ignored for 4965 */
+	.shadow_ram_support = true,	/* shadow_ram_support */
+	.shadow_reg_enable = false,	/* shadow_reg_enable */
+	.bt_session_2 = false,	/* bt_session_2 XXX unknown? */
+	.bt_sco_disable = true,	/* bt_sco_disable XXX unknown? */
+	.additional_nic_config = false,	/* additional_nic_config - not for 4965 */
+	.regulatory_bands = iwn5000_regulatory_bands,	/* regulatory_bands */
+	.enhanced_TX_power = false,	/* enhanced_TX_power - not for 4965 */
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ_PERIODIC
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND ),
+	.support_hostap = false,	/* support_hostap - XXX should work on fixing! */
+	.no_multi_vaps = true,	/* no_multi_vaps - XXX should work on fixing!  */
+	.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,	/* additional_gp_drv_bit */
+	.bt_mode = IWN_BT_SIMPLE,	/* bt_mode */
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+
+
+static const struct iwn_base_params iwn2000_base_params = {
+	.pll_cfg_val = 0,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_2x00,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = false,
+	.bt_session_2 = false,
+	.bt_sco_disable = true,
+	.additional_nic_config = false,
+	.regulatory_bands = iwn2030_regulatory_bands,
+	.enhanced_TX_power = true,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND
+	    | IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSETv2 ),
+	.support_hostap = true,
+	.no_multi_vaps = false,
+	.additional_gp_drv_bit = IWN_GP_DRIVER_REG_BIT_RADIO_IQ_INVERT,
+	.bt_mode = IWN_BT_NONE,
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+
+static const struct iwn_base_params iwn2030_base_params = {
+	.pll_cfg_val = 0,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_2x00,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = false,     /* XXX check? */
+	.bt_session_2 = true,
+	.bt_sco_disable = true,
+	.additional_nic_config = false,
+	.regulatory_bands = iwn2030_regulatory_bands,
+	.enhanced_TX_power = true,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND
+	    | IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSETv2 ),
+	.support_hostap = true,
+	.no_multi_vaps = false,
+	.additional_gp_drv_bit = IWN_GP_DRIVER_REG_BIT_RADIO_IQ_INVERT,
+	.bt_mode = IWN_BT_ADVANCED,
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+
+static const struct iwn_base_params iwn1000_base_params = {
+	.pll_cfg_val = IWN_ANA_PLL_INIT,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_1000,
+	.shadow_ram_support = false,
+	.shadow_reg_enable = false,	/* XXX check? */
+	.bt_session_2 = false,
+	.bt_sco_disable = false,
+	.additional_nic_config = false,
+	.regulatory_bands = iwn5000_regulatory_bands,
+	.enhanced_TX_power = false,
+	.calib_need =
+	    ( IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND ),
+	.support_hostap = false,
+	.no_multi_vaps = true,
+	.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,
+	.bt_mode = IWN_BT_NONE,
+	.plcp_err_threshold = IWN_PLCP_ERR_EXT_LONG_THRESHOLD,
+};
+static const struct iwn_base_params iwn_6000_base_params = {
+	.pll_cfg_val = 0,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = true,
+	.bt_session_2 = false,
+	.bt_sco_disable = false,
+	.additional_nic_config = false,
+	.regulatory_bands = iwn6000_regulatory_bands,
+	.enhanced_TX_power = true,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND ),
+	.support_hostap = false,
+	.no_multi_vaps = true,
+	.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,
+	.bt_mode = IWN_BT_SIMPLE,
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+static const struct iwn_base_params iwn_6000i_base_params = {
+	.pll_cfg_val = 0,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = true,
+	.bt_session_2 = false,
+	.bt_sco_disable = true,
+	.additional_nic_config = false,
+	.regulatory_bands = iwn6000_regulatory_bands,
+	.enhanced_TX_power = true,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND ),
+	.support_hostap = false,
+	.no_multi_vaps = true,
+	.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,
+	.bt_mode = IWN_BT_SIMPLE,
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+static const struct iwn_base_params iwn_6000g2_base_params = {
+	.pll_cfg_val = 0,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = true,
+	.bt_session_2 = false,
+	.bt_sco_disable = true,
+	.additional_nic_config = false,
+	.regulatory_bands = iwn6000_regulatory_bands,
+	.enhanced_TX_power = true,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND
+	    | IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSET ),
+	.support_hostap = false,
+	.no_multi_vaps = true,
+	.additional_gp_drv_bit = 0,
+	.bt_mode = IWN_BT_SIMPLE,
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+
+static const struct iwn_base_params iwn_6050_base_params = {
+	.pll_cfg_val = 0,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x50,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = true,
+	.bt_session_2 = false,
+	.bt_sco_disable = true,
+	.additional_nic_config = true,
+	.regulatory_bands = iwn6000_regulatory_bands,
+	.enhanced_TX_power = true,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND
+	    | IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSET ),
+	.support_hostap = false,
+	.no_multi_vaps = true,
+	.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,
+	.bt_mode = IWN_BT_SIMPLE,
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+static const struct iwn_base_params iwn_6150_base_params = {
+	.pll_cfg_val = 0,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x50,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = true,
+	.bt_session_2 = false,
+	.bt_sco_disable = true,
+	.additional_nic_config = true,
+	.regulatory_bands = iwn6000_regulatory_bands,
+	.enhanced_TX_power = true,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND),
+	.support_hostap = false,
+	.no_multi_vaps = true,
+	.additional_gp_drv_bit = IWN_GP_DRIVER_6050_1X2,
+	.bt_mode = IWN_BT_SIMPLE,
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+
+/* IWL_DEVICE_6035 & IWL_DEVICE_6030 */
+static const struct iwn_base_params iwn_6000g2b_base_params = {
+	.pll_cfg_val = 0,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = true,
+	.bt_session_2 = false,
+	.bt_sco_disable = true,
+	.additional_nic_config = false,
+	.regulatory_bands = iwn6000_regulatory_bands,
+	.enhanced_TX_power = true,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND
+	    | IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSET ),
+	.support_hostap = false,
+	.no_multi_vaps = true,
+	.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,
+	.bt_mode = IWN_BT_ADVANCED,
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+
+/*
+ * 6235 series NICs.
+ */
+static const struct iwn_base_params iwn_6235_base_params = {
+	.pll_cfg_val = 0,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = true,
+	.bt_session_2 = false,
+	.bt_sco_disable = true,
+	.additional_nic_config = true,
+	.regulatory_bands = iwn6000_regulatory_bands,
+	.enhanced_TX_power = true,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND
+	    | IWN_FLG_NEED_PHY_CALIB_TEMP_OFFSET ),
+	.support_hostap = false,
+	.no_multi_vaps = true,
+	/* XXX 1x2? This NIC is 2x2, right? */
+	.additional_gp_drv_bit = IWN_GP_DRIVER_6050_1X2,
+	.bt_mode = IWN_BT_ADVANCED,
+	.plcp_err_threshold = IWN_PLCP_ERR_DEFAULT_THRESHOLD,
+};
+
+static const struct iwn_base_params iwn_5x50_base_params = {
+	.pll_cfg_val = IWN_ANA_PLL_INIT,
+	.max_ll_items = IWN_OTP_MAX_LL_ITEMS_6x00,
+	.shadow_ram_support = true,
+	.shadow_reg_enable = false,
+	.bt_session_2 = false,
+	.bt_sco_disable = true,
+	.additional_nic_config = false,
+	.regulatory_bands = iwn5000_regulatory_bands,
+	.enhanced_TX_power =false,
+	.calib_need =
+	    (IWN_FLG_NEED_PHY_CALIB_DC
+	    | IWN_FLG_NEED_PHY_CALIB_LO
+	    | IWN_FLG_NEED_PHY_CALIB_TX_IQ
+	    | IWN_FLG_NEED_PHY_CALIB_BASE_BAND ),
+	.support_hostap = false,
+	.no_multi_vaps = true,
+	.additional_gp_drv_bit = IWN_GP_DRIVER_NONE,
+	.bt_mode = IWN_BT_SIMPLE,
+	.plcp_err_threshold = IWN_PLCP_ERR_LONG_THRESHOLD,
+};
+
+#endif	/* __IF_IWN_CHIP_CFG_H__ */
diff --git a/sys/dev/iwn/if_iwn_debug.h b/sys/dev/iwn/if_iwn_debug.h
new file mode 100644
index 00000000000..253c76df45f
--- /dev/null
+++ b/sys/dev/iwn/if_iwn_debug.h
@@ -0,0 +1,122 @@
+/*-
+ * Copyright (c) 2013 Cedric GROSS <c.gross@kreiz-it.fr>
+ * Copyright (c) 2011 Intel Corporation
+ * Copyright (c) 2007-2009
+ *      Damien Bergamini <damien.bergamini@free.fr>
+ * Copyright (c) 2008
+ *      Benjamin Close <benjsc@FreeBSD.org>
+ * Copyright (c) 2008 Sam Leffler, Errno Consulting
+ *
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	__IF_IWN_DEBUG_H__
+#define	__IF_IWN_DEBUG_H__
+
+#ifdef	IWN_DEBUG
+enum {
+	IWN_DEBUG_XMIT		= 0x00000001,	/* basic xmit operation */
+	IWN_DEBUG_RECV		= 0x00000002,	/* basic recv operation */
+	IWN_DEBUG_STATE		= 0x00000004,	/* 802.11 state transitions */
+	IWN_DEBUG_TXPOW		= 0x00000008,	/* tx power processing */
+	IWN_DEBUG_RESET		= 0x00000010,	/* reset processing */
+	IWN_DEBUG_OPS		= 0x00000020,	/* iwn_ops processing */
+	IWN_DEBUG_BEACON 	= 0x00000040,	/* beacon handling */
+	IWN_DEBUG_WATCHDOG 	= 0x00000080,	/* watchdog timeout */
+	IWN_DEBUG_INTR		= 0x00000100,	/* ISR */
+	IWN_DEBUG_CALIBRATE	= 0x00000200,	/* periodic calibration */
+	IWN_DEBUG_NODE		= 0x00000400,	/* node management */
+	IWN_DEBUG_LED		= 0x00000800,	/* led management */
+	IWN_DEBUG_CMD		= 0x00001000,	/* cmd submission */
+	IWN_DEBUG_TXRATE	= 0x00002000,	/* TX rate debugging */
+	IWN_DEBUG_PWRSAVE	= 0x00004000,	/* Power save operations */
+	IWN_DEBUG_SCAN		= 0x00008000,	/* Scan related operations */
+	IWN_DEBUG_REGISTER	= 0x20000000,	/* print chipset register */
+	IWN_DEBUG_TRACE		= 0x40000000,	/* Print begin and start driver function */
+	IWN_DEBUG_FATAL		= 0x80000000,	/* fatal errors */
+	IWN_DEBUG_ANY		= 0xffffffff
+};
+
+#define DPRINTF(sc, m, fmt, ...) do {			\
+	if (sc->sc_debug & (m))				\
+		printf(fmt, __VA_ARGS__);		\
+} while (0)
+
+static const char *
+iwn_intr_str(uint8_t cmd)
+{
+	switch (cmd) {
+	/* Notifications */
+	case IWN_UC_READY:		return "UC_READY";
+	case IWN_ADD_NODE_DONE:		return "ADD_NODE_DONE";
+	case IWN_TX_DONE:		return "TX_DONE";
+	case IWN_START_SCAN:		return "START_SCAN";
+	case IWN_STOP_SCAN:		return "STOP_SCAN";
+	case IWN_RX_STATISTICS:		return "RX_STATS";
+	case IWN_BEACON_STATISTICS:	return "BEACON_STATS";
+	case IWN_STATE_CHANGED:		return "STATE_CHANGED";
+	case IWN_BEACON_MISSED:		return "BEACON_MISSED";
+	case IWN_RX_PHY:		return "RX_PHY";
+	case IWN_MPDU_RX_DONE:		return "MPDU_RX_DONE";
+	case IWN_RX_DONE:		return "RX_DONE";
+
+	/* Command Notifications */
+	case IWN_CMD_RXON:		return "IWN_CMD_RXON";
+	case IWN_CMD_RXON_ASSOC:	return "IWN_CMD_RXON_ASSOC";
+	case IWN_CMD_EDCA_PARAMS:	return "IWN_CMD_EDCA_PARAMS";
+	case IWN_CMD_TIMING:		return "IWN_CMD_TIMING";
+	case IWN_CMD_LINK_QUALITY:	return "IWN_CMD_LINK_QUALITY";
+	case IWN_CMD_SET_LED:		return "IWN_CMD_SET_LED";
+	case IWN5000_CMD_WIMAX_COEX:	return "IWN5000_CMD_WIMAX_COEX";
+	case IWN5000_CMD_CALIB_CONFIG:	return "IWN5000_CMD_CALIB_CONFIG";
+	case IWN5000_CMD_CALIB_RESULT:	return "IWN5000_CMD_CALIB_RESULT";
+	case IWN5000_CMD_CALIB_COMPLETE: return "IWN5000_CMD_CALIB_COMPLETE";
+	case IWN_CMD_SET_POWER_MODE:	return "IWN_CMD_SET_POWER_MODE";
+	case IWN_CMD_SCAN:		return "IWN_CMD_SCAN";
+	case IWN_CMD_SCAN_RESULTS:	return "IWN_CMD_SCAN_RESULTS";
+	case IWN_CMD_TXPOWER:		return "IWN_CMD_TXPOWER";
+	case IWN_CMD_TXPOWER_DBM:	return "IWN_CMD_TXPOWER_DBM";
+	case IWN5000_CMD_TX_ANT_CONFIG:	return "IWN5000_CMD_TX_ANT_CONFIG";
+	case IWN_CMD_BT_COEX:		return "IWN_CMD_BT_COEX";
+	case IWN_CMD_SET_CRITICAL_TEMP:	return "IWN_CMD_SET_CRITICAL_TEMP";
+	case IWN_CMD_SET_SENSITIVITY:	return "IWN_CMD_SET_SENSITIVITY";
+	case IWN_CMD_PHY_CALIB:		return "IWN_CMD_PHY_CALIB";
+
+	/* Bluetooth commands */
+	case IWN_CMD_BT_COEX_PRIOTABLE:	return "IWN_CMD_BT_COEX_PRIOTABLE";
+	case IWN_CMD_BT_COEX_PROT:	return "IWN_CMD_BT_COEX_PROT";
+	case IWN_CMD_BT_COEX_NOTIF:	return "IWN_CMD_BT_COEX_NOTIF";
+
+	/* PAN commands */
+	case IWN_CMD_WIPAN_PARAMS:	return "IWN_CMD_WIPAN_PARAMS";
+	case IWN_CMD_WIPAN_RXON:	return "IWN_CMD_WIPAN_RXON";
+	case IWN_CMD_WIPAN_RXON_TIMING:	return "IWN_CMD_WIPAN_RXON_TIMING";
+	case IWN_CMD_WIPAN_RXON_ASSOC:	return "IWN_CMD_WIPAN_RXON_ASSOC";
+	case IWN_CMD_WIPAN_QOS_PARAM:	return "IWN_CMD_WIPAN_QOS_PARAM";
+	case IWN_CMD_WIPAN_WEPKEY:	return "IWN_CMD_WIPAN_WEPKEY";
+	case IWN_CMD_WIPAN_P2P_CHANNEL_SWITCH:
+		return "IWN_CMD_WIPAN_P2P_CHANNEL_SWITCH";
+	case IWN_CMD_WIPAN_NOA_NOTIFICATION:
+		return "IWN_CMD_WIPAN_NOA_NOTIFICATION";
+	case IWN_CMD_WIPAN_DEACTIVATION_COMPLETE:
+		return "IWN_CMD_WIPAN_DEACTIVATION_COMPLETE";
+	}
+	return "UNKNOWN INTR NOTIF/CMD";
+}
+#else
+#define DPRINTF(sc, m, fmt, ...) do { (void) sc; } while (0)
+#endif
+
+#endif	/* __IF_IWN_DEBUG_H__ */
diff --git a/sys/dev/iwn/if_iwn_devid.h b/sys/dev/iwn/if_iwn_devid.h
index 23fd0a10067..16b70e6b7f1 100644
--- a/sys/dev/iwn/if_iwn_devid.h
+++ b/sys/dev/iwn/if_iwn_devid.h
@@ -41,6 +41,20 @@
  * DEVICE ID BLOCK
  * ==========================================================================
 */
+
+/*
+ * --------------------------------------------------------------------------
+ * Device ID for 2x00 series
+ * --------------------------------------------------------------------------
+ */
+#define	IWN_DID_2x00_1		0x0890
+#define	IWN_DID_2x00_2		0x0891
+/* SubDevice ID */
+#define	IWN_SDID_2x00_1		0x4022
+#define	IWN_SDID_2x00_2		0x4222
+#define	IWN_SDID_2x00_3		0x4422
+#define	IWN_SDID_2x00_4		0x4822
+
 /*
  * --------------------------------------------------------------------------
  * Device ID for 2x30 series
diff --git a/sys/dev/iwn/if_iwnreg.h b/sys/dev/iwn/if_iwnreg.h
index 911407b3a41..5b611b0b3d9 100644
--- a/sys/dev/iwn/if_iwnreg.h
+++ b/sys/dev/iwn/if_iwnreg.h
@@ -17,6 +17,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifndef	__IF_IWNREG_H__
+#define	__IF_IWNREG_H__
 
 #define	IWN_CT_KILL_THRESHOLD		114	/* in Celsius */
 #define	IWN_CT_KILL_EXIT_THRESHOLD	95	/* in Celsius */
@@ -198,7 +200,7 @@
 #define IWN_RESET_SW			(1 << 7)
 #define IWN_RESET_MASTER_DISABLED	(1 << 8)
 #define IWN_RESET_STOP_MASTER		(1 << 9)
-#define IWN_RESET_LINK_PWR_MGMT_DIS	(1 << 31)
+#define IWN_RESET_LINK_PWR_MGMT_DIS	(1U << 31)
 
 /* Possible flags for register IWN_GP_CNTRL. */
 #define IWN_GP_CNTRL_MAC_ACCESS_ENA	(1 << 0)
@@ -222,6 +224,7 @@
 #define IWN_GP_DRIVER_CALIB_VER6	(1 << 2)
 #define IWN_GP_DRIVER_6050_1X2		(1 << 3)
 #define	IWN_GP_DRIVER_REG_BIT_RADIO_IQ_INVERT	(1 << 7)
+#define	IWN_GP_DRIVER_NONE		0
 
 /* Possible flags for register IWN_UCODE_GP1_CLR. */
 #define IWN_UCODE_GP1_RFKILL		(1 << 1)
@@ -262,7 +265,7 @@ static const struct {
 
 /* Possible flags for register IWN_DRAM_INT_TBL. */
 #define IWN_DRAM_INT_TBL_WRAP_CHECK	(1 << 27)
-#define IWN_DRAM_INT_TBL_ENABLE		(1 << 31)
+#define IWN_DRAM_INT_TBL_ENABLE		(1U << 31)
 
 /* Possible values for register IWN_ANA_PLL. */
 #define IWN_ANA_PLL_INIT	0x00880300
@@ -272,7 +275,7 @@ static const struct {
 
 /* Possible flags for register IWN_BSM_WR_CTRL. */
 #define IWN_BSM_WR_CTRL_START_EN	(1 << 30)
-#define IWN_BSM_WR_CTRL_START		(1 << 31)
+#define IWN_BSM_WR_CTRL_START		(1U << 31)
 
 /* Possible flags for register IWN_INT. */
 #define IWN_INT_ALIVE		(1 <<  0)
@@ -285,7 +288,7 @@ static const struct {
 #define IWN_INT_FH_TX		(1 << 27)
 #define IWN_INT_RX_PERIODIC	(1 << 28)
 #define IWN_INT_HW_ERR		(1 << 29)
-#define IWN_INT_FH_RX		(1 << 31)
+#define IWN_INT_FH_RX		(1U << 31)
 
 /* Shortcut. */
 #define IWN_INT_MASK_DEF						\
@@ -305,7 +308,7 @@ static const struct {
 
 /* Possible flags/values for register IWN_FH_TX_CONFIG. */
 #define IWN_FH_TX_CONFIG_DMA_PAUSE		0
-#define IWN_FH_TX_CONFIG_DMA_ENA		(1 << 31)
+#define IWN_FH_TX_CONFIG_DMA_ENA		(1U << 31)
 #define IWN_FH_TX_CONFIG_CIRQ_HOST_ENDTFD	(1 << 20)
 
 /* Possible flags/values for register IWN_FH_TXBUF_STATUS. */
@@ -320,7 +323,7 @@ static const struct {
 #define IWN_FH_TX_STATUS_IDLE(chnl)	(1 << ((chnl) + 16))
 
 /* Possible flags for register IWN_FH_RX_CONFIG. */
-#define IWN_FH_RX_CONFIG_ENA		(1 << 31)
+#define IWN_FH_RX_CONFIG_ENA		(1U << 31)
 #define IWN_FH_RX_CONFIG_NRBD(x)	((x) << 20)
 #define IWN_FH_RX_CONFIG_RB_SIZE_8K	(1 << 16)
 #define IWN_FH_RX_CONFIG_SINGLE_FRAME	(1 << 15)
@@ -329,7 +332,7 @@ static const struct {
 #define IWN_FH_RX_CONFIG_IGN_RXF_EMPTY	(1 <<  2)
 
 /* Possible flags for register IWN_FH_TX_CONFIG. */
-#define IWN_FH_TX_CONFIG_DMA_ENA	(1 << 31)
+#define IWN_FH_TX_CONFIG_DMA_ENA	(1U << 31)
 #define IWN_FH_TX_CONFIG_DMA_CREDIT_ENA	(1 <<  3)
 
 /* Possible flags for register IWN_EEPROM. */
@@ -377,7 +380,7 @@ static const struct {
 #define IWN_APMG_PCI_STT_L1A_DIS	(1 << 11)
 
 /* Possible flags for register IWN_BSM_DRAM_TEXT_SIZE. */
-#define IWN_FW_UPDATED	(1 << 31)
+#define IWN_FW_UPDATED	(1U << 31)
 
 #define IWN_SCHED_WINSZ		64
 #define IWN_SCHED_LIMIT		64
@@ -882,7 +885,7 @@ struct iwn_scan_essid {
 
 struct iwn_scan_hdr {
 	uint16_t	len;
-	uint8_t		reserved1;
+	uint8_t		scan_flags;
 	uint8_t		nchan;
 	uint16_t	quiet_time;
 	uint16_t	quiet_threshold;
@@ -919,17 +922,53 @@ struct iwn_scan_chan {
 /* Maximum size of a scan command. */
 #define IWN_SCAN_MAXSZ	(MCLBYTES - 4)
 
-#define	IWN_ACTIVE_DWELL_TIME_24	(30)	/* all times in msec */
-#define	IWN_ACTIVE_DWELL_TIME_52	(20)
-#define	IWN_ACTIVE_DWELL_FACTOR_24	(3)
-#define	IWN_ACTIVE_DWELL_FACTOR_52	(2)
+/*
+ * For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after
+ * sending probe req.  This should be set long enough to hear probe responses
+ * from more than one AP.
+ */
+#define	IWN_ACTIVE_DWELL_TIME_2GHZ	(30)	/* all times in msec */
+#define	IWN_ACTIVE_DWELL_TIME_5GHZ	(20)
+#define	IWN_ACTIVE_DWELL_FACTOR_2GHZ	(3)
+#define	IWN_ACTIVE_DWELL_FACTOR_5GHZ	(2)
 
-#define	IWN_PASSIVE_DWELL_TIME_24	(20)	/* all times in msec */
-#define	IWN_PASSIVE_DWELL_TIME_52	(10)
+/*
+ * For passive scan, listen PASSIVE_DWELL_TIME (msec) on each channel.
+ * Must be set longer than active dwell time.
+ * For the most reliable scan, set > AP beacon interval (typically 100msec).
+ */
+#define	IWN_PASSIVE_DWELL_TIME_2GHZ	(20)	/* all times in msec */
+#define	IWN_PASSIVE_DWELL_TIME_5GHZ	(10)
 #define	IWN_PASSIVE_DWELL_BASE		(100)
 #define	IWN_CHANNEL_TUNE_TIME		(5)
 
 #define	IWN_SCAN_CHAN_TIMEOUT		2
+#define	IWN_MAX_SCAN_CHANNEL		50
+
+/*
+ * If active scanning is requested but a certain channel is
+ * marked passive, we can do active scanning if we detect
+ * transmissions.
+ *
+ * There is an issue with some firmware versions that triggers
+ * a sysassert on a "good CRC threshold" of zero (== disabled),
+ * on a radar channel even though this means that we should NOT
+ * send probes.
+ *
+ * The "good CRC threshold" is the number of frames that we
+ * need to receive during our dwell time on a channel before
+ * sending out probes -- setting this to a huge value will
+ * mean we never reach it, but at the same time work around
+ * the aforementioned issue. Thus use IWL_GOOD_CRC_TH_NEVER
+ * here instead of IWL_GOOD_CRC_TH_DISABLED.
+ *
+ * This was fixed in later versions along with some other
+ * scan changes, and the threshold behaves as a flag in those
+ * versions.
+ */
+#define	IWN_GOOD_CRC_TH_DISABLED	0
+#define	IWN_GOOD_CRC_TH_DEFAULT		htole16(1)
+#define	IWN_GOOD_CRC_TH_NEVER		htole16(0xffff)
 
 /* Structure for command IWN_CMD_TXPOWER (4965AGN only.) */
 #define IWN_RIDX_MAX	32
@@ -1102,6 +1141,12 @@ struct iwn_enhanced_sensitivity_cmd {
 	uint16_t	reserved;
 } __packed;
 
+/*
+ * Define maximal number of calib result send to runtime firmware
+ * PS: TEMP_OFFSET count for 2 (std and v2)
+ */
+#define	IWN5000_PHY_CALIB_MAX_RESULT		8
+
 /* Structures for command IWN_CMD_PHY_CALIB. */
 struct iwn_phy_calib {
 	uint8_t	code;
@@ -1232,6 +1277,7 @@ struct iwn_ucode_info {
 #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 (???) */
 
 struct iwn4965_tx_stat {
 	uint8_t		nframes;
@@ -1589,6 +1635,60 @@ struct iwn_fw_tlv {
 #define IWN4965_FWSZ		(IWN4965_FW_TEXT_MAXSZ + IWN4965_FW_DATA_MAXSZ)
 #define IWN5000_FWSZ		IWN5000_FW_TEXT_MAXSZ
 
+/*
+ * Microcode flags TLV (18.)
+ */
+
+/**
+ * enum iwn_ucode_tlv_flag - ucode API flags
+ * @IWN_UCODE_TLV_FLAGS_PAN: This is PAN capable microcode; this previously
+ *      was a separate TLV but moved here to save space.
+ * @IWN_UCODE_TLV_FLAGS_NEWSCAN: new uCode scan behaviour on hidden SSID,
+ *      treats good CRC threshold as a boolean
+ * @IWN_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).
+ * @IWN_UCODE_TLV_FLAGS_P2P: This uCode image supports P2P.
+ * @IWN_UCODE_TLV_FLAGS_DW_BC_TABLE: The SCD byte count table is in DWORDS
+ * @IWN_UCODE_TLV_FLAGS_UAPSD: This uCode image supports uAPSD
+ * @IWN_UCODE_TLV_FLAGS_SHORT_BL: 16 entries of black list instead of 64 in scan
+ *      offload profile config command.
+ * @IWN_UCODE_TLV_FLAGS_RX_ENERGY_API: supports rx signal strength api
+ * @IWN_UCODE_TLV_FLAGS_TIME_EVENT_API_V2: using the new time event API.
+ * @IWN_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS: D3 image supports up to six
+ *      (rather than two) IPv6 addresses
+ * @IWN_UCODE_TLV_FLAGS_BF_UPDATED: new beacon filtering API
+ * @IWN_UCODE_TLV_FLAGS_NO_BASIC_SSID: not sending a probe with the SSID element
+ *      from the probe request template.
+ * @IWN_UCODE_TLV_FLAGS_D3_CONTINUITY_API: modified D3 API to allow keeping
+ *      connection when going back to D0
+ * @IWN_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL: new NS offload (small version)
+ * @IWN_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE: new NS offload (large version)
+ * @IWN_UCODE_TLV_FLAGS_SCHED_SCAN: this uCode image supports scheduled scan.
+ * @IWN_UCODE_TLV_FLAGS_STA_KEY_CMD: new ADD_STA and ADD_STA_KEY command API
+ * @IWN_UCODE_TLV_FLAGS_DEVICE_PS_CMD: support device wide power command
+ *      containing CAM (Continuous Active Mode) indication.
+ */
+enum iwn_ucode_tlv_flag {
+	IWN_UCODE_TLV_FLAGS_PAN			= (1 << 0),
+	IWN_UCODE_TLV_FLAGS_NEWSCAN		= (1 << 1),
+	IWN_UCODE_TLV_FLAGS_MFP			= (1 << 2),
+	IWN_UCODE_TLV_FLAGS_P2P			= (1 << 3),
+	IWN_UCODE_TLV_FLAGS_DW_BC_TABLE		= (1 << 4),
+	IWN_UCODE_TLV_FLAGS_NEWBT_COEX		= (1 << 5),
+	IWN_UCODE_TLV_FLAGS_UAPSD		= (1 << 6),
+	IWN_UCODE_TLV_FLAGS_SHORT_BL		= (1 << 7),
+	IWN_UCODE_TLV_FLAGS_RX_ENERGY_API	= (1 << 8),
+	IWN_UCODE_TLV_FLAGS_TIME_EVENT_API_V2	= (1 << 9),
+	IWN_UCODE_TLV_FLAGS_D3_6_IPV6_ADDRS	= (1 << 10),
+	IWN_UCODE_TLV_FLAGS_BF_UPDATED		= (1 << 11),
+	IWN_UCODE_TLV_FLAGS_NO_BASIC_SSID	= (1 << 12),
+	IWN_UCODE_TLV_FLAGS_D3_CONTINUITY_API	= (1 << 14),
+	IWN_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL	= (1 << 15),
+	IWN_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE	= (1 << 16),
+	IWN_UCODE_TLV_FLAGS_SCHED_SCAN		= (1 << 17),
+	IWN_UCODE_TLV_FLAGS_STA_KEY_CMD		= (1 << 19),
+	IWN_UCODE_TLV_FLAGS_DEVICE_PS_CMD	= (1 << 20),
+};
+
 /*
  * Offsets into EEPROM.
  */
@@ -1731,6 +1831,16 @@ static const uint32_t iwn1000_regulatory_bands[IWN_NBANDS] = {
 	IWN5000_EEPROM_NO_HT40,
 };
 
+static const uint32_t iwn2030_regulatory_bands[IWN_NBANDS] = {
+	IWN5000_EEPROM_BAND1,
+	IWN5000_EEPROM_BAND2,
+	IWN5000_EEPROM_BAND3,
+	IWN5000_EEPROM_BAND4,
+	IWN5000_EEPROM_BAND5,
+	IWN6000_EEPROM_BAND6,
+	IWN5000_EEPROM_BAND7
+};
+
 #define IWN_CHAN_BANDS_COUNT	 7
 #define IWN_MAX_CHAN_PER_BAND	14
 static const struct iwn_chan_band {
@@ -1757,8 +1867,8 @@ static const uint8_t iwn_bss_ac_to_queue[] = {
 static const uint8_t iwn_pan_ac_to_queue[] = {
 	5, 4, 6, 7,
 };
-#define IWN1000_OTP_NBLOCKS	3 
-#define IWN6000_OTP_NBLOCKS	4 
+#define IWN1000_OTP_NBLOCKS	3
+#define IWN6000_OTP_NBLOCKS	4
 #define IWN6050_OTP_NBLOCKS	7
 
 /* HW rate indices. */
@@ -1891,6 +2001,7 @@ struct iwn_sensitivity_limits {
 	uint32_t	min_energy_cck;
 	uint32_t	energy_cck;
 	uint32_t	energy_ofdm;
+	uint32_t	barker_mrc;
 };
 
 /*
@@ -1905,7 +2016,8 @@ static const struct iwn_sensitivity_limits iwn4965_sensitivity_limits = {
 	200, 400,
 	 97,
 	100,
-	100
+	100,
+	390
 };
 
 static const struct iwn_sensitivity_limits iwn5000_sensitivity_limits = {
@@ -1917,7 +2029,8 @@ static const struct iwn_sensitivity_limits iwn5000_sensitivity_limits = {
 	170, 400,
 	 95,
 	 95,
-	 95
+	 95,
+	 390
 };
 
 static const struct iwn_sensitivity_limits iwn5150_sensitivity_limits = {
@@ -1929,7 +2042,8 @@ static const struct iwn_sensitivity_limits iwn5150_sensitivity_limits = {
 	170, 400,
 	 95,
 	 95,
-	 95
+	 95,
+	 390,
 };
 
 static const struct iwn_sensitivity_limits iwn1000_sensitivity_limits = {
@@ -1941,7 +2055,8 @@ static const struct iwn_sensitivity_limits iwn1000_sensitivity_limits = {
 	170, 400,
 	 95,
 	 95,
-	 95
+	 95,
+	 390,
 };
 
 static const struct iwn_sensitivity_limits iwn6000_sensitivity_limits = {
@@ -1953,9 +2068,24 @@ static const struct iwn_sensitivity_limits iwn6000_sensitivity_limits = {
 	160, 310,
 	 97,
 	 97,
-	100
+	100,
+	390
 };
 
+static const struct iwn_sensitivity_limits iwn6235_sensitivity_limits = {
+	105, 110,
+	192, 232,
+	 80, 145,
+	128, 232,
+	125, 175,
+	160, 310,
+	100,
+	110,
+	110,
+	336
+};
+
+
 /* Get value from linux kernel 3.2.+ in Drivers/net/wireless/iwlwifi/iwl-2000.c*/
 static const struct iwn_sensitivity_limits iwn2030_sensitivity_limits = {
 	105,110,
@@ -2052,3 +2182,5 @@ static const char * const iwn_fw_errmsg[] = {
 #define IWN_BARRIER_READ_WRITE(sc)					\
 	bus_space_barrier((sc)->sc_st, (sc)->sc_sh, 0, (sc)->sc_sz,	\
 	    BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE)
+
+#endif	/* __IF_IWNREG_H__ */
diff --git a/sys/dev/iwn/if_iwnvar.h b/sys/dev/iwn/if_iwnvar.h
index d1c0b76ab92..9fccd0f893c 100644
--- a/sys/dev/iwn/if_iwnvar.h
+++ b/sys/dev/iwn/if_iwnvar.h
@@ -163,6 +163,7 @@ struct iwn_calib_state {
 	uint32_t	bad_plcp_cck;
 	uint32_t	fa_cck;
 	uint32_t	low_fa;
+	uint32_t	bad_plcp_ht;
 	uint8_t		cck_state;
 #define IWN_CCK_STATE_INIT	0
 #define IWN_CCK_STATE_LOFA	1
@@ -249,6 +250,7 @@ struct iwn_softc {
 #define IWN_FLAG_ENH_SENS	(1 << 7)
 #define IWN_FLAG_ADV_BTCOEX	(1 << 8)
 #define IWN_FLAG_PAN_SUPPORT	(1 << 9)
+#define IWN_FLAG_BTCOEX		(1 << 10)
 
 	uint8_t 		hw_type;
 	/* subdevice_id used to adjust configuration */
@@ -309,13 +311,15 @@ struct iwn_softc {
 	struct task		sc_radioon_task;
 	struct task		sc_radiooff_task;
 
+	/* Calibration information */
 	struct callout		calib_to;
 	int			calib_cnt;
 	struct iwn_calib_state	calib;
+	int			last_calib_ticks;
 	struct callout		watchdog_to;
 	struct callout		ct_kill_exit_to;
 	struct iwn_fw_info	fw;
-	struct iwn_calib_info	calibcmd[5];
+	struct iwn_calib_info	calibcmd[IWN5000_PHY_CALIB_MAX_RESULT];
 	uint32_t		errptr;
 
 	struct iwn_rx_stat	last_rx_stat;
@@ -360,6 +364,9 @@ struct iwn_softc {
 	int			sc_tx_timer;
 	int			sc_scan_timer;
 
+	/* Are we doing a scan? */
+	int			sc_is_scanning;
+
 	struct ieee80211_tx_ampdu *qid2tap[IWN5000_NTXQUEUES];
 
 	int			(*sc_ampdu_rx_start)(struct ieee80211_node *,
@@ -387,8 +394,8 @@ struct iwn_softc {
 	 */
 	int			current_pwrsave_level;
 
-	/* For specifique params */
-	struct iwn_base_params *base_params;
+	/* For specific params */
+	const struct iwn_base_params *base_params;
 };
 
 #define IWN_LOCK_INIT(_sc) \
diff --git a/sys/dev/ixgb/if_ixgb.h b/sys/dev/ixgb/if_ixgb.h
index 4e88db79a86..e42dc1deca7 100644
--- a/sys/dev/ixgb/if_ixgb.h
+++ b/sys/dev/ixgb/if_ixgb.h
@@ -47,6 +47,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <sys/sockio.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ixgbe/ixgbe.c b/sys/dev/ixgbe/ixgbe.c
index 3434125fc48..1245fc87c97 100644
--- a/sys/dev/ixgbe/ixgbe.c
+++ b/sys/dev/ixgbe/ixgbe.c
@@ -1253,9 +1253,6 @@ ixgbe_init_locked(struct adapter *adapter)
 		IXGBE_WRITE_REG(hw, IXGBE_RDT(i), adapter->num_rx_desc - 1);
 	}
 
-	/* Set up VLAN support and filter */
-	ixgbe_setup_vlan_hw_support(adapter);
-
 	/* Enable Receive engine */
 	rxctrl = IXGBE_READ_REG(hw, IXGBE_RXCTRL);
 	if (hw->mac.type == ixgbe_mac_82598EB)
@@ -1339,6 +1336,9 @@ ixgbe_init_locked(struct adapter *adapter)
 	/* Initialize the FC settings */
 	ixgbe_start_hw(hw);
 
+	/* Set up VLAN support and filter */
+	ixgbe_setup_vlan_hw_support(adapter);
+
 	/* And now turn on interrupts */
 	ixgbe_enable_intr(adapter);
 
@@ -2662,7 +2662,8 @@ ixgbe_setup_interface(device_t dev, struct adapter *adapter)
 	ifp->if_capabilities |= IFCAP_LRO;
 	ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING
 			     |  IFCAP_VLAN_HWTSO
-			     |  IFCAP_VLAN_MTU;
+			     |  IFCAP_VLAN_MTU
+			     |  IFCAP_HWSTATS;
 	ifp->if_capenable = ifp->if_capabilities;
 
 	/*
@@ -3620,16 +3621,11 @@ ixgbe_txeof(struct tx_ring *txr)
 		 *   means the user thread should not be woken up);
 		 * - the driver ignores tx interrupts unless netmap_mitigate=0
 		 *   or the slot has the DD bit set.
-		 *
-		 * When the driver has separate locks, we need to
-		 * release and re-acquire txlock to avoid deadlocks.
-		 * XXX see if we can find a better way.
 		 */
 		if (!netmap_mitigate ||
 		    (kring->nr_kflags < kring->nkr_num_slots &&
 		    txd[kring->nr_kflags].wb.status & IXGBE_TXD_STAT_DD)) {
-			netmap_tx_irq(ifp, txr->me |
-			    (NETMAP_LOCKED_ENTER|NETMAP_LOCKED_EXIT));
+			netmap_tx_irq(ifp, txr->me);
 		}
 		return;
 	}
@@ -4421,8 +4417,10 @@ ixgbe_rxeof(struct ix_queue *que)
 
 #ifdef DEV_NETMAP
 	/* Same as the txeof routine: wakeup clients on intr. */
-	if (netmap_rx_irq(ifp, rxr->me | NETMAP_LOCKED_ENTER, &processed))
+	if (netmap_rx_irq(ifp, rxr->me, &processed)) {
+		IXGBE_RX_UNLOCK(rxr);
 		return (FALSE);
+	}
 #endif /* DEV_NETMAP */
 
 	for (i = rxr->next_to_check; count != 0;) {
@@ -4690,7 +4688,7 @@ ixgbe_register_vlan(void *arg, struct ifnet *ifp, u16 vtag)
 	bit = vtag & 0x1F;
 	adapter->shadow_vfta[index] |= (1 << bit);
 	++adapter->num_vlans;
-	ixgbe_init_locked(adapter);
+	ixgbe_setup_vlan_hw_support(adapter);
 	IXGBE_CORE_UNLOCK(adapter);
 }
 
@@ -4717,7 +4715,7 @@ ixgbe_unregister_vlan(void *arg, struct ifnet *ifp, u16 vtag)
 	adapter->shadow_vfta[index] &= ~(1 << bit);
 	--adapter->num_vlans;
 	/* Re-init to load the changes */
-	ixgbe_init_locked(adapter);
+	ixgbe_setup_vlan_hw_support(adapter);
 	IXGBE_CORE_UNLOCK(adapter);
 }
 
@@ -4739,6 +4737,20 @@ ixgbe_setup_vlan_hw_support(struct adapter *adapter)
 	if (adapter->num_vlans == 0)
 		return;
 
+	/* Setup the queues for vlans */
+	for (int i = 0; i < adapter->num_queues; i++) {
+		rxr = &adapter->rx_rings[i];
+		/* On 82599 the VLAN enable is per/queue in RXDCTL */
+		if (hw->mac.type != ixgbe_mac_82598EB) {
+			ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));
+			ctrl |= IXGBE_RXDCTL_VME;
+			IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), ctrl);
+		}
+		rxr->vtag_strip = TRUE;
+	}
+
+	if ((ifp->if_capenable & IFCAP_VLAN_HWFILTER) == 0)
+		return;
 	/*
 	** A soft reset zero's out the VFTA, so
 	** we need to repopulate it now.
@@ -4757,18 +4769,6 @@ ixgbe_setup_vlan_hw_support(struct adapter *adapter)
 	if (hw->mac.type == ixgbe_mac_82598EB)
 		ctrl |= IXGBE_VLNCTRL_VME;
 	IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, ctrl);
-
-	/* Setup the queues for vlans */
-	for (int i = 0; i < adapter->num_queues; i++) {
-		rxr = &adapter->rx_rings[i];
-		/* On 82599 the VLAN enable is per/queue in RXDCTL */
-		if (hw->mac.type != ixgbe_mac_82598EB) {
-			ctrl = IXGBE_READ_REG(hw, IXGBE_RXDCTL(i));
-			ctrl |= IXGBE_RXDCTL_VME;
-			IXGBE_WRITE_REG(hw, IXGBE_RXDCTL(i), ctrl);
-		}
-		rxr->vtag_strip = TRUE;
-	}
 }
 
 static void
diff --git a/sys/dev/ixgbe/ixgbe.h b/sys/dev/ixgbe/ixgbe.h
index 77b72edbd3f..ab3cc9f86bf 100644
--- a/sys/dev/ixgbe/ixgbe.h
+++ b/sys/dev/ixgbe/ixgbe.h
@@ -49,8 +49,10 @@
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/sockio.h>
+#include <sys/eventhandler.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/bpf.h>
 #include <net/ethernet.h>
diff --git a/sys/dev/ixgbe/ixv.h b/sys/dev/ixgbe/ixv.h
index 096819c38d3..79d84b62f64 100644
--- a/sys/dev/ixgbe/ixv.h
+++ b/sys/dev/ixgbe/ixv.h
@@ -44,10 +44,14 @@
 #include <sys/socket.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/sockio.h>
+#include <sys/eventhandler.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/bpf.h>
 #include <net/ethernet.h>
diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c
index 9bdb229807d..c3f6bf4b91c 100644
--- a/sys/dev/jme/if_jme.c
+++ b/sys/dev/jme/if_jme.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/le/if_le_ledma.c b/sys/dev/le/if_le_ledma.c
index 7b09366ec7e..44cb41fd101 100644
--- a/sys/dev/le/if_le_ledma.c
+++ b/sys/dev/le/if_le_ledma.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <sparc64/sbus/lsi64854reg.h>
diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c
index e2cc30e2371..bb8cbb2cc3e 100644
--- a/sys/dev/le/lance.c
+++ b/sys/dev/le/lance.c
@@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 5fc763d0109..7f03e8baffc 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -79,6 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c
index d42aca1de3a..766fdae392a 100644
--- a/sys/dev/lmc/if_lmc.c
+++ b/sys/dev/lmc/if_lmc.c
@@ -111,6 +111,7 @@
 # include <sys/bus.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>
@@ -168,6 +169,7 @@
 # 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>
diff --git a/sys/dev/lmc/if_lmc.h b/sys/dev/lmc/if_lmc.h
index f3c19479556..e89c739d46f 100644
--- a/sys/dev/lmc/if_lmc.h
+++ b/sys/dev/lmc/if_lmc.h
@@ -936,7 +936,7 @@ struct ioctl
 #define IOCTL_RESET_CNTRS	  54	/* reset event counters            */
 
 /* storage for these strings is allocated here! */
-const char *ssi_cables[] =
+static const char *ssi_cables[] =
   {
   "V.10/EIA423",
   "V.11/EIA530A",
diff --git a/sys/dev/malo/if_malo.c b/sys/dev/malo/if_malo.c
index 9f298de0d7a..5f128897565 100644
--- a/sys/dev/malo/if_malo.c
+++ b/sys/dev/malo/if_malo.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/malo/if_malo_pci.c b/sys/dev/malo/if_malo_pci.c
index de9c39d01a4..71ba3c0543c 100644
--- a/sys/dev/malo/if_malo_pci.c
+++ b/sys/dev/malo/if_malo_pci.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
@@ -49,7 +50,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 
diff --git a/sys/dev/malo/if_malohal.c b/sys/dev/malo/if_malohal.c
index d244b986081..117ccde3af8 100644
--- a/sys/dev/malo/if_malohal.c
+++ b/sys/dev/malo/if_malohal.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/endian.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/firmware.h>
 #include <sys/socket.h>
 
@@ -45,8 +46,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index f0d1aec0d91..817a89db300 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -189,6 +189,7 @@ struct md_s {
 	LIST_ENTRY(md_s) list;
 	struct bio_queue_head bio_queue;
 	struct mtx queue_mtx;
+	struct mtx stat_mtx;
 	struct cdev *dev;
 	enum md_types type;
 	off_t mediasize;
@@ -415,8 +416,11 @@ g_md_start(struct bio *bp)
 	struct md_s *sc;
 
 	sc = bp->bio_to->geom->softc;
-	if ((bp->bio_cmd == BIO_READ) || (bp->bio_cmd == BIO_WRITE))
+	if ((bp->bio_cmd == BIO_READ) || (bp->bio_cmd == BIO_WRITE)) {
+		mtx_lock(&sc->stat_mtx);
 		devstat_start_transaction_bio(sc->devstat, bp);
+		mtx_unlock(&sc->stat_mtx);
+	}
 	mtx_lock(&sc->queue_mtx);
 	bioq_disksort(&sc->bio_queue, bp);
 	mtx_unlock(&sc->queue_mtx);
@@ -742,12 +746,12 @@ mdstart_vnode(struct md_s *sc, struct bio *bp)
 		return (error);
 	}
 
-	KASSERT(bp->bio_length <= MAXPHYS, ("bio_length %jd",
-	    (uintmax_t)bp->bio_length));
 	if ((bp->bio_flags & BIO_UNMAPPED) == 0) {
 		pb = NULL;
 		aiov.iov_base = bp->bio_data;
 	} else {
+		KASSERT(bp->bio_length <= MAXPHYS, ("bio_length %jd",
+		    (uintmax_t)bp->bio_length));
 		pb = getpbuf(&md_vnode_pbuf_freecnt);
 		pmap_qenter((vm_offset_t)pb->b_data, bp->bio_ma, bp->bio_ma_n);
 		aiov.iov_base = (void *)((vm_offset_t)pb->b_data +
@@ -904,6 +908,22 @@ mdstart_swap(struct md_s *sc, struct bio *bp)
 	return (rv != VM_PAGER_ERROR ? 0 : ENOSPC);
 }
 
+static int
+mdstart_null(struct md_s *sc, struct bio *bp)
+{
+
+	switch (bp->bio_cmd) {
+	case BIO_READ:
+		bzero(bp->bio_data, bp->bio_length);
+		cpu_flush_dcache(bp->bio_data, bp->bio_length);
+		break;
+	case BIO_WRITE:
+		break;
+	}
+	bp->bio_resid = 0;
+	return (0);
+}
+
 static void
 md_kthread(void *arg)
 {
@@ -987,6 +1007,7 @@ mdnew(int unit, int *errp, enum md_types type)
 	sc->type = type;
 	bioq_init(&sc->bio_queue);
 	mtx_init(&sc->queue_mtx, "md bio queue", NULL, MTX_DEF);
+	mtx_init(&sc->stat_mtx, "md stat", NULL, MTX_DEF);
 	sc->unit = unit;
 	sprintf(sc->name, "md%d", unit);
 	LIST_INSERT_HEAD(&md_softc_list, sc, list);
@@ -994,6 +1015,7 @@ mdnew(int unit, int *errp, enum md_types type)
 	if (error == 0)
 		return (sc);
 	LIST_REMOVE(sc, list);
+	mtx_destroy(&sc->stat_mtx);
 	mtx_destroy(&sc->queue_mtx);
 	free_unr(md_uh, sc->unit);
 	free(sc, M_MD);
@@ -1011,6 +1033,7 @@ mdinit(struct md_s *sc)
 	gp = g_new_geomf(&g_md_class, "md%d", sc->unit);
 	gp->softc = sc;
 	pp = g_new_providerf(gp, "md%d", sc->unit);
+	pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
 	pp->mediasize = sc->mediasize;
 	pp->sectorsize = sc->sectorsize;
 	switch (sc->type) {
@@ -1020,6 +1043,7 @@ mdinit(struct md_s *sc)
 		pp->flags |= G_PF_ACCEPT_UNMAPPED;
 		break;
 	case MD_PRELOAD:
+	case MD_NULL:
 		break;
 	}
 	sc->gp = gp;
@@ -1206,6 +1230,7 @@ mddestroy(struct md_s *sc, struct thread *td)
 	while (!(sc->flags & MD_EXITING))
 		msleep(sc->procp, &sc->queue_mtx, PRIBIO, "mddestroy", hz / 10);
 	mtx_unlock(&sc->queue_mtx);
+	mtx_destroy(&sc->stat_mtx);
 	mtx_destroy(&sc->queue_mtx);
 	if (sc->vnode != NULL) {
 		vn_lock(sc->vnode, LK_EXCLUSIVE | LK_RETRY);
@@ -1237,6 +1262,7 @@ mdresize(struct md_s *sc, struct md_ioctl *mdio)
 
 	switch (sc->type) {
 	case MD_VNODE:
+	case MD_NULL:
 		break;
 	case MD_SWAP:
 		if (mdio->md_mediasize <= 0 ||
@@ -1294,8 +1320,8 @@ mdcreate_swap(struct md_s *sc, struct md_ioctl *mdio, struct thread *td)
 	int error;
 
 	/*
-	 * Range check.  Disallow negative sizes or any size less then the
-	 * size of a page.  Then round to a page.
+	 * Range check.  Disallow negative sizes and sizes not being
+	 * multiple of page size.
 	 */
 	if (sc->mediasize <= 0 || (sc->mediasize % PAGE_SIZE) != 0)
 		return (EDOM);
@@ -1331,6 +1357,19 @@ mdcreate_swap(struct md_s *sc, struct md_ioctl *mdio, struct thread *td)
 	return (error);
 }
 
+static int
+mdcreate_null(struct md_s *sc, struct md_ioctl *mdio, struct thread *td)
+{
+
+	/*
+	 * Range check.  Disallow negative sizes and sizes not being
+	 * multiple of page size.
+	 */
+	if (sc->mediasize <= 0 || (sc->mediasize % PAGE_SIZE) != 0)
+		return (EDOM);
+
+	return (0);
+}
 
 static int
 xmdctlioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread *td)
@@ -1363,6 +1402,7 @@ xmdctlioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread
 		case MD_PRELOAD:
 		case MD_VNODE:
 		case MD_SWAP:
+		case MD_NULL:
 			break;
 		default:
 			return (EINVAL);
@@ -1408,6 +1448,10 @@ xmdctlioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, struct thread
 			sc->start = mdstart_swap;
 			error = mdcreate_swap(sc, mdio, td);
 			break;
+		case MD_NULL:
+			sc->start = mdstart_null;
+			error = mdcreate_null(sc, mdio, td);
+			break;
 		}
 		if (error != 0) {
 			mddestroy(sc, td);
@@ -1578,6 +1622,9 @@ g_md_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp,
 	case MD_SWAP:
 		type = "swap";
 		break;
+	case MD_NULL:
+		type = "null";
+		break;
 	default:
 		type = "unknown";
 		break;
diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c
index 2f89aadad48..88c4f0d2cff 100644
--- a/sys/dev/mge/if_mge.c
+++ b/sys/dev/mge/if_mge.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <net/ethernet.h>
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/mge/if_mgevar.h b/sys/dev/mge/if_mgevar.h
index f884fc8945a..0ab28bf6f0b 100644
--- a/sys/dev/mge/if_mgevar.h
+++ b/sys/dev/mge/if_mgevar.h
@@ -262,7 +262,7 @@ struct mge_softc {
 #define MGE_PORT_INT_RXQ0	(1 << 2)
 #define MGE_PORT_INT_RXERR	(1 << 10)
 #define MGE_PORT_INT_RXERRQ0	(1 << 11)
-#define MGE_PORT_INT_SUM	(1 << 31)
+#define MGE_PORT_INT_SUM	(1U << 31)
 
 #define MGE_PORT_INT_CAUSE_EXT	0x464
 #define MGE_PORT_INT_MASK_EXT	0x46C
@@ -273,7 +273,7 @@ struct mge_softc {
 #define MGE_PORT_INT_EXT_TXUR	(1 << 19)
 #define MGE_PORT_INT_EXT_LC	(1 << 20)
 #define MGE_PORT_INT_EXT_IAR	(1 << 23)
-#define MGE_PORT_INT_EXT_SUM	(1 << 31)
+#define MGE_PORT_INT_EXT_SUM	(1U << 31)
 
 #define MGE_RX_FIFO_URGENT_TRSH		0x470
 #define MGE_TX_FIFO_URGENT_TRSH		0x474
@@ -330,7 +330,7 @@ struct mge_softc {
 #define MGE_RX_DESC_FIRST	(1 << 27)
 #define MGE_RX_ENABLE_INT	(1 << 29)
 #define MGE_RX_L4_CSUM_OK	(1 << 30)
-#define MGE_DMA_OWNED		(1 << 31)
+#define MGE_DMA_OWNED		(1U << 31)
 
 #define MGE_RX_IP_FRAGMENT	(1 << 2)
 
diff --git a/sys/dev/mii/acphy.c b/sys/dev/mii/acphy.c
index c61c05bf437..edb5221179f 100644
--- a/sys/dev/mii/acphy.c
+++ b/sys/dev/mii/acphy.c
@@ -168,12 +168,6 @@ acphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		/* Wake & deisolate up if necessary */
 		reg = PHY_READ(sc, MII_BMCR);
 		if (reg & (BMCR_ISO | BMCR_PDOWN))
@@ -183,12 +177,6 @@ acphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * This PHY's autonegotiation doesn't need to be kicked.
 		 */
diff --git a/sys/dev/mii/amphy.c b/sys/dev/mii/amphy.c
index bd90ccf6508..ae3827db9a2 100644
--- a/sys/dev/mii/amphy.c
+++ b/sys/dev/mii/amphy.c
@@ -119,12 +119,6 @@ amphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
diff --git a/sys/dev/mii/atphy.c b/sys/dev/mii/atphy.c
index cca8813a7cb..819b1562143 100644
--- a/sys/dev/mii/atphy.c
+++ b/sys/dev/mii/atphy.c
@@ -80,6 +80,7 @@ static int	atphy_setmedia(struct mii_softc *, int);
 static const struct mii_phydesc atphys[] = {
 	MII_PHY_DESC(xxATHEROS, F1),
 	MII_PHY_DESC(xxATHEROS, F1_7),
+	MII_PHY_DESC(xxATHEROS, AR8021),
 	MII_PHY_DESC(xxATHEROS, F2),
 	MII_PHY_END
 };
@@ -116,12 +117,6 @@ atphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO ||
 		    IFM_SUBTYPE(ife->ifm_media) == IFM_1000_T) {
 			atphy_setmedia(sc, ife->ifm_media);
@@ -174,12 +169,6 @@ done:
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
diff --git a/sys/dev/mii/axphy.c b/sys/dev/mii/axphy.c
index 78f3901c6cb..f6fbc2a9f43 100644
--- a/sys/dev/mii/axphy.c
+++ b/sys/dev/mii/axphy.c
@@ -113,12 +113,6 @@ axphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
diff --git a/sys/dev/mii/bmtphy.c b/sys/dev/mii/bmtphy.c
index 81c2bd2ae1f..a4e880e0489 100644
--- a/sys/dev/mii/bmtphy.c
+++ b/sys/dev/mii/bmtphy.c
@@ -159,12 +159,6 @@ bmtphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
diff --git a/sys/dev/mii/brgphy.c b/sys/dev/mii/brgphy.c
index dd29b340d8e..bdefbe56495 100644
--- a/sys/dev/mii/brgphy.c
+++ b/sys/dev/mii/brgphy.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_media.h>
 
@@ -314,10 +315,6 @@ brgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 	case MII_POLLSTAT:
 		break;
 	case MII_MEDIACHG:
-		/* If the interface is not up, don't do anything. */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		/* Todo: Why is this here?  Is it really needed? */
 		PHY_RESET(sc);	/* XXX hardware bug work-around */
 
@@ -337,11 +334,6 @@ brgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		}
 		break;
 	case MII_TICK:
-		/* Bail if the interface isn't up. */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
-
 		/* Bail if autoneg isn't in process. */
 		if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) {
 			sc->mii_ticks = 0;
diff --git a/sys/dev/mii/ciphy.c b/sys/dev/mii/ciphy.c
index e830f279e95..1b7eb7747b9 100644
--- a/sys/dev/mii/ciphy.c
+++ b/sys/dev/mii/ciphy.c
@@ -131,12 +131,6 @@ ciphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		ciphy_fixup(sc);	/* XXX hardware bug work-around */
 
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
@@ -186,12 +180,6 @@ setit:
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
diff --git a/sys/dev/mii/e1000phy.c b/sys/dev/mii/e1000phy.c
index 4854d78e651..d151b364405 100644
--- a/sys/dev/mii/e1000phy.c
+++ b/sys/dev/mii/e1000phy.c
@@ -50,8 +50,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 #include <sys/bus.h>
 
-
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>
@@ -311,12 +311,6 @@ e1000phy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO) {
 			e1000phy_mii_phy_auto(sc, ife->ifm_media);
 			break;
@@ -374,12 +368,6 @@ e1000phy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 done:
 		break;
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
diff --git a/sys/dev/mii/gentbi.c b/sys/dev/mii/gentbi.c
index 05209cfaae8..52dc8fcdb06 100644
--- a/sys/dev/mii/gentbi.c
+++ b/sys/dev/mii/gentbi.c
@@ -191,12 +191,6 @@ gentbi_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 6330d9efd62..53afc9a6fcf 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -145,12 +145,6 @@ icsphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
diff --git a/sys/dev/mii/ip1000phy.c b/sys/dev/mii/ip1000phy.c
index b7fb5151ae3..8a82004f7ce 100644
--- a/sys/dev/mii/ip1000phy.c
+++ b/sys/dev/mii/ip1000phy.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>
@@ -126,13 +127,6 @@ ip1000phy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0) {
-			break;
-		}
-
 		PHY_RESET(sc);
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
 		case IFM_AUTO:
@@ -179,12 +173,6 @@ done:
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
diff --git a/sys/dev/mii/jmphy.c b/sys/dev/mii/jmphy.c
index 14fdf7e787c..f1efa980bc5 100644
--- a/sys/dev/mii/jmphy.c
+++ b/sys/dev/mii/jmphy.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>
@@ -121,23 +122,11 @@ jmphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		if (jmphy_setmedia(sc, ife) != EJUSTRETURN)
 			return (EINVAL);
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
diff --git a/sys/dev/mii/lxtphy.c b/sys/dev/mii/lxtphy.c
index d7059fb5cee..d673f2cd92d 100644
--- a/sys/dev/mii/lxtphy.c
+++ b/sys/dev/mii/lxtphy.c
@@ -168,12 +168,6 @@ lxtphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		if (IFM_SUBTYPE(ife->ifm_media) == IFM_100_FX)
 			lxtphy_set_fx(sc);
 		else
diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c
index bba3f63e796..e603cff045d 100644
--- a/sys/dev/mii/mii.c
+++ b/sys/dev/mii/mii.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>
diff --git a/sys/dev/mii/mii_physubr.c b/sys/dev/mii/mii_physubr.c
index 8e1476a7df4..c8ee613a917 100644
--- a/sys/dev/mii/mii_physubr.c
+++ b/sys/dev/mii/mii_physubr.c
@@ -209,13 +209,8 @@ int
 mii_phy_tick(struct mii_softc *sc)
 {
 	struct ifmedia_entry *ife = sc->mii_pdata->mii_media.ifm_cur;
-	struct ifnet *ifp = sc->mii_pdata->mii_ifp;
 	int reg;
 
-	/* Just bail now if the interface is down. */
-	if ((ifp->if_flags & IFF_UP) == 0)
-		return (EJUSTRETURN);
-
 	/*
 	 * If we're not doing autonegotiation, we don't need to do
 	 * any extra work here.  However, we need to check the link
diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs
index d2931f38a2c..d7671b29b99 100644
--- a/sys/dev/mii/miidevs
+++ b/sys/dev/mii/miidevs
@@ -136,6 +136,7 @@ model yyAMD 79c901home		0x0039 Am79C901 HomePNA 1.0 interface
 /* Atheros Communications/Attansic PHYs */
 model xxATHEROS F1		0x0001 Atheros F1 10/100/1000 PHY
 model xxATHEROS F2		0x0002 Atheros F2 10/100 PHY
+model xxATHEROS AR8021		0x0004 Atheros AR8021 10/100/1000 PHY
 model xxATHEROS F1_7		0x0007 Atheros F1 10/100/1000 PHY
 
 /* Asix semiconductor PHYs */
@@ -304,6 +305,7 @@ model yyREALTEK RTL8201L	0x0020 RTL8201L 10/100 media interface
 model xxREALTEK RTL8169S	0x0011 RTL8169S/8110S/8211 1000BASE-T media interface
 model REALTEK RTL8305SC		0x0005 RTL8305SC 10/100 802.1q switch
 model REALTEK RTL8201E		0x0008 RTL8201E 10/100 media interface
+model REALTEK RTL8251		0x0000 RTL8251 1000BASE-T media interface
 model REALTEK RTL8169S		0x0011 RTL8169S/8110S/8211 1000BASE-T media interface
 
 /* Seeq Seeq PHYs */
diff --git a/sys/dev/mii/mlphy.c b/sys/dev/mii/mlphy.c
index f9b1962f2f0..eb6aa4c6607 100644
--- a/sys/dev/mii/mlphy.c
+++ b/sys/dev/mii/mlphy.c
@@ -205,12 +205,6 @@ mlphy_service(xsc, mii, cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
 		case IFM_AUTO:
 			/*
@@ -265,12 +259,6 @@ mlphy_service(xsc, mii, cmd)
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
diff --git a/sys/dev/mii/nsgphy.c b/sys/dev/mii/nsgphy.c
index 988e5c2cabc..e87747a5443 100644
--- a/sys/dev/mii/nsgphy.c
+++ b/sys/dev/mii/nsgphy.c
@@ -159,12 +159,6 @@ nsgphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index 01cd31d77b0..7b450fb00b4 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 
 #include <dev/mii/mii.h>
@@ -152,12 +153,6 @@ nsphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		reg = PHY_READ(sc, MII_NSPHY_PCR);
 
 		/*
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index dabb156a536..00c0550a8ca 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -149,12 +149,6 @@ nsphyter_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 29f2c7851d7..6e5c51b255c 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -121,12 +121,6 @@ pnaphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
 		case IFM_HPNA_1:
 			mii_phy_setmedia(sc);
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index a649e5c710d..e1d137ca098 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -143,22 +143,10 @@ qsphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * This PHY's autonegotiation doesn't need to be kicked.
 		 */
diff --git a/sys/dev/mii/rdcphy.c b/sys/dev/mii/rdcphy.c
index 6f7f98d5f99..c411eaecfa8 100644
--- a/sys/dev/mii/rdcphy.c
+++ b/sys/dev/mii/rdcphy.c
@@ -121,12 +121,6 @@ rdcphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
 		case IFM_100_TX:
diff --git a/sys/dev/mii/rgephy.c b/sys/dev/mii/rgephy.c
index aa919f53463..fbeeb51054f 100644
--- a/sys/dev/mii/rgephy.c
+++ b/sys/dev/mii/rgephy.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
 
@@ -90,6 +91,7 @@ static void	rgephy_load_dspcode(struct mii_softc *);
 
 static const struct mii_phydesc rgephys[] = {
 	MII_PHY_DESC(REALTEK, RTL8169S),
+	MII_PHY_DESC(REALTEK, RTL8251),
 	MII_PHY_END
 };
 
@@ -153,12 +155,6 @@ rgephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		PHY_RESET(sc);	/* XXX hardware bug work-around */
 
 		anar = PHY_READ(sc, RGEPHY_MII_ANAR);
@@ -230,12 +226,6 @@ setit:
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
@@ -406,7 +396,8 @@ rgephy_loop(struct mii_softc *sc)
 {
 	int i;
 
-	if (sc->mii_mpd_rev < 2) {
+	if (sc->mii_mpd_model != MII_MODEL_REALTEK_RTL8251 &&
+	    sc->mii_mpd_rev < 2) {
 		PHY_WRITE(sc, RGEPHY_MII_BMCR, RGEPHY_BMCR_PDOWN);
 		DELAY(1000);
 	}
@@ -439,7 +430,8 @@ rgephy_load_dspcode(struct mii_softc *sc)
 {
 	int val;
 
-	if (sc->mii_mpd_rev >= 2)
+	if (sc->mii_mpd_model == MII_MODEL_REALTEK_RTL8251 ||
+	    sc->mii_mpd_rev >= 2)
 		return;
 
 	PHY_WRITE(sc, 31, 0x0001);
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index ddf8d73dc23..b98c0403ba4 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/bus.h>
+#include <sys/taskqueue.h>	/* XXXGL: if_rlreg.h contamination */
 
 #include <net/if.h>
 #include <net/if_arp.h>
@@ -141,22 +142,10 @@ rlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * The RealTek PHY's autonegotiation doesn't need to be
 		 * kicked; it continues in the background.
diff --git a/sys/dev/mii/rlswitch.c b/sys/dev/mii/rlswitch.c
index b158fd40c37..5082e7ccb06 100644
--- a/sys/dev/mii/rlswitch.c
+++ b/sys/dev/mii/rlswitch.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/bus.h>
+#include <sys/taskqueue.h>	/* XXXGL: if_rlreg.h contamination */
 
 #include <net/if.h>
 #include <net/if_arp.h>
@@ -353,11 +354,6 @@ rlswitch_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
 		break;
 	}
 
diff --git a/sys/dev/mii/smcphy.c b/sys/dev/mii/smcphy.c
index e96805357fe..484c736909b 100644
--- a/sys/dev/mii/smcphy.c
+++ b/sys/dev/mii/smcphy.c
@@ -134,12 +134,6 @@ smcphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
                 break;
 
         case MII_MEDIACHG:
-                /*
-                 * If the interface is not up, don't do anything.
-                 */
-                if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-                        break;
-
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
 		case IFM_AUTO:
 			smcphy_auto(sc, ife->ifm_media);
@@ -153,10 +147,6 @@ smcphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
                 break;
 
         case MII_TICK:
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0) {
-			return (0);
-		}
-
 		if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) {
 			break;
 		}
diff --git a/sys/dev/mii/smscphy.c b/sys/dev/mii/smscphy.c
index 5029f2a1ce1..1d6ce618b7b 100644
--- a/sys/dev/mii/smscphy.c
+++ b/sys/dev/mii/smscphy.c
@@ -120,12 +120,6 @@ smscphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
                 break;
 
         case MII_MEDIACHG:
-                /*
-                 * If the interface is not up, don't do anything.
-                 */
-                if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-                        break;
-
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
 		case IFM_AUTO:
 			smscphy_auto(sc, ife->ifm_media);
@@ -139,10 +133,6 @@ smscphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
                 break;
 
         case MII_TICK:
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0) {
-			return (0);
-		}
-
 		if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) {
 			break;
 		}
diff --git a/sys/dev/mii/tdkphy.c b/sys/dev/mii/tdkphy.c
index d07327c9a45..0dfb934767f 100644
--- a/sys/dev/mii/tdkphy.c
+++ b/sys/dev/mii/tdkphy.c
@@ -122,12 +122,6 @@ tdkphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index ac5cff3d46f..52300db389d 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -217,12 +217,6 @@ tlphy_service(struct mii_softc *self, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
 		case IFM_AUTO:
 			/*
@@ -246,12 +240,6 @@ tlphy_service(struct mii_softc *self, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
diff --git a/sys/dev/mii/truephy.c b/sys/dev/mii/truephy.c
index df17b2474ed..66e4e26fcde 100644
--- a/sys/dev/mii/truephy.c
+++ b/sys/dev/mii/truephy.c
@@ -44,6 +44,7 @@
 #include <sys/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
@@ -180,12 +181,6 @@ truephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		if (IFM_SUBTYPE(ife->ifm_media) != IFM_AUTO) {
 			bmcr = PHY_READ(sc, MII_BMCR) & ~BMCR_AUTOEN;
 			PHY_WRITE(sc, MII_BMCR, bmcr);
diff --git a/sys/dev/mii/ukphy.c b/sys/dev/mii/ukphy.c
index 9d52eb580ca..45addcbc757 100644
--- a/sys/dev/mii/ukphy.c
+++ b/sys/dev/mii/ukphy.c
@@ -140,12 +140,6 @@ ukphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index 328d34ad9a5..2e2fff988a1 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -148,12 +148,6 @@ xmphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
 		case IFM_AUTO:
 #ifdef foo
@@ -181,12 +175,6 @@ xmphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
diff --git a/sys/dev/mps/mps_sas.c b/sys/dev/mps/mps_sas.c
index b6ee542a5f4..b9555fb469a 100644
--- a/sys/dev/mps/mps_sas.c
+++ b/sys/dev/mps/mps_sas.c
@@ -1063,8 +1063,8 @@ mpssas_announce_reset(struct mps_softc *sc, uint32_t ac_code,
 	path_id_t path_id = cam_sim_path(sc->sassc->sim);
 	struct cam_path *path;
 
-	mps_dprint(sc, MPS_XINFO, "%s code %x target %d lun %d\n", __func__,
-	    ac_code, target_id, lun_id);
+	mps_dprint(sc, MPS_XINFO, "%s code %x target %d lun %jx\n", __func__,
+	    ac_code, target_id, (uintmax_t)lun_id);
 
 	if (xpt_create_path(&path, NULL, 
 		path_id, target_id, lun_id) != CAM_REQ_CMP) {
diff --git a/sys/dev/mpt/mpt_cam.c b/sys/dev/mpt/mpt_cam.c
index cb829572e64..8feffbbe76f 100644
--- a/sys/dev/mpt/mpt_cam.c
+++ b/sys/dev/mpt/mpt_cam.c
@@ -1431,7 +1431,7 @@ bad:
 			/* SAS1078 36GB limitation WAR */
 			if (mpt->is_1078 && (((uint64_t)dm_segs->ds_addr +
 			    MPI_SGE_LENGTH(se->FlagsLength)) >> 32) == 9) {
-				addr |= (1 << 31);
+				addr |= (1U << 31);
 				tf |= MPI_SGE_FLAGS_LOCAL_ADDRESS;
 			}
 			se->Address.High = htole32(addr);
@@ -1554,7 +1554,7 @@ bad:
 				    (((uint64_t)dm_segs->ds_addr +
 				    MPI_SGE_LENGTH(se->FlagsLength)) >>
 				    32) == 9) {
-					addr |= (1 << 31);
+					addr |= (1U << 31);
 					tf |= MPI_SGE_FLAGS_LOCAL_ADDRESS;
 				}
 				se->Address.High = htole32(addr);
@@ -2203,8 +2203,8 @@ mpt_start(struct cam_sim *sim, union ccb *ccb)
 			    "read" : "write",  csio->dxfer_len,
 			    (csio->dxfer_len == 1)? ")" : "s)");
 		}
-		mpt_prtc(mpt, "tgt %u lun %u req %p:%u\n", tgt,
-		    ccb->ccb_h.target_lun, req, req->serno);
+		mpt_prtc(mpt, "tgt %u lun %jx req %p:%u\n", tgt,
+		    (uintmax_t)ccb->ccb_h.target_lun, req, req->serno);
 	}
 
 	error = bus_dmamap_load_ccb(mpt->buffer_dmat, req->dmap, ccb, cb,
@@ -2978,8 +2978,8 @@ mpt_fc_els_reply_handler(struct mpt_softc *mpt, request_t *req,
 			ccb = tgt->ccb;
 			if (ccb) {
 				mpt_prt(mpt,
-				    "CCB (%p): lun %u flags %x status %x\n",
-				    ccb, ccb->ccb_h.target_lun,
+				    "CCB (%p): lun %jx flags %x status %x\n",
+				    ccb, (uintmax_t)ccb->ccb_h.target_lun,
 				    ccb->ccb_h.flags, ccb->ccb_h.status);
 			}
 			mpt_prt(mpt, "target state 0x%x resid %u xfrd %u rpwrd "
@@ -3683,7 +3683,6 @@ mpt_action(struct cam_sim *sim, union ccb *ccb)
 		lun_id_t lun = ccb->ccb_h.target_lun;
 		ccb->ccb_h.sim_priv.entries[0].field = 0;
 		ccb->ccb_h.sim_priv.entries[1].ptr = mpt;
-		ccb->ccb_h.flags = 0;
 
 		if (lun == CAM_LUN_WILDCARD) {
 			if (ccb->ccb_h.target_id != CAM_TARGET_WILDCARD) {
@@ -3699,12 +3698,12 @@ mpt_action(struct cam_sim *sim, union ccb *ccb)
 		}
 		if (ccb->ccb_h.func_code == XPT_ACCEPT_TARGET_IO) {
 			mpt_lprt(mpt, MPT_PRT_DEBUG1,
-			    "Put FREE ATIO %p lun %d\n", ccb, lun);
+			    "Put FREE ATIO %p lun %jx\n", ccb, (uintmax_t)lun);
 			STAILQ_INSERT_TAIL(&trtp->atios, &ccb->ccb_h,
 			    sim_links.stqe);
 		} else if (ccb->ccb_h.func_code == XPT_IMMEDIATE_NOTIFY) {
 			mpt_lprt(mpt, MPT_PRT_DEBUG1,
-			    "Put FREE INOT lun %d\n", lun);
+			    "Put FREE INOT lun %jx\n", (uintmax_t)lun);
 			STAILQ_INSERT_TAIL(&trtp->inots, &ccb->ccb_h,
 			    sim_links.stqe);
 		} else {
@@ -4867,7 +4866,8 @@ mpt_scsi_tgt_tsk_mgmt(struct mpt_softc *mpt, request_t *req, mpt_task_mgmt_t fc,
 	}
 	STAILQ_REMOVE_HEAD(&trtp->inots, sim_links.stqe);
 	mpt_lprt(mpt, MPT_PRT_DEBUG1,
-	    "Get FREE INOT %p lun %d\n", inot, inot->ccb_h.target_lun);
+	    "Get FREE INOT %p lun %jx\n", inot,
+	    (uintmax_t)inot->ccb_h.target_lun);
 
 	inot->initiator_id = init_id;	/* XXX */
 	/*
@@ -5094,8 +5094,8 @@ mpt_scsi_tgt_atio(struct mpt_softc *mpt, request_t *req, uint32_t reply_desc)
 				return;
 			default:
 				mpt_lprt(mpt, MPT_PRT_DEBUG,
-				    "CMD 0x%x to unmanaged lun %u\n",
-				    cdbp[0], lun);
+				    "CMD 0x%x to unmanaged lun %jx\n",
+				    cdbp[0], (uintmax_t)lun);
 				buf[12] = 0x25;
 				break;
 			}
@@ -5127,7 +5127,7 @@ mpt_scsi_tgt_atio(struct mpt_softc *mpt, request_t *req, uint32_t reply_desc)
 	atiop = (struct ccb_accept_tio *) STAILQ_FIRST(&trtp->atios);
 	if (atiop == NULL) {
 		mpt_lprt(mpt, MPT_PRT_WARN,
-		    "no ATIOs for lun %u- sending back %s\n", lun,
+		    "no ATIOs for lun %jx- sending back %s\n", (uintmax_t)lun,
 		    mpt->tenabled? "QUEUE FULL" : "BUSY");
 		mpt_scsi_tgt_status(mpt, NULL, req,
 		    mpt->tenabled? SCSI_STATUS_QUEUE_FULL : SCSI_STATUS_BUSY,
@@ -5136,7 +5136,8 @@ mpt_scsi_tgt_atio(struct mpt_softc *mpt, request_t *req, uint32_t reply_desc)
 	}
 	STAILQ_REMOVE_HEAD(&trtp->atios, sim_links.stqe);
 	mpt_lprt(mpt, MPT_PRT_DEBUG1,
-	    "Get FREE ATIO %p lun %d\n", atiop, atiop->ccb_h.target_lun);
+	    "Get FREE ATIO %p lun %jx\n", atiop,
+	    (uintmax_t)atiop->ccb_h.target_lun);
 	atiop->ccb_h.ccb_mpt_ptr = mpt;
 	atiop->ccb_h.status = CAM_CDB_RECVD;
 	atiop->ccb_h.target_lun = lun;
@@ -5156,12 +5157,12 @@ mpt_scsi_tgt_atio(struct mpt_softc *mpt, request_t *req, uint32_t reply_desc)
 	tgt->tag_id = atiop->tag_id;
 	if (tag_action) {
 		atiop->tag_action = tag_action;
-		atiop->ccb_h.flags = CAM_TAG_ACTION_VALID;
+		atiop->ccb_h.flags |= CAM_TAG_ACTION_VALID;
 	}
 	if (mpt->verbose >= MPT_PRT_DEBUG) {
 		int i;
-		mpt_prt(mpt, "START_CCB %p for lun %u CDB=<", atiop,
-		    atiop->ccb_h.target_lun);
+		mpt_prt(mpt, "START_CCB %p for lun %jx CDB=<", atiop,
+		    (uintmax_t)atiop->ccb_h.target_lun);
 		for (i = 0; i < atiop->cdb_len; i++) {
 			mpt_prtc(mpt, "%02x%c", cdbp[i] & 0xff,
 			    (i == (atiop->cdb_len - 1))? '>' : ' ');
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index 526062b573b..01f784c2578 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -117,6 +117,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -4070,12 +4071,12 @@ msk_init_locked(struct msk_if_softc *sc_if)
 	CSR_WRITE_4(sc, B0_IMSK, sc->msk_intrmask);
 	CSR_READ_4(sc, B0_IMSK);
 
-	sc_if->msk_flags &= ~MSK_FLAG_LINK;
-	mii_mediachg(mii);
-
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
+	sc_if->msk_flags &= ~MSK_FLAG_LINK;
+	mii_mediachg(mii);
+
 	callout_reset(&sc_if->msk_tick_ch, hz, msk_tick, sc_if);
 }
 
diff --git a/sys/dev/msk/if_mskreg.h b/sys/dev/msk/if_mskreg.h
index 5465deb1bf3..41a6eb7c36d 100644
--- a/sys/dev/msk/if_mskreg.h
+++ b/sys/dev/msk/if_mskreg.h
@@ -156,7 +156,7 @@
 #define DEVICEID_DLINK_DGE560SX	0x4002
 #define DEVICEID_DLINK_DGE560T	0x4b00
 
-#define BIT_31		(1 << 31)
+#define BIT_31		(1U << 31)
 #define BIT_30		(1 << 30)
 #define BIT_29		(1 << 29)
 #define BIT_28		(1 << 28)
diff --git a/sys/dev/mvs/mvs.c b/sys/dev/mvs/mvs.c
index 7f00deeb81c..8ad85a86cf7 100644
--- a/sys/dev/mvs/mvs.c
+++ b/sys/dev/mvs/mvs.c
@@ -654,9 +654,7 @@ mvs_ch_intr_locked(void *data)
 	struct mvs_channel *ch = device_get_softc(dev);
 
 	mtx_lock(&ch->mtx);
-	xpt_batch_start(ch->sim);
 	mvs_ch_intr(data);
-	xpt_batch_done(ch->sim);
 	mtx_unlock(&ch->mtx);
 }
 
diff --git a/sys/dev/mvs/mvs.h b/sys/dev/mvs/mvs.h
index 4938fb4c6d2..69a7c96b348 100644
--- a/sys/dev/mvs/mvs.h
+++ b/sys/dev/mvs/mvs.h
@@ -141,7 +141,7 @@
 #define EDMA_IE_LINKDATARXERR(x)	((x) << 17)	/* Link Data Recv Err */
 #define EDMA_IE_LINKCTLTXERR(x)		((x) << 21)	/* Link Ctrl Tx Error */
 #define EDMA_IE_LINKDATATXERR(x)	((x) << 26)	/* Link Data Tx Error */
-#define EDMA_IE_TRANSPROTERR		(1 << 31)	/* Transport Proto E */
+#define EDMA_IE_TRANSPROTERR		(1U << 31)	/* Transport Proto E */
 #define EDMA_IE_TRANSIENT		(EDMA_IE_LINKCTLRXERR(0x0b) | \
 					 EDMA_IE_LINKCTLTXERR(0x1f))
 							/* Non-fatal Errors */
diff --git a/sys/dev/mvs/mvs_soc.c b/sys/dev/mvs/mvs_soc.c
index 2edeef0cac6..ca3699361a7 100644
--- a/sys/dev/mvs/mvs_soc.c
+++ b/sys/dev/mvs/mvs_soc.c
@@ -66,6 +66,8 @@ static struct {
 	{MV_DEV_88F6282, 0x00,   "Marvell 88F6282",	2, MVS_Q_GENIIE|MVS_Q_SOC},
 	{MV_DEV_MV78100, 0x00,   "Marvell MV78100",	2, MVS_Q_GENIIE|MVS_Q_SOC},
 	{MV_DEV_MV78100_Z0, 0x00,"Marvell MV78100",	2, MVS_Q_GENIIE|MVS_Q_SOC},
+	{MV_DEV_MV78260, 0x00,   "Marvell MV78260",	2, MVS_Q_GENIIE|MVS_Q_SOC},
+	{MV_DEV_MV78460, 0x00,   "Marvell MV78460",	2, MVS_Q_GENIIE|MVS_Q_SOC},
 	{0,              0x00,   NULL,			0, 0}
 };
 
diff --git a/sys/dev/mwl/if_mwl.c b/sys/dev/mwl/if_mwl.c
index bf669620b12..5c19f19c8a8 100644
--- a/sys/dev/mwl/if_mwl.c
+++ b/sys/dev/mwl/if_mwl.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/mwl/if_mwl_pci.c b/sys/dev/mwl/if_mwl_pci.c
index d4d00dc95f3..8527cd67e38 100644
--- a/sys/dev/mwl/if_mwl_pci.c
+++ b/sys/dev/mwl/if_mwl_pci.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/errno.h>
 
@@ -52,9 +53,11 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/socket.h>
  
+#include <net/ethernet.h>
 #include <net/if.h>
 #include <net/if_media.h>
 #include <net/if_arp.h>
+#include <net/route.h>
 
 #include <net80211/ieee80211_var.h>
 
diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c
index c7064f555d4..530b01c716b 100644
--- a/sys/dev/mxge/if_mxge.c
+++ b/sys/dev/mxge/if_mxge.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/mxge/mxge_mcp.h b/sys/dev/mxge/mxge_mcp.h
index 5a3fa560acb..365357e0b5b 100644
--- a/sys/dev/mxge/mxge_mcp.h
+++ b/sys/dev/mxge/mxge_mcp.h
@@ -226,7 +226,7 @@ enum myri10ge_mcp_cmd_type {
      a power of 2 number of entries.  */
 
   MXGEFW_CMD_SET_INTRQ_SIZE = 13, 	/* in bytes */
-#define MXGEFW_CMD_SET_INTRQ_SIZE_FLAG_NO_STRICT_SIZE_CHECK  (1 << 31)
+#define MXGEFW_CMD_SET_INTRQ_SIZE_FLAG_NO_STRICT_SIZE_CHECK  (1U << 31)
 
   /* command to bring ethernet interface up.  Above parameters
      (plus mtu & mac address) must have been exchanged prior
diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
index a487d901ee6..f657d81da5f 100644
--- a/sys/dev/my/if_my.c
+++ b/sys/dev/my/if_my.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #define NBPFILTER	1
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_media.h>
diff --git a/sys/dev/nand/nand.c b/sys/dev/nand/nand.c
index f46d0f05419..fb83e673861 100644
--- a/sys/dev/nand/nand.c
+++ b/sys/dev/nand/nand.c
@@ -115,7 +115,7 @@ nand_init(struct nand_softc *nand, device_t dev, int ecc_mode,
 }
 
 void
-nand_onfi_set_params(struct nand_chip *chip, struct onfi_params *params)
+nand_onfi_set_params(struct nand_chip *chip, struct onfi_chip_params *params)
 {
 	struct chip_geom *cg;
 
@@ -309,23 +309,22 @@ nand_get_chip_param(struct nand_chip *chip, struct chip_param_io *param)
 static uint16_t *
 default_software_ecc_positions(struct nand_chip *chip)
 {
-	struct nand_ecc_data *eccd;
+	/* If positions have been set already, use them. */
+	if (chip->nand->ecc.eccpositions)
+		return (chip->nand->ecc.eccpositions);
 
-	eccd = &chip->nand->ecc;
-
-	if (eccd->eccpositions)
-		return (eccd->eccpositions);
-
-	switch (chip->chip_geom.oob_size) {
-	case 16:
-		return ((uint16_t *)&default_software_ecc_positions_16);
-	case 64:
-		return ((uint16_t *)&default_software_ecc_positions_64);
-	case 128:
-		return ((uint16_t *)&default_software_ecc_positions_128);
-	default:
-		return (NULL); /* No ecc bytes positions defs available */
-	}
+	/*
+	 * XXX Note that the following logic isn't really sufficient, especially
+	 * in the ONFI case where the number of ECC bytes can be dictated by
+	 * values in the parameters page, and that could lead to needing more
+	 * byte positions than exist within the tables of software-ecc defaults.
+	 */
+	if (chip->chip_geom.oob_size >= 128)
+		return (default_software_ecc_positions_128);
+	if (chip->chip_geom.oob_size >= 64)
+		return (default_software_ecc_positions_64);
+	else if (chip->chip_geom.oob_size >= 16)
+		return (default_software_ecc_positions_16);
 
 	return (NULL);
 }
diff --git a/sys/dev/nand/nand.h b/sys/dev/nand/nand.h
index 0d6d7b453d7..0e9ea41bc60 100644
--- a/sys/dev/nand/nand.h
+++ b/sys/dev/nand/nand.h
@@ -31,6 +31,7 @@
 
 #include <sys/bus.h>
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/lock.h>
 #include <sys/sx.h>
 #include <sys/taskqueue.h>
@@ -122,7 +123,8 @@ MALLOC_DECLARE(M_NAND);
 
 #define NAND_MAN_SAMSUNG		0xec
 #define NAND_MAN_HYNIX			0xad
-#define	NAND_MAN_STMICRO		0x20
+#define NAND_MAN_STMICRO		0x20
+#define NAND_MAN_MICRON			0x2c
 
 struct nand_id {
 	uint8_t man_id;
@@ -176,12 +178,17 @@ struct onfi_params {
 	uint16_t	rev;
 	uint16_t	features;
 	uint16_t	optional_commands;
-	uint8_t		res1[22];
+	uint8_t		primary_advanced_command;
+	uint8_t		res1;
+	uint16_t	extended_parameter_page_length;
+	uint8_t		parameter_page_count;
+	uint8_t		res2[17];
 	char		manufacturer_name[12];
 	char		device_model[20];
 	uint8_t		manufacturer_id;
-	uint16_t	date;
-	uint8_t		res2[13];
+	uint8_t		manufacture_date_yy;
+	uint8_t		manufacture_date_ww;
+	uint8_t		res3[13];
 	uint32_t	bytes_per_page;
 	uint16_t	spare_bytes_per_page;
 	uint32_t	bytes_per_partial_page;
@@ -200,7 +207,8 @@ struct onfi_params {
 	uint8_t		bits_of_ecc;
 	uint8_t		interleaved_addr_bits;
 	uint8_t		interleaved_oper_attr;
-	uint8_t		res3[13];
+	uint8_t		eznand_support;
+	uint8_t		res4[12];
 	uint8_t		pin_capacitance;
 	uint16_t	asynch_timing_mode_support;
 	uint16_t	asynch_prog_cache_timing_mode_support;
@@ -215,11 +223,31 @@ struct onfi_params {
 	uint16_t	input_capacitance;
 	uint8_t		input_capacitance_max;
 	uint8_t		driver_strength_support;
-	uint8_t		res4[12];
+	uint16_t	t_r_interleaved;
+	uint16_t	t_adl;
+	uint16_t	t_r_eznand;
+	uint8_t		nv_ddr2_features;
+	uint8_t		nv_ddr2_warmup_cycles;
+	uint8_t		res5[4];
 	uint16_t	vendor_rev;
-	uint8_t		vendor_spec[8];
+	uint8_t		vendor_spec[88];
 	uint16_t	crc;
 }__attribute__((packed));
+CTASSERT(sizeof(struct onfi_params) == 256);
+
+struct onfi_chip_params {
+	uint32_t blocks_per_lun;
+	uint32_t pages_per_block;
+	uint32_t bytes_per_page;
+	uint32_t spare_bytes_per_page;
+	uint16_t t_bers;
+	uint16_t t_prog;
+	uint16_t t_r;
+	uint16_t t_ccs;
+	uint16_t features;
+	uint8_t address_cycles;
+	uint8_t luns;
+};
 
 struct nand_ecc_data {
 	int	eccsize;		/* Number of data bytes per ECC step */
@@ -353,7 +381,7 @@ void nand_init(struct nand_softc *nand, device_t dev, int ecc_mode,
 void nand_detach(struct nand_softc *nand);
 struct nand_params *nand_get_params(struct nand_id *id);
 
-void nand_onfi_set_params(struct nand_chip *chip, struct onfi_params *params);
+void nand_onfi_set_params(struct nand_chip *chip, struct onfi_chip_params *params);
 void nand_set_params(struct nand_chip *chip, struct nand_params *params);
 int  nand_init_stat(struct nand_chip *chip);
 void nand_destroy_stat(struct nand_chip *chip);
diff --git a/sys/dev/nand/nand_cdev.c b/sys/dev/nand/nand_cdev.c
index ac27ff36153..b01194601ad 100644
--- a/sys/dev/nand/nand_cdev.c
+++ b/sys/dev/nand/nand_cdev.c
@@ -294,19 +294,40 @@ nand_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
     struct thread *td)
 {
 	struct nand_chip *chip;
+	struct chip_geom  *cg;
 	struct nand_oob_rw *oob_rw = NULL;
 	struct nand_raw_rw *raw_rw = NULL;
 	device_t nandbus;
+	size_t bufsize = 0, len = 0;
+	size_t raw_size;
+	off_t off;
 	uint8_t *buf = NULL;
 	int ret = 0;
 	uint8_t status;
 
 	chip = (struct nand_chip *)dev->si_drv1;
+	cg = &chip->chip_geom;
 	nandbus = device_get_parent(chip->dev);
 
 	if ((cmd == NAND_IO_RAW_READ) || (cmd == NAND_IO_RAW_PROG)) {
 		raw_rw = (struct nand_raw_rw *)data;
-		buf = malloc(raw_rw->len, M_NAND, M_WAITOK);
+		raw_size =  cg->pgs_per_blk * (cg->page_size + cg->oob_size);
+
+		/* Check if len is not bigger than chip size */
+		if (raw_rw->len > raw_size)
+			return (EFBIG);
+
+		/*
+		 * Do not ask for too much memory, in case of large transfers
+		 * read/write in 16-pages chunks
+		 */
+		bufsize = 16 * (cg->page_size + cg->oob_size);
+		if (raw_rw->len < bufsize)
+			bufsize = raw_rw->len;
+
+		buf = malloc(bufsize, M_NAND, M_WAITOK);
+		len = raw_rw->len;
+		off = 0;
 	}
 	switch(cmd) {
 	case NAND_IO_ERASE:
@@ -335,19 +356,37 @@ nand_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
 		break;
 
 	case NAND_IO_RAW_PROG:
-		ret = copyin(raw_rw->data, buf, raw_rw->len);
-		if (ret)
-			break;
-		ret = nand_prog_pages_raw(chip, raw_rw->off, buf,
-		    raw_rw->len);
+		while (len > 0) {
+			if (len < bufsize)
+				bufsize = len;
+			ret = copyin(raw_rw->data + off, buf, bufsize);
+			if (ret)
+				break;
+			ret = nand_prog_pages_raw(chip, raw_rw->off + off, buf,
+			    bufsize);
+			if (ret)
+				break;
+			len -= bufsize;
+			off += bufsize;
+		}
 		break;
 
 	case NAND_IO_RAW_READ:
-		ret = nand_read_pages_raw(chip, raw_rw->off, buf,
-		    raw_rw->len);
-		if (ret)
-			break;
-		ret = copyout(buf, raw_rw->data, raw_rw->len);
+		while (len > 0) {
+			if (len < bufsize)
+				bufsize = len;
+
+			ret = nand_read_pages_raw(chip, raw_rw->off + off, buf,
+			    bufsize);
+			if (ret)
+				break;
+
+			ret = copyout(buf, raw_rw->data + off, bufsize);
+			if (ret)
+				break;
+			len -= bufsize;
+			off += bufsize;
+		}
 		break;
 
 	case NAND_IO_PAGE_STAT:
diff --git a/sys/dev/nand/nand_generic.c b/sys/dev/nand/nand_generic.c
index 85e81beb6b6..62c61610d51 100644
--- a/sys/dev/nand/nand_generic.c
+++ b/sys/dev/nand/nand_generic.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
+#include <sys/endian.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/rman.h>
@@ -73,7 +74,7 @@ static int small_program_page(device_t, uint32_t, void *, uint32_t, uint32_t);
 static int small_program_oob(device_t, uint32_t, void *, uint32_t, uint32_t);
 
 static int onfi_is_blk_bad(device_t, uint32_t, uint8_t *);
-static int onfi_read_parameter(struct nand_chip *, struct onfi_params *);
+static int onfi_read_parameter(struct nand_chip *, struct onfi_chip_params *);
 
 static int nand_send_address(device_t, int32_t, int32_t, int8_t);
 
@@ -206,7 +207,7 @@ generic_nand_attach(device_t dev)
 {
 	struct nand_chip *chip;
 	struct nandbus_ivar *ivar;
-	struct onfi_params *onfi_params;
+	struct onfi_chip_params *onfi_chip_params;
 	device_t nandbus, nfc;
 	int err;
 
@@ -225,25 +226,24 @@ generic_nand_attach(device_t dev)
 	chip->nand = device_get_softc(nfc);
 
 	if (ivar->is_onfi) {
-		onfi_params = malloc(sizeof(struct onfi_params),
+		onfi_chip_params = malloc(sizeof(struct onfi_chip_params),
 		    M_NAND, M_WAITOK | M_ZERO);
-		if (onfi_params == NULL)
-			return (ENXIO);
+		if (onfi_chip_params == NULL)
+			return (ENOMEM);
 
-		if (onfi_read_parameter(chip, onfi_params)) {
+		if (onfi_read_parameter(chip, onfi_chip_params)) {
 			nand_debug(NDBG_GEN,"Could not read parameter page!\n");
-			free(onfi_params, M_NAND);
+			free(onfi_chip_params, M_NAND);
 			return (ENXIO);
 		}
 
-		nand_onfi_set_params(chip, onfi_params);
+		nand_onfi_set_params(chip, onfi_chip_params);
 		/* Set proper column and row cycles */
-		ivar->cols = (onfi_params->address_cycles >> 4) & 0xf;
-		ivar->rows = onfi_params->address_cycles & 0xf;
-		free(onfi_params, M_NAND);
+		ivar->cols = (onfi_chip_params->address_cycles >> 4) & 0xf;
+		ivar->rows = onfi_chip_params->address_cycles & 0xf;
+		free(onfi_chip_params, M_NAND);
 
 	} else {
-
 		nand_set_params(chip, ivar->params);
 	}
 
@@ -319,10 +319,32 @@ check_fail(device_t nandbus)
 	return (0);
 }
 
+static uint16_t
+onfi_crc(const void *buf, size_t buflen)
+{
+	int i, j;
+	uint16_t crc;
+	const uint8_t *bufptr;
+
+	bufptr = buf;
+	crc = 0x4f4e;
+	for (j = 0; j < buflen; j++) {
+		crc ^= *bufptr++ << 8;
+		for (i = 0; i < 8; i++)
+			if (crc & 0x8000)
+				crc = (crc << 1) ^ 0x8005;
+			else
+				crc <<= 1;
+	}
+       return crc;
+}
+
 static int
-onfi_read_parameter(struct nand_chip *chip, struct onfi_params *params)
+onfi_read_parameter(struct nand_chip *chip, struct onfi_chip_params *chip_params)
 {
 	device_t nandbus;
+	struct onfi_params params;
+	int found, sigcount, trycopy;
 
 	nand_debug(NDBG_GEN,"read parameter");
 
@@ -339,12 +361,44 @@ onfi_read_parameter(struct nand_chip *chip, struct onfi_params *params)
 	if (NANDBUS_START_COMMAND(nandbus))
 		return (ENXIO);
 
-	NANDBUS_READ_BUFFER(nandbus, params, sizeof(struct onfi_params));
+	/*
+	 * XXX Bogus DELAY, we really need a nandbus_wait_ready() here, but it's
+	 * not accessible from here (static to nandbus).
+	 */
+	DELAY(1000);
 
-	/* TODO */
-	/* Check for signature */
-	/* Check CRC */
-	/* Use redundant page if necessary */
+	/*
+	 * The ONFI spec mandates a minimum of three copies of the parameter
+	 * data, so loop up to 3 times trying to find good data.  Each copy is
+	 * validated by a signature of "ONFI" and a crc. There is a very strange
+	 * rule that the signature is valid if any 2 of the 4 bytes are correct.
+	 */
+	for (found= 0, trycopy = 0; !found && trycopy < 3; trycopy++) {
+		NANDBUS_READ_BUFFER(nandbus, &params, sizeof(struct onfi_params));
+		sigcount  = params.signature[0] == 'O';
+		sigcount += params.signature[1] == 'N';
+		sigcount += params.signature[2] == 'F';
+		sigcount += params.signature[3] == 'I';
+		if (sigcount < 2)
+			continue;
+		if (onfi_crc(&params, 254) != params.crc)
+			continue;
+		found = 1;
+	}
+	if (!found)
+		return (ENXIO);
+
+	chip_params->luns = params.luns;
+	chip_params->blocks_per_lun = le32dec(&params.blocks_per_lun);
+	chip_params->pages_per_block = le32dec(&params.pages_per_block);
+	chip_params->bytes_per_page = le32dec(&params.bytes_per_page);
+	chip_params->spare_bytes_per_page = le32dec(&params.spare_bytes_per_page);
+	chip_params->t_bers = le16dec(&params.t_bers);
+	chip_params->t_prog = le16dec(&params.t_prog);
+	chip_params->t_r = le16dec(&params.t_r);
+	chip_params->t_ccs = le16dec(&params.t_ccs);
+	chip_params->features = le16dec(&params.features);
+	chip_params->address_cycles = params.address_cycles;
 
 	return (0);
 }
diff --git a/sys/dev/nand/nand_geom.c b/sys/dev/nand/nand_geom.c
index 2c4915b319b..8786a0a8477 100644
--- a/sys/dev/nand/nand_geom.c
+++ b/sys/dev/nand/nand_geom.c
@@ -193,20 +193,42 @@ nand_ioctl(struct disk *ndisk, u_long cmd, void *data, int fflag,
     struct thread *td)
 {
 	struct nand_chip *chip;
+	struct chip_geom  *cg;
 	struct nand_oob_rw *oob_rw = NULL;
 	struct nand_raw_rw *raw_rw = NULL;
 	device_t nandbus;
+	size_t bufsize = 0, len = 0;
+	size_t raw_size;
+	off_t off;
 	uint8_t *buf = NULL;
 	int ret = 0;
 	uint8_t status;
 
 	chip = (struct nand_chip *)ndisk->d_drv1;
+	cg = &chip->chip_geom;
 	nandbus = device_get_parent(chip->dev);
 
 	if ((cmd == NAND_IO_RAW_READ) || (cmd == NAND_IO_RAW_PROG)) {
 		raw_rw = (struct nand_raw_rw *)data;
-		buf = malloc(raw_rw->len, M_NAND, M_WAITOK);
+		raw_size =  cg->pgs_per_blk * (cg->page_size + cg->oob_size);
+
+		/* Check if len is not bigger than chip size */
+		if (raw_rw->len > raw_size)
+			return (EFBIG);
+
+		/*
+		 * Do not ask for too much memory, in case of large transfers
+		 * read/write in 16-pages chunks
+		 */
+		bufsize = 16 * (cg->page_size + cg->oob_size);
+		if (raw_rw->len < bufsize)
+			bufsize = raw_rw->len;
+
+		buf = malloc(bufsize, M_NAND, M_WAITOK);
+		len = raw_rw->len;
+		off = 0;
 	}
+
 	switch (cmd) {
 	case NAND_IO_ERASE:
 		ret = nand_erase_blocks(chip, ((off_t *)data)[0],
@@ -234,15 +256,38 @@ nand_ioctl(struct disk *ndisk, u_long cmd, void *data, int fflag,
 		break;
 
 	case NAND_IO_RAW_PROG:
-		copyin(raw_rw->data, buf, raw_rw->len);
-		ret = nand_prog_pages_raw(chip, raw_rw->off, buf,
-		    raw_rw->len);
+		while (len > 0) {
+			if (len < bufsize)
+				bufsize = len;
+
+			ret = copyin(raw_rw->data + off, buf, bufsize);
+			if (ret)
+				break;
+			ret = nand_prog_pages_raw(chip, raw_rw->off + off, buf,
+			    bufsize);
+			if (ret)
+				break;
+			len -= bufsize;
+			off += bufsize;
+		}
 		break;
 
 	case NAND_IO_RAW_READ:
-		ret = nand_read_pages_raw(chip, raw_rw->off, buf,
-		    raw_rw->len);
-		copyout(buf, raw_rw->data, raw_rw->len);
+		while (len > 0) {
+			if (len < bufsize)
+				bufsize = len;
+
+			ret = nand_read_pages_raw(chip, raw_rw->off + off, buf,
+			    bufsize);
+			if (ret)
+				break;
+
+			ret = copyout(buf, raw_rw->data + off, bufsize);
+			if (ret)
+				break;
+			len -= bufsize;
+			off += bufsize;
+		}
 		break;
 
 	case NAND_IO_GET_CHIP_PARAM:
diff --git a/sys/dev/nand/nand_id.c b/sys/dev/nand/nand_id.c
index 76c5f9fd3bb..89008085723 100644
--- a/sys/dev/nand/nand_id.c
+++ b/sys/dev/nand/nand_id.c
@@ -47,6 +47,8 @@ struct nand_params nand_ids[] = {
 	    0x80, 0x200, 0x10, 0x20, 0 },
 	{ { NAND_MAN_STMICRO, 0xf1 }, "STMicro 128MB 3,3V 8-bit",
 	    0x80, 2048, 64, 0x40, 0 },
+	{ { NAND_MAN_MICRON, 0xcc }, "Micron NAND 512MiB 3,3V 16-bit",
+	    0x200, 2048, 64, 0x40, 0 },
 };
 
 struct nand_params *nand_get_params(struct nand_id *id)
diff --git a/sys/dev/nand/nandbus.c b/sys/dev/nand/nandbus.c
index a79cd4d365f..5dc2e2fc150 100644
--- a/sys/dev/nand/nandbus.c
+++ b/sys/dev/nand/nandbus.c
@@ -195,8 +195,27 @@ nandbus_attach(device_t dev)
 		if (chip_id.man_id == 0xff)
 			continue;
 
-		/* Check if chip is ONFI compliant */
-		if (nand_probe_onfi(dev, &onfi) != 0) {
+		/*
+		 * First try to get info from the table.  If that fails, see if
+		 * the chip can provide ONFI info.  We check the table first to
+		 * allow table entries to override info from chips that are
+		 * known to provide bad ONFI data.
+		 */
+		onfi = 0;
+		chip_params = nand_get_params(&chip_id);
+		if (chip_params == NULL) {
+			nand_probe_onfi(dev, &onfi);
+		}
+
+		/*
+		 * At this point it appears there is a chip at this chipselect,
+		 * so if we can't work with it, whine about it.
+		 */
+		if (chip_params == NULL && onfi == 0) {
+			if (bootverbose || (nand_debug_flag & NDBG_BUS))
+				printf("Chip params not found, chipsel: %d "
+				    "(manuf: 0x%0x, chipid: 0x%0x, onfi: %d)\n",
+				    cs, chip_id.man_id, chip_id.dev_id, onfi);
 			continue;
 		}
 
@@ -218,15 +237,6 @@ nandbus_attach(device_t dev)
 			continue;
 		}
 
-		chip_params = nand_get_params(&chip_id);
-		if (chip_params == NULL) {
-			nand_debug(NDBG_BUS,"Chip description not found! "
-			    "(manuf: 0x%0x, chipid: 0x%0x)\n",
-			    chip_id.man_id, chip_id.dev_id);
-			free(ivar, M_NAND);
-			continue;
-		}
-
 		ivar->cs = cs;
 		ivar->cols = 1;
 		ivar->rows = 2;
diff --git a/sys/dev/nand/nfc_at91.c b/sys/dev/nand/nfc_at91.c
new file mode 100644
index 00000000000..cdf85249e55
--- /dev/null
+++ b/sys/dev/nand/nfc_at91.c
@@ -0,0 +1,258 @@
+/*-
+ * Copyright (C) 2013 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.
+ */
+
+/*
+ * Atmel at91-family integrated NAND controller driver.
+ *
+ * This code relies on the board setup code (in at91/board_whatever.c) having
+ * set up the EBI and SMC registers appropriately for whatever type of nand part
+ * is on the board.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/proc.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/rman.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/time.h>
+
+#include <machine/bus.h>
+
+#include <dev/nand/nand.h>
+#include <dev/nand/nandbus.h>
+#include "nfc_if.h"
+
+/*
+ * Data cycles are triggered by access to any address within the EBI CS3 region
+ * that has A21 and A22 clear.  Command cycles are any access with bit A21
+ * asserted. Address cycles are any access with bit A22 asserted.
+ *
+ * XXX The atmel docs say that any address bits can be used instead of A21 and
+ * A22; these values should be configurable.
+ */
+#define	AT91_NAND_DATA		0
+#define	AT91_NAND_COMMAND	(1 << 21)
+#define	AT91_NAND_ADDRESS	(1 << 22)
+
+struct at91_nand_softc {
+	struct nand_softc	nand_sc;
+	struct resource		*res;
+};
+
+static int	at91_nand_attach(device_t);
+static int	at91_nand_probe(device_t);
+static uint8_t	at91_nand_read_byte(device_t);
+static void	at91_nand_read_buf(device_t, void *, uint32_t);
+static int	at91_nand_read_rnb(device_t);
+static int	at91_nand_select_cs(device_t, uint8_t);
+static int	at91_nand_send_command(device_t, uint8_t);
+static int	at91_nand_send_address(device_t, uint8_t);
+static void	at91_nand_write_buf(device_t, void *, uint32_t);
+
+static inline u_int8_t
+dev_read_1(struct at91_nand_softc *sc, bus_size_t offset)
+{
+	return bus_read_1(sc->res, offset);
+}
+
+static inline void
+dev_write_1(struct at91_nand_softc *sc, bus_size_t offset, u_int8_t value)
+{
+	bus_write_1(sc->res, offset, value);
+}
+
+static int
+at91_nand_probe(device_t dev)
+{
+
+	device_set_desc(dev, "AT91 Integrated NAND controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+at91_nand_attach(device_t dev)
+{
+	struct at91_nand_softc *sc;
+	int err, rid;
+
+	sc = device_get_softc(dev);
+	rid = 0;
+	sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (sc->res == NULL) {
+		device_printf(dev, "could not allocate resources!\n");
+		return (ENXIO);
+	}
+
+	nand_init(&sc->nand_sc, dev, NAND_ECC_SOFT, 0, 0, NULL, NULL);
+
+	err = nandbus_create(dev);
+
+	return (err);
+}
+
+static int
+at91_nand_send_command(device_t dev, uint8_t command)
+{
+	struct at91_nand_softc *sc;
+
+        /* nand_debug(NDBG_DRV,"at91_nand_send_command: 0x%02x", command); */
+
+	sc = device_get_softc(dev);
+	dev_write_1(sc, AT91_NAND_COMMAND, command);
+	return (0);
+}
+
+static int
+at91_nand_send_address(device_t dev, uint8_t addr)
+{
+	struct at91_nand_softc *sc;
+
+        /* nand_debug(NDBG_DRV,"at91_nand_send_address: x%02x", addr); */
+
+	sc = device_get_softc(dev);
+	dev_write_1(sc, AT91_NAND_ADDRESS, addr);
+	return (0);
+}
+
+static uint8_t
+at91_nand_read_byte(device_t dev)
+{
+	struct at91_nand_softc *sc;
+	uint8_t data;
+
+	sc = device_get_softc(dev);
+	data = dev_read_1(sc, AT91_NAND_DATA);
+
+        /* nand_debug(NDBG_DRV,"at91_nand_read_byte: 0x%02x", data); */
+
+	return (data);
+}
+
+
+static void
+at91_nand_dump_buf(const char *op, void* buf, uint32_t len)
+{
+	int i;
+	uint8_t *b = buf;
+
+	printf("at91_nand_%s_buf (hex):", op);
+	for (i = 0; i < len; i++) {
+		if ((i & 0x01f) == 0)
+			printf("\n");
+		printf(" %02x", b[i]);
+	}
+	printf("\n");
+}
+
+static void
+at91_nand_read_buf(device_t dev, void* buf, uint32_t len)
+{
+	struct at91_nand_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	bus_read_multi_1(sc->res, AT91_NAND_DATA, buf, len);
+
+	if (nand_debug_flag & NDBG_DRV)
+		at91_nand_dump_buf("read", buf, len);
+}
+
+static void
+at91_nand_write_buf(device_t dev, void* buf, uint32_t len)
+{
+	struct at91_nand_softc *sc;
+
+	sc = device_get_softc(dev);
+
+	if (nand_debug_flag & NDBG_DRV)
+		at91_nand_dump_buf("write", buf, len);
+
+	bus_write_multi_1(sc->res, AT91_NAND_DATA, buf, len);
+}
+
+static int
+at91_nand_select_cs(device_t dev, uint8_t cs)
+{
+
+	if (cs > 0)
+		return (ENODEV);
+
+	return (0);
+}
+
+static int
+at91_nand_read_rnb(device_t dev)
+{
+#if 0
+	/*
+         * XXX There's no way for this code to know which GPIO pin (if any) is
+         * attached to the chip's RNB line.  Not to worry, nothing calls this;
+         * at higher layers, all the nand code uses status commands.
+         */
+	uint32_t bits;
+
+	bits = at91_pio_gpio_get(AT91RM92_PIOD_BASE, AT91C_PIO_PD15);
+	nand_debug(NDBG_DRV,"at91_nand: read_rnb: %#x", bits);
+	return (bits != 0); /* ready */
+#endif	
+	panic("at91_nand_read_rnb() is not implemented\n");
+	return (0);
+}
+
+static device_method_t at91_nand_methods[] = {
+	DEVMETHOD(device_probe,		at91_nand_probe),
+	DEVMETHOD(device_attach,	at91_nand_attach),
+
+	DEVMETHOD(nfc_send_command,	at91_nand_send_command),
+	DEVMETHOD(nfc_send_address,	at91_nand_send_address),
+	DEVMETHOD(nfc_read_byte,	at91_nand_read_byte),
+	DEVMETHOD(nfc_read_buf,		at91_nand_read_buf),
+	DEVMETHOD(nfc_write_buf,	at91_nand_write_buf),
+	DEVMETHOD(nfc_select_cs,	at91_nand_select_cs),
+	DEVMETHOD(nfc_read_rnb,		at91_nand_read_rnb),
+
+	DEVMETHOD_END
+};
+
+static driver_t at91_nand_driver = {
+	"nand",
+	at91_nand_methods,
+	sizeof(struct at91_nand_softc),
+};
+
+static devclass_t at91_nand_devclass;
+DRIVER_MODULE(at91_nand, atmelarm, at91_nand_driver, at91_nand_devclass, 0, 0);
+
diff --git a/sys/dev/netmap/if_em_netmap.h b/sys/dev/netmap/if_em_netmap.h
index 5bfbd3d76ad..1ea11238aaa 100644
--- a/sys/dev/netmap/if_em_netmap.h
+++ b/sys/dev/netmap/if_em_netmap.h
@@ -43,35 +43,6 @@ static void	em_netmap_block_tasks(struct adapter *);
 static void	em_netmap_unblock_tasks(struct adapter *);
 
 
-static void
-em_netmap_lock_wrapper(struct ifnet *ifp, int what, u_int queueid)
-{
-	struct adapter *adapter = ifp->if_softc;
-
-	ASSERT(queueid < adapter->num_queues);
-	switch (what) {
-	case NETMAP_CORE_LOCK:
-		EM_CORE_LOCK(adapter);
-		break;
-	case NETMAP_CORE_UNLOCK:
-		EM_CORE_UNLOCK(adapter);
-		break;
-	case NETMAP_TX_LOCK:
-		EM_TX_LOCK(&adapter->tx_rings[queueid]);
-		break;
-	case NETMAP_TX_UNLOCK:
-		EM_TX_UNLOCK(&adapter->tx_rings[queueid]);
-		break;
-	case NETMAP_RX_LOCK:
-		EM_RX_LOCK(&adapter->rx_rings[queueid]);
-		break;
-	case NETMAP_RX_UNLOCK:
-		EM_RX_UNLOCK(&adapter->rx_rings[queueid]);
-		break;
-	}
-}
-
-
 // XXX do we need to block/unblock the tasks ?
 static void
 em_netmap_block_tasks(struct adapter *adapter)
@@ -137,7 +108,7 @@ em_netmap_reg(struct ifnet *ifp, int onoff)
 		ifp->if_capenable |= IFCAP_NETMAP;
 
 		na->if_transmit = ifp->if_transmit;
-		ifp->if_transmit = netmap_start;
+		ifp->if_transmit = netmap_transmit;
 
 		em_init_locked(adapter);
 		if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) == 0) {
@@ -160,7 +131,7 @@ fail:
  * Reconcile kernel and user view of the transmit ring.
  */
 static int
-em_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+em_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct adapter *adapter = ifp->if_softc;
 	struct tx_ring *txr = &adapter->tx_rings[ring_nr];
@@ -176,8 +147,6 @@ em_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	if (k > lim)
 		return netmap_ring_reinit(kring);
 
-	if (do_lock)
-		EM_TX_LOCK(txr);
 	bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map,
 			BUS_DMASYNC_POSTREAD);
 
@@ -202,8 +171,6 @@ em_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			u_int len = slot->len;
 
 			if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) {
-				if (do_lock)
-					EM_TX_UNLOCK(txr);
 				return netmap_ring_reinit(kring);
 			}
 
@@ -252,8 +219,6 @@ em_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	/* update avail to what the kernel knows */
 	ring->avail = kring->nr_hwavail;
 
-	if (do_lock)
-		EM_TX_UNLOCK(txr);
 	return 0;
 }
 
@@ -262,7 +227,7 @@ em_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
  * Reconcile kernel and user view of the receive ring.
  */
 static int
-em_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+em_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct adapter *adapter = ifp->if_softc;
 	struct rx_ring *rxr = &adapter->rx_rings[ring_nr];
@@ -270,16 +235,13 @@ em_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	struct netmap_kring *kring = &na->rx_rings[ring_nr];
 	struct netmap_ring *ring = kring->ring;
 	u_int j, l, n, lim = kring->nkr_num_slots - 1;
-	int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR;
+	int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR;
 	u_int k = ring->cur, resvd = ring->reserved;
 
 	k = ring->cur;
 	if (k > lim)
 		return netmap_ring_reinit(kring);
 
-	if (do_lock)
-		EM_RX_LOCK(rxr);
-
 	/* XXX check sync modes */
 	bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map,
 			BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
@@ -334,8 +296,6 @@ em_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			void *addr = PNMB(slot, &paddr);
 
 			if (addr == netmap_buffer_base) { /* bad buf */
-				if (do_lock)
-					EM_RX_UNLOCK(rxr);
 				return netmap_ring_reinit(kring);
 			}
 
@@ -364,8 +324,6 @@ em_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	}
 	/* tell userspace that there are new packets */
 	ring->avail = kring->nr_hwavail - resvd;
-	if (do_lock)
-		EM_RX_UNLOCK(rxr);
 	return 0;
 }
 
@@ -378,12 +336,11 @@ em_netmap_attach(struct adapter *adapter)
 	bzero(&na, sizeof(na));
 
 	na.ifp = adapter->ifp;
-	na.separate_locks = 1;
+	na.na_flags = NAF_BDG_MAYSLEEP;
 	na.num_tx_desc = adapter->num_tx_desc;
 	na.num_rx_desc = adapter->num_rx_desc;
 	na.nm_txsync = em_netmap_txsync;
 	na.nm_rxsync = em_netmap_rxsync;
-	na.nm_lock = em_netmap_lock_wrapper;
 	na.nm_register = em_netmap_reg;
 	netmap_attach(&na, adapter->num_queues);
 }
diff --git a/sys/dev/netmap/if_igb_netmap.h b/sys/dev/netmap/if_igb_netmap.h
index a94ca3b1883..10d94b5faa3 100644
--- a/sys/dev/netmap/if_igb_netmap.h
+++ b/sys/dev/netmap/if_igb_netmap.h
@@ -38,38 +38,6 @@
 #include <dev/netmap/netmap_kern.h>
 
 
-/*
- * wrapper to export locks to the generic code
- */
-static void
-igb_netmap_lock_wrapper(struct ifnet *ifp, int what, u_int queueid)
-{
-	struct adapter *adapter = ifp->if_softc;
-
-	ASSERT(queueid < adapter->num_queues);
-	switch (what) {
-	case NETMAP_CORE_LOCK:
-		IGB_CORE_LOCK(adapter);
-		break;
-	case NETMAP_CORE_UNLOCK:
-		IGB_CORE_UNLOCK(adapter);
-		break;
-	case NETMAP_TX_LOCK:
-		IGB_TX_LOCK(&adapter->tx_rings[queueid]);
-		break;
-	case NETMAP_TX_UNLOCK:
-		IGB_TX_UNLOCK(&adapter->tx_rings[queueid]);
-		break;
-	case NETMAP_RX_LOCK:
-		IGB_RX_LOCK(&adapter->rx_rings[queueid]);
-		break;
-	case NETMAP_RX_UNLOCK:
-		IGB_RX_UNLOCK(&adapter->rx_rings[queueid]);
-		break;
-	}
-}
-
-
 /*
  * register-unregister routine
  */
@@ -92,7 +60,7 @@ igb_netmap_reg(struct ifnet *ifp, int onoff)
 		ifp->if_capenable |= IFCAP_NETMAP;
 
 		na->if_transmit = ifp->if_transmit;
-		ifp->if_transmit = netmap_start;
+		ifp->if_transmit = netmap_transmit;
 
 		igb_init_locked(adapter);
 		if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) == 0) {
@@ -114,7 +82,7 @@ fail:
  * Reconcile kernel and user view of the transmit ring.
  */
 static int
-igb_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+igb_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct adapter *adapter = ifp->if_softc;
 	struct tx_ring *txr = &adapter->tx_rings[ring_nr];
@@ -130,8 +98,6 @@ igb_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	if (k > lim)
 		return netmap_ring_reinit(kring);
 
-	if (do_lock)
-		IGB_TX_LOCK(txr);
 	bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map,
 	    BUS_DMASYNC_POSTREAD);
 
@@ -153,7 +119,14 @@ igb_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			/* curr is the current slot in the nic ring */
 			union e1000_adv_tx_desc *curr =
 			    (union e1000_adv_tx_desc *)&txr->tx_base[l];
-			struct igb_tx_buffer *txbuf = &txr->tx_buffers[l];
+#ifndef IGB_MEDIA_RESET
+/* at the same time as IGB_MEDIA_RESET was defined, the
+ * tx buffer descriptor was renamed, so use this to revert
+ * back to the old name.
+ */
+#define igb_tx_buf igb_tx_buffer
+#endif
+			struct igb_tx_buf *txbuf = &txr->tx_buffers[l];
 			int flags = ((slot->flags & NS_REPORT) ||
 				j == 0 || j == report_frequency) ?
 					E1000_ADVTXD_DCMD_RS : 0;
@@ -162,8 +135,6 @@ igb_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			u_int len = slot->len;
 
 			if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) {
-				if (do_lock)
-					IGB_TX_UNLOCK(txr);
 				return netmap_ring_reinit(kring);
 			}
 
@@ -223,8 +194,6 @@ igb_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	/* update avail to what the kernel knows */
 	ring->avail = kring->nr_hwavail;
 
-	if (do_lock)
-		IGB_TX_UNLOCK(txr);
 	return 0;
 }
 
@@ -233,7 +202,7 @@ igb_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
  * Reconcile kernel and user view of the receive ring.
  */
 static int
-igb_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+igb_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct adapter *adapter = ifp->if_softc;
 	struct rx_ring *rxr = &adapter->rx_rings[ring_nr];
@@ -241,16 +210,13 @@ igb_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	struct netmap_kring *kring = &na->rx_rings[ring_nr];
 	struct netmap_ring *ring = kring->ring;
 	u_int j, l, n, lim = kring->nkr_num_slots - 1;
-	int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR;
+	int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR;
 	u_int k = ring->cur, resvd = ring->reserved;
 
 	k = ring->cur;
 	if (k > lim)
 		return netmap_ring_reinit(kring);
 
-	if (do_lock)
-		IGB_RX_LOCK(rxr);
-
 	/* XXX check sync modes */
 	bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map,
 	    BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
@@ -303,8 +269,6 @@ igb_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			void *addr = PNMB(slot, &paddr);
 
 			if (addr == netmap_buffer_base) { /* bad buf */
-				if (do_lock)
-					IGB_RX_UNLOCK(rxr);
 				return netmap_ring_reinit(kring);
 			}
 
@@ -332,8 +296,6 @@ igb_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	}
 	/* tell userspace that there are new packets */
 	ring->avail = kring->nr_hwavail - resvd;
-	if (do_lock)
-		IGB_RX_UNLOCK(rxr);
 	return 0;
 }
 
@@ -346,12 +308,11 @@ igb_netmap_attach(struct adapter *adapter)
 	bzero(&na, sizeof(na));
 
 	na.ifp = adapter->ifp;
-	na.separate_locks = 1;
+	na.na_flags = NAF_BDG_MAYSLEEP;
 	na.num_tx_desc = adapter->num_tx_desc;
 	na.num_rx_desc = adapter->num_rx_desc;
 	na.nm_txsync = igb_netmap_txsync;
 	na.nm_rxsync = igb_netmap_rxsync;
-	na.nm_lock = igb_netmap_lock_wrapper;
 	na.nm_register = igb_netmap_reg;
 	netmap_attach(&na, adapter->num_queues);
 }	
diff --git a/sys/dev/netmap/if_lem_netmap.h b/sys/dev/netmap/if_lem_netmap.h
index acef45f0d88..25e5c7c27e3 100644
--- a/sys/dev/netmap/if_lem_netmap.h
+++ b/sys/dev/netmap/if_lem_netmap.h
@@ -39,35 +39,6 @@
 #include <dev/netmap/netmap_kern.h>
 
 
-static void
-lem_netmap_lock_wrapper(struct ifnet *ifp, int what, u_int ringid)
-{
-	struct adapter *adapter = ifp->if_softc;
-
-	/* only one ring here so ignore the ringid */
-	switch (what) {
-	case NETMAP_CORE_LOCK:
-		EM_CORE_LOCK(adapter);
-		break;
-	case NETMAP_CORE_UNLOCK:
-		EM_CORE_UNLOCK(adapter);
-		break;
-	case NETMAP_TX_LOCK:
-		EM_TX_LOCK(adapter);
-		break;
-	case NETMAP_TX_UNLOCK:
-		EM_TX_UNLOCK(adapter);
-		break;
-	case NETMAP_RX_LOCK:
-		EM_RX_LOCK(adapter);
-		break;
-	case NETMAP_RX_UNLOCK:
-		EM_RX_UNLOCK(adapter);
-		break;
-	}
-}
-
-
 /*
  * Register/unregister
  */
@@ -81,6 +52,8 @@ lem_netmap_reg(struct ifnet *ifp, int onoff)
 	if (na == NULL)
 		return EINVAL;
 
+	EM_CORE_LOCK(adapter);
+
 	lem_disable_intr(adapter);
 
 	/* Tell the stack that the interface is no longer active */
@@ -95,7 +68,7 @@ lem_netmap_reg(struct ifnet *ifp, int onoff)
 		ifp->if_capenable |= IFCAP_NETMAP;
 
 		na->if_transmit = ifp->if_transmit;
-		ifp->if_transmit = netmap_start;
+		ifp->if_transmit = netmap_transmit;
 
 		lem_init_locked(adapter);
 		if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) == 0) {
@@ -114,6 +87,8 @@ fail:
 	taskqueue_unblock(adapter->tq); // XXX do we need this ?
 #endif /* !EM_LEGCY_IRQ */
 
+	EM_CORE_UNLOCK(adapter);
+
 	return (error);
 }
 
@@ -122,7 +97,7 @@ fail:
  * Reconcile kernel and user view of the transmit ring.
  */
 static int
-lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct adapter *adapter = ifp->if_softc;
 	struct netmap_adapter *na = NA(ifp);
@@ -133,13 +108,16 @@ lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	/* generate an interrupt approximately every half ring */
 	int report_frequency = kring->nkr_num_slots >> 1;
 
+	ND("%s: hwofs %d, hwcur %d hwavail %d lease %d cur %d avail %d",
+		ifp->if_xname,
+		kring->nkr_hwofs, kring->nr_hwcur, kring->nr_hwavail,
+		kring->nkr_hwlease,
+		ring->cur, ring->avail);
 	/* take a copy of ring->cur now, and never read it again */
 	k = ring->cur;
 	if (k > lim)
 		return netmap_ring_reinit(kring);
 
-	if (do_lock)
-		EM_TX_LOCK(adapter);
 	bus_dmamap_sync(adapter->txdma.dma_tag, adapter->txdma.dma_map,
 			BUS_DMASYNC_POSTREAD);
 	/*
@@ -147,6 +125,8 @@ lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	 * netmap ring, l is the corresponding index in the NIC ring.
 	 */
 	j = kring->nr_hwcur;
+	if (netmap_verbose > 255)
+		RD(5, "device %s send %d->%d", ifp->if_xname, j, k);
 	if (j != k) {	/* we have new packets to send */
 		l = netmap_idx_k2n(kring, j);
 		for (n = 0; j != k; n++) {
@@ -163,13 +143,12 @@ lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			u_int len = slot->len;
 
 			if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) {
-				if (do_lock)
-					EM_TX_UNLOCK(adapter);
 				return netmap_ring_reinit(kring);
 			}
+			ND("slot %d NIC %d %s", j, l, nm_dump_buf(addr, len, 128, NULL));
 
 			slot->flags &= ~NS_REPORT;
-			if (slot->flags & NS_BUF_CHANGED) {
+			if (1 || slot->flags & NS_BUF_CHANGED) {
 				/* buffer has changed, reload map */
 				netmap_reload_map(adapter->txtag, txbuf->map, addr);
 				curr->buffer_addr = htole64(paddr);
@@ -180,11 +159,13 @@ lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			    htole32( adapter->txd_cmd | len |
 				(E1000_TXD_CMD_EOP | flags) );
 
+			ND("len %d kring %d nic %d", len, j, l);
 			bus_dmamap_sync(adapter->txtag, txbuf->map,
 			    BUS_DMASYNC_PREWRITE);
 			j = (j == lim) ? 0 : j + 1;
 			l = (l == lim) ? 0 : l + 1;
 		}
+		ND("sent %d packets from %d, TDT now %d", n, kring->nr_hwcur, l);
 		kring->nr_hwcur = k; /* the saved ring->cur */
 		kring->nr_hwavail -= n;
 
@@ -199,6 +180,7 @@ lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 
 		/* record completed transmissions using TDH */
 		l = E1000_READ_REG(&adapter->hw, E1000_TDH(0));
+		ND("tdh is now %d", l);
 		if (l >= kring->nkr_num_slots) { /* XXX can it happen ? */
 			D("bad TDH %d", l);
 			l -= kring->nkr_num_slots;
@@ -208,6 +190,9 @@ lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			/* some tx completed, increment hwavail. */
 			if (delta < 0)
 				delta += kring->nkr_num_slots;
+			if (netmap_verbose > 255)
+				RD(5, "%s tx recover %d bufs",
+					ifp->if_xname, delta);
 			adapter->next_tx_to_clean = l;
 			kring->nr_hwavail += delta;
 		}
@@ -215,8 +200,6 @@ lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	/* update avail to what the kernel knows */
 	ring->avail = kring->nr_hwavail;
 
-	if (do_lock)
-		EM_TX_UNLOCK(adapter);
 	return 0;
 }
 
@@ -225,21 +208,19 @@ lem_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
  * Reconcile kernel and user view of the receive ring.
  */
 static int
-lem_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+lem_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct adapter *adapter = ifp->if_softc;
 	struct netmap_adapter *na = NA(ifp);
 	struct netmap_kring *kring = &na->rx_rings[ring_nr];
 	struct netmap_ring *ring = kring->ring;
 	int j, l, n, lim = kring->nkr_num_slots - 1;
-	int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR;
+	int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR;
 	u_int k = ring->cur, resvd = ring->reserved;
 
 	if (k > lim)
 		return netmap_ring_reinit(kring);
 
-	if (do_lock)
-		EM_RX_LOCK(adapter);
 
 	/* XXX check sync modes */
 	bus_dmamap_sync(adapter->rxdma.dma_tag, adapter->rxdma.dma_map,
@@ -251,6 +232,10 @@ lem_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	 */
 	l = adapter->next_rx_desc_to_check;
 	j = netmap_idx_n2k(kring, l);
+	ND("%s: next NIC %d kring %d (ofs %d), hwcur %d hwavail %d cur %d avail %d",
+		ifp->if_xname,
+		l, j,  kring->nkr_hwofs, kring->nr_hwcur, kring->nr_hwavail,
+		ring->cur, ring->avail);
 	if (netmap_no_pendintr || force_update) {
 		uint16_t slot_flags = kring->nkr_slot_flags;
 
@@ -266,6 +251,8 @@ lem_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 				D("bogus pkt size at %d", j);
 				len = 0;
 			}
+			ND("\n%s", nm_dump_buf(NMB(&ring->slot[j]),
+				len, 128, NULL));
 			ring->slot[j].len = len;
 			ring->slot[j].flags = slot_flags;
 			bus_dmamap_sync(adapter->rxtag,
@@ -300,8 +287,6 @@ lem_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			void *addr = PNMB(slot, &paddr);
 
 			if (addr == netmap_buffer_base) { /* bad buf */
-				if (do_lock)
-					EM_RX_UNLOCK(adapter);
 				return netmap_ring_reinit(kring);
 			}
 
@@ -332,8 +317,6 @@ lem_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	}
 	/* tell userspace that there are new packets */
 	ring->avail = kring->nr_hwavail - resvd;
-	if (do_lock)
-		EM_RX_UNLOCK(adapter);
 	return 0;
 }
 
@@ -346,12 +329,11 @@ lem_netmap_attach(struct adapter *adapter)
 	bzero(&na, sizeof(na));
 
 	na.ifp = adapter->ifp;
-	na.separate_locks = 1;
+	na.na_flags = NAF_BDG_MAYSLEEP;
 	na.num_tx_desc = adapter->num_tx_desc;
 	na.num_rx_desc = adapter->num_rx_desc;
 	na.nm_txsync = lem_netmap_txsync;
 	na.nm_rxsync = lem_netmap_rxsync;
-	na.nm_lock = lem_netmap_lock_wrapper;
 	na.nm_register = lem_netmap_reg;
 	netmap_attach(&na, 1);
 }
diff --git a/sys/dev/netmap/if_re_netmap.h b/sys/dev/netmap/if_re_netmap.h
index f0f1f1969f4..ac781ccb572 100644
--- a/sys/dev/netmap/if_re_netmap.h
+++ b/sys/dev/netmap/if_re_netmap.h
@@ -38,33 +38,6 @@
 #include <dev/netmap/netmap_kern.h>
 
 
-/*
- * wrapper to export locks to the generic code
- * We should not use the tx/rx locks
- */
-static void
-re_netmap_lock_wrapper(struct ifnet *ifp, int what, u_int queueid)
-{
-	struct rl_softc *adapter = ifp->if_softc;
-
-	switch (what) {
-	case NETMAP_CORE_LOCK:
-		RL_LOCK(adapter);
-		break;
-	case NETMAP_CORE_UNLOCK:
-		RL_UNLOCK(adapter);
-		break;
-
-	case NETMAP_TX_LOCK:
-	case NETMAP_RX_LOCK:
-	case NETMAP_TX_UNLOCK:
-	case NETMAP_RX_UNLOCK:
-		D("invalid lock call %d, no tx/rx locks here", what);
-		break;
-	}
-}
-
-
 /*
  * support for netmap register/unregisted. We are already under core lock.
  * only called on the first register or the last unregister.
@@ -88,7 +61,7 @@ re_netmap_reg(struct ifnet *ifp, int onoff)
 
 		/* save if_transmit to restore it later */
 		na->if_transmit = ifp->if_transmit;
-		ifp->if_transmit = netmap_start;
+		ifp->if_transmit = netmap_transmit;
 
 		re_init_locked(adapter);
 
@@ -111,7 +84,7 @@ fail:
  * Reconcile kernel and user view of the transmit ring.
  */
 static int
-re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct rl_softc *sc = ifp->if_softc;
 	struct rl_txdesc *txd = sc->rl_ldata.rl_tx_desc;
@@ -124,9 +97,6 @@ re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	if (k > lim)
 		return netmap_ring_reinit(kring);
 
-	if (do_lock)
-		RL_LOCK(sc);
-
 	/* Sync the TX descriptor list */
 	bus_dmamap_sync(sc->rl_ldata.rl_tx_list_tag,
             sc->rl_ldata.rl_tx_list_map,
@@ -164,8 +134,6 @@ re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			int len = slot->len;
 
 			if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) {
-				if (do_lock)
-					RL_UNLOCK(sc);
 				// XXX what about prodidx ?
 				return netmap_ring_reinit(kring);
 			}
@@ -200,8 +168,6 @@ re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 		/* start ? */
 		CSR_WRITE_1(sc, sc->rl_txstart, RL_TXSTART_START);
 	}
-	if (do_lock)
-		RL_UNLOCK(sc);
 	return 0;
 }
 
@@ -210,7 +176,7 @@ re_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
  * Reconcile kernel and user view of the receive ring.
  */
 static int
-re_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+re_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct rl_softc *sc = ifp->if_softc;
 	struct rl_rxdesc *rxd = sc->rl_ldata.rl_rx_desc;
@@ -218,15 +184,13 @@ re_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	struct netmap_kring *kring = &na->rx_rings[ring_nr];
 	struct netmap_ring *ring = kring->ring;
 	int j, l, n, lim = kring->nkr_num_slots - 1;
-	int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR;
+	int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR;
 	u_int k = ring->cur, resvd = ring->reserved;
 
 	k = ring->cur;
 	if (k > lim)
 		return netmap_ring_reinit(kring);
 
-	if (do_lock)
-		RL_LOCK(sc);
 	/* XXX check sync modes */
 	bus_dmamap_sync(sc->rl_ldata.rl_rx_list_tag,
 	    sc->rl_ldata.rl_rx_list_map,
@@ -291,8 +255,6 @@ re_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			void *addr = PNMB(slot, &paddr);
 
 			if (addr == netmap_buffer_base) { /* bad buf */
-				if (do_lock)
-					RL_UNLOCK(sc);
 				return netmap_ring_reinit(kring);
 			}
 
@@ -323,8 +285,6 @@ re_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	}
 	/* tell userspace that there are new packets */
 	ring->avail = kring->nr_hwavail - resvd;
-	if (do_lock)
-		RL_UNLOCK(sc);
 	return 0;
 }
 
@@ -411,12 +371,11 @@ re_netmap_attach(struct rl_softc *sc)
 	bzero(&na, sizeof(na));
 
 	na.ifp = sc->rl_ifp;
-	na.separate_locks = 0;
+	na.na_flags = NAF_BDG_MAYSLEEP;
 	na.num_tx_desc = sc->rl_ldata.rl_tx_desc_cnt;
 	na.num_rx_desc = sc->rl_ldata.rl_rx_desc_cnt;
 	na.nm_txsync = re_netmap_txsync;
 	na.nm_rxsync = re_netmap_rxsync;
-	na.nm_lock = re_netmap_lock_wrapper;
 	na.nm_register = re_netmap_reg;
 	netmap_attach(&na, 1);
 }
diff --git a/sys/dev/netmap/ixgbe_netmap.h b/sys/dev/netmap/ixgbe_netmap.h
index be790502c27..fca1cf1e0a9 100644
--- a/sys/dev/netmap/ixgbe_netmap.h
+++ b/sys/dev/netmap/ixgbe_netmap.h
@@ -72,37 +72,6 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, ix_rx_miss,
 SYSCTL_INT(_dev_netmap, OID_AUTO, ix_rx_miss_bufs,
     CTLFLAG_RW, &ix_rx_miss_bufs, 0, "potentially missed rx intr bufs");
 
-/*
- * wrapper to export locks to the generic netmap code.
- */
-static void
-ixgbe_netmap_lock_wrapper(struct ifnet *_a, int what, u_int queueid)
-{
-	struct adapter *adapter = _a->if_softc;
-
-	ASSERT(queueid < adapter->num_queues);
-	switch (what) {
-	case NETMAP_CORE_LOCK:
-		IXGBE_CORE_LOCK(adapter);
-		break;
-	case NETMAP_CORE_UNLOCK:
-		IXGBE_CORE_UNLOCK(adapter);
-		break;
-	case NETMAP_TX_LOCK:
-		IXGBE_TX_LOCK(&adapter->tx_rings[queueid]);
-		break;
-	case NETMAP_TX_UNLOCK:
-		IXGBE_TX_UNLOCK(&adapter->tx_rings[queueid]);
-		break;
-	case NETMAP_RX_LOCK:
-		IXGBE_RX_LOCK(&adapter->rx_rings[queueid]);
-		break;
-	case NETMAP_RX_UNLOCK:
-		IXGBE_RX_UNLOCK(&adapter->rx_rings[queueid]);
-		break;
-	}
-}
-
 
 static void
 set_crcstrip(struct ixgbe_hw *hw, int onoff)
@@ -155,6 +124,7 @@ ixgbe_netmap_reg(struct ifnet *ifp, int onoff)
 	if (na == NULL)
 		return EINVAL; /* no netmap support here */
 
+	IXGBE_CORE_LOCK(adapter);
 	ixgbe_disable_intr(adapter);
 
 	/* Tell the stack that the interface is no longer active */
@@ -166,7 +136,7 @@ ixgbe_netmap_reg(struct ifnet *ifp, int onoff)
 
 		/* save if_transmit and replace with our routine */
 		na->if_transmit = ifp->if_transmit;
-		ifp->if_transmit = netmap_start;
+		ifp->if_transmit = netmap_transmit;
 
 		/*
 		 * reinitialize the adapter, now with netmap flag set,
@@ -186,6 +156,7 @@ fail:
 		ixgbe_init_locked(adapter);	/* also enables intr */
 	}
 	set_crcstrip(&adapter->hw, onoff);
+	IXGBE_CORE_UNLOCK(adapter);
 	return (error);
 }
 
@@ -213,12 +184,11 @@ fail:
  *
  * ring->avail is never used, only checked for bogus values.
  *
- * do_lock is set iff the function is called from the ioctl handler.
- * In this case, grab a lock around the body, and also reclaim transmitted
+ * I flags & FORCE_RECLAIM, reclaim transmitted
  * buffers irrespective of interrupt mitigation.
  */
 static int
-ixgbe_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+ixgbe_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct adapter *adapter = ifp->if_softc;
 	struct tx_ring *txr = &adapter->tx_rings[ring_nr];
@@ -237,8 +207,6 @@ ixgbe_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 
 	if (k > lim)
 		return netmap_ring_reinit(kring);
-	if (do_lock)
-		IXGBE_TX_LOCK(txr);
 
 	bus_dmamap_sync(txr->txdma.dma_tag, txr->txdma.dma_map,
 			BUS_DMASYNC_POSTREAD);
@@ -303,8 +271,6 @@ ixgbe_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 			 */
 			if (addr == netmap_buffer_base || len > NETMAP_BUF_SIZE) {
 ring_reset:
-				if (do_lock)
-					IXGBE_TX_UNLOCK(txr);
 				return netmap_ring_reinit(kring);
 			}
 
@@ -347,7 +313,7 @@ ring_reset:
 	 * In all cases kring->nr_kflags indicates which slot will be
 	 * checked upon a tx interrupt (nkr_num_slots means none).
 	 */
-	if (do_lock) {
+	if (flags & NAF_FORCE_RECLAIM) {
 		j = 1; /* forced reclaim, ignore interrupts */
 		kring->nr_kflags = kring->nkr_num_slots;
 	} else if (kring->nr_hwavail > 0) {
@@ -422,8 +388,6 @@ ring_reset:
 	/* update avail to what the kernel knows */
 	ring->avail = kring->nr_hwavail;
 
-	if (do_lock)
-		IXGBE_TX_UNLOCK(txr);
 	return 0;
 }
 
@@ -442,10 +406,11 @@ ring_reset:
  * from nr_hwavail, make the descriptors available for the next reads,
  * and set kring->nr_hwcur = ring->cur and ring->avail = kring->nr_hwavail.
  *
- * do_lock has a special meaning: please refer to txsync.
+ * If (flags & NAF_FORCE_READ) also check for incoming packets irrespective
+ * of whether or not we received an interrupt.
  */
 static int
-ixgbe_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+ixgbe_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct adapter *adapter = ifp->if_softc;
 	struct rx_ring *rxr = &adapter->rx_rings[ring_nr];
@@ -453,14 +418,12 @@ ixgbe_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	struct netmap_kring *kring = &na->rx_rings[ring_nr];
 	struct netmap_ring *ring = kring->ring;
 	u_int j, l, n, lim = kring->nkr_num_slots - 1;
-	int force_update = do_lock || kring->nr_kflags & NKR_PENDINTR;
+	int force_update = (flags & NAF_FORCE_READ) || kring->nr_kflags & NKR_PENDINTR;
 	u_int k = ring->cur, resvd = ring->reserved;
 
 	if (k > lim)
 		return netmap_ring_reinit(kring);
 
-	if (do_lock)
-		IXGBE_RX_LOCK(rxr);
 	/* XXX check sync modes */
 	bus_dmamap_sync(rxr->rxdma.dma_tag, rxr->rxdma.dma_map,
 			BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
@@ -571,13 +534,9 @@ ixgbe_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	/* tell userspace that there are new packets */
 	ring->avail = kring->nr_hwavail - resvd;
 
-	if (do_lock)
-		IXGBE_RX_UNLOCK(rxr);
 	return 0;
 
 ring_reset:
-	if (do_lock)
-		IXGBE_RX_UNLOCK(rxr);
 	return netmap_ring_reinit(kring);
 }
 
@@ -597,12 +556,11 @@ ixgbe_netmap_attach(struct adapter *adapter)
 	bzero(&na, sizeof(na));
 
 	na.ifp = adapter->ifp;
-	na.separate_locks = 1;	/* this card has separate rx/tx locks */
+	na.na_flags = NAF_BDG_MAYSLEEP;
 	na.num_tx_desc = adapter->num_tx_desc;
 	na.num_rx_desc = adapter->num_rx_desc;
 	na.nm_txsync = ixgbe_netmap_txsync;
 	na.nm_rxsync = ixgbe_netmap_rxsync;
-	na.nm_lock = ixgbe_netmap_lock_wrapper;
 	na.nm_register = ixgbe_netmap_reg;
 	netmap_attach(&na, adapter->num_queues);
 }	
diff --git a/sys/dev/netmap/netmap.c b/sys/dev/netmap/netmap.c
index 139eb899a7b..19be406f6db 100644
--- a/sys/dev/netmap/netmap.c
+++ b/sys/dev/netmap/netmap.c
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 
-#define NM_BRIDGE
 
 /*
  * This module supports memory mapped access to network devices,
@@ -52,18 +51,84 @@
  *    packets on the output interface.
  * 6. select() or poll() can be used to wait for events on individual
  *    transmit or receive queues (or all queues for a given interface).
+ *
+
+		SYNCHRONIZATION (USER)
+
+The netmap rings and data structures may be shared among multiple
+user threads or even independent processes.
+Any synchronization among those threads/processes is delegated
+to the threads themselves. Only one thread at a time can be in
+a system call on the same netmap ring. The OS does not enforce
+this and only guarantees against system crashes in case of
+invalid usage.
+
+		LOCKING (INTERNAL)
+
+Within the kernel, access to the netmap rings is protected as follows:
+
+- a spinlock on each ring, to handle producer/consumer races on
+  RX rings attached to the host stack (against multiple host
+  threads writing from the host stack to the same ring),
+  and on 'destination' rings attached to a VALE switch
+  (i.e. RX rings in VALE ports, and TX rings in NIC/host ports)
+  protecting multiple active senders for the same destination)
+
+- an atomic variable to guarantee that there is at most one
+  instance of *_*xsync() on the ring at any time.
+  For rings connected to user file
+  descriptors, an atomic_test_and_set() protects this, and the
+  lock on the ring is not actually used.
+  For NIC RX rings connected to a VALE switch, an atomic_test_and_set()
+  is also used to prevent multiple executions (the driver might indeed
+  already guarantee this).
+  For NIC TX rings connected to a VALE switch, the lock arbitrates
+  access to the queue (both when allocating buffers and when pushing
+  them out).
+
+- *xsync() should be protected against initializations of the card.
+  On FreeBSD most devices have the reset routine protected by
+  a RING lock (ixgbe, igb, em) or core lock (re). lem is missing
+  the RING protection on rx_reset(), this should be added.
+
+  On linux there is an external lock on the tx path, which probably
+  also arbitrates access to the reset routine. XXX to be revised
+
+- a per-interface core_lock protecting access from the host stack
+  while interfaces may be detached from netmap mode.
+  XXX there should be no need for this lock if we detach the interfaces
+  only while they are down.
+
+
+--- VALE SWITCH ---
+
+NMG_LOCK() serializes all modifications to switches and ports.
+A switch cannot be deleted until all ports are gone.
+
+For each switch, an SX lock (RWlock on linux) protects
+deletion of ports. When configuring or deleting a new port, the
+lock is acquired in exclusive mode (after holding NMG_LOCK).
+When forwarding, the lock is acquired in shared mode (without NMG_LOCK).
+The lock is held throughout the entire forwarding cycle,
+during which the thread may incur in a page fault.
+Hence it is important that sleepable shared locks are used.
+
+On the rx ring, the per-port lock is grabbed initially to reserve
+a number of slot in the ring, then the lock is released,
+packets are copied from source to destination, and then
+the lock is acquired again and the receive ring is updated.
+(A similar thing is done on the tx ring for NIC and host stack
+ports attached to the switch)
+
  */
 
-#ifdef linux
-#include "bsd_glue.h"
-static netdev_tx_t linux_netmap_start(struct sk_buff *skb, struct net_device *dev);
-#endif /* linux */
+/*
+ * OS-specific code that is used only within this file.
+ * Other OS-specific code that must be accessed by drivers
+ * is present in netmap_kern.h
+ */
 
-#ifdef __APPLE__
-#include "osx_glue.h"
-#endif /* __APPLE__ */
-
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__)
 #include <sys/cdefs.h> /* prerequisite */
 __FBSDID("$FreeBSD$");
 
@@ -84,25 +149,143 @@ __FBSDID("$FreeBSD$");
 #include <sys/rwlock.h>
 #include <vm/vm.h>	/* vtophys */
 #include <vm/pmap.h>	/* vtophys */
+#include <vm/vm_param.h>
+#include <vm/vm_object.h>
+#include <vm/vm_page.h>
+#include <vm/vm_pager.h>
+#include <vm/uma.h>
 #include <sys/socket.h> /* sockaddrs */
-#include <machine/bus.h>
 #include <sys/selinfo.h>
 #include <sys/sysctl.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/bpf.h>		/* BIOCIMMEDIATE */
 #include <net/vnet.h>
 #include <machine/bus.h>	/* bus_dmamap_* */
+#include <sys/endian.h>
+#include <sys/refcount.h>
 
-MALLOC_DEFINE(M_NETMAP, "netmap", "Network memory map");
-#endif /* __FreeBSD__ */
+#define prefetch(x)	__builtin_prefetch(x)
 
+#define BDG_RWLOCK_T		struct rwlock // struct rwlock
+
+#define	BDG_RWINIT(b)		\
+	rw_init_flags(&(b)->bdg_lock, "bdg lock", RW_NOWITNESS)
+#define BDG_WLOCK(b)		rw_wlock(&(b)->bdg_lock)
+#define BDG_WUNLOCK(b)		rw_wunlock(&(b)->bdg_lock)
+#define BDG_RLOCK(b)		rw_rlock(&(b)->bdg_lock)
+#define BDG_RTRYLOCK(b)		rw_try_rlock(&(b)->bdg_lock)
+#define BDG_RUNLOCK(b)		rw_runlock(&(b)->bdg_lock)
+#define BDG_RWDESTROY(b)	rw_destroy(&(b)->bdg_lock)
+
+
+/* netmap global lock.
+ * normally called within the user thread (upon a system call)
+ * or when a file descriptor or process is terminated
+ * (last close or last munmap)
+ */
+
+#define NMG_LOCK_T		struct mtx
+#define NMG_LOCK_INIT()		mtx_init(&netmap_global_lock, "netmap global lock", NULL, MTX_DEF)
+#define NMG_LOCK_DESTROY()	mtx_destroy(&netmap_global_lock)
+#define NMG_LOCK()		mtx_lock(&netmap_global_lock)
+#define NMG_UNLOCK()		mtx_unlock(&netmap_global_lock)
+#define NMG_LOCK_ASSERT()	mtx_assert(&netmap_global_lock, MA_OWNED)
+
+
+/* atomic operations */
+#include <machine/atomic.h>
+#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)
+
+
+#elif defined(linux)
+
+#include "bsd_glue.h"
+
+static netdev_tx_t linux_netmap_start_xmit(struct sk_buff *, struct net_device *);
+
+static struct device_driver*
+linux_netmap_find_driver(struct device *dev)
+{
+	struct device_driver *dd;
+
+	while ( (dd = dev->driver) == NULL ) {
+		if ( (dev = dev->parent) == NULL )
+			return NULL;
+	}
+	return dd;
+}
+
+static struct net_device*
+ifunit_ref(const char *name)
+{
+	struct net_device *ifp = dev_get_by_name(&init_net, name);
+	struct device_driver *dd;
+
+	if (ifp == NULL)
+		return NULL;
+
+	if ( (dd = linux_netmap_find_driver(&ifp->dev)) == NULL )
+		goto error;
+
+	if (!try_module_get(dd->owner))
+		goto error;
+
+	return ifp;
+error:
+	dev_put(ifp);
+	return NULL;
+}
+
+static void
+if_rele(struct net_device *ifp)
+{
+	struct device_driver *dd;
+	dd = linux_netmap_find_driver(&ifp->dev);
+	dev_put(ifp);
+	if (dd)
+		module_put(dd->owner);
+}
+
+// XXX a mtx would suffice here too 20130404 gl
+#define NMG_LOCK_T		struct semaphore
+#define NMG_LOCK_INIT()		sema_init(&netmap_global_lock, 1)
+#define NMG_LOCK_DESTROY()	
+#define NMG_LOCK()		down(&netmap_global_lock)
+#define NMG_UNLOCK()		up(&netmap_global_lock)
+#define NMG_LOCK_ASSERT()	//	XXX to be completed
+
+
+#elif defined(__APPLE__)
+
+#warning OSX support is only partial
+#include "osx_glue.h"
+
+#else
+
+#error	Unsupported platform
+
+#endif /* unsupported */
+
+/*
+ * common headers
+ */
 #include <net/netmap.h>
 #include <dev/netmap/netmap_kern.h>
+#include <dev/netmap/netmap_mem2.h>
 
-/* XXX the following variables must be deprecated and included in nm_mem */
+
+MALLOC_DEFINE(M_NETMAP, "netmap", "Network memory map");
+
+/*
+ * The following variables are used by the drivers and replicate
+ * fields in the global memory pool. They only refer to buffers
+ * used by physical interfaces.
+ */
 u_int netmap_total_buffers;
 u_int netmap_buf_size;
-char *netmap_buffer_base;	/* address of an invalid buffer */
+char *netmap_buffer_base;	/* also address of an invalid buffer */
 
 /* user-controlled variables */
 int netmap_verbose;
@@ -126,17 +309,178 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, txsync_retry, CTLFLAG_RW,
 int netmap_drop = 0;	/* debugging */
 int netmap_flags = 0;	/* debug flags */
 int netmap_fwd = 0;	/* force transparent mode */
+int netmap_mmap_unreg = 0; /* allow mmap of unregistered fds */
 
 SYSCTL_INT(_dev_netmap, OID_AUTO, drop, CTLFLAG_RW, &netmap_drop, 0 , "");
 SYSCTL_INT(_dev_netmap, OID_AUTO, flags, CTLFLAG_RW, &netmap_flags, 0 , "");
 SYSCTL_INT(_dev_netmap, OID_AUTO, fwd, CTLFLAG_RW, &netmap_fwd, 0 , "");
+SYSCTL_INT(_dev_netmap, OID_AUTO, mmap_unreg, CTLFLAG_RW, &netmap_mmap_unreg, 0, "");
 
-#ifdef NM_BRIDGE /* support for netmap virtual switch, called VALE */
+NMG_LOCK_T	netmap_global_lock;
+
+/*
+ * protect against multiple threads using the same ring.
+ * also check that the ring has not been stopped.
+ */
+#define NM_KR_BUSY	1
+#define NM_KR_STOPPED	2
+static void nm_kr_put(struct netmap_kring *kr);
+static __inline int nm_kr_tryget(struct netmap_kring *kr)
+{
+	/* check a first time without taking the lock 
+	 * to avoid starvation for nm_kr_get()
+	 */
+	if (unlikely(kr->nkr_stopped)) {
+		ND("ring %p stopped (%d)", kr, kr->nkr_stopped);
+		return NM_KR_STOPPED;
+	}
+	if (unlikely(NM_ATOMIC_TEST_AND_SET(&kr->nr_busy)))
+		return NM_KR_BUSY;
+	/* check a second time with lock held */
+	if (unlikely(kr->nkr_stopped)) {
+		ND("ring %p stopped (%d)", kr, kr->nkr_stopped);
+		nm_kr_put(kr);
+		return NM_KR_STOPPED;
+	}
+	return 0;
+}
+
+static __inline void nm_kr_put(struct netmap_kring *kr)
+{
+	NM_ATOMIC_CLEAR(&kr->nr_busy);
+}
+
+static void nm_kr_get(struct netmap_kring *kr)
+{
+	while (NM_ATOMIC_TEST_AND_SET(&kr->nr_busy))
+		tsleep(kr, 0, "NM_KR_GET", 4);
+}
+
+static void nm_disable_ring(struct netmap_kring *kr)
+{
+	kr->nkr_stopped = 1;
+	nm_kr_get(kr);
+	mtx_lock(&kr->q_lock);
+	mtx_unlock(&kr->q_lock);
+	nm_kr_put(kr);
+}
+
+void netmap_disable_all_rings(struct ifnet *ifp)
+{
+	struct netmap_adapter *na;
+	int i;
+
+	if (!(ifp->if_capenable & IFCAP_NETMAP))
+		return;
+
+	na = NA(ifp);
+
+	for (i = 0; i < na->num_tx_rings + 1; i++) {
+		nm_disable_ring(na->tx_rings + i);
+		selwakeuppri(&na->tx_rings[i].si, PI_NET);
+	}
+	for (i = 0; i < na->num_rx_rings + 1; i++) {
+		nm_disable_ring(na->rx_rings + i);
+		selwakeuppri(&na->rx_rings[i].si, PI_NET);
+	}
+	selwakeuppri(&na->tx_si, PI_NET);
+	selwakeuppri(&na->rx_si, PI_NET);
+}
+
+void netmap_enable_all_rings(struct ifnet *ifp)
+{
+	struct netmap_adapter *na;
+	int i;
+
+	if (!(ifp->if_capenable & IFCAP_NETMAP))
+		return;
+
+	na = NA(ifp);
+	for (i = 0; i < na->num_tx_rings + 1; i++) {
+		D("enabling %p", na->tx_rings + i);
+		na->tx_rings[i].nkr_stopped = 0;
+	}
+	for (i = 0; i < na->num_rx_rings + 1; i++) {
+		D("enabling %p", na->rx_rings + i);
+		na->rx_rings[i].nkr_stopped = 0;
+	}
+}
+
+
+/*
+ * generic bound_checking function
+ */
+u_int
+nm_bound_var(u_int *v, u_int dflt, u_int lo, u_int hi, const char *msg)
+{
+	u_int oldv = *v;
+	const char *op = NULL;
+
+	if (dflt < lo)
+		dflt = lo;
+	if (dflt > hi)
+		dflt = hi;
+	if (oldv < lo) {
+		*v = dflt;
+		op = "Bump";
+	} else if (oldv > hi) {
+		*v = hi;
+		op = "Clamp";
+	}
+	if (op && msg)
+		printf("%s %s to %d (was %d)\n", op, msg, *v, oldv);
+	return *v;
+}
+
+/*
+ * packet-dump function, user-supplied or static buffer.
+ * The destination buffer must be at least 30+4*len
+ */
+const char *
+nm_dump_buf(char *p, int len, int lim, char *dst)
+{
+	static char _dst[8192];
+        int i, j, i0;
+	static char hex[] ="0123456789abcdef";
+	char *o;	/* output position */
+
+#define P_HI(x)	hex[((x) & 0xf0)>>4]
+#define P_LO(x)	hex[((x) & 0xf)]
+#define P_C(x)	((x) >= 0x20 && (x) <= 0x7e ? (x) : '.')
+	if (!dst)
+		dst = _dst;
+	if (lim <= 0 || lim > len)
+		lim = len;
+	o = dst;
+	sprintf(o, "buf 0x%p len %d lim %d\n", p, len, lim);
+	o += strlen(o);
+	/* hexdump routine */
+	for (i = 0; i < lim; ) {
+		sprintf(o, "%5d: ", i);
+		o += strlen(o);
+		memset(o, ' ', 48);
+		i0 = i;
+		for (j=0; j < 16 && i < lim; i++, j++) {
+			o[j*3] = P_HI(p[i]);
+			o[j*3+1] = P_LO(p[i]);
+		}
+		i = i0;
+		for (j=0; j < 16 && i < lim; i++, j++)
+			o[j + 48] = P_C(p[i]);
+		o[j+48] = '\n';
+		o += j+49;
+	}
+	*o = '\0';
+#undef P_HI
+#undef P_LO
+#undef P_C
+	return dst;
+}
 
 /*
  * system parameters (most of them in netmap_kern.h)
  * NM_NAME	prefix for switch port names, default "vale"
- * NM_MAXPORTS	number of ports
+ * NM_BDG_MAXPORTS	number of ports
  * NM_BRIDGES	max number of switches in the system.
  *	XXX should become a sysctl or tunable
  *
@@ -148,33 +492,29 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, fwd, CTLFLAG_RW, &netmap_fwd, 0 , "");
  * for rings and buffers.
  * The virtual interfaces use per-queue lock instead of core lock.
  * In the tx loop, we aggregate traffic in batches to make all operations
- * faster. The batch size is NM_BDG_BATCH
+ * faster. The batch size is bridge_batch.
  */
 #define NM_BDG_MAXRINGS		16	/* XXX unclear how many. */
+#define NM_BDG_MAXSLOTS		4096	/* XXX same as above */
 #define NM_BRIDGE_RINGSIZE	1024	/* in the device */
 #define NM_BDG_HASH		1024	/* forwarding table entries */
 #define NM_BDG_BATCH		1024	/* entries in the forwarding buffer */
+#define NM_MULTISEG		64	/* max size of a chain of bufs */
+/* actual size of the tables */
+#define NM_BDG_BATCH_MAX	(NM_BDG_BATCH + NM_MULTISEG)
+/* NM_FT_NULL terminates a list of slots in the ft */
+#define NM_FT_NULL		NM_BDG_BATCH_MAX
 #define	NM_BRIDGES		8	/* number of bridges */
 
 
-int netmap_bridge = NM_BDG_BATCH; /* bridge batch size */
-SYSCTL_INT(_dev_netmap, OID_AUTO, bridge, CTLFLAG_RW, &netmap_bridge, 0 , "");
+/*
+ * bridge_batch is set via sysctl to the max batch size to be
+ * used in the bridge. The actual value may be larger as the
+ * last packet in the block may overflow the size.
+ */
+int bridge_batch = NM_BDG_BATCH; /* bridge batch size */
+SYSCTL_INT(_dev_netmap, OID_AUTO, bridge_batch, CTLFLAG_RW, &bridge_batch, 0 , "");
 
-#ifdef linux
-
-#define	refcount_acquire(_a)	atomic_add(1, (atomic_t *)_a)
-#define	refcount_release(_a)	atomic_dec_and_test((atomic_t *)_a)
-
-#else /* !linux */
-
-#ifdef __FreeBSD__
-#include <sys/endian.h>
-#include <sys/refcount.h>
-#endif /* __FreeBSD__ */
-
-#define prefetch(x)	__builtin_prefetch(x)
-
-#endif /* !linux */
 
 /*
  * These are used to handle reference counters for bridge ports.
@@ -182,54 +522,79 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, bridge, CTLFLAG_RW, &netmap_bridge, 0 , "");
 #define	ADD_BDG_REF(ifp)	refcount_acquire(&NA(ifp)->na_bdg_refcount)
 #define	DROP_BDG_REF(ifp)	refcount_release(&NA(ifp)->na_bdg_refcount)
 
-static void bdg_netmap_attach(struct netmap_adapter *);
-static int bdg_netmap_reg(struct ifnet *ifp, int onoff);
-static int kern_netmap_regif(struct nmreq *nmr);
+/* The bridge references the buffers using the device specific look up table */
+static inline void *
+BDG_NMB(struct netmap_mem_d *nmd, struct netmap_slot *slot)
+{
+	struct lut_entry *lut = nmd->pools[NETMAP_BUF_POOL].lut;
+	uint32_t i = slot->buf_idx;
+	return (unlikely(i >= nmd->pools[NETMAP_BUF_POOL].objtotal)) ?  lut[0].vaddr : lut[i].vaddr;
+}
 
-/* per-tx-queue entry */
+static int bdg_netmap_attach(struct netmap_adapter *);
+static int bdg_netmap_reg(struct ifnet *ifp, int onoff);
+int kern_netmap_regif(struct nmreq *nmr);
+
+/*
+ * Each transmit queue accumulates a batch of packets into
+ * a structure before forwarding. Packets to the same
+ * destination are put in a list using ft_next as a link field.
+ * ft_frags and ft_next are valid only on the first fragment.
+ */
 struct nm_bdg_fwd {	/* forwarding entry for a bridge */
-	void *ft_buf;
-	uint16_t _ft_dst;	/* dst port, unused */
+	void *ft_buf;		/* netmap or indirect buffer */
+	uint8_t ft_frags;	/* how many fragments (only on 1st frag) */
+	uint8_t _ft_port;	/* dst port (unused) */
 	uint16_t ft_flags;	/* flags, e.g. indirect */
-	uint16_t ft_len;	/* src len */
+	uint16_t ft_len;	/* src fragment len */
 	uint16_t ft_next;	/* next packet to same destination */
 };
 
-/* We need to build a list of buffers going to each destination.
- * Each buffer is in one entry of struct nm_bdg_fwd, we use ft_next
- * to build the list, and struct nm_bdg_q below for the queue.
- * The structure should compact because potentially we have a lot
- * of destinations.
+/*
+ * For each output interface, nm_bdg_q is used to construct a list.
+ * bq_len is the number of output buffers (we can have coalescing
+ * during the copy).
  */
 struct nm_bdg_q {
 	uint16_t bq_head;
 	uint16_t bq_tail;
+	uint32_t bq_len;	/* number of buffers */
 };
 
+/* XXX revise this */
 struct nm_hash_ent {
 	uint64_t	mac;	/* the top 2 bytes are the epoch */
 	uint64_t	ports;
 };
 
 /*
+ * nm_bridge is a descriptor for a VALE switch.
  * Interfaces for a bridge are all in bdg_ports[].
  * The array has fixed size, an empty entry does not terminate
- * the search. But lookups only occur on attach/detach so we
+ * the search, but lookups only occur on attach/detach so we
  * don't mind if they are slow.
  *
- * The bridge is non blocking on the transmit ports.
+ * The bridge is non blocking on the transmit ports: excess
+ * packets are dropped if there is no room on the output port.
  *
  * bdg_lock protects accesses to the bdg_ports array.
  * This is a rw lock (or equivalent).
  */
 struct nm_bridge {
-	int namelen;	/* 0 means free */
-
 	/* XXX what is the proper alignment/layout ? */
-	NM_RWLOCK_T bdg_lock;	/* protects bdg_ports */
+	BDG_RWLOCK_T	bdg_lock;	/* protects bdg_ports */
+	int		bdg_namelen;
+	uint32_t	bdg_active_ports; /* 0 means free */
+	char		bdg_basename[IFNAMSIZ];
+
+	/* Indexes of active ports (up to active_ports)
+	 * and all other remaining ports.
+	 */
+	uint8_t		bdg_port_index[NM_BDG_MAXPORTS];
+
 	struct netmap_adapter *bdg_ports[NM_BDG_MAXPORTS];
 
-	char basename[IFNAMSIZ];
+
 	/*
 	 * The function to decide the destination port.
 	 * It returns either of an index of the destination port,
@@ -241,41 +606,43 @@ struct nm_bridge {
 	 */
 	bdg_lookup_fn_t nm_bdg_lookup;
 
-	/* the forwarding table, MAC+ports */
+	/* the forwarding table, MAC+ports.
+	 * XXX should be changed to an argument to be passed to
+	 * the lookup function, and allocated on attach
+	 */
 	struct nm_hash_ent ht[NM_BDG_HASH];
 };
 
-struct nm_bridge nm_bridges[NM_BRIDGES];
-NM_LOCK_T	netmap_bridge_mutex;
 
-/* other OS will have these macros defined in their own glue code. */
-
-#ifdef __FreeBSD__
-#define BDG_LOCK()		mtx_lock(&netmap_bridge_mutex)
-#define BDG_UNLOCK()		mtx_unlock(&netmap_bridge_mutex)
-#define BDG_WLOCK(b)		rw_wlock(&(b)->bdg_lock)
-#define BDG_WUNLOCK(b)		rw_wunlock(&(b)->bdg_lock)
-#define BDG_RLOCK(b)		rw_rlock(&(b)->bdg_lock)
-#define BDG_RUNLOCK(b)		rw_runlock(&(b)->bdg_lock)
-
-/* set/get variables. OS-specific macros may wrap these
- * assignments into read/write lock or similar
+/*
+ * XXX in principle nm_bridges could be created dynamically
+ * Right now we have a static array and deletions are protected
+ * by an exclusive lock.
  */
-#define BDG_SET_VAR(lval, p)	(lval = p)
-#define BDG_GET_VAR(lval)	(lval)
-#define BDG_FREE(p)		free(p, M_DEVBUF)
-#endif /* __FreeBSD__ */
+struct nm_bridge nm_bridges[NM_BRIDGES];
 
-static __inline int
+
+/*
+ * A few function to tell which kind of port are we using.
+ * XXX should we hold a lock ?
+ *
+ * nma_is_vp()		virtual port
+ * nma_is_host()	port connected to the host stack
+ * nma_is_hw()		port connected to a NIC
+ */
+int nma_is_vp(struct netmap_adapter *na);
+int
 nma_is_vp(struct netmap_adapter *na)
 {
 	return na->nm_register == bdg_netmap_reg;
 }
+
 static __inline int
 nma_is_host(struct netmap_adapter *na)
 {
 	return na->nm_register == NULL;
 }
+
 static __inline int
 nma_is_hw(struct netmap_adapter *na)
 {
@@ -283,11 +650,12 @@ nma_is_hw(struct netmap_adapter *na)
 	return !nma_is_vp(na) && !nma_is_host(na);
 }
 
+
 /*
- * Regarding holding a NIC, if the NIC is owned by the kernel
+ * If the NIC is owned by the kernel
  * (i.e., bridge), neither another bridge nor user can use it;
  * if the NIC is owned by a user, only users can share it.
- * Evaluation must be done under NMA_LOCK().
+ * Evaluation must be done under NMG_LOCK().
  */
 #define NETMAP_OWNED_BY_KERN(ifp)	(!nma_is_vp(NA(ifp)) && NA(ifp)->na_bdg)
 #define NETMAP_OWNED_BY_ANY(ifp) \
@@ -297,14 +665,22 @@ nma_is_hw(struct netmap_adapter *na)
  * NA(ifp)->bdg_port	port index
  */
 
-// XXX only for multiples of 64 bytes, non overlapped.
+
+/*
+ * this is a slightly optimized copy routine which rounds
+ * to multiple of 64 bytes and is often faster than dealing
+ * with other odd sizes. We assume there is enough room
+ * in the source and destination buffers.
+ *
+ * XXX only for multiples of 64 bytes, non overlapped.
+ */
 static inline void
 pkt_copy(void *_src, void *_dst, int l)
 {
         uint64_t *src = _src;
         uint64_t *dst = _dst;
         if (unlikely(l >= 1024)) {
-                bcopy(src, dst, l);
+                memcpy(dst, src, l);
                 return;
         }
         for (; likely(l > 0); l-=64) {
@@ -322,6 +698,8 @@ pkt_copy(void *_src, void *_dst, int l)
 
 /*
  * locate a bridge among the existing ones.
+ * MUST BE CALLED WITH NMG_LOCK()
+ *
  * a ':' in the name terminates the bridge name. Otherwise, just NM_NAME.
  * We assume that this is called with a name of at least NM_NAME chars.
  */
@@ -331,8 +709,14 @@ nm_find_bridge(const char *name, int create)
 	int i, l, namelen;
 	struct nm_bridge *b = NULL;
 
+	NMG_LOCK_ASSERT();
+
 	namelen = strlen(NM_NAME);	/* base length */
-	l = strlen(name);		/* actual length */
+	l = name ? strlen(name) : 0;		/* actual length */
+	if (l < namelen) {
+		D("invalid bridge name %s", name ? name : NULL);
+		return NULL;
+	}
 	for (i = namelen + 1; i < l; i++) {
 		if (name[i] == ':') {
 			namelen = i;
@@ -343,31 +727,35 @@ nm_find_bridge(const char *name, int create)
 		namelen = IFNAMSIZ;
 	ND("--- prefix is '%.*s' ---", namelen, name);
 
-	BDG_LOCK();
 	/* lookup the name, remember empty slot if there is one */
 	for (i = 0; i < NM_BRIDGES; i++) {
 		struct nm_bridge *x = nm_bridges + i;
 
-		if (x->namelen == 0) {
+		if (x->bdg_active_ports == 0) {
 			if (create && b == NULL)
 				b = x;	/* record empty slot */
-		} else if (x->namelen != namelen) {
+		} else if (x->bdg_namelen != namelen) {
 			continue;
-		} else if (strncmp(name, x->basename, namelen) == 0) {
+		} else if (strncmp(name, x->bdg_basename, namelen) == 0) {
 			ND("found '%.*s' at %d", namelen, name, i);
 			b = x;
 			break;
 		}
 	}
 	if (i == NM_BRIDGES && b) { /* name not found, can create entry */
-		strncpy(b->basename, name, namelen);
-		b->namelen = namelen;
+		/* initialize the bridge */
+		strncpy(b->bdg_basename, name, namelen);
+		ND("create new bridge %s with ports %d", b->bdg_basename,
+			b->bdg_active_ports);
+		b->bdg_namelen = namelen;
+		b->bdg_active_ports = 0;
+		for (i = 0; i < NM_BDG_MAXPORTS; i++)
+			b->bdg_port_index[i] = i;
 		/* set the default function */
 		b->nm_bdg_lookup = netmap_bdg_learning;
 		/* reset the MAC address table */
 		bzero(b->ht, sizeof(struct nm_hash_ent) * NM_BDG_HASH);
 	}
-	BDG_UNLOCK();
 	return b;
 }
 
@@ -381,6 +769,7 @@ nm_free_bdgfwd(struct netmap_adapter *na)
 	int nrings, i;
 	struct netmap_kring *kring;
 
+	NMG_LOCK_ASSERT();
 	nrings = nma_is_vp(na) ? na->num_tx_rings : na->num_rx_rings;
 	kring = nma_is_vp(na) ? na->tx_rings : na->rx_rings;
 	for (i = 0; i < nrings; i++) {
@@ -403,11 +792,12 @@ nm_alloc_bdgfwd(struct netmap_adapter *na)
 	int nrings, l, i, num_dstq;
 	struct netmap_kring *kring;
 
+	NMG_LOCK_ASSERT();
 	/* all port:rings + broadcast */
 	num_dstq = NM_BDG_MAXPORTS * NM_BDG_MAXRINGS + 1;
-	l = sizeof(struct nm_bdg_fwd) * NM_BDG_BATCH;
+	l = sizeof(struct nm_bdg_fwd) * NM_BDG_BATCH_MAX;
 	l += sizeof(struct nm_bdg_q) * num_dstq;
-	l += sizeof(uint16_t) * NM_BDG_BATCH;
+	l += sizeof(uint16_t) * NM_BDG_BATCH_MAX;
 
 	nrings = nma_is_vp(na) ? na->num_tx_rings : na->num_rx_rings;
 	kring = nma_is_vp(na) ? na->tx_rings : na->rx_rings;
@@ -421,9 +811,11 @@ nm_alloc_bdgfwd(struct netmap_adapter *na)
 			nm_free_bdgfwd(na);
 			return ENOMEM;
 		}
-		dstq = (struct nm_bdg_q *)(ft + NM_BDG_BATCH);
-		for (j = 0; j < num_dstq; j++)
-			dstq[j].bq_head = dstq[j].bq_tail = NM_BDG_BATCH;
+		dstq = (struct nm_bdg_q *)(ft + NM_BDG_BATCH_MAX);
+		for (j = 0; j < num_dstq; j++) {
+			dstq[j].bq_head = dstq[j].bq_tail = NM_FT_NULL;
+			dstq[j].bq_len = 0;
+		}
 		kring[i].nkr_ft = ft;
 	}
 	if (nma_is_hw(na))
@@ -431,8 +823,6 @@ nm_alloc_bdgfwd(struct netmap_adapter *na)
 	return 0;
 }
 
-#endif /* NM_BRIDGE */
-
 
 /*
  * Fetch configuration from the device, to cope with dynamic
@@ -478,9 +868,15 @@ netmap_update_config(struct netmap_adapter *na)
 	return 1;
 }
 
-/*------------- memory allocator -----------------*/
-#include "netmap_mem2.c"
-/*------------ end of memory allocator ----------*/
+static struct netmap_if *
+netmap_if_new(const char *ifname, struct netmap_adapter *na)
+{
+	if (netmap_update_config(na)) {
+		/* configuration mismatch, report and fail */
+		return NULL;
+	}
+	return netmap_mem_if_new(ifname, na);
+}
 
 
 /* Structure associated to each thread which registered an interface.
@@ -506,49 +902,99 @@ netmap_update_config(struct netmap_adapter *na)
  * private structure is destroyed.
  */
 struct netmap_priv_d {
-	struct netmap_if * volatile np_nifp;	/* netmap interface descriptor. */
+	struct netmap_if * volatile np_nifp;	/* netmap if descriptor. */
 
-	struct ifnet	*np_ifp;	/* device for which we hold a reference */
+	struct ifnet	*np_ifp;	/* device for which we hold a ref. */
 	int		np_ringid;	/* from the ioctl */
 	u_int		np_qfirst, np_qlast;	/* range of rings to scan */
 	uint16_t	np_txpoll;
 
-	unsigned long	ref_done;	/* use with NMA_LOCK held */
+	struct netmap_mem_d *np_mref;	/* use with NMG_LOCK held */
+#ifdef __FreeBSD__
+	int		np_refcount;	/* use with NMG_LOCK held */
+#endif /* __FreeBSD__ */
 };
 
+/* grab a reference to the memory allocator, if we don't have one already.  The
+ * reference is taken from the netmap_adapter registered with the priv.
+ *
+ */
+static int
+netmap_get_memory_locked(struct netmap_priv_d* p)
+{
+	struct netmap_mem_d *nmd;
+	int error = 0;
+
+	if (p->np_ifp == NULL) {
+		if (!netmap_mmap_unreg)
+			return ENODEV;
+		/* for compatibility with older versions of the API
+ 		 * we use the global allocator when no interface has been
+ 		 * registered
+ 		 */
+		nmd = &nm_mem;
+	} else {
+		nmd = NA(p->np_ifp)->nm_mem;
+	}
+	if (p->np_mref == NULL) {
+		error = netmap_mem_finalize(nmd);
+		if (!error)
+			p->np_mref = nmd;
+	} else if (p->np_mref != nmd) {
+		/* a virtual port has been registered, but previous
+ 		 * syscalls already used the global allocator.
+ 		 * We cannot continue
+ 		 */
+		error = ENODEV;
+	}
+	return error;
+}
 
 static int
 netmap_get_memory(struct netmap_priv_d* p)
 {
-	int error = 0;
-	NMA_LOCK();
-	if (!p->ref_done) {
-		error = netmap_memory_finalize();
-		if (!error)
-			p->ref_done = 1;
-	}
-	NMA_UNLOCK();
+	int error;
+	NMG_LOCK();
+	error = netmap_get_memory_locked(p);
+	NMG_UNLOCK();
 	return error;
 }
 
+static int
+netmap_have_memory_locked(struct netmap_priv_d* p)
+{
+	return p->np_mref != NULL;
+}
+
+static void
+netmap_drop_memory_locked(struct netmap_priv_d* p)
+{
+	if (p->np_mref) {
+		netmap_mem_deref(p->np_mref);
+		p->np_mref = NULL;
+	}
+}
+
 /*
  * File descriptor's private data destructor.
  *
  * Call nm_register(ifp,0) to stop netmap mode on the interface and
  * revert to normal operation. We expect that np_ifp has not gone.
+ * The second argument is the nifp to work on. In some cases it is
+ * not attached yet to the netmap_priv_d so we need to pass it as
+ * a separate argument.
  */
-/* call with NMA_LOCK held */
+/* call with NMG_LOCK held */
 static void
-netmap_dtor_locked(void *data)
+netmap_do_unregif(struct netmap_priv_d *priv, struct netmap_if *nifp)
 {
-	struct netmap_priv_d *priv = data;
 	struct ifnet *ifp = priv->np_ifp;
 	struct netmap_adapter *na = NA(ifp);
-	struct netmap_if *nifp = priv->np_nifp;
 
+	NMG_LOCK_ASSERT();
 	na->refcount--;
 	if (na->refcount <= 0) {	/* last instance */
-		u_int i, j, lim;
+		u_int i;
 
 		if (netmap_verbose)
 			D("deleting last instance for %s", ifp->if_xname);
@@ -557,59 +1003,54 @@ netmap_dtor_locked(void *data)
 		 * when the last reference to this file descriptor goes
 		 * away. This means we cannot have any pending poll()
 		 * or interrupt routine operating on the structure.
+		 * XXX The file may be closed in a thread while
+		 * another thread is using it.
+		 * Linux keeps the file opened until the last reference
+		 * by any outstanding ioctl/poll or mmap is gone.
+		 * FreeBSD does not track mmap()s (but we do) and
+		 * wakes up any sleeping poll(). Need to check what
+		 * happens if the close() occurs while a concurrent
+		 * syscall is running.
 		 */
 		na->nm_register(ifp, 0); /* off, clear IFCAP_NETMAP */
 		/* Wake up any sleeping threads. netmap_poll will
 		 * then return POLLERR
+		 * XXX The wake up now must happen during *_down(), when
+		 * we order all activities to stop. -gl
 		 */
-		for (i = 0; i < na->num_tx_rings + 1; i++)
-			selwakeuppri(&na->tx_rings[i].si, PI_NET);
-		for (i = 0; i < na->num_rx_rings + 1; i++)
-			selwakeuppri(&na->rx_rings[i].si, PI_NET);
-		selwakeuppri(&na->tx_si, PI_NET);
-		selwakeuppri(&na->rx_si, PI_NET);
-#ifdef NM_BRIDGE
 		nm_free_bdgfwd(na);
-#endif /* NM_BRIDGE */
-		/* release all buffers */
 		for (i = 0; i < na->num_tx_rings + 1; i++) {
-			struct netmap_ring *ring = na->tx_rings[i].ring;
-			lim = na->tx_rings[i].nkr_num_slots;
-			for (j = 0; j < lim; j++)
-				netmap_free_buf(nifp, ring->slot[j].buf_idx);
-			/* knlist_destroy(&na->tx_rings[i].si.si_note); */
 			mtx_destroy(&na->tx_rings[i].q_lock);
 		}
 		for (i = 0; i < na->num_rx_rings + 1; i++) {
-			struct netmap_ring *ring = na->rx_rings[i].ring;
-			lim = na->rx_rings[i].nkr_num_slots;
-			for (j = 0; j < lim; j++)
-				netmap_free_buf(nifp, ring->slot[j].buf_idx);
-			/* knlist_destroy(&na->rx_rings[i].si.si_note); */
 			mtx_destroy(&na->rx_rings[i].q_lock);
 		}
 		/* XXX kqueue(9) needed; these will mirror knlist_init. */
 		/* knlist_destroy(&na->tx_si.si_note); */
 		/* knlist_destroy(&na->rx_si.si_note); */
-		netmap_free_rings(na);
 		if (nma_is_hw(na))
 			SWNA(ifp)->tx_rings = SWNA(ifp)->rx_rings = NULL;
 	}
-	netmap_if_free(nifp);
+	/*
+	 * netmap_mem_if_delete() deletes the nifp, and if this is
+	 * the last instance also buffers, rings and krings.
+	 */
+	netmap_mem_if_delete(na, nifp);
 }
 
 
-/* we assume netmap adapter exists */
+/* we assume netmap adapter exists
+ * Called with NMG_LOCK held
+ */
 static void
 nm_if_rele(struct ifnet *ifp)
 {
-#ifndef NM_BRIDGE
-	if_rele(ifp);
-#else /* NM_BRIDGE */
-	int i, full = 0, is_hw;
+	int i, is_hw, hw, sw, lim;
 	struct nm_bridge *b;
 	struct netmap_adapter *na;
+	uint8_t tmp[NM_BDG_MAXPORTS];
 
+	NMG_LOCK_ASSERT();
 	/* I can be called not only for get_ifp()-ed references where netmap's
 	 * capability is guaranteed, but also for non-netmap-capable NICs.
 	 */
@@ -617,202 +1058,278 @@ nm_if_rele(struct ifnet *ifp)
 		if_rele(ifp);
 		return;
 	}
-	if (!DROP_BDG_REF(ifp))
-		return;
-
 	na = NA(ifp);
 	b = na->na_bdg;
 	is_hw = nma_is_hw(na);
 
-	BDG_WLOCK(b);
-	ND("want to disconnect %s from the bridge", ifp->if_xname);
-	full = 0;
-	/* remove the entry from the bridge, also check
-	 * if there are any leftover interfaces
-	 * XXX we should optimize this code, e.g. going directly
-	 * to na->bdg_port, and having a counter of ports that
-	 * are connected. But it is not in a critical path.
-	 * In NIC's case, index of sw na is always higher than hw na
-	 */
-	for (i = 0; i < NM_BDG_MAXPORTS; i++) {
-		struct netmap_adapter *tmp = BDG_GET_VAR(b->bdg_ports[i]);
+	ND("%s has %d references", ifp->if_xname, NA(ifp)->na_bdg_refcount);
 
-		if (tmp == na) {
-			/* disconnect from bridge */
-			BDG_SET_VAR(b->bdg_ports[i], NULL);
-			na->na_bdg = NULL;
-			if (is_hw && SWNA(ifp)->na_bdg) {
-				/* disconnect sw adapter too */
-				int j = SWNA(ifp)->bdg_port;
-				BDG_SET_VAR(b->bdg_ports[j], NULL);
-				SWNA(ifp)->na_bdg = NULL;
-			}
-		} else if (tmp != NULL) {
-			full = 1;
+	if (!DROP_BDG_REF(ifp))
+		return;
+
+	/*
+	New algorithm:
+	make a copy of bdg_port_index;
+	lookup NA(ifp)->bdg_port and SWNA(ifp)->bdg_port
+	in the array of bdg_port_index, replacing them with
+	entries from the bottom of the array;
+	decrement bdg_active_ports;
+	acquire BDG_WLOCK() and copy back the array.
+	 */
+	
+	hw = NA(ifp)->bdg_port;
+	sw = (is_hw && SWNA(ifp)->na_bdg) ? SWNA(ifp)->bdg_port : -1;
+	lim = b->bdg_active_ports;
+
+	ND("detach %d and %d (lim %d)", hw, sw, lim);
+	/* make a copy of the list of active ports, update it,
+	 * and then copy back within BDG_WLOCK().
+	 */
+	memcpy(tmp, b->bdg_port_index, sizeof(tmp));
+	for (i = 0; (hw >= 0 || sw >= 0) && i < lim; ) {
+		if (hw >= 0 && tmp[i] == hw) {
+			ND("detach hw %d at %d", hw, i);
+			lim--; /* point to last active port */
+			tmp[i] = tmp[lim]; /* swap with i */
+			tmp[lim] = hw;	/* now this is inactive */
+			hw = -1;
+		} else if (sw >= 0 && tmp[i] == sw) {
+			ND("detach sw %d at %d", sw, i);
+			lim--;
+			tmp[i] = tmp[lim];
+			tmp[lim] = sw;
+			sw = -1;
+		} else {
+			i++;
 		}
 	}
+	if (hw >= 0 || sw >= 0) {
+		D("XXX delete failed hw %d sw %d, should panic...", hw, sw);
+	}
+	hw = NA(ifp)->bdg_port;
+	sw = (is_hw && SWNA(ifp)->na_bdg) ?  SWNA(ifp)->bdg_port : -1;
+
+	BDG_WLOCK(b);
+	b->bdg_ports[hw] = NULL;
+	na->na_bdg = NULL;
+	if (sw >= 0) {
+		b->bdg_ports[sw] = NULL;
+		SWNA(ifp)->na_bdg = NULL;
+	}
+	memcpy(b->bdg_port_index, tmp, sizeof(tmp));
+	b->bdg_active_ports = lim;
 	BDG_WUNLOCK(b);
-	if (full == 0) {
-		ND("marking bridge %d as free", b - nm_bridges);
-		b->namelen = 0;
+
+	ND("now %d active ports", lim);
+	if (lim == 0) {
+		ND("marking bridge %s as free", b->bdg_basename);
 		b->nm_bdg_lookup = NULL;
 	}
-	if (na->na_bdg) { /* still attached to the bridge */
-		D("ouch, cannot find ifp to remove");
-	} else if (is_hw) {
+
+	if (is_hw) {
 		if_rele(ifp);
 	} else {
+		if (na->na_flags & NAF_MEM_OWNER)
+			netmap_mem_private_delete(na->nm_mem);
 		bzero(na, sizeof(*na));
 		free(na, M_DEVBUF);
 		bzero(ifp, sizeof(*ifp));
 		free(ifp, M_DEVBUF);
 	}
-#endif /* NM_BRIDGE */
+}
+
+
+/*
+ * returns 1 if this is the last instance and we can free priv
+ */
+static int
+netmap_dtor_locked(struct netmap_priv_d *priv)
+{
+	struct ifnet *ifp = priv->np_ifp;
+
+#ifdef __FreeBSD__
+	/*
+	 * np_refcount is the number of active mmaps on
+	 * this file descriptor
+	 */
+	if (--priv->np_refcount > 0) {
+		return 0;
+	}
+#endif /* __FreeBSD__ */
+	if (ifp) {
+		netmap_do_unregif(priv, priv->np_nifp);
+	}
+	netmap_drop_memory_locked(priv);
+	if (ifp) {
+		nm_if_rele(ifp); /* might also destroy *na */
+	}
+	return 1;
 }
 
 static void
 netmap_dtor(void *data)
 {
 	struct netmap_priv_d *priv = data;
-	struct ifnet *ifp = priv->np_ifp;
+	int last_instance;
 
-	NMA_LOCK();
-	if (ifp) {
-		struct netmap_adapter *na = NA(ifp);
-
-		if (na->na_bdg)
-			BDG_WLOCK(na->na_bdg);
-		na->nm_lock(ifp, NETMAP_REG_LOCK, 0);
-		netmap_dtor_locked(data);
-		na->nm_lock(ifp, NETMAP_REG_UNLOCK, 0);
-		if (na->na_bdg)
-			BDG_WUNLOCK(na->na_bdg);
-
-		nm_if_rele(ifp); /* might also destroy *na */
+	NMG_LOCK();
+	last_instance = netmap_dtor_locked(priv);
+	NMG_UNLOCK();
+	if (last_instance) {
+		bzero(priv, sizeof(*priv));	/* for safety */
+		free(priv, M_DEVBUF);
 	}
-	if (priv->ref_done) {
-		netmap_memory_deref();
-	}
-	NMA_UNLOCK();
-	bzero(priv, sizeof(*priv));	/* XXX for safety */
-	free(priv, M_DEVBUF);
 }
 
 
 #ifdef __FreeBSD__
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_object.h>
-#include <vm/vm_page.h>
-#include <vm/vm_pager.h>
-#include <vm/uma.h>
 
 /*
  * In order to track whether pages are still mapped, we hook into
  * the standard cdev_pager and intercept the constructor and
  * destructor.
- * XXX but then ? Do we really use the information ?
- * Need to investigate.
  */
-static struct cdev_pager_ops saved_cdev_pager_ops;
 
+struct netmap_vm_handle_t {
+	struct cdev 		*dev;
+	struct netmap_priv_d	*priv;
+};
 
 static int
 netmap_dev_pager_ctor(void *handle, vm_ooffset_t size, vm_prot_t prot,
     vm_ooffset_t foff, struct ucred *cred, u_short *color)
 {
-	if (netmap_verbose)
-		D("first mmap for %p", handle);
-	return saved_cdev_pager_ops.cdev_pg_ctor(handle,
-			size, prot, foff, cred, color);
+	struct netmap_vm_handle_t *vmh = handle;
+	D("handle %p size %jd prot %d foff %jd",
+		handle, (intmax_t)size, prot, (intmax_t)foff);
+	dev_ref(vmh->dev);	
+	return 0;	
 }
 
 
 static void
 netmap_dev_pager_dtor(void *handle)
 {
-	saved_cdev_pager_ops.cdev_pg_dtor(handle);
-	ND("ready to release memory for %p", handle);
+	struct netmap_vm_handle_t *vmh = handle;
+	struct cdev *dev = vmh->dev;
+	struct netmap_priv_d *priv = vmh->priv;
+	D("handle %p", handle);
+	netmap_dtor(priv);
+	free(vmh, M_DEVBUF);
+	dev_rel(dev);
+}
+
+static int
+netmap_dev_pager_fault(vm_object_t object, vm_ooffset_t offset,
+	int prot, vm_page_t *mres)
+{
+	struct netmap_vm_handle_t *vmh = object->handle;
+	struct netmap_priv_d *priv = vmh->priv;
+	vm_paddr_t paddr;
+	vm_page_t page;
+	vm_memattr_t memattr;
+	vm_pindex_t pidx;
+
+	ND("object %p offset %jd prot %d mres %p",
+			object, (intmax_t)offset, prot, mres);
+	memattr = object->memattr;
+	pidx = OFF_TO_IDX(offset);
+	paddr = netmap_mem_ofstophys(priv->np_mref, offset);
+	if (paddr == 0)
+		return VM_PAGER_FAIL;
+
+	if (((*mres)->flags & PG_FICTITIOUS) != 0) {
+		/*
+		 * If the passed in result page is a fake page, update it with
+		 * the new physical address.
+		 */
+		page = *mres;
+		vm_page_updatefake(page, paddr, memattr);
+	} else {
+		/*
+		 * Replace the passed in reqpage page with our own fake page and
+		 * free up the all of the original pages.
+		 */
+#ifndef VM_OBJECT_WUNLOCK	/* FreeBSD < 10.x */
+#define VM_OBJECT_WUNLOCK VM_OBJECT_UNLOCK
+#define VM_OBJECT_WLOCK	VM_OBJECT_LOCK
+#endif /* VM_OBJECT_WUNLOCK */
+
+		VM_OBJECT_WUNLOCK(object);
+		page = vm_page_getfake(paddr, memattr);
+		VM_OBJECT_WLOCK(object);
+		vm_page_lock(*mres);
+		vm_page_free(*mres);
+		vm_page_unlock(*mres);
+		*mres = page;
+		vm_page_insert(page, object, pidx);
+	}
+	page->valid = VM_PAGE_BITS_ALL;
+	return (VM_PAGER_OK);
 }
 
 
 static struct cdev_pager_ops netmap_cdev_pager_ops = {
         .cdev_pg_ctor = netmap_dev_pager_ctor,
         .cdev_pg_dtor = netmap_dev_pager_dtor,
-        .cdev_pg_fault = NULL,
+        .cdev_pg_fault = netmap_dev_pager_fault,
 };
 
 
-// XXX check whether we need netmap_mmap_single _and_ netmap_mmap
 static int
 netmap_mmap_single(struct cdev *cdev, vm_ooffset_t *foff,
 	vm_size_t objsize,  vm_object_t *objp, int prot)
 {
+	int error;
+	struct netmap_vm_handle_t *vmh;
+	struct netmap_priv_d *priv;
 	vm_object_t obj;
 
-	ND("cdev %p foff %jd size %jd objp %p prot %d", cdev,
+	D("cdev %p foff %jd size %jd objp %p prot %d", cdev,
 	    (intmax_t )*foff, (intmax_t )objsize, objp, prot);
-	obj = vm_pager_allocate(OBJT_DEVICE, cdev, objsize, prot, *foff,
-            curthread->td_ucred);
-	ND("returns obj %p", obj);
-	if (obj == NULL)
-		return EINVAL;
-	if (saved_cdev_pager_ops.cdev_pg_fault == NULL) {
-		ND("initialize cdev_pager_ops");
-		saved_cdev_pager_ops = *(obj->un_pager.devp.ops);
-		netmap_cdev_pager_ops.cdev_pg_fault =
-			saved_cdev_pager_ops.cdev_pg_fault;
-	};
-	obj->un_pager.devp.ops = &netmap_cdev_pager_ops;
+	
+	vmh = malloc(sizeof(struct netmap_vm_handle_t), M_DEVBUF,
+			      M_NOWAIT | M_ZERO);
+	if (vmh == NULL)
+		return ENOMEM;
+	vmh->dev = cdev;
+
+	NMG_LOCK();
+	error = devfs_get_cdevpriv((void**)&priv);
+	if (error)
+		goto err_unlock;
+	vmh->priv = priv;
+	priv->np_refcount++;
+	NMG_UNLOCK();
+
+	error = netmap_get_memory(priv);
+	if (error)
+		goto err_deref;
+
+	obj = cdev_pager_allocate(vmh, OBJT_DEVICE, 
+		&netmap_cdev_pager_ops, objsize, prot,
+		*foff, NULL);
+	if (obj == NULL) {
+		D("cdev_pager_allocate failed");
+		error = EINVAL;
+		goto err_deref;
+	}
+		
 	*objp = obj;
 	return 0;
-}
-#endif /* __FreeBSD__ */
 
-
-/*
- * mmap(2) support for the "netmap" device.
- *
- * Expose all the memory previously allocated by our custom memory
- * allocator: this way the user has only to issue a single mmap(2), and
- * can work on all the data structures flawlessly.
- *
- * Return 0 on success, -1 otherwise.
- */
-
-#ifdef __FreeBSD__
-static int
-netmap_mmap(__unused struct cdev *dev,
-#if __FreeBSD_version < 900000
-		vm_offset_t offset, vm_paddr_t *paddr, int nprot
-#else
-		vm_ooffset_t offset, vm_paddr_t *paddr, int nprot,
-		__unused vm_memattr_t *memattr
-#endif
-	)
-{
-	int error = 0;
-	struct netmap_priv_d *priv;
-
-	if (nprot & PROT_EXEC)
-		return (-1);	// XXX -1 or EINVAL ?
-
-	error = devfs_get_cdevpriv((void **)&priv);
-	if (error == EBADF) {	/* called on fault, memory is initialized */
-		ND(5, "handling fault at ofs 0x%x", offset);
-		error = 0;
-	} else if (error == 0)	/* make sure memory is set */
-		error = netmap_get_memory(priv);
-	if (error)
-		return (error);
-
-	ND("request for offset 0x%x", (uint32_t)offset);
-	*paddr = netmap_ofstophys(offset);
-
-	return (*paddr ? 0 : ENOMEM);
+err_deref:
+	NMG_LOCK();
+	priv->np_refcount--;
+err_unlock:
+	NMG_UNLOCK();
+// err:
+	free(vmh, M_DEVBUF);
+	return error;
 }
 
 
+// XXX can we remove this ?
 static int
 netmap_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
 {
@@ -829,6 +1346,12 @@ netmap_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 	struct netmap_priv_d *priv;
 	int error;
 
+	(void)dev;
+	(void)oflags;
+	(void)devtype;
+	(void)td;
+
+	// XXX wait or nowait ?
 	priv = malloc(sizeof(struct netmap_priv_d), M_DEVBUF,
 			      M_NOWAIT | M_ZERO);
 	if (priv == NULL)
@@ -838,6 +1361,8 @@ netmap_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 	if (error)
 	        return error;
 
+	priv->np_refcount = 1;
+
 	return 0;
 }
 #endif /* __FreeBSD__ */
@@ -899,24 +1424,30 @@ netmap_grab_packets(struct netmap_kring *kring, struct mbq *q, int force)
 	 * the queue is drained in all cases.
 	 * XXX handle reserved
 	 */
-	int k = kring->ring->cur - kring->ring->reserved;
-	u_int n, lim = kring->nkr_num_slots - 1;
+	u_int lim = kring->nkr_num_slots - 1;
 	struct mbuf *m, *tail = q->tail;
+	u_int k = kring->ring->cur, n = kring->ring->reserved;
+	struct netmap_mem_d *nmd = kring->na->nm_mem;
 
-	if (k < 0)
-		k = k + kring->nkr_num_slots;
+	/* compute the final position, ring->cur - ring->reserved */
+	if (n > 0) {
+		if (k < n)
+			k += kring->nkr_num_slots;
+		k += n;
+	}
 	for (n = kring->nr_hwcur; n != k;) {
 		struct netmap_slot *slot = &kring->ring->slot[n];
 
-		n = (n == lim) ? 0 : n + 1;
+		n = nm_next(n, lim);
 		if ((slot->flags & NS_FORWARD) == 0 && !force)
 			continue;
-		if (slot->len < 14 || slot->len > NETMAP_BUF_SIZE) {
+		if (slot->len < 14 || slot->len > NETMAP_BDG_BUF_SIZE(nmd)) {
 			D("bad pkt at %d len %d", n, slot->len);
 			continue;
 		}
 		slot->flags &= ~NS_FORWARD; // XXX needed ?
-		m = m_devget(NMB(slot), slot->len, 0, kring->na->ifp, NULL);
+		/* XXX adapt to the case of a multisegment packet */
+		m = m_devget(BDG_NMB(nmd, slot), slot->len, 0, kring->na->ifp, NULL);
 
 		if (m == NULL)
 			break;
@@ -933,9 +1464,17 @@ netmap_grab_packets(struct netmap_kring *kring, struct mbq *q, int force)
 
 
 /*
- * called under main lock to send packets from the host to the NIC
  * The host ring has packets from nr_hwcur to (cur - reserved)
- * to be sent down. We scan the tx rings, which have just been
+ * to be sent down to the NIC.
+ * We need to use the queue lock on the source (host RX ring)
+ * to protect against netmap_transmit.
+ * If the user is well behaved we do not need to acquire locks
+ * on the destination(s),
+ * so we only need to make sure that there are no panics because
+ * of user errors.
+ * XXX verify
+ *
+ * We scan the tx rings, which have just been
  * flushed so nr_hwcur == cur. Pushing packets down means
  * increment cur and decrement avail.
  * XXX to be verified
@@ -945,14 +1484,23 @@ netmap_sw_to_nic(struct netmap_adapter *na)
 {
 	struct netmap_kring *kring = &na->rx_rings[na->num_rx_rings];
 	struct netmap_kring *k1 = &na->tx_rings[0];
-	int i, howmany, src_lim, dst_lim;
+	u_int i, howmany, src_lim, dst_lim;
+
+	/* XXX we should also check that the carrier is on */
+	if (kring->nkr_stopped)
+		return;
+
+	mtx_lock(&kring->q_lock);
+
+	if (kring->nkr_stopped)
+		goto out;
 
 	howmany = kring->nr_hwavail;	/* XXX otherwise cur - reserved - nr_hwcur */
 
-	src_lim = kring->nkr_num_slots;
+	src_lim = kring->nkr_num_slots - 1;
 	for (i = 0; howmany > 0 && i < na->num_tx_rings; i++, k1++) {
 		ND("%d packets left to ring %d (space %d)", howmany, i, k1->nr_hwavail);
-		dst_lim = k1->nkr_num_slots;
+		dst_lim = k1->nkr_num_slots - 1;
 		while (howmany > 0 && k1->ring->avail > 0) {
 			struct netmap_slot *src, *dst, tmp;
 			src = &kring->ring->slot[kring->nr_hwcur];
@@ -968,40 +1516,45 @@ netmap_sw_to_nic(struct netmap_adapter *na)
 				dst->len, dst->buf_idx,
 				kring->nr_hwcur, k1->ring->cur);
 
-			if (++kring->nr_hwcur >= src_lim)
-				kring->nr_hwcur = 0;
+			kring->nr_hwcur = nm_next(kring->nr_hwcur, src_lim);
 			howmany--;
 			kring->nr_hwavail--;
-			if (++k1->ring->cur >= dst_lim)
-				k1->ring->cur = 0;
+			k1->ring->cur = nm_next(k1->ring->cur, dst_lim);
 			k1->ring->avail--;
 		}
 		kring->ring->cur = kring->nr_hwcur; // XXX
-		k1++;
+		k1++; // XXX why?
 	}
+out:
+	mtx_unlock(&kring->q_lock);
 }
 
 
 /*
- * netmap_sync_to_host() passes packets up. We are called from a
+ * netmap_txsync_to_host() passes packets up. We are called from a
  * system call in user process context, and the only contention
  * can be among multiple user threads erroneously calling
  * this routine concurrently.
  */
 static void
-netmap_sync_to_host(struct netmap_adapter *na)
+netmap_txsync_to_host(struct netmap_adapter *na)
 {
 	struct netmap_kring *kring = &na->tx_rings[na->num_tx_rings];
 	struct netmap_ring *ring = kring->ring;
 	u_int k, lim = kring->nkr_num_slots - 1;
-	struct mbq q = { NULL, NULL };
+	struct mbq q = { NULL, NULL, 0 };
 
-	k = ring->cur;
-	if (k > lim) {
-		netmap_ring_reinit(kring);
+	if (nm_kr_tryget(kring)) {
+		D("ring %p busy (user error)", kring);
+		return;
+	}
+	k = ring->cur;
+	if (k > lim) {
+		D("invalid ring index in stack TX kring %p", kring);
+		netmap_ring_reinit(kring);
+		nm_kr_put(kring);
 		return;
 	}
-	// na->nm_lock(na->ifp, NETMAP_CORE_LOCK, 0);
 
 	/* Take packets from hwcur to cur and pass them up.
 	 * In case of no buffers we give up. At the end of the loop,
@@ -1010,26 +1563,32 @@ netmap_sync_to_host(struct netmap_adapter *na)
 	netmap_grab_packets(kring, &q, 1);
 	kring->nr_hwcur = k;
 	kring->nr_hwavail = ring->avail = lim;
-	// na->nm_lock(na->ifp, NETMAP_CORE_UNLOCK, 0);
 
+	nm_kr_put(kring);
 	netmap_send_up(na->ifp, q.head);
 }
 
 
+/*
+ * This is the 'txsync' handler to send from a software ring to the
+ * host stack.
+ */
 /* SWNA(ifp)->txrings[0] is always NA(ifp)->txrings[NA(ifp)->num_txrings] */
 static int
-netmap_bdg_to_host(struct ifnet *ifp, u_int ring_nr, int do_lock)
+netmap_bdg_to_host(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	(void)ring_nr;
-	(void)do_lock;
-	netmap_sync_to_host(NA(ifp));
+	(void)flags;
+	if (netmap_verbose > 255)
+		RD(5, "sync to host %s ring %d", ifp->if_xname, ring_nr);
+	netmap_txsync_to_host(NA(ifp));
 	return 0;
 }
 
 
 /*
  * rxsync backend for packets coming from the host stack.
- * They have been put in the queue by netmap_start() so we
+ * They have been put in the queue by netmap_transmit() so we
  * need to protect access to the kring using a lock.
  *
  * This routine also does the selrecord if called from the poll handler
@@ -1039,7 +1598,7 @@ netmap_bdg_to_host(struct ifnet *ifp, u_int ring_nr, int do_lock)
  *     as an additional hidden argument.
  */
 static void
-netmap_sync_from_host(struct netmap_adapter *na, struct thread *td, void *pwait)
+netmap_rxsync_from_host(struct netmap_adapter *na, struct thread *td, void *pwait)
 {
 	struct netmap_kring *kring = &na->rx_rings[na->num_rx_rings];
 	struct netmap_ring *ring = kring->ring;
@@ -1047,10 +1606,19 @@ netmap_sync_from_host(struct netmap_adapter *na, struct thread *td, void *pwait)
 	u_int k = ring->cur, resvd = ring->reserved;
 
 	(void)pwait;	/* disable unused warnings */
-	na->nm_lock(na->ifp, NETMAP_CORE_LOCK, 0);
+
+	if (kring->nkr_stopped) /* check a first time without lock */
+		return;
+
+	/* XXX as an optimization we could reuse na->core_lock */
+	mtx_lock(&kring->q_lock);
+
+	if (kring->nkr_stopped)  /* check again with lock held */
+		goto unlock_out;
+
 	if (k >= lim) {
 		netmap_ring_reinit(kring);
-		return;
+		goto unlock_out;
 	}
 	/* new packets are already set in nr_hwavail */
 	/* skip past packets that userspace has released */
@@ -1072,17 +1640,23 @@ netmap_sync_from_host(struct netmap_adapter *na, struct thread *td, void *pwait)
 		selrecord(td, &kring->si);
 	if (k && (netmap_verbose & NM_VERB_HOST))
 		D("%d pkts from stack", k);
-	na->nm_lock(na->ifp, NETMAP_CORE_UNLOCK, 0);
+unlock_out:
+
+	mtx_unlock(&kring->q_lock);
 }
 
 
 /*
+ * MUST BE CALLED UNDER NMG_LOCK()
+ *
  * get a refcounted reference to an interface.
+ * This is always called in the execution of an ioctl().
+ *
  * Return ENXIO if the interface does not exist, EINVAL if netmap
  * is not supported by the interface.
  * If successful, hold a reference.
  *
- * During the NIC is attached to a bridge, reference is managed
+ * When the NIC is attached to a bridge, reference is managed
  * at na->na_bdg_refcount using ADD/DROP_BDG_REF() as well as
  * virtual ports.  Hence, on the final DROP_BDG_REF(), the NIC
  * is detached from the bridge, then ifp's refcount is dropped (this
@@ -1093,143 +1667,172 @@ netmap_sync_from_host(struct netmap_adapter *na, struct thread *td, void *pwait)
  * is acquired by this function, it must be released using nm_if_rele().
  */
 static int
-get_ifp(struct nmreq *nmr, struct ifnet **ifp)
+get_ifp(struct nmreq *nmr, struct ifnet **ifp, int create)
 {
 	const char *name = nmr->nr_name;
 	int namelen = strlen(name);
-#ifdef NM_BRIDGE
 	struct ifnet *iter = NULL;
 	int no_prefix = 0;
 
-	do {
-		struct nm_bridge *b;
-		struct netmap_adapter *na;
-		int i, cand = -1, cand2 = -1;
+	/* first try to see if this is a bridge port. */
+	struct nm_bridge *b;
+	struct netmap_adapter *na;
+	int i, j, cand = -1, cand2 = -1;
+	int needed;
 
-		if (strncmp(name, NM_NAME, sizeof(NM_NAME) - 1)) {
-			no_prefix = 1;
-			break;
+	NMG_LOCK_ASSERT();
+	*ifp = NULL;	/* default */
+	if (strncmp(name, NM_NAME, sizeof(NM_NAME) - 1)) {
+		no_prefix = 1;	/* no VALE prefix */
+		goto no_bridge_port;
+	}
+
+	b = nm_find_bridge(name, create);
+	if (b == NULL) {
+		D("no bridges available for '%s'", name);
+		return (ENXIO);
+	}
+
+	/* Now we are sure that name starts with the bridge's name,
+	 * lookup the port in the bridge. We need to scan the entire
+	 * list. It is not important to hold a WLOCK on the bridge
+	 * during the search because NMG_LOCK already guarantees
+	 * that there are no other possible writers.
+	 */
+
+	/* lookup in the local list of ports */
+	for (j = 0; j < b->bdg_active_ports; j++) {
+		i = b->bdg_port_index[j];
+		na = b->bdg_ports[i];
+		// KASSERT(na != NULL);
+		iter = na->ifp;
+		/* XXX make sure the name only contains one : */
+		if (!strcmp(iter->if_xname, name) /* virtual port */ ||
+		    (namelen > b->bdg_namelen && !strcmp(iter->if_xname,
+		    name + b->bdg_namelen + 1)) /* NIC */) {
+			ADD_BDG_REF(iter);
+			ND("found existing if %s refs %d", name,
+				NA(iter)->na_bdg_refcount);
+			*ifp = iter;
+			/* we are done, this is surely netmap capable */
+			return 0;
 		}
-		b = nm_find_bridge(name, 1 /* create a new one if no exist */ );
-		if (b == NULL) {
-			D("no bridges available for '%s'", name);
-			return (ENXIO);
-		}
-		/* Now we are sure that name starts with the bridge's name */
-		BDG_WLOCK(b);
-		/* lookup in the local list of ports */
-		for (i = 0; i < NM_BDG_MAXPORTS; i++) {
-			na = BDG_GET_VAR(b->bdg_ports[i]);
-			if (na == NULL) {
-				if (cand == -1)
-					cand = i; /* potential insert point */
-				else if (cand2 == -1)
-					cand2 = i; /* for host stack */
-				continue;
-			}
-			iter = na->ifp;
-			/* XXX make sure the name only contains one : */
-			if (!strcmp(iter->if_xname, name) /* virtual port */ ||
-			    (namelen > b->namelen && !strcmp(iter->if_xname,
-			    name + b->namelen + 1)) /* NIC */) {
-				ADD_BDG_REF(iter);
-				ND("found existing interface");
-				BDG_WUNLOCK(b);
-				break;
-			}
-		}
-		if (i < NM_BDG_MAXPORTS) /* already unlocked */
-			break;
-		if (cand == -1) {
-			D("bridge full, cannot create new port");
-no_port:
-			BDG_WUNLOCK(b);
-			*ifp = NULL;
+	}
+	/* not found, should we create it? */
+	if (!create)
+		return ENXIO;
+	/* yes we should, see if we have space to attach entries */
+	needed = 2; /* in some cases we only need 1 */
+	if (b->bdg_active_ports + needed >= NM_BDG_MAXPORTS) {
+		D("bridge full %d, cannot create new port", b->bdg_active_ports);
+		return EINVAL;
+	}
+	/* record the next two ports available, but do not allocate yet */
+	cand = b->bdg_port_index[b->bdg_active_ports];
+	cand2 = b->bdg_port_index[b->bdg_active_ports + 1];
+	ND("+++ bridge %s port %s used %d avail %d %d",
+		b->bdg_basename, name, b->bdg_active_ports, cand, cand2);
+
+	/*
+	 * try see if there is a matching NIC with this name
+	 * (after the bridge's name)
+	 */
+	iter = ifunit_ref(name + b->bdg_namelen + 1);
+	if (!iter) { /* this is a virtual port */
+		/* Create a temporary NA with arguments, then
+		 * bdg_netmap_attach() will allocate the real one
+		 * and attach it to the ifp
+		 */
+		struct netmap_adapter tmp_na;
+		int error;
+
+		if (nmr->nr_cmd) {
+			/* nr_cmd must be 0 for a virtual port */
 			return EINVAL;
 		}
-		ND("create new bridge port %s", name);
-		/*
-		 * create a struct ifnet for the new port.
-		 * The forwarding table is attached to the kring(s).
-		 */
-		/*
-		 * try see if there is a matching NIC with this name
-		 * (after the bridge's name)
-		 */
-		iter = ifunit_ref(name + b->namelen + 1);
-		if (!iter) { /* this is a virtual port */
-			/* Create a temporary NA with arguments, then
-			 * bdg_netmap_attach() will allocate the real one
-			 * and attach it to the ifp
-			 */
-			struct netmap_adapter tmp_na;
+		bzero(&tmp_na, sizeof(tmp_na));
+		/* bound checking */
+		tmp_na.num_tx_rings = nmr->nr_tx_rings;
+		nm_bound_var(&tmp_na.num_tx_rings, 1, 1, NM_BDG_MAXRINGS, NULL);
+		nmr->nr_tx_rings = tmp_na.num_tx_rings; // write back
+		tmp_na.num_rx_rings = nmr->nr_rx_rings;
+		nm_bound_var(&tmp_na.num_rx_rings, 1, 1, NM_BDG_MAXRINGS, NULL);
+		nmr->nr_rx_rings = tmp_na.num_rx_rings; // write back
+		nm_bound_var(&nmr->nr_tx_slots, NM_BRIDGE_RINGSIZE,
+				1, NM_BDG_MAXSLOTS, NULL);
+		tmp_na.num_tx_desc = nmr->nr_tx_slots;
+		nm_bound_var(&nmr->nr_rx_slots, NM_BRIDGE_RINGSIZE,
+				1, NM_BDG_MAXSLOTS, NULL);
+		tmp_na.num_rx_desc = nmr->nr_rx_slots;
 
-			if (nmr->nr_cmd) /* nr_cmd must be for a NIC */
-				goto no_port;
-			bzero(&tmp_na, sizeof(tmp_na));
-			/* bound checking */
-			if (nmr->nr_tx_rings < 1)
-				nmr->nr_tx_rings = 1;
-			if (nmr->nr_tx_rings > NM_BDG_MAXRINGS)
-				nmr->nr_tx_rings = NM_BDG_MAXRINGS;
-			tmp_na.num_tx_rings = nmr->nr_tx_rings;
-			if (nmr->nr_rx_rings < 1)
-				nmr->nr_rx_rings = 1;
-			if (nmr->nr_rx_rings > NM_BDG_MAXRINGS)
-				nmr->nr_rx_rings = NM_BDG_MAXRINGS;
-			tmp_na.num_rx_rings = nmr->nr_rx_rings;
+	 	/* create a struct ifnet for the new port.
+		 * need M_NOWAIT as we are under nma_lock
+		 */
+		iter = malloc(sizeof(*iter), M_DEVBUF, M_NOWAIT | M_ZERO);
+		if (!iter)
+			return ENOMEM;
 
-			iter = malloc(sizeof(*iter), M_DEVBUF, M_NOWAIT | M_ZERO);
-			if (!iter)
-				goto no_port;
-			strcpy(iter->if_xname, name);
-			tmp_na.ifp = iter;
-			/* bdg_netmap_attach creates a struct netmap_adapter */
-			bdg_netmap_attach(&tmp_na);
-		} else if (NETMAP_CAPABLE(iter)) { /* this is a NIC */
-			/* cannot attach the NIC that any user or another
-			 * bridge already holds.
-			 */
-			if (NETMAP_OWNED_BY_ANY(iter) || cand2 == -1) {
-ifunit_rele:
-				if_rele(iter); /* don't detach from bridge */
-				goto no_port;
-			}
-			/* bind the host stack to the bridge */
-			if (nmr->nr_arg1 == NETMAP_BDG_HOST) {
-				BDG_SET_VAR(b->bdg_ports[cand2], SWNA(iter));
-				SWNA(iter)->bdg_port = cand2;
-				SWNA(iter)->na_bdg = b;
-			}
-		} else /* not a netmap-capable NIC */
-			goto ifunit_rele;
-		na = NA(iter);
-		na->bdg_port = cand;
-		/* bind the port to the bridge (virtual ports are not active) */
-		BDG_SET_VAR(b->bdg_ports[cand], na);
-		na->na_bdg = b;
-		ADD_BDG_REF(iter);
-		BDG_WUNLOCK(b);
-		ND("attaching virtual bridge %p", b);
-	} while (0);
+		strcpy(iter->if_xname, name);
+		tmp_na.ifp = iter;
+		/* bdg_netmap_attach creates a struct netmap_adapter */
+		error = bdg_netmap_attach(&tmp_na);
+		if (error) {
+			D("error %d", error);
+			free(iter, M_DEVBUF);
+			return error;
+		}
+		cand2 = -1;	/* only need one port */
+	} else if (NETMAP_CAPABLE(iter)) { /* this is a NIC */
+		/* make sure the NIC is not already in use */
+		if (NETMAP_OWNED_BY_ANY(iter)) {
+			D("NIC %s busy, cannot attach to bridge",
+				iter->if_xname);
+			if_rele(iter); /* don't detach from bridge */
+			return EINVAL;
+		}
+		if (nmr->nr_arg1 != NETMAP_BDG_HOST)
+			cand2 = -1; /* only need one port */
+	} else { /* not a netmap-capable NIC */
+		if_rele(iter); /* don't detach from bridge */
+		return EINVAL;
+	}
+	na = NA(iter);
+
+	BDG_WLOCK(b);
+	na->bdg_port = cand;
+	ND("NIC  %p to bridge port %d", NA(iter), cand);
+	/* bind the port to the bridge (virtual ports are not active) */
+	b->bdg_ports[cand] = na;
+	na->na_bdg = b;
+	b->bdg_active_ports++;
+	if (cand2 >= 0) {
+		/* also bind the host stack to the bridge */
+		b->bdg_ports[cand2] = SWNA(iter);
+		SWNA(iter)->bdg_port = cand2;
+		SWNA(iter)->na_bdg = b;
+		b->bdg_active_ports++;
+		ND("host %p to bridge port %d", SWNA(iter), cand2);
+	}
+	ADD_BDG_REF(iter);	// XXX one or two ?
+	ND("if %s refs %d", name, NA(iter)->na_bdg_refcount);
+	BDG_WUNLOCK(b);
+	*ifp = iter;
+	return 0;
+
+no_bridge_port:
 	*ifp = iter;
 	if (! *ifp)
-#endif /* NM_BRIDGE */
-	*ifp = ifunit_ref(name);
+		*ifp = ifunit_ref(name);
 	if (*ifp == NULL)
 		return (ENXIO);
-	/* can do this if the capability exists and if_pspare[0]
-	 * points to the netmap descriptor.
-	 */
+
 	if (NETMAP_CAPABLE(*ifp)) {
-#ifdef NM_BRIDGE
 		/* Users cannot use the NIC attached to a bridge directly */
 		if (no_prefix && NETMAP_OWNED_BY_KERN(*ifp)) {
 			if_rele(*ifp); /* don't detach from bridge */
 			return EINVAL;
 		} else
-#endif /* NM_BRIDGE */
-		return 0;	/* valid pointer, we hold the refcount */
+			return 0;	/* valid pointer, we hold the refcount */
 	}
 	nm_if_rele(*ifp);
 	return EINVAL;	// not NETMAP capable
@@ -1255,6 +1858,7 @@ netmap_ring_reinit(struct netmap_kring *kring)
 	u_int i, lim = kring->nkr_num_slots - 1;
 	int errors = 0;
 
+	// XXX KASSERT nm_kr_tryget
 	RD(10, "called for %s", kring->na->ifp->if_xname);
 	if (ring->cur > lim)
 		errors++;
@@ -1266,7 +1870,7 @@ netmap_ring_reinit(struct netmap_kring *kring)
 				D("bad buffer at slot %d idx %d len %d ", i, idx, len);
 			ring->slot[i].buf_idx = 0;
 			ring->slot[i].len = 0;
-		} else if (len > NETMAP_BUF_SIZE) {
+		} else if (len > NETMAP_BDG_BUF_SIZE(kring->na->nm_mem)) {
 			ring->slot[i].len = 0;
 			if (!errors++)
 				D("bad len %d at slot %d idx %d",
@@ -1302,8 +1906,7 @@ netmap_set_ringid(struct netmap_priv_d *priv, u_int ringid)
 	struct netmap_adapter *na = NA(ifp);
 	u_int i = ringid & NETMAP_RING_MASK;
 	/* initially (np_qfirst == np_qlast) we don't want to lock */
-	int need_lock = (priv->np_qfirst != priv->np_qlast);
-	int lim = na->num_rx_rings;
+	u_int lim = na->num_rx_rings;
 
 	if (na->num_tx_rings > lim)
 		lim = na->num_tx_rings;
@@ -1311,8 +1914,6 @@ netmap_set_ringid(struct netmap_priv_d *priv, u_int ringid)
 		D("invalid ring id %d", i);
 		return (EINVAL);
 	}
-	if (need_lock)
-		na->nm_lock(ifp, NETMAP_CORE_LOCK, 0);
 	priv->np_ringid = ringid;
 	if (ringid & NETMAP_SW_RING) {
 		priv->np_qfirst = NETMAP_SW_RING;
@@ -1325,8 +1926,6 @@ netmap_set_ringid(struct netmap_priv_d *priv, u_int ringid)
 		priv->np_qlast = NETMAP_HW_RING ;
 	}
 	priv->np_txpoll = (ringid & NETMAP_NO_TX_POLL) ? 0 : 1;
-	if (need_lock)
-		na->nm_lock(ifp, NETMAP_CORE_UNLOCK, 0);
     if (netmap_verbose) {
 	if (ringid & NETMAP_SW_RING)
 		D("ringid %s set to SW RING", ifp->if_xname);
@@ -1343,7 +1942,7 @@ netmap_set_ringid(struct netmap_priv_d *priv, u_int ringid)
 /*
  * possibly move the interface to netmap-mode.
  * If success it returns a pointer to netmap_if, otherwise NULL.
- * This must be called with NMA_LOCK held.
+ * This must be called with NMG_LOCK held.
  */
 static struct netmap_if *
 netmap_do_regif(struct netmap_priv_d *priv, struct ifnet *ifp,
@@ -1351,63 +1950,89 @@ netmap_do_regif(struct netmap_priv_d *priv, struct ifnet *ifp,
 {
 	struct netmap_adapter *na = NA(ifp);
 	struct netmap_if *nifp = NULL;
-	int i, error;
-
-	if (na->na_bdg)
-		BDG_WLOCK(na->na_bdg);
-	na->nm_lock(ifp, NETMAP_REG_LOCK, 0);
+	int error, need_mem;
 
+	NMG_LOCK_ASSERT();
 	/* ring configuration may have changed, fetch from the card */
 	netmap_update_config(na);
 	priv->np_ifp = ifp;     /* store the reference */
 	error = netmap_set_ringid(priv, ringid);
 	if (error)
 		goto out;
+	/* ensure allocators are ready */
+	need_mem = !netmap_have_memory_locked(priv);
+	if (need_mem) {
+		error = netmap_get_memory_locked(priv);
+		ND("get_memory returned %d", error);
+		if (error)
+			goto out;
+	}
 	nifp = netmap_if_new(ifp->if_xname, na);
 	if (nifp == NULL) { /* allocation failed */
+		/* we should drop the allocator, but only
+		 * if we were the ones who grabbed it
+		 */
+		if (need_mem)
+			netmap_drop_memory_locked(priv);
 		error = ENOMEM;
-	} else if (ifp->if_capenable & IFCAP_NETMAP) {
+		goto out;
+	}
+	na->refcount++;
+	if (ifp->if_capenable & IFCAP_NETMAP) {
 		/* was already set */
 	} else {
+		u_int i;
 		/* Otherwise set the card in netmap mode
 		 * and make it use the shared buffers.
+		 *
+		 * If the interface is attached to a bridge, lock it.
 		 */
+		if (NETMAP_OWNED_BY_KERN(ifp))
+			BDG_WLOCK(NA(ifp)->na_bdg);
 		for (i = 0 ; i < na->num_tx_rings + 1; i++)
 			mtx_init(&na->tx_rings[i].q_lock, "nm_txq_lock",
-			    MTX_NETWORK_LOCK, MTX_DEF);
+			    NULL, MTX_DEF);
 		for (i = 0 ; i < na->num_rx_rings + 1; i++) {
 			mtx_init(&na->rx_rings[i].q_lock, "nm_rxq_lock",
-			    MTX_NETWORK_LOCK, MTX_DEF);
+			    NULL, MTX_DEF);
 		}
 		if (nma_is_hw(na)) {
 			SWNA(ifp)->tx_rings = &na->tx_rings[na->num_tx_rings];
 			SWNA(ifp)->rx_rings = &na->rx_rings[na->num_rx_rings];
 		}
+		/*
+		 * do not core lock because the race is harmless here,
+		 * there cannot be any traffic to netmap_transmit()
+		 */
 		error = na->nm_register(ifp, 1); /* mode on */
-#ifdef NM_BRIDGE
+		// XXX do we need to nm_alloc_bdgfwd() in all cases ?
 		if (!error)
 			error = nm_alloc_bdgfwd(na);
-#endif /* NM_BRIDGE */
 		if (error) {
-			netmap_dtor_locked(priv);
-			/* nifp is not yet in priv, so free it separately */
-			netmap_if_free(nifp);
+			netmap_do_unregif(priv, nifp);
 			nifp = NULL;
 		}
+		if (NETMAP_OWNED_BY_KERN(ifp))
+			BDG_WUNLOCK(NA(ifp)->na_bdg);
 
 	}
 out:
 	*err = error;
-	na->nm_lock(ifp, NETMAP_REG_UNLOCK, 0);
-	if (na->na_bdg)
-		BDG_WUNLOCK(na->na_bdg);
+	if (nifp != NULL) {
+		/*
+		 * advertise that the interface is ready bt setting ni_nifp.
+		 * The barrier is needed because readers (poll and *SYNC)
+		 * check for priv->np_nifp != NULL without locking
+		 */
+		wmb(); /* make sure previous writes are visible to all CPUs */
+		priv->np_nifp = nifp;
+	}
 	return nifp;
 }
 
-
 /* Process NETMAP_BDG_ATTACH and NETMAP_BDG_DETACH */
 static int
-kern_netmap_regif(struct nmreq *nmr)
+nm_bdg_attach(struct nmreq *nmr)
 {
 	struct ifnet *ifp;
 	struct netmap_if *nifp;
@@ -1417,81 +2042,92 @@ kern_netmap_regif(struct nmreq *nmr)
 	npriv = malloc(sizeof(*npriv), M_DEVBUF, M_NOWAIT|M_ZERO);
 	if (npriv == NULL)
 		return ENOMEM;
-	error = netmap_get_memory(npriv);
-	if (error) {
-free_exit:
-		bzero(npriv, sizeof(*npriv));
-		free(npriv, M_DEVBUF);
-		return error;
+	NMG_LOCK();
+	error = get_ifp(nmr, &ifp, 1 /* create if not exists */);
+	if (error) /* no device, or another bridge or user owns the device */
+		goto unlock_exit;
+	/* get_ifp() sets na_bdg if this is a physical interface
+	 * that we can attach to a switch.
+	 */
+	if (!NETMAP_OWNED_BY_KERN(ifp)) {
+		/* got reference to a virtual port or direct access to a NIC.
+		 * perhaps specified no bridge prefix or wrong NIC name
+		 */
+		error = EINVAL;
+		goto unref_exit;
 	}
 
-	NMA_LOCK();
-	error = get_ifp(nmr, &ifp);
+	if (NA(ifp)->refcount > 0) { /* already registered */
+		error = EBUSY;
+		DROP_BDG_REF(ifp);
+		goto unlock_exit;
+	}
+
+	nifp = netmap_do_regif(npriv, ifp, nmr->nr_ringid, &error);
+	if (!nifp) {
+		goto unref_exit;
+	}
+
+	NA(ifp)->na_kpriv = npriv;
+	NMG_UNLOCK();
+	ND("registered %s to netmap-mode", ifp->if_xname);
+	return 0;
+
+unref_exit:
+	nm_if_rele(ifp);
+unlock_exit:
+	NMG_UNLOCK();
+	bzero(npriv, sizeof(*npriv));
+	free(npriv, M_DEVBUF);
+	return error;
+}
+
+static int
+nm_bdg_detach(struct nmreq *nmr)
+{
+	struct ifnet *ifp;
+	int error;
+	int last_instance;
+
+	NMG_LOCK();
+	error = get_ifp(nmr, &ifp, 0 /* don't create */);
 	if (error) { /* no device, or another bridge or user owns the device */
-		NMA_UNLOCK();
-		goto free_exit;
-	} else if (!NETMAP_OWNED_BY_KERN(ifp)) {
+		goto unlock_exit;
+	}
+	/* XXX do we need to check this ? */
+	if (!NETMAP_OWNED_BY_KERN(ifp)) {
 		/* got reference to a virtual port or direct access to a NIC.
 		 * perhaps specified no bridge's prefix or wrong NIC's name
 		 */
 		error = EINVAL;
-unref_exit:
-		nm_if_rele(ifp);
-		NMA_UNLOCK();
-		goto free_exit;
+		goto unref_exit;
 	}
 
-	if (nmr->nr_cmd == NETMAP_BDG_DETACH) {
-		if (NA(ifp)->refcount == 0) { /* not registered */
-			error = EINVAL;
-			goto unref_exit;
-		}
-		NMA_UNLOCK();
-
-		netmap_dtor(NA(ifp)->na_kpriv); /* unregister */
-		NA(ifp)->na_kpriv = NULL;
-		nm_if_rele(ifp); /* detach from the bridge */
-		goto free_exit;
-	} else if (NA(ifp)->refcount > 0) { /* already registered */
+	if (NA(ifp)->refcount == 0) { /* not registered */
 		error = EINVAL;
 		goto unref_exit;
 	}
 
-	nifp = netmap_do_regif(npriv, ifp, nmr->nr_ringid, &error);
-	if (!nifp)
-		goto unref_exit;
-	wmb(); // XXX do we need it ?
-	npriv->np_nifp = nifp;
-	NA(ifp)->na_kpriv = npriv;
-	NMA_UNLOCK();
-	D("registered %s to netmap-mode", ifp->if_xname);
-	return 0;
-}
+	DROP_BDG_REF(ifp); /* the one from get_ifp */
+	last_instance = netmap_dtor_locked(NA(ifp)->na_kpriv); /* unregister */
+	NMG_UNLOCK();
+	if (!last_instance) {
+		D("--- error, trying to detach an entry with active mmaps");
+		error = EINVAL;
+	} else {
+		struct netmap_priv_d *npriv = NA(ifp)->na_kpriv;
+		NA(ifp)->na_kpriv = NULL;
 
-
-/* CORE_LOCK is not necessary */
-static void
-netmap_swlock_wrapper(struct ifnet *dev, int what, u_int queueid)
-{
-	struct netmap_adapter *na = SWNA(dev);
-
-	switch (what) {
-	case NETMAP_TX_LOCK:
-		mtx_lock(&na->tx_rings[queueid].q_lock);
-		break;
-
-	case NETMAP_TX_UNLOCK:
-		mtx_unlock(&na->tx_rings[queueid].q_lock);
-		break;
-
-	case NETMAP_RX_LOCK:
-		mtx_lock(&na->rx_rings[queueid].q_lock);
-		break;
-
-	case NETMAP_RX_UNLOCK:
-		mtx_unlock(&na->rx_rings[queueid].q_lock);
-		break;
+		bzero(npriv, sizeof(*npriv));
+		free(npriv, M_DEVBUF);
 	}
+	return error;
+
+unref_exit:
+	nm_if_rele(ifp);
+unlock_exit:
+	NMG_UNLOCK();
+	return error;
 }
 
 
@@ -1510,16 +2146,20 @@ netmap_attach_sw(struct ifnet *ifp)
 	struct netmap_adapter *na = SWNA(ifp);
 
 	na->ifp = ifp;
-	na->separate_locks = 1;
-	na->nm_lock = netmap_swlock_wrapper;
 	na->num_rx_rings = na->num_tx_rings = 1;
 	na->num_tx_desc = hw_na->num_tx_desc;
 	na->num_rx_desc = hw_na->num_rx_desc;
 	na->nm_txsync = netmap_bdg_to_host;
+	/* we use the same memory allocator as the
+	 * the hw adapter */
+	na->nm_mem = hw_na->nm_mem;
 }
 
 
-/* exported to kernel callers */
+/* exported to kernel callers, e.g. OVS ?
+ * Entry point.
+ * Called without NMG_LOCK.
+ */
 int
 netmap_bdg_ctl(struct nmreq *nmr, bdg_lookup_fn_t func)
 {
@@ -1532,8 +2172,11 @@ netmap_bdg_ctl(struct nmreq *nmr, bdg_lookup_fn_t func)
 
 	switch (cmd) {
 	case NETMAP_BDG_ATTACH:
+		error = nm_bdg_attach(nmr);
+		break;
+
 	case NETMAP_BDG_DETACH:
-		error = kern_netmap_regif(nmr);
+		error = nm_bdg_detach(nmr);
 		break;
 
 	case NETMAP_BDG_LIST:
@@ -1543,26 +2186,30 @@ netmap_bdg_ctl(struct nmreq *nmr, bdg_lookup_fn_t func)
 				error = EINVAL;
 				break;
 			}
+			NMG_LOCK();
 			b = nm_find_bridge(name, 0 /* don't create */);
 			if (!b) {
 				error = ENOENT;
+				NMG_UNLOCK();
 				break;
 			}
 
-			BDG_RLOCK(b);
 			error = ENOENT;
-			for (i = 0; i < NM_BDG_MAXPORTS; i++) {
-				na = BDG_GET_VAR(b->bdg_ports[i]);
-				if (na == NULL)
+			for (j = 0; j < b->bdg_active_ports; j++) {
+				i = b->bdg_port_index[j];
+				na = b->bdg_ports[i];
+				if (na == NULL) {
+					D("---AAAAAAAAARGH-------");
 					continue;
+				}
 				iter = na->ifp;
 				/* the former and the latter identify a
 				 * virtual port and a NIC, respectively
 				 */
 				if (!strcmp(iter->if_xname, name) ||
-				    (namelen > b->namelen &&
+				    (namelen > b->bdg_namelen &&
 				    !strcmp(iter->if_xname,
-				    name + b->namelen + 1))) {
+				    name + b->bdg_namelen + 1))) {
 					/* bridge index */
 					nmr->nr_arg1 = b - nm_bridges;
 					nmr->nr_arg2 = i; /* port index */
@@ -1570,7 +2217,7 @@ netmap_bdg_ctl(struct nmreq *nmr, bdg_lookup_fn_t func)
 					break;
 				}
 			}
-			BDG_RUNLOCK(b);
+			NMG_UNLOCK();
 		} else {
 			/* return the first non-empty entry starting from
 			 * bridge nr_arg1 and port nr_arg2.
@@ -1582,23 +2229,23 @@ netmap_bdg_ctl(struct nmreq *nmr, bdg_lookup_fn_t func)
 			i = nmr->nr_arg1;
 			j = nmr->nr_arg2;
 
-			for (error = ENOENT; error && i < NM_BRIDGES; i++) {
+			NMG_LOCK();
+			for (error = ENOENT; i < NM_BRIDGES; i++) {
 				b = nm_bridges + i;
-				BDG_RLOCK(b);
-				for (; j < NM_BDG_MAXPORTS; j++) {
-					na = BDG_GET_VAR(b->bdg_ports[j]);
-					if (na == NULL)
-						continue;
-					iter = na->ifp;
-					nmr->nr_arg1 = i;
-					nmr->nr_arg2 = j;
-					strncpy(name, iter->if_xname, IFNAMSIZ);
-					error = 0;
-					break;
+				if (j >= b->bdg_active_ports) {
+					j = 0; /* following bridges scan from 0 */
+					continue;
 				}
-				BDG_RUNLOCK(b);
-				j = 0; /* following bridges scan from 0 */
+				nmr->nr_arg1 = i;
+				nmr->nr_arg2 = j;
+				j = b->bdg_port_index[j];
+				na = b->bdg_ports[j];
+				iter = na->ifp;
+				strncpy(name, iter->if_xname, (size_t)IFNAMSIZ);
+				error = 0;
+				break;
 			}
+			NMG_UNLOCK();
 		}
 		break;
 
@@ -1611,15 +2258,16 @@ netmap_bdg_ctl(struct nmreq *nmr, bdg_lookup_fn_t func)
 			error = EINVAL;
 			break;
 		}
+		NMG_LOCK();
 		b = nm_find_bridge(name, 0 /* don't create */);
 		if (!b) {
 			error = EINVAL;
-			break;
+		} else {
+			b->nm_bdg_lookup = func;
 		}
-		BDG_WLOCK(b);
-		b->nm_bdg_lookup = func;
-		BDG_WUNLOCK(b);
+		NMG_UNLOCK();
 		break;
+
 	default:
 		D("invalid cmd (nmr->nr_cmd) (0x%x)", cmd);
 		error = EINVAL;
@@ -1647,12 +2295,13 @@ netmap_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
 	int fflag, struct thread *td)
 {
 	struct netmap_priv_d *priv = NULL;
-	struct ifnet *ifp;
+	struct ifnet *ifp = NULL;
 	struct nmreq *nmr = (struct nmreq *) data;
-	struct netmap_adapter *na;
+	struct netmap_adapter *na = NULL;
 	int error;
 	u_int i, lim;
 	struct netmap_if *nifp;
+	struct netmap_kring *krings;
 
 	(void)dev;	/* UNUSED */
 	(void)fflag;	/* UNUSED */
@@ -1695,32 +2344,40 @@ netmap_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
 			error = netmap_bdg_ctl(nmr, NULL);
 			break;
 		}
-		/* update configuration */
-		error = netmap_get_memory(priv);
-		ND("get_memory returned %d", error);
-		if (error)
-			break;
-		/* memsize is always valid */
-		nmr->nr_memsize = nm_mem.nm_totalsize;
-		nmr->nr_offset = 0;
-		nmr->nr_rx_slots = nmr->nr_tx_slots = 0;
-		if (nmr->nr_name[0] == '\0')	/* just get memory info */
-			break;
-		/* lock because get_ifp and update_config see na->refcount */
-		NMA_LOCK();
-		error = get_ifp(nmr, &ifp); /* get a refcount */
-		if (error) {
-			NMA_UNLOCK();
-			break;
-		}
-		na = NA(ifp); /* retrieve netmap_adapter */
-		netmap_update_config(na);
-		NMA_UNLOCK();
-		nmr->nr_rx_rings = na->num_rx_rings;
-		nmr->nr_tx_rings = na->num_tx_rings;
-		nmr->nr_rx_slots = na->num_rx_desc;
-		nmr->nr_tx_slots = na->num_tx_desc;
-		nm_if_rele(ifp);	/* return the refcount */
+
+		NMG_LOCK();
+		do {
+			/* memsize is always valid */
+			struct netmap_mem_d *nmd = &nm_mem;
+			u_int memflags;
+
+			if (nmr->nr_name[0] != '\0') {
+				/* get a refcount */
+				error = get_ifp(nmr, &ifp, 1 /* create */);
+				if (error)
+					break;
+				na = NA(ifp);  /* retrieve the netmap adapter */
+				nmd = na->nm_mem; /* and its memory allocator */
+			}
+			
+			error = netmap_mem_get_info(nmd, &nmr->nr_memsize, &memflags);
+			if (error)
+				break;
+			if (na == NULL) /* only memory info */
+				break;
+			nmr->nr_offset = 0;
+			nmr->nr_rx_slots = nmr->nr_tx_slots = 0;
+			netmap_update_config(na);
+			nmr->nr_rx_rings = na->num_rx_rings;
+			nmr->nr_tx_rings = na->num_tx_rings;
+			nmr->nr_rx_slots = na->num_rx_desc;
+			nmr->nr_tx_slots = na->num_tx_desc;
+			if (memflags & NETMAP_MEM_PRIVATE)
+				nmr->nr_ringid |= NETMAP_PRIV_MEM;
+		} while (0);
+		if (ifp)
+			nm_if_rele(ifp);	/* return the refcount */
+		NMG_UNLOCK();
 		break;
 
 	case NIOCREGIF:
@@ -1740,52 +2397,50 @@ netmap_ioctl(struct cdev *dev, u_long cmd, caddr_t data,
 			break;
 		}
 
-		/* ensure allocators are ready */
-		error = netmap_get_memory(priv);
-		ND("get_memory returned %d", error);
-		if (error)
-			break;
-
 		/* protect access to priv from concurrent NIOCREGIF */
-		NMA_LOCK();
-		if (priv->np_ifp != NULL) {	/* thread already registered */
-			error = netmap_set_ringid(priv, nmr->nr_ringid);
-unlock_out:
-			NMA_UNLOCK();
-			break;
-		}
-		/* find the interface and a reference */
-		error = get_ifp(nmr, &ifp); /* keep reference */
-		if (error)
-			goto unlock_out;
-		else if (NETMAP_OWNED_BY_KERN(ifp)) {
-			nm_if_rele(ifp);
-			goto unlock_out;
-		}
-		nifp = netmap_do_regif(priv, ifp, nmr->nr_ringid, &error);
-		if (!nifp) {    /* reg. failed, release priv and ref */
-			nm_if_rele(ifp);        /* return the refcount */
-			priv->np_ifp = NULL;
-			priv->np_nifp = NULL;
-			goto unlock_out;
-		}
+		NMG_LOCK();
+		do {
+			u_int memflags;
 
-		/* the following assignment is a commitment.
-		 * Readers (i.e., poll and *SYNC) check for
-		 * np_nifp != NULL without locking
-		 */
-		wmb(); /* make sure previous writes are visible to all CPUs */
-		priv->np_nifp = nifp;
-		NMA_UNLOCK();
+			if (priv->np_ifp != NULL) {	/* thread already registered */
+				error = netmap_set_ringid(priv, nmr->nr_ringid);
+				break;
+			}
+			/* find the interface and a reference */
+			error = get_ifp(nmr, &ifp, 1 /* create */); /* keep reference */
+			if (error)
+				break;
+			if (NETMAP_OWNED_BY_KERN(ifp)) {
+				nm_if_rele(ifp);
+				error = EBUSY;
+				break;
+			}
+			nifp = netmap_do_regif(priv, ifp, nmr->nr_ringid, &error);
+			if (!nifp) {    /* reg. failed, release priv and ref */
+				nm_if_rele(ifp);        /* return the refcount */
+				priv->np_ifp = NULL;
+				priv->np_nifp = NULL;
+				break;
+			}
 
-		/* return the offset of the netmap_if object */
-		na = NA(ifp); /* retrieve netmap adapter */
-		nmr->nr_rx_rings = na->num_rx_rings;
-		nmr->nr_tx_rings = na->num_tx_rings;
-		nmr->nr_rx_slots = na->num_rx_desc;
-		nmr->nr_tx_slots = na->num_tx_desc;
-		nmr->nr_memsize = nm_mem.nm_totalsize;
-		nmr->nr_offset = netmap_if_offset(nifp);
+			/* return the offset of the netmap_if object */
+			na = NA(ifp); /* retrieve netmap adapter */
+			nmr->nr_rx_rings = na->num_rx_rings;
+			nmr->nr_tx_rings = na->num_tx_rings;
+			nmr->nr_rx_slots = na->num_rx_desc;
+			nmr->nr_tx_slots = na->num_tx_desc;
+			error = netmap_mem_get_info(na->nm_mem, &nmr->nr_memsize, &memflags);
+			if (error) {
+				nm_if_rele(ifp);
+				break;
+			}
+			if (memflags & NETMAP_MEM_PRIVATE) {
+				nmr->nr_ringid |= NETMAP_PRIV_MEM;
+				*(uint32_t *)(uintptr_t)&nifp->ni_flags |= NI_PRIV_MEM;
+			}
+			nmr->nr_offset = netmap_mem_if_offset(na->nm_mem, nifp);
+		} while (0);
+		NMG_UNLOCK();
 		break;
 
 	case NIOCUNREGIF:
@@ -1804,7 +2459,6 @@ unlock_out:
 		}
 		rmb(); /* make sure following reads are not from cache */
 
-
 		ifp = priv->np_ifp;	/* we have a reference */
 
 		if (ifp == NULL) {
@@ -1816,9 +2470,9 @@ unlock_out:
 		na = NA(ifp); /* retrieve netmap adapter */
 		if (priv->np_qfirst == NETMAP_SW_RING) { /* host rings */
 			if (cmd == NIOCTXSYNC)
-				netmap_sync_to_host(na);
+				netmap_txsync_to_host(na);
 			else
-				netmap_sync_from_host(na, NULL, NULL);
+				netmap_rxsync_from_host(na, NULL, NULL);
 			break;
 		}
 		/* find the last ring to scan */
@@ -1827,22 +2481,28 @@ unlock_out:
 			lim = (cmd == NIOCTXSYNC) ?
 			    na->num_tx_rings : na->num_rx_rings;
 
+		krings = (cmd == NIOCTXSYNC) ? na->tx_rings : na->rx_rings;
 		for (i = priv->np_qfirst; i < lim; i++) {
+			struct netmap_kring *kring = krings + i;
+			if (nm_kr_tryget(kring)) {
+				error = EBUSY;
+				goto out;
+			}
 			if (cmd == NIOCTXSYNC) {
-				struct netmap_kring *kring = &na->tx_rings[i];
 				if (netmap_verbose & NM_VERB_TXSYNC)
 					D("pre txsync ring %d cur %d hwcur %d",
 					    i, kring->ring->cur,
 					    kring->nr_hwcur);
-				na->nm_txsync(ifp, i, 1 /* do lock */);
+				na->nm_txsync(ifp, i, NAF_FORCE_RECLAIM);
 				if (netmap_verbose & NM_VERB_TXSYNC)
 					D("post txsync ring %d cur %d hwcur %d",
 					    i, kring->ring->cur,
 					    kring->nr_hwcur);
 			} else {
-				na->nm_rxsync(ifp, i, 1 /* do lock */);
+				na->nm_rxsync(ifp, i, NAF_FORCE_READ);
 				microtime(&na->rx_rings[i].ring->ts);
 			}
+			nm_kr_put(kring);
 		}
 
 		break;
@@ -1858,14 +2518,19 @@ unlock_out:
 	default:	/* allow device-specific ioctls */
 	    {
 		struct socket so;
+
 		bzero(&so, sizeof(so));
-		error = get_ifp(nmr, &ifp); /* keep reference */
-		if (error)
+		NMG_LOCK();
+		error = get_ifp(nmr, &ifp, 0 /* don't create */); /* keep reference */
+		if (error) {
+			NMG_UNLOCK();
 			break;
+		}
 		so.so_vnet = ifp->if_vnet;
 		// so->so_proto not null.
 		error = ifioctl(&so, cmd, data, td);
 		nm_if_rele(ifp);
+		NMG_UNLOCK();
 		break;
 	    }
 
@@ -1874,6 +2539,7 @@ unlock_out:
 		error = EOPNOTSUPP;
 #endif /* linux */
 	}
+out:
 
 	CURVNET_RESTORE();
 	return (error);
@@ -1886,7 +2552,7 @@ unlock_out:
  * Can be called for one or more queues.
  * Return true the event mask corresponding to ready events.
  * If there are no ready events, do a selrecord on either individual
- * selfd or on the global one.
+ * selinfo or on the global one.
  * Device-dependent parts (locking and sync of tx/rx rings)
  * are done through callbacks.
  *
@@ -1901,12 +2567,13 @@ netmap_poll(struct cdev *dev, int events, struct thread *td)
 	struct netmap_adapter *na;
 	struct ifnet *ifp;
 	struct netmap_kring *kring;
-	u_int core_lock, i, check_all, want_tx, want_rx, revents = 0;
+	u_int i, check_all_tx, check_all_rx, want_tx, want_rx, revents = 0;
 	u_int lim_tx, lim_rx, host_forwarded = 0;
 	struct mbq q = { NULL, NULL, 0 };
-	enum {NO_CL, NEED_CL, LOCKED_CL }; /* see below */
 	void *pwait = dev;	/* linux compatibility */
 
+		int retry_tx = 1;
+
 	(void)pwait;
 
 	if (devfs_get_cdevpriv((void **)&priv) != 0 || priv == NULL)
@@ -1932,17 +2599,18 @@ netmap_poll(struct cdev *dev, int events, struct thread *td)
 
 	lim_tx = na->num_tx_rings;
 	lim_rx = na->num_rx_rings;
-	/* how many queues we are scanning */
+
 	if (priv->np_qfirst == NETMAP_SW_RING) {
+		/* handle the host stack ring */
 		if (priv->np_txpoll || want_tx) {
 			/* push any packets up, then we are always ready */
-			netmap_sync_to_host(na);
+			netmap_txsync_to_host(na);
 			revents |= want_tx;
 		}
 		if (want_rx) {
 			kring = &na->rx_rings[lim_rx];
 			if (kring->ring->avail == 0)
-				netmap_sync_from_host(na, td, dev);
+				netmap_rxsync_from_host(na, td, dev);
 			if (kring->ring->avail > 0) {
 				revents |= want_rx;
 			}
@@ -1956,56 +2624,27 @@ netmap_poll(struct cdev *dev, int events, struct thread *td)
 			&& want_rx
 			&& (netmap_fwd || kring->ring->flags & NR_FORWARD) ) {
 		if (kring->ring->avail == 0)
-			netmap_sync_from_host(na, td, dev);
+			netmap_rxsync_from_host(na, td, dev);
 		if (kring->ring->avail > 0)
 			revents |= want_rx;
 	}
 
 	/*
-	 * check_all is set if the card has more than one queue and
+	 * check_all is set if the card has more than one queue AND
 	 * the client is polling all of them. If true, we sleep on
-	 * the "global" selfd, otherwise we sleep on individual selfd
-	 * (we can only sleep on one of them per direction).
-	 * The interrupt routine in the driver should always wake on
-	 * the individual selfd, and also on the global one if the card
-	 * has more than one ring.
-	 *
-	 * If the card has only one lock, we just use that.
-	 * If the card has separate ring locks, we just use those
-	 * unless we are doing check_all, in which case the whole
-	 * loop is wrapped by the global lock.
-	 * We acquire locks only when necessary: if poll is called
-	 * when buffers are available, we can just return without locks.
+	 * the "global" selinfo, otherwise we sleep on individual selinfo
+	 * (FreeBSD only allows two selinfo's per file descriptor).
+	 * The interrupt routine in the driver wake one or the other
+	 * (or both) depending on which clients are active.
 	 *
 	 * rxsync() is only called if we run out of buffers on a POLLIN.
 	 * txsync() is called if we run out of buffers on POLLOUT, or
 	 * there are pending packets to send. The latter can be disabled
 	 * passing NETMAP_NO_TX_POLL in the NIOCREG call.
 	 */
-	check_all = (priv->np_qlast == NETMAP_HW_RING) && (lim_tx > 1 || lim_rx > 1);
+	check_all_tx = (priv->np_qlast == NETMAP_HW_RING) && (lim_tx > 1);
+	check_all_rx = (priv->np_qlast == NETMAP_HW_RING) && (lim_rx > 1);
 
-	/*
-	 * core_lock indicates what to do with the core lock.
-	 * The core lock is used when either the card has no individual
-	 * locks, or it has individual locks but we are cheking all
-	 * rings so we need the core lock to avoid missing wakeup events.
-	 *
-	 * It has three possible states:
-	 * NO_CL	we don't need to use the core lock, e.g.
-	 *		because we are protected by individual locks.
-	 * NEED_CL	we need the core lock. In this case, when we
-	 *		call the lock routine, move to LOCKED_CL
-	 *		to remember to release the lock once done.
-	 * LOCKED_CL	core lock is set, so we need to release it.
-	 */
-	core_lock = (check_all || !na->separate_locks) ? NEED_CL : NO_CL;
-#ifdef NM_BRIDGE
-	/* the bridge uses separate locks */
-	if (na->nm_register == bdg_netmap_reg) {
-		ND("not using core lock for %s", ifp->if_xname);
-		core_lock = NO_CL;
-	}
-#endif /* NM_BRIDGE */
 	if (priv->np_qlast != NETMAP_HW_RING) {
 		lim_tx = lim_rx = priv->np_qlast;
 	}
@@ -2036,28 +2675,33 @@ netmap_poll(struct cdev *dev, int events, struct thread *td)
 	 * to avoid that the tx rings stall).
 	 */
 	if (priv->np_txpoll || want_tx) {
+		/* If we really want to be woken up (want_tx),
+		 * do a selrecord, either on the global or on
+		 * the private structure.  Then issue the txsync
+		 * so there is no race in the selrecord/selwait
+		 */
 flush_tx:
 		for (i = priv->np_qfirst; i < lim_tx; i++) {
 			kring = &na->tx_rings[i];
 			/*
-			 * Skip the current ring if want_tx == 0
+			 * Skip this ring if want_tx == 0
 			 * (we have already done a successful sync on
 			 * a previous ring) AND kring->cur == kring->hwcur
 			 * (there are no pending transmissions for this ring).
 			 */
 			if (!want_tx && kring->ring->cur == kring->nr_hwcur)
 				continue;
-			if (core_lock == NEED_CL) {
-				na->nm_lock(ifp, NETMAP_CORE_LOCK, 0);
-				core_lock = LOCKED_CL;
+			/* make sure only one user thread is doing this */
+			if (nm_kr_tryget(kring)) {
+				ND("ring %p busy is %d", kring, (int)kring->nr_busy);
+				revents |= POLLERR;
+				goto out;
 			}
-			if (na->separate_locks)
-				na->nm_lock(ifp, NETMAP_TX_LOCK, i);
+
 			if (netmap_verbose & NM_VERB_TXSYNC)
 				D("send %d on %s %d",
-					kring->ring->cur,
-					ifp->if_xname, i);
-			if (na->nm_txsync(ifp, i, 0 /* no lock */))
+					kring->ring->cur, ifp->if_xname, i);
+			if (na->nm_txsync(ifp, i, 0))
 				revents |= POLLERR;
 
 			/* Check avail/call selrecord only if called with POLLOUT */
@@ -2068,11 +2712,15 @@ flush_tx:
 					 */
 					revents |= want_tx;
 					want_tx = 0;
-				} else if (!check_all)
-					selrecord(td, &kring->si);
+				}
 			}
-			if (na->separate_locks)
-				na->nm_lock(ifp, NETMAP_TX_UNLOCK, i);
+			nm_kr_put(kring);
+		}
+		if (want_tx && retry_tx) {
+			selrecord(td, check_all_tx ?
+			    &na->tx_si : &na->tx_rings[priv->np_qfirst].si);
+			retry_tx = 0;
+			goto flush_tx;
 		}
 	}
 
@@ -2081,112 +2729,71 @@ flush_tx:
 	 * Do it on all rings because otherwise we starve.
 	 */
 	if (want_rx) {
+		int retry_rx = 1;
+do_retry_rx:
 		for (i = priv->np_qfirst; i < lim_rx; i++) {
 			kring = &na->rx_rings[i];
-			if (core_lock == NEED_CL) {
-				na->nm_lock(ifp, NETMAP_CORE_LOCK, 0);
-				core_lock = LOCKED_CL;
+
+			if (nm_kr_tryget(kring)) {
+				revents |= POLLERR;
+				goto out;
 			}
-			if (na->separate_locks)
-				na->nm_lock(ifp, NETMAP_RX_LOCK, i);
+
+			/* XXX NR_FORWARD should only be read on
+			 * physical or NIC ports
+			 */
 			if (netmap_fwd ||kring->ring->flags & NR_FORWARD) {
 				ND(10, "forwarding some buffers up %d to %d",
 				    kring->nr_hwcur, kring->ring->cur);
 				netmap_grab_packets(kring, &q, netmap_fwd);
 			}
 
-			if (na->nm_rxsync(ifp, i, 0 /* no lock */))
+			if (na->nm_rxsync(ifp, i, 0))
 				revents |= POLLERR;
 			if (netmap_no_timestamp == 0 ||
 					kring->ring->flags & NR_TIMESTAMP) {
 				microtime(&kring->ring->ts);
 			}
 
-			if (kring->ring->avail > 0)
+			if (kring->ring->avail > 0) {
 				revents |= want_rx;
-			else if (!check_all)
-				selrecord(td, &kring->si);
-			if (na->separate_locks)
-				na->nm_lock(ifp, NETMAP_RX_UNLOCK, i);
+				retry_rx = 0;
+			}
+			nm_kr_put(kring);
+		}
+		if (retry_rx) {
+			retry_rx = 0;
+			selrecord(td, check_all_rx ?
+			    &na->rx_si : &na->rx_rings[priv->np_qfirst].si);
+			goto do_retry_rx;
 		}
 	}
-	if (check_all && revents == 0) { /* signal on the global queue */
-		if (want_tx)
-			selrecord(td, &na->tx_si);
-		if (want_rx)
-			selrecord(td, &na->rx_si);
-	}
 
-	/* forward host to the netmap ring */
+	/* forward host to the netmap ring.
+	 * I am accessing nr_hwavail without lock, but netmap_transmit
+	 * can only increment it, so the operation is safe.
+	 */
 	kring = &na->rx_rings[lim_rx];
-	if (kring->nr_hwavail > 0)
-		ND("host rx %d has %d packets", lim_rx, kring->nr_hwavail);
 	if ( (priv->np_qlast == NETMAP_HW_RING) // XXX check_all
 			&& (netmap_fwd || kring->ring->flags & NR_FORWARD)
 			 && kring->nr_hwavail > 0 && !host_forwarded) {
-		if (core_lock == NEED_CL) {
-			na->nm_lock(ifp, NETMAP_CORE_LOCK, 0);
-			core_lock = LOCKED_CL;
-		}
 		netmap_sw_to_nic(na);
 		host_forwarded = 1; /* prevent another pass */
 		want_rx = 0;
 		goto flush_tx;
 	}
 
-	if (core_lock == LOCKED_CL)
-		na->nm_lock(ifp, NETMAP_CORE_UNLOCK, 0);
 	if (q.head)
 		netmap_send_up(na->ifp, q.head);
 
+out:
+
 	return (revents);
 }
 
 /*------- driver support routines ------*/
 
 
-/*
- * default lock wrapper.
- */
-static void
-netmap_lock_wrapper(struct ifnet *dev, int what, u_int queueid)
-{
-	struct netmap_adapter *na = NA(dev);
-
-	switch (what) {
-#ifdef linux	/* some system do not need lock on register */
-	case NETMAP_REG_LOCK:
-	case NETMAP_REG_UNLOCK:
-		break;
-#endif /* linux */
-
-	case NETMAP_CORE_LOCK:
-		mtx_lock(&na->core_lock);
-		break;
-
-	case NETMAP_CORE_UNLOCK:
-		mtx_unlock(&na->core_lock);
-		break;
-
-	case NETMAP_TX_LOCK:
-		mtx_lock(&na->tx_rings[queueid].q_lock);
-		break;
-
-	case NETMAP_TX_UNLOCK:
-		mtx_unlock(&na->tx_rings[queueid].q_lock);
-		break;
-
-	case NETMAP_RX_LOCK:
-		mtx_lock(&na->rx_rings[queueid].q_lock);
-		break;
-
-	case NETMAP_RX_UNLOCK:
-		mtx_unlock(&na->rx_rings[queueid].q_lock);
-		break;
-	}
-}
-
-
 /*
  * Initialize a ``netmap_adapter`` object created by driver on attach.
  * We allocate a block of memory with room for a struct netmap_adapter
@@ -2202,14 +2809,15 @@ netmap_lock_wrapper(struct ifnet *dev, int what, u_int queueid)
  * setups.
  */
 int
-netmap_attach(struct netmap_adapter *arg, int num_queues)
+netmap_attach(struct netmap_adapter *arg, u_int num_queues)
 {
 	struct netmap_adapter *na = NULL;
 	struct ifnet *ifp = arg ? arg->ifp : NULL;
-	int len;
+	size_t len;
 
 	if (arg == NULL || ifp == NULL)
 		goto fail;
+	/* a VALE port uses two endpoints */
 	len = nma_is_vp(arg) ? sizeof(*na) : sizeof(*na) * 2;
 	na = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (na == NULL)
@@ -2223,10 +2831,6 @@ netmap_attach(struct netmap_adapter *arg, int num_queues)
 	na->refcount = na->na_single = na->na_multi = 0;
 	/* Core lock initialized here, others after netmap_if_new. */
 	mtx_init(&na->core_lock, "netmap core lock", MTX_NETWORK_LOCK, MTX_DEF);
-	if (na->nm_lock == NULL) {
-		ND("using default locks for %s", ifp->if_xname);
-		na->nm_lock = netmap_lock_wrapper;
-	}
 #ifdef linux
 	if (ifp->netdev_ops) {
 		ND("netdev_ops %p", ifp->netdev_ops);
@@ -2237,8 +2841,9 @@ netmap_attach(struct netmap_adapter *arg, int num_queues)
 		na->nm_ndo = *ifp->netdev_ops;
 #endif
 	}
-	na->nm_ndo.ndo_start_xmit = linux_netmap_start;
-#endif
+	na->nm_ndo.ndo_start_xmit = linux_netmap_start_xmit;
+#endif /* linux */
+	na->nm_mem = arg->nm_mem ? arg->nm_mem : &nm_mem;
 	if (!nma_is_vp(arg))
 		netmap_attach_sw(ifp);
 	D("success for %s", ifp->if_xname);
@@ -2269,6 +2874,8 @@ netmap_detach(struct ifnet *ifp)
 		D("freeing leftover tx_rings");
 		free(na->tx_rings, M_DEVBUF);
 	}
+	if (na->na_flags & NAF_MEM_OWNER)
+		netmap_mem_private_delete(na->nm_mem);
 	bzero(na, sizeof(*na));
 	WNA(ifp) = NULL;
 	free(na, M_DEVBUF);
@@ -2276,84 +2883,103 @@ netmap_detach(struct ifnet *ifp)
 
 
 int
-nm_bdg_flush(struct nm_bdg_fwd *ft, int n, struct netmap_adapter *na, u_int ring_nr);
-
-/* we don't need to lock myself */
-static int
-bdg_netmap_start(struct ifnet *ifp, struct mbuf *m)
-{
-	struct netmap_adapter *na = SWNA(ifp);
-	struct nm_bdg_fwd *ft = na->rx_rings[0].nkr_ft;
-	char *buf = NMB(&na->rx_rings[0].ring->slot[0]);
-	u_int len = MBUF_LEN(m);
-
-	if (!na->na_bdg) /* SWNA is not configured to be attached */
-		return EBUSY;
-	m_copydata(m, 0, len, buf);
-	ft->ft_flags = 0;	// XXX could be indirect ?
-	ft->ft_len = len;
-	ft->ft_buf = buf;
-	ft->ft_next = NM_BDG_BATCH; // XXX is it needed ?
-	nm_bdg_flush(ft, 1, na, 0);
-
-	/* release the mbuf in either cases of success or failure. As an
-	 * alternative, put the mbuf in a free list and free the list
-	 * only when really necessary.
-	 */
-	m_freem(m);
-
-	return (0);
-}
+nm_bdg_flush(struct nm_bdg_fwd *ft, u_int n,
+	struct netmap_adapter *na, u_int ring_nr);
 
 
 /*
  * Intercept packets from the network stack and pass them
  * to netmap as incoming packets on the 'software' ring.
- * We are not locked when called.
+ * We rely on the OS to make sure that the ifp and na do not go
+ * away (typically the caller checks for IFF_DRV_RUNNING or the like).
+ * In nm_register() or whenever there is a reinitialization,
+ * we make sure to access the core lock and per-ring locks
+ * so that IFCAP_NETMAP is visible here.
  */
 int
-netmap_start(struct ifnet *ifp, struct mbuf *m)
+netmap_transmit(struct ifnet *ifp, struct mbuf *m)
 {
 	struct netmap_adapter *na = NA(ifp);
-	struct netmap_kring *kring = &na->rx_rings[na->num_rx_rings];
+	struct netmap_kring *kring;
 	u_int i, len = MBUF_LEN(m);
-	u_int error = EBUSY, lim = kring->nkr_num_slots - 1;
+	u_int error = EBUSY, lim;
 	struct netmap_slot *slot;
 
+	// XXX [Linux] we do not need this lock
+	// if we follow the down/configure/up protocol -gl
+	// mtx_lock(&na->core_lock);
+	if ( (ifp->if_capenable & IFCAP_NETMAP) == 0) {
+		/* interface not in netmap mode anymore */
+		error = ENXIO;
+		goto done;
+	}
+
+	kring = &na->rx_rings[na->num_rx_rings];
+	lim = kring->nkr_num_slots - 1;
 	if (netmap_verbose & NM_VERB_HOST)
 		D("%s packet %d len %d from the stack", ifp->if_xname,
 			kring->nr_hwcur + kring->nr_hwavail, len);
-	if (len > NETMAP_BUF_SIZE) { /* too long for us */
+	// XXX reconsider long packets if we handle fragments
+	if (len > NETMAP_BDG_BUF_SIZE(na->nm_mem)) { /* too long for us */
 		D("%s from_host, drop packet size %d > %d", ifp->if_xname,
-			len, NETMAP_BUF_SIZE);
-		m_freem(m);
-		return EINVAL;
+			len, NETMAP_BDG_BUF_SIZE(na->nm_mem));
+		goto done;
 	}
-	if (na->na_bdg)
-		return bdg_netmap_start(ifp, m);
+	if (SWNA(ifp)->na_bdg) {
+		struct nm_bdg_fwd *ft;
+		char *dst;
 
-	na->nm_lock(ifp, NETMAP_CORE_LOCK, 0);
+		na = SWNA(ifp); /* we operate on the host port */
+		ft = na->rx_rings[0].nkr_ft;
+		dst = BDG_NMB(na->nm_mem, &na->rx_rings[0].ring->slot[0]);
+
+		/* use slot 0 in the ft, there is nothing queued here */
+		/* XXX we can save the copy calling m_copydata in nm_bdg_flush,
+		 * need a special flag for this.
+		 */
+		m_copydata(m, 0, (int)len, dst);
+		ft->ft_flags = 0;
+		ft->ft_len = len;
+		ft->ft_buf = dst;
+		ft->ft_next = NM_FT_NULL;
+		ft->ft_frags = 1;
+		if (netmap_verbose & NM_VERB_HOST)
+			RD(5, "pkt %p size %d to bridge port %d",
+				dst, len, na->bdg_port);
+		nm_bdg_flush(ft, 1, na, 0);
+		na = NA(ifp);	/* back to the regular object/lock */
+		error = 0;
+		goto done;
+	}
+
+	/* protect against other instances of netmap_transmit,
+	 * and userspace invocations of rxsync().
+	 * XXX could reuse core_lock
+	 */
+	// XXX [Linux] there can be no other instances of netmap_transmit
+	// on this same ring, but we still need this lock to protect
+	// concurrent access from netmap_sw_to_nic() -gl
+	mtx_lock(&kring->q_lock);
 	if (kring->nr_hwavail >= lim) {
 		if (netmap_verbose)
 			D("stack ring %s full\n", ifp->if_xname);
-		goto done;	/* no space */
+	} else {
+		/* compute the insert position */
+		i = nm_kr_rxpos(kring);
+		slot = &kring->ring->slot[i];
+		m_copydata(m, 0, (int)len, BDG_NMB(na->nm_mem, slot));
+		slot->len = len;
+		slot->flags = kring->nkr_slot_flags;
+		kring->nr_hwavail++;
+		if (netmap_verbose  & NM_VERB_HOST)
+			D("wake up host ring %s %d", na->ifp->if_xname, na->num_rx_rings);
+		selwakeuppri(&kring->si, PI_NET);
+		error = 0;
 	}
+	mtx_unlock(&kring->q_lock);
 
-	/* compute the insert position */
-	i = kring->nr_hwcur + kring->nr_hwavail;
-	if (i > lim)
-		i -= lim + 1;
-	slot = &kring->ring->slot[i];
-	m_copydata(m, 0, len, NMB(slot));
-	slot->len = len;
-	slot->flags = kring->nkr_slot_flags;
-	kring->nr_hwavail++;
-	if (netmap_verbose  & NM_VERB_HOST)
-		D("wake up host ring %s %d", na->ifp->if_xname, na->num_rx_rings);
-	selwakeuppri(&kring->si, PI_NET);
-	error = 0;
 done:
-	na->nm_lock(ifp, NETMAP_CORE_UNLOCK, 0);
+	// mtx_unlock(&na->core_lock);
 
 	/* release the mbuf in either cases of success or failure. As an
 	 * alternative, put the mbuf in a free list and free the list
@@ -2371,17 +2997,29 @@ done:
  * If netmap mode is not set just return NULL.
  */
 struct netmap_slot *
-netmap_reset(struct netmap_adapter *na, enum txrx tx, int n,
+netmap_reset(struct netmap_adapter *na, enum txrx tx, u_int n,
 	u_int new_cur)
 {
 	struct netmap_kring *kring;
 	int new_hwofs, lim;
 
-	if (na == NULL)
+	if (na == NULL) {
+		D("NULL na, should not happen");
 		return NULL;	/* no netmap support here */
-	if (!(na->ifp->if_capenable & IFCAP_NETMAP))
+	}
+	if (!(na->ifp->if_capenable & IFCAP_NETMAP)) {
+		ND("interface not in netmap mode");
 		return NULL;	/* nothing to reinitialize */
+	}
 
+	/* XXX note- in the new scheme, we are not guaranteed to be
+	 * under lock (e.g. when called on a device reset).
+	 * In this case, we should set a flag and do not trust too
+	 * much the values. In practice: TODO
+	 * - set a RESET flag somewhere in the kring
+	 * - do the processing in a conservative way
+	 * - let the *sync() fixup at the end.
+	 */
 	if (tx == NR_TX) {
 		if (n >= na->num_tx_rings)
 			return NULL;
@@ -2397,13 +3035,15 @@ netmap_reset(struct netmap_adapter *na, enum txrx tx, int n,
 	if (new_hwofs > lim)
 		new_hwofs -= lim + 1;
 
-	/* Alwayws set the new offset value and realign the ring. */
+	/* Always set the new offset value and realign the ring. */
+	D("%s hwofs %d -> %d, hwavail %d -> %d",
+		tx == NR_TX ? "TX" : "RX",
+		kring->nkr_hwofs, new_hwofs,
+		kring->nr_hwavail,
+		tx == NR_TX ? lim : kring->nr_hwavail);
 	kring->nkr_hwofs = new_hwofs;
 	if (tx == NR_TX)
-		kring->nr_hwavail = kring->nkr_num_slots - 1;
-	ND(10, "new hwofs %d on %s %s[%d]",
-			kring->nkr_hwofs, na->ifp->if_xname,
-			tx == NR_TX ? "TX" : "RX", n);
+		kring->nr_hwavail = lim;
 
 #if 0 // def linux
 	/* XXX check that the mappings are correct */
@@ -2416,7 +3056,7 @@ netmap_reset(struct netmap_adapter *na, enum txrx tx, int n,
 
 #endif /* linux */
 	/*
-	 * Wakeup on the individual and global lock
+	 * Wakeup on the individual and global selwait
 	 * We do the wakeup here, but the ring is not yet reconfigured.
 	 * However, we are under lock so there are no races.
 	 */
@@ -2426,43 +3066,79 @@ netmap_reset(struct netmap_adapter *na, enum txrx tx, int n,
 }
 
 
-/* returns the next position in the ring */
+/*
+ * Grab packets from a kring, move them into the ft structure
+ * associated to the tx (input) port. Max one instance per port,
+ * filtered on input (ioctl, poll or XXX).
+ * Returns the next position in the ring.
+ */
 static int
 nm_bdg_preflush(struct netmap_adapter *na, u_int ring_nr,
 	struct netmap_kring *kring, u_int end)
 {
 	struct netmap_ring *ring = kring->ring;
-	struct nm_bdg_fwd *ft = kring->nkr_ft;
+	struct nm_bdg_fwd *ft;
 	u_int j = kring->nr_hwcur, lim = kring->nkr_num_slots - 1;
 	u_int ft_i = 0;	/* start from 0 */
+	u_int frags = 1; /* how many frags ? */
+	struct nm_bridge *b = na->na_bdg;
 
-	for (; likely(j != end); j = unlikely(j == lim) ? 0 : j+1) {
+	/* To protect against modifications to the bridge we acquire a
+	 * shared lock, waiting if we can sleep (if the source port is
+	 * attached to a user process) or with a trylock otherwise (NICs).
+	 */
+	ND("wait rlock for %d packets", ((j > end ? lim+1 : 0) + end) - j);
+	if (na->na_flags & NAF_BDG_MAYSLEEP)
+		BDG_RLOCK(b);
+	else if (!BDG_RTRYLOCK(b))
+		return 0;
+	ND(5, "rlock acquired for %d packets", ((j > end ? lim+1 : 0) + end) - j);
+	ft = kring->nkr_ft;
+
+	for (; likely(j != end); j = nm_next(j, lim)) {
 		struct netmap_slot *slot = &ring->slot[j];
-		char *buf = NMB(slot);
-		int len = ft[ft_i].ft_len = slot->len;
+		char *buf;
 
+		ft[ft_i].ft_len = slot->len;
 		ft[ft_i].ft_flags = slot->flags;
 
 		ND("flags is 0x%x", slot->flags);
 		/* this slot goes into a list so initialize the link field */
-		ft[ft_i].ft_next = NM_BDG_BATCH; /* equivalent to NULL */
-		if (unlikely(len < 14))
-			continue;
+		ft[ft_i].ft_next = NM_FT_NULL;
 		buf = ft[ft_i].ft_buf = (slot->flags & NS_INDIRECT) ?
-			*((void **)buf) : buf;
+			(void *)(uintptr_t)slot->ptr : BDG_NMB(na->nm_mem, slot);
 		prefetch(buf);
-		if (unlikely(++ft_i == netmap_bridge))
+		++ft_i;
+		if (slot->flags & NS_MOREFRAG) {
+			frags++;
+			continue;
+		}
+		if (unlikely(netmap_verbose && frags > 1))
+			RD(5, "%d frags at %d", frags, ft_i - frags);
+		ft[ft_i - frags].ft_frags = frags;
+		frags = 1;
+		if (unlikely((int)ft_i >= bridge_batch))
 			ft_i = nm_bdg_flush(ft, ft_i, na, ring_nr);
 	}
+	if (frags > 1) {
+		D("truncate incomplete fragment at %d (%d frags)", ft_i, frags);
+		// ft_i > 0, ft[ft_i-1].flags has NS_MOREFRAG
+		ft[ft_i - 1].ft_frags &= ~NS_MOREFRAG;
+		ft[ft_i - frags].ft_frags = frags - 1;
+	}
 	if (ft_i)
 		ft_i = nm_bdg_flush(ft, ft_i, na, ring_nr);
+	BDG_RUNLOCK(b);
 	return j;
 }
 
 
 /*
- * Pass packets from nic to the bridge. Must be called with
- * proper locks on the source interface.
+ * Pass packets from nic to the bridge.
+ * XXX TODO check locking: this is called from the interrupt
+ * handler so we should make sure that the interface is not
+ * disconnected while passing down an interrupt.
+ *
  * Note, no user process can access this NIC so we can ignore
  * the info in the 'ring'.
  */
@@ -2472,20 +3148,24 @@ netmap_nic_to_bdg(struct ifnet *ifp, u_int ring_nr)
 	struct netmap_adapter *na = NA(ifp);
 	struct netmap_kring *kring = &na->rx_rings[ring_nr];
 	struct netmap_ring *ring = kring->ring;
-	int j, k, lim = kring->nkr_num_slots - 1;
+	u_int j, k;
 
-	/* fetch packets that have arrived */
-	na->nm_rxsync(ifp, ring_nr, 0);
-	/* XXX we don't count reserved, but it should be 0 */
-	j = kring->nr_hwcur;
-	k = j + kring->nr_hwavail;
-	if (k > lim)
-		k -= lim + 1;
-	if (k == j && netmap_verbose) {
+	/* make sure that only one thread is ever in here,
+	 * after which we can unlock. Probably unnecessary XXX.
+	 */
+	if (nm_kr_tryget(kring)) 
+		return;
+	/* fetch packets that have arrived.
+	 * XXX maybe do this in a loop ?
+	 */
+	if (na->nm_rxsync(ifp, ring_nr, 0))
+		goto put_out;
+	if (kring->nr_hwavail == 0 && netmap_verbose) {
 		D("how strange, interrupt with no packets on %s",
 			ifp->if_xname);
-		return;
+		goto put_out;
 	}
+	k = nm_kr_rxpos(kring);
 
 	j = nm_bdg_preflush(na, ring_nr, kring, k);
 
@@ -2496,42 +3176,43 @@ netmap_nic_to_bdg(struct ifnet *ifp, u_int ring_nr)
 	ring->cur = j;
 	ring->avail = 0;
 	na->nm_rxsync(ifp, ring_nr, 0);
+
+put_out:
+	nm_kr_put(kring);
 	return;
 }
 
 
 /*
- * Default functions to handle rx/tx interrupts
- * we have 4 cases:
- * 1 ring, single lock:
- *	lock(core); wake(i=0); unlock(core)
- * N rings, single lock:
- *	lock(core); wake(i); wake(N+1) unlock(core)
- * 1 ring, separate locks: (i=0)
- *	lock(i); wake(i); unlock(i)
- * N rings, separate locks:
- *	lock(i); wake(i); unlock(i); lock(core) wake(N+1) unlock(core)
- * work_done is non-null on the RX path.
+ * Default functions to handle rx/tx interrupts from a physical device.
+ * "work_done" is non-null on the RX path, NULL for the TX path.
+ * We rely on the OS to make sure that there is only one active
+ * instance per queue, and that there is appropriate locking.
  *
- * The 'q' argument also includes flag to tell whether the queue is
- * already locked on enter, and whether it should remain locked on exit.
- * This helps adapting to different defaults in drivers and OSes.
+ * If the card is not in netmap mode, simply return 0,
+ * so that the caller proceeds with regular processing.
+ *
+ * If the card is connected to a netmap file descriptor,
+ * do a selwakeup on the individual queue, plus one on the global one
+ * if needed (multiqueue card _and_ there are multiqueue listeners),
+ * and return 1.
+ *
+ * Finally, if called on rx from an interface connected to a switch,
+ * calls the proper forwarding routine, and return 1.
  */
 int
-netmap_rx_irq(struct ifnet *ifp, int q, int *work_done)
+netmap_rx_irq(struct ifnet *ifp, u_int q, u_int *work_done)
 {
 	struct netmap_adapter *na;
-	struct netmap_kring *r;
-	NM_SELINFO_T *main_wq;
-	int locktype, unlocktype, nic_to_bridge, lock;
+	struct netmap_kring *kring;
 
 	if (!(ifp->if_capenable & IFCAP_NETMAP))
 		return 0;
 
-	lock = q & (NETMAP_LOCKED_ENTER | NETMAP_LOCKED_EXIT);
-	q = q & NETMAP_RING_MASK;
+	q &= NETMAP_RING_MASK;
 
-	ND(5, "received %s queue %d", work_done ? "RX" : "TX" , q);
+	if (netmap_verbose)
+		RD(5, "received %s queue %d", work_done ? "RX" : "TX" , q);
 	na = NA(ifp);
 	if (na->na_flags & NAF_SKIP_INTR) {
 		ND("use regular interrupt");
@@ -2541,57 +3222,24 @@ netmap_rx_irq(struct ifnet *ifp, int q, int *work_done)
 	if (work_done) { /* RX path */
 		if (q >= na->num_rx_rings)
 			return 0;	// not a physical queue
-		r = na->rx_rings + q;
-		r->nr_kflags |= NKR_PENDINTR;
-		main_wq = (na->num_rx_rings > 1) ? &na->rx_si : NULL;
-		/* set a flag if the NIC is attached to a VALE switch */
-		nic_to_bridge = (na->na_bdg != NULL);
-		locktype = NETMAP_RX_LOCK;
-		unlocktype = NETMAP_RX_UNLOCK;
+		kring = na->rx_rings + q;
+		kring->nr_kflags |= NKR_PENDINTR;	// XXX atomic ?
+		if (na->na_bdg != NULL) {
+			netmap_nic_to_bdg(ifp, q);
+		} else {
+			selwakeuppri(&kring->si, PI_NET);
+			if (na->num_rx_rings > 1 /* or multiple listeners */ )
+				selwakeuppri(&na->rx_si, PI_NET);
+		}
+		*work_done = 1; /* do not fire napi again */
 	} else { /* TX path */
 		if (q >= na->num_tx_rings)
 			return 0;	// not a physical queue
-		r = na->tx_rings + q;
-		main_wq = (na->num_tx_rings > 1) ? &na->tx_si : NULL;
-		work_done = &q; /* dummy */
-		nic_to_bridge = 0;
-		locktype = NETMAP_TX_LOCK;
-		unlocktype = NETMAP_TX_UNLOCK;
+		kring = na->tx_rings + q;
+		selwakeuppri(&kring->si, PI_NET);
+		if (na->num_tx_rings > 1 /* or multiple listeners */ )
+			selwakeuppri(&na->tx_si, PI_NET);
 	}
-	if (na->separate_locks) {
-		if (!(lock & NETMAP_LOCKED_ENTER))
-			na->nm_lock(ifp, locktype, q);
-		/* If a NIC is attached to a bridge, flush packets
-		 * (and no need to wakeup anyone). Otherwise, wakeup
-		 * possible processes waiting for packets.
-		 */
-		if (nic_to_bridge)
-			netmap_nic_to_bdg(ifp, q);
-		else
-			selwakeuppri(&r->si, PI_NET);
-		na->nm_lock(ifp, unlocktype, q);
-		if (main_wq && !nic_to_bridge) {
-			na->nm_lock(ifp, NETMAP_CORE_LOCK, 0);
-			selwakeuppri(main_wq, PI_NET);
-			na->nm_lock(ifp, NETMAP_CORE_UNLOCK, 0);
-		}
-		/* lock the queue again if requested */
-		if (lock & NETMAP_LOCKED_EXIT)
-			na->nm_lock(ifp, locktype, q);
-	} else {
-		if (!(lock & NETMAP_LOCKED_ENTER))
-			na->nm_lock(ifp, NETMAP_CORE_LOCK, 0);
-		if (nic_to_bridge)
-			netmap_nic_to_bdg(ifp, q);
-		else {
-			selwakeuppri(&r->si, PI_NET);
-			if (main_wq)
-				selwakeuppri(main_wq, PI_NET);
-		}
-		if (!(lock & NETMAP_LOCKED_EXIT))
-			na->nm_lock(ifp, NETMAP_CORE_UNLOCK, 0);
-	}
-	*work_done = 1; /* do not fire napi again */
 	return 1;
 }
 
@@ -2625,11 +3273,10 @@ linux_netmap_poll(struct file * file, struct poll_table_struct *pwait)
 static int
 linux_netmap_mmap(struct file *f, struct vm_area_struct *vma)
 {
-	int lut_skip, i, j;
-	int user_skip = 0;
-	struct lut_entry *l_entry;
 	int error = 0;
-	unsigned long off, tomap;
+	unsigned long off, va;
+	vm_ooffset_t pa;
+	struct netmap_priv_d *priv = f->private_data;
 	/*
 	 * vma->vm_start: start of mapping user address space
 	 * vma->vm_end: end of the mapping user address space
@@ -2638,69 +3285,45 @@ linux_netmap_mmap(struct file *f, struct vm_area_struct *vma)
 
 	// XXX security checks
 
-	error = netmap_get_memory(f->private_data);
+	error = netmap_get_memory(priv);
 	ND("get_memory returned %d", error);
 	if (error)
 	    return -error;
 
-	off = vma->vm_pgoff << PAGE_SHIFT; /* offset in bytes */
-	tomap = vma->vm_end - vma->vm_start;
-	for (i = 0; i < NETMAP_POOLS_NR; i++) {  /* loop through obj_pools */
-		const struct netmap_obj_pool *p = &nm_mem.pools[i];
-		/*
-		 * In each pool memory is allocated in clusters
-		 * of size _clustsize, each containing clustentries
-		 * entries. For each object k we already store the
-		 * vtophys mapping in lut[k] so we use that, scanning
-		 * the lut[] array in steps of clustentries,
-		 * and we map each cluster (not individual pages,
-		 * it would be overkill -- XXX slow ? 20130415).
-		 */
-
-		/*
-		 * We interpret vm_pgoff as an offset into the whole
-		 * netmap memory, as if all clusters where contiguous.
-		 */
-		for (lut_skip = 0, j = 0; j < p->_numclusters; j++, lut_skip += p->clustentries) {
-			unsigned long paddr, mapsize;
-			if (p->_clustsize <= off) {
-				off -= p->_clustsize;
-				continue;
-			}
-			l_entry = &p->lut[lut_skip]; /* first obj in the cluster */
-			paddr = l_entry->paddr + off;
-			mapsize = p->_clustsize - off;
-			off = 0;
-			if (mapsize > tomap)
-				mapsize = tomap;
-			ND("remap_pfn_range(%lx, %lx, %lx)",
-				vma->vm_start + user_skip,
-				paddr >> PAGE_SHIFT, mapsize);
-			if (remap_pfn_range(vma, vma->vm_start + user_skip,
-					paddr >> PAGE_SHIFT, mapsize,
-					vma->vm_page_prot))
-				return -EAGAIN; // XXX check return value
-			user_skip += mapsize;
-			tomap -= mapsize;
-			if (tomap == 0)
-				goto done;
-		}
+	if ((vma->vm_start & ~PAGE_MASK) || (vma->vm_end & ~PAGE_MASK)) {
+		ND("vm_start = %lx vm_end = %lx", vma->vm_start, vma->vm_end);
+		return -EINVAL;
 	}
-done:
 
+	for (va = vma->vm_start, off = vma->vm_pgoff;
+	     va < vma->vm_end;
+	     va += PAGE_SIZE, off++)
+	{
+		pa = netmap_mem_ofstophys(priv->np_mref, off << PAGE_SHIFT);
+		if (pa == 0) 
+			return -EINVAL;
+	
+		ND("va %lx pa %p", va, pa);	
+		error = remap_pfn_range(vma, va, pa >> PAGE_SHIFT, PAGE_SIZE, vma->vm_page_prot);
+		if (error) 
+			return error;
+	}
 	return 0;
 }
 
 
+/*
+ * This one is probably already protected by the netif lock XXX
+ */
 static netdev_tx_t
-linux_netmap_start(struct sk_buff *skb, struct net_device *dev)
+linux_netmap_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-	netmap_start(dev, skb);
+	netmap_transmit(dev, skb);
 	return (NETDEV_TX_OK);
 }
 
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)	// XXX was 38
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)	// XXX was 37
 #define LIN_IOCTL_NAME	.ioctl
 int
 linux_netmap_ioctl(struct inode *inode, struct file *file, u_int cmd, u_long data /* arg */)
@@ -2714,6 +3337,9 @@ linux_netmap_ioctl(struct file *file, u_int cmd, u_long data /* arg */)
 	struct nmreq nmr;
 	bzero(&nmr, sizeof(nmr));
 
+	if (cmd == NIOCTXSYNC || cmd == NIOCRXSYNC) {
+		data = 0;	/* no argument required here */
+	}
 	if (data && copy_from_user(&nmr, (void *)data, sizeof(nmr) ) != 0)
 		return -EFAULT;
 	ret = netmap_ioctl(NULL, cmd, (caddr_t)&nmr, 0, (void *)file);
@@ -2791,6 +3417,8 @@ EXPORT_SYMBOL(netmap_rx_irq);		// default irq handler
 EXPORT_SYMBOL(netmap_no_pendintr);	// XXX mitigation - should go away
 EXPORT_SYMBOL(netmap_bdg_ctl);		// bridge configuration routine
 EXPORT_SYMBOL(netmap_bdg_learning);	// the default lookup function
+EXPORT_SYMBOL(netmap_disable_all_rings);
+EXPORT_SYMBOL(netmap_enable_all_rings);
 
 
 MODULE_AUTHOR("http://info.iet.unipi.it/~luigi/netmap/");
@@ -2804,7 +3432,6 @@ static struct cdevsw netmap_cdevsw = {
 	.d_version = D_VERSION,
 	.d_name = "netmap",
 	.d_open = netmap_open,
-	.d_mmap = netmap_mmap,
 	.d_mmap_single = netmap_mmap_single,
 	.d_ioctl = netmap_ioctl,
 	.d_poll = netmap_poll,
@@ -2812,7 +3439,6 @@ static struct cdevsw netmap_cdevsw = {
 };
 #endif /* __FreeBSD__ */
 
-#ifdef NM_BRIDGE
 /*
  *---- support for virtual bridge -----
  */
@@ -2861,20 +3487,14 @@ nm_bridge_rthash(const uint8_t *addr)
 static int
 bdg_netmap_reg(struct ifnet *ifp, int onoff)
 {
-	// struct nm_bridge *b = NA(ifp)->na_bdg;
-
 	/* the interface is already attached to the bridge,
 	 * so we only need to toggle IFCAP_NETMAP.
-	 * Locking is not necessary (we are already under
-	 * NMA_LOCK, and the port is not in use during this call).
 	 */
-	/* BDG_WLOCK(b); */
 	if (onoff) {
 		ifp->if_capenable |= IFCAP_NETMAP;
 	} else {
 		ifp->if_capenable &= ~IFCAP_NETMAP;
 	}
-	/* BDG_WUNLOCK(b); */
 	return 0;
 }
 
@@ -2886,7 +3506,7 @@ bdg_netmap_reg(struct ifnet *ifp, int onoff)
  * ring in *dst_ring (at the moment, always use ring 0)
  */
 u_int
-netmap_bdg_learning(char *buf, u_int len, uint8_t *dst_ring,
+netmap_bdg_learning(char *buf, u_int buf_len, uint8_t *dst_ring,
 		struct netmap_adapter *na)
 {
 	struct nm_hash_ent *ht = na->na_bdg->ht;
@@ -2894,6 +3514,10 @@ netmap_bdg_learning(char *buf, u_int len, uint8_t *dst_ring,
 	u_int dst, mysrc = na->bdg_port;
 	uint64_t smac, dmac;
 
+	if (buf_len < 14) {
+		D("invalid buf length %d", buf_len);
+		return NM_BDG_NOPORT;
+	}
 	dmac = le64toh(*(uint64_t *)(buf)) & 0xffffffffffff;
 	smac = le64toh(*(uint64_t *)(buf + 4));
 	smac >>= 16;
@@ -2904,7 +3528,7 @@ netmap_bdg_learning(char *buf, u_int len, uint8_t *dst_ring,
 	 */
 	if ((buf[6] & 1) == 0) { /* valid src */
 		uint8_t *s = buf+6;
-		sh = nm_bridge_rthash(buf+6); // XXX hash of source
+		sh = nm_bridge_rthash(s); // XXX hash of source
 		/* update source port forwarding entry */
 		ht[sh].mac = smac;	/* XXX expire ? */
 		ht[sh].ports = mysrc;
@@ -2930,42 +3554,50 @@ netmap_bdg_learning(char *buf, u_int len, uint8_t *dst_ring,
  * number of ports, and lets us replace the learn and dispatch functions.
  */
 int
-nm_bdg_flush(struct nm_bdg_fwd *ft, int n, struct netmap_adapter *na,
+nm_bdg_flush(struct nm_bdg_fwd *ft, u_int n, struct netmap_adapter *na,
 		u_int ring_nr)
 {
 	struct nm_bdg_q *dst_ents, *brddst;
 	uint16_t num_dsts = 0, *dsts;
 	struct nm_bridge *b = na->na_bdg;
-	u_int i, me = na->bdg_port;
+	u_int i, j, me = na->bdg_port;
 
-	dst_ents = (struct nm_bdg_q *)(ft + NM_BDG_BATCH);
+	/*
+	 * The work area (pointed by ft) is followed by an array of
+	 * pointers to queues , dst_ents; there are NM_BDG_MAXRINGS
+	 * queues per port plus one for the broadcast traffic.
+	 * Then we have an array of destination indexes.
+	 */
+	dst_ents = (struct nm_bdg_q *)(ft + NM_BDG_BATCH_MAX);
 	dsts = (uint16_t *)(dst_ents + NM_BDG_MAXPORTS * NM_BDG_MAXRINGS + 1);
 
-	BDG_RLOCK(b);
-
-	/* first pass: find a destination */
-	for (i = 0; likely(i < n); i++) {
-		uint8_t *buf = ft[i].ft_buf;
-		uint8_t dst_ring = ring_nr;
+	/* first pass: find a destination for each packet in the batch */
+	for (i = 0; likely(i < n); i += ft[i].ft_frags) {
+		uint8_t dst_ring = ring_nr; /* default, same ring as origin */
 		uint16_t dst_port, d_i;
 		struct nm_bdg_q *d;
 
-		dst_port = b->nm_bdg_lookup(buf, ft[i].ft_len, &dst_ring, na);
-		if (dst_port == NM_BDG_NOPORT) {
+		ND("slot %d frags %d", i, ft[i].ft_frags);
+		dst_port = b->nm_bdg_lookup(ft[i].ft_buf, ft[i].ft_len,
+			&dst_ring, na);
+		if (netmap_verbose > 255)
+			RD(5, "slot %d port %d -> %d", i, me, dst_port);
+		if (dst_port == NM_BDG_NOPORT)
 			continue; /* this packet is identified to be dropped */
-		} else if (unlikely(dst_port > NM_BDG_MAXPORTS)) {
+		else if (unlikely(dst_port > NM_BDG_MAXPORTS))
 			continue;
-		} else if (dst_port == NM_BDG_BROADCAST) {
+		else if (dst_port == NM_BDG_BROADCAST)
 			dst_ring = 0; /* broadcasts always go to ring 0 */
-		} else if (unlikely(dst_port == me ||
-		    !BDG_GET_VAR(b->bdg_ports[dst_port]))) {
+		else if (unlikely(dst_port == me ||
+		    !b->bdg_ports[dst_port]))
 			continue;
-		}
 
 		/* get a position in the scratch pad */
 		d_i = dst_port * NM_BDG_MAXRINGS + dst_ring;
 		d = dst_ents + d_i;
-		if (d->bq_head == NM_BDG_BATCH) { /* new destination */
+
+		/* append the first fragment to the list */
+		if (d->bq_head == NM_FT_NULL) { /* new destination */
 			d->bq_head = d->bq_tail = i;
 			/* remember this position to be scanned later */
 			if (dst_port != NM_BDG_BROADCAST)
@@ -2974,23 +3606,30 @@ nm_bdg_flush(struct nm_bdg_fwd *ft, int n, struct netmap_adapter *na,
 			ft[d->bq_tail].ft_next = i;
 			d->bq_tail = i;
 		}
+		d->bq_len += ft[i].ft_frags;
 	}
 
-	/* if there is a broadcast, set ring 0 of all ports to be scanned
-	 * XXX This would be optimized by recording the highest index of active
-	 * ports.
+	/*
+	 * Broadcast traffic goes to ring 0 on all destinations.
+	 * So we need to add these rings to the list of ports to scan.
+	 * XXX at the moment we scan all NM_BDG_MAXPORTS ports, which is
+	 * expensive. We should keep a compact list of active destinations
+	 * so we could shorten this loop.
 	 */
 	brddst = dst_ents + NM_BDG_BROADCAST * NM_BDG_MAXRINGS;
-	if (brddst->bq_head != NM_BDG_BATCH) {
-		for (i = 0; likely(i < NM_BDG_MAXPORTS); i++) {
-			uint16_t d_i = i * NM_BDG_MAXRINGS;
-			if (unlikely(i == me) || !BDG_GET_VAR(b->bdg_ports[i]))
+	if (brddst->bq_head != NM_FT_NULL) {
+		for (j = 0; likely(j < b->bdg_active_ports); j++) {
+			uint16_t d_i;
+			i = b->bdg_port_index[j];
+			if (unlikely(i == me))
 				continue;
-			else if (dst_ents[d_i].bq_head == NM_BDG_BATCH)
+			d_i = i * NM_BDG_MAXRINGS;
+			if (dst_ents[d_i].bq_head == NM_FT_NULL)
 				dsts[num_dsts++] = d_i;
 		}
 	}
 
+	ND(5, "pass 1 done %d pkts %d dsts", n, num_dsts);
 	/* second pass: scan destinations (XXX will be modular somehow) */
 	for (i = 0; i < num_dsts; i++) {
 		struct ifnet *dst_ifp;
@@ -2998,168 +3637,281 @@ nm_bdg_flush(struct nm_bdg_fwd *ft, int n, struct netmap_adapter *na,
 		struct netmap_kring *kring;
 		struct netmap_ring *ring;
 		u_int dst_nr, is_vp, lim, j, sent = 0, d_i, next, brd_next;
-		int howmany, retry = netmap_txsync_retry;
+		u_int needed, howmany;
+		int retry = netmap_txsync_retry;
 		struct nm_bdg_q *d;
+		uint32_t my_start = 0, lease_idx = 0;
+		int nrings;
 
 		d_i = dsts[i];
+		ND("second pass %d port %d", i, d_i);
 		d = dst_ents + d_i;
-		dst_na = BDG_GET_VAR(b->bdg_ports[d_i/NM_BDG_MAXRINGS]);
+		// XXX fix the division
+		dst_na = b->bdg_ports[d_i/NM_BDG_MAXRINGS];
 		/* protect from the lookup function returning an inactive
 		 * destination port
 		 */
 		if (unlikely(dst_na == NULL))
-			continue;
-		else if (dst_na->na_flags & NAF_SW_ONLY)
-			continue;
+			goto cleanup;
+		if (dst_na->na_flags & NAF_SW_ONLY)
+			goto cleanup;
 		dst_ifp = dst_na->ifp;
 		/*
 		 * The interface may be in !netmap mode in two cases:
 		 * - when na is attached but not activated yet;
 		 * - when na is being deactivated but is still attached.
 		 */
-		if (unlikely(!(dst_ifp->if_capenable & IFCAP_NETMAP)))
-			continue;
+		if (unlikely(!(dst_ifp->if_capenable & IFCAP_NETMAP))) {
+			ND("not in netmap mode!");
+			goto cleanup;
+		}
 
 		/* there is at least one either unicast or broadcast packet */
 		brd_next = brddst->bq_head;
 		next = d->bq_head;
+		/* we need to reserve this many slots. If fewer are
+		 * available, some packets will be dropped.
+		 * Packets may have multiple fragments, so we may not use
+		 * there is a chance that we may not use all of the slots
+		 * we have claimed, so we will need to handle the leftover
+		 * ones when we regain the lock.
+		 */
+		needed = d->bq_len + brddst->bq_len;
 
 		is_vp = nma_is_vp(dst_na);
+		ND(5, "pass 2 dst %d is %x %s",
+			i, d_i, is_vp ? "virtual" : "nic/host");
 		dst_nr = d_i & (NM_BDG_MAXRINGS-1);
 		if (is_vp) { /* virtual port */
-			if (dst_nr >= dst_na->num_rx_rings)
-				dst_nr = dst_nr % dst_na->num_rx_rings;
-			kring = &dst_na->rx_rings[dst_nr];
-			ring = kring->ring;
-			lim = kring->nkr_num_slots - 1;
-			dst_na->nm_lock(dst_ifp, NETMAP_RX_LOCK, dst_nr);
-			j = kring->nr_hwcur + kring->nr_hwavail;
-			if (j > lim)
-				j -= kring->nkr_num_slots;
-			howmany = lim - kring->nr_hwavail;
-		} else { /* hw or sw adapter */
-			if (dst_nr >= dst_na->num_tx_rings)
-				dst_nr = dst_nr % dst_na->num_tx_rings;
-			kring = &dst_na->tx_rings[dst_nr];
-			ring = kring->ring;
-			lim = kring->nkr_num_slots - 1;
-			dst_na->nm_lock(dst_ifp, NETMAP_TX_LOCK, dst_nr);
-retry:
-			dst_na->nm_txsync(dst_ifp, dst_nr, 0);
-			/* see nm_bdg_flush() */
-			j = kring->nr_hwcur;
-			howmany = kring->nr_hwavail;
+			nrings = dst_na->num_rx_rings;
+		} else {
+			nrings = dst_na->num_tx_rings;
 		}
-		while (howmany-- > 0) {
-			struct netmap_slot *slot;
-			struct nm_bdg_fwd *ft_p;
+		if (dst_nr >= nrings)
+			dst_nr = dst_nr % nrings;
+		kring = is_vp ?  &dst_na->rx_rings[dst_nr] :
+				&dst_na->tx_rings[dst_nr];
+		ring = kring->ring;
+		lim = kring->nkr_num_slots - 1;
 
-			/* our 'NULL' is always higher than valid indexes
+retry:
+
+		/* reserve the buffers in the queue and an entry
+		 * to report completion, and drop lock.
+		 * XXX this might become a helper function.
+		 */
+		mtx_lock(&kring->q_lock);
+		if (kring->nkr_stopped) {
+			mtx_unlock(&kring->q_lock);
+			goto cleanup;
+		}
+		/* on physical interfaces, do a txsync to recover
+		 * slots for packets already transmitted.
+		 * XXX maybe we could be optimistic and rely on a retry
+		 * in case of failure.
+		 */
+		if (nma_is_hw(dst_na)) {
+			dst_na->nm_txsync(dst_ifp, dst_nr, 0);
+		}
+		my_start = j = kring->nkr_hwlease;
+		howmany = nm_kr_space(kring, is_vp);
+		if (needed < howmany)
+			howmany = needed;
+		lease_idx = nm_kr_lease(kring, howmany, is_vp);
+		mtx_unlock(&kring->q_lock);
+
+		/* only retry if we need more than available slots */
+		if (retry && needed <= howmany)
+			retry = 0;
+
+		/* copy to the destination queue */
+		while (howmany > 0) {
+			struct netmap_slot *slot;
+			struct nm_bdg_fwd *ft_p, *ft_end;
+			u_int cnt;
+
+			/* find the queue from which we pick next packet.
+			 * NM_FT_NULL is always higher than valid indexes
 			 * so we never dereference it if the other list
-			 * has packets (and if both are NULL we never
+			 * has packets (and if both are empty we never
 			 * get here).
 			 */
 			if (next < brd_next) {
 				ft_p = ft + next;
 				next = ft_p->ft_next;
-				ND("j %d uni %d next %d %d",
-					j, ft_p - ft, next, brd_next);
 			} else { /* insert broadcast */
 				ft_p = ft + brd_next;
 				brd_next = ft_p->ft_next;
-				ND("j %d brd %d next %d %d",
-					j, ft_p - ft, next, brd_next);
 			}
-			slot = &ring->slot[j];
-			ND("send %d %d bytes at %s:%d", i, ft_p->ft_len, dst_ifp->if_xname, j);
-		    if (ft_p->ft_flags & NS_INDIRECT) {
-			ND("copying from INDIRECT source");
-			copyin(ft_p->ft_buf, NMB(slot),
-				(ft_p->ft_len + 63) & ~63);
-		    } else {
-			pkt_copy(ft_p->ft_buf, NMB(slot), ft_p->ft_len);
-		    }
-			slot->len = ft_p->ft_len;
-			j = unlikely(j == lim) ? 0: j + 1; /* XXX to be macro-ed */
-			sent++;
+			cnt = ft_p->ft_frags; // cnt > 0
+			if (unlikely(cnt > howmany))
+			    break; /* no more space */
+			howmany -= cnt;
+			if (netmap_verbose && cnt > 1)
+				RD(5, "rx %d frags to %d", cnt, j);
+			ft_end = ft_p + cnt;
+			do {
+			    void *dst, *src = ft_p->ft_buf;
+			    size_t len = (ft_p->ft_len + 63) & ~63;
+
+			    slot = &ring->slot[j];
+			    dst = BDG_NMB(dst_na->nm_mem, slot);
+			    /* round to a multiple of 64 */
+
+			    ND("send %d %d bytes at %s:%d",
+				i, ft_p->ft_len, dst_ifp->if_xname, j);
+			    if (ft_p->ft_flags & NS_INDIRECT) {
+				if (copyin(src, dst, len)) {
+					// invalid user pointer, pretend len is 0
+					ft_p->ft_len = 0;
+				}
+			    } else {
+				//memcpy(dst, src, len);
+				pkt_copy(src, dst, (int)len);
+			    }
+			    slot->len = ft_p->ft_len;
+			    slot->flags = (cnt << 8)| NS_MOREFRAG;
+			    j = nm_next(j, lim);
+			    ft_p++;
+			    sent++;
+			} while (ft_p != ft_end);
+			slot->flags = (cnt << 8); /* clear flag on last entry */
 			/* are we done ? */
-			if (next == NM_BDG_BATCH && brd_next == NM_BDG_BATCH)
+			if (next == NM_FT_NULL && brd_next == NM_FT_NULL)
 				break;
 		}
-		if (netmap_verbose && (howmany < 0))
-			D("rx ring full on %s", dst_ifp->if_xname);
-		if (is_vp) {
-			if (sent) {
-				kring->nr_hwavail += sent;
+		{
+		    /* current position */
+		    uint32_t *p = kring->nkr_leases; /* shorthand */
+		    uint32_t update_pos;
+		    int still_locked = 1;
+
+		    mtx_lock(&kring->q_lock);
+		    if (unlikely(howmany > 0)) {
+			/* not used all bufs. If i am the last one
+			 * i can recover the slots, otherwise must
+			 * fill them with 0 to mark empty packets.
+			 */
+			ND("leftover %d bufs", howmany);
+			if (nm_next(lease_idx, lim) == kring->nkr_lease_idx) {
+			    /* yes i am the last one */
+			    ND("roll back nkr_hwlease to %d", j);
+			    kring->nkr_hwlease = j;
+			} else {
+			    while (howmany-- > 0) {
+				ring->slot[j].len = 0;
+				ring->slot[j].flags = 0;
+				j = nm_next(j, lim);
+			    }
+			}
+		    }
+		    p[lease_idx] = j; /* report I am done */
+
+		    update_pos = is_vp ? nm_kr_rxpos(kring) : ring->cur;
+
+		    if (my_start == update_pos) {
+			/* all slots before my_start have been reported,
+			 * so scan subsequent leases to see if other ranges
+			 * have been completed, and to a selwakeup or txsync.
+		         */
+			while (lease_idx != kring->nkr_lease_idx &&
+				p[lease_idx] != NR_NOSLOT) {
+			    j = p[lease_idx];
+			    p[lease_idx] = NR_NOSLOT;
+			    lease_idx = nm_next(lease_idx, lim); 
+			}
+			/* j is the new 'write' position. j != my_start
+			 * means there are new buffers to report
+			 */
+			if (likely(j != my_start)) {
+			    if (is_vp) {
+				uint32_t old_avail = kring->nr_hwavail;
+
+				kring->nr_hwavail = (j >= kring->nr_hwcur) ?
+					j - kring->nr_hwcur :
+					j + lim + 1 - kring->nr_hwcur;
+				if (kring->nr_hwavail < old_avail) {
+					D("avail shrink %d -> %d",
+						old_avail, kring->nr_hwavail);
+				}
+				still_locked = 0;
+				mtx_unlock(&kring->q_lock);
 				selwakeuppri(&kring->si, PI_NET);
-			}
-			dst_na->nm_lock(dst_ifp, NETMAP_RX_UNLOCK, dst_nr);
-		} else {
-			if (sent) {
-				ring->avail -= sent;
+			    } else {
 				ring->cur = j;
+				/* XXX update avail ? */
+				still_locked = 0;
 				dst_na->nm_txsync(dst_ifp, dst_nr, 0);
+				mtx_unlock(&kring->q_lock);
+
+				/* retry to send more packets */
+				if (nma_is_hw(dst_na) && retry--)
+					goto retry;
+			    }
 			}
-			/* retry to send more packets */
-			if (nma_is_hw(dst_na) && howmany < 0 && retry--)
-				goto retry;
-			dst_na->nm_lock(dst_ifp, NETMAP_TX_UNLOCK, dst_nr);
+		    }
+		    if (still_locked)
+			mtx_unlock(&kring->q_lock);
 		}
-		/* NM_BDG_BATCH means 'no packet' */
-		d->bq_head = d->bq_tail = NM_BDG_BATCH; /* cleanup */
+cleanup:
+		d->bq_head = d->bq_tail = NM_FT_NULL; /* cleanup */
+		d->bq_len = 0;
 	}
-	brddst->bq_head = brddst->bq_tail = NM_BDG_BATCH; /* cleanup */
-	BDG_RUNLOCK(b);
+	brddst->bq_head = brddst->bq_tail = NM_FT_NULL; /* cleanup */
+	brddst->bq_len = 0;
 	return 0;
 }
 
 
 /*
- * main dispatch routine
+ * main dispatch routine for the bridge.
+ * We already know that only one thread is running this.
+ * we must run nm_bdg_preflush without lock.
  */
 static int
-bdg_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+bdg_netmap_txsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct netmap_adapter *na = NA(ifp);
 	struct netmap_kring *kring = &na->tx_rings[ring_nr];
 	struct netmap_ring *ring = kring->ring;
-	int i, j, k, lim = kring->nkr_num_slots - 1;
+	u_int j, k, lim = kring->nkr_num_slots - 1;
 
 	k = ring->cur;
 	if (k > lim)
 		return netmap_ring_reinit(kring);
-	if (do_lock)
-		na->nm_lock(ifp, NETMAP_TX_LOCK, ring_nr);
 
-	if (netmap_bridge <= 0) { /* testing only */
+	if (bridge_batch <= 0) { /* testing only */
 		j = k; // used all
 		goto done;
 	}
-	if (netmap_bridge > NM_BDG_BATCH)
-		netmap_bridge = NM_BDG_BATCH;
+	if (bridge_batch > NM_BDG_BATCH)
+		bridge_batch = NM_BDG_BATCH;
 
 	j = nm_bdg_preflush(na, ring_nr, kring, k);
-	i = k - j;
-	if (i < 0)
-		i += kring->nkr_num_slots;
-	kring->nr_hwavail = kring->nkr_num_slots - 1 - i;
 	if (j != k)
 		D("early break at %d/ %d, avail %d", j, k, kring->nr_hwavail);
+	/* k-j modulo ring size is the number of slots processed */
+	if (k < j)
+		k += kring->nkr_num_slots;
+	kring->nr_hwavail = lim - (k - j);
 
 done:
 	kring->nr_hwcur = j;
 	ring->avail = kring->nr_hwavail;
-	if (do_lock)
-		na->nm_lock(ifp, NETMAP_TX_UNLOCK, ring_nr);
-
 	if (netmap_verbose)
-		D("%s ring %d lock %d", ifp->if_xname, ring_nr, do_lock);
+		D("%s ring %d flags %d", ifp->if_xname, ring_nr, flags);
 	return 0;
 }
 
 
+/*
+ * user process reading from a VALE switch.
+ * Already protected against concurrent calls from userspace,
+ * but we must acquire the queue's lock to protect against
+ * writers on the same queue.
+ */
 static int
-bdg_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
+bdg_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int flags)
 {
 	struct netmap_adapter *na = NA(ifp);
 	struct netmap_kring *kring = &na->rx_rings[ring_nr];
@@ -3168,13 +3920,12 @@ bdg_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 	u_int k = ring->cur, resvd = ring->reserved;
 	int n;
 
-	ND("%s ring %d lock %d avail %d",
-		ifp->if_xname, ring_nr, do_lock, kring->nr_hwavail);
-
-	if (k > lim)
-		return netmap_ring_reinit(kring);
-	if (do_lock)
-		na->nm_lock(ifp, NETMAP_RX_LOCK, ring_nr);
+	mtx_lock(&kring->q_lock);
+	if (k > lim) {
+		D("ouch dangerous reset!!!");
+		n = netmap_ring_reinit(kring);
+		goto done;
+	}
 
 	/* skip past packets that userspace has released */
 	j = kring->nr_hwcur;    /* netmap ring index */
@@ -3193,31 +3944,28 @@ bdg_netmap_rxsync(struct ifnet *ifp, u_int ring_nr, int do_lock)
 		ND("userspace releases %d packets", n);
                 for (n = 0; likely(j != k); n++) {
                         struct netmap_slot *slot = &ring->slot[j];
-                        void *addr = NMB(slot);
+                        void *addr = BDG_NMB(na->nm_mem, slot);
 
                         if (addr == netmap_buffer_base) { /* bad buf */
-                                if (do_lock)
-                                        na->nm_lock(ifp, NETMAP_RX_UNLOCK, ring_nr);
-                                return netmap_ring_reinit(kring);
+				D("bad buffer index %d, ignore ?",
+					slot->buf_idx);
                         }
-			/* decrease refcount for buffer */
-
 			slot->flags &= ~NS_BUF_CHANGED;
-                        j = unlikely(j == lim) ? 0 : j + 1;
+                        j = nm_next(j, lim);
                 }
                 kring->nr_hwavail -= n;
                 kring->nr_hwcur = k;
         }
         /* tell userspace that there are new packets */
         ring->avail = kring->nr_hwavail - resvd;
-
-	if (do_lock)
-		na->nm_lock(ifp, NETMAP_RX_UNLOCK, ring_nr);
-	return 0;
+	n = 0;
+done:
+	mtx_unlock(&kring->q_lock);
+	return n;
 }
 
 
-static void
+static int
 bdg_netmap_attach(struct netmap_adapter *arg)
 {
 	struct netmap_adapter na;
@@ -3226,18 +3974,20 @@ bdg_netmap_attach(struct netmap_adapter *arg)
 	bzero(&na, sizeof(na));
 
 	na.ifp = arg->ifp;
-	na.separate_locks = 1;
+	na.na_flags = NAF_BDG_MAYSLEEP | NAF_MEM_OWNER;
 	na.num_tx_rings = arg->num_tx_rings;
 	na.num_rx_rings = arg->num_rx_rings;
-	na.num_tx_desc = NM_BRIDGE_RINGSIZE;
-	na.num_rx_desc = NM_BRIDGE_RINGSIZE;
+	na.num_tx_desc = arg->num_tx_desc;
+	na.num_rx_desc = arg->num_rx_desc;
 	na.nm_txsync = bdg_netmap_txsync;
 	na.nm_rxsync = bdg_netmap_rxsync;
 	na.nm_register = bdg_netmap_reg;
-	netmap_attach(&na, na.num_tx_rings);
+	na.nm_mem = netmap_mem_private_new(arg->ifp->if_xname,
+			na.num_tx_rings, na.num_tx_desc,
+			na.num_rx_rings, na.num_rx_desc);
+	return netmap_attach(&na, na.num_tx_rings);
 }
 
-#endif /* NM_BRIDGE */
 
 static struct cdev *netmap_dev; /* /dev/netmap character device. */
 
@@ -3253,9 +4003,11 @@ static struct cdev *netmap_dev; /* /dev/netmap character device. */
 static int
 netmap_init(void)
 {
-	int error;
+	int i, error;
 
-	error = netmap_memory_init();
+	NMG_LOCK_INIT();
+
+	error = netmap_mem_init();
 	if (error != 0) {
 		printf("netmap: unable to initialize the memory allocator.\n");
 		return (error);
@@ -3264,16 +4016,9 @@ netmap_init(void)
 	netmap_dev = make_dev(&netmap_cdevsw, 0, UID_ROOT, GID_WHEEL, 0660,
 			      "netmap");
 
-#ifdef NM_BRIDGE
-	{
-	int i;
-	mtx_init(&netmap_bridge_mutex, "netmap_bridge_mutex",
-		MTX_NETWORK_LOCK, MTX_DEF);
 	bzero(nm_bridges, sizeof(struct nm_bridge) * NM_BRIDGES); /* safety */
 	for (i = 0; i < NM_BRIDGES; i++)
-		rw_init(&nm_bridges[i].bdg_lock, "bdg lock");
-	}
-#endif
+		BDG_RWINIT(&nm_bridges[i]);
 	return (error);
 }
 
@@ -3287,7 +4032,8 @@ static void
 netmap_fini(void)
 {
 	destroy_dev(netmap_dev);
-	netmap_memory_fini();
+	netmap_mem_fini();
+	NMG_LOCK_DESTROY();
 	printf("netmap: unloaded module.\n");
 }
 
diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h
index e246e146c8e..12bd882521b 100644
--- a/sys/dev/netmap/netmap_kern.h
+++ b/sys/dev/netmap/netmap_kern.h
@@ -35,26 +35,28 @@
 
 #if defined(__FreeBSD__)
 
-#define likely(x)	__builtin_expect(!!(x), 1)
-#define unlikely(x)	__builtin_expect(!!(x), 0)
+#define likely(x)	__builtin_expect((long)!!(x), 1L)
+#define unlikely(x)	__builtin_expect((long)!!(x), 0L)
 
 #define	NM_LOCK_T	struct mtx
-#define	NM_RWLOCK_T	struct rwlock
 #define	NM_SELINFO_T	struct selinfo
 #define	MBUF_LEN(m)	((m)->m_pkthdr.len)
 #define	NM_SEND_UP(ifp, m)	((ifp)->if_input)(ifp, m)
 
+#define NM_ATOMIC_T	volatile int
+
 #elif defined (linux)
 
 #define	NM_LOCK_T	safe_spinlock_t	// see bsd_glue.h
-#define	NM_RWLOCK_T	safe_spinlock_t	// see bsd_glue.h
 #define	NM_SELINFO_T	wait_queue_head_t
 #define	MBUF_LEN(m)	((m)->len)
 #define	NM_SEND_UP(ifp, m)	netif_rx(m)
 
+#define NM_ATOMIC_T	volatile long unsigned int
+
 #ifndef DEV_NETMAP
 #define DEV_NETMAP
-#endif
+#endif /* DEV_NETMAP */
 
 /*
  * IFCAP_NETMAP goes into net_device's priv_flags (if_capenable).
@@ -111,6 +113,8 @@ struct nm_bdg_fwd;
 struct nm_bridge;
 struct netmap_priv_d;
 
+const char *nm_dump_buf(char *p, int len, int lim, char *dst);
+
 /*
  * private, kernel view of a ring. Keeps track of the status of
  * a ring across system calls.
@@ -128,26 +132,120 @@ struct netmap_priv_d;
  * 	the next empty buffer as known by the hardware (next_to_check or so).
  * TX rings: hwcur + hwofs coincides with next_to_send
  *
+ * Clients cannot issue concurrent syscall on a ring. The system
+ * detects this and reports an error using two flags,
+ * NKR_WBUSY and NKR_RBUSY
  * For received packets, slot->flags is set to nkr_slot_flags
  * so we can provide a proper initial value (e.g. set NS_FORWARD
  * when operating in 'transparent' mode).
+ *
+ * The following fields are used to implement lock-free copy of packets
+ * from input to output ports in VALE switch:
+ *	nkr_hwlease	buffer after the last one being copied.
+ *			A writer in nm_bdg_flush reserves N buffers
+ *			from nr_hwlease, advances it, then does the
+ *			copy outside the lock.
+ *			In RX rings (used for VALE ports),
+ *			nkr_hwcur + nkr_hwavail <= nkr_hwlease < nkr_hwcur+N-1
+ *			In TX rings (used for NIC or host stack ports)
+ *			nkr_hwcur <= nkr_hwlease < nkr_hwcur+ nkr_hwavail
+ *	nkr_leases	array of nkr_num_slots where writers can report
+ *			completion of their block. NR_NOSLOT (~0) indicates
+ *			that the writer has not finished yet
+ *	nkr_lease_idx	index of next free slot in nr_leases, to be assigned 
+ *
+ * The kring is manipulated by txsync/rxsync and generic netmap function.
+ * q_lock is used to arbitrate access to the kring from within the netmap
+ * code, and this and other protections guarantee that there is never
+ * more than 1 concurrent call to txsync or rxsync. So we are free
+ * to manipulate the kring from within txsync/rxsync without any extra
+ * locks.
  */
 struct netmap_kring {
 	struct netmap_ring *ring;
-	u_int nr_hwcur;
-	int nr_hwavail;
-	u_int nr_kflags;	/* private driver flags */
+	uint32_t nr_hwcur;
+	uint32_t nr_hwavail;
+	uint32_t nr_kflags;	/* private driver flags */
 #define NKR_PENDINTR	0x1	// Pending interrupt.
-	u_int nkr_num_slots;
+	uint32_t nkr_num_slots;
+	int32_t	nkr_hwofs;	/* offset between NIC and netmap ring */
 
 	uint16_t	nkr_slot_flags;	/* initial value for flags */
-	int	nkr_hwofs;	/* offset between NIC and netmap ring */
 	struct netmap_adapter *na;
 	struct nm_bdg_fwd *nkr_ft;
+	uint32_t *nkr_leases;
+#define NR_NOSLOT	((uint32_t)~0)
+	uint32_t nkr_hwlease;
+	uint32_t nkr_lease_idx;
+
 	NM_SELINFO_T si;	/* poll/select wait queue */
-	NM_LOCK_T q_lock;	/* used if no device lock available */
+	NM_LOCK_T q_lock;	/* protects kring and ring. */
+	NM_ATOMIC_T nr_busy;	/* prevent concurrent syscalls */
+
+	volatile int nkr_stopped;
 } __attribute__((__aligned__(64)));
 
+
+/* return the next index, with wraparound */
+static inline uint32_t
+nm_next(uint32_t i, uint32_t lim)
+{
+	return unlikely (i == lim) ? 0 : i + 1;
+}
+
+/*
+ *
+ * Here is the layout for the Rx and Tx rings.
+
+       RxRING                            TxRING
+
+      +-----------------+            +-----------------+
+      |                 |            |                 |
+      |XXX free slot XXX|            |XXX free slot XXX|
+      +-----------------+            +-----------------+
+      |                 |<-hwcur     |                 |<-hwcur
+      | reserved    h   |            | (ready          |
+      +-----------  w  -+            |  to be          |
+ cur->|             a   |            |  sent)      h   |
+      |             v   |            +----------   w   |
+      |             a   |       cur->| (being      a   |
+      |             i   |            |  prepared)  v   |
+      | avail       l   |            |             a   |
+      +-----------------+            +  a  ------  i   +
+      |                 | ...        |  v          l   |<-hwlease
+      | (being          | ...        |  a              | ...
+      |  prepared)      | ...        |  i              | ...
+      +-----------------+ ...        |  l              | ...
+      |                 |<-hwlease   +-----------------+
+      |                 |            |                 |
+      |                 |            |                 |
+      |                 |            |                 |
+      |                 |            |                 |
+      +-----------------+            +-----------------+
+
+ * The cur/avail (user view) and hwcur/hwavail (kernel view)
+ * are used in the normal operation of the card.
+ *
+ * When a ring is the output of a switch port (Rx ring for
+ * a VALE port, Tx ring for the host stack or NIC), slots
+ * are reserved in blocks through 'hwlease' which points
+ * to the next unused slot.
+ * On an Rx ring, hwlease is always after hwavail,
+ * and completions cause avail to advance.
+ * On a Tx ring, hwlease is always between cur and hwavail,
+ * and completions cause cur to advance.
+ *
+ * nm_kr_space() returns the maximum number of slots that
+ * can be assigned.
+ * nm_kr_lease() reserves the required number of buffers,
+ *    advances nkr_hwlease and also returns an entry in
+ *    a circular array where completions should be reported.
+ */
+
+
+
+
+
 /*
  * This struct extends the 'struct adapter' (or
  * equivalent) device descriptor. It contains all fields needed to
@@ -167,6 +265,13 @@ struct netmap_adapter {
 				 * useful during initialization
 				 */
 #define NAF_SW_ONLY	2	/* forward packets only to sw adapter */
+#define NAF_BDG_MAYSLEEP 4	/* the bridge is allowed to sleep when
+				 * forwarding packets coming from this
+				 * interface
+				 */
+#define NAF_MEM_OWNER	8	/* the adapter is responsible for the
+				 * deallocation of the memory allocator
+				 */
 	int refcount; /* number of user-space descriptors using this
 			 interface, which is equal to the number of
 			 struct netmap_if objs in the mapped region. */
@@ -179,9 +284,6 @@ struct netmap_adapter {
 	int na_single;	/* threads attached to a single hw queue */
 	int na_multi;	/* threads attached to multiple hw queues */
 
-	int separate_locks; /* set if the interface suports different
-			       locks for rx, tx and core. */
-
 	u_int num_rx_rings; /* number of adapter receive rings */
 	u_int num_tx_rings; /* number of adapter transmit rings */
 
@@ -210,9 +312,11 @@ struct netmap_adapter {
 	NM_LOCK_T core_lock;	/* used if no device lock available */
 
 	int (*nm_register)(struct ifnet *, int onoff);
-	void (*nm_lock)(struct ifnet *, int what, u_int ringid);
-	int (*nm_txsync)(struct ifnet *, u_int ring, int lock);
-	int (*nm_rxsync)(struct ifnet *, u_int ring, int lock);
+
+	int (*nm_txsync)(struct ifnet *, u_int ring, int flags);
+	int (*nm_rxsync)(struct ifnet *, u_int ring, int flags);
+#define NAF_FORCE_READ    1
+#define NAF_FORCE_RECLAIM 2
 	/* return configuration information */
 	int (*nm_config)(struct ifnet *, u_int *txr, u_int *txd,
 					u_int *rxr, u_int *rxd);
@@ -236,12 +340,105 @@ struct netmap_adapter {
 	 * This is only done when physical interfaces are attached to a bridge.
 	 */
 	struct netmap_priv_d *na_kpriv;
+
+	/* memory allocator */
+ 	struct netmap_mem_d *nm_mem;
 #ifdef linux
 	struct net_device_ops nm_ndo;
 #endif /* linux */
 };
 
 /*
+ * Available space in the ring.
+ */
+static inline uint32_t
+nm_kr_space(struct netmap_kring *k, int is_rx)
+{
+	int space;
+
+	if (is_rx) {
+		int busy = k->nkr_hwlease - k->nr_hwcur;
+		if (busy < 0)
+			busy += k->nkr_num_slots;
+		space = k->nkr_num_slots - 1 - busy;
+	} else {
+		space = k->nr_hwcur + k->nr_hwavail - k->nkr_hwlease;
+		if (space < 0)
+			space += k->nkr_num_slots;
+	}
+#if 0
+	// sanity check
+	if (k->nkr_hwlease >= k->nkr_num_slots ||
+		k->nr_hwcur >= k->nkr_num_slots ||
+		k->nr_hwavail >= k->nkr_num_slots ||
+		busy < 0 ||
+		busy >= k->nkr_num_slots) {
+		D("invalid kring, cur %d avail %d lease %d lease_idx %d lim %d",			k->nr_hwcur, k->nr_hwavail, k->nkr_hwlease,
+			k->nkr_lease_idx, k->nkr_num_slots);
+	}
+#endif
+	return space;
+}
+
+
+/* return update position */
+static inline uint32_t
+nm_kr_rxpos(struct netmap_kring *k)
+{
+	uint32_t pos = k->nr_hwcur + k->nr_hwavail;
+	if (pos >= k->nkr_num_slots)
+		pos -= k->nkr_num_slots;
+#if 0
+	if (pos >= k->nkr_num_slots ||
+		k->nkr_hwlease >= k->nkr_num_slots ||
+		k->nr_hwcur >= k->nkr_num_slots ||
+		k->nr_hwavail >= k->nkr_num_slots ||
+		k->nkr_lease_idx >= k->nkr_num_slots) {
+		D("invalid kring, cur %d avail %d lease %d lease_idx %d lim %d",			k->nr_hwcur, k->nr_hwavail, k->nkr_hwlease,
+			k->nkr_lease_idx, k->nkr_num_slots);
+	}
+#endif
+	return pos;
+}
+
+
+/* make a lease on the kring for N positions. return the
+ * lease index
+ */
+static inline uint32_t
+nm_kr_lease(struct netmap_kring *k, u_int n, int is_rx)
+{
+	uint32_t lim = k->nkr_num_slots - 1;
+	uint32_t lease_idx = k->nkr_lease_idx;
+
+	k->nkr_leases[lease_idx] = NR_NOSLOT;
+	k->nkr_lease_idx = nm_next(lease_idx, lim);
+
+	if (n > nm_kr_space(k, is_rx)) {
+		D("invalid request for %d slots", n);
+		panic("x");
+	}
+	/* XXX verify that there are n slots */
+	k->nkr_hwlease += n;
+	if (k->nkr_hwlease > lim)
+		k->nkr_hwlease -= lim + 1;
+
+	if (k->nkr_hwlease >= k->nkr_num_slots ||
+		k->nr_hwcur >= k->nkr_num_slots ||
+		k->nr_hwavail >= k->nkr_num_slots ||
+		k->nkr_lease_idx >= k->nkr_num_slots) {
+		D("invalid kring %s, cur %d avail %d lease %d lease_idx %d lim %d",
+			k->na->ifp->if_xname,
+			k->nr_hwcur, k->nr_hwavail, k->nkr_hwlease,
+			k->nkr_lease_idx, k->nkr_num_slots);
+	}
+	return lease_idx;
+}
+
+
+/*
+ * XXX NETMAP_DELETING() is unused
+ *
  * The combination of "enable" (ifp->if_capenable & IFCAP_NETMAP)
  * and refcount gives the status of the interface, namely:
  *
@@ -256,25 +453,6 @@ struct netmap_adapter {
 #define NETMAP_DELETING(_na)  (  ((_na)->refcount == 0) &&	\
 	( (_na)->ifp->if_capenable & IFCAP_NETMAP) )
 
-/*
- * parameters for (*nm_lock)(adapter, what, index)
- */
-enum {
-	NETMAP_NO_LOCK = 0,
-	NETMAP_CORE_LOCK, NETMAP_CORE_UNLOCK,
-	NETMAP_TX_LOCK, NETMAP_TX_UNLOCK,
-	NETMAP_RX_LOCK, NETMAP_RX_UNLOCK,
-#ifdef __FreeBSD__
-#define	NETMAP_REG_LOCK		NETMAP_CORE_LOCK
-#define	NETMAP_REG_UNLOCK	NETMAP_CORE_UNLOCK
-#else
-	NETMAP_REG_LOCK, NETMAP_REG_UNLOCK
-#endif
-};
-
-/* How to handle locking support in netmap_rx_irq/netmap_tx_irq */
-#define	NETMAP_LOCKED_ENTER	0x10000000	/* already locked on enter */
-#define	NETMAP_LOCKED_EXIT	0x20000000	/* keep locked on exit */
 
 /*
  * The following are support routines used by individual drivers to
@@ -285,7 +463,7 @@ enum {
  *
  * netmap_detach() frees the memory allocated by netmap_attach().
  *
- * netmap_start() replaces the if_transmit routine of the interface,
+ * netmap_transmit() replaces the if_transmit routine of the interface,
  *	and is used to intercept packets coming from the stack.
  *
  * netmap_load_map/netmap_reload_map are helper routines to set/reset
@@ -294,14 +472,16 @@ enum {
  * netmap_reset() is a helper routine to be called in the driver
  *	when reinitializing a ring.
  */
-int netmap_attach(struct netmap_adapter *, int);
+int netmap_attach(struct netmap_adapter *, u_int);
 void netmap_detach(struct ifnet *);
-int netmap_start(struct ifnet *, struct mbuf *);
+int netmap_transmit(struct ifnet *, struct mbuf *);
 enum txrx { NR_RX = 0, NR_TX = 1 };
 struct netmap_slot *netmap_reset(struct netmap_adapter *na,
-	enum txrx tx, int n, u_int new_cur);
+	enum txrx tx, u_int n, u_int new_cur);
 int netmap_ring_reinit(struct netmap_kring *);
 
+u_int nm_bound_var(u_int *v, u_int dflt, u_int lo, u_int hi, const char *msg);
+
 /*
  * The following bridge-related interfaces are used by other kernel modules
  * In the version that only supports unicast or broadcast, the lookup
@@ -451,6 +631,7 @@ netmap_reload_map(bus_dma_tag_t tag, bus_dmamap_t map, void *buf)
 
 #endif /* linux */
 
+
 /*
  * functions to map NIC to KRING indexes (n2k) and vice versa (k2n)
  */
@@ -515,7 +696,15 @@ PNMB(struct netmap_slot *slot, uint64_t *pp)
 }
 
 /* default functions to handle rx/tx interrupts */
-int netmap_rx_irq(struct ifnet *, int, int *);
+int netmap_rx_irq(struct ifnet *, u_int, u_int *);
 #define netmap_tx_irq(_n, _q) netmap_rx_irq(_n, _q, NULL)
 
+#ifdef __FreeBSD__
+MALLOC_DECLARE(M_NETMAP);
+#endif /* __FreeBSD__ */
+
+
+void netmap_disable_all_rings(struct ifnet *);
+void netmap_enable_all_rings(struct ifnet *);
+
 #endif /* _NET_NETMAP_KERN_H_ */
diff --git a/sys/dev/netmap/netmap_mem2.c b/sys/dev/netmap/netmap_mem2.c
index dcf4b06d874..a7890421605 100644
--- a/sys/dev/netmap/netmap_mem2.c
+++ b/sys/dev/netmap/netmap_mem2.c
@@ -23,107 +23,48 @@
  * SUCH DAMAGE.
  */
 
-/*
- * $FreeBSD$
- *
- * (New) memory allocator for netmap
- */
-
-/*
- * This allocator creates three memory pools:
- *	nm_if_pool	for the struct netmap_if
- *	nm_ring_pool	for the struct netmap_ring
- *	nm_buf_pool	for the packet buffers.
- *
- * that contain netmap objects. Each pool is made of a number of clusters,
- * multiple of a page size, each containing an integer number of objects.
- * The clusters are contiguous in user space but not in the kernel.
- * Only nm_buf_pool needs to be dma-able,
- * but for convenience use the same type of allocator for all.
- *
- * Once mapped, the three pools are exported to userspace
- * as a contiguous block, starting from nm_if_pool. Each
- * cluster (and pool) is an integral number of pages.
- *   [ . . . ][ . . . . . .][ . . . . . . . . . .]
- *    nm_if     nm_ring            nm_buf
- *
- * The userspace areas contain offsets of the objects in userspace.
- * When (at init time) we write these offsets, we find out the index
- * of the object, and from there locate the offset from the beginning
- * of the region.
- *
- * The invididual allocators manage a pool of memory for objects of
- * the same size.
- * The pool is split into smaller clusters, whose size is a
- * multiple of the page size. The cluster size is chosen
- * to minimize the waste for a given max cluster size
- * (we do it by brute force, as we have relatively few objects
- * per cluster).
- *
- * Objects are aligned to the cache line (64 bytes) rounding up object
- * sizes when needed. A bitmap contains the state of each object.
- * Allocation scans the bitmap; this is done only on attach, so we are not
- * too worried about performance
- *
- * For each allocator we can define (thorugh sysctl) the size and
- * number of each object. Memory is allocated at the first use of a
- * netmap file descriptor, and can be freed when all such descriptors
- * have been released (including unmapping the memory).
- * If memory is scarce, the system tries to get as much as possible
- * and the sysctl values reflect the actual allocation.
- * Together with desired values, the sysctl export also absolute
- * min and maximum values that cannot be overridden.
- *
- * struct netmap_if:
- *	variable size, max 16 bytes per ring pair plus some fixed amount.
- *	1024 bytes should be large enough in practice.
- *
- *	In the worst case we have one netmap_if per ring in the system.
- *
- * struct netmap_ring
- *	variable size, 8 byte per slot plus some fixed amount.
- *	Rings can be large (e.g. 4k slots, or >32Kbytes).
- *	We default to 36 KB (9 pages), and a few hundred rings.
- *
- * struct netmap_buffer
- *	The more the better, both because fast interfaces tend to have
- *	many slots, and because we may want to use buffers to store
- *	packets in userspace avoiding copies.
- *	Must contain a full frame (eg 1518, or more for vlans, jumbo
- *	frames etc.) plus be nicely aligned, plus some NICs restrict
- *	the size to multiple of 1K or so. Default to 2K
- */
-
-#define NETMAP_BUF_MAX_NUM	20*4096*2	/* large machine */
-
 #ifdef linux
-// XXX a mtx would suffice here 20130415 lr
-// #define NMA_LOCK_T		safe_spinlock_t
-#define NMA_LOCK_T		struct semaphore
-#define NMA_LOCK_INIT()		sema_init(&nm_mem.nm_mtx, 1)
-#define NMA_LOCK_DESTROY()
-#define NMA_LOCK()		down(&nm_mem.nm_mtx)
-#define NMA_UNLOCK()		up(&nm_mem.nm_mtx)
-#else /* !linux */
-#define NMA_LOCK_T		struct mtx
-#define NMA_LOCK_INIT()		mtx_init(&nm_mem.nm_mtx, "netmap memory allocator lock", NULL, MTX_DEF)
-#define NMA_LOCK_DESTROY()	mtx_destroy(&nm_mem.nm_mtx)
-#define NMA_LOCK()		mtx_lock(&nm_mem.nm_mtx)
-#define NMA_UNLOCK()		mtx_unlock(&nm_mem.nm_mtx)
+#include "bsd_glue.h"
 #endif /* linux */
 
-enum {
-	NETMAP_IF_POOL   = 0,
-	NETMAP_RING_POOL,
-	NETMAP_BUF_POOL,
-	NETMAP_POOLS_NR
-};
+#ifdef __APPLE__
+#include "osx_glue.h"
+#endif /* __APPLE__ */
 
+#ifdef __FreeBSD__
+#include <sys/cdefs.h> /* prerequisite */
+__FBSDID("$FreeBSD$");
 
-struct netmap_obj_params {
-	u_int size;
-	u_int num;
-};
+#include <sys/types.h>
+#include <sys/malloc.h>
+#include <sys/proc.h>
+#include <vm/vm.h>	/* vtophys */
+#include <vm/pmap.h>	/* vtophys */
+#include <sys/socket.h> /* sockaddrs */
+#include <sys/selinfo.h>
+#include <sys/sysctl.h>
+#include <net/if.h>
+#include <net/if_var.h>
+#include <net/vnet.h>
+#include <machine/bus.h>	/* bus_dmamap_* */
+
+#endif /* __FreeBSD__ */
+
+#include <net/netmap.h>
+#include <dev/netmap/netmap_kern.h>
+#include "netmap_mem2.h"
+
+#ifdef linux
+#define NMA_LOCK_INIT(n)	sema_init(&(n)->nm_mtx, 1)
+#define NMA_LOCK_DESTROY(n)
+#define NMA_LOCK(n)		down(&(n)->nm_mtx)
+#define NMA_UNLOCK(n)		up(&(n)->nm_mtx)
+#else /* !linux */
+#define NMA_LOCK_INIT(n)	mtx_init(&(n)->nm_mtx, "netmap memory allocator lock", NULL, MTX_DEF)
+#define NMA_LOCK_DESTROY(n)	mtx_destroy(&(n)->nm_mtx)
+#define NMA_LOCK(n)		mtx_lock(&(n)->nm_mtx)
+#define NMA_UNLOCK(n)		mtx_unlock(&(n)->nm_mtx)
+#endif /* linux */
 
 
 struct netmap_obj_params netmap_params[NETMAP_POOLS_NR] = {
@@ -142,47 +83,15 @@ struct netmap_obj_params netmap_params[NETMAP_POOLS_NR] = {
 };
 
 
-struct netmap_obj_pool {
-	char name[16];		/* name of the allocator */
-	u_int objtotal;         /* actual total number of objects. */
-	u_int objfree;          /* number of free objects. */
-	u_int clustentries;	/* actual objects per cluster */
-
-	/* limits */
-	u_int objminsize;	/* minimum object size */
-	u_int objmaxsize;	/* maximum object size */
-	u_int nummin;		/* minimum number of objects */
-	u_int nummax;		/* maximum number of objects */
-
-	/* the total memory space is _numclusters*_clustsize */
-	u_int _numclusters;	/* how many clusters */
-	u_int _clustsize;        /* cluster size */
-	u_int _objsize;		/* actual object size */
-
-	u_int _memtotal;	/* _numclusters*_clustsize */
-	struct lut_entry *lut;  /* virt,phys addresses, objtotal entries */
-	uint32_t *bitmap;       /* one bit per buffer, 1 means free */
-	uint32_t bitmap_slots;	/* number of uint32 entries in bitmap */
-};
-
-
-struct netmap_mem_d {
-	NMA_LOCK_T nm_mtx;  /* protect the allocator */
-	u_int nm_totalsize; /* shorthand */
-
-	int finalized;		/* !=0 iff preallocation done */
-	int lasterr;		/* last error for curr config */
-	int refcount;		/* existing priv structures */
-	/* the three allocators */
-	struct netmap_obj_pool pools[NETMAP_POOLS_NR];
-};
-
 /*
  * nm_mem is the memory allocator used for all physical interfaces
  * running in netmap mode.
  * Virtual (VALE) ports will have each its own allocator.
  */
-static struct netmap_mem_d nm_mem = {	/* Our memory allocator. */
+static int netmap_mem_global_config(struct netmap_mem_d *nmd);
+static int netmap_mem_global_finalize(struct netmap_mem_d *nmd);
+static void netmap_mem_global_deref(struct netmap_mem_d *nmd);
+struct netmap_mem_d nm_mem = {	/* Our memory allocator. */
 	.pools = {
 		[NETMAP_IF_POOL] = {
 			.name 	= "netmap_if",
@@ -206,15 +115,55 @@ static struct netmap_mem_d nm_mem = {	/* Our memory allocator. */
 			.nummax	    = 1000000, /* one million! */
 		},
 	},
+	.config   = netmap_mem_global_config,
+	.finalize = netmap_mem_global_finalize,
+	.deref    = netmap_mem_global_deref,
 };
 
+
 // XXX logically belongs to nm_mem
 struct lut_entry *netmap_buffer_lut;	/* exported */
 
+/* blueprint for the private memory allocators */
+static int netmap_mem_private_config(struct netmap_mem_d *nmd);
+static int netmap_mem_private_finalize(struct netmap_mem_d *nmd);
+static void netmap_mem_private_deref(struct netmap_mem_d *nmd);
+const struct netmap_mem_d nm_blueprint = {
+	.pools = {
+		[NETMAP_IF_POOL] = {
+			.name 	= "%s_if",
+			.objminsize = sizeof(struct netmap_if),
+			.objmaxsize = 4096,
+			.nummin     = 1,
+			.nummax	    = 10,
+		},
+		[NETMAP_RING_POOL] = {
+			.name 	= "%s_ring",
+			.objminsize = sizeof(struct netmap_ring),
+			.objmaxsize = 32*PAGE_SIZE,
+			.nummin     = 2,
+			.nummax	    = 1024,
+		},
+		[NETMAP_BUF_POOL] = {
+			.name	= "%s_buf",
+			.objminsize = 64,
+			.objmaxsize = 65536,
+			.nummin     = 4,
+			.nummax	    = 1000000, /* one million! */
+		},
+	},
+	.config   = netmap_mem_private_config,
+	.finalize = netmap_mem_private_finalize,
+	.deref    = netmap_mem_private_deref,
+
+	.flags = NETMAP_MEM_PRIVATE,
+};
+
 /* memory allocator related sysctls */
 
 #define STRINGIFY(x) #x
 
+
 #define DECLARE_SYSCTLS(id, name) \
 	SYSCTL_INT(_dev_netmap, OID_AUTO, name##_size, \
 	    CTLFLAG_RW, &netmap_params[id].size, 0, "Requested size of netmap " STRINGIFY(name) "s"); \
@@ -225,43 +174,71 @@ struct lut_entry *netmap_buffer_lut;	/* exported */
         SYSCTL_INT(_dev_netmap, OID_AUTO, name##_curr_num, \
             CTLFLAG_RD, &nm_mem.pools[id].objtotal, 0, "Current number of netmap " STRINGIFY(name) "s")
 
+SYSCTL_DECL(_dev_netmap);
 DECLARE_SYSCTLS(NETMAP_IF_POOL, if);
 DECLARE_SYSCTLS(NETMAP_RING_POOL, ring);
 DECLARE_SYSCTLS(NETMAP_BUF_POOL, buf);
 
 /*
- * Convert a userspace offset to a physical address.
- * XXX only called in the FreeBSD's netmap_mmap()
- * because in linux we map everything at once.
- *
  * First, find the allocator that contains the requested offset,
  * then locate the cluster through a lookup table.
  */
-static inline vm_paddr_t
-netmap_ofstophys(vm_offset_t offset)
+vm_paddr_t
+netmap_mem_ofstophys(struct netmap_mem_d* nmd, vm_ooffset_t offset)
 {
 	int i;
-	vm_offset_t o = offset;
-	struct netmap_obj_pool *p = nm_mem.pools;
+	vm_ooffset_t o = offset;
+	vm_paddr_t pa;
+	struct netmap_obj_pool *p;
 
-	for (i = 0; i < NETMAP_POOLS_NR; offset -= p[i]._memtotal, i++) {
-		if (offset >= p[i]._memtotal)
+	NMA_LOCK(nmd);
+	p = nmd->pools;
+
+	for (i = 0; i < NETMAP_POOLS_NR; offset -= p[i].memtotal, i++) {
+		if (offset >= p[i].memtotal)
 			continue;
 		// now lookup the cluster's address
-		return p[i].lut[offset / p[i]._objsize].paddr +
+		pa = p[i].lut[offset / p[i]._objsize].paddr +
 			offset % p[i]._objsize;
+		NMA_UNLOCK(nmd);
+		return pa;
 	}
 	/* this is only in case of errors */
 	D("invalid ofs 0x%x out of 0x%x 0x%x 0x%x", (u_int)o,
-		p[NETMAP_IF_POOL]._memtotal,
-		p[NETMAP_IF_POOL]._memtotal
-			+ p[NETMAP_RING_POOL]._memtotal,
-		p[NETMAP_IF_POOL]._memtotal
-			+ p[NETMAP_RING_POOL]._memtotal
-			+ p[NETMAP_BUF_POOL]._memtotal);
+		p[NETMAP_IF_POOL].memtotal,
+		p[NETMAP_IF_POOL].memtotal
+			+ p[NETMAP_RING_POOL].memtotal,
+		p[NETMAP_IF_POOL].memtotal
+			+ p[NETMAP_RING_POOL].memtotal
+			+ p[NETMAP_BUF_POOL].memtotal);
+	NMA_UNLOCK(nmd);
 	return 0;	// XXX bad address
 }
 
+int
+netmap_mem_get_info(struct netmap_mem_d* nmd, u_int* size, u_int *memflags)
+{
+	int error = 0;
+	NMA_LOCK(nmd);
+	error = nmd->config(nmd);
+	if (error)
+		goto out;
+	if (nmd->flags & NETMAP_MEM_FINALIZED) {
+		*size = nmd->nm_totalsize;
+	} else {
+		int i;
+		*size = 0;
+		for (i = 0; i < NETMAP_POOLS_NR; i++) {
+			struct netmap_obj_pool *p = nmd->pools + i;
+			*size += (p->_numclusters * p->_clustsize);
+		}
+	}
+	*memflags = nmd->flags;
+out:
+	NMA_UNLOCK(nmd);
+	return error;
+}
+
 /*
  * we store objects by kernel address, need to find the offset
  * within the pool to export the value to userspace.
@@ -271,7 +248,7 @@ netmap_ofstophys(vm_offset_t offset)
 static ssize_t
 netmap_obj_offset(struct netmap_obj_pool *p, const void *vaddr)
 {
-	int i, k = p->clustentries, n = p->objtotal;
+	int i, k = p->_clustentries, n = p->objtotal;
 	ssize_t ofs = 0;
 
 	for (i = 0; i < n; i += k, ofs += p->_clustsize) {
@@ -292,25 +269,35 @@ netmap_obj_offset(struct netmap_obj_pool *p, const void *vaddr)
 }
 
 /* Helper functions which convert virtual addresses to offsets */
-#define netmap_if_offset(v)					\
-	netmap_obj_offset(&nm_mem.pools[NETMAP_IF_POOL], (v))
+#define netmap_if_offset(n, v)					\
+	netmap_obj_offset(&(n)->pools[NETMAP_IF_POOL], (v))
 
-#define netmap_ring_offset(v)					\
-    (nm_mem.pools[NETMAP_IF_POOL]._memtotal + 			\
-	netmap_obj_offset(&nm_mem.pools[NETMAP_RING_POOL], (v)))
+#define netmap_ring_offset(n, v)				\
+    ((n)->pools[NETMAP_IF_POOL].memtotal + 			\
+	netmap_obj_offset(&(n)->pools[NETMAP_RING_POOL], (v)))
 
-#define netmap_buf_offset(v)					\
-    (nm_mem.pools[NETMAP_IF_POOL]._memtotal +			\
-	nm_mem.pools[NETMAP_RING_POOL]._memtotal +		\
-	netmap_obj_offset(&nm_mem.pools[NETMAP_BUF_POOL], (v)))
+#define netmap_buf_offset(n, v)					\
+    ((n)->pools[NETMAP_IF_POOL].memtotal +			\
+	(n)->pools[NETMAP_RING_POOL].memtotal +		\
+	netmap_obj_offset(&(n)->pools[NETMAP_BUF_POOL], (v)))
 
 
+ssize_t
+netmap_mem_if_offset(struct netmap_mem_d *nmd, const void *addr)
+{
+	ssize_t v;
+	NMA_LOCK(nmd);
+	v = netmap_if_offset(nmd, addr);
+	NMA_UNLOCK(nmd);
+	return v;
+}
+
 /*
  * report the index, and use start position as a hint,
  * otherwise buffer allocation becomes terribly expensive.
  */
 static void *
-netmap_obj_malloc(struct netmap_obj_pool *p, int len, uint32_t *start, uint32_t *index)
+netmap_obj_malloc(struct netmap_obj_pool *p, u_int len, uint32_t *start, uint32_t *index)
 {
 	uint32_t i = 0;			/* index in the bitmap */
 	uint32_t mask, j;		/* slot counter */
@@ -374,10 +361,10 @@ netmap_obj_free(struct netmap_obj_pool *p, uint32_t j)
 static void
 netmap_obj_free_va(struct netmap_obj_pool *p, void *vaddr)
 {
-	int i, j, n = p->_memtotal / p->_clustsize;
+	u_int i, j, n = p->numclusters;
 
-	for (i = 0, j = 0; i < n; i++, j += p->clustentries) {
-		void *base = p->lut[i * p->clustentries].vaddr;
+	for (i = 0, j = 0; i < n; i++, j += p->_clustentries) {
+		void *base = p->lut[i * p->_clustentries].vaddr;
 		ssize_t relofs = (ssize_t) vaddr - (ssize_t) base;
 
 		/* Given address, is out of the scope of the current cluster.*/
@@ -385,7 +372,7 @@ netmap_obj_free_va(struct netmap_obj_pool *p, void *vaddr)
 			continue;
 
 		j = j + relofs / p->_objsize;
-		KASSERT(j != 0, ("Cannot free object 0"));
+		/* KASSERT(j != 0, ("Cannot free object 0")); */
 		netmap_obj_free(p, j);
 		return;
 	}
@@ -393,32 +380,32 @@ netmap_obj_free_va(struct netmap_obj_pool *p, void *vaddr)
 	    vaddr, p->name);
 }
 
-#define netmap_if_malloc(len)	netmap_obj_malloc(&nm_mem.pools[NETMAP_IF_POOL], len, NULL, NULL)
-#define netmap_if_free(v)	netmap_obj_free_va(&nm_mem.pools[NETMAP_IF_POOL], (v))
-#define netmap_ring_malloc(len)	netmap_obj_malloc(&nm_mem.pools[NETMAP_RING_POOL], len, NULL, NULL)
-#define netmap_ring_free(v)	netmap_obj_free_va(&nm_mem.pools[NETMAP_RING_POOL], (v))
-#define netmap_buf_malloc(_pos, _index)			\
-	netmap_obj_malloc(&nm_mem.pools[NETMAP_BUF_POOL], NETMAP_BUF_SIZE, _pos, _index)
+#define netmap_if_malloc(n, len)	netmap_obj_malloc(&(n)->pools[NETMAP_IF_POOL], len, NULL, NULL)
+#define netmap_if_free(n, v)		netmap_obj_free_va(&(n)->pools[NETMAP_IF_POOL], (v))
+#define netmap_ring_malloc(n, len)	netmap_obj_malloc(&(n)->pools[NETMAP_RING_POOL], len, NULL, NULL)
+#define netmap_ring_free(n, v)		netmap_obj_free_va(&(n)->pools[NETMAP_RING_POOL], (v))
+#define netmap_buf_malloc(n, _pos, _index)			\
+	netmap_obj_malloc(&(n)->pools[NETMAP_BUF_POOL], NETMAP_BDG_BUF_SIZE(n), _pos, _index)
 
 
 /* Return the index associated to the given packet buffer */
-#define netmap_buf_index(v)						\
-    (netmap_obj_offset(&nm_mem.pools[NETMAP_BUF_POOL], (v)) / nm_mem.pools[NETMAP_BUF_POOL]._objsize)
+#define netmap_buf_index(n, v)						\
+    (netmap_obj_offset(&(n)->pools[NETMAP_BUF_POOL], (v)) / NETMAP_BDG_BUF_SIZE(n))
 
 
 /* Return nonzero on error */
 static int
-netmap_new_bufs(struct netmap_if *nifp,
+netmap_new_bufs(struct netmap_mem_d *nmd, struct netmap_if *nifp,
                 struct netmap_slot *slot, u_int n)
 {
-	struct netmap_obj_pool *p = &nm_mem.pools[NETMAP_BUF_POOL];
-	int i = 0;	/* slot counter */
+	struct netmap_obj_pool *p = &nmd->pools[NETMAP_BUF_POOL];
+	u_int i = 0;	/* slot counter */
 	uint32_t pos = 0;	/* slot in p->bitmap */
 	uint32_t index = 0;	/* buffer index */
 
 	(void)nifp;	/* UNUSED */
 	for (i = 0; i < n; i++) {
-		void *vaddr = netmap_buf_malloc(&pos, &index);
+		void *vaddr = netmap_buf_malloc(nmd, &pos, &index);
 		if (vaddr == NULL) {
 			D("unable to locate empty packet buffer");
 			goto cleanup;
@@ -446,10 +433,11 @@ cleanup:
 
 
 static void
-netmap_free_buf(struct netmap_if *nifp, uint32_t i)
+netmap_free_buf(struct netmap_mem_d *nmd, struct netmap_if *nifp, uint32_t i)
 {
-	struct netmap_obj_pool *p = &nm_mem.pools[NETMAP_BUF_POOL];
+	struct netmap_obj_pool *p = &nmd->pools[NETMAP_BUF_POOL];
 
+	(void)nifp;
 	if (i < 2 || i >= p->objtotal) {
 		D("Cannot free buf#%d: should be in [2, %d[", i, p->objtotal);
 		return;
@@ -460,16 +448,19 @@ netmap_free_buf(struct netmap_if *nifp, uint32_t i)
 static void
 netmap_reset_obj_allocator(struct netmap_obj_pool *p)
 {
+
 	if (p == NULL)
 		return;
 	if (p->bitmap)
 		free(p->bitmap, M_NETMAP);
 	p->bitmap = NULL;
 	if (p->lut) {
-		int i;
-		for (i = 0; i < p->objtotal; i += p->clustentries) {
+		u_int i;
+		size_t sz = p->_clustsize;
+
+		for (i = 0; i < p->objtotal; i += p->_clustentries) {
 			if (p->lut[i].vaddr)
-				contigfree(p->lut[i].vaddr, p->_clustsize, M_NETMAP);
+				contigfree(p->lut[i].vaddr, sz, M_NETMAP);
 		}
 		bzero(p->lut, sizeof(struct lut_entry) * p->objtotal);
 #ifdef linux
@@ -479,6 +470,10 @@ netmap_reset_obj_allocator(struct netmap_obj_pool *p)
 #endif
 	}
 	p->lut = NULL;
+	p->objtotal = 0;
+	p->memtotal = 0;
+	p->numclusters = 0;
+	p->objfree = 0;
 }
 
 /*
@@ -496,8 +491,7 @@ netmap_destroy_obj_allocator(struct netmap_obj_pool *p)
  * We receive a request for objtotal objects, of size objsize each.
  * Internally we may round up both numbers, as we allocate objects
  * in small clusters multiple of the page size.
- * In the allocator we don't need to store the objsize,
- * but we do need to keep track of objtotal' and clustentries,
+ * We need to keep track of objtotal and clustentries,
  * as they are needed when freeing memory.
  *
  * XXX note -- userspace needs the buffers to be contiguous,
@@ -509,16 +503,21 @@ netmap_destroy_obj_allocator(struct netmap_obj_pool *p)
 static int
 netmap_config_obj_allocator(struct netmap_obj_pool *p, u_int objtotal, u_int objsize)
 {
-	int i, n;
+	int i;
 	u_int clustsize;	/* the cluster size, multiple of page size */
 	u_int clustentries;	/* how many objects per entry */
 
+	/* we store the current request, so we can
+	 * detect configuration changes later */
+	p->r_objtotal = objtotal;
+	p->r_objsize = objsize;
+
 #define MAX_CLUSTSIZE	(1<<17)
 #define LINE_ROUND	64
 	if (objsize >= MAX_CLUSTSIZE) {
 		/* we could do it but there is no point */
 		D("unsupported allocation for %d bytes", objsize);
-		goto error;
+		return EINVAL;
 	}
 	/* make sure objsize is a multiple of LINE_ROUND */
 	i = (objsize & (LINE_ROUND - 1));
@@ -529,12 +528,12 @@ netmap_config_obj_allocator(struct netmap_obj_pool *p, u_int objtotal, u_int obj
 	if (objsize < p->objminsize || objsize > p->objmaxsize) {
 		D("requested objsize %d out of range [%d, %d]",
 			objsize, p->objminsize, p->objmaxsize);
-		goto error;
+		return EINVAL;
 	}
 	if (objtotal < p->nummin || objtotal > p->nummax) {
 		D("requested objtotal %d out of range [%d, %d]",
 			objtotal, p->nummin, p->nummax);
-		goto error;
+		return EINVAL;
 	}
 	/*
 	 * Compute number of objects using a brute-force approach:
@@ -568,22 +567,15 @@ netmap_config_obj_allocator(struct netmap_obj_pool *p, u_int objtotal, u_int obj
 	 * The number of clusters is n = ceil(objtotal/clustentries)
 	 * objtotal' = n * clustentries
 	 */
-	p->clustentries = clustentries;
+	p->_clustentries = clustentries;
 	p->_clustsize = clustsize;
-	n = (objtotal + clustentries - 1) / clustentries;
-	p->_numclusters = n;
-	p->objtotal = n * clustentries;
-	p->objfree = p->objtotal - 2; /* obj 0 and 1 are reserved */
-	p->_memtotal = p->_numclusters * p->_clustsize;
+	p->_numclusters = (objtotal + clustentries - 1) / clustentries;
+
+	/* actual values (may be larger than requested) */
 	p->_objsize = objsize;
+	p->_objtotal = p->_numclusters * clustentries;
 
 	return 0;
-
-error:
-	p->_objsize = objsize;
-	p->objtotal = objtotal;
-
-	return EINVAL;
 }
 
 
@@ -591,7 +583,12 @@ error:
 static int
 netmap_finalize_obj_allocator(struct netmap_obj_pool *p)
 {
-	int i, n;
+	int i; /* must be signed */
+	size_t n;
+
+	/* optimistically assume we have enough memory */
+	p->numclusters = p->_numclusters;
+	p->objtotal = p->_objtotal;
 
 	n = sizeof(struct lut_entry) * p->objtotal;
 #ifdef linux
@@ -600,7 +597,7 @@ netmap_finalize_obj_allocator(struct netmap_obj_pool *p)
 	p->lut = malloc(n, M_NETMAP, M_NOWAIT | M_ZERO);
 #endif
 	if (p->lut == NULL) {
-		D("Unable to create lookup table (%d bytes) for '%s'", n, p->name);
+		D("Unable to create lookup table (%d bytes) for '%s'", (int)n, p->name);
 		goto clean;
 	}
 
@@ -608,7 +605,7 @@ netmap_finalize_obj_allocator(struct netmap_obj_pool *p)
 	n = (p->objtotal + 31) / 32;
 	p->bitmap = malloc(sizeof(uint32_t) * n, M_NETMAP, M_NOWAIT | M_ZERO);
 	if (p->bitmap == NULL) {
-		D("Unable to create bitmap (%d entries) for allocator '%s'", n,
+		D("Unable to create bitmap (%d entries) for allocator '%s'", (int)n,
 		    p->name);
 		goto clean;
 	}
@@ -617,31 +614,34 @@ netmap_finalize_obj_allocator(struct netmap_obj_pool *p)
 	/*
 	 * Allocate clusters, init pointers and bitmap
 	 */
-	for (i = 0; i < p->objtotal;) {
-		int lim = i + p->clustentries;
+
+	n = p->_clustsize;
+	for (i = 0; i < (int)p->objtotal;) {
+		int lim = i + p->_clustentries;
 		char *clust;
 
-		clust = contigmalloc(p->_clustsize, M_NETMAP, M_NOWAIT | M_ZERO,
-		    0, -1UL, PAGE_SIZE, 0);
+		clust = contigmalloc(n, M_NETMAP, M_NOWAIT | M_ZERO,
+		    (size_t)0, -1UL, PAGE_SIZE, 0);
 		if (clust == NULL) {
 			/*
 			 * If we get here, there is a severe memory shortage,
 			 * so halve the allocated memory to reclaim some.
-			 * XXX check boundaries
 			 */
 			D("Unable to create cluster at %d for '%s' allocator",
 			    i, p->name);
+			if (i < 2) /* nothing to halve */
+				goto out;
 			lim = i / 2;
 			for (i--; i >= lim; i--) {
 				p->bitmap[ (i>>5) ] &=  ~( 1 << (i & 31) );
-				if (i % p->clustentries == 0 && p->lut[i].vaddr)
+				if (i % p->_clustentries == 0 && p->lut[i].vaddr)
 					contigfree(p->lut[i].vaddr,
-						p->_clustsize, M_NETMAP);
+						n, M_NETMAP);
 			}
+		out:
 			p->objtotal = i;
-			p->objfree = p->objtotal - 2;
-			p->_numclusters = i / p->clustentries;
-			p->_memtotal = p->_numclusters * p->_clustsize;
+			/* we may have stopped in the middle of a cluster */
+			p->numclusters = (i + p->_clustentries - 1) / p->_clustentries;
 			break;
 		}
 		for (; i < lim; i++, clust += p->_objsize) {
@@ -650,11 +650,14 @@ netmap_finalize_obj_allocator(struct netmap_obj_pool *p)
 			p->lut[i].paddr = vtophys(clust);
 		}
 	}
-	p->bitmap[0] = ~3; /* objs 0 and 1 is always busy */
+	p->objfree = p->objtotal;
+	p->memtotal = p->numclusters * p->_clustsize;
+	if (p->objfree == 0)
+		goto clean;
 	if (netmap_verbose)
 		D("Pre-allocated %d clusters (%d/%dKB) for '%s'",
-		    p->_numclusters, p->_clustsize >> 10,
-		    p->_memtotal >> 10, p->name);
+		    p->numclusters, p->_clustsize >> 10,
+		    p->memtotal >> 10, p->name);
 
 	return 0;
 
@@ -665,148 +668,275 @@ clean:
 
 /* call with lock held */
 static int
-netmap_memory_config_changed(void)
+netmap_memory_config_changed(struct netmap_mem_d *nmd)
 {
 	int i;
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
-		if (nm_mem.pools[i]._objsize != netmap_params[i].size ||
-		    nm_mem.pools[i].objtotal != netmap_params[i].num)
+		if (nmd->pools[i].r_objsize != netmap_params[i].size ||
+		    nmd->pools[i].r_objtotal != netmap_params[i].num)
 		    return 1;
 	}
 	return 0;
 }
 
+static void
+netmap_mem_reset_all(struct netmap_mem_d *nmd)
+{
+	int i;
+	D("resetting %p", nmd);
+	for (i = 0; i < NETMAP_POOLS_NR; i++) {
+		netmap_reset_obj_allocator(&nmd->pools[i]);
+	}
+	nmd->flags  &= ~NETMAP_MEM_FINALIZED;
+}
+
+static int
+netmap_mem_finalize_all(struct netmap_mem_d *nmd)
+{
+	int i;
+	if (nmd->flags & NETMAP_MEM_FINALIZED)
+		return 0;
+	nmd->lasterr = 0;
+	nmd->nm_totalsize = 0;
+	for (i = 0; i < NETMAP_POOLS_NR; i++) {
+		nmd->lasterr = netmap_finalize_obj_allocator(&nmd->pools[i]);
+		if (nmd->lasterr)
+			goto error;
+		nmd->nm_totalsize += nmd->pools[i].memtotal;
+	}
+	/* buffers 0 and 1 are reserved */
+	nmd->pools[NETMAP_BUF_POOL].objfree -= 2;
+	nmd->pools[NETMAP_BUF_POOL].bitmap[0] = ~3;
+	nmd->flags |= NETMAP_MEM_FINALIZED;
+
+	D("Have %d KB for interfaces, %d KB for rings and %d MB for buffers",
+	    nmd->pools[NETMAP_IF_POOL].memtotal >> 10,
+	    nmd->pools[NETMAP_RING_POOL].memtotal >> 10,
+	    nmd->pools[NETMAP_BUF_POOL].memtotal >> 20);
+
+	D("Free buffers: %d", nmd->pools[NETMAP_BUF_POOL].objfree);
+
+
+	return 0;
+error:
+	netmap_mem_reset_all(nmd);
+	return nmd->lasterr;
+}
+
+
+
+void
+netmap_mem_private_delete(struct netmap_mem_d *nmd)
+{
+	if (nmd == NULL)
+		return;
+	D("deleting %p", nmd);
+	if (nmd->refcount > 0)
+		D("bug: deleting mem allocator with refcount=%d!", nmd->refcount);
+	D("done deleting %p", nmd);
+	NMA_LOCK_DESTROY(nmd);
+	free(nmd, M_DEVBUF);
+}
+
+static int
+netmap_mem_private_config(struct netmap_mem_d *nmd)
+{
+	/* nothing to do, we are configured on creation
+ 	 * and configuration never changes thereafter
+ 	 */
+	return 0;
+}
+
+static int
+netmap_mem_private_finalize(struct netmap_mem_d *nmd)
+{
+	int err;
+	NMA_LOCK(nmd);
+	nmd->refcount++;
+	err = netmap_mem_finalize_all(nmd);
+	NMA_UNLOCK(nmd);
+	return err;
+
+}
+
+static void netmap_mem_private_deref(struct netmap_mem_d *nmd)
+{
+	NMA_LOCK(nmd);
+	if (--nmd->refcount <= 0)
+		netmap_mem_reset_all(nmd);
+	NMA_UNLOCK(nmd);
+}
+
+struct netmap_mem_d *
+netmap_mem_private_new(const char *name, u_int txr, u_int txd, u_int rxr, u_int rxd)
+{
+	struct netmap_mem_d *d = NULL;
+	struct netmap_obj_params p[NETMAP_POOLS_NR];
+	int i;
+	u_int maxd;
+
+	d = malloc(sizeof(struct netmap_mem_d),
+			M_DEVBUF, M_NOWAIT | M_ZERO);
+	if (d == NULL)
+		return NULL;
+
+	*d = nm_blueprint;
+
+	/* XXX the rest of the code assumes the stack rings are alwasy present */
+	txr++;
+	rxr++;
+	p[NETMAP_IF_POOL].size = sizeof(struct netmap_if) +
+		sizeof(ssize_t) * (txr + rxr);
+	p[NETMAP_IF_POOL].num = 2;
+	maxd = (txd > rxd) ? txd : rxd;
+	p[NETMAP_RING_POOL].size = sizeof(struct netmap_ring) +
+		sizeof(struct netmap_slot) * maxd;
+	p[NETMAP_RING_POOL].num = txr + rxr;
+	p[NETMAP_BUF_POOL].size = 2048; /* XXX find a way to let the user choose this */
+	p[NETMAP_BUF_POOL].num = rxr * (rxd + 2) + txr * (txd + 2);
+
+	D("req if %d*%d ring %d*%d buf %d*%d",
+			p[NETMAP_IF_POOL].num,
+			p[NETMAP_IF_POOL].size,
+			p[NETMAP_RING_POOL].num,
+			p[NETMAP_RING_POOL].size,
+			p[NETMAP_BUF_POOL].num,
+			p[NETMAP_BUF_POOL].size);
+
+	for (i = 0; i < NETMAP_POOLS_NR; i++) {
+		snprintf(d->pools[i].name, NETMAP_POOL_MAX_NAMSZ,
+				nm_blueprint.pools[i].name,
+				name);
+		if (netmap_config_obj_allocator(&d->pools[i],
+				p[i].num, p[i].size))
+			goto error;
+	}
+
+	d->flags &= ~NETMAP_MEM_FINALIZED;
+
+	NMA_LOCK_INIT(d);
+
+	return d;
+error:
+	netmap_mem_private_delete(d);
+	return NULL;
+}
+
 
 /* call with lock held */
 static int
-netmap_memory_config(void)
+netmap_mem_global_config(struct netmap_mem_d *nmd)
 {
 	int i;
 
-	if (!netmap_memory_config_changed())
+	if (nmd->refcount)
+		/* already in use, we cannot change the configuration */
+		goto out;
+
+	if (!netmap_memory_config_changed(nmd))
 		goto out;
 
 	D("reconfiguring");
 
-	if (nm_mem.finalized) {
+	if (nmd->flags & NETMAP_MEM_FINALIZED) {
 		/* reset previous allocation */
 		for (i = 0; i < NETMAP_POOLS_NR; i++) {
-			netmap_reset_obj_allocator(&nm_mem.pools[i]);
+			netmap_reset_obj_allocator(&nmd->pools[i]);
 		}
-		nm_mem.finalized = 0;
+		nmd->flags &= ~NETMAP_MEM_FINALIZED;
         }
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
-		nm_mem.lasterr = netmap_config_obj_allocator(&nm_mem.pools[i],
+		nmd->lasterr = netmap_config_obj_allocator(&nmd->pools[i],
 				netmap_params[i].num, netmap_params[i].size);
-		if (nm_mem.lasterr)
+		if (nmd->lasterr)
 			goto out;
 	}
 
-	D("Have %d KB for interfaces, %d KB for rings and %d MB for buffers",
-	    nm_mem.pools[NETMAP_IF_POOL]._memtotal >> 10,
-	    nm_mem.pools[NETMAP_RING_POOL]._memtotal >> 10,
-	    nm_mem.pools[NETMAP_BUF_POOL]._memtotal >> 20);
-
 out:
 
-	return nm_mem.lasterr;
+	return nmd->lasterr;
 }
 
-/* call with lock held */
 static int
-netmap_memory_finalize(void)
+netmap_mem_global_finalize(struct netmap_mem_d *nmd)
 {
-	int i;
-	u_int totalsize = 0;
+	int err;
+
+	NMA_LOCK(nmd);
 
-	nm_mem.refcount++;
-	if (nm_mem.refcount > 1) {
-		ND("busy (refcount %d)", nm_mem.refcount);
-		goto out;
-	}
 
 	/* update configuration if changed */
-	if (netmap_memory_config())
+	if (netmap_mem_global_config(nmd))
 		goto out;
 
-	if (nm_mem.finalized) {
+	nmd->refcount++;
+
+	if (nmd->flags & NETMAP_MEM_FINALIZED) {
 		/* may happen if config is not changed */
 		ND("nothing to do");
 		goto out;
 	}
 
-	for (i = 0; i < NETMAP_POOLS_NR; i++) {
-		nm_mem.lasterr = netmap_finalize_obj_allocator(&nm_mem.pools[i]);
-		if (nm_mem.lasterr)
-			goto cleanup;
-		totalsize += nm_mem.pools[i]._memtotal;
-	}
-	nm_mem.nm_totalsize = totalsize;
+	if (netmap_mem_finalize_all(nmd))
+		goto out;
 
 	/* backward compatibility */
-	netmap_buf_size = nm_mem.pools[NETMAP_BUF_POOL]._objsize;
-	netmap_total_buffers = nm_mem.pools[NETMAP_BUF_POOL].objtotal;
+	netmap_buf_size = nmd->pools[NETMAP_BUF_POOL]._objsize;
+	netmap_total_buffers = nmd->pools[NETMAP_BUF_POOL].objtotal;
 
-	netmap_buffer_lut = nm_mem.pools[NETMAP_BUF_POOL].lut;
-	netmap_buffer_base = nm_mem.pools[NETMAP_BUF_POOL].lut[0].vaddr;
+	netmap_buffer_lut = nmd->pools[NETMAP_BUF_POOL].lut;
+	netmap_buffer_base = nmd->pools[NETMAP_BUF_POOL].lut[0].vaddr;
 
-	nm_mem.finalized = 1;
-	nm_mem.lasterr = 0;
-
-	/* make sysctl values match actual values in the pools */
-	for (i = 0; i < NETMAP_POOLS_NR; i++) {
-		netmap_params[i].size = nm_mem.pools[i]._objsize;
-		netmap_params[i].num  = nm_mem.pools[i].objtotal;
-	}
+	nmd->lasterr = 0;
 
 out:
-	if (nm_mem.lasterr)
-		nm_mem.refcount--;
+	if (nmd->lasterr)
+		nmd->refcount--;
+	err = nmd->lasterr;
 
-	return nm_mem.lasterr;
+	NMA_UNLOCK(nmd);
 
-cleanup:
-	for (i = 0; i < NETMAP_POOLS_NR; i++) {
-		netmap_reset_obj_allocator(&nm_mem.pools[i]);
-	}
-	nm_mem.refcount--;
+	return err;
 
-	return nm_mem.lasterr;
 }
 
-static int
-netmap_memory_init(void)
+int
+netmap_mem_init(void)
 {
-	NMA_LOCK_INIT();
+	NMA_LOCK_INIT(&nm_mem);
 	return (0);
 }
 
-static void
-netmap_memory_fini(void)
+void
+netmap_mem_fini(void)
 {
 	int i;
 
 	for (i = 0; i < NETMAP_POOLS_NR; i++) {
 	    netmap_destroy_obj_allocator(&nm_mem.pools[i]);
 	}
-	NMA_LOCK_DESTROY();
+	NMA_LOCK_DESTROY(&nm_mem);
 }
 
 static void
 netmap_free_rings(struct netmap_adapter *na)
 {
-	int i;
+	u_int i;
 	if (!na->tx_rings)
 		return;
 	for (i = 0; i < na->num_tx_rings + 1; i++) {
-		netmap_ring_free(na->tx_rings[i].ring);
-		na->tx_rings[i].ring = NULL;
+		if (na->tx_rings[i].ring) {
+			netmap_ring_free(na->nm_mem, na->tx_rings[i].ring);
+			na->tx_rings[i].ring = NULL;
+		}
 	}
 	for (i = 0; i < na->num_rx_rings + 1; i++) {
-		netmap_ring_free(na->rx_rings[i].ring);
-		na->rx_rings[i].ring = NULL;
+		if (na->rx_rings[i].ring) {
+			netmap_ring_free(na->nm_mem, na->rx_rings[i].ring);
+			na->rx_rings[i].ring = NULL;
+		}
 	}
 	free(na->tx_rings, M_DEVBUF);
 	na->tx_rings = na->rx_rings = NULL;
@@ -818,50 +948,76 @@ netmap_free_rings(struct netmap_adapter *na)
 /*
  * Allocate the per-fd structure netmap_if.
  * If this is the first instance, also allocate the krings, rings etc.
+ *
+ * We assume that the configuration stored in na
+ * (number of tx/rx rings and descs) does not change while
+ * the interface is in netmap mode.
  */
-static void *
-netmap_if_new(const char *ifname, struct netmap_adapter *na)
+extern int nma_is_vp(struct netmap_adapter *na);
+struct netmap_if *
+netmap_mem_if_new(const char *ifname, struct netmap_adapter *na)
 {
 	struct netmap_if *nifp;
 	struct netmap_ring *ring;
 	ssize_t base; /* handy for relative offsets between rings and nifp */
 	u_int i, len, ndesc, ntx, nrx;
 	struct netmap_kring *kring;
+	uint32_t *tx_leases = NULL, *rx_leases = NULL;
 
-	if (netmap_update_config(na)) {
-		/* configuration mismatch, report and fail */
-		return NULL;
-	}
+	/*
+	 * verify whether virtual port need the stack ring
+	 */
 	ntx = na->num_tx_rings + 1; /* shorthand, include stack ring */
 	nrx = na->num_rx_rings + 1; /* shorthand, include stack ring */
 	/*
 	 * the descriptor is followed inline by an array of offsets
 	 * to the tx and rx rings in the shared memory region.
+	 * For virtual rx rings we also allocate an array of
+	 * pointers to assign to nkr_leases.
 	 */
+
+	NMA_LOCK(na->nm_mem);
+
 	len = sizeof(struct netmap_if) + (nrx + ntx) * sizeof(ssize_t);
-	nifp = netmap_if_malloc(len);
+	nifp = netmap_if_malloc(na->nm_mem, len);
 	if (nifp == NULL) {
+		NMA_UNLOCK(na->nm_mem);
 		return NULL;
 	}
 
 	/* initialize base fields -- override const */
-	*(int *)(uintptr_t)&nifp->ni_tx_rings = na->num_tx_rings;
-	*(int *)(uintptr_t)&nifp->ni_rx_rings = na->num_rx_rings;
-	strncpy(nifp->ni_name, ifname, IFNAMSIZ);
+	*(u_int *)(uintptr_t)&nifp->ni_tx_rings = na->num_tx_rings;
+	*(u_int *)(uintptr_t)&nifp->ni_rx_rings = na->num_rx_rings;
+	strncpy(nifp->ni_name, ifname, (size_t)IFNAMSIZ);
 
-	(na->refcount)++;	/* XXX atomic ? we are under lock */
-	if (na->refcount > 1) { /* already setup, we are done */
+	if (na->refcount) { /* already setup, we are done */
 		goto final;
 	}
 
 	len = (ntx + nrx) * sizeof(struct netmap_kring);
-	na->tx_rings = malloc(len, M_DEVBUF, M_NOWAIT | M_ZERO);
+	/*
+	 * Leases are attached to TX rings on NIC/host ports,
+	 * and to RX rings on VALE ports.
+	 */
+	if (nma_is_vp(na)) {
+		len += sizeof(uint32_t) * na->num_rx_desc * na->num_rx_rings;
+	} else {
+		len += sizeof(uint32_t) * na->num_tx_desc * ntx;
+	}
+
+	na->tx_rings = malloc((size_t)len, M_DEVBUF, M_NOWAIT | M_ZERO);
 	if (na->tx_rings == NULL) {
 		D("Cannot allocate krings for %s", ifname);
 		goto cleanup;
 	}
 	na->rx_rings = na->tx_rings + ntx;
 
+	if (nma_is_vp(na)) {
+		rx_leases = (uint32_t *)(na->rx_rings + nrx);
+	} else {
+		tx_leases = (uint32_t *)(na->rx_rings + nrx);
+	}
+
 	/*
 	 * First instance, allocate netmap rings and buffers for this card
 	 * The rings are contiguous, but have variable size.
@@ -872,7 +1028,7 @@ netmap_if_new(const char *ifname, struct netmap_adapter *na)
 		bzero(kring, sizeof(*kring));
 		len = sizeof(struct netmap_ring) +
 			  ndesc * sizeof(struct netmap_slot);
-		ring = netmap_ring_malloc(len);
+		ring = netmap_ring_malloc(na->nm_mem, len);
 		if (ring == NULL) {
 			D("Cannot allocate tx_ring[%d] for %s", i, ifname);
 			goto cleanup;
@@ -880,11 +1036,15 @@ netmap_if_new(const char *ifname, struct netmap_adapter *na)
 		ND("txring[%d] at %p ofs %d", i, ring);
 		kring->na = na;
 		kring->ring = ring;
-		*(int *)(uintptr_t)&ring->num_slots = kring->nkr_num_slots = ndesc;
+		if (tx_leases) {
+			kring->nkr_leases = tx_leases;
+			tx_leases += ndesc;
+		}
+		*(uint32_t *)(uintptr_t)&ring->num_slots = kring->nkr_num_slots = ndesc;
 		*(ssize_t *)(uintptr_t)&ring->buf_ofs =
-		    (nm_mem.pools[NETMAP_IF_POOL]._memtotal +
-			nm_mem.pools[NETMAP_RING_POOL]._memtotal) -
-			netmap_ring_offset(ring);
+		    (na->nm_mem->pools[NETMAP_IF_POOL].memtotal +
+			na->nm_mem->pools[NETMAP_RING_POOL].memtotal) -
+			netmap_ring_offset(na->nm_mem, ring);
 
 		/*
 		 * IMPORTANT:
@@ -894,9 +1054,10 @@ netmap_if_new(const char *ifname, struct netmap_adapter *na)
 		 */
 		ring->avail = kring->nr_hwavail = ndesc - 1;
 		ring->cur = kring->nr_hwcur = 0;
-		*(int *)(uintptr_t)&ring->nr_buf_size = NETMAP_BUF_SIZE;
+		*(uint16_t *)(uintptr_t)&ring->nr_buf_size =
+			NETMAP_BDG_BUF_SIZE(na->nm_mem);
 		ND("initializing slots for txring[%d]", i);
-		if (netmap_new_bufs(nifp, ring->slot, ndesc)) {
+		if (netmap_new_bufs(na->nm_mem, nifp, ring->slot, ndesc)) {
 			D("Cannot allocate buffers for tx_ring[%d] for %s", i, ifname);
 			goto cleanup;
 		}
@@ -908,7 +1069,7 @@ netmap_if_new(const char *ifname, struct netmap_adapter *na)
 		bzero(kring, sizeof(*kring));
 		len = sizeof(struct netmap_ring) +
 			  ndesc * sizeof(struct netmap_slot);
-		ring = netmap_ring_malloc(len);
+		ring = netmap_ring_malloc(na->nm_mem, len);
 		if (ring == NULL) {
 			D("Cannot allocate rx_ring[%d] for %s", i, ifname);
 			goto cleanup;
@@ -917,17 +1078,22 @@ netmap_if_new(const char *ifname, struct netmap_adapter *na)
 
 		kring->na = na;
 		kring->ring = ring;
-		*(int *)(uintptr_t)&ring->num_slots = kring->nkr_num_slots = ndesc;
+		if (rx_leases && i < na->num_rx_rings) {
+			kring->nkr_leases = rx_leases;
+			rx_leases += ndesc;
+		}
+		*(uint32_t *)(uintptr_t)&ring->num_slots = kring->nkr_num_slots = ndesc;
 		*(ssize_t *)(uintptr_t)&ring->buf_ofs =
-		    (nm_mem.pools[NETMAP_IF_POOL]._memtotal +
-		        nm_mem.pools[NETMAP_RING_POOL]._memtotal) -
-			netmap_ring_offset(ring);
+		    (na->nm_mem->pools[NETMAP_IF_POOL].memtotal +
+		        na->nm_mem->pools[NETMAP_RING_POOL].memtotal) -
+			netmap_ring_offset(na->nm_mem, ring);
 
 		ring->cur = kring->nr_hwcur = 0;
 		ring->avail = kring->nr_hwavail = 0; /* empty */
-		*(int *)(uintptr_t)&ring->nr_buf_size = NETMAP_BUF_SIZE;
+		*(int *)(uintptr_t)&ring->nr_buf_size =
+			NETMAP_BDG_BUF_SIZE(na->nm_mem);
 		ND("initializing slots for rxring[%d]", i);
-		if (netmap_new_bufs(nifp, ring->slot, ndesc)) {
+		if (netmap_new_bufs(na->nm_mem, nifp, ring->slot, ndesc)) {
 			D("Cannot allocate buffers for rx_ring[%d] for %s", i, ifname);
 			goto cleanup;
 		}
@@ -947,28 +1113,78 @@ final:
 	 * between the ring and nifp, so the information is usable in
 	 * userspace to reach the ring from the nifp.
 	 */
-	base = netmap_if_offset(nifp);
+	base = netmap_if_offset(na->nm_mem, nifp);
 	for (i = 0; i < ntx; i++) {
 		*(ssize_t *)(uintptr_t)&nifp->ring_ofs[i] =
-			netmap_ring_offset(na->tx_rings[i].ring) - base;
+			netmap_ring_offset(na->nm_mem, na->tx_rings[i].ring) - base;
 	}
 	for (i = 0; i < nrx; i++) {
 		*(ssize_t *)(uintptr_t)&nifp->ring_ofs[i+ntx] =
-			netmap_ring_offset(na->rx_rings[i].ring) - base;
+			netmap_ring_offset(na->nm_mem, na->rx_rings[i].ring) - base;
 	}
+
+	NMA_UNLOCK(na->nm_mem);
+
 	return (nifp);
 cleanup:
 	netmap_free_rings(na);
-	netmap_if_free(nifp);
-	(na->refcount)--;
+	netmap_if_free(na->nm_mem, nifp);
+
+	NMA_UNLOCK(na->nm_mem);
+
 	return NULL;
 }
 
-/* call with NMA_LOCK held */
-static void
-netmap_memory_deref(void)
+void
+netmap_mem_if_delete(struct netmap_adapter *na, struct netmap_if *nifp)
 {
-	nm_mem.refcount--;
-	if (netmap_verbose)
-		D("refcount = %d", nm_mem.refcount);
+	if (nifp == NULL)
+		/* nothing to do */
+		return;
+	NMA_LOCK(na->nm_mem);
+
+	if (na->refcount <= 0) {
+		/* last instance, release bufs and rings */
+		u_int i, j, lim;
+		struct netmap_ring *ring;
+
+		for (i = 0; i < na->num_tx_rings + 1; i++) {
+			ring = na->tx_rings[i].ring;
+			lim = na->tx_rings[i].nkr_num_slots;
+			for (j = 0; j < lim; j++)
+				netmap_free_buf(na->nm_mem, nifp, ring->slot[j].buf_idx);
+		}
+		for (i = 0; i < na->num_rx_rings + 1; i++) {
+			ring = na->rx_rings[i].ring;
+			lim = na->rx_rings[i].nkr_num_slots;
+			for (j = 0; j < lim; j++)
+				netmap_free_buf(na->nm_mem, nifp, ring->slot[j].buf_idx);
+		}
+		netmap_free_rings(na);
+	}
+	netmap_if_free(na->nm_mem, nifp);
+
+	NMA_UNLOCK(na->nm_mem);
+}
+
+static void
+netmap_mem_global_deref(struct netmap_mem_d *nmd)
+{
+	NMA_LOCK(nmd);
+
+	nmd->refcount--;
+	if (netmap_verbose)
+		D("refcount = %d", nmd->refcount);
+
+	NMA_UNLOCK(nmd);
+}
+
+int netmap_mem_finalize(struct netmap_mem_d *nmd)
+{
+	return nmd->finalize(nmd);
+}
+
+void netmap_mem_deref(struct netmap_mem_d *nmd)
+{
+	return nmd->deref(nmd);
 }
diff --git a/sys/dev/netmap/netmap_mem2.h b/sys/dev/netmap/netmap_mem2.h
new file mode 100644
index 00000000000..83f31d011c4
--- /dev/null
+++ b/sys/dev/netmap/netmap_mem2.h
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2012-2013 Matteo Landi, Luigi Rizzo, Giuseppe Lettieri. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *   1. Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright
+ *      notice, this 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$
+ *
+ * (New) memory allocator for netmap
+ */
+
+/*
+ * This allocator creates three memory pools:
+ *	nm_if_pool	for the struct netmap_if
+ *	nm_ring_pool	for the struct netmap_ring
+ *	nm_buf_pool	for the packet buffers.
+ *
+ * that contain netmap objects. Each pool is made of a number of clusters,
+ * multiple of a page size, each containing an integer number of objects.
+ * The clusters are contiguous in user space but not in the kernel.
+ * Only nm_buf_pool needs to be dma-able,
+ * but for convenience use the same type of allocator for all.
+ *
+ * Once mapped, the three pools are exported to userspace
+ * as a contiguous block, starting from nm_if_pool. Each
+ * cluster (and pool) is an integral number of pages.
+ *   [ . . . ][ . . . . . .][ . . . . . . . . . .]
+ *    nm_if     nm_ring            nm_buf
+ *
+ * The userspace areas contain offsets of the objects in userspace.
+ * When (at init time) we write these offsets, we find out the index
+ * of the object, and from there locate the offset from the beginning
+ * of the region.
+ *
+ * The invididual allocators manage a pool of memory for objects of
+ * the same size.
+ * The pool is split into smaller clusters, whose size is a
+ * multiple of the page size. The cluster size is chosen
+ * to minimize the waste for a given max cluster size
+ * (we do it by brute force, as we have relatively few objects
+ * per cluster).
+ *
+ * Objects are aligned to the cache line (64 bytes) rounding up object
+ * sizes when needed. A bitmap contains the state of each object.
+ * Allocation scans the bitmap; this is done only on attach, so we are not
+ * too worried about performance
+ *
+ * For each allocator we can define (thorugh sysctl) the size and
+ * number of each object. Memory is allocated at the first use of a
+ * netmap file descriptor, and can be freed when all such descriptors
+ * have been released (including unmapping the memory).
+ * If memory is scarce, the system tries to get as much as possible
+ * and the sysctl values reflect the actual allocation.
+ * Together with desired values, the sysctl export also absolute
+ * min and maximum values that cannot be overridden.
+ *
+ * struct netmap_if:
+ *	variable size, max 16 bytes per ring pair plus some fixed amount.
+ *	1024 bytes should be large enough in practice.
+ *
+ *	In the worst case we have one netmap_if per ring in the system.
+ *
+ * struct netmap_ring
+ *	variable size, 8 byte per slot plus some fixed amount.
+ *	Rings can be large (e.g. 4k slots, or >32Kbytes).
+ *	We default to 36 KB (9 pages), and a few hundred rings.
+ *
+ * struct netmap_buffer
+ *	The more the better, both because fast interfaces tend to have
+ *	many slots, and because we may want to use buffers to store
+ *	packets in userspace avoiding copies.
+ *	Must contain a full frame (eg 1518, or more for vlans, jumbo
+ *	frames etc.) plus be nicely aligned, plus some NICs restrict
+ *	the size to multiple of 1K or so. Default to 2K
+ */
+#ifndef _NET_NETMAP_MEM2_H_
+#define _NET_NETMAP_MEM2_H_
+
+
+#define NETMAP_BUF_MAX_NUM	20*4096*2	/* large machine */
+
+#define NETMAP_POOL_MAX_NAMSZ	32
+
+
+enum {
+	NETMAP_IF_POOL   = 0,
+	NETMAP_RING_POOL,
+	NETMAP_BUF_POOL,
+	NETMAP_POOLS_NR
+};
+
+
+struct netmap_obj_params {
+	u_int size;
+	u_int num;
+};
+struct netmap_obj_pool {
+	char name[NETMAP_POOL_MAX_NAMSZ];	/* name of the allocator */
+
+	/* ---------------------------------------------------*/
+	/* these are only meaningful if the pool is finalized */
+	/* (see 'finalized' field in netmap_mem_d)            */
+	u_int objtotal;         /* actual total number of objects. */
+	u_int memtotal;		/* actual total memory space */
+	u_int numclusters;	/* actual number of clusters */
+
+	u_int objfree;          /* number of free objects. */
+
+	struct lut_entry *lut;  /* virt,phys addresses, objtotal entries */
+	uint32_t *bitmap;       /* one bit per buffer, 1 means free */
+	uint32_t bitmap_slots;	/* number of uint32 entries in bitmap */
+	/* ---------------------------------------------------*/
+
+	/* limits */
+	u_int objminsize;	/* minimum object size */
+	u_int objmaxsize;	/* maximum object size */
+	u_int nummin;		/* minimum number of objects */
+	u_int nummax;		/* maximum number of objects */
+
+	/* these are changed only by config */
+	u_int _objtotal;	/* total number of objects */
+	u_int _objsize;		/* object size */
+	u_int _clustsize;       /* cluster size */
+	u_int _clustentries;    /* objects per cluster */
+	u_int _numclusters;	/* number of clusters */
+
+	/* requested values */
+	u_int r_objtotal;
+	u_int r_objsize;
+};
+
+#ifdef linux
+// XXX a mtx would suffice here 20130415 lr
+#define NMA_LOCK_T		struct semaphore
+#else /* !linux */
+#define NMA_LOCK_T		struct mtx
+#endif /* linux */
+
+typedef int (*netmap_mem_config_t)(struct netmap_mem_d*);
+typedef int (*netmap_mem_finalize_t)(struct netmap_mem_d*);
+typedef void (*netmap_mem_deref_t)(struct netmap_mem_d*);
+
+
+/* We implement two kinds of netmap_mem_d structures:
+ *
+ * - global: used by hardware NICS;
+ *
+ * - private: used by VALE ports.
+ *
+ * In both cases, the netmap_mem_d structure has the same lifetime as the
+ * netmap_adapter of the corresponding NIC or port. It is the responsibility of
+ * the client code to delete the private allocator when the associated
+ * netmap_adapter is freed (this is implemented by the NAF_MEM_OWNER flag in
+ * netmap.c).  The 'refcount' field counts the number of active users of the
+ * structure. The global allocator uses this information to prevent/allow
+ * reconfiguration. The private allocators release all their memory when there
+ * are no active users.  By 'active user' we mean an existing netmap_priv
+ * structure holding a reference to the allocator.
+ */
+struct netmap_mem_d {
+	NMA_LOCK_T nm_mtx;  /* protect the allocator */
+	u_int nm_totalsize; /* shorthand */
+
+	u_int flags;
+#define NETMAP_MEM_FINALIZED	0x1	/* preallocation done */
+#define NETMAP_MEM_PRIVATE	0x2	/* uses private address space */
+	int lasterr;		/* last error for curr config */
+	int refcount;		/* existing priv structures */
+	/* the three allocators */
+	struct netmap_obj_pool pools[NETMAP_POOLS_NR];
+
+	netmap_mem_config_t   config;	
+	netmap_mem_finalize_t finalize;
+	netmap_mem_deref_t    deref;
+};
+
+extern struct netmap_mem_d nm_mem;
+
+vm_paddr_t netmap_mem_ofstophys(struct netmap_mem_d *, vm_ooffset_t);
+int	   netmap_mem_finalize(struct netmap_mem_d *);
+int 	   netmap_mem_init(void);
+void 	   netmap_mem_fini(void);
+struct netmap_if *   netmap_mem_if_new(const char *, struct netmap_adapter *);
+void 	   netmap_mem_if_delete(struct netmap_adapter *na, struct netmap_if *nifp);
+void 	   netmap_mem_deref(struct netmap_mem_d *);
+int	   netmap_mem_get_info(struct netmap_mem_d *nm_mem, u_int *size, u_int *memflags);
+ssize_t    netmap_mem_if_offset(struct netmap_mem_d *nm_mem, const void *vaddr);
+struct netmap_mem_d*
+	   netmap_mem_private_new(const char *name, u_int txr, u_int txd, u_int rxr, u_int rxd);
+void	   netmap_mem_private_delete(struct netmap_mem_d *nm_mem);
+
+#define NETMAP_BDG_BUF_SIZE(n)	((n)->pools[NETMAP_BUF_POOL]._objsize)
+
+
+
+#endif
diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c
index 6c87a2a61be..e91f50ad2c5 100644
--- a/sys/dev/nfe/if_nfe.c
+++ b/sys/dev/nfe/if_nfe.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 6f680c38ea2..d95feb32a13 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -109,6 +109,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/nvd/nvd.c b/sys/dev/nvd/nvd.c
index b2e880b5c5c..b48fb3586a4 100644
--- a/sys/dev/nvd/nvd.c
+++ b/sys/dev/nvd/nvd.c
@@ -187,17 +187,6 @@ nvd_done(void *arg, const struct nvme_completion *cpl)
 
 	atomic_add_int(&ndisk->cur_depth, -1);
 
-	/*
-	 * TODO: add more extensive translation of NVMe status codes
-	 *  to different bio error codes (i.e. EIO, EINVAL, etc.)
-	 */
-	if (nvme_completion_is_error(cpl)) {
-		bp->bio_error = EIO;
-		bp->bio_flags |= BIO_ERROR;
-		bp->bio_resid = bp->bio_bcount;
-	} else
-		bp->bio_resid = 0;
-
 	biodone(bp);
 }
 
diff --git a/sys/dev/nve/if_nve.c b/sys/dev/nve/if_nve.c
index 839cfb6ad74..10147fcb8f7 100644
--- a/sys/dev/nve/if_nve.c
+++ b/sys/dev/nve/if_nve.c
@@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/nvme/nvme.c b/sys/dev/nvme/nvme.c
index ec8d592349c..81c90871bc8 100644
--- a/sys/dev/nvme/nvme.c
+++ b/sys/dev/nvme/nvme.c
@@ -221,8 +221,10 @@ nvme_attach(device_t dev)
 
 	status = nvme_ctrlr_construct(ctrlr, dev);
 
-	if (status != 0)
+	if (status != 0) {
+		nvme_ctrlr_destruct(ctrlr, dev);
 		return (status);
+	}
 
 	/*
 	 * Reset controller twice to ensure we do a transition from cc.en==1
@@ -230,12 +232,16 @@ nvme_attach(device_t dev)
 	 *  the controller was left in when boot handed off to OS.
 	 */
 	status = nvme_ctrlr_hw_reset(ctrlr);
-	if (status != 0)
+	if (status != 0) {
+		nvme_ctrlr_destruct(ctrlr, dev);
 		return (status);
+	}
 
 	status = nvme_ctrlr_hw_reset(ctrlr);
-	if (status != 0)
+	if (status != 0) {
+		nvme_ctrlr_destruct(ctrlr, dev);
 		return (status);
+	}
 
 	nvme_sysctl_initialize_ctrlr(ctrlr);
 
diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
index f904933a20a..111a9320c20 100644
--- a/sys/dev/nvme/nvme.h
+++ b/sys/dev/nvme/nvme.h
@@ -535,7 +535,7 @@ struct nvme_controller_data {
 	uint8_t			reserved6[1024];
 
 	/* bytes 3072-4095: vendor specific */
-	uint8_t			reserved7[1024];
+	uint8_t			vs[1024];
 } __packed __aligned(4);
 
 struct nvme_namespace_data {
@@ -720,7 +720,7 @@ struct nvme_io_test {
 	uint32_t		time;	/* in seconds */
 	uint32_t		num_threads;
 	uint32_t		flags;
-	uint32_t		io_completed[NVME_TEST_MAX_THREADS];
+	uint64_t		io_completed[NVME_TEST_MAX_THREADS];
 };
 
 enum nvme_io_test_flags {
diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
index 48457820540..de037b7a3f8 100644
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -616,10 +616,36 @@ nvme_ctrlr_get_log_page_size(struct nvme_controller *ctrlr, uint8_t page_id)
 	return (log_page_size);
 }
 
+static void
+nvme_ctrlr_log_critical_warnings(struct nvme_controller *ctrlr,
+    union nvme_critical_warning_state state)
+{
+
+	if (state.bits.available_spare == 1)
+		nvme_printf(ctrlr, "available spare space below threshold\n");
+
+	if (state.bits.temperature == 1)
+		nvme_printf(ctrlr, "temperature above threshold\n");
+
+	if (state.bits.device_reliability == 1)
+		nvme_printf(ctrlr, "device reliability degraded\n");
+
+	if (state.bits.read_only == 1)
+		nvme_printf(ctrlr, "media placed in read only mode\n");
+
+	if (state.bits.volatile_memory_backup == 1)
+		nvme_printf(ctrlr, "volatile memory backup device failed\n");
+
+	if (state.bits.reserved != 0)
+		nvme_printf(ctrlr,
+		    "unknown critical warning(s): state = 0x%02x\n", state.raw);
+}
+
 static void
 nvme_ctrlr_async_event_log_page_cb(void *arg, const struct nvme_completion *cpl)
 {
-	struct nvme_async_event_request	*aer = arg;
+	struct nvme_async_event_request		*aer = arg;
+	struct nvme_health_information_page	*health_info;
 
 	/*
 	 * If the log page fetch for some reason completed with an error,
@@ -629,13 +655,33 @@ nvme_ctrlr_async_event_log_page_cb(void *arg, const struct nvme_completion *cpl)
 	if (nvme_completion_is_error(cpl))
 		nvme_notify_async_consumers(aer->ctrlr, &aer->cpl,
 		    aer->log_page_id, NULL, 0);
-	else
+	else {
+		if (aer->log_page_id == NVME_LOG_HEALTH_INFORMATION) {
+			health_info = (struct nvme_health_information_page *)
+			    aer->log_page_buffer;
+			nvme_ctrlr_log_critical_warnings(aer->ctrlr,
+			    health_info->critical_warning);
+			/*
+			 * Critical warnings reported through the
+			 *  SMART/health log page are persistent, so
+			 *  clear the associated bits in the async event
+			 *  config so that we do not receive repeated
+			 *  notifications for the same event.
+			 */
+			aer->ctrlr->async_event_config.raw &=
+			    ~health_info->critical_warning.raw;
+			nvme_ctrlr_cmd_set_async_event_config(aer->ctrlr,
+			    aer->ctrlr->async_event_config, NULL, NULL);
+		}
+
+
 		/*
 		 * Pass the cpl data from the original async event completion,
 		 *  not the log page fetch.
 		 */
 		nvme_notify_async_consumers(aer->ctrlr, &aer->cpl,
 		    aer->log_page_id, aer->log_page_buffer, aer->log_page_size);
+	}
 
 	/*
 	 * Repost another asynchronous event request to replace the one
@@ -708,13 +754,27 @@ nvme_ctrlr_construct_and_submit_aer(struct nvme_controller *ctrlr,
 static void
 nvme_ctrlr_configure_aer(struct nvme_controller *ctrlr)
 {
-	union nvme_critical_warning_state	state;
+	struct nvme_completion_poll_status	status;
 	struct nvme_async_event_request		*aer;
 	uint32_t				i;
 
-	state.raw = 0xFF;
-	state.bits.reserved = 0;
-	nvme_ctrlr_cmd_set_async_event_config(ctrlr, state, NULL, NULL);
+	ctrlr->async_event_config.raw = 0xFF;
+	ctrlr->async_event_config.bits.reserved = 0;
+
+	status.done = FALSE;
+	nvme_ctrlr_cmd_get_feature(ctrlr, NVME_FEAT_TEMPERATURE_THRESHOLD,
+	    0, NULL, 0, nvme_completion_poll_cb, &status);
+	while (status.done == FALSE)
+		pause("nvme", 1);
+	if (nvme_completion_is_error(&status.cpl) ||
+	    (status.cpl.cdw0 & 0xFFFF) == 0xFFFF ||
+	    (status.cpl.cdw0 & 0xFFFF) == 0x0000) {
+		nvme_printf(ctrlr, "temperature threshold not supported\n");
+		ctrlr->async_event_config.bits.temperature = 0;
+	}
+
+	nvme_ctrlr_cmd_set_async_event_config(ctrlr,
+	    ctrlr->async_event_config, NULL, NULL);
 
 	/* aerl is a zero-based value, so we need to add 1 here. */
 	ctrlr->num_aers = min(NVME_MAX_ASYNC_EVENTS, (ctrlr->cdata.aerl+1));
@@ -1090,8 +1150,8 @@ intx:
 	if (status != 0)
 		return (status);
 
-	ctrlr->cdev = make_dev(&nvme_ctrlr_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
-	    "nvme%d", device_get_unit(dev));
+	ctrlr->cdev = make_dev(&nvme_ctrlr_cdevsw, device_get_unit(dev),
+	    UID_ROOT, GID_WHEEL, 0600, "nvme%d", device_get_unit(dev));
 
 	if (ctrlr->cdev == NULL)
 		return (ENXIO);
diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c
index 5fa3ba0b1cc..ed2214d68a0 100644
--- a/sys/dev/nvme/nvme_ns.c
+++ b/sys/dev/nvme/nvme_ns.c
@@ -34,13 +34,32 @@ __FBSDID("$FreeBSD$");
 #include <sys/disk.h>
 #include <sys/fcntl.h>
 #include <sys/ioccom.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/proc.h>
+#include <sys/systm.h>
 
 #include <dev/pci/pcivar.h>
 
+#include <geom/geom.h>
+
 #include "nvme_private.h"
 
+static void		nvme_bio_child_inbed(struct bio *parent, int bio_error);
+static void		nvme_bio_child_done(void *arg,
+					    const struct nvme_completion *cpl);
+static uint32_t		nvme_get_num_segments(uint64_t addr, uint64_t size,
+					      uint32_t alignment);
+static void		nvme_free_child_bios(int num_bios,
+					     struct bio **child_bios);
+static struct bio **	nvme_allocate_child_bios(int num_bios);
+static struct bio **	nvme_construct_child_bios(struct bio *bp,
+						  uint32_t alignment,
+						  int *num_bios);
+static int		nvme_ns_split_bio(struct nvme_namespace *ns,
+					  struct bio *bp,
+					  uint32_t alignment);
+
 static int
 nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag,
     struct thread *td)
@@ -202,18 +221,218 @@ nvme_ns_bio_done(void *arg, const struct nvme_completion *status)
 	if (bp->bio_driver2)
 		free(bp->bio_driver2, M_NVME);
 
+	if (nvme_completion_is_error(status)) {
+		bp->bio_flags |= BIO_ERROR;
+		if (bp->bio_error == 0)
+			bp->bio_error = EIO;
+	}
+
+	if ((bp->bio_flags & BIO_ERROR) == 0)
+		bp->bio_resid = 0;
+	else
+		bp->bio_resid = bp->bio_bcount;
+
 	bp_cb_fn(bp, status);
 }
 
+static void
+nvme_bio_child_inbed(struct bio *parent, int bio_error)
+{
+	struct nvme_completion	parent_cpl;
+	int			inbed;
+
+	if (bio_error != 0) {
+		parent->bio_flags |= BIO_ERROR;
+		parent->bio_error = bio_error;
+	}
+
+	/*
+	 * atomic_fetchadd will return value before adding 1, so we still
+	 *  must add 1 to get the updated inbed number.
+	 */
+	inbed = atomic_fetchadd_int(&parent->bio_inbed, 1) + 1;
+	if (inbed == parent->bio_children) {
+		bzero(&parent_cpl, sizeof(parent_cpl));
+		if (parent->bio_flags & BIO_ERROR)
+			parent_cpl.status.sc = NVME_SC_DATA_TRANSFER_ERROR;
+		nvme_ns_bio_done(parent, &parent_cpl);
+	}
+}
+
+static void
+nvme_bio_child_done(void *arg, const struct nvme_completion *cpl)
+{
+	struct bio		*child = arg;
+	struct bio		*parent;
+	int			bio_error;
+
+	parent = child->bio_parent;
+	g_destroy_bio(child);
+	bio_error = nvme_completion_is_error(cpl) ? EIO : 0;
+	nvme_bio_child_inbed(parent, bio_error);
+}
+
+static uint32_t
+nvme_get_num_segments(uint64_t addr, uint64_t size, uint32_t align)
+{
+	uint32_t	num_segs, offset, remainder;
+
+	if (align == 0)
+		return (1);
+
+	KASSERT((align & (align - 1)) == 0, ("alignment not power of 2\n"));
+
+	num_segs = size / align;
+	remainder = size & (align - 1);
+	offset = addr & (align - 1);
+	if (remainder > 0 || offset > 0)
+		num_segs += 1 + (remainder + offset - 1) / align;
+	return (num_segs);
+}
+
+static void
+nvme_free_child_bios(int num_bios, struct bio **child_bios)
+{
+	int i;
+
+	for (i = 0; i < num_bios; i++) {
+		if (child_bios[i] != NULL)
+			g_destroy_bio(child_bios[i]);
+	}
+
+	free(child_bios, M_NVME);
+}
+
+static struct bio **
+nvme_allocate_child_bios(int num_bios)
+{
+	struct bio **child_bios;
+	int err = 0, i;
+
+	child_bios = malloc(num_bios * sizeof(struct bio *), M_NVME, M_NOWAIT);
+	if (child_bios == NULL)
+		return (NULL);
+
+	for (i = 0; i < num_bios; i++) {
+		child_bios[i] = g_new_bio();
+		if (child_bios[i] == NULL)
+			err = ENOMEM;
+	}
+
+	if (err == ENOMEM) {
+		nvme_free_child_bios(num_bios, child_bios);
+		return (NULL);
+	}
+
+	return (child_bios);
+}
+
+static struct bio **
+nvme_construct_child_bios(struct bio *bp, uint32_t alignment, int *num_bios)
+{
+	struct bio	**child_bios;
+	struct bio	*child;
+	uint64_t	cur_offset;
+	caddr_t		data;
+	uint32_t	rem_bcount;
+	int		i;
+#ifdef NVME_UNMAPPED_BIO_SUPPORT
+	struct vm_page	**ma;
+	uint32_t	ma_offset;
+#endif
+
+	*num_bios = nvme_get_num_segments(bp->bio_offset, bp->bio_bcount,
+	    alignment);
+	child_bios = nvme_allocate_child_bios(*num_bios);
+	if (child_bios == NULL)
+		return (NULL);
+
+	bp->bio_children = *num_bios;
+	bp->bio_inbed = 0;
+	cur_offset = bp->bio_offset;
+	rem_bcount = bp->bio_bcount;
+	data = bp->bio_data;
+#ifdef NVME_UNMAPPED_BIO_SUPPORT
+	ma_offset = bp->bio_ma_offset;
+	ma = bp->bio_ma;
+#endif
+
+	for (i = 0; i < *num_bios; i++) {
+		child = child_bios[i];
+		child->bio_parent = bp;
+		child->bio_cmd = bp->bio_cmd;
+		child->bio_offset = cur_offset;
+		child->bio_bcount = min(rem_bcount,
+		    alignment - (cur_offset & (alignment - 1)));
+		child->bio_flags = bp->bio_flags;
+#ifdef NVME_UNMAPPED_BIO_SUPPORT
+		if (bp->bio_flags & BIO_UNMAPPED) {
+			child->bio_ma_offset = ma_offset;
+			child->bio_ma = ma;
+			child->bio_ma_n =
+			    nvme_get_num_segments(child->bio_ma_offset,
+				child->bio_bcount, PAGE_SIZE);
+			ma_offset = (ma_offset + child->bio_bcount) &
+			    PAGE_MASK;
+			ma += child->bio_ma_n;
+			if (ma_offset != 0)
+				ma -= 1;
+		} else
+#endif
+		{
+			child->bio_data = data;
+			data += child->bio_bcount;
+		}
+		cur_offset += child->bio_bcount;
+		rem_bcount -= child->bio_bcount;
+	}
+
+	return (child_bios);
+}
+
+static int
+nvme_ns_split_bio(struct nvme_namespace *ns, struct bio *bp,
+    uint32_t alignment)
+{
+	struct bio	*child;
+	struct bio	**child_bios;
+	int		err, i, num_bios;
+
+	child_bios = nvme_construct_child_bios(bp, alignment, &num_bios);
+	if (child_bios == NULL)
+		return (ENOMEM);
+
+	for (i = 0; i < num_bios; i++) {
+		child = child_bios[i];
+		err = nvme_ns_bio_process(ns, child, nvme_bio_child_done);
+		if (err != 0) {
+			nvme_bio_child_inbed(bp, err);
+			g_destroy_bio(child);
+		}
+	}
+
+	free(child_bios, M_NVME);
+	return (0);
+}
+
 int
 nvme_ns_bio_process(struct nvme_namespace *ns, struct bio *bp,
 	nvme_cb_fn_t cb_fn)
 {
 	struct nvme_dsm_range	*dsm_range;
+	uint32_t		num_bios;
 	int			err;
 
 	bp->bio_driver1 = cb_fn;
 
+	if (ns->stripesize > 0 &&
+	    (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE)) {
+		num_bios = nvme_get_num_segments(bp->bio_offset,
+		    bp->bio_bcount, ns->stripesize);
+		if (num_bios > 1)
+			return (nvme_ns_split_bio(ns, bp, ns->stripesize));
+	}
+
 	switch (bp->bio_cmd) {
 	case BIO_READ:
 		err = nvme_ns_cmd_read_bio(ns, bp, nvme_ns_bio_done, bp);
@@ -273,9 +492,15 @@ nvme_ns_construct(struct nvme_namespace *ns, uint16_t id,
     struct nvme_controller *ctrlr)
 {
 	struct nvme_completion_poll_status	status;
+	int					unit;
 
 	ns->ctrlr = ctrlr;
 	ns->id = id;
+	ns->stripesize = 0;
+
+	if (pci_get_devid(ctrlr->dev) == 0x09538086 && ctrlr->cdata.vs[3] != 0)
+		ns->stripesize =
+		    (1 << ctrlr->cdata.vs[3]) * ctrlr->min_page_size;
 
 	/*
 	 * Namespaces are reconstructed after a controller reset, so check
@@ -329,6 +554,12 @@ nvme_ns_construct(struct nvme_namespace *ns, uint16_t id,
 	if (ns->cdev != NULL)
 		return (0);
 
+	/*
+	 * Namespace IDs start at 1, so we need to subtract 1 to create a
+	 *  correct unit number.
+	 */
+	unit = device_get_unit(ctrlr->dev) * NVME_MAX_NAMESPACES + ns->id - 1;
+
 /*
  * MAKEDEV_ETERNAL was added in r210923, for cdevs that will never
  *  be destroyed.  This avoids refcounting on the cdev object.
@@ -336,11 +567,11 @@ nvme_ns_construct(struct nvme_namespace *ns, uint16_t id,
  *  surprise removal nor namespace deletion.
  */
 #ifdef MAKEDEV_ETERNAL_KLD
-	ns->cdev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &nvme_ns_cdevsw, 0,
+	ns->cdev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &nvme_ns_cdevsw, unit,
 	    NULL, UID_ROOT, GID_WHEEL, 0600, "nvme%dns%d",
 	    device_get_unit(ctrlr->dev), ns->id);
 #else
-	ns->cdev = make_dev_credf(0, &nvme_ns_cdevsw, 0,
+	ns->cdev = make_dev_credf(0, &nvme_ns_cdevsw, unit,
 	    NULL, UID_ROOT, GID_WHEEL, 0600, "nvme%dns%d",
 	    device_get_unit(ctrlr->dev), ns->id);
 #endif
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
index f0f44537976..f6bd041e4c6 100644
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -238,6 +238,7 @@ struct nvme_namespace {
 	uint16_t			flags;
 	struct cdev			*cdev;
 	void				*cons_cookie[NVME_MAX_CONSUMERS];
+	uint32_t			stripesize;
 	struct mtx			lock;
 };
 
@@ -321,6 +322,9 @@ struct nvme_controller {
 
 	struct cdev			*cdev;
 
+	/** bit mask of warning types currently enabled for async events */
+	union nvme_critical_warning_state	async_event_config;
+
 	uint32_t			num_aers;
 	struct nvme_async_event_request	aer[NVME_MAX_ASYNC_EVENTS];
 
diff --git a/sys/dev/nvme/nvme_test.c b/sys/dev/nvme/nvme_test.c
index 89bcc00c059..24f65cce9b9 100644
--- a/sys/dev/nvme/nvme_test.c
+++ b/sys/dev/nvme/nvme_test.c
@@ -53,7 +53,7 @@ struct nvme_io_test_thread {
 	void			*buf;
 	uint32_t		size;
 	uint32_t		time;
-	uint32_t		io_completed;
+	uint64_t		io_completed;
 };
 
 struct nvme_io_test_internal {
@@ -66,7 +66,7 @@ struct nvme_io_test_internal {
 	uint32_t		td_active;
 	uint32_t		td_idx;
 	uint32_t		flags;
-	uint32_t		io_completed[NVME_TEST_MAX_THREADS];
+	uint64_t		io_completed[NVME_TEST_MAX_THREADS];
 };
 
 static void
@@ -90,8 +90,8 @@ nvme_ns_bio_test(void *arg)
 	struct cdev			*dev;
 	void				*buf;
 	struct timeval			t;
-	uint64_t			offset;
-	uint32_t			idx, io_completed = 0;
+	uint64_t			io_completed = 0, offset;
+	uint32_t			idx;
 #if __FreeBSD_version >= 900017
 	int				ref;
 #endif
diff --git a/sys/dev/nxge/if_nxge.c b/sys/dev/nxge/if_nxge.c
index df1b9ec1260..9fa2cfe22b5 100644
--- a/sys/dev/nxge/if_nxge.c
+++ b/sys/dev/nxge/if_nxge.c
@@ -31,6 +31,7 @@
 #include <net/if_arp.h>
 #include <sys/types.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_vlan_var.h>
 
 int       copyright_print       = 0;
diff --git a/sys/dev/oce/oce_hw.c b/sys/dev/oce/oce_hw.c
index 1cacb8c1c8a..7fc16b8383f 100644
--- a/sys/dev/oce/oce_hw.c
+++ b/sys/dev/oce/oce_hw.c
@@ -38,6 +38,7 @@
 
 /* $FreeBSD$ */
 
+
 #include "oce_if.h"
 
 static int oce_POST(POCE_SOFTC sc);
@@ -203,12 +204,16 @@ void oce_get_pci_capabilities(POCE_SOFTC sc)
 {
 	uint32_t val;
 
-	if (pci_find_cap(sc->dev, PCIY_PCIX, &val) == 0) {
+#if __FreeBSD_version >= 1000000
+	#define pci_find_extcap pci_find_cap
+#endif
+
+	if (pci_find_extcap(sc->dev, PCIY_PCIX, &val) == 0) {
 		if (val != 0) 
 			sc->flags |= OCE_FLAGS_PCIX;
 	}
 
-	if (pci_find_cap(sc->dev, PCIY_EXPRESS, &val) == 0) {
+	if (pci_find_extcap(sc->dev, PCIY_EXPRESS, &val) == 0) {
 		if (val != 0) {
 			uint16_t link_status =
 			    pci_read_config(sc->dev, val + 0x12, 2);
@@ -219,12 +224,12 @@ void oce_get_pci_capabilities(POCE_SOFTC sc)
 		}
 	}
 
-	if (pci_find_cap(sc->dev, PCIY_MSI, &val) == 0) {
+	if (pci_find_extcap(sc->dev, PCIY_MSI, &val) == 0) {
 		if (val != 0)
 			sc->flags |= OCE_FLAGS_MSI_CAPABLE;
 	}
 
-	if (pci_find_cap(sc->dev, PCIY_MSIX, &val) == 0) {
+	if (pci_find_extcap(sc->dev, PCIY_MSIX, &val) == 0) {
 		if (val != 0) {
 			val = pci_msix_count(sc->dev);
 			sc->flags |= OCE_FLAGS_MSIX_CAPABLE;
@@ -386,6 +391,9 @@ oce_create_nw_interface(POCE_SOFTC sc)
 		capab_flags &= ~MBX_RX_IFACE_FLAGS_PASS_L3L4_ERR;
 	}
 
+	if (IS_SH(sc) || IS_XE201(sc))
+		capab_flags |= MBX_RX_IFACE_FLAGS_MULTICAST;
+
 	/* enable capabilities controlled via driver startup parameters */
 	if (is_rss_enabled(sc))
 		capab_en_flags |= MBX_RX_IFACE_FLAGS_RSS;
diff --git a/sys/dev/oce/oce_hw.h b/sys/dev/oce/oce_hw.h
index 66250c8a7ae..9f1a92a37e9 100644
--- a/sys/dev/oce/oce_hw.h
+++ b/sys/dev/oce/oce_hw.h
@@ -59,6 +59,30 @@
 #define	INTR_EN				0x20000000
 #define	IMAGE_TRANSFER_SIZE		(32 * 1024)	/* 32K at a time */
 
+
+/********* UE Status and Mask Registers ***/
+#define PCICFG_UE_STATUS_LOW                    0xA0
+#define PCICFG_UE_STATUS_HIGH                   0xA4
+#define PCICFG_UE_STATUS_LOW_MASK               0xA8
+
+/* Lancer SLIPORT registers */
+#define SLIPORT_STATUS_OFFSET           0x404
+#define SLIPORT_CONTROL_OFFSET          0x408
+#define SLIPORT_ERROR1_OFFSET           0x40C
+#define SLIPORT_ERROR2_OFFSET           0x410
+#define PHYSDEV_CONTROL_OFFSET          0x414
+
+#define SLIPORT_STATUS_ERR_MASK         0x80000000
+#define SLIPORT_STATUS_DIP_MASK         0x02000000
+#define SLIPORT_STATUS_RN_MASK          0x01000000
+#define SLIPORT_STATUS_RDY_MASK         0x00800000
+#define SLI_PORT_CONTROL_IP_MASK        0x08000000
+#define PHYSDEV_CONTROL_FW_RESET_MASK   0x00000002
+#define PHYSDEV_CONTROL_DD_MASK         0x00000004
+#define PHYSDEV_CONTROL_INP_MASK        0x40000000
+
+#define SLIPORT_ERROR_NO_RESOURCE1      0x2
+#define SLIPORT_ERROR_NO_RESOURCE2      0x9
 /* CSR register offsets */
 #define	MPU_EP_CONTROL			0
 #define	MPU_EP_SEMAPHORE_BE3		0xac
@@ -1553,7 +1577,8 @@ struct mbx_common_read_write_flashrom {
 	uint32_t flash_op_type;
 	uint32_t data_buffer_size;
 	uint32_t data_offset;
-	uint8_t  data_buffer[4];	/* + IMAGE_TRANSFER_SIZE */
+	uint8_t  data_buffer[32768];	/* + IMAGE_TRANSFER_SIZE */
+	uint8_t  rsvd[4];
 };
 
 struct oce_phy_info {
@@ -2079,7 +2104,8 @@ struct flash_file_hdr {
 	uint32_t antidote;
 	uint32_t num_imgs;
 	uint8_t  build[24];
-	uint8_t  rsvd[32];
+	uint8_t  asic_type_rev;
+	uint8_t  rsvd[31];
 };
 
 struct image_hdr {
@@ -3681,4 +3707,3 @@ enum OCE_QUEUE_RX_STATS {
 	QUEUE_RX_BUFFER_ERRORS = 8,
 	QUEUE_RX_N_WORDS = 10
 };
-
diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
index 166828b1ed7..f637f2a181b 100644
--- a/sys/dev/oce/oce_if.c
+++ b/sys/dev/oce/oce_if.c
@@ -36,7 +36,6 @@
  * Costa Mesa, CA 92626
  */
 
-
 /* $FreeBSD$ */
 
 #include "opt_inet6.h"
@@ -44,6 +43,78 @@
 
 #include "oce_if.h"
 
+/* UE Status Low CSR */
+static char *ue_status_low_desc[] = {
+	"CEV",
+	"CTX",
+	"DBUF",
+	"ERX",
+	"Host",
+	"MPU",
+	"NDMA",
+	"PTC ",
+	"RDMA ",
+	"RXF ",
+	"RXIPS ",
+	"RXULP0 ",
+	"RXULP1 ",
+	"RXULP2 ",
+	"TIM ",
+	"TPOST ",
+	"TPRE ",
+	"TXIPS ",
+	"TXULP0 ",
+	"TXULP1 ",
+	"UC ",
+	"WDMA ",
+	"TXULP2 ",
+	"HOST1 ",
+	"P0_OB_LINK ",
+	"P1_OB_LINK ",
+	"HOST_GPIO ",
+	"MBOX ",
+	"AXGMAC0",
+	"AXGMAC1",
+	"JTAG",
+	"MPU_INTPEND"
+};
+
+/* UE Status High CSR */
+static char *ue_status_hi_desc[] = {
+	"LPCMEMHOST",
+	"MGMT_MAC",
+	"PCS0ONLINE",
+	"MPU_IRAM",
+	"PCS1ONLINE",
+	"PCTL0",
+	"PCTL1",
+	"PMEM",
+	"RR",
+	"TXPB",
+	"RXPP",
+	"XAUI",
+	"TXP",
+	"ARM",
+	"IPC",
+	"HOST2",
+	"HOST3",
+	"HOST4",
+	"HOST5",
+	"HOST6",
+	"HOST7",
+	"HOST8",
+	"HOST9",
+	"NETC",
+	"Unknown",
+	"Unknown",
+	"Unknown",
+	"Unknown",
+	"Unknown",
+	"Unknown",
+	"Unknown",
+	"Unknown"
+};
+
 
 /* Driver entry points prototypes */
 static int  oce_probe(device_t dev);
@@ -388,11 +459,11 @@ oce_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		}
 
 		if ((ifp->if_flags & IFF_PROMISC) && !sc->promisc) {
-			sc->promisc = TRUE;
-			oce_rxf_set_promiscuous(sc, sc->promisc);
+			if (!oce_rxf_set_promiscuous(sc, (1 | (1 << 1))))
+				sc->promisc = TRUE;
 		} else if (!(ifp->if_flags & IFF_PROMISC) && sc->promisc) {
-			sc->promisc = FALSE;
-			oce_rxf_set_promiscuous(sc, sc->promisc);
+			if (!oce_rxf_set_promiscuous(sc, 0))
+				sc->promisc = FALSE;
 		}
 
 		break;
@@ -758,6 +829,10 @@ oce_media_status(struct ifnet *ifp, struct ifmediareq *req)
 		req->ifm_active |= IFM_10G_SR | IFM_FDX;
 		sc->speed = 10000;
 		break;
+	case 7: /* 40 Gbps */
+		req->ifm_active |= IFM_40G_SR4 | IFM_FDX;
+		sc->speed = 40000;
+		break;
 	}
 	
 	return;
@@ -862,10 +937,12 @@ retry:
 			(m->m_pkthdr.csum_flags & CSUM_TCP) ? 1 : 0;
 		nichdr->u0.s.num_wqe = num_wqes;
 		nichdr->u0.s.total_length = m->m_pkthdr.len;
+
 		if (m->m_flags & M_VLANTAG) {
 			nichdr->u0.s.vlan = 1; /*Vlan present*/
 			nichdr->u0.s.vlan_tag = m->m_pkthdr.ether_vtag;
 		}
+
 		if (m->m_pkthdr.csum_flags & CSUM_TSO) {
 			if (m->m_pkthdr.tso_segsz) {
 				nichdr->u0.s.lso = 1;
@@ -1156,6 +1233,18 @@ oce_wq_handler(void *arg)
 }
 
 
+#if __FreeBSD_version >= 1000000
+static __inline void
+drbr_stats_update(struct ifnet *ifp, int len, int mflags)
+{
+#ifndef NO_SLOW_STATS
+	ifp->if_obytes += len;
+	if (mflags & M_MCAST)
+		ifp->if_omcasts++;
+#endif
+}
+#endif
+
 static int 
 oce_multiq_transmit(struct ifnet *ifp, struct mbuf *m, struct oce_wq *wq)
 {
@@ -1174,7 +1263,7 @@ oce_multiq_transmit(struct ifnet *ifp, struct mbuf *m, struct oce_wq *wq)
 		return status;
 	}
 
-	 if (m != NULL) {
+	if (m != NULL) {
 		if ((status = drbr_enqueue(ifp, br, m)) != 0)
 			return status;
 	} 
@@ -1646,6 +1735,10 @@ oce_attach_ifp(POCE_SOFTC sc)
 	sc->ifp->if_capenable = sc->ifp->if_capabilities;
 	if_initbaudrate(sc->ifp, IF_Gbps(10));
 
+#if __FreeBSD_version >= 1000000
+	sc->ifp->if_hw_tsomax = OCE_MAX_TSO_SIZE;
+#endif
+
 	ether_ifattach(sc->ifp, sc->macaddr.mac_addr);
 	
 	return 0;
@@ -1664,7 +1757,8 @@ oce_add_vlan(void *arg, struct ifnet *ifp, uint16_t vtag)
 
 	sc->vlan_tag[vtag] = 1;
 	sc->vlans_added++;
-	oce_vid_config(sc);
+	if (sc->vlans_added <= (sc->max_vlans + 1))
+		oce_vid_config(sc);
 }
 
 
@@ -1863,15 +1957,78 @@ done:
 	/* Is there atleast one eq that needs to be modified? */
 	if(num)
 		oce_mbox_eqd_modify_periodic(sc, set_eqd, num);
+}
+
+static void oce_detect_hw_error(POCE_SOFTC sc)
+{
+
+	uint32_t ue_low = 0, ue_high = 0, ue_low_mask = 0, ue_high_mask = 0;
+	uint32_t sliport_status = 0, sliport_err1 = 0, sliport_err2 = 0;
+	uint32_t i;
+
+	if (sc->hw_error)
+		return;
+
+	if (IS_XE201(sc)) {
+		sliport_status = OCE_READ_REG32(sc, db, SLIPORT_STATUS_OFFSET);
+		if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
+			sliport_err1 = OCE_READ_REG32(sc, db, SLIPORT_ERROR1_OFFSET);
+			sliport_err2 = OCE_READ_REG32(sc, db, SLIPORT_ERROR2_OFFSET);
+		}
+	} else {
+		ue_low = OCE_READ_REG32(sc, devcfg, PCICFG_UE_STATUS_LOW);
+		ue_high = OCE_READ_REG32(sc, devcfg, PCICFG_UE_STATUS_HIGH);
+		ue_low_mask = OCE_READ_REG32(sc, devcfg, PCICFG_UE_STATUS_LOW_MASK);
+		ue_high_mask = OCE_READ_REG32(sc, devcfg, PCICFG_UE_STATUS_HI_MASK);
+
+		ue_low = (ue_low & ~ue_low_mask);
+		ue_high = (ue_high & ~ue_high_mask);
+	}
+
+	/* On certain platforms BE hardware can indicate spurious UEs.
+	 * Allow the h/w to stop working completely in case of a real UE.
+	 * Hence not setting the hw_error for UE detection.
+	 */
+	if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
+		sc->hw_error = TRUE;
+		device_printf(sc->dev, "Error detected in the card\n");
+	}
+
+	if (sliport_status & SLIPORT_STATUS_ERR_MASK) {
+		device_printf(sc->dev,
+				"ERR: sliport status 0x%x\n", sliport_status);
+		device_printf(sc->dev,
+				"ERR: sliport error1 0x%x\n", sliport_err1);
+		device_printf(sc->dev,
+				"ERR: sliport error2 0x%x\n", sliport_err2);
+	}
+
+	if (ue_low) {
+		for (i = 0; ue_low; ue_low >>= 1, i++) {
+			if (ue_low & 1)
+				device_printf(sc->dev, "UE: %s bit set\n",
+							ue_status_low_desc[i]);
+		}
+	}
+
+	if (ue_high) {
+		for (i = 0; ue_high; ue_high >>= 1, i++) {
+			if (ue_high & 1)
+				device_printf(sc->dev, "UE: %s bit set\n",
+							ue_status_hi_desc[i]);
+		}
+	}
 
 }
 
+
 static void
 oce_local_timer(void *arg)
 {
 	POCE_SOFTC sc = arg;
 	int i = 0;
 	
+	oce_detect_hw_error(sc);
 	oce_refresh_nic_stats(sc);
 	oce_refresh_queue_stats(sc);
 	oce_mac_addr_set(sc);
@@ -1890,7 +2047,7 @@ oce_local_timer(void *arg)
 
 /* NOTE : This should only be called holding
  *        DEVICE_LOCK.
-*/
+ */
 static void
 oce_if_deactivate(POCE_SOFTC sc)
 {
@@ -1999,11 +2156,6 @@ process_link_state(POCE_SOFTC sc, struct oce_async_cqe_link_state *acqe)
 		sc->link_status = ASYNC_EVENT_LINK_DOWN;
 		if_link_state_change(sc->ifp, LINK_STATE_DOWN);
 	}
-
-	/* Update speed */
-	sc->link_speed = acqe->u0.s.speed;
-	sc->qos_link_speed = (uint32_t) acqe->u0.s.qos_link_speed * 10;
-
 }
 
 
@@ -2080,6 +2232,9 @@ setup_max_queues_want(POCE_SOFTC sc)
 	    (sc->flags & OCE_FLAGS_BE2)) {
 		sc->nrqs = 1;
 		sc->nwqs = 1;
+	} else {
+		sc->nrqs = MIN(OCE_NCPUS, sc->nrssqs) + 1;
+		sc->nwqs = MIN(OCE_NCPUS, sc->nrssqs);
 	}
 }
 
@@ -2185,18 +2340,17 @@ oce_get_config(POCE_SOFTC sc)
 		max_rss = OCE_MAX_RSS;
 
 	if (!IS_BE(sc)) {
-		rc = oce_get_func_config(sc);
+		rc = oce_get_profile_config(sc, max_rss);
 		if (rc) {
 			sc->nwqs = OCE_MAX_WQ;
 			sc->nrssqs = max_rss;
 			sc->nrqs = sc->nrssqs + 1;
 		}
 	}
-	else {
-		rc = oce_get_profile_config(sc);
+	else { /* For BE3 don't rely on fw for determining the resources */
 		sc->nrssqs = max_rss;
 		sc->nrqs = sc->nrssqs + 1;
-		if (rc)
-			sc->nwqs = OCE_MAX_WQ;
+		sc->nwqs = OCE_MAX_WQ;
+		sc->max_vlans = MAX_VLANFILTER_SIZE; 
 	}
 }
diff --git a/sys/dev/oce/oce_if.h b/sys/dev/oce/oce_if.h
index 83de17ba534..1af4c4ccdc8 100644
--- a/sys/dev/oce/oce_if.h
+++ b/sys/dev/oce/oce_if.h
@@ -36,11 +36,11 @@
  * Costa Mesa, CA 92626
  */
 
-
 /* $FreeBSD$ */
 
 #include <sys/param.h>
 #include <sys/endian.h>
+#include <sys/eventhandler.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
@@ -65,6 +65,7 @@
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
 #include <net/if_vlan_var.h>
@@ -88,7 +89,8 @@
 
 #include "oce_hw.h"
 
-#define COMPONENT_REVISION "4.6.95.0"
+/* OCE device driver module component revision informaiton */
+#define COMPONENT_REVISION "10.0.664.0"
 
 /* OCE devices supported by this driver */
 #define PCI_VENDOR_EMULEX		0x10df	/* Emulex */
@@ -150,6 +152,7 @@ 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
@@ -173,6 +176,7 @@ extern int mp_ncpus;			/* system's total active cpu cores */
 #define  OCE_CAPAB_FLAGS 		(MBX_RX_IFACE_FLAGS_BROADCAST    | \
 					MBX_RX_IFACE_FLAGS_UNTAGGED      | \
 					MBX_RX_IFACE_FLAGS_PROMISCUOUS      | \
+					MBX_RX_IFACE_FLAGS_VLAN_PROMISCUOUS |	\
 					MBX_RX_IFACE_FLAGS_MCAST_PROMISCUOUS   | \
 					MBX_RX_IFACE_FLAGS_RSS | \
 					MBX_RX_IFACE_FLAGS_PASS_L3L4_ERR)
@@ -863,7 +867,7 @@ typedef struct oce_softc {
 	uint32_t if_cap_flags;
 
 	uint32_t flow_control;
-	uint32_t promisc;
+	uint8_t  promisc;
 
 	struct oce_aic_obj aic_obj[OCE_MAX_EQ];
 
@@ -877,9 +881,11 @@ typedef struct oce_softc {
 	struct oce_drv_stats oce_stats_info;
 	struct callout  timer;
 	int8_t be3_native;
+	uint8_t hw_error;
 	uint16_t qnq_debug_event;
 	uint16_t qnqid;
-	uint16_t pvid;
+	uint32_t pvid;
+	uint32_t max_vlans;
 
 } OCE_SOFTC, *POCE_SOFTC;
 
@@ -1010,7 +1016,7 @@ int oce_config_vlan(POCE_SOFTC sc, uint32_t if_id,
 		uint32_t untagged, uint32_t enable_promisc);
 int oce_set_flow_control(POCE_SOFTC sc, uint32_t flow_control);
 int oce_config_nic_rss(POCE_SOFTC sc, uint32_t if_id, uint16_t enable_rss);
-int oce_rxf_set_promiscuous(POCE_SOFTC sc, uint32_t enable);
+int oce_rxf_set_promiscuous(POCE_SOFTC sc, uint8_t enable);
 int oce_set_common_iface_rx_filter(POCE_SOFTC sc, POCE_DMA_MEM sgl);
 int oce_get_link_status(POCE_SOFTC sc, struct link_status *link);
 int oce_mbox_get_nic_stats_v0(POCE_SOFTC sc, POCE_DMA_MEM pstats_dma_mem);
@@ -1051,7 +1057,7 @@ int oce_mbox_cq_create(struct oce_cq *cq, uint32_t ncoalesce,
 int oce_mbox_read_transrecv_data(POCE_SOFTC sc, uint32_t page_num);
 void oce_mbox_eqd_modify_periodic(POCE_SOFTC sc, struct oce_set_eqd *set_eqd,
 					int num);
-int oce_get_profile_config(POCE_SOFTC sc);
+int oce_get_profile_config(POCE_SOFTC sc, uint32_t max_rss);
 int oce_get_func_config(POCE_SOFTC sc);
 void mbx_common_req_hdr_init(struct mbx_hdr *hdr,
 			     uint8_t dom,
@@ -1095,6 +1101,9 @@ extern uint32_t oce_max_rsp_handled;	/* max responses */
 #define OCE_ONE_PORT_EXT_LOOPBACK	0x2
 #define OCE_NO_LOOPBACK			0xff
 
+#undef IFM_40G_SR4
+#define IFM_40G_SR4			28
+
 #define atomic_inc_32(x)		atomic_add_32(x, 1)
 #define atomic_dec_32(x)		atomic_subtract_32(x, 1)
 
diff --git a/sys/dev/oce/oce_mbox.c b/sys/dev/oce/oce_mbox.c
index 9aab595e562..77fd33bfb05 100644
--- a/sys/dev/oce/oce_mbox.c
+++ b/sys/dev/oce/oce_mbox.c
@@ -36,11 +36,8 @@
  * Costa Mesa, CA 92626
  */
 
-
-
 /* $FreeBSD$ */
 
-
 #include "oce_if.h"
 extern uint32_t sfp_vpd_dump_buffer[TRANSCEIVER_DATA_NUM_ELE];
 
@@ -281,8 +278,10 @@ oce_get_fw_version(POCE_SOFTC sc)
 	if (!ret)
                 ret = fwcmd->hdr.u0.rsp.status;
 	if (ret) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, ret);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, ret,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 
@@ -438,8 +437,10 @@ oce_read_mac_addr(POCE_SOFTC sc, uint32_t if_id,
 	if (!ret)
                 ret = fwcmd->hdr.u0.rsp.status;
 	if (ret) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, ret);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, ret,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 
@@ -481,25 +482,27 @@ oce_get_fw_config(POCE_SOFTC sc)
 	if (!ret)
                 ret = fwcmd->hdr.u0.rsp.status;
 	if (ret) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, ret);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, ret,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 
 	DW_SWAP(u32ptr(fwcmd), sizeof(struct mbx_common_query_fw_config));
 
-	sc->config_number = fwcmd->params.rsp.config_number;
-	sc->asic_revision = fwcmd->params.rsp.asic_revision;
-	sc->port_id	  = fwcmd->params.rsp.port_id;
-	sc->function_mode = fwcmd->params.rsp.function_mode;
-	sc->function_caps = fwcmd->params.rsp.function_caps;
+	sc->config_number = HOST_32(fwcmd->params.rsp.config_number);
+	sc->asic_revision = HOST_32(fwcmd->params.rsp.asic_revision);
+	sc->port_id	  = HOST_32(fwcmd->params.rsp.port_id);
+	sc->function_mode = HOST_32(fwcmd->params.rsp.function_mode);
+	sc->function_caps = HOST_32(fwcmd->params.rsp.function_caps);
 
 	if (fwcmd->params.rsp.ulp[0].ulp_mode & ULP_NIC_MODE) {
-		sc->max_tx_rings = fwcmd->params.rsp.ulp[0].nic_wq_tot;
-		sc->max_rx_rings = fwcmd->params.rsp.ulp[0].lro_rqid_tot;
+		sc->max_tx_rings = HOST_32(fwcmd->params.rsp.ulp[0].nic_wq_tot);
+		sc->max_rx_rings = HOST_32(fwcmd->params.rsp.ulp[0].lro_rqid_tot);
 	} else {
-		sc->max_tx_rings = fwcmd->params.rsp.ulp[1].nic_wq_tot;
-		sc->max_rx_rings = fwcmd->params.rsp.ulp[1].lro_rqid_tot;
+		sc->max_tx_rings = HOST_32(fwcmd->params.rsp.ulp[1].nic_wq_tot);
+		sc->max_rx_rings = HOST_32(fwcmd->params.rsp.ulp[1].lro_rqid_tot);
 	}
 	
 error:
@@ -561,15 +564,17 @@ oce_if_create(POCE_SOFTC sc,
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 
-	*if_id = LE_32(fwcmd->params.rsp.if_id);
+	*if_id = HOST_32(fwcmd->params.rsp.if_id);
 
 	if (mac_addr != NULL)
-		sc->pmac_id = LE_32(fwcmd->params.rsp.pmac_id);
+		sc->pmac_id = HOST_32(fwcmd->params.rsp.pmac_id);
 error:
 	return rc;
 }
@@ -607,8 +612,10 @@ oce_if_del(POCE_SOFTC sc, uint32_t if_id)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	return rc;
 }
 
@@ -630,7 +637,10 @@ oce_config_vlan(POCE_SOFTC sc,
 {
 	struct oce_mbx mbx;
 	struct mbx_common_config_vlan *fwcmd;
-	int rc;
+	int rc = 0;
+
+	if (sc->vlans_added > sc->max_vlans)
+		goto vlan_promisc;
 
 	bzero(&mbx, sizeof(struct oce_mbx));
 	fwcmd = (struct mbx_common_config_vlan *)&mbx.payload;
@@ -659,9 +669,19 @@ oce_config_vlan(POCE_SOFTC sc,
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
-	return 0;
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
+
+	goto done;
+
+vlan_promisc:
+	/* Enable Vlan Promis */
+	oce_rxf_set_promiscuous(sc, (1 << 1));
+	device_printf(sc->dev,"Enabling Vlan Promisc Mode\n");
+done:
+	return rc;
 
 }
 
@@ -702,8 +722,10 @@ oce_set_flow_control(POCE_SOFTC sc, uint32_t flow_control)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	return rc;
 }
 
@@ -802,8 +824,10 @@ oce_config_nic_rss(POCE_SOFTC sc, uint32_t if_id, uint16_t enable_rss)
 		if (!rc)
                 	rc = fwcmd->hdr.u0.rsp.status;
 		if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	}
 	return rc;
 }
@@ -818,7 +842,7 @@ oce_config_nic_rss(POCE_SOFTC sc, uint32_t if_id, uint16_t enable_rss)
  *	This function uses the COMMON_SET_IFACE_RX_FILTER command instead.
  */
 int
-oce_rxf_set_promiscuous(POCE_SOFTC sc, uint32_t enable)
+oce_rxf_set_promiscuous(POCE_SOFTC sc, uint8_t enable)
 {
 	struct mbx_set_common_iface_rx_filter *fwcmd;
 	int sz = sizeof(struct mbx_set_common_iface_rx_filter);
@@ -836,10 +860,13 @@ oce_rxf_set_promiscuous(POCE_SOFTC sc, uint32_t enable)
 	req =  &fwcmd->params.req;
 	req->iface_flags_mask = MBX_RX_IFACE_FLAGS_PROMISCUOUS |
 				MBX_RX_IFACE_FLAGS_VLAN_PROMISCUOUS;
-	if (enable) {
-		req->iface_flags = MBX_RX_IFACE_FLAGS_PROMISCUOUS |
-				   MBX_RX_IFACE_FLAGS_VLAN_PROMISCUOUS;
-	}
+	/* Bit 0 Mac promisc, Bit 1 Vlan promisc */
+	if (enable & 0x01)
+		req->iface_flags = MBX_RX_IFACE_FLAGS_PROMISCUOUS;
+
+	if (enable & 0x02)
+		req->iface_flags = MBX_RX_IFACE_FLAGS_VLAN_PROMISCUOUS;
+
 	req->if_id = sc->if_id;
 
 	rc = oce_set_common_iface_rx_filter(sc, &sgl);
@@ -886,9 +913,11 @@ oce_set_common_iface_rx_filter(POCE_SOFTC sc, POCE_DMA_MEM sgl)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
-	return 0;
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
+	return rc;
 }
 
 /**
@@ -906,7 +935,7 @@ oce_get_link_status(POCE_SOFTC sc, struct link_status *link)
 
 	bzero(&mbx, sizeof(struct oce_mbx));
 
-	IS_XE201(sc) ? (version = OCE_MBX_VER_V1) : (version = OCE_MBX_VER_V0);
+	IS_BE2(sc) ? (version = OCE_MBX_VER_V0) : (version = OCE_MBX_VER_V1);
 
 	fwcmd = (struct mbx_query_common_link_config *)&mbx.payload;
 	mbx_common_req_hdr_init(&fwcmd->hdr, 0, 0,
@@ -925,14 +954,16 @@ oce_get_link_status(POCE_SOFTC sc, struct link_status *link)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 	/* interpret response */
 	bcopy(&fwcmd->params.rsp, link, sizeof(struct link_status));
-	link->logical_link_status = LE_32(link->logical_link_status);
-	link->qos_link_speed = LE_16(link->qos_link_speed);
+	link->logical_link_status = HOST_32(link->logical_link_status);
+	link->qos_link_speed = HOST_16(link->qos_link_speed);
 error:
 	return rc;
 }
@@ -978,8 +1009,10 @@ oce_mbox_get_nic_stats_v0(POCE_SOFTC sc, POCE_DMA_MEM pstats_dma_mem)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	return rc; 
 }
 
@@ -1028,8 +1061,10 @@ oce_mbox_get_nic_stats(POCE_SOFTC sc, POCE_DMA_MEM pstats_dma_mem)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	return rc; 
 }
 
@@ -1080,8 +1115,10 @@ oce_mbox_get_pport_stats(POCE_SOFTC sc, POCE_DMA_MEM pstats_dma_mem,
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	return rc;
 }
 
@@ -1133,8 +1170,10 @@ oce_mbox_get_vport_stats(POCE_SOFTC sc, POCE_DMA_MEM pstats_dma_mem,
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	return rc;
 }
 
@@ -1178,8 +1217,10 @@ oce_update_multicast(POCE_SOFTC sc, POCE_DMA_MEM pdma_mem)
 	if (!rc)
                 rc = req->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      req->hdr.u0.rsp.additional_status);
 	return rc;
 }
 
@@ -1243,8 +1284,10 @@ oce_mbox_macaddr_add(POCE_SOFTC sc, uint8_t *mac_addr,
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 	*pmac_id = fwcmd->params.rsp.pmac_id;
@@ -1281,8 +1324,10 @@ oce_mbox_macaddr_del(POCE_SOFTC sc, uint32_t if_id, uint32_t pmac_id)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	return rc;
 }
 
@@ -1318,11 +1363,13 @@ oce_mbox_check_native_mode(POCE_SOFTC sc)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
-	sc->be3_native = fwcmd->params.rsp.capability_flags
+	sc->be3_native = HOST_32(fwcmd->params.rsp.capability_flags)
 			& CAP_BE3_NATIVE_ERX_API;
 
 error:
@@ -1363,8 +1410,10 @@ oce_mbox_cmd_set_loopback(POCE_SOFTC sc, uint8_t port_num,
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 
 	return rc;
 
@@ -1406,8 +1455,10 @@ oce_mbox_cmd_test_loopback(POCE_SOFTC sc, uint32_t port_num,
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	
 	return rc;
 }
@@ -1433,9 +1484,9 @@ oce_mbox_write_flashrom(POCE_SOFTC sc, uint32_t optype,uint32_t opcode,
 				payload_len,
 				OCE_MBX_VER_V0);
 
-	fwcmd->flash_op_type = optype;
-	fwcmd->flash_op_code = opcode;
-	fwcmd->data_buffer_size = num_bytes;
+	fwcmd->flash_op_type = LE_32(optype);
+	fwcmd->flash_op_code = LE_32(opcode);
+	fwcmd->data_buffer_size = LE_32(num_bytes);
 
 	mbx.u0.s.embedded  = 0; /*Non embeded*/
 	mbx.payload_length = payload_len;
@@ -1451,8 +1502,10 @@ oce_mbox_write_flashrom(POCE_SOFTC sc, uint32_t optype,uint32_t opcode,
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 	
 	return rc;
 
@@ -1497,8 +1550,10 @@ oce_mbox_get_flashrom_crc(POCE_SOFTC sc, uint8_t *flash_crc,
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 	bcopy(fwcmd->data_buffer, flash_crc, 4);
@@ -1532,18 +1587,20 @@ oce_mbox_get_phy_info(POCE_SOFTC sc, struct oce_phy_info *phy_info)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
-	phy_info->phy_type = fwcmd->params.rsp.phy_info.phy_type;
+	phy_info->phy_type = HOST_16(fwcmd->params.rsp.phy_info.phy_type);
 	phy_info->interface_type =
-			fwcmd->params.rsp.phy_info.interface_type;
+			HOST_16(fwcmd->params.rsp.phy_info.interface_type);
 	phy_info->auto_speeds_supported =
-		fwcmd->params.rsp.phy_info.auto_speeds_supported;
+		HOST_16(fwcmd->params.rsp.phy_info.auto_speeds_supported);
 	phy_info->fixed_speeds_supported =
-		fwcmd->params.rsp.phy_info.fixed_speeds_supported;
-	phy_info->misc_params =fwcmd->params.rsp.phy_info.misc_params;
+		HOST_16(fwcmd->params.rsp.phy_info.fixed_speeds_supported);
+	phy_info->misc_params = HOST_32(fwcmd->params.rsp.phy_info.misc_params);
 error:
 	return rc;
 
@@ -1593,11 +1650,13 @@ oce_mbox_lancer_write_flashrom(POCE_SOFTC sc, uint32_t data_size,
 	if (!rc)
                 rc = fwcmd->params.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->params.rsp.additional_status);
 		goto error;
 	}
-	*written_data = fwcmd->params.rsp.actual_write_length;
+	*written_data = HOST_32(fwcmd->params.rsp.actual_write_length);
 	*additional_status = fwcmd->params.rsp.additional_status;
 error:
 	return rc;
@@ -1649,11 +1708,13 @@ oce_mbox_create_rq(struct oce_rq *rq)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
-	rq->rq_id = fwcmd->params.rsp.rq_id;
+	rq->rq_id = HOST_16(fwcmd->params.rsp.rq_id);
 	rq->rss_cpuid = fwcmd->params.rsp.rss_cpuid;
 error:
 	return rc;
@@ -1673,15 +1734,17 @@ oce_mbox_create_wq(struct oce_wq *wq)
 	bzero(&mbx, sizeof(struct oce_mbx));
 
 	fwcmd = (struct mbx_create_nic_wq *)&mbx.payload;
-	if (IS_XE201(sc)) {
+	if (IS_XE201(sc))
 		version = OCE_MBX_VER_V1;
-		fwcmd->params.req.if_id = sc->if_id;
-	} else if(IS_BE(sc))
+	else if(IS_BE(sc))
 		IS_PROFILE_SUPER_NIC(sc) ? (version = OCE_MBX_VER_V2) 
 					 : (version = OCE_MBX_VER_V0);
 	else
 		version = OCE_MBX_VER_V2;
 
+	if (version > OCE_MBX_VER_V0)
+		fwcmd->params.req.if_id = sc->if_id;
+
 	mbx_common_req_hdr_init(&fwcmd->hdr, 0, 0,
 				MBX_SUBSYSTEM_NIC,
 				NIC_CREATE_WQ, MBX_TIMEOUT_SEC,
@@ -1703,13 +1766,15 @@ oce_mbox_create_wq(struct oce_wq *wq)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
-	wq->wq_id = LE_16(fwcmd->params.rsp.wq_id);
+	wq->wq_id = HOST_16(fwcmd->params.rsp.wq_id);
 	if (version == OCE_MBX_VER_V2)
-		wq->db_offset = LE_32(fwcmd->params.rsp.db_offset);
+		wq->db_offset = HOST_32(fwcmd->params.rsp.db_offset);
 	else
 		wq->db_offset = PD_TXULP_DB;
 error:
@@ -1754,11 +1819,13 @@ oce_mbox_create_eq(struct oce_eq *eq)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
-	eq->eq_id = LE_16(fwcmd->params.rsp.eq_id);
+	eq->eq_id = HOST_16(fwcmd->params.rsp.eq_id);
 error:
 	return rc;
 }
@@ -1832,11 +1899,13 @@ oce_mbox_cq_create(struct oce_cq *cq, uint32_t ncoalesce, uint32_t is_eventable)
 	if (!rc)
                 rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
-	cq->cq_id = LE_16(fwcmd->params.rsp.cq_id);
+	cq->cq_id = HOST_16(fwcmd->params.rsp.cq_id);
 error:
 	return rc;
 
@@ -1885,8 +1954,10 @@ oce_mbox_read_transrecv_data(POCE_SOFTC sc, uint32_t page_num)
 	if (!rc)
 		rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 	if(fwcmd->params.rsp.page_num == PAGE_NUM_A0)
@@ -1947,12 +2018,14 @@ oce_mbox_eqd_modify_periodic(POCE_SOFTC sc, struct oce_set_eqd *set_eqd,
 	if (!rc)
 		rc = fwcmd->hdr.u0.rsp.status;
 	if (rc)
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 }
 
 int
-oce_get_profile_config(POCE_SOFTC sc)
+oce_get_profile_config(POCE_SOFTC sc, uint32_t max_rss)
 {
 	struct oce_mbx mbx;
 	struct mbx_common_get_profile_config *fwcmd;
@@ -1977,7 +2050,7 @@ oce_get_profile_config(POCE_SOFTC sc)
 	fwcmd = OCE_DMAPTR(&dma, struct mbx_common_get_profile_config);
 	bzero(fwcmd, sizeof(struct mbx_common_get_profile_config));
 
-	if (IS_BE3(sc))
+	if (!IS_XE201(sc))
 		version = OCE_MBX_VER_V1;
 	else
 		version = OCE_MBX_VER_V0;
@@ -2006,8 +2079,10 @@ oce_get_profile_config(POCE_SOFTC sc)
 	if (!rc)
 		rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 
@@ -2027,12 +2102,20 @@ oce_get_profile_config(POCE_SOFTC sc)
 		goto error;
 	}
 	else { 
-		sc->nwqs = HOST_32(nic_desc->txq_count);
+		sc->max_vlans = HOST_16(nic_desc->vlan_count);
+		sc->nwqs = HOST_16(nic_desc->txq_count);
 		if (sc->nwqs)
 			sc->nwqs = MIN(sc->nwqs, OCE_MAX_WQ);
 		else
 			sc->nwqs = OCE_MAX_WQ;
 
+		sc->nrssqs = HOST_16(nic_desc->rssq_count);
+		if (sc->nrssqs)
+			sc->nrssqs = MIN(sc->nrssqs, max_rss);
+		else
+			sc->nrssqs = max_rss;
+		sc->nrqs =  sc->nrssqs + 1; /* 1 for def RX */;
+
 	}
 error:
 	oce_dma_free(sc, &dma);
@@ -2096,8 +2179,10 @@ oce_get_func_config(POCE_SOFTC sc)
 	if (!rc)
 		rc = fwcmd->hdr.u0.rsp.status;
 	if (rc) {
-		device_printf(sc->dev,"%s failed - cmd status: %d\n",
-			      __FUNCTION__, rc);
+		device_printf(sc->dev,
+			      "%s failed - cmd status: %d addi status: %d\n",
+			      __FUNCTION__, rc,
+			      fwcmd->hdr.u0.rsp.additional_status);
 		goto error;
 	}
 
@@ -2117,6 +2202,7 @@ oce_get_func_config(POCE_SOFTC sc)
 		goto error;
 	}
 	else {
+		sc->max_vlans = nic_desc->vlan_count;
 		sc->nwqs = HOST_32(nic_desc->txq_count);
                 if (sc->nwqs)
                         sc->nwqs = MIN(sc->nwqs, OCE_MAX_WQ);
diff --git a/sys/dev/oce/oce_queue.c b/sys/dev/oce/oce_queue.c
index fbf68fde3d1..308c16d5484 100644
--- a/sys/dev/oce/oce_queue.c
+++ b/sys/dev/oce/oce_queue.c
@@ -36,11 +36,8 @@
  * Costa Mesa, CA 92626
  */
 
-
-
 /* $FreeBSD$ */
 
-
 #include "oce_if.h"
 
 /*****************************************************
diff --git a/sys/dev/oce/oce_sysctl.c b/sys/dev/oce/oce_sysctl.c
index 7dad6195cb2..0cafbbd84ed 100644
--- a/sys/dev/oce/oce_sysctl.c
+++ b/sys/dev/oce/oce_sysctl.c
@@ -38,17 +38,16 @@
 
 /* $FreeBSD$ */
 
-
 #include "oce_if.h"
 
 static void copy_stats_to_sc_xe201(POCE_SOFTC sc);
 static void copy_stats_to_sc_be3(POCE_SOFTC sc);
 static void copy_stats_to_sc_be2(POCE_SOFTC sc);
 static int  oce_sysctl_loopback(SYSCTL_HANDLER_ARGS);
+static int  oce_sys_aic_enable(SYSCTL_HANDLER_ARGS);
 static int  oce_be3_fwupgrade(POCE_SOFTC sc, const struct firmware *fw);
+static int oce_skyhawk_fwupgrade(POCE_SOFTC sc, const struct firmware *fw);
 static int  oce_sys_fwupgrade(SYSCTL_HANDLER_ARGS);
-static int  oce_be3_flashdata(POCE_SOFTC sc, const struct firmware
-						*fw, int num_imgs);
 static int  oce_lancer_fwupgrade(POCE_SOFTC sc, const struct firmware *fw);
 static int oce_sysctl_sfp_vpd_dump(SYSCTL_HANDLER_ARGS);
 static boolean_t oce_phy_flashing_required(POCE_SOFTC sc);
@@ -62,9 +61,18 @@ static void oce_add_stats_sysctls_xe201(POCE_SOFTC sc,
 				struct sysctl_ctx_list *ctx,
 				struct sysctl_oid *stats_node);
 
+
 extern char component_revision[32];
 uint32_t sfp_vpd_dump_buffer[TRANSCEIVER_DATA_NUM_ELE];
 
+struct flash_img_attri {
+	int img_offset;
+	int img_size;
+	int img_type;
+	bool skip_image;
+	int optype;
+};
+
 void
 oce_add_sysctls(POCE_SOFTC sc)
 {
@@ -124,6 +132,10 @@ oce_add_sysctls(POCE_SOFTC sc)
 		CTLTYPE_STRING | CTLFLAG_RW, (void *)sc, 0,
 		oce_sys_fwupgrade, "A", "Firmware ufi file");
 
+	SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "aic_enable",
+		CTLTYPE_INT | CTLFLAG_RW, (void *)sc, 1,
+		oce_sys_aic_enable, "I", "aic flags");
+
         /*
          *  Dumps Transceiver data
 	 *  "sysctl dev.oce.0.sfp_vpd_dump=0"
@@ -154,14 +166,43 @@ oce_loopback_test(struct oce_softc *sc, uint8_t loopback_type)
 {
 	uint32_t status = 0;
 
-	oce_mbox_cmd_set_loopback(sc, sc->if_id, loopback_type, 1);
-	status = oce_mbox_cmd_test_loopback(sc, sc->if_id, loopback_type,
+	oce_mbox_cmd_set_loopback(sc, sc->port_id, loopback_type, 1);
+	status = oce_mbox_cmd_test_loopback(sc, sc->port_id, loopback_type,
 				1500, 2, 0xabc);
-	oce_mbox_cmd_set_loopback(sc, sc->if_id, OCE_NO_LOOPBACK, 1);
+	oce_mbox_cmd_set_loopback(sc, sc->port_id, OCE_NO_LOOPBACK, 1);
 
 	return status;
 }
 
+static int
+oce_sys_aic_enable(SYSCTL_HANDLER_ARGS)
+{
+	int value = 0;
+	uint32_t status, vector;
+	POCE_SOFTC sc = (struct oce_softc *)arg1;
+	struct oce_aic_obj *aic;
+
+	status = sysctl_handle_int(oidp, &value, 0, req);
+	if (status || !req->newptr)
+		return status; 
+
+	for (vector = 0; vector < sc->intr_count; vector++) {
+		aic = &sc->aic_obj[vector];
+
+		if (value == 0){
+			aic->max_eqd = aic->min_eqd = aic->et_eqd = 0;
+			aic->enable = 0;
+		}
+		else {
+			aic->max_eqd = OCE_MAX_EQD;
+			aic->min_eqd = OCE_MIN_EQD;
+			aic->et_eqd = OCE_MIN_EQD;
+			aic->enable = TRUE;
+		}
+	}
+	return 0;
+}
+
 static int
 oce_sysctl_loopback(SYSCTL_HANDLER_ARGS)
 {
@@ -223,7 +264,7 @@ oce_sys_fwupgrade(SYSCTL_HANDLER_ARGS)
 		return ENOENT;
 	}
 
-	if (IS_BE(sc) || IS_SH(sc)) {
+	if (IS_BE(sc)) {
 		if ((sc->flags & OCE_FLAGS_BE2)) {
 			device_printf(sc->dev, 
 				"Flashing not supported for BE2 yet.\n");
@@ -231,6 +272,8 @@ oce_sys_fwupgrade(SYSCTL_HANDLER_ARGS)
 			goto done;
 		}
 		status = oce_be3_fwupgrade(sc, fw);
+	} else if (IS_SH(sc)) {
+		status = oce_skyhawk_fwupgrade(sc,fw);
 	} else
 		status = oce_lancer_fwupgrade(sc, fw);
 done:
@@ -246,6 +289,277 @@ done:
 	return status;
 }
 
+static void oce_fill_flash_img_data(POCE_SOFTC sc, const struct flash_sec_info * fsec,
+				struct flash_img_attri *pimg, int i,
+				const struct firmware *fw, int bin_offset)
+{
+	if (IS_SH(sc)) {
+		pimg->img_offset = HOST_32(fsec->fsec_entry[i].offset);
+		pimg->img_size   = HOST_32(fsec->fsec_entry[i].pad_size);
+	}
+
+	pimg->img_type = HOST_32(fsec->fsec_entry[i].type);
+	pimg->skip_image = FALSE;
+	switch (pimg->img_type) {
+		case IMG_ISCSI:
+			pimg->optype = 0;
+			if (IS_BE3(sc)) {
+				pimg->img_offset = 2097152;
+				pimg->img_size   = 2097152;
+			}
+			break;
+		case IMG_REDBOOT:
+			pimg->optype = 1;
+			if (IS_BE3(sc)) {
+				pimg->img_offset = 262144;
+				pimg->img_size   = 1048576;
+			}
+			if (!oce_img_flashing_required(sc, fw->data,
+						pimg->optype,
+						pimg->img_offset,
+						pimg->img_size,
+						bin_offset))
+				pimg->skip_image = TRUE;
+			break;
+		case IMG_BIOS:
+			pimg->optype = 2;
+			if (IS_BE3(sc)) {
+				pimg->img_offset = 12582912;
+				pimg->img_size   = 524288;
+			}
+			break;
+		case IMG_PXEBIOS:
+			pimg->optype = 3;
+			if (IS_BE3(sc)) {
+				pimg->img_offset =  13107200;;
+				pimg->img_size   = 524288;
+			}
+			break;
+		case IMG_FCOEBIOS:
+			pimg->optype = 8;
+			if (IS_BE3(sc)) {
+				pimg->img_offset = 13631488;
+				pimg->img_size   = 524288;
+			}
+			break;
+		case IMG_ISCSI_BAK:
+			pimg->optype = 9;
+			if (IS_BE3(sc)) {
+				pimg->img_offset = 4194304;
+				pimg->img_size   = 2097152;
+			}
+			break;
+		case IMG_FCOE:
+			pimg->optype = 10;
+			if (IS_BE3(sc)) {
+				pimg->img_offset = 6291456;
+				pimg->img_size   = 2097152;
+			}
+			break;
+		case IMG_FCOE_BAK:
+			pimg->optype = 11;
+			if (IS_BE3(sc)) {
+				pimg->img_offset = 8388608;
+				pimg->img_size   = 2097152;
+			}
+			break;
+		case IMG_NCSI:
+			pimg->optype = 13;
+			if (IS_BE3(sc)) {
+				pimg->img_offset = 15990784;
+				pimg->img_size   = 262144;
+			}
+			break;
+		case IMG_PHY:
+			pimg->optype = 99;
+			if (IS_BE3(sc)) {
+				pimg->img_offset = 1310720;
+				pimg->img_size   = 262144;
+			}
+			if (!oce_phy_flashing_required(sc))
+				pimg->skip_image = TRUE;
+			break;
+		default:
+			pimg->skip_image = TRUE;
+			break;
+	}
+
+}
+
+static int
+oce_sh_be3_flashdata(POCE_SOFTC sc, const struct firmware *fw, int32_t num_imgs)
+{
+	char cookie[2][16] =    {"*** SE FLAS", "H DIRECTORY *** "};
+	const char *p = (const char *)fw->data;
+	const struct flash_sec_info *fsec = NULL;
+	struct mbx_common_read_write_flashrom *req;
+	int rc = 0, i, bin_offset = 0, opcode, num_bytes;
+	OCE_DMA_MEM dma_mem;
+	struct flash_img_attri imgatt;
+
+	/* Validate Cookie */
+	bin_offset = (sizeof(struct flash_file_hdr) +
+			(num_imgs * sizeof(struct image_hdr)));
+	p += bin_offset;
+	while (p < ((const char *)fw->data + fw->datasize)) {
+		fsec = (const struct flash_sec_info *)p;
+		if (!memcmp(cookie, fsec->cookie, sizeof(cookie)))
+			break;
+		fsec = NULL;
+		p += 32;
+	}
+
+	if (!fsec) {
+		device_printf(sc->dev,
+				"Invalid Cookie. Firmware image corrupted ?\n");
+		return EINVAL;
+	}
+
+	rc = oce_dma_alloc(sc, sizeof(struct mbx_common_read_write_flashrom),
+				&dma_mem, 0);
+	if (rc) {
+		device_printf(sc->dev,
+				"Memory allocation failure while flashing\n");
+		return ENOMEM;
+	}
+	req = OCE_DMAPTR(&dma_mem, struct mbx_common_read_write_flashrom);
+
+	if (IS_SH(sc))
+		num_imgs = HOST_32(fsec->fsec_hdr.num_images);
+	else if (IS_BE3(sc))
+		num_imgs = MAX_FLASH_COMP;
+
+	for (i = 0; i < num_imgs; i++) {
+
+		bzero(&imgatt, sizeof(struct flash_img_attri));
+
+		oce_fill_flash_img_data(sc, fsec, &imgatt, i, fw, bin_offset);
+
+		if (imgatt.skip_image)
+			continue;
+
+		p = fw->data;
+		p = p + bin_offset + imgatt.img_offset;
+
+		if ((p + imgatt.img_size) > ((const char *)fw->data + fw->datasize)) {
+			rc = 1;
+			goto ret;
+		}
+
+		while (imgatt.img_size) {
+
+			if (imgatt.img_size > 32*1024)
+				num_bytes = 32*1024;
+			else
+				num_bytes = imgatt.img_size;
+			imgatt.img_size -= num_bytes;
+
+			if (!imgatt.img_size)
+				opcode = FLASHROM_OPER_FLASH;
+			else
+				opcode = FLASHROM_OPER_SAVE;
+
+			memcpy(req->data_buffer, p, num_bytes);
+			p += num_bytes;
+
+			rc = oce_mbox_write_flashrom(sc, imgatt.optype, opcode,
+					&dma_mem, num_bytes);
+			if (rc) {
+				device_printf(sc->dev,
+						"cmd to write to flash rom failed.\n");
+				rc = EIO;
+				goto ret;
+			}
+			/* Leave the CPU for others for some time */
+			pause("yield", 10);
+
+		}
+
+	}
+
+ret:
+	oce_dma_free(sc, &dma_mem);
+	return rc;
+}
+
+#define UFI_TYPE2		2
+#define UFI_TYPE3		3
+#define UFI_TYPE3R		10
+#define UFI_TYPE4		4
+#define UFI_TYPE4R		11
+static int oce_get_ufi_type(POCE_SOFTC sc,
+			    const struct flash_file_hdr *fhdr)
+{
+	if (fhdr == NULL)
+		goto be_get_ufi_exit;
+
+	if (IS_SH(sc) && fhdr->build[0] == '4') {
+		if (fhdr->asic_type_rev >= 0x10)
+			return UFI_TYPE4R;
+		else
+			return UFI_TYPE4;
+	} else if (IS_BE3(sc) && fhdr->build[0] == '3') {
+		if (fhdr->asic_type_rev == 0x10)
+			return UFI_TYPE3R;
+		else
+			return UFI_TYPE3;
+	} else if (IS_BE2(sc) && fhdr->build[0] == '2')
+		return UFI_TYPE2;
+
+be_get_ufi_exit:
+	device_printf(sc->dev,
+		"UFI and Interface are not compatible for flashing\n");
+	return -1;
+}
+
+
+static int
+oce_skyhawk_fwupgrade(POCE_SOFTC sc, const struct firmware *fw)
+{
+	int rc = 0, num_imgs = 0, i = 0, ufi_type;
+	const struct flash_file_hdr *fhdr;
+	const struct image_hdr *img_ptr;
+
+	fhdr = (const struct flash_file_hdr *)fw->data;
+
+	ufi_type = oce_get_ufi_type(sc, fhdr);
+
+	/* Display flash version */
+	device_printf(sc->dev, "Flashing Firmware %s\n", &fhdr->build[2]);
+
+	num_imgs = fhdr->num_imgs;
+	for (i = 0; i < num_imgs; i++) {
+		img_ptr = (const struct image_hdr *)((const char *)fw->data +
+				sizeof(struct flash_file_hdr) +
+				(i * sizeof(struct image_hdr)));
+
+		if (img_ptr->imageid != 1)
+			continue;
+
+		switch (ufi_type) {
+			case UFI_TYPE4R:
+				rc = oce_sh_be3_flashdata(sc, fw,
+						num_imgs);
+				break;
+			case UFI_TYPE4:
+				if (sc->asic_revision < 0x10)
+					rc = oce_sh_be3_flashdata(sc, fw,
+								   num_imgs);
+				else {
+					rc = -1;
+					device_printf(sc->dev,
+						"Cant load SH A0 UFI on B0\n");
+				}
+				break;
+			default:
+				rc = -1;
+				break;
+
+		}
+	}
+
+	return rc;
+}
 
 static int
 oce_be3_fwupgrade(POCE_SOFTC sc, const struct firmware *fw)
@@ -268,7 +582,8 @@ oce_be3_fwupgrade(POCE_SOFTC sc, const struct firmware *fw)
 				sizeof(struct flash_file_hdr) +
 				(i * sizeof(struct image_hdr)));
 		if (img_ptr->imageid == 1) {
-			rc = oce_be3_flashdata(sc, fw, num_imgs);
+			rc = oce_sh_be3_flashdata(sc, fw, num_imgs);
+
 			break;
 		}
 	}
@@ -277,156 +592,6 @@ oce_be3_fwupgrade(POCE_SOFTC sc, const struct firmware *fw)
 }
 
 
-static int
-oce_be3_flashdata(POCE_SOFTC sc, const struct firmware *fw, int num_imgs)
-{
-	char cookie[2][16] =    {"*** SE FLAS", "H DIRECTORY *** "};
-	const char *p = (const char *)fw->data;
-	const struct flash_sec_info *fsec = NULL;
-	struct mbx_common_read_write_flashrom *req;
-	int rc = 0, i, img_type, bin_offset = 0;
-	boolean_t skip_image;
-	uint32_t optype = 0, size = 0, start = 0, num_bytes = 0;
-	uint32_t opcode = 0;
-	OCE_DMA_MEM dma_mem;
-
-	/* Validate Cookie */
-	bin_offset = (sizeof(struct flash_file_hdr) +
-		(num_imgs * sizeof(struct image_hdr)));
-	p += bin_offset;
-	while (p < ((const char *)fw->data + fw->datasize)) {
-		fsec = (const struct flash_sec_info *)p;
-		if (!memcmp(cookie, fsec->cookie, sizeof(cookie)))
-			break;
-		fsec = NULL;
-		p += 32;
-	}
-
-	if (!fsec) {
-		device_printf(sc->dev,
-			"Invalid Cookie. Firmware image corrupted ?\n");
-		return EINVAL;
-	}
-
-	rc = oce_dma_alloc(sc, sizeof(struct mbx_common_read_write_flashrom)
-			+ 32*1024, &dma_mem, 0);
-	if (rc) {
-		device_printf(sc->dev,
-			"Memory allocation failure while flashing\n");
-		return ENOMEM;
-	}
-	req = OCE_DMAPTR(&dma_mem, struct mbx_common_read_write_flashrom);
-
-	for (i = 0; i < MAX_FLASH_COMP; i++) {
-
-		img_type = fsec->fsec_entry[i].type;
-		skip_image = FALSE;
-		switch (img_type) {
-		case IMG_ISCSI:
-			optype = 0;
-			size = 2097152;
-			start = 2097152;
-			break;
-		case IMG_REDBOOT:
-			optype = 1;
-			size = 1048576;
-			start = 262144;
-			if (!oce_img_flashing_required(sc, fw->data,
-				optype, start, size, bin_offset))
-				skip_image = TRUE;
-			break;
-		case IMG_BIOS:
-			optype = 2;
-			size = 524288;
-			start = 12582912;
-			break;
-		case IMG_PXEBIOS:
-			optype = 3;
-			size = 524288;
-			start = 13107200;
-			break;
-		case IMG_FCOEBIOS:
-			optype = 8;
-			size = 524288;
-			start = 13631488;
-			break;
-		case IMG_ISCSI_BAK:
-			optype = 9;
-			size = 2097152;
-			start = 4194304;
-			break;
-		case IMG_FCOE:
-			optype = 10;
-			size = 2097152;
-			start = 6291456;
-			break;
-		case IMG_FCOE_BAK:
-			optype = 11;
-			size = 2097152;
-			start = 8388608;
-			break;
-		case IMG_NCSI:
-			optype = 13;
-			size = 262144;
-			start = 15990784;
-			break;
-		case IMG_PHY:
-			optype = 99;
-			size = 262144;
-			start = 1310720;
-			if (!oce_phy_flashing_required(sc))
-				skip_image = TRUE;
-			break;
-		default:
-			skip_image = TRUE;
-			break;
-		}
-		if (skip_image)
-			continue;
-
-		p = fw->data;
-		p = p + bin_offset + start;
-		if ((p + size) > ((const char *)fw->data + fw->datasize)) {
-			rc = 1;
-			goto ret;
-		}
-
-		while (size) {
-
-			if (size > 32*1024)
-				num_bytes = 32*1024;
-			else
-				num_bytes = size;
-			size -= num_bytes;
-
-			if (!size)
-				opcode = FLASHROM_OPER_FLASH;
-			else
-				opcode = FLASHROM_OPER_SAVE;
-
-			memcpy(req->data_buffer, p, num_bytes);
-			p += num_bytes;
-
-			rc = oce_mbox_write_flashrom(sc, optype, opcode,
-						&dma_mem, num_bytes);
-			if (rc) {
-				device_printf(sc->dev,
-					"cmd to write to flash rom failed.\n");
-				rc = EIO;
-				goto ret;
-			}
-			/* Leave the CPU for others for some time */
-			pause("yield", 10);
-
-		}
-	}
-ret:
-	oce_dma_free(sc, &dma_mem);
-	return rc;
-
-}
-
-
 static boolean_t
 oce_phy_flashing_required(POCE_SOFTC sc)
 {
diff --git a/sys/dev/oce/oce_util.c b/sys/dev/oce/oce_util.c
index eeca2f23bd3..669da036785 100644
--- a/sys/dev/oce/oce_util.c
+++ b/sys/dev/oce/oce_util.c
@@ -36,10 +36,8 @@
  * Costa Mesa, CA 92626
  */
 
-
 /* $FreeBSD$ */
 
-
 #include "oce_if.h"
 
 static void oce_dma_map_ring(void *arg,
diff --git a/sys/dev/ofw/ofw_bus.h b/sys/dev/ofw/ofw_bus.h
index 3f4fbae9754..1ea48456126 100644
--- a/sys/dev/ofw/ofw_bus.h
+++ b/sys/dev/ofw/ofw_bus.h
@@ -70,4 +70,16 @@ ofw_bus_get_type(device_t dev)
 	return (OFW_BUS_GET_TYPE(device_get_parent(dev), dev));
 }
 
+static __inline int
+ofw_bus_map_intr(device_t dev, phandle_t iparent, int irq)
+{
+	return (OFW_BUS_MAP_INTR(dev, dev, iparent, irq));
+}
+
+static __inline int
+ofw_bus_config_intr(device_t dev, int irq, int sense)
+{
+	return (OFW_BUS_CONFIG_INTR(dev, dev, irq, sense));
+}
+
 #endif /* !_DEV_OFW_OFW_BUS_H_ */
diff --git a/sys/dev/ofw/ofw_bus_if.m b/sys/dev/ofw/ofw_bus_if.m
index 46fa281118d..0034a15478e 100644
--- a/sys/dev/ofw/ofw_bus_if.m
+++ b/sys/dev/ofw/ofw_bus_if.m
@@ -56,6 +56,8 @@ CODE {
 	static ofw_bus_get_name_t ofw_bus_default_get_name;
 	static ofw_bus_get_node_t ofw_bus_default_get_node;
 	static ofw_bus_get_type_t ofw_bus_default_get_type;
+	static ofw_bus_map_intr_t ofw_bus_default_map_intr;
+	static ofw_bus_config_intr_t ofw_bus_default_config_intr;
 
 	static const struct ofw_bus_devinfo *
 	ofw_bus_default_get_devinfo(device_t bus, device_t dev)
@@ -98,6 +100,31 @@ CODE {
 
 		return (NULL);
 	}
+
+	int
+	ofw_bus_default_map_intr(device_t bus, device_t dev, phandle_t iparent,
+	    int irq)
+	{
+		/* Propagate up the bus hierarchy until someone handles it. */	
+		if (device_get_parent(bus) != NULL)
+			return OFW_BUS_MAP_INTR(device_get_parent(bus), dev,
+			    iparent, irq);
+
+		/* If that fails, then assume a one-domain system */
+		return (irq);
+	}
+
+	int
+	ofw_bus_default_config_intr(device_t bus, device_t dev, int irq,
+	    int sense)
+	{
+		/* Propagate up the bus hierarchy until someone handles it. */	
+		if (device_get_parent(bus) != NULL)
+			return OFW_BUS_CONFIG_INTR(device_get_parent(bus), dev,
+			    irq, sense);
+
+		return (ENXIO);
+	}
 };
 
 # Get the ofw_bus_devinfo struct for the device dev on the bus. Used for bus
@@ -131,7 +158,7 @@ METHOD const char * get_name {
 } DEFAULT ofw_bus_default_get_name;
 
 # Get the firmware node for the device dev on the bus. The default method will
-# return 0, which signals that there is no such node.
+# return -1, which signals that there is no such node.
 METHOD phandle_t get_node {
 	device_t bus;
 	device_t dev;
@@ -143,3 +170,22 @@ METHOD const char * get_type {
 	device_t bus;
 	device_t dev;
 } DEFAULT ofw_bus_default_get_type;
+
+# Map an (interrupt parent, IRQ) pair to a unique system-wide interrupt number.
+METHOD int map_intr {
+	device_t bus;
+	device_t dev;
+	phandle_t iparent;
+	int irq;
+} DEFAULT ofw_bus_default_map_intr;
+
+# Configure an interrupt using the device-tree encoded sense key (the second
+# value in the interrupts property if interrupt-cells is 2). IRQ should be
+# encoded as from ofw_bus_map_intr().
+METHOD int config_intr {
+	device_t bus;
+	device_t dev;
+	int irq;
+	int sense;
+} DEFAULT ofw_bus_default_config_intr;
+
diff --git a/sys/dev/ofw/ofw_bus_subr.c b/sys/dev/ofw/ofw_bus_subr.c
index 9b9dee4d162..26a675937c1 100644
--- a/sys/dev/ofw/ofw_bus_subr.c
+++ b/sys/dev/ofw/ofw_bus_subr.c
@@ -197,6 +197,21 @@ ofw_bus_is_compatible_strict(device_t dev, const char *compatible)
 	return (0);
 }
 
+const struct ofw_compat_data *
+ofw_bus_search_compatible(device_t dev, const struct ofw_compat_data *compat)
+{
+
+	if (compat == NULL)
+		return NULL;
+
+	for (; compat->ocd_str != NULL; ++compat) {
+		if (ofw_bus_is_compatible(dev, compat->ocd_str))
+			break;
+	}
+
+	return (compat);
+}
+
 int
 ofw_bus_has_prop(device_t dev, const char *propname)
 {
@@ -208,21 +223,20 @@ ofw_bus_has_prop(device_t dev, const char *propname)
 	return (OF_hasprop(node, propname));
 }
 
-#ifndef FDT
 void
 ofw_bus_setup_iinfo(phandle_t node, struct ofw_bus_iinfo *ii, int intrsz)
 {
 	pcell_t addrc;
 	int msksz;
 
-	if (OF_getprop(node, "#address-cells", &addrc, sizeof(addrc)) == -1)
+	if (OF_getencprop(node, "#address-cells", &addrc, sizeof(addrc)) == -1)
 		addrc = 2;
 	ii->opi_addrc = addrc * sizeof(pcell_t);
 
-	ii->opi_imapsz = OF_getprop_alloc(node, "interrupt-map", 1,
+	ii->opi_imapsz = OF_getencprop_alloc(node, "interrupt-map", 1,
 	    (void **)&ii->opi_imap);
 	if (ii->opi_imapsz > 0) {
-		msksz = OF_getprop_alloc(node, "interrupt-map-mask", 1,
+		msksz = OF_getencprop_alloc(node, "interrupt-map-mask", 1,
 		    (void **)&ii->opi_imapmsk);
 		/*
 		 * Failure to get the mask is ignored; a full mask is used
@@ -246,9 +260,11 @@ ofw_bus_lookup_imap(phandle_t node, struct ofw_bus_iinfo *ii, void *reg,
 	KASSERT(regsz >= ii->opi_addrc,
 	    ("ofw_bus_lookup_imap: register size too small: %d < %d",
 		regsz, ii->opi_addrc));
-	rv = OF_getprop(node, "reg", reg, regsz);
-	if (rv < regsz)
-		panic("ofw_bus_lookup_imap: could not get reg property");
+	if (node != -1) {
+		rv = OF_getencprop(node, "reg", reg, regsz);
+		if (rv < regsz)
+			panic("ofw_bus_lookup_imap: cannot get reg property");
+	}
 	return (ofw_bus_search_intrmap(pintr, pintrsz, reg, ii->opi_addrc,
 	    ii->opi_imap, ii->opi_imapsz, ii->opi_imapmsk, maskbuf, mintr,
 	    mintrsz, iparent));
@@ -300,8 +316,8 @@ ofw_bus_search_intrmap(void *intr, int intrsz, void *regs, int physsz,
 	i = imapsz;
 	while (i > 0) {
 		bcopy(mptr + physsz + intrsz, &parent, sizeof(parent));
-		if (OF_searchprop(OF_xref_phandle(parent), "#interrupt-cells",
-		    &pintrsz, sizeof(pintrsz)) == -1)
+		if (OF_searchencprop(OF_xref_phandle(parent),
+		    "#interrupt-cells", &pintrsz, sizeof(pintrsz)) == -1)
 			pintrsz = 1;	/* default */
 		pintrsz *= sizeof(pcell_t);
 
@@ -328,4 +344,4 @@ ofw_bus_search_intrmap(void *intr, int intrsz, void *regs, int physsz,
 	}
 	return (0);
 }
-#endif /* !FDT */
+
diff --git a/sys/dev/ofw/ofw_bus_subr.h b/sys/dev/ofw/ofw_bus_subr.h
index b777f778164..184ab07b241 100644
--- a/sys/dev/ofw/ofw_bus_subr.h
+++ b/sys/dev/ofw/ofw_bus_subr.h
@@ -47,6 +47,11 @@ struct ofw_bus_iinfo {
 	pcell_t			opi_addrc;
 };
 
+struct ofw_compat_data {
+	const char	*ocd_str;
+	uintptr_t	 ocd_data;
+};
+
 /* Generic implementation of ofw_bus_if.m methods and helper routines */
 int	ofw_bus_gen_setup_devinfo(struct ofw_bus_devinfo *, phandle_t);
 void	ofw_bus_gen_destroy_devinfo(struct ofw_bus_devinfo *);
@@ -74,6 +79,16 @@ void	ofw_bus_find_iparent(phandle_t);
 int ofw_bus_is_compatible(device_t, const char *);
 int ofw_bus_is_compatible_strict(device_t, const char *);
 
+/* 
+ * Helper routine to search a list of compat properties.  The table is
+ * terminated by an entry with a NULL compat-string pointer; a pointer to that
+ * table entry is returned if none of the compat strings match for the device,
+ * giving you control over the not-found value.  Will not return NULL unless the
+ * provided table pointer is NULL.
+ */
+const struct ofw_compat_data *
+    ofw_bus_search_compatible(device_t, const struct ofw_compat_data *);
+
 /* Helper routine for checking existence of a prop */
 int ofw_bus_has_prop(device_t, const char *);
 
diff --git a/sys/dev/ofw/ofw_console.c b/sys/dev/ofw/ofw_console.c
index 01f86bf7fe8..30c10187ddf 100644
--- a/sys/dev/ofw/ofw_console.c
+++ b/sys/dev/ofw/ofw_console.c
@@ -106,8 +106,8 @@ cn_drvinit(void *unused)
 
 SYSINIT(cndev, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, cn_drvinit, NULL);
 
-static int	stdin;
-static int	stdout;
+static pcell_t	stdin;
+static pcell_t	stdout;
 
 static int
 ofwtty_open(struct tty *tp)
@@ -170,12 +170,12 @@ ofw_cnprobe(struct consdev *cp)
 		return;
 	}
 
-	if (OF_getprop(chosen, "stdin", &stdin, sizeof(stdin)) == -1) {
+	if (OF_getencprop(chosen, "stdin", &stdin, sizeof(stdin)) == -1) {
 		cp->cn_pri = CN_DEAD;
 		return;
 	}
 
-	if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == -1) {
+	if (OF_getencprop(chosen, "stdout", &stdout, sizeof(stdout)) == -1) {
 		cp->cn_pri = CN_DEAD;
 		return;
 	}
diff --git a/sys/dev/ofw/ofw_fdt.c b/sys/dev/ofw/ofw_fdt.c
index 7b3b0e98dab..617d2a3ba24 100644
--- a/sys/dev/ofw/ofw_fdt.c
+++ b/sys/dev/ofw/ofw_fdt.c
@@ -137,26 +137,6 @@ fdt_phandle_offset(phandle_t p)
 	return (pint - dtoff);
 }
 
-static int
-fdt_pointer_offset(const void *ptr)
-{
-	uintptr_t dt_struct, p;
-	int offset;
-
-	p = (uintptr_t)ptr;
-	dt_struct = (uintptr_t)fdtp + fdt_off_dt_struct(fdtp);
-
-	if ((p < dt_struct) ||
-	    p > (dt_struct + fdt_size_dt_struct(fdtp)))
-		return (-1);
-
-	offset = p - dt_struct;
-	if (offset < 0)
-		return (-1);
-
-	return (offset);
-}
-
 /* Return the next sibling of this node or 0. */
 static phandle_t
 ofw_fdt_peer(ofw_t ofw, phandle_t node)
@@ -226,20 +206,9 @@ ofw_fdt_parent(ofw_t ofw, phandle_t node)
 static phandle_t
 ofw_fdt_instance_to_package(ofw_t ofw, ihandle_t instance)
 {
-	int offset;
 
-	/*
-	 * Note: FDT does not have the notion of instances, but we somewhat
-	 * abuse the semantics and let treat as 'instance' the internal
-	 * 'phandle' prop, so that ofw I/F consumers have a uniform way of
-	 * translation between internal representation (which appear in some
-	 * contexts as property values) and effective phandles.
-	 */
-	offset = fdt_node_offset_by_phandle(fdtp, instance);
-	if (offset < 0)
-		return (-1);
-
-	return (fdt_offset_phandle(offset));
+	/* Where real OF uses ihandles in the tree, FDT uses xref phandles */
+	return (OF_xref_phandle(instance));
 }
 
 /* Get the length of a property of a package. */
@@ -297,70 +266,53 @@ ofw_fdt_getprop(ofw_t ofw, phandle_t package, const char *propname, void *buf,
 	return (len);
 }
 
-static int
-fdt_nextprop(int offset, char *buf, size_t size)
-{
-	const struct fdt_property *prop;
-	const char *name;
-	uint32_t tag;
-	int nextoffset, depth;
-
-	depth = 0;
-	tag = fdt_next_tag(fdtp, offset, &nextoffset);
-
-	/* Find the next prop */
-	do {
-		offset = nextoffset;
-		tag = fdt_next_tag(fdtp, offset, &nextoffset);
-
-		if (tag == FDT_BEGIN_NODE)
-			depth++;
-		else if (tag == FDT_END_NODE)
-			depth--;
-		else if ((tag == FDT_PROP) && (depth == 0)) {
-			prop =
-			    (const struct fdt_property *)fdt_offset_ptr(fdtp,
-			    offset, sizeof(*prop));
-			name = fdt_string(fdtp,
-			    fdt32_to_cpu(prop->nameoff));
-			strncpy(buf, name, size);
-			return (strlen(name));
-		} else
-			depth = -1;
-	} while (depth >= 0);
-
-	return (-1);
-}
-
 /*
- * Get the next property of a package. Return the actual len of retrieved
- * prop name.
+ * Get the next property of a package. Return values:
+ *  -1: package or previous property does not exist
+ *   0: no more properties
+ *   1: success
  */
 static int
 ofw_fdt_nextprop(ofw_t ofw, phandle_t package, const char *previous, char *buf,
     size_t size)
 {
 	const struct fdt_property *prop;
-	int offset, rv;
+	const char *name;
+	int offset;
 
 	offset = fdt_phandle_offset(package);
 	if (offset < 0)
 		return (-1);
 
-	if (previous == NULL)
-		/* Find the first prop in the node */
-		return (fdt_nextprop(offset, buf, size));
+	/* Find the first prop in the node */
+	offset = fdt_first_property_offset(fdtp, offset);
+	if (offset < 0)
+		return (0); /* No properties */
 
-	/*
-	 * Advance to the previous prop
-	 */
-	prop = fdt_get_property(fdtp, offset, previous, NULL);
+	if (previous != NULL) {
+		while (offset >= 0) {
+			prop = fdt_get_property_by_offset(fdtp, offset, NULL);
+			if (prop == NULL)
+				return (-1); /* Internal error */
+
+			offset = fdt_next_property_offset(fdtp, offset);
+			if (offset < 0)
+				return (0); /* No more properties */
+
+			/* Check if the last one was the one we wanted */
+			name = fdt_string(fdtp, fdt32_to_cpu(prop->nameoff));
+			if (strcmp(name, previous) == 0)
+				break;
+		}
+	}
+
+	prop = fdt_get_property_by_offset(fdtp, offset, &offset);
 	if (prop == NULL)
-		return (-1);
+		return (-1); /* Internal error */
 
-	offset = fdt_pointer_offset(prop);
-	rv = fdt_nextprop(offset, buf, size);
-	return (rv);
+	strncpy(buf, fdt_string(fdtp, fdt32_to_cpu(prop->nameoff)), size);
+
+	return (1);
 }
 
 /* Set the value of a property of a package. */
@@ -401,8 +353,13 @@ ofw_fdt_finddevice(ofw_t ofw, const char *device)
 static ssize_t
 ofw_fdt_instance_to_path(ofw_t ofw, ihandle_t instance, char *buf, size_t len)
 {
+	phandle_t phandle;
 
-	return (-1);
+	phandle = OF_instance_to_package(instance);
+	if (phandle == -1)
+		return (-1);
+
+	return (OF_package_to_path(phandle, buf, len));
 }
 
 /* Return the fully qualified pathname corresponding to a package. */
diff --git a/sys/dev/ofw/ofw_iicbus.c b/sys/dev/ofw/ofw_iicbus.c
index f6cafb1669c..965721a8714 100644
--- a/sys/dev/ofw/ofw_iicbus.c
+++ b/sys/dev/ofw/ofw_iicbus.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/mutex.h>
 
-#include <dev/fdt/fdt_common.h>
 #include <dev/iicbus/iicbus.h>
 #include <dev/iicbus/iiconf.h>
 #include <dev/ofw/ofw_bus.h>
@@ -104,7 +103,6 @@ ofw_iicbus_attach(device_t dev)
 	phandle_t child;
 	pcell_t paddr;
 	device_t childdev;
-	uint32_t addr;
 
 	sc->dev = dev;
 	mtx_init(&sc->lock, "iicbus", NULL, MTX_DEF);
@@ -123,11 +121,12 @@ ofw_iicbus_attach(device_t dev)
 		 * property, then try the reg property.  It moves around
 		 * on different systems.
 		 */
-		if (OF_getprop(child, "i2c-address", &paddr, sizeof(paddr)) == -1)
-			if (OF_getprop(child, "reg", &paddr, sizeof(paddr)) == -1)
+		if (OF_getencprop(child, "i2c-address", &paddr,
+		    sizeof(paddr)) == -1)
+			if (OF_getencprop(child, "reg", &paddr,
+			    sizeof(paddr)) == -1)
 				continue;
 
-		addr = fdt32_to_cpu(paddr);
 		/*
 		 * Now set up the I2C and OFW bus layer devinfo and add it
 		 * to the bus.
@@ -136,7 +135,7 @@ ofw_iicbus_attach(device_t dev)
 		    M_NOWAIT | M_ZERO);
 		if (dinfo == NULL)
 			continue;
-		dinfo->opd_dinfo.addr = addr;
+		dinfo->opd_dinfo.addr = paddr;
 		if (ofw_bus_gen_setup_devinfo(&dinfo->opd_obdinfo, child) !=
 		    0) {
 			free(dinfo, M_DEVBUF);
diff --git a/sys/dev/ofw/ofw_nexus.c b/sys/dev/ofw/ofw_nexus.c
new file mode 100644
index 00000000000..f602bfec874
--- /dev/null
+++ b/sys/dev/ofw/ofw_nexus.c
@@ -0,0 +1,503 @@
+/*-
+ * Copyright 1998 Massachusetts Institute of Technology
+ * Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>.
+ * Copyright 2006 by Marius Strobl <marius@FreeBSD.org>.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby
+ * granted, provided that both the above copyright notice and this
+ * permission notice appear in all copies, that both the above
+ * copyright notice and this permission notice appear in all
+ * supporting documentation, and that the name of M.I.T. not be used
+ * in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  M.I.T. makes
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ *
+ * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
+ * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
+ * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (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: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
+ */
+
+#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/pcpu.h>
+#include <sys/rman.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/ofw/ofw_nexus.h>
+#include <dev/ofw/openfirm.h>
+
+#include <machine/bus.h>
+#include <machine/resource.h>
+
+/*
+ * The nexus (which is a pseudo-bus actually) iterates over the nodes that
+ * hang from the Open Firmware root node and adds them as devices to this bus
+ * (except some special nodes which are excluded) so that drivers can be
+ * attached to them.
+ *
+ * Additionally, interrupt setup/teardown and some resource management are
+ * done at this level.
+ *
+ */
+
+struct nexus_devinfo {
+	struct ofw_bus_devinfo	ndi_obdinfo;
+	struct resource_list	ndi_rl;
+};
+
+static device_probe_t nexus_probe;
+static device_attach_t nexus_attach;
+static bus_print_child_t nexus_print_child;
+static bus_add_child_t nexus_add_child;
+static bus_probe_nomatch_t nexus_probe_nomatch;
+static bus_alloc_resource_t nexus_alloc_resource;
+static bus_adjust_resource_t nexus_adjust_resource;
+static bus_release_resource_t nexus_release_resource;
+static bus_get_resource_list_t nexus_get_resource_list;
+static ofw_bus_get_devinfo_t nexus_get_devinfo;
+
+static int nexus_inlist(const char *, const char *const *);
+static struct nexus_devinfo * nexus_setup_dinfo(device_t, phandle_t);
+static void nexus_destroy_dinfo(struct nexus_devinfo *);
+static int nexus_print_res(struct nexus_devinfo *);
+
+static device_method_t nexus_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		nexus_probe),
+	DEVMETHOD(device_attach,	nexus_attach),
+	DEVMETHOD(device_detach,	bus_generic_detach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
+
+	/* Bus interface */
+	DEVMETHOD(bus_print_child,	nexus_print_child),
+	DEVMETHOD(bus_probe_nomatch,	nexus_probe_nomatch),
+	DEVMETHOD(bus_read_ivar,	bus_generic_read_ivar),
+	DEVMETHOD(bus_write_ivar,	bus_generic_write_ivar),
+	DEVMETHOD(bus_add_child,	nexus_add_child),
+	DEVMETHOD(bus_child_pnpinfo_str, ofw_bus_gen_child_pnpinfo_str),
+	DEVMETHOD(bus_alloc_resource,	nexus_alloc_resource),
+	DEVMETHOD(bus_adjust_resource,	nexus_adjust_resource),
+	DEVMETHOD(bus_release_resource,	nexus_release_resource),
+	DEVMETHOD(bus_set_resource,	bus_generic_rl_set_resource),
+	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
+	DEVMETHOD(bus_get_resource_list, nexus_get_resource_list),
+
+	/* ofw_bus interface */
+	DEVMETHOD(ofw_bus_get_devinfo,	nexus_get_devinfo),
+	DEVMETHOD(ofw_bus_get_compat,	ofw_bus_gen_get_compat),
+	DEVMETHOD(ofw_bus_get_model,	ofw_bus_gen_get_model),
+	DEVMETHOD(ofw_bus_get_name,	ofw_bus_gen_get_name),
+	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
+	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
+
+	DEVMETHOD_END
+};
+
+DEFINE_CLASS_0(ofw_nexus, ofw_nexus_driver, nexus_methods,
+    sizeof(struct ofw_nexus_softc));
+MODULE_VERSION(ofw_nexus, 1);
+
+static const char *const nexus_excl_name[] = {
+	"FJSV,system",
+	"aliases",
+	"associations",
+	"chosen",
+	"cmp",
+	"counter-timer",	/* No separate device; handled by psycho/sbus */
+	"failsafe",
+	"memory",
+	"openprom",
+	"options",
+	"packages",
+	"physical-memory",
+	"rsc",
+	"sgcn",
+	"todsg",
+	"virtual-memory",
+	NULL
+};
+
+static const char *const nexus_excl_type[] = {
+	"core",
+	"cpu",
+	NULL
+};
+
+static int
+nexus_inlist(const char *name, const char *const *list)
+{
+	int i;
+
+	if (name == NULL)
+		return (0);
+	for (i = 0; list[i] != NULL; i++)
+		if (strcmp(name, list[i]) == 0)
+			return (1);
+	return (0);
+}
+
+#define	NEXUS_EXCLUDED(name, type)					\
+	(nexus_inlist((name), nexus_excl_name) ||			\
+	((type) != NULL && nexus_inlist((type), nexus_excl_type)))
+
+static int
+nexus_probe(device_t dev)
+{
+
+	/* Nexus does always match. */
+	device_set_desc(dev, "Open Firmware Nexus device");
+	return (0);
+}
+
+static int
+nexus_attach(device_t dev)
+{
+	struct nexus_devinfo *ndi;
+	struct ofw_nexus_softc *sc;
+	device_t cdev;
+	phandle_t node;
+
+	sc = device_get_softc(dev);
+
+	node = OF_peer(0);
+
+	sc->sc_intr_rman.rm_type = RMAN_ARRAY;
+	sc->sc_intr_rman.rm_descr = "Interrupts";
+	sc->sc_mem_rman.rm_type = RMAN_ARRAY;
+	sc->sc_mem_rman.rm_descr = "Device Memory";
+	if (rman_init(&sc->sc_intr_rman) != 0 ||
+	    rman_init(&sc->sc_mem_rman) != 0 ||
+	    rman_manage_region(&sc->sc_intr_rman, 0, ~0) != 0 ||
+	    rman_manage_region(&sc->sc_mem_rman, 0, BUS_SPACE_MAXADDR) != 0)
+		panic("%s: failed to set up rmans.", __func__);
+
+	/*
+	 * Allow devices to identify.
+	 */
+	bus_generic_probe(dev);
+
+	/*
+	 * If no Open Firmware, bail early
+	 */
+	if (node == -1)
+		return (bus_generic_attach(dev));
+
+	/*
+	 * Some important numbers
+	 */
+	sc->acells = 2;
+	OF_getencprop(node, "#address-cells", &sc->acells, sizeof(sc->acells));
+	sc->scells = 1;
+	OF_getencprop(node, "#size-cells", &sc->scells, sizeof(sc->scells));
+
+	/*
+	 * Now walk the OFW tree and attach top-level devices.
+	 */
+	for (node = OF_child(node); node > 0; node = OF_peer(node)) {
+		if ((ndi = nexus_setup_dinfo(dev, node)) == NULL)
+			continue;
+		cdev = device_add_child(dev, NULL, -1);
+		if (cdev == NULL) {
+			device_printf(dev, "<%s>: device_add_child failed\n",
+			    ndi->ndi_obdinfo.obd_name);
+			nexus_destroy_dinfo(ndi);
+			continue;
+		}
+		device_set_ivars(cdev, ndi);
+	}
+	return (bus_generic_attach(dev));
+}
+
+static device_t
+nexus_add_child(device_t dev, u_int order, const char *name, int unit)
+{
+	device_t cdev;
+	struct nexus_devinfo *ndi;
+
+	cdev = device_add_child_ordered(dev, order, name, unit);
+	if (cdev == NULL)
+		return (NULL);
+
+	ndi = malloc(sizeof(*ndi), M_DEVBUF, M_WAITOK | M_ZERO);
+	ndi->ndi_obdinfo.obd_node = -1;
+	resource_list_init(&ndi->ndi_rl);
+	device_set_ivars(cdev, ndi);
+
+	return (cdev);
+}
+
+static int
+nexus_print_child(device_t bus, device_t child)
+{
+	int rv;
+
+	rv = bus_print_child_header(bus, child);
+	rv += nexus_print_res(device_get_ivars(child));
+	rv += bus_print_child_footer(bus, child);
+	return (rv);
+}
+
+static void
+nexus_probe_nomatch(device_t bus, device_t child)
+{
+	const char *name, *type;
+
+	if (!bootverbose)
+		return;
+
+	name = ofw_bus_get_name(child);
+	type = ofw_bus_get_type(child);
+
+	device_printf(bus, "<%s>",
+	    name != NULL ? name : "unknown");
+	nexus_print_res(device_get_ivars(child));
+	printf(" type %s (no driver attached)\n",
+	    type != NULL ? type : "unknown");
+}
+
+static struct resource *
+nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
+    u_long start, u_long end, u_long count, u_int flags)
+{
+	struct ofw_nexus_softc *sc;
+	struct rman *rm;
+	struct resource *rv;
+	struct resource_list_entry *rle;
+	int isdefault, passthrough;
+
+	isdefault = (start == 0UL && end == ~0UL);
+	passthrough = (device_get_parent(child) != bus);
+	sc = device_get_softc(bus);
+	rle = NULL;
+
+	if (!passthrough && isdefault) {
+		rle = resource_list_find(BUS_GET_RESOURCE_LIST(bus, child),
+		    type, *rid);
+		if (rle == NULL)
+			return (NULL);
+		if (rle->res != NULL)
+			panic("%s: resource entry is busy", __func__);
+		start = rle->start;
+		count = ulmax(count, rle->count);
+		end = ulmax(rle->end, start + count - 1);
+	}
+
+	switch (type) {
+	case SYS_RES_IRQ:
+		rm = &sc->sc_intr_rman;
+		break;
+	case SYS_RES_MEMORY:
+		rm = &sc->sc_mem_rman;
+		break;
+	default:
+		return (NULL);
+	}
+
+	rv = rman_reserve_resource(rm, start, end, count, flags & ~RF_ACTIVE,
+	    child);
+	if (rv == NULL)
+		return (NULL);
+	rman_set_rid(rv, *rid);
+
+	if ((flags & RF_ACTIVE) != 0 && bus_activate_resource(child, type,
+	    *rid, rv) != 0) {
+		rman_release_resource(rv);
+		return (NULL);
+	}
+
+	if (!passthrough && rle != NULL) {
+		rle->res = rv;
+		rle->start = rman_get_start(rv);
+		rle->end = rman_get_end(rv);
+		rle->count = rle->end - rle->start + 1;
+	}
+
+	return (rv);
+}
+
+static int
+nexus_adjust_resource(device_t bus, device_t child __unused, int type,
+    struct resource *r, u_long start, u_long end)
+{
+	struct ofw_nexus_softc *sc;
+	struct rman *rm;
+	device_t nexus;
+
+	nexus = bus;
+	while (strcmp(device_get_name(device_get_parent(nexus)), "root") != 0)
+		nexus = device_get_parent(nexus);
+	sc = device_get_softc(nexus);
+	switch (type) {
+	case SYS_RES_IRQ:
+		rm = &sc->sc_intr_rman;
+		break;
+	case SYS_RES_MEMORY:
+		rm = &sc->sc_mem_rman;
+		break;
+	default:
+		return (EINVAL);
+	}
+	if (rm == NULL)
+		return (ENXIO);
+	if (rman_is_region_manager(r, rm) == 0)
+		return (EINVAL);
+	return (rman_adjust_resource(r, start, end));
+}
+
+static int
+nexus_release_resource(device_t bus __unused, device_t child, int type,
+    int rid, struct resource *r)
+{
+	int error;
+
+	if ((rman_get_flags(r) & RF_ACTIVE) != 0) {
+		error = bus_deactivate_resource(child, type, rid, r);
+		if (error)
+			return (error);
+	}
+	return (rman_release_resource(r));
+}
+
+static struct resource_list *
+nexus_get_resource_list(device_t bus __unused, device_t child)
+{
+	struct nexus_devinfo *ndi;
+
+	ndi = device_get_ivars(child);
+	return (&ndi->ndi_rl);
+}
+
+static const struct ofw_bus_devinfo *
+nexus_get_devinfo(device_t bus __unused, device_t child)
+{
+	struct nexus_devinfo *ndi;
+
+	ndi = device_get_ivars(child);
+	return (&ndi->ndi_obdinfo);
+}
+
+static struct nexus_devinfo *
+nexus_setup_dinfo(device_t dev, phandle_t node)
+{
+	struct ofw_nexus_softc *sc;
+	struct nexus_devinfo *ndi;
+	uint32_t *reg, *intr, icells;
+	uint64_t phys, size;
+	phandle_t iparent;
+	int i, j;
+	int nintr;
+	int nreg;
+
+	sc = device_get_softc(dev);
+
+	ndi = malloc(sizeof(*ndi), M_DEVBUF, M_WAITOK | M_ZERO);
+	if (ofw_bus_gen_setup_devinfo(&ndi->ndi_obdinfo, node) != 0) {
+		free(ndi, M_DEVBUF);
+		return (NULL);
+	}
+	if (NEXUS_EXCLUDED(ndi->ndi_obdinfo.obd_name,
+	    ndi->ndi_obdinfo.obd_type)) {
+		ofw_bus_gen_destroy_devinfo(&ndi->ndi_obdinfo);
+		free(ndi, M_DEVBUF);
+		return (NULL);
+	}
+
+	resource_list_init(&ndi->ndi_rl);
+	nreg = OF_getencprop_alloc(node, "reg", sizeof(*reg), (void **)&reg);
+	if (nreg == -1)
+		nreg = 0;
+	if (nreg % (sc->acells + sc->scells) != 0) {
+		if (bootverbose)
+			device_printf(dev, "Malformed reg property on <%s>\n",
+			    ndi->ndi_obdinfo.obd_name);
+		nreg = 0;
+	}
+
+	for (i = 0; i < nreg; i += sc->acells + sc->scells) {
+		phys = size = 0;
+		for (j = 0; j < sc->acells; j++) {
+			phys <<= 32;
+			phys |= reg[i + j];
+		}
+		for (j = 0; j < sc->scells; j++) {
+			size <<= 32;
+			size |= reg[i + sc->acells + j];
+		}
+		/* Skip the dummy reg property of glue devices like ssm(4). */
+		if (size != 0)
+			resource_list_add(&ndi->ndi_rl, SYS_RES_MEMORY, i,
+			    phys, phys + size - 1, size);
+	}
+	free(reg, M_OFWPROP);
+
+	nintr = OF_getencprop_alloc(node, "interrupts",  sizeof(*intr),
+	    (void **)&intr);
+	if (nintr > 0) {
+		iparent = 0;
+		OF_searchencprop(node, "interrupt-parent", &iparent,
+		    sizeof(iparent));
+		OF_searchencprop(OF_xref_phandle(iparent), "#interrupt-cells",
+		    &icells, sizeof(icells));
+		for (i = 0; i < nintr; i+= icells) {
+			intr[i] = ofw_bus_map_intr(dev, iparent, intr[i]);
+			resource_list_add(&ndi->ndi_rl, SYS_RES_IRQ, i, intr[i],
+			    intr[i], 1);
+			if (icells > 1)
+				ofw_bus_config_intr(dev, intr[i], intr[i+1]);
+		}
+		free(intr, M_OFWPROP);
+	}
+
+	return (ndi);
+}
+
+static void
+nexus_destroy_dinfo(struct nexus_devinfo *ndi)
+{
+
+	resource_list_free(&ndi->ndi_rl);
+	ofw_bus_gen_destroy_devinfo(&ndi->ndi_obdinfo);
+	free(ndi, M_DEVBUF);
+}
+
+static int
+nexus_print_res(struct nexus_devinfo *ndi)
+{
+	int rv;
+
+	rv = 0;
+	rv += resource_list_print_type(&ndi->ndi_rl, "mem", SYS_RES_MEMORY,
+	    "%#lx");
+	rv += resource_list_print_type(&ndi->ndi_rl, "irq", SYS_RES_IRQ,
+	    "%ld");
+	return (rv);
+}
+
diff --git a/sys/dev/ofw/ofw_nexus.h b/sys/dev/ofw/ofw_nexus.h
new file mode 100644
index 00000000000..e67b4a37d56
--- /dev/null
+++ b/sys/dev/ofw/ofw_nexus.h
@@ -0,0 +1,40 @@
+/*-
+ * Copyright (c) 2010 Marius Strobl <marius@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 _OFW_NEXUS_H_
+#define	_OFW_NEXUS_H_
+
+struct ofw_nexus_softc {
+	uint32_t	acells, scells;
+	struct rman	sc_intr_rman;
+	struct rman	sc_mem_rman;
+};
+
+DECLARE_CLASS(ofw_nexus_driver);
+
+#endif /* _OFW_NEXUS_H_ */
diff --git a/sys/dev/ofw/openfirm.c b/sys/dev/ofw/openfirm.c
index 0760854079c..97e6cbf9f76 100644
--- a/sys/dev/ofw/openfirm.c
+++ b/sys/dev/ofw/openfirm.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/systm.h>
+#include <sys/endian.h>
 
 #include <machine/stdarg.h>
 
@@ -134,7 +135,8 @@ OF_init(void *cookie)
 	rv = OFW_INIT(ofw_obj, cookie);
 
 	if ((chosen = OF_finddevice("/chosen")) != -1)
-		if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == -1)
+		if (OF_getencprop(chosen, "stdout", &stdout,
+		    sizeof(stdout)) == -1)
 			stdout = -1;
 
 	return (rv);
@@ -280,6 +282,21 @@ OF_getprop(phandle_t package, const char *propname, void *buf, size_t buflen)
 	return (OFW_GETPROP(ofw_obj, package, propname, buf, buflen));
 }
 
+ssize_t
+OF_getencprop(phandle_t node, const char *propname, pcell_t *buf, size_t len)
+{
+	ssize_t retval;
+	int i;
+
+	KASSERT(len % 4 == 0, ("Need a multiple of 4 bytes"));
+
+	retval = OF_getprop(node, propname, buf, len);
+	for (i = 0; i < len/4; i++)
+		buf[i] = be32toh(buf[i]);
+
+	return (retval);
+}
+
 /*
  * Recursively search the node and its parent for the given property, working
  * downward from the node to the device tree root.  Returns the value of the
@@ -296,6 +313,17 @@ OF_searchprop(phandle_t node, const char *propname, void *buf, size_t len)
 	return (-1);
 }
 
+ssize_t
+OF_searchencprop(phandle_t node, const char *propname, void *buf, size_t len)
+{
+	ssize_t rv;
+
+	for (; node != 0; node = OF_parent(node))
+		if ((rv = OF_getencprop(node, propname, buf, len)) != -1)
+			return (rv);
+	return (-1);
+}
+
 /*
  * Store the value of a property of a package into newly allocated memory
  * (using the M_OFWPROP malloc pool and M_WAITOK).  elsz is the size of a
@@ -320,6 +348,24 @@ OF_getprop_alloc(phandle_t package, const char *propname, int elsz, void **buf)
 	return (len / elsz);
 }
 
+ssize_t
+OF_getencprop_alloc(phandle_t package, const char *name, int elsz, void **buf)
+{
+	ssize_t retval;
+	pcell_t *cell;
+	int i;
+
+	retval = OF_getprop_alloc(package, name, elsz, buf);
+	if (retval == -1 || retval*elsz % 4 != 0)
+		return (-1);
+
+	cell = *buf;
+	for (i = 0; i < retval*elsz/4; i++)
+		cell[i] = be32toh(cell[i]);
+
+	return (retval);
+}
+
 /* Get the next property of a package. */
 int
 OF_nextprop(phandle_t package, const char *previous, char *buf, size_t size)
@@ -403,9 +449,9 @@ OF_child_xref_phandle(phandle_t parent, phandle_t xref)
 		if (rxref != -1)
 			return (rxref);
 
-		if (OF_getprop(child, "phandle", &rxref, sizeof(rxref)) == -1 &&
-		    OF_getprop(child, "ibm,phandle", &rxref,
-		    sizeof(rxref)) == -1 && OF_getprop(child,
+		if (OF_getencprop(child, "phandle", &rxref, sizeof(rxref)) ==
+		    -1 && OF_getencprop(child, "ibm,phandle", &rxref,
+		    sizeof(rxref)) == -1 && OF_getencprop(child,
 		    "linux,phandle", &rxref, sizeof(rxref)) == -1)
 			continue;
 
diff --git a/sys/dev/ofw/openfirm.h b/sys/dev/ofw/openfirm.h
index e6ede1d6a9b..5ac08fe1289 100644
--- a/sys/dev/ofw/openfirm.h
+++ b/sys/dev/ofw/openfirm.h
@@ -105,11 +105,17 @@ phandle_t	OF_parent(phandle_t node);
 ssize_t		OF_getproplen(phandle_t node, const char *propname);
 ssize_t		OF_getprop(phandle_t node, const char *propname, void *buf,
 		    size_t len);
+ssize_t		OF_getencprop(phandle_t node, const char *prop, pcell_t *buf,
+		    size_t len); /* Same as getprop, but maintains endianness */
 int		OF_hasprop(phandle_t node, const char *propname);
 ssize_t		OF_searchprop(phandle_t node, const char *propname, void *buf,
 		    size_t len);
+ssize_t		OF_searchencprop(phandle_t node, const char *propname,
+		    void *buf, size_t len);
 ssize_t		OF_getprop_alloc(phandle_t node, const char *propname,
 		    int elsz, void **buf);
+ssize_t		OF_getencprop_alloc(phandle_t node, const char *propname,
+		    int elsz, void **buf);
 int		OF_nextprop(phandle_t node, const char *propname, char *buf,
 		    size_t len);
 int		OF_setprop(phandle_t node, const char *name, const void *buf,
diff --git a/sys/dev/patm/if_patm.c b/sys/dev/patm/if_patm.c
index 7c0eefa8339..a09eeea151f 100644
--- a/sys/dev/patm/if_patm.c
+++ b/sys/dev/patm/if_patm.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/route.h>
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index 97b6b955c96..d93fd008162 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/sys/dev/patm/if_patm_attach.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/if_atm.h>
diff --git a/sys/dev/patm/if_patm_intr.c b/sys/dev/patm/if_patm_intr.c
index 12ef9958c1d..864fff5bfd5 100644
--- a/sys/dev/patm/if_patm_intr.c
+++ b/sys/dev/patm/if_patm_intr.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/route.h>
diff --git a/sys/dev/patm/if_patm_ioctl.c b/sys/dev/patm/if_patm_ioctl.c
index 2ed466d81f2..c12bd760593 100644
--- a/sys/dev/patm/if_patm_ioctl.c
+++ b/sys/dev/patm/if_patm_ioctl.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/route.h>
diff --git a/sys/dev/patm/if_patm_rx.c b/sys/dev/patm/if_patm_rx.c
index f739b9cfa4a..06a58c34b1c 100644
--- a/sys/dev/patm/if_patm_rx.c
+++ b/sys/dev/patm/if_patm_rx.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/route.h>
diff --git a/sys/dev/patm/if_patm_tx.c b/sys/dev/patm/if_patm_tx.c
index f17657d0269..1b4384496b9 100644
--- a/sys/dev/patm/if_patm_tx.c
+++ b/sys/dev/patm/if_patm_tx.c
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_atm.h>
 #include <net/route.h>
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index 701f1ea89bb..4d8837ff92c 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -70,10 +70,6 @@ __FBSDID("$FreeBSD$");
 #include "pcib_if.h"
 #include "pci_if.h"
 
-#if (BUS_SPACE_MAXADDR > 0xFFFFFFFF)
-#define	PCI_DMA_BOUNDARY	0x100000000
-#endif
-
 #define	PCIR_IS_BIOS(cfg, reg)						\
 	(((cfg)->hdrtype == PCIM_HDRTYPE_NORMAL && reg == PCIR_BIOS) ||	\
 	 ((cfg)->hdrtype == PCIM_HDRTYPE_BRIDGE && reg == PCIR_BIOS_1))
@@ -100,7 +96,6 @@ static void		pci_load_vendor_data(void);
 static int		pci_describe_parse_line(char **ptr, int *vendor,
 			    int *device, char **desc);
 static char		*pci_describe_device(device_t dev);
-static bus_dma_tag_t	pci_get_dma_tag(device_t bus, device_t dev);
 static int		pci_modevent(module_t mod, int what, void *arg);
 static void		pci_hdrtypedata(device_t pcib, int b, int s, int f,
 			    pcicfgregs *cfg);
diff --git a/sys/dev/pci/pci_private.h b/sys/dev/pci/pci_private.h
index bbec401982b..1502288146f 100644
--- a/sys/dev/pci/pci_private.h
+++ b/sys/dev/pci/pci_private.h
@@ -116,6 +116,7 @@ int		pci_child_pnpinfo_str_method(device_t cbdev, device_t child,
 int		pci_assign_interrupt_method(device_t dev, device_t child);
 int		pci_resume(device_t dev);
 int		pci_suspend(device_t dev);
+bus_dma_tag_t pci_get_dma_tag(device_t bus, device_t dev);
 
 /** Restore the config register state.  The state must be previously
  * saved with pci_cfg_save.  However, the pci bus driver takes care of
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 8db21ba7fd0..afd140ffce6 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -762,8 +762,17 @@
 #define	PCIEM_SLOT_STA_EIS		0x0080
 #define	PCIEM_SLOT_STA_DLLSC		0x0100
 #define	PCIER_ROOT_CTL		0x1c
+#define	PCIEM_ROOT_CTL_SERR_CORR	0x0001
+#define	PCIEM_ROOT_CTL_SERR_NONFATAL	0x0002
+#define	PCIEM_ROOT_CTL_SERR_FATAL	0x0004
+#define	PCIEM_ROOT_CTL_PME		0x0008
+#define	PCIEM_ROOT_CTL_CRS_VIS		0x0010
 #define	PCIER_ROOT_CAP		0x1e
+#define	PCIEM_ROOT_CAP_CRS_VIS		0x0001
 #define	PCIER_ROOT_STA		0x20
+#define	PCIEM_ROOT_STA_PME_REQID_MASK	0x0000ffff
+#define	PCIEM_ROOT_STA_PME_STATUS	0x00010000
+#define	PCIEM_ROOT_STA_PME_PEND		0x00020000
 #define	PCIER_DEVICE_CAP2	0x24
 #define	PCIER_DEVICE_CTL2	0x28
 #define	PCIEM_CTL2_COMP_TIMEOUT_VAL	0x000f
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index d733e3b6ced..8f93f96df4a 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -499,6 +499,15 @@ void	pci_restore_state(device_t dev);
 void	pci_save_state(device_t dev);
 int	pci_set_max_read_req(device_t dev, int size);
 
+
+#ifdef BUS_SPACE_MAXADDR
+#if (BUS_SPACE_MAXADDR > 0xFFFFFFFF)
+#define	PCI_DMA_BOUNDARY	0x100000000
+#else
+#define	PCI_DMA_BOUNDARY	0
+#endif
+#endif
+
 #endif	/* _SYS_BUS_H_ */
 
 /*
diff --git a/sys/dev/pcn/if_pcn.c b/sys/dev/pcn/if_pcn.c
index a9cff3c22fd..cd04b38899d 100644
--- a/sys/dev/pcn/if_pcn.c
+++ b/sys/dev/pcn/if_pcn.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c
index bcdbfc032e6..73c6caeebda 100644
--- a/sys/dev/pdq/if_fea.c
+++ b/sys/dev/pdq/if_fea.c
@@ -32,10 +32,11 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
-
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/bus.h>
 
 #include <machine/bus.h>
@@ -43,6 +44,7 @@
 #include <sys/rman.h> 
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/fddi.h>
 
diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index 3fe88add845..1701454d962 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h> 
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h> 
 #include <net/fddi.h>
 
diff --git a/sys/dev/pdq/pdq_freebsd.h b/sys/dev/pdq/pdq_freebsd.h
index 02bb9ca5ab6..78eeef912cd 100644
--- a/sys/dev/pdq/pdq_freebsd.h
+++ b/sys/dev/pdq/pdq_freebsd.h
@@ -53,6 +53,7 @@
 #include <sys/rman.h>
         
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c
index 00e42b0edec..b359b525345 100644
--- a/sys/dev/pdq/pdq_ifsubr.c
+++ b/sys/dev/pdq/pdq_ifsubr.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h> 
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h> 
diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
index 60fc2128392..dbc5183fe89 100644
--- a/sys/dev/ppbus/if_plip.c
+++ b/sys/dev/ppbus/if_plip.c
@@ -97,6 +97,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
 #include <net/route.h>
diff --git a/sys/dev/ppc/ppc_pci.c b/sys/dev/ppc/ppc_pci.c
index 0641dcdc77a..f2bd129b9c1 100644
--- a/sys/dev/ppc/ppc_pci.c
+++ b/sys/dev/ppc/ppc_pci.c
@@ -88,6 +88,7 @@ static struct pci_id pci_ids[] = {
 	{ 0x80001407, "Lava Computers 2SP-PCI parallel port", 0x10 },
 	{ 0x84031415, "Oxford Semiconductor OX12PCI840 Parallel port", 0x10 },
 	{ 0x95131415, "Oxford Semiconductor OX16PCI954 Parallel port", 0x10 },
+	{ 0xc1101415, "Oxford Semiconductor OXPCIe952 Parallel port", 0x10 },
 	{ 0x98059710, "NetMos NM9805 1284 Printer port", 0x10 },
 	{ 0x98659710, "MosChip MCS9865 1284 Printer port", 0x10 },
 	{ 0x99019710, "MosChip MCS9901 PCIe to Peripheral Controller", 0x10 },
diff --git a/sys/dev/qlxgb/qla_os.h b/sys/dev/qlxgb/qla_os.h
index a2f4343cbee..6c1e6f74b98 100644
--- a/sys/dev/qlxgb/qla_os.h
+++ b/sys/dev/qlxgb/qla_os.h
@@ -52,6 +52,7 @@
 #endif
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/qlxgbe/ql_hw.c b/sys/dev/qlxgbe/ql_hw.c
index 1a6e7040c3b..1d1e3f145b3 100644
--- a/sys/dev/qlxgbe/ql_hw.c
+++ b/sys/dev/qlxgbe/ql_hw.c
@@ -212,6 +212,12 @@ ql_hw_add_sysctls(qla_host_t *ha)
 		"Number of Rcv Rings Entries to post before updating"
 		" RDS Ring Producer Index");
 
+	ha->hw.min_lro_pkt_size = 512;
+	SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
+		SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
+		OID_AUTO, "min_lro_pkt_size", CTLFLAG_RD, &ha->hw.min_lro_pkt_size,
+		ha->hw.min_lro_pkt_size, "minimum packet size to trigger lro");
+
 	ha->hw.mdump_active = 0;
         SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev),
                 SYSCTL_CHILDREN(device_get_sysctl_tree(dev)),
@@ -1069,6 +1075,11 @@ qla_config_fw_lro(qla_host_t *ha, uint16_t cntxt_id)
 
 	fw_lro->cntxt_id = cntxt_id;
 
+	if (ha->hw.min_lro_pkt_size) {
+		fw_lro->flags |= Q8_MBX_FW_LRO_LOW_THRESHOLD;
+		fw_lro->low_threshold = ha->hw.min_lro_pkt_size;
+	}
+
 	if (qla_mbx_cmd(ha, (uint32_t *)fw_lro,
 		(sizeof (q80_config_fw_lro_t) >> 2),
 		ha->hw.mbox, (sizeof (q80_config_fw_lro_rsp_t) >> 2), 0)) {
diff --git a/sys/dev/qlxgbe/ql_hw.h b/sys/dev/qlxgbe/ql_hw.h
index 4b4dd83ef54..592853763d6 100644
--- a/sys/dev/qlxgbe/ql_hw.h
+++ b/sys/dev/qlxgbe/ql_hw.h
@@ -568,9 +568,13 @@ typedef struct _q80_config_fw_lro {
 #define Q8_MBX_FW_LRO_IPV6                     0x2
 #define Q8_MBX_FW_LRO_IPV4_WO_DST_IP_CHK       0x4
 #define Q8_MBX_FW_LRO_IPV6_WO_DST_IP_CHK       0x8
+#define Q8_MBX_FW_LRO_LOW_THRESHOLD            0x10
 
 	uint8_t		rsrvd;
 	uint16_t	cntxt_id;
+
+	uint16_t	low_threshold;
+	uint16_t	rsrvd0;
 } __packed q80_config_fw_lro_t;
 
 typedef struct _q80_config_fw_lro_rsp {
@@ -1521,6 +1525,7 @@ typedef struct _qla_hw {
 	uint32_t	health_count;
 
 	uint32_t	max_tx_segs;
+	uint32_t	min_lro_pkt_size;
 	
 	/* Flash Descriptor Table */
 	qla_flash_desc_table_t fdt;
diff --git a/sys/dev/qlxgbe/ql_ioctl.c b/sys/dev/qlxgbe/ql_ioctl.c
index 8ee74a50996..cc47e3f9f15 100644
--- a/sys/dev/qlxgbe/ql_ioctl.c
+++ b/sys/dev/qlxgbe/ql_ioctl.c
@@ -223,6 +223,13 @@ ql_eioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
 		}
 		
 		fw_dump = (qla_rd_fw_dump_t *)data;
+
+		if ((fw_dump->md_template == NULL) ||
+			(fw_dump->template_size != ha->hw.dma_buf.minidump.size)) {
+			rval = EINVAL;
+			break;
+		}
+
 		if ((rval = copyout(ha->hw.dma_buf.minidump.dma_b,
 			fw_dump->md_template, fw_dump->template_size)))
 			rval = ENXIO;
diff --git a/sys/dev/qlxgbe/ql_os.h b/sys/dev/qlxgbe/ql_os.h
index b6a9f3f06a7..bcbafff7513 100644
--- a/sys/dev/qlxgbe/ql_os.h
+++ b/sys/dev/qlxgbe/ql_os.h
@@ -53,6 +53,7 @@
 #endif
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/qlxge/qls_dump.c b/sys/dev/qlxge/qls_dump.c
index 44866ac077a..f829a85e3cf 100644
--- a/sys/dev/qlxge/qls_dump.c
+++ b/sys/dev/qlxge/qls_dump.c
@@ -111,7 +111,7 @@ enum
 	Q81_PAUSE_FRM_DEST_LO          = 0x00000128,
 	Q81_PAUSE_FRM_DEST_HI          = 0x0000012c,
 	Q81_MAC_TX_PARAMS              = 0x00000134,
-	Q81_MAC_TX_PARAMS_JUMBO        = (1 << 31),   /*Control*/
+	Q81_MAC_TX_PARAMS_JUMBO        = (1U << 31),   /*Control*/
 	Q81_MAC_TX_PARAMS_SIZE_SHIFT   = 16,          /*Control*/
 	Q81_MAC_RX_PARAMS              = 0x00000138,
 	Q81_MAC_SYS_INT                = 0x00000144,
diff --git a/sys/dev/qlxge/qls_ioctl.c b/sys/dev/qlxge/qls_ioctl.c
index 5afa7763198..6b39fc96781 100644
--- a/sys/dev/qlxge/qls_ioctl.c
+++ b/sys/dev/qlxge/qls_ioctl.c
@@ -100,13 +100,16 @@ qls_eioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag,
 		if (mpi_dump->size == 0) {
 			mpi_dump->size = sizeof (qls_mpi_coredump_t);
 		} else {
-			if (mpi_dump->size < sizeof (qls_mpi_coredump_t))
+			if ((mpi_dump->size != sizeof (qls_mpi_coredump_t)) ||
+				(mpi_dump->dbuf == NULL))
 				rval = EINVAL;
 			else {
-				qls_mpi_core_dump(ha);
-				rval = copyout( &ql_mpi_coredump,
-						mpi_dump->dbuf,
-						mpi_dump->size);
+				if (qls_mpi_core_dump(ha) == 0) {
+					rval = copyout(&ql_mpi_coredump,
+							mpi_dump->dbuf,
+							mpi_dump->size);
+				} else 
+					rval = ENXIO;
 
 				if (rval) {
 					device_printf(ha->pci_dev,
diff --git a/sys/dev/qlxge/qls_os.h b/sys/dev/qlxge/qls_os.h
index eba9bf55d93..c72410745e4 100644
--- a/sys/dev/qlxge/qls_os.h
+++ b/sys/dev/qlxge/qls_os.h
@@ -53,6 +53,7 @@
 #endif
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c
index 7c1b9de490f..846d1797e38 100644
--- a/sys/dev/ral/rt2560.c
+++ b/sys/dev/ral/rt2560.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ral/rt2560reg.h b/sys/dev/ral/rt2560reg.h
index 8e501b4c223..6860d1ea082 100644
--- a/sys/dev/ral/rt2560reg.h
+++ b/sys/dev/ral/rt2560reg.h
@@ -268,7 +268,7 @@ struct rt2560_rx_desc {
 #define RT2560_BBP_BUSY		(1 << 15)
 #define RT2560_BBP_WRITE	(1 << 16)
 #define RT2560_RF_20BIT		(20 << 24)
-#define RT2560_RF_BUSY		(1 << 31)
+#define RT2560_RF_BUSY		(1U << 31)
 
 #define RT2560_RF_2522	0x00
 #define RT2560_RF_2523	0x01
diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c
index 70c30f13c4d..4c1dc565a2a 100644
--- a/sys/dev/ral/rt2661.c
+++ b/sys/dev/ral/rt2661.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ral/rt2661reg.h b/sys/dev/ral/rt2661reg.h
index b4325b053d3..3bed3d12dd2 100644
--- a/sys/dev/ral/rt2661reg.h
+++ b/sys/dev/ral/rt2661reg.h
@@ -182,7 +182,7 @@
 
 /* possible flags for register PHY_CSR4 */
 #define RT2661_RF_21BIT	(21 << 24)
-#define RT2661_RF_BUSY	(1 << 31)
+#define RT2661_RF_BUSY	(1U << 31)
 
 /* possible values for register STA_CSR4 */
 #define RT2661_TX_STAT_VALID	(1 << 0)
diff --git a/sys/dev/ral/rt2860.c b/sys/dev/ral/rt2860.c
index 3bdd01dc82c..300ffc8d940 100644
--- a/sys/dev/ral/rt2860.c
+++ b/sys/dev/ral/rt2860.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ral/rt2860reg.h b/sys/dev/ral/rt2860reg.h
index 06c275d47f0..fe9fb4f3899 100644
--- a/sys/dev/ral/rt2860reg.h
+++ b/sys/dev/ral/rt2860reg.h
@@ -258,7 +258,7 @@
 #define RT2860_TX_DMA_EN		(1 << 0)
 
 /* possible flags for register DELAY_INT_CFG */
-#define RT2860_TXDLY_INT_EN		(1 << 31)
+#define RT2860_TXDLY_INT_EN		(1U << 31)
 #define RT2860_TXMAX_PINT_SHIFT		24
 #define RT2860_TXMAX_PTIME_SHIFT	16
 #define RT2860_RXDLY_INT_EN		(1 << 15)
@@ -270,7 +270,7 @@
 #define RT2860_GPIO_O_SHIFT	0
 
 /* possible flags for register USB_DMA_CFG */
-#define RT2860_USB_TX_BUSY		(1 << 31)
+#define RT2860_USB_TX_BUSY		(1U << 31)
 #define RT2860_USB_RX_BUSY		(1 << 30)
 #define RT2860_USB_EPOUT_VLD_SHIFT	24
 #define RT2860_USB_TX_EN		(1 << 23)
@@ -370,7 +370,7 @@
 #define RT2860_TX0Q_PCNT_MASK	0x000000ff
 
 /* possible flags for register CAP_CTRL */
-#define RT2860_CAP_ADC_FEQ		(1 << 31)
+#define RT2860_CAP_ADC_FEQ		(1U << 31)
 #define RT2860_CAP_START		(1 << 30)
 #define RT2860_MAN_TRIG			(1 << 29)
 #define RT2860_TRIG_OFFSET_SHIFT	16
@@ -381,7 +381,7 @@
 #define RT3070_RF_WRITE		(1 << 16)
 
 /* possible flags for register EFUSE_CTRL */
-#define RT3070_SEL_EFUSE	(1 << 31)
+#define RT3070_SEL_EFUSE	(1U << 31)
 #define RT3070_EFSROM_KICK	(1 << 30)
 #define RT3070_EFSROM_AIN_MASK	0x03ff0000
 #define RT3070_EFSROM_AIN_SHIFT	16
@@ -420,7 +420,7 @@
 #define RT2860_BBP_DATA_SHIFT		0
 
 /* possible flags for register RF_CSR_CFG0 */
-#define RT2860_RF_REG_CTRL		(1 << 31)
+#define RT2860_RF_REG_CTRL		(1U << 31)
 #define RT2860_RF_LE_SEL1		(1 << 30)
 #define RT2860_RF_LE_STBY		(1 << 29)
 #define RT2860_RF_REG_WIDTH_SHIFT	24
@@ -455,7 +455,7 @@
 #define RT2860_SLOT_TIME		0
 
 /* possible flags for register NAV_TIME_CFG */
-#define RT2860_NAV_UPD			(1 << 31)
+#define RT2860_NAV_UPD			(1U << 31)
 #define RT2860_NAV_UPD_VAL_SHIFT	16
 #define RT2860_NAV_CLR_EN		(1 << 15)
 #define RT2860_NAV_TIMER_SHIFT		0
@@ -509,7 +509,7 @@
 #define RT2860_WAKEUP_LEAD_TIME_SHIFT	0
 
 /* possible flags for register TX_PIN_CFG */
-#define RT3593_LNA_PE_G2_POL	(1 << 31)
+#define RT3593_LNA_PE_G2_POL	(1U << 31)
 #define RT3593_LNA_PE_A2_POL	(1 << 30)
 #define RT3593_LNA_PE_G2_EN	(1 << 29)
 #define RT3593_LNA_PE_A2_EN	(1 << 28)
diff --git a/sys/dev/random/pseudo_rng.c b/sys/dev/random/dummy_rng.c
similarity index 57%
rename from sys/dev/random/pseudo_rng.c
rename to sys/dev/random/dummy_rng.c
index 15cc7b3785d..810a784a3b1 100644
--- a/sys/dev/random/pseudo_rng.c
+++ b/sys/dev/random/dummy_rng.c
@@ -28,93 +28,92 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/time.h>
+#include <sys/fcntl.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/random.h>
 #include <sys/selinfo.h>
 #include <sys/systm.h>
+#include <sys/time.h>
 
 #include <dev/random/random_adaptors.h>
 #include <dev/random/randomdev.h>
 
-static struct mtx	pseudo_random_block_mtx;
+static struct mtx	dummy_random_mtx;
 
 /* Used to fake out unused random calls in random_adaptor */
-void
+static void
 random_null_func(void)
 {
 }
 
 static int
-pseudo_random_block_read(void *buf __unused, int c __unused)
+dummy_random_poll(int events __unused, struct thread *td __unused)
 {
 
-	mtx_lock(&pseudo_random_block_mtx);
-
-	printf("random(4) device is blocking.\n");
-	msleep(pseudo_random_block_read, &pseudo_random_block_mtx, 0,
-	    "block", 0);
-
-	mtx_unlock(&pseudo_random_block_mtx);
-
 	return (0);
 }
 
+static int
+dummy_random_block(int flag)
+{
+	int error = 0;
+
+	mtx_lock(&dummy_random_mtx);
+
+	/* Blocking logic */
+	while (!error) {
+		if (flag & O_NONBLOCK)
+			error = EWOULDBLOCK;
+		else {
+			printf("random: dummy device blocking on read.\n");
+			error = msleep(&dummy_random_block,
+			    &dummy_random_mtx,
+			    PUSER | PCATCH, "block", 0);
+		}
+	}
+	mtx_unlock(&dummy_random_mtx);
+
+	return (error);
+}
+
 static void
-pseudo_random_block_init(void)
+dummy_random_init(void)
 {
 
-	mtx_init(&pseudo_random_block_mtx, "sleep mtx for random_block",
+	mtx_init(&dummy_random_mtx, "sleep mtx for dummy_random",
 	    NULL, MTX_DEF);
 }
 
 static void
-pseudo_random_block_deinit(void)
+dummy_random_deinit(void)
 {
 
-	mtx_destroy(&pseudo_random_block_mtx);
+	mtx_destroy(&dummy_random_mtx);
 }
 
-struct random_adaptor pseudo_random_block = {
-	.ident = "pseudo-RNG that always blocks",
-	.init = pseudo_random_block_init,
-	.deinit = pseudo_random_block_deinit,
-	.read = pseudo_random_block_read,
-	.write = (random_write_func_t *)random_null_func,
+struct random_adaptor dummy_random = {
+	.ident = "Dummy entropy device that always blocks",
+	.init = dummy_random_init,
+	.deinit = dummy_random_deinit,
+	.block = dummy_random_block,
+	.poll = dummy_random_poll,
+	.read = (random_read_func_t *)random_null_func,
 	.reseed = (random_reseed_func_t *)random_null_func,
-	.seeded = 1,
+	.seeded = 0, /* This device can never be seeded */
+	.priority = 1, /* Bottom priority, so goes to last position */
 };
 
 static int
-pseudo_random_panic_read(void *buf, int c)
-{
-
-	panic("Insert a witty panic msg in here.");
-
-	return (0);
-}
-
-struct random_adaptor pseudo_random_panic = {
-	.ident = "pseudo-RNG that always panics on first read(2)",
-	.init = (random_init_func_t *)random_null_func,
-	.deinit = (random_deinit_func_t *)random_null_func,
-	.read = pseudo_random_panic_read,
-	.write = (random_write_func_t *)random_null_func,
-	.reseed = (random_reseed_func_t *)random_null_func,
-	.seeded = 1,
-};
-
-static int
-pseudo_random_modevent(module_t mod, int type, void *unused)
+dummy_random_modevent(module_t mod __unused, int type, void *unused __unused)
 {
 
 	switch (type) {
 	case MOD_LOAD:
-		random_adaptor_register("block", &pseudo_random_block);
+		random_adaptor_register("dummy", &dummy_random);
 		EVENTHANDLER_INVOKE(random_adaptor_attach,
-		    &pseudo_random_block);
-
-		random_adaptor_register("panic", &pseudo_random_panic);
+		    &dummy_random);
 
 		return (0);
 	}
@@ -122,4 +121,4 @@ pseudo_random_modevent(module_t mod, int type, void *unused)
 	return (EINVAL);
 }
 
-RANDOM_ADAPTOR_MODULE(pseudo, pseudo_random_modevent, 1);
+RANDOM_ADAPTOR_MODULE(dummy, dummy_random_modevent, 1);
diff --git a/sys/dev/random/harvest.c b/sys/dev/random/harvest.c
index 473e429317a..9dbae8449b3 100644
--- a/sys/dev/random/harvest.c
+++ b/sys/dev/random/harvest.c
@@ -48,20 +48,20 @@ __FBSDID("$FreeBSD$");
 static int read_random_phony(void *, int);
 
 /* Structure holding the desired entropy sources */
-struct harvest_select harvest = { 1, 1, 1, 0 };
+struct harvest_select harvest = { 1, 1, 1, 1 };
 static int warned = 0;
 
 /* hold the address of the routine which is actually called if
  * the randomdev is loaded
  */
-static void (*reap_func)(u_int64_t, const void *, u_int, u_int, u_int,
+static void (*reap_func)(u_int64_t, const void *, u_int, u_int,
     enum esource) = NULL;
 static int (*read_func)(void *, int) = read_random_phony;
 
 /* Initialise the harvester at load time */
 void
 randomdev_init_harvester(void (*reaper)(u_int64_t, const void *, u_int,
-    u_int, u_int, enum esource), int (*reader)(void *, int))
+    u_int, enum esource), int (*reader)(void *, int))
 {
 	reap_func = reaper;
 	read_func = reader;
@@ -86,12 +86,10 @@ randomdev_deinit_harvester(void)
  * read which can be quite expensive.
  */
 void
-random_harvest(void *entropy, u_int count, u_int bits, u_int frac,
-    enum esource origin)
+random_harvest(const void *entropy, u_int count, u_int bits, enum esource origin)
 {
 	if (reap_func)
-		(*reap_func)(get_cyclecount(), entropy, count, bits, frac,
-		    origin);
+		(*reap_func)(get_cyclecount(), entropy, count, bits, origin);
 }
 
 /* Userland-visible version of read_random */
diff --git a/sys/dev/random/hash.h b/sys/dev/random/hash.h
index 62f116daa00..4e6a4a0db83 100644
--- a/sys/dev/random/hash.h
+++ b/sys/dev/random/hash.h
@@ -26,6 +26,9 @@
  * $FreeBSD$
  */
 
+#ifndef SYS_DEV_RANDOM_HASH_H_INCLUDED
+#define SYS_DEV_RANDOM_HASH_H_INCLUDED
+
 #define	KEYSIZE		32	/* (in bytes) == 256 bits */
 #define	BLOCKSIZE	16	/* (in bytes) == 128 bits */
 
@@ -43,3 +46,5 @@ void randomdev_hash_iterate(struct randomdev_hash *, void *, size_t);
 void randomdev_hash_finish(struct randomdev_hash *, void *);
 void randomdev_encrypt_init(struct randomdev_key *, void *);
 void randomdev_encrypt(struct randomdev_key *context, void *, void *, unsigned);
+
+#endif
diff --git a/sys/dev/random/ivy.c b/sys/dev/random/ivy.c
index 07c87123acc..9b4001692ad 100644
--- a/sys/dev/random/ivy.c
+++ b/sys/dev/random/ivy.c
@@ -1,8 +1,12 @@
 /*-
+ * Copyright (c) 2013 The FreeBSD Foundation
  * Copyright (c) 2013 David E. O'Brien <obrien@NUXI.org>
  * Copyright (c) 2012 Konstantin Belousov <kib@FreeBSD.org>
  * All rights reserved.
  *
+ * Portions of this software were developed by Konstantin Belousov
+ * 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:
@@ -30,90 +34,68 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
-#include <sys/mutex.h>
+#include <sys/random.h>
 #include <sys/selinfo.h>
 #include <sys/systm.h>
 
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
-#include <dev/random/random_adaptors.h>
 #include <dev/random/randomdev.h>
+#include <dev/random/randomdev_soft.h>
+#include <dev/random/random_harvestq.h>
+#include <dev/random/live_entropy_sources.h>
+#include <dev/random/random_adaptors.h>
 
 #define	RETRY_COUNT	10
 
-static void random_ivy_init(void);
-static void random_ivy_deinit(void);
 static int random_ivy_read(void *, int);
 
-struct random_adaptor random_ivy = {
+static struct random_hardware_source random_ivy = {
 	.ident = "Hardware, Intel IvyBridge+ RNG",
-	.init = random_ivy_init,
-	.deinit = random_ivy_deinit,
-	.read = random_ivy_read,
-	.write = (random_write_func_t *)random_null_func,
-	.reseed = (random_reseed_func_t *)random_null_func,
-	.seeded = 1,
+	.source = RANDOM_PURE_RDRAND,
+	.read = random_ivy_read
 };
 
 static inline int
-ivy_rng_store(long *tmp)
+ivy_rng_store(long *buf)
 {
 #ifdef __GNUCLIKE_ASM
-	uint32_t count;
+	long tmp;
+	int retry;
 
+	retry = RETRY_COUNT;
 	__asm __volatile(
-#ifdef __amd64__
-	    ".byte\t0x48,0x0f,0xc7,0xf0\n\t" /* rdrand %rax */
-	    "jnc\t1f\n\t"
-	    "movq\t%%rax,%1\n\t"
-	    "movl\t$8,%%eax\n"
-#else /* i386 */
-	    ".byte\t0x0f,0xc7,0xf0\n\t" /* rdrand %eax */
-	    "jnc\t1f\n\t"
-	    "movl\t%%eax,%1\n\t"
-	    "movl\t$4,%%eax\n"
-#endif
-	    "1:\n"	/* %eax is cleared by processor on failure */
-	    : "=a" (count), "=g" (*tmp) : "a" (0) : "cc");
-	return (count);
+	    "1:\n\t"
+	    "rdrand	%2\n\t"	/* read randomness into tmp */
+	    "jb		2f\n\t" /* CF is set on success, exit retry loop */
+	    "dec	%0\n\t" /* otherwise, retry-- */
+	    "jne	1b\n\t" /* and loop if retries are not exhausted */
+	    "jmp	3f\n"	/* failure, retry is 0, used as return value */
+	    "2:\n\t"
+	    "mov	%2,%1\n\t" /* *buf = tmp */
+	    "3:"
+	    : "+q" (retry), "=m" (*buf), "=q" (tmp) : : "cc");
+	return (retry);
 #else /* __GNUCLIKE_ASM */
 	return (0);
 #endif
 }
 
-static void
-random_ivy_init(void)
-{
-}
-
-void
-random_ivy_deinit(void)
-{
-}
-
 static int
 random_ivy_read(void *buf, int c)
 {
-	char *b;
-	long tmp;
-	int count, res, retry;
+	long *b;
+	int count;
 
-	for (count = c, b = buf; count > 0; count -= res, b += res) {
-		for (retry = 0; retry < RETRY_COUNT; retry++) {
-			res = ivy_rng_store(&tmp);
-			if (res != 0)
-				break;
-		}
-		if (res == 0)
+	KASSERT(c % sizeof(long) == 0, ("partial read %d", c));
+	for (b = buf, count = c; count > 0; count -= sizeof(long), b++) {
+		if (ivy_rng_store(b) == 0)
 			break;
-		if (res > count)
-			res = count;
-		memcpy(b, &tmp, res);
 	}
 	return (c - count);
 }
@@ -121,25 +103,35 @@ random_ivy_read(void *buf, int c)
 static int
 rdrand_modevent(module_t mod, int type, void *unused)
 {
+	int error = 0;
 
 	switch (type) {
 	case MOD_LOAD:
-		if (cpu_feature2 & CPUID2_RDRAND) {
-			random_adaptor_register("rdrand", &random_ivy);
-			EVENTHANDLER_INVOKE(random_adaptor_attach, &random_ivy);
-			return (0);
-		} else {
+		if (cpu_feature2 & CPUID2_RDRAND)
+			live_entropy_source_register(&random_ivy);
+		else
 #ifndef KLD_MODULE
 			if (bootverbose)
 #endif
-				printf(
-			    "%s: RDRAND feature is not present on this CPU\n",
+				printf("%s: RDRAND is not present\n",
 				    random_ivy.ident);
-			return (0);
-		}
+		break;
+
+	case MOD_UNLOAD:
+		if (cpu_feature2 & CPUID2_RDRAND)
+			live_entropy_source_deregister(&random_ivy);
+		break;
+
+	case MOD_SHUTDOWN:
+		break;
+
+	default:
+		error = EOPNOTSUPP;
+		break;
+
 	}
 
-	return (EINVAL);
+	return (error);
 }
 
-RANDOM_ADAPTOR_MODULE(random_rdrand, rdrand_modevent, 1);
+LIVE_ENTROPY_SRC_MODULE(random_rdrand, rdrand_modevent, 1);
diff --git a/sys/dev/random/live_entropy_sources.c b/sys/dev/random/live_entropy_sources.c
new file mode 100644
index 00000000000..d406ebd2086
--- /dev/null
+++ b/sys/dev/random/live_entropy_sources.c
@@ -0,0 +1,195 @@
+/*-
+ * Copyright (c) 2013 Arthur Mesh <arthurmesh@gmail.com>
+ * Copyright (c) 2013 Mark R V Murray
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/param.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/kernel.h>
+#include <sys/libkern.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/queue.h>
+#include <sys/random.h>
+#include <sys/selinfo.h>
+#include <sys/sx.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
+#include <sys/unistd.h>
+
+#include <machine/cpu.h>
+
+#include <dev/random/randomdev.h>
+#include <dev/random/randomdev_soft.h>
+#include <dev/random/random_adaptors.h>
+#include <dev/random/random_harvestq.h>
+
+#include "live_entropy_sources.h"
+
+LIST_HEAD(les_head, live_entropy_sources);
+static struct les_head sources = LIST_HEAD_INITIALIZER(sources);
+
+/*
+ * The live_lock protects the consistency of the "struct les_head sources"
+ */
+static struct sx les_lock; /* need a sleepable lock */
+
+void
+live_entropy_source_register(struct random_hardware_source *rsource)
+{
+	struct live_entropy_sources *les;
+
+	KASSERT(rsource != NULL, ("invalid input to %s", __func__));
+
+	les = malloc(sizeof(struct live_entropy_sources), M_ENTROPY, M_WAITOK);
+	les->rsource = rsource;
+
+	sx_xlock(&les_lock);
+	LIST_INSERT_HEAD(&sources, les, entries);
+	sx_xunlock(&les_lock);
+}
+
+void
+live_entropy_source_deregister(struct random_hardware_source *rsource)
+{
+	struct live_entropy_sources *les = NULL;
+
+	KASSERT(rsource != NULL, ("invalid input to %s", __func__));
+
+	sx_xlock(&les_lock);
+	LIST_FOREACH(les, &sources, entries)
+		if (les->rsource == rsource) {
+			LIST_REMOVE(les, entries);
+			break;
+		}
+	sx_xunlock(&les_lock);
+	if (les != NULL)
+		free(les, M_ENTROPY);
+}
+
+static int
+live_entropy_source_handler(SYSCTL_HANDLER_ARGS)
+{
+	struct live_entropy_sources *les;
+	int error, count;
+
+	count = error = 0;
+
+	sx_slock(&les_lock);
+
+	if (LIST_EMPTY(&sources))
+		error = SYSCTL_OUT(req, "", 0);
+	else {
+		LIST_FOREACH(les, &sources, entries) {
+
+			error = SYSCTL_OUT(req, ",", count++ ? 1 : 0);
+			if (error)
+				break;
+
+			error = SYSCTL_OUT(req, les->rsource->ident, strlen(les->rsource->ident));
+			if (error)
+				break;
+		}
+	}
+
+	sx_sunlock(&les_lock);
+
+	return (error);
+}
+
+static void
+live_entropy_sources_init(void *unused)
+{
+
+	SYSCTL_PROC(_kern_random, OID_AUTO, live_entropy_sources,
+	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE,
+	    NULL, 0, live_entropy_source_handler, "",
+	    "List of Active Live Entropy Sources");
+
+	sx_init(&les_lock, "live_entropy_sources");
+}
+
+/*
+ * Run through all "live" sources reading entropy for the given
+ * number of rounds, which should be a multiple of the number
+ * of entropy accumulation pools in use; 2 for Yarrow and 32
+ * for Fortuna.
+ *
+ * BEWARE!!!
+ * This function runs inside the RNG thread! Don't do anything silly!
+ * Remember that we are NOT holding harvest_mtx on entry!
+ */
+void
+live_entropy_sources_feed(int rounds, event_proc_f entropy_processor)
+{
+	static struct harvest event;
+	static uint8_t buf[HARVESTSIZE];
+	struct live_entropy_sources *les;
+	int i, n;
+
+	sx_slock(&les_lock);
+
+	/*
+	 * Walk over all of live entropy sources, and feed their output
+	 * to the system-wide RNG.
+	 */
+	LIST_FOREACH(les, &sources, entries) {
+
+		for (i = 0; i < rounds; i++) {
+			/*
+			 * This should be quick, since it's a live entropy
+			 * source.
+			 */
+			/* FIXME: Whine loudly if this didn't work. */
+			n = les->rsource->read(buf, sizeof(buf));
+			n = MIN(n, HARVESTSIZE);
+
+			event.somecounter = get_cyclecount();
+			event.size = n;
+			event.bits = (n*8)/2;
+			event.source = les->rsource->source;
+			memcpy(event.entropy, buf, n);
+
+			/* Do the actual entropy insertion */
+			entropy_processor(&event);
+		}
+
+	}
+
+	sx_sunlock(&les_lock);
+}
+
+static void
+live_entropy_sources_deinit(void *unused)
+{
+
+	sx_destroy(&les_lock);
+}
+
+SYSINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST,
+    live_entropy_sources_init, NULL);
+SYSUNINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST,
+    live_entropy_sources_deinit, NULL);
diff --git a/sys/dev/random/live_entropy_sources.h b/sys/dev/random/live_entropy_sources.h
new file mode 100644
index 00000000000..9a23070fa63
--- /dev/null
+++ b/sys/dev/random/live_entropy_sources.h
@@ -0,0 +1,60 @@
+/*-
+ * Copyright (c) 2013 Arthur Mesh <arthurmesh@gmail.com>
+ * Copyright (c) 2013 Mark R V Murray
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 SYS_DEV_RANDOM_LIVE_ENTROPY_SOURCES_H_INCLUDED
+#define SYS_DEV_RANDOM_LIVE_ENTROPY_SOURCES_H_INCLUDED
+
+/*
+ * Live entropy source is a source of entropy that can provide
+ * specified or approximate amount of entropy immediately upon request or within
+ * an acceptable amount of time.
+ */
+struct live_entropy_sources {
+	LIST_ENTRY(live_entropy_sources) entries;	/* list of providers */
+	struct random_hardware_source	*rsource;	/* associated random adaptor */
+};
+
+extern struct mtx live_mtx;
+
+void live_entropy_source_register(struct random_hardware_source *);
+void live_entropy_source_deregister(struct random_hardware_source *);
+void live_entropy_sources_feed(int, event_proc_f);
+
+#define LIVE_ENTROPY_SRC_MODULE(name, modevent, ver)		\
+    static moduledata_t name##_mod = {				\
+	#name,							\
+	modevent,						\
+	0							\
+    };								\
+    DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS,		\
+		   SI_ORDER_SECOND);				\
+    MODULE_VERSION(name, ver);					\
+    MODULE_DEPEND(name, random, 1, 1, 1);
+
+#endif /* SYS_DEV_RANDOM_LIVE_ENTROPY_SOURCES_H_INCLUDED */
diff --git a/sys/dev/random/nehemiah.c b/sys/dev/random/nehemiah.c
index 1b4416eb19c..b60689e2bc6 100644
--- a/sys/dev/random/nehemiah.c
+++ b/sys/dev/random/nehemiah.c
@@ -1,6 +1,5 @@
 /*-
- * Copyright (c) 2013 David E. O'Brien <obrien@NUXI.org>
- * Copyright (c) 2004 Mark R V Murray
+ * Copyright (c) 2013 Mark R V Murray
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,209 +29,133 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/time.h>
+#include <sys/kernel.h>
 #include <sys/lock.h>
-#include <sys/mutex.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/random.h>
 #include <sys/selinfo.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>
 
+#include <machine/segments.h>
 #include <machine/pcb.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
-#include <dev/random/random_adaptors.h>
 #include <dev/random/randomdev.h>
-
-#define RANDOM_BLOCK_SIZE	256
-#define CIPHER_BLOCK_SIZE	16
+#include <dev/random/randomdev_soft.h>
+#include <dev/random/random_harvestq.h>
+#include <dev/random/live_entropy_sources.h>
+#include <dev/random/random_adaptors.h>
 
 static void random_nehemiah_init(void);
 static void random_nehemiah_deinit(void);
 static int random_nehemiah_read(void *, int);
 
-struct random_adaptor random_nehemiah = {
-	.ident = "Hardware, VIA Nehemiah",
-	.init = random_nehemiah_init,
-	.deinit = random_nehemiah_deinit,
-	.read = random_nehemiah_read,
-	.write = (random_write_func_t *)random_null_func,
-	.reseed = (random_reseed_func_t *)random_null_func,
-	.seeded = 1,
+static struct random_hardware_source random_nehemiah = {
+	.ident = "Hardware, VIA Nehemiah Padlock RNG",
+	.source = RANDOM_PURE_NEHEMIAH,
+	.read = random_nehemiah_read
 };
 
-union VIA_ACE_CW {
-	uint64_t raw;
-	struct {
-		u_int round_count : 4;
-		u_int algorithm_type : 3;
-		u_int key_generation_type : 1;
-		u_int intermediate : 1;
-		u_int decrypt : 1;
-		u_int key_size : 2;
-		u_int filler0 : 20;
-		u_int filler1 : 32;
-		u_int filler2 : 32;
-		u_int filler3 : 32;
-	} field;
-};
-
-/* The extra 7 is to allow an 8-byte write on the last byte of the
- * arrays.  The ACE wants the AES data 16-byte/128-bit aligned, and
- * it _always_ writes n*64 bits. The RNG does not care about alignment,
- * and it always writes n*32 bits or n*64 bits.
+/* TODO: now that the Davies-Meyer hash is gone and we only use
+ * the 'xstore' instruction, do we still need to preserve the
+ * FPU state with fpu_kern_(enter|leave)() ?
  */
-static uint8_t key[CIPHER_BLOCK_SIZE+7]	__aligned(16);
-static uint8_t iv[CIPHER_BLOCK_SIZE+7]	__aligned(16);
-static uint8_t in[RANDOM_BLOCK_SIZE+7]	__aligned(16);
-static uint8_t out[RANDOM_BLOCK_SIZE+7]	__aligned(16);
-
-static union VIA_ACE_CW acw		__aligned(16);
-
 static struct fpu_kern_ctx *fpu_ctx_save;
 
-static struct mtx random_nehemiah_mtx;
-
+/* This H/W source never stores more than 8 bytes in one go */
 /* ARGSUSED */
 static __inline size_t
 VIA_RNG_store(void *buf)
 {
-#ifdef __GNUCLIKE_ASM
 	uint32_t retval = 0;
 	uint32_t rate = 0;
 
-	/* The .byte line is really VIA C3 "xstore" instruction */
+#ifdef __GNUCLIKE_ASM
 	__asm __volatile(
-		"movl	$0,%%edx		\n\t"
-		".byte	0x0f, 0xa7, 0xc0"
+		"movl	$0,%%edx\n\t"
+		".byte	0x0f, 0xa7, 0xc0" /* xstore */
 			: "=a" (retval), "+d" (rate), "+D" (buf)
 			:
 			: "memory"
 	);
+#endif
 	if (rate == 0)
 		return (retval&0x1f);
-#endif
 	return (0);
 }
 
-/* ARGSUSED */
-static __inline void
-VIA_ACE_cbc(void *in, void *out, size_t count, void *key, union VIA_ACE_CW *cw, void *iv)
-{
-#ifdef __GNUCLIKE_ASM
-	/* The .byte line is really VIA C3 "xcrypt-cbc" instruction */
-	__asm __volatile(
-		"pushf				\n\t"
-		"popf				\n\t"
-		"rep				\n\t"
-		".byte	0x0f, 0xa7, 0xc8"
-			: "+a" (iv), "+c" (count), "+D" (out), "+S" (in)
-			: "b" (key), "d" (cw)
-			: "cc", "memory"
-		);
-#endif
-}
-
 static void
 random_nehemiah_init(void)
 {
-	acw.raw = 0ULL;
-	acw.field.round_count = 12;
 
-	mtx_init(&random_nehemiah_mtx, "random nehemiah", NULL, MTX_DEF);
 	fpu_ctx_save = fpu_kern_alloc_ctx(FPU_KERN_NORMAL);
 }
 
-void
+static void
 random_nehemiah_deinit(void)
 {
 
 	fpu_kern_free_ctx(fpu_ctx_save);
-	mtx_destroy(&random_nehemiah_mtx);
 }
 
 static int
 random_nehemiah_read(void *buf, int c)
 {
-	int i, error;
+	uint8_t *b;
 	size_t count, ret;
-	uint8_t *p;
+	uint64_t tmp;
 
-	mtx_lock(&random_nehemiah_mtx);
-	error = fpu_kern_enter(curthread, fpu_ctx_save, FPU_KERN_NORMAL);
-	if (error != 0) {
-		mtx_unlock(&random_nehemiah_mtx);
-		return (0);
+	if ((fpu_kern_enter(curthread, fpu_ctx_save, FPU_KERN_NORMAL) == 0)) {
+		b = buf;
+		for (count = c; count > 0; count -= ret) {
+			ret = MIN(VIA_RNG_store(&tmp), count);
+			memcpy(b, &tmp, ret);
+			b += ret;
+		}
+		fpu_kern_leave(curthread, fpu_ctx_save);
 	}
+	else
+		c = 0;
 
-	/* Get a random AES key */
-	count = 0;
-	p = key;
-	do {
-		ret = VIA_RNG_store(p);
-		p += ret;
-		count += ret;
-	} while (count < CIPHER_BLOCK_SIZE);
-
-	/* Get a random AES IV */
-	count = 0;
-	p = iv;
-	do {
-		ret = VIA_RNG_store(p);
-		p += ret;
-		count += ret;
-	} while (count < CIPHER_BLOCK_SIZE);
-
-	/* Get a block of random bytes */
-	count = 0;
-	p = in;
-	do {
-		ret = VIA_RNG_store(p);
-		p += ret;
-		count += ret;
-	} while (count < RANDOM_BLOCK_SIZE);
-
-	/* This is a Davies-Meyer hash of the most paranoid variety; the
-	 * key, IV and the data are all read directly from the hardware RNG.
-	 * All of these are used precisely once.
-	 */
-	VIA_ACE_cbc(in, out, RANDOM_BLOCK_SIZE/CIPHER_BLOCK_SIZE,
-	    key, &acw, iv);
-	for (i = 0; i < RANDOM_BLOCK_SIZE; i++)
-		out[i] ^= in[i];
-
-	c = MIN(RANDOM_BLOCK_SIZE, c);
-	memcpy(buf, out, (size_t)c);
-
-	fpu_kern_leave(curthread, fpu_ctx_save);
-	mtx_unlock(&random_nehemiah_mtx);
 	return (c);
 }
 
 static int
 nehemiah_modevent(module_t mod, int type, void *unused)
 {
+	int error = 0;
 
 	switch (type) {
 	case MOD_LOAD:
 		if (via_feature_rng & VIA_HAS_RNG) {
-			random_adaptor_register("nehemiah", &random_nehemiah);
-			EVENTHANDLER_INVOKE(random_adaptor_attach,
-			    &random_nehemiah);
-			return (0);
-		} else {
+			live_entropy_source_register(&random_nehemiah);
+			random_nehemiah_init();
+		} else
 #ifndef KLD_MODULE
 			if (bootverbose)
 #endif
-				printf(
-			    "%s: VIA RNG feature is not present on this CPU\n",
+				printf("%s: VIA Padlock RNG not present\n",
 				    random_nehemiah.ident);
-			return (0);
-		}
+		break;
+
+	case MOD_UNLOAD:
+		if (via_feature_rng & VIA_HAS_RNG)
+			random_nehemiah_deinit();
+			live_entropy_source_deregister(&random_nehemiah);
+		break;
+
+	case MOD_SHUTDOWN:
+		break;
+
+	default:
+		error = EOPNOTSUPP;
+		break;
+
 	}
 
-	return (EINVAL);
+	return (error);
 }
 
-RANDOM_ADAPTOR_MODULE(nehemiah, nehemiah_modevent, 1);
+LIVE_ENTROPY_SRC_MODULE(nehemiah, nehemiah_modevent, 1);
diff --git a/sys/dev/random/random_adaptors.c b/sys/dev/random/random_adaptors.c
index 43f55f22fe4..4f5ad2c1ebe 100644
--- a/sys/dev/random/random_adaptors.c
+++ b/sys/dev/random/random_adaptors.c
@@ -1,7 +1,7 @@
 /*-
  * Copyright (c) 2013 Arthur Mesh <arthurmesh@gmail.com>
  * Copyright (c) 2013 David E. O'Brien <obrien@NUXI.org>
- * Copyright (c) 2004 Mark R V Murray
+ * Copyright (c) 2013 Mark R V Murray
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,17 +29,17 @@
 #include <sys/param.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/libkern.h>
 #include <sys/lock.h>
-#include <sys/random.h>
-#include <sys/selinfo.h>
-#include <sys/sysctl.h>
-#include <sys/sx.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
-#include <sys/libkern.h>
+#include <sys/random.h>
+#include <sys/selinfo.h>
+#include <sys/sx.h>
+#include <sys/sysctl.h>
 #include <sys/unistd.h>
 
 #include <dev/random/randomdev.h>
@@ -55,7 +55,7 @@ static struct sysctl_ctx_list random_clist;
 
 struct random_adaptor *random_adaptor;
 
-MALLOC_DEFINE(M_RANDOM_ADAPTORS, "random_adaptors", "Random adaptors buffers");
+MALLOC_DEFINE(M_ENTROPY, "entropy", "Entropy harvesting buffers and data structures");
 
 int
 random_adaptor_register(const char *name, struct random_adaptor *rsp)
@@ -64,8 +64,7 @@ random_adaptor_register(const char *name, struct random_adaptor *rsp)
 
 	KASSERT(name != NULL && rsp != NULL, ("invalid input to %s", __func__));
 
-	rpp = malloc(sizeof(struct random_adaptors), M_RANDOM_ADAPTORS,
-	    M_WAITOK);
+	rpp = malloc(sizeof(struct random_adaptors), M_ENTROPY, M_WAITOK);
 	rpp->name = name;
 	rpp->rsp = rsp;
 
@@ -95,30 +94,6 @@ random_adaptor_get(const char *name)
 	return (rsp);
 }
 
-/*
- * In the past, the logic of the random_adaptor selection was inverted, such
- * that hardware RNGs would be chosen unless disabled. This routine is here to
- * preserve that functionality to avoid folks losing their hardware RNGs by
- * upgrading to newer kernel.
- */
-static void
-random_adaptor_choose_legacy(struct random_adaptor **adaptor)
-{
-	struct random_adaptor *tmp;
-	int enable;
-
-	/* Then go looking for hardware */
-	enable = 1;
-	TUNABLE_INT_FETCH("hw.nehemiah_rng_enable", &enable);
-	if (enable && (tmp = random_adaptor_get("nehemiah")))
-		*adaptor = tmp;
-
-	enable = 1;
-	TUNABLE_INT_FETCH("hw.ivy_rng_enable", &enable);
-	if (enable && (tmp = random_adaptor_get("rdrand")))
-		*adaptor = tmp;
-}
-
 /*
  * Walk a list of registered random(4) adaptors and pick the last non-selected
  * one.
@@ -129,52 +104,42 @@ void
 random_adaptor_choose(struct random_adaptor **adaptor)
 {
 	char			 rngs[128], *token, *cp;
-	struct random_adaptors  *rpp;
+	struct random_adaptors	*rppi, *ramax;
+	unsigned		 primax;
 
 	KASSERT(adaptor != NULL, ("pre-conditions failed"));
 
 	*adaptor = NULL;
-
-	random_adaptor_choose_legacy(adaptor);
-
-	if (*adaptor != NULL)
-		return;
-
-	if (TUNABLE_STR_FETCH("rngs_want", rngs, sizeof(rngs))) {
+	if (TUNABLE_STR_FETCH("kern.random.active_adaptor", rngs, sizeof(rngs))) {
 		cp = rngs;
 
-		while ((token = strsep(&cp, ",")) != NULL) {
+		while ((token = strsep(&cp, ",")) != NULL)
 			if ((*adaptor = random_adaptor_get(token)) != NULL)
 				break;
 			else if (bootverbose)
-				printf(
-			    "%s random adaptor is not available, skipping\n",
-				    token);
-		}
+				printf("%s random adaptor is not available,"
+				    " skipping\n", token);
 	}
 
+	primax = 0U;
 	if (*adaptor == NULL) {
 		/*
-		 * Either no RNGs are prefered via rngs_want tunable, or
-		 * no prefered RNGs are registered.
-		 * Fallback to Yarrow.
+		 * Fall back to the highest priority item on the available
+		 * RNG list.
 		 */
-		*adaptor = random_adaptor_get("yarrow");
+		sx_slock(&adaptors_lock);
 
-		if (*adaptor == NULL) {
-			/*
-			 * Yarrow doesn't seem to be available.
-			 * Fallback to the first thing that's on the list of
-			 * available RNGs.
-			 */
-			sx_slock(&adaptors_lock);
-
-			rpp = LIST_FIRST(&adaptors);
-			if (rpp != NULL)
-				*adaptor = rpp->rsp;
-
-			sx_sunlock(&adaptors_lock);
+		ramax = NULL;
+		LIST_FOREACH(rppi, &adaptors, entries) {
+			if (rppi->rsp->priority >= primax) {
+				ramax = rppi;
+				primax = rppi->rsp->priority;
+			}
 		}
+		if (ramax != NULL)
+			*adaptor = ramax->rsp;
+
+		sx_sunlock(&adaptors_lock);
 
 		if (bootverbose && *adaptor)
 			printf("Falling back to <%s> random adaptor\n",
@@ -200,19 +165,16 @@ random_sysctl_adaptors_handler(SYSCTL_HANDLER_ARGS)
 
 	sx_slock(&adaptors_lock);
 
-	if (LIST_EMPTY(&adaptors)) {
+	if (LIST_EMPTY(&adaptors))
 		error = SYSCTL_OUT(req, "", 0);
-	} else {
-
+	else {
 		LIST_FOREACH(rpp, &adaptors, entries) {
 
 			error = SYSCTL_OUT(req, ",", count++ ? 1 : 0);
-
 			if (error)
 				break;
 
 			error = SYSCTL_OUT(req, rpp->name, strlen(rpp->name));
-
 			if (error)
 				break;
 		}
@@ -237,19 +199,17 @@ random_sysctl_active_adaptor_handler(SYSCTL_HANDLER_ARGS)
 	if (rsp != NULL) {
 		sx_slock(&adaptors_lock);
 
-		LIST_FOREACH(rpp, &adaptors, entries) {
+		LIST_FOREACH(rpp, &adaptors, entries)
 			if (rpp->rsp == rsp)
 				name = rpp->name;
-		}
 
 		sx_sunlock(&adaptors_lock);
 	}
 
-	if (rsp == NULL || name == NULL) {
+	if (rsp == NULL || name == NULL)
 		error = SYSCTL_OUT(req, "", 0);
-	} else {
+	else
 		error = SYSCTL_OUT(req, name, strlen(name));
-	}
 
 	return (error);
 }
@@ -277,3 +237,15 @@ SYSINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST, random_adaptors_init,
     NULL);
 SYSUNINIT(random_adaptors, SI_SUB_DRIVERS, SI_ORDER_FIRST,
     random_adaptors_deinit, NULL);
+
+static void
+random_adaptors_reseed(void *unused)
+{
+
+	(void)unused;
+	if (random_adaptor != NULL)
+		(*random_adaptor->reseed)();
+	arc4rand(NULL, 0, 1);
+}
+SYSINIT(random_reseed, SI_SUB_INTRINSIC_POST, SI_ORDER_SECOND,
+    random_adaptors_reseed, NULL);
diff --git a/sys/dev/random/random_adaptors.h b/sys/dev/random/random_adaptors.h
index fa5f7c82883..4765694a452 100644
--- a/sys/dev/random/random_adaptors.h
+++ b/sys/dev/random/random_adaptors.h
@@ -26,11 +26,13 @@
  * $FreeBSD$
  */
 
-#ifndef __RANDOM_ADAPTORS_H__
-#define __RANDOM_ADAPTORS_H__
+#ifndef SYS_DEV_RANDOM_RANDOM_ADAPTORS_H_INCLUDED
+#define SYS_DEV_RANDOM_RANDOM_ADAPTORS_H_INCLUDED
 
 #include <sys/eventhandler.h>
 
+MALLOC_DECLARE(M_ENTROPY);
+
 struct random_adaptors {
 	LIST_ENTRY(random_adaptors) entries;	/* list of providers */
 	const char		*name;		/* name of random adaptor */
@@ -66,4 +68,4 @@ EVENTHANDLER_DECLARE(random_adaptor_attach, random_adaptor_attach_hook);
 SYSCTL_DECL(_kern_random);
 #endif /* SYSCTL_DECL */
 
-#endif /* __RANDOM_ADAPTORS_H__ */
+#endif /* SYS_DEV_RANDOM_RANDOM_ADAPTORS_H_INCLUDED */
diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c
index fc87cde0068..b7b8381c8eb 100644
--- a/sys/dev/random/random_harvestq.c
+++ b/sys/dev/random/random_harvestq.c
@@ -1,6 +1,6 @@
 /*-
+ * Copyright (c) 2000-2013 Mark R V Murray
  * Copyright (c) 2013 Arthur Mesh
- * Copyright (c) 2000-2009 Mark R V Murray
  * Copyright (c) 2004 Robert N. M. Watson
  * All rights reserved.
  *
@@ -25,34 +25,42 @@
  * (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 "opt_random.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/linker.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/random.h>
+#include <sys/selinfo.h>
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 
+#include <machine/cpu.h>
+#include <machine/vmparam.h>
+
+#include <dev/random/randomdev.h>
 #include <dev/random/randomdev_soft.h>
+#include <dev/random/random_adaptors.h>
+#include <dev/random/random_harvestq.h>
+#include <dev/random/live_entropy_sources.h>
+#include <dev/random/rwfile.h>
 
-#include "random_harvestq.h"
-
-#define RANDOM_FIFO_MAX	256	/* How many events to queue up */
-
-MALLOC_DEFINE(M_ENTROPY, "entropy", "Entropy harvesting buffers");
+#define RANDOM_FIFO_MAX	1024	/* How many events to queue up */
 
 /*
  * The harvest mutex protects the consistency of the entropy fifos and
- * empty fifo.
+ * empty fifo and other associated structures.
  */
 struct mtx	harvest_mtx;
 
@@ -65,24 +73,88 @@ struct entropyfifo {
 /* Empty entropy buffers */
 static struct entropyfifo emptyfifo;
 
-#define EMPTYBUFFERS	1024
-
 /* Harvested entropy */
-static struct entropyfifo harvestfifo[ENTROPYSOURCE];
+static struct entropyfifo harvestfifo;
 
 /* <0 to end the kthread, 0 to let it run, 1 to flush the harvest queues */
 int random_kthread_control = 0;
 
 static struct proc *random_kthread_proc;
 
+#ifdef RANDOM_RWFILE
+static const char *entropy_files[] = {
+	"/entropy",
+	NULL
+};
+#endif
+
+/* Deal with entropy cached externally if this is present.
+ * Lots of policy may eventually arrive in this function.
+ * Called after / is mounted.
+ */
+static void
+random_harvestq_cache(void *arg __unused)
+{
+	uint8_t *keyfile, *data;
+	size_t size, i;
+#ifdef RANDOM_RWFILE
+	const char **entropy_file;
+	uint8_t *zbuf;
+	int error;
+#endif
+
+	/* Get stuff that may have been preloaded by loader(8) */
+	keyfile = preload_search_by_type("/boot/entropy");
+	if (keyfile != NULL) {
+		data = preload_fetch_addr(keyfile);
+		size = preload_fetch_size(keyfile);
+		if (data != NULL && size != 0) {
+			for (i = 0; i < size; i += 16)
+				random_harvestq_internal(get_cyclecount(), data + i, 16, 16, RANDOM_CACHED);
+			printf("random: read %zu bytes from preloaded cache\n", size);
+			bzero(data, size);
+		}
+		else
+			printf("random: no preloaded entropy cache available\n");
+	}
+
+#ifdef RANDOM_RWFILE
+	/* Read and attempt to overwrite the entropy cache files.
+	 * If the file exists, can be read and then overwritten,
+	 * then use it. Ignore it otherwise, but print out what is
+	 * going on.
+	 */
+	data = malloc(PAGE_SIZE, M_ENTROPY, M_WAITOK);
+	zbuf = __DECONST(void *, zero_region);
+	for (entropy_file = entropy_files; *entropy_file; entropy_file++) {
+		error = randomdev_read_file(*entropy_file, data, PAGE_SIZE);
+		if (error == 0) {
+			printf("random: entropy cache '%s' provides %ld bytes\n", *entropy_file, (long)PAGE_SIZE);
+			error = randomdev_write_file(*entropy_file, zbuf, PAGE_SIZE);
+			if (error == 0) {
+				printf("random: entropy cache '%s' contents used and successfully overwritten\n", *entropy_file);
+				for (i = 0; i < PAGE_SIZE; i += 16)
+					random_harvestq_internal(get_cyclecount(), data + i, 16, 16, RANDOM_CACHED);
+			}
+			else
+				printf("random: entropy cache '%s' not overwritten and therefore not used; error = %d\n", *entropy_file, error);
+		}
+		else
+			printf("random: entropy cache '%s' not present or unreadable; error = %d\n", *entropy_file, error);
+	}
+	bzero(data, PAGE_SIZE);
+	free(data, M_ENTROPY);
+#endif
+}
+EVENTHANDLER_DEFINE(mountroot, random_harvestq_cache, NULL, 0);
+
 static void
 random_kthread(void *arg)
 {
 	STAILQ_HEAD(, harvest) local_queue;
 	struct harvest *event = NULL;
 	int local_count;
-	enum esource source;
-	event_proc_f func = arg;
+	event_proc_f entropy_processor = arg;
 
 	STAILQ_INIT(&local_queue);
 	local_count = 0;
@@ -91,26 +163,23 @@ random_kthread(void *arg)
 	mtx_lock_spin(&harvest_mtx);
 	for (; random_kthread_control >= 0;) {
 
-		/* Cycle through all the entropy sources */
-		for (source = RANDOM_START; source < ENTROPYSOURCE; source++) {
-			/*
-			 * Drain entropy source records into a thread-local
-			 * queue for processing while not holding the mutex.
-			 */
-			STAILQ_CONCAT(&local_queue, &harvestfifo[source].head);
-			local_count += harvestfifo[source].count;
-			harvestfifo[source].count = 0;
-		}
+		/*
+		 * Grab all the entropy events.
+		 * Drain entropy source records into a thread-local
+		 * queue for processing while not holding the mutex.
+		 */
+		STAILQ_CONCAT(&local_queue, &harvestfifo.head);
+		local_count += harvestfifo.count;
+		harvestfifo.count = 0;
 
 		/*
-		 * Deal with events, if any, dropping the mutex as we process
-		 * each event.  Then push the events back into the empty
-		 * fifo.
+		 * Deal with events, if any.
+		 * Then transfer the used events back into the empty fifo.
 		 */
 		if (!STAILQ_EMPTY(&local_queue)) {
 			mtx_unlock_spin(&harvest_mtx);
 			STAILQ_FOREACH(event, &local_queue, next)
-				func(event);
+				entropy_processor(event);
 			mtx_lock_spin(&harvest_mtx);
 			STAILQ_CONCAT(&emptyfifo.head, &local_queue);
 			emptyfifo.count += local_count;
@@ -120,16 +189,25 @@ random_kthread(void *arg)
 		KASSERT(local_count == 0, ("random_kthread: local_count %d",
 		    local_count));
 
+		/*
+		 * Do only one round of the hardware sources for now.
+		 * Later we'll need to make it rate-adaptive.
+		 */
+		mtx_unlock_spin(&harvest_mtx);
+		live_entropy_sources_feed(1, entropy_processor);
+		mtx_lock_spin(&harvest_mtx);
+
 		/*
 		 * If a queue flush was commanded, it has now happened,
 		 * and we can mark this by resetting the command.
 		 */
+
 		if (random_kthread_control == 1)
 			random_kthread_control = 0;
 
 		/* Work done, so don't belabour the issue */
 		msleep_spin_sbt(&random_kthread_control, &harvest_mtx,
-		    "-", SBT_1S / 10, 0, C_PREL(1));
+		    "-", SBT_1S/10, 0, C_PREL(1));
 
 	}
 	mtx_unlock_spin(&harvest_mtx);
@@ -143,23 +221,23 @@ random_harvestq_init(event_proc_f cb)
 {
 	int error, i;
 	struct harvest *np;
-	enum esource e;
 
 	/* Initialise the harvest fifos */
+
+	/* Contains the currently unused event structs. */
 	STAILQ_INIT(&emptyfifo.head);
-	emptyfifo.count = 0;
-	for (i = 0; i < EMPTYBUFFERS; i++) {
+	for (i = 0; i < RANDOM_FIFO_MAX; i++) {
 		np = malloc(sizeof(struct harvest), M_ENTROPY, M_WAITOK);
 		STAILQ_INSERT_TAIL(&emptyfifo.head, np, next);
 	}
-	for (e = RANDOM_START; e < ENTROPYSOURCE; e++) {
-		STAILQ_INIT(&harvestfifo[e].head);
-		harvestfifo[e].count = 0;
-	}
+	emptyfifo.count = RANDOM_FIFO_MAX;
+
+	/* Will contain the queued-up events. */
+	STAILQ_INIT(&harvestfifo.head);
+	harvestfifo.count = 0;
 
 	mtx_init(&harvest_mtx, "entropy harvest mutex", NULL, MTX_SPIN);
 
-
 	/* Start the hash/reseed thread */
 	error = kproc_create(random_kthread, cb,
 	    &random_kthread_proc, RFHIGHPID, 0, "rand_harvestq"); /* RANDOM_CSPRNG_NAME */
@@ -172,7 +250,6 @@ void
 random_harvestq_deinit(void)
 {
 	struct harvest *np;
-	enum esource e;
 
 	/* Destroy the harvest fifos */
 	while (!STAILQ_EMPTY(&emptyfifo.head)) {
@@ -180,72 +257,66 @@ random_harvestq_deinit(void)
 		STAILQ_REMOVE_HEAD(&emptyfifo.head, next);
 		free(np, M_ENTROPY);
 	}
-	for (e = RANDOM_START; e < ENTROPYSOURCE; e++) {
-		while (!STAILQ_EMPTY(&harvestfifo[e].head)) {
-			np = STAILQ_FIRST(&harvestfifo[e].head);
-			STAILQ_REMOVE_HEAD(&harvestfifo[e].head, next);
-			free(np, M_ENTROPY);
-		}
+	emptyfifo.count = 0;
+	while (!STAILQ_EMPTY(&harvestfifo.head)) {
+		np = STAILQ_FIRST(&harvestfifo.head);
+		STAILQ_REMOVE_HEAD(&harvestfifo.head, next);
+		free(np, M_ENTROPY);
 	}
+	harvestfifo.count = 0;
 
 	mtx_destroy(&harvest_mtx);
 }
 
 /*
- * Entropy harvesting routine. This is supposed to be fast; do
- * not do anything slow in here!
+ * Entropy harvesting routine.
+ * This is supposed to be fast; do not do anything slow in here!
+ *
+ * It is also illegal (and morally reprehensible) to insert any
+ * high-rate data here. "High-rate" is define as a data source
+ * that will usually cause lots of failures of the "Lockless read"
+ * check a few lines below. This includes the "always-on" sources
+ * like the Intel "rdrand" or the VIA Nehamiah "xstore" sources.
  */
 void
 random_harvestq_internal(u_int64_t somecounter, const void *entropy,
-    u_int count, u_int bits, u_int frac, enum esource origin)
+    u_int count, u_int bits, enum esource origin)
 {
 	struct harvest *event;
 
-	KASSERT(origin >= RANDOM_START && origin <= RANDOM_PURE,
+	KASSERT(origin >= RANDOM_START && origin < ENTROPYSOURCE,
 	    ("random_harvest_internal: origin %d invalid\n", origin));
 
 	/* Lockless read to avoid lock operations if fifo is full. */
-	if (harvestfifo[origin].count >= RANDOM_FIFO_MAX)
+	if (harvestfifo.count >= RANDOM_FIFO_MAX)
 		return;
 
 	mtx_lock_spin(&harvest_mtx);
 
 	/*
-	 * Don't make the harvest queues too big - help to prevent low-grade
-	 * entropy swamping
+	 * On't overfill the harvest queue; this could steal all
+	 * our memory.
 	 */
-	if (harvestfifo[origin].count < RANDOM_FIFO_MAX) {
+	if (harvestfifo.count < RANDOM_FIFO_MAX) {
 		event = STAILQ_FIRST(&emptyfifo.head);
 		if (event != NULL) {
 			/* Add the harvested data to the fifo */
 			STAILQ_REMOVE_HEAD(&emptyfifo.head, next);
-			harvestfifo[origin].count++;
+			emptyfifo.count--;
 			event->somecounter = somecounter;
 			event->size = count;
 			event->bits = bits;
-			event->frac = frac;
 			event->source = origin;
 
 			/* XXXX Come back and make this dynamic! */
 			count = MIN(count, HARVESTSIZE);
 			memcpy(event->entropy, entropy, count);
 
-#if 0
-			{
-			int i;
-			printf("Harvest:%16jX ", event->somecounter);
-			for (i = 0; i < event->size; i++)
-				printf("%02X", event->entropy[i]);
-			for (; i < 16; i++)
-				printf("  ");
-			printf(" %2d 0x%2X.%03X %02X\n", event->size, event->bits, event->frac, event->source);
-			}
-#endif
-
-			STAILQ_INSERT_TAIL(&harvestfifo[origin].head,
+			STAILQ_INSERT_TAIL(&harvestfifo.head,
 			    event, next);
+			harvestfifo.count++;
 		}
 	}
+
 	mtx_unlock_spin(&harvest_mtx);
 }
-
diff --git a/sys/dev/random/random_harvestq.h b/sys/dev/random/random_harvestq.h
index 9766c7728c4..a2ac3d1f91b 100644
--- a/sys/dev/random/random_harvestq.h
+++ b/sys/dev/random/random_harvestq.h
@@ -26,16 +26,17 @@
  * $FreeBSD$
  */
 
-#ifndef __RANDOM_HARVEST_H__
-#define __RANDOM_HARVEST_H__
+#ifndef SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED
+#define SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED
 
 typedef void (*event_proc_f)(struct harvest *event);
 
 void random_harvestq_init(event_proc_f);
 void random_harvestq_deinit(void);
 void random_harvestq_internal(u_int64_t, const void *,
-    u_int, u_int, u_int, enum esource);
+    u_int, u_int, enum esource);
 
 extern int random_kthread_control;
+extern struct mtx harvest_mtx;
 
-#endif /* __RANDOM_HARVEST_H__ */
+#endif /* SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED */
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 0f10e6c627f..b76cb839a02 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -1,6 +1,6 @@
 /*-
+ * Copyright (c) 2000-2013 Mark R V Murray
  * Copyright (c) 2013 Arthur Mesh <arthurmesh@gmail.com>
- * Copyright (c) 2000-2004 Mark R V Murray
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/poll.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
+#include <sys/random.h>
 #include <sys/selinfo.h>
 #include <sys/uio.h>
 #include <sys/unistd.h>
@@ -51,12 +52,14 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/random/random_adaptors.h>
 #include <dev/random/randomdev.h>
+#include <dev/random/randomdev_soft.h>
+#include <dev/random/random_adaptors.h>
+#include <dev/random/random_harvestq.h>
+#include <dev/random/live_entropy_sources.h>
 
 #define RANDOM_MINOR	0
 
-static d_close_t random_close;
 static d_read_t random_read;
 static d_write_t random_write;
 static d_ioctl_t random_ioctl;
@@ -64,7 +67,6 @@ static d_poll_t random_poll;
 
 static struct cdevsw random_cdevsw = {
 	.d_version = D_VERSION,
-	.d_close = random_close,
 	.d_read = random_read,
 	.d_write = random_write,
 	.d_ioctl = random_ioctl,
@@ -72,27 +74,9 @@ static struct cdevsw random_cdevsw = {
 	.d_name = "random",
 };
 
-static eventhandler_tag attach_tag;
-static int random_inited;
-
 /* For use with make_dev(9)/destroy_dev(9). */
 static struct cdev *random_dev;
 
-/* ARGSUSED */
-static int
-random_close(struct cdev *dev __unused, int flags, int fmt __unused,
-    struct thread *td)
-{
-	if ((flags & FWRITE) && (priv_check(td, PRIV_RANDOM_RESEED) == 0)
-	    && (securelevel_gt(td->td_ucred, 0) == 0)) {
-		(*random_adaptor->reseed)();
-		random_adaptor->seeded = 1;
-		arc4rand(NULL, 0, 1);	/* Reseed arc4random as well. */
-	}
-
-	return (0);
-}
-
 /* ARGSUSED */
 static int
 random_read(struct cdev *dev __unused, struct uio *uio, int flag)
@@ -107,15 +91,18 @@ random_read(struct cdev *dev __unused, struct uio *uio, int flag)
 	/* The actual read */
 	if (!error) {
 
-		random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
+		random_buf = (void *)malloc(PAGE_SIZE, M_ENTROPY, M_WAITOK);
 
 		while (uio->uio_resid > 0 && !error) {
 			c = MIN(uio->uio_resid, PAGE_SIZE);
 			c = (*random_adaptor->read)(random_buf, c);
 			error = uiomove(random_buf, c, uio);
 		}
+		/* Finished reading; let the source know so it can do some
+		 * optional housekeeping */
+		(*random_adaptor->read)(NULL, 0);
 
-		free(random_buf, M_TEMP);
+		free(random_buf, M_ENTROPY);
 
 	}
 
@@ -126,22 +113,16 @@ random_read(struct cdev *dev __unused, struct uio *uio, int flag)
 static int
 random_write(struct cdev *dev __unused, struct uio *uio, int flag __unused)
 {
-	int c, error = 0;
-	void *random_buf;
 
-	random_buf = (void *)malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
+	/* We used to allow this to insert userland entropy.
+	 * We don't any more because (1) this so-called entropy
+	 * is usually lousy and (b) its vaguely possible to
+	 * mess with entropy harvesting by overdoing a write.
+	 * Now we just ignore input like /dev/null does.
+	 */
+	uio->uio_resid = 0;
 
-	while (uio->uio_resid > 0) {
-		c = MIN((int)uio->uio_resid, PAGE_SIZE);
-		error = uiomove(random_buf, c, uio);
-		if (error)
-			break;
-		(*random_adaptor->write)(random_buf, c);
-	}
-
-	free(random_buf, M_TEMP);
-
-	return (error);
+	return (0);
 }
 
 /* ARGSUSED */
@@ -172,7 +153,7 @@ random_poll(struct cdev *dev __unused, int events, struct thread *td)
 		if (random_adaptor->seeded)
 			revents = events & (POLLIN | POLLRDNORM);
 		else
-			revents = (*random_adaptor->poll) (events,td);
+			revents = (*random_adaptor->poll)(events, td);
 	}
 	return (revents);
 }
@@ -180,6 +161,8 @@ random_poll(struct cdev *dev __unused, int events, struct thread *td)
 static void
 random_initialize(void *p, struct random_adaptor *s)
 {
+	static int random_inited = 0;
+
 	if (random_inited) {
 		printf("random: <%s> already initialized\n",
 		    random_adaptor->ident);
@@ -192,9 +175,11 @@ random_initialize(void *p, struct random_adaptor *s)
 
 	printf("random: <%s> initialized\n", s->ident);
 
+	/* Use an appropriately evil mode for those who are concerned
+	 * with daemons */
 	random_dev = make_dev_credf(MAKEDEV_ETERNAL_KLD, &random_cdevsw,
 	    RANDOM_MINOR, NULL, UID_ROOT, GID_WHEEL, 0666, "random");
-	make_dev_alias(random_dev, "urandom");	/* XXX Deprecated */
+	make_dev_alias(random_dev, "urandom"); /* compatibility */
 
 	/* mark random(4) as initialized, to avoid being called again */
 	random_inited = 1;
@@ -204,6 +189,7 @@ random_initialize(void *p, struct random_adaptor *s)
 static int
 random_modevent(module_t mod __unused, int type, void *data __unused)
 {
+	static eventhandler_tag attach_tag = NULL;
 	int error = 0;
 
 	switch (type) {
@@ -211,13 +197,12 @@ random_modevent(module_t mod __unused, int type, void *data __unused)
 		random_adaptor_choose(&random_adaptor);
 
 		if (random_adaptor == NULL) {
-			printf(
-       "random: No random adaptor attached, postponing initialization\n");
+			printf("random: No random adaptor attached, "
+			    "postponing initialization\n");
 			attach_tag = EVENTHANDLER_REGISTER(random_adaptor_attach,
 			    random_initialize, NULL, EVENTHANDLER_PRI_ANY);
-		} else {
+		} else
 			random_initialize(NULL, random_adaptor);
-		}
 
 		break;
 
@@ -227,10 +212,9 @@ random_modevent(module_t mod __unused, int type, void *data __unused)
 			destroy_dev(random_dev);
 		}
 		/* Unregister the event handler */
-		if (attach_tag != NULL) {
+		if (attach_tag != NULL)
 			EVENTHANDLER_DEREGISTER(random_adaptor_attach,
 			    attach_tag);
-		}
 
 		break;
 
diff --git a/sys/dev/random/randomdev.h b/sys/dev/random/randomdev.h
index 75b2c198090..b87789f0834 100644
--- a/sys/dev/random/randomdev.h
+++ b/sys/dev/random/randomdev.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2000-2004 Mark R V Murray
+ * Copyright (c) 2000-2013 Mark R V Murray
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,6 +26,9 @@
  * $FreeBSD$
  */
 
+#ifndef SYS_DEV_RANDOM_RANDOMDEV_H_INCLUDED
+#define SYS_DEV_RANDOM_RANDOMDEV_H_INCLUDED
+
 /* This header contains only those definitions that are global
  * and non algorithm-specific for the entropy processor
  */
@@ -34,7 +37,6 @@ typedef void random_init_func_t(void);
 typedef void random_deinit_func_t(void);
 typedef int random_block_func_t(int);
 typedef int random_read_func_t(void *, int);
-typedef void random_write_func_t(void *, int);
 typedef int random_poll_func_t(int, struct thread *);
 typedef void random_reseed_func_t(void);
 
@@ -42,14 +44,19 @@ struct random_adaptor {
 	struct selinfo		rsel;
 	const char		*ident;
 	int			seeded;
+	unsigned		priority;
 	random_init_func_t	*init;
 	random_deinit_func_t	*deinit;
 	random_block_func_t	*block;
 	random_read_func_t	*read;
-	random_write_func_t	*write;
 	random_poll_func_t	*poll;
 	random_reseed_func_t	*reseed;
 };
 
-extern void random_ident_hardware(struct random_adaptor **);
-extern void random_null_func(void);
+struct random_hardware_source {
+	const char		*ident;
+	enum esource		source;
+	random_read_func_t	*read;
+};
+
+#endif
diff --git a/sys/dev/random/randomdev_soft.c b/sys/dev/random/randomdev_soft.c
index 61afb1b76a7..0929704da89 100644
--- a/sys/dev/random/randomdev_soft.c
+++ b/sys/dev/random/randomdev_soft.c
@@ -26,10 +26,15 @@
  *
  */
 
-#if !defined(YARROW_RNG) && !defined(FORTUNA_RNG)
-#define YARROW_RNG
-#elif defined(YARROW_RNG) && defined(FORTUNA_RNG)
-#error "Must define either YARROW_RNG or FORTUNA_RNG"
+#include "opt_random.h"
+
+#if !defined(RANDOM_YARROW) && !defined(RANDOM_FORTUNA)
+#define RANDOM_YARROW
+#elif defined(RANDOM_YARROW) && defined(RANDOM_FORTUNA)
+#error "Must define either RANDOM_YARROW or RANDOM_FORTUNA"
+#endif
+#if defined(RANDOM_FORTUNA)
+#error "Fortuna is not yet implemented"
 #endif
 
 #include <sys/cdefs.h>
@@ -53,55 +58,56 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 #include <machine/cpu.h>
 
-#include <dev/random/random_adaptors.h>
 #include <dev/random/randomdev.h>
 #include <dev/random/randomdev_soft.h>
-#if defined(YARROW_RNG)
+#include <dev/random/random_harvestq.h>
+#include <dev/random/random_adaptors.h>
+#if defined(RANDOM_YARROW)
 #include <dev/random/yarrow.h>
 #endif
-#if defined(FORTUNA_RNG)
+#if defined(RANDOM_FORTUNA)
 #include <dev/random/fortuna.h>
 #endif
 
-#include "random_harvestq.h"
 
 static int randomdev_poll(int event, struct thread *td);
 static int randomdev_block(int flag);
 static void randomdev_flush_reseed(void);
 
-#if defined(YARROW_RNG)
+#if defined(RANDOM_YARROW)
 static struct random_adaptor random_context = {
 	.ident = "Software, Yarrow",
 	.init = randomdev_init,
 	.deinit = randomdev_deinit,
 	.block = randomdev_block,
 	.read = random_yarrow_read,
-	.write = randomdev_write,
 	.poll = randomdev_poll,
 	.reseed = randomdev_flush_reseed,
-	.seeded = 1,
+	.seeded = 0, /* This will be seeded during entropy processing */
+	.priority = 90, /* High priority, so top of the list. Fortuna may still win. */
 };
 #define RANDOM_MODULE_NAME	yarrow
 #define RANDOM_CSPRNG_NAME	"yarrow"
 #endif
 
-#if defined(FORTUNA_RNG)
+#if defined(RANDOM_FORTUNA)
 static struct random_adaptor random_context = {
 	.ident = "Software, Fortuna",
 	.init = randomdev_init,
 	.deinit = randomdev_deinit,
 	.block = randomdev_block,
 	.read = random_fortuna_read,
-	.write = randomdev_write,
 	.poll = randomdev_poll,
 	.reseed = randomdev_flush_reseed,
-	.seeded = 1,
+	.seeded = 0, /* This will be excplicitly seeded at startup when secured */
+	.priority = 100, /* High priority, so top of the list. Beat Yarrow. */
 };
 #define RANDOM_MODULE_NAME	fortuna
 #define RANDOM_CSPRNG_NAME	"fortuna"
-
 #endif
 
+TUNABLE_INT("kern.random.sys.seeded", &random_context.seeded);
+
 /* List for the dynamic sysctls */
 static struct sysctl_ctx_list random_clist;
 
@@ -111,7 +117,7 @@ random_check_boolean(SYSCTL_HANDLER_ARGS)
 {
 	if (oidp->oid_arg1 != NULL && *(u_int *)(oidp->oid_arg1) != 0)
 		*(u_int *)(oidp->oid_arg1) = 1;
-	return sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
+	return (sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req));
 }
 
 void
@@ -119,10 +125,10 @@ randomdev_init(void)
 {
 	struct sysctl_oid *random_sys_o, *random_sys_harvest_o;
 
-#if defined(YARROW_RNG)
+#if defined(RANDOM_YARROW)
 	random_yarrow_init_alg(&random_clist);
 #endif
-#if defined(FORTUNA_RNG)
+#if defined(RANDOM_FORTUNA)
 	random_fortuna_init_alg(&random_clist);
 #endif
 
@@ -134,7 +140,7 @@ randomdev_init(void)
 	SYSCTL_ADD_PROC(&random_clist,
 	    SYSCTL_CHILDREN(random_sys_o),
 	    OID_AUTO, "seeded", CTLTYPE_INT | CTLFLAG_RW,
-	    &random_context.seeded, 1, random_check_boolean, "I",
+	    &random_context.seeded, 0, random_check_boolean, "I",
 	    "Seeded State");
 
 	random_sys_harvest_o = SYSCTL_ADD_NODE(&random_clist,
@@ -155,12 +161,12 @@ randomdev_init(void)
 	SYSCTL_ADD_PROC(&random_clist,
 	    SYSCTL_CHILDREN(random_sys_harvest_o),
 	    OID_AUTO, "interrupt", CTLTYPE_INT | CTLFLAG_RW,
-	    &harvest.interrupt, 0, random_check_boolean, "I",
+	    &harvest.interrupt, 1, random_check_boolean, "I",
 	    "Harvest IRQ entropy");
 	SYSCTL_ADD_PROC(&random_clist,
 	    SYSCTL_CHILDREN(random_sys_harvest_o),
 	    OID_AUTO, "swi", CTLTYPE_INT | CTLFLAG_RW,
-	    &harvest.swi, 0, random_check_boolean, "I",
+	    &harvest.swi, 1, random_check_boolean, "I",
 	    "Harvest SWI entropy");
 
 	random_harvestq_init(random_process_event);
@@ -182,43 +188,26 @@ randomdev_deinit(void)
 	random_kthread_control = -1;
 	tsleep((void *)&random_kthread_control, 0, "term", 0);
 
-#if defined(YARROW_RNG)
+#if defined(RANDOM_YARROW)
 	random_yarrow_deinit_alg();
 #endif
-#if defined(FORTUNA_RNG)
+#if defined(RANDOM_FORTUNA)
 	random_fortuna_deinit_alg();
 #endif
 
 	sysctl_ctx_free(&random_clist);
 }
 
-void
-randomdev_write(void *buf, int count)
-{
-	int i;
-	u_int chunk;
-
-	/*
-	 * Break the input up into HARVESTSIZE chunks. The writer has too
-	 * much control here, so "estimate" the entropy as zero.
-	 */
-	for (i = 0; i < count; i += HARVESTSIZE) {
-		chunk = HARVESTSIZE;
-		if (i + chunk >= count)
-			chunk = (u_int)(count - i);
-		random_harvestq_internal(get_cyclecount(), (char *)buf + i,
-		    chunk, 0, 0, RANDOM_WRITE);
-	}
-}
-
 void
 randomdev_unblock(void)
 {
 	if (!random_context.seeded) {
-		random_context.seeded = 1;
 		selwakeuppri(&random_context.rsel, PUSER);
 		wakeup(&random_context);
+                printf("random: unblocking device.\n");
+		random_context.seeded = 1;
 	}
+	/* Do arc4random(9) a favour while we are about it. */
 	(void)atomic_cmpset_int(&arc4rand_iniseed_state, ARC4_ENTR_NONE,
 	    ARC4_ENTR_HAVE);
 }
@@ -227,6 +216,7 @@ static int
 randomdev_poll(int events, struct thread *td)
 {
 	int revents = 0;
+
 	mtx_lock(&random_reseed_mtx);
 
 	if (random_context.seeded)
@@ -235,7 +225,7 @@ randomdev_poll(int events, struct thread *td)
 		selrecord(td, &random_context.rsel);
 
 	mtx_unlock(&random_reseed_mtx);
-	return revents;
+	return (revents);
 }
 
 static int
@@ -250,7 +240,7 @@ randomdev_block(int flag)
 		if (flag & O_NONBLOCK)
 			error = EWOULDBLOCK;
 		else {
-			printf("Entropy device is blocking.\n");
+			printf("random: blocking on read.\n");
 			error = msleep(&random_context,
 			    &random_reseed_mtx,
 			    PUSER | PCATCH, "block", 0);
@@ -258,7 +248,7 @@ randomdev_block(int flag)
 	}
 	mtx_unlock(&random_reseed_mtx);
 
-	return error;
+	return (error);
 }
 
 /* Helper routine to perform explicit reseeds */
@@ -270,16 +260,18 @@ randomdev_flush_reseed(void)
 	while (random_kthread_control)
 		pause("-", hz / 10);
 
-#if defined(YARROW_RNG)
+#if defined(RANDOM_YARROW)
+	/* This ultimately calls randomdev_unblock() */
 	random_yarrow_reseed();
 #endif
-#if defined(FORTUNA_RNG)
+#if defined(RANDOM_FORTUNA)
+	/* This ultimately calls randomdev_unblock() */
 	random_fortuna_reseed();
 #endif
 }
 
 static int
-randomdev_modevent(module_t mod, int type, void *unused)
+randomdev_modevent(module_t mod __unused, int type, void *unused __unused)
 {
 
 	switch (type) {
diff --git a/sys/dev/random/randomdev_soft.h b/sys/dev/random/randomdev_soft.h
index c92a5a8e072..cbee779a7d0 100644
--- a/sys/dev/random/randomdev_soft.h
+++ b/sys/dev/random/randomdev_soft.h
@@ -26,6 +26,9 @@
  * $FreeBSD$
  */
 
+#ifndef SYS_DEV_RANDOM_RANDOMDEV_SOFT_H_INCLUDED
+#define SYS_DEV_RANDOM_RANDOMDEV_SOFT_H_INCLUDED
+
 /* This header contains only those definitions that are global
  * and harvester-specific for the entropy processor
  */
@@ -41,26 +44,22 @@
 
 #define HARVESTSIZE	16	/* max size of each harvested entropy unit */
 
-MALLOC_DECLARE(M_ENTROPY);
-
 /* These are used to queue harvested packets of entropy. The entropy
  * buffer size is pretty arbitrary.
  */
 struct harvest {
 	uintmax_t somecounter;		/* fast counter for clock jitter */
 	uint8_t entropy[HARVESTSIZE];	/* the harvested entropy */
-	u_int size, bits, frac;		/* stats about the entropy */
-	enum esource source;		/* stats about the entropy */
+	u_int size, bits;		/* stats about the entropy */
+	enum esource source;		/* origin of the entropy */
 	STAILQ_ENTRY(harvest) next;	/* next item on the list */
 };
 
 void randomdev_init(void);
 void randomdev_deinit(void);
 
-void randomdev_write(void *, int);
-
 void randomdev_init_harvester(void (*)(u_int64_t, const void *, u_int,
-	u_int, u_int, enum esource), int (*)(void *, int));
+	u_int, enum esource), int (*)(void *, int));
 void randomdev_deinit_harvester(void);
 
 void random_set_wakeup_exit(void *);
@@ -80,6 +79,8 @@ random_check_uint_##name(SYSCTL_HANDLER_ARGS)				\
 		 else if (*(u_int *)(oidp->oid_arg1) > (max))		\
 			*(u_int *)(oidp->oid_arg1) = (max);		\
 	}								\
-        return sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2,	\
-		req);							\
+        return (sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2,	\
+		req));							\
 }
+
+#endif
diff --git a/sys/dev/random/rwfile.c b/sys/dev/random/rwfile.c
new file mode 100644
index 00000000000..9b389579169
--- /dev/null
+++ b/sys/dev/random/rwfile.c
@@ -0,0 +1,96 @@
+/*-
+ * Copyright (c) 2013 Mark R V Murray
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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>
+__FBSDID("$FreeBSD$");
+
+#include "opt_random.h"
+
+#ifdef RANDOM_RWFILE
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/namei.h>
+#include <sys/fcntl.h>
+#include <sys/vnode.h>
+
+#include <dev/random/rwfile.h>
+
+int
+randomdev_read_file(const char *filename, void *buf, size_t length)
+{
+	struct nameidata nd;
+	struct thread* td = curthread;
+	int error;
+	ssize_t resid;
+	int flags;
+
+	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, td);
+	flags = FREAD;
+	error = vn_open(&nd, &flags, 0, NULL);
+	if (error == 0) {
+		NDFREE(&nd, NDF_ONLY_PNBUF);
+		if (nd.ni_vp->v_type != VREG)
+			error = ENOEXEC;
+		else
+			error = vn_rdwr(UIO_READ, nd.ni_vp, buf, length, 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td);
+		VOP_UNLOCK(nd.ni_vp, 0);
+		vn_close(nd.ni_vp, FREAD, td->td_ucred, td);
+	}
+
+	return (error);
+}
+
+int
+randomdev_write_file(const char *filename, void *buf, size_t length)
+{
+	struct nameidata nd;
+	struct thread* td = curthread;
+	int error;
+	ssize_t resid;
+	int flags;
+
+	NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, filename, td);
+	flags = FWRITE | O_CREAT | O_TRUNC;
+	error = vn_open(&nd, &flags, 0, NULL);
+	if (error == 0) {
+		NDFREE(&nd, NDF_ONLY_PNBUF);
+		if (nd.ni_vp->v_type != VREG)
+			error = ENOEXEC;
+		else
+			error = vn_rdwr(UIO_WRITE, nd.ni_vp, buf, length, 0, UIO_SYSSPACE, IO_NODELOCKED, td->td_ucred, NOCRED, &resid, td);
+
+		VOP_UNLOCK(nd.ni_vp, 0);
+		vn_close(nd.ni_vp, FREAD, td->td_ucred, td);
+	}
+
+	return (error);
+}
+
+#endif
diff --git a/sys/dev/random/rwfile.h b/sys/dev/random/rwfile.h
new file mode 100644
index 00000000000..f14fd7b7e96
--- /dev/null
+++ b/sys/dev/random/rwfile.h
@@ -0,0 +1,39 @@
+/*-
+ * Copyright (c) 2013 Mark R V Murray
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 SYS_DEV_RANDOM_RWFILE_H_INCLUDED
+#define SYS_DEV_RANDOM_RWFILE_H_INCLUDED
+
+#ifdef RANDOM_RWFILE
+
+int randomdev_read_file(const char *filename, void *buf, size_t);
+int randomdev_write_file(const char *filename, void *buf, size_t);
+
+#endif
+
+#endif
diff --git a/sys/dev/random/yarrow.c b/sys/dev/random/yarrow.c
index 21913f924f6..1cfa37372ed 100644
--- a/sys/dev/random/yarrow.c
+++ b/sys/dev/random/yarrow.c
@@ -28,6 +28,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_random.h"
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
@@ -67,8 +69,6 @@ static struct random_state {
 	struct pool {
 		struct source {
 			u_int bits;	/* estimated bits of entropy */
-			u_int frac;	/* fractional bits of entropy
-					   (given as 1024/n) */
 		} source[ENTROPYSOURCE];
 		u_int thresh;	/* pool reseed threshhold */
 		struct randomdev_hash hash;	/* accumulated entropy */
@@ -99,6 +99,7 @@ clear_counter(void)
 
 /* 128-bit C = C + 1 */
 /* Nothing to see here, folks, just an ugly mess. */
+/* TODO: Make a Galois counter instead? */
 static void
 increment_counter(void)
 {
@@ -115,16 +116,26 @@ random_process_event(struct harvest *event)
 	struct source *source;
 	enum esource src;
 
-	/* Unpack the event into the appropriate source accumulator */
+#if 0
+	/* Do this better with DTrace */
+	{
+		int i;
+
+		printf("Harvest:%16jX ", event->somecounter);
+		for (i = 0; i < event->size; i++)
+			printf("%02X", event->entropy[i]);
+		for (; i < 16; i++)
+			printf("  ");
+		printf(" %2d %2d %02X\n", event->size, event->bits, event->source);
+	}
+#endif
+
+	/* Accumulate the event into the appropriate pool */
 	pl = random_state.which;
 	source = &random_state.pool[pl].source[event->source];
-	randomdev_hash_iterate(&random_state.pool[pl].hash, event->entropy,
-		sizeof(event->entropy));
-	randomdev_hash_iterate(&random_state.pool[pl].hash, &event->somecounter,
-		sizeof(event->somecounter));
-	source->frac += event->frac;
-	source->bits += event->bits + (source->frac >> 12); /* bits + frac/0x1000 */
-	source->frac &= 0xFFF; /* Keep the fractional bits */
+	randomdev_hash_iterate(&random_state.pool[pl].hash, event,
+		sizeof(*event));
+	source->bits += event->bits;
 
 	/* Count the over-threshold sources in each pool */
 	for (pl = 0; pl < 2; pl++) {
@@ -234,6 +245,10 @@ reseed(u_int fastslow)
 	u_int i;
 	enum esource j;
 
+#if 0
+	printf("Yarrow: %s reseed\n", fastslow == FAST ? "fast" : "slow");
+#endif
+
 	/* The reseed task must not be jumped on */
 	mtx_lock(&random_reseed_mtx);
 
@@ -286,12 +301,9 @@ reseed(u_int fastslow)
 
 	/* 5. Reset entropy estimate accumulators to zero */
 
-	for (i = 0; i <= fastslow; i++) {
-		for (j = RANDOM_START; j < ENTROPYSOURCE; j++) {
+	for (i = 0; i <= fastslow; i++)
+		for (j = RANDOM_START; j < ENTROPYSOURCE; j++)
 			random_state.pool[i].source[j].bits = 0;
-			random_state.pool[i].source[j].frac = 0;
-		}
-	}
 
 	/* 6. Wipe memory of intermediate values */
 
@@ -320,6 +332,10 @@ random_yarrow_read(void *buf, int count)
 	int i;
 	int retval;
 
+	/* Check for final read request */
+	if (buf == NULL && count == 0)
+		return (0);
+
 	/* The reseed task must not be jumped on */
 	mtx_lock(&random_reseed_mtx);
 
@@ -362,7 +378,7 @@ random_yarrow_read(void *buf, int count)
 		}
 	}
 	mtx_unlock(&random_reseed_mtx);
-	return retval;
+	return (retval);
 }
 
 static void
@@ -384,5 +400,17 @@ generator_gate(void)
 void
 random_yarrow_reseed(void)
 {
+#ifdef RANDOM_DEBUG
+	int i;
+
+	printf("%s(): fast:", __func__);
+	for (i = RANDOM_START; i < ENTROPYSOURCE; ++i)
+		printf(" %d", random_state.pool[FAST].source[i].bits);
+	printf("\n");
+	printf("%s(): slow:", __func__);
+	for (i = RANDOM_START; i < ENTROPYSOURCE; ++i)
+		printf(" %d", random_state.pool[SLOW].source[i].bits);
+	printf("\n");
+#endif
 	reseed(SLOW);
 }
diff --git a/sys/dev/random/yarrow.h b/sys/dev/random/yarrow.h
index 0bde5b582d3..f32313ee577 100644
--- a/sys/dev/random/yarrow.h
+++ b/sys/dev/random/yarrow.h
@@ -26,7 +26,12 @@
  * $FreeBSD$
  */
 
+#ifndef SYS_DEV_RANDOM_YARROW_H_INCLUDED
+#define SYS_DEV_RANDOM_YARROW_H_INCLUDED
+
 void random_yarrow_init_alg(struct sysctl_ctx_list *);
 void random_yarrow_deinit_alg(void);
 int random_yarrow_read(void *, int);
 void random_yarrow_reseed(void);
+
+#endif
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 1e906a7b493..ee5af995f62 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -127,6 +127,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -181,7 +182,7 @@ static const struct rl_type re_devs[] = {
 	{ RT_VENDORID, RT_DEVICEID_8101E, 0,
 	    "RealTek 810xE PCIe 10/100baseTX" },
 	{ RT_VENDORID, RT_DEVICEID_8168, 0,
-	    "RealTek 8168/8111 B/C/CP/D/DP/E/F PCIe Gigabit Ethernet" },
+	    "RealTek 8168/8111 B/C/CP/D/DP/E/F/G PCIe Gigabit Ethernet" },
 	{ RT_VENDORID, RT_DEVICEID_8169, 0,
 	    "RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet" },
 	{ RT_VENDORID, RT_DEVICEID_8169SC, 0,
@@ -223,6 +224,7 @@ static const struct rl_hwrev re_hwrevs[] = {
 	{ RL_HWREV_8402, RL_8169, "8402", RL_MTU },
 	{ RL_HWREV_8105E, RL_8169, "8105E", RL_MTU },
 	{ RL_HWREV_8105E_SPIN1, RL_8169, "8105E", RL_MTU },
+	{ RL_HWREV_8106E, RL_8169, "8106E", RL_MTU },
 	{ RL_HWREV_8168B_SPIN2, RL_8169, "8168", RL_JUMBO_MTU },
 	{ RL_HWREV_8168B_SPIN3, RL_8169, "8168", RL_JUMBO_MTU },
 	{ RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K },
@@ -232,8 +234,12 @@ static const struct rl_hwrev re_hwrevs[] = {
 	{ RL_HWREV_8168DP, RL_8169, "8168DP/8111DP", RL_JUMBO_MTU_9K },
 	{ RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K},
 	{ RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K},
+	{ RL_HWREV_8168EP, RL_8169, "8168EP/8111EP", RL_JUMBO_MTU_9K},
 	{ RL_HWREV_8168F, RL_8169, "8168F/8111F", RL_JUMBO_MTU_9K},
+	{ RL_HWREV_8168G, RL_8169, "8168G/8111G", RL_JUMBO_MTU_9K},
+	{ RL_HWREV_8168GU, RL_8169, "8168GU/8111GU", RL_JUMBO_MTU_9K},
 	{ RL_HWREV_8411, RL_8169, "8411", RL_JUMBO_MTU_9K},
+	{ RL_HWREV_8411B, RL_8169, "8411B", RL_JUMBO_MTU_9K},
 	{ 0, 0, NULL, 0 }
 };
 
@@ -1367,10 +1373,11 @@ re_attach(device_t dev)
 		break;
 	default:
 		device_printf(dev, "Chip rev. 0x%08x\n", hwrev & 0x7c800000);
+		sc->rl_macrev = hwrev & 0x00700000;
 		hwrev &= RL_TXCFG_HWREV;
 		break;
 	}
-	device_printf(dev, "MAC rev. 0x%08x\n", hwrev & 0x00700000);
+	device_printf(dev, "MAC rev. 0x%08x\n", sc->rl_macrev);
 	while (hw_rev->rl_desc != NULL) {
 		if (hw_rev->rl_rev == hwrev) {
 			sc->rl_type = hw_rev->rl_type;
@@ -1408,6 +1415,7 @@ re_attach(device_t dev)
 	case RL_HWREV_8401E:
 	case RL_HWREV_8105E:
 	case RL_HWREV_8105E_SPIN1:
+	case RL_HWREV_8106E:
 		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM |
 		    RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT |
 		    RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD;
@@ -1429,7 +1437,7 @@ re_attach(device_t dev)
 		sc->rl_flags |= RL_FLAG_MACSLEEP;
 		/* FALLTHROUGH */
 	case RL_HWREV_8168C:
-		if ((hwrev & 0x00700000) == 0x00200000)
+		if (sc->rl_macrev == 0x00200000)
 			sc->rl_flags |= RL_FLAG_MACSLEEP;
 		/* FALLTHROUGH */
 	case RL_HWREV_8168CP:
@@ -1455,13 +1463,27 @@ re_attach(device_t dev)
 		    RL_FLAG_WOL_MANLINK;
 		break;
 	case RL_HWREV_8168E_VL:
+	case RL_HWREV_8168EP:
 	case RL_HWREV_8168F:
+	case RL_HWREV_8168G:
 	case RL_HWREV_8411:
+	case RL_HWREV_8411B:
 		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR |
 		    RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP |
 		    RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2 |
 		    RL_FLAG_CMDSTOP_WAIT_TXQ | RL_FLAG_WOL_MANLINK;
 		break;
+	case RL_HWREV_8168GU:
+		if (pci_get_device(dev) == RT_DEVICEID_8101E) {
+			/* RTL8106EUS */
+			sc->rl_flags |= RL_FLAG_FASTETHER;
+		} else
+			sc->rl_flags |= RL_FLAG_JUMBOV2 | RL_FLAG_WOL_MANLINK;
+
+		sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR |
+		    RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP |
+		    RL_FLAG_AUTOPAD | RL_FLAG_CMDSTOP_WAIT_TXQ;
+		break;
 	case RL_HWREV_8169_8110SB:
 	case RL_HWREV_8169_8110SBL:
 	case RL_HWREV_8169_8110SC:
@@ -2112,8 +2134,7 @@ re_rxeof(struct rl_softc *sc, int *rx_npktsp)
 
 	ifp = sc->rl_ifp;
 #ifdef DEV_NETMAP
-	if (netmap_rx_irq(ifp, 0 | (NETMAP_LOCKED_ENTER|NETMAP_LOCKED_EXIT),
-	    &rx_npkts))
+	if (netmap_rx_irq(ifp, 0, &rx_npkts))
 		return 0;
 #endif /* DEV_NETMAP */
 	if (ifp->if_mtu > RL_MTU && (sc->rl_flags & RL_FLAG_JUMBOV2) != 0)
@@ -2358,7 +2379,7 @@ re_txeof(struct rl_softc *sc)
 
 	ifp = sc->rl_ifp;
 #ifdef DEV_NETMAP
-	if (netmap_tx_irq(ifp, 0 | (NETMAP_LOCKED_ENTER|NETMAP_LOCKED_EXIT)))
+	if (netmap_tx_irq(ifp, 0))
 		return;
 #endif /* DEV_NETMAP */
 	/* Invalidate the TX descriptor list */
@@ -3332,7 +3353,9 @@ re_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 	switch (command) {
 	case SIOCSIFMTU:
 		if (ifr->ifr_mtu < ETHERMIN ||
-		    ifr->ifr_mtu > sc->rl_hwrev->rl_max_mtu) {
+		    ifr->ifr_mtu > sc->rl_hwrev->rl_max_mtu ||
+		    ((sc->rl_flags & RL_FLAG_FASTETHER) != 0 &&
+		    ifr->ifr_mtu > RL_MTU)) {
 			error = EINVAL;
 			break;
 		}
diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c
index 3c42972c36f..e4fd3b0b2cb 100644
--- a/sys/dev/rndtest/rndtest.c
+++ b/sys/dev/rndtest/rndtest.c
@@ -152,7 +152,7 @@ rndtest_harvest(struct rndtest_state *rsp, void *buf, u_int len)
 		for (len /= sizeof (u_int32_t); len; len--)
 			add_true_randomness(*p++);
 #else
-		random_harvest(buf, len, len*NBBY/2, 0, RANDOM_PURE);
+		random_harvest(buf, len, len*NBBY/2, RANDOM_PURE_RNDTEST);
 #endif
 	}
 }
diff --git a/sys/dev/rt/if_rt.c b/sys/dev/rt/if_rt.c
index ce2b7a9b022..5f62fec6920 100644
--- a/sys/dev/rt/if_rt.c
+++ b/sys/dev/rt/if_rt.c
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include "if_rtreg.h"
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -148,7 +149,7 @@ static int
 rt_probe(device_t dev)
 {
 	device_set_desc(dev, "Ralink RT305XF onChip Ethernet MAC");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 /*
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 721b9f4b2b6..a3590efbeb0 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -211,7 +211,7 @@ safe_partname(struct safe_softc *sc)
 static void
 default_harvest(struct rndtest_state *rsp, void *buf, u_int count)
 {
-	random_harvest(buf, count, count*NBBY/2, 0, RANDOM_PURE);
+	random_harvest(buf, count, count*NBBY/2, RANDOM_PURE_SAFE);
 }
 #endif /* SAFE_NO_RNG */
 
diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
index dc1b6eb5647..e3d0faf7922 100644
--- a/sys/dev/sbni/if_sbni.c
+++ b/sys/dev/sbni/if_sbni.c
@@ -79,6 +79,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/ethernet.h>
 #include <net/bpf.h>
diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
index 007b9af5b74..e27ce148fff 100644
--- a/sys/dev/sbni/if_sbni_isa.c
+++ b/sys/dev/sbni/if_sbni_isa.c
@@ -42,8 +42,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
-#include <net/if_arp.h>
 
 #include <isa/isavar.h>
 
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 7280801bcf6..8fb0a6216b0 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -99,6 +99,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/sfxge/common/efsys.h b/sys/dev/sfxge/common/efsys.h
index 18456d51ef1..8fd126735b9 100644
--- a/sys/dev/sfxge/common/efsys.h
+++ b/sys/dev/sfxge/common/efsys.h
@@ -270,7 +270,7 @@ typedef struct __efsys_identifier_s	efsys_identifier_t;
 
 /* PROBE */
 
-#ifndef KDTRACE_HOOKS
+#ifndef DTRACE_PROBE
 
 #define EFSYS_PROBE(_name)
 
@@ -295,7 +295,7 @@ typedef struct __efsys_identifier_s	efsys_identifier_t;
 	    _type3, _arg3, _type4, _arg4, _type5, _arg5,		\
 	    _type6, _arg6, _type7, _arg7)
 
-#else /* KDTRACE_HOOKS */
+#else /* DTRACE_PROBE */
 
 #define	EFSYS_PROBE(_name)						\
 	DTRACE_PROBE(_name)
@@ -359,7 +359,7 @@ typedef struct __efsys_identifier_s	efsys_identifier_t;
 	    _type6, _arg6)
 #endif
 
-#endif /* KDTRACE_HOOKS */
+#endif /* DTRACE_PROBE */
 
 /* DMA */
 
diff --git a/sys/dev/sfxge/common/siena_nic.c b/sys/dev/sfxge/common/siena_nic.c
index e52503b6ef6..857b78ac97d 100644
--- a/sys/dev/sfxge/common/siena_nic.c
+++ b/sys/dev/sfxge/common/siena_nic.c
@@ -589,6 +589,7 @@ siena_nic_probe(
 	unsigned int mask;
 	int rc;
 
+	mask = 0;	/* XXX: pacify gcc */
 	EFSYS_ASSERT3U(enp->en_family, ==, EFX_FAMILY_SIENA);
 
 	/* Read clear any assertion state */
diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c
index 18428cf523a..8f2c7bbc299 100644
--- a/sys/dev/sfxge/sfxge.c
+++ b/sys/dev/sfxge/sfxge.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 
diff --git a/sys/dev/sfxge/sfxge.h b/sys/dev/sfxge/sfxge.h
index 2d3e042ace4..d73d15019bf 100644
--- a/sys/dev/sfxge/sfxge.h
+++ b/sys/dev/sfxge/sfxge.h
@@ -42,6 +42,7 @@
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 
diff --git a/sys/dev/sfxge/sfxge_dma.c b/sys/dev/sfxge/sfxge_dma.c
index f0d17544a0d..48d02d56192 100644
--- a/sys/dev/sfxge/sfxge_dma.c
+++ b/sys/dev/sfxge/sfxge_dma.c
@@ -32,6 +32,10 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/queue.h>
+#include <sys/taskqueue.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/sfxge/sfxge_ev.c b/sys/dev/sfxge/sfxge_ev.c
index b506b276a6c..0d33c86487f 100644
--- a/sys/dev/sfxge/sfxge_ev.c
+++ b/sys/dev/sfxge/sfxge_ev.c
@@ -31,7 +31,12 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/param.h>
+#include <sys/queue.h>
 #include <sys/systm.h>
+#include <sys/taskqueue.h>
 
 #include "common/efx.h"
 
diff --git a/sys/dev/sfxge/sfxge_intr.c b/sys/dev/sfxge/sfxge_intr.c
index c8f4c3d4641..17f5fcd47db 100644
--- a/sys/dev/sfxge/sfxge_intr.c
+++ b/sys/dev/sfxge/sfxge_intr.c
@@ -32,9 +32,13 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/queue.h>
 #include <sys/rman.h>
 #include <sys/smp.h>
 #include <sys/syslog.h>
+#include <sys/taskqueue.h>
 
 #include <machine/bus.h>
 #include <machine/resource.h>
diff --git a/sys/dev/sge/if_sge.c b/sys/dev/sge/if_sge.c
index 8482bb27486..20c14289111 100644
--- a/sys/dev/sge/if_sge.c
+++ b/sys/dev/sge/if_sge.c
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/siba/siba_bwn.c b/sys/dev/siba/siba_bwn.c
index 278ab9f03ab..2cd3d4a2786 100644
--- a/sys/dev/siba/siba_bwn.c
+++ b/sys/dev/siba/siba_bwn.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
diff --git a/sys/dev/siba/siba_core.c b/sys/dev/siba/siba_core.c
index 91f44f3e7be..7527261b2bb 100644
--- a/sys/dev/siba/siba_core.c
+++ b/sys/dev/siba/siba_core.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
 #include <sys/endian.h>
diff --git a/sys/dev/siis/siis.c b/sys/dev/siis/siis.c
index b08ee625ecf..dd2bd70a656 100644
--- a/sys/dev/siis/siis.c
+++ b/sys/dev/siis/siis.c
@@ -838,9 +838,7 @@ siis_ch_intr_locked(void *data)
 	struct siis_channel *ch = device_get_softc(dev);
 
 	mtx_lock(&ch->mtx);
-	xpt_batch_start(ch->sim);
 	siis_ch_intr(data);
-	xpt_batch_done(ch->sim);
 	mtx_unlock(&ch->mtx);
 }
 
diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c
index 55bb7ca08e9..7b0fc88e503 100644
--- a/sys/dev/sis/if_sis.c
+++ b/sys/dev/sis/if_sis.c
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 3a0cc2e5059..62a0ef49038 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -101,6 +101,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/smc/if_smc.c b/sys/dev/smc/if_smc.c
index f6df3503d16..0ce595f67a6 100644
--- a/sys/dev/smc/if_smc.c
+++ b/sys/dev/smc/if_smc.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c
index fc26d239dda..7cc856439c7 100644
--- a/sys/dev/sn/if_sn.c
+++ b/sys/dev/sn/if_sn.c
@@ -97,6 +97,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
diff --git a/sys/dev/sn/if_sn_isa.c b/sys/dev/sn/if_sn_isa.c
index eb7bda71b03..ca4b1f48046 100644
--- a/sys/dev/sn/if_sn_isa.c
+++ b/sys/dev/sn/if_sn_isa.c
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
diff --git a/sys/dev/snc/dp83932.c b/sys/dev/snc/dp83932.c
index a41ceedca1f..617897780cc 100644
--- a/sys/dev/snc/dp83932.c
+++ b/sys/dev/snc/dp83932.c
@@ -74,6 +74,7 @@
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/snc/if_snc.c b/sys/dev/snc/if_snc.c
index 914a406f635..92631a4eb0d 100644
--- a/sys/dev/snc/if_snc.c
+++ b/sys/dev/snc/if_snc.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/if_media.h>
+#include <net/if_var.h>
 
 #include <dev/snc/dp83932reg.h>
 #include <dev/snc/dp83932var.h>
diff --git a/sys/dev/snc/if_snc_pccard.c b/sys/dev/snc/if_snc_pccard.c
index 26567305cf6..552a11cd836 100644
--- a/sys/dev/snc/if_snc_pccard.c
+++ b/sys/dev/snc/if_snc_pccard.c
@@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 
 #include <sys/module.h>
 #include <sys/bus.h>
diff --git a/sys/dev/sound/pci/hda/hdaa.h b/sys/dev/sound/pci/hda/hdaa.h
index e24575d8104..a85e14f0dee 100644
--- a/sys/dev/sound/pci/hda/hdaa.h
+++ b/sys/dev/sound/pci/hda/hdaa.h
@@ -56,7 +56,7 @@
 #define HDAA_QUIRK_IVREF100	(1 << 28)
 #define HDAA_QUIRK_OVREF50	(1 << 29)
 #define HDAA_QUIRK_OVREF80	(1 << 30)
-#define HDAA_QUIRK_OVREF100	(1 << 31)
+#define HDAA_QUIRK_OVREF100	(1U << 31)
 
 #define HDAA_QUIRK_IVREF	(HDAA_QUIRK_IVREF50 | HDAA_QUIRK_IVREF80 | \
 						HDAA_QUIRK_IVREF100)
diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c
index 1a6026663d7..b0bab7c517f 100644
--- a/sys/dev/sound/pci/hda/hdac.c
+++ b/sys/dev/sound/pci/hda/hdac.c
@@ -78,11 +78,20 @@ static const struct {
 	char		quirks_on;
 	char		quirks_off;
 } hdac_devices[] = {
+	{ HDA_INTEL_OAK,     "Intel Oaktrail",	0, 0 },
+	{ HDA_INTEL_BAY,     "Intel BayTrail",	0, 0 },
+	{ HDA_INTEL_HSW1,    "Intel Haswell",	0, 0 },
+	{ HDA_INTEL_HSW2,    "Intel Haswell",	0, 0 },
+	{ HDA_INTEL_HSW3,    "Intel Haswell",	0, 0 },
 	{ HDA_INTEL_CPT,     "Intel Cougar Point",	0, 0 },
 	{ HDA_INTEL_PATSBURG,"Intel Patsburg",  0, 0 },
 	{ HDA_INTEL_PPT1,    "Intel Panther Point",	0, 0 },
 	{ HDA_INTEL_LPT1,    "Intel Lynx Point",	0, 0 },
 	{ HDA_INTEL_LPT2,    "Intel Lynx Point",	0, 0 },
+	{ HDA_INTEL_WELLS1,  "Intel Wellsburg",	0, 0 },
+	{ HDA_INTEL_WELLS2,  "Intel Wellsburg",	0, 0 },
+	{ HDA_INTEL_LPTLP1,  "Intel Lynx Point-LP",	0, 0 },
+	{ HDA_INTEL_LPTLP2,  "Intel Lynx Point-LP",	0, 0 },
 	{ HDA_INTEL_82801F,  "Intel 82801F",	0, 0 },
 	{ HDA_INTEL_63XXESB, "Intel 631x/632xESB",	0, 0 },
 	{ HDA_INTEL_82801G,  "Intel 82801G",	0, 0 },
diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h
index 1ff433e4eb2..d021279c6c7 100644
--- a/sys/dev/sound/pci/hda/hdac.h
+++ b/sys/dev/sound/pci/hda/hdac.h
@@ -41,6 +41,11 @@
 
 /* Intel */
 #define INTEL_VENDORID		0x8086
+#define HDA_INTEL_OAK		HDA_MODEL_CONSTRUCT(INTEL, 0x080a)
+#define HDA_INTEL_BAY		HDA_MODEL_CONSTRUCT(INTEL, 0x0f04)
+#define HDA_INTEL_HSW1		HDA_MODEL_CONSTRUCT(INTEL, 0x0a0c)
+#define HDA_INTEL_HSW2		HDA_MODEL_CONSTRUCT(INTEL, 0x0c0c)
+#define HDA_INTEL_HSW3		HDA_MODEL_CONSTRUCT(INTEL, 0x0d0c)
 #define HDA_INTEL_CPT		HDA_MODEL_CONSTRUCT(INTEL, 0x1c20)
 #define HDA_INTEL_PATSBURG	HDA_MODEL_CONSTRUCT(INTEL, 0x1d20)
 #define HDA_INTEL_PPT1		HDA_MODEL_CONSTRUCT(INTEL, 0x1e20)
@@ -56,6 +61,10 @@
 #define HDA_INTEL_SCH		HDA_MODEL_CONSTRUCT(INTEL, 0x811b)
 #define HDA_INTEL_LPT1		HDA_MODEL_CONSTRUCT(INTEL, 0x8c20)
 #define HDA_INTEL_LPT2		HDA_MODEL_CONSTRUCT(INTEL, 0x8c21)
+#define HDA_INTEL_WELLS1	HDA_MODEL_CONSTRUCT(INTEL, 0x8d20)
+#define HDA_INTEL_WELLS2	HDA_MODEL_CONSTRUCT(INTEL, 0x8d21)
+#define HDA_INTEL_LPTLP1	HDA_MODEL_CONSTRUCT(INTEL, 0x9c20)
+#define HDA_INTEL_LPTLP2	HDA_MODEL_CONSTRUCT(INTEL, 0x9c21)
 #define HDA_INTEL_ALL		HDA_MODEL_CONSTRUCT(INTEL, 0xffff)
 
 /* Nvidia */
@@ -605,6 +614,7 @@
 #define HDA_CODEC_INTELIP2	HDA_CODEC_CONSTRUCT(INTEL, 0x2804)
 #define HDA_CODEC_INTELCPT	HDA_CODEC_CONSTRUCT(INTEL, 0x2805)
 #define HDA_CODEC_INTELPPT	HDA_CODEC_CONSTRUCT(INTEL, 0x2806)
+#define HDA_CODEC_INTELHSW	HDA_CODEC_CONSTRUCT(INTEL, 0x2807)
 #define HDA_CODEC_INTELCL	HDA_CODEC_CONSTRUCT(INTEL, 0x29fb)
 #define HDA_CODEC_INTELXXXX	HDA_CODEC_CONSTRUCT(INTEL, 0xffff)
 
diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c
index c9282c917b8..f646b869d0c 100644
--- a/sys/dev/sound/pci/hda/hdacc.c
+++ b/sys/dev/sound/pci/hda/hdacc.c
@@ -318,6 +318,7 @@ static const struct {
 	{ HDA_CODEC_INTELIP2, 0,	"Intel Ibex Peak" },
 	{ HDA_CODEC_INTELCPT, 0,	"Intel Cougar Point" },
 	{ HDA_CODEC_INTELPPT, 0,	"Intel Panther Point" },
+	{ HDA_CODEC_INTELHSW, 0,	"Intel Haswell" },
 	{ HDA_CODEC_INTELCL, 0,		"Intel Crestline" },
 	{ HDA_CODEC_SII1390, 0,		"Silicon Image SiI1390" },
 	{ HDA_CODEC_SII1392, 0,		"Silicon Image SiI1392" },
diff --git a/sys/dev/spibus/ofw_spibus.c b/sys/dev/spibus/ofw_spibus.c
new file mode 100644
index 00000000000..313d4e6533f
--- /dev/null
+++ b/sys/dev/spibus/ofw_spibus.c
@@ -0,0 +1,192 @@
+/*-
+ * Copyright (c) 2009, Nathan Whitehorn <nwhitehorn@FreeBSD.org>
+ * Copyright (c) 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 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/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/libkern.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/spibus/spi.h>
+#include <dev/spibus/spibusvar.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/ofw/openfirm.h>
+
+#include "spibus_if.h"
+
+struct ofw_spibus_devinfo {
+	struct spibus_ivar	opd_dinfo;
+	struct ofw_bus_devinfo	opd_obdinfo;
+};
+
+/* Methods */
+static device_probe_t ofw_spibus_probe;
+static device_attach_t ofw_spibus_attach;
+static device_t ofw_spibus_add_child(device_t dev, u_int order,
+    const char *name, int unit);
+static const struct ofw_bus_devinfo *ofw_spibus_get_devinfo(device_t bus,
+    device_t dev);
+
+static int
+ofw_spibus_probe(device_t dev)
+{
+
+	if (ofw_bus_get_node(dev) == -1)
+		return (ENXIO);
+	device_set_desc(dev, "OFW SPI bus");
+
+	return (0);
+}
+
+static int
+ofw_spibus_attach(device_t dev)
+{
+	struct spibus_softc *sc = device_get_softc(dev);
+	struct ofw_spibus_devinfo *dinfo;
+	phandle_t child;
+	pcell_t paddr;
+	device_t childdev;
+
+	sc->dev = dev;
+
+	bus_generic_probe(dev);
+	bus_enumerate_hinted_children(dev);
+
+	/*
+	 * Attach those children represented in the device tree.
+	 */
+	for (child = OF_child(ofw_bus_get_node(dev)); child != 0;
+	    child = OF_peer(child)) {
+		/*
+		 * Try to get the CS number first from the spi-chipselect
+		 * property, then try the reg property.
+		 */
+		if (OF_getencprop(child, "spi-chipselect", &paddr,
+		    sizeof(paddr)) == -1) {
+			if (OF_getencprop(child, "reg", &paddr,
+			    sizeof(paddr)) == -1)
+				continue;
+		}
+
+		/*
+		 * Now set up the SPI and OFW bus layer devinfo and add it
+		 * to the bus.
+		 */
+		dinfo = malloc(sizeof(struct ofw_spibus_devinfo), M_DEVBUF,
+		    M_NOWAIT | M_ZERO);
+		if (dinfo == NULL)
+			continue;
+		dinfo->opd_dinfo.cs = paddr;
+		if (ofw_bus_gen_setup_devinfo(&dinfo->opd_obdinfo, child) !=
+		    0) {
+			free(dinfo, M_DEVBUF);
+			continue;
+		}
+		childdev = device_add_child(dev, NULL, -1);
+		device_set_ivars(childdev, dinfo);
+	}
+
+	return (bus_generic_attach(dev));
+}
+
+static device_t
+ofw_spibus_add_child(device_t dev, u_int order, const char *name, int unit)
+{
+	device_t child;
+	struct ofw_spibus_devinfo *devi;
+
+	child = device_add_child_ordered(dev, order, name, unit);
+	if (child == NULL)
+		return (child);
+	devi = malloc(sizeof(struct ofw_spibus_devinfo), M_DEVBUF,
+	    M_NOWAIT | M_ZERO);
+	if (devi == NULL) {
+		device_delete_child(dev, child);
+		return (0);
+	}
+
+	/*
+	 * NULL all the OFW-related parts of the ivars for non-OFW
+	 * children.
+	 */
+	devi->opd_obdinfo.obd_node = -1;
+	devi->opd_obdinfo.obd_name = NULL;
+	devi->opd_obdinfo.obd_compat = NULL;
+	devi->opd_obdinfo.obd_type = NULL;
+	devi->opd_obdinfo.obd_model = NULL;
+
+	device_set_ivars(child, devi);
+
+	return (child);
+}
+
+static const struct ofw_bus_devinfo *
+ofw_spibus_get_devinfo(device_t bus, device_t dev)
+{
+	struct ofw_spibus_devinfo *dinfo;
+
+	dinfo = device_get_ivars(dev);
+	return (&dinfo->opd_obdinfo);
+}
+
+static device_method_t ofw_spibus_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		ofw_spibus_probe),
+	DEVMETHOD(device_attach,	ofw_spibus_attach),
+
+	/* Bus interface */
+	DEVMETHOD(bus_child_pnpinfo_str, ofw_bus_gen_child_pnpinfo_str),
+	DEVMETHOD(bus_add_child,	ofw_spibus_add_child),
+
+	/* ofw_bus interface */
+	DEVMETHOD(ofw_bus_get_devinfo,	ofw_spibus_get_devinfo),
+	DEVMETHOD(ofw_bus_get_compat,	ofw_bus_gen_get_compat),
+	DEVMETHOD(ofw_bus_get_model,	ofw_bus_gen_get_model),
+	DEVMETHOD(ofw_bus_get_name,	ofw_bus_gen_get_name),
+	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
+	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
+
+	DEVMETHOD_END
+};
+
+static devclass_t ofwspibus_devclass;
+
+DEFINE_CLASS_1(spibus, ofw_spibus_driver, ofw_spibus_methods,
+    sizeof(struct spibus_softc), spibus_driver);
+DRIVER_MODULE(ofw_spibus, spi, ofw_spibus_driver, ofwspibus_devclass, 0, 0);
+MODULE_VERSION(ofw_spibus, 1);
+MODULE_DEPEND(ofw_spibus, spibus, 1, 1, 1);
diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c
index 43b4e7e8b38..fc7831c7897 100644
--- a/sys/dev/spibus/spibus.c
+++ b/sys/dev/spibus/spibus.c
@@ -23,7 +23,7 @@ static int
 spibus_probe(device_t dev)
 {
 	device_set_desc(dev, "spibus bus");
-	return (0);
+	return (BUS_PROBE_GENERIC);
 }
 
 static int
@@ -185,7 +185,7 @@ static device_method_t spibus_methods[] = {
 	DEVMETHOD_END
 };
 
-static driver_t spibus_driver = {
+driver_t spibus_driver = {
 	"spibus",
 	spibus_methods,
 	sizeof(struct spibus_softc)
diff --git a/sys/dev/spibus/spibusvar.h b/sys/dev/spibus/spibusvar.h
index c035be122c6..3d5cac8215c 100644
--- a/sys/dev/spibus/spibusvar.h
+++ b/sys/dev/spibus/spibusvar.h
@@ -26,3 +26,6 @@ spibus_get_ ## A(device_t dev, T *t)					\
 }
 	
 SPIBUS_ACCESSOR(cs,		CS,		uint32_t)
+
+extern driver_t spibus_driver;
+extern devclass_t spibus_devclass;
diff --git a/sys/dev/ste/if_ste.c b/sys/dev/ste/if_ste.c
index be2e8b2f2d0..107d77a24cd 100644
--- a/sys/dev/ste/if_ste.c
+++ b/sys/dev/ste/if_ste.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c
index 3cc45b35051..8a6f7b0ed82 100644
--- a/sys/dev/stge/if_stge.c
+++ b/sys/dev/stge/if_stge.c
@@ -56,6 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/dev/syscons/scmouse.c b/sys/dev/syscons/scmouse.c
index 21e6d0830d6..4dbd1a77873 100644
--- a/sys/dev/syscons/scmouse.c
+++ b/sys/dev/syscons/scmouse.c
@@ -666,7 +666,7 @@ sc_mouse_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
 
 	mouse = (mouse_info_t*)data;
 
-	random_harvest(mouse, sizeof(mouse_info_t), 2, 0, RANDOM_MOUSE);
+	random_harvest(mouse, sizeof(mouse_info_t), 2, RANDOM_MOUSE);
 
 	if (cmd == OLD_CONS_MOUSECTL) {
 	    static u_char swapb[] = { 0, 4, 2, 6, 1, 5, 3, 7 };
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index f09973c49a1..b44dd537105 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -3400,7 +3400,7 @@ next_code:
 	sc_touch_scrn_saver();
 
     if (!(flags & SCGETC_CN))
-	random_harvest(&c, sizeof(c), 1, 0, RANDOM_KEYBOARD);
+	random_harvest(&c, sizeof(c), 1, RANDOM_KEYBOARD);
 
     if (scp->kbd_mode != K_XLATE)
 	return KEYCHAR(c);
diff --git a/sys/dev/terasic/de4led/terasic_de4led_nexus.c b/sys/dev/terasic/de4led/terasic_de4led_nexus.c
index 870d412947a..a8eb5f1af0d 100644
--- a/sys/dev/terasic/de4led/terasic_de4led_nexus.c
+++ b/sys/dev/terasic/de4led/terasic_de4led_nexus.c
@@ -58,7 +58,7 @@ terasic_de4led_nexus_probe(device_t dev)
 {
 
 	device_set_desc(dev, "Terasic DE4 8-element LED");
-	return (BUS_PROBE_DEFAULT);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/dev/terasic/mtl/terasic_mtl_nexus.c b/sys/dev/terasic/mtl/terasic_mtl_nexus.c
index 2dff7dbb2dd..b1d13db70af 100644
--- a/sys/dev/terasic/mtl/terasic_mtl_nexus.c
+++ b/sys/dev/terasic/mtl/terasic_mtl_nexus.c
@@ -55,7 +55,7 @@ terasic_mtl_nexus_probe(device_t dev)
 {
 
 	device_set_desc(dev, "Terasic Multi-touch LCD (MTL)");
-	return (BUS_PROBE_DEFAULT);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 36cf0477ca1..c201029bc7d 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -94,6 +94,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sf_buf.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/tl/if_tl.c b/sys/dev/tl/if_tl.c
index 30969e2aef1..754c9455a82 100644
--- a/sys/dev/tl/if_tl.c
+++ b/sys/dev/tl/if_tl.c
@@ -187,6 +187,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c
index 80417768582..c6e57e95442 100644
--- a/sys/dev/tsec/if_tsec.c
+++ b/sys/dev/tsec/if_tsec.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -111,6 +112,8 @@ DRIVER_MODULE(miibus, tsec, miibus_driver, miibus_devclass, 0, 0);
 MODULE_DEPEND(tsec, ether, 1, 1, 1);
 MODULE_DEPEND(tsec, miibus, 1, 1, 1);
 
+struct mtx tsec_phy_mtx;
+
 int
 tsec_attach(struct tsec_softc *sc)
 {
@@ -121,6 +124,10 @@ tsec_attach(struct tsec_softc *sc)
 	int error = 0;
 	int i;
 
+	/* Initialize global (because potentially shared) MII lock */
+	if (!mtx_initialized(&tsec_phy_mtx))
+		mtx_init(&tsec_phy_mtx, "tsec mii", NULL, MTX_DEF);
+
 	/* Reset all TSEC counters */
 	TSEC_TX_RX_COUNTERS_INIT(sc);
 
@@ -406,21 +413,24 @@ tsec_init_locked(struct tsec_softc *sc)
 	 */
 	TSEC_WRITE(sc, TSEC_REG_TBIPA, 5);
 
+	TSEC_PHY_LOCK(sc);
+
 	/* Step 6: Reset the management interface */
-	TSEC_WRITE(sc->phy_sc, TSEC_REG_MIIMCFG, TSEC_MIIMCFG_RESETMGMT);
+	TSEC_PHY_WRITE(sc, TSEC_REG_MIIMCFG, TSEC_MIIMCFG_RESETMGMT);
 
 	/* Step 7: Setup the MII Mgmt clock speed */
-	TSEC_WRITE(sc->phy_sc, TSEC_REG_MIIMCFG, TSEC_MIIMCFG_CLKDIV28);
+	TSEC_PHY_WRITE(sc, TSEC_REG_MIIMCFG, TSEC_MIIMCFG_CLKDIV28);
 
 	/* Step 8: Read MII Mgmt indicator register and check for Busy = 0 */
 	timeout = TSEC_READ_RETRY;
-	while (--timeout && (TSEC_READ(sc->phy_sc, TSEC_REG_MIIMIND) &
+	while (--timeout && (TSEC_PHY_READ(sc, TSEC_REG_MIIMIND) &
 	    TSEC_MIIMIND_BUSY))
 		DELAY(TSEC_READ_DELAY);
 	if (timeout == 0) {
 		if_printf(ifp, "tsec_init_locked(): Mgmt busy timeout\n");
 		return;
 	}
+	TSEC_PHY_UNLOCK(sc);
 
 	/* Step 9: Setup the MII Mgmt */
 	mii_mediachg(sc->tsec_mii);
@@ -1561,22 +1571,27 @@ tsec_miibus_readreg(device_t dev, int phy, int reg)
 {
 	struct tsec_softc *sc;
 	uint32_t timeout;
+	int rv;
 
 	sc = device_get_softc(dev);
 
-	TSEC_WRITE(sc->phy_sc, TSEC_REG_MIIMADD, (phy << 8) | reg);
-	TSEC_WRITE(sc->phy_sc, TSEC_REG_MIIMCOM, 0);
-	TSEC_WRITE(sc->phy_sc, TSEC_REG_MIIMCOM, TSEC_MIIMCOM_READCYCLE);
+	TSEC_PHY_LOCK();
+	TSEC_PHY_WRITE(sc, TSEC_REG_MIIMADD, (phy << 8) | reg);
+	TSEC_PHY_WRITE(sc, TSEC_REG_MIIMCOM, 0);
+	TSEC_PHY_WRITE(sc, TSEC_REG_MIIMCOM, TSEC_MIIMCOM_READCYCLE);
 
 	timeout = TSEC_READ_RETRY;
-	while (--timeout && TSEC_READ(sc->phy_sc, TSEC_REG_MIIMIND) &
+	while (--timeout && TSEC_PHY_READ(sc, TSEC_REG_MIIMIND) &
 	    (TSEC_MIIMIND_NOTVALID | TSEC_MIIMIND_BUSY))
 		DELAY(TSEC_READ_DELAY);
 
 	if (timeout == 0)
 		device_printf(dev, "Timeout while reading from PHY!\n");
 
-	return (TSEC_READ(sc->phy_sc, TSEC_REG_MIIMSTAT));
+	rv = TSEC_PHY_READ(sc, TSEC_REG_MIIMSTAT);
+	TSEC_PHY_UNLOCK();
+
+	return (rv);
 }
 
 int
@@ -1587,13 +1602,15 @@ tsec_miibus_writereg(device_t dev, int phy, int reg, int value)
 
 	sc = device_get_softc(dev);
 
-	TSEC_WRITE(sc->phy_sc, TSEC_REG_MIIMADD, (phy << 8) | reg);
-	TSEC_WRITE(sc->phy_sc, TSEC_REG_MIIMCON, value);
+	TSEC_PHY_LOCK();
+	TSEC_PHY_WRITE(sc, TSEC_REG_MIIMADD, (phy << 8) | reg);
+	TSEC_PHY_WRITE(sc, TSEC_REG_MIIMCON, value);
 
 	timeout = TSEC_READ_RETRY;
-	while (--timeout && (TSEC_READ(sc->phy_sc, TSEC_REG_MIIMIND) &
+	while (--timeout && (TSEC_READ(sc, TSEC_REG_MIIMIND) &
 	    TSEC_MIIMIND_BUSY))
 		DELAY(TSEC_READ_DELAY);
+	TSEC_PHY_UNLOCK();
 
 	if (timeout == 0)
 		device_printf(dev, "Timeout while writing to PHY!\n");
diff --git a/sys/dev/tsec/if_tsec.h b/sys/dev/tsec/if_tsec.h
index cfba3f6bcc3..7c6bc302d2e 100644
--- a/sys/dev/tsec/if_tsec.h
+++ b/sys/dev/tsec/if_tsec.h
@@ -133,7 +133,8 @@ struct tsec_softc {
 	struct mbuf	*frame;
 
 	int		phyaddr;
-	struct tsec_softc *phy_sc;
+	bus_space_tag_t phy_bst;
+	bus_space_handle_t phy_bsh;
 };
 
 /* interface to get/put generic objects */
@@ -253,6 +254,14 @@ struct tsec_softc {
 #define TSEC_WRITE(sc, reg, val)	\
 		bus_space_write_4((sc)->sc_bas.bst, (sc)->sc_bas.bsh, (reg), (val))
 
+extern struct mtx tsec_phy_mtx;
+#define TSEC_PHY_LOCK(sc)	mtx_lock(&tsec_phy_mtx)
+#define TSEC_PHY_UNLOCK(sc)	mtx_unlock(&tsec_phy_mtx)
+#define TSEC_PHY_READ(sc, reg)		\
+		bus_space_read_4((sc)->phy_bst, (sc)->phy_bsh, (reg))
+#define TSEC_PHY_WRITE(sc, reg, val)	\
+		bus_space_write_4((sc)->phy_bst, (sc)->phy_bsh, (reg), (val))
+
 /* Lock for transmitter */
 #define TSEC_TRANSMIT_LOCK(sc) do {					\
 		mtx_assert(&(sc)->receive_lock, MA_NOTOWNED);		\
diff --git a/sys/dev/tsec/if_tsec_fdt.c b/sys/dev/tsec/if_tsec_fdt.c
index 7f6f414a35d..76080bdd949 100644
--- a/sys/dev/tsec/if_tsec_fdt.c
+++ b/sys/dev/tsec/if_tsec_fdt.c
@@ -35,7 +35,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
+#include <sys/lock.h>
 #include <sys/mbuf.h>
+#include <sys/mutex.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/socket.h>
@@ -48,9 +50,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
-#include <net/if_arp.h>
 
 #include <dev/fdt/fdt_common.h>
 #include <dev/mii/mii.h>
@@ -110,6 +110,10 @@ tsec_fdt_probe(device_t dev)
 	struct tsec_softc *sc;
 	uint32_t id;
 
+	if (ofw_bus_get_type(dev) == NULL ||
+	    strcmp(ofw_bus_get_type(dev), "network") != 0)
+		return (ENXIO);
+
 	if (!ofw_bus_is_compatible(dev, "gianfar"))
 		return (ENXIO);
 
@@ -148,6 +152,7 @@ static int
 tsec_fdt_attach(device_t dev)
 {
 	struct tsec_softc *sc;
+	phandle_t phy;
 	int error = 0;
 
 	sc = device_get_softc(dev);
@@ -155,9 +160,14 @@ tsec_fdt_attach(device_t dev)
 	sc->node = ofw_bus_get_node(dev);
 
 	/* Get phy address from fdt */
-	if (fdt_get_phyaddr(sc->node, sc->dev, &sc->phyaddr,
-	    (void **)&sc->phy_sc) != 0)
+	if (OF_getencprop(sc->node, "phy-handle", &phy, sizeof(phy)) <= 0) {
+		device_printf(dev, "PHY not found in device tree");
 		return (ENXIO);
+	}
+
+	phy = OF_xref_phandle(phy);
+	OF_decode_addr(OF_parent(phy), 0, &sc->phy_bst, &sc->phy_bsh);
+	OF_getencprop(phy, "reg", &sc->phyaddr, sizeof(sc->phyaddr));
 
 	/* Init timer */
 	callout_init(&sc->tsec_callout, 1);
@@ -324,6 +334,13 @@ tsec_get_hwaddr(struct tsec_softc *sc, uint8_t *addr)
 		return;
 	}
 
+	/* Also try the mac-address property, which is second-best */
+	i = OF_getprop(sc->node, "mac-address", (void *)hw.addr, 6);
+	if (i == 6 && (hw.reg[0] != 0 || hw.reg[1] != 0)) {
+		bcopy(hw.addr, addr, 6);
+		return;
+	}
+
 	/*
 	 * Fall back -- use the currently programmed address in the hope that
 	 * it was set be firmware...
diff --git a/sys/dev/tsec/if_tsecreg.h b/sys/dev/tsec/if_tsecreg.h
index 4ba1997e1bf..1994298cd53 100644
--- a/sys/dev/tsec/if_tsecreg.h
+++ b/sys/dev/tsec/if_tsecreg.h
@@ -77,12 +77,13 @@
 				       * register */
 #define TSEC_REG_HAFDUP		0x50c /* Half-duplex register */
 #define TSEC_REG_MAXFRM		0x510 /* Maximum frame length register */
-#define TSEC_REG_MIIMCFG	0x520 /* MII Management configuration register */
-#define TSEC_REG_MIIMCOM	0x524 /* MII Management command register */
-#define TSEC_REG_MIIMADD	0x528 /* MII Management address register */
-#define TSEC_REG_MIIMCON	0x52c /* MII Management control register */
-#define TSEC_REG_MIIMSTAT	0x530 /* MII Management status register */
-#define TSEC_REG_MIIMIND	0x534 /* MII Management indicator register */
+#define TSEC_REG_MIIBASE	0x520 /* MII Management base, rest offsets */
+#define TSEC_REG_MIIMCFG	0x0   /* MII Management configuration register */
+#define TSEC_REG_MIIMCOM	0x4   /* MII Management command register */
+#define TSEC_REG_MIIMADD	0x8   /* MII Management address register */
+#define TSEC_REG_MIIMCON	0xc   /* MII Management control register */
+#define TSEC_REG_MIIMSTAT	0x10  /* MII Management status register */
+#define TSEC_REG_MIIMIND	0x14  /* MII Management indicator register */
 #define TSEC_REG_IFSTAT		0x53c /* Interface status register */
 #define TSEC_REG_MACSTNADDR1	0x540 /* Station address register, part 1 */
 #define TSEC_REG_MACSTNADDR2	0x544 /* Station address register, part 2 */
diff --git a/sys/dev/twa/tw_osl_cam.c b/sys/dev/twa/tw_osl_cam.c
index df6566eba91..b8b21a39031 100644
--- a/sys/dev/twa/tw_osl_cam.c
+++ b/sys/dev/twa/tw_osl_cam.c
@@ -207,15 +207,17 @@ tw_osli_execute_scsi(struct tw_osli_req_context *req, union ccb *ccb)
 		csio->cdb_io.cdb_bytes[0]);
 
 	if (ccb_h->target_id >= TW_CL_MAX_NUM_UNITS) {
-		tw_osli_dbg_dprintf(3, sc, "Invalid target. PTL = %x %x %x",
-			ccb_h->path_id, ccb_h->target_id, ccb_h->target_lun);
+		tw_osli_dbg_dprintf(3, sc, "Invalid target. PTL = %x %x %jx",
+			ccb_h->path_id, ccb_h->target_id,
+			(uintmax_t)ccb_h->target_lun);
 		ccb_h->status |= CAM_TID_INVALID;
 		xpt_done(ccb);
 		return(1);
 	}
 	if (ccb_h->target_lun >= TW_CL_MAX_NUM_LUNS) {
-		tw_osli_dbg_dprintf(3, sc, "Invalid lun. PTL = %x %x %x",
-			ccb_h->path_id, ccb_h->target_id, ccb_h->target_lun);
+		tw_osli_dbg_dprintf(3, sc, "Invalid lun. PTL = %x %x %jx",
+			ccb_h->path_id, ccb_h->target_id,
+			(uintmax_t)ccb_h->target_lun);
 		ccb_h->status |= CAM_LUN_INVALID;
 		xpt_done(ccb);
 		return(1);
diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c
index 66f54802a4f..1c73aca5d80 100644
--- a/sys/dev/tx/if_tx.c
+++ b/sys/dev/tx/if_tx.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/txp/if_txp.c b/sys/dev/txp/if_txp.c
index bc6f016ef63..b0dd09c2e7c 100644
--- a/sys/dev/txp/if_txp.c
+++ b/sys/dev/txp/if_txp.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index 840d783b405..4874488550a 100644
--- a/sys/dev/uart/uart.h
+++ b/sys/dev/uart/uart.h
@@ -75,6 +75,12 @@ extern struct uart_class uart_lpc_class __attribute__((weak));
 extern struct uart_class uart_pl011_class __attribute__((weak));
 extern struct uart_class uart_cdnc_class __attribute__((weak));
 extern struct uart_class uart_ti8250_class __attribute__((weak));
+extern struct uart_class uart_vybrid_class __attribute__((weak));
+
+#ifdef FDT
+struct ofw_compat_data;
+extern const struct ofw_compat_data *uart_fdt_compat_data;
+#endif
 
 #ifdef PC98
 struct uart_class *uart_pc98_getdev(u_long port);
diff --git a/sys/dev/uart/uart_bus_fdt.c b/sys/dev/uart/uart_bus_fdt.c
index da84f26de48..259ab85d58d 100644
--- a/sys/dev/uart/uart_bus_fdt.c
+++ b/sys/dev/uart/uart_bus_fdt.c
@@ -30,6 +30,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_platform.h"
+
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
@@ -61,6 +63,34 @@ static driver_t uart_fdt_driver = {
 	sizeof(struct uart_softc),
 };
 
+/*
+ * Compatible devices.  Keep this sorted in most- to least-specific order first,
+ * alphabetical second.  That is, "zwie,ns16550" should appear before "ns16550"
+ * on the theory that the zwie driver knows how to make better use of the
+ * hardware than the generic driver.  Likewise with chips within a family, the
+ * highest-numbers / most recent models should probably appear earlier.
+ */
+static struct ofw_compat_data compat_data[] = {
+	{"arm,pl011",		(uintptr_t)&uart_pl011_class},
+	{"cadence,uart",	(uintptr_t)&uart_cdnc_class},
+	{"exynos",		(uintptr_t)&uart_s3c2410_class},
+	{"fsl,imx6q-uart",	(uintptr_t)&uart_imx_class},
+	{"fsl,imx53-uart",	(uintptr_t)&uart_imx_class},
+	{"fsl,imx51-uart",	(uintptr_t)&uart_imx_class},
+	{"fsl,imx31-uart",	(uintptr_t)&uart_imx_class},
+	{"fsl,imx27-uart",	(uintptr_t)&uart_imx_class},
+	{"fsl,imx25-uart",	(uintptr_t)&uart_imx_class},
+	{"fsl,imx21-uart",	(uintptr_t)&uart_imx_class},
+	{"fsl,mvf600-uart",	(uintptr_t)&uart_vybrid_class},
+	{"lpc,uart",		(uintptr_t)&uart_lpc_class},
+	{"ti,ns16550",		(uintptr_t)&uart_ti8250_class},
+	{"ns16550",		(uintptr_t)&uart_ns8250_class},
+	{NULL,			(uintptr_t)NULL},
+};
+
+/* Export the compat_data table for use by the uart_cpu_fdt.c probe routine. */
+const struct ofw_compat_data *uart_fdt_compat_data = compat_data;
+
 static int
 uart_fdt_get_clock(phandle_t node, pcell_t *cell)
 {
@@ -99,25 +129,16 @@ uart_fdt_probe(device_t dev)
 	phandle_t node;
 	pcell_t clock, shift;
 	int err;
+	const struct ofw_compat_data * cd;
 
 	sc = device_get_softc(dev);
-	if (ofw_bus_is_compatible(dev, "lpc,uart"))
-		sc->sc_class = &uart_lpc_class;
-	else if (ofw_bus_is_compatible(dev, "fsl,imx-uart"))
-		sc->sc_class = &uart_imx_class;
-	else if (ofw_bus_is_compatible(dev, "arm,pl011"))
-		sc->sc_class = &uart_pl011_class;
-	else if (ofw_bus_is_compatible(dev, "exynos"))
-		sc->sc_class = &uart_s3c2410_class;
-	else if (ofw_bus_is_compatible(dev, "cadence,uart"))
-		sc->sc_class = &uart_cdnc_class;
-	else if (ofw_bus_is_compatible(dev, "ti,ns16550"))
-		sc->sc_class = &uart_ti8250_class;
-	else if (ofw_bus_is_compatible(dev, "ns16550"))
-		sc->sc_class = &uart_ns8250_class;
-	else
+
+	cd = ofw_bus_search_compatible(dev, compat_data);
+	if (cd->ocd_data == (uintptr_t)NULL)
 		return (ENXIO);
 
+	sc->sc_class = (struct uart_class *)cd->ocd_data;
+
 	node = ofw_bus_get_node(dev);
 
 	if ((err = uart_fdt_get_clock(node, &clock)) != 0)
diff --git a/sys/dev/uart/uart_bus_pci.c b/sys/dev/uart/uart_bus_pci.c
index 6419ebb8921..937dae082de 100644
--- a/sys/dev/uart/uart_bus_pci.c
+++ b/sys/dev/uart/uart_bus_pci.c
@@ -122,6 +122,7 @@ static const struct pci_id pci_ns8250_ids[] = {
 { 0x8086, 0x8812, 0xffff, 0, "Intel EG20T Serial Port 1", 0x10 },
 { 0x8086, 0x8813, 0xffff, 0, "Intel EG20T Serial Port 2", 0x10 },
 { 0x8086, 0x8814, 0xffff, 0, "Intel EG20T Serial Port 3", 0x10 },
+{ 0x8086, 0x8c3d, 0xffff, 0, "Intel Lynx Point KT Controller", 0x10 },
 { 0x9710, 0x9820, 0x1000, 1, "NetMos NM9820 Serial Port", 0x10 },
 { 0x9710, 0x9835, 0x1000, 1, "NetMos NM9835 Serial Port", 0x10 },
 { 0x9710, 0x9865, 0xa000, 0x1000, "NetMos NM9865 Serial Port", 0x10 },
diff --git a/sys/dev/uart/uart_cpu_fdt.c b/sys/dev/uart/uart_cpu_fdt.c
index 230c3632c3a..9bf35496e68 100644
--- a/sys/dev/uart/uart_cpu_fdt.c
+++ b/sys/dev/uart/uart_cpu_fdt.c
@@ -30,10 +30,16 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_platform.h"
+
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/systm.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
 
 #include <machine/bus.h>
 #include <machine/fdt.h>
@@ -86,13 +92,35 @@ int
 uart_cpu_eqres(struct uart_bas *b1, struct uart_bas *b2)
 {
 
-	return ((b1->bsh == b2->bsh && b1->bst == b2->bst) ? 1 : 0);
+	if (b1->bst != b2->bst)
+		return (0);
+	if (pmap_kextract(b1->bsh) == 0)
+		return (0);
+	if (pmap_kextract(b2->bsh) == 0)
+		return (0);
+	return ((pmap_kextract(b1->bsh) == pmap_kextract(b2->bsh)) ? 1 : 0);
+}
+
+static int
+phandle_chosen_propdev(phandle_t chosen, const char *name, phandle_t *node)
+{
+	char buf[64];
+
+	if (OF_getprop(chosen, name, buf, sizeof(buf)) <= 0)
+		return (ENXIO);
+	if ((*node = OF_finddevice(buf)) == -1)
+		return (ENXIO);
+	
+	return (0);
 }
 
 int
 uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 {
-	char buf[64];
+	const char *propnames[] = {"stdout-path", "linux,stdout-path", "stdout",
+	    "stdin-path", "stdin", NULL};
+	const char **name;
+	const struct ofw_compat_data *cd;
 	struct uart_class *class;
 	phandle_t node, chosen;
 	pcell_t shift, br, rclk;
@@ -102,7 +130,7 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 	uart_bus_space_mem = fdtbus_bs_tag;
 	uart_bus_space_io = NULL;
 
-	/* Allow overriding the FDT uning the environment. */
+	/* Allow overriding the FDT using the environment. */
 	class = &uart_ns8250_class;
 	err = uart_getenv(devtype, di, class);
 	if (!err)
@@ -114,17 +142,19 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 	/*
 	 * Retrieve /chosen/std{in,out}.
 	 */
-	if ((chosen = OF_finddevice("/chosen")) == -1)
-		return (ENXIO);
-	if (OF_getprop(chosen, "stdin", buf, sizeof(buf)) <= 0)
-		return (ENXIO);
-	if ((node = OF_finddevice(buf)) == -1)
-		return (ENXIO);
-	if (OF_getprop(chosen, "stdout", buf, sizeof(buf)) <= 0)
-		return (ENXIO);
-	if (OF_finddevice(buf) != node)
-		/* Only stdin == stdout is supported. */
+	node = -1;
+	if ((chosen = OF_finddevice("/chosen")) != -1) {
+		for (name = propnames; *name != NULL; name++) {
+			if (phandle_chosen_propdev(chosen, *name, &node) == 0)
+				break;
+		}
+	}
+	if (chosen == -1 || *name == NULL)
+		node = OF_finddevice("serial0"); /* Last ditch */
+
+	if (node == -1) /* Can't find anything */
 		return (ENXIO);
+
 	/*
 	 * Retrieve serial attributes.
 	 */
@@ -139,22 +169,13 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 	/*
 	 * Finalize configuration.
 	 */
-	if (fdt_is_compatible(node, "fsl,imx-uart"))
-		class = &uart_imx_class;
-	else if (fdt_is_compatible(node, "quicc"))
-		class = &uart_quicc_class;
-	else if (fdt_is_compatible(node, "lpc"))
-		class = &uart_lpc_class;
-	else if (fdt_is_compatible(node, "arm,pl011"))
-		class = &uart_pl011_class;
-	else if (fdt_is_compatible(node, "exynos"))
-		class = &uart_s3c2410_class;
-	else if (fdt_is_compatible(node, "cadence,uart"))
-		class = &uart_cdnc_class;
-	else if (fdt_is_compatible(node, "ti,ns16550"))
-		class = &uart_ti8250_class;
-	else if (fdt_is_compatible(node, "ns16550"))
-		class = &uart_ns8250_class;
+	for (cd = uart_fdt_compat_data; cd->ocd_str != NULL; ++cd) {
+		if (fdt_is_compatible(node, cd->ocd_str))
+			break;
+	}
+	if (cd->ocd_str == NULL)
+		return (ENXIO);
+	class = (struct uart_class *)cd->ocd_data;
 
 	di->bas.chan = 0;
 	di->bas.regshft = (u_int)shift;
diff --git a/sys/dev/uart/uart_cpu_powerpc.c b/sys/dev/uart/uart_cpu_powerpc.c
index 997bdd8bcfc..0791c7783ba 100644
--- a/sys/dev/uart/uart_cpu_powerpc.c
+++ b/sys/dev/uart/uart_cpu_powerpc.c
@@ -61,42 +61,96 @@ ofw_get_uart_console(phandle_t opts, phandle_t *result, const char *inputdev,
 	input = OF_finddevice(buf);
 	if (input == -1)
 		return (ENXIO);
-	if (OF_getprop(opts, outputdev, buf, sizeof(buf)) == -1)
-		return (ENXIO);
-	if (OF_finddevice(buf) != input)
-		return (ENXIO);
+
+	if (outputdev != NULL) {
+		if (OF_getprop(opts, outputdev, buf, sizeof(buf)) == -1)
+			return (ENXIO);
+		if (OF_finddevice(buf) != input)
+			return (ENXIO);
+	}
 
 	*result = input;
 	return (0);
 }
 
+static int
+ofw_get_console_phandle_path(phandle_t node, phandle_t *result,
+    const char *prop)
+{
+	union {
+		char buf[64];
+		phandle_t ref;
+	} field;
+	phandle_t output;
+	ssize_t size;
+
+	size = OF_getproplen(node, prop);
+	if (size == -1)
+		return (ENXIO);
+	OF_getprop(node, prop, &field, sizeof(field));
+
+	/* This property might be either a ihandle or path. Hooray. */
+
+	output = -1;
+	if (field.buf[size - 1] == 0)
+		output = OF_finddevice(field.buf);
+	if (output == -1 && size == 4)
+		output = OF_instance_to_package(field.ref);
+	
+	if (output != -1) {
+		*result = output;
+		return (0);
+	}
+
+	return (ENXIO);
+}
+
 int
 uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 {
 	char buf[64];
 	struct uart_class *class;
-	phandle_t input, opts;
+	phandle_t input, opts, chosen;
 	int error;
 
 	class = &uart_z8530_class;
 	if (class == NULL)
 		return (ENXIO);
 
-	if ((opts = OF_finddevice("/options")) == -1)
-		return (ENXIO);
+	opts = OF_finddevice("/options");
+	chosen = OF_finddevice("/chosen");
 	switch (devtype) {
 	case UART_DEV_CONSOLE:
-		if (ofw_get_uart_console(opts, &input, "input-device",
-		    "output-device")) {
-			/*
-			 * At least some G5 Xserves require that we
-			 * probe input-device-1 as well
-			 */
-	
-			if (ofw_get_uart_console(opts, &input, "input-device-1",
-			    "output-device-1"))
-				return (ENXIO);
+		error = ENXIO;
+		if (chosen != -1 && error != 0)
+			error = ofw_get_uart_console(chosen, &input,
+			    "stdout-path", NULL);
+		if (chosen != -1 && error != 0)
+			error = ofw_get_uart_console(chosen, &input,
+			    "linux,stdout-path", NULL);
+		if (chosen != -1 && error != 0)
+			error = ofw_get_console_phandle_path(chosen, &input,
+			    "stdout");
+		if (chosen != -1 && error != 0)
+			error = ofw_get_uart_console(chosen, &input,
+			    "stdin-path", NULL);
+		if (chosen != -1 && error != 0)
+			error = ofw_get_console_phandle_path(chosen, &input,
+			    "stdin");
+		if (opts != -1 && error != 0)
+			error = ofw_get_uart_console(opts, &input,
+			    "input-device", "output-device");
+		if (opts != -1 && error != 0)
+			error = ofw_get_uart_console(opts, &input,
+			    "input-device-1", "output-device-1");
+		if (error != 0) {
+			input = OF_finddevice("serial0"); /* Last ditch */
+			if (input == -1)
+				error = (ENXIO);
 		}
+
+		if (error != 0)
+			return (error);
 		break;
 	case UART_DEV_DBGPORT:
 		if (!getenv_string("hw.uart.dbgport", buf, sizeof(buf)))
@@ -113,14 +167,14 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 		return (ENXIO);
 	if (strcmp(buf, "serial") != 0)
 		return (ENXIO);
-	if (OF_getprop(input, "name", buf, sizeof(buf)) == -1)
+	if (OF_getprop(input, "compatible", buf, sizeof(buf)) == -1)
 		return (ENXIO);
 
-	if (strcmp(buf, "ch-a") == 0) {
+	if (strncmp(buf, "chrp,es", 7) == 0) {
 		class = &uart_z8530_class;
 		di->bas.regshft = 4;
 		di->bas.chan = 1;
-	} else if (strcmp(buf,"serial") == 0) {
+	} else if (strcmp(buf,"ns16550") == 0 || strcmp(buf,"ns8250") == 0) {
 		class = &uart_ns8250_class;
 		di->bas.regshft = 0;
 		di->bas.chan = 0;
@@ -139,9 +193,12 @@ uart_cpu_getdev(int devtype, struct uart_devinfo *di)
 	if (OF_getprop(input, "current-speed", &di->baudrate, 
 	    sizeof(di->baudrate)) == -1)
 		di->baudrate = 0;
+	OF_getprop(input, "reg-shift", &di->bas.regshft,
+	    sizeof(di->bas.regshft));
 
 	di->databits = 8;
 	di->stopbits = 1;
 	di->parity = UART_PARITY_NONE;
 	return (0);
 }
+
diff --git a/sys/dev/uart/uart_dev_imx.c b/sys/dev/uart/uart_dev_imx.c
index 1651a9f37eb..22ee8ccc83d 100644
--- a/sys/dev/uart/uart_dev_imx.c
+++ b/sys/dev/uart/uart_dev_imx.c
@@ -189,7 +189,7 @@ imx_uart_bus_attach(struct uart_softc *sc)
 
 	(void)imx_uart_bus_getsig(sc);
 
-	/* XXX workaround to have working console on manut prompt */
+	/* XXX workaround to have working console on mount prompt */
 	if (sc->sc_sysdev != NULL && sc->sc_sysdev->type == UART_DEV_CONSOLE){
 		DIS(bas, UCR4, DREN);
 	} else {
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index 211d1132186..249be4ce0e3 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -647,11 +647,35 @@ int
 ns8250_bus_param(struct uart_softc *sc, int baudrate, int databits,
     int stopbits, int parity)
 {
+	struct ns8250_softc *ns8250;
 	struct uart_bas *bas;
-	int error;
+	int error, limit;
 
+	ns8250 = (struct ns8250_softc*)sc;
 	bas = &sc->sc_bas;
 	uart_lock(sc->sc_hwmtx);
+	/*
+	 * When using DW UART with BUSY detection it is necessary to wait
+	 * until all serial transfers are finished before manipulating the
+	 * line control. LCR will not be affected when UART is busy.
+	 */
+	if (ns8250->busy_detect != 0) {
+		/*
+		 * Pick an arbitrary high limit to avoid getting stuck in
+		 * an infinite loop in case when the hardware is broken.
+		 */
+		limit = 10 * 1024;
+		while (((uart_getreg(bas, DW_REG_USR) & USR_BUSY) != 0) &&
+		    --limit)
+			DELAY(4);
+
+		if (limit <= 0) {
+			/* UART appears to be stuck */
+			uart_unlock(sc->sc_hwmtx);
+			return (EIO);
+		}
+	}
+
 	error = ns8250_param(bas, baudrate, databits, stopbits, parity);
 	uart_unlock(sc->sc_hwmtx);
 	return (error);
diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c
index 583dedfcc70..82e8b03654d 100644
--- a/sys/dev/uart/uart_dev_pl011.c
+++ b/sys/dev/uart/uart_dev_pl011.c
@@ -147,9 +147,6 @@ uart_pl011_param(struct uart_bas *bas, int baudrate, int databits, int stopbits,
 		break;
 	}
 
-	/* TODO: Calculate divisors */
-	baud = (0x1 << 16) | 0x28;
-
 	if (stopbits == 2)
 		line |= LCR_H_STP2;
 	else
@@ -164,8 +161,11 @@ uart_pl011_param(struct uart_bas *bas, int baudrate, int databits, int stopbits,
 	line &=  ~LCR_H_FEN;
 	ctrl |= (CR_RXE | CR_TXE | CR_UARTEN);
 
-	__uart_setreg(bas, UART_IBRD, ((uint32_t)(baud >> 16)) & IBRD_BDIVINT);
-	__uart_setreg(bas, UART_FBRD, (uint32_t)(baud) & FBRD_BDIVFRAC);
+	if (bas->rclk != 0 && baudrate != 0) {
+		baud = bas->rclk * 4 / baudrate;
+		__uart_setreg(bas, UART_IBRD, ((uint32_t)(baud >> 6)) & IBRD_BDIVINT);
+		__uart_setreg(bas, UART_FBRD, (uint32_t)(baud & 0x3F) & FBRD_BDIVFRAC);
+	}
 
 	/* Add config. to line before reenabling UART */
 	__uart_setreg(bas, UART_LCR_H, (__uart_getreg(bas, UART_LCR_H) &
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index 0e1b7cb5df6..6c06b71820b 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -259,7 +259,7 @@ ubsec_partname(struct ubsec_softc *sc)
 static void
 default_harvest(struct rndtest_state *rsp, void *buf, u_int count)
 {
-	random_harvest(buf, count, count*NBBY/2, 0, RANDOM_PURE);
+	random_harvest(buf, count, count*NBBY/2, RANDOM_PURE_UBSEC);
 }
 
 static int
diff --git a/sys/arm/broadcom/bcm2835/dwc_otg_brcm.c b/sys/dev/usb/controller/dwc_otg_fdt.c
similarity index 100%
rename from sys/arm/broadcom/bcm2835/dwc_otg_brcm.c
rename to sys/dev/usb/controller/dwc_otg_fdt.c
diff --git a/sys/dev/usb/controller/ehci.h b/sys/dev/usb/controller/ehci.h
index 6fba4d4c7af..808ff9f51bf 100644
--- a/sys/dev/usb/controller/ehci.h
+++ b/sys/dev/usb/controller/ehci.h
@@ -90,7 +90,7 @@ struct ehci_itd {
 #define	EHCI_ITD_GET_PG(x)	(((x) >> 12) & 0x7)
 #define	EHCI_ITD_SET_OFFS(x)	(x)
 #define	EHCI_ITD_GET_OFFS(x)	(((x) >> 0) & 0xFFF)
-#define	EHCI_ITD_ACTIVE		(1 << 31)
+#define	EHCI_ITD_ACTIVE		(1U << 31)
 #define	EHCI_ITD_DATABUFERR	(1 << 30)
 #define	EHCI_ITD_BABBLE		(1 << 29)
 #define	EHCI_ITD_XACTERR	(1 << 28)
@@ -126,7 +126,7 @@ struct ehci_sitd {
 	volatile uint32_t sitd_next;
 	volatile uint32_t sitd_portaddr;
 #define	EHCI_SITD_SET_DIR_OUT	(0 << 31)
-#define	EHCI_SITD_SET_DIR_IN	(1 << 31)
+#define	EHCI_SITD_SET_DIR_IN	(1U << 31)
 #define	EHCI_SITD_SET_ADDR(x)	(x)
 #define	EHCI_SITD_GET_ADDR(x)	((x) & 0x7F)
 #define	EHCI_SITD_SET_ENDPT(x)	((x) << 8)
diff --git a/sys/dev/usb/controller/ehci_imx.c b/sys/dev/usb/controller/ehci_imx.c
index e9f148c9ed1..6d91b7be1c8 100644
--- a/sys/dev/usb/controller/ehci_imx.c
+++ b/sys/dev/usb/controller/ehci_imx.c
@@ -1,6 +1,7 @@
 /*-
  * Copyright (c) 2010-2012 Semihalf
  * Copyright (c) 2012 The FreeBSD Foundation
+ * Copyright (c) 2013 Ian Lepore <ian@freebsd.org>
  * All rights reserved.
  *
  * Portions of this software were developed by Oleksandr Rybalko
@@ -31,7 +32,9 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_bus.h"
+/*
+ * EHCI driver for Freescale i.MX SoCs which incorporate the USBOH3 controller.
+ */
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -52,45 +55,261 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/usb_bus.h>
 #include <dev/usb/controller/ehci.h>
 #include <dev/usb/controller/ehcireg.h>
+#include "usbdevs.h"
 
 #include <machine/bus.h>
 #include <machine/resource.h>
 
+#include <arm/freescale/imx/imx_machdep.h>
+
 #include "opt_platform.h"
 
-#define	FSL_EHCI_COUNT		4
-#define FSL_EHCI_REG_OFF	0x100
-#define FSL_EHCI_REG_SIZE	0x100
-#define	FSL_EHCI_REG_STEP	0x200
+/*
+ * Notes on the hardware and related FDT data seen in the wild.
+ *
+ * There are two sets of registers in the USBOH3 implementation; documentation
+ * refers to them as "core" and "non-core" registers.  A set of core register
+ * exists for each OTG or EHCI device.  There is a single set of non-core
+ * registers per USBOH3, and they control aspects of operation not directly
+ * related to the USB specs, such as whether interrupts from each of the core
+ * devices are able to generate a SoC wakeup event.
+ *
+ * In the FreeBSD universe we might be inclined to describe the core and
+ * non-core registers by using a pair of resource address/size values (two
+ * entries in the reg property for each core).  However, we have to work with
+ * existing FDT data (which mostly comes from the linux universe), and the way
+ * they've chosen to represent this is with an entry for a "usbmisc" device
+ * whose reg property describes the non-core registers. The way we handle FDT
+ * data, this means that the resources (memory-mapped register range) for the
+ * non-core registers belongs to a device other than the echi devices.
+ *
+ * At the moment we have no need to access the non-core registers, so all of
+ * this amounts to documenting what's known.  The following compat strings have
+ * been seen in existing FDT data:
+ *   - "fsl,imx25-usbmisc"
+ *   - "fsl,imx51-usbmisc";
+ *   - "fsl,imx6q-usbmisc";
+ *
+ * In addition to the single usbmisc device, the existing FDT data defines a
+ * separate device for each of the OTG or EHCI cores within the USBOH3.  Each of
+ * those devices has a set of core registers described by the reg property.
+ *
+ * The core registers for each of the four cores in the USBOH3 are divided into
+ * two parts: a set of imx-specific registers at an offset of 0 from the
+ * beginning of the register range, and the standard USB (EHCI or OTG) registers
+ * at an offset of 0x100 from the beginning of the register range.  The FreeBSD
+ * way of dealing with this might be to map out two ranges in the reg property,
+ * but that's not what the alternate universe has done.  To work with existing
+ * FDT data, we acquire the resource that maps all the core registers, then use
+ * bus_space_subregion() to create another resource that maps just the standard
+ * USB registers, which we provide to the standard USB code in the ehci_softc.
+ *
+ * The following compat strings have been seen for the OTG and EHCI cores.  The
+ * FDT compat table in this driver contains all these strings, but as of this
+ * writing, not all of these SoCs have been tested with the driver.  The fact
+ * that imx27 is common to all of them gives some hope that the driver will work
+ * on all these SoCs.
+ *   - "fsl,imx23-usb", "fsl,imx27-usb";
+ *   - "fsl,imx25-usb", "fsl,imx27-usb";
+ *   - "fsl,imx28-usb", "fsl,imx27-usb";
+ *   - "fsl,imx51-usb", "fsl,imx27-usb";
+ *   - "fsl,imx53-usb", "fsl,imx27-usb";
+ *   - "fsl,imx6q-usb", "fsl,imx27-usb";
+ *
+ * The FDT data for some SoCs contains the following properties, which we don't
+ * currently do anything with:
+ *   - fsl,usbmisc = <&usbmisc 0>;
+ *   - fsl,usbphy = <&usbphy0>;
+ *
+ * Some imx SoCs have FDT data related to USB PHY, some don't.  We have separate
+ * usbphy drivers where needed; this data is mentioned here just to keep all the
+ * imx-FDT-usb-related info in one place.  Here are the usbphy compat strings
+ * known to exist:
+ *   - "nop-usbphy"
+ *   - "usb-nop-xceiv";
+ *   - "fsl,imx23-usbphy" 
+ *   - "fsl,imx28-usbphy", "fsl,imx23-usbphy";
+ *   - "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
+ *
+ */
+
+static struct ofw_compat_data compat_data[] = {
+	{"fsl,imx6q-usb",	1},
+	{"fsl,imx53-usb",	1},
+	{"fsl,imx51-usb",	1},
+	{"fsl,imx28-usb",	1},
+	{"fsl,imx27-usb",	1},
+	{"fsl,imx25-usb",	1},
+	{"fsl,imx23-usb",	1},
+	{NULL,		 	0},
+};
+
+/*
+ * Each EHCI device in the SoC has some SoC-specific per-device registers at an
+ * offset of 0, then the standard EHCI registers begin at an offset of 0x100.
+ */
+#define	IMX_EHCI_REG_OFF	0x100
+#define	IMX_EHCI_REG_SIZE	0x100
 
 struct imx_ehci_softc {
-	ehci_softc_t		ehci[FSL_EHCI_COUNT];
-	/* MEM + 4 interrupts */
-	struct resource		*sc_res[1 + FSL_EHCI_COUNT];
+	ehci_softc_t	ehci_softc;
+	struct resource	*ehci_mem_res;	/* EHCI core regs. */
+	struct resource	*ehci_irq_res;	/* EHCI core IRQ. */ 
 };
 
-/* i.MX515 have 4 EHCI inside USB core */
-/* TODO: we can get number of EHCIs by IRQ allocation */
-static struct resource_spec imx_ehci_spec[] = {
-	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		0,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		1,	RF_ACTIVE },
-	{ SYS_RES_IRQ,		2,	RF_ACTIVE },
-	/* RF_OPTIONAL will allow to use driver for systems with 3 EHCIs */
-	{ SYS_RES_IRQ,		3,	RF_ACTIVE | RF_OPTIONAL },
-	{ -1, 0 }
-};
+static int
+imx_ehci_probe(device_t dev)
+{
 
-/* Forward declarations */
-static int	fsl_ehci_attach(device_t self);
-static int	fsl_ehci_detach(device_t self);
-static int	fsl_ehci_probe(device_t self);
+	if (ofw_bus_search_compatible(dev, compat_data)->ocd_data != 0) {
+		device_set_desc(dev, "Freescale i.MX integrated USB controller");
+		return (BUS_PROBE_DEFAULT);
+	}
+	return (ENXIO);
+}
+
+static int
+imx_ehci_detach(device_t dev)
+{
+	struct imx_ehci_softc *sc;
+	ehci_softc_t *esc;
+
+	sc = device_get_softc(dev);
+
+	esc = &sc->ehci_softc;
+
+	if (esc->sc_bus.bdev != NULL)
+		device_delete_child(dev, esc->sc_bus.bdev);
+	if (esc->sc_flags & EHCI_SCFLG_DONEINIT)
+		ehci_detach(esc);
+	if (esc->sc_intr_hdl != NULL)
+		bus_teardown_intr(dev, esc->sc_irq_res, 
+		    esc->sc_intr_hdl);
+	if (sc->ehci_irq_res != NULL)
+		bus_release_resource(dev, SYS_RES_IRQ, 0, 
+		    sc->ehci_irq_res);
+	if (sc->ehci_mem_res != NULL)
+		bus_release_resource(dev, SYS_RES_MEMORY, 0,
+		    sc->ehci_mem_res);
+
+	usb_bus_mem_free_all(&esc->sc_bus, &ehci_iterate_hw_softc);
+
+	/* During module unload there are lots of children leftover */
+	device_delete_children(dev);
+
+	return (0);
+}
+
+static int
+imx_ehci_attach(device_t dev)
+{
+	struct imx_ehci_softc *sc;
+	ehci_softc_t *esc;
+	int err, rid;
+
+	sc = device_get_softc(dev);
+	esc = &sc->ehci_softc;
+	err = 0;
+
+	/* Allocate bus_space resources. */
+	rid = 0;
+	sc->ehci_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (sc->ehci_mem_res == NULL) {
+		device_printf(dev, "Cannot allocate memory resources\n");
+		err = ENXIO;
+		goto out;
+	}
+
+	rid = 0;
+	sc->ehci_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE);
+	if (sc->ehci_irq_res == NULL) {
+		device_printf(dev, "Cannot allocate IRQ resources\n");
+		err = ENXIO;
+		goto out;
+	}
+
+	esc->sc_io_tag = rman_get_bustag(sc->ehci_mem_res);
+	esc->sc_bus.parent = dev;
+	esc->sc_bus.devices = esc->sc_devices;
+	esc->sc_bus.devices_max = EHCI_MAX_DEVICES;
+
+	if (usb_bus_mem_alloc_all(&esc->sc_bus, USB_GET_DMA_TAG(dev),
+	    &ehci_iterate_hw_softc) != 0) {
+		device_printf(dev, "usb_bus_mem_alloc_all() failed\n");
+		err = ENOMEM;
+		goto out;
+	}
+
+	/*
+	 * Set handle to USB related registers subregion used by
+	 * generic EHCI driver.
+	 */
+	err = bus_space_subregion(esc->sc_io_tag, 
+	    rman_get_bushandle(sc->ehci_mem_res),
+	    IMX_EHCI_REG_OFF, IMX_EHCI_REG_SIZE, &esc->sc_io_hdl);
+	if (err != 0) {
+		device_printf(dev, "bus_space_subregion() failed\n");
+		err = ENXIO;
+		goto out;
+	}
+
+	/* Setup interrupt handler. */
+	err = bus_setup_intr(dev, sc->ehci_irq_res, INTR_TYPE_BIO, NULL, 
+	    (driver_intr_t *)ehci_interrupt, esc, &esc->sc_intr_hdl);
+	if (err != 0) {
+		device_printf(dev, "Could not setup IRQ\n");
+		goto out;
+	}
+
+	/* Turn on clocks. */
+	imx_ccm_usb_enable(dev);
+
+	/* Add USB bus device. */
+	esc->sc_bus.bdev = device_add_child(dev, "usbus", -1);
+	if (esc->sc_bus.bdev == NULL) {
+		device_printf(dev, "Could not add USB device\n");
+		goto out;
+	}
+	device_set_ivars(esc->sc_bus.bdev, &esc->sc_bus);
+
+	esc->sc_id_vendor = USB_VENDOR_FREESCALE;
+	strlcpy(esc->sc_vendor, "Freescale", sizeof(esc->sc_vendor));
+
+	/* Set flags that affect ehci_init() behavior. */
+	esc->sc_flags |= EHCI_SCFLG_DONTRESET | EHCI_SCFLG_NORESTERM;
+	err = ehci_init(esc);
+	if (err != 0) {
+		device_printf(dev, "USB init failed, usb_err_t=%d\n", 
+		    err);
+		goto out;
+	}
+	esc->sc_flags |= EHCI_SCFLG_DONEINIT;
+
+	/* Probe the bus. */
+	err = device_probe_and_attach(esc->sc_bus.bdev);
+	if (err != 0) {
+		device_printf(dev,
+		    "device_probe_and_attach() failed\n");
+		goto out;
+	}
+
+	err = 0;
+
+out:
+
+	if (err != 0)
+		imx_ehci_detach(dev);
+
+	return (err);
+}
 
 static device_method_t ehci_methods[] = {
 	/* Device interface */
-	DEVMETHOD(device_probe, fsl_ehci_probe),
-	DEVMETHOD(device_attach, fsl_ehci_attach),
-	DEVMETHOD(device_detach, fsl_ehci_detach),
+	DEVMETHOD(device_probe, imx_ehci_probe),
+	DEVMETHOD(device_attach, imx_ehci_attach),
+	DEVMETHOD(device_detach, imx_ehci_detach),
 	DEVMETHOD(device_suspend, bus_generic_suspend),
 	DEVMETHOD(device_resume, bus_generic_resume),
 	DEVMETHOD(device_shutdown, bus_generic_shutdown),
@@ -98,10 +317,9 @@ static device_method_t ehci_methods[] = {
 	/* Bus interface */
 	DEVMETHOD(bus_print_child, bus_generic_print_child),
 
-	{ 0, 0 }
+	DEVMETHOD_END
 };
 
-/* kobj_class definition */
 static driver_t ehci_driver = {
 	"ehci",
 	ehci_methods,
@@ -112,171 +330,3 @@ static devclass_t ehci_devclass;
 
 DRIVER_MODULE(ehci, simplebus, ehci_driver, ehci_devclass, 0, 0);
 MODULE_DEPEND(ehci, usb, 1, 1, 1);
-
-/*
- * Public methods
- */
-static int
-fsl_ehci_probe(device_t dev)
-{
-
-	if (ofw_bus_is_compatible(dev, "fsl,usb-4core") == 0)
-		return (ENXIO);
-
-	device_set_desc(dev, "Freescale integrated USB controller");
-
-	return (BUS_PROBE_DEFAULT);
-}
-
-static int
-fsl_ehci_attach(device_t self)
-{
-	struct imx_ehci_softc *sc;
-	bus_space_tag_t iot;
-	ehci_softc_t *esc;
-	int err, i, rid;
-
-	sc = device_get_softc(self);
-	rid = 0;
-
-	/* Allocate io resource for EHCI */
-	if (bus_alloc_resources(self, imx_ehci_spec, sc->sc_res)) {
-		device_printf(self, "could not allocate resources\n");
-		return (ENXIO);
-	}
-	iot = rman_get_bustag(sc->sc_res[0]);
-
-	/* TODO: Power/clock enable */
-	/* TODO: basic init */
-
-	for (i = 0; i < FSL_EHCI_COUNT; i ++) {
-		/* No interrupt - no driver */
-		if (sc->sc_res[1 + i] == NULL)
-			continue;
-
-		esc = &sc->ehci[i];
-		esc->sc_io_tag = iot;
-		esc->sc_bus.parent = self;
-		esc->sc_bus.devices = esc->sc_devices;
-		esc->sc_bus.devices_max = EHCI_MAX_DEVICES;
-
-		if (usb_bus_mem_alloc_all(&esc->sc_bus, USB_GET_DMA_TAG(self),
-		    &ehci_iterate_hw_softc))
-			continue;
-
-		/*
-		 * Set handle to USB related registers subregion used by
-		 * generic EHCI driver.
-		 */
-		err = bus_space_subregion(iot,
-		    rman_get_bushandle(sc->sc_res[0]),
-		    FSL_EHCI_REG_OFF + (i * FSL_EHCI_REG_STEP),
-		    FSL_EHCI_REG_SIZE, &esc->sc_io_hdl);
-		if (err != 0)
-			continue;
-
-		/* Setup interrupt handler */
-		err = bus_setup_intr(self, sc->sc_res[1 + i], INTR_TYPE_BIO,
-		    NULL, (driver_intr_t *)ehci_interrupt, esc,
-		    &esc->sc_intr_hdl);
-		if (err) {
-			device_printf(self, "Could not setup irq, "
-			    "for EHCI%d %d\n", i, err);
-			continue;
-		}
-
-		/* Add USB device */
-		esc->sc_bus.bdev = device_add_child(self, "usbus", -1);
-		if (!esc->sc_bus.bdev) {
-			device_printf(self, "Could not add USB device\n");
-			err = bus_teardown_intr(self, esc->sc_irq_res,
-			    esc->sc_intr_hdl);
-			if (err)
-				device_printf(self, "Could not tear down irq,"
-				    " %d\n", err);
-			continue;
-		}
-		device_set_ivars(esc->sc_bus.bdev, &esc->sc_bus);
-
-		esc->sc_id_vendor = 0x1234;
-		strlcpy(esc->sc_vendor, "Freescale", sizeof(esc->sc_vendor));
-
-		/* Set flags */
-		esc->sc_flags |= EHCI_SCFLG_DONTRESET | EHCI_SCFLG_NORESTERM;
-
-		err = ehci_init(esc);
-		if (!err) {
-			esc->sc_flags |= EHCI_SCFLG_DONEINIT;
-			err = device_probe_and_attach(esc->sc_bus.bdev);
-		} else {
-			device_printf(self, "USB init failed err=%d\n", err);
-
-			device_delete_child(self, esc->sc_bus.bdev);
-			esc->sc_bus.bdev = NULL;
-
-			err = bus_teardown_intr(self, esc->sc_irq_res,
-			    esc->sc_intr_hdl);
-			if (err)
-				device_printf(self, "Could not tear down irq,"
-				    " %d\n", err);
-
-			continue;
-		}
-	}
-	return (0);
-}
-
-static int
-fsl_ehci_detach(device_t self)
-{
-	struct imx_ehci_softc *sc;
-	ehci_softc_t *esc;
-	int err, i;
-
-	sc = device_get_softc(self);
-
-	for (i = 0; i < FSL_EHCI_COUNT; i ++) {
-		esc = &sc->ehci[i];
-		if (esc->sc_flags & EHCI_SCFLG_DONEINIT)
-			continue;
-		/*
-		 * only call ehci_detach() after ehci_init()
-		 */
-		if (esc->sc_flags & EHCI_SCFLG_DONEINIT) {
-			ehci_detach(esc);
-			esc->sc_flags &= ~EHCI_SCFLG_DONEINIT;
-		}
-
-		/*
-		 * Disable interrupts that might have been switched on in
-		 * ehci_init.
-		 */
-		if (esc->sc_io_tag && esc->sc_io_hdl)
-			bus_space_write_4(esc->sc_io_tag, esc->sc_io_hdl,
-			    EHCI_USBINTR, 0);
-
-		if (esc->sc_irq_res && esc->sc_intr_hdl) {
-			err = bus_teardown_intr(self, esc->sc_irq_res,
-			    esc->sc_intr_hdl);
-			if (err) {
-				device_printf(self, "Could not tear down irq,"
-				    " %d\n", err);
-				return (err);
-			}
-			esc->sc_intr_hdl = NULL;
-		}
-
-		if (esc->sc_bus.bdev) {
-			device_delete_child(self, esc->sc_bus.bdev);
-			esc->sc_bus.bdev = NULL;
-		}
-	}
-
-	/* During module unload there are lots of children leftover */
-	device_delete_children(self);
-
-	if (sc->sc_res[0])
-		bus_release_resources(self, imx_ehci_spec, sc->sc_res);
-
-	return (0);
-}
diff --git a/sys/dev/usb/controller/ehci_pci.c b/sys/dev/usb/controller/ehci_pci.c
index 6914f5094d3..a6b1fa6cee3 100644
--- a/sys/dev/usb/controller/ehci_pci.c
+++ b/sys/dev/usb/controller/ehci_pci.c
@@ -124,6 +124,8 @@ ehci_pci_match(device_t self)
 		return ("Intel Panther Point USB 2.0 controller");
 	case 0x1e2d8086:
 		return ("Intel Panther Point USB 2.0 controller");
+	case 0x1f2c8086:
+		return ("Intel Avoton USB 2.0 controller");
 	case 0x25ad8086:
 		return "Intel 6300ESB USB 2.0 controller";
 	case 0x24cd8086:
@@ -152,6 +154,10 @@ ehci_pci_match(device_t self)
 		return ("Intel PCH USB 2.0 controller USB-A");
 	case 0x3b3c8086:
 		return ("Intel PCH USB 2.0 controller USB-B");
+	case 0x8c268086:
+		return ("Intel Lynx Point USB 2.0 controller USB-A");
+	case 0x8c2d8086:
+		return ("Intel Lynx Point USB 2.0 controller USB-B");
 
 	case 0x00e01033:
 		return ("NEC uPD 720100 USB 2.0 controller");
diff --git a/sys/dev/usb/controller/musb_otg.c b/sys/dev/usb/controller/musb_otg.c
index 9b2974f267c..6944a599eef 100644
--- a/sys/dev/usb/controller/musb_otg.c
+++ b/sys/dev/usb/controller/musb_otg.c
@@ -1661,7 +1661,7 @@ repeat:
 	}
 
 	/* Max packet size */
-	MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, td->max_packet);
+	MUSB2_WRITE_2(sc, MUSB2_REG_TXMAXP, td->reg_max_packet);
 
 	/* write command */
 	MUSB2_WRITE_1(sc, MUSB2_REG_TXCSRL,
@@ -1726,13 +1726,16 @@ repeat:
 		    td->hport);
 
 		/* RX NAK timeout */
-		MUSB2_WRITE_1(sc, MUSB2_REG_RXNAKLIMIT, MAX_NAK_TO);
+		if (td->transfer_type & MUSB2_MASK_TI_PROTO_ISOC)
+			MUSB2_WRITE_1(sc, MUSB2_REG_RXNAKLIMIT, 0);
+		else
+			MUSB2_WRITE_1(sc, MUSB2_REG_RXNAKLIMIT, MAX_NAK_TO);
 
 		/* Protocol, speed, device endpoint */
 		MUSB2_WRITE_1(sc, MUSB2_REG_RXTI, td->transfer_type);
 
 		/* Max packet size */
-		MUSB2_WRITE_1(sc, MUSB2_REG_RXMAXP, td->max_packet);
+		MUSB2_WRITE_2(sc, MUSB2_REG_RXMAXP, td->reg_max_packet);
 
 		/* Data Toggle */
 		csrh = MUSB2_READ_1(sc, MUSB2_REG_RXCSRH);
@@ -1938,7 +1941,7 @@ musbotg_host_data_tx(struct musbotg_td *td)
 		return (0);	/* complete */
 	}
 
-	if (csr & MUSB2_MASK_CSRL_TXNAKTO ) {
+	if (csr & MUSB2_MASK_CSRL_TXNAKTO) {
 		/* 
 		 * Flush TX FIFO before clearing NAK TO
 		 */
@@ -2069,13 +2072,16 @@ musbotg_host_data_tx(struct musbotg_td *td)
 	    td->hport);
 
 	/* TX NAK timeout */
-	MUSB2_WRITE_1(sc, MUSB2_REG_TXNAKLIMIT, MAX_NAK_TO);
+	if (td->transfer_type & MUSB2_MASK_TI_PROTO_ISOC)
+		MUSB2_WRITE_1(sc, MUSB2_REG_TXNAKLIMIT, 0);
+	else
+		MUSB2_WRITE_1(sc, MUSB2_REG_TXNAKLIMIT, MAX_NAK_TO);
 
 	/* Protocol, speed, device endpoint */
 	MUSB2_WRITE_1(sc, MUSB2_REG_TXTI, td->transfer_type);
 
 	/* Max packet size */
-	MUSB2_WRITE_1(sc, MUSB2_REG_TXMAXP, td->max_packet);
+	MUSB2_WRITE_2(sc, MUSB2_REG_TXMAXP, td->reg_max_packet);
 
 	if (!td->transaction_started) {
 		csrh = MUSB2_READ_1(sc, MUSB2_REG_TXCSRH);
@@ -2406,7 +2412,6 @@ musbotg_setup_standard_chain(struct usb_xfer *xfer)
 
 	if (xfer->flags_int.usb_mode == USB_MODE_HOST) {
 		speed =  usbd_get_speed(xfer->xroot->udev);
-		xfer_type = xfer->endpoint->edesc->bmAttributes & UE_XFERTYPE;
 
 		switch (speed) {
 			case USB_SPEED_LOW:
@@ -2444,7 +2449,6 @@ musbotg_setup_standard_chain(struct usb_xfer *xfer)
 		}
 
 		temp.transfer_type |= ep_no;
-		td->max_packet = xfer->max_packet_size;
 		td->toggle = xfer->endpoint->toggle_next;
 	}
 
@@ -2469,9 +2473,9 @@ musbotg_setup_standard_chain(struct usb_xfer *xfer)
 		x = 0;
 	}
 
-	if (x != xfer->nframes) {
-		tx = 0;
+	tx = 0;
 
+	if (x != xfer->nframes) {
 		if (xfer->endpointno & UE_DIR_IN)
 		    	tx = 1;
 
@@ -2532,9 +2536,14 @@ musbotg_setup_standard_chain(struct usb_xfer *xfer)
 
 		} else {
 
-			/* regular data transfer */
-
-			temp.short_pkt = (xfer->flags.force_short_xfer) ? 0 : 1;
+			if (xfer->flags_int.isochronous_xfr) {
+				/* isochronous data transfer */
+				/* don't force short */
+				temp.short_pkt = 1;
+			} else {
+				/* regular data transfer */
+				temp.short_pkt = (xfer->flags.force_short_xfer ? 0 : 1);
+			}
 		}
 
 		musbotg_setup_standard_chain_sub(&temp);
@@ -3158,7 +3167,12 @@ musbotg_init(struct musbotg_softc *sc)
 
 		if (dynfifo) {
 			if (frx && (temp <= nrx)) {
-				if (temp < 8) {
+				if (temp == 1) {
+					frx = 12;	/* 4K */
+					MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOSZ, 
+					    MUSB2_VAL_FIFOSZ_4096 |
+					    MUSB2_MASK_FIFODB);
+				} else if (temp < 8) {
 					frx = 10;	/* 1K */
 					MUSB2_WRITE_1(sc, MUSB2_REG_RXFIFOSZ, 
 					    MUSB2_VAL_FIFOSZ_512 |
@@ -3175,7 +3189,12 @@ musbotg_init(struct musbotg_softc *sc)
 				offset += (1 << frx);
 			}
 			if (ftx && (temp <= ntx)) {
-				if (temp < 8) {
+				if (temp == 1) {
+					ftx = 12;	/* 4K */
+					MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOSZ,
+	 				    MUSB2_VAL_FIFOSZ_4096 |
+	 				    MUSB2_MASK_FIFODB);
+				} else if (temp < 8) {
 					ftx = 10;	/* 1K */
 					MUSB2_WRITE_1(sc, MUSB2_REG_TXFIFOSZ,
 	 				    MUSB2_VAL_FIFOSZ_512 |
@@ -4042,7 +4061,7 @@ musbotg_xfer_setup(struct usb_setup_params *parm)
 	 * reasonable dummies:
 	 */
 	parm->hc_max_packet_size = 0x400;
-	parm->hc_max_frame_size = 0x400;
+	parm->hc_max_frame_size = 0xc00;
 
 	if ((parm->methods == &musbotg_device_isoc_methods) ||
 	    (parm->methods == &musbotg_device_intr_methods))
@@ -4117,6 +4136,8 @@ musbotg_xfer_setup(struct usb_setup_params *parm)
 
 			/* init TD */
 			td->max_frame_size = xfer->max_frame_size;
+			td->reg_max_packet = xfer->max_packet_size |
+			    ((xfer->max_packet_count - 1) << 11);
 			td->ep_no = ep_no;
 			td->obj_next = last_obj;
 
diff --git a/sys/dev/usb/controller/musb_otg.h b/sys/dev/usb/controller/musb_otg.h
index 649cab8d61b..f8f3470dd9d 100644
--- a/sys/dev/usb/controller/musb_otg.h
+++ b/sys/dev/usb/controller/musb_otg.h
@@ -316,9 +316,9 @@ struct musbotg_td {
 	uint32_t offset;
 	uint32_t remainder;
 	uint16_t max_frame_size;	/* packet_size * mult */
+	uint16_t reg_max_packet;
 	uint8_t	ep_no;
 	uint8_t	transfer_type;
-	uint8_t	max_packet;
 	uint8_t	error:1;
 	uint8_t	alt_next:1;
 	uint8_t	short_pkt:1;
diff --git a/sys/dev/usb/controller/usb_controller.c b/sys/dev/usb/controller/usb_controller.c
index 0abb42f1e75..bbb9e85df95 100644
--- a/sys/dev/usb/controller/usb_controller.c
+++ b/sys/dev/usb/controller/usb_controller.c
@@ -295,6 +295,28 @@ usb_resume(device_t dev)
 	return (0);
 }
 
+/*------------------------------------------------------------------------*
+ *	usb_bus_reset_async_locked
+ *------------------------------------------------------------------------*/
+void
+usb_bus_reset_async_locked(struct usb_bus *bus)
+{
+	USB_BUS_LOCK_ASSERT(bus, MA_OWNED);
+
+	DPRINTF("\n");
+
+	if (bus->reset_msg[0].hdr.pm_qentry.tqe_prev != NULL ||
+	    bus->reset_msg[1].hdr.pm_qentry.tqe_prev != NULL) {
+		DPRINTF("Reset already pending\n");
+		return;
+	}
+
+	device_printf(bus->parent, "Resetting controller\n");
+
+	usb_proc_msignal(USB_BUS_EXPLORE_PROC(bus),
+	    &bus->reset_msg[0], &bus->reset_msg[1]);
+}
+
 /*------------------------------------------------------------------------*
  *	usb_shutdown
  *------------------------------------------------------------------------*/
@@ -419,7 +441,7 @@ usb_bus_detach(struct usb_proc_msg *pm)
 /*------------------------------------------------------------------------*
  *	usb_bus_suspend
  *
- * This function is used to suspend the USB contoller.
+ * This function is used to suspend the USB controller.
  *------------------------------------------------------------------------*/
 static void
 usb_bus_suspend(struct usb_proc_msg *pm)
@@ -429,6 +451,8 @@ usb_bus_suspend(struct usb_proc_msg *pm)
 	usb_error_t err;
 	uint8_t do_unlock;
 
+	DPRINTF("\n");
+
 	bus = ((struct usb_bus_msg *)pm)->bus;
 	udev = bus->devices[USB_ROOT_HUB_ADDR];
 
@@ -474,7 +498,7 @@ usb_bus_suspend(struct usb_proc_msg *pm)
 /*------------------------------------------------------------------------*
  *	usb_bus_resume
  *
- * This function is used to resume the USB contoller.
+ * This function is used to resume the USB controller.
  *------------------------------------------------------------------------*/
 static void
 usb_bus_resume(struct usb_proc_msg *pm)
@@ -484,6 +508,8 @@ usb_bus_resume(struct usb_proc_msg *pm)
 	usb_error_t err;
 	uint8_t do_unlock;
 
+	DPRINTF("\n");
+
 	bus = ((struct usb_bus_msg *)pm)->bus;
 	udev = bus->devices[USB_ROOT_HUB_ADDR];
 
@@ -532,10 +558,32 @@ usb_bus_resume(struct usb_proc_msg *pm)
 	USB_BUS_LOCK(bus);
 }
 
+/*------------------------------------------------------------------------*
+ *	usb_bus_reset
+ *
+ * This function is used to reset the USB controller.
+ *------------------------------------------------------------------------*/
+static void
+usb_bus_reset(struct usb_proc_msg *pm)
+{
+	struct usb_bus *bus;
+
+	DPRINTF("\n");
+
+	bus = ((struct usb_bus_msg *)pm)->bus;
+
+	if (bus->bdev == NULL || bus->no_explore != 0)
+		return;
+
+	/* a suspend and resume will reset the USB controller */
+	usb_bus_suspend(pm);
+	usb_bus_resume(pm);
+}
+
 /*------------------------------------------------------------------------*
  *	usb_bus_shutdown
  *
- * This function is used to shutdown the USB contoller.
+ * This function is used to shutdown the USB controller.
  *------------------------------------------------------------------------*/
 static void
 usb_bus_shutdown(struct usb_proc_msg *pm)
@@ -750,6 +798,11 @@ usb_attach_sub(device_t dev, struct usb_bus *bus)
 	bus->resume_msg[1].hdr.pm_callback = &usb_bus_resume;
 	bus->resume_msg[1].bus = bus;
 
+	bus->reset_msg[0].hdr.pm_callback = &usb_bus_reset;
+	bus->reset_msg[0].bus = bus;
+	bus->reset_msg[1].hdr.pm_callback = &usb_bus_reset;
+	bus->reset_msg[1].bus = bus;
+
 	bus->shutdown_msg[0].hdr.pm_callback = &usb_bus_shutdown;
 	bus->shutdown_msg[0].bus = bus;
 	bus->shutdown_msg[1].hdr.pm_callback = &usb_bus_shutdown;
diff --git a/sys/dev/usb/controller/xhci.c b/sys/dev/usb/controller/xhci.c
index 0f8470e1279..75f3d5efb2d 100644
--- a/sys/dev/usb/controller/xhci.c
+++ b/sys/dev/usb/controller/xhci.c
@@ -278,6 +278,69 @@ xhci_ctx_get_le64(struct xhci_softc *sc, volatile uint64_t *ptr)
 }
 #endif
 
+static int
+xhci_reset_command_queue_locked(struct xhci_softc *sc)
+{
+	struct usb_page_search buf_res;
+	struct xhci_hw_root *phwr;
+	uint64_t addr;
+	uint32_t temp;
+
+	DPRINTF("\n");
+
+	temp = XREAD4(sc, oper, XHCI_CRCR_LO);
+	if (temp & XHCI_CRCR_LO_CRR) {
+		DPRINTF("Command ring running\n");
+		temp &= ~(XHCI_CRCR_LO_CS | XHCI_CRCR_LO_CA);
+
+		/*
+		 * Try to abort the last command as per section
+		 * 4.6.1.2 "Aborting a Command" of the XHCI
+		 * specification:
+		 */
+
+		/* stop and cancel */
+		XWRITE4(sc, oper, XHCI_CRCR_LO, temp | XHCI_CRCR_LO_CS);
+		XWRITE4(sc, oper, XHCI_CRCR_HI, 0);
+
+		XWRITE4(sc, oper, XHCI_CRCR_LO, temp | XHCI_CRCR_LO_CA);
+		XWRITE4(sc, oper, XHCI_CRCR_HI, 0);
+
+ 		/* wait 250ms */
+ 		usb_pause_mtx(&sc->sc_bus.bus_mtx, hz / 4);
+
+		/* check if command ring is still running */
+		temp = XREAD4(sc, oper, XHCI_CRCR_LO);
+		if (temp & XHCI_CRCR_LO_CRR) {
+			DPRINTF("Comand ring still running\n");
+			return (USB_ERR_IOERROR);
+		}
+	}
+
+	/* reset command ring */
+	sc->sc_command_ccs = 1;
+	sc->sc_command_idx = 0;
+
+	usbd_get_page(&sc->sc_hw.root_pc, 0, &buf_res);
+
+	/* setup command ring control base address */
+	addr = buf_res.physaddr;
+	phwr = buf_res.buffer;
+	addr += (uintptr_t)&((struct xhci_hw_root *)0)->hwr_commands[0];
+
+	DPRINTF("CRCR=0x%016llx\n", (unsigned long long)addr);
+
+	memset(phwr->hwr_commands, 0, sizeof(phwr->hwr_commands));
+	phwr->hwr_commands[XHCI_MAX_COMMANDS - 1].qwTrb0 = htole64(addr);
+
+	usb_pc_cpu_flush(&sc->sc_hw.root_pc);
+
+	XWRITE4(sc, oper, XHCI_CRCR_LO, ((uint32_t)addr) | XHCI_CRCR_LO_RCS);
+	XWRITE4(sc, oper, XHCI_CRCR_HI, (uint32_t)(addr >> 32));
+
+	return (0);
+}
+
 usb_error_t
 xhci_start_controller(struct xhci_softc *sc)
 {
@@ -1059,6 +1122,7 @@ xhci_do_command(struct xhci_softc *sc, struct xhci_trb *trb,
 	uint32_t temp;
 	uint8_t i;
 	uint8_t j;
+	uint8_t timeout = 0;
 	int err;
 
 	XHCI_CMD_ASSERT_LOCKED(sc);
@@ -1072,7 +1136,7 @@ xhci_do_command(struct xhci_softc *sc, struct xhci_trb *trb,
 	/* Queue command */
 
 	USB_BUS_LOCK(&sc->sc_bus);
-
+retry:
 	i = sc->sc_command_idx;
 	j = sc->sc_command_ccs;
 
@@ -1143,7 +1207,23 @@ xhci_do_command(struct xhci_softc *sc, struct xhci_trb *trb,
 		err = 0;
 	}
 	if (err != 0) {
-		DPRINTFN(0, "Command timeout!\n");
+		DPRINTF("Command timeout!\n");
+		/*
+		 * After some weeks of continuous operation, it has
+		 * been observed that the ASMedia Technology, ASM1042
+		 * SuperSpeed USB Host Controller can suddenly stop
+		 * accepting commands via the command queue. Try to
+		 * first reset the command queue. If that fails do a
+		 * host controller reset.
+		 */
+		if (timeout == 0 &&
+		    xhci_reset_command_queue_locked(sc) == 0) {
+			timeout = 1;
+			goto retry;
+		} else {
+			DPRINTF("Controller reset!\n");
+			usb_bus_reset_async_locked(&sc->sc_bus);
+		}
 		err = USB_ERR_TIMEOUT;
 		trb->dwTrb2 = 0;
 		trb->dwTrb3 = 0;
@@ -2521,7 +2601,11 @@ xhci_configure_device(struct usb_device *udev)
 
 	xhci_ctx_set_le32(sc, &pinp->ctx_slot.dwSctx2, temp);
 
-	temp = XHCI_SCTX_3_DEV_ADDR_SET(udev->address) |
+	/*
+	 * These fields should be initialized to zero, according to
+	 * XHCI section 6.2.2 - slot context:
+	 */
+	temp = XHCI_SCTX_3_DEV_ADDR_SET(0) |
 	    XHCI_SCTX_3_SLOT_STATE_SET(0);
 
 	xhci_ctx_set_le32(sc, &pinp->ctx_slot.dwSctx3, temp);
diff --git a/sys/dev/usb/net/if_aue.c b/sys/dev/usb/net/if_aue.c
index 1681a2a38b4..e9d664696b1 100644
--- a/sys/dev/usb/net/if_aue.c
+++ b/sys/dev/usb/net/if_aue.c
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
@@ -87,6 +88,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
diff --git a/sys/dev/usb/net/if_axe.c b/sys/dev/usb/net/if_axe.c
index ac6c2302a78..e4f3153c82f 100644
--- a/sys/dev/usb/net/if_axe.c
+++ b/sys/dev/usb/net/if_axe.c
@@ -93,6 +93,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sx.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
diff --git a/sys/dev/usb/net/if_axge.c b/sys/dev/usb/net/if_axge.c
new file mode 100644
index 00000000000..8d1d7c1945e
--- /dev/null
+++ b/sys/dev/usb/net/if_axge.c
@@ -0,0 +1,1023 @@
+/*-
+ * Copyright (c) 2013 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+/*
+ * ASIX Electronics AX88178A/AX88179 USB 2.0/3.0 gigabit ethernet driver.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/condvar.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/unistd.h>
+
+#include <net/if.h>
+#include <net/if_var.h>
+
+#include <dev/usb/usb.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdi_util.h>
+#include "usbdevs.h"
+
+#define	USB_DEBUG_VAR 	axge_debug
+#include <dev/usb/usb_debug.h>
+#include <dev/usb/usb_process.h>
+
+#include <dev/usb/net/usb_ethernet.h>
+#include <dev/usb/net/if_axgereg.h>
+
+/*
+ * Various supported device vendors/products.
+ */
+
+static const STRUCT_USB_HOST_ID axge_devs[] = {
+#define	AXGE_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
+	AXGE_DEV(ASIX, AX88178A),
+	AXGE_DEV(ASIX, AX88179),
+	/* AXGE_DEV(SITECOMEU, LN032), */
+#undef AXGE_DEV
+};
+
+static const struct {
+	unsigned char ctrl, timer_l, timer_h, size, ifg;
+} AX88179_BULKIN_SIZE[] = {
+	{7, 0x4f, 0,    0x12, 0xff},
+	{7, 0x20, 3,    0x16, 0xff},
+	{7, 0xae, 7,    0x18, 0xff},
+	{7, 0xcc, 0x4c, 0x18, 8},
+};
+
+/* prototypes */
+
+static device_probe_t axge_probe;
+static device_attach_t axge_attach;
+static device_detach_t axge_detach;
+
+static usb_callback_t axge_bulk_read_callback;
+static usb_callback_t axge_bulk_write_callback;
+
+static miibus_readreg_t axge_miibus_readreg;
+static miibus_writereg_t axge_miibus_writereg;
+static miibus_statchg_t axge_miibus_statchg;
+
+static uether_fn_t axge_attach_post;
+static uether_fn_t axge_init;
+static uether_fn_t axge_stop;
+static uether_fn_t axge_start;
+static uether_fn_t axge_tick;
+static uether_fn_t axge_setmulti;
+static uether_fn_t axge_setpromisc;
+
+static int	axge_read_mem(struct axge_softc *, uint8_t, uint16_t,
+		    uint16_t, void *, int);
+static void	axge_write_mem(struct axge_softc *, uint8_t, uint16_t,
+		    uint16_t, void *, int);
+static uint16_t	axge_read_cmd_2(struct axge_softc *, uint8_t, uint16_t,
+		    uint16_t);
+static void	axge_write_cmd_1(struct axge_softc *, uint8_t, uint16_t,
+		    uint16_t, uint8_t);
+static void	axge_write_cmd_2(struct axge_softc *, uint8_t, uint16_t,
+		    uint16_t, uint16_t);
+static void	axge_chip_init(struct axge_softc *);
+static void	axge_reset(struct axge_softc *);
+
+static int	axge_attach_post_sub(struct usb_ether *);
+static int	axge_ifmedia_upd(struct ifnet *);
+static void	axge_ifmedia_sts(struct ifnet *, struct ifmediareq *);
+static int	axge_ioctl(struct ifnet *, u_long, caddr_t);
+static int	axge_rx_frame(struct usb_ether *, struct usb_page_cache *, int);
+static int	axge_rxeof(struct usb_ether *, struct usb_page_cache *,
+		    unsigned int, unsigned int, struct axge_csum_hdr *);
+static void	axge_csum_cfg(struct usb_ether *);
+
+#define	AXGE_CSUM_FEATURES	(CSUM_IP | CSUM_TCP | CSUM_UDP)
+
+#ifdef USB_DEBUG
+static int axge_debug = 0;
+
+static SYSCTL_NODE(_hw_usb, OID_AUTO, axge, CTLFLAG_RW, 0, "USB axge");
+SYSCTL_INT(_hw_usb_axge, OID_AUTO, debug, CTLFLAG_RW, &axge_debug, 0,
+    "Debug level");
+#endif
+
+static const struct usb_config axge_config[AXGE_N_TRANSFER] = {
+	[AXGE_BULK_DT_WR] = {
+		.type = UE_BULK,
+		.endpoint = UE_ADDR_ANY,
+		.direction = UE_DIR_OUT,
+		.frames = 16,
+		.bufsize = 16 * (MCLBYTES + 16),
+		.flags = {.pipe_bof = 1,.force_short_xfer = 1,},
+		.callback = axge_bulk_write_callback,
+		.timeout = 10000,	/* 10 seconds */
+	},
+	[AXGE_BULK_DT_RD] = {
+		.type = UE_BULK,
+		.endpoint = UE_ADDR_ANY,
+		.direction = UE_DIR_IN,
+		.bufsize = 20480,
+		.flags = {.pipe_bof = 1,.short_xfer_ok = 1,},
+		.callback = axge_bulk_read_callback,
+		.timeout = 0,		/* no timeout */
+	},
+};
+
+static device_method_t axge_methods[] = {
+	/* Device interface. */
+	DEVMETHOD(device_probe,		axge_probe),
+	DEVMETHOD(device_attach,	axge_attach),
+	DEVMETHOD(device_detach,	axge_detach),
+
+	/* MII interface. */
+	DEVMETHOD(miibus_readreg,	axge_miibus_readreg),
+	DEVMETHOD(miibus_writereg,	axge_miibus_writereg),
+	DEVMETHOD(miibus_statchg,	axge_miibus_statchg),
+
+	DEVMETHOD_END
+};
+
+static driver_t axge_driver = {
+	.name = "axge",
+	.methods = axge_methods,
+	.size = sizeof(struct axge_softc),
+};
+
+static devclass_t axge_devclass;
+
+DRIVER_MODULE(axge, uhub, axge_driver, axge_devclass, NULL, NULL);
+DRIVER_MODULE(miibus, axge, miibus_driver, miibus_devclass, NULL, NULL);
+MODULE_DEPEND(axge, uether, 1, 1, 1);
+MODULE_DEPEND(axge, usb, 1, 1, 1);
+MODULE_DEPEND(axge, ether, 1, 1, 1);
+MODULE_DEPEND(axge, miibus, 1, 1, 1);
+MODULE_VERSION(axge, 1);
+
+static const struct usb_ether_methods axge_ue_methods = {
+	.ue_attach_post = axge_attach_post,
+	.ue_attach_post_sub = axge_attach_post_sub,
+	.ue_start = axge_start,
+	.ue_init = axge_init,
+	.ue_stop = axge_stop,
+	.ue_tick = axge_tick,
+	.ue_setmulti = axge_setmulti,
+	.ue_setpromisc = axge_setpromisc,
+	.ue_mii_upd = axge_ifmedia_upd,
+	.ue_mii_sts = axge_ifmedia_sts,
+};
+
+static int
+axge_read_mem(struct axge_softc *sc, uint8_t cmd, uint16_t index,
+    uint16_t val, void *buf, int len)
+{
+	struct usb_device_request req;
+
+	AXGE_LOCK_ASSERT(sc, MA_OWNED);
+
+	req.bmRequestType = UT_READ_VENDOR_DEVICE;
+	req.bRequest = cmd;
+	USETW(req.wValue, val);
+	USETW(req.wIndex, index);
+	USETW(req.wLength, len);
+
+	return (uether_do_request(&sc->sc_ue, &req, buf, 1000));
+}
+
+static void
+axge_write_mem(struct axge_softc *sc, uint8_t cmd, uint16_t index,
+    uint16_t val, void *buf, int len)
+{
+	struct usb_device_request req;
+
+	AXGE_LOCK_ASSERT(sc, MA_OWNED);
+
+	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
+	req.bRequest = cmd;
+	USETW(req.wValue, val);
+	USETW(req.wIndex, index);
+	USETW(req.wLength, len);
+
+	if (uether_do_request(&sc->sc_ue, &req, buf, 1000)) {
+		/* Error ignored. */
+	}
+}
+
+static uint16_t
+axge_read_cmd_2(struct axge_softc *sc, uint8_t cmd, uint16_t index,
+    uint16_t reg)
+{
+	uint8_t val[2];
+
+	axge_read_mem(sc, cmd, index, reg, &val, 2);
+	return (UGETW(val));
+}
+
+static void
+axge_write_cmd_1(struct axge_softc *sc, uint8_t cmd, uint16_t index,
+    uint16_t reg, uint8_t val)
+{
+	axge_write_mem(sc, cmd, index, reg, &val, 1);
+}
+
+static void
+axge_write_cmd_2(struct axge_softc *sc, uint8_t cmd, uint16_t index,
+    uint16_t reg, uint16_t val)
+{
+	uint8_t temp[2];
+
+	USETW(temp, val);
+	axge_write_mem(sc, cmd, index, reg, &temp, 2);
+}
+
+static int
+axge_miibus_readreg(device_t dev, int phy, int reg)
+{
+	struct axge_softc *sc;
+	uint16_t val;
+	int locked;
+
+	sc = device_get_softc(dev);
+	locked = mtx_owned(&sc->sc_mtx);
+	if (!locked)
+		AXGE_LOCK(sc);
+
+	val = axge_read_cmd_2(sc, AXGE_ACCESS_PHY, reg, phy);
+
+	if (!locked)
+		AXGE_UNLOCK(sc);
+
+	return (val);
+}
+
+static int
+axge_miibus_writereg(device_t dev, int phy, int reg, int val)
+{
+	struct axge_softc *sc;
+	int locked;
+
+	sc = device_get_softc(dev);
+	if (sc->sc_phyno != phy)
+		return (0);
+	locked = mtx_owned(&sc->sc_mtx);
+	if (!locked)
+		AXGE_LOCK(sc);
+
+	axge_write_cmd_2(sc, AXGE_ACCESS_PHY, reg, phy, val);
+
+	if (!locked)
+		AXGE_UNLOCK(sc);
+
+	return (0);
+}
+
+static void
+axge_miibus_statchg(device_t dev)
+{
+	struct axge_softc *sc;
+	struct mii_data *mii;
+	struct ifnet *ifp;
+	uint16_t val;
+	int locked;
+
+	sc = device_get_softc(dev);
+	mii = GET_MII(sc);
+	locked = mtx_owned(&sc->sc_mtx);
+	if (!locked)
+		AXGE_LOCK(sc);
+
+	ifp = uether_getifp(&sc->sc_ue);
+	if (mii == NULL || ifp == NULL ||
+	    (ifp->if_drv_flags & IFF_DRV_RUNNING) == 0)
+		goto done;
+
+	sc->sc_flags &= ~AXGE_FLAG_LINK;
+	if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
+	    (IFM_ACTIVE | IFM_AVALID)) {
+		switch (IFM_SUBTYPE(mii->mii_media_active)) {
+		case IFM_10_T:
+		case IFM_100_TX:
+		case IFM_1000_T:
+			sc->sc_flags |= AXGE_FLAG_LINK;
+			break;
+		default:
+			break;
+		}
+	}
+
+	/* Lost link, do nothing. */
+	if ((sc->sc_flags & AXGE_FLAG_LINK) == 0)
+		goto done;
+
+	val = 0;
+	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) != 0) {
+		val |= AXGE_MEDIUM_FULL_DUPLEX;
+		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_TXPAUSE) != 0)
+			val |= AXGE_MEDIUM_TXFLOW_CTRLEN;
+		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_ETH_RXPAUSE) != 0)
+			val |= AXGE_MEDIUM_RXFLOW_CTRLEN;
+	}
+	val |=  AXGE_MEDIUM_RECEIVE_EN | AXGE_MEDIUM_ALWAYS_ONE;
+	switch (IFM_SUBTYPE(mii->mii_media_active)) {
+	case IFM_1000_T:
+		val |= AXGE_MEDIUM_GIGAMODE;
+	case IFM_100_TX:
+		val |= AXGE_MEDIUM_PS;
+	case IFM_10_T:
+		/* Doesn't need to be handled. */
+		break;
+	}
+	axge_write_cmd_2(sc, AXGE_ACCESS_MAC, 2, AXGE_MEDIUM_STATUS_MODE, val);
+
+done:
+	if (!locked)
+		AXGE_UNLOCK(sc);
+}
+
+static void
+axge_chip_init(struct axge_softc *sc)
+{
+	/* Power up ethernet PHY. */
+	axge_write_cmd_2(sc, AXGE_ACCESS_MAC, 2, AXGE_PHYPWR_RSTCTL, 0);
+	axge_write_cmd_2(sc, AXGE_ACCESS_MAC, 2, AXGE_PHYPWR_RSTCTL,
+	    AXGE_PHYPWR_RSTCTL_IPRL);
+	uether_pause(&sc->sc_ue, hz / 4);
+	axge_write_cmd_1(sc, AXGE_ACCESS_MAC, 1, AXGE_CLK_SELECT,
+	    AXGE_CLK_SELECT_ACS | AXGE_CLK_SELECT_BCS);
+	uether_pause(&sc->sc_ue, hz / 10);
+}
+
+static void
+axge_reset(struct axge_softc *sc)
+{
+	struct usb_config_descriptor *cd;
+	usb_error_t err;
+
+	cd = usbd_get_config_descriptor(sc->sc_ue.ue_udev);
+
+	err = usbd_req_set_config(sc->sc_ue.ue_udev, &sc->sc_mtx,
+	    cd->bConfigurationValue);
+	if (err)
+		DPRINTF("reset failed (ignored)\n");
+
+	/* Wait a little while for the chip to get its brains in order. */
+	uether_pause(&sc->sc_ue, hz / 100);
+
+	/* Reinitialize controller to achieve full reset. */
+	axge_chip_init(sc);
+}
+
+static void
+axge_attach_post(struct usb_ether *ue)
+{
+	struct axge_softc *sc;
+	uint8_t tmp[5];
+
+	sc = uether_getsc(ue);
+	sc->sc_phyno = 3;
+
+	/* Initialize controller and get station address. */
+	axge_chip_init(sc);
+
+	memcpy(tmp, &AX88179_BULKIN_SIZE[0], 5);
+	axge_read_mem(sc, AXGE_ACCESS_MAC, 5, AXGE_RX_BULKIN_QCTRL, tmp, 5);
+	axge_read_mem(sc, AXGE_ACCESS_MAC, ETHER_ADDR_LEN, AXGE_NODE_ID,
+	    ue->ue_eaddr, ETHER_ADDR_LEN);
+}
+
+static int
+axge_attach_post_sub(struct usb_ether *ue)
+{
+	struct axge_softc *sc;
+	struct ifnet *ifp;
+	int error;
+
+	sc = uether_getsc(ue);
+	ifp = ue->ue_ifp;
+	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	ifp->if_start = uether_start;
+	ifp->if_ioctl = axge_ioctl;
+	ifp->if_init = uether_init;
+	IFQ_SET_MAXLEN(&ifp->if_snd, ifqmaxlen);
+	ifp->if_snd.ifq_drv_maxlen = ifqmaxlen;
+	IFQ_SET_READY(&ifp->if_snd);
+
+	ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_TXCSUM | IFCAP_RXCSUM;
+	ifp->if_hwassist = AXGE_CSUM_FEATURES;
+	ifp->if_capenable = ifp->if_capabilities;
+
+	mtx_lock(&Giant);
+	error = mii_attach(ue->ue_dev, &ue->ue_miibus, ifp,
+	    uether_ifmedia_upd, ue->ue_methods->ue_mii_sts,
+	    BMSR_DEFCAPMASK, sc->sc_phyno, MII_OFFSET_ANY, 0);
+	mtx_unlock(&Giant);
+
+	return (error);
+}
+
+/*
+ * Set media options.
+ */
+static int
+axge_ifmedia_upd(struct ifnet *ifp)
+{
+	struct axge_softc *sc;
+	struct mii_data *mii;
+	struct mii_softc *miisc;
+	int error;
+
+	sc = ifp->if_softc;
+	mii = GET_MII(sc);
+	AXGE_LOCK_ASSERT(sc, MA_OWNED);
+
+	LIST_FOREACH(miisc, &mii->mii_phys, mii_list)
+	    PHY_RESET(miisc);
+	error = mii_mediachg(mii);
+
+	return (error);
+}
+
+/*
+ * Report current media status.
+ */
+static void
+axge_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr)
+{
+	struct axge_softc *sc;
+	struct mii_data *mii;
+
+	sc = ifp->if_softc;
+	mii = GET_MII(sc);
+	AXGE_LOCK(sc);
+	mii_pollstat(mii);
+	ifmr->ifm_active = mii->mii_media_active;
+	ifmr->ifm_status = mii->mii_media_status;
+	AXGE_UNLOCK(sc);
+}
+
+/*
+ * Probe for a AX88179 chip.
+ */
+static int
+axge_probe(device_t dev)
+{
+	struct usb_attach_arg *uaa;
+
+	uaa = device_get_ivars(dev);
+	if (uaa->usb_mode != USB_MODE_HOST)
+		return (ENXIO);
+	if (uaa->info.bConfigIndex != AXGE_CONFIG_IDX)
+		return (ENXIO);
+	if (uaa->info.bIfaceIndex != AXGE_IFACE_IDX)
+		return (ENXIO);
+
+	return (usbd_lookup_id_by_uaa(axge_devs, sizeof(axge_devs), uaa));
+}
+
+/*
+ * Attach the interface. Allocate softc structures, do ifmedia
+ * setup and ethernet/BPF attach.
+ */
+static int
+axge_attach(device_t dev)
+{
+	struct usb_attach_arg *uaa;
+	struct axge_softc *sc;
+	struct usb_ether *ue;
+	uint8_t iface_index;
+	int error;
+
+	uaa = device_get_ivars(dev);
+	sc = device_get_softc(dev);
+	ue = &sc->sc_ue;
+
+	device_set_usb_desc(dev);
+	mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
+
+	iface_index = AXGE_IFACE_IDX;
+	error = usbd_transfer_setup(uaa->device, &iface_index,
+	    sc->sc_xfer, axge_config, AXGE_N_TRANSFER, sc, &sc->sc_mtx);
+	if (error) {
+		device_printf(dev, "allocating USB transfers failed\n");
+		goto detach;
+	}
+
+	ue->ue_sc = sc;
+	ue->ue_dev = dev;
+	ue->ue_udev = uaa->device;
+	ue->ue_mtx = &sc->sc_mtx;
+	ue->ue_methods = &axge_ue_methods;
+
+	error = uether_ifattach(ue);
+	if (error) {
+		device_printf(dev, "could not attach interface\n");
+		goto detach;
+	}
+	return (0);			/* success */
+
+detach:
+	axge_detach(dev);
+	return (ENXIO);			/* failure */
+}
+
+static int
+axge_detach(device_t dev)
+{
+	struct axge_softc *sc;
+	struct usb_ether *ue;
+
+	sc = device_get_softc(dev);
+	ue = &sc->sc_ue;
+	usbd_transfer_unsetup(sc->sc_xfer, AXGE_N_TRANSFER);
+	uether_ifdetach(ue);
+	mtx_destroy(&sc->sc_mtx);
+
+	return (0);
+}
+
+static void
+axge_bulk_read_callback(struct usb_xfer *xfer, usb_error_t error)
+{
+	struct axge_softc *sc;
+	struct usb_ether *ue;
+	struct usb_page_cache *pc;
+	int actlen;
+
+	sc = usbd_xfer_softc(xfer);
+	ue = &sc->sc_ue;
+	usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
+
+	switch (USB_GET_STATE(xfer)) {
+	case USB_ST_TRANSFERRED:
+		pc = usbd_xfer_get_frame(xfer, 0);
+		axge_rx_frame(ue, pc, actlen);
+
+		/* FALLTHROUGH */
+	case USB_ST_SETUP:
+tr_setup:
+		usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
+		usbd_transfer_submit(xfer);
+		uether_rxflush(ue);
+		return;
+
+	default:
+		if (error != USB_ERR_CANCELLED) {
+			usbd_xfer_set_stall(xfer);
+			goto tr_setup;
+		}
+		return;
+
+	}
+}
+
+static void
+axge_bulk_write_callback(struct usb_xfer *xfer, usb_error_t error)
+{
+	struct axge_softc *sc;
+	struct ifnet *ifp;
+	struct usb_page_cache *pc;
+	struct mbuf *m;
+	uint32_t txhdr;
+	uint32_t txhdr2;
+	int nframes;
+	int frm_len;
+
+	sc = usbd_xfer_softc(xfer);
+	ifp = uether_getifp(&sc->sc_ue);
+
+	switch (USB_GET_STATE(xfer)) {
+	case USB_ST_TRANSFERRED:
+		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+		/* FALLTHROUGH */
+	case USB_ST_SETUP:
+tr_setup:
+		if ((sc->sc_flags & AXGE_FLAG_LINK) == 0 ||
+		    (ifp->if_drv_flags & IFF_DRV_OACTIVE) != 0) {
+			/*
+			 * Don't send anything if there is no link or
+			 * controller is busy.
+			 */
+			return;
+		}
+
+		for (nframes = 0; nframes < 16 &&
+		    !IFQ_DRV_IS_EMPTY(&ifp->if_snd); nframes++) {
+			IFQ_DRV_DEQUEUE(&ifp->if_snd, m);
+			if (m == NULL)
+				break;
+			usbd_xfer_set_frame_offset(xfer, nframes * MCLBYTES,
+				nframes);
+			frm_len = 0;
+			pc = usbd_xfer_get_frame(xfer, nframes);
+
+			txhdr = m->m_pkthdr.len;
+			txhdr = htole32(txhdr);
+			usbd_copy_in(pc, 0, &txhdr, sizeof(txhdr));
+			frm_len += sizeof(txhdr);
+
+			txhdr2 = 0;
+			if ((m->m_pkthdr.len + sizeof(txhdr) + sizeof(txhdr2)) %
+			    usbd_xfer_max_framelen(xfer) == 0) {
+				txhdr2 |= 0x80008000;
+			}
+			txhdr2 = htole32(txhdr2);
+			usbd_copy_in(pc, frm_len, &txhdr2, sizeof(txhdr2));
+			frm_len += sizeof(txhdr2);
+
+			/* Next copy in the actual packet. */
+			usbd_m_copy_in(pc, frm_len, m, 0, m->m_pkthdr.len);
+			frm_len += m->m_pkthdr.len;
+
+			/*
+			 * XXX
+			 * Update TX packet counter here. This is not
+			 * correct way but it seems that there is no way
+			 * to know how many packets are sent at the end
+			 * of transfer because controller combines
+			 * multiple writes into single one if there is
+			 * room in TX buffer of controller.
+			 */
+			ifp->if_opackets++;
+
+			/*
+			 * if there's a BPF listener, bounce a copy
+			 * of this frame to him:
+			 */
+			BPF_MTAP(ifp, m);
+
+			m_freem(m);
+
+			/* Set frame length. */
+			usbd_xfer_set_frame_len(xfer, nframes, frm_len);
+		}
+		if (nframes != 0) {
+			usbd_xfer_set_frames(xfer, nframes);
+			usbd_transfer_submit(xfer);
+			ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+		}
+		return;
+		/* NOTREACHED */
+	default:
+		ifp->if_oerrors++;
+		ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+
+		if (error != USB_ERR_CANCELLED) {
+			usbd_xfer_set_stall(xfer);
+			goto tr_setup;
+		}
+		return;
+
+	}
+}
+
+static void
+axge_tick(struct usb_ether *ue)
+{
+	struct axge_softc *sc;
+	struct mii_data *mii;
+
+	sc = uether_getsc(ue);
+	mii = GET_MII(sc);
+	AXGE_LOCK_ASSERT(sc, MA_OWNED);
+
+	mii_tick(mii);
+	if ((sc->sc_flags & AXGE_FLAG_LINK) == 0) {
+		axge_miibus_statchg(ue->ue_dev);
+		if ((sc->sc_flags & AXGE_FLAG_LINK) != 0)
+			axge_start(ue);
+	}
+}
+
+static void
+axge_setmulti(struct usb_ether *ue)
+{
+	struct axge_softc *sc;
+	struct ifnet *ifp;
+	struct ifmultiaddr *ifma;
+	uint32_t h;
+	uint16_t rxmode;
+	uint8_t hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+
+	sc = uether_getsc(ue);
+	ifp = uether_getifp(ue);
+	h = 0;
+	AXGE_LOCK_ASSERT(sc, MA_OWNED);
+
+	rxmode = axge_read_cmd_2(sc, AXGE_ACCESS_MAC, 2, AXGE_RX_CTL);
+	if (ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) {
+		rxmode |= AXGE_RX_CTL_AMALL;
+		axge_write_cmd_2(sc, AXGE_ACCESS_MAC, 2, AXGE_RX_CTL, rxmode);
+		return;
+	}
+	rxmode &= ~AXGE_RX_CTL_AMALL;
+
+	if_maddr_rlock(ifp);
+	TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) {
+		if (ifma->ifma_addr->sa_family != AF_LINK)
+			continue;
+		h = ether_crc32_be(LLADDR((struct sockaddr_dl *)
+		    ifma->ifma_addr), ETHER_ADDR_LEN) >> 26;
+		hashtbl[h / 8] |= 1 << (h % 8);
+	}
+	if_maddr_runlock(ifp);
+
+	axge_write_mem(sc, AXGE_ACCESS_MAC, 8, AXGE_MULTI_FILTER_ARRY,
+	    (void *)&hashtbl, 8);
+	axge_write_cmd_2(sc, AXGE_ACCESS_MAC, 2, AXGE_RX_CTL, rxmode);
+}
+
+static void
+axge_setpromisc(struct usb_ether *ue)
+{
+	struct axge_softc *sc;
+	struct ifnet *ifp;
+	uint16_t rxmode;
+
+	sc = uether_getsc(ue);
+	ifp = uether_getifp(ue);
+	rxmode = axge_read_cmd_2(sc, AXGE_ACCESS_MAC, 2, AXGE_RX_CTL);
+
+	if (ifp->if_flags & IFF_PROMISC)
+		rxmode |= AXGE_RX_CTL_PRO;
+	else
+		rxmode &= ~AXGE_RX_CTL_PRO;
+
+	axge_write_cmd_2(sc, AXGE_ACCESS_MAC, 2, AXGE_RX_CTL, rxmode);
+	axge_setmulti(ue);
+}
+
+static void
+axge_start(struct usb_ether *ue)
+{
+	struct axge_softc *sc;
+
+	sc = uether_getsc(ue);
+	/*
+	 * Start the USB transfers, if not already started.
+	 */
+	usbd_transfer_start(sc->sc_xfer[AXGE_BULK_DT_RD]);
+	usbd_transfer_start(sc->sc_xfer[AXGE_BULK_DT_WR]);
+}
+
+static void
+axge_init(struct usb_ether *ue)
+{
+	struct axge_softc *sc;
+	struct ifnet *ifp;
+	uint16_t rxmode;
+
+	sc = uether_getsc(ue);
+	ifp = uether_getifp(ue);
+	AXGE_LOCK_ASSERT(sc, MA_OWNED);
+
+	if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+		return;
+
+	/*
+	 * Cancel pending I/O and free all RX/TX buffers.
+	 */
+	axge_stop(ue);
+
+	axge_reset(sc);
+
+	/* Set MAC address. */
+	axge_write_mem(sc, AXGE_ACCESS_MAC, ETHER_ADDR_LEN, AXGE_NODE_ID,
+	    IF_LLADDR(ifp), ETHER_ADDR_LEN);
+
+	axge_write_cmd_1(sc, AXGE_ACCESS_MAC, 1, AXGE_PAUSE_WATERLVL_LOW, 0x34);
+	axge_write_cmd_1(sc, AXGE_ACCESS_MAC, 1, AXGE_PAUSE_WATERLVL_HIGH,
+	    0x52);
+
+	/* Configure TX/RX checksum offloading. */
+	axge_csum_cfg(ue);
+
+	/* Configure RX settings. */
+	rxmode = (AXGE_RX_CTL_IPE | AXGE_RX_CTL_AM | AXGE_RX_CTL_START);
+
+	/* If we want promiscuous mode, set the allframes bit. */
+	if (ifp->if_flags & IFF_PROMISC)
+		rxmode |= AXGE_RX_CTL_PRO;
+
+	if (ifp->if_flags & IFF_BROADCAST)
+		rxmode |= AXGE_RX_CTL_AB;
+
+	axge_write_cmd_2(sc, AXGE_ACCESS_MAC, 2, AXGE_RX_CTL, rxmode);
+
+	/* Load the multicast filter. */
+	axge_setmulti(ue);
+
+	usbd_xfer_set_stall(sc->sc_xfer[AXGE_BULK_DT_WR]);
+
+	ifp->if_drv_flags |= IFF_DRV_RUNNING;
+	/* Switch to selected media. */
+	axge_ifmedia_upd(ifp);
+}
+
+static void
+axge_stop(struct usb_ether *ue)
+{
+	struct axge_softc *sc;
+	struct ifnet *ifp;
+
+	sc = uether_getsc(ue);
+	ifp = uether_getifp(ue);
+
+	AXGE_LOCK_ASSERT(sc, MA_OWNED);
+
+	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+	sc->sc_flags &= ~AXGE_FLAG_LINK;
+
+	/*
+	 * Stop all the transfers, if not already stopped:
+	 */
+	usbd_transfer_stop(sc->sc_xfer[AXGE_BULK_DT_WR]);
+	usbd_transfer_stop(sc->sc_xfer[AXGE_BULK_DT_RD]);
+}
+
+static int
+axge_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
+{
+	struct usb_ether *ue;
+	struct axge_softc *sc;
+	struct ifreq *ifr;
+	int error, mask, reinit;
+
+	ue = ifp->if_softc;
+	sc = uether_getsc(ue);
+	ifr = (struct ifreq *)data;
+	error = 0;
+	reinit = 0;
+	if (cmd == SIOCSIFCAP) {
+		AXGE_LOCK(sc);
+		mask = ifr->ifr_reqcap ^ ifp->if_capenable;
+		if ((mask & IFCAP_TXCSUM) != 0 &&
+		    (ifp->if_capabilities & IFCAP_TXCSUM) != 0) {
+			ifp->if_capenable ^= IFCAP_TXCSUM;
+			if ((ifp->if_capenable & IFCAP_TXCSUM) != 0)
+				ifp->if_hwassist |= AXGE_CSUM_FEATURES;
+			else
+				ifp->if_hwassist &= ~AXGE_CSUM_FEATURES;
+			reinit++;
+		}
+		if ((mask & IFCAP_RXCSUM) != 0 &&
+		    (ifp->if_capabilities & IFCAP_RXCSUM) != 0) {
+			ifp->if_capenable ^= IFCAP_RXCSUM;
+			reinit++;
+		}
+		if (reinit > 0 && ifp->if_drv_flags & IFF_DRV_RUNNING)
+			ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
+		else
+			reinit = 0;
+		AXGE_UNLOCK(sc);
+		if (reinit > 0)
+			uether_init(ue);
+	} else
+		error = uether_ioctl(ifp, cmd, data);
+
+	return (error);
+}
+
+static int
+axge_rx_frame(struct usb_ether *ue, struct usb_page_cache *pc, int actlen)
+{
+	struct axge_softc *sc;
+	struct axge_csum_hdr csum_hdr;
+	int error, len, pos;
+	int pkt_cnt;
+	uint32_t rxhdr;
+	uint16_t hdr_off;
+	uint16_t pktlen;
+
+	sc = uether_getsc(ue);
+	pos = 0;
+	len = 0;
+	error = 0;
+
+	usbd_copy_out(pc, actlen - sizeof(rxhdr), &rxhdr, sizeof(rxhdr));
+	actlen -= sizeof(rxhdr);
+	rxhdr = le32toh(rxhdr);
+
+	pkt_cnt = (uint16_t)rxhdr;
+	hdr_off = (uint16_t)(rxhdr >> 16);
+
+	usbd_copy_out(pc, pos + hdr_off, &csum_hdr, sizeof(csum_hdr));
+	csum_hdr.len = le16toh(csum_hdr.len);
+	csum_hdr.cstatus = le16toh(csum_hdr.cstatus);
+
+	while (pkt_cnt--) {
+		if (actlen <= sizeof(csum_hdr) + sizeof(struct ether_header)) {
+			error = EINVAL;
+			break;
+		}
+		pktlen = AXGE_CSUM_RXBYTES(csum_hdr.len);
+
+		if (pkt_cnt == 0)
+			/* Skip the 2-byte IP alignment header. */
+			axge_rxeof(ue, pc, 2, pktlen - 2, &csum_hdr);
+	}
+
+	if (error != 0)
+		ue->ue_ifp->if_ierrors++;
+	return (error);
+}
+
+static int
+axge_rxeof(struct usb_ether *ue, struct usb_page_cache *pc,
+    unsigned int offset, unsigned int len, struct axge_csum_hdr *csum_hdr)
+{
+	struct ifnet *ifp;
+	struct mbuf *m;
+
+	ifp = ue->ue_ifp;
+	if (len < ETHER_HDR_LEN || len > MCLBYTES - ETHER_ALIGN) {
+		ifp->if_ierrors++;
+		return (EINVAL);
+	}
+
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+	if (m == NULL) {
+		ifp->if_iqdrops++;
+		return (ENOMEM);
+	}
+	m->m_len = m->m_pkthdr.len = MCLBYTES;
+	m_adj(m, ETHER_ALIGN);
+
+	usbd_copy_out(pc, offset, mtod(m, uint8_t *), len);
+
+	ifp->if_ipackets++;
+	m->m_pkthdr.rcvif = ifp;
+	m->m_pkthdr.len = m->m_len = len;
+
+	if (csum_hdr != NULL &&
+	    csum_hdr->cstatus & AXGE_CSUM_HDR_L3_TYPE_IPV4) {
+		if ((csum_hdr->cstatus & (AXGE_CSUM_HDR_L4_CSUM_ERR |
+		    AXGE_RXHDR_L4CSUM_ERR)) == 0) {
+			m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED |
+			    CSUM_IP_VALID;
+			if ((csum_hdr->cstatus & AXGE_CSUM_HDR_L4_TYPE_MASK) ==
+			    AXGE_CSUM_HDR_L4_TYPE_TCP ||
+			    (csum_hdr->cstatus & AXGE_CSUM_HDR_L4_TYPE_MASK) ==
+			    AXGE_CSUM_HDR_L4_TYPE_UDP) {
+				m->m_pkthdr.csum_flags |=
+				    CSUM_DATA_VALID | CSUM_PSEUDO_HDR;
+				m->m_pkthdr.csum_data = 0xffff;
+			}
+		}
+	}
+
+	_IF_ENQUEUE(&ue->ue_rxq, m);
+	return (0);
+}
+
+static void
+axge_csum_cfg(struct usb_ether *ue)
+{
+	struct axge_softc *sc;
+	struct ifnet *ifp;
+	uint8_t csum;
+
+	sc = uether_getsc(ue);
+	AXGE_LOCK_ASSERT(sc, MA_OWNED);
+	ifp = uether_getifp(ue);
+
+	csum = 0;
+	if ((ifp->if_capenable & IFCAP_TXCSUM) != 0)
+		csum |= AXGE_TXCOE_IP  | AXGE_TXCOE_TCP | AXGE_TXCOE_UDP;
+	axge_write_cmd_1(sc, AXGE_ACCESS_MAC, 1, AXGE_TXCOE_CTL, csum);
+
+	csum = 0;
+	if ((ifp->if_capenable & IFCAP_RXCSUM) != 0)
+		csum |= AXGE_RXCOE_IP  | AXGE_RXCOE_TCP | AXGE_RXCOE_UDP |
+		    AXGE_RXCOE_ICMP | AXGE_RXCOE_IGMP;
+	axge_write_cmd_1(sc, AXGE_ACCESS_MAC, 1, AXGE_RXCOE_CTL, csum);
+}
diff --git a/sys/dev/usb/net/if_axgereg.h b/sys/dev/usb/net/if_axgereg.h
new file mode 100644
index 00000000000..6ba93461a9e
--- /dev/null
+++ b/sys/dev/usb/net/if_axgereg.h
@@ -0,0 +1,212 @@
+/*-
+ * Copyright (c) 2013 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 Bill Paul AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (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	AX88179_PHY_ID			0x03
+#define	AXGE_MCAST_FILTER_SIZE		8
+#define	AXGE_MAXGE_MCAST		64
+#define	AXGE_EEPROM_LEN			0x40
+#define	AXGE_RX_CHECKSUM		1
+#define	AXGE_TX_CHECKSUM		2
+
+#define	AXGE_ACCESS_MAC			0x01
+#define	AXGE_ACCESS_PHY			0x02
+#define	AXGE_ACCESS_WAKEUP		0x03
+#define	AXGE_ACCESS_EEPROM		0x04
+#define	AXGE_ACCESS_EFUSE		0x05
+#define	AXGE_RELOAD_EEPROM_EFUSE	0x06
+#define	AXGE_WRITE_EFUSE_EN		0x09
+#define	AXGE_WRITE_EFUSE_DIS		0x0A
+#define	AXGE_ACCESS_MFAB		0x10
+
+#define	AXGE_LINK_STATUS		0x02
+#define	AXGE_LINK_STATUS_USB_FS		0x01
+#define	AXGE_LINK_STATUS_USB_HS		0x02
+#define	AXGE_LINK_STATUS_USB_SS		0x04
+
+#define	AXGE_SROM_ADDR			0x07
+#define	AXGE_SROM_DATA_LOW		0x08
+#define	AXGE_SROM_DATA_HIGH		0x09
+#define	AXGE_SROM_CMD			0x0a
+#define	AXGE_SROM_CMD_RD		0x04	/* EEprom read command */
+#define	AXGE_SROM_CMD_WR		0x08	/* EEprom write command */
+#define	AXGE_SROM_CMD_BUSY		0x10	/* EEprom access module busy */
+
+#define	AXGE_RX_CTL			0x0b
+#define	AXGE_RX_CTL_DROPCRCERR		0x0100 /* Drop CRC error packet */
+#define	AXGE_RX_CTL_IPE			0x0200 /* 4-byte IP header alignment */
+#define	AXGE_RX_CTL_TXPADCRC		0x0400 /* Csum value in rx header 3 */
+#define	AXGE_RX_CTL_START		0x0080 /* Ethernet MAC start */
+#define	AXGE_RX_CTL_AP			0x0020 /* Accept physical address from
+						  multicast array */
+#define	AXGE_RX_CTL_AM			0x0010
+#define	AXGE_RX_CTL_AB			0x0008
+#define	AXGE_RX_CTL_HA8B		0x0004
+#define	AXGE_RX_CTL_AMALL		0x0002 /* Accept all multicast frames */
+#define	AXGE_RX_CTL_PRO			0x0001 /* Promiscuous Mode */
+#define	AXGE_RX_CTL_STOP		0x0000 /* Stop MAC */
+
+#define	AXGE_NODE_ID			0x10
+#define	AXGE_MULTI_FILTER_ARRY		0x16
+
+#define	AXGE_MEDIUM_STATUS_MODE		0x22
+#define	AXGE_MEDIUM_GIGAMODE		0x0001
+#define	AXGE_MEDIUM_FULL_DUPLEX		0x0002
+#define	AXGE_MEDIUM_ALWAYS_ONE		0x0004
+#define	AXGE_MEDIUM_EN_125MHZ		0x0008
+#define	AXGE_MEDIUM_RXFLOW_CTRLEN	0x0010
+#define	AXGE_MEDIUM_TXFLOW_CTRLEN	0x0020
+#define	AXGE_MEDIUM_RECEIVE_EN		0x0100
+#define	AXGE_MEDIUM_PS			0x0200
+#define	AXGE_MEDIUM_JUMBO_EN		0x8040
+
+#define	AXGE_MONITOR_MODE		0x24
+#define	AXGE_MONITOR_MODE_RWLC		0x02
+#define	AXGE_MONITOR_MODE_RWMP		0x04
+#define	AXGE_MONITOR_MODE_RWWF		0x08
+#define	AXGE_MONITOR_MODE_RW_FLAG	0x10
+#define	AXGE_MONITOR_MODE_PMEPOL	0x20
+#define	AXGE_MONITOR_MODE_PMETYPE	0x40
+
+#define	AXGE_GPIO_CTRL			0x25
+#define	AXGE_GPIO_CTRL_GPIO3EN		0x80
+#define	AXGE_GPIO_CTRL_GPIO2EN		0x40
+#define	AXGE_GPIO_CTRL_GPIO1EN		0x20
+
+#define	AXGE_PHYPWR_RSTCTL		0x26
+#define	AXGE_PHYPWR_RSTCTL_BZ		0x0010
+#define	AXGE_PHYPWR_RSTCTL_IPRL		0x0020
+#define	AXGE_PHYPWR_RSTCTL_AUTODETACH	0x1000
+
+#define	AXGE_RX_BULKIN_QCTRL		0x2e
+#define	AXGE_RX_BULKIN_QCTRL_TIME	0x01
+#define	AXGE_RX_BULKIN_QCTRL_IFG	0x02
+#define	AXGE_RX_BULKIN_QCTRL_SIZE	0x04
+
+#define	AXGE_RX_BULKIN_QTIMR_LOW	0x2f
+#define	AXGE_RX_BULKIN_QTIMR_HIGH	0x30
+#define	AXGE_RX_BULKIN_QSIZE		0x31
+#define	AXGE_RX_BULKIN_QIFG		0x32
+
+#define	AXGE_CLK_SELECT			0x33
+#define	AXGE_CLK_SELECT_BCS		0x01
+#define	AXGE_CLK_SELECT_ACS		0x02
+#define	AXGE_CLK_SELECT_ACSREQ		0x10
+#define	AXGE_CLK_SELECT_ULR		0x08
+
+#define	AXGE_RXCOE_CTL			0x34
+#define	AXGE_RXCOE_IP			0x01
+#define	AXGE_RXCOE_TCP			0x02
+#define	AXGE_RXCOE_UDP			0x04
+#define	AXGE_RXCOE_ICMP			0x08
+#define	AXGE_RXCOE_IGMP			0x10
+#define	AXGE_RXCOE_TCPV6		0x20
+#define	AXGE_RXCOE_UDPV6		0x40
+#define	AXGE_RXCOE_ICMV6		0x80
+
+#define	AXGE_TXCOE_CTL			0x35
+#define	AXGE_TXCOE_IP			0x01
+#define	AXGE_TXCOE_TCP			0x02
+#define	AXGE_TXCOE_UDP			0x04
+#define	AXGE_TXCOE_ICMP			0x08
+#define	AXGE_TXCOE_IGMP			0x10
+#define	AXGE_TXCOE_TCPV6		0x20
+#define	AXGE_TXCOE_UDPV6		0x40
+#define	AXGE_TXCOE_ICMV6		0x80
+
+#define	AXGE_PAUSE_WATERLVL_HIGH	0x54
+#define	AXGE_PAUSE_WATERLVL_LOW		0x55
+
+#define	AXGE_EEP_EFUSE_CORRECT		0x00
+#define	AX88179_EEPROM_MAGIC		0x17900b95
+
+#define	AXGE_CONFIG_IDX			0	/* config number 1 */
+#define	AXGE_IFACE_IDX			0
+
+#define	AXGE_RXHDR_CRC_ERR		0x80000000
+#define	AXGE_RXHDR_L4_ERR		(1 << 8)
+#define	AXGE_RXHDR_L3_ERR		(1 << 9)
+
+#define	AXGE_RXHDR_L4_TYPE_ICMP		2
+#define	AXGE_RXHDR_L4_TYPE_IGMP		3
+#define	AXGE_RXHDR_L4_TYPE_TCMPV6	5
+
+#define	AXGE_RXHDR_L3_TYPE_IP		1
+#define	AXGE_RXHDR_L3_TYPE_IPV6		2
+
+#define	AXGE_RXHDR_L4_TYPE_MASK		0x1c
+#define	AXGE_RXHDR_L4_TYPE_UDP		4
+#define	AXGE_RXHDR_L4_TYPE_TCP		16
+#define	AXGE_RXHDR_L3CSUM_ERR		2
+#define	AXGE_RXHDR_L4CSUM_ERR		1
+#define	AXGE_RXHDR_CRC_ERR		0x80000000
+#define	AXGE_RXHDR_DROP_ERR		0x40000000
+
+struct axge_csum_hdr {
+	uint16_t cstatus;
+#define	AXGE_CSUM_HDR_L4_CSUM_ERR	0x0001
+#define	AXGE_CSUM_HDR_L3_CSUM_ERR	0x0002
+#define	AXGE_CSUM_HDR_L4_TYPE_UDP	0x0004
+#define	AXGE_CSUM_HDR_L4_TYPE_ICMP	0x0008
+#define	AXGE_CSUM_HDR_L4_TYPE_IGMP	0x000C
+#define	AXGE_CSUM_HDR_L4_TYPE_TCP	0x0010
+#define	AXGE_CSUM_HDR_L4_TYPE_TCPV6	0x0014
+#define	AXGE_CSUM_HDR_L4_TYPE_MASK	0x001C
+#define	AXGE_CSUM_HDR_L3_TYPE_IPV4	0x0020
+#define	AXGE_CSUM_HDR_L3_TYPE_IPV6	0x0040
+#define	AXGE_CSUM_HDR_VLAN_MASK		0x0700
+	uint16_t len;
+#define	AXGE_CSUM_HDR_LEN_MASK		0x1FFF
+#define	AXGE_CSUM_HDR_CRC_ERR		0x2000
+#define	AXGE_CSUM_HDR_MII_ERR		0x4000
+#define	AXGE_CSUM_HDR_DROP		0x8000
+} __packed;
+
+#define	AXGE_CSUM_RXBYTES(x)	((x) & AXGE_CSUM_HDR_LEN_MASK)
+
+#define	GET_MII(sc)		uether_getmii(&(sc)->sc_ue)
+
+/* The interrupt endpoint is currently unused by the ASIX part. */
+enum {
+	AXGE_BULK_DT_WR,
+	AXGE_BULK_DT_RD,
+	AXGE_N_TRANSFER,
+};
+
+struct axge_softc {
+	struct usb_ether	sc_ue;
+	struct mtx		sc_mtx;
+	struct usb_xfer		*sc_xfer[AXGE_N_TRANSFER];
+	int			sc_phyno;
+
+	int			sc_flags;
+#define	AXGE_FLAG_LINK		0x0001	/* got a link */
+};
+
+#define	AXGE_LOCK(_sc)			mtx_lock(&(_sc)->sc_mtx)
+#define	AXGE_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
+#define	AXGE_LOCK_ASSERT(_sc, t)	mtx_assert(&(_sc)->sc_mtx, t)
diff --git a/sys/dev/usb/net/if_cdce.c b/sys/dev/usb/net/if_cdce.c
index 6649bc02f53..5ed162593f8 100644
--- a/sys/dev/usb/net/if_cdce.c
+++ b/sys/dev/usb/net/if_cdce.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
@@ -67,6 +68,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
diff --git a/sys/dev/usb/net/if_cue.c b/sys/dev/usb/net/if_cue.c
index 6414e7ac5f2..5b06bc4c2a5 100644
--- a/sys/dev/usb/net/if_cue.c
+++ b/sys/dev/usb/net/if_cue.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
@@ -70,6 +71,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
diff --git a/sys/dev/usb/net/if_ipheth.c b/sys/dev/usb/net/if_ipheth.c
index 4460e00f4ea..056d364dccd 100644
--- a/sys/dev/usb/net/if_ipheth.c
+++ b/sys/dev/usb/net/if_ipheth.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
+#include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
 #include <sys/unistd.h>
@@ -51,6 +52,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c
index ec0c5f0889b..7410dbea76e 100644
--- a/sys/dev/usb/net/if_kue.c
+++ b/sys/dev/usb/net/if_kue.c
@@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
@@ -84,6 +85,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
diff --git a/sys/dev/usb/net/if_mos.c b/sys/dev/usb/net/if_mos.c
index 050bf385347..b3e541370a8 100644
--- a/sys/dev/usb/net/if_mos.c
+++ b/sys/dev/usb/net/if_mos.c
@@ -102,6 +102,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
@@ -115,6 +116,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
diff --git a/sys/dev/usb/net/if_rue.c b/sys/dev/usb/net/if_rue.c
index 17f82b09f3d..f37ae1c6a02 100644
--- a/sys/dev/usb/net/if_rue.c
+++ b/sys/dev/usb/net/if_rue.c
@@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
@@ -84,6 +85,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
diff --git a/sys/dev/usb/net/if_smsc.c b/sys/dev/usb/net/if_smsc.c
index 93762cf417b..6a02925304a 100644
--- a/sys/dev/usb/net/if_smsc.c
+++ b/sys/dev/usb/net/if_smsc.c
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/condvar.h>
+#include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
 #include <sys/unistd.h>
@@ -82,6 +83,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/priv.h>
 #include <sys/random.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include "opt_platform.h"
 
 #ifdef FDT
diff --git a/sys/dev/usb/net/if_udav.c b/sys/dev/usb/net/if_udav.c
index 4fd39cc48cf..418776030da 100644
--- a/sys/dev/usb/net/if_udav.c
+++ b/sys/dev/usb/net/if_udav.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 #include <sys/types.h>
 #include <sys/systm.h>
+#include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
@@ -65,6 +66,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/priv.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
diff --git a/sys/dev/usb/net/if_usie.c b/sys/dev/usb/net/if_usie.c
index 9ca1ad61901..19093184c68 100644
--- a/sys/dev/usb/net/if_usie.c
+++ b/sys/dev/usb/net/if_usie.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/queue.h>
 #include <sys/systm.h>
+#include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
@@ -44,6 +45,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/taskqueue.h>
 
+#include <net/if.h>
+#include <net/if_var.h>
+
 #include <machine/bus.h>
 
 #include <net/if.h>
diff --git a/sys/dev/usb/net/ruephy.c b/sys/dev/usb/net/ruephy.c
index bb9931e44d5..746ddbae6aa 100644
--- a/sys/dev/usb/net/ruephy.c
+++ b/sys/dev/usb/net/ruephy.c
@@ -123,22 +123,10 @@ ruephy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * Only used for autonegotiation.
 		 */
diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c
index c9d97577d2b..40d74394251 100644
--- a/sys/dev/usb/net/uhso.c
+++ b/sys/dev/usb/net/uhso.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/bus.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
 #include <net/bpf.h>
diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c
index 2f1795915d8..1d3ae6e44ea 100644
--- a/sys/dev/usb/net/usb_ethernet.c
+++ b/sys/dev/usb/net/usb_ethernet.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sx.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
diff --git a/sys/dev/usb/serial/u3g.c b/sys/dev/usb/serial/u3g.c
index 7ade79c06d9..74936f380ac 100644
--- a/sys/dev/usb/serial/u3g.c
+++ b/sys/dev/usb/serial/u3g.c
@@ -345,6 +345,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
 	U3G_DEV(NOVATEL, MC547, 0),
 	U3G_DEV(NOVATEL, MC950D, 0),
 	U3G_DEV(NOVATEL, MIFI2200, U3GINIT_SCSIEJECT),
+	U3G_DEV(NOVATEL, MIFI2200V, U3GINIT_SCSIEJECT),
 	U3G_DEV(NOVATEL, U720, 0),
 	U3G_DEV(NOVATEL, U727, 0),
 	U3G_DEV(NOVATEL, U727_2, 0),
@@ -387,6 +388,7 @@ static const STRUCT_USB_HOST_ID u3g_devs[] = {
 	U3G_DEV(OPTION, GTMAXHSUPA, 0),
 	U3G_DEV(OPTION, GTMAXHSUPAE, 0),
 	U3G_DEV(OPTION, VODAFONEMC3G, 0),
+	U3G_DEV(OPTION, GTM661W, 0),
 	U3G_DEV(QISDA, H20_1, 0),
 	U3G_DEV(QISDA, H20_2, 0),
 	U3G_DEV(QISDA, H21_1, 0),
diff --git a/sys/dev/usb/serial/umodem.c b/sys/dev/usb/serial/umodem.c
index d0dc364814f..163cdfbfff0 100644
--- a/sys/dev/usb/serial/umodem.c
+++ b/sys/dev/usb/serial/umodem.c
@@ -128,6 +128,9 @@ static const STRUCT_USB_HOST_ID umodem_devs[] = {
 	{USB_IFACE_CLASS(UICLASS_CDC),
 		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
 		USB_IFACE_PROTOCOL(UIPROTO_CDC_AT)},
+	{USB_IFACE_CLASS(UICLASS_CDC),
+		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
+		USB_IFACE_PROTOCOL(UIPROTO_CDC_NONE)},
 	/* Huawei Modem class match */
 	{USB_IFACE_CLASS(UICLASS_CDC),
 		USB_IFACE_SUBCLASS(UISUBCLASS_ABSTRACT_CONTROL_MODEL),
diff --git a/sys/dev/usb/serial/uslcom.c b/sys/dev/usb/serial/uslcom.c
index 69950f20a3a..a50937ab8c1 100644
--- a/sys/dev/usb/serial/uslcom.c
+++ b/sys/dev/usb/serial/uslcom.c
@@ -252,15 +252,37 @@ static const STRUCT_USB_HOST_ID uslcom_devs[] = {
     USLCOM_DEV(JABLOTRON, PC60B),
     USLCOM_DEV(KAMSTRUP, OPTICALEYE),
     USLCOM_DEV(KAMSTRUP, MBUS_250D),
+    USLCOM_DEV(LAKESHORE, 121),
+    USLCOM_DEV(LAKESHORE, 218A),
+    USLCOM_DEV(LAKESHORE, 219),
+    USLCOM_DEV(LAKESHORE, 233),
+    USLCOM_DEV(LAKESHORE, 235),
+    USLCOM_DEV(LAKESHORE, 335),
+    USLCOM_DEV(LAKESHORE, 336),
+    USLCOM_DEV(LAKESHORE, 350),
+    USLCOM_DEV(LAKESHORE, 371),
+    USLCOM_DEV(LAKESHORE, 411),
+    USLCOM_DEV(LAKESHORE, 425),
+    USLCOM_DEV(LAKESHORE, 455A),
+    USLCOM_DEV(LAKESHORE, 465),
+    USLCOM_DEV(LAKESHORE, 475A),
+    USLCOM_DEV(LAKESHORE, 625A),
+    USLCOM_DEV(LAKESHORE, 642A),
+    USLCOM_DEV(LAKESHORE, 648),
+    USLCOM_DEV(LAKESHORE, 737),
+    USLCOM_DEV(LAKESHORE, 776),
     USLCOM_DEV(LINKINSTRUMENTS, MSO19),
     USLCOM_DEV(LINKINSTRUMENTS, MSO28),
     USLCOM_DEV(LINKINSTRUMENTS, MSO28_2),
     USLCOM_DEV(MEI, CASHFLOW_SC),
     USLCOM_DEV(MEI, S2000),
+    USLCOM_DEV(NETGEAR, M4100),
     USLCOM_DEV(OWEN, AC4),
+    USLCOM_DEV(OWL, CM_160),
     USLCOM_DEV(PHILIPS, ACE1001),
     USLCOM_DEV(PLX, CA42),
     USLCOM_DEV(RENESAS, RX610),
+    USLCOM_DEV(SEL, C662),
     USLCOM_DEV(SILABS, AC_SERV_CAN),
     USLCOM_DEV(SILABS, AC_SERV_CIS),
     USLCOM_DEV(SILABS, AC_SERV_IBUS),
@@ -293,6 +315,7 @@ static const STRUCT_USB_HOST_ID uslcom_devs[] = {
     USLCOM_DEV(SILABS, HELICOM),
     USLCOM_DEV(SILABS, IMS_USB_RS422),
     USLCOM_DEV(SILABS, INFINITY_MIC),
+    USLCOM_DEV(SILABS, INGENI_ZIGBEE),
     USLCOM_DEV(SILABS, INSYS_MODEM),
     USLCOM_DEV(SILABS, IRZ_SG10),
     USLCOM_DEV(SILABS, KYOCERA_GPS),
@@ -300,6 +323,7 @@ static const STRUCT_USB_HOST_ID uslcom_devs[] = {
     USLCOM_DEV(SILABS, LIPOWSKY_JTAG),
     USLCOM_DEV(SILABS, LIPOWSKY_LIN),
     USLCOM_DEV(SILABS, MC35PU),
+    USLCOM_DEV(SILABS, MMB_ZIGBEE),
     USLCOM_DEV(SILABS, MJS_TOSLINK),
     USLCOM_DEV(SILABS, MSD_DASHHAWK),
     USLCOM_DEV(SILABS, MULTIPLEX_RC),
@@ -316,6 +340,7 @@ static const STRUCT_USB_HOST_ID uslcom_devs[] = {
     USLCOM_DEV(SILABS, USBPULSE100),
     USLCOM_DEV(SILABS, USBSCOPE50),
     USLCOM_DEV(SILABS, USBWAVE12),
+    USLCOM_DEV(SILABS, V_PREON32),
     USLCOM_DEV(SILABS, VSTABI),
     USLCOM_DEV(SILABS, WAVIT),
     USLCOM_DEV(SILABS, WMRBATT),
@@ -330,6 +355,7 @@ static const STRUCT_USB_HOST_ID uslcom_devs[] = {
     USLCOM_DEV(VAISALA, CABLE),
     USLCOM_DEV(WAGO, SERVICECABLE),
     USLCOM_DEV(WAVESENSE, JAZZ),
+    USLCOM_DEV(WESTMOUNTAIN, RIGBLASTER_ADVANTAGE),
     USLCOM_DEV(WIENERPLEINBAUS, PL512),
     USLCOM_DEV(WIENERPLEINBAUS, RCM),
     USLCOM_DEV(WIENERPLEINBAUS, MPOD),
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c
index 2e6051dd6c1..f3a51b313ff 100644
--- a/sys/dev/usb/storage/umass.c
+++ b/sys/dev/usb/storage/umass.c
@@ -2119,10 +2119,9 @@ umass_cam_attach(struct umass_softc *sc)
 #ifndef USB_DEBUG
 	if (bootverbose)
 #endif
-		printf("%s:%d:%d:%d: Attached to scbus%d\n",
+		printf("%s:%d:%d: Attached to scbus%d\n",
 		    sc->sc_name, cam_sim_path(sc->sc_sim),
-		    sc->sc_unit, CAM_LUN_WILDCARD,
-		    cam_sim_path(sc->sc_sim));
+		    sc->sc_unit, cam_sim_path(sc->sc_sim));
 }
 
 /* umass_cam_detach
@@ -2173,19 +2172,19 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 				cmd = (uint8_t *)(ccb->csio.cdb_io.cdb_bytes);
 			}
 
-			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%d:XPT_SCSI_IO: "
+			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%jx:XPT_SCSI_IO: "
 			    "cmd: 0x%02x, flags: 0x%02x, "
 			    "%db cmd/%db data/%db sense\n",
 			    cam_sim_path(sc->sc_sim), ccb->ccb_h.target_id,
-			    ccb->ccb_h.target_lun, cmd[0],
+			    (uintmax_t)ccb->ccb_h.target_lun, cmd[0],
 			    ccb->ccb_h.flags & CAM_DIR_MASK, ccb->csio.cdb_len,
 			    ccb->csio.dxfer_len, ccb->csio.sense_len);
 
 			if (sc->sc_transfer.ccb) {
-				DPRINTF(sc, UDMASS_SCSI, "%d:%d:%d:XPT_SCSI_IO: "
+				DPRINTF(sc, UDMASS_SCSI, "%d:%d:%jx:XPT_SCSI_IO: "
 				    "I/O in progress, deferring\n",
 				    cam_sim_path(sc->sc_sim), ccb->ccb_h.target_id,
-				    ccb->ccb_h.target_lun);
+				    (uintmax_t)ccb->ccb_h.target_lun);
 				ccb->ccb_h.status = CAM_SCSI_BUSY;
 				xpt_done(ccb);
 				goto done;
@@ -2303,9 +2302,9 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		{
 			struct ccb_pathinq *cpi = &ccb->cpi;
 
-			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%d:XPT_PATH_INQ:.\n",
+			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%jx:XPT_PATH_INQ:.\n",
 			    sc ? cam_sim_path(sc->sc_sim) : -1, ccb->ccb_h.target_id,
-			    ccb->ccb_h.target_lun);
+			    (uintmax_t)ccb->ccb_h.target_lun);
 
 			/* host specific information */
 			cpi->version_num = 1;
@@ -2358,9 +2357,9 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		}
 	case XPT_RESET_DEV:
 		{
-			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%d:XPT_RESET_DEV:.\n",
+			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%jx:XPT_RESET_DEV:.\n",
 			    cam_sim_path(sc->sc_sim), ccb->ccb_h.target_id,
-			    ccb->ccb_h.target_lun);
+			    (uintmax_t)ccb->ccb_h.target_lun);
 
 			umass_reset(sc);
 
@@ -2372,9 +2371,9 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		{
 			struct ccb_trans_settings *cts = &ccb->cts;
 
-			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%d:XPT_GET_TRAN_SETTINGS:.\n",
+			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%jx:XPT_GET_TRAN_SETTINGS:.\n",
 			    cam_sim_path(sc->sc_sim), ccb->ccb_h.target_id,
-			    ccb->ccb_h.target_lun);
+			    (uintmax_t)ccb->ccb_h.target_lun);
 
 			cts->protocol = PROTO_SCSI;
 			cts->protocol_version = SCSI_REV_2;
@@ -2388,9 +2387,9 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		}
 	case XPT_SET_TRAN_SETTINGS:
 		{
-			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%d:XPT_SET_TRAN_SETTINGS:.\n",
+			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%jx:XPT_SET_TRAN_SETTINGS:.\n",
 			    cam_sim_path(sc->sc_sim), ccb->ccb_h.target_id,
-			    ccb->ccb_h.target_lun);
+			    (uintmax_t)ccb->ccb_h.target_lun);
 
 			ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
 			xpt_done(ccb);
@@ -2404,19 +2403,19 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
 		}
 	case XPT_NOOP:
 		{
-			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%d:XPT_NOOP:.\n",
+			DPRINTF(sc, UDMASS_SCSI, "%d:%d:%jx:XPT_NOOP:.\n",
 			    sc ? cam_sim_path(sc->sc_sim) : -1, ccb->ccb_h.target_id,
-			    ccb->ccb_h.target_lun);
+			    (uintmax_t)ccb->ccb_h.target_lun);
 
 			ccb->ccb_h.status = CAM_REQ_CMP;
 			xpt_done(ccb);
 			break;
 		}
 	default:
-		DPRINTF(sc, UDMASS_SCSI, "%d:%d:%d:func_code 0x%04x: "
+		DPRINTF(sc, UDMASS_SCSI, "%d:%d:%jx:func_code 0x%04x: "
 		    "Not implemented\n",
 		    sc ? cam_sim_path(sc->sc_sim) : -1, ccb->ccb_h.target_id,
-		    ccb->ccb_h.target_lun, ccb->ccb_h.func_code);
+		    (uintmax_t)ccb->ccb_h.target_lun, ccb->ccb_h.func_code);
 
 		ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
 		xpt_done(ccb);
diff --git a/sys/dev/usb/usb.h b/sys/dev/usb/usb.h
index b8b52d5abb9..3e014521c2b 100644
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
@@ -441,6 +441,7 @@ typedef struct usb_interface_assoc_descriptor usb_interface_assoc_descriptor_t;
 #define	UISUBCLASS_ETHERNET_EMULATION_MODEL 12
 #define	UISUBCLASS_NETWORK_CONTROL_MODEL 13
 
+#define	UIPROTO_CDC_NONE		0
 #define	UIPROTO_CDC_AT			1
 
 #define	UICLASS_HID		0x03
diff --git a/sys/dev/usb/usb_bus.h b/sys/dev/usb/usb_bus.h
index 2898eee87cb..9836058d991 100644
--- a/sys/dev/usb/usb_bus.h
+++ b/sys/dev/usb/usb_bus.h
@@ -81,6 +81,7 @@ struct usb_bus {
 	struct usb_bus_msg attach_msg[2];
 	struct usb_bus_msg suspend_msg[2];
 	struct usb_bus_msg resume_msg[2];
+	struct usb_bus_msg reset_msg[2];
 	struct usb_bus_msg shutdown_msg[2];
 	/*
 	 * This mutex protects the USB hardware:
diff --git a/sys/dev/usb/usb_busdma.c b/sys/dev/usb/usb_busdma.c
index 1808ab4a24d..83b47cb7606 100644
--- a/sys/dev/usb/usb_busdma.c
+++ b/sys/dev/usb/usb_busdma.c
@@ -215,9 +215,7 @@ usbd_m_copy_in(struct usb_page_cache *cache, usb_frlength_t dst_offset,
     struct mbuf *m, usb_size_t src_offset, usb_frlength_t src_len)
 {
 	struct usb_m_copy_in_arg arg = {cache, dst_offset};
-	int error;
-
-	error = m_apply(m, src_offset, src_len, &usbd_m_copy_in_cb, &arg);
+	(void) m_apply(m, src_offset, src_len, &usbd_m_copy_in_cb, &arg);
 }
 #endif
 
diff --git a/sys/dev/usb/usb_controller.h b/sys/dev/usb/usb_controller.h
index 3ee6f04ac2a..6a2f6b03edd 100644
--- a/sys/dev/usb/usb_controller.h
+++ b/sys/dev/usb/usb_controller.h
@@ -191,6 +191,7 @@ void	usb_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb);
 uint8_t	usb_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat, usb_bus_mem_cb_t *cb);
 void	usb_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb);
 uint16_t usb_isoc_time_expand(struct usb_bus *bus, uint16_t isoc_time_curr);
+void	usb_bus_reset_async_locked(struct usb_bus *bus);
 #if USB_HAVE_TT_SUPPORT
 uint8_t	usbd_fs_isoc_schedule_alloc_slot(struct usb_xfer *isoc_xfer, uint16_t isoc_time);
 #endif
diff --git a/sys/dev/usb/usb_dev.c b/sys/dev/usb/usb_dev.c
index 9bf430bcf43..9e3cef5220a 100644
--- a/sys/dev/usb/usb_dev.c
+++ b/sys/dev/usb/usb_dev.c
@@ -1099,7 +1099,7 @@ usb_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int fflag, struct thread*
 
 	/* Wait for re-enumeration, if any */
 
-	while (f->udev->re_enumerate_wait != 0) {
+	while (f->udev->re_enumerate_wait != USB_RE_ENUM_DONE) {
 
 		usb_unref_device(cpd, &refs);
 
diff --git a/sys/dev/usb/usb_device.h b/sys/dev/usb/usb_device.h
index 06b931fb0b2..b5b5d13d5cd 100644
--- a/sys/dev/usb/usb_device.h
+++ b/sys/dev/usb/usb_device.h
@@ -238,6 +238,9 @@ struct usb_device {
 	uint8_t	driver_added_refcount;	/* our driver added generation count */
 	uint8_t	power_mode;		/* see USB_POWER_XXX */
 	uint8_t re_enumerate_wait;	/* set if re-enum. is in progress */
+#define	USB_RE_ENUM_DONE	0
+#define	USB_RE_ENUM_START	1
+#define	USB_RE_ENUM_PWR_OFF	2
 	uint8_t ifaces_max;		/* number of interfaces present */
 	uint8_t endpoints_max;		/* number of endpoints present */
 
diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c
index 8e1033e4a9c..6d8b0f5bfce 100644
--- a/sys/dev/usb/usb_generic.c
+++ b/sys/dev/usb/usb_generic.c
@@ -1762,16 +1762,11 @@ ugen_set_power_mode(struct usb_fifo *f, int mode)
 
 	switch (mode) {
 	case USB_POWER_MODE_OFF:
-		/* get the device unconfigured */
-		err = ugen_set_config(f, USB_UNCONFIG_INDEX);
-		if (err) {
-			DPRINTFN(0, "Could not unconfigure "
-			    "device (ignored)\n");
+		if (udev->flags.usb_mode == USB_MODE_HOST &&
+		    udev->re_enumerate_wait == USB_RE_ENUM_DONE) {
+			udev->re_enumerate_wait = USB_RE_ENUM_PWR_OFF;
 		}
-
-		/* clear port enable */
-		err = usbd_req_clear_port_feature(udev->parent_hub,
-		    NULL, udev->port_no, UHF_PORT_ENABLE);
+		/* set power mode will wake up the explore thread */
 		break;
 
 	case USB_POWER_MODE_ON:
@@ -1819,9 +1814,9 @@ ugen_set_power_mode(struct usb_fifo *f, int mode)
 
 	/* if we are powered off we need to re-enumerate first */
 	if (old_mode == USB_POWER_MODE_OFF) {
-		if (udev->flags.usb_mode == USB_MODE_HOST) {
-			if (udev->re_enumerate_wait == 0)
-				udev->re_enumerate_wait = 1;
+		if (udev->flags.usb_mode == USB_MODE_HOST &&
+		    udev->re_enumerate_wait == USB_RE_ENUM_DONE) {
+			udev->re_enumerate_wait = USB_RE_ENUM_START;
 		}
 		/* set power mode will wake up the explore thread */
 	}
diff --git a/sys/dev/usb/usb_hub.c b/sys/dev/usb/usb_hub.c
index 46b7d8d540e..3e9d1cbb699 100644
--- a/sys/dev/usb/usb_hub.c
+++ b/sys/dev/usb/usb_hub.c
@@ -248,7 +248,8 @@ uhub_explore_sub(struct uhub_softc *sc, struct usb_port *up)
 		uint8_t do_unlock;
 		
 		do_unlock = usbd_enum_lock(child);
-		if (child->re_enumerate_wait) {
+		switch (child->re_enumerate_wait) {
+		case USB_RE_ENUM_START:
 			err = usbd_set_config_index(child,
 			    USB_UNCONFIG_INDEX);
 			if (err != 0) {
@@ -263,8 +264,33 @@ uhub_explore_sub(struct uhub_softc *sc, struct usb_port *up)
 				err = usb_probe_and_attach(child,
 				    USB_IFACE_INDEX_ANY);
 			}
-			child->re_enumerate_wait = 0;
+			child->re_enumerate_wait = USB_RE_ENUM_DONE;
 			err = 0;
+			break;
+
+		case USB_RE_ENUM_PWR_OFF:
+			/* get the device unconfigured */
+			err = usbd_set_config_index(child,
+			    USB_UNCONFIG_INDEX);
+			if (err) {
+				DPRINTFN(0, "Could not unconfigure "
+				    "device (ignored)\n");
+			}
+
+			/* clear port enable */
+			err = usbd_req_clear_port_feature(child->parent_hub,
+			    NULL, child->port_no, UHF_PORT_ENABLE);
+			if (err) {
+				DPRINTFN(0, "Could not disable port "
+				    "(ignored)\n");
+			}
+			child->re_enumerate_wait = USB_RE_ENUM_DONE;
+			err = 0;
+			break;
+
+		default:
+			child->re_enumerate_wait = USB_RE_ENUM_DONE;
+			break;
 		}
 		if (do_unlock)
 			usbd_enum_unlock(child);
@@ -2086,7 +2112,7 @@ usb_peer_should_wakeup(struct usb_device *udev)
 	return (((udev->power_mode == USB_POWER_MODE_ON) &&
 	    (udev->flags.usb_mode == USB_MODE_HOST)) ||
 	    (udev->driver_added_refcount != udev->bus->driver_added_refcount) ||
-	    (udev->re_enumerate_wait != 0) ||
+	    (udev->re_enumerate_wait != USB_RE_ENUM_DONE) ||
 	    (udev->pwr_save.type_refs[UE_ISOCHRONOUS] != 0) ||
 	    (udev->pwr_save.write_refs != 0) ||
 	    ((udev->pwr_save.read_refs != 0) &&
@@ -2502,6 +2528,8 @@ usbd_set_power_mode(struct usb_device *udev, uint8_t power_mode)
 
 #if USB_HAVE_POWERD
 	usb_bus_power_update(udev->bus);
+#else
+	usb_needs_explore(udev->bus, 0 /* no probe */ );
 #endif
 }
 
@@ -2540,8 +2568,8 @@ usbd_filter_power_mode(struct usb_device *udev, uint8_t power_mode)
 void
 usbd_start_re_enumerate(struct usb_device *udev)
 {
-	if (udev->re_enumerate_wait == 0) {
-		udev->re_enumerate_wait = 1;
+	if (udev->re_enumerate_wait == USB_RE_ENUM_DONE) {
+		udev->re_enumerate_wait = USB_RE_ENUM_START;
 		usb_needs_explore(udev->bus, 0);
 	}
 }
diff --git a/sys/dev/usb/usb_pf.c b/sys/dev/usb/usb_pf.c
index 121105b2b27..650f666d0f5 100644
--- a/sys/dev/usb/usb_pf.c
+++ b/sys/dev/usb/usb_pf.c
@@ -45,6 +45,7 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_clone.h>
 #include <net/bpf.h>
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index e6a32aecf9d..3edc1a6c09b 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -569,6 +569,7 @@ vendor FALCOM		0x0f94	Falcom Wireless Communications GmbH
 vendor RIM		0x0fca	Research In Motion
 vendor DYNASTREAM	0x0fcf	Dynastream Innovations
 vendor LARSENBRUSGAARD	0x0fd8	Larsen and Brusgaard
+vendor OWL		0x0fde	OWL
 vendor KONTRON		0x0fe6	Kontron AG
 vendor QUALCOMM		0x1004	Qualcomm
 vendor APACER		0x1005	Apacer
@@ -654,6 +655,7 @@ vendor OWEN		0x1555	Owen
 vendor OQO		0x1557	OQO
 vendor UMEDIA		0x157e	U-MEDIA Communications
 vendor FIBERLINE	0x1582	Fiberline
+vendor FREESCALE	0x15a2  Freescale Semiconductor, Inc.
 vendor AFATECH		0x15a4	Afatech Technologies, Inc.
 vendor SPARKLAN		0x15a9	SparkLAN
 vendor OLIMEX		0x15ba	Olimex
@@ -695,6 +697,7 @@ vendor QUALCOMMINC	0x19d2	Qualcomm, Incorporated
 vendor BAYER		0x1a79	Bayer
 vendor WCH2		0x1a86	QinHeng Electronics
 vendor STELERA		0x1a8d	Stelera Wireless
+vendor SEL		0x1adb	Schweitzer Engineering Laboratories
 vendor CORSAIR		0x1b1c	Corsair
 vendor MATRIXORBITAL	0x1b3d	Matrix Orbital
 vendor OVISLINK		0x1b75	OvisLink
@@ -715,6 +718,7 @@ vendor METAGEEK2	0x1dd5	MetaGeek
 vendor ALINK		0x1e0e  Alink
 vendor AIRTIES		0x1eda	AirTies
 vendor FESTO		0x1e29	Festo
+vendor LAKESHORE	0x1fb9	Lake Shore Cryotronics, Inc.
 vendor VERTEX		0x1fe7  Vertex Wireless Co., Ltd.
 vendor DLINK		0x2001	D-Link
 vendor PLANEX2		0x2019	Planex Communications
@@ -730,6 +734,7 @@ vendor VIALABS		0x2109	VIA Labs
 vendor ERICSSON		0x2282	Ericsson
 vendor MOTOROLA2	0x22b8	Motorola
 vendor WETELECOM	0x22de	WeTelecom
+vendor WESTMOUNTAIN	0x2405	West Mountain Radio
 vendor TRIPPLITE	0x2478	Tripp-Lite
 vendor HIROSE		0x2631	Hirose Electric
 vendor NHJ		0x2770	NHJ
@@ -1116,6 +1121,8 @@ product ASANTE EA		0x1427	Ethernet
 /* ASIX Electronics products */
 product ASIX AX88172		0x1720	10/100 Ethernet
 product ASIX AX88178		0x1780	AX88178
+product ASIX AX88178A		0x178a	AX88178A USB 2.0 10/100/1000 Ethernet
+product ASIX AX88179		0x1790	AX88179 USB 3.0 10/100/1000 Ethernet
 product ASIX AX88772		0x7720	AX88772
 product ASIX AX88772A		0x772a	AX88772A USB 2.0 10/100 Ethernet
 product ASIX AX88772B		0x772b	AX88772B USB 2.0 10/100 Ethernet
@@ -1259,6 +1266,7 @@ product BELKIN F5D8055V2	0x825b	F5D8055 v2
 product BELKIN F5D9050V3	0x905b	F5D9050 ver 3 Wireless Adapter
 product BELKIN2 F5U002		0x0002	F5U002 Parallel printer
 product BELKIN F6D4050V1	0x935a	F6D4050 v1
+product BELKIN F6D4050V2	0x935b	F6D4050 v2
 
 /* Billionton products */
 product BILLIONTON USB100	0x0986	USB100N 10/100 FastEthernet
@@ -1547,6 +1555,8 @@ product DLINK DWLG122		0x3c00	DWL-G122 b1 Wireless Adapter
 product DLINK DUBE100B1		0x3c05	DUB-E100 rev B1
 product DLINK RT2870		0x3c09	RT2870
 product DLINK RT3072		0x3c0a	RT3072
+product DLINK DWA140B3		0x3c15	DWA-140 rev B3
+product DLINK DWA160B2		0x3c1a	DWA-160 rev B2
 product DLINK DWA127		0x3c1b	DWA-127 Wireless Adapter
 product DLINK DSB650C		0x4000	10Mbps Ethernet
 product DLINK DSB650TX1		0x4001	10/100 Ethernet
@@ -1604,7 +1614,7 @@ product DYNASTREAM ANTDEVBOARD2	0x1006	ANT dev board
 product EDIMAX EW7318USG	0x7318	USB Wireless dongle
 product EDIMAX RTL8192SU_1	0x7611	RTL8192SU
 product EDIMAX RTL8192SU_2	0x7612	RTL8192SU
-product EDIMAX RTL8192SU_3	0x7622	RTL8192SU
+product EDIMAX EW7622UMN	0x7622	EW-7622UMn
 product EDIMAX RT2870_1		0x7711	RT2870
 product EDIMAX EW7717		0x7717	EW-7717
 product EDIMAX EW7718		0x7718	EW-7718
@@ -2486,6 +2496,27 @@ product KYOCERA2 KPC680		0x180a	Qualcomm Kyocera CDMA Technologies MSM
 product LACIE HD		0xa601	Hard Disk
 product LACIE CDRW		0xa602	CD R/W
 
+/* Lake Shore Cryotronics products */
+product LAKESHORE 121		0x0100	121 Current Source
+product LAKESHORE 218A		0x0200	218A Temperature Monitor
+product LAKESHORE 219		0x0201	219 Temperature Monitor
+product LAKESHORE 233		0x0202	233 Temperature Transmitter
+product LAKESHORE 235		0x0203	235 Temperature Transmitter
+product LAKESHORE 335		0x0300	335 Temperature Controller
+product LAKESHORE 336		0x0301	336 Temperature Controller
+product LAKESHORE 350		0x0302	350 Temperature Controller
+product LAKESHORE 371		0x0303	371 AC Bridge
+product LAKESHORE 411		0x0400	411 Handheld Gaussmeter
+product LAKESHORE 425		0x0401	425 Gaussmeter
+product LAKESHORE 455A		0x0402	455A DSP Gaussmeter
+product LAKESHORE 475A		0x0403	475A DSP Gaussmeter
+product LAKESHORE 465		0x0404	465 Gaussmeter
+product LAKESHORE 625A		0x0600	625A Magnet PSU
+product LAKESHORE 642A		0x0601	642A Magnet PSU
+product LAKESHORE 648		0x0602	648 Magnet PSU
+product LAKESHORE 737		0x0700	737 VSM Controller
+product LAKESHORE 776		0x0701	776 Matrix Switch
+
 /* Larsen and Brusgaard products */
 product LARSENBRUSGAARD ALTITRACK	0x0001	FTDI compatible adapter
 
@@ -3085,6 +3116,7 @@ product NETGEAR EA101		0x1001	Ethernet
 product NETGEAR EA101X		0x1002	Ethernet
 product NETGEAR FA101		0x1020	Ethernet 10/100, USB1.1
 product NETGEAR FA120		0x1040	USB 2.0 Ethernet
+product NETGEAR M4100		0x1100	M4100/M5300/M7100 series switch
 product NETGEAR WG111V2_2	0x4240	PrismGT USB 2.0 WLAN
 product NETGEAR WG111V3		0x4260	WG111v3
 product NETGEAR WG111U		0x4300	WG111U
@@ -3143,6 +3175,7 @@ product NOVATEL EU870D		0x2420	Expedite EU870D
 product NOVATEL U727		0x4100	Merlin U727 CDMA
 product NOVATEL MC950D		0x4400	Novatel MC950D HSUPA
 product NOVATEL ZEROCD		0x5010	Novatel ZeroCD
+product NOVATEL MIFI2200V	0x5020	Novatel MiFi 2200 CDMA Virgin Mobile
 product NOVATEL ZEROCD2		0x5030	Novatel ZeroCD
 product NOVATEL MIFI2200	0x5041	Novatel MiFi 2200 CDMA
 product NOVATEL U727_2		0x5100	Merlin U727 CDMA
@@ -3221,6 +3254,7 @@ product OPTION GMT382		0x7501	Globetrotter HSUPA
 product OPTION GE40X_1		0x7301	Globetrotter HSUPA
 product OPTION GE40X_2		0x7361	Globetrotter HSUPA
 product OPTION GE40X_3		0x7381	Globetrotter HSUPA
+product OPTION GTM661W		0x9000  GTM661W
 product OPTION ICONEDGE		0xc031	GlobeSurfer iCON EDGE
 product OPTION MODHSXPA		0xd013	Globetrotter HSUPA
 product OPTION ICON321		0xd031	Globetrotter HSUPA
@@ -3249,6 +3283,9 @@ product OTI DKU5		0x6858	DKU-5 Serial
 /* Owen.ru products */
 product OWEN AC4		0x0004	AC4 USB-RS485 converter
 
+/* OWL producs */
+product OWL CM_160		0xca05	OWL CM-160 power monitor
+
 /* Palm Computing, Inc. product */
 product PALM SERIAL		0x0080	USB Serial
 product PALM M500		0x0001	Palm m500
@@ -3570,6 +3607,7 @@ product RALINK RT3072		0x3072	RT3072
 product RALINK RT3370		0x3370	RT3370
 product RALINK RT3572		0x3572	RT3572
 product RALINK RT5370		0x5370	RT5370
+product RALINK RT5572		0x5572	RT5572
 product RALINK RT8070		0x8070	RT8070
 product RALINK RT2570_3		0x9020	RT2500USB Wireless Adapter
 product RALINK RT2573_2		0x9021	RT2501USB Wireless Adapter
@@ -3695,6 +3733,9 @@ product SANYO SCP4900 		0x0701	Sanyo SCP-4900 USB Phone
 product SCANLOGIC SL11R		0x0002	SL11R IDE Adapter
 product SCANLOGIC 336CX		0x0300	Phantom 336CX - C3 scanner
 
+/* Schweitzer Engineering Laboratories products */
+product SEL C662		0x0001	C662 Cable
+
 /* Sealevel products */
 product SEALEVEL 2101		0x2101	FTDI compatible adapter
 product SEALEVEL 2102		0x2102	FTDI compatible adapter
@@ -3935,8 +3976,11 @@ product SILABS	BEI_VCP		0x846e	BEI USB Sensor (VCP)
 product SILABS	BALLUFF_RFID	0x8477	Balluff RFID reader
 product SILABS	AC_SERV_IBUS	0x85ea	AC-Services IBUS Interface
 product SILABS	AC_SERV_CIS	0x85eb	AC-Services CIS-IBUS
+product SILABS	V_PREON32	0x85f8	Virtenio Preon32
 product SILABS	AC_SERV_CAN	0x8664	AC-Services CAN Interface
 product SILABS	AC_SERV_OBD	0x8665	AC-Services OBD Interface
+product SILABS	MMB_ZIGBEE	0x88a4	MMB Networks ZigBee
+product SILABS	INGENI_ZIGBEE	0x88a5	Planet Innovation Ingeni ZigBee
 product SILABS	CP2102		0xea60	SILABS USB UART
 product SILABS	CP210X_2	0xea61	CP210x Serial
 product SILABS	CP210X_3	0xea70	CP210x Serial
@@ -4326,6 +4370,9 @@ product WCH2 CH341SER_2		0x5523	CH341/CH340 USB-Serial Bridge
 product WCH2 CH341SER		0x7523	CH341/CH340 USB-Serial Bridge
 product WCH2 U2M		0X752d	CH345 USB2.0-MIDI
 
+/* West Mountain Radio products */
+product WESTMOUNTAIN RIGBLASTER_ADVANTAGE	0x0003	RIGblaster Advantage
+
 /* Western Digital products */
 product WESTERN COMBO		0x0200	Firewire USB Combo
 product WESTERN EXTHDD		0x0400	External HDD
diff --git a/sys/dev/usb/wlan/if_rsu.c b/sys/dev/usb/wlan/if_rsu.c
index 30cdbe93549..8bd23d102b2 100644
--- a/sys/dev/usb/wlan/if_rsu.c
+++ b/sys/dev/usb/wlan/if_rsu.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -102,7 +103,7 @@ static const STRUCT_USB_HOST_ID rsu_devs[] = {
 	RSU_DEV_HT(DLINK2,		RTL8192SU_2),
 	RSU_DEV_HT(EDIMAX,		RTL8192SU_1),
 	RSU_DEV_HT(EDIMAX,		RTL8192SU_2),
-	RSU_DEV_HT(EDIMAX,		RTL8192SU_3),
+	RSU_DEV_HT(EDIMAX,		EW7622UMN),
 	RSU_DEV_HT(GUILLEMOT,		HWGUN54),
 	RSU_DEV_HT(GUILLEMOT,		HWNUM300),
 	RSU_DEV_HT(HAWKING,		RTL8192SU_1),
@@ -480,8 +481,13 @@ rsu_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 	if (uvp == NULL)
 		return (NULL);
 	vap = &uvp->vap;
-	ieee80211_vap_setup(ic, vap, name, unit, opmode,
-	    flags, bssid, mac);
+
+	if (ieee80211_vap_setup(ic, vap, name, unit, opmode,
+	    flags, bssid, mac) != 0) {
+		/* out of memory */
+		free(uvp, M_80211_VAP);
+		return (NULL);
+	}
 
 	/* override state transition machine */
 	uvp->newstate = vap->iv_newstate;
@@ -1153,7 +1159,7 @@ rsu_event_survey(struct rsu_softc *sc, uint8_t *buf, int len)
 	wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT |
 	    IEEE80211_FC0_SUBTYPE_BEACON;
 	wh->i_fc[1] = IEEE80211_FC1_DIR_NODS;
-	*(uint16_t *)wh->i_dur = 0;
+	USETW(wh->i_dur, 0);
 	IEEE80211_ADDR_COPY(wh->i_addr1, ifp->if_broadcastaddr);
 	IEEE80211_ADDR_COPY(wh->i_addr2, bss->macaddr);
 	IEEE80211_ADDR_COPY(wh->i_addr3, bss->macaddr);
diff --git a/sys/dev/usb/wlan/if_rum.c b/sys/dev/usb/wlan/if_rum.c
index fa4e9f1236e..e05dda07711 100644
--- a/sys/dev/usb/wlan/if_rum.c
+++ b/sys/dev/usb/wlan/if_rum.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -604,8 +605,13 @@ rum_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 		return NULL;
 	vap = &rvp->vap;
 	/* enable s/w bmiss handling for sta mode */
-	ieee80211_vap_setup(ic, vap, name, unit, opmode,
-	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
+
+	if (ieee80211_vap_setup(ic, vap, name, unit, opmode,
+	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac) != 0) {
+		/* out of memory */
+		free(rvp, M_80211_VAP);
+		return (NULL);
+	}
 
 	/* override state transition machine */
 	rvp->newstate = vap->iv_newstate;
@@ -1131,7 +1137,7 @@ rum_tx_mgt(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
 
 		dur = ieee80211_ack_duration(ic->ic_rt, tp->mgmtrate, 
 		    ic->ic_flags & IEEE80211_F_SHPREAMBLE);
-		*(uint16_t *)wh->i_dur = htole16(dur);
+		USETW(wh->i_dur, dur);
 
 		/* tell hardware to add timestamp for probe responses */
 		if ((wh->i_fc[0] &
@@ -1275,7 +1281,7 @@ rum_tx_data(struct rum_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
 
 		dur = ieee80211_ack_duration(ic->ic_rt, rate, 
 		    ic->ic_flags & IEEE80211_F_SHPREAMBLE);
-		*(uint16_t *)wh->i_dur = htole16(dur);
+		USETW(wh->i_dur, dur);
 	}
 
 	rum_setup_tx_desc(sc, &data->desc, flags, 0, m0->m_pkthdr.len, rate);
diff --git a/sys/dev/usb/wlan/if_rumreg.h b/sys/dev/usb/wlan/if_rumreg.h
index 75a51bcd4ad..44e627ad138 100644
--- a/sys/dev/usb/wlan/if_rumreg.h
+++ b/sys/dev/usb/wlan/if_rumreg.h
@@ -139,7 +139,7 @@
 #define RT2573_BBP_BUSY	(1 << 16)
 /* possible flags for register PHY_CSR4 */
 #define RT2573_RF_20BIT	(20 << 24)
-#define RT2573_RF_BUSY	(1 << 31)
+#define RT2573_RF_BUSY	(1U << 31)
 
 /* LED values */
 #define RT2573_LED_RADIO	(1 << 8)
diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c
index 5b4587fd6c1..701a895a793 100644
--- a/sys/dev/usb/wlan/if_run.c
+++ b/sys/dev/usb/wlan/if_run.c
@@ -2,6 +2,7 @@
  * Copyright (c) 2008,2010 Damien Bergamini <damien.bergamini@free.fr>
  * ported to FreeBSD by Akinori Furukoshi <moonlightakkiy@yahoo.ca>
  * USB Consulting, Hans Petter Selasky <hselasky@freebsd.org>
+ * Copyright (c) 2013 Kevin Lo
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,7 +21,7 @@
 __FBSDID("$FreeBSD$");
 
 /*-
- * Ralink Technology RT2700U/RT2800U/RT3000U chipset driver.
+ * Ralink Technology RT2700U/RT2800U/RT3000U/RT3900E chipset driver.
  * http://www.ralinktech.com/
  */
 
@@ -47,6 +48,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -74,8 +76,6 @@ __FBSDID("$FreeBSD$");
 #include <dev/usb/wlan/if_runreg.h>
 #include <dev/usb/wlan/if_runvar.h>
 
-#define	N(_a) ((int)(sizeof((_a)) / sizeof((_a)[0])))
-
 #ifdef	USB_DEBUG
 #define RUN_DEBUG
 #endif
@@ -147,6 +147,7 @@ static const STRUCT_USB_HOST_ID run_devs[] = {
     RUN_DEV(BELKIN,		F5D8055),
     RUN_DEV(BELKIN,		F5D8055V2),
     RUN_DEV(BELKIN,		F6D4050V1),
+    RUN_DEV(BELKIN,		F6D4050V2),
     RUN_DEV(BELKIN,		RT2870_1),
     RUN_DEV(BELKIN,		RT2870_2),
     RUN_DEV(CISCOLINKSYS,	AE1000),
@@ -172,6 +173,8 @@ static const STRUCT_USB_HOST_ID run_devs[] = {
     RUN_DEV(DLINK,		RT2870),
     RUN_DEV(DLINK,		RT3072),
     RUN_DEV(DLINK,		DWA127),
+    RUN_DEV(DLINK,		DWA140B3),
+    RUN_DEV(DLINK,		DWA160B2),
     RUN_DEV(DLINK2,		DWA130),
     RUN_DEV(DLINK2,		RT2870_1),
     RUN_DEV(DLINK2,		RT2870_2),
@@ -255,6 +258,8 @@ static const STRUCT_USB_HOST_ID run_devs[] = {
     RUN_DEV(RALINK,		RT3072),
     RUN_DEV(RALINK,		RT3370),
     RUN_DEV(RALINK,		RT3572),
+    RUN_DEV(RALINK,		RT5370),
+    RUN_DEV(RALINK,		RT5572),
     RUN_DEV(RALINK,		RT8070),
     RUN_DEV(SAMSUNG,		WIS09ABGN),
     RUN_DEV(SAMSUNG2,		RT2870_1),
@@ -318,7 +323,7 @@ static usb_callback_t	run_bulk_tx_callback4;
 static usb_callback_t	run_bulk_tx_callback5;
 
 static void	run_bulk_tx_callbackN(struct usb_xfer *xfer,
-		    usb_error_t error, unsigned int index);
+		    usb_error_t error, u_int index);
 static struct ieee80211vap *run_vap_create(struct ieee80211com *,
 		    const char [IFNAMSIZ], int, enum ieee80211_opmode, int,
 		    const uint8_t [IEEE80211_ADDR_LEN],
@@ -342,13 +347,13 @@ static int	run_write_region_1(struct run_softc *, uint16_t,
 static int	run_set_region_4(struct run_softc *, uint16_t, uint32_t, int);
 static int	run_efuse_read_2(struct run_softc *, uint16_t, uint16_t *);
 static int	run_eeprom_read_2(struct run_softc *, uint16_t, uint16_t *);
-static int	run_rt2870_rf_write(struct run_softc *, uint8_t, uint32_t);
+static int	run_rt2870_rf_write(struct run_softc *, uint32_t);
 static int	run_rt3070_rf_read(struct run_softc *, uint8_t, uint8_t *);
 static int	run_rt3070_rf_write(struct run_softc *, uint8_t, uint8_t);
 static int	run_bbp_read(struct run_softc *, uint8_t, uint8_t *);
 static int	run_bbp_write(struct run_softc *, uint8_t, uint8_t);
 static int	run_mcu_cmd(struct run_softc *, uint8_t, uint16_t);
-static const char *run_get_rf(int);
+static const char *run_get_rf(uint16_t);
 static int	run_read_eeprom(struct run_softc *);
 static struct ieee80211_node *run_node_alloc(struct ieee80211vap *,
 			    const uint8_t mac[IEEE80211_ADDR_LEN]);
@@ -360,7 +365,7 @@ static void	run_key_update_begin(struct ieee80211vap *);
 static void	run_key_update_end(struct ieee80211vap *);
 static void	run_key_set_cb(void *);
 static int	run_key_set(struct ieee80211vap *, struct ieee80211_key *,
-			    const uint8_t mac[IEEE80211_ADDR_LEN]);
+		    const uint8_t mac[IEEE80211_ADDR_LEN]);
 static void	run_key_delete_cb(void *);
 static int	run_key_delete(struct ieee80211vap *, struct ieee80211_key *);
 static void	run_ratectl_to(void *);
@@ -392,6 +397,8 @@ static void	run_set_rx_antenna(struct run_softc *, int);
 static void	run_rt2870_set_chan(struct run_softc *, u_int);
 static void	run_rt3070_set_chan(struct run_softc *, u_int);
 static void	run_rt3572_set_chan(struct run_softc *, u_int);
+static void	run_rt5390_set_chan(struct run_softc *, u_int);
+static void	run_rt5592_set_chan(struct run_softc *, u_int);
 static int	run_set_chan(struct run_softc *, struct ieee80211_channel *);
 static void	run_set_channel(struct ieee80211com *);
 static void	run_scan_start(struct ieee80211com *);
@@ -415,16 +422,19 @@ static void	run_update_mcast(struct ifnet *);
 static int8_t	run_rssi2dbm(struct run_softc *, uint8_t, uint8_t);
 static void	run_update_promisc_locked(struct ifnet *);
 static void	run_update_promisc(struct ifnet *);
+static void	run_rt5390_bbp_init(struct run_softc *);
 static int	run_bbp_init(struct run_softc *);
 static int	run_rt3070_rf_init(struct run_softc *);
+static void	run_rt5390_rf_init(struct run_softc *);
 static int	run_rt3070_filter_calib(struct run_softc *, uint8_t, uint8_t,
 		    uint8_t *);
 static void	run_rt3070_rf_setup(struct run_softc *);
 static int	run_txrx_enable(struct run_softc *);
+static void	run_adjust_freq_offset(struct run_softc *);
 static void	run_init(void *);
 static void	run_init_locked(struct run_softc *);
 static void	run_stop(void *);
-static void	run_delay(struct run_softc *, unsigned int);
+static void	run_delay(struct run_softc *, u_int);
 
 static const struct {
 	uint16_t	reg;
@@ -438,6 +448,25 @@ static const struct {
 	uint8_t	val;
 } rt2860_def_bbp[] = {
 	RT2860_DEF_BBP
+},rt5390_def_bbp[] = {
+	RT5390_DEF_BBP
+},rt5592_def_bbp[] = {
+	RT5592_DEF_BBP
+};
+
+/* 
+ * Default values for BBP register R196 for RT5592.
+ */
+static const uint8_t rt5592_bbp_r196[] = {
+	0xe0, 0x1f, 0x38, 0x32, 0x08, 0x28, 0x19, 0x0a, 0xff, 0x00,
+	0x16, 0x10, 0x10, 0x0b, 0x36, 0x2c, 0x26, 0x24, 0x42, 0x36,
+	0x30, 0x2d, 0x4c, 0x46, 0x3d, 0x40, 0x3e, 0x42, 0x3d, 0x40,
+	0x3c, 0x34, 0x2c, 0x2f, 0x3c, 0x35, 0x2e, 0x2a, 0x49, 0x41,
+	0x36, 0x31, 0x30, 0x30, 0x0e, 0x0d, 0x28, 0x21, 0x1c, 0x16,
+	0x50, 0x4a, 0x43, 0x40, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7d, 0x14, 0x32, 0x2c, 0x36, 0x4c, 0x43, 0x2c,
+	0x2e, 0x36, 0x30, 0x6e
 };
 
 static const struct rfprog {
@@ -453,6 +482,15 @@ struct {
 	RT3070_RF3052
 };
 
+static const struct rt5592_freqs {
+	uint16_t	n;
+	uint8_t		k, m, r;
+} rt5592_freqs_20mhz[] = {
+	RT5592_RF5592_20MHZ
+},rt5592_freqs_40mhz[] = {
+	RT5592_RF5592_40MHZ
+};
+
 static const struct {
 	uint8_t	reg;
 	uint8_t	val;
@@ -460,6 +498,25 @@ static const struct {
 	RT3070_DEF_RF
 },rt3572_def_rf[] = {
 	RT3572_DEF_RF
+},rt5390_def_rf[] = {
+	RT5390_DEF_RF
+},rt5392_def_rf[] = {
+	RT5392_DEF_RF
+},rt5592_def_rf[] = {
+	RT5592_DEF_RF
+},rt5592_2ghz_def_rf[] = {
+	RT5592_2GHZ_DEF_RF
+},rt5592_5ghz_def_rf[] = {
+	RT5592_5GHZ_DEF_RF
+};
+
+static const struct {
+	u_int	firstchan;
+	u_int	lastchan;
+	uint8_t	reg;
+	uint8_t	val;
+} rt5592_chan_5ghz[] = {
+	RT5592_CHAN_5GHZ
 };
 
 static const struct usb_config run_config[RUN_N_XFER] = {
@@ -556,7 +613,7 @@ run_attach(device_t self)
 	struct ieee80211com *ic;
 	struct ifnet *ifp;
 	uint32_t ver;
-	int i, ntries, error;
+	int ntries, error;
 	uint8_t iface_index, bands;
 
 	device_set_usb_desc(self);
@@ -653,27 +710,11 @@ run_attach(device_t self)
 	bands = 0;
 	setbit(&bands, IEEE80211_MODE_11B);
 	setbit(&bands, IEEE80211_MODE_11G);
+	if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850 ||
+	    sc->rf_rev == RT3070_RF_3052 || sc->rf_rev == RT5592_RF_5592)
+		setbit(&bands, IEEE80211_MODE_11A);
 	ieee80211_init_channels(ic, NULL, &bands);
 
-	/*
-	 * Do this by own because h/w supports
-	 * more channels than ieee80211_init_channels()
-	 */
-	if (sc->rf_rev == RT2860_RF_2750 ||
-	    sc->rf_rev == RT2860_RF_2850 ||
-	    sc->rf_rev == RT3070_RF_3052) {
-		/* set supported .11a rates */
-		for (i = 14; i < N(rt2860_rf2850); i++) {
-			uint8_t chan = rt2860_rf2850[i].chan;
-			ic->ic_channels[ic->ic_nchans].ic_freq =
-			    ieee80211_ieee2mhz(chan, IEEE80211_CHAN_A);
-			ic->ic_channels[ic->ic_nchans].ic_ieee = chan;
-			ic->ic_channels[ic->ic_nchans].ic_flags = IEEE80211_CHAN_A;
-			ic->ic_channels[ic->ic_nchans].ic_extieee = 0;
-			ic->ic_nchans++;
-		}
-	}
-
 	ieee80211_ifattach(ic, sc->sc_bssid);
 
 	ic->ic_scan_start = run_scan_start;
@@ -698,7 +739,7 @@ run_attach(device_t self)
 
 	TASK_INIT(&sc->cmdq_task, 0, run_cmdq_cb, sc);
 	TASK_INIT(&sc->ratectl_task, 0, run_ratectl_cb, sc);
-	callout_init((struct callout *)&sc->ratectl_ch, 1);
+	usb_callout_init_mtx(&sc->ratectl_ch, &sc->sc_mtx, 0);
 
 	if (bootverbose)
 		ieee80211_announce(ic);
@@ -802,7 +843,13 @@ run_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 	if (rvp == NULL)
 		return (NULL);
 	vap = &rvp->vap;
-	ieee80211_vap_setup(ic, vap, name, unit, opmode, flags, bssid, mac);
+
+	if (ieee80211_vap_setup(ic, vap, name, unit,
+	    opmode, flags, bssid, mac) != 0) {
+		/* out of memory */
+		free(rvp, M_80211_VAP);
+		return (NULL);
+	}
 
 	vap->iv_key_update_begin = run_key_update_begin;
 	vap->iv_key_update_end = run_key_update_end;
@@ -1008,13 +1055,12 @@ run_load_microcode(struct run_softc *sc)
 	/* cheap sanity check */
 	temp = fw->data;
 	bytes = *temp;
-	if (bytes != be64toh(0xffffff0210280210)) {
+	if (bytes != be64toh(0xffffff0210280210ULL)) {
 		device_printf(sc->sc_dev, "firmware checksum failed\n");
 		error = EINVAL;
 		goto fail;
 	}
 
-	run_read(sc, RT2860_ASIC_VER_ID, &tmp);
 	/* write microcode image */
 	run_write_region_1(sc, RT2870_FW_BASE, base, 4096);
 	run_write(sc, RT2860_H2M_MAILBOX_CID, 0xffffffff);
@@ -1061,7 +1107,7 @@ fail:
 	return (error);
 }
 
-int
+static int
 run_reset(struct run_softc *sc)
 {
 	usb_device_request_t req;
@@ -1163,13 +1209,32 @@ run_write_region_1(struct run_softc *sc, uint16_t reg, const uint8_t *buf,
 	return (error);
 #else
 	usb_device_request_t req;
+	int error = 0;
 
-	req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
-	req.bRequest = RT2870_WRITE_REGION_1;
-	USETW(req.wValue, 0);
-	USETW(req.wIndex, reg);
-	USETW(req.wLength, len);
-	return (run_do_request(sc, &req, buf));
+	/*
+	 * NOTE: It appears the WRITE_REGION_1 command cannot be
+	 * passed a huge amount of data, which will crash the
+	 * firmware. Limit amount of data passed to 64-bytes at a
+	 * time.
+	 */
+	while (len > 0) {
+		int delta = 64;
+		if (delta > len)
+			delta = len;
+
+		req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
+		req.bRequest = RT2870_WRITE_REGION_1;
+		USETW(req.wValue, 0);
+		USETW(req.wIndex, reg);
+		USETW(req.wLength, delta);
+		error = run_do_request(sc, &req, __DECONST(uint8_t *, buf));
+		if (error != 0)
+			break;
+		reg += delta;
+		buf += delta;
+		len -= delta;
+	}
+	return (error);
 #endif
 }
 
@@ -1259,7 +1324,7 @@ run_srom_read(struct run_softc *sc, uint16_t addr, uint16_t *val)
 }
 
 static int
-run_rt2870_rf_write(struct run_softc *sc, uint8_t reg, uint32_t val)
+run_rt2870_rf_write(struct run_softc *sc, uint32_t val)
 {
 	uint32_t tmp;
 	int error, ntries;
@@ -1273,10 +1338,7 @@ run_rt2870_rf_write(struct run_softc *sc, uint8_t reg, uint32_t val)
 	if (ntries == 10)
 		return (ETIMEDOUT);
 
-	/* RF registers are 24-bit on the RT2860 */
-	tmp = RT2860_RF_REG_CTRL | 24 << RT2860_RF_REG_WIDTH_SHIFT |
-	    (val & 0x3fffff) << 2 | (reg & 3);
-	return (run_write(sc, RT2860_RF_CSR_CFG0, tmp));
+	return (run_write(sc, RT2860_RF_CSR_CFG0, val));
 }
 
 static int
@@ -1427,7 +1489,7 @@ b4inc(uint32_t b32, int8_t delta)
 }
 
 static const char *
-run_get_rf(int rev)
+run_get_rf(uint16_t rev)
 {
 	switch (rev) {
 	case RT2860_RF_2820:	return "RT2820";
@@ -1439,11 +1501,14 @@ run_get_rf(int rev)
 	case RT3070_RF_3021:	return "RT3021";
 	case RT3070_RF_3022:	return "RT3022";
 	case RT3070_RF_3052:	return "RT3052";
+	case RT5592_RF_5592:	return "RT5592";
+	case RT5390_RF_5370:	return "RT5370";
+	case RT5390_RF_5372:	return "RT5372";
 	}
 	return ("unknown");
 }
 
-int
+static int
 run_read_eeprom(struct run_softc *sc)
 {
 	int8_t delta_2ghz, delta_5ghz;
@@ -1475,21 +1540,25 @@ run_read_eeprom(struct run_softc *sc)
 	sc->sc_bssid[4] = val & 0xff;
 	sc->sc_bssid[5] = val >> 8;
 
-	/* read vender BBP settings */
-	for (i = 0; i < 10; i++) {
-		run_srom_read(sc, RT2860_EEPROM_BBP_BASE + i, &val);
-		sc->bbp[i].val = val & 0xff;
-		sc->bbp[i].reg = val >> 8;
-		DPRINTF("BBP%d=0x%02x\n", sc->bbp[i].reg, sc->bbp[i].val);
-	}
-	if (sc->mac_ver >= 0x3071) {
-		/* read vendor RF settings */
+	if (sc->mac_ver < 0x5390) {
+		/* read vender BBP settings */
 		for (i = 0; i < 10; i++) {
-			run_srom_read(sc, RT3071_EEPROM_RF_BASE + i, &val);
-			sc->rf[i].val = val & 0xff;
-			sc->rf[i].reg = val >> 8;
-			DPRINTF("RF%d=0x%02x\n", sc->rf[i].reg,
-			    sc->rf[i].val);
+			run_srom_read(sc, RT2860_EEPROM_BBP_BASE + i, &val);
+			sc->bbp[i].val = val & 0xff;
+			sc->bbp[i].reg = val >> 8;
+			DPRINTF("BBP%d=0x%02x\n", sc->bbp[i].reg,
+			    sc->bbp[i].val);
+		}
+		if (sc->mac_ver >= 0x3071) {
+			/* read vendor RF settings */
+			for (i = 0; i < 10; i++) {
+				run_srom_read(sc, RT3071_EEPROM_RF_BASE + i,
+				   &val);
+				sc->rf[i].val = val & 0xff;
+				sc->rf[i].reg = val >> 8;
+				DPRINTF("RF%d=0x%02x\n", sc->rf[i].reg,
+				    sc->rf[i].val);
+			}
 		}
 	}
 
@@ -1515,7 +1584,11 @@ run_read_eeprom(struct run_softc *sc)
 	    sc->leds, sc->led[0], sc->led[1], sc->led[2]);
 
 	/* read RF information */
-	run_srom_read(sc, RT2860_EEPROM_ANTENNA, &val);
+	if (sc->mac_ver == 0x5390 || sc->mac_ver ==0x5392)
+		run_srom_read(sc, 0x00, &val);
+	else
+		run_srom_read(sc, RT2860_EEPROM_ANTENNA, &val);
+
 	if (val == 0xffff) {
 		DPRINTF("invalid EEPROM antenna info, using default\n");
 		if (sc->mac_ver == 0x3572) {
@@ -1535,11 +1608,15 @@ run_read_eeprom(struct run_softc *sc)
 			sc->nrxchains = 2;
 		}
 	} else {
-		sc->rf_rev = (val >> 8) & 0xf;
+		if (sc->mac_ver == 0x5390 || sc->mac_ver ==0x5392) {
+			sc->rf_rev = val;
+			run_srom_read(sc, RT2860_EEPROM_ANTENNA, &val);
+		} else
+			sc->rf_rev = (val >> 8) & 0xf;
 		sc->ntxchains = (val >> 4) & 0xf;
 		sc->nrxchains = val & 0xf;
 	}
-	DPRINTF("EEPROM RF rev=0x%02x chains=%dT%dR\n",
+	DPRINTF("EEPROM RF rev=0x%04x chains=%dT%dR\n",
 	    sc->rf_rev, sc->ntxchains, sc->nrxchains);
 
 	/* check if RF supports automatic Tx access gain control */
@@ -1563,16 +1640,29 @@ run_read_eeprom(struct run_softc *sc)
 		sc->txpow1[i + 0] = (int8_t)(val & 0xff);
 		sc->txpow1[i + 1] = (int8_t)(val >> 8);
 
-		run_srom_read(sc, RT2860_EEPROM_PWR2GHZ_BASE2 + i / 2, &val);
-		sc->txpow2[i + 0] = (int8_t)(val & 0xff);
-		sc->txpow2[i + 1] = (int8_t)(val >> 8);
+		if (sc->mac_ver != 0x5390) {
+			run_srom_read(sc,
+			    RT2860_EEPROM_PWR2GHZ_BASE2 + i / 2, &val);
+			sc->txpow2[i + 0] = (int8_t)(val & 0xff);
+			sc->txpow2[i + 1] = (int8_t)(val >> 8);
+		}
 	}
 	/* fix broken Tx power entries */
 	for (i = 0; i < 14; i++) {
-		if (sc->txpow1[i] < 0 || sc->txpow1[i] > 31)
-			sc->txpow1[i] = 5;
-		if (sc->txpow2[i] < 0 || sc->txpow2[i] > 31)
-			sc->txpow2[i] = 5;
+		if (sc->mac_ver >= 0x5390) {
+			if (sc->txpow1[i] < 0 || sc->txpow1[i] > 27)
+				sc->txpow1[i] = 5;
+		} else {
+			if (sc->txpow1[i] < 0 || sc->txpow1[i] > 31)
+				sc->txpow1[i] = 5;
+		}
+		if (sc->mac_ver > 0x5390) {
+			if (sc->txpow2[i] < 0 || sc->txpow2[i] > 27)
+				sc->txpow2[i] = 5;
+		} else if (sc->mac_ver < 0x5390) {
+			if (sc->txpow2[i] < 0 || sc->txpow2[i] > 31)
+				sc->txpow2[i] = 5;
+		}
 		DPRINTF("chan %d: power1=%d, power2=%d\n",
 		    rt2860_rf2850[i].chan, sc->txpow1[i], sc->txpow2[i]);
 	}
@@ -1587,11 +1677,13 @@ run_read_eeprom(struct run_softc *sc)
 		sc->txpow2[i + 15] = (int8_t)(val >> 8);
 	}
 	/* fix broken Tx power entries */
-	for (i = 0; i < 40; i++) {
-		if (sc->txpow1[14 + i] < -7 || sc->txpow1[14 + i] > 15)
-			sc->txpow1[14 + i] = 5;
-		if (sc->txpow2[14 + i] < -7 || sc->txpow2[14 + i] > 15)
-			sc->txpow2[14 + i] = 5;
+	for (i = 0; i < 40; i++ ) {
+		if (sc->mac_ver != 0x5592) {
+			if (sc->txpow1[14 + i] < -7 || sc->txpow1[14 + i] > 15)
+				sc->txpow1[14 + i] = 5;
+			if (sc->txpow2[14 + i] < -7 || sc->txpow2[14 + i] > 15)
+				sc->txpow2[14 + i] = 5;
+		}
 		DPRINTF("chan %d: power1=%d, power2=%d\n",
 		    rt2860_rf2850[14 + i].chan, sc->txpow1[14 + i],
 		    sc->txpow2[14 + i]);
@@ -2235,8 +2327,10 @@ run_ratectl_cb(void *arg, int pending)
 		ieee80211_iterate_nodes(&ic->ic_sta, run_iter_func, sc);
 	}
 
+	RUN_LOCK(sc);
 	if(sc->ratectl_run != RUN_RATECTL_OFF)
 		usb_callout_reset(&sc->ratectl_ch, hz, run_ratectl_to, sc);
+	RUN_UNLOCK(sc);
 }
 
 static void
@@ -2471,12 +2565,15 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
 	struct rt2870_rxd *rxd;
 	struct rt2860_rxwi *rxwi;
 	uint32_t flags;
-	uint16_t len, phy;
+	uint16_t len, rxwisize;
 	uint8_t ant, rssi;
 	int8_t nf;
 
 	rxwi = mtod(m, struct rt2860_rxwi *);
 	len = le16toh(rxwi->len) & 0xfff;
+	rxwisize = (sc->mac_ver == 0x5592) ?
+	    sizeof(struct rt2860_rxwi) + sizeof(uint64_t) :
+	    sizeof(struct rt2860_rxwi);
 	if (__predict_false(len > dmalen)) {
 		m_freem(m);
 		ifp->if_ierrors++;
@@ -2494,8 +2591,8 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
 		return;
 	}
 
-	m->m_data += sizeof(struct rt2860_rxwi);
-	m->m_pkthdr.len = m->m_len -= sizeof(struct rt2860_rxwi);
+	m->m_data += rxwisize;
+	m->m_pkthdr.len = m->m_len -= rxwisize;
 
 	wh = mtod(m, struct ieee80211_frame *);
 
@@ -2515,7 +2612,8 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
 	if (__predict_false(flags & RT2860_RX_MICERR)) {
 		/* report MIC failures to net80211 for TKIP */
 		if (ni != NULL)
-			ieee80211_notify_michael_failure(ni->ni_vap, wh, rxwi->keyidx);
+			ieee80211_notify_michael_failure(ni->ni_vap, wh,
+			    rxwi->keyidx);
 		m_freem(m);
 		ifp->if_ierrors++;
 		DPRINTF("MIC error. Someone is lying.\n");
@@ -2538,6 +2636,7 @@ run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen)
 
 	if (__predict_false(ieee80211_radiotap_active(ic))) {
 		struct run_rx_radiotap_header *tap = &sc->sc_rxtap;
+		uint16_t phy;
 
 		tap->wr_flags = 0;
 		tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
@@ -2582,8 +2681,13 @@ run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 	struct mbuf *m = NULL;
 	struct mbuf *m0;
 	uint32_t dmalen;
+	uint16_t rxwisize;
 	int xferlen;
 
+	rxwisize = (sc->mac_ver == 0x5592) ?
+	    sizeof(struct rt2860_rxwi) + sizeof(uint64_t) :
+	    sizeof(struct rt2860_rxwi);
+
 	usbd_xfer_status(xfer, &xferlen, NULL, NULL, NULL);
 
 	switch (USB_GET_STATE(xfer)) {
@@ -2591,8 +2695,8 @@ run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error)
 
 		DPRINTFN(15, "rx done, actlen=%d\n", xferlen);
 
-		if (xferlen < (int)(sizeof(uint32_t) +
-		    sizeof(struct rt2860_rxwi) + sizeof(struct rt2870_rxd))) {
+		if (xferlen < (int)(sizeof(uint32_t) + rxwisize +
+		    sizeof(struct rt2870_rxd))) {
 			DPRINTF("xfer too short %d\n", xferlen);
 			goto tr_setup;
 		}
@@ -2674,6 +2778,7 @@ tr_setup:
 			m->m_data += 4;
 			m->m_pkthdr.len = m->m_len -= 4;
 			run_rx_frame(sc, m, dmalen);
+			m = NULL;	/* don't free source buffer */
 			break;
 		}
 
@@ -2695,6 +2800,9 @@ tr_setup:
 		m->m_pkthdr.len = m->m_len -= dmalen + 8;
 	}
 
+	/* make sure we free the source buffer, if any */
+	m_freem(m);
+
 	RUN_LOCK(sc);
 }
 
@@ -2722,7 +2830,7 @@ run_tx_free(struct run_endpoint_queue *pq,
 }
 
 static void
-run_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, unsigned int index)
+run_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, u_int index)
 {
 	struct run_softc *sc = usbd_xfer_softc(xfer);
 	struct ifnet *ifp = sc->sc_ifp;
@@ -2762,8 +2870,10 @@ tr_setup:
 		STAILQ_REMOVE_HEAD(&pq->tx_qh, next);
 
 		m = data->m;
+		size = (sc->mac_ver == 0x5592) ? 
+		    RUN_MAX_TXSZ + sizeof(uint32_t) : RUN_MAX_TXSZ;
 		if ((m->m_pkthdr.len +
-		    sizeof(data->desc) + 3 + 8) > RUN_MAX_TXSZ) {
+		    sizeof(data->desc) + 3 + 8) > size) {
 			DPRINTF("data overflow, %u bytes\n",
 			    m->m_pkthdr.len);
 
@@ -2775,7 +2885,8 @@ tr_setup:
 		}
 
 		pc = usbd_xfer_get_frame(xfer, 0);
-		size = sizeof(data->desc);
+		size = (sc->mac_ver == 0x5592) ?
+		    sizeof(data->desc) + sizeof(uint32_t) : sizeof(data->desc);
 		usbd_copy_in(pc, 0, &data->desc, size);
 		usbd_m_copy_in(pc, size, m, 0, m->m_pkthdr.len);
 		size += m->m_pkthdr.len;
@@ -2790,9 +2901,8 @@ tr_setup:
 		vap = data->ni->ni_vap;
 		if (ieee80211_radiotap_active_vap(vap)) {
 			struct run_tx_radiotap_header *tap = &sc->sc_txtap;
-			struct rt2860_txwi *txwi =
+			struct rt2860_txwi *txwi = 
 			    (struct rt2860_txwi *)(&data->desc + sizeof(struct rt2870_txd));
-
 			tap->wt_flags = 0;
 			tap->wt_rate = rt2860_rates[data->ridx].rate;
 			tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq);
@@ -2902,7 +3012,7 @@ run_set_tx_desc(struct run_softc *sc, struct run_tx_data *data)
 	struct ieee80211_frame *wh;
 	struct rt2870_txd *txd;
 	struct rt2860_txwi *txwi;
-	uint16_t xferlen;
+	uint16_t xferlen, txwisize;
 	uint16_t mcs;
 	uint8_t ridx = data->ridx;
 	uint8_t pad;
@@ -2910,7 +3020,9 @@ run_set_tx_desc(struct run_softc *sc, struct run_tx_data *data)
 	/* get MCS code from rate index */
 	mcs = rt2860_rates[ridx].mcs;
 
-	xferlen = sizeof(*txwi) + m->m_pkthdr.len;
+	txwisize = (sc->mac_ver == 0x5592) ?
+	    sizeof(*txwi) + sizeof(uint32_t) : sizeof(*txwi);
+	xferlen = txwisize + m->m_pkthdr.len;
 
 	/* roundup to 32-bit alignment */
 	xferlen = (xferlen + 3) & ~3;
@@ -3036,7 +3148,7 @@ run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 			dur = rt2860_rates[ctl_ridx].sp_ack_dur;
 		else
 			dur = rt2860_rates[ctl_ridx].lp_ack_dur;
-		*(uint16_t *)wh->i_dur = htole16(dur);
+		USETW(wh->i_dur, dur);
 	}
 
 	/* reserve slots for mgmt packets, just in case */
@@ -3053,12 +3165,12 @@ run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 	txd->flags = qflags;
 	txwi = (struct rt2860_txwi *)(txd + 1);
 	txwi->xflags = xflags;
-	if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+	if (IEEE80211_IS_MULTICAST(wh->i_addr1))
 		txwi->wcid = 0;
-	} else {
+	else
 		txwi->wcid = (vap->iv_opmode == IEEE80211_M_STA) ?
 		    1 : RUN_AID2WCID(ni->ni_associd);
-	}
+
 	/* clear leftover garbage bits */
 	txwi->flags = 0;
 	txwi->txop = 0;
@@ -3116,9 +3228,9 @@ run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 
 	usbd_transfer_start(sc->sc_xfer[qid]);
 
-	DPRINTFN(8, "sending data frame len=%d rate=%d qid=%d\n", m->m_pkthdr.len +
-	    (int)(sizeof (struct rt2870_txd) + sizeof (struct rt2860_rxwi)),
-	    rt2860_rates[ridx].rate, qid);
+	DPRINTFN(8, "sending data frame len=%d rate=%d qid=%d\n",
+	    m->m_pkthdr.len + (int)(sizeof(struct rt2870_txd) +
+	    sizeof(struct rt2860_txwi)), rt2860_rates[ridx].rate, qid);
 
 	return (0);
 }
@@ -3155,7 +3267,7 @@ run_tx_mgt(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 
 		dur = ieee80211_ack_duration(ic->ic_rt, rt2860_rates[ridx].rate, 
 		    ic->ic_flags & IEEE80211_F_SHPREAMBLE);
-		*(uint16_t *)wh->i_dur = htole16(dur);
+		USETW(wh->i_dur, dur);
 	}
 
 	if (sc->sc_epq[0].tx_nfree == 0) {
@@ -3182,7 +3294,7 @@ run_tx_mgt(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
 	run_set_tx_desc(sc, data);
 
 	DPRINTFN(10, "sending mgt frame len=%d rate=%d\n", m->m_pkthdr.len +
-	    (int)(sizeof (struct rt2870_txd) + sizeof (struct rt2860_rxwi)),
+	    (int)(sizeof(struct rt2870_txd) + sizeof(struct rt2860_txwi)),
 	    rt2860_rates[ridx].rate);
 
 	STAILQ_INSERT_TAIL(&sc->sc_epq[0].tx_qh, data, next);
@@ -3512,18 +3624,63 @@ run_select_chan_group(struct run_softc *sc, int group)
 	run_bbp_write(sc, 62, 0x37 - sc->lna[group]);
 	run_bbp_write(sc, 63, 0x37 - sc->lna[group]);
 	run_bbp_write(sc, 64, 0x37 - sc->lna[group]);
-	run_bbp_write(sc, 86, 0x00);
+	if (sc->mac_ver < 0x3572)
+		run_bbp_write(sc, 86, 0x00);
 
 	if (group == 0) {
 		if (sc->ext_2ghz_lna) {
-			run_bbp_write(sc, 82, 0x62);
-			run_bbp_write(sc, 75, 0x46);
+			if (sc->mac_ver >= 0x5390)
+				run_bbp_write(sc, 75, 0x52);
+			else {
+				run_bbp_write(sc, 82, 0x62);
+				run_bbp_write(sc, 75, 0x46);
+			}
 		} else {
-			run_bbp_write(sc, 82, 0x84);
-			run_bbp_write(sc, 75, 0x50);
+			if (sc->mac_ver == 0x5592) {
+				run_bbp_write(sc, 79, 0x1c);
+				run_bbp_write(sc, 80, 0x0e);
+				run_bbp_write(sc, 81, 0x3a);
+				run_bbp_write(sc, 82, 0x62);
+
+				run_bbp_write(sc, 195, 0x80);
+				run_bbp_write(sc, 196, 0xe0);
+				run_bbp_write(sc, 195, 0x81);
+				run_bbp_write(sc, 196, 0x1f);
+				run_bbp_write(sc, 195, 0x82);
+				run_bbp_write(sc, 196, 0x38);
+				run_bbp_write(sc, 195, 0x83);
+				run_bbp_write(sc, 196, 0x32);
+				run_bbp_write(sc, 195, 0x85);
+				run_bbp_write(sc, 196, 0x28);
+				run_bbp_write(sc, 195, 0x86);
+				run_bbp_write(sc, 196, 0x19);
+			} else if (sc->mac_ver >= 0x5390)
+				run_bbp_write(sc, 75, 0x50);
+			else {
+				run_bbp_write(sc, 82, 0x84);
+				run_bbp_write(sc, 75, 0x50);
+			}
 		}
 	} else {
-		if (sc->mac_ver == 0x3572)
+		if (sc->mac_ver == 0x5592) {
+			run_bbp_write(sc, 79, 0x18);
+			run_bbp_write(sc, 80, 0x08);
+			run_bbp_write(sc, 81, 0x38);
+			run_bbp_write(sc, 82, 0x92);
+
+			run_bbp_write(sc, 195, 0x80);
+			run_bbp_write(sc, 196, 0xf0);
+			run_bbp_write(sc, 195, 0x81);
+			run_bbp_write(sc, 196, 0x1e);
+			run_bbp_write(sc, 195, 0x82);
+			run_bbp_write(sc, 196, 0x28);
+			run_bbp_write(sc, 195, 0x83);
+			run_bbp_write(sc, 196, 0x20);
+			run_bbp_write(sc, 195, 0x85);
+			run_bbp_write(sc, 196, 0x7f);
+			run_bbp_write(sc, 195, 0x86);
+			run_bbp_write(sc, 196, 0x7f);
+		} else if (sc->mac_ver == 0x3572)
 			run_bbp_write(sc, 82, 0x94);
 		else
 			run_bbp_write(sc, 82, 0xf2);
@@ -3558,6 +3715,11 @@ run_select_chan_group(struct run_softc *sc, int group)
 	} else
 		run_write(sc, RT2860_TX_PIN_CFG, tmp);
 
+	if (sc->mac_ver == 0x5592) {
+		run_bbp_write(sc, 195, 0x8d);
+		run_bbp_write(sc, 196, 0x1a);
+	}
+
 	/* set initial AGC value */
 	if (group == 0) {	/* 2GHz band */
 		if (sc->mac_ver >= 0x3070)
@@ -3565,7 +3727,9 @@ run_select_chan_group(struct run_softc *sc, int group)
 		else
 			agc = 0x2e + sc->lna[0];
 	} else {		/* 5GHz band */
-		if (sc->mac_ver == 0x3572)
+		if (sc->mac_ver == 0x5592)
+			agc = 0x24 + sc->lna[group] * 2;
+		else if (sc->mac_ver == 0x3572)
 			agc = 0x22 + (sc->lna[group] * 5) / 3;
 		else
 			agc = 0x32 + (sc->lna[group] * 5) / 3;
@@ -3574,7 +3738,7 @@ run_select_chan_group(struct run_softc *sc, int group)
 }
 
 static void
-run_rt2870_set_chan(struct run_softc *sc, uint32_t chan)
+run_rt2870_set_chan(struct run_softc *sc, u_int chan)
 {
 	const struct rfprog *rfprog = rt2860_rf2850;
 	uint32_t r2, r3, r4;
@@ -3586,58 +3750,71 @@ run_rt2870_set_chan(struct run_softc *sc, uint32_t chan)
 
 	r2 = rfprog[i].r2;
 	if (sc->ntxchains == 1)
-		r2 |= 1 << 12;		/* 1T: disable Tx chain 2 */
+		r2 |= 1 << 14;		/* 1T: disable Tx chain 2 */
 	if (sc->nrxchains == 1)
-		r2 |= 1 << 15 | 1 << 4;	/* 1R: disable Rx chains 2 & 3 */
+		r2 |= 1 << 17 | 1 << 6;	/* 1R: disable Rx chains 2 & 3 */
 	else if (sc->nrxchains == 2)
-		r2 |= 1 << 4;		/* 2R: disable Rx chain 3 */
+		r2 |= 1 << 6;		/* 2R: disable Rx chain 3 */
 
 	/* use Tx power values from EEPROM */
 	txpow1 = sc->txpow1[i];
 	txpow2 = sc->txpow2[i];
+
+	/* Initialize RF R3 and R4. */
+	r3 = rfprog[i].r3 & 0xffffc1ff;
+	r4 = (rfprog[i].r4 & ~(0x001f87c0)) | (sc->freq << 15);
 	if (chan > 14) {
-		if (txpow1 >= 0)
-			txpow1 = txpow1 << 1 | 1;
-		else
-			txpow1 = (7 + txpow1) << 1;
-		if (txpow2 >= 0)
-			txpow2 = txpow2 << 1 | 1;
-		else
-			txpow2 = (7 + txpow2) << 1;
+		if (txpow1 >= 0) {
+			txpow1 = (txpow1 > 0xf) ? (0xf) : (txpow1);
+			r3 |= (txpow1 << 10) | (1 << 9);
+		} else {
+			txpow1 += 7;
+
+			/* txpow1 is not possible larger than 15. */
+			r3 |= (txpow1 << 10);
+		}
+		if (txpow2 >= 0) {
+			txpow2 = (txpow2 > 0xf) ? (0xf) : (txpow2);
+			r4 |= (txpow2 << 7) | (1 << 6);
+		} else {
+			txpow2 += 7;
+			r4 |= (txpow2 << 7);
+		}
+	} else {
+		/* Set Tx0 power. */
+		r3 |= (txpow1 << 9);
+
+		/* Set frequency offset and Tx1 power. */
+		r4 |= (txpow2 << 6);
 	}
-	r3 = rfprog[i].r3 | txpow1 << 7;
-	r4 = rfprog[i].r4 | sc->freq << 13 | txpow2 << 4;
 
-	run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1);
-	run_rt2870_rf_write(sc, RT2860_RF2, r2);
-	run_rt2870_rf_write(sc, RT2860_RF3, r3);
-	run_rt2870_rf_write(sc, RT2860_RF4, r4);
+	run_rt2870_rf_write(sc, rfprog[i].r1);
+	run_rt2870_rf_write(sc, r2);
+	run_rt2870_rf_write(sc, r3 & ~(1 << 2));
+	run_rt2870_rf_write(sc, r4);
 
 	run_delay(sc, 10);
 
-	run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1);
-	run_rt2870_rf_write(sc, RT2860_RF2, r2);
-	run_rt2870_rf_write(sc, RT2860_RF3, r3 | 1);
-	run_rt2870_rf_write(sc, RT2860_RF4, r4);
+	run_rt2870_rf_write(sc, rfprog[i].r1);
+	run_rt2870_rf_write(sc, r2);
+	run_rt2870_rf_write(sc, r3 | (1 << 2));
+	run_rt2870_rf_write(sc, r4);
 
 	run_delay(sc, 10);
 
-	run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1);
-	run_rt2870_rf_write(sc, RT2860_RF2, r2);
-	run_rt2870_rf_write(sc, RT2860_RF3, r3);
-	run_rt2870_rf_write(sc, RT2860_RF4, r4);
+	run_rt2870_rf_write(sc, rfprog[i].r1);
+	run_rt2870_rf_write(sc, r2);
+	run_rt2870_rf_write(sc, r3 & ~(1 << 2));
+	run_rt2870_rf_write(sc, r4);
 }
 
 static void
-run_rt3070_set_chan(struct run_softc *sc, uint32_t chan)
+run_rt3070_set_chan(struct run_softc *sc, u_int chan)
 {
 	int8_t txpow1, txpow2;
 	uint8_t rf;
 	int i;
 
-	/* RT3070 is 2GHz only */
-	KASSERT(chan >= 1 && chan <= 14, ("wrong channel selected\n"));
-
 	/* find the settings for this channel (we know it exists) */
 	for (i = 0; rt2860_rf2850[i].chan != chan; i++);
 
@@ -3646,7 +3823,12 @@ run_rt3070_set_chan(struct run_softc *sc, uint32_t chan)
 	txpow2 = sc->txpow2[i];
 
 	run_rt3070_rf_write(sc, 2, rt3070_freqs[i].n);
-	run_rt3070_rf_write(sc, 3, rt3070_freqs[i].k);
+
+	/* RT3370/RT3390: RF R3 [7:4] is not reserved bits. */
+	run_rt3070_rf_read(sc, 3, &rf);
+	rf = (rf & ~0x0f) | rt3070_freqs[i].k;
+	run_rt3070_rf_write(sc, 3, rf);
+
 	run_rt3070_rf_read(sc, 6, &rf);
 	rf = (rf & ~0x03) | rt3070_freqs[i].r;
 	run_rt3070_rf_write(sc, 6, rf);
@@ -3841,19 +4023,277 @@ run_rt3572_set_chan(struct run_softc *sc, u_int chan)
 	run_delay(sc, 2);
 }
 
+static void
+run_rt5390_set_chan(struct run_softc *sc, u_int chan)
+{
+	int8_t txpow1, txpow2;
+	uint8_t rf;
+	int i;
+
+	/* find the settings for this channel (we know it exists) */
+	for (i = 0; rt2860_rf2850[i].chan != chan; i++);
+
+	/* use Tx power values from EEPROM */
+	txpow1 = sc->txpow1[i];
+	txpow2 = sc->txpow2[i];
+
+	run_rt3070_rf_write(sc, 8, rt3070_freqs[i].n);
+	run_rt3070_rf_write(sc, 9, rt3070_freqs[i].k & 0x0f);
+	run_rt3070_rf_read(sc, 11, &rf);
+	rf = (rf & ~0x03) | (rt3070_freqs[i].r & 0x03);
+	run_rt3070_rf_write(sc, 11, rf);
+
+	run_rt3070_rf_read(sc, 49, &rf);
+	rf = (rf & ~0x3f) | (txpow1 & 0x3f);
+	/* The valid range of the RF R49 is 0x00 to 0x27. */
+	if ((rf & 0x3f) > 0x27)
+		rf = (rf & ~0x3f) | 0x27;
+	run_rt3070_rf_write(sc, 49, rf);
+
+	if (sc->mac_ver == 0x5392) {
+		run_rt3070_rf_read(sc, 50, &rf);
+		rf = (rf & ~0x3f) | (txpow2 & 0x3f);
+		/* The valid range of the RF R50 is 0x00 to 0x27. */
+		if ((rf & 0x3f) > 0x27)
+			rf = (rf & ~0x3f) | 0x27;
+		run_rt3070_rf_write(sc, 50, rf);
+	}
+
+	run_rt3070_rf_read(sc, 1, &rf);
+	rf |= RT3070_RF_BLOCK | RT3070_PLL_PD | RT3070_RX0_PD | RT3070_TX0_PD;
+	if (sc->mac_ver == 0x5392)
+		rf |= RT3070_RX1_PD | RT3070_TX1_PD;
+	run_rt3070_rf_write(sc, 1, rf);
+
+	if (sc->mac_ver != 0x5392) {
+		run_rt3070_rf_read(sc, 2, &rf);
+		rf |= 0x80;
+		run_rt3070_rf_write(sc, 2, rf);
+		run_delay(sc, 10);
+		rf &= 0x7f;
+		run_rt3070_rf_write(sc, 2, rf);
+	}
+
+	run_adjust_freq_offset(sc);
+
+	if (sc->mac_ver == 0x5392) {
+		/* Fix for RT5392C. */
+		if (sc->mac_rev >= 0x0223) {
+			if (chan <= 4)
+				rf = 0x0f;
+			else if (chan >= 5 && chan <= 7)
+				rf = 0x0e;
+			else
+				rf = 0x0d;
+			run_rt3070_rf_write(sc, 23, rf);
+
+			if (chan <= 4)
+				rf = 0x0c;
+			else if (chan == 5)
+				rf = 0x0b;
+			else if (chan >= 6 && chan <= 7)
+				rf = 0x0a;
+			else if (chan >= 8 && chan <= 10)
+				rf = 0x09;
+			else
+				rf = 0x08;
+			run_rt3070_rf_write(sc, 59, rf);
+		} else {
+			if (chan <= 11)
+				rf = 0x0f;
+			else
+				rf = 0x0b;
+			run_rt3070_rf_write(sc, 59, rf);
+		}
+	} else {
+		/* Fix for RT5390F. */
+		if (sc->mac_rev >= 0x0502) {
+			if (chan <= 11)
+				rf = 0x43;
+			else
+				rf = 0x23;
+			run_rt3070_rf_write(sc, 55, rf);
+
+			if (chan <= 11)
+				rf = 0x0f;
+			else if (chan == 12)
+				rf = 0x0d;
+			else
+				rf = 0x0b;
+			run_rt3070_rf_write(sc, 59, rf);
+		} else {
+			run_rt3070_rf_write(sc, 55, 0x44);
+			run_rt3070_rf_write(sc, 59, 0x8f);
+		}
+	}
+
+	/* Enable VCO calibration. */
+	run_rt3070_rf_read(sc, 3, &rf);
+	rf |= RT5390_VCOCAL;
+	run_rt3070_rf_write(sc, 3, rf);
+}
+
+static void
+run_rt5592_set_chan(struct run_softc *sc, u_int chan)
+{
+	const struct rt5592_freqs *freqs;
+	uint32_t tmp;
+	uint8_t reg, rf, txpow_bound;
+	int8_t txpow1, txpow2;
+	int i;
+
+	run_read(sc, RT5592_DEBUG_INDEX, &tmp);
+	freqs = (tmp & RT5592_SEL_XTAL) ?
+	    rt5592_freqs_40mhz : rt5592_freqs_20mhz;
+
+	/* find the settings for this channel (we know it exists) */
+	for (i = 0; rt2860_rf2850[i].chan != chan; i++, freqs++);
+
+	/* use Tx power values from EEPROM */
+	txpow1 = sc->txpow1[i];
+	txpow2 = sc->txpow2[i];
+
+	run_read(sc, RT3070_LDO_CFG0, &tmp);
+	tmp &= ~0x1c000000;
+	if (chan > 14)
+		tmp |= 0x14000000;
+	run_write(sc, RT3070_LDO_CFG0, tmp);
+
+	/* N setting. */
+	run_rt3070_rf_write(sc, 8, freqs->n & 0xff);
+	run_rt3070_rf_read(sc, 9, &rf);
+	rf &= ~(1 << 4);
+	rf |= ((freqs->n & 0x0100) >> 8) << 4;
+	run_rt3070_rf_write(sc, 9, rf);
+
+	/* K setting. */
+	run_rt3070_rf_read(sc, 9, &rf);
+	rf &= ~0x0f;
+	rf |= (freqs->k & 0x0f);
+	run_rt3070_rf_write(sc, 9, rf);
+
+	/* Mode setting. */
+	run_rt3070_rf_read(sc, 11, &rf);
+	rf &= ~0x0c;
+	rf |= ((freqs->m - 0x8) & 0x3) << 2;
+	run_rt3070_rf_write(sc, 11, rf);
+	run_rt3070_rf_read(sc, 9, &rf);
+	rf &= ~(1 << 7);
+	rf |= (((freqs->m - 0x8) & 0x4) >> 2) << 7;
+	run_rt3070_rf_write(sc, 9, rf);
+
+	/* R setting. */
+	run_rt3070_rf_read(sc, 11, &rf);
+	rf &= ~0x03;
+	rf |= (freqs->r - 0x1);
+	run_rt3070_rf_write(sc, 11, rf);
+
+	if (chan <= 14) {
+		/* Initialize RF registers for 2GHZ. */
+		for (i = 0; i < nitems(rt5592_2ghz_def_rf); i++) {
+			run_rt3070_rf_write(sc, rt5592_2ghz_def_rf[i].reg,
+			    rt5592_2ghz_def_rf[i].val);
+		}
+
+		rf = (chan <= 10) ? 0x07 : 0x06;
+		run_rt3070_rf_write(sc, 23, rf);
+		run_rt3070_rf_write(sc, 59, rf);
+
+		run_rt3070_rf_write(sc, 55, 0x43);
+
+		/* 
+		 * RF R49/R50 Tx power ALC code.
+		 * G-band bit<7:6>=1:0, bit<5:0> range from 0x0 ~ 0x27.
+		 */
+		reg = 2;
+		txpow_bound = 0x27;
+	} else {
+		/* Initialize RF registers for 5GHZ. */
+		for (i = 0; i < nitems(rt5592_5ghz_def_rf); i++) {
+			run_rt3070_rf_write(sc, rt5592_5ghz_def_rf[i].reg,
+			    rt5592_5ghz_def_rf[i].val);
+		}
+		for (i = 0; i < nitems(rt5592_chan_5ghz); i++) {
+			if (chan >= rt5592_chan_5ghz[i].firstchan &&
+			    chan <= rt5592_chan_5ghz[i].lastchan) {
+				run_rt3070_rf_write(sc, rt5592_chan_5ghz[i].reg,
+				    rt5592_chan_5ghz[i].val);
+			}
+		}
+
+		/* 
+		 * RF R49/R50 Tx power ALC code.
+		 * A-band bit<7:6>=1:1, bit<5:0> range from 0x0 ~ 0x2b.
+		 */
+		reg = 3;
+		txpow_bound = 0x2b;
+	}
+
+	/* RF R49 ch0 Tx power ALC code. */
+	run_rt3070_rf_read(sc, 49, &rf);
+	rf &= ~0xc0;
+	rf |= (reg << 6);
+	rf = (rf & ~0x3f) | (txpow1 & 0x3f);
+	if ((rf & 0x3f) > txpow_bound)
+		rf = (rf & ~0x3f) | txpow_bound;
+	run_rt3070_rf_write(sc, 49, rf);
+
+	/* RF R50 ch1 Tx power ALC code. */
+	run_rt3070_rf_read(sc, 50, &rf);
+	rf &= ~(1 << 7 | 1 << 6);
+	rf |= (reg << 6);
+	rf = (rf & ~0x3f) | (txpow2 & 0x3f);
+	if ((rf & 0x3f) > txpow_bound)
+		rf = (rf & ~0x3f) | txpow_bound;
+	run_rt3070_rf_write(sc, 50, rf);
+
+	/* Enable RF_BLOCK, PLL_PD, RX0_PD, and TX0_PD. */
+	run_rt3070_rf_read(sc, 1, &rf);
+	rf |= (RT3070_RF_BLOCK | RT3070_PLL_PD | RT3070_RX0_PD | RT3070_TX0_PD);
+	if (sc->ntxchains > 1)
+		rf |= RT3070_TX1_PD;
+	if (sc->nrxchains > 1)
+		rf |= RT3070_RX1_PD;
+	run_rt3070_rf_write(sc, 1, rf);
+
+	run_rt3070_rf_write(sc, 6, 0xe4);
+
+	run_rt3070_rf_write(sc, 30, 0x10);
+	run_rt3070_rf_write(sc, 31, 0x80);
+	run_rt3070_rf_write(sc, 32, 0x80);
+
+	run_adjust_freq_offset(sc);
+
+	/* Enable VCO calibration. */
+	run_rt3070_rf_read(sc, 3, &rf);
+	rf |= RT5390_VCOCAL;
+	run_rt3070_rf_write(sc, 3, rf);
+}
+
 static void
 run_set_rx_antenna(struct run_softc *sc, int aux)
 {
 	uint32_t tmp;
+	uint8_t bbp152;
 
 	if (aux) {
-		run_mcu_cmd(sc, RT2860_MCU_CMD_ANTSEL, 0);
-		run_read(sc, RT2860_GPIO_CTRL, &tmp);
-		run_write(sc, RT2860_GPIO_CTRL, (tmp & ~0x0808) | 0x08);
+		if (sc->rf_rev == RT5390_RF_5370) {
+			run_bbp_read(sc, 152, &bbp152);
+			run_bbp_write(sc, 152, bbp152 & ~0x80);
+		} else {
+			run_mcu_cmd(sc, RT2860_MCU_CMD_ANTSEL, 0);
+			run_read(sc, RT2860_GPIO_CTRL, &tmp);
+			run_write(sc, RT2860_GPIO_CTRL, (tmp & ~0x0808) | 0x08);
+		}
 	} else {
-		run_mcu_cmd(sc, RT2860_MCU_CMD_ANTSEL, 1);
-		run_read(sc, RT2860_GPIO_CTRL, &tmp);
-		run_write(sc, RT2860_GPIO_CTRL, tmp & ~0x0808);
+		if (sc->rf_rev == RT5390_RF_5370) {
+			run_bbp_read(sc, 152, &bbp152);
+			run_bbp_write(sc, 152, bbp152 | 0x80);
+		} else {
+			run_mcu_cmd(sc, RT2860_MCU_CMD_ANTSEL, 1);
+			run_read(sc, RT2860_GPIO_CTRL, &tmp);
+			run_write(sc, RT2860_GPIO_CTRL, tmp & ~0x0808);
+		}
 	}
 }
 
@@ -3861,13 +4301,17 @@ static int
 run_set_chan(struct run_softc *sc, struct ieee80211_channel *c)
 {
 	struct ieee80211com *ic = sc->sc_ifp->if_l2com;
-	uint32_t chan, group;
+	u_int chan, group;
 
 	chan = ieee80211_chan2ieee(ic, c);
 	if (chan == 0 || chan == IEEE80211_CHAN_ANY)
 		return (EINVAL);
 
-	if (sc->mac_ver == 0x3572)
+	if (sc->mac_ver == 0x5592)
+		run_rt5592_set_chan(sc, chan);
+	else if (sc->mac_ver >= 0x5390)
+		run_rt5390_set_chan(sc, chan);
+	else if (sc->mac_ver == 0x3572)
 		run_rt3572_set_chan(sc, chan);
 	else if (sc->mac_ver >= 0x3070)
 		run_rt3070_set_chan(sc, chan);
@@ -3990,6 +4434,7 @@ run_update_beacon_cb(void *arg)
 	struct run_softc *sc = ic->ic_ifp->if_softc;
 	struct rt2860_txwi txwi;
 	struct mbuf *m;
+	uint16_t txwisize;
 	uint8_t ridx;
 
 	if (vap->iv_bss->ni_chan == IEEE80211_CHAN_ANYC)
@@ -4009,25 +4454,26 @@ run_update_beacon_cb(void *arg)
 	}
 	m = rvp->beacon_mbuf;
 
-	memset(&txwi, 0, sizeof txwi);
+	memset(&txwi, 0, sizeof(txwi));
 	txwi.wcid = 0xff;
 	txwi.len = htole16(m->m_pkthdr.len);
+
 	/* send beacons at the lowest available rate */
 	ridx = (ic->ic_curmode == IEEE80211_MODE_11A) ?
 	    RT2860_RIDX_OFDM6 : RT2860_RIDX_CCK1;
 	txwi.phy = htole16(rt2860_rates[ridx].mcs);
 	if (rt2860_rates[ridx].phy == IEEE80211_T_OFDM)
-	        txwi.phy |= htole16(RT2860_PHY_OFDM);
+		txwi.phy |= htole16(RT2860_PHY_OFDM);
 	txwi.txop = RT2860_TX_TXOP_HT;
 	txwi.flags = RT2860_TX_TS;
 	txwi.xflags = RT2860_TX_NSEQ;
 
-	run_write_region_1(sc, RT2860_BCN_BASE(rvp->rvp_id),
-	    (uint8_t *)&txwi, sizeof txwi);
-	run_write_region_1(sc, RT2860_BCN_BASE(rvp->rvp_id) + sizeof txwi,
-	    mtod(m, uint8_t *), (m->m_pkthdr.len + 1) & ~1);	/* roundup len */
-
-	return;
+	txwisize = (sc->mac_ver == 0x5592) ?
+	    sizeof(txwi) + sizeof(uint32_t) : sizeof(txwi);
+	run_write_region_1(sc, RT2860_BCN_BASE(rvp->rvp_id), (uint8_t *)&txwi,
+	    txwisize);
+	run_write_region_1(sc, RT2860_BCN_BASE(rvp->rvp_id) + txwisize,
+	    mtod(m, uint8_t *), (m->m_pkthdr.len + 1) & ~1);
 }
 
 static void
@@ -4147,7 +4593,8 @@ run_enable_tsf_sync(struct run_softc *sc)
 	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
 	uint32_t tmp;
 
-	DPRINTF("rvp_id=%d ic_opmode=%d\n", RUN_VAP(vap)->rvp_id, ic->ic_opmode);
+	DPRINTF("rvp_id=%d ic_opmode=%d\n", RUN_VAP(vap)->rvp_id,
+	    ic->ic_opmode);
 
 	run_read(sc, RT2860_BCN_TIME_CFG, &tmp);
 	tmp &= ~0x1fffff;
@@ -4303,7 +4750,7 @@ run_rssi2dbm(struct run_softc *sc, uint8_t rssi, uint8_t rxchain)
 	int delta;
 
 	if (IEEE80211_IS_CHAN_5GHZ(c)) {
-		uint32_t chan = ieee80211_chan2ieee(ic, c);
+		u_int chan = ieee80211_chan2ieee(ic, c);
 		delta = sc->rssi_5ghz[rxchain];
 
 		/* determine channel group */
@@ -4319,6 +4766,64 @@ run_rssi2dbm(struct run_softc *sc, uint8_t rssi, uint8_t rxchain)
 	return (-12 - delta - rssi);
 }
 
+static void
+run_rt5390_bbp_init(struct run_softc *sc)
+{
+	int i;
+	uint8_t bbp;
+
+	/* Apply maximum likelihood detection for 2 stream case. */
+	run_bbp_read(sc, 105, &bbp);
+	if (sc->nrxchains > 1)
+		run_bbp_write(sc, 105, bbp | RT5390_MLD);
+
+	/* Avoid data lost and CRC error. */
+	run_bbp_read(sc, 4, &bbp);
+	run_bbp_write(sc, 4, bbp | RT5390_MAC_IF_CTRL);
+
+	if (sc->mac_ver == 0x5592) {
+		for (i = 0; i < nitems(rt5592_def_bbp); i++) {
+			run_bbp_write(sc, rt5592_def_bbp[i].reg,
+			    rt5592_def_bbp[i].val);
+		}
+		for (i = 0; i < nitems(rt5592_bbp_r196); i++) {
+			run_bbp_write(sc, 195, i + 0x80);
+			run_bbp_write(sc, 196, rt5592_bbp_r196[i]);
+		}
+	} else {
+		for (i = 0; i < nitems(rt5390_def_bbp); i++) {
+			run_bbp_write(sc, rt5390_def_bbp[i].reg,
+			    rt5390_def_bbp[i].val);
+		}
+	}
+	if (sc->mac_ver == 0x5392) {
+		run_bbp_write(sc, 88, 0x90);
+		run_bbp_write(sc, 95, 0x9a);
+		run_bbp_write(sc, 98, 0x12);
+		run_bbp_write(sc, 106, 0x12);
+		run_bbp_write(sc, 134, 0xd0);
+		run_bbp_write(sc, 135, 0xf6);
+		run_bbp_write(sc, 148, 0x84);
+	}
+
+	run_bbp_read(sc, 152, &bbp);
+	run_bbp_write(sc, 152, bbp | 0x80);
+
+	/* Fix BBP254 for RT5592C. */
+	if (sc->mac_ver == 0x5592 && sc->mac_rev >= 0x0221) {
+		run_bbp_read(sc, 254, &bbp);
+		run_bbp_write(sc, 254, bbp | 0x80);
+	}
+
+	/* Disable hardware antenna diversity. */
+	if (sc->mac_ver == 0x5390)
+		run_bbp_write(sc, 154, 0);
+
+	/* Initialize Rx CCK/OFDM frequency offset report. */
+	run_bbp_write(sc, 142, 1);
+	run_bbp_write(sc, 143, 57);
+}
+
 static int
 run_bbp_init(struct run_softc *sc)
 {
@@ -4336,16 +4841,20 @@ run_bbp_init(struct run_softc *sc)
 		return (ETIMEDOUT);
 
 	/* initialize BBP registers to default values */
-	for (i = 0; i < N(rt2860_def_bbp); i++) {
-		run_bbp_write(sc, rt2860_def_bbp[i].reg,
-		    rt2860_def_bbp[i].val);
+	if (sc->mac_ver >= 0x5390)
+		run_rt5390_bbp_init(sc);
+	else {
+		for (i = 0; i < nitems(rt2860_def_bbp); i++) {
+			run_bbp_write(sc, rt2860_def_bbp[i].reg,
+			    rt2860_def_bbp[i].val);
+		}
 	}
 
 	/* fix BBP84 for RT2860E */
 	if (sc->mac_ver == 0x2860 && sc->mac_rev != 0x0101)
 		run_bbp_write(sc, 84, 0x19);
 
-	if (sc->mac_ver >= 0x3070) {
+	if (sc->mac_ver >= 0x3070 && sc->mac_ver != 0x5592) {
 		run_bbp_write(sc, 79, 0x13);
 		run_bbp_write(sc, 80, 0x05);
 		run_bbp_write(sc, 81, 0x33);
@@ -4360,7 +4869,7 @@ static int
 run_rt3070_rf_init(struct run_softc *sc)
 {
 	uint32_t tmp;
-	uint8_t rf, target, bbp4;
+	uint8_t bbp4, mingain, rf, target;
 	int i;
 
 	run_rt3070_rf_read(sc, 30, &rf);
@@ -4371,19 +4880,23 @@ run_rt3070_rf_init(struct run_softc *sc)
 
 	/* initialize RF registers to default value */
 	if (sc->mac_ver == 0x3572) {
-		for (i = 0; i < N(rt3572_def_rf); i++) {
+		for (i = 0; i < nitems(rt3572_def_rf); i++) {
 			run_rt3070_rf_write(sc, rt3572_def_rf[i].reg,
 			    rt3572_def_rf[i].val);
 		}
 	} else {
-		for (i = 0; i < N(rt3070_def_rf); i++) {
+		for (i = 0; i < nitems(rt3070_def_rf); i++) {
 			run_rt3070_rf_write(sc, rt3070_def_rf[i].reg,
 			    rt3070_def_rf[i].val);
 		}
 	}
 
-	if (sc->mac_ver == 0x3070) {
-		/* change voltage from 1.2V to 1.35V for RT3070 */
+	if (sc->mac_ver == 0x3070 && sc->mac_rev < 0x0201) {
+		/* 
+		 * Change voltage from 1.2V to 1.35V for RT3070.
+		 * The DAC issue (RT3070_LDO_CFG0) has been fixed
+		 * in RT3070(F).
+		 */
 		run_read(sc, RT3070_LDO_CFG0, &tmp);
 		tmp = (tmp & ~0x0f000000) | 0x0d000000;
 		run_write(sc, RT3070_LDO_CFG0, tmp);
@@ -4433,7 +4946,7 @@ run_rt3070_rf_init(struct run_softc *sc)
 
 	/* select 40MHz bandwidth */
 	run_bbp_read(sc, 4, &bbp4);
-	run_bbp_write(sc, 4, (bbp4 & ~0x08) | 0x10);
+	run_bbp_write(sc, 4, (bbp4 & ~0x18) | 0x10);
 	run_rt3070_rf_read(sc, 31, &rf);
 	run_rt3070_rf_write(sc, 31, rf | 0x20);
 
@@ -4450,7 +4963,7 @@ run_rt3070_rf_init(struct run_softc *sc)
 		/* save default BBP registers 25 and 26 values */
 		run_bbp_read(sc, 25, &sc->bbp25);
 		run_bbp_read(sc, 26, &sc->bbp26);
-	} else if (sc->mac_rev < 0x0211)
+	} else if (sc->mac_rev < 0x0201 || sc->mac_rev < 0x0211)
 		run_rt3070_rf_write(sc, 27, 0x03);
 
 	run_read(sc, RT3070_OPT_14, &tmp);
@@ -4463,7 +4976,8 @@ run_rt3070_rf_init(struct run_softc *sc)
 		     (sc->mac_ver == 0x3071 && sc->mac_rev >= 0x0211)) &&
 		    !sc->ext_2ghz_lna)
 			rf |= 0x20;	/* fix for long range Rx issue */
-		if (sc->txmixgain_2ghz >= 1)
+		mingain = (sc->mac_ver == 0x3070) ? 1 : 2;
+		if (sc->txmixgain_2ghz >= mingain)
 			rf = (rf & ~0x7) | sc->txmixgain_2ghz;
 		run_rt3070_rf_write(sc, 17, rf);
 	}
@@ -4495,6 +5009,70 @@ run_rt3070_rf_init(struct run_softc *sc)
 	return (0);
 }
 
+static void
+run_rt5390_rf_init(struct run_softc *sc)
+{
+	uint32_t tmp;
+	uint8_t rf;
+	int i;
+
+	/* Toggle RF R2 to initiate calibration. */
+	if (sc->mac_ver == 0x5390) {
+		run_rt3070_rf_read(sc, 2, &rf);
+		run_rt3070_rf_write(sc, 2, rf | RT5390_RESCAL);
+		run_delay(sc, 10);
+		run_rt3070_rf_write(sc, 2, rf & ~RT5390_RESCAL);
+	} else {
+		run_rt3070_rf_write(sc, 2, RT5390_RESCAL);
+		run_delay(sc, 10);
+	}
+
+	/* Initialize RF registers to default value. */
+	if (sc->mac_ver == 0x5592) {
+		for (i = 0; i < nitems(rt5592_def_rf); i++) {
+			run_rt3070_rf_write(sc, rt5592_def_rf[i].reg,
+			    rt5592_def_rf[i].val);
+		}
+		/* Initialize RF frequency offset. */
+		run_adjust_freq_offset(sc);
+	} else if (sc->mac_ver == 0x5392) {
+		for (i = 0; i < nitems(rt5392_def_rf); i++) {
+			run_rt3070_rf_write(sc, rt5392_def_rf[i].reg,
+			    rt5392_def_rf[i].val);
+		}
+		if (sc->mac_rev >= 0x0223) {
+			run_rt3070_rf_write(sc, 23, 0x0f);
+			run_rt3070_rf_write(sc, 24, 0x3e);
+			run_rt3070_rf_write(sc, 51, 0x32);
+			run_rt3070_rf_write(sc, 53, 0x22);
+			run_rt3070_rf_write(sc, 56, 0xc1);
+			run_rt3070_rf_write(sc, 59, 0x0f);
+		}
+	} else {
+		for (i = 0; i < nitems(rt5390_def_rf); i++) {
+			run_rt3070_rf_write(sc, rt5390_def_rf[i].reg,
+			    rt5390_def_rf[i].val);
+		}
+		if (sc->mac_rev >= 0x0502) {
+			run_rt3070_rf_write(sc, 6, 0xe0);
+			run_rt3070_rf_write(sc, 25, 0x80);
+			run_rt3070_rf_write(sc, 46, 0x73);
+			run_rt3070_rf_write(sc, 53, 0x00);
+			run_rt3070_rf_write(sc, 56, 0x42);
+			run_rt3070_rf_write(sc, 61, 0xd1);
+		}
+	}
+
+	sc->rf24_20mhz = 0x1f;	/* default value */
+	sc->rf24_40mhz = (sc->mac_ver == 0x5592) ? 0 : 0x2f;
+
+	if (sc->mac_rev < 0x0211)
+		run_rt3070_rf_write(sc, 27, 0x3);
+
+	run_read(sc, RT3070_OPT_14, &tmp);
+	run_write(sc, RT3070_OPT_14, tmp | 1);
+}
+
 static int
 run_rt3070_filter_calib(struct run_softc *sc, uint8_t init, uint8_t target,
     uint8_t *val)
@@ -4524,7 +5102,7 @@ run_rt3070_filter_calib(struct run_softc *sc, uint8_t init, uint8_t target,
 			break;
 	}
 	if (ntries == 100)
-		return ETIMEDOUT;
+		return (ETIMEDOUT);
 
 	/* set power and frequency of stopband test tone */
 	run_bbp_write(sc, 24, 0x06);
@@ -4566,7 +5144,49 @@ run_rt3070_rf_setup(struct run_softc *sc)
 	uint8_t bbp, rf;
 	int i;
 
-	if (sc->mac_ver == 0x3572) {
+	if (sc->mac_ver >= 0x5390) {
+		if (sc->mac_rev >= 0x0211) {
+			/* Enable DC filter. */
+			run_bbp_write(sc, 103, 0xc0);
+
+			if (sc->mac_ver != 0x5592) {
+				/* Improve power consumption. */
+				run_bbp_read(sc, 31, &bbp);
+				run_bbp_write(sc, 31, bbp & ~0x03);
+			}
+		}
+
+		run_bbp_read(sc, 138, &bbp);
+		if (sc->ntxchains == 1)
+			bbp |= 0x20;	/* turn off DAC1 */
+		if (sc->nrxchains == 1)
+			bbp &= ~0x02;	/* turn off ADC1 */
+		run_bbp_write(sc, 138, bbp);
+
+		run_rt3070_rf_read(sc, 38, &rf);
+		run_rt3070_rf_write(sc, 38, rf & ~RT5390_RX_LO1);
+
+		run_rt3070_rf_read(sc, 39, &rf);
+		run_rt3070_rf_write(sc, 39, rf & ~RT5390_RX_LO2);
+
+		/* Avoid data lost and CRC error. */
+		run_bbp_read(sc, 4, &bbp);
+		run_bbp_write(sc, 4, bbp | RT5390_MAC_IF_CTRL);
+
+		run_rt3070_rf_read(sc, 30, &rf);
+		rf = (rf & ~0x18) | 0x10;
+		run_rt3070_rf_write(sc, 30, rf);
+
+		if (sc->mac_ver != 0x5592) {
+			run_write(sc, RT2860_TX_SW_CFG1, 0);
+			if (sc->mac_rev < 0x0211) {
+				run_write(sc, RT2860_TX_SW_CFG2,
+				    sc->patch_dac ? 0x2c : 0x0f);
+			} else
+				run_write(sc, RT2860_TX_SW_CFG2, 0);
+		}
+
+	} else if (sc->mac_ver == 0x3572) {
 		/* enable DC filter */
 		if (sc->mac_rev >= 0x0201)
 			run_bbp_write(sc, 103, 0xc0);
@@ -4589,10 +5209,15 @@ run_rt3070_rf_setup(struct run_softc *sc)
 		run_rt3070_rf_write(sc, 16, rf);
 
 	} else if (sc->mac_ver == 0x3071) {
-		/* enable DC filter */
-		if (sc->mac_rev >= 0x0201)
+		if (sc->mac_rev >= 0x0211) {
+			/* enable DC filter */
 			run_bbp_write(sc, 103, 0xc0);
 
+			/* improve power consumption */
+			run_bbp_read(sc, 31, &bbp);
+			run_bbp_write(sc, 31, bbp & ~0x03);
+		}
+
 		run_bbp_read(sc, 138, &bbp);
 		if (sc->ntxchains == 1)
 			bbp |= 0x20;	/* turn off DAC1 */
@@ -4600,12 +5225,6 @@ run_rt3070_rf_setup(struct run_softc *sc)
 			bbp &= ~0x02;	/* turn off ADC1 */
 		run_bbp_write(sc, 138, bbp);
 
-		if (sc->mac_rev >= 0x0211) {
-			/* improve power consumption */
-			run_bbp_read(sc, 31, &bbp);
-			run_bbp_write(sc, 31, bbp & ~0x03);
-		}
-
 		run_write(sc, RT2860_TX_SW_CFG1, 0);
 		if (sc->mac_rev < 0x0211) {
 			run_write(sc, RT2860_TX_SW_CFG2,
@@ -4623,7 +5242,7 @@ run_rt3070_rf_setup(struct run_softc *sc)
 			run_bbp_write(sc, 31, bbp & ~0x03);
 		}
 
-		if (sc->mac_rev < 0x0211) {
+		if (sc->mac_rev < 0x0201) {
 			run_write(sc, RT2860_TX_SW_CFG1, 0);
 			run_write(sc, RT2860_TX_SW_CFG2, 0x2c);
 		} else
@@ -4631,7 +5250,7 @@ run_rt3070_rf_setup(struct run_softc *sc)
 	}
 
 	/* initialize RF registers from ROM for >=RT3071*/
-	if (sc->mac_ver >= 0x3071) {
+	if (sc->mac_ver >= 0x3071 && sc->mac_ver < 0x5390) {
 		for (i = 0; i < 10; i++) {
 			if (sc->rf[i].reg == 0 || sc->rf[i].reg == 0xff)
 				continue;
@@ -4650,13 +5269,13 @@ run_txrx_enable(struct run_softc *sc)
 	run_write(sc, RT2860_MAC_SYS_CTRL, RT2860_MAC_TX_EN);
 	for (ntries = 0; ntries < 200; ntries++) {
 		if ((error = run_read(sc, RT2860_WPDMA_GLO_CFG, &tmp)) != 0)
-			return error;
+			return (error);
 		if ((tmp & (RT2860_TX_DMA_BUSY | RT2860_RX_DMA_BUSY)) == 0)
 			break;
 		run_delay(sc, 50);
 	}
 	if (ntries == 200)
-		return ETIMEDOUT;
+		return (ETIMEDOUT);
 
 	run_delay(sc, 50);
 
@@ -4686,6 +5305,20 @@ run_txrx_enable(struct run_softc *sc)
 	return (0);
 }
 
+static void
+run_adjust_freq_offset(struct run_softc *sc)
+{
+	uint8_t rf, tmp;
+
+	run_rt3070_rf_read(sc, 17, &rf);
+	tmp = rf;
+	rf = (rf & ~0x7f) | (sc->freq & 0x7f);
+	rf = MIN(rf, 0x5f);
+
+	if (tmp != rf)
+		run_mcu_cmd(sc, 0x74, (tmp << 8 ) | rf);
+}
+
 static void
 run_init_locked(struct run_softc *sc)
 {
@@ -4759,13 +5392,26 @@ run_init_locked(struct run_softc *sc)
 		run_write(sc, RT2860_TX_PWR_CFG(ridx), sc->txpow20mhz[ridx]);
 	}
 
-	for (i = 0; i < N(rt2870_def_mac); i++)
+	for (i = 0; i < nitems(rt2870_def_mac); i++)
 		run_write(sc, rt2870_def_mac[i].reg, rt2870_def_mac[i].val);
 	run_write(sc, RT2860_WMM_AIFSN_CFG, 0x00002273);
 	run_write(sc, RT2860_WMM_CWMIN_CFG, 0x00002344);
 	run_write(sc, RT2860_WMM_CWMAX_CFG, 0x000034aa);
 
-	if (sc->mac_ver >= 0x3070) {
+	if (sc->mac_ver >= 0x5390) {
+		run_write(sc, RT2860_TX_SW_CFG0,
+		    4 << RT2860_DLY_PAPE_EN_SHIFT | 4);
+		if (sc->mac_ver >= 0x5392) {
+			run_write(sc, RT2860_MAX_LEN_CFG, 0x00002fff);
+			if (sc->mac_ver == 0x5592) {
+				run_write(sc, RT2860_HT_FBK_CFG1, 0xedcba980);
+				run_write(sc, RT2860_TXOP_HLDR_ET, 0x00000082);
+			} else {
+				run_write(sc, RT2860_HT_FBK_CFG1, 0xedcb4980);
+				run_write(sc, RT2860_LG_FBK_CFG0, 0xedcba322);
+			}
+		}
+	} else if (sc->mac_ver >= 0x3070) {
 		/* set delay of PA_PE assertion to 1us (unit of 0.25us) */
 		run_write(sc, RT2860_TX_SW_CFG0,
 		    4 << RT2860_DLY_PAPE_EN_SHIFT);
@@ -4822,14 +5468,16 @@ run_init_locked(struct run_softc *sc)
 	run_write(sc, RT2860_WMM_TXOP1_CFG, 48 << 16 | 96);
 
 	/* write vendor-specific BBP values (from EEPROM) */
-	for (i = 0; i < 10; i++) {
-		if (sc->bbp[i].reg == 0 || sc->bbp[i].reg == 0xff)
-			continue;
-		run_bbp_write(sc, sc->bbp[i].reg, sc->bbp[i].val);
+	if (sc->mac_ver < 0x5390) {
+		for (i = 0; i < 10; i++) {
+			if (sc->bbp[i].reg == 0 || sc->bbp[i].reg == 0xff)
+				continue;
+			run_bbp_write(sc, sc->bbp[i].reg, sc->bbp[i].val);
+		}
 	}
 
 	/* select Main antenna for 1T1R devices */
-	if (sc->rf_rev == RT3070_RF_3020)
+	if (sc->rf_rev == RT3070_RF_3020 || sc->rf_rev == RT5390_RF_5370)
 		run_set_rx_antenna(sc, 0);
 
 	/* send LEDs operating mode to microcontroller */
@@ -4837,7 +5485,9 @@ run_init_locked(struct run_softc *sc)
 	(void)run_mcu_cmd(sc, RT2860_MCU_CMD_LED2, sc->led[1]);
 	(void)run_mcu_cmd(sc, RT2860_MCU_CMD_LED3, sc->led[2]);
 
-	if (sc->mac_ver >= 0x3070)
+	if (sc->mac_ver >= 0x5390)
+		run_rt5390_rf_init(sc);
+	else if (sc->mac_ver >= 0x3070)
 		run_rt3070_rf_init(sc);
 
 	/* disable non-existing Rx chains */
@@ -4931,6 +5581,24 @@ run_stop(void *arg)
 		sc->rx_m = NULL;
 	}
 
+	/* Disable Tx/Rx DMA. */
+	if (run_read(sc, RT2860_WPDMA_GLO_CFG, &tmp) != 0)
+		return;
+	tmp &= ~(RT2860_RX_DMA_EN | RT2860_TX_DMA_EN);
+	run_write(sc, RT2860_WPDMA_GLO_CFG, tmp);
+
+	for (ntries = 0; ntries < 100; ntries++) {
+		if (run_read(sc, RT2860_WPDMA_GLO_CFG, &tmp) != 0)
+			return;
+		if ((tmp & (RT2860_TX_DMA_BUSY | RT2860_RX_DMA_BUSY)) == 0)
+				break;
+		run_delay(sc, 10);
+	}
+	if (ntries == 100) {
+		device_printf(sc->sc_dev, "timeout waiting for DMA engine\n");
+		return;
+	}
+
 	/* disable Tx/Rx */
 	run_read(sc, RT2860_MAC_SYS_CTRL, &tmp);
 	tmp &= ~(RT2860_MAC_RX_EN | RT2860_MAC_TX_EN);
@@ -4958,12 +5626,10 @@ run_stop(void *arg)
 
 	for (i = 0; i != RUN_EP_QUEUES; i++)
 		run_unsetup_tx_list(sc, &sc->sc_epq[i]);
-
-	return;
 }
 
 static void
-run_delay(struct run_softc *sc, unsigned int ms)
+run_delay(struct run_softc *sc, u_int ms)
 {
 	usb_pause_mtx(mtx_owned(&sc->sc_mtx) ? 
 	    &sc->sc_mtx : NULL, USB_MS_TO_TICKS(ms));
@@ -4985,7 +5651,7 @@ static driver_t run_driver = {
 
 static devclass_t run_devclass;
 
-DRIVER_MODULE(run, uhub, run_driver, run_devclass, NULL, 0);
+DRIVER_MODULE(run, uhub, run_driver, run_devclass, NULL, NULL);
 MODULE_DEPEND(run, wlan, 1, 1, 1);
 MODULE_DEPEND(run, usb, 1, 1, 1);
 MODULE_DEPEND(run, firmware, 1, 1, 1);
diff --git a/sys/dev/usb/wlan/if_runreg.h b/sys/dev/usb/wlan/if_runreg.h
index 3a5125f82b5..0a71cb66b36 100644
--- a/sys/dev/usb/wlan/if_runreg.h
+++ b/sys/dev/usb/wlan/if_runreg.h
@@ -22,13 +22,6 @@
 #ifndef _IF_RUNREG_H_
 #define	_IF_RUNREG_H_
 
-/* PCI registers */
-#define RT2860_PCI_CFG			0x0000
-#define RT2860_PCI_EECTRL		0x0004
-#define RT2860_PCI_MCUCTRL		0x0008
-#define RT2860_PCI_SYSCTRL		0x000c
-#define RT2860_PCIE_JTAG		0x0010
-
 #define RT2860_CONFIG_NO		1
 #define RT2860_IFACE_INDEX		0
 
@@ -85,6 +78,9 @@
 #define RT3070_LDO_CFG0			0x05d4
 #define RT3070_GPIO_SWITCH		0x05dc
 
+/* RT5592 registers */
+#define RT5592_DEBUG_INDEX		0x05e8
+
 /* MAC registers */
 #define RT2860_ASIC_VER_ID		0x1000
 #define RT2860_MAC_SYS_CTRL		0x1004
@@ -209,6 +205,7 @@
 #define RT2860_H2M_MAILBOX		0x7010
 #define RT2860_H2M_MAILBOX_CID		0x7014
 #define RT2860_H2M_MAILBOX_STATUS	0x701c
+#define RT2860_H2M_INTSRC		0x7024
 #define RT2860_H2M_BBPAGENT		0x7028
 #define RT2860_BCN_BASE(vap)		(0x7800 + (vap) * 512)
 
@@ -256,7 +253,7 @@
 #define RT2860_TX_DMA_EN		(1 << 0)
 
 /* possible flags for register DELAY_INT_CFG */
-#define RT2860_TXDLY_INT_EN		(1 << 31)
+#define RT2860_TXDLY_INT_EN		(1U << 31)
 #define RT2860_TXMAX_PINT_SHIFT		24
 #define RT2860_TXMAX_PTIME_SHIFT	16
 #define RT2860_RXDLY_INT_EN		(1 << 15)
@@ -268,7 +265,7 @@
 #define RT2860_GPIO_O_SHIFT	0
 
 /* possible flags for register USB_DMA_CFG */
-#define RT2860_USB_TX_BUSY		(1 << 31)
+#define RT2860_USB_TX_BUSY		(1U << 31)
 #define RT2860_USB_RX_BUSY		(1 << 30)
 #define RT2860_USB_EPOUT_VLD_SHIFT	24
 #define RT2860_USB_TX_EN		(1 << 23)
@@ -368,7 +365,7 @@
 #define RT2860_TX0Q_PCNT_MASK	0x000000ff
 
 /* possible flags for register CAP_CTRL */
-#define RT2860_CAP_ADC_FEQ		(1 << 31)
+#define RT2860_CAP_ADC_FEQ		(1U << 31)
 #define RT2860_CAP_START		(1 << 30)
 #define RT2860_MAN_TRIG			(1 << 29)
 #define RT2860_TRIG_OFFSET_SHIFT	16
@@ -379,13 +376,16 @@
 #define RT3070_RF_WRITE		(1 << 16)
 
 /* possible flags for register EFUSE_CTRL */
-#define RT3070_SEL_EFUSE	(1 << 31)
+#define RT3070_SEL_EFUSE	(1U << 31)
 #define RT3070_EFSROM_KICK	(1 << 30)
 #define RT3070_EFSROM_AIN_MASK	0x03ff0000
 #define RT3070_EFSROM_AIN_SHIFT	16
 #define RT3070_EFSROM_MODE_MASK	0x000000c0
 #define RT3070_EFUSE_AOUT_MASK	0x0000003f
 
+/* possible flag for register DEBUG_INDEX */
+#define RT5592_SEL_XTAL		(1U << 31)
+
 /* possible flags for register MAC_SYS_CTRL */
 #define RT2860_RX_TS_EN		(1 << 7)
 #define RT2860_WLAN_HALT_EN	(1 << 6)
@@ -418,7 +418,7 @@
 #define RT2860_BBP_DATA_SHIFT		0
 
 /* possible flags for register RF_CSR_CFG0 */
-#define RT2860_RF_REG_CTRL		(1 << 31)
+#define RT2860_RF_REG_CTRL		(1U << 31)
 #define RT2860_RF_LE_SEL1		(1 << 30)
 #define RT2860_RF_LE_STBY		(1 << 29)
 #define RT2860_RF_REG_WIDTH_SHIFT	24
@@ -453,7 +453,7 @@
 #define RT2860_SLOT_TIME		0
 
 /* possible flags for register NAV_TIME_CFG */
-#define RT2860_NAV_UPD			(1 << 31)
+#define RT2860_NAV_UPD			(1U << 31)
 #define RT2860_NAV_UPD_VAL_SHIFT	16
 #define RT2860_NAV_CLR_EN		(1 << 15)
 #define RT2860_NAV_TIMER_SHIFT		0
@@ -688,6 +688,7 @@
 
 /* possible flags for RT3020 RF register 1 */
 #define RT3070_RF_BLOCK	(1 << 0)
+#define RT3070_PLL_PD	(1 << 1)
 #define RT3070_RX0_PD	(1 << 2)
 #define RT3070_TX0_PD	(1 << 3)
 #define RT3070_RX1_PD	(1 << 4)
@@ -705,6 +706,24 @@
 /* possible flags for RT3020 RF register 21 */
 #define RT3070_RX_LO2	(1 << 3)
 
+/* Possible flags for RT5390 RF register 2. */
+#define	RT5390_RESCAL	(1 << 7)
+
+/* Possible flags for RT5390 RF register 3. */
+#define	RT5390_VCOCAL	(1 << 7)
+
+/* Possible flags for RT5390 RF register 38. */
+#define	RT5390_RX_LO1	(1 << 5)
+
+/* Possible flags for RT5390 RF register 39. */
+#define	RT5390_RX_LO2	(1 << 7)
+
+/* Possible flags for RT5390 BBP register 4. */
+#define	RT5390_MAC_IF_CTRL	(1 << 6)
+
+/* Possible flags for RT5390 BBP register 105. */
+#define	RT5390_MLD			(1 << 2)
+#define	RT5390_EN_SIG_MODULATION	(1 << 3)
 
 /* RT2860 TX descriptor */
 struct rt2860_txd {
@@ -827,27 +846,18 @@ struct rt2860_rxwi {
 	uint16_t	reserved2;
 } __packed;
 
-
-/* first DMA segment contains TXWI + 802.11 header + 32-bit padding */
-#define RT2860_TXWI_DMASZ			\
-	(sizeof (struct rt2860_txwi) +		\
-	 sizeof (struct ieee80211_htframe) +	\
-	 sizeof (uint16_t))
-
-#define RT2860_RF1	0
-#define RT2860_RF2	2
-#define RT2860_RF3	1
-#define RT2860_RF4	3
-
-#define RT2860_RF_2820	1	/* 2T3R */
-#define RT2860_RF_2850	2	/* dual-band 2T3R */
-#define RT2860_RF_2720	3	/* 1T2R */
-#define RT2860_RF_2750	4	/* dual-band 1T2R */
-#define RT3070_RF_3020	5	/* 1T1R */
-#define RT3070_RF_2020	6	/* b/g */
-#define RT3070_RF_3021	7	/* 1T2R */
-#define RT3070_RF_3022	8	/* 2T2R */
-#define RT3070_RF_3052	9	/* dual-band 2T2R */
+#define RT2860_RF_2820	0x0001	/* 2T3R */
+#define RT2860_RF_2850	0x0002	/* dual-band 2T3R */
+#define RT2860_RF_2720	0x0003	/* 1T2R */
+#define RT2860_RF_2750	0x0004	/* dual-band 1T2R */
+#define RT3070_RF_3020	0x0005	/* 1T1R */
+#define RT3070_RF_2020	0x0006	/* b/g */
+#define RT3070_RF_3021	0x0007	/* 1T2R */
+#define RT3070_RF_3022	0x0008	/* 2T2R */
+#define RT3070_RF_3052	0x0009	/* dual-band 2T2R */
+#define RT5592_RF_5592	0x000f	/* dual-band 2T2R */
+#define RT5390_RF_5370	0x5370	/* 1T1R */
+#define RT5390_RF_5372	0x5372	/* 2T2R */
 
 /* USB commands for RT2870 only */
 #define RT2870_RESET		1
@@ -921,31 +931,6 @@ static const struct rt2860_rate {
 	{ 108, 7, IEEE80211_T_OFDM, 8,  40,  40 }
 };
 
-/*
- * Control and status registers access macros.
- */
-#define RAL_READ(sc, reg)						\
-	bus_space_read_4((sc)->sc_st, (sc)->sc_sh, (reg))
-
-#define RAL_WRITE(sc, reg, val)						\
-	bus_space_write_4((sc)->sc_st, (sc)->sc_sh, (reg), (val))
-
-#define RAL_BARRIER_WRITE(sc)						\
-	bus_space_barrier((sc)->sc_st, (sc)->sc_sh, 0, 0x1800,		\
-	    BUS_SPACE_BARRIER_WRITE)
-
-#define RAL_BARRIER_READ_WRITE(sc)					\
-	bus_space_barrier((sc)->sc_st, (sc)->sc_sh, 0, 0x1800,		\
-	    BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE)
-
-#define RAL_WRITE_REGION_1(sc, offset, datap, count)			\
-	bus_space_write_region_1((sc)->sc_st, (sc)->sc_sh, (offset),	\
-	    (datap), (count))
-
-#define RAL_SET_REGION_4(sc, offset, val, count)			\
-	bus_space_set_region_4((sc)->sc_st, (sc)->sc_sh, (offset),	\
-	    (val), (count))
-
 /*
  * EEPROM access macro.
  */
@@ -958,39 +943,9 @@ static const struct rt2860_rate {
 /*
  * Default values for MAC registers; values taken from the reference driver.
  */
-#define RT2860_DEF_MAC					\
-	{ RT2860_BCN_OFFSET0,		0xf8f0e8e0 },	\
-	{ RT2860_LEGACY_BASIC_RATE,	0x0000013f },	\
-	{ RT2860_HT_BASIC_RATE,		0x00008003 },	\
-	{ RT2860_MAC_SYS_CTRL,		0x00000000 },	\
-	{ RT2860_BKOFF_SLOT_CFG,	0x00000209 },	\
-	{ RT2860_TX_SW_CFG0,		0x00000000 },	\
-	{ RT2860_TX_SW_CFG1,		0x00080606 },	\
-	{ RT2860_TX_LINK_CFG,		0x00001020 },	\
-	{ RT2860_TX_TIMEOUT_CFG,	0x000a2090 },	\
-	{ RT2860_LED_CFG,		0x7f031e46 },	\
-	{ RT2860_WMM_AIFSN_CFG,		0x00002273 },	\
-	{ RT2860_WMM_CWMIN_CFG,		0x00002344 },	\
-	{ RT2860_WMM_CWMAX_CFG,		0x000034aa },	\
-	{ RT2860_MAX_PCNT,		0x1f3fbf9f },	\
-	{ RT2860_TX_RTY_CFG,		0x47d01f0f },	\
-	{ RT2860_AUTO_RSP_CFG,		0x00000013 },	\
-	{ RT2860_CCK_PROT_CFG,		0x05740003 },	\
-	{ RT2860_OFDM_PROT_CFG,		0x05740003 },	\
-	{ RT2860_GF20_PROT_CFG,		0x01744004 },	\
-	{ RT2860_GF40_PROT_CFG,		0x03f44084 },	\
-	{ RT2860_MM20_PROT_CFG,		0x01744004 },	\
-	{ RT2860_MM40_PROT_CFG,		0x03f54084 },	\
-	{ RT2860_TXOP_CTRL_CFG,		0x0000583f },	\
-	{ RT2860_TXOP_HLDR_ET,		0x00000002 },	\
-	{ RT2860_TX_RTS_CFG,		0x00092b20 },	\
-	{ RT2860_EXP_ACK_TIME,		0x002400ca },	\
-	{ RT2860_XIFS_TIME_CFG,		0x33a41010 },	\
-	{ RT2860_PWR_PIN_CFG,		0x00000003 }
-
-/* XXX only a few registers differ from above, try to merge? */
 #define RT2870_DEF_MAC					\
 	{ RT2860_BCN_OFFSET0,		0xf8f0e8e0 },	\
+	{ RT2860_BCN_OFFSET1,		0x6f77d0c8 },	\
 	{ RT2860_LEGACY_BASIC_RATE,	0x0000013f },	\
 	{ RT2860_HT_BASIC_RATE,		0x00008003 },	\
 	{ RT2860_MAC_SYS_CTRL,		0x00000000 },	\
@@ -999,6 +954,7 @@ static const struct rt2860_rate {
 	{ RT2860_TX_SW_CFG1,		0x00080606 },	\
 	{ RT2860_TX_LINK_CFG,		0x00001020 },	\
 	{ RT2860_TX_TIMEOUT_CFG,	0x000a2090 },	\
+	{ RT2860_MAX_LEN_CFG,		0x00001f00 },	\
 	{ RT2860_LED_CFG,		0x7f031e46 },	\
 	{ RT2860_WMM_AIFSN_CFG,		0x00002273 },	\
 	{ RT2860_WMM_CWMIN_CFG,		0x00002344 },	\
@@ -1027,6 +983,7 @@ static const struct rt2860_rate {
 #define RT2860_DEF_BBP	\
 	{  65, 0x2c },	\
 	{  66, 0x38 },	\
+	{  68, 0x0b },	\
 	{  69, 0x12 },	\
 	{  70, 0x0a },	\
 	{  73, 0x10 },	\
@@ -1041,63 +998,126 @@ static const struct rt2860_rate {
 	{ 105, 0x05 },	\
 	{ 106, 0x35 }
 
+#define RT5390_DEF_BBP	\
+	{  31, 0x08 },	\
+	{  65, 0x2c },	\
+	{  66, 0x38 },	\
+	{  68, 0x0b },	\
+	{  69, 0x0d },	\
+	{  70, 0x06 },	\
+	{  73, 0x13 },	\
+	{  75, 0x46 },	\
+	{  76, 0x28 },	\
+	{  77, 0x59 },	\
+	{  81, 0x37 },	\
+	{  82, 0x62 },	\
+	{  83, 0x7a },	\
+	{  84, 0x9a },	\
+	{  86, 0x38 },	\
+	{  91, 0x04 },	\
+	{  92, 0x02 },	\
+	{ 103, 0xc0 },	\
+	{ 104, 0x92 },	\
+	{ 105, 0x3c },	\
+	{ 106, 0x03 },	\
+	{ 128, 0x12 }
+
+#define RT5592_DEF_BBP	\
+	{  20, 0x06 },	\
+	{  31, 0x08 },	\
+	{  65, 0x2c },	\
+	{  66, 0x38 },	\
+	{  68, 0xdd },	\
+	{  69, 0x1a },	\
+	{  70, 0x05 },	\
+	{  73, 0x13 },	\
+	{  74, 0x0f },	\
+	{  75, 0x4f },	\
+	{  76, 0x28 },	\
+	{  77, 0x59 },	\
+	{  81, 0x37 },	\
+	{  82, 0x62 },	\
+	{  83, 0x6a },	\
+	{  84, 0x9a },	\
+	{  86, 0x38 },	\
+	{  88, 0x90 },	\
+	{  91, 0x04 },	\
+	{  92, 0x02 },	\
+	{  95, 0x9a },	\
+	{  98, 0x12 },	\
+	{ 103, 0xc0 },	\
+	{ 104, 0x92 },	\
+	{ 105, 0x3c },	\
+	{ 106, 0x35 },	\
+	{ 128, 0x12 },	\
+	{ 134, 0xd0 },	\
+	{ 135, 0xf6 },	\
+	{ 137, 0x0f }
+
 /*
  * Default settings for RF registers; values derived from the reference driver.
  */
-#define RT2860_RF2850						\
-	{   1, 0x100bb3, 0x1301e1, 0x05a014, 0x001402 },	\
-	{   2, 0x100bb3, 0x1301e1, 0x05a014, 0x001407 },	\
-	{   3, 0x100bb3, 0x1301e2, 0x05a014, 0x001402 },	\
-	{   4, 0x100bb3, 0x1301e2, 0x05a014, 0x001407 },	\
-	{   5, 0x100bb3, 0x1301e3, 0x05a014, 0x001402 },	\
-	{   6, 0x100bb3, 0x1301e3, 0x05a014, 0x001407 },	\
-	{   7, 0x100bb3, 0x1301e4, 0x05a014, 0x001402 },	\
-	{   8, 0x100bb3, 0x1301e4, 0x05a014, 0x001407 },	\
-	{   9, 0x100bb3, 0x1301e5, 0x05a014, 0x001402 },	\
-	{  10, 0x100bb3, 0x1301e5, 0x05a014, 0x001407 },	\
-	{  11, 0x100bb3, 0x1301e6, 0x05a014, 0x001402 },	\
-	{  12, 0x100bb3, 0x1301e6, 0x05a014, 0x001407 },	\
-	{  13, 0x100bb3, 0x1301e7, 0x05a014, 0x001402 },	\
-	{  14, 0x100bb3, 0x1301e8, 0x05a014, 0x001404 },	\
-	{  36, 0x100bb3, 0x130266, 0x056014, 0x001408 },	\
-	{  38, 0x100bb3, 0x130267, 0x056014, 0x001404 },	\
-	{  40, 0x100bb2, 0x1301a0, 0x056014, 0x001400 },	\
-	{  44, 0x100bb2, 0x1301a0, 0x056014, 0x001408 },	\
-	{  46, 0x100bb2, 0x1301a1, 0x056014, 0x001402 },	\
-	{  48, 0x100bb2, 0x1301a1, 0x056014, 0x001406 },	\
-	{  52, 0x100bb2, 0x1301a2, 0x056014, 0x001404 },	\
-	{  54, 0x100bb2, 0x1301a2, 0x056014, 0x001408 },	\
-	{  56, 0x100bb2, 0x1301a3, 0x056014, 0x001402 },	\
-	{  60, 0x100bb2, 0x1301a4, 0x056014, 0x001400 },	\
-	{  62, 0x100bb2, 0x1301a4, 0x056014, 0x001404 },	\
-	{  64, 0x100bb2, 0x1301a4, 0x056014, 0x001408 },	\
-	{ 100, 0x100bb2, 0x1301ac, 0x05e014, 0x001400 },	\
-	{ 102, 0x100bb2, 0x1701ac, 0x15e014, 0x001404 },	\
-	{ 104, 0x100bb2, 0x1701ac, 0x15e014, 0x001408 },	\
-	{ 108, 0x100bb3, 0x17028c, 0x15e014, 0x001404 },	\
-	{ 110, 0x100bb3, 0x13028d, 0x05e014, 0x001400 },	\
-	{ 112, 0x100bb3, 0x13028d, 0x05e014, 0x001406 },	\
-	{ 116, 0x100bb3, 0x13028e, 0x05e014, 0x001408 },	\
-	{ 118, 0x100bb3, 0x13028f, 0x05e014, 0x001404 },	\
-	{ 120, 0x100bb1, 0x1300e0, 0x05e014, 0x001400 },	\
-	{ 124, 0x100bb1, 0x1300e0, 0x05e014, 0x001404 },	\
-	{ 126, 0x100bb1, 0x1300e0, 0x05e014, 0x001406 },	\
-	{ 128, 0x100bb1, 0x1300e0, 0x05e014, 0x001408 },	\
-	{ 132, 0x100bb1, 0x1300e1, 0x05e014, 0x001402 },	\
-	{ 134, 0x100bb1, 0x1300e1, 0x05e014, 0x001404 },	\
-	{ 136, 0x100bb1, 0x1300e1, 0x05e014, 0x001406 },	\
-	{ 140, 0x100bb1, 0x1300e2, 0x05e014, 0x001400 },	\
-	{ 149, 0x100bb1, 0x1300e2, 0x05e014, 0x001409 },	\
-	{ 151, 0x100bb1, 0x1300e3, 0x05e014, 0x001401 },	\
-	{ 153, 0x100bb1, 0x1300e3, 0x05e014, 0x001403 },	\
-	{ 157, 0x100bb1, 0x1300e3, 0x05e014, 0x001407 },	\
-	{ 159, 0x100bb1, 0x1300e3, 0x05e014, 0x001409 },	\
-	{ 161, 0x100bb1, 0x1300e4, 0x05e014, 0x001401 },	\
-	{ 165, 0x100bb1, 0x1300e4, 0x05e014, 0x001405 },	\
-	{ 167, 0x100bb1, 0x1300f4, 0x05e014, 0x001407 },	\
-	{ 169, 0x100bb1, 0x1300f4, 0x05e014, 0x001409 },	\
-	{ 171, 0x100bb1, 0x1300f5, 0x05e014, 0x001401 },	\
-	{ 173, 0x100bb1, 0x1300f5, 0x05e014, 0x001403 }
+#define RT2860_RF2850							\
+	{   1, 0x98402ecc, 0x984c0786, 0x9816b455, 0x9800510b },	\
+	{   2, 0x98402ecc, 0x984c0786, 0x98168a55, 0x9800519f },	\
+	{   3, 0x98402ecc, 0x984c078a, 0x98168a55, 0x9800518b },	\
+	{   4, 0x98402ecc, 0x984c078a, 0x98168a55, 0x9800519f },	\
+	{   5, 0x98402ecc, 0x984c078e, 0x98168a55, 0x9800518b },	\
+	{   6, 0x98402ecc, 0x984c078e, 0x98168a55, 0x9800519f },	\
+	{   7, 0x98402ecc, 0x984c0792, 0x98168a55, 0x9800518b },	\
+	{   8, 0x98402ecc, 0x984c0792, 0x98168a55, 0x9800519f },	\
+	{   9, 0x98402ecc, 0x984c0796, 0x98168a55, 0x9800518b },	\
+	{  10, 0x98402ecc, 0x984c0796, 0x98168a55, 0x9800519f },	\
+	{  11, 0x98402ecc, 0x984c079a, 0x98168a55, 0x9800518b },	\
+	{  12, 0x98402ecc, 0x984c079a, 0x98168a55, 0x9800519f },	\
+	{  13, 0x98402ecc, 0x984c079e, 0x98168a55, 0x9800518b },	\
+	{  14, 0x98402ecc, 0x984c07a2, 0x98168a55, 0x98005193 },	\
+	{  36, 0x98402ecc, 0x984c099a, 0x98158a55, 0x980ed1a3 },	\
+	{  38, 0x98402ecc, 0x984c099e, 0x98158a55, 0x980ed193 },	\
+	{  40, 0x98402ec8, 0x984c0682, 0x98158a55, 0x980ed183 },	\
+	{  44, 0x98402ec8, 0x984c0682, 0x98158a55, 0x980ed1a3 },	\
+	{  46, 0x98402ec8, 0x984c0686, 0x98158a55, 0x980ed18b },	\
+	{  48, 0x98402ec8, 0x984c0686, 0x98158a55, 0x980ed19b },	\
+	{  52, 0x98402ec8, 0x984c068a, 0x98158a55, 0x980ed193 },	\
+	{  54, 0x98402ec8, 0x984c068a, 0x98158a55, 0x980ed1a3 },	\
+	{  56, 0x98402ec8, 0x984c068e, 0x98158a55, 0x980ed18b },	\
+	{  60, 0x98402ec8, 0x984c0692, 0x98158a55, 0x980ed183 },	\
+	{  62, 0x98402ec8, 0x984c0692, 0x98158a55, 0x980ed193 },	\
+	{  64, 0x98402ec8, 0x984c0692, 0x98158a55, 0x980ed1a3 },	\
+	{ 100, 0x98402ec8, 0x984c06b2, 0x98178a55, 0x980ed783 },	\
+	{ 102, 0x98402ec8, 0x985c06b2, 0x98578a55, 0x980ed793 },	\
+	{ 104, 0x98402ec8, 0x985c06b2, 0x98578a55, 0x980ed1a3 },	\
+	{ 108, 0x98402ecc, 0x985c0a32, 0x98578a55, 0x980ed193 },	\
+	{ 110, 0x98402ecc, 0x984c0a36, 0x98178a55, 0x980ed183 },	\
+	{ 112, 0x98402ecc, 0x984c0a36, 0x98178a55, 0x980ed19b },	\
+	{ 116, 0x98402ecc, 0x984c0a3a, 0x98178a55, 0x980ed1a3 },	\
+	{ 118, 0x98402ecc, 0x984c0a3e, 0x98178a55, 0x980ed193 },	\
+	{ 120, 0x98402ec4, 0x984c0382, 0x98178a55, 0x980ed183 },	\
+	{ 124, 0x98402ec4, 0x984c0382, 0x98178a55, 0x980ed193 },	\
+	{ 126, 0x98402ec4, 0x984c0382, 0x98178a55, 0x980ed15b },	\
+	{ 128, 0x98402ec4, 0x984c0382, 0x98178a55, 0x980ed1a3 },	\
+	{ 132, 0x98402ec4, 0x984c0386, 0x98178a55, 0x980ed18b },	\
+	{ 134, 0x98402ec4, 0x984c0386, 0x98178a55, 0x980ed193 },	\
+	{ 136, 0x98402ec4, 0x984c0386, 0x98178a55, 0x980ed19b },	\
+	{ 140, 0x98402ec4, 0x984c038a, 0x98178a55, 0x980ed183 },	\
+	{ 149, 0x98402ec4, 0x984c038a, 0x98178a55, 0x980ed1a7 },	\
+	{ 151, 0x98402ec4, 0x984c038e, 0x98178a55, 0x980ed187 },	\
+	{ 153, 0x98402ec4, 0x984c038e, 0x98178a55, 0x980ed18f },	\
+	{ 157, 0x98402ec4, 0x984c038e, 0x98178a55, 0x980ed19f },	\
+	{ 159, 0x98402ec4, 0x984c038e, 0x98178a55, 0x980ed1a7 },	\
+	{ 161, 0x98402ec4, 0x984c0392, 0x98178a55, 0x980ed187 },	\
+	{ 165, 0x98402ec4, 0x984c0392, 0x98178a55, 0x980ed197 },	\
+	{ 167, 0x98402ec4, 0x984c03d2, 0x98179855, 0x9815531f },	\
+	{ 169, 0x98402ec4, 0x984c03d2, 0x98179855, 0x98155327 },	\
+	{ 171, 0x98402ec4, 0x984c03d6, 0x98179855, 0x98155307 },	\
+	{ 173, 0x98402ec4, 0x984c03d6, 0x98179855, 0x9815530f },	\
+	{ 184, 0x95002ccc, 0x9500491e, 0x9509be55, 0x950c0a0b },	\
+	{ 188, 0x95002ccc, 0x95004922, 0x9509be55, 0x950c0a13 },	\
+	{ 192, 0x95002ccc, 0x95004926, 0x9509be55, 0x950c0a1b },	\
+	{ 196, 0x95002ccc, 0x9500492a, 0x9509be55, 0x950c0a23 },	\
+	{ 208, 0x95002ccc, 0x9500493a, 0x9509be55, 0x950c0a13 },	\
+	{ 212, 0x95002ccc, 0x9500493e, 0x9509be55, 0x950c0a1b },	\
+	{ 216, 0x95002ccc, 0x95004982, 0x9509be55, 0x950c0a23 }
 
 #define RT3070_RF3052		\
 	{ 0xf1, 2,  2 },	\
@@ -1154,11 +1174,121 @@ static const struct rt2860_rate {
 	{ 0x61, 0,  7 },	\
 	{ 0x61, 0,  9 }
 
+#define RT5592_RF5592_20MHZ	\
+	{ 0x1e2,  4, 10, 3 },	\
+	{ 0x1e3,  4, 10, 3 },	\
+	{ 0x1e4,  4, 10, 3 },	\
+	{ 0x1e5,  4, 10, 3 },	\
+	{ 0x1e6,  4, 10, 3 },	\
+	{ 0x1e7,  4, 10, 3 },	\
+	{ 0x1e8,  4, 10, 3 },	\
+	{ 0x1e9,  4, 10, 3 },	\
+	{ 0x1ea,  4, 10, 3 },	\
+	{ 0x1eb,  4, 10, 3 },	\
+	{ 0x1ec,  4, 10, 3 },	\
+	{ 0x1ed,  4, 10, 3 },	\
+	{ 0x1ee,  4, 10, 3 },	\
+	{ 0x1f0,  8, 10, 3 },	\
+	{  0xac,  8, 12, 1 },	\
+	{  0xad,  0, 12, 1 },	\
+	{  0xad,  4, 12, 1 },	\
+	{  0xae,  0, 12, 1 },	\
+	{  0xae,  4, 12, 1 },	\
+	{  0xae,  8, 12, 1 },	\
+	{  0xaf,  4, 12, 1 },	\
+	{  0xaf,  8, 12, 1 },	\
+	{  0xb0,  0, 12, 1 },	\
+	{  0xb0,  8, 12, 1 },	\
+	{  0xb1,  0, 12, 1 },	\
+	{  0xb1,  4, 12, 1 },	\
+	{  0xb7,  4, 12, 1 },	\
+	{  0xb7,  8, 12, 1 },	\
+	{  0xb8,  0, 12, 1 },	\
+	{  0xb8,  8, 12, 1 },	\
+	{  0xb9,  0, 12, 1 },	\
+	{  0xb9,  4, 12, 1 },	\
+	{  0xba,  0, 12, 1 },	\
+	{  0xba,  4, 12, 1 },	\
+	{  0xba,  8, 12, 1 },	\
+	{  0xbb,  4, 12, 1 },	\
+	{  0xbb,  8, 12, 1 },	\
+	{  0xbc,  0, 12, 1 },	\
+	{  0xbc,  8, 12, 1 },	\
+	{  0xbd,  0, 12, 1 },	\
+	{  0xbd,  4, 12, 1 },	\
+	{  0xbe,  0, 12, 1 },	\
+	{  0xbf,  6, 12, 1 },	\
+	{  0xbf, 10, 12, 1 },	\
+	{  0xc0,  2, 12, 1 },	\
+	{  0xc0, 10, 12, 1 },	\
+	{  0xc1,  2, 12, 1 },	\
+	{  0xc1,  6, 12, 1 },	\
+	{  0xc2,  2, 12, 1 },	\
+	{  0xa4,  0, 12, 1 },	\
+	{  0xa4,  4, 12, 1 },	\
+	{  0xa5,  8, 12, 1 },	\
+	{  0xa6,  0, 12, 1 }
+
+#define RT5592_RF5592_40MHZ	\
+	{ 0xf1,  2, 10, 3 },	\
+	{ 0xf1,  7, 10, 3 },	\
+	{ 0xf2,  2, 10, 3 },	\
+	{ 0xf2,  7, 10, 3 },	\
+	{ 0xf3,  2, 10, 3 },	\
+	{ 0xf3,  7, 10, 3 },	\
+	{ 0xf4,  2, 10, 3 },	\
+	{ 0xf4,  7, 10, 3 },	\
+	{ 0xf5,  2, 10, 3 },	\
+	{ 0xf5,  7, 10, 3 },	\
+	{ 0xf6,  2, 10, 3 },	\
+	{ 0xf6,  7, 10, 3 },	\
+	{ 0xf7,  2, 10, 3 },	\
+	{ 0xf8,  4, 10, 3 },	\
+	{ 0x56,  4, 12, 1 },	\
+	{ 0x56,  6, 12, 1 },	\
+	{ 0x56,  8, 12, 1 },	\
+	{ 0x57,  0, 12, 1 },	\
+	{ 0x57,  2, 12, 1 },	\
+	{ 0x57,  4, 12, 1 },	\
+	{ 0x57,  8, 12, 1 },	\
+	{ 0x57, 10, 12, 1 },	\
+	{ 0x58,  0, 12, 1 },	\
+	{ 0x58,  4, 12, 1 },	\
+	{ 0x58,  6, 12, 1 },	\
+	{ 0x58,  8, 12, 1 },	\
+	{ 0x5b,  8, 12, 1 },	\
+	{ 0x5b, 10, 12, 1 },	\
+	{ 0x5c,  0, 12, 1 },	\
+	{ 0x5c,  4, 12, 1 },	\
+	{ 0x5c,  6, 12, 1 },	\
+	{ 0x5c,  8, 12, 1 },	\
+	{ 0x5d,  0, 12, 1 },	\
+	{ 0x5d,  2, 12, 1 },	\
+	{ 0x5d,  4, 12, 1 },	\
+	{ 0x5d,  8, 12, 1 },	\
+	{ 0x5d, 10, 12, 1 },	\
+	{ 0x5e,  0, 12, 1 },	\
+	{ 0x5e,  4, 12, 1 },	\
+	{ 0x5e,  6, 12, 1 },	\
+	{ 0x5e,  8, 12, 1 },	\
+	{ 0x5f,  0, 12, 1 },	\
+	{ 0x5f,  9, 12, 1 },	\
+	{ 0x5f, 11, 12, 1 },	\
+	{ 0x60,  1, 12, 1 },	\
+	{ 0x60,  5, 12, 1 },	\
+	{ 0x60,  7, 12, 1 },	\
+	{ 0x60,  9, 12, 1 },	\
+	{ 0x61,  1, 12, 1 },	\
+	{ 0x52,  0, 12, 1 },	\
+	{ 0x52,  4, 12, 1 },	\
+	{ 0x52,  8, 12, 1 },	\
+	{ 0x53,  0, 12, 1 }
+
 #define RT3070_DEF_RF	\
 	{  4, 0x40 },	\
 	{  5, 0x03 },	\
 	{  6, 0x02 },	\
-	{  7, 0x70 },	\
+	{  7, 0x60 },	\
 	{  9, 0x0f },	\
 	{ 10, 0x41 },	\
 	{ 11, 0x21 },	\
@@ -1172,7 +1302,7 @@ static const struct rt2860_rate {
 	{ 20, 0xba },	\
 	{ 21, 0xdb },	\
 	{ 24, 0x16 },	\
-	{ 25, 0x01 },	\
+	{ 25, 0x03 },	\
 	{ 29, 0x1f }
 
 #define RT3572_DEF_RF	\
@@ -1208,6 +1338,246 @@ static const struct rt2860_rate {
 	{ 30, 0x09 },	\
 	{ 31, 0x10 }
 
+#define RT5390_DEF_RF	\
+	{  1, 0x0f },	\
+	{  2, 0x80 },	\
+	{  3, 0x88 },	\
+	{  5, 0x10 },	\
+	{  6, 0xa0 },	\
+	{  7, 0x00 },	\
+	{ 10, 0x53 },	\
+	{ 11, 0x4a },	\
+	{ 12, 0x46 },	\
+	{ 13, 0x9f },	\
+	{ 14, 0x00 },	\
+	{ 15, 0x00 },	\
+	{ 16, 0x00 },	\
+	{ 18, 0x03 },	\
+	{ 19, 0x00 },	\
+	{ 20, 0x00 },	\
+	{ 21, 0x00 },	\
+	{ 22, 0x20 },  	\
+	{ 23, 0x00 },	\
+	{ 24, 0x00 },	\
+	{ 25, 0xc0 },	\
+	{ 26, 0x00 },	\
+	{ 27, 0x09 },	\
+	{ 28, 0x00 },	\
+	{ 29, 0x10 },	\
+	{ 30, 0x10 },	\
+	{ 31, 0x80 },	\
+	{ 32, 0x80 },	\
+	{ 33, 0x00 },	\
+	{ 34, 0x07 },	\
+	{ 35, 0x12 },	\
+	{ 36, 0x00 },	\
+	{ 37, 0x08 },	\
+	{ 38, 0x85 },	\
+	{ 39, 0x1b },	\
+	{ 40, 0x0b },	\
+	{ 41, 0xbb },	\
+	{ 42, 0xd2 },	\
+	{ 43, 0x9a },	\
+	{ 44, 0x0e },	\
+	{ 45, 0xa2 },	\
+	{ 46, 0x7b },	\
+	{ 47, 0x00 },	\
+	{ 48, 0x10 },	\
+	{ 49, 0x94 },	\
+	{ 52, 0x38 },	\
+	{ 53, 0x84 },	\
+	{ 54, 0x78 },	\
+	{ 55, 0x44 },	\
+	{ 56, 0x22 },	\
+	{ 57, 0x80 },	\
+	{ 58, 0x7f },	\
+	{ 59, 0x8f },	\
+	{ 60, 0x45 },	\
+	{ 61, 0xdd },	\
+	{ 62, 0x00 },	\
+	{ 63, 0x00 }
+
+#define RT5392_DEF_RF	\
+	{  1, 0x17 },	\
+	{  3, 0x88 },	\
+	{  5, 0x10 },	\
+	{  6, 0xe0 },	\
+	{  7, 0x00 },	\
+	{ 10, 0x53 },	\
+	{ 11, 0x4a },	\
+	{ 12, 0x46 },	\
+	{ 13, 0x9f },	\
+	{ 14, 0x00 },	\
+	{ 15, 0x00 },	\
+	{ 16, 0x00 },	\
+	{ 18, 0x03 },	\
+	{ 19, 0x4d },	\
+	{ 20, 0x00 },	\
+	{ 21, 0x8d },	\
+	{ 22, 0x20 },  	\
+	{ 23, 0x0b },	\
+	{ 24, 0x44 },	\
+	{ 25, 0x80 },	\
+	{ 26, 0x82 },	\
+	{ 27, 0x09 },	\
+	{ 28, 0x00 },	\
+	{ 29, 0x10 },	\
+	{ 30, 0x10 },	\
+	{ 31, 0x80 },	\
+	{ 32, 0x20 },	\
+	{ 33, 0xc0 },	\
+	{ 34, 0x07 },	\
+	{ 35, 0x12 },	\
+	{ 36, 0x00 },	\
+	{ 37, 0x08 },	\
+	{ 38, 0x89 },	\
+	{ 39, 0x1b },	\
+	{ 40, 0x0f },	\
+	{ 41, 0xbb },	\
+	{ 42, 0xd5 },	\
+	{ 43, 0x9b },	\
+	{ 44, 0x0e },	\
+	{ 45, 0xa2 },	\
+	{ 46, 0x73 },	\
+	{ 47, 0x0c },	\
+	{ 48, 0x10 },	\
+	{ 49, 0x94 },	\
+	{ 50, 0x94 },	\
+	{ 51, 0x3a },	\
+	{ 52, 0x48 },	\
+	{ 53, 0x44 },	\
+	{ 54, 0x38 },	\
+	{ 55, 0x43 },	\
+	{ 56, 0xa1 },	\
+	{ 57, 0x00 },	\
+	{ 58, 0x39 },	\
+	{ 59, 0x07 },	\
+	{ 60, 0x45 },	\
+	{ 61, 0x91 },	\
+	{ 62, 0x39 },	\
+	{ 63, 0x07 }
+
+#define RT5592_DEF_RF	\
+	{  1, 0x3f },	\
+	{  3, 0x08 },	\
+	{  5, 0x10 },	\
+	{  6, 0xe4 },	\
+	{  7, 0x00 },	\
+	{ 14, 0x00 },	\
+	{ 15, 0x00 },	\
+	{ 16, 0x00 },	\
+	{ 18, 0x03 },	\
+	{ 19, 0x4d },	\
+	{ 20, 0x10 },	\
+	{ 21, 0x8d },	\
+	{ 26, 0x82 },	\
+	{ 28, 0x00 },	\
+	{ 29, 0x10 },	\
+	{ 33, 0xc0 },	\
+	{ 34, 0x07 },	\
+	{ 35, 0x12 },	\
+	{ 47, 0x0c },	\
+	{ 53, 0x22 },	\
+	{ 63, 0x07 }
+
+#define RT5592_2GHZ_DEF_RF	\
+	{ 10, 0x90 },		\
+	{ 11, 0x4a },		\
+	{ 12, 0x52 },		\
+	{ 13, 0x42 },		\
+	{ 22, 0x40 },		\
+	{ 24, 0x4a },		\
+	{ 25, 0x80 },		\
+	{ 27, 0x42 },		\
+	{ 36, 0x80 },		\
+	{ 37, 0x08 },		\
+	{ 38, 0x89 },		\
+	{ 39, 0x1b },		\
+	{ 40, 0x0d },		\
+	{ 41, 0x9b },		\
+	{ 42, 0xd5 },		\
+	{ 43, 0x72 },		\
+	{ 44, 0x0e },		\
+	{ 45, 0xa2 },		\
+	{ 46, 0x6b },		\
+	{ 48, 0x10 },		\
+	{ 51, 0x3e },		\
+	{ 52, 0x48 },		\
+	{ 54, 0x38 },		\
+	{ 56, 0xa1 },		\
+	{ 57, 0x00 },		\
+	{ 58, 0x39 },		\
+	{ 60, 0x45 },		\
+	{ 61, 0x91 },		\
+	{ 62, 0x39 }
+
+#define RT5592_5GHZ_DEF_RF	\
+	{ 10, 0x97 },		\
+	{ 11, 0x40 },		\
+	{ 25, 0xbf },		\
+	{ 27, 0x42 },		\
+	{ 36, 0x00 },		\
+	{ 37, 0x04 },		\
+	{ 38, 0x85 },		\
+	{ 40, 0x42 },		\
+	{ 41, 0xbb },		\
+	{ 42, 0xd7 },		\
+	{ 45, 0x41 },		\
+	{ 48, 0x00 },		\
+	{ 57, 0x77 },		\
+	{ 60, 0x05 },		\
+	{ 61, 0x01 }
+
+#define RT5592_CHAN_5GHZ	\
+	{  36,  64, 12, 0x2e },	\
+	{ 100, 165, 12, 0x0e },	\
+	{  36,  64, 13, 0x22 },	\
+	{ 100, 165, 13, 0x42 },	\
+	{  36,  64, 22, 0x60 },	\
+	{ 100, 165, 22, 0x40 },	\
+	{  36,  64, 23, 0x7f },	\
+	{ 100, 153, 23, 0x3c },	\
+	{ 155, 165, 23, 0x38 },	\
+	{  36,  50, 24, 0x09 },	\
+	{  52,  64, 24, 0x07 },	\
+	{ 100, 153, 24, 0x06 },	\
+	{ 155, 165, 24, 0x05 },	\
+	{  36,  64, 39, 0x1c },	\
+	{ 100, 138, 39, 0x1a },	\
+	{ 140, 165, 39, 0x18 },	\
+	{  36,  64, 43, 0x5b },	\
+	{ 100, 138, 43, 0x3b },	\
+	{ 140, 165, 43, 0x1b },	\
+	{  36,  64, 44, 0x40 },	\
+	{ 100, 138, 44, 0x20 },	\
+	{ 140, 165, 44, 0x10 },	\
+	{  36,  64, 46, 0x00 },	\
+	{ 100, 138, 46, 0x18 },	\
+	{ 140, 165, 46, 0x08 },	\
+	{  36,  64, 51, 0xfe },	\
+	{ 100, 124, 51, 0xfc },	\
+	{ 126, 165, 51, 0xec },	\
+	{  36,  64, 52, 0x0c },	\
+	{ 100, 138, 52, 0x06 },	\
+	{ 140, 165, 52, 0x06 },	\
+	{  36,  64, 54, 0xf8 },	\
+	{ 100, 165, 54, 0xeb },	\
+	{ 36,   50, 55, 0x06 },	\
+	{ 52,   64, 55, 0x04 },	\
+	{ 100, 138, 55, 0x01 },	\
+	{ 140, 165, 55, 0x00 },	\
+	{  36,  50, 56, 0xd3 },	\
+	{  52, 128, 56, 0xbb },	\
+	{ 130, 165, 56, 0xab },	\
+	{  36,  64, 58, 0x15 },	\
+	{ 100, 116, 58, 0x1d },	\
+	{ 118, 165, 58, 0x15 },	\
+	{  36,  64, 59, 0x7f },	\
+	{ 100, 138, 59, 0x3f },	\
+	{ 140, 165, 59, 0x7c },	\
+	{  36,  64, 62, 0x15 },	\
+	{ 100, 116, 62, 0x1d },	\
+	{ 118, 165, 62, 0x15 }
 
 union run_stats {
 	uint32_t	raw;
diff --git a/sys/dev/usb/wlan/if_runvar.h b/sys/dev/usb/wlan/if_runvar.h
index 37ae3fa4ce1..cc6f44cc8e5 100644
--- a/sys/dev/usb/wlan/if_runvar.h
+++ b/sys/dev/usb/wlan/if_runvar.h
@@ -25,17 +25,11 @@
 
 #define RUN_MAX_RXSZ			\
 	MIN(4096, MJUMPAGESIZE)
-#if 0
-	(sizeof (uint32_t) +		\
-	 sizeof (struct rt2860_rxwi) +	\
-	 sizeof (uint16_t) +		\
-	 MCLBYTES +			\
-	 sizeof (struct rt2870_rxd))
-#endif
+
 /* NB: "11" is the maximum number of padding bytes needed for Tx */
 #define RUN_MAX_TXSZ			\
 	(sizeof (struct rt2870_txd) +	\
-	 sizeof (struct rt2860_rxwi) +	\
+	 sizeof (struct rt2860_txwi) +	\
 	 MCLBYTES + 11)
 
 #define RUN_TX_TIMEOUT	5000	/* ms */
@@ -170,7 +164,7 @@ struct run_softc {
 
 	uint16_t			mac_ver;
 	uint16_t			mac_rev;
-	uint8_t				rf_rev;
+	uint16_t			rf_rev;
 	uint8_t				freq;
 	uint8_t				ntxchains;
 	uint8_t				nrxchains;
diff --git a/sys/dev/usb/wlan/if_uath.c b/sys/dev/usb/wlan/if_uath.c
index f238d0df4fd..3645d180997 100644
--- a/sys/dev/usb/wlan/if_uath.c
+++ b/sys/dev/usb/wlan/if_uath.c
@@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -1072,8 +1073,13 @@ uath_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 		return (NULL);
 	vap = &uvp->vap;
 	/* enable s/w bmiss handling for sta mode */
-	ieee80211_vap_setup(ic, vap, name, unit, opmode,
-	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
+
+	if (ieee80211_vap_setup(ic, vap, name, unit, opmode,
+	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac) != 0) {
+		/* out of memory */
+		free(uvp, M_80211_VAP);
+		return (NULL);
+	}
 
 	/* override state transition machine */
 	uvp->newstate = vap->iv_newstate;
diff --git a/sys/dev/usb/wlan/if_upgt.c b/sys/dev/usb/wlan/if_upgt.c
index eff792222fa..6c77b3bf358 100644
--- a/sys/dev/usb/wlan/if_upgt.c
+++ b/sys/dev/usb/wlan/if_upgt.c
@@ -31,6 +31,7 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -1040,8 +1041,13 @@ upgt_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 		return NULL;
 	vap = &uvp->vap;
 	/* enable s/w bmiss handling for sta mode */
-	ieee80211_vap_setup(ic, vap, name, unit, opmode,
-	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
+
+	if (ieee80211_vap_setup(ic, vap, name, unit, opmode,
+	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac) != 0) {
+		/* out of memory */
+		free(uvp, M_80211_VAP);
+		return (NULL);
+	}
 
 	/* override state transition machine */
 	uvp->newstate = vap->iv_newstate;
diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c
index f3fa1ca2093..835139075ae 100644
--- a/sys/dev/usb/wlan/if_ural.c
+++ b/sys/dev/usb/wlan/if_ural.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -589,8 +590,13 @@ ural_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 		return NULL;
 	vap = &uvp->vap;
 	/* enable s/w bmiss handling for sta mode */
-	ieee80211_vap_setup(ic, vap, name, unit, opmode,
-	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
+
+	if (ieee80211_vap_setup(ic, vap, name, unit, opmode,
+	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac) != 0) {
+		/* out of memory */
+		free(uvp, M_80211_VAP);
+		return (NULL);
+	}
 
 	/* override state transition machine */
 	uvp->newstate = vap->iv_newstate;
@@ -1133,7 +1139,7 @@ ural_tx_mgt(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
 
 		dur = ieee80211_ack_duration(ic->ic_rt, tp->mgmtrate, 
 		    ic->ic_flags & IEEE80211_F_SHPREAMBLE);
-		*(uint16_t *)wh->i_dur = htole16(dur);
+		USETW(wh->i_dur, dur);
 
 		/* tell hardware to add timestamp for probe responses */
 		if ((wh->i_fc[0] & IEEE80211_FC0_TYPE_MASK) ==
@@ -1324,7 +1330,7 @@ ural_tx_data(struct ural_softc *sc, struct mbuf *m0, struct ieee80211_node *ni)
 
 		dur = ieee80211_ack_duration(ic->ic_rt, rate, 
 		    ic->ic_flags & IEEE80211_F_SHPREAMBLE);
-		*(uint16_t *)wh->i_dur = htole16(dur);
+		USETW(wh->i_dur, dur);
 	}
 
 	ural_setup_tx_desc(sc, &data->desc, flags, m0->m_pkthdr.len, rate);
diff --git a/sys/dev/usb/wlan/if_uralreg.h b/sys/dev/usb/wlan/if_uralreg.h
index 042cf5ace51..3554fe6fe72 100644
--- a/sys/dev/usb/wlan/if_uralreg.h
+++ b/sys/dev/usb/wlan/if_uralreg.h
@@ -197,7 +197,7 @@ struct ural_rx_desc {
 } __packed;
 
 #define RAL_RF_LOBUSY	(1 << 15)
-#define RAL_RF_BUSY	(1 << 31)
+#define RAL_RF_BUSY	(1U << 31)
 #define RAL_RF_20BIT	(20 << 24)
 
 #define RAL_RF1	0
diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c
index 184317bd3eb..511a1e135c3 100644
--- a/sys/dev/usb/wlan/if_urtw.c
+++ b/sys/dev/usb/wlan/if_urtw.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -1035,8 +1036,13 @@ urtw_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 		return (NULL);
 	vap = &uvp->vap;
 	/* enable s/w bmiss handling for sta mode */
-	ieee80211_vap_setup(ic, vap, name, unit, opmode,
-	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
+
+	if (ieee80211_vap_setup(ic, vap, name, unit, opmode,
+	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac) != 0) {
+		/* out of memory */
+		free(uvp, M_80211_VAP);
+		return (NULL);
+	}
 
 	/* override state transition machine */
 	uvp->newstate = vap->iv_newstate;
@@ -1761,7 +1767,7 @@ urtw_tx_start(struct urtw_softc *sc, struct ieee80211_node *ni, struct mbuf *m0,
 		else
 			dur = URTW_ASIFS_TIME + acktime;
 	}
-	*(uint16_t *)wh->i_dur = htole16(dur);
+	USETW(wh->i_dur, dur);
 
 	xferlen = m0->m_pkthdr.len;
 	xferlen += (sc->sc_flags & URTW_RTL8187B) ? (4 * 8) : (4 * 3);
diff --git a/sys/dev/usb/wlan/if_urtwn.c b/sys/dev/usb/wlan/if_urtwn.c
index 5f61cde9a88..de4184c24b9 100644
--- a/sys/dev/usb/wlan/if_urtwn.c
+++ b/sys/dev/usb/wlan/if_urtwn.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -138,6 +139,7 @@ static const STRUCT_USB_HOST_ID urtwn_devs[] = {
 	URTWN_DEV(REALTEK,	RTL8191CU),
 	URTWN_DEV(REALTEK,	RTL8192CE),
 	URTWN_DEV(REALTEK,	RTL8192CU),
+	URTWN_DEV(REALTEK, 	RTL8188CU_0),
 	URTWN_DEV(SITECOMEU,	RTL8188CU_1),
 	URTWN_DEV(SITECOMEU,	RTL8188CU_2),
 	URTWN_DEV(SITECOMEU,	RTL8192CU),
@@ -547,8 +549,13 @@ urtwn_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 		return (NULL);
 	vap = &uvp->vap;
 	/* enable s/w bmiss handling for sta mode */
-	ieee80211_vap_setup(ic, vap, name, unit, opmode, 
-	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
+
+	if (ieee80211_vap_setup(ic, vap, name, unit, opmode, 
+	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac) != 0) {
+		/* out of memory */
+		free(uvp, M_80211_VAP);
+		return (NULL);
+	}
 
 	/* override state transition machine */
 	uvp->newstate = vap->iv_newstate;
diff --git a/sys/dev/usb/wlan/if_urtwreg.h b/sys/dev/usb/wlan/if_urtwreg.h
index a0fe5ffd715..09dd59746e0 100644
--- a/sys/dev/usb/wlan/if_urtwreg.h
+++ b/sys/dev/usb/wlan/if_urtwreg.h
@@ -72,7 +72,7 @@
 #define	URTW_TX_HWMASK			(7 << 25)
 #define	URTW_TX_DISREQQSIZE		(1 << 28)
 #define	URTW_TX_HW_SEQNUM		(1 << 30)
-#define	URTW_TX_CWMIN			(1 << 31)
+#define	URTW_TX_CWMIN			(1U << 31)
 #define	URTW_TX_NOICV			(0x80000)
 #define	URTW_RX				0x0044		/* 4 byte  */
 #define	URTW_RX_9356SEL			(1 << 6)
@@ -106,7 +106,7 @@
 #define	URTW_MAX_RX_DMA_2048		(7 << URTW_MAX_RX_DMA_SHIFT)
 #define	URTW_MAX_RX_DMA_1024		(6)
 #define	URTW_MAX_RX_DMA_SHIFT		(10)
-#define	URTW_RCR_ONLYERLPKT		(1 << 31)
+#define	URTW_RCR_ONLYERLPKT		(1U << 31)
 #define	URTW_INT_TIMEOUT		0x0048		/* 4 byte  */
 #define	URTW_INT_TBDA			0x004c		/* 4 byte  */
 #define	URTW_EPROM_CMD			0x0050		/* 1 byte  */
@@ -330,7 +330,7 @@ struct urtw_8187b_rxhdr {
 #define	URTW_RX_FLAG_LAST	(1 << 28)
 #define	URTW_RX_FLAG_FIRST	(1 << 29)
 #define	URTW_RX_FLAG_EOR	(1 << 30)
-#define	URTW_RX_FLAG_OWN	(1 << 31)
+#define	URTW_RX_FLAG_OWN	(1U << 31)
 	uint64_t		mactime;
 	uint8_t			noise;
 	uint8_t			rssi;
@@ -367,7 +367,7 @@ struct urtw_8187b_txhdr {
 #define	URTW_TX_FLAG_LAST	(1 << 28)
 #define	URTW_TX_FLAG_FIRST	(1 << 29)
 #define	URTW_TX_FLAG_DMA	(1 << 30)
-#define	URTW_TX_FLAG_OWN	(1 << 31)
+#define	URTW_TX_FLAG_OWN	(1U << 31)
 	uint16_t		rtsdur;
 	uint16_t		len;
 #define	URTW_TX_LEN				/*  0 ~ 14 bits */
diff --git a/sys/dev/usb/wlan/if_zyd.c b/sys/dev/usb/wlan/if_zyd.c
index 3d3f2695013..504c270b0d3 100644
--- a/sys/dev/usb/wlan/if_zyd.c
+++ b/sys/dev/usb/wlan/if_zyd.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -488,9 +489,14 @@ zyd_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], int unit,
 	if (zvp == NULL)
 		return (NULL);
 	vap = &zvp->vap;
+
 	/* enable s/w bmiss handling for sta mode */
-	ieee80211_vap_setup(ic, vap, name, unit, opmode,
-	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac);
+	if (ieee80211_vap_setup(ic, vap, name, unit, opmode,
+	    flags | IEEE80211_CLONE_NOBEACONS, bssid, mac) != 0) {
+		/* out of memory */
+		free(zvp, M_80211_VAP);
+		return (NULL);
+	}
 
 	/* override state transition machine */
 	zvp->newstate = vap->iv_newstate;
diff --git a/sys/dev/usb/wlan/if_zydreg.h b/sys/dev/usb/wlan/if_zydreg.h
index 06ba2abe2bb..970a3e82dd1 100644
--- a/sys/dev/usb/wlan/if_zydreg.h
+++ b/sys/dev/usb/wlan/if_zydreg.h
@@ -1007,7 +1007,7 @@
 #define ZYD_FILTER_CTS		(1 << 28)
 #define ZYD_FILTER_ACK		(1 << 29)
 #define ZYD_FILTER_CFE		(1 << 30)
-#define ZYD_FILTER_CFE_A	(1 << 31)
+#define ZYD_FILTER_CFE_A	(1U << 31)
 
 /* helpers for register ZYD_MAC_RXFILTER */
 #define ZYD_FILTER_MONITOR	0xffffffff
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index cdd67e0bedd..993323a645e 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -99,6 +99,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
index 3276ae2ced1..3d3e714885d 100644
--- a/sys/dev/virtio/network/if_vtnet.c
+++ b/sys/dev/virtio/network/if_vtnet.c
@@ -30,6 +30,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/sockio.h>
@@ -50,6 +51,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c
index 1cab2d557d8..593d367c7e6 100644
--- a/sys/dev/vmware/vmxnet3/if_vmx.c
+++ b/sys/dev/vmware/vmxnet3/if_vmx.c
@@ -24,6 +24,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/endian.h>
 #include <sys/sockio.h>
@@ -37,6 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
@@ -1317,7 +1319,7 @@ vmxnet3_init_shared_data(struct vmxnet3_softc *sc)
 
 	/* DriverInfo */
 	ds->version = VMXNET3_DRIVER_VERSION;
-	ds->guest = VMXNET3_GOS_FREEBSD | VMXNET3_GUEST_OS_VERSION |
+	ds->guest = VMXNET3_GOS_FREEBSD |
 #ifdef __LP64__
 	    VMXNET3_GOS_64BIT;
 #else
diff --git a/sys/dev/vmware/vmxnet3/if_vmxvar.h b/sys/dev/vmware/vmxnet3/if_vmxvar.h
index 2e7d02d316b..c905eb81424 100644
--- a/sys/dev/vmware/vmxnet3/if_vmxvar.h
+++ b/sys/dev/vmware/vmxnet3/if_vmxvar.h
@@ -247,17 +247,6 @@ struct vmxnet3_softc {
  */
 #define VMXNET3_DRIVER_VERSION 0x00010000
 
-/*
- * Convert the FreeBSD version in to something the hypervisor
- * understands. This is apparently what VMware's driver reports
- * so mimic it even though it probably is not required.
- */
-#define VMXNET3_GUEST_OS_VERSION \
-   (((__FreeBSD_version / 100000) << 14)	| \
-    (((__FreeBSD_version / 1000) % 100)	<< 6 )	| \
-    (((__FreeBSD_version / 100) % 10) << 30)	| \
-    ((__FreeBSD_version % 100) << 22))
-
 /*
  * Max descriptors per Tx packet. We must limit the size of the
  * any TSO packets based on the number of segments.
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index 00e726909ff..0a1d7df2001 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -80,6 +80,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/vt/colors/vt_termcolors.c b/sys/dev/vt/colors/vt_termcolors.c
new file mode 100644
index 00000000000..e8608770875
--- /dev/null
+++ b/sys/dev/vt/colors/vt_termcolors.c
@@ -0,0 +1,80 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Aleksandr 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$
+ */
+
+#include <sys/param.h>
+
+#include <dev/vt/colors/vt_termcolors.h>
+
+static struct {
+	unsigned char r;	/* Red percentage value. */
+	unsigned char g;	/* Green percentage value. */
+	unsigned char b;	/* Blue percentage value. */
+} color_def[16] = {
+	{0,	0,	0},	/* black */
+	{0,	0,	50},	/* dark blue */
+	{0,	50,	0},	/* dark green */
+	{0,	50,	50},	/* dark cyan */
+	{50,	0,	0},	/* dark red */
+	{50,	0,	50},	/* dark magenta */
+	{50,	50,	0},	/* brown */
+	{75,	75,	75},	/* light gray */
+	{50,	50,	50},	/* dark gray */
+	{0,	0,	100},	/* light blue */
+	{0,	100,	0},	/* light green */
+	{0,	100,	100},	/* light cyan */
+	{100,	0,	0},	/* light red */
+	{100,	0,	100},	/* light magenta */
+	{100,	100,	0},	/* yellow */
+	{100,	100,	100},	/* white */
+};
+
+int
+vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax, int roffset,
+    uint32_t gmax, int goffset, uint32_t bmax, int boffset)
+{
+	int i;
+
+#define	CF(_f, _i) ((_f ## max * color_def[(_i)]._f / 100) << _f ## offset)
+	for (i = 0; i < 16; i++) {
+		switch (format) {
+		case COLOR_FORMAT_VGA:
+			palette[i] = i;
+			break;
+		case COLOR_FORMAT_RGB:
+			palette[i] = CF(r, i) | CF(g, i) | CF(b, i);
+			break;
+		default:
+			return (ENODEV);
+		}
+	}
+#undef	CF
+	return (0);
+}
diff --git a/sys/dev/vt/colors/vt_termcolors.h b/sys/dev/vt/colors/vt_termcolors.h
new file mode 100644
index 00000000000..2ae7049301d
--- /dev/null
+++ b/sys/dev/vt/colors/vt_termcolors.h
@@ -0,0 +1,50 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Aleksandr 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$
+ */
+
+enum vt_color_format {
+	COLOR_FORMAT_BW = 0,
+	COLOR_FORMAT_GRAY,
+	COLOR_FORMAT_VGA,		/* Color Index. */
+	COLOR_FORMAT_RGB,
+	COLOR_FORMAT_ARGB,
+        COLOR_FORMAT_CMYK,
+        COLOR_FORMAT_HSL,
+        COLOR_FORMAT_YUV,
+        COLOR_FORMAT_YCbCr,
+        COLOR_FORMAT_YPbPr,
+
+        COLOR_FORMAT_MAX = 15,
+};
+
+/* Helper to fill color map used by driver */
+int vt_generate_vga_palette(uint32_t *palette, int format, uint32_t rmax,
+    int roffset, uint32_t gmax, int goffset, uint32_t bmax, int boffset);
+
diff --git a/sys/dev/vt/font/vt_font_default.c b/sys/dev/vt/font/vt_font_default.c
new file mode 100644
index 00000000000..c9ceb5ccbf6
--- /dev/null
+++ b/sys/dev/vt/font/vt_font_default.c
@@ -0,0 +1,2202 @@
+/*-
+ * Copyright (c) 2011 Dimitar Toshkov Zhekov <jimmy@is-vn.bg>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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.
+ *
+ * Please contribute any changes back to <jimmy@is-vn.bg>.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <dev/vt/vt.h>
+
+static uint8_t font_bytes[1422 * 16] = {
+	0x00, 0x00, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x24, 0x7e, 0x24, 0x24,
+	0x7e, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c,
+	0x92, 0x90, 0x90, 0x7c, 0x12, 0x12, 0x92, 0x7c, 0x10, 0x10, 0x00, 0x00,
+	0x00, 0x00, 0x64, 0x94, 0x68, 0x08, 0x10, 0x10, 0x20, 0x2c, 0x52, 0x4c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x24, 0x18, 0x30, 0x4a,
+	0x44, 0x44, 0x44, 0x3a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x10, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x10, 0x08,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x08, 0x08, 0x08, 0x08,
+	0x08, 0x08, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x24, 0x18, 0x7e, 0x18, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0x10, 0x10, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10,
+	0x20, 0x20, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x46, 0x4a, 0x52, 0x62, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x18, 0x28, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42, 0x02, 0x04, 0x08,
+	0x10, 0x20, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x02, 0x1c, 0x02, 0x02, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x02, 0x06, 0x0a, 0x12, 0x22, 0x42, 0x7e, 0x02, 0x02, 0x02,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x7c, 0x02,
+	0x02, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x20,
+	0x40, 0x40, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7e, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x3c, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x04, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04,
+	0x08, 0x10, 0x20, 0x40, 0x20, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x10, 0x08, 0x04,
+	0x08, 0x10, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x42, 0x04, 0x08, 0x08, 0x00, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0x82, 0x9e, 0xa2, 0xa2, 0xa2, 0xa6, 0x9a, 0x80, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x7e,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x42,
+	0x42, 0x42, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x42, 0x42, 0x40, 0x40, 0x40, 0x40, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x44, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x44, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40,
+	0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x40, 0x40,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42, 0x40, 0x40, 0x4e,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42,
+	0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x38, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x44,
+	0x48, 0x50, 0x60, 0x60, 0x50, 0x48, 0x44, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0xc6, 0xaa, 0x92, 0x92, 0x82,
+	0x82, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42,
+	0x42, 0x62, 0x52, 0x4a, 0x46, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x7c,
+	0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x4a, 0x3c, 0x02, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x7c, 0x50, 0x48, 0x44, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x40, 0x40, 0x3c, 0x02,
+	0x02, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24,
+	0x24, 0x24, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82,
+	0x82, 0x82, 0x82, 0x92, 0x92, 0xaa, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x24, 0x24, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x44, 0x44, 0x28, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x02,
+	0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x38, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
+	0x08, 0x08, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x08,
+	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x10, 0x28, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x10, 0x08, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x3e, 0x42, 0x42, 0x42, 0x3e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x7c, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3c, 0x42, 0x40, 0x40, 0x40, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x02, 0x02, 0x02, 0x3e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42,
+	0x7e, 0x40, 0x40, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x10,
+	0x10, 0x7c, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x7c, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,
+	0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x04, 0x04, 0x00, 0x0c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x42, 0x44, 0x48,
+	0x70, 0x48, 0x44, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7c,
+	0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5e, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x7c, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x92,
+	0x92, 0x92, 0x92, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x42, 0x42, 0x24, 0x18, 0x24, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x04, 0x08,
+	0x10, 0x20, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x10,
+	0x10, 0x10, 0x20, 0x10, 0x10, 0x10, 0x10, 0x0c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x08, 0x08, 0x08, 0x04, 0x08,
+	0x08, 0x08, 0x08, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x92, 0x8c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0x92, 0x90,
+	0x90, 0x90, 0x92, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24,
+	0x20, 0x20, 0x78, 0x20, 0x20, 0x20, 0x22, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x44, 0x38, 0x44, 0x44, 0x44, 0x38, 0x44, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x44, 0x28, 0x10, 0x7c,
+	0x10, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,
+	0x10, 0x10, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x38, 0x44, 0x40, 0x30, 0x48, 0x44, 0x44, 0x24, 0x18, 0x04, 0x44,
+	0x38, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e,
+	0x81, 0x99, 0xa5, 0xa1, 0xa5, 0x99, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x38, 0x04, 0x3c, 0x44, 0x3c, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x24, 0x48,
+	0x90, 0x48, 0x24, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7e, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x81, 0xb9, 0xa5, 0xb9,
+	0xa9, 0xa5, 0x81, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x18, 0x24, 0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c,
+	0x10, 0x10, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x08,
+	0x10, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x38, 0x04, 0x18, 0x04, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x46, 0x7a, 0x40, 0x40, 0x40, 0x00,
+	0x00, 0x00, 0x7e, 0x92, 0x92, 0x92, 0x92, 0x72, 0x12, 0x12, 0x12, 0x12,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10,
+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x20, 0x00,
+	0x00, 0x10, 0x30, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x44, 0x44, 0x38, 0x00, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x90, 0x48, 0x24, 0x12, 0x24, 0x48, 0x90, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x20, 0x60, 0x20, 0x22, 0x24, 0x08, 0x10, 0x22, 0x46, 0x8a, 0x1e,
+	0x02, 0x02, 0x00, 0x00, 0x00, 0x20, 0x60, 0x20, 0x22, 0x24, 0x08, 0x10,
+	0x20, 0x4c, 0x92, 0x04, 0x08, 0x1e, 0x00, 0x00, 0x00, 0xe0, 0x10, 0x60,
+	0x12, 0xe4, 0x08, 0x10, 0x22, 0x46, 0x8a, 0x1e, 0x02, 0x02, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x00, 0x10, 0x10, 0x20, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x7e,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x3c,
+	0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x24, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x32, 0x4c, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x7e,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x3c,
+	0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x24, 0x18, 0x3c, 0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x90, 0x90, 0x90, 0xfc, 0x90,
+	0x90, 0x90, 0x90, 0x9e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x40, 0x40, 0x40, 0x40, 0x42, 0x42, 0x3c, 0x10, 0x10, 0x20, 0x00,
+	0x10, 0x08, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x78,
+	0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x00, 0x7e,
+	0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x24, 0x24, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x20, 0x10, 0x00, 0x38, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x38,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x24, 0x00, 0x38, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x00, 0x38, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x44,
+	0x42, 0x42, 0xf2, 0x42, 0x42, 0x42, 0x44, 0x78, 0x00, 0x00, 0x00, 0x00,
+	0x32, 0x4c, 0x00, 0x42, 0x42, 0x62, 0x52, 0x4a, 0x46, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x3c,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x24, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x32, 0x4c, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x3c,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x24, 0x18, 0x18, 0x24, 0x42, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x43, 0x42, 0x46, 0x4a, 0x52,
+	0x62, 0x42, 0xc2, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x08, 0x10, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x08, 0x10, 0x82, 0x82, 0x44, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x7c, 0x42, 0x42, 0x42,
+	0x42, 0x7c, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44,
+	0x44, 0x48, 0x7c, 0x42, 0x42, 0x42, 0x62, 0x5c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x08, 0x00, 0x3c, 0x02, 0x3e, 0x42, 0x42, 0x42, 0x3e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x3c, 0x02, 0x3e,
+	0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24,
+	0x00, 0x3c, 0x02, 0x3e, 0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x32, 0x4c, 0x00, 0x3c, 0x02, 0x3e, 0x42, 0x42, 0x42, 0x3e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x3c, 0x02, 0x3e,
+	0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24,
+	0x18, 0x3c, 0x02, 0x3e, 0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x12, 0x72, 0x9e, 0x90, 0x90, 0x6c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x40,
+	0x40, 0x40, 0x42, 0x3c, 0x10, 0x10, 0x20, 0x00, 0x00, 0x00, 0x10, 0x08,
+	0x00, 0x3c, 0x42, 0x42, 0x7e, 0x40, 0x40, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x10, 0x00, 0x3c, 0x42, 0x42, 0x7e, 0x40, 0x40, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x00, 0x3c, 0x42, 0x42,
+	0x7e, 0x40, 0x40, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24,
+	0x00, 0x3c, 0x42, 0x42, 0x7e, 0x40, 0x40, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x20, 0x10, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x30, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x48,
+	0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x48, 0x48, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x10, 0x28, 0x3c, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4c,
+	0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x08, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x3c, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24,
+	0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x32, 0x4c, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x3c, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x10, 0x10, 0x00, 0x7c, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x02, 0x3c, 0x46, 0x4a, 0x52, 0x62, 0x42, 0xbc,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x3c, 0x00,
+	0x00, 0x00, 0x40, 0x40, 0x40, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7c,
+	0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x42,
+	0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3c, 0x00, 0x3c, 0x02, 0x3e, 0x42, 0x42, 0x42, 0x3e,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x7e,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18,
+	0x00, 0x3c, 0x02, 0x3e, 0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42,
+	0x02, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x3e,
+	0x42, 0x42, 0x42, 0x3e, 0x02, 0x04, 0x03, 0x00, 0x08, 0x10, 0x00, 0x3c,
+	0x42, 0x42, 0x40, 0x40, 0x40, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x10, 0x00, 0x3c, 0x42, 0x40, 0x40, 0x40, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x00, 0x3c, 0x42, 0x42, 0x40, 0x40,
+	0x40, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24,
+	0x00, 0x3c, 0x42, 0x40, 0x40, 0x40, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x10, 0x10, 0x00, 0x3c, 0x42, 0x42, 0x40, 0x40, 0x40, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x3c, 0x42, 0x40,
+	0x40, 0x40, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x3c,
+	0x42, 0x42, 0x40, 0x40, 0x40, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x18, 0x00, 0x3c, 0x42, 0x40, 0x40, 0x40, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x78, 0x44, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x44, 0x78, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x02, 0x02,
+	0x02, 0x3e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x02, 0x0f, 0x02, 0x3e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x78, 0x40,
+	0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c,
+	0x00, 0x3c, 0x42, 0x42, 0x7e, 0x40, 0x40, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x24, 0x18, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x3c, 0x42, 0x42,
+	0x7e, 0x40, 0x40, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x7e,
+	0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x00, 0x3c, 0x42, 0x42, 0x7e, 0x40, 0x40, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x78, 0x40,
+	0x40, 0x40, 0x40, 0x7e, 0x02, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3c, 0x42, 0x42, 0x7e, 0x40, 0x40, 0x3c, 0x08, 0x10, 0x0c, 0x00,
+	0x18, 0x24, 0x00, 0x3c, 0x42, 0x42, 0x40, 0x4e, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x00, 0x3e, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x3c, 0x00, 0x24, 0x18, 0x00, 0x3c,
+	0x42, 0x42, 0x40, 0x4e, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x18, 0x00, 0x3e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x02, 0x3c, 0x00, 0x10, 0x10, 0x00, 0x3c, 0x42, 0x42, 0x40, 0x4e,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08,
+	0x00, 0x3e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x3c, 0x00,
+	0x00, 0x00, 0x3c, 0x42, 0x42, 0x40, 0x40, 0x4e, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x10, 0x10, 0x20, 0x00, 0x04, 0x08, 0x08, 0x00, 0x3e, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x3c, 0x00, 0x18, 0x24, 0x00, 0x42,
+	0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x0c, 0x12, 0x40, 0x40, 0x40, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0xff, 0x42, 0x42, 0x7e, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf8,
+	0x40, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x32, 0x4c, 0x00, 0x38, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x34, 0x58, 0x00, 0x30, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x38, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x78, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x38, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x30,
+	0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x38, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x10, 0x20, 0x18, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x30, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x38, 0x10, 0x20, 0x18, 0x00, 0x10, 0x10, 0x00, 0x38,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe7, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x52, 0x52, 0xec, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42,
+	0x00, 0xc6, 0x42, 0x42, 0x42, 0x42, 0x42, 0xe2, 0x12, 0x12, 0x0c, 0x00,
+	0x0c, 0x12, 0x00, 0x0e, 0x04, 0x04, 0x04, 0x04, 0x04, 0x44, 0x44, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12, 0x00, 0x0c, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x42, 0x44,
+	0x48, 0x50, 0x60, 0x60, 0x50, 0x48, 0x44, 0x42, 0x00, 0x10, 0x10, 0x20,
+	0x00, 0x00, 0x40, 0x40, 0x40, 0x42, 0x44, 0x48, 0x70, 0x48, 0x44, 0x42,
+	0x00, 0x10, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x44, 0x48,
+	0x70, 0x48, 0x44, 0x42, 0x00, 0x00, 0x00, 0x00, 0x20, 0x40, 0x00, 0x40,
+	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x08, 0x10, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+	0x40, 0x40, 0x40, 0x7e, 0x00, 0x10, 0x10, 0x20, 0x00, 0x00, 0x30, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x10, 0x10, 0x20,
+	0x24, 0x18, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x48, 0x30, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40,
+	0x40, 0x40, 0x44, 0x44, 0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x30, 0x10, 0x10, 0x10, 0x11, 0x11, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x60, 0xc0,
+	0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x10,
+	0x10, 0x10, 0x18, 0x30, 0x10, 0x10, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x08, 0x10, 0x42, 0x42, 0x42, 0x62, 0x52, 0x4a, 0x46, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x7c, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42,
+	0x42, 0x62, 0x52, 0x4a, 0x46, 0x42, 0x42, 0x42, 0x00, 0x10, 0x10, 0x20,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x00, 0x10, 0x10, 0x20, 0x24, 0x18, 0x42, 0x42, 0x42, 0x62, 0x52, 0x4a,
+	0x46, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18,
+	0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x40, 0x40, 0x80, 0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x62, 0x52, 0x4a,
+	0x46, 0x42, 0x42, 0x42, 0x02, 0x02, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x02, 0x02, 0x0c, 0x00,
+	0x3c, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x3c, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x3c,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x18, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x12, 0x24, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x24,
+	0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7e, 0x90, 0x90, 0x90, 0x9c, 0x90, 0x90, 0x90, 0x90, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x92, 0x92,
+	0x9e, 0x90, 0x90, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x7c,
+	0x42, 0x42, 0x42, 0x7c, 0x50, 0x48, 0x44, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x10, 0x00, 0x5e, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x7c,
+	0x50, 0x48, 0x44, 0x42, 0x00, 0x10, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x5e, 0x60, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x40, 0x40, 0x80,
+	0x24, 0x18, 0x00, 0x7c, 0x42, 0x42, 0x42, 0x7c, 0x50, 0x48, 0x44, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x5e, 0x60, 0x40,
+	0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x3c,
+	0x42, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x04, 0x08, 0x00, 0x3e, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x00, 0x3c, 0x42, 0x40, 0x40, 0x3c,
+	0x02, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24,
+	0x00, 0x3e, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x42, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x42, 0x42, 0x3c,
+	0x10, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x40, 0x40,
+	0x3c, 0x02, 0x02, 0x7c, 0x10, 0x10, 0x20, 0x00, 0x24, 0x18, 0x00, 0x3c,
+	0x42, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x18, 0x00, 0x3e, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x08, 0x08, 0x10, 0x00, 0x00, 0x00, 0x10, 0x10,
+	0x10, 0x7c, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0e, 0x04, 0x04, 0x08, 0x00,
+	0x24, 0x18, 0x00, 0xfe, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x10, 0x10, 0x7c, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x0e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x10,
+	0x10, 0x10, 0x7c, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x10, 0x7c, 0x10, 0x38, 0x10, 0x10, 0x10, 0x0e,
+	0x00, 0x00, 0x00, 0x00, 0x32, 0x4c, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4c,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	0x3c, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x18, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x18, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24,
+	0x18, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00,
+	0x12, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x24, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x08, 0x10, 0x0c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x04, 0x03, 0x00, 0x18, 0x24, 0x00, 0x82, 0x82, 0x82, 0x82, 0x92,
+	0x92, 0xaa, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24,
+	0x00, 0x82, 0x82, 0x92, 0x92, 0x92, 0x92, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x44, 0x44, 0x00, 0x82, 0x82, 0x44, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x7e, 0x02, 0x04, 0x08, 0x10,
+	0x20, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10,
+	0x00, 0x7e, 0x04, 0x08, 0x10, 0x20, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x10, 0x10, 0x00, 0x7e, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x40, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x7e, 0x04, 0x08,
+	0x10, 0x20, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x7e,
+	0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x18, 0x00, 0x7e, 0x04, 0x08, 0x10, 0x20, 0x40, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x02, 0x02, 0x02, 0x02, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7e, 0x02, 0x02, 0x02, 0x1e, 0x02, 0x02, 0x02, 0x02, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x02, 0x02, 0x7e, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x40, 0x38, 0x40, 0x40, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x0c, 0x12, 0x10, 0x10, 0x7c, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x90, 0x60, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x62, 0x52, 0x4a,
+	0x46, 0x42, 0x42, 0x42, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x02, 0x02, 0x02, 0x00,
+	0x00, 0x00, 0x7e, 0x02, 0x04, 0x08, 0x1c, 0x02, 0x02, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x40, 0x40, 0x3c, 0x02,
+	0x02, 0x42, 0x42, 0x3c, 0x00, 0x10, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3e, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x7c, 0x00, 0x10, 0x10, 0x20,
+	0x00, 0x00, 0xfe, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x10, 0x10, 0x20, 0x00, 0x00, 0x10, 0x10, 0x10, 0x7c, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x0e, 0x00, 0x04, 0x04, 0x08, 0x7c, 0x00, 0x82, 0x82,
+	0x44, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3c, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3c, 0x42, 0x02, 0x02, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42, 0x7e, 0x02, 0x02, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x02, 0x02,
+	0x7e, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3c, 0x42, 0x40, 0x38, 0x40, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x02, 0x04,
+	0x08, 0x1c, 0x02, 0x02, 0x42, 0x42, 0x3c, 0x00, 0x08, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x08, 0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x04, 0x03, 0x00,
+	0x32, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x12, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00,
+	0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x24, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x3c, 0x42,
+	0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x7e, 0x40, 0x40, 0x40, 0x78, 0x40,
+	0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x42, 0x42,
+	0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x40, 0x80, 0x38, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x82,
+	0x82, 0x44, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x40, 0x80, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x24, 0x66,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x48, 0x48, 0x00, 0x30, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40,
+	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x28, 0x28, 0x44, 0x44, 0x44, 0x82, 0x82, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x5a, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,
+	0x28, 0x28, 0x44, 0x44, 0x44, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40,
+	0x20, 0x10, 0x08, 0x08, 0x10, 0x20, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x7c, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x7c, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x24, 0x24, 0x66, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x10, 0x00, 0x3a, 0x46, 0x44, 0x44, 0x44, 0x46, 0x3a,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x3c, 0x42, 0x40,
+	0x38, 0x40, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10,
+	0x00, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x02, 0x02, 0x02, 0x00,
+	0x00, 0x00, 0x08, 0x10, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0c,
+	0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x00, 0x24, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3a, 0x46, 0x44, 0x44, 0x44, 0x46, 0x3a, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x38, 0x44, 0x44, 0x48, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x7c,
+	0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x44,
+	0x44, 0x28, 0x28, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x3e, 0x10,
+	0x08, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7e, 0x04, 0x08, 0x10, 0x20, 0x40, 0x40, 0x40, 0x40, 0x3c,
+	0x02, 0x02, 0x04, 0x00, 0x00, 0x00, 0x38, 0x44, 0x44, 0x44, 0x7c, 0x44,
+	0x44, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x20, 0x20, 0x10, 0x10, 0x28, 0x28, 0x44, 0x44, 0x82, 0x82,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x40, 0x40, 0x40, 0x3c, 0x40,
+	0x40, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7e, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7c,
+	0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x40,
+	0x40, 0x40, 0x40, 0x3c, 0x02, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3e, 0x44, 0x44, 0x44, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x4c, 0x92, 0x92, 0x92, 0x92, 0x92, 0x7c, 0x10, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x24,
+	0x24, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x7c, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x44, 0x82, 0x92, 0x92, 0x92, 0x92, 0x6c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x48, 0x48, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x0c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x10, 0x00, 0x44, 0x82, 0x92, 0x92, 0x92, 0x92, 0x6c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x7e, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x20,
+	0x20, 0x3c, 0x22, 0x22, 0x22, 0x22, 0x22, 0x24, 0x00, 0x00, 0x00, 0x00,
+	0x08, 0x10, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x40, 0x40, 0x78, 0x40,
+	0x40, 0x40, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x50,
+	0x90, 0x9c, 0x92, 0x92, 0x92, 0x92, 0x92, 0x9c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x90, 0x90, 0x90, 0x9c, 0xf2, 0x92, 0x92, 0x92, 0x92, 0x9c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x20, 0x20, 0x3c, 0x22, 0x22,
+	0x22, 0x22, 0x22, 0x22, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x42, 0x44,
+	0x48, 0x50, 0x60, 0x60, 0x50, 0x48, 0x44, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x10, 0x08, 0x42, 0x42, 0x42, 0x46, 0x4a, 0x52, 0x62, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x02, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7e, 0x18, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0x40, 0x40, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x44, 0x44, 0x44, 0x44, 0x44,
+	0x44, 0x44, 0x44, 0xfe, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x92,
+	0x92, 0x54, 0x38, 0x54, 0x92, 0x92, 0x92, 0x92, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x42, 0x42, 0x42, 0x46, 0x4a, 0x52, 0x62, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x42, 0x42, 0x42, 0x46, 0x4a, 0x52,
+	0x62, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x12,
+	0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x02, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x7c, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x7c, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3f, 0x01, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x02, 0x02,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x92,
+	0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x7f, 0x01, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0xc0, 0x40, 0x40, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x82, 0xf2, 0x8a, 0x8a,
+	0x8a, 0x8a, 0x8a, 0xf2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x02, 0x02, 0x1e, 0x02, 0x02, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x8c, 0x92, 0x92, 0x92, 0x92, 0xf2, 0x92, 0x92, 0x92, 0x8c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x0a, 0x12, 0x22, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x40,
+	0x40, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x38, 0x44, 0x44, 0x48, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40, 0x40,
+	0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x92, 0x92, 0x54, 0x38, 0x54, 0x92, 0x92, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x02, 0x1c, 0x02, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x22, 0x22,
+	0x22, 0x22, 0x22, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x82, 0xc6, 0xaa, 0x92, 0x82, 0x82, 0x82, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x10, 0x7c, 0x92, 0x92, 0x92, 0x92, 0x92, 0x7c, 0x10, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3f,
+	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42,
+	0x3e, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x92, 0x92, 0x92, 0x92, 0x92, 0x7f,
+	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x3c,
+	0x22, 0x22, 0x22, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x82, 0x82, 0xf2, 0x8a, 0x8a, 0x8a, 0xf2, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x78, 0x44, 0x44, 0x44, 0x78,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x02,
+	0x1e, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x8c, 0x92, 0x92, 0xf2, 0x92, 0x92, 0x8c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x42, 0x42, 0x3e, 0x12, 0x22, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0xf8, 0x40, 0x7c, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x42, 0x02, 0x02, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x10,
+	0x00, 0x7e, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x40, 0x78, 0x40, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x90, 0x9c,
+	0x92, 0x92, 0x92, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x90, 0x90, 0x9c, 0xf2, 0x92, 0x92, 0x9c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x08, 0x10, 0x00, 0x42, 0x44, 0x48, 0x70, 0x48, 0x44, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x18, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7e, 0x18, 0x18, 0x00, 0x00,
+	0x02, 0x02, 0x7e, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x7e, 0x40, 0x40,
+	0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40,
+	0x40, 0x40, 0xf8, 0x40, 0x40, 0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40, 0x40, 0xf8, 0x40, 0x40, 0x40,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x40, 0x7c,
+	0x42, 0x42, 0x42, 0x42, 0x02, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7e, 0x40, 0x40, 0x78, 0x44, 0x44, 0x44, 0x04, 0x08, 0x00, 0x00,
+	0x00, 0x00, 0x92, 0x92, 0x92, 0x54, 0x38, 0x54, 0x92, 0x92, 0x92, 0x93,
+	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x92, 0x54,
+	0x38, 0x54, 0x92, 0x93, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x02, 0x1c, 0x02, 0x02, 0x42, 0x42, 0x3c, 0x10, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x02, 0x1c, 0x02, 0x42, 0x3c,
+	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x42, 0x44, 0x48, 0x50, 0x60, 0x60,
+	0x50, 0x48, 0x44, 0x43, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x42, 0x44, 0x48, 0x70, 0x48, 0x44, 0x43, 0x01, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0x42, 0x42, 0x54, 0x58, 0x70, 0x70, 0x58, 0x54, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x54, 0x58,
+	0x70, 0x58, 0x54, 0x42, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0x44,
+	0x48, 0x50, 0x60, 0x60, 0x50, 0x48, 0x44, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc2, 0x44, 0x48, 0x70, 0x48, 0x44, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x7e, 0x42,
+	0x42, 0x42, 0x42, 0x43, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x43, 0x01, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0x47, 0x44, 0x44, 0x44, 0x7c, 0x44, 0x44, 0x44, 0x44, 0x44,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x47, 0x44, 0x44,
+	0x7c, 0x44, 0x44, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42,
+	0x42, 0x40, 0x40, 0x40, 0x40, 0x42, 0x42, 0x3c, 0x10, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x40, 0x40, 0x40, 0x42, 0x3c,
+	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x82, 0x82, 0x44, 0x44, 0x28, 0x10,
+	0x7c, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x82, 0x82, 0x44, 0x44, 0x28, 0x28, 0x10, 0x7c, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x24, 0x24, 0x42, 0x43,
+	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x24,
+	0x18, 0x24, 0x42, 0x43, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x02, 0x03, 0x01, 0x01, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x03,
+	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x4a, 0x4a, 0x3e,
+	0x0a, 0x0a, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x42, 0x4a, 0x4a, 0x3e, 0x0a, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x40, 0x40, 0x40, 0x40, 0x7c, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x40, 0x7c,
+	0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x3c,
+	0x42, 0x02, 0x02, 0x7e, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x24, 0x00, 0x3c, 0x02, 0x02, 0x7e, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x44, 0x44, 0x00, 0x92, 0x92, 0x92, 0x54, 0x38,
+	0x54, 0x92, 0x92, 0x92, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x44,
+	0x00, 0x92, 0x92, 0x54, 0x38, 0x54, 0x92, 0x92, 0x00, 0x00, 0x00, 0x00,
+	0x24, 0x24, 0x00, 0x3c, 0x42, 0x42, 0x02, 0x1c, 0x02, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x3c, 0x42, 0x02,
+	0x1c, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x42, 0x42,
+	0x42, 0x46, 0x4a, 0x52, 0x62, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x24, 0x24, 0x00, 0x42, 0x42, 0x42, 0x46, 0x4a, 0x52, 0x62, 0x42, 0x42,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42,
+	0x7e, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x3c,
+	0x42, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x24, 0x00, 0x3c, 0x42, 0x42, 0x7e, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x3c, 0x42, 0x02, 0x02, 0x1e,
+	0x02, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24,
+	0x00, 0x3c, 0x42, 0x02, 0x1e, 0x02, 0x42, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x3c, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x02, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x02, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x12, 0x24, 0x00, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x12, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x02, 0x3c, 0x00, 0x24, 0x24, 0x00, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x24,
+	0x00, 0x42, 0x42, 0x42, 0x3e, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00,
+	0x48, 0x48, 0x00, 0x82, 0x82, 0x82, 0xf2, 0x8a, 0x8a, 0x8a, 0x8a, 0xf2,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x48, 0x00, 0x82, 0x82, 0xf2,
+	0x8a, 0x8a, 0x8a, 0xf2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x44,
+	0x48, 0x50, 0x60, 0x60, 0x50, 0x48, 0x44, 0x42, 0x00, 0x3c, 0x00, 0x00,
+	0x00, 0x00, 0x40, 0x40, 0x40, 0x42, 0x44, 0x48, 0x70, 0x48, 0x44, 0x42,
+	0x00, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x78, 0x40,
+	0x40, 0x40, 0x40, 0x7e, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3c, 0x42, 0x42, 0x7e, 0x40, 0x40, 0x3c, 0x00, 0x10, 0x10, 0x00,
+	0x32, 0x4c, 0x00, 0x7e, 0x40, 0x40, 0x40, 0x78, 0x40, 0x40, 0x40, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4c, 0x00, 0x3c, 0x42, 0x42,
+	0x7e, 0x40, 0x40, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38, 0x00, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x00, 0x30, 0x10, 0x10, 0x10, 0x10, 0x10, 0x38,
+	0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3c, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c, 0x00, 0x10, 0x10, 0x00,
+	0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x3e, 0x00, 0x08, 0x08, 0x00, 0x64, 0x98, 0x00, 0x82,
+	0x82, 0x44, 0x44, 0x28, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x32, 0x4c, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3e,
+	0x02, 0x02, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7e, 0x00, 0x7e, 0x00, 0x08, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x08,
+	0x10, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x08, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x24, 0x24,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x12, 0x12, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x24, 0x48, 0x00, 0x00, 0x00, 0x00, 0x48, 0x48, 0x24,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x7c, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0x10, 0x10, 0x10,
+	0x10, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x92, 0x92,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0xa8, 0x50, 0x10, 0x20, 0x20,
+	0x40, 0x54, 0xaa, 0x94, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10,
+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x24, 0x24, 0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x10,
+	0x20, 0x10, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x20, 0x10, 0x08, 0x04, 0x08, 0x10, 0x20, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x24, 0x00, 0x24, 0x24,
+	0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x24, 0x24,
+	0x24, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xf0, 0x88, 0x88, 0x88, 0xf4, 0x84, 0x8e, 0x84, 0x84, 0x82,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x22, 0x40, 0xf8, 0x40,
+	0xf8, 0x40, 0x22, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x10,
+	0x10, 0x1c, 0x70, 0x1c, 0x70, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x96, 0x96, 0x96, 0xd0, 0xf0, 0xf0, 0xb0, 0x96, 0x90, 0x96,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb, 0x55, 0x55, 0x51, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x20, 0x40, 0xfe, 0x40, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x38, 0x54, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x04, 0xfe,
+	0x04, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x54, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x42, 0xff, 0x42, 0x24, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x54, 0x10, 0x10, 0x10,
+	0x10, 0x54, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38,
+	0x54, 0x10, 0x10, 0x10, 0x54, 0x38, 0x10, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x22, 0x42, 0xfe, 0x40, 0x20,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x7e, 0xc0,
+	0x7e, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38,
+	0x6c, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xfc, 0x06, 0xfc, 0x08, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x6c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x24, 0x7e, 0xc3, 0x7e, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x38, 0x6c, 0x28, 0x28, 0x28, 0x28, 0x6c, 0x38, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x02, 0x02, 0x02, 0x7e,
+	0x02, 0x02, 0x02, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x04,
+	0x7c, 0x8a, 0x92, 0x92, 0xa2, 0x7c, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1e, 0x20, 0x40, 0x40, 0x7e, 0x40, 0x40, 0x20, 0x1e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x20, 0x40, 0x7e,
+	0x40, 0x20, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x06, 0x04, 0x04, 0x04, 0x04, 0x44, 0x44, 0x44, 0x24, 0x14, 0x0c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x92, 0x92,
+	0x92, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x40, 0x40, 0x40, 0x40, 0x40, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x28, 0x28, 0x44, 0x44, 0x82, 0x82,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x82, 0x82, 0x44, 0x44,
+	0x28, 0x28, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x3c, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x32, 0x4c, 0x00,
+	0x32, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x02, 0x7e, 0x08, 0x10, 0x7e, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x7e, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x08, 0x10, 0x20, 0x10,
+	0x08, 0x04, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
+	0x10, 0x08, 0x04, 0x08, 0x10, 0x20, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x44, 0x82, 0x82, 0x82, 0x82, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x40, 0x40,
+	0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x12,
+	0x12, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x90, 0x90, 0x60,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x88, 0x88, 0xf8,
+	0x88, 0x88, 0x88, 0x00, 0x1f, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00,
+	0x00, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf8, 0x00, 0x1f, 0x10, 0x1c, 0x10,
+	0x10, 0x10, 0x00, 0x00, 0x00, 0x88, 0x88, 0x50, 0x50, 0x20, 0x20, 0x00,
+	0x1f, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0xf8, 0x80, 0xe0,
+	0x80, 0x80, 0x80, 0x00, 0x1f, 0x10, 0x1c, 0x10, 0x10, 0x10, 0x00, 0x00,
+	0x00, 0x70, 0x88, 0x80, 0x80, 0x88, 0x70, 0x00, 0x1e, 0x11, 0x11, 0x1e,
+	0x12, 0x11, 0x00, 0x00, 0x00, 0x88, 0xc8, 0xa8, 0x98, 0x88, 0x88, 0x00,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa,
+	0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x00,
+	0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 0x10, 0x00,
+	0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x18, 0x00,
+	0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1f, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f,
+	0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xf0, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f,
+	0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xf0,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8,
+	0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f, 0x1f, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f,
+	0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x1f, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xf0,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0xf0, 0xf0, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xf8,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xf8,
+	0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+	0xf0, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x1f, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff, 0xf0, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff,
+	0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
+	0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0xff, 0xf0, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff, 0x1f, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff,
+	0xff, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xf0, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1f, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff,
+	0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0xff, 0x1f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x10, 0x10, 0x10,
+	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff,
+	0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0x1f, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff,
+	0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x10,
+	0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3f, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x20, 0x2f, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x10,
+	0xf0, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xf8, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x08, 0xe8, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f, 0x10,
+	0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x20, 0x3f, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xf0, 0x10,
+	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0xe8, 0x08, 0xf8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f, 0x10,
+	0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x2f, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x2f, 0x20, 0x2f, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xf0, 0x10,
+	0xf0, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0xe8, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0xe8, 0x08, 0xe8, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00,
+	0xff, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xef, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff, 0x00,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0xef, 0x00, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0xff, 0x10,
+	0xff, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0xff, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0xef, 0x00, 0xef, 0x28, 0x28, 0x28,
+	0x28, 0x28, 0x28, 0x28, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+	0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0x0f, 0x0f, 0x0f, 0x0f,
+	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+	0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22, 0x88, 0x22,
+	0x88, 0x22, 0x88, 0x22, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55,
+	0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xee, 0xbb, 0xee, 0xbb,
+	0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb, 0xee, 0xbb,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xf0, 0xf0, 0xf0,
+	0xf0, 0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0xf0, 0xf0, 0xf0, 0xf0,
+	0xf0, 0xf0, 0xf0, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x0f, 0x0f, 0x0f,
+	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x0f, 0x0f, 0x0f,
+	0x0f, 0x0f, 0x0f, 0x0f, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0,
+	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x3c, 0x3c,
+	0x3c, 0x3c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x7e, 0x7e, 0x7e, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38,
+	0x7c, 0x7c, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xc0, 0xf0, 0xfc, 0xff, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe, 0x7c, 0x7c, 0x38, 0x38, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x3f, 0xff,
+	0x3f, 0x0f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x10, 0x38, 0x7c, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x10, 0x28, 0x44, 0x82, 0x44, 0x28, 0x10, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x24,
+	0x24, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xe7, 0xc3, 0xc3, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe7, 0xdb, 0xdb, 0xe7, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x7c, 0x82, 0xaa, 0x82, 0x82, 0xba,
+	0x92, 0x82, 0x82, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xfe,
+	0xd6, 0xfe, 0xfe, 0xc6, 0xee, 0xfe, 0xfe, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x10, 0x92, 0x54, 0x38, 0xee, 0x38, 0x54, 0x92, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x44, 0x44, 0x44, 0x44, 0x38,
+	0x10, 0x7c, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x06,
+	0x0a, 0x12, 0x38, 0x44, 0x44, 0x44, 0x44, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x10, 0x38, 0x7c, 0xfe, 0xfe, 0x7c, 0x10, 0x10, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x38, 0x10, 0x54, 0xfe,
+	0xfe, 0x54, 0x10, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0xfe, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3e, 0x22, 0x3e, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0xc0,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x42, 0x7e, 0x42, 0x42, 0x42,
+	0x42, 0x42, 0x42, 0x44, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0xfe, 0x6c, 0x6c,
+	0xfe, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x7c,
+	0xd6, 0xd0, 0xd0, 0x7c, 0x16, 0x16, 0xd6, 0x7c, 0x10, 0x10, 0x00, 0x00,
+	0x00, 0x00, 0x66, 0xd6, 0x6c, 0x0c, 0x18, 0x18, 0x30, 0x36, 0x6b, 0x66,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x6c, 0x38, 0x76, 0xdc,
+	0xcc, 0xcc, 0xdc, 0x76, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x0c, 0x18, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x18, 0x0c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x0c, 0x0c, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x6c, 0x38, 0xfe, 0x38, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x06, 0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x60, 0x60,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xce, 0xde, 0xf6,
+	0xe6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38,
+	0x78, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x3c, 0x06,
+	0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0e,
+	0x1e, 0x36, 0x66, 0xc6, 0xfe, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xfc, 0x06, 0x06, 0x06, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x60, 0xc0, 0xc0, 0xfc, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06,
+	0x06, 0x0c, 0x0c, 0x18, 0x18, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x06, 0x0c, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x18, 0x18,
+	0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x18, 0x30, 0x60,
+	0x30, 0x18, 0x0c, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xfe, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x60, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x60,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0x0c, 0x18,
+	0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
+	0xce, 0xd6, 0xd6, 0xd6, 0xd6, 0xce, 0xc0, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xfc, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
+	0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xf8, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xcc, 0xf8,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xf8, 0xc0,
+	0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0,
+	0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x1e, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0x78,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xcc, 0xd8, 0xf0, 0xf0,
+	0xd8, 0xcc, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0,
+	0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x82, 0xc6, 0xee, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xe6, 0xf6, 0xde,
+	0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xde, 0x7c, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xfc, 0xf0, 0xd8, 0xcc, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x6c, 0x38, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6,
+	0xfe, 0xee, 0xc6, 0x82, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
+	0x6c, 0x6c, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xc3, 0xc3, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x0c, 0x18, 0x30,
+	0x60, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x30,
+	0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x60, 0x60, 0x30, 0x30, 0x18, 0x18, 0x0c, 0x0c, 0x06, 0x06,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+	0x0c, 0x0c, 0x0c, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x66,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xfe, 0x00, 0x00, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7c, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0,
+	0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06,
+	0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc0, 0xc0, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x30, 0x30, 0xfc, 0x30, 0x30,
+	0x30, 0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x7c, 0x00,
+	0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06,
+	0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x66, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xfc, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0xc0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xde, 0xf0, 0xe0,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7e, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0x1e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x6c,
+	0x38, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x7c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x30, 0x30, 0x30, 0x60, 0x30,
+	0x30, 0x30, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x70, 0x18, 0x18, 0x18, 0x0c, 0x18, 0x18, 0x18, 0x18, 0x70,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0xdb, 0xce, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
+	0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x10, 0x10, 0x7c, 0xd6, 0xd0, 0xd0, 0xd0, 0xd6, 0x7c,
+	0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x60, 0x60, 0xf8, 0x60,
+	0x60, 0x60, 0x66, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x66, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xc3, 0xc3, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x7e, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x60,
+	0x38, 0x6c, 0x66, 0x66, 0x36, 0x1c, 0x06, 0x66, 0x3c, 0x00, 0x00, 0x00,
+	0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x06, 0x3e, 0x66, 0x3e, 0x00, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x1b, 0x36, 0x6c, 0xd8, 0x6c, 0x36, 0x1b, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e,
+	0x18, 0x18, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x18,
+	0x30, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x78, 0x0c, 0x38, 0x0c, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xce, 0xf6, 0xc0, 0xc0, 0xc0, 0x00,
+	0x00, 0x00, 0x7e, 0xd6, 0xd6, 0xd6, 0xd6, 0x76, 0x16, 0x16, 0x16, 0x16,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x60, 0x00, 0x00, 0x18, 0x38, 0x18,
+	0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3c, 0x66, 0x66, 0x66, 0x3c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0x6c, 0x36,
+	0x1b, 0x36, 0x6c, 0xd8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xe0, 0x62,
+	0x66, 0x6c, 0x18, 0x30, 0x66, 0xce, 0x9a, 0x3e, 0x06, 0x06, 0x00, 0x00,
+	0x00, 0x60, 0xe0, 0x62, 0x66, 0x6c, 0x18, 0x30, 0x60, 0xdc, 0xb6, 0x0c,
+	0x18, 0x3e, 0x00, 0x00, 0x00, 0xe0, 0x30, 0x62, 0x36, 0xec, 0x18, 0x30,
+	0x66, 0xce, 0x9a, 0x3e, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30,
+	0x00, 0x30, 0x30, 0x60, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x30, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c,
+	0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38, 0x7c,
+	0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7e, 0xd8, 0xd8, 0xd8, 0xfe, 0xd8, 0xd8, 0xd8, 0xd8, 0xde,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0xc0, 0xc0,
+	0xc0, 0xc6, 0xc6, 0x7c, 0x30, 0x30, 0x60, 0x00, 0x30, 0x18, 0x00, 0xfe,
+	0xc0, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x30, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xf8,
+	0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0xfe,
+	0xc0, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x30, 0x18, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0x3c,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x66, 0x66, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x6c, 0x66, 0x66, 0xf6, 0x66,
+	0x66, 0x66, 0x6c, 0x78, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0xc6,
+	0xc6, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x30, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c,
+	0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0x6c, 0x38, 0x38, 0x6c, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc7, 0xc6, 0xce, 0xde, 0xf6, 0xe6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0xc3, 0xc3,
+	0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc, 0xcc, 0xc8, 0xfc, 0xc6,
+	0xc6, 0xc6, 0xe6, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18,
+	0x00, 0x7c, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x30, 0x00, 0x7c, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c, 0x06, 0x7e,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc,
+	0x00, 0x7c, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38, 0x7c, 0x06, 0x7e,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x6c, 0x16, 0x16, 0x7e, 0xd0, 0xd0, 0x6c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c,
+	0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x30, 0x18, 0x00, 0x7c, 0xc6, 0xc6,
+	0xfe, 0xc0, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30,
+	0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc0, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc0, 0xc0, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6,
+	0xfe, 0xc0, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18,
+	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x0c, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0x38, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c,
+	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x68, 0x30, 0x58, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0xfc, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18,
+	0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc,
+	0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e,
+	0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3d, 0x67, 0x6e, 0x7e, 0x76, 0xe6, 0xbc, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x30, 0x18, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c,
+	0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x7c, 0x00, 0x00, 0x00, 0xc0, 0xc0,
+	0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0xc0, 0x00,
+	0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x06, 0x7c, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
+	0x00, 0x7c, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0x06, 0x7e,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x0c, 0x07, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x0c, 0x07, 0x00, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0xc0,
+	0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30,
+	0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc0,
+	0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7c,
+	0xc6, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x18, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0xc0,
+	0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38,
+	0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x38, 0x00, 0xf8, 0xcc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xcc, 0xf8,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x06, 0x06, 0x06, 0x7e, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x1f,
+	0x06, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x7c, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6,
+	0xfe, 0xc0, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x00, 0xfe,
+	0xc0, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc0, 0xc0, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xf8,
+	0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
+	0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc0, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe,
+	0x06, 0x0c, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6,
+	0xfe, 0xc0, 0xc0, 0x7c, 0x18, 0x30, 0x1c, 0x00, 0x38, 0x6c, 0x00, 0x7c,
+	0xc6, 0xc6, 0xc0, 0xde, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x38, 0x6c, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x06, 0x7c, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0xde,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38,
+	0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x7c, 0x00,
+	0x18, 0x18, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0xde, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x7c, 0x00, 0x00, 0x00, 0x7c, 0xc6,
+	0xc6, 0xc0, 0xc0, 0xde, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x30, 0x30, 0x60,
+	0x00, 0x0c, 0x18, 0x18, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x06, 0x7c, 0x00, 0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x36, 0xc0, 0xc0,
+	0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x66, 0xff, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x66, 0x66,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf8, 0x60, 0x7c, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x3c,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x76, 0xdc, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
+	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x38, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x00, 0x38, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x18, 0x30, 0x1c, 0x00,
+	0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+	0x18, 0x30, 0x1c, 0x00, 0x18, 0x18, 0x00, 0x3c, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xcf, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xf6, 0xf6, 0xdc,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x00, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x36, 0x36, 0x1c, 0x00, 0x1c, 0x36, 0x00, 0x1e,
+	0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x0e, 0x1b, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xcc, 0xd8, 0xf0, 0xf0,
+	0xd8, 0xcc, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x60, 0x00, 0x00, 0xc0, 0xc0,
+	0xc0, 0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0xc6, 0x00, 0x30, 0x30, 0x60,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
+	0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x00, 0x38,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe,
+	0x00, 0x30, 0x30, 0x60, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x30, 0x6c, 0x38, 0xc0, 0xc0,
+	0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x38, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xcc, 0xcc,
+	0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18,
+	0x18, 0x18, 0x1b, 0x1b, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x70, 0xe0, 0x60, 0x60, 0x60, 0x7f,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x18, 0x18, 0x18, 0x1c, 0x38,
+	0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0xc6, 0xc6,
+	0xc6, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x30, 0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xe6, 0xf6, 0xde,
+	0xce, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x30, 0x30, 0x60,
+	0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x00, 0xfc, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0xc0,
+	0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xe6, 0xf6, 0xde, 0xce, 0xc6, 0xc6, 0xc6,
+	0x06, 0x06, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x06, 0x1c, 0x00, 0x7c, 0x00, 0x7c, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38,
+	0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x36, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0x00, 0x7c, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xd8,
+	0xd8, 0xd8, 0xde, 0xd8, 0xd8, 0xd8, 0xd8, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xd6, 0xd6, 0xde, 0xd0, 0xd0, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xfc,
+	0xf0, 0xd8, 0xcc, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30,
+	0x00, 0xde, 0xf0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0xf0, 0xd8, 0xcc, 0xc6,
+	0x00, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6f, 0x78, 0x70,
+	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0xc0, 0x6c, 0x38, 0x00, 0xfc,
+	0xc6, 0xc6, 0xc6, 0xfc, 0xf0, 0xd8, 0xcc, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x6c, 0x38, 0x00, 0xde, 0xf0, 0xe0, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0x7c,
+	0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18,
+	0x00, 0x7e, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00,
+	0x38, 0x6c, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0x7e, 0xc0, 0xc0,
+	0x7c, 0x06, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
+	0xc0, 0xc0, 0x7c, 0x06, 0x06, 0xc6, 0xc6, 0x7c, 0x30, 0x30, 0x60, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0xfc,
+	0x30, 0x30, 0x60, 0x00, 0x6c, 0x38, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0x7c,
+	0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38,
+	0x00, 0x7e, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0xfc, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x0c, 0x0c, 0x18, 0x00, 0x00, 0x00, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30,
+	0x30, 0x30, 0x30, 0x1e, 0x0c, 0x0c, 0x18, 0x00, 0x6c, 0x38, 0x00, 0xff,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x38, 0x00, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0x1e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x18, 0x18, 0x18, 0x7e, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30,
+	0x30, 0xfc, 0x30, 0x78, 0x30, 0x30, 0x30, 0x1e, 0x00, 0x00, 0x00, 0x00,
+	0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38,
+	0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x38, 0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x38, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0x00, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x36, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x18, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x0c, 0x07, 0x00,
+	0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xd6, 0xfe, 0xee, 0xc6, 0x82,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0xc6, 0xc6, 0xd6,
+	0xd6, 0xd6, 0xd6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0x00, 0xc3,
+	0xc3, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x30, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc0, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0xfe, 0x0c, 0x18,
+	0x30, 0x60, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0xfe,
+	0x06, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x18, 0x00, 0xfe, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x30,
+	0x60, 0xc0, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38,
+	0x00, 0xfe, 0x0c, 0x18, 0x30, 0x60, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x1e, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x06, 0x06,
+	0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06,
+	0x06, 0x06, 0x3e, 0x06, 0x06, 0x06, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc0, 0x78, 0xc0,
+	0xc0, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1b,
+	0x18, 0x18, 0x7e, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xd8, 0x70, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x76, 0x7e, 0x6e, 0x66, 0x66, 0x66, 0x66,
+	0x60, 0x60, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0xfe, 0x06,
+	0x0c, 0x18, 0x3c, 0x06, 0x06, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0xc6, 0xc6, 0x7c,
+	0x00, 0x30, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc0, 0xc0,
+	0x7c, 0x06, 0x06, 0xfc, 0x00, 0x30, 0x30, 0x60, 0x00, 0x00, 0xff, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x30,
+	0x00, 0x00, 0x30, 0x30, 0x30, 0xfc, 0x30, 0x30, 0x30, 0x30, 0x30, 0x1e,
+	0x00, 0x0c, 0x0c, 0x18, 0x7e, 0x00, 0xc3, 0xc3, 0x66, 0x66, 0x3c, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c,
+	0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x7c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06,
+	0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0x06, 0x06, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0,
+	0x78, 0xc0, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x60, 0x60, 0xc0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x06, 0x0c, 0x18, 0x3c, 0x06, 0x06,
+	0xc6, 0xc6, 0x7c, 0x00, 0x18, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x30, 0x30, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x38, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x06, 0x0c, 0x07, 0x00, 0x76, 0xdc, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x36, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x60, 0xc0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x30, 0x00, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x60, 0xc0, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x3c, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x60, 0xc0, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x00, 0xc3, 0xc3, 0x66, 0x66, 0x3c,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x60, 0xc0, 0x7c, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x6c, 0x6c, 0xee, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x30, 0xd8, 0xd8, 0x00, 0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x1c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10,
+	0x38, 0x38, 0x6c, 0x6c, 0x6c, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38, 0x6c, 0x6c,
+	0x6c, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00,
+	0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0x60, 0x30, 0x18, 0x18,
+	0x30, 0x60, 0xc0, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x7c,
+	0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0x6c, 0x6c, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30,
+	0x00, 0x7a, 0xce, 0xcc, 0xcc, 0xcc, 0xce, 0x7a, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x30, 0x00, 0x7c, 0xc6, 0xc0, 0x78, 0xc0, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0xfc, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x18, 0x30,
+	0x00, 0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x30, 0x00, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7a, 0xce, 0xcc,
+	0xcc, 0xcc, 0xce, 0x7a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xcc,
+	0xcc, 0xc8, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0xc0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18,
+	0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x7e, 0x30, 0x18, 0x7c, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x0c,
+	0x18, 0x30, 0x60, 0xc0, 0xc0, 0xc0, 0xc0, 0x7c, 0x06, 0x06, 0x0c, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x7e, 0x66, 0x66, 0x66, 0x66, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x30, 0x30,
+	0x30, 0x30, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30,
+	0x18, 0x18, 0x3c, 0x3c, 0x66, 0x66, 0xc3, 0xc3, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7e, 0xc0, 0xc0, 0xc0, 0x7c, 0xc0, 0xc0, 0xc0, 0xc0, 0x7c,
+	0x06, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0xc0, 0xc0, 0xc0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0x7c,
+	0x06, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x0e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4c, 0xd6, 0xd6,
+	0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc6, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c,
+	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0xc6, 0xd6,
+	0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd8, 0xd8,
+	0x00, 0x70, 0x30, 0x30, 0x30, 0x30, 0x30, 0x1c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30,
+	0x00, 0x44, 0xc6, 0xd6, 0xd6, 0xd6, 0xfe, 0x6c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x60, 0x60, 0x7c, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0x00, 0xfe,
+	0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x70, 0xd0, 0xdc, 0xd6, 0xd6,
+	0xd6, 0xd6, 0xd6, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xd0,
+	0xd0, 0xdc, 0xf6, 0xd6, 0xd6, 0xd6, 0xd6, 0xdc, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xf0, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x30, 0xc6, 0xc6, 0xcc, 0xd8, 0xf0, 0xf0,
+	0xd8, 0xcc, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x30, 0x18, 0xc6, 0xc6,
+	0xc6, 0xce, 0xde, 0xf6, 0xe6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xfe, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xc0,
+	0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0xff,
+	0xc3, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c,
+	0xd6, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
+	0xc6, 0xce, 0xde, 0xf6, 0xe6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x38, 0xc6, 0xc6, 0xc6, 0xce, 0xde, 0xf6, 0xe6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x36, 0x66, 0x66, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c,
+	0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7f, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6,
+	0xd6, 0xd6, 0xd6, 0x7f, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x60,
+	0x60, 0x7c, 0x66, 0x66, 0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xe6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xe6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x7c, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
+	0x06, 0x06, 0x3e, 0x06, 0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xcc, 0xd6, 0xd6, 0xd6, 0xd6, 0xf6, 0xd6, 0xd6, 0xd6, 0xcc,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x1e, 0x36, 0x66, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc0,
+	0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x78, 0xcc, 0xcc, 0xc8, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xfc,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xee, 0xfe, 0xd6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x10, 0x7c, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7c, 0x10, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7f,
+	0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6,
+	0x7e, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0xd6, 0x7f,
+	0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x60, 0x7c,
+	0x66, 0x66, 0x66, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xc6, 0xe6, 0xd6, 0xd6, 0xd6, 0xe6, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x7c, 0x66, 0x66, 0x66, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06,
+	0x3e, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xcc, 0xd6, 0xd6, 0xf6, 0xd6, 0xd6, 0xcc, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xc6, 0xc6, 0x7e, 0x36, 0x66, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf8, 0x60, 0x7c, 0x66, 0x66,
+	0x66, 0x66, 0x66, 0x66, 0x06, 0x06, 0x1c, 0x00, 0x00, 0x00, 0x18, 0x30,
+	0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xf8, 0xc0, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xd0, 0xdc,
+	0xd6, 0xd6, 0xd6, 0x9c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xd0, 0xd0, 0xdc, 0xf6, 0xd6, 0xd6, 0xdc, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x30, 0x00, 0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x38, 0x00, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0x38, 0x38, 0x00, 0x00,
+	0x06, 0x06, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0xfe, 0xc0, 0xc0,
+	0xc0, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x60,
+	0x60, 0x60, 0xfc, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x60, 0x60, 0xfc, 0x60, 0x60, 0x60,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x06, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xfe, 0xc0, 0xc0, 0xf8, 0xcc, 0xcc, 0xcc, 0x0c, 0x18, 0x00, 0x00,
+	0x00, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0xd6, 0xd7,
+	0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd6, 0xd6, 0x7c,
+	0x38, 0x7c, 0xd6, 0xd7, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
+	0xc6, 0x06, 0x3c, 0x06, 0x06, 0xc6, 0xc6, 0x7c, 0x30, 0x30, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0x7c,
+	0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xcc, 0xd8, 0xf0, 0xf0,
+	0xd8, 0xcc, 0xc6, 0xc7, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0xc7, 0x03, 0x03, 0x00, 0x00,
+	0x00, 0x00, 0xc6, 0xc6, 0xd6, 0xdc, 0xf8, 0xf8, 0xdc, 0xd6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xd6, 0xdc,
+	0xf8, 0xdc, 0xd6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 0xe3,
+	0x66, 0x6c, 0x78, 0x78, 0x6c, 0x66, 0x63, 0x63, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xe3, 0x66, 0x6c, 0x78, 0x6c, 0x66, 0x63,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xc7, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc7, 0x03, 0x03, 0x00, 0x00,
+	0x00, 0x00, 0xcf, 0xcc, 0xcc, 0xcc, 0xfc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcf, 0xcc, 0xcc,
+	0xfc, 0xcc, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6,
+	0xc6, 0xc0, 0xc0, 0xc0, 0xc0, 0xc6, 0xc6, 0x7c, 0x30, 0x30, 0x30, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc0, 0xc0, 0xc0, 0xc6, 0x7c,
+	0x30, 0x30, 0x30, 0x00, 0x00, 0x00, 0xc3, 0xc3, 0x66, 0x66, 0x3c, 0x18,
+	0x7e, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc3, 0xc3, 0x66, 0x66, 0x3c, 0x3c, 0x18, 0x7e, 0x18, 0x18, 0x00,
+	0x00, 0x00, 0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x6c, 0x6c, 0xc6, 0xc7,
+	0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0x6c,
+	0x38, 0x6c, 0xc6, 0xc7, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x07, 0x03, 0x03, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x07,
+	0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xd6, 0xd6, 0x7e,
+	0x16, 0x16, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xc6, 0xd6, 0xd6, 0x7e, 0x16, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xfc, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xfc,
+	0xc6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c,
+	0xc6, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0x06, 0x06, 0xfe, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0xd6, 0xd6, 0xd6, 0x7c, 0x38,
+	0x7c, 0xd6, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c,
+	0x00, 0xd6, 0xd6, 0x7c, 0x38, 0x7c, 0xd6, 0xd6, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0x06, 0x3c, 0x06, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06,
+	0x3c, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0xc6, 0xc6,
+	0xc6, 0xce, 0xde, 0xf6, 0xe6, 0xc6, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xce, 0xde, 0xf6, 0xe6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6,
+	0xfe, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c,
+	0xc6, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc6, 0xc6, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0x7c, 0xc6, 0x06, 0x06, 0x3e,
+	0x06, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c,
+	0x00, 0x7c, 0xc6, 0x06, 0x3e, 0x06, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x7c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x7c,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x06, 0x06, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x36, 0x6c, 0x00, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x7c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x36, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x06, 0x7c, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c,
+	0x00, 0xc6, 0xc6, 0xc6, 0x7e, 0x06, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00,
+	0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xc6, 0xe6, 0xd6, 0xd6, 0xd6, 0xd6, 0xe6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x00, 0xc6, 0xc6, 0xe6,
+	0xd6, 0xd6, 0xd6, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6,
+	0xcc, 0xd8, 0xf0, 0xf0, 0xd8, 0xcc, 0xc6, 0xc6, 0x00, 0x7c, 0x00, 0x00,
+	0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc6, 0xcc, 0xd8, 0xf0, 0xd8, 0xcc, 0xc6,
+	0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xf8, 0xc0,
+	0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7c, 0xc6, 0xc6, 0xfe, 0xc0, 0xc0, 0x7c, 0x00, 0x18, 0x18, 0x00,
+	0x76, 0xdc, 0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0xf8, 0xc0, 0xc0, 0xc0, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x7c, 0xc6, 0xc6,
+	0xfe, 0xc0, 0xc0, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c, 0x00, 0x18, 0x18, 0x00,
+	0x00, 0x00, 0x18, 0x18, 0x00, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x3c,
+	0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x18, 0x18, 0x00,
+	0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7c,
+	0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x76, 0xdc, 0x00, 0xc3,
+	0xc3, 0x66, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x76, 0xdc, 0x00, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0x7e,
+	0x06, 0x06, 0x7c, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0xfe,
+	0x00, 0x18, 0x30, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x30, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x30, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x66, 0xcc, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x66, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x66, 0x66, 0xcc, 0x00, 0x00, 0x00,
+	0x00, 0xcc, 0xcc, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
+	0x7e, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xdb, 0xdb,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xec, 0xac, 0xf8, 0x18, 0x30, 0x30,
+	0x60, 0x7f, 0xd5, 0xdf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18,
+	0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x66, 0x66, 0x66, 0x66, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x18, 0x30,
+	0x60, 0x30, 0x18, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x60, 0x30, 0x18, 0x0c, 0x18, 0x30, 0x60, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00, 0x66, 0x66,
+	0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x6c, 0x6c,
+	0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xf8, 0xcc, 0xcc, 0xcc, 0xfa, 0xc6, 0xcf, 0xc6, 0xc6, 0xc3,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x33, 0x60, 0xfc, 0x60,
+	0xfc, 0x60, 0x33, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x18,
+	0x18, 0x1e, 0x78, 0x1e, 0x78, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0xfe, 0xfe, 0x60, 0x20, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x08, 0x0c, 0xfe, 0xfe, 0x0c, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x66, 0xff,
+	0xff, 0x66, 0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c,
+	0x7e, 0x18, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x3c, 0x7e, 0x18, 0x18, 0x18, 0x7e, 0x3c, 0x18, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x26, 0x66,
+	0xfe, 0xfe, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x10, 0x3e, 0x7e, 0xe0, 0x7e, 0x3e, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x10, 0x38, 0x7c, 0xee, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0xf8, 0xfc, 0x0e,
+	0xfc, 0xf8, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c,
+	0x6c, 0x6c, 0x6c, 0x6c, 0xee, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x24, 0x7e, 0xff, 0xc3, 0xff, 0x7e, 0x24, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x7c, 0xee, 0x6c, 0x6c,
+	0xee, 0x7c, 0x38, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe,
+	0x06, 0x06, 0x06, 0xfe, 0x06, 0x06, 0x06, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x06, 0x0c, 0x7c, 0xce, 0xde, 0xf6, 0xe6, 0x7c, 0x60, 0xc0,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x60, 0xc0, 0xc0, 0xfe,
+	0xc0, 0xc0, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x3e, 0x60, 0xc0, 0xfe, 0xc0, 0x60, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0c, 0x0c, 0x0c, 0x0c, 0xcc, 0xcc,
+	0xcc, 0x6c, 0x3c, 0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7c, 0xd6, 0xd6, 0xd6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xfe, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x38, 0x38,
+	0x6c, 0x6c, 0xc6, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xc6, 0xc6, 0x6c, 0x6c, 0x38, 0x38, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x7c, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6, 0xc6,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0xc6, 0xc6, 0xc6,
+	0xc6, 0xc6, 0xc6, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x06, 0xfe, 0x18, 0x30, 0xfe, 0xc0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x00, 0x00, 0xfe,
+	0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c,
+	0x18, 0x30, 0x60, 0x30, 0x18, 0x0c, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x30, 0x18, 0x0c, 0x06, 0x0c, 0x18, 0x30, 0x00, 0x7e,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x38, 0x6c, 0xc6,
+	0xc6, 0xc6, 0xc6, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xfe, 0xc0, 0xc0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x0e, 0x1b, 0x1b, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0xd8, 0xd8, 0x70, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xfc,
+	0xcc, 0xcc, 0xcc, 0x00, 0x3f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00,
+	0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0, 0xf8, 0x00, 0x3f, 0x30, 0x3c, 0x30,
+	0x30, 0x30, 0x00, 0x00, 0x00, 0xcc, 0xcc, 0xcc, 0xcc, 0x78, 0x30, 0x00,
+	0x3f, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x00, 0x00, 0x00, 0xfc, 0xc0, 0xf0,
+	0xc0, 0xc0, 0xc0, 0x00, 0x3f, 0x30, 0x3c, 0x30, 0x30, 0x30, 0x00, 0x00,
+	0x00, 0x78, 0xcc, 0xc0, 0xc0, 0xcc, 0x78, 0x00, 0x3e, 0x33, 0x33, 0x3e,
+	0x36, 0x33, 0x00, 0x00, 0x00, 0xcc, 0xec, 0xfc, 0xdc, 0xcc, 0xcc, 0x00,
+	0x30, 0x30, 0x30, 0x30, 0x30, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xaa, 0xaa,
+	0xaa, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x00,
+	0x38, 0x38, 0x38, 0x00, 0x38, 0x38, 0x38, 0x00, 0x38, 0x38, 0x38, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
+	0x3f, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3f, 0x3f, 0x3f, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0xf8, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8,
+	0xf8, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xf8, 0xf8, 0xf8, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x1f, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x3f,
+	0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x3f, 0x3f, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0xf8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xf8,
+	0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0xf8, 0xf8, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x1f, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x3f,
+	0x3f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x3f, 0x3f, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x3f, 0x3f, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x3f, 0x3f,
+	0x3f, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x3f, 0x3f, 0x3f, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x3f, 0x3f, 0x3f, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8,
+	0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xf8,
+	0xf8, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0xf8, 0xf8, 0xf8, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0xf8, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xf8, 0xf8,
+	0xf8, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xf8, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0xff, 0xff, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff,
+	0xff, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0xff, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xf8, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x3f, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xff,
+	0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x1f, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0xff, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xff,
+	0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0xff, 0xff, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xff, 0xff, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xf8, 0xff,
+	0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x3f, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xff, 0xff, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0xff,
+	0xff, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0xff, 0xff, 0xff, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0xff, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xf8, 0xff,
+	0xff, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x3f, 0xff, 0xff, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0xff, 0xff, 0xff, 0x38, 0x38, 0x38,
+	0x38, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
+	0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x1f, 0x18, 0x1f, 0x1f, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
+	0x7f, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7f, 0x7f, 0x60, 0x6f, 0x6f, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xf8, 0x18, 0xf8, 0xf8, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc,
+	0xfc, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xfc, 0xfc, 0x0c, 0xec, 0xec, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x1f, 0x1f, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x7f,
+	0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x6c, 0x6f, 0x6f, 0x60, 0x7f, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0xf8, 0xf8, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xfc,
+	0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x6c, 0xec, 0xec, 0x0c, 0xfc, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0x1f, 0x1f, 0x18, 0x1f, 0x1f, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6f,
+	0x6f, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x6c, 0x6f, 0x6f, 0x60, 0x6f, 0x6f, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0xf8, 0xf8, 0x18, 0xf8, 0xf8, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xec,
+	0xec, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x6c, 0xec, 0xec, 0x0c, 0xec, 0xec, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x00, 0xef, 0xef, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x6c, 0xef, 0xef, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x18, 0x18, 0x18, 0x18, 0xff, 0xff, 0x18, 0xff, 0xff, 0x18, 0x18,
+	0x18, 0x18, 0x18, 0x18, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0xff,
+	0xff, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x6c, 0xef, 0xef, 0x00, 0xef, 0xef, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c, 0x6c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x7c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xfe,
+	0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x3c, 0x3c, 0x7e, 0x7e, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0xf0, 0xfc, 0xff,
+	0xff, 0xfc, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x7e, 0x7e, 0x3c, 0x3c, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x3f, 0xff, 0xff, 0x3f, 0x0f, 0x03,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x3c, 0x7e, 0xff,
+	0x7e, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x18, 0x3c, 0x66, 0xc3, 0x66, 0x3c, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x66, 0x42, 0x42, 0x66, 0x3c, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0x99, 0xbd,
+	0xbd, 0x99, 0xc3, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x18,
+	0xdb, 0x7e, 0x3c, 0xe7, 0x3c, 0x7e, 0xdb, 0x18, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3c, 0x66, 0x66, 0x66, 0x66, 0x3c, 0x18, 0x7e, 0x18, 0x18,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x0e, 0x1a, 0x32, 0x78, 0xcc,
+	0xcc, 0xcc, 0xcc, 0x78, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18,
+	0x3c, 0x7e, 0xff, 0xff, 0x7e, 0x18, 0x18, 0x3c, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x18, 0x3c, 0x3c, 0x18, 0x5a, 0xff, 0xff, 0x5a, 0x18, 0x3c,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x7e, 0x60, 0x60, 0x60,
+	0x60, 0x60, 0xe0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66,
+	0x7e, 0x66, 0x66, 0x66, 0x66, 0x66, 0x6e, 0xec, 0xc0, 0x00, 0x00, 0x00,
+};
+
+static struct vt_font_map font_mapping_normal[248] = {
+	{ 0x0020, 0x0001, 0x5e }, { 0x00a0, 0x0001, 0x00 },
+	{ 0x00a1, 0x0060, 0x6e }, { 0x0110, 0x008f, 0x00 },
+	{ 0x0111, 0x00cf, 0x08 }, { 0x011a, 0x00d2, 0x01 },
+	{ 0x011c, 0x00d8, 0x59 }, { 0x0178, 0x0132, 0x07 },
+	{ 0x0186, 0x013a, 0x00 }, { 0x018e, 0x013b, 0x02 },
+	{ 0x0192, 0x013e, 0x00 }, { 0x019d, 0x013f, 0x01 },
+	{ 0x01b7, 0x0141, 0x00 }, { 0x0218, 0x0142, 0x03 },
+	{ 0x0232, 0x0146, 0x01 }, { 0x0237, 0x0148, 0x00 },
+	{ 0x0254, 0x0149, 0x00 }, { 0x0258, 0x014a, 0x01 },
+	{ 0x025b, 0x014c, 0x00 }, { 0x0272, 0x014d, 0x00 },
+	{ 0x0292, 0x014e, 0x00 }, { 0x02bb, 0x014f, 0x02 },
+	{ 0x02c6, 0x0152, 0x01 }, { 0x02d8, 0x0153, 0x01 },
+	{ 0x02db, 0x0155, 0x02 }, { 0x0300, 0x0041, 0x00 },
+	{ 0x0301, 0x0073, 0x00 }, { 0x0302, 0x0152, 0x00 },
+	{ 0x0303, 0x0156, 0x00 }, { 0x0306, 0x0153, 0x00 },
+	{ 0x030c, 0x0153, 0x00 }, { 0x0329, 0x0158, 0x00 },
+	{ 0x0384, 0x0159, 0x06 }, { 0x038c, 0x0160, 0x00 },
+	{ 0x038e, 0x0161, 0x02 }, { 0x0391, 0x0022, 0x01 },
+	{ 0x0393, 0x0164, 0x01 }, { 0x0395, 0x0026, 0x00 },
+	{ 0x0396, 0x003b, 0x00 }, { 0x0397, 0x0029, 0x00 },
+	{ 0x0398, 0x0166, 0x00 }, { 0x0399, 0x002a, 0x00 },
+	{ 0x039a, 0x002c, 0x00 }, { 0x039b, 0x0167, 0x00 },
+	{ 0x039c, 0x002e, 0x01 }, { 0x039e, 0x0168, 0x00 },
+	{ 0x039f, 0x0030, 0x00 }, { 0x03a0, 0x0169, 0x00 },
+	{ 0x03a1, 0x0031, 0x00 }, { 0x03a3, 0x016a, 0x00 },
+	{ 0x03a4, 0x0035, 0x00 }, { 0x03a5, 0x003a, 0x00 },
+	{ 0x03a6, 0x016b, 0x00 }, { 0x03a7, 0x0039, 0x00 },
+	{ 0x03a8, 0x016c, 0x01 }, { 0x03aa, 0x008e, 0x00 },
+	{ 0x03ab, 0x0132, 0x00 }, { 0x03ac, 0x016e, 0x08 },
+	{ 0x03b5, 0x014c, 0x00 }, { 0x03b6, 0x0177, 0x00 },
+	{ 0x03b7, 0x0140, 0x00 }, { 0x03b8, 0x0178, 0x01 },
+	{ 0x03ba, 0x00f4, 0x00 }, { 0x03bb, 0x017a, 0x00 },
+	{ 0x03bc, 0x0074, 0x00 }, { 0x03bd, 0x0057, 0x00 },
+	{ 0x03be, 0x017b, 0x00 }, { 0x03bf, 0x0050, 0x00 },
+	{ 0x03c0, 0x017c, 0x0b }, { 0x03cc, 0x00b2, 0x00 },
+	{ 0x03cd, 0x0188, 0x01 }, { 0x03f3, 0x004b, 0x00 },
+	{ 0x03f4, 0x018a, 0x00 }, { 0x0400, 0x0087, 0x00 },
+	{ 0x0401, 0x008a, 0x00 }, { 0x0402, 0x018b, 0x02 },
+	{ 0x0405, 0x0034, 0x00 }, { 0x0406, 0x002a, 0x00 },
+	{ 0x0407, 0x008e, 0x00 }, { 0x0408, 0x002b, 0x00 },
+	{ 0x0409, 0x018e, 0x06 }, { 0x0410, 0x0022, 0x00 },
+	{ 0x0411, 0x0195, 0x00 }, { 0x0412, 0x0023, 0x00 },
+	{ 0x0413, 0x0164, 0x00 }, { 0x0414, 0x0196, 0x00 },
+	{ 0x0415, 0x0026, 0x00 }, { 0x0416, 0x0197, 0x00 },
+	{ 0x0417, 0x0014, 0x00 }, { 0x0418, 0x0198, 0x01 },
+	{ 0x041a, 0x002c, 0x00 }, { 0x041b, 0x019a, 0x00 },
+	{ 0x041c, 0x002e, 0x00 }, { 0x041d, 0x0029, 0x00 },
+	{ 0x041e, 0x0030, 0x00 }, { 0x041f, 0x0169, 0x00 },
+	{ 0x0420, 0x0031, 0x00 }, { 0x0421, 0x0024, 0x00 },
+	{ 0x0422, 0x0035, 0x00 }, { 0x0423, 0x019b, 0x01 },
+	{ 0x0425, 0x0039, 0x00 }, { 0x0426, 0x019d, 0x05 },
+	{ 0x042c, 0x0043, 0x00 }, { 0x042d, 0x01a3, 0x02 },
+	{ 0x0430, 0x0042, 0x00 }, { 0x0431, 0x01a6, 0x02 },
+	{ 0x0434, 0x0048, 0x00 }, { 0x0435, 0x0046, 0x00 },
+	{ 0x0436, 0x01a9, 0x01 }, { 0x0438, 0x0056, 0x00 },
+	{ 0x0439, 0x0129, 0x00 }, { 0x043a, 0x00f4, 0x00 },
+	{ 0x043b, 0x01ab, 0x02 }, { 0x043e, 0x0050, 0x00 },
+	{ 0x043f, 0x017c, 0x00 }, { 0x0440, 0x0051, 0x00 },
+	{ 0x0441, 0x0044, 0x00 }, { 0x0442, 0x01ae, 0x00 },
+	{ 0x0443, 0x005a, 0x00 }, { 0x0444, 0x01af, 0x00 },
+	{ 0x0445, 0x0059, 0x00 }, { 0x0446, 0x01b0, 0x09 },
+	{ 0x0450, 0x00a7, 0x00 }, { 0x0451, 0x00aa, 0x00 },
+	{ 0x0452, 0x01ba, 0x02 }, { 0x0455, 0x0054, 0x00 },
+	{ 0x0456, 0x004a, 0x00 }, { 0x0457, 0x00ae, 0x00 },
+	{ 0x0458, 0x004b, 0x00 }, { 0x0459, 0x01bd, 0x01 },
+	{ 0x045b, 0x00e3, 0x00 }, { 0x045c, 0x01bf, 0x00 },
+	{ 0x045d, 0x00b8, 0x00 }, { 0x045e, 0x01c0, 0x01 },
+	{ 0x0490, 0x01c2, 0x0d }, { 0x04a0, 0x01d0, 0x05 },
+	{ 0x04aa, 0x01d6, 0x01 }, { 0x04ae, 0x003a, 0x00 },
+	{ 0x04af, 0x0175, 0x00 }, { 0x04b0, 0x01d8, 0x03 },
+	{ 0x04b6, 0x01dc, 0x05 }, { 0x04d0, 0x00c1, 0x01 },
+	{ 0x04d2, 0x0083, 0x00 }, { 0x04d3, 0x00a3, 0x00 },
+	{ 0x04d4, 0x0085, 0x00 }, { 0x04d5, 0x00a5, 0x00 },
+	{ 0x04d6, 0x00d2, 0x01 }, { 0x04d8, 0x013c, 0x00 },
+	{ 0x04d9, 0x014b, 0x00 }, { 0x04da, 0x01e2, 0x05 },
+	{ 0x04e2, 0x01e8, 0x00 }, { 0x04e3, 0x0127, 0x00 },
+	{ 0x04e4, 0x01e9, 0x00 }, { 0x04e5, 0x00bb, 0x00 },
+	{ 0x04e6, 0x0095, 0x00 }, { 0x04e7, 0x00b5, 0x00 },
+	{ 0x04e8, 0x018a, 0x00 }, { 0x04e9, 0x01ea, 0x05 },
+	{ 0x04ef, 0x0147, 0x00 }, { 0x04f0, 0x01f0, 0x00 },
+	{ 0x04f1, 0x00be, 0x00 }, { 0x04f2, 0x01f1, 0x03 },
+	{ 0x04f8, 0x01f5, 0x01 }, { 0x1e34, 0x01f7, 0x01 },
+	{ 0x1eb8, 0x01f9, 0x01 }, { 0x1ebc, 0x01fb, 0x01 },
+	{ 0x1eca, 0x01fd, 0x03 }, { 0x1ee4, 0x0201, 0x01 },
+	{ 0x1ef8, 0x0203, 0x01 }, { 0x2000, 0x0001, 0x00 },
+	{ 0x2001, 0x0001, 0x00 }, { 0x2002, 0x0001, 0x00 },
+	{ 0x2003, 0x0001, 0x00 }, { 0x2004, 0x0001, 0x00 },
+	{ 0x2005, 0x0001, 0x00 }, { 0x2006, 0x0001, 0x00 },
+	{ 0x2007, 0x0001, 0x00 }, { 0x2008, 0x0001, 0x00 },
+	{ 0x2009, 0x0001, 0x00 }, { 0x200a, 0x0001, 0x00 },
+	{ 0x2010, 0x006c, 0x00 }, { 0x2011, 0x006c, 0x00 },
+	{ 0x2012, 0x000e, 0x00 }, { 0x2013, 0x000e, 0x00 },
+	{ 0x2014, 0x0205, 0x00 }, { 0x2015, 0x0205, 0x0d },
+	{ 0x2026, 0x0213, 0x00 }, { 0x2030, 0x0214, 0x00 },
+	{ 0x2032, 0x0215, 0x01 }, { 0x2039, 0x0217, 0x01 },
+	{ 0x203c, 0x0219, 0x00 }, { 0x203e, 0x021a, 0x00 },
+	{ 0x207f, 0x021b, 0x00 }, { 0x20a7, 0x021c, 0x00 },
+	{ 0x20ac, 0x021d, 0x00 }, { 0x20ae, 0x021e, 0x00 },
+	{ 0x210e, 0x0049, 0x00 }, { 0x210f, 0x00e3, 0x00 },
+	{ 0x2116, 0x021f, 0x00 }, { 0x2122, 0x0220, 0x00 },
+	{ 0x2126, 0x016d, 0x00 }, { 0x2190, 0x0221, 0x05 },
+	{ 0x21a8, 0x0227, 0x00 }, { 0x21b5, 0x0228, 0x00 },
+	{ 0x21d0, 0x0229, 0x05 }, { 0x2203, 0x022f, 0x00 },
+	{ 0x2205, 0x0230, 0x00 }, { 0x2206, 0x0165, 0x00 },
+	{ 0x2208, 0x0231, 0x00 }, { 0x220a, 0x0232, 0x00 },
+	{ 0x2212, 0x000e, 0x00 }, { 0x2219, 0x0233, 0x01 },
+	{ 0x221e, 0x0235, 0x01 }, { 0x2227, 0x0237, 0x03 },
+	{ 0x2248, 0x023b, 0x00 }, { 0x2260, 0x023c, 0x01 },
+	{ 0x2264, 0x023e, 0x01 }, { 0x2302, 0x0240, 0x00 },
+	{ 0x2310, 0x0241, 0x00 }, { 0x2320, 0x0242, 0x01 },
+	{ 0x23ba, 0x0244, 0x03 }, { 0x2409, 0x0248, 0x04 },
+	{ 0x2424, 0x024d, 0x00 }, { 0x2500, 0x024e, 0x03 },
+	{ 0x2508, 0x0252, 0x43 }, { 0x2550, 0x0296, 0x1c },
+	{ 0x2580, 0x02b3, 0x08 }, { 0x258c, 0x02bc, 0x00 },
+	{ 0x2590, 0x02bd, 0x03 }, { 0x2596, 0x02c1, 0x0a },
+	{ 0x25ac, 0x02cc, 0x00 }, { 0x25ae, 0x02cd, 0x00 },
+	{ 0x25b2, 0x02ce, 0x00 }, { 0x25b6, 0x02cf, 0x00 },
+	{ 0x25bc, 0x02d0, 0x00 }, { 0x25c0, 0x02d1, 0x00 },
+	{ 0x25c6, 0x02d2, 0x00 }, { 0x25ca, 0x02d3, 0x01 },
+	{ 0x25d8, 0x02d5, 0x01 }, { 0x263a, 0x02d7, 0x02 },
+	{ 0x2640, 0x02da, 0x00 }, { 0x2642, 0x02db, 0x00 },
+	{ 0x2660, 0x02dc, 0x00 }, { 0x2663, 0x02dd, 0x00 },
+	{ 0x2665, 0x02de, 0x00 }, { 0x2666, 0x02d2, 0x00 },
+	{ 0x266a, 0x02df, 0x01 }, { 0xf6be, 0x0148, 0x00 },
+};
+
+static struct vt_font_map font_mapping_bold[260] = {
+	{ 0x0021, 0x02e1, 0x0b }, { 0x002d, 0x0205, 0x00 },
+	{ 0x002e, 0x02ed, 0x50 }, { 0x00a1, 0x033e, 0x07 },
+	{ 0x00aa, 0x0346, 0x03 }, { 0x00af, 0x034a, 0x07 },
+	{ 0x00b7, 0x0233, 0x00 }, { 0x00b8, 0x0352, 0x57 },
+	{ 0x0110, 0x036a, 0x00 }, { 0x0111, 0x03aa, 0x08 },
+	{ 0x011a, 0x03ad, 0x01 }, { 0x011c, 0x03b3, 0x59 },
+	{ 0x0178, 0x040d, 0x07 }, { 0x0186, 0x0415, 0x00 },
+	{ 0x018e, 0x0416, 0x02 }, { 0x0192, 0x0419, 0x00 },
+	{ 0x019d, 0x041a, 0x01 }, { 0x01b7, 0x041c, 0x00 },
+	{ 0x0218, 0x041d, 0x03 }, { 0x0232, 0x0421, 0x01 },
+	{ 0x0237, 0x0423, 0x00 }, { 0x0254, 0x0424, 0x00 },
+	{ 0x0258, 0x0425, 0x01 }, { 0x025b, 0x0427, 0x00 },
+	{ 0x0272, 0x0428, 0x00 }, { 0x0292, 0x0429, 0x00 },
+	{ 0x02bb, 0x042a, 0x02 }, { 0x02c6, 0x042d, 0x01 },
+	{ 0x02d8, 0x042e, 0x01 }, { 0x02db, 0x0430, 0x02 },
+	{ 0x0300, 0x031f, 0x00 }, { 0x0301, 0x034f, 0x00 },
+	{ 0x0302, 0x042d, 0x00 }, { 0x0303, 0x0431, 0x00 },
+	{ 0x0306, 0x042e, 0x00 }, { 0x030c, 0x042e, 0x00 },
+	{ 0x0329, 0x0433, 0x00 }, { 0x0384, 0x0434, 0x06 },
+	{ 0x038c, 0x043b, 0x00 }, { 0x038e, 0x043c, 0x02 },
+	{ 0x0391, 0x0300, 0x01 }, { 0x0393, 0x043f, 0x01 },
+	{ 0x0395, 0x0304, 0x00 }, { 0x0396, 0x0319, 0x00 },
+	{ 0x0397, 0x0307, 0x00 }, { 0x0398, 0x0441, 0x00 },
+	{ 0x0399, 0x0308, 0x00 }, { 0x039a, 0x030a, 0x00 },
+	{ 0x039b, 0x0442, 0x00 }, { 0x039c, 0x030c, 0x01 },
+	{ 0x039e, 0x0443, 0x00 }, { 0x039f, 0x030e, 0x00 },
+	{ 0x03a0, 0x0444, 0x00 }, { 0x03a1, 0x030f, 0x00 },
+	{ 0x03a3, 0x0445, 0x00 }, { 0x03a4, 0x0313, 0x00 },
+	{ 0x03a5, 0x0318, 0x00 }, { 0x03a6, 0x0446, 0x00 },
+	{ 0x03a7, 0x0317, 0x00 }, { 0x03a8, 0x0447, 0x01 },
+	{ 0x03aa, 0x0369, 0x00 }, { 0x03ab, 0x040d, 0x00 },
+	{ 0x03ac, 0x0449, 0x08 }, { 0x03b5, 0x0427, 0x00 },
+	{ 0x03b6, 0x0452, 0x00 }, { 0x03b7, 0x041b, 0x00 },
+	{ 0x03b8, 0x0453, 0x01 }, { 0x03ba, 0x03cf, 0x00 },
+	{ 0x03bb, 0x0455, 0x00 }, { 0x03bc, 0x0350, 0x00 },
+	{ 0x03bd, 0x0335, 0x00 }, { 0x03be, 0x0456, 0x00 },
+	{ 0x03bf, 0x032e, 0x00 }, { 0x03c0, 0x0457, 0x0b },
+	{ 0x03cc, 0x038d, 0x00 }, { 0x03cd, 0x0463, 0x01 },
+	{ 0x03f3, 0x0329, 0x00 }, { 0x03f4, 0x0465, 0x00 },
+	{ 0x0400, 0x0362, 0x00 }, { 0x0401, 0x0365, 0x00 },
+	{ 0x0402, 0x0466, 0x02 }, { 0x0405, 0x0312, 0x00 },
+	{ 0x0406, 0x0308, 0x00 }, { 0x0407, 0x0369, 0x00 },
+	{ 0x0408, 0x0309, 0x00 }, { 0x0409, 0x0469, 0x06 },
+	{ 0x0410, 0x0300, 0x00 }, { 0x0411, 0x0470, 0x00 },
+	{ 0x0412, 0x0301, 0x00 }, { 0x0413, 0x043f, 0x00 },
+	{ 0x0414, 0x0471, 0x00 }, { 0x0415, 0x0304, 0x00 },
+	{ 0x0416, 0x0472, 0x00 }, { 0x0417, 0x02f2, 0x00 },
+	{ 0x0418, 0x0473, 0x01 }, { 0x041a, 0x030a, 0x00 },
+	{ 0x041b, 0x0475, 0x00 }, { 0x041c, 0x030c, 0x00 },
+	{ 0x041d, 0x0307, 0x00 }, { 0x041e, 0x030e, 0x00 },
+	{ 0x041f, 0x0444, 0x00 }, { 0x0420, 0x030f, 0x00 },
+	{ 0x0421, 0x0302, 0x00 }, { 0x0422, 0x0313, 0x00 },
+	{ 0x0423, 0x0476, 0x01 }, { 0x0425, 0x0317, 0x00 },
+	{ 0x0426, 0x0478, 0x09 }, { 0x0430, 0x0320, 0x00 },
+	{ 0x0431, 0x0482, 0x02 }, { 0x0434, 0x0326, 0x00 },
+	{ 0x0435, 0x0324, 0x00 }, { 0x0436, 0x0485, 0x01 },
+	{ 0x0438, 0x0334, 0x00 }, { 0x0439, 0x0404, 0x00 },
+	{ 0x043a, 0x03cf, 0x00 }, { 0x043b, 0x0487, 0x02 },
+	{ 0x043e, 0x032e, 0x00 }, { 0x043f, 0x0457, 0x00 },
+	{ 0x0440, 0x032f, 0x00 }, { 0x0441, 0x0322, 0x00 },
+	{ 0x0442, 0x048a, 0x00 }, { 0x0443, 0x0338, 0x00 },
+	{ 0x0444, 0x048b, 0x00 }, { 0x0445, 0x0337, 0x00 },
+	{ 0x0446, 0x048c, 0x09 }, { 0x0450, 0x0382, 0x00 },
+	{ 0x0451, 0x0385, 0x00 }, { 0x0452, 0x0496, 0x02 },
+	{ 0x0455, 0x0332, 0x00 }, { 0x0456, 0x0328, 0x00 },
+	{ 0x0457, 0x0389, 0x00 }, { 0x0458, 0x0329, 0x00 },
+	{ 0x0459, 0x0499, 0x01 }, { 0x045b, 0x03be, 0x00 },
+	{ 0x045c, 0x049b, 0x00 }, { 0x045d, 0x0393, 0x00 },
+	{ 0x045e, 0x049c, 0x01 }, { 0x0490, 0x049e, 0x0d },
+	{ 0x04a0, 0x04ac, 0x05 }, { 0x04aa, 0x04b2, 0x01 },
+	{ 0x04ae, 0x0318, 0x00 }, { 0x04af, 0x0450, 0x00 },
+	{ 0x04b0, 0x04b4, 0x03 }, { 0x04b6, 0x04b8, 0x05 },
+	{ 0x04d0, 0x039c, 0x01 }, { 0x04d2, 0x035e, 0x00 },
+	{ 0x04d3, 0x037e, 0x00 }, { 0x04d4, 0x0360, 0x00 },
+	{ 0x04d5, 0x0380, 0x00 }, { 0x04d6, 0x03ad, 0x01 },
+	{ 0x04d8, 0x0417, 0x00 }, { 0x04d9, 0x0426, 0x00 },
+	{ 0x04da, 0x04be, 0x05 }, { 0x04e2, 0x04c4, 0x00 },
+	{ 0x04e3, 0x0402, 0x00 }, { 0x04e4, 0x04c5, 0x00 },
+	{ 0x04e5, 0x0396, 0x00 }, { 0x04e6, 0x0370, 0x00 },
+	{ 0x04e7, 0x0390, 0x00 }, { 0x04e8, 0x0465, 0x00 },
+	{ 0x04e9, 0x04c6, 0x05 }, { 0x04ef, 0x0422, 0x00 },
+	{ 0x04f0, 0x04cc, 0x00 }, { 0x04f1, 0x0399, 0x00 },
+	{ 0x04f2, 0x04cd, 0x03 }, { 0x04f8, 0x04d1, 0x01 },
+	{ 0x1e34, 0x04d3, 0x01 }, { 0x1eb8, 0x04d5, 0x01 },
+	{ 0x1ebc, 0x04d7, 0x01 }, { 0x1eca, 0x04d9, 0x03 },
+	{ 0x1ee4, 0x04dd, 0x01 }, { 0x1ef8, 0x04df, 0x01 },
+	{ 0x2010, 0x0349, 0x00 }, { 0x2011, 0x0349, 0x00 },
+	{ 0x2012, 0x0205, 0x00 }, { 0x2013, 0x0205, 0x00 },
+	{ 0x2016, 0x04e1, 0x03 }, { 0x201a, 0x02ec, 0x00 },
+	{ 0x201b, 0x04e5, 0x06 }, { 0x2026, 0x04ec, 0x00 },
+	{ 0x2030, 0x04ed, 0x00 }, { 0x2032, 0x04ee, 0x01 },
+	{ 0x2039, 0x04f0, 0x01 }, { 0x203c, 0x04f2, 0x00 },
+	{ 0x203e, 0x04f3, 0x00 }, { 0x207f, 0x04f4, 0x00 },
+	{ 0x20a7, 0x04f5, 0x00 }, { 0x20ac, 0x04f6, 0x00 },
+	{ 0x20ae, 0x04f7, 0x00 }, { 0x210e, 0x0327, 0x00 },
+	{ 0x210f, 0x03be, 0x00 }, { 0x2126, 0x0448, 0x00 },
+	{ 0x2190, 0x04f8, 0x05 }, { 0x21a8, 0x04fe, 0x00 },
+	{ 0x21b5, 0x04ff, 0x00 }, { 0x21d0, 0x0500, 0x05 },
+	{ 0x2203, 0x0506, 0x00 }, { 0x2205, 0x0507, 0x00 },
+	{ 0x2206, 0x0440, 0x00 }, { 0x2208, 0x0508, 0x00 },
+	{ 0x220a, 0x0509, 0x00 }, { 0x2212, 0x0205, 0x00 },
+	{ 0x2219, 0x050a, 0x01 }, { 0x221e, 0x050c, 0x01 },
+	{ 0x2227, 0x050e, 0x03 }, { 0x2248, 0x0512, 0x00 },
+	{ 0x2260, 0x0513, 0x01 }, { 0x2264, 0x0515, 0x01 },
+	{ 0x2302, 0x0517, 0x00 }, { 0x2310, 0x0518, 0x00 },
+	{ 0x2320, 0x0519, 0x01 }, { 0x23ba, 0x051b, 0x02 },
+	{ 0x23bd, 0x02b4, 0x00 }, { 0x2409, 0x051e, 0x04 },
+	{ 0x2424, 0x0523, 0x00 }, { 0x2500, 0x024f, 0x00 },
+	{ 0x2501, 0x0524, 0x00 }, { 0x2502, 0x0251, 0x00 },
+	{ 0x2503, 0x0525, 0x00 }, { 0x2508, 0x0253, 0x00 },
+	{ 0x2509, 0x0526, 0x00 }, { 0x250a, 0x0255, 0x00 },
+	{ 0x250b, 0x0527, 0x00 }, { 0x250c, 0x0259, 0x00 },
+	{ 0x250d, 0x0528, 0x02 }, { 0x2510, 0x025d, 0x00 },
+	{ 0x2511, 0x052b, 0x02 }, { 0x2514, 0x0261, 0x00 },
+	{ 0x2515, 0x052e, 0x02 }, { 0x2518, 0x0265, 0x00 },
+	{ 0x2519, 0x0531, 0x02 }, { 0x251c, 0x026d, 0x00 },
+	{ 0x251d, 0x0534, 0x06 }, { 0x2524, 0x0275, 0x00 },
+	{ 0x2525, 0x053b, 0x06 }, { 0x252c, 0x027d, 0x00 },
+	{ 0x252d, 0x0542, 0x06 }, { 0x2534, 0x0285, 0x00 },
+	{ 0x2535, 0x0549, 0x06 }, { 0x253c, 0x0295, 0x00 },
+	{ 0x253d, 0x0550, 0x0e }, { 0x2550, 0x055f, 0x1c },
+	{ 0x25a0, 0x057c, 0x00 }, { 0x25ac, 0x057d, 0x00 },
+	{ 0x25ae, 0x057e, 0x00 }, { 0x25b2, 0x057f, 0x00 },
+	{ 0x25b6, 0x0580, 0x00 }, { 0x25bc, 0x0581, 0x00 },
+	{ 0x25c0, 0x0582, 0x00 }, { 0x25c6, 0x0583, 0x00 },
+	{ 0x25ca, 0x0584, 0x01 }, { 0x25d9, 0x0586, 0x00 },
+	{ 0x263c, 0x0587, 0x00 }, { 0x2640, 0x0588, 0x00 },
+	{ 0x2642, 0x0589, 0x00 }, { 0x2660, 0x058a, 0x00 },
+	{ 0x2663, 0x058b, 0x00 }, { 0x2666, 0x0583, 0x00 },
+	{ 0x266a, 0x058c, 0x01 }, { 0xf6be, 0x0423, 0x00 },
+};
+
+struct vt_font vt_font_default = {
+	.vf_width		= 8,
+	.vf_height		= 16,
+	.vf_bytes		= font_bytes,
+	.vf_normal		= font_mapping_normal,
+	.vf_normal_length	= 248,
+	.vf_bold		= font_mapping_bold,
+	.vf_bold_length		= 260,
+	.vf_refcount		= 1,
+};
diff --git a/sys/dev/vt/font/vt_mouse_cursor.c b/sys/dev/vt/font/vt_mouse_cursor.c
new file mode 100644
index 00000000000..a35de006a65
--- /dev/null
+++ b/sys/dev/vt/font/vt_mouse_cursor.c
@@ -0,0 +1,70 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Aleksandr 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 <dev/vt/vt.h>
+
+#ifndef SC_NO_CUTPASTE
+struct mouse_cursor vt_default_mouse_pointer = {
+	.map = {
+		0x00, /* "__      " */
+		0x40, /* "_*_     " */
+		0x60, /* "_**_    " */
+		0x70, /* "_***_   " */
+		0x78, /* "_****_  " */
+		0x7c, /* "_*****_ " */
+		0x7e, /* "_******_" */
+		0x68, /* "_**_****" */
+		0x4c, /* "_*__**__" */
+		0x0c, /* " _ _**_ " */
+		0x06, /* "    _**_" */
+		0x06, /* "    _**_" */
+		0x00, /* "    ____" */
+	},
+	.mask = {
+		0xc0, /* "__      " */
+		0xe0, /* "___     " */
+		0xf0, /* "____    " */
+		0xf8, /* "_____   " */
+		0xfc, /* "______  " */
+		0xfe, /* "_______ " */
+		0xff, /* "________" */
+		0xff, /* "________" */
+		0xff, /* "________" */
+		0x1e, /* "   ____ " */
+		0x0f, /* "    ____" */
+		0x0f, /* "    ____" */
+		0x0f, /* "    ____" */
+	},
+	.w = 8,
+	.h = 13,
+};
+#endif
diff --git a/sys/dev/vt/hw/fb/vt_early_fb.c b/sys/dev/vt/hw/fb/vt_early_fb.c
new file mode 100644
index 00000000000..b471decc121
--- /dev/null
+++ b/sys/dev/vt/hw/fb/vt_early_fb.c
@@ -0,0 +1,278 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Aleksandr 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$
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/fbio.h>
+
+#include "opt_platform.h"
+
+#ifdef	FDT
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/ofw/ofw_pci.h>
+#endif
+
+#include <dev/vt/vt.h>
+#include <dev/vt/hw/fb/vt_fb.h>
+#include <dev/vt/colors/vt_termcolors.h>
+
+static vd_init_t vt_efb_init;
+
+static struct vt_driver vt_fb_early_driver = {
+	.vd_init = vt_efb_init,
+	.vd_blank = vt_fb_blank,
+	.vd_bitbltchr = vt_fb_bitbltchr,
+	.vd_priority = VD_PRIORITY_GENERIC,
+};
+
+static struct fb_info info;
+VT_CONSDEV_DECLARE(vt_fb_early_driver,
+    MAX(80, PIXEL_WIDTH(VT_FB_DEFAULT_WIDTH)),
+    MAX(25, PIXEL_HEIGHT(VT_FB_DEFAULT_HEIGHT)), &info);
+
+static void
+#ifdef	FDT
+vt_efb_initialize(struct fb_info *info, phandle_t node)
+#else
+vt_efb_initialize(struct fb_info *info)
+#endif
+{
+#ifdef	FDT
+	char name[64];
+	cell_t retval;
+	ihandle_t ih;
+	int i;
+
+	/* Open display device, thereby initializing it */
+	memset(name, 0, sizeof(name));
+	OF_package_to_path(node, name, sizeof(name));
+	ih = OF_open(name);
+#endif
+
+	/*
+	 * Set up the color map
+	 */
+	switch (info->fb_depth) {
+	case 8:
+		vt_generate_vga_palette(info->fb_cmap, COLOR_FORMAT_RGB,
+		    0x7, 5, 0x7, 2, 0x3, 0);
+		break;
+	case 15:
+		vt_generate_vga_palette(info->fb_cmap, COLOR_FORMAT_RGB,
+		    0x1f, 10, 0x1f, 5, 0x1f, 0);
+		break;
+	case 16:
+		vt_generate_vga_palette(info->fb_cmap, COLOR_FORMAT_RGB,
+		    0x1f, 11, 0x3f, 5, 0x1f, 0);
+		break;
+	case 24:
+	case 32:
+#if BYTE_ORDER == BIG_ENDIAN
+		vt_generate_vga_palette(info->fb_cmap,
+		    COLOR_FORMAT_RGB, 255, 16, 255, 8, 255, 0);
+#else
+		vt_generate_vga_palette(info->fb_cmap,
+		    COLOR_FORMAT_RGB, 255, 0, 255, 8, 255, 16);
+#endif
+#ifdef	FDT
+		for (i = 0; i < 16; i++) {
+			OF_call_method("color!", ih, 4, 1,
+			    (cell_t)((info->fb_cmap[i] >> 16) & 0xff),
+			    (cell_t)((info->fb_cmap[i] >> 8) & 0xff),
+			    (cell_t)((info->fb_cmap[i] >> 0) & 0xff),
+			    (cell_t)i, &retval);
+		}
+#endif
+		break;
+
+	default:
+		panic("Unknown color space fb_depth %d", info->fb_depth);
+		break;
+        }
+}
+
+static int
+vt_efb_init(struct vt_device *vd)
+{
+	struct ofw_pci_register pciaddrs[8];
+	struct fb_info *info;
+	int i, len, n_pciaddrs;
+	phandle_t chosen, node;
+	ihandle_t stdout;
+	char type[64];
+
+	info = vd->vd_softc;
+
+	chosen = OF_finddevice("/chosen");
+	OF_getprop(chosen, "stdout", &stdout, sizeof(stdout));
+	node = OF_instance_to_package(stdout);
+	if (node == -1) {
+		/*
+		 * The "/chosen/stdout" does not exist try
+		 * using "screen" directly.
+		 */
+		node = OF_finddevice("screen");
+	}
+	OF_getprop(node, "device_type", type, sizeof(type));
+	if (strcmp(type, "display") != 0)
+		return (CN_DEAD);
+
+#define	GET(name, var)							\
+	if (OF_getproplen(node, (name)) != sizeof(info->fb_##var))	\
+		return (CN_DEAD);					\
+	OF_getencprop(node, (name), &info->fb_##var, sizeof(info->fb_##var)); \
+	if (info->fb_##var == 0)					\
+		return (CN_DEAD);
+
+	GET("height", height)
+	GET("width", width)
+	GET("depth", depth)
+	GET("linebytes", stride)
+#undef GET
+
+	info->fb_size = info->fb_height * info->fb_stride;
+
+	/*
+	 * Get the PCI addresses of the adapter, if present. The node may be the
+	 * child of the PCI device: in that case, try the parent for
+	 * the assigned-addresses property.
+	 */
+	len = OF_getprop(node, "assigned-addresses", pciaddrs,
+	    sizeof(pciaddrs));
+	if (len == -1) {
+		len = OF_getprop(OF_parent(node), "assigned-addresses",
+		    pciaddrs, sizeof(pciaddrs));
+        }
+        if (len == -1)
+                len = 0;
+	n_pciaddrs = len / sizeof(struct ofw_pci_register);
+
+	/*
+	 * Grab the physical address of the framebuffer, and then map it
+	 * into our memory space. If the MMU is not yet up, it will be
+	 * remapped for us when relocation turns on.
+	 */
+	if (OF_getproplen(node, "address") == sizeof(info->fb_pbase)) {
+	 	/* XXX We assume #address-cells is 1 at this point. */
+		OF_getencprop(node, "address", &info->fb_pbase,
+		    sizeof(info->fb_pbase));
+
+	#if defined(__powerpc__)
+		sc->sc_memt = &bs_be_tag;
+		bus_space_map(sc->sc_memt, info->fb_pbase, info->fb_size,
+		    BUS_SPACE_MAP_PREFETCHABLE, &info->fb_vbase);
+	#elif defined(__sparc64__)
+		OF_decode_addr(node, 0, &space, &phys);
+		sc->sc_memt = &vt_efb_memt[0];
+		info->addr = sparc64_fake_bustag(space, fb_phys, sc->sc_memt);
+	#else
+		bus_space_map(fdtbus_bs_tag, info->fb_pbase, info->fb_size,
+		    BUS_SPACE_MAP_PREFETCHABLE,
+		    (bus_space_handle_t *)&info->fb_vbase);
+	#endif
+	} else {
+		/*
+		 * Some IBM systems don't have an address property. Try to
+		 * guess the framebuffer region from the assigned addresses.
+		 * This is ugly, but there doesn't seem to be an alternative.
+		 * Linux does the same thing.
+		 */
+
+		info->fb_pbase = n_pciaddrs;
+		for (i = 0; i < n_pciaddrs; i++) {
+			/* If it is too small, not the framebuffer */
+			if (pciaddrs[i].size_lo < info->fb_size)
+				continue;
+			/* If it is not memory, it isn't either */
+			if (!(pciaddrs[i].phys_hi &
+			    OFW_PCI_PHYS_HI_SPACE_MEM32))
+				continue;
+
+			/* This could be the framebuffer */
+			info->fb_pbase = i;
+
+			/* If it is prefetchable, it certainly is */
+			if (pciaddrs[i].phys_hi & OFW_PCI_PHYS_HI_PREFETCHABLE)
+				break;
+		}
+
+		if (info->fb_pbase == n_pciaddrs) /* No candidates found */
+			return (CN_DEAD);
+
+	#if defined(__powerpc__)
+		OF_decode_addr(node, info->fb_pbase, &sc->sc_memt,
+		    &info->fb_vbase);
+	#elif defined(__sparc64__)
+		OF_decode_addr(node, info->fb_pbase, &space, &info->fb_pbase);
+		sc->sc_memt = &vt_efb_memt[0];
+		info->fb_vbase = sparc64_fake_bustag(space, info->fb_pbase,
+		    sc->sc_memt);
+	#else
+		bus_space_map(fdtbus_bs_tag, info->fb_pbase, info->fb_size,
+		    BUS_SPACE_MAP_PREFETCHABLE,
+		    (bus_space_handle_t *)&info->fb_vbase);
+	#endif
+        }
+
+
+	/* blank full size */
+	len = info->fb_size / 4;
+	for (i = 0; i < len; i++) {
+		((uint32_t *)info->fb_vbase)[i] = 0;
+	}
+
+	/* Get pixel storage size. */
+	info->fb_bpp = info->fb_stride / info->fb_width * 8;
+
+	/*
+	 * Early FB driver work with static window buffer 80x25, so reduce
+	 * size to 640x480.
+	 */
+	info->fb_width = VT_FB_DEFAULT_WIDTH;
+	info->fb_height = VT_FB_DEFAULT_HEIGHT;
+
+#ifdef	FDT
+	vt_efb_initialize(info, node);
+#else
+	vt_efb_initialize(info);
+#endif
+	fb_probe(info);
+	vt_fb_init(vd);
+
+
+	return (CN_INTERNAL);
+}
diff --git a/sys/dev/vt/hw/fb/vt_fb.c b/sys/dev/vt/hw/fb/vt_fb.c
new file mode 100644
index 00000000000..f1b673cda27
--- /dev/null
+++ b/sys/dev/vt/hw/fb/vt_fb.c
@@ -0,0 +1,246 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Aleksandr 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$
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/queue.h>
+#include <sys/fbio.h>
+#include <dev/vt/vt.h>
+#include <dev/vt/hw/fb/vt_fb.h>
+#include <dev/vt/colors/vt_termcolors.h>
+
+static struct vt_driver vt_fb_driver = {
+	.vd_init = vt_fb_init,
+	.vd_blank = vt_fb_blank,
+	.vd_bitbltchr = vt_fb_bitbltchr,
+	.vd_postswitch = vt_fb_postswitch,
+	.vd_priority = VD_PRIORITY_GENERIC+10,
+};
+
+void
+vt_fb_blank(struct vt_device *vd, term_color_t color)
+{
+	struct fb_info *info;
+	uint32_t c;
+	u_int o;
+
+	info = vd->vd_softc;
+	c = info->fb_cmap[color];
+
+	switch (FBTYPE_GET_BYTESPP(info)) {
+	case 1:
+		for (o = 0; o < info->fb_stride; o++)
+			info->wr1(info, o, c);
+		break;
+	case 2:
+		for (o = 0; o < info->fb_stride; o += 2)
+			info->wr2(info, o, c);
+		break;
+	case 3:
+		/* line 0 */
+		for (o = 0; o < info->fb_stride; o += 3) {
+			info->wr1(info, o, (c >> 16) & 0xff);
+			info->wr1(info, o + 1, (c >> 8) & 0xff);
+			info->wr1(info, o + 2, c & 0xff);
+		}
+		break;
+	case 4:
+		for (o = 0; o < info->fb_stride; o += 4)
+			info->wr4(info, o, c);
+		break;
+	default:
+		/* panic? */
+		return;
+	}
+	/* Copy line0 to all other lines. */
+	/* XXX will copy with borders. */
+	for (o = info->fb_stride; o < info->fb_size; o += info->fb_stride) {
+		info->copy(info, o, 0, info->fb_stride);
+	}
+}
+
+void
+vt_fb_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
+    int bpl, vt_axis_t top, vt_axis_t left, unsigned int width,
+    unsigned int height, term_color_t fg, term_color_t bg)
+{
+	struct fb_info *info;
+	uint32_t fgc, bgc, cc, o;
+	int c, l, bpp;
+	u_long line;
+	uint8_t b, m;
+	const uint8_t *ch;
+
+	info = vd->vd_softc;
+	bpp = FBTYPE_GET_BYTESPP(info);
+	fgc = info->fb_cmap[fg];
+	bgc = info->fb_cmap[bg];
+	b = m = 0;
+	if (bpl == 0)
+		bpl = (width + 7) >> 3; /* Bytes per sorce line. */
+
+	/* Don't try to put off screen pixels */
+	if (((left + width) > info->fb_width) || ((top + height) >
+	    info->fb_height))
+		return;
+
+	line = (info->fb_stride * top) + (left * bpp);
+	for (l = 0; l < height; l++) {
+		ch = src;
+		for (c = 0; c < width; c++) {
+			if (c % 8 == 0)
+				b = *ch++;
+			else
+				b <<= 1;
+			if (mask != NULL) {
+				if (c % 8 == 0)
+					m = *mask++;
+				else
+					m <<= 1;
+				/* Skip pixel write, if mask has no bit set. */
+				if ((m & 0x80) == 0)
+					continue;
+			}
+			o = line + (c * bpp);
+			cc = b & 0x80 ? fgc : bgc;
+
+			switch(bpp) {
+			case 1:
+				info->wr1(info, o, cc);
+				break;
+			case 2:
+				info->wr2(info, o, cc);
+				break;
+			case 3:
+				/* Packed mode, so unaligned. Byte access. */
+				info->wr1(info, o, (cc >> 16) & 0xff);
+				info->wr1(info, o + 1, (cc >> 8) & 0xff);
+				info->wr1(info, o + 2, cc & 0xff);
+				break;
+			case 4:
+				info->wr4(info, o, cc);
+				break;
+			default:
+				/* panic? */
+				break;
+			}
+		}
+		line += info->fb_stride;
+		src += bpl;
+	}
+}
+
+void
+vt_fb_postswitch(struct vt_device *vd)
+{
+	struct fb_info *info;
+
+	info = vd->vd_softc;
+
+	if (info->enter != NULL)
+		info->enter(info->fb_priv);
+}
+
+static int
+vt_fb_init_cmap(uint32_t *cmap, int depth)
+{
+
+	switch (depth) {
+	case 8:
+		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		    0x7, 5, 0x7, 2, 0x3, 0));
+	case 15:
+		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		    0x1f, 10, 0x1f, 5, 0x1f, 0));
+	case 16:
+		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		    0x1f, 11, 0x3f, 5, 0x1f, 0));
+	case 24:
+	case 32: /* Ignore alpha. */
+		return (vt_generate_vga_palette(cmap, COLOR_FORMAT_RGB,
+		    0xff, 0, 0xff, 8, 0xff, 16));
+	default:
+		return (1);
+	}
+}
+
+int
+vt_fb_init(struct vt_device *vd)
+{
+	struct fb_info *info;
+	int err;
+
+	info = vd->vd_softc;
+	vd->vd_height = info->fb_height;
+	vd->vd_width = info->fb_width;
+
+	if (info->fb_cmsize <= 0) {
+		err = vt_fb_init_cmap(info->fb_cmap, FBTYPE_GET_BPP(info));
+		if (err)
+			return (CN_DEAD);
+		info->fb_cmsize = 16;
+	}
+
+	/* Clear the screen. */
+	vt_fb_blank(vd, TC_BLACK);
+
+	/* Wakeup screen. KMS need this. */
+	vt_fb_postswitch(vd);
+
+	return (CN_INTERNAL);
+}
+
+int
+vt_fb_attach(struct fb_info *info)
+{
+
+	vt_allocate(&vt_fb_driver, info);
+
+	return (0);
+}
+
+void
+vt_fb_resume(void)
+{
+
+	vt_resume();
+}
+
+void
+vt_fb_suspend(void)
+{
+
+	vt_suspend();
+}
diff --git a/sys/dev/vt/hw/fb/vt_fb.h b/sys/dev/vt/hw/fb/vt_fb.h
new file mode 100644
index 00000000000..9b3aa0d9652
--- /dev/null
+++ b/sys/dev/vt/hw/fb/vt_fb.h
@@ -0,0 +1,47 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Aleksandr 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 _DEV_VT_HW_FB_VT_FB_H_
+#define	_DEV_VT_HW_FB_VT_FB_H_
+/* Generic framebuffer interface call vt_fb_attach to init VT(9) */
+int vt_fb_attach(struct fb_info *info);
+void vt_fb_resume(void);
+void vt_fb_suspend(void);
+
+int fb_probe(struct fb_info *info);
+
+vd_init_t	vt_fb_init;
+vd_blank_t	vt_fb_blank;
+vd_bitbltchr_t	vt_fb_bitbltchr;
+vd_postswitch_t	vt_fb_postswitch;
+
+
+#endif /* _DEV_VT_HW_FB_VT_FB_H_ */
diff --git a/sys/dev/vt/hw/ofwfb/ofwfb.c b/sys/dev/vt/hw/ofwfb/ofwfb.c
new file mode 100644
index 00000000000..8421d85ca74
--- /dev/null
+++ b/sys/dev/vt/hw/ofwfb/ofwfb.c
@@ -0,0 +1,348 @@
+/*-
+ * Copyright (c) 2011 Nathan Whitehorn
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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: user/ed/newcons/sys/dev/vt/hw/ofwfb/ofwfb.c 219888 2011-03-22 21:31:31Z ed $");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+
+#include <dev/vt/vt.h>
+#include <dev/vt/colors/vt_termcolors.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <machine/bus.h>
+#ifdef __sparc64__
+#include <machine/bus_private.h>
+#endif
+
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_pci.h>
+
+struct ofwfb_softc {
+	phandle_t	sc_node;
+
+	intptr_t	sc_addr;
+	int		sc_depth;
+	int		sc_stride;
+
+	bus_space_tag_t	sc_memt; 
+
+	uint32_t	sc_colormap[16];
+};
+
+static vd_init_t	ofwfb_init;
+static vd_blank_t	ofwfb_blank;
+static vd_bitbltchr_t	ofwfb_bitbltchr;
+
+static const struct vt_driver vt_ofwfb_driver = {
+	.vd_init	= ofwfb_init,
+	.vd_blank	= ofwfb_blank,
+	.vd_bitbltchr	= ofwfb_bitbltchr,
+	.vd_priority	= VD_PRIORITY_GENERIC+1,
+};
+
+static struct ofwfb_softc ofwfb_conssoftc;
+VT_CONSDEV_DECLARE(vt_ofwfb_driver, PIXEL_WIDTH(1920), PIXEL_HEIGHT(1200),
+    &ofwfb_conssoftc);
+/* XXX: hardcoded max size */
+
+static void
+ofwfb_blank(struct vt_device *vd, term_color_t color)
+{
+	struct ofwfb_softc *sc = vd->vd_softc;
+	u_int ofs;
+	uint32_t c;
+
+	switch (sc->sc_depth) {
+	case 8:
+		for (ofs = 0; ofs < sc->sc_stride*vd->vd_height; ofs++)
+			*(uint8_t *)(sc->sc_addr + ofs) = color;
+		break;
+	case 32:
+		c = sc->sc_colormap[color];
+		for (ofs = 0; ofs < sc->sc_stride*vd->vd_height; ofs++)
+			*(uint32_t *)(sc->sc_addr + 4*ofs) = c;
+		break;
+	default:
+		/* panic? */
+		break;
+	}
+}
+
+static void
+ofwfb_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
+    int bpl, vt_axis_t top, vt_axis_t left, unsigned int width,
+    unsigned int height, term_color_t fg, term_color_t bg)
+{
+	struct ofwfb_softc *sc = vd->vd_softc;
+	u_long line;
+	uint32_t fgc, bgc;
+	int c;
+	uint8_t b, m;
+
+	fgc = sc->sc_colormap[fg];
+	bgc = sc->sc_colormap[bg];
+	b = m = 0;
+
+	/* Don't try to put off screen pixels */
+	if (((left + width) > vd->vd_width) || ((top + height) >
+	    vd->vd_height))
+		return;
+
+	line = (sc->sc_stride * top) + left * sc->sc_depth/8;
+	for (; height > 0; height--) {
+		for (c = 0; c < width; c++) {
+			if (c % 8 == 0)
+				b = *src++;
+			else
+				b <<= 1;
+			if (mask != NULL) {
+				if (c % 8 == 0)
+					m = *mask++;
+				else
+					m <<= 1;
+				/* Skip pixel write, if mask has no bit set. */
+				if ((m & 0x80) == 0)
+					continue;
+			}
+			switch(sc->sc_depth) {
+			case 8:
+				*(uint8_t *)(sc->sc_addr + line + c) =
+				    b & 0x80 ? fg : bg;
+				break;
+			case 32:
+				*(uint32_t *)(sc->sc_addr + line + 4*c) = 
+				    (b & 0x80) ? fgc : bgc;
+				break;
+			default:
+				/* panic? */
+				break;
+			}
+		}
+		line += sc->sc_stride;
+	}
+}
+
+static void
+ofwfb_initialize(struct vt_device *vd)
+{
+	struct ofwfb_softc *sc = vd->vd_softc;
+	char name[64];
+	ihandle_t ih;
+	int i;
+	cell_t retval;
+	uint32_t oldpix;
+
+	/* Open display device, thereby initializing it */
+	memset(name, 0, sizeof(name));
+	OF_package_to_path(sc->sc_node, name, sizeof(name));
+	ih = OF_open(name);
+
+	/*
+	 * Set up the color map
+	 */
+
+	switch (sc->sc_depth) {
+	case 8:
+		vt_generate_vga_palette(sc->sc_colormap, COLOR_FORMAT_RGB, 255,
+		    0, 255, 8, 255, 16);
+
+		for (i = 0; i < 16; i++) {
+			OF_call_method("color!", ih, 4, 1,
+			    (cell_t)((sc->sc_colormap[i] >> 16) & 0xff),
+			    (cell_t)((sc->sc_colormap[i] >> 8) & 0xff),
+			    (cell_t)((sc->sc_colormap[i] >> 0) & 0xff),
+			    (cell_t)i, &retval);
+		}
+		break;
+
+	case 32:
+		/*
+		 * We bypass the usual bus_space_() accessors here, mostly
+		 * for performance reasons. In particular, we don't want
+		 * any barrier operations that may be performed and handle
+		 * endianness slightly different. Figure out the host-view
+		 * endianness of the frame buffer.
+		 */
+		oldpix = bus_space_read_4(sc->sc_memt, sc->sc_addr, 0);
+		bus_space_write_4(sc->sc_memt, sc->sc_addr, 0, 0xff000000);
+		if (*(uint8_t *)(sc->sc_addr) == 0xff)
+			vt_generate_vga_palette(sc->sc_colormap,
+			    COLOR_FORMAT_RGB, 255, 16, 255, 8, 255, 0);
+		else
+			vt_generate_vga_palette(sc->sc_colormap,
+			    COLOR_FORMAT_RGB, 255, 0, 255, 8, 255, 16);
+		bus_space_write_4(sc->sc_memt, sc->sc_addr, 0, oldpix);
+		break;
+
+	default:
+		panic("Unknown color space depth %d", sc->sc_depth);
+		break;
+        }
+
+	/* Clear the screen. */
+	ofwfb_blank(vd, TC_BLACK);
+}
+
+static int
+ofwfb_init(struct vt_device *vd)
+{
+	struct ofwfb_softc *sc = vd->vd_softc;
+	char type[64];
+	phandle_t chosen;
+	ihandle_t stdout;
+	phandle_t node;
+	uint32_t depth, height, width;
+	struct ofw_pci_register pciaddrs[8];
+	int n_pciaddrs;
+	uint32_t fb_phys;
+	int i, len;
+#ifdef __sparc64__
+	static struct bus_space_tag ofwfb_memt[1];
+	bus_addr_t phys;
+	int space;
+#endif
+
+	chosen = OF_finddevice("/chosen");
+	OF_getprop(chosen, "stdout", &stdout, sizeof(stdout));
+	node = OF_instance_to_package(stdout);
+	if (node == -1) {
+		/*
+		 * The "/chosen/stdout" does not exist try
+		 * using "screen" directly.
+		 */
+		node = OF_finddevice("screen");
+	}
+	OF_getprop(node, "device_type", type, sizeof(type));
+	if (strcmp(type, "display") != 0)
+		return (CN_DEAD);
+
+	/* Keep track of the OF node */
+	sc->sc_node = node;
+
+	/* Make sure we have needed properties */
+	if (OF_getproplen(node, "height") != sizeof(height) ||
+	    OF_getproplen(node, "width") != sizeof(width) ||
+	    OF_getproplen(node, "depth") != sizeof(depth) ||
+	    OF_getproplen(node, "linebytes") != sizeof(sc->sc_stride))
+		return (CN_DEAD);
+
+	/* Only support 8 and 32-bit framebuffers */
+	OF_getprop(node, "depth", &depth, sizeof(depth));
+	if (depth != 8 && depth != 32)
+		return (CN_DEAD);
+	sc->sc_depth = depth;
+
+	OF_getprop(node, "height", &height, sizeof(height));
+	OF_getprop(node, "width", &width, sizeof(width));
+	OF_getprop(node, "linebytes", &sc->sc_stride, sizeof(sc->sc_stride));
+
+	vd->vd_height = height;
+	vd->vd_width = width;
+
+	/*
+	 * Get the PCI addresses of the adapter, if present. The node may be the
+	 * child of the PCI device: in that case, try the parent for
+	 * the assigned-addresses property.
+	 */
+	len = OF_getprop(node, "assigned-addresses", pciaddrs,
+	    sizeof(pciaddrs));
+	if (len == -1) {
+		len = OF_getprop(OF_parent(node), "assigned-addresses",
+		    pciaddrs, sizeof(pciaddrs));
+        }
+        if (len == -1)
+                len = 0;
+	n_pciaddrs = len / sizeof(struct ofw_pci_register);
+
+	/*
+	 * Grab the physical address of the framebuffer, and then map it
+	 * into our memory space. If the MMU is not yet up, it will be
+	 * remapped for us when relocation turns on.
+	 */
+	if (OF_getproplen(node, "address") == sizeof(fb_phys)) {
+	 	/* XXX We assume #address-cells is 1 at this point. */
+		OF_getprop(node, "address", &fb_phys, sizeof(fb_phys));
+
+	#if defined(__powerpc__)
+		sc->sc_memt = &bs_be_tag;
+		bus_space_map(sc->sc_memt, fb_phys, height * sc->sc_stride,
+		    BUS_SPACE_MAP_PREFETCHABLE, &sc->sc_addr);
+	#elif defined(__sparc64__)
+		OF_decode_addr(node, 0, &space, &phys);
+		sc->sc_memt = &ofwfb_memt[0];
+		sc->sc_addr = sparc64_fake_bustag(space, fb_phys, sc->sc_memt);
+	#else
+		#error Unsupported platform!
+	#endif
+	} else {
+		/*
+		 * Some IBM systems don't have an address property. Try to
+		 * guess the framebuffer region from the assigned addresses.
+		 * This is ugly, but there doesn't seem to be an alternative.
+		 * Linux does the same thing.
+		 */
+
+		fb_phys = n_pciaddrs;
+		for (i = 0; i < n_pciaddrs; i++) {
+			/* If it is too small, not the framebuffer */
+			if (pciaddrs[i].size_lo < sc->sc_stride*height)
+				continue;
+			/* If it is not memory, it isn't either */
+			if (!(pciaddrs[i].phys_hi &
+			    OFW_PCI_PHYS_HI_SPACE_MEM32))
+				continue;
+
+			/* This could be the framebuffer */
+			fb_phys = i;
+
+			/* If it is prefetchable, it certainly is */
+			if (pciaddrs[i].phys_hi & OFW_PCI_PHYS_HI_PREFETCHABLE)
+				break;
+		}
+
+		if (fb_phys == n_pciaddrs) /* No candidates found */
+			return (CN_DEAD);
+
+	#if defined(__powerpc__)
+		OF_decode_addr(node, fb_phys, &sc->sc_memt, &sc->sc_addr);
+	#elif defined(__sparc64__)
+		OF_decode_addr(node, fb_phys, &space, &phys);
+		sc->sc_memt = &ofwfb_memt[0];
+		sc->sc_addr = sparc64_fake_bustag(space, phys, sc->sc_memt);
+	#endif
+        }
+
+	ofwfb_initialize(vd);
+
+	return (CN_INTERNAL);
+}
+
diff --git a/sys/dev/vt/hw/vga/vga.c b/sys/dev/vt/hw/vga/vga.c
new file mode 100644
index 00000000000..f658dc5ec96
--- /dev/null
+++ b/sys/dev/vt/hw/vga/vga.c
@@ -0,0 +1,604 @@
+/*-
+ * Copyright (c) 2005 Marcel Moolenaar
+ * All rights reserved.
+ *
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * Portions of this software were developed by Ed Schouten
+ * 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/kernel.h>
+#include <sys/systm.h>
+
+#include <dev/vt/vt.h>
+#include <dev/vt/hw/vga/vga_reg.h>
+
+#include <machine/bus.h>
+
+#if defined(__amd64__) || defined(__i386__)
+#include <vm/vm.h>
+#include <vm/pmap.h>
+#include <machine/pmap.h>
+#include <machine/vmparam.h>
+#endif /* __amd64__ || __i386__ */
+
+struct vga_softc {
+	bus_space_tag_t		 vga_fb_tag;
+	bus_space_handle_t	 vga_fb_handle;
+	bus_space_tag_t		 vga_reg_tag;
+	bus_space_handle_t	 vga_reg_handle;
+	int			 vga_curcolor;
+};
+
+/* Convenience macros. */
+#define	MEM_READ1(sc, ofs) \
+	bus_space_read_1(sc->vga_fb_tag, sc->vga_fb_handle, ofs)
+#define	MEM_WRITE1(sc, ofs, val) \
+	bus_space_write_1(sc->vga_fb_tag, sc->vga_fb_handle, ofs, val)
+#define	REG_READ1(sc, reg) \
+	bus_space_read_1(sc->vga_reg_tag, sc->vga_reg_handle, reg)
+#define	REG_WRITE1(sc, reg, val) \
+	bus_space_write_1(sc->vga_reg_tag, sc->vga_reg_handle, reg, val)
+
+#define	VT_VGA_WIDTH	640
+#define	VT_VGA_HEIGHT	480
+#define	VT_VGA_MEMSIZE	(VT_VGA_WIDTH * VT_VGA_HEIGHT / 8)
+
+static vd_init_t	vga_init;
+static vd_blank_t	vga_blank;
+static vd_bitbltchr_t	vga_bitbltchr;
+static vd_putchar_t	vga_putchar;
+
+static const struct vt_driver vt_vga_driver = {
+	.vd_init	= vga_init,
+	.vd_blank	= vga_blank,
+	.vd_bitbltchr	= vga_bitbltchr,
+	.vd_putchar	= vga_putchar,
+	.vd_priority	= VD_PRIORITY_GENERIC,
+};
+
+/*
+ * Driver supports both text mode and graphics mode.  Make sure the
+ * buffer is always big enough to support both.
+ */
+static struct vga_softc vga_conssoftc;
+VT_CONSDEV_DECLARE(vt_vga_driver, MAX(80, PIXEL_WIDTH(VT_VGA_WIDTH)),
+    MAX(25, PIXEL_HEIGHT(VT_VGA_HEIGHT)), &vga_conssoftc);
+
+static inline void
+vga_setcolor(struct vt_device *vd, term_color_t color)
+{
+	struct vga_softc *sc = vd->vd_softc;
+
+	if (sc->vga_curcolor != color) {
+		REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_SET_RESET);
+		REG_WRITE1(sc, VGA_GC_DATA, color);
+		sc->vga_curcolor = color;
+	}
+}
+
+static void
+vga_blank(struct vt_device *vd, term_color_t color)
+{
+	struct vga_softc *sc = vd->vd_softc;
+	u_int ofs;
+
+	vga_setcolor(vd, color);
+	for (ofs = 0; ofs < VT_VGA_MEMSIZE; ofs++)
+		MEM_WRITE1(sc, ofs, 0xff);
+}
+
+static inline void
+vga_bitblt_put(struct vt_device *vd, u_long dst, term_color_t color,
+    uint8_t v)
+{
+	struct vga_softc *sc = vd->vd_softc;
+
+	/* Skip empty writes, in order to avoid palette changes. */
+	if (v != 0x00) {
+		vga_setcolor(vd, color);
+		/*
+		 * When this MEM_READ1() gets disabled, all sorts of
+		 * artifacts occur.  This is because this read loads the
+		 * set of 8 pixels that are about to be changed.  There
+		 * is one scenario where we can avoid the read, namely
+		 * if all pixels are about to be overwritten anyway.
+		 */
+		if (v != 0xff)
+			MEM_READ1(sc, dst);
+		MEM_WRITE1(sc, dst, v);
+	}
+}
+
+static inline void
+vga_bitblt_draw(struct vt_device *vd, const uint8_t *src,
+    u_long ldst, uint8_t shift, unsigned int width, unsigned int height,
+    term_color_t color, int negate)
+{
+	u_long dst;
+	int w;
+	uint8_t b, r, out;
+
+	for (; height > 0; height--) {
+		dst = ldst;
+		ldst += VT_VGA_WIDTH / 8;
+		r = 0;
+		for (w = width; w > 0; w -= 8) {
+			b = *src++;
+			if (negate) {
+				b = ~b;
+				/* Don't go too far. */
+				if (w < 8)
+					b &= 0xff << (8 - w);
+			}
+			/* Reintroduce bits from previous column. */
+			out = (b >> shift) | r;
+			r = b << (8 - shift);
+			vga_bitblt_put(vd, dst++, color, out);
+		}
+		/* Print the remainder. */
+		vga_bitblt_put(vd, dst, color, r);
+	}
+}
+
+static void
+vga_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
+    int bpl, vt_axis_t top, vt_axis_t left, unsigned int width,
+    unsigned int height, term_color_t fg, term_color_t bg)
+{
+	struct vga_softc *sc = vd->vd_softc;
+	u_long dst;
+	uint8_t shift;
+
+	dst = (VT_VGA_WIDTH * top + left) / 8;
+	shift = left % 8;
+
+	/* Don't try to put off screen pixels */
+	if (((left + width) > VT_VGA_WIDTH) || ((top + height) >
+	    VT_VGA_HEIGHT))
+		return;
+
+	if (sc->vga_curcolor == fg) {
+		vga_bitblt_draw(vd, src, dst, shift, width, height, fg, 0);
+		vga_bitblt_draw(vd, src, dst, shift, width, height, bg, 1);
+	} else {
+		vga_bitblt_draw(vd, src, dst, shift, width, height, bg, 1);
+		vga_bitblt_draw(vd, src, dst, shift, width, height, fg, 0);
+	}
+}
+
+/*
+ * Binary searchable table for Unicode to CP437 conversion.
+ */
+
+struct unicp437 {
+	uint16_t	unicode_base;
+	uint8_t		cp437_base;
+	uint8_t		length;
+};
+
+static const struct unicp437 cp437table[] = {
+	{ 0x0020, 0x20, 0x5e }, { 0x00a0, 0x20, 0x00 },
+	{ 0x00a1, 0xad, 0x00 }, { 0x00a2, 0x9b, 0x00 },
+	{ 0x00a3, 0x9c, 0x00 }, { 0x00a5, 0x9d, 0x00 },
+	{ 0x00a7, 0x15, 0x00 }, { 0x00aa, 0xa6, 0x00 },
+	{ 0x00ab, 0xae, 0x00 }, { 0x00ac, 0xaa, 0x00 },
+	{ 0x00b0, 0xf8, 0x00 }, { 0x00b1, 0xf1, 0x00 },
+	{ 0x00b2, 0xfd, 0x00 }, { 0x00b5, 0xe6, 0x00 },
+	{ 0x00b6, 0x14, 0x00 }, { 0x00b7, 0xfa, 0x00 },
+	{ 0x00ba, 0xa7, 0x00 }, { 0x00bb, 0xaf, 0x00 },
+	{ 0x00bc, 0xac, 0x00 }, { 0x00bd, 0xab, 0x00 },
+	{ 0x00bf, 0xa8, 0x00 }, { 0x00c4, 0x8e, 0x01 },
+	{ 0x00c6, 0x92, 0x00 }, { 0x00c7, 0x80, 0x00 },
+	{ 0x00c9, 0x90, 0x00 }, { 0x00d1, 0xa5, 0x00 },
+	{ 0x00d6, 0x99, 0x00 }, { 0x00dc, 0x9a, 0x00 },
+	{ 0x00df, 0xe1, 0x00 }, { 0x00e0, 0x85, 0x00 },
+	{ 0x00e1, 0xa0, 0x00 }, { 0x00e2, 0x83, 0x00 },
+	{ 0x00e4, 0x84, 0x00 }, { 0x00e5, 0x86, 0x00 },
+	{ 0x00e6, 0x91, 0x00 }, { 0x00e7, 0x87, 0x00 },
+	{ 0x00e8, 0x8a, 0x00 }, { 0x00e9, 0x82, 0x00 },
+	{ 0x00ea, 0x88, 0x01 }, { 0x00ec, 0x8d, 0x00 },
+	{ 0x00ed, 0xa1, 0x00 }, { 0x00ee, 0x8c, 0x00 },
+	{ 0x00ef, 0x8b, 0x00 }, { 0x00f0, 0xeb, 0x00 },
+	{ 0x00f1, 0xa4, 0x00 }, { 0x00f2, 0x95, 0x00 },
+	{ 0x00f3, 0xa2, 0x00 }, { 0x00f4, 0x93, 0x00 },
+	{ 0x00f6, 0x94, 0x00 }, { 0x00f7, 0xf6, 0x00 },
+	{ 0x00f8, 0xed, 0x00 }, { 0x00f9, 0x97, 0x00 },
+	{ 0x00fa, 0xa3, 0x00 }, { 0x00fb, 0x96, 0x00 },
+	{ 0x00fc, 0x81, 0x00 }, { 0x00ff, 0x98, 0x00 },
+	{ 0x0192, 0x9f, 0x00 }, { 0x0393, 0xe2, 0x00 },
+	{ 0x0398, 0xe9, 0x00 }, { 0x03a3, 0xe4, 0x00 },
+	{ 0x03a6, 0xe8, 0x00 }, { 0x03a9, 0xea, 0x00 },
+	{ 0x03b1, 0xe0, 0x01 }, { 0x03b4, 0xeb, 0x00 },
+	{ 0x03b5, 0xee, 0x00 }, { 0x03bc, 0xe6, 0x00 },
+	{ 0x03c0, 0xe3, 0x00 }, { 0x03c3, 0xe5, 0x00 },
+	{ 0x03c4, 0xe7, 0x00 }, { 0x03c6, 0xed, 0x00 },
+	{ 0x03d5, 0xed, 0x00 }, { 0x2010, 0x2d, 0x00 },
+	{ 0x2014, 0x2d, 0x00 }, { 0x2018, 0x60, 0x00 },
+	{ 0x2019, 0x27, 0x00 }, { 0x201c, 0x22, 0x00 },
+	{ 0x201d, 0x22, 0x00 }, { 0x2022, 0x07, 0x00 },
+	{ 0x203c, 0x13, 0x00 }, { 0x207f, 0xfc, 0x00 },
+	{ 0x20a7, 0x9e, 0x00 }, { 0x20ac, 0xee, 0x00 },
+	{ 0x2126, 0xea, 0x00 }, { 0x2190, 0x1b, 0x00 },
+	{ 0x2191, 0x18, 0x00 }, { 0x2192, 0x1a, 0x00 },
+	{ 0x2193, 0x19, 0x00 }, { 0x2194, 0x1d, 0x00 },
+	{ 0x2195, 0x12, 0x00 }, { 0x21a8, 0x17, 0x00 },
+	{ 0x2202, 0xeb, 0x00 }, { 0x2208, 0xee, 0x00 },
+	{ 0x2211, 0xe4, 0x00 }, { 0x2212, 0x2d, 0x00 },
+	{ 0x2219, 0xf9, 0x00 }, { 0x221a, 0xfb, 0x00 },
+	{ 0x221e, 0xec, 0x00 }, { 0x221f, 0x1c, 0x00 },
+	{ 0x2229, 0xef, 0x00 }, { 0x2248, 0xf7, 0x00 },
+	{ 0x2261, 0xf0, 0x00 }, { 0x2264, 0xf3, 0x00 },
+	{ 0x2265, 0xf2, 0x00 }, { 0x2302, 0x7f, 0x00 },
+	{ 0x2310, 0xa9, 0x00 }, { 0x2320, 0xf4, 0x00 },
+	{ 0x2321, 0xf5, 0x00 }, { 0x2500, 0xc4, 0x00 },
+	{ 0x2502, 0xb3, 0x00 }, { 0x250c, 0xda, 0x00 },
+	{ 0x2510, 0xbf, 0x00 }, { 0x2514, 0xc0, 0x00 },
+	{ 0x2518, 0xd9, 0x00 }, { 0x251c, 0xc3, 0x00 },
+	{ 0x2524, 0xb4, 0x00 }, { 0x252c, 0xc2, 0x00 },
+	{ 0x2534, 0xc1, 0x00 }, { 0x253c, 0xc5, 0x00 },
+	{ 0x2550, 0xcd, 0x00 }, { 0x2551, 0xba, 0x00 },
+	{ 0x2552, 0xd5, 0x00 }, { 0x2553, 0xd6, 0x00 },
+	{ 0x2554, 0xc9, 0x00 }, { 0x2555, 0xb8, 0x00 },
+	{ 0x2556, 0xb7, 0x00 }, { 0x2557, 0xbb, 0x00 },
+	{ 0x2558, 0xd4, 0x00 }, { 0x2559, 0xd3, 0x00 },
+	{ 0x255a, 0xc8, 0x00 }, { 0x255b, 0xbe, 0x00 },
+	{ 0x255c, 0xbd, 0x00 }, { 0x255d, 0xbc, 0x00 },
+	{ 0x255e, 0xc6, 0x01 }, { 0x2560, 0xcc, 0x00 },
+	{ 0x2561, 0xb5, 0x00 }, { 0x2562, 0xb6, 0x00 },
+	{ 0x2563, 0xb9, 0x00 }, { 0x2564, 0xd1, 0x01 },
+	{ 0x2566, 0xcb, 0x00 }, { 0x2567, 0xcf, 0x00 },
+	{ 0x2568, 0xd0, 0x00 }, { 0x2569, 0xca, 0x00 },
+	{ 0x256a, 0xd8, 0x00 }, { 0x256b, 0xd7, 0x00 },
+	{ 0x256c, 0xce, 0x00 }, { 0x2580, 0xdf, 0x00 },
+	{ 0x2584, 0xdc, 0x00 }, { 0x2588, 0xdb, 0x00 },
+	{ 0x258c, 0xdd, 0x00 }, { 0x2590, 0xde, 0x00 },
+	{ 0x2591, 0xb0, 0x02 }, { 0x25a0, 0xfe, 0x00 },
+	{ 0x25ac, 0x16, 0x00 }, { 0x25b2, 0x1e, 0x00 },
+	{ 0x25ba, 0x10, 0x00 }, { 0x25bc, 0x1f, 0x00 },
+	{ 0x25c4, 0x11, 0x00 }, { 0x25cb, 0x09, 0x00 },
+	{ 0x25d8, 0x08, 0x00 }, { 0x25d9, 0x0a, 0x00 },
+	{ 0x263a, 0x01, 0x01 }, { 0x263c, 0x0f, 0x00 },
+	{ 0x2640, 0x0c, 0x00 }, { 0x2642, 0x0b, 0x00 },
+	{ 0x2660, 0x06, 0x00 }, { 0x2663, 0x05, 0x00 },
+	{ 0x2665, 0x03, 0x01 }, { 0x266a, 0x0d, 0x01 },
+};
+
+static uint8_t
+vga_get_cp437(term_char_t c)
+{
+	int min, mid, max;
+
+	min = 0;
+	max = (sizeof(cp437table) / sizeof(struct unicp437)) - 1;
+
+	if (c < cp437table[0].unicode_base ||
+	    c > cp437table[max].unicode_base + cp437table[max].length)
+		return '?';
+
+	while (max >= min) {
+		mid = (min + max) / 2;
+		if (c < cp437table[mid].unicode_base)
+			max = mid - 1;
+		else if (c > cp437table[mid].unicode_base +
+		    cp437table[mid].length)
+			min = mid + 1;
+		else
+			return (c - cp437table[mid].unicode_base +
+			    cp437table[mid].cp437_base);
+	}
+
+	return '?';
+}
+
+static void
+vga_putchar(struct vt_device *vd, term_char_t c,
+    vt_axis_t top, vt_axis_t left, term_color_t fg, term_color_t bg)
+{
+	struct vga_softc *sc = vd->vd_softc;
+	uint8_t ch, attr;
+
+	/*
+	 * Convert character to CP437, which is the character set used
+	 * by the VGA hardware by default.
+	 */
+	ch = vga_get_cp437(c);
+
+	/*
+	 * Convert colors to VGA attributes.
+	 */
+	attr = bg << 4 | fg;
+
+	MEM_WRITE1(sc, 0x18000 + (top * 80 + left) * 2 + 0, ch);
+	MEM_WRITE1(sc, 0x18000 + (top * 80 + left) * 2 + 1, attr);
+}
+
+static void
+vga_initialize_graphics(struct vt_device *vd)
+{
+	struct vga_softc *sc = vd->vd_softc;
+
+	/* Clock select. */
+	REG_WRITE1(sc, VGA_GEN_MISC_OUTPUT_W, VGA_GEN_MO_VSP | VGA_GEN_MO_HSP |
+	    VGA_GEN_MO_PB | VGA_GEN_MO_ER | VGA_GEN_MO_IOA);
+	/* Set sequencer clocking and memory mode. */
+	REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_CLOCKING_MODE);
+	REG_WRITE1(sc, VGA_SEQ_DATA, VGA_SEQ_CM_89);
+	REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_MEMORY_MODE);
+	REG_WRITE1(sc, VGA_SEQ_DATA, VGA_SEQ_MM_OE | VGA_SEQ_MM_EM);
+
+	/* Set the graphics controller in graphics mode. */
+	REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_MISCELLANEOUS);
+	REG_WRITE1(sc, VGA_GC_DATA, 0x04 + VGA_GC_MISC_GA);
+	/* Program the CRT controller. */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_HORIZ_TOTAL);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0x5f);			/* 760 */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_HORIZ_DISP_END);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0x4f);			/* 640 - 8 */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_START_HORIZ_BLANK);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0x50);			/* 640 */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_END_HORIZ_BLANK);
+	REG_WRITE1(sc, VGA_CRTC_DATA, VGA_CRTC_EHB_CR + 2);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_START_HORIZ_RETRACE);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0x54);			/* 672 */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_END_HORIZ_RETRACE);
+	REG_WRITE1(sc, VGA_CRTC_DATA, VGA_CRTC_EHR_EHB + 0);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_VERT_TOTAL);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0x0b);			/* 523 */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_OVERFLOW);
+	REG_WRITE1(sc, VGA_CRTC_DATA, VGA_CRTC_OF_VT9 | VGA_CRTC_OF_LC8 |
+	    VGA_CRTC_OF_VBS8 | VGA_CRTC_OF_VRS8 | VGA_CRTC_OF_VDE8);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_MAX_SCAN_LINE);
+	REG_WRITE1(sc, VGA_CRTC_DATA, VGA_CRTC_MSL_LC9);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_VERT_RETRACE_START);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0xea);			/* 480 + 10 */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_VERT_RETRACE_END);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0x0c);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_VERT_DISPLAY_END);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0xdf);			/* 480 - 1*/
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_OFFSET);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0x28);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_START_VERT_BLANK);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0xe7);			/* 480 + 7 */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_END_VERT_BLANK);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0x04);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_MODE_CONTROL);
+	REG_WRITE1(sc, VGA_CRTC_DATA, VGA_CRTC_MC_WB | VGA_CRTC_MC_AW |
+	    VGA_CRTC_MC_SRS | VGA_CRTC_MC_CMS);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_LINE_COMPARE);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0xff);			/* 480 + 31 */
+
+	REG_WRITE1(sc, VGA_GEN_FEATURE_CTRL_W, 0);
+
+	REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_MAP_MASK);
+	REG_WRITE1(sc, VGA_SEQ_DATA, VGA_SEQ_MM_EM3 | VGA_SEQ_MM_EM2 |
+	    VGA_SEQ_MM_EM1 | VGA_SEQ_MM_EM0);
+	REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_CHAR_MAP_SELECT);
+	REG_WRITE1(sc, VGA_SEQ_DATA, 0);
+
+	REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_SET_RESET);
+	REG_WRITE1(sc, VGA_GC_DATA, 0);
+	REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_ENABLE_SET_RESET);
+	REG_WRITE1(sc, VGA_GC_DATA, 0x0f);
+	REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_COLOR_COMPARE);
+	REG_WRITE1(sc, VGA_GC_DATA, 0);
+	REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_DATA_ROTATE);
+	REG_WRITE1(sc, VGA_GC_DATA, 0);
+	REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_READ_MAP_SELECT);
+	REG_WRITE1(sc, VGA_GC_DATA, 0);
+	REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_MODE);
+	REG_WRITE1(sc, VGA_GC_DATA, 0);
+	REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_COLOR_DONT_CARE);
+	REG_WRITE1(sc, VGA_GC_DATA, 0x0f);
+	REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_BIT_MASK);
+	REG_WRITE1(sc, VGA_GC_DATA, 0xff);
+}
+
+static void
+vga_initialize(struct vt_device *vd, int textmode)
+{
+	struct vga_softc *sc = vd->vd_softc;
+	uint8_t x;
+
+	/* Make sure the VGA adapter is not in monochrome emulation mode. */
+	x = REG_READ1(sc, VGA_GEN_MISC_OUTPUT_R);
+	REG_WRITE1(sc, VGA_GEN_MISC_OUTPUT_W, x | VGA_GEN_MO_IOA);
+
+	/* Unprotect CRTC registers 0-7. */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_VERT_RETRACE_END);
+	x = REG_READ1(sc, VGA_CRTC_DATA);
+	REG_WRITE1(sc, VGA_CRTC_DATA, x & ~VGA_CRTC_VRE_PR);
+
+	/*
+	 * Wait for the vertical retrace.
+	 * NOTE: this code reads the VGA_GEN_INPUT_STAT_1 register, which has
+	 * the side-effect of clearing the internal flip-flip of the attribute
+	 * controller's write register. This means that because this code is
+	 * here, we know for sure that the first write to the attribute
+	 * controller will be a write to the address register. Removing this
+	 * code therefore also removes that guarantee and appropriate measures
+	 * need to be taken.
+	 */
+	do {
+		x = REG_READ1(sc, VGA_GEN_INPUT_STAT_1);
+		x &= VGA_GEN_IS1_VR | VGA_GEN_IS1_DE;
+	} while (x != (VGA_GEN_IS1_VR | VGA_GEN_IS1_DE));
+
+	/* Now, disable the sync. signals. */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_MODE_CONTROL);
+	x = REG_READ1(sc, VGA_CRTC_DATA);
+	REG_WRITE1(sc, VGA_CRTC_DATA, x & ~VGA_CRTC_MC_HR);
+
+	/* Asynchronous sequencer reset. */
+	REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_RESET);
+	REG_WRITE1(sc, VGA_SEQ_DATA, VGA_SEQ_RST_SR);
+
+	if (!textmode)
+		vga_initialize_graphics(vd);
+
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_PRESET_ROW_SCAN);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_CURSOR_START);
+	REG_WRITE1(sc, VGA_CRTC_DATA, VGA_CRTC_CS_COO);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_CURSOR_END);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_START_ADDR_HIGH);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_START_ADDR_LOW);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_CURSOR_LOC_HIGH);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_CURSOR_LOC_LOW);
+	REG_WRITE1(sc, VGA_CRTC_DATA, 0x59);
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_UNDERLINE_LOC);
+	REG_WRITE1(sc, VGA_CRTC_DATA, VGA_CRTC_UL_UL);
+
+	if (textmode) {
+		/* Set the attribute controller to blink disable. */
+		REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_MODE_CONTROL);
+		REG_WRITE1(sc, VGA_AC_WRITE, 0);
+	} else {
+		/* Set the attribute controller in graphics mode. */
+		REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_MODE_CONTROL);
+		REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_MC_GA);
+		REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_HORIZ_PIXEL_PANNING);
+		REG_WRITE1(sc, VGA_AC_WRITE, 0);
+	}
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(0));
+	REG_WRITE1(sc, VGA_AC_WRITE, 0);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(1));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_R);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(2));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_G);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(3));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_SG | VGA_AC_PAL_R);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(4));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_B);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(5));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_R | VGA_AC_PAL_B);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(6));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_G | VGA_AC_PAL_B);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(7));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_R | VGA_AC_PAL_G | VGA_AC_PAL_B);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(8));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_SR | VGA_AC_PAL_SG |
+	    VGA_AC_PAL_SB);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(9));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_SR | VGA_AC_PAL_SG |
+	    VGA_AC_PAL_SB | VGA_AC_PAL_R);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(10));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_SR | VGA_AC_PAL_SG |
+	    VGA_AC_PAL_SB | VGA_AC_PAL_G);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(11));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_SR | VGA_AC_PAL_SG |
+	    VGA_AC_PAL_SB | VGA_AC_PAL_R | VGA_AC_PAL_G);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(12));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_SR | VGA_AC_PAL_SG |
+	    VGA_AC_PAL_SB | VGA_AC_PAL_B);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(13));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_SR | VGA_AC_PAL_SG |
+	    VGA_AC_PAL_SB | VGA_AC_PAL_R | VGA_AC_PAL_B);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(14));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_SR | VGA_AC_PAL_SG |
+	    VGA_AC_PAL_SB | VGA_AC_PAL_G | VGA_AC_PAL_B);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PALETTE(15));
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_PAL_SR | VGA_AC_PAL_SG |
+	    VGA_AC_PAL_SB | VGA_AC_PAL_R | VGA_AC_PAL_G | VGA_AC_PAL_B);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_OVERSCAN_COLOR);
+	REG_WRITE1(sc, VGA_AC_WRITE, 0);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_COLOR_PLANE_ENABLE);
+	REG_WRITE1(sc, VGA_AC_WRITE, 0x0f);
+	REG_WRITE1(sc, VGA_AC_WRITE, VGA_AC_COLOR_SELECT);
+	REG_WRITE1(sc, VGA_AC_WRITE, 0);
+
+	if (!textmode) {
+		u_int ofs;
+
+		/*
+		 * Done.  Clear the frame buffer.  All bit planes are
+		 * enabled, so a single-paged loop should clear all
+		 * planes.
+		 */
+		for (ofs = 0; ofs < VT_VGA_MEMSIZE; ofs++) {
+			MEM_READ1(sc, ofs);
+			MEM_WRITE1(sc, ofs, 0);
+		}
+	}
+
+	/* Re-enable the sequencer. */
+	REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_RESET);
+	REG_WRITE1(sc, VGA_SEQ_DATA, VGA_SEQ_RST_SR | VGA_SEQ_RST_NAR);
+	/* Re-enable the sync signals. */
+	REG_WRITE1(sc, VGA_CRTC_ADDRESS, VGA_CRTC_MODE_CONTROL);
+	x = REG_READ1(sc, VGA_CRTC_DATA);
+	REG_WRITE1(sc, VGA_CRTC_DATA, x | VGA_CRTC_MC_HR);
+
+	if (!textmode) {
+		/* Switch to write mode 3, because we'll mainly do bitblt. */
+		REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_MODE);
+		REG_WRITE1(sc, VGA_GC_DATA, 3);
+		REG_WRITE1(sc, VGA_GC_ADDRESS, VGA_GC_ENABLE_SET_RESET);
+		REG_WRITE1(sc, VGA_GC_DATA, 0x0f);
+	}
+}
+
+static int
+vga_init(struct vt_device *vd)
+{
+	struct vga_softc *sc = vd->vd_softc;
+	int textmode = 0;
+
+#if defined(__amd64__) || defined(__i386__)
+	sc->vga_fb_tag = X86_BUS_SPACE_MEM;
+	sc->vga_fb_handle = KERNBASE + VGA_MEM_BASE;
+	sc->vga_reg_tag = X86_BUS_SPACE_IO;
+	sc->vga_reg_handle = VGA_REG_BASE;
+#elif defined(__ia64__)
+	sc->vga_fb_tag = IA64_BUS_SPACE_MEM;
+	sc->vga_fb_handle = IA64_PHYS_TO_RR6(VGA_MEM_BASE);
+	sc->vga_reg_tag = IA64_BUS_SPACE_IO;
+	sc->vga_reg_handle = VGA_REG_BASE;
+#else
+# error "Architecture not yet supported!"
+#endif
+
+	TUNABLE_INT_FETCH("hw.vga.textmode", &textmode);
+	if (textmode) {
+		vd->vd_flags |= VDF_TEXTMODE;
+		vd->vd_width = 80;
+		vd->vd_height = 25;
+	} else {
+		vd->vd_width = VT_VGA_WIDTH;
+		vd->vd_height = VT_VGA_HEIGHT;
+	}
+	vga_initialize(vd, textmode);
+
+	return (CN_INTERNAL);
+}
diff --git a/sys/dev/vt/hw/vga/vga_reg.h b/sys/dev/vt/hw/vga/vga_reg.h
new file mode 100644
index 00000000000..5bfb8ce585d
--- /dev/null
+++ b/sys/dev/vt/hw/vga/vga_reg.h
@@ -0,0 +1,220 @@
+/*-
+ * Copyright (c) 2005 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 ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED 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_VT_HW_VGA_VGA_REG_H_
+#define	_DEV_VT_HW_VGA_VGA_REG_H_
+
+/*
+ * The VGA adapter uses two I/O port blocks. One of these blocks, the CRT
+ * controller registers, can be located either at 0x3B0 or at 0x3D0 in I/O
+ * port space. This allows compatibility with the monochrome adapter, which
+ * has the CRT controller registers at 0x3B0.
+ *
+ * It is assumed that compatibility with the monochrome adapter is not of
+ * interest anymore. As such, the CRT controller can be located at 0x3D0 in
+ * I/O port space unconditionally. This means that the 2 I/O blocks are
+ * always adjacent and can therefore be treated as a single logical I/O port
+ * range. In practical terms: there only has to be a single tag and handle
+ * to access all registers.
+ *
+ * The following definitions are taken from or inspired by:
+ *   Programmer's Guide to the EGA, VGA, and Super VGA Cards -- 3rd ed.,
+ *     Richard F. Ferraro, Addison-Wesley, ISBN 0-201-62490-7
+ */
+
+#define	VGA_MEM_BASE	0xA0000
+#define	VGA_MEM_SIZE	0x10000
+#define	VGA_REG_BASE	0x3c0
+#define	VGA_REG_SIZE	0x10+0x0c
+
+/* Attribute controller registers. */
+#define	VGA_AC_WRITE		0x00
+#define	VGA_AC_READ		0x01
+#define	VGA_AC_PALETTE(x)		(x)	/* 0 <= x <= 15 */
+#define		VGA_AC_PAL_SR		0x20	/* Secondary red */
+#define		VGA_AC_PAL_SG		0x10	/* Secondary green */
+#define		VGA_AC_PAL_SB		0x08	/* Secondary blue */
+#define		VGA_AC_PAL_R		0x04	/* Red */
+#define		VGA_AC_PAL_G		0x02	/* Green */
+#define		VGA_AC_PAL_B		0x01	/* Blue */
+#define	VGA_AC_MODE_CONTROL		(32+16)
+#define		VGA_AC_MC_IPS		0x80	/* Internal palette size */
+#define		VGA_AC_MC_PCS		0x40	/* Pixel clock select */
+#define		VGA_AC_MC_PPC		0x20	/* Pixel panning compat. */
+#define		VGA_AC_MC_BI		0x08	/* Blink/intensity */
+#define		VGA_AC_MC_ELG		0x04	/* Enable line graphics cc. */
+#define		VGA_AC_MC_DT		0x02	/* Display type */
+#define		VGA_AC_MC_GA		0x01	/* Graphics/alphanumeric */
+#define	VGA_AC_OVERSCAN_COLOR		(32+17)
+#define	VGA_AC_COLOR_PLANE_ENABLE	(32+18)
+#define	VGA_AC_HORIZ_PIXEL_PANNING	(32+19)
+#define	VGA_AC_COLOR_SELECT		(32+20)
+#define		VGA_AC_CS_C67		0x0C	/* Color reg. addr. bits 6+7 */
+#define		VGA_AC_CS_C45		0x03	/* Color reg. addr. bits 4+5 */
+
+/* General registers. */
+#define	VGA_GEN_MISC_OUTPUT_W	0x02		/* Write only. */
+#define	VGA_GEN_MISC_OUTPUT_R	0x0c		/* Read only. */
+#define		VGA_GEN_MO_VSP		0x80	/* Vertical sync. polarity */
+#define		VGA_GEN_MO_HSP		0x40	/* Horiz. sync. polarity */
+#define		VGA_GEN_MO_PB		0x20	/* Page bit for odd/even */
+#define		VGA_GEN_MO_CS		0x0C	/* Clock select */
+#define		VGA_GEN_MO_ER		0x02	/* Enable RAM */
+#define		VGA_GEN_MO_IOA		0x01	/* Input/output address */
+#define	VGA_GEN_INPUT_STAT_0	0x02		/* Read only. */
+#define	VGA_GEN_FEATURE_CTRL_W	0x1a		/* Write only. */
+#define	VGA_GEN_FEATURE_CTRL_R	0x0a		/* Read only. */
+#define	VGA_GEN_INPUT_STAT_1	0x1a		/* Read only. */
+#define		VGA_GEN_IS1_VR		0x08	/* Vertical retrace */
+#define		VGA_GEN_IS1_DE		0x01	/* Display enable not */
+
+/* Sequencer registers. */
+#define	VGA_SEQ_ADDRESS		0x04
+#define	VGA_SEQ_RESET			0
+#define		VGA_SEQ_RST_SR		0x02	/* Synchronous reset */
+#define		VGA_SEQ_RST_NAR		0x01	/* No async. reset */
+#define	VGA_SEQ_CLOCKING_MODE		1
+#define		VGA_SEQ_CM_SO		0x20	/* Screen off */
+#define		VGA_SEQ_CM_S4		0x10	/* Shift four */
+#define		VGA_SEQ_CM_DC		0x08	/* Dot clock */
+#define		VGA_SEQ_CM_SL		0x04	/* Shift load */
+#define		VGA_SEQ_CM_89		0x01	/* 8/9 Dot clocks */
+#define	VGA_SEQ_MAP_MASK		2
+#define		VGA_SEQ_MM_EM3		0x08	/* Enable memory plane 3 */
+#define		VGA_SEQ_MM_EM2		0x04	/* Enable memory plane 2 */
+#define		VGA_SEQ_MM_EM1		0x02	/* Enable memory plane 1 */
+#define		VGA_SEQ_MM_EM0		0x01	/* Enable memory plane 0 */
+#define	VGA_SEQ_CHAR_MAP_SELECT		3
+#define		VGA_SEQ_CMS_SAH		0x20	/* Char. A (bit 2) */
+#define		VGA_SEQ_CMS_SBH		0x10	/* Char. B (bit 2) */
+#define		VGA_SEQ_CMS_SA		0x0C	/* Char. A (bit 0+1) */
+#define		VGA_SEQ_CMS_SB		0x03	/* Char. B (bit 0+1) */
+#define	VGA_SEQ_MEMORY_MODE		4
+#define		VGA_SEQ_MM_C4		0x08	/* Chain four */
+#define		VGA_SEQ_MM_OE		0x04	/* Odd/even */
+#define		VGA_SEQ_MM_EM		0x02	/* Extended memory */
+#define	VGA_SEQ_DATA		0x05
+
+/* Color registers. */
+#define	VGA_PEL_MASK		0x06
+#define	VGA_PEL_ADDR_RD_MODE	0x07		/* Write only. */
+#define	VGA_DAC_STATE		0x07		/* Read only. */
+#define	VGA_PEL_ADDR_WR_MODE	0x08
+#define	VGA_PEL_DATA		0x09
+
+/* Graphics controller registers. */
+#define	VGA_GC_ADDRESS		0x0e
+#define	VGA_GC_SET_RESET		0
+#define	VGA_GC_ENABLE_SET_RESET		1
+#define	VGA_GC_COLOR_COMPARE		2
+#define	VGA_GC_DATA_ROTATE		3
+#define		VGA_GC_DR_FS_XOR	0x18	/* Function select - XOR */
+#define		VGA_GC_DR_FS_OR		0x10	/* Function select - OR */
+#define		VGA_GC_DR_FS_AND	0x08	/* Function select - AND */
+#define		VGA_GC_DR_RC		0x07	/* Rotate count */
+#define	VGA_GC_READ_MAP_SELECT		4
+#define	VGA_GC_MODE			5
+#define		VGA_GC_MODE_SR		0x60	/* Shift register */
+#define		VGA_GC_MODE_OE		0x10	/* Odd/even */
+#define		VGA_GC_MODE_RM		0x08	/* Read mode */
+#define		VGA_GC_MODE_WM		0x03	/* Write mode */
+#define	VGA_GC_MISCELLANEOUS		6
+#define		VGA_GC_MISC_MM		0x0C	/* memory map */
+#define		VGA_GC_MISC_COE		0x02	/* Chain odd/even */
+#define		VGA_GC_MISC_GA		0x01	/* Graphics/text mode */
+#define	VGA_GC_COLOR_DONT_CARE		7
+#define	VGA_GC_BIT_MASK			8
+#define	VGA_GC_DATA		0x0f
+
+/* CRT controller registers. */
+#define	VGA_CRTC_ADDRESS	0x14
+#define	VGA_CRTC_HORIZ_TOTAL		0
+#define	VGA_CRTC_HORIZ_DISP_END		1
+#define	VGA_CRTC_START_HORIZ_BLANK	2
+#define	VGA_CRTC_END_HORIZ_BLANK	3
+#define		VGA_CRTC_EHB_CR		0x80	/* Compatible read */
+#define		VGA_CRTC_EHB_DES	0x60	/* Display enable skew */
+#define		VGA_CRTC_EHB_EHB	0x1F	/* End horizontal blank */
+#define	VGA_CRTC_START_HORIZ_RETRACE	4
+#define	VGA_CRTC_END_HORIZ_RETRACE	5
+#define		VGA_CRTC_EHR_EHB	0x80	/* End horizontal blanking */
+#define		VGA_CRTC_EHR_HRD	0x60	/* Horizontal retrace delay */
+#define		VGA_CRTC_EHR_EHR	0x1F	/* End horizontal retrace */
+#define	VGA_CRTC_VERT_TOTAL		6
+#define	VGA_CRTC_OVERFLOW		7
+#define		VGA_CRTC_OF_VRS9	0x80	/* Vertical retrace start */
+#define		VGA_CRTC_OF_VDE9	0x40	/* Vertical disp. enable end */
+#define		VGA_CRTC_OF_VT9		0x20	/* Vertical total (bit 9) */
+#define		VGA_CRTC_OF_LC8		0x10	/* Line compare */
+#define		VGA_CRTC_OF_VBS8	0x08	/* Start vertical blanking */
+#define		VGA_CRTC_OF_VRS8	0x04	/* Vertical retrace start */
+#define		VGA_CRTC_OF_VDE8	0x02	/* Vertical disp. enable end */
+#define		VGA_CRTC_OF_VT8		0x01	/* Vertical total (bit 8) */
+#define	VGA_CRTC_PRESET_ROW_SCAN	8
+#define		VGA_CRTC_PRS_BP		0x60	/* Byte panning */
+#define		VGA_CRTC_PRS_PRS	0x1F	/* Preset row scan */
+#define	VGA_CRTC_MAX_SCAN_LINE		9
+#define		VGA_CRTC_MSL_2T4	0x80	/* 200-to-400 line conversion */
+#define		VGA_CRTC_MSL_LC9	0x40	/* Line compare (bit 9) */
+#define		VGA_CRTC_MSL_VBS9	0x20	/* Start vertical blanking */
+#define		VGA_CRTC_MSL_MSL	0x1F	/* Maximum scan line */
+#define	VGA_CRTC_CURSOR_START		10
+#define		VGA_CRTC_CS_COO		0x20	/* Cursor on/off */
+#define		VGA_CRTC_CS_CS		0x1F	/* Cursor start */
+#define	VGA_CRTC_CURSOR_END		11
+#define		VGA_CRTC_CE_CSK		0x60	/* Cursor skew */
+#define		VGA_CRTC_CE_CE		0x1F	/* Cursor end */
+#define	VGA_CRTC_START_ADDR_HIGH	12
+#define	VGA_CRTC_START_ADDR_LOW		13
+#define	VGA_CRTC_CURSOR_LOC_HIGH	14
+#define	VGA_CRTC_CURSOR_LOC_LOW		15
+#define	VGA_CRTC_VERT_RETRACE_START	16
+#define	VGA_CRTC_VERT_RETRACE_END	17
+#define		VGA_CRTC_VRE_PR		0x80	/* Protect register 0-7 */
+#define		VGA_CRTC_VRE_BW		0x40	/* Bandwidth */
+#define		VGA_CRTC_VRE_VRE	0x1F	/* Vertical retrace end */
+#define	VGA_CRTC_VERT_DISPLAY_END	18
+#define	VGA_CRTC_OFFSET			19
+#define	VGA_CRTC_UNDERLINE_LOC		20
+#define		VGA_CRTC_UL_DW		0x40	/* Double word mode */
+#define		VGA_CRTC_UL_CB4		0x20	/* Count by four */
+#define		VGA_CRTC_UL_UL		0x1F	/* Underline location */
+#define	VGA_CRTC_START_VERT_BLANK	21
+#define	VGA_CRTC_END_VERT_BLANK		22
+#define	VGA_CRTC_MODE_CONTROL		23
+#define		VGA_CRTC_MC_HR		0x80	/* hardware reset */
+#define		VGA_CRTC_MC_WB		0x40	/* Word/byte mode */
+#define		VGA_CRTC_MC_AW		0x20	/* Address wrap */
+#define		VGA_CRTC_MC_CBT		0x08	/* Count by two */
+#define		VGA_CRTC_MC_HRS		0x04	/* Horizontal retrace select */
+#define		VGA_CRTC_MC_SRS		0x02	/* Select row scan counter */
+#define		VGA_CRTC_MC_CMS		0x01	/* Compatibility mode support */
+#define	VGA_CRTC_LINE_COMPARE		24
+#define	VGA_CRTC_DATA		0x15
+
+#endif /* !_DEV_VT_HW_VGA_VGA_REG_H_ */
diff --git a/sys/dev/vt/hw/xboxfb/xboxfb.c b/sys/dev/vt/hw/xboxfb/xboxfb.c
new file mode 100644
index 00000000000..d8a9057f806
--- /dev/null
+++ b/sys/dev/vt/hw/xboxfb/xboxfb.c
@@ -0,0 +1,212 @@
+/*-
+ * Copyright (c) 2005 Rink Springer
+ * All rights reserved.
+ *
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * Portions of this software were developed by Ed Schouten
+ * 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/kernel.h>
+#include <sys/systm.h>
+
+#include <dev/vt/vt.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <machine/bus.h>
+#include <machine/pmap.h>
+#include <machine/vmparam.h>
+#include <machine/xbox.h>
+
+struct xbox_softc {
+	bus_space_tag_t		xbox_fb_tag;
+	bus_space_handle_t	xbox_fb_handle;
+};
+
+/* Convenience macros. */
+#define	MEM_WRITE4(sc, ofs, val) \
+	bus_space_write_4(sc->xbox_fb_tag, sc->xbox_fb_handle, ofs, val)
+
+#define	VT_XBOX_WIDTH	640
+#define	VT_XBOX_HEIGHT	480
+
+static vd_init_t	xbox_init;
+static vd_blank_t	xbox_blank;
+static vd_bitbltchr_t	xbox_bitbltchr;
+
+static const struct vt_driver vt_xbox_driver = {
+	.vd_init	= xbox_init,
+	.vd_blank	= xbox_blank,
+	.vd_bitbltchr	= xbox_bitbltchr,
+	.vd_priority	= VD_PRIORITY_GENERIC+1,
+};
+
+static struct xbox_softc xbox_conssoftc;
+VT_CONSDEV_DECLARE(vt_xbox_driver, PIXEL_WIDTH(VT_XBOX_WIDTH),
+    PIXEL_HEIGHT(VT_XBOX_HEIGHT), &xbox_conssoftc);
+
+static const uint32_t colormap[] = {
+	0x00000000,	/* Black */
+	0x00ff0000,	/* Red */
+	0x0000ff00,	/* Green */
+	0x00c0c000,	/* Brown */
+	0x000000ff,	/* Blue */
+	0x00c000c0,	/* Magenta */
+	0x0000c0c0,	/* Cyan */
+	0x00c0c0c0,	/* Light grey */
+	0x00808080,	/* Dark grey */
+	0x00ff8080,	/* Light red */
+	0x0080ff80,	/* Light green */
+	0x00ffff80,	/* Yellow */
+	0x008080ff,	/* Light blue */
+	0x00ff80ff,	/* Light magenta */
+	0x0080ffff,	/* Light cyan */
+	0x00ffffff, 	/* White */
+};
+
+static void
+xbox_blank(struct vt_device *vd, term_color_t color)
+{
+	struct xbox_softc *sc = vd->vd_softc;
+	u_int ofs;
+	uint32_t c;
+
+	c = colormap[color];
+	for (ofs = 0; ofs < (VT_XBOX_WIDTH * VT_XBOX_HEIGHT) * 4; ofs += 4)
+		MEM_WRITE4(sc, ofs, c);
+}
+
+static void
+xbox_bitbltchr(struct vt_device *vd, const uint8_t *src, const uint8_t *mask,
+    int bpl, vt_axis_t top, vt_axis_t left, unsigned int width,
+    unsigned int height, term_color_t fg, term_color_t bg)
+{
+	struct xbox_softc *sc = vd->vd_softc;
+	u_long line;
+	uint32_t fgc, bgc;
+	int c;
+	uint8_t b, m;
+
+	fgc = colormap[fg];
+	bgc = colormap[bg];
+
+	/* Don't try to put off screen pixels */
+	if (((left + width) > info->fb_width) || ((top + height) >
+	    info->fb_height))
+		return;
+
+	line = (VT_XBOX_WIDTH * top + left) * 4;
+	for (; height > 0; height--) {
+		for (c = 0; c < width; c++) {
+			if (c % 8 == 0)
+				b = *src++;
+			else
+				b <<= 1;
+			if (mask != NULL) {
+				if (c % 8 == 0)
+					m = *mask++;
+				else
+					m <<= 1;
+				/* Skip pixel write, if mask has no bit set. */
+				if ((m & 0x80) == 0)
+					continue;
+			}
+			MEM_WRITE4(sc, line + c * 4, b & 0x80 ? fgc : bgc);
+		}
+		line += VT_XBOX_WIDTH * 4;
+	}
+}
+
+static void
+xbox_initialize(struct vt_device *vd)
+{
+	int i;
+
+	/*
+	 * We must make a mapping from video framebuffer memory
+	 * to real. This is very crude:  we map the entire
+	 * videomemory to PAGE_SIZE! Since our kernel lives at
+	 * it's relocated address range (0xc0xxxxxx), it won't
+	 * care.
+	 *
+	 * We use address PAGE_SIZE and up so we can still trap
+	 * NULL pointers.  Once the real init is called, the
+	 * mapping will be done via the OS and stored in a more
+	 * sensible location ... but since we're not fully
+	 * initialized, this is our only way to go :-(
+	 */
+	for (i = 0; i < (XBOX_FB_SIZE / PAGE_SIZE); i++) {
+		pmap_kenter(((i + 1) * PAGE_SIZE),
+		    XBOX_FB_START + (i * PAGE_SIZE));
+	}
+	pmap_kenter((i + 1) * PAGE_SIZE,
+	    XBOX_FB_START_PTR - XBOX_FB_START_PTR % PAGE_SIZE);
+
+	/* Ensure the framebuffer is where we want it to be. */
+	*(uint32_t *)((i + 1) * PAGE_SIZE + XBOX_FB_START_PTR % PAGE_SIZE) =
+	    XBOX_FB_START;
+
+	/* Clear the screen. */
+	xbox_blank(vd, TC_BLACK);
+}
+
+static int
+xbox_init(struct vt_device *vd)
+{
+	struct xbox_softc *sc = vd->vd_softc;
+
+	if (!arch_i386_is_xbox)
+		return (CN_DEAD);
+
+	sc->xbox_fb_tag = I386_BUS_SPACE_MEM;
+	sc->xbox_fb_handle = PAGE_SIZE;
+
+	vd->vd_width = VT_XBOX_WIDTH;
+	vd->vd_height = VT_XBOX_HEIGHT;
+
+	xbox_initialize(vd);
+
+	return (CN_INTERNAL);
+}
+
+static void
+xbox_remap(void *unused)
+{
+
+	if (!arch_i386_is_xbox)
+		return;
+
+	xbox_conssoftc.xbox_fb_handle =
+	    (bus_space_handle_t)pmap_mapdev(XBOX_FB_START, XBOX_FB_SIZE);
+}
+
+SYSINIT(xboxfb, SI_SUB_DRIVERS, SI_ORDER_ANY, xbox_remap, NULL);
diff --git a/sys/dev/vt/logo/logo_freebsd.c b/sys/dev/vt/logo/logo_freebsd.c
new file mode 100644
index 00000000000..fc70570876a
--- /dev/null
+++ b/sys/dev/vt/logo/logo_freebsd.c
@@ -0,0 +1,641 @@
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten 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$");
+
+unsigned int vt_logo_width = 257;
+unsigned int vt_logo_height = 219;
+unsigned int vt_logo_depth = 1;
+
+unsigned char vt_logo_image[] = {
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x07, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0f, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7f, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xc0, 0x00, 0x00,
+	0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff,
+	0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xc0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x3f, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff,
+	0xf0, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xc0, 0x00,
+	0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x07, 0xff, 0xff,
+	0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x0f, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xe0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x3f, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xfe, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff,
+	0xff, 0xfe, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80,
+	0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xfc, 0x07,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc3, 0xff, 0xff, 0xff,
+	0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xf8, 0x1f, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x1f, 0xff, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xfc, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff,
+	0xff, 0xc0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x7f,
+	0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0x81, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x01, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xfe, 0x07, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf8, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0f, 0xff, 0xff, 0xfc, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf0, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff,
+	0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x1f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x7f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xe0, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x03, 0xff, 0xff, 0xc1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
+	0x83, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0x07, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0xff, 0xfe, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0xff, 0xfc, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf8,
+	0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xf8, 0x7f, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x7f, 0xf0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7f, 0xe1, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf8, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xc1,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x7f, 0xff,
+	0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x83, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x7f, 0xff, 0xff, 0xff, 0xff,
+	0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x1f, 0x87, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xfe, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x1f, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x0f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xff,
+	0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, 0x1f, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xff, 0xff, 0xff, 0xff,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x04, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x8f, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xc7, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe3, 0xff,
+	0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf1, 0xff, 0xff, 0xff, 0xfc,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xf8, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xfc, 0x7f, 0xff, 0xff, 0xf1, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x3f,
+	0xff, 0xff, 0xf3, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x1f, 0xff, 0xff, 0xe3,
+	0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x8f, 0xff, 0xff, 0xc7, 0xc0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xc7, 0xff, 0xff, 0xc7, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe1,
+	0xff, 0xff, 0x8f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xff, 0x0f,
+	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x3f, 0xff, 0x07, 0xf0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xfc, 0x0f, 0xfe, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x01, 0xf8, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x07,
+	0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x07, 0xfc, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf0, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xfc, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x1f,
+	0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x7f, 0xfe, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x0f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x1f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f,
+	0xff, 0xff, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xf0, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xff, 0xc0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x07, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff,
+	0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0x00, 0x7f, 0x80, 0x00, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xff, 0xff, 0xc0, 0x00, 0x07,
+	0xff, 0xf0, 0x00, 0x01, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x03, 0xff, 0xff,
+	0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x03, 0xff, 0xff, 0xe0, 0x00, 0x0f, 0xff, 0xfe, 0x00,
+	0x07, 0xff, 0xff, 0x80, 0x00, 0x00, 0x07, 0xff, 0xff, 0xf0, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x07, 0xff, 0xff, 0xf8, 0x00, 0x3f, 0xff, 0xff, 0x80, 0x0f, 0xff, 0xff,
+	0xe0, 0x00, 0x00, 0x0f, 0xff, 0xff, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xf8, 0x1f,
+	0xf8, 0x00, 0x7f, 0xff, 0xff, 0xc0, 0x1f, 0xff, 0xff, 0xf8, 0x00, 0x00,
+	0x1f, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xc0, 0x03, 0xfc, 0x00, 0xff,
+	0xe0, 0xff, 0xc0, 0x1f, 0x80, 0x0f, 0xfc, 0x00, 0x00, 0x3f, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x3f, 0x80, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x1f, 0xc0,
+	0x1f, 0x00, 0x01, 0xff, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x3f, 0x00, 0x00, 0x7e, 0x01, 0xfc, 0x00, 0x07, 0x80, 0x3e, 0x00, 0x00,
+	0x7f, 0x80, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00,
+	0x3f, 0x01, 0xf8, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x1f, 0xc0, 0x00,
+	0x7e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x3f, 0x03, 0xf0,
+	0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x0f, 0xe0, 0x00, 0x7c, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x1f, 0x03, 0xe0, 0x00, 0x00, 0x00,
+	0x3e, 0x00, 0x00, 0x07, 0xf0, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0xfc, 0x00, 0x00, 0x1f, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00,
+	0x03, 0xf0, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00,
+	0x1f, 0x03, 0xe0, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x01, 0xf8, 0x00,
+	0xfc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x1f, 0x03, 0xe0,
+	0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0x00,
+	0x00, 0x07, 0xfc, 0x00, 0x00, 0x03, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x7f,
+	0xc0, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x1f, 0x03, 0xe0, 0x00, 0x00, 0x00,
+	0x3e, 0x00, 0x00, 0x00, 0x7c, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x1f, 0xff,
+	0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x03, 0xff, 0xf8, 0x00, 0x00,
+	0xf8, 0x00, 0x00, 0x1f, 0x03, 0xf0, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00,
+	0x00, 0x7e, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xc0, 0x00, 0x7f,
+	0xff, 0xf0, 0x00, 0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0xf8, 0x00, 0x00,
+	0x3f, 0x03, 0xf0, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x3e, 0x00,
+	0xfc, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe0, 0x01, 0xff, 0xff, 0xfc, 0x00,
+	0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, 0xf8, 0x00, 0x00, 0x3f, 0x03, 0xf8,
+	0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0xfc, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xf0, 0x03, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x7f, 0xff,
+	0xff, 0xc0, 0x00, 0xf8, 0x00, 0x00, 0x7e, 0x01, 0xfc, 0x00, 0x00, 0x00,
+	0x3e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0xfc, 0x00, 0x00, 0x03, 0xfc, 0x07,
+	0xf8, 0x07, 0xfe, 0x03, 0xff, 0x00, 0x00, 0xff, 0xc0, 0x3f, 0xe0, 0x00,
+	0xfc, 0x00, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00,
+	0x00, 0x1f, 0x00, 0xfc, 0x00, 0x00, 0x07, 0xf0, 0x01, 0xf8, 0x0f, 0xf0,
+	0x00, 0x7f, 0x80, 0x01, 0xfe, 0x00, 0x0f, 0xf0, 0x00, 0xfc, 0x00, 0x01,
+	0xfc, 0x00, 0xff, 0x80, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x1f, 0x00,
+	0xfc, 0x00, 0x00, 0x07, 0xe0, 0x00, 0xf8, 0x1f, 0xc0, 0x00, 0x3f, 0xc0,
+	0x03, 0xfc, 0x00, 0x03, 0xf8, 0x00, 0xfe, 0x00, 0x0f, 0xfc, 0x00, 0x7f,
+	0xe0, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0xfe, 0x00, 0x00,
+	0x0f, 0xc0, 0x00, 0x78, 0x1f, 0x80, 0x00, 0x0f, 0xc0, 0x03, 0xf0, 0x00,
+	0x01, 0xfc, 0x00, 0xff, 0xff, 0xff, 0xf8, 0x00, 0x3f, 0xf0, 0x00, 0x00,
+	0x3e, 0x00, 0x00, 0x00, 0x0f, 0x80, 0xff, 0x00, 0x00, 0x0f, 0x80, 0x00,
+	0x00, 0x3f, 0x00, 0x00, 0x07, 0xe0, 0x07, 0xe0, 0x00, 0x00, 0xfc, 0x00,
+	0xff, 0xff, 0xff, 0xfc, 0x00, 0x0f, 0xfc, 0x00, 0x00, 0x3e, 0x00, 0x00,
+	0x00, 0x0f, 0x80, 0xff, 0xff, 0xfc, 0x0f, 0x80, 0x00, 0x00, 0x7e, 0x00,
+	0x00, 0x03, 0xf0, 0x07, 0xe0, 0x00, 0x00, 0x7e, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x00, 0x07, 0xff, 0x00, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x0f, 0x80,
+	0xff, 0xff, 0xfc, 0x1f, 0x80, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x03, 0xf0,
+	0x0f, 0xc0, 0x00, 0x00, 0x7e, 0x00, 0xff, 0xff, 0xff, 0xff, 0x80, 0x01,
+	0xff, 0xc0, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x0f, 0x80, 0xff, 0xff, 0xfe,
+	0x1f, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x01, 0xf0, 0x0f, 0x80, 0x00,
+	0x00, 0x3e, 0x00, 0xff, 0xff, 0xff, 0xff, 0xc0, 0x00, 0x7f, 0xf0, 0x00,
+	0x3e, 0x00, 0x00, 0x00, 0x0f, 0x80, 0xff, 0xff, 0xfc, 0x1f, 0x00, 0x00,
+	0x00, 0xfc, 0x00, 0x00, 0x01, 0xf8, 0x1f, 0x80, 0x00, 0x00, 0x1f, 0x00,
+	0xfc, 0x00, 0x00, 0x1f, 0xe0, 0x00, 0x1f, 0xfc, 0x00, 0x3e, 0x00, 0x00,
+	0x00, 0x0f, 0x80, 0xff, 0xff, 0xf8, 0x1f, 0x00, 0x00, 0x00, 0xf8, 0x00,
+	0x00, 0x00, 0xf8, 0x1f, 0x80, 0x00, 0x00, 0x1f, 0x00, 0xfc, 0x00, 0x00,
+	0x07, 0xf0, 0x00, 0x07, 0xff, 0x00, 0x3e, 0x00, 0x00, 0x00, 0x0f, 0x80,
+	0xfe, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x01, 0xf8,
+	0x1f, 0x80, 0x00, 0x00, 0x1f, 0x00, 0xf8, 0x00, 0x00, 0x03, 0xf8, 0x00,
+	0x01, 0xff, 0x80, 0x3e, 0x00, 0x00, 0x00, 0x0f, 0x80, 0xfc, 0x00, 0x00,
+	0x1f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f, 0xff, 0xff,
+	0xff, 0xff, 0x80, 0xf8, 0x00, 0x00, 0x01, 0xf8, 0x00, 0x00, 0x7f, 0xc0,
+	0x3e, 0x00, 0x00, 0x00, 0x0f, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00,
+	0x01, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80,
+	0xf8, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0xe0, 0x3e, 0x00, 0x00,
+	0x00, 0x1f, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x01, 0xff, 0xff,
+	0xff, 0xff, 0xfc, 0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0xf8, 0x00, 0x00,
+	0x00, 0xfc, 0x00, 0x00, 0x0f, 0xf0, 0x3e, 0x00, 0x00, 0x00, 0x1f, 0x00,
+	0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xf8,
+	0x1f, 0xff, 0xff, 0xff, 0xff, 0x80, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00,
+	0x00, 0x03, 0xf8, 0x3e, 0x00, 0x00, 0x00, 0x1f, 0x00, 0xfc, 0x00, 0x00,
+	0x1f, 0x00, 0x00, 0x01, 0xff, 0xff, 0xff, 0xff, 0xf8, 0x1f, 0xff, 0xff,
+	0xff, 0xff, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x01, 0xf8,
+	0x3e, 0x00, 0x00, 0x00, 0x3e, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x1f, 0xff, 0xff, 0xff, 0xfc, 0x00,
+	0xf8, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfc, 0x3e, 0x00, 0x00,
+	0x00, 0x3e, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0xfc, 0x00,
+	0x00, 0x00, 0x00, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00,
+	0x00, 0x7e, 0x00, 0x00, 0x00, 0xfc, 0x3e, 0x00, 0x00, 0x00, 0x7c, 0x00,
+	0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00,
+	0x1f, 0x80, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x7e, 0x00,
+	0x00, 0x00, 0xfc, 0x3e, 0x00, 0x00, 0x00, 0x7c, 0x00, 0xfc, 0x00, 0x00,
+	0x1f, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0xfc,
+	0x3e, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00,
+	0x00, 0x7c, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x80, 0x00, 0x00, 0x00, 0x00,
+	0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x3e, 0x00, 0x00,
+	0x01, 0xf8, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x7e, 0x00,
+	0x00, 0x00, 0x00, 0x0f, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00,
+	0x00, 0x7c, 0x00, 0x00, 0x00, 0xfc, 0x3e, 0x00, 0x00, 0x03, 0xf0, 0x00,
+	0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+	0x07, 0xe0, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0xfc, 0x00,
+	0x00, 0x00, 0xfc, 0x3e, 0x00, 0x00, 0x07, 0xe0, 0x00, 0xfc, 0x00, 0x00,
+	0x1f, 0x00, 0x00, 0x00, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x07, 0xe0, 0x00,
+	0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x01, 0xfc,
+	0x3e, 0x00, 0x00, 0x0f, 0xe0, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00,
+	0x00, 0x1f, 0x80, 0x00, 0x0c, 0x00, 0x03, 0xf0, 0x00, 0x01, 0x80, 0x00,
+	0xf8, 0x00, 0x00, 0x01, 0xf8, 0x70, 0x00, 0x03, 0xf8, 0x3e, 0x00, 0x00,
+	0x1f, 0xc0, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x1f, 0xc0,
+	0x00, 0x3e, 0x00, 0x03, 0xfc, 0x00, 0x03, 0xc0, 0x00, 0xf8, 0x00, 0x00,
+	0x03, 0xf8, 0xfc, 0x00, 0x07, 0xf8, 0x3f, 0x00, 0x00, 0x7f, 0x80, 0x00,
+	0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x0f, 0xf0, 0x00, 0x7e, 0x00,
+	0x01, 0xfe, 0x00, 0x0f, 0xe0, 0x00, 0xf8, 0x00, 0x00, 0x07, 0xf0, 0xff,
+	0x80, 0x0f, 0xf0, 0x3f, 0x00, 0x01, 0xff, 0x00, 0x00, 0xfc, 0x00, 0x00,
+	0x1f, 0x00, 0x00, 0x00, 0x07, 0xfe, 0x03, 0xfe, 0x00, 0x00, 0xff, 0xc0,
+	0x3f, 0xc0, 0x00, 0xf8, 0x00, 0x00, 0x3f, 0xe0, 0xff, 0xf8, 0x7f, 0xe0,
+	0x3f, 0x80, 0x1f, 0xfc, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00,
+	0x00, 0x03, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xc0, 0x00,
+	0xff, 0xff, 0xff, 0xff, 0xc0, 0xff, 0xff, 0xff, 0xc0, 0x3f, 0xff, 0xff,
+	0xf8, 0x00, 0x00, 0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x01, 0xff,
+	0xff, 0xfc, 0x00, 0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, 0xff, 0xff, 0xff,
+	0xff, 0x80, 0x7f, 0xff, 0xff, 0x80, 0x3f, 0xff, 0xff, 0xe0, 0x00, 0x00,
+	0xfc, 0x00, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xf0, 0x00,
+	0x00, 0x0f, 0xff, 0xfe, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x0f,
+	0xff, 0xff, 0x00, 0x1f, 0xff, 0xff, 0x80, 0x00, 0x00, 0x78, 0x00, 0x00,
+	0x1f, 0x00, 0x00, 0x00, 0x00, 0x1f, 0xff, 0xc0, 0x00, 0x00, 0x03, 0xff,
+	0xf8, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xfc, 0x00, 0x03, 0xff, 0xfc, 0x00,
+	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, 
+};
diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h
new file mode 100644
index 00000000000..7b573ae197c
--- /dev/null
+++ b/sys/dev/vt/vt.h
@@ -0,0 +1,422 @@
+/*-
+ * Copyright (c) 2009, 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten under sponsorship from the
+ * FreeBSD Foundation.
+ *
+ * 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 _DEV_VT_VT_H_
+#define	_DEV_VT_VT_H_
+
+#include <sys/param.h>
+#include <sys/_lock.h>
+#include <sys/_mutex.h>
+#include <sys/callout.h>
+#include <sys/condvar.h>
+#include <sys/consio.h>
+#include <sys/kbio.h>
+#include <sys/mouse.h>
+#include <sys/terminal.h>
+#include <sys/sysctl.h>
+
+#include "opt_syscons.h"
+#include "opt_splash.h"
+
+#ifdef DEV_SC
+#error "Build with both syscons and vt is not supported. Please enable only \
+one 'device sc' or 'device vt'"
+#endif
+
+#ifndef	VT_MAXWINDOWS
+#ifdef	MAXCONS
+#define	VT_MAXWINDOWS	MAXCONS
+#else
+#define	VT_MAXWINDOWS	12
+#endif
+#endif
+
+#ifndef VT_ALT_TO_ESC_HACK
+#define	VT_ALT_TO_ESC_HACK	1
+#endif
+
+#define	VT_CONSWINDOW	0
+
+#if defined(SC_TWOBUTTON_MOUSE) || defined(VT_TWOBUTTON_MOUSE)
+#define VT_MOUSE_PASTEBUTTON	MOUSE_BUTTON3DOWN	/* right button */
+#define VT_MOUSE_EXTENDBUTTON	MOUSE_BUTTON2DOWN	/* not really used */
+#else
+#define VT_MOUSE_PASTEBUTTON	MOUSE_BUTTON2DOWN	/* middle button */
+#define VT_MOUSE_EXTENDBUTTON	MOUSE_BUTTON3DOWN	/* right button */
+#endif /* defined(SC_TWOBUTTON_MOUSE) || defined(VT_TWOBUTTON_MOUSE) */
+
+#define	SC_DRIVER_NAME	"vt"
+#define	DPRINTF(_l, ...)	if (vt_debug > (_l)) printf( __VA_ARGS__ )
+#define	ISSIGVALID(sig)	((sig) > 0 && (sig) < NSIG)
+
+#define	VT_SYSCTL_INT(_name, _default, _descr)				\
+static int vt_##_name = _default;					\
+SYSCTL_INT(_kern_vt, OID_AUTO, _name, CTLFLAG_RW, &vt_##_name, _default,\
+		_descr);						\
+TUNABLE_INT("kern.vt." #_name, &vt_##_name);
+
+struct vt_driver;
+
+void vt_allocate(struct vt_driver *, void *);
+void vt_resume(void);
+void vt_suspend(void);
+
+typedef unsigned int 	vt_axis_t;
+
+/*
+ * List of locks
+ * (d)	locked by vd_lock
+ * (b)	locked by vb_lock
+ * (G)	locked by Giant
+ * (u)	unlocked, locked by higher levels
+ * (c)	const until freeing
+ * (?)	yet to be determined
+ */
+
+/*
+ * Per-device datastructure.
+ */
+
+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. */
+	const struct vt_driver	*vd_driver;	/* (c) Graphics driver. */
+	void			*vd_softc;	/* (u) Driver data. */
+	uint16_t		 vd_mx;		/* (?) Mouse X. */
+	uint16_t		 vd_my;		/* (?) Mouse Y. */
+	vt_axis_t		 vd_mdirtyx;	/* (?) Screen width. */
+	vt_axis_t		 vd_mdirtyy;	/* (?) Screen height. */
+	uint32_t		 vd_mstate;	/* (?) Mouse state. */
+	term_pos_t		 vd_offset;	/* (?) Pixel offset. */
+	vt_axis_t		 vd_width;	/* (?) Screen width. */
+	vt_axis_t		 vd_height;	/* (?) Screen height. */
+	struct mtx		 vd_lock;	/* Per-device lock. */
+	struct cv		 vd_winswitch;	/* (d) Window switch notify. */
+	struct callout		 vd_timer;	/* (d) Display timer. */
+	int			 vd_flags;	/* (d) Device flags. */
+#define	VDF_TEXTMODE	0x01	/* Do text mode rendering. */
+#define	VDF_SPLASH	0x02	/* Splash screen active. */
+#define	VDF_ASYNC	0x04	/* vt_timer() running. */
+#define	VDF_INVALID	0x08	/* Entire screen should be re-rendered. */
+#define	VDF_DEAD	0x10	/* Early probing found nothing. */
+#define	VDF_INITIALIZED	0x20	/* vtterm_cnprobe already done. */
+#define	VDF_MOUSECURSOR	0x40	/* Mouse cursor visible. */
+	int			 vd_keyboard;	/* (G) Keyboard index. */
+	unsigned int		 vd_kbstate;	/* (?) Device unit. */
+	unsigned int		 vd_unit;	/* (c) Device unit. */
+};
+
+/*
+ * Per-window terminal screen buffer.
+ *
+ * Because redrawing is performed asynchronously, the buffer keeps track
+ * of a rectangle that needs to be redrawn (vb_dirtyrect).  Because this
+ * approach seemed to cause suboptimal performance (when the top left
+ * and the bottom right of the screen are modified), it also uses a set
+ * of bitmasks to keep track of the rows and columns (mod 64) that have
+ * 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. */
+	int			 vb_flags;	/* (b) Flags. */
+#define	VBF_CURSOR	0x1	/* Cursor visible. */
+#define	VBF_STATIC	0x2	/* Buffer is statically allocated. */
+#define	VBF_MTX_INIT	0x4	/* Mutex initialized. */
+#define	VBF_SCROLL	0x8	/* scroll locked mode. */
+#define	VBF_HISTORY_FULL 0x10	/* All rows filled. */
+	int			 vb_history_size;
+#define	VBF_DEFAULT_HISTORY_SIZE	500
+	int			 vb_roffset;	/* (b) History rows offset. */
+	int			 vb_curroffset;	/* (b) Saved rows offset. */
+	term_pos_t		 vb_cursor;	/* (u) Cursor position. */
+	term_pos_t		 vb_mark_start;	/* (b) Copy region start. */
+	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 */
+};
+
+void vtbuf_copy(struct vt_buf *, const term_rect_t *, const term_pos_t *);
+void vtbuf_fill_locked(struct vt_buf *, const term_rect_t *, term_char_t);
+void vtbuf_init_early(struct vt_buf *);
+void vtbuf_init(struct vt_buf *, const term_pos_t *);
+void vtbuf_grow(struct vt_buf *, const term_pos_t *, int);
+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_undirty(struct vt_buf *, term_rect_t *, struct vt_bufmask *);
+void vtbuf_sethistory_size(struct vt_buf *, int);
+int vtbuf_iscursor(struct vt_buf *vb, int row, int col);
+void vtbuf_cursor_visibility(struct vt_buf *, int);
+#ifndef SC_NO_CUTPASTE
+void vtbuf_mouse_cursor_position(struct vt_buf *vb, int col, int row);
+int vtbuf_set_mark(struct vt_buf *vb, int type, int col, int row);
+int vtbuf_get_marked_len(struct vt_buf *vb);
+void vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz);
+#endif
+
+#define	VTB_MARK_NONE		0
+#define	VTB_MARK_END		1
+#define	VTB_MARK_START		2
+#define	VTB_MARK_WORD		3
+#define	VTB_MARK_ROW		4
+#define	VTB_MARK_EXTEND		5
+#define	VTB_MARK_MOVE		6
+
+#define	VTBUF_SLCK_ENABLE(vb)	vtbuf_scroll_mode((vb), 1)
+#define	VTBUF_SLCK_DISABLE(vb)	vtbuf_scroll_mode((vb), 0)
+
+#define	VTBUF_MAX_HEIGHT(vb) \
+	((vb)->vb_history_size)
+#define	VTBUF_GET_ROW(vb, r) \
+	((vb)->vb_rows[((vb)->vb_roffset + (r)) % VTBUF_MAX_HEIGHT(vb)])
+#define	VTBUF_GET_FIELD(vb, r, c) \
+	((vb)->vb_rows[((vb)->vb_roffset + (r)) % VTBUF_MAX_HEIGHT(vb)][(c)])
+#define	VTBUF_FIELD(vb, r, c) \
+	((vb)->vb_rows[((vb)->vb_curroffset + (r)) % VTBUF_MAX_HEIGHT(vb)][(c)])
+#define	VTBUF_ISCURSOR(vb, r, c) \
+	vtbuf_iscursor((vb), (r), (c))
+#define	VTBUF_DIRTYROW(mask, row) \
+	((mask)->vbm_row & ((uint64_t)1 << ((row) % 64)))
+#define	VTBUF_DIRTYCOL(mask, col) \
+	((mask)->vbm_col & ((uint64_t)1 << ((col) % 64)))
+#define	VTBUF_SPACE_CHAR	(' ' | TC_WHITE << 26 | TC_BLACK << 29)
+
+#define	VHS_SET	0
+#define	VHS_CUR	1
+#define	VHS_END	2
+int vthistory_seek(struct vt_buf *, int offset, int whence);
+void vthistory_addlines(struct vt_buf *vb, int offset);
+void vthistory_getpos(const struct vt_buf *, unsigned int *offset);
+
+/*
+ * Per-window datastructure.
+ */
+
+struct vt_window {
+	struct vt_device	*vw_device;	/* (c) Device. */
+	struct terminal		*vw_terminal;	/* (c) Terminal. */
+	struct vt_buf		 vw_buf;	/* (u) Screen buffer. */
+	struct vt_font		*vw_font;	/* (d) Graphical font. */
+	unsigned int		 vw_number;	/* (c) Window number. */
+	int			 vw_kbdmode;	/* (?) Keyboard mode. */
+	char			*vw_kbdsq;	/* Escape sequence queue*/
+	unsigned int		 vw_flags;	/* (d) Per-window flags. */
+#define	VWF_BUSY	0x1	/* Busy reconfiguring device. */
+#define	VWF_OPENED	0x2	/* TTY in use. */
+#define	VWF_SCROLL	0x4	/* Keys influence scrollback. */
+#define	VWF_CONSOLE	0x8	/* Kernel message console window. */
+#define	VWF_VTYLOCK	0x10	/* Prevent window switch. */
+#define	VWF_MOUSE_HIDE	0x20	/* Disable mouse events processing. */
+#define	VWF_SWWAIT_REL	0x10000	/* Program wait for VT acquire is done. */
+#define	VWF_SWWAIT_ACQ	0x20000	/* Program wait for VT release is done. */
+	pid_t			 vw_pid;	/* Terminal holding process */
+	struct proc		*vw_proc;
+	struct vt_mode		 vw_smode;	/* switch mode */
+	struct callout		 vw_proc_dead_timer;
+	struct vt_window	*vw_switch_to;
+};
+
+#define	VT_AUTO		0		/* switching is automatic */
+#define	VT_PROCESS	1		/* switching controlled by prog */
+#define	VT_KERNEL	255		/* switching controlled in kernel */
+
+#define	IS_VT_PROC_MODE(vw)	((vw)->vw_smode.mode == VT_PROCESS)
+
+/*
+ * Per-device driver routines.
+ *
+ * vd_bitbltchr is used when the driver operates in graphics mode, while
+ * vd_putchar is used when the driver operates in text mode
+ * (VDF_TEXTMODE).
+ */
+
+typedef int vd_init_t(struct vt_device *vd);
+typedef void vd_postswitch_t(struct vt_device *vd);
+typedef void vd_blank_t(struct vt_device *vd, term_color_t color);
+typedef void vd_bitbltchr_t(struct vt_device *vd, const uint8_t *src,
+    const uint8_t *mask, int bpl, vt_axis_t top, vt_axis_t left,
+    unsigned int width, unsigned int height, term_color_t fg, term_color_t bg);
+typedef void vd_putchar_t(struct vt_device *vd, term_char_t,
+    vt_axis_t top, vt_axis_t left, term_color_t fg, term_color_t bg);
+
+struct vt_driver {
+	/* Console attachment. */
+	vd_init_t	*vd_init;
+
+	/* Drawing. */
+	vd_blank_t	*vd_blank;
+	vd_bitbltchr_t	*vd_bitbltchr;
+
+	/* Text mode operation. */
+	vd_putchar_t	*vd_putchar;
+
+	/* Update display setting on vt switch. */
+	vd_postswitch_t	*vd_postswitch;
+
+	/* Priority to know which one can override */
+	int		vd_priority;
+#define	VD_PRIORITY_DUMB	10
+#define	VD_PRIORITY_GENERIC	100
+#define	VD_PRIORITY_SPECIFIC	1000
+};
+
+/*
+ * Console device madness.
+ *
+ * Utility macro to make early vt(4) instances work.
+ */
+
+extern const struct terminal_class vt_termclass;
+void vt_upgrade(struct vt_device *vd);
+
+#define	PIXEL_WIDTH(w)	((w) / 8)
+#define	PIXEL_HEIGHT(h)	((h) / 16)
+
+#ifndef VT_FB_DEFAULT_WIDTH
+#define	VT_FB_DEFAULT_WIDTH	640
+#endif
+#ifndef VT_FB_DEFAULT_HEIGHT
+#define	VT_FB_DEFAULT_HEIGHT	480
+#endif
+
+#define	VT_CONSDEV_DECLARE(driver, width, height, softc)		\
+static struct terminal	driver ## _consterm;				\
+static struct vt_window	driver ## _conswindow;				\
+static struct vt_device	driver ## _consdev = {				\
+	.vd_driver = &driver,						\
+	.vd_softc = (softc),						\
+	.vd_flags = VDF_INVALID,					\
+	.vd_windows = { [VT_CONSWINDOW] =  &driver ## _conswindow, },	\
+	.vd_curwindow = &driver ## _conswindow,				\
+	.vd_markedwin = NULL,						\
+	.vd_kbstate = 0,						\
+};									\
+static term_char_t	driver ## _constextbuf[(width) * 		\
+	    (VBF_DEFAULT_HISTORY_SIZE)];				\
+static term_char_t	*driver ## _constextbufrows[			\
+	    VBF_DEFAULT_HISTORY_SIZE];					\
+static struct vt_window	driver ## _conswindow = {			\
+	.vw_number = VT_CONSWINDOW,					\
+	.vw_flags = VWF_CONSOLE,					\
+	.vw_buf = {							\
+		.vb_buffer = driver ## _constextbuf,			\
+		.vb_rows = driver ## _constextbufrows,			\
+		.vb_history_size = VBF_DEFAULT_HISTORY_SIZE,		\
+		.vb_curroffset = 0,					\
+		.vb_roffset = 0,					\
+		.vb_flags = VBF_STATIC,					\
+		.vb_mark_start = {					\
+			.tp_row = 0,					\
+			.tp_col = 0,					\
+		},							\
+		.vb_mark_end = {					\
+			.tp_row = 0,					\
+			.tp_col = 0,					\
+		},							\
+		.vb_scr_size = {					\
+			.tp_row = height,				\
+			.tp_col = width,				\
+		},							\
+	},								\
+	.vw_device = &driver ## _consdev,				\
+	.vw_terminal = &driver ## _consterm,				\
+	.vw_kbdmode = K_XLATE,						\
+};									\
+TERMINAL_DECLARE_EARLY(driver ## _consterm, vt_termclass,		\
+    &driver ## _conswindow);						\
+SYSINIT(vt_early_cons, SI_SUB_INT_CONFIG_HOOKS, SI_ORDER_ANY,		\
+    vt_upgrade, &driver ## _consdev)
+
+/*
+ * Fonts.
+ *
+ * Remapping tables are used to map Unicode points to glyphs.  They need
+ * to be sorted, because vtfont_lookup() performs a binary search.  Each
+ * font has two remapping tables, for normal and bold.  When a character
+ * is not present in bold, it uses a normal glyph.  When no glyph is
+ * available, it uses glyph 0, which is normally equal to U+FFFD.
+ */
+
+struct vt_font_map {
+	uint32_t		 vfm_src;
+	uint16_t		 vfm_dst;
+	uint16_t		 vfm_len;
+};
+
+struct vt_font {
+	struct vt_font_map	*vf_bold;
+	struct vt_font_map	*vf_normal;
+	uint8_t			*vf_bytes;
+	unsigned int		 vf_height, vf_width,
+				 vf_normal_length, vf_bold_length;
+	unsigned int		 vf_refcount;
+};
+
+#ifndef SC_NO_CUTPASTE
+struct mouse_cursor {
+	uint8_t map[64 * 64 / 8];
+	uint8_t mask[64 * 64 / 8];
+	uint8_t w;
+	uint8_t h;
+};
+#endif
+
+const uint8_t	*vtfont_lookup(const struct vt_font *vf, term_char_t c);
+struct vt_font	*vtfont_ref(struct vt_font *vf);
+void		 vtfont_unref(struct vt_font *vf);
+int		 vtfont_load(vfnt_t *f, struct vt_font **ret);
+
+/* Sysmouse. */
+void sysmouse_process_event(mouse_info_t *mi);
+#ifndef SC_NO_CUTPASTE
+void vt_mouse_event(int type, int x, int y, int event, int cnt);
+void vt_mouse_state(int show);
+#endif
+#define	VT_MOUSE_SHOW 1
+#define	VT_MOUSE_HIDE 0
+
+#endif /* !_DEV_VT_VT_H_ */
+
diff --git a/sys/dev/vt/vt_buf.c b/sys/dev/vt/vt_buf.c
new file mode 100644
index 00000000000..0b078ecbfd6
--- /dev/null
+++ b/sys/dev/vt/vt_buf.c
@@ -0,0 +1,734 @@
+/*-
+ * Copyright (c) 2009, 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten under sponsorship from the
+ * FreeBSD Foundation.
+ *
+ * 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/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/systm.h>
+
+#include <dev/vt/vt.h>
+
+static MALLOC_DEFINE(M_VTBUF, "vtbuf", "vt buffer");
+
+#define	VTBUF_LOCK(vb)		mtx_lock_spin(&(vb)->vb_lock)
+#define	VTBUF_UNLOCK(vb)	mtx_unlock_spin(&(vb)->vb_lock)
+
+#define POS_INDEX(c, r) (((r) << 12) + (c))
+#define	POS_COPY(d, s)	do {	\
+	(d).tp_col = (s).tp_col;	\
+	(d).tp_row = (s).tp_row;	\
+} while (0)
+
+
+/*
+ * line4
+ * line5 <--- curroffset (terminal output to that line)
+ * line0
+ * line1                  <--- roffset (history display from that point)
+ * line2
+ * line3
+ */
+int
+vthistory_seek(struct vt_buf *vb, int offset, int whence)
+{
+	int diff, top, bottom, roffset;
+
+	/* No scrolling if not enabled. */
+	if ((vb->vb_flags & VBF_SCROLL) == 0) {
+		if (vb->vb_roffset != vb->vb_curroffset) {
+			vb->vb_roffset = vb->vb_curroffset;
+			return (0xffff);
+		}
+		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;
+	switch (whence) {
+	case VHS_SET:
+		roffset = offset + vb->vb_history_size;
+		break;
+	case VHS_CUR:
+		roffset += offset;
+		break;
+	case VHS_END:
+		/* Go to current offset. */
+		roffset = vb->vb_curroffset + vb->vb_history_size;
+		break;
+	}
+
+	roffset = (roffset < top)?top:roffset;
+	roffset = (roffset > bottom)?bottom: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 */
+}
+
+void
+vthistory_addlines(struct vt_buf *vb, int offset)
+{
+
+	vb->vb_curroffset += offset;
+	if (vb->vb_curroffset < 0)
+		vb->vb_curroffset = 0;
+	vb->vb_curroffset %= vb->vb_history_size;
+	if ((vb->vb_flags & VBF_SCROLL) == 0) {
+		vb->vb_roffset = vb->vb_curroffset;
+	}
+}
+
+void
+vthistory_getpos(const struct vt_buf *vb, unsigned int *offset)
+{
+
+	*offset = vb->vb_roffset;
+}
+
+#ifndef SC_NO_CUTPASTE	/* Only mouse support use it now. */
+/* Translate current view row number to history row. */
+static int
+vtbuf_wth(struct vt_buf *vb, int row)
+{
+
+	return ((vb->vb_roffset + row) % vb->vb_history_size);
+}
+#endif
+
+/* Translate history row to current view row number. */
+static int
+vtbuf_htw(struct vt_buf *vb, int row)
+{
+
+	/*
+	 * total 1000 rows.
+	 * History offset	roffset	winrow
+	 *	205		200	((205 - 200 + 1000) % 1000) = 5
+	 *	90		990	((90 - 990 + 1000) % 1000) = 100
+	 */
+	return ((row - vb->vb_roffset + vb->vb_history_size) %
+	    vb->vb_history_size);
+}
+
+int
+vtbuf_iscursor(struct vt_buf *vb, int row, int col)
+{
+	int sc, sr, ec, er, tmp;
+
+	if ((vb->vb_flags & (VBF_CURSOR|VBF_SCROLL)) == VBF_CURSOR &&
+	    (vb->vb_cursor.tp_row == row) && (vb->vb_cursor.tp_col == col))
+		return (1);
+
+	/* Mark cut/paste region. */
+
+	/*
+	 * Luckily screen view is not like circular buffer, so we will
+	 * calculate in screen coordinates.  Translate first.
+	 */
+	sc = vb->vb_mark_start.tp_col;
+	sr = vtbuf_htw(vb, vb->vb_mark_start.tp_row);
+	ec = vb->vb_mark_end.tp_col;
+	er = vtbuf_htw(vb, vb->vb_mark_end.tp_row);
+
+
+	/* Swap start and end if start > end. */
+	if (POS_INDEX(sc, sr) > POS_INDEX(ec, er)) {
+		tmp = sc; sc = ec; ec = tmp;
+		tmp = sr; sr = er; er = tmp;
+	}
+
+	if ((POS_INDEX(sc, sr) <= POS_INDEX(col, row)) &&
+	    (POS_INDEX(col, row) < POS_INDEX(ec, er)))
+		return (1);
+
+	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(struct vt_buf *vb, const term_rect_t *area)
+{
+
+	VTBUF_LOCK(vb);
+	if (vb->vb_dirtyrect.tr_begin.tp_row > area->tr_begin.tp_row)
+		vb->vb_dirtyrect.tr_begin.tp_row = area->tr_begin.tp_row;
+	if (vb->vb_dirtyrect.tr_begin.tp_col > area->tr_begin.tp_col)
+		vb->vb_dirtyrect.tr_begin.tp_col = area->tr_begin.tp_col;
+	if (vb->vb_dirtyrect.tr_end.tp_row < area->tr_end.tp_row)
+		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);
+	VTBUF_UNLOCK(vb);
+}
+
+static inline void
+vtbuf_dirty_cell(struct vt_buf *vb, const term_pos_t *p)
+{
+	term_rect_t area;
+
+	area.tr_begin = *p;
+	area.tr_end.tp_row = p->tp_row + 1;
+	area.tr_end.tp_col = p->tp_col + 1;
+	vtbuf_dirty(vb, &area);
+}
+
+static void
+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_LOCK(vb);
+	*r = vb->vb_dirtyrect;
+	*m = vb->vb_dirtymask;
+	vtbuf_make_undirty(vb);
+	VTBUF_UNLOCK(vb);
+}
+
+void
+vtbuf_copy(struct vt_buf *vb, const term_rect_t *r, const term_pos_t *p2)
+{
+	const term_pos_t *p1 = &r->tr_begin;
+	term_rect_t area;
+	unsigned int rows, cols;
+	int pr, rdiff;
+
+	KASSERT(r->tr_begin.tp_row < vb->vb_scr_size.tp_row,
+	    ("vtbuf_copy begin.tp_row %d must be less than screen width %d",
+		r->tr_begin.tp_row, vb->vb_scr_size.tp_row));
+	KASSERT(r->tr_begin.tp_col < vb->vb_scr_size.tp_col,
+	    ("vtbuf_copy begin.tp_col %d must be less than screen height %d",
+		r->tr_begin.tp_col, vb->vb_scr_size.tp_col));
+
+	KASSERT(r->tr_end.tp_row <= vb->vb_scr_size.tp_row,
+	    ("vtbuf_copy end.tp_row %d must be less than screen width %d",
+		r->tr_end.tp_row, vb->vb_scr_size.tp_row));
+	KASSERT(r->tr_end.tp_col <= vb->vb_scr_size.tp_col,
+	    ("vtbuf_copy end.tp_col %d must be less than screen height %d",
+		r->tr_end.tp_col, vb->vb_scr_size.tp_col));
+
+	KASSERT(p2->tp_row < vb->vb_scr_size.tp_row,
+	    ("vtbuf_copy tp_row %d must be less than screen width %d",
+		p2->tp_row, vb->vb_scr_size.tp_row));
+	KASSERT(p2->tp_col < vb->vb_scr_size.tp_col,
+	    ("vtbuf_copy tp_col %d must be less than screen height %d",
+		p2->tp_col, vb->vb_scr_size.tp_col));
+
+	rows = r->tr_end.tp_row - r->tr_begin.tp_row;
+	rdiff = r->tr_begin.tp_row - p2->tp_row;
+	cols = r->tr_end.tp_col - r->tr_begin.tp_col;
+	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. */
+		vthistory_addlines(vb, rdiff);
+	} else if (p2->tp_row < p1->tp_row) {
+		/* Handle overlapping copies of line segments. */
+		/* Move data up. */
+		for (pr = 0; pr < rows; pr++)
+			memmove(
+			    &VTBUF_FIELD(vb, p2->tp_row + pr, p2->tp_col),
+			    &VTBUF_FIELD(vb, p1->tp_row + pr, p1->tp_col),
+			    cols * sizeof(term_char_t));
+	} else {
+		/* Move data down. */
+		for (pr = rows - 1; pr >= 0; pr--)
+			memmove(
+			    &VTBUF_FIELD(vb, p2->tp_row + pr, p2->tp_col),
+			    &VTBUF_FIELD(vb, p1->tp_row + pr, p1->tp_col),
+			    cols * sizeof(term_char_t));
+	}
+
+	area.tr_begin = *p2;
+	area.tr_end.tp_row = MIN(p2->tp_row + rows, vb->vb_scr_size.tp_row);
+	area.tr_end.tp_col = MIN(p2->tp_col + cols, vb->vb_scr_size.tp_col);
+	vtbuf_dirty(vb, &area);
+}
+
+static void
+vtbuf_fill(struct vt_buf *vb, const term_rect_t *r, term_char_t c)
+{
+	unsigned int pr, pc;
+	term_char_t *row;
+
+	for (pr = r->tr_begin.tp_row; pr < r->tr_end.tp_row; pr++) {
+		row = vb->vb_rows[(vb->vb_curroffset + pr) %
+		    VTBUF_MAX_HEIGHT(vb)];
+		for (pc = r->tr_begin.tp_col; pc < r->tr_end.tp_col; pc++) {
+			row[pc] = c;
+		}
+	}
+}
+
+void
+vtbuf_fill_locked(struct vt_buf *vb, const term_rect_t *r, term_char_t c)
+{
+	KASSERT(r->tr_begin.tp_row < vb->vb_scr_size.tp_row,
+	    ("vtbuf_fill_locked begin.tp_row %d must be < screen width %d",
+		r->tr_begin.tp_row, vb->vb_scr_size.tp_row));
+	KASSERT(r->tr_begin.tp_col < vb->vb_scr_size.tp_col,
+	    ("vtbuf_fill_locked begin.tp_col %d must be < screen height %d",
+		r->tr_begin.tp_col, vb->vb_scr_size.tp_col));
+
+	KASSERT(r->tr_end.tp_row <= vb->vb_scr_size.tp_row,
+	    ("vtbuf_fill_locked end.tp_row %d must be <= screen width %d",
+		r->tr_end.tp_row, vb->vb_scr_size.tp_row));
+	KASSERT(r->tr_end.tp_col <= vb->vb_scr_size.tp_col,
+	    ("vtbuf_fill_locked end.tp_col %d must be <= screen height %d",
+		r->tr_end.tp_col, vb->vb_scr_size.tp_col));
+
+	VTBUF_LOCK(vb);
+	vtbuf_fill(vb, r, c);
+	VTBUF_UNLOCK(vb);
+
+	vtbuf_dirty(vb, r);
+}
+
+static void
+vtbuf_init_rows(struct vt_buf *vb)
+{
+	int r;
+
+	vb->vb_history_size = MAX(vb->vb_history_size, vb->vb_scr_size.tp_row);
+
+	for (r = 0; r < vb->vb_history_size; r++)
+		vb->vb_rows[r] = &vb->vb_buffer[r *
+		    vb->vb_scr_size.tp_col];
+}
+
+void
+vtbuf_init_early(struct vt_buf *vb)
+{
+
+	vb->vb_flags |= VBF_CURSOR;
+	vb->vb_roffset = 0;
+	vb->vb_curroffset = 0;
+	vb->vb_mark_start.tp_row = 0;
+	vb->vb_mark_start.tp_col = 0;
+	vb->vb_mark_end.tp_row = 0;
+	vb->vb_mark_end.tp_col = 0;
+
+	vtbuf_init_rows(vb);
+	vtbuf_make_undirty(vb);
+	if ((vb->vb_flags & VBF_MTX_INIT) == 0) {
+		mtx_init(&vb->vb_lock, "vtbuf", NULL, MTX_SPIN);
+		vb->vb_flags |= VBF_MTX_INIT;
+	}
+}
+
+void
+vtbuf_init(struct vt_buf *vb, const term_pos_t *p)
+{
+	int sz;
+
+	vb->vb_scr_size = *p;
+	vb->vb_history_size = VBF_DEFAULT_HISTORY_SIZE;
+
+	if ((vb->vb_flags & VBF_STATIC) == 0) {
+		sz = vb->vb_history_size * p->tp_col * sizeof(term_char_t);
+		vb->vb_buffer = malloc(sz, M_VTBUF, M_WAITOK | M_ZERO);
+
+		sz = vb->vb_history_size * sizeof(term_char_t *);
+		vb->vb_rows = malloc(sz, M_VTBUF, M_WAITOK | M_ZERO);
+	}
+
+	vtbuf_init_early(vb);
+}
+
+void
+vtbuf_sethistory_size(struct vt_buf *vb, int size)
+{
+	term_pos_t p;
+
+	/* With same size */
+	p.tp_row = vb->vb_scr_size.tp_row;
+	p.tp_col = vb->vb_scr_size.tp_col;
+	vtbuf_grow(vb, &p, size);
+}
+
+void
+vtbuf_grow(struct vt_buf *vb, const term_pos_t *p, int history_size)
+{
+	term_char_t *old, *new, **rows, **oldrows, **copyrows, *row;
+	int bufsize, rowssize, w, h, c, r;
+	term_rect_t rect;
+
+	history_size = MAX(history_size, p->tp_row);
+
+	if (history_size > vb->vb_history_size || p->tp_col >
+	    vb->vb_scr_size.tp_col) {
+		/* 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;
+
+		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. */
+		for (r = 0; r < history_size; r ++) {
+			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;
+				}
+			} 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);
+				break;
+			}
+		}
+		vtbuf_make_undirty(vb);
+		VTBUF_UNLOCK(vb);
+		/* Deallocate old buffer. */
+		free(old, M_VTBUF);
+		free(oldrows, M_VTBUF);
+	}
+}
+
+void
+vtbuf_putchar(struct vt_buf *vb, const term_pos_t *p, term_char_t c)
+{
+	term_char_t *row;
+
+	KASSERT(p->tp_row < vb->vb_scr_size.tp_row,
+	    ("vtbuf_putchar tp_row %d must be less than screen width %d",
+		p->tp_row, vb->vb_scr_size.tp_row));
+	KASSERT(p->tp_col < vb->vb_scr_size.tp_col,
+	    ("vtbuf_putchar tp_col %d must be less than screen height %d",
+		p->tp_col, vb->vb_scr_size.tp_col));
+
+	row = vb->vb_rows[(vb->vb_curroffset + p->tp_row) %
+	    VTBUF_MAX_HEIGHT(vb)];
+	if (row[p->tp_col] != c) {
+		VTBUF_LOCK(vb);
+		row[p->tp_col] = c;
+		VTBUF_UNLOCK(vb);
+		vtbuf_dirty_cell(vb, p);
+	}
+}
+
+void
+vtbuf_cursor_position(struct vt_buf *vb, const term_pos_t *p)
+{
+
+	if (vb->vb_flags & VBF_CURSOR) {
+		vtbuf_dirty_cell(vb, &vb->vb_cursor);
+		vb->vb_cursor = *p;
+		vtbuf_dirty_cell(vb, &vb->vb_cursor);
+	} else {
+		vb->vb_cursor = *p;
+	}
+}
+
+#ifndef SC_NO_CUTPASTE
+void
+vtbuf_mouse_cursor_position(struct vt_buf *vb, int col, int row)
+{
+	term_rect_t area;
+
+	area.tr_begin.tp_row = MAX(row - 1, 0);
+	area.tr_begin.tp_col = MAX(col - 1, 0);
+	area.tr_end.tp_row = MIN(row + 2, vb->vb_scr_size.tp_row);
+	area.tr_end.tp_col = MIN(col + 2, vb->vb_scr_size.tp_col);
+	vtbuf_dirty(vb, &area);
+}
+
+static void
+vtbuf_flush_mark(struct vt_buf *vb)
+{
+	term_rect_t area;
+	int s, e;
+
+	/* Notify renderer to update marked region. */
+	if (vb->vb_mark_start.tp_col || vb->vb_mark_end.tp_col ||
+	    vb->vb_mark_start.tp_row || vb->vb_mark_end.tp_row) {
+
+		s = vtbuf_htw(vb, vb->vb_mark_start.tp_row);
+		e = vtbuf_htw(vb, vb->vb_mark_end.tp_row);
+
+		area.tr_begin.tp_col = 0;
+		area.tr_begin.tp_row = MIN(s, e);
+
+		area.tr_end.tp_col = vb->vb_scr_size.tp_col;
+		area.tr_end.tp_row = MAX(s, e) + 1;
+
+		vtbuf_dirty(vb, &area);
+	}
+}
+
+int
+vtbuf_get_marked_len(struct vt_buf *vb)
+{
+	int ei, si, sz;
+	term_pos_t s, e;
+
+	/* Swap according to window coordinates. */
+	if (POS_INDEX(vtbuf_htw(vb, vb->vb_mark_start.tp_row),
+	    vb->vb_mark_start.tp_col) >
+	    POS_INDEX(vtbuf_htw(vb, vb->vb_mark_end.tp_row),
+	    vb->vb_mark_end.tp_col)) {
+		POS_COPY(e, vb->vb_mark_start);
+		POS_COPY(s, vb->vb_mark_end);
+	} else {
+		POS_COPY(s, vb->vb_mark_start);
+		POS_COPY(e, vb->vb_mark_end);
+	}
+
+	si = s.tp_row * vb->vb_scr_size.tp_col + s.tp_col;
+	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;
+
+	return (sz * sizeof(term_char_t));
+}
+
+void
+vtbuf_extract_marked(struct vt_buf *vb, term_char_t *buf, int sz)
+{
+	int i, r, c, cs, ce;
+	term_pos_t s, e;
+
+	/* Swap according to window coordinates. */
+	if (POS_INDEX(vtbuf_htw(vb, vb->vb_mark_start.tp_row),
+	    vb->vb_mark_start.tp_col) >
+	    POS_INDEX(vtbuf_htw(vb, vb->vb_mark_end.tp_row),
+	    vb->vb_mark_end.tp_col)) {
+		POS_COPY(e, vb->vb_mark_start);
+		POS_COPY(s, vb->vb_mark_end);
+	} else {
+		POS_COPY(s, vb->vb_mark_start);
+		POS_COPY(e, vb->vb_mark_end);
+	}
+
+	i = 0;
+	for (r = s.tp_row; r <= e.tp_row; r ++) {
+		cs = (r == s.tp_row)?s.tp_col:0;
+		ce = (r == e.tp_row)?e.tp_col:vb->vb_scr_size.tp_col;
+		for (c = cs; c < ce; c ++) {
+			buf[i++] = vb->vb_rows[r][c];
+		}
+		/* Add new line for all rows, but not for last one. */
+		if (r != e.tp_row) {
+			buf[i++] = '\r';
+			buf[i++] = '\n';
+		}
+	}
+}
+
+int
+vtbuf_set_mark(struct vt_buf *vb, int type, int col, int row)
+{
+	term_char_t *r;
+	int i;
+
+	switch (type) {
+	case VTB_MARK_END:	/* B1 UP */
+		if (vb->vb_mark_last != VTB_MARK_MOVE)
+			return (0);
+		/* FALLTHROUGH */
+	case VTB_MARK_MOVE:
+	case VTB_MARK_EXTEND:
+		vtbuf_flush_mark(vb); /* Clean old mark. */
+		vb->vb_mark_end.tp_col = col;
+		vb->vb_mark_end.tp_row = vtbuf_wth(vb, row);
+		break;
+	case VTB_MARK_START:
+		vtbuf_flush_mark(vb); /* Clean old mark. */
+		vb->vb_mark_start.tp_col = col;
+		vb->vb_mark_start.tp_row = vtbuf_wth(vb, row);
+		/* Start again, so clear end point. */
+		vb->vb_mark_end.tp_col = col;
+		vb->vb_mark_end.tp_row = vtbuf_wth(vb, row);
+		break;
+	case VTB_MARK_WORD:
+		vtbuf_flush_mark(vb); /* Clean old mark. */
+		vb->vb_mark_start.tp_row = vb->vb_mark_end.tp_row =
+		    vtbuf_wth(vb, row);
+		r = vb->vb_rows[vb->vb_mark_start.tp_row];
+		for (i = col; i >= 0; i --) {
+			if (TCHAR_CHARACTER(r[i]) == ' ') {
+				vb->vb_mark_start.tp_col = i + 1;
+				break;
+			}
+		}
+		for (i = col; i < vb->vb_scr_size.tp_col; i ++) {
+			if (TCHAR_CHARACTER(r[i]) == ' ') {
+				vb->vb_mark_end.tp_col = i;
+				break;
+			}
+		}
+		if (vb->vb_mark_start.tp_col > vb->vb_mark_end.tp_col)
+			vb->vb_mark_start.tp_col = vb->vb_mark_end.tp_col;
+		break;
+	case VTB_MARK_ROW:
+		vtbuf_flush_mark(vb); /* Clean old mark. */
+		vb->vb_mark_start.tp_col = 0;
+		vb->vb_mark_end.tp_col = vb->vb_scr_size.tp_col;
+		vb->vb_mark_start.tp_row = vb->vb_mark_end.tp_row =
+		    vtbuf_wth(vb, row);
+		break;
+	case VTB_MARK_NONE:
+		vb->vb_mark_last = type;
+		/* FALLTHROUGH */
+	default:
+		/* panic? */
+		return (0);
+	}
+
+	vb->vb_mark_last = type;
+	/* Draw new marked region. */
+	vtbuf_flush_mark(vb);
+	return (1);
+}
+#endif
+
+void
+vtbuf_cursor_visibility(struct vt_buf *vb, int yes)
+{
+	int oflags, nflags;
+
+	VTBUF_LOCK(vb);
+	oflags = vb->vb_flags;
+	if (yes)
+		vb->vb_flags |= VBF_CURSOR;
+	else
+		vb->vb_flags &= ~VBF_CURSOR;
+	nflags = vb->vb_flags;
+	VTBUF_UNLOCK(vb);
+
+	if (oflags != nflags)
+		vtbuf_dirty_cell(vb, &vb->vb_cursor);
+}
+
+void
+vtbuf_scroll_mode(struct vt_buf *vb, int yes)
+{
+	int oflags, nflags;
+
+	VTBUF_LOCK(vb);
+	oflags = vb->vb_flags;
+	if (yes)
+		vb->vb_flags |= VBF_SCROLL;
+	else
+		vb->vb_flags &= ~VBF_SCROLL;
+	nflags = vb->vb_flags;
+	VTBUF_UNLOCK(vb);
+
+	if (oflags != nflags)
+		vtbuf_dirty_cell(vb, &vb->vb_cursor);
+}
+
diff --git a/sys/dev/vt/vt_consolectl.c b/sys/dev/vt/vt_consolectl.c
new file mode 100644
index 00000000000..c4180a18f7b
--- /dev/null
+++ b/sys/dev/vt/vt_consolectl.c
@@ -0,0 +1,79 @@
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten 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/conf.h>
+#include <sys/consio.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
+
+#include <dev/vt/vt.h>
+
+static d_ioctl_t	consolectl_ioctl;
+
+static struct cdevsw consolectl_cdevsw = {
+	.d_version	= D_VERSION,
+	.d_ioctl	= consolectl_ioctl,
+	.d_name		= "consolectl",
+};
+
+static int
+consolectl_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag,
+    struct thread *td)
+{
+
+	switch (cmd) {
+	case CONS_GETVERS: 
+		*(int*)data = 0x200;
+		return 0;
+	case CONS_MOUSECTL: {
+		mouse_info_t *mi = (mouse_info_t*)data;
+
+		sysmouse_process_event(mi);
+		return (0);
+	}
+	default:
+		printf("consolectl: unknown ioctl: %c:%lx\n",
+		    (char)IOCGROUP(cmd), IOCBASECMD(cmd));
+		return (ENOIOCTL);
+	}
+}
+
+static void
+consolectl_drvinit(void *unused)
+{
+
+	make_dev(&consolectl_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
+	    "consolectl");
+}
+
+SYSINIT(consolectl, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, consolectl_drvinit, NULL);
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
new file mode 100644
index 00000000000..34f2b1b220e
--- /dev/null
+++ b/sys/dev/vt/vt_core.c
@@ -0,0 +1,1844 @@
+/*-
+ * Copyright (c) 2009, 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten under sponsorship from the
+ * FreeBSD Foundation.
+ *
+ * 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 "opt_compat.h"
+
+#include <sys/param.h>
+#include <sys/consio.h>
+#include <sys/eventhandler.h>
+#include <sys/fbio.h>
+#include <sys/kbio.h>
+#include <sys/kdb.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/priv.h>
+#include <sys/proc.h>
+#include <sys/reboot.h>
+#include <sys/systm.h>
+#include <sys/terminal.h>
+
+#include <dev/kbd/kbdreg.h>
+#include <dev/vt/vt.h>
+
+#if defined(__i386__) || defined(__amd64__)
+#include <machine/psl.h>
+#include <machine/frame.h>
+#endif
+
+static tc_bell_t	vtterm_bell;
+static tc_cursor_t	vtterm_cursor;
+static tc_putchar_t	vtterm_putchar;
+static tc_fill_t	vtterm_fill;
+static tc_copy_t	vtterm_copy;
+static tc_param_t	vtterm_param;
+static tc_done_t	vtterm_done;
+
+static tc_cnprobe_t	vtterm_cnprobe;
+static tc_cngetc_t	vtterm_cngetc;
+
+static tc_opened_t	vtterm_opened;
+static tc_ioctl_t	vtterm_ioctl;
+
+const struct terminal_class vt_termclass = {
+	.tc_bell	= vtterm_bell,
+	.tc_cursor	= vtterm_cursor,
+	.tc_putchar	= vtterm_putchar,
+	.tc_fill	= vtterm_fill,
+	.tc_copy	= vtterm_copy,
+	.tc_param	= vtterm_param,
+	.tc_done	= vtterm_done,
+
+	.tc_cnprobe	= vtterm_cnprobe,
+	.tc_cngetc	= vtterm_cngetc,
+
+	.tc_opened	= vtterm_opened,
+	.tc_ioctl	= vtterm_ioctl,
+};
+
+/*
+ * Use a constant timer of 25 Hz to redraw the screen.
+ *
+ * XXX: In theory we should only fire up the timer when there is really
+ * activity. Unfortunately we cannot always start timers. We really
+ * don't want to process kernel messages synchronously, because it
+ * really slows down the system.
+ */
+#define	VT_TIMERFREQ	25
+
+/* Bell pitch/duration. */
+#define VT_BELLDURATION	((5 * hz + 99) / 100)
+#define VT_BELLPITCH	800
+
+#define	VT_LOCK(vd)	mtx_lock(&(vd)->vd_lock)
+#define	VT_UNLOCK(vd)	mtx_unlock(&(vd)->vd_lock)
+
+#define	VT_UNIT(vw)	((vw)->vw_device->vd_unit * VT_MAXWINDOWS + \
+			(vw)->vw_number)
+
+/* XXX while syscons is here. */
+int sc_txtmouse_no_retrace_wait;
+
+static SYSCTL_NODE(_kern, OID_AUTO, vt, CTLFLAG_RD, 0, "Newcons parameters");
+VT_SYSCTL_INT(debug, 0, "Newcons 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");
+
+static unsigned int vt_unit = 0;
+static MALLOC_DEFINE(M_VT, "vt", "vt device");
+struct vt_device *main_vd = NULL;
+
+/* Boot logo. */
+extern unsigned int vt_logo_width;
+extern unsigned int vt_logo_height;
+extern unsigned int vt_logo_depth;
+extern unsigned char vt_logo_image[];
+
+/* Font. */
+extern struct vt_font vt_font_default;
+#ifndef SC_NO_CUTPASTE
+extern struct mouse_cursor vt_default_mouse_pointer;
+#endif
+
+static int signal_vt_rel(struct vt_window *);
+static int signal_vt_acq(struct vt_window *);
+static int finish_vt_rel(struct vt_window *, int, int *);
+static int finish_vt_acq(struct vt_window *);
+static int vt_window_switch(struct vt_window *);
+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_switch_timer(void *arg)
+{
+
+	vt_late_window_switch((struct vt_window *)arg);
+}
+
+static int
+vt_window_preswitch(struct vt_window *vw, struct vt_window *curvw)
+{
+
+	DPRINTF(40, "%s\n", __func__);
+	curvw->vw_switch_to = vw;
+	/* Set timer to allow switch in case when process hang. */
+	callout_reset(&vw->vw_proc_dead_timer, hz * vt_deadtimer,
+	    vt_switch_timer, (void *)vw);
+	/* Notify process about vt switch attempt. */
+	DPRINTF(30, "%s: Notify process.\n", __func__);
+	signal_vt_rel(curvw);
+
+	return (0);
+}
+
+static int
+vt_window_postswitch(struct vt_window *vw)
+{
+
+	signal_vt_acq(vw);
+	return (0);
+}
+
+/* vt_late_window_switch will done VT switching for regular case. */
+static int
+vt_late_window_switch(struct vt_window *vw)
+{
+	int ret;
+
+	callout_stop(&vw->vw_proc_dead_timer);
+
+	ret = vt_window_switch(vw);
+	if (ret)
+		return (ret);
+
+	/* Notify owner process about terminal availability. */
+	if (vw->vw_smode.mode == VT_PROCESS) {
+		ret = vt_window_postswitch(vw);
+	}
+	return (ret);
+}
+
+/* Switch window. */
+static int
+vt_proc_window_switch(struct vt_window *vw)
+{
+	struct vt_window *curvw;
+	struct vt_device *vd;
+	int ret;
+
+	if (vw->vw_flags & VWF_VTYLOCK)
+		return (EBUSY);
+
+	vd = vw->vw_device;
+	curvw = vd->vd_curwindow;
+
+	/* Ask current process permitions to switch away. */
+	if (curvw->vw_smode.mode == VT_PROCESS) {
+		DPRINTF(30, "%s: VT_PROCESS ", __func__);
+		if (vt_proc_alive(curvw) == FALSE) {
+			DPRINTF(30, "Dead. Cleaning.");
+			/* Dead */
+		} else {
+			DPRINTF(30, "%s: Signaling process.\n", __func__);
+			/* Alive, try to ask him. */
+			ret = vt_window_preswitch(vw, curvw);
+			/* Wait for process answer or timeout. */
+			return (ret);
+		}
+		DPRINTF(30, "\n");
+	}
+
+	ret = vt_late_window_switch(vw);
+	return (ret);
+}
+
+/* Switch window ignoring process locking. */
+static int
+vt_window_switch(struct vt_window *vw)
+{
+	struct vt_device *vd = vw->vw_device;
+	struct vt_window *curvw = vd->vd_curwindow;
+	keyboard_t *kbd;
+
+	VT_LOCK(vd);
+	if (curvw == vw) {
+		/* Nothing to do. */
+		VT_UNLOCK(vd);
+		return (0);
+	}
+	if (!(vw->vw_flags & (VWF_OPENED|VWF_CONSOLE))) {
+		VT_UNLOCK(vd);
+		return (EINVAL);
+	}
+
+	vd->vd_curwindow = vw;
+	vd->vd_flags |= VDF_INVALID;
+	cv_broadcast(&vd->vd_winswitch);
+	VT_UNLOCK(vd);
+
+	if (vd->vd_driver->vd_postswitch)
+		vd->vd_driver->vd_postswitch(vd);
+
+	/* Restore per-window keyboard mode. */
+	mtx_lock(&Giant);
+	kbd = kbd_get_keyboard(vd->vd_keyboard);
+	if (kbd != NULL) {
+		kbdd_ioctl(kbd, KDSKBMODE, (void *)&vw->vw_kbdmode);
+	}
+	mtx_unlock(&Giant);
+	DPRINTF(10, "%s(ttyv%d) done\n", __func__, vw->vw_number);
+
+	return (0);
+}
+
+static inline void
+vt_termsize(struct vt_device *vd, struct vt_font *vf, term_pos_t *size)
+{
+
+	size->tp_row = vd->vd_height;
+	size->tp_col = vd->vd_width;
+	if (vf != NULL) {
+		size->tp_row /= vf->vf_height;
+		size->tp_col /= vf->vf_width;
+	}
+}
+
+static inline void
+vt_winsize(struct vt_device *vd, struct vt_font *vf, struct winsize *size)
+{
+
+	size->ws_row = size->ws_ypixel = vd->vd_height;
+	size->ws_col = size->ws_xpixel = vd->vd_width;
+	if (vf != NULL) {
+		size->ws_row /= vf->vf_height;
+		size->ws_col /= vf->vf_width;
+	}
+}
+
+static void
+vt_scroll(struct vt_window *vw, int offset, int whence)
+{
+	int diff;
+	term_pos_t size;
+
+	if ((vw->vw_flags & VWF_SCROLL) == 0)
+		return;
+
+	vt_termsize(vw->vw_device, vw->vw_font, &size);
+
+	diff = vthistory_seek(&vw->vw_buf, offset, whence);
+	/*
+	 * Offset changed, please update Nth lines on sceen.
+	 * +N - Nth lines at top;
+	 * -N - Nth lines at bottom.
+	 */
+
+	if (diff < -size.tp_row || diff > size.tp_row) {
+		vw->vw_device->vd_flags |= VDF_INVALID;
+		return;
+	}
+	vw->vw_device->vd_flags |= VDF_INVALID; /*XXX*/
+}
+
+static int
+vt_machine_kbdevent(int c)
+{
+
+	switch (c) {
+	case SPCLKEY | DBG:
+		kdb_enter(KDB_WHY_BREAK, "manual escape to debugger");
+		return (1);
+	case SPCLKEY | RBT:
+		/* XXX: Make this configurable! */
+		shutdown_nice(0);
+		return (1);
+	case SPCLKEY | HALT:
+		shutdown_nice(RB_HALT);
+		return (1);
+	case SPCLKEY | PDWN:
+		shutdown_nice(RB_HALT|RB_POWEROFF);
+		return (1);
+	};
+
+	return (0);
+}
+
+static void
+vt_scrollmode_kbdevent(struct vt_window *vw, int c, int console)
+{
+	struct vt_device *vd;
+	term_pos_t size;
+
+	vd = vw->vw_device;
+	/* Only special keys handled in ScrollLock mode */
+	if ((c & SPCLKEY) == 0)
+		return;
+
+	c &= ~SPCLKEY;
+
+	if (console == 0) {
+		if (c >= F_SCR && c <= MIN(L_SCR, F_SCR + VT_MAXWINDOWS - 1)) {
+			vw = vd->vd_windows[c - F_SCR];
+			if (vw != NULL)
+				vt_proc_window_switch(vw);
+			return;
+		}
+		VT_LOCK(vd);
+	}
+
+	switch (c) {
+	case SLK: {
+		/* Turn scrolling off. */
+		vt_scroll(vw, 0, VHS_END);
+		VTBUF_SLCK_DISABLE(&vw->vw_buf);
+		vw->vw_flags &= ~VWF_SCROLL;
+		break;
+	}
+	case FKEY | F(49): /* Home key. */
+		vt_scroll(vw, 0, VHS_SET);
+		break;
+	case FKEY | F(50): /* Arrow up. */
+		vt_scroll(vw, -1, VHS_CUR);
+		break;
+	case FKEY | F(51): /* Page up. */
+		vt_termsize(vd, vw->vw_font, &size);
+		vt_scroll(vw, -size.tp_row, VHS_CUR);
+		break;
+	case FKEY | F(57): /* End key. */
+		vt_scroll(vw, 0, VHS_END);
+		break;
+	case FKEY | F(58): /* Arrow down. */
+		vt_scroll(vw, 1, VHS_CUR);
+		break;
+	case FKEY | F(59): /* Page down. */
+		vt_termsize(vd, vw->vw_font, &size);
+		vt_scroll(vw, size.tp_row, VHS_CUR);
+		break;
+	}
+
+	if (console == 0)
+		VT_UNLOCK(vd);
+}
+
+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) {
+		switch (c & ~RELKEY) {
+		case (SPCLKEY | RALT):
+		case (SPCLKEY | LALT):
+			vd->vd_kbstate &= ~ALKED;
+		}
+		/* Other keys ignored for RELKEY event. */
+		return (0);
+	} else {
+		switch (c & ~RELKEY) {
+		case (SPCLKEY | RALT):
+		case (SPCLKEY | LALT):
+			vd->vd_kbstate |= ALKED;
+		}
+	}
+#else
+	if (c & RELKEY)
+		/* Other keys ignored for RELKEY event. */
+		return (0);
+#endif
+
+	if (vt_machine_kbdevent(c))
+		return (0);
+
+	if (vw->vw_flags & VWF_SCROLL) {
+		vt_scrollmode_kbdevent(vw, c, 0/* Not a console */);
+		/* Scroll mode keys handled, nothing to do more. */
+		return (0);
+	}
+
+	if (c & SPCLKEY) {
+		c &= ~SPCLKEY;
+
+		if (c >= F_SCR && c <= MIN(L_SCR, F_SCR + VT_MAXWINDOWS - 1)) {
+			vw = vd->vd_windows[c - F_SCR];
+			if (vw != NULL)
+				vt_proc_window_switch(vw);
+			return (0);
+		}
+
+		switch (c) {
+		case SLK: {
+
+			kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
+			VT_LOCK(vd);
+			if (state & SLKED) {
+				/* Turn scrolling on. */
+				vw->vw_flags |= VWF_SCROLL;
+				VTBUF_SLCK_ENABLE(&vw->vw_buf);
+			} else {
+				/* Turn scrolling off. */
+				vw->vw_flags &= ~VWF_SCROLL;
+				VTBUF_SLCK_DISABLE(&vw->vw_buf);
+				vt_scroll(vw, 0, VHS_END);
+			}
+			VT_UNLOCK(vd);
+			break;
+		}
+		case FKEY | F(1):  case FKEY | F(2):  case FKEY | F(3):
+		case FKEY | F(4):  case FKEY | F(5):  case FKEY | F(6):
+		case FKEY | F(7):  case FKEY | F(8):  case FKEY | F(9):
+		case FKEY | F(10): case FKEY | F(11): case FKEY | F(12):
+			/* F1 through F12 keys. */
+			terminal_input_special(vw->vw_terminal,
+			    TKEY_F1 + c - (FKEY | F(1)));
+			break;
+		case FKEY | F(49): /* Home key. */
+			terminal_input_special(vw->vw_terminal, TKEY_HOME);
+			break;
+		case FKEY | F(50): /* Arrow up. */
+			terminal_input_special(vw->vw_terminal, TKEY_UP);
+			break;
+		case FKEY | F(51): /* Page up. */
+			terminal_input_special(vw->vw_terminal, TKEY_PAGE_UP);
+			break;
+		case FKEY | F(53): /* Arrow left. */
+			terminal_input_special(vw->vw_terminal, TKEY_LEFT);
+			break;
+		case FKEY | F(55): /* Arrow right. */
+			terminal_input_special(vw->vw_terminal, TKEY_RIGHT);
+			break;
+		case FKEY | F(57): /* End key. */
+			terminal_input_special(vw->vw_terminal, TKEY_END);
+			break;
+		case FKEY | F(58): /* Arrow down. */
+			terminal_input_special(vw->vw_terminal, TKEY_DOWN);
+			break;
+		case FKEY | F(59): /* Page down. */
+			terminal_input_special(vw->vw_terminal, TKEY_PAGE_DOWN);
+			break;
+		case FKEY | F(60): /* Insert key. */
+			terminal_input_special(vw->vw_terminal, TKEY_INSERT);
+			break;
+		case FKEY | F(61): /* Delete key. */
+			terminal_input_special(vw->vw_terminal, TKEY_DELETE);
+			break;
+		}
+	} else if (KEYFLAGS(c) == 0) {
+		/* Don't do UTF-8 conversion when doing raw mode. */
+		if (vw->vw_kbdmode == K_XLATE) {
+#if VT_ALT_TO_ESC_HACK
+			if (vd->vd_kbstate & ALKED) {
+				/*
+				 * Prepend ESC sequence if one of ALT keys down.
+				 */
+				terminal_input_char(vw->vw_terminal, 0x1b);
+			}
+#endif
+
+			terminal_input_char(vw->vw_terminal, KEYCHAR(c));
+		} else
+			terminal_input_raw(vw->vw_terminal, c);
+	}
+	return (0);
+}
+
+static int
+vt_kbdevent(keyboard_t *kbd, int event, void *arg)
+{
+	struct vt_device *vd = arg;
+	int c;
+
+	switch (event) {
+	case KBDIO_KEYINPUT:
+		break;
+	case KBDIO_UNLOADING:
+		mtx_lock(&Giant);
+		vd->vd_keyboard = -1;
+		kbd_release(kbd, (void *)&vd->vd_keyboard);
+		mtx_unlock(&Giant);
+		return (0);
+	default:
+		return (EINVAL);
+	}
+
+	while ((c = kbdd_read_char(kbd, 0)) != NOKEY)
+		vt_processkey(kbd, vd, c);
+
+	return (0);
+}
+
+static int
+vt_allocate_keyboard(struct vt_device *vd)
+{
+	int		 idx0, idx;
+	keyboard_t	*k0, *k;
+	keyboard_info_t	 ki;
+
+	idx0 = kbd_allocate("kbdmux", -1, (void *)&vd->vd_keyboard,
+	    vt_kbdevent, vd);
+	/* XXX: kb_token lost */
+	vd->vd_keyboard = idx0;
+	if (idx0 != -1) {
+		DPRINTF(20, "%s: kbdmux allocated, idx = %d\n", __func__, idx0);
+		k0 = kbd_get_keyboard(idx0);
+
+		for (idx = kbd_find_keyboard2("*", -1, 0);
+		     idx != -1;
+		     idx = kbd_find_keyboard2("*", -1, idx + 1)) {
+			k = kbd_get_keyboard(idx);
+
+			if (idx == idx0 || KBD_IS_BUSY(k))
+				continue;
+
+			bzero(&ki, sizeof(ki));
+			strcpy(ki.kb_name, k->kb_name);
+			ki.kb_unit = k->kb_unit;
+
+			kbdd_ioctl(k0, KBADDKBD, (caddr_t) &ki);
+		}
+	} else {
+		DPRINTF(20, "%s: no kbdmux allocated\n", __func__);
+		idx0 = kbd_allocate("*", -1, (void *)&vd->vd_keyboard,
+		    vt_kbdevent, vd);
+	}
+	DPRINTF(20, "%s: vd_keyboard = %d\n", __func__, vd->vd_keyboard);
+
+	return (idx0);
+}
+
+static void
+vtterm_bell(struct terminal *tm)
+{
+
+	sysbeep(1193182 / VT_BELLPITCH, VT_BELLDURATION);
+}
+
+static void
+vtterm_cursor(struct terminal *tm, const term_pos_t *p)
+{
+	struct vt_window *vw = tm->tm_softc;
+
+	vtbuf_cursor_position(&vw->vw_buf, p);
+}
+
+static void
+vtterm_putchar(struct terminal *tm, const term_pos_t *p, term_char_t c)
+{
+	struct vt_window *vw = tm->tm_softc;
+
+	vtbuf_putchar(&vw->vw_buf, p, c);
+}
+
+static void
+vtterm_fill(struct terminal *tm, const term_rect_t *r, term_char_t c)
+{
+	struct vt_window *vw = tm->tm_softc;
+
+	vtbuf_fill_locked(&vw->vw_buf, r, c);
+}
+
+static void
+vtterm_copy(struct terminal *tm, const term_rect_t *r,
+    const term_pos_t *p)
+{
+	struct vt_window *vw = tm->tm_softc;
+
+	vtbuf_copy(&vw->vw_buf, r, p);
+}
+
+static void
+vtterm_param(struct terminal *tm, int cmd, unsigned int arg)
+{
+	struct vt_window *vw = tm->tm_softc;
+
+	switch (cmd) {
+	case TP_SHOWCURSOR:
+		vtbuf_cursor_visibility(&vw->vw_buf, arg);
+		break;
+	}
+}
+
+static inline void
+vt_determine_colors(term_char_t c, int cursor,
+    term_color_t *fg, term_color_t *bg)
+{
+
+	*fg = TCHAR_FGCOLOR(c);
+	if (TCHAR_FORMAT(c) & TF_BOLD)
+		*fg = TCOLOR_LIGHT(*fg);
+	*bg = TCHAR_BGCOLOR(c);
+
+	if (TCHAR_FORMAT(c) & TF_REVERSE) {
+		term_color_t tmp;
+
+		tmp = *fg;
+		*fg = *bg;
+		*bg = tmp;
+	}
+
+	if (cursor) {
+		*fg = *bg;
+		*bg = TC_WHITE;
+	}
+}
+
+static void
+vt_bitblt_char(struct vt_device *vd, struct vt_font *vf, term_char_t c,
+    int iscursor, unsigned int row, unsigned int col)
+{
+	term_color_t fg, bg;
+
+	vt_determine_colors(c, iscursor, &fg, &bg);
+
+	if (vf != NULL) {
+		const uint8_t *src;
+		vt_axis_t top, left;
+
+		src = vtfont_lookup(vf, c);
+
+		/*
+		 * Align the terminal to the centre of the screen.
+		 * Fonts may not always be able to fill the entire
+		 * screen.
+		 */
+		top = row * vf->vf_height + vd->vd_offset.tp_row;
+		left = col * vf->vf_width + vd->vd_offset.tp_col;
+
+		vd->vd_driver->vd_bitbltchr(vd, src, NULL, 0, top, left,
+		    vf->vf_width, vf->vf_height, fg, bg);
+	} else {
+		vd->vd_driver->vd_putchar(vd, TCHAR_CHARACTER(c),
+		    row, col, fg, bg);
+	}
+}
+
+static void
+vt_flush(struct vt_device *vd)
+{
+	struct vt_window *vw = vd->vd_curwindow;
+	struct vt_font *vf = vw->vw_font;
+	struct vt_bufmask tmask;
+	unsigned int row, col;
+	term_rect_t tarea;
+	term_pos_t size;
+	term_char_t *r;
+#ifndef SC_NO_CUTPASTE
+	struct mouse_cursor *m;
+	int bpl, h, w;
+#endif
+
+	if (vd->vd_flags & VDF_SPLASH || vw->vw_flags & VWF_BUSY)
+		return;
+
+	vtbuf_undirty(&vw->vw_buf, &tarea, &tmask);
+	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;
+	}
+
+#ifndef SC_NO_CUTPASTE
+	if ((vw->vw_flags & VWF_MOUSE_HIDE) == 0) {
+		/* Mark last mouse position as dirty to erase. */
+		vtbuf_mouse_cursor_position(&vw->vw_buf, vd->vd_mdirtyx,
+		    vd->vd_mdirtyy);
+	}
+#endif
+
+	for (row = tarea.tr_begin.tp_row; row < tarea.tr_end.tp_row; row++) {
+		if (!VTBUF_DIRTYROW(&tmask, row))
+			continue;
+		r = VTBUF_GET_ROW(&vw->vw_buf, row);
+		for (col = tarea.tr_begin.tp_col;
+		    col < tarea.tr_end.tp_col; col++) {
+			if (!VTBUF_DIRTYCOL(&tmask, col))
+				continue;
+
+			vt_bitblt_char(vd, vf, r[col],
+			    VTBUF_ISCURSOR(&vw->vw_buf, row, col), row, col);
+		}
+	}
+
+#ifndef SC_NO_CUTPASTE
+	/* Mouse disabled. */
+	if (vw->vw_flags & VWF_MOUSE_HIDE)
+		return;
+
+	/* No mouse for DDB. */
+	if (kdb_active || panicstr != NULL)
+		return;
+
+	if ((vd->vd_flags & (VDF_MOUSECURSOR|VDF_TEXTMODE)) ==
+	    VDF_MOUSECURSOR) {
+		m = &vt_default_mouse_pointer;
+		bpl = (m->w + 7) >> 3; /* Bytes per sorce line. */
+		w = m->w;
+		h = m->h;
+
+		if ((vd->vd_mx + m->w) > (size.tp_col * vf->vf_width))
+			w = (size.tp_col * vf->vf_width) - vd->vd_mx - 1;
+		if ((vd->vd_my + m->h) > (size.tp_row * vf->vf_height))
+			h = (size.tp_row * vf->vf_height) - vd->vd_my - 1;
+
+		vd->vd_driver->vd_bitbltchr(vd, m->map, m->mask, bpl,
+		    vd->vd_offset.tp_row + vd->vd_my,
+		    vd->vd_offset.tp_col + vd->vd_mx,
+		    w, h, TC_WHITE, TC_BLACK);
+		/* Save point of last mouse cursor to erase it later. */
+		vd->vd_mdirtyx = vd->vd_mx / vf->vf_width;
+		vd->vd_mdirtyy = vd->vd_my / vf->vf_height;
+	}
+#endif
+}
+
+static void
+vt_timer(void *arg)
+{
+	struct vt_device *vd;
+
+	vd = arg;
+	/* Update screen if required. */
+	vt_flush(vd);
+	/* Schedule for next update. */
+	callout_schedule(&vd->vd_timer, hz / VT_TIMERFREQ);
+}
+
+static void
+vtterm_done(struct terminal *tm)
+{
+	struct vt_window *vw = tm->tm_softc;
+	struct vt_device *vd = vw->vw_device;
+
+	if (kdb_active || panicstr != NULL) {
+		/* Switch to the debugger. */
+		if (vd->vd_curwindow != vw) {
+			vd->vd_curwindow = vw;
+			vd->vd_flags |= VDF_INVALID;
+			if (vd->vd_driver->vd_postswitch)
+				vd->vd_driver->vd_postswitch(vd);
+		}
+		vd->vd_flags &= ~VDF_SPLASH;
+		vt_flush(vd);
+	} else if (!(vd->vd_flags & VDF_ASYNC)) {
+		vt_flush(vd);
+	}
+}
+
+#ifdef DEV_SPLASH
+static void
+vtterm_splash(struct vt_device *vd)
+{
+	vt_axis_t top, left;
+
+	/* Display a nice boot splash. */
+	if (!(vd->vd_flags & VDF_TEXTMODE) && (boothowto & RB_MUTE)) {
+
+		top = (vd->vd_height - vt_logo_height) / 2;
+		left = (vd->vd_width - vt_logo_width) / 2;
+		switch (vt_logo_depth) {
+		case 1:
+			/* XXX: Unhardcode colors! */
+			vd->vd_driver->vd_bitbltchr(vd, vt_logo_image, NULL, 0,
+			    top, left, vt_logo_width, vt_logo_height, 0xf, 0x0);
+		}
+		vd->vd_flags |= VDF_SPLASH;
+	}
+}
+#endif
+
+static void
+vtterm_cnprobe(struct terminal *tm, struct consdev *cp)
+{
+	struct vt_window *vw = tm->tm_softc;
+	struct vt_device *vd = vw->vw_device;
+	struct winsize wsz;
+
+	if (vd->vd_flags & VDF_INITIALIZED)
+		/* Initialization already done. */
+		return;
+
+	cp->cn_pri = vd->vd_driver->vd_init(vd);
+	if (cp->cn_pri == CN_DEAD) {
+		vd->vd_flags |= VDF_DEAD;
+		return;
+	}
+
+	/* Initialize any early-boot keyboard drivers */
+	kbd_configure(KB_CONF_PROBE_ONLY);
+
+	vd->vd_unit = atomic_fetchadd_int(&vt_unit, 1);
+	vd->vd_windows[VT_CONSWINDOW] = vw;
+	sprintf(cp->cn_name, "ttyv%r", VT_UNIT(vw));
+
+	if (!(vd->vd_flags & VDF_TEXTMODE))
+		vw->vw_font = vtfont_ref(&vt_font_default);
+
+	vtbuf_init_early(&vw->vw_buf);
+	vt_winsize(vd, vw->vw_font, &wsz);
+	terminal_set_winsize(tm, &wsz);
+
+#ifdef DEV_SPLASH
+	vtterm_splash(vd);
+#endif
+
+	vd->vd_flags |= VDF_INITIALIZED;
+	main_vd = vd;
+}
+
+static int
+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 */
+		vd->vd_flags &= ~VDF_SPLASH;
+		/* Mark screen as invalid to force update */
+		vd->vd_flags |= VDF_INVALID;
+		vt_flush(vd);
+	}
+
+	/* Stripped down keyboard handler. */
+	kbd = kbd_get_keyboard(vd->vd_keyboard);
+	if (kbd == NULL)
+		return (-1);
+
+	/* Force keyboard input mode to K_XLATE */
+	c = K_XLATE;
+	kbdd_ioctl(kbd, KDSKBMODE, (void *)&c);
+
+	/* Switch the keyboard to polling to make it work here. */
+	kbdd_poll(kbd, TRUE);
+	c = kbdd_read_char(kbd, 0);
+	kbdd_poll(kbd, FALSE);
+	if (c & RELKEY)
+		return (-1);
+
+	if (vw->vw_flags & VWF_SCROLL) {
+		vt_scrollmode_kbdevent(vw, c, 1/* Console mode */);
+		vt_flush(vd);
+		return (-1);
+	}
+
+	/* Stripped down handling of vt_kbdevent(), without locking, etc. */
+	if (c & SPCLKEY) {
+		switch (c) {
+		case SPCLKEY | SLK:
+			kbdd_ioctl(kbd, KDGKBSTATE, (caddr_t)&state);
+			if (state & SLKED) {
+				/* Turn scrolling on. */
+				vw->vw_flags |= VWF_SCROLL;
+				VTBUF_SLCK_ENABLE(&vw->vw_buf);
+			} else {
+				/* Turn scrolling off. */
+				vt_scroll(vw, 0, VHS_END);
+				vw->vw_flags &= ~VWF_SCROLL;
+				VTBUF_SLCK_DISABLE(&vw->vw_buf);
+			}
+			break;
+		/* XXX: KDB can handle history. */
+		case SPCLKEY | FKEY | F(50): /* Arrow up. */
+			vw->vw_kbdsq = "\x1b[A";
+			break;
+		case SPCLKEY | FKEY | F(58): /* Arrow down. */
+			vw->vw_kbdsq = "\x1b[B";
+			break;
+		case SPCLKEY | FKEY | F(55): /* Arrow right. */
+			vw->vw_kbdsq = "\x1b[C";
+			break;
+		case SPCLKEY | FKEY | F(53): /* Arrow left. */
+			vw->vw_kbdsq = "\x1b[D";
+			break;
+		}
+
+		/* Force refresh to make scrollback work. */
+		vt_flush(vd);
+	} else if (KEYFLAGS(c) == 0) {
+		return (KEYCHAR(c));
+	}
+
+	if (vw->vw_kbdsq && *vw->vw_kbdsq)
+		return (*vw->vw_kbdsq++);
+
+	return (-1);
+}
+
+static void
+vtterm_opened(struct terminal *tm, int opened)
+{
+	struct vt_window *vw = tm->tm_softc;
+	struct vt_device *vd = vw->vw_device;
+
+	VT_LOCK(vd);
+	vd->vd_flags &= ~VDF_SPLASH;
+	if (opened)
+		vw->vw_flags |= VWF_OPENED;
+	else {
+		vw->vw_flags &= ~VWF_OPENED;
+		/* TODO: finish ACQ/REL */
+	}
+	VT_UNLOCK(vd);
+}
+
+static int
+vt_change_font(struct vt_window *vw, struct vt_font *vf)
+{
+	struct vt_device *vd = vw->vw_device;
+	struct terminal *tm = vw->vw_terminal;
+	term_pos_t size;
+	struct winsize wsz;
+
+	/*
+	 * Changing fonts.
+	 *
+	 * Changing fonts is a little tricky.  We must prevent
+	 * simultaneous access to the device, so we must stop
+	 * the display timer and the terminal from accessing.
+	 * We need to switch fonts and grow our screen buffer.
+	 *
+	 * XXX: Right now the code uses terminal_mute() to
+	 * prevent data from reaching the console driver while
+	 * resizing the screen buffer.  This isn't elegant...
+	 */
+
+	VT_LOCK(vd);
+	if (vw->vw_flags & VWF_BUSY) {
+		/* Another process is changing the font. */
+		VT_UNLOCK(vd);
+		return (EBUSY);
+	}
+	if (vw->vw_font == NULL) {
+		/* Our device doesn't need fonts. */
+		VT_UNLOCK(vd);
+		return (ENOTTY);
+	}
+	vw->vw_flags |= VWF_BUSY;
+	VT_UNLOCK(vd);
+
+	vt_termsize(vd, vf, &size);
+	vt_winsize(vd, vf, &wsz);
+	/* Save offset to font aligned area. */
+	vd->vd_offset.tp_col = (vd->vd_width % vf->vf_width) / 2;
+	vd->vd_offset.tp_row = (vd->vd_height % vf->vf_height) / 2;
+
+	/* Grow the screen buffer and terminal. */
+	terminal_mute(tm, 1);
+	vtbuf_grow(&vw->vw_buf, &size, vw->vw_buf.vb_history_size);
+	terminal_set_winsize_blank(tm, &wsz, 0);
+	terminal_mute(tm, 0);
+
+	/* Actually apply the font to the current window. */
+	VT_LOCK(vd);
+	vtfont_unref(vw->vw_font);
+	vw->vw_font = vtfont_ref(vf);
+
+	/* Force a full redraw the next timer tick. */
+	if (vd->vd_curwindow == vw)
+		vd->vd_flags |= VDF_INVALID;
+	vw->vw_flags &= ~VWF_BUSY;
+	VT_UNLOCK(vd);
+	return (0);
+}
+
+static int
+vt_proc_alive(struct vt_window *vw)
+{
+	struct proc *p;
+
+	if (vw->vw_smode.mode != VT_PROCESS)
+		return (FALSE);
+
+	if (vw->vw_proc) {
+		if ((p = pfind(vw->vw_pid)) != NULL)
+			PROC_UNLOCK(p);
+		if (vw->vw_proc == p)
+			return (TRUE);
+		vw->vw_proc = NULL;
+		vw->vw_smode.mode = VT_AUTO;
+		DPRINTF(1, "vt controlling process %d died\n", vw->vw_pid);
+		vw->vw_pid = 0;
+	}
+	return (FALSE);
+}
+
+static int
+signal_vt_rel(struct vt_window *vw)
+{
+
+	if (vw->vw_smode.mode != VT_PROCESS)
+		return (FALSE);
+	if (vw->vw_proc == NULL || vt_proc_alive(vw) == FALSE) {
+		vw->vw_proc = NULL;
+		vw->vw_pid = 0;
+		return (TRUE);
+	}
+	vw->vw_flags |= VWF_SWWAIT_REL;
+	PROC_LOCK(vw->vw_proc);
+	kern_psignal(vw->vw_proc, vw->vw_smode.relsig);
+	PROC_UNLOCK(vw->vw_proc);
+	DPRINTF(1, "sending relsig to %d\n", vw->vw_pid);
+	return (TRUE);
+}
+
+static int
+signal_vt_acq(struct vt_window *vw)
+{
+
+	if (vw->vw_smode.mode != VT_PROCESS)
+		return (FALSE);
+	if (vw == vw->vw_device->vd_windows[VT_CONSWINDOW])
+		cnavailable(vw->vw_terminal->consdev, FALSE);
+	if (vw->vw_proc == NULL || vt_proc_alive(vw) == FALSE) {
+		vw->vw_proc = NULL;
+		vw->vw_pid = 0;
+		return (TRUE);
+	}
+	vw->vw_flags |= VWF_SWWAIT_ACQ;
+	PROC_LOCK(vw->vw_proc);
+	kern_psignal(vw->vw_proc, vw->vw_smode.acqsig);
+	PROC_UNLOCK(vw->vw_proc);
+	DPRINTF(1, "sending acqsig to %d\n", vw->vw_pid);
+	return (TRUE);
+}
+
+static int
+finish_vt_rel(struct vt_window *vw, int release, int *s)
+{
+
+	if (vw->vw_flags & VWF_SWWAIT_REL) {
+		vw->vw_flags &= ~VWF_SWWAIT_REL;
+		if (release) {
+			callout_drain(&vw->vw_proc_dead_timer);
+			vt_late_window_switch(vw->vw_switch_to);
+		}
+		return (0);
+	}
+	return (EINVAL);
+}
+
+static int
+finish_vt_acq(struct vt_window *vw)
+{
+
+	if (vw->vw_flags & VWF_SWWAIT_ACQ) {
+		vw->vw_flags &= ~VWF_SWWAIT_ACQ;
+		return (0);
+	}
+	return (EINVAL);
+}
+
+#ifndef SC_NO_CUTPASTE
+void
+vt_mouse_event(int type, int x, int y, int event, int cnt)
+{
+	struct vt_device *vd;
+	struct vt_window *vw;
+	struct vt_font *vf;
+	term_pos_t size;
+	term_char_t *buf;
+	int i, len, mark;
+
+	vd = main_vd;
+	vw = vd->vd_curwindow;
+	vf = vw->vw_font;
+	mark = 0;
+
+	if (vw->vw_flags & VWF_MOUSE_HIDE)
+		return; /* Mouse disabled. */
+
+	if (vf == NULL)	/* Text mode. */
+		return;
+
+	/*
+	 * TODO: add flag about pointer position changed, to not redraw chars
+	 * under mouse pointer when nothing changed.
+	 */
+
+	switch (type) {
+	case MOUSE_ACTION:
+	case MOUSE_MOTION_EVENT:
+		/* Movement */
+		x += vd->vd_mx;
+		y += vd->vd_my;
+
+		vt_termsize(vd, vf, &size);
+
+		/* Apply limits. */
+		x = MAX(x, 0);
+		y = MAX(y, 0);
+		x = MIN(x, (size.tp_col * vf->vf_width) - 1);
+		y = MIN(y, (size.tp_row * vf->vf_height) - 1);
+
+		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;
+		}
+		return; /* Done */
+	case MOUSE_BUTTON_EVENT:
+		/* Buttons */
+		break;
+	default:
+		return; /* Done */
+	}
+
+	switch (event) {
+	case MOUSE_BUTTON1DOWN:
+		switch (cnt % 4) {
+		case 0:	/* up */
+			mark = VTB_MARK_END;
+			break;
+		case 1: /* single click: start cut operation */
+			mark = VTB_MARK_START;
+			break;
+		case 2:	/* double click: cut a word */
+			mark = VTB_MARK_WORD;
+			break;
+		case 3:	/* triple click: cut a line */
+			mark = VTB_MARK_ROW;
+			break;
+		}
+		break;
+	case VT_MOUSE_PASTEBUTTON:
+		switch (cnt) {
+		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);
+			break;
+		}
+		return; /* Done */
+	case VT_MOUSE_EXTENDBUTTON:
+		switch (cnt) {
+		case 0:	/* up */
+			if (!(vd->vd_mstate & MOUSE_BUTTON1DOWN))
+				mark = VTB_MARK_EXTEND;
+			else
+				mark = 0;
+			break;
+		default:
+			mark = VTB_MARK_EXTEND;
+			break;
+		}
+		break;
+	default:
+		return; /* Done */
+	}
+
+	/* Save buttons state. */
+	if (cnt > 0)
+		vd->vd_mstate |= event;
+	else
+		vd->vd_mstate &= ~event;
+
+	if (vtbuf_set_mark(&vw->vw_buf, mark, 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;
+	}
+}
+
+void
+vt_mouse_state(int show)
+{
+	struct vt_device *vd;
+	struct vt_window *vw;
+
+	vd = main_vd;
+	vw = vd->vd_curwindow;
+
+	switch (show) {
+	case VT_MOUSE_HIDE:
+		vw->vw_flags |= VWF_MOUSE_HIDE;
+		break;
+	case VT_MOUSE_SHOW:
+		vw->vw_flags &= ~VWF_MOUSE_HIDE;
+		break;
+	}
+}
+#endif
+
+static int
+vtterm_ioctl(struct terminal *tm, u_long cmd, caddr_t data,
+    struct thread *td)
+{
+	struct vt_window *vw = tm->tm_softc;
+	struct vt_device *vd = vw->vw_device;
+	keyboard_t *kbd;
+	int error, i, s;
+#if defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD5) || \
+    defined(COMPAT_FREEBSD4) || defined(COMPAT_43)
+	int ival;
+
+	switch (cmd) {
+	case _IO('v', 4):
+		cmd = VT_RELDISP;
+		break;
+	case _IO('v', 5):
+		cmd = VT_ACTIVATE;
+		break;
+	case _IO('v', 6):
+		cmd = VT_WAITACTIVE;
+		break;
+	case _IO('K', 20):
+		cmd = KDSKBSTATE;
+		break;
+	case _IO('K', 67):
+		cmd = KDSETRAD;
+		break;
+	case _IO('K', 7):
+		cmd = KDSKBMODE;
+		break;
+	case _IO('K', 8):
+		cmd = KDMKTONE;
+		break;
+	case _IO('K', 63):
+		cmd = KIOCSOUND;
+		break;
+	case _IO('K', 66):
+		cmd = KDSETLED;
+		break;
+	case _IO('c', 110):
+		cmd = CONS_SETKBD;
+		break;
+	}
+	ival = IOCPARM_IVAL(data);
+	data = (caddr_t)&ival;
+#endif
+
+	switch (cmd) {
+	case KDSETRAD:		/* set keyboard repeat & delay rates (old) */
+		if (*(int *)data & ~0x7f)
+			return (EINVAL);
+	case GIO_KEYMAP:
+	case PIO_KEYMAP:
+	case GIO_DEADKEYMAP:
+	case PIO_DEADKEYMAP:
+	case GETFKEY:
+	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;
+
+		mtx_lock(&Giant);
+		kbd = kbd_get_keyboard(vd->vd_keyboard);
+		if (kbd != NULL)
+			error = kbdd_ioctl(kbd, cmd, data);
+		mtx_unlock(&Giant);
+		if (error == ENOIOCTL) {
+			if (cmd == KDGKBTYPE) {
+				/* always return something? XXX */
+				*(int *)data = 0;
+			} else {
+				return (ENODEV);
+			}
+		}
+		return (error);
+	}
+	case KDGKBMODE: {
+		int mode = -1;
+
+		mtx_lock(&Giant);
+		kbd = kbd_get_keyboard(vd->vd_keyboard);
+		if (kbd != NULL) {
+			kbdd_ioctl(kbd, KDGKBMODE, (void *)&mode);
+		}
+		mtx_unlock(&Giant);
+		DPRINTF(20, "mode %d, vw_kbdmode %d\n", mode, vw->vw_kbdmode);
+		*(int *)data = mode;
+		return (0);
+	}
+	case KDSKBMODE: {
+		int mode;
+
+		mode = *(int *)data;
+		switch (mode) {
+		case K_XLATE:
+		case K_RAW:
+		case K_CODE:
+			vw->vw_kbdmode = mode;
+			if (vw == vd->vd_curwindow) {
+				keyboard_t *kbd;
+				error = 0;
+
+				mtx_lock(&Giant);
+				kbd = kbd_get_keyboard(vd->vd_keyboard);
+				if (kbd != NULL) {
+					error = kbdd_ioctl(kbd, KDSKBMODE,
+					    (void *)&mode);
+				}
+				mtx_unlock(&Giant);
+			}
+			return (0);
+		default:
+			return (EINVAL);
+		}
+	}
+	case CONS_BLANKTIME:
+		/* XXX */
+		return (0);
+	case CONS_GET:
+		/* XXX */
+		*(int *)data = M_CG640x480;
+		return (0);
+	case CONS_GETINFO: {
+		vid_info_t *vi = (vid_info_t *)data;
+
+		vi->m_num = vd->vd_curwindow->vw_number + 1;
+		/* XXX: other fields! */
+		return (0);
+	}
+	case CONS_GETVERS: 
+		*(int *)data = 0x200;
+		return (0);
+	case CONS_MODEINFO:
+		/* XXX */
+		return (0);
+	case CONS_MOUSECTL: {
+		mouse_info_t *mouse = (mouse_info_t*)data;
+
+		/*
+		 * This has no effect on vt(4).  We don't draw any mouse
+		 * cursor.  Just ignore MOUSE_HIDE and MOUSE_SHOW to
+		 * prevent excessive errors.  All the other commands
+		 * should not be applied to individual TTYs, but only to
+		 * consolectl.
+		 */
+		switch (mouse->operation) {
+		case MOUSE_HIDE:
+			vd->vd_flags &= ~VDF_MOUSECURSOR;
+			return (0);
+		case MOUSE_SHOW:
+			vd->vd_mx = vd->vd_width / 2;
+			vd->vd_my = vd->vd_height / 2;
+			vd->vd_flags |= VDF_MOUSECURSOR;
+			return (0);
+		default:
+			return (EINVAL);
+		}
+	}
+	case PIO_VFONT: {
+		struct vt_font *vf;
+
+		error = vtfont_load((void *)data, &vf);
+		if (error != 0)
+			return (error);
+
+		error = vt_change_font(vw, vf);
+		vtfont_unref(vf);
+		return (error);
+	}
+	case GIO_SCRNMAP: {
+		scrmap_t *sm = (scrmap_t *)data;
+		int i;
+
+		/* We don't have screen maps, so return a handcrafted one. */
+		for (i = 0; i < 256; i++)
+			sm->scrmap[i] = i;
+		return (0);
+	}
+	case KDSETMODE:
+		/* XXX */
+		return (0);
+	case KDENABIO:      	/* allow io operations */
+		error = priv_check(td, PRIV_IO);
+		if (error != 0)
+			return (error);
+		error = securelevel_gt(td->td_ucred, 0);
+		if (error != 0)
+			return (error);
+#if defined(__i386__)
+		td->td_frame->tf_eflags |= PSL_IOPL;
+#elif defined(__amd64__)
+		td->td_frame->tf_rflags |= PSL_IOPL;
+#endif
+		return (0);
+	case KDDISABIO:     	/* disallow io operations (default) */
+#if defined(__i386__)
+		td->td_frame->tf_eflags &= ~PSL_IOPL;
+#elif defined(__amd64__)
+		td->td_frame->tf_rflags &= ~PSL_IOPL;
+#endif
+		return (0);
+	case KDMKTONE:      	/* sound the bell */
+		/* TODO */
+		return (0);
+	case KIOCSOUND:     	/* make tone (*data) hz */
+		/* TODO */
+		return (0);
+	case CONS_SETKBD: 		/* set the new keyboard */
+		mtx_lock(&Giant);
+		error = 0;
+		if (vd->vd_keyboard != *(int *)data) {
+			kbd = kbd_get_keyboard(*(int *)data);
+			if (kbd == NULL) {
+				mtx_unlock(&Giant);
+				return (EINVAL);
+			}
+			i = kbd_allocate(kbd->kb_name, kbd->kb_unit,
+			    (void *)&vd->vd_keyboard, vt_kbdevent, vd);
+			if (i >= 0) {
+				if (vd->vd_keyboard != -1) {
+					kbd_release(kbd,
+					    (void *)&vd->vd_keyboard);
+				}
+				kbd = kbd_get_keyboard(i);
+				vd->vd_keyboard = i;
+
+				(void)kbdd_ioctl(kbd, KDSKBMODE,
+				    (caddr_t)&vd->vd_curwindow->vw_kbdmode);
+			} else {
+				error = EPERM;	/* XXX */
+			}
+		}
+		mtx_unlock(&Giant);
+		return (error);
+	case CONS_RELKBD: 		/* release the current keyboard */
+		mtx_lock(&Giant);
+		error = 0;
+		if (vd->vd_keyboard != -1) {
+			kbd = kbd_get_keyboard(vd->vd_keyboard);
+			if (kbd == NULL) {
+				mtx_unlock(&Giant);
+				return (EINVAL);
+			}
+			error = kbd_release(kbd, (void *)&vd->vd_keyboard);
+			if (error == 0) {
+				vd->vd_keyboard = -1;
+			}
+		}
+		mtx_unlock(&Giant);
+		return (error);
+	case VT_ACTIVATE: {
+		int win;
+		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))
+			return (EINVAL);
+		return (vt_proc_window_switch(vd->vd_windows[win]));
+	}
+	case VT_GETACTIVE:
+		*(int *)data = vd->vd_curwindow->vw_number + 1;
+		return (0);
+	case VT_GETINDEX:
+		*(int *)data = vw->vw_number + 1;
+		return (0);
+	case VT_LOCKSWITCH:
+		/* TODO: Check current state, switching can be in progress. */
+		if ((*(int *)data) & 0x01)
+			vw->vw_flags |= VWF_VTYLOCK;
+		else
+			vw->vw_flags &= ~VWF_VTYLOCK;
+	case VT_OPENQRY:
+		VT_LOCK(vd);
+		for (i = 0; i < VT_MAXWINDOWS; i++) {
+			vw = vd->vd_windows[i];
+			if (vw == NULL)
+				continue;
+			if (!(vw->vw_flags & VWF_OPENED)) {
+				*(int *)data = vw->vw_number + 1;
+				VT_UNLOCK(vd);
+				return (0);
+			}
+		}
+		VT_UNLOCK(vd);
+		return (EINVAL);
+	case VT_WAITACTIVE:
+		error = 0;
+
+		i = *(unsigned int *)data;
+		if (i > VT_MAXWINDOWS)
+			return (EINVAL);
+		if (i != 0)
+			vw = vd->vd_windows[i - 1];
+
+		VT_LOCK(vd);
+		while (vd->vd_curwindow != vw && error == 0)
+			error = cv_wait_sig(&vd->vd_winswitch, &vd->vd_lock);
+		VT_UNLOCK(vd);
+		return (error);
+	case VT_SETMODE: {    	/* set screen switcher mode */
+		struct vt_mode *mode;
+		struct proc *p1;
+
+		mode = (struct vt_mode *)data;
+		DPRINTF(5, "%s%d: VT_SETMODE ", SC_DRIVER_NAME, VT_UNIT(vw));
+		if (vw->vw_smode.mode == VT_PROCESS) {
+			p1 = pfind(vw->vw_pid);
+			if (vw->vw_proc == p1 && vw->vw_proc != td->td_proc) {
+				if (p1)
+					PROC_UNLOCK(p1);
+				DPRINTF(5, "error EPERM\n");
+				return (EPERM);
+			}
+			if (p1)
+				PROC_UNLOCK(p1);
+		}
+		if (mode->mode == VT_AUTO) {
+			vw->vw_smode.mode = VT_AUTO;
+			vw->vw_proc = NULL;
+			vw->vw_pid = 0;
+			DPRINTF(5, "VT_AUTO, ");
+			if (vw == vw->vw_device->vd_windows[VT_CONSWINDOW])
+				cnavailable(vw->vw_terminal->consdev, TRUE);
+			/* were we in the middle of the vty switching process? */
+			if (finish_vt_rel(vw, TRUE, &s) == 0)
+				DPRINTF(5, "reset WAIT_REL, ");
+			if (finish_vt_acq(vw) == 0)
+				DPRINTF(5, "reset WAIT_ACQ, ");
+			return (0);
+		} else if (mode->mode == VT_PROCESS) {
+			if (!ISSIGVALID(mode->relsig) ||
+			    !ISSIGVALID(mode->acqsig) ||
+			    !ISSIGVALID(mode->frsig)) {
+				DPRINTF(5, "error EINVAL\n");
+				return (EINVAL);
+			}
+			DPRINTF(5, "VT_PROCESS %d, ", td->td_proc->p_pid);
+			bcopy(data, &vw->vw_smode, sizeof(struct vt_mode));
+			vw->vw_proc = td->td_proc;
+			vw->vw_pid = vw->vw_proc->p_pid;
+			if (vw == vw->vw_device->vd_windows[VT_CONSWINDOW])
+				cnavailable(vw->vw_terminal->consdev, FALSE);
+		} else {
+			DPRINTF(5, "VT_SETMODE failed, unknown mode %d\n",
+			    mode->mode);
+			return (EINVAL);
+		}
+		DPRINTF(5, "\n");
+		return (0);
+	}
+	case VT_GETMODE:	/* get screen switcher mode */
+		bcopy(&vw->vw_smode, data, sizeof(struct vt_mode));
+		return (0);
+
+	case VT_RELDISP:	/* screen switcher ioctl */
+		/*
+		 * This must be the current vty which is in the VT_PROCESS
+		 * switching mode...
+		 */
+		if ((vw != vd->vd_curwindow) || (vw->vw_smode.mode !=
+		    VT_PROCESS)) {
+			return (EINVAL);
+		}
+		/* ...and this process is controlling it. */
+		if (vw->vw_proc != td->td_proc) {
+			return (EPERM);
+		}
+		error = EINVAL;
+		switch(*(int *)data) {
+		case VT_FALSE:	/* user refuses to release screen, abort */
+			if ((error = finish_vt_rel(vw, FALSE, &s)) == 0)
+				DPRINTF(5, "%s%d: VT_RELDISP: VT_FALSE\n",
+				    SC_DRIVER_NAME, VT_UNIT(vw));
+			break;
+		case VT_TRUE:	/* user has released screen, go on */
+			/* finish_vt_rel(..., TRUE, ...) should not be locked */
+			if (vw->vw_flags & VWF_SWWAIT_REL) {
+				if ((error = finish_vt_rel(vw, TRUE, &s)) == 0)
+					DPRINTF(5, "%s%d: VT_RELDISP: VT_TRUE\n",
+					    SC_DRIVER_NAME, VT_UNIT(vw));
+			} else {
+				error = EINVAL;
+			}
+			return (error);
+		case VT_ACKACQ:	/* acquire acknowledged, switch completed */
+			if ((error = finish_vt_acq(vw)) == 0)
+				DPRINTF(5, "%s%d: VT_RELDISP: VT_ACKACQ\n",
+				    SC_DRIVER_NAME, VT_UNIT(vw));
+			break;
+		default:
+			break;
+		}
+		return (error);
+	}
+
+	return (ENOIOCTL);
+}
+
+static struct vt_window *
+vt_allocate_window(struct vt_device *vd, unsigned int window)
+{
+	struct vt_window *vw;
+	struct terminal *tm;
+	term_pos_t size;
+	struct winsize wsz;
+
+	vw = malloc(sizeof *vw, M_VT, M_WAITOK|M_ZERO);
+	vw->vw_device = vd;
+	vw->vw_number = window;
+	vw->vw_kbdmode = K_XLATE;
+
+	if (!(vd->vd_flags & VDF_TEXTMODE))
+		vw->vw_font = vtfont_ref(&vt_font_default);
+
+	vt_termsize(vd, vw->vw_font, &size);
+	vt_winsize(vd, vw->vw_font, &wsz);
+	vtbuf_init(&vw->vw_buf, &size);
+
+	tm = vw->vw_terminal = terminal_alloc(&vt_termclass, vw);
+	terminal_set_winsize(tm, &wsz);
+	vd->vd_windows[window] = vw;
+	callout_init(&vw->vw_proc_dead_timer, 0);
+
+	return (vw);
+}
+
+void
+vt_upgrade(struct vt_device *vd)
+{
+	struct vt_window *vw;
+	unsigned int i;
+
+	/* Device didn't pass vd_init() or already upgraded. */
+	if (vd->vd_flags & (VDF_ASYNC|VDF_DEAD))
+		return;
+	vd->vd_flags |= VDF_ASYNC;
+
+	mtx_init(&vd->vd_lock, "vtdev", NULL, MTX_DEF);
+	cv_init(&vd->vd_winswitch, "vtwswt");
+
+	/* Init 25 Hz timer. */
+	callout_init_mtx(&vd->vd_timer, &vd->vd_lock, 0);
+
+	for (i = 0; i < VT_MAXWINDOWS; i++) {
+		vw = vd->vd_windows[i];
+		if (vw == NULL) {
+			/* New window. */
+			vw = vt_allocate_window(vd, i);
+		}
+		if (i == VT_CONSWINDOW) {
+			/* Console window. */
+			EVENTHANDLER_REGISTER(shutdown_pre_sync,
+			    vt_window_switch, vw, SHUTDOWN_PRI_DEFAULT);
+		}
+		terminal_maketty(vw->vw_terminal, "v%r", VT_UNIT(vw));
+	}
+	if (vd->vd_curwindow == NULL)
+		vd->vd_curwindow = vd->vd_windows[VT_CONSWINDOW];
+
+	/* Attach keyboard. */
+	vt_allocate_keyboard(vd);
+	DPRINTF(20, "%s: vd_keyboard = %d\n", __func__, vd->vd_keyboard);
+
+	/* Start timer when everything ready. */
+	callout_reset(&vd->vd_timer, hz / VT_TIMERFREQ, vt_timer, vd);
+}
+
+static void
+vt_resize(struct vt_device *vd)
+{
+	struct vt_window *vw;
+	int i;
+
+	for (i = 0; i < VT_MAXWINDOWS; i++) {
+		vw = vd->vd_windows[i];
+		/* Resize terminal windows */
+		vt_change_font(vw, vw->vw_font);
+	}
+}
+
+void
+vt_allocate(struct vt_driver *drv, void *softc)
+{
+	struct vt_device *vd;
+	struct winsize wsz;
+
+	if (main_vd == NULL) {
+		main_vd = malloc(sizeof *vd, M_VT, M_WAITOK|M_ZERO);
+		printf("%s: VT initialize with new VT driver.\n", __func__);
+	} else {
+		/*
+		 * Check if have rights to replace current driver. For example:
+		 * it is bad idea to replace KMS driver with generic VGA one.
+		 */
+		if (drv->vd_priority <= main_vd->vd_driver->vd_priority) {
+			printf("%s: Driver priority %d too low. Current %d\n ",
+			    __func__, drv->vd_priority,
+			    main_vd->vd_driver->vd_priority);
+			return;
+		}
+		printf("%s: Replace existing VT driver.\n", __func__);
+	}
+	vd = main_vd;
+
+	/* Stop vt_flush periodic task. */
+	if (vd->vd_curwindow != NULL)
+		callout_drain(&vd->vd_timer);
+
+	vd->vd_driver = drv;
+	vd->vd_softc = softc;
+	vd->vd_driver->vd_init(vd);
+
+	vt_upgrade(vd);
+
+	/* Refill settings with new sizes. */
+	vt_resize(vd);
+
+#ifdef DEV_SPLASH
+	if (vd->vd_flags & VDF_SPLASH)
+		vtterm_splash(vd);
+#endif
+
+	if (vd->vd_curwindow != NULL)
+		callout_schedule(&vd->vd_timer, hz / VT_TIMERFREQ);
+
+	termcn_cnregister(vd->vd_windows[VT_CONSWINDOW]->vw_terminal);
+
+	/* Update console window sizes to actual. */
+	vt_winsize(vd, vd->vd_windows[VT_CONSWINDOW]->vw_font, &wsz);
+	terminal_set_winsize(vd->vd_windows[VT_CONSWINDOW]->vw_terminal, &wsz);
+}
+
+void
+vt_suspend()
+{
+
+	if (vt_suspendswitch == 0)
+		return;
+	/* Save current window. */
+	main_vd->vd_savedwindow = main_vd->vd_curwindow;
+	/* Ask holding process to free window and switch to console window */
+	vt_proc_window_switch(main_vd->vd_windows[VT_CONSWINDOW]);
+}
+
+void
+vt_resume()
+{
+
+	if (vt_suspendswitch == 0)
+		return;
+	/* Switch back to saved window */
+	if (main_vd->vd_savedwindow != NULL)
+		vt_proc_window_switch(main_vd->vd_savedwindow);
+	main_vd->vd_savedwindow = NULL;
+}
diff --git a/sys/dev/vt/vt_font.c b/sys/dev/vt/vt_font.c
new file mode 100644
index 00000000000..eebe74066e6
--- /dev/null
+++ b/sys/dev/vt/vt_font.c
@@ -0,0 +1,212 @@
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten 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/kernel.h>
+#include <sys/malloc.h>
+#include <sys/refcount.h>
+#include <sys/systm.h>
+
+#include <dev/vt/vt.h>
+
+static MALLOC_DEFINE(M_VTFONT, "vtfont", "vt font");
+
+/* Some limits to prevent abnormal fonts from being loaded. */
+#define	VTFONT_MAXMAPPINGS	1024
+#define	VTFONT_MAXGLYPHSIZE	262144
+#define	VTFONT_MAXDIMENSION	128
+
+static uint16_t
+vtfont_bisearch(const struct vt_font_map *map, unsigned int len, uint32_t src)
+{
+	int min, mid, max;
+
+	min = 0;
+	max = len - 1;
+
+	/* Empty font map. */
+	if (len == 0)
+		return (0);
+	/* Character below minimal entry. */
+	if (src < map[0].vfm_src)
+		return (0);
+	/* Optimization: ASCII characters occur very often. */
+	if (src <= map[0].vfm_src + map[0].vfm_len)
+		return (src - map[0].vfm_src + map[0].vfm_dst);
+	/* Character above maximum entry. */
+	if (src > map[max].vfm_src + map[max].vfm_len)
+		return (0);
+
+	/* Binary search. */
+	while (max >= min) {
+		mid = (min + max) / 2;
+		if (src < map[mid].vfm_src)
+			max = mid - 1;
+		else if (src > map[mid].vfm_src + map[mid].vfm_len)
+			min = mid + 1;
+		else
+			return (src - map[mid].vfm_src + map[mid].vfm_dst);
+	}
+
+	return (0);
+}
+
+const uint8_t *
+vtfont_lookup(const struct vt_font *vf, term_char_t c)
+{
+	uint32_t src;
+	uint16_t dst;
+	size_t stride;
+
+	src = TCHAR_CHARACTER(c);
+	if (TCHAR_FORMAT(c) & TF_BOLD) {
+		dst = vtfont_bisearch(vf->vf_bold, vf->vf_bold_length, src);
+		if (dst != 0)
+			goto found;
+	}
+	dst = vtfont_bisearch(vf->vf_normal, vf->vf_normal_length, src);
+
+found:
+	stride = howmany(vf->vf_width, 8) * vf->vf_height;
+	return (&vf->vf_bytes[dst * stride]);
+}
+
+struct vt_font *
+vtfont_ref(struct vt_font *vf)
+{
+
+	refcount_acquire(&vf->vf_refcount);
+	return (vf);
+}
+
+void
+vtfont_unref(struct vt_font *vf)
+{
+
+	if (refcount_release(&vf->vf_refcount)) {
+		free(vf->vf_normal, M_VTFONT);
+		free(vf->vf_bold, M_VTFONT);
+		free(vf->vf_bytes, M_VTFONT);
+		free(vf, M_VTFONT);
+	}
+}
+
+static int
+vtfont_validate_map(struct vt_font_map *vfm, unsigned int length,
+    unsigned int nglyphs)
+{
+	unsigned int i, last = 0;
+
+	for (i = 0; i < length; i++) {
+		/* Not ordered. */
+		if (i > 0 && vfm[i].vfm_src <= last)
+			return (EINVAL);
+		/*
+		 * Destination extends amount of glyphs.
+		 */
+		if (vfm[i].vfm_dst >= nglyphs ||
+		    vfm[i].vfm_dst + vfm[i].vfm_len >= nglyphs)
+			return (EINVAL);
+		last = vfm[i].vfm_src + vfm[i].vfm_len;
+	}
+
+	return (0);
+}
+
+int
+vtfont_load(vfnt_t *f, struct vt_font **ret)
+{
+	size_t glyphsize;
+	struct vt_font *vf;
+	int error;
+
+	/* Make sure the dimensions are valid. */
+	if (f->width < 1 || f->height < 1)
+		return (EINVAL);
+	if (f->width > VTFONT_MAXDIMENSION || f->height > VTFONT_MAXDIMENSION)
+		return (E2BIG);
+
+	/* Not too many mappings. */
+	if (f->nnormal > VTFONT_MAXMAPPINGS || f->nbold > VTFONT_MAXMAPPINGS)
+		return (E2BIG);
+
+	/* Character 0 must always be present. */
+	if (f->nglyphs < 1)
+		return (EINVAL);
+
+	glyphsize = howmany(f->width, 8) * f->height * f->nglyphs;
+	if (glyphsize > VTFONT_MAXGLYPHSIZE)
+		return (E2BIG);
+
+	/* Allocate new font structure. */
+	vf = malloc(sizeof *vf, M_VTFONT, M_WAITOK);
+	vf->vf_normal = malloc(f->nnormal * sizeof(struct vt_font_map),
+	    M_VTFONT, M_WAITOK);
+	vf->vf_bold = malloc(f->nbold * sizeof(struct vt_font_map),
+	    M_VTFONT, M_WAITOK);
+	vf->vf_bytes = malloc(glyphsize, M_VTFONT, M_WAITOK);
+	vf->vf_height = f->height;
+	vf->vf_width = f->width;
+	vf->vf_normal_length = f->nnormal;
+	vf->vf_bold_length = f->nbold;
+	vf->vf_refcount = 1;
+
+	/* Copy in data. */
+	error = copyin(f->normal, vf->vf_normal,
+	    vf->vf_normal_length * sizeof(struct vt_font_map));
+	if (error)
+		goto bad;
+	error = copyin(f->bold, vf->vf_bold,
+	    vf->vf_bold_length * sizeof(struct vt_font_map));
+	if (error)
+		goto bad;
+	error = copyin(f->glyphs, vf->vf_bytes, glyphsize);
+	if (error)
+		goto bad;
+
+	/* Validate mappings. */
+	error = vtfont_validate_map(vf->vf_normal, vf->vf_normal_length,
+	    f->nglyphs);
+	if (error)
+		goto bad;
+	error = vtfont_validate_map(vf->vf_bold, vf->vf_bold_length,
+	    f->nglyphs);
+	if (error)
+		goto bad;
+
+	/* Success. */
+	*ret = vf;
+	return (0);
+
+bad:	vtfont_unref(vf);
+	return (error);
+}
diff --git a/sys/dev/vt/vt_sysmouse.c b/sys/dev/vt/vt_sysmouse.c
new file mode 100644
index 00000000000..c46887fd5e2
--- /dev/null
+++ b/sys/dev/vt/vt_sysmouse.c
@@ -0,0 +1,412 @@
+/*-
+ * Copyright (c) 1999 Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
+ * All rights reserved.
+ *
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten 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/condvar.h>
+#include <sys/conf.h>
+#include <sys/consio.h>
+#include <sys/fcntl.h>
+#include <sys/filio.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/poll.h>
+#include <sys/random.h>
+#include <sys/selinfo.h>
+#include <sys/sigio.h>
+#include <sys/signalvar.h>
+#include <sys/systm.h>
+#include <sys/uio.h>
+
+#include <dev/vt/vt.h>
+
+static d_open_t		sysmouse_open;
+static d_close_t	sysmouse_close;
+static d_read_t		sysmouse_read;
+static d_ioctl_t	sysmouse_ioctl;
+static d_poll_t		sysmouse_poll;
+
+static struct cdevsw sysmouse_cdevsw = {
+	.d_version	= D_VERSION,
+	.d_open		= sysmouse_open,
+	.d_close	= sysmouse_close,
+	.d_read		= sysmouse_read,
+	.d_ioctl	= sysmouse_ioctl,
+	.d_poll		= sysmouse_poll,
+	.d_name		= "sysmouse",
+};
+
+static struct mtx	 sysmouse_lock;
+static struct cv	 sysmouse_sleep;
+static struct selinfo	 sysmouse_bufpoll;
+
+static int		 sysmouse_level;
+static mousestatus_t	 sysmouse_status;
+static int		 sysmouse_flags;
+#define	SM_ASYNC	0x1
+static struct sigio	*sysmouse_sigio;
+
+#define	SYSMOUSE_MAXFRAMES	250	/* 2 KB */
+static MALLOC_DEFINE(M_SYSMOUSE, "sysmouse", "sysmouse device");
+static unsigned char	*sysmouse_buffer;
+static unsigned int	 sysmouse_start, sysmouse_length;
+
+static int
+sysmouse_buf_read(struct uio *uio, unsigned int length)
+{
+	unsigned char buf[MOUSE_SYS_PACKETSIZE];
+	int error;
+
+	if (sysmouse_buffer == NULL)
+		return (ENXIO);
+	else if (sysmouse_length == 0)
+		return (EWOULDBLOCK);
+
+	memcpy(buf, sysmouse_buffer +
+	    sysmouse_start * MOUSE_SYS_PACKETSIZE, MOUSE_SYS_PACKETSIZE);
+	sysmouse_start = (sysmouse_start + 1) % SYSMOUSE_MAXFRAMES;
+	sysmouse_length--;
+
+	mtx_unlock(&sysmouse_lock);
+	error = uiomove(buf, length, uio);
+	mtx_lock(&sysmouse_lock);
+
+	return (error);
+}
+
+static void
+sysmouse_buf_store(const unsigned char buf[MOUSE_SYS_PACKETSIZE])
+{
+	unsigned int idx;
+
+	if (sysmouse_buffer == NULL || sysmouse_length == SYSMOUSE_MAXFRAMES)
+		return;
+
+	idx = (sysmouse_start + sysmouse_length) % SYSMOUSE_MAXFRAMES;
+	memcpy(sysmouse_buffer + idx * MOUSE_SYS_PACKETSIZE, buf,
+	    MOUSE_SYS_PACKETSIZE);
+	sysmouse_length++;
+	cv_broadcast(&sysmouse_sleep);
+	selwakeup(&sysmouse_bufpoll);
+	if (sysmouse_flags & SM_ASYNC && sysmouse_sigio != NULL)
+		pgsigio(&sysmouse_sigio, SIGIO, 0);
+}
+
+void
+sysmouse_process_event(mouse_info_t *mi)
+{
+	/* MOUSE_BUTTON?DOWN -> MOUSE_MSC_BUTTON?UP */
+	static const int buttonmap[8] = {
+	    MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
+	    MOUSE_MSC_BUTTON2UP | MOUSE_MSC_BUTTON3UP,
+	    MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON3UP,
+	    MOUSE_MSC_BUTTON3UP,
+	    MOUSE_MSC_BUTTON1UP | MOUSE_MSC_BUTTON2UP,
+	    MOUSE_MSC_BUTTON2UP,
+	    MOUSE_MSC_BUTTON1UP,
+	    0,
+	};
+	unsigned char buf[MOUSE_SYS_PACKETSIZE];
+	int x, y, iy, z;
+
+	random_harvest(mi, sizeof *mi, 2, RANDOM_MOUSE);
+
+	mtx_lock(&sysmouse_lock);
+	switch (mi->operation) {
+	case MOUSE_ACTION:
+		sysmouse_status.button = mi->u.data.buttons;
+		/* FALLTHROUGH */
+	case MOUSE_MOTION_EVENT:
+		x = mi->u.data.x;
+		y = mi->u.data.y;
+		z = mi->u.data.z;
+		break;
+	case MOUSE_BUTTON_EVENT:
+		x = y = z = 0;
+		if (mi->u.event.value > 0)
+			sysmouse_status.button |= mi->u.event.id;
+		else
+			sysmouse_status.button &= ~mi->u.event.id;
+		break;
+	default:
+		goto done;
+	}
+
+	sysmouse_status.dx += x;
+	sysmouse_status.dy += y;
+	sysmouse_status.dz += z;
+	sysmouse_status.flags |= ((x || y || z) ? MOUSE_POSCHANGED : 0) |
+	    (sysmouse_status.obutton ^ sysmouse_status.button);
+	if (sysmouse_status.flags == 0)
+		goto done;
+
+
+	/* The first five bytes are compatible with MouseSystems. */
+	buf[0] = MOUSE_MSC_SYNC |
+	    buttonmap[sysmouse_status.button & MOUSE_STDBUTTONS];
+	x = imax(imin(x, 255), -256);
+	buf[1] = x >> 1;
+	buf[3] = x - buf[1];
+	iy = -imax(imin(y, 255), -256);
+	buf[2] = iy >> 1;
+	buf[4] = iy - buf[2];
+	/* Extended part. */
+        z = imax(imin(z, 127), -128);
+        buf[5] = (z >> 1) & 0x7f;
+        buf[6] = (z - (z >> 1)) & 0x7f;
+        /* Buttons 4-10. */
+        buf[7] = (~sysmouse_status.button >> 3) & 0x7f;
+
+	sysmouse_buf_store(buf);
+
+#ifndef SC_NO_CUTPASTE
+	mtx_unlock(&sysmouse_lock);
+	vt_mouse_event(mi->operation, x, y, mi->u.event.id, mi->u.event.value);
+	return;
+#endif
+
+done:	mtx_unlock(&sysmouse_lock);
+}
+
+static int
+sysmouse_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
+{
+	void *buf;
+
+	buf = malloc(MOUSE_SYS_PACKETSIZE * SYSMOUSE_MAXFRAMES,
+	    M_SYSMOUSE, M_WAITOK);
+	mtx_lock(&sysmouse_lock);
+	if (sysmouse_buffer == NULL) {
+		sysmouse_buffer = buf;
+		sysmouse_start = sysmouse_length = 0;
+		sysmouse_level = 0;
+	} else {
+		free(buf, M_SYSMOUSE);
+	}
+	mtx_unlock(&sysmouse_lock);
+
+	return (0);
+}
+
+static int
+sysmouse_close(struct cdev *dev, int fflag, int devtype, struct thread *td)
+{
+
+	mtx_lock(&sysmouse_lock);
+	free(sysmouse_buffer, M_SYSMOUSE);
+	sysmouse_buffer = NULL;
+	sysmouse_level = 0;
+	mtx_unlock(&sysmouse_lock);
+
+	return (0);
+}
+
+static int
+sysmouse_read(struct cdev *dev, struct uio *uio, int ioflag)
+{
+	unsigned int length;
+	ssize_t oresid;
+	int error = 0;
+
+	oresid = uio->uio_resid;
+
+	mtx_lock(&sysmouse_lock);
+	length = sysmouse_level >= 1 ? MOUSE_SYS_PACKETSIZE :
+	    MOUSE_MSC_PACKETSIZE;
+
+	while (uio->uio_resid >= length) {
+		error = sysmouse_buf_read(uio, length);
+		if (error == 0) {
+			/* Process the next frame. */
+			continue;
+		} else if (error != EWOULDBLOCK) {
+			/* Error (e.g. EFAULT). */
+			break;
+		} else {
+			/* Block. */
+			if (oresid != uio->uio_resid || ioflag & O_NONBLOCK)
+				break;
+			error = cv_wait_sig(&sysmouse_sleep, &sysmouse_lock);
+			if (error != 0)
+				break;
+		}
+	}
+	mtx_unlock(&sysmouse_lock);
+
+	return (error);
+}
+
+static int
+sysmouse_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag,
+    struct thread *td)
+{
+
+	switch (cmd) {
+	case FIOASYNC:
+		mtx_lock(&sysmouse_lock);
+		if (*(int *)data)
+			sysmouse_flags |= SM_ASYNC;
+		else
+			sysmouse_flags &= ~SM_ASYNC;
+		mtx_unlock(&sysmouse_lock);
+		return (0);
+	case FIONBIO:
+		return (0);
+	case FIOGETOWN:
+		*(int *)data = fgetown(&sysmouse_sigio);
+		return (0);
+	case FIOSETOWN:
+		return (fsetown(*(int *)data, &sysmouse_sigio));
+	case MOUSE_GETHWINFO: {
+		mousehw_t *hw = (mousehw_t *)data;
+
+		hw->buttons = 10;
+		hw->iftype = MOUSE_IF_SYSMOUSE;
+		hw->type = MOUSE_MOUSE;
+		hw->model = MOUSE_MODEL_GENERIC;
+		hw->hwid = 0;
+
+		return (0);
+	}
+	case MOUSE_GETLEVEL:
+		*(int *)data = sysmouse_level;
+		return (0);
+	case MOUSE_GETMODE: {
+		mousemode_t *mode = (mousemode_t *)data;
+
+		mode->rate = -1;
+		mode->resolution = -1;
+		mode->accelfactor = 0;
+		mode->level = sysmouse_level;
+
+		switch (mode->level) {
+		case 0:
+			mode->protocol = MOUSE_PROTO_MSC;
+			mode->packetsize = MOUSE_MSC_PACKETSIZE;
+			mode->syncmask[0] = MOUSE_MSC_SYNCMASK;
+			mode->syncmask[1] = MOUSE_MSC_SYNC;
+			break;
+		case 1:
+			mode->protocol = MOUSE_PROTO_SYSMOUSE;
+			mode->packetsize = MOUSE_SYS_PACKETSIZE;
+			mode->syncmask[0] = MOUSE_SYS_SYNCMASK;
+			mode->syncmask[1] = MOUSE_SYS_SYNC;
+			break;
+		}
+
+		return (0);
+	}
+	case MOUSE_GETSTATUS:
+		mtx_lock(&sysmouse_lock);
+		*(mousestatus_t *)data = sysmouse_status;
+
+		sysmouse_status.flags = 0;
+		sysmouse_status.obutton = sysmouse_status.button;
+		sysmouse_status.dx = 0;
+		sysmouse_status.dy = 0;
+		sysmouse_status.dz = 0;
+		mtx_unlock(&sysmouse_lock);
+
+		return (0);
+	case MOUSE_SETLEVEL: {
+		int level;
+
+		level = *(int *)data;
+		if (level != 0 && level != 1)
+			return (EINVAL);
+
+		sysmouse_level = level;
+#ifndef SC_NO_CUTPASTE
+		vt_mouse_state((level == 0)?VT_MOUSE_SHOW:VT_MOUSE_HIDE);
+#endif
+		return (0);
+	}
+	case MOUSE_SETMODE: {
+		mousemode_t *mode = (mousemode_t *)data;
+
+		switch (mode->level) {
+		case -1:
+			/* Do nothing. */
+			break;
+		case 0:
+		case 1:
+			sysmouse_level = mode->level;
+#ifndef SC_NO_CUTPASTE
+			vt_mouse_state((mode->level == 0)?VT_MOUSE_SHOW:
+			    VT_MOUSE_HIDE);
+#endif
+			break;
+		default:
+			return (EINVAL);
+		}
+
+		return (0);
+	}
+	case MOUSE_MOUSECHAR:
+		return (0);
+	default:
+		printf("sysmouse: unknown ioctl: %c:%lx\n",
+		    (char)IOCGROUP(cmd), IOCBASECMD(cmd));
+		return (ENOIOCTL);
+	}
+}
+
+static int
+sysmouse_poll(struct cdev *dev, int events, struct thread *td)
+{
+	int revents = 0;
+
+	mtx_lock(&sysmouse_lock);
+	if (events & (POLLIN|POLLRDNORM)) {
+		if (sysmouse_length > 0)
+			revents = events & (POLLIN|POLLRDNORM);
+		else
+			selrecord(td, &sysmouse_bufpoll);
+	}
+	mtx_unlock(&sysmouse_lock);
+
+	return (revents);
+}
+
+static void
+sysmouse_drvinit(void *unused)
+{
+
+	mtx_init(&sysmouse_lock, "sysmouse", NULL, MTX_DEF);
+	cv_init(&sysmouse_sleep, "sysmrd");
+	make_dev(&sysmouse_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600,
+	    "sysmouse");
+}
+
+SYSINIT(sysmouse, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sysmouse_drvinit, NULL);
diff --git a/sys/dev/vte/if_vte.c b/sys/dev/vte/if_vte.c
index dfc06e53609..4c92fa43f29 100644
--- a/sys/dev/vte/if_vte.c
+++ b/sys/dev/vte/if_vte.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index acb9c2fb312..afbaee78183 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c
index 24dc2dd439d..b05c8e1ab53 100644
--- a/sys/dev/vx/if_vx_eisa.c
+++ b/sys/dev/vx/if_vx_eisa.c
@@ -33,7 +33,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/lock.h>
 #include <sys/kernel.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/module.h>
 #include <sys/bus.h>
@@ -44,7 +46,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
-#include <net/if_arp.h>
+#include <net/if_var.h>
 
 #include <dev/eisa/eisaconf.h>
 
diff --git a/sys/dev/vx/if_vx_pci.c b/sys/dev/vx/if_vx_pci.c
index 38037fa6968..72fff6aed21 100644
--- a/sys/dev/vx/if_vx_pci.c
+++ b/sys/dev/vx/if_vx_pci.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 
 #include <machine/bus.h>
diff --git a/sys/dev/wb/if_wb.c b/sys/dev/wb/if_wb.c
index f96441c5e4d..a126d4a4df8 100644
--- a/sys/dev/wb/if_wb.c
+++ b/sys/dev/wb/if_wb.c
@@ -94,6 +94,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/wds/wd7000.c b/sys/dev/wds/wd7000.c
index 194d39e96e6..3ea5b29b3a6 100644
--- a/sys/dev/wds/wd7000.c
+++ b/sys/dev/wds/wd7000.c
@@ -1048,8 +1048,8 @@ wds_scsi_io(struct cam_sim * sim, struct ccb_scsiio * csio)
 	wp = (struct wds *)cam_sim_softc(sim);
 	ccb_h = &csio->ccb_h;
 
-	DBG(DBX "wds%d: cmd TARG=%d LUN=%d\n", unit, ccb_h->target_id,
-	    ccb_h->target_lun);
+	DBG(DBX "wds%d: cmd TARG=%d LUN=%jx\n", unit, ccb_h->target_id,
+	    (uintmax_t)ccb_h->target_lun);
 
 	if (ccb_h->target_id > 7 || ccb_h->target_id == WDS_HBA_ID) {
 		ccb_h->status = CAM_TID_INVALID;
diff --git a/sys/dev/wi/if_wi.c b/sys/dev/wi/if_wi.c
index c9bf2e069b1..ac6d8c09bb9 100644
--- a/sys/dev/wi/if_wi.c
+++ b/sys/dev/wi/if_wi.c
@@ -87,6 +87,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/wi/if_wi_pccard.c b/sys/dev/wi/if_wi_pccard.c
index 382a3a34e6c..2f199c84c91 100644
--- a/sys/dev/wi/if_wi_pccard.c
+++ b/sys/dev/wi/if_wi_pccard.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/module.h>
diff --git a/sys/dev/wi/if_wi_pci.c b/sys/dev/wi/if_wi_pci.c
index 30cdbc40ed9..198c599ef54 100644
--- a/sys/dev/wi/if_wi_pci.c
+++ b/sys/dev/wi/if_wi_pci.c
@@ -55,6 +55,7 @@
 #include <dev/pci/pcivar.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_media.h>
diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c
index c6db4b9f15a..303e57fb484 100644
--- a/sys/dev/wl/if_wl.c
+++ b/sys/dev/wl/if_wl.c
@@ -209,6 +209,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
diff --git a/sys/dev/wpi/if_wpi.c b/sys/dev/wpi/if_wpi.c
index 465c140d1d8..0b51fece768 100644
--- a/sys/dev/wpi/if_wpi.c
+++ b/sys/dev/wpi/if_wpi.c
@@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/wpi/if_wpireg.h b/sys/dev/wpi/if_wpireg.h
index 2ccc21fedd7..df71b3d3965 100644
--- a/sys/dev/wpi/if_wpireg.h
+++ b/sys/dev/wpi/if_wpireg.h
@@ -143,7 +143,7 @@
 
 /* possible flags for register WPI_UC_CTL */
 #define WPI_UC_ENABLE	(1 << 30)
-#define WPI_UC_RUN	(1 << 31)
+#define WPI_UC_RUN	(1U << 31)
 
 /* possible flags for register WPI_INTR_CSR */
 #define WPI_ALIVE_INTR	(1 << 0)
@@ -151,7 +151,7 @@
 #define WPI_SW_ERROR	(1 << 25)
 #define WPI_TX_INTR	(1 << 27)
 #define WPI_HW_ERROR	(1 << 29)
-#define WPI_RX_INTR	(1 << 31)
+#define WPI_RX_INTR	(1U << 31)
 
 #define WPI_INTR_MASK							\
 	(WPI_SW_ERROR | WPI_HW_ERROR | WPI_TX_INTR | WPI_RX_INTR |	\
diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index 855c8c16643..5399d28c07a 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -112,6 +112,7 @@ __FBSDID("$FreeBSD$");
  
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c
index f60ab1ad972..4db7c8e5955 100644
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@@ -32,7 +32,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 
diff --git a/sys/dev/xen/balloon/balloon.c b/sys/dev/xen/balloon/balloon.c
index 9021abb1172..2df9c8b50fb 100644
--- a/sys/dev/xen/balloon/balloon.c
+++ b/sys/dev/xen/balloon/balloon.c
@@ -52,18 +52,13 @@ __FBSDID("$FreeBSD$");
 
 static MALLOC_DEFINE(M_BALLOON, "Balloon", "Xen Balloon Driver");
 
-struct mtx balloon_mutex;
+/* Convert from KB (as fetched from xenstore) to number of PAGES */
+#define KB_TO_PAGE_SHIFT	(PAGE_SHIFT - 10)
 
-/*
- * Protects atomic reservation decrease/increase against concurrent increases.
- * Also protects non-atomic updates of current_pages and driver_pages, and
- * balloon lists.
- */
-struct mtx balloon_lock;
+struct mtx balloon_mutex;
 
 /* We increase/decrease in batches which fit in a page */
 static unsigned long frame_list[PAGE_SIZE / sizeof(unsigned long)];
-#define ARRAY_SIZE(A)	(sizeof(A) / sizeof(A[0]))
 
 struct balloon_stats {
 	/* We aim for 'current allocation' == 'target allocation'. */
@@ -116,15 +111,21 @@ static void balloon_process(void *unused);
 	printk(KERN_WARNING "xen_mem: " fmt, ##args)
 
 /* balloon_append: add the given page to the balloon. */
-static void 
+static int
 balloon_append(vm_page_t page)
 {
 	struct balloon_entry *entry;
 
-	entry = malloc(sizeof(struct balloon_entry), M_BALLOON, M_WAITOK);
+	mtx_assert(&balloon_mutex, MA_OWNED);
+
+	entry = malloc(sizeof(struct balloon_entry), M_BALLOON, M_NOWAIT);
+	if (!entry)
+		return (ENOMEM);
 	entry->page = page;
 	STAILQ_INSERT_HEAD(&ballooned_pages, entry, list);
 	bs.balloon_low++;
+
+	return (0);
 }
 
 /* balloon_retrieve: rescue a page from the balloon, if it is not empty. */
@@ -134,8 +135,10 @@ balloon_retrieve(void)
 	vm_page_t page;
 	struct balloon_entry *entry;
 
+	mtx_assert(&balloon_mutex, MA_OWNED);
+
 	if (STAILQ_EMPTY(&ballooned_pages))
-		return NULL;
+		return (NULL);
 
 	entry = STAILQ_FIRST(&ballooned_pages);
 	STAILQ_REMOVE_HEAD(&ballooned_pages, list);
@@ -145,7 +148,7 @@ balloon_retrieve(void)
 	
 	bs.balloon_low--;
 
-	return page;
+	return (page);
 }
 
 static unsigned long 
@@ -154,21 +157,22 @@ current_target(void)
 	unsigned long target = min(bs.target_pages, bs.hard_limit);
 	if (target > (bs.current_pages + bs.balloon_low + bs.balloon_high))
 		target = bs.current_pages + bs.balloon_low + bs.balloon_high;
-	return target;
+	return (target);
 }
 
 static unsigned long
 minimum_target(void)
 {
 #ifdef XENHVM
-#define max_pfn physmem
+#define max_pfn realmem
 #else
 #define max_pfn HYPERVISOR_shared_info->arch.max_pfn
 #endif
 	unsigned long min_pages, curr_pages = current_target();
 
 #define MB2PAGES(mb) ((mb) << (20 - PAGE_SHIFT))
-	/* Simple continuous piecewiese linear function:
+	/*
+	 * Simple continuous piecewiese linear function:
 	 *  max MiB -> min MiB	gradient
 	 *       0	   0
 	 *      16	  16
@@ -189,12 +193,10 @@ minimum_target(void)
 	else
 		min_pages = MB2PAGES(296) + (max_pfn >> 5);
 #undef MB2PAGES
+#undef max_pfn
 
 	/* Don't enforce growth */
-	return min(min_pages, curr_pages);
-#ifndef CONFIG_XEN
-#undef max_pfn
-#endif
+	return (min(min_pages, curr_pages));
 }
 
 static int 
@@ -210,10 +212,10 @@ increase_reservation(unsigned long nr_pages)
 		.domid        = DOMID_SELF
 	};
 
-	if (nr_pages > ARRAY_SIZE(frame_list))
-		nr_pages = ARRAY_SIZE(frame_list);
+	mtx_assert(&balloon_mutex, MA_OWNED);
 
-	mtx_lock(&balloon_lock);
+	if (nr_pages > nitems(frame_list))
+		nr_pages = nitems(frame_list);
 
 	for (entry = STAILQ_FIRST(&ballooned_pages), i = 0;
 	     i < nr_pages; i++, entry = STAILQ_NEXT(entry, list)) {
@@ -253,33 +255,14 @@ increase_reservation(unsigned long nr_pages)
 
 		set_phys_to_machine(pfn, frame_list[i]);
 
-#if 0
-#ifndef XENHVM
-		/* Link back into the page tables if not highmem. */
-		if (pfn < max_low_pfn) {
-			int ret;
-			ret = HYPERVISOR_update_va_mapping(
-				(unsigned long)__va(pfn << PAGE_SHIFT),
-				pfn_pte_ma(frame_list[i], PAGE_KERNEL),
-				0);
-			PASSING(ret == 0,
-			    ("HYPERVISOR_update_va_mapping failed"));
-		}
-#endif
-#endif
-
-		/* Relinquish the page back to the allocator. */
 		vm_page_unwire(page, 0);
 		vm_page_free(page);
 	}
 
 	bs.current_pages += nr_pages;
-	//totalram_pages = bs.current_pages;
 
  out:
-	mtx_unlock(&balloon_lock);
-
-	return 0;
+	return (0);
 }
 
 static int
@@ -295,8 +278,10 @@ decrease_reservation(unsigned long nr_pages)
 		.domid        = DOMID_SELF
 	};
 
-	if (nr_pages > ARRAY_SIZE(frame_list))
-		nr_pages = ARRAY_SIZE(frame_list);
+	mtx_assert(&balloon_mutex, MA_OWNED);
+
+	if (nr_pages > nitems(frame_list))
+		nr_pages = nitems(frame_list);
 
 	for (i = 0; i < nr_pages; i++) {
 		if ((page = vm_page_alloc(NULL, 0, 
@@ -310,39 +295,15 @@ decrease_reservation(unsigned long nr_pages)
 		pfn = (VM_PAGE_TO_PHYS(page) >> PAGE_SHIFT);
 		frame_list[i] = PFNTOMFN(pfn);
 
-#if 0
-		if (!PageHighMem(page)) {
-			v = phys_to_virt(pfn << PAGE_SHIFT);
-			scrub_pages(v, 1);
-#ifdef CONFIG_XEN
-			ret = HYPERVISOR_update_va_mapping(
-				(unsigned long)v, __pte_ma(0), 0);
-			BUG_ON(ret);
-#endif
-		}
-#endif
-#ifdef CONFIG_XEN_SCRUB_PAGES
-		else {
-			v = kmap(page);
-			scrub_pages(v, 1);
-			kunmap(page);
-		}
-#endif
-	}
-
-#ifdef CONFIG_XEN
-	/* Ensure that ballooned highmem pages don't have kmaps. */
-	kmap_flush_unused();
-	flush_tlb_all();
-#endif
-
-	mtx_lock(&balloon_lock);
-
-	/* No more mappings: invalidate P2M and add to balloon. */
-	for (i = 0; i < nr_pages; i++) {
-		pfn = MFNTOPFN(frame_list[i]);
 		set_phys_to_machine(pfn, INVALID_P2M_ENTRY);
-		balloon_append(PHYS_TO_VM_PAGE(pfn << PAGE_SHIFT));
+		if (balloon_append(page) != 0) {
+			vm_page_unwire(page, 0);
+			vm_page_free(page);
+
+			nr_pages = i;
+			need_sleep = 1;
+			break;
+		}
 	}
 
 	set_xen_guest_handle(reservation.extent_start, frame_list);
@@ -351,9 +312,6 @@ decrease_reservation(unsigned long nr_pages)
 	KASSERT(ret == nr_pages, ("HYPERVISOR_memory_op failed"));
 
 	bs.current_pages -= nr_pages;
-	//totalram_pages = bs.current_pages;
-
-	mtx_unlock(&balloon_lock);
 
 	return (need_sleep);
 }
@@ -425,11 +383,11 @@ watch_target(struct xs_watch *watch,
 		return;
 	} 
         
-	/* The given memory/target value is in KiB, so it needs converting to
-	   pages.  PAGE_SHIFT converts bytes to pages, hence PAGE_SHIFT - 10.
-	*/
-	set_new_target(new_target >> (PAGE_SHIFT - 10));
-    
+	/*
+	 * The given memory/target value is in KiB, so it needs converting to
+	 * pages.  PAGE_SHIFT converts bytes to pages, hence PAGE_SHIFT - 10.
+	 */
+	set_new_target(new_target >> KB_TO_PAGE_SHIFT);
 }
 
 static void 
@@ -461,13 +419,12 @@ balloon_init(void *arg)
 	if (!is_running_on_xen())
 		return;
 
-	mtx_init(&balloon_lock, "balloon_lock", NULL, MTX_DEF);
 	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 = physmem;
+	bs.current_pages = realmem;
 #endif
 	bs.target_pages  = bs.current_pages;
 	bs.balloon_low   = 0;
@@ -497,76 +454,7 @@ void balloon_update_driver_allowance(long delta);
 void 
 balloon_update_driver_allowance(long delta)
 {
-	mtx_lock(&balloon_lock);
+	mtx_lock(&balloon_mutex);
 	bs.driver_pages += delta;
-	mtx_unlock(&balloon_lock);
+	mtx_unlock(&balloon_mutex);
 }
-
-#if 0
-static int dealloc_pte_fn(
-	pte_t *pte, struct page *pte_page, unsigned long addr, void *data)
-{
-	unsigned long mfn = pte_mfn(*pte);
-	int ret;
-	struct xen_memory_reservation reservation = {
-		.extent_start = &mfn,
-		.nr_extents   = 1,
-		.extent_order = 0,
-		.domid        = DOMID_SELF
-	};
-	set_pte_at(&init_mm, addr, pte, __pte_ma(0));
-	set_phys_to_machine(__pa(addr) >> PAGE_SHIFT, INVALID_P2M_ENTRY);
-	ret = HYPERVISOR_memory_op(XENMEM_decrease_reservation, &reservation);
-	KASSERT(ret == 1, ("HYPERVISOR_memory_op failed"));
-	return 0;
-}
-
-#endif
-
-#if 0
-vm_page_t
-balloon_alloc_empty_page_range(unsigned long nr_pages)
-{
-	vm_page_t pages;
-	int i, rc;
-	unsigned long *mfn_list;
-	struct xen_memory_reservation reservation = {
-		.address_bits = 0,
-		.extent_order = 0,
-		.domid        = DOMID_SELF
-	};
-
-	pages = vm_page_alloc_contig(nr_pages, 0, -1, 4, 4)
-	if (pages == NULL)
-		return NULL;
-	
-	mfn_list = malloc(nr_pages*sizeof(unsigned long), M_DEVBUF, M_WAITOK);
-	
-	for (i = 0; i < nr_pages; i++) {
-		mfn_list[i] = PFNTOMFN(VM_PAGE_TO_PHYS(pages[i]) >> PAGE_SHIFT);
-		PFNTOMFN(i) = INVALID_P2M_ENTRY;
-		reservation.extent_start = mfn_list;
-		reservation.nr_extents = nr_pages;
-		rc = HYPERVISOR_memory_op(XENMEM_decrease_reservation,
-		    &reservation);
-		KASSERT(rc == nr_pages, ("HYPERVISOR_memory_op failed"));
-	}
-
-	current_pages -= nr_pages;
-
-	wakeup(balloon_process);
-
-	return pages;
-}
-
-void 
-balloon_dealloc_empty_page_range(vm_page_t page, unsigned long nr_pages)
-{
-	unsigned long i;
-
-	for (i = 0; i < nr_pages; i++)
-		balloon_append(page + i);
-
-	wakeup(balloon_process);
-}
-#endif
diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c
index 21fbb41f77f..f2f26988e53 100644
--- a/sys/dev/xen/blkback/blkback.c
+++ b/sys/dev/xen/blkback/blkback.c
@@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
  *        a FreeBSD domain to other domains.
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -2032,10 +2030,10 @@ xbb_filter(void *arg)
 }
 
 SDT_PROVIDER_DEFINE(xbb);
-SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_dev, flush, flush, "int");
-SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, read, read, "int", "uint64_t",
+SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_dev, flush, "int");
+SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, read, "int", "uint64_t",
 		  "uint64_t");
-SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, write, write, "int",
+SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_dev, write, "int",
 		  "uint64_t", "uint64_t");
 
 /*----------------------------- Backend Handlers -----------------------------*/
@@ -2211,10 +2209,10 @@ fail_free_bios:
 	return (error);
 }
 
-SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_file, flush, flush, "int");
-SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, read, read, "int", "uint64_t",
+SDT_PROBE_DEFINE1(xbb, kernel, xbb_dispatch_file, flush, "int");
+SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, read, "int", "uint64_t",
 		  "uint64_t");
-SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, write, write, "int",
+SDT_PROBE_DEFINE3(xbb, kernel, xbb_dispatch_file, write, "int",
 		  "uint64_t", "uint64_t");
 
 /**
diff --git a/sys/dev/xen/blkfront/blkfront.c b/sys/dev/xen/blkfront/blkfront.c
index feb79a1eb86..92b5f354281 100644
--- a/sys/dev/xen/blkfront/blkfront.c
+++ b/sys/dev/xen/blkfront/blkfront.c
@@ -1381,14 +1381,42 @@ xbd_closing(device_t dev)
 static int
 xbd_probe(device_t dev)
 {
+	if (strcmp(xenbus_get_type(dev), "vbd") != 0)
+		return (ENXIO);
 
-	if (!strcmp(xenbus_get_type(dev), "vbd")) {
-		device_set_desc(dev, "Virtual Block Device");
-		device_quiet(dev);
-		return (0);
+	if (xen_hvm_domain()) {
+		int error;
+		char *type;
+
+		/*
+		 * When running in an HVM domain, IDE disk emulation is
+		 * disabled early in boot so that native drivers will
+		 * not see emulated hardware.  However, CDROM device
+		 * emulation cannot be disabled.
+		 *
+		 * Through use of FreeBSD's vm_guest and xen_hvm_domain()
+		 * APIs, we could modify the native CDROM driver to fail its
+		 * probe when running under Xen.  Unfortunatlely, the PV
+		 * CDROM support in XenServer (up through at least version
+		 * 6.2) isn't functional, so we instead rely on the emulated
+		 * CDROM instance, and fail to attach the PV one here in
+		 * the blkfront driver.
+		 */
+		error = xs_read(XST_NIL, xenbus_get_node(dev),
+		    "device-type", NULL, (void **) &type);
+		if (error)
+			return (ENXIO);
+
+		if (strncmp(type, "cdrom", 5) == 0) {
+			free(type, M_XENSTORE);
+			return (ENXIO);
+		}
+		free(type, M_XENSTORE);
 	}
 
-	return (ENXIO);
+	device_set_desc(dev, "Virtual Block Device");
+	device_quiet(dev);
+	return (0);
 }
 
 /*
diff --git a/sys/dev/xen/console/console.c b/sys/dev/xen/console/console.c
index 65a0e7dad96..23eaee24972 100644
--- a/sys/dev/xen/console/console.c
+++ b/sys/dev/xen/console/console.c
@@ -226,7 +226,7 @@ static int
 xc_probe(device_t dev)
 {
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/dev/xen/control/control.c b/sys/dev/xen/control/control.c
index a74042bf225..bc0609d33d4 100644
--- a/sys/dev/xen/control/control.c
+++ b/sys/dev/xen/control/control.c
@@ -158,7 +158,6 @@ static xctrl_shutdown_handler_t xctrl_poweroff;
 static xctrl_shutdown_handler_t xctrl_reboot;
 static xctrl_shutdown_handler_t xctrl_suspend;
 static xctrl_shutdown_handler_t xctrl_crash;
-static xctrl_shutdown_handler_t xctrl_halt;
 
 /*-------------------------- Private Data Structures -------------------------*/
 /** Element type for lookup table of event name to handler. */
@@ -173,7 +172,7 @@ static const struct xctrl_shutdown_reason xctrl_shutdown_reasons[] = {
 	{ "reboot",   xctrl_reboot   },
 	{ "suspend",  xctrl_suspend  },
 	{ "crash",    xctrl_crash    },
-	{ "halt",     xctrl_halt     },
+	{ "halt",     xctrl_poweroff },
 };
 
 struct xctrl_softc {
@@ -371,6 +370,7 @@ xctrl_suspend()
 	mtx_unlock(&Giant);
 
 #ifdef SMP
+	CPU_ZERO(&cpu_suspend_map);	/* silence gcc */
 	if (smp_started) {
 		/*
 		 * Suspend other CPUs. This prevents IPIs while we
@@ -440,12 +440,6 @@ xctrl_crash()
 	panic("Xen directed crash");
 }
 
-static void
-xctrl_halt()
-{
-	shutdown_nice(RB_HALT);
-}
-
 /*------------------------------ Event Reception -----------------------------*/
 static void
 xctrl_on_watch_event(struct xs_watch *watch, const char **vec, unsigned int len)
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index 8f0286c31f0..6dec6647da0 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
  * 	  from this FreeBSD domain to other domains.
  */
 #include "opt_inet.h"
+#include "opt_inet6.h"
 #include "opt_global.h"
 
 #include "opt_sctp.h"
@@ -57,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -183,7 +185,6 @@ static int	xnb_rxpkt2gnttab(const struct xnb_pkt *pkt,
 static int	xnb_rxpkt2rsp(const struct xnb_pkt *pkt,
 			      const gnttab_copy_table gnttab, int n_entries,
 			      netif_rx_back_ring_t *ring);
-static void	xnb_add_mbuf_cksum(struct mbuf *mbufc);
 static void	xnb_stop(struct xnb_softc*);
 static int	xnb_ioctl(struct ifnet*, u_long, caddr_t);
 static void	xnb_start_locked(struct ifnet*);
@@ -194,6 +195,9 @@ static void	xnb_ifinit(void*);
 static int	xnb_unit_test_main(SYSCTL_HANDLER_ARGS);
 static int	xnb_dump_rings(SYSCTL_HANDLER_ARGS);
 #endif
+#if defined(INET) || defined(INET6)
+static void	xnb_add_mbuf_cksum(struct mbuf *mbufc);
+#endif
 /*------------------------------ Data Structures -----------------------------*/
 
 
@@ -1778,7 +1782,9 @@ xnb_update_mbufc(struct mbuf *mbufc, const gnttab_copy_table gnttab,
 	}
 	mbufc->m_pkthdr.len = total_size;
 
+#if defined(INET) || defined(INET6)
 	xnb_add_mbuf_cksum(mbufc);
+#endif
 }
 
 /**
@@ -2121,6 +2127,7 @@ xnb_rxpkt2rsp(const struct xnb_pkt *pkt, const gnttab_copy_table gnttab,
 	return n_responses;
 }
 
+#if defined(INET) || defined(INET6)
 /**
  * Add IP, TCP, and/or UDP checksums to every mbuf in a chain.  The first mbuf
  * in the chain must start with a struct ether_header.
@@ -2175,6 +2182,7 @@ xnb_add_mbuf_cksum(struct mbuf *mbufc)
 		break;
 	}
 }
+#endif /* INET || INET6 */
 
 static void
 xnb_stop(struct xnb_softc *xnb)
@@ -2191,8 +2199,8 @@ static int
 xnb_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct xnb_softc *xnb = ifp->if_softc;
-#ifdef INET
 	struct ifreq *ifr = (struct ifreq*) data;
+#ifdef INET
 	struct ifaddr *ifa = (struct ifaddr*)data;
 #endif
 	int error = 0;
diff --git a/sys/dev/xen/netback/netback_unit_tests.c b/sys/dev/xen/netback/netback_unit_tests.c
index 92e2b68eefc..390f9f782f8 100644
--- a/sys/dev/xen/netback/netback_unit_tests.c
+++ b/sys/dev/xen/netback/netback_unit_tests.c
@@ -104,10 +104,6 @@ struct test_fixture {
 
 typedef struct test_fixture test_fixture_t;
 
-static void	xnb_fill_eh_and_ip(struct mbuf *m, uint16_t ip_len,
-				   uint16_t ip_id, uint16_t ip_p,
-				   uint16_t ip_off, uint16_t ip_sum);
-static void	xnb_fill_tcp(struct mbuf *m);
 static int	xnb_get1pkt(struct xnb_pkt *pkt, size_t size, uint16_t flags);
 static int	xnb_unit_test_runner(test_fixture_t const tests[], int ntests,
 				     char *buffer, size_t buflen);
@@ -163,17 +159,24 @@ static testcase_t xnb_rxpkt2rsp_extra;
 static testcase_t xnb_rxpkt2rsp_2short;
 static testcase_t xnb_rxpkt2rsp_2slots;
 static testcase_t xnb_rxpkt2rsp_copyerror;
+static testcase_t xnb_sscanf_llu;
+static testcase_t xnb_sscanf_lld;
+static testcase_t xnb_sscanf_hhu;
+static testcase_t xnb_sscanf_hhd;
+static testcase_t xnb_sscanf_hhn;
+
+#if defined(INET) || defined(INET6)
 /* TODO: add test cases for xnb_add_mbuf_cksum for IPV6 tcp and udp */
 static testcase_t xnb_add_mbuf_cksum_arp;
 static testcase_t xnb_add_mbuf_cksum_tcp;
 static testcase_t xnb_add_mbuf_cksum_udp;
 static testcase_t xnb_add_mbuf_cksum_icmp;
 static testcase_t xnb_add_mbuf_cksum_tcp_swcksum;
-static testcase_t xnb_sscanf_llu;
-static testcase_t xnb_sscanf_lld;
-static testcase_t xnb_sscanf_hhu;
-static testcase_t xnb_sscanf_hhd;
-static testcase_t xnb_sscanf_hhn;
+static void	xnb_fill_eh_and_ip(struct mbuf *m, uint16_t ip_len,
+				   uint16_t ip_id, uint16_t ip_p,
+				   uint16_t ip_off, uint16_t ip_sum);
+static void	xnb_fill_tcp(struct mbuf *m);
+#endif /* INET || INET6 */
 
 /** Private data used by unit tests */
 static struct {
@@ -307,11 +310,13 @@ xnb_unit_test_main(SYSCTL_HANDLER_ARGS) {
 		{setup_pvt_data, xnb_rxpkt2rsp_2short, teardown_pvt_data},
 		{setup_pvt_data, xnb_rxpkt2rsp_2slots, teardown_pvt_data},
 		{setup_pvt_data, xnb_rxpkt2rsp_copyerror, teardown_pvt_data},
+#if defined(INET) || defined(INET6)
 		{null_setup, xnb_add_mbuf_cksum_arp, null_teardown},
 		{null_setup, xnb_add_mbuf_cksum_icmp, null_teardown},
 		{null_setup, xnb_add_mbuf_cksum_tcp, null_teardown},
 		{null_setup, xnb_add_mbuf_cksum_tcp_swcksum, null_teardown},
 		{null_setup, xnb_add_mbuf_cksum_udp, null_teardown},
+#endif
 		{null_setup, xnb_sscanf_hhd, null_teardown},
 		{null_setup, xnb_sscanf_hhu, null_teardown},
 		{null_setup, xnb_sscanf_lld, null_teardown},
@@ -2066,6 +2071,7 @@ xnb_rxpkt2rsp_copyerror(char *buffer, size_t buflen)
 	safe_m_freem(&mbuf);
 }
 
+#if defined(INET) || defined(INET6)
 /**
  * xnb_add_mbuf_cksum on an ARP request packet
  */
@@ -2430,6 +2436,7 @@ xnb_add_mbuf_cksum_tcp_swcksum(char *buffer, size_t buflen)
 
 	m_freem(mbufc);
 }
+#endif /* INET || INET6 */
 
 /**
  * sscanf on unsigned chars
diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c
index f9c72e6fc49..9ff872cdc74 100644
--- a/sys/dev/xen/netfront/netfront.c
+++ b/sys/dev/xen/netfront/netfront.c
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
+#include "opt_inet6.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -43,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sx.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
@@ -51,7 +53,6 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 
 #include <net/if_types.h>
-#include <net/if.h>
 
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
@@ -165,7 +166,6 @@ static int  xn_configure_features(struct netfront_info *np);
 static void xn_watchdog(struct ifnet *);
 #endif
 
-static void show_device(struct netfront_info *sc);
 #ifdef notyet
 static void netfront_closing(device_t dev);
 #endif
@@ -644,8 +644,6 @@ setup_device(device_t dev, struct netfront_info *info)
 		goto fail;
 	}
 
-	show_device(info);
-	
 	return (0);
 	
  fail:
@@ -967,7 +965,7 @@ static void
 xn_rxeof(struct netfront_info *np)
 {
 	struct ifnet *ifp;
-#if __FreeBSD_version >= 700000
+#if __FreeBSD_version >= 700000 && (defined(INET) || defined(INET6))
 	struct lro_ctrl *lro = &np->xn_lro;
 	struct lro_entry *queued;
 #endif
@@ -1064,7 +1062,7 @@ xn_rxeof(struct netfront_info *np)
 			 * Do we really need to drop the rx lock?
 			 */
 			XN_RX_UNLOCK(np);
-#if __FreeBSD_version >= 700000
+#if __FreeBSD_version >= 700000 && (defined(INET) || defined(INET6))
 			/* Use LRO if possible */
 			if ((ifp->if_capenable & IFCAP_LRO) == 0 ||
 			    lro->lro_cnt == 0 || tcp_lro_rx(lro, m, 0)) {
@@ -1082,7 +1080,7 @@ xn_rxeof(struct netfront_info *np)
 	
 		np->rx.rsp_cons = i;
 
-#if __FreeBSD_version >= 700000
+#if __FreeBSD_version >= 700000 && (defined(INET) || defined(INET6))
 		/*
 		 * Flush any outstanding LRO work
 		 */
@@ -1969,25 +1967,6 @@ network_connect(struct netfront_info *np)
 	return (0);
 }
 
-static void 
-show_device(struct netfront_info *sc)
-{
-#ifdef DEBUG
-	if (sc) {
-		IPRINTK("<vif handle=%u %s(%s) evtchn=%u irq=%u tx=%p rx=%p>\n",
-			sc->xn_ifno,
-			be_state_name[sc->xn_backend_state],
-			sc->xn_user_state ? "open" : "closed",
-			sc->xn_evtchn,
-			sc->xn_irq,
-			sc->xn_tx_if,
-			sc->xn_rx_if);
-	} else {
-		IPRINTK("<vif NULL>\n");
-	}
-#endif
-}
-
 static void
 xn_query_features(struct netfront_info *np)
 {
@@ -2024,14 +2003,14 @@ xn_configure_features(struct netfront_info *np)
 	int err;
 
 	err = 0;
-#if __FreeBSD_version >= 700000
+#if __FreeBSD_version >= 700000 && (defined(INET) || defined(INET6))
 	if ((np->xn_ifp->if_capenable & IFCAP_LRO) != 0)
 		tcp_lro_free(&np->xn_lro);
 #endif
     	np->xn_ifp->if_capenable =
 	    np->xn_ifp->if_capabilities & ~(IFCAP_LRO|IFCAP_TSO4);
 	np->xn_ifp->if_hwassist &= ~CSUM_TSO;
-#if __FreeBSD_version >= 700000
+#if __FreeBSD_version >= 700000 && (defined(INET) || defined(INET6))
 	if (xn_enable_lro && (np->xn_ifp->if_capabilities & IFCAP_LRO) != 0) {
 		err = tcp_lro_init(&np->xn_lro);
 		if (err) {
diff --git a/sys/dev/xen/pcifront/pcifront.c b/sys/dev/xen/pcifront/pcifront.c
index cdc8f9c0568..1613e0ae0ca 100644
--- a/sys/dev/xen/pcifront/pcifront.c
+++ b/sys/dev/xen/pcifront/pcifront.c
@@ -441,7 +441,7 @@ xpcife_probe(device_t dev)
 	struct pcifront_device *pdev = (struct pcifront_device *)device_get_ivars(dev);
 	DPRINTF("xpcife probe (unit=%d)\n", pdev->unit);
 #endif
-	return 0;
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 /* Newbus xpcife device driver attach */
diff --git a/sys/dev/xen/timer/timer.c b/sys/dev/xen/timer/timer.c
index 605e5c59950..354085bc183 100644
--- a/sys/dev/xen/timer/timer.c
+++ b/sys/dev/xen/timer/timer.c
@@ -142,7 +142,7 @@ xentimer_probe(device_t dev)
 	           "VCPUOPs interface unavailable\n");
 #undef XTREQUIRES
 	device_set_desc(dev, "Xen PV Clock");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 /*
@@ -396,7 +396,7 @@ xentimer_et_start(struct eventtimer *et,
 {
 	int error = 0, i = 0;
 	struct xentimer_softc *sc = et->et_priv;
-	int cpu = PCPU_GET(acpi_id);
+	int cpu = PCPU_GET(vcpu_id);
 	struct xentimer_pcpu_data *pcpu = DPCPU_PTR(xentimer_pcpu);
 	uint64_t first_in_ns, next_time;
 
@@ -433,7 +433,7 @@ xentimer_et_start(struct eventtimer *et,
 static int
 xentimer_et_stop(struct eventtimer *et)
 {
-	int cpu = PCPU_GET(acpi_id);
+	int cpu = PCPU_GET(vcpu_id);
 	struct xentimer_pcpu_data *pcpu = DPCPU_PTR(xentimer_pcpu);
 
 	pcpu->timer = 0;
diff --git a/sys/dev/xl/if_xl.c b/sys/dev/xl/if_xl.c
index 90bc0c02cef..8c3846091a3 100644
--- a/sys/dev/xl/if_xl.c
+++ b/sys/dev/xl/if_xl.c
@@ -113,6 +113,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/xl/xlphy.c b/sys/dev/xl/xlphy.c
index 2fe9e0d9058..a5555c7ff3f 100644
--- a/sys/dev/xl/xlphy.c
+++ b/sys/dev/xl/xlphy.c
@@ -152,22 +152,10 @@ xlphy_service(struct mii_softc *sc, struct mii_data *mii, int cmd)
 		break;
 
 	case MII_MEDIACHG:
-		/*
-		 * If the interface is not up, don't do anything.
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			break;
-
 		mii_phy_setmedia(sc);
 		break;
 
 	case MII_TICK:
-		/*
-		 * Is the interface even up?
-		 */
-		if ((mii->mii_ifp->if_flags & IFF_UP) == 0)
-			return (0);
-
 		/*
 		 * The 3Com PHY's autonegotiation doesn't need to be
 		 * kicked; it continues in the background.
diff --git a/sys/fs/devfs/devfs_vnops.c b/sys/fs/devfs/devfs_vnops.c
index 711a7eafb7e..a05299a8e70 100644
--- a/sys/fs/devfs/devfs_vnops.c
+++ b/sys/fs/devfs/devfs_vnops.c
@@ -1168,9 +1168,9 @@ devfs_print(struct vop_print_args *ap)
 	return (0);
 }
 
-/* ARGSUSED */
 static int
-devfs_read_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td)
+devfs_read_f(struct file *fp, struct uio *uio, struct ucred *cred,
+    int flags, struct thread *td)
 {
 	struct cdev *dev;
 	int ioflag, error, ref;
@@ -1178,6 +1178,8 @@ devfs_read_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, st
 	struct cdevsw *dsw;
 	struct file *fpop;
 
+	if (uio->uio_resid > DEVFS_IOSIZE_MAX)
+		return (EINVAL);
 	fpop = td->td_fpop;
 	error = devfs_fp_check(fp, &dev, &dsw, &ref);
 	if (error)
@@ -1643,9 +1645,9 @@ devfs_truncate_f(struct file *fp, off_t length, struct ucred *cred, struct threa
 	return (vnops.fo_truncate(fp, length, cred, td));
 }
 
-/* ARGSUSED */
 static int
-devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, struct thread *td)
+devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred,
+    int flags, struct thread *td)
 {
 	struct cdev *dev;
 	int error, ioflag, ref;
@@ -1653,6 +1655,8 @@ devfs_write_f(struct file *fp, struct uio *uio, struct ucred *cred, int flags, s
 	struct cdevsw *dsw;
 	struct file *fpop;
 
+	if (uio->uio_resid > DEVFS_IOSIZE_MAX)
+		return (EINVAL);
 	fpop = td->td_fpop;
 	error = devfs_fp_check(fp, &dev, &dsw, &ref);
 	if (error)
diff --git a/sys/fs/ext2fs/ext2_dinode.h b/sys/fs/ext2fs/ext2_dinode.h
index e492a0858c1..41b0236e732 100644
--- a/sys/fs/ext2fs/ext2_dinode.h
+++ b/sys/fs/ext2fs/ext2_dinode.h
@@ -44,6 +44,8 @@
 #define	EXT2_UNDELDIRINO	((ino_t)6)
 #define	EXT2_RESIZEINO		((ino_t)7)
 #define	EXT2_JOURNALINO		((ino_t)8)
+#define	EXT2_EXCLUDEINO		((ino_t)9)
+#define	EXT2_REPLICAINO		((ino_t)10)
 #define	EXT2_FIRSTINO		((ino_t)11)
 
 /*
diff --git a/sys/fs/ext2fs/ext2_vnops.c b/sys/fs/ext2fs/ext2_vnops.c
index c5be7d06f89..04ef9e2b81d 100644
--- a/sys/fs/ext2fs/ext2_vnops.c
+++ b/sys/fs/ext2fs/ext2_vnops.c
@@ -1689,7 +1689,7 @@ ext2_ind_read(struct vop_read_args *ap)
 			    NOCRED, blkoffset + uio->uio_resid, seqcount,
 			    0, &bp);
 		} else if (seqcount > 1) {
-			int nextsize = blksize(fs, ip, nextlbn);
+			u_int nextsize = blksize(fs, ip, nextlbn);
 			error = breadn(vp, lbn,
 			    size, &nextlbn, &nextsize, 1, NOCRED, &bp);
 		} else
diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c
index 47e5a374eed..0104c2928f9 100644
--- a/sys/fs/nfs/nfs_commonkrpc.c
+++ b/sys/fs/nfs/nfs_commonkrpc.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
  * Socket operations for use by nfs
  */
 
-#include "opt_kdtrace.h"
 #include "opt_kgssapi.h"
 #include "opt_nfs.h"
 
@@ -336,24 +335,25 @@ newnfs_connect(struct nfsmount *nmp, struct nfssockreq *nrp,
 
 	mtx_lock(&nrp->nr_mtx);
 	if (nrp->nr_client != NULL) {
+		mtx_unlock(&nrp->nr_mtx);
 		/*
 		 * Someone else already connected.
 		 */
 		CLNT_RELEASE(client);
 	} else {
 		nrp->nr_client = client;
+		/*
+		 * Protocols that do not require connections may be optionally
+		 * left unconnected for servers that reply from a port other
+		 * than NFS_PORT.
+		 */
+		if (nmp == NULL || (nmp->nm_flag & NFSMNT_NOCONN) == 0) {
+			mtx_unlock(&nrp->nr_mtx);
+			CLNT_CONTROL(client, CLSET_CONNECT, &one);
+		} else
+			mtx_unlock(&nrp->nr_mtx);
 	}
 
-	/*
-	 * Protocols that do not require connections may be optionally left
-	 * unconnected for servers that reply from a port other than NFS_PORT.
-	 */
-	if (nmp == NULL || (nmp->nm_flag & NFSMNT_NOCONN) == 0) {
-		mtx_unlock(&nrp->nr_mtx);
-		CLNT_CONTROL(client, CLSET_CONNECT, &one);
-	} else {
-		mtx_unlock(&nrp->nr_mtx);
-	}
 
 	/* Restore current thread's credentials. */
 	td->td_ucred = origcred;
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c
index b60b0ebf986..0ee06bd1b28 100644
--- a/sys/fs/nfs/nfs_commonsubs.c
+++ b/sys/fs/nfs/nfs_commonsubs.c
@@ -3693,8 +3693,8 @@ nfsv4_seqsess_cacherep(uint32_t slotid, struct nfsslot *slots, struct mbuf *rep)
  * Generate the xdr for an NFSv4.1 Sequence Operation.
  */
 APPLESTATIC void
-nfsv4_setsequence(struct nfsrv_descript *nd, struct nfsclsession *sep,
-    int dont_replycache)
+nfsv4_setsequence(struct nfsmount *nmp, struct nfsrv_descript *nd,
+    struct nfsclsession *sep, int dont_replycache)
 {
 	uint32_t *tl, slotseq = 0;
 	int i, maxslot, slotpos;
@@ -3717,9 +3717,21 @@ nfsv4_setsequence(struct nfsrv_descript *nd, struct nfsclsession *sep,
 			}
 			bitval <<= 1;
 		}
-		if (slotpos == -1)
+		if (slotpos == -1) {
+			/*
+			 * If a forced dismount is in progress, just return.
+			 * This RPC attempt will fail when it calls
+			 * newnfs_request().
+			 */
+			if ((nmp->nm_mountp->mnt_kern_flag & MNTK_UNMOUNTF)
+			    != 0) {
+				mtx_unlock(&sep->nfsess_mtx);
+				return;
+			}
+			/* Wake up once/sec, to check for a forced dismount. */
 			(void)mtx_sleep(&sep->nfsess_slots, &sep->nfsess_mtx,
-			    PZERO, "nfsclseq", 0);
+			    PZERO, "nfsclseq", hz);
+		}
 	} while (slotpos == -1);
 	/* Now, find the highest slot in use. (nfsc_slots is 64bits) */
 	bitval = 1;
diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h
index 1edb8a3f129..f6a974ec698 100644
--- a/sys/fs/nfs/nfs_var.h
+++ b/sys/fs/nfs/nfs_var.h
@@ -265,7 +265,8 @@ int nfsv4_getipaddr(struct nfsrv_descript *, struct sockaddr_storage *,
 int nfsv4_seqsession(uint32_t, uint32_t, uint32_t, struct nfsslot *,
     struct mbuf **, uint16_t);
 void nfsv4_seqsess_cacherep(uint32_t, struct nfsslot *, struct mbuf *);
-void nfsv4_setsequence(struct nfsrv_descript *, struct nfsclsession *, int);
+void nfsv4_setsequence(struct nfsmount *, struct nfsrv_descript *,
+    struct nfsclsession *, int);
 void nfsv4_freeslot(struct nfsclsession *, int);
 
 /* nfs_clcomsubs.c */
diff --git a/sys/fs/nfs/nfsport.h b/sys/fs/nfs/nfsport.h
index cec50a65709..a34ddd3f60a 100644
--- a/sys/fs/nfs/nfsport.h
+++ b/sys/fs/nfs/nfsport.h
@@ -79,6 +79,7 @@
 #include <sys/kthread.h>
 #include <sys/syscallsubr.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/radix.h>
 #include <net/route.h>
 #include <net/if_dl.h>
diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c
index 47c2f357251..dc106ee5370 100644
--- a/sys/fs/nfsclient/nfs_clbio.c
+++ b/sys/fs/nfsclient/nfs_clbio.c
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
@@ -874,7 +872,7 @@ ncl_write(struct vop_write_args *ap)
 	struct vattr vattr;
 	struct nfsmount *nmp = VFSTONFS(vp->v_mount);
 	daddr_t lbn;
-	int bcount;
+	int bcount, noncontig_write, obcount;
 	int bp_cached, n, on, error = 0, error1;
 	size_t orig_resid, local_resid;
 	off_t orig_size, tmp_off;
@@ -1037,7 +1035,15 @@ again:
 		 * unaligned buffer size.
 		 */
 		mtx_lock(&np->n_mtx);
-		if (uio->uio_offset == np->n_size && n) {
+		if ((np->n_flag & NHASBEENLOCKED) == 0 &&
+		    (nmp->nm_flag & NFSMNT_NONCONTIGWR) != 0)
+			noncontig_write = 1;
+		else
+			noncontig_write = 0;
+		if ((uio->uio_offset == np->n_size ||
+		    (noncontig_write != 0 &&
+		    lbn == (np->n_size / biosize) &&
+		    uio->uio_offset + n > np->n_size)) && n) {
 			mtx_unlock(&np->n_mtx);
 			/*
 			 * Get the buffer (in its pre-append state to maintain
@@ -1045,8 +1051,8 @@ again:
 			 * nfsnode after we have locked the buffer to prevent
 			 * readers from reading garbage.
 			 */
-			bcount = on;
-			bp = nfs_getcacheblk(vp, lbn, bcount, td);
+			obcount = np->n_size - (lbn * biosize);
+			bp = nfs_getcacheblk(vp, lbn, obcount, td);
 
 			if (bp != NULL) {
 				long save;
@@ -1058,9 +1064,12 @@ again:
 				mtx_unlock(&np->n_mtx);
 
 				save = bp->b_flags & B_CACHE;
-				bcount += n;
+				bcount = on + n;
 				allocbuf(bp, bcount);
 				bp->b_flags |= save;
+				if (noncontig_write != 0 && on > obcount)
+					vfs_bio_bzero_buf(bp, obcount, on -
+					    obcount);
 			}
 		} else {
 			/*
@@ -1159,19 +1168,23 @@ again:
 		 * area, just update the b_dirtyoff and b_dirtyend,
 		 * otherwise force a write rpc of the old dirty area.
 		 *
+		 * If there has been a file lock applied to this file
+		 * or vfs.nfs.old_noncontig_writing is set, do the following:
 		 * While it is possible to merge discontiguous writes due to
 		 * our having a B_CACHE buffer ( and thus valid read data
 		 * for the hole), we don't because it could lead to
 		 * significant cache coherency problems with multiple clients,
 		 * especially if locking is implemented later on.
 		 *
-		 * As an optimization we could theoretically maintain
-		 * a linked list of discontinuous areas, but we would still
-		 * have to commit them separately so there isn't much
-		 * advantage to it except perhaps a bit of asynchronization.
+		 * If vfs.nfs.old_noncontig_writing is not set and there has
+		 * not been file locking done on this file:
+		 * Relax coherency a bit for the sake of performance and
+		 * expand the current dirty region to contain the new
+		 * write even if it means we mark some non-dirty data as
+		 * dirty.
 		 */
 
-		if (bp->b_dirtyend > 0 &&
+		if (noncontig_write == 0 && bp->b_dirtyend > 0 &&
 		    (on > bp->b_dirtyend || (on + n) < bp->b_dirtyoff)) {
 			if (bwrite(bp) == EINTR) {
 				error = EINTR;
diff --git a/sys/fs/nfsclient/nfs_clcomsubs.c b/sys/fs/nfsclient/nfs_clcomsubs.c
index 073c6cceea1..52dcaad1826 100644
--- a/sys/fs/nfsclient/nfs_clcomsubs.c
+++ b/sys/fs/nfsclient/nfs_clcomsubs.c
@@ -203,10 +203,11 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp,
 			NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED);
 			*tl = txdr_unsigned(NFSV4OP_SEQUENCE);
 			if (sep == NULL)
-				nfsv4_setsequence(nd, NFSMNT_MDSSESSION(nmp),
+				nfsv4_setsequence(nmp, nd,
+				    NFSMNT_MDSSESSION(nmp),
 				    nfs_bigreply[procnum]);
 			else
-				nfsv4_setsequence(nd, sep,
+				nfsv4_setsequence(nmp, nd, sep,
 				    nfs_bigreply[procnum]);
 		}
 		if (nfsv4_opflag[nfsv4_opmap[procnum].op].needscfh > 0) {
diff --git a/sys/fs/nfsclient/nfs_clkdtrace.c b/sys/fs/nfsclient/nfs_clkdtrace.c
index cf3d8b09f10..5e6e58cff49 100644
--- a/sys/fs/nfsclient/nfs_clkdtrace.c
+++ b/sys/fs/nfsclient/nfs_clkdtrace.c
@@ -176,21 +176,6 @@ static dtrace_pops_t dtnfsclient_pops = {
 
 static dtrace_provider_id_t	dtnfsclient_id;
 
-/*
- * Most probes are generated from the above RPC table, but for access and
- * attribute caches, we have specific IDs we recognize and handle specially
- * in various spots.
- */
-extern uint32_t	nfscl_accesscache_flush_done_id;
-extern uint32_t	nfscl_accesscache_get_hit_id;
-extern uint32_t	nfscl_accesscache_get_miss_id;
-extern uint32_t	nfscl_accesscache_load_done_id;
-
-extern uint32_t	nfscl_attrcache_flush_done_id;
-extern uint32_t	nfscl_attrcache_get_hit_id;
-extern uint32_t	nfscl_attrcache_get_miss_id;
-extern uint32_t	nfscl_attrcache_load_done_id;
-
 /*
  * When tracing on a procedure is enabled, the DTrace ID for an RPC event is
  * stored in one of these two NFS client-allocated arrays; 0 indicates that
diff --git a/sys/fs/nfsclient/nfs_clnode.c b/sys/fs/nfsclient/nfs_clnode.c
index 0cd503cc0e5..5052261ed86 100644
--- a/sys/fs/nfsclient/nfs_clnode.c
+++ b/sys/fs/nfsclient/nfs_clnode.c
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/fcntl.h>
diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c
index b198d597698..0b85353c528 100644
--- a/sys/fs/nfsclient/nfs_clport.c
+++ b/sys/fs/nfsclient/nfs_clport.c
@@ -35,7 +35,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
-#include "opt_kdtrace.h"
 
 #include <sys/capability.h>
 
diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c
index 1629cf36d07..cf21ef97a11 100644
--- a/sys/fs/nfsclient/nfs_clsubs.c
+++ b/sys/fs/nfsclient/nfs_clsubs.c
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 /*
  * These functions support the macros and help fiddle mbuf chains for
  * the nfs op functions. They do things like create the rpc header and
diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c
index 4a180c52ed6..6b093561887 100644
--- a/sys/fs/nfsclient/nfs_clvfsops.c
+++ b/sys/fs/nfsclient/nfs_clvfsops.c
@@ -719,7 +719,8 @@ static const char *nfs_opts[] = { "from", "nfs_args",
     "retrans", "acregmin", "acregmax", "acdirmin", "acdirmax", "resvport",
     "readahead", "hostname", "timeout", "addr", "fh", "nfsv3", "sec",
     "principal", "nfsv4", "gssname", "allgssname", "dirpath", "minorversion",
-    "nametimeo", "negnametimeo", "nocto", "pnfs", "wcommitsize",
+    "nametimeo", "negnametimeo", "nocto", "noncontigwr", "pnfs",
+    "wcommitsize",
     NULL };
 
 /*
@@ -840,6 +841,8 @@ nfs_mount(struct mount *mp)
 		args.flags |= NFSMNT_ALLGSSNAME;
 	if (vfs_getopt(mp->mnt_optnew, "nocto", NULL, NULL) == 0)
 		args.flags |= NFSMNT_NOCTO;
+	if (vfs_getopt(mp->mnt_optnew, "noncontigwr", NULL, NULL) == 0)
+		args.flags |= NFSMNT_NONCONTIGWR;
 	if (vfs_getopt(mp->mnt_optnew, "pnfs", NULL, NULL) == 0)
 		args.flags |= NFSMNT_PNFS;
 	if (vfs_getopt(mp->mnt_optnew, "readdirsize", (void **)&opt, NULL) == 0) {
@@ -1792,6 +1795,8 @@ void nfscl_retopts(struct nfsmount *nmp, char *buffer, size_t buflen)
 	    &blen);
 	nfscl_printopt(nmp, (nmp->nm_flag & NFSMNT_NOCTO) != 0, ",nocto", &buf,
 	    &blen);
+	nfscl_printopt(nmp, (nmp->nm_flag & NFSMNT_NONCONTIGWR) != 0,
+	    ",noncontigwr", &buf, &blen);
 	nfscl_printopt(nmp, (nmp->nm_flag & (NFSMNT_NOLOCKD | NFSMNT_NFSV4)) ==
 	    0, ",lockd", &buf, &blen);
 	nfscl_printopt(nmp, (nmp->nm_flag & (NFSMNT_NOLOCKD | NFSMNT_NFSV4)) ==
diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c
index 944873c6364..73e5ed9cc42 100644
--- a/sys/fs/nfsclient/nfs_clvnops.c
+++ b/sys/fs/nfsclient/nfs_clvnops.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
  * vnode op calls for Sun NFS version 2, 3 and 4
  */
 
-#include "opt_kdtrace.h"
 #include "opt_inet.h"
 
 #include <sys/param.h>
@@ -3079,6 +3078,10 @@ nfs_advlock(struct vop_advlock_args *ap)
 					np->n_change = va.va_filerev;
 				}
 			}
+			/* Mark that a file lock has been acquired. */
+			mtx_lock(&np->n_mtx);
+			np->n_flag |= NHASBEENLOCKED;
+			mtx_unlock(&np->n_mtx);
 		}
 		NFSVOPUNLOCK(vp, 0);
 		return (0);
@@ -3098,6 +3101,12 @@ nfs_advlock(struct vop_advlock_args *ap)
 				error = ENOLCK;
 			}
 		}
+		if (error == 0 && ap->a_op == F_SETLK) {
+			/* Mark that a file lock has been acquired. */
+			mtx_lock(&np->n_mtx);
+			np->n_flag |= NHASBEENLOCKED;
+			mtx_unlock(&np->n_mtx);
+		}
 	}
 	return (error);
 }
diff --git a/sys/fs/nfsclient/nfs_kdtrace.h b/sys/fs/nfsclient/nfs_kdtrace.h
index f8f143f916e..93eca7aca19 100644
--- a/sys/fs/nfsclient/nfs_kdtrace.h
+++ b/sys/fs/nfsclient/nfs_kdtrace.h
@@ -32,9 +32,6 @@
 #ifndef _NFSCL_NFS_KDTRACE_H_
 #define	_NFSCL_NFS_KDTRACE_H_
 
-#ifdef KDTRACE_HOOKS
-#include <sys/dtrace_bsd.h>
-
 /*
  * Definitions for NFS access cache probes.
  */
@@ -43,6 +40,17 @@ extern uint32_t	nfscl_accesscache_get_hit_id;
 extern uint32_t	nfscl_accesscache_get_miss_id;
 extern uint32_t	nfscl_accesscache_load_done_id;
 
+/*
+ * Definitions for NFS attribute cache probes.
+ */
+extern uint32_t	nfscl_attrcache_flush_done_id;
+extern uint32_t	nfscl_attrcache_get_hit_id;
+extern uint32_t	nfscl_attrcache_get_miss_id;
+extern uint32_t	nfscl_attrcache_load_done_id;
+
+#ifdef KDTRACE_HOOKS
+#include <sys/dtrace_bsd.h>
+
 #define	KDTRACE_NFS_ACCESSCACHE_FLUSH_DONE(vp)	do {			\
 	if (dtrace_nfscl_accesscache_flush_done_probe != NULL)		\
 		(dtrace_nfscl_accesscache_flush_done_probe)(		\
@@ -70,14 +78,6 @@ extern uint32_t	nfscl_accesscache_load_done_id;
 		    (rmode), (error));					\
 } while (0)
 
-/*
- * Definitions for NFS attribute cache probes.
- */
-extern uint32_t	nfscl_attrcache_flush_done_id;
-extern uint32_t	nfscl_attrcache_get_hit_id;
-extern uint32_t	nfscl_attrcache_get_miss_id;
-extern uint32_t	nfscl_attrcache_load_done_id;
-
 #define	KDTRACE_NFS_ATTRCACHE_FLUSH_DONE(vp)	do {			\
 	if (dtrace_nfscl_attrcache_flush_done_probe != NULL)		\
 		(dtrace_nfscl_attrcache_flush_done_probe)(		\
diff --git a/sys/fs/nfsclient/nfsnode.h b/sys/fs/nfsclient/nfsnode.h
index bbb67d71304..d5cb7564f71 100644
--- a/sys/fs/nfsclient/nfsnode.h
+++ b/sys/fs/nfsclient/nfsnode.h
@@ -157,6 +157,7 @@ struct nfsnode {
 #define	NLOCKWANT	0x00010000  /* Want the sleep lock */
 #define	NNOLAYOUT	0x00020000  /* Can't get a layout for this file */
 #define	NWRITEOPENED	0x00040000  /* Has been opened for writing */
+#define	NHASBEENLOCKED	0x00080000  /* Has been file locked. */
 
 /*
  * Convert between nfsnode pointers and vnode pointers
diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
index 9f97cd3b64c..f00b4b2ad5e 100644
--- a/sys/fs/pseudofs/pseudofs_vnops.c
+++ b/sys/fs/pseudofs/pseudofs_vnops.c
@@ -616,8 +616,7 @@ pfs_read(struct vop_read_args *va)
 	struct proc *proc;
 	struct sbuf *sb = NULL;
 	int error, locked;
-	off_t offset;
-	ssize_t buflen, resid;
+	off_t buflen;
 
 	PFS_TRACE(("%s", pn->pn_name));
 	pfs_assert_not_owned(pn);
@@ -654,14 +653,12 @@ pfs_read(struct vop_read_args *va)
 		goto ret;
 	}
 
-	/* beaucoup sanity checks so we don't ask for bogus allocation */
-	if (uio->uio_offset < 0 || uio->uio_resid < 0 ||
-	    (offset = uio->uio_offset) != uio->uio_offset ||
-	    (resid = uio->uio_resid) != uio->uio_resid ||
-	    (buflen = offset + resid) < offset || buflen >= INT_MAX) {
+	if (uio->uio_resid < 0 || uio->uio_offset < 0 ||
+	    uio->uio_resid > OFF_MAX - uio->uio_offset) {
 		error = EINVAL;
 		goto ret;
 	}
+	buflen = uio->uio_offset + uio->uio_resid;
 	if (buflen > MAXPHYS)
 		buflen = MAXPHYS;
 
diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c
index 91431662e63..2efc1b53fd6 100644
--- a/sys/geom/concat/g_concat.c
+++ b/sys/geom/concat/g_concat.c
@@ -238,6 +238,27 @@ g_concat_kernel_dump(struct bio *bp)
 	    disk->d_consumer->provider->name);
 }
 
+static void
+g_concat_done(struct bio *bp)
+{
+	struct g_concat_softc *sc;
+	struct bio *pbp;
+
+	pbp = bp->bio_parent;
+	sc = pbp->bio_to->geom->softc;
+	mtx_lock(&sc->sc_lock);
+	if (pbp->bio_error == 0)
+		pbp->bio_error = bp->bio_error;
+	pbp->bio_completed += bp->bio_completed;
+	pbp->bio_inbed++;
+	if (pbp->bio_children == pbp->bio_inbed) {
+		mtx_unlock(&sc->sc_lock);
+		g_io_deliver(pbp, pbp->bio_error);
+	} else
+		mtx_unlock(&sc->sc_lock);
+	g_destroy_bio(bp);
+}
+
 static void
 g_concat_flush(struct g_concat_softc *sc, struct bio *bp)
 {
@@ -250,23 +271,19 @@ g_concat_flush(struct g_concat_softc *sc, struct bio *bp)
 	for (no = 0; no < sc->sc_ndisks; no++) {
 		cbp = g_clone_bio(bp);
 		if (cbp == NULL) {
-			for (cbp = bioq_first(&queue); cbp != NULL;
-			    cbp = bioq_first(&queue)) {
-				bioq_remove(&queue, cbp);
+			while ((cbp = bioq_takefirst(&queue)) != NULL)
 				g_destroy_bio(cbp);
-			}
 			if (bp->bio_error == 0)
 				bp->bio_error = ENOMEM;
 			g_io_deliver(bp, bp->bio_error);
 			return;
 		}
 		bioq_insert_tail(&queue, cbp);
-		cbp->bio_done = g_std_done;
+		cbp->bio_done = g_concat_done;
 		cbp->bio_caller1 = sc->sc_disks[no].d_consumer;
 		cbp->bio_to = sc->sc_disks[no].d_consumer->provider;
 	}
-	for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		G_CONCAT_LOGREQ(cbp, "Sending request.");
 		cp = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
@@ -320,7 +337,10 @@ g_concat_start(struct bio *bp)
 
 	offset = bp->bio_offset;
 	length = bp->bio_length;
-	addr = bp->bio_data;
+	if ((bp->bio_flags & BIO_UNMAPPED) != 0)
+		addr = NULL;
+	else
+		addr = bp->bio_data;
 	end = offset + length;
 
 	bioq_init(&queue);
@@ -338,11 +358,8 @@ g_concat_start(struct bio *bp)
 
 		cbp = g_clone_bio(bp);
 		if (cbp == NULL) {
-			for (cbp = bioq_first(&queue); cbp != NULL;
-			    cbp = bioq_first(&queue)) {
-				bioq_remove(&queue, cbp);
+			while ((cbp = bioq_takefirst(&queue)) != NULL)
 				g_destroy_bio(cbp);
-			}
 			if (bp->bio_error == 0)
 				bp->bio_error = ENOMEM;
 			g_io_deliver(bp, bp->bio_error);
@@ -352,11 +369,21 @@ g_concat_start(struct bio *bp)
 		/*
 		 * Fill in the component buf structure.
 		 */
-		cbp->bio_done = g_std_done;
+		if (len == bp->bio_length)
+			cbp->bio_done = g_std_done;
+		else
+			cbp->bio_done = g_concat_done;
 		cbp->bio_offset = off;
-		cbp->bio_data = addr;
-		addr += len;
 		cbp->bio_length = len;
+		if ((bp->bio_flags & BIO_UNMAPPED) != 0) {
+			cbp->bio_ma_offset += (uintptr_t)addr;
+			cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE;
+			cbp->bio_ma_offset %= PAGE_SIZE;
+			cbp->bio_ma_n = round_page(cbp->bio_ma_offset +
+			    cbp->bio_length) / PAGE_SIZE;
+		} else
+			cbp->bio_data = addr;
+		addr += len;
 		cbp->bio_to = disk->d_consumer->provider;
 		cbp->bio_caller1 = disk;
 
@@ -366,8 +393,7 @@ g_concat_start(struct bio *bp)
 	KASSERT(length == 0,
 	    ("Length is still greater than 0 (class=%s, name=%s).",
 	    bp->bio_to->geom->class->name, bp->bio_to->geom->name));
-	for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		G_CONCAT_LOGREQ(cbp, "Sending request.");
 		disk = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
@@ -379,7 +405,7 @@ static void
 g_concat_check_and_run(struct g_concat_softc *sc)
 {
 	struct g_concat_disk *disk;
-	struct g_provider *pp;
+	struct g_provider *dp, *pp;
 	u_int no, sectorsize = 0;
 	off_t start;
 
@@ -388,20 +414,27 @@ g_concat_check_and_run(struct g_concat_softc *sc)
 		return;
 
 	pp = g_new_providerf(sc->sc_geom, "concat/%s", sc->sc_name);
+	pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE |
+	    G_PF_ACCEPT_UNMAPPED;
 	start = 0;
 	for (no = 0; no < sc->sc_ndisks; no++) {
 		disk = &sc->sc_disks[no];
+		dp = disk->d_consumer->provider;
 		disk->d_start = start;
-		disk->d_end = disk->d_start +
-		    disk->d_consumer->provider->mediasize;
+		disk->d_end = disk->d_start + dp->mediasize;
 		if (sc->sc_type == G_CONCAT_TYPE_AUTOMATIC)
-			disk->d_end -= disk->d_consumer->provider->sectorsize;
+			disk->d_end -= dp->sectorsize;
 		start = disk->d_end;
 		if (no == 0)
-			sectorsize = disk->d_consumer->provider->sectorsize;
-		else {
-			sectorsize = lcm(sectorsize,
-			    disk->d_consumer->provider->sectorsize);
+			sectorsize = dp->sectorsize;
+		else
+			sectorsize = lcm(sectorsize, dp->sectorsize);
+
+		/* A provider underneath us doesn't support unmapped */
+		if ((dp->flags & G_PF_ACCEPT_UNMAPPED) == 0) {
+			G_CONCAT_DEBUG(1, "Cancelling unmapped "
+			    "because of %s.", dp->name);
+			pp->flags &= ~G_PF_ACCEPT_UNMAPPED;
 		}
 	}
 	pp->sectorsize = sectorsize;
@@ -468,6 +501,7 @@ g_concat_add_disk(struct g_concat_softc *sc, struct g_provider *pp, u_int no)
 	fcp = LIST_FIRST(&gp->consumer);
 
 	cp = g_new_consumer(gp);
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	error = g_attach(cp, pp);
 	if (error != 0) {
 		g_destroy_consumer(cp);
@@ -557,6 +591,7 @@ g_concat_create(struct g_class *mp, const struct g_concat_metadata *md,
 	for (no = 0; no < sc->sc_ndisks; no++)
 		sc->sc_disks[no].d_consumer = NULL;
 	sc->sc_type = type;
+	mtx_init(&sc->sc_lock, "gconcat lock", NULL, MTX_DEF);
 
 	gp->softc = sc;
 	sc->sc_geom = gp;
@@ -605,6 +640,7 @@ g_concat_destroy(struct g_concat_softc *sc, boolean_t force)
 	KASSERT(sc->sc_provider == NULL, ("Provider still exists? (device=%s)",
 	    gp->name));
 	free(sc->sc_disks, M_CONCAT);
+	mtx_destroy(&sc->sc_lock);
 	free(sc, M_CONCAT);
 
 	G_CONCAT_DEBUG(0, "Device %s destroyed.", gp->name);
diff --git a/sys/geom/concat/g_concat.h b/sys/geom/concat/g_concat.h
index 1c1e6f584d4..c2ea3664772 100644
--- a/sys/geom/concat/g_concat.h
+++ b/sys/geom/concat/g_concat.h
@@ -83,6 +83,7 @@ struct g_concat_softc {
 
 	struct g_concat_disk *sc_disks;
 	uint16_t	 sc_ndisks;
+	struct mtx	 sc_lock;
 };
 #define	sc_name	sc_geom->name
 #endif	/* _KERNEL */
diff --git a/sys/geom/eli/g_eli.c b/sys/geom/eli/g_eli.c
index 18e3cc47585..2d21ab3b751 100644
--- a/sys/geom/eli/g_eli.c
+++ b/sys/geom/eli/g_eli.c
@@ -1170,9 +1170,9 @@ g_eli_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp,
 	if (pp != NULL || cp != NULL)
 		return;	/* Nothing here. */
 
-	sbuf_printf(sb, "%s<KeysTotal>%ju</KeysTotal>", indent,
+	sbuf_printf(sb, "%s<KeysTotal>%ju</KeysTotal>\n", indent,
 	    (uintmax_t)sc->sc_ekeys_total);
-	sbuf_printf(sb, "%s<KeysAllocated>%ju</KeysAllocated>", indent,
+	sbuf_printf(sb, "%s<KeysAllocated>%ju</KeysAllocated>\n", indent,
 	    (uintmax_t)sc->sc_ekeys_allocated);
 	sbuf_printf(sb, "%s<Flags>", indent);
 	if (sc->sc_flags == 0)
diff --git a/sys/geom/eli/g_eli_ctl.c b/sys/geom/eli/g_eli_ctl.c
index 520d2371973..59aff9b684b 100644
--- a/sys/geom/eli/g_eli_ctl.c
+++ b/sys/geom/eli/g_eli_ctl.c
@@ -471,7 +471,7 @@ g_eli_ctl_configure(struct gctl_req *req, struct g_class *mp)
 			    prov, error);
 		}
 		bzero(&md, sizeof(md));
-		bzero(sector, sizeof(sector));
+		bzero(sector, pp->sectorsize);
 		free(sector, M_ELI);
 	}
 }
@@ -562,7 +562,7 @@ g_eli_ctl_setkey(struct gctl_req *req, struct g_class *mp)
 
 	/* Encrypt Master Key with the new key. */
 	error = g_eli_mkey_encrypt(md.md_ealgo, key, md.md_keylen, mkeydst);
-	bzero(key, sizeof(key));
+	bzero(key, keysize);
 	if (error != 0) {
 		bzero(&md, sizeof(md));
 		gctl_error(req, "Cannot encrypt Master Key (error=%d).", error);
@@ -575,7 +575,7 @@ g_eli_ctl_setkey(struct gctl_req *req, struct g_class *mp)
 	bzero(&md, sizeof(md));
 	error = g_write_data(cp, pp->mediasize - pp->sectorsize, sector,
 	    pp->sectorsize);
-	bzero(sector, sizeof(sector));
+	bzero(sector, pp->sectorsize);
 	free(sector, M_ELI);
 	if (error != 0) {
 		gctl_error(req, "Cannot store metadata on %s (error=%d).",
@@ -691,7 +691,7 @@ g_eli_ctl_delkey(struct gctl_req *req, struct g_class *mp)
 		(void)g_io_flush(cp);
 	}
 	bzero(&md, sizeof(md));
-	bzero(sector, sizeof(sector));
+	bzero(sector, pp->sectorsize);
 	free(sector, M_ELI);
 	if (*all)
 		G_ELI_DEBUG(1, "All keys removed from %s.", pp->name);
diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c
index 0727ecd68f9..eed4abbc54a 100644
--- a/sys/geom/gate/g_gate.c
+++ b/sys/geom/gate/g_gate.c
@@ -91,6 +91,7 @@ static struct mtx g_gate_units_lock;
 static int
 g_gate_destroy(struct g_gate_softc *sc, boolean_t force)
 {
+	struct bio_queue_head queue;
 	struct g_provider *pp;
 	struct g_consumer *cp;
 	struct g_geom *gp;
@@ -113,21 +114,22 @@ g_gate_destroy(struct g_gate_softc *sc, boolean_t force)
 	pp->flags |= G_PF_WITHER;
 	g_orphan_provider(pp, ENXIO);
 	callout_drain(&sc->sc_callout);
+	bioq_init(&queue);
 	mtx_lock(&sc->sc_queue_mtx);
-	while ((bp = bioq_first(&sc->sc_inqueue)) != NULL) {
-		bioq_remove(&sc->sc_inqueue, bp);
+	while ((bp = bioq_takefirst(&sc->sc_inqueue)) != NULL) {
 		sc->sc_queue_count--;
-		G_GATE_LOGREQ(1, bp, "Request canceled.");
-		g_io_deliver(bp, ENXIO);
+		bioq_insert_tail(&queue, bp);
 	}
-	while ((bp = bioq_first(&sc->sc_outqueue)) != NULL) {
-		bioq_remove(&sc->sc_outqueue, bp);
+	while ((bp = bioq_takefirst(&sc->sc_outqueue)) != NULL) {
 		sc->sc_queue_count--;
-		G_GATE_LOGREQ(1, bp, "Request canceled.");
-		g_io_deliver(bp, ENXIO);
+		bioq_insert_tail(&queue, bp);
 	}
 	mtx_unlock(&sc->sc_queue_mtx);
 	g_topology_unlock();
+	while ((bp = bioq_takefirst(&queue)) != NULL) {
+		G_GATE_LOGREQ(1, bp, "Request canceled.");
+		g_io_deliver(bp, ENXIO);
+	}
 	mtx_lock(&g_gate_units_lock);
 	/* One reference is ours. */
 	sc->sc_ref--;
@@ -334,6 +336,7 @@ g_gate_getunit(int unit, int *errorp)
 static void
 g_gate_guard(void *arg)
 {
+	struct bio_queue_head queue;
 	struct g_gate_softc *sc;
 	struct bintime curtime;
 	struct bio *bp, *bp2;
@@ -341,24 +344,27 @@ g_gate_guard(void *arg)
 	sc = arg;
 	binuptime(&curtime);
 	g_gate_hold(sc->sc_unit, NULL);
+	bioq_init(&queue);
 	mtx_lock(&sc->sc_queue_mtx);
 	TAILQ_FOREACH_SAFE(bp, &sc->sc_inqueue.queue, bio_queue, bp2) {
 		if (curtime.sec - bp->bio_t0.sec < 5)
 			continue;
 		bioq_remove(&sc->sc_inqueue, bp);
 		sc->sc_queue_count--;
-		G_GATE_LOGREQ(1, bp, "Request timeout.");
-		g_io_deliver(bp, EIO);
+		bioq_insert_tail(&queue, bp);
 	}
 	TAILQ_FOREACH_SAFE(bp, &sc->sc_outqueue.queue, bio_queue, bp2) {
 		if (curtime.sec - bp->bio_t0.sec < 5)
 			continue;
 		bioq_remove(&sc->sc_outqueue, bp);
 		sc->sc_queue_count--;
+		bioq_insert_tail(&queue, bp);
+	}
+	mtx_unlock(&sc->sc_queue_mtx);
+	while ((bp = bioq_takefirst(&queue)) != NULL) {
 		G_GATE_LOGREQ(1, bp, "Request timeout.");
 		g_io_deliver(bp, EIO);
 	}
-	mtx_unlock(&sc->sc_queue_mtx);
 	if ((sc->sc_flags & G_GATE_FLAG_DESTROY) == 0) {
 		callout_reset(&sc->sc_callout, sc->sc_timeout * hz,
 		    g_gate_guard, sc);
@@ -542,6 +548,7 @@ g_gate_create(struct g_gate_ctl_create *ggio)
 
 	if (ropp != NULL) {
 		cp = g_new_consumer(gp);
+		cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 		error = g_attach(cp, ropp);
 		if (error != 0) {
 			G_GATE_DEBUG(1, "Unable to attach to %s.", ropp->name);
@@ -560,6 +567,7 @@ g_gate_create(struct g_gate_ctl_create *ggio)
 	ggio->gctl_unit = sc->sc_unit;
 
 	pp = g_new_providerf(gp, "%s", name);
+	pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
 	pp->mediasize = ggio->gctl_mediasize;
 	pp->sectorsize = ggio->gctl_sectorsize;
 	sc->sc_provider = pp;
@@ -636,6 +644,7 @@ g_gate_modify(struct g_gate_softc *sc, struct g_gate_ctl_modify *ggio)
 				return (EINVAL);
 			}
 			cp = g_new_consumer(sc->sc_provider->geom);
+			cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 			error = g_attach(cp, pp);
 			if (error != 0) {
 				G_GATE_DEBUG(1, "Unable to attach to %s.",
diff --git a/sys/geom/geom.h b/sys/geom/geom.h
index 660bf6e7380..f313d02b74c 100644
--- a/sys/geom/geom.h
+++ b/sys/geom/geom.h
@@ -177,6 +177,8 @@ struct g_consumer {
 	int			flags;
 #define G_CF_SPOILED		0x1
 #define G_CF_ORPHAN		0x4
+#define G_CF_DIRECT_SEND	0x10
+#define G_CF_DIRECT_RECEIVE	0x20
 	struct devstat		*stat;
 	u_int			nstart, nend;
 
@@ -206,6 +208,8 @@ struct g_provider {
 #define G_PF_WITHER		0x2
 #define G_PF_ORPHAN		0x4
 #define	G_PF_ACCEPT_UNMAPPED	0x8
+#define G_PF_DIRECT_SEND	0x10
+#define G_PF_DIRECT_RECEIVE	0x20
 
 	/* Two fields for the implementing class to use */
 	void			*private;
@@ -270,6 +274,7 @@ int g_handleattr(struct bio *bp, const char *attribute, const void *val,
     int len);
 int g_handleattr_int(struct bio *bp, const char *attribute, int val);
 int g_handleattr_off_t(struct bio *bp, const char *attribute, off_t val);
+int g_handleattr_uint16_t(struct bio *bp, const char *attribute, uint16_t val);
 int g_handleattr_str(struct bio *bp, const char *attribute, const char *str);
 struct g_consumer * g_new_consumer(struct g_geom *gp);
 struct g_geom * g_new_geomf(struct g_class *mp, const char *fmt, ...)
@@ -393,6 +398,8 @@ g_free(void *ptr)
 	};							\
 	DECLARE_MODULE(name, name##_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);
 
+int g_is_geom_thread(struct thread *td);
+
 #endif /* _KERNEL */
 
 /* geom_ctl.c */
diff --git a/sys/geom/geom_dev.c b/sys/geom/geom_dev.c
index 17f24f8dcb2..6ec77cca25a 100644
--- a/sys/geom/geom_dev.c
+++ b/sys/geom/geom_dev.c
@@ -222,6 +222,7 @@ g_dev_taste(struct g_class *mp, struct g_provider *pp, int insist __unused)
 	mtx_init(&sc->sc_mtx, "g_dev", NULL, MTX_DEF);
 	cp = g_new_consumer(gp);
 	cp->private = sc;
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	error = g_attach(cp, pp);
 	KASSERT(error == 0,
 	    ("g_dev_taste(%s) failed to g_attach, err=%d", pp->name, error));
@@ -485,16 +486,16 @@ g_dev_done(struct bio *bp2)
 	sc = cp->private;
 	bp = bp2->bio_parent;
 	bp->bio_error = bp2->bio_error;
-	if (bp->bio_error != 0) {
+	bp->bio_completed = bp2->bio_completed;
+	bp->bio_resid = bp2->bio_resid;
+	if (bp2->bio_error != 0) {
 		g_trace(G_T_BIO, "g_dev_done(%p) had error %d",
-		    bp2, bp->bio_error);
+		    bp2, bp2->bio_error);
 		bp->bio_flags |= BIO_ERROR;
 	} else {
 		g_trace(G_T_BIO, "g_dev_done(%p/%p) resid %ld completed %jd",
-		    bp2, bp, bp->bio_resid, (intmax_t)bp2->bio_completed);
+		    bp2, bp, bp2->bio_resid, (intmax_t)bp2->bio_completed);
 	}
-	bp->bio_resid = bp->bio_length - bp2->bio_completed;
-	bp->bio_completed = bp2->bio_completed;
 	g_destroy_bio(bp2);
 	destroy = 0;
 	mtx_lock(&sc->sc_mtx);
diff --git a/sys/geom/geom_disk.c b/sys/geom/geom_disk.c
index 732b35dc015..56b3b2f4957 100644
--- a/sys/geom/geom_disk.c
+++ b/sys/geom/geom_disk.c
@@ -66,6 +66,7 @@ struct g_disk_softc {
 	struct sysctl_oid	*sysctl_tree;
 	char			led[64];
 	uint32_t		state;
+	struct mtx		 start_mtx;
 };
 
 static g_access_t g_disk_access;
@@ -90,22 +91,6 @@ static SYSCTL_NODE(_kern_geom, OID_AUTO, disk, CTLFLAG_RW, 0,
 
 DECLARE_GEOM_CLASS(g_disk_class, g_disk);
 
-static void __inline
-g_disk_lock_giant(struct disk *dp)
-{
-
-	if (dp->d_flags & DISKFLAG_NEEDSGIANT)
-		mtx_lock(&Giant);
-}
-
-static void __inline
-g_disk_unlock_giant(struct disk *dp)
-{
-
-	if (dp->d_flags & DISKFLAG_NEEDSGIANT)
-		mtx_unlock(&Giant);
-}
-
 static int
 g_disk_access(struct g_provider *pp, int r, int w, int e)
 {
@@ -132,12 +117,10 @@ g_disk_access(struct g_provider *pp, int r, int w, int e)
 	error = 0;
 	if ((pp->acr + pp->acw + pp->ace) == 0 && (r + w + e) > 0) {
 		if (dp->d_open != NULL) {
-			g_disk_lock_giant(dp);
 			error = dp->d_open(dp);
 			if (bootverbose && error != 0)
 				printf("Opened disk %s -> %d\n",
 				    pp->name, error);
-			g_disk_unlock_giant(dp);
 			if (error != 0)
 				return (error);
 		}
@@ -160,12 +143,10 @@ g_disk_access(struct g_provider *pp, int r, int w, int e)
 		dp->d_flags |= DISKFLAG_OPEN;
 	} else if ((pp->acr + pp->acw + pp->ace) > 0 && (r + w + e) == 0) {
 		if (dp->d_close != NULL) {
-			g_disk_lock_giant(dp);
 			error = dp->d_close(dp);
 			if (error != 0)
 				printf("Closed disk %s -> %d\n",
 				    pp->name, error);
-			g_disk_unlock_giant(dp);
 		}
 		sc->state = G_STATE_ACTIVE;
 		if (sc->led[0] != 0)
@@ -229,6 +210,7 @@ g_disk_setstate(struct bio *bp, struct g_disk_softc *sc)
 static void
 g_disk_done(struct bio *bp)
 {
+	struct bintime now;
 	struct bio *bp2;
 	struct g_disk_softc *sc;
 
@@ -237,19 +219,40 @@ g_disk_done(struct bio *bp)
 	bp2 = bp->bio_parent;
 	sc = bp2->bio_to->private;
 	bp->bio_completed = bp->bio_length - bp->bio_resid;
+	binuptime(&now);
 	mtx_lock(&sc->done_mtx);
 	if (bp2->bio_error == 0)
 		bp2->bio_error = bp->bio_error;
 	bp2->bio_completed += bp->bio_completed;
 	if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) != 0)
-		devstat_end_transaction_bio(sc->dp->d_devstat, bp);
-	g_destroy_bio(bp);
+		devstat_end_transaction_bio_bt(sc->dp->d_devstat, bp, &now);
 	bp2->bio_inbed++;
 	if (bp2->bio_children == bp2->bio_inbed) {
+		mtx_unlock(&sc->done_mtx);
 		bp2->bio_resid = bp2->bio_bcount - bp2->bio_completed;
 		g_io_deliver(bp2, bp2->bio_error);
+	} else
+		mtx_unlock(&sc->done_mtx);
+	g_destroy_bio(bp);
+}
+
+static void
+g_disk_done_single(struct bio *bp)
+{
+	struct bintime now;
+	struct g_disk_softc *sc;
+
+	bp->bio_completed = bp->bio_length - bp->bio_resid;
+	bp->bio_done = (void *)bp->bio_to;
+	bp->bio_to = LIST_FIRST(&bp->bio_disk->d_geom->provider);
+	if ((bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) != 0) {
+		binuptime(&now);
+		sc = bp->bio_to->private;
+		mtx_lock(&sc->done_mtx);
+		devstat_end_transaction_bio_bt(sc->dp->d_devstat, bp, &now);
+		mtx_unlock(&sc->done_mtx);
 	}
-	mtx_unlock(&sc->done_mtx);
+	g_io_deliver(bp, bp->bio_error);
 }
 
 static int
@@ -264,9 +267,7 @@ g_disk_ioctl(struct g_provider *pp, u_long cmd, void * data, int fflag, struct t
 
 	if (dp->d_ioctl == NULL)
 		return (ENOIOCTL);
-	g_disk_lock_giant(dp);
 	error = dp->d_ioctl(dp, cmd, data, fflag, td);
-	g_disk_unlock_giant(dp);
 	return (error);
 }
 
@@ -277,7 +278,7 @@ g_disk_start(struct bio *bp)
 	struct disk *dp;
 	struct g_disk_softc *sc;
 	int error;
-	off_t off;
+	off_t d_maxsize, off;
 
 	sc = bp->bio_to->private;
 	if (sc == NULL || (dp = sc->dp) == NULL || dp->d_destroyed) {
@@ -294,6 +295,20 @@ g_disk_start(struct bio *bp)
 		/* fall-through */
 	case BIO_READ:
 	case BIO_WRITE:
+		d_maxsize = (bp->bio_cmd == BIO_DELETE) ?
+		    dp->d_delmaxsize : dp->d_maxsize;
+		if (bp->bio_length <= d_maxsize) {
+			bp->bio_disk = dp;
+			bp->bio_to = (void *)bp->bio_done;
+			bp->bio_done = g_disk_done_single;
+			bp->bio_pblkno = bp->bio_offset / dp->d_sectorsize;
+			bp->bio_bcount = bp->bio_length;
+			mtx_lock(&sc->start_mtx);
+			devstat_start_transaction_bio(dp->d_devstat, bp);
+			mtx_unlock(&sc->start_mtx);
+			dp->d_strategy(bp);
+			break;
+		}
 		off = 0;
 		bp3 = NULL;
 		bp2 = g_clone_bio(bp);
@@ -302,10 +317,6 @@ g_disk_start(struct bio *bp)
 			break;
 		}
 		do {
-			off_t d_maxsize;
-
-			d_maxsize = (bp->bio_cmd == BIO_DELETE) ?
-			    dp->d_delmaxsize : dp->d_maxsize;
 			bp2->bio_offset += off;
 			bp2->bio_length -= off;
 			if ((bp->bio_flags & BIO_UNMAPPED) == 0) {
@@ -346,10 +357,10 @@ g_disk_start(struct bio *bp)
 			bp2->bio_pblkno = bp2->bio_offset / dp->d_sectorsize;
 			bp2->bio_bcount = bp2->bio_length;
 			bp2->bio_disk = dp;
+			mtx_lock(&sc->start_mtx); 
 			devstat_start_transaction_bio(dp->d_devstat, bp2);
-			g_disk_lock_giant(dp);
+			mtx_unlock(&sc->start_mtx); 
 			dp->d_strategy(bp2);
-			g_disk_unlock_giant(dp);
 			bp2 = bp3;
 			bp3 = NULL;
 		} while (bp2 != NULL);
@@ -376,22 +387,25 @@ g_disk_start(struct bio *bp)
 			break;
 		else if (g_handleattr_str(bp, "GEOM::ident", dp->d_ident))
 			break;
-		else if (g_handleattr(bp, "GEOM::hba_vendor",
-		    &dp->d_hba_vendor, 2))
+		else if (g_handleattr_uint16_t(bp, "GEOM::hba_vendor",
+		    dp->d_hba_vendor))
 			break;
-		else if (g_handleattr(bp, "GEOM::hba_device",
-		    &dp->d_hba_device, 2))
+		else if (g_handleattr_uint16_t(bp, "GEOM::hba_device",
+		    dp->d_hba_device))
 			break;
-		else if (g_handleattr(bp, "GEOM::hba_subvendor",
-		    &dp->d_hba_subvendor, 2))
+		else if (g_handleattr_uint16_t(bp, "GEOM::hba_subvendor",
+		    dp->d_hba_subvendor))
 			break;
-		else if (g_handleattr(bp, "GEOM::hba_subdevice",
-		    &dp->d_hba_subdevice, 2))
+		else if (g_handleattr_uint16_t(bp, "GEOM::hba_subdevice",
+		    dp->d_hba_subdevice))
 			break;
 		else if (!strcmp(bp->bio_attribute, "GEOM::kerneldump"))
 			g_disk_kerneldump(bp, dp);
 		else if (!strcmp(bp->bio_attribute, "GEOM::setstate"))
 			g_disk_setstate(bp, sc);
+		else if (g_handleattr_uint16_t(bp, "GEOM::rotation_rate",
+		    dp->d_rotation_rate))
+			break;
 		else 
 			error = ENOIOCTL;
 		break;
@@ -402,16 +416,10 @@ g_disk_start(struct bio *bp)
 			error = EOPNOTSUPP;
 			break;
 		}
-		bp2 = g_clone_bio(bp);
-		if (bp2 == NULL) {
-			g_io_deliver(bp, ENOMEM);
-			return;
-		}
-		bp2->bio_done = g_disk_done;
-		bp2->bio_disk = dp;
-		g_disk_lock_giant(dp);
-		dp->d_strategy(bp2);
-		g_disk_unlock_giant(dp);
+		bp->bio_disk = dp;
+		bp->bio_to = (void *)bp->bio_done;
+		bp->bio_done = g_disk_done_single;
+		dp->d_strategy(bp);
 		break;
 	default:
 		error = EOPNOTSUPP;
@@ -452,26 +460,36 @@ g_disk_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, struct g
 			bp->bio_length = DISK_IDENT_SIZE;
 			bp->bio_data = buf;
 			res = dp->d_getattr(bp);
-			sbuf_printf(sb, "%s<ident>%s</ident>\n", indent,
+			sbuf_printf(sb, "%s<ident>", indent);
+			g_conf_printf_escaped(sb, "%s",
 			    res == 0 ? buf: dp->d_ident);
+			sbuf_printf(sb, "</ident>\n");
 			bp->bio_attribute = "GEOM::lunid";
 			bp->bio_length = DISK_IDENT_SIZE;
 			bp->bio_data = buf;
-			if (dp->d_getattr(bp) == 0)
-				sbuf_printf(sb, "%s<lunid>%s</lunid>\n",
-				    indent, buf);
+			if (dp->d_getattr(bp) == 0) {
+				sbuf_printf(sb, "%s<lunid>", indent);
+				g_conf_printf_escaped(sb, "%s", buf);
+				sbuf_printf(sb, "</lunid>\n");
+			}
 			bp->bio_attribute = "GEOM::lunname";
 			bp->bio_length = DISK_IDENT_SIZE;
 			bp->bio_data = buf;
-			if (dp->d_getattr(bp) == 0)
-				sbuf_printf(sb, "%s<lunname>%s</lunname>\n",
-				    indent, buf);
+			if (dp->d_getattr(bp) == 0) {
+				sbuf_printf(sb, "%s<lunname>", indent);
+				g_conf_printf_escaped(sb, "%s", buf);
+				sbuf_printf(sb, "</lunname>\n");
+			}
 			g_destroy_bio(bp);
 			g_free(buf);
-		} else
-			sbuf_printf(sb, "%s<ident>%s</ident>\n", indent,
-			    dp->d_ident);
-		sbuf_printf(sb, "%s<descr>%s</descr>\n", indent, dp->d_descr);
+		} else {
+			sbuf_printf(sb, "%s<ident>", indent);
+			g_conf_printf_escaped(sb, "%s", dp->d_ident);
+			sbuf_printf(sb, "</ident>\n");
+		}
+		sbuf_printf(sb, "%s<descr>", indent);
+		g_conf_printf_escaped(sb, "%s", dp->d_descr);
+		sbuf_printf(sb, "</descr>\n");
 	}
 }
 
@@ -515,17 +533,24 @@ g_disk_create(void *arg, int flag)
 	g_topology_assert();
 	dp = arg;
 	sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO);
+	mtx_init(&sc->start_mtx, "g_disk_start", NULL, MTX_DEF);
 	mtx_init(&sc->done_mtx, "g_disk_done", NULL, MTX_DEF);
 	sc->dp = dp;
 	gp = g_new_geomf(&g_disk_class, "%s%d", dp->d_name, dp->d_unit);
 	gp->softc = sc;
 	pp = g_new_providerf(gp, "%s", gp->name);
+	devstat_remove_entry(pp->stat);
+	pp->stat = NULL;
+	dp->d_devstat->id = pp;
 	pp->mediasize = dp->d_mediasize;
 	pp->sectorsize = dp->d_sectorsize;
 	pp->stripeoffset = dp->d_stripeoffset;
 	pp->stripesize = dp->d_stripesize;
 	if ((dp->d_flags & DISKFLAG_UNMAPPED_BIO) != 0)
 		pp->flags |= G_PF_ACCEPT_UNMAPPED;
+	if ((dp->d_flags & DISKFLAG_DIRECT_COMPLETION) != 0)
+		pp->flags |= G_PF_DIRECT_SEND;
+	pp->flags |= G_PF_DIRECT_RECEIVE;
 	if (bootverbose)
 		printf("GEOM: new disk %s\n", gp->name);
 	sysctl_ctx_init(&sc->sysctl_ctx);
@@ -574,6 +599,7 @@ g_disk_providergone(struct g_provider *pp)
 	pp->private = NULL;
 	pp->geom->softc = NULL;
 	mtx_destroy(&sc->done_mtx);
+	mtx_destroy(&sc->start_mtx);
 	g_free(sc);
 }
 
@@ -641,6 +667,13 @@ disk_create(struct disk *dp, int version)
 		    dp->d_name, dp->d_unit);
 		return;
 	}
+	if (dp->d_flags & DISKFLAG_RESERVED) {
+		printf("WARNING: Attempt to add non-MPSAFE disk %s%d\n",
+		    dp->d_name, dp->d_unit);
+		printf("WARNING: Ignoring disk %s%d\n",
+		    dp->d_name, dp->d_unit);
+		return;
+	}
 	KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy"));
 	KASSERT(dp->d_name != NULL, ("disk_create need d_name"));
 	KASSERT(*dp->d_name != 0, ("disk_create need d_name"));
diff --git a/sys/geom/geom_disk.h b/sys/geom/geom_disk.h
index 852047bae43..4cf53c4e5d0 100644
--- a/sys/geom/geom_disk.h
+++ b/sys/geom/geom_disk.h
@@ -97,16 +97,18 @@ struct disk {
 	uint16_t		d_hba_device;
 	uint16_t		d_hba_subvendor;
 	uint16_t		d_hba_subdevice;
+	uint16_t		d_rotation_rate;
 
 	/* Fields private to the driver */
 	void			*d_drv1;
 };
 
-#define DISKFLAG_NEEDSGIANT	0x1
+#define DISKFLAG_RESERVED	0x1	/* Was NEEDSGIANT */
 #define DISKFLAG_OPEN		0x2
 #define DISKFLAG_CANDELETE	0x4
 #define DISKFLAG_CANFLUSHCACHE	0x8
 #define	DISKFLAG_UNMAPPED_BIO	0x10
+#define	DISKFLAG_DIRECT_COMPLETION	0x20
 
 struct disk *disk_alloc(void);
 void disk_create(struct disk *disk, int version);
@@ -121,7 +123,8 @@ int disk_resize(struct disk *dp, int flag);
 #define DISK_VERSION_01		0x5856105a
 #define DISK_VERSION_02		0x5856105b
 #define DISK_VERSION_03		0x5856105c
-#define DISK_VERSION		DISK_VERSION_03
+#define DISK_VERSION_04		0x5856105d
+#define DISK_VERSION		DISK_VERSION_04
 
 #endif /* _KERNEL */
 #endif /* _GEOM_GEOM_DISK_H_ */
diff --git a/sys/geom/geom_dump.c b/sys/geom/geom_dump.c
index 3466a0f647d..8aaab0f2397 100644
--- a/sys/geom/geom_dump.c
+++ b/sys/geom/geom_dump.c
@@ -154,25 +154,28 @@ g_conftxt(void *p, int flag)
 }
 
 
-static void
-g_conf_print_escaped(struct sbuf *sb, const char *fmt, const char *str)
+void
+g_conf_printf_escaped(struct sbuf *sb, const char *fmt, ...)
 {
 	struct sbuf *s;
 	const u_char *c;
+	va_list ap;
 
 	s = sbuf_new_auto();
+	va_start(ap, fmt);
+	sbuf_vprintf(s, fmt, ap);
+	va_end(ap);
+	sbuf_finish(s);
 
-	for (c = str; *c != '\0'; c++) {
+	for (c = sbuf_data(s); *c != '\0'; c++) {
 		if (*c == '&' || *c == '<' || *c == '>' ||
 		    *c == '\'' || *c == '"' || *c > 0x7e)
-			sbuf_printf(s, "&#x%X;", *c);
+			sbuf_printf(sb, "&#x%X;", *c);
 		else if (*c == '\t' || *c == '\n' || *c == '\r' || *c > 0x1f)
-			sbuf_putc(s, *c);
+			sbuf_putc(sb, *c);
 		else
-			sbuf_putc(s, '?');
+			sbuf_putc(sb, '?');
 	}
-	sbuf_finish(s);
-	sbuf_printf(sb, fmt, sbuf_data(s));
 	sbuf_delete(s);
 }
 
@@ -204,7 +207,9 @@ g_conf_provider(struct sbuf *sb, struct g_provider *pp)
 	sbuf_printf(sb, "\t  <geom ref=\"%p\"/>\n", pp->geom);
 	sbuf_printf(sb, "\t  <mode>r%dw%de%d</mode>\n",
 	    pp->acr, pp->acw, pp->ace);
-	g_conf_print_escaped(sb, "\t  <name>%s</name>\n", pp->name);
+	sbuf_printf(sb, "\t  <name>");
+	g_conf_printf_escaped(sb, "%s", pp->name);
+	sbuf_printf(sb, "</name>\n");
 	sbuf_printf(sb, "\t  <mediasize>%jd</mediasize>\n",
 	    (intmax_t)pp->mediasize);
 	sbuf_printf(sb, "\t  <sectorsize>%u</sectorsize>\n", pp->sectorsize);
@@ -229,7 +234,9 @@ g_conf_geom(struct sbuf *sb, struct g_geom *gp, struct g_provider *pp, struct g_
 
 	sbuf_printf(sb, "    <geom id=\"%p\">\n", gp);
 	sbuf_printf(sb, "      <class ref=\"%p\"/>\n", gp->class);
-	g_conf_print_escaped(sb, "      <name>%s</name>\n", gp->name);
+	sbuf_printf(sb, "      <name>");
+	g_conf_printf_escaped(sb, "%s", gp->name);
+	sbuf_printf(sb, "</name>\n");
 	sbuf_printf(sb, "      <rank>%d</rank>\n", gp->rank);
 	if (gp->flags & G_GEOM_WITHER)
 		sbuf_printf(sb, "      <wither/>\n");
@@ -258,7 +265,9 @@ g_conf_class(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g_pr
 	struct g_geom *gp2;
 
 	sbuf_printf(sb, "  <class id=\"%p\">\n", mp);
-	g_conf_print_escaped(sb, "    <name>%s</name>\n", mp->name);
+	sbuf_printf(sb, "    <name>");
+	g_conf_printf_escaped(sb, "%s", mp->name);
+	sbuf_printf(sb, "</name>\n");
 	LIST_FOREACH(gp2, &mp->geom, geom) {
 		if (gp != NULL && gp != gp2)
 			continue;
diff --git a/sys/geom/geom_int.h b/sys/geom/geom_int.h
index 149a283c656..d5af866e445 100644
--- a/sys/geom/geom_int.h
+++ b/sys/geom/geom_int.h
@@ -39,6 +39,9 @@ LIST_HEAD(class_list_head, g_class);
 TAILQ_HEAD(g_tailq_head, g_geom);
 
 extern int g_collectstats;
+#define G_STATS_PROVIDERS	1	/* Collect I/O stats for providers */
+#define G_STATS_CONSUMERS	2	/* Collect I/O stats for consumers */
+
 extern int g_debugflags;
 /*
  * 1	G_T_TOPOLOGY
@@ -54,6 +57,7 @@ extern int g_debugflags;
 /* geom_dump.c */
 void g_confxml(void *, int flag);
 void g_conf_specific(struct sbuf *sb, struct g_class *mp, struct g_geom *gp, struct g_provider *pp, struct g_consumer *cp);
+void g_conf_printf_escaped(struct sbuf *sb, const char *fmt, ...);
 void g_confdot(void *, int flag);
 void g_conftxt(void *, int flag);
 
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c
index 0e79920f2de..0b8e118a694 100644
--- a/sys/geom/geom_io.c
+++ b/sys/geom/geom_io.c
@@ -65,6 +65,8 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 #include <vm/vm_map.h>
 
+static int	g_io_transient_map_bio(struct bio *bp);
+
 static struct g_bioq g_bio_run_down;
 static struct g_bioq g_bio_run_up;
 static struct g_bioq g_bio_run_task;
@@ -310,6 +312,8 @@ g_io_check(struct bio *bp)
 {
 	struct g_consumer *cp;
 	struct g_provider *pp;
+	off_t excess;
+	int error;
 
 	cp = bp->bio_from;
 	pp = bp->bio_to;
@@ -354,11 +358,44 @@ g_io_check(struct bio *bp)
 			return (EIO);
 		if (bp->bio_offset > pp->mediasize)
 			return (EIO);
+
+		/* Truncate requests to the end of providers media. */
+		excess = bp->bio_offset + bp->bio_length;
+		if (excess > bp->bio_to->mediasize) {
+			KASSERT((bp->bio_flags & BIO_UNMAPPED) == 0 ||
+			    round_page(bp->bio_ma_offset +
+			    bp->bio_length) / PAGE_SIZE == bp->bio_ma_n,
+			    ("excess bio %p too short", bp));
+			excess -= bp->bio_to->mediasize;
+			bp->bio_length -= excess;
+			if ((bp->bio_flags & BIO_UNMAPPED) != 0) {
+				bp->bio_ma_n = round_page(bp->bio_ma_offset +
+				    bp->bio_length) / PAGE_SIZE;
+			}
+			if (excess > 0)
+				CTR3(KTR_GEOM, "g_down truncated bio "
+				    "%p provider %s by %d", bp,
+				    bp->bio_to->name, excess);
+		}
+
+		/* Deliver zero length transfers right here. */
+		if (bp->bio_length == 0) {
+			CTR2(KTR_GEOM, "g_down terminated 0-length "
+			    "bp %p provider %s", bp, bp->bio_to->name);
+			return (0);
+		}
+
+		if ((bp->bio_flags & BIO_UNMAPPED) != 0 &&
+		    (bp->bio_to->flags & G_PF_ACCEPT_UNMAPPED) == 0 &&
+		    (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE)) {
+			if ((error = g_io_transient_map_bio(bp)) >= 0)
+				return (error);
+		}
 		break;
 	default:
 		break;
 	}
-	return (0);
+	return (EJUSTRETURN);
 }
 
 /*
@@ -422,7 +459,8 @@ void
 g_io_request(struct bio *bp, struct g_consumer *cp)
 {
 	struct g_provider *pp;
-	int first;
+	struct mtx *mtxp;
+	int direct, error, first;
 
 	KASSERT(cp != NULL, ("NULL cp in g_io_request"));
 	KASSERT(bp != NULL, ("NULL bp in g_io_request"));
@@ -472,48 +510,81 @@ g_io_request(struct bio *bp, struct g_consumer *cp)
 
 	KASSERT(!(bp->bio_flags & BIO_ONQUEUE),
 	    ("Bio already on queue bp=%p", bp));
-	bp->bio_flags |= BIO_ONQUEUE;
-
-	if (g_collectstats)
+	if ((g_collectstats & G_STATS_CONSUMERS) != 0 ||
+	    ((g_collectstats & G_STATS_PROVIDERS) != 0 && pp->stat != NULL))
 		binuptime(&bp->bio_t0);
 	else
 		getbinuptime(&bp->bio_t0);
 
+#ifdef GET_STACK_USAGE
+	direct = (cp->flags & G_CF_DIRECT_SEND) &&
+		 (pp->flags & G_PF_DIRECT_RECEIVE) &&
+		 !g_is_geom_thread(curthread) &&
+		 (((pp->flags & G_PF_ACCEPT_UNMAPPED) == 0 &&
+		   (bp->bio_flags & BIO_UNMAPPED) != 0) || THREAD_CAN_SLEEP());
+	if (direct) {
+		/* Block direct execution if less then half of stack left. */
+		size_t	st, su;
+		GET_STACK_USAGE(st, su);
+		if (su * 2 > st)
+			direct = 0;
+	}
+#else
+	direct = 0;
+#endif
+
+	if (!TAILQ_EMPTY(&g_classifier_tailq) && !bp->bio_classifier1) {
+		g_bioq_lock(&g_bio_run_down);
+		g_run_classifiers(bp);
+		g_bioq_unlock(&g_bio_run_down);
+	}
+
 	/*
 	 * The statistics collection is lockless, as such, but we
 	 * can not update one instance of the statistics from more
 	 * than one thread at a time, so grab the lock first.
-	 *
-	 * We also use the lock to protect the list of classifiers.
 	 */
-	g_bioq_lock(&g_bio_run_down);
-
-	if (!TAILQ_EMPTY(&g_classifier_tailq) && !bp->bio_classifier1)
-		g_run_classifiers(bp);
-
-	if (g_collectstats & 1)
+	mtxp = mtx_pool_find(mtxpool_sleep, pp);
+	mtx_lock(mtxp);
+	if (g_collectstats & G_STATS_PROVIDERS)
 		devstat_start_transaction(pp->stat, &bp->bio_t0);
-	if (g_collectstats & 2)
+	if (g_collectstats & G_STATS_CONSUMERS)
 		devstat_start_transaction(cp->stat, &bp->bio_t0);
-
 	pp->nstart++;
 	cp->nstart++;
-	first = TAILQ_EMPTY(&g_bio_run_down.bio_queue);
-	TAILQ_INSERT_TAIL(&g_bio_run_down.bio_queue, bp, bio_queue);
-	g_bio_run_down.bio_queue_length++;
-	g_bioq_unlock(&g_bio_run_down);
+	mtx_unlock(mtxp);
 
-	/* Pass it on down. */
-	if (first)
-		wakeup(&g_wait_down);
+	if (direct) {
+		error = g_io_check(bp);
+		if (error >= 0) {
+			CTR3(KTR_GEOM, "g_io_request g_io_check on bp %p "
+			    "provider %s returned %d", bp, bp->bio_to->name,
+			    error);
+			g_io_deliver(bp, error);
+			return;
+		}
+		bp->bio_to->geom->start(bp);
+	} else {
+		g_bioq_lock(&g_bio_run_down);
+		first = TAILQ_EMPTY(&g_bio_run_down.bio_queue);
+		TAILQ_INSERT_TAIL(&g_bio_run_down.bio_queue, bp, bio_queue);
+		bp->bio_flags |= BIO_ONQUEUE;
+		g_bio_run_down.bio_queue_length++;
+		g_bioq_unlock(&g_bio_run_down);
+		/* Pass it on down. */
+		if (first)
+			wakeup(&g_wait_down);
+	}
 }
 
 void
 g_io_deliver(struct bio *bp, int error)
 {
+	struct bintime now;
 	struct g_consumer *cp;
 	struct g_provider *pp;
-	int first;
+	struct mtx *mtxp;
+	int direct, first;
 
 	KASSERT(bp != NULL, ("NULL bp in g_io_deliver"));
 	pp = bp->bio_to;
@@ -559,31 +630,55 @@ g_io_deliver(struct bio *bp, int error)
 	bp->bio_bcount = bp->bio_length;
 	bp->bio_resid = bp->bio_bcount - bp->bio_completed;
 
+#ifdef GET_STACK_USAGE
+	direct = (pp->flags & G_PF_DIRECT_SEND) &&
+		 (cp->flags & G_CF_DIRECT_RECEIVE) &&
+		 !g_is_geom_thread(curthread);
+	if (direct) {
+		/* Block direct execution if less then half of stack left. */
+		size_t	st, su;
+		GET_STACK_USAGE(st, su);
+		if (su * 2 > st)
+			direct = 0;
+	}
+#else
+	direct = 0;
+#endif
+
 	/*
 	 * The statistics collection is lockless, as such, but we
 	 * can not update one instance of the statistics from more
 	 * than one thread at a time, so grab the lock first.
 	 */
-	g_bioq_lock(&g_bio_run_up);
-	if (g_collectstats & 1)
-		devstat_end_transaction_bio(pp->stat, bp);
-	if (g_collectstats & 2)
-		devstat_end_transaction_bio(cp->stat, bp);
-
+	if ((g_collectstats & G_STATS_CONSUMERS) != 0 ||
+	    ((g_collectstats & G_STATS_PROVIDERS) != 0 && pp->stat != NULL))
+		binuptime(&now);
+	mtxp = mtx_pool_find(mtxpool_sleep, cp);
+	mtx_lock(mtxp);
+	if (g_collectstats & G_STATS_PROVIDERS)
+		devstat_end_transaction_bio_bt(pp->stat, bp, &now);
+	if (g_collectstats & G_STATS_CONSUMERS)
+		devstat_end_transaction_bio_bt(cp->stat, bp, &now);
 	cp->nend++;
 	pp->nend++;
+	mtx_unlock(mtxp);
+
 	if (error != ENOMEM) {
 		bp->bio_error = error;
-		first = TAILQ_EMPTY(&g_bio_run_up.bio_queue);
-		TAILQ_INSERT_TAIL(&g_bio_run_up.bio_queue, bp, bio_queue);
-		bp->bio_flags |= BIO_ONQUEUE;
-		g_bio_run_up.bio_queue_length++;
-		g_bioq_unlock(&g_bio_run_up);
-		if (first)
-			wakeup(&g_wait_up);
+		if (direct) {
+			biodone(bp);
+		} else {
+			g_bioq_lock(&g_bio_run_up);
+			first = TAILQ_EMPTY(&g_bio_run_up.bio_queue);
+			TAILQ_INSERT_TAIL(&g_bio_run_up.bio_queue, bp, bio_queue);
+			bp->bio_flags |= BIO_ONQUEUE;
+			g_bio_run_up.bio_queue_length++;
+			g_bioq_unlock(&g_bio_run_up);
+			if (first)
+				wakeup(&g_wait_up);
+		}
 		return;
 	}
-	g_bioq_unlock(&g_bio_run_up);
 
 	if (bootverbose)
 		printf("ENOMEM %p on %p(%s)\n", bp, pp, pp->name);
@@ -639,11 +734,10 @@ retry:
 	if (vmem_alloc(transient_arena, size, M_BESTFIT | M_NOWAIT, &addr)) {
 		if (transient_map_retries != 0 &&
 		    retried >= transient_map_retries) {
-			g_io_deliver(bp, EDEADLK/* XXXKIB */);
 			CTR2(KTR_GEOM, "g_down cannot map bp %p provider %s",
 			    bp, bp->bio_to->name);
 			atomic_add_int(&transient_map_hard_failures, 1);
-			return (1);
+			return (EDEADLK/* XXXKIB */);
 		} else {
 			/*
 			 * Naive attempt to quisce the I/O to get more
@@ -663,14 +757,13 @@ retry:
 	bp->bio_data = (caddr_t)addr + bp->bio_ma_offset;
 	bp->bio_flags |= BIO_TRANSIENT_MAPPING;
 	bp->bio_flags &= ~BIO_UNMAPPED;
-	return (0);
+	return (EJUSTRETURN);
 }
 
 void
 g_io_schedule_down(struct thread *tp __unused)
 {
 	struct bio *bp;
-	off_t excess;
 	int error;
 
 	for(;;) {
@@ -689,59 +782,15 @@ g_io_schedule_down(struct thread *tp __unused)
 			pause("g_down", hz/10);
 			pace--;
 		}
+		CTR2(KTR_GEOM, "g_down processing bp %p provider %s", bp,
+		    bp->bio_to->name);
 		error = g_io_check(bp);
-		if (error) {
+		if (error >= 0) {
 			CTR3(KTR_GEOM, "g_down g_io_check on bp %p provider "
 			    "%s returned %d", bp, bp->bio_to->name, error);
 			g_io_deliver(bp, error);
 			continue;
 		}
-		CTR2(KTR_GEOM, "g_down processing bp %p provider %s", bp,
-		    bp->bio_to->name);
-		switch (bp->bio_cmd) {
-		case BIO_READ:
-		case BIO_WRITE:
-		case BIO_DELETE:
-			/* Truncate requests to the end of providers media. */
-			/*
-			 * XXX: What if we truncate because of offset being
-			 * bad, not length?
-			 */
-			excess = bp->bio_offset + bp->bio_length;
-			if (excess > bp->bio_to->mediasize) {
-				KASSERT((bp->bio_flags & BIO_UNMAPPED) == 0 ||
-				    round_page(bp->bio_ma_offset +
-				    bp->bio_length) / PAGE_SIZE == bp->bio_ma_n,
-				    ("excess bio %p too short", bp));
-				excess -= bp->bio_to->mediasize;
-				bp->bio_length -= excess;
-				if ((bp->bio_flags & BIO_UNMAPPED) != 0) {
-					bp->bio_ma_n = round_page(
-					    bp->bio_ma_offset +
-					    bp->bio_length) / PAGE_SIZE;
-				}
-				if (excess > 0)
-					CTR3(KTR_GEOM, "g_down truncated bio "
-					    "%p provider %s by %d", bp,
-					    bp->bio_to->name, excess);
-			}
-			/* Deliver zero length transfers right here. */
-			if (bp->bio_length == 0) {
-				g_io_deliver(bp, 0);
-				CTR2(KTR_GEOM, "g_down terminated 0-length "
-				    "bp %p provider %s", bp, bp->bio_to->name);
-				continue;
-			}
-			break;
-		default:
-			break;
-		}
-		if ((bp->bio_flags & BIO_UNMAPPED) != 0 &&
-		    (bp->bio_to->flags & G_PF_ACCEPT_UNMAPPED) == 0 &&
-		    (bp->bio_cmd == BIO_READ || bp->bio_cmd == BIO_WRITE)) {
-			if (g_io_transient_map_bio(bp))
-				continue;
-		}
 		THREAD_NO_SLEEPING();
 		CTR4(KTR_GEOM, "g_down starting bp %p provider %s off %ld "
 		    "len %ld", bp, bp->bio_to->name, bp->bio_offset,
diff --git a/sys/geom/geom_kern.c b/sys/geom/geom_kern.c
index 2e65bfbcd9b..79afb14abe9 100644
--- a/sys/geom/geom_kern.c
+++ b/sys/geom/geom_kern.c
@@ -124,6 +124,13 @@ g_event_procbody(void *arg)
 	/* NOTREACHED */
 }
 
+int
+g_is_geom_thread(struct thread *td)
+{
+
+	return (td == g_up_td || td == g_down_td || td == g_event_td);
+}
+
 static void
 geom_shutdown(void *foo __unused)
 {
diff --git a/sys/geom/geom_slice.c b/sys/geom/geom_slice.c
index 0f12a0ab642..f40a4de129e 100644
--- a/sys/geom/geom_slice.c
+++ b/sys/geom/geom_slice.c
@@ -382,7 +382,7 @@ g_slice_config(struct g_geom *gp, u_int idx, int how, off_t offset, off_t length
 			printf("GEOM: Reconfigure %s, start %jd length %jd end %jd\n",
 			    pp->name, (intmax_t)offset, (intmax_t)length,
 			    (intmax_t)(offset + length - 1));
-		pp->mediasize = gsl->length;
+		g_resize_provider(pp, gsl->length);
 		return (0);
 	}
 	sb = sbuf_new_auto();
@@ -396,8 +396,10 @@ g_slice_config(struct g_geom *gp, u_int idx, int how, off_t offset, off_t length
 	pp->stripeoffset = pp2->stripeoffset + offset;
 	if (pp->stripesize > 0)
 		pp->stripeoffset %= pp->stripesize;
-	if (gsp->nhotspot == 0)
+	if (gsp->nhotspot == 0) {
 		pp->flags |= pp2->flags & G_PF_ACCEPT_UNMAPPED;
+		pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
+	}
 	if (0 && bootverbose)
 		printf("GEOM: Configure %s, start %jd length %jd end %jd\n",
 		    pp->name, (intmax_t)offset, (intmax_t)length,
@@ -430,16 +432,20 @@ g_slice_conf_hot(struct g_geom *gp, u_int idx, off_t offset, off_t length, int r
 {
 	struct g_slicer *gsp;
 	struct g_slice_hot *gsl, *gsl2;
+	struct g_consumer *cp;
 	struct g_provider *pp;
 
 	g_trace(G_T_TOPOLOGY, "g_slice_conf_hot(%s, idx: %d, off: %jd, len: %jd)",
 	    gp->name, idx, (intmax_t)offset, (intmax_t)length);
 	g_topology_assert();
 	gsp = gp->softc;
-	/* Deny unmapped I/O if hotspots are used. */
+	/* Deny unmapped I/O and direct dispatch if hotspots are used. */
 	if (gsp->nhotspot == 0) {
 		LIST_FOREACH(pp, &gp->provider, provider)
-			pp->flags &= ~G_PF_ACCEPT_UNMAPPED;
+			pp->flags &= ~(G_PF_ACCEPT_UNMAPPED |
+			    G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE);
+		LIST_FOREACH(cp, &gp->consumer, consumer)
+			cp->flags &= ~(G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE);
 	}
 	gsl = gsp->hotspot;
 	if(idx >= gsp->nhotspot) {
@@ -511,6 +517,7 @@ g_slice_new(struct g_class *mp, u_int slices, struct g_provider *pp, struct g_co
 	if (gp->class->destroy_geom == NULL)
 		gp->class->destroy_geom = g_slice_destroy_geom;
 	cp = g_new_consumer(gp);
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	error = g_attach(cp, pp);
 	if (error == 0)
 		error = g_access(cp, 1, 0, 0);
diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c
index ecbf0b811d9..dd8c4ab2ab2 100644
--- a/sys/geom/geom_subr.c
+++ b/sys/geom/geom_subr.c
@@ -950,6 +950,13 @@ g_handleattr_int(struct bio *bp, const char *attribute, int val)
 	return (g_handleattr(bp, attribute, &val, sizeof val));
 }
 
+int
+g_handleattr_uint16_t(struct bio *bp, const char *attribute, uint16_t val)
+{
+
+	return (g_handleattr(bp, attribute, &val, sizeof val));
+}
+
 int
 g_handleattr_off_t(struct bio *bp, const char *attribute, off_t val)
 {
diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c
index 92f1ad2f509..eda4b75b089 100644
--- a/sys/geom/geom_vfs.c
+++ b/sys/geom/geom_vfs.c
@@ -102,14 +102,10 @@ g_vfs_done(struct bio *bip)
 	/*
 	 * Collect statistics on synchronous and asynchronous read
 	 * and write counts for disks that have associated filesystems.
-	 * Since this run by the g_up thread it is single threaded and
-	 * we do not need to use atomic increments on the counters.
 	 */
 	bp = bip->bio_caller2;
 	vp = bp->b_vp;
-	if (vp == NULL) {
-		mp = NULL;
-	} else {
+	if (vp != NULL) {
 		/*
 		 * If not a disk vnode, use its associated mount point
 		 * otherwise use the mountpoint associated with the disk.
@@ -122,20 +118,20 @@ g_vfs_done(struct bio *bip)
 			mp = vp->v_mount;
 		else
 			mp = cdevp->si_mountpt;
-		VI_UNLOCK(vp);
-	}
-	if (mp != NULL) {
-		if (bp->b_iocmd == BIO_WRITE) {
-			if (LK_HOLDER(bp->b_lock.lk_lock) == LK_KERNPROC)
-				mp->mnt_stat.f_asyncwrites++;
-			else
-				mp->mnt_stat.f_syncwrites++;
-		} else {
-			if (LK_HOLDER(bp->b_lock.lk_lock) == LK_KERNPROC)
-				mp->mnt_stat.f_asyncreads++;
-			else
-				mp->mnt_stat.f_syncreads++;
+		if (mp != NULL) {
+			if (bp->b_iocmd == BIO_READ) {
+				if (LK_HOLDER(bp->b_lock.lk_lock) == LK_KERNPROC)
+					mp->mnt_stat.f_asyncreads++;
+				else
+					mp->mnt_stat.f_syncreads++;
+			} else if (bp->b_iocmd == BIO_WRITE) {
+				if (LK_HOLDER(bp->b_lock.lk_lock) == LK_KERNPROC)
+					mp->mnt_stat.f_asyncwrites++;
+				else
+					mp->mnt_stat.f_syncwrites++;
+			}
 		}
+		VI_UNLOCK(vp);
 	}
 
 	cp = bip->bio_from;
@@ -260,6 +256,7 @@ g_vfs_open(struct vnode *vp, struct g_consumer **cpp, const char *fsname, int wr
 	vnode_create_vobject(vp, pp->mediasize, curthread);
 	*cpp = cp;
 	cp->private = vp;
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	bo->bo_ops = g_vfs_bufops;
 	bo->bo_private = cp;
 	bo->bo_bsize = pp->sectorsize;
diff --git a/sys/geom/label/g_label.c b/sys/geom/label/g_label.c
index 2011b770d7a..fc16f7fb4f6 100644
--- a/sys/geom/label/g_label.c
+++ b/sys/geom/label/g_label.c
@@ -124,6 +124,17 @@ g_label_spoiled(struct g_consumer *cp)
 	g_slice_spoiled(cp);
 }
 
+static void
+g_label_resize(struct g_consumer *cp)
+{
+
+	G_LABEL_DEBUG(1, "Label %s resized.",
+	    LIST_FIRST(&cp->geom->provider)->name);
+
+	g_slice_config(cp->geom, 0, G_SLICE_CONFIG_FORCE, (off_t)0,
+	    cp->provider->mediasize, cp->provider->sectorsize, "notused");
+}
+
 static int
 g_label_is_name_ok(const char *label)
 {
@@ -208,6 +219,7 @@ g_label_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp,
 	}
 	gp->orphan = g_label_orphan;
 	gp->spoiled = g_label_spoiled;
+	gp->resize = g_label_resize;
 	g_access(cp, -1, 0, 0);
 	g_slice_config(gp, 0, G_SLICE_CONFIG_SET, (off_t)0, mediasize,
 	    pp->sectorsize, "%s", name);
diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c
index 04233fec78e..37d52c52f94 100644
--- a/sys/geom/mirror/g_mirror.c
+++ b/sys/geom/mirror/g_mirror.c
@@ -87,6 +87,7 @@ static int g_mirror_shutdown = 0;
 static int g_mirror_destroy_geom(struct gctl_req *req, struct g_class *mp,
     struct g_geom *gp);
 static g_taste_t g_mirror_taste;
+static g_resize_t g_mirror_resize;
 static void g_mirror_init(struct g_class *mp);
 static void g_mirror_fini(struct g_class *mp);
 
@@ -97,7 +98,8 @@ struct g_class g_mirror_class = {
 	.taste = g_mirror_taste,
 	.destroy_geom = g_mirror_destroy_geom,
 	.init = g_mirror_init,
-	.fini = g_mirror_fini
+	.fini = g_mirror_fini,
+	.resize = g_mirror_resize
 };
 
 
@@ -394,6 +396,7 @@ g_mirror_connect_disk(struct g_mirror_disk *disk, struct g_provider *pp)
 
 	g_topology_lock();
 	cp = g_new_consumer(disk->d_softc->sc_geom);
+	cp->flags |= G_CF_DIRECT_RECEIVE;
 	error = g_attach(cp, pp);
 	if (error != 0) {
 		g_destroy_consumer(cp);
@@ -554,6 +557,7 @@ g_mirror_destroy_device(struct g_mirror_softc *sc)
 	g_topology_unlock();
 	mtx_destroy(&sc->sc_queue_mtx);
 	mtx_destroy(&sc->sc_events_mtx);
+	mtx_destroy(&sc->sc_done_mtx);
 	sx_xunlock(&sc->sc_lock);
 	sx_destroy(&sc->sc_lock);
 }
@@ -638,9 +642,17 @@ g_mirror_write_metadata(struct g_mirror_disk *disk,
 	length = cp->provider->sectorsize;
 	offset = cp->provider->mediasize - length;
 	sector = malloc((size_t)length, M_MIRROR, M_WAITOK | M_ZERO);
-	if (md != NULL)
-		mirror_metadata_encode(md, sector);
-	error = g_write_data(cp, offset, sector, length);
+	if (md != NULL) {
+		/*
+		 * Handle the case, when the size of parent provider reduced.
+		 */
+		if (offset < md->md_mediasize)
+			error = ENOSPC;
+		else
+			mirror_metadata_encode(md, sector);
+	}
+	if (error == 0)
+		error = g_write_data(cp, offset, sector, length);
 	free(sector, M_MIRROR);
 	if (error != 0) {
 		if ((disk->d_flags & G_MIRROR_DISK_FLAG_BROKEN) == 0) {
@@ -851,6 +863,27 @@ g_mirror_unidle(struct g_mirror_softc *sc)
 	}
 }
 
+static void
+g_mirror_flush_done(struct bio *bp)
+{
+	struct g_mirror_softc *sc;
+	struct bio *pbp;
+
+	pbp = bp->bio_parent;
+	sc = pbp->bio_to->geom->softc;
+	mtx_lock(&sc->sc_done_mtx);
+	if (pbp->bio_error == 0)
+		pbp->bio_error = bp->bio_error;
+	pbp->bio_completed += bp->bio_completed;
+	pbp->bio_inbed++;
+	if (pbp->bio_children == pbp->bio_inbed) {
+		mtx_unlock(&sc->sc_done_mtx);
+		g_io_deliver(pbp, pbp->bio_error);
+	} else
+		mtx_unlock(&sc->sc_done_mtx);
+	g_destroy_bio(bp);
+}
+
 static void
 g_mirror_done(struct bio *bp)
 {
@@ -1037,23 +1070,19 @@ g_mirror_flush(struct g_mirror_softc *sc, struct bio *bp)
 			continue;
 		cbp = g_clone_bio(bp);
 		if (cbp == NULL) {
-			for (cbp = bioq_first(&queue); cbp != NULL;
-			    cbp = bioq_first(&queue)) {
-				bioq_remove(&queue, cbp);
+			while ((cbp = bioq_takefirst(&queue)) != NULL)
 				g_destroy_bio(cbp);
-			}
 			if (bp->bio_error == 0)
 				bp->bio_error = ENOMEM;
 			g_io_deliver(bp, bp->bio_error);
 			return;
 		}
 		bioq_insert_tail(&queue, cbp);
-		cbp->bio_done = g_std_done;
+		cbp->bio_done = g_mirror_flush_done;
 		cbp->bio_caller1 = disk;
 		cbp->bio_to = disk->d_consumer->provider;
 	}
-	for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		G_MIRROR_LOGREQ(3, cbp, "Sending request.");
 		disk = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
@@ -1304,7 +1333,7 @@ g_mirror_sync_request(struct bio *bp)
 		}
 		G_MIRROR_LOGREQ(3, bp, "Synchronization request finished.");
 		sync = &disk->d_sync;
-		if (sync->ds_offset == sc->sc_mediasize ||
+		if (sync->ds_offset >= sc->sc_mediasize ||
 		    sync->ds_consumer == NULL ||
 		    (sc->sc_flags & G_MIRROR_DEVICE_FLAG_DESTROY) != 0) {
 			/* Don't send more synchronization requests. */
@@ -1538,11 +1567,8 @@ g_mirror_request_split(struct g_mirror_softc *sc, struct bio *bp)
 			continue;
 		cbp = g_clone_bio(bp);
 		if (cbp == NULL) {
-			for (cbp = bioq_first(&queue); cbp != NULL;
-			    cbp = bioq_first(&queue)) {
+			while ((cbp = bioq_takefirst(&queue)) != NULL)
 				bioq_remove(&queue, cbp);
-				g_destroy_bio(cbp);
-			}
 			if (bp->bio_error == 0)
 				bp->bio_error = ENOMEM;
 			g_io_deliver(bp, bp->bio_error);
@@ -1561,8 +1587,7 @@ g_mirror_request_split(struct g_mirror_softc *sc, struct bio *bp)
 		offset += cbp->bio_length;
 		data += cbp->bio_length;
 	}
-	for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		G_MIRROR_LOGREQ(3, cbp, "Sending request.");
 		disk = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
@@ -1643,11 +1668,8 @@ g_mirror_register_request(struct bio *bp)
 				continue;
 			cbp = g_clone_bio(bp);
 			if (cbp == NULL) {
-				for (cbp = bioq_first(&queue); cbp != NULL;
-				    cbp = bioq_first(&queue)) {
-					bioq_remove(&queue, cbp);
+				while ((cbp = bioq_takefirst(&queue)) != NULL)
 					g_destroy_bio(cbp);
-				}
 				if (bp->bio_error == 0)
 					bp->bio_error = ENOMEM;
 				g_io_deliver(bp, bp->bio_error);
@@ -1662,9 +1684,7 @@ g_mirror_register_request(struct bio *bp)
 			    ("Consumer %s not opened (r%dw%de%d).",
 			    cp->provider->name, cp->acr, cp->acw, cp->ace));
 		}
-		for (cbp = bioq_first(&queue); cbp != NULL;
-		    cbp = bioq_first(&queue)) {
-			bioq_remove(&queue, cbp);
+		while ((cbp = bioq_takefirst(&queue)) != NULL) {
 			G_MIRROR_LOGREQ(3, cbp, "Sending request.");
 			cp = cbp->bio_caller1;
 			cbp->bio_caller1 = NULL;
@@ -1920,6 +1940,7 @@ g_mirror_sync_start(struct g_mirror_disk *disk)
 	sx_xunlock(&sc->sc_lock);
 	g_topology_lock();
 	cp = g_new_consumer(sc->sc_sync.ds_geom);
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	error = g_attach(cp, sc->sc_provider);
 	KASSERT(error == 0,
 	    ("Cannot attach to %s (error=%d).", sc->sc_name, error));
@@ -2034,6 +2055,7 @@ g_mirror_launch_provider(struct g_mirror_softc *sc)
 
 	g_topology_lock();
 	pp = g_new_providerf(sc->sc_geom, "mirror/%s", sc->sc_name);
+	pp->flags |= G_PF_DIRECT_RECEIVE;
 	pp->mediasize = sc->sc_mediasize;
 	pp->sectorsize = sc->sc_sectorsize;
 	pp->stripesize = 0;
@@ -2082,10 +2104,8 @@ g_mirror_destroy_provider(struct g_mirror_softc *sc)
 	g_topology_lock();
 	g_error_provider(sc->sc_provider, ENXIO);
 	mtx_lock(&sc->sc_queue_mtx);
-	while ((bp = bioq_first(&sc->sc_queue)) != NULL) {
-		bioq_remove(&sc->sc_queue, bp);
+	while ((bp = bioq_takefirst(&sc->sc_queue)) != NULL)
 		g_io_deliver(bp, ENXIO);
-	}
 	mtx_unlock(&sc->sc_queue_mtx);
 	G_MIRROR_DEBUG(0, "Device %s: provider %s destroyed.", sc->sc_name,
 	    sc->sc_provider->name);
@@ -2707,12 +2727,14 @@ g_mirror_check_metadata(struct g_mirror_softc *sc, struct g_provider *pp,
 		    "md_balance", pp->name, sc->sc_name);
 		return (EINVAL);
 	}
+#if 0
 	if (md->md_mediasize != sc->sc_mediasize) {
 		G_MIRROR_DEBUG(1,
 		    "Invalid '%s' field on disk %s (device %s), skipping.",
 		    "md_mediasize", pp->name, sc->sc_name);
 		return (EINVAL);
 	}
+#endif
 	if (sc->sc_mediasize > pp->mediasize) {
 		G_MIRROR_DEBUG(1,
 		    "Invalid size of disk %s (device %s), skipping.", pp->name,
@@ -2896,6 +2918,7 @@ g_mirror_create(struct g_class *mp, const struct g_mirror_metadata *md)
 	TAILQ_INIT(&sc->sc_events);
 	mtx_init(&sc->sc_events_mtx, "gmirror:events", NULL, MTX_DEF);
 	callout_init(&sc->sc_callout, CALLOUT_MPSAFE);
+	mtx_init(&sc->sc_done_mtx, "gmirror:done", NULL, MTX_DEF);
 	sc->sc_state = G_MIRROR_DEVICE_STATE_STARTING;
 	gp->softc = sc;
 	sc->sc_geom = gp;
@@ -2914,6 +2937,7 @@ g_mirror_create(struct g_class *mp, const struct g_mirror_metadata *md)
 		G_MIRROR_DEBUG(1, "Cannot create kernel thread for %s.",
 		    sc->sc_name);
 		g_destroy_geom(sc->sc_sync.ds_geom);
+		mtx_destroy(&sc->sc_done_mtx);
 		mtx_destroy(&sc->sc_events_mtx);
 		mtx_destroy(&sc->sc_queue_mtx);
 		sx_destroy(&sc->sc_lock);
@@ -3103,6 +3127,22 @@ g_mirror_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 	return (gp);
 }
 
+static void
+g_mirror_resize(struct g_consumer *cp)
+{
+	struct g_mirror_disk *disk;
+
+	g_topology_assert();
+	g_trace(G_T_TOPOLOGY, "%s(%s)", __func__, cp->provider->name);
+
+	disk = cp->private;
+	if (disk == NULL)
+		return;
+	g_topology_unlock();
+	g_mirror_update_metadata(disk);
+	g_topology_lock();
+}
+
 static int
 g_mirror_destroy_geom(struct gctl_req *req __unused,
     struct g_class *mp __unused, struct g_geom *gp)
diff --git a/sys/geom/mirror/g_mirror.h b/sys/geom/mirror/g_mirror.h
index 44ea18adbf1..96270c8bf2b 100644
--- a/sys/geom/mirror/g_mirror.h
+++ b/sys/geom/mirror/g_mirror.h
@@ -212,6 +212,8 @@ struct g_mirror_softc {
 	struct callout	sc_callout;
 
 	struct root_hold_token *sc_rootmount;
+
+	struct mtx	 sc_done_mtx;
 };
 #define	sc_name	sc_geom->name
 
diff --git a/sys/geom/mirror/g_mirror_ctl.c b/sys/geom/mirror/g_mirror_ctl.c
index c024bd9d318..1748d7b9d6b 100644
--- a/sys/geom/mirror/g_mirror_ctl.c
+++ b/sys/geom/mirror/g_mirror_ctl.c
@@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
@@ -40,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 #include <machine/atomic.h>
 #include <geom/geom.h>
+#include <geom/geom_int.h>
 #include <sys/proc.h>
 #include <sys/kthread.h>
 #include <geom/mirror/g_mirror.h>
@@ -616,6 +618,75 @@ g_mirror_ctl_remove(struct gctl_req *req, struct g_class *mp)
 	sx_xunlock(&sc->sc_lock);
 }
 
+static void
+g_mirror_ctl_resize(struct gctl_req *req, struct g_class *mp)
+{
+	struct g_mirror_softc *sc;
+	struct g_mirror_disk *disk;
+	uint64_t mediasize;
+	const char *name, *s;
+	char *x;
+	int *nargs;
+
+	nargs = gctl_get_paraml(req, "nargs", sizeof(*nargs));
+	if (nargs == NULL) {
+		gctl_error(req, "No '%s' argument.", "nargs");
+		return;
+	}
+	if (*nargs != 1) {
+		gctl_error(req, "Missing device.");
+		return;
+	}
+	name = gctl_get_asciiparam(req, "arg0");
+	if (name == NULL) {
+		gctl_error(req, "No 'arg%u' argument.", 0);
+		return;
+	}
+	s = gctl_get_asciiparam(req, "size");
+	if (s == NULL) {
+		gctl_error(req, "No '%s' argument.", "size");
+		return;
+	}
+	mediasize = strtouq(s, &x, 0);
+	if (*x != '\0' || mediasize == 0) {
+		gctl_error(req, "Invalid '%s' argument.", "size");
+		return;
+	}
+	sc = g_mirror_find_device(mp, name);
+	if (sc == NULL) {
+		gctl_error(req, "No such device: %s.", name);
+		return;
+	}
+	/* Deny shrinking of an opened provider */
+	if ((g_debugflags & 16) == 0 && (sc->sc_provider->acr > 0 ||
+	    sc->sc_provider->acw > 0 || sc->sc_provider->ace > 0)) {
+		if (sc->sc_mediasize > mediasize) {
+			gctl_error(req, "Device %s is busy.",
+			    sc->sc_provider->name);
+			sx_xunlock(&sc->sc_lock);
+			return;
+		}
+	}
+	LIST_FOREACH(disk, &sc->sc_disks, d_next) {
+		if (mediasize > disk->d_consumer->provider->mediasize -
+		    disk->d_consumer->provider->sectorsize) {
+			gctl_error(req, "Provider %s is too small.",
+			    disk->d_name);
+			sx_xunlock(&sc->sc_lock);
+			return;
+		}
+	}
+	/* Update the size. */
+	sc->sc_mediasize = mediasize;
+	LIST_FOREACH(disk, &sc->sc_disks, d_next) {
+		g_mirror_update_metadata(disk);
+	}
+	g_topology_lock();
+	g_resize_provider(sc->sc_provider, mediasize);
+	g_topology_unlock();
+	sx_xunlock(&sc->sc_lock);
+}
+
 static void
 g_mirror_ctl_deactivate(struct gctl_req *req, struct g_class *mp)
 {
@@ -793,6 +864,8 @@ g_mirror_config(struct gctl_req *req, struct g_class *mp, const char *verb)
 		g_mirror_ctl_insert(req, mp);
 	else if (strcmp(verb, "remove") == 0)
 		g_mirror_ctl_remove(req, mp);
+	else if (strcmp(verb, "resize") == 0)
+		g_mirror_ctl_resize(req, mp);
 	else if (strcmp(verb, "deactivate") == 0)
 		g_mirror_ctl_deactivate(req, mp);
 	else if (strcmp(verb, "forget") == 0)
diff --git a/sys/geom/multipath/g_multipath.c b/sys/geom/multipath/g_multipath.c
index 72cd2c5bb67..88e65f8b202 100644
--- a/sys/geom/multipath/g_multipath.c
+++ b/sys/geom/multipath/g_multipath.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2011 Alexander Motin <mav@FreeBSD.org>
+ * Copyright (c) 2011-2013 Alexander Motin <mav@FreeBSD.org>
  * Copyright (c) 2006-2007 Matthew Jacob <mjacob@FreeBSD.org>
  * All rights reserved.
  *
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/limits.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/bio.h>
@@ -66,7 +67,13 @@ static enum {
 static struct bio_queue_head gmtbq;
 static struct mtx gmtbq_mtx;
 
+static int g_multipath_read_metadata(struct g_consumer *cp,
+    struct g_multipath_metadata *md);
+static int g_multipath_write_metadata(struct g_consumer *cp,
+    struct g_multipath_metadata *md);
+
 static void g_multipath_orphan(struct g_consumer *);
+static void g_multipath_resize(struct g_consumer *);
 static void g_multipath_start(struct bio *);
 static void g_multipath_done(struct bio *);
 static void g_multipath_done_error(struct bio *);
@@ -236,6 +243,79 @@ g_multipath_orphan(struct g_consumer *cp)
 		mtx_unlock(&sc->sc_mtx);
 }
 
+static void
+g_multipath_resize(struct g_consumer *cp)
+{
+	struct g_multipath_softc *sc;
+	struct g_geom *gp;
+	struct g_consumer *cp1;
+	struct g_provider *pp;
+	struct g_multipath_metadata md;
+	off_t size, psize, ssize;
+	int error;
+
+	g_topology_assert();
+
+	gp = cp->geom;
+	pp = cp->provider;
+	sc = gp->softc;
+
+	if (sc->sc_stopping)
+		return;
+
+	if (pp->mediasize < sc->sc_size) {
+		size = pp->mediasize;
+		ssize = pp->sectorsize;
+	} else {
+		size = ssize = OFF_MAX;
+		mtx_lock(&sc->sc_mtx);
+		LIST_FOREACH(cp1, &gp->consumer, consumer) {
+			pp = cp1->provider;
+			if (pp == NULL)
+				continue;
+			if (pp->mediasize < size) {
+				size = pp->mediasize;
+				ssize = pp->sectorsize;
+			}
+		}
+		mtx_unlock(&sc->sc_mtx);
+		if (size == OFF_MAX || size == sc->sc_size)
+			return;
+	}
+	psize = size - ((sc->sc_uuid[0] != 0) ? ssize : 0);
+	printf("GEOM_MULTIPATH: %s size changed from %jd to %jd\n",
+	    sc->sc_name, sc->sc_pp->mediasize, psize);
+	if (sc->sc_uuid[0] != 0 && size < sc->sc_size) {
+		error = g_multipath_read_metadata(cp, &md);
+		if (error ||
+		    (strcmp(md.md_magic, G_MULTIPATH_MAGIC) != 0) ||
+		    (memcmp(md.md_uuid, sc->sc_uuid, sizeof(sc->sc_uuid)) != 0) ||
+		    (strcmp(md.md_name, sc->sc_name) != 0) ||
+		    (md.md_size != 0 && md.md_size != size) ||
+		    (md.md_sectorsize != 0 && md.md_sectorsize != ssize)) {
+			g_multipath_destroy(gp);
+			return;
+		}
+	}
+	sc->sc_size = size;
+	g_resize_provider(sc->sc_pp, psize);
+
+	if (sc->sc_uuid[0] != 0) {
+		pp = cp->provider;
+		strlcpy(md.md_magic, G_MULTIPATH_MAGIC, sizeof(md.md_magic));
+		memcpy(md.md_uuid, sc->sc_uuid, sizeof (sc->sc_uuid));
+		strlcpy(md.md_name, sc->sc_name, sizeof(md.md_name));
+		md.md_version = G_MULTIPATH_VERSION;
+		md.md_size = size;
+		md.md_sectorsize = ssize;
+		md.md_active_active = sc->sc_active_active;
+		error = g_multipath_write_metadata(cp, &md);
+		if (error != 0)
+			printf("GEOM_MULTIPATH: Can't update metadata on %s "
+			    "(%d)\n", pp->name, error);
+	}
+}
+
 static void
 g_multipath_start(struct bio *bp)
 {
@@ -435,13 +515,16 @@ g_multipath_create(struct g_class *mp, struct g_multipath_metadata *md)
 	memcpy(sc->sc_uuid, md->md_uuid, sizeof (sc->sc_uuid));
 	memcpy(sc->sc_name, md->md_name, sizeof (sc->sc_name));
 	sc->sc_active_active = md->md_active_active;
+	sc->sc_size = md->md_size;
 	gp->softc = sc;
 	gp->start = g_multipath_start;
 	gp->orphan = g_multipath_orphan;
+	gp->resize = g_multipath_resize;
 	gp->access = g_multipath_access;
 	gp->dumpconf = g_multipath_dumpconf;
 
 	pp = g_new_providerf(gp, "multipath/%s", md->md_name);
+	pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
 	if (md->md_size != 0) {
 		pp->mediasize = md->md_size -
 		    ((md->md_uuid[0] != 0) ? md->md_sectorsize : 0);
@@ -479,6 +562,7 @@ g_multipath_add_disk(struct g_geom *gp, struct g_provider *pp)
 	}
 	nxtcp = LIST_FIRST(&gp->consumer);
 	cp = g_new_consumer(gp);
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	cp->private = NULL;
 	cp->index = MP_NEW;
 	error = g_attach(cp, pp);
@@ -512,18 +596,17 @@ g_multipath_add_disk(struct g_geom *gp, struct g_provider *pp)
 		g_destroy_consumer(cp);
 		return (error);
 	}
-	if (sc->sc_pp != NULL && sc->sc_pp->mediasize == 0) {
-		sc->sc_pp->mediasize = pp->mediasize -
+	if (sc->sc_size == 0) {
+		sc->sc_size = pp->mediasize -
 		    ((sc->sc_uuid[0] != 0) ? pp->sectorsize : 0);
+		sc->sc_pp->mediasize = sc->sc_size;
 		sc->sc_pp->sectorsize = pp->sectorsize;
 	}
-	if (sc->sc_pp != NULL &&
-	    sc->sc_pp->stripesize == 0 && sc->sc_pp->stripeoffset == 0) {
+	if (sc->sc_pp->stripesize == 0 && sc->sc_pp->stripeoffset == 0) {
 		sc->sc_pp->stripesize = pp->stripesize;
 		sc->sc_pp->stripeoffset = pp->stripeoffset;
 	}
-	if (sc->sc_pp != NULL)
-		sc->sc_pp->flags |= pp->flags & G_PF_ACCEPT_UNMAPPED;
+	sc->sc_pp->flags |= pp->flags & G_PF_ACCEPT_UNMAPPED;
 	mtx_lock(&sc->sc_mtx);
 	cp->index = 0;
 	sc->sc_ndisks++;
@@ -554,10 +637,8 @@ g_multipath_destroy(struct g_geom *gp)
 		sc->sc_stopping = 1;
 	}
 	if (sc->sc_opened != 0) {
-		if (sc->sc_pp != NULL) {
-			g_wither_provider(sc->sc_pp, ENXIO);
-			sc->sc_pp = NULL;
-		}
+		g_wither_provider(sc->sc_pp, ENXIO);
+		sc->sc_pp = NULL;
 		return (EINPROGRESS);
 	}
 	LIST_FOREACH_SAFE(cp, &gp->consumer, consumer, cp1) {
@@ -666,6 +747,30 @@ g_multipath_read_metadata(struct g_consumer *cp,
 	return (0);
 }
 
+static int
+g_multipath_write_metadata(struct g_consumer *cp,
+    struct g_multipath_metadata *md)
+{
+	struct g_provider *pp;
+	u_char *buf;
+	int error;
+
+	g_topology_assert();
+	error = g_access(cp, 1, 1, 1);
+	if (error != 0)
+		return (error);
+	pp = cp->provider;
+	g_topology_unlock();
+	buf = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO);
+	multipath_metadata_encode(md, buf);
+	error = g_write_data(cp, pp->mediasize - pp->sectorsize,
+	    buf, pp->sectorsize);
+	g_topology_lock();
+	g_access(cp, -1, -1, -1);
+	g_free(buf);
+	return (error);
+}
+
 static struct g_geom *
 g_multipath_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 {
@@ -835,7 +940,7 @@ g_multipath_ctl_add_name(struct gctl_req *req, struct g_class *mp,
 			return;
 		}
 	}
-	if (sc->sc_pp != NULL && sc->sc_pp->mediasize != 0 &&
+	if (sc->sc_pp->mediasize != 0 &&
 	    sc->sc_pp->mediasize + (sc->sc_uuid[0] != 0 ? pp->sectorsize : 0)
 	     != pp->mediasize) {
 		gctl_error(req, "Providers size mismatch %jd != %jd",
@@ -844,7 +949,7 @@ g_multipath_ctl_add_name(struct gctl_req *req, struct g_class *mp,
 		    (intmax_t) pp->mediasize);
 		return;
 	}
-	if (sc->sc_pp != NULL && sc->sc_pp->sectorsize != 0 &&
+	if (sc->sc_pp->sectorsize != 0 &&
 	    sc->sc_pp->sectorsize != pp->sectorsize) {
 		gctl_error(req, "Providers sectorsize mismatch %u != %u",
 		    sc->sc_pp->sectorsize, pp->sectorsize);
@@ -1028,7 +1133,6 @@ g_multipath_ctl_configure(struct gctl_req *req, struct g_class *mp)
 	struct g_multipath_metadata md;
 	const char *name;
 	int error, *val;
-	void *buf;
 
 	g_topology_assert();
 
@@ -1055,13 +1159,6 @@ g_multipath_ctl_configure(struct gctl_req *req, struct g_class *mp)
 	if (sc->sc_uuid[0] != 0 && sc->sc_active != NULL) {
 		cp = sc->sc_active;
 		pp = cp->provider;
-		error = g_access(cp, 1, 1, 1);
-		if (error != 0) {
-			gctl_error(req, "Can't open %s (%d)", pp->name, error);
-			return;
-		}
-		g_topology_unlock();
-		buf = g_malloc(pp->sectorsize, M_WAITOK | M_ZERO);
 		strlcpy(md.md_magic, G_MULTIPATH_MAGIC, sizeof(md.md_magic));
 		memcpy(md.md_uuid, sc->sc_uuid, sizeof (sc->sc_uuid));
 		strlcpy(md.md_name, name, sizeof(md.md_name));
@@ -1069,11 +1166,7 @@ g_multipath_ctl_configure(struct gctl_req *req, struct g_class *mp)
 		md.md_size = pp->mediasize;
 		md.md_sectorsize = pp->sectorsize;
 		md.md_active_active = sc->sc_active_active;
-		multipath_metadata_encode(&md, buf);
-		error = g_write_data(cp, pp->mediasize - pp->sectorsize,
-		    buf, pp->sectorsize);
-		g_topology_lock();
-		g_access(cp, -1, -1, -1);
+		error = g_multipath_write_metadata(cp, &md);
 		if (error != 0)
 			gctl_error(req, "Can't update metadata on %s (%d)",
 			    pp->name, error);
diff --git a/sys/geom/multipath/g_multipath.h b/sys/geom/multipath/g_multipath.h
index 33c44f1062e..c839dc485c2 100644
--- a/sys/geom/multipath/g_multipath.h
+++ b/sys/geom/multipath/g_multipath.h
@@ -48,6 +48,7 @@ struct g_multipath_softc {
 	struct mtx		sc_mtx;
 	char			sc_name[16];
 	char			sc_uuid[40];
+	off_t			sc_size;
 	int			sc_opened;
 	int			sc_stopping;
 	int			sc_ndisks;
diff --git a/sys/geom/nop/g_nop.c b/sys/geom/nop/g_nop.c
index 0cb03746ea0..bd72d780a4b 100644
--- a/sys/geom/nop/g_nop.c
+++ b/sys/geom/nop/g_nop.c
@@ -107,6 +107,7 @@ g_nop_start(struct bio *bp)
 	gp = bp->bio_to->geom;
 	sc = gp->softc;
 	G_NOP_LOGREQ(bp, "Request received.");
+	mtx_lock(&sc->sc_lock);
 	switch (bp->bio_cmd) {
 	case BIO_READ:
 		sc->sc_reads++;
@@ -119,6 +120,7 @@ g_nop_start(struct bio *bp)
 		failprob = sc->sc_wfailprob;
 		break;
 	}
+	mtx_unlock(&sc->sc_lock);
 	if (failprob > 0) {
 		u_int rval;
 
@@ -214,7 +216,7 @@ g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp,
 		}
 	}
 	gp = g_new_geomf(mp, "%s", name);
-	sc = g_malloc(sizeof(*sc), M_WAITOK);
+	sc = g_malloc(sizeof(*sc), M_WAITOK | M_ZERO);
 	sc->sc_offset = offset;
 	sc->sc_explicitsize = explicitsize;
 	sc->sc_error = ioerror;
@@ -224,6 +226,7 @@ g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp,
 	sc->sc_writes = 0;
 	sc->sc_readbytes = 0;
 	sc->sc_wrotebytes = 0;
+	mtx_init(&sc->sc_lock, "gnop lock", NULL, MTX_DEF);
 	gp->softc = sc;
 	gp->start = g_nop_start;
 	gp->orphan = g_nop_orphan;
@@ -232,10 +235,12 @@ g_nop_create(struct gctl_req *req, struct g_class *mp, struct g_provider *pp,
 	gp->dumpconf = g_nop_dumpconf;
 
 	newpp = g_new_providerf(gp, "%s", gp->name);
+	newpp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
 	newpp->mediasize = size;
 	newpp->sectorsize = secsize;
 
 	cp = g_new_consumer(gp);
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	error = g_attach(cp, pp);
 	if (error != 0) {
 		gctl_error(req, "Cannot attach to provider %s.", pp->name);
@@ -251,6 +256,7 @@ fail:
 		g_detach(cp);
 	g_destroy_consumer(cp);
 	g_destroy_provider(newpp);
+	mtx_destroy(&sc->sc_lock);
 	g_free(gp->softc);
 	g_destroy_geom(gp);
 	return (error);
@@ -259,10 +265,12 @@ fail:
 static int
 g_nop_destroy(struct g_geom *gp, boolean_t force)
 {
+	struct g_nop_softc *sc;
 	struct g_provider *pp;
 
 	g_topology_assert();
-	if (gp->softc == NULL)
+	sc = gp->softc;
+	if (sc == NULL)
 		return (ENXIO);
 	pp = LIST_FIRST(&gp->provider);
 	if (pp != NULL && (pp->acr != 0 || pp->acw != 0 || pp->ace != 0)) {
@@ -277,8 +285,9 @@ g_nop_destroy(struct g_geom *gp, boolean_t force)
 	} else {
 		G_NOP_DEBUG(0, "Device %s removed.", gp->name);
 	}
-	g_free(gp->softc);
 	gp->softc = NULL;
+	mtx_destroy(&sc->sc_lock);
+	g_free(sc);
 	g_wither_geom(gp, ENXIO);
 
 	return (0);
diff --git a/sys/geom/nop/g_nop.h b/sys/geom/nop/g_nop.h
index da555ecb100..3e37c05d93e 100644
--- a/sys/geom/nop/g_nop.h
+++ b/sys/geom/nop/g_nop.h
@@ -65,6 +65,7 @@ struct g_nop_softc {
 	uintmax_t	sc_writes;
 	uintmax_t	sc_readbytes;
 	uintmax_t	sc_wrotebytes;
+	struct mtx	sc_lock;
 };
 #endif	/* _KERNEL */
 
diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c
index db46dd358a5..08c612d5780 100644
--- a/sys/geom/part/g_part.c
+++ b/sys/geom/part/g_part.c
@@ -132,6 +132,7 @@ static g_dumpconf_t g_part_dumpconf;
 static g_orphan_t g_part_orphan;
 static g_spoiled_t g_part_spoiled;
 static g_start_t g_part_start;
+static g_resize_t g_part_resize;
 
 static struct g_class g_part_class = {
 	.name = "PART",
@@ -148,6 +149,7 @@ static struct g_class g_part_class = {
 	.orphan = g_part_orphan,
 	.spoiled = g_part_spoiled,
 	.start = g_part_start,
+	.resize = g_part_resize
 };
 
 DECLARE_GEOM_CLASS(g_part_class, g_part);
@@ -416,6 +418,7 @@ g_part_new_provider(struct g_geom *gp, struct g_part_table *table,
 		sbuf_finish(sb);
 		entry->gpe_pp = g_new_providerf(gp, "%s", sbuf_data(sb));
 		sbuf_delete(sb);
+		entry->gpe_pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
 		entry->gpe_pp->private = entry;		/* Close the circle. */
 	}
 	entry->gpe_pp->index = entry->gpe_index - 1;	/* index is 1-based. */
@@ -928,6 +931,7 @@ g_part_ctl_create(struct gctl_req *req, struct g_part_parms *gpp)
 	LIST_INIT(&table->gpt_entry);
 	if (null == NULL) {
 		cp = g_new_consumer(gp);
+		cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 		error = g_attach(cp, pp);
 		if (error == 0)
 			error = g_access(cp, 1, 1, 1);
@@ -1884,6 +1888,7 @@ g_part_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 	 */
 	gp = g_new_geomf(mp, "%s", pp->name);
 	cp = g_new_consumer(gp);
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	error = g_attach(cp, pp);
 	if (error == 0)
 		error = g_access(cp, 1, 0, 0);
@@ -2042,6 +2047,30 @@ g_part_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp,
 	}
 }
 
+static void
+g_part_resize(struct g_consumer *cp)
+{
+	struct g_part_table *table;
+
+	G_PART_TRACE((G_T_TOPOLOGY, "%s(%s)", __func__, cp->provider->name));
+	g_topology_assert();
+
+	table = cp->geom->softc;
+	if (table->gpt_opened == 0) {
+		if (g_access(cp, 1, 1, 1) != 0)
+			return;
+		table->gpt_opened = 1;
+	}
+	if (G_PART_RESIZE(table, NULL, NULL) == 0)
+		printf("GEOM_PART: %s was automatically resized\n",
+		    cp->geom->name);
+	if (g_part_check_integrity(table, cp) != 0) {
+		g_access(cp, -1, -1, -1);
+		table->gpt_opened = 0;
+		g_part_wither(table->gpt_gp, ENXIO);
+	}
+}
+
 static void
 g_part_orphan(struct g_consumer *cp)
 {
diff --git a/sys/geom/part/g_part_apm.c b/sys/geom/part/g_part_apm.c
index 6abd12ef0bd..66c0295da28 100644
--- a/sys/geom/part/g_part_apm.c
+++ b/sys/geom/part/g_part_apm.c
@@ -359,6 +359,14 @@ g_part_apm_resize(struct g_part_table *basetable,
     struct g_part_entry *baseentry, struct g_part_parms *gpp)
 {
 	struct g_part_apm_entry *entry;
+	struct g_provider *pp;
+
+	if (baseentry == NULL) {
+		pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider;
+		basetable->gpt_last = MIN(pp->mediasize / pp->sectorsize,
+		    UINT32_MAX) - 1;
+		return (0);
+	}
 
 	entry = (struct g_part_apm_entry *)baseentry;
 	baseentry->gpe_end = baseentry->gpe_start + gpp->gpp_size - 1;
diff --git a/sys/geom/part/g_part_bsd.c b/sys/geom/part/g_part_bsd.c
index a53781c7c52..487bf23bf7b 100644
--- a/sys/geom/part/g_part_bsd.c
+++ b/sys/geom/part/g_part_bsd.c
@@ -304,12 +304,40 @@ g_part_bsd_modify(struct g_part_table *basetable,
 	return (0);
 }
 
+static void
+bsd_set_rawsize(struct g_part_table *basetable, struct g_provider *pp)
+{
+	struct g_part_bsd_table *table;
+	struct g_part_bsd_entry *entry;
+	struct g_part_entry *baseentry;
+	uint32_t msize;
+
+	table = (struct g_part_bsd_table *)basetable;
+	msize = MIN(pp->mediasize / pp->sectorsize, UINT32_MAX);
+	le32enc(table->bbarea + pp->sectorsize + 60, msize); /* d_secperunit */
+	basetable->gpt_last = msize - 1;
+	LIST_FOREACH(baseentry, &basetable->gpt_entry, gpe_entry) {
+		if (baseentry->gpe_index != RAW_PART + 1)
+			continue;
+		baseentry->gpe_end = basetable->gpt_last;
+		entry = (struct g_part_bsd_entry *)baseentry;
+		entry->part.p_size = msize;
+		return;
+	}
+}
+
 static int
 g_part_bsd_resize(struct g_part_table *basetable,
     struct g_part_entry *baseentry, struct g_part_parms *gpp)
 {
 	struct g_part_bsd_entry *entry;
+	struct g_provider *pp;
 
+	if (baseentry == NULL) {
+		pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider;
+		bsd_set_rawsize(basetable, pp);
+		return (0);
+	}
 	entry = (struct g_part_bsd_entry *)baseentry;
 	baseentry->gpe_end = baseentry->gpe_start + gpp->gpp_size - 1;
 	entry->part.p_size = gpp->gpp_size;
diff --git a/sys/geom/part/g_part_ebr.c b/sys/geom/part/g_part_ebr.c
index 03b9aac72c5..a8a940d77a4 100644
--- a/sys/geom/part/g_part_ebr.c
+++ b/sys/geom/part/g_part_ebr.c
@@ -93,6 +93,8 @@ static int g_part_ebr_setunset(struct g_part_table *, struct g_part_entry *,
 static const char *g_part_ebr_type(struct g_part_table *, struct g_part_entry *,
     char *, size_t);
 static int g_part_ebr_write(struct g_part_table *, struct g_consumer *);
+static int g_part_ebr_resize(struct g_part_table *, struct g_part_entry *,
+    struct g_part_parms *);
 
 static kobj_method_t g_part_ebr_methods[] = {
 	KOBJMETHOD(g_part_add,		g_part_ebr_add),
@@ -108,6 +110,7 @@ static kobj_method_t g_part_ebr_methods[] = {
 	KOBJMETHOD(g_part_precheck,	g_part_ebr_precheck),
 	KOBJMETHOD(g_part_probe,	g_part_ebr_probe),
 	KOBJMETHOD(g_part_read,		g_part_ebr_read),
+	KOBJMETHOD(g_part_resize,	g_part_ebr_resize),
 	KOBJMETHOD(g_part_setunset,	g_part_ebr_setunset),
 	KOBJMETHOD(g_part_type,		g_part_ebr_type),
 	KOBJMETHOD(g_part_write,	g_part_ebr_write),
@@ -377,6 +380,20 @@ g_part_ebr_modify(struct g_part_table *basetable,
 	return (0);
 }
 
+static int
+g_part_ebr_resize(struct g_part_table *basetable,
+    struct g_part_entry *baseentry, struct g_part_parms *gpp)
+{
+	struct g_provider *pp;
+
+	if (baseentry != NULL)
+		return (EOPNOTSUPP);
+	pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider;
+	basetable->gpt_last = MIN(pp->mediasize / pp->sectorsize,
+	    UINT32_MAX) - 1;
+	return (0);
+}
+
 static const char *
 g_part_ebr_name(struct g_part_table *table, struct g_part_entry *entry,
     char *buf, size_t bufsz)
diff --git a/sys/geom/part/g_part_gpt.c b/sys/geom/part/g_part_gpt.c
index 8634b1e9237..d10404756da 100644
--- a/sys/geom/part/g_part_gpt.c
+++ b/sys/geom/part/g_part_gpt.c
@@ -731,8 +731,11 @@ g_part_gpt_resize(struct g_part_table *basetable,
     struct g_part_entry *baseentry, struct g_part_parms *gpp)
 {
 	struct g_part_gpt_entry *entry;
-	entry = (struct g_part_gpt_entry *)baseentry;
 
+	if (baseentry == NULL)
+		return (EOPNOTSUPP);
+
+	entry = (struct g_part_gpt_entry *)baseentry;
 	baseentry->gpe_end = baseentry->gpe_start + gpp->gpp_size - 1;
 	entry->ent.ent_lba_end = baseentry->gpe_end;
 
@@ -756,8 +759,8 @@ static int
 g_part_gpt_probe(struct g_part_table *table, struct g_consumer *cp)
 {
 	struct g_provider *pp;
-	char *buf;
-	int error, res;
+	u_char *buf;
+	int error, index, pri, res;
 
 	/* We don't nest, which means that our depth should be 0. */
 	if (table->gpt_depth != 0)
@@ -782,11 +785,21 @@ g_part_gpt_probe(struct g_part_table *table, struct g_consumer *cp)
 	if (pp->sectorsize < MBRSIZE || pp->mediasize < 6 * pp->sectorsize)
 		return (ENOSPC);
 
-	/* Check that there's a MBR. */
+	/*
+	 * Check that there's a MBR or a PMBR. If it's a PMBR, we return
+	 * as the highest priority on a match, otherwise we assume some
+	 * GPT-unaware tool has destroyed the GPT by recreating a MBR and
+	 * we really want the MBR scheme to take precedence.
+	 */
 	buf = g_read_data(cp, 0L, pp->sectorsize, &error);
 	if (buf == NULL)
 		return (error);
 	res = le16dec(buf + DOSMAGICOFFSET);
+	pri = G_PART_PROBE_PRI_LOW;
+	for (index = 0; index < NDOSPART; index++) {
+		if (buf[DOSPARTOFF + DOSPARTSIZE * index + 4] == 0xee)
+			pri = G_PART_PROBE_PRI_HIGH;
+	}
 	g_free(buf);
 	if (res != DOSMAGIC) 
 		return (ENXIO);
@@ -798,7 +811,7 @@ g_part_gpt_probe(struct g_part_table *table, struct g_consumer *cp)
 	res = memcmp(buf, GPT_HDR_SIG, 8);
 	g_free(buf);
 	if (res == 0)
-		return (G_PART_PROBE_PRI_HIGH);
+		return (pri);
 
 	/* No primary? Check that there's a secondary. */
 	buf = g_read_data(cp, pp->mediasize - pp->sectorsize, pp->sectorsize,
@@ -807,7 +820,7 @@ g_part_gpt_probe(struct g_part_table *table, struct g_consumer *cp)
 		return (error);
 	res = memcmp(buf, GPT_HDR_SIG, 8); 
 	g_free(buf);
-	return ((res == 0) ? G_PART_PROBE_PRI_HIGH : ENXIO);
+	return ((res == 0) ? pri : ENXIO);
 }
 
 static int
diff --git a/sys/geom/part/g_part_mbr.c b/sys/geom/part/g_part_mbr.c
index 459aee67363..e9085b12098 100644
--- a/sys/geom/part/g_part_mbr.c
+++ b/sys/geom/part/g_part_mbr.c
@@ -336,8 +336,15 @@ g_part_mbr_resize(struct g_part_table *basetable,
     struct g_part_entry *baseentry, struct g_part_parms *gpp)
 {
 	struct g_part_mbr_entry *entry;
+	struct g_provider *pp;
 	uint32_t size, sectors;
 
+	if (baseentry == NULL) {
+		pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider;
+		basetable->gpt_last = MIN(pp->mediasize / pp->sectorsize,
+		    UINT32_MAX) - 1;
+		return (0);
+	}
 	sectors = basetable->gpt_sectors;
 	size = gpp->gpp_size;
 
diff --git a/sys/geom/part/g_part_pc98.c b/sys/geom/part/g_part_pc98.c
index d18d5cf5804..bd594313b7d 100644
--- a/sys/geom/part/g_part_pc98.c
+++ b/sys/geom/part/g_part_pc98.c
@@ -343,8 +343,15 @@ g_part_pc98_resize(struct g_part_table *basetable,
     struct g_part_entry *baseentry, struct g_part_parms *gpp)
 {
 	struct g_part_pc98_entry *entry;
+	struct g_provider *pp;
 	uint32_t size, cyl;
 
+	if (baseentry == NULL) {
+		pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider;
+		basetable->gpt_last = MIN(pp->mediasize / SECSIZE,
+		    UINT32_MAX) - 1;
+		return (0);
+	}
 	cyl = basetable->gpt_heads * basetable->gpt_sectors;
 	size = gpp->gpp_size;
 
diff --git a/sys/geom/part/g_part_vtoc8.c b/sys/geom/part/g_part_vtoc8.c
index e993eff6bee..833eceb7d1c 100644
--- a/sys/geom/part/g_part_vtoc8.c
+++ b/sys/geom/part/g_part_vtoc8.c
@@ -305,13 +305,54 @@ g_part_vtoc8_modify(struct g_part_table *basetable,
 	return (0);
 }
 
+static int
+vtoc8_set_rawsize(struct g_part_table *basetable, struct g_provider *pp)
+{
+	struct g_part_vtoc8_table *table;
+	struct g_part_entry *baseentry;
+	off_t msize;
+	uint32_t acyls, ncyls, pcyls;
+
+	table = (struct g_part_vtoc8_table *)basetable;
+	msize = MIN(pp->mediasize / pp->sectorsize, UINT32_MAX);
+	pcyls = msize / table->secpercyl;
+	if (pcyls > UINT16_MAX)
+		return (ERANGE);
+	acyls = be16dec(&table->vtoc.altcyls);
+	ncyls = pcyls - acyls;
+	msize = ncyls * table->secpercyl;
+	basetable->gpt_last = msize - 1;
+
+	bzero(table->vtoc.ascii, sizeof(table->vtoc.ascii));
+	sprintf(table->vtoc.ascii, "FreeBSD%lldM cyl %u alt %u hd %u sec %u",
+	    (long long)(msize / 2048), ncyls, acyls, basetable->gpt_heads,
+	    basetable->gpt_sectors);
+	be16enc(&table->vtoc.physcyls, pcyls);
+	be16enc(&table->vtoc.ncyls, ncyls);
+	be32enc(&table->vtoc.map[VTOC_RAW_PART].nblks, msize);
+	if (be32dec(&table->vtoc.sanity) == VTOC_SANITY)
+		be16enc(&table->vtoc.part[VTOC_RAW_PART].tag, VTOC_TAG_BACKUP);
+	LIST_FOREACH(baseentry, &basetable->gpt_entry, gpe_entry) {
+		if (baseentry->gpe_index == VTOC_RAW_PART + 1) {
+			baseentry->gpe_end = basetable->gpt_last;
+			return (0);
+		}
+	}
+	return (ENXIO);
+}
+
 static int
 g_part_vtoc8_resize(struct g_part_table *basetable,
     struct g_part_entry *entry, struct g_part_parms *gpp)
 {
 	struct g_part_vtoc8_table *table;
+	struct g_provider *pp;
 	uint64_t size;
 
+	if (entry == NULL) {
+		pp = LIST_FIRST(&basetable->gpt_gp->consumer)->provider;
+		return (vtoc8_set_rawsize(basetable, pp));
+	}
 	table = (struct g_part_vtoc8_table *)basetable;
 	size = gpp->gpp_size;
 	if (size % table->secpercyl)
diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c
index 41a1f9668cb..a161f8a1004 100644
--- a/sys/geom/raid/g_raid.c
+++ b/sys/geom/raid/g_raid.c
@@ -792,6 +792,7 @@ g_raid_open_consumer(struct g_raid_softc *sc, const char *name)
 	if (pp == NULL)
 		return (NULL);
 	cp = g_new_consumer(sc->sc_geom);
+	cp->flags |= G_CF_DIRECT_RECEIVE;
 	if (g_attach(cp, pp) != 0) {
 		g_destroy_consumer(cp);
 		return (NULL);
@@ -993,20 +994,15 @@ g_raid_tr_flush_common(struct g_raid_tr_object *tr, struct bio *bp)
 		cbp->bio_caller1 = sd;
 		bioq_insert_tail(&queue, cbp);
 	}
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		sd = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
 		g_raid_subdisk_iostart(sd, cbp);
 	}
 	return;
 failure:
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL)
 		g_destroy_bio(cbp);
-	}
 	if (bp->bio_error == 0)
 		bp->bio_error = ENOMEM;
 	g_raid_iodone(bp, bp->bio_error);
@@ -1639,11 +1635,13 @@ static void
 g_raid_launch_provider(struct g_raid_volume *vol)
 {
 	struct g_raid_disk *disk;
+	struct g_raid_subdisk *sd;
 	struct g_raid_softc *sc;
 	struct g_provider *pp;
 	char name[G_RAID_MAX_VOLUMENAME];
 	char   announce_buf[80], buf1[32];
 	off_t off;
+	int i;
 
 	sc = vol->v_softc;
 	sx_assert(&sc->sc_lock, SX_LOCKED);
@@ -1673,6 +1671,18 @@ g_raid_launch_provider(struct g_raid_volume *vol)
         }
 
 	pp = g_new_providerf(sc->sc_geom, "%s", name);
+	pp->flags |= G_PF_DIRECT_RECEIVE;
+	if (vol->v_tr->tro_class->trc_accept_unmapped) {
+		pp->flags |= G_PF_ACCEPT_UNMAPPED;
+		for (i = 0; i < vol->v_disks_count; i++) {
+			sd = &vol->v_subdisks[i];
+			if (sd->sd_state == G_RAID_SUBDISK_S_NONE)
+				continue;
+			if ((sd->sd_disk->d_consumer->provider->flags &
+			    G_PF_ACCEPT_UNMAPPED) == 0)
+				pp->flags &= ~G_PF_ACCEPT_UNMAPPED;
+		}
+	}
 	pp->private = vol;
 	pp->mediasize = vol->v_mediasize;
 	pp->sectorsize = vol->v_sectorsize;
@@ -2247,6 +2257,7 @@ g_raid_taste(struct g_class *mp, struct g_provider *pp, int flags __unused)
 	 */
 	gp->orphan = g_raid_taste_orphan;
 	cp = g_new_consumer(gp);
+	cp->flags |= G_CF_DIRECT_RECEIVE;
 	g_attach(cp, pp);
 
 	geom = NULL;
diff --git a/sys/geom/raid/g_raid.h b/sys/geom/raid/g_raid.h
index 993b1000b5f..8a96fa9f469 100644
--- a/sys/geom/raid/g_raid.h
+++ b/sys/geom/raid/g_raid.h
@@ -376,6 +376,7 @@ struct g_raid_tr_class {
 	KOBJ_CLASS_FIELDS;
 	int		 trc_enable;
 	int		 trc_priority;
+	int		 trc_accept_unmapped;
 	LIST_ENTRY(g_raid_tr_class) trc_list;
 };
 
diff --git a/sys/geom/raid/md_ddf.c b/sys/geom/raid/md_ddf.c
index 5a173017078..4e1545b6217 100644
--- a/sys/geom/raid/md_ddf.c
+++ b/sys/geom/raid/md_ddf.c
@@ -2143,6 +2143,7 @@ g_raid_md_taste_ddf(struct g_raid_md_object *md, struct g_class *mp,
 	}
 
 	rcp = g_new_consumer(geom);
+	rcp->flags |= G_CF_DIRECT_RECEIVE;
 	g_attach(rcp, pp);
 	if (g_access(rcp, 1, 1, 1) != 0)
 		; //goto fail1;
diff --git a/sys/geom/raid/md_intel.c b/sys/geom/raid/md_intel.c
index eeb42d5f9d9..11917f578e3 100644
--- a/sys/geom/raid/md_intel.c
+++ b/sys/geom/raid/md_intel.c
@@ -1477,6 +1477,7 @@ search:
 	}
 
 	rcp = g_new_consumer(geom);
+	rcp->flags |= G_CF_DIRECT_RECEIVE;
 	g_attach(rcp, pp);
 	if (g_access(rcp, 1, 1, 1) != 0)
 		; //goto fail1;
diff --git a/sys/geom/raid/md_jmicron.c b/sys/geom/raid/md_jmicron.c
index a06221595ec..2da4a33a799 100644
--- a/sys/geom/raid/md_jmicron.c
+++ b/sys/geom/raid/md_jmicron.c
@@ -923,6 +923,7 @@ search:
 	}
 
 	rcp = g_new_consumer(geom);
+	rcp->flags |= G_CF_DIRECT_RECEIVE;
 	g_attach(rcp, pp);
 	if (g_access(rcp, 1, 1, 1) != 0)
 		; //goto fail1;
diff --git a/sys/geom/raid/md_nvidia.c b/sys/geom/raid/md_nvidia.c
index 92d9f710ab9..25cc2cc099d 100644
--- a/sys/geom/raid/md_nvidia.c
+++ b/sys/geom/raid/md_nvidia.c
@@ -919,6 +919,7 @@ search:
 	}
 
 	rcp = g_new_consumer(geom);
+	rcp->flags |= G_CF_DIRECT_RECEIVE;
 	g_attach(rcp, pp);
 	if (g_access(rcp, 1, 1, 1) != 0)
 		; //goto fail1;
diff --git a/sys/geom/raid/md_promise.c b/sys/geom/raid/md_promise.c
index 0007b20f778..b1e44270281 100644
--- a/sys/geom/raid/md_promise.c
+++ b/sys/geom/raid/md_promise.c
@@ -1176,6 +1176,7 @@ search:
 	}
 
 	rcp = g_new_consumer(geom);
+	rcp->flags |= G_CF_DIRECT_RECEIVE;
 	g_attach(rcp, pp);
 	if (g_access(rcp, 1, 1, 1) != 0)
 		; //goto fail1;
diff --git a/sys/geom/raid/md_sii.c b/sys/geom/raid/md_sii.c
index 03bb03b23a8..149b3369c6b 100644
--- a/sys/geom/raid/md_sii.c
+++ b/sys/geom/raid/md_sii.c
@@ -1012,6 +1012,7 @@ search:
 	}
 
 	rcp = g_new_consumer(geom);
+	rcp->flags |= G_CF_DIRECT_RECEIVE;
 	g_attach(rcp, pp);
 	if (g_access(rcp, 1, 1, 1) != 0)
 		; //goto fail1;
diff --git a/sys/geom/raid/tr_concat.c b/sys/geom/raid/tr_concat.c
index 60db472fc5a..44951d44478 100644
--- a/sys/geom/raid/tr_concat.c
+++ b/sys/geom/raid/tr_concat.c
@@ -74,7 +74,8 @@ static struct g_raid_tr_class g_raid_tr_concat_class = {
 	g_raid_tr_concat_methods,
 	sizeof(struct g_raid_tr_concat_object),
 	.trc_enable = 1,
-	.trc_priority = 50
+	.trc_priority = 50,
+	.trc_accept_unmapped = 1
 };
 
 static int
@@ -227,7 +228,10 @@ g_raid_tr_iostart_concat(struct g_raid_tr_object *tr, struct bio *bp)
 
 	offset = bp->bio_offset;
 	remain = bp->bio_length;
-	addr = bp->bio_data;
+	if ((bp->bio_flags & BIO_UNMAPPED) != 0)
+		addr = NULL;
+	else
+		addr = bp->bio_data;
 	no = 0;
 	while (no < vol->v_disks_count &&
 	    offset >= vol->v_subdisks[no].sd_size) {
@@ -244,8 +248,16 @@ g_raid_tr_iostart_concat(struct g_raid_tr_object *tr, struct bio *bp)
 		if (cbp == NULL)
 			goto failure;
 		cbp->bio_offset = offset;
-		cbp->bio_data = addr;
 		cbp->bio_length = length;
+		if ((bp->bio_flags & BIO_UNMAPPED) != 0 &&
+		    bp->bio_cmd != BIO_DELETE) {
+			cbp->bio_ma_offset += (uintptr_t)addr;
+			cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE;
+			cbp->bio_ma_offset %= PAGE_SIZE;
+			cbp->bio_ma_n = round_page(cbp->bio_ma_offset +
+			    cbp->bio_length) / PAGE_SIZE;
+		} else
+			cbp->bio_data = addr;
 		cbp->bio_caller1 = sd;
 		bioq_insert_tail(&queue, cbp);
 		remain -= length;
@@ -257,20 +269,15 @@ g_raid_tr_iostart_concat(struct g_raid_tr_object *tr, struct bio *bp)
 		    ("Request ends after volume end (%ju, %ju)",
 			bp->bio_offset, bp->bio_length));
 	} while (remain > 0);
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		sd = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
 		g_raid_subdisk_iostart(sd, cbp);
 	}
 	return;
 failure:
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL)
 		g_destroy_bio(cbp);
-	}
 	if (bp->bio_error == 0)
 		bp->bio_error = ENOMEM;
 	g_raid_iodone(bp, bp->bio_error);
diff --git a/sys/geom/raid/tr_raid0.c b/sys/geom/raid/tr_raid0.c
index 7873be82e61..40d35fdbbad 100644
--- a/sys/geom/raid/tr_raid0.c
+++ b/sys/geom/raid/tr_raid0.c
@@ -74,7 +74,8 @@ static struct g_raid_tr_class g_raid_tr_raid0_class = {
 	g_raid_tr_raid0_methods,
 	sizeof(struct g_raid_tr_raid0_object),
 	.trc_enable = 1,
-	.trc_priority = 100
+	.trc_priority = 100,
+	.trc_accept_unmapped = 1
 };
 
 static int
@@ -204,7 +205,10 @@ g_raid_tr_iostart_raid0(struct g_raid_tr_object *tr, struct bio *bp)
 		g_raid_tr_flush_common(tr, bp);
 		return;
 	}
-	addr = bp->bio_data;
+	if ((bp->bio_flags & BIO_UNMAPPED) != 0)
+		addr = NULL;
+	else
+		addr = bp->bio_data;
 	strip_size = vol->v_strip_size;
 
 	/* Stripe number. */
@@ -225,8 +229,16 @@ g_raid_tr_iostart_raid0(struct g_raid_tr_object *tr, struct bio *bp)
 		if (cbp == NULL)
 			goto failure;
 		cbp->bio_offset = offset + start;
-		cbp->bio_data = addr;
 		cbp->bio_length = length;
+		if ((bp->bio_flags & BIO_UNMAPPED) != 0 &&
+		    bp->bio_cmd != BIO_DELETE) {
+			cbp->bio_ma_offset += (uintptr_t)addr;
+			cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE;
+			cbp->bio_ma_offset %= PAGE_SIZE;
+			cbp->bio_ma_n = round_page(cbp->bio_ma_offset +
+			    cbp->bio_length) / PAGE_SIZE;
+		} else
+			cbp->bio_data = addr;
 		cbp->bio_caller1 = &vol->v_subdisks[no];
 		bioq_insert_tail(&queue, cbp);
 		if (++no >= vol->v_disks_count) {
@@ -238,20 +250,15 @@ g_raid_tr_iostart_raid0(struct g_raid_tr_object *tr, struct bio *bp)
 			addr += length;
 		start = 0;
 	} while (remain > 0);
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		sd = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
 		g_raid_subdisk_iostart(sd, cbp);
 	}
 	return;
 failure:
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL)
 		g_destroy_bio(cbp);
-	}
 	if (bp->bio_error == 0)
 		bp->bio_error = ENOMEM;
 	g_raid_iodone(bp, bp->bio_error);
diff --git a/sys/geom/raid/tr_raid1.c b/sys/geom/raid/tr_raid1.c
index 4465e328789..833655bb854 100644
--- a/sys/geom/raid/tr_raid1.c
+++ b/sys/geom/raid/tr_raid1.c
@@ -130,7 +130,8 @@ static struct g_raid_tr_class g_raid_tr_raid1_class = {
 	g_raid_tr_raid1_methods,
 	sizeof(struct g_raid_tr_raid1_object),
 	.trc_enable = 1,
-	.trc_priority = 100
+	.trc_priority = 100,
+	.trc_accept_unmapped = 1
 };
 
 static void g_raid_tr_raid1_rebuild_abort(struct g_raid_tr_object *tr);
@@ -594,20 +595,15 @@ g_raid_tr_iostart_raid1_write(struct g_raid_tr_object *tr, struct bio *bp)
 		cbp->bio_caller1 = sd;
 		bioq_insert_tail(&queue, cbp);
 	}
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		sd = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
 		g_raid_subdisk_iostart(sd, cbp);
 	}
 	return;
 failure:
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL)
 		g_destroy_bio(cbp);
-	}
 	if (bp->bio_error == 0)
 		bp->bio_error = ENOMEM;
 	g_raid_iodone(bp, bp->bio_error);
diff --git a/sys/geom/raid/tr_raid1e.c b/sys/geom/raid/tr_raid1e.c
index 679b7669b6e..404b9e60934 100644
--- a/sys/geom/raid/tr_raid1e.c
+++ b/sys/geom/raid/tr_raid1e.c
@@ -134,7 +134,8 @@ static struct g_raid_tr_class g_raid_tr_raid1e_class = {
 	g_raid_tr_raid1e_methods,
 	sizeof(struct g_raid_tr_raid1e_object),
 	.trc_enable = 1,
-	.trc_priority = 200
+	.trc_priority = 200,
+	.trc_accept_unmapped = 1
 };
 
 static void g_raid_tr_raid1e_rebuild_abort(struct g_raid_tr_object *tr);
@@ -701,7 +702,10 @@ g_raid_tr_iostart_raid1e_read(struct g_raid_tr_object *tr, struct bio *bp)
 	int best;
 
 	vol = tr->tro_volume;
-	addr = bp->bio_data;
+	if ((bp->bio_flags & BIO_UNMAPPED) != 0)
+		addr = NULL;
+	else
+		addr = bp->bio_data;
 	strip_size = vol->v_strip_size;
 	V2P(vol, bp->bio_offset, &no, &offset, &start);
 	remain = bp->bio_length;
@@ -721,8 +725,15 @@ g_raid_tr_iostart_raid1e_read(struct g_raid_tr_object *tr, struct bio *bp)
 		if (cbp == NULL)
 			goto failure;
 		cbp->bio_offset = offset + start;
-		cbp->bio_data = addr;
 		cbp->bio_length = length;
+		if ((bp->bio_flags & BIO_UNMAPPED) != 0) {
+			cbp->bio_ma_offset += (uintptr_t)addr;
+			cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE;
+			cbp->bio_ma_offset %= PAGE_SIZE;
+			cbp->bio_ma_n = round_page(cbp->bio_ma_offset +
+			    cbp->bio_length) / PAGE_SIZE;
+		} else
+			cbp->bio_data = addr;
 		cbp->bio_caller1 = &vol->v_subdisks[no];
 		bioq_insert_tail(&queue, cbp);
 		no += N - best;
@@ -734,20 +745,15 @@ g_raid_tr_iostart_raid1e_read(struct g_raid_tr_object *tr, struct bio *bp)
 		addr += length;
 		start = 0;
 	}
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		sd = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
 		g_raid_subdisk_iostart(sd, cbp);
 	}
 	return;
 failure:
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL)
 		g_destroy_bio(cbp);
-	}
 	if (bp->bio_error == 0)
 		bp->bio_error = ENOMEM;
 	g_raid_iodone(bp, bp->bio_error);
@@ -766,7 +772,10 @@ g_raid_tr_iostart_raid1e_write(struct g_raid_tr_object *tr, struct bio *bp)
 	int i;
 
 	vol = tr->tro_volume;
-	addr = bp->bio_data;
+	if ((bp->bio_flags & BIO_UNMAPPED) != 0)
+		addr = NULL;
+	else
+		addr = bp->bio_data;
 	strip_size = vol->v_strip_size;
 	V2P(vol, bp->bio_offset, &no, &offset, &start);
 	remain = bp->bio_length;
@@ -791,8 +800,16 @@ g_raid_tr_iostart_raid1e_write(struct g_raid_tr_object *tr, struct bio *bp)
 			if (cbp == NULL)
 				goto failure;
 			cbp->bio_offset = offset + start;
-			cbp->bio_data = addr;
 			cbp->bio_length = length;
+			if ((bp->bio_flags & BIO_UNMAPPED) != 0 &&
+			    bp->bio_cmd != BIO_DELETE) {
+				cbp->bio_ma_offset += (uintptr_t)addr;
+				cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE;
+				cbp->bio_ma_offset %= PAGE_SIZE;
+				cbp->bio_ma_n = round_page(cbp->bio_ma_offset +
+				    cbp->bio_length) / PAGE_SIZE;
+			} else
+				cbp->bio_data = addr;
 			cbp->bio_caller1 = sd;
 			bioq_insert_tail(&queue, cbp);
 nextdisk:
@@ -806,20 +823,15 @@ nextdisk:
 			addr += length;
 		start = 0;
 	}
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		sd = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
 		g_raid_subdisk_iostart(sd, cbp);
 	}
 	return;
 failure:
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL)
 		g_destroy_bio(cbp);
-	}
 	if (bp->bio_error == 0)
 		bp->bio_error = ENOMEM;
 	g_raid_iodone(bp, bp->bio_error);
@@ -1030,13 +1042,16 @@ rebuild_round_done:
 			cbp->bio_offset = offset + start;
 			cbp->bio_length = bp->bio_length;
 			cbp->bio_data = bp->bio_data;
+			cbp->bio_ma = bp->bio_ma;
+			cbp->bio_ma_offset = bp->bio_ma_offset;
+			cbp->bio_ma_n = bp->bio_ma_n;
 			g_destroy_bio(bp);
 			nsd = &vol->v_subdisks[disk];
 			G_RAID_LOGREQ(2, cbp, "Retrying read from %d",
 			    nsd->sd_pos);
 			if (do_write)
 				mask |= 1 << 31;
-			if ((mask & (1 << 31)) != 0)
+			if ((mask & (1U << 31)) != 0)
 				sd->sd_recovery++;
 			cbp->bio_caller2 = (void *)mask;
 			if (do_write) {
@@ -1059,7 +1074,7 @@ rebuild_round_done:
 	}
 	if (bp->bio_cmd == BIO_READ &&
 	    bp->bio_error == 0 &&
-	    (mask & (1 << 31)) != 0) {
+	    (mask & (1U << 31)) != 0) {
 		G_RAID_LOGREQ(3, bp, "Recovered data from other drive");
 
 		/* Restore what we were doing. */
@@ -1086,7 +1101,7 @@ rebuild_round_done:
 			return;
 		}
 	}
-	if ((mask & (1 << 31)) != 0) {
+	if ((mask & (1U << 31)) != 0) {
 		/*
 		 * We're done with a recovery, mark the range as unlocked.
 		 * For any write errors, we agressively fail the disk since
diff --git a/sys/geom/raid/tr_raid5.c b/sys/geom/raid/tr_raid5.c
index 6e54d168cea..c90845e5137 100644
--- a/sys/geom/raid/tr_raid5.c
+++ b/sys/geom/raid/tr_raid5.c
@@ -324,20 +324,15 @@ g_raid_tr_iostart_raid5_read(struct g_raid_tr_object *tr, struct bio *bp)
 		addr += length;
 		start = 0;
 	} while (remain > 0);
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL) {
 		sd = cbp->bio_caller1;
 		cbp->bio_caller1 = NULL;
 		g_raid_subdisk_iostart(sd, cbp);
 	}
 	return;
 failure:
-	for (cbp = bioq_first(&queue); cbp != NULL;
-	    cbp = bioq_first(&queue)) {
-		bioq_remove(&queue, cbp);
+	while ((cbp = bioq_takefirst(&queue)) != NULL)
 		g_destroy_bio(cbp);
-	}
 	if (bp->bio_error == 0)
 		bp->bio_error = ENOMEM;
 	g_raid_iodone(bp, bp->bio_error);
diff --git a/sys/geom/stripe/g_stripe.c b/sys/geom/stripe/g_stripe.c
index 575ec5f3774..b5d77c5303c 100644
--- a/sys/geom/stripe/g_stripe.c
+++ b/sys/geom/stripe/g_stripe.c
@@ -284,22 +284,25 @@ g_stripe_done(struct bio *bp)
 
 	pbp = bp->bio_parent;
 	sc = pbp->bio_to->geom->softc;
-	if (pbp->bio_error == 0)
-		pbp->bio_error = bp->bio_error;
-	pbp->bio_completed += bp->bio_completed;
 	if (bp->bio_cmd == BIO_READ && bp->bio_caller1 != NULL) {
 		g_stripe_copy(sc, bp->bio_data, bp->bio_caller1, bp->bio_offset,
 		    bp->bio_length, 1);
 		bp->bio_data = bp->bio_caller1;
 		bp->bio_caller1 = NULL;
 	}
-	g_destroy_bio(bp);
+	mtx_lock(&sc->sc_lock);
+	if (pbp->bio_error == 0)
+		pbp->bio_error = bp->bio_error;
+	pbp->bio_completed += bp->bio_completed;
 	pbp->bio_inbed++;
 	if (pbp->bio_children == pbp->bio_inbed) {
+		mtx_unlock(&sc->sc_lock);
 		if (pbp->bio_driver1 != NULL)
 			uma_zfree(g_stripe_zone, pbp->bio_driver1);
 		g_io_deliver(pbp, pbp->bio_error);
-	}
+	} else
+		mtx_unlock(&sc->sc_lock);
+	g_destroy_bio(bp);
 }
 
 static int
@@ -442,7 +445,6 @@ g_stripe_start_economic(struct bio *bp, u_int no, off_t offset, off_t length)
 
 	sc = bp->bio_to->geom->softc;
 
-	addr = bp->bio_data;
 	stripesize = sc->sc_stripesize;
 
 	cbp = g_clone_bio(bp);
@@ -454,10 +456,18 @@ g_stripe_start_economic(struct bio *bp, u_int no, off_t offset, off_t length)
 	/*
 	 * Fill in the component buf structure.
 	 */
-	cbp->bio_done = g_std_done;
+	if (bp->bio_length == length)
+		cbp->bio_done = g_std_done;	/* Optimized lockless case. */
+	else
+		cbp->bio_done = g_stripe_done;
 	cbp->bio_offset = offset;
-	cbp->bio_data = addr;
 	cbp->bio_length = length;
+	if ((bp->bio_flags & BIO_UNMAPPED) != 0) {
+		bp->bio_ma_n = round_page(bp->bio_ma_offset +
+		    bp->bio_length) / PAGE_SIZE;
+		addr = NULL;
+	} else
+		addr = bp->bio_data;
 	cbp->bio_caller2 = sc->sc_disks[no];
 
 	/* offset -= offset % stripesize; */
@@ -479,14 +489,21 @@ g_stripe_start_economic(struct bio *bp, u_int no, off_t offset, off_t length)
 		/*
 		 * Fill in the component buf structure.
 		 */
-		cbp->bio_done = g_std_done;
+		cbp->bio_done = g_stripe_done;
 		cbp->bio_offset = offset;
-		cbp->bio_data = addr;
 		/*
 		 * MIN() is in case when
 		 * (bp->bio_length % sc->sc_stripesize) != 0.
 		 */
 		cbp->bio_length = MIN(stripesize, length);
+		if ((bp->bio_flags & BIO_UNMAPPED) != 0) {
+			cbp->bio_ma_offset += (uintptr_t)addr;
+			cbp->bio_ma += cbp->bio_ma_offset / PAGE_SIZE;
+			cbp->bio_ma_offset %= PAGE_SIZE;
+			cbp->bio_ma_n = round_page(cbp->bio_ma_offset +
+			    cbp->bio_length) / PAGE_SIZE;
+		} else
+			cbp->bio_data = addr;
 
 		cbp->bio_caller2 = sc->sc_disks[no];
 	}
@@ -536,15 +553,15 @@ g_stripe_flush(struct g_stripe_softc *sc, struct bio *bp)
 			return;
 		}
 		bioq_insert_tail(&queue, cbp);
-		cbp->bio_done = g_std_done;
-		cbp->bio_caller1 = sc->sc_disks[no];
+		cbp->bio_done = g_stripe_done;
+		cbp->bio_caller2 = sc->sc_disks[no];
 		cbp->bio_to = sc->sc_disks[no]->provider;
 	}
 	for (cbp = bioq_first(&queue); cbp != NULL; cbp = bioq_first(&queue)) {
 		bioq_remove(&queue, cbp);
 		G_STRIPE_LOGREQ(cbp, "Sending request.");
-		cp = cbp->bio_caller1;
-		cbp->bio_caller1 = NULL;
+		cp = cbp->bio_caller2;
+		cbp->bio_caller2 = NULL;
 		g_io_request(cbp, cp);
 	}
 }
@@ -613,9 +630,12 @@ g_stripe_start(struct bio *bp)
 	 * 3. Request size is bigger than stripesize * ndisks. If it isn't,
 	 *    there will be no need to send more than one I/O request to
 	 *    a provider, so there is nothing to optmize.
+	 * and
+	 * 4. Request is not unmapped.
 	 */
 	if (g_stripe_fast && bp->bio_length <= MAXPHYS &&
-	    bp->bio_length >= stripesize * sc->sc_ndisks) {
+	    bp->bio_length >= stripesize * sc->sc_ndisks &&
+	    (bp->bio_flags & BIO_UNMAPPED) == 0) {
 		fast = 1;
 	}
 	error = 0;
@@ -642,6 +662,7 @@ g_stripe_start(struct bio *bp)
 static void
 g_stripe_check_and_run(struct g_stripe_softc *sc)
 {
+	struct g_provider *dp;
 	off_t mediasize, ms;
 	u_int no, sectorsize = 0;
 
@@ -651,6 +672,9 @@ g_stripe_check_and_run(struct g_stripe_softc *sc)
 
 	sc->sc_provider = g_new_providerf(sc->sc_geom, "stripe/%s",
 	    sc->sc_name);
+	sc->sc_provider->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
+	if (g_stripe_fast == 0)
+		sc->sc_provider->flags |= G_PF_ACCEPT_UNMAPPED;
 	/*
 	 * Find the smallest disk.
 	 */
@@ -660,14 +684,21 @@ g_stripe_check_and_run(struct g_stripe_softc *sc)
 	mediasize -= mediasize % sc->sc_stripesize;
 	sectorsize = sc->sc_disks[0]->provider->sectorsize;
 	for (no = 1; no < sc->sc_ndisks; no++) {
-		ms = sc->sc_disks[no]->provider->mediasize;
+		dp = sc->sc_disks[no]->provider;
+		ms = dp->mediasize;
 		if (sc->sc_type == G_STRIPE_TYPE_AUTOMATIC)
-			ms -= sc->sc_disks[no]->provider->sectorsize;
+			ms -= dp->sectorsize;
 		ms -= ms % sc->sc_stripesize;
 		if (ms < mediasize)
 			mediasize = ms;
-		sectorsize = lcm(sectorsize,
-		    sc->sc_disks[no]->provider->sectorsize);
+		sectorsize = lcm(sectorsize, dp->sectorsize);
+
+		/* A provider underneath us doesn't support unmapped */
+		if ((dp->flags & G_PF_ACCEPT_UNMAPPED) == 0) {
+			G_STRIPE_DEBUG(1, "Cancelling unmapped "
+			    "because of %s.", dp->name);
+			sc->sc_provider->flags &= ~G_PF_ACCEPT_UNMAPPED;
+		}
 	}
 	sc->sc_provider->sectorsize = sectorsize;
 	sc->sc_provider->mediasize = mediasize * sc->sc_ndisks;
@@ -729,6 +760,7 @@ g_stripe_add_disk(struct g_stripe_softc *sc, struct g_provider *pp, u_int no)
 	fcp = LIST_FIRST(&gp->consumer);
 
 	cp = g_new_consumer(gp);
+	cp->flags |= G_CF_DIRECT_SEND | G_CF_DIRECT_RECEIVE;
 	cp->private = NULL;
 	cp->index = no;
 	error = g_attach(cp, pp);
@@ -830,6 +862,7 @@ g_stripe_create(struct g_class *mp, const struct g_stripe_metadata *md,
 	for (no = 0; no < sc->sc_ndisks; no++)
 		sc->sc_disks[no] = NULL;
 	sc->sc_type = type;
+	mtx_init(&sc->sc_lock, "gstripe lock", NULL, MTX_DEF);
 
 	gp->softc = sc;
 	sc->sc_geom = gp;
@@ -878,6 +911,7 @@ g_stripe_destroy(struct g_stripe_softc *sc, boolean_t force)
 	KASSERT(sc->sc_provider == NULL, ("Provider still exists? (device=%s)",
 	    gp->name));
 	free(sc->sc_disks, M_STRIPE);
+	mtx_destroy(&sc->sc_lock);
 	free(sc, M_STRIPE);
 	G_STRIPE_DEBUG(0, "Device %s destroyed.", gp->name);
 	g_wither_geom(gp, ENXIO);
diff --git a/sys/geom/stripe/g_stripe.h b/sys/geom/stripe/g_stripe.h
index 2720c6f7795..fe4452b15fc 100644
--- a/sys/geom/stripe/g_stripe.h
+++ b/sys/geom/stripe/g_stripe.h
@@ -76,6 +76,7 @@ struct g_stripe_softc {
 	uint16_t	 sc_ndisks;
 	uint32_t	 sc_stripesize;
 	uint32_t	 sc_stripebits;
+	struct mtx	 sc_lock;
 };
 #define	sc_name	sc_geom->name
 #endif	/* _KERNEL */
diff --git a/sys/geom/zero/g_zero.c b/sys/geom/zero/g_zero.c
index 311db54402b..8cdfd904d42 100644
--- a/sys/geom/zero/g_zero.c
+++ b/sys/geom/zero/g_zero.c
@@ -106,6 +106,7 @@ g_zero_init(struct g_class *mp)
 	gp->start = g_zero_start;
 	gp->access = g_std_access;
 	gpp = pp = g_new_providerf(gp, "%s", gp->name);
+	pp->flags |= G_PF_DIRECT_SEND | G_PF_DIRECT_RECEIVE;
 	if (!g_zero_clear)
 		pp->flags |= G_PF_ACCEPT_UNMAPPED;
 	pp->mediasize = 1152921504606846976LLU;
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index dfaf4ab1d82..6d83d6a6d72 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -67,12 +67,10 @@ 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 	PROCDESC		# Support for process descriptors
 options 	MAC			# TrustedBSD MAC Framework
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
-options 	XENHVM			# Include Xen support
 
 # Debugging support.  Always need this:
 options 	KDB			# Enable kernel debugger support.
@@ -356,8 +354,13 @@ device		virtio_blk	# VirtIO Block device
 device		virtio_scsi	# VirtIO SCSI device
 device		virtio_balloon	# VirtIO Memory Balloon device
 
-# Xen support
-device		xenpci		# Generic Xen bus
+# HyperV drivers
+device		hyperv		# HyperV drivers 
+
+# Xen HVM Guest Optimizations
+# NOTE: XENHVM depends on xenpci.  They must be added or removed together.
+options 	XENHVM		# Xen HVM kernel infrastructure
+device		xenpci		# Xen HVM Hypervisor services driver
 
 # VMware support
 device		vmx		# VMware VMXNET3 Ethernet
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 50b391ade1e..212dbd9a17b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -491,6 +491,7 @@ device		tdfx_linux		# Enable Linuxulator support
 
 device		acpi
 options 	ACPI_DEBUG
+options 	ACPI_DMAR
 
 # ACPI WMI Mapping driver
 device		acpi_wmi
@@ -800,6 +801,8 @@ device		virtio_blk	# VirtIO Block device
 device		virtio_scsi	# VirtIO SCSI device
 device		virtio_balloon	# VirtIO Memory Balloon device
 
+device 		hyperv		# HyperV drivers
+
 #####################################################################
 
 #
diff --git a/sys/i386/conf/XEN b/sys/i386/conf/XEN
index bcc9f1992ad..58b819b7da2 100644
--- a/sys/i386/conf/XEN
+++ b/sys/i386/conf/XEN
@@ -7,7 +7,7 @@ cpu		I686_CPU
 ident		XEN
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-makeoptions	WITHOUT_MODULES="aha ahb amd cxgb dpt drm drm2 hptnr hptmv ida malo mps mwl nve rdma sound sym trm xfs"
+makeoptions	WITHOUT_MODULES="aha ahb amd ctl cxgb dpt drm drm2 hptnr hptmv ida malo mps mwl nve rdma sound sym trm xfs"
 
 options 	SCHED_ULE		# ULE scheduler
 options 	PREEMPTION		# Enable kernel thread preemption
diff --git a/sys/i386/i386/bpf_jit_machdep.c b/sys/i386/i386/bpf_jit_machdep.c
index 4c2946f9f6b..e0aaf018cc4 100644
--- a/sys/i386/i386/bpf_jit_machdep.c
+++ b/sys/i386/i386/bpf_jit_machdep.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/malloc.h>
 #include <net/if.h>
diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s
index 58cd3e8c661..39a8828e10a 100644
--- a/sys/i386/i386/exception.s
+++ b/sys/i386/i386/exception.s
@@ -37,7 +37,6 @@
 #include "opt_apic.h"
 #include "opt_atpic.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_npx.h"
 
 #include <machine/asmacros.h>
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index beec9b1e7df..1af3ac25cdb 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -842,18 +842,18 @@ printcpuinfo(void)
 				"\017<b14>"
 				"\020LWP"	/* Lightweight Profiling */
 				"\021FMA4"	/* 4-operand FMA instructions */
-				"\022<b17>"
+				"\022TCE"	/* Translation Cache Extension */
 				"\023<b18>"
 				"\024NodeId"	/* NodeId MSR support */
 				"\025<b20>"
 				"\026TBM"	/* Trailing Bit Manipulation */
 				"\027Topology"	/* Topology Extensions */
-				"\030<b23>"
-				"\031<b24>"
+				"\030PCXC"	/* Core perf count */
+				"\031PNXC"	/* NB perf count */
 				"\032<b25>"
-				"\033<b26>"
-				"\034<b27>"
-				"\035<b28>"
+				"\033DBE"	/* Data Breakpoint extension */
+				"\034PTSC"	/* Performance TSC */
+				"\035PL2I"	/* L2I perf count */
 				"\036<b29>"
 				"\037<b30>"
 				"\040<b31>"
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index c43031644f8..d43abbf512a 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -56,7 +56,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_perfmon.h"
 #include "opt_platform.h"
 #include "opt_xbox.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -294,7 +293,6 @@ cpu_startup(dummy)
 #ifdef PERFMON
 	perfmon_init();
 #endif
-	realmem = Maxmem;
 
 	/*
 	 * Display physical memory if SMBIOS reports reasonable amount.
@@ -308,6 +306,7 @@ cpu_startup(dummy)
 	if (memsize < ptoa((uintmax_t)cnt.v_free_count))
 		memsize = ptoa((uintmax_t)Maxmem);
 	printf("real memory  = %ju (%ju MB)\n", memsize, memsize >> 20);
+	realmem = atop(memsize);
 
 	/*
 	 * Display any holes after the first chunk of extended memory.
@@ -757,6 +756,8 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask)
 
 	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;
@@ -840,17 +841,7 @@ osigreturn(td, uap)
 		/*
 		 * Don't allow users to change privileged or reserved flags.
 		 */
-		/*
-		 * XXX do allow users to change the privileged flag PSL_RF.
-		 * The cpu sets PSL_RF in tf_eflags for faults.  Debuggers
-		 * should sometimes set it there too.  tf_eflags is kept in
-		 * the signal context during signal handling and there is no
-		 * other place to remember it, so the PSL_RF bit may be
-		 * corrupted by the signal handler without us knowing.
-		 * Corruption of the PSL_RF bit at worst causes one more or
-		 * one less debugger trap, so allowing it is fairly harmless.
-		 */
-		if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) {
+		if (!EFL_SECURE(eflags, regs->tf_eflags)) {
 	    		return (EINVAL);
 		}
 
@@ -966,17 +957,7 @@ freebsd4_sigreturn(td, uap)
 		/*
 		 * Don't allow users to change privileged or reserved flags.
 		 */
-		/*
-		 * XXX do allow users to change the privileged flag PSL_RF.
-		 * The cpu sets PSL_RF in tf_eflags for faults.  Debuggers
-		 * should sometimes set it there too.  tf_eflags is kept in
-		 * the signal context during signal handling and there is no
-		 * other place to remember it, so the PSL_RF bit may be
-		 * corrupted by the signal handler without us knowing.
-		 * Corruption of the PSL_RF bit at worst causes one more or
-		 * one less debugger trap, so allowing it is fairly harmless.
-		 */
-		if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) {
+		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);
@@ -1080,17 +1061,7 @@ sys_sigreturn(td, uap)
 		/*
 		 * Don't allow users to change privileged or reserved flags.
 		 */
-		/*
-		 * XXX do allow users to change the privileged flag PSL_RF.
-		 * The cpu sets PSL_RF in tf_eflags for faults.  Debuggers
-		 * should sometimes set it there too.  tf_eflags is kept in
-		 * the signal context during signal handling and there is no
-		 * other place to remember it, so the PSL_RF bit may be
-		 * corrupted by the signal handler without us knowing.
-		 * Corruption of the PSL_RF bit at worst causes one more or
-		 * one less debugger trap, so allowing it is fairly harmless.
-		 */
-		if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) {
+		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);
@@ -1445,7 +1416,7 @@ cpu_idle(int busy)
 	/* Call main idle method. */
 	cpu_idle_fn(sbt);
 
-	/* Switch timers mack into active mode. */
+	/* Switch timers back into active mode. */
 	if (!busy) {
 		cpu_activeclock();
 		critical_exit();
@@ -2030,26 +2001,20 @@ sdtossd(sd, ssd)
 
 #ifndef XEN
 static int
-add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp)
+add_physmap_entry(uint64_t base, uint64_t length, vm_paddr_t *physmap,
+    int *physmap_idxp)
 {
 	int i, insert_idx, physmap_idx;
 
 	physmap_idx = *physmap_idxp;
 	
-	if (boothowto & RB_VERBOSE)
-		printf("SMAP type=%02x base=%016llx len=%016llx\n",
-		    smap->type, smap->base, smap->length);
-
-	if (smap->type != SMAP_TYPE_MEMORY)
-		return (1);
-
-	if (smap->length == 0)
+	if (length == 0)
 		return (1);
 
 #ifndef PAE
-	if (smap->base > 0xffffffff) {
+	if (base > 0xffffffff) {
 		printf("%uK of memory above 4GB ignored\n",
-		    (u_int)(smap->length / 1024));
+		    (u_int)(length / 1024));
 		return (1);
 	}
 #endif
@@ -2060,8 +2025,8 @@ add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp)
 	 */
 	insert_idx = physmap_idx + 2;
 	for (i = 0; i <= physmap_idx; i += 2) {
-		if (smap->base < physmap[i + 1]) {
-			if (smap->base + smap->length <= physmap[i]) {
+		if (base < physmap[i + 1]) {
+			if (base + length <= physmap[i]) {
 				insert_idx = i;
 				break;
 			}
@@ -2073,15 +2038,14 @@ add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp)
 	}
 
 	/* See if we can prepend to the next entry. */
-	if (insert_idx <= physmap_idx &&
-	    smap->base + smap->length == physmap[insert_idx]) {
-		physmap[insert_idx] = smap->base;
+	if (insert_idx <= physmap_idx && base + length == physmap[insert_idx]) {
+		physmap[insert_idx] = base;
 		return (1);
 	}
 
 	/* See if we can append to the previous entry. */
-	if (insert_idx > 0 && smap->base == physmap[insert_idx - 1]) {
-		physmap[insert_idx - 1] += smap->length;
+	if (insert_idx > 0 && base == physmap[insert_idx - 1]) {
+		physmap[insert_idx - 1] += length;
 		return (1);
 	}
 
@@ -2103,11 +2067,46 @@ add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp)
 	}
 
 	/* Insert the new entry. */
-	physmap[insert_idx] = smap->base;
-	physmap[insert_idx + 1] = smap->base + smap->length;
+	physmap[insert_idx] = base;
+	physmap[insert_idx + 1] = base + length;
 	return (1);
 }
 
+static int
+add_smap_entry(struct bios_smap *smap, vm_paddr_t *physmap, int *physmap_idxp)
+{
+	if (boothowto & RB_VERBOSE)
+		printf("SMAP type=%02x base=%016llx len=%016llx\n",
+		    smap->type, smap->base, smap->length);
+
+	if (smap->type != SMAP_TYPE_MEMORY)
+		return (1);
+
+	return (add_physmap_entry(smap->base, smap->length, physmap,
+	    physmap_idxp));
+}
+
+static void
+add_smap_entries(struct bios_smap *smapbase, vm_paddr_t *physmap,
+    int *physmap_idxp)
+{
+	struct bios_smap *smap, *smapend;
+	u_int32_t smapsize;
+	/*
+	 * Memory map from INT 15:E820.
+	 *
+	 * subr_module.c says:
+	 * "Consumer may safely assume that size value precedes data."
+	 * ie: an int32_t immediately precedes SMAP.
+	 */
+	smapsize = *((u_int32_t *)smapbase - 1);
+	smapend = (struct bios_smap *)((uintptr_t)smapbase + smapsize);
+
+	for (smap = smapbase; smap < smapend; smap++)
+		if (!add_smap_entry(smap, physmap, physmap_idxp))
+			break;
+}
+
 static void
 basemem_setup(void)
 {
@@ -2184,8 +2183,7 @@ getmemsize(int first)
 	struct vm86frame vmf;
 	struct vm86context vmc;
 	vm_paddr_t pa;
-	struct bios_smap *smap, *smapbase, *smapend;
-	u_int32_t smapsize;
+	struct bios_smap *smap, *smapbase;
 	caddr_t kmdp;
 #endif
 
@@ -2227,18 +2225,8 @@ getmemsize(int first)
 		smapbase = (struct bios_smap *)preload_search_info(kmdp,
 		    MODINFO_METADATA | MODINFOMD_SMAP);
 	if (smapbase != NULL) {
-		/*
-		 * subr_module.c says:
-		 * "Consumer may safely assume that size value precedes data."
-		 * ie: an int32_t immediately precedes SMAP.
-		 */
-		smapsize = *((u_int32_t *)smapbase - 1);
-		smapend = (struct bios_smap *)((uintptr_t)smapbase + smapsize);
+		add_smap_entries(smapbase, physmap, &physmap_idx);
 		has_smap = 1;
-
-		for (smap = smapbase; smap < smapend; smap++)
-			if (!add_smap_entry(smap, physmap, &physmap_idx))
-				break;
 		goto have_smap;
 	}
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 3fe7c0c36e9..884e0f057af 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_hwpmc_hooks.h"
 #include "opt_isa.h"
 #include "opt_kdb.h"
-#include "opt_kdtrace.h"
 #include "opt_npx.h"
 #include "opt_trap.h"
 
@@ -123,9 +122,8 @@ dtrace_doubletrap_func_t	dtrace_doubletrap_func;
 systrace_probe_func_t	systrace_probe_func;
 
 /*
- * These hooks are necessary for the pid, usdt and fasttrap providers.
+ * These hooks are necessary for the pid and usdt providers.
  */
-dtrace_fasttrap_probe_ptr_t	dtrace_fasttrap_probe_ptr;
 dtrace_pid_probe_ptr_t		dtrace_pid_probe_ptr;
 dtrace_return_probe_ptr_t	dtrace_return_probe_ptr;
 #endif
@@ -139,7 +137,7 @@ void dblfault_handler(void);
 
 extern inthand_t IDTVEC(lcall_syscall);
 
-#define MAX_TRAP_MSG		33
+#define MAX_TRAP_MSG		32
 static char *trap_msg[] = {
 	"",					/*  0 unused */
 	"privileged instruction fault",		/*  1 T_PRIVINFLT */
@@ -174,8 +172,6 @@ static char *trap_msg[] = {
 	"reserved (unknown) fault",		/* 30 T_RESERVED */
 	"",					/* 31 unused (reserved) */
 	"DTrace pid return trap",               /* 32 T_DTRACE_RET */
-	"DTrace fasttrap probe trap",           /* 33 T_DTRACE_PROBE */
-
 };
 
 #if defined(I586_CPU) && !defined(NO_F00F_HACK)
@@ -275,15 +271,10 @@ trap(struct trapframe *frame)
 	 * handled the trap and modified the trap frame so that this
 	 * function can return normally.
 	 */
-	if (type == T_DTRACE_PROBE || type == T_DTRACE_RET ||
-	    type == T_BPTFLT) {
+	if (type == T_DTRACE_RET || type == T_BPTFLT) {
 		struct reg regs;
 
 		fill_frame_regs(frame, &regs);
-		if (type == T_DTRACE_PROBE &&
-		    dtrace_fasttrap_probe_ptr != NULL &&
-		    dtrace_fasttrap_probe_ptr(&regs) == 0)
-			goto out;
 		if (type == T_BPTFLT &&
 		    dtrace_pid_probe_ptr != NULL &&
 		    dtrace_pid_probe_ptr(&regs) == 0)
diff --git a/sys/i386/ibcs2/ibcs2_sysvec.c b/sys/i386/ibcs2/ibcs2_sysvec.c
index 5b6f680cb13..5d007c7958d 100644
--- a/sys/i386/ibcs2/ibcs2_sysvec.c
+++ b/sys/i386/ibcs2/ibcs2_sysvec.c
@@ -54,8 +54,6 @@ MODULE_VERSION(ibcs2, 1);
 
 extern int bsd_to_ibcs2_errno[];
 extern struct sysent ibcs2_sysent[IBCS2_SYS_MAXSYSCALL];
-extern int szsigcode;
-extern char sigcode[];
 static int ibcs2_fixup(register_t **, struct image_params *);
 
 struct sysentvec ibcs2_svr3_sysvec = {
diff --git a/sys/i386/include/apicvar.h b/sys/i386/include/apicvar.h
index 5d1f52249de..df99ebe7ba4 100644
--- a/sys/i386/include/apicvar.h
+++ b/sys/i386/include/apicvar.h
@@ -135,15 +135,6 @@
  */
 #define	APIC_SPURIOUS_INT 255
 
-#define	LVT_LINT0	0
-#define	LVT_LINT1	1
-#define	LVT_TIMER	2
-#define	LVT_ERROR	3
-#define	LVT_PMC		4
-#define	LVT_THERMAL	5
-#define	LVT_CMCI	6
-#define	LVT_MAX		LVT_CMCI
-
 #ifndef LOCORE
 
 #define	APIC_IPI_DEST_SELF	-1
diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h
index cc8bfe01219..b2d4a6b2890 100644
--- a/sys/i386/include/asm.h
+++ b/sys/i386/include/asm.h
@@ -91,11 +91,15 @@
 #endif
 
 /*
- * WEAK_ALIAS: create a weak alias.
+ * WEAK_REFERENCE(): create a weak reference alias from sym.
+ * The macro is not a general asm macro that takes arbitrary names,
+ * but one that takes only C names. It does the non-null name
+ * translation inside the macro.
  */
-#define	WEAK_ALIAS(alias,sym)						\
-	.weak alias;							\
-	alias = sym
+
+#define	WEAK_REFERENCE(sym, alias)					\
+	.weak CNAME(alias);						\
+	.equ CNAME(alias),CNAME(sym)
 
 /*
  * STRONG_ALIAS: create a strong alias.
diff --git a/sys/i386/include/pcpu.h b/sys/i386/include/pcpu.h
index 60e50f8167b..dc29b6dad24 100644
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
@@ -62,13 +62,13 @@ struct shadow_time_info {
 	vm_paddr_t *pc_pdir_shadow;					\
 	uint64_t pc_processed_system_time;				\
 	struct shadow_time_info pc_shadow_time;				\
-	char	__pad[189]
+	char	__pad[185]
 
 #else /* !XEN */
 
 #define PCPU_XEN_FIELDS							\
 	;								\
-	char	__pad[237]
+	char	__pad[233]
 
 #endif
 
@@ -84,7 +84,8 @@ struct shadow_time_info {
 	u_int   pc_acpi_id;		/* ACPI CPU id */		\
 	u_int	pc_apic_id;						\
 	int	pc_private_tss;		/* Flag indicating private tss*/\
-	u_int	pc_cmci_mask		/* MCx banks for CMCI */	\
+	u_int	pc_cmci_mask;		/* MCx banks for CMCI */	\
+	u_int	pc_vcpu_id		/* Xen vCPU ID */		\
 	PCPU_XEN_FIELDS
 
 #ifdef _KERNEL
diff --git a/sys/i386/include/vm86.h b/sys/i386/include/vm86.h
index e33d72008f2..2253d5c504c 100644
--- a/sys/i386/include/vm86.h
+++ b/sys/i386/include/vm86.h
@@ -113,7 +113,7 @@ struct vm86context {
 	} pmap[VM86_PMAPSIZE];
 };
 
-#define VM_USERCHANGE   (PSL_USERCHANGE | PSL_RF)
+#define VM_USERCHANGE   (PSL_USERCHANGE)
 #define VME_USERCHANGE  (VM_USERCHANGE | PSL_VIP | PSL_VIF)
 
 struct vm86_kernel {
diff --git a/sys/i386/include/vmparam.h b/sys/i386/include/vmparam.h
index 19cdd8e115e..c086d76d49a 100644
--- a/sys/i386/include/vmparam.h
+++ b/sys/i386/include/vmparam.h
@@ -164,24 +164,23 @@
 #define VM_MAX_ADDRESS		VADDR(PTDPTDI, PTDPTDI)
 #define VM_MIN_ADDRESS		((vm_offset_t)0)
 
-/* virtual sizes (bytes) for various kernel submaps */
-#ifndef VM_KMEM_SIZE
-#define VM_KMEM_SIZE		(12 * 1024 * 1024)
-#endif
-
 /*
- * How many physical pages per KVA page allocated.
- * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE),
- *     VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
- * is the total KVA space allocated for kmem_map.
+ * How many physical pages per kmem arena virtual page.
  */
 #ifndef VM_KMEM_SIZE_SCALE
 #define	VM_KMEM_SIZE_SCALE	(3)
 #endif
 
 /*
- * Ceiling on the amount of kmem_map KVA space: 40% of the entire KVA space
- * rounded to the nearest multiple of the superpage size.
+ * Optional floor (in bytes) on the size of the kmem arena.
+ */
+#ifndef VM_KMEM_SIZE_MIN
+#define	VM_KMEM_SIZE_MIN	(12 * 1024 * 1024)
+#endif
+
+/*
+ * Optional ceiling (in bytes) on the size of the kmem arena: 40% of the
+ * kernel map rounded to the nearest multiple of the superpage size.
  */
 #ifndef VM_KMEM_SIZE_MAX
 #define	VM_KMEM_SIZE_MAX	(((((VM_MAX_KERNEL_ADDRESS - \
diff --git a/sys/i386/include/xen/xen-os.h b/sys/i386/include/xen/xen-os.h
index e15d6687006..a8fba61bde7 100644
--- a/sys/i386/include/xen/xen-os.h
+++ b/sys/i386/include/xen/xen-os.h
@@ -37,9 +37,6 @@
 /* Everything below this point is not included by assembler (.S) files. */
 #ifndef __ASSEMBLY__
 
-/* Force a proper event-channel callback from Xen. */
-void force_evtchn_callback(void);
-
 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
 static inline void rep_nop(void)
 {
diff --git a/sys/i386/linux/linux_dummy.c b/sys/i386/linux/linux_dummy.c
index ab77790c3e5..85d40f0e091 100644
--- a/sys/i386/linux/linux_dummy.c
+++ b/sys/i386/linux/linux_dummy.c
@@ -30,7 +30,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 71417e05676..0ad67910e75 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -684,17 +684,7 @@ linux_sigreturn(struct thread *td, struct linux_sigreturn_args *args)
 	 */
 #define	EFLAGS_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
 	eflags = frame.sf_sc.sc_eflags;
-	/*
-	 * XXX do allow users to change the privileged flag PSL_RF.  The
-	 * cpu sets PSL_RF in tf_eflags for faults.  Debuggers should
-	 * sometimes set it there too.  tf_eflags is kept in the signal
-	 * context during signal handling and there is no other place
-	 * to remember it, so the PSL_RF bit may be corrupted by the
-	 * signal handler without us knowing.  Corruption of the PSL_RF
-	 * bit at worst causes one more or one less debugger trap, so
-	 * allowing it is fairly harmless.
-	 */
-	if (!EFLAGS_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF))
+	if (!EFLAGS_SECURE(eflags, regs->tf_eflags))
 		return(EINVAL);
 
 	/*
@@ -785,17 +775,7 @@ linux_rt_sigreturn(struct thread *td, struct linux_rt_sigreturn_args *args)
 	 */
 #define	EFLAGS_SECURE(ef, oef)	((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0)
 	eflags = context->sc_eflags;
-	/*
-	 * XXX do allow users to change the privileged flag PSL_RF.  The
-	 * cpu sets PSL_RF in tf_eflags for faults.  Debuggers should
-	 * sometimes set it there too.  tf_eflags is kept in the signal
-	 * context during signal handling and there is no other place
-	 * to remember it, so the PSL_RF bit may be corrupted by the
-	 * signal handler without us knowing.  Corruption of the PSL_RF
-	 * bit at worst causes one more or one less debugger trap, so
-	 * allowing it is fairly harmless.
-	 */
-	if (!EFLAGS_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF))
+	if (!EFLAGS_SECURE(eflags, regs->tf_eflags))
 		return(EINVAL);
 
 	/*
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index bddaaa836c7..cce4981d9c9 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -306,7 +306,7 @@ pci_cfgenable(unsigned bus, unsigned slot, unsigned func, int reg, int bytes)
 		switch (cfgmech) {
 		case CFGMECH_PCIE:
 		case CFGMECH_1:
-			outl(CONF1_ADDR_PORT, (1 << 31)
+			outl(CONF1_ADDR_PORT, (1U << 31)
 			    | (bus << 16) | (slot << 11) 
 			    | (func << 8) | (reg & ~0x03));
 			dataport = CONF1_DATA_PORT + (reg & 0x03);
diff --git a/sys/i386/xen/mp_machdep.c b/sys/i386/xen/mp_machdep.c
index ae5b5d46c16..c48fcb2a9b7 100644
--- a/sys/i386/xen/mp_machdep.c
+++ b/sys/i386/xen/mp_machdep.c
@@ -783,13 +783,7 @@ start_all_aps(void)
 		dpcpu_init((void *)kmem_malloc(kernel_arena, DPCPU_SIZE,
 		    M_WAITOK | M_ZERO), bootAP);
 		pc->pc_apic_id = cpu_apic_ids[bootAP];
-		/*
-		 * The i386 PV port uses the apic_id as vCPU id, but the
-		 * PVHVM port needs to use the acpi_id, so set it for PV
-		 * also in order to work with shared devices between PV
-		 * and PVHVM.
-		 */
-		pc->pc_acpi_id = cpu_apic_ids[bootAP];
+		pc->pc_vcpu_id = cpu_apic_ids[bootAP];
 		pc->pc_prvspace = pc;
 		pc->pc_curthread = 0;
 
diff --git a/sys/i386/xen/mptable.c b/sys/i386/xen/mptable.c
index 29d3b339fef..6682a8f2ff4 100644
--- a/sys/i386/xen/mptable.c
+++ b/sys/i386/xen/mptable.c
@@ -88,7 +88,7 @@ mptable_setup_local(void)
 {
 
 	PCPU_SET(apic_id, 0);
-	PCPU_SET(acpi_id, 0);
+	PCPU_SET(vcpu_id, 0);
 	return (0);
 }
 
diff --git a/sys/ia64/conf/GENERIC b/sys/ia64/conf/GENERIC
index 553c5d1fcef..82008431a49 100644
--- a/sys/ia64/conf/GENERIC
+++ b/sys/ia64/conf/GENERIC
@@ -46,7 +46,6 @@ options 	NFS_ROOT	# NFS usable as root device
 options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
 options 	PREEMPTION	# Enable kernel thread preemption
 options 	PRINTF_BUFR_SIZE=128  # Printf buffering to limit interspersion
-options 	PROCDESC	# Support for process descriptors
 options 	PROCFS		# Process filesystem (/proc)
 options 	PSEUDOFS	# Pseudo-filesystem framework
 options 	SCHED_ULE	# ULE scheduler
diff --git a/sys/ia64/ia64/busdma_machdep.c b/sys/ia64/ia64/busdma_machdep.c
index 770f29f0176..206fc6e7da8 100644
--- a/sys/ia64/ia64/busdma_machdep.c
+++ b/sys/ia64/ia64/busdma_machdep.c
@@ -658,6 +658,17 @@ _bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
 	 */
 	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
 }
+
+int
+_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
+    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+    bus_dma_segment_t *segs, int *segp)
+{
+
+	return (bus_dmamap_load_ma_triv(dmat, map, ma, tlen, ma_offs, flags,
+	    segs, segp));
+}
+
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrace, and the ending segment on exit.
diff --git a/sys/ia64/ia64/machdep.c b/sys/ia64/ia64/machdep.c
index 537315117e6..92bbc64cbfa 100644
--- a/sys/ia64/ia64/machdep.c
+++ b/sys/ia64/ia64/machdep.c
@@ -716,8 +716,8 @@ ia64_init(void)
 	 * handlers. Here we just make sure that they have the largest
 	 * possible page size to minimise TLB usage.
 	 */
-	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (PAGE_SHIFT << 2));
-	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (PAGE_SHIFT << 2));
+	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (LOG2_ID_PAGE_SIZE << 2));
+	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (LOG2_ID_PAGE_SIZE << 2));
 	ia64_srlz_d();
 
 	/* Initialize/setup physical memory datastructures */
diff --git a/sys/ia64/ia64/mp_machdep.c b/sys/ia64/ia64/mp_machdep.c
index 8e71b35e00a..ea579017d08 100644
--- a/sys/ia64/ia64/mp_machdep.c
+++ b/sys/ia64/ia64/mp_machdep.c
@@ -65,6 +65,8 @@ __FBSDID("$FreeBSD$");
 
 extern uint64_t bdata[];
 
+extern int smp_disabled;
+
 MALLOC_DEFINE(M_SMP, "SMP", "SMP related allocations");
 
 void ia64_ap_startup(void);
@@ -206,8 +208,8 @@ ia64_ap_startup(void)
 	ia64_ap_state.as_trace = 0x100;
 
 	ia64_set_rr(IA64_RR_BASE(5), (5 << 8) | (PAGE_SHIFT << 2) | 1);
-	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (PAGE_SHIFT << 2));
-	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (PAGE_SHIFT << 2));
+	ia64_set_rr(IA64_RR_BASE(6), (6 << 8) | (LOG2_ID_PAGE_SIZE << 2));
+	ia64_set_rr(IA64_RR_BASE(7), (7 << 8) | (LOG2_ID_PAGE_SIZE << 2));
 	ia64_srlz_d();
 
 	pcpup = ia64_ap_state.as_pcpu;
@@ -238,6 +240,8 @@ ia64_ap_startup(void)
 	KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread"));
 	PCPU_SET(curthread, PCPU_GET(idlethread));
 
+	pmap_invalidate_all();
+
 	atomic_add_int(&ia64_ap_state.as_awake, 1);
 	while (!smp_started)
 		cpu_spinwait();
@@ -249,8 +253,6 @@ ia64_ap_startup(void)
 	ia64_set_tpr(0);
 	ia64_srlz_d();
 
-	ia64_enable_intr();
-
 	sched_throw(NULL);
 	/* NOTREACHED */
 }
@@ -294,6 +296,9 @@ cpu_mp_add(u_int acpi_id, u_int id, u_int eid)
 	void *dpcpu;
 	u_int cpuid, sapic_id;
 
+	if (smp_disabled)
+		return;
+
 	sapic_id = SAPIC_ID_SET(id, eid);
 	cpuid = (IA64_LID_GET_SAPIC_ID(ia64_get_lid()) == sapic_id)
 	    ? 0 : smp_cpus++;
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c
index 3e848399d9e..89bd82d42bf 100644
--- a/sys/ia64/ia64/pmap.c
+++ b/sys/ia64/ia64/pmap.c
@@ -195,12 +195,12 @@ extern struct ia64_lpte ***ia64_kptdir;
 
 vm_offset_t kernel_vm_end;
 
-/* Values for ptc.e. XXX values for SKI. */
-static uint64_t pmap_ptc_e_base = 0x100000000;
-static uint64_t pmap_ptc_e_count1 = 3;
-static uint64_t pmap_ptc_e_count2 = 2;
-static uint64_t pmap_ptc_e_stride1 = 0x2000;
-static uint64_t pmap_ptc_e_stride2 = 0x100000000;
+/* Defaults for ptc.e. */
+static uint64_t pmap_ptc_e_base = 0;
+static uint32_t pmap_ptc_e_count1 = 1;
+static uint32_t pmap_ptc_e_count2 = 1;
+static uint32_t pmap_ptc_e_stride1 = 0;
+static uint32_t pmap_ptc_e_stride2 = 0;
 
 struct mtx pmap_ptc_mutex;
 
@@ -262,7 +262,6 @@ static vm_page_t pmap_pv_reclaim(pmap_t locked_pmap);
 static void	pmap_enter_quick_locked(pmap_t pmap, vm_offset_t va,
 		    vm_page_t m, vm_prot_t prot);
 static void	pmap_free_pte(struct ia64_lpte *pte, vm_offset_t va);
-static void	pmap_invalidate_all(void);
 static int	pmap_remove_pte(pmap_t pmap, struct ia64_lpte *pte,
 		    vm_offset_t va, pv_entry_t pv, int freepte);
 static int	pmap_remove_vhpt(vm_offset_t va);
@@ -325,12 +324,12 @@ pmap_bootstrap()
 		panic("Can't configure ptc.e parameters");
 	pmap_ptc_e_base = res.pal_result[0];
 	pmap_ptc_e_count1 = res.pal_result[1] >> 32;
-	pmap_ptc_e_count2 = res.pal_result[1] & ((1L<<32) - 1);
+	pmap_ptc_e_count2 = res.pal_result[1];
 	pmap_ptc_e_stride1 = res.pal_result[2] >> 32;
-	pmap_ptc_e_stride2 = res.pal_result[2] & ((1L<<32) - 1);
+	pmap_ptc_e_stride2 = res.pal_result[2];
 	if (bootverbose)
-		printf("ptc.e base=0x%lx, count1=%ld, count2=%ld, "
-		       "stride1=0x%lx, stride2=0x%lx\n",
+		printf("ptc.e base=0x%lx, count1=%u, count2=%u, "
+		       "stride1=0x%x, stride2=0x%x\n",
 		       pmap_ptc_e_base,
 		       pmap_ptc_e_count1,
 		       pmap_ptc_e_count2,
@@ -537,13 +536,12 @@ pmap_invalidate_page(vm_offset_t va)
 	critical_exit();
 }
 
-static void
-pmap_invalidate_all_1(void *arg)
+void
+pmap_invalidate_all(void)
 {
 	uint64_t addr;
 	int i, j;
 
-	critical_enter();
 	addr = pmap_ptc_e_base;
 	for (i = 0; i < pmap_ptc_e_count1; i++) {
 		for (j = 0; j < pmap_ptc_e_count2; j++) {
@@ -552,20 +550,7 @@ pmap_invalidate_all_1(void *arg)
 		}
 		addr += pmap_ptc_e_stride1;
 	}
-	critical_exit();
-}
-
-static void
-pmap_invalidate_all(void)
-{
-
-#ifdef SMP
-	if (mp_ncpus > 1) {
-		smp_rendezvous(NULL, pmap_invalidate_all_1, NULL, NULL);
-		return;
-	}
-#endif
-	pmap_invalidate_all_1(NULL);
+	ia64_srlz_i();
 }
 
 static uint32_t
diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h
index c00eb28af8d..a260a7598ef 100644
--- a/sys/ia64/include/param.h
+++ b/sys/ia64/include/param.h
@@ -105,6 +105,11 @@
 #endif
 #define	KSTACK_GUARD_PAGES 0		/* pages of kstack guard; 0 disables */
 
+/* The default size of identity mappings in region 6 & 7. */
+#ifndef LOG2_ID_PAGE_SIZE
+#define	LOG2_ID_PAGE_SIZE	16
+#endif
+
 /*
  * Mach derived conversion macros
  */
diff --git a/sys/ia64/include/pmap.h b/sys/ia64/include/pmap.h
index b59a9cbdee1..3db0cada6ac 100644
--- a/sys/ia64/include/pmap.h
+++ b/sys/ia64/include/pmap.h
@@ -122,6 +122,7 @@ extern int pmap_vhpt_log2size;
 
 vm_offset_t pmap_alloc_vhpt(void);
 void	pmap_bootstrap(void);
+void	pmap_invalidate_all(void);
 void	pmap_kenter(vm_offset_t va, vm_offset_t pa);
 vm_paddr_t pmap_kextract(vm_offset_t va);
 void	pmap_kremove(vm_offset_t);
diff --git a/sys/ia64/include/vmparam.h b/sys/ia64/include/vmparam.h
index 1fda472a273..edae4c4689f 100644
--- a/sys/ia64/include/vmparam.h
+++ b/sys/ia64/include/vmparam.h
@@ -189,19 +189,11 @@
 #define	USRSTACK		VM_MAXUSER_ADDRESS
 #define	IA64_BACKINGSTORE	(USRSTACK - (2 * MAXSSIZ) - PAGE_SIZE)
 
-/* virtual sizes (bytes) for various kernel submaps */
-#ifndef VM_KMEM_SIZE
-#define VM_KMEM_SIZE		(12 * 1024 * 1024)
-#endif
-
 /*
- * How many physical pages per KVA page allocated.
- * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE),
- *     VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
- * is the total KVA space allocated for kmem_map.
+ * How many physical pages per kmem arena virtual page.
  */
 #ifndef VM_KMEM_SIZE_SCALE
-#define	VM_KMEM_SIZE_SCALE	(4) /* XXX 8192 byte pages */
+#define	VM_KMEM_SIZE_SCALE	(4)
 #endif
 
 /* initial pagein size of beginning of executable file */
diff --git a/sys/kern/capabilities.conf b/sys/kern/capabilities.conf
index 7f68668a542..746a04cd9f1 100644
--- a/sys/kern/capabilities.conf
+++ b/sys/kern/capabilities.conf
@@ -385,13 +385,6 @@ listen
 ##
 lseek
 
-##
-## Allow MAC label operations by file descriptor, subject to capability
-## rights.
-##
-mac_get_fd
-mac_set_fd
-
 ##
 ## Allow simple VM operations on the current process.
 ##
@@ -552,7 +545,7 @@ sched_get_priority_min
 ##
 sched_getparam
 sched_getscheduler
-sched_rr_getinterval
+sched_rr_get_interval
 sched_setparam
 sched_setscheduler
 sched_yield
diff --git a/sys/kern/dtio_kdtrace.c b/sys/kern/dtio_kdtrace.c
deleted file mode 100644
index 3d6f416e109..00000000000
--- a/sys/kern/dtio_kdtrace.c
+++ /dev/null
@@ -1,232 +0,0 @@
-/*-
- * Copyright (c) 2012 Advanced Computing Technologies LLC
- * Written by George Neville-Neil gnn@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/param.h>
-#include <sys/systm.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-
-#include <sys/dtrace.h>
-#include "../sys/dtrace_bsd.h"
-
-
-static int	dtio_unload(void);
-static void	dtio_getargdesc(void *, dtrace_id_t, void *,
-		    dtrace_argdesc_t *);
-static void	dtio_provide(void *, dtrace_probedesc_t *);
-static void	dtio_destroy(void *, dtrace_id_t, void *);
-static void	dtio_enable(void *, dtrace_id_t, void *);
-static void	dtio_disable(void *, dtrace_id_t, void *);
-static void	dtio_load(void *);
-
-static dtrace_pattr_t dtio_attr = {
-{ DTRACE_STABILITY_STABLE, DTRACE_STABILITY_STABLE, DTRACE_CLASS_COMMON },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_PRIVATE, DTRACE_STABILITY_PRIVATE, DTRACE_CLASS_UNKNOWN },
-{ DTRACE_STABILITY_STABLE, DTRACE_STABILITY_STABLE, DTRACE_CLASS_COMMON },
-{ DTRACE_STABILITY_STABLE, DTRACE_STABILITY_STABLE, DTRACE_CLASS_COMMON },
-};
-
-static char    *kernel = "kernel";
-
-/*
- * Name strings.
- */
-static char	*dtio_start_str = "start";
-static char	*dtio_done_str = "done";
-static char	*dtio_wait_start_str = "wait-start";
-static char	*dtio_wait_done_str = "wait-done";
-
-static dtrace_pops_t dtio_pops = {
-	dtio_provide,
-	NULL,
-	dtio_enable,
-	dtio_disable,
-	NULL,
-	NULL,
-	dtio_getargdesc,
-	NULL,
-	NULL,
-	dtio_destroy
-};
-
-static dtrace_provider_id_t	dtio_id;
-
-extern uint32_t	dtio_start_id;
-extern uint32_t	dtio_done_id;
-extern uint32_t	dtio_wait_start_id;
-extern uint32_t	dtio_wait_done_id;
-
-static void
-dtio_getargdesc(void *arg, dtrace_id_t id, void *parg,
-    dtrace_argdesc_t *desc)
-{
-	const char *p = NULL;
-
-	switch (desc->dtargd_ndx) {
-	case 0:
-		p = "struct bio *";
-		break;
-	case 1:
-		p = "struct devstat *";
-		break;
-	default:
-		desc->dtargd_ndx = DTRACE_ARGNONE;
-	}
-
-	if (p != NULL)
-		strlcpy(desc->dtargd_native, p, sizeof(desc->dtargd_native));
-}
-
-static void
-dtio_provide(void *arg, dtrace_probedesc_t *desc)
-{
-	if (desc != NULL)
-		return;
-
-	if (dtrace_probe_lookup(dtio_id, kernel, NULL, 
-				dtio_start_str) == 0) {
-		dtio_start_id = dtrace_probe_create(dtio_id, kernel, NULL, 
-						   dtio_start_str, 0, NULL);
-	}
-	if (dtrace_probe_lookup(dtio_id, kernel, NULL, dtio_done_str) == 0) {
-		dtio_done_id = dtrace_probe_create(dtio_id, kernel, NULL, 
-						   dtio_done_str, 0, NULL);
-	}
-	if (dtrace_probe_lookup(dtio_id, kernel, NULL, 
-				dtio_wait_start_str) == 0) {
-		dtio_wait_start_id = dtrace_probe_create(dtio_id, kernel, 
-							 NULL, 
-							 dtio_wait_start_str, 
-							 0, NULL);
-	}
-	if (dtrace_probe_lookup(dtio_id, kernel, NULL, 
-				dtio_wait_done_str) == 0) {
-		dtio_wait_done_id = dtrace_probe_create(dtio_id, kernel, NULL, 
-						   dtio_wait_done_str, 0, NULL);
-	}
-
-}
-
-static void
-dtio_destroy(void *arg, dtrace_id_t id, void *parg)
-{
-}
-
-static void
-dtio_enable(void *arg, dtrace_id_t id, void *parg)
-{
-	if (id == dtio_start_id)
-		dtrace_io_start_probe =
-			(dtrace_io_start_probe_func_t)dtrace_probe;
-	else if (id == dtio_done_id)
-		dtrace_io_done_probe =
-			(dtrace_io_done_probe_func_t)dtrace_probe;
-	else if (id == dtio_wait_start_id)
-		dtrace_io_wait_start_probe =
-			(dtrace_io_wait_start_probe_func_t)dtrace_probe;
-	else if (id == dtio_wait_done_id)
-		dtrace_io_wait_done_probe =
-			(dtrace_io_wait_done_probe_func_t)dtrace_probe;
-	else
-		printf("dtrace io provider: unknown ID\n");
-
-}
-
-static void
-dtio_disable(void *arg, dtrace_id_t id, void *parg)
-{
-	if (id == dtio_start_id)
-		dtrace_io_start_probe = NULL;
-	else if (id == dtio_done_id)
-		dtrace_io_done_probe = NULL;
-	else if (id == dtio_wait_start_id)
-		dtrace_io_wait_start_probe = NULL;
-	else if (id == dtio_wait_done_id)
-		dtrace_io_wait_done_probe = NULL;
-	else 
-		printf("dtrace io provider: unknown ID\n");
-	
-}
-
-static void
-dtio_load(void *dummy)
-{
-	if (dtrace_register("io", &dtio_attr, DTRACE_PRIV_USER, NULL, 
-			    &dtio_pops, NULL, &dtio_id) != 0)
-		return;
-}
-
-
-static int
-dtio_unload()
-{
-	dtrace_io_start_probe = NULL;
-	dtrace_io_done_probe = NULL;
-	dtrace_io_wait_start_probe = NULL;
-	dtrace_io_wait_done_probe = NULL;
-
-	return (dtrace_unregister(dtio_id));
-}
-
-static int
-dtio_modevent(module_t mod __unused, int type, void *data __unused)
-{
-	int error = 0;
-
-	switch (type) {
-	case MOD_LOAD:
-		break;
-
-	case MOD_UNLOAD:
-		break;
-
-	case MOD_SHUTDOWN:
-		break;
-
-	default:
-		error = EOPNOTSUPP;
-		break;
-	}
-
-	return (error);
-}
-
-SYSINIT(dtio_load, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY,
-    dtio_load, NULL);
-SYSUNINIT(dtio_unload, SI_SUB_DTRACE_PROVIDER, SI_ORDER_ANY,
-    dtio_unload, NULL);
-
-DEV_MODULE(dtio, dtio_modevent, NULL);
-MODULE_VERSION(dtio, 1);
-MODULE_DEPEND(dtio, dtrace, 1, 1, 1);
-MODULE_DEPEND(dtio, opensolaris, 1, 1, 1);
diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 4cfd219590b..3d232cf744c 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_kdb.h"
 #include "opt_device_polling.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_ntp.h"
 #include "opt_watchdog.h"
 
@@ -93,7 +92,7 @@ SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL);
 static struct mtx time_lock;
 
 SDT_PROVIDER_DECLARE(sched);
-SDT_PROBE_DEFINE2(sched, , , tick, tick, "struct thread *", "struct proc *");
+SDT_PROBE_DEFINE2(sched, , , tick, "struct thread *", "struct proc *");
 
 static int
 sysctl_kern_cp_time(SYSCTL_HANDLER_ARGS)
diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c
index c2bebbeeb95..0aa71bd7372 100644
--- a/sys/kern/kern_clocksource.c
+++ b/sys/kern/kern_clocksource.c
@@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "opt_device_polling.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index c04d1da7f5f..b1ae7a16cea 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -193,7 +193,7 @@ dev_refthread(struct cdev *dev, int *ref)
 	if (csw != NULL) {
 		cdp = cdev2priv(dev);
 		if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0)
-			dev->si_threadcount++;
+			atomic_add_long(&dev->si_threadcount, 1);
 		else
 			csw = NULL;
 	}
@@ -234,7 +234,7 @@ devvn_refthread(struct vnode *vp, struct cdev **devp, int *ref)
 	if ((cdp->cdp_flags & CDP_SCHED_DTR) == 0) {
 		csw = dev->si_devsw;
 		if (csw != NULL)
-			dev->si_threadcount++;
+			atomic_add_long(&dev->si_threadcount, 1);
 	}
 	dev_unlock();
 	if (csw != NULL) {
@@ -251,11 +251,9 @@ dev_relthread(struct cdev *dev, int ref)
 	mtx_assert(&devmtx, MA_NOTOWNED);
 	if (!ref)
 		return;
-	dev_lock();
 	KASSERT(dev->si_threadcount > 0,
 	    ("%s threadcount is wrong", dev->si_name));
-	dev->si_threadcount--;
-	dev_unlock();
+	atomic_subtract_rel_long(&dev->si_threadcount, 1);
 }
 
 int
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index a1021e12c13..c0d9008ea29 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_compat.h"
 #include "opt_ddb.h"
 #include "opt_ktrace.h"
-#include "opt_procdesc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -119,6 +118,7 @@ static int	closefp(struct filedesc *fdp, int fd, struct file *fp,
 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);
@@ -129,6 +129,7 @@ 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);
 
 /*
  * Each process has:
@@ -771,6 +772,18 @@ kern_fcntl(struct thread *td, int fd, int cmd, intptr_t arg)
 	return (error);
 }
 
+static int
+getmaxfd(struct proc *p)
+{
+	int maxfd;
+
+	PROC_LOCK(p);
+	maxfd = min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc);
+	PROC_UNLOCK(p);
+
+	return (maxfd);
+}
+
 /*
  * Common code for dup, dup2, fcntl(F_DUPFD) and fcntl(F_DUP2FD).
  */
@@ -797,9 +810,7 @@ do_dup(struct thread *td, int flags, int old, int new,
 		return (EBADF);
 	if (new < 0)
 		return (flags & DUP_FCNTL ? EINVAL : EBADF);
-	PROC_LOCK(p);
-	maxfd = min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc);
-	PROC_UNLOCK(p);
+	maxfd = getmaxfd(p);
 	if (new >= maxfd)
 		return (flags & DUP_FCNTL ? EINVAL : EBADF);
 
@@ -844,7 +855,7 @@ do_dup(struct thread *td, int flags, int old, int new,
 				return (EMFILE);
 			}
 #endif
-			fdgrowtable(fdp, new + 1);
+			fdgrowtable_exp(fdp, new + 1);
 			oldfde = &fdp->fd_ofiles[old];
 		}
 		newfde = &fdp->fd_ofiles[new];
@@ -1467,6 +1478,24 @@ filecaps_validate(const struct filecaps *fcaps, const char *func)
 	    ("%s: ioctls without CAP_IOCTL", func));
 }
 
+static void
+fdgrowtable_exp(struct filedesc *fdp, int nfd)
+{
+	int nfd1, maxfd;
+
+	FILEDESC_XLOCK_ASSERT(fdp);
+
+	nfd1 = fdp->fd_nfiles * 2;
+	if (nfd1 < nfd)
+		nfd1 = nfd;
+	maxfd = getmaxfd(curproc);
+	if (maxfd < nfd1)
+		nfd1 = maxfd;
+	KASSERT(nfd <= nfd1,
+	    ("too low nfd1 %d %d %d %d", nfd, fdp->fd_nfiles, maxfd, nfd1));
+	fdgrowtable(fdp, nfd1);
+}
+
 /*
  * Grow the file table to accomodate (at least) nfd descriptors.
  */
@@ -1563,9 +1592,7 @@ fdalloc(struct thread *td, int minfd, int *result)
 	if (fdp->fd_freefile > minfd)
 		minfd = fdp->fd_freefile;
 
-	PROC_LOCK(p);
-	maxfd = min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc);
-	PROC_UNLOCK(p);
+	maxfd = getmaxfd(p);
 
 	/*
 	 * Search the bitmap for a free descriptor starting at minfd.
@@ -1587,7 +1614,7 @@ fdalloc(struct thread *td, int minfd, int *result)
 		 * fd is already equal to first free descriptor >= minfd, so
 		 * we only need to grow the table and we are done.
 		 */
-		fdgrowtable(fdp, allocfd);
+		fdgrowtable_exp(fdp, allocfd);
 	}
 
 	/*
@@ -1652,9 +1679,7 @@ fdavail(struct thread *td, int n)
 	 *      call racct_add() from there instead of dealing with containers
 	 *      here.
 	 */
-	PROC_LOCK(p);
-	lim = min((int)lim_cur(p, RLIMIT_NOFILE), maxfilesperproc);
-	PROC_UNLOCK(p);
+	lim = getmaxfd(p);
 	if ((i = lim - fdp->fd_nfiles) > 0 && (n -= i) <= 0)
 		return (1);
 	last = min(fdp->fd_nfiles, lim);
@@ -3089,11 +3114,9 @@ sysctl_kern_proc_ofiledesc(SYSCTL_HANDLER_ARGS)
 			tp = fp->f_data;
 			break;
 
-#ifdef PROCDESC
 		case DTYPE_PROCDESC:
 			kif->kf_type = KF_TYPE_PROCDESC;
 			break;
-#endif
 
 		default:
 			kif->kf_type = KF_TYPE_UNKNOWN;
@@ -3459,12 +3482,10 @@ kern_proc_filedesc_out(struct proc *p,  struct sbuf *sb, ssize_t maxlen)
 			data = fp->f_data;
 			break;
 
-#ifdef PROCDESC
 		case DTYPE_PROCDESC:
 			type = KF_TYPE_PROCDESC;
 			data = fp->f_data;
 			break;
-#endif
 
 		default:
 			type = KF_TYPE_UNKNOWN;
@@ -3928,7 +3949,7 @@ badfo_chown(struct file *fp, uid_t uid, gid_t gid, struct ucred *active_cred,
 static int
 badfo_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
     struct uio *trl_uio, off_t offset, size_t nbytes, off_t *sent, int flags,
-    int kflags, struct thread *td)
+    int kflags, struct sendfile_sync *sfs, struct thread *td)
 {
 
 	return (EBADF);
@@ -3967,7 +3988,7 @@ invfo_chown(struct file *fp, uid_t uid, gid_t gid, struct ucred *active_cred,
 int
 invfo_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
     struct uio *trl_uio, off_t offset, size_t nbytes, off_t *sent, int flags,
-    int kflags, struct thread *td)
+    int kflags, struct sendfile_sync *sfs, struct thread *td)
 {
 
 	return (EINVAL);
diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index e89b3f77b55..ff453cb91f2 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -315,20 +315,12 @@ char *
 getenv(const char *name)
 {
 	char buf[KENV_MNAMELEN + 1 + KENV_MVALLEN + 1];
-	char *ret, *cp;
-	int len;
+	char *ret;
 
 	if (dynamic_kenv) {
-		mtx_lock(&kenv_lock);
-		cp = _getenv_dynamic(name, NULL);
-		if (cp != NULL) {
-			strcpy(buf, cp);
-			mtx_unlock(&kenv_lock);
-			len = strlen(buf) + 1;
-			ret = malloc(len, M_KENV, M_WAITOK);
-			strcpy(ret, buf);
+		if (getenv_string(name, buf, sizeof(buf))) {
+			ret = strdup(buf, M_KENV);
 		} else {
-			mtx_unlock(&kenv_lock);
 			ret = NULL;
 			WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL,
 			    "getenv");
@@ -458,15 +450,20 @@ unsetenv(const char *name)
 int
 getenv_string(const char *name, char *data, int size)
 {
-	char *tmp;
+	char *cp;
 
-	tmp = getenv(name);
-	if (tmp != NULL) {
-		strlcpy(data, tmp, size);
-		freeenv(tmp);
-		return (1);
-	} else
-		return (0);
+	if (dynamic_kenv) {
+		mtx_lock(&kenv_lock);
+		cp = _getenv_dynamic(name, NULL);
+		if (cp != NULL)
+			strlcpy(data, cp, size);
+		mtx_unlock(&kenv_lock);
+	} else {
+		cp = _getenv_static(name);
+		if (cp != NULL)
+			strlcpy(data, cp, size);
+	}
+	return (cp != NULL);
 }
 
 /*
@@ -535,18 +532,15 @@ getenv_ulong(const char *name, unsigned long *data)
 int
 getenv_quad(const char *name, quad_t *data)
 {
-	char	*value;
+	char	value[KENV_MNAMELEN + 1 + KENV_MVALLEN + 1];
 	char	*vtp;
 	quad_t	iv;
 
-	value = getenv(name);
-	if (value == NULL)
+	if (!getenv_string(name, value, sizeof(value)))
 		return (0);
 	iv = strtoq(value, &vtp, 0);
-	if (vtp == value || (vtp[0] != '\0' && vtp[1] != '\0')) {
-		freeenv(value);
+	if (vtp == value || (vtp[0] != '\0' && vtp[1] != '\0'))
 		return (0);
-	}
 	switch (vtp[0]) {
 	case 't': case 'T':
 		iv *= 1024;
@@ -559,11 +553,9 @@ getenv_quad(const char *name, quad_t *data)
 	case '\0':
 		break;
 	default:
-		freeenv(value);
 		return (0);
 	}
 	*data = iv;
-	freeenv(value);
 	return (1);
 }
 
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 4c068bf0f31..dfbba675a3b 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/eventvar.h>
 #include <sys/poll.h>
 #include <sys/protosw.h>
+#include <sys/resourcevar.h>
 #include <sys/sigio.h>
 #include <sys/signalvar.h>
 #include <sys/socket.h>
@@ -699,9 +700,23 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap)
 	struct filedesc *fdp;
 	struct kqueue *kq;
 	struct file *fp;
+	struct proc *p;
+	struct ucred *cred;
 	int fd, error;
 
-	fdp = td->td_proc->p_fd;
+	p = td->td_proc;
+	cred = td->td_ucred;
+	crhold(cred);
+	PROC_LOCK(p);
+	if (!chgkqcnt(cred->cr_ruidinfo, 1, lim_cur(td->td_proc,
+	    RLIMIT_KQUEUES))) {
+		PROC_UNLOCK(p);
+		crfree(cred);
+		return (ENOMEM);
+	}
+	PROC_UNLOCK(p);
+
+	fdp = p->p_fd;
 	error = falloc(td, &fp, &fd, 0);
 	if (error)
 		goto done2;
@@ -711,6 +726,7 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap)
 	mtx_init(&kq->kq_lock, "kqueue", NULL, MTX_DEF|MTX_DUPOK);
 	TAILQ_INIT(&kq->kq_head);
 	kq->kq_fdp = fdp;
+	kq->kq_cred = cred;
 	knlist_init_mtx(&kq->kq_sel.si_note, &kq->kq_lock);
 	TASK_INIT(&kq->kq_task, 0, kqueue_task, kq);
 
@@ -723,6 +739,10 @@ sys_kqueue(struct thread *td, struct kqueue_args *uap)
 
 	td->td_retval[0] = fd;
 done2:
+	if (error != 0) {
+		chgkqcnt(cred->cr_ruidinfo, -1, 0);
+		crfree(cred);
+	}
 	return (error);
 }
 
@@ -835,10 +855,17 @@ kern_kevent(struct thread *td, int fd, int nchanges, int nevents,
 	cap_rights_t rights;
 	int i, n, nerrors, error;
 
-	error = fget(td, fd, cap_rights_init(&rights, CAP_POST_EVENT), &fp);
+	cap_rights_init(&rights);
+	if (nchanges > 0)
+		cap_rights_set(&rights, CAP_KQUEUE_CHANGE);
+	if (nevents > 0)
+		cap_rights_set(&rights, CAP_KQUEUE_EVENT);
+	error = fget(td, fd, &rights, &fp);
 	if (error != 0)
 		return (error);
-	if ((error = kqueue_acquire(fp, &kq)) != 0)
+
+	error = kqueue_acquire(fp, &kq);
+	if (error != 0)
 		goto done_norel;
 
 	nerrors = 0;
@@ -995,7 +1022,7 @@ findkn:
 	if (fops->f_isfd) {
 		KASSERT(td != NULL, ("td is NULL"));
 		error = fget(td, kev->ident,
-		    cap_rights_init(&rights, CAP_POLL_EVENT), &fp);
+		    cap_rights_init(&rights, CAP_EVENT), &fp);
 		if (error)
 			goto done;
 
@@ -1767,6 +1794,8 @@ kqueue_close(struct file *fp, struct thread *td)
 		free(kq->kq_knlist, M_KQUEUE);
 
 	funsetown(&kq->kq_sigio);
+	chgkqcnt(kq->kq_cred->cr_ruidinfo, -1, 0);
+	crfree(kq->kq_cred);
 	free(kq, M_KQUEUE);
 	fp->f_data = NULL;
 
@@ -2279,7 +2308,7 @@ kqfd_register(int fd, struct kevent *kev, struct thread *td, int waitok)
 	cap_rights_t rights;
 	int error;
 
-	error = fget(td, fd, cap_rights_init(&rights, CAP_POST_EVENT), &fp);
+	error = fget(td, fd, cap_rights_init(&rights, CAP_KQUEUE_CHANGE), &fp);
 	if (error != 0)
 		return (error);
 	if ((error = kqueue_acquire(fp, &kq)) != 0)
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 45f732b2f85..9f4ceac760a 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_capsicum.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_vm.h"
 
@@ -96,9 +95,9 @@ dtrace_execexit_func_t	dtrace_fasttrap_exec;
 #endif
 
 SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE1(proc, kernel, , exec, exec, "char *");
-SDT_PROBE_DEFINE1(proc, kernel, , exec_failure, exec-failure, "int");
-SDT_PROBE_DEFINE1(proc, kernel, , exec_success, exec-success, "char *");
+SDT_PROBE_DEFINE1(proc, kernel, , exec, "char *");
+SDT_PROBE_DEFINE1(proc, kernel, , exec__failure, "int");
+SDT_PROBE_DEFINE1(proc, kernel, , exec__success, "char *");
 
 MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments");
 
@@ -123,6 +122,11 @@ u_long ps_arg_cache_limit = PAGE_SIZE / 16;
 SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW, 
     &ps_arg_cache_limit, 0, "");
 
+static int disallow_high_osrel;
+SYSCTL_INT(_kern, OID_AUTO, disallow_high_osrel, CTLFLAG_RW,
+    &disallow_high_osrel, 0,
+    "Disallow execution of binaries built for higher version of the world");
+
 static int map_at_zero = 0;
 TUNABLE_INT("security.bsd.map_at_zero", &map_at_zero);
 SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RW, &map_at_zero, 0,
@@ -552,6 +556,15 @@ interpret:
 	     vn_fullpath(td, imgp->vp, &imgp->execpath, &imgp->freepath) != 0))
 		imgp->execpath = args->fname;
 
+	if (disallow_high_osrel &&
+	    P_OSREL_MAJOR(p->p_osrel) > P_OSREL_MAJOR(__FreeBSD_version)) {
+		error = ENOEXEC;
+		uprintf("Osrel %d for image %s too high\n", p->p_osrel,
+		    imgp->execpath != NULL ? imgp->execpath : "<unresolved>");
+		vn_lock(imgp->vp, LK_SHARED | LK_RETRY);
+		goto exec_fail_dealloc;
+	}
+
 	/*
 	 * Copy out strings (args and env) and initialize stack base
 	 */
@@ -819,7 +832,7 @@ interpret:
 
 	vfs_mark_atime(imgp->vp, td->td_ucred);
 
-	SDT_PROBE(proc, kernel, , exec_success, args->fname, 0, 0, 0, 0);
+	SDT_PROBE(proc, kernel, , exec__success, args->fname, 0, 0, 0, 0);
 
 done1:
 	/*
@@ -891,7 +904,7 @@ exec_fail:
 	p->p_flag &= ~P_INEXEC;
 	PROC_UNLOCK(p);
 
-	SDT_PROBE(proc, kernel, , exec_failure, error, 0, 0, 0, 0);
+	SDT_PROBE(proc, kernel, , exec__failure, error, 0, 0, 0, 0);
 
 done2:
 #ifdef MAC
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index f0be10ed624..b2f86b15cf7 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -38,9 +38,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
-#include "opt_procdesc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -94,7 +92,7 @@ dtrace_execexit_func_t	dtrace_fasttrap_exit;
 #endif
 
 SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE1(proc, kernel, , exit, exit, "int");
+SDT_PROBE_DEFINE1(proc, kernel, , exit, "int");
 
 /* Hook for NFS teardown procedure. */
 void (*nlminfo_release_p)(struct proc *p);
@@ -501,9 +499,7 @@ exit1(struct thread *td, int rv)
 	 * procdesc_exit() to serialize concurrent calls to close() and
 	 * exit().
 	 */
-#ifdef PROCDESC
 	if (p->p_procdesc == NULL || procdesc_exit(p)) {
-#endif
 		/*
 		 * Notify parent that we're gone.  If parent has the
 		 * PS_NOCLDWAIT flag set, or if the handler is set to SIG_IGN,
@@ -540,10 +536,8 @@ exit1(struct thread *td, int rv)
 			else	/* LINUX thread */
 				kern_psignal(p->p_pptr, p->p_sigparent);
 		}
-#ifdef PROCDESC
 	} else
 		PROC_LOCK(p->p_pptr);
-#endif
 	sx_xunlock(&proctree_lock);
 
 	/*
@@ -808,10 +802,8 @@ proc_reap(struct thread *td, struct proc *p, int *status, int options)
 	clear_orphan(p);
 	PROC_UNLOCK(p);
 	leavepgrp(p);
-#ifdef PROCDESC
 	if (p->p_procdesc != NULL)
 		procdesc_reap(p);
-#endif
 	sx_xunlock(&proctree_lock);
 
 	/*
@@ -974,16 +966,19 @@ proc_to_reap(struct thread *td, struct proc *p, idtype_t idtype, id_t id,
 		 *  This is still a rough estimate.  We will fix the
 		 *  cases TRAPPED, STOPPED, and CONTINUED later.
 		 */
-		if (WCOREDUMP(p->p_xstat))
+		if (WCOREDUMP(p->p_xstat)) {
 			siginfo->si_code = CLD_DUMPED;
-		else if (WIFSIGNALED(p->p_xstat))
+			siginfo->si_status = WTERMSIG(p->p_xstat);
+		} else if (WIFSIGNALED(p->p_xstat)) {
 			siginfo->si_code = CLD_KILLED;
-		else
+			siginfo->si_status = WTERMSIG(p->p_xstat);
+		} else {
 			siginfo->si_code = CLD_EXITED;
+			siginfo->si_status = WEXITSTATUS(p->p_xstat);
+		}
 
 		siginfo->si_pid = p->p_pid;
 		siginfo->si_uid = p->p_ucred->cr_uid;
-		siginfo->si_status = p->p_xstat;
 
 		/*
 		 * The si_addr field would be useful additional
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index de7f09fd6ca..3198bd5938b 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -37,10 +37,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
-#include "opt_procdesc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -89,7 +87,7 @@ dtrace_fork_func_t	dtrace_fasttrap_fork;
 #endif
 
 SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE3(proc, kernel, , create, create, "struct proc *",
+SDT_PROBE_DEFINE3(proc, kernel, , create, "struct proc *",
     "struct proc *", "int");
 
 #ifndef _SYS_SYSPROTO_H_
@@ -119,7 +117,6 @@ sys_pdfork(td, uap)
 	struct thread *td;
 	struct pdfork_args *uap;
 {
-#ifdef PROCDESC
 	int error, fd;
 	struct proc *p2;
 
@@ -136,9 +133,6 @@ sys_pdfork(td, uap)
 		error = copyout(&fd, uap->fdp, sizeof(fd));
 	}
 	return (error);
-#else
-	return (ENOSYS);
-#endif
 }
 
 /* ARGSUSED */
@@ -656,7 +650,6 @@ do_fork(struct thread *td, int flags, struct proc *p2, struct thread *td2,
 		    p2->p_vmspace->vm_ssize);
 	}
 
-#ifdef PROCDESC
 	/*
 	 * Associate the process descriptor with the process before anything
 	 * can happen that might cause that process to need the descriptor.
@@ -664,7 +657,6 @@ do_fork(struct thread *td, int flags, struct proc *p2, struct thread *td2,
 	 */
 	if (flags & RFPROCDESC)
 		procdesc_new(p2, pdflags);
-#endif
 
 	/*
 	 * Both processes are set up, now check if any loadable modules want
@@ -759,9 +751,7 @@ fork1(struct thread *td, int flags, int pages, struct proc **procp,
 	int error;
 	static int curfail;
 	static struct timeval lastfail;
-#ifdef PROCDESC
 	struct file *fp_procdesc = NULL;
-#endif
 
 	/* Check for the undefined or unimplemented flags. */
 	if ((flags & ~(RFFLAGS | RFTSIGFLAGS(RFTSIGMASK))) != 0)
@@ -779,7 +769,6 @@ fork1(struct thread *td, int flags, int pages, struct proc **procp,
 	if ((flags & RFTSIGZMB) != 0 && (u_int)RFTSIGNUM(flags) > _SIG_MAXSIG)
 		return (EINVAL);
 
-#ifdef PROCDESC
 	if ((flags & RFPROCDESC) != 0) {
 		/* Can't not create a process yet get a process descriptor. */
 		if ((flags & RFPROC) == 0)
@@ -789,7 +778,6 @@ fork1(struct thread *td, int flags, int pages, struct proc **procp,
 		if (procdescp == NULL)
 			return (EINVAL);
 	}
-#endif
 
 	p1 = td->td_proc;
 
@@ -802,7 +790,6 @@ fork1(struct thread *td, int flags, int pages, struct proc **procp,
 		return (fork_norfproc(td, flags));
 	}
 
-#ifdef PROCDESC
 	/*
 	 * If required, create a process descriptor in the parent first; we
 	 * will abandon it if something goes wrong. We don't finit() until
@@ -813,7 +800,6 @@ fork1(struct thread *td, int flags, int pages, struct proc **procp,
 		if (error != 0)
 			return (error);
 	}
-#endif
 
 	mem_charged = 0;
 	vm2 = NULL;
@@ -920,12 +906,10 @@ fork1(struct thread *td, int flags, int pages, struct proc **procp,
 		 * Return child proc pointer to parent.
 		 */
 		*procp = newproc;
-#ifdef PROCDESC
 		if (flags & RFPROCDESC) {
 			procdesc_finit(newproc->p_procdesc, fp_procdesc);
 			fdrop(fp_procdesc, td);
 		}
-#endif
 		racct_proc_fork_done(newproc);
 		return (0);
 	}
@@ -945,12 +929,10 @@ fail1:
 	if (vm2 != NULL)
 		vmspace_free(vm2);
 	uma_zfree(proc_zone, newproc);
-#ifdef PROCDESC
 	if ((flags & RFPROCDESC) != 0 && fp_procdesc != NULL) {
 		fdclose(td->td_proc->p_fd, fp_procdesc, *procdescp, td);
 		fdrop(fp_procdesc, td);
 	}
-#endif
 	pause("fork", hz / 2);
 	return (error);
 }
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index f4b04c3f71b..e4f1c823c88 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -901,7 +901,7 @@ intr_event_schedule_thread(struct intr_event *ie)
 		    p->p_pid, td->td_name);
 		entropy.event = (uintptr_t)ie;
 		entropy.td = ctd;
-		random_harvest(&entropy, sizeof(entropy), 2, 0,
+		random_harvest(&entropy, sizeof(entropy), 2,
 		    RANDOM_INTERRUPT);
 	}
 
@@ -1055,7 +1055,7 @@ intr_event_schedule_thread(struct intr_event *ie, struct intr_thread *it)
 		    p->p_pid, td->td_name);
 		entropy.event = (uintptr_t)ie;
 		entropy.td = ctd;
-		random_harvest(&entropy, sizeof(entropy), 2, 0,
+		random_harvest(&entropy, sizeof(entropy), 2,
 		    RANDOM_INTERRUPT);
 	}
 
@@ -1146,7 +1146,7 @@ swi_sched(void *cookie, int flags)
 		    curproc->p_pid, curthread->td_name);
 		entropy.event = (uintptr_t)ih;
 		entropy.td = curthread;
-		random_harvest(&entropy, sizeof(entropy), 1, 0,
+		random_harvest(&entropy, sizeof(entropy), 1,
 		    RANDOM_SWI);
 	}
 
diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c
index 331b0e1a943..e5d0ad70e25 100644
--- a/sys/kern/kern_jail.c
+++ b/sys/kern/kern_jail.c
@@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/vnode.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
@@ -134,7 +135,7 @@ static void prison_racct_modify(struct prison *pr);
 static void prison_racct_detach(struct prison *pr);
 #endif
 #ifdef INET
-static int _prison_check_ip4(struct prison *pr, struct in_addr *ia);
+static int _prison_check_ip4(const struct prison *, const struct in_addr *);
 static int prison_restrict_ip4(struct prison *pr, struct in_addr *newip4);
 #endif
 #ifdef INET6
@@ -313,7 +314,7 @@ sys_jail(struct thread *td, struct jail_args *uap)
 		j.version = j0.version;
 		j.path = j0.path;
 		j.hostname = j0.hostname;
-		j.ip4s = j0.ip_number;
+		j.ip4s = htonl(j0.ip_number);	/* jail_v0 is host order */
 		break;
 	}
 
@@ -2929,7 +2930,7 @@ prison_remote_ip4(struct ucred *cred, struct in_addr *ia)
  * doesn't allow IPv4.  Address passed in in NBO.
  */
 static int
-_prison_check_ip4(struct prison *pr, struct in_addr *ia)
+_prison_check_ip4(const struct prison *pr, const struct in_addr *ia)
 {
 	int i, a, z, d;
 
@@ -2959,7 +2960,7 @@ _prison_check_ip4(struct prison *pr, struct in_addr *ia)
 }
 
 int
-prison_check_ip4(struct ucred *cred, struct in_addr *ia)
+prison_check_ip4(const struct ucred *cred, const struct in_addr *ia)
 {
 	struct prison *pr;
 	int error;
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index 8ca8acd130c..5b691065674 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -29,7 +29,6 @@
 #include "opt_adaptive_lockmgrs.h"
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
diff --git a/sys/kern/kern_lockstat.c b/sys/kern/kern_lockstat.c
index 1f3589331f5..1c773128da9 100644
--- a/sys/kern/kern_lockstat.c
+++ b/sys/kern/kern_lockstat.c
@@ -32,8 +32,6 @@
  *
  */
 
-#include "opt_kdtrace.h"
-
 #ifdef KDTRACE_HOOKS
 
 #include <sys/time.h>
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index bab745623d0..464cbad7987 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -46,7 +46,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 #include "opt_vm.h"
 
 #include <sys/param.h>
@@ -684,41 +683,47 @@ kmem_reclaim(vmem_t *vm, int flags)
 	pagedaemon_wakeup();
 }
 
+CTASSERT(VM_KMEM_SIZE_SCALE >= 1);
+
 /*
- * Initialize the kernel memory arena.
+ * Initialize the kernel memory (kmem) arena.
  */
 void
 kmeminit(void)
 {
 	u_long mem_size, tmp;
- 
+
 	/*
-	 * Try to auto-tune the kernel memory size, so that it is
-	 * more applicable for a wider range of machine sizes.  The
-	 * VM_KMEM_SIZE_MAX is dependent on the maximum KVA space
-	 * available.
+	 * Calculate the amount of kernel virtual address (KVA) space that is
+	 * preallocated to the kmem arena.  In order to support a wide range
+	 * of machines, it is a function of the physical memory size,
+	 * specifically,
 	 *
-	 * Note that the kmem arena is also used by the zone allocator,
-	 * so make sure that there is enough space.
+	 *	min(max(physical memory size / VM_KMEM_SIZE_SCALE,
+	 *	    VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
+	 *
+	 * Every architecture must define an integral value for
+	 * VM_KMEM_SIZE_SCALE.  However, the definitions of VM_KMEM_SIZE_MIN
+	 * and VM_KMEM_SIZE_MAX, which represent respectively the floor and
+	 * ceiling on this preallocation, are optional.  Typically,
+	 * VM_KMEM_SIZE_MAX is itself a function of the available KVA space on
+	 * a given architecture.
 	 */
-	vm_kmem_size = VM_KMEM_SIZE;
 	mem_size = cnt.v_page_count;
 
-#if defined(VM_KMEM_SIZE_SCALE)
 	vm_kmem_size_scale = VM_KMEM_SIZE_SCALE;
-#endif
 	TUNABLE_INT_FETCH("vm.kmem_size_scale", &vm_kmem_size_scale);
-	if (vm_kmem_size_scale > 0 &&
-	    (mem_size / vm_kmem_size_scale) > (vm_kmem_size / PAGE_SIZE))
-		vm_kmem_size = (mem_size / vm_kmem_size_scale) * PAGE_SIZE;
+	if (vm_kmem_size_scale < 1)
+		vm_kmem_size_scale = VM_KMEM_SIZE_SCALE;
+
+	vm_kmem_size = (mem_size / vm_kmem_size_scale) * PAGE_SIZE;
 
 #if defined(VM_KMEM_SIZE_MIN)
 	vm_kmem_size_min = VM_KMEM_SIZE_MIN;
 #endif
 	TUNABLE_ULONG_FETCH("vm.kmem_size_min", &vm_kmem_size_min);
-	if (vm_kmem_size_min > 0 && vm_kmem_size < vm_kmem_size_min) {
+	if (vm_kmem_size_min > 0 && vm_kmem_size < vm_kmem_size_min)
 		vm_kmem_size = vm_kmem_size_min;
-	}
 
 #if defined(VM_KMEM_SIZE_MAX)
 	vm_kmem_size_max = VM_KMEM_SIZE_MAX;
@@ -727,15 +732,17 @@ kmeminit(void)
 	if (vm_kmem_size_max > 0 && vm_kmem_size >= vm_kmem_size_max)
 		vm_kmem_size = vm_kmem_size_max;
 
-	/* Allow final override from the kernel environment */
-	TUNABLE_ULONG_FETCH("vm.kmem_size", &vm_kmem_size);
-
 	/*
-	 * Limit kmem virtual size to twice the physical memory.
-	 * This allows for kmem map sparseness, but limits the size
-	 * to something sane.  Be careful to not overflow the 32bit
-	 * ints while doing the check or the adjustment.
+	 * Alternatively, the amount of KVA space that is preallocated to the
+	 * kmem arena can be set statically at compile-time or manually
+	 * through the kernel environment.  However, it is still limited to
+	 * twice the physical memory size, which has been sufficient to handle
+	 * the most severe cases of external fragmentation in the kmem arena. 
 	 */
+#if defined(VM_KMEM_SIZE)
+	vm_kmem_size = VM_KMEM_SIZE;
+#endif
+	TUNABLE_ULONG_FETCH("vm.kmem_size", &vm_kmem_size);
 	if (vm_kmem_size / 2 / PAGE_SIZE > mem_size)
 		vm_kmem_size = 2 * mem_size * PAGE_SIZE;
 
diff --git a/sys/kern/kern_mbuf.c b/sys/kern/kern_mbuf.c
index 5d589425fff..e7b8016dd02 100644
--- a/sys/kern/kern_mbuf.c
+++ b/sys/kern/kern_mbuf.c
@@ -161,7 +161,7 @@ sysctl_nmbclusters(SYSCTL_HANDLER_ARGS)
 
 	newnmbclusters = nmbclusters;
 	error = sysctl_handle_int(oidp, &newnmbclusters, 0, req);
-	if (error == 0 && req->newptr) {
+	if (error == 0 && req->newptr && newnmbclusters != nmbclusters) {
 		if (newnmbclusters > nmbclusters &&
 		    nmbufs >= nmbclusters + nmbjumbop + nmbjumbo9 + nmbjumbo16) {
 			nmbclusters = newnmbclusters;
@@ -183,7 +183,7 @@ sysctl_nmbjumbop(SYSCTL_HANDLER_ARGS)
 
 	newnmbjumbop = nmbjumbop;
 	error = sysctl_handle_int(oidp, &newnmbjumbop, 0, req);
-	if (error == 0 && req->newptr) {
+	if (error == 0 && req->newptr && newnmbjumbop != nmbjumbop) {
 		if (newnmbjumbop > nmbjumbop &&
 		    nmbufs >= nmbclusters + nmbjumbop + nmbjumbo9 + nmbjumbo16) {
 			nmbjumbop = newnmbjumbop;
@@ -204,7 +204,7 @@ sysctl_nmbjumbo9(SYSCTL_HANDLER_ARGS)
 
 	newnmbjumbo9 = nmbjumbo9;
 	error = sysctl_handle_int(oidp, &newnmbjumbo9, 0, req);
-	if (error == 0 && req->newptr) {
+	if (error == 0 && req->newptr && newnmbjumbo9 != nmbjumbo9) {
 		if (newnmbjumbo9 > nmbjumbo9 &&
 		    nmbufs >= nmbclusters + nmbjumbop + nmbjumbo9 + nmbjumbo16) {
 			nmbjumbo9 = newnmbjumbo9;
@@ -225,7 +225,7 @@ sysctl_nmbjumbo16(SYSCTL_HANDLER_ARGS)
 
 	newnmbjumbo16 = nmbjumbo16;
 	error = sysctl_handle_int(oidp, &newnmbjumbo16, 0, req);
-	if (error == 0 && req->newptr) {
+	if (error == 0 && req->newptr && newnmbjumbo16 != nmbjumbo16) {
 		if (newnmbjumbo16 > nmbjumbo16 &&
 		    nmbufs >= nmbclusters + nmbjumbop + nmbjumbo9 + nmbjumbo16) {
 			nmbjumbo16 = newnmbjumbo16;
@@ -246,7 +246,7 @@ sysctl_nmbufs(SYSCTL_HANDLER_ARGS)
 
 	newnmbufs = nmbufs;
 	error = sysctl_handle_int(oidp, &newnmbufs, 0, req);
-	if (error == 0 && req->newptr) {
+	if (error == 0 && req->newptr && newnmbufs != nmbufs) {
 		if (newnmbufs > nmbufs) {
 			nmbufs = newnmbufs;
 			nmbufs = uma_zone_set_max(zone_mbuf, nmbufs);
diff --git a/sys/kern/kern_mib.c b/sys/kern/kern_mib.c
index c84d4b28913..ac6196c5077 100644
--- a/sys/kern/kern_mib.c
+++ b/sys/kern/kern_mib.c
@@ -261,6 +261,13 @@ sysctl_hw_machine_arch(SYSCTL_HANDLER_ARGS)
 SYSCTL_PROC(_hw, HW_MACHINE_ARCH, machine_arch, CTLTYPE_STRING | CTLFLAG_RD,
     NULL, 0, sysctl_hw_machine_arch, "A", "System architecture");
 
+SYSCTL_STRING(_kern, OID_AUTO, supported_archs, CTLFLAG_RD | CTLFLAG_MPSAFE,
+#ifdef COMPAT_FREEBSD32
+    MACHINE_ARCH " " MACHINE_ARCH32, 0, "Supported architectures for binaries");
+#else
+    MACHINE_ARCH, 0, "Supported architectures for binaries");
+#endif
+
 static int
 sysctl_hostname(SYSCTL_HANDLER_ARGS)
 {
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c
index e61a187319f..d0b47e5374b 100644
--- a/sys/kern/kern_mutex.c
+++ b/sys/kern/kern_mutex.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_ddb.h"
 #include "opt_global.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
@@ -249,8 +248,6 @@ __mtx_unlock_flags(volatile uintptr_t *c, int opts, const char *file, int line)
 	    line);
 	mtx_assert(m, MA_OWNED);
 
-	if (m->mtx_recurse == 0)
-		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_UNLOCK_RELEASE, m);
 	__mtx_unlock(m, curthread, opts, file, line);
 	curthread->td_locks--;
 }
diff --git a/sys/kern/kern_poll.c b/sys/kern/kern_poll.c
index 349f338f48a..19c76a970d8 100644
--- a/sys/kern/kern_poll.c
+++ b/sys/kern/kern_poll.c
@@ -42,7 +42,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 
-#include <net/if.h>			/* for IFF_* flags		*/
+#include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>			/* for NETISR_POLL		*/
 #include <net/vnet.h>
 
@@ -267,7 +268,7 @@ init_device_poll(void)
 	EVENTHANDLER_REGISTER(shutdown_post_sync, poll_shutdown, NULL,
 	    SHUTDOWN_PRI_LAST);
 }
-SYSINIT(device_poll, SI_SUB_CLOCKS, SI_ORDER_MIDDLE, init_device_poll, NULL);
+SYSINIT(device_poll, SI_SUB_SOFTINTR, SI_ORDER_MIDDLE, init_device_poll, NULL);
 
 
 /*
diff --git a/sys/kern/kern_priv.c b/sys/kern/kern_priv.c
index 4d266ab3ecc..2daa5c29fe4 100644
--- a/sys/kern/kern_priv.c
+++ b/sys/kern/kern_priv.c
@@ -28,8 +28,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
@@ -65,8 +63,8 @@ SYSCTL_INT(_security_bsd, OID_AUTO, unprivileged_mlock, CTLFLAG_RW|CTLFLAG_TUN,
 TUNABLE_INT("security.bsd.unprivileged_mlock", &unprivileged_mlock);
 
 SDT_PROVIDER_DEFINE(priv);
-SDT_PROBE_DEFINE1(priv, kernel, priv_check, priv_ok, priv-ok, "int");
-SDT_PROBE_DEFINE1(priv, kernel, priv_check, priv_err, priv-err, "int");
+SDT_PROBE_DEFINE1(priv, kernel, priv_check, priv__ok, "int");
+SDT_PROBE_DEFINE1(priv, kernel, priv_check, priv__err, "int");
 
 /*
  * Check a credential for privilege.  Lots of good reasons to deny privilege;
@@ -169,9 +167,9 @@ priv_check_cred(struct ucred *cred, int priv, int flags)
 	error = EPERM;
 out:
 	if (error)
-		SDT_PROBE1(priv, kernel, priv_check, priv_err, priv);
+		SDT_PROBE1(priv, kernel, priv_check, priv__err, priv);
 	else
-		SDT_PROBE1(priv, kernel, priv_check, priv_ok, priv);
+		SDT_PROBE1(priv, kernel, priv_check, priv__ok, priv);
 	return (error);
 }
 
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index 9968e763901..3dc1a584d85 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
 #include "opt_stack.h"
@@ -92,17 +91,17 @@ __FBSDID("$FreeBSD$");
 #endif
 
 SDT_PROVIDER_DEFINE(proc);
-SDT_PROBE_DEFINE4(proc, kernel, ctor, entry, entry, "struct proc *", "int",
+SDT_PROBE_DEFINE4(proc, kernel, ctor, entry, "struct proc *", "int",
     "void *", "int");
-SDT_PROBE_DEFINE4(proc, kernel, ctor, return, return, "struct proc *", "int",
+SDT_PROBE_DEFINE4(proc, kernel, ctor, return, "struct proc *", "int",
     "void *", "int");
-SDT_PROBE_DEFINE4(proc, kernel, dtor, entry, entry, "struct proc *", "int",
+SDT_PROBE_DEFINE4(proc, kernel, dtor, entry, "struct proc *", "int",
     "void *", "struct thread *");
-SDT_PROBE_DEFINE3(proc, kernel, dtor, return, return, "struct proc *", "int",
+SDT_PROBE_DEFINE3(proc, kernel, dtor, return, "struct proc *", "int",
     "void *");
-SDT_PROBE_DEFINE3(proc, kernel, init, entry, entry, "struct proc *", "int",
+SDT_PROBE_DEFINE3(proc, kernel, init, entry, "struct proc *", "int",
     "int");
-SDT_PROBE_DEFINE3(proc, kernel, init, return, return, "struct proc *", "int",
+SDT_PROBE_DEFINE3(proc, kernel, init, return, "struct proc *", "int",
     "int");
 
 MALLOC_DEFINE(M_PGRP, "pgrp", "process group header");
@@ -2632,6 +2631,60 @@ errout:
 	return (error);
 }
 
+static int
+sysctl_kern_proc_sigtramp(SYSCTL_HANDLER_ARGS)
+{
+	int *name = (int *)arg1;
+	u_int namelen = arg2;
+	struct proc *p;
+	struct kinfo_sigtramp kst;
+	const struct sysentvec *sv;
+	int error;
+#ifdef COMPAT_FREEBSD32
+	struct kinfo_sigtramp32 kst32;
+#endif
+
+	if (namelen != 1)
+		return (EINVAL);
+
+	error = pget((pid_t)name[0], PGET_CANDEBUG, &p);
+	if (error != 0)
+		return (error);
+	sv = p->p_sysent;
+#ifdef COMPAT_FREEBSD32
+	if ((req->flags & SCTL_MASK32) != 0) {
+		bzero(&kst32, sizeof(kst32));
+		if (SV_PROC_FLAG(p, SV_ILP32)) {
+			if (sv->sv_sigcode_base != 0) {
+				kst32.ksigtramp_start = sv->sv_sigcode_base;
+				kst32.ksigtramp_end = sv->sv_sigcode_base +
+				    *sv->sv_szsigcode;
+			} else {
+				kst32.ksigtramp_start = sv->sv_psstrings -
+				    *sv->sv_szsigcode;
+				kst32.ksigtramp_end = sv->sv_psstrings;
+			}
+		}
+		PROC_UNLOCK(p);
+		error = SYSCTL_OUT(req, &kst32, sizeof(kst32));
+		return (error);
+	}
+#endif
+	bzero(&kst, sizeof(kst));
+	if (sv->sv_sigcode_base != 0) {
+		kst.ksigtramp_start = (char *)sv->sv_sigcode_base;
+		kst.ksigtramp_end = (char *)sv->sv_sigcode_base +
+		    *sv->sv_szsigcode;
+	} else {
+		kst.ksigtramp_start = (char *)sv->sv_psstrings -
+		    *sv->sv_szsigcode;
+		kst.ksigtramp_end = (char *)sv->sv_psstrings;
+	}
+	PROC_UNLOCK(p);
+	error = SYSCTL_OUT(req, &kst, sizeof(kst));
+	return (error);
+}
+
 SYSCTL_NODE(_kern, KERN_PROC, proc, CTLFLAG_RD,  0, "Process table");
 
 SYSCTL_PROC(_kern_proc, KERN_PROC_ALL, all, CTLFLAG_RD|CTLTYPE_STRUCT|
@@ -2740,3 +2793,7 @@ static SYSCTL_NODE(_kern_proc, KERN_PROC_UMASK, umask, CTLFLAG_RD |
 static SYSCTL_NODE(_kern_proc, KERN_PROC_OSREL, osrel, CTLFLAG_RW |
 	CTLFLAG_ANYBODY | CTLFLAG_MPSAFE, sysctl_kern_proc_osrel,
 	"Process binary osreldate");
+
+static SYSCTL_NODE(_kern_proc, KERN_PROC_SIGTRAMP, sigtramp, CTLFLAG_RD |
+	CTLFLAG_MPSAFE, sysctl_kern_proc_sigtramp,
+	"Process signal trampoline location");
diff --git a/sys/kern/kern_racct.c b/sys/kern/kern_racct.c
index d31c8328a59..26ebc4e6f27 100644
--- a/sys/kern/kern_racct.c
+++ b/sys/kern/kern_racct.c
@@ -32,7 +32,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
@@ -96,29 +95,29 @@ static void racct_add_cred_locked(struct ucred *cred, int resource,
 		uint64_t amount);
 
 SDT_PROVIDER_DEFINE(racct);
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add, add, "struct proc *", "int",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, add, "struct proc *", "int",
     "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add_failure, add-failure,
+SDT_PROBE_DEFINE3(racct, kernel, rusage, add__failure,
     "struct proc *", "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add_cred, add-cred, "struct ucred *",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, add__cred, "struct ucred *",
     "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, add_force, add-force, "struct proc *",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, add__force, "struct proc *",
     "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, set, set, "struct proc *", "int",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, set, "struct proc *", "int",
     "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, set_failure, set-failure,
+SDT_PROBE_DEFINE3(racct, kernel, rusage, set__failure,
     "struct proc *", "int", "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, sub, sub, "struct proc *", "int",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, sub, "struct proc *", "int",
     "uint64_t");
-SDT_PROBE_DEFINE3(racct, kernel, rusage, sub_cred, sub-cred, "struct ucred *",
+SDT_PROBE_DEFINE3(racct, kernel, rusage, sub__cred, "struct ucred *",
     "int", "uint64_t");
-SDT_PROBE_DEFINE1(racct, kernel, racct, create, create, "struct racct *");
-SDT_PROBE_DEFINE1(racct, kernel, racct, destroy, destroy, "struct racct *");
-SDT_PROBE_DEFINE2(racct, kernel, racct, join, join, "struct racct *",
+SDT_PROBE_DEFINE1(racct, kernel, racct, create, "struct racct *");
+SDT_PROBE_DEFINE1(racct, kernel, racct, destroy, "struct racct *");
+SDT_PROBE_DEFINE2(racct, kernel, racct, join, "struct racct *",
     "struct racct *");
-SDT_PROBE_DEFINE2(racct, kernel, racct, join_failure, join-failure,
+SDT_PROBE_DEFINE2(racct, kernel, racct, join__failure,
     "struct racct *", "struct racct *");
-SDT_PROBE_DEFINE2(racct, kernel, racct, leave, leave, "struct racct *",
+SDT_PROBE_DEFINE2(racct, kernel, racct, leave, "struct racct *",
     "struct racct *");
 
 int racct_types[] = {
@@ -527,7 +526,7 @@ racct_add_locked(struct proc *p, int resource, uint64_t amount)
 #ifdef RCTL
 	error = rctl_enforce(p, resource, amount);
 	if (error && RACCT_IS_DENIABLE(resource)) {
-		SDT_PROBE(racct, kernel, rusage, add_failure, p, resource,
+		SDT_PROBE(racct, kernel, rusage, add__failure, p, resource,
 		    amount, 0, 0);
 		return (error);
 	}
@@ -558,7 +557,7 @@ racct_add_cred_locked(struct ucred *cred, int resource, uint64_t amount)
 {
 	struct prison *pr;
 
-	SDT_PROBE(racct, kernel, rusage, add_cred, cred, resource, amount,
+	SDT_PROBE(racct, kernel, rusage, add__cred, cred, resource, amount,
 	    0, 0);
 
 	racct_alloc_resource(cred->cr_ruidinfo->ui_racct, resource, amount);
@@ -591,7 +590,7 @@ void
 racct_add_force(struct proc *p, int resource, uint64_t amount)
 {
 
-	SDT_PROBE(racct, kernel, rusage, add_force, p, resource, amount, 0, 0);
+	SDT_PROBE(racct, kernel, rusage, add__force, p, resource, amount, 0, 0);
 
 	/*
 	 * We need proc lock to dereference p->p_ucred.
@@ -645,7 +644,7 @@ racct_set_locked(struct proc *p, int resource, uint64_t amount)
 	if (diff_proc > 0) {
 		error = rctl_enforce(p, resource, diff_proc);
 		if (error && RACCT_IS_DENIABLE(resource)) {
-			SDT_PROBE(racct, kernel, rusage, set_failure, p,
+			SDT_PROBE(racct, kernel, rusage, set__failure, p,
 			    resource, amount, 0, 0);
 			return (error);
 		}
@@ -805,7 +804,7 @@ racct_sub_cred_locked(struct ucred *cred, int resource, uint64_t amount)
 {
 	struct prison *pr;
 
-	SDT_PROBE(racct, kernel, rusage, sub_cred, cred, resource, amount,
+	SDT_PROBE(racct, kernel, rusage, sub__cred, cred, resource, amount,
 	    0, 0);
 
 #ifdef notyet
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 57ee671aa79..470eaedd52d 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1432,3 +1432,21 @@ chgptscnt(uip, diff, max)
 	}
 	return (1);
 }
+
+int
+chgkqcnt(struct uidinfo *uip, int diff, rlim_t max)
+{
+
+	if (diff > 0 && max != 0) {
+		if (atomic_fetchadd_long(&uip->ui_kqcnt, (long)diff) +
+		    diff > max) {
+			atomic_subtract_long(&uip->ui_kqcnt, (long)diff);
+			return (0);
+		}
+	} else {
+		atomic_add_long(&uip->ui_kqcnt, (long)diff);
+		if (uip->ui_kqcnt < 0)
+			printf("negative kqcnt for uid = %d\n", uip->ui_uid);
+	}
+	return (1);
+}
diff --git a/sys/kern/kern_rmlock.c b/sys/kern/kern_rmlock.c
index ec0e7fa5fd8..d93aa158461 100644
--- a/sys/kern/kern_rmlock.c
+++ b/sys/kern/kern_rmlock.c
@@ -35,7 +35,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
index 7b1e6bfba5e..0e9f3a53920 100644
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_no_adaptive_rwlocks.h"
 
 #include <sys/param.h>
@@ -322,8 +321,6 @@ _rw_wunlock_cookie(volatile uintptr_t *c, const char *file, int line)
 	WITNESS_UNLOCK(&rw->lock_object, LOP_EXCLUSIVE, file, line);
 	LOCK_LOG_LOCK("WUNLOCK", &rw->lock_object, 0, rw->rw_recurse, file,
 	    line);
-	if (!rw_recursed(rw))
-		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_RW_WUNLOCK_RELEASE, rw);
 	__rw_wunlock(rw, curthread, file, line);
 	curthread->td_locks--;
 }
diff --git a/sys/kern/kern_sdt.c b/sys/kern/kern_sdt.c
index c8e1940fbd7..845d95bba13 100644
--- a/sys/kern/kern_sdt.c
+++ b/sys/kern/kern_sdt.c
@@ -25,12 +25,12 @@
  * $FreeBSD$
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sdt.h>
 
+SDT_PROVIDER_DEFINE(sdt);
+
 /*
  * Hook for the DTrace probe function. The SDT provider will set this to
  * dtrace_probe() when it loads.
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index b120263ec17..ddcf9ad3e26 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -89,6 +89,11 @@ __FBSDID("$FreeBSD$");
 #ifndef PANIC_REBOOT_WAIT_TIME
 #define PANIC_REBOOT_WAIT_TIME 15 /* default to 15 seconds */
 #endif
+static int panic_reboot_wait_time = PANIC_REBOOT_WAIT_TIME;
+SYSCTL_INT(_kern, OID_AUTO, panic_reboot_wait_time, CTLFLAG_RW | CTLFLAG_TUN,
+    &panic_reboot_wait_time, 0,
+    "Seconds to wait before rebooting after a panic");
+TUNABLE_INT("kern.panic_reboot_wait_time", &panic_reboot_wait_time);
 
 /*
  * Note that stdarg.h and the ANSI style va_start macro is used for both
@@ -485,12 +490,12 @@ shutdown_panic(void *junk, int howto)
 	int loop;
 
 	if (howto & RB_DUMP) {
-		if (PANIC_REBOOT_WAIT_TIME != 0) {
-			if (PANIC_REBOOT_WAIT_TIME != -1) {
+		if (panic_reboot_wait_time != 0) {
+			if (panic_reboot_wait_time != -1) {
 				printf("Automatic reboot in %d seconds - "
 				       "press a key on the console to abort\n",
-					PANIC_REBOOT_WAIT_TIME);
-				for (loop = PANIC_REBOOT_WAIT_TIME * 10;
+					panic_reboot_wait_time);
+				for (loop = panic_reboot_wait_time * 10;
 				     loop > 0; --loop) {
 					DELAY(1000 * 100); /* 1/10th second */
 					/* Did user type a key? */
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 1797ebc7dd4..6aa347595ec 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -38,10 +38,8 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_core.h"
-#include "opt_procdesc.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -93,11 +91,11 @@ __FBSDID("$FreeBSD$");
 #define	ONSIG	32		/* NSIG for osig* syscalls.  XXX. */
 
 SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE3(proc, kernel, , signal_send, signal-send, "struct thread *",
+SDT_PROBE_DEFINE3(proc, kernel, , signal__send, "struct thread *",
     "struct proc *", "int");
-SDT_PROBE_DEFINE2(proc, kernel, , signal_clear, signal-clear, "int",
+SDT_PROBE_DEFINE2(proc, kernel, , signal__clear, "int",
     "ksiginfo_t *");
-SDT_PROBE_DEFINE3(proc, kernel, , signal_discard, signal-discard,
+SDT_PROBE_DEFINE3(proc, kernel, , signal__discard,
     "struct thread *", "struct proc *", "int");
 
 static int	coredump(struct thread *);
@@ -1254,7 +1252,7 @@ kern_sigtimedwait(struct thread *td, sigset_t waitset, ksiginfo_t *ksi,
 		reschedule_signals(p, new_block, 0);
 
 	if (error == 0) {
-		SDT_PROBE(proc, kernel, , signal_clear, sig, ksi, 0, 0, 0);
+		SDT_PROBE(proc, kernel, , signal__clear, sig, ksi, 0, 0, 0);
 
 		if (ksi->ksi_code == SI_TIMER)
 			itimer_accept(p, ksi->ksi_timerid, ksi);
@@ -1724,7 +1722,6 @@ sys_pdkill(td, uap)
 	struct thread *td;
 	struct pdkill_args *uap;
 {
-#ifdef PROCDESC
 	struct proc *p;
 	cap_rights_t rights;
 	int error;
@@ -1744,9 +1741,6 @@ sys_pdkill(td, uap)
 		kern_psignal(p, uap->signum);
 	PROC_UNLOCK(p);
 	return (error);
-#else
-	return (ENOSYS);
-#endif
 }
 
 #if defined(COMPAT_43)
@@ -2063,7 +2057,7 @@ tdsendsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi)
 	} else
 		sigqueue = &td->td_sigqueue;
 
-	SDT_PROBE(proc, kernel, , signal_send, td, p, sig, 0, 0 );
+	SDT_PROBE(proc, kernel, , signal__send, td, p, sig, 0, 0 );
 
 	/*
 	 * If the signal is being ignored,
@@ -2074,7 +2068,7 @@ tdsendsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi)
 	 */
 	mtx_lock(&ps->ps_mtx);
 	if (SIGISMEMBER(ps->ps_sigignore, sig)) {
-		SDT_PROBE(proc, kernel, , signal_discard, td, p, sig, 0, 0 );
+		SDT_PROBE(proc, kernel, , signal__discard, td, p, sig, 0, 0 );
 
 		mtx_unlock(&ps->ps_mtx);
 		if (ksi && (ksi->ksi_flags & KSI_INS))
@@ -2959,7 +2953,7 @@ sigparent(struct proc *p, int reason, int status)
 }
 
 static void
-childproc_jobstate(struct proc *p, int reason, int status)
+childproc_jobstate(struct proc *p, int reason, int sig)
 {
 	struct sigacts *ps;
 
@@ -2979,7 +2973,7 @@ childproc_jobstate(struct proc *p, int reason, int status)
 	mtx_lock(&ps->ps_mtx);
 	if ((ps->ps_flag & PS_NOCLDSTOP) == 0) {
 		mtx_unlock(&ps->ps_mtx);
-		sigparent(p, reason, status);
+		sigparent(p, reason, sig);
 	} else
 		mtx_unlock(&ps->ps_mtx);
 }
@@ -2987,6 +2981,7 @@ childproc_jobstate(struct proc *p, int reason, int status)
 void
 childproc_stopped(struct proc *p, int reason)
 {
+	/* p_xstat is a plain signal number, not a full wait() status here. */
 	childproc_jobstate(p, reason, p->p_xstat);
 }
 
@@ -3000,13 +2995,15 @@ void
 childproc_exited(struct proc *p)
 {
 	int reason;
-	int status = p->p_xstat; /* convert to int */
+	int xstat = p->p_xstat; /* convert to int */
+	int status;
 
-	reason = CLD_EXITED;
-	if (WCOREDUMP(status))
-		reason = CLD_DUMPED;
-	else if (WIFSIGNALED(status))
-		reason = CLD_KILLED;
+	if (WCOREDUMP(xstat))
+		reason = CLD_DUMPED, status = WTERMSIG(xstat);
+	else if (WIFSIGNALED(xstat))
+		reason = CLD_KILLED, status = WTERMSIG(xstat);
+	else
+		reason = CLD_EXITED, status = WEXITSTATUS(xstat);
 	/*
 	 * XXX avoid calling wakeup(p->p_pptr), the work is
 	 * done in exit1().
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c
index a1fc36a9f3d..8154b20c494 100644
--- a/sys/kern/kern_sx.c
+++ b/sys/kern/kern_sx.c
@@ -38,7 +38,6 @@
 
 #include "opt_ddb.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_no_adaptive_sx.h"
 
 #include <sys/cdefs.h>
@@ -109,7 +108,6 @@ PMC_SOFT_DECLARE( , , lock, failed);
  * Returns true if an exclusive lock is recursed.  It assumes
  * curthread currently has an exclusive lock.
  */
-#define	sx_recurse		lock_object.lo_data
 #define	sx_recursed(sx)		((sx)->sx_recurse != 0)
 
 static void	assert_sx(const struct lock_object *lock, int what);
@@ -365,7 +363,6 @@ _sx_sunlock(struct sx *sx, const char *file, int line)
 	WITNESS_UNLOCK(&sx->lock_object, 0, file, line);
 	LOCK_LOG_LOCK("SUNLOCK", &sx->lock_object, 0, 0, file, line);
 	__sx_sunlock(sx, file, line);
-	LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_SUNLOCK_RELEASE, sx);
 	curthread->td_locks--;
 }
 
@@ -381,8 +378,6 @@ _sx_xunlock(struct sx *sx, const char *file, int line)
 	WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line);
 	LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file,
 	    line);
-	if (!sx_recursed(sx))
-		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_XUNLOCK_RELEASE, sx);
 	__sx_xunlock(sx, curthread, file, line);
 	curthread->td_locks--;
 }
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 047fa46a630..37c538b64b7 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -37,7 +37,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 #include "opt_sched.h"
 
@@ -108,18 +107,18 @@ SYSCTL_INT(_kern, OID_AUTO, fscale, CTLFLAG_RD, 0, FSCALE, "");
 static void	loadav(void *arg);
 
 SDT_PROVIDER_DECLARE(sched);
-SDT_PROBE_DEFINE(sched, , , preempt, preempt);
+SDT_PROBE_DEFINE(sched, , , preempt);
 
 /*
  * These probes reference Solaris features that are not implemented in FreeBSD.
  * Create the probes anyway for compatibility with existing D scripts; they'll
  * just never fire.
  */
-SDT_PROBE_DEFINE(sched, , , cpucaps_sleep, cpucaps-sleep);
-SDT_PROBE_DEFINE(sched, , , cpucaps_wakeup, cpucaps-wakeup);
-SDT_PROBE_DEFINE(sched, , , schedctl_nopreempt, schedctl-nopreempt);
-SDT_PROBE_DEFINE(sched, , , schedctl_preempt, schedctl-preempt);
-SDT_PROBE_DEFINE(sched, , , schedctl_yield, schedctl-yield);
+SDT_PROBE_DEFINE(sched, , , cpucaps__sleep);
+SDT_PROBE_DEFINE(sched, , , cpucaps__wakeup);
+SDT_PROBE_DEFINE(sched, , , schedctl__nopreempt);
+SDT_PROBE_DEFINE(sched, , , schedctl__preempt);
+SDT_PROBE_DEFINE(sched, , , schedctl__yield);
 
 static void
 sleepinit(void *unused)
@@ -588,7 +587,7 @@ int
 should_yield(void)
 {
 
-	return ((unsigned int)(ticks - curthread->td_swvoltick) >= hogticks);
+	return ((u_int)ticks - (u_int)curthread->td_swvoltick >= hogticks);
 }
 
 void
diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c
index 5da4866d638..b21a4f00cdb 100644
--- a/sys/kern/kern_thread.c
+++ b/sys/kern/kern_thread.c
@@ -27,7 +27,6 @@
  */
 
 #include "opt_witness.h"
-#include "opt_kdtrace.h"
 #include "opt_hwpmc_hooks.h"
 
 #include <sys/cdefs.h>
@@ -63,7 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/eventhandler.h>
 
 SDT_PROVIDER_DECLARE(proc);
-SDT_PROBE_DEFINE(proc, , , lwp_exit, lwp-exit);
+SDT_PROBE_DEFINE(proc, , , lwp__exit);
 
 
 /*
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index 98a6df339f6..8d7b4bece99 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -38,7 +38,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_callout_profiling.h"
-#include "opt_kdtrace.h"
 #if defined(__arm__)
 #include "opt_timer.h"
 #endif
@@ -69,9 +68,9 @@ DPCPU_DECLARE(sbintime_t, hardclocktime);
 #endif
 
 SDT_PROVIDER_DEFINE(callout_execute);
-SDT_PROBE_DEFINE1(callout_execute, kernel, , callout_start, callout-start,
+SDT_PROBE_DEFINE1(callout_execute, kernel, , callout__start,
     "struct callout *");
-SDT_PROBE_DEFINE1(callout_execute, kernel, , callout_end, callout-end,
+SDT_PROBE_DEFINE1(callout_execute, kernel, , callout__end,
     "struct callout *");
 
 #ifdef CALLOUT_PROFILING
@@ -678,9 +677,9 @@ softclock_call_cc(struct callout *c, struct callout_cpu *cc,
 	sbt1 = sbinuptime();
 #endif
 	THREAD_NO_SLEEPING();
-	SDT_PROBE(callout_execute, kernel, , callout_start, c, 0, 0, 0, 0);
+	SDT_PROBE(callout_execute, kernel, , callout__start, c, 0, 0, 0, 0);
 	c_func(c_arg);
-	SDT_PROBE(callout_execute, kernel, , callout_end, c, 0, 0, 0, 0);
+	SDT_PROBE(callout_execute, kernel, , callout__end, c, 0, 0, 0, 0);
 	THREAD_SLEEPING_OK();
 #if defined(DIAGNOSTIC) || defined(CALLOUT_PROFILING)
 	sbt2 = sbinuptime();
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 9db6decf972..87263bf97eb 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -57,7 +57,7 @@ case $# in
 	;;
 esac
 
-if [ -n "$2" -a -f "$2" ]; then
+if [ -n "$2" ]; then
 	. $2
 fi
 
@@ -326,6 +326,7 @@ s/\$//g
 		for (cap in capenabled) {
 			if (funcname == capenabled[cap]) {
 				flags = "SYF_CAPENABLED";
+				break;
 			}
 		}
 
diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c
index 7c7d48118e5..0c7391e496f 100644
--- a/sys/kern/sched_4bsd.c
+++ b/sys/kern/sched_4bsd.c
@@ -37,7 +37,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_sched.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -255,20 +254,20 @@ SYSCTL_INT(_kern_sched, OID_AUTO, followon, CTLFLAG_RW,
 
 SDT_PROVIDER_DEFINE(sched);
 
-SDT_PROBE_DEFINE3(sched, , , change_pri, change-pri, "struct thread *", 
+SDT_PROBE_DEFINE3(sched, , , change__pri, "struct thread *", 
     "struct proc *", "uint8_t");
-SDT_PROBE_DEFINE3(sched, , , dequeue, dequeue, "struct thread *", 
+SDT_PROBE_DEFINE3(sched, , , dequeue, "struct thread *", 
     "struct proc *", "void *");
-SDT_PROBE_DEFINE4(sched, , , enqueue, enqueue, "struct thread *", 
+SDT_PROBE_DEFINE4(sched, , , enqueue, "struct thread *", 
     "struct proc *", "void *", "int");
-SDT_PROBE_DEFINE4(sched, , , lend_pri, lend-pri, "struct thread *", 
+SDT_PROBE_DEFINE4(sched, , , lend__pri, "struct thread *", 
     "struct proc *", "uint8_t", "struct thread *");
-SDT_PROBE_DEFINE2(sched, , , load_change, load-change, "int", "int");
-SDT_PROBE_DEFINE2(sched, , , off_cpu, off-cpu, "struct thread *",
+SDT_PROBE_DEFINE2(sched, , , load__change, "int", "int");
+SDT_PROBE_DEFINE2(sched, , , off__cpu, "struct thread *",
     "struct proc *");
-SDT_PROBE_DEFINE(sched, , , on_cpu, on-cpu);
-SDT_PROBE_DEFINE(sched, , , remain_cpu, remain-cpu);
-SDT_PROBE_DEFINE2(sched, , , surrender, surrender, "struct thread *",
+SDT_PROBE_DEFINE(sched, , , on__cpu);
+SDT_PROBE_DEFINE(sched, , , remain__cpu);
+SDT_PROBE_DEFINE2(sched, , , surrender, "struct thread *",
     "struct proc *");
 
 static __inline void
@@ -277,7 +276,7 @@ sched_load_add(void)
 
 	sched_tdcnt++;
 	KTR_COUNTER0(KTR_SCHED, "load", "global load", sched_tdcnt);
-	SDT_PROBE2(sched, , , load_change, NOCPU, sched_tdcnt);
+	SDT_PROBE2(sched, , , load__change, NOCPU, sched_tdcnt);
 }
 
 static __inline void
@@ -286,7 +285,7 @@ sched_load_rem(void)
 
 	sched_tdcnt--;
 	KTR_COUNTER0(KTR_SCHED, "load", "global load", sched_tdcnt);
-	SDT_PROBE2(sched, , , load_change, NOCPU, sched_tdcnt);
+	SDT_PROBE2(sched, , , load__change, NOCPU, sched_tdcnt);
 }
 /*
  * Arrange to reschedule if necessary, taking the priorities and
@@ -836,12 +835,12 @@ sched_priority(struct thread *td, u_char prio)
 	KTR_POINT3(KTR_SCHED, "thread", sched_tdname(td), "priority change",
 	    "prio:%d", td->td_priority, "new prio:%d", prio, KTR_ATTR_LINKED,
 	    sched_tdname(curthread));
-	SDT_PROBE3(sched, , , change_pri, td, td->td_proc, prio);
+	SDT_PROBE3(sched, , , change__pri, td, td->td_proc, prio);
 	if (td != curthread && prio > td->td_priority) {
 		KTR_POINT3(KTR_SCHED, "thread", sched_tdname(curthread),
 		    "lend prio", "prio:%d", td->td_priority, "new prio:%d",
 		    prio, KTR_ATTR_LINKED, sched_tdname(td));
-		SDT_PROBE4(sched, , , lend_pri, td, td->td_proc, prio, 
+		SDT_PROBE4(sched, , , lend__pri, td, td->td_proc, prio, 
 		    curthread);
 	}
 	THREAD_LOCK_ASSERT(td, MA_OWNED);
@@ -1033,7 +1032,7 @@ sched_switch(struct thread *td, struct thread *newtd, int flags)
 			PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT);
 #endif
 
-		SDT_PROBE2(sched, , , off_cpu, td, td->td_proc);
+		SDT_PROBE2(sched, , , off__cpu, td, td->td_proc);
 
                 /* I feel sleepy */
 		lock_profile_release_lock(&sched_lock.lock_object);
@@ -1067,13 +1066,13 @@ sched_switch(struct thread *td, struct thread *newtd, int flags)
 		 * need to reap it.
 		 */
 
-		SDT_PROBE0(sched, , , on_cpu);
+		SDT_PROBE0(sched, , , on__cpu);
 #ifdef	HWPMC_HOOKS
 		if (PMC_PROC_IS_USING_PMCS(td->td_proc))
 			PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_IN);
 #endif
 	} else
-		SDT_PROBE0(sched, , , remain_cpu);
+		SDT_PROBE0(sched, , , remain__cpu);
 
 #ifdef SMP
 	if (td->td_flags & TDF_IDLETD)
diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c
index cba9d804a3a..31c0dd97434 100644
--- a/sys/kern/sched_ule.c
+++ b/sys/kern/sched_ule.c
@@ -39,7 +39,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
@@ -344,20 +343,20 @@ SYSINIT(sched_initticks, SI_SUB_CLOCKS, SI_ORDER_THIRD, sched_initticks,
 
 SDT_PROVIDER_DEFINE(sched);
 
-SDT_PROBE_DEFINE3(sched, , , change_pri, change-pri, "struct thread *", 
+SDT_PROBE_DEFINE3(sched, , , change__pri, "struct thread *", 
     "struct proc *", "uint8_t");
-SDT_PROBE_DEFINE3(sched, , , dequeue, dequeue, "struct thread *", 
+SDT_PROBE_DEFINE3(sched, , , dequeue, "struct thread *", 
     "struct proc *", "void *");
-SDT_PROBE_DEFINE4(sched, , , enqueue, enqueue, "struct thread *", 
+SDT_PROBE_DEFINE4(sched, , , enqueue, "struct thread *", 
     "struct proc *", "void *", "int");
-SDT_PROBE_DEFINE4(sched, , , lend_pri, lend-pri, "struct thread *", 
+SDT_PROBE_DEFINE4(sched, , , lend__pri, "struct thread *", 
     "struct proc *", "uint8_t", "struct thread *");
-SDT_PROBE_DEFINE2(sched, , , load_change, load-change, "int", "int");
-SDT_PROBE_DEFINE2(sched, , , off_cpu, off-cpu, "struct thread *", 
+SDT_PROBE_DEFINE2(sched, , , load__change, "int", "int");
+SDT_PROBE_DEFINE2(sched, , , off__cpu, "struct thread *", 
     "struct proc *");
-SDT_PROBE_DEFINE(sched, , , on_cpu, on-cpu);
-SDT_PROBE_DEFINE(sched, , , remain_cpu, remain-cpu);
-SDT_PROBE_DEFINE2(sched, , , surrender, surrender, "struct thread *", 
+SDT_PROBE_DEFINE(sched, , , on__cpu);
+SDT_PROBE_DEFINE(sched, , , remain__cpu);
+SDT_PROBE_DEFINE2(sched, , , surrender, "struct thread *", 
     "struct proc *");
 
 /*
@@ -542,7 +541,7 @@ tdq_load_add(struct tdq *tdq, struct thread *td)
 	if ((td->td_flags & TDF_NOLOAD) == 0)
 		tdq->tdq_sysload++;
 	KTR_COUNTER0(KTR_SCHED, "load", tdq->tdq_loadname, tdq->tdq_load);
-	SDT_PROBE2(sched, , , load_change, (int)TDQ_ID(tdq), tdq->tdq_load);
+	SDT_PROBE2(sched, , , load__change, (int)TDQ_ID(tdq), tdq->tdq_load);
 }
 
 /*
@@ -562,7 +561,7 @@ tdq_load_rem(struct tdq *tdq, struct thread *td)
 	if ((td->td_flags & TDF_NOLOAD) == 0)
 		tdq->tdq_sysload--;
 	KTR_COUNTER0(KTR_SCHED, "load", tdq->tdq_loadname, tdq->tdq_load);
-	SDT_PROBE2(sched, , , load_change, (int)TDQ_ID(tdq), tdq->tdq_load);
+	SDT_PROBE2(sched, , , load__change, (int)TDQ_ID(tdq), tdq->tdq_load);
 }
 
 /*
@@ -1533,7 +1532,7 @@ sched_priority(struct thread *td)
 		pri = SCHED_PRI_MIN;
 		if (td->td_sched->ts_ticks)
 			pri += min(SCHED_PRI_TICKS(td->td_sched),
-			    SCHED_PRI_RANGE);
+			    SCHED_PRI_RANGE - 1);
 		pri += SCHED_PRI_NICE(td->td_proc->p_nice);
 		KASSERT(pri >= PRI_MIN_BATCH && pri <= PRI_MAX_BATCH,
 		    ("sched_priority: invalid priority %d: nice %d, " 
@@ -1680,12 +1679,12 @@ sched_thread_priority(struct thread *td, u_char prio)
 	KTR_POINT3(KTR_SCHED, "thread", sched_tdname(td), "prio",
 	    "prio:%d", td->td_priority, "new prio:%d", prio,
 	    KTR_ATTR_LINKED, sched_tdname(curthread));
-	SDT_PROBE3(sched, , , change_pri, td, td->td_proc, prio);
+	SDT_PROBE3(sched, , , change__pri, td, td->td_proc, prio);
 	if (td != curthread && prio < td->td_priority) {
 		KTR_POINT3(KTR_SCHED, "thread", sched_tdname(curthread),
 		    "lend prio", "prio:%d", td->td_priority, "new prio:%d",
 		    prio, KTR_ATTR_LINKED, sched_tdname(td));
-		SDT_PROBE4(sched, , , lend_pri, td, td->td_proc, prio, 
+		SDT_PROBE4(sched, , , lend__pri, td, td->td_proc, prio, 
 		    curthread);
 	} 
 	ts = td->td_sched;
@@ -1938,7 +1937,7 @@ sched_switch(struct thread *td, struct thread *newtd, int flags)
 		if (PMC_PROC_IS_USING_PMCS(td->td_proc))
 			PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_OUT);
 #endif
-		SDT_PROBE2(sched, , , off_cpu, newtd, newtd->td_proc);
+		SDT_PROBE2(sched, , , off__cpu, newtd, newtd->td_proc);
 		lock_profile_release_lock(&TDQ_LOCKPTR(tdq)->lock_object);
 		TDQ_LOCKPTR(tdq)->mtx_lock = (uintptr_t)newtd;
 		sched_pctcpu_update(newtd->td_sched, 0);
@@ -1964,14 +1963,14 @@ sched_switch(struct thread *td, struct thread *newtd, int flags)
 		lock_profile_obtain_lock_success(
 		    &TDQ_LOCKPTR(tdq)->lock_object, 0, 0, __FILE__, __LINE__);
 
-		SDT_PROBE0(sched, , , on_cpu);
+		SDT_PROBE0(sched, , , on__cpu);
 #ifdef	HWPMC_HOOKS
 		if (PMC_PROC_IS_USING_PMCS(td->td_proc))
 			PMC_SWITCH_CONTEXT(td, PMC_FN_CSW_IN);
 #endif
 	} else {
 		thread_unblock_switch(td, mtx);
-		SDT_PROBE0(sched, , , remain_cpu);
+		SDT_PROBE0(sched, , , remain__cpu);
 	}
 	/*
 	 * Assert that all went well and return.
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index b3b1852cada..5c4c3297f14 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -28,6 +28,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_bus.h"
+#include "opt_random.h"
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -44,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/condvar.h>
 #include <sys/queue.h>
 #include <machine/bus.h>
+#include <sys/random.h>
 #include <sys/rman.h>
 #include <sys/selinfo.h>
 #include <sys/signalvar.h>
@@ -55,6 +57,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/vnet.h>
 
+#include <machine/cpu.h>
 #include <machine/stdarg.h>
 
 #include <vm/uma.h>
@@ -2766,6 +2769,7 @@ device_probe_and_attach(device_t dev)
 int
 device_attach(device_t dev)
 {
+	uint64_t attachtime;
 	int error;
 
 	if (resource_disabled(dev->driver->name, dev->unit)) {
@@ -2778,6 +2782,7 @@ device_attach(device_t dev)
 	device_sysctl_init(dev);
 	if (!device_is_quiet(dev))
 		device_print_child(dev->parent, dev);
+	attachtime = get_cyclecount();
 	dev->state = DS_ATTACHING;
 	if ((error = DEVICE_ATTACH(dev)) != 0) {
 		printf("device_attach: %s%d attach returned %d\n",
@@ -2790,6 +2795,17 @@ device_attach(device_t dev)
 		dev->state = DS_NOTPRESENT;
 		return (error);
 	}
+	attachtime = get_cyclecount() - attachtime;
+	/*
+	 * 4 bits per device is a reasonable value for desktop and server
+	 * hardware with good get_cyclecount() implementations, but may
+	 * need to be adjusted on other platforms.
+	 */
+#ifdef RANDOM_DEBUG
+	printf("%s(): feeding %d bit(s) of entropy from %s%d\n",
+	    __func__, 4, dev->driver->name, dev->unit);
+#endif
+	random_harvest(&attachtime, sizeof(attachtime), 4, RANDOM_ATTACH);
 	device_sysctl_update(dev);
 	if (dev->busy)
 		dev->state = DS_BUSY;
diff --git a/sys/kern/subr_bus_dma.c b/sys/kern/subr_bus_dma.c
index 999de3f5ba1..a16d8c823e7 100644
--- a/sys/kern/subr_bus_dma.c
+++ b/sys/kern/subr_bus_dma.c
@@ -124,24 +124,33 @@ static int
 _bus_dmamap_load_bio(bus_dma_tag_t dmat, bus_dmamap_t map, struct bio *bio,
     int *nsegs, int flags)
 {
-	vm_paddr_t paddr;
-	bus_size_t len, tlen;
-	int error, i, ma_offs;
+	int error;
 
 	if ((bio->bio_flags & BIO_UNMAPPED) == 0) {
 		error = _bus_dmamap_load_buffer(dmat, map, bio->bio_data,
 		    bio->bio_bcount, kernel_pmap, flags, NULL, nsegs);
-		return (error);
+	} else {
+		error = _bus_dmamap_load_ma(dmat, map, bio->bio_ma,
+		    bio->bio_bcount, bio->bio_ma_offset, flags, NULL, nsegs);
 	}
+	return (error);
+}
+
+int
+bus_dmamap_load_ma_triv(bus_dma_tag_t dmat, bus_dmamap_t map,
+    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+    bus_dma_segment_t *segs, int *segp)
+{
+	vm_paddr_t paddr;
+	bus_size_t len;
+	int error, i;
 
 	error = 0;
-	tlen = bio->bio_bcount;
-	ma_offs = bio->bio_ma_offset;
 	for (i = 0; tlen > 0; i++, tlen -= len) {
 		len = min(PAGE_SIZE - ma_offs, tlen);
-		paddr = VM_PAGE_TO_PHYS(bio->bio_ma[i]) + ma_offs;
+		paddr = VM_PAGE_TO_PHYS(ma[i]) + ma_offs;
 		error = _bus_dmamap_load_phys(dmat, map, paddr, len,
-		    flags, NULL, nsegs);
+		    flags, segs, segp);
 		if (error != 0)
 			break;
 		ma_offs = 0;
diff --git a/sys/kern/subr_capability.c b/sys/kern/subr_capability.c
index 61ace5ab6e4..ce41f4a46b5 100644
--- a/sys/kern/subr_capability.c
+++ b/sys/kern/subr_capability.c
@@ -30,6 +30,10 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+/*
+ * Note that this file is compiled into the kernel and into libc.
+ */
+
 #ifdef _KERNEL
 #include <sys/types.h>
 #include <sys/capability.h>
@@ -164,7 +168,7 @@ __cap_rights_init(int version, cap_rights_t *rights, ...)
 	return (rights);
 }
 
-void
+cap_rights_t *
 __cap_rights_set(cap_rights_t *rights, ...)
 {
 	va_list ap;
@@ -174,9 +178,11 @@ __cap_rights_set(cap_rights_t *rights, ...)
 	va_start(ap, rights);
 	cap_rights_vset(rights, ap);
 	va_end(ap);
+
+	return (rights);
 }
 
-void
+cap_rights_t *
 __cap_rights_clear(cap_rights_t *rights, ...)
 {
 	va_list ap;
@@ -186,6 +192,8 @@ __cap_rights_clear(cap_rights_t *rights, ...)
 	va_start(ap, rights);
 	cap_rights_vclear(rights, ap);
 	va_end(ap);
+
+	return (rights);
 }
 
 bool
@@ -231,7 +239,7 @@ cap_rights_is_valid(const cap_rights_t *rights)
 	return (true);
 }
 
-void
+cap_rights_t *
 cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src)
 {
 	unsigned int i, n;
@@ -250,9 +258,11 @@ cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src)
 
 	assert(cap_rights_is_valid(src));
 	assert(cap_rights_is_valid(dst));
+
+	return (dst);
 }
 
-void
+cap_rights_t *
 cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src)
 {
 	unsigned int i, n;
@@ -273,6 +283,8 @@ cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src)
 
 	assert(cap_rights_is_valid(src));
 	assert(cap_rights_is_valid(dst));
+
+	return (dst);
 }
 
 bool
diff --git a/sys/kern/subr_devstat.c b/sys/kern/subr_devstat.c
index c44ef27edd0..3d2492f52ac 100644
--- a/sys/kern/subr_devstat.c
+++ b/sys/kern/subr_devstat.c
@@ -29,13 +29,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
 #include <sys/devicestat.h>
+#include <sys/sdt.h>
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/lock.h>
@@ -46,57 +45,21 @@ __FBSDID("$FreeBSD$");
 
 #include <machine/atomic.h>
 
-#ifdef KDTRACE_HOOKS
-#include <sys/dtrace_bsd.h>
+SDT_PROVIDER_DEFINE(io);
 
-dtrace_io_start_probe_func_t dtrace_io_start_probe;
-dtrace_io_done_probe_func_t dtrace_io_done_probe;
-dtrace_io_wait_start_probe_func_t dtrace_io_wait_start_probe;
-dtrace_io_wait_done_probe_func_t dtrace_io_wait_done_probe;
+SDT_PROBE_DEFINE2(io, , , start, "struct bio *", "struct devstat *");
+SDT_PROBE_DEFINE2(io, , , done, "struct bio *", "struct devstat *");
+SDT_PROBE_DEFINE2(io, , , wait__start, "struct bio *",
+    "struct devstat *");
+SDT_PROBE_DEFINE2(io, , , wait__done, "struct bio *",
+    "struct devstat *");
 
-uint32_t	dtio_start_id;
-uint32_t	dtio_done_id;
-uint32_t	dtio_wait_start_id;
-uint32_t	dtio_wait_done_id;
-
-#define DTRACE_DEVSTAT_START() \
-	if (dtrace_io_start_probe != NULL) \
-		(*dtrace_io_start_probe)(dtio_start_id, NULL, ds);
-
-#define DTRACE_DEVSTAT_BIO_START() \
-	if (dtrace_io_start_probe != NULL) \
-		(*dtrace_io_start_probe)(dtio_start_id, bp, ds);
-
-#define DTRACE_DEVSTAT_DONE() \
-	if (dtrace_io_done_probe != NULL) \
-		(*dtrace_io_done_probe)(dtio_done_id, NULL, ds);
-
-#define DTRACE_DEVSTAT_BIO_DONE() \
-	if (dtrace_io_done_probe != NULL) \
-		(*dtrace_io_done_probe)(dtio_done_id, bp, ds);
-
-#define DTRACE_DEVSTAT_WAIT_START() \
-	if (dtrace_io_wait_start_probe != NULL) \
-		(*dtrace_io_wait_start_probe)(dtio_wait_start_id, NULL, ds);
-
-#define DTRACE_DEVSTAT_WAIT_DONE() \
-	if (dtrace_io_wait_done_probe != NULL) \
-		(*dtrace_io_wait_done_probe)(dtio_wait_done_id, NULL, ds);
-
-#else /* ! KDTRACE_HOOKS */
-
-#define DTRACE_DEVSTAT_START()
-
-#define DTRACE_DEVSTAT_BIO_START()
-
-#define DTRACE_DEVSTAT_DONE()
-
-#define DTRACE_DEVSTAT_BIO_DONE()
-
-#define DTRACE_DEVSTAT_WAIT_START()
-
-#define DTRACE_DEVSTAT_WAIT_DONE()
-#endif /* KDTRACE_HOOKS */
+#define	DTRACE_DEVSTAT_START()		SDT_PROBE2(io, , , start, NULL, ds)
+#define	DTRACE_DEVSTAT_BIO_START()	SDT_PROBE2(io, , , start, bp, ds)
+#define	DTRACE_DEVSTAT_DONE()		SDT_PROBE2(io, , , done, NULL, ds)
+#define	DTRACE_DEVSTAT_BIO_DONE()	SDT_PROBE2(io, , , done, bp, ds)
+#define	DTRACE_DEVSTAT_WAIT_START()	SDT_PROBE2(io, , , wait__start, NULL, ds)
+#define	DTRACE_DEVSTAT_WAIT_DONE()	SDT_PROBE2(io, , , wait__done, NULL, ds)
 
 static int devstat_num_devs;
 static long devstat_generation = 1;
@@ -131,6 +94,7 @@ devstat_new_entry(const void *dev_name,
 	ds = devstat_alloc();
 	mtx_lock(&devstat_mutex);
 	if (unit_number == -1) {
+		ds->unit_number = unit_number;
 		ds->id = dev_name;
 		binuptime(&ds->creation_time);
 		devstat_generation++;
@@ -242,7 +206,7 @@ devstat_remove_entry(struct devstat *ds)
 
 	/* Remove this entry from the devstat queue */
 	atomic_add_acq_int(&ds->sequence1, 1);
-	if (ds->id == NULL) {
+	if (ds->unit_number != -1) {
 		devstat_num_devs--;
 		STAILQ_REMOVE(devstat_head, ds, devstat, dev_links);
 	}
@@ -373,6 +337,14 @@ devstat_end_transaction(struct devstat *ds, uint32_t bytes,
 
 void
 devstat_end_transaction_bio(struct devstat *ds, struct bio *bp)
+{
+
+	devstat_end_transaction_bio_bt(ds, bp, NULL);
+}
+
+void
+devstat_end_transaction_bio_bt(struct devstat *ds, struct bio *bp,
+    struct bintime *now)
 {
 	devstat_trans_flags flg;
 
@@ -390,7 +362,7 @@ devstat_end_transaction_bio(struct devstat *ds, struct bio *bp)
 		flg = DEVSTAT_NO_DATA;
 
 	devstat_end_transaction(ds, bp->bio_bcount - bp->bio_resid,
-				DEVSTAT_TAG_SIMPLE, flg, NULL, &bp->bio_t0);
+				DEVSTAT_TAG_SIMPLE, flg, now, &bp->bio_t0);
 	DTRACE_DEVSTAT_BIO_DONE();
 }
 
diff --git a/sys/kern/subr_kdb.c b/sys/kern/subr_kdb.c
index 59d6258bad7..a7ed944a61f 100644
--- a/sys/kern/subr_kdb.c
+++ b/sys/kern/subr_kdb.c
@@ -503,6 +503,8 @@ kdb_reenter(void)
 	if (!kdb_active || kdb_jmpbufp == NULL)
 		return;
 
+	printf("KDB: reentering\n");
+	kdb_backtrace();
 	longjmp(kdb_jmpbufp, 1);
 	/* NOTREACHED */
 }
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index a2e822c793f..afd3eacc717 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -153,8 +153,10 @@ static const char *const vm_guest_sysctl_names[] = {
 	"none",
 	"generic",
 	"xen",
+	"hv",
 	NULL
 };
+CTASSERT(nitems(vm_guest_sysctl_names) - 1 == VM_LAST);
 
 #ifndef XEN
 static const char *const vm_bnames[] = {
@@ -344,7 +346,7 @@ init_param2(long physpages)
 }
 
 /*
- * Sysctl stringiying handler for kern.vm_guest.
+ * Sysctl stringifying handler for kern.vm_guest.
  */
 static int
 sysctl_kern_vm_guest(SYSCTL_HANDLER_ARGS)
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c
index 92b51477e09..c385b319f81 100644
--- a/sys/kern/subr_sleepqueue.c
+++ b/sys/kern/subr_sleepqueue.c
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_sleepqueue_profiling.h"
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c
index 3d6dc5ad906..c06661eb890 100644
--- a/sys/kern/subr_syscall.c
+++ b/sys/kern/subr_syscall.c
@@ -40,7 +40,6 @@
 
 #include "opt_capsicum.h"
 #include "opt_ktrace.h"
-#include "opt_kdtrace.h"
 
 __FBSDID("$FreeBSD$");
 
diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index 9c7bf411aeb..bfc941ee332 100644
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -46,6 +46,9 @@ __FBSDID("$FreeBSD$");
 static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues");
 static void	*taskqueue_giant_ih;
 static void	*taskqueue_ih;
+static void	 taskqueue_fast_enqueue(void *);
+static void	 taskqueue_swi_enqueue(void *);
+static void	 taskqueue_swi_giant_enqueue(void *);
 
 struct taskqueue_busy {
 	struct task	*tb_running;
@@ -69,7 +72,7 @@ struct taskqueue {
 
 #define	TQ_FLAGS_ACTIVE		(1 << 0)
 #define	TQ_FLAGS_BLOCKED	(1 << 1)
-#define	TQ_FLAGS_PENDING	(1 << 2)
+#define	TQ_FLAGS_UNLOCKED_ENQUEUE	(1 << 2)
 
 #define	DT_CALLOUT_ARMED	(1 << 0)
 
@@ -97,7 +100,8 @@ _timeout_task_init(struct taskqueue *queue, struct timeout_task *timeout_task,
 {
 
 	TASK_INIT(&timeout_task->t, priority, func, context);
-	callout_init_mtx(&timeout_task->c, &queue->tq_mutex, 0);
+	callout_init_mtx(&timeout_task->c, &queue->tq_mutex,
+	    CALLOUT_RETURNUNLOCKED);
 	timeout_task->q = queue;
 	timeout_task->f = 0;
 }
@@ -128,6 +132,11 @@ _taskqueue_create(const char *name __unused, int mflags,
 	queue->tq_context = context;
 	queue->tq_spin = (mtxflags & MTX_SPIN) != 0;
 	queue->tq_flags |= TQ_FLAGS_ACTIVE;
+	if (enqueue == taskqueue_fast_enqueue ||
+	    enqueue == taskqueue_swi_enqueue ||
+	    enqueue == taskqueue_swi_giant_enqueue ||
+	    enqueue == taskqueue_thread_enqueue)
+		queue->tq_flags |= TQ_FLAGS_UNLOCKED_ENQUEUE;
 	mtx_init(&queue->tq_mutex, mtxname, NULL, mtxflags);
 
 	return queue;
@@ -197,6 +206,7 @@ taskqueue_enqueue_locked(struct taskqueue *queue, struct task *task)
 	if (task->ta_pending) {
 		if (task->ta_pending < USHRT_MAX)
 			task->ta_pending++;
+		TQ_UNLOCK(queue);
 		return (0);
 	}
 
@@ -220,11 +230,14 @@ taskqueue_enqueue_locked(struct taskqueue *queue, struct task *task)
 	}
 
 	task->ta_pending = 1;
+	if ((queue->tq_flags & TQ_FLAGS_UNLOCKED_ENQUEUE) != 0)
+		TQ_UNLOCK(queue);
 	if ((queue->tq_flags & TQ_FLAGS_BLOCKED) == 0)
 		queue->tq_enqueue(queue->tq_context);
-	else
-		queue->tq_flags |= TQ_FLAGS_PENDING;
+	if ((queue->tq_flags & TQ_FLAGS_UNLOCKED_ENQUEUE) == 0)
+		TQ_UNLOCK(queue);
 
+	/* Return with lock released. */
 	return (0);
 }
 int
@@ -234,7 +247,7 @@ taskqueue_enqueue(struct taskqueue *queue, struct task *task)
 
 	TQ_LOCK(queue);
 	res = taskqueue_enqueue_locked(queue, task);
-	TQ_UNLOCK(queue);
+	/* The lock is released inside. */
 
 	return (res);
 }
@@ -251,6 +264,7 @@ taskqueue_timeout_func(void *arg)
 	timeout_task->f &= ~DT_CALLOUT_ARMED;
 	queue->tq_callouts--;
 	taskqueue_enqueue_locked(timeout_task->q, &timeout_task->t);
+	/* The lock is released inside. */
 }
 
 int
@@ -267,6 +281,7 @@ taskqueue_enqueue_timeout(struct taskqueue *queue,
 	res = timeout_task->t.ta_pending;
 	if (ticks == 0) {
 		taskqueue_enqueue_locked(queue, &timeout_task->t);
+		/* The lock is released inside. */
 	} else {
 		if ((timeout_task->f & DT_CALLOUT_ARMED) != 0) {
 			res++;
@@ -280,11 +295,20 @@ taskqueue_enqueue_timeout(struct taskqueue *queue,
 			callout_reset(&timeout_task->c, ticks,
 			    taskqueue_timeout_func, timeout_task);
 		}
+		TQ_UNLOCK(queue);
 	}
-	TQ_UNLOCK(queue);
 	return (res);
 }
 
+static void
+taskqueue_drain_running(struct taskqueue *queue)
+{
+
+	while (!TAILQ_EMPTY(&queue->tq_active))
+		TQ_SLEEP(queue, &queue->tq_active, &queue->tq_mutex,
+		    PWAIT, "-", 0);
+}
+
 void
 taskqueue_block(struct taskqueue *queue)
 {
@@ -300,10 +324,8 @@ taskqueue_unblock(struct taskqueue *queue)
 
 	TQ_LOCK(queue);
 	queue->tq_flags &= ~TQ_FLAGS_BLOCKED;
-	if (queue->tq_flags & TQ_FLAGS_PENDING) {
-		queue->tq_flags &= ~TQ_FLAGS_PENDING;
+	if (!STAILQ_EMPTY(&queue->tq_queue))
 		queue->tq_enqueue(queue->tq_context);
-	}
 	TQ_UNLOCK(queue);
 }
 
@@ -337,6 +359,8 @@ taskqueue_run_locked(struct taskqueue *queue)
 		wakeup(task);
 	}
 	TAILQ_REMOVE(&queue->tq_active, &tb, tb_link);
+	if (TAILQ_EMPTY(&queue->tq_active))
+		wakeup(&queue->tq_active);
 }
 
 void
@@ -377,11 +401,9 @@ taskqueue_cancel_locked(struct taskqueue *queue, struct task *task,
 int
 taskqueue_cancel(struct taskqueue *queue, struct task *task, u_int *pendp)
 {
-	u_int pending;
 	int error;
 
 	TQ_LOCK(queue);
-	pending = task->ta_pending;
 	error = taskqueue_cancel_locked(queue, task, pendp);
 	TQ_UNLOCK(queue);
 
@@ -422,6 +444,25 @@ taskqueue_drain(struct taskqueue *queue, struct task *task)
 	TQ_UNLOCK(queue);
 }
 
+void
+taskqueue_drain_all(struct taskqueue *queue)
+{
+	struct task *task;
+
+	if (!queue->tq_spin)
+		WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, __func__);
+
+	TQ_LOCK(queue);
+	task = STAILQ_LAST(&queue->tq_queue, task, ta_link);
+	if (task != NULL)
+		while (task->ta_pending != 0)
+			TQ_SLEEP(queue, task, &queue->tq_mutex, PWAIT, "-", 0);
+	taskqueue_drain_running(queue);
+	KASSERT(STAILQ_EMPTY(&queue->tq_queue),
+	    ("taskqueue queue is not empty after draining"));
+	TQ_UNLOCK(queue);
+}
+
 void
 taskqueue_drain_timeout(struct taskqueue *queue,
     struct timeout_task *timeout_task)
@@ -568,7 +609,6 @@ taskqueue_thread_enqueue(void *context)
 	tqp = context;
 	tq = *tqp;
 
-	TQ_ASSERT_LOCKED(tq);
 	wakeup_one(tq);
 }
 
diff --git a/sys/kern/subr_terminal.c b/sys/kern/subr_terminal.c
new file mode 100644
index 00000000000..91634f4483a
--- /dev/null
+++ b/sys/kern/subr_terminal.c
@@ -0,0 +1,602 @@
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten 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/cons.h>
+#include <sys/consio.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/systm.h>
+#include <sys/terminal.h>
+#include <sys/tty.h>
+
+#include <machine/stdarg.h>
+
+static MALLOC_DEFINE(M_TERMINAL, "terminal", "terminal device");
+
+/*
+ * Locking.
+ *
+ * Normally we don't need to lock down the terminal emulator, because
+ * the TTY lock is already held when calling teken_input().
+ * Unfortunately this is not the case when the terminal acts as a
+ * console device, because cnputc() can be called at the same time.
+ * This means terminals may need to be locked down using a spin lock.
+ */
+#define	TERMINAL_LOCK(tm)	do {					\
+	if ((tm)->tm_flags & TF_CONS)					\
+		mtx_lock_spin(&(tm)->tm_mtx);				\
+	else if ((tm)->tm_tty != NULL)					\
+		tty_lock((tm)->tm_tty);					\
+} while (0)
+#define	TERMINAL_UNLOCK(tm)	do {					\
+	if ((tm)->tm_flags & TF_CONS)					\
+		mtx_unlock_spin(&(tm)->tm_mtx);				\
+	else if ((tm)->tm_tty != NULL)					\
+		tty_unlock((tm)->tm_tty);				\
+} while (0)
+#define	TERMINAL_LOCK_TTY(tm)	do {					\
+	if ((tm)->tm_flags & TF_CONS)					\
+		mtx_lock_spin(&(tm)->tm_mtx);				\
+} while (0)
+#define	TERMINAL_UNLOCK_TTY(tm)	do {					\
+	if ((tm)->tm_flags & TF_CONS)					\
+		mtx_unlock_spin(&(tm)->tm_mtx);				\
+} while (0)
+#define	TERMINAL_LOCK_CONS(tm)		mtx_lock_spin(&(tm)->tm_mtx)
+#define	TERMINAL_UNLOCK_CONS(tm)	mtx_unlock_spin(&(tm)->tm_mtx)
+
+/*
+ * TTY routines.
+ */
+
+static tsw_open_t	termtty_open;
+static tsw_close_t	termtty_close;
+static tsw_outwakeup_t	termtty_outwakeup;
+static tsw_ioctl_t	termtty_ioctl;
+
+static struct ttydevsw terminal_tty_class = {
+	.tsw_open	= termtty_open,
+	.tsw_close	= termtty_close,
+	.tsw_outwakeup	= termtty_outwakeup,
+	.tsw_ioctl	= termtty_ioctl,
+};
+
+/*
+ * Terminal emulator routines.
+ */
+
+static tf_bell_t	termteken_bell;
+static tf_cursor_t	termteken_cursor;
+static tf_putchar_t	termteken_putchar;
+static tf_fill_t	termteken_fill;
+static tf_copy_t	termteken_copy;
+static tf_param_t	termteken_param;
+static tf_respond_t	termteken_respond;
+
+static teken_funcs_t terminal_drawmethods = {
+	.tf_bell	= termteken_bell,
+	.tf_cursor	= termteken_cursor,
+	.tf_putchar	= termteken_putchar,
+	.tf_fill	= termteken_fill,
+	.tf_copy	= termteken_copy,
+	.tf_param	= termteken_param,
+	.tf_respond	= termteken_respond,
+};
+
+/* Kernel message formatting. */
+static const teken_attr_t kernel_message = {
+	.ta_fgcolor	= TC_WHITE,
+	.ta_bgcolor	= TC_BLACK,
+	.ta_format	= TF_BOLD,
+};
+
+static const teken_attr_t default_message = {
+	.ta_fgcolor	= TC_WHITE,
+	.ta_bgcolor	= TC_BLACK,
+};
+
+#define	TCHAR_CREATE(c, a)	((c) | \
+	(a)->ta_format << 22 | \
+	teken_256to8((a)->ta_fgcolor) << 26 | \
+	teken_256to8((a)->ta_bgcolor) << 29)
+
+static void
+terminal_init(struct terminal *tm)
+{
+
+	if (tm->tm_flags & TF_CONS)
+		mtx_init(&tm->tm_mtx, "trmlck", NULL, MTX_SPIN);
+	teken_init(&tm->tm_emulator, &terminal_drawmethods, tm);
+	teken_set_defattr(&tm->tm_emulator, &default_message);
+}
+
+struct terminal *
+terminal_alloc(const struct terminal_class *tc, void *softc)
+{
+	struct terminal *tm;
+
+	tm = malloc(sizeof(struct terminal), M_TERMINAL, M_WAITOK|M_ZERO);
+	terminal_init(tm);
+
+	tm->tm_class = tc;
+	tm->tm_softc = softc;
+
+	return (tm);
+}
+
+static void
+terminal_sync_ttysize(struct terminal *tm)
+{
+	struct tty *tp;
+
+	tp = tm->tm_tty;
+	if (tp == NULL)
+		return;
+
+	tty_lock(tp);
+	tty_set_winsize(tp, &tm->tm_winsize);
+	tty_unlock(tp);
+}
+
+void
+terminal_maketty(struct terminal *tm, const char *fmt, ...)
+{
+	struct tty *tp;
+	char name[8];
+	va_list ap;
+
+	va_start(ap, fmt);
+	vsnrprintf(name, sizeof name, 32, fmt, ap);
+	va_end(ap);
+
+	tp = tty_alloc(&terminal_tty_class, tm);
+	tty_makedev(tp, NULL, "%s", name);
+	tm->tm_tty = tp;
+	terminal_sync_ttysize(tm);
+}
+
+void
+terminal_set_winsize_blank(struct terminal *tm, const struct winsize *size,
+    int blank)
+{
+	term_rect_t r;
+
+	tm->tm_winsize = *size;
+
+	r.tr_begin.tp_row = r.tr_begin.tp_col = 0;
+	r.tr_end.tp_row = size->ws_row;
+	r.tr_end.tp_col = size->ws_col;
+
+	TERMINAL_LOCK(tm);
+	if (blank == 0)
+		teken_set_winsize_noreset(&tm->tm_emulator, &r.tr_end);
+	else
+		teken_set_winsize(&tm->tm_emulator, &r.tr_end);
+	TERMINAL_UNLOCK(tm);
+
+	if (blank != 0)
+		tm->tm_class->tc_fill(tm, &r, TCHAR_CREATE((teken_char_t)' ',
+		    &default_message));
+
+	terminal_sync_ttysize(tm);
+}
+
+void
+terminal_set_winsize(struct terminal *tm, const struct winsize *size)
+{
+
+	terminal_set_winsize_blank(tm, size, 1);
+}
+
+/*
+ * XXX: This function is a kludge.  Drivers like vt(4) need to
+ * temporarily stop input when resizing, etc.  This should ideally be
+ * handled within the driver.
+ */
+
+void
+terminal_mute(struct terminal *tm, int yes)
+{
+
+	TERMINAL_LOCK(tm);
+	if (yes)
+		tm->tm_flags |= TF_MUTE;
+	else
+		tm->tm_flags &= ~TF_MUTE;
+	TERMINAL_UNLOCK(tm);
+}
+
+void
+terminal_input_char(struct terminal *tm, term_char_t c)
+{
+	struct tty *tp;
+
+	tp = tm->tm_tty;
+	if (tp == NULL)
+		return;
+
+	/* Strip off any attributes. */
+	c = TCHAR_CHARACTER(c);
+
+	tty_lock(tp);
+	/*
+	 * Conversion to UTF-8.
+	 */
+	if (c < 0x80) {
+		ttydisc_rint(tp, c, 0);
+	} else if (c < 0x800) {
+		char str[2] = {
+			0xc0 | (c >> 6),
+			0x80 | (c & 0x3f)
+		};
+
+		ttydisc_rint_simple(tp, str, sizeof str);
+	} else if (c < 0x10000) {
+		char str[3] = {
+			0xe0 | (c >> 12),
+			0x80 | ((c >> 6) & 0x3f),
+			0x80 | (c & 0x3f)
+		};
+
+		ttydisc_rint_simple(tp, str, sizeof str);
+	} else {
+		char str[4] = {
+			0xf0 | (c >> 18),
+			0x80 | ((c >> 12) & 0x3f),
+			0x80 | ((c >> 6) & 0x3f),
+			0x80 | (c & 0x3f)
+		};
+
+		ttydisc_rint_simple(tp, str, sizeof str);
+	}
+	ttydisc_rint_done(tp);
+	tty_unlock(tp);
+}
+
+void
+terminal_input_raw(struct terminal *tm, char c)
+{
+	struct tty *tp;
+
+	tp = tm->tm_tty;
+	if (tp == NULL)
+		return;
+
+	tty_lock(tp);
+	ttydisc_rint(tp, c, 0);
+	ttydisc_rint_done(tp);
+	tty_unlock(tp);
+}
+
+void
+terminal_input_special(struct terminal *tm, unsigned int k)
+{
+	struct tty *tp;
+	const char *str;
+
+	tp = tm->tm_tty;
+	if (tp == NULL)
+		return;
+
+	str = teken_get_sequence(&tm->tm_emulator, k);
+	if (str == NULL)
+		return;
+
+	tty_lock(tp);
+	ttydisc_rint_simple(tp, str, strlen(str));
+	ttydisc_rint_done(tp);
+	tty_unlock(tp);
+}
+
+/*
+ * Binding with the TTY layer.
+ */
+
+static int
+termtty_open(struct tty *tp)
+{
+	struct terminal *tm = tty_softc(tp);
+
+	tm->tm_class->tc_opened(tm, 1);
+	return (0);
+}
+
+static void
+termtty_close(struct tty *tp)
+{
+	struct terminal *tm = tty_softc(tp);
+
+	tm->tm_class->tc_opened(tm, 0);
+}
+
+static void
+termtty_outwakeup(struct tty *tp)
+{
+	struct terminal *tm = tty_softc(tp);
+	char obuf[128];
+	size_t olen;
+	unsigned int flags = 0;
+
+	while ((olen = ttydisc_getc(tp, obuf, sizeof obuf)) > 0) {
+		TERMINAL_LOCK_TTY(tm);
+		if (!(tm->tm_flags & TF_MUTE)) {
+			tm->tm_flags &= ~TF_BELL;
+			teken_input(&tm->tm_emulator, obuf, olen);
+			flags |= tm->tm_flags;
+		}
+		TERMINAL_UNLOCK_TTY(tm);
+	}
+
+	tm->tm_class->tc_done(tm);
+	if (flags & TF_BELL)
+		tm->tm_class->tc_bell(tm);
+}
+
+static int
+termtty_ioctl(struct tty *tp, u_long cmd, caddr_t data, struct thread *td)
+{
+	struct terminal *tm = tty_softc(tp);
+	int error;
+
+	switch (cmd) {
+	case CONS_GETINFO: {
+		vid_info_t *vi = (vid_info_t *)data;
+		const teken_pos_t *p;
+		int fg, bg;
+
+		if (vi->size != sizeof(vid_info_t))
+			return (EINVAL);
+
+		/* Already help the console driver by filling in some data. */
+		p = teken_get_cursor(&tm->tm_emulator);
+		vi->mv_row = p->tp_row;
+		vi->mv_col = p->tp_col;
+
+		p = teken_get_winsize(&tm->tm_emulator);
+		vi->mv_rsz = p->tp_row;
+		vi->mv_csz = p->tp_col;
+
+		teken_get_defattr_cons25(&tm->tm_emulator, &fg, &bg);
+		vi->mv_norm.fore = fg;
+		vi->mv_norm.back = bg;
+		/* XXX: keep vidcontrol happy; bold backgrounds. */
+		vi->mv_rev.fore = bg;
+		vi->mv_rev.back = fg & 0x7;
+		break;
+	}
+	}
+
+	/*
+	 * Unlike various other drivers, this driver will never
+	 * deallocate TTYs.  This means it's safe to temporarily unlock
+	 * the TTY when handling ioctls.
+	 */
+	tty_unlock(tp);
+	error = tm->tm_class->tc_ioctl(tm, cmd, data, td);
+	tty_lock(tp);
+	return (error);
+}
+
+/*
+ * Binding with the kernel and debug console.
+ */
+
+static cn_probe_t	termcn_cnprobe;
+static cn_init_t	termcn_cninit;
+static cn_term_t	termcn_cnterm;
+static cn_getc_t	termcn_cngetc;
+static cn_putc_t	termcn_cnputc;
+static cn_grab_t	termcn_cngrab;
+static cn_ungrab_t	termcn_cnungrab;
+
+const struct consdev_ops termcn_cnops = {
+	.cn_probe	= termcn_cnprobe,
+	.cn_init	= termcn_cninit,
+	.cn_term	= termcn_cnterm,
+	.cn_getc	= termcn_cngetc,
+	.cn_putc	= termcn_cnputc,
+	.cn_grab	= termcn_cngrab,
+	.cn_ungrab	= termcn_cnungrab,
+};
+
+void
+termcn_cnregister(struct terminal *tm)
+{
+	struct consdev *cp;
+
+	cp = tm->consdev;
+	if (cp == NULL) {
+		cp = malloc(sizeof(struct consdev), M_TERMINAL,
+		    M_WAITOK|M_ZERO);
+		cp->cn_ops = &termcn_cnops;
+		cp->cn_arg = tm;
+		cp->cn_pri = CN_INTERNAL;
+		sprintf(cp->cn_name, "ttyv0");
+
+		tm->tm_flags = TF_CONS;
+		tm->consdev = cp;
+
+		terminal_init(tm);
+	}
+
+	/* Attach terminal as console. */
+	cnadd(cp);
+}
+
+static void
+termcn_cngrab(struct consdev *cp)
+{
+
+}
+
+static void
+termcn_cnungrab(struct consdev *cp)
+{
+
+}
+
+static void
+termcn_cnprobe(struct consdev *cp)
+{
+	struct terminal *tm = cp->cn_arg;
+
+	if (tm == NULL) {
+		cp->cn_pri = CN_DEAD;
+		return;
+	}
+
+	tm->consdev = cp;
+	terminal_init(tm);
+
+	tm->tm_class->tc_cnprobe(tm, cp);
+}
+
+static void
+termcn_cninit(struct consdev *cp)
+{
+
+}
+
+static void
+termcn_cnterm(struct consdev *cp)
+{
+
+}
+
+static int
+termcn_cngetc(struct consdev *cp)
+{
+	struct terminal *tm = cp->cn_arg;
+
+	return (tm->tm_class->tc_cngetc(tm));
+}
+
+static void
+termcn_cnputc(struct consdev *cp, int c)
+{
+	struct terminal *tm = cp->cn_arg;
+	teken_attr_t backup;
+	char cv = c;
+
+	TERMINAL_LOCK_CONS(tm);
+	if (!(tm->tm_flags & TF_MUTE)) {
+		backup = *teken_get_curattr(&tm->tm_emulator);
+		teken_set_curattr(&tm->tm_emulator, &kernel_message);
+		teken_input(&tm->tm_emulator, &cv, 1);
+		teken_set_curattr(&tm->tm_emulator, &backup);
+	}
+	TERMINAL_UNLOCK_CONS(tm);
+
+	tm->tm_class->tc_done(tm);
+}
+
+/*
+ * Binding with the terminal emulator.
+ */
+
+static void
+termteken_bell(void *softc)
+{
+	struct terminal *tm = softc;
+
+	tm->tm_flags |= TF_BELL;
+}
+
+static void
+termteken_cursor(void *softc, const teken_pos_t *p)
+{
+	struct terminal *tm = softc;
+
+	tm->tm_class->tc_cursor(tm, p);
+}
+
+static void
+termteken_putchar(void *softc, const teken_pos_t *p, teken_char_t c,
+    const teken_attr_t *a)
+{
+	struct terminal *tm = softc;
+
+	tm->tm_class->tc_putchar(tm, p, TCHAR_CREATE(c, a));
+}
+
+static void
+termteken_fill(void *softc, const teken_rect_t *r, teken_char_t c,
+    const teken_attr_t *a)
+{
+	struct terminal *tm = softc;
+
+	tm->tm_class->tc_fill(tm, r, TCHAR_CREATE(c, a));
+}
+
+static void
+termteken_copy(void *softc, const teken_rect_t *r, const teken_pos_t *p)
+{
+	struct terminal *tm = softc;
+
+	tm->tm_class->tc_copy(tm, r, p);
+}
+
+static void
+termteken_param(void *softc, int cmd, unsigned int arg)
+{
+	struct terminal *tm = softc;
+
+	tm->tm_class->tc_param(tm, cmd, arg);
+}
+
+static void
+termteken_respond(void *softc, const void *buf, size_t len)
+{
+#if 0
+	struct terminal *tm = softc;
+	struct tty *tp;
+
+	/*
+	 * Only inject a response into the TTY if the data actually
+	 * originated from the TTY.
+	 *
+	 * XXX: This cannot be done right now.  The TTY could pick up
+	 * other locks.  It could also in theory cause loops, when the
+	 * TTY performs echoing of a command that generates even more
+	 * input.
+	 */
+	tp = tm->tm_tty;
+	if (tp == NULL)
+		return;
+
+	ttydisc_rint_simple(tp, buf, len);
+	ttydisc_rint_done(tp);
+#endif
+}
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 19729a46356..65a31cdaeec 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_hwpmc_hooks.h"
 #include "opt_ktrace.h"
-#include "opt_kdtrace.h"
 #include "opt_sched.h"
 
 #include <sys/param.h>
diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index 0a21ad92949..367297a6a41 100644
--- a/sys/kern/subr_turnstile.c
+++ b/sys/kern/subr_turnstile.c
@@ -60,7 +60,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 #include "opt_turnstile_profiling.h"
 #include "opt_sched.h"
 
@@ -170,8 +169,8 @@ static int	turnstile_init(void *mem, int size, int flags);
 static void	turnstile_fini(void *mem, int size);
 
 SDT_PROVIDER_DECLARE(sched);
-SDT_PROBE_DEFINE(sched, , , sleep, sleep);
-SDT_PROBE_DEFINE2(sched, , , wakeup, wakeup, "struct thread *", 
+SDT_PROBE_DEFINE(sched, , , sleep);
+SDT_PROBE_DEFINE2(sched, , , wakeup, "struct thread *", 
     "struct proc *");
 
 /*
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index d4d6293034a..f8fafb7a0f4 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -75,9 +75,13 @@ __FBSDID("$FreeBSD$");
 
 #include <security/audit/audit.h>
 
-int iosize_max_clamp = 1;
+int iosize_max_clamp = 0;
 SYSCTL_INT(_debug, OID_AUTO, iosize_max_clamp, CTLFLAG_RW,
     &iosize_max_clamp, 0, "Clamp max i/o size to INT_MAX");
+int devfs_iosize_max_clamp = 1;
+SYSCTL_INT(_debug, OID_AUTO, devfs_iosize_max_clamp, CTLFLAG_RW,
+    &devfs_iosize_max_clamp, 0, "Clamp max i/o size to INT_MAX for devices");
+
 /*
  * Assert that the return value of read(2) and write(2) syscalls fits
  * into a register.  If not, an architecture will need to provide the
@@ -1191,8 +1195,9 @@ getselfd_cap(struct filedesc *fdp, int fd, struct file **fpp)
 {
 	cap_rights_t rights;
 
-	return (fget_unlocked(fdp, fd, cap_rights_init(&rights, CAP_POLL_EVENT),
-	    0, fpp, NULL));
+	cap_rights_init(&rights, CAP_EVENT);
+
+	return (fget_unlocked(fdp, fd, &rights, 0, fpp, NULL));
 }
 
 /*
@@ -1388,7 +1393,7 @@ pollrescan(struct thread *td)
 #ifdef CAPABILITIES
 		if (fp == NULL ||
 		    cap_check(cap_rights(fdp, fd->fd),
-		    cap_rights_init(&rights, CAP_POLL_EVENT)) != 0)
+		    cap_rights_init(&rights, CAP_EVENT)) != 0)
 #else
 		if (fp == NULL)
 #endif
@@ -1463,7 +1468,7 @@ pollscan(td, fds, nfd)
 #ifdef CAPABILITIES
 			if (fp == NULL ||
 			    cap_check(cap_rights(fdp, fds->fd),
-			    cap_rights_init(&rights, CAP_POLL_EVENT)) != 0)
+			    cap_rights_init(&rights, CAP_EVENT)) != 0)
 #else
 			if (fp == NULL)
 #endif
diff --git a/sys/kern/sys_procdesc.c b/sys/kern/sys_procdesc.c
index 4bafeabaab4..0801fbf08cf 100644
--- a/sys/kern/sys_procdesc.c
+++ b/sys/kern/sys_procdesc.c
@@ -61,8 +61,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_procdesc.h"
-
 #include <sys/param.h>
 #include <sys/capability.h>
 #include <sys/fcntl.h>
@@ -85,8 +83,6 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/uma.h>
 
-#ifdef PROCDESC
-
 FEATURE(process_descriptors, "Process Descriptors");
 
 static uma_zone_t procdesc_zone;
@@ -522,14 +518,3 @@ procdesc_chown(struct file *fp, uid_t uid, gid_t gid, struct ucred *active_cred,
 
 	return (EOPNOTSUPP);
 }
-
-#else /* !PROCDESC */
-
-int
-sys_pdgetpid(struct thread *td, struct pdgetpid_args *uap)
-{
-
-	return (ENOSYS);
-}
-
-#endif /* PROCDESC */
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index 6a766afa971..0fc26df6748 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ucred.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index ea44debd176..4144d9431f9 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -342,7 +342,7 @@ kern_shmat(td, shmid, shmaddr, shmflg)
 	int shmflg;
 {
 	struct proc *p = td->td_proc;
-	int i, flags;
+	int i;
 	struct shmid_kernel *shmseg;
 	struct shmmap_state *shmmap_s = NULL;
 	vm_offset_t attach_va;
@@ -389,9 +389,7 @@ kern_shmat(td, shmid, shmaddr, shmflg)
 	prot = VM_PROT_READ;
 	if ((shmflg & SHM_RDONLY) == 0)
 		prot |= VM_PROT_WRITE;
-	flags = MAP_ANON | MAP_SHARED;
 	if (shmaddr) {
-		flags |= MAP_FIXED;
 		if (shmflg & SHM_RND) {
 			attach_va = (vm_offset_t)shmaddr & ~(SHMLBA-1);
 		} else if (((vm_offset_t)shmaddr & (SHMLBA-1)) == 0) {
@@ -413,7 +411,7 @@ kern_shmat(td, shmid, shmaddr, shmflg)
 
 	vm_object_reference(shmseg->object);
 	rv = vm_map_find(&p->p_vmspace->vm_map, shmseg->object,
-	    0, &attach_va, size, 0, (flags & MAP_FIXED) ? VMFS_NO_SPACE :
+	    0, &attach_va, size, 0, shmaddr != NULL ? VMFS_NO_SPACE :
 	    VMFS_OPTIMAL_SPACE, prot, prot, MAP_INHERIT_SHARE);
 	if (rv != KERN_SUCCESS) {
 		vm_object_deallocate(shmseg->object);
diff --git a/sys/kern/uipc_cow.c b/sys/kern/uipc_cow.c
deleted file mode 100644
index 8a3a5ff0475..00000000000
--- a/sys/kern/uipc_cow.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*--
- * Copyright (c) 1997, Duke University
- * All rights reserved.
- *
- * Author:
- *         Andrew Gallatin <gallatin@cs.duke.edu>  
- *            
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 Duke University may not be used to endorse or promote 
- *    products derived from this software without specific prior written 
- *    permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY DUKE UNIVERSITY ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DUKE UNIVERSITY BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITSOR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
- * IN CONTRACT, STRICT LIABILITY, OR TORT (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 set of routines for enabling and disabling copy on write
- * protection for data written into sockets.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/sysctl.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/mbuf.h>
-#include <sys/sf_buf.h>
-#include <sys/socketvar.h>
-#include <sys/uio.h>
-
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-#include <vm/vm_map.h>
-#include <vm/vm_page.h>
-#include <vm/vm_object.h>
-
-FEATURE(zero_copy_sockets, "Zero copy sockets support");
-
-struct netsend_cow_stats {
-	int attempted;
-	int fail_not_mapped;
-	int fail_sf_buf;
-	int success;
-	int iodone;
-};
-
-static struct netsend_cow_stats socow_stats;
-
-static int socow_iodone(struct mbuf *m, void *addr, void *args);
-
-static int
-socow_iodone(struct mbuf *m, void *addr, void *args)
-{	
-	struct sf_buf *sf;
-	vm_page_t pp;
-
-	sf = args;
-	pp = sf_buf_page(sf);
-	sf_buf_free(sf);
-	/* remove COW mapping  */
-	vm_page_lock(pp);
-	vm_page_cowclear(pp);
-	vm_page_unwire(pp, 0);
-	/*
-	 * Check for the object going away on us. This can
-	 * happen since we don't hold a reference to it.
-	 * If so, we're responsible for freeing the page.
-	 */
-	if (pp->wire_count == 0 && pp->object == NULL)
-		vm_page_free(pp);
-	vm_page_unlock(pp);
-	socow_stats.iodone++;
-	return (EXT_FREE_OK);
-}
-
-int
-socow_setup(struct mbuf *m0, struct uio *uio)
-{
-	struct sf_buf *sf;
-	vm_page_t pp;
-	struct iovec *iov;
-	struct vmspace *vmspace;
-	struct vm_map *map;
-	vm_offset_t offset, uva;
-	vm_size_t len;
-
-	socow_stats.attempted++;
-	vmspace = curproc->p_vmspace;
-	map = &vmspace->vm_map;
-	uva = (vm_offset_t) uio->uio_iov->iov_base;
-	offset = uva & PAGE_MASK;
-	len = PAGE_SIZE - offset;
-
-	/*
-	 * Verify that access to the given address is allowed from user-space.
-	 */
-	if (vm_fault_quick_hold_pages(map, uva, len, VM_PROT_READ, &pp, 1) <
-	    0) {
-		socow_stats.fail_not_mapped++;
-		return(0);
-	}
-
-	/* 
-	 * set up COW
-	 */
-	vm_page_lock(pp);
-	if (vm_page_cowsetup(pp) != 0) {
-		vm_page_unhold(pp);
-		vm_page_unlock(pp);
-		return (0);
-	}
-
-	/*
-	 * wire the page for I/O
-	 */
-	vm_page_wire(pp);
-	vm_page_unhold(pp);
-	vm_page_unlock(pp);
-	/*
-	 * Allocate an sf buf
-	 */
-	sf = sf_buf_alloc(pp, SFB_CATCH);
-	if (sf == NULL) {
-		vm_page_lock(pp);
-		vm_page_cowclear(pp);
-		vm_page_unwire(pp, 0);
-		/*
-		 * Check for the object going away on us. This can
-		 * happen since we don't hold a reference to it.
-		 * If so, we're responsible for freeing the page.
-		 */
-		if (pp->wire_count == 0 && pp->object == NULL)
-			vm_page_free(pp);
-		vm_page_unlock(pp);
-		socow_stats.fail_sf_buf++;
-		return(0);
-	}
-	/* 
-	 * attach to mbuf
-	 */
-	MEXTADD(m0, sf_buf_kva(sf), PAGE_SIZE, socow_iodone,
-	    (void*)sf_buf_kva(sf), sf, M_RDONLY, EXT_SFBUF);
-	m0->m_len = len;
-	m0->m_data = (caddr_t)sf_buf_kva(sf) + offset;
-	socow_stats.success++;
-
-	iov = uio->uio_iov;
-	iov->iov_base = (char *)iov->iov_base + m0->m_len;
-	iov->iov_len -= m0->m_len;
-	uio->uio_resid -= m0->m_len;
-	uio->uio_offset += m0->m_len;
-	if (iov->iov_len == 0) {
-		uio->uio_iov++;
-		uio->uio_iovcnt--;
-	}
-
-	return(m0->m_len);
-}
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 8e278a47c0a..a16af57a85b 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1196,6 +1196,7 @@ m_split(struct mbuf *m0, int len0, int wait)
 	remain = m->m_len - len;
 	if (m0->m_flags & M_PKTHDR && remain == 0) {
 		n = m_gethdr(wait, m0->m_type);
+		if (n == NULL)
 			return (NULL);
 		n->m_next = m->m_next;
 		m->m_next = NULL;
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c
index fe7e88645b1..20efbe087d6 100644
--- a/sys/kern/uipc_mqueue.c
+++ b/sys/kern/uipc_mqueue.c
@@ -2119,7 +2119,7 @@ getmq(struct thread *td, int fd, struct file **fpp, struct mqfs_node **ppn,
 {
 	cap_rights_t rights;
 
-	return _getmq(td, fd, cap_rights_init(&rights, CAP_POLL_EVENT), fget,
+	return _getmq(td, fd, cap_rights_init(&rights, CAP_EVENT), fget,
 	    fpp, ppn, pmq);
 }
 
@@ -2282,7 +2282,7 @@ again:
 	}
 #ifdef CAPABILITIES
 	error = cap_check(cap_rights(fdp, mqd),
-	    cap_rights_init(&rights, CAP_POLL_EVENT));
+	    cap_rights_init(&rights, CAP_EVENT));
 	if (error) {
 		FILEDESC_SUNLOCK(fdp);
 		goto out;
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index 9fa8ae0aa7b..c23995f72c6 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -65,7 +65,7 @@ u_long sb_max_adj =
 
 static	u_long sb_efficiency = 8;	/* parameter for sbreserve() */
 
-static void	sbdrop_internal(struct sockbuf *sb, int len);
+static struct mbuf	*sbcut_internal(struct sockbuf *sb, int len);
 static void	sbflush_internal(struct sockbuf *sb);
 
 /*
@@ -818,7 +818,7 @@ sbflush_internal(struct sockbuf *sb)
 		 */
 		if (!sb->sb_cc && (sb->sb_mb == NULL || sb->sb_mb->m_len))
 			break;
-		sbdrop_internal(sb, (int)sb->sb_cc);
+		m_freem(sbcut_internal(sb, (int)sb->sb_cc));
 	}
 	if (sb->sb_cc || sb->sb_mb || sb->sb_mbcnt)
 		panic("sbflush_internal: cc %u || mb %p || mbcnt %u",
@@ -843,15 +843,16 @@ sbflush(struct sockbuf *sb)
 }
 
 /*
- * Drop data from (the front of) a sockbuf.
+ * Cut data from (the front of) a sockbuf.
  */
-static void
-sbdrop_internal(struct sockbuf *sb, int len)
+static struct mbuf *
+sbcut_internal(struct sockbuf *sb, int len)
 {
-	struct mbuf *m;
-	struct mbuf *next;
+	struct mbuf *m, *n, *next, *mfree;
 
 	next = (m = sb->sb_mb) ? m->m_nextpkt : 0;
+	mfree = NULL;
+
 	while (len > 0) {
 		if (m == 0) {
 			if (next == 0)
@@ -872,11 +873,17 @@ sbdrop_internal(struct sockbuf *sb, int len)
 		}
 		len -= m->m_len;
 		sbfree(sb, m);
-		m = m_free(m);
+		n = m->m_next;
+		m->m_next = mfree;
+		mfree = m;
+		m = n;
 	}
 	while (m && m->m_len == 0) {
 		sbfree(sb, m);
-		m = m_free(m);
+		n = m->m_next;
+		m->m_next = mfree;
+		mfree = m;
+		m = n;
 	}
 	if (m) {
 		sb->sb_mb = m;
@@ -894,6 +901,8 @@ sbdrop_internal(struct sockbuf *sb, int len)
 	} else if (m->m_nextpkt == NULL) {
 		sb->sb_lastrecord = m;
 	}
+
+	return (mfree);
 }
 
 /*
@@ -904,17 +913,31 @@ sbdrop_locked(struct sockbuf *sb, int len)
 {
 
 	SOCKBUF_LOCK_ASSERT(sb);
+	m_freem(sbcut_internal(sb, len));
+}
 
-	sbdrop_internal(sb, len);
+/*
+ * Drop data from (the front of) a sockbuf,
+ * and return it to caller.
+ */
+struct mbuf *
+sbcut_locked(struct sockbuf *sb, int len)
+{
+
+	SOCKBUF_LOCK_ASSERT(sb);
+	return (sbcut_internal(sb, len));
 }
 
 void
 sbdrop(struct sockbuf *sb, int len)
 {
+	struct mbuf *mfree;
 
 	SOCKBUF_LOCK(sb);
-	sbdrop_locked(sb, len);
+	mfree = sbcut_internal(sb, len);
 	SOCKBUF_UNLOCK(sb);
+
+	m_freem(mfree);
 }
 
 /*
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 66af1810513..9da42057f9e 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -479,13 +479,17 @@ SYSCTL_INT(_regression, OID_AUTO, sonewconn_earlytest, CTLFLAG_RW,
  * connections, sonewconn is called.  If the connection is possible (subject
  * to space constraints, etc.) then we allocate a new structure, propoerly
  * linked into the data structure of the original socket, and return this.
- * Connstatus may be 0, or SO_ISCONFIRMING, or SO_ISCONNECTED.
+ * Connstatus may be 0, or SS_ISCONFIRMING, or SS_ISCONNECTED.
  *
  * Note: the ref count on the socket is 0 on return.
  */
 struct socket *
 sonewconn(struct socket *head, int connstatus)
 {
+	static struct timeval lastover;
+	static struct timeval overinterval = { 60, 0 };
+	static int overcount;
+
 	struct socket *so;
 	int over;
 
@@ -497,9 +501,17 @@ sonewconn(struct socket *head, int connstatus)
 #else
 	if (over) {
 #endif
-		log(LOG_DEBUG, "%s: pcb %p: Listen queue overflow: "
-		    "%i already in queue awaiting acceptance\n",
-		    __func__, head->so_pcb, head->so_qlen);
+		overcount++;
+
+		if (ratecheck(&lastover, &overinterval)) {
+			log(LOG_DEBUG, "%s: pcb %p: Listen queue overflow: "
+			    "%i already in queue awaiting acceptance "
+			    "(%d occurrences)\n",
+			    __func__, head->so_pcb, head->so_qlen, overcount);
+
+			overcount = 0;
+		}
+
 		return (NULL);
 	}
 	VNET_ASSERT(head->so_vnet != NULL, ("%s:%d so_vnet is NULL, head=%p",
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 322550b7455..e43cd4bb353 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/protosw.h>
 #include <sys/rwlock.h>
 #include <sys/sf_buf.h>
+#include <sys/sf_sync.h>
 #include <sys/sysent.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
@@ -1844,12 +1845,6 @@ getsockaddr(namp, uaddr, len)
 	return (error);
 }
 
-struct sendfile_sync {
-	struct mtx	mtx;
-	struct cv	cv;
-	unsigned	count;
-};
-
 /*
  * Detach mapped page and release resources back to the system.
  */
@@ -1871,15 +1866,94 @@ sf_buf_mext(struct mbuf *mb, void *addr, void *args)
 	if (m->wire_count == 0 && m->object == NULL)
 		vm_page_free(m);
 	vm_page_unlock(m);
-	if (addr == NULL)
-		return (EXT_FREE_OK);
-	sfs = addr;
+	if (addr != NULL) {
+		sfs = addr;
+		sf_sync_deref(sfs);
+	}
+	return (EXT_FREE_OK);
+}
+
+void
+sf_sync_deref(struct sendfile_sync *sfs)
+{
+
+	if (sfs == NULL)
+		return;
+
 	mtx_lock(&sfs->mtx);
 	KASSERT(sfs->count> 0, ("Sendfile sync botchup count == 0"));
 	if (--sfs->count == 0)
 		cv_signal(&sfs->cv);
 	mtx_unlock(&sfs->mtx);
-	return (EXT_FREE_OK);
+}
+
+/*
+ * Allocate a sendfile_sync state structure.
+ *
+ * For now this only knows about the "sleep" sync, but later it will
+ * grow various other personalities.
+ */
+struct sendfile_sync *
+sf_sync_alloc(uint32_t flags)
+{
+	struct sendfile_sync *sfs;
+
+	sfs = malloc(sizeof *sfs, M_TEMP, M_WAITOK | M_ZERO);
+	mtx_init(&sfs->mtx, "sendfile", NULL, MTX_DEF);
+	cv_init(&sfs->cv, "sendfile");
+	sfs->flags = flags;
+
+	return (sfs);
+}
+
+/*
+ * Take a reference to a sfsync instance.
+ *
+ * This has to map 1:1 to free calls coming in via sf_buf_mext(),
+ * so typically this will be referenced once for each mbuf allocated.
+ */
+void
+sf_sync_ref(struct sendfile_sync *sfs)
+{
+
+	if (sfs == NULL)
+		return;
+
+	mtx_lock(&sfs->mtx);
+	sfs->count++;
+	mtx_unlock(&sfs->mtx);
+}
+
+void
+sf_sync_syscall_wait(struct sendfile_sync *sfs)
+{
+
+	if (sfs == NULL)
+		return;
+
+	mtx_lock(&sfs->mtx);
+	if (sfs->count != 0)
+		cv_wait(&sfs->cv, &sfs->mtx);
+	KASSERT(sfs->count == 0, ("sendfile sync still busy"));
+	mtx_unlock(&sfs->mtx);
+}
+
+void
+sf_sync_free(struct sendfile_sync *sfs)
+{
+
+	if (sfs == NULL)
+		return;
+
+	/*
+	 * XXX we should ensure that nothing else has this
+	 * locked before freeing.
+	 */
+	mtx_lock(&sfs->mtx);
+	KASSERT(sfs->count == 0, ("sendfile sync still busy"));
+	cv_destroy(&sfs->cv);
+	mtx_destroy(&sfs->mtx);
+	free(sfs, M_TEMP);
 }
 
 /*
@@ -1908,6 +1982,8 @@ do_sendfile(struct thread *td, struct sendfile_args *uap, int compat)
 	struct file *fp;
 	cap_rights_t rights;
 	int error;
+	off_t sbytes;
+	struct sendfile_sync *sfs;
 
 	/*
 	 * File offset must be positive.  If it goes beyond EOF
@@ -1917,6 +1993,7 @@ do_sendfile(struct thread *td, struct sendfile_args *uap, int compat)
 		return (EINVAL);
 
 	hdr_uio = trl_uio = NULL;
+	sfs = NULL;
 
 	if (uap->hdtr != NULL) {
 		error = copyin(uap->hdtr, &hdtr, sizeof(hdtr));
@@ -1946,10 +2023,34 @@ do_sendfile(struct thread *td, struct sendfile_args *uap, int compat)
 		goto out;
 	}
 
+	/*
+	 * If we need to wait for completion, initialise the sfsync
+	 * state here.
+	 */
+	if (uap->flags & SF_SYNC)
+		sfs = sf_sync_alloc(uap->flags & SF_SYNC);
+
 	error = fo_sendfile(fp, uap->s, hdr_uio, trl_uio, uap->offset,
-	    uap->nbytes, uap->sbytes, uap->flags, compat ? SFK_COMPAT : 0, td);
+	    uap->nbytes, &sbytes, uap->flags, compat ? SFK_COMPAT : 0, sfs, td);
+
+	/*
+	 * If appropriate, do the wait and free here.
+	 */
+	if (sfs != NULL) {
+		sf_sync_syscall_wait(sfs);
+		sf_sync_free(sfs);
+	}
+
+	/*
+	 * XXX Should we wait until the send has completed before freeing the source
+	 * file handle? It's the previous behaviour, sure, but is it required?
+	 * We've wired down the page references after all.
+	 */
 	fdrop(fp, td);
 
+	if (uap->sbytes != NULL) {
+		copyout(&sbytes, uap->sbytes, sizeof(off_t));
+	}
 out:
 	free(hdr_uio, M_IOV);
 	free(trl_uio, M_IOV);
@@ -2070,7 +2171,8 @@ free_page:
 	}
 	KASSERT(error != 0 || (m->wire_count > 0 &&
 	    vm_page_is_valid(m, off & PAGE_MASK, xfsize)),
-	    ("wrong page state m %p", m));
+	    ("wrong page state m %p off %#jx xfsize %d", m, (uintmax_t)off,
+	    xfsize));
 	VM_OBJECT_WUNLOCK(obj);
 	return (error);
 }
@@ -2173,7 +2275,7 @@ kern_sendfile_getsock(struct thread *td, int s, struct file **sock_fp,
 int
 vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
     struct uio *trl_uio, off_t offset, size_t nbytes, off_t *sent, int flags,
-    int kflags, struct thread *td)
+    int kflags, struct sendfile_sync *sfs, struct thread *td)
 {
 	struct file *sock_fp;
 	struct vnode *vp;
@@ -2183,22 +2285,18 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
 	struct sf_buf *sf;
 	struct vm_page *pg;
 	struct shmfd *shmfd;
-	struct sendfile_sync *sfs;
 	struct vattr va;
 	off_t off, xfsize, fsbytes, sbytes, rem, obj_size;
 	int error, bsize, nd, hdrlen, mnw;
-	bool inflight_called;
 
 	pg = NULL;
 	obj = NULL;
 	so = NULL;
 	m = NULL;
-	sfs = NULL;
 	fsbytes = sbytes = 0;
 	hdrlen = mnw = 0;
 	rem = nbytes;
 	obj_size = 0;
-	inflight_called = false;
 
 	error = sendfile_getobj(td, fp, &obj, &vp, &shmfd, &obj_size, &bsize);
 	if (error != 0)
@@ -2218,12 +2316,6 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
 	if (flags & SF_MNOWAIT)
 		mnw = 1;
 
-	if (flags & SF_SYNC) {
-		sfs = malloc(sizeof *sfs, M_TEMP, M_WAITOK | M_ZERO);
-		mtx_init(&sfs->mtx, "sendfile", NULL, MTX_DEF);
-		cv_init(&sfs->cv, "sendfile");
-	}
-
 #ifdef MAC
 	error = mac_socket_check_send(td->td_ucred, so);
 	if (error != 0)
@@ -2468,11 +2560,12 @@ retry_space:
 			loopbytes += xfsize;
 			off += xfsize;
 
-			if (sfs != NULL) {
-				mtx_lock(&sfs->mtx);
-				sfs->count++;
-				mtx_unlock(&sfs->mtx);
-			}
+			/*
+			 * XXX eventually this should be a sfsync
+			 * method call!
+			 */
+			if (sfs != NULL)
+				sf_sync_ref(sfs);
 		}
 
 		if (vp != NULL)
@@ -2545,7 +2638,7 @@ out:
 		td->td_retval[0] = 0;
 	}
 	if (sent != NULL) {
-		copyout(&sbytes, sent, sizeof(off_t));
+		(*sent) = sbytes;
 	}
 	if (obj != NULL)
 		vm_object_deallocate(obj);
@@ -2554,16 +2647,6 @@ out:
 	if (m)
 		m_freem(m);
 
-	if (sfs != NULL) {
-		mtx_lock(&sfs->mtx);
-		if (sfs->count != 0)
-			cv_wait(&sfs->cv, &sfs->mtx);
-		KASSERT(sfs->count == 0, ("sendfile sync still busy"));
-		cv_destroy(&sfs->cv);
-		mtx_destroy(&sfs->mtx);
-		free(sfs, M_TEMP);
-	}
-
 	if (error == ERESTART)
 		error = EINTR;
 
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 1690ee5a05e..b7c4d600577 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -118,6 +118,7 @@ static int flushbufqueues(int, int);
 static void buf_daemon(void);
 static void bremfreel(struct buf *bp);
 static __inline void bd_wakeup(void);
+static int sysctl_runningspace(SYSCTL_HANDLER_ARGS);
 #if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
     defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
 static int sysctl_bufspace(SYSCTL_HANDLER_ARGS);
@@ -167,10 +168,12 @@ static int bufdefragcnt;
 SYSCTL_INT(_vfs, OID_AUTO, bufdefragcnt, CTLFLAG_RW, &bufdefragcnt, 0,
     "Number of times we have had to repeat buffer allocation to defragment");
 static long lorunningspace;
-SYSCTL_LONG(_vfs, OID_AUTO, lorunningspace, CTLFLAG_RW, &lorunningspace, 0,
+SYSCTL_PROC(_vfs, OID_AUTO, lorunningspace, CTLTYPE_LONG | CTLFLAG_MPSAFE |
+    CTLFLAG_RW, &lorunningspace, 0, sysctl_runningspace, "L",
     "Minimum preferred space used for in-progress I/O");
 static long hirunningspace;
-SYSCTL_LONG(_vfs, OID_AUTO, hirunningspace, CTLFLAG_RW, &hirunningspace, 0,
+SYSCTL_PROC(_vfs, OID_AUTO, hirunningspace, CTLTYPE_LONG | CTLFLAG_MPSAFE |
+    CTLFLAG_RW, &hirunningspace, 0, sysctl_runningspace, "L",
     "Maximum amount of space to use for in-progress I/O");
 int dirtybufferflushes;
 SYSCTL_INT(_vfs, OID_AUTO, dirtybufferflushes, CTLFLAG_RW, &dirtybufferflushes,
@@ -332,6 +335,34 @@ const char *buf_wmesg = BUF_WMESG;
 #define VFS_BIO_NEED_FREE	0x04	/* wait for free bufs, hi hysteresis */
 #define VFS_BIO_NEED_BUFSPACE	0x08	/* wait for buf space, lo hysteresis */
 
+static int
+sysctl_runningspace(SYSCTL_HANDLER_ARGS)
+{
+	long value;
+	int error;
+
+	value = *(long *)arg1;
+	error = sysctl_handle_long(oidp, &value, 0, req);
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+	mtx_lock(&rbreqlock);
+	if (arg1 == &hirunningspace) {
+		if (value < lorunningspace)
+			error = EINVAL;
+		else
+			hirunningspace = value;
+	} else {
+		KASSERT(arg1 == &lorunningspace,
+		    ("%s: unknown arg1", __func__));
+		if (value > hirunningspace)
+			error = EINVAL;
+		else
+			lorunningspace = value;
+	}
+	mtx_unlock(&rbreqlock);
+	return (error);
+}
+
 #if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \
     defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7)
 static int
@@ -2076,7 +2107,8 @@ getnewbuf_bufd_help(struct vnode *vp, int gbflags, int slpflag, int slptimeo,
 	wait = MNT_NOWAIT;
 	mtx_lock(&nblock);
 	while (needsbuffer & flags) {
-		if (vp != NULL && (td->td_pflags & TDP_BUFNEED) == 0) {
+		if (vp != NULL && vp->v_type != VCHR &&
+		    (td->td_pflags & TDP_BUFNEED) == 0) {
 			mtx_unlock(&nblock);
 
 			/*
@@ -3556,37 +3588,31 @@ biodone(struct bio *bp)
 	struct mtx *mtxp;
 	void (*done)(struct bio *);
 	vm_offset_t start, end;
-	int transient;
 
-	mtxp = mtx_pool_find(mtxpool_sleep, bp);
-	mtx_lock(mtxp);
-	bp->bio_flags |= BIO_DONE;
 	if ((bp->bio_flags & BIO_TRANSIENT_MAPPING) != 0) {
+		bp->bio_flags &= ~BIO_TRANSIENT_MAPPING;
+		bp->bio_flags |= BIO_UNMAPPED;
 		start = trunc_page((vm_offset_t)bp->bio_data);
 		end = round_page((vm_offset_t)bp->bio_data + bp->bio_length);
-		transient = 1;
-	} else {
-		transient = 0;
-		start = end = 0;
-	}
-	done = bp->bio_done;
-	if (done == NULL)
-		wakeup(bp);
-	mtx_unlock(mtxp);
-	if (done != NULL)
-		done(bp);
-	if (transient) {
 		pmap_qremove(start, OFF_TO_IDX(end - start));
 		vmem_free(transient_arena, start, end - start);
 		atomic_add_int(&inflight_transient_maps, -1);
 	}
+	done = bp->bio_done;
+	if (done == NULL) {
+		mtxp = mtx_pool_find(mtxpool_sleep, bp);
+		mtx_lock(mtxp);
+		bp->bio_flags |= BIO_DONE;
+		wakeup(bp);
+		mtx_unlock(mtxp);
+	} else {
+		bp->bio_flags |= BIO_DONE;
+		done(bp);
+	}
 }
 
 /*
  * Wait for a BIO to finish.
- *
- * XXX: resort to a timeout for now.  The optimal locking (if any) for this
- * case is not yet clear.
  */
 int
 biowait(struct bio *bp, const char *wchan)
@@ -3596,7 +3622,7 @@ biowait(struct bio *bp, const char *wchan)
 	mtxp = mtx_pool_find(mtxpool_sleep, bp);
 	mtx_lock(mtxp);
 	while ((bp->bio_flags & BIO_DONE) == 0)
-		msleep(bp, mtxp, PRIBIO, wchan, hz / 10);
+		msleep(bp, mtxp, PRIBIO, wchan, 0);
 	mtx_unlock(mtxp);
 	if (bp->bio_error != 0)
 		return (bp->bio_error);
@@ -3653,7 +3679,6 @@ bufdonebio(struct bio *bip)
 
 	bp = bip->bio_caller2;
 	bp->b_resid = bp->b_bcount - bip->bio_completed;
-	bp->b_resid = bip->bio_resid;	/* XXX: remove */
 	bp->b_ioflags = bip->bio_flags;
 	bp->b_error = bip->bio_error;
 	if (bp->b_error)
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index 31ed545c495..d46ba3dbdb4 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -35,7 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
@@ -62,28 +61,28 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 SDT_PROVIDER_DECLARE(vfs);
-SDT_PROBE_DEFINE3(vfs, namecache, enter, done, done, "struct vnode *", "char *",
+SDT_PROBE_DEFINE3(vfs, namecache, enter, done, "struct vnode *", "char *",
     "struct vnode *");
-SDT_PROBE_DEFINE2(vfs, namecache, enter_negative, done, done, "struct vnode *",
+SDT_PROBE_DEFINE2(vfs, namecache, enter_negative, done, "struct vnode *",
     "char *");
-SDT_PROBE_DEFINE1(vfs, namecache, fullpath, entry, entry, "struct vnode *");
-SDT_PROBE_DEFINE3(vfs, namecache, fullpath, hit, hit, "struct vnode *",
+SDT_PROBE_DEFINE1(vfs, namecache, fullpath, entry, "struct vnode *");
+SDT_PROBE_DEFINE3(vfs, namecache, fullpath, hit, "struct vnode *",
     "char *", "struct vnode *");
-SDT_PROBE_DEFINE1(vfs, namecache, fullpath, miss, miss, "struct vnode *");
-SDT_PROBE_DEFINE3(vfs, namecache, fullpath, return, return, "int",
+SDT_PROBE_DEFINE1(vfs, namecache, fullpath, miss, "struct vnode *");
+SDT_PROBE_DEFINE3(vfs, namecache, fullpath, return, "int",
     "struct vnode *", "char *");
-SDT_PROBE_DEFINE3(vfs, namecache, lookup, hit, hit, "struct vnode *", "char *",
+SDT_PROBE_DEFINE3(vfs, namecache, lookup, hit, "struct vnode *", "char *",
     "struct vnode *");
-SDT_PROBE_DEFINE2(vfs, namecache, lookup, hit_negative, hit-negative,
+SDT_PROBE_DEFINE2(vfs, namecache, lookup, hit__negative,
     "struct vnode *", "char *");
-SDT_PROBE_DEFINE2(vfs, namecache, lookup, miss, miss, "struct vnode *",
+SDT_PROBE_DEFINE2(vfs, namecache, lookup, miss, "struct vnode *",
     "char *");
-SDT_PROBE_DEFINE1(vfs, namecache, purge, done, done, "struct vnode *");
-SDT_PROBE_DEFINE1(vfs, namecache, purge_negative, done, done, "struct vnode *");
-SDT_PROBE_DEFINE1(vfs, namecache, purgevfs, done, done, "struct mount *");
-SDT_PROBE_DEFINE3(vfs, namecache, zap, done, done, "struct vnode *", "char *",
+SDT_PROBE_DEFINE1(vfs, namecache, purge, done, "struct vnode *");
+SDT_PROBE_DEFINE1(vfs, namecache, purge_negative, done, "struct vnode *");
+SDT_PROBE_DEFINE1(vfs, namecache, purgevfs, done, "struct mount *");
+SDT_PROBE_DEFINE3(vfs, namecache, zap, done, "struct vnode *", "char *",
     "struct vnode *");
-SDT_PROBE_DEFINE2(vfs, namecache, zap_negative, done, done, "struct vnode *",
+SDT_PROBE_DEFINE2(vfs, namecache, zap_negative, done, "struct vnode *",
     "char *");
 
 /*
@@ -614,7 +613,7 @@ negative_success:
 	nchstats.ncs_neghits++;
 	if (ncp->nc_flag & NCF_WHITE)
 		cnp->cn_flags |= ISWHITEOUT;
-	SDT_PROBE(vfs, namecache, lookup, hit_negative, dvp, nc_get_name(ncp),
+	SDT_PROBE(vfs, namecache, lookup, hit__negative, dvp, nc_get_name(ncp),
 	    0, 0, 0);
 	cache_out_ts(ncp, tsp, ticksp);
 	CACHE_WUNLOCK();
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 0be0463e31b..9c45a3b1a81 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -38,7 +38,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_capsicum.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
@@ -70,9 +69,9 @@ __FBSDID("$FreeBSD$");
 #undef NAMEI_DIAGNOSTIC
 
 SDT_PROVIDER_DECLARE(vfs);
-SDT_PROBE_DEFINE3(vfs, namei, lookup, entry, entry, "struct vnode *", "char *",
+SDT_PROBE_DEFINE3(vfs, namei, lookup, entry, "struct vnode *", "char *",
     "unsigned long");
-SDT_PROBE_DEFINE2(vfs, namei, lookup, return, return, "int", "struct vnode *");
+SDT_PROBE_DEFINE2(vfs, namei, lookup, return, "int", "struct vnode *");
 
 /*
  * Allocation zone for namei
@@ -424,13 +423,8 @@ needs_exclusive_leaf(struct mount *mp, int flags)
 	 * extended shared operations, then use a shared lock for the
 	 * leaf node, otherwise use an exclusive lock.
 	 */
-	if (flags & ISOPEN) {
-		if (mp != NULL &&
-		    (mp->mnt_kern_flag & MNTK_EXTENDED_SHARED))
-			return (0);
-		else
-			return (1);
-	}
+	if ((flags & ISOPEN) != 0)
+		return (!MNT_EXTENDED_SHARED(mp));
 
 	/*
 	 * Lookup requests outside of open() that specify LOCKSHARED
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 930a3c8f478..91c64a301b9 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1315,6 +1315,8 @@ vinvalbuf(struct vnode *vp, int flags, int slpflag, int slptimeo)
 
 	CTR3(KTR_VFS, "%s: vp %p with flags %d", __func__, vp, flags);
 	ASSERT_VOP_LOCKED(vp, "vinvalbuf");
+	if (vp->v_object != NULL && vp->v_object->handle != vp)
+		return (0);
 	return (bufobj_invalbuf(&vp->v_bufobj, flags, slpflag, slptimeo));
 }
 
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 4b82df8d7ef..dbad1aede93 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_capsicum.h"
 #include "opt_compat.h"
-#include "opt_kdtrace.h"
 #include "opt_ktrace.h"
 
 #include <sys/param.h>
@@ -92,8 +91,8 @@ __FBSDID("$FreeBSD$");
 MALLOC_DEFINE(M_FADVISE, "fadvise", "posix_fadvise(2) information");
 
 SDT_PROVIDER_DEFINE(vfs);
-SDT_PROBE_DEFINE2(vfs, , stat, mode, mode, "char *", "int");
-SDT_PROBE_DEFINE2(vfs, , stat, reg, reg, "char *", "int");
+SDT_PROBE_DEFINE2(vfs, , stat, mode, "char *", "int");
+SDT_PROBE_DEFINE2(vfs, , stat, reg, "char *", "int");
 
 static int chroot_refuse_vdir_fds(struct filedesc *fdp);
 static int getutimes(const struct timeval *, enum uio_seg, struct timespec *);
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 00bd9982e84..da4a914be35 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -360,8 +360,8 @@ vn_close(vp, flags, file_cred, td)
 	struct mount *mp;
 	int error, lock_flags;
 
-	if (vp->v_type != VFIFO && !(flags & FWRITE) && vp->v_mount != NULL &&
-	    vp->v_mount->mnt_kern_flag & MNTK_EXTENDED_SHARED)
+	if (vp->v_type != VFIFO && (flags & FWRITE) == 0 &&
+	    MNT_EXTENDED_SHARED(vp->v_mount))
 		lock_flags = LK_SHARED;
 	else
 		lock_flags = LK_EXCLUSIVE;
@@ -933,7 +933,7 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
 	void *rl_cookie;
 	struct mount *mp;
 	vm_page_t *prev_td_ma;
-	int cnt, error, save, saveheld, prev_td_ma_cnt;
+	int error, cnt, save, saveheld, prev_td_ma_cnt;
 	vm_offset_t addr, end;
 	vm_prot_t prot;
 	size_t len, resid;
@@ -1007,21 +1007,20 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred,
 			uio_clone->uio_iovcnt--;
 			continue;
 		}
-
-		addr = (vm_offset_t)uio_clone->uio_iov->iov_base;
+		if (len > io_hold_cnt * PAGE_SIZE)
+			len = io_hold_cnt * PAGE_SIZE;
+		addr = (uintptr_t)uio_clone->uio_iov->iov_base;
 		end = round_page(addr + len);
-		cnt = howmany(end - trunc_page(addr), PAGE_SIZE);
+		if (end < addr) {
+			error = EFAULT;
+			break;
+		}
+		cnt = atop(end - trunc_page(addr));
 		/*
 		 * A perfectly misaligned address and length could cause
 		 * both the start and the end of the chunk to use partial
 		 * page.  +2 accounts for such a situation.
 		 */
-		if (cnt > io_hold_cnt + 2) {
-			len = io_hold_cnt * PAGE_SIZE;
-			KASSERT(howmany(round_page(addr + len) -
-			    trunc_page(addr), PAGE_SIZE) <= io_hold_cnt + 2,
-			    ("cnt overflow"));
-		}
 		cnt = vm_fault_quick_hold_pages(&td->td_proc->p_vmspace->vm_map,
 		    addr, len, prot, ma, io_hold_cnt + 2);
 		if (cnt == -1) {
diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index eabfb4384b6..3793ef35d37 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -477,7 +477,7 @@ vop_getpages {
 };
 
 
-%% putpages	vp	E E E
+%% putpages	vp	L L L
 
 vop_putpages {
 	IN struct vnode *vp;
diff --git a/sys/libkern/iconv.c b/sys/libkern/iconv.c
index dcdb1192ef3..0b92047ec54 100644
--- a/sys/libkern/iconv.c
+++ b/sys/libkern/iconv.c
@@ -137,7 +137,7 @@ iconv_unregister_converter(struct iconv_converter_class *dcp)
 {
 	dcp->refs--;
 	if (dcp->refs > 1) {
-		ICDEBUG("converter have %d referenses left\n", dcp->refs);
+		ICDEBUG("converter has %d references left\n", dcp->refs);
 		return EBUSY;
 	}
 	TAILQ_REMOVE(&iconv_converters, dcp, cc_link);
diff --git a/sys/mips/adm5120/if_admsw.c b/sys/mips/adm5120/if_admsw.c
index f17df00f836..b0690152223 100644
--- a/sys/mips/adm5120/if_admsw.c
+++ b/sys/mips/adm5120/if_admsw.c
@@ -98,6 +98,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>
 #include <net/if_mib.h>
 #include <net/if_types.h>
+#include <net/if_var.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/mips/adm5120/obio.c b/sys/mips/adm5120/obio.c
index b89c9576579..788e3a8ab9c 100644
--- a/sys/mips/adm5120/obio.c
+++ b/sys/mips/adm5120/obio.c
@@ -157,7 +157,7 @@ static int
 obio_probe(device_t dev)
 {
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/alchemy/obio.c b/sys/mips/alchemy/obio.c
index 90e41d61bfa..da05bbbfd20 100644
--- a/sys/mips/alchemy/obio.c
+++ b/sys/mips/alchemy/obio.c
@@ -158,7 +158,7 @@ static int
 obio_probe(device_t dev)
 {
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/atheros/apb.c b/sys/mips/atheros/apb.c
index ef44e0ad47f..fd1bc68cbe2 100644
--- a/sys/mips/atheros/apb.c
+++ b/sys/mips/atheros/apb.c
@@ -103,7 +103,7 @@ static int
 apb_probe(device_t dev)
 {
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
@@ -359,6 +359,9 @@ apb_filter(void *arg)
 			case AR71XX_SOC_AR7242:
 			case AR71XX_SOC_AR9330:
 			case AR71XX_SOC_AR9331:
+			case AR71XX_SOC_AR9341:
+			case AR71XX_SOC_AR9342:
+			case AR71XX_SOC_AR9344:
 				/* Ack/clear the irq on status register for AR724x */
 				ATH_WRITE_REG(AR71XX_MISC_INTR_STATUS,
 				    reg & ~(1 << irq));
diff --git a/sys/mips/atheros/ar71xx_chip.c b/sys/mips/atheros/ar71xx_chip.c
index db7920f6b25..2fdf376db17 100644
--- a/sys/mips/atheros/ar71xx_chip.c
+++ b/sys/mips/atheros/ar71xx_chip.c
@@ -81,6 +81,7 @@ uint32_t u_ar71xx_ddr_freq;
 uint32_t u_ar71xx_uart_freq;
 uint32_t u_ar71xx_wdt_freq;
 uint32_t u_ar71xx_refclk;
+uint32_t u_ar71xx_mdio_freq;
 
 static void
 ar71xx_chip_detect_mem_size(void)
@@ -94,7 +95,7 @@ ar71xx_chip_detect_sys_frequency(void)
 	uint32_t freq;
 	uint32_t div;
 
-	u_ar71xx_refclk = AR71XX_BASE_FREQ;
+	u_ar71xx_mdio_freq = u_ar71xx_refclk = AR71XX_BASE_FREQ;
 
 	pll = ATH_READ_REG(AR71XX_PLL_REG_CPU_CONFIG);
 
diff --git a/sys/mips/atheros/ar71xx_cpudef.h b/sys/mips/atheros/ar71xx_cpudef.h
index a30157c2a0a..9a1133bd2e5 100644
--- a/sys/mips/atheros/ar71xx_cpudef.h
+++ b/sys/mips/atheros/ar71xx_cpudef.h
@@ -57,6 +57,12 @@ struct ar71xx_cpu_def {
 	 * each chip.
 	 */
 	void (* ar71xx_chip_init_usb_peripheral) (void);
+
+	void (* ar71xx_chip_reset_ethernet_switch) (void);
+
+	void (* ar71xx_chip_reset_wmac) (void);
+
+	void (* ar71xx_chip_init_gmac) (void);
 };
 
 extern struct ar71xx_cpu_def * ar71xx_cpu_ops;
@@ -111,6 +117,24 @@ static inline void ar71xx_init_usb_peripheral(void)
 	ar71xx_cpu_ops->ar71xx_chip_init_usb_peripheral();
 }
 
+static inline void ar71xx_reset_ethernet_switch(void)
+{
+	if (ar71xx_cpu_ops->ar71xx_chip_reset_ethernet_switch)
+		ar71xx_cpu_ops->ar71xx_chip_reset_ethernet_switch();
+}
+
+static inline void ar71xx_reset_wmac(void)
+{
+	if (ar71xx_cpu_ops->ar71xx_chip_reset_wmac)
+		ar71xx_cpu_ops->ar71xx_chip_reset_wmac();
+}
+
+static inline void ar71xx_init_gmac(void)
+{
+	if (ar71xx_cpu_ops->ar71xx_chip_init_gmac)
+		ar71xx_cpu_ops->ar71xx_chip_init_gmac();
+}
+
 static inline void ar71xx_device_ddr_flush_ip2(void)
 {
 	ar71xx_cpu_ops->ar71xx_chip_ddr_flush_ip2();
@@ -123,6 +147,7 @@ extern uint32_t u_ar71xx_ahb_freq;
 extern uint32_t u_ar71xx_ddr_freq;
 extern uint32_t u_ar71xx_uart_freq;
 extern uint32_t u_ar71xx_wdt_freq;
+extern uint32_t u_ar71xx_mdio_freq;
 
 static inline uint64_t ar71xx_refclk(void) { return u_ar71xx_refclk; }
 static inline uint64_t ar71xx_cpu_freq(void) { return u_ar71xx_cpu_freq; }
@@ -130,5 +155,6 @@ static inline uint64_t ar71xx_ahb_freq(void) { return u_ar71xx_ahb_freq; }
 static inline uint64_t ar71xx_ddr_freq(void) { return u_ar71xx_ddr_freq; }
 static inline uint64_t ar71xx_uart_freq(void) { return u_ar71xx_uart_freq; }
 static inline uint64_t ar71xx_wdt_freq(void) { return u_ar71xx_wdt_freq; }
+static inline uint64_t ar71xx_mdio_freq(void) { return u_ar71xx_mdio_freq; }
 
 #endif
diff --git a/sys/mips/atheros/ar71xx_ehci.c b/sys/mips/atheros/ar71xx_ehci.c
index d3bb5f60bf1..cc92d8a646e 100644
--- a/sys/mips/atheros/ar71xx_ehci.c
+++ b/sys/mips/atheros/ar71xx_ehci.c
@@ -75,7 +75,7 @@ ar71xx_ehci_probe(device_t self)
 
 	device_set_desc(self, EHCI_HC_DEVSTR);
 
-	return (BUS_PROBE_DEFAULT);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/atheros/ar71xx_machdep.c b/sys/mips/atheros/ar71xx_machdep.c
index bd44b47aff4..f0b3026d0d9 100644
--- a/sys/mips/atheros/ar71xx_machdep.c
+++ b/sys/mips/atheros/ar71xx_machdep.c
@@ -233,8 +233,9 @@ platform_start(__register_t a0 __unused, __register_t a1 __unused,
 	printf("CPU Frequency=%d MHz\n", u_ar71xx_cpu_freq / 1000000);
 	printf("CPU DDR Frequency=%d MHz\n", u_ar71xx_ddr_freq / 1000000);
 	printf("CPU AHB Frequency=%d MHz\n", u_ar71xx_ahb_freq / 1000000);
-	printf("platform frequency: %lld\n", platform_counter_freq);
+	printf("platform frequency: %lld MHz\n", platform_counter_freq / 1000000);
 	printf("CPU reference clock: %d MHz\n", u_ar71xx_refclk / 1000000);
+	printf("CPU MDIO clock: %d MHz\n", u_ar71xx_mdio_freq / 1000000);
 	printf("arguments: \n");
 	printf("  a0 = %08x\n", a0);
 	printf("  a1 = %08x\n", a1);
@@ -279,6 +280,16 @@ platform_start(__register_t a0 __unused, __register_t a1 __unused,
 	 */
 	ar71xx_init_usb_peripheral();
 
+	/*
+	 * Reset internal ethernet switch, if one exists
+	 */
+	ar71xx_reset_ethernet_switch();
+
+	/*
+	 * Initialise the gmac driver.
+	 */
+	ar71xx_init_gmac();
+
 	kdb_init();
 #ifdef KDB
 	if (boothowto & RB_KDB)
diff --git a/sys/mips/atheros/ar71xx_pci.c b/sys/mips/atheros/ar71xx_pci.c
index 9b88f608873..476dba287fa 100644
--- a/sys/mips/atheros/ar71xx_pci.c
+++ b/sys/mips/atheros/ar71xx_pci.c
@@ -371,7 +371,7 @@ static int
 ar71xx_pci_probe(device_t dev)
 {
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/atheros/ar71xx_spi.c b/sys/mips/atheros/ar71xx_spi.c
index 095f9306e4d..a7fc9935d0a 100644
--- a/sys/mips/atheros/ar71xx_spi.c
+++ b/sys/mips/atheros/ar71xx_spi.c
@@ -62,8 +62,16 @@ __FBSDID("$FreeBSD$");
 /*
  * register space access macros
  */
-#define SPI_WRITE(sc, reg, val)	do {	\
-		bus_write_4(sc->sc_mem_res, (reg), (val)); \
+
+#define	SPI_BARRIER_WRITE(sc)		bus_barrier((sc)->sc_mem_res, 0, 0, 	\
+					    BUS_SPACE_BARRIER_WRITE)
+#define	SPI_BARRIER_READ(sc)	bus_barrier((sc)->sc_mem_res, 0, 0, 	\
+					    BUS_SPACE_BARRIER_READ)
+#define	SPI_BARRIER_RW(sc)		bus_barrier((sc)->sc_mem_res, 0, 0, 	\
+					    BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE)
+
+#define SPI_WRITE(sc, reg, val)	do {				\
+		bus_write_4(sc->sc_mem_res, (reg), (val));	\
 	} while (0)
 
 #define SPI_READ(sc, reg)	 bus_read_4(sc->sc_mem_res, (reg))
@@ -84,7 +92,7 @@ static int
 ar71xx_spi_probe(device_t dev)
 {
 	device_set_desc(dev, "AR71XX SPI");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
@@ -102,12 +110,30 @@ ar71xx_spi_attach(device_t dev)
 		return (ENXIO);
 	}
 
-
 	SPI_WRITE(sc, AR71XX_SPI_FS, 1);
+
+	/* Flush out read before reading the control register */
+	SPI_BARRIER_WRITE(sc);
+
 	sc->sc_reg_ctrl  = SPI_READ(sc, AR71XX_SPI_CTRL);
+
+	/*
+	 * XXX TODO: document what the SPI control register does.
+	 */
 	SPI_WRITE(sc, AR71XX_SPI_CTRL, 0x43);
+
+	/*
+	 * Ensure the config register write has gone out before configuring
+	 * the chip select mask.
+	 */
+	SPI_BARRIER_WRITE(sc);
 	SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, SPI_IO_CTRL_CSMASK);
 
+	/*
+	 * .. and ensure the write has gone out before continuing.
+	 */
+	SPI_BARRIER_WRITE(sc);
+
 	device_add_child(dev, "spibus", -1);
 	return (bus_generic_attach(dev));
 }
@@ -121,7 +147,15 @@ ar71xx_spi_chip_activate(struct ar71xx_spi_softc *sc, int cs)
 	 */
 	ioctrl &= ~(SPI_IO_CTRL_CS0 << cs);
 
+	/*
+	 * Make sure any other writes have gone out to the
+	 * device before changing the chip select line;
+	 * then ensure that it has made it out to the device
+	 * before continuing.
+	 */
+	SPI_BARRIER_WRITE(sc);
 	SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, ioctrl);
+	SPI_BARRIER_WRITE(sc);
 }
 
 static void
@@ -150,14 +184,18 @@ ar71xx_spi_txrx(struct ar71xx_spi_softc *sc, int cs, uint8_t data)
 			iod = ioctrl | SPI_IO_CTRL_DO;
 		else
 			iod = ioctrl & ~SPI_IO_CTRL_DO;
+		SPI_BARRIER_WRITE(sc);
 		SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, iod);
+		SPI_BARRIER_WRITE(sc);
 		SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, iod | SPI_IO_CTRL_CLK);
 	}
 
 	/*
 	 * Provide falling edge for connected device by clear clock bit.
 	 */
+	SPI_BARRIER_WRITE(sc);
 	SPI_WRITE(sc, AR71XX_SPI_IO_CTRL, iod);
+	SPI_BARRIER_WRITE(sc);
 	rds = SPI_READ(sc, AR71XX_SPI_RDS);
 
 	return (rds & 0xff);
@@ -206,8 +244,25 @@ ar71xx_spi_detach(device_t dev)
 {
 	struct ar71xx_spi_softc *sc = device_get_softc(dev);
 
+	/*
+	 * Ensure any other writes to the device are finished
+	 * before we tear down the SPI device.
+	 */
+	SPI_BARRIER_WRITE(sc);
+
+	/*
+	 * Restore the control register; ensure it has hit the
+	 * hardware before continuing.
+	 */
 	SPI_WRITE(sc, AR71XX_SPI_CTRL, sc->sc_reg_ctrl);
+	SPI_BARRIER_WRITE(sc);
+
+	/*
+	 * And now, put the flash back into mapped IO mode and
+	 * ensure _that_ has completed before we finish up.
+	 */
 	SPI_WRITE(sc, AR71XX_SPI_FS, 0);
+	SPI_BARRIER_WRITE(sc);
 
 	if (sc->sc_mem_res)
 		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
diff --git a/sys/mips/atheros/ar71xx_wdog.c b/sys/mips/atheros/ar71xx_wdog.c
index d582f18fdc3..bf1ebc606a1 100644
--- a/sys/mips/atheros/ar71xx_wdog.c
+++ b/sys/mips/atheros/ar71xx_wdog.c
@@ -92,7 +92,7 @@ ar71xx_wdog_probe(device_t dev)
 {
 
 	device_set_desc(dev, "Atheros AR71XX watchdog timer");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static void
diff --git a/sys/mips/atheros/ar71xxreg.h b/sys/mips/atheros/ar71xxreg.h
index 7d6d6b2f5a4..f12c0dffc15 100644
--- a/sys/mips/atheros/ar71xxreg.h
+++ b/sys/mips/atheros/ar71xxreg.h
@@ -162,7 +162,7 @@
 #define	AR71XX_BASE_FREQ		40000000
 #define	AR71XX_PLL_CPU_BASE		0x18050000
 #define	AR71XX_PLL_CPU_CONFIG		0x18050000
-#define		PLL_SW_UPDATE			(1 << 31)
+#define		PLL_SW_UPDATE			(1U << 31)
 #define		PLL_LOCKED			(1 << 30)
 #define		PLL_AHB_DIV_SHIFT		20
 #define		PLL_AHB_DIV_MASK		7
@@ -200,7 +200,7 @@
 #define	AR71XX_RST_BLOCK_BASE	0x18060000
 
 #define AR71XX_RST_WDOG_CONTROL	0x18060008
-#define		RST_WDOG_LAST			(1 << 31)
+#define		RST_WDOG_LAST			(1U << 31)
 #define		RST_WDOG_ACTION_MASK		3
 #define		RST_WDOG_ACTION_RESET		3
 #define		RST_WDOG_ACTION_NMI		2
@@ -303,7 +303,7 @@ typedef enum {
 #define AR71XX_MAC1_BASE	0x1A000000
 
 #define		AR71XX_MAC_CFG1			0x00
-#define			MAC_CFG1_SOFT_RESET		(1 << 31)
+#define			MAC_CFG1_SOFT_RESET		(1U << 31)
 #define			MAC_CFG1_SIMUL_RESET		(1 << 30)
 #define			MAC_CFG1_MAC_RX_BLOCK_RESET	(1 << 19)
 #define			MAC_CFG1_MAC_TX_BLOCK_RESET	(1 << 18)
@@ -332,10 +332,11 @@ typedef enum {
 #define		AR71XX_MAC_HDUPLEX		0x0C
 #define		AR71XX_MAC_MAX_FRAME_LEN	0x10
 #define		AR71XX_MAC_MII_CFG		0x20
-#define			MAC_MII_CFG_RESET		(1 << 31)
+#define			MAC_MII_CFG_RESET		(1U << 31)
 #define			MAC_MII_CFG_SCAN_AUTO_INC	(1 <<  5)
 #define			MAC_MII_CFG_PREAMBLE_SUP	(1 <<  4)
 #define			MAC_MII_CFG_CLOCK_SELECT_MASK	0x7
+#define			MAC_MII_CFG_CLOCK_SELECT_MASK_AR933X	0xf
 #define			MAC_MII_CFG_CLOCK_DIV_4		0
 #define			MAC_MII_CFG_CLOCK_DIV_6		2
 #define			MAC_MII_CFG_CLOCK_DIV_8		3
@@ -343,6 +344,17 @@ typedef enum {
 #define			MAC_MII_CFG_CLOCK_DIV_14	5
 #define			MAC_MII_CFG_CLOCK_DIV_20	6
 #define			MAC_MII_CFG_CLOCK_DIV_28	7
+
+/* .. and the AR933x/AR934x extensions */
+#define			MAC_MII_CFG_CLOCK_DIV_34	8
+#define			MAC_MII_CFG_CLOCK_DIV_42	9
+#define			MAC_MII_CFG_CLOCK_DIV_50	10
+#define			MAC_MII_CFG_CLOCK_DIV_58	11
+#define			MAC_MII_CFG_CLOCK_DIV_66	12
+#define			MAC_MII_CFG_CLOCK_DIV_74	13
+#define			MAC_MII_CFG_CLOCK_DIV_82	14
+#define			MAC_MII_CFG_CLOCK_DIV_98	15
+
 #define		AR71XX_MAC_MII_CMD		0x24
 #define			MAC_MII_CMD_SCAN_CYCLE		(1 << 1)
 #define			MAC_MII_CMD_READ		1
diff --git a/sys/mips/atheros/ar724x_chip.c b/sys/mips/atheros/ar724x_chip.c
index c06eca63cd2..3a8d332ae51 100644
--- a/sys/mips/atheros/ar724x_chip.c
+++ b/sys/mips/atheros/ar724x_chip.c
@@ -73,7 +73,7 @@ ar724x_chip_detect_sys_frequency(void)
 	uint32_t freq;
 	uint32_t div;
 
-	u_ar71xx_refclk = AR724X_BASE_FREQ;
+	u_ar71xx_mdio_freq = u_ar71xx_refclk = AR724X_BASE_FREQ;
 
 	pll = ATH_READ_REG(AR724X_PLL_REG_CPU_CONFIG);
 
diff --git a/sys/mips/atheros/ar724x_pci.c b/sys/mips/atheros/ar724x_pci.c
index e73e9fc97be..c481b6a019e 100644
--- a/sys/mips/atheros/ar724x_pci.c
+++ b/sys/mips/atheros/ar724x_pci.c
@@ -349,7 +349,7 @@ static int
 ar724x_pci_probe(device_t dev)
 {
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/atheros/ar91xx_chip.c b/sys/mips/atheros/ar91xx_chip.c
index a4174b47363..4fb77f7730b 100644
--- a/sys/mips/atheros/ar91xx_chip.c
+++ b/sys/mips/atheros/ar91xx_chip.c
@@ -71,7 +71,7 @@ ar91xx_chip_detect_sys_frequency(void)
 	uint32_t freq;
 	uint32_t div;
 
-	u_ar71xx_refclk = AR91XX_BASE_FREQ;
+	u_ar71xx_mdio_freq = u_ar71xx_refclk = AR91XX_BASE_FREQ;
 
 	pll = ATH_READ_REG(AR91XX_PLL_REG_CPU_CONFIG);
 
diff --git a/sys/mips/atheros/ar933x_chip.c b/sys/mips/atheros/ar933x_chip.c
index 9eab526bb4b..f0ccb135e32 100644
--- a/sys/mips/atheros/ar933x_chip.c
+++ b/sys/mips/atheros/ar933x_chip.c
@@ -115,11 +115,19 @@ ar933x_chip_detect_sys_frequency(void)
 		u_ar71xx_ahb_freq = freq / t;
 	}
 
-	/* On the AR933x, the UART frequency is the reference clock,
+	/*
+	 * On the AR933x, the UART frequency is the reference clock,
 	 * not the AHB bus clock.
 	 */
 	u_ar71xx_uart_freq = u_ar71xx_refclk;
 
+	/*
+	 * XXX TODO: check whether the mdio frequency is always the
+	 * refclock frequency, or whether it's variable like on the
+	 * AR934x.
+	 */
+	u_ar71xx_mdio_freq = u_ar71xx_refclk;
+
 	/*
 	 * XXX check what the watchdog frequency should be?
 	 */
@@ -242,6 +250,95 @@ ar933x_chip_init_usb_peripheral(void)
 	DELAY(100);
 }
 
+static void
+ar933x_configure_gmac(uint32_t gmac_cfg)
+{
+	uint32_t reg;
+
+	reg = ATH_READ_REG(AR933X_GMAC_REG_ETH_CFG);
+
+	/*
+	 * The relevant bits here include:
+	 *
+	 * + AR933X_ETH_CFG_SW_PHY_SWAP
+	 * + AR933X_ETH_CFG_SW_PHY_ADDR_SWAP
+	 *
+	 * There are other things; look at what openwrt exposes so
+	 * it can be correctly exposed.
+	 *
+	 * TODO: what about ethernet switch support? How's that work?
+	 */
+	if (bootverbose)
+		printf("%s: GMAC config was 0x%08x\n", __func__, reg);
+        reg &= ~(AR933X_ETH_CFG_SW_PHY_SWAP | AR933X_ETH_CFG_SW_PHY_ADDR_SWAP);
+	reg |= gmac_cfg;
+	if (bootverbose)
+		printf("%s: GMAC setting is 0x%08x; register is now 0x%08x\n",
+		    __func__,
+		    gmac_cfg,
+		    reg);
+	ATH_WRITE_REG(AR933X_GMAC_REG_ETH_CFG, reg);
+}
+
+static void
+ar933x_chip_init_gmac(void)
+{
+	int val;
+	uint32_t gmac_cfg = 0;
+
+	/*
+	 * These two bits need a bit better explanation.
+	 *
+	 * The default configuration in the hardware is to map both
+	 * ports to the internal switch.
+	 *
+	 * Here, GE0 == arge0, GE1 == arge1.
+	 *
+	 * The internal switch has:
+	 * + 5 MAC ports, MAC0->MAC4.
+	 * + 5 PHY ports, PHY0->PHY4,
+	 * + MAC0 connects to GE1;
+	 * + GE0 connects to PHY4;
+	 * + The other mappings are MAC1->PHY0, MAC2->PHY1 .. MAC4->PHY3.
+	 *
+	 * The GE1 port is linked in via 1000MBit/full, supplying what is
+	 * normally the 'WAN' switch ports.
+	 *
+	 * The switch is connected the MDIO bus on GE1.  It looks like
+	 * a normal AR7240 on-board switch.
+	 *
+	 * The GE0 port is connected via MII to PHY4, and can operate in
+	 * 10/100mbit, full/half duplex.  Ie, you can speak to PHY4 on
+	 * the MDIO bus and everything will simply 'work'.
+	 *
+	 * So far so good.  This looks just like an AR7240 SoC.
+	 *
+	 * However, some configurations will just expose one or two
+	 * physical ports.  In this case, some configuration bits can
+	 * be set to tweak this.
+	 *
+	 * + CFG_SW_PHY_ADDR_SWAP swaps PHY port 0 with PHY port 4.
+	 *   Ie, GE0's PHY shows up as PHY 0.  So if there's only
+	 *   one physical port, there's no need to involve the
+	 *   switch framework - it can just show up as a default,
+	 *   normal single PHY.
+	 *
+	 * + CFG_SW_PHY_SWAP swaps the internal switch connection
+	 *   between PHY0 and PHY4.  Ie, PHY4 connects to MAc1,
+	 *   PHY0 connects to GE0.
+	 */
+	if ((resource_int_value("ar933x_gmac", 0, "override_phy", &val) == 0)
+	    && (val == 0))
+		return;
+	if ((resource_int_value("ar933x_gmac", 0, "swap_phy", &val) == 0)
+	    && (val == 1))
+		gmac_cfg |= AR933X_ETH_CFG_SW_PHY_SWAP;
+	if ((resource_int_value("ar933x_gmac", 0, "swap_phy_addr", &val) == 0)
+	    && (val == 1))
+		gmac_cfg |= AR933X_ETH_CFG_SW_PHY_ADDR_SWAP;
+	ar933x_configure_gmac(gmac_cfg);
+}
+
 struct ar71xx_cpu_def ar933x_chip_def = {
 	&ar933x_chip_detect_mem_size,
 	&ar933x_chip_detect_sys_frequency,
@@ -254,5 +351,8 @@ struct ar71xx_cpu_def ar933x_chip_def = {
 	&ar933x_chip_ddr_flush_ge,
 	&ar933x_chip_get_eth_pll,
 	&ar933x_chip_ddr_flush_ip2,
-	&ar933x_chip_init_usb_peripheral
+	&ar933x_chip_init_usb_peripheral,
+	NULL,
+	NULL,
+	&ar933x_chip_init_gmac,
 };
diff --git a/sys/mips/atheros/ar933xreg.h b/sys/mips/atheros/ar933xreg.h
index 2baf45f1548..3f31088102e 100644
--- a/sys/mips/atheros/ar933xreg.h
+++ b/sys/mips/atheros/ar933xreg.h
@@ -38,6 +38,24 @@
 
 #define	AR933X_UART_BASE	(AR71XX_APB_BASE + 0x00020000)
 #define	AR933X_UART_SIZE	0x14
+
+#define	AR933X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
+#define	AR933X_GMAC_SIZE	0x04
+
+#define	AR933X_GMAC_REG_ETH_CFG		(AR933X_GMAC_BASE + 0x00)
+
+#define	AR933X_ETH_CFG_RGMII_GE0	(1 << 0)
+#define	AR933X_ETH_CFG_MII_GE0		(1 << 1)
+#define	AR933X_ETH_CFG_GMII_GE0		(1 << 2)
+#define	AR933X_ETH_CFG_MII_GE0_MASTER	(1 << 3)
+#define	AR933X_ETH_CFG_MII_GE0_SLAVE	(1 << 4)
+#define	AR933X_ETH_CFG_MII_GE0_ERR_EN	(1 << 5)
+#define	AR933X_ETH_CFG_SW_PHY_SWAP	(1 << 7)
+#define	AR933X_ETH_CFG_SW_PHY_ADDR_SWAP	(1 << 8)
+#define	AR933X_ETH_CFG_RMII_GE0		(1 << 9)
+#define	AR933X_ETH_CFG_RMII_GE0_SPD_10		0
+#define	AR933X_ETH_CFG_RMII_GE0_SPD_100		(1 << 10)
+
 #define	AR933X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
 #define	AR933X_WMAC_SIZE	0x20000
 #define	AR933X_EHCI_BASE	0x1b000000
diff --git a/sys/mips/atheros/ar934x_chip.c b/sys/mips/atheros/ar934x_chip.c
index 2a76e114aaa..1266fc828bf 100644
--- a/sys/mips/atheros/ar934x_chip.c
+++ b/sys/mips/atheros/ar934x_chip.c
@@ -92,6 +92,7 @@ ar934x_chip_detect_sys_frequency(void)
 	uint32_t pll, out_div, ref_div, nint, nfrac, frac, clk_ctrl, postdiv;
 	uint32_t cpu_pll, ddr_pll;
 	uint32_t bootstrap;
+	uint32_t reg;
 
 	bootstrap = ATH_READ_REG(AR934X_RESET_REG_BOOTSTRAP);
 	if (bootstrap & AR934X_BOOTSTRAP_REF_CLK_40)
@@ -187,6 +188,18 @@ ar934x_chip_detect_sys_frequency(void)
 
 	u_ar71xx_wdt_freq = u_ar71xx_refclk;
 	u_ar71xx_uart_freq = u_ar71xx_refclk;
+
+	/*
+	 * Next, fetch reference clock speed for MDIO bus.
+	 */
+	reg = ATH_READ_REG(AR934X_PLL_SWITCH_CLOCK_CONTROL_REG);
+	if (reg & AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL) {
+		printf("%s: mdio=100MHz\n", __func__);
+		u_ar71xx_mdio_freq = (100 * 1000 * 1000);
+	} else {
+		printf("%s: mdio=%d Hz\n", __func__, u_ar71xx_refclk);
+		u_ar71xx_mdio_freq = u_ar71xx_refclk;
+	}
 }
 
 static void
@@ -233,10 +246,10 @@ ar934x_chip_set_pll_ge(int unit, int speed, uint32_t pll)
 
 	switch (unit) {
 	case 0:
-		/* XXX TODO */
+		ATH_WRITE_REG(AR934X_PLL_ETH_XMII_CONTROL_REG, pll);
 		break;
 	case 1:
-		/* XXX TODO */
+		/* XXX nothing */
 		break;
 	default:
 		printf("%s: invalid PLL set for arge unit: %d\n",
@@ -273,26 +286,50 @@ ar934x_chip_ddr_flush_ip2(void)
 static uint32_t
 ar934x_chip_get_eth_pll(unsigned int mac, int speed)
 {
-#if 0
 	uint32_t pll;
 
 	switch (speed) {
 	case 10:
-		pll = AR933X_PLL_VAL_10;
+		pll = AR934X_PLL_VAL_10;
 		break;
 	case 100:
-		pll = AR933X_PLL_VAL_100;
+		pll = AR934X_PLL_VAL_100;
 		break;
 	case 1000:
-		pll = AR933X_PLL_VAL_1000;
+		pll = AR934X_PLL_VAL_1000;
 		break;
 	default:
 		printf("%s%d: invalid speed %d\n", __func__, mac, speed);
 		pll = 0;
 	}
 	return (pll);
-#endif
-	return (0);
+}
+
+static void
+ar934x_chip_reset_ethernet_switch(void)
+{
+
+	ar71xx_device_stop(AR934X_RESET_ETH_SWITCH);
+	DELAY(100);
+	ar71xx_device_start(AR934X_RESET_ETH_SWITCH);
+	DELAY(100);
+}
+
+static void
+ar934x_configure_gmac(uint32_t gmac_cfg)
+{
+	uint32_t reg;
+
+	reg = ATH_READ_REG(AR934X_GMAC_REG_ETH_CFG);
+	printf("%s: ETH_CFG=0x%08x\n", __func__, reg);
+
+	reg &= ~(AR934X_ETH_CFG_RGMII_GMAC0 | AR934X_ETH_CFG_MII_GMAC0 |
+	    AR934X_ETH_CFG_MII_GMAC0 | AR934X_ETH_CFG_SW_ONLY_MODE |
+	    AR934X_ETH_CFG_SW_PHY_SWAP);
+
+	reg |= gmac_cfg;
+
+	ATH_WRITE_REG(AR934X_GMAC_REG_ETH_CFG, reg);
 }
 
 static void
@@ -317,6 +354,43 @@ ar934x_chip_init_usb_peripheral(void)
 	DELAY(100);
 }
 
+static void
+ar934x_chip_set_mii_if(uint32_t unit, uint32_t mii_mode)
+{
+
+	/*
+	 * XXX !
+	 *
+	 * Nothing to see here; although gmac0 can have its
+	 * MII configuration changed, the register values
+	 * are slightly different.
+	 */
+}
+
+/*
+ * XXX TODO: fetch default MII divider configuration
+ */
+
+static void
+ar934x_chip_reset_wmac(void)
+{
+
+}
+
+static void
+ar934x_chip_init_gmac(void)
+{
+	long gmac_cfg;
+
+	if (resource_long_value("ar934x_gmac", 0, "gmac_cfg",
+	    &gmac_cfg) == 0) {
+		printf("%s: gmac_cfg=0x%08lx\n",
+		    __func__,
+		    (long) gmac_cfg);
+		ar934x_configure_gmac((uint32_t) gmac_cfg);
+	}
+}
+
 struct ar71xx_cpu_def ar934x_chip_def = {
 	&ar934x_chip_detect_mem_size,
 	&ar934x_chip_detect_sys_frequency,
@@ -325,9 +399,12 @@ struct ar71xx_cpu_def ar934x_chip_def = {
 	&ar934x_chip_device_stopped,
 	&ar934x_chip_set_pll_ge,
 	&ar934x_chip_set_mii_speed,
-	&ar71xx_chip_set_mii_if,
+	&ar934x_chip_set_mii_if,
 	&ar934x_chip_ddr_flush_ge,
 	&ar934x_chip_get_eth_pll,
 	&ar934x_chip_ddr_flush_ip2,
-	&ar934x_chip_init_usb_peripheral
+	&ar934x_chip_init_usb_peripheral,
+	&ar934x_chip_reset_ethernet_switch,
+	&ar934x_chip_reset_wmac,
+	&ar934x_chip_init_gmac,
 };
diff --git a/sys/mips/atheros/ar934xreg.h b/sys/mips/atheros/ar934xreg.h
index 3b0381f8f7f..1df1cb293ac 100644
--- a/sys/mips/atheros/ar934xreg.h
+++ b/sys/mips/atheros/ar934xreg.h
@@ -29,6 +29,8 @@
 #ifndef	__AR934X_REG_H__
 #define	__AR934X_REG_H__
 
+#define	AR934X_GMAC_BASE	(AR71XX_APB_BASE + 0x00070000)
+#define	AR934X_GMAC_SIZE	0x14
 #define	AR934X_WMAC_BASE	(AR71XX_APB_BASE + 0x00100000)
 #define	AR934X_WMAC_SIZE	0x20000
 #define	AR934X_EHCI_BASE	0x1b000000
@@ -36,6 +38,23 @@
 #define	AR934X_SRIF_BASE	(AR71XX_APB_BASE + 0x00116000)
 #define	AR934X_SRIF_SIZE	0x1000
 
+/* AR934x GMAC configuration */
+#define	AR934X_GMAC_REG_ETH_CFG		(AR934X_GMAC_BASE + 0x00)
+
+#define	AR934X_ETH_CFG_RGMII_GMAC0		(1 << 0)
+#define	AR934X_ETH_CFG_MII_GMAC0		(1 << 1)
+#define	AR934X_ETH_CFG_GMII_GMAC0		(1 << 2)
+#define	AR934X_ETH_CFG_MII_GMAC0_MASTER		(1 << 3)
+#define	AR934X_ETH_CFG_MII_GMAC0_SLAVE		(1 << 4)
+#define	AR934X_ETH_CFG_MII_GMAC0_ERR_EN		(1 << 5)
+#define	AR934X_ETH_CFG_SW_ONLY_MODE		(1 << 6)
+#define	AR934X_ETH_CFG_SW_PHY_SWAP		(1 << 7)
+#define	AR934X_ETH_CFG_SW_APB_ACCESS		(1 << 9)
+#define	AR934X_ETH_CFG_RMII_GMAC0		(1 << 10)
+#define	AR933X_ETH_CFG_MII_CNTL_SPEED		(1 << 11)
+#define	AR934X_ETH_CFG_RMII_GMAC0_MASTER	(1 << 12)
+#define	AR934X_ETH_CFG_SW_ACC_MSB_FIRST		(1 << 13)
+
 #define	AR934X_DDR_REG_FLUSH_GE0	(AR71XX_APB_BASE + 0x9c)
 #define	AR934X_DDR_REG_FLUSH_GE1	(AR71XX_APB_BASE + 0xa0)
 #define	AR934X_DDR_REG_FLUSH_USB	(AR71XX_APB_BASE + 0xa4)
@@ -45,6 +64,9 @@
 #define	AR934X_PLL_CPU_CONFIG_REG	(AR71XX_PLL_CPU_BASE + 0x00)
 #define	AR934X_PLL_DDR_CONFIG_REG	(AR71XX_PLL_CPU_BASE + 0x04)
 #define	AR934X_PLL_CPU_DDR_CLK_CTRL_REG	(AR71XX_PLL_CPU_BASE + 0x08)
+#define	AR934X_PLL_SWITCH_CLOCK_CONTROL_REG	(AR71XX_PLL_CPU_BASE + 0x24)
+#define		AR934X_PLL_SWITCH_CLOCK_CONTROL_MDIO_CLK_SEL   (1 << 6)
+#define	AR934X_PLL_ETH_XMII_CONTROL_REG	(AR71XX_PLL_CPU_BASE + 0x2c)
 
 #define	AR934X_PLL_CPU_CONFIG_NFRAC_SHIFT	0
 #define	AR934X_PLL_CPU_CONFIG_NFRAC_MASK	0x3f
@@ -81,10 +103,38 @@
 #define	AR934X_RESET_REG_BOOTSTRAP		(AR71XX_RST_BLOCK_BASE + 0xb0)
 #define	AR934X_RESET_REG_PCIE_WMAC_INT_STATUS	(AR71XX_RST_BLOCK_BASE + 0xac)
 
+#define	AR934X_RESET_HOST		(1U << 31)
+#define	AR934X_RESET_SLIC		(1 << 30)
+#define	AR934X_RESET_HDMA		(1 << 29)
+#define	AR934X_RESET_EXTERNAL		(1 << 28)
+#define	AR934X_RESET_RTC		(1 << 27)
+#define	AR934X_RESET_PCIE_EP_INT	(1 << 26)
+#define	AR934X_RESET_CHKSUM_ACC		(1 << 25)
+#define	AR934X_RESET_FULL_CHIP		(1 << 24)
+#define	AR934X_RESET_GE1_MDIO		(1 << 23)
+#define	AR934X_RESET_GE0_MDIO		(1 << 22)
+#define	AR934X_RESET_CPU_NMI		(1 << 21)
+#define	AR934X_RESET_CPU_COLD		(1 << 20)
+#define	AR934X_RESET_HOST_RESET_INT	(1 << 19)
+#define	AR934X_RESET_PCIE_EP		(1 << 18)
+#define	AR934X_RESET_UART1		(1 << 17)
+#define	AR934X_RESET_DDR		(1 << 16)
+#define	AR934X_RESET_USB_PHY_PLL_PWD_EXT	(1 << 15)
+#define	AR934X_RESET_NANDF		(1 << 14)
+#define	AR934X_RESET_GE1_MAC		(1 << 13)
+#define	AR934X_RESET_ETH_SWITCH_ANALOG	(1 << 12)
 #define	AR934X_RESET_USB_PHY_ANALOG	(1 << 11)
+#define	AR934X_RESET_HOST_DMA_INT	(1 << 10)
+#define	AR934X_RESET_GE0_MAC		(1 << 9)
+#define	AR934X_RESET_ETH_SWITCH		(1 << 8)
+#define	AR934X_RESET_PCIE_PHY		(1 << 7)
+#define	AR934X_RESET_PCIE		(1 << 6)
 #define	AR934X_RESET_USB_HOST		(1 << 5)
 #define	AR934X_RESET_USB_PHY		(1 << 4)
 #define	AR934X_RESET_USBSUS_OVERRIDE	(1 << 3)
+#define	AR934X_RESET_LUT		(1 << 2)
+#define	AR934X_RESET_MBOX		(1 << 1)
+#define	AR934X_RESET_I2S		(1 << 0)
 
 #define	AR934X_BOOTSTRAP_SW_OPTION8	(1 << 23)
 #define	AR934X_BOOTSTRAP_SW_OPTION7	(1 << 22)
@@ -153,4 +203,9 @@
 #define	AR934X_SRIF_DPLL2_OUTDIV_SHIFT	13
 #define	AR934X_SRIF_DPLL2_OUTDIV_MASK	0x7
 
+/* XXX verify! */
+#define	AR934X_PLL_VAL_1000		0x16000000
+#define	AR934X_PLL_VAL_100		0x00000101
+#define	AR934X_PLL_VAL_10		0x00001616
+
 #endif	/* __AR934X_REG_H__ */
diff --git a/sys/mips/atheros/if_arge.c b/sys/mips/atheros/if_arge.c
index aabab52187b..ef76e58ac73 100644
--- a/sys/mips/atheros/if_arge.c
+++ b/sys/mips/atheros/if_arge.c
@@ -41,8 +41,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
+#include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
 #include <sys/socket.h>
@@ -50,10 +52,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
-#include <net/if_arp.h>
-#include <net/ethernet.h>
-#include <net/if_dl.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 #include <net/if_types.h>
 
 #include <net/bpf.h>
@@ -90,6 +91,7 @@ MODULE_VERSION(arge, 1);
 #include "miibus_if.h"
 
 #include <mips/atheros/ar71xxreg.h>
+#include <mips/atheros/ar934xreg.h>	/* XXX tsk! */
 #include <mips/atheros/if_argevar.h>
 #include <mips/atheros/ar71xx_setup.h>
 #include <mips/atheros/ar71xx_cpudef.h>
@@ -260,7 +262,7 @@ arge_probe(device_t dev)
 {
 
 	device_set_desc(dev, "Atheros AR71xx built-in ethernet interface");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static void
@@ -298,17 +300,38 @@ static void
 arge_reset_mac(struct arge_softc *sc)
 {
 	uint32_t reg;
+	uint32_t reset_reg;
 
 	/* Step 1. Soft-reset MAC */
 	ARGE_SET_BITS(sc, AR71XX_MAC_CFG1, MAC_CFG1_SOFT_RESET);
 	DELAY(20);
 
 	/* Step 2. Punt the MAC core from the central reset register */
-	ar71xx_device_stop(sc->arge_mac_unit == 0 ? RST_RESET_GE0_MAC :
-	    RST_RESET_GE1_MAC);
+	/*
+	 * XXX TODO: migrate this (and other) chip specific stuff into
+	 * a chipdef method.
+	 */
+	if (sc->arge_mac_unit == 0) {
+		reset_reg = RST_RESET_GE0_MAC;
+	} else {
+		reset_reg = RST_RESET_GE1_MAC;
+	}
+
+	/*
+	 * AR934x (and later) also needs the MDIO block reset.
+	 */
+	if (ar71xx_soc == AR71XX_SOC_AR9341 ||
+	   ar71xx_soc == AR71XX_SOC_AR9342 ||
+	   ar71xx_soc == AR71XX_SOC_AR9344) {
+		if (sc->arge_mac_unit == 0) {
+			reset_reg |= AR934X_RESET_GE0_MDIO;
+		} else {
+			reset_reg |= AR934X_RESET_GE1_MDIO;
+		}
+	}
+	ar71xx_device_stop(reset_reg);
 	DELAY(100);
-	ar71xx_device_start(sc->arge_mac_unit == 0 ? RST_RESET_GE0_MAC :
-	    RST_RESET_GE1_MAC);
+	ar71xx_device_start(reset_reg);
 
 	/* Step 3. Reconfigure MAC block */
 	ARGE_WRITE(sc, AR71XX_MAC_CFG1,
@@ -322,14 +345,173 @@ arge_reset_mac(struct arge_softc *sc)
 	ARGE_WRITE(sc, AR71XX_MAC_MAX_FRAME_LEN, 1536);
 }
 
+/*
+ * These values map to the divisor values programmed into
+ * AR71XX_MAC_MII_CFG.
+ *
+ * The index of each value corresponds to the divisor section
+ * value in AR71XX_MAC_MII_CFG (ie, table[0] means '0' in
+ * AR71XX_MAC_MII_CFG, table[1] means '1', etc.)
+ */
+static const uint32_t ar71xx_mdio_div_table[] = {
+	4, 4, 6, 8, 10, 14, 20, 28,
+};
+
+static const uint32_t ar7240_mdio_div_table[] = {
+	2, 2, 4, 6, 8, 12, 18, 26, 32, 40, 48, 56, 62, 70, 78, 96,
+};
+
+static const uint32_t ar933x_mdio_div_table[] = {
+	4, 4, 6, 8, 10, 14, 20, 28, 34, 42, 50, 58, 66, 74, 82, 98,
+};
+
+/*
+ * Lookup the divisor to use based on the given frequency.
+ *
+ * Returns the divisor to use, or -ve on error.
+ */
+static int
+arge_mdio_get_divider(struct arge_softc *sc, unsigned long mdio_clock)
+{
+	unsigned long ref_clock, t;
+	const uint32_t *table;
+	int ndivs;
+	int i;
+
+	/*
+	 * This is the base MDIO frequency on the SoC.
+	 * The dividers .. well, divide. Duh.
+	 */
+	ref_clock = ar71xx_mdio_freq();
+
+	/*
+	 * If either clock is undefined, just tell the
+	 * caller to fall through to the defaults.
+	 */
+	if (ref_clock == 0 || mdio_clock == 0)
+		return (-EINVAL);
+
+	/*
+	 * Pick the correct table!
+	 */
+	switch (ar71xx_soc) {
+	case AR71XX_SOC_AR9330:
+	case AR71XX_SOC_AR9331:
+	case AR71XX_SOC_AR9341:
+	case AR71XX_SOC_AR9342:
+	case AR71XX_SOC_AR9344:
+		table = ar933x_mdio_div_table;
+		ndivs = nitems(ar933x_mdio_div_table);
+		break;
+
+	case AR71XX_SOC_AR7240:
+	case AR71XX_SOC_AR7241:
+	case AR71XX_SOC_AR7242:
+		table = ar7240_mdio_div_table;
+		ndivs = nitems(ar7240_mdio_div_table);
+		break;
+
+	default:
+		table = ar71xx_mdio_div_table;
+		ndivs = nitems(ar71xx_mdio_div_table);
+	}
+
+	/*
+	 * Now, walk through the list and find the first divisor
+	 * that falls under the target MDIO frequency.
+	 *
+	 * The divisors go up, but the corresponding frequencies
+	 * are actually decreasing.
+	 */
+	for (i = 0; i < ndivs; i++) {
+		t = ref_clock / table[i];
+		if (t <= mdio_clock) {
+			return (i);
+		}
+	}
+
+	ARGEDEBUG(sc, ARGE_DBG_RESET,
+	    "No divider found; MDIO=%lu Hz; target=%lu Hz\n",
+		ref_clock, mdio_clock);
+	return (-ENOENT);
+}
+
+/*
+ * Fetch the MDIO bus clock rate.
+ *
+ * For now, the default is DIV_28 for everything
+ * bar AR934x, which will be DIV_58.
+ *
+ * It will definitely need updating to take into account
+ * the MDIO bus core clock rate and the target clock
+ * rate for the chip.
+ */
+static uint32_t
+arge_fetch_mdiobus_clock_rate(struct arge_softc *sc)
+{
+	int mdio_freq, div;
+
+	/*
+	 * Is the MDIO frequency defined? If so, find a divisor that
+	 * makes reasonable sense.  Don't overshoot the frequency.
+	 */
+	if (resource_int_value(device_get_name(sc->arge_dev),
+	    device_get_unit(sc->arge_dev),
+	    "mdio_freq",
+	    &mdio_freq) == 0) {
+		sc->arge_mdiofreq = mdio_freq;
+		div = arge_mdio_get_divider(sc, sc->arge_mdiofreq);
+		if (bootverbose)
+			device_printf(sc->arge_dev,
+			    "%s: mdio ref freq=%llu Hz, target freq=%llu Hz,"
+			    " divisor index=%d\n",
+			    __func__,
+			    (unsigned long long) ar71xx_mdio_freq(),
+			    (unsigned long long) mdio_freq,
+			    div);
+		if (div >= 0)
+			return (div);
+	}
+
+	/*
+	 * Default value(s).
+	 *
+	 * XXX obviously these need .. fixing.
+	 *
+	 * From Linux/OpenWRT:
+	 *
+	 * + 7240? DIV_6
+	 * + Builtin-switch port and not 934x? DIV_10
+	 * + Not built-in switch port and 934x? DIV_58
+	 * + .. else DIV_28.
+	 */
+	switch (ar71xx_soc) {
+	case AR71XX_SOC_AR9341:
+	case AR71XX_SOC_AR9342:
+	case AR71XX_SOC_AR9344:
+		return (MAC_MII_CFG_CLOCK_DIV_58);
+		break;
+	default:
+		return (MAC_MII_CFG_CLOCK_DIV_28);
+	}
+}
+
 static void
 arge_reset_miibus(struct arge_softc *sc)
 {
+	uint32_t mdio_div;
 
-	/* Reset MII bus */
-	ARGE_WRITE(sc, AR71XX_MAC_MII_CFG, MAC_MII_CFG_RESET);
+	mdio_div = arge_fetch_mdiobus_clock_rate(sc);
+
+	/*
+	 * XXX AR934x and later; should we be also resetting the
+	 * MDIO block(s) using the reset register block?
+	 */
+
+	/* Reset MII bus; program in the default divisor */
+	ARGE_WRITE(sc, AR71XX_MAC_MII_CFG, MAC_MII_CFG_RESET | mdio_div);
 	DELAY(100);
-	ARGE_WRITE(sc, AR71XX_MAC_MII_CFG, MAC_MII_CFG_CLOCK_DIV_28);
+	ARGE_WRITE(sc, AR71XX_MAC_MII_CFG, mdio_div);
 	DELAY(100);
 }
 
@@ -588,9 +770,13 @@ arge_attach(device_t dev)
 		case AR71XX_SOC_AR7242:
 		case AR71XX_SOC_AR9330:
 		case AR71XX_SOC_AR9331:
+		case AR71XX_SOC_AR9341:
+		case AR71XX_SOC_AR9342:
+		case AR71XX_SOC_AR9344:
 			ARGE_WRITE(sc, AR71XX_MAC_FIFO_CFG1, 0x0010ffff);
 			ARGE_WRITE(sc, AR71XX_MAC_FIFO_CFG2, 0x015500aa);
 			break;
+		/* AR71xx, AR913x */
 		default:
 			ARGE_WRITE(sc, AR71XX_MAC_FIFO_CFG1, 0x0fff0000);
 			ARGE_WRITE(sc, AR71XX_MAC_FIFO_CFG2, 0x00001fff);
@@ -917,12 +1103,16 @@ arge_set_pll(struct arge_softc *sc, int media, int duplex)
 		case AR71XX_SOC_AR7242:
 		case AR71XX_SOC_AR9330:
 		case AR71XX_SOC_AR9331:
+		case AR71XX_SOC_AR9341:
+		case AR71XX_SOC_AR9342:
+		case AR71XX_SOC_AR9344:
 			fifo_tx = 0x01f00140;
 			break;
 		case AR71XX_SOC_AR9130:
 		case AR71XX_SOC_AR9132:
 			fifo_tx = 0x00780fff;
 			break;
+		/* AR71xx */
 		default:
 			fifo_tx = 0x008001ff;
 	}
@@ -1072,6 +1262,10 @@ arge_init_locked(struct arge_softc *sc)
  * The TX engine requires each fragment to be aligned to a
  * 4 byte boundary and the size of each fragment except
  * the last to be a multiple of 4 bytes.
+ *
+ * XXX TODO: I believe this is only a bug on the AR71xx and
+ * AR913x MACs. The later MACs (AR724x and later) does not
+ * need this workaround.
  */
 static int
 arge_mbuf_chain_is_tx_aligned(struct mbuf *m0)
@@ -1105,6 +1299,10 @@ arge_encap(struct arge_softc *sc, struct mbuf **m_head)
 	/*
 	 * Fix mbuf chain, all fragments should be 4 bytes aligned and
 	 * even 4 bytes
+	 *
+	 * XXX TODO: I believe this is only a bug on the AR71xx and
+	 * AR913x MACs. The later MACs (AR724x and later) does not
+	 * need this workaround.
 	 */
 	m = *m_head;
 	if (! arge_mbuf_chain_is_tx_aligned(m)) {
diff --git a/sys/mips/atheros/if_argevar.h b/sys/mips/atheros/if_argevar.h
index 9add6740ec1..50c02c3ff41 100644
--- a/sys/mips/atheros/if_argevar.h
+++ b/sys/mips/atheros/if_argevar.h
@@ -55,10 +55,17 @@
 /*
  * register space access macros
  */
+#define	ARGE_BARRIER_READ(sc)	bus_barrier(sc->arge_res, 0, 0, \
+				    BUS_SPACE_BARRIER_READ)
+#define	ARGE_BARRIER_WRITE(sc)	bus_barrier(sc->arge_res, 0, 0, \
+				    BUS_SPACE_BARRIER_WRITE)
+#define	ARGE_BARRIER_RW(sc)	bus_barrier(sc->arge_res, 0, 0, \
+				    BUS_SPACE_BARRIER_READ | \
+				    BUS_SPACE_BARRIER_WRITE)
 #define ARGE_WRITE(sc, reg, val)	do {	\
 		bus_write_4(sc->arge_res, (reg), (val)); \
+		ARGE_BARRIER_WRITE((sc)); \
 	} while (0)
-
 #define ARGE_READ(sc, reg)	 bus_read_4(sc->arge_res, (reg))
 
 #define ARGE_SET_BITS(sc, reg, bits)	\
@@ -71,8 +78,11 @@
 	ARGE_WRITE((_sc), (_reg), (_val))
 #define ARGE_MDIO_READ(_sc, _reg)	\
 	ARGE_READ((_sc), (_reg))
+#define	ARGE_MDIO_BARRIER_READ(_sc)	ARGE_BARRIER_READ(_sc)
+#define	ARGE_MDIO_BARRIER_WRITE(_sc)	ARGE_BARRIER_WRITE(_sc)
+#define	ARGE_MDIO_BARRIER_RW(_sc)	ARGE_BARRIER_READ_RW(_sc)
 
-#define ARGE_DESC_EMPTY		(1 << 31)
+#define ARGE_DESC_EMPTY		(1U << 31)
 #define ARGE_DESC_MORE		(1 << 24)
 #define ARGE_DESC_SIZE_MASK	((1 << 12) - 1)
 #define	ARGE_DMASIZE(len)	((len) & ARGE_DESC_SIZE_MASK)
@@ -159,6 +169,7 @@ struct arge_softc {
 	int			arge_mac_unit;
 	int			arge_if_flags;
 	uint32_t		arge_debug;
+	uint32_t		arge_mdiofreq;
 	struct {
 		uint32_t	tx_pkts_unaligned;
 		uint32_t	tx_pkts_aligned;
diff --git a/sys/mips/beri/beri_machdep.c b/sys/mips/beri/beri_machdep.c
index f36b0ea1bb1..7c8eea573b6 100644
--- a/sys/mips/beri/beri_machdep.c
+++ b/sys/mips/beri/beri_machdep.c
@@ -116,14 +116,19 @@ mips_init(void)
 
 /*
  * Perform a board-level soft-reset.
- *
- * XXXRW: BERI doesn't yet have a board-level soft-reset.
  */
 void
 platform_reset(void)
 {
 
-	panic("%s: not yet", __func__);
+	/* XXX SMP will likely require us to do more. */
+	__asm__ __volatile__(
+		"mfc0 $k0, $12\n\t"
+		"li $k1, 0x00100000\n\t"
+		"or $k0, $k0, $k1\n\t"
+		"mtc0 $k0, $12\n");
+	for( ; ; )
+		__asm__ __volatile("wait");
 }
 
 void
diff --git a/sys/mips/beri/beri_pic.c b/sys/mips/beri/beri_pic.c
new file mode 100644
index 00000000000..f13f144bc99
--- /dev/null
+++ b/sys/mips/beri/beri_pic.c
@@ -0,0 +1,700 @@
+/*-
+ * Copyright (c) 2013 SRI International
+ * 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+
+#include <machine/bus.h>
+#include <machine/intr_machdep.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/fdt/fdt_common.h>
+
+#include "fdt_ic_if.h"
+
+struct beripic_softc;
+
+static uint64_t	bp_read_cfg(struct beripic_softc *, int);
+static void	bp_write_cfg(struct beripic_softc *, int, uint64_t);
+static void	bp_detach_resources(device_t);
+static char	*bp_strconfig(uint64_t, char *, size_t);
+static void	bp_config_source(device_t, int, int, u_long, u_long);
+#ifdef __mips__
+static void	bp_set_counter_name(device_t, device_t, int);
+#endif
+
+static int	beripic_fdt_probe(device_t);
+static int	beripic_fdt_attach(device_t);
+
+static int	beripic_activate_intr(device_t, struct resource *);
+static struct resource *
+		beripic_alloc_intr(device_t, device_t, int *, u_long, u_int);
+static int	beripic_config_intr(device_t, int,  enum intr_trigger,
+		    enum intr_polarity);
+static int	beripic_release_intr(device_t, struct resource *);
+static int	beripic_setup_intr(device_t, device_t, struct resource *,
+		    int, driver_filter_t *, driver_intr_t *, void *, void **);
+static int	beripic_teardown_intr(device_t, device_t, struct resource *,
+		    void *);
+
+static int	beripic_filter(void *);
+static void	beripic_intr(void *);
+
+#define	BP_MAX_HARD_IRQS	6
+#define	BP_FIRST_SOFT		64
+
+struct beripic_softc {
+	device_t		bp_dev;
+	struct resource		*bp_cfg_res;
+	struct resource		*bp_read_res;
+	struct resource		*bp_set_res;
+	struct resource		*bp_clear_res;
+	int			bp_cfg_rid;
+	int			bp_read_rid;
+	int			bp_set_rid;
+	int			bp_clear_rid;
+	bus_space_tag_t		bp_cfg_bst;
+	bus_space_tag_t		bp_read_bst;
+	bus_space_tag_t		bp_set_bst;
+	bus_space_tag_t		bp_clear_bst;
+	bus_space_handle_t	bp_cfg_bsh;
+	bus_space_handle_t	bp_read_bsh;
+	bus_space_handle_t	bp_set_bsh;
+	bus_space_handle_t	bp_clear_bsh;
+
+	struct resource		*bp_irqs[BP_MAX_HARD_IRQS];
+	int			bp_irq_rids[BP_MAX_HARD_IRQS];
+	int			bp_nirqs;
+	int			bp_next_irq;
+	int			bp_next_tid;
+
+	int			bp_nthreads;
+
+	int			bp_nhard;
+	int			bp_nsoft;
+	int			bp_nsrcs;
+	struct rman		bp_src_rman;
+
+#ifdef __mips__
+	mips_intrcnt_t		*bp_counters;
+#endif
+
+	struct mtx		bp_cfgmtx;
+};
+
+struct beripic_intr_arg {
+	driver_filter_t		*filter;
+	driver_intr_t		*intr;
+	void			*arg;
+	struct resource		*irq;
+#ifdef __mips__
+	mips_intrcnt_t		counter;
+#endif
+};
+
+struct beripic_cookie {
+	struct beripic_intr_arg	*bpia;
+	struct resource		*hirq;
+	void			*cookie;
+};
+
+#define	BP_CFG_MASK_E		0x80000000ull
+#define	BP_CFG_SHIFT_E		31
+#define	BP_CFG_MASK_TID		0x7FFFFF00ull	/* Depends on CPU */
+#define	BP_CFG_SHIFT_TID	8
+#define	BP_CFG_MASK_IRQ		0x0000000Full
+#define BP_CFG_SHIFT_IRQ	0
+#define	BP_CFG_VALID		(BP_CFG_MASK_E|BP_CFG_MASK_TID|BP_CFG_MASK_IRQ)
+#define	BP_CFG_RESERVED		~BP_CFG_VALID
+
+#define	BP_CFG_ENABLED(cfg)	(((cfg) & BP_CFG_MASK_E) >> BP_CFG_SHIFT_E)
+#define	BP_CFG_TID(cfg)		(((cfg) & BP_CFG_MASK_TID) >> BP_CFG_SHIFT_TID)
+#define	BP_CFG_IRQ(cfg)		(((cfg) & BP_CFG_MASK_IRQ) >> BP_CFG_SHIFT_IRQ)
+
+MALLOC_DEFINE(M_BERIPIC, "beripic", "beripic memory");
+
+static uint64_t
+bp_read_cfg(struct beripic_softc *sc, int irq)
+{
+	
+	KASSERT((irq >= 0 && irq < sc->bp_nsrcs),
+	    ("IRQ of of range %d (0-%d)", irq, sc->bp_nsrcs - 1));
+	return (bus_space_read_8(sc->bp_cfg_bst, sc->bp_cfg_bsh, irq * 8));
+}
+
+static void
+bp_write_cfg(struct beripic_softc *sc, int irq, uint64_t config)
+{
+	
+	KASSERT((irq >= 0 && irq < sc->bp_nsrcs),
+	    ("IRQ of of range %d (0-%d)", irq, sc->bp_nsrcs - 1));
+	bus_space_write_8(sc->bp_cfg_bst, sc->bp_cfg_bsh, irq * 8, config);
+}
+
+static void
+bp_detach_resources(device_t dev)
+{
+	struct beripic_softc *sc;
+	int i;
+
+	sc = device_get_softc(dev);
+
+	if (sc->bp_cfg_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_cfg_rid,
+		    sc->bp_cfg_res);
+		sc->bp_cfg_res = NULL;
+	}
+	if (sc->bp_read_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_read_rid,
+		    sc->bp_read_res);
+		sc->bp_read_res = NULL;
+	}
+	if (sc->bp_set_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_set_rid,
+		    sc->bp_set_res);
+		sc->bp_set_res = NULL;
+	}
+	if (sc->bp_clear_res != NULL) {
+		bus_release_resource(dev, SYS_RES_MEMORY, sc->bp_clear_rid,
+		    sc->bp_clear_res);
+		sc->bp_clear_res = NULL;
+	}
+	for (i = sc->bp_nirqs - 1; i >= 0; i--) {
+		bus_release_resource(dev, SYS_RES_IRQ, sc->bp_irq_rids[i],
+		    sc->bp_irqs[i]);
+	}
+	sc->bp_nirqs = 0;
+}
+
+static char *
+bp_strconfig(uint64_t config, char *configstr, size_t len)
+{
+	
+	if (snprintf(configstr, len, "%s tid: %llu hardintr %llu",
+	    BP_CFG_ENABLED(config) ? "enabled" : "disabled",
+	    BP_CFG_TID(config), BP_CFG_IRQ(config)) > len - 1)
+		return (NULL);
+	return (configstr);
+}
+
+static void
+bp_config_source(device_t ic, int src, int enable, u_long tid, u_long irq)
+{
+	struct beripic_softc *sc;
+	uint64_t config;
+
+	sc = device_get_softc(ic);
+
+	config = 0;
+	config |= enable << BP_CFG_SHIFT_E;
+	config |= tid << BP_CFG_SHIFT_TID;
+	config |= irq << BP_CFG_SHIFT_IRQ;
+
+	bp_write_cfg(sc, src, config);
+}
+
+#ifdef __mips__
+static void
+bp_set_counter_name(device_t ic, device_t child, int src)
+{
+	struct beripic_softc *sc;
+	char name[MAXCOMLEN + 1];
+
+	sc = device_get_softc(ic);
+
+	if (snprintf(name, sizeof(name), "bp%dsrc%d%s%s%s",
+	    device_get_unit(ic), src, src < sc->bp_nhard ? "" : "s",
+	    child == NULL ? "" : " ",
+	    child == NULL ? " " : device_get_nameunit(child)) >= sizeof(name))
+		name[sizeof(name) - 2] = '+';
+	
+	mips_intrcnt_setname(sc->bp_counters[src], name);
+}
+#endif
+
+static int
+beripic_fdt_probe(device_t dev)
+{
+
+	if (!ofw_bus_is_compatible(dev, "sri-cambridge,beri-pic"))
+		return (ENXIO);
+		
+	device_set_desc(dev, "BERI Programmable Interrupt Controller");
+	return (BUS_PROBE_DEFAULT);
+}
+
+static int
+beripic_fdt_attach(device_t dev)
+{
+	char configstr[64];
+	struct beripic_softc *sc;
+	struct fdt_ic *fic;
+	pcell_t nhard, nsoft;
+	phandle_t ph;
+	int error, i, src;
+	uint64_t config;
+
+	sc = device_get_softc(dev);
+	sc->bp_dev = dev;
+
+	mtx_init(&sc->bp_cfgmtx, "beripic config lock", NULL, MTX_DEF);
+
+	/*
+	 * FDT lists CONFIG, IP_READ, IP_SET, and IP_CLEAR registers as
+	 * seperate memory regions in that order.
+	 */
+	sc->bp_cfg_rid = 0;
+	sc->bp_cfg_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->bp_cfg_rid, RF_ACTIVE);
+	if (sc->bp_cfg_res == NULL) {
+		device_printf(dev, "failed to map config memory");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->bp_dev, "config region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->bp_cfg_res),
+		    (void *)(rman_get_start(sc->bp_cfg_res) +
+		    rman_get_size(sc->bp_cfg_res)));
+
+	sc->bp_read_rid = 1;
+	sc->bp_read_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->bp_read_rid, RF_ACTIVE);
+	if (sc->bp_read_res == NULL) {
+		device_printf(dev, "failed to map IP read memory");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->bp_dev, "IP read region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->bp_read_res),
+		    (void *)(rman_get_start(sc->bp_read_res) +
+		    rman_get_size(sc->bp_read_res)));
+
+	sc->bp_set_rid = 2;
+	sc->bp_set_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->bp_set_rid, RF_ACTIVE);
+	if (sc->bp_set_res == NULL) {
+		device_printf(dev, "failed to map IP read memory");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->bp_dev, "IP set region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->bp_set_res),
+		    (void *)(rman_get_start(sc->bp_set_res) +
+		    rman_get_size(sc->bp_set_res)));
+
+	sc->bp_clear_rid = 3;
+	sc->bp_clear_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &sc->bp_clear_rid, RF_ACTIVE);
+	if (sc->bp_clear_res == NULL) {
+		device_printf(dev, "failed to map IP read memory");
+		error = ENXIO;
+		goto err;
+	}
+	if (bootverbose)
+		device_printf(sc->bp_dev, "IP clear region at mem %p-%p\n",
+		    (void *)rman_get_start(sc->bp_clear_res),
+		    (void *)(rman_get_start(sc->bp_clear_res) +
+		    rman_get_size(sc->bp_clear_res)));
+
+	i = 0;
+	for (i = 0; i < BP_MAX_HARD_IRQS; i++) {
+		sc->bp_irq_rids[i] = i;
+		sc->bp_irqs[i] = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+		    &sc->bp_irq_rids[i], RF_ACTIVE | RF_SHAREABLE);
+		if (sc->bp_irqs[i] == NULL)
+			break;
+	}
+	if (i == 0) {
+		device_printf(dev, "failed to allocate any parent IRQs!");
+		error = ENXIO;
+		goto err;
+	}
+	sc->bp_nirqs = i;
+
+	ph = ofw_bus_gen_get_node(device_get_parent(dev), dev);
+
+#ifndef SMP
+	sc->bp_nthreads = 1;
+#else
+	sc->bp_nthreads = 1;
+	/* XXX: get nthreads from cpu(s) somehow */
+#endif
+
+	if (OF_getprop(ph, "hard-interrupt-sources", &nhard, sizeof(nhard))
+	    <= 0) {
+		device_printf(dev, "failed to get number of hard sources");
+		error = ENXIO;
+		goto err;
+	}
+	if (OF_getprop(ph, "soft-interrupt-sources", &nsoft, sizeof(nsoft))
+	    <= 0) {
+		device_printf(dev, "failed to get number of soft sources");
+		error = ENXIO;
+		goto err;
+	}
+
+	sc->bp_nhard = nhard;
+	sc->bp_nsoft = nsoft;
+	sc->bp_nsrcs = sc->bp_nhard + sc->bp_nsoft;
+	/* XXX: should deal with gap between hard and soft */
+	KASSERT(sc->bp_nhard <= BP_FIRST_SOFT,
+	    ("too many hard sources"));
+	KASSERT(rman_get_size(sc->bp_cfg_res) / 8 == sc->bp_nsrcs,
+	    ("config space size does not match sources"));
+	KASSERT(sc->bp_nhard % 64 == 0,
+	    ("Non-multiple of 64 intr counts not supported"));
+	KASSERT(sc->bp_nsoft % 64 == 0,
+	    ("Non-multiple of 64 intr counts not supported"));
+	if (bootverbose)
+		device_printf(dev, "%d hard and %d soft sources\n",
+		    sc->bp_nhard, sc->bp_nsoft);
+
+#ifdef __mips__
+	sc->bp_counters = malloc(sizeof(*sc->bp_counters) * sc->bp_nsrcs,
+	    M_BERIPIC, M_WAITOK|M_ZERO);
+	for (i = 0; i < sc->bp_nsrcs; i++) {
+		sc->bp_counters[i] = mips_intrcnt_create("");
+		bp_set_counter_name(dev, NULL, i);
+	}
+#endif
+	
+	sc->bp_src_rman.rm_start = 0;
+	sc->bp_src_rman.rm_end = sc->bp_nsrcs - 1;
+	sc->bp_src_rman.rm_type = RMAN_ARRAY;
+	sc->bp_src_rman.rm_descr = "Interrupt source";
+	if (rman_init(&(sc->bp_src_rman)) != 0 ||
+	    rman_manage_region(&(sc->bp_src_rman), 0, sc->bp_nsrcs - 1) != 0) {
+		device_printf(dev, "Failed to set up sources rman");
+		error = ENXIO;
+		goto err;
+	}
+
+	sc->bp_cfg_bst = rman_get_bustag(sc->bp_cfg_res);
+	sc->bp_cfg_bsh = rman_get_bushandle(sc->bp_cfg_res);
+	sc->bp_read_bst = rman_get_bustag(sc->bp_read_res);
+	sc->bp_read_bsh = rman_get_bushandle(sc->bp_read_res);
+	sc->bp_set_bst = rman_get_bustag(sc->bp_set_res);
+	sc->bp_set_bsh = rman_get_bushandle(sc->bp_set_res);
+	sc->bp_clear_bst = rman_get_bustag(sc->bp_clear_res);
+	sc->bp_clear_bsh = rman_get_bushandle(sc->bp_clear_res);
+
+	for (src = 0; src < sc->bp_nsrcs; src++) {
+		config = bp_read_cfg(sc, src);
+		if (config == 0)
+			continue;
+
+		if (bootverbose) {
+			device_printf(dev, "initial config: src %d: %s\n", src,
+			    bp_strconfig(config, configstr, sizeof(configstr)));
+			if (config & BP_CFG_RESERVED)
+				device_printf(dev,
+				    "reserved bits not 0: 0x%016jx\n",
+				    (uintmax_t) config);
+		}
+
+		bp_config_source(dev, src, 0, 0, 0);
+	}
+
+	fic = malloc(sizeof(*fic), M_BERIPIC, M_WAITOK|M_ZERO);
+	fic->iph = ph;
+	fic->dev = dev;
+	SLIST_INSERT_HEAD(&fdt_ic_list_head, fic, fdt_ics);
+
+	return (0);
+err:
+	bp_detach_resources(dev);
+
+	return (error);
+}
+
+static struct resource *
+beripic_alloc_intr(device_t ic, device_t child, int *rid, u_long irq,
+    u_int flags)
+{
+	struct beripic_softc *sc;
+	struct resource *rv;
+
+	sc = device_get_softc(ic);
+
+	rv = rman_reserve_resource(&(sc->bp_src_rman), irq, irq, 1, flags,
+	    child);
+	if (rv == NULL)
+		 printf("%s: could not reserve source interrupt for %s\n",
+		     __func__, device_get_nameunit(child));
+	rman_set_rid(rv, *rid);
+
+	if ((flags & RF_ACTIVE) &&
+	    beripic_activate_intr(ic, rv) != 0) {
+		printf("%s: could not activate interrupt\n", __func__);
+		rman_release_resource(rv);
+		return (NULL);
+	}
+
+	return (rv);
+}
+
+static int
+beripic_release_intr(device_t ic, struct resource *r)
+{
+	
+	return (rman_release_resource(r));
+}
+
+static int
+beripic_activate_intr(device_t ic, struct resource *r)
+{
+	
+	return (rman_activate_resource(r));
+}
+
+static int
+beripic_deactivate_intr(device_t ic, struct resource *r)
+{
+	
+	return (rman_deactivate_resource(r));
+}
+
+static int
+beripic_config_intr(device_t dev, int irq, enum intr_trigger trig,
+   enum intr_polarity pol)
+{
+
+	if (trig != INTR_TRIGGER_CONFORM || pol != INTR_POLARITY_CONFORM)
+		return (EINVAL);
+
+	return (0);
+}
+
+static int
+beripic_setup_intr(device_t ic, device_t child, struct resource *irq,
+    int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, 
+    void **cookiep)
+{
+	struct beripic_softc *sc;
+	struct beripic_intr_arg *bpia;
+	struct beripic_cookie *bpc;
+	int error;
+	u_long hirq, src, tid;
+
+	sc = device_get_softc(ic);
+
+	src = rman_get_start(irq);
+
+	KASSERT(src < sc->bp_nsrcs, ("source (%lu) out of range 0-%d",
+	     src, sc->bp_nsrcs - 1));
+
+	bpia = malloc(sizeof(*bpia), M_BERIPIC, M_WAITOK|M_ZERO);
+	bpia->filter = filter;
+	bpia->intr = intr;
+	bpia->arg = arg;
+	bpia->irq = irq;
+#ifdef __mips__
+	bpia->counter = sc->bp_counters[src];
+	bp_set_counter_name(ic, child, src);
+#endif
+
+	bpc = malloc(sizeof(*bpc), M_BERIPIC, M_WAITOK|M_ZERO);
+	bpc->bpia = bpia;
+
+	mtx_lock(&(sc->bp_cfgmtx));
+	bpc->hirq = sc->bp_irqs[sc->bp_next_irq];
+	hirq = rman_get_start(bpc->hirq);
+	tid = sc->bp_next_tid;
+
+	error = BUS_SETUP_INTR(device_get_parent(ic), ic, bpc->hirq, flags,
+	    beripic_filter, intr == NULL ? NULL : beripic_intr, bpia,
+	    &(bpc->cookie));
+	if (error != 0)
+		goto err;
+
+#ifdef NOTYET
+#ifdef SMP
+	/* XXX: bind ithread to cpu */
+	sc->bp_next_tid++;
+	if (sc->bp_next_tid >= sc->bp_nthreads)
+		sc->bp_next_tid = 0;
+#endif
+#endif
+	if (sc->bp_next_tid == 0) {
+		sc->bp_next_irq++;
+		if (sc->bp_next_irq >= sc->bp_nirqs)
+			sc->bp_next_irq = 0;
+	}
+	mtx_unlock(&(sc->bp_cfgmtx));
+
+	*cookiep = bpc;
+
+	bp_config_source(ic, rman_get_start(irq), 1, tid, hirq);
+
+	return (0);
+err:
+	free(bpc, M_BERIPIC);
+	free(bpia, M_BERIPIC);
+
+	return (error);
+}
+
+static int
+beripic_teardown_intr(device_t dev, device_t child, struct resource *irq,
+    void *cookie)
+{
+	struct beripic_cookie *bpc;
+	int error;
+
+	bpc = cookie;
+
+	bp_config_source(dev, rman_get_start(irq), 0, 0, 0);
+
+	free(bpc->bpia, M_BERIPIC);
+
+	error = BUS_TEARDOWN_INTR(device_get_parent(dev), dev, bpc->hirq,
+	    bpc->cookie);
+
+	free(bpc, M_BERIPIC);
+
+	return (error);
+}
+
+static int
+beripic_filter(void *arg)
+{
+	struct beripic_intr_arg *bpic;
+
+	bpic = arg;
+
+#ifdef __mips__
+	mips_intrcnt_inc(bpic->counter);
+#endif
+
+	/* XXX: Add a check that our source is high */
+
+	if (bpic->filter == NULL)
+		return (FILTER_SCHEDULE_THREAD);
+
+	return (bpic->filter(bpic->arg));
+}
+
+static void
+beripic_intr(void *arg)
+{
+	struct beripic_intr_arg *bpic;
+
+	bpic = arg;
+
+	KASSERT(bpic->intr != NULL,
+	    ("%s installed, but no child intr", __func__));
+
+	bpic->intr(bpic->arg);
+}
+
+#ifdef SMP
+static void
+beripic_setup_ipi(device_t ic, u_int tid, u_int ipi_irq)
+{
+	
+	bp_config_source(ic, BP_FIRST_SOFT + tid, 1, tid, ipi_irq);
+}
+
+static void
+beripic_send_ipi(device_t ic, u_int tid)
+{
+	struct beripic_softc *sc;
+	uint64_t bit;
+
+	sc = device_get_softc(ic);
+
+	KASSERT(tid < sc->bp_nsoft, ("tid (%d) too large\n", tid));
+
+	bit = 1ULL << (tid % 64);
+	bus_space_write_8(sc->bp_set_bst, sc->bp_set_bsh, 
+	    (BP_FIRST_SOFT / 8) + (tid / 64), bit);
+}
+
+static void
+beripic_clear_ipi(device_t ic, u_int tid)
+{
+	struct beripic_softc *sc;
+	uint64_t bit;
+
+	sc = device_get_softc(ic);
+
+	KASSERT(tid < sc->bp_nsoft, ("tid (%d) to large\n", tid));
+
+	bit = 1ULL << (tid % 64);
+	bus_space_write_8(sc->bp_clear_bst, sc->bp_clear_bsh, 
+	    (BP_FIRST_SOFT / 8) + (tid / 64), bit);
+}
+#endif
+
+devclass_t	beripic_devclass;
+
+static device_method_t beripic_fdt_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		beripic_fdt_probe),
+	DEVMETHOD(device_attach,	beripic_fdt_attach),
+
+	DEVMETHOD(fdt_ic_activate_intr,	beripic_activate_intr),
+	DEVMETHOD(fdt_ic_alloc_intr,	beripic_alloc_intr),
+	DEVMETHOD(fdt_ic_config_intr,	beripic_config_intr),
+	DEVMETHOD(fdt_ic_deactivate_intr, beripic_deactivate_intr),
+	DEVMETHOD(fdt_ic_release_intr,	beripic_release_intr),
+	DEVMETHOD(fdt_ic_setup_intr,	beripic_setup_intr),
+	DEVMETHOD(fdt_ic_teardown_intr,	beripic_teardown_intr),
+
+#ifdef SMP
+	DEVMETHOD(fdt_ic_setup_ipi,	beripic_setup_ipi),
+	DEVMETHOD(fdt_ic_clear_ipi,	beripic_clear_ipi),
+	DEVMETHOD(fdt_ic_send_ipi,	beripic_send_ipi),
+#endif
+
+	{ 0, 0 },
+};
+
+static driver_t beripic_fdt_driver = {
+	"beripic",
+	beripic_fdt_methods,
+	sizeof(struct beripic_softc)
+};
+
+DRIVER_MODULE(beripic, simplebus, beripic_fdt_driver, beripic_devclass, 0, 0);
diff --git a/sys/mips/beri/files.beri b/sys/mips/beri/files.beri
index 679479364bd..7bdcb317623 100644
--- a/sys/mips/beri/files.beri
+++ b/sys/mips/beri/files.beri
@@ -1,4 +1,7 @@
 # $FreeBSD$
+dev/altera/atse/if_atse.c		optional altera_atse
+dev/altera/atse/if_atse_fdt.c		optional altera_atse fdt
+dev/altera/atse/if_atse_nexus.c		optional altera_atse
 dev/altera/jtag_uart/altera_jtag_uart_cons.c	optional altera_jtag_uart
 dev/altera/jtag_uart/altera_jtag_uart_tty.c	optional altera_jtag_uart
 dev/altera/jtag_uart/altera_jtag_uart_fdt.c	optional altera_jtag_uart fdt
@@ -14,5 +17,6 @@ dev/terasic/mtl/terasic_mtl_reg.c	optional terasic_mtl
 dev/terasic/mtl/terasic_mtl_syscons.c	optional terasic_mtl
 dev/terasic/mtl/terasic_mtl_text.c	optional terasic_mtl
 mips/beri/beri_machdep.c		standard
+mips/beri/beri_pic.c			optional fdt
 mips/mips/intr_machdep.c		standard
 mips/mips/tick.c			standard
diff --git a/sys/mips/beri/std.beri b/sys/mips/beri/std.beri
index e1a1e834ebf..cdf8b025db6 100644
--- a/sys/mips/beri/std.beri
+++ b/sys/mips/beri/std.beri
@@ -2,3 +2,5 @@
 files	"../beri/files.beri"
 
 cpu		CPU_MIPS4KC
+
+options 	BERI_LARGE_TLB
diff --git a/sys/mips/cavium/ciu.c b/sys/mips/cavium/ciu.c
index dab16216629..a9b1f988f6b 100644
--- a/sys/mips/cavium/ciu.c
+++ b/sys/mips/cavium/ciu.c
@@ -109,7 +109,7 @@ ciu_probe(device_t dev)
 		return (ENXIO);
 
 	device_set_desc(dev, "Cavium Octeon Central Interrupt Unit");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/cavium/octe/cavium-ethernet.h b/sys/mips/cavium/octe/cavium-ethernet.h
index dce2d2bcfa7..cc19faf051e 100644
--- a/sys/mips/cavium/octe/cavium-ethernet.h
+++ b/sys/mips/cavium/octe/cavium-ethernet.h
@@ -38,7 +38,9 @@ AND WITH ALL FAULTS AND CAVIUM  NETWORKS MAKES NO PROMISES, REPRESENTATIONS OR W
 #ifndef CAVIUM_ETHERNET_H
 #define CAVIUM_ETHERNET_H
 
+#include <sys/taskqueue.h>
 #include <net/if_media.h>
+#include <net/ifq.h>
 
 /**
  * This is the definition of the Ethernet driver's private
diff --git a/sys/mips/cavium/octe/ethernet-common.c b/sys/mips/cavium/octe/ethernet-common.c
index 5349427df48..f18eabdfe01 100644
--- a/sys/mips/cavium/octe/ethernet-common.c
+++ b/sys/mips/cavium/octe/ethernet-common.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet-mdio.c b/sys/mips/cavium/octe/ethernet-mdio.c
index a5f3bad4a01..d95669a6037 100644
--- a/sys/mips/cavium/octe/ethernet-mdio.c
+++ b/sys/mips/cavium/octe/ethernet-mdio.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet-mem.c b/sys/mips/cavium/octe/ethernet-mem.c
index d101d7cc956..70c49869008 100644
--- a/sys/mips/cavium/octe/ethernet-mem.c
+++ b/sys/mips/cavium/octe/ethernet-mem.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet-mv88e61xx.c b/sys/mips/cavium/octe/ethernet-mv88e61xx.c
index 31dbd74ecd2..51c55f711e7 100644
--- a/sys/mips/cavium/octe/ethernet-mv88e61xx.c
+++ b/sys/mips/cavium/octe/ethernet-mv88e61xx.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet-rgmii.c b/sys/mips/cavium/octe/ethernet-rgmii.c
index 9addb12bf0f..e8df9ba848a 100644
--- a/sys/mips/cavium/octe/ethernet-rgmii.c
+++ b/sys/mips/cavium/octe/ethernet-rgmii.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet-rx.c b/sys/mips/cavium/octe/ethernet-rx.c
index 910d6bdbb65..79470be1dd4 100644
--- a/sys/mips/cavium/octe/ethernet-rx.c
+++ b/sys/mips/cavium/octe/ethernet-rx.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet-sgmii.c b/sys/mips/cavium/octe/ethernet-sgmii.c
index 4241cabae28..76fe6c9dc50 100644
--- a/sys/mips/cavium/octe/ethernet-sgmii.c
+++ b/sys/mips/cavium/octe/ethernet-sgmii.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet-spi.c b/sys/mips/cavium/octe/ethernet-spi.c
index b378117483c..dc9e9cce3ae 100644
--- a/sys/mips/cavium/octe/ethernet-spi.c
+++ b/sys/mips/cavium/octe/ethernet-spi.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet-tx.c b/sys/mips/cavium/octe/ethernet-tx.c
index 97af542eeb2..b55ada64db2 100644
--- a/sys/mips/cavium/octe/ethernet-tx.c
+++ b/sys/mips/cavium/octe/ethernet-tx.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet-xaui.c b/sys/mips/cavium/octe/ethernet-xaui.c
index 47af915f17a..e1854b22b72 100644
--- a/sys/mips/cavium/octe/ethernet-xaui.c
+++ b/sys/mips/cavium/octe/ethernet-xaui.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include "wrapper-cvmx-includes.h"
 #include "ethernet-headers.h"
diff --git a/sys/mips/cavium/octe/ethernet.c b/sys/mips/cavium/octe/ethernet.c
index 7d2c7df7c4f..b2a5ddf8de2 100644
--- a/sys/mips/cavium/octe/ethernet.c
+++ b/sys/mips/cavium/octe/ethernet.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 
 #include "wrapper-cvmx-includes.h"
diff --git a/sys/mips/cavium/octeon_ebt3000_cf.c b/sys/mips/cavium/octeon_ebt3000_cf.c
index 287005b42bb..18db10ff766 100644
--- a/sys/mips/cavium/octeon_ebt3000_cf.c
+++ b/sys/mips/cavium/octeon_ebt3000_cf.c
@@ -599,7 +599,7 @@ static int cf_probe (device_t dev)
 
         device_set_desc(dev, "Octeon Compact Flash Driver");
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 /* ------------------------------------------------------------------- *
diff --git a/sys/mips/cavium/octeon_pmc.c b/sys/mips/cavium/octeon_pmc.c
index 04480187969..688b154230b 100644
--- a/sys/mips/cavium/octeon_pmc.c
+++ b/sys/mips/cavium/octeon_pmc.c
@@ -71,7 +71,7 @@ octeon_pmc_probe(device_t dev)
 		return (ENXIO);
 
 	device_set_desc(dev, "Cavium Octeon Performance Counters");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/cavium/octeon_rnd.c b/sys/mips/cavium/octeon_rnd.c
index 298f06aee1d..94193142647 100644
--- a/sys/mips/cavium/octeon_rnd.c
+++ b/sys/mips/cavium/octeon_rnd.c
@@ -41,11 +41,6 @@ __FBSDID("$FreeBSD$");
 #include <contrib/octeon-sdk/cvmx.h>
 #include <contrib/octeon-sdk/cvmx-rng.h>
 
-/*
- * XXX
- * random_harvest(9) says to call it with no more than 16 bytes, but at least
- * safe(4) seems to violate that rule.
- */
 #define	OCTEON_RND_WORDS	2
 
 struct octeon_rnd_softc {
@@ -91,7 +86,7 @@ octeon_rnd_probe(device_t dev)
 		return (ENXIO);
 
 	device_set_desc(dev, "Cavium Octeon Random Number Generator");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
@@ -131,7 +126,7 @@ octeon_rnd_harvest(void *arg)
 	for (i = 0; i < OCTEON_RND_WORDS; i++)
 		sc->sc_entropy[i] = cvmx_rng_get_random64();
 	random_harvest(sc->sc_entropy, sizeof sc->sc_entropy,
-		       (sizeof(sc->sc_entropy)*8)/2, 0, RANDOM_PURE);
+		       (sizeof(sc->sc_entropy)*8)/2, RANDOM_PURE_OCTEON);
 
 	callout_reset(&sc->sc_callout, hz * 5, octeon_rnd_harvest, sc);
 }
diff --git a/sys/mips/cavium/octeon_rtc.c b/sys/mips/cavium/octeon_rtc.c
index ca2debdfc6a..b08d4db5569 100644
--- a/sys/mips/cavium/octeon_rtc.c
+++ b/sys/mips/cavium/octeon_rtc.c
@@ -81,7 +81,7 @@ octeon_rtc_probe(device_t dev)
 		return (ENXIO);
 
 	device_set_desc(dev, "Cavium Octeon Realtime Clock");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/cavium/std.octeon1 b/sys/mips/cavium/std.octeon1
index 70618ca898b..fa6ae0746d9 100644
--- a/sys/mips/cavium/std.octeon1
+++ b/sys/mips/cavium/std.octeon1
@@ -3,3 +3,7 @@
 files	"../cavium/files.octeon1"
 machine	mips mips64
 cpu		CPU_CNMIPS
+
+makeoptions CFLAGS_PARAM_INLINE_UNIT_GROWTH=10000
+makeoptions CFLAGS_PARAM_LARGE_FUNCTION_GROWTH=100000
+makeoptions CFLAGS_ARCH_PARAMS="--param max-inline-insns-single=10000"
diff --git a/sys/mips/conf/ALFA_HORNET_UB b/sys/mips/conf/ALFA_HORNET_UB
new file mode 100644
index 00000000000..296634e95db
--- /dev/null
+++ b/sys/mips/conf/ALFA_HORNET_UB
@@ -0,0 +1,57 @@
+#
+# Alfa Networks Hornet UB - an AR933x based SoC wifi device.
+#
+# http://www.alfa.com.tw/products_show.php?pc=99&ps=50
+#
+# This is for the 64MB RAM/16MB flash part.  They also
+# do various other versions; they have different RAM/flash
+# configurations.
+#
+# * AR9330 SoC
+# * 64MB RAM
+# * 16MB flash
+# * Integrated 1x1 2GHz wifi and 10/100 bridge
+#
+# $FreeBSD$
+#
+
+# Include the default AR933x parameters
+include         "AR933X_BASE"
+
+ident           ALFA_HORNET_UB
+
+# Override hints with board values
+hints           "ALFA_HORNET_UB.hints"
+
+# Board memory - 64MB
+options         AR71XX_REALMEM=(64*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
+
+# read MSDOS formatted disks - USB
+#options		MSDOSFS
+
+# Enable the uboot environment stuff rather then the
+# redboot stuff.
+options		AR71XX_ENV_UBOOT
+
+# uzip - to boot natively from flash
+device		geom_uncompress
+options 	GEOM_UNCOMPRESS
+
+# Used for the static uboot partition map
+device          geom_map
+
+# Boot off of the rootfs, as defined in the geom_map setup.
+options		ROOTDEVNAME=\"ufs:map/rootfs.uncompress\"
diff --git a/sys/mips/conf/ALFA_HORNET_UB.hints b/sys/mips/conf/ALFA_HORNET_UB.hints
new file mode 100644
index 00000000000..55661e8640d
--- /dev/null
+++ b/sys/mips/conf/ALFA_HORNET_UB.hints
@@ -0,0 +1,105 @@
+#
+# 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 (uboot), 64k (uboot-env), 14336k (rootfs), 1600k (kernel), 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=0x000040000
+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
+
+# 1600KB
+hint.map.2.at="flash/spi0"
+hint.map.2.start=0x00050000
+hint.map.2.end=0x001e0000
+hint.map.2.name="kernel"
+hint.map.2.readonly=0
+
+# 14336KB
+hint.map.3.at="flash/spi0"
+hint.map.3.start=0x001e0000
+hint.map.3.end=0x00fe0000
+hint.map.3.name="rootfs"
+hint.map.3.readonly=0
+
+# NVRAM
+hint.map.4.at="flash/spi0"
+hint.map.4.start=0x00fe0000
+hint.map.4.end=0x00ff0000
+hint.map.4.name="cfg"
+hint.map.4.readonly=0
+
+# This is radio calibration section.  It is (or should be!) unique
+# for each board, to take into account thermal and electrical differences
+# as well as the regulatory compliance data.
+#
+hint.map.5.at="flash/spi0"
+hint.map.5.start=0x00ff0000
+hint.map.5.end=0x01000000
+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/AR934X_BASE b/sys/mips/conf/AR934X_BASE
index 4e07eebc1de..22ba0b8a9d8 100644
--- a/sys/mips/conf/AR934X_BASE
+++ b/sys/mips/conf/AR934X_BASE
@@ -12,7 +12,7 @@
 
 machine         mips mips
 ident		AR934X_BASE
-cpu		CPU_MIPS4KC
+cpu		CPU_MIPS74KC
 makeoptions	KERNLOADADDR=0x80050000
 options		HZ=1000
 
diff --git a/sys/mips/conf/BERI_DE4.hints b/sys/mips/conf/BERI_DE4.hints
index 9ec33c86939..66dad52f3ae 100644
--- a/sys/mips/conf/BERI_DE4.hints
+++ b/sys/mips/conf/BERI_DE4.hints
@@ -1,111 +1,26 @@
 # $FreeBSD$
 
-#
-# Altera JTAG UARTs configured for console, debugging, and data putput on the
-# Terasic DE-4.
-#
-hint.altera_jtag_uart.0.at="nexus0"
-hint.altera_jtag_uart.0.maddr=0x7f000000
-hint.altera_jtag_uart.0.msize=0x40
-hint.altera_jtag_uart.0.irq=0
-
-hint.altera_jtag_uart.1.at="nexus0"
-hint.altera_jtag_uart.1.maddr=0x7f001000
-hint.altera_jtag_uart.1.msize=0x40
-
-hint.altera_jtag_uart.2.at="nexus0"
-hint.altera_jtag_uart.2.maddr=0x7f002000
-hint.altera_jtag_uart.2.msize=0x40
-
-#
-# On-board DE4 and tPad SD Card IP core
-#
-hint.altera_sdcardc.0.at="nexus0"
-hint.altera_sdcardc.0.maddr=0x7f008000
-hint.altera_sdcardc.0.msize=0x400
-
-#
-# On-board DE4 8-element LED
-#
-hint.terasic_de4led.0.at="nexus0"
-hint.terasic_de4led.0.maddr=0x7f006000
-hint.terasic_de4led.0.msize=1
-hint.terasic_de4led.0.de4led_0_cmd="f9"
-
-#
-# Terasic Multi-touch LCD (MTL), an optional feature in DE-4 configurations.
-#
-hint.terasic_mtl.0.at="nexus0"
-hint.terasic_mtl.0.reg_maddr=0x70400000
-hint.terasic_mtl.0.reg_msize=0x1000
-hint.terasic_mtl.0.pixel_maddr=0x70000000
-hint.terasic_mtl.0.pixel_msize=0x177000
-hint.terasic_mtl.0.text_maddr=0x70177000
-hint.terasic_mtl.0.text_msize=0x2000
-
-#
-# BERI Hardware Version ROM
-#
-hint.altera_avgen.0.at="nexus0"
-hint.altera_avgen.0.maddr=0x7F00A000
-hint.altera_avgen.0.msize=20
-hint.altera_avgen.0.width=4
-hint.altera_avgen.0.fileio="rw"
-hint.altera_avgen.0.devname="berirom"
-
-#
-# Expose the DE4 flash via an Avalon "generic" device.
-# This is incompatible with the isf(4) driver.
-#
-#hint.altera_avgen.0.at="nexus0"
-#hint.altera_avgen.0.maddr=0x74000000
-#hint.altera_avgen.0.msize=0x4000000
-#hint.altera_avgen.0.width=2
-#hint.altera_avgen.0.fileio="rw"
-#hint.altera_avgen.0.mmapio="rwx"
-#hint.altera_avgen.0.devname="de4flash"
-
-#
-# Expose the DE4 buttons and switches via an Avalon "generic" device.
-# 
-hint.altera_avgen.0.at="nexus0"
-hint.altera_avgen.0.maddr=0x7f009000
-hint.altera_avgen.0.msize=2
-hint.altera_avgen.0.width=1
-hint.altera_avgen.0.fileio="r"
-hint.altera_avgen.0.devname="de4bsw"
-
-#
-# General Intel StrataFlash driver
-#
-hint.isf.0.at="nexus0"
-hint.isf.0.maddr=0x74000000
-hint.isf.0.msize=0x2000000
-hint.isf.1.at="nexus0"
-hint.isf.1.maddr=0x76000000
-hint.isf.1.msize=0x2000000
-
-# Reserved configuration blocks.  Don't touch.
-hint.map.0.at="isf0"
-hint.map.0.start=0x00000000
-hint.map.0.end=0x00020000
-hint.map.0.name="config"
-hint.map.0.readonly=1
-
 # Hardwired location of bitfile
-hint.map.1.at="isf0"
-hint.map.1.start=0x00020000
-hint.map.1.end=0x01820000
-hint.map.1.name="fpga"
+hint.map.0.at="cfid0s.fpga0"
+hint.map.0.start=0x00000000
+hint.map.0.end=0x00c00000
+hint.map.0.name="fpga"
 
-# Kernel on first chip
-hint.map.2.at="isf0"
-hint.map.2.start=0x01820000
-hint.map.2.end=0x02000000
-hint.map.2.name="reserved"
+# Kernel on the second chip
+hint.map.1.at="cfid0s.os"
+hint.map.1.start=0x007e0000
+hint.map.1.end=0x01fe0000
+hint.map.1.name="kernel"
+
+# Altera Triple-Speed Ethernet Mac, present in tPad and DE-4 configurations
+# configured from fdt(4) but PHYs are still described in here.
+# Currently configured for individual tse_mac cores.
+hint.e1000phy.0.at="miibus0"
+hint.e1000phy.0.phyno=0
+hint.e1000phy.1.at="miibus0"
+hint.e1000phy.1.phyno=0
+hint.e1000phy.2.at="miibus0"
+hint.e1000phy.2.phyno=0
+hint.e1000phy.3.at="miibus0"
+hint.e1000phy.3.phyno=0
 
-# The second chip
-hint.map.3.at="isf1"
-hint.map.3.start=0x00000000
-hint.map.3.end=0x02000000
-hint.map.3.name="kernel"
diff --git a/sys/mips/conf/BERI_DE4_BASE b/sys/mips/conf/BERI_DE4_BASE
new file mode 100644
index 00000000000..801c8d30ada
--- /dev/null
+++ b/sys/mips/conf/BERI_DE4_BASE
@@ -0,0 +1,42 @@
+#
+# BERI_DE4_BASE -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC
+# Implementation) FPGA soft core, as configured in its Terasic DE-4 reference
+# configuration.  This kernel configration must be further specialized to
+# to include a root filesystem specification.
+#
+# $FreeBSD$
+#
+
+include "BERI_TEMPLATE"
+
+ident		BERI_DE4_BASE
+
+options 	NFSCL			# New Network Filesystem Client
+options 	NFSLOCKD		# Network Lock Manager
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
+
+options         FDT
+options         FDT_DTB_STATIC
+makeoptions     FDT_DTS_FILE=beripad-de4.dts
+
+hints		"BERI_DE4.hints"	# Flash partitions still use hints.
+
+device		altera_atse
+device		altera_avgen
+device		altera_jtag_uart
+device		altera_sdcard
+device		terasic_de4led
+device		terasic_mtl
+
+device		bpf
+device		cfi
+device		cfid
+options 	CFI_SUPPORT_STRATAFLASH
+options 	ATSE_CFI_HACK
+device		sc
+
+device		uart
+
+device		miibus
+options 	DEVICE_POLLING
+
diff --git a/sys/mips/conf/BERI_DE4_MDROOT b/sys/mips/conf/BERI_DE4_MDROOT
index f40a60e78c5..410ce78f7fd 100644
--- a/sys/mips/conf/BERI_DE4_MDROOT
+++ b/sys/mips/conf/BERI_DE4_MDROOT
@@ -1,30 +1,19 @@
 #
-# BERI_DE4 -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC
-# Implementation) FPGA soft core, as configured in its Terasic DE-4 reference
-# configuration.
+# BERI_DE4_MDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
+# RISC # Implementation) FPGA soft core, as configured in its Terasic DE-4
+# reference configuration.
 #
 # $FreeBSD$
 #
 
-include "BERI_TEMPLATE"
+include "BERI_DE4_BASE"
 
 ident		BERI_DE4_MDROOT
 
-hints		"BERI_DE4.hints"	#Default places to look for devices.
-
 #
 # This kernel configuration uses an embedded 8MB memory root file system.
 # Adjust the following path based on local requirements.
 #
 options 	MD_ROOT			# MD is a potential root device
-options 	MD_ROOT_SIZE=8192
+options 	MD_ROOT_SIZE=26112	# 25.5MB
 options 	ROOTDEVNAME=\"ufs:md0\"
-
-device		altera_avgen
-device		altera_jtag_uart
-device		altera_sdcard
-device		terasic_de4led
-device		terasic_mtl
-
-device		isf
-device		sc
diff --git a/sys/mips/conf/BERI_DE4_SDROOT b/sys/mips/conf/BERI_DE4_SDROOT
index 304cce5d04a..72386f13624 100644
--- a/sys/mips/conf/BERI_DE4_SDROOT
+++ b/sys/mips/conf/BERI_DE4_SDROOT
@@ -1,24 +1,16 @@
 #
-# BERI_DE4 -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC
-# Implementation) FPGA soft core, as configured in its Terasic DE-4 reference
-# configuration.
+# BERI_DE4_SDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
+# RISC Implementation) FPGA soft core, as configured in its Terasic DE-4
+# reference configuration.
 #
 # $FreeBSD$
 #
 
-include "BERI_TEMPLATE"
+include "BERI_DE4_BASE"
 
 ident		BERI_DE4_SDROOT
 
-hints		"BERI_DE4.hints"	#Default places to look for devices.
-
-options 	ROOTDEVNAME=\"ufs:altera_sdcard0\"
-
-device		altera_avgen
-device		altera_jtag_uart
-device		altera_sdcard
-device		terasic_de4led
-device		terasic_mtl
-
-device		isf
-device		sc
+#
+# This kernel expects to find its root filesystem on the SD Card.
+#
+options 	ROOTDEVNAME=\"ufs:/dev/altera_sdcard0\"
diff --git a/sys/mips/conf/BERI_SIM.hints b/sys/mips/conf/BERI_SIM.hints
deleted file mode 100644
index 342d94f35cf..00000000000
--- a/sys/mips/conf/BERI_SIM.hints
+++ /dev/null
@@ -1,26 +0,0 @@
-# $FreeBSD$
-
-#
-# Altera JTAG UARTs configured for console, debugging, and data putput on the
-# BERI simulator.
-#
-hint.altera_jtag_uart.0.at="nexus0"
-hint.altera_jtag_uart.0.maddr=0x7f000000
-hint.altera_jtag_uart.0.msize=0x40
-hint.altera_jtag_uart.0.irq=0
-
-hint.altera_jtag_uart.1.at="nexus0"
-hint.altera_jtag_uart.1.maddr=0x7f001000
-hint.altera_jtag_uart.1.msize=0x40
-
-hint.altera_jtag_uart.2.at="nexus0"
-hint.altera_jtag_uart.2.maddr=0x7f002000
-hint.altera_jtag_uart.2.msize=0x40
-
-#
-# On-board DE4 and tPad SD Card IP core -- also present in Bluespec
-# simulation.
-#
-hint.altera_sdcardc.0.at="nexus0"
-hint.altera_sdcardc.0.maddr=0x7f008000
-hint.altera_sdcardc.0.msize=0x400
diff --git a/sys/mips/conf/BERI_SIM_BASE b/sys/mips/conf/BERI_SIM_BASE
new file mode 100644
index 00000000000..bedc9cbac57
--- /dev/null
+++ b/sys/mips/conf/BERI_SIM_BASE
@@ -0,0 +1,19 @@
+#
+# BERI_SIM_BASE -- Base kernel for the SRI/Cambridge "BERI" (Bluespec
+# Extensible RISC Implementation) FPGA soft core, as configured for
+# simulation.
+#
+# $FreeBSD$
+#
+
+include "BERI_TEMPLATE"
+
+options 	FDT
+options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=beri-sim.dts
+
+options 	ALTERA_SDCARD_FAST_SIM
+
+device		altera_avgen
+device		altera_jtag_uart
+device		altera_sdcard
diff --git a/sys/mips/conf/BERI_SIM_MDROOT b/sys/mips/conf/BERI_SIM_MDROOT
index a5bfe42c271..756117347b1 100644
--- a/sys/mips/conf/BERI_SIM_MDROOT
+++ b/sys/mips/conf/BERI_SIM_MDROOT
@@ -1,24 +1,18 @@
 #
-# BERI_SIM -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible RISC
-# Implementation) FPGA soft core, as configured for simulation.
+# BERI_SIM_MDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
+# RISC Implementation) FPGA soft core, as configured for simulation.
 #
 # $FreeBSD$
 #
 
-include "BERI_TEMPLATE"
+include "BERI_SIM_BASE"
 
 ident		BERI_SIM_MDROOT
 
-hints		"BERI_SIM.hints"	#Default places to look for devices.
-
 #
-# This kernel configuration uses an embedded 8MB memory root file system.
+# This kernel configuration uses an embedded memory root file system.
 # Adjust the following path based on local requirements.
 #
 options 	MD_ROOT			# MD is a potential root device
-options 	MD_ROOT_SIZE=8192
+options 	MD_ROOT_SIZE=26112	# 25.5MB
 options 	ROOTDEVNAME=\"ufs:md0\"
-
-device		altera_avgen
-device		altera_jtag_uart
-device		altera_sdcard
diff --git a/sys/mips/conf/BERI_SIM_SDROOT b/sys/mips/conf/BERI_SIM_SDROOT
new file mode 100644
index 00000000000..7f2f82d4d3f
--- /dev/null
+++ b/sys/mips/conf/BERI_SIM_SDROOT
@@ -0,0 +1,15 @@
+#
+# BERI_SIM_SDROOT -- Kernel for the SRI/Cambridge "BERI" (Bluespec Extensible
+# RISC Implementation) FPGA soft core, as configured for simulation.
+#
+# $FreeBSD$
+#
+
+include "BERI_SIM_BASE"
+
+ident		BERI_SIM_SDROOT
+
+#
+# This kernel expects to find its root filesystem on the SD Card.
+#
+options 	ROOTDEVNAME=\"ufs:/dev/altera_sdcard0\"
diff --git a/sys/mips/conf/BERI_TEMPLATE b/sys/mips/conf/BERI_TEMPLATE
index f4d53ca1cc2..fcba5cc96c5 100644
--- a/sys/mips/conf/BERI_TEMPLATE
+++ b/sys/mips/conf/BERI_TEMPLATE
@@ -39,7 +39,9 @@ options 	FFS			#Berkeley Fast Filesystem
 
 options 	INET
 options 	INET6
+options 	KGSSAPI
 options 	NFSCL
+options 	NFSLOCKD
 options 	NFS_ROOT
 
 # Debugging for use in -current
@@ -49,10 +51,11 @@ options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required
 #options 	WITNESS			#Enable checks to detect deadlocks and cycles
 #options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
-device		geom_map
-
-device		md
+device		crypto
+device		cryptodev
 device		ether
+device		geom_map
 device		loop
+device		md
 device		random
 device		snp
diff --git a/sys/mips/conf/DB120 b/sys/mips/conf/DB120
index 7578f091295..f37bc704594 100644
--- a/sys/mips/conf/DB120
+++ b/sys/mips/conf/DB120
@@ -13,7 +13,7 @@ ident           DB120
 hints           "DB120.hints"
 
 # Force the board memory - the base DB120 has 128MB RAM
-options         AR71XX_REALMEM=(32*1024*1024)
+options         AR71XX_REALMEM=(128*1024*1024)
 
 # i2c GPIO bus
 #device		gpioiic
diff --git a/sys/mips/conf/DB120.hints b/sys/mips/conf/DB120.hints
index d395f153a64..2c16101577b 100644
--- a/sys/mips/conf/DB120.hints
+++ b/sys/mips/conf/DB120.hints
@@ -1,3 +1,104 @@
 # $FreeBSD$
 
 # This is a placeholder until the hardware support is complete.
+
+# mdiobus0 on arge0
+hint.argemdio.0.at="nexus0"
+hint.argemdio.0.maddr=0x19000000
+hint.argemdio.0.msize=0x1000
+hint.argemdio.0.order=0
+
+# DB120 GMAC configuration
+# + AR934X_ETH_CFG_RGMII_GMAC0              (1 << 0)
+# + AR934X_ETH_CFG_SW_ONLY_MODE             (1 << 6)
+hint.ar934x_gmac.0.gmac_cfg=0x41
+
+# GMAC0 here - connected to an AR8327
+#hint.arswitch.0.at="mdio0"
+#hint.arswitch.0.is_7240=0
+#hint.arswitch.0.is_9340=0	# not the internal switch!
+#hint.arswitch.0.numphys=5
+#hint.arswitch.0.phy4cpu=0
+#hint.arswitch.0.is_rgmii=1
+#hint.arswitch.0.is_gmii=0
+
+# XXX OpenWRT DB120 BSP doesn't have media/duplex set?
+hint.arge.0.phymask=0x0
+hint.arge.0.media=1000
+hint.arge.0.fduplex=1
+hint.arge.0.miimode=3           # RGMII
+hint.arge.0.pll_1000=0x06000000
+
+# mdiobus1 on arge1
+hint.argemdio.1.at="nexus0"
+hint.argemdio.1.maddr=0x1a000000
+hint.argemdio.1.msize=0x1000
+hint.argemdio.1.order=0
+
+# Embedded switch on the AR9344
+hint.arswitch.1.at="mdio1"
+hint.arswitch.1.is_7240=0
+hint.arswitch.1.is_9340=1
+hint.arswitch.1.numphys=4
+hint.arswitch.1.phy4cpu=0       # phy 4 is not a "CPU port" PHY here
+hint.arswitch.1.is_rgmii=0
+hint.arswitch.1.is_gmii=1       # arge1 <-> switch PHY is GMII
+
+# arge1 - lock up to 1000/full
+hint.arge.1.phymask=0x0		# Nothing attached here (XXX?)
+hint.arge.1.media=1000
+hint.arge.1.fduplex=1
+hint.arge.1.miimode=1		# GMII
+
+# flash layout:
+#
+# bootargs=console=ttyS0,115200 root=31:02 rootfstype=jffs2 init=/sbin/init mtdparts=ath-nor0:256k(u-boot),64k(u-boot-env),6336k(rootfs),1408k(uImage),64k(mib0),64k(ART)
+
+# 256KiB u-boot
+hint.map.0.at="flash/spi0"
+hint.map.0.start=0x00000000
+hint.map.0.end=0x00040000	# 256k u-boot
+hint.map.0.name="u-boot"
+hint.map.0.readonly=1
+
+# 64KiB u-boot-env
+hint.map.1.at="flash/spi0"
+hint.map.1.start=0x00040000
+hint.map.1.end=0x00050000	# 64k u-boot-env
+hint.map.1.name="u-boot-env"
+hint.map.1.readonly=1
+
+# 6336KiB rootfs
+hint.map.2.at="flash/spi0"
+hint.map.2.start=0x00050000
+hint.map.2.end=0x00680000	# 6336k rootfs
+hint.map.2.name="rootfs"
+hint.map.2.readonly=1
+
+# 1344KiB uImage
+hint.map.3.at="flash/spi0"
+hint.map.3.start=0x00680000
+hint.map.3.end=0x007d0000	# 1408k uImage, 64k off the end..
+hint.map.3.name="uImage"
+hint.map.3.readonly=1
+
+# 64KiB cfg
+hint.map.4.at="flash/spi0"
+hint.map.4.start=0x007d0000
+hint.map.4.end=0x007e0000
+hint.map.4.name="cfg"
+hint.map.4.readonly=0
+
+# 64KiB mib0
+hint.map.5.at="flash/spi0"
+hint.map.5.start=0x007e0000
+hint.map.5.end=0x007f0000	# 64k mib0
+hint.map.5.name="mib0"
+hint.map.5.readonly=1
+
+# 64KiB ART
+hint.map.6.at="flash/spi0"
+hint.map.6.start=0x007f0000
+hint.map.6.end=0x00800000	# 64k ART
+hint.map.6.name="ART"
+hint.map.6.readonly=1
diff --git a/sys/mips/idt/if_kr.c b/sys/mips/idt/if_kr.c
index aa533eb889b..f1a06d1da64 100644
--- a/sys/mips/idt/if_kr.c
+++ b/sys/mips/idt/if_kr.c
@@ -40,7 +40,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/taskqueue.h>
 
@@ -50,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
+#include <net/if_var.h>
 
 #include <net/bpf.h>
 
diff --git a/sys/mips/idt/obio.c b/sys/mips/idt/obio.c
index 034b93ab644..b7b917d6917 100644
--- a/sys/mips/idt/obio.c
+++ b/sys/mips/idt/obio.c
@@ -108,7 +108,7 @@ static int
 obio_probe(device_t dev)
 {
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/include/asm.h b/sys/mips/include/asm.h
index 790024ff60d..de957d6533f 100644
--- a/sys/mips/include/asm.h
+++ b/sys/mips/include/asm.h
@@ -261,46 +261,6 @@ _C_LABEL(x):
 	.asciiz str;			\
 	.align	3
 
-/*
- * Call ast if required
- *
- * XXX Do we really need to disable interrupts?
- */
-#define DO_AST				             \
-44:				                     \
-	mfc0	t0, MIPS_COP_0_STATUS               ;\
-	and	a0, t0, MIPS_SR_INT_IE              ;\
-	xor	t0, a0, t0                          ;\
-	mtc0	t0, MIPS_COP_0_STATUS               ;\
-	COP0_SYNC                                   ;\
-	GET_CPU_PCPU(s1)                            ;\
-	PTR_L	s3, PC_CURPCB(s1)                   ;\
-	PTR_L	s1, PC_CURTHREAD(s1)                ;\
-	lw	s2, TD_FLAGS(s1)                    ;\
-	li	s0, TDF_ASTPENDING | TDF_NEEDRESCHED;\
-	and	s2, s0                              ;\
-	mfc0	t0, MIPS_COP_0_STATUS               ;\
-	or	t0, a0, t0                          ;\
-	mtc0	t0, MIPS_COP_0_STATUS               ;\
-	COP0_SYNC                                   ;\
-	beq	s2, zero, 4f                        ;\
-	nop                                         ;\
-	PTR_LA	s0, _C_LABEL(ast)                   ;\
-	jalr	s0                                  ;\
-	PTR_ADDU a0, s3, U_PCB_REGS                 ;\
-	j	44b		                    ;\
-        nop                                         ;\
-4:
-
-
-/*
- * XXX retain dialects XXX
- */
-#define	ALEAF(x)			XLEAF(x)
-#define	NLEAF(x)			LEAF_NOPROFILE(x)
-#define	NON_LEAF(x, fsize, retpc)	NESTED(x, fsize, retpc)
-#define	NNON_LEAF(x, fsize, retpc)	NESTED_NOPROFILE(x, fsize, retpc)
-
 #if defined(__mips_o32)
 #define	SZREG	4
 #else
@@ -725,9 +685,12 @@ _C_LABEL(x):
 #elif defined(CPU_RMI)
 #define	HAZARD_DELAY
 #define	ITLBNOPFIX
+#elif defined(CPU_MIPS74KC)
+#define	HAZARD_DELAY	sll $0,$0,3
+#define	ITLBNOPFIX	sll $0,$0,3
 #else
-#define	ITLBNOPFIX	nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;
-#define	HAZARD_DELAY	nop;nop;nop;nop;nop;
+#define	ITLBNOPFIX	nop;nop;nop;nop;nop;nop;nop;nop;nop;sll $0,$0,3;
+#define	HAZARD_DELAY	nop;nop;nop;nop;sll $0,$0,3;
 #endif
 
 #endif /* !_MACHINE_ASM_H_ */
diff --git a/sys/mips/include/cpufunc.h b/sys/mips/include/cpufunc.h
index 1b96160295e..d47f9aa126c 100644
--- a/sys/mips/include/cpufunc.h
+++ b/sys/mips/include/cpufunc.h
@@ -242,8 +242,13 @@ MIPS_RW32_COP0_SEL(config3, MIPS_COP_0_CONFIG, 3);
 #ifdef CPU_CNMIPS
 MIPS_RW32_COP0_SEL(config4, MIPS_COP_0_CONFIG, 4);
 #endif
-#ifdef CPU_NLM
+#ifdef BERI_LARGE_TLB
+MIPS_RW32_COP0_SEL(config5, MIPS_COP_0_CONFIG, 5);
+#endif
+#if defined(CPU_NLM) || defined(BERI_LARGE_TLB)
 MIPS_RW32_COP0_SEL(config6, MIPS_COP_0_CONFIG, 6);
+#endif
+#ifdef CPU_NLM
 MIPS_RW32_COP0_SEL(config7, MIPS_COP_0_CONFIG, 7);
 #endif
 MIPS_RW32_COP0(count, MIPS_COP_0_COUNT);
diff --git a/sys/mips/include/cpuregs.h b/sys/mips/include/cpuregs.h
index 436a980785c..be8414f8fc3 100644
--- a/sys/mips/include/cpuregs.h
+++ b/sys/mips/include/cpuregs.h
@@ -149,6 +149,11 @@
 #define	MIPS_CCA_CC	0x05	/* Cacheable Coherent. */
 #endif
 
+#if defined(CPU_MIPS74KC)
+#define	MIPS_CCA_UNCACHED	0x02
+#define	MIPS_CCA_CACHED		0x00
+#endif
+
 #ifndef	MIPS_CCA_UNCACHED
 #define	MIPS_CCA_UNCACHED	MIPS_CCA_UC
 #endif
@@ -204,12 +209,14 @@
 #define	COP0_SYNC	.word 0xc0	/* ehb */
 #elif defined(CPU_SB1)
 #define COP0_SYNC  ssnop; ssnop; ssnop; ssnop; ssnop; ssnop; ssnop; ssnop; ssnop
+#elif defined(CPU_MIPS74KC)
+#define	COP0_SYNC	 .word 0xc0	/* ehb */
 #else
 /*
  * Pick a reasonable default based on the "typical" spacing described in the
  * "CP0 Hazards" chapter of MIPS Architecture Book Vol III.
  */
-#define	COP0_SYNC  ssnop; ssnop; ssnop; ssnop; ssnop
+#define	COP0_SYNC  ssnop; ssnop; ssnop; ssnop; .word 0xc0;
 #endif
 #define	COP0_HAZARD_FPUENABLE	nop; nop; nop; nop;
 
diff --git a/sys/mips/include/pcb.h b/sys/mips/include/pcb.h
index 13cc2559f77..fa84a7d33f4 100644
--- a/sys/mips/include/pcb.h
+++ b/sys/mips/include/pcb.h
@@ -60,6 +60,61 @@
 #define	PCB_REG_GP	12
 #define	PCB_REG_PC	13
 
+/*
+ * Call ast if required
+ *
+ * XXX Do we really need to disable interrupts?
+ */
+#define DO_AST				             \
+44:				                     \
+	mfc0	t0, MIPS_COP_0_STATUS               ;\
+	and	a0, t0, MIPS_SR_INT_IE              ;\
+	xor	t0, a0, t0                          ;\
+	mtc0	t0, MIPS_COP_0_STATUS               ;\
+	COP0_SYNC                                   ;\
+	GET_CPU_PCPU(s1)                            ;\
+	PTR_L	s3, PC_CURPCB(s1)                   ;\
+	PTR_L	s1, PC_CURTHREAD(s1)                ;\
+	lw	s2, TD_FLAGS(s1)                    ;\
+	li	s0, TDF_ASTPENDING | TDF_NEEDRESCHED;\
+	and	s2, s0                              ;\
+	mfc0	t0, MIPS_COP_0_STATUS               ;\
+	or	t0, a0, t0                          ;\
+	mtc0	t0, MIPS_COP_0_STATUS               ;\
+	COP0_SYNC                                   ;\
+	beq	s2, zero, 4f                        ;\
+	nop                                         ;\
+	PTR_LA	s0, _C_LABEL(ast)                   ;\
+	jalr	s0                                  ;\
+	PTR_ADDU a0, s3, U_PCB_REGS                 ;\
+	j	44b		                    ;\
+        nop                                         ;\
+4:
+
+#define	SAVE_U_PCB_REG(reg, offs, base) \
+	REG_S	reg, U_PCB_REGS + (SZREG * offs) (base)
+
+#define	RESTORE_U_PCB_REG(reg, offs, base) \
+	REG_L	reg, U_PCB_REGS + (SZREG * offs) (base)
+
+#define	SAVE_U_PCB_FPREG(reg, offs, base) \
+	FP_S	reg, U_PCB_FPREGS + (SZFPREG * offs) (base)
+
+#define	RESTORE_U_PCB_FPREG(reg, offs, base) \
+	FP_L	reg, U_PCB_FPREGS + (SZFPREG * offs) (base)
+
+#define	SAVE_U_PCB_FPSR(reg, offs, base) \
+	REG_S	reg, U_PCB_FPREGS + (SZFPREG * offs) (base)
+
+#define	RESTORE_U_PCB_FPSR(reg, offs, base) \
+	REG_L	reg, U_PCB_FPREGS + (SZFPREG * offs) (base)
+
+#define	SAVE_U_PCB_CONTEXT(reg, offs, base) \
+	REG_S	reg, U_PCB_CONTEXT + (SZREG * offs) (base)
+
+#define	RESTORE_U_PCB_CONTEXT(reg, offs, base) \
+	REG_L	reg, U_PCB_CONTEXT + (SZREG * offs) (base)
+
 #ifndef LOCORE
 #include <machine/frame.h>
 
@@ -79,6 +134,7 @@ extern struct pcb *curpcb;		/* the current running pcb */
 
 void makectx(struct trapframe *, struct pcb *);
 int savectx(struct pcb *) __returns_twice;
+
 #endif
 #endif
 
diff --git a/sys/mips/include/pte.h b/sys/mips/include/pte.h
index c798eeef512..2f2f995d764 100644
--- a/sys/mips/include/pte.h
+++ b/sys/mips/include/pte.h
@@ -56,19 +56,30 @@ typedef	pt_entry_t *pd_entry_t;
 #define	TLBMASK_MASK	((PAGE_MASK >> TLBMASK_SHIFT) << TLBMASK_SHIFT)
 
 /*
- * PFN for EntryLo register.  Upper bits are 0, which is to say that
- * bit 28 is the last hardware bit;  Bits 29 and upwards (EntryLo is
- * 64 bit though it can be referred to in 32-bits providing 3 software
- * bits safely.  We use it as 64 bits to get many software bits, and
- * god knows what else.) are unacknowledged by hardware.  They may be
- * written as anything, but otherwise they have as much meaning as
- * other 0 fields.
+ * FreeBSD/mips page-table entries take a near-identical format to MIPS TLB
+ * entries, each consisting of two 32-bit or 64-bit values ("EntryHi" and
+ * "EntryLo").  MIPS4k and MIPS64 both define certain bits in TLB entries as
+ * reserved, and these must be zero-filled by software.  We overload these
+ * bits in PTE entries to hold  PTE_ flags such as RO, W, and MANAGED.
+ * However, we must mask these out when writing to TLB entries to ensure that
+ * they do not become visible to hardware -- especially on MIPS64r2 which has
+ * an extended physical memory space.
+ *
+ * When using n64 and n32, shift software-defined bits into the MIPS64r2
+ * reserved range, which runs from bit 55 ... 63.  In other configurations
+ * (32-bit MIPS4k and compatible), shift them out to bits 29 ... 31.
+ *
+ * NOTE: This means that for 32-bit use of CP0, we aren't able to set the top
+ * bit of PFN to a non-zero value, as software is using it!  This physical
+ * memory size limit may not be sufficiently enforced elsewhere.
  */
 #if defined(__mips_n64) || defined(__mips_n32) /*  PHYSADDR_64_BIT */
-#define	TLBLO_SWBITS_SHIFT	(34)
+#define	TLBLO_SWBITS_SHIFT	(55)
+#define	TLBLO_SWBITS_CLEAR_SHIFT	(9)
 #define	TLBLO_PFN_MASK		0x3FFFFFFC0ULL
 #else
 #define	TLBLO_SWBITS_SHIFT	(29)
+#define	TLBLO_SWBITS_CLEAR_SHIFT	(3)
 #define	TLBLO_PFN_MASK		(0x1FFFFFC0)
 #endif
 #define	TLBLO_PFN_SHIFT		(6)
@@ -133,6 +144,9 @@ typedef	pt_entry_t *pd_entry_t;
  * 		listen to requests to write to it.
  * 	W:	Wired.  ???
  *	MANAGED:Managed.  This PTE maps a managed page.
+ *
+ * These bits should not be written into the TLB, so must first be masked out
+ * explicitly in C, or using CLEAR_PTE_SWBITS() in assembly.
  */
 #define	PTE_RO			((pt_entry_t)0x01 << TLBLO_SWBITS_SHIFT)
 #define	PTE_W			((pt_entry_t)0x02 << TLBLO_SWBITS_SHIFT)
@@ -162,7 +176,7 @@ typedef	pt_entry_t *pd_entry_t;
 #define	PTESIZE			4
 #define	PTE_L			lw
 #define	PTE_MTC0		mtc0
-#define	CLEAR_PTE_SWBITS(r)	sll r, 3; srl r, 3 /* remove 3 high bits */
+#define	CLEAR_PTE_SWBITS(r)	LONG_SLL r, TLBLO_SWBITS_CLEAR_SHIFT; LONG_SRL r, TLBLO_SWBITS_CLEAR_SHIFT /* remove swbits */
 #endif /* defined(__mips_n64) || defined(__mips_n32) */
 
 #if defined(__mips_n64)
diff --git a/sys/mips/include/vmparam.h b/sys/mips/include/vmparam.h
index 4e1f03c5518..8922924faa7 100644
--- a/sys/mips/include/vmparam.h
+++ b/sys/mips/include/vmparam.h
@@ -108,22 +108,23 @@
 #define	VM_NRESERVLEVEL		0
 #endif
 
-/* virtual sizes (bytes) for various kernel submaps */
-#ifndef VM_KMEM_SIZE
-#define	VM_KMEM_SIZE		(12 * 1024 * 1024)
-#endif
-
 /*
- * How many physical pages per KVA page allocated.
- * min(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE), VM_KMEM_SIZE_MAX)
- * is the total KVA space allocated for kmem_map.
+ * How many physical pages per kmem arena virtual page.
  */
 #ifndef VM_KMEM_SIZE_SCALE
 #define	VM_KMEM_SIZE_SCALE	(3)
 #endif
 
 /*
- * Ceiling on the amount of kmem_map KVA space: 40% of the entire KVA space.
+ * Optional floor (in bytes) on the size of the kmem arena.
+ */
+#ifndef VM_KMEM_SIZE_MIN
+#define	VM_KMEM_SIZE_MIN	(12 * 1024 * 1024)
+#endif
+
+/*
+ * Optional ceiling (in bytes) on the size of the kmem arena: 40% of the
+ * kernel map.
  */
 #ifndef VM_KMEM_SIZE_MAX
 #define	VM_KMEM_SIZE_MAX	((VM_MAX_KERNEL_ADDRESS - \
diff --git a/sys/mips/malta/gt.c b/sys/mips/malta/gt.c
index ce320c98aa8..b9cff7d33af 100644
--- a/sys/mips/malta/gt.c
+++ b/sys/mips/malta/gt.c
@@ -51,7 +51,7 @@ static int
 gt_probe(device_t dev)
 {
 	device_set_desc(dev, "GT64120 chip");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static void
diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c
index f9d8b83465c..3acc9b05bdf 100644
--- a/sys/mips/malta/gt_pci.c
+++ b/sys/mips/malta/gt_pci.c
@@ -448,7 +448,7 @@ gt_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg,
 
 	/* Clear cause register bits. */
 	GT_REGVAL(GT_INTR_CAUSE) = GT_PCI_DATA(0);
-	GT_REGVAL(GT_PCI0_CFG_ADDR) = GT_PCI_DATA((1 << 31) | addr);
+	GT_REGVAL(GT_PCI0_CFG_ADDR) = GT_PCI_DATA((1U << 31) | addr);
 	/* 
 	 * Galileo system controller is special
 	 */
@@ -555,7 +555,7 @@ gt_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg,
 	/* Clear cause register bits. */
 	GT_REGVAL(GT_INTR_CAUSE) = GT_PCI_DATA(0);
 
-	GT_REGVAL(GT_PCI0_CFG_ADDR) = GT_PCI_DATA((1 << 31) | addr);
+	GT_REGVAL(GT_PCI0_CFG_ADDR) = GT_PCI_DATA((1U << 31) | addr);
 
 	/* 
 	 * Galileo system controller is special
diff --git a/sys/mips/mips/bcopy.S b/sys/mips/mips/bcopy.S
index a7ac1f2aee3..af71b0ded0c 100644
--- a/sys/mips/mips/bcopy.S
+++ b/sys/mips/mips/bcopy.S
@@ -72,8 +72,8 @@ LEAF(memcpy)
 	move	a0, a1
 	move	a1, v0
 
-ALEAF(bcopy)
-ALEAF(ovbcopy)
+XLEAF(bcopy)
+XLEAF(ovbcopy)
 	/*
 	 *	Make sure we can copy forwards.
 	 */
diff --git a/sys/mips/mips/bus_space_generic.c b/sys/mips/mips/bus_space_generic.c
index f7169b44c25..efcf5fc4cb5 100644
--- a/sys/mips/mips/bus_space_generic.c
+++ b/sys/mips/mips/bus_space_generic.c
@@ -749,4 +749,8 @@ generic_bs_barrier(void *t __unused,
 	if (flags & BUS_SPACE_BARRIER_WRITE)
 		mips_dcache_wbinv_all();
 #endif
+	if (flags & BUS_SPACE_BARRIER_READ)
+		rmb();
+	if (flags & BUS_SPACE_BARRIER_WRITE)
+		wmb();
 }
diff --git a/sys/mips/mips/busdma_machdep.c b/sys/mips/mips/busdma_machdep.c
index f3275e6bec3..823ae9cb974 100644
--- a/sys/mips/mips/busdma_machdep.c
+++ b/sys/mips/mips/busdma_machdep.c
@@ -878,6 +878,16 @@ _bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
 	return (0);
 }
 
+int
+_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
+    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+    bus_dma_segment_t *segs, int *segp)
+{
+
+	return (bus_dmamap_load_ma_triv(dmat, map, ma, tlen, ma_offs, flags,
+	    segs, segp));
+}
+
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrance, and the ending segment on exit.
diff --git a/sys/mips/mips/cache.c b/sys/mips/mips/cache.c
index 94231798374..1a1d374f0ee 100644
--- a/sys/mips/mips/cache.c
+++ b/sys/mips/mips/cache.c
@@ -116,11 +116,9 @@ mips_config_cache(struct mips_cpuinfo * cpuinfo)
 
 #ifdef MIPS_DISABLE_L1_CACHE
 	case 0:
-		mips_cache_ops.mco_icache_sync_all = cache_noop;
-		mips_cache_ops.mco_icache_sync_range =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
-		mips_cache_ops.mco_icache_sync_range_index =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
+		mips_cache_ops.mco_icache_sync_all = (void (*)(void))cache_noop;
+		mips_cache_ops.mco_icache_sync_range = cache_noop;
+		mips_cache_ops.mco_icache_sync_range_index = cache_noop;
 		break;
 #endif
 	default:
@@ -193,20 +191,16 @@ mips_config_cache(struct mips_cpuinfo * cpuinfo)
 #endif		
 #ifdef MIPS_DISABLE_L1_CACHE
 	case 0:
-		mips_cache_ops.mco_pdcache_wbinv_all = cache_noop;
-		mips_cache_ops.mco_intern_pdcache_wbinv_all = cache_noop;
-		mips_cache_ops.mco_pdcache_wbinv_range =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
-		mips_cache_ops.mco_pdcache_wbinv_range_index =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
+		mips_cache_ops.mco_pdcache_wbinv_all =
+		    mips_cache_ops.mco_intern_pdcache_wbinv_all =
+		    (void (*)(void))cache_noop;
+		mips_cache_ops.mco_pdcache_wbinv_range = cache_noop;
+		mips_cache_ops.mco_pdcache_wbinv_range_index = cache_noop;
 		mips_cache_ops.mco_intern_pdcache_wbinv_range_index =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
-		mips_cache_ops.mco_pdcache_inv_range =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
-		mips_cache_ops.mco_pdcache_wb_range =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
-		mips_cache_ops.mco_intern_pdcache_wb_range =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
+		    cache_noop;
+		mips_cache_ops.mco_pdcache_inv_range = cache_noop;
+		mips_cache_ops.mco_pdcache_wb_range = cache_noop;
+		mips_cache_ops.mco_intern_pdcache_wb_range = cache_noop;
 		break;
 #endif
 	default:
@@ -222,26 +216,22 @@ mips_config_cache(struct mips_cpuinfo * cpuinfo)
 #ifdef CACHE_DEBUG
 		printf("  Dcache is coherent\n");
 #endif
-		mips_cache_ops.mco_pdcache_wbinv_all = cache_noop;
-		mips_cache_ops.mco_pdcache_wbinv_range =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
-		mips_cache_ops.mco_pdcache_wbinv_range_index =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
-		mips_cache_ops.mco_pdcache_inv_range =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
-		mips_cache_ops.mco_pdcache_wb_range =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
+		mips_cache_ops.mco_pdcache_wbinv_all = 
+		    (void (*)(void))cache_noop;
+		mips_cache_ops.mco_pdcache_wbinv_range = cache_noop;
+		mips_cache_ops.mco_pdcache_wbinv_range_index = cache_noop;
+		mips_cache_ops.mco_pdcache_inv_range = cache_noop;
+		mips_cache_ops.mco_pdcache_wb_range = cache_noop;
 	}
 	if (mips_cpu_flags & CPU_MIPS_I_D_CACHE_COHERENT) {
 #ifdef CACHE_DEBUG
 		printf("  Icache is coherent against Dcache\n");
 #endif
 		mips_cache_ops.mco_intern_pdcache_wbinv_all =
-		    cache_noop;
+		    (void (*)(void))cache_noop;
 		mips_cache_ops.mco_intern_pdcache_wbinv_range_index =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
-		mips_cache_ops.mco_intern_pdcache_wb_range =
-		    (void (*)(vaddr_t, vsize_t))cache_noop;
+		    cache_noop;
+		mips_cache_ops.mco_intern_pdcache_wb_range = cache_noop;
 	}
 #endif
 
diff --git a/sys/mips/mips/cpu.c b/sys/mips/mips/cpu.c
index da13ca45c86..c31cd5b5a82 100644
--- a/sys/mips/mips/cpu.c
+++ b/sys/mips/mips/cpu.c
@@ -99,23 +99,38 @@ mips_get_identity(struct mips_cpuinfo *cpuinfo)
 
 	/* Learn TLB size and L1 cache geometry. */
 	cfg1 = mips_rd_config1();
-#ifndef CPU_NLM
-	cpuinfo->tlb_nentries = 
-	    ((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1;
-#else
+
+#if defined(CPU_NLM)
 	/* Account for Extended TLB entries in XLP */
 	tmp = mips_rd_config6();
 	cpuinfo->tlb_nentries = ((tmp >> 16) & 0xffff) + 1;
+#elif defined(BERI_LARGE_TLB)
+	/* Check if we support extended TLB entries and if so activate. */
+	tmp = mips_rd_config5();
+#define	BERI_CP5_LTLB_SUPPORTED	0x1
+	if (tmp & BERI_CP5_LTLB_SUPPORTED) {
+		/* See how many extra TLB entries we have. */
+		tmp = mips_rd_config6();
+		cpuinfo->tlb_nentries = (tmp >> 16) + 1;
+		/* Activate the extended entries. */
+		mips_wr_config6(tmp|0x4);
+	} else
+#endif
+#if !defined(CPU_NLM)
+	cpuinfo->tlb_nentries = 
+	    ((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1;
 #endif
-
-	/* Add extended TLB size information from config4.  */
 #if defined(CPU_CNMIPS)
+	/* Add extended TLB size information from config4.  */
 	cfg4 = mips_rd_config4();
 	if ((cfg4 & MIPS_CONFIG4_MMUEXTDEF) == MIPS_CONFIG4_MMUEXTDEF_MMUSIZEEXT)
 		cpuinfo->tlb_nentries += (cfg4 & MIPS_CONFIG4_MMUSIZEEXT) * 0x40;
 #endif
 
 	/* L1 instruction cache. */
+#ifdef MIPS_DISABLE_L1_CACHE
+	cpuinfo->l1.ic_linesize = 0;
+#else
 	tmp = (cfg1 & MIPS_CONFIG1_IL_MASK) >> MIPS_CONFIG1_IL_SHIFT;
 	if (tmp != 0) {
 		cpuinfo->l1.ic_linesize = 1 << (tmp + 1);
@@ -123,9 +138,13 @@ mips_get_identity(struct mips_cpuinfo *cpuinfo)
 		cpuinfo->l1.ic_nsets = 
 	    		1 << (((cfg1 & MIPS_CONFIG1_IS_MASK) >> MIPS_CONFIG1_IS_SHIFT) + 6);
 	}
+#endif
 
-#ifndef CPU_CNMIPS
 	/* L1 data cache. */
+#ifdef MIPS_DISABLE_L1_CACHE
+	cpuinfo->l1.dc_linesize = 0;
+#else
+#ifndef CPU_CNMIPS
 	tmp = (cfg1 & MIPS_CONFIG1_DL_MASK) >> MIPS_CONFIG1_DL_SHIFT;
 	if (tmp != 0) {
 		cpuinfo->l1.dc_linesize = 1 << (tmp + 1);
@@ -160,6 +179,7 @@ mips_get_identity(struct mips_cpuinfo *cpuinfo)
 
 	/* All Octeon models use 128 byte line size.  */
 	cpuinfo->l1.dc_linesize = 128;
+#endif
 #endif
 
 	cpuinfo->l1.ic_size = cpuinfo->l1.ic_linesize
diff --git a/sys/mips/mips/elf_trampoline.c b/sys/mips/mips/elf_trampoline.c
index 7d8324a733b..7be26bbe62b 100644
--- a/sys/mips/mips/elf_trampoline.c
+++ b/sys/mips/mips/elf_trampoline.c
@@ -32,10 +32,6 @@ __FBSDID("$FreeBSD$");
 #else
 #include <sys/elf32.h>
 #endif
-#include <sys/inflate.h>
-#include <machine/elf.h>
-#include <machine/cpufunc.h>
-#include <machine/stdarg.h>
 
 /*
  * Since we are compiled outside of the normal kernel build process, we
@@ -43,6 +39,11 @@ __FBSDID("$FreeBSD$");
  */
 #include "opt_global.h"
 
+#include <sys/inflate.h>
+#include <machine/elf.h>
+#include <machine/cpufunc.h>
+#include <machine/stdarg.h>
+
 #ifndef KERNNAME
 #error Kernel name not provided
 #endif
diff --git a/sys/mips/mips/exception.S b/sys/mips/mips/exception.S
index 50da30b572f..6eddd19af88 100644
--- a/sys/mips/mips/exception.S
+++ b/sys/mips/mips/exception.S
@@ -55,12 +55,13 @@
  */
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
+
 #include <machine/asm.h>
 #include <machine/cpu.h>
 #include <machine/regnum.h>
 #include <machine/cpuregs.h>
 #include <machine/pte.h>
+#include <machine/pcb.h>
 
 #include "assym.s"
 
@@ -376,7 +377,7 @@ SlowFault:
 #define	KERN_REG_SIZE		(NUMSAVEREGS * SZREG)
 #define	KERN_EXC_FRAME_SIZE	(CALLFRAME_SIZ + KERN_REG_SIZE + 16)
 
-NNON_LEAF(MipsKernGenException, KERN_EXC_FRAME_SIZE, ra)
+NESTED_NOPROFILE(MipsKernGenException, KERN_EXC_FRAME_SIZE, ra)
 	.set	noat
 	PTR_SUBU	sp, sp, KERN_EXC_FRAME_SIZE
 	.mask	0x80000000, (CALLFRAME_RA - KERN_EXC_FRAME_SIZE)
@@ -411,12 +412,6 @@ NNON_LEAF(MipsKernGenException, KERN_EXC_FRAME_SIZE, ra)
 END(MipsKernGenException)
 
 
-#define	SAVE_U_PCB_REG(reg, offs, base) \
-	REG_S	reg, U_PCB_REGS + (SZREG * offs) (base)
-
-#define	RESTORE_U_PCB_REG(reg, offs, base) \
-	REG_L	reg, U_PCB_REGS + (SZREG * offs) (base)
-
 /*----------------------------------------------------------------------------
  *
  * MipsUserGenException --
@@ -431,7 +426,7 @@ END(MipsKernGenException)
  *
  *----------------------------------------------------------------------------
  */
-NNON_LEAF(MipsUserGenException, CALLFRAME_SIZ, ra)
+NESTED_NOPROFILE(MipsUserGenException, CALLFRAME_SIZ, ra)
 	.set	noat
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 /*
@@ -578,7 +573,7 @@ END(MipsUserGenException)
 
 	.set	push
 	.set	noat
-NON_LEAF(mips_wait, CALLFRAME_SIZ, ra)
+NESTED(mips_wait, CALLFRAME_SIZ, ra)
 	PTR_SUBU        sp, sp, CALLFRAME_SIZ
 	.mask   0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	REG_S   ra, CALLFRAME_RA(sp)		# save RA
@@ -620,7 +615,7 @@ END(mips_wait)
  *----------------------------------------------------------------------------
  */
 
-NNON_LEAF(MipsKernIntr, KERN_EXC_FRAME_SIZE, ra)
+NESTED_NOPROFILE(MipsKernIntr, KERN_EXC_FRAME_SIZE, ra)
 	.set	noat
 	PTR_SUBU	sp, sp, KERN_EXC_FRAME_SIZE
 	.mask	0x80000000, (CALLFRAME_RA - KERN_EXC_FRAME_SIZE)
@@ -687,7 +682,7 @@ END(MipsKernIntr)
  *
  *----------------------------------------------------------------------------
  */
-NNON_LEAF(MipsUserIntr, CALLFRAME_SIZ, ra)
+NESTED_NOPROFILE(MipsUserIntr, CALLFRAME_SIZ, ra)
 	.set	noat
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 /*
@@ -843,7 +838,7 @@ NNON_LEAF(MipsUserIntr, CALLFRAME_SIZ, ra)
 	.set	at
 END(MipsUserIntr)
 
-NLEAF(MipsTLBInvalidException)
+LEAF_NOPROFILE(MipsTLBInvalidException)
 	.set push
 	.set noat
 	.set noreorder
@@ -1034,7 +1029,7 @@ END(MipsTLBInvalidException)
  *
  *----------------------------------------------------------------------------
  */
-NLEAF(MipsTLBMissException)
+LEAF_NOPROFILE(MipsTLBMissException)
 	.set	noat
 	MFC0		k0, MIPS_COP_0_BAD_VADDR	# k0=bad address
 	PTR_LI		k1, VM_MAX_KERNEL_ADDRESS	# check fault address against
@@ -1093,7 +1088,7 @@ END(MipsTLBMissException)
  *
  *----------------------------------------------------------------------------
  */
-NON_LEAF(MipsFPTrap, CALLFRAME_SIZ, ra)
+NESTED(MipsFPTrap, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	mfc0	t0, MIPS_COP_0_STATUS
 	REG_S	ra, CALLFRAME_RA(sp)
diff --git a/sys/mips/mips/fp.S b/sys/mips/mips/fp.S
index 3190f117ae4..78556fe3580 100644
--- a/sys/mips/mips/fp.S
+++ b/sys/mips/mips/fp.S
@@ -94,7 +94,7 @@
  *
  *----------------------------------------------------------------------------
  */
-NON_LEAF(MipsEmulateFP, CALLFRAME_SIZ, ra)
+NESTED(MipsEmulateFP, CALLFRAME_SIZ, ra)
 	subu	sp, sp, CALLFRAME_SIZ
 	sw	ra, CALLFRAME_RA(sp)
 /*
@@ -2460,7 +2460,7 @@ get_ft_s_done:
  *
  *----------------------------------------------------------------------------
  */
-ALEAF(get_fs_s)
+XLEAF(get_fs_s)
 	srl	a3, a0, 12 - 2			# get FS field (even regs only)
 	and	a3, a3, 0xF << 2		# mask FS field
 	lw	a3, get_fs_s_tbl(a3)		# switch on register number
@@ -2679,7 +2679,7 @@ get_ft_d_done:
  *
  *----------------------------------------------------------------------------
  */
-ALEAF(get_fs_d)
+XLEAF(get_fs_d)
 	srl	a3, a0, 12 - 2			# get FS field (even regs only)
 	and	a3, a3, 0xF << 2		# mask FS field
 	lw	a3, get_fs_d_tbl(a3)		# switch on register number
@@ -3194,7 +3194,7 @@ LEAF(set_fd_s)
 	sll	t1, t1, 23			# position exponent
 	or	t2, t2, t0
 	or	t2, t2, t1
-ALEAF(set_fd_word)
+XLEAF(set_fd_word)
 	srl	a3, a0, 7 - 2			# get FD field (even regs only)
 	and	a3, a3, 0xF << 2		# mask FT field
 	lw	a3, set_fd_s_tbl(a3)		# switch on register number
diff --git a/sys/mips/mips/nexus.c b/sys/mips/mips/nexus.c
index 47b8c198dfe..ecf315dad67 100644
--- a/sys/mips/mips/nexus.c
+++ b/sys/mips/mips/nexus.c
@@ -58,6 +58,12 @@ __FBSDID("$FreeBSD$");
 #include <machine/resource.h>
 #include <machine/vmparam.h>
 
+#include "opt_platform.h"
+
+#ifdef FDT
+#include <dev/ofw/ofw_nexus.h>
+#endif
+
 #undef NEXUS_DEBUG
 #ifdef NEXUS_DEBUG
 #define dprintf printf
@@ -65,6 +71,9 @@ __FBSDID("$FreeBSD$");
 #define dprintf(x, arg...)
 #endif  /* NEXUS_DEBUG */
 
+#define NUM_MIPS_IRQS	6
+
+#ifndef FDT
 static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device");
 
 struct nexus_device {
@@ -72,7 +81,6 @@ struct nexus_device {
 };
 
 #define DEVTONX(dev)	((struct nexus_device *)device_get_ivars(dev))
-#define NUM_MIPS_IRQS	6
 
 static struct rman irq_rman;
 static struct rman mem_rman;
@@ -80,18 +88,13 @@ static struct rman mem_rman;
 static struct resource *
 		nexus_alloc_resource(device_t, device_t, int, int *, u_long,
 		    u_long, u_long, u_int);
-static int	nexus_activate_resource(device_t, device_t, int, int,
-		    struct resource *);
 static device_t	nexus_add_child(device_t, u_int, const char *, int);
 static int	nexus_attach(device_t);
-static int	nexus_deactivate_resource(device_t, device_t, int, int,
-		    struct resource *);
 static void	nexus_delete_resource(device_t, device_t, int, int);
 static struct resource_list *
 		nexus_get_reslist(device_t, device_t);
 static int	nexus_get_resource(device_t, device_t, int, int, u_long *,
 		    u_long *);
-static void	nexus_hinted_child(device_t, const char *, int);
 static int	nexus_print_child(device_t, device_t);
 static int	nexus_print_all_resources(device_t dev);
 static int	nexus_probe(device_t);
@@ -99,6 +102,12 @@ static int	nexus_release_resource(device_t, device_t, int, int,
 		    struct resource *);
 static int	nexus_set_resource(device_t, device_t, int, int, u_long,
 		    u_long);
+#endif
+static int	nexus_activate_resource(device_t, device_t, int, int,
+		    struct resource *);
+static int	nexus_deactivate_resource(device_t, device_t, int, int,
+		    struct resource *);
+static void	nexus_hinted_child(device_t, const char *, int);
 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);
@@ -106,35 +115,43 @@ static int	nexus_teardown_intr(device_t, device_t, struct resource *,
 		    void *);
 
 static device_method_t nexus_methods[] = {
+#ifndef FDT
 	/* Device interface */
 	DEVMETHOD(device_probe,		nexus_probe),
 	DEVMETHOD(device_attach,	nexus_attach),
 
 	/* Bus interface */
 	DEVMETHOD(bus_add_child,	nexus_add_child),
-	DEVMETHOD(bus_activate_resource,nexus_activate_resource),
 	DEVMETHOD(bus_alloc_resource,	nexus_alloc_resource),
-	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
 	DEVMETHOD(bus_delete_resource,	nexus_delete_resource),
 	DEVMETHOD(bus_get_resource,	nexus_get_resource),
 	DEVMETHOD(bus_get_resource_list,	nexus_get_reslist),
-	DEVMETHOD(bus_hinted_child,	nexus_hinted_child),
 	DEVMETHOD(bus_print_child,	nexus_print_child),
 	DEVMETHOD(bus_release_resource,	nexus_release_resource),
 	DEVMETHOD(bus_set_resource,	nexus_set_resource),
+#endif
 	DEVMETHOD(bus_setup_intr,	nexus_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	nexus_teardown_intr),
+	DEVMETHOD(bus_activate_resource,nexus_activate_resource),
+	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
+	DEVMETHOD(bus_hinted_child,	nexus_hinted_child),
 
 	{ 0, 0 }
 };
 
+#ifndef FDT
 static driver_t nexus_driver = {
 	"nexus",
 	nexus_methods,
 	1			/* no softc */
 };
+#else
+DEFINE_CLASS_1(nexus, nexus_driver, nexus_methods,
+    sizeof(struct ofw_nexus_softc), ofw_nexus_driver);
+#endif
 static devclass_t nexus_devclass;
 
+#ifndef FDT
 static int
 nexus_probe(device_t dev)
 {
@@ -162,34 +179,6 @@ nexus_probe(device_t dev)
 	return (0);
 }
 
-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)
-{
-	register_t s;
-	int irq;
-
-	s = intr_disable();
-	irq = rman_get_start(res);
-	if (irq >= NUM_MIPS_IRQS) {
-		intr_restore(s);
-		return (0);
-	}
-
-	cpu_establish_hardintr(device_get_nameunit(child), filt, intr, arg,
-	    irq, flags, cookiep);
-	intr_restore(s);
-	return (0);
-}
-
-static int
-nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
-{
-
-	printf("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__);
-	return (0);
-}
-
 static int
 nexus_attach(device_t dev)
 {
@@ -231,59 +220,6 @@ nexus_print_all_resources(device_t dev)
 	return (retval);
 }
 
-static void
-nexus_hinted_child(device_t bus, const char *dname, int dunit)
-{
-	device_t child;
-	long	maddr;
-	int	msize;
-	int	order;
-	int	result;
-	int	irq;
-	int	mem_hints_count;
-
-	if ((resource_int_value(dname, dunit, "order", &order)) != 0)
-		order = 1000;
-	child = BUS_ADD_CHILD(bus, order, dname, dunit);
-	if (child == NULL)
-		return;
-
-	/*
-	 * Set hard-wired resources for hinted child using
-	 * specific RIDs.
-	 */
-	mem_hints_count = 0;
-	if (resource_long_value(dname, dunit, "maddr", &maddr) == 0)
-		mem_hints_count++;
-	if (resource_int_value(dname, dunit, "msize", &msize) == 0)
-		mem_hints_count++;
-
-	/* check if all info for mem resource has been provided */
-	if ((mem_hints_count > 0) && (mem_hints_count < 2)) {
-		printf("Either maddr or msize hint is missing for %s%d\n",
-		    dname, dunit);
-	} 
-	else if (mem_hints_count) {
-		dprintf("%s: discovered hinted child %s at maddr %p(%d)\n",
-		    __func__, device_get_nameunit(child),
-		    (void *)(intptr_t)maddr, msize);
-
-		result = bus_set_resource(child, SYS_RES_MEMORY, 0, maddr, 
-		    msize);
-		if (result != 0) {
-			device_printf(bus, 
-			    "warning: bus_set_resource() failed\n");
-		}
-	}
-
-	if (resource_int_value(dname, dunit, "irq", &irq) == 0) {
-		result = bus_set_resource(child, SYS_RES_IRQ, 0, irq, 1);
-		if (result != 0)
-			device_printf(bus,
-			    "warning: bus_set_resource() failed\n");
-	}
-}
-
 static device_t
 nexus_add_child(device_t bus, u_int order, const char *name, int unit)
 {
@@ -381,30 +317,6 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 	return (rv);
 }
 
-static int
-nexus_activate_resource(device_t bus, device_t child, int type, int rid,
-    struct resource *r)
-{
-	void *vaddr;
-	vm_paddr_t paddr;
-	vm_size_t psize;
-
-	/*
-	 * If this is a memory resource, use pmap_mapdev to map it.
-	 */
-	if (type == SYS_RES_MEMORY) {
-		paddr = rman_get_start(r);
-		psize = rman_get_size(r);
-		vaddr = pmap_mapdev(paddr, psize);
-
-		rman_set_virtual(r, vaddr);
-		rman_set_bustag(r, mips_bus_space_generic);
-		rman_set_bushandle(r, (bus_space_handle_t)(uintptr_t)vaddr);
-	}
-
-	return (rman_activate_resource(r));
-}
-
 static struct resource_list *
 nexus_get_reslist(device_t dev, device_t child)
 {
@@ -475,6 +387,31 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid,
 
 	return (rman_release_resource(r));
 }
+#endif
+
+static int
+nexus_activate_resource(device_t bus, device_t child, int type, int rid,
+    struct resource *r)
+{
+	void *vaddr;
+	vm_paddr_t paddr;
+	vm_size_t psize;
+
+	/*
+	 * If this is a memory resource, use pmap_mapdev to map it.
+	 */
+	if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
+		paddr = rman_get_start(r);
+		psize = rman_get_size(r);
+		vaddr = pmap_mapdev(paddr, psize);
+
+		rman_set_virtual(r, vaddr);
+		rman_set_bustag(r, mips_bus_space_generic);
+		rman_set_bushandle(r, (bus_space_handle_t)(uintptr_t)vaddr);
+	}
+
+	return (rman_activate_resource(r));
+}
 
 static int
 nexus_deactivate_resource(device_t bus, device_t child, int type, int rid,
@@ -490,4 +427,85 @@ nexus_deactivate_resource(device_t bus, device_t child, int type, int rid,
 	return (rman_deactivate_resource(r));
 }
 
+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)
+{
+	register_t s;
+	int irq;
+
+	s = intr_disable();
+	irq = rman_get_start(res);
+	if (irq >= NUM_MIPS_IRQS) {
+		intr_restore(s);
+		return (0);
+	}
+
+	cpu_establish_hardintr(device_get_nameunit(child), filt, intr, arg,
+	    irq, flags, cookiep);
+	intr_restore(s);
+	return (0);
+}
+
+static int
+nexus_teardown_intr(device_t dev, device_t child, struct resource *r, void *ih)
+{
+
+	printf("Unimplemented %s at %s:%d\n", __func__, __FILE__, __LINE__);
+	return (0);
+}
+
+static void
+nexus_hinted_child(device_t bus, const char *dname, int dunit)
+{
+	device_t child;
+	long	maddr;
+	int	msize;
+	int	order;
+	int	result;
+	int	irq;
+	int	mem_hints_count;
+
+	if ((resource_int_value(dname, dunit, "order", &order)) != 0)
+		order = 1000;
+	child = BUS_ADD_CHILD(bus, order, dname, dunit);
+	if (child == NULL)
+		return;
+
+	/*
+	 * Set hard-wired resources for hinted child using
+	 * specific RIDs.
+	 */
+	mem_hints_count = 0;
+	if (resource_long_value(dname, dunit, "maddr", &maddr) == 0)
+		mem_hints_count++;
+	if (resource_int_value(dname, dunit, "msize", &msize) == 0)
+		mem_hints_count++;
+
+	/* check if all info for mem resource has been provided */
+	if ((mem_hints_count > 0) && (mem_hints_count < 2)) {
+		printf("Either maddr or msize hint is missing for %s%d\n",
+		    dname, dunit);
+	} 
+	else if (mem_hints_count) {
+		dprintf("%s: discovered hinted child %s at maddr %p(%d)\n",
+		    __func__, device_get_nameunit(child),
+		    (void *)(intptr_t)maddr, msize);
+
+		result = bus_set_resource(child, SYS_RES_MEMORY, 0, maddr, 
+		    msize);
+		if (result != 0) {
+			device_printf(bus, 
+			    "warning: bus_set_resource() failed\n");
+		}
+	}
+
+	if (resource_int_value(dname, dunit, "irq", &irq) == 0) {
+		result = bus_set_resource(child, SYS_RES_IRQ, 0, irq, 1);
+		if (result != 0)
+			device_printf(bus,
+			    "warning: bus_set_resource() failed\n");
+	}
+}
+
 DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
diff --git a/sys/mips/mips/support.S b/sys/mips/mips/support.S
index 42800000ceb..44a5ccb3b92 100644
--- a/sys/mips/mips/support.S
+++ b/sys/mips/mips/support.S
@@ -175,7 +175,7 @@ END(copystr)
  *		u_int maxlength;
  *		u_int *lencopied;
  */
-NON_LEAF(copyinstr, CALLFRAME_SIZ, ra)
+NESTED(copyinstr, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	PTR_LA	v0, copyerr
@@ -203,7 +203,7 @@ END(copyinstr)
  *		u_int maxlength;
  *		u_int *lencopied;
  */
-NON_LEAF(copyoutstr, CALLFRAME_SIZ, ra)
+NESTED(copyoutstr, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	PTR_LA	v0, copyerr
@@ -228,7 +228,7 @@ END(copyoutstr)
  *		caddr_t *to;	(kernel destination address)
  *		unsigned len;
  */
-NON_LEAF(copyin, CALLFRAME_SIZ, ra)
+NESTED(copyin, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	PTR_LA	v0, copyerr
@@ -254,7 +254,7 @@ END(copyin)
  *		caddr_t *to;	(user destination address)
  *		unsigned len;
  */
-NON_LEAF(copyout, CALLFRAME_SIZ, ra)
+NESTED(copyout, CALLFRAME_SIZ, ra)
 	PTR_SUBU	sp, sp, CALLFRAME_SIZ
 	.mask	0x80000000, (CALLFRAME_RA - CALLFRAME_SIZ)
 	PTR_LA	v0, copyerr
@@ -288,7 +288,7 @@ END(copyerr)
  */
 #ifdef __mips_n64
 LEAF(fuword64)
-ALEAF(fuword)
+XLEAF(fuword)
 	PTR_LA	v0, fswberr
 	blt	a0, zero, fswberr	# make sure address is in user space
 	nop
@@ -303,7 +303,7 @@ END(fuword64)
 
 LEAF(fuword32)
 #ifndef __mips_n64
-ALEAF(fuword)
+XLEAF(fuword)
 #endif
 	PTR_LA	v0, fswberr
 	blt	a0, zero, fswberr	# make sure address is in user space
@@ -553,7 +553,7 @@ END(memset)
  * bzero(s1, n)
  */
 LEAF(bzero)
-ALEAF(blkclr)
+XLEAF(blkclr)
 	.set	noreorder
 	blt	a1, 12, smallclr	# small amount to clear?
 	PTR_SUBU	a3, zero, a0		# compute # bytes to word align address
diff --git a/sys/mips/mips/swtch.S b/sys/mips/mips/swtch.S
index 8fd9c8261f2..056d1f033eb 100644
--- a/sys/mips/mips/swtch.S
+++ b/sys/mips/mips/swtch.S
@@ -68,31 +68,6 @@
 
 	.set	noreorder			# Noreorder is default style!
 
-#define	SAVE_U_PCB_REG(reg, offs, base) \
-	REG_S	reg, U_PCB_REGS + (SZREG * offs) (base)
-
-#define	RESTORE_U_PCB_REG(reg, offs, base) \
-	REG_L	reg, U_PCB_REGS + (SZREG * offs) (base)
-
-#define	SAVE_U_PCB_FPREG(reg, offs, base) \
-	FP_S	reg, U_PCB_FPREGS + (SZFPREG * offs) (base)
-
-#define	RESTORE_U_PCB_FPREG(reg, offs, base) \
-	FP_L	reg, U_PCB_FPREGS + (SZFPREG * offs) (base)
-
-#define	SAVE_U_PCB_FPSR(reg, offs, base) \
-	REG_S	reg, U_PCB_FPREGS + (SZFPREG * offs) (base)
-
-#define	RESTORE_U_PCB_FPSR(reg, offs, base) \
-	REG_L	reg, U_PCB_FPREGS + (SZFPREG * offs) (base)
-
-#define	SAVE_U_PCB_CONTEXT(reg, offs, base) \
-	REG_S	reg, U_PCB_CONTEXT + (SZREG * offs) (base)
-
-#define	RESTORE_U_PCB_CONTEXT(reg, offs, base) \
-	REG_L	reg, U_PCB_CONTEXT + (SZREG * offs) (base)
-
-
 /*
  * Setup for and return to user.
  */
@@ -200,7 +175,7 @@ LEAF(savectx)
 	move	v0, zero
 END(savectx)
 
-NON_LEAF(cpu_throw, CALLFRAME_SIZ, ra)
+NESTED(cpu_throw, CALLFRAME_SIZ, ra)
 	mfc0	t0, MIPS_COP_0_STATUS		# t0 = saved status register
 	nop
 	nop
@@ -220,7 +195,7 @@ END(cpu_throw)
  *	a2 - mtx
  * Find the highest priority process and resume it.
  */
-NON_LEAF(cpu_switch, CALLFRAME_SIZ, ra)
+NESTED(cpu_switch, CALLFRAME_SIZ, ra)
 	mfc0	t0, MIPS_COP_0_STATUS		# t0 = saved status register
 	nop
 	nop
diff --git a/sys/mips/mips/tick.c b/sys/mips/mips/tick.c
index 1dc3e7a8efb..501e5bb7f3a 100644
--- a/sys/mips/mips/tick.c
+++ b/sys/mips/mips/tick.c
@@ -309,11 +309,8 @@ static int
 clock_probe(device_t dev)
 {
 
-	if (device_get_unit(dev) != 0)
-		panic("can't attach more clocks");
-
 	device_set_desc(dev, "Generic MIPS32 ticker");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static void
@@ -329,6 +326,9 @@ clock_attach(device_t dev)
 	struct clock_softc *sc;
 	int error;
 
+	if (device_get_unit(dev) != 0)
+		panic("can't attach more clocks");
+
 	softc = sc = device_get_softc(dev);
 	sc->intr_rid = 0;
 	sc->intr_res = bus_alloc_resource(dev,
diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c
index 9fda4ffd63c..80955307bcc 100644
--- a/sys/mips/mips/trap.c
+++ b/sys/mips/mips/trap.c
@@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_ddb.h"
 #include "opt_global.h"
 #include "opt_ktrace.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -112,9 +111,8 @@ dtrace_doubletrap_func_t	dtrace_doubletrap_func;
 systrace_probe_func_t	systrace_probe_func;
 
 /*
- * These hooks are necessary for the pid, usdt and fasttrap providers.
+ * These hooks are necessary for the pid and usdt providers.
  */
-dtrace_fasttrap_probe_ptr_t	dtrace_fasttrap_probe_ptr;
 dtrace_pid_probe_ptr_t		dtrace_pid_probe_ptr;
 dtrace_return_probe_ptr_t	dtrace_return_probe_ptr;
 #endif
@@ -639,7 +637,7 @@ trap(struct trapframe *trapframe)
 	 * function can return normally.
 	 */
 	/*
-	 * XXXDTRACE: add fasttrap and pid  probes handlers here (if ever)
+	 * XXXDTRACE: add pid probe handler here (if ever)
 	 */
 	if (!usermode) {
 		if (dtrace_trap_func != NULL && (*dtrace_trap_func)(trapframe, type))
@@ -1520,6 +1518,7 @@ log_bad_page_fault(char *msg, struct trapframe *frame, int trap_type)
 	printf("cpuid = %d\n", PCPU_GET(cpuid));
 #endif
 	switch (trap_type) {
+	case T_TLB_MOD:
 	case T_TLB_ST_MISS:
 	case T_ADDR_ERR_ST:
 		read_or_write = "write";
diff --git a/sys/mips/nlm/dev/net/nae.c b/sys/mips/nlm/dev/net/nae.c
index 9f06372885e..b3790a25268 100644
--- a/sys/mips/nlm/dev/net/nae.c
+++ b/sys/mips/nlm/dev/net/nae.c
@@ -1401,7 +1401,7 @@ nlm_nae_open_if(uint64_t nae_base, int nblock, int port_type,
 		mac_cfg1 = nlm_read_nae_reg(nae_base, conf1_reg);
 		nlm_write_nae_reg(nae_base, conf1_reg,
 		    mac_cfg1	|
-		    (1 << 31)	|	/* soft reset */
+		    (1U << 31)	|	/* soft reset */
 		    (1 << 2)	|	/* rx enable */
 		    (1));		/* tx enable */
 
@@ -1415,7 +1415,7 @@ nlm_nae_open_if(uint64_t nae_base, int nblock, int port_type,
 
 		/* clear gmac reset */
 		mac_cfg1 = nlm_read_nae_reg(nae_base, conf1_reg);
-		nlm_write_nae_reg(nae_base, conf1_reg, mac_cfg1 & ~(1 << 31));
+		nlm_write_nae_reg(nae_base, conf1_reg, mac_cfg1 & ~(1U << 31));
 
 		/* clear speed debug bit */
 		iface_ctrl3_reg = SGMII_NET_IFACE_CTRL3(nblock, iface);
diff --git a/sys/mips/nlm/dev/net/xlpge.c b/sys/mips/nlm/dev/net/xlpge.c
index 3ae114821f7..2c6cba5ec64 100644
--- a/sys/mips/nlm/dev/net/xlpge.c
+++ b/sys/mips/nlm/dev/net/xlpge.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/mips/nlm/tick.c b/sys/mips/nlm/tick.c
index b5a8c368ea3..75bedfbc8ed 100644
--- a/sys/mips/nlm/tick.c
+++ b/sys/mips/nlm/tick.c
@@ -314,11 +314,8 @@ static int
 clock_probe(device_t dev)
 {
 
-	if (device_get_unit(dev) != 0)
-		panic("can't attach more clocks");
-
 	device_set_desc(dev, "Generic MIPS32 ticker");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static void
@@ -333,6 +330,9 @@ clock_attach(device_t dev)
 {
 	struct clock_softc *sc;
 
+	if (device_get_unit(dev) != 0)
+		panic("can't attach more clocks");
+
 	softc = sc = device_get_softc(dev);
 	cpu_establish_hardintr("compare", clock_intr, NULL,
 	    sc, IRQ_TIMER, INTR_TYPE_CLK, &sc->intr_handler);
diff --git a/sys/mips/nlm/xlp_machdep.c b/sys/mips/nlm/xlp_machdep.c
index f95592e044a..6a5dcb8bf7a 100644
--- a/sys/mips/nlm/xlp_machdep.c
+++ b/sys/mips/nlm/xlp_machdep.c
@@ -150,7 +150,7 @@ xlp_setup_mmu(void)
 
 	/* Enable no-read, no-exec, large-physical-address */
 	pagegrain = mips_rd_pagegrain();
-	pagegrain |= (1 << 31)	|	/* RIE */
+	pagegrain |= (1U << 31)	|	/* RIE */
 	    (1 << 30)		|	/* XIE */
 	    (1 << 29);			/* ELPA */
 	mips_wr_pagegrain(pagegrain);
diff --git a/sys/mips/nlm/xlp_pci.c b/sys/mips/nlm/xlp_pci.c
index 23bd46cd282..71f1d196a68 100644
--- a/sys/mips/nlm/xlp_pci.c
+++ b/sys/mips/nlm/xlp_pci.c
@@ -383,8 +383,7 @@ xlp_pcib_probe(device_t dev)
 {
 
 	device_set_desc(dev, "XLP PCI bus");
-	xlp_pcib_init_resources();
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
@@ -524,6 +523,8 @@ xlp_pcib_attach(device_t dev)
 {
 	int node, link;
 
+	xlp_pcib_init_resources();
+
 	/* enable hardware swap on all nodes/links */
 	for (node = 0; node < XLP_MAX_NODES; node++)
 		for (link = 0; link < 4; link++)
diff --git a/sys/mips/rmi/dev/nlge/if_nlge.c b/sys/mips/rmi/dev/nlge/if_nlge.c
index 331064ae72a..3579fe394c1 100644
--- a/sys/mips/rmi/dev/nlge/if_nlge.c
+++ b/sys/mips/rmi/dev/nlge/if_nlge.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if_media.h>
 #include <net/bpf.h>
 #include <net/if_types.h>
+#include <net/if_var.h>
 #include <net/if_vlan_var.h>
 
 #include <netinet/in_systm.h>
diff --git a/sys/mips/rmi/iodi.c b/sys/mips/rmi/iodi.c
index 8952fcdaaf3..a286589fa35 100644
--- a/sys/mips/rmi/iodi.c
+++ b/sys/mips/rmi/iodi.c
@@ -190,7 +190,7 @@ static void iodi_identify(driver_t *, device_t);
 int
 iodi_probe(device_t dev)
 {
-	return 0;
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 void
diff --git a/sys/mips/rmi/pic.h b/sys/mips/rmi/pic.h
index 7b90eb960b1..d7e3add41bc 100644
--- a/sys/mips/rmi/pic.h
+++ b/sys/mips/rmi/pic.h
@@ -214,7 +214,7 @@ void pic_setup_intr(int picintr, int irq, uint32_t cpumask, int level)
 
 	mtx_lock_spin(&xlr_pic_lock);
 	xlr_write_reg(mmio, PIC_IRT_0(picintr), cpumask);
-	xlr_write_reg(mmio, PIC_IRT_1(picintr), ((1 << 31) | (level << 30) |
+	xlr_write_reg(mmio, PIC_IRT_1(picintr), ((1U << 31) | (level << 30) |
 	    (1 << 6) | irq));
 	mtx_unlock_spin(&xlr_pic_lock);
 }
diff --git a/sys/mips/rmi/tick.c b/sys/mips/rmi/tick.c
index adc8c89fb42..3b22795b994 100644
--- a/sys/mips/rmi/tick.c
+++ b/sys/mips/rmi/tick.c
@@ -311,11 +311,8 @@ static int
 clock_probe(device_t dev)
 {
 
-	if (device_get_unit(dev) != 0)
-		panic("can't attach more clocks");
-
 	device_set_desc(dev, "Generic MIPS32 ticker");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static void
@@ -330,6 +327,9 @@ clock_attach(device_t dev)
 {
 	struct clock_softc *sc;
 
+	if (device_get_unit(dev) != 0)
+		panic("can't attach more clocks");
+
 	softc = sc = device_get_softc(dev);
 	cpu_establish_hardintr("compare", clock_intr, NULL,
 	    sc, IRQ_TIMER, INTR_TYPE_CLK, &sc->intr_handler);
diff --git a/sys/mips/rt305x/obio.c b/sys/mips/rt305x/obio.c
index 870afea80e9..fd9132a47b8 100644
--- a/sys/mips/rt305x/obio.c
+++ b/sys/mips/rt305x/obio.c
@@ -148,7 +148,7 @@ static int
 obio_probe(device_t dev)
 {
 
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/mips/sibyte/sb_zbbus.c b/sys/mips/sibyte/sb_zbbus.c
index e166b8f2661..b96409b714a 100644
--- a/sys/mips/sibyte/sb_zbbus.c
+++ b/sys/mips/sibyte/sb_zbbus.c
@@ -207,7 +207,7 @@ zbbus_probe(device_t dev)
 {
 
 	device_set_desc(dev, "Broadcom/Sibyte ZBbus");
-	return (0);
+	return (BUS_PROBE_NOWILDCARD);
 }
 
 static int
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 8e7c895da83..6de63c168cf 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -532,7 +532,9 @@ _opensolaris=	opensolaris
 _pccard=	pccard
 _pcfclock=	pcfclock
 _pst=		pst
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _rdma=		rdma
+.endif
 _safe=		safe
 _sbni=		sbni
 _scsi_low=	scsi_low
@@ -583,6 +585,7 @@ _hptmv=		hptmv
 _hptnr=		hptnr
 _hptrr=		hptrr
 .endif
+_hyperv=	hyperv
 _ichwd=		ichwd
 _ida=		ida
 _iir=		iir
@@ -743,7 +746,9 @@ _pccard=	pccard
 _qlxge=		qlxge
 _qlxgb=		qlxgb
 _qlxgbe=	qlxgbe
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _rdma=		rdma
+.endif
 _s3=		s3
 _safe=		safe
 _scsi_low=	scsi_low
diff --git a/sys/modules/aic7xxx/Makefile b/sys/modules/aic7xxx/Makefile
index 47550f0de2c..08567a62452 100644
--- a/sys/modules/aic7xxx/Makefile
+++ b/sys/modules/aic7xxx/Makefile
@@ -1,6 +1,6 @@
 
 # $FreeBSD$
 
-SUBDIR= aicasm ahc ahd
+SUBDIR= ahc ahd
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile
index 66780d8ccaa..b69fbaf8328 100644
--- a/sys/modules/aic7xxx/ahc/Makefile
+++ b/sys/modules/aic7xxx/ahc/Makefile
@@ -15,13 +15,10 @@ REG_PRINT_OPT= -p aic7xxx_reg_print.c
 .endif
 BEFORE_DEPEND = ${GENSRCS}
 
-../aicasm/aicasm: ${.CURDIR}/../../../dev/aci7xxx/aicasm/*.[chyl]
-	( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
-
 ${GENSRCS}:								 \
 		${.CURDIR}/../../../dev/aic7xxx/aic7xxx.{reg,seq}	 \
-		${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm
-	../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi	 \
+		${.CURDIR}/../../../cam/scsi/scsi_message.h 
+	aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi	 \
 			-I${.CURDIR}/../../../dev/aic7xxx		 \
 			-o aic7xxx_seq.h -r aic7xxx_reg.h		 \
 			${REG_PRINT_OPT}				 \
diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile
index 77885c78c75..b1e790063ef 100644
--- a/sys/modules/aic7xxx/ahd/Makefile
+++ b/sys/modules/aic7xxx/ahd/Makefile
@@ -15,13 +15,10 @@ REG_PRINT_OPT= -p aic79xx_reg_print.c
 .endif
 BEFORE_DEPEND= ${GENSRCS}
 
-../aicasm/aicasm: ${.CURDIR}/../../../dev/aic7xxx/aicasm/*.[chyl]
-	( cd ${.CURDIR}/../aicasm; ${MAKE} aicasm; )
-
 ${GENSRCS}:								 \
 		${.CURDIR}/../../../dev/aic7xxx/aic79xx.{reg,seq}	 \
-		${.CURDIR}/../../../cam/scsi/scsi_message.h ../aicasm/aicasm
-	../aicasm/aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi	 \
+		${.CURDIR}/../../../cam/scsi/scsi_message.h
+	aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi	 \
 			-I${.CURDIR}/../../../dev/aic7xxx		 \
 			-o aic79xx_seq.h -r aic79xx_reg.h		 \
 			${REG_PRINT_OPT}				 \
diff --git a/sys/modules/bwi/Makefile b/sys/modules/bwi/Makefile
index 7daf14076e8..25f0022c605 100644
--- a/sys/modules/bwi/Makefile
+++ b/sys/modules/bwi/Makefile
@@ -7,8 +7,4 @@ KMOD	= if_bwi
 SRCS	= if_bwi.c if_bwi_pci.c bwimac.c bwiphy.c bwirf.c
 SRCS	+= device_if.h bus_if.h pci_if.h opt_inet.h opt_bwi.h opt_wlan.h
 
-opt_bwi.h:
-	echo '#define BWI_DEBUG 1' > opt_bwi.h
-#	echo '#define BWI_DEBUG_VERBOSE 1' >> opt_bwi.h
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile
index bf7c566f133..175c28972d1 100644
--- a/sys/modules/crypto/Makefile
+++ b/sys/modules/crypto/Makefile
@@ -11,11 +11,11 @@
 KMOD	= crypto
 SRCS	= crypto.c cryptodev_if.c
 SRCS	+= criov.c cryptosoft.c xform.c
-SRCS	+= cast.c deflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c
+SRCS	+= cast.c cryptodeflate.c rmd160.c rijndael-alg-fst.c rijndael-api.c
 SRCS	+= skipjack.c bf_enc.c bf_ecb.c bf_skey.c
 SRCS	+= des_ecb.c des_enc.c des_setkey.c
 SRCS	+= sha1.c sha2.c
 SRCS	+= opt_param.h cryptodev_if.h bus_if.h device_if.h
-SRCS	+= opt_ddb.h opt_kdtrace.h
+SRCS	+= opt_ddb.h
 SRCS	+= camellia.c camellia-api.c
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ctl/Makefile b/sys/modules/ctl/Makefile
index 39a61f612ef..08cd639db24 100644
--- a/sys/modules/ctl/Makefile
+++ b/sys/modules/ctl/Makefile
@@ -22,7 +22,6 @@ SRCS+=	bus_if.h
 SRCS+=	device_if.h
 SRCS+=	vnode_if.h
 SRCS+=	opt_cam.h
-SRCS+=	opt_kdtrace.h
 
 #CFLAGS+=-DICL_KERNEL_PROXY
 
diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile
index 325c7050120..a84dbaf2335 100644
--- a/sys/modules/cxgb/Makefile
+++ b/sys/modules/cxgb/Makefile
@@ -1,4 +1,7 @@
 # $FreeBSD$
+
+.include <bsd.own.mk>
+
 SUBDIR= cxgb
 SUBDIR+= cxgb_t3fw
 SUBDIR+= ${_tom}
@@ -6,7 +9,9 @@ SUBDIR+= ${_iw_cxgb}
 
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
 _tom=		tom
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
 _iw_cxgb=	iw_cxgb
 .endif
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/cxgbe/Makefile b/sys/modules/cxgbe/Makefile
index fb7548584ad..86ce82e9e45 100644
--- a/sys/modules/cxgbe/Makefile
+++ b/sys/modules/cxgbe/Makefile
@@ -2,12 +2,22 @@
 # $FreeBSD$
 #
 
+.include <bsd.own.mk>
+
 SUBDIR = if_cxgbe
 SUBDIR+= t4_firmware
 SUBDIR+= t5_firmware
 SUBDIR+= ${_tom}
+SUBDIR+= ${_iw_cxgbe}
 
-.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
+.if ${MACHINE_CPUARCH} == "amd64"
+_tom=		tom
+.if ${MK_OFED} != "no" || defined(ALL_MODULES)
+_iw_cxgbe=	iw_cxgbe
+.endif
+.endif
+
+.if ${MACHINE_CPUARCH} == "i386"
 _tom=		tom
 .endif
 
diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile
new file mode 100644
index 00000000000..7704650ed05
--- /dev/null
+++ b/sys/modules/cxgbe/iw_cxgbe/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+CXGBE = ${.CURDIR}/../../../dev/cxgbe
+.PATH: ${CXGBE}/iw_cxgbe
+
+KMOD=   iw_cxgbe
+SRCS=   device.c cm.c provider.c mem.c cq.c qp.c resource.c ev.c id_table.c
+SRCS+=  bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h
+SRCS+=  opt_inet.h opt_ofed.h vnode_if.h
+CFLAGS+= -I${CXGBE} -I${.CURDIR}/../../../ofed/include -DLINUX_TYPES_DEFINED
+
+.if !defined(KERNBUILDDIR)
+.if ${MK_INET_SUPPORT} != "no"
+opt_inet.h:
+	@echo "#define INET 1" > ${.TARGET}
+	@echo "#define TCP_OFFLOAD 1" >> ${.TARGET}
+.endif
+
+.if ${MK_INET6_SUPPORT} != "no"
+opt_inet6.h:
+	@echo "#define INET6 1" > ${.TARGET}
+.endif
+.endif
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/t4_firmware/Makefile b/sys/modules/cxgbe/t4_firmware/Makefile
index d5b86d1b04f..a92dc0bb44a 100644
--- a/sys/modules/cxgbe/t4_firmware/Makefile
+++ b/sys/modules/cxgbe/t4_firmware/Makefile
@@ -17,7 +17,7 @@ FIRMWS += ${F}:${F:C/.txt//}:1.0.0.0
 .endif
 .endfor
 
-T4FW_VER = 1.8.11.0
+T4FW_VER = 1.9.12.0
 FIRMWS += t4fw.fw:t4fw:${T4FW_VER}
 CLEANFILES += t4fw.fw
 
diff --git a/sys/modules/cxgbe/t5_firmware/Makefile b/sys/modules/cxgbe/t5_firmware/Makefile
index 6637b222f72..fe2c43e8337 100644
--- a/sys/modules/cxgbe/t5_firmware/Makefile
+++ b/sys/modules/cxgbe/t5_firmware/Makefile
@@ -17,7 +17,7 @@ FIRMWS += ${F}:${F:C/.txt//}:1.0.0.0
 .endif
 .endfor
 
-T5FW_VER = 1.8.22.0
+T5FW_VER = 1.9.12.0
 FIRMWS += t5fw.fw:t5fw:${T5FW_VER}
 CLEANFILES += t5fw.fw
 
diff --git a/sys/modules/drm2/drm2/Makefile b/sys/modules/drm2/drm2/Makefile
index acb2d331156..1d6baab616b 100644
--- a/sys/modules/drm2/drm2/Makefile
+++ b/sys/modules/drm2/drm2/Makefile
@@ -54,6 +54,6 @@ SRCS	+= drm_ioc32.c
 .endif
 
 SRCS	+=device_if.h bus_if.h pci_if.h device_if.h iicbus_if.h opt_drm.h \
-	opt_vm.h opt_compat.h
+	opt_vm.h opt_compat.h opt_syscons.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/drm2/i915kms/Makefile b/sys/modules/drm2/i915kms/Makefile
index eda04d9ff03..1587e7340ec 100644
--- a/sys/modules/drm2/i915kms/Makefile
+++ b/sys/modules/drm2/i915kms/Makefile
@@ -34,7 +34,7 @@ SRCS	= \
 SRCS	+= i915_ioc32.c
 .endif
 
-SRCS	+= device_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h opt_drm.h \
-	 opt_compat.h
+SRCS	+= device_if.h fb_if.h bus_if.h pci_if.h iicbus_if.h iicbb_if.h \
+	 opt_drm.h opt_compat.h opt_syscons.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/drm2/radeonkms/Makefile b/sys/modules/drm2/radeonkms/Makefile
index f8468f60e17..20667844754 100644
--- a/sys/modules/drm2/radeonkms/Makefile
+++ b/sys/modules/drm2/radeonkms/Makefile
@@ -94,8 +94,10 @@ SRCS	+=								\
 	opt_acpi.h							\
 	opt_compat.h							\
 	opt_drm.h							\
+	opt_syscons.h							\
 	acpi_if.h							\
 	bus_if.h							\
+	fb_if.h								\
 	device_if.h							\
 	iicbb_if.h							\
 	iicbus_if.h							\
diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile
index 2fa7ecd4eae..1b123717585 100644
--- a/sys/modules/dtrace/Makefile
+++ b/sys/modules/dtrace/Makefile
@@ -9,7 +9,6 @@ SUBDIR=		dtmalloc	\
 		dtrace		\
 		dtraceall	\
 		dtrace_test	\
-		dtio		\
 		lockstat	\
 		profile		\
 		prototype	\
@@ -20,7 +19,7 @@ SUBDIR=		dtmalloc	\
 SUBDIR+=	fasttrap fbt systrace_linux32
 .endif
 .if ${MACHINE_CPUARCH} == "powerpc"
-SUBDIR+=	fbt
+SUBDIR+=	fbt fasttrap
 .endif
 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"
 SUBDIR+=	systrace_freebsd32
diff --git a/sys/modules/dtrace/dtio/Makefile b/sys/modules/dtrace/dtio/Makefile
deleted file mode 100644
index 2b777ef1051..00000000000
--- a/sys/modules/dtrace/dtio/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $FreeBSD$
-
-.PATH: ${.CURDIR}/../../../kern
-
-KMOD=		dtio
-SRCS=		dtio_kdtrace.c \
-		vnode_if.h
-
-CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
-		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
-		-I${.CURDIR}/../../..
-
-.include <bsd.kmod.mk>
-
-CFLAGS+=	-include ${.CURDIR}/../../../cddl/compat/opensolaris/sys/debug_compat.h
diff --git a/sys/modules/dtrace/dtrace_test/Makefile b/sys/modules/dtrace/dtrace_test/Makefile
index c5bb169d42b..9725ad9f9a2 100644
--- a/sys/modules/dtrace/dtrace_test/Makefile
+++ b/sys/modules/dtrace/dtrace_test/Makefile
@@ -5,7 +5,6 @@
 KMOD=		dtrace_test
 SRCS=		dtrace_test.c
 
-SRCS+=		opt_kdtrace.h
 SRCS+=		vnode_if.h
 
 CFLAGS+=	-I${.CURDIR}/../../..
diff --git a/sys/modules/dtrace/dtraceall/dtraceall.c b/sys/modules/dtrace/dtraceall/dtraceall.c
index 5d70feb1cdd..b8eb0fc17f6 100644
--- a/sys/modules/dtrace/dtraceall/dtraceall.c
+++ b/sys/modules/dtrace/dtraceall/dtraceall.c
@@ -66,7 +66,6 @@ MODULE_VERSION(dtraceall, 1);
 MODULE_DEPEND(dtraceall, cyclic, 1, 1, 1);
 MODULE_DEPEND(dtraceall, opensolaris, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtrace, 1, 1, 1);
-MODULE_DEPEND(dtraceall, dtio, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtmalloc, 1, 1, 1);
 MODULE_DEPEND(dtraceall, dtnfscl, 1, 1, 1);
 #if defined(NFSCLIENT)
diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile
index 6008498a6b9..50b5c58a785 100644
--- a/sys/modules/dtrace/fasttrap/Makefile
+++ b/sys/modules/dtrace/fasttrap/Makefile
@@ -13,6 +13,9 @@ CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
 .if ${MACHINE_CPUARCH} == "amd64" ||  ${MACHINE_CPUARCH} == "i386"
 CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel
 .PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/uts/intel/dtrace
+.elif ${MACHINE_CPUARCH} == "powerpc"
+CFLAGS+=	-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/powerpc
+.PATH:		${.CURDIR}/../../../cddl/contrib/opensolaris/uts/powerpc/dtrace
 .endif
 
 CFLAGS+=	-DSMP
diff --git a/sys/modules/dtrace/lockstat/Makefile b/sys/modules/dtrace/lockstat/Makefile
index c87a65ab804..11b695a291b 100644
--- a/sys/modules/dtrace/lockstat/Makefile
+++ b/sys/modules/dtrace/lockstat/Makefile
@@ -5,7 +5,7 @@
 KMOD=		lockstat
 SRCS=		lockstat.c 
 
-SRCS+=		vnode_if.h opt_kdtrace.h
+SRCS+=		vnode_if.h
 
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
diff --git a/sys/modules/dtrace/sdt/Makefile b/sys/modules/dtrace/sdt/Makefile
index d50999a4e9a..96605e11152 100644
--- a/sys/modules/dtrace/sdt/Makefile
+++ b/sys/modules/dtrace/sdt/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=		sdt
 SRCS=		sdt.c
-SRCS+=		vnode_if.h opt_kdtrace.h
+SRCS+=		vnode_if.h
 
 CFLAGS+=	-I${.CURDIR}/../../../cddl/compat/opensolaris \
 		-I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \
diff --git a/sys/modules/ip6_mroute_mod/Makefile b/sys/modules/ip6_mroute_mod/Makefile
index eb1c82395b0..943f9ab9236 100644
--- a/sys/modules/ip6_mroute_mod/Makefile
+++ b/sys/modules/ip6_mroute_mod/Makefile
@@ -7,7 +7,7 @@
 KMOD=	ip6_mroute
 
 SRCS=	ip6_mroute.c
-SRCS+=	opt_inet6.h opt_kdtrace.h opt_mrouting.h
+SRCS+=	opt_inet6.h opt_mrouting.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet6.h:
diff --git a/sys/modules/iwnfw/Makefile b/sys/modules/iwnfw/Makefile
index 9075edb30c6..173fbfbd02e 100644
--- a/sys/modules/iwnfw/Makefile
+++ b/sys/modules/iwnfw/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6000g2a iwn6000g2b iwn6050 iwn2030
+SUBDIR=	iwn1000 iwn4965 iwn5000 iwn5150 iwn6000 iwn6000g2a iwn6000g2b iwn6050 iwn2000 iwn2030
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/iwnfw/iwn6000g2b/Makefile b/sys/modules/iwnfw/iwn6000g2b/Makefile
index 71a260737de..ce767556f20 100644
--- a/sys/modules/iwnfw/iwn6000g2b/Makefile
+++ b/sys/modules/iwnfw/iwn6000g2b/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
 KMOD=	iwn6000g2bfw
-IMG=	iwlwifi-6000g2b-17.168.5.2
+IMG=	iwlwifi-6000g2b-18.168.6.1
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 7ed6e989388..f79ad1b7a1c 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -13,8 +13,8 @@ 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 \
-	opt_inet6.h opt_compat.h opt_kdtrace.h opt_posix.h opt_usb.h \
-	vnode_if.h device_if.h bus_if.h assym.s
+	opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \
+	device_if.h bus_if.h assym.s
 
 # XXX: for assym.s
 SRCS+=  opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile
index dc44ac7c0dc..0703c242f5c 100644
--- a/sys/modules/netgraph/Makefile
+++ b/sys/modules/netgraph/Makefile
@@ -18,7 +18,6 @@ SUBDIR=	async \
 	etf \
 	ether \
 	ether_echo \
-	fec \
 	frame_relay \
 	gif \
 	gif_demux \
diff --git a/sys/modules/netgraph/fec/Makefile b/sys/modules/netgraph/fec/Makefile
deleted file mode 100644
index 1d437f58d86..00000000000
--- a/sys/modules/netgraph/fec/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-# $FreeBSD$
-
-KMOD=		ng_fec
-SRCS= 		ng_fec.c opt_inet.h opt_inet6.h
-
-CFLAGS +=	-DINET -DINET6
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/nfscl/Makefile b/sys/modules/nfscl/Makefile
index a9b20038cfe..ba78d05d445 100644
--- a/sys/modules/nfscl/Makefile
+++ b/sys/modules/nfscl/Makefile
@@ -17,7 +17,6 @@ SRCS=	vnode_if.h \
 	opt_bootp.h \
 	opt_inet.h \
 	opt_inet6.h \
-	opt_kdtrace.h \
 	opt_kgssapi.h \
 	opt_nfs.h \
 	opt_nfsroot.h \
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 94d473b930d..aaa6a04449d 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -7,7 +7,7 @@ SRCS=	vnode_if.h \
 	nfs_bio.c nfs_node.c nfs_subs.c nfs_nfsiod.c \
 	nfs_vfsops.c nfs_vnops.c nfs_krpc.c \
 	opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h
-SRCS+=	opt_inet6.h opt_kdtrace.h opt_kgssapi.h
+SRCS+=	opt_inet6.h opt_kgssapi.h
 
 .if !defined(KERNBUILDDIR)
 NFS_INET?=	1	# 0/1 - requires INET to be configured in kernel
diff --git a/sys/modules/nfscommon/Makefile b/sys/modules/nfscommon/Makefile
index 2a6b8f77593..18a343e7cf0 100644
--- a/sys/modules/nfscommon/Makefile
+++ b/sys/modules/nfscommon/Makefile
@@ -8,7 +8,6 @@ SRCS=	vnode_if.h \
 	nfs_commonport.c \
 	nfs_commonsubs.c \
 	opt_inet6.h \
-	opt_kdtrace.h \
 	opt_kgssapi.h \
 	opt_nfs.h \
 	opt_ufs.h
diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile
index 60b62afde1d..332515db514 100644
--- a/sys/modules/random/Makefile
+++ b/sys/modules/random/Makefile
@@ -11,8 +11,9 @@ SRCS+=	nehemiah.c
 SRCS+=	ivy.c
 .endif
 SRCS+=	randomdev_soft.c yarrow.c hash.c
+SRCS+=	random_harvestq.c live_entropy_sources.c rwfile.c
 SRCS+=	rijndael-alg-fst.c rijndael-api-fst.c sha2.c
-SRCS+=	bus_if.h device_if.h vnode_if.h opt_cpu.h
+SRCS+=	bus_if.h device_if.h vnode_if.h opt_cpu.h opt_random.h
 
 CFLAGS+= -I${.CURDIR}/../..
 
diff --git a/sys/modules/rdma/Makefile b/sys/modules/rdma/Makefile
index f5d7255b309..a24517d3142 100644
--- a/sys/modules/rdma/Makefile
+++ b/sys/modules/rdma/Makefile
@@ -1,9 +1,5 @@
 # $FreeBSD$
 
-#SUBDIR=  addr
-#SUBDIR+= cma
-#SUBDIR+= iwcm
-#SUBDIR+= core
 SUBDIR+= krping
 
 .include <bsd.subdir.mk>
diff --git a/sys/modules/rdma/addr/Makefile b/sys/modules/rdma/addr/Makefile
deleted file mode 100644
index 74406944ae0..00000000000
--- a/sys/modules/rdma/addr/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-RDMA=	${.CURDIR}/../../../contrib/rdma
-.PATH: ${RDMA}
-
-KMOD=	rdma_addr
-SRCS= device_if.h bus_if.h pci_if.h pcib_if.h opt_sched.h
-SRCS+= rdma_addr.c 
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/rdma/cma/Makefile b/sys/modules/rdma/cma/Makefile
deleted file mode 100644
index 4ff4b368e54..00000000000
--- a/sys/modules/rdma/cma/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-RDMA=	${.CURDIR}/../../../contrib/rdma
-.PATH: ${RDMA}
-
-KMOD=  rdma_cma
-SRCS=  device_if.h bus_if.h pci_if.h pcib_if.h opt_sched.h
-SRCS+= rdma_cma.c 
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/rdma/core/Makefile b/sys/modules/rdma/core/Makefile
deleted file mode 100644
index 60c6dc36252..00000000000
--- a/sys/modules/rdma/core/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $FreeBSD$
-
-RDMA=	${.CURDIR}/../../../contrib/rdma
-.PATH: ${RDMA}
-
-KMOD=	rdma_core
-SRCS= device_if.h bus_if.h pci_if.h pcib_if.h
-SRCS+= rdma_device.c
-SRCS+= rdma_cache.c
-SRCS+= rdma_verbs.c
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/rdma/iwcm/Makefile b/sys/modules/rdma/iwcm/Makefile
deleted file mode 100644
index 28310967b8a..00000000000
--- a/sys/modules/rdma/iwcm/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-RDMA=	${.CURDIR}/../../../contrib/rdma
-.PATH: ${RDMA}
-
-KMOD=  rdma_iwcm
-SRCS=  device_if.h bus_if.h pci_if.h pcib_if.h opt_sched.h
-SRCS+= rdma_iwcm.c 
-
-.include <bsd.kmod.mk>
diff --git a/sys/modules/send/Makefile b/sys/modules/send/Makefile
index 06ea9e0d1ea..1cb976b9b8d 100644
--- a/sys/modules/send/Makefile
+++ b/sys/modules/send/Makefile
@@ -2,6 +2,6 @@
 .PATH: ${.CURDIR}/../../netinet6
 
 KMOD=	send
-SRCS=	send.c opt_kdtrace.h
+SRCS=	send.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index 325b00d7228..24847cacd50 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -27,6 +27,18 @@
 
 .include <bsd.own.mk>
 
+#
+# Check for common USB debug flags to pass when building the USB
+# modules in this directory:
+#
+.if defined(USB_DEBUG)
+MAKE+=" DEBUG_FLAGS+=-DUSB_DEBUG"
+.endif
+
+.if defined(USB_DEBUG) && defined(USB_REQ_DEBUG)
+MAKE+=" DEBUG_FLAGS+=-DUSB_REQ_DEBUG"
+.endif
+
 # Modules that include binary-only blobs of microcode should be selectable by
 # MK_SOURCELESS_UCODE option (see below).
 
@@ -38,7 +50,7 @@ SUBDIR += ${_urtwn} ${_urtwnfw}
 SUBDIR += atp uhid ukbd ums udbp ufm uep
 SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \
 	  umct umcs umodem umoscom uplcom uslcom uvisor uvscom
-SUBDIR += uether aue axe cdce cue ${_kue} mos rue smsc udav uhso ipheth
+SUBDIR += uether aue axe axge cdce cue ${_kue} mos rue smsc udav uhso ipheth
 SUBDIR += usfs umass urio
 SUBDIR += quirk template
 SUBDIR += ${_g_audio} ${_g_keyboard} ${_g_modem} ${_g_mouse}
diff --git a/sys/modules/usb/axge/Makefile b/sys/modules/usb/axge/Makefile
new file mode 100644
index 00000000000..bad4b94a559
--- /dev/null
+++ b/sys/modules/usb/axge/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../dev/usb/net
+
+KMOD=	if_axge
+SRCS+=	if_axge.c usbdevs.h
+SRCS+=	bus_if.h device_if.h miibus_if.h usb_if.h \
+	opt_bus.h opt_inet.h opt_usb.h
+
+.include <bsd.kmod.mk>
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile
index a7d44f94134..7c4b959091e 100644
--- a/sys/modules/vmm/Makefile
+++ b/sys/modules/vmm/Makefile
@@ -28,7 +28,8 @@ SRCS+=	vmm.c		\
 .PATH: ${.CURDIR}/../../amd64/vmm/io
 SRCS+=	iommu.c		\
 	ppt.c           \
-	vdev.c		\
+	vhpet.c		\
+	vioapic.c	\
 	vlapic.c
 
 # intel-specific files
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index cb3ed2716a5..d9686e8a4b4 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #define	BPF_INTERNAL
 #include <net/bpf.h>
 #include <net/bpf_buffer.h>
@@ -576,7 +577,7 @@ bpf_movein(struct uio *uio, int linktype, struct ifnet *ifp, struct mbuf **mp,
 				goto bad;
 			}
 		}
-		bcopy(m->m_data, sockp->sa_data, hlen);
+		bcopy(mtod(m, const void *), sockp->sa_data, hlen);
 	}
 	*hdrlen = hlen;
 
diff --git a/sys/net/bpf.h b/sys/net/bpf.h
index e362f1612d6..b42b64b0cea 100644
--- a/sys/net/bpf.h
+++ b/sys/net/bpf.h
@@ -1310,4 +1310,12 @@ bpf_peers_present(struct bpf_if *bpf)
  */
 #define BPF_MEMWORDS 16
 
+#ifdef _SYS_EVENTHANDLER_H_
+/* BPF attach/detach events */
+struct ifnet;
+typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* dlt */,
+    int /* 1 =>'s attach */);
+EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn);
+#endif /* _SYS_EVENTHANDLER_H_ */
+
 #endif /* _NET_BPF_H_ */
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 07cf2199f7d..bd5ef9f906e 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_llc.h>
diff --git a/sys/net/flowtable.c b/sys/net/flowtable.c
index 6995798b311..32b953c1639 100644
--- a/sys/net/flowtable.c
+++ b/sys/net/flowtable.c
@@ -1401,7 +1401,7 @@ fle_free(struct flentry *fle, struct flowtable *ft)
 static void
 flowtable_free_stale(struct flowtable *ft, struct rtentry *rt)
 {
-	int curbit = 0, count;
+	int curbit = 0, count, tmpsize;
 	struct flentry *fle,  **flehead, *fleprev;
 	struct flentry *flefreehead, *flefreetail, *fletmp;
 	bitstr_t *mask, *tmpmask;
@@ -1410,6 +1410,7 @@ flowtable_free_stale(struct flowtable *ft, struct rtentry *rt)
 	flefreehead = flefreetail = NULL;
 	mask = flowtable_mask(ft);
 	tmpmask = ft->ft_tmpmask;
+	tmpsize = ft->ft_size;
 	memcpy(tmpmask, mask, ft->ft_size/8);
 	/*
 	 * XXX Note to self, bit_ffs operates at the byte level
@@ -1479,7 +1480,9 @@ flowtable_free_stale(struct flowtable *ft, struct rtentry *rt)
 			bit_clear(mask, curbit);
 		FL_ENTRY_UNLOCK(ft, curbit);
 		bit_clear(tmpmask, curbit);
-		bit_ffs(tmpmask, ft->ft_size, &curbit);
+		tmpmask += (curbit / 8);
+		tmpsize -= (curbit / 8) * 8;
+		bit_ffs(tmpmask, tmpsize, &curbit);
 	}
 	count = 0;
 	while ((fle = flefreehead) != NULL) {
diff --git a/sys/net/ieee8023ad_lacp.c b/sys/net/ieee8023ad_lacp.c
index 014140b4bd2..423d3c485fe 100644
--- a/sys/net/ieee8023ad_lacp.c
+++ b/sys/net/ieee8023ad_lacp.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/callout.h>
+#include <sys/eventhandler.h>
 #include <sys/mbuf.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
@@ -42,8 +43,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/stdarg.h>
 #include <sys/lock.h>
 #include <sys/rwlock.h>
+#include <sys/taskqueue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/ethernet.h>
 #include <net/if_media.h>
@@ -1089,8 +1092,45 @@ lacp_compose_key(struct lacp_port *lp)
 		KASSERT(IFM_TYPE(media) == IFM_ETHER, ("invalid media type"));
 		KASSERT((media & IFM_FDX) != 0, ("aggregating HDX interface"));
 
-		/* bit 0..4:	IFM_SUBTYPE */
-		key = subtype;
+		/* bit 0..4:	IFM_SUBTYPE modulo speed */
+		switch (subtype) {
+		case IFM_10_T:
+		case IFM_10_2:
+		case IFM_10_5:
+		case IFM_10_STP:
+		case IFM_10_FL:
+			key = IFM_10_T;
+			break;
+		case IFM_100_TX:
+		case IFM_100_FX:
+		case IFM_100_T4:
+		case IFM_100_VG:
+		case IFM_100_T2:
+			key = IFM_100_TX;
+			break;
+		case IFM_1000_SX:
+		case IFM_1000_LX:
+		case IFM_1000_CX:
+		case IFM_1000_T:
+			key = IFM_1000_SX;
+			break;
+		case IFM_10G_LR:
+		case IFM_10G_SR:
+		case IFM_10G_CX4:
+		case IFM_10G_TWINAX:
+		case IFM_10G_TWINAX_LONG:
+		case IFM_10G_LRM:
+		case IFM_10G_T:
+			key = IFM_10G_LR;
+			break;
+		case IFM_40G_CR4:
+		case IFM_40G_SR4:
+		case IFM_40G_LR4:
+			key = IFM_40G_CR4;
+			break;
+		default:
+			key = subtype;
+		}
 		/* bit 5..14:	(some bits of) if_index of lagg device */
 		key |= 0x7fe0 & ((sc->sc_ifp->if_index) << 5);
 		/* bit 15:	0 */
diff --git a/sys/net/ieee_oui.h b/sys/net/ieee_oui.h
new file mode 100644
index 00000000000..3fcb96b597a
--- /dev/null
+++ b/sys/net/ieee_oui.h
@@ -0,0 +1,67 @@
+/* 
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above
+ *    copyright notice, this 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$
+ *
+ * Author: George V. Neville-Neil
+ *
+ */
+
+/* Organizationally Unique Identifier assigned by IEEE 14 Nov 2013 */
+#define OUI_FREEBSD_BASE 0x589cfc000000
+#define OUI_FREEBSD(nic) (OUI_FREEBSD_BASE | (nic))
+
+/* 
+ * OUIs are most often used to uniquely identify network interfaces
+ * and occupy the first 3 bytes of both destination and source MAC
+ * addresses.  The following allocations exist so that various
+ * software systems associated with FreeBSD can have unique IDs in the
+ * absence of hardware.  The use of OUIs for this purpose is not fully
+ * fleshed out but is now in common use in virtualization technology.
+ * 
+ * Allocations from this range are expected to be made using COMMON
+ * SENSE by developers.  Do NOT take a large range just because
+ * they're currently wide open.  Take the smallest useful range for
+ * your system.  We have (2^24 - 2) available addresses (see Reserved
+ * Values below) but that is far from infinite.
+ *
+ * In the event of a conflict arbitration of allocation in this file
+ * is subject to core@ approval.
+ * 
+ * Applications are differentiated based on the high order bit(s) of
+ * the remaining three bytes.  Our first allocation has all 0s, the
+ * next allocation has the highest bit set.  Allocating in this way
+ * gives us 254 allocations of 64K addresses.  Address blocks can be
+ * concatenated if necessary.
+ *
+ * Reserved Values: 0x000000 and 0xffffff are reserved and MUST NOT BE
+ * allocated for any reason.
+ */
+
+/* Allocate 64K to bhyve */
+#define OUI_FREEBSD_BHYVE_LOW	OUI_FREEBSD(0x000001)
+#define OUI_FREEBSD_BHYVE_HIGH	OUI_FREEBSD(0x00ffff)
diff --git a/sys/net/if.c b/sys/net/if.c
index 0356ec7fbf4..f190bb47d26 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -633,8 +633,7 @@ if_attach_internal(struct ifnet *ifp, int vmove)
 			socksize = sizeof(*sdl);
 		socksize = roundup2(socksize, sizeof(long));
 		ifasize = sizeof(*ifa) + 2 * socksize;
-		ifa = malloc(ifasize, M_IFADDR, M_WAITOK | M_ZERO);
-		ifa_init(ifa);
+		ifa = ifa_alloc(ifasize, M_WAITOK);
 		sdl = (struct sockaddr_dl *)(ifa + 1);
 		sdl->sdl_len = socksize;
 		sdl->sdl_family = AF_LINK;
@@ -1417,13 +1416,40 @@ if_maddr_runlock(struct ifnet *ifp)
 /*
  * Initialization, destruction and refcounting functions for ifaddrs.
  */
-void
-ifa_init(struct ifaddr *ifa)
+struct ifaddr *
+ifa_alloc(size_t size, int flags)
 {
+	struct ifaddr *ifa;
+
+	KASSERT(size >= sizeof(struct ifaddr),
+	    ("%s: invalid size %zu", __func__, size));
+
+	ifa = malloc(size, M_IFADDR, M_ZERO | flags);
+	if (ifa == NULL)
+		return (NULL);
+
+	if ((ifa->ifa_opackets = counter_u64_alloc(flags)) == NULL)
+		goto fail;
+	if ((ifa->ifa_ipackets = counter_u64_alloc(flags)) == NULL)
+		goto fail;
+	if ((ifa->ifa_obytes = counter_u64_alloc(flags)) == NULL)
+		goto fail;
+	if ((ifa->ifa_ibytes = counter_u64_alloc(flags)) == NULL)
+		goto fail;
 
-	mtx_init(&ifa->ifa_mtx, "ifaddr", NULL, MTX_DEF);
 	refcount_init(&ifa->ifa_refcnt, 1);
-	ifa->if_data.ifi_datalen = sizeof(ifa->if_data);
+
+	return (ifa);
+
+fail:
+	/* free(NULL) is okay */
+	counter_u64_free(ifa->ifa_opackets);
+	counter_u64_free(ifa->ifa_ipackets);
+	counter_u64_free(ifa->ifa_obytes);
+	counter_u64_free(ifa->ifa_ibytes);
+	free(ifa, M_IFADDR);
+
+	return (NULL);
 }
 
 void
@@ -1438,7 +1464,10 @@ ifa_free(struct ifaddr *ifa)
 {
 
 	if (refcount_release(&ifa->ifa_refcnt)) {
-		mtx_destroy(&ifa->ifa_mtx);
+		counter_u64_free(ifa->ifa_opackets);
+		counter_u64_free(ifa->ifa_ipackets);
+		counter_u64_free(ifa->ifa_obytes);
+		counter_u64_free(ifa->ifa_ibytes);
 		free(ifa, M_IFADDR);
 	}
 }
@@ -1496,6 +1525,25 @@ ifa_del_loopback_route(struct ifaddr *ifa, struct sockaddr *ia)
 	return (error);
 }
 
+int
+ifa_switch_loopback_route(struct ifaddr *ifa, struct sockaddr *sa)
+{
+	struct rtentry *rt;
+
+	rt = rtalloc1_fib(sa, 0, 0, 0);
+	if (rt == NULL) {
+		log(LOG_DEBUG, "%s: fail", __func__);
+		return (EHOSTUNREACH);
+	}
+	((struct sockaddr_dl *)rt->rt_gateway)->sdl_type =
+	    ifa->ifa_ifp->if_type;
+	((struct sockaddr_dl *)rt->rt_gateway)->sdl_index =
+	    ifa->ifa_ifp->if_index;
+	RTFREE_LOCKED(rt);
+
+	return (0);
+}
+
 /*
  * XXX: Because sockaddr_dl has deeper structure than the sockaddr
  * structs used to represent other address families, it is necessary
@@ -2162,9 +2210,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
 		 */
 		new_flags = (ifr->ifr_flags & 0xffff) |
 		    (ifr->ifr_flagshigh << 16);
-		if (ifp->if_flags & IFF_SMART) {
-			/* Smart drivers twiddle their own routes */
-		} else if (ifp->if_flags & IFF_UP &&
+		if (ifp->if_flags & IFF_UP &&
 		    (new_flags & IFF_UP) == 0) {
 			if_down(ifp);
 		} else if (new_flags & IFF_UP &&
@@ -2235,9 +2281,9 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
 		log(LOG_INFO, "%s: changing name to '%s'\n",
 		    ifp->if_xname, new_name);
 
+		IF_ADDR_WLOCK(ifp);
 		strlcpy(ifp->if_xname, new_name, sizeof(ifp->if_xname));
 		ifa = ifp->if_addr;
-		IFA_LOCK(ifa);
 		sdl = (struct sockaddr_dl *)ifa->ifa_addr;
 		namelen = strlen(new_name);
 		onamelen = sdl->sdl_nlen;
@@ -2256,7 +2302,7 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
 		bzero(sdl->sdl_data, onamelen);
 		while (namelen != 0)
 			sdl->sdl_data[--namelen] = 0xff;
-		IFA_UNLOCK(ifa);
+		IF_ADDR_WUNLOCK(ifp);
 
 		EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp);
 		/* Announce the return of the interface. */
@@ -2366,7 +2412,6 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
 #ifdef INET6
 	case SIOCSIFPHYADDR_IN6:
 #endif
-	case SIOCSLIFPHYADDR:
 	case SIOCSIFMEDIA:
 	case SIOCSIFGENERIC:
 		error = priv_check(td, PRIV_NET_HWIOCTL);
@@ -2385,7 +2430,6 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, struct thread *td)
 
 	case SIOCGIFPSRCADDR:
 	case SIOCGIFPDSTADDR:
-	case SIOCGLIFPHYADDR:
 	case SIOCGIFMEDIA:
 	case SIOCGIFGENERIC:
 		if (ifp->if_ioctl == NULL)
@@ -2463,7 +2507,6 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td)
 	CURVNET_SET(so->so_vnet);
 	switch (cmd) {
 	case SIOCGIFCONF:
-	case OSIOCGIFCONF:
 		error = ifconf(cmd, data);
 		CURVNET_RESTORE();
 		return (error);
@@ -2563,71 +2606,12 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td)
 	 * layer, and do not perform any credentials checks or input
 	 * validation.
 	 */
-#ifndef COMPAT_43
-	error = ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd,
-								 data,
-								 ifp, td));
+	error = ((*so->so_proto->pr_usrreqs->pru_control)(so, cmd, data,
+	    ifp, td));
 	if (error == EOPNOTSUPP && ifp != NULL && ifp->if_ioctl != NULL &&
 	    cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR &&
 	    cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK)
 		error = (*ifp->if_ioctl)(ifp, cmd, data);
-#else
-	{
-		u_long ocmd = cmd;
-
-		switch (cmd) {
-
-		case SIOCSIFDSTADDR:
-		case SIOCSIFADDR:
-		case SIOCSIFBRDADDR:
-		case SIOCSIFNETMASK:
-#if BYTE_ORDER != BIG_ENDIAN
-			if (ifr->ifr_addr.sa_family == 0 &&
-			    ifr->ifr_addr.sa_len < 16) {
-				ifr->ifr_addr.sa_family = ifr->ifr_addr.sa_len;
-				ifr->ifr_addr.sa_len = 16;
-			}
-#else
-			if (ifr->ifr_addr.sa_len == 0)
-				ifr->ifr_addr.sa_len = 16;
-#endif
-			break;
-
-		case OSIOCGIFADDR:
-			cmd = SIOCGIFADDR;
-			break;
-
-		case OSIOCGIFDSTADDR:
-			cmd = SIOCGIFDSTADDR;
-			break;
-
-		case OSIOCGIFBRDADDR:
-			cmd = SIOCGIFBRDADDR;
-			break;
-
-		case OSIOCGIFNETMASK:
-			cmd = SIOCGIFNETMASK;
-		}
-		error =  ((*so->so_proto->pr_usrreqs->pru_control)(so,
-								   cmd,
-								   data,
-								   ifp, td));
-		if (error == EOPNOTSUPP && ifp != NULL &&
-		    ifp->if_ioctl != NULL &&
-		    cmd != SIOCSIFADDR && cmd != SIOCSIFBRDADDR &&
-		    cmd != SIOCSIFDSTADDR && cmd != SIOCSIFNETMASK)
-			error = (*ifp->if_ioctl)(ifp, cmd, data);
-		switch (ocmd) {
-
-		case OSIOCGIFADDR:
-		case OSIOCGIFDSTADDR:
-		case OSIOCGIFBRDADDR:
-		case OSIOCGIFNETMASK:
-			*(u_short *)&ifr->ifr_addr = ifr->ifr_addr.sa_family;
-
-		}
-	}
-#endif /* COMPAT_43 */
 
 	if ((oif_flags ^ ifp->if_flags) & IFF_UP) {
 #ifdef INET6
@@ -2793,16 +2777,6 @@ again:
 			if (prison_if(curthread->td_ucred, sa) != 0)
 				continue;
 			addrs++;
-#ifdef COMPAT_43
-			if (cmd == OSIOCGIFCONF) {
-				struct osockaddr *osa =
-					 (struct osockaddr *)&ifr.ifr_addr;
-				ifr.ifr_addr = *sa;
-				osa->sa_family = sa->sa_family;
-				sbuf_bcat(sb, &ifr, sizeof(ifr));
-				max_len += sizeof(ifr);
-			} else
-#endif
 			if (sa->sa_len <= sizeof(*sa)) {
 				ifr.ifr_addr = *sa;
 				sbuf_bcat(sb, &ifr, sizeof(ifr));
diff --git a/sys/net/if.h b/sys/net/if.h
index ab98ec0b282..ec49ad4fe80 100644
--- a/sys/net/if.h
+++ b/sys/net/if.h
@@ -35,10 +35,6 @@
 
 #include <sys/cdefs.h>
 
-#ifdef _KERNEL
-#include <sys/queue.h>
-#endif
-
 #if __BSD_VISIBLE
 /*
  * <net/if.h> does not depend on <sys/time.h> on most other systems.  This
@@ -49,8 +45,6 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 #endif
-
-struct ifnet;
 #endif
 
 /*
@@ -135,7 +129,7 @@ struct if_data {
 #define	IFF_DEBUG	0x4		/* (n) turn on debugging */
 #define	IFF_LOOPBACK	0x8		/* (i) is a loopback net */
 #define	IFF_POINTOPOINT	0x10		/* (i) is a point-to-point link */
-#define	IFF_SMART	0x20		/* (i) interface manages own routes */
+/*			0x20		   was IFF_SMART */
 #define	IFF_DRV_RUNNING	0x40		/* (d) resources allocated */
 #define	IFF_NOARP	0x80		/* (n) no address resolution protocol */
 #define	IFF_PROMISC	0x100		/* (n) receive all packets */
@@ -165,7 +159,7 @@ struct if_data {
 /* flags set internally only: */
 #define	IFF_CANTCHANGE \
 	(IFF_BROADCAST|IFF_POINTOPOINT|IFF_DRV_RUNNING|IFF_DRV_OACTIVE|\
-	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_SMART|IFF_PROMISC|\
+	    IFF_SIMPLEX|IFF_MULTICAST|IFF_ALLMULTI|IFF_PROMISC|\
 	    IFF_DYING|IFF_CANTCONFIG)
 
 /*
@@ -231,6 +225,7 @@ struct if_data {
 #define	IFCAP_NETMAP		0x100000 /* netmap mode supported/enabled */
 #define	IFCAP_RXCSUM_IPV6	0x200000  /* can offload checksum on IPv6 RX */
 #define	IFCAP_TXCSUM_IPV6	0x400000  /* can offload checksum on IPv6 TX */
+#define	IFCAP_HWSTATS		0x800000 /* manages counters internally */
 
 #define IFCAP_HWCSUM_IPV6	(IFCAP_RXCSUM_IPV6 | IFCAP_TXCSUM_IPV6)
 
@@ -417,7 +412,7 @@ struct ifaliasreq {
 	int	ifra_vhid;
 };
 
-/* Compat with pre-10.x */
+/* 9.x compat */
 struct oifaliasreq {
 	char	ifra_name[IFNAMSIZ];
 	struct	sockaddr ifra_addr;
@@ -502,18 +497,6 @@ struct ifgroupreq {
 #define ifgr_groups	ifgr_ifgru.ifgru_groups
 };
 
-/*
- * Structure for SIOC[AGD]LIFADDR
- */
-struct if_laddrreq {
-	char	iflr_name[IFNAMSIZ];
-	u_int	flags;
-#define	IFLR_PREFIX	0x8000  /* in: prefix given  out: kernel fills id */
-	u_int	prefixlen;         /* in/out */
-	struct	sockaddr_storage addr;   /* in/out */
-	struct	sockaddr_storage dstaddr; /* out */
-};
-
 #endif /* __BSD_VISIBLE */
 
 #ifdef _KERNEL
@@ -536,10 +519,4 @@ struct if_nameindex	*if_nameindex(void);
 unsigned int		 if_nametoindex(const char *);
 __END_DECLS
 #endif
-
-#ifdef _KERNEL
-/* XXX - this should go away soon. */
-#include <net/if_var.h>
-#endif
-
 #endif /* !_NET_IF_H_ */
diff --git a/sys/net/if_arcsubr.c b/sys/net/if_arcsubr.c
index 2f9478582d1..49c2dd3de68 100644
--- a/sys/net/if_arcsubr.c
+++ b/sys/net/if_arcsubr.c
@@ -57,6 +57,7 @@
 #include <machine/cpu.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/if_dl.h>
diff --git a/sys/net/if_atmsubr.c b/sys/net/if_atmsubr.c
index d6190ec9fcd..8bf8534bc85 100644
--- a/sys/net/if_atmsubr.c
+++ b/sys/net/if_atmsubr.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/if_dl.h>
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 572ee06d366..a4459603497 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/protosw.h>
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index fcb71313047..abbda41199d 100644
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -32,6 +32,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/malloc.h>
 #include <sys/limits.h>
 #include <sys/lock.h>
@@ -42,8 +43,8 @@
 #include <sys/socket.h>
 
 #include <net/if.h>
-#include <net/if_clone.h>
 #include <net/if_var.h>
+#include <net/if_clone.h>
 #include <net/radix.h>
 #include <net/route.h>
 #include <net/vnet.h>
diff --git a/sys/net/if_clone.h b/sys/net/if_clone.h
index 7159421aa8a..90d9b7b18a1 100644
--- a/sys/net/if_clone.h
+++ b/sys/net/if_clone.h
@@ -58,9 +58,11 @@ int	ifc_name2unit(const char *name, int *unit);
 int	ifc_alloc_unit(struct if_clone *, int *);
 void	ifc_free_unit(struct if_clone *, int);
 
+#ifdef _SYS_EVENTHANDLER_H_
 /* Interface clone event. */
 typedef void (*if_clone_event_handler_t)(void *, struct if_clone *);
 EVENTHANDLER_DECLARE(if_clone_event, if_clone_event_handler_t);
+#endif
 
 /* The below interfaces used only by net/if.c. */
 void	if_clone_init(void);
diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
index 16a1e7b02f4..2afecfe644e 100644
--- a/sys/net/if_disc.c
+++ b/sys/net/if_disc.c
@@ -45,6 +45,7 @@
 #include <sys/sockio.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_types.h>
 #include <net/route.h>
diff --git a/sys/net/if_edsc.c b/sys/net/if_edsc.c
index b54cfaecc50..3ee1c6d864a 100644
--- a/sys/net/if_edsc.c
+++ b/sys/net/if_edsc.c
@@ -46,7 +46,8 @@
 
 #include <net/bpf.h>		/* bpf(9) */
 #include <net/ethernet.h>	/* Ethernet related constants and types */
-#include <net/if.h>		/* basic part of ifnet(9) */
+#include <net/if.h>
+#include <net/if_var.h>		/* basic part of ifnet(9) */
 #include <net/if_clone.h>	/* network interface cloning */
 #include <net/if_types.h>	/* IFT_ETHER and friends */
 #include <net/if_var.h>		/* kernel-only part of ifnet(9) */
diff --git a/sys/net/if_ef.c b/sys/net/if_ef.c
index fc6402c137d..887c9120e30 100644
--- a/sys/net/if_ef.c
+++ b/sys/net/if_ef.c
@@ -43,6 +43,7 @@
 #include <net/ethernet.h>
 #include <net/if_llc.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
index dcb82f5d8f1..fc78769ba54 100644
--- a/sys/net/if_enc.c
+++ b/sys/net/if_enc.c
@@ -44,6 +44,7 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_types.h>
 #include <net/pfil.h>
diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c
index 42a8a7a7725..03e379bd012 100644
--- a/sys/net/if_epair.c
+++ b/sys/net/if_epair.c
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_media.h>
 #include <net/if_var.h>
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 638b3647f6b..04b94defc95 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -51,6 +51,7 @@
 #include <sys/uuid.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/netisr.h>
 #include <net/route.h>
@@ -62,10 +63,11 @@
 #include <net/if_bridgevar.h>
 #include <net/if_vlan_var.h>
 #include <net/if_llatbl.h>
-#include <net/pf_mtag.h>
 #include <net/pfil.h>
 #include <net/vnet.h>
 
+#include <netpfil/pf/pf_mtag.h>
+
 #if defined(INET) || defined(INET6)
 #include <netinet/in.h>
 #include <netinet/in_var.h>
@@ -528,7 +530,8 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m)
 		m->m_flags &= ~M_HASFCS;
 	}
 
-	ifp->if_ibytes += m->m_pkthdr.len;
+	if (!(ifp->if_capenable & IFCAP_HWSTATS))
+		ifp->if_ibytes += m->m_pkthdr.len;
 
 	/* Allow monitor mode to claim this frame, after stats are updated. */
 	if (ifp->if_flags & IFF_MONITOR) {
@@ -639,7 +642,7 @@ ether_input_internal(struct ifnet *ifp, struct mbuf *m)
 	}
 
 	if (harvest.ethernet)
-		random_harvest(&(m->m_data), 12, 3, 0, RANDOM_NET_ETHER);
+		random_harvest(&(m->m_data), 12, 2, RANDOM_NET_ETHER);
 
 	ether_demux(ifp, m);
 	CURVNET_RESTORE();
@@ -705,13 +708,25 @@ static void
 ether_input(struct ifnet *ifp, struct mbuf *m)
 {
 
-	/*
-	 * We will rely on rcvif being set properly in the deferred context,
-	 * so assert it is correct here.
-	 */
-	KASSERT(m->m_pkthdr.rcvif == ifp, ("%s: ifnet mismatch", __func__));
+	struct mbuf *mn;
 
-	netisr_dispatch(NETISR_ETHER, m);
+	/*
+	 * The drivers are allowed to pass in a chain of packets linked with
+	 * m_nextpkt. We split them up into separate packets here and pass
+	 * them up. This allows the drivers to amortize the receive lock.
+	 */
+	while (m) {
+		mn = m->m_nextpkt;
+		m->m_nextpkt = NULL;
+
+		/*
+		 * We will rely on rcvif being set properly in the deferred context,
+		 * so assert it is correct here.
+		 */
+		KASSERT(m->m_pkthdr.rcvif == ifp, ("%s: ifnet mismatch", __func__));
+		netisr_dispatch(NETISR_ETHER, m);
+		m = mn;
+	}
 }
 
 /*
diff --git a/sys/net/if_faith.c b/sys/net/if_faith.c
index 37a53bbeb8f..277e54e2dcb 100644
--- a/sys/net/if_faith.c
+++ b/sys/net/if_faith.c
@@ -56,6 +56,7 @@
 #include <sys/malloc.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 4f54dcb6780..2f03bb7e5fe 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -51,6 +51,7 @@
 #include <sys/sockio.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_llc.h>
 #include <net/if_types.h>
diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c
index 31fc2a949bf..5f0f9238794 100644
--- a/sys/net/if_fwsubr.c
+++ b/sys/net/if_fwsubr.c
@@ -43,6 +43,7 @@
 #include <sys/sockio.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/if_llc.h>
diff --git a/sys/net/if_gif.c b/sys/net/if_gif.c
index dfc2697e9af..6cf04373a4d 100644
--- a/sys/net/if_gif.c
+++ b/sys/net/if_gif.c
@@ -53,6 +53,7 @@
 #include <machine/cpu.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
@@ -152,10 +153,7 @@ static const u_char etherbroadcastaddr[ETHER_ADDR_LEN] =
 #endif
 
 static int
-gif_clone_create(ifc, unit, params)
-	struct if_clone *ifc;
-	int unit;
-	caddr_t params;
+gif_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 {
 	struct gif_softc *sc;
 
@@ -199,8 +197,7 @@ gif_clone_create(ifc, unit, params)
 }
 
 static void
-gif_clone_destroy(ifp)
-	struct ifnet *ifp;
+gif_clone_destroy(struct ifnet *ifp)
 {
 #if defined(INET) || defined(INET6)
 	int err;
@@ -246,10 +243,7 @@ VNET_SYSINIT(vnet_gif_init, SI_SUB_PSEUDO, SI_ORDER_MIDDLE, vnet_gif_init,
     NULL);
 
 static int
-gifmodevent(mod, type, data)
-	module_t mod;
-	int type;
-	void *data;
+gifmodevent(module_t mod, int type, void *data)
 {
 
 	switch (type) {
@@ -279,11 +273,7 @@ DECLARE_MODULE(if_gif, gif_mod, SI_SUB_PSEUDO, SI_ORDER_ANY);
 MODULE_VERSION(if_gif, 1);
 
 int
-gif_encapcheck(m, off, proto, arg)
-	const struct mbuf *m;
-	int off;
-	int proto;
-	void *arg;
+gif_encapcheck(const struct mbuf *m, int off, int proto, void *arg)
 {
 	struct ip ip;
 	struct gif_softc *sc;
@@ -528,10 +518,7 @@ gif_output(struct ifnet *ifp, struct mbuf *m, const struct sockaddr *dst,
 }
 
 void
-gif_input(m, af, ifp)
-	struct mbuf *m;
-	int af;
-	struct ifnet *ifp;
+gif_input(struct mbuf *m, int af, struct ifnet *ifp)
 {
 	int isr, n;
 	struct gif_softc *sc;
@@ -668,10 +655,7 @@ gif_input(m, af, ifp)
 
 /* XXX how should we handle IPv6 scope on SIOC[GS]IFPHYADDR? */
 int
-gif_ioctl(ifp, cmd, data)
-	struct ifnet *ifp;
-	u_long cmd;
-	caddr_t data;
+gif_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct gif_softc *sc  = ifp->if_softc;
 	struct ifreq     *ifr = (struct ifreq*)data;
@@ -709,7 +693,6 @@ gif_ioctl(ifp, cmd, data)
 #ifdef INET6
 	case SIOCSIFPHYADDR_IN6:
 #endif /* INET6 */
-	case SIOCSLIFPHYADDR:
 		switch (cmd) {
 #ifdef INET
 		case SIOCSIFPHYADDR:
@@ -727,12 +710,6 @@ gif_ioctl(ifp, cmd, data)
 				&(((struct in6_aliasreq *)data)->ifra_dstaddr);
 			break;
 #endif
-		case SIOCSLIFPHYADDR:
-			src = (struct sockaddr *)
-				&(((struct if_laddrreq *)data)->addr);
-			dst = (struct sockaddr *)
-				&(((struct if_laddrreq *)data)->dstaddr);
-			break;
 		default:
 			return EINVAL;
 		}
@@ -787,9 +764,6 @@ gif_ioctl(ifp, cmd, data)
 				break;
 			return EAFNOSUPPORT;
 #endif /* INET6 */
-		case SIOCSLIFPHYADDR:
-			/* checks done in the above */
-			break;
 		}
 
 		error = gif_set_tunnel(GIF2IFP(sc), src, dst);
@@ -885,31 +859,6 @@ gif_ioctl(ifp, cmd, data)
 #endif
 		break;
 
-	case SIOCGLIFPHYADDR:
-		if (sc->gif_psrc == NULL || sc->gif_pdst == NULL) {
-			error = EADDRNOTAVAIL;
-			goto bad;
-		}
-
-		/* copy src */
-		src = sc->gif_psrc;
-		dst = (struct sockaddr *)
-			&(((struct if_laddrreq *)data)->addr);
-		size = sizeof(((struct if_laddrreq *)data)->addr);
-		if (src->sa_len > size)
-			return EINVAL;
-		bcopy((caddr_t)src, (caddr_t)dst, src->sa_len);
-
-		/* copy dst */
-		src = sc->gif_pdst;
-		dst = (struct sockaddr *)
-			&(((struct if_laddrreq *)data)->dstaddr);
-		size = sizeof(((struct if_laddrreq *)data)->dstaddr);
-		if (src->sa_len > size)
-			return EINVAL;
-		bcopy((caddr_t)src, (caddr_t)dst, src->sa_len);
-		break;
-
 	case SIOCSIFFLAGS:
 		/* if_ioctl() takes care of it */
 		break;
@@ -948,10 +897,7 @@ gif_ioctl(ifp, cmd, data)
  * a mutex.
  */
 int
-gif_set_tunnel(ifp, src, dst)
-	struct ifnet *ifp;
-	struct sockaddr *src;
-	struct sockaddr *dst;
+gif_set_tunnel(struct ifnet *ifp, struct sockaddr *src, struct sockaddr *dst)
 {
 	struct gif_softc *sc = ifp->if_softc;
 	struct gif_softc *sc2;
@@ -1057,8 +1003,7 @@ gif_set_tunnel(ifp, src, dst)
 }
 
 void
-gif_delete_tunnel(ifp)
-	struct ifnet *ifp;
+gif_delete_tunnel(struct ifnet *ifp)
 {
 	struct gif_softc *sc = ifp->if_softc;
 
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 98090e54859..9f6a78e48b7 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -62,6 +62,7 @@
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_types.h>
 #include <net/route.h>
@@ -518,7 +519,6 @@ static int
 gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 {
 	struct ifreq *ifr = (struct ifreq *)data;
-	struct if_laddrreq *lifr = (struct if_laddrreq *)data;
 	struct in_aliasreq *aifr = (struct in_aliasreq *)data;
 	struct gre_softc *sc = ifp->if_softc;
 	struct sockaddr_in si;
@@ -733,27 +733,6 @@ gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		sc->g_src = aifr->ifra_addr.sin_addr;
 		sc->g_dst = aifr->ifra_dstaddr.sin_addr;
 		goto recompute;
-	case SIOCSLIFPHYADDR:
-		/*
-		 * XXXRW: Isn't this priv_check() redundant to the ifnet
-		 * layer check?
-		 */
-		if ((error = priv_check(curthread, PRIV_NET_SETIFPHYS)) != 0)
-			break;
-		if (lifr->addr.ss_family != AF_INET ||
-		    lifr->dstaddr.ss_family != AF_INET) {
-			error = EAFNOSUPPORT;
-			break;
-		}
-		if (lifr->addr.ss_len != sizeof(si) ||
-		    lifr->dstaddr.ss_len != sizeof(si)) {
-			error = EINVAL;
-			break;
-		}
-		sc->g_src = (satosin(&lifr->addr))->sin_addr;
-		sc->g_dst =
-		    (satosin(&lifr->dstaddr))->sin_addr;
-		goto recompute;
 	case SIOCDIFPHYADDR:
 		/*
 		 * XXXRW: Isn't this priv_check() redundant to the ifnet
@@ -764,26 +743,6 @@ gre_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
 		sc->g_src.s_addr = INADDR_ANY;
 		sc->g_dst.s_addr = INADDR_ANY;
 		goto recompute;
-	case SIOCGLIFPHYADDR:
-		if (sc->g_src.s_addr == INADDR_ANY ||
-		    sc->g_dst.s_addr == INADDR_ANY) {
-			error = EADDRNOTAVAIL;
-			break;
-		}
-		memset(&si, 0, sizeof(si));
-		si.sin_family = AF_INET;
-		si.sin_len = sizeof(struct sockaddr_in);
-		si.sin_addr.s_addr = sc->g_src.s_addr;
-		error = prison_if(curthread->td_ucred, (struct sockaddr *)&si);
-		if (error != 0)
-			break;
-		memcpy(&lifr->addr, &si, sizeof(si));
-		si.sin_addr.s_addr = sc->g_dst.s_addr;
-		error = prison_if(curthread->td_ucred, (struct sockaddr *)&si);
-		if (error != 0)
-			break;
-		memcpy(&lifr->dstaddr, &si, sizeof(si));
-		break;
 	case SIOCGIFPSRCADDR:
 #ifdef INET6
 	case SIOCGIFPSRCADDR_IN6:
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index 5975b282302..825b220a131 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -54,6 +54,7 @@
 #include <sys/sockio.h> 
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
 #include <net/if_llc.h>
diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c
index 27bab876faf..258c2f9113a 100644
--- a/sys/net/if_lagg.c
+++ b/sys/net/if_lagg.c
@@ -347,6 +347,7 @@ lagg_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 	ifp->if_init = lagg_init;
 	ifp->if_ioctl = lagg_ioctl;
 	ifp->if_flags = IFF_SIMPLEX | IFF_BROADCAST | IFF_MULTICAST;
+	ifp->if_capenable = ifp->if_capabilities = IFCAP_HWSTATS;
 
 	/*
 	 * Attach as an ordinary ethernet device, children will be attached
diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
index 499cd2c06f8..64f9209d1fd 100644
--- a/sys/net/if_loop.c
+++ b/sys/net/if_loop.c
@@ -51,6 +51,7 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
diff --git a/sys/net/if_media.h b/sys/net/if_media.h
index 7d26f7a35e5..a7a775b9a60 100644
--- a/sys/net/if_media.h
+++ b/sys/net/if_media.h
@@ -54,6 +54,8 @@
 
 #include <sys/queue.h>
 
+struct ifnet;
+
 /*
  * Driver callbacks for media status and change requests.
  */
@@ -153,7 +155,10 @@ uint64_t	ifmedia_baudrate(int);
 #define	IFM_40G_CR4	27		/* 40GBase-CR4 */
 #define	IFM_40G_SR4	28		/* 40GBase-SR4 */
 #define	IFM_40G_LR4	29		/* 40GBase-LR4 */
-
+/*
+ * Please update ieee8023ad_lacp.c:lacp_compose_key()
+ * after adding new Ethernet media types.
+ */
 /* note 31 is the max! */
 
 #define	IFM_ETH_MASTER	0x00000100	/* master mode (1000baseT) */
diff --git a/sys/net/if_mib.c b/sys/net/if_mib.c
index 97a2d402846..aa6e6e5acb7 100644
--- a/sys/net/if_mib.c
+++ b/sys/net/if_mib.c
@@ -36,6 +36,7 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_mib.h>
 #include <net/vnet.h>
 
diff --git a/sys/net/if_spppfr.c b/sys/net/if_spppfr.c
index b5e24f6802d..a1518492c26 100644
--- a/sys/net/if_spppfr.c
+++ b/sys/net/if_spppfr.c
@@ -58,6 +58,7 @@
 #endif
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/if_types.h>
 #include <net/route.h>
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 9fe713c3891..b24ea73d331 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -40,6 +40,7 @@
 #include <sys/md5.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/if_types.h>
 #include <net/route.h>
diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
index 2c347398be6..e0bec252ce1 100644
--- a/sys/net/if_stf.c
+++ b/sys/net/if_stf.c
@@ -94,6 +94,7 @@
 #include <sys/malloc.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/route.h>
 #include <net/netisr.h>
diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c
index fe53a6acf4f..5153b2adbc4 100644
--- a/sys/net/if_tap.c
+++ b/sys/net/if_tap.c
@@ -63,6 +63,7 @@
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
@@ -205,7 +206,7 @@ vmnet_clone_create(struct if_clone *ifc, int unit, caddr_t params)
 	i = clone_create(&tapclones, &tap_cdevsw, &unit, &dev, VMNET_DEV_MASK);
 	if (i) {
 		dev = make_dev(&tap_cdevsw, unit | VMNET_DEV_MASK, UID_ROOT,
-		    GID_WHEEL, 0600, "%s%d", tapname, unit);
+		    GID_WHEEL, 0600, "%s%d", vmnetname, unit);
 	}
 
 	tapcreate(dev);
@@ -828,8 +829,7 @@ tapioctl(struct cdev *dev, u_long cmd, caddr_t data, int flag, struct thread *td
 			mtx_unlock(&tp->tap_mtx);
 			break;
 
-		case OSIOCGIFADDR:	/* get MAC address of the remote side */
-		case SIOCGIFADDR:
+		case SIOCGIFADDR:	/* get MAC address of the remote side */
 			mtx_lock(&tp->tap_mtx);
 			bcopy(tp->ether_addr, data, sizeof(tp->ether_addr));
 			mtx_unlock(&tp->tap_mtx);
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index f36e7ada3d2..ddef6f90d20 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -45,6 +45,7 @@
 #include <sys/random.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
@@ -918,7 +919,7 @@ tunwrite(struct cdev *dev, struct uio *uio, int flag)
 		return (EAFNOSUPPORT);
 	}
 	if (harvest.point_to_point)
-		random_harvest(&(m->m_data), 12, 3, 0, RANDOM_NET_TUN);
+		random_harvest(&(m->m_data), 12, 2, RANDOM_NET_TUN);
 	ifp->if_ibytes += m->m_pkthdr.len;
 	ifp->if_ipackets++;
 	CURVNET_SET(ifp->if_vnet);
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index 3288a4f555a..26163ada6e3 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -58,37 +58,26 @@
  * interfaces.  These routines live in the files if.c and route.c
  */
 
-#ifdef __STDC__
-/*
- * Forward structure declarations for function prototypes [sic].
- */
-struct	mbuf;
-struct	thread;
-struct	rtentry;
-struct	rt_addrinfo;
+struct	rtentry;		/* ifa_rtrequest */
+struct	rt_addrinfo;		/* ifa_rtrequest */
 struct	socket;
-struct	ether_header;
 struct	carp_if;
 struct	carp_softc;
 struct  ifvlantrunk;
-struct	route;
+struct	route;			/* if_output */
 struct	vnet;
-#endif
-
-#include <sys/queue.h>		/* get TAILQ macros */
 
 #ifdef _KERNEL
-#include <sys/mbuf.h>
-#include <sys/eventhandler.h>
+#include <sys/mbuf.h>		/* ifqueue only? */
 #include <sys/buf_ring.h>
 #include <net/vnet.h>
 #endif /* _KERNEL */
+#include <sys/counter.h>
 #include <sys/lock.h>		/* XXX */
-#include <sys/mutex.h>		/* XXX */
+#include <sys/mutex.h>		/* struct ifqueue */
 #include <sys/rwlock.h>		/* XXX */
 #include <sys/sx.h>		/* XXX */
-#include <sys/event.h>		/* XXX */
-#include <sys/_task.h>
+#include <sys/_task.h>		/* if_link_task */
 
 #define	IF_DUNIT_NONE	-1
 
@@ -104,34 +93,45 @@ VNET_DECLARE(struct pfil_head, link_pfil_hook);	/* packet filter hooks */
 #define	V_link_pfil_hook	VNET(link_pfil_hook)
 #endif /* _KERNEL */
 
-/*
- * Structure defining a queue for a network interface.
- */
-struct	ifqueue {
-	struct	mbuf *ifq_head;
-	struct	mbuf *ifq_tail;
-	int	ifq_len;
-	int	ifq_maxlen;
-	int	ifq_drops;
-	struct	mtx ifq_mtx;
-};
-
 /*
  * Structure defining a network interface.
  *
- * (Would like to call this struct ``if'', but C isn't PL/1.)
+ * Size ILP32:  592 (approx)
+ *	 LP64: 1048 (approx)
  */
-
 struct ifnet {
-	void	*if_softc;		/* pointer to driver state */
-	void	*if_l2com;		/* pointer to protocol bits */
-	struct vnet *if_vnet;		/* pointer to network stack instance */
+	/* General book keeping of interface lists. */
 	TAILQ_ENTRY(ifnet) if_link; 	/* all struct ifnets are chained */
-	char	if_xname[IFNAMSIZ];	/* external name (name + unit) */
+	LIST_ENTRY(ifnet) if_clones;	/* interfaces of a cloner */
+	TAILQ_HEAD(, ifg_list) if_groups; /* linked list of groups per if */
+					/* protected by if_addr_lock */
+	u_char	if_alloctype;		/* if_type at time of allocation */
+
+	/* Driver and protocol specific information that remains stable. */
+	void	*if_softc;		/* pointer to driver state */
+	void	*if_llsoftc;		/* link layer softc */
+	void	*if_l2com;		/* pointer to protocol bits */
 	const char *if_dname;		/* driver name */
 	int	if_dunit;		/* unit or IF_DUNIT_NONE */
+	u_short	if_index;		/* numeric abbreviation for this if  */
+	short	if_index_reserved;	/* spare space to grow if_index */
+	char	if_xname[IFNAMSIZ];	/* external name (name + unit) */
+	char	*if_description;	/* interface description */
+
+	/* Variable fields that are touched by the stack and drivers. */
+	int	if_flags;		/* up/down, broadcast, etc. */
+	int	if_capabilities;	/* interface features & capabilities */
+	int	if_capenable;		/* enabled features & capabilities */
+	void	*if_linkmib;		/* link-type-specific MIB data */
+	size_t	if_linkmiblen;		/* length of above data */
+	int	if_drv_flags;		/* driver-managed status flags */
 	u_int	if_refcount;		/* reference count */
-	struct	ifaddrhead if_addrhead;	/* linked list of addresses per if */
+	struct  ifaltq if_snd;		/* output queue (includes altq) */
+	struct	if_data if_data;	/* type information and statistics */
+	struct	task if_linktask;	/* task for link change events */
+
+	/* Addresses of different protocol families assigned to this if. */
+	struct	rwlock if_addr_lock;	/* lock to protect address lists */
 		/*
 		 * if_addrhead is the list of all addresses associated to
 		 * an interface.
@@ -142,21 +142,29 @@ struct ifnet {
 		 * However, access to the AF_LINK address through this
 		 * field is deprecated. Use if_addr or ifaddr_byindex() instead.
 		 */
-	int	if_pcount;		/* number of promiscuous listeners */
-	struct	carp_if *if_carp;	/* carp interface structure */
-	struct	bpf_if *if_bpf;		/* packet filter structure */
-	u_short	if_index;		/* numeric abbreviation for this if  */
-	short	if_index_reserved;	/* spare space to grow if_index */
-	struct  ifvlantrunk *if_vlantrunk; /* pointer to 802.1q data */
-	int	if_flags;		/* up/down, broadcast, etc. */
-	int	if_capabilities;	/* interface features & capabilities */
-	int	if_capenable;		/* enabled features & capabilities */
-	void	*if_linkmib;		/* link-type-specific MIB data */
-	size_t	if_linkmiblen;		/* length of above data */
-	struct	if_data if_data;
+	struct	ifaddrhead if_addrhead;	/* linked list of addresses per if */
 	struct	ifmultihead if_multiaddrs; /* multicast addresses configured */
 	int	if_amcount;		/* number of all-multicast requests */
-/* procedure handles */
+	struct	ifaddr	*if_addr;	/* pointer to link-level address */
+	const u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */
+	struct	rwlock if_afdata_lock;
+	void	*if_afdata[AF_MAX];
+	int	if_afdata_initialized;
+
+	/* Additional features hung off the interface. */
+	u_int	if_fib;			/* interface FIB */
+	struct	vnet *if_vnet;		/* pointer to network stack instance */
+	struct	vnet *if_home_vnet;	/* where this ifnet originates from */
+	struct  ifvlantrunk *if_vlantrunk; /* pointer to 802.1q data */
+	struct	bpf_if *if_bpf;		/* packet filter structure */
+	int	if_pcount;		/* number of promiscuous listeners */
+	void	*if_bridge;		/* bridge glue */
+	void	*if_lagg;		/* lagg glue */
+	void	*if_pf_kif;		/* pf glue */
+	struct	carp_if *if_carp;	/* carp interface structure */
+	struct	label *if_label;	/* interface MAC label */
+
+	/* Various procedures of the layer2 encapsulation and drivers. */
 	int	(*if_output)		/* output routine (enqueue) */
 		(struct ifnet *, struct mbuf *, const struct sockaddr *,
 		     struct route *);
@@ -176,39 +184,12 @@ struct ifnet {
 		(struct ifnet *, struct mbuf *);
 	void	(*if_reassign)		/* reassign to vnet routine */
 		(struct ifnet *, struct vnet *, char *);
-	struct	vnet *if_home_vnet;	/* where this ifnet originates from */
-	struct	ifaddr	*if_addr;	/* pointer to link-level address */
-	void	*if_llsoftc;		/* link layer softc */
-	int	if_drv_flags;		/* driver-managed status flags */
-	struct  ifaltq if_snd;		/* output queue (includes altq) */
-	const u_int8_t *if_broadcastaddr; /* linklevel broadcast bytestring */
-
-	void	*if_bridge;		/* bridge glue */
-
-	struct	label *if_label;	/* interface MAC label */
-
-	/* these are only used by IPv6 */
-	void	*if_unused[2];
-	void	*if_afdata[AF_MAX];
-	int	if_afdata_initialized;
-	struct	rwlock if_afdata_lock;
-	struct	task if_linktask;	/* task for link change events */
-	struct	rwlock if_addr_lock;	/* lock to protect address lists */
-
-	LIST_ENTRY(ifnet) if_clones;	/* interfaces of a cloner */
-	TAILQ_HEAD(, ifg_list) if_groups; /* linked list of groups per if */
-					/* protected by if_addr_lock */
-	void	*if_pf_kif;
-	void	*if_lagg;		/* lagg glue */
-	char	*if_description;	/* interface description */
-	u_int	if_fib;			/* interface FIB */
-	u_char	if_alloctype;		/* if_type at time of allocation */
 
+	/* 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. */
-
 	/*
 	 * Spare fields are added so that we can modify sensitive data
 	 * structures without changing the kernel binary interface, and must
@@ -216,10 +197,11 @@ struct ifnet {
 	 */
 	char	if_cspare[3];
 	int	if_ispare[4];
+	void	*if_unused[2];
 	void	*if_pspare[8];		/* 1 netmap, 7 TDB */
 };
 
-typedef void if_init_f_t(void *);
+#include <net/ifq.h>	/* XXXAO: temporary unconditional include */
 
 /*
  * XXX These aliases are terribly dangerous because they could apply
@@ -275,97 +257,8 @@ void	if_addr_runlock(struct ifnet *ifp);	/* if_addrhead */
 void	if_maddr_rlock(struct ifnet *ifp);	/* if_multiaddrs */
 void	if_maddr_runlock(struct ifnet *ifp);	/* if_multiaddrs */
 
-/*
- * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq)
- * are queues of messages stored on ifqueue structures
- * (defined above).  Entries are added to and deleted from these structures
- * by these macros.
- */
-#define IF_LOCK(ifq)		mtx_lock(&(ifq)->ifq_mtx)
-#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 { 				\
-	(m)->m_nextpkt = NULL;					\
-	if ((ifq)->ifq_tail == NULL) 				\
-		(ifq)->ifq_head = m; 				\
-	else 							\
-		(ifq)->ifq_tail->m_nextpkt = m; 		\
-	(ifq)->ifq_tail = m; 					\
-	(ifq)->ifq_len++; 					\
-} while (0)
-
-#define IF_ENQUEUE(ifq, m) do {					\
-	IF_LOCK(ifq); 						\
-	_IF_ENQUEUE(ifq, m); 					\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_PREPEND(ifq, m) do {				\
-	(m)->m_nextpkt = (ifq)->ifq_head; 			\
-	if ((ifq)->ifq_tail == NULL) 				\
-		(ifq)->ifq_tail = (m); 				\
-	(ifq)->ifq_head = (m); 					\
-	(ifq)->ifq_len++; 					\
-} while (0)
-
-#define IF_PREPEND(ifq, m) do {		 			\
-	IF_LOCK(ifq); 						\
-	_IF_PREPEND(ifq, m); 					\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_DEQUEUE(ifq, m) do { 				\
-	(m) = (ifq)->ifq_head; 					\
-	if (m) { 						\
-		if (((ifq)->ifq_head = (m)->m_nextpkt) == NULL)	\
-			(ifq)->ifq_tail = NULL; 		\
-		(m)->m_nextpkt = NULL; 				\
-		(ifq)->ifq_len--; 				\
-	} 							\
-} while (0)
-
-#define IF_DEQUEUE(ifq, m) do { 				\
-	IF_LOCK(ifq); 						\
-	_IF_DEQUEUE(ifq, m); 					\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_DEQUEUE_ALL(ifq, m) do {				\
-	(m) = (ifq)->ifq_head;					\
-	(ifq)->ifq_head = (ifq)->ifq_tail = NULL;		\
-	(ifq)->ifq_len = 0;					\
-} while (0)
-
-#define	IF_DEQUEUE_ALL(ifq, m) do {				\
-	IF_LOCK(ifq); 						\
-	_IF_DEQUEUE_ALL(ifq, m);				\
-	IF_UNLOCK(ifq); 					\
-} while (0)
-
-#define	_IF_POLL(ifq, m)	((m) = (ifq)->ifq_head)
-#define	IF_POLL(ifq, m)		_IF_POLL(ifq, m)
-
-#define _IF_DRAIN(ifq) do { 					\
-	struct mbuf *m; 					\
-	for (;;) { 						\
-		_IF_DEQUEUE(ifq, m); 				\
-		if (m == NULL) 					\
-			break; 					\
-		m_freem(m); 					\
-	} 							\
-} while (0)
-
-#define IF_DRAIN(ifq) do {					\
-	IF_LOCK(ifq);						\
-	_IF_DRAIN(ifq);						\
-	IF_UNLOCK(ifq);						\
-} while(0)
-
 #ifdef _KERNEL
+#ifdef _SYS_EVENTHANDLER_H_
 /* interface link layer address change event */
 typedef void (*iflladdr_event_handler_t)(void *, struct ifnet *);
 EVENTHANDLER_DECLARE(iflladdr_event, iflladdr_event_handler_t);
@@ -381,6 +274,7 @@ EVENTHANDLER_DECLARE(ifnet_departure_event, ifnet_departure_event_handler_t);
 /* Interface link state change event */
 typedef void (*ifnet_link_event_handler_t)(void *, struct ifnet *, int);
 EVENTHANDLER_DECLARE(ifnet_link_event, ifnet_link_event_handler_t);
+#endif /* _SYS_EVENTHANDLER_H_ */
 
 /*
  * interface groups
@@ -403,6 +297,7 @@ struct ifg_list {
 	TAILQ_ENTRY(ifg_list)	 ifgl_next;
 };
 
+#ifdef _SYS_EVENTHANDLER_H_
 /* group attach event */
 typedef void (*group_attach_event_handler_t)(void *, struct ifg_group *);
 EVENTHANDLER_DECLARE(group_attach_event, group_attach_event_handler_t);
@@ -412,6 +307,7 @@ EVENTHANDLER_DECLARE(group_detach_event, group_detach_event_handler_t);
 /* group change event */
 typedef void (*group_change_event_handler_t)(void *, const char *);
 EVENTHANDLER_DECLARE(group_change_event, group_change_event_handler_t);
+#endif /* _SYS_EVENTHANDLER_H_ */
 
 #define	IF_AFDATA_LOCK_INIT(ifp)	\
 	rw_init(&(ifp)->if_afdata_lock, "if_afdata")
@@ -430,172 +326,6 @@ EVENTHANDLER_DECLARE(group_change_event, group_change_event_handler_t);
 #define	IF_AFDATA_WLOCK_ASSERT(ifp)	rw_assert(&(ifp)->if_afdata_lock, RA_WLOCKED)
 #define	IF_AFDATA_UNLOCK_ASSERT(ifp)	rw_assert(&(ifp)->if_afdata_lock, RA_UNLOCKED)
 
-int	if_handoff(struct ifqueue *ifq, struct mbuf *m, struct ifnet *ifp,
-	    int adjust);
-#define	IF_HANDOFF(ifq, m, ifp)			\
-	if_handoff((struct ifqueue *)ifq, m, ifp, 0)
-#define	IF_HANDOFF_ADJ(ifq, m, ifp, adj)	\
-	if_handoff((struct ifqueue *)ifq, m, ifp, adj)
-
-void	if_start(struct ifnet *);
-
-#define	IFQ_ENQUEUE(ifq, m, err)					\
-do {									\
-	IF_LOCK(ifq);							\
-	if (ALTQ_IS_ENABLED(ifq))					\
-		ALTQ_ENQUEUE(ifq, m, NULL, err);			\
-	else {								\
-		if (_IF_QFULL(ifq)) {					\
-			m_freem(m);					\
-			(err) = ENOBUFS;				\
-		} else {						\
-			_IF_ENQUEUE(ifq, m);				\
-			(err) = 0;					\
-		}							\
-	}								\
-	if (err)							\
-		(ifq)->ifq_drops++;					\
-	IF_UNLOCK(ifq);							\
-} while (0)
-
-#define	IFQ_DEQUEUE_NOLOCK(ifq, m)					\
-do {									\
-	if (TBR_IS_ENABLED(ifq))					\
-		(m) = tbr_dequeue_ptr(ifq, ALTDQ_REMOVE);		\
-	else if (ALTQ_IS_ENABLED(ifq))					\
-		ALTQ_DEQUEUE(ifq, m);					\
-	else								\
-		_IF_DEQUEUE(ifq, m);					\
-} while (0)
-
-#define	IFQ_DEQUEUE(ifq, m)						\
-do {									\
-	IF_LOCK(ifq);							\
-	IFQ_DEQUEUE_NOLOCK(ifq, m);					\
-	IF_UNLOCK(ifq);							\
-} while (0)
-
-#define	IFQ_POLL_NOLOCK(ifq, m)						\
-do {									\
-	if (TBR_IS_ENABLED(ifq))					\
-		(m) = tbr_dequeue_ptr(ifq, ALTDQ_POLL);			\
-	else if (ALTQ_IS_ENABLED(ifq))					\
-		ALTQ_POLL(ifq, m);					\
-	else								\
-		_IF_POLL(ifq, m);					\
-} while (0)
-
-#define	IFQ_POLL(ifq, m)						\
-do {									\
-	IF_LOCK(ifq);							\
-	IFQ_POLL_NOLOCK(ifq, m);					\
-	IF_UNLOCK(ifq);							\
-} while (0)
-
-#define	IFQ_PURGE_NOLOCK(ifq)						\
-do {									\
-	if (ALTQ_IS_ENABLED(ifq)) {					\
-		ALTQ_PURGE(ifq);					\
-	} else								\
-		_IF_DRAIN(ifq);						\
-} while (0)
-
-#define	IFQ_PURGE(ifq)							\
-do {									\
-	IF_LOCK(ifq);							\
-	IFQ_PURGE_NOLOCK(ifq);						\
-	IF_UNLOCK(ifq);							\
-} while (0)
-
-#define	IFQ_SET_READY(ifq)						\
-	do { ((ifq)->altq_flags |= ALTQF_READY); } while (0)
-
-#define	IFQ_LOCK(ifq)			IF_LOCK(ifq)
-#define	IFQ_UNLOCK(ifq)			IF_UNLOCK(ifq)
-#define	IFQ_LOCK_ASSERT(ifq)		IF_LOCK_ASSERT(ifq)
-#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))
-
-/*
- * The IFF_DRV_OACTIVE test should really occur in the device driver, not in
- * the handoff logic, as that flag is locked by the device driver.
- */
-#define	IFQ_HANDOFF_ADJ(ifp, m, adj, err)				\
-do {									\
-	int len;							\
-	short mflags;							\
-									\
-	len = (m)->m_pkthdr.len;					\
-	mflags = (m)->m_flags;						\
-	IFQ_ENQUEUE(&(ifp)->if_snd, m, err);				\
-	if ((err) == 0) {						\
-		(ifp)->if_obytes += len + (adj);			\
-		if (mflags & M_MCAST)					\
-			(ifp)->if_omcasts++;				\
-		if (((ifp)->if_drv_flags & IFF_DRV_OACTIVE) == 0)	\
-			if_start(ifp);					\
-	}								\
-} while (0)
-
-#define	IFQ_HANDOFF(ifp, m, err)					\
-	IFQ_HANDOFF_ADJ(ifp, m, 0, err)
-
-#define	IFQ_DRV_DEQUEUE(ifq, m)						\
-do {									\
-	(m) = (ifq)->ifq_drv_head;					\
-	if (m) {							\
-		if (((ifq)->ifq_drv_head = (m)->m_nextpkt) == NULL)	\
-			(ifq)->ifq_drv_tail = NULL;			\
-		(m)->m_nextpkt = NULL;					\
-		(ifq)->ifq_drv_len--;					\
-	} else {							\
-		IFQ_LOCK(ifq);						\
-		IFQ_DEQUEUE_NOLOCK(ifq, m);				\
-		while ((ifq)->ifq_drv_len < (ifq)->ifq_drv_maxlen) {	\
-			struct mbuf *m0;				\
-			IFQ_DEQUEUE_NOLOCK(ifq, m0);			\
-			if (m0 == NULL)					\
-				break;					\
-			m0->m_nextpkt = NULL;				\
-			if ((ifq)->ifq_drv_tail == NULL)		\
-				(ifq)->ifq_drv_head = m0;		\
-			else						\
-				(ifq)->ifq_drv_tail->m_nextpkt = m0;	\
-			(ifq)->ifq_drv_tail = m0;			\
-			(ifq)->ifq_drv_len++;				\
-		}							\
-		IFQ_UNLOCK(ifq);					\
-	}								\
-} while (0)
-
-#define	IFQ_DRV_PREPEND(ifq, m)						\
-do {									\
-	(m)->m_nextpkt = (ifq)->ifq_drv_head;				\
-	if ((ifq)->ifq_drv_tail == NULL)				\
-		(ifq)->ifq_drv_tail = (m);				\
-	(ifq)->ifq_drv_head = (m);					\
-	(ifq)->ifq_drv_len++;						\
-} while (0)
-
-#define	IFQ_DRV_IS_EMPTY(ifq)						\
-	(((ifq)->ifq_drv_len == 0) && ((ifq)->ifq_len == 0))
-
-#define	IFQ_DRV_PURGE(ifq)						\
-do {									\
-	struct mbuf *m, *n = (ifq)->ifq_drv_head;			\
-	while((m = n) != NULL) {					\
-		n = m->m_nextpkt;					\
-		m_freem(m);						\
-	}								\
-	(ifq)->ifq_drv_head = (ifq)->ifq_drv_tail = NULL;		\
-	(ifq)->ifq_drv_len = 0;						\
-	IFQ_PURGE(ifq);							\
-} while (0)
-
-#ifdef _KERNEL
 static __inline void
 if_initbaudrate(struct ifnet *ifp, uintmax_t baud)
 {
@@ -608,165 +338,6 @@ if_initbaudrate(struct ifnet *ifp, uintmax_t baud)
 	ifp->if_baudrate = baud;
 }
 
-static __inline int
-drbr_enqueue(struct ifnet *ifp, struct buf_ring *br, struct mbuf *m)
-{	
-	int error = 0;
-
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
-		IFQ_ENQUEUE(&ifp->if_snd, m, error);
-		return (error);
-	}
-#endif
-	error = buf_ring_enqueue(br, m);
-	if (error)
-		m_freem(m);
-
-	return (error);
-}
-
-static __inline void
-drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *new)
-{
-	/*
-	 * The top of the list needs to be swapped 
-	 * for this one.
-	 */
-#ifdef ALTQ
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {
-		/* 
-		 * Peek in altq case dequeued it
-		 * so put it back.
-		 */
-		IFQ_DRV_PREPEND(&ifp->if_snd, new);
-		return;
-	}
-#endif
-	buf_ring_putback_sc(br, new);
-}
-
-static __inline struct mbuf *
-drbr_peek(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	struct mbuf *m;
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {
-		/* 
-		 * Pull it off like a dequeue
-		 * since drbr_advance() does nothing
-		 * for altq and drbr_putback() will
-		 * use the old prepend function.
-		 */
-		IFQ_DEQUEUE(&ifp->if_snd, m);
-		return (m);
-	}
-#endif
-	return(buf_ring_peek(br));
-}
-
-static __inline void
-drbr_flush(struct ifnet *ifp, struct buf_ring *br)
-{
-	struct mbuf *m;
-
-#ifdef ALTQ
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd))
-		IFQ_PURGE(&ifp->if_snd);
-#endif	
-	while ((m = buf_ring_dequeue_sc(br)) != NULL)
-		m_freem(m);
-}
-
-static __inline void
-drbr_free(struct buf_ring *br, struct malloc_type *type)
-{
-
-	drbr_flush(NULL, br);
-	buf_ring_free(br, type);
-}
-
-static __inline struct mbuf *
-drbr_dequeue(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	struct mbuf *m;
-
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {	
-		IFQ_DEQUEUE(&ifp->if_snd, m);
-		return (m);
-	}
-#endif
-	return (buf_ring_dequeue_sc(br));
-}
-
-static __inline void
-drbr_advance(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	/* Nothing to do here since peek dequeues in altq case */
-	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd))
-		return;
-#endif
-	return (buf_ring_advance_sc(br));
-}
-
-
-static __inline struct mbuf *
-drbr_dequeue_cond(struct ifnet *ifp, struct buf_ring *br,
-    int (*func) (struct mbuf *, void *), void *arg) 
-{
-	struct mbuf *m;
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
-		IFQ_LOCK(&ifp->if_snd);
-		IFQ_POLL_NOLOCK(&ifp->if_snd, m);
-		if (m != NULL && func(m, arg) == 0) {
-			IFQ_UNLOCK(&ifp->if_snd);
-			return (NULL);
-		}
-		IFQ_DEQUEUE_NOLOCK(&ifp->if_snd, m);
-		IFQ_UNLOCK(&ifp->if_snd);
-		return (m);
-	}
-#endif
-	m = buf_ring_peek(br);
-	if (m == NULL || func(m, arg) == 0)
-		return (NULL);
-
-	return (buf_ring_dequeue_sc(br));
-}
-
-static __inline int
-drbr_empty(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd))
-		return (IFQ_IS_EMPTY(&ifp->if_snd));
-#endif
-	return (buf_ring_empty(br));
-}
-
-static __inline int
-drbr_needs_enqueue(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd))
-		return (1);
-#endif
-	return (!buf_ring_empty(br));
-}
-
-static __inline int
-drbr_inuse(struct ifnet *ifp, struct buf_ring *br)
-{
-#ifdef ALTQ
-	if (ALTQ_IS_ENABLED(&ifp->if_snd))
-		return (ifp->if_snd.ifq_len);
-#endif
-	return (buf_ring_count(br));
-}
-#endif
 /*
  * 72 was chosen below because it is the size of a TCP/IP
  * header (40) + the minimum mss (32).
@@ -788,12 +359,12 @@ drbr_inuse(struct ifnet *ifp, struct buf_ring *br)
  * chunk of malloc'ed memory, where we store the three addresses
  * (ifa_addr, ifa_dstaddr and ifa_netmask) referenced here.
  */
+#if defined(_KERNEL) || defined(_WANT_IFADDR)
 struct ifaddr {
 	struct	sockaddr *ifa_addr;	/* address of interface */
 	struct	sockaddr *ifa_dstaddr;	/* other end of p-to-p link */
 #define	ifa_broadaddr	ifa_dstaddr	/* broadcast address interface */
 	struct	sockaddr *ifa_netmask;	/* used to determine subnet */
-	struct	if_data if_data;	/* not all members are meaningful */
 	struct	ifnet *ifa_ifp;		/* back-pointer to interface */
 	struct	carp_softc *ifa_carp;	/* pointer to CARP data */
 	TAILQ_ENTRY(ifaddr) ifa_link;	/* queue macro glue */
@@ -804,22 +375,25 @@ struct ifaddr {
 	int	ifa_metric;		/* cost of going out this interface */
 	int (*ifa_claim_addr)		/* check if an addr goes to this if */
 		(struct ifaddr *, struct sockaddr *);
-	struct mtx ifa_mtx;
-};
-#define	IFA_ROUTE	RTF_UP		/* route installed */
-#define IFA_RTSELF	RTF_HOST	/* loopback route to self installed */
 
-/* for compatibility with other BSDs */
-#define	ifa_list	ifa_link
+	counter_u64_t	ifa_ipackets;
+	counter_u64_t	ifa_opackets;	 
+	counter_u64_t	ifa_ibytes;
+	counter_u64_t	ifa_obytes;
+};
+#endif
 
 #ifdef _KERNEL
-#define	IFA_LOCK(ifa)		mtx_lock(&(ifa)->ifa_mtx)
-#define	IFA_UNLOCK(ifa)		mtx_unlock(&(ifa)->ifa_mtx)
+#define	IFA_ROUTE	RTF_UP		/* route installed */
+#define	IFA_RTSELF	RTF_HOST	/* loopback route to self installed */
 
+/* For compatibility with other BSDs. SCTP uses it. */
+#define	ifa_list	ifa_link
+
+struct ifaddr *	ifa_alloc(size_t size, int flags);
 void	ifa_free(struct ifaddr *ifa);
-void	ifa_init(struct ifaddr *ifa);
 void	ifa_ref(struct ifaddr *ifa);
-#endif
+#endif /* _KERNEL */
 
 /*
  * Multicast address structure.  This is analogous to the ifaddr
@@ -891,15 +465,11 @@ VNET_DECLARE(struct ifnethead, ifnet);
 VNET_DECLARE(struct ifgrouphead, ifg_head);
 VNET_DECLARE(int, if_index);
 VNET_DECLARE(struct ifnet *, loif);	/* first loopback interface */
-VNET_DECLARE(int, useloopback);
 
 #define	V_ifnet		VNET(ifnet)
 #define	V_ifg_head	VNET(ifg_head)
 #define	V_if_index	VNET(if_index)
 #define	V_loif		VNET(loif)
-#define	V_useloopback	VNET(useloopback)
-
-extern	int ifqmaxlen;
 
 int	if_addgroup(struct ifnet *, const char *);
 int	if_delgroup(struct ifnet *, const char *);
@@ -921,7 +491,6 @@ void	if_free(struct ifnet *);
 void	if_initname(struct ifnet *, const char *, int);
 void	if_link_state_change(struct ifnet *, int);
 int	if_printf(struct ifnet *, const char *, ...) __printflike(2, 3);
-void	if_qflush(struct ifnet *);
 void	if_ref(struct ifnet *);
 void	if_rele(struct ifnet *);
 int	if_setlladdr(struct ifnet *, const u_char *, int);
@@ -931,11 +500,9 @@ int	ifpromisc(struct ifnet *, int);
 struct	ifnet *ifunit(const char *);
 struct	ifnet *ifunit_ref(const char *);
 
-void	ifq_init(struct ifaltq *, struct ifnet *ifp);
-void	ifq_delete(struct ifaltq *);
-
 int	ifa_add_loopback_route(struct ifaddr *, struct sockaddr *);
 int	ifa_del_loopback_route(struct ifaddr *, struct sockaddr *);
+int	ifa_switch_loopback_route(struct ifaddr *, struct sockaddr *);
 
 struct	ifaddr *ifa_ifwithaddr(struct sockaddr *);
 int		ifa_ifwithaddr_check(struct sockaddr *);
@@ -957,14 +524,5 @@ void	if_deregister_com_alloc(u_char type);
 #define IF_LLADDR(ifp)							\
     LLADDR((struct sockaddr_dl *)((ifp)->if_addr->ifa_addr))
 
-#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);
-#endif /* DEVICE_POLLING */
-
 #endif /* _KERNEL */
-
 #endif /* !_NET_IF_VAR_H_ */
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index b7f119715fc..75699fb8ff2 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_vlan.h"
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
@@ -61,6 +62,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
diff --git a/sys/net/if_vlan_var.h b/sys/net/if_vlan_var.h
index 4eb3b09feb3..b24087435da 100644
--- a/sys/net/if_vlan_var.h
+++ b/sys/net/if_vlan_var.h
@@ -150,6 +150,14 @@ extern	int (*vlan_tag_p)(struct ifnet *, uint16_t *);
 extern	int (*vlan_setcookie_p)(struct ifnet *, void *);
 extern	void *(*vlan_cookie_p)(struct ifnet *);
 
+#ifdef _SYS_EVENTHANDLER_H_
+/* VLAN state change events */
+typedef void (*vlan_config_fn)(void *, struct ifnet *, uint16_t);
+typedef void (*vlan_unconfig_fn)(void *, struct ifnet *, uint16_t);
+EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn);
+EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn);
+#endif /* _SYS_EVENTHANDLER_H_ */
+
 #endif /* _KERNEL */
 
 #endif /* _NET_IF_VLAN_VAR_H_ */
diff --git a/sys/net/ifq.h b/sys/net/ifq.h
new file mode 100644
index 00000000000..18d61e22d37
--- /dev/null
+++ b/sys/net/ifq.h
@@ -0,0 +1,490 @@
+/*-
+ * Copyright (c) 1982, 1986, 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.
+ * 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: @(#)if.h	8.1 (Berkeley) 6/10/93
+ * $FreeBSD$
+ */
+
+#ifndef	_NET_IFQ_H_
+#define	_NET_IFQ_H_
+
+#ifdef _KERNEL
+#include <sys/mbuf.h>		/* ifqueue only? */
+#include <sys/buf_ring.h>
+#include <net/vnet.h>
+#endif /* _KERNEL */
+#include <sys/lock.h>		/* XXX */
+#include <sys/mutex.h>		/* struct ifqueue */
+
+#define	IF_DUNIT_NONE	-1
+
+#include <altq/if_altq.h>
+
+/*
+ * Structure defining a queue for a network interface.
+ */
+struct	ifqueue {
+	struct	mbuf *ifq_head;
+	struct	mbuf *ifq_tail;
+	int	ifq_len;
+	int	ifq_maxlen;
+	int	ifq_drops;
+	struct	mtx ifq_mtx;
+};
+
+#ifdef _KERNEL
+/*
+ * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq)
+ * are queues of messages stored on ifqueue structures
+ * (defined above).  Entries are added to and deleted from these structures
+ * by these macros.
+ */
+#define IF_LOCK(ifq)		mtx_lock(&(ifq)->ifq_mtx)
+#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 { 				\
+	(m)->m_nextpkt = NULL;					\
+	if ((ifq)->ifq_tail == NULL) 				\
+		(ifq)->ifq_head = m; 				\
+	else 							\
+		(ifq)->ifq_tail->m_nextpkt = m; 		\
+	(ifq)->ifq_tail = m; 					\
+	(ifq)->ifq_len++; 					\
+} while (0)
+
+#define IF_ENQUEUE(ifq, m) do {					\
+	IF_LOCK(ifq); 						\
+	_IF_ENQUEUE(ifq, m); 					\
+	IF_UNLOCK(ifq); 					\
+} while (0)
+
+#define	_IF_PREPEND(ifq, m) do {				\
+	(m)->m_nextpkt = (ifq)->ifq_head; 			\
+	if ((ifq)->ifq_tail == NULL) 				\
+		(ifq)->ifq_tail = (m); 				\
+	(ifq)->ifq_head = (m); 					\
+	(ifq)->ifq_len++; 					\
+} while (0)
+
+#define IF_PREPEND(ifq, m) do {		 			\
+	IF_LOCK(ifq); 						\
+	_IF_PREPEND(ifq, m); 					\
+	IF_UNLOCK(ifq); 					\
+} while (0)
+
+#define	_IF_DEQUEUE(ifq, m) do { 				\
+	(m) = (ifq)->ifq_head; 					\
+	if (m) { 						\
+		if (((ifq)->ifq_head = (m)->m_nextpkt) == NULL)	\
+			(ifq)->ifq_tail = NULL; 		\
+		(m)->m_nextpkt = NULL; 				\
+		(ifq)->ifq_len--; 				\
+	} 							\
+} while (0)
+
+#define IF_DEQUEUE(ifq, m) do { 				\
+	IF_LOCK(ifq); 						\
+	_IF_DEQUEUE(ifq, m); 					\
+	IF_UNLOCK(ifq); 					\
+} while (0)
+
+#define	_IF_DEQUEUE_ALL(ifq, m) do {				\
+	(m) = (ifq)->ifq_head;					\
+	(ifq)->ifq_head = (ifq)->ifq_tail = NULL;		\
+	(ifq)->ifq_len = 0;					\
+} while (0)
+
+#define	IF_DEQUEUE_ALL(ifq, m) do {				\
+	IF_LOCK(ifq); 						\
+	_IF_DEQUEUE_ALL(ifq, m);				\
+	IF_UNLOCK(ifq); 					\
+} while (0)
+
+#define	_IF_POLL(ifq, m)	((m) = (ifq)->ifq_head)
+#define	IF_POLL(ifq, m)		_IF_POLL(ifq, m)
+
+#define _IF_DRAIN(ifq) do { 					\
+	struct mbuf *m; 					\
+	for (;;) { 						\
+		_IF_DEQUEUE(ifq, m); 				\
+		if (m == NULL) 					\
+			break; 					\
+		m_freem(m); 					\
+	} 							\
+} while (0)
+
+#define IF_DRAIN(ifq) do {					\
+	IF_LOCK(ifq);						\
+	_IF_DRAIN(ifq);						\
+	IF_UNLOCK(ifq);						\
+} while(0)
+
+int	if_handoff(struct ifqueue *ifq, struct mbuf *m, struct ifnet *ifp,
+	    int adjust);
+#define	IF_HANDOFF(ifq, m, ifp)			\
+	if_handoff((struct ifqueue *)ifq, m, ifp, 0)
+#define	IF_HANDOFF_ADJ(ifq, m, ifp, adj)	\
+	if_handoff((struct ifqueue *)ifq, m, ifp, adj)
+
+void	if_start(struct ifnet *);
+
+#define	IFQ_ENQUEUE(ifq, m, err)					\
+do {									\
+	IF_LOCK(ifq);							\
+	if (ALTQ_IS_ENABLED(ifq))					\
+		ALTQ_ENQUEUE(ifq, m, NULL, err);			\
+	else {								\
+		if (_IF_QFULL(ifq)) {					\
+			m_freem(m);					\
+			(err) = ENOBUFS;				\
+		} else {						\
+			_IF_ENQUEUE(ifq, m);				\
+			(err) = 0;					\
+		}							\
+	}								\
+	if (err)							\
+		(ifq)->ifq_drops++;					\
+	IF_UNLOCK(ifq);							\
+} while (0)
+
+#define	IFQ_DEQUEUE_NOLOCK(ifq, m)					\
+do {									\
+	if (TBR_IS_ENABLED(ifq))					\
+		(m) = tbr_dequeue_ptr(ifq, ALTDQ_REMOVE);		\
+	else if (ALTQ_IS_ENABLED(ifq))					\
+		ALTQ_DEQUEUE(ifq, m);					\
+	else								\
+		_IF_DEQUEUE(ifq, m);					\
+} while (0)
+
+#define	IFQ_DEQUEUE(ifq, m)						\
+do {									\
+	IF_LOCK(ifq);							\
+	IFQ_DEQUEUE_NOLOCK(ifq, m);					\
+	IF_UNLOCK(ifq);							\
+} while (0)
+
+#define	IFQ_POLL_NOLOCK(ifq, m)						\
+do {									\
+	if (TBR_IS_ENABLED(ifq))					\
+		(m) = tbr_dequeue_ptr(ifq, ALTDQ_POLL);			\
+	else if (ALTQ_IS_ENABLED(ifq))					\
+		ALTQ_POLL(ifq, m);					\
+	else								\
+		_IF_POLL(ifq, m);					\
+} while (0)
+
+#define	IFQ_POLL(ifq, m)						\
+do {									\
+	IF_LOCK(ifq);							\
+	IFQ_POLL_NOLOCK(ifq, m);					\
+	IF_UNLOCK(ifq);							\
+} while (0)
+
+#define	IFQ_PURGE_NOLOCK(ifq)						\
+do {									\
+	if (ALTQ_IS_ENABLED(ifq)) {					\
+		ALTQ_PURGE(ifq);					\
+	} else								\
+		_IF_DRAIN(ifq);						\
+} while (0)
+
+#define	IFQ_PURGE(ifq)							\
+do {									\
+	IF_LOCK(ifq);							\
+	IFQ_PURGE_NOLOCK(ifq);						\
+	IF_UNLOCK(ifq);							\
+} while (0)
+
+#define	IFQ_SET_READY(ifq)						\
+	do { ((ifq)->altq_flags |= ALTQF_READY); } while (0)
+
+#define	IFQ_LOCK(ifq)			IF_LOCK(ifq)
+#define	IFQ_UNLOCK(ifq)			IF_UNLOCK(ifq)
+#define	IFQ_LOCK_ASSERT(ifq)		IF_LOCK_ASSERT(ifq)
+#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))
+
+/*
+ * The IFF_DRV_OACTIVE test should really occur in the device driver, not in
+ * the handoff logic, as that flag is locked by the device driver.
+ */
+#define	IFQ_HANDOFF_ADJ(ifp, m, adj, err)				\
+do {									\
+	int len;							\
+	short mflags;							\
+									\
+	len = (m)->m_pkthdr.len;					\
+	mflags = (m)->m_flags;						\
+	IFQ_ENQUEUE(&(ifp)->if_snd, m, err);				\
+	if ((err) == 0) {						\
+		(ifp)->if_obytes += len + (adj);			\
+		if (mflags & M_MCAST)					\
+			(ifp)->if_omcasts++;				\
+		if (((ifp)->if_drv_flags & IFF_DRV_OACTIVE) == 0)	\
+			if_start(ifp);					\
+	}								\
+} while (0)
+
+#define	IFQ_HANDOFF(ifp, m, err)					\
+	IFQ_HANDOFF_ADJ(ifp, m, 0, err)
+
+#define	IFQ_DRV_DEQUEUE(ifq, m)						\
+do {									\
+	(m) = (ifq)->ifq_drv_head;					\
+	if (m) {							\
+		if (((ifq)->ifq_drv_head = (m)->m_nextpkt) == NULL)	\
+			(ifq)->ifq_drv_tail = NULL;			\
+		(m)->m_nextpkt = NULL;					\
+		(ifq)->ifq_drv_len--;					\
+	} else {							\
+		IFQ_LOCK(ifq);						\
+		IFQ_DEQUEUE_NOLOCK(ifq, m);				\
+		while ((ifq)->ifq_drv_len < (ifq)->ifq_drv_maxlen) {	\
+			struct mbuf *m0;				\
+			IFQ_DEQUEUE_NOLOCK(ifq, m0);			\
+			if (m0 == NULL)					\
+				break;					\
+			m0->m_nextpkt = NULL;				\
+			if ((ifq)->ifq_drv_tail == NULL)		\
+				(ifq)->ifq_drv_head = m0;		\
+			else						\
+				(ifq)->ifq_drv_tail->m_nextpkt = m0;	\
+			(ifq)->ifq_drv_tail = m0;			\
+			(ifq)->ifq_drv_len++;				\
+		}							\
+		IFQ_UNLOCK(ifq);					\
+	}								\
+} while (0)
+
+#define	IFQ_DRV_PREPEND(ifq, m)						\
+do {									\
+	(m)->m_nextpkt = (ifq)->ifq_drv_head;				\
+	if ((ifq)->ifq_drv_tail == NULL)				\
+		(ifq)->ifq_drv_tail = (m);				\
+	(ifq)->ifq_drv_head = (m);					\
+	(ifq)->ifq_drv_len++;						\
+} while (0)
+
+#define	IFQ_DRV_IS_EMPTY(ifq)						\
+	(((ifq)->ifq_drv_len == 0) && ((ifq)->ifq_len == 0))
+
+#define	IFQ_DRV_PURGE(ifq)						\
+do {									\
+	struct mbuf *m, *n = (ifq)->ifq_drv_head;			\
+	while((m = n) != NULL) {					\
+		n = m->m_nextpkt;					\
+		m_freem(m);						\
+	}								\
+	(ifq)->ifq_drv_head = (ifq)->ifq_drv_tail = NULL;		\
+	(ifq)->ifq_drv_len = 0;						\
+	IFQ_PURGE(ifq);							\
+} while (0)
+
+static __inline int
+drbr_enqueue(struct ifnet *ifp, struct buf_ring *br, struct mbuf *m)
+{	
+	int error = 0;
+
+#ifdef ALTQ
+	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
+		IFQ_ENQUEUE(&ifp->if_snd, m, error);
+		return (error);
+	}
+#endif
+	error = buf_ring_enqueue(br, m);
+	if (error)
+		m_freem(m);
+
+	return (error);
+}
+
+static __inline void
+drbr_putback(struct ifnet *ifp, struct buf_ring *br, struct mbuf *new)
+{
+	/*
+	 * The top of the list needs to be swapped 
+	 * for this one.
+	 */
+#ifdef ALTQ
+	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {
+		/* 
+		 * Peek in altq case dequeued it
+		 * so put it back.
+		 */
+		IFQ_DRV_PREPEND(&ifp->if_snd, new);
+		return;
+	}
+#endif
+	buf_ring_putback_sc(br, new);
+}
+
+static __inline struct mbuf *
+drbr_peek(struct ifnet *ifp, struct buf_ring *br)
+{
+#ifdef ALTQ
+	struct mbuf *m;
+	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {
+		/* 
+		 * Pull it off like a dequeue
+		 * since drbr_advance() does nothing
+		 * for altq and drbr_putback() will
+		 * use the old prepend function.
+		 */
+		IFQ_DEQUEUE(&ifp->if_snd, m);
+		return (m);
+	}
+#endif
+	return(buf_ring_peek(br));
+}
+
+static __inline void
+drbr_flush(struct ifnet *ifp, struct buf_ring *br)
+{
+	struct mbuf *m;
+
+#ifdef ALTQ
+	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd))
+		IFQ_PURGE(&ifp->if_snd);
+#endif	
+	while ((m = buf_ring_dequeue_sc(br)) != NULL)
+		m_freem(m);
+}
+
+static __inline void
+drbr_free(struct buf_ring *br, struct malloc_type *type)
+{
+
+	drbr_flush(NULL, br);
+	buf_ring_free(br, type);
+}
+
+static __inline struct mbuf *
+drbr_dequeue(struct ifnet *ifp, struct buf_ring *br)
+{
+#ifdef ALTQ
+	struct mbuf *m;
+
+	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd)) {	
+		IFQ_DEQUEUE(&ifp->if_snd, m);
+		return (m);
+	}
+#endif
+	return (buf_ring_dequeue_sc(br));
+}
+
+static __inline void
+drbr_advance(struct ifnet *ifp, struct buf_ring *br)
+{
+#ifdef ALTQ
+	/* Nothing to do here since peek dequeues in altq case */
+	if (ifp != NULL && ALTQ_IS_ENABLED(&ifp->if_snd))
+		return;
+#endif
+	return (buf_ring_advance_sc(br));
+}
+
+
+static __inline struct mbuf *
+drbr_dequeue_cond(struct ifnet *ifp, struct buf_ring *br,
+    int (*func) (struct mbuf *, void *), void *arg) 
+{
+	struct mbuf *m;
+#ifdef ALTQ
+	if (ALTQ_IS_ENABLED(&ifp->if_snd)) {
+		IFQ_LOCK(&ifp->if_snd);
+		IFQ_POLL_NOLOCK(&ifp->if_snd, m);
+		if (m != NULL && func(m, arg) == 0) {
+			IFQ_UNLOCK(&ifp->if_snd);
+			return (NULL);
+		}
+		IFQ_DEQUEUE_NOLOCK(&ifp->if_snd, m);
+		IFQ_UNLOCK(&ifp->if_snd);
+		return (m);
+	}
+#endif
+	m = buf_ring_peek(br);
+	if (m == NULL || func(m, arg) == 0)
+		return (NULL);
+
+	return (buf_ring_dequeue_sc(br));
+}
+
+static __inline int
+drbr_empty(struct ifnet *ifp, struct buf_ring *br)
+{
+#ifdef ALTQ
+	if (ALTQ_IS_ENABLED(&ifp->if_snd))
+		return (IFQ_IS_EMPTY(&ifp->if_snd));
+#endif
+	return (buf_ring_empty(br));
+}
+
+static __inline int
+drbr_needs_enqueue(struct ifnet *ifp, struct buf_ring *br)
+{
+#ifdef ALTQ
+	if (ALTQ_IS_ENABLED(&ifp->if_snd))
+		return (1);
+#endif
+	return (!buf_ring_empty(br));
+}
+
+static __inline int
+drbr_inuse(struct ifnet *ifp, struct buf_ring *br)
+{
+#ifdef ALTQ
+	if (ALTQ_IS_ENABLED(&ifp->if_snd))
+		return (ifp->if_snd.ifq_len);
+#endif
+	return (buf_ring_count(br));
+}
+
+extern	int ifqmaxlen;
+
+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);
+#endif /* DEVICE_POLLING */
+
+#endif /* _KERNEL */
+#endif /* !_NET_IFQ_H_ */
diff --git a/sys/net/netisr.c b/sys/net/netisr.c
index 3045e95bb70..7974cc891ea 100644
--- a/sys/net/netisr.c
+++ b/sys/net/netisr.c
@@ -129,7 +129,7 @@ static SYSCTL_NODE(_net, OID_AUTO, isr, CTLFLAG_RW, 0, "netisr");
 /*-
  * Three global direct dispatch policies are supported:
  *
- * NETISR_DISPATCH_QUEUED: All work is deferred for a netisr, regardless of
+ * NETISR_DISPATCH_DEFERRED: All work is deferred for a netisr, regardless of
  * context (may be overriden by protocols).
  *
  * NETISR_DISPATCH_HYBRID: If the executing context allows direct dispatch,
diff --git a/sys/net/netmap.h b/sys/net/netmap.h
index b5ab6d54908..0f2baebe15f 100644
--- a/sys/net/netmap.h
+++ b/sys/net/netmap.h
@@ -38,6 +38,8 @@
  * Detailed info on netmap is available with "man netmap" or at
  * 
  *	http://info.iet.unipi.it/~luigi/netmap/
+ *
+ * This API is also used to communicate with the VALE software switch
  */
 
 #ifndef _NET_NETMAP_H_
@@ -46,106 +48,95 @@
 /*
  * --- Netmap data structures ---
  *
- * The data structures used by netmap are shown below. Those in
- * capital letters are in an mmapp()ed area shared with userspace,
- * while others are private to the kernel.
- * Shared structures do not contain pointers but only memory
- * offsets, so that addressing is portable between kernel and userspace.
+ * The userspace data structures used by netmap are shown below.
+ * They are allocated by the kernel and mmap()ed by userspace threads.
+ * Pointers are implemented as memory offsets or indexes,
+ * so that they can be easily dereferenced in kernel and userspace.
 
+   KERNEL (opaque, obviously)
 
- softc
-+----------------+
-| standard fields|
-| if_pspare[0] ----------+
-+----------------+       |
-                         |
-+----------------+<------+
-|(netmap_adapter)|
-|                |                             netmap_kring
-| tx_rings *--------------------------------->+---------------+
-|                |       netmap_kring         | ring    *---------.
-| rx_rings *--------->+---------------+       | nr_hwcur      |   |
-+----------------+    | ring    *--------.    | nr_hwavail    |   V
-                      | nr_hwcur      |  |    | selinfo       |   |
-                      | nr_hwavail    |  |    +---------------+   .
-                      | selinfo       |  |    |     ...       |   .
-                      +---------------+  |    |(ntx+1 entries)|
-                      |    ....       |  |    |               |
-                      |(nrx+1 entries)|  |    +---------------+
-                      |               |  |
-   KERNEL             +---------------+  |
-                                         |
   ====================================================================
                                          |
-   USERSPACE                             |      NETMAP_RING
-                                         +---->+-------------+
-                                             / | cur         |
-   NETMAP_IF  (nifp, one per file desc.)    /  | avail       |
-    +---------------+                      /   | buf_ofs     |
-    | ni_tx_rings   |                     /    +=============+
-    | ni_rx_rings   |                    /     | buf_idx     | slot[0]
-    |               |                   /      | len, flags  |
-    |               |                  /       +-------------+
-    +===============+                 /        | buf_idx     | slot[1]
-    | txring_ofs[0] | (rel.to nifp)--'         | len, flags  |
-    | txring_ofs[1] |                          +-------------+
-  (num_rings+1 entries)                     (nr_num_slots entries)
-    | txring_ofs[n] |                          | buf_idx     | slot[n-1]
-    +---------------+                          | len, flags  |
-    | rxring_ofs[0] |                          +-------------+
+   USERSPACE                             |      struct netmap_ring
+                                         +---->+--------------+
+                                             / | cur          |
+   struct netmap_if (nifp, 1 per fd)        /  | avail        |
+    +---------------+                      /   | buf_ofs      |
+    | ni_tx_rings   |                     /    +==============+
+    | ni_rx_rings   |                    /     | buf_idx, len | slot[0]
+    |               |                   /      | flags, ptr   |
+    |               |                  /       +--------------+
+    +===============+                 /        | buf_idx, len | slot[1]
+    | txring_ofs[0] | (rel.to nifp)--'         | flags, ptr   |
+    | txring_ofs[1] |                          +--------------+
+  (ni_tx_rings+1 entries)                     (num_slots entries)
+    | txring_ofs[t] |                          | buf_idx, len | slot[n-1]
+    +---------------+                          | flags, ptr   |
+    | rxring_ofs[0] |                          +--------------+
     | rxring_ofs[1] |
-  (num_rings+1 entries)
-    | txring_ofs[n] |
+  (ni_rx_rings+1 entries)
+    | rxring_ofs[r] |
     +---------------+
 
- * The private descriptor ('softc' or 'adapter') of each interface
- * is extended with a "struct netmap_adapter" containing netmap-related
- * info (see description in dev/netmap/netmap_kernel.h.
- * Among other things, tx_rings and rx_rings point to the arrays of
- * "struct netmap_kring" which in turn reache the various
- * "struct netmap_ring", shared with userspace.
-
- * The NETMAP_RING is the userspace-visible replica of the NIC ring.
- * Each slot has the index of a buffer, its length and some flags.
+ * For each "interface" (NIC, host stack, VALE switch port) attached to a
+ * file descriptor, the mmap()ed region contains a (logically readonly)
+ * struct netmap_if pointing to struct netmap_ring's.
+ * There is one netmap_ring per physical NIC ring, plus one tx/rx ring
+ * pair attached to the host stack (this pair is unused for VALE ports).
+ *
+ * All physical/host stack ports share the same memory region,
+ * so that zero-copy can be implemented between them.
+ * VALE switch ports instead have separate memory regions.
+ *
+ * The netmap_ring is the userspace-visible replica of the NIC ring.
+ * Each slot has the index of a buffer (MTU-sized and residing in the
+ * mmapped region), its length and some flags. An extra 64-bit pointer
+ * is provided for user-supplied buffers in the tx path.
+ *
  * In user space, the buffer address is computed as
  *	(char *)ring + buf_ofs + index*NETMAP_BUF_SIZE
- * In the kernel, buffers do not necessarily need to be contiguous,
- * and the virtual and physical addresses are derived through
- * a lookup table.
+ */
+
+/*
+ * struct netmap_slot is a buffer descriptor
  *
- * struct netmap_slot:
+ * buf_idx	the index of the buffer associated to the slot.
+ * len		the length of the payload
+ * flags	control operation on the slot, as defined below
  *
- * buf_idx	is the index of the buffer associated to the slot.
- * len		is the length of the payload
  * NS_BUF_CHANGED	must be set whenever userspace wants
  *		to change buf_idx (it might be necessary to
- *		reprogram the NIC slot)
+ *		reprogram the NIC)
+ *
  * NS_REPORT	must be set if we want the NIC to generate an interrupt
  *		when this slot is used. Leaving it to 0 improves
  *		performance.
+ *
  * NS_FORWARD	if set on a receive ring, and the device is in
  *		transparent mode, buffers released with the flag set
  *		will be forwarded to the 'other' side (host stack
  *		or NIC, respectively) on the next select() or ioctl()
  *
- *		The following will be supported from NETMAP_API = 5
  * NS_NO_LEARN	on a VALE switch, do not 'learn' the source port for
  *		this packet.
- * NS_INDIRECT	the netmap buffer contains a 64-bit pointer to
- *		the actual userspace buffer. This may be useful
- *		to reduce copies in a VM environment.
+ *
+ * NS_INDIRECT	(tx rings only) data is in a userspace buffer pointed
+ *		by the ptr field in the slot.
+ *
  * NS_MOREFRAG	Part of a multi-segment frame. The last (or only)
  *		segment must not have this flag.
+ *		Only supported on VALE ports.
+ *
  * NS_PORT_MASK	the high 8 bits of the flag, if not zero, indicate the
  *		destination port for the VALE switch, overriding
  *		the lookup table.
  */
 
 struct netmap_slot {
-	uint32_t buf_idx; /* buffer index */
-	uint16_t len;	/* packet length, to be copied to/from the hw ring */
-	uint16_t flags;	/* buf changed, etc. */
-#define	NS_BUF_CHANGED	0x0001	/* must resync the map, buffer changed */
+	uint32_t buf_idx;	/* buffer index */
+	uint16_t len;		/* packet length */
+	uint16_t flags;		/* buf changed, etc. */
+#define	NS_BUF_CHANGED	0x0001	/* buf_idx changed */
 #define	NS_REPORT	0x0002	/* ask the hardware to report results
 				 * e.g. by generating an interrupt
 				 */
@@ -157,62 +148,61 @@ struct netmap_slot {
 #define	NS_MOREFRAG	0x0020
 #define	NS_PORT_SHIFT	8
 #define	NS_PORT_MASK	(0xff << NS_PORT_SHIFT)
+				/*
+				 * in rx rings, the high 8 bits
+				 *  are the number of fragments.
+				 */
+#define	NS_RFRAGS(_slot)	( ((_slot)->flags >> 8) & 0xff)
+	uint64_t	ptr;	/* pointer for indirect buffers */
 };
 
 /*
+ * struct netmap_ring
+ *
  * Netmap representation of a TX or RX ring (also known as "queue").
  * This is a queue implemented as a fixed-size circular array.
  * At the software level, two fields are important: avail and cur.
  *
  * In TX rings:
- *	avail	indicates the number of slots available for transmission.
- *		It is updated by the kernel after every netmap system call.
- *		It MUST BE decremented by the application when it appends a
- *		packet.
+ *
+ *	avail	tells how many slots are available for transmission.
+ *		It is updated by the kernel in each netmap system call.
+ *		It MUST BE decremented by the user when it
+ *		adds a new packet to send.
+ *
  *	cur	indicates the slot to use for the next packet
  *		to send (i.e. the "tail" of the queue).
- *		It MUST BE incremented by the application before
+ *		It MUST BE incremented by the user before
  *		netmap system calls to reflect the number of newly
  *		sent packets.
  *		It is checked by the kernel on netmap system calls
  *		(normally unmodified by the kernel unless invalid).
  *
- *   The kernel side of netmap uses two additional fields in its own
- *   private ring structure, netmap_kring:
- *	nr_hwcur is a copy of nr_cur on an NIOCTXSYNC.
- *	nr_hwavail is the number of slots known as available by the
- *		hardware. It is updated on an INTR (inc by the
- *		number of packets sent) and on a NIOCTXSYNC
- *		(decrease by nr_cur - nr_hwcur)
- *		A special case, nr_hwavail is -1 if the transmit
- *		side is idle (no pending transmits).
- *
  * In RX rings:
+ *
  *	avail	is the number of packets available (possibly 0).
- *		It MUST BE decremented by the application when it consumes
- *		a packet, and it is updated to nr_hwavail on a NIOCRXSYNC
+ *		It is updated by the kernel in each netmap system call.
+ *		It MUST BE decremented by the user when it
+ *		consumes a packet.
+ *
  *	cur	indicates the first slot that contains a packet not
- *		processed yet (the "head" of the queue).
- *		It MUST BE incremented by the software when it consumes
+ *		yet processed (the "head" of the queue).
+ *		It MUST BE incremented by the user when it consumes
  *		a packet.
+ *
  *	reserved	indicates the number of buffers before 'cur'
- *		that the application has still in use. Normally 0,
- *		it MUST BE incremented by the application when it
+ *		that the user has not released yet. Normally 0,
+ *		it MUST BE incremented by the user when it
  *		does not return the buffer immediately, and decremented
  *		when the buffer is finally freed.
  *
- *   The kernel side of netmap uses two additional fields in the kring:
- *	nr_hwcur is a copy of nr_cur on an NIOCRXSYNC
- *	nr_hwavail is the number of packets available. It is updated
- *		on INTR (inc by the number of new packets arrived)
- *		and on NIOCRXSYNC (decreased by nr_cur - nr_hwcur).
  *
  * DATA OWNERSHIP/LOCKING:
- *	The netmap_ring is owned by the user program and it is only
- *	accessed or modified in the upper half of the kernel during
- *	a system call.
- *
- *	The netmap_kring is only modified by the upper half of the kernel.
+ *	The netmap_ring, all slots, and buffers in the range
+ *	[reserved-cur , cur+avail[ are owned by the user program,
+ *	and the kernel only touches them in the same thread context
+ *	during a system call.
+ *	Other buffers are reserved for use by the NIC's DMA engines.
  *
  * FLAGS
  *	NR_TIMESTAMP	updates the 'ts' field on each syscall. This is
@@ -228,7 +218,7 @@ struct netmap_slot {
  */
 struct netmap_ring {
 	/*
-	 * nr_buf_base_ofs is meant to be used through macros.
+	 * buf_ofs is meant to be used through macros.
 	 * It contains the offset of the buffer region from this
 	 * descriptor.
 	 */
@@ -253,23 +243,29 @@ struct netmap_ring {
 
 /*
  * Netmap representation of an interface and its queue(s).
+ * This is initialized by the kernel when binding a file
+ * descriptor to a port, and should be considered as readonly
+ * by user programs. The kernel never uses it.
+ *
  * There is one netmap_if for each file descriptor on which we want
- * to select/poll.  We assume that on each interface has the same number
- * of receive and transmit queues.
+ * to select/poll.
  * select/poll operates on one or all pairs depending on the value of
  * nmr_queueid passed on the ioctl.
  */
 struct netmap_if {
 	char		ni_name[IFNAMSIZ]; /* name of the interface. */
-	const u_int	ni_version;	/* API version, currently unused */
-	const u_int	ni_rx_rings;	/* number of rx rings */
-	const u_int	ni_tx_rings;	/* if zero, same as ni_rx_rings */
+	const uint32_t	ni_version;	/* API version, currently unused */
+	const uint32_t	ni_flags;	/* properties */
+#define	NI_PRIV_MEM	0x1		/* private memory region */
+
+	const uint32_t	ni_rx_rings;	/* number of rx rings */
+	const uint32_t	ni_tx_rings;	/* number of tx rings */
 	/*
 	 * The following array contains the offset of each netmap ring
-	 * from this structure. The first ni_tx_queues+1 entries refer
-	 * to the tx rings, the next ni_rx_queues+1 refer to the rx rings
+	 * from this structure. The first ni_tx_rings+1 entries refer
+	 * to the tx rings, the next ni_rx_rings+1 refer to the rx rings
 	 * (the last entry in each block refers to the host stack rings).
-	 * The area is filled up by the kernel on NIOCREG,
+	 * The area is filled up by the kernel on NIOCREGIF,
 	 * and then only read by userspace code.
 	 */
 	const ssize_t	ring_ofs[0];
@@ -282,23 +278,47 @@ struct netmap_if {
  * NIOCGINFO takes a struct ifreq, the interface name is the input,
  *	the outputs are number of queues and number of descriptor
  *	for each queue (useful to set number of threads etc.).
+ *	The info returned is only advisory and may change before
+ *	the interface is bound to a file descriptor.
  *
  * NIOCREGIF takes an interface name within a struct ifreq,
  *	and activates netmap mode on the interface (if possible).
  *
- *	For vale ports, starting with NETMAP_API = 5,
- *	nr_tx_rings and nr_rx_rings specify how many software rings
- *	are created (0 means 1).
+ *   nr_name	is the name of the interface
  *
- *	NIOCREGIF is also used to attach a NIC to a VALE switch.
- *	In this case the name is vale*:ifname, and "nr_cmd"
- *	is set to 'NETMAP_BDG_ATTACH' or 'NETMAP_BDG_DETACH'.
- *	nr_ringid specifies which rings should be attached, 0 means all,
- *	NETMAP_HW_RING + n means only the n-th ring.
- *	The process can terminate after the interface has been attached.
+ *   nr_tx_slots, nr_tx_slots, nr_tx_rings, nr_rx_rings
+ *	indicate the configuration of the port on return.
  *
- * NIOCUNREGIF unregisters the interface associated to the fd.
- *	this is deprecated and will go away.
+ *	On input, non-zero values for nr_tx_rings, nr_tx_slots and the
+ *	rx counterparts may be used to reconfigure the port according
+ *	to the requested values, but this is not guaranteed.
+ *	The actual values are returned on completion of the ioctl().
+ *
+ *   nr_ringid
+ *	indicates how rings should be bound to the file descriptors.
+ *	The default (0) means all physical rings of a NIC are bound.
+ *	NETMAP_HW_RING plus a ring number lets you bind just
+ *	a single ring pair.
+ *	NETMAP_SW_RING binds only the host tx/rx rings
+ *	NETMAP_NO_TX_POLL prevents select()/poll() from pushing
+ *	out packets on the tx ring unless POLLOUT is specified.
+ *
+ *	NETMAP_PRIV_MEM is a return value used to indicate that
+ *	this ring is in a private memory region hence buffer
+ *	swapping cannot be used
+ *	
+ *   nr_cmd	is used to configure NICs attached to a VALE switch,
+ *	or to dump the configuration of a VALE switch.
+ *	
+ *	nr_cmd = NETMAP_BDG_ATTACH and nr_name = vale*:ifname
+ *	attaches the NIC to the switch, with nr_ringid specifying
+ *	which rings to use
+ *
+ *	nr_cmd = NETMAP_BDG_DETACH and nr_name = vale*:ifname
+ *	disconnects a previously attached NIC
+ *
+ *	nr_cmd = NETMAP_BDG_LIST is used to list the configuration
+ *	of VALE switches, with additional arguments.
  *
  * NIOCTXSYNC, NIOCRXSYNC synchronize tx or rx queues,
  *	whose identity is set in NIOCREGIF through nr_ringid
@@ -312,7 +332,7 @@ struct netmap_if {
 struct nmreq {
 	char		nr_name[IFNAMSIZ];
 	uint32_t	nr_version;	/* API version */
-#define	NETMAP_API	4		/* current version */
+#define	NETMAP_API	5		/* current version */
 	uint32_t	nr_offset;	/* nifp offset in the shared region */
 	uint32_t	nr_memsize;	/* size of the shared region */
 	uint32_t	nr_tx_slots;	/* slots in tx rings */
@@ -320,6 +340,7 @@ struct nmreq {
 	uint16_t	nr_tx_rings;	/* number of tx rings */
 	uint16_t	nr_rx_rings;	/* number of rx rings */
 	uint16_t	nr_ringid;	/* ring(s) we care about */
+#define NETMAP_PRIV_MEM	0x8000		/* rings use private memory */
 #define NETMAP_HW_RING	0x4000		/* low bits indicate one hw ring */
 #define NETMAP_SW_RING	0x2000		/* process the sw ring */
 #define NETMAP_NO_TX_POLL	0x1000	/* no automatic txsync on poll */
@@ -343,7 +364,7 @@ struct nmreq {
  */
 #define NIOCGINFO	_IOWR('i', 145, struct nmreq) /* return IF info */
 #define NIOCREGIF	_IOWR('i', 146, struct nmreq) /* interface register */
-#define NIOCUNREGIF	_IO('i', 147) /* interface unregister */
+#define NIOCUNREGIF	_IO('i', 147) /* deprecated. Was interface unregister */
 #define NIOCTXSYNC	_IO('i', 148) /* sync tx queues */
 #define NIOCRXSYNC	_IO('i', 149) /* sync rx queues */
 #endif /* !NIOCREGIF */
diff --git a/sys/net/pfil.c b/sys/net/pfil.c
index 44373ee14bf..2494deae205 100644
--- a/sys/net/pfil.c
+++ b/sys/net/pfil.c
@@ -45,6 +45,7 @@
 #include <sys/queue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/pfil.h>
 
 static struct mtx pfil_global_lock;
diff --git a/sys/net/pfvar.h b/sys/net/pfvar.h
index c16591bacea..28b313e26f6 100644
--- a/sys/net/pfvar.h
+++ b/sys/net/pfvar.h
@@ -41,83 +41,9 @@
 #include <net/radix.h>
 #include <netinet/in.h>
 
-#include <net/pf_mtag.h>
-
-#define	PF_TCPS_PROXY_SRC	((TCP_NSTATES)+0)
-#define	PF_TCPS_PROXY_DST	((TCP_NSTATES)+1)
-
-#define	PF_MD5_DIGEST_LENGTH	16
-#ifdef MD5_DIGEST_LENGTH
-#if PF_MD5_DIGEST_LENGTH != MD5_DIGEST_LENGTH
-#error
-#endif
-#endif
-
-enum	{ PF_INOUT, PF_IN, PF_OUT };
-enum	{ PF_PASS, PF_DROP, PF_SCRUB, PF_NOSCRUB, PF_NAT, PF_NONAT,
-	  PF_BINAT, PF_NOBINAT, PF_RDR, PF_NORDR, PF_SYNPROXY_DROP, PF_DEFER };
-enum	{ PF_RULESET_SCRUB, PF_RULESET_FILTER, PF_RULESET_NAT,
-	  PF_RULESET_BINAT, PF_RULESET_RDR, PF_RULESET_MAX };
-enum	{ PF_OP_NONE, PF_OP_IRG, PF_OP_EQ, PF_OP_NE, PF_OP_LT,
-	  PF_OP_LE, PF_OP_GT, PF_OP_GE, PF_OP_XRG, PF_OP_RRG };
-enum	{ PF_DEBUG_NONE, PF_DEBUG_URGENT, PF_DEBUG_MISC, PF_DEBUG_NOISY };
-enum	{ PF_CHANGE_NONE, PF_CHANGE_ADD_HEAD, PF_CHANGE_ADD_TAIL,
-	  PF_CHANGE_ADD_BEFORE, PF_CHANGE_ADD_AFTER,
-	  PF_CHANGE_REMOVE, PF_CHANGE_GET_TICKET };
-enum	{ PF_GET_NONE, PF_GET_CLR_CNTR };
-enum	{ PF_SK_WIRE, PF_SK_STACK, PF_SK_BOTH };
-
-/*
- * Note about PFTM_*: real indices into pf_rule.timeout[] come before
- * PFTM_MAX, special cases afterwards. See pf_state_expires().
- */
-enum	{ PFTM_TCP_FIRST_PACKET, PFTM_TCP_OPENING, PFTM_TCP_ESTABLISHED,
-	  PFTM_TCP_CLOSING, PFTM_TCP_FIN_WAIT, PFTM_TCP_CLOSED,
-	  PFTM_UDP_FIRST_PACKET, PFTM_UDP_SINGLE, PFTM_UDP_MULTIPLE,
-	  PFTM_ICMP_FIRST_PACKET, PFTM_ICMP_ERROR_REPLY,
-	  PFTM_OTHER_FIRST_PACKET, PFTM_OTHER_SINGLE,
-	  PFTM_OTHER_MULTIPLE, PFTM_FRAG, PFTM_INTERVAL,
-	  PFTM_ADAPTIVE_START, PFTM_ADAPTIVE_END, PFTM_SRC_NODE,
-	  PFTM_TS_DIFF, PFTM_MAX, PFTM_PURGE, PFTM_UNLINKED,
-	  PFTM_UNTIL_PACKET };
-
-/* PFTM default values */
-#define PFTM_TCP_FIRST_PACKET_VAL	120	/* First TCP packet */
-#define PFTM_TCP_OPENING_VAL		30	/* No response yet */
-#define PFTM_TCP_ESTABLISHED_VAL	24*60*60/* Established */
-#define PFTM_TCP_CLOSING_VAL		15 * 60	/* Half closed */
-#define PFTM_TCP_FIN_WAIT_VAL		45	/* Got both FINs */
-#define PFTM_TCP_CLOSED_VAL		90	/* Got a RST */
-#define PFTM_UDP_FIRST_PACKET_VAL	60	/* First UDP packet */
-#define PFTM_UDP_SINGLE_VAL		30	/* Unidirectional */
-#define PFTM_UDP_MULTIPLE_VAL		60	/* Bidirectional */
-#define PFTM_ICMP_FIRST_PACKET_VAL	20	/* First ICMP packet */
-#define PFTM_ICMP_ERROR_REPLY_VAL	10	/* Got error response */
-#define PFTM_OTHER_FIRST_PACKET_VAL	60	/* First packet */
-#define PFTM_OTHER_SINGLE_VAL		30	/* Unidirectional */
-#define PFTM_OTHER_MULTIPLE_VAL		60	/* Bidirectional */
-#define PFTM_FRAG_VAL			30	/* Fragment expire */
-#define PFTM_INTERVAL_VAL		10	/* Expire interval */
-#define PFTM_SRC_NODE_VAL		0	/* Source tracking */
-#define PFTM_TS_DIFF_VAL		30	/* Allowed TS diff */
-
-enum	{ PF_NOPFROUTE, PF_FASTROUTE, PF_ROUTETO, PF_DUPTO, PF_REPLYTO };
-enum	{ PF_LIMIT_STATES, PF_LIMIT_SRC_NODES, PF_LIMIT_FRAGS,
-	  PF_LIMIT_TABLE_ENTRIES, PF_LIMIT_MAX };
-#define PF_POOL_IDMASK		0x0f
-enum	{ PF_POOL_NONE, PF_POOL_BITMASK, PF_POOL_RANDOM,
-	  PF_POOL_SRCHASH, PF_POOL_ROUNDROBIN };
-enum	{ PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE, PF_ADDR_DYNIFTL,
-	  PF_ADDR_TABLE, PF_ADDR_URPFFAILED,
-	  PF_ADDR_RANGE };
-#define PF_POOL_TYPEMASK	0x0f
-#define PF_POOL_STICKYADDR	0x20
-#define	PF_WSCALE_FLAG		0x80
-#define	PF_WSCALE_MASK		0x0f
-
-#define	PF_LOG			0x01
-#define	PF_LOG_ALL		0x02
-#define	PF_LOG_SOCKET_LOOKUP	0x04
+#include <netpfil/pf/pf.h>
+#include <netpfil/pf/pf_altq.h>
+#include <netpfil/pf/pf_mtag.h>
 
 struct pf_addr {
 	union {
@@ -134,8 +60,6 @@ struct pf_addr {
 #define addr32	pfa.addr32
 };
 
-#define	PF_TABLE_NAME_SIZE	 32
-
 #define PFI_AFLAG_NETWORK	0x01
 #define PFI_AFLAG_BROADCAST	0x02
 #define PFI_AFLAG_PEER		0x04
@@ -564,7 +488,6 @@ struct pf_rule {
 	union pf_rule_ptr	 skip[PF_SKIP_COUNT];
 #define PF_RULE_LABEL_SIZE	 64
 	char			 label[PF_RULE_LABEL_SIZE];
-#define PF_QNAME_SIZE		 64
 	char			 ifname[IFNAMSIZ];
 	char			 qname[PF_QNAME_SIZE];
 	char			 pqname[PF_QNAME_SIZE];
@@ -1195,43 +1118,6 @@ struct pf_pdesc {
 #define PF_DPORT_RANGE	0x01		/* Dest port uses range */
 #define PF_RPORT_RANGE	0x02		/* RDR'ed port uses range */
 
-/* Reasons code for passing/dropping a packet */
-#define PFRES_MATCH	0		/* Explicit match of a rule */
-#define PFRES_BADOFF	1		/* Bad offset for pull_hdr */
-#define PFRES_FRAG	2		/* Dropping following fragment */
-#define PFRES_SHORT	3		/* Dropping short packet */
-#define PFRES_NORM	4		/* Dropping by normalizer */
-#define PFRES_MEMORY	5		/* Dropped due to lacking mem */
-#define PFRES_TS	6		/* Bad TCP Timestamp (RFC1323) */
-#define PFRES_CONGEST	7		/* Congestion (of ipintrq) */
-#define PFRES_IPOPTIONS 8		/* IP option */
-#define PFRES_PROTCKSUM 9		/* Protocol checksum invalid */
-#define PFRES_BADSTATE	10		/* State mismatch */
-#define PFRES_STATEINS	11		/* State insertion failure */
-#define PFRES_MAXSTATES	12		/* State limit */
-#define PFRES_SRCLIMIT	13		/* Source node/conn limit */
-#define PFRES_SYNPROXY	14		/* SYN proxy */
-#define PFRES_MAX	15		/* total+1 */
-
-#define PFRES_NAMES { \
-	"match", \
-	"bad-offset", \
-	"fragment", \
-	"short", \
-	"normalize", \
-	"memory", \
-	"bad-timestamp", \
-	"congestion", \
-	"ip-option", \
-	"proto-cksum", \
-	"state-mismatch", \
-	"state-insert", \
-	"state-limit", \
-	"src-limit", \
-	"synproxy", \
-	NULL \
-}
-
 /* Counters for other things we want to keep track of */
 #define LCNT_STATES		0	/* states */
 #define LCNT_SRCSTATES		1	/* max-src-states */
@@ -1322,69 +1208,6 @@ struct pf_status {
 	u_int8_t	pf_chksum[PF_MD5_DIGEST_LENGTH];
 };
 
-struct cbq_opts {
-	u_int		minburst;
-	u_int		maxburst;
-	u_int		pktsize;
-	u_int		maxpktsize;
-	u_int		ns_per_byte;
-	u_int		maxidle;
-	int		minidle;
-	u_int		offtime;
-	int		flags;
-};
-
-struct priq_opts {
-	int		flags;
-};
-
-struct hfsc_opts {
-	/* real-time service curve */
-	u_int		rtsc_m1;	/* slope of the 1st segment in bps */
-	u_int		rtsc_d;		/* the x-projection of m1 in msec */
-	u_int		rtsc_m2;	/* slope of the 2nd segment in bps */
-	/* link-sharing service curve */
-	u_int		lssc_m1;
-	u_int		lssc_d;
-	u_int		lssc_m2;
-	/* upper-limit service curve */
-	u_int		ulsc_m1;
-	u_int		ulsc_d;
-	u_int		ulsc_m2;
-	int		flags;
-};
-
-struct pf_altq {
-	char			 ifname[IFNAMSIZ];
-
-	void			*altq_disc;	/* discipline-specific state */
-	TAILQ_ENTRY(pf_altq)	 entries;
-
-	/* scheduler spec */
-	u_int8_t		 scheduler;	/* scheduler type */
-	u_int16_t		 tbrsize;	/* tokenbucket regulator size */
-	u_int32_t		 ifbandwidth;	/* interface bandwidth */
-
-	/* queue spec */
-	char			 qname[PF_QNAME_SIZE];	/* queue name */
-	char			 parent[PF_QNAME_SIZE];	/* parent name */
-	u_int32_t		 parent_qid;	/* parent queue id */
-	u_int32_t		 bandwidth;	/* queue bandwidth */
-	u_int8_t		 priority;	/* priority */
-	u_int8_t		 local_flags;	/* dynamic interface */
-#define	PFALTQ_FLAG_IF_REMOVED		0x01
-
-	u_int16_t		 qlimit;	/* queue size limit */
-	u_int16_t		 flags;		/* misc flags */
-	union {
-		struct cbq_opts		 cbq_opts;
-		struct priq_opts	 priq_opts;
-		struct hfsc_opts	 hfsc_opts;
-	} pq_u;
-
-	u_int32_t		 qid;		/* return value */
-};
-
 struct pf_divert {
 	union {
 		struct in_addr	ipv4;
@@ -1644,8 +1467,9 @@ struct pf_ifspeed {
 #define	DIOCGIFSPEED	_IOWR('D', 92, struct pf_ifspeed)
 
 #ifdef _KERNEL
+LIST_HEAD(pf_src_node_list, pf_src_node);
 struct pf_srchash {
-	LIST_HEAD(, pf_src_node)	nodes;
+	struct pf_src_node_list		nodes;
 	struct mtx			lock;
 };
 
@@ -1751,8 +1575,11 @@ pf_release_state(struct pf_state *s)
 extern struct pf_state		*pf_find_state_byid(uint64_t, uint32_t);
 extern struct pf_state		*pf_find_state_all(struct pf_state_key_cmp *,
 				    u_int, int *);
-struct pf_src_node		*pf_find_src_node(struct pf_addr *, struct pf_rule *,
-				    sa_family_t, int);
+extern struct pf_src_node	*pf_find_src_node(struct pf_addr *,
+				    struct pf_rule *, sa_family_t, int);
+extern void			 pf_unlink_src_node(struct pf_src_node *);
+extern void			 pf_unlink_src_node_locked(struct pf_src_node *);
+extern u_int			 pf_free_src_nodes(struct pf_src_node_list *);
 extern void			 pf_print_state(struct pf_state *);
 extern void			 pf_print_flags(u_int8_t);
 extern u_int16_t		 pf_cksum_fixup(u_int16_t, u_int16_t, u_int16_t,
diff --git a/sys/net/radix.c b/sys/net/radix.c
index 7b4699d5f8e..6b67f664251 100644
--- a/sys/net/radix.c
+++ b/sys/net/radix.c
@@ -66,27 +66,19 @@ static struct radix_node
 	 *rn_search(void *, struct radix_node *),
 	 *rn_search_m(void *, struct radix_node *, void *);
 
-static int	max_keylen;
-static struct radix_mask *rn_mkfreelist;
-static struct radix_node_head *mask_rnhead;
-/*
- * Work area -- the following point to 3 buffers of size max_keylen,
- * allocated in this order in a block of memory malloc'ed by rn_init.
- * rn_zeros, rn_ones are set in rn_init and used in readonly afterwards.
- * addmask_key is used in rn_addmask in rw mode and not thread-safe.
- */
-static char *rn_zeros, *rn_ones, *addmask_key;
+static void rn_detachhead_internal(void **head);
+static int rn_inithead_internal(void **head, int off);
 
-#define MKGet(m) {						\
-	if (rn_mkfreelist) {					\
-		m = rn_mkfreelist;				\
-		rn_mkfreelist = (m)->rm_mklist;			\
-	} else							\
-		R_Malloc(m, struct radix_mask *, sizeof (struct radix_mask)); }
- 
-#define MKFree(m) { (m)->rm_mklist = rn_mkfreelist; rn_mkfreelist = (m);}
+#define	RADIX_MAX_KEY_LEN	32
+
+static char rn_zeros[RADIX_MAX_KEY_LEN];
+static char rn_ones[RADIX_MAX_KEY_LEN] = {
+	-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, -1, -1, -1, -1, -1, -1,
+};
 
-#define rn_masktop (mask_rnhead->rnh_treetop)
 
 static int	rn_lexobetter(void *m_arg, void *n_arg);
 static struct radix_mask *
@@ -230,7 +222,8 @@ rn_lookup(v_arg, m_arg, head)
 	caddr_t netmask = 0;
 
 	if (m_arg) {
-		x = rn_addmask(m_arg, 1, head->rnh_treetop->rn_offset);
+		x = rn_addmask(m_arg, head->rnh_masks, 1,
+		    head->rnh_treetop->rn_offset);
 		if (x == 0)
 			return (0);
 		netmask = x->rn_key;
@@ -489,53 +482,47 @@ on1:
 }
 
 struct radix_node *
-rn_addmask(n_arg, search, skip)
-	int search, skip;
-	void *n_arg;
+rn_addmask(void *n_arg, struct radix_node_head *maskhead, int search, int skip)
 {
 	caddr_t netmask = (caddr_t)n_arg;
 	register struct radix_node *x;
 	register caddr_t cp, cplim;
 	register int b = 0, mlen, j;
-	int maskduplicated, m0, isnormal;
+	int maskduplicated, isnormal;
 	struct radix_node *saved_x;
-	static int last_zeroed = 0;
+	char addmask_key[RADIX_MAX_KEY_LEN];
 
-	if ((mlen = LEN(netmask)) > max_keylen)
-		mlen = max_keylen;
+	if ((mlen = LEN(netmask)) > RADIX_MAX_KEY_LEN)
+		mlen = RADIX_MAX_KEY_LEN;
 	if (skip == 0)
 		skip = 1;
 	if (mlen <= skip)
-		return (mask_rnhead->rnh_nodes);
+		return (maskhead->rnh_nodes);
+
+	bzero(addmask_key, RADIX_MAX_KEY_LEN);
 	if (skip > 1)
 		bcopy(rn_ones + 1, addmask_key + 1, skip - 1);
-	if ((m0 = mlen) > skip)
-		bcopy(netmask + skip, addmask_key + skip, mlen - skip);
+	bcopy(netmask + skip, addmask_key + skip, mlen - skip);
 	/*
 	 * Trim trailing zeroes.
 	 */
 	for (cp = addmask_key + mlen; (cp > addmask_key) && cp[-1] == 0;)
 		cp--;
 	mlen = cp - addmask_key;
-	if (mlen <= skip) {
-		if (m0 >= last_zeroed)
-			last_zeroed = mlen;
-		return (mask_rnhead->rnh_nodes);
-	}
-	if (m0 < last_zeroed)
-		bzero(addmask_key + m0, last_zeroed - m0);
-	*addmask_key = last_zeroed = mlen;
-	x = rn_search(addmask_key, rn_masktop);
+	if (mlen <= skip)
+		return (maskhead->rnh_nodes);
+	*addmask_key = mlen;
+	x = rn_search(addmask_key, maskhead->rnh_treetop);
 	if (bcmp(addmask_key, x->rn_key, mlen) != 0)
 		x = 0;
 	if (x || search)
 		return (x);
-	R_Zalloc(x, struct radix_node *, max_keylen + 2 * sizeof (*x));
+	R_Zalloc(x, struct radix_node *, RADIX_MAX_KEY_LEN + 2 * sizeof (*x));
 	if ((saved_x = x) == 0)
 		return (0);
 	netmask = cp = (caddr_t)(x + 2);
 	bcopy(addmask_key, cp, mlen);
-	x = rn_insert(cp, mask_rnhead, &maskduplicated, x);
+	x = rn_insert(cp, maskhead, &maskduplicated, x);
 	if (maskduplicated) {
 		log(LOG_ERR, "rn_addmask: mask impossibly already in tree");
 		Free(saved_x);
@@ -590,12 +577,12 @@ rn_new_radix_mask(tt, next)
 {
 	register struct radix_mask *m;
 
-	MKGet(m);
+	R_Malloc(m, struct radix_mask *, sizeof (struct radix_mask));
 	if (m == 0) {
-		log(LOG_ERR, "Mask for route not entered\n");
+		log(LOG_ERR, "Failed to allocate route mask\n");
 		return (0);
 	}
-	bzero(m, sizeof *m);
+	bzero(m, sizeof(*m));
 	m->rm_bit = tt->rn_bit;
 	m->rm_flags = tt->rn_flags;
 	if (tt->rn_flags & RNF_NORMAL)
@@ -629,7 +616,8 @@ rn_addroute(v_arg, n_arg, head, treenodes)
 	 * nodes and possibly save time in calculating indices.
 	 */
 	if (netmask)  {
-		if ((x = rn_addmask(netmask, 0, top->rn_offset)) == 0)
+		x = rn_addmask(netmask, head->rnh_masks, 0, top->rn_offset);
+		if (x == NULL)
 			return (0);
 		b_leaf = x->rn_bit;
 		b = -1 - x->rn_bit;
@@ -808,7 +796,8 @@ rn_delete(v_arg, netmask_arg, head)
 	 * Delete our route from mask lists.
 	 */
 	if (netmask) {
-		if ((x = rn_addmask(netmask, 1, head_off)) == 0)
+		x = rn_addmask(netmask, head->rnh_masks, 1, head_off);
+		if (x == NULL)
 			return (0);
 		netmask = x->rn_key;
 		while (tt->rn_mask != netmask)
@@ -841,7 +830,7 @@ rn_delete(v_arg, netmask_arg, head)
 	for (mp = &x->rn_mklist; (m = *mp); mp = &m->rm_mklist)
 		if (m == saved_m) {
 			*mp = m->rm_mklist;
-			MKFree(m);
+			Free(m);
 			break;
 		}
 	if (m == 0) {
@@ -932,7 +921,7 @@ on1:
 					struct radix_mask *mm = m->rm_mklist;
 					x->rn_mklist = 0;
 					if (--(m->rm_refs) < 0)
-						MKFree(m);
+						Free(m);
 					m = mm;
 				}
 			if (m)
@@ -1128,10 +1117,8 @@ rn_walktree(h, f, w)
  * bits starting at 'off'.
  * Return 1 on success, 0 on error.
  */
-int
-rn_inithead(head, off)
-	void **head;
-	int off;
+static int
+rn_inithead_internal(void **head, int off)
 {
 	register struct radix_node_head *rnh;
 	register struct radix_node *t, *tt, *ttt;
@@ -1163,8 +1150,8 @@ rn_inithead(head, off)
 	return (1);
 }
 
-int
-rn_detachhead(void **head)
+static void
+rn_detachhead_internal(void **head)
 {
 	struct radix_node_head *rnh;
 
@@ -1176,28 +1163,41 @@ rn_detachhead(void **head)
 	Free(rnh);
 
 	*head = NULL;
+}
+
+int
+rn_inithead(void **head, int off)
+{
+	struct radix_node_head *rnh;
+
+	if (*head != NULL)
+		return (1);
+
+	if (rn_inithead_internal(head, off) == 0)
+		return (0);
+
+	rnh = (struct radix_node_head *)(*head);
+
+	if (rn_inithead_internal((void **)&rnh->rnh_masks, 0) == 0) {
+		rn_detachhead_internal(head);
+		return (0);
+	}
+
 	return (1);
 }
 
-void
-rn_init(int maxk)
+int
+rn_detachhead(void **head)
 {
-	char *cp, *cplim;
+	struct radix_node_head *rnh;
 
-	max_keylen = maxk;
-	if (max_keylen == 0) {
-		log(LOG_ERR,
-		    "rn_init: radix functions require max_keylen be set\n");
-		return;
-	}
-	R_Malloc(rn_zeros, char *, 3 * max_keylen);
-	if (rn_zeros == NULL)
-		panic("rn_init");
-	bzero(rn_zeros, 3 * max_keylen);
-	rn_ones = cp = rn_zeros + max_keylen;
-	addmask_key = cplim = rn_ones + max_keylen;
-	while (cp < cplim)
-		*cp++ = -1;
-	if (rn_inithead((void **)(void *)&mask_rnhead, 0) == 0)
-		panic("rn_init 2");
+	KASSERT((head != NULL && *head != NULL),
+	    ("%s: head already freed", __func__));
+
+	rnh = *head;
+
+	rn_detachhead_internal((void **)&rnh->rnh_masks);
+	rn_detachhead_internal(head);
+	return (1);
 }
+
diff --git a/sys/net/radix.h b/sys/net/radix.h
index 5bacaa3ade8..06cd37b71e1 100644
--- a/sys/net/radix.h
+++ b/sys/net/radix.h
@@ -107,24 +107,15 @@ struct radix_node_head {
 	struct	radix_node *rnh_treetop;
 	u_int	rnh_gen;		/* generation counter */
 	int	rnh_multipath;		/* multipath capable ? */
-	int	rnh_addrsize;		/* permit, but not require fixed keys */
-	int	rnh_pktsize;		/* permit, but not require fixed keys */
 	struct	radix_node *(*rnh_addaddr)	/* add based on sockaddr */
 		(void *v, void *mask,
 		     struct radix_node_head *head, struct radix_node nodes[]);
-	struct	radix_node *(*rnh_addpkt)	/* add based on packet hdr */
-		(void *v, void *mask,
-		     struct radix_node_head *head, struct radix_node nodes[]);
 	struct	radix_node *(*rnh_deladdr)	/* remove based on sockaddr */
 		(void *v, void *mask, struct radix_node_head *head);
-	struct	radix_node *(*rnh_delpkt)	/* remove based on packet hdr */
-		(void *v, void *mask, struct radix_node_head *head);
 	struct	radix_node *(*rnh_matchaddr)	/* locate based on sockaddr */
 		(void *v, struct radix_node_head *head);
 	struct	radix_node *(*rnh_lookup)	/* locate based on sockaddr */
 		(void *v, void *mask, struct radix_node_head *head);
-	struct	radix_node *(*rnh_matchpkt)	/* locate based on packet hdr */
-		(void *v, struct radix_node_head *head);
 	int	(*rnh_walktree)			/* traverse tree */
 		(struct radix_node_head *head, walktree_f_t *f, void *w);
 	int	(*rnh_walktree_from)		/* traverse tree below a */
@@ -133,6 +124,7 @@ struct radix_node_head {
 	void	(*rnh_close)	/* do something when the last ref drops */
 		(struct radix_node *rn, struct radix_node_head *head);
 	struct	radix_node rnh_nodes[3];	/* empty tree for common case */
+	struct	radix_node_head *rnh_masks;	/* Storage for our masks */
 #ifdef _KERNEL
 	struct	rwlock rnh_lock;		/* locks entire radix tree */
 #endif
@@ -141,7 +133,7 @@ struct radix_node_head {
 #ifndef _KERNEL
 #define R_Malloc(p, t, n) (p = (t) malloc((unsigned int)(n)))
 #define R_Zalloc(p, t, n) (p = (t) calloc(1,(unsigned int)(n)))
-#define Free(p) free((char *)p);
+#define R_Free(p) free((char *)p);
 #else
 #define R_Malloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_NOWAIT))
 #define R_Zalloc(p, t, n) (p = (t) malloc((unsigned long)(n), M_RTABLE, M_NOWAIT | M_ZERO))
@@ -161,12 +153,11 @@ struct radix_node_head {
 #define	RADIX_NODE_HEAD_WLOCK_ASSERT(rnh) rw_assert(&(rnh)->rnh_lock, RA_WLOCKED)
 #endif /* _KERNEL */
 
-void	 rn_init(int);
 int	 rn_inithead(void **, int);
 int	 rn_detachhead(void **);
 int	 rn_refines(void *, void *);
 struct radix_node
-	 *rn_addmask(void *, int, int),
+	 *rn_addmask(void *, struct radix_node_head *, int, int),
 	 *rn_addroute (void *, void *, struct radix_node_head *,
 			struct radix_node [2]),
 	 *rn_delete(void *, void *, struct radix_node_head *),
diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c
index c90f537c8d6..477a65db26e 100644
--- a/sys/net/raw_cb.c
+++ b/sys/net/raw_cb.c
@@ -44,8 +44,8 @@
 #include <sys/systm.h>
 
 #include <net/if.h>
-#include <net/raw_cb.h>
 #include <net/vnet.h>
+#include <net/raw_cb.h>
 
 /*
  * Routines to manage the raw protocol control blocks.
diff --git a/sys/net/raw_usrreq.c b/sys/net/raw_usrreq.c
index df77063863f..87bcd895a47 100644
--- a/sys/net/raw_usrreq.c
+++ b/sys/net/raw_usrreq.c
@@ -46,8 +46,8 @@
 #include <sys/systm.h>
 
 #include <net/if.h>
-#include <net/raw_cb.h>
 #include <net/vnet.h>
+#include <net/raw_cb.h>
 
 MTX_SYSINIT(rawcb_mtx, &rawcb_mtx, "rawcb", MTX_DEF);
 
diff --git a/sys/net/route.c b/sys/net/route.c
index 9b9835fa529..dd32980dda5 100644
--- a/sys/net/route.c
+++ b/sys/net/route.c
@@ -54,6 +54,7 @@
 #include <sys/kernel.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <net/vnet.h>
@@ -183,20 +184,12 @@ rt_tables_get_rnh(int table, int fam)
 static void
 route_init(void)
 {
-	struct domain *dom;
-	int max_keylen = 0;
 
 	/* whack the tunable ints into  line. */
 	if (rt_numfibs > RT_MAXFIBS)
 		rt_numfibs = RT_MAXFIBS;
 	if (rt_numfibs == 0)
 		rt_numfibs = 1;
-
-	for (dom = domains; dom; dom = dom->dom_next)
-		if (dom->dom_maxrtkey > max_keylen)
-			max_keylen = dom->dom_maxrtkey;
-
-	rn_init(max_keylen);	/* init all zeroes, all ones, mask table */
 }
 SYSINIT(route_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, route_init, 0);
 
@@ -262,6 +255,9 @@ vnet_route_uninit(const void *unused __unused)
 			dom->dom_rtdetach((void **)rnh, dom->dom_rtoffset);
 		}
 	}
+
+	free(V_rt_tables, M_RTABLE);
+	uma_zdestroy(V_rtzone);
 }
 VNET_SYSUNINIT(vnet_route_uninit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD,
     vnet_route_uninit, 0);
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 0b5d1c5ebc5..e7d1d99a59c 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -53,6 +53,7 @@
 #include <sys/systm.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_llatbl.h>
 #include <net/if_types.h>
@@ -1751,7 +1752,17 @@ sysctl_iflist_ifaml(struct ifaddr *ifa, struct rt_addrinfo *info,
 		    offsetof(struct ifa_msghdrl32, ifam_data);
 		ifam32->ifam_metric = ifa->ifa_metric;
 
-		copy_ifdata32(&ifa->ifa_ifp->if_data, &ifam32->ifam_data);
+		bzero(&ifam32->ifam_data, sizeof(ifam32->ifam_data));
+		ifam32->ifam_data.ifi_datalen = sizeof(struct if_data32);
+		ifam32->ifam_data.ifi_ipackets =
+		    counter_u64_fetch(ifa->ifa_ipackets);
+		ifam32->ifam_data.ifi_opackets =
+		    counter_u64_fetch(ifa->ifa_opackets);
+		ifam32->ifam_data.ifi_ibytes =
+		    counter_u64_fetch(ifa->ifa_ibytes);
+		ifam32->ifam_data.ifi_obytes =
+		    counter_u64_fetch(ifa->ifa_obytes);
+
 		/* Fixup if_data carp(4) vhid. */
 		if (carp_get_vhid_p != NULL)
 			ifam32->ifam_data.ifi_vhid = (*carp_get_vhid_p)(ifa);
@@ -1769,7 +1780,13 @@ sysctl_iflist_ifaml(struct ifaddr *ifa, struct rt_addrinfo *info,
 	ifam->ifam_data_off = offsetof(struct ifa_msghdrl, ifam_data);
 	ifam->ifam_metric = ifa->ifa_metric;
 
-	ifam->ifam_data = ifa->if_data;
+	bzero(&ifam->ifam_data, sizeof(ifam->ifam_data));
+	ifam->ifam_data.ifi_datalen = sizeof(struct if_data);
+	ifam->ifam_data.ifi_ipackets = counter_u64_fetch(ifa->ifa_ipackets);
+	ifam->ifam_data.ifi_opackets = counter_u64_fetch(ifa->ifa_opackets);
+	ifam->ifam_data.ifi_ibytes = counter_u64_fetch(ifa->ifa_ibytes);
+	ifam->ifam_data.ifi_obytes = counter_u64_fetch(ifa->ifa_obytes);
+
 	/* Fixup if_data carp(4) vhid. */
 	if (carp_get_vhid_p != NULL)
 		ifam->ifam_data.ifi_vhid = (*carp_get_vhid_p)(ifa);
diff --git a/sys/net/sff8472.h b/sys/net/sff8472.h
new file mode 100644
index 00000000000..9ce8d6ff8fb
--- /dev/null
+++ b/sys/net/sff8472.h
@@ -0,0 +1,433 @@
+/*-
+ * Copyright (c) 2013 George V. Neville-Neil
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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$
+ */
+
+/*
+ * The following set of constants are from Document SFF-8472
+ * "Diagnostic Monitoring Interface for Optical Transceivers" revision
+ * 11.3 published by the SFF Committee on June 11, 2013
+ *
+ * The SFF standard defines two ranges of addresses, each 255 bytes
+ * long for the storage of data and diagnostics on cables, such as
+ * SFP+ optics and TwinAx cables.  The ranges are defined in the
+ * following way:
+ *
+ * Base Address 0xa0 (Identification Data)
+ * 0-95    Serial ID Defined by SFP MSA
+ * 96-127  Vendor Specific Data
+ * 128-255 Reserved
+ *
+ * Base Address 0xa2 (Diagnostic Data)
+ * 0-55    Alarm and Warning Thresholds
+ * 56-95   Cal Constants
+ * 96-119  Real Time Diagnostic Interface
+ * 120-127 Vendor Specific
+ * 128-247 User Writable EEPROM
+ * 248-255 Vendor Specific
+ *
+ * Note that not all addresses are supported.  Where support is
+ * optional this is noted and instructions for checking for the
+ * support are supplied.
+ *
+ * All these values are read across an I2C (i squared C) bus.  Any
+ * device wishing to read these addresses must first have support for
+ * i2c calls.  The Chelsio T4/T5 driver (dev/cxgbe) is one such
+ * driver.
+ */
+
+
+/* Table 3.1 Two-wire interface ID: Data Fields */
+
+#define SFF_8472_BASE 		0xa0   /* Base address for all our queries. */
+#define SFF_8472_ID		0  /* Transceiver Type (Table 3.2) */
+#define SFF_8472_EXT_ID		1  /* Extended transceiver type (Table 3.3) */
+#define SFF_8472_CONNECTOR	2  /* Connector type (Table 3.4) */
+#define SFF_8472_TRANS_START	3  /* Elec or Optical Compatibility
+				    * (Table 3.5) */
+#define SFF_8472_TRANS_END	10
+#define SFF_8472_ENCODING	11 /* Encoding Code for high speed
+				    * serial encoding algorithm (see
+				    * Table 3.6) */
+#define SFF_8472_BITRATE	12 /* Nominal signaling rate, units
+				    *  of 100MBd.  (see details for
+				    *  rates > 25.0Gb/s) */
+#define SFF_8472_RATEID		13 /* Type of rate select
+				    * functionality (see Table
+				    * 3.6a) */
+#define SFF_8472_LEN_SMF_KM	14 /* Link length supported for single
+				    * mode fiber, units of km */
+#define SFF_8472_LEN_SMF	15 /* Link length supported for single
+				    * mode fiber, units of 100 m */
+#define SFF_8472_LEN_50UM	16 /* Link length supported for 50 um
+				    * OM2 fiber, units of 10 m */
+#define SFF_8472_LEN_625UM	17 /* Link length supported for 62.5
+				    * um OM1 fiber, units of 10 m */
+#define SFF_8472_LEN_OM4	18 /* Link length supported for 50um
+				    * OM4 fiber, units of 10m.
+				    * Alternatively copper or direct
+				    * attach cable, units of m */
+#define SFF_8472_LEN_OM3	19 /* Link length supported for 50 um OM3 fiber, units of 10 m */
+#define SFF_8472_VENDOR_START 	20 /* Vendor name [Address A0h, Bytes
+				    * 20-35] */
+#define SFF_8472_VENDOR_END 	35
+#define SFF_8472_TRANS		36 /* Transceiver Code for electronic
+				    * or optical compatibility (see
+				    * Table 3.5) */
+#define SFF_8472_VENDOR_OUI_START	37 /* Vendor OUI SFP vendor IEEE
+				    * company ID */
+#define SFF_8472_VENDOR_OUI_END	39
+#define SFF_8472_PN_START 	40 /* Vendor PN */
+#define SFF_8472_PN_END 	55
+#define SFF_8472_REV_START 	56 /* Vendor Revision */
+#define SFF_8472_REV_END 	59
+#define SFF_8472_WAVELEN_START	60 /* Wavelength Laser wavelength
+				    * (Passive/Active Cable
+				    * Specification Compliance) */
+#define SFF_8472_WAVELEN_END	61
+#define SFF_8472_CC_BASE	63 /* CC_BASE Check code for Base ID
+				    * Fields (addresses 0 to 62) */
+
+/*
+ * Extension Fields (optional) check the options before reading other
+ * addresses.
+ */
+#define SFF_8472_OPTIONS_MSB	64 /* Options Indicates which optional
+				    * transceiver signals are
+				    * implemented */
+#define SFF_8472_OPTIONS_LSB	65 /* (see Table 3.7) */
+#define SFF_8472_BR_MAX		66 /* BR max Upper bit rate margin,
+				    * units of % (see details for
+				    * rates > 25.0Gb/s) */
+#define SFF_8472_BR_MIN		67 /* Lower bit rate margin, units of
+				    * % (see details for rates >
+				    * 25.0Gb/s) */
+#define SFF_8472_SN_START 	68 /* Vendor SN [Address A0h, Bytes 68-83] */
+#define SFF_8472_SN_END 	83
+#define SFF_8472_DATE_START	84 /* Date code Vendor’s manufacturing
+				    * date code (see Table 3.8) */
+#define SFF_8472_DATE_END	91
+#define SFF_8472_DIAG_TYPE	92 /* Diagnostic Monitoring Type
+				    * Indicates which type of
+				    * diagnostic monitoring is
+				    * implemented (if any) in the
+				    * transceiver (see Table 3.9)
+				    */
+#define SFF_8472_DIAG_IMPL	(1 << 6) /* Required to be 1 */
+#define SFF_8472_DIAG_INTERNAL	(1 << 5) /* Internal measurements. */
+#define SFF_8472_DIAG_EXTERNAL	(1 << 4) /* External measurements. */
+#define SFF_8472_DIAG_POWER	(1 << 3) /* Power measurement type */
+#define SFF_8472_DIAG_ADDR_CHG	(1 << 2) /* Address change required.
+					  * See SFF-8472 doc. */
+
+#define SFF_8472_ENHANCED	93 /* Enhanced Options Indicates which
+				    * optional enhanced features are
+				    * implemented (if any) in the
+				    * transceiver (see Table 3.10) */
+#define SFF_8472_COMPLIANCE	94 /* SFF-8472 Compliance Indicates
+				    * which revision of SFF-8472 the
+				    * transceiver complies with.  (see
+				    * Table 3.12)*/
+#define SFF_8472_CC_EXT		95 /* Check code for the Extended ID
+				    * Fields (addresses 64 to 94)
+				    */
+
+#define SFF_8472_VENDOR_RSRVD_START	96
+#define SFF_8472_VENDOR_RSRVD_END	127
+
+#define SFF_8472_RESERVED_START	128
+#define SFF_8472_RESERVED_END	255
+
+ /*
+  * Diagnostics are available at the two wire address 0xa2.  All
+  * diagnostics are OPTIONAL so you should check 0xa0 registers 92 to
+  * see which, if any are supported.
+  */
+
+#define SFF_8472_DIAG 		0xa2  /* Base address for diagnostics. */
+
+ /*
+  *  Table 3.15 Alarm and Warning Thresholds All values are 2 bytes
+  * and MUST be read in a single read operation starting at the MSB
+  */
+
+#define SFF_8472_TEMP_HIGH_ALM		0 /* Temp High Alarm  */
+#define SFF_8472_TEMP_LOW_ALM		2 /* Temp Low Alarm */
+#define SFF_8472_TEMP_HIGH_WARN		4 /* Temp High Warning */
+#define SFF_8472_TEMP_LOW_WARN		6 /* Temp Low Warning */
+#define SFF_8472_VOLTAGE_HIGH_ALM	8 /* Voltage High Alarm */
+#define SFF_8472_VOLTAGE_LOW_ALM	10 /* Voltage Low Alarm */
+#define SFF_8472_VOLTAGE_HIGH_WARN	12 /* Voltage High Warning */
+#define SFF_8472_VOLTAGE_LOW_WARN	14 /* Voltage Low Warning */
+#define SFF_8472_BIAS_HIGH_ALM		16 /* Bias High Alarm */
+#define SFF_8472_BIAS_LOW_ALM		18 /* Bias Low Alarm */
+#define SFF_8472_BIAS_HIGH_WARN		20 /* Bias High Warning */
+#define SFF_8472_BIAS_LOW_WARN		22 /* Bias Low Warning */
+#define SFF_8472_TX_POWER_HIGH_ALM	24 /* TX Power High Alarm */
+#define SFF_8472_TX_POWER_LOW_ALM	26 /* TX Power Low Alarm */
+#define SFF_8472_TX_POWER_HIGH_WARN	28 /* TX Power High Warning */
+#define SFF_8472_TX_POWER_LOW_WARN	30 /* TX Power Low Warning */
+#define SFF_8472_RX_POWER_HIGH_ALM	32 /* RX Power High Alarm */
+#define SFF_8472_RX_POWER_LOW_ALM	34 /* RX Power Low Alarm */
+#define SFF_8472_RX_POWER_HIGH_WARN	36 /* RX Power High Warning */
+#define SFF_8472_RX_POWER_LOW_WARN	38 /* RX Power Low Warning */
+
+#define SFF_8472_RX_POWER4	56 /* Rx_PWR(4) Single precision
+				    *  floating point calibration data
+				    *  - Rx optical power. Bit 7 of
+				    *  byte 56 is MSB. Bit 0 of byte
+				    *  59 is LSB. Rx_PWR(4) should be
+				    *  set to zero for “internally
+				    *  calibrated� devices. */
+#define SFF_8472_RX_POWER3	60 /* Rx_PWR(3) Single precision
+				    * floating point calibration data
+				    * - Rx optical power.  Bit 7 of
+				    * byte 60 is MSB. Bit 0 of byte 63
+				    * is LSB. Rx_PWR(3) should be set
+				    * to zero for “internally
+				    * calibrated� devices.*/
+#define SFF_8472_RX_POWER2	64 /* Rx_PWR(2) Single precision
+				    * floating point calibration data,
+				    * Rx optical power.  Bit 7 of byte
+				    * 64 is MSB, bit 0 of byte 67 is
+				    * LSB. Rx_PWR(2) should be set to
+				    * zero for “internally calibrated�
+				    * devices. */
+#define SFF_8472_RX_POWER1	68 /* Rx_PWR(1) Single precision
+				    * floating point calibration data,
+				    * Rx optical power. Bit 7 of byte
+				    * 68 is MSB, bit 0 of byte 71 is
+				    * LSB. Rx_PWR(1) should be set to
+				    * 1 for “internally calibrated�
+				    * devices. */
+#define SFF_8472_RX_POWER0	72 /* Rx_PWR(0) Single precision
+				    * floating point calibration data,
+				    * Rx optical power. Bit 7 of byte
+				    * 72 is MSB, bit 0 of byte 75 is
+				    * LSB. Rx_PWR(0) should be set to
+				    * zero for “internally calibrated�
+				    * devices. */
+#define SFF_8472_TX_I_SLOPE	76 /* Tx_I(Slope) Fixed decimal
+				    * (unsigned) calibration data,
+				    * laser bias current. Bit 7 of
+				    * byte 76 is MSB, bit 0 of byte 77
+				    * is LSB. Tx_I(Slope) should be
+				    * set to 1 for “internally
+				    * calibrated� devices. */
+#define SFF_8472_TX_I_OFFSET	78 /* Tx_I(Offset) Fixed decimal
+				    * (signed two’s complement)
+				    * calibration data, laser bias
+				    * current. Bit 7 of byte 78 is
+				    * MSB, bit 0 of byte 79 is
+				    * LSB. Tx_I(Offset) should be set
+				    * to zero for “internally
+				    * calibrated� devices. */
+#define SFF_8472_TX_POWER_SLOPE	80 /* Tx_PWR(Slope) Fixed decimal
+				    * (unsigned) calibration data,
+				    * transmitter coupled output
+				    * power. Bit 7 of byte 80 is MSB,
+				    * bit 0 of byte 81 is LSB.
+				    * Tx_PWR(Slope) should be set to 1
+				    * for “internally calibrated�
+				    * devices. */
+#define SFF_8472_TX_POWER_OFFSET	82 /* Tx_PWR(Offset) Fixed decimal
+				    * (signed two’s complement)
+				    * calibration data, transmitter
+				    * coupled output power. Bit 7 of
+				    * byte 82 is MSB, bit 0 of byte 83
+				    * is LSB. Tx_PWR(Offset) should be
+				    * set to zero for “internally
+				    * calibrated� devices. */
+#define SFF_8472_T_SLOPE	84 /* T (Slope) Fixed decimal
+				    * (unsigned) calibration data,
+				    * internal module temperature. Bit
+				    * 7 of byte 84 is MSB, bit 0 of
+				    * byte 85 is LSB.  T(Slope) should
+				    * be set to 1 for “internally
+				    * calibrated� devices. */
+#define SFF_8472_T_OFFSET	86 /* T (Offset) Fixed decimal (signed
+				    * two’s complement) calibration
+				    * data, internal module
+				    * temperature. Bit 7 of byte 86 is
+				    * MSB, bit 0 of byte 87 is LSB.
+				    * T(Offset) should be set to zero
+				    * for “internally calibrated�
+				    * devices. */
+#define SFF_8472_V_SLOPE	88 /* V (Slope) Fixed decimal
+				    * (unsigned) calibration data,
+				    * internal module supply
+				    * voltage. Bit 7 of byte 88 is
+				    * MSB, bit 0 of byte 89 is
+				    * LSB. V(Slope) should be set to 1
+				    * for “internally calibrated�
+				    * devices. */
+#define SFF_8472_V_OFFSET	90 /* V (Offset) Fixed decimal (signed
+				    * two’s complement) calibration
+				    * data, internal module supply
+				    * voltage. Bit 7 of byte 90 is
+				    * MSB. Bit 0 of byte 91 is
+				    * LSB. V(Offset) should be set to
+				    * zero for “internally calibrated�
+				    * devices. */
+#define SFF_8472_CHECKSUM	95 /* Checksum Byte 95 contains the
+				    * low order 8 bits of the sum of
+				    * bytes 0 – 94. */
+ /* Internal measurements. */
+
+#define SFF_8472_TEMP	 	96 /* Internally measured module temperature. */
+#define SFF_8472_VCC 		98 /* Internally measured supply
+				    * voltage in transceiver.
+				    */
+#define SFF_8472_TX_BIAS	100 /* Internally measured TX Bias Current. */
+#define SFF_8472_TX_POWER	102 /* Measured TX output power. */
+#define SFF_8472_RX_POWER	104 /* Measured RX input power. */
+
+#define SFF_8472_STATUS		110 /* See below */
+
+ /* Status Bits Described */
+
+/*
+ * TX Disable State Digital state of the TX Disable Input Pin. Updated
+ * within 100ms of change on pin.
+ */
+#define SFF_8472_STATUS_TX_DISABLE  (1 << 7) 
+
+/*
+ * Select Read/write bit that allows software disable of
+ * laser. Writing ‘1’ disables laser. See Table 3.11 for
+ * enable/disable timing requirements. This bit is “OR�d with the hard
+ * TX_DISABLE pin value. Note, per SFP MSA TX_DISABLE pin is default
+ * enabled unless pulled low by hardware. If Soft TX Disable is not
+ * implemented, the transceiver ignores the value of this bit. Default
+ * power up value is zero/low.
+ */
+#define SFF_8472_STATUS_SOFT_TX_DISABLE (1 << 6) 
+
+/*
+ * RS(1) State Digital state of SFP input pin AS(1) per SFF-8079 or
+ * RS(1) per SFF-8431. Updated within 100ms of change on pin. See A2h
+ * Byte 118, Bit 3 for Soft RS(1) Select control information.
+ */
+#define SFF_8472_RS_STATE (1 << 5) 
+
+/*
+ * Rate_Select State [aka. “RS(0)�] Digital state of the SFP
+ * Rate_Select Input Pin. Updated within 100ms of change on pin. Note:
+ * This pin is also known as AS(0) in SFF-8079 and RS(0) in SFF-8431.
+ */ 
+#define SFF_8472_STATUS_SELECT_STATE (1 << 4)
+     
+/*
+ * Read/write bit that allows software rate select control. Writing
+ * ‘1’ selects full bandwidth operation. This bit is “OR’d with the
+ * hard Rate_Select, AS(0) or RS(0) pin value. See Table 3.11 for
+ * timing requirements. Default at power up is logic zero/low. If Soft
+ * Rate Select is not implemented, the transceiver ignores the value
+ * of this bit. Note: Specific transceiver behaviors of this bit are
+ * identified in Table 3.6a and referenced documents. See Table 3.18a,
+ * byte 118, bit 3 for Soft RS(1) Select.
+ */
+#define SFF_8472_STATUS_SOFT_RATE_SELECT (1 << 3)
+
+/*
+ * TX Fault State Digital state of the TX Fault Output Pin. Updated
+ * within 100ms of change on pin.
+ */
+#define SFF_8472_STATUS_TX_FAULT_STATE (1 << 2)
+
+/*
+ * Digital state of the RX_LOS Output Pin. Updated within 100ms of
+ * change on pin.
+ */
+#define SFF_8472_STATUS_RX_LOS (1 << 1)
+
+/*
+ * Indicates transceiver has achieved power up and data is ready. Bit
+ * remains high until data is ready to be read at which time the
+ * device sets the bit low.
+ */
+#define SFF_8472_STATUS_DATA_READY (1 << 0)
+
+/* Table 3.2 Identifier values */
+#define SFF_8472_ID_UNKNOWN	0x0 /* Unknown or unspecified */
+#define SFF_8472_ID_GBIC	0x1 /* GBIC */
+#define SFF_8472_ID_SFF		0x2 /* Module soldered to motherboard (ex: SFF)*/
+#define SFF_8472_ID_SFP		0x3 /* SFP or SFP “Plus� */
+#define SFF_8472_ID_XBI		0x4 /* Reserved for “300 pin XBI� devices */
+#define SFF_8472_ID_XENPAK	0x5 /* Reserved for “Xenpak� devices */
+#define SFF_8472_ID_XFP		0x6 /* Reserved for “XFP� devices */
+#define SFF_8472_ID_XFF		0x7 /* Reserved for “XFF� devices */
+#define SFF_8472_ID_XFPE	0x8 /* Reserved for “XFP-E� devices */
+#define SFF_8472_ID_XPAK	0x9 /* Reserved for “XPak� devices */
+#define SFF_8472_ID_X2		0xA /* Reserved for “X2� devices */
+#define SFF_8472_ID_DWDM_SFP	0xB /* Reserved for “DWDM-SFP� devices */
+#define SFF_8472_ID_QSFP	0xC /* Reserved for “QSFP� devices */
+#define SFF_8472_ID_LAST	SFF_8472_ID_QSFP
+
+static char *sff_8472_id[SFF_8472_ID_LAST + 1] = {"Unknown",
+					     "GBIC",
+					     "SFF",
+					     "SFP",
+					     "XBI",
+					     "Xenpak",
+					     "XFP",
+					     "XFF",
+					     "XFP-E",
+					     "XPak",
+					     "X2",
+					     "DWDM-SFP",
+					     "QSFP"};
+
+/* Table 3.13 and 3.14 Temperature Conversion Values */
+#define SFF_8472_TEMP_SIGN (1 << 15)
+#define SFF_8472_TEMP_SHIFT  8
+#define SFF_8472_TEMP_MSK  0xEF00
+#define SFF_8472_TEMP_FRAC 0x00FF
+
+/* Internal Callibration Conversion factors */
+
+/*
+ * Represented as a 16 bit unsigned integer with the voltage defined
+ * as the full 16 bit value (0 – 65535) with LSB equal to 100 uVolt,
+ * yielding a total range of 0 to +6.55 Volts.
+ */
+#define SFF_8472_VCC_FACTOR 10000.0 
+
+/*
+ * Represented as a 16 bit unsigned integer with the current defined
+ * as the full 16 bit value (0 – 65535) with LSB equal to 2 uA,
+ * yielding a total range of 0 to 131 mA.
+ */
+
+#define SFF_8472_BIAS_FACTOR 2000.0 
+
+/*
+ * Represented as a 16 bit unsigned integer with the power defined as
+ * the full 16 bit value (0 – 65535) with LSB equal to 0.1 uW,
+ * yielding a total range of 0 to 6.5535 mW (~ -40 to +8.2 dBm).
+ */
+
+#define SFF_8472_POWER_FACTOR 10000.0
diff --git a/sys/net/vnet.c b/sys/net/vnet.c
index e8864aac0cd..bceb2ef9b68 100644
--- a/sys/net/vnet.c
+++ b/sys/net/vnet.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ddb.h"
 #include "opt_kdb.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kdb.h>
@@ -210,14 +209,14 @@ static TAILQ_HEAD(, vnet_data_free) vnet_data_free_head =
 static struct sx vnet_data_free_lock;
 
 SDT_PROVIDER_DEFINE(vnet);
-SDT_PROBE_DEFINE1(vnet, functions, vnet_alloc, entry, entry, "int");
-SDT_PROBE_DEFINE2(vnet, functions, vnet_alloc, alloc, alloc, "int",
+SDT_PROBE_DEFINE1(vnet, functions, vnet_alloc, entry, "int");
+SDT_PROBE_DEFINE2(vnet, functions, vnet_alloc, alloc, "int",
     "struct vnet *");
-SDT_PROBE_DEFINE2(vnet, functions, vnet_alloc, return, return,
+SDT_PROBE_DEFINE2(vnet, functions, vnet_alloc, return,
     "int", "struct vnet *");
-SDT_PROBE_DEFINE2(vnet, functions, vnet_destroy, entry, entry,
+SDT_PROBE_DEFINE2(vnet, functions, vnet_destroy, entry,
     "int", "struct vnet *");
-SDT_PROBE_DEFINE1(vnet, functions, vnet_destroy, return, entry,
+SDT_PROBE_DEFINE1(vnet, functions, vnet_destroy, return,
     "int");
 
 #ifdef DDB
diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index db505abd2dc..6ba0984cd13 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/net80211/ieee80211_action.c b/sys/net80211/ieee80211_action.c
index a36df7c8b0b..e37863ee12f 100644
--- a/sys/net80211/ieee80211_action.c
+++ b/sys/net80211/ieee80211_action.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
diff --git a/sys/net80211/ieee80211_adhoc.c b/sys/net80211/ieee80211_adhoc.c
index ecf3a8793bf..e40a238d614 100644
--- a/sys/net80211/ieee80211_adhoc.c
+++ b/sys/net80211/ieee80211_adhoc.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
diff --git a/sys/net80211/ieee80211_ageq.c b/sys/net80211/ieee80211_ageq.c
index 018ddc27119..b650136c05b 100644
--- a/sys/net80211/ieee80211_ageq.c
+++ b/sys/net80211/ieee80211_ageq.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
diff --git a/sys/net80211/ieee80211_alq.c b/sys/net80211/ieee80211_alq.c
index e651574698d..a52103aef1b 100644
--- a/sys/net80211/ieee80211_alq.c
+++ b/sys/net80211/ieee80211_alq.c
@@ -53,10 +53,8 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/if_var.h>
-#include <net/if_dl.h>
-#include <net/if_clone.h>
 #include <net/if_media.h>
-#include <net/if_types.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_freebsd.h>
diff --git a/sys/net80211/ieee80211_amrr.c b/sys/net80211/ieee80211_amrr.c
index 003b4bc7ae4..ab1f0333904 100644
--- a/sys/net80211/ieee80211_amrr.c
+++ b/sys/net80211/ieee80211_amrr.c
@@ -38,7 +38,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #ifdef INET
 #include <netinet/in.h>
@@ -129,6 +131,12 @@ amrr_deinit(struct ieee80211vap *vap)
 	free(vap->iv_rs, M_80211_RATECTL);
 }
 
+/*
+ * Return whether 11n rates are possible.
+ *
+ * Some 11n devices may return HT information but no HT rates.
+ * Thus, we shouldn't treat them as an 11n node.
+ */
 static int
 amrr_node_is_11n(struct ieee80211_node *ni)
 {
@@ -137,6 +145,8 @@ amrr_node_is_11n(struct ieee80211_node *ni)
 		return (0);
 	if (ni->ni_chan == IEEE80211_CHAN_ANYC)
 		return (0);
+	if (IEEE80211_IS_CHAN_HT(ni->ni_chan) && ni->ni_htrates.rs_nrates == 0)
+		return (0);
 	return (IEEE80211_IS_CHAN_HT(ni->ni_chan));
 }
 
@@ -189,13 +199,13 @@ amrr_node_init(struct ieee80211_node *ni)
 	    amn->amn_rix--) {
 		/* legacy - anything < 36mbit, stop searching */
 		/* 11n - stop at MCS4 / MCS12 / MCS28 */
-		if (amrr_node_is_11n(ni) &&
-		    (rs->rs_rates[amn->amn_rix] & 0x7) < 4)
+		if (amrr_node_is_11n(ni)) {
+			if ((rs->rs_rates[amn->amn_rix] & 0x7) < 4)
+				break;
+		} else if ((rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL) <= 72)
 			break;
-		else if ((rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL) <= 72)
-			break;
-		rate = rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL;
 	}
+	rate = rs->rs_rates[amn->amn_rix] & IEEE80211_RATE_VAL;
 
 	/* if the rate is an 11n rate, ensure the MCS bit is set */
 	if (amrr_node_is_11n(ni))
diff --git a/sys/net80211/ieee80211_ddb.c b/sys/net80211/ieee80211_ddb.c
index 6f7dabf3b72..74e82e54513 100644
--- a/sys/net80211/ieee80211_ddb.c
+++ b/sys/net80211/ieee80211_ddb.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
diff --git a/sys/net80211/ieee80211_dfs.c b/sys/net80211/ieee80211_dfs.c
index 82e525d523c..5fa9ba4b5c3 100644
--- a/sys/net80211/ieee80211_dfs.c
+++ b/sys/net80211/ieee80211_dfs.c
@@ -48,7 +48,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 
diff --git a/sys/net80211/ieee80211_freebsd.c b/sys/net80211/ieee80211_freebsd.c
index b616c4453e8..ab5b26eca82 100644
--- a/sys/net80211/ieee80211_freebsd.c
+++ b/sys/net80211/ieee80211_freebsd.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_clone.h>
 #include <net/if_media.h>
@@ -808,9 +809,9 @@ static eventhandler_tag wlan_ifllevent;
 static void
 bpf_track(void *arg, struct ifnet *ifp, int dlt, int attach)
 {
-	/* NB: identify vap's by if_start */
+	/* NB: identify vap's by if_init */
 	if (dlt == DLT_IEEE802_11_RADIO &&
-	    ifp->if_transmit == ieee80211_vap_transmit) {
+	    ifp->if_init == ieee80211_init) {
 		struct ieee80211vap *vap = ifp->if_softc;
 		/*
 		 * Track bpf radiotap listener state.  We mark the vap
diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c
index 93a9b27024b..91c58abf35f 100644
--- a/sys/net80211/ieee80211_hostap.c
+++ b/sys/net80211/ieee80211_hostap.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c
index 7f41b279abb..b39f71dc24a 100644
--- a/sys/net80211/ieee80211_ht.c
+++ b/sys/net80211/ieee80211_ht.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
diff --git a/sys/net80211/ieee80211_input.c b/sys/net80211/ieee80211_input.c
index 5e956461ce8..6ea4f9bfcce 100644
--- a/sys/net80211/ieee80211_input.c
+++ b/sys/net80211/ieee80211_input.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
  
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
 #include <net/if_vlan_var.h>
diff --git a/sys/net80211/ieee80211_ioctl.c b/sys/net80211/ieee80211_ioctl.c
index 6b668cb2c91..72d6dd1f7a4 100644
--- a/sys/net80211/ieee80211_ioctl.c
+++ b/sys/net80211/ieee80211_ioctl.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
diff --git a/sys/net80211/ieee80211_mesh.c b/sys/net80211/ieee80211_mesh.c
index 1d03c1a820b..d18483ea056 100644
--- a/sys/net80211/ieee80211_mesh.c
+++ b/sys/net80211/ieee80211_mesh.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
diff --git a/sys/net80211/ieee80211_monitor.c b/sys/net80211/ieee80211_monitor.c
index e32408172fe..f52b0fb0763 100644
--- a/sys/net80211/ieee80211_monitor.c
+++ b/sys/net80211/ieee80211_monitor.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c
index 41692558fd9..9fc4cd4d315 100644
--- a/sys/net80211/ieee80211_node.c
+++ b/sys/net80211/ieee80211_node.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
  
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
diff --git a/sys/net80211/ieee80211_output.c b/sys/net80211/ieee80211_output.c
index a7aa7d9e902..f7582034038 100644
--- a/sys/net80211/ieee80211_output.c
+++ b/sys/net80211/ieee80211_output.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
 #include <net/if_vlan_var.h>
@@ -143,8 +144,12 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, struct mbuf *m,
 		 */
 		(void) ieee80211_pwrsave(ni, m);
 		ieee80211_free_node(ni);
-		/* XXX better status? */
-		return (ENOBUFS);
+
+		/*
+		 * We queued it fine, so tell the upper layer
+		 * that we consumed it.
+		 */
+		return (0);
 	}
 	/* calculate priority so drivers can find the tx queue */
 	if (ieee80211_classify(ni, m)) {
@@ -155,8 +160,9 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, struct mbuf *m,
 		ifp->if_oerrors++;
 		m_freem(m);
 		ieee80211_free_node(ni);
+
 		/* XXX better status? */
-		return (ENOBUFS);
+		return (0);
 	}
 	/*
 	 * Stash the node pointer.  Note that we do this after
@@ -168,7 +174,6 @@ ieee80211_vap_pkt_send_dest(struct ieee80211vap *vap, struct mbuf *m,
 
 	BPF_MTAP(ifp, m);		/* 802.3 tx */
 
-
 	/*
 	 * Check if A-MPDU tx aggregation is setup or if we
 	 * should try to enable it.  The sta must be associated
@@ -2732,20 +2737,35 @@ ieee80211_alloc_cts(struct ieee80211com *ic,
 static void
 ieee80211_tx_mgt_timeout(void *arg)
 {
-	struct ieee80211_node *ni = arg;
-	struct ieee80211vap *vap = ni->ni_vap;
+	struct ieee80211vap *vap = arg;
 
+	IEEE80211_LOCK(vap->iv_ic);
 	if (vap->iv_state != IEEE80211_S_INIT &&
 	    (vap->iv_ic->ic_flags & IEEE80211_F_SCAN) == 0) {
 		/*
 		 * NB: it's safe to specify a timeout as the reason here;
 		 *     it'll only be used in the right state.
 		 */
-		ieee80211_new_state(vap, IEEE80211_S_SCAN,
+		ieee80211_new_state_locked(vap, IEEE80211_S_SCAN,
 			IEEE80211_SCAN_FAIL_TIMEOUT);
 	}
+	IEEE80211_UNLOCK(vap->iv_ic);
 }
 
+/*
+ * This is the callback set on net80211-sourced transmitted
+ * authentication request frames.
+ *
+ * This does a couple of things:
+ *
+ * + If the frame transmitted was a success, it schedules a future
+ *   event which will transition the interface to scan.
+ *   If a state transition _then_ occurs before that event occurs,
+ *   said state transition will cancel this callout.
+ *
+ * + If the frame transmit was a failure, it immediately schedules
+ *   the transition back to scan.
+ */
 static void
 ieee80211_tx_mgt_cb(struct ieee80211_node *ni, void *arg, int status)
 {
@@ -2763,10 +2783,11 @@ ieee80211_tx_mgt_cb(struct ieee80211_node *ni, void *arg, int status)
 	 *
 	 * XXX what happens if !acked but response shows up before callback?
 	 */
-	if (vap->iv_state == ostate)
+	if (vap->iv_state == ostate) {
 		callout_reset(&vap->iv_mgtsend,
 			status == 0 ? IEEE80211_TRANS_WAIT*hz : 0,
-			ieee80211_tx_mgt_timeout, ni);
+			ieee80211_tx_mgt_timeout, vap);
+	}
 }
 
 static void
diff --git a/sys/net80211/ieee80211_phy.c b/sys/net80211/ieee80211_phy.c
index 923266ca373..4242ac0ec5d 100644
--- a/sys/net80211/ieee80211_phy.c
+++ b/sys/net80211/ieee80211_phy.c
@@ -35,12 +35,16 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
+#include <sys/malloc.h>
 
 #include <sys/socket.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
 
+#include <net/ethernet.h>
+#include <net/route.h>
+
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_phy.h>
 
diff --git a/sys/net80211/ieee80211_power.c b/sys/net80211/ieee80211_power.c
index 4542ec59da0..3fd16cf5d64 100644
--- a/sys/net80211/ieee80211_power.c
+++ b/sys/net80211/ieee80211_power.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
diff --git a/sys/net80211/ieee80211_proto.c b/sys/net80211/ieee80211_proto.c
index 605c77102c6..751c44d7397 100644
--- a/sys/net80211/ieee80211_proto.c
+++ b/sys/net80211/ieee80211_proto.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sockio.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>		/* XXX for ether_sprintf */
 
@@ -107,8 +108,6 @@ static void update_promisc(void *, int);
 static void update_channel(void *, int);
 static void update_chw(void *, int);
 static void ieee80211_newstate_cb(void *, int);
-static int ieee80211_new_state_locked(struct ieee80211vap *,
-	enum ieee80211_state, int);
 
 static int
 null_raw_xmit(struct ieee80211_node *ni, struct mbuf *m,
@@ -1834,7 +1833,7 @@ done:
  * is usually a mistake and indicates lack of proper integration
  * with the net80211 layer.
  */
-static int
+int
 ieee80211_new_state_locked(struct ieee80211vap *vap,
 	enum ieee80211_state nstate, int arg)
 {
diff --git a/sys/net80211/ieee80211_proto.h b/sys/net80211/ieee80211_proto.h
index 5ec845938ac..8df51163e4e 100644
--- a/sys/net80211/ieee80211_proto.h
+++ b/sys/net80211/ieee80211_proto.h
@@ -332,6 +332,8 @@ void	ieee80211_dturbo_switch(struct ieee80211vap *, int newflags);
 void	ieee80211_swbmiss(void *arg);
 void	ieee80211_beacon_miss(struct ieee80211com *);
 int	ieee80211_new_state(struct ieee80211vap *, enum ieee80211_state, int);
+int	ieee80211_new_state_locked(struct ieee80211vap *, enum ieee80211_state,
+		int);
 void	ieee80211_print_essid(const uint8_t *, int);
 void	ieee80211_dump_pkt(struct ieee80211com *,
 		const uint8_t *, int, int, int);
diff --git a/sys/net80211/ieee80211_radiotap.c b/sys/net80211/ieee80211_radiotap.c
index f06f7e019a5..5638f52c2ca 100644
--- a/sys/net80211/ieee80211_radiotap.c
+++ b/sys/net80211/ieee80211_radiotap.c
@@ -42,8 +42,10 @@ __FBSDID("$FreeBSD$");
  
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 
diff --git a/sys/net80211/ieee80211_ratectl.c b/sys/net80211/ieee80211_ratectl.c
index 0ad46bd3bd4..3eff898ecd4 100644
--- a/sys/net80211/ieee80211_ratectl.c
+++ b/sys/net80211/ieee80211_ratectl.c
@@ -30,9 +30,12 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
+#include <sys/malloc.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
+#include <net/route.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_ratectl.h>
diff --git a/sys/net80211/ieee80211_ratectl_none.c b/sys/net80211/ieee80211_ratectl_none.c
index 0edec449ec3..a0056f3f535 100644
--- a/sys/net80211/ieee80211_ratectl_none.c
+++ b/sys/net80211/ieee80211_ratectl_none.c
@@ -29,13 +29,16 @@ __FBSDID("$FreeBSD$");
 #include "opt_wlan.h"
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #ifdef INET
 #include <netinet/in.h>
diff --git a/sys/net80211/ieee80211_regdomain.c b/sys/net80211/ieee80211_regdomain.c
index 6bc5e0d388b..ed7f4227ef5 100644
--- a/sys/net80211/ieee80211_regdomain.c
+++ b/sys/net80211/ieee80211_regdomain.c
@@ -34,11 +34,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h> 
 #include <sys/kernel.h>
+#include <sys/malloc.h>
  
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_regdomain.h>
diff --git a/sys/net80211/ieee80211_rssadapt.c b/sys/net80211/ieee80211_rssadapt.c
index aaf4057a77e..f230f60d8f4 100644
--- a/sys/net80211/ieee80211_rssadapt.c
+++ b/sys/net80211/ieee80211_rssadapt.c
@@ -33,13 +33,17 @@
 #include "opt_wlan.h"
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_rssadapt.h>
diff --git a/sys/net80211/ieee80211_scan.c b/sys/net80211/ieee80211_scan.c
index c24b6317929..66e843097cc 100644
--- a/sys/net80211/ieee80211_scan.c
+++ b/sys/net80211/ieee80211_scan.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
@@ -859,6 +860,7 @@ scan_task(void *arg, int pending)
 	if (ss->ss_next == ss->ss_last) {
 		IEEE80211_DPRINTF(vap, IEEE80211_MSG_SCAN,
 			"%s: no channels to scan\n", __func__);
+		scandone = 1;
 		goto done;
 	}
 
diff --git a/sys/net80211/ieee80211_scan_sta.c b/sys/net80211/ieee80211_scan_sta.c
index c791ea1ef99..6da06fd1c4d 100644
--- a/sys/net80211/ieee80211_scan_sta.c
+++ b/sys/net80211/ieee80211_scan_sta.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/ethernet.h>
 
@@ -732,7 +733,7 @@ sta_cancel(struct ieee80211_scan_state *ss, struct ieee80211vap *vap)
 	return 0;
 }
 
-/* unalligned little endian access */     
+/* unaligned little endian access */     
 #define LE_READ_2(p)					\
 	((uint16_t)					\
 	 ((((const uint8_t *)(p))[0]      ) |		\
diff --git a/sys/net80211/ieee80211_superg.c b/sys/net80211/ieee80211_superg.c
index 21f3b995c0e..94af70d5388 100644
--- a/sys/net80211/ieee80211_superg.c
+++ b/sys/net80211/ieee80211_superg.c
@@ -38,11 +38,12 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/socket.h>
  
-#include <net/bpf.h>
-#include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_llc.h>
 #include <net/if_media.h>
+#include <net/bpf.h>
+#include <net/ethernet.h>
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_input.h>
diff --git a/sys/net80211/ieee80211_wds.c b/sys/net80211/ieee80211_wds.c
index 8e0cb06e6ef..e0dfaeafff6 100644
--- a/sys/net80211/ieee80211_wds.c
+++ b/sys/net80211/ieee80211_wds.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_llc.h>
 #include <net/ethernet.h>
diff --git a/sys/netatalk/aarp.c b/sys/netatalk/aarp.c
index 8d4f76fddd4..0cd418001da 100644
--- a/sys/netatalk/aarp.c
+++ b/sys/netatalk/aarp.c
@@ -60,6 +60,7 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 
 #include <netinet/in.h>
diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index 9d92a05a3cf..67e2bd50581 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #undef s_net
@@ -199,16 +200,10 @@ at_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
 		 * allocate a fresh one. 
 		 */
 		if (aa == NULL) {
-			aa = malloc(sizeof(struct at_ifaddr), M_IFADDR,
-			    M_NOWAIT | M_ZERO);
-			if (aa == NULL) {
-				error = ENOBUFS;
-				goto out;
-			}
-			callout_init(&aa->aa_callout, CALLOUT_MPSAFE);
+			ifa = ifa_alloc(sizeof(struct at_ifaddr), M_WAITOK);
+			aa = (struct at_ifaddr *)ifa;
 
-			ifa = (struct ifaddr *)aa;
-			ifa_init(ifa);
+			callout_init(&aa->aa_callout, CALLOUT_MPSAFE);
 
 			/*
 			 * As the at_ifaddr contains the actual sockaddrs,
diff --git a/sys/netatalk/ddp_input.c b/sys/netatalk/ddp_input.c
index f78fc86e847..6ea78571521 100644
--- a/sys/netatalk/ddp_input.c
+++ b/sys/netatalk/ddp_input.c
@@ -59,6 +59,7 @@
 #include <sys/sx.h>
 #include <sys/systm.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netatalk/at.h>
diff --git a/sys/netatalk/ddp_output.c b/sys/netatalk/ddp_output.c
index 2b53de46e75..2eb02738672 100644
--- a/sys/netatalk/ddp_output.c
+++ b/sys/netatalk/ddp_output.c
@@ -30,6 +30,7 @@
 #include <sys/socketvar.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #undef s_net
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 6be8f4e1364..9d9078ee408 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -58,6 +58,7 @@
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/netisr.h>
 
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 2e541588b9b..e675fdc895b 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -58,6 +58,7 @@
 #include <sys/socketvar.h>
 #include <sys/protosw.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/netisr.h>
 
diff --git a/sys/netgraph/netflow/netflow.c b/sys/netgraph/netflow/netflow.c
index f230616a5db..56947a644e5 100644
--- a/sys/netgraph/netflow/netflow.c
+++ b/sys/netgraph/netflow/netflow.c
@@ -46,6 +46,7 @@ static const char rcs_id[] =
 #include <machine/stdarg.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/ethernet.h>
 #include <netinet/in.h>
diff --git a/sys/netgraph/ng_base.c b/sys/netgraph/ng_base.c
index a5fcb143275..0b974ce4fd5 100644
--- a/sys/netgraph/ng_base.c
+++ b/sys/netgraph/ng_base.c
@@ -74,7 +74,12 @@
 MODULE_VERSION(netgraph, NG_ABI_VERSION);
 
 /* Mutex to protect topology events. */
-static struct mtx	ng_topo_mtx;
+static struct rwlock	ng_topo_lock;
+#define	TOPOLOGY_RLOCK()	rw_rlock(&ng_topo_lock)
+#define	TOPOLOGY_RUNLOCK()	rw_runlock(&ng_topo_lock)
+#define	TOPOLOGY_WLOCK()	rw_wlock(&ng_topo_lock)
+#define	TOPOLOGY_WUNLOCK()	rw_wunlock(&ng_topo_lock)
+#define	TOPOLOGY_NOTOWNED()	rw_assert(&ng_topo_lock, RA_UNLOCKED)
 
 #ifdef	NETGRAPH_DEBUG
 static struct mtx	ng_nodelist_mtx; /* protects global node/hook lists */
@@ -1162,7 +1167,7 @@ ng_destroy_hook(hook_p hook)
 	 * Protect divorce process with mutex, to avoid races on
 	 * simultaneous disconnect.
 	 */
-	mtx_lock(&ng_topo_mtx);
+	TOPOLOGY_WLOCK();
 
 	hook->hk_flags |= HK_INVALID;
 
@@ -1182,17 +1187,17 @@ ng_destroy_hook(hook_p hook)
 			 * If it's already divorced from a node,
 			 * just free it.
 			 */
-			mtx_unlock(&ng_topo_mtx);
+			TOPOLOGY_WUNLOCK();
 		} else {
-			mtx_unlock(&ng_topo_mtx);
+			TOPOLOGY_WUNLOCK();
 			ng_rmhook_self(peer); 	/* Send it a surprise */
 		}
 		NG_HOOK_UNREF(peer);		/* account for peer link */
 		NG_HOOK_UNREF(hook);		/* account for peer link */
 	} else
-		mtx_unlock(&ng_topo_mtx);
+		TOPOLOGY_WUNLOCK();
 
-	mtx_assert(&ng_topo_mtx, MA_NOTOWNED);
+	TOPOLOGY_NOTOWNED();
 
 	/*
 	 * Remove the hook from the node's list to avoid possible recursion
@@ -1233,9 +1238,9 @@ ng_bypass(hook_p hook1, hook_p hook2)
 		TRAP_ERROR();
 		return (EINVAL);
 	}
-	mtx_lock(&ng_topo_mtx);
+	TOPOLOGY_WLOCK();
 	if (NG_HOOK_NOT_VALID(hook1) || NG_HOOK_NOT_VALID(hook2)) {
-		mtx_unlock(&ng_topo_mtx);
+		TOPOLOGY_WUNLOCK();
 		return (EINVAL);
 	}
 	hook1->hk_peer->hk_peer = hook2->hk_peer;
@@ -1243,7 +1248,7 @@ ng_bypass(hook_p hook1, hook_p hook2)
 
 	hook1->hk_peer = &ng_deadhook;
 	hook2->hk_peer = &ng_deadhook;
-	mtx_unlock(&ng_topo_mtx);
+	TOPOLOGY_WUNLOCK();
 
 	NG_HOOK_UNREF(hook1);
 	NG_HOOK_UNREF(hook2);
@@ -1440,15 +1445,15 @@ ng_con_part2(node_p node, item_p item, hook_p hook)
 	/*
 	 * Acquire topo mutex to avoid race with ng_destroy_hook().
 	 */
-	mtx_lock(&ng_topo_mtx);
+	TOPOLOGY_RLOCK();
 	peer = hook->hk_peer;
 	if (peer == &ng_deadhook) {
-		mtx_unlock(&ng_topo_mtx);
+		TOPOLOGY_RUNLOCK();
 		printf("failed in ng_con_part2(B)\n");
 		ng_destroy_hook(hook);
 		ERROUT(ENOENT);
 	}
-	mtx_unlock(&ng_topo_mtx);
+	TOPOLOGY_RUNLOCK();
 
 	if ((error = ng_send_fn2(peer->hk_node, peer, item, &ng_con_part3,
 	    NULL, 0, NG_REUSE_ITEM))) {
@@ -1793,14 +1798,14 @@ ng_path2noderef(node_p here, const char *address, node_p *destp,
 		/* We have a segment, so look for a hook by that name */
 		hook = ng_findhook(node, segment);
 
-		mtx_lock(&ng_topo_mtx);
+		TOPOLOGY_WLOCK();
 		/* Can't get there from here... */
 		if (hook == NULL || NG_HOOK_PEER(hook) == NULL ||
 		    NG_HOOK_NOT_VALID(hook) ||
 		    NG_HOOK_NOT_VALID(NG_HOOK_PEER(hook))) {
 			TRAP_ERROR();
 			NG_NODE_UNREF(node);
-			mtx_unlock(&ng_topo_mtx);
+			TOPOLOGY_WUNLOCK();
 			return (ENOENT);
 		}
 
@@ -1817,7 +1822,7 @@ ng_path2noderef(node_p here, const char *address, node_p *destp,
 		NG_NODE_UNREF(oldnode);	/* XXX another race */
 		if (NG_NODE_NOT_VALID(node)) {
 			NG_NODE_UNREF(node);	/* XXX more races */
-			mtx_unlock(&ng_topo_mtx);
+			TOPOLOGY_WUNLOCK();
 			TRAP_ERROR();
 			return (ENXIO);
 		}
@@ -1830,11 +1835,11 @@ ng_path2noderef(node_p here, const char *address, node_p *destp,
 				} else
 					*lasthook = NULL;
 			}
-			mtx_unlock(&ng_topo_mtx);
+			TOPOLOGY_WUNLOCK();
 			*destp = node;
 			return (0);
 		}
-		mtx_unlock(&ng_topo_mtx);
+		TOPOLOGY_WUNLOCK();
 	}
 }
 
@@ -3202,8 +3207,7 @@ ngb_mod_event(module_t mod, int event, void *data)
 		rw_init(&ng_typelist_lock, "netgraph types");
 		rw_init(&ng_idhash_lock, "netgraph idhash");
 		rw_init(&ng_namehash_lock, "netgraph namehash");
-		mtx_init(&ng_topo_mtx, "netgraph topology mutex", NULL,
-		    MTX_DEF);
+		rw_init(&ng_topo_lock, "netgraph topology mutex");
 #ifdef	NETGRAPH_DEBUG
 		mtx_init(&ng_nodelist_mtx, "netgraph nodelist mutex", NULL,
 		    MTX_DEF);
@@ -3579,13 +3583,13 @@ ng_address_hook(node_p here, item_p item, hook_p hook, ng_ID_t retaddr)
 	 * that the peer is still connected (even if invalid,) we know
 	 * that the peer node is present, though maybe invalid.
 	 */
-	mtx_lock(&ng_topo_mtx);
+	TOPOLOGY_RLOCK();
 	if ((hook == NULL) || NG_HOOK_NOT_VALID(hook) ||
 	    NG_HOOK_NOT_VALID(peer = NG_HOOK_PEER(hook)) ||
 	    NG_NODE_NOT_VALID(peernode = NG_PEER_NODE(hook))) {
 		NG_FREE_ITEM(item);
 		TRAP_ERROR();
-		mtx_unlock(&ng_topo_mtx);
+		TOPOLOGY_RUNLOCK();
 		return (ENETDOWN);
 	}
 
@@ -3598,7 +3602,7 @@ ng_address_hook(node_p here, item_p item, hook_p hook, ng_ID_t retaddr)
 	NGI_SET_NODE(item, peernode);
 	SET_RETADDR(item, here, retaddr);
 
-	mtx_unlock(&ng_topo_mtx);
+	TOPOLOGY_RUNLOCK();
 
 	return (0);
 }
diff --git a/sys/netgraph/ng_bridge.c b/sys/netgraph/ng_bridge.c
index becfea160ed..57db73e60c3 100644
--- a/sys/netgraph/ng_bridge.c
+++ b/sys/netgraph/ng_bridge.c
@@ -71,6 +71,7 @@
 #include <sys/ctype.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
 #include <net/vnet.h>
 
diff --git a/sys/netgraph/ng_cisco.c b/sys/netgraph/ng_cisco.c
index f937557fa79..a9780dd63fd 100644
--- a/sys/netgraph/ng_cisco.c
+++ b/sys/netgraph/ng_cisco.c
@@ -51,6 +51,7 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>		/* XXXGL: ipx? */
 
 #include <netinet/in.h>
 #include <netinet/if_ether.h>
diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
index 0f471bb88fe..98ecd445aff 100644
--- a/sys/netgraph/ng_eiface.c
+++ b/sys/netgraph/ng_eiface.c
@@ -29,6 +29,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
@@ -41,6 +42,7 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
diff --git a/sys/netgraph/ng_ether.c b/sys/netgraph/ng_ether.c
index df2dff5cb42..55f491a597d 100644
--- a/sys/netgraph/ng_ether.c
+++ b/sys/netgraph/ng_ether.c
@@ -47,6 +47,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
diff --git a/sys/netgraph/ng_fec.c b/sys/netgraph/ng_fec.c
deleted file mode 100644
index b7c1f567180..00000000000
--- a/sys/netgraph/ng_fec.c
+++ /dev/null
@@ -1,1362 +0,0 @@
-/*
- * ng_fec.c
- */
-
-/*-
- * Copyright (c) 2001 Berkeley Software Design, Inc.
- * Copyright (c) 2000, 2001
- *	Bill Paul <wpaul@osd.bsdi.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. 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 Bill Paul AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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$
- */
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $Whistle: ng_fec.c,v 1.33 1999/11/01 09:24:51 julian Exp $
- */
-
-/*
- * This module implements ethernet channel bonding using the Cisco
- * Fast EtherChannel mechanism. Two or four ports may be combined
- * into a single aggregate interface.
- *
- * Interfaces are named fec0, fec1, etc.  New nodes take the
- * first available interface name.
- *
- * This node also includes Berkeley packet filter support.
- *
- * Note that this node doesn't need to connect to any other
- * netgraph nodes in order to do its work.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/errno.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/errno.h>
-#include <sys/sockio.h>
-#include <sys/socket.h>
-#include <sys/syslog.h>
-#include <sys/libkern.h>
-#include <sys/queue.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/if_types.h>
-#include <net/if_media.h>
-#include <net/bpf.h>
-#include <net/ethernet.h>
-#include <net/route.h>
-
-#include "opt_inet.h"
-#include "opt_inet6.h"
-
-#include <netinet/in.h>
-#ifdef INET
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#endif
-
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
-#include <netgraph/ng_message.h>
-#include <netgraph/netgraph.h>
-#include <netgraph/ng_parse.h>
-#include <netgraph/ng_fec.h>
-
-/*
- * We need a way to stash a pointer to our netgraph node in the
- * ifnet structure so that receive handling works. As far as I can
- * tell, although there is an AF_NETGRAPH address family, it's only
- * used to identify sockaddr_ng structures: there is no netgraph address
- * family domain. This means the AF_NETGRAPH entry in ifp->if_afdata
- * should be unused, so we can use to hold our node context.
- */
-#define	IFP2NG(ifp)	((ifp)->if_afdata[AF_NETGRAPH])
-
-/*
- * Current fast etherchannel implementations use either 2 or 4
- * ports, so for now we limit the maximum bundle size to 4 interfaces.
- */
-#define FEC_BUNDLESIZ	4
-
-struct ng_fec_portlist {
-	struct ifnet		*fec_if;
-	void			(*fec_if_input) (struct ifnet *,
-						 struct mbuf *);
-	int			fec_idx;
-	int			fec_ifstat;
-	struct ether_addr	fec_mac;
-	SLIST_HEAD(__mclhd, ng_fec_mc)	fec_mc_head;
-	TAILQ_ENTRY(ng_fec_portlist) fec_list;
-};
-
-struct ng_fec_mc {
-	struct ifmultiaddr      *mc_ifma;
-	SLIST_ENTRY(ng_fec_mc)    mc_entries;
-};
-
-struct ng_fec_bundle {
-	TAILQ_HEAD(,ng_fec_portlist) ng_fec_ports;
-	int			fec_ifcnt;
-	int			fec_btype;
-	int			(*fec_if_output) (struct ifnet *,
-						  struct mbuf *,
-						  const struct sockaddr *,
-						  struct route *);
-};
-
-#define FEC_BTYPE_MAC		0x01
-#define FEC_BTYPE_INET		0x02
-#define FEC_BTYPE_INET6		0x03
-
-/* Node private data */
-struct ng_fec_private {
-	struct ifnet *ifp;
-	struct ifmedia ifmedia;
-	int	if_flags;
-	int	if_error;		/* XXX */
-	int	unit;			/* Interface unit number */
-	node_p	node;			/* Our netgraph node */
-	struct ng_fec_bundle fec_bundle;/* Aggregate bundle */
-	struct callout_handle fec_ch;	/* callout handle for ticker */
-};
-typedef struct ng_fec_private *priv_p;
-
-/* Interface methods */
-static void	ng_fec_input(struct ifnet *, struct mbuf *);
-static void	ng_fec_start(struct ifnet *ifp);
-static int	ng_fec_choose_port(struct ng_fec_bundle *b,
-			struct mbuf *m, struct ifnet **ifp);
-static int	ng_fec_setport(struct ifnet *ifp, u_long cmd, caddr_t data);
-static void	ng_fec_init(void *arg);
-static void	ng_fec_stop(struct ifnet *ifp);
-static int	ng_fec_ifmedia_upd(struct ifnet *ifp);
-static void	ng_fec_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr);
-static int	ng_fec_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
-static int	ng_fec_output(struct ifnet *ifp, struct mbuf *m0,
-			const struct sockaddr *dst, struct route *ro);
-static void	ng_fec_tick(void *arg);
-static int	ng_fec_addport(struct ng_fec_private *priv, char *iface);
-static int	ng_fec_delport(struct ng_fec_private *priv, char *iface);
-static int	ng_fec_ether_cmdmulti(struct ifnet *trifp, struct ng_fec_portlist *p, int set);
-
-#ifdef DEBUG
-static void	ng_fec_print_ioctl(struct ifnet *ifp, int cmd, caddr_t data);
-#endif
-
-/* Netgraph methods */
-static int		ng_fec_mod_event(module_t, int, void *);
-static ng_constructor_t	ng_fec_constructor;
-static ng_rcvmsg_t	ng_fec_rcvmsg;
-static ng_shutdown_t	ng_fec_shutdown;
-
-/* List of commands and how to convert arguments to/from ASCII */
-static const struct ng_cmdlist ng_fec_cmds[] = {
-	{
-	  NGM_FEC_COOKIE,
-	  NGM_FEC_ADD_IFACE,
-	  "add_iface",
-	  &ng_parse_string_type,
-	  NULL,
-	},
-	{
-	  NGM_FEC_COOKIE,
-	  NGM_FEC_DEL_IFACE,
-	  "del_iface",
-	  &ng_parse_string_type,
-	  NULL,
-	},
-	{
-	  NGM_FEC_COOKIE,
-	  NGM_FEC_SET_MODE_MAC,
-	  "set_mode_mac",
-	  NULL,
-	  NULL,
-	},
-	{
-	  NGM_FEC_COOKIE,
-	  NGM_FEC_SET_MODE_INET,
-	  "set_mode_inet",
-	  NULL,
-	  NULL,
-	},
-	{ 0 }
-};
-
-/* Node type descriptor */
-static struct ng_type typestruct = {
-	.version =	NG_ABI_VERSION,
-	.name =		NG_FEC_NODE_TYPE,
-	.mod_event =	ng_fec_mod_event,
-	.constructor =	ng_fec_constructor,
-	.rcvmsg =	ng_fec_rcvmsg,
-	.shutdown =	ng_fec_shutdown,
-	.cmdlist =	ng_fec_cmds,
-};
-NETGRAPH_INIT(fec, &typestruct);
-
-/* We keep a bitmap indicating which unit numbers are free.
-   One means the unit number is free, zero means it's taken. */
-static int	*ng_fec_units = NULL;
-static int	ng_fec_units_len = 0;
-static int	ng_units_in_use = 0;
-
-#define UNITS_BITSPERWORD	(sizeof(*ng_fec_units) * NBBY)
-
-static struct mtx	ng_fec_mtx;
-
-/*
- * Find the first free unit number for a new interface.
- * Increase the size of the unit bitmap as necessary.
- */
-static __inline int
-ng_fec_get_unit(int *unit)
-{
-	int index, bit;
-
-	mtx_lock(&ng_fec_mtx);
-	for (index = 0; index < ng_fec_units_len
-	    && ng_fec_units[index] == 0; index++);
-	if (index == ng_fec_units_len) {		/* extend array */
-		int i, *newarray, newlen;
-
-		newlen = (2 * ng_fec_units_len) + 4;
-		newarray = malloc(newlen * sizeof(*ng_fec_units),
-		    M_NETGRAPH, M_NOWAIT);
-		if (newarray == NULL) {
-			mtx_unlock(&ng_fec_mtx);
-			return (ENOMEM);
-		}
-		bcopy(ng_fec_units, newarray,
-		    ng_fec_units_len * sizeof(*ng_fec_units));
-		for (i = ng_fec_units_len; i < newlen; i++)
-			newarray[i] = ~0;
-		if (ng_fec_units != NULL)
-			free(ng_fec_units, M_NETGRAPH);
-		ng_fec_units = newarray;
-		ng_fec_units_len = newlen;
-	}
-	bit = ffs(ng_fec_units[index]) - 1;
-	KASSERT(bit >= 0 && bit <= UNITS_BITSPERWORD - 1,
-	    ("%s: word=%d bit=%d", __func__, ng_fec_units[index], bit));
-	ng_fec_units[index] &= ~(1 << bit);
-	*unit = (index * UNITS_BITSPERWORD) + bit;
-	ng_units_in_use++;
-	mtx_unlock(&ng_fec_mtx);
-	return (0);
-}
-
-/*
- * Free a no longer needed unit number.
- */
-static __inline void
-ng_fec_free_unit(int unit)
-{
-	int index, bit;
-
-	index = unit / UNITS_BITSPERWORD;
-	bit = unit % UNITS_BITSPERWORD;
-	mtx_lock(&ng_fec_mtx);
-	KASSERT(index < ng_fec_units_len,
-	    ("%s: unit=%d len=%d", __func__, unit, ng_fec_units_len));
-	KASSERT((ng_fec_units[index] & (1 << bit)) == 0,
-	    ("%s: unit=%d is free", __func__, unit));
-	ng_fec_units[index] |= (1 << bit);
-	/*
-	 * XXX We could think about reducing the size of ng_fec_units[]
-	 * XXX here if the last portion is all ones
-	 * XXX At least free it if no more units
-	 * Needed if we are to eventually be able to unload.
-	 */
-	ng_units_in_use--;
-	if (ng_units_in_use == 0) { /* XXX make SMP safe */
-		free(ng_fec_units, M_NETGRAPH);
-		ng_fec_units_len = 0;
-		ng_fec_units = NULL;
-	}
-	mtx_unlock(&ng_fec_mtx);
-}
-
-/************************************************************************
-			INTERFACE STUFF
- ************************************************************************/
-
-static int
-ng_fec_addport(struct ng_fec_private *priv, char *iface)
-{
-	struct ng_fec_bundle	*b;
-	struct ifnet		*ifp, *bifp;
-	struct ng_fec_portlist	*p, *new;
-
-	if (priv == NULL || iface == NULL)
-		return(EINVAL);
-
-	b = &priv->fec_bundle;
-	ifp = priv->ifp;
-
-	/* Only allow reconfiguration if not running. */
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
-		printf("fec%d: can't add new iface; bundle is running\n",
-		    priv->unit);
-		return (EINVAL);
-	}
-
-	/* Find the interface */
-	bifp = ifunit(iface);
-	if (bifp == NULL) {
-		printf("fec%d: tried to add iface %s, which "
-		    "doesn't seem to exist\n", priv->unit, iface);
-		return(ENOENT);
-	}
-
-	/* See if we have room in the bundle */
-	if (b->fec_ifcnt == FEC_BUNDLESIZ) {
-		printf("fec%d: can't add new iface; bundle is full\n",
-		    priv->unit);
-		return(ENOSPC);
-	}
-
-	/* See if the interface is already in the bundle */
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		if (p->fec_if == bifp) {
-			printf("fec%d: iface %s is already in this "
-			    "bundle\n", priv->unit, iface);
-			return(EINVAL);
-		}
-	}
-
-	/*
-	 * All interfaces must use the same output vector. Once the
-	 * user attaches an interface of one type, make all subsequent
-	 * interfaces have the same output vector.
-	 */
-	if (b->fec_if_output != NULL) {
-		if (b->fec_if_output != bifp->if_output) {
-			printf("fec%d: iface %s is not the same type "
-			    "as the other interface(s) already in "
-			    "the bundle\n", priv->unit, iface);
-			return(EINVAL);
-		}
-	}
-
-	/* Allocate new list entry. */
-	new = malloc(sizeof(struct ng_fec_portlist), M_NETGRAPH, M_NOWAIT);
-	if (new == NULL)
-		return(ENOMEM);
-
-	IF_AFDATA_LOCK(bifp);
-	IFP2NG(bifp) = priv->node;
-	IF_AFDATA_UNLOCK(bifp);
-
-	/*
-	 * If this is the first interface added to the bundle,
-	 * use its MAC address for the virtual interface (and,
-	 * by extension, all the other ports in the bundle).
-	 */
-	if (b->fec_ifcnt == 0)
-		if_setlladdr(ifp, IF_LLADDR(bifp), ETHER_ADDR_LEN);
-
-	b->fec_btype = FEC_BTYPE_MAC;
-	new->fec_idx = b->fec_ifcnt;
-	b->fec_ifcnt++;
-
-	/* Initialise the list of multicast addresses that we own. */
-	SLIST_INIT(&new->fec_mc_head);
-
-	/* Save the real MAC address. */
-	bcopy(IF_LLADDR(bifp),
-	    (char *)&new->fec_mac, ETHER_ADDR_LEN);
-
-	/* Set up phony MAC address. */
-	if_setlladdr(bifp, IF_LLADDR(ifp), ETHER_ADDR_LEN);
-	EVENTHANDLER_INVOKE(iflladdr_event, bifp);
-
-	/* Save original input vector */
-	new->fec_if_input = bifp->if_input;
-
-	/* Override it with our own */
-	bifp->if_input = ng_fec_input;
-
-	/* Save output vector too. */
-	if (b->fec_if_output == NULL)
-		b->fec_if_output = bifp->if_output;
-
-	/* Add to the queue */
-	new->fec_if = bifp;
-	new->fec_ifstat = -1;
-	TAILQ_INSERT_TAIL(&b->ng_fec_ports, new, fec_list);
-
-	/* Add multicast addresses to this port. */
-	ng_fec_ether_cmdmulti(ifp, new, 1);
-
-	return(0);
-}
-
-static int
-ng_fec_delport(struct ng_fec_private *priv, char *iface)
-{
-	struct ng_fec_bundle	*b;
-	struct ifnet		*ifp, *bifp;
-	struct ng_fec_portlist	*p;
-
-	if (priv == NULL || iface == NULL)
-		return(EINVAL);
-
-	b = &priv->fec_bundle;
-	ifp = priv->ifp;
-
-	/* Only allow reconfiguration if not running. */
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING) {
-		printf("fec%d: can't remove iface; bundle is running\n",
-		    priv->unit);
-		return (EINVAL);
-	}
-
-	/* Find the interface */
-	bifp = ifunit(iface);
-	if (bifp == NULL) {
-		printf("fec%d: tried to remove iface %s, which "
-		    "doesn't seem to exist\n", priv->unit, iface);
-		return(ENOENT);
-	}
-
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		if (p->fec_if == bifp)
-			break;
-	}
-
-	if (p == NULL) {
-		printf("fec%d: tried to remove iface %s which "
-		    "is not in our bundle\n", priv->unit, iface);
-		return(EINVAL);
-	}
-
-	/* Stop interface */
-	bifp->if_flags &= ~IFF_UP;
-	(*bifp->if_ioctl)(bifp, SIOCSIFFLAGS, NULL);
-
-	/* Restore MAC address. */
-	if_setlladdr(bifp, (u_char *)&p->fec_mac, ETHER_ADDR_LEN);
-
-	/* Restore input vector */
-	bifp->if_input = p->fec_if_input;
-
-	/* Remove our node context pointer. */
-	IF_AFDATA_LOCK(bifp);
-	IFP2NG(bifp) = NULL;
-	IF_AFDATA_UNLOCK(bifp);
-
-	/* Delete port */
-	TAILQ_REMOVE(&b->ng_fec_ports, p, fec_list);
-	free(p, M_NETGRAPH);
-	b->fec_ifcnt--;
-
-	if (b->fec_ifcnt == 0)
-		b->fec_if_output = NULL;
-
-	return(0);
-}
-
-static int
-ng_fec_ether_cmdmulti(struct ifnet *trifp, struct ng_fec_portlist *p, int set)
-{
-	struct ifnet *ifp = p->fec_if;
-	struct ng_fec_mc *mc;
-	struct ifmultiaddr *ifma, *rifma = NULL;
-	struct sockaddr_dl sdl;
-	int error;
-
-	bzero((char *)&sdl, sizeof(sdl));
-	sdl.sdl_len = sizeof(sdl);
-	sdl.sdl_family = AF_LINK;
-	sdl.sdl_type = IFT_ETHER;
-	sdl.sdl_alen = ETHER_ADDR_LEN;
-	sdl.sdl_index = ifp->if_index;
-
-	if (set) {
-		TAILQ_FOREACH(ifma, &trifp->if_multiaddrs, ifma_link) {
-			if (ifma->ifma_addr->sa_family != AF_LINK)
-				continue;
-			bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr),
-			    LLADDR(&sdl), ETHER_ADDR_LEN);
-
-			error = if_addmulti(ifp, (struct sockaddr *)&sdl, &rifma);
-			if (error)
-				return (error);
-			mc = malloc(sizeof(struct ng_fec_mc), M_DEVBUF, M_NOWAIT);
-			if (mc == NULL)
-				return (ENOMEM);
-			mc->mc_ifma = rifma;
-			SLIST_INSERT_HEAD(&p->fec_mc_head, mc, mc_entries);
-		}
-	} else {
-		while ((mc = SLIST_FIRST(&p->fec_mc_head)) != NULL) {
-			SLIST_REMOVE(&p->fec_mc_head, mc, ng_fec_mc, mc_entries);
-			if_delmulti_ifma(mc->mc_ifma);
-			free(mc, M_DEVBUF);
-		}
-	}
-	return (0);
-}
-
-static int
-ng_fec_ether_setmulti(struct ifnet *ifp)
-{
-	struct ng_fec_private	*priv;
-	struct ng_fec_bundle	*b;
-	struct ng_fec_portlist	*p;
-
-	priv = ifp->if_softc;
-	b = &priv->fec_bundle;
-
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		/* First, remove any existing filter entries. */
-		ng_fec_ether_cmdmulti(ifp, p, 0);
-		/* copy all addresses from the fec interface to the port */
-		ng_fec_ether_cmdmulti(ifp, p, 1);
-	}
-	return (0);
-}
-
-/*
- * Pass an ioctl command down to all the underyling interfaces in a
- * bundle. Used for setting flags.
- */
-
-static int 
-ng_fec_setport(struct ifnet *ifp, u_long command, caddr_t data)
-{
-	struct ng_fec_private	*priv;
-	struct ng_fec_bundle	*b;
-	struct ifnet		*oifp;
-	struct ng_fec_portlist	*p;
-
-	priv = ifp->if_softc;
-	b = &priv->fec_bundle;
-
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		oifp = p->fec_if;
-		if (oifp != NULL)
-			(*oifp->if_ioctl)(oifp, command, data);
-	}
-
-	return(0);
-}
-
-static void
-ng_fec_init(void *arg)
-{
-	struct ng_fec_private	*priv;
-	struct ng_fec_bundle	*b;
-	struct ifnet		*ifp, *bifp;
-	struct ng_fec_portlist	*p;
-
-	priv = arg;
-	ifp = priv->ifp;
-	b = &priv->fec_bundle;
-
-	if (b->fec_ifcnt != 2 && b->fec_ifcnt != FEC_BUNDLESIZ) {
-		printf("fec%d: invalid bundle "
-		    "size: %d\n", priv->unit,
-		    b->fec_ifcnt);
-		return;
-	}
-
-	ng_fec_stop(ifp);
-
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		bifp = p->fec_if;
-		bifp->if_flags |= IFF_UP;
-                (*bifp->if_ioctl)(bifp, SIOCSIFFLAGS, NULL);
-		/* mark iface as up and let the monitor check it */
-		p->fec_ifstat = -1;
-	}
-
-	ifp->if_drv_flags &= ~(IFF_DRV_OACTIVE);
-	ifp->if_drv_flags |= IFF_DRV_RUNNING;
-
-	priv->fec_ch = timeout(ng_fec_tick, priv, hz);
-
-	return;
-}
-
-static void
-ng_fec_stop(struct ifnet *ifp)
-{
-	struct ng_fec_private	*priv;
-	struct ng_fec_bundle	*b;
-	struct ifnet		*bifp;
-	struct ng_fec_portlist	*p;
-
-	priv = ifp->if_softc;
-	b = &priv->fec_bundle;
-
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		bifp = p->fec_if;
-		bifp->if_flags &= ~IFF_UP;
-                (*bifp->if_ioctl)(bifp, SIOCSIFFLAGS, NULL);
-	}
-
-	untimeout(ng_fec_tick, priv, priv->fec_ch);
-
-	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
-
-	return;
-}
-
-static void
-ng_fec_tick(void *arg)
-{
-	struct ng_fec_private	*priv;
-	struct ng_fec_bundle	*b;
-        struct ifmediareq	ifmr;
-	struct ifnet		*ifp;
-	struct ng_fec_portlist	*p;
-	int			error = 0;
-
-	priv = arg;
-	b = &priv->fec_bundle;
-
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		bzero((char *)&ifmr, sizeof(ifmr));
-		ifp = p->fec_if;
-		error = (*ifp->if_ioctl)(ifp, SIOCGIFMEDIA, (caddr_t)&ifmr);
-		if (error) {
-			printf("fec%d: failed to check status "
-			    "of link %s\n", priv->unit, ifp->if_xname);
-			continue;
-		}
-
-        	if (ifmr.ifm_status & IFM_AVALID) {
-			if (ifmr.ifm_status & IFM_ACTIVE) {
-				if (p->fec_ifstat == -1 ||
-				    p->fec_ifstat == 0) {
-					p->fec_ifstat = 1;
-					printf("fec%d: port %s in bundle "
-					    "is up\n", priv->unit,
-					    ifp->if_xname);
-				}
-			} else {
-				if (p->fec_ifstat == -1 ||
-				    p->fec_ifstat == 1) {
-					p->fec_ifstat = 0;
-					printf("fec%d: port %s in bundle "
-					    "is down\n", priv->unit,
-					    ifp->if_xname);
-				}
-			}
-		}
-	}
-
-	ifp = priv->ifp;
-	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-		priv->fec_ch = timeout(ng_fec_tick, priv, hz);
-
-	return;
-}
-
-static int
-ng_fec_ifmedia_upd(struct ifnet *ifp)
-{
-	return(0);
-}
-
-static void ng_fec_ifmedia_sts(struct ifnet *ifp,
-	struct ifmediareq *ifmr)
-{
-	struct ng_fec_private	*priv;
-	struct ng_fec_bundle	*b;
-	struct ng_fec_portlist	*p;
-
-	priv = ifp->if_softc;
-	b = &priv->fec_bundle;
-
-	ifmr->ifm_status = IFM_AVALID;
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		if (p->fec_ifstat == 1) {
-			ifmr->ifm_status |= IFM_ACTIVE;
-			break;
-		}
-	}
-
-	return;
-}
-
-/*
- * Process an ioctl for the virtual interface
- */
-static int
-ng_fec_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
-{
-	struct ifreq *const ifr = (struct ifreq *) data;
-	int error = 0;
-	struct ng_fec_private	*priv;
-	struct ng_fec_bundle	*b;
-
-	priv = ifp->if_softc;
-	b = &priv->fec_bundle;
-
-#ifdef DEBUG
-	ng_fec_print_ioctl(ifp, command, data);
-#endif
-	switch (command) {
-
-	/* These two are mostly handled at a higher layer */
-	case SIOCSIFADDR:
-	case SIOCGIFADDR:
-		error = ether_ioctl(ifp, command, data);
-		break;
-
-	case SIOCSIFMTU:
-		if (ifr->ifr_mtu >= NG_FEC_MTU_MIN &&
-		    ifr->ifr_mtu <= NG_FEC_MTU_MAX) {
-			struct ng_fec_portlist *p;
-			struct ifnet *bifp;
-
-			TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-				bifp = p->fec_if;
-				error = (*bifp->if_ioctl)(bifp, SIOCSIFMTU,
-				    data);
-				if (error != 0)
-					break;
-			}
-			if (error == 0)
-				ifp->if_mtu = ifr->ifr_mtu;
-		} else
-			error = EINVAL;
-		break;
-
-	/* Set flags */
-	case SIOCSIFFLAGS:
-		/*
-		 * If the interface is marked up and stopped, then start it.
-		 * If it is marked down and running, then stop it.
-		 */
-		if (ifr->ifr_flags & IFF_UP) {
-			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) {
-				/* Sanity. */
-				if (b->fec_ifcnt != 2 &&
-				    b->fec_ifcnt != FEC_BUNDLESIZ) {
-					printf("fec%d: invalid bundle "
-					    "size: %d\n", priv->unit,
-					    b->fec_ifcnt);
-					error = EINVAL;
-					break;
-				}
-				ng_fec_init(priv);
-			}
-			/*
-			 * Bubble down changes in promisc mode to
-			 * underlying interfaces.
-			 */
-			if ((ifp->if_flags & IFF_PROMISC) !=
-			    (priv->if_flags & IFF_PROMISC)) {
-				ng_fec_setport(ifp, command, data);
-				priv->if_flags = ifp->if_flags;
-			}
-		} else {
-			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-				ng_fec_stop(ifp);
-		}
-		break;
-
-	case SIOCADDMULTI:
-	case SIOCDELMULTI:
-		ng_fec_ether_setmulti(ifp);
-		error = 0;
-		break;
-	case SIOCGIFMEDIA:
-	case SIOCSIFMEDIA:
-		error = ifmedia_ioctl(ifp, ifr, &priv->ifmedia, command);
-		break;
-	/* Stuff that's not supported */
-	case SIOCSIFPHYS:
-		error = EOPNOTSUPP;
-		break;
-
-	default:
-		error = EINVAL;
-		break;
-	}
-	return (error);
-}
-
-/*
- * This routine spies on mbufs received by underlying network device
- * drivers. When we add an interface to our bundle, we override its
- * if_input routine with a pointer to ng_fec_input(). This means we
- * get to look at all the device's packets before sending them to the
- * real ether_input() for processing by the stack. Once we verify the
- * packet comes from an interface that's been aggregated into
- * our bundle, we fix up the rcvif pointer and increment our
- * packet counters so that it looks like the frames are actually
- * coming from us.
- */
-static void 
-ng_fec_input(struct ifnet *ifp, struct mbuf *m0)
-{
-	struct ng_node		*node;
-	struct ng_fec_private	*priv;
-	struct ng_fec_bundle	*b;
-	struct ifnet		*bifp;
-	struct ng_fec_portlist	*p;
-
-	/* Sanity check */
-	if (ifp == NULL || m0 == NULL)
-		return;
-
-	node = IFP2NG(ifp);
-
-	/* Sanity check part II */
-	if (node == NULL)
-		return;
-
-	priv = NG_NODE_PRIVATE(node);
-	b = &priv->fec_bundle;
-	bifp = priv->ifp;
-
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		if (p->fec_if == m0->m_pkthdr.rcvif)
-			break;
-	}
-
-	/* Wasn't meant for us; leave this frame alone. */
-	if (p == NULL)
-		return;
-
-        /*
-	 * Check for a BPF tap on the underlying interface. This
-	 * is mainly a debugging aid: it allows tcpdump-ing of an
-	 * individual interface in a bundle to work, which it
-	 * otherwise would not. BPF tapping of our own aggregate
-	 * interface will occur once we call ether_input().
-	 */
-	BPF_MTAP(m0->m_pkthdr.rcvif, m0);
-
-	/* Convince the system that this is our frame. */
-	m0->m_pkthdr.rcvif = bifp;
-
-	/*
-	 * Count bytes on an individual interface in a bundle.
-	 * The bytes will also be added to the aggregate interface
-	 * once we call ether_input().
-	 */
-	ifp->if_ibytes += m0->m_pkthdr.len;
-
-	bifp->if_ipackets++;
-	(*bifp->if_input)(bifp, m0);
-
-	return;
-}
-
-/*
- * Take a quick peek at the packet and see if it's ok for us to use
- * the inet or inet6 hash methods on it, if they're enabled. We do
- * this by setting flags in the mbuf header. Once we've made up our
- * mind what to do, we pass the frame to output vector for further
- * processing.
- */
-
-static int
-ng_fec_output(struct ifnet *ifp, struct mbuf *m,
-	const struct sockaddr *dst, struct route *ro)
-{
-	const priv_p priv = (priv_p) ifp->if_softc;
-	struct ng_fec_bundle *b;
-	int error;
-
-	/* Check interface flags */
-	if (!((ifp->if_flags & IFF_UP) &&
-	    (ifp->if_drv_flags & IFF_DRV_RUNNING))) {
-		m_freem(m);
-		return (ENETDOWN);
-	}
-
-	b = &priv->fec_bundle;
-
-	switch (b->fec_btype) {
-	case FEC_BTYPE_MAC:
-		m->m_flags |= M_FEC_MAC;
-		break;
-#ifdef INET
-	case FEC_BTYPE_INET:
-		/*
-		 * We can't use the INET address port selection
-		 * scheme if this isn't an INET packet.
-		 */
-		if (dst->sa_family == AF_INET)
-			m->m_flags |= M_FEC_INET;
-#ifdef INET6
-		else if (dst->sa_family == AF_INET6)
-			m->m_flags |= M_FEC_INET6;
-#endif
-		else {
-#ifdef DEBUG
-			if_printf(ifp, "can't do inet aggregation of non "
-			    "inet packet\n");
-#endif
-			m->m_flags |= M_FEC_MAC;
-		}
-		break;
-#endif
-	default:
-		if_printf(ifp, "bogus hash type: %d\n",
-		    b->fec_btype);
-		m_freem(m);
-		return(EINVAL);
-		break;
-	}
-
-	/*
-	 * Pass the frame to the output vector for all the protocol
-	 * handling. This will put the ethernet header on the packet
-	 * for us.
-	 */
-	priv->if_error = 0;
-	error = (*b->fec_if_output)(ifp, m, dst, ro);
-	if (priv->if_error && !error)
-		error = priv->if_error;
-
-	return(error);
-}
-
-/*
- * Apply a hash to the source and destination addresses in the packet
- * in order to select an interface. Also check link status and handle
- * dead links accordingly.
- */
-
-static int
-ng_fec_choose_port(struct ng_fec_bundle *b,
-	struct mbuf *m, struct ifnet **ifp)
-{
-	struct ether_header	*eh;
-	struct mbuf		*m0;
-#ifdef INET
-	struct ip		*ip;
-#ifdef INET6
-	struct ip6_hdr		*ip6;
-#endif
-#endif
-
-	struct ng_fec_portlist	*p;
-	int			port = 0, mask;
-
-	/*
-	 * If there are only two ports, mask off all but the
-	 * last bit for XORing. If there are 4, mask off all
-	 * but the last 2 bits.
-	 */
-	mask = b->fec_ifcnt == 2 ? 0x1 : 0x3;
-	eh = mtod(m, struct ether_header *);
-#ifdef INET
-	ip = (struct ip *)(mtod(m, char *) +
-	    sizeof(struct ether_header));
-#ifdef INET6
-	ip6 = (struct ip6_hdr *)(mtod(m, char *) +
-	    sizeof(struct ether_header));
-#endif
-#endif
-
-	/*
-	 * The fg_fec_output() routine is supposed to leave a
-	 * flag for us in the mbuf that tells us what hash to
-	 * use, but sometimes a new mbuf is prepended to the
-	 * chain, so we have to search every mbuf in the chain
-	 * to find the flags.
-	 */
-	m0 = m;
-	while (m0) {
-		if (m0->m_flags & (M_FEC_MAC|M_FEC_INET|M_FEC_INET6))
-			break;
-		m0 = m0->m_next;
-	}
-	if (m0 == NULL)
-		return(EINVAL);
-
-	switch (m0->m_flags & (M_FEC_MAC|M_FEC_INET|M_FEC_INET6)) {
-	case M_FEC_MAC:
-		port = (eh->ether_dhost[5] ^
-		    eh->ether_shost[5]) & mask;
-		break;
-#ifdef INET
-	case M_FEC_INET:
-		port = (ntohl(ip->ip_dst.s_addr) ^
-		    ntohl(ip->ip_src.s_addr)) & mask;
-		break;
-#ifdef INET6
-	case M_FEC_INET6:
-		port = (ip6->ip6_dst.s6_addr[15] ^
-		    ip6->ip6_dst.s6_addr[15]) & mask;
-		break;
-#endif
-#endif
-	default:
-		return(EINVAL);
-			break;
-	}
-
-	TAILQ_FOREACH(p, &b->ng_fec_ports, fec_list) {
-		if (port == p->fec_idx)
-			break;
-	}
-
-	/*
-	 * Now that we've chosen a port, make sure it's
-	 * alive. If it's not alive, cycle through the bundle
-	 * looking for a port that is alive. If we don't find
-	 * any, return an error.
-	 */
-	if (p->fec_ifstat != 1) {
-		struct ng_fec_portlist	*n = NULL;
-
-		n = TAILQ_NEXT(p, fec_list);
-		if (n == NULL)
-			n = TAILQ_FIRST(&b->ng_fec_ports);
-		while (n != p) {
-			if (n->fec_ifstat == 1)
-				break;
-			n = TAILQ_NEXT(n, fec_list);
-			if (n == NULL)
-				n = TAILQ_FIRST(&b->ng_fec_ports);
-		}
-		if (n == p)
-			return(EAGAIN);
-		p = n;
-	}
-
-	*ifp = p->fec_if;
-
-	return(0);
-}
-
-/*
- * Now that the packet has been run through ether_output(), yank it
- * off our own send queue and stick it on the queue for the appropriate
- * underlying physical interface. Note that if the interface's send
- * queue is full, we save an error status in our private netgraph
- * space which will eventually be handed up to ng_fec_output(), which
- * will return it to the rest of the IP stack. We need to do this
- * in order to duplicate the effect of ether_output() returning ENOBUFS
- * when it detects that an interface's send queue is full. There's no
- * other way to signal the error status from here since the if_start()
- * routine is spec'ed to return void.
- *
- * Once the frame is queued, we call ether_output_frame() to initiate
- * transmission.
- */
-static void
-ng_fec_start(struct ifnet *ifp)
-{
-	struct ng_fec_private	*priv;
-	struct ng_fec_bundle	*b;
-	struct ifnet		*oifp = NULL;
-	struct mbuf		*m0;
-	int			error;
-
-	priv = ifp->if_softc;
-	b = &priv->fec_bundle;
-
-	IF_DEQUEUE(&ifp->if_snd, m0);
-	if (m0 == NULL)
-		return;
-
-	BPF_MTAP(ifp, m0);
-
-	/* Queue up packet on the proper port. */
-	error = ng_fec_choose_port(b, m0, &oifp);
-	if (error) {
-		ifp->if_ierrors++;
-		m_freem(m0);
-		priv->if_error = ENOBUFS;
-		return;
-	}
-	ifp->if_opackets++;
-
-	priv->if_error = IF_HANDOFF(&oifp->if_snd, m0, oifp) ? 0 : ENOBUFS;
-
-	return;
-}
-
-#ifdef DEBUG
-/*
- * Display an ioctl to the virtual interface
- */
-
-static void
-ng_fec_print_ioctl(struct ifnet *ifp, int command, caddr_t data)
-{
-	char   *str;
-
-	switch (command & IOC_DIRMASK) {
-	case IOC_VOID:
-		str = "IO";
-		break;
-	case IOC_OUT:
-		str = "IOR";
-		break;
-	case IOC_IN:
-		str = "IOW";
-		break;
-	case IOC_INOUT:
-		str = "IORW";
-		break;
-	default:
-		str = "IO??";
-	}
-	log(LOG_DEBUG, "%s: %s('%c', %d, char[%d])\n",
-	       ifp->if_xname,
-	       str,
-	       IOCGROUP(command),
-	       command & 0xff,
-	       IOCPARM_LEN(command));
-}
-#endif /* DEBUG */
-
-/************************************************************************
-			NETGRAPH NODE STUFF
- ************************************************************************/
-
-/*
- * Constructor for a node
- */
-static int
-ng_fec_constructor(node_p node)
-{
-	char ifname[NG_FEC_FEC_NAME_MAX + 1];
-	struct ifnet *ifp;
-	priv_p priv;
-	const uint8_t eaddr[ETHER_ADDR_LEN] = {0, 0, 0, 0, 0, 0};
-	struct ng_fec_bundle *b;
-	int error = 0;
-
-	/* Allocate node and interface private structures */
-	priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK | M_ZERO);
-
-	ifp = priv->ifp = if_alloc(IFT_ETHER);
-	if (ifp == NULL) {
-		free(priv, M_NETGRAPH);
-		return (ENOSPC);
-	}
-	b = &priv->fec_bundle;
-
-	/* Link them together */
-	ifp->if_softc = priv;
-
-	/* Get an interface unit number */
-	if ((error = ng_fec_get_unit(&priv->unit)) != 0) {
-		if_free(ifp);
-		free(priv, M_NETGRAPH);
-		return (error);
-	}
-
-	/* Link together node and private info */
-	NG_NODE_SET_PRIVATE(node, priv);
-	priv->node = node;
-
-	/* Initialize interface structure */
-	if_initname(ifp, NG_FEC_FEC_NAME, priv->unit);
-	ifp->if_start = ng_fec_start;
-	ifp->if_ioctl = ng_fec_ioctl;
-	ifp->if_init = ng_fec_init;
-	ifp->if_snd.ifq_maxlen = ifqmaxlen;
-	ifp->if_mtu = NG_FEC_MTU_DEFAULT;
-	ifp->if_flags = (IFF_SIMPLEX|IFF_BROADCAST|IFF_MULTICAST);
-	ifp->if_addrlen = 0;			/* XXX */
-	ifp->if_hdrlen = 0;			/* XXX */
-	ifp->if_baudrate = 100000000;		/* XXX */
-	TAILQ_INIT(&ifp->if_addrhead); /* XXX useless - done in if_attach */
-
-	/* Give this node the same name as the interface (if possible) */
-	bzero(ifname, sizeof(ifname));
-	strlcpy(ifname, ifp->if_xname, sizeof(ifname));
-	if (ng_name_node(node, ifname) != 0)
-		log(LOG_WARNING, "%s: can't acquire netgraph name\n", ifname);
-
-	/* Attach the interface */
-	ether_ifattach(ifp, eaddr);
-	callout_handle_init(&priv->fec_ch);
-
-	/* Override output method with our own */
-	ifp->if_output = ng_fec_output;
-
-	TAILQ_INIT(&b->ng_fec_ports);
-	b->fec_ifcnt = 0;
-
-	ifmedia_init(&priv->ifmedia, 0,
-	    ng_fec_ifmedia_upd, ng_fec_ifmedia_sts);
-	ifmedia_add(&priv->ifmedia, IFM_ETHER|IFM_NONE, 0, NULL);
-	ifmedia_set(&priv->ifmedia, IFM_ETHER|IFM_NONE);
-
-	/* Done */
-	return (0);
-}
-
-/*
- * Receive a control message
- */
-static int
-ng_fec_rcvmsg(node_p node, item_p item, hook_p lasthook)
-{
-	const priv_p priv = NG_NODE_PRIVATE(node);
-	struct ng_fec_bundle	*b;
-	struct ng_mesg *resp = NULL;
-	struct ng_mesg *msg;
-	char *ifname;
-	int error = 0;
-
-	NGI_GET_MSG(item, msg);
-	b = &priv->fec_bundle;
-
-	switch (msg->header.typecookie) {
-	case NGM_FEC_COOKIE:
-		switch (msg->header.cmd) {
-		case NGM_FEC_ADD_IFACE:
-			ifname = msg->data;
-			error = ng_fec_addport(priv, ifname);
-			break;
-		case NGM_FEC_DEL_IFACE:
-			ifname = msg->data;
-			error = ng_fec_delport(priv, ifname);
-			break;
-		case NGM_FEC_SET_MODE_MAC:
-			b->fec_btype = FEC_BTYPE_MAC;
-			break;
-#ifdef INET
-		case NGM_FEC_SET_MODE_INET:
-			b->fec_btype = FEC_BTYPE_INET;
-			break;
-#ifdef INET6
-		case NGM_FEC_SET_MODE_INET6:
-			b->fec_btype = FEC_BTYPE_INET6;
-			break;
-#endif
-#endif
-		default:
-			error = EINVAL;
-			break;
-		}
-		break;
-	default:
-		error = EINVAL;
-		break;
-	}
-	NG_RESPOND_MSG(error, node, item, resp);
-	NG_FREE_MSG(msg);
-	return (error);
-}
-
-/*
- * Shutdown and remove the node and its associated interface.
- */
-static int
-ng_fec_shutdown(node_p node)
-{
-	const priv_p priv = NG_NODE_PRIVATE(node);
-	struct ng_fec_bundle *b;
-	struct ng_fec_portlist	*p;
-
-	b = &priv->fec_bundle;
-	ng_fec_stop(priv->ifp);
-
-	while (!TAILQ_EMPTY(&b->ng_fec_ports)) {
-		p = TAILQ_FIRST(&b->ng_fec_ports);
-		ng_fec_ether_cmdmulti(priv->ifp, p, 0);
-		ng_fec_delport(priv, p->fec_if->if_xname);
-	}
-
-	ether_ifdetach(priv->ifp);
-	if_free(priv->ifp);
-	ifmedia_removeall(&priv->ifmedia);
-	ng_fec_free_unit(priv->unit);
-	free(priv, M_NETGRAPH);
-	NG_NODE_SET_PRIVATE(node, NULL);
-	NG_NODE_UNREF(node);
-	return (0);
-}
-
-/*
- * Handle loading and unloading for this node type.
- */
-static int
-ng_fec_mod_event(module_t mod, int event, void *data)
-{
-	int error = 0;
-
-	switch (event) {
-	case MOD_LOAD:
-		mtx_init(&ng_fec_mtx, "ng_fec", NULL, MTX_DEF);
-		break;
-	case MOD_UNLOAD:
-		mtx_destroy(&ng_fec_mtx);
-		break;
-	default:
-		error = EOPNOTSUPP;
-		break;
-	}
-	return (error);
-}
diff --git a/sys/netgraph/ng_fec.h b/sys/netgraph/ng_fec.h
deleted file mode 100644
index 8ef441b6c23..00000000000
--- a/sys/netgraph/ng_fec.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * ng_fec.h
- */
-
-/*-
- * Copyright (c) 2000 Berkeley Software Design, Inc.
- * Copyright (c) 1997, 1998, 1999, 2000
- *	Bill Paul <wpaul@osd.bsdi.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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by Bill Paul.
- * 4. 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 Bill Paul AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (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$
- */
-/*-
- * Copyright (c) 1996-1999 Whistle Communications, Inc.
- * All rights reserved.
- * 
- * Subject to the following obligations and disclaimer of warranty, use and
- * redistribution of this software, in source or object code forms, with or
- * without modifications are expressly permitted by Whistle Communications;
- * provided, however, that:
- * 1. Any and all reproductions of the source or object code must include the
- *    copyright notice above and the following disclaimer of warranties; and
- * 2. No rights are granted, in any manner or form, to use Whistle
- *    Communications, Inc. trademarks, including the mark "WHISTLE
- *    COMMUNICATIONS" on advertising, endorsements, or otherwise except as
- *    such appears in the above copyright notice or in the software.
- * 
- * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND
- * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO
- * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE,
- * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT.
- * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY
- * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS
- * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE.
- * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES
- * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING
- * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY
- * OF SUCH DAMAGE.
- *
- * Author: Archie Cobbs <archie@freebsd.org>
- *
- * $Whistle: ng_fec.h,v 1.5 1999/01/20 00:22:13 archie Exp $
- */
-
-#ifndef _NETGRAPH_NG_FEC_H_
-#define _NETGRAPH_NG_FEC_H_
-
-#define NETISR_FEC			26
-
-/* Node type name and magic cookie */
-#define NG_FEC_NODE_TYPE		"fec"
-#define NGM_FEC_COOKIE			983566799
-
-/* Interface base name */
-#define NG_FEC_FEC_NAME			"fec"
-#define NG_FEC_FEC_NAME_MAX		15
-
-/* MTU bounds */
-#define NG_FEC_MTU_MIN			72
-#define NG_FEC_MTU_MAX			65535
-#define NG_FEC_MTU_DEFAULT		1500
-
-/* Special flags for mbufs. */
-#define M_FEC_MAC			0x2000
-#define M_FEC_INET			0x4000
-#define M_FEC_INET6			0x8000
-
-/* Netgraph commands */
-enum {
-	NGM_FEC_ADD_IFACE,
-	NGM_FEC_DEL_IFACE,
-	NGM_FEC_SET_MODE_MAC,
-	NGM_FEC_SET_MODE_INET,
-	NGM_FEC_SET_MODE_INET6
-};
-
-struct ng_fec_ifname {
-	char    ngif_name[NG_FEC_FEC_NAME_MAX + 1];
-};
-
-#endif /* _NETGRAPH_NG_FEC_H_ */
diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
index 72fc16201df..e2d345435c9 100644
--- a/sys/netgraph/ng_iface.c
+++ b/sys/netgraph/ng_iface.c
@@ -72,6 +72,7 @@
 #include <sys/libkern.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/bpf.h>
 #include <net/netisr.h>
@@ -775,7 +776,7 @@ ng_iface_rcvdata(hook_p hook, item_p item)
 		return (EAFNOSUPPORT);
 	}
 	if (harvest.point_to_point)
-		random_harvest(&(m->m_data), 12, 3, 0, RANDOM_NET_NG);
+		random_harvest(&(m->m_data), 12, 2, RANDOM_NET_NG);
 	M_SETFIB(m, ifp->if_fib);
 	netisr_dispatch(isr, m);
 	return (0);
diff --git a/sys/netgraph/ng_ipfw.c b/sys/netgraph/ng_ipfw.c
index 8c777980d3c..7863a675765 100644
--- a/sys/netgraph/ng_ipfw.c
+++ b/sys/netgraph/ng_ipfw.c
@@ -42,6 +42,7 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/sys/netgraph/ng_one2many.c b/sys/netgraph/ng_one2many.c
index 8171005efa8..ad1d3d88258 100644
--- a/sys/netgraph/ng_one2many.c
+++ b/sys/netgraph/ng_one2many.c
@@ -220,7 +220,7 @@ ng_one2many_newhook(node_p node, hook_p hook, const char *name)
 		if (!isdigit(*cp) || (cp[0] == '0' && cp[1] != '\0'))
 			return (EINVAL);
 		i = strtoul(cp, &eptr, 10);
-		if (*eptr != '\0' || i < 0 || i >= NG_ONE2MANY_MAX_LINKS)
+		if (*eptr != '\0' || i >= NG_ONE2MANY_MAX_LINKS)
 			return (EINVAL);
 		linkNum = (int)i;
 		link = &priv->many[linkNum];
diff --git a/sys/netgraph/ng_pipe.c b/sys/netgraph/ng_pipe.c
index 11ea8149ba6..72c3b87b5d7 100644
--- a/sys/netgraph/ng_pipe.c
+++ b/sys/netgraph/ng_pipe.c
@@ -680,35 +680,6 @@ ngp_rcvdata(hook_p hook, item_p item)
 		struct mbuf *m1;
 		int longest = 0;
 
-		/* Find the longest queue */
-		TAILQ_FOREACH(ngp_f1, &hinfo->fifo_head, fifo_le)
-			if (ngp_f1->packets > longest) {
-				longest = ngp_f1->packets;
-				ngp_f = ngp_f1;
-			}
-
-		/* Drop a frame from the queue head/tail, depending on cfg */
-		if (hinfo->cfg.drophead) 
-			ngp_h = TAILQ_FIRST(&ngp_f->packet_head);
-		else 
-			ngp_h = TAILQ_LAST(&ngp_f->packet_head, p_head);
-		TAILQ_REMOVE(&ngp_f->packet_head, ngp_h, ngp_link);
-		m1 = ngp_h->m;
-		uma_zfree(ngp_zone, ngp_h);
-		hinfo->run.qin_octets -= m1->m_pkthdr.len;
-		hinfo->stats.in_disc_octets += m1->m_pkthdr.len;
-		m_freem(m1);
-		if (--(ngp_f->packets) == 0) {
-			TAILQ_REMOVE(&hinfo->fifo_head, ngp_f, fifo_le);
-			uma_zfree(ngp_zone, ngp_f);
-			hinfo->run.fifo_queues--;
-		}
-		hinfo->run.qin_frames--;
-		hinfo->stats.in_disc_frames++;
-	} else if (hinfo->run.qin_frames > hinfo->cfg.qin_size_limit) {
-		struct mbuf *m1;
-		int longest = 0;
-
 		/* Find the longest queue */
 		TAILQ_FOREACH(ngp_f1, &hinfo->fifo_head, fifo_le)
 			if (ngp_f1->packets > longest) {
diff --git a/sys/netgraph/ng_sppp.c b/sys/netgraph/ng_sppp.c
index 4ad89ec6fc9..44db053ca44 100644
--- a/sys/netgraph/ng_sppp.c
+++ b/sys/netgraph/ng_sppp.c
@@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/libkern.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/bpf.h>
 #include <net/if_sppp.h>
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index 4816678ed2f..e2b71a8b501 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <net/if_atm.h>
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 9660edc42d9..6228ea4b35d 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/netisr.h>
@@ -84,8 +85,6 @@ static SYSCTL_NODE(_net_link_ether, PF_ARP, arp, CTLFLAG_RW, 0, "");
 static VNET_DEFINE(int, arpt_keep) = (20*60);	/* once resolved, good for 20
 						 * minutes */
 static VNET_DEFINE(int, arp_maxtries) = 5;
-VNET_DEFINE(int, useloopback) = 1;	/* use loopback interface for
-					 * local traffic */
 static VNET_DEFINE(int, arp_proxyall) = 0;
 static VNET_DEFINE(int, arpt_down) = 20;	/* keep incomplete entries for
 						 * 20 seconds */
@@ -110,9 +109,6 @@ SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW,
 SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, maxtries, CTLFLAG_RW,
 	&VNET_NAME(arp_maxtries), 0,
 	"ARP resolution attempts before returning error");
-SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, useloopback, CTLFLAG_RW,
-	&VNET_NAME(useloopback), 0,
-	"Use the loopback interface for local traffic");
 SYSCTL_VNET_INT(_net_link_ether_inet, OID_AUTO, proxyall, CTLFLAG_RW,
 	&VNET_NAME(arp_proxyall), 0,
 	"Enable proxy ARP for all suitable requests");
@@ -141,7 +137,7 @@ static const struct netisr_handler arp_nh = {
 
 #ifdef AF_INET
 /*
- * called by in_ifscrub to remove entry from the table when
+ * called by in_scrubprefix() to remove entry from the table when
  * the interface goes away
  */
 void
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 9f31a191c75..4e2294824bb 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/condvar.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index 363f671e7dd..4331e82d72d 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_mpath.h"
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/malloc.h>
@@ -46,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
+#include <sys/sx.h>
 
 #include <net/if.h>
 #include <net/if_var.h>
@@ -66,14 +68,10 @@ __FBSDID("$FreeBSD$");
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 
-static int in_mask2len(struct in_addr *);
-static void in_len2mask(struct in_addr *, int);
-static int in_lifaddr_ioctl(struct socket *, u_long, caddr_t,
-	struct ifnet *, struct thread *);
+static int in_aifaddr_ioctl(u_long, caddr_t, struct ifnet *, struct thread *);
+static int in_difaddr_ioctl(caddr_t, struct ifnet *, struct thread *);
 
 static void	in_socktrim(struct sockaddr_in *);
-static int	in_ifinit(struct ifnet *, struct in_ifaddr *,
-		    struct sockaddr_in *, int, int);
 static void	in_purgemaddrs(struct ifnet *);
 
 static VNET_DEFINE(int, nosameprefix);
@@ -85,6 +83,9 @@ SYSCTL_VNET_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_RW,
 VNET_DECLARE(struct inpcbinfo, ripcbinfo);
 #define	V_ripcbinfo			VNET(ripcbinfo)
 
+static struct sx in_control_sx;
+SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");
+
 /*
  * Return 1 if an internet address is for a ``local'' host
  * (one to which we have a connection).
@@ -126,6 +127,29 @@ in_localip(struct in_addr in)
 	return (0);
 }
 
+/*
+ * Return a reference to the interface address which is different to
+ * the supplied one but with same IP address value.
+ */
+static struct in_ifaddr *
+in_localip_more(struct in_ifaddr *ia)
+{
+	in_addr_t in = IA_SIN(ia)->sin_addr.s_addr;
+	struct in_ifaddr *it;
+
+	IN_IFADDR_RLOCK();
+	LIST_FOREACH(it, INADDR_HASH(in), ia_hash) {
+		if (it != ia && IA_SIN(it)->sin_addr.s_addr == in) {
+			ifa_ref(&it->ia_ifa);
+			IN_IFADDR_RUNLOCK();
+			return (it);
+		}
+	}
+	IN_IFADDR_RUNLOCK();
+
+	return (NULL);
+}
+
 /*
  * Determine whether an IP address is in a reserved set of addresses
  * that may not be forwarded, or whether datagrams to that destination
@@ -164,672 +188,190 @@ in_socktrim(struct sockaddr_in *ap)
 	}
 }
 
-static int
-in_mask2len(mask)
-	struct in_addr *mask;
-{
-	int x, y;
-	u_char *p;
-
-	p = (u_char *)mask;
-	for (x = 0; x < sizeof(*mask); x++) {
-		if (p[x] != 0xff)
-			break;
-	}
-	y = 0;
-	if (x < sizeof(*mask)) {
-		for (y = 0; y < 8; y++) {
-			if ((p[x] & (0x80 >> y)) == 0)
-				break;
-		}
-	}
-	return (x * 8 + y);
-}
-
-static void
-in_len2mask(struct in_addr *mask, int len)
-{
-	int i;
-	u_char *p;
-
-	p = (u_char *)mask;
-	bzero(mask, sizeof(*mask));
-	for (i = 0; i < len / 8; i++)
-		p[i] = 0xff;
-	if (len % 8)
-		p[i] = (0xff00 >> (len % 8)) & 0xff;
-}
-
 /*
  * Generic internet control operations (ioctl's).
- *
- * ifp is NULL if not an interface-specific ioctl.
  */
-/* ARGSUSED */
 int
 in_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
     struct thread *td)
 {
-	register struct ifreq *ifr = (struct ifreq *)data;
-	register struct in_ifaddr *ia, *iap;
-	register struct ifaddr *ifa;
-	struct in_addr allhosts_addr;
-	struct in_addr dst;
-	struct in_ifinfo *ii;
-	struct in_aliasreq *ifra = (struct in_aliasreq *)data;
-	int error, hostIsNew, iaIsNew, maskIsNew;
-	int iaIsFirst;
-	u_long ocmd = cmd;
+	struct ifreq *ifr = (struct ifreq *)data;
+	struct sockaddr_in *addr = (struct sockaddr_in *)&ifr->ifr_addr;
+	struct ifaddr *ifa;
+	struct in_ifaddr *ia;
+	int error;
+
+	if (ifp == NULL)
+		return (EADDRNOTAVAIL);
 
 	/*
-	 * Pre-10.x compat: OSIOCAIFADDR passes a shorter
-	 * struct in_aliasreq, without ifra_vhid.
-	 */
-	if (cmd == OSIOCAIFADDR)
-		cmd = SIOCAIFADDR;
-
-	ia = NULL;
-	iaIsFirst = 0;
-	iaIsNew = 0;
-	allhosts_addr.s_addr = htonl(INADDR_ALLHOSTS_GROUP);
-
-	/*
-	 * Filter out ioctls we implement directly; forward the rest on to
-	 * in_lifaddr_ioctl() and ifp->if_ioctl().
+	 * Filter out 4 ioctls we implement directly.  Forward the rest
+	 * to specific functions and ifp->if_ioctl().
 	 */
 	switch (cmd) {
 	case SIOCGIFADDR:
 	case SIOCGIFBRDADDR:
 	case SIOCGIFDSTADDR:
 	case SIOCGIFNETMASK:
+		break;
 	case SIOCDIFADDR:
-		break;
+		sx_xlock(&in_control_sx);
+		error = in_difaddr_ioctl(data, ifp, td);
+		sx_xunlock(&in_control_sx);
+		return (error);
+	case OSIOCAIFADDR:	/* 9.x compat */
 	case SIOCAIFADDR:
-		/*
-		 * ifra_addr must be present and be of INET family.
-		 * ifra_broadaddr and ifra_mask are optional.
-		 */
-		if (ifra->ifra_addr.sin_len != sizeof(struct sockaddr_in) ||
-		    ifra->ifra_addr.sin_family != AF_INET)
-			return (EINVAL);
-		if (ifra->ifra_broadaddr.sin_len != 0 &&
-		    (ifra->ifra_broadaddr.sin_len !=
-		    sizeof(struct sockaddr_in) ||
-		    ifra->ifra_broadaddr.sin_family != AF_INET))
-			return (EINVAL);
-#if 0
-		/*
-		 * ifconfig(8) in pre-10.x doesn't set sin_family for the
-		 * mask. The code is disabled for the 10.x timeline, to
-		 * make SIOCAIFADDR compatible with 9.x ifconfig(8).
-		 * The code should be enabled in 11.x
-		 */
-		if (ifra->ifra_mask.sin_len != 0 &&
-		    (ifra->ifra_mask.sin_len != sizeof(struct sockaddr_in) ||
-		    ifra->ifra_mask.sin_family != AF_INET))
-			return (EINVAL);
-#endif
-		break;
+		sx_xlock(&in_control_sx);
+		error = in_aifaddr_ioctl(cmd, data, ifp, td);
+		sx_xunlock(&in_control_sx);
+		return (error);
 	case SIOCSIFADDR:
 	case SIOCSIFBRDADDR:
 	case SIOCSIFDSTADDR:
 	case SIOCSIFNETMASK:
 		/* We no longer support that old commands. */
 		return (EINVAL);
-
-	case SIOCALIFADDR:
-		if (td != NULL) {
-			error = priv_check(td, PRIV_NET_ADDIFADDR);
-			if (error)
-				return (error);
-		}
-		if (ifp == NULL)
-			return (EINVAL);
-		return in_lifaddr_ioctl(so, cmd, data, ifp, td);
-
-	case SIOCDLIFADDR:
-		if (td != NULL) {
-			error = priv_check(td, PRIV_NET_DELIFADDR);
-			if (error)
-				return (error);
-		}
-		if (ifp == NULL)
-			return (EINVAL);
-		return in_lifaddr_ioctl(so, cmd, data, ifp, td);
-
-	case SIOCGLIFADDR:
-		if (ifp == NULL)
-			return (EINVAL);
-		return in_lifaddr_ioctl(so, cmd, data, ifp, td);
-
 	default:
-		if (ifp == NULL || ifp->if_ioctl == NULL)
+		if (ifp->if_ioctl == NULL)
 			return (EOPNOTSUPP);
 		return ((*ifp->if_ioctl)(ifp, cmd, data));
 	}
 
-	if (ifp == NULL)
+	if (addr->sin_addr.s_addr != INADDR_ANY &&
+	    prison_check_ip4(td->td_ucred, &addr->sin_addr) != 0)
 		return (EADDRNOTAVAIL);
 
 	/*
-	 * Security checks before we get involved in any work.
+	 * For SIOCGIFADDR, pick the first address.  For the rest of
+	 * ioctls, try to find specified address.
 	 */
-	switch (cmd) {
-	case SIOCAIFADDR:
-		if (td != NULL) {
-			error = priv_check(td, PRIV_NET_ADDIFADDR);
-			if (error)
-				return (error);
-		}
-		break;
-
-	case SIOCDIFADDR:
-		if (td != NULL) {
-			error = priv_check(td, PRIV_NET_DELIFADDR);
-			if (error)
-				return (error);
-		}
-		break;
-	}
-
-	/*
-	 * Find address for this interface, if it exists.
-	 *
-	 * If an alias address was specified, find that one instead of the
-	 * first one on the interface, if possible.
-	 */
-	dst = ((struct sockaddr_in *)&ifr->ifr_addr)->sin_addr;
-	IN_IFADDR_RLOCK();
-	LIST_FOREACH(iap, INADDR_HASH(dst.s_addr), ia_hash) {
-		if (iap->ia_ifp == ifp &&
-		    iap->ia_addr.sin_addr.s_addr == dst.s_addr) {
-			if (td == NULL || prison_check_ip4(td->td_ucred,
-			    &dst) == 0)
-				ia = iap;
+	IF_ADDR_RLOCK(ifp);
+	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
+		ia = (struct in_ifaddr *)ifa;
+		if (cmd == SIOCGIFADDR || addr->sin_addr.s_addr == INADDR_ANY)
+			break;
+		if (ia->ia_addr.sin_addr.s_addr == addr->sin_addr.s_addr)
 			break;
-		}
 	}
-	if (ia != NULL)
-		ifa_ref(&ia->ia_ifa);
-	IN_IFADDR_RUNLOCK();
-	if (ia == NULL) {
-		IF_ADDR_RLOCK(ifp);
-		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
-			iap = ifatoia(ifa);
-			if (iap->ia_addr.sin_family == AF_INET) {
-				if (td != NULL &&
-				    prison_check_ip4(td->td_ucred,
-				    &iap->ia_addr.sin_addr) != 0)
-					continue;
-				ia = iap;
-				break;
-			}
-		}
-		if (ia != NULL)
-			ifa_ref(&ia->ia_ifa);
+
+	if (ifa == NULL) {
 		IF_ADDR_RUNLOCK(ifp);
+		return (EADDRNOTAVAIL);
 	}
-	if (ia == NULL)
-		iaIsFirst = 1;
 
 	error = 0;
 	switch (cmd) {
-	case SIOCAIFADDR:
-	case SIOCDIFADDR:
-		if (ifra->ifra_addr.sin_family == AF_INET) {
-			struct in_ifaddr *oia;
-
-			IN_IFADDR_RLOCK();
-			for (oia = ia; ia; ia = TAILQ_NEXT(ia, ia_link)) {
-				if (ia->ia_ifp == ifp  &&
-				    ia->ia_addr.sin_addr.s_addr ==
-				    ifra->ifra_addr.sin_addr.s_addr)
-					break;
-			}
-			if (ia != NULL && ia != oia)
-				ifa_ref(&ia->ia_ifa);
-			if (oia != NULL && ia != oia)
-				ifa_free(&oia->ia_ifa);
-			IN_IFADDR_RUNLOCK();
-			if ((ifp->if_flags & IFF_POINTOPOINT)
-			    && (cmd == SIOCAIFADDR)
-			    && (ifra->ifra_dstaddr.sin_addr.s_addr
-				== INADDR_ANY)) {
-				error = EDESTADDRREQ;
-				goto out;
-			}
-		}
-		if (cmd == SIOCDIFADDR && ia == NULL) {
-			error = EADDRNOTAVAIL;
-			goto out;
-		}
-		if (ia == NULL) {
-			ia = (struct in_ifaddr *)
-				malloc(sizeof *ia, M_IFADDR, M_NOWAIT |
-				    M_ZERO);
-			if (ia == NULL) {
-				error = ENOBUFS;
-				goto out;
-			}
-
-			ifa = &ia->ia_ifa;
-			ifa_init(ifa);
-			ifa->ifa_addr = (struct sockaddr *)&ia->ia_addr;
-			ifa->ifa_dstaddr = (struct sockaddr *)&ia->ia_dstaddr;
-			ifa->ifa_netmask = (struct sockaddr *)&ia->ia_sockmask;
-
-			ia->ia_sockmask.sin_len = 8;
-			ia->ia_sockmask.sin_family = AF_INET;
-			if (ifp->if_flags & IFF_BROADCAST) {
-				ia->ia_broadaddr.sin_len = sizeof(ia->ia_addr);
-				ia->ia_broadaddr.sin_family = AF_INET;
-			}
-			ia->ia_ifp = ifp;
-
-			ifa_ref(ifa);			/* if_addrhead */
-			IF_ADDR_WLOCK(ifp);
-			TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link);
-			IF_ADDR_WUNLOCK(ifp);
-			ifa_ref(ifa);			/* in_ifaddrhead */
-			IN_IFADDR_WLOCK();
-			TAILQ_INSERT_TAIL(&V_in_ifaddrhead, ia, ia_link);
-			IN_IFADDR_WUNLOCK();
-			iaIsNew = 1;
-		}
-		break;
-
 	case SIOCGIFADDR:
-	case SIOCGIFNETMASK:
-	case SIOCGIFDSTADDR:
-	case SIOCGIFBRDADDR:
-		if (ia == NULL) {
-			error = EADDRNOTAVAIL;
-			goto out;
-		}
+		*addr = ia->ia_addr;
 		break;
-	}
-
-	/*
-	 * Most paths in this switch return directly or via out.  Only paths
-	 * that remove the address break in order to hit common removal code.
-	 */
-	switch (cmd) {
-	case SIOCGIFADDR:
-		*((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_addr;
-		goto out;
 
 	case SIOCGIFBRDADDR:
 		if ((ifp->if_flags & IFF_BROADCAST) == 0) {
 			error = EINVAL;
-			goto out;
+			break;
 		}
-		*((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_broadaddr;
-		goto out;
+		*addr = ia->ia_broadaddr;
+		break;
 
 	case SIOCGIFDSTADDR:
 		if ((ifp->if_flags & IFF_POINTOPOINT) == 0) {
 			error = EINVAL;
-			goto out;
-		}
-		*((struct sockaddr_in *)&ifr->ifr_dstaddr) = ia->ia_dstaddr;
-		goto out;
-
-	case SIOCGIFNETMASK:
-		*((struct sockaddr_in *)&ifr->ifr_addr) = ia->ia_sockmask;
-		goto out;
-
-	case SIOCAIFADDR:
-		maskIsNew = 0;
-		hostIsNew = 1;
-		error = 0;
-		if (ifra->ifra_addr.sin_addr.s_addr ==
-			    ia->ia_addr.sin_addr.s_addr)
-			hostIsNew = 0;
-		if (ifra->ifra_mask.sin_len) {
-			/*
-			 * QL: XXX
-			 * Need to scrub the prefix here in case
-			 * the issued command is SIOCAIFADDR with
-			 * the same address, but with a different
-			 * prefix length. And if the prefix length
-			 * is the same as before, then the call is
-			 * un-necessarily executed here.
-			 */
-			in_ifscrub(ifp, ia, LLE_STATIC);
-			ia->ia_sockmask = ifra->ifra_mask;
-			ia->ia_sockmask.sin_family = AF_INET;
-			ia->ia_subnetmask =
-			    ntohl(ia->ia_sockmask.sin_addr.s_addr);
-			maskIsNew = 1;
-		}
-		if ((ifp->if_flags & IFF_POINTOPOINT) &&
-		    (ifra->ifra_dstaddr.sin_family == AF_INET)) {
-			in_ifscrub(ifp, ia, LLE_STATIC);
-			ia->ia_dstaddr = ifra->ifra_dstaddr;
-			maskIsNew  = 1; /* We lie; but the effect's the same */
-		}
-		if (hostIsNew || maskIsNew)
-			error = in_ifinit(ifp, ia, &ifra->ifra_addr, maskIsNew,
-			    (ocmd == cmd ? ifra->ifra_vhid : 0));
-		if (error != 0 && iaIsNew)
 			break;
-
-		if ((ifp->if_flags & IFF_BROADCAST) &&
-		    ifra->ifra_broadaddr.sin_len)
-			ia->ia_broadaddr = ifra->ifra_broadaddr;
-		if (error == 0) {
-			ii = ((struct in_ifinfo *)ifp->if_afdata[AF_INET]);
-			if (iaIsFirst &&
-			    (ifp->if_flags & IFF_MULTICAST) != 0) {
-				error = in_joingroup(ifp, &allhosts_addr,
-				    NULL, &ii->ii_allhosts);
-			}
-			EVENTHANDLER_INVOKE(ifaddr_event, ifp);
 		}
-		goto out;
-
-	case SIOCDIFADDR:
-		/*
-		 * in_ifscrub kills the interface route.
-		 */
-		in_ifscrub(ifp, ia, LLE_STATIC);
-
-		/*
-		 * in_ifadown gets rid of all the rest of
-		 * the routes.  This is not quite the right
-		 * thing to do, but at least if we are running
-		 * a routing process they will come back.
-		 */
-		in_ifadown(&ia->ia_ifa, 1);
-		EVENTHANDLER_INVOKE(ifaddr_event, ifp);
-		error = 0;
+		*addr = ia->ia_dstaddr;
 		break;
 
-	default:
-		panic("in_control: unsupported ioctl");
+	case SIOCGIFNETMASK:
+		*addr = ia->ia_sockmask;
+		break;
 	}
 
-	if (ia->ia_ifa.ifa_carp)
-		(*carp_detach_p)(&ia->ia_ifa);
+	IF_ADDR_RUNLOCK(ifp);
 
-	IF_ADDR_WLOCK(ifp);
-	/* Re-check that ia is still part of the list. */
-	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
-		if (ifa == &ia->ia_ifa)
-			break;
-	}
-	if (ifa == NULL) {
-		/*
-		 * If we lost the race with another thread, there is no need to
-		 * try it again for the next loop as there is no other exit
-		 * path between here and out.
-		 */
-		IF_ADDR_WUNLOCK(ifp);
-		error = EADDRNOTAVAIL;
-		goto out;
-	}
-	TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link);
-	IF_ADDR_WUNLOCK(ifp);
-	ifa_free(&ia->ia_ifa);		      /* if_addrhead */
-
-	IN_IFADDR_WLOCK();
-	TAILQ_REMOVE(&V_in_ifaddrhead, ia, ia_link);
-
-	LIST_REMOVE(ia, ia_hash);
-	IN_IFADDR_WUNLOCK();
-	/*
-	 * If this is the last IPv4 address configured on this
-	 * interface, leave the all-hosts group.
-	 * No state-change report need be transmitted.
-	 */
-	IFP_TO_IA(ifp, iap);
-	if (iap == NULL) {
-		ii = ((struct in_ifinfo *)ifp->if_afdata[AF_INET]);
-		IN_MULTI_LOCK();
-		if (ii->ii_allhosts) {
-			(void)in_leavegroup_locked(ii->ii_allhosts, NULL);
-			ii->ii_allhosts = NULL;
-		}
-		IN_MULTI_UNLOCK();
-	} else
-		ifa_free(&iap->ia_ifa);
-
-	ifa_free(&ia->ia_ifa);				/* in_ifaddrhead */
-out:
-	if (ia != NULL)
-		ifa_free(&ia->ia_ifa);
 	return (error);
 }
 
-/*
- * SIOC[GAD]LIFADDR.
- *	SIOCGLIFADDR: get first address. (?!?)
- *	SIOCGLIFADDR with IFLR_PREFIX:
- *		get first address that matches the specified prefix.
- *	SIOCALIFADDR: add the specified address.
- *	SIOCALIFADDR with IFLR_PREFIX:
- *		EINVAL since we can't deduce hostid part of the address.
- *	SIOCDLIFADDR: delete the specified address.
- *	SIOCDLIFADDR with IFLR_PREFIX:
- *		delete the first address that matches the specified prefix.
- * return values:
- *	EINVAL on invalid parameters
- *	EADDRNOTAVAIL on prefix match failed/specified address not found
- *	other values may be returned from in_ioctl()
- */
 static int
-in_lifaddr_ioctl(struct socket *so, u_long cmd, caddr_t data,
-    struct ifnet *ifp, struct thread *td)
+in_aifaddr_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp, struct thread *td)
 {
-	struct if_laddrreq *iflr = (struct if_laddrreq *)data;
+	const struct in_aliasreq *ifra = (struct in_aliasreq *)data;
+	const struct sockaddr_in *addr = &ifra->ifra_addr;
+	const struct sockaddr_in *broadaddr = &ifra->ifra_broadaddr;
+	const struct sockaddr_in *mask = &ifra->ifra_mask;
+	const struct sockaddr_in *dstaddr = &ifra->ifra_dstaddr;
+	const int vhid = (cmd == SIOCAIFADDR) ? ifra->ifra_vhid : 0;
 	struct ifaddr *ifa;
+	struct in_ifaddr *ia;
+	bool iaIsFirst;
+	int error = 0;
 
-	/* sanity checks */
-	if (data == NULL || ifp == NULL) {
-		panic("invalid argument to in_lifaddr_ioctl");
-		/*NOTRECHED*/
-	}
-
-	switch (cmd) {
-	case SIOCGLIFADDR:
-		/* address must be specified on GET with IFLR_PREFIX */
-		if ((iflr->flags & IFLR_PREFIX) == 0)
-			break;
-		/*FALLTHROUGH*/
-	case SIOCALIFADDR:
-	case SIOCDLIFADDR:
-		/* address must be specified on ADD and DELETE */
-		if (iflr->addr.ss_family != AF_INET)
-			return (EINVAL);
-		if (iflr->addr.ss_len != sizeof(struct sockaddr_in))
-			return (EINVAL);
-		/* XXX need improvement */
-		if (iflr->dstaddr.ss_family
-		 && iflr->dstaddr.ss_family != AF_INET)
-			return (EINVAL);
-		if (iflr->dstaddr.ss_family
-		 && iflr->dstaddr.ss_len != sizeof(struct sockaddr_in))
-			return (EINVAL);
-		break;
-	default: /*shouldn't happen*/
-		return (EOPNOTSUPP);
-	}
-	if (sizeof(struct in_addr) * 8 < iflr->prefixlen)
-		return (EINVAL);
-
-	switch (cmd) {
-	case SIOCALIFADDR:
-	    {
-		struct in_aliasreq ifra;
-
-		if (iflr->flags & IFLR_PREFIX)
-			return (EINVAL);
-
-		/* copy args to in_aliasreq, perform ioctl(SIOCAIFADDR). */
-		bzero(&ifra, sizeof(ifra));
-		bcopy(iflr->iflr_name, ifra.ifra_name,
-			sizeof(ifra.ifra_name));
-
-		bcopy(&iflr->addr, &ifra.ifra_addr, iflr->addr.ss_len);
-
-		if (iflr->dstaddr.ss_family) {	/*XXX*/
-			bcopy(&iflr->dstaddr, &ifra.ifra_dstaddr,
-				iflr->dstaddr.ss_len);
-		}
-
-		ifra.ifra_mask.sin_family = AF_INET;
-		ifra.ifra_mask.sin_len = sizeof(struct sockaddr_in);
-		in_len2mask(&ifra.ifra_mask.sin_addr, iflr->prefixlen);
-
-		return (in_control(so, SIOCAIFADDR, (caddr_t)&ifra, ifp, td));
-	    }
-	case SIOCGLIFADDR:
-	case SIOCDLIFADDR:
-	    {
-		struct in_ifaddr *ia;
-		struct in_addr mask, candidate, match;
-		struct sockaddr_in *sin;
-
-		bzero(&mask, sizeof(mask));
-		bzero(&match, sizeof(match));
-		if (iflr->flags & IFLR_PREFIX) {
-			/* lookup a prefix rather than address. */
-			in_len2mask(&mask, iflr->prefixlen);
-
-			sin = (struct sockaddr_in *)&iflr->addr;
-			match.s_addr = sin->sin_addr.s_addr;
-			match.s_addr &= mask.s_addr;
-
-			/* if you set extra bits, that's wrong */
-			if (match.s_addr != sin->sin_addr.s_addr)
-				return (EINVAL);
-
-		} else {
-			/* on getting an address, take the 1st match */
-			/* on deleting an address, do exact match */
-			if (cmd != SIOCGLIFADDR) {
-				in_len2mask(&mask, 32);
-				sin = (struct sockaddr_in *)&iflr->addr;
-				match.s_addr = sin->sin_addr.s_addr;
-			}
-		}
-
-		IF_ADDR_RLOCK(ifp);
-		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link)	{
-			if (ifa->ifa_addr->sa_family != AF_INET)
-				continue;
-			if (match.s_addr == 0)
-				break;
-			sin = (struct sockaddr_in *)&ifa->ifa_addr;
-			candidate.s_addr = sin->sin_addr.s_addr;
-			candidate.s_addr &= mask.s_addr;
-			if (candidate.s_addr == match.s_addr)
-				break;
-		}
-		if (ifa != NULL)
-			ifa_ref(ifa);
-		IF_ADDR_RUNLOCK(ifp);
-		if (ifa == NULL)
-			return (EADDRNOTAVAIL);
-		ia = (struct in_ifaddr *)ifa;
-
-		if (cmd == SIOCGLIFADDR) {
-			/* fill in the if_laddrreq structure */
-			bcopy(&ia->ia_addr, &iflr->addr, ia->ia_addr.sin_len);
-
-			if ((ifp->if_flags & IFF_POINTOPOINT) != 0) {
-				bcopy(&ia->ia_dstaddr, &iflr->dstaddr,
-					ia->ia_dstaddr.sin_len);
-			} else
-				bzero(&iflr->dstaddr, sizeof(iflr->dstaddr));
-
-			iflr->prefixlen =
-				in_mask2len(&ia->ia_sockmask.sin_addr);
-
-			iflr->flags = 0;	/*XXX*/
-			ifa_free(ifa);
-
-			return (0);
-		} else {
-			struct in_aliasreq ifra;
-
-			/* fill in_aliasreq and do ioctl(SIOCDIFADDR) */
-			bzero(&ifra, sizeof(ifra));
-			bcopy(iflr->iflr_name, ifra.ifra_name,
-				sizeof(ifra.ifra_name));
-
-			bcopy(&ia->ia_addr, &ifra.ifra_addr,
-				ia->ia_addr.sin_len);
-			if ((ifp->if_flags & IFF_POINTOPOINT) != 0) {
-				bcopy(&ia->ia_dstaddr, &ifra.ifra_dstaddr,
-					ia->ia_dstaddr.sin_len);
-			}
-			bcopy(&ia->ia_sockmask, &ifra.ifra_dstaddr,
-				ia->ia_sockmask.sin_len);
-			ifa_free(ifa);
-
-			return (in_control(so, SIOCDIFADDR, (caddr_t)&ifra,
-			    ifp, td));
-		}
-	    }
-	}
-
-	return (EOPNOTSUPP);	/*just for safety*/
-}
-
-/*
- * Delete any existing route for an interface.
- */
-void
-in_ifscrub(struct ifnet *ifp, struct in_ifaddr *ia, u_int flags)
-{
-
-	in_scrubprefix(ia, flags);
-}
-
-/*
- * Initialize an interface's internet address
- * and routing table entry.
- */
-static int
-in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin,
-    int masksupplied, int vhid)
-{
-	register u_long i = ntohl(sin->sin_addr.s_addr);
-	int flags, error = 0;
-
-	IN_IFADDR_WLOCK();
-	if (ia->ia_addr.sin_family == AF_INET)
-		LIST_REMOVE(ia, ia_hash);
-	ia->ia_addr = *sin;
-	LIST_INSERT_HEAD(INADDR_HASH(ia->ia_addr.sin_addr.s_addr),
-	    ia, ia_hash);
-	IN_IFADDR_WUNLOCK();
-
-	if (vhid > 0) {
-		if (carp_attach_p != NULL)
-			error = (*carp_attach_p)(&ia->ia_ifa, vhid);
-		else
-			error = EPROTONOSUPPORT;
-	}
+	error = priv_check(td, PRIV_NET_ADDIFADDR);
 	if (error)
 		return (error);
 
 	/*
-	 * Give the interface a chance to initialize
-	 * if this is its first address,
-	 * and to validate the address if necessary.
+	 * ifra_addr must be present and be of INET family.
+	 * ifra_broadaddr/ifra_dstaddr and ifra_mask are optional.
 	 */
-	if (ifp->if_ioctl != NULL &&
-	    (error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia)) != 0)
-			/* LIST_REMOVE(ia, ia_hash) is done in in_control */
-			return (error);
+	if (addr->sin_len != sizeof(struct sockaddr_in) ||
+	    addr->sin_family != AF_INET)
+		return (EINVAL);
+	if (broadaddr->sin_len != 0 &&
+	    (broadaddr->sin_len != sizeof(struct sockaddr_in) ||
+	    broadaddr->sin_family != AF_INET))
+		return (EINVAL);
+	if (mask->sin_len != 0 &&
+	    (mask->sin_len != sizeof(struct sockaddr_in) ||
+	    mask->sin_family != AF_INET))
+		return (EINVAL);
+	if ((ifp->if_flags & IFF_POINTOPOINT) &&
+	    (dstaddr->sin_len != sizeof(struct sockaddr_in) ||
+	     dstaddr->sin_addr.s_addr == INADDR_ANY))
+		return (EDESTADDRREQ);
+	if (vhid > 0 && carp_attach_p == NULL)
+		return (EPROTONOSUPPORT);
 
 	/*
-	 * Be compatible with network classes, if netmask isn't supplied,
-	 * guess it based on classes.
+	 * See whether address already exist.
 	 */
-	if (!masksupplied) {
+	iaIsFirst = true;
+	ia = NULL;
+	IF_ADDR_RLOCK(ifp);
+	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
+		struct in_ifaddr *it = ifatoia(ifa);
+
+		if (it->ia_addr.sin_family != AF_INET)
+			continue;
+
+		iaIsFirst = false;
+		if (it->ia_addr.sin_addr.s_addr == addr->sin_addr.s_addr &&
+		    prison_check_ip4(td->td_ucred, &addr->sin_addr) == 0)
+			ia = it;
+	}
+	IF_ADDR_RUNLOCK(ifp);
+
+	if (ia != NULL)
+		(void )in_difaddr_ioctl(data, ifp, td);
+
+	ifa = ifa_alloc(sizeof(struct in_ifaddr), M_WAITOK);
+	ia = (struct in_ifaddr *)ifa;
+	ifa->ifa_addr = (struct sockaddr *)&ia->ia_addr;
+	ifa->ifa_dstaddr = (struct sockaddr *)&ia->ia_dstaddr;
+	ifa->ifa_netmask = (struct sockaddr *)&ia->ia_sockmask;
+
+	ia->ia_ifp = ifp;
+	ia->ia_ifa.ifa_metric = ifp->if_metric;
+	ia->ia_addr = *addr;
+	if (mask->sin_len != 0) {
+		ia->ia_sockmask = *mask;
+		ia->ia_subnetmask = ntohl(ia->ia_sockmask.sin_addr.s_addr);
+	} else {
+		in_addr_t i = ntohl(addr->sin_addr.s_addr);
+
+		/*
+	 	 * Be compatible with network classes, if netmask isn't
+		 * supplied, guess it based on classes.
+	 	 */
 		if (IN_CLASSA(i))
 			ia->ia_subnetmask = IN_CLASSA_NET;
 		else if (IN_CLASSB(i))
@@ -838,62 +380,225 @@ in_ifinit(struct ifnet *ifp, struct in_ifaddr *ia, struct sockaddr_in *sin,
 			ia->ia_subnetmask = IN_CLASSC_NET;
 		ia->ia_sockmask.sin_addr.s_addr = htonl(ia->ia_subnetmask);
 	}
-	ia->ia_subnet = i & ia->ia_subnetmask;
+	ia->ia_subnet = ntohl(addr->sin_addr.s_addr) & ia->ia_subnetmask;
 	in_socktrim(&ia->ia_sockmask);
 
+	if (ifp->if_flags & IFF_BROADCAST) {
+		if (broadaddr->sin_len != 0) {
+			ia->ia_broadaddr = *broadaddr;
+		} else if (ia->ia_subnetmask == IN_RFC3021_MASK) {
+			ia->ia_broadaddr.sin_addr.s_addr = INADDR_BROADCAST;
+			ia->ia_broadaddr.sin_len = sizeof(struct sockaddr_in);
+			ia->ia_broadaddr.sin_family = AF_INET;
+		} else {
+			ia->ia_broadaddr.sin_addr.s_addr =
+			    htonl(ia->ia_subnet | ~ia->ia_subnetmask);
+			ia->ia_broadaddr.sin_len = sizeof(struct sockaddr_in);
+			ia->ia_broadaddr.sin_family = AF_INET;
+		}
+	}
+
+	if (ifp->if_flags & IFF_POINTOPOINT)
+		ia->ia_dstaddr = *dstaddr;
+
+	/* XXXGL: rtinit() needs this strange assignment. */
+	if (ifp->if_flags & IFF_LOOPBACK)
+                ia->ia_dstaddr = ia->ia_addr;
+
+	ifa_ref(ifa);			/* if_addrhead */
+	IF_ADDR_WLOCK(ifp);
+	TAILQ_INSERT_TAIL(&ifp->if_addrhead, ifa, ifa_link);
+	IF_ADDR_WUNLOCK(ifp);
+
+	ifa_ref(ifa);			/* in_ifaddrhead */
+	IN_IFADDR_WLOCK();
+	TAILQ_INSERT_TAIL(&V_in_ifaddrhead, ia, ia_link);
+	LIST_INSERT_HEAD(INADDR_HASH(ia->ia_addr.sin_addr.s_addr), ia, ia_hash);
+	IN_IFADDR_WUNLOCK();
+
+	if (vhid != 0)
+		error = (*carp_attach_p)(&ia->ia_ifa, vhid);
+	if (error)
+		goto fail1;
+
+	/*
+	 * Give the interface a chance to initialize
+	 * if this is its first address,
+	 * and to validate the address if necessary.
+	 */
+	if (ifp->if_ioctl != NULL)
+		error = (*ifp->if_ioctl)(ifp, SIOCSIFADDR, (caddr_t)ia);
+	if (error)
+		goto fail2;
+
 	/*
 	 * Add route for the network.
 	 */
-	flags = RTF_UP;
-	ia->ia_ifa.ifa_metric = ifp->if_metric;
-	if (ifp->if_flags & IFF_BROADCAST) {
-		if (ia->ia_subnetmask == IN_RFC3021_MASK)
-			ia->ia_broadaddr.sin_addr.s_addr = INADDR_BROADCAST;
-		else
-			ia->ia_broadaddr.sin_addr.s_addr =
-			    htonl(ia->ia_subnet | ~ia->ia_subnetmask);
-	} else if (ifp->if_flags & IFF_LOOPBACK) {
-		ia->ia_dstaddr = ia->ia_addr;
-		flags |= RTF_HOST;
-	} else if (ifp->if_flags & IFF_POINTOPOINT) {
-		if (ia->ia_dstaddr.sin_family != AF_INET)
-			return (0);
-		flags |= RTF_HOST;
+	if (vhid == 0) {
+		int flags = RTF_UP;
+
+		if (ifp->if_flags & (IFF_LOOPBACK|IFF_POINTOPOINT))
+			flags |= RTF_HOST;
+
+		error = in_addprefix(ia, flags);
+		if (error)
+			goto fail2;
 	}
-	if (!vhid && (error = in_addprefix(ia, flags)) != 0)
-		return (error);
-
-	if (ia->ia_addr.sin_addr.s_addr == INADDR_ANY)
-		return (0);
-
-	if (ifp->if_flags & IFF_POINTOPOINT &&
-	    ia->ia_dstaddr.sin_addr.s_addr == ia->ia_addr.sin_addr.s_addr)
-			return (0);
 
 	/*
-	 * add a loopback route to self
+	 * Add a loopback route to self.
 	 */
-	if (V_useloopback && !vhid && !(ifp->if_flags & IFF_LOOPBACK)) {
-		struct route ia_ro;
+	if (vhid == 0 && (ifp->if_flags & IFF_LOOPBACK) == 0 &&
+	    ia->ia_addr.sin_addr.s_addr != INADDR_ANY &&
+	    !((ifp->if_flags & IFF_POINTOPOINT) &&
+	     ia->ia_dstaddr.sin_addr.s_addr == ia->ia_addr.sin_addr.s_addr)) {
+		struct in_ifaddr *eia;
 
-		bzero(&ia_ro, sizeof(ia_ro));
-		*((struct sockaddr_in *)(&ia_ro.ro_dst)) = ia->ia_addr;
-		rtalloc_ign_fib(&ia_ro, 0, RT_DEFAULT_FIB);
-		if ((ia_ro.ro_rt != NULL) && (ia_ro.ro_rt->rt_ifp != NULL) &&
-		    (ia_ro.ro_rt->rt_ifp == V_loif)) {
-			RT_LOCK(ia_ro.ro_rt);
-			RT_ADDREF(ia_ro.ro_rt);
-			RTFREE_LOCKED(ia_ro.ro_rt);
-		} else
+		eia = in_localip_more(ia);
+
+		if (eia == NULL) {
 			error = ifa_add_loopback_route((struct ifaddr *)ia,
 			    (struct sockaddr *)&ia->ia_addr);
-		if (error == 0)
-			ia->ia_flags |= IFA_RTSELF;
-		if (ia_ro.ro_rt != NULL)
-			RTFREE(ia_ro.ro_rt);
+			if (error)
+				goto fail3;
+		} else
+			ifa_free(&eia->ia_ifa);
 	}
 
+	if (iaIsFirst && (ifp->if_flags & IFF_MULTICAST)) {
+		struct in_addr allhosts_addr;
+		struct in_ifinfo *ii;
+
+		ii = ((struct in_ifinfo *)ifp->if_afdata[AF_INET]);
+		allhosts_addr.s_addr = htonl(INADDR_ALLHOSTS_GROUP);
+
+		error = in_joingroup(ifp, &allhosts_addr, NULL,
+			&ii->ii_allhosts);
+	}
+
+	EVENTHANDLER_INVOKE(ifaddr_event, ifp);
+
 	return (error);
+
+fail3:
+	if (vhid == 0)
+		(void )in_scrubprefix(ia, LLE_STATIC);
+
+fail2:
+	if (ia->ia_ifa.ifa_carp)
+		(*carp_detach_p)(&ia->ia_ifa);
+
+fail1:
+	IF_ADDR_WLOCK(ifp);
+	TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link);
+	IF_ADDR_WUNLOCK(ifp);
+	ifa_free(&ia->ia_ifa);
+
+	IN_IFADDR_WLOCK();
+	TAILQ_REMOVE(&V_in_ifaddrhead, ia, ia_link);
+	LIST_REMOVE(ia, ia_hash);
+	IN_IFADDR_WUNLOCK();
+	ifa_free(&ia->ia_ifa);
+
+	return (error);
+}
+
+static int
+in_difaddr_ioctl(caddr_t data, struct ifnet *ifp, struct thread *td)
+{
+	const struct ifreq *ifr = (struct ifreq *)data;
+	const struct sockaddr_in *addr = (const struct sockaddr_in *)
+	    &ifr->ifr_addr;
+	struct ifaddr *ifa;
+	struct in_ifaddr *ia;
+	bool deleteAny, iaIsLast;
+	int error;
+
+	if (td != NULL) {
+		error = priv_check(td, PRIV_NET_DELIFADDR);
+		if (error)
+			return (error);
+	}
+
+	if (addr->sin_len != sizeof(struct sockaddr_in) ||
+	    addr->sin_family != AF_INET)
+		deleteAny = true;
+	else
+		deleteAny = false;
+
+	iaIsLast = true;
+	ia = NULL;
+	IF_ADDR_WLOCK(ifp);
+	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
+		struct in_ifaddr *it = ifatoia(ifa);
+
+		if (it->ia_addr.sin_family != AF_INET)
+			continue;
+
+		if (deleteAny && ia == NULL && (td == NULL ||
+		    prison_check_ip4(td->td_ucred, &it->ia_addr.sin_addr) == 0))
+			ia = it;
+
+		if (it->ia_addr.sin_addr.s_addr == addr->sin_addr.s_addr &&
+		    (td == NULL || prison_check_ip4(td->td_ucred,
+		    &addr->sin_addr) == 0))
+			ia = it;
+
+		if (it != ia)
+			iaIsLast = false;
+	}
+
+	if (ia == NULL) {
+		IF_ADDR_WUNLOCK(ifp);
+		return (EADDRNOTAVAIL);
+	}
+
+	TAILQ_REMOVE(&ifp->if_addrhead, &ia->ia_ifa, ifa_link);
+	IF_ADDR_WUNLOCK(ifp);
+	ifa_free(&ia->ia_ifa);		/* if_addrhead */
+
+	IN_IFADDR_WLOCK();
+	TAILQ_REMOVE(&V_in_ifaddrhead, ia, ia_link);
+	LIST_REMOVE(ia, ia_hash);
+	IN_IFADDR_WUNLOCK();
+	ifa_free(&ia->ia_ifa);		/* in_ifaddrhead */
+
+	/*
+	 * in_scrubprefix() kills the interface route.
+	 */
+	in_scrubprefix(ia, LLE_STATIC);
+
+	/*
+	 * in_ifadown gets rid of all the rest of
+	 * the routes.  This is not quite the right
+	 * thing to do, but at least if we are running
+	 * a routing process they will come back.
+	 */
+	in_ifadown(&ia->ia_ifa, 1);
+
+	if (ia->ia_ifa.ifa_carp)
+		(*carp_detach_p)(&ia->ia_ifa);
+
+	/*
+	 * If this is the last IPv4 address configured on this
+	 * interface, leave the all-hosts group.
+	 * No state-change report need be transmitted.
+	 */
+	if (iaIsLast && (ifp->if_flags & IFF_MULTICAST)) {
+		struct in_ifinfo *ii;
+
+		ii = ((struct in_ifinfo *)ifp->if_afdata[AF_INET]);
+		IN_MULTI_LOCK();
+		if (ii->ii_allhosts) {
+			(void)in_leavegroup_locked(ii->ii_allhosts, NULL);
+			ii->ii_allhosts = NULL;
+		}
+		IN_MULTI_UNLOCK();
+	}
+
+	EVENTHANDLER_INVOKE(ifaddr_event, ifp);
+
+	return (0);
 }
 
 #define rtinitflags(x) \
@@ -1024,44 +729,27 @@ in_scrubprefix(struct in_ifaddr *target, u_int flags)
 
 	/*
 	 * Remove the loopback route to the interface address.
-	 * The "useloopback" setting is not consulted because if the
-	 * user configures an interface address, turns off this
-	 * setting, and then tries to delete that interface address,
-	 * checking the current setting of "useloopback" would leave
-	 * that interface address loopback route untouched, which
-	 * would be wrong. Therefore the interface address loopback route
-	 * deletion is unconditional.
 	 */
 	if ((target->ia_addr.sin_addr.s_addr != INADDR_ANY) &&
 	    !(target->ia_ifp->if_flags & IFF_LOOPBACK) &&
-	    (target->ia_flags & IFA_RTSELF)) {
-		struct route ia_ro;
-		int freeit = 0;
+	    (flags & LLE_STATIC)) {
+		struct in_ifaddr *eia;
 
-		bzero(&ia_ro, sizeof(ia_ro));
-		*((struct sockaddr_in *)(&ia_ro.ro_dst)) = target->ia_addr;
-		rtalloc_ign_fib(&ia_ro, 0, 0);
-		if ((ia_ro.ro_rt != NULL) && (ia_ro.ro_rt->rt_ifp != NULL) &&
-		    (ia_ro.ro_rt->rt_ifp == V_loif)) {
-			RT_LOCK(ia_ro.ro_rt);
-			if (ia_ro.ro_rt->rt_refcnt <= 1)
-				freeit = 1;
-			else if (flags & LLE_STATIC) {
-				RT_REMREF(ia_ro.ro_rt);
-				target->ia_flags &= ~IFA_RTSELF;
-			}
-			RTFREE_LOCKED(ia_ro.ro_rt);
-		}
-		if (freeit && (flags & LLE_STATIC)) {
+		eia = in_localip_more(target);
+
+		if (eia != NULL) {
+			error = ifa_switch_loopback_route((struct ifaddr *)eia,
+			    (struct sockaddr *)&target->ia_addr);
+			ifa_free(&eia->ia_ifa);
+		} else {
 			error = ifa_del_loopback_route((struct ifaddr *)target,
 			    (struct sockaddr *)&target->ia_addr);
-			if (error == 0)
-				target->ia_flags &= ~IFA_RTSELF;
 		}
-		if ((flags & LLE_STATIC) &&
-			!(target->ia_ifp->if_flags & IFF_NOARP))
+
+		if (!(target->ia_ifp->if_flags & IFF_NOARP))
 			/* remove arp cache */
-			arp_ifscrub(target->ia_ifp, IA_SIN(target)->sin_addr.s_addr);
+			arp_ifscrub(target->ia_ifp,
+			    IA_SIN(target)->sin_addr.s_addr);
 	}
 
 	if (rtinitflags(target)) {
diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index db9a59032d4..986f8b37465 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -43,8 +43,8 @@
 #define	IPPROTO_TCP		6		/* tcp */
 #define	IPPROTO_UDP		17		/* user datagram protocol */
 
-#define	INADDR_ANY		(u_int32_t)0x00000000
-#define	INADDR_BROADCAST	(u_int32_t)0xffffffff	/* must be masked */
+#define	INADDR_ANY		((in_addr_t)0x00000000)
+#define	INADDR_BROADCAST	((in_addr_t)0xffffffff)	/* must be masked */
 
 #ifndef _UINT8_T_DECLARED
 typedef	__uint8_t		uint8_t;
@@ -339,61 +339,61 @@ __END_DECLS
  * On subnets, the decomposition of addresses to host and net parts
  * is done according to subnet mask, not the masks here.
  */
-#define	IN_CLASSA(i)		(((u_int32_t)(i) & 0x80000000) == 0)
+#define	IN_CLASSA(i)		(((in_addr_t)(i) & 0x80000000) == 0)
 #define	IN_CLASSA_NET		0xff000000
 #define	IN_CLASSA_NSHIFT	24
 #define	IN_CLASSA_HOST		0x00ffffff
 #define	IN_CLASSA_MAX		128
 
-#define	IN_CLASSB(i)		(((u_int32_t)(i) & 0xc0000000) == 0x80000000)
+#define	IN_CLASSB(i)		(((in_addr_t)(i) & 0xc0000000) == 0x80000000)
 #define	IN_CLASSB_NET		0xffff0000
 #define	IN_CLASSB_NSHIFT	16
 #define	IN_CLASSB_HOST		0x0000ffff
 #define	IN_CLASSB_MAX		65536
 
-#define	IN_CLASSC(i)		(((u_int32_t)(i) & 0xe0000000) == 0xc0000000)
+#define	IN_CLASSC(i)		(((in_addr_t)(i) & 0xe0000000) == 0xc0000000)
 #define	IN_CLASSC_NET		0xffffff00
 #define	IN_CLASSC_NSHIFT	8
 #define	IN_CLASSC_HOST		0x000000ff
 
-#define	IN_CLASSD(i)		(((u_int32_t)(i) & 0xf0000000) == 0xe0000000)
+#define	IN_CLASSD(i)		(((in_addr_t)(i) & 0xf0000000) == 0xe0000000)
 #define	IN_CLASSD_NET		0xf0000000	/* These ones aren't really */
 #define	IN_CLASSD_NSHIFT	28		/* net and host fields, but */
 #define	IN_CLASSD_HOST		0x0fffffff	/* routing needn't know.    */
 #define	IN_MULTICAST(i)		IN_CLASSD(i)
 
-#define	IN_EXPERIMENTAL(i)	(((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
-#define	IN_BADCLASS(i)		(((u_int32_t)(i) & 0xf0000000) == 0xf0000000)
+#define	IN_EXPERIMENTAL(i)	(((in_addr_t)(i) & 0xf0000000) == 0xf0000000)
+#define	IN_BADCLASS(i)		(((in_addr_t)(i) & 0xf0000000) == 0xf0000000)
 
-#define IN_LINKLOCAL(i)		(((u_int32_t)(i) & 0xffff0000) == 0xa9fe0000)
-#define IN_LOOPBACK(i)		(((u_int32_t)(i) & 0xff000000) == 0x7f000000)
-#define IN_ZERONET(i)		(((u_int32_t)(i) & 0xff000000) == 0)
+#define IN_LINKLOCAL(i)		(((in_addr_t)(i) & 0xffff0000) == 0xa9fe0000)
+#define IN_LOOPBACK(i)		(((in_addr_t)(i) & 0xff000000) == 0x7f000000)
+#define IN_ZERONET(i)		(((in_addr_t)(i) & 0xff000000) == 0)
 
-#define	IN_PRIVATE(i)	((((u_int32_t)(i) & 0xff000000) == 0x0a000000) || \
-			 (((u_int32_t)(i) & 0xfff00000) == 0xac100000) || \
-			 (((u_int32_t)(i) & 0xffff0000) == 0xc0a80000))
+#define	IN_PRIVATE(i)	((((in_addr_t)(i) & 0xff000000) == 0x0a000000) || \
+			 (((in_addr_t)(i) & 0xfff00000) == 0xac100000) || \
+			 (((in_addr_t)(i) & 0xffff0000) == 0xc0a80000))
 
-#define	IN_LOCAL_GROUP(i)	(((u_int32_t)(i) & 0xffffff00) == 0xe0000000)
+#define	IN_LOCAL_GROUP(i)	(((in_addr_t)(i) & 0xffffff00) == 0xe0000000)
  
 #define	IN_ANY_LOCAL(i)		(IN_LINKLOCAL(i) || IN_LOCAL_GROUP(i))
 
-#define	INADDR_LOOPBACK		(u_int32_t)0x7f000001
+#define	INADDR_LOOPBACK		((in_addr_t)0x7f000001)
 #ifndef _KERNEL
-#define	INADDR_NONE		0xffffffff		/* -1 return */
+#define	INADDR_NONE		((in_addr_t)0xffffffff)	/* -1 return */
 #endif
 
-#define	INADDR_UNSPEC_GROUP	(u_int32_t)0xe0000000	/* 224.0.0.0 */
-#define	INADDR_ALLHOSTS_GROUP	(u_int32_t)0xe0000001	/* 224.0.0.1 */
-#define	INADDR_ALLRTRS_GROUP	(u_int32_t)0xe0000002	/* 224.0.0.2 */
-#define	INADDR_ALLRPTS_GROUP	(u_int32_t)0xe0000016	/* 224.0.0.22, IGMPv3 */
-#define	INADDR_CARP_GROUP	(u_int32_t)0xe0000012	/* 224.0.0.18 */
-#define	INADDR_PFSYNC_GROUP	(u_int32_t)0xe00000f0	/* 224.0.0.240 */
-#define	INADDR_ALLMDNS_GROUP	(u_int32_t)0xe00000fb	/* 224.0.0.251 */
-#define	INADDR_MAX_LOCAL_GROUP	(u_int32_t)0xe00000ff	/* 224.0.0.255 */
+#define	INADDR_UNSPEC_GROUP	((in_addr_t)0xe0000000)	/* 224.0.0.0 */
+#define	INADDR_ALLHOSTS_GROUP	((in_addr_t)0xe0000001)	/* 224.0.0.1 */
+#define	INADDR_ALLRTRS_GROUP	((in_addr_t)0xe0000002)	/* 224.0.0.2 */
+#define	INADDR_ALLRPTS_GROUP	((in_addr_t)0xe0000016)	/* 224.0.0.22, IGMPv3 */
+#define	INADDR_CARP_GROUP	((in_addr_t)0xe0000012)	/* 224.0.0.18 */
+#define	INADDR_PFSYNC_GROUP	((in_addr_t)0xe00000f0)	/* 224.0.0.240 */
+#define	INADDR_ALLMDNS_GROUP	((in_addr_t)0xe00000fb)	/* 224.0.0.251 */
+#define	INADDR_MAX_LOCAL_GROUP	((in_addr_t)0xe00000ff)	/* 224.0.0.255 */
 
 #define	IN_LOOPBACKNET		127			/* official! */
 
-#define	IN_RFC3021_MASK		(u_int32_t)0xfffffffe
+#define	IN_RFC3021_MASK		((in_addr_t)0xfffffffe)
 
 /*
  * Options for use with [gs]etsockopt at the IP level.
@@ -603,78 +603,6 @@ int	getsourcefilter(int, uint32_t, struct sockaddr *, socklen_t,
  * Third level is protocol number.
  * Fourth level is desired variable within that protocol.
  */
-#define	IPPROTO_MAXID	(IPPROTO_AH + 1)	/* don't list to IPPROTO_MAX */
-
-#define	CTL_IPPROTO_NAMES { \
-	{ "ip", CTLTYPE_NODE }, \
-	{ "icmp", CTLTYPE_NODE }, \
-	{ "igmp", CTLTYPE_NODE }, \
-	{ "ggp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "tcp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ "egp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "pup", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "udp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "idp", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "ipsec", CTLTYPE_NODE }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ 0, 0 }, \
-	{ "pim", CTLTYPE_NODE }, \
-}
 
 /*
  * Names for IP sysctl objects
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 45c86190107..6559454320c 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet/in_kdtrace.c b/sys/netinet/in_kdtrace.c
index fc39e4396de..d37e3c09ce2 100644
--- a/sys/netinet/in_kdtrace.c
+++ b/sys/netinet/in_kdtrace.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sdt.h>
@@ -39,7 +37,7 @@ SDT_PROVIDER_DEFINE(ip);
 SDT_PROVIDER_DEFINE(tcp);
 SDT_PROVIDER_DEFINE(udp);
 
-SDT_PROBE_DEFINE6_XLATE(ip, , , receive, receive,
+SDT_PROBE_DEFINE6_XLATE(ip, , , receive,
     "void *", "pktinfo_t *",
     "void *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
@@ -47,7 +45,7 @@ SDT_PROBE_DEFINE6_XLATE(ip, , , receive, receive,
     "struct ip *", "ipv4info_t *",
     "struct ip6_hdr *", "ipv6info_t *");
 
-SDT_PROBE_DEFINE6_XLATE(ip, , , send, send,
+SDT_PROBE_DEFINE6_XLATE(ip, , , send,
     "void *", "pktinfo_t *",
     "void *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
@@ -55,56 +53,56 @@ SDT_PROBE_DEFINE6_XLATE(ip, , , send, send,
     "struct ip *", "ipv4info_t *",
     "struct ip6_hdr *", "ipv6info_t *");
 
-SDT_PROBE_DEFINE5_XLATE(tcp, , , accept_established, accept-established,
+SDT_PROBE_DEFINE5_XLATE(tcp, , , accept__established,
     "void *", "pktinfo_t *",
     "struct tcpcb *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
     "struct tcpcb *", "tcpsinfo_t *" ,
     "struct tcphdr *", "tcpinfoh_t *");
 
-SDT_PROBE_DEFINE5_XLATE(tcp, , , accept_refused, accept-refused,
+SDT_PROBE_DEFINE5_XLATE(tcp, , , accept__refused,
     "void *", "pktinfo_t *",
     "struct tcpcb *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
     "struct tcpcb *", "tcpsinfo_t *" ,
     "struct tcphdr *", "tcpinfo_t *");
 
-SDT_PROBE_DEFINE5_XLATE(tcp, , , connect_established, connect-established,
+SDT_PROBE_DEFINE5_XLATE(tcp, , , connect__established,
     "void *", "pktinfo_t *",
     "struct tcpcb *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
     "struct tcpcb *", "tcpsinfo_t *" ,
     "struct tcphdr *", "tcpinfoh_t *");
 
-SDT_PROBE_DEFINE5_XLATE(tcp, , , connect_refused, connect-refused,
+SDT_PROBE_DEFINE5_XLATE(tcp, , , connect__refused,
     "void *", "pktinfo_t *",
     "struct tcpcb *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
     "struct tcpcb *", "tcpsinfo_t *" ,
     "struct tcphdr *", "tcpinfoh_t *");
 
-SDT_PROBE_DEFINE5_XLATE(tcp, , , connect_request, connect-request,
+SDT_PROBE_DEFINE5_XLATE(tcp, , , connect__request,
     "void *", "pktinfo_t *",
     "struct tcpcb *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
     "struct tcpcb *", "tcpsinfo_t *" ,
     "struct tcphdr *", "tcpinfo_t *");
 
-SDT_PROBE_DEFINE5_XLATE(tcp, , , receive, receive,
+SDT_PROBE_DEFINE5_XLATE(tcp, , , receive,
     "void *", "pktinfo_t *",
     "struct tcpcb *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
     "struct tcpcb *", "tcpsinfo_t *" ,
     "struct tcphdr *", "tcpinfoh_t *");
 
-SDT_PROBE_DEFINE5_XLATE(tcp, , , send, send,
+SDT_PROBE_DEFINE5_XLATE(tcp, , , send,
     "void *", "pktinfo_t *",
     "struct tcpcb *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
     "struct tcpcb *", "tcpsinfo_t *" ,
     "struct tcphdr *", "tcpinfo_t *");
 
-SDT_PROBE_DEFINE6_XLATE(tcp, , , state_change, state-change,
+SDT_PROBE_DEFINE6_XLATE(tcp, , , state__change,
     "void *", "void *",
     "struct tcpcb *", "csinfo_t *",
     "void *", "void *",
@@ -112,14 +110,14 @@ SDT_PROBE_DEFINE6_XLATE(tcp, , , state_change, state-change,
     "void *", "void *",
     "int", "tcplsinfo_t *");
 
-SDT_PROBE_DEFINE5_XLATE(udp, , , receive, receive,
+SDT_PROBE_DEFINE5_XLATE(udp, , , receive,
     "void *", "pktinfo_t *",
     "struct inpcb *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
     "struct inpcb *", "udpsinfo_t *",
     "struct udphdr *", "udpinfo_t *");
 
-SDT_PROBE_DEFINE5_XLATE(udp, , , send, send,
+SDT_PROBE_DEFINE5_XLATE(udp, , , send,
     "void *", "pktinfo_t *",
     "struct inpcb *", "csinfo_t *",
     "uint8_t *", "ipinfo_t *",
diff --git a/sys/netinet/in_kdtrace.h b/sys/netinet/in_kdtrace.h
index 1759fac5128..07b3e3a4ca7 100644
--- a/sys/netinet/in_kdtrace.h
+++ b/sys/netinet/in_kdtrace.h
@@ -44,14 +44,14 @@ SDT_PROVIDER_DECLARE(udp);
 SDT_PROBE_DECLARE(ip, , , receive);
 SDT_PROBE_DECLARE(ip, , , send);
 
-SDT_PROBE_DECLARE(tcp, , , accept_established);
-SDT_PROBE_DECLARE(tcp, , , accept_refused);
-SDT_PROBE_DECLARE(tcp, , , connect_established);
-SDT_PROBE_DECLARE(tcp, , , connect_refused);
-SDT_PROBE_DECLARE(tcp, , , connect_request);
+SDT_PROBE_DECLARE(tcp, , , accept__established);
+SDT_PROBE_DECLARE(tcp, , , accept__refused);
+SDT_PROBE_DECLARE(tcp, , , connect__established);
+SDT_PROBE_DECLARE(tcp, , , connect__refused);
+SDT_PROBE_DECLARE(tcp, , , connect__request);
 SDT_PROBE_DECLARE(tcp, , , receive);
 SDT_PROBE_DECLARE(tcp, , , send);
-SDT_PROBE_DECLARE(tcp, , , state_change);
+SDT_PROBE_DECLARE(tcp, , , state__change);
 
 SDT_PROBE_DECLARE(udp, , , receive);
 SDT_PROBE_DECLARE(udp, , , send);
diff --git a/sys/netinet/in_mcast.c b/sys/netinet/in_mcast.c
index 8022c69a9ff..e0f6e4d4ec2 100644
--- a/sys/netinet/in_mcast.c
+++ b/sys/netinet/in_mcast.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/tree.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <net/vnet.h>
@@ -222,6 +223,49 @@ imf_init(struct in_mfilter *imf, const int st0, const int st1)
 	imf->imf_st[1] = st1;
 }
 
+/*
+ * Function for looking up an in_multi record for an IPv4 multicast address
+ * on a given interface. ifp must be valid. If no record found, return NULL.
+ * The IN_MULTI_LOCK and IF_ADDR_LOCK on ifp must be held.
+ */
+struct in_multi *
+inm_lookup_locked(struct ifnet *ifp, const struct in_addr ina)
+{
+	struct ifmultiaddr *ifma;
+	struct in_multi *inm;
+
+	IN_MULTI_LOCK_ASSERT();
+	IF_ADDR_LOCK_ASSERT(ifp);
+
+	inm = NULL;
+	TAILQ_FOREACH(ifma, &((ifp)->if_multiaddrs), ifma_link) {
+		if (ifma->ifma_addr->sa_family == AF_INET) {
+			inm = (struct in_multi *)ifma->ifma_protospec;
+			if (inm->inm_addr.s_addr == ina.s_addr)
+				break;
+			inm = NULL;
+		}
+	}
+	return (inm);
+}
+
+/*
+ * Wrapper for inm_lookup_locked().
+ * The IF_ADDR_LOCK will be taken on ifp and released on return.
+ */
+struct in_multi *
+inm_lookup(struct ifnet *ifp, const struct in_addr ina)
+{
+	struct in_multi *inm;
+
+	IN_MULTI_LOCK_ASSERT();
+	IF_ADDR_RLOCK(ifp);
+	inm = inm_lookup_locked(ifp, ina);
+	IF_ADDR_RUNLOCK(ifp);
+
+	return (inm);
+}
+
 /*
  * Resize the ip_moptions vector to the next power-of-two minus 1.
  * May be called with locks held; do not sleep.
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index eb15a38cc1c..1f4d56fa834 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/vnet.h>
diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c
index b7dc82a29ea..733aa4df1a1 100644
--- a/sys/netinet/in_proto.c
+++ b/sys/netinet/in_proto.c
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
  */
 #ifdef INET
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #ifdef RADIX_MPATH
 #include <net/radix_mpath.h>
diff --git a/sys/netinet/in_rmx.c b/sys/netinet/in_rmx.c
index d09805d58cd..8ce7d6c50b6 100644
--- a/sys/netinet/in_rmx.c
+++ b/sys/netinet/in_rmx.c
@@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/callout.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
@@ -432,15 +433,15 @@ in_ifadownkill(struct radix_node *rn, void *xap)
 	return 0;
 }
 
-int
+void
 in_ifadown(struct ifaddr *ifa, int delete)
 {
 	struct in_ifadown_arg arg;
 	struct radix_node_head *rnh;
 	int	fibnum;
 
-	if (ifa->ifa_addr->sa_family != AF_INET)
-		return 1;
+	KASSERT(ifa->ifa_addr->sa_family == AF_INET,
+	    ("%s: wrong family", __func__));
 
 	for ( fibnum = 0; fibnum < rt_numfibs; fibnum++) {
 		rnh = rt_tables_get_rnh(fibnum, AF_INET);
@@ -451,7 +452,6 @@ in_ifadown(struct ifaddr *ifa, int delete)
 		RADIX_NODE_HEAD_UNLOCK(rnh);
 		ifa->ifa_flags &= ~IFA_ROUTE;		/* XXXlocking? */
 	}
-	return 0;
 }
 
 /*
diff --git a/sys/netinet/in_var.h b/sys/netinet/in_var.h
index 8657dbb7ed1..3a6e9255279 100644
--- a/sys/netinet/in_var.h
+++ b/sys/netinet/in_var.h
@@ -50,6 +50,7 @@ struct in_ifinfo {
 	struct in_multi		*ii_allhosts;	/* 224.0.0.1 membership */
 };
 
+#if defined(_KERNEL) || defined(_WANT_IFADDR)
 /*
  * Interface address, Internet version.  One of these structures
  * is allocated for each Internet address on an interface.
@@ -70,6 +71,7 @@ struct in_ifaddr {
 #define	ia_broadaddr	ia_dstaddr
 	struct	sockaddr_in ia_sockmask; /* reserve space for general netmask */
 };
+#endif
 
 struct	in_aliasreq {
 	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
@@ -361,49 +363,6 @@ extern struct mtx in_multi_mtx;
 #define	IN_MULTI_LOCK_ASSERT()	mtx_assert(&in_multi_mtx, MA_OWNED)
 #define	IN_MULTI_UNLOCK_ASSERT() mtx_assert(&in_multi_mtx, MA_NOTOWNED)
 
-/*
- * Function for looking up an in_multi record for an IPv4 multicast address
- * on a given interface. ifp must be valid. If no record found, return NULL.
- * The IN_MULTI_LOCK and IF_ADDR_LOCK on ifp must be held.
- */
-static __inline struct in_multi *
-inm_lookup_locked(struct ifnet *ifp, const struct in_addr ina)
-{
-	struct ifmultiaddr *ifma;
-	struct in_multi *inm;
-
-	IN_MULTI_LOCK_ASSERT();
-	IF_ADDR_LOCK_ASSERT(ifp);
-
-	inm = NULL;
-	TAILQ_FOREACH(ifma, &((ifp)->if_multiaddrs), ifma_link) {
-		if (ifma->ifma_addr->sa_family == AF_INET) {
-			inm = (struct in_multi *)ifma->ifma_protospec;
-			if (inm->inm_addr.s_addr == ina.s_addr)
-				break;
-			inm = NULL;
-		}
-	}
-	return (inm);
-}
-
-/*
- * Wrapper for inm_lookup_locked().
- * The IF_ADDR_LOCK will be taken on ifp and released on return.
- */
-static __inline struct in_multi *
-inm_lookup(struct ifnet *ifp, const struct in_addr ina)
-{
-	struct in_multi *inm;
-
-	IN_MULTI_LOCK_ASSERT();
-	IF_ADDR_RLOCK(ifp);
-	inm = inm_lookup_locked(ifp, ina);
-	IF_ADDR_RUNLOCK(ifp);
-
-	return (inm);
-}
-
 /* Acquire an in_multi record. */
 static __inline void
 inm_acquire_locked(struct in_multi *inm)
@@ -426,6 +385,8 @@ struct	route;
 struct	ip_moptions;
 struct radix_node_head;
 
+struct in_multi *inm_lookup_locked(struct ifnet *, const struct in_addr);
+struct in_multi *inm_lookup(struct ifnet *, const struct in_addr);
 int	imo_multi_filter(const struct ip_moptions *, const struct ifnet *,
 	    const struct sockaddr *, const struct sockaddr *);
 void	inm_commit(struct in_multi *);
@@ -450,8 +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 *);
-int	in_ifadown(struct ifaddr *ifa, int);
-void	in_ifscrub(struct ifnet *, struct in_ifaddr *, u_int);
+void	in_ifadown(struct ifaddr *ifa, int);
 struct	mbuf	*ip_fastforward(struct mbuf *);
 void	*in_domifattach(struct ifnet *);
 void	in_domifdetach(struct ifnet *, void *);
diff --git a/sys/netinet/ip_carp.c b/sys/netinet/ip_carp.c
index a170e34d32d..b6d14bc1c7f 100644
--- a/sys/netinet/ip_carp.c
+++ b/sys/netinet/ip_carp.c
@@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <net/ethernet.h>
 #include <net/fddi.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_llatbl.h>
 #include <net/if_types.h>
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index e698035669c..89511822040 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
@@ -53,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <net/vnet.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h> 
 
 #include <netinet/in.h>
diff --git a/sys/netinet/ip_fastfwd.c b/sys/netinet/ip_fastfwd.c
index 7d8147566cd..3f92cd7fa5f 100644
--- a/sys/netinet/ip_fastfwd.c
+++ b/sys/netinet/ip_fastfwd.c
@@ -78,7 +78,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ipfw.h"
 #include "opt_ipstealth.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/netinet/ip_gre.c b/sys/netinet/ip_gre.c
index 776820f5db8..e4a84ceac96 100644
--- a/sys/netinet/ip_gre.c
+++ b/sys/netinet/ip_gre.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <net/bpf.h>
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/raw_cb.h>
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index deabf44f7a9..aa7b262547d 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/vnet.h>
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index c265d02b4e2..01ec61762b7 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_ipfw.h"
 #include "opt_ipstealth.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_route.h"
 
 #include <sys/param.h>
@@ -603,7 +602,9 @@ passin:
 		 */
 		if (IA_SIN(ia)->sin_addr.s_addr == ip->ip_dst.s_addr && 
 		    (!checkif || ia->ia_ifp == ifp)) {
-			ifa_ref(&ia->ia_ifa);
+			counter_u64_add(ia->ia_ifa.ifa_ipackets, 1);
+			counter_u64_add(ia->ia_ifa.ifa_ibytes,
+			    m->m_pkthdr.len);
 			/* IN_IFADDR_RUNLOCK(); */
 			goto ours;
 		}
@@ -626,13 +627,17 @@ passin:
 			ia = ifatoia(ifa);
 			if (satosin(&ia->ia_broadaddr)->sin_addr.s_addr ==
 			    ip->ip_dst.s_addr) {
-				ifa_ref(ifa);
+				counter_u64_add(ia->ia_ifa.ifa_ipackets, 1);
+				counter_u64_add(ia->ia_ifa.ifa_ibytes,
+				    m->m_pkthdr.len);
 				IF_ADDR_RUNLOCK(ifp);
 				goto ours;
 			}
 #ifdef BOOTP_COMPAT
 			if (IA_SIN(ia)->sin_addr.s_addr == INADDR_ANY) {
-				ifa_ref(ifa);
+				counter_u64_add(ia->ia_ifa.ifa_ipackets, 1);
+				counter_u64_add(ia->ia_ifa.ifa_ibytes,
+				    m->m_pkthdr.len);
 				IF_ADDR_RUNLOCK(ifp);
 				goto ours;
 			}
@@ -717,20 +722,10 @@ ours:
 	 * IPSTEALTH: Process non-routing options only
 	 * if the packet is destined for us.
 	 */
-	if (V_ipstealth && hlen > sizeof (struct ip) && ip_dooptions(m, 1)) {
-		if (ia != NULL)
-			ifa_free(&ia->ia_ifa);
+	if (V_ipstealth && hlen > sizeof (struct ip) && ip_dooptions(m, 1))
 		return;
-	}
 #endif /* IPSTEALTH */
 
-	/* Count the packet in the ip address stats */
-	if (ia != NULL) {
-		ia->ia_ifa.if_ipackets++;
-		ia->ia_ifa.if_ibytes += m->m_pkthdr.len;
-		ifa_free(&ia->ia_ifa);
-	}
-
 	/*
 	 * Attempt reassembly; if it succeeds, proceed.
 	 * ip_reass() will return a different mbuf.
diff --git a/sys/netinet/ip_ipsec.c b/sys/netinet/ip_ipsec.c
index 526a6de7cc3..ee93d9f96c2 100644
--- a/sys/netinet/ip_ipsec.c
+++ b/sys/netinet/ip_ipsec.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index 3a03defe04c..dfc545ee337 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -96,6 +96,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/counter.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/vnet.h>
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 464c85289e4..6d746ac48a9 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_ipfw.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_mbuf_stress_test.h"
 #include "opt_mpath.h"
 #include "opt_route.h"
@@ -55,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ucred.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_llatbl.h>
 #include <net/netisr.h>
 #include <net/pfil.h>
@@ -610,11 +610,12 @@ passout:
 		 */
 		if (!(flags & IP_FORWARDING) && ia) {
 			if (m->m_pkthdr.csum_flags & CSUM_TSO)
-				ia->ia_ifa.if_opackets +=
-				    m->m_pkthdr.len / m->m_pkthdr.tso_segsz;
+				counter_u64_add(ia->ia_ifa.ifa_opackets,
+				    m->m_pkthdr.len / m->m_pkthdr.tso_segsz);
 			else
-				ia->ia_ifa.if_opackets++;
-			ia->ia_ifa.if_obytes += m->m_pkthdr.len;
+				counter_u64_add(ia->ia_ifa.ifa_opackets, 1);
+
+			counter_u64_add(ia->ia_ifa.ifa_obytes, m->m_pkthdr.len);
 		}
 #ifdef MBUF_STRESS_TEST
 		if (mbuf_frag_size && m->m_pkthdr.len > mbuf_frag_size)
@@ -651,8 +652,9 @@ passout:
 		if (error == 0) {
 			/* Record statistics for this interface address. */
 			if (ia != NULL) {
-				ia->ia_ifa.if_opackets++;
-				ia->ia_ifa.if_obytes += m->m_pkthdr.len;
+				counter_u64_add(ia->ia_ifa.ifa_opackets, 1);
+				counter_u64_add(ia->ia_ifa.ifa_obytes,
+				    m->m_pkthdr.len);
 			}
 			/*
 			 * Reset layer specific mbuf flags
diff --git a/sys/netinet/libalias/alias_db.c b/sys/netinet/libalias/alias_db.c
index 052e04563fa..7df55d04415 100644
--- a/sys/netinet/libalias/alias_db.c
+++ b/sys/netinet/libalias/alias_db.c
@@ -146,6 +146,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/stdarg.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/systm.h>
 #include <sys/lock.h>
 #include <sys/module.h>
 #include <sys/rwlock.h>
diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index eddc69e21f6..84fec9a7ab2 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
@@ -735,9 +736,9 @@ rip_ctlinput(int cmd, struct sockaddr *sa, void *vip)
 				ifa_ref(&ia->ia_ifa);
 				IN_IFADDR_RUNLOCK();
 				/*
-				 * in_ifscrub kills the interface route.
+				 * in_scrubprefix() kills the interface route.
 				 */
-				in_ifscrub(ia->ia_ifp, ia, 0);
+				in_scrubprefix(ia, 0);
 				/*
 				 * in_ifadown gets rid of all the rest of the
 				 * routes.  This is not quite the right thing
@@ -773,16 +774,12 @@ rip_ctlinput(int cmd, struct sockaddr *sa, void *vip)
 			flags |= RTF_HOST;
 
 		err = ifa_del_loopback_route((struct ifaddr *)ia, sa);
-		if (err == 0)
-			ia->ia_flags &= ~IFA_RTSELF;
 
 		err = rtinit(&ia->ia_ifa, RTM_ADD, flags);
 		if (err == 0)
 			ia->ia_flags |= IFA_ROUTE;
 
 		err = ifa_add_loopback_route((struct ifaddr *)ia, sa);
-		if (err == 0)
-			ia->ia_flags |= IFA_RTSELF;
 
 		ifa_free(&ia->ia_ifa);
 		break;
diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c
index a20f966446c..a2daf1800d2 100644
--- a/sys/netinet/sctp_asconf.c
+++ b/sys/netinet/sctp_asconf.c
@@ -150,7 +150,12 @@ sctp_process_asconf_add_ip(struct sockaddr *src, struct sctp_asconf_paramhdr *ap
 	struct mbuf *m_reply = NULL;
 	struct sockaddr_storage sa_store;
 	struct sctp_paramhdr *ph;
-	uint16_t param_type, param_length, aparam_length;
+	uint16_t param_type, aparam_length;
+
+#if defined(INET) || defined(INET6)
+	uint16_t param_length;
+
+#endif
 	struct sockaddr *sa;
 	int zero_address = 0;
 	int bad_address = 0;
@@ -169,8 +174,9 @@ sctp_process_asconf_add_ip(struct sockaddr *src, struct sctp_asconf_paramhdr *ap
 	aparam_length = ntohs(aph->ph.param_length);
 	ph = (struct sctp_paramhdr *)(aph + 1);
 	param_type = ntohs(ph->param_type);
+#if defined(INET) || defined(INET6)
 	param_length = ntohs(ph->param_length);
-
+#endif
 	sa = (struct sockaddr *)&sa_store;
 	switch (param_type) {
 #ifdef INET
@@ -298,7 +304,12 @@ sctp_process_asconf_delete_ip(struct sockaddr *src,
 	struct mbuf *m_reply = NULL;
 	struct sockaddr_storage sa_store;
 	struct sctp_paramhdr *ph;
-	uint16_t param_type, param_length, aparam_length;
+	uint16_t param_type, aparam_length;
+
+#if defined(INET) || defined(INET6)
+	uint16_t param_length;
+
+#endif
 	struct sockaddr *sa;
 	int zero_address = 0;
 	int result;
@@ -317,8 +328,9 @@ sctp_process_asconf_delete_ip(struct sockaddr *src,
 	aparam_length = ntohs(aph->ph.param_length);
 	ph = (struct sctp_paramhdr *)(aph + 1);
 	param_type = ntohs(ph->param_type);
+#if defined(INET) || defined(INET6)
 	param_length = ntohs(ph->param_length);
-
+#endif
 	sa = (struct sockaddr *)&sa_store;
 	switch (param_type) {
 #ifdef INET
@@ -427,7 +439,12 @@ sctp_process_asconf_set_primary(struct sockaddr *src,
 	struct mbuf *m_reply = NULL;
 	struct sockaddr_storage sa_store;
 	struct sctp_paramhdr *ph;
-	uint16_t param_type, param_length, aparam_length;
+	uint16_t param_type, aparam_length;
+
+#if defined(INET) || defined(INET6)
+	uint16_t param_length;
+
+#endif
 	struct sockaddr *sa;
 	int zero_address = 0;
 
@@ -445,8 +462,9 @@ sctp_process_asconf_set_primary(struct sockaddr *src,
 	aparam_length = ntohs(aph->ph.param_length);
 	ph = (struct sctp_paramhdr *)(aph + 1);
 	param_type = ntohs(ph->param_type);
+#if defined(INET) || defined(INET6)
 	param_length = ntohs(ph->param_length);
-
+#endif
 	sa = (struct sockaddr *)&sa_store;
 	switch (param_type) {
 #ifdef INET
@@ -860,10 +878,12 @@ sctp_asconf_addr_match(struct sctp_asconf_addr *aa, struct sockaddr *sa)
 static uint32_t
 sctp_addr_match(struct sctp_paramhdr *ph, struct sockaddr *sa)
 {
+#if defined(INET) || defined(INET6)
 	uint16_t param_type, param_length;
 
 	param_type = ntohs(ph->param_type);
 	param_length = ntohs(ph->param_length);
+#endif
 	switch (sa->sa_family) {
 #ifdef INET6
 	case AF_INET6:
@@ -874,7 +894,7 @@ sctp_addr_match(struct sctp_paramhdr *ph, struct sockaddr *sa)
 
 			v6addr = (struct sctp_ipv6addr_param *)ph;
 			if ((param_type == SCTP_IPV6_ADDRESS) &&
-			    param_length == sizeof(struct sctp_ipv6addr_param) &&
+			    (param_length == sizeof(struct sctp_ipv6addr_param)) &&
 			    (memcmp(&v6addr->addr, &sin6->sin6_addr,
 			    sizeof(struct in6_addr)) == 0)) {
 				return (1);
@@ -890,7 +910,7 @@ sctp_addr_match(struct sctp_paramhdr *ph, struct sockaddr *sa)
 
 			v4addr = (struct sctp_ipv4addr_param *)ph;
 			if ((param_type == SCTP_IPV4_ADDRESS) &&
-			    param_length == sizeof(struct sctp_ipv4addr_param) &&
+			    (param_length == sizeof(struct sctp_ipv4addr_param)) &&
 			    (memcmp(&v4addr->addr, &sin->sin_addr,
 			    sizeof(struct in_addr)) == 0)) {
 				return (1);
@@ -2596,7 +2616,8 @@ sctp_compose_asconf(struct sctp_tcb *stcb, int *retlen, int addr_locked)
 		/* get the parameter length */
 		p_length = SCTP_SIZE32(aa->ap.aph.ph.param_length);
 		/* will it fit in current chunk? */
-		if (SCTP_BUF_LEN(m_asconf) + p_length > stcb->asoc.smallest_mtu) {
+		if ((SCTP_BUF_LEN(m_asconf) + p_length > stcb->asoc.smallest_mtu) ||
+		    (SCTP_BUF_LEN(m_asconf) + p_length > MCLBYTES)) {
 			/* won't fit, so we're done with this chunk */
 			break;
 		}
@@ -2717,7 +2738,7 @@ sctp_compose_asconf(struct sctp_tcb *stcb, int *retlen, int addr_locked)
 	/* chain it all together */
 	SCTP_BUF_NEXT(m_asconf_chk) = m_asconf;
 	*retlen = SCTP_BUF_LEN(m_asconf_chk) + SCTP_BUF_LEN(m_asconf);
-	acp->ch.chunk_length = ntohs(*retlen);
+	acp->ch.chunk_length = htons(*retlen);
 
 	return (m_asconf_chk);
 }
diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c
index 0048856fb27..08b6a4927c1 100644
--- a/sys/netinet/sctp_auth.c
+++ b/sys/netinet/sctp_auth.c
@@ -333,10 +333,6 @@ sctp_generate_random_key(uint32_t keylen)
 {
 	sctp_key_t *new_key;
 
-	/* validate keylen */
-	if (keylen > SCTP_AUTH_RANDOM_SIZE_MAX)
-		keylen = SCTP_AUTH_RANDOM_SIZE_MAX;
-
 	new_key = sctp_alloc_key(keylen);
 	if (new_key == NULL) {
 		/* out of memory */
@@ -374,7 +370,7 @@ sctp_compare_key(sctp_key_t * key1, sctp_key_t * key2)
 	uint32_t i;
 	uint32_t key1len, key2len;
 	uint8_t *key_1, *key_2;
-	uint8_t temp[SCTP_AUTH_RANDOM_SIZE_MAX];
+	uint8_t val1, val2;
 
 	/* sanity/length check */
 	key1len = sctp_get_keylen(key1);
@@ -386,38 +382,24 @@ sctp_compare_key(sctp_key_t * key1, sctp_key_t * key2)
 	else if (key2len == 0)
 		return (1);
 
-	if (key1len != key2len) {
-		if (key1len >= key2len)
-			maxlen = key1len;
-		else
-			maxlen = key2len;
-		bzero(temp, maxlen);
-		if (key1len < maxlen) {
-			/* prepend zeroes to key1 */
-			bcopy(key1->key, temp + (maxlen - key1len), key1len);
-			key_1 = temp;
-			key_2 = key2->key;
-		} else {
-			/* prepend zeroes to key2 */
-			bcopy(key2->key, temp + (maxlen - key2len), key2len);
-			key_1 = key1->key;
-			key_2 = temp;
-		}
+	if (key1len < key2len) {
+		maxlen = key2len;
 	} else {
 		maxlen = key1len;
-		key_1 = key1->key;
-		key_2 = key2->key;
 	}
-
+	key_1 = key1->key;
+	key_2 = key2->key;
+	/* check for numeric equality */
 	for (i = 0; i < maxlen; i++) {
-		if (*key_1 > *key_2)
+		/* left-pad with zeros */
+		val1 = (i < (maxlen - key1len)) ? 0 : *(key_1++);
+		val2 = (i < (maxlen - key2len)) ? 0 : *(key_2++);
+		if (val1 > val2) {
 			return (1);
-		else if (*key_1 < *key_2)
+		} else if (val1 < val2) {
 			return (-1);
-		key_1++;
-		key_2++;
+		}
 	}
-
 	/* keys are equal value, so check lengths */
 	if (key1len == key2len)
 		return (0);
diff --git a/sys/netinet/sctp_auth.h b/sys/netinet/sctp_auth.h
index 154bc13d01c..535c0fc0de1 100644
--- a/sys/netinet/sctp_auth.h
+++ b/sys/netinet/sctp_auth.h
@@ -46,7 +46,6 @@ __FBSDID("$FreeBSD$");
 /* random sizes */
 #define SCTP_AUTH_RANDOM_SIZE_DEFAULT	32
 #define SCTP_AUTH_RANDOM_SIZE_REQUIRED	32
-#define SCTP_AUTH_RANDOM_SIZE_MAX	256
 
 /* union of all supported HMAC algorithm contexts */
 typedef union sctp_hash_context {
diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c
index 74404b99925..520670fa5e3 100644
--- a/sys/netinet/sctp_bsd_addr.c
+++ b/sys/netinet/sctp_bsd_addr.c
@@ -96,22 +96,15 @@ sctp_iterator_thread(void *v SCTP_UNUSED)
 void
 sctp_startup_iterator(void)
 {
-	static int called = 0;
-	int ret;
-
-	if (called) {
+	if (sctp_it_ctl.thread_proc) {
 		/* You only get one */
 		return;
 	}
-	/* init the iterator head */
-	called = 1;
-	sctp_it_ctl.iterator_running = 0;
-	sctp_it_ctl.iterator_flags = 0;
-	sctp_it_ctl.cur_it = NULL;
+	/* Initialize global locks here, thus only once. */
 	SCTP_ITERATOR_LOCK_INIT();
 	SCTP_IPI_ITERATOR_WQ_INIT();
 	TAILQ_INIT(&sctp_it_ctl.iteratorhead);
-	ret = kproc_create(sctp_iterator_thread,
+	kproc_create(sctp_iterator_thread,
 	    (void *)NULL,
 	    &sctp_it_ctl.thread_proc,
 	    RFPROC,
diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h
index 58ca808e98c..7deff39b821 100644
--- a/sys/netinet/sctp_constants.h
+++ b/sys/netinet/sctp_constants.h
@@ -726,7 +726,6 @@ __FBSDID("$FreeBSD$");
 /* small chunk store for looking at chunk_list in auth */
 #define SCTP_SMALL_CHUNK_STORE 260
 
-#define SCTP_DEFAULT_MINSEGMENT 512	/* MTU size ... if no mtu disc */
 #define SCTP_HOW_MANY_SECRETS	2	/* how many secrets I keep */
 
 #define SCTP_NUMBER_OF_SECRETS	8	/* or 8 * 4 = 32 octets */
diff --git a/sys/netinet/sctp_dtrace_declare.h b/sys/netinet/sctp_dtrace_declare.h
index 930a547c578..c5c8f9ce161 100644
--- a/sys/netinet/sctp_dtrace_declare.h
+++ b/sys/netinet/sctp_dtrace_declare.h
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #ifndef _NETINET_SCTP_DTRACE_DECLARE_H_
 #define _NETINET_SCTP_DTRACE_DECLARE_H_
 
-#include "opt_kdtrace.h"
 #include <sys/kernel.h>
 #include <sys/sdt.h>
 
diff --git a/sys/netinet/sctp_dtrace_define.h b/sys/netinet/sctp_dtrace_define.h
index c460c0bf349..f34effbddf5 100644
--- a/sys/netinet/sctp_dtrace_define.h
+++ b/sys/netinet/sctp_dtrace_define.h
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #ifndef _NETINET_SCTP_DTRACE_DEFINE_H_
 #define _NETINET_SCTP_DTRACE_DEFINE_H_
 
-#include "opt_kdtrace.h"
 #include <sys/kernel.h>
 #include <sys/sdt.h>
 
@@ -45,7 +44,7 @@ SDT_PROVIDER_DEFINE(sctp);
 /* Cwnd probe - tracks changes in the congestion window on a netp */
 /********************************************************/
 /* Initial */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, init, init,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, init,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
@@ -56,7 +55,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, init, init,
     "int");		/* The new value of the cwnd */
 
 /* ACK-INCREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, ack, ack,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, ack,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
@@ -67,14 +66,14 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, ack, ack,
     "int");		/* The new value of the cwnd */
 
 /* ACK-INCREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, rttvar, rttvar,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, rttvar,
     "uint64_t",		/* The Vtag << 32 | localport << 16 | remoteport */
     "uint64_t",		/* obw | nbw */
     "uint64_t",		/* bwrtt | newrtt */
     "uint64_t",		/* flight */
     "uint64_t");	/* (cwnd << 32) | point << 16 | retval(0/1) */
 
-SDT_PROBE_DEFINE5(sctp, cwnd, net, rttstep, rttstep,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, rttstep,
     "uint64_t",		/* The Vtag << 32 | localport << 16 | remoteport */
     "uint64_t",		/* obw | nbw */
     "uint64_t",		/* bwrtt | newrtt */
@@ -82,7 +81,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, rttstep, rttstep,
     "uint64_t");	/* (cwnd << 32) | point << 16 | retval(0/1) */
 
 /* FastRetransmit-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, fr, fr,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, fr,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
@@ -93,7 +92,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, fr, fr,
     "int");		/* The new value of the cwnd */
 
 /* TimeOut-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, to, to,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, to,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
@@ -104,7 +103,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, to, to,
     "int");		/* The new value of the cwnd */
 
 /* BurstLimit-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, bl, bl,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, bl,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
@@ -115,7 +114,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, bl, bl,
     "int");		/* The new value of the cwnd */
 
 /* ECN-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, ecn, ecn,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, ecn,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
@@ -126,7 +125,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, ecn, ecn,
     "int");		/* The new value of the cwnd */
 
 /* PacketDrop-DECREASE */
-SDT_PROBE_DEFINE5(sctp, cwnd, net, pd, pd,
+SDT_PROBE_DEFINE5(sctp, cwnd, net, pd,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
@@ -139,7 +138,7 @@ SDT_PROBE_DEFINE5(sctp, cwnd, net, pd, pd,
 /********************************************************/
 /* Rwnd probe - tracks changes in the receiver window for an assoc */
 /********************************************************/
-SDT_PROBE_DEFINE4(sctp, rwnd, assoc, val, val,
+SDT_PROBE_DEFINE4(sctp, rwnd, assoc, val,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
@@ -151,7 +150,7 @@ SDT_PROBE_DEFINE4(sctp, rwnd, assoc, val, val,
 /********************************************************/
 /* flight probe - tracks changes in the flight size on a net or assoc */
 /********************************************************/
-SDT_PROBE_DEFINE5(sctp, flightsize, net, val, val,
+SDT_PROBE_DEFINE5(sctp, flightsize, net, val,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
@@ -164,7 +163,7 @@ SDT_PROBE_DEFINE5(sctp, flightsize, net, val, val,
 /********************************************************/
 /* The total flight version */
 /********************************************************/
-SDT_PROBE_DEFINE4(sctp, flightsize, assoc, val, val,
+SDT_PROBE_DEFINE4(sctp, flightsize, assoc, val,
     "uint32_t",		/* The Vtag for this end */
     "uint32_t",		/*
 			 * The port number of the local side << 16 | port number
diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c
index 26fcf852095..7446170e8aa 100644
--- a/sys/netinet/sctp_indata.c
+++ b/sys/netinet/sctp_indata.c
@@ -1787,7 +1787,6 @@ failed_express_del:
 				asoc->highest_tsn_inside_nr_map = tsn;
 			}
 			SCTP_STAT_INCR(sctps_recvexpressm);
-			control->sinfo_tsn = tsn;
 			asoc->tsn_last_delivered = tsn;
 			asoc->fragment_flags = chunk_flags;
 			asoc->tsn_of_pdapi_last_delivered = tsn;
diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c
index 34edf5b0e60..629109a8f98 100644
--- a/sys/netinet/sctp_output.c
+++ b/sys/netinet/sctp_output.c
@@ -1937,10 +1937,13 @@ sctp_is_address_in_scope(struct sctp_ifa *ifa,
 static struct mbuf *
 sctp_add_addr_to_mbuf(struct mbuf *m, struct sctp_ifa *ifa, uint16_t * len)
 {
+#if defined(INET) || defined(INET6)
 	struct sctp_paramhdr *parmh;
 	struct mbuf *mret;
 	uint16_t plen;
 
+#endif
+
 	switch (ifa->address.sa.sa_family) {
 #ifdef INET
 	case AF_INET:
@@ -1955,6 +1958,7 @@ sctp_add_addr_to_mbuf(struct mbuf *m, struct sctp_ifa *ifa, uint16_t * len)
 	default:
 		return (m);
 	}
+#if defined(INET) || defined(INET6)
 	if (M_TRAILINGSPACE(m) >= plen) {
 		/* easy side we just drop it on the end */
 		parmh = (struct sctp_paramhdr *)(SCTP_BUF_AT(m, SCTP_BUF_LEN(m)));
@@ -2015,6 +2019,7 @@ sctp_add_addr_to_mbuf(struct mbuf *m, struct sctp_ifa *ifa, uint16_t * len)
 		*len += plen;
 	}
 	return (mret);
+#endif
 }
 
 
@@ -3384,7 +3389,11 @@ sctp_find_cmsg(int c_type, void *data, struct mbuf *control, size_t cpsize)
 						return (found);
 					}
 					m_copydata(control, at + CMSG_ALIGN(sizeof(cmh)), sizeof(struct sctp_prinfo), (caddr_t)&prinfo);
-					sndrcvinfo->sinfo_timetolive = prinfo.pr_value;
+					if (prinfo.pr_policy != SCTP_PR_SCTP_NONE) {
+						sndrcvinfo->sinfo_timetolive = prinfo.pr_value;
+					} else {
+						sndrcvinfo->sinfo_timetolive = 0;
+					}
 					sndrcvinfo->sinfo_flags |= prinfo.pr_policy;
 					break;
 				case SCTP_AUTHINFO:
@@ -3855,8 +3864,11 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
 	struct sctphdr *sctphdr;
 	int packet_length;
 	int ret;
+
+#if defined(INET) || defined(INET6)
 	uint32_t vrf_id;
 
+#endif
 #if defined(INET) || defined(INET6)
 	struct mbuf *o_pak;
 	sctp_route_t *ro = NULL;
@@ -3875,12 +3887,13 @@ sctp_lowlevel_chunk_output(struct sctp_inpcb *inp,
 		sctp_m_freem(m);
 		return (EFAULT);
 	}
+#if defined(INET) || defined(INET6)
 	if (stcb) {
 		vrf_id = stcb->asoc.vrf_id;
 	} else {
 		vrf_id = inp->def_vrf_id;
 	}
-
+#endif
 	/* fill in the HMAC digest for any AUTH chunk in the packet */
 	if ((auth != NULL) && (stcb != NULL)) {
 		sctp_fill_hmac_digest_m(m, auth_offset, auth, stcb, auth_keyid);
@@ -6069,13 +6082,13 @@ sctp_set_prsctp_policy(struct sctp_stream_queue_pending *sp)
 {
 	/*
 	 * We assume that the user wants PR_SCTP_TTL if the user provides a
-	 * positive lifetime but does not specify any PR_SCTP policy. This
-	 * is a BAD assumption and causes problems at least with the
-	 * U-Vancovers MPI folks. I will change this to be no policy means
-	 * NO PR-SCTP.
+	 * positive lifetime but does not specify any PR_SCTP policy.
 	 */
 	if (PR_SCTP_ENABLED(sp->sinfo_flags)) {
 		sp->act_flags |= PR_SCTP_POLICY(sp->sinfo_flags);
+	} else if (sp->timetolive > 0) {
+		sp->sinfo_flags |= SCTP_PR_SCTP_TTL;
+		sp->act_flags |= PR_SCTP_POLICY(sp->sinfo_flags);
 	} else {
 		return;
 	}
@@ -10798,8 +10811,12 @@ sctp_send_resp_msg(struct sockaddr *src, struct sockaddr *dst,
 	struct sctphdr *shout;
 	struct sctp_chunkhdr *ch;
 	struct udphdr *udp;
-	int len, cause_len, padding_len, ret;
+	int len, cause_len, padding_len;
 
+#if defined(INET) || defined(INET6)
+	int ret;
+
+#endif
 #ifdef INET
 	struct sockaddr_in *src_sin, *dst_sin;
 	struct ip *ip;
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 95d87711a1a..88dd145a85b 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -827,18 +827,30 @@ out_now:
 static int
 sctp_does_stcb_own_this_addr(struct sctp_tcb *stcb, struct sockaddr *to)
 {
-	int loopback_scope, ipv4_local_scope, local_scope, site_scope;
-	int ipv4_addr_legal, ipv6_addr_legal;
+	int loopback_scope;
+
+#if defined(INET)
+	int ipv4_local_scope, ipv4_addr_legal;
+
+#endif
+#if defined(INET6)
+	int local_scope, site_scope, ipv6_addr_legal;
+
+#endif
 	struct sctp_vrf *vrf;
 	struct sctp_ifn *sctp_ifn;
 	struct sctp_ifa *sctp_ifa;
 
 	loopback_scope = stcb->asoc.scope.loopback_scope;
+#if defined(INET)
 	ipv4_local_scope = stcb->asoc.scope.ipv4_local_scope;
+	ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal;
+#endif
+#if defined(INET6)
 	local_scope = stcb->asoc.scope.local_scope;
 	site_scope = stcb->asoc.scope.site_scope;
-	ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal;
 	ipv6_addr_legal = stcb->asoc.scope.ipv6_addr_legal;
+#endif
 
 	SCTP_IPI_ADDR_RLOCK();
 	vrf = sctp_find_vrf(stcb->asoc.vrf_id);
@@ -863,6 +875,9 @@ sctp_does_stcb_own_this_addr(struct sctp_tcb *stcb, struct sockaddr *to)
 					 */
 					continue;
 				}
+				if (sctp_ifa->address.sa.sa_family != to->sa_family) {
+					continue;
+				}
 				switch (sctp_ifa->address.sa.sa_family) {
 #ifdef INET
 				case AF_INET:
@@ -1971,8 +1986,13 @@ sctp_findassociation_special_addr(struct mbuf *m, int offset,
     struct sockaddr *dst)
 {
 	struct sctp_paramhdr *phdr, parm_buf;
+
+#if defined(INET) || defined(INET6)
 	struct sctp_tcb *stcb;
-	uint32_t ptype, plen;
+	uint16_t ptype;
+
+#endif
+	uint16_t plen;
 
 #ifdef INET
 	struct sockaddr_in sin4;
@@ -1996,13 +2016,14 @@ sctp_findassociation_special_addr(struct mbuf *m, int offset,
 	sin6.sin6_port = sh->src_port;
 #endif
 
-	stcb = NULL;
 	offset += sizeof(struct sctp_init_chunk);
 
 	phdr = sctp_get_next_param(m, offset, &parm_buf, sizeof(parm_buf));
 	while (phdr != NULL) {
 		/* now we must see if we want the parameter */
+#if defined(INET) || defined(INET6)
 		ptype = ntohs(phdr->param_type);
+#endif
 		plen = ntohs(phdr->param_length);
 		if (plen == 0) {
 			break;
@@ -3740,7 +3761,7 @@ sctp_add_remote_addr(struct sctp_tcb *stcb, struct sockaddr *newaddr,
 			sin->sin_len = sizeof(struct sockaddr_in);
 			if (set_scope) {
 #ifdef SCTP_DONT_DO_PRIVADDR_SCOPE
-				stcb->ipv4_local_scope = 1;
+				stcb->asoc.scope.ipv4_local_scope = 1;
 #else
 				if (IN4_ISPRIVATE_ADDRESS(&sin->sin_addr)) {
 					stcb->asoc.scope.ipv4_local_scope = 1;
@@ -4314,6 +4335,7 @@ sctp_aloc_assoc(struct sctp_inpcb *inp, struct sockaddr *firstaddr,
 			asoc->nr_mapping_array = NULL;
 		}
 		SCTP_DECR_ASOC_COUNT();
+		SCTP_TCB_UNLOCK(stcb);
 		SCTP_TCB_LOCK_DESTROY(stcb);
 		SCTP_TCB_SEND_LOCK_DESTROY(stcb);
 		LIST_REMOVE(stcb, sctp_tcbasocidhash);
@@ -5116,6 +5138,7 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int from_inpcbfre
 	/* Insert new items here :> */
 
 	/* Get rid of LOCK */
+	SCTP_TCB_UNLOCK(stcb);
 	SCTP_TCB_LOCK_DESTROY(stcb);
 	SCTP_TCB_SEND_LOCK_DESTROY(stcb);
 	if (from_inpcbfree == SCTP_NORMAL_PROC) {
@@ -5841,7 +5864,6 @@ sctp_pcb_init()
 	for (i = 0; i < SCTP_STACK_VTAG_HASH_SIZE; i++) {
 		LIST_INIT(&SCTP_BASE_INFO(vtag_timewait)[i]);
 	}
-
 	sctp_startup_iterator();
 
 #if defined(__FreeBSD__) && defined(SCTP_MCORE_INPUT) && defined(SMP)
@@ -5870,35 +5892,31 @@ sctp_pcb_finish(void)
 	struct sctp_tagblock *twait_block, *prev_twait_block;
 	struct sctp_laddr *wi, *nwi;
 	int i;
+	struct sctp_iterator *it, *nit;
 
 	/*
-	 * Free BSD the it thread never exits but we do clean up. The only
-	 * way freebsd reaches here if we have VRF's but we still add the
-	 * ifdef to make it compile on old versions.
+	 * In FreeBSD the iterator thread never exits but we do clean up.
+	 * The only way FreeBSD reaches here is if we have VRF's but we
+	 * still add the ifdef to make it compile on old versions.
 	 */
-	{
-		struct sctp_iterator *it, *nit;
-
-		SCTP_IPI_ITERATOR_WQ_LOCK();
-		TAILQ_FOREACH_SAFE(it, &sctp_it_ctl.iteratorhead, sctp_nxt_itr, nit) {
-			if (it->vn != curvnet) {
-				continue;
-			}
-			TAILQ_REMOVE(&sctp_it_ctl.iteratorhead, it, sctp_nxt_itr);
-			if (it->function_atend != NULL) {
-				(*it->function_atend) (it->pointer, it->val);
-			}
-			SCTP_FREE(it, SCTP_M_ITER);
+	SCTP_IPI_ITERATOR_WQ_LOCK();
+	TAILQ_FOREACH_SAFE(it, &sctp_it_ctl.iteratorhead, sctp_nxt_itr, nit) {
+		if (it->vn != curvnet) {
+			continue;
 		}
-		SCTP_IPI_ITERATOR_WQ_UNLOCK();
-		SCTP_ITERATOR_LOCK();
-		if ((sctp_it_ctl.cur_it) &&
-		    (sctp_it_ctl.cur_it->vn == curvnet)) {
-			sctp_it_ctl.iterator_flags |= SCTP_ITERATOR_STOP_CUR_IT;
+		TAILQ_REMOVE(&sctp_it_ctl.iteratorhead, it, sctp_nxt_itr);
+		if (it->function_atend != NULL) {
+			(*it->function_atend) (it->pointer, it->val);
 		}
-		SCTP_ITERATOR_UNLOCK();
+		SCTP_FREE(it, SCTP_M_ITER);
 	}
-
+	SCTP_IPI_ITERATOR_WQ_UNLOCK();
+	SCTP_ITERATOR_LOCK();
+	if ((sctp_it_ctl.cur_it) &&
+	    (sctp_it_ctl.cur_it->vn == curvnet)) {
+		sctp_it_ctl.iterator_flags |= SCTP_ITERATOR_STOP_CUR_IT;
+	}
+	SCTP_ITERATOR_UNLOCK();
 	SCTP_OS_TIMER_STOP(&SCTP_BASE_INFO(addr_wq_timer.timer));
 	SCTP_WQ_ADDR_LOCK();
 	LIST_FOREACH_SAFE(wi, &SCTP_BASE_INFO(addr_wq), sctp_nxt_addr, nwi) {
diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c
index 833c94a062a..188b0868db8 100644
--- a/sys/netinet/sctp_timer.c
+++ b/sys/netinet/sctp_timer.c
@@ -552,7 +552,7 @@ start_again:
 	TAILQ_FOREACH_SAFE(chk, &stcb->asoc.sent_queue, sctp_next, nchk) {
 		if (SCTP_TSN_GE(stcb->asoc.last_acked_seq, chk->rec.data.TSN_seq)) {
 			/* Strange case our list got out of order? */
-			SCTP_PRINTF("Our list is out of order? last_acked:%x chk:%x",
+			SCTP_PRINTF("Our list is out of order? last_acked:%x chk:%x\n",
 			    (unsigned int)stcb->asoc.last_acked_seq, (unsigned int)chk->rec.data.TSN_seq);
 			recovery_cnt++;
 #ifdef INVARIANTS
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c
index d36698546d3..0ff166c5e24 100644
--- a/sys/netinet/sctp_usrreq.c
+++ b/sys/netinet/sctp_usrreq.c
@@ -1120,9 +1120,17 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
 {
 	struct sctp_ifn *sctp_ifn;
 	struct sctp_ifa *sctp_ifa;
-	int loopback_scope, ipv4_local_scope, local_scope, site_scope;
 	size_t actual;
-	int ipv4_addr_legal, ipv6_addr_legal;
+	int loopback_scope;
+
+#if defined(INET)
+	int ipv4_local_scope, ipv4_addr_legal;
+
+#endif
+#if defined(INET6)
+	int local_scope, site_scope, ipv6_addr_legal;
+
+#endif
 	struct sctp_vrf *vrf;
 
 	actual = 0;
@@ -1132,27 +1140,43 @@ sctp_fill_up_addresses_vrf(struct sctp_inpcb *inp,
 	if (stcb) {
 		/* Turn on all the appropriate scope */
 		loopback_scope = stcb->asoc.scope.loopback_scope;
+#if defined(INET)
 		ipv4_local_scope = stcb->asoc.scope.ipv4_local_scope;
+		ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal;
+#endif
+#if defined(INET6)
 		local_scope = stcb->asoc.scope.local_scope;
 		site_scope = stcb->asoc.scope.site_scope;
-		ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal;
 		ipv6_addr_legal = stcb->asoc.scope.ipv6_addr_legal;
+#endif
 	} else {
 		/* Use generic values for endpoints. */
 		loopback_scope = 1;
+#if defined(INET)
 		ipv4_local_scope = 1;
+#endif
+#if defined(INET6)
 		local_scope = 1;
 		site_scope = 1;
+#endif
 		if (inp->sctp_flags & SCTP_PCB_FLAGS_BOUND_V6) {
+#if defined(INET6)
 			ipv6_addr_legal = 1;
+#endif
+#if defined(INET)
 			if (SCTP_IPV6_V6ONLY(inp)) {
 				ipv4_addr_legal = 0;
 			} else {
 				ipv4_addr_legal = 1;
 			}
+#endif
 		} else {
+#if defined(INET6)
 			ipv6_addr_legal = 0;
+#endif
+#if defined(INET)
 			ipv4_addr_legal = 1;
+#endif
 		}
 	}
 	vrf = sctp_find_vrf(vrf_id);
@@ -3281,7 +3305,7 @@ flags_out:
 				}
 			}
 			if (error == 0) {
-				*optsize = sizeof(struct sctp_paddrparams);
+				*optsize = sizeof(struct sctp_udpencaps);
 			}
 			break;
 		}
@@ -4796,11 +4820,9 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 							    SCTP_FROM_SCTP_USRREQ + SCTP_LOC_10);
 						}
 						net->dest_state |= SCTP_ADDR_NO_PMTUD;
-						if (paddrp->spp_pathmtu > SCTP_DEFAULT_MINSEGMENT) {
-							net->mtu = paddrp->spp_pathmtu + ovh;
-							if (net->mtu < stcb->asoc.smallest_mtu) {
-								sctp_pathmtu_adjustment(stcb, net->mtu);
-							}
+						net->mtu = paddrp->spp_pathmtu + ovh;
+						if (net->mtu < stcb->asoc.smallest_mtu) {
+							sctp_pathmtu_adjustment(stcb, net->mtu);
 						}
 					}
 					if (paddrp->spp_flags & SPP_PMTUD_ENABLE) {
@@ -4920,11 +4942,9 @@ sctp_setopt(struct socket *so, int optname, void *optval, size_t optsize,
 								    SCTP_FROM_SCTP_USRREQ + SCTP_LOC_10);
 							}
 							net->dest_state |= SCTP_ADDR_NO_PMTUD;
-							if (paddrp->spp_pathmtu > SCTP_DEFAULT_MINSEGMENT) {
-								net->mtu = paddrp->spp_pathmtu + ovh;
-								if (net->mtu < stcb->asoc.smallest_mtu) {
-									sctp_pathmtu_adjustment(stcb, net->mtu);
-								}
+							net->mtu = paddrp->spp_pathmtu + ovh;
+							if (net->mtu < stcb->asoc.smallest_mtu) {
+								sctp_pathmtu_adjustment(stcb, net->mtu);
 							}
 						}
 						sctp_stcb_feature_on(inp, stcb, SCTP_PCB_FLAGS_DO_NOT_PMTUD);
diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c
index c101118b992..567bf1ce1d6 100644
--- a/sys/netinet/sctputil.c
+++ b/sys/netinet/sctputil.c
@@ -2602,7 +2602,7 @@ sctp_notify_assoc_change(uint16_t state, struct sctp_tcb *stcb,
 	if (sctp_stcb_is_feature_on(stcb->sctp_ep, stcb, SCTP_PCB_FLAGS_RECVASSOCEVNT)) {
 		notif_len = sizeof(struct sctp_assoc_change);
 		if (abort != NULL) {
-			abort_len = htons(abort->ch.chunk_length);
+			abort_len = ntohs(abort->ch.chunk_length);
 		} else {
 			abort_len = 0;
 		}
@@ -3474,7 +3474,7 @@ sctp_notify_remote_error(struct sctp_tcb *stcb, uint16_t error, struct sctp_erro
 		return;
 	}
 	if (chunk != NULL) {
-		chunk_len = htons(chunk->ch.chunk_length);
+		chunk_len = ntohs(chunk->ch.chunk_length);
 	} else {
 		chunk_len = 0;
 	}
@@ -6612,8 +6612,16 @@ sctp_bindx_delete_address(struct sctp_inpcb *inp,
 int
 sctp_local_addr_count(struct sctp_tcb *stcb)
 {
-	int loopback_scope, ipv4_local_scope, local_scope, site_scope;
-	int ipv4_addr_legal, ipv6_addr_legal;
+	int loopback_scope;
+
+#if defined(INET)
+	int ipv4_local_scope, ipv4_addr_legal;
+
+#endif
+#if defined (INET6)
+	int local_scope, site_scope, ipv6_addr_legal;
+
+#endif
 	struct sctp_vrf *vrf;
 	struct sctp_ifn *sctp_ifn;
 	struct sctp_ifa *sctp_ifa;
@@ -6621,11 +6629,15 @@ sctp_local_addr_count(struct sctp_tcb *stcb)
 
 	/* Turn on all the appropriate scopes */
 	loopback_scope = stcb->asoc.scope.loopback_scope;
+#if defined(INET)
 	ipv4_local_scope = stcb->asoc.scope.ipv4_local_scope;
+	ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal;
+#endif
+#if defined(INET6)
 	local_scope = stcb->asoc.scope.local_scope;
 	site_scope = stcb->asoc.scope.site_scope;
-	ipv4_addr_legal = stcb->asoc.scope.ipv4_addr_legal;
 	ipv6_addr_legal = stcb->asoc.scope.ipv6_addr_legal;
+#endif
 	SCTP_IPI_ADDR_RLOCK();
 	vrf = sctp_find_vrf(stcb->asoc.vrf_id);
 	if (vrf == NULL) {
diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c
index 886be0685d1..c838d7ae1e1 100644
--- a/sys/netinet/siftr.c
+++ b/sys/netinet/siftr.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/alq.h>
 #include <sys/errno.h>
+#include <sys/eventhandler.h>
 #include <sys/hash.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
@@ -81,6 +82,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/unistd.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/pfil.h>
 
 #include <netinet/in.h>
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c
index 3a53aa448d1..d5332352989 100644
--- a/sys/netinet/tcp_hostcache.c
+++ b/sys/netinet/tcp_hostcache.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 0d7eb193349..b9e0f42cd15 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
@@ -77,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
@@ -508,10 +508,13 @@ do { \
  *	  the ack that opens up a 0-sized window and
  *		- delayed acks are enabled or
  *		- this is a half-synchronized T/TCP connection.
+ *	- the segment size is not larger than the MSS and LRO wasn't used
+ *	  for this segment.
  */
-#define DELAY_ACK(tp)							\
+#define DELAY_ACK(tp, tlen)						\
 	((!tcp_timer_active(tp, TT_DELACK) &&				\
 	    (tp->t_flags & TF_RXWIN0SENT) == 0) &&			\
+	    (tlen <= tp->t_maxopd) &&					\
 	    (V_tcp_delack_enabled || (tp->t_flags & TF_NEEDSYN)))
 
 /*
@@ -1390,7 +1393,7 @@ relocked:
 	}
 #endif
 
-	TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
+	TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
 
 	/*
 	 * Segment belongs to a connection in SYN_SENT, ESTABLISHED or later
@@ -1402,7 +1405,7 @@ relocked:
 	return;
 
 dropwithreset:
-	TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
+	TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
 
 	if (ti_locked == TI_WLOCKED) {
 		INP_INFO_WUNLOCK(&V_tcbinfo);
@@ -1426,7 +1429,7 @@ dropwithreset:
 
 dropunlock:
 	if (m != NULL)
-		TCP_PROBE5(receive, NULL, tp, m->m_data, tp, th);
+		TCP_PROBE5(receive, NULL, tp, mtod(m, const char *), tp, th);
 
 	if (ti_locked == TI_WLOCKED) {
 		INP_INFO_WUNLOCK(&V_tcbinfo);
@@ -1461,6 +1464,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 	u_long tiwin;
 	char *s;
 	struct in_conninfo *inc;
+	struct mbuf *mfree;
 	struct tcpopt to;
 
 #ifdef TCPDEBUG
@@ -1862,7 +1866,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 			}
 			/* NB: sorwakeup_locked() does an implicit unlock. */
 			sorwakeup_locked(so);
-			if (DELAY_ACK(tp)) {
+			if (DELAY_ACK(tp, tlen)) {
 				tp->t_flags |= TF_DELACK;
 			} else {
 				tp->t_flags |= TF_ACKNOW;
@@ -1924,8 +1928,8 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 			goto dropwithreset;
 		}
 		if ((thflags & (TH_ACK|TH_RST)) == (TH_ACK|TH_RST)) {
-			TCP_PROBE5(connect_refused, NULL, tp, m->m_data, tp,
-			    th);
+			TCP_PROBE5(connect__refused, NULL, tp,
+			    mtod(m, const char *), tp, th);
 			tp = tcp_drop(tp, ECONNREFUSED);
 		}
 		if (thflags & TH_RST)
@@ -1953,7 +1957,7 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 			 * If there's data, delay ACK; if there's also a FIN
 			 * ACKNOW will be turned on later.
 			 */
-			if (DELAY_ACK(tp) && tlen != 0)
+			if (DELAY_ACK(tp, tlen) && tlen != 0)
 				tcp_timer_activate(tp, TT_DELACK,
 				    tcp_delacktime);
 			else
@@ -1977,8 +1981,8 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 				thflags &= ~TH_SYN;
 			} else {
 				tcp_state_change(tp, TCPS_ESTABLISHED);
-				TCP_PROBE5(connect_established, NULL, tp,
-				    m->m_data, tp, th);
+				TCP_PROBE5(connect__established, NULL, tp,
+				    mtod(m, const char *), tp, th);
 				cc_conn_init(tp);
 				tcp_timer_activate(tp, TT_KEEP,
 				    TP_KEEPIDLE(tp));
@@ -2383,8 +2387,8 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 			tp->t_flags &= ~TF_NEEDFIN;
 		} else {
 			tcp_state_change(tp, TCPS_ESTABLISHED);
-			TCP_PROBE5(accept_established, NULL, tp, m->m_data, tp,
-			    th);
+			TCP_PROBE5(accept__established, NULL, tp,
+			    mtod(m, const char *), tp, th);
 			cc_conn_init(tp);
 			tcp_timer_activate(tp, TT_KEEP, TP_KEEPIDLE(tp));
 		}
@@ -2425,13 +2429,15 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so,
 		hhook_run_tcp_est_in(tp, th, &to);
 
 		if (SEQ_LEQ(th->th_ack, tp->snd_una)) {
-			if (tlen == 0 && tiwin == tp->snd_wnd) {
+			if (tlen == 0 && tiwin == tp->snd_wnd &&
+			    !(thflags & TH_FIN)) {
 				TCPSTAT_INC(tcps_rcvdupack);
 				/*
 				 * If we have outstanding data (other than
 				 * a window probe), this is a completely
 				 * duplicate ack (ie, window info didn't
-				 * change), the ack is the biggest we've
+				 * change and FIN isn't set),
+				 * the ack is the biggest we've
 				 * seen and we've seen exactly our rexmt
 				 * threshhold of them, assume a packet
 				 * has been dropped and retransmit it.
@@ -2718,15 +2724,17 @@ process_ACK:
 		SOCKBUF_LOCK(&so->so_snd);
 		if (acked > so->so_snd.sb_cc) {
 			tp->snd_wnd -= so->so_snd.sb_cc;
-			sbdrop_locked(&so->so_snd, (int)so->so_snd.sb_cc);
+			mfree = sbcut_locked(&so->so_snd,
+			    (int)so->so_snd.sb_cc);
 			ourfinisacked = 1;
 		} else {
-			sbdrop_locked(&so->so_snd, acked);
+			mfree = sbcut_locked(&so->so_snd, acked);
 			tp->snd_wnd -= acked;
 			ourfinisacked = 0;
 		}
 		/* NB: sowwakeup_locked() does an implicit unlock. */
 		sowwakeup_locked(so);
+		m_freem(mfree);
 		/* Detect una wraparound. */
 		if (!IN_RECOVERY(tp->t_flags) &&
 		    SEQ_GT(tp->snd_una, tp->snd_recover) &&
@@ -2923,7 +2931,7 @@ dodata:							/* XXX */
 		if (th->th_seq == tp->rcv_nxt &&
 		    LIST_EMPTY(&tp->t_segq) &&
 		    TCPS_HAVEESTABLISHED(tp->t_state)) {
-			if (DELAY_ACK(tp))
+			if (DELAY_ACK(tp, tlen))
 				tp->t_flags |= TF_DELACK;
 			else
 				tp->t_flags |= TF_ACKNOW;
diff --git a/sys/netinet/tcp_offload.c b/sys/netinet/tcp_offload.c
index b7724181820..683e2121c17 100644
--- a/sys/netinet/tcp_offload.c
+++ b/sys/netinet/tcp_offload.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 #include <sys/sockopt.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_pcb.h>
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 00d541596b0..6c55f101d5f 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
@@ -1185,7 +1184,7 @@ send:
 		ip6->ip6_plen = htons(m->m_pkthdr.len - sizeof(*ip6));
 
 		if (tp->t_state == TCPS_SYN_SENT)
-			TCP_PROBE5(connect_request, NULL, tp, ip6, tp, th);
+			TCP_PROBE5(connect__request, NULL, tp, ip6, tp, th);
 
 		TCP_PROBE5(send, NULL, tp, ip6, tp, th);
 
@@ -1224,7 +1223,7 @@ send:
 		ip->ip_off |= htons(IP_DF);
 
 	if (tp->t_state == TCPS_SYN_SENT)
-		TCP_PROBE5(connect_request, NULL, tp, ip, tp, th);
+		TCP_PROBE5(connect__request, NULL, tp, ip, tp, th);
 
 	TCP_PROBE5(send, NULL, tp, ip, tp, th);
 
diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c
index 5fd29b831c4..cc87c88f1cb 100644
--- a/sys/netinet/tcp_reass.c
+++ b/sys/netinet/tcp_reass.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet/tcp_sack.c b/sys/netinet/tcp_sack.c
index 440bd641a6c..bc9c6796b03 100644
--- a/sys/netinet/tcp_sack.c
+++ b/sys/netinet/tcp_sack.c
@@ -95,6 +95,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 5d37b504707..52e5a447afd 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_tcpdebug.h"
 
 #include <sys/param.h>
@@ -64,6 +63,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/route.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/vnet.h>
 
 #include <netinet/cc.h>
@@ -431,6 +431,7 @@ tcp_init(void)
 void
 tcp_destroy(void)
 {
+	int error;
 
 	tcp_reass_destroy();
 	tcp_hc_destroy();
@@ -439,6 +440,19 @@ tcp_destroy(void)
 	in_pcbinfo_destroy(&V_tcbinfo);
 	uma_zdestroy(V_sack_hole_zone);
 	uma_zdestroy(V_tcpcb_zone);
+
+	error = hhook_head_deregister(V_tcp_hhh[HHOOK_TCP_EST_IN]);
+	if (error != 0) {
+		printf("%s: WARNING: unable to deregister helper hook "
+		    "type=%d, id=%d: error %d returned\n", __func__,
+		    HHOOK_TYPE_TCP, HHOOK_TCP_EST_IN, error);
+	}
+	error = hhook_head_deregister(V_tcp_hhh[HHOOK_TCP_EST_OUT]);
+	if (error != 0) {
+		printf("%s: WARNING: unable to deregister helper hook "
+		    "type=%d, id=%d: error %d returned\n", __func__,
+		    HHOOK_TYPE_TCP, HHOOK_TCP_EST_OUT, error);
+	}
 }
 #endif
 
@@ -706,9 +720,10 @@ tcp_respond(struct tcpcb *tp, void *ipgen, struct tcphdr *th, struct mbuf *m,
 		tcp_trace(TA_OUTPUT, 0, tp, mtod(m, void *), th, 0);
 #endif
 	if (flags & TH_RST)
-		TCP_PROBE5(accept_refused, NULL, NULL, m->m_data, tp, nth);
+		TCP_PROBE5(accept__refused, NULL, NULL, mtod(m, const char *),
+		    tp, nth);
 
-	TCP_PROBE5(send, NULL, tp, m->m_data, tp, nth);
+	TCP_PROBE5(send, NULL, tp, mtod(m, const char *), tp, nth);
 #ifdef INET6
 	if (isipv6)
 		(void) ip6_output(m, NULL, NULL, ipflags, NULL, NULL, inp);
@@ -2397,5 +2412,5 @@ tcp_state_change(struct tcpcb *tp, int newstate)
 #endif
 
 	tp->t_state = newstate;
-	TCP_PROBE6(state_change, NULL, tp, NULL, tp, NULL, pstate);
+	TCP_PROBE6(state__change, NULL, tp, NULL, tp, NULL, pstate);
 }
diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c
index 1c27d7a0218..29d9d531012 100644
--- a/sys/netinet/tcp_syncache.c
+++ b/sys/netinet/tcp_syncache.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c
index 7e6128b46fd..f8c3f45c606 100644
--- a/sys/netinet/tcp_timewait.c
+++ b/sys/netinet/tcp_timewait.c
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/route.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 88755e739dd..0188beb50f7 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -64,6 +64,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
@@ -1584,6 +1585,27 @@ unlock_and_done:
 			INP_WUNLOCK(inp);
 			error = sooptcopyout(sopt, buf, TCP_CA_NAME_MAX);
 			break;
+		case TCP_KEEPIDLE:
+		case TCP_KEEPINTVL:
+		case TCP_KEEPINIT:
+		case TCP_KEEPCNT:
+			switch (sopt->sopt_name) {
+			case TCP_KEEPIDLE:
+				ui = tp->t_keepidle / hz;
+				break;
+			case TCP_KEEPINTVL:
+				ui = tp->t_keepintvl / hz;
+				break;
+			case TCP_KEEPINIT:
+				ui = tp->t_keepinit / hz;
+				break;
+			case TCP_KEEPCNT:
+				ui = tp->t_keepcnt;
+				break;
+			}
+			INP_WUNLOCK(inp);
+			error = sooptcopyout(sopt, &ui, sizeof(ui));
+			break;
 		default:
 			INP_WUNLOCK(inp);
 			error = ENOPROTOOPT;
diff --git a/sys/netinet/toecore.c b/sys/netinet/toecore.c
index 53d4778a60f..12f2c38e7ea 100644
--- a/sys/netinet/toecore.c
+++ b/sys/netinet/toecore.c
@@ -43,6 +43,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/ethernet.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_vlan_var.h>
 #include <net/if_llatbl.h>
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index de4957de78c..47f1515a56b 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -42,7 +42,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet.h"
 #include "opt_inet6.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/domain.h>
@@ -67,6 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
diff --git a/sys/netinet6/dest6.c b/sys/netinet6/dest6.c
index b6a33e03726..2b95fd9d011 100644
--- a/sys/netinet6/dest6.c
+++ b/sys/netinet6/dest6.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index e67d2919252..dd088961358 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -45,6 +45,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 28e731244e7..a50b5cfd7cc 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_llatbl.h>
 #include <net/if_types.h>
@@ -1227,6 +1228,7 @@ icmp6_mtudisc_update(struct ip6ctlparam *ip6cp, int validated)
 		mtu = IPV6_MMTU - 8;
 
 	bzero(&inc, sizeof(inc));
+	inc.inc_fibnum = M_GETFIB(m);
 	inc.inc_flags |= INC_ISIPV6;
 	inc.inc6_faddr = *dst;
 	if (in6_setscope(&inc.inc6_faddr, m->m_pkthdr.rcvif, NULL))
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index e5c62df81a2..fbd2e0f091d 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 
 #include <sys/param.h>
+#include <sys/eventhandler.h>
 #include <sys/errno.h>
 #include <sys/jail.h>
 #include <sys/malloc.h>
@@ -132,8 +133,6 @@ const struct in6_addr in6mask128 = IN6MASK128;
 const struct sockaddr_in6 sa6_any =
 	{ sizeof(sa6_any), AF_INET6, 0, 0, IN6ADDR_ANY_INIT, 0 };
 
-static int in6_lifaddr_ioctl(struct socket *, u_long, caddr_t,
-	struct ifnet *, struct thread *);
 static int in6_ifinit(struct ifnet *, struct in6_ifaddr *,
 	struct sockaddr_in6 *, int);
 static void in6_unlink_ifa(struct in6_ifaddr *, struct ifnet *);
@@ -375,26 +374,6 @@ in6_control(struct socket *so, u_long cmd, caddr_t data,
 		    ifr->ifr_ifru.ifru_scope_id));
 	}
 
-	switch (cmd) {
-	case SIOCALIFADDR:
-		if (td != NULL) {
-			error = priv_check(td, PRIV_NET_ADDIFADDR);
-			if (error)
-				return (error);
-		}
-		return in6_lifaddr_ioctl(so, cmd, data, ifp, td);
-
-	case SIOCDLIFADDR:
-		if (td != NULL) {
-			error = priv_check(td, PRIV_NET_DELIFADDR);
-			if (error)
-				return (error);
-		}
-		/* FALLTHROUGH */
-	case SIOCGLIFADDR:
-		return in6_lifaddr_ioctl(so, cmd, data, ifp, td);
-	}
-
 	/*
 	 * Find address for this interface, if it exists.
 	 *
@@ -1141,12 +1120,9 @@ in6_update_ifa(struct ifnet *ifp, struct in6_aliasreq *ifra,
 		 * RA, it is called under an interrupt context.  So, we should
 		 * call malloc with M_NOWAIT.
 		 */
-		ia = (struct in6_ifaddr *) malloc(sizeof(*ia), M_IFADDR,
-		    M_NOWAIT);
+		ia = (struct in6_ifaddr *)ifa_alloc(sizeof(*ia), M_NOWAIT);
 		if (ia == NULL)
 			return (ENOBUFS);
-		bzero((caddr_t)ia, sizeof(*ia));
-		ifa_init(&ia->ia_ifa);
 		LIST_INIT(&ia->ia6_memberships);
 		/* Initialize the address and masks, and put time stamp */
 		ia->ia_ifa.ifa_addr = (struct sockaddr *)&ia->ia_addr;
@@ -1602,277 +1578,6 @@ in6_purgeif(struct ifnet *ifp)
 	in6_ifdetach(ifp);
 }
 
-/*
- * SIOC[GAD]LIFADDR.
- *	SIOCGLIFADDR: get first address. (?)
- *	SIOCGLIFADDR with IFLR_PREFIX:
- *		get first address that matches the specified prefix.
- *	SIOCALIFADDR: add the specified address.
- *	SIOCALIFADDR with IFLR_PREFIX:
- *		add the specified prefix, filling hostid part from
- *		the first link-local address.  prefixlen must be <= 64.
- *	SIOCDLIFADDR: delete the specified address.
- *	SIOCDLIFADDR with IFLR_PREFIX:
- *		delete the first address that matches the specified prefix.
- * return values:
- *	EINVAL on invalid parameters
- *	EADDRNOTAVAIL on prefix match failed/specified address not found
- *	other values may be returned from in6_ioctl()
- *
- * NOTE: SIOCALIFADDR(with IFLR_PREFIX set) allows prefixlen less than 64.
- * this is to accomodate address naming scheme other than RFC2374,
- * in the future.
- * RFC2373 defines interface id to be 64bit, but it allows non-RFC2374
- * address encoding scheme. (see figure on page 8)
- */
-static int
-in6_lifaddr_ioctl(struct socket *so, u_long cmd, caddr_t data,
-    struct ifnet *ifp, struct thread *td)
-{
-	struct if_laddrreq *iflr = (struct if_laddrreq *)data;
-	struct ifaddr *ifa;
-	struct sockaddr *sa;
-
-	/* sanity checks */
-	if (!data || !ifp) {
-		panic("invalid argument to in6_lifaddr_ioctl");
-		/* NOTREACHED */
-	}
-
-	switch (cmd) {
-	case SIOCGLIFADDR:
-		/* address must be specified on GET with IFLR_PREFIX */
-		if ((iflr->flags & IFLR_PREFIX) == 0)
-			break;
-		/* FALLTHROUGH */
-	case SIOCALIFADDR:
-	case SIOCDLIFADDR:
-		/* address must be specified on ADD and DELETE */
-		sa = (struct sockaddr *)&iflr->addr;
-		if (sa->sa_family != AF_INET6)
-			return EINVAL;
-		if (sa->sa_len != sizeof(struct sockaddr_in6))
-			return EINVAL;
-		/* XXX need improvement */
-		sa = (struct sockaddr *)&iflr->dstaddr;
-		if (sa->sa_family && sa->sa_family != AF_INET6)
-			return EINVAL;
-		if (sa->sa_len && sa->sa_len != sizeof(struct sockaddr_in6))
-			return EINVAL;
-		break;
-	default: /* shouldn't happen */
-#if 0
-		panic("invalid cmd to in6_lifaddr_ioctl");
-		/* NOTREACHED */
-#else
-		return EOPNOTSUPP;
-#endif
-	}
-	if (sizeof(struct in6_addr) * 8 < iflr->prefixlen)
-		return EINVAL;
-
-	switch (cmd) {
-	case SIOCALIFADDR:
-	    {
-		struct in6_aliasreq ifra;
-		struct in6_addr *hostid = NULL;
-		int prefixlen;
-
-		ifa = NULL;
-		if ((iflr->flags & IFLR_PREFIX) != 0) {
-			struct sockaddr_in6 *sin6;
-
-			/*
-			 * hostid is to fill in the hostid part of the
-			 * address.  hostid points to the first link-local
-			 * address attached to the interface.
-			 */
-			ifa = (struct ifaddr *)in6ifa_ifpforlinklocal(ifp, 0);
-			if (!ifa)
-				return EADDRNOTAVAIL;
-			hostid = IFA_IN6(ifa);
-
-			/* prefixlen must be <= 64. */
-			if (64 < iflr->prefixlen) {
-				if (ifa != NULL)
-					ifa_free(ifa);
-				return EINVAL;
-			}
-			prefixlen = iflr->prefixlen;
-
-			/* hostid part must be zero. */
-			sin6 = (struct sockaddr_in6 *)&iflr->addr;
-			if (sin6->sin6_addr.s6_addr32[2] != 0 ||
-			    sin6->sin6_addr.s6_addr32[3] != 0) {
-				if (ifa != NULL)
-					ifa_free(ifa);
-				return EINVAL;
-			}
-		} else
-			prefixlen = iflr->prefixlen;
-
-		/* copy args to in6_aliasreq, perform ioctl(SIOCAIFADDR_IN6). */
-		bzero(&ifra, sizeof(ifra));
-		bcopy(iflr->iflr_name, ifra.ifra_name, sizeof(ifra.ifra_name));
-
-		bcopy(&iflr->addr, &ifra.ifra_addr,
-		    ((struct sockaddr *)&iflr->addr)->sa_len);
-		if (hostid) {
-			/* fill in hostid part */
-			ifra.ifra_addr.sin6_addr.s6_addr32[2] =
-			    hostid->s6_addr32[2];
-			ifra.ifra_addr.sin6_addr.s6_addr32[3] =
-			    hostid->s6_addr32[3];
-		}
-
-		if (((struct sockaddr *)&iflr->dstaddr)->sa_family) { /* XXX */
-			bcopy(&iflr->dstaddr, &ifra.ifra_dstaddr,
-			    ((struct sockaddr *)&iflr->dstaddr)->sa_len);
-			if (hostid) {
-				ifra.ifra_dstaddr.sin6_addr.s6_addr32[2] =
-				    hostid->s6_addr32[2];
-				ifra.ifra_dstaddr.sin6_addr.s6_addr32[3] =
-				    hostid->s6_addr32[3];
-			}
-		}
-		if (ifa != NULL)
-			ifa_free(ifa);
-
-		ifra.ifra_prefixmask.sin6_len = sizeof(struct sockaddr_in6);
-		in6_prefixlen2mask(&ifra.ifra_prefixmask.sin6_addr, prefixlen);
-
-		ifra.ifra_flags = iflr->flags & ~IFLR_PREFIX;
-		return in6_control(so, SIOCAIFADDR_IN6, (caddr_t)&ifra, ifp, td);
-	    }
-	case SIOCGLIFADDR:
-	case SIOCDLIFADDR:
-	    {
-		struct in6_ifaddr *ia;
-		struct in6_addr mask, candidate, match;
-		struct sockaddr_in6 *sin6;
-		int cmp;
-
-		bzero(&mask, sizeof(mask));
-		if (iflr->flags & IFLR_PREFIX) {
-			/* lookup a prefix rather than address. */
-			in6_prefixlen2mask(&mask, iflr->prefixlen);
-
-			sin6 = (struct sockaddr_in6 *)&iflr->addr;
-			bcopy(&sin6->sin6_addr, &match, sizeof(match));
-			match.s6_addr32[0] &= mask.s6_addr32[0];
-			match.s6_addr32[1] &= mask.s6_addr32[1];
-			match.s6_addr32[2] &= mask.s6_addr32[2];
-			match.s6_addr32[3] &= mask.s6_addr32[3];
-
-			/* if you set extra bits, that's wrong */
-			if (bcmp(&match, &sin6->sin6_addr, sizeof(match)))
-				return EINVAL;
-
-			cmp = 1;
-		} else {
-			if (cmd == SIOCGLIFADDR) {
-				/* on getting an address, take the 1st match */
-				cmp = 0;	/* XXX */
-			} else {
-				/* on deleting an address, do exact match */
-				in6_prefixlen2mask(&mask, 128);
-				sin6 = (struct sockaddr_in6 *)&iflr->addr;
-				bcopy(&sin6->sin6_addr, &match, sizeof(match));
-
-				cmp = 1;
-			}
-		}
-
-		IF_ADDR_RLOCK(ifp);
-		TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
-			if (ifa->ifa_addr->sa_family != AF_INET6)
-				continue;
-			if (!cmp)
-				break;
-
-			/*
-			 * XXX: this is adhoc, but is necessary to allow
-			 * a user to specify fe80::/64 (not /10) for a
-			 * link-local address.
-			 */
-			bcopy(IFA_IN6(ifa), &candidate, sizeof(candidate));
-			in6_clearscope(&candidate);
-			candidate.s6_addr32[0] &= mask.s6_addr32[0];
-			candidate.s6_addr32[1] &= mask.s6_addr32[1];
-			candidate.s6_addr32[2] &= mask.s6_addr32[2];
-			candidate.s6_addr32[3] &= mask.s6_addr32[3];
-			if (IN6_ARE_ADDR_EQUAL(&candidate, &match))
-				break;
-		}
-		if (ifa != NULL)
-			ifa_ref(ifa);
-		IF_ADDR_RUNLOCK(ifp);
-		if (!ifa)
-			return EADDRNOTAVAIL;
-		ia = ifa2ia6(ifa);
-
-		if (cmd == SIOCGLIFADDR) {
-			int error;
-
-			/* fill in the if_laddrreq structure */
-			bcopy(&ia->ia_addr, &iflr->addr, ia->ia_addr.sin6_len);
-			error = sa6_recoverscope(
-			    (struct sockaddr_in6 *)&iflr->addr);
-			if (error != 0) {
-				ifa_free(ifa);
-				return (error);
-			}
-
-			if ((ifp->if_flags & IFF_POINTOPOINT) != 0) {
-				bcopy(&ia->ia_dstaddr, &iflr->dstaddr,
-				    ia->ia_dstaddr.sin6_len);
-				error = sa6_recoverscope(
-				    (struct sockaddr_in6 *)&iflr->dstaddr);
-				if (error != 0) {
-					ifa_free(ifa);
-					return (error);
-				}
-			} else
-				bzero(&iflr->dstaddr, sizeof(iflr->dstaddr));
-
-			iflr->prefixlen =
-			    in6_mask2len(&ia->ia_prefixmask.sin6_addr, NULL);
-
-			iflr->flags = ia->ia6_flags;	/* XXX */
-			ifa_free(ifa);
-
-			return 0;
-		} else {
-			struct in6_aliasreq ifra;
-
-			/* fill in6_aliasreq and do ioctl(SIOCDIFADDR_IN6) */
-			bzero(&ifra, sizeof(ifra));
-			bcopy(iflr->iflr_name, ifra.ifra_name,
-			    sizeof(ifra.ifra_name));
-
-			bcopy(&ia->ia_addr, &ifra.ifra_addr,
-			    ia->ia_addr.sin6_len);
-			if ((ifp->if_flags & IFF_POINTOPOINT) != 0) {
-				bcopy(&ia->ia_dstaddr, &ifra.ifra_dstaddr,
-				    ia->ia_dstaddr.sin6_len);
-			} else {
-				bzero(&ifra.ifra_dstaddr,
-				    sizeof(ifra.ifra_dstaddr));
-			}
-			bcopy(&ia->ia_prefixmask, &ifra.ifra_dstaddr,
-			    ia->ia_prefixmask.sin6_len);
-
-			ifra.ifra_flags = ia->ia6_flags;
-			ifa_free(ifa);
-			return in6_control(so, SIOCDIFADDR_IN6, (caddr_t)&ifra,
-			    ifp, td);
-		}
-	    }
-	}
-
-	return EOPNOTSUPP;	/* just for safety */
-}
-
 /*
  * Initialize an interface's IPv6 address and routing table entry.
  */
diff --git a/sys/netinet6/in6_gif.c b/sys/netinet6/in6_gif.c
index 7fdaf16305a..53188f143a4 100644
--- a/sys/netinet6/in6_gif.c
+++ b/sys/netinet6/in6_gif.c
@@ -49,7 +49,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.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_systm.h>
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index ee386d6d068..2ee0cae1a46 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -44,6 +44,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/md5.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/route.h>
@@ -809,6 +810,9 @@ in6_ifdetach(struct ifnet *ifp)
 	struct sockaddr_in6 sin6;
 	struct in6_multi_mship *imm;
 
+	if (ifp->if_afdata[AF_INET6] == NULL)
+		return;
+
 	/* remove neighbor management table */
 	nd6_purge(ifp);
 
diff --git a/sys/netinet6/in6_mcast.c b/sys/netinet6/in6_mcast.c
index fca48b5c6d6..16ac88c4893 100644
--- a/sys/netinet6/in6_mcast.c
+++ b/sys/netinet6/in6_mcast.c
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/tree.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <net/vnet.h>
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index fb84279c8e6..848f3c6c661 100644
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -90,6 +90,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/route.h>
 
diff --git a/sys/netinet6/in6_proto.c b/sys/netinet6/in6_proto.c
index 965de60fd8b..a6032391f29 100644
--- a/sys/netinet6/in6_proto.c
+++ b/sys/netinet6/in6_proto.c
@@ -84,6 +84,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/radix.h>
 #include <net/route.h>
 #ifdef RADIX_MPATH
diff --git a/sys/netinet6/in6_rmx.c b/sys/netinet6/in6_rmx.c
index 88ecc146cf9..e90c74bd1b6 100644
--- a/sys/netinet6/in6_rmx.c
+++ b/sys/netinet6/in6_rmx.c
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/callout.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c
index 7590fa1e4d9..000c246ce5d 100644
--- a/sys/netinet6/in6_src.c
+++ b/sys/netinet6/in6_src.c
@@ -85,6 +85,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sx.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_dl.h>
 #include <net/route.h>
 #include <net/if_llatbl.h>
diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h
index e2f356dee6a..229cc33472a 100644
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
@@ -65,6 +65,7 @@
 #define _NETINET6_IN6_VAR_H_
 
 #include <sys/tree.h>
+#include <sys/counter.h>
 
 #ifdef _KERNEL
 #include <sys/fnv_hash.h>
@@ -98,9 +99,6 @@ struct scope6_id;
 struct lltable;
 struct mld_ifinfo;
 
-#ifdef _KERNEL
-#include <sys/counter.h>
-
 struct in6_ifextra {
 	counter_u64_t *in6_ifstat;
 	counter_u64_t *icmp6_ifstat;
@@ -109,20 +107,10 @@ struct in6_ifextra {
 	struct lltable *lltable;
 	struct mld_ifinfo *mld_ifinfo;
 };
-#else
-
-struct in6_ifextra {
-	void *in6_ifstat;
-	void *icmp6_ifstat;
-	struct nd_ifinfo *nd_ifinfo;
-	struct scope6_id *scope6_id;
-	struct lltable *lltable;
-	struct mld_ifinfo *mld_ifinfo;
-};
-#endif /* !_KERNEL */
 
 #define	LLTABLE6(ifp)	(((struct in6_ifextra *)(ifp)->if_afdata[AF_INET6])->lltable)
 
+#if defined(_KERNEL) || defined(_WANT_IFADDR)
 struct	in6_ifaddr {
 	struct	ifaddr ia_ifa;		/* protocol-independent info */
 #define	ia_ifp		ia_ifa.ifa_ifp
@@ -153,6 +141,7 @@ struct	in6_ifaddr {
 /* List of in6_ifaddr's. */
 TAILQ_HEAD(in6_ifaddrhead, in6_ifaddr);
 LIST_HEAD(in6_ifaddrlisthead, in6_ifaddr);
+#endif
 
 /* control structure to manage address selection policy */
 struct in6_addrpolicy {
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 2cc274167be..05d96e75364 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/pfil.h>
diff --git a/sys/netinet6/ip6_id.c b/sys/netinet6/ip6_id.c
index cf808061e85..3f40fa5c064 100644
--- a/sys/netinet6/ip6_id.c
+++ b/sys/netinet6/ip6_id.c
@@ -97,6 +97,7 @@ __FBSDID("$FreeBSD$");
 
 #include <net/if.h>
 #include <net/route.h>
+#include <net/vnet.h>
 #include <netinet/in.h>
 #include <netinet/ip6.h>
 #include <netinet6/ip6_var.h>
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index a94d5c22c50..dae52afb116 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -67,7 +67,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_ipfw.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 #include "opt_route.h"
 
 #include <sys/param.h>
@@ -86,6 +85,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/route.h>
@@ -724,8 +724,9 @@ passin:
 		ia6 = (struct in6_ifaddr *)ifa;
 		if (!(ia6->ia6_flags & IN6_IFF_NOTREADY)) {
 			/* Count the packet in the ip address stats */
-			ia6->ia_ifa.if_ipackets++;
-			ia6->ia_ifa.if_ibytes += m->m_pkthdr.len;
+			counter_u64_add(ia6->ia_ifa.ifa_ipackets, 1);
+			counter_u64_add(ia6->ia_ifa.ifa_ibytes,
+			    m->m_pkthdr.len);
 
 			/*
 			 * record address information into m_tag.
@@ -840,9 +841,10 @@ passin:
 			ours = 1;
 			deliverifp = ia6->ia_ifp;	/* correct? */
 			/* Count the packet in the ip address stats */
-			ia6->ia_ifa.if_ipackets++;
-			ia6->ia_ifa.if_ibytes += m->m_pkthdr.len;
-			if (ia6 != NULL && free_ia6 != 0)
+			counter_u64_add(ia6->ia_ifa.ifa_ipackets, 1);
+			counter_u64_add(ia6->ia_ifa.ifa_ibytes,
+			    m->m_pkthdr.len);
+			if (free_ia6)
 				ifa_free(&ia6->ia_ifa);
 			goto hbhcheck;
 		} else {
@@ -854,7 +856,7 @@ passin:
 			    ip6_sprintf(ip6bufs, &ip6->ip6_src),
 			    ip6_sprintf(ip6bufd, &ip6->ip6_dst)));
 
-			if (ia6 != NULL && free_ia6 != 0)
+			if (free_ia6)
 				ifa_free(&ia6->ia_ifa);
 			goto bad;
 		}
diff --git a/sys/netinet6/ip6_ipsec.c b/sys/netinet6/ip6_ipsec.c
index 8cdd43143d2..678f1dfc7c0 100644
--- a/sys/netinet6/ip6_ipsec.c
+++ b/sys/netinet6/ip6_ipsec.c
@@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 36d0d6f183d..a9686ec2f9f 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -82,7 +82,6 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_inet6.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -106,6 +105,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/time.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/raw_cb.h>
 #include <net/vnet.h>
@@ -616,7 +616,7 @@ X_ip6_mrouter_done(void)
 			for (rte = rt->mf6c_stall; rte != NULL; ) {
 				struct rtdetq *n = rte->next;
 
-				m_free(rte->m);
+				m_freem(rte->m);
 				free(rte, M_MRTABLE6);
 				rte = n;
 			}
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 0d55b66290f..166c1bc8ade 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/in_cksum.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/netisr.h>
 #include <net/route.h>
 #include <net/pfil.h>
@@ -1021,8 +1022,9 @@ passout:
 		ia6 = in6_ifawithifp(ifp, &ip6->ip6_src);
 		if (ia6) {
 			/* Record statistics for this interface address. */
-			ia6->ia_ifa.if_opackets++;
-			ia6->ia_ifa.if_obytes += m->m_pkthdr.len;
+			counter_u64_add(ia6->ia_ifa.ifa_opackets, 1);
+			counter_u64_add(ia6->ia_ifa.ifa_obytes,
+			    m->m_pkthdr.len);
 			ifa_free(&ia6->ia_ifa);
 		}
 		error = nd6_output(ifp, origifp, m, dst, ro->ro_rt);
@@ -1177,8 +1179,9 @@ sendorfree:
 		if (error == 0) {
 			/* Record statistics for this interface address. */
 			if (ia) {
-				ia->ia_ifa.if_opackets++;
-				ia->ia_ifa.if_obytes += m->m_pkthdr.len;
+				counter_u64_add(ia->ia_ifa.ifa_opackets, 1);
+				counter_u64_add(ia->ia_ifa.ifa_obytes,
+				    m->m_pkthdr.len);
 			}
 			error = nd6_output(ifp, origifp, m, dst, ro->ro_rt);
 		} else
@@ -2659,10 +2662,8 @@ ip6_setpktopt(int optname, u_char *buf, int len, struct ip6_pktopts *opt,
 		}
 
 		/* validate the interface index if specified. */
-		if (pktinfo->ipi6_ifindex > V_if_index ||
-		    pktinfo->ipi6_ifindex < 0) {
+		if (pktinfo->ipi6_ifindex > V_if_index)
 			 return (ENXIO);
-		}
 		if (pktinfo->ipi6_ifindex) {
 			ifp = ifnet_byindex(pktinfo->ipi6_ifindex);
 			if (ifp == NULL)
diff --git a/sys/netinet6/mld6.c b/sys/netinet6/mld6.c
index 77b19bfb980..ddc6eea0cf0 100644
--- a/sys/netinet6/mld6.c
+++ b/sys/netinet6/mld6.c
@@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ktr.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index e76121d3d4b..188e63a426e 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -55,6 +54,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arc.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 532c9b8fd17..92fb7c6377c 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -232,41 +232,28 @@ nd6_ns_input(struct mbuf *m, int off, int icmp6len)
 
 	/* (2) check. */
 	if (ifa == NULL) {
-		struct rtentry *rt;
-		struct sockaddr_in6 tsin6;
-		int need_proxy;
-#ifdef RADIX_MPATH
 		struct route_in6 ro;
-#endif
+		int need_proxy;
 
-		bzero(&tsin6, sizeof tsin6);
-		tsin6.sin6_len = sizeof(struct sockaddr_in6);
-		tsin6.sin6_family = AF_INET6;
-		tsin6.sin6_addr = taddr6;
+		bzero(&ro, sizeof(ro));
+		ro.ro_dst.sin6_len = sizeof(struct sockaddr_in6);
+		ro.ro_dst.sin6_family = AF_INET6;
+		ro.ro_dst.sin6_addr = taddr6;
 
 		/* Always use the default FIB. */
 #ifdef RADIX_MPATH
-		bzero(&ro, sizeof(ro));
-		ro.ro_dst = tsin6;
 		rtalloc_mpath_fib((struct route *)&ro, RTF_ANNOUNCE,
 		    RT_DEFAULT_FIB);
-		rt = ro.ro_rt;
 #else
-		rt = in6_rtalloc1((struct sockaddr *)&tsin6, 0, 0,
-		    RT_DEFAULT_FIB);
+		in6_rtalloc(&ro, RT_DEFAULT_FIB);
 #endif
-		need_proxy = (rt && (rt->rt_flags & RTF_ANNOUNCE) != 0 &&
-		    rt->rt_gateway->sa_family == AF_LINK);
-		if (rt != NULL) {
-			/*
-			 * Make a copy while we can be sure that rt_gateway
-			 * is still stable before unlocking to avoid lock
-			 * order problems.  proxydl will only be used if
-			 * proxy will be set in the next block.
-			 */
+		need_proxy = (ro.ro_rt &&
+		    (ro.ro_rt->rt_flags & RTF_ANNOUNCE) != 0 &&
+		    ro.ro_rt->rt_gateway->sa_family == AF_LINK);
+		if (ro.ro_rt != NULL) {
 			if (need_proxy)
-				proxydl = *SDL(rt->rt_gateway);
-			RTFREE_LOCKED(rt);
+				proxydl = *SDL(ro.ro_rt->rt_gateway);
+			RTFREE(ro.ro_rt);
 		}
 		if (need_proxy) {
 			/*
diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c
index 0c8b5876595..55240d9e1d3 100644
--- a/sys/netinet6/nd6_rtr.c
+++ b/sys/netinet6/nd6_rtr.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
 #include <net/route.h>
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index a37dfc5900d..57f7e901ace 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -82,6 +82,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/vnet.h>
diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c
index b6bec8d8179..5f224375e57 100644
--- a/sys/netinet6/route6.c
+++ b/sys/netinet6/route6.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/queue.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 
 #include <netinet/in.h>
 #include <netinet6/in6_var.h>
diff --git a/sys/netinet6/scope6.c b/sys/netinet6/scope6.c
index b6479a1041e..3284a7dd9fd 100644
--- a/sys/netinet6/scope6.c
+++ b/sys/netinet6/scope6.c
@@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c
index 511b0e83173..6c9f9ee1fc3 100644
--- a/sys/netinet6/sctp6_usrreq.c
+++ b/sys/netinet6/sctp6_usrreq.c
@@ -839,16 +839,18 @@ sctp6_connect(struct socket *so, struct sockaddr *addr, struct thread *p)
 	uint32_t vrf_id;
 	int error = 0;
 	struct sctp_inpcb *inp;
-	struct in6pcb *inp6;
 	struct sctp_tcb *stcb;
 
 #ifdef INET
+	struct in6pcb *inp6;
 	struct sockaddr_in6 *sin6;
 	struct sockaddr_storage ss;
 
 #endif
 
+#ifdef INET
 	inp6 = (struct in6pcb *)so->so_pcb;
+#endif
 	inp = (struct sctp_inpcb *)so->so_pcb;
 	if (inp == NULL) {
 		SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP6_USRREQ, ECONNRESET);
diff --git a/sys/netinet6/send.c b/sys/netinet6/send.c
index aa6ec673fcd..79748387b66 100644
--- a/sys/netinet6/send.c
+++ b/sys/netinet6/send.c
@@ -27,8 +27,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c
index 7df0db75377..96510652d8f 100644
--- a/sys/netinet6/udp6_usrreq.c
+++ b/sys/netinet6/udp6_usrreq.c
@@ -73,7 +73,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 #include "opt_ipfw.h"
 #include "opt_ipsec.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/jail.h>
@@ -93,6 +92,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/route.h>
 
diff --git a/sys/netipsec/ipsec.c b/sys/netipsec/ipsec.c
index 4a22f321878..de367f7dd5c 100644
--- a/sys/netipsec/ipsec.c
+++ b/sys/netipsec/ipsec.c
@@ -55,6 +55,7 @@
 #include <sys/proc.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c
index 23a4a5ccfaa..f0195814a1a 100644
--- a/sys/netipsec/ipsec_input.c
+++ b/sys/netipsec/ipsec_input.c
@@ -56,6 +56,7 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/pfil.h>
 #include <net/route.h>
 #include <net/netisr.h>
@@ -602,6 +603,7 @@ ipsec6_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, int proto
 	ip6->ip6_plen = htons(m->m_pkthdr.len - sizeof(struct ip6_hdr));
 
 	/* Save protocol */
+	prot = 0;
 	m_copydata(m, protoff, 1, (unsigned char *) &prot);
 
 #ifdef notyet
diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c
index 19b27ec23c7..4ef5ca2789a 100644
--- a/sys/netipsec/ipsec_output.c
+++ b/sys/netipsec/ipsec_output.c
@@ -44,6 +44,7 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/pfil.h>
 #include <net/route.h>
 #include <net/vnet.h>
diff --git a/sys/netipsec/key.c b/sys/netipsec/key.c
index 35385e55fc1..0cc35dd18c2 100644
--- a/sys/netipsec/key.c
+++ b/sys/netipsec/key.c
@@ -58,9 +58,10 @@
 #include <sys/syslog.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
-#include <net/raw_cb.h>
 #include <net/vnet.h>
+#include <net/raw_cb.h>
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index 5a6b84a70af..55f34dcc2f1 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -52,9 +52,9 @@
 #include <sys/systm.h>
 
 #include <net/if.h>
+#include <net/vnet.h>
 #include <net/raw_cb.h>
 #include <net/route.h>
-#include <net/vnet.h>
 
 #include <netinet/in.h>
 
diff --git a/sys/netipsec/xform_ah.c b/sys/netipsec/xform_ah.c
index 3666b541c5a..0c0a5a8a096 100644
--- a/sys/netipsec/xform_ah.c
+++ b/sys/netipsec/xform_ah.c
@@ -45,6 +45,8 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/rwlock.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
diff --git a/sys/netipsec/xform_esp.c b/sys/netipsec/xform_esp.c
index bb6d1e6c2a5..e7a34324e84 100644
--- a/sys/netipsec/xform_esp.c
+++ b/sys/netipsec/xform_esp.c
@@ -44,7 +44,9 @@
 #include <sys/socket.h>
 #include <sys/syslog.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/random.h>
+#include <sys/rwlock.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c
index 1d2aff2e4f6..d2537d26e58 100644
--- a/sys/netipsec/xform_ipip.c
+++ b/sys/netipsec/xform_ipip.c
@@ -52,6 +52,7 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/pfil.h>
 #include <net/route.h>
 #include <net/netisr.h>
diff --git a/sys/netipx/ipx.c b/sys/netipx/ipx.c
index b3e8aa2bd56..987a267bf45 100644
--- a/sys/netipx/ipx.c
+++ b/sys/netipx/ipx.c
@@ -75,6 +75,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netipx/ipx.h>
@@ -190,13 +191,8 @@ ipx_control(struct socket *so, u_long cmd, caddr_t data, struct ifnet *ifp,
 		if (td && (error = priv_check(td, PRIV_NET_SETLLADDR)) != 0)
 			goto out;
 		if (ia == NULL) {
-			ia = malloc(sizeof(*ia), M_IFADDR, M_NOWAIT | M_ZERO);
-			if (ia == NULL) {
-				error = ENOBUFS;
-				goto out;
-			}
-			ifa = (struct ifaddr *)ia;
-			ifa_init(ifa);
+			ifa = ifa_alloc(sizeof(struct ipx_ifaddr), M_WAITOK);
+			ia = (struct ipx_ifaddr *)ifa;
 			ia->ia_ifp = ifp;
 			ifa->ifa_addr = (struct sockaddr *)&ia->ia_addr;
 			ifa->ifa_netmask = (struct sockaddr *)&ipx_netmask;
diff --git a/sys/netipx/ipx_if.h b/sys/netipx/ipx_if.h
index ab5ee799cf3..7725b4ad99a 100644
--- a/sys/netipx/ipx_if.h
+++ b/sys/netipx/ipx_if.h
@@ -70,7 +70,7 @@
  * The ifaddr structure contains the protocol-independent part
  * of the structure and is assumed to be first.
  */
-
+#ifdef _KERNEL
 struct ipx_ifaddr {
 	struct	ifaddr ia_ifa;		/* protocol-independent info */
 #define	ia_ifp		ia_ifa.ifa_ifp
@@ -81,6 +81,7 @@ struct ipx_ifaddr {
 #define ia_broadaddr	ia_dstaddr
 	struct	sockaddr_ipx ia_netmask;	/* space for my network mask */
 };
+#endif /* _KERNEL */
 
 struct	ipx_aliasreq {
 	char	ifra_name[IFNAMSIZ];		/* if name, e.g. "en0" */
diff --git a/sys/netipx/ipx_input.c b/sys/netipx/ipx_input.c
index 9d44ec55e5b..df277fb003f 100644
--- a/sys/netipx/ipx_input.c
+++ b/sys/netipx/ipx_input.c
@@ -77,6 +77,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/netisr.h>
 
diff --git a/sys/netipx/ipx_outputfl.c b/sys/netipx/ipx_outputfl.c
index 25bbedf40bb..e6223574f1e 100644
--- a/sys/netipx/ipx_outputfl.c
+++ b/sys/netipx/ipx_outputfl.c
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netipx/ipx.h>
diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c
index 92a58bd4037..61510bbc2a6 100644
--- a/sys/netipx/ipx_pcb.c
+++ b/sys/netipx/ipx_pcb.c
@@ -73,6 +73,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/socketvar.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netipx/ipx.h>
diff --git a/sys/netipx/ipx_usrreq.c b/sys/netipx/ipx_usrreq.c
index 31b781c9f65..f2f96eb2a1d 100644
--- a/sys/netipx/ipx_usrreq.c
+++ b/sys/netipx/ipx_usrreq.c
@@ -81,6 +81,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c
index c6116501553..56b8539941a 100644
--- a/sys/netnatm/natm.c
+++ b/sys/netnatm/natm.c
@@ -78,6 +78,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_atm.h>
 #include <net/netisr.h>
 
diff --git a/sys/netnatm/natm_pcb.c b/sys/netnatm/natm_pcb.c
index 16ceab12a43..602d438ea51 100644
--- a/sys/netnatm/natm_pcb.c
+++ b/sys/netnatm/natm_pcb.c
@@ -43,12 +43,15 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 
 #include <net/if.h>
+#include <net/if_var.h>		/* XXX: db_show_natm() */
 
 #include <netinet/in.h>
 
diff --git a/sys/netnatm/natm_proto.c b/sys/netnatm/natm_proto.c
index d97809b27bd..b064c434001 100644
--- a/sys/netnatm/natm_proto.c
+++ b/sys/netnatm/natm_proto.c
@@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/socket.h>
 #include <sys/protosw.h>
 #include <sys/domain.h>
diff --git a/sys/netpfil/ipfw/dn_sched.h b/sys/netpfil/ipfw/dn_sched.h
index ab823fe7c80..0d2845427ab 100644
--- a/sys/netpfil/ipfw/dn_sched.h
+++ b/sys/netpfil/ipfw/dn_sched.h
@@ -166,6 +166,7 @@ dn_dequeue(struct dn_queue *q)
 	if (m == NULL)
 		return NULL;
 	q->mq.head = m->m_nextpkt;
+	q->mq.count--;
 
 	/* Update stats for the queue */
 	q->ni.length--;
diff --git a/sys/netpfil/ipfw/ip_dn_io.c b/sys/netpfil/ipfw/ip_dn_io.c
index 9a4b4867d3f..1748194b1e2 100644
--- a/sys/netpfil/ipfw/ip_dn_io.c
+++ b/sys/netpfil/ipfw/ip_dn_io.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
@@ -259,10 +260,39 @@ dn_tag_get(struct mbuf *m)
 static inline void
 mq_append(struct mq *q, struct mbuf *m)
 {
+#ifdef USERSPACE
+	// buffers from netmap need to be copied
+	// XXX note that the routine is not expected to fail
+	ND("append %p to %p", m, q);
+	if (m->m_flags & M_STACK) {
+		struct mbuf *m_new;
+		void *p;
+		int l, ofs;
+
+		ofs = m->m_data - m->__m_extbuf;
+		// XXX allocate
+		MGETHDR(m_new, M_NOWAIT, MT_DATA);
+		ND("*** WARNING, volatile buf %p ext %p %d dofs %d m_new %p",
+			m, m->__m_extbuf, m->__m_extlen, ofs, m_new);
+		p = m_new->__m_extbuf;	/* new pointer */
+		l = m_new->__m_extlen;	/* new len */
+		if (l <= m->__m_extlen) {
+			panic("extlen too large");
+		}
+
+		*m_new = *m;	// copy
+		m_new->m_flags &= ~M_STACK;
+		m_new->__m_extbuf = p; // point to new buffer
+		pkt_copy(m->__m_extbuf, p, m->__m_extlen);
+		m_new->m_data = p + ofs;
+		m = m_new;
+	}
+#endif /* USERSPACE */
 	if (q->head == NULL)
 		q->head = m;
 	else
 		q->tail->m_nextpkt = m;
+	q->count++;
 	q->tail = m;
 	m->m_nextpkt = NULL;
 }
@@ -454,6 +484,7 @@ transmit_event(struct mq *q, struct delay_line *dline, uint64_t now)
 		if (!DN_KEY_LEQ(pkt->output_time, now))
 			break;
 		dline->mq.head = m->m_nextpkt;
+		dline->mq.count--;
 		mq_append(q, m);
 	}
 	if (m != NULL) {
diff --git a/sys/netpfil/ipfw/ip_dn_private.h b/sys/netpfil/ipfw/ip_dn_private.h
index 159ddc9ab8b..958c8201412 100644
--- a/sys/netpfil/ipfw/ip_dn_private.h
+++ b/sys/netpfil/ipfw/ip_dn_private.h
@@ -83,6 +83,7 @@ SLIST_HEAD(dn_alg_head, dn_alg);
 
 struct mq {	/* a basic queue of packets*/
         struct mbuf *head, *tail;
+	int count;
 };
 
 static inline void
diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c
index 4de2156b20d..453c0f1db95 100644
--- a/sys/netpfil/ipfw/ip_dummynet.c
+++ b/sys/netpfil/ipfw/ip_dummynet.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c
index 128afad3ad6..7bbfff3bba9 100644
--- a/sys/netpfil/ipfw/ip_fw2.c
+++ b/sys/netpfil/ipfw/ip_fw2.c
@@ -59,11 +59,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/ucred.h>
 #include <net/ethernet.h> /* for ETHERTYPE_IP */
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
-#include <net/pf_mtag.h>
 #include <net/pfil.h>
 #include <net/vnet.h>
 
+#include <netpfil/pf/pf_mtag.h>
+
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netinet/in_pcb.h>
@@ -368,7 +370,7 @@ iface_match(struct ifnet *ifp, ipfw_insn_if *cmd, struct ip_fw_chain *chain, uin
 				return(1);
 		}
 	} else {
-#ifdef __FreeBSD__	/* and OSX too ? */
+#if !defined(USERSPACE) && defined(__FreeBSD__)	/* and OSX too ? */
 		struct ifaddr *ia;
 
 		if_addr_rlock(ifp);
@@ -411,7 +413,7 @@ iface_match(struct ifnet *ifp, ipfw_insn_if *cmd, struct ip_fw_chain *chain, uin
 static int
 verify_path(struct in_addr src, struct ifnet *ifp, u_int fib)
 {
-#ifndef __FreeBSD__
+#if defined(USERSPACE) || !defined(__FreeBSD__)
 	return 0;
 #else
 	struct route ro;
@@ -432,7 +434,7 @@ verify_path(struct in_addr src, struct ifnet *ifp, u_int fib)
 	 * If ifp is provided, check for equality with rtentry.
 	 * We should use rt->rt_ifa->ifa_ifp, instead of rt->rt_ifp,
 	 * in order to pass packets injected back by if_simloop():
-	 * if useloopback == 1 routing entry (via lo0) for our own address
+	 * routing entry (via lo0) for our own address
 	 * may exist, so we need to handle routing assymetry.
 	 */
 	if (ifp != NULL && ro.ro_rt->rt_ifa->ifa_ifp != ifp) {
@@ -662,6 +664,9 @@ static int
 check_uidgid(ipfw_insn_u32 *insn, struct ip_fw_args *args, int *ugid_lookupp,
     struct ucred **uc)
 {
+#if defined(USERSPACE)
+	return 0;	// not supported in userspace
+#else
 #ifndef __FreeBSD__
 	/* XXX */
 	return cred_check(insn, proto, oif,
@@ -764,6 +769,7 @@ check_uidgid(ipfw_insn_u32 *insn, struct ip_fw_args *args, int *ugid_lookupp,
 		match = ((*uc)->cr_prison->pr_id == (int)insn->d[0]);
 	return (match);
 #endif /* __FreeBSD__ */
+#endif /* not supported in userspace */
 }
 
 /*
@@ -1462,6 +1468,7 @@ do {								\
 					    key = htonl(dst_port);
 					else if (v == 3)
 					    key = htonl(src_port);
+#ifndef USERSPACE
 					else if (v == 4 || v == 5) {
 					    check_uidgid(
 						(ipfw_insn_u32 *)cmd,
@@ -1481,6 +1488,7 @@ do {								\
 #endif /* !__FreeBSD__ */
 					    key = htonl(key);
 					} else
+#endif /* !USERSPACE */
 					    break;
 				    }
 				    match = ipfw_lookup_table(chain,
@@ -1944,6 +1952,7 @@ do {								\
 				break;
 
 			case O_SOCKARG:	{
+#ifndef USERSPACE	/* not supported in userspace */
 				struct inpcb *inp = args->inp;
 				struct inpcbinfo *pi;
 				
@@ -1984,6 +1993,7 @@ do {								\
 							match = 1;
 					}
 				}
+#endif /* !USERSPACE */
 				break;
 			}
 
@@ -2403,38 +2413,35 @@ do {								\
 			}
 
 			case O_NAT:
+				l = 0;          /* exit inner loop */
+				done = 1;       /* exit outer loop */
  				if (!IPFW_NAT_LOADED) {
 				    retval = IP_FW_DENY;
-				} else {
-				    struct cfg_nat *t;
-				    int nat_id;
+				    break;
+				}
 
-				    set_match(args, f_pos, chain);
-				    /* Check if this is 'global' nat rule */
-				    if (cmd->arg1 == 0) {
-					    retval = ipfw_nat_ptr(args, NULL, m);
-					    l = 0;
-					    done = 1;
-					    break;
-				    }
-				    t = ((ipfw_insn_nat *)cmd)->nat;
-				    if (t == NULL) {
+				struct cfg_nat *t;
+				int nat_id;
+
+				set_match(args, f_pos, chain);
+				/* Check if this is 'global' nat rule */
+				if (cmd->arg1 == 0) {
+					retval = ipfw_nat_ptr(args, NULL, m);
+					break;
+				}
+				t = ((ipfw_insn_nat *)cmd)->nat;
+				if (t == NULL) {
 					nat_id = IP_FW_ARG_TABLEARG(cmd->arg1);
 					t = (*lookup_nat_ptr)(&chain->nat, nat_id);
 
 					if (t == NULL) {
 					    retval = IP_FW_DENY;
-					    l = 0;	/* exit inner loop */
-					    done = 1;	/* exit outer loop */
 					    break;
 					}
 					if (cmd->arg1 != IP_FW_TABLEARG)
 					    ((ipfw_insn_nat *)cmd)->nat = t;
-				    }
-				    retval = ipfw_nat_ptr(args, t, m);
 				}
-				l = 0;          /* exit inner loop */
-				done = 1;       /* exit outer loop */
+				retval = ipfw_nat_ptr(args, t, m);
 				break;
 
 			case O_REASS: {
diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c
index b0456d37f98..cf4071e0f44 100644
--- a/sys/netpfil/ipfw/ip_fw_dynamic.c
+++ b/sys/netpfil/ipfw/ip_fw_dynamic.c
@@ -45,12 +45,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
+#include <sys/ktr.h>
 #include <sys/lock.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 #include <sys/syslog.h>
 #include <net/ethernet.h> /* for ETHERTYPE_IP */
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
@@ -179,6 +181,13 @@ static VNET_DEFINE(u_int32_t, dyn_max);		/* max # of dynamic rules */
 #define	DYN_COUNT			uma_zone_get_cur(V_ipfw_dyn_rule_zone)
 #define	V_dyn_max			VNET(dyn_max)
 
+/* for userspace, we emulate the uma_zone_counter with ipfw_dyn_count */
+static int ipfw_dyn_count;	/* number of objects */
+
+#ifdef USERSPACE /* emulation of UMA object counters for userspace */
+#define uma_zone_get_cur(x)	ipfw_dyn_count
+#endif /* USERSPACE */
+
 static int last_log;	/* Log ratelimiting */
 
 static void ipfw_dyn_tick(void *vnetx);
@@ -577,6 +586,7 @@ add_dyn_rule(struct ipfw_flow_id *id, int i, u_int8_t dyn_type, struct ip_fw *ru
 		}
 		return NULL;
 	}
+	ipfw_dyn_count++;
 
 	/*
 	 * refcount on parent is already incremented, so
@@ -1251,11 +1261,13 @@ check_dyn_rules(struct ip_fw_chain *chain, struct ip_fw *rule,
 	for (q = exp_head; q != NULL; q = q_next) {
 		q_next = q->next;
 		uma_zfree(V_ipfw_dyn_rule_zone, q);
+		ipfw_dyn_count--;
 	}
 
 	for (q = exp_lhead; q != NULL; q = q_next) {
 		q_next = q->next;
 		uma_zfree(V_ipfw_dyn_rule_zone, q);
+		ipfw_dyn_count--;
 	}
 
 	/*
diff --git a/sys/netpfil/ipfw/ip_fw_log.c b/sys/netpfil/ipfw/ip_fw_log.c
index b1e6dffd61c..b9ef96dc0f9 100644
--- a/sys/netpfil/ipfw/ip_fw_log.c
+++ b/sys/netpfil/ipfw/ip_fw_log.c
@@ -48,6 +48,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/rwlock.h>
 #include <net/ethernet.h> /* for ETHERTYPE_IP */
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/vnet.h>
 #include <net/if_types.h>	/* for IFT_PFLOG */
@@ -84,8 +85,15 @@ __FBSDID("$FreeBSD$");
 #define	ICMP(p)		((struct icmphdr *)(p))
 #define	ICMP6(p)	((struct icmp6_hdr *)(p))
 
+#ifdef __APPLE__
+#undef snprintf
+#define snprintf	sprintf
+#define SNPARGS(buf, len) buf + len
+#define SNP(buf) buf
+#else	/* !__APPLE__ */
 #define SNPARGS(buf, len) buf + len, sizeof(buf) > len ? sizeof(buf) - len : 0
 #define SNP(buf) buf, sizeof(buf)
+#endif /* !__APPLE__ */
 
 #ifdef WITHOUT_BPF
 void
diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c
index 155eddd4cf1..427a55e46f6 100644
--- a/sys/netpfil/ipfw/ip_fw_nat.c
+++ b/sys/netpfil/ipfw/ip_fw_nat.c
@@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/eventhandler.h>
 #include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/module.h>
@@ -42,6 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/libalias/alias_local.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
@@ -674,7 +676,7 @@ static moduledata_t ipfw_nat_mod = {
 };
 
 /* Define startup order. */
-#define	IPFW_NAT_SI_SUB_FIREWALL	SI_SUB_PROTO_IFATTACHDOMAIN
+#define	IPFW_NAT_SI_SUB_FIREWALL	(SI_SUB_PROTO_IFATTACHDOMAIN + 1)
 #define	IPFW_NAT_MODEVENT_ORDER		(SI_ORDER_ANY - 255)
 #define	IPFW_NAT_MODULE_ORDER		(IPFW_NAT_MODEVENT_ORDER + 1)
 #define	IPFW_NAT_VNET_ORDER		(IPFW_NAT_MODEVENT_ORDER + 2)
diff --git a/sys/netpfil/ipfw/ip_fw_pfil.c b/sys/netpfil/ipfw/ip_fw_pfil.c
index 79973b1f05c..dcef12a2166 100644
--- a/sys/netpfil/ipfw/ip_fw_pfil.c
+++ b/sys/netpfil/ipfw/ip_fw_pfil.c
@@ -82,9 +82,9 @@ int ipfw_chg_hook(SYSCTL_HANDLER_ARGS);
 
 /* Forward declarations. */
 static int ipfw_divert(struct mbuf **, int, struct ipfw_rule_ref *, int);
-static int ipfw_check_packet(void *, struct mbuf **, struct ifnet *, int,
+int ipfw_check_packet(void *, struct mbuf **, struct ifnet *, int,
 	struct inpcb *);
-static int ipfw_check_frame(void *, struct mbuf **, struct ifnet *, int,
+int ipfw_check_frame(void *, struct mbuf **, struct ifnet *, int,
 	struct inpcb *);
 
 #ifdef SYSCTL_NODE
@@ -116,7 +116,7 @@ SYSEND
  * dummynet, divert, netgraph or other modules.
  * The packet may be consumed.
  */
-static int
+int
 ipfw_check_packet(void *arg, struct mbuf **m0, struct ifnet *ifp, int dir,
     struct inpcb *inp)
 {
@@ -292,7 +292,7 @@ again:
  * Inteface is NULL from ether_demux, and ifp from
  * ether_output_frame.
  */
-static int
+int
 ipfw_check_frame(void *arg, struct mbuf **m0, struct ifnet *dst, int dir,
     struct inpcb *inp)
 {
diff --git a/sys/netpfil/ipfw/ip_fw_sockopt.c b/sys/netpfil/ipfw/ip_fw_sockopt.c
index 64f09a56a2a..38ee2affe16 100644
--- a/sys/netpfil/ipfw/ip_fw_sockopt.c
+++ b/sys/netpfil/ipfw/ip_fw_sockopt.c
@@ -653,7 +653,7 @@ check_ipfw_struct(struct ip_fw *rule, int size)
 
 		case O_IP_SRC_LOOKUP:
 		case O_IP_DST_LOOKUP:
-			if (cmd->arg1 >= IPFW_TABLES_MAX) {
+			if (cmd->arg1 >= V_fw_tables_max) {
 				printf("ipfw: invalid table number %d\n",
 				    cmd->arg1);
 				return (EINVAL);
diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c
index 1efd5e2b4fe..30e345724bb 100644
--- a/sys/netpfil/pf/if_pflog.c
+++ b/sys/netpfil/pf/if_pflog.c
@@ -52,9 +52,11 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_pflog.h>
 #include <net/if_types.h>
+#include <net/vnet.h>
 #include <net/pfvar.h>
 
 #if defined(INET) || defined(INET6)
diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
index 982f8563574..471be3e2dd8 100644
--- a/sys/netpfil/pf/if_pfsync.c
+++ b/sys/netpfil/pf/if_pfsync.c
@@ -81,8 +81,10 @@ __FBSDID("$FreeBSD$");
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_clone.h>
 #include <net/if_types.h>
+#include <net/vnet.h>
 #include <net/pfvar.h>
 #include <net/if_pfsync.h>
 
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index 2de8c40fa4e..b2e378890a9 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -61,13 +61,13 @@ __FBSDID("$FreeBSD$");
 #include <sys/ucred.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/route.h>
 #include <net/radix_mpath.h>
 #include <net/vnet.h>
 
 #include <net/pfvar.h>
-#include <net/pf_mtag.h>
 #include <net/if_pflog.h>
 #include <net/if_pfsync.h>
 
@@ -210,6 +210,8 @@ static void		 pf_change_ap(struct pf_addr *, u_int16_t *,
 			    u_int16_t, u_int8_t, sa_family_t);
 static int		 pf_modulate_sack(struct mbuf *, int, struct pf_pdesc *,
 			    struct tcphdr *, struct pf_state_peer *);
+static int		 pf_icmp_mapping(struct pf_pdesc *, uint8_t, int *,
+			    int *, uint16_t *, uint16_t *);
 static void		 pf_change_icmp(struct pf_addr *, u_int16_t *,
 			    struct pf_addr *, struct pf_addr *, u_int16_t,
 			    u_int16_t *, u_int16_t *, u_int16_t *,
@@ -256,6 +258,10 @@ static int		 pf_test_state_tcp(struct pf_state **, int,
 static int		 pf_test_state_udp(struct pf_state **, int,
 			    struct pfi_kif *, struct mbuf *, int,
 			    void *, struct pf_pdesc *);
+static int		 pf_icmp_state_lookup(struct pf_state_key_cmp *,
+			    struct pf_pdesc *, struct pf_state **, struct mbuf *,
+			    int, struct pfi_kif *, uint16_t, uint16_t,
+			    int, int *, int);
 static int		 pf_test_state_icmp(struct pf_state **, int,
 			    struct pfi_kif *, struct mbuf *, int,
 			    void *, struct pf_pdesc *, u_short *);
@@ -304,13 +310,15 @@ VNET_DECLARE(int, pf_end_threads);
 
 VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]);
 
+enum { PF_ICMP_MULTI_NONE, PF_ICMP_MULTI_SOLICITED, PF_ICMP_MULTI_LINK };
+
 #define	PACKET_LOOPED(pd)	((pd)->pf_mtag &&			\
 				 (pd)->pf_mtag->flags & PF_PACKET_LOOPED)
 
 #define	STATE_LOOKUP(i, k, d, s, pd)					\
 	do {								\
 		(s) = pf_find_state((i), (k), (d));			\
-		if ((s) == NULL || (s)->timeout == PFTM_PURGE)		\
+		if ((s) == NULL)					\
 			return (PF_DROP);				\
 		if (PACKET_LOOPED(pd))					\
 			return (PF_PASS);				\
@@ -673,20 +681,54 @@ pf_insert_src_node(struct pf_src_node **sn, struct pf_rule *rule,
 	return (0);
 }
 
-static void
-pf_remove_src_node(struct pf_src_node *src)
+void
+pf_unlink_src_node_locked(struct pf_src_node *src)
+{
+#ifdef INVARIANTS
+	struct pf_srchash *sh;
+
+	sh = &V_pf_srchash[pf_hashsrc(&src->addr, src->af)];
+	PF_HASHROW_ASSERT(sh);
+#endif
+	LIST_REMOVE(src, entry);
+	if (src->rule.ptr)
+		src->rule.ptr->src_nodes--;
+	V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++;
+	V_pf_status.src_nodes--;
+}
+
+void
+pf_unlink_src_node(struct pf_src_node *src)
 {
 	struct pf_srchash *sh;
 
 	sh = &V_pf_srchash[pf_hashsrc(&src->addr, src->af)];
 	PF_HASHROW_LOCK(sh);
-	LIST_REMOVE(src, entry);
+	pf_unlink_src_node_locked(src);
 	PF_HASHROW_UNLOCK(sh);
+}
 
-	V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++;
-	V_pf_status.src_nodes--;
+static void
+pf_free_src_node(struct pf_src_node *sn)
+{
 
-	uma_zfree(V_pf_sources_z, src);
+	KASSERT(sn->states == 0, ("%s: %p has refs", __func__, sn));
+	LIST_REMOVE(sn, entry);
+	uma_zfree(V_pf_sources_z, sn);
+}
+
+u_int
+pf_free_src_nodes(struct pf_src_node_list *head)
+{
+	struct pf_src_node *sn, *tmp;
+	u_int count = 0;
+
+	LIST_FOREACH_SAFE(sn, head, entry, tmp) {
+		pf_free_src_node(sn);
+		count++;
+	}
+
+	return (count);
 }
 
 /* Data storage structures initialization. */
@@ -1222,11 +1264,11 @@ pf_find_state(struct pfi_kif *kif, struct pf_state_key_cmp *key, u_int dir)
 		if (s->kif == V_pfi_all || s->kif == kif) {
 			PF_STATE_LOCK(s);
 			PF_HASHROW_UNLOCK(kh);
-			if (s->timeout == PFTM_UNLINKED) {
+			if (s->timeout >= PFTM_MAX) {
 				/*
-				 * State is being processed
-				 * by pf_unlink_state() in
-				 * an other thread.
+				 * State is either being processed by
+				 * pf_unlink_state() in an other thread, or
+				 * is scheduled for immediate expiry.
 				 */
 				PF_STATE_UNLOCK(s);
 				return (NULL);
@@ -1427,8 +1469,6 @@ pf_state_expires(const struct pf_state *state)
 	/* handle all PFTM_* > PFTM_MAX here */
 	if (state->timeout == PFTM_PURGE)
 		return (time_uptime);
-	if (state->timeout == PFTM_UNTIL_PACKET)
-		return (0);
 	KASSERT(state->timeout != PFTM_UNLINKED,
 	    ("pf_state_expires: timeout == PFTM_UNLINKED"));
 	KASSERT((state->timeout < PFTM_MAX),
@@ -1458,24 +1498,24 @@ pf_state_expires(const struct pf_state *state)
 void
 pf_purge_expired_src_nodes()
 {
+	struct pf_src_node_list	 freelist;
 	struct pf_srchash	*sh;
 	struct pf_src_node	*cur, *next;
 	int i;
 
+	LIST_INIT(&freelist);
 	for (i = 0, sh = V_pf_srchash; i <= V_pf_srchashmask; i++, sh++) {
 	    PF_HASHROW_LOCK(sh);
 	    LIST_FOREACH_SAFE(cur, &sh->nodes, entry, next)
-		if (cur->states <= 0 && cur->expire <= time_uptime) {
-			if (cur->rule.ptr != NULL)
-				cur->rule.ptr->src_nodes--;
-			LIST_REMOVE(cur, entry);
-			V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++;
-			V_pf_status.src_nodes--;
-			uma_zfree(V_pf_sources_z, cur);
+		if (cur->states == 0 && cur->expire <= time_uptime) {
+			pf_unlink_src_node_locked(cur);
+			LIST_INSERT_HEAD(&freelist, cur, entry);
 		} else if (cur->rule.ptr != NULL)
 			cur->rule.ptr->rule_flag |= PFRULE_REFS;
 	    PF_HASHROW_UNLOCK(sh);
 	}
+
+	pf_free_src_nodes(&freelist);
 }
 
 static void
@@ -1486,7 +1526,7 @@ pf_src_tree_remove_state(struct pf_state *s)
 	if (s->src_node != NULL) {
 		if (s->src.tcp_est)
 			--s->src_node->conn;
-		if (--s->src_node->states <= 0) {
+		if (--s->src_node->states == 0) {
 			timeout = s->rule.ptr->timeout[PFTM_SRC_NODE];
 			if (!timeout)
 				timeout =
@@ -1495,7 +1535,7 @@ pf_src_tree_remove_state(struct pf_state *s)
 		}
 	}
 	if (s->nat_src_node != s->src_node && s->nat_src_node != NULL) {
-		if (--s->nat_src_node->states <= 0) {
+		if (--s->nat_src_node->states == 0) {
 			timeout = s->rule.ptr->timeout[PFTM_SRC_NODE];
 			if (!timeout)
 				timeout =
@@ -2018,6 +2058,155 @@ pf_change_a6(struct pf_addr *a, u_int16_t *c, struct pf_addr *an, u_int8_t u)
 }
 #endif /* INET6 */
 
+static int
+pf_icmp_mapping(struct pf_pdesc *pd, uint8_t type,
+    int *icmp_dir, int *multi, uint16_t *icmpid, uint16_t *icmptype)
+{
+	/*
+	 * ICMP types marked with PF_OUT are typically responses to
+	 * PF_IN, and will match states in the opposite direction.
+	 * PF_IN ICMP types need to match a state with that type.
+	 */
+	*icmp_dir = PF_OUT;
+	*multi = PF_ICMP_MULTI_LINK;
+	/* Queries (and responses) */
+	switch (type) {
+	case ICMP_ECHO:
+		*icmp_dir = PF_IN;
+	case ICMP_ECHOREPLY:
+		*icmptype = ICMP_ECHO;
+		*icmpid = pd->hdr.icmp->icmp_id;
+		break;
+
+	case ICMP_TSTAMP:
+		*icmp_dir = PF_IN;
+	case ICMP_TSTAMPREPLY:
+		*icmptype = ICMP_TSTAMP;
+		*icmpid = pd->hdr.icmp->icmp_id;
+		break;
+
+	case ICMP_IREQ:
+		*icmp_dir = PF_IN;
+	case ICMP_IREQREPLY:
+		*icmptype = ICMP_IREQ;
+		*icmpid = pd->hdr.icmp->icmp_id;
+		break;
+
+	case ICMP_MASKREQ:
+		*icmp_dir = PF_IN;
+	case ICMP_MASKREPLY:
+		*icmptype = ICMP_MASKREQ;
+		*icmpid = pd->hdr.icmp->icmp_id;
+		break;
+
+	case ICMP_IPV6_WHEREAREYOU:
+		*icmp_dir = PF_IN;
+	case ICMP_IPV6_IAMHERE:
+		*icmptype = ICMP_IPV6_WHEREAREYOU;
+		*icmpid = 0; /* Nothing sane to match on! */
+		break;
+
+	case ICMP_MOBILE_REGREQUEST:
+		*icmp_dir = PF_IN;
+	case ICMP_MOBILE_REGREPLY:
+		*icmptype = ICMP_MOBILE_REGREQUEST;
+		*icmpid = 0; /* Nothing sane to match on! */
+		break;
+
+	case ICMP_ROUTERSOLICIT:
+		*icmp_dir = PF_IN;
+	case ICMP_ROUTERADVERT:
+		*icmptype = ICMP_MOBILE_REGREQUEST;
+		*icmpid = 0; /* Nothing sane to match on! */
+		break;
+
+#ifdef INET6
+	case ICMP6_ECHO_REQUEST:
+		*icmp_dir = PF_IN;
+	case ICMP6_ECHO_REPLY:
+		*icmptype = ICMP6_ECHO_REPLY;
+		*icmpid = 0; /* Nothing sane to match on! */
+		break;
+
+	case MLD_LISTENER_QUERY:
+		*icmp_dir = PF_IN;
+	case MLD_LISTENER_REPORT: {
+		struct mld_hdr *mld = (void *)pd->hdr.icmp6;
+
+		*icmptype = MLD_LISTENER_QUERY;
+		/* generate fake id for these messages */
+		*icmpid = (mld->mld_addr.s6_addr32[0] ^
+			mld->mld_addr.s6_addr32[1] ^
+			mld->mld_addr.s6_addr32[2] ^
+			mld->mld_addr.s6_addr32[3]) & 0xffff;
+		break;
+	}
+
+	/* ICMP6_FQDN and ICMP6_NI query/reply are the same type as ICMP6_WRU */
+	case ICMP6_WRUREQUEST:
+		*icmp_dir = PF_IN;
+	case ICMP6_WRUREPLY:
+		*icmptype = ICMP6_WRUREQUEST;
+		*icmpid = 0; /* Nothing sane to match on! */
+		break;
+
+	case MLD_MTRACE:
+		*icmp_dir = PF_IN;
+	case MLD_MTRACE_RESP:
+		*icmptype = MLD_MTRACE;
+		*icmpid = 0; /* Nothing sane to match on! */
+		break;
+
+	case ND_NEIGHBOR_SOLICIT:
+		*icmp_dir = PF_IN;
+	case ND_NEIGHBOR_ADVERT: {
+		struct nd_neighbor_solicit *nd = (void *)pd->hdr.icmp6;
+
+		*icmptype = ND_NEIGHBOR_SOLICIT;
+		*multi = PF_ICMP_MULTI_SOLICITED;
+		/* generate fake id for these messages */
+		*icmpid = (nd->nd_ns_target.s6_addr32[0] ^
+			nd->nd_ns_target.s6_addr32[1] ^
+			nd->nd_ns_target.s6_addr32[2] ^
+			nd->nd_ns_target.s6_addr32[3]) & 0xffff;
+		break;
+	}
+
+#endif /* INET6 */
+	/* These ICMP types map to other connections */
+	case ICMP_UNREACH:
+	case ICMP_SOURCEQUENCH:
+	case ICMP_REDIRECT:
+	case ICMP_TIMXCEED:
+	case ICMP_PARAMPROB:
+#ifdef INET6
+	/*
+	 * ICMP6_TIME_EXCEEDED is the same type as ICMP_UNREACH
+	 * ND_REDIRECT can't be in this list because the triggering packet
+	 * header is optional.
+	 */
+	case ICMP6_PACKET_TOO_BIG:
+#endif /* INET6 */
+		/* These will not be used, but set them anyways */
+		*icmp_dir = PF_IN;
+		*icmptype = htons(type);
+		*icmpid = 0;
+		return (1);	/* These types are matched to other state */
+	/*
+	 * All remaining ICMP types get their own states,
+	 * and will only match in one direction.
+	 */
+	default:
+		*icmp_dir = PF_IN;
+		*icmptype = type;
+		*icmpid = 0;
+		break;
+	}
+	*icmptype = htons(*icmptype);
+
+	return (0);
+}
+
 static void
 pf_change_icmp(struct pf_addr *ia, u_int16_t *ip, struct pf_addr *oa,
     struct pf_addr *na, u_int16_t np, u_int16_t *pc, u_int16_t *h2c,
@@ -2992,8 +3181,8 @@ pf_test_rule(struct pf_rule **rm, struct pf_state **sm, int direction,
 	int			 tag = -1, rtableid = -1;
 	int			 asd = 0;
 	int			 match = 0;
-	int			 state_icmp = 0;
-	u_int16_t		 sport = 0, dport = 0;
+	int			 state_icmp = 0, icmp_dir, multi;
+	uint16_t		 sport = 0 , dport = 0, virtual_type = 0, virtual_id = 0;
 	u_int16_t		 bproto_sum = 0, bip_sum = 0;
 	u_int8_t		 icmptype = 0, icmpcode = 0;
 	struct pf_anchor_stackframe	anchor_stack[PF_ANCHOR_STACKSIZE];
@@ -3022,33 +3211,38 @@ pf_test_rule(struct pf_rule **rm, struct pf_state **sm, int direction,
 	case IPPROTO_ICMP:
 		if (pd->af != AF_INET)
 			break;
-		sport = dport = pd->hdr.icmp->icmp_id;
 		hdrlen = sizeof(*pd->hdr.icmp);
 		icmptype = pd->hdr.icmp->icmp_type;
 		icmpcode = pd->hdr.icmp->icmp_code;
 
-		if (icmptype == ICMP_UNREACH ||
-		    icmptype == ICMP_SOURCEQUENCH ||
-		    icmptype == ICMP_REDIRECT ||
-		    icmptype == ICMP_TIMXCEED ||
-		    icmptype == ICMP_PARAMPROB)
-			state_icmp++;
+		state_icmp = pf_icmp_mapping(pd, icmptype,
+		    &icmp_dir, &multi, &virtual_id, &virtual_type);
+		if (icmp_dir == PF_IN) {
+			sport = virtual_id;
+			dport = virtual_type;
+		} else {
+			sport = virtual_type;
+			dport = virtual_id;
+		}
 		break;
 #endif /* INET */
 #ifdef INET6
 	case IPPROTO_ICMPV6:
 		if (af != AF_INET6)
 			break;
-		sport = dport = pd->hdr.icmp6->icmp6_id;
 		hdrlen = sizeof(*pd->hdr.icmp6);
 		icmptype = pd->hdr.icmp6->icmp6_type;
 		icmpcode = pd->hdr.icmp6->icmp6_code;
 
-		if (icmptype == ICMP6_DST_UNREACH ||
-		    icmptype == ICMP6_PACKET_TOO_BIG ||
-		    icmptype == ICMP6_TIME_EXCEEDED ||
-		    icmptype == ICMP6_PARAM_PROB)
-			state_icmp++;
+		state_icmp = pf_icmp_mapping(pd, icmptype,
+		    &icmp_dir, &multi, &virtual_id, &virtual_type);
+		if (icmp_dir == PF_IN) {
+			sport = virtual_id;
+			dport = virtual_type;
+		} else {
+			sport = virtual_type;
+			dport = virtual_id;
+		}
 		break;
 #endif /* INET6 */
 	default:
@@ -3118,7 +3312,6 @@ pf_test_rule(struct pf_rule **rm, struct pf_state **sm, int direction,
 			break;
 #ifdef INET
 		case IPPROTO_ICMP:
-			nk->port[0] = nk->port[1];
 			if (PF_ANEQ(saddr, &nk->addr[pd->sidx], AF_INET))
 				pf_change_a(&saddr->v4.s_addr, pd->ip_sum,
 				    nk->addr[pd->sidx].v4.s_addr, 0);
@@ -3127,11 +3320,12 @@ pf_test_rule(struct pf_rule **rm, struct pf_state **sm, int direction,
 				pf_change_a(&daddr->v4.s_addr, pd->ip_sum,
 				    nk->addr[pd->didx].v4.s_addr, 0);
 
-			if (nk->port[1] != pd->hdr.icmp->icmp_id) {
+			if (virtual_type == ICMP_ECHO &&
+			     nk->port[pd->sidx] != pd->hdr.icmp->icmp_id) {
 				pd->hdr.icmp->icmp_cksum = pf_cksum_fixup(
 				    pd->hdr.icmp->icmp_cksum, sport,
-				    nk->port[1], 0);
-				pd->hdr.icmp->icmp_id = nk->port[1];
+				    nk->port[pd->sidx], 0);
+				pd->hdr.icmp->icmp_id = nk->port[pd->sidx];
 				pd->sport = &pd->hdr.icmp->icmp_id;
 			}
 			m_copyback(m, off, ICMP_MINLEN, (caddr_t)pd->hdr.icmp);
@@ -3611,11 +3805,15 @@ csfailed:
 	if (nk != NULL)
 		uma_zfree(V_pf_state_key_z, nk);
 
-	if (sn != NULL && sn->states == 0 && sn->expire == 0)
-		pf_remove_src_node(sn);
+	if (sn != NULL && sn->states == 0 && sn->expire == 0) {
+		pf_unlink_src_node(sn);
+		pf_free_src_node(sn);
+	}
 
-	if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0)
-		pf_remove_src_node(nsn);
+	if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0) {
+		pf_unlink_src_node(nsn);
+		pf_free_src_node(nsn);
+	}
 
 	return (PF_DROP);
 }
@@ -4347,14 +4545,70 @@ pf_test_state_udp(struct pf_state **state, int direction, struct pfi_kif *kif,
 	return (PF_PASS);
 }
 
+static int
+pf_icmp_state_lookup(struct pf_state_key_cmp *key, struct pf_pdesc *pd,
+    struct pf_state **state, struct mbuf *m, int direction, struct pfi_kif *kif,
+    uint16_t icmpid, uint16_t type, int icmp_dir, int *iidx, int multi)
+{
+
+	key->af = pd->af;
+	key->proto = pd->proto;
+	if (icmp_dir == PF_IN) {
+		*iidx = pd->sidx;
+		key->port[pd->sidx] = icmpid;
+		key->port[pd->didx] = type;
+	} else {
+		*iidx = pd->didx;
+		key->port[pd->sidx] = type;
+		key->port[pd->didx] = icmpid;
+	}
+#ifdef INET6
+	if (pd->af == AF_INET6 && multi != PF_ICMP_MULTI_NONE) {
+		switch (multi) {
+		case PF_ICMP_MULTI_SOLICITED:
+			key->addr[pd->sidx].addr32[0] = IPV6_ADDR_INT32_MLL;
+			key->addr[pd->sidx].addr32[1] = 0;
+			key->addr[pd->sidx].addr32[2] = IPV6_ADDR_INT32_ONE;
+			key->addr[pd->sidx].addr32[3] = pd->src->addr32[3];
+			key->addr[pd->sidx].addr8[12] = 0xff;
+			break;
+		case PF_ICMP_MULTI_LINK:
+			key->addr[pd->sidx].addr32[0] = IPV6_ADDR_INT32_MLL;
+			key->addr[pd->sidx].addr32[1] = 0;
+			key->addr[pd->sidx].addr32[2] = 0;
+			key->addr[pd->sidx].addr32[3] = IPV6_ADDR_INT32_ONE;
+			break;
+		}
+	} else
+#endif
+		PF_ACPY(&key->addr[pd->sidx], pd->src, key->af);
+	PF_ACPY(&key->addr[pd->didx], pd->dst, key->af);
+
+	STATE_LOOKUP(kif, key, direction, *state, pd);
+
+	/* Is this ICMP message flowing in right direction? */
+	if ((*state)->rule.ptr->type &&
+	    (((*state)->direction == direction) ?
+	    PF_IN : PF_OUT) != icmp_dir) {
+		if (V_pf_status.debug >= PF_DEBUG_MISC) {
+			printf("pf: icmp type %d in wrong direction (%d): ",
+			    icmp_dir, direction);
+			pf_print_state(*state);
+			printf("\n");
+		}
+		return (PF_DROP);
+	}
+	return (-1);
+}
+
 static int
 pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif,
     struct mbuf *m, int off, void *h, struct pf_pdesc *pd, u_short *reason)
 {
 	struct pf_addr  *saddr = pd->src, *daddr = pd->dst;
-	u_int16_t	 icmpid = 0, *icmpsum;
+	u_int16_t	 icmpid = 0, *icmpsum, virtual_id, virtual_type;
 	u_int8_t	 icmptype;
-	int		 state_icmp = 0;
+	int		 icmp_dir, iidx, ret, multi;
 	struct pf_state_key_cmp key;
 
 	bzero(&key, sizeof(key));
@@ -4365,12 +4619,6 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif,
 		icmpid = pd->hdr.icmp->icmp_id;
 		icmpsum = &pd->hdr.icmp->icmp_cksum;
 
-		if (icmptype == ICMP_UNREACH ||
-		    icmptype == ICMP_SOURCEQUENCH ||
-		    icmptype == ICMP_REDIRECT ||
-		    icmptype == ICMP_TIMXCEED ||
-		    icmptype == ICMP_PARAMPROB)
-			state_icmp++;
 		break;
 #endif /* INET */
 #ifdef INET6
@@ -4379,34 +4627,35 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif,
 		icmpid = pd->hdr.icmp6->icmp6_id;
 		icmpsum = &pd->hdr.icmp6->icmp6_cksum;
 
-		if (icmptype == ICMP6_DST_UNREACH ||
-		    icmptype == ICMP6_PACKET_TOO_BIG ||
-		    icmptype == ICMP6_TIME_EXCEEDED ||
-		    icmptype == ICMP6_PARAM_PROB)
-			state_icmp++;
 		break;
 #endif /* INET6 */
+	default:
+		panic("%s: proto %d\n", __func__, pd->proto);
 	}
 
-	if (!state_icmp) {
-
+	if (pf_icmp_mapping(pd, icmptype, &icmp_dir, &multi,
+	    &virtual_id, &virtual_type) == 0) {
 		/*
 		 * ICMP query/reply message not related to a TCP/UDP packet.
 		 * Search for an ICMP state.
 		 */
-		key.af = pd->af;
-		key.proto = pd->proto;
-		key.port[0] = key.port[1] = icmpid;
-		if (direction == PF_IN)	{	/* wire side, straight */
-			PF_ACPY(&key.addr[0], pd->src, key.af);
-			PF_ACPY(&key.addr[1], pd->dst, key.af);
-		} else {			/* stack side, reverse */
-			PF_ACPY(&key.addr[1], pd->src, key.af);
-			PF_ACPY(&key.addr[0], pd->dst, key.af);
+		ret = pf_icmp_state_lookup(&key, pd, state, m, direction,
+		    kif, virtual_id, virtual_type, icmp_dir, &iidx,
+		    PF_ICMP_MULTI_NONE);
+		if (ret >= 0) {
+			if (ret == PF_DROP && pd->af == AF_INET6 &&
+			    icmp_dir == PF_OUT) {
+				if (*state)
+					PF_STATE_UNLOCK(*state);
+				ret = pf_icmp_state_lookup(&key, pd, state, m,
+				    direction, kif, virtual_id, virtual_type,
+				    icmp_dir, &iidx, multi);
+				if (ret >= 0)
+					return (ret);
+			} else
+				return (ret);
 		}
 
-		STATE_LOOKUP(kif, &key, direction, *state, pd);
-
 		(*state)->expire = time_uptime;
 		(*state)->timeout = PFTM_ICMP_ERROR_REPLY;
 
@@ -4429,14 +4678,13 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif,
 					    pd->ip_sum,
 					    nk->addr[pd->didx].v4.s_addr, 0);
 
-				if (nk->port[0] !=
+				if (nk->port[iidx] !=
 				    pd->hdr.icmp->icmp_id) {
 					pd->hdr.icmp->icmp_cksum =
 					    pf_cksum_fixup(
 					    pd->hdr.icmp->icmp_cksum, icmpid,
-					    nk->port[pd->sidx], 0);
-					pd->hdr.icmp->icmp_id =
-					    nk->port[pd->sidx];
+					    nk->port[iidx], 0);
+					pd->hdr.icmp->icmp_id = nk->port[iidx];
 				}
 
 				m_copyback(m, off, ICMP_MINLEN,
@@ -4786,13 +5034,15 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif,
 				return (PF_DROP);
 			}
 
-			key.af = pd2.af;
-			key.proto = IPPROTO_ICMP;
-			PF_ACPY(&key.addr[pd2.sidx], pd2.src, key.af);
-			PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af);
-			key.port[0] = key.port[1] = iih.icmp_id;
+			pd2.hdr.icmp = &iih;
+			pf_icmp_mapping(&pd2, iih.icmp_type,
+			    &icmp_dir, &multi, &virtual_id, &virtual_type);
 
-			STATE_LOOKUP(kif, &key, direction, *state, pd);
+			ret = pf_icmp_state_lookup(&key, &pd2, state, m,
+			    direction, kif, virtual_id, virtual_type,
+			    icmp_dir, &iidx, PF_ICMP_MULTI_NONE);
+			if (ret >= 0)
+				return (ret);
 
 			/* translate source/destination address, if necessary */
 			if ((*state)->key[PF_SK_WIRE] !=
@@ -4802,20 +5052,20 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif,
 
 				if (PF_ANEQ(pd2.src,
 				    &nk->addr[pd2.sidx], pd2.af) ||
-				    nk->port[pd2.sidx] != iih.icmp_id)
-					pf_change_icmp(pd2.src, &iih.icmp_id,
+				    (virtual_type == ICMP_ECHO &&
+				    nk->port[iidx] != iih.icmp_id))
+					pf_change_icmp(pd2.src,
+					    (virtual_type == ICMP_ECHO) ?
+					    &iih.icmp_id : NULL,
 					    daddr, &nk->addr[pd2.sidx],
 					    nk->port[pd2.sidx], NULL,
 					    pd2.ip_sum, icmpsum,
 					    pd->ip_sum, 0, AF_INET);
 
 				if (PF_ANEQ(pd2.dst,
-				    &nk->addr[pd2.didx], pd2.af) ||
-				    nk->port[pd2.didx] != iih.icmp_id)
-					pf_change_icmp(pd2.dst, &iih.icmp_id,
-					    NULL, /* XXX Inbound NAT? */
-					    &nk->addr[pd2.didx],
-					    nk->port[pd2.didx], NULL,
+				    &nk->addr[pd2.didx], pd2.af))
+                                       pf_change_icmp(pd2.dst, NULL, NULL,
+					    &nk->addr[pd2.didx], 0, NULL,
 					    pd2.ip_sum, icmpsum,
 					    pd->ip_sum, 0, AF_INET);
 
@@ -4839,13 +5089,26 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif,
 				return (PF_DROP);
 			}
 
-			key.af = pd2.af;
-			key.proto = IPPROTO_ICMPV6;
-			PF_ACPY(&key.addr[pd2.sidx], pd2.src, key.af);
-			PF_ACPY(&key.addr[pd2.didx], pd2.dst, key.af);
-			key.port[0] = key.port[1] = iih.icmp6_id;
-
-			STATE_LOOKUP(kif, &key, direction, *state, pd);
+			pd2.hdr.icmp6 = &iih;
+			pf_icmp_mapping(&pd2, iih.icmp6_type,
+			    &icmp_dir, &multi, &virtual_id, &virtual_type);
+			ret = pf_icmp_state_lookup(&key, &pd2, state, m,
+			    direction, kif, virtual_id, virtual_type,
+			    icmp_dir, &iidx, PF_ICMP_MULTI_NONE);
+			if (ret >= 0) {
+				if (ret == PF_DROP && pd->af == AF_INET6 &&
+				    icmp_dir == PF_OUT) {
+					if (*state)
+						PF_STATE_UNLOCK(*state);
+					ret = pf_icmp_state_lookup(&key, pd,
+					    state, m, direction, kif,
+					    virtual_id, virtual_type,
+					    icmp_dir, &iidx, multi);
+					if (ret >= 0)
+						return (ret);
+				} else
+					return (ret);
+			}
 
 			/* translate source/destination address, if necessary */
 			if ((*state)->key[PF_SK_WIRE] !=
@@ -4855,20 +5118,21 @@ pf_test_state_icmp(struct pf_state **state, int direction, struct pfi_kif *kif,
 
 				if (PF_ANEQ(pd2.src,
 				    &nk->addr[pd2.sidx], pd2.af) ||
-				    nk->port[pd2.sidx] != iih.icmp6_id)
-					pf_change_icmp(pd2.src, &iih.icmp6_id,
+			 	    ((virtual_type == ICMP6_ECHO_REQUEST) &&
+				    nk->port[pd2.sidx] != iih.icmp6_id))
+					pf_change_icmp(pd2.src,
+					    (virtual_type == ICMP6_ECHO_REQUEST)
+					    ? &iih.icmp6_id : NULL,
 					    daddr, &nk->addr[pd2.sidx],
-					    nk->port[pd2.sidx], NULL,
+					    (virtual_type == ICMP6_ECHO_REQUEST)
+					    ? nk->port[iidx] : 0, NULL,
 					    pd2.ip_sum, icmpsum,
 					    pd->ip_sum, 0, AF_INET6);
 
 				if (PF_ANEQ(pd2.dst,
-				    &nk->addr[pd2.didx], pd2.af) ||
-				    nk->port[pd2.didx] != iih.icmp6_id)
-					pf_change_icmp(pd2.dst, &iih.icmp6_id,
-					    NULL, /* XXX Inbound NAT? */
-					    &nk->addr[pd2.didx],
-					    nk->port[pd2.didx], NULL,
+				    &nk->addr[pd2.didx], pd2.af))
+					pf_change_icmp(pd2.dst, NULL, NULL,
+					    &nk->addr[pd2.didx], 0, NULL,
 					    pd2.ip_sum, icmpsum,
 					    pd->ip_sum, 0, AF_INET6);
 
@@ -6192,10 +6456,32 @@ pf_test6(int dir, struct ifnet *ifp, struct mbuf **m0, struct inpcb *inp)
 	}
 
 	case IPPROTO_ICMPV6: {
-		struct icmp6_hdr	ih;
+		union {
+			struct icmp6_hdr		icmp6;
+			struct mld_hdr			mld;
+			struct nd_neighbor_solicit	nd;
+		} ih;
+		size_t	icmp_hlen = sizeof(struct icmp6_hdr);
 
-		pd.hdr.icmp6 = &ih;
-		if (!pf_pull_hdr(m, off, &ih, sizeof(ih),
+		pd.hdr.icmp6 = &ih.icmp6;
+		if (!pf_pull_hdr(m, off, &ih, icmp_hlen,
+		    &action, &reason, AF_INET6)) {
+			log = action != PF_PASS;
+			goto done;
+		}
+		/* ICMP headers we look further into to match state */
+		switch (ih.icmp6.icmp6_type) {
+		case MLD_LISTENER_QUERY:
+		case MLD_LISTENER_REPORT:
+			icmp_hlen = sizeof(struct mld_hdr);
+			break;
+		case ND_NEIGHBOR_SOLICIT:
+		case ND_NEIGHBOR_ADVERT:
+			icmp_hlen = sizeof(struct nd_neighbor_solicit);
+			break;
+		}
+		if (icmp_hlen > sizeof(struct icmp6_hdr) &&
+		    !pf_pull_hdr(m, off, &ih, icmp_hlen,
 		    &action, &reason, AF_INET6)) {
 			log = action != PF_PASS;
 			goto done;
diff --git a/sys/netpfil/pf/pf.h b/sys/netpfil/pf/pf.h
new file mode 100644
index 00000000000..8d2c0f73c7c
--- /dev/null
+++ b/sys/netpfil/pf/pf.h
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2001 Daniel Hartmeier
+ * 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.
+ *
+ *	$OpenBSD: pfvar.h,v 1.282 2009/01/29 15:12:28 pyr Exp $
+ *	$FreeBSD$
+ */
+
+#ifndef	_NET_PF_H_
+#define	_NET_PFAR_H_
+
+#define	PF_TCPS_PROXY_SRC	((TCP_NSTATES)+0)
+#define	PF_TCPS_PROXY_DST	((TCP_NSTATES)+1)
+
+#define	PF_MD5_DIGEST_LENGTH	16
+#ifdef MD5_DIGEST_LENGTH
+#if PF_MD5_DIGEST_LENGTH != MD5_DIGEST_LENGTH
+#error
+#endif
+#endif
+
+enum	{ PF_INOUT, PF_IN, PF_OUT };
+enum	{ PF_PASS, PF_DROP, PF_SCRUB, PF_NOSCRUB, PF_NAT, PF_NONAT,
+	  PF_BINAT, PF_NOBINAT, PF_RDR, PF_NORDR, PF_SYNPROXY_DROP, PF_DEFER };
+enum	{ PF_RULESET_SCRUB, PF_RULESET_FILTER, PF_RULESET_NAT,
+	  PF_RULESET_BINAT, PF_RULESET_RDR, PF_RULESET_MAX };
+enum	{ PF_OP_NONE, PF_OP_IRG, PF_OP_EQ, PF_OP_NE, PF_OP_LT,
+	  PF_OP_LE, PF_OP_GT, PF_OP_GE, PF_OP_XRG, PF_OP_RRG };
+enum	{ PF_DEBUG_NONE, PF_DEBUG_URGENT, PF_DEBUG_MISC, PF_DEBUG_NOISY };
+enum	{ PF_CHANGE_NONE, PF_CHANGE_ADD_HEAD, PF_CHANGE_ADD_TAIL,
+	  PF_CHANGE_ADD_BEFORE, PF_CHANGE_ADD_AFTER,
+	  PF_CHANGE_REMOVE, PF_CHANGE_GET_TICKET };
+enum	{ PF_GET_NONE, PF_GET_CLR_CNTR };
+enum	{ PF_SK_WIRE, PF_SK_STACK, PF_SK_BOTH };
+
+/*
+ * Note about PFTM_*: real indices into pf_rule.timeout[] come before
+ * PFTM_MAX, special cases afterwards. See pf_state_expires().
+ */
+enum	{ PFTM_TCP_FIRST_PACKET, PFTM_TCP_OPENING, PFTM_TCP_ESTABLISHED,
+	  PFTM_TCP_CLOSING, PFTM_TCP_FIN_WAIT, PFTM_TCP_CLOSED,
+	  PFTM_UDP_FIRST_PACKET, PFTM_UDP_SINGLE, PFTM_UDP_MULTIPLE,
+	  PFTM_ICMP_FIRST_PACKET, PFTM_ICMP_ERROR_REPLY,
+	  PFTM_OTHER_FIRST_PACKET, PFTM_OTHER_SINGLE,
+	  PFTM_OTHER_MULTIPLE, PFTM_FRAG, PFTM_INTERVAL,
+	  PFTM_ADAPTIVE_START, PFTM_ADAPTIVE_END, PFTM_SRC_NODE,
+	  PFTM_TS_DIFF, PFTM_MAX, PFTM_PURGE, PFTM_UNLINKED };
+
+/* PFTM default values */
+#define PFTM_TCP_FIRST_PACKET_VAL	120	/* First TCP packet */
+#define PFTM_TCP_OPENING_VAL		30	/* No response yet */
+#define PFTM_TCP_ESTABLISHED_VAL	24*60*60/* Established */
+#define PFTM_TCP_CLOSING_VAL		15 * 60	/* Half closed */
+#define PFTM_TCP_FIN_WAIT_VAL		45	/* Got both FINs */
+#define PFTM_TCP_CLOSED_VAL		90	/* Got a RST */
+#define PFTM_UDP_FIRST_PACKET_VAL	60	/* First UDP packet */
+#define PFTM_UDP_SINGLE_VAL		30	/* Unidirectional */
+#define PFTM_UDP_MULTIPLE_VAL		60	/* Bidirectional */
+#define PFTM_ICMP_FIRST_PACKET_VAL	20	/* First ICMP packet */
+#define PFTM_ICMP_ERROR_REPLY_VAL	10	/* Got error response */
+#define PFTM_OTHER_FIRST_PACKET_VAL	60	/* First packet */
+#define PFTM_OTHER_SINGLE_VAL		30	/* Unidirectional */
+#define PFTM_OTHER_MULTIPLE_VAL		60	/* Bidirectional */
+#define PFTM_FRAG_VAL			30	/* Fragment expire */
+#define PFTM_INTERVAL_VAL		10	/* Expire interval */
+#define PFTM_SRC_NODE_VAL		0	/* Source tracking */
+#define PFTM_TS_DIFF_VAL		30	/* Allowed TS diff */
+
+enum	{ PF_NOPFROUTE, PF_FASTROUTE, PF_ROUTETO, PF_DUPTO, PF_REPLYTO };
+enum	{ PF_LIMIT_STATES, PF_LIMIT_SRC_NODES, PF_LIMIT_FRAGS,
+	  PF_LIMIT_TABLE_ENTRIES, PF_LIMIT_MAX };
+#define PF_POOL_IDMASK		0x0f
+enum	{ PF_POOL_NONE, PF_POOL_BITMASK, PF_POOL_RANDOM,
+	  PF_POOL_SRCHASH, PF_POOL_ROUNDROBIN };
+enum	{ PF_ADDR_ADDRMASK, PF_ADDR_NOROUTE, PF_ADDR_DYNIFTL,
+	  PF_ADDR_TABLE, PF_ADDR_URPFFAILED,
+	  PF_ADDR_RANGE };
+#define PF_POOL_TYPEMASK	0x0f
+#define PF_POOL_STICKYADDR	0x20
+#define	PF_WSCALE_FLAG		0x80
+#define	PF_WSCALE_MASK		0x0f
+
+#define	PF_LOG			0x01
+#define	PF_LOG_ALL		0x02
+#define	PF_LOG_SOCKET_LOOKUP	0x04
+
+/* Reasons code for passing/dropping a packet */
+#define PFRES_MATCH	0		/* Explicit match of a rule */
+#define PFRES_BADOFF	1		/* Bad offset for pull_hdr */
+#define PFRES_FRAG	2		/* Dropping following fragment */
+#define PFRES_SHORT	3		/* Dropping short packet */
+#define PFRES_NORM	4		/* Dropping by normalizer */
+#define PFRES_MEMORY	5		/* Dropped due to lacking mem */
+#define PFRES_TS	6		/* Bad TCP Timestamp (RFC1323) */
+#define PFRES_CONGEST	7		/* Congestion (of ipintrq) */
+#define PFRES_IPOPTIONS 8		/* IP option */
+#define PFRES_PROTCKSUM 9		/* Protocol checksum invalid */
+#define PFRES_BADSTATE	10		/* State mismatch */
+#define PFRES_STATEINS	11		/* State insertion failure */
+#define PFRES_MAXSTATES	12		/* State limit */
+#define PFRES_SRCLIMIT	13		/* Source node/conn limit */
+#define PFRES_SYNPROXY	14		/* SYN proxy */
+#define PFRES_MAX	15		/* total+1 */
+
+#define PFRES_NAMES { \
+	"match", \
+	"bad-offset", \
+	"fragment", \
+	"short", \
+	"normalize", \
+	"memory", \
+	"bad-timestamp", \
+	"congestion", \
+	"ip-option", \
+	"proto-cksum", \
+	"state-mismatch", \
+	"state-insert", \
+	"state-limit", \
+	"src-limit", \
+	"synproxy", \
+	NULL \
+}
+
+#define	PF_TABLE_NAME_SIZE	32
+#define	PF_QNAME_SIZE		64
+
+#endif	/* _NET_PF_H_ */
diff --git a/sys/netpfil/pf/pf_altq.h b/sys/netpfil/pf/pf_altq.h
new file mode 100644
index 00000000000..eda09651d64
--- /dev/null
+++ b/sys/netpfil/pf/pf_altq.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2001 Daniel Hartmeier
+ * 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.
+ *
+ *	$OpenBSD: pfvar.h,v 1.282 2009/01/29 15:12:28 pyr Exp $
+ *	$FreeBSD$
+ */
+
+#ifndef	_NET_PF_ALTQ_H_
+#define	_NET_PF_ALTQ_H_
+
+struct cbq_opts {
+	u_int		minburst;
+	u_int		maxburst;
+	u_int		pktsize;
+	u_int		maxpktsize;
+	u_int		ns_per_byte;
+	u_int		maxidle;
+	int		minidle;
+	u_int		offtime;
+	int		flags;
+};
+
+struct priq_opts {
+	int		flags;
+};
+
+struct hfsc_opts {
+	/* real-time service curve */
+	u_int		rtsc_m1;	/* slope of the 1st segment in bps */
+	u_int		rtsc_d;		/* the x-projection of m1 in msec */
+	u_int		rtsc_m2;	/* slope of the 2nd segment in bps */
+	/* link-sharing service curve */
+	u_int		lssc_m1;
+	u_int		lssc_d;
+	u_int		lssc_m2;
+	/* upper-limit service curve */
+	u_int		ulsc_m1;
+	u_int		ulsc_d;
+	u_int		ulsc_m2;
+	int		flags;
+};
+
+struct pf_altq {
+	char			 ifname[IFNAMSIZ];
+
+	void			*altq_disc;	/* discipline-specific state */
+	TAILQ_ENTRY(pf_altq)	 entries;
+
+	/* scheduler spec */
+	uint8_t			 scheduler;	/* scheduler type */
+	uint16_t		 tbrsize;	/* tokenbucket regulator size */
+	uint32_t		 ifbandwidth;	/* interface bandwidth */
+
+	/* queue spec */
+	char			 qname[PF_QNAME_SIZE];	/* queue name */
+	char			 parent[PF_QNAME_SIZE];	/* parent name */
+	uint32_t		 parent_qid;	/* parent queue id */
+	uint32_t		 bandwidth;	/* queue bandwidth */
+	uint8_t			 priority;	/* priority */
+	uint8_t			 local_flags;	/* dynamic interface */
+#define	PFALTQ_FLAG_IF_REMOVED		0x01
+
+	uint16_t		 qlimit;	/* queue size limit */
+	uint16_t		 flags;		/* misc flags */
+	union {
+		struct cbq_opts		 cbq_opts;
+		struct priq_opts	 priq_opts;
+		struct hfsc_opts	 hfsc_opts;
+	} pq_u;
+
+	uint32_t		 qid;		/* return value */
+};
+
+#endif	/* _NET_PF_ALTQ_H_ */
diff --git a/sys/netpfil/pf/pf_if.c b/sys/netpfil/pf/pf_if.c
index 91fbeb86fec..41acc7dd477 100644
--- a/sys/netpfil/pf/pf_if.c
+++ b/sys/netpfil/pf/pf_if.c
@@ -41,9 +41,14 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mbuf.h>
+#include <sys/rwlock.h>
 #include <sys/socket.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
+#include <net/vnet.h>
 #include <net/pfvar.h>
 #include <net/route.h>
 
diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c
index 2b0f2cd8f06..a6ff85b8e1d 100644
--- a/sys/netpfil/pf/pf_ioctl.c
+++ b/sys/netpfil/pf/pf_ioctl.c
@@ -53,9 +53,11 @@ __FBSDID("$FreeBSD$");
 #include <sys/jail.h>
 #include <sys/kernel.h>
 #include <sys/kthread.h>
+#include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/proc.h>
+#include <sys/rwlock.h>
 #include <sys/smp.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
@@ -63,6 +65,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/ucred.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
+#include <net/vnet.h>
 #include <net/route.h>
 #include <net/pfil.h>
 #include <net/pfvar.h>
@@ -151,6 +155,7 @@ struct cdev *pf_dev;
 static void		 pf_clear_states(void);
 static int		 pf_clear_tables(void);
 static void		 pf_clear_srcnodes(struct pf_src_node *);
+static void		 pf_kill_srcnodes(struct pfioc_src_node_kill *);
 static void		 pf_tbladdr_copyout(struct pf_addr_wrap *);
 
 /*
@@ -1682,8 +1687,7 @@ relock_DIOCKILLSTATES:
 		struct pfioc_state	*ps = (struct pfioc_state *)addr;
 		struct pfsync_state	*sp = &ps->state;
 
-		if (sp->timeout >= PFTM_MAX &&
-		    sp->timeout != PFTM_UNTIL_PACKET) {
+		if (sp->timeout >= PFTM_MAX) {
 			error = EINVAL;
 			break;
 		}
@@ -3078,7 +3082,7 @@ DIOCCHANGEADDR_error:
 		uint32_t		 i, nr = 0;
 
 		if (psn->psn_len == 0) {
-			for (i = 0, sh = V_pf_srchash; i < V_pf_srchashmask;
+			for (i = 0, sh = V_pf_srchash; i <= V_pf_srchashmask;
 			    i++, sh++) {
 				PF_HASHROW_LOCK(sh);
 				LIST_FOREACH(n, &sh->nodes, entry)
@@ -3090,7 +3094,7 @@ DIOCCHANGEADDR_error:
 		}
 
 		p = pstore = malloc(psn->psn_len, M_TEMP, M_WAITOK);
-		for (i = 0, sh = V_pf_srchash; i < V_pf_srchashmask;
+		for (i = 0, sh = V_pf_srchash; i <= V_pf_srchashmask;
 		    i++, sh++) {
 		    PF_HASHROW_LOCK(sh);
 		    LIST_FOREACH(n, &sh->nodes, entry) {
@@ -3140,45 +3144,9 @@ DIOCCHANGEADDR_error:
 		break;
 	}
 
-	case DIOCKILLSRCNODES: {
-		struct pfioc_src_node_kill *psnk =
-		    (struct pfioc_src_node_kill *)addr;
-		struct pf_srchash	*sh;
-		struct pf_src_node	*sn;
-		u_int			i, killed = 0;
-
-		for (i = 0, sh = V_pf_srchash; i < V_pf_srchashmask;
-		    i++, sh++) {
-		    /*
-		     * XXXGL: we don't ever acquire sources hash lock
-		     * but if we ever do, the below call to pf_clear_srcnodes()
-		     * would lead to a LOR.
-		     */
-		    PF_HASHROW_LOCK(sh);
-		    LIST_FOREACH(sn, &sh->nodes, entry)
-			if (PF_MATCHA(psnk->psnk_src.neg,
-				&psnk->psnk_src.addr.v.a.addr,
-				&psnk->psnk_src.addr.v.a.mask,
-				&sn->addr, sn->af) &&
-			    PF_MATCHA(psnk->psnk_dst.neg,
-				&psnk->psnk_dst.addr.v.a.addr,
-				&psnk->psnk_dst.addr.v.a.mask,
-				&sn->raddr, sn->af)) {
-				/* Handle state to src_node linkage */
-				if (sn->states != 0)
-					pf_clear_srcnodes(sn);
-				sn->expire = 1;
-				killed++;
-			}
-		    PF_HASHROW_UNLOCK(sh);
-		}
-
-		if (killed > 0)
-			pf_purge_expired_src_nodes();
-
-		psnk->psnk_killed = killed;
+	case DIOCKILLSRCNODES:
+		pf_kill_srcnodes((struct pfioc_src_node_kill *)addr);
 		break;
-	}
 
 	case DIOCSETHOSTID: {
 		u_int32_t	*hostid = (u_int32_t *)addr;
@@ -3382,7 +3350,7 @@ pf_clear_srcnodes(struct pf_src_node *n)
 	if (n == NULL) {
 		struct pf_srchash *sh;
 
-		for (i = 0, sh = V_pf_srchash; i < V_pf_srchashmask;
+		for (i = 0, sh = V_pf_srchash; i <= V_pf_srchashmask;
 		    i++, sh++) {
 			PF_HASHROW_LOCK(sh);
 			LIST_FOREACH(n, &sh->nodes, entry) {
@@ -3397,6 +3365,59 @@ pf_clear_srcnodes(struct pf_src_node *n)
 		n->states = 0;
 	}
 }
+
+static void
+pf_kill_srcnodes(struct pfioc_src_node_kill *psnk)
+{
+	struct pf_src_node_list	 kill;
+
+	LIST_INIT(&kill);
+	for (int i = 0; i <= V_pf_srchashmask; i++) {
+		struct pf_srchash *sh = &V_pf_srchash[i];
+		struct pf_src_node *sn, *tmp;
+
+		PF_HASHROW_LOCK(sh);
+		LIST_FOREACH_SAFE(sn, &sh->nodes, entry, tmp)
+			if (PF_MATCHA(psnk->psnk_src.neg,
+			      &psnk->psnk_src.addr.v.a.addr,
+			      &psnk->psnk_src.addr.v.a.mask,
+			      &sn->addr, sn->af) &&
+			    PF_MATCHA(psnk->psnk_dst.neg,
+			      &psnk->psnk_dst.addr.v.a.addr,
+			      &psnk->psnk_dst.addr.v.a.mask,
+			      &sn->raddr, sn->af)) {
+				pf_unlink_src_node_locked(sn);
+				LIST_INSERT_HEAD(&kill, sn, entry);
+				sn->expire = 1;
+			}
+		PF_HASHROW_UNLOCK(sh);
+	}
+
+	for (int i = 0; i <= V_pf_hashmask; i++) {
+		struct pf_idhash *ih = &V_pf_idhash[i];
+		struct pf_state *s;
+
+		PF_HASHROW_LOCK(ih);
+		LIST_FOREACH(s, &ih->states, entry) {
+			if (s->src_node && s->src_node->expire == 1) {
+#ifdef INVARIANTS
+				s->src_node->states--;
+#endif
+				s->src_node = NULL;
+			}
+			if (s->nat_src_node && s->nat_src_node->expire == 1) {
+#ifdef INVARIANTS
+				s->nat_src_node->states--;
+#endif
+				s->nat_src_node = NULL;
+			}
+		}
+		PF_HASHROW_UNLOCK(ih);
+	}
+
+	psnk->psnk_killed = pf_free_src_nodes(&kill);
+}
+
 /*
  * XXX - Check for version missmatch!!!
  */
diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c
index f870bf46735..bc7cc09be5c 100644
--- a/sys/netpfil/pf/pf_lb.c
+++ b/sys/netpfil/pf/pf_lb.c
@@ -42,13 +42,25 @@ __FBSDID("$FreeBSD$");
 #include "opt_inet6.h"
 
 #include <sys/param.h>
+#include <sys/lock.h>
+#include <sys/mbuf.h>
+#include <sys/rwlock.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/vnet.h>
 #include <net/pfvar.h>
 #include <net/if_pflog.h>
-#include <net/pf_mtag.h>
+
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
+
+#ifdef INET6
+#include <netinet/ip6.h>
+#include <netinet/icmp6.h>
+#endif
 
 #define DPFPRINTF(n, x)	if (V_pf_status.debug >= (n)) printf x
 
@@ -215,15 +227,26 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_rule *r,
 {
 	struct pf_state_key_cmp	key;
 	struct pf_addr		init_addr;
-	uint16_t		cut;
 
 	bzero(&init_addr, sizeof(init_addr));
 	if (pf_map_addr(af, r, saddr, naddr, &init_addr, sn))
 		return (1);
 
-	if (proto == IPPROTO_ICMP) {
+	switch (proto) {
+	case IPPROTO_ICMP:
+		if (dport != htons(ICMP_ECHO))
+			return (0);
 		low = 1;
 		high = 65535;
+		break;
+#ifdef INET6
+	case IPPROTO_ICMPV6:
+		if (dport != htons(ICMP6_ECHO_REQUEST))
+			return (0);
+		low = 1;
+		high = 65535;
+		break;
+#endif
 	}
 
 	bzero(&key, sizeof(key));
@@ -257,7 +280,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_rule *r,
 				return (0);
 			}
 		} else {
-			uint16_t tmp;
+			uint16_t tmp, cut;
 
 			if (low > high) {
 				tmp = low;
@@ -265,7 +288,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_rule *r,
 				high = tmp;
 			}
 			/* low < high */
-			cut = htonl(arc4random()) % (1 + high - low) + low;
+			cut = arc4random() % (1 + high - low) + low;
 			/* low <= cut <= high */
 			for (tmp = cut; tmp <= high; ++(tmp)) {
 				key.port[1] = htons(tmp);
diff --git a/sys/net/pf_mtag.h b/sys/netpfil/pf/pf_mtag.h
similarity index 100%
rename from sys/net/pf_mtag.h
rename to sys/netpfil/pf/pf_mtag.h
diff --git a/sys/netpfil/pf/pf_norm.c b/sys/netpfil/pf/pf_norm.c
index e1e9d5d635c..883b50029cf 100644
--- a/sys/netpfil/pf/pf_norm.c
+++ b/sys/netpfil/pf/pf_norm.c
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/vnet.h>
 #include <net/pfvar.h>
-#include <net/pf_mtag.h>
 #include <net/if_pflog.h>
 
 #include <netinet/in.h>
diff --git a/sys/netpfil/pf/pf_osfp.c b/sys/netpfil/pf/pf_osfp.c
index b20a64e224e..55a7d105879 100644
--- a/sys/netpfil/pf/pf_osfp.c
+++ b/sys/netpfil/pf/pf_osfp.c
@@ -21,6 +21,9 @@ __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/mbuf.h>
+#include <sys/rwlock.h>
 #include <sys/socket.h>
 
 #include <netinet/in.h>
@@ -28,10 +31,10 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 
 #include <net/if.h>
+#include <net/vnet.h>
 #include <net/pfvar.h>
 
 #include <netinet/ip6.h>
-#include <netinet6/in6_var.h>
 
 static MALLOC_DEFINE(M_PFOSFP, "pf_osfp", "pf(4) operating system fingerprints");
 #define	DPFPRINTF(format, x...)		\
diff --git a/sys/netpfil/pf/pf_ruleset.c b/sys/netpfil/pf/pf_ruleset.c
index 384e42bb8d8..61da586fbdd 100644
--- a/sys/netpfil/pf/pf_ruleset.c
+++ b/sys/netpfil/pf/pf_ruleset.c
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 
 #include <net/if.h>
+#include <net/vnet.h>
 #include <net/pfvar.h>
 
 #ifdef INET6
diff --git a/sys/netpfil/pf/pf_table.c b/sys/netpfil/pf/pf_table.c
index 595a365d87c..d88a761eb64 100644
--- a/sys/netpfil/pf/pf_table.c
+++ b/sys/netpfil/pf/pf_table.c
@@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/malloc.h>
+#include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/refcount.h>
 #include <sys/rwlock.h>
diff --git a/sys/netsmb/smb_trantcp.c b/sys/netsmb/smb_trantcp.c
index a22e0643a5e..ef9b52e2026 100644
--- a/sys/netsmb/smb_trantcp.c
+++ b/sys/netsmb/smb_trantcp.c
@@ -155,8 +155,8 @@ nb_connect_in(struct nbpcb *nbp, struct sockaddr_in *to, struct thread *td)
 	SOCKBUF_LOCK(&so->so_rcv);
 	soupcall_set(so, SO_RCV, nb_upcall, nbp);
 	SOCKBUF_UNLOCK(&so->so_rcv);
-	so->so_rcv.sb_timeo = (5 * hz);
-	so->so_snd.sb_timeo = (5 * hz);
+	so->so_rcv.sb_timeo = (5 * SBT_1S);
+	so->so_snd.sb_timeo = (5 * SBT_1S);
 	error = soreserve(so, nbp->nbp_sndbuf, nbp->nbp_rcvbuf);
 	if (error)
 		goto bad;
diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c
index 7b84f94cd0f..d85851a63da 100644
--- a/sys/nfs/bootp_subr.c
+++ b/sys/nfs/bootp_subr.c
@@ -63,6 +63,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 
 #include <netinet/in.h>
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c
index 630a7ffe593..1f07b4696c9 100644
--- a/sys/nfsclient/nfs_bio.c
+++ b/sys/nfsclient/nfs_bio.c
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
diff --git a/sys/nfsclient/nfs_krpc.c b/sys/nfsclient/nfs_krpc.c
index d3082d8d914..f88e47f4f4e 100644
--- a/sys/nfsclient/nfs_krpc.c
+++ b/sys/nfsclient/nfs_krpc.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "opt_inet6.h"
-#include "opt_kdtrace.h"
 #include "opt_kgssapi.h"
 
 #include <sys/param.h>
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 5dfab1ca878..d4fd5eb0238 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -41,8 +41,6 @@ __FBSDID("$FreeBSD$");
  * copy data between mbuf chains and uio lists.
  */
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 7a26aa20aff..cf63c5ef3ee 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/uma.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 69ff21dc499..a841f65dc96 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
  */
 
 #include "opt_inet.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -51,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/jail.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/namei.h>
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/dirent.h>
 #include <sys/fcntl.h>
 #include <sys/lockf.h>
+#include <sys/rwlock.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/signalvar.h>
@@ -77,6 +78,8 @@ __FBSDID("$FreeBSD$");
 #include <nfsclient/nfsm_subs.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
+#include <net/vnet.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 9cd89459ed4..e10063fd094 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -99,5 +99,6 @@ struct nfs_args {
 #define	NFSMNT_STRICT3530	0x10000000 /* Adhere strictly to RFC3530 */
 #define	NFSMNT_NOCTO		0x20000000 /* Don't flush attrcache on open */
 #define	NFSMNT_PNFS		0x40000000 /* Enable pNFS support */
+#define	NFSMNT_NONCONTIGWR	0x80000000 /* Enable non-contiguous writes */
 
 #endif
diff --git a/sys/nfsserver/nfs_srvkrpc.c b/sys/nfsserver/nfs_srvkrpc.c
index 85003b7b1be..123bbbab4ca 100644
--- a/sys/nfsserver/nfs_srvkrpc.c
+++ b/sys/nfsserver/nfs_srvkrpc.c
@@ -68,7 +68,8 @@ __FBSDID("$FreeBSD$");
 #include <netinet/tcp.h>
 #ifdef INET6
 #include <net/if.h>
-#include <netinet6/in6_var.h>
+#include <net/if_var.h>			/* XXX: for in6_var.h */
+#include <netinet6/in6_var.h>		/* XXX: for ip6_sprintf */
 #endif
 
 #include <rpc/rpc.h>
diff --git a/sys/ofed/drivers/infiniband/core/ucm.c b/sys/ofed/drivers/infiniband/core/ucm.c
index 90e0b31368e..860d0a5c2de 100644
--- a/sys/ofed/drivers/infiniband/core/ucm.c
+++ b/sys/ofed/drivers/infiniband/core/ucm.c
@@ -104,9 +104,6 @@ enum {
 	IB_UCM_MAX_DEVICES = 32
 };
 
-/* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */
-extern struct class cm_class;
-
 #define IB_UCM_BASE_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_BASE_MINOR)
 
 static void ib_ucm_add_one(struct ib_device *device);
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/main.c b/sys/ofed/drivers/infiniband/hw/mlx4/main.c
index 8713c41eb55..056ed1979ff 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/main.c
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/main.c
@@ -1859,33 +1859,6 @@ err:
 			    "is incorrect. The parameter value is discarded!");
 }
 
-static int mlx4_ib_dev_idx(struct mlx4_dev *dev)
-{
-	int /*bus,*/ slot, fn;
-	int i;
-
-	if (!dev)
-		return -1;
-	else if (!dev->pdev)
-		return -1;
-	//else if (!dev->pdev->bus)
-	//	return -1;
-
-	//bus	= dev->pdev->bus->conf.pc_sel.pc_bus;
-	slot	= PCI_SLOT(dev->pdev->devfn);
-	fn	= PCI_FUNC(dev->pdev->devfn);
-
-	for (i = 0; i < MAX_DR; ++i) {
-		if (/*dr[i].bus == bus &&*/
-		    dr[i].dev == slot &&
-		    dr[i].func == fn) {
-			return dr[i].nr;
-		}
-	}
-
-	return -1;
-}
-
 static void *mlx4_ib_add(struct mlx4_dev *dev)
 {
 	struct mlx4_ib_dev *ibdev;
@@ -1893,7 +1866,6 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
 	int i, j;
 	int err;
 	struct mlx4_ib_iboe *iboe;
-	int dev_idx;
 
 	printk(KERN_INFO "%s", mlx4_ib_version);
 
@@ -1928,12 +1900,7 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
 
 	ibdev->dev = dev;
 
-	dev_idx = mlx4_ib_dev_idx(dev);
-	if (dev_idx >= 0)
-		sprintf(ibdev->ib_dev.name, "mlx4_%d", dev_idx);
-	else
-		strlcpy(ibdev->ib_dev.name, "mlx4_%d", IB_DEVICE_NAME_MAX);
-
+	strlcpy(ibdev->ib_dev.name, "mlx4_%d", IB_DEVICE_NAME_MAX);
 	ibdev->ib_dev.owner		= THIS_MODULE;
 	ibdev->ib_dev.node_type		= RDMA_NODE_IB_CA;
 	ibdev->ib_dev.local_dma_lkey	= dev->caps.reserved_lkey;
diff --git a/sys/ofed/drivers/infiniband/hw/mlx4/qp.c b/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
index b3baa6d25c4..9b5cb95aaac 100644
--- a/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
+++ b/sys/ofed/drivers/infiniband/hw/mlx4/qp.c
@@ -275,7 +275,7 @@ static void post_nop_wqe(struct mlx4_ib_qp *qp, int n, int size)
 	wmb();
 
 	ctrl->owner_opcode = cpu_to_be32(MLX4_OPCODE_NOP | MLX4_WQE_CTRL_NEC) |
-		(n & qp->sq.wqe_cnt ? cpu_to_be32(1 << 31) : 0);
+		(n & qp->sq.wqe_cnt ? cpu_to_be32(1U << 31) : 0);
 
 	stamp_send_wqe(qp, n + qp->sq_spare_wqes, size);
 }
@@ -2073,7 +2073,7 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
 
 		for (i = 0; i < qp->sq.wqe_cnt; ++i) {
 			ctrl = get_send_wqe(qp, i);
-			ctrl->owner_opcode = cpu_to_be32(1 << 31);
+			ctrl->owner_opcode = cpu_to_be32(1U << 31);
 			if (qp->sq_max_wqes_per_wr == 1)
 				ctrl->fence_size = 1 << (qp->sq.wqe_shift - 4);
 
@@ -2832,7 +2832,7 @@ static void set_mlx_icrc_seg(void *dseg)
 	 */
 	wmb();
 
-	iseg->byte_count = cpu_to_be32((1 << 31) | 4);
+	iseg->byte_count = cpu_to_be32((1U << 31) | 4);
 }
 
 static void set_data_seg(struct mlx4_wqe_data_seg *dseg, struct ib_sge *sg)
@@ -2900,7 +2900,7 @@ static void add_zero_len_inline(void *wqe)
 {
 	struct mlx4_wqe_inline_seg *inl = wqe;
 	memset(wqe, 0, 16);
-	inl->byte_count = cpu_to_be32(1 << 31);
+	inl->byte_count = cpu_to_be32(1U << 31);
 }
 
 static int lay_inline_data(struct mlx4_ib_qp *qp, struct ib_send_wr *wr,
@@ -3252,7 +3252,7 @@ int mlx4_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
 		}
 
 		ctrl->owner_opcode = mlx4_ib_opcode[wr->opcode] |
-			(ind & qp->sq.wqe_cnt ? cpu_to_be32(1 << 31) : 0) | blh;
+			(ind & qp->sq.wqe_cnt ? cpu_to_be32(1U << 31) : 0) | blh;
 
 		stamp = ind + qp->sq_spare_wqes;
 		ind += DIV_ROUND_UP(size * 16, 1U << qp->sq.wqe_shift);
diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_mcg.c b/sys/ofed/drivers/infiniband/hw/mthca/mthca_mcg.c
index d4c81053e43..6274a1c67ae 100644
--- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -173,13 +173,13 @@ int mthca_multicast_attach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 	}
 
 	for (i = 0; i < MTHCA_QP_PER_MGM; ++i)
-		if (mgm->qp[i] == cpu_to_be32(ibqp->qp_num | (1 << 31))) {
+		if (mgm->qp[i] == cpu_to_be32(ibqp->qp_num | (1U << 31))) {
 			mthca_dbg(dev, "QP %06x already a member of MGM\n",
 				  ibqp->qp_num);
 			err = 0;
 			goto out;
-		} else if (!(mgm->qp[i] & cpu_to_be32(1 << 31))) {
-			mgm->qp[i] = cpu_to_be32(ibqp->qp_num | (1 << 31));
+		} else if (!(mgm->qp[i] & cpu_to_be32(1U << 31))) {
+			mgm->qp[i] = cpu_to_be32(ibqp->qp_num | (1U << 31));
 			break;
 		}
 
@@ -260,9 +260,9 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
 	}
 
 	for (loc = -1, i = 0; i < MTHCA_QP_PER_MGM; ++i) {
-		if (mgm->qp[i] == cpu_to_be32(ibqp->qp_num | (1 << 31)))
+		if (mgm->qp[i] == cpu_to_be32(ibqp->qp_num | (1U << 31)))
 			loc = i;
-		if (!(mgm->qp[i] & cpu_to_be32(1 << 31)))
+		if (!(mgm->qp[i] & cpu_to_be32(1U << 31)))
 			break;
 	}
 
diff --git a/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c b/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c
index 4a4d1334a17..2264bcdb904 100644
--- a/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/sys/ofed/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -1756,7 +1756,7 @@ int mthca_tavor_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
 		/* Add one more inline data segment for ICRC */
 		if (qp->transport == MLX) {
 			((struct mthca_data_seg *) wqe)->byte_count =
-				cpu_to_be32((1 << 31) | 4);
+				cpu_to_be32((1U << 31) | 4);
 			((u32 *) wqe)[1] = 0;
 			wqe += sizeof (struct mthca_data_seg);
 			size += sizeof (struct mthca_data_seg) / 16;
@@ -2097,7 +2097,7 @@ int mthca_arbel_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
 		/* Add one more inline data segment for ICRC */
 		if (qp->transport == MLX) {
 			((struct mthca_data_seg *) wqe)->byte_count =
-				cpu_to_be32((1 << 31) | 4);
+				cpu_to_be32((1U << 31) | 4);
 			((u32 *) wqe)[1] = 0;
 			wqe += sizeof (struct mthca_data_seg);
 			size += sizeof (struct mthca_data_seg) / 16;
diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
index 768833de6dd..7d5e17550c1 100644
--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -52,6 +52,7 @@
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/netisr.h>
 #include <net/route.h>
diff --git a/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h b/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h
index a1ccdff0f95..2ba1a89c9be 100644
--- a/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h
+++ b/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h
@@ -25,6 +25,7 @@
 #endif
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/route.h>
 #include <net/vnet.h>
 
diff --git a/sys/ofed/drivers/net/mlx4/en_ethtool.c b/sys/ofed/drivers/net/mlx4/en_ethtool.c
index f5b21d094ba..92799441314 100644
--- a/sys/ofed/drivers/net/mlx4/en_ethtool.c
+++ b/sys/ofed/drivers/net/mlx4/en_ethtool.c
@@ -366,13 +366,13 @@ static int mlx4_en_set_coalesce(struct net_device *dev,
 	priv->rx_usecs_high = coal->rx_coalesce_usecs_high;
 	priv->sample_interval = coal->rate_sample_interval;
 	priv->adaptive_rx_coal = coal->use_adaptive_rx_coalesce;
-	priv->last_moder_time = MLX4_EN_AUTO_CONF;
 	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;
@@ -418,6 +418,7 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
 	u32 rx_size, tx_size;
 	int port_up = 0;
 	int err = 0;
+	int i;
 
 	if (param->rx_jumbo_pending || param->rx_mini_pending)
 		return -EINVAL;
@@ -456,6 +457,15 @@ static int mlx4_en_set_ringparam(struct net_device *dev,
 			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;
diff --git a/sys/ofed/drivers/net/mlx4/en_netdev.c b/sys/ofed/drivers/net/mlx4/en_netdev.c
index f7167d9cc51..99a93368153 100644
--- a/sys/ofed/drivers/net/mlx4/en_netdev.c
+++ b/sys/ofed/drivers/net/mlx4/en_netdev.c
@@ -52,6 +52,9 @@ static void mlx4_en_vlan_rx_add_vid(void *arg, struct net_device *dev, u16 vid)
 	int idx;
 	u8 field;
 
+	if (arg != priv)
+		return;
+
 	if ((vid == 0) || (vid > 4095))    /* Invalid */
 		return;
 	en_dbg(HW, priv, "adding VLAN:%d\n", vid);
@@ -73,6 +76,9 @@ static void mlx4_en_vlan_rx_kill_vid(void *arg, struct net_device *dev, u16 vid)
 	int idx;
 	u8 field;
 
+	if (arg != priv)
+		return;
+
 	if ((vid == 0) || (vid > 4095))    /* Invalid */
 		return;
 	en_dbg(HW, priv, "Killing VID:%d\n", vid);
@@ -318,6 +324,9 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
 		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;
+		priv->last_moder_packets[i] = 0;
+		priv->last_moder_bytes[i] = 0;
 	}
 
 	for (i = 0; i < priv->tx_ring_num; i++) {
@@ -333,11 +342,8 @@ static void mlx4_en_set_default_moderation(struct mlx4_en_priv *priv)
 	priv->rx_usecs_high = MLX4_EN_RX_COAL_TIME_HIGH;
 	priv->sample_interval = MLX4_EN_SAMPLE_INTERVAL;
 	priv->adaptive_rx_coal = 1;
-	priv->last_moder_time = MLX4_EN_AUTO_CONF;
 	priv->last_moder_jiffies = 0;
-	priv->last_moder_packets = 0;
 	priv->last_moder_tx_packets = 0;
-	priv->last_moder_bytes = 0;
 }
 
 static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
@@ -349,43 +355,29 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
 	unsigned long avg_pkt_size;
 	unsigned long rx_packets;
 	unsigned long rx_bytes;
-	unsigned long tx_packets;
-	unsigned long tx_pkt_diff;
 	unsigned long rx_pkt_diff;
 	int moder_time;
-	int i, err;
+	int ring, err;
 
 	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_unlock(&priv->stats_lock);
 
-	spin_lock(&priv->stats_lock);
-	rx_packets = priv->dev->if_ipackets;
-	rx_bytes = priv->dev->if_ibytes;
-	tx_packets = priv->dev->if_opackets;
-	spin_unlock(&priv->stats_lock);
+		rx_pkt_diff = ((unsigned long) (rx_packets -
+				priv->last_moder_packets[ring]));
+		packets = rx_pkt_diff;
+		rate = packets * HZ / period;
+		avg_pkt_size = packets ? ((unsigned long) (rx_bytes -
+				priv->last_moder_bytes[ring])) / packets : 0;
 
-	if (!priv->last_moder_jiffies || !period)
-		goto out;
-
-	tx_pkt_diff = ((unsigned long) (tx_packets -
-					priv->last_moder_tx_packets));
-	rx_pkt_diff = ((unsigned long) (rx_packets -
-					priv->last_moder_packets));
-	packets = max(tx_pkt_diff, rx_pkt_diff);
-	rate = packets * HZ / period;
-	avg_pkt_size = packets ? ((unsigned long) (rx_bytes -
-				 priv->last_moder_bytes)) / packets : 0;
-
-	/* Apply auto-moderation only when packet rate exceeds a rate that
-	 * it matters */
-	if (rate > MLX4_EN_RX_RATE_THRESH) {
-		/* If tx and rx packet rates are not balanced, assume that
-		 * traffic is mainly BW bound and apply maximum moderation.
-		 * Otherwise, moderate according to packet rate */
-		if (2 * tx_pkt_diff > 3 * rx_pkt_diff ||
-		    2 * rx_pkt_diff > 3 * tx_pkt_diff) {
-			moder_time = priv->rx_usecs_high;
-		} else {
+		/* Apply auto-moderation only when packet rate
+		* 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)
 				moder_time = priv->rx_usecs_low;
@@ -396,38 +388,23 @@ static void mlx4_en_auto_moderation(struct mlx4_en_priv *priv)
 					(priv->rx_usecs_high - priv->rx_usecs_low) /
 					(priv->pkt_rate_high - priv->pkt_rate_low) +
 					priv->rx_usecs_low;
+		} else {
+			moder_time = priv->rx_usecs_low;
 		}
-	} else {
-		/* When packet rate is low, use default moderation rather than
-		 * 0 to prevent interrupt storms if traffic suddenly increases */
-		moder_time = priv->rx_usecs;
-	}
 
-	en_dbg(INTR, priv, "tx rate:%lu rx_rate:%lu\n",
-	       tx_pkt_diff * HZ / period, rx_pkt_diff * HZ / period);
-
-	en_dbg(INTR, priv, "Rx moder_time changed from:%d to %d period:%lu "
-	       "[jiff] packets:%lu avg_pkt_size:%lu rate:%lu [p/s])\n",
-		 priv->last_moder_time, moder_time, period, packets,
-		 avg_pkt_size, rate);
-
-	if (moder_time != priv->last_moder_time) {
-		priv->last_moder_time = moder_time;
-		for (i = 0; i < priv->rx_ring_num; i++) {
-			cq = &priv->rx_cq[i];
+		if (moder_time != priv->last_moder_time[ring]) {
+			priv->last_moder_time[ring] = moder_time;
+			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", i);
-				break;
-			}
+			if (err)
+				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;
 	}
 
-out:
-	priv->last_moder_packets = rx_packets;
-	priv->last_moder_tx_packets = tx_packets;
-	priv->last_moder_bytes = rx_bytes;
 	priv->last_moder_jiffies = jiffies;
 }
 
@@ -633,8 +610,8 @@ int mlx4_en_start_port(struct net_device *dev)
 	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) {
-		en_err(priv, "Failed setting port mac\n");
+	if (err < 0) {
+		en_err(priv, "Failed setting port mac err=%d\n", err);
 		goto tx_err;
 	}
 	mdev->mac_removed[priv->port] = 0;
@@ -927,9 +904,6 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
 	if (priv->allocated)
 		mlx4_free_hwq_res(mdev->dev, &priv->res, MLX4_EN_PAGE_SIZE);
 
-	if (priv->sysctl)
-		sysctl_ctx_free(&priv->conf_ctx);
-
 	mutex_lock(&mdev->state_lock);
 	mlx4_en_stop_port(dev);
 	mutex_unlock(&mdev->state_lock);
@@ -946,8 +920,12 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
 
 	mlx4_en_free_resources(priv);
 
+	if (priv->sysctl)
+		sysctl_ctx_free(&priv->conf_ctx);
+
 	mtx_destroy(&priv->stats_lock.m);
 	mtx_destroy(&priv->vlan_lock.m);
+	mtx_destroy(&priv->ioctl_lock.m);
 	kfree(priv);
 	if_free(dev);
 }
@@ -1116,9 +1094,9 @@ static int mlx4_en_ioctl(struct ifnet *dev, u_long command, caddr_t data)
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
-		mutex_lock(&mdev->state_lock);
+                spin_lock(&priv->ioctl_lock);
 		mlx4_en_set_multicast(dev);
-		mutex_unlock(&mdev->state_lock);
+                spin_unlock(&priv->ioctl_lock);
 		break;
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
@@ -1539,6 +1517,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
 	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->ioctl_lock.m, "mlx4 ioctl", NULL, MTX_DEF);
 	mtx_init(&priv->vlan_lock.m, "mlx4 vlan", NULL, MTX_DEF);
 	INIT_WORK(&priv->mcast_task, mlx4_en_do_set_multicast);
 	INIT_WORK(&priv->watchdog_task, mlx4_en_restart);
diff --git a/sys/ofed/drivers/net/mlx4/mcg.c b/sys/ofed/drivers/net/mlx4/mcg.c
index 625e5e42e9d..dfe5308ba01 100644
--- a/sys/ofed/drivers/net/mlx4/mcg.c
+++ b/sys/ofed/drivers/net/mlx4/mcg.c
@@ -1148,7 +1148,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 |= (1 << 31);
+		qpn |= (1U << 31);
 
 	err = mlx4_cmd(dev, mailbox->dma, qpn, attach,
 		       MLX4_CMD_QP_ATTACH, MLX4_CMD_TIME_CLASS_A,
diff --git a/sys/ofed/drivers/net/mlx4/mlx4_en.h b/sys/ofed/drivers/net/mlx4/mlx4_en.h
index f3f71c79c78..7f3c352b7bb 100644
--- a/sys/ofed/drivers/net/mlx4/mlx4_en.h
+++ b/sys/ofed/drivers/net/mlx4/mlx4_en.h
@@ -493,12 +493,13 @@ struct mlx4_en_priv {
 	spinlock_t vlan_lock;
 	struct mlx4_en_port_state port_state;
 	spinlock_t stats_lock;
+	spinlock_t ioctl_lock;
 
-	unsigned long last_moder_packets;
+	unsigned long last_moder_packets[MAX_RX_RINGS];
 	unsigned long last_moder_tx_packets;
-	unsigned long last_moder_bytes;
+	unsigned long last_moder_bytes[MAX_RX_RINGS];
 	unsigned long last_moder_jiffies;
-	int last_moder_time;
+	int last_moder_time[MAX_RX_RINGS];
 	u16 rx_usecs;
 	u16 rx_frames;
 	u16 tx_usecs;
@@ -568,7 +569,6 @@ enum mlx4_en_wol {
 	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);
 
diff --git a/sys/ofed/include/linux/bitops.h b/sys/ofed/include/linux/bitops.h
index 4ada7089b98..bac688af5e7 100644
--- a/sys/ofed/include/linux/bitops.h
+++ b/sys/ofed/include/linux/bitops.h
@@ -286,14 +286,14 @@ bitmap_empty(unsigned long *addr, int size)
 #define	NBLONG	(NBBY * sizeof(long))
 
 #define	set_bit(i, a)							\
-    atomic_set_long(&((volatile long *)(a))[(i)/NBLONG], 1 << (i) % NBLONG)
+    atomic_set_long(&((volatile long *)(a))[(i)/NBLONG], 1UL << (i) % NBLONG)
 
 #define	clear_bit(i, a)							\
-    atomic_clear_long(&((volatile long *)(a))[(i)/NBLONG], 1 << (i) % NBLONG)
+    atomic_clear_long(&((volatile long *)(a))[(i)/NBLONG], 1UL << (i) % NBLONG)
 
 #define	test_bit(i, a)							\
     !!(atomic_load_acq_long(&((volatile long *)(a))[(i)/NBLONG]) &	\
-    1 << ((i) % NBLONG))
+    1UL << ((i) % NBLONG))
 
 static inline long
 test_and_clear_bit(long bit, long *var)
diff --git a/sys/ofed/include/linux/gfp.h b/sys/ofed/include/linux/gfp.h
index e88df78d68c..f974956bb69 100644
--- a/sys/ofed/include/linux/gfp.h
+++ b/sys/ofed/include/linux/gfp.h
@@ -92,14 +92,14 @@ __free_page(struct page *m)
 }
 
 static inline void
-__free_pages(void *p, unsigned int order)
+__free_pages(struct page *m, unsigned int order)
 {
 	size_t size;
 
-	if (p == 0)
+	if (m == NULL)
 		return;
 	size = PAGE_SIZE << order;
-	kmem_free(kmem_arena, (vm_offset_t)p, size);
+	kmem_free(kmem_arena, (vm_offset_t)page_address(m), size);
 }
 
 /*
diff --git a/sys/ofed/include/linux/list.h b/sys/ofed/include/linux/list.h
index 4b5454a517b..f02deadf6c4 100644
--- a/sys/ofed/include/linux/list.h
+++ b/sys/ofed/include/linux/list.h
@@ -49,6 +49,7 @@
 
 #include <net/bpf.h>
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
 
diff --git a/sys/ofed/include/rdma/ib_verbs.h b/sys/ofed/include/rdma/ib_verbs.h
index 0145cb2965a..7c1700715c8 100644
--- a/sys/ofed/include/rdma/ib_verbs.h
+++ b/sys/ofed/include/rdma/ib_verbs.h
@@ -660,7 +660,7 @@ struct ib_qp_init_attr {
 	union {
 		struct ib_qp *qpg_parent; /* see qpg_type */
 		struct ib_qpg_init_attrib parent_attrib;
-	};
+	} pp;
 	enum ib_sig_type	sq_sig_type;
 	enum ib_qp_type		qp_type;
 	enum ib_qp_create_flags	create_flags;
diff --git a/sys/opencrypto/crypto.c b/sys/opencrypto/crypto.c
index 53c11e648fa..889e8555e4c 100644
--- a/sys/opencrypto/crypto.c
+++ b/sys/opencrypto/crypto.c
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
 #define	CRYPTO_TIMING				/* enable timing support */
 
 #include "opt_ddb.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/opencrypto/deflate.c b/sys/opencrypto/cryptodeflate.c
similarity index 95%
rename from sys/opencrypto/deflate.c
rename to sys/opencrypto/cryptodeflate.c
index deaf0527344..0ad86e3303e 100644
--- a/sys/opencrypto/deflate.c
+++ b/sys/opencrypto/cryptodeflate.c
@@ -35,8 +35,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -50,13 +48,13 @@ __FBSDID("$FreeBSD$");
 #include <opencrypto/deflate.h>
 
 SDT_PROVIDER_DECLARE(opencrypto);
-SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, entry, entry,
+SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, entry,
     "int", "u_int32_t");
-SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, bad, bad,
+SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, bad,
     "int", "int", "int", "int", "int");
-SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, iter, iter,
+SDT_PROBE_DEFINE5(opencrypto, deflate, deflate_global, iter,
     "int", "int", "int", "int", "int");
-SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, return, return,
+SDT_PROBE_DEFINE2(opencrypto, deflate, deflate_global, return,
     "int", "u_int32_t");
 
 int window_inflate = -1 * MAX_WBITS;
diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index e5f5e125d4c..7386c1f737d 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -65,7 +65,6 @@ 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 	PROCDESC		# Support for process descriptors
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
 options 	KDB			# Kernel debugger related code
diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c
index 443518697cb..0146cf32c19 100644
--- a/sys/pc98/pc98/machdep.c
+++ b/sys/pc98/pc98/machdep.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 #include "opt_mp_watchdog.h"
 #include "opt_npx.h"
 #include "opt_perfmon.h"
-#include "opt_kdtrace.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -773,17 +772,7 @@ osigreturn(td, uap)
 		/*
 		 * Don't allow users to change privileged or reserved flags.
 		 */
-		/*
-		 * XXX do allow users to change the privileged flag PSL_RF.
-		 * The cpu sets PSL_RF in tf_eflags for faults.  Debuggers
-		 * should sometimes set it there too.  tf_eflags is kept in
-		 * the signal context during signal handling and there is no
-		 * other place to remember it, so the PSL_RF bit may be
-		 * corrupted by the signal handler without us knowing.
-		 * Corruption of the PSL_RF bit at worst causes one more or
-		 * one less debugger trap, so allowing it is fairly harmless.
-		 */
-		if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) {
+		if (!EFL_SECURE(eflags, regs->tf_eflags)) {
 	    		return (EINVAL);
 		}
 
@@ -899,17 +888,7 @@ freebsd4_sigreturn(td, uap)
 		/*
 		 * Don't allow users to change privileged or reserved flags.
 		 */
-		/*
-		 * XXX do allow users to change the privileged flag PSL_RF.
-		 * The cpu sets PSL_RF in tf_eflags for faults.  Debuggers
-		 * should sometimes set it there too.  tf_eflags is kept in
-		 * the signal context during signal handling and there is no
-		 * other place to remember it, so the PSL_RF bit may be
-		 * corrupted by the signal handler without us knowing.
-		 * Corruption of the PSL_RF bit at worst causes one more or
-		 * one less debugger trap, so allowing it is fairly harmless.
-		 */
-		if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) {
+		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);
@@ -1013,17 +992,7 @@ sys_sigreturn(td, uap)
 		/*
 		 * Don't allow users to change privileged or reserved flags.
 		 */
-		/*
-		 * XXX do allow users to change the privileged flag PSL_RF.
-		 * The cpu sets PSL_RF in tf_eflags for faults.  Debuggers
-		 * should sometimes set it there too.  tf_eflags is kept in
-		 * the signal context during signal handling and there is no
-		 * other place to remember it, so the PSL_RF bit may be
-		 * corrupted by the signal handler without us knowing.
-		 * Corruption of the PSL_RF bit at worst causes one more or
-		 * one less debugger trap, so allowing it is fairly harmless.
-		 */
-		if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_eflags & ~PSL_RF)) {
+		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);
@@ -1259,7 +1228,7 @@ cpu_idle(int busy)
 	/* Call main idle method. */
 	cpu_idle_fn(sbt);
 
-	/* Switch timers mack into active mode. */
+	/* Switch timers back into active mode. */
 	if (!busy) {
 		cpu_activeclock();
 		critical_exit();
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 4f91d1fa664..41f91a315e6 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -99,6 +99,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_arp.h>
 #include <net/ethernet.h>
 #include <net/if_dl.h>
diff --git a/sys/pci/if_rlreg.h b/sys/pci/if_rlreg.h
index be89c4f5896..13a111a551a 100644
--- a/sys/pci/if_rlreg.h
+++ b/sys/pci/if_rlreg.h
@@ -189,8 +189,13 @@
 #define	RL_HWREV_8105E		0x40800000
 #define	RL_HWREV_8105E_SPIN1	0x40C00000
 #define	RL_HWREV_8402		0x44000000
+#define	RL_HWREV_8106E		0x44800000
 #define	RL_HWREV_8168F		0x48000000
 #define	RL_HWREV_8411		0x48800000
+#define	RL_HWREV_8168G		0x4C000000
+#define	RL_HWREV_8168EP		0x50000000
+#define	RL_HWREV_8168GU		0x50800000
+#define	RL_HWREV_8411B		0x5C800000
 #define	RL_HWREV_8139		0x60000000
 #define	RL_HWREV_8139A		0x70000000
 #define	RL_HWREV_8139AG		0x70800000
@@ -877,6 +882,7 @@ struct rl_softc {
 	bus_dma_tag_t		rl_parent_tag;
 	uint8_t			rl_type;
 	const struct rl_hwrev	*rl_hwrev;
+	uint32_t		rl_macrev;
 	int			rl_eecmd_read;
 	int			rl_eewidth;
 	int			rl_expcap;
diff --git a/sys/powerpc/aim/interrupt.c b/sys/powerpc/aim/interrupt.c
index d1e36551458..1db565ca520 100644
--- a/sys/powerpc/aim/interrupt.c
+++ b/sys/powerpc/aim/interrupt.c
@@ -31,6 +31,8 @@
  * Interrupts are dispatched to here from locore asm
  */
 
+#include "opt_hwpmc_hooks.h"
+
 #include <sys/cdefs.h>                  /* RCS ID & Copyright macro defns */
 
 #include <sys/param.h>
@@ -43,6 +45,9 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mutex.h>
+#ifdef HWPMC_HOOKS
+#include <sys/pmckern.h>
+#endif
 #include <sys/proc.h>
 #include <sys/smp.h>
 #include <sys/unistd.h>
@@ -96,6 +101,16 @@ powerpc_interrupt(struct trapframe *framep)
 		atomic_subtract_int(&td->td_intr_nesting_level, 1);
 		critical_exit();
 		break;
+#ifdef HWPMC_HOOKS
+	case EXC_PERF:
+		critical_enter();
+		KASSERT(pmc_intr != NULL, ("Performance exception, but no handler!"));
+		(*pmc_intr)(PCPU_GET(cpuid), framep);
+		if (pmc_hook && (PCPU_GET(curthread)->td_pflags & TDP_CALLCHAIN))
+			pmc_hook(PCPU_GET(curthread), PMC_FN_USER_CALLCHAIN, framep);
+		critical_exit();
+		break;
+#endif
 
 	default:
 		/* Re-enable interrupts if applicable. */
diff --git a/sys/powerpc/aim/locore32.S b/sys/powerpc/aim/locore32.S
index c1ac26c8d56..8cee6654b2e 100644
--- a/sys/powerpc/aim/locore32.S
+++ b/sys/powerpc/aim/locore32.S
@@ -66,8 +66,6 @@
 #include <machine/asm.h>
 #include "opt_platform.h"
 
-#include "opt_kdtrace.h"
-
 /* Locate the per-CPU data structure */
 #define GET_CPUINFO(r)  \
         mfsprg0  r
diff --git a/sys/powerpc/aim/locore64.S b/sys/powerpc/aim/locore64.S
index 3b3c8f38945..65c4999a1e2 100644
--- a/sys/powerpc/aim/locore64.S
+++ b/sys/powerpc/aim/locore64.S
@@ -65,8 +65,6 @@
 #include <machine/spr.h>
 #include <machine/asm.h>
 
-#include "opt_kdtrace.h"
-
 /* Locate the per-CPU data structure */
 #define GET_CPUINFO(r)  \
         mfsprg0  r
diff --git a/sys/powerpc/aim/machdep.c b/sys/powerpc/aim/machdep.c
index 5ae42bdb2f3..2e0c1213344 100644
--- a/sys/powerpc/aim/machdep.c
+++ b/sys/powerpc/aim/machdep.c
@@ -123,6 +123,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/spr.h>
 #include <machine/trap.h>
 #include <machine/vmparam.h>
+#include <machine/ofw_machdep.h>
 
 #include <ddb/ddb.h>
 
@@ -156,8 +157,6 @@ SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size,
 
 uintptr_t	powerpc_init(vm_offset_t, vm_offset_t, vm_offset_t, void *);
 
-int             setfault(faultbuf);             /* defined in locore.S */
-
 long		Maxmem = 0;
 long		realmem = 0;
 
@@ -249,6 +248,7 @@ extern void	*dblow, *dbsize;
 extern void	*imisstrap, *imisssize;
 extern void	*dlmisstrap, *dlmisssize;
 extern void	*dsmisstrap, *dsmisssize;
+char 		save_trap_init[0x2f00];		/* EXC_LAST */
 
 uintptr_t
 powerpc_init(vm_offset_t startkernel, vm_offset_t endkernel,
@@ -273,6 +273,9 @@ powerpc_init(vm_offset_t startkernel, vm_offset_t endkernel,
 	trap_offset = 0;
 	cacheline_warn = 0;
 
+	/* Save trap vectors. */
+	ofw_save_trap_vec(save_trap_init);
+
 #ifdef WII
 	/*
 	 * The Wii loader doesn't pass us any environment so, mdp
@@ -646,14 +649,6 @@ cpu_flush_dcache(void *ptr, size_t len)
 	/* TBD */
 }
 
-void
-cpu_initclocks(void)
-{
-
-	decr_tc_init();
-	cpu_initclocks_bsp();
-}
-
 /*
  * Shutdown the CPU as much as possible.
  */
@@ -783,3 +778,11 @@ va_to_vsid(pmap_t pm, vm_offset_t va)
 }
 
 #endif
+
+vm_offset_t
+pmap_early_io_map(vm_paddr_t pa, vm_size_t size)
+{
+
+	return (pa);
+}
+
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c
index ac3e9fe8a59..0becfb40ab9 100644
--- a/sys/powerpc/aim/mmu_oea.c
+++ b/sys/powerpc/aim/mmu_oea.c
@@ -148,7 +148,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 #include <machine/sr.h>
 #include <machine/mmuvar.h>
-#include <machine/trap_aim.h>
+#include <machine/trap.h>
 
 #include "mmu_if.h"
 
diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c
index 4ed2606d0d4..b8408a389bd 100644
--- a/sys/powerpc/aim/mmu_oea64.c
+++ b/sys/powerpc/aim/mmu_oea64.c
@@ -187,11 +187,15 @@ uintptr_t moea64_get_unique_vsid(void);
 struct ofw_map {
 	cell_t	om_va;
 	cell_t	om_len;
-	cell_t	om_pa_hi;
-	cell_t	om_pa_lo;
+	uint64_t om_pa;
 	cell_t	om_mode;
 };
 
+extern unsigned char _etext[];
+extern unsigned char _end[];
+
+extern int dumpsys_minidump;
+
 /*
  * Map of physical memory regions.
  */
@@ -329,6 +333,9 @@ void moea64_kenter_attr(mmu_t, vm_offset_t, vm_offset_t, vm_memattr_t ma);
 void moea64_kenter(mmu_t, vm_offset_t, vm_paddr_t);
 boolean_t moea64_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t);
 static void moea64_sync_icache(mmu_t, pmap_t, vm_offset_t, vm_size_t);
+vm_offset_t moea64_dumpsys_map(mmu_t mmu, struct pmap_md *md, vm_size_t ofs,
+    vm_size_t *sz);
+struct pmap_md * moea64_scan_md(mmu_t mmu, struct pmap_md *prev);
 
 static mmu_method_t moea64_methods[] = {
 	MMUMETHOD(mmu_change_wiring,	moea64_change_wiring),
@@ -374,6 +381,8 @@ static mmu_method_t moea64_methods[] = {
 	MMUMETHOD(mmu_kenter,		moea64_kenter),
 	MMUMETHOD(mmu_kenter_attr,	moea64_kenter_attr),
 	MMUMETHOD(mmu_dev_direct_mapped,moea64_dev_direct_mapped),
+	MMUMETHOD(mmu_scan_md,		moea64_scan_md),
+	MMUMETHOD(mmu_dumpsys_map,	moea64_dumpsys_map),
 
 	{ 0, 0 }
 };
@@ -468,13 +477,9 @@ om_cmp(const void *a, const void *b)
 
 	mapa = a;
 	mapb = b;
-	if (mapa->om_pa_hi < mapb->om_pa_hi)
+	if (mapa->om_pa < mapb->om_pa)
 		return (-1);
-	else if (mapa->om_pa_hi > mapb->om_pa_hi)
-		return (1);
-	else if (mapa->om_pa_lo < mapb->om_pa_lo)
-		return (-1);
-	else if (mapa->om_pa_lo > mapb->om_pa_lo)
+	else if (mapa->om_pa > mapb->om_pa)
 		return (1);
 	else
 		return (0);
@@ -483,37 +488,52 @@ om_cmp(const void *a, const void *b)
 static void
 moea64_add_ofw_mappings(mmu_t mmup, phandle_t mmu, size_t sz)
 {
-	struct ofw_map	translations[sz/sizeof(struct ofw_map)];
+	struct ofw_map	translations[sz/(4*sizeof(cell_t))]; /*>= 4 cells per */
+	pcell_t		acells, trans_cells[sz/sizeof(cell_t)];
 	register_t	msr;
 	vm_offset_t	off;
 	vm_paddr_t	pa_base;
-	int		i;
+	int		i, j;
 
 	bzero(translations, sz);
-	if (OF_getprop(mmu, "translations", translations, sz) == -1)
+	OF_getprop(OF_finddevice("/"), "#address-cells", &acells,
+	    sizeof(acells));
+	if (OF_getprop(mmu, "translations", trans_cells, sz) == -1)
 		panic("moea64_bootstrap: can't get ofw translations");
 
 	CTR0(KTR_PMAP, "moea64_add_ofw_mappings: translations");
-	sz /= sizeof(*translations);
+	sz /= sizeof(cell_t);
+	for (i = 0, j = 0; i < sz; j++) {
+		translations[j].om_va = trans_cells[i++];
+		translations[j].om_len = trans_cells[i++];
+		translations[j].om_pa = trans_cells[i++];
+		if (acells == 2) {
+			translations[j].om_pa <<= 32;
+			translations[j].om_pa |= trans_cells[i++];
+		}
+		translations[j].om_mode = trans_cells[i++];
+	}
+	KASSERT(i == sz, ("Translations map has incorrect cell count (%d/%zd)",
+	    i, sz));
+
+	sz = j;
 	qsort(translations, sz, sizeof (*translations), om_cmp);
 
 	for (i = 0; i < sz; i++) {
-		CTR3(KTR_PMAP, "translation: pa=%#x va=%#x len=%#x",
-		    (uint32_t)(translations[i].om_pa_lo), translations[i].om_va,
-		    translations[i].om_len);
-
-		if (translations[i].om_pa_lo % PAGE_SIZE)
-			panic("OFW translation not page-aligned!");
-
-		pa_base = translations[i].om_pa_lo;
-
-	      #ifdef __powerpc64__
-		pa_base += (vm_offset_t)translations[i].om_pa_hi << 32;
-	      #else
-		if (translations[i].om_pa_hi)
+		pa_base = translations[i].om_pa;
+	      #ifndef __powerpc64__
+		if ((translations[i].om_pa >> 32) != 0)
 			panic("OFW translations above 32-bit boundary!");
 	      #endif
 
+		if (pa_base % PAGE_SIZE)
+			panic("OFW translation not page-aligned (phys)!");
+		if (translations[i].om_va % PAGE_SIZE)
+			panic("OFW translation not page-aligned (virt)!");
+
+		CTR3(KTR_PMAP, "translation: pa=%#zx va=%#x len=%#x",
+		    pa_base, translations[i].om_va, translations[i].om_len);
+
 		/* Now enter the pages for this mapping */
 
 		DISABLE_TRANS(msr);
@@ -690,9 +710,9 @@ moea64_early_bootstrap(mmu_t mmup, vm_offset_t kernelstart, vm_offset_t kernelen
 	hwphyssz = 0;
 	TUNABLE_ULONG_FETCH("hw.physmem", (u_long *) &hwphyssz);
 	for (i = 0, j = 0; i < regions_sz; i++, j += 2) {
-		CTR3(KTR_PMAP, "region: %#x - %#x (%#x)", regions[i].mr_start,
-		    regions[i].mr_start + regions[i].mr_size,
-		    regions[i].mr_size);
+		CTR3(KTR_PMAP, "region: %#zx - %#zx (%#zx)",
+		    regions[i].mr_start, regions[i].mr_start +
+		    regions[i].mr_size, regions[i].mr_size);
 		if (hwphyssz != 0 &&
 		    (physsz + regions[i].mr_size) >= hwphyssz) {
 			if (physsz < hwphyssz) {
@@ -2584,3 +2604,98 @@ moea64_sync_icache(mmu_t mmu, pmap_t pm, vm_offset_t va, vm_size_t sz)
 	}
 	PMAP_UNLOCK(pm);
 }
+
+vm_offset_t
+moea64_dumpsys_map(mmu_t mmu, struct pmap_md *md, vm_size_t ofs,
+    vm_size_t *sz)
+{
+	if (md->md_vaddr == ~0UL)
+	    return (md->md_paddr + ofs);
+	else
+	    return (md->md_vaddr + ofs);
+}
+
+struct pmap_md *
+moea64_scan_md(mmu_t mmu, struct pmap_md *prev)
+{
+	static struct pmap_md md;
+	struct pvo_entry *pvo;
+	vm_offset_t va;
+ 
+	if (dumpsys_minidump) {
+		md.md_paddr = ~0UL;	/* Minidumps use virtual addresses. */
+		if (prev == NULL) {
+			/* 1st: kernel .data and .bss. */
+			md.md_index = 1;
+			md.md_vaddr = trunc_page((uintptr_t)_etext);
+			md.md_size = round_page((uintptr_t)_end) - md.md_vaddr;
+			return (&md);
+		}
+		switch (prev->md_index) {
+		case 1:
+			/* 2nd: msgbuf and tables (see pmap_bootstrap()). */
+			md.md_index = 2;
+			md.md_vaddr = (vm_offset_t)msgbufp->msg_ptr;
+			md.md_size = round_page(msgbufp->msg_size);
+			break;
+		case 2:
+			/* 3rd: kernel VM. */
+			va = prev->md_vaddr + prev->md_size;
+			/* Find start of next chunk (from va). */
+			while (va < virtual_end) {
+				/* Don't dump the buffer cache. */
+				if (va >= kmi.buffer_sva &&
+				    va < kmi.buffer_eva) {
+					va = kmi.buffer_eva;
+					continue;
+				}
+				pvo = moea64_pvo_find_va(kernel_pmap,
+				    va & ~ADDR_POFF);
+				if (pvo != NULL &&
+				    (pvo->pvo_pte.lpte.pte_hi & LPTE_VALID))
+					break;
+				va += PAGE_SIZE;
+			}
+			if (va < virtual_end) {
+				md.md_vaddr = va;
+				va += PAGE_SIZE;
+				/* Find last page in chunk. */
+				while (va < virtual_end) {
+					/* Don't run into the buffer cache. */
+					if (va == kmi.buffer_sva)
+						break;
+					pvo = moea64_pvo_find_va(kernel_pmap,
+					    va & ~ADDR_POFF);
+					if (pvo == NULL ||
+					    !(pvo->pvo_pte.lpte.pte_hi & LPTE_VALID))
+						break;
+					va += PAGE_SIZE;
+				}
+				md.md_size = va - md.md_vaddr;
+				break;
+			}
+			md.md_index = 3;
+			/* FALLTHROUGH */
+		default:
+			return (NULL);
+		}
+	} else { /* minidumps */
+		if (prev == NULL) {
+			/* first physical chunk. */
+			md.md_paddr = pregions[0].mr_start;
+			md.md_size = pregions[0].mr_size;
+			md.md_vaddr = ~0UL;
+			md.md_index = 1;
+		} else if (md.md_index < pregions_sz) {
+			md.md_paddr = pregions[md.md_index].mr_start;
+			md.md_size = pregions[md.md_index].mr_size;
+			md.md_vaddr = ~0UL;
+			md.md_index++;
+		} else {
+			/* There's no next physical chunk. */
+			return (NULL);
+		}
+	}
+
+	return (&md);
+}
diff --git a/sys/powerpc/aim/mp_cpudep.c b/sys/powerpc/aim/mp_cpudep.c
index 607256c9b15..76822716c46 100644
--- a/sys/powerpc/aim/mp_cpudep.c
+++ b/sys/powerpc/aim/mp_cpudep.c
@@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/psl.h>
 #include <machine/smp.h>
 #include <machine/spr.h>
-#include <machine/trap_aim.h>
+#include <machine/trap.h>
 
 #include <dev/ofw/openfirm.h>
 #include <machine/ofw_machdep.h>
diff --git a/sys/powerpc/aim/nexus.c b/sys/powerpc/aim/nexus.c
deleted file mode 100644
index 109ec52ae6f..00000000000
--- a/sys/powerpc/aim/nexus.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/*-
- * Copyright 1998 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (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 2001 by Thomas Moestl <tmm@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.
- *
- * 	from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <sys/cons.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-
-#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/ofw/openfirm.h>
-
-#include <machine/bus.h>
-#include <machine/frame.h>
-#include <machine/intr_machdep.h>
-#include <machine/resource.h>
-
-#include <sys/rman.h>
-
-#include "ofw_bus_if.h"
-#include "pic_if.h"
-
-/*
- * The nexus (which is a pseudo-bus actually) iterates over the nodes that
- * exist in Open Firmware and adds them as devices to this bus so that drivers
- * can be attached to them.
- *
- * Maybe this code should get into dev/ofw to some extent, as some of it should
- * work for all Open Firmware based machines...
- */
-
-static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information");
-
-enum nexus_ivars {
-	NEXUS_IVAR_NODE,
-	NEXUS_IVAR_NAME,
-	NEXUS_IVAR_DEVICE_TYPE,
-	NEXUS_IVAR_COMPATIBLE,
-};
-
-struct nexus_devinfo {
-	phandle_t	ndi_node;
-	/* Some common properties. */
-	const char     	*ndi_name;
-	const char     	*ndi_device_type;
-	const char     	*ndi_compatible;
-};
-
-struct nexus_softc {
-	struct rman	sc_rman;
-};
-
-/*
- * Device interface
- */
-static int	nexus_probe(device_t);
-static int	nexus_attach(device_t);
-
-/*
- * Bus interface
- */
-static device_t nexus_add_child(device_t, u_int, const char *, int);
-static void	nexus_probe_nomatch(device_t, device_t);
-static int	nexus_read_ivar(device_t, device_t, int, uintptr_t *);
-static int	nexus_write_ivar(device_t, device_t, int, uintptr_t);
-#ifdef SMP
-static int	nexus_bind_intr(device_t dev, device_t child,
-		    struct resource *irq, int cpu);
-#endif
-static int	nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
-		    enum intr_polarity pol);
-static int	nexus_setup_intr(device_t, device_t, struct resource *, int,
-		    driver_filter_t *, driver_intr_t *, void *, void **);
-static int	nexus_teardown_intr(device_t, device_t, struct resource *,
-		    void *);
-static struct	resource *nexus_alloc_resource(device_t, device_t, int, int *,
-		    u_long, u_long, u_long, u_int);
-static int	nexus_activate_resource(device_t, device_t, int, int,
-		    struct resource *);
-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 *);
-
-/*
- * OFW bus interface.
- */
-static phandle_t	 nexus_ofw_get_node(device_t, device_t);
-static const char	*nexus_ofw_get_name(device_t, device_t);
-static const char	*nexus_ofw_get_type(device_t, device_t);
-static const char	*nexus_ofw_get_compat(device_t, device_t);
-
-/*
- * Local routines
- */
-static device_t	nexus_device_from_node(device_t, phandle_t);
-
-static device_method_t nexus_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		nexus_probe),
-	DEVMETHOD(device_attach,	nexus_attach),
-	DEVMETHOD(device_detach,	bus_generic_detach),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
-
-	/* Bus interface. Resource management is business of the children... */
-	DEVMETHOD(bus_add_child,	nexus_add_child),
-	DEVMETHOD(bus_child_pnpinfo_str, ofw_bus_gen_child_pnpinfo_str),
-	DEVMETHOD(bus_probe_nomatch,	nexus_probe_nomatch),
-	DEVMETHOD(bus_read_ivar,	nexus_read_ivar),
-	DEVMETHOD(bus_write_ivar,	nexus_write_ivar),
-	DEVMETHOD(bus_setup_intr,	nexus_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	nexus_teardown_intr),
-#ifdef SMP
-	DEVMETHOD(bus_bind_intr,	nexus_bind_intr),
-#endif
-	DEVMETHOD(bus_config_intr,	nexus_config_intr),
-	DEVMETHOD(bus_alloc_resource,	nexus_alloc_resource),
-	DEVMETHOD(bus_activate_resource,	nexus_activate_resource),
-	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
-	DEVMETHOD(bus_release_resource,	nexus_release_resource),
-
-	/* OFW bus interface */
-	DEVMETHOD(ofw_bus_get_node, nexus_ofw_get_node),
-	DEVMETHOD(ofw_bus_get_name, nexus_ofw_get_name),
-	DEVMETHOD(ofw_bus_get_type, nexus_ofw_get_type),
-	DEVMETHOD(ofw_bus_get_compat, nexus_ofw_get_compat),
-
-	DEVMETHOD_END
-};
-
-static driver_t nexus_driver = {
-	"nexus",
-	nexus_methods,
-	sizeof(struct nexus_softc),
-};
-
-static devclass_t nexus_devclass;
-
-EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0,
-    BUS_PASS_BUS);
-
-static int
-nexus_probe(device_t dev)
-{
-	bus_generic_probe(dev);
-	device_set_desc(dev, "Open Firmware Nexus device");
-	return (0);
-}
-
-static int
-nexus_attach(device_t dev)
-{
-	phandle_t	root;
-	phandle_t	child;
-	struct		nexus_softc *sc;
-	u_long		start, end;
-
-	sc = device_get_softc(dev);
-
-	start = 0;
-	end = ~0;
-
-	sc->sc_rman.rm_start = start;
-	sc->sc_rman.rm_end = end;
-	sc->sc_rman.rm_type = RMAN_ARRAY;
-	sc->sc_rman.rm_descr = "Interrupt request lines";
-	if (rman_init(&sc->sc_rman) ||
-	    rman_manage_region(&sc->sc_rman, start, end))
-		panic("nexus_probe IRQ rman");
-
-	if ((root = OF_peer(0)) == 0)
-		return (bus_generic_attach(dev));
-		
-	/*
-	 * Now walk the OFW tree to locate top-level devices
-	 */
-	for (child = OF_child(root); child != 0; child = OF_peer(child)) {
-		if (child == -1)
-			panic("nexus_probe(): OF_child failed.");
-		(void)nexus_device_from_node(dev, child);
-
-	}
-
-	return (bus_generic_attach(dev));
-}
-
-static void
-nexus_probe_nomatch(device_t dev, device_t child)
-{
-	char	*name, *type;
-
-	if (BUS_READ_IVAR(dev, child, NEXUS_IVAR_NAME,
-	    (uintptr_t *)&name) != 0 ||
-	    BUS_READ_IVAR(dev, child, NEXUS_IVAR_DEVICE_TYPE,
-	    (uintptr_t *)&type) != 0)
-		return;
-
-	if (type == NULL)
-		type = "(unknown)";
-
-	if (bootverbose)
-		device_printf(dev, "<%s>, type %s (no driver attached)\n",
-		    name, type);
-}
-
-static device_t
-nexus_add_child(device_t dev, u_int order, const char *name, int unit)
-{
-	device_t child;
-	struct nexus_devinfo *dinfo;
-
-	child = device_add_child_ordered(dev, order, name, unit);
-	if (child == NULL)
-		return (NULL);
-
-	dinfo = malloc(sizeof(struct nexus_devinfo), M_NEXUS, M_NOWAIT|M_ZERO);
-	if (dinfo == NULL)
-		return (NULL);
-
-	dinfo->ndi_node = -1;
-	dinfo->ndi_name = name;
-	device_set_ivars(child, dinfo);
-
-        return (child);
-}
-
-
-static int
-nexus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
-{
-	struct nexus_devinfo *dinfo;
-
-	if ((dinfo = device_get_ivars(child)) == 0)
-		return (ENOENT);
-	switch (which) {
-	case NEXUS_IVAR_NODE:
-		*result = dinfo->ndi_node;
-		break;
-	case NEXUS_IVAR_NAME:
-		*result = (uintptr_t)dinfo->ndi_name;
-		break;
-	case NEXUS_IVAR_DEVICE_TYPE:
-		*result = (uintptr_t)dinfo->ndi_device_type;
-		break;
-	case NEXUS_IVAR_COMPATIBLE:
-		*result = (uintptr_t)dinfo->ndi_compatible;
-		break;
-	default:
-		return (ENOENT);
-	}
-	return 0;
-}
-
-static int
-nexus_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
-{
-	struct nexus_devinfo *dinfo;
-
-	if ((dinfo = device_get_ivars(child)) == 0)
-		return (ENOENT);
-
-	switch (which) {
-	case NEXUS_IVAR_NAME:
-		return (EINVAL);
-
-	/* Identified devices may want to set these */
-	case NEXUS_IVAR_NODE:
-		dinfo->ndi_node = (phandle_t)value;
-		break;
-
-	case NEXUS_IVAR_DEVICE_TYPE:
-		dinfo->ndi_device_type = (char *)value;
-		break;
-
-	default:
-		return (ENOENT);
-	}
-	return 0;
-}
-
-static int
-nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags,
-    driver_filter_t *filter, driver_intr_t *ihand, void *arg, void **cookiep)
-{
-	int		error;
-
-	/* somebody tried to setup an irq that failed to allocate! */
-	if (res == NULL)
-		panic("nexus_setup_intr: NULL irq resource!");
-
-	*cookiep = 0;
-	if ((rman_get_flags(res) & RF_SHAREABLE) == 0)
-		flags |= INTR_EXCL;
-
-	/*
-	 * We depend here on rman_activate_resource() being idempotent.
-	 */
-	error = rman_activate_resource(res);
-	if (error)
-		return (error);
-
-	error = powerpc_setup_intr(device_get_nameunit(child),
-	    rman_get_start(res), filter, ihand, arg, flags, cookiep);
-
-	return (error);
-}
-
-static int
-nexus_teardown_intr(device_t dev, device_t child, struct resource *res,
-    void *cookie)
-{
-
-	return (powerpc_teardown_intr(cookie));
-}
-
-#ifdef SMP
-static int
-nexus_bind_intr(device_t dev, device_t child, struct resource *irq, int cpu)
-{
-
-        return (powerpc_bind_intr(rman_get_start(irq), cpu));
-}
-#endif
-        
-static int
-nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
-    enum intr_polarity pol)
-{
-
-        return (powerpc_config_intr(irq, trig, pol));
-}
-
-/*
- * Allocate resources at the behest of a child.  This only handles interrupts,
- * since I/O resources are handled by child busses.
- */
-static struct resource *
-nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
-    u_long start, u_long end, u_long count, u_int flags)
-{
-	struct nexus_softc *sc;
-	struct resource *rv;
-
-	if (type != SYS_RES_IRQ) {
-		device_printf(bus, "unknown resource request from %s\n",
-		    device_get_nameunit(child));
-		return (NULL);
-	}
-
-	if (count == 0 || start + count - 1 != end) {
-		device_printf(bus, "invalid IRQ allocation from %s\n",
-		    device_get_nameunit(child));
-		return (NULL);
-	}
-
-	sc = device_get_softc(bus);
-
-	rv = rman_reserve_resource(&sc->sc_rman, start, end, count,
-	    flags, child);
-	if (rv == NULL) {
-		device_printf(bus, "IRQ allocation failed for %s\n",
-		    device_get_nameunit(child));
-	} else
-		rman_set_rid(rv, *rid);
-
-	return (rv);
-}
-
-static int
-nexus_activate_resource(device_t bus, device_t child, int type, int rid,
-    struct resource *res)
-{
-
-	/* Not much to be done yet... */
-	return (rman_activate_resource(res));
-}
-
-static int
-nexus_deactivate_resource(device_t bus, device_t child, int type, int rid,
-    struct resource *res)
-{
-
-	/* Not much to be done yet... */
-	return (rman_deactivate_resource(res));
-}
-
-static int
-nexus_release_resource(device_t bus, device_t child, int type, int rid,
-    struct resource *res)
-{
-
-	if (type != SYS_RES_IRQ) {
-		device_printf(bus, "unknown resource request from %s\n",
-		    device_get_nameunit(child));
-		return (EINVAL);
-	}
-
-	return (rman_release_resource(res));
-}
-
-static device_t
-nexus_device_from_node(device_t parent, phandle_t node)
-{
-	device_t	cdev;
-	struct		nexus_devinfo *dinfo;
-	char		*name, *type, *compatible;
-
-	OF_getprop_alloc(node, "name", 1, (void **)&name);
-	OF_getprop_alloc(node, "device_type", 1, (void **)&type);
-	OF_getprop_alloc(node, "compatible", 1, (void **)&compatible);
-	cdev = device_add_child(parent, NULL, -1);
-	if (cdev != NULL) {
-		dinfo = malloc(sizeof(*dinfo), M_NEXUS, M_WAITOK);
-		dinfo->ndi_node = node;
-		dinfo->ndi_name = name;
-		dinfo->ndi_device_type = type;
-		dinfo->ndi_compatible = compatible;
-		device_set_ivars(cdev, dinfo);
-	} else
-		free(name, M_OFWPROP);
-
-	return (cdev);
-}
-
-static const char *
-nexus_ofw_get_name(device_t bus, device_t dev)
-{
-	struct nexus_devinfo *dinfo;
-
-	if ((dinfo = device_get_ivars(dev)) == NULL)
-		return (NULL);
-	
-	return (dinfo->ndi_name);
-}
-
-static phandle_t
-nexus_ofw_get_node(device_t bus, device_t dev)
-{
-	struct nexus_devinfo *dinfo;
-
-	if ((dinfo = device_get_ivars(dev)) == NULL)
-		return (0);
-	
-	return (dinfo->ndi_node);
-}
-
-static const char *
-nexus_ofw_get_type(device_t bus, device_t dev)
-{
-	struct nexus_devinfo *dinfo;
-
-	if ((dinfo = device_get_ivars(dev)) == NULL)
-		return (NULL);
-	
-	return (dinfo->ndi_device_type);
-}
-
-static const char *
-nexus_ofw_get_compat(device_t bus, device_t dev)
-{
-	struct nexus_devinfo *dinfo;
-
-	if ((dinfo = device_get_ivars(dev)) == NULL)
-		return (NULL);
-	
-	return (dinfo->ndi_compatible);
-}
-
diff --git a/sys/powerpc/aim/trap.c b/sys/powerpc/aim/trap.c
index 2edbbfa7e3f..d382ba55411 100644
--- a/sys/powerpc/aim/trap.c
+++ b/sys/powerpc/aim/trap.c
@@ -34,9 +34,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/kdb.h>
 #include <sys/proc.h>
@@ -52,9 +49,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/uio.h>
 #include <sys/signalvar.h>
 #include <sys/vmmeter.h>
-#ifdef HWPMC_HOOKS
-#include <sys/pmckern.h>
-#endif
 
 #include <security/audit/audit.h>
 
@@ -84,7 +78,6 @@ static void	printtrap(u_int vector, struct trapframe *frame, int isfatal,
 		    int user);
 static int	trap_pfault(struct trapframe *frame, int user);
 static int	fix_unaligned(struct thread *td, struct trapframe *frame);
-static int	ppc_instr_emulate(struct trapframe *frame);
 static int	handle_onfault(struct trapframe *frame);
 static void	syscall(struct trapframe *frame);
 
@@ -94,12 +87,6 @@ static int	handle_user_slb_spill(pmap_t pm, vm_offset_t addr);
 extern int	n_slbs;
 #endif
 
-int	setfault(faultbuf);		/* defined in locore.S */
-
-/* Why are these not defined in a header? */
-int	badaddr(void *, size_t);
-int	badaddr_read(void *, size_t, int *);
-
 struct powerpc_exception {
 	u_int	vector;
 	char	*name;
@@ -125,9 +112,8 @@ dtrace_doubletrap_func_t	dtrace_doubletrap_func;
 systrace_probe_func_t	systrace_probe_func;
 
 /*
- * These hooks are necessary for the pid, usdt and fasttrap providers.
+ * These hooks are necessary for the pid and usdt providers.
  */
-dtrace_fasttrap_probe_ptr_t	dtrace_fasttrap_probe_ptr;
 dtrace_pid_probe_ptr_t		dtrace_pid_probe_ptr;
 dtrace_return_probe_ptr_t	dtrace_return_probe_ptr;
 int (*dtrace_invop_jump_addr)(struct trapframe *);
@@ -179,6 +165,9 @@ trap(struct trapframe *frame)
 {
 	struct thread	*td;
 	struct proc	*p;
+#ifdef KDTRACE_HOOKS
+	uint32_t inst;
+#endif
 	int		sig, type, user;
 	u_int		ucode;
 	ksiginfo_t	ksi;
@@ -195,14 +184,6 @@ trap(struct trapframe *frame)
 	CTR3(KTR_TRAP, "trap: %s type=%s (%s)", td->td_name,
 	    trapname(type), user ? "user" : "kernel");
 
-#ifdef HWPMC_HOOKS
-	if (type == EXC_PERF && (pmc_intr != NULL)) {
-		(*pmc_intr)(PCPU_GET(cpuid), frame);
-		if (user)
-			userret(td, frame);
-		return;
-	}
-#endif
 #ifdef KDTRACE_HOOKS
 	/*
 	 * A trap can occur while DTrace executes a probe. Before
@@ -216,9 +197,6 @@ trap(struct trapframe *frame)
 	 * handled the trap and modified the trap frame so that this
 	 * function can return normally.
 	 */
-	/*
-	 * XXXDTRACE: add fasttrap and pid  probes handlers here (if ever)
-	 */
 	if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame, type))
 		return;
 #endif
@@ -291,12 +269,20 @@ trap(struct trapframe *frame)
 
 		case EXC_PGM:
 			/* Identify the trap reason */
-			if (frame->srr1 & EXC_PGM_TRAP)
-				sig = SIGTRAP;
-			else if (ppc_instr_emulate(frame) == 0)
-				frame->srr0 += 4;
-			else
-				sig = SIGILL;
+			if (frame->srr1 & EXC_PGM_TRAP) {
+#ifdef KDTRACE_HOOKS
+				inst = fuword32((const void *)frame->srr0);
+				if (inst == 0x0FFFDDDD && dtrace_pid_probe_ptr != NULL) {
+					struct reg regs;
+					fill_regs(td, &regs);
+					(*dtrace_pid_probe_ptr)(&regs);
+					break;
+				}
+#endif
+ 				sig = SIGTRAP;
+			} else {
+				sig = ppc_instr_emulate(frame, td->td_pcb);
+			}
 			break;
 
 		default:
@@ -698,59 +684,6 @@ trap_pfault(struct trapframe *frame, int user)
 	return (SIGSEGV);
 }
 
-int
-badaddr(void *addr, size_t size)
-{
-	return (badaddr_read(addr, size, NULL));
-}
-
-int
-badaddr_read(void *addr, size_t size, int *rptr)
-{
-	struct thread	*td;
-	faultbuf	env;
-	int		x;
-
-	/* Get rid of any stale machine checks that have been waiting.  */
-	__asm __volatile ("sync; isync");
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = 0;
-		__asm __volatile ("sync");
-		return 1;
-	}
-
-	__asm __volatile ("sync");
-
-	switch (size) {
-	case 1:
-		x = *(volatile int8_t *)addr;
-		break;
-	case 2:
-		x = *(volatile int16_t *)addr;
-		break;
-	case 4:
-		x = *(volatile int32_t *)addr;
-		break;
-	default:
-		panic("badaddr: invalid size (%zd)", size);
-	}
-
-	/* Make sure we took the machine check, if we caused one. */
-	__asm __volatile ("sync; isync");
-
-	td->td_pcb->pcb_onfault = 0;
-	__asm __volatile ("sync");	/* To be sure. */
-
-	/* Use the value to avoid reorder. */
-	if (rptr)
-		*rptr = x;
-
-	return (0);
-}
-
 /*
  * For now, this only deals with the particular unaligned access case
  * that gcc tends to generate.  Eventually it should handle all of the
@@ -801,20 +734,3 @@ fix_unaligned(struct thread *td, struct trapframe *frame)
 	return -1;
 }
 
-static int
-ppc_instr_emulate(struct trapframe *frame)
-{
-	uint32_t instr;
-	int reg;
-
-	instr = fuword32((void *)frame->srr0);
-
-	if ((instr & 0xfc1fffff) == 0x7c1f42a6) {	/* mfpvr */
-		reg = (instr & ~0xfc1fffff) >> 21;
-		frame->fixreg[reg] = mfpvr();
-		return (0);
-	}
-
-	return (-1);
-}
-
diff --git a/sys/powerpc/aim/trap_subr32.S b/sys/powerpc/aim/trap_subr32.S
index d137fd41ab1..78accf3fc4e 100644
--- a/sys/powerpc/aim/trap_subr32.S
+++ b/sys/powerpc/aim/trap_subr32.S
@@ -664,11 +664,12 @@ disitrap:
 	stw	%r31,(PC_TEMPSAVE+CPUSAVE_AIM_DSISR)(%r1)
 
 #ifdef KDB
-	/* Try and detect a kernel stack overflow */
+	/* Try to detect a kernel stack overflow */
 	mfsrr1	%r31
 	mtcr	%r31
 	bt	17,realtrap		/* branch is user mode */
 	mfsprg1	%r31			/* get old SP */
+	clrrwi	%r31,%r31,11		/* Round SP down to nearest page */
 	sub.	%r30,%r31,%r30		/* SP - DAR */
 	bge	1f
 	neg	%r30,%r30		/* modulo value */
diff --git a/sys/powerpc/aim/trap_subr64.S b/sys/powerpc/aim/trap_subr64.S
index 85502270b9e..5911a7fc92e 100644
--- a/sys/powerpc/aim/trap_subr64.S
+++ b/sys/powerpc/aim/trap_subr64.S
@@ -569,11 +569,12 @@ disitrap:
 	std	%r31,(PC_TEMPSAVE+CPUSAVE_AIM_DSISR)(%r1)
 
 #ifdef KDB
-	/* Try and detect a kernel stack overflow */
+	/* Try to detect a kernel stack overflow */
 	mfsrr1	%r31
 	mtcr	%r31
 	bt	17,realtrap		/* branch is user mode */
 	mfsprg1	%r31			/* get old SP */
+	clrrdi	%r31,%r31,11		/* Round SP down to nearest page */
 	sub.	%r30,%r31,%r30		/* SP - DAR */
 	bge	1f
 	neg	%r30,%r30		/* modulo value */
diff --git a/sys/powerpc/aim/vm_machdep.c b/sys/powerpc/aim/vm_machdep.c
deleted file mode 100644
index 21cc8f34c07..00000000000
--- a/sys/powerpc/aim/vm_machdep.c
+++ /dev/null
@@ -1,413 +0,0 @@
-/*-
- * Copyright (c) 1982, 1986 The Regents of the University of California.
- * Copyright (c) 1989, 1990 William Jolitz
- * Copyright (c) 1994 John Dyson
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department, and 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: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
- *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD$
- */
-/*-
- * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Author: Chris G. Demetriou
- *
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/malloc.h>
-#include <sys/bio.h>
-#include <sys/buf.h>
-#include <sys/ktr.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/vnode.h>
-#include <sys/vmmeter.h>
-#include <sys/kernel.h>
-#include <sys/mbuf.h>
-#include <sys/sf_buf.h>
-#include <sys/sysctl.h>
-#include <sys/sysent.h>
-#include <sys/unistd.h>
-
-#include <machine/cpu.h>
-#include <machine/fpu.h>
-#include <machine/frame.h>
-#include <machine/md_var.h>
-#include <machine/pcb.h>
-
-#include <dev/ofw/openfirm.h>
-
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_page.h>
-#include <vm/vm_map.h>
-#include <vm/vm_extern.h>
-
-/*
- * On systems without a direct mapped region (e.g. PPC64),
- * we use the same code as the Book E implementation. Since
- * we need to have runtime detection of this, define some machinery
- * for sf_bufs in this case, and ignore it on systems with direct maps.
- */
-
-#ifndef NSFBUFS
-#define NSFBUFS         (512 + maxusers * 16)
-#endif
-
-static int nsfbufs;
-static int nsfbufspeak;
-static int nsfbufsused;
-
-SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufs, CTLFLAG_RDTUN, &nsfbufs, 0,
-    "Maximum number of sendfile(2) sf_bufs available");
-SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufspeak, CTLFLAG_RD, &nsfbufspeak, 0,
-    "Number of sendfile(2) sf_bufs at peak usage");
-SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0,
-    "Number of sendfile(2) sf_bufs in use");
-
-static void sf_buf_init(void *arg);
-SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL);
- 
-LIST_HEAD(sf_head, sf_buf);
- 
-/* A hash table of active sendfile(2) buffers */
-static struct sf_head *sf_buf_active;
-static u_long sf_buf_hashmask;
-
-#define SF_BUF_HASH(m)  (((m) - vm_page_array) & sf_buf_hashmask)
-
-static TAILQ_HEAD(, sf_buf) sf_buf_freelist;
-static u_int sf_buf_alloc_want;
-
-/*
- * A lock used to synchronize access to the hash table and free list
- */
-static struct mtx sf_buf_lock;
-
-#ifdef __powerpc64__
-extern uintptr_t tocbase;
-#endif
-
-
-/*
- * Finish a fork operation, with process p2 nearly set up.
- * Copy and update the pcb, set up the stack so that the child
- * ready to run and return to user mode.
- */
-void
-cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
-{
-	struct	trapframe *tf;
-	struct	callframe *cf;
-	struct	pcb *pcb;
-
-	KASSERT(td1 == curthread || td1 == &thread0,
-	    ("cpu_fork: p1 not curproc and not proc0"));
-	CTR3(KTR_PROC, "cpu_fork: called td1=%p p2=%p flags=%x",
-	    td1, p2, flags);
-
-	if ((flags & RFPROC) == 0)
-		return;
-
-	pcb = (struct pcb *)((td2->td_kstack +
-	    td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x2fUL);
-	td2->td_pcb = pcb;
-
-	/* Copy the pcb */
-	bcopy(td1->td_pcb, pcb, sizeof(struct pcb));
-
-	/*
-	 * Create a fresh stack for the new process.
-	 * Copy the trap frame for the return to user mode as if from a
-	 * syscall.  This copies most of the user mode register values.
-	 */
-	tf = (struct trapframe *)pcb - 1;
-	bcopy(td1->td_frame, tf, sizeof(*tf));
-
-	/* Set up trap frame. */
-	tf->fixreg[FIRSTARG] = 0;
-	tf->fixreg[FIRSTARG + 1] = 0;
-	tf->cr &= ~0x10000000;
-
-	td2->td_frame = tf;
-
-	cf = (struct callframe *)tf - 1;
-	memset(cf, 0, sizeof(struct callframe));
-	#ifdef __powerpc64__
-	cf->cf_toc = tocbase;
-	#endif
-	cf->cf_func = (register_t)fork_return;
-	cf->cf_arg0 = (register_t)td2;
-	cf->cf_arg1 = (register_t)tf;
-
-	pcb->pcb_sp = (register_t)cf;
-	KASSERT(pcb->pcb_sp % 16 == 0, ("stack misaligned"));
-	#ifdef __powerpc64__
-	pcb->pcb_lr = ((register_t *)fork_trampoline)[0];
-	pcb->pcb_toc = ((register_t *)fork_trampoline)[1];
-	#else
-	pcb->pcb_lr = (register_t)fork_trampoline;
-	#endif
-	pcb->pcb_cpu.aim.usr_vsid = 0;
-
-	/* Setup to release spin count in fork_exit(). */
-	td2->td_md.md_spinlock_count = 1;
-	td2->td_md.md_saved_msr = PSL_KERNSET;
-
-	/*
- 	 * Now cpu_switch() can schedule the new process.
-	 */
-}
-
-/*
- * Intercept the return address from a freshly forked process that has NOT
- * been scheduled yet.
- *
- * This is needed to make kernel threads stay in kernel mode.
- */
-void
-cpu_set_fork_handler(td, func, arg)
-	struct thread *td;
-	void (*func)(void *);
-	void *arg;
-{
-	struct	callframe *cf;
-
-	CTR4(KTR_PROC, "%s called with td=%p func=%p arg=%p",
-	    __func__, td, func, arg);
-
-	cf = (struct callframe *)td->td_pcb->pcb_sp;
-
-	cf->cf_func = (register_t)func;
-	cf->cf_arg0 = (register_t)arg;
-}
-
-void
-cpu_exit(td)
-	register struct thread *td;
-{
-}
-
-/*
- * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-))
- */
-static void
-sf_buf_init(void *arg)
-{
-        struct sf_buf *sf_bufs;
-        vm_offset_t sf_base;
-        int i;
-
-	/* Don't bother on systems with a direct map */
-
-	if (hw_direct_map)
-		return;
-
-        nsfbufs = NSFBUFS;
-        TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs);
-
-        sf_buf_active = hashinit(nsfbufs, M_TEMP, &sf_buf_hashmask);
-        TAILQ_INIT(&sf_buf_freelist);
-        sf_base = kva_alloc(nsfbufs * PAGE_SIZE);
-        sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, M_NOWAIT | M_ZERO);
-
-        for (i = 0; i < nsfbufs; i++) {
-                sf_bufs[i].kva = sf_base + i * PAGE_SIZE;
-                TAILQ_INSERT_TAIL(&sf_buf_freelist, &sf_bufs[i], free_entry);
-        }
-        sf_buf_alloc_want = 0;
-        mtx_init(&sf_buf_lock, "sf_buf", NULL, MTX_DEF);
-}
-
-/*
- * Get an sf_buf from the freelist. Will block if none are available.
- */
-struct sf_buf *
-sf_buf_alloc(struct vm_page *m, int flags)
-{
-        struct sf_head *hash_list;
-        struct sf_buf *sf;
-        int error;
-
-	if (hw_direct_map) {
-		/* Shortcut the direct mapped case */
-
-		return ((struct sf_buf *)m);
-	}
-
-        hash_list = &sf_buf_active[SF_BUF_HASH(m)];
-        mtx_lock(&sf_buf_lock);
-        LIST_FOREACH(sf, hash_list, list_entry) {
-                if (sf->m == m) {
-                        sf->ref_count++;
-                        if (sf->ref_count == 1) {
-                                TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry);
-                                nsfbufsused++;
-                                nsfbufspeak = imax(nsfbufspeak, nsfbufsused);
-                        }
-                        goto done;
-                }
-        }
-
-        while ((sf = TAILQ_FIRST(&sf_buf_freelist)) == NULL) {
-                if (flags & SFB_NOWAIT)
-                        goto done;
-
-                sf_buf_alloc_want++;
-                SFSTAT_INC(sf_allocwait);
-                error = msleep(&sf_buf_freelist, &sf_buf_lock,
-                    (flags & SFB_CATCH) ? PCATCH | PVM : PVM, "sfbufa", 0);
-                sf_buf_alloc_want--;
-
-                /*
-                 * If we got a signal, don't risk going back to sleep.
-                 */
-                if (error)
-                        goto done;
-        }
-
-        TAILQ_REMOVE(&sf_buf_freelist, sf, free_entry);
-        if (sf->m != NULL)
-                LIST_REMOVE(sf, list_entry);
-
-        LIST_INSERT_HEAD(hash_list, sf, list_entry);
-        sf->ref_count = 1;
-        sf->m = m;
-        nsfbufsused++;
-        nsfbufspeak = imax(nsfbufspeak, nsfbufsused);
-        pmap_qenter(sf->kva, &sf->m, 1);
-done:
-        mtx_unlock(&sf_buf_lock);
-        return (sf);
-}
-
-/*
- * Detatch mapped page and release resources back to the system.
- *
- * Remove a reference from the given sf_buf, adding it to the free
- * list when its reference count reaches zero. A freed sf_buf still,
- * however, retains its virtual-to-physical mapping until it is
- * recycled or reactivated by sf_buf_alloc(9).
- */
-void
-sf_buf_free(struct sf_buf *sf)
-{
-	if (hw_direct_map)
-		return;
-
-        mtx_lock(&sf_buf_lock);
-        sf->ref_count--;
-        if (sf->ref_count == 0) {
-                TAILQ_INSERT_TAIL(&sf_buf_freelist, sf, free_entry);
-                nsfbufsused--;
-
-                if (sf_buf_alloc_want > 0)
-                        wakeup(&sf_buf_freelist);
-        }
-        mtx_unlock(&sf_buf_lock);
-}
-
-/*
- * Software interrupt handler for queued VM system processing.
- */
-void
-swi_vm(void *dummy)
-{
-
-	if (busdma_swi_pending != 0)
-		busdma_swi();
-}
-
-/*
- * Tell whether this address is in some physical memory region.
- * Currently used by the kernel coredump code in order to avoid
- * dumping the ``ISA memory hole'' which could cause indefinite hangs,
- * or other unpredictable behaviour.
- */
-
-
-int
-is_physical_memory(addr)
-	vm_offset_t addr;
-{
-	/*
-	 * stuff other tests for known memory-mapped devices (PCI?)
-	 * here
-	 */
-
-	return 1;
-}
-
-/*
- * CPU threading functions related to the VM layer. These could be used
- * to map the SLB bits required for the kernel stack instead of forcing a
- * fixed-size KVA.
- */
-
-void
-cpu_thread_swapin(struct thread *td)
-{
-}
-
-void
-cpu_thread_swapout(struct thread *td)
-{
-}
-
diff --git a/sys/powerpc/booke/clock.c b/sys/powerpc/booke/clock.c
deleted file mode 100644
index 5827e73c25f..00000000000
--- a/sys/powerpc/booke/clock.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996 Wolfgang Solfrank.
- * Copyright (C) 1995, 1996 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *	$NetBSD: clock.c,v 1.9 2000/01/19 02:52:19 msaitoh Exp $
- */
-/*
- * Copyright (C) 2001 Benno Rice.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) 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/kernel.h>
-#include <sys/sysctl.h>
-#include <sys/bus.h>
-#include <sys/interrupt.h>
-#include <sys/ktr.h>
-#include <sys/pcpu.h>
-#include <sys/timeet.h>
-#include <sys/timetc.h>
-
-#include <machine/clock.h>
-#include <machine/intr_machdep.h>
-#include <machine/platform.h>
-#include <machine/psl.h>
-#include <machine/spr.h>
-#include <machine/cpu.h>
-#include <machine/md_var.h>
-
-/*
- * Initially we assume a processor with a bus frequency of 12.5 MHz.
- */
-static int		initialized = 0;
-static u_long		ns_per_tick = 80;
-static u_long		ticks_per_sec = 12500000;
-static u_long		*decr_counts[MAXCPU];
-
-#define	DIFF19041970	2082844800
-
-static int		decr_et_start(struct eventtimer *et,
-    sbintime_t first, sbintime_t period);
-static int		decr_et_stop(struct eventtimer *et);
-static timecounter_get_t decr_get_timecount;
-
-struct decr_state {
-	int	mode;	/* 0 - off, 1 - periodic, 2 - one-shot. */
-	int32_t	div;	/* Periodic divisor. */
-};
-static DPCPU_DEFINE(struct decr_state, decr_state);
-
-static struct eventtimer	decr_et;
-static struct timecounter	decr_timecounter = {
-	decr_get_timecount,	/* get_timecount */
-	0,			/* no poll_pps */
-	~0u,			/* counter_mask */
-	0,			/* frequency */
-	"timebase"		/* name */
-};
-
-/*
- * Decrementer interrupt handler.
- */
-void
-decr_intr(struct trapframe *frame)
-{
-	struct decr_state *s = DPCPU_PTR(decr_state);
-
-	if (!initialized)
-		return;
-
-	(*decr_counts[curcpu])++;
-
-	/*
-	 * Interrupt handler must reset DIS to avoid getting another
-	 * interrupt once EE is enabled.
-	 */
-	mtspr(SPR_TSR, TSR_DIS);
-
-	CTR1(KTR_INTR, "%s: DEC interrupt", __func__);
-
-	if (s->mode == 2)
-		decr_et_stop(NULL);
-
-	if (decr_et.et_active)
-		decr_et.et_event_cb(&decr_et, decr_et.et_arg);
-}
-
-void
-cpu_initclocks(void)
-{
-
-	decr_tc_init();
-	cpu_initclocks_bsp();
-}
-
-/*
- * BSP early initialization.
- */
-void
-decr_init(void)
-{
-	struct cpuref cpu;
-	char buf[32];
-
-	if (platform_smp_get_bsp(&cpu) != 0)
-		platform_smp_first_cpu(&cpu);
-	ticks_per_sec = platform_timebase_freq(&cpu);
-	ns_per_tick = 1000000000 / ticks_per_sec;
-
-	set_cputicker(mftb, ticks_per_sec, 0);
-	snprintf(buf, sizeof(buf), "cpu%d:decrementer", curcpu);
-	intrcnt_add(buf, &decr_counts[curcpu]);
-	decr_et_stop(NULL);
-	initialized = 1;
-}
-
-#ifdef SMP
-/*
- * AP early initialization.
- */
-void
-decr_ap_init(void)
-{
-	char buf[32];
-
-	snprintf(buf, sizeof(buf), "cpu%d:decrementer", curcpu);
-	intrcnt_add(buf, &decr_counts[curcpu]);
-	decr_et_stop(NULL);
-}
-#endif
-
-/*
- * Final initialization.
- */
-void
-decr_tc_init(void)
-{
-
-	decr_timecounter.tc_frequency = ticks_per_sec;
-	tc_init(&decr_timecounter);
-	decr_et.et_name = "decrementer";
-	decr_et.et_flags = ET_FLAGS_PERIODIC | ET_FLAGS_ONESHOT |
-	    ET_FLAGS_PERCPU;
-	decr_et.et_quality = 1000;
-	decr_et.et_frequency = ticks_per_sec;
-	decr_et.et_min_period = (0x00000002LLU << 32) / ticks_per_sec;
-	decr_et.et_max_period = (0xfffffffeLLU << 32) / ticks_per_sec;
-	decr_et.et_start = decr_et_start;
-	decr_et.et_stop = decr_et_stop;
-	decr_et.et_priv = NULL;
-	et_register(&decr_et);
-}
-
-/*
- * Event timer start method.
- */
-static int
-decr_et_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
-{
-	struct decr_state *s = DPCPU_PTR(decr_state);
-	uint32_t fdiv, tcr;
-
-	if (period != 0) {
-		s->mode = 1;
-		s->div = (decr_et.et_frequency * period) >> 32;
-	} else {
-		s->mode = 2;
-		s->div = 0;
-	}
-	if (first != 0)
-		fdiv = (decr_et.et_frequency * first) >> 32;
-	else
-		fdiv = s->div;
-
-	tcr = mfspr(SPR_TCR);
-	tcr |= TCR_DIE;
-	if (s->mode == 1) {
-		mtspr(SPR_DECAR, s->div);
-		tcr |= TCR_ARE;
-	} else
-		tcr &= ~TCR_ARE;
-	mtdec(fdiv);
-	mtspr(SPR_TCR, tcr);
-	return (0);
-}
-
-/*
- * Event timer stop method.
- */
-static int
-decr_et_stop(struct eventtimer *et)
-{
-	struct decr_state *s = DPCPU_PTR(decr_state);
-	uint32_t tcr;
-
-	s->mode = 0;
-	s->div = 0xffffffff;
-	tcr = mfspr(SPR_TCR);
-	tcr &= ~(TCR_DIE | TCR_ARE);
-	mtspr(SPR_TCR, tcr);
-	return (0);
-}
-
-/*
- * Timecounter get method.
- */
-static unsigned
-decr_get_timecount(struct timecounter *tc)
-{
-	quad_t tb;
-
-	tb = mftb();
-	return (tb);
-}
-
-/*
- * Wait for about n microseconds (at least!).
- */
-void
-DELAY(int n)
-{
-	u_quad_t start, end, now;
-
-	start = mftb();
-	end = start + (u_quad_t)ticks_per_sec / (1000000ULL / n);
-	do {
-		now = mftb();
-	} while (now < end || (now > start && end < start));
-}
-
diff --git a/sys/powerpc/booke/copyinout.c b/sys/powerpc/booke/copyinout.c
deleted file mode 100644
index 011b8bdf3cd..00000000000
--- a/sys/powerpc/booke/copyinout.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/*-
- * Copyright (C) 2002 Benno Rice
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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) 1993 Wolfgang Solfrank.
- * Copyright (C) 1993 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) 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/proc.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-#include <vm/vm_map.h>
-
-#include <machine/pcb.h>
-#include <machine/vmparam.h>
-
-
-int	setfault(faultbuf);	/* defined in locore.S */
-
-static int
-is_uaddr(const void *addr)
-{
-	int rv = ((vm_offset_t)addr <= VM_MAXUSER_ADDRESS) ? 1 : 0;
-
-	return rv;
-}
-
-int
-copyout(const void *kaddr, void *udaddr, size_t len)
-{
-	struct		thread *td;
-	faultbuf	env;
-
-	if (!is_uaddr(udaddr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	bcopy(kaddr, udaddr, len);
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (0);
-}
-
-int
-copyin(const void *udaddr, void *kaddr, size_t len)
-{
-	struct		thread *td;
-	faultbuf	env;
-
-	if (!is_uaddr(udaddr) || is_uaddr(kaddr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	bcopy(udaddr, kaddr, len);
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (0);
-}
-
-int
-copyinstr(const void *udaddr, void *kaddr, size_t len, size_t *done)
-{
-	struct		thread *td;
-	faultbuf	env;
-	const char	*up;
-	char		*kp;
-	size_t		l;
-	int		rv, c;
-
-	if (!is_uaddr(udaddr) || is_uaddr(kaddr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	kp = kaddr;
-	up = udaddr;
-
-	rv = ENAMETOOLONG;
-
-	for (l = 0; len-- > 0; l++) {
-
-		c = *up++;
-		
-		if (!(*kp++ = c)) {
-			l++;
-			rv = 0;
-			break;
-		}
-	}
-
-	if (done != NULL) {
-		*done = l;
-	}
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (rv);
-}
-
-int
-subyte(void *addr, int byte)
-{
-	struct		thread *td;
-	faultbuf	env;
-
-	if (!is_uaddr(addr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	*(char *)addr = (char)byte;
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (0);
-}
-
-int
-suword(void *addr, long word)
-{
-	struct		thread *td;
-	faultbuf	env;
-
-	if (!is_uaddr(addr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	*(long *)addr = word;
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (0);
-}
-
-int
-suword32(void *addr, int32_t word)
-{
-
-	return (suword(addr, (long)word));
-}
-
-
-int
-fubyte(const void *addr)
-{
-	struct		thread *td;
-	faultbuf	env;
-	int		val;
-
-	if (!is_uaddr(addr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	val = *(const u_char *)addr;
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (val);
-}
-
-long
-fuword(const void *addr)
-{
-	struct		thread *td;
-	faultbuf	env;
-	long		val;
-
-	if (!is_uaddr(addr))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	val = *(const long *)addr;
-
-	td->td_pcb->pcb_onfault = NULL;
-	return (val);
-}
-
-int32_t
-fuword32(const void *addr)
-{
-
-	return ((int32_t)fuword(addr));
-}
-
-uint32_t
-casuword32(volatile uint32_t *base, uint32_t oldval, uint32_t newval)
-{
-
-	return (casuword((volatile u_long *)base, oldval, newval));
-}
-
-u_long
-casuword(volatile u_long *addr, u_long old, u_long new)
-{
-	struct thread *td;
-	faultbuf env;
-	u_long val;
-
-	if (!((vm_offset_t)addr <= VM_MAXUSER_ADDRESS))
-		return (EFAULT);
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
-	__asm __volatile (
-		"1:\tlwarx %0, 0, %2\n\t"	/* load old value */
-		"cmplw %3, %0\n\t"		/* compare */
-		"bne 2f\n\t"			/* exit if not equal */
-		"stwcx. %4, 0, %2\n\t"      	/* attempt to store */
-		"bne- 1b\n\t"			/* spin if failed */
-		"b 3f\n\t"			/* we've succeeded */
-		"2:\n\t"
-		"stwcx. %0, 0, %2\n\t"       	/* clear reservation (74xx) */
-		"3:\n\t"
-		: "=&r" (val), "=m" (*addr)
-		: "r" (addr), "r" (old), "r" (new), "m" (*addr)
-		: "cc", "memory");
-
-	td->td_pcb->pcb_onfault = NULL;
-
-	return (val);
-}
diff --git a/sys/powerpc/booke/locore.S b/sys/powerpc/booke/locore.S
index 631796d135a..514afa66be7 100644
--- a/sys/powerpc/booke/locore.S
+++ b/sys/powerpc/booke/locore.S
@@ -158,7 +158,7 @@ __start:
 	mtspr	SPR_MAS0, %r3
 	isync
 
-	li	%r3, (TLB_SIZE_16M << MAS1_TSIZE_SHIFT)@l
+	li	%r3, (TLB_SIZE_64M << MAS1_TSIZE_SHIFT)@l
 	oris	%r3, %r3, (MAS1_VALID | MAS1_IPROT)@h
 	mtspr	SPR_MAS1, %r3		/* note TS was not filled, so it's TS=0 */
 	isync
@@ -738,8 +738,7 @@ ENTRY(icache_enable)
 setfault:
 	mflr	%r0
 	mfsprg0	%r4
-	lwz	%r4, PC_CURTHREAD(%r4)
-	lwz	%r4, TD_PCB(%r4)
+	lwz	%r4, TD_PCB(%r2)
 	stw	%r3, PCB_ONFAULT(%r4)
 	mfcr	%r10
 	mfctr	%r11
diff --git a/sys/powerpc/booke/machdep.c b/sys/powerpc/booke/machdep.c
index e9a2d52aaa6..b289fa13554 100644
--- a/sys/powerpc/booke/machdep.c
+++ b/sys/powerpc/booke/machdep.c
@@ -137,6 +137,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/linker.h>
 #include <sys/reboot.h>
 
+#include <contrib/libfdt/libfdt.h>
 #include <dev/fdt/fdt_common.h>
 #include <dev/ofw/openfirm.h>
 
@@ -192,7 +193,8 @@ extern int elf32_nxstack;
 static void
 cpu_booke_startup(void *dummy)
 {
-	int indx, size;
+	int indx;
+	unsigned long size;
 
 	/* Initialise the decrementer-based clock. */
 	decr_init();
@@ -200,7 +202,7 @@ cpu_booke_startup(void *dummy)
 	/* Good {morning,afternoon,evening,night}. */
 	cpu_setup(PCPU_GET(cpuid));
 
-	printf("real memory  = %ld (%ld MB)\n", ptoa(physmem),
+	printf("real memory  = %lu (%ld MB)\n", ptoa(physmem),
 	    ptoa(physmem) / 1048576);
 	realmem = physmem;
 
@@ -210,7 +212,7 @@ cpu_booke_startup(void *dummy)
 		for (indx = 0; phys_avail[indx + 1] != 0; indx += 2) {
 			size = phys_avail[indx + 1] - phys_avail[indx];
 
-			printf("0x%08x - 0x%08x, %d bytes (%ld pages)\n",
+			printf("0x%08x - 0x%08x, %lu bytes (%lu pages)\n",
 			    phys_avail[indx], phys_avail[indx + 1] - 1,
 			    size, size / PAGE_SIZE);
 		}
@@ -218,7 +220,7 @@ cpu_booke_startup(void *dummy)
 
 	vm_ksubmap_init(&kmi);
 
-	printf("avail memory = %ld (%ld MB)\n", ptoa(cnt.v_free_count),
+	printf("avail memory = %lu (%ld MB)\n", ptoa(cnt.v_free_count),
 	    ptoa(cnt.v_free_count) / 1048576);
 
 	/* Set up buffers, so they can be used to read disk labels. */
@@ -275,6 +277,23 @@ print_kernel_section_addr(void)
 	debugf(" _end           = 0x%08x\n", (uint32_t)_end);
 }
 
+static int
+booke_check_for_fdt(uint32_t arg1, vm_offset_t *dtbp)
+{
+	void *ptr;
+
+	if (arg1 % 8 != 0)
+		return (-1);
+
+	ptr = (void *)pmap_early_io_map(arg1, PAGE_SIZE);
+	if (fdt_check_header(ptr) != 0)
+		return (-1);
+
+	*dtbp = (vm_offset_t)ptr;
+
+	return (0);
+}
+
 u_int
 booke_init(uint32_t arg1, uint32_t arg2)
 {
@@ -287,6 +306,10 @@ booke_init(uint32_t arg1, uint32_t arg2)
 	end = (uintptr_t)_end;
 	dtbp = (vm_offset_t)NULL;
 
+	/* Set up TLB initially */
+	bootinfo = NULL;
+	tlb1_init();
+
 	/*
 	 * Handle the various ways we can get loaded and started:
 	 *  -	FreeBSD's loader passes the pointer to the metadata
@@ -301,11 +324,21 @@ booke_init(uint32_t arg1, uint32_t arg2)
 	 *	in arg1 and arg2 (resp). arg1 is between 1 and some
 	 *	relatively small number, such as 64K. arg2 is the
 	 *	physical address of the argv vector.
+	 *  -   ePAPR loaders pass an FDT blob in r3 (arg1) and the magic hex
+	 *      string 0x45504150 ('ePAP') in r6 (which has been lost by now).
+	 *      r4 (arg2) is supposed to be set to zero, but is not always.
 	 */
-	if (arg1 > (uintptr_t)kernel_text)	/* FreeBSD loader */
-		mdp = (void *)arg1;
-	else if (arg1 == 0)			/* Juniper loader */
+	
+	if (arg1 == 0)				/* Juniper loader */
 		mdp = (void *)arg2;
+	else if (booke_check_for_fdt(arg1, &dtbp) == 0) { /* ePAPR */
+		end = roundup(end, 8);
+		memmove((void *)end, (void *)dtbp, fdt_totalsize((void *)dtbp));
+		dtbp = end;
+		end += fdt_totalsize((void *)dtbp);
+		mdp = NULL;
+	} else if (arg1 > (uintptr_t)kernel_text)	/* FreeBSD loader */
+		mdp = (void *)arg1;
 	else					/* U-Boot */
 		mdp = NULL;
 
@@ -349,13 +382,10 @@ booke_init(uint32_t arg1, uint32_t arg2)
 	if (OF_init((void *)dtbp) != 0)
 		while (1);
 
-	if (fdt_immr_addr(CCSRBAR_VA) != 0)
-		while (1);
-
 	OF_interpret("perform-fixup", 0);
 	
-	/* Set up TLB initially */
-	booke_init_tlb(fdt_immr_pa);
+	/* Reset TLB1 to get rid of temporary mappings */
+	tlb1_init();
 
 	/* Reset Time Base */
 	mttb(0);
@@ -371,6 +401,11 @@ booke_init(uint32_t arg1, uint32_t arg2)
 	pc = &__pcpu[0];
 	pcpu_init(pc, 0, sizeof(struct pcpu));
 	pc->pc_curthread = &thread0;
+#ifdef __powerpc64__
+	__asm __volatile("mr 13,%0" :: "r"(pc->pc_curthread));
+#else
+	__asm __volatile("mr 2,%0" :: "r"(pc->pc_curthread));
+#endif
 	__asm __volatile("mtsprg 0, %0" :: "r"(pc));
 
 	/* Initialize system mutexes. */
diff --git a/sys/powerpc/booke/machdep_e500.c b/sys/powerpc/booke/machdep_e500.c
index 85805a278a6..ab47f620424 100644
--- a/sys/powerpc/booke/machdep_e500.c
+++ b/sys/powerpc/booke/machdep_e500.c
@@ -47,8 +47,6 @@ void
 booke_init_tlb(vm_paddr_t fdt_immr_pa)
 {
 
-	/* Initialize TLB1 handling */
-	tlb1_init(fdt_immr_pa);
 }
 
 void
diff --git a/sys/powerpc/booke/mp_cpudep.c b/sys/powerpc/booke/mp_cpudep.c
index 55e33d8a3ba..5f6becead6e 100644
--- a/sys/powerpc/booke/mp_cpudep.c
+++ b/sys/powerpc/booke/mp_cpudep.c
@@ -71,6 +71,11 @@ cpudep_ap_bootstrap()
 
 	/* Assign pcpu fields, return ptr to this AP's idle thread kstack */
 	pcpup->pc_curthread = pcpup->pc_idlethread;
+#ifdef __powerpc64__
+	__asm __volatile("mr 13,%0" :: "r"(pcpup->pc_curthread));
+#else
+	__asm __volatile("mr 2,%0" :: "r"(pcpup->pc_curthread));
+#endif
 	pcpup->pc_curpcb = pcpup->pc_curthread->td_pcb;
 	sp = pcpup->pc_curpcb->pcb_sp;
 
diff --git a/sys/powerpc/booke/platform_bare.c b/sys/powerpc/booke/platform_bare.c
index 65fb55411c0..c11620a3ae7 100644
--- a/sys/powerpc/booke/platform_bare.c
+++ b/sys/powerpc/booke/platform_bare.c
@@ -35,65 +35,34 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/smp.h>
 
-#include <machine/bus.h>
-#include <machine/cpu.h>
-#include <machine/hid.h>
-#include <machine/platform.h>
-#include <machine/platformvar.h>
-#include <machine/smp.h>
-#include <machine/spr.h>
-#include <machine/vmparam.h>
-
-#include <dev/fdt/fdt_common.h>
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/openfirm.h>
 
-#include <powerpc/mpc85xx/mpc85xx.h>
+#include <machine/platform.h>
+#include <machine/platformvar.h>
 
 #include "platform_if.h"
 
-#ifdef SMP
-extern void *ap_pcpu;
-extern vm_paddr_t kernload;		/* Kernel physical load address */
-extern uint8_t __boot_page[];		/* Boot page body */
-extern uint32_t bp_ntlb1s;
-extern uint32_t bp_tlb1[];
-extern uint32_t bp_tlb1_end[];
-#endif
-
 extern uint32_t *bootinfo;
 
-static int cpu, maxcpu;
-
 static int bare_probe(platform_t);
-static void bare_mem_regions(platform_t, struct mem_region **phys, int *physsz,
-    struct mem_region **avail, int *availsz);
+static void bare_mem_regions(platform_t, struct mem_region *phys, int *physsz,
+    struct mem_region *avail, int *availsz);
 static u_long bare_timebase_freq(platform_t, struct cpuref *cpuref);
-static int bare_smp_first_cpu(platform_t, struct cpuref *cpuref);
-static int bare_smp_next_cpu(platform_t, struct cpuref *cpuref);
-static int bare_smp_get_bsp(platform_t, struct cpuref *cpuref);
-static int bare_smp_start_cpu(platform_t, struct pcpu *cpu);
 
-static void booke_reset(platform_t);
+static void bare_reset(platform_t);
 
 static platform_method_t bare_methods[] = {
 	PLATFORMMETHOD(platform_probe,		bare_probe),
 	PLATFORMMETHOD(platform_mem_regions,	bare_mem_regions),
 	PLATFORMMETHOD(platform_timebase_freq,	bare_timebase_freq),
 
-	PLATFORMMETHOD(platform_smp_first_cpu,	bare_smp_first_cpu),
-	PLATFORMMETHOD(platform_smp_next_cpu,	bare_smp_next_cpu),
-	PLATFORMMETHOD(platform_smp_get_bsp,	bare_smp_get_bsp),
-	PLATFORMMETHOD(platform_smp_start_cpu,	bare_smp_start_cpu),
-
-	PLATFORMMETHOD(platform_reset,		booke_reset),
+	PLATFORMMETHOD(platform_reset,		bare_reset),
 
 	PLATFORMMETHOD_END
 };
 
 static platform_def_t bare_platform = {
-	"bare metal",
+	"bare",
 	bare_methods,
 	0
 };
@@ -103,65 +72,19 @@ PLATFORM_DEF(bare_platform);
 static int
 bare_probe(platform_t plat)
 {
-	phandle_t cpus, child;
-	uint32_t sr;
-	int i, law_max, tgt;
 
-	if ((cpus = OF_finddevice("/cpus")) != 0) {
-		for (maxcpu = 0, child = OF_child(cpus); child != 0;
-		    child = OF_peer(child), maxcpu++)
-			;
-	} else
-		maxcpu = 1;
-
-	/*
-	 * Clear local access windows. Skip DRAM entries, so we don't shoot
-	 * ourselves in the foot.
-	 */
-	law_max = law_getmax();
-	for (i = 0; i < law_max; i++) {
-		sr = ccsr_read4(OCP85XX_LAWSR(i));
-		if ((sr & 0x80000000) == 0)
-			continue;
-		tgt = (sr & 0x01f00000) >> 20;
-		if (tgt == OCP85XX_TGTIF_RAM1 || tgt == OCP85XX_TGTIF_RAM2 ||
-		    tgt == OCP85XX_TGTIF_RAM_INTL)
-			continue;
-
-		ccsr_write4(OCP85XX_LAWSR(i), sr & 0x7fffffff);
-	}
+	if (OF_peer(0) == -1) /* Needs device tree to work */
+		return (ENXIO);
 
 	return (BUS_PROBE_GENERIC);
 }
 
-#define MEM_REGIONS	8
-static struct mem_region avail_regions[MEM_REGIONS];
-
 void
-bare_mem_regions(platform_t plat, struct mem_region **phys, int *physsz,
-    struct mem_region **avail, int *availsz)
+bare_mem_regions(platform_t plat, struct mem_region *phys, int *physsz,
+    struct mem_region *avail, int *availsz)
 {
-	uint32_t memsize;
-	int i, rv;
 
-	rv = fdt_get_mem_regions(avail_regions, availsz, &memsize);
-	if (rv != 0)
-		panic("%s: could not retrieve mem regions from the 'memory' "
-		    "node, error: %d", __func__, rv);
-
-	for (i = 0; i < *availsz; i++) {
-		if (avail_regions[i].mr_start < 1048576) {
-			avail_regions[i].mr_size =
-			    avail_regions[i].mr_size -
-			    (1048576 - avail_regions[i].mr_start);
-			avail_regions[i].mr_start = 1048576;
-		}
-	}
-	*avail = avail_regions;
-
-	/* On the bare metal platform phys == avail memory */
-	*physsz = *availsz;
-	*phys = *avail;
+	ofw_mem_regions(phys, physsz, avail, availsz);
 }
 
 static u_long
@@ -188,6 +111,25 @@ bare_timebase_freq(platform_t plat, struct cpuref *cpuref)
 	if ((child = OF_child(cpus)) == 0)
 		goto out;
 
+	switch (OF_getproplen(child, "timebase-frequency")) {
+	case 4:
+	{
+		uint32_t tbase;
+		OF_getprop(child, "timebase-frequency", &tbase, sizeof(tbase));
+		ticks = tbase;
+		return (ticks);
+	}
+	case 8:
+	{
+		uint64_t tbase;
+		OF_getprop(child, "timebase-frequency", &tbase, sizeof(tbase));
+		ticks = tbase;
+		return (ticks);
+	}
+	default:
+		break;
+	}
+
 	freq = 0;
 	if (OF_getprop(child, "bus-frequency", (void *)&freq,
 	    sizeof(freq)) <= 0)
@@ -207,138 +149,10 @@ out:
 	return (ticks);
 }
 
-static int
-bare_smp_first_cpu(platform_t plat, struct cpuref *cpuref)
-{
-
-	cpu = 0;
-	cpuref->cr_cpuid = cpu;
-	cpuref->cr_hwref = cpuref->cr_cpuid;
-	if (bootverbose)
-		printf("powerpc_smp_first_cpu: cpuid %d\n", cpuref->cr_cpuid);
-	cpu++;
-
-	return (0);
-}
-
-static int
-bare_smp_next_cpu(platform_t plat, struct cpuref *cpuref)
-{
-
-	if (cpu >= maxcpu)
-		return (ENOENT);
-
-	cpuref->cr_cpuid = cpu++;
-	cpuref->cr_hwref = cpuref->cr_cpuid;
-	if (bootverbose)
-		printf("powerpc_smp_next_cpu: cpuid %d\n", cpuref->cr_cpuid);
-
-	return (0);
-}
-
-static int
-bare_smp_get_bsp(platform_t plat, struct cpuref *cpuref)
-{
-
-	cpuref->cr_cpuid = mfspr(SPR_PIR);
-	cpuref->cr_hwref = cpuref->cr_cpuid;
-
-	return (0);
-}
-
-static int
-bare_smp_start_cpu(platform_t plat, struct pcpu *pc)
-{
-#ifdef SMP
-	uint32_t *tlb1;
-	uint32_t bptr, eebpcr;
-	int i, timeout;
-
-	eebpcr = ccsr_read4(OCP85XX_EEBPCR);
-	if ((eebpcr & (1 << (pc->pc_cpuid + 24))) != 0) {
-		printf("SMP: CPU %d already out of hold-off state!\n",
-		    pc->pc_cpuid);
-		return (ENXIO);
-	}
-
-	ap_pcpu = pc;
-
-	i = 0;
-	tlb1 = bp_tlb1;
-	while (i < bp_ntlb1s && tlb1 < bp_tlb1_end) {
-		mtspr(SPR_MAS0, MAS0_TLBSEL(1) | MAS0_ESEL(i));
-		__asm __volatile("isync; tlbre");
-		tlb1[0] = mfspr(SPR_MAS1);
-		tlb1[1] = mfspr(SPR_MAS2);
-		tlb1[2] = mfspr(SPR_MAS3);
-		i++;
-		tlb1 += 3;
-	}
-	if (i < bp_ntlb1s)
-		bp_ntlb1s = i;
-
-	/*
-	 * Set BPTR to the physical address of the boot page
-	 */
-	bptr = ((uint32_t)__boot_page - KERNBASE) + kernload;
-	KASSERT((bptr & 0xfff) == 0,
-	    ("%s: boot page is not aligned (%#x)", __func__, bptr));
-	bptr = (bptr >> 12) | 0x80000000u;
-	ccsr_write4(OCP85XX_BPTR, bptr);
-	__asm __volatile("isync; msync");
-
-	/* Flush caches to have our changes hit DRAM. */
-	cpu_flush_dcache(__boot_page, 4096);
-
-	/*
-	 * Release AP from hold-off state
-	 */
-	eebpcr |= (1 << (pc->pc_cpuid + 24));
-	ccsr_write4(OCP85XX_EEBPCR, eebpcr);
-	__asm __volatile("isync; msync");
-
-	timeout = 500;
-	while (!pc->pc_awake && timeout--)
-		DELAY(1000);	/* wait 1ms */
-
-	/*
-	 * Disable boot page translation so that the 4K page at the default
-	 * address (= 0xfffff000) isn't permanently remapped and thus not
-	 * usable otherwise.
-	 */
-	ccsr_write4(OCP85XX_BPTR, 0);
-	__asm __volatile("isync; msync");
-
-	if (!pc->pc_awake)
-		printf("SMP: CPU %d didn't wake up.\n", pc->pc_cpuid);
-	return ((pc->pc_awake) ? 0 : EBUSY);
-#else
-	/* No SMP support */
-	return (ENXIO);
-#endif
-}
-
 static void
-booke_reset(platform_t plat)
+bare_reset(platform_t plat)
 {
 
-	/*
-	 * Try the dedicated reset register first.
-	 * If the SoC doesn't have one, we'll fall
-	 * back to using the debug control register.
-	 */
-	ccsr_write4(OCP85XX_RSTCR, 2);
-
-	/* Clear DBCR0, disables debug interrupts and events. */
-	mtspr(SPR_DBCR0, 0);
-	__asm __volatile("isync");
-
-	/* Enable Debug Interrupts in MSR. */
-	mtmsr(mfmsr() | PSL_DE);
-
-	/* Enable debug interrupts and issue reset. */
-	mtspr(SPR_DBCR0, mfspr(SPR_DBCR0) | DBCR0_IDM | DBCR0_RST_SYSTEM);
-
 	printf("Reset failed...\n");
 	while (1)
 		;
diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c
index 7b9a5d313d0..2f60b720ed7 100644
--- a/sys/powerpc/booke/pmap.c
+++ b/sys/powerpc/booke/pmap.c
@@ -100,8 +100,6 @@ __FBSDID("$FreeBSD$");
 
 #define TODO			panic("%s: not implemented", __func__);
 
-extern struct mtx sched_lock;
-
 extern int dumpsys_minidump;
 
 extern unsigned char _etext[];
@@ -113,7 +111,6 @@ extern uint32_t *bootinfo;
 extern uint32_t bp_ntlb1s;
 #endif
 
-vm_paddr_t ccsrbar_pa;
 vm_paddr_t kernload;
 vm_offset_t kernstart;
 vm_size_t kernsize;
@@ -190,6 +187,7 @@ static tlb_entry_t tlb1[TLB1_ENTRIES];
 
 /* Next free entry in the TLB1 */
 static unsigned int tlb1_idx;
+static vm_offset_t tlb1_map_base = VM_MAX_KERNEL_ADDRESS;
 
 static tlbtid_t tid_alloc(struct pmap *);
 
@@ -315,9 +313,11 @@ static void		mmu_booke_activate(mmu_t, struct thread *);
 static void		mmu_booke_deactivate(mmu_t, struct thread *);
 static void		mmu_booke_bootstrap(mmu_t, vm_offset_t, vm_offset_t);
 static void		*mmu_booke_mapdev(mmu_t, vm_paddr_t, vm_size_t);
+static void		*mmu_booke_mapdev_attr(mmu_t, vm_paddr_t, vm_size_t, vm_memattr_t);
 static void		mmu_booke_unmapdev(mmu_t, vm_offset_t, vm_size_t);
 static vm_paddr_t	mmu_booke_kextract(mmu_t, vm_offset_t);
 static void		mmu_booke_kenter(mmu_t, vm_offset_t, vm_paddr_t);
+static void		mmu_booke_kenter_attr(mmu_t, vm_offset_t, vm_paddr_t, vm_memattr_t);
 static void		mmu_booke_kremove(mmu_t, vm_offset_t);
 static boolean_t	mmu_booke_dev_direct_mapped(mmu_t, vm_paddr_t, vm_size_t);
 static void		mmu_booke_sync_icache(mmu_t, pmap_t, vm_offset_t,
@@ -371,7 +371,9 @@ static mmu_method_t mmu_booke_methods[] = {
 	MMUMETHOD(mmu_bootstrap,	mmu_booke_bootstrap),
 	MMUMETHOD(mmu_dev_direct_mapped,mmu_booke_dev_direct_mapped),
 	MMUMETHOD(mmu_mapdev,		mmu_booke_mapdev),
+	MMUMETHOD(mmu_mapdev_attr,	mmu_booke_mapdev_attr),
 	MMUMETHOD(mmu_kenter,		mmu_booke_kenter),
+	MMUMETHOD(mmu_kenter_attr,	mmu_booke_kenter_attr),
 	MMUMETHOD(mmu_kextract,		mmu_booke_kextract),
 /*	MMUMETHOD(mmu_kremove,		mmu_booke_kremove),	*/
 	MMUMETHOD(mmu_unmapdev,		mmu_booke_unmapdev),
@@ -386,6 +388,42 @@ static mmu_method_t mmu_booke_methods[] = {
 
 MMU_DEF(booke_mmu, MMU_TYPE_BOOKE, mmu_booke_methods, 0);
 
+static __inline uint32_t
+tlb_calc_wimg(vm_offset_t pa, vm_memattr_t ma)
+{
+	uint32_t attrib;
+	int i;
+
+	if (ma != VM_MEMATTR_DEFAULT) {
+		switch (ma) {
+		case VM_MEMATTR_UNCACHEABLE:
+			return (PTE_I | PTE_G);
+		case VM_MEMATTR_WRITE_COMBINING:
+		case VM_MEMATTR_WRITE_BACK:
+		case VM_MEMATTR_PREFETCHABLE:
+			return (PTE_I);
+		case VM_MEMATTR_WRITE_THROUGH:
+			return (PTE_W | PTE_M);
+		}
+	}
+
+	/*
+	 * Assume the page is cache inhibited and access is guarded unless
+	 * it's in our available memory array.
+	 */
+	attrib = _TLB_ENTRY_IO;
+	for (i = 0; i < physmem_regions_sz; i++) {
+		if ((pa >= physmem_regions[i].mr_start) &&
+		    (pa < (physmem_regions[i].mr_start +
+		     physmem_regions[i].mr_size))) {
+			attrib = _TLB_ENTRY_MEM;
+			break;
+		}
+	}
+
+	return (attrib);
+}
+
 static inline void
 tlb_miss_lock(void)
 {
@@ -1315,6 +1353,15 @@ mmu_booke_extract(mmu_t mmu, pmap_t pmap, vm_offset_t va)
 static vm_paddr_t
 mmu_booke_kextract(mmu_t mmu, vm_offset_t va)
 {
+	int i;
+
+	/* Check TLB1 mappings */
+	for (i = 0; i < tlb1_idx; i++) {
+		if (!(tlb1[i].mas1 & MAS1_VALID))
+			continue;
+		if (va >= tlb1[i].virt && va < tlb1[i].virt + tlb1[i].size)
+			return (tlb1[i].phys + (va - tlb1[i].virt));
+	}
 
 	return (pte_vatopa(mmu, kernel_pmap, va));
 }
@@ -1391,6 +1438,13 @@ mmu_booke_qremove(mmu_t mmu, vm_offset_t sva, int count)
  */
 static void
 mmu_booke_kenter(mmu_t mmu, vm_offset_t va, vm_paddr_t pa)
+{
+
+	mmu_booke_kenter_attr(mmu, va, pa, VM_MEMATTR_DEFAULT);
+}
+
+static void
+mmu_booke_kenter_attr(mmu_t mmu, vm_offset_t va, vm_paddr_t pa, vm_memattr_t ma)
 {
 	unsigned int pdir_idx = PDIR_IDX(va);
 	unsigned int ptbl_idx = PTBL_IDX(va);
@@ -1400,7 +1454,8 @@ mmu_booke_kenter(mmu_t mmu, vm_offset_t va, vm_paddr_t pa)
 	KASSERT(((va >= VM_MIN_KERNEL_ADDRESS) &&
 	    (va <= VM_MAX_KERNEL_ADDRESS)), ("mmu_booke_kenter: invalid va"));
 
-	flags = PTE_M | PTE_SR | PTE_SW | PTE_SX | PTE_WIRED | PTE_VALID;
+	flags = PTE_SR | PTE_SW | PTE_SX | PTE_WIRED | PTE_VALID;
+	flags |= tlb_calc_wimg(pa, ma);
 
 	pte = &(kernel_pmap->pm_pdir[pdir_idx][ptbl_idx]);
 
@@ -1849,7 +1904,7 @@ mmu_booke_activate(mmu_t mmu, struct thread *td)
 
 	KASSERT((pmap != kernel_pmap), ("mmu_booke_activate: kernel_pmap!"));
 
-	mtx_lock_spin(&sched_lock);
+	sched_pin();
 
 	cpuid = PCPU_GET(cpuid);
 	CPU_SET_ATOMIC(cpuid, &pmap->pm_active);
@@ -1862,7 +1917,7 @@ mmu_booke_activate(mmu_t mmu, struct thread *td)
 	mtspr(SPR_PID0, pmap->pm_tid[cpuid]);
 	__asm __volatile("isync");
 
-	mtx_unlock_spin(&sched_lock);
+	sched_unpin();
 
 	CTR3(KTR_PMAP, "%s: e (tid = %d for '%s')", __func__,
 	    pmap->pm_tid[PCPU_GET(cpuid)], td->td_proc->p_comm);
@@ -2594,24 +2649,54 @@ mmu_booke_scan_md(mmu_t mmu, struct pmap_md *prev)
  */
 static void *
 mmu_booke_mapdev(mmu_t mmu, vm_paddr_t pa, vm_size_t size)
+{
+
+	return (mmu_booke_mapdev_attr(mmu, pa, size, VM_MEMATTR_DEFAULT));
+}
+
+static void *
+mmu_booke_mapdev_attr(mmu_t mmu, vm_paddr_t pa, vm_size_t size, vm_memattr_t ma)
 {
 	void *res;
 	uintptr_t va;
 	vm_size_t sz;
+	int i;
 
 	/*
-	 * CCSR is premapped. Note that (pa + size - 1) is there to make sure
-	 * we don't wrap around. Devices on the local bus typically extend all
-	 * the way up to and including 0xffffffff. In that case (pa + size)
-	 * would be 0. This creates a false positive (i.e. we think it's
-	 * within the CCSR) and not create a mapping.
+	 * Check if this is premapped in TLB1. Note: this should probably also
+	 * check whether a sequence of TLB1 entries exist that match the
+	 * requirement, but now only checks the easy case.
 	 */
-	if (pa >= ccsrbar_pa && (pa + size - 1) < (ccsrbar_pa + CCSRBAR_SIZE)) {
-		va = CCSRBAR_VA + (pa - ccsrbar_pa);
-		return ((void *)va);
+	if (ma == VM_MEMATTR_DEFAULT) {
+		for (i = 0; i < tlb1_idx; i++) {
+			if (!(tlb1[i].mas1 & MAS1_VALID))
+				continue;
+			if (pa >= tlb1[i].phys &&
+			    (pa + size) <= (tlb1[i].phys + tlb1[i].size))
+				return (void *)(tlb1[i].virt +
+				    (pa - tlb1[i].phys));
+		}
 	}
 
-	va = (pa >= 0x80000000) ? pa : (0xe2000000 + pa);
+	size = roundup(size, PAGE_SIZE);
+
+	/*
+	 * We leave a hole for device direct mapping between the maximum user
+	 * address (0x8000000) and the minimum KVA address (0xc0000000). If
+	 * devices are in there, just map them 1:1. If not, map them to the
+	 * device mapping area about VM_MAX_KERNEL_ADDRESS. These mapped
+	 * addresses should be pulled from an allocator, but since we do not
+	 * ever free TLB1 entries, it is safe just to increment a counter.
+	 * Note that there isn't a lot of address space here (128 MB) and it
+	 * is not at all difficult to imagine running out, since that is a 4:1
+	 * compression from the 0xc0000000 - 0xf0000000 address space that gets
+	 * mapped there.
+	 */
+	if (pa >= (VM_MAXUSER_ADDRESS + PAGE_SIZE) &&
+	    (pa + size - 1) < VM_MIN_KERNEL_ADDRESS) 
+		va = pa;
+	else
+		va = atomic_fetchadd_int(&tlb1_map_base, size);
 	res = (void *)va;
 
 	do {
@@ -2619,7 +2704,7 @@ mmu_booke_mapdev(mmu_t mmu, vm_paddr_t pa, vm_size_t size)
 		if (bootverbose)
 			printf("Wiring VA=%x to PA=%x (size=%x), "
 			    "using TLB1[%d]\n", va, pa, sz, tlb1_idx);
-		tlb1_set_entry(va, pa, sz, _TLB_ENTRY_IO);
+		tlb1_set_entry(va, pa, sz, tlb_calc_wimg(pa, ma));
 		size -= sz;
 		pa += sz;
 		va += sz;
@@ -2634,6 +2719,7 @@ mmu_booke_mapdev(mmu_t mmu, vm_paddr_t pa, vm_size_t size)
 static void
 mmu_booke_unmapdev(mmu_t mmu, vm_offset_t va, vm_size_t size)
 {
+#ifdef SUPPORTS_SHRINKING_TLB1
 	vm_offset_t base, offset;
 
 	/*
@@ -2645,6 +2731,7 @@ mmu_booke_unmapdev(mmu_t mmu, vm_offset_t va, vm_size_t size)
 		size = roundup(offset + size, PAGE_SIZE);
 		kva_free(base, size);
 	}
+#endif
 }
 
 /*
@@ -2670,7 +2757,7 @@ mmu_booke_mincore(mmu_t mmu, pmap_t pmap, vm_offset_t addr,
     vm_paddr_t *locked_pa)
 {
 
-	TODO;
+	/* XXX: this should be implemented at some point */
 	return (0);
 }
 
@@ -2825,9 +2912,8 @@ tlb0_print_tlbentries(void)
 /*
  * TLB1 mapping notes:
  *
- * TLB1[0]	CCSRBAR
- * TLB1[1]	Kernel text and data.
- * TLB1[2-15]	Additional kernel text and data mappings (if required), PCI
+ * TLB1[0]	Kernel text and data.
+ * TLB1[1-15]	Additional kernel text and data mappings (if required), PCI
  *		windows, other devices mappings.
  */
 
@@ -2911,9 +2997,10 @@ tlb1_set_entry(vm_offset_t va, vm_offset_t pa, vm_size_t size,
     uint32_t flags)
 {
 	uint32_t ts, tid;
-	int tsize;
-	
-	if (tlb1_idx >= TLB1_ENTRIES) {
+	int tsize, index;
+
+	index = atomic_fetchadd_int(&tlb1_idx, 1);
+	if (index >= TLB1_ENTRIES) {
 		printf("tlb1_set_entry: TLB1 full!\n");
 		return (-1);
 	}
@@ -2925,18 +3012,22 @@ tlb1_set_entry(vm_offset_t va, vm_offset_t pa, vm_size_t size,
 	/* XXX TS is hard coded to 0 for now as we only use single address space */
 	ts = (0 << MAS1_TS_SHIFT) & MAS1_TS_MASK;
 
-	/* XXX LOCK tlb1[] */
+	/*
+	 * Atomicity is preserved by the atomic increment above since nothing
+	 * is ever removed from tlb1.
+	 */
 
-	tlb1[tlb1_idx].mas1 = MAS1_VALID | MAS1_IPROT | ts | tid;
-	tlb1[tlb1_idx].mas1 |= ((tsize << MAS1_TSIZE_SHIFT) & MAS1_TSIZE_MASK);
-	tlb1[tlb1_idx].mas2 = (va & MAS2_EPN_MASK) | flags;
+	tlb1[index].phys = pa;
+	tlb1[index].virt = va;
+	tlb1[index].size = size;
+	tlb1[index].mas1 = MAS1_VALID | MAS1_IPROT | ts | tid;
+	tlb1[index].mas1 |= ((tsize << MAS1_TSIZE_SHIFT) & MAS1_TSIZE_MASK);
+	tlb1[index].mas2 = (va & MAS2_EPN_MASK) | flags;
 
 	/* Set supervisor RWX permission bits */
-	tlb1[tlb1_idx].mas3 = (pa & MAS3_RPN) | MAS3_SR | MAS3_SW | MAS3_SX;
+	tlb1[index].mas3 = (pa & MAS3_RPN) | MAS3_SR | MAS3_SW | MAS3_SX;
 
-	tlb1_write_entry(tlb1_idx++);
-
-	/* XXX UNLOCK tlb1[] */
+	tlb1_write_entry(index);
 
 	/*
 	 * XXX in general TLB1 updates should be propagated between CPUs,
@@ -3005,7 +3096,7 @@ tlb1_mapin_region(vm_offset_t va, vm_paddr_t pa, vm_size_t size)
 	}
 
 	mapped = (va - base);
-	debugf("mapped size 0x%08x (wasted space 0x%08x)\n",
+	printf("mapped size 0x%08x (wasted space 0x%08x)\n",
 	    mapped, mapped - size);
 	return (mapped);
 }
@@ -3015,14 +3106,12 @@ tlb1_mapin_region(vm_offset_t va, vm_paddr_t pa, vm_size_t size)
  * assembler level setup done in locore.S.
  */
 void
-tlb1_init(vm_offset_t ccsrbar)
+tlb1_init()
 {
-	uint32_t mas0, mas1, mas3;
+	uint32_t mas0, mas1, mas2, mas3;
 	uint32_t tsz;
 	u_int i;
 
-	ccsrbar_pa = ccsrbar;
-
 	if (bootinfo != NULL && bootinfo[0] != 1) {
 		tlb1_idx = *((uint16_t *)(bootinfo + 8));
 	} else
@@ -3038,22 +3127,23 @@ tlb1_init(vm_offset_t ccsrbar)
 		if ((mas1 & MAS1_VALID) == 0)
 			continue;
 
+		mas2 = mfspr(SPR_MAS2);
 		mas3 = mfspr(SPR_MAS3);
 
 		tlb1[i].mas1 = mas1;
 		tlb1[i].mas2 = mfspr(SPR_MAS2);
 		tlb1[i].mas3 = mas3;
+		tlb1[i].virt = mas2 & MAS2_EPN_MASK;
+		tlb1[i].phys = mas3 & MAS3_RPN;
 
 		if (i == 0)
 			kernload = mas3 & MAS3_RPN;
 
 		tsz = (mas1 & MAS1_TSIZE_MASK) >> MAS1_TSIZE_SHIFT;
-		kernsize += (tsz > 0) ? tsize2size(tsz) : 0;
+		tlb1[i].size = (tsz > 0) ? tsize2size(tsz) : 0;
+		kernsize += tlb1[i].size;
 	}
 
-	/* Map in CCSRBAR. */
-	tlb1_set_entry(CCSRBAR_VA, ccsrbar, CCSRBAR_SIZE, _TLB_ENTRY_IO);
-
 #ifdef SMP
 	bp_ntlb1s = tlb1_idx;
 #endif
@@ -3066,6 +3156,43 @@ tlb1_init(vm_offset_t ccsrbar)
 	set_mas4_defaults();
 }
 
+vm_offset_t 
+pmap_early_io_map(vm_paddr_t pa, vm_size_t size)
+{
+	vm_paddr_t pa_base;
+	vm_offset_t va, sz;
+	int i;
+
+	KASSERT(!pmap_bootstrapped, ("Do not use after PMAP is up!"));
+	
+	for (i = 0; i < tlb1_idx; i++) {
+		if (!(tlb1[i].mas1 & MAS1_VALID))
+			continue;
+		if (pa >= tlb1[i].phys && (pa + size) <=
+		    (tlb1[i].phys + tlb1[i].size))
+			return (tlb1[i].virt + (pa - tlb1[i].phys));
+	}
+
+	pa_base = trunc_page(pa);
+	size = roundup(size + (pa - pa_base), PAGE_SIZE);
+	tlb1_map_base = roundup2(tlb1_map_base, 1 << (ilog2(size) & ~1));
+	va = tlb1_map_base + (pa - pa_base);
+
+	do {
+		sz = 1 << (ilog2(size) & ~1);
+		tlb1_set_entry(tlb1_map_base, pa_base, sz, _TLB_ENTRY_IO);
+		size -= sz;
+		pa_base += sz;
+		tlb1_map_base += sz;
+	} while (size > 0);
+
+#ifdef SMP
+	bp_ntlb1s = tlb1_idx;
+#endif
+
+	return (va);
+}
+
 /*
  * Setup MAS4 defaults.
  * These values are loaded to MAS0-2 on a TLB miss.
diff --git a/sys/powerpc/booke/swtch.S b/sys/powerpc/booke/swtch.S
deleted file mode 100644
index 88cbf2980ea..00000000000
--- a/sys/powerpc/booke/swtch.S
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * Copyright (C) 2001 Benno Rice
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY Benno Rice ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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: $NetBSD: locore.S,v 1.24 2000/05/31 05:09:17 thorpej Exp $
- *	from: $FreeBSD$
- *
- * $FreeBSD$
- */
-/*-
- * Copyright (C) 1995, 1996 Wolfgang Solfrank.
- * Copyright (C) 1995, 1996 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "assym.s"
-
-#include <sys/syscall.h>
-
-#include <machine/trap.h>
-#include <machine/param.h>
-#include <machine/asm.h>
-#include <machine/spr.h>
-
-/*
- * void cpu_throw(struct thread *old, struct thread *new)
- */
-ENTRY(cpu_throw)
-	mr	%r15, %r4
-	b	cpu_switchin
-
-/*
- * void cpu_switch(struct thread *old, struct thread *new, struct mutex *mtx);)
- *
- * Switch to a new thread saving the current state in the old thread.
- */
-ENTRY(cpu_switch)
-	stw	%r5, TD_LOCK(%r3)
-
-	lwz	%r5, TD_PCB(%r3)	/* Get the old thread's PCB ptr */
-
-	mr	%r12, %r2	
-	stmw	%r12, PCB_CONTEXT(%r5)	/* Save the non-volatile GP regs.
-					   These can now be used for scratch */
-
-	mfcr	%r16			/* Save the condition register */
-	stw	%r16, PCB_CR(%r5)
-	mflr	%r16			/* Save the link register */
-	stw	%r16, PCB_LR(%r5)
-	mfctr	%r16
-	stw	%r16, PCB_BOOKE_CTR(%r5)
-	mfxer	%r16
-	stw	%r16, PCB_BOOKE_XER(%r5)
-	mfspr	%r16, SPR_DBCR0
-	stw	%r16, PCB_BOOKE_DBCR0(%r5)
-
-	stw	%r1, PCB_SP(%r5)	/* Save the stack pointer */
-
-	mr	%r14, %r3		/* Copy the old thread ptr... */
-	mr	%r15, %r4		/* and the new thread ptr in scratch */
-
-	bl	pmap_deactivate		/* Deactivate the current pmap */
-
-cpu_switchin:
-	mr	%r3, %r15		/* Get new thread ptr */
-	bl	pmap_activate		/* Activate the new address space */
-
-	mfsprg	%r7, 0			/* Get the pcpu pointer */
-	stw	%r15, PC_CURTHREAD(%r7)	/* Store new current thread */
-	lwz	%r17, TD_PCB(%r15)	/* Store new current PCB */
-	stw	%r17, PC_CURPCB(%r7)
-
-	mr	%r3, %r17		/* Recover PCB ptr */
-	lmw	%r12, PCB_CONTEXT(%r3)	/* Load the non-volatile GP regs */
-	mr	%r2, %r12
-	lwz	%r5, PCB_CR(%r3)	/* Load the condition register */
-	mtcr	%r5
-	lwz	%r5, PCB_LR(%r3)	/* Load the link register */
-	mtlr	%r5
-	lwz	%r5, PCB_BOOKE_CTR(%r3)
-	mtctr	%r5
-	lwz	%r5, PCB_BOOKE_XER(%r3)
-	mtxer	%r5
-	lwz	%r5, PCB_BOOKE_DBCR0(%r3)
-	mtspr	SPR_DBCR0, %r5
-
-	lwz	%r1, PCB_SP(%r3)	/* Load the stack pointer */
-	blr
-
-/*
- * savectx(pcb)
- * Update pcb, saving current processor state
- */
-ENTRY(savectx)
-	mr	%r12, %r2
-	stmw	%r12, PCB_CONTEXT(%r3)	/* Save the non-volatile GP regs */
-	mfcr	%r4			/* Save the condition register */
-	stw	%r4, PCB_CONTEXT(%r3)
-	blr
-
-/*
- * fork_trampoline()
- * Set up the return from cpu_fork()
- */
-ENTRY(fork_trampoline)
-	lwz	%r3, CF_FUNC(%r1)
-	lwz	%r4, CF_ARG0(%r1)
-	lwz	%r5, CF_ARG1(%r1)
-	bl	fork_exit
-	addi	%r1, %r1, CF_SIZE-FSP	/* Allow 8 bytes in front of
-					   trapframe to simulate FRAME_SETUP
-					   does when allocating space for
-					   a frame pointer/saved LR */
-	b	trapexit
diff --git a/sys/powerpc/booke/trap.c b/sys/powerpc/booke/trap.c
index 959d8b1d066..476f77f522f 100644
--- a/sys/powerpc/booke/trap.c
+++ b/sys/powerpc/booke/trap.c
@@ -71,10 +71,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/trap.h>
 #include <machine/spr.h>
 
-#ifdef FPU_EMU
-#include <powerpc/fpu/fpu_extern.h>
-#endif
-
 #define	FAULTBUF_LR	0
 #define	FAULTBUF_R1	1
 #define	FAULTBUF_R2	2
@@ -91,12 +87,6 @@ static int	fix_unaligned(struct thread *td, struct trapframe *frame);
 static int	handle_onfault(struct trapframe *frame);
 static void	syscall(struct trapframe *frame);
 
-int	setfault(faultbuf);		/* defined in locore.S */
-
-/* Why are these not defined in a header? */
-int	badaddr(void *, size_t);
-int	badaddr_read(void *, size_t, int *);
-
 struct powerpc_exception {
 	u_int	vector;
 	char	*name;
@@ -193,13 +183,7 @@ trap(struct trapframe *frame)
 			break;
 
 		case EXC_PGM:	/* Program exception */
-#ifdef FPU_EMU
-			sig = fpu_emulate(frame,
-			    (struct fpreg *)&td->td_pcb->pcb_fpu);
-#else
-			/* XXX SIGILL for non-trap instructions. */
-			sig = SIGTRAP;
-#endif
+			sig = ppc_instr_emulate(frame, td->td_pcb);
 			break;
 
 		default:
@@ -471,60 +455,6 @@ trap_pfault(struct trapframe *frame, int user)
 	return ((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV);
 }
 
-int
-badaddr(void *addr, size_t size)
-{
-
-	return (badaddr_read(addr, size, NULL));
-}
-
-int
-badaddr_read(void *addr, size_t size, int *rptr)
-{
-	struct thread	*td;
-	faultbuf	env;
-	int		x;
-
-	/* Get rid of any stale machine checks that have been waiting.  */
-	__asm __volatile ("sync; isync");
-
-	td = curthread;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = 0;
-		__asm __volatile ("sync");
-		return (1);
-	}
-
-	__asm __volatile ("sync");
-
-	switch (size) {
-	case 1:
-		x = *(volatile int8_t *)addr;
-		break;
-	case 2:
-		x = *(volatile int16_t *)addr;
-		break;
-	case 4:
-		x = *(volatile int32_t *)addr;
-		break;
-	default:
-		panic("badaddr: invalid size (%d)", size);
-	}
-
-	/* Make sure we took the machine check, if we caused one. */
-	__asm __volatile ("sync; isync");
-
-	td->td_pcb->pcb_onfault = 0;
-	__asm __volatile ("sync");	/* To be sure. */
-
-	/* Use the value to avoid reorder. */
-	if (rptr)
-		*rptr = x;
-
-	return (0);
-}
-
 /*
  * For now, this only deals with the particular unaligned access case
  * that gcc tends to generate.  Eventually it should handle all of the
diff --git a/sys/powerpc/booke/trap_subr.S b/sys/powerpc/booke/trap_subr.S
index 33976ca159e..757644963b3 100644
--- a/sys/powerpc/booke/trap_subr.S
+++ b/sys/powerpc/booke/trap_subr.S
@@ -219,7 +219,8 @@
 	lwz	%r30, (savearea+CPUSAVE_SRR0)(%r2);			\
 	lwz	%r31, (savearea+CPUSAVE_SRR1)(%r2);			\
 	stw	%r30, FRAME_SRR0+8(%r1);				\
-	stw	%r31, FRAME_SRR1+8(%r1)
+	stw	%r31, FRAME_SRR1+8(%r1);				\
+	lwz	%r2,PC_CURTHREAD(%r2)	/* set curthread pointer */
 
 /*
  *
@@ -734,7 +735,8 @@ interrupt_vector_top:
 INTERRUPT(int_debug)
 	STANDARD_CRIT_PROLOG(SPR_SPRG2, PC_BOOKE_CRITSAVE, SPR_CSRR0, SPR_CSRR1)
 	FRAME_SETUP(SPR_SPRG2, PC_BOOKE_CRITSAVE, EXC_DEBUG)
-	lwz	%r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0)(%r2);
+	GET_CPUINFO(%r3)
+	lwz	%r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0)(%r3)
 	lis	%r4, interrupt_vector_base@ha
 	addi	%r4, %r4, interrupt_vector_base@l
 	cmplw	cr0, %r3, %r4
@@ -748,9 +750,10 @@ INTERRUPT(int_debug)
 	rlwinm	%r3, %r3, 0, 23, 21
 	stw	%r3, FRAME_SRR1+8(%r1);
 	/* Restore srr0 and srr1 as they could have been clobbered. */
-	lwz	%r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0+8)(%r2);
+	GET_CPUINFO(%r4)
+	lwz	%r3, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR0+8)(%r4);
 	mtspr	SPR_SRR0, %r3
-	lwz	%r4, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR1+8)(%r2);
+	lwz	%r4, (PC_BOOKE_CRITSAVE+CPUSAVE_SRR1+8)(%r4);
 	mtspr	SPR_SRR1, %r4
 	b	9f
 1:
diff --git a/sys/powerpc/conf/GENERIC b/sys/powerpc/conf/GENERIC
index 59ff68f0bac..318c6547c03 100644
--- a/sys/powerpc/conf/GENERIC
+++ b/sys/powerpc/conf/GENERIC
@@ -70,7 +70,6 @@ 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 	PROCDESC		# Support for process descriptors
 options 	MAC			# TrustedBSD MAC Framework
 options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 options 	DDB_CTF			# Kernel ELF linker loads CTF data
diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64
index 7ac3e10bfaf..24dc7da0696 100644
--- a/sys/powerpc/conf/GENERIC64
+++ b/sys/powerpc/conf/GENERIC64
@@ -136,6 +136,7 @@ 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		glc		# Sony Playstation 3 Ethernet
+device		llan		# IBM pSeries Virtual Ethernet
 
 # PCI Ethernet NICs that use the common MII bus controller code.
 device		miibus		# MII bus support
diff --git a/sys/powerpc/fpu/fpu_emu.c b/sys/powerpc/fpu/fpu_emu.c
index 66cc2156f95..610c0eaeefc 100644
--- a/sys/powerpc/fpu/fpu_emu.c
+++ b/sys/powerpc/fpu/fpu_emu.c
@@ -326,8 +326,10 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 				/* Store as integer */
 				ra = instr.i_x.i_ra;
 				rb = instr.i_x.i_rb;
-				DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n",
-					ra, tf->fixreg[ra], rb, tf->fixreg[rb]));
+				DPRINTF(FPE_INSN,
+					("reg %d has %jx reg %d has %jx\n",
+					ra, (uintmax_t)tf->fixreg[ra], rb,
+					(uintmax_t)tf->fixreg[rb]));
 
 				addr = tf->fixreg[rb];
 				if (ra != 0)
@@ -356,8 +358,9 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 			/* calculate EA of load/store */
 			ra = instr.i_x.i_ra;
 			rb = instr.i_x.i_rb;
-			DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n",
-				ra, tf->fixreg[ra], rb, tf->fixreg[rb]));
+			DPRINTF(FPE_INSN, ("reg %d has %jx reg %d has %jx\n",
+				ra, (uintmax_t)tf->fixreg[ra], rb,
+				(uintmax_t)tf->fixreg[rb]));
 			addr = tf->fixreg[rb];
 			if (ra != 0)
 				addr += tf->fixreg[ra];
@@ -373,8 +376,9 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 			/* calculate EA of load/store */
 			ra = instr.i_d.i_ra;
 			addr = instr.i_d.i_d;
-			DPRINTF(FPE_INSN, ("reg %d has %x displ %x\n",
-				ra, tf->fixreg[ra], addr));
+			DPRINTF(FPE_INSN, ("reg %d has %jx displ %jx\n",
+				ra, (uintmax_t)tf->fixreg[ra],
+				(uintmax_t)addr));
 			if (ra != 0)
 				addr += tf->fixreg[ra];
 			rt = instr.i_d.i_rt;
@@ -420,7 +424,7 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 		return (0);
 #ifdef notyet
 	} else if (instr.i_any.i_opcd == OPC_load_st_62) {
-		/* These are 64-bit extenstions */
+		/* These are 64-bit extensions */
 		return (NOTFPU);
 #endif
 	} else if (instr.i_any.i_opcd == OPC_sp_fp_59 ||
@@ -500,7 +504,7 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 				memcpy(&fs->fpreg[rt], &fs->fpreg[rb],
 					sizeof(double));
 				a = (int *)&fs->fpreg[rt];
-				*a ^= (1 << 31);
+				*a ^= (1U << 31);
 				break;
 			case	OPC63_MCRFS:
 				FPU_EMU_EVCNT_INCR(mcrfs);
@@ -547,7 +551,7 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 				memcpy(&fs->fpreg[rt], &fs->fpreg[rb],
 					sizeof(double));
 				a = (int *)&fs->fpreg[rt];
-				*a |= (1 << 31);
+				*a |= (1U << 31);
 				break;
 			case	OPC63_FABS:
 				FPU_EMU_EVCNT_INCR(fabs);
@@ -555,7 +559,7 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 				memcpy(&fs->fpreg[rt], &fs->fpreg[rb],
 					sizeof(double));
 				a = (int *)&fs->fpreg[rt];
-				*a &= ~(1 << 31);
+				*a &= ~(1U << 31);
 				break;
 			case	OPC63_MFFS:
 				FPU_EMU_EVCNT_INCR(mffs);
@@ -606,9 +610,11 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 			rb = instr.i_a.i_frb;
 			rc = instr.i_a.i_frc;
 
-			type = FTYPE_SNG;
-			if (instr.i_any.i_opcd & 0x4)
-				type = FTYPE_DBL;
+			/*
+			 * All arithmetic operations work on registers, which
+			 * are stored as doubles.
+			 */
+			type = FTYPE_DBL;
 			switch ((unsigned int)instr.i_a.i_xo) {
 			case	OPC59_FDIVS:
 				FPU_EMU_EVCNT_INCR(fdiv);
@@ -725,6 +731,13 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 				return (NOTFPU);
 				break;
 			}
+
+			/* If the instruction was single precision, round */
+			if (!(instr.i_any.i_opcd & 0x4)) {
+				fpu_implode(fe, fp, FTYPE_SNG, 
+					(u_int *)&fs->fpreg[rt]);
+				fpu_explode(fe, fp = &fe->fe_f1, FTYPE_SNG, rt);
+			}
 		}
 	} else {
 		return (NOTFPU);
@@ -775,7 +788,8 @@ fpu_execute(struct trapframe *tf, struct fpemu *fe, union instr *insn)
 		/* Move fpu condition codes to cr[1] */
 		tf->cr &= ~(0xf0000000>>bf);
 		tf->cr |= (cond>>bf);
-		DPRINTF(FPE_INSN, ("fpu_execute: cr[%d] (cr=%x) <= %x\n", bf/4, tf->cr, cond));
+		DPRINTF(FPE_INSN, ("fpu_execute: cr[%d] (cr=%jx) <= %x\n",
+			bf/4, (uintmax_t)tf->cr, cond));
 	}
 
 	((int *)&fs->fpscr)[1] = fsr;
diff --git a/sys/powerpc/fpu/fpu_explode.c b/sys/powerpc/fpu/fpu_explode.c
index d2646fcdc8f..91d92b30e41 100644
--- a/sys/powerpc/fpu/fpu_explode.c
+++ b/sys/powerpc/fpu/fpu_explode.c
@@ -235,6 +235,7 @@ fpu_explode(struct fpemu *fe, struct fpn *fp, int type, int reg)
 		s = fpu_dtof(fp, s, space[1]);
 		break;
 
+	default:
 		panic("fpu_explode");
 		panic("fpu_explode: invalid type %d", type);
 	}
diff --git a/sys/powerpc/fpu/fpu_sqrt.c b/sys/powerpc/fpu/fpu_sqrt.c
index 963a19302a9..59cb3abc83a 100644
--- a/sys/powerpc/fpu/fpu_sqrt.c
+++ b/sys/powerpc/fpu/fpu_sqrt.c
@@ -274,7 +274,7 @@ fpu_sqrt(struct fpemu *fe)
 	 * double x correctly while doing the `known q=1.0'.
 	 *
 	 * We do this one mantissa-word at a time, as noted above, to
-	 * save work.  To avoid `(1 << 31) << 1', we also do the top bit
+	 * save work.  To avoid `(1U << 31) << 1', we also do the top bit
 	 * outside of each per-word loop.
 	 *
 	 * The calculation `t = y + bit' breaks down into `t0 = y0, ...,
diff --git a/sys/powerpc/include/counter.h b/sys/powerpc/include/counter.h
index e876f62e7a9..4a9d64790f8 100644
--- a/sys/powerpc/include/counter.h
+++ b/sys/powerpc/include/counter.h
@@ -34,7 +34,7 @@
 #include <sys/proc.h>
 #endif
 
-#if defined(AIM) && defined(__powerpc64__)
+#ifdef __powerpc64__
 
 #define	counter_enter()	do {} while (0)
 #define	counter_exit()	do {} while (0)
@@ -98,7 +98,7 @@ counter_u64_add(counter_u64_t c, int64_t inc)
 	    : "cc", "memory");
 }
 
-#else	/* !AIM || !64bit */
+#else	/* !64bit */
 
 #define	counter_enter()	critical_enter()
 #define	counter_exit()	critical_exit()
@@ -157,6 +157,6 @@ counter_u64_add(counter_u64_t c, int64_t inc)
 	counter_exit();
 }
 
-#endif	/* AIM 64bit */
+#endif	/* 64bit */
 
 #endif	/* ! __MACHINE_COUNTER_H__ */
diff --git a/sys/powerpc/include/fdt.h b/sys/powerpc/include/fdt.h
index 116f562af02..955e3c7303c 100644
--- a/sys/powerpc/include/fdt.h
+++ b/sys/powerpc/include/fdt.h
@@ -35,15 +35,7 @@
 #include <machine/bus.h>
 #include <machine/intr_machdep.h>
 
-/* Max interrupt number */
-#define FDT_INTR_MAX	INTR_VECTORS
-
 /* Map phandle/intpin pair to global IRQ number */
 #define	FDT_MAP_IRQ(node, pin)	powerpc_get_irq(node, pin)
 
-/*
- * Bus space tag. XXX endianess info needs to be derived from the blob.
- */
-#define fdtbus_bs_tag	(&bs_be_tag)
-
 #endif /* _MACHINE_FDT_H_ */
diff --git a/sys/powerpc/include/intr_machdep.h b/sys/powerpc/include/intr_machdep.h
index df73992dc9a..c2529d55b48 100644
--- a/sys/powerpc/include/intr_machdep.h
+++ b/sys/powerpc/include/intr_machdep.h
@@ -56,5 +56,6 @@ int	powerpc_setup_intr(const char *, u_int, driver_filter_t, driver_intr_t,
 int	powerpc_teardown_intr(void *);
 int	powerpc_bind_intr(u_int irq, u_char cpu);
 int	powerpc_config_intr(int, enum intr_trigger, enum intr_polarity);
+int	powerpc_fw_config_intr(int irq, int sense_code);
 
 #endif /* _MACHINE_INTR_MACHDEP_H_ */
diff --git a/sys/powerpc/include/ofw_machdep.h b/sys/powerpc/include/ofw_machdep.h
index b85ebe12166..0ee75f43519 100644
--- a/sys/powerpc/include/ofw_machdep.h
+++ b/sys/powerpc/include/ofw_machdep.h
@@ -45,7 +45,8 @@ boolean_t OF_bootstrap(void);
 
 void OF_reboot(void);
 
-void ofw_mem_regions(struct mem_region **, int *, struct mem_region **, int *);
+void ofw_mem_regions(struct mem_region *, int *, struct mem_region *, int *);
 void ofw_quiesce(void); /* Must be called before VM is up! */
+void ofw_save_trap_vec(char *);
 
 #endif /* _MACHINE_OFW_MACHDEP_H_ */
diff --git a/sys/powerpc/include/param.h b/sys/powerpc/include/param.h
index 7e7c8f153cb..5c25e8a3d2e 100644
--- a/sys/powerpc/include/param.h
+++ b/sys/powerpc/include/param.h
@@ -104,8 +104,12 @@
 #define	MAXPAGESIZES	1		/* maximum number of supported page sizes */
 
 #ifndef KSTACK_PAGES
+#ifdef __powerpc64__
+#define	KSTACK_PAGES		8		/* includes pcb */
+#else
 #define	KSTACK_PAGES		4		/* includes pcb */
 #endif
+#endif
 #define	KSTACK_GUARD_PAGES	1	/* pages of kstack guard; 0 disables */
 #define	USPACE		(KSTACK_PAGES * PAGE_SIZE)	/* total size of pcb */
 
diff --git a/sys/powerpc/include/pcb.h b/sys/powerpc/include/pcb.h
index 394d9347f11..a1a8132c9ea 100644
--- a/sys/powerpc/include/pcb.h
+++ b/sys/powerpc/include/pcb.h
@@ -47,8 +47,9 @@ struct pcb {
 	faultbuf	*pcb_onfault;		/* For use during
 						    copyin/copyout */
 	int		pcb_flags;
-#define	PCB_FPU		1	/* Process had FPU initialized */
-#define	PCB_VEC		2	/* Process had Altivec initialized */
+#define	PCB_FPU		1	/* Process uses FPU */
+#define	PCB_FPREGS	2	/* Process had FPU registers initialized */
+#define	PCB_VEC		4	/* Process had Altivec initialized */
 	struct fpu {
 		double	fpr[32];
 		double	fpscr;	/* FPSCR stored as double for easier access */
@@ -70,8 +71,6 @@ struct pcb {
 			register_t	usr_vsid;	/* USER_SR segment */
 		} aim;
 		struct {
-			register_t	ctr;
-			register_t	xer;
 			register_t	dbcr0;
 		} booke;
 	} pcb_cpu;
diff --git a/sys/powerpc/include/pcpu.h b/sys/powerpc/include/pcpu.h
index 7ab184e6427..8a55967e7d4 100644
--- a/sys/powerpc/include/pcpu.h
+++ b/sys/powerpc/include/pcpu.h
@@ -135,7 +135,6 @@ struct pmap;
 
 #define pcpup	((struct pcpu *) powerpc_get_pcpup())
 
-#ifdef AIM /* Book-E not yet adapted */
 static __inline __pure2 struct thread *
 __curthread(void)
 {
@@ -148,7 +147,6 @@ __curthread(void)
 	return (td);
 }
 #define curthread (__curthread())
-#endif
 
 #define	PCPU_GET(member)	(pcpup->pc_ ## member)
 
diff --git a/sys/powerpc/include/pmap.h b/sys/powerpc/include/pmap.h
index f50ff118da0..2c9c786d117 100644
--- a/sys/powerpc/include/pmap.h
+++ b/sys/powerpc/include/pmap.h
@@ -240,7 +240,11 @@ boolean_t	pmap_mmu_install(char *name, int prio);
 
 #define	vtophys(va)	pmap_kextract((vm_offset_t)(va))
 
-#define PHYS_AVAIL_SZ	128
+#define PHYS_AVAIL_SZ	256	/* Allows up to 16GB Ram on pSeries with
+				 * logical memory block size of 64MB.
+				 * For more Ram increase the lmb or this value.
+				 */
+
 extern	vm_offset_t phys_avail[PHYS_AVAIL_SZ];
 extern	vm_offset_t virtual_avail;
 extern	vm_offset_t virtual_end;
@@ -254,6 +258,8 @@ extern void pmap_dumpsys_unmap(struct pmap_md *, vm_size_t, vm_offset_t);
 
 extern struct pmap_md *pmap_scan_md(struct pmap_md *);
 
+vm_offset_t pmap_early_io_map(vm_paddr_t pa, vm_size_t size);
+
 #endif
 
 #endif /* !_MACHINE_PMAP_H_ */
diff --git a/sys/powerpc/include/psl.h b/sys/powerpc/include/psl.h
index b519266b860..d09de52f450 100644
--- a/sys/powerpc/include/psl.h
+++ b/sys/powerpc/include/psl.h
@@ -35,96 +35,44 @@
 #ifndef	_MACHINE_PSL_H_
 #define	_MACHINE_PSL_H_
 
-#if defined(BOOKE_E500)
 /*
- * Machine State Register (MSR) - e500 core
- *
- * The PowerPC e500 does not implement the following bits:
- *
- * FP, FE0, FE1 - reserved, always cleared, setting has no effect.
- *
+ * Machine State Register (MSR) - All cores
  */
-#define PSL_UCLE	0x04000000UL	/* User mode cache lock enable */
-#define PSL_SPE		0x02000000UL	/* SPE enable */
-#define PSL_WE		0x00040000UL	/* Wait state enable */
-#define PSL_CE		0x00020000UL	/* Critical interrupt enable */
-#define PSL_EE		0x00008000UL	/* External interrupt enable */
-#define PSL_PR		0x00004000UL	/* User mode */
-#define PSL_FP		0x00002000UL	/* Floating point available */
-#define PSL_ME		0x00001000UL	/* Machine check interrupt enable */
-#define PSL_FE0		0x00000800UL	/* Floating point exception mode 0 */
-#define PSL_UBLE	0x00000400UL	/* BTB lock enable */
-#define PSL_DE		0x00000200UL	/* Debug interrupt enable */
-#define PSL_FE1		0x00000100UL	/* Floating point exception mode 1 */
-#define PSL_IS		0x00000020UL	/* Instruction address space */
-#define PSL_DS		0x00000010UL	/* Data address space */
-#define PSL_PMM		0x00000004UL	/* Performance monitor mark */
-
-#define PSL_FE_DFLT	0x00000000UL	/* default == none */
-
-/* Initial kernel MSR, use IS=1 ad DS=1. */
-#define PSL_KERNSET_INIT	(PSL_IS | PSL_DS)
-#define PSL_KERNSET		(PSL_CE | PSL_ME | PSL_EE)
-#define PSL_USERSET		(PSL_KERNSET | PSL_PR)
-
-#elif defined(BOOKE_PPC4XX)
-/*
- * Machine State Register (MSR) - PPC4xx core
- */
-#define PSL_WE		(0x80000000 >> 13) /* Wait State Enable */
-#define PSL_CE		(0x80000000 >> 14) /* Critical Interrupt Enable */
-#define PSL_EE		(0x80000000 >> 16) /* External Interrupt Enable */
-#define PSL_PR		(0x80000000 >> 17) /* Problem State */
-#define PSL_FP		(0x80000000 >> 18) /* Floating Point Available */
-#define PSL_ME		(0x80000000 >> 19) /* Machine Check Enable */
-#define PSL_FE0		(0x80000000 >> 20) /* Floating-point exception mode 0 */
-#define PSL_DWE		(0x80000000 >> 21) /* Debug Wait Enable */
-#define PSL_DE		(0x80000000 >> 22) /* Debug interrupt Enable */
-#define PSL_FE1		(0x80000000 >> 23) /* Floating-point exception mode 1 */
-#define PSL_IS		(0x80000000 >> 26) /* Instruction Address Space */
-#define PSL_DS		(0x80000000 >> 27) /* Data Address Space */
-
-#define PSL_KERNSET	(PSL_CE | PSL_ME | PSL_EE | PSL_FP)
-#define PSL_USERSET	(PSL_KERNSET | PSL_PR)
-
-#define PSL_FE_DFLT	0x00000000UL	/* default == none */
-
-#else	/* if defined(BOOKE_*) */
-/*
- * Machine State Register (MSR)
- *
- * The PowerPC 601 does not implement the following bits:
- *
- *	VEC, POW, ILE, BE, RI, LE[*]
- *
- * [*] Little-endian mode on the 601 is implemented in the HID0 register.
- */
-
-#ifdef __powerpc64__
-#define PSL_SF		0x8000000000000000UL	/* 64-bit addressing */
-#define PSL_HV		0x1000000000000000UL	/* hyper-privileged mode */
-#endif
-
-#define	PSL_VEC		0x02000000UL	/* AltiVec vector unit available */
-#define	PSL_POW		0x00040000UL	/* power management */
-#define	PSL_ILE		0x00010000UL	/* interrupt endian mode (1 == le) */
+#define	PSL_VEC		0x02000000UL	/* AltiVec/SPE vector unit available */
 #define	PSL_EE		0x00008000UL	/* external interrupt enable */
 #define	PSL_PR		0x00004000UL	/* privilege mode (1 == user) */
 #define	PSL_FP		0x00002000UL	/* floating point enable */
 #define	PSL_ME		0x00001000UL	/* machine check enable */
 #define	PSL_FE0		0x00000800UL	/* floating point interrupt mode 0 */
-#define	PSL_SE		0x00000400UL	/* single-step trace enable */
 #define	PSL_BE		0x00000200UL	/* branch trace enable */
 #define	PSL_FE1		0x00000100UL	/* floating point interrupt mode 1 */
-#define	PSL_IP		0x00000040UL	/* interrupt prefix */
+#define	PSL_PMM		0x00000004UL	/* performance monitor mark */
+
+/* Machine State Register - Book-E cores */
+#define PSL_UCLE	0x04000000UL	/* User mode cache lock enable */
+#define PSL_WE		0x00040000UL	/* Wait state enable */
+#define PSL_CE		0x00020000UL	/* Critical interrupt enable */
+#define PSL_UBLE	0x00000400UL	/* BTB lock enable - e500 only */
+#define PSL_DWE		0x00000400UL	/* Debug Wait Enable - 440 only*/
+#define PSL_DE		0x00000200UL	/* Debug interrupt enable */
+#define PSL_IS		0x00000020UL	/* Instruction address space */
+#define PSL_DS		0x00000010UL	/* Data address space */
+
+/* Machine State Register (MSR) - AIM cores */
+#ifdef __powerpc64__
+#define PSL_SF		0x8000000000000000UL	/* 64-bit addressing */
+#define PSL_HV		0x1000000000000000UL	/* hyper-privileged mode */
+#endif
+
+#define	PSL_POW		0x00040000UL	/* power management */
+#define	PSL_ILE		0x00010000UL	/* interrupt endian mode (1 == le) */
+#define	PSL_SE		0x00000400UL	/* single-step trace enable */
+#define	PSL_IP		0x00000040UL	/* interrupt prefix - 601 only */
 #define	PSL_IR		0x00000020UL	/* instruction address relocation */
 #define	PSL_DR		0x00000010UL	/* data address relocation */
-#define	PSL_PMM		0x00000004UL	/* performance monitor mark */
 #define	PSL_RI		0x00000002UL	/* recoverable interrupt */
 #define	PSL_LE		0x00000001UL	/* endian mode (1 == le) */
 
-#define	PSL_601_MASK	~(PSL_POW|PSL_ILE|PSL_BE|PSL_RI|PSL_LE)
-
 /*
  * Floating-point exception modes:
  */
@@ -134,20 +82,21 @@
 #define	PSL_FE_PREC	(PSL_FE0 | PSL_FE1) /* precise */
 #define	PSL_FE_DFLT	PSL_FE_DIS	/* default == none */
 
-/*
- * Note that PSL_POW and PSL_ILE are not in the saved copy of the MSR
- */
-#define	PSL_MBO		0
-#define	PSL_MBZ		0
-
+#if defined(BOOKE_E500)
+/* Initial kernel MSR, use IS=1 ad DS=1. */
+#define PSL_KERNSET_INIT	(PSL_IS | PSL_DS)
+#define PSL_KERNSET		(PSL_CE | PSL_ME | PSL_EE)
+#elif defined(BOOKE_PPC4XX)
+#define PSL_KERNSET	(PSL_CE | PSL_ME | PSL_EE | PSL_FP)
+#elif defined(AIM)
 #ifdef __powerpc64__
 #define	PSL_KERNSET	(PSL_SF | PSL_EE | PSL_ME | PSL_IR | PSL_DR | PSL_RI)
 #else
 #define	PSL_KERNSET	(PSL_EE | PSL_ME | PSL_IR | PSL_DR | PSL_RI)
 #endif
+#endif
+
 #define	PSL_USERSET	(PSL_KERNSET | PSL_PR)
+#define	PSL_USERSTATIC	~(PSL_VEC | PSL_FP | PSL_FE0 | PSL_FE1)
 
-#define	PSL_USERSTATIC	(PSL_USERSET | PSL_IP | 0x87c0008c)
-
-#endif	/* if defined(BOOKE_E500) */
 #endif	/* _MACHINE_PSL_H_ */
diff --git a/sys/powerpc/include/tlb.h b/sys/powerpc/include/tlb.h
index 7e0d909a074..58a1a019eb4 100644
--- a/sys/powerpc/include/tlb.h
+++ b/sys/powerpc/include/tlb.h
@@ -126,6 +126,9 @@
 
 #if !defined(LOCORE)
 typedef struct tlb_entry {
+	vm_paddr_t phys;
+	vm_offset_t virt;
+	vm_size_t size;
 	uint32_t mas1;
 	uint32_t mas2;
 	uint32_t mas3;
@@ -134,7 +137,7 @@ typedef struct tlb_entry {
 void tlb0_print_tlbentries(void);
 
 void tlb1_inval_entry(unsigned int);
-void tlb1_init(vm_offset_t);
+void tlb1_init(void);
 void tlb1_print_entries(void);
 void tlb1_print_tlbentries(void);
 #endif /* !LOCORE */
diff --git a/sys/powerpc/include/trap.h b/sys/powerpc/include/trap.h
index 75accf300f6..89f596659cf 100644
--- a/sys/powerpc/include/trap.h
+++ b/sys/powerpc/include/trap.h
@@ -1,8 +1,130 @@
-/* $FreeBSD$ */
+/*-
+ * Copyright (C) 1995, 1996 Wolfgang Solfrank.
+ * Copyright (C) 1995, 1996 TooLs GmbH.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must 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 TooLs GmbH.
+ * 4. The name of TooLs GmbH may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * $NetBSD: trap.h,v 1.7 2002/02/22 13:51:40 kleink Exp $
+ * $FreeBSD$
+ */
 
-#if defined(AIM)
-#include <machine/trap_aim.h>
-#elif defined(BOOKE)
-#include <machine/trap_booke.h>
+#ifndef	_POWERPC_TRAP_H_
+#define	_POWERPC_TRAP_H_
+
+#define	EXC_RSVD	0x0000		/* Reserved */
+#define	EXC_RST		0x0100		/* Reset; all but IBM4xx */
+#define	EXC_MCHK	0x0200		/* Machine Check */
+#define	EXC_DSI		0x0300		/* Data Storage Interrupt */
+#define	EXC_DSE		0x0380		/* Data Segment Interrupt */
+#define	EXC_ISI		0x0400		/* Instruction Storage Interrupt */
+#define	EXC_ISE		0x0480		/* Instruction Segment Interrupt */
+#define	EXC_EXI		0x0500		/* External Interrupt */
+#define	EXC_ALI		0x0600		/* Alignment Interrupt */
+#define	EXC_PGM		0x0700		/* Program Interrupt */
+#define	EXC_FPU		0x0800		/* Floating-point Unavailable */
+#define	EXC_DECR	0x0900		/* Decrementer Interrupt */
+#define	EXC_SC		0x0c00		/* System Call */
+#define	EXC_TRC		0x0d00		/* Trace */
+#define	EXC_FPA		0x0e00		/* Floating-point Assist */
+
+/* The following is only available on the 601: */
+#define	EXC_RUNMODETRC	0x2000		/* Run Mode/Trace Exception */
+
+/* The following are only available on 970(G5): */
+#define	EXC_VECAST_G5	0x1700		/* AltiVec Assist */
+
+/* The following are only available on 7400(G4): */
+#define	EXC_VEC		0x0f20		/* AltiVec Unavailable */
+#define	EXC_VECAST_G4	0x1600		/* AltiVec Assist */
+
+/* The following are only available on 604/750/7400: */
+#define	EXC_PERF	0x0f00		/* Performance Monitoring */
+#define	EXC_BPT		0x1300		/* Instruction Breakpoint */
+#define	EXC_SMI		0x1400		/* System Managment Interrupt */
+
+/* The following are only available on 750/7400: */
+#define	EXC_THRM	0x1700		/* Thermal Management Interrupt */
+
+/* And these are only on the 603: */
+#define	EXC_IMISS	0x1000		/* Instruction translation miss */
+#define	EXC_DLMISS	0x1100		/* Data load translation miss */
+#define	EXC_DSMISS	0x1200		/* Data store translation miss */
+
+/* The following are available on 4xx and 85xx */
+#define	EXC_CRIT	0x0100		/* Critical Input Interrupt */
+#define	EXC_PIT		0x1000		/* Programmable Interval Timer */
+#define	EXC_FIT		0x1010		/* Fixed Interval Timer */
+#define	EXC_WDOG	0x1020		/* Watchdog Timer */
+#define	EXC_DTMISS	0x1100		/* Data TLB Miss */
+#define	EXC_ITMISS	0x1200		/* Instruction TLB Miss */
+#define	EXC_APU		0x1300		/* Auxiliary Processing Unit */
+#define	EXC_DEBUG	0x2000		/* Debug trap */
+
+#define	EXC_LAST	0x2f00		/* Last possible exception vector */
+
+#define	EXC_AST		0x3000		/* Fake AST vector */
+
+/* Trap was in user mode */
+#define	EXC_USER	0x10000
+
+
+/*
+ * EXC_ALI sets bits in the DSISR and DAR to provide enough
+ * information to recover from the unaligned access without needing to
+ * parse the offending instruction. This includes certain bits of the
+ * opcode, and information about what registers are used. The opcode
+ * indicator values below come from Appendix F of Book III of "The
+ * PowerPC Architecture".
+ */
+
+#define EXC_ALI_OPCODE_INDICATOR(dsisr) ((dsisr >> 10) & 0x7f)
+#define EXC_ALI_LFD	0x09
+#define EXC_ALI_STFD	0x0b
+
+/* Macros to extract register information */
+#define EXC_ALI_RST(dsisr) ((dsisr >> 5) & 0x1f)   /* source or target */
+#define EXC_ALI_RA(dsisr) (dsisr & 0x1f)
+
+/*
+ * SRR1 bits for program exception traps. These identify what caused
+ * the program exception. See section 6.5.9 of the Power ISA Version
+ * 2.05.
+ */
+
+#define	EXC_PGM_FPENABLED	(1UL << 20)
+#define	EXC_PGM_ILLEGAL		(1UL << 19)
+#define	EXC_PGM_PRIV		(1UL << 18)
+#define	EXC_PGM_TRAP		(1UL << 17)
+
+#ifndef LOCORE
+struct	trapframe;
+struct	pcb;
+void    trap(struct trapframe *);
+int	ppc_instr_emulate(struct trapframe *, struct pcb *);
 #endif
 
+#endif	/* _POWERPC_TRAP_H_ */
diff --git a/sys/powerpc/include/trap_aim.h b/sys/powerpc/include/trap_aim.h
deleted file mode 100644
index eb7322c71e4..00000000000
--- a/sys/powerpc/include/trap_aim.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/*-
- * Copyright (C) 1995, 1996 Wolfgang Solfrank.
- * Copyright (C) 1995, 1996 TooLs GmbH.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must 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 TooLs GmbH.
- * 4. The name of TooLs GmbH may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $NetBSD: trap.h,v 1.7 2002/02/22 13:51:40 kleink Exp $
- * $FreeBSD$
- */
-
-#ifndef	_POWERPC_TRAP_H_
-#define	_POWERPC_TRAP_H_
-
-#define	EXC_RSVD	0x0000		/* Reserved */
-#define	EXC_RST		0x0100		/* Reset; all but IBM4xx */
-#define	EXC_MCHK	0x0200		/* Machine Check */
-#define	EXC_DSI		0x0300		/* Data Storage Interrupt */
-#define	EXC_DSE		0x0380		/* Data Segment Interrupt */
-#define	EXC_ISI		0x0400		/* Instruction Storage Interrupt */
-#define	EXC_ISE		0x0480		/* Instruction Segment Interrupt */
-#define	EXC_EXI		0x0500		/* External Interrupt */
-#define	EXC_ALI		0x0600		/* Alignment Interrupt */
-#define	EXC_PGM		0x0700		/* Program Interrupt */
-#define	EXC_FPU		0x0800		/* Floating-point Unavailable */
-#define	EXC_DECR	0x0900		/* Decrementer Interrupt */
-#define	EXC_SC		0x0c00		/* System Call */
-#define	EXC_TRC		0x0d00		/* Trace */
-#define	EXC_FPA		0x0e00		/* Floating-point Assist */
-
-/* The following is only available on the 601: */
-#define	EXC_RUNMODETRC	0x2000		/* Run Mode/Trace Exception */
-
-/* The following are only available on 970(G5): */
-#define	EXC_VECAST_G5	0x1700		/* AltiVec Assist */
-
-/* The following are only available on 7400(G4): */
-#define	EXC_VEC		0x0f20		/* AltiVec Unavailable */
-#define	EXC_VECAST_G4	0x1600		/* AltiVec Assist */
-
-/* The following are only available on 604/750/7400: */
-#define	EXC_PERF	0x0f00		/* Performance Monitoring */
-#define	EXC_BPT		0x1300		/* Instruction Breakpoint */
-#define	EXC_SMI		0x1400		/* System Managment Interrupt */
-
-/* The following are only available on 750/7400: */
-#define	EXC_THRM	0x1700		/* Thermal Management Interrupt */
-
-/* And these are only on the 603: */
-#define	EXC_IMISS	0x1000		/* Instruction translation miss */
-#define	EXC_DLMISS	0x1100		/* Data load translation miss */
-#define	EXC_DSMISS	0x1200		/* Data store translation miss */
-
-/* The following are available on 4xx and 85xx */
-#define	EXC_CII		0x0100		/* Critical Input Interrupt */
-#define	EXC_PIT		0x1000		/* Programmable Interval Timer */
-#define	EXC_FIT		0x1010		/* Fixed Interval Timer */
-#define	EXC_WDOG	0x1020		/* Watchdog Timer */
-#define	EXC_DTMISS	0x1100		/* Data TLB Miss */
-#define	EXC_ITMISS	0x1200		/* Instruction TLB Miss */
-#define	EXC_DEBUG	0x2000		/* Debug trap */
-
-#define	EXC_LAST	0x2f00		/* Last possible exception vector */
-
-#define	EXC_AST		0x3000		/* Fake AST vector */
-
-/* Trap was in user mode */
-#define	EXC_USER	0x10000
-
-
-/*
- * EXC_ALI sets bits in the DSISR and DAR to provide enough
- * information to recover from the unaligned access without needing to
- * parse the offending instruction. This includes certain bits of the
- * opcode, and information about what registers are used. The opcode
- * indicator values below come from Appendix F of Book III of "The
- * PowerPC Architecture".
- */
-
-#define EXC_ALI_OPCODE_INDICATOR(dsisr) ((dsisr >> 10) & 0x7f)
-#define EXC_ALI_LFD	0x09
-#define EXC_ALI_STFD	0x0b
-
-/* Macros to extract register information */
-#define EXC_ALI_RST(dsisr) ((dsisr >> 5) & 0x1f)   /* source or target */
-#define EXC_ALI_RA(dsisr) (dsisr & 0x1f)
-
-/*
- * SRR1 bits for program exception traps. These identify what caused
- * the program exception. See section 6.5.9 of the Power ISA Version
- * 2.05.
- */
-
-#define	EXC_PGM_FPENABLED	(1UL << 20)
-#define	EXC_PGM_ILLEGAL		(1UL << 19)
-#define	EXC_PGM_PRIV		(1UL << 18)
-#define	EXC_PGM_TRAP		(1UL << 17)
-
-#ifndef LOCORE
-struct	trapframe;
-void    trap(struct trapframe *);
-#endif
-
-#endif	/* _POWERPC_TRAP_H_ */
diff --git a/sys/powerpc/include/trap_booke.h b/sys/powerpc/include/trap_booke.h
deleted file mode 100644
index b19fc335d6c..00000000000
--- a/sys/powerpc/include/trap_booke.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*-
- * Copyright (C) 2006 Semihalf, Rafal Jaworowski <raj@semihalf.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.
- * 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.
- *
- * $FreeBSD$
- */
-
-#ifndef	_POWERPC_TRAP_H_
-#define	_POWERPC_TRAP_H_
-
-#define	EXC_CRIT	0
-#define	EXC_MCHK	1
-#define	EXC_DSI		2
-#define	EXC_ISI		3
-#define	EXC_EXI		4
-#define	EXC_ALI		5
-#define	EXC_PGM		6
-#define	EXC_FPU		7	/* e500: not supported */
-#define	EXC_SC		8
-#define	EXC_APU		9	/* e500: not supported */
-#define	EXC_DECR	10
-#define	EXC_FIT		11
-#define	EXC_WDOG	12
-#define	EXC_DTMISS	13
-#define	EXC_ITMISS	14
-#define	EXC_DEBUG	15
-
-#define	EXC_SAU		32	/* e500-specific: SPE APU unavailable */
-#define	EXC_PERF	35	/* e500-specific: Performance monitor */
-
-#define	EXC_LAST	255
-
-#ifndef LOCORE
-struct	trapframe;
-void    trap(struct trapframe *);
-#endif
-
-#endif	/* _POWERPC_TRAP_H_ */
diff --git a/sys/powerpc/include/vmparam.h b/sys/powerpc/include/vmparam.h
index 5a2979623d1..2d50f94c9dc 100644
--- a/sys/powerpc/include/vmparam.h
+++ b/sys/powerpc/include/vmparam.h
@@ -108,16 +108,11 @@
 
 #else /* Book-E */
 
-/*
- * Kernel CCSRBAR location. We make this the reset location.
- */
-#define	CCSRBAR_VA		0xfef00000
-#define	CCSRBAR_SIZE		0x00100000
-
 #define	KERNBASE		0xc0000000	/* start of kernel virtual */
 
 #define	VM_MIN_KERNEL_ADDRESS	KERNBASE
 #define	VM_MAX_KERNEL_ADDRESS	0xf8000000
+#define	VM_MAX_SAFE_KERNEL_ADDRESS	VM_MAX_KERNEL_ADDRESS
 
 #endif /* AIM/E500 */
 
@@ -177,18 +172,27 @@ struct pmap_physseg {
 #define	SGROWSIZ	(128UL*1024)		/* amount to grow stack */
 #endif
 
-#ifndef VM_KMEM_SIZE
-#define	VM_KMEM_SIZE		(12 * 1024 * 1024)
-#endif
-
-#ifdef __powerpc64__
+/*
+ * How many physical pages per kmem arena virtual page.
+ */
 #ifndef VM_KMEM_SIZE_SCALE
-#define VM_KMEM_SIZE_SCALE      (3)
+#define	VM_KMEM_SIZE_SCALE	(3)
 #endif
 
-#ifndef VM_KMEM_SIZE_MAX
-#define VM_KMEM_SIZE_MAX        0x1c0000000  /* 7 GB */
+/*
+ * Optional floor (in bytes) on the size of the kmem arena.
+ */
+#ifndef VM_KMEM_SIZE_MIN
+#define	VM_KMEM_SIZE_MIN	(12 * 1024 * 1024)
 #endif
+
+/*
+ * Optional ceiling (in bytes) on the size of the kmem arena: 40% of the
+ * usable KVA space.
+ */
+#ifndef VM_KMEM_SIZE_MAX
+#define VM_KMEM_SIZE_MAX	((VM_MAX_SAFE_KERNEL_ADDRESS - \
+    VM_MIN_KERNEL_ADDRESS + 1) * 2 / 5)
 #endif
 
 #define	ZERO_REGION_SIZE	(64 * 1024)	/* 64KB */
diff --git a/sys/powerpc/mambo/mambo_openpic.c b/sys/powerpc/mambo/mambo_openpic.c
deleted file mode 100644
index 883c9d70209..00000000000
--- a/sys/powerpc/mambo/mambo_openpic.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * Copyright 2008 by Nathan Whitehorn. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/openfirm.h>
-
-#include <machine/bus.h>
-#include <machine/intr_machdep.h>
-#include <machine/md_var.h>
-#include <machine/pio.h>
-#include <machine/resource.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
-#include <sys/rman.h>
-
-#include <machine/openpicvar.h>
-
-#include "pic_if.h"
-
-/*
- * Mambo interface
- */
-static int	openpic_mambo_probe(device_t);
-static int	openpic_mambo_attach(device_t);
-static int	openpicbus_mambo_probe(device_t dev);
-static int	openpicbus_mambo_attach(device_t dev);
-static struct resource *openpicbus_alloc_resource(device_t bus, device_t dev,
-    int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
-
-static device_method_t  openpicbus_mambo_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		openpicbus_mambo_probe),
-	DEVMETHOD(device_attach,	openpicbus_mambo_attach),
-
-	/* Bus interface */
-	DEVMETHOD(bus_alloc_resource,	openpicbus_alloc_resource),
-
-	{0,0}
-};
-
-struct openpicbus_softc {
-	vm_offset_t picaddr;
-};
-
-static driver_t openpicbus_mambo_driver = {
-	"openpicbus",
-	openpicbus_mambo_methods,
-	sizeof(struct openpicbus_softc),
-};
-
-static device_method_t  openpic_mambo_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		openpic_mambo_probe),
-	DEVMETHOD(device_attach,	openpic_mambo_attach),
-
-	/* PIC interface */
-	DEVMETHOD(pic_config,		openpic_config),
-	DEVMETHOD(pic_dispatch,		openpic_dispatch),
-	DEVMETHOD(pic_enable,		openpic_enable),
-	DEVMETHOD(pic_eoi,		openpic_eoi),
-	DEVMETHOD(pic_ipi,		openpic_ipi),
-	DEVMETHOD(pic_mask,		openpic_mask),
-	DEVMETHOD(pic_unmask,		openpic_unmask),
-
-	{ 0, 0 },
-};
-
-static driver_t openpic_mambo_driver = {
-	"openpic",
-	openpic_mambo_methods,
-	sizeof(struct openpic_softc),
-};
-
-static devclass_t openpicbus_devclass;
-
-DRIVER_MODULE(openpicbus, nexus, openpicbus_mambo_driver, 
-    openpicbus_devclass, 0, 0);
-DRIVER_MODULE(openpic, openpicbus, openpic_mambo_driver, 
-    openpic_devclass, 0, 0);
-
-static int
-openpicbus_mambo_probe(device_t dev)
-{
-	const char *type = ofw_bus_get_type(dev);
-
-	if (type == NULL || strcmp(type, "open-pic") != 0)
-                return (ENXIO);
-
-	device_set_desc(dev, "Mambo OpenPIC Container");
-
-	return (0);
-}
-
-static int
-openpicbus_mambo_attach(device_t dev)
-{
-	uint64_t picaddr;
-	phandle_t nexus;
-	struct openpicbus_softc *sc;
-
-	sc = device_get_softc(dev);
-
-	nexus = OF_parent(ofw_bus_get_node(dev));
-
-	OF_getprop(nexus,"platform-open-pic",
-	    &picaddr,sizeof(picaddr));
-
-	sc->picaddr = picaddr;
-
-	device_add_child(dev,"openpic",-1);
-
-	return (bus_generic_attach(dev));
-}
-
-static struct resource *
-openpicbus_alloc_resource(device_t bus, device_t dev, int type, int *rid,
-		   u_long start, u_long end, u_long count, u_int flags)
-{
-	struct openpicbus_softc *sc;
-
-	sc = device_get_softc(bus);
-
-	count = 0x40000;
-	start = sc->picaddr;
-	end = start + count;
-
-	return (bus_alloc_resource(bus, type, rid, start, end, count, flags));
-}
-
-static int
-openpic_mambo_probe(device_t dev)
-{
-
-	device_set_desc(dev, OPENPIC_DEVSTR);
-	return (0);
-}
-
-static int
-openpic_mambo_attach(device_t dev)
-{
- 
-	return (openpic_common_attach(dev,
-	    ofw_bus_get_node(device_get_parent(dev))));
-}
diff --git a/sys/powerpc/mpc85xx/atpic.c b/sys/powerpc/mpc85xx/atpic.c
index a792e54491b..ef7ab885561 100644
--- a/sys/powerpc/mpc85xx/atpic.c
+++ b/sys/powerpc/mpc85xx/atpic.c
@@ -79,6 +79,9 @@ static void atpic_ipi(device_t, u_int);
 static void atpic_mask(device_t, u_int);
 static void atpic_unmask(device_t, u_int);
 
+static void atpic_ofw_translate_code(device_t, u_int irq, int code,
+    enum intr_trigger *trig, enum intr_polarity *pol);
+
 static device_method_t atpic_isa_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_identify, 	atpic_isa_identify),
@@ -94,6 +97,8 @@ static device_method_t atpic_isa_methods[] = {
 	DEVMETHOD(pic_mask,		atpic_mask),
 	DEVMETHOD(pic_unmask,		atpic_unmask),
 
+	DEVMETHOD(pic_translate_code,	atpic_ofw_translate_code),
+
 	{ 0, 0 },
 };
 
@@ -325,3 +330,35 @@ atpic_unmask(device_t dev, u_int irq)
 		atpic_write(sc, ATPIC_MASTER, 1, sc->sc_mask[ATPIC_MASTER]);
 	}
 }
+
+static void
+atpic_ofw_translate_code(device_t dev, u_int irq, int code,
+    enum intr_trigger *trig, enum intr_polarity *pol)
+{
+	switch (code) {
+	case 0:
+		/* Active L level */
+		*trig = INTR_TRIGGER_LEVEL;
+		*pol = INTR_POLARITY_LOW;
+		break;
+	case 1:
+		/* Active H level */
+		*trig = INTR_TRIGGER_LEVEL;
+		*pol = INTR_POLARITY_HIGH;
+		break;
+	case 2:
+		/* H to L edge */
+		*trig = INTR_TRIGGER_EDGE;
+		*pol = INTR_POLARITY_LOW;
+		break;
+	case 3:
+		/* L to H edge */
+		*trig = INTR_TRIGGER_EDGE;
+		*pol = INTR_POLARITY_HIGH;
+		break;
+	default:
+		*trig = INTR_TRIGGER_CONFORM;
+		*pol = INTR_POLARITY_CONFORM;
+	}
+}
+
diff --git a/sys/powerpc/mpc85xx/fsl_sdhc.c b/sys/powerpc/mpc85xx/fsl_sdhc.c
index ecd6572524b..12b18b12485 100644
--- a/sys/powerpc/mpc85xx/fsl_sdhc.c
+++ b/sys/powerpc/mpc85xx/fsl_sdhc.c
@@ -64,8 +64,6 @@ __FBSDID("$FreeBSD$");
 
 #include "fsl_sdhc.h"
 
-#define DEBUG
-#undef DEBUG
 #ifdef DEBUG
 #define	DPRINTF(fmt, arg...)	printf("DEBUG %s(): " fmt, __FUNCTION__, ##arg)
 #else
diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c
index cbcd9fc2e66..5c27ca446e9 100644
--- a/sys/powerpc/mpc85xx/lbc.c
+++ b/sys/powerpc/mpc85xx/lbc.c
@@ -113,7 +113,7 @@ static driver_t lbc_driver = {
 
 devclass_t lbc_devclass;
 
-DRIVER_MODULE(lbc, fdtbus, lbc_driver, lbc_devclass, 0, 0);
+DRIVER_MODULE(lbc, nexus, lbc_driver, lbc_devclass, 0, 0);
 
 /*
  * Calculate address mask used by OR(n) registers. Use memory region size to
diff --git a/sys/powerpc/mpc85xx/mpc85xx.c b/sys/powerpc/mpc85xx/mpc85xx.c
index 0db5d5e0efe..e94a1d832b0 100644
--- a/sys/powerpc/mpc85xx/mpc85xx.c
+++ b/sys/powerpc/mpc85xx/mpc85xx.c
@@ -41,6 +41,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/pio.h>
 #include <machine/spr.h>
 
+#include <dev/fdt/fdt_common.h>
+
 #include <powerpc/mpc85xx/mpc85xx.h>
 
 /*
diff --git a/sys/powerpc/mpc85xx/mpc85xx.h b/sys/powerpc/mpc85xx/mpc85xx.h
index fa3bde3f24e..c3cbf55512c 100644
--- a/sys/powerpc/mpc85xx/mpc85xx.h
+++ b/sys/powerpc/mpc85xx/mpc85xx.h
@@ -33,6 +33,8 @@
 /*
  * Configuration control and status registers
  */
+extern vm_offset_t		ccsrbar_va;
+#define CCSRBAR_VA		ccsrbar_va
 #define	OCP85XX_CCSRBAR		(CCSRBAR_VA + 0x0)
 #define	OCP85XX_BPTR		(CCSRBAR_VA + 0x20)
 
diff --git a/sys/powerpc/mpc85xx/nexus.c b/sys/powerpc/mpc85xx/nexus.c
deleted file mode 100644
index 5220d1e4c72..00000000000
--- a/sys/powerpc/mpc85xx/nexus.c
+++ /dev/null
@@ -1,201 +0,0 @@
-/*-
- * Copyright 1998 Massachusetts Institute of Technology
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby
- * granted, provided that both the above copyright notice and this
- * permission notice appear in all copies, that both the above
- * copyright notice and this permission notice appear in all
- * supporting documentation, and that the name of M.I.T. not be used
- * in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission.  M.I.T. makes
- * no representations about the suitability of this software for any
- * purpose.  It is provided "as is" without express or implied
- * warranty.
- *
- * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
- * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
- * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (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 2001 by Thomas Moestl <tmm@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.
- *
- * 	from: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/module.h>
-#include <sys/bus.h>
-#include <sys/cons.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/rman.h>
-
-#include <machine/intr_machdep.h>
-
-/*
- * Device interface
- */
-static int	nexus_probe(device_t);
-static int	nexus_attach(device_t);
-static int	nexus_activate_resource(device_t, device_t, int, int,
-    struct resource *);
-static int	nexus_deactivate_resource(device_t, device_t, int, int,
-    struct resource *);
-
-static int	nexus_config_intr(device_t, int, enum intr_trigger,
-    enum intr_polarity);
-static int	nexus_setup_intr(device_t, device_t, struct resource *, int,
-    driver_filter_t *, driver_intr_t *, void *, void **);
-static int	nexus_teardown_intr(device_t, device_t, struct resource *,
-    void *);
-
-static device_method_t nexus_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		nexus_probe),
-	DEVMETHOD(device_attach,	nexus_attach),
-	DEVMETHOD(device_detach,	bus_generic_detach),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
-
-	/* Bus interface. Resource management is business of the children... */
-	DEVMETHOD(bus_add_child,	bus_generic_add_child),
-	DEVMETHOD(bus_probe_nomatch,	NULL),
-	DEVMETHOD(bus_read_ivar,	NULL),
-	DEVMETHOD(bus_write_ivar,	NULL),
-	DEVMETHOD(bus_config_intr,	nexus_config_intr),
-	DEVMETHOD(bus_setup_intr,	nexus_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	nexus_teardown_intr),
-	DEVMETHOD(bus_alloc_resource,	NULL),
-	DEVMETHOD(bus_activate_resource,	nexus_activate_resource),
-	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
-	DEVMETHOD(bus_release_resource,	NULL),
-
-	DEVMETHOD_END
-};
-
-static driver_t nexus_driver = {
-	"nexus",
-	nexus_methods
-};
-
-static devclass_t nexus_devclass;
-
-DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0);
-
-static int
-nexus_probe(device_t dev)
-{
-
-	if (!bootverbose)
-		device_quiet(dev);
-	return (BUS_PROBE_DEFAULT);
-}
-
-static int
-nexus_attach(device_t dev)
-{
-
-	bus_generic_probe(dev);
-	bus_generic_attach(dev);
-	return (0);
-}
-
-static int
-nexus_activate_resource(device_t bus, device_t child, int type, int rid,
-    struct resource *res)
-{
-
-	/* Not much to be done yet... */
-	return (rman_activate_resource(res));
-}
-
-static int
-nexus_deactivate_resource(device_t bus, device_t child, int type, int rid,
-    struct resource *res)
-{
-
-	/* Not much to be done yet... */
-	return (rman_deactivate_resource(res));
-}
-
-static int
-nexus_config_intr(device_t bus, int irq, enum intr_trigger trig,
-    enum intr_polarity pol)
-{
-
-	return (powerpc_config_intr(irq, trig, pol));
-}
-
-static int
-nexus_setup_intr(device_t bus, device_t child, struct resource *res, int flags,
-    driver_filter_t *ifilt, driver_intr_t *ihand, void *arg, void **cookiep)
-{
-	int error;
-
-	*cookiep = NULL;
-
-	/* somebody tried to setup an irq that failed to allocate! */
-	if (res == NULL)
-		return (EINVAL);
-
-	if ((rman_get_flags(res) & RF_SHAREABLE) == 0)
-		flags |= INTR_EXCL;
-
-	/* We depend on rman_activate_resource() being idempotent. */
-	error = rman_activate_resource(res);
-	if (error)
-		return (error);
-
-	error = powerpc_setup_intr(device_get_nameunit(child),
-	    rman_get_start(res), ifilt, ihand, arg, flags, cookiep);
-	return (error);
-}
-
-static int
-nexus_teardown_intr(device_t bus, device_t child, struct resource *res,
-    void *cookie)
-{
-	int error;
-
-	if (res == NULL)
-		return (EINVAL);
-
-	error = powerpc_teardown_intr(cookie);
-	return (error);
-}
diff --git a/sys/powerpc/mpc85xx/pci_fdt.c b/sys/powerpc/mpc85xx/pci_mpc85xx.c
similarity index 72%
rename from sys/powerpc/mpc85xx/pci_fdt.c
rename to sys/powerpc/mpc85xx/pci_mpc85xx.c
index 724384d5707..0699b224b49 100644
--- a/sys/powerpc/mpc85xx/pci_fdt.c
+++ b/sys/powerpc/mpc85xx/pci_mpc85xx.c
@@ -55,13 +55,15 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm.h>
 #include <vm/pmap.h>
 
-#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_pci.h>
 #include <dev/ofw/ofw_bus.h>
 #include <dev/ofw/ofw_bus_subr.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcib_private.h>
 
+#include <powerpc/ofw/ofw_pci.h>
+
 #include "ofw_bus_if.h"
 #include "pcib_if.h"
 
@@ -98,20 +100,15 @@ __FBSDID("$FreeBSD$");
 #define	DEVFN(b, s, f)	((b << 16) | (s << 8) | f)
 
 struct fsl_pcib_softc {
+	struct ofw_pci_softc pci_sc;
 	device_t	sc_dev;
 
-	struct rman	sc_iomem;
-	bus_addr_t	sc_iomem_va;		/* Virtual mapping. */
-	bus_addr_t	sc_iomem_size;
-	bus_addr_t	sc_iomem_alloc;		/* Next allocation. */
 	int		sc_iomem_target;
-	struct rman	sc_ioport;
-	bus_addr_t	sc_ioport_va;		/* Virtual mapping. */
-	bus_addr_t	sc_ioport_size;
-	bus_addr_t	sc_ioport_alloc;	/* Next allocation. */
+	bus_addr_t	sc_iomem_alloc, sc_iomem_start, sc_iomem_end;
 	int		sc_ioport_target;
+	bus_addr_t	sc_ioport_alloc, sc_ioport_start, sc_ioport_end;
 
-	struct resource	*sc_res;
+	struct resource *sc_res;
 	bus_space_handle_t sc_bsh;
 	bus_space_tag_t	sc_bst;
 	int		sc_rid;
@@ -123,8 +120,6 @@ struct fsl_pcib_softc {
 	/* Devices that need special attention. */
 	int		sc_devfn_tundra;
 	int		sc_devfn_via_ide;
-
-	struct fdt_pci_intr	sc_intr_info;
 };
 
 /* Local forward declerations. */
@@ -137,9 +132,6 @@ static void fsl_pcib_err_init(device_t);
 static void fsl_pcib_inbound(struct fsl_pcib_softc *, int, int, u_long,
     u_long, u_long);
 static int fsl_pcib_init(struct fsl_pcib_softc *, int, int);
-static int fsl_pcib_intr_info(phandle_t, struct fsl_pcib_softc *);
-static int fsl_pcib_set_range(struct fsl_pcib_softc *, int, int, u_long,
-    u_long);
 static void fsl_pcib_outbound(struct fsl_pcib_softc *, int, int, u_long,
     u_long, u_long);
 
@@ -148,13 +140,6 @@ static int fsl_pcib_attach(device_t);
 static int fsl_pcib_detach(device_t);
 static int fsl_pcib_probe(device_t);
 
-static struct resource *fsl_pcib_alloc_resource(device_t, device_t, int, int *,
-    u_long, u_long, u_long, u_int);
-static int fsl_pcib_read_ivar(device_t, device_t, int, uintptr_t *);
-static int fsl_pcib_release_resource(device_t, device_t, int, int,
-    struct resource *);
-static int fsl_pcib_write_ivar(device_t, device_t, int, uintptr_t);
-
 static int fsl_pcib_maxslots(device_t);
 static uint32_t fsl_pcib_read_config(device_t, u_int, u_int, u_int, u_int, int);
 static void fsl_pcib_write_config(device_t, u_int, u_int, u_int, u_int,
@@ -173,53 +158,31 @@ static device_method_t fsl_pcib_methods[] = {
 	DEVMETHOD(device_attach,	fsl_pcib_attach),
 	DEVMETHOD(device_detach,	fsl_pcib_detach),
 
-	/* Bus interface */
-	DEVMETHOD(bus_read_ivar,	fsl_pcib_read_ivar),
-	DEVMETHOD(bus_write_ivar,	fsl_pcib_write_ivar),
-	DEVMETHOD(bus_alloc_resource,	fsl_pcib_alloc_resource),
-	DEVMETHOD(bus_release_resource,	fsl_pcib_release_resource),
-	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
-	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
-	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
-
 	/* pcib interface */
 	DEVMETHOD(pcib_maxslots,	fsl_pcib_maxslots),
 	DEVMETHOD(pcib_read_config,	fsl_pcib_read_config),
 	DEVMETHOD(pcib_write_config,	fsl_pcib_write_config),
-	DEVMETHOD(pcib_route_interrupt,	pcib_route_interrupt),
-
-	/* OFW bus interface */
-	DEVMETHOD(ofw_bus_get_compat,   ofw_bus_gen_get_compat),
-	DEVMETHOD(ofw_bus_get_model,    ofw_bus_gen_get_model),
-	DEVMETHOD(ofw_bus_get_name,     ofw_bus_gen_get_name),
-	DEVMETHOD(ofw_bus_get_node,     ofw_bus_gen_get_node),
-	DEVMETHOD(ofw_bus_get_type,     ofw_bus_gen_get_type),
 
 	DEVMETHOD_END
 };
 
-static driver_t fsl_pcib_driver = {
-	"pcib",
-	fsl_pcib_methods,
-	sizeof(struct fsl_pcib_softc),
-};
+static devclass_t fsl_pcib_devclass;
 
-devclass_t pcib_devclass;
-
-DRIVER_MODULE(pcib, fdtbus, fsl_pcib_driver, pcib_devclass, 0, 0);
+DEFINE_CLASS_1(pcib, fsl_pcib_driver, fsl_pcib_methods,
+    sizeof(struct fsl_pcib_softc), ofw_pci_driver);
+DRIVER_MODULE(pcib, nexus, fsl_pcib_driver, fsl_pcib_devclass, 0, 0);
 
 static int
 fsl_pcib_probe(device_t dev)
 {
-	phandle_t node;
 
-	node = ofw_bus_get_node(dev);
-	if (!fdt_is_type(node, "pci"))
+	if (ofw_bus_get_type(dev) == NULL ||
+	    strcmp(ofw_bus_get_type(dev), "pci") != 0)
 		return (ENXIO);
 
-	if (!(fdt_is_compatible(node, "fsl,mpc8540-pci") ||
-	    fdt_is_compatible(node, "fsl,mpc8548-pcie")))
+	if (!(ofw_bus_is_compatible(dev, "fsl,mpc8540-pci") ||
+	    ofw_bus_is_compatible(dev, "fsl,mpc8540-pcie") ||
+	    ofw_bus_is_compatible(dev, "fsl,mpc8548-pcie")))
 		return (ENXIO);
 
 	device_set_desc(dev, "Freescale Integrated PCI/PCI-E Controller");
@@ -232,7 +195,7 @@ fsl_pcib_attach(device_t dev)
 	struct fsl_pcib_softc *sc;
 	phandle_t node;
 	uint32_t cfgreg;
-	int maxslot;
+	int maxslot, error;
 	uint8_t ltssm, capptr;
 
 	sc = device_get_softc(dev);
@@ -273,13 +236,14 @@ fsl_pcib_attach(device_t dev)
 	}
 
 	node = ofw_bus_get_node(dev);
+
 	/*
-	 * Get PCI interrupt info.
+	 * Initialize generic OF PCI interface (ranges, etc.)
 	 */
-	if (fsl_pcib_intr_info(node, sc) != 0) {
-		device_printf(dev, "could not retrieve interrupt info\n");
-		goto err;
-	}
+
+	error = ofw_pci_init(dev);
+	if (error)
+		return (error);
 
 	/*
 	 * Configure decode windows for PCI(E) access.
@@ -315,11 +279,9 @@ fsl_pcib_attach(device_t dev)
 
 	fsl_pcib_err_init(dev);
 
-	device_add_child(dev, "pci", -1);
-	return (bus_generic_attach(dev));
+	return (ofw_pci_attach(dev));
 
 err:
-	bus_release_resource(dev, SYS_RES_MEMORY, sc->sc_rid, sc->sc_res);
 	return (ENXIO);
 }
 
@@ -542,37 +504,6 @@ fsl_pcib_init_bar(struct fsl_pcib_softc *sc, int bus, int slot, int func,
 	return (width);
 }
 
-static u_int
-fsl_pcib_route_int(struct fsl_pcib_softc *sc, u_int bus, u_int slot, u_int func,
-    u_int intpin)
-{
-	int err, unit;
-	u_int devfn, intline;
-
-	unit = device_get_unit(sc->sc_dev);
-
-	devfn = DEVFN(bus, slot, func);
-	if (devfn == sc->sc_devfn_via_ide)
-		intline = MAP_IRQ(0, 14);
-	else if (devfn == sc->sc_devfn_via_ide + 1)
-		intline = MAP_IRQ(0, 10);
-	else if (devfn == sc->sc_devfn_via_ide + 2)
-		intline = MAP_IRQ(0, 10);
-	else {
-		if (intpin != 0)
-			err = fdt_pci_route_intr(bus, slot, func, intpin,
-			    &sc->sc_intr_info, &intline);
-		else
-			intline = 0xff;
-	}
-
-	if (bootverbose)
-		printf("PCI %u:%u:%u:%u: intpin %u: intline=%u\n",
-		    unit, bus, slot, func, intpin, intline);
-
-	return (intline);
-}
-
 static int
 fsl_pcib_init(struct fsl_pcib_softc *sc, int bus, int maxslot)
 {
@@ -583,7 +514,6 @@ fsl_pcib_init(struct fsl_pcib_softc *sc, int bus, int maxslot)
 	int bar, maxbar;
 	uint16_t vendor, device;
 	uint8_t command, hdrtype, class, subclass;
-	uint8_t intline, intpin;
 
 	secbus = bus;
 	for (slot = 0; slot <= maxslot; slot++) {
@@ -624,13 +554,9 @@ fsl_pcib_init(struct fsl_pcib_softc *sc, int bus, int maxslot)
 				bar += fsl_pcib_init_bar(sc, bus, slot, func,
 				    bar);
 
-			/* Perform interrupt routing. */
-			intpin = fsl_pcib_read_config(sc->sc_dev, bus, slot,
-			    func, PCIR_INTPIN, 1);
-			intline = fsl_pcib_route_int(sc, bus, slot, func,
-			    intpin);
+			/* Put a placeholder interrupt value */
 			fsl_pcib_write_config(sc->sc_dev, bus, slot, func,
-			    PCIR_INTLINE, intline, 1);
+			    PCIR_INTLINE, PCI_INVALID_IRQ, 1);
 
 			command |= PCIM_CMD_MEMEN | PCIM_CMD_PORTEN;
 			fsl_pcib_write_config(sc->sc_dev, bus, slot, func,
@@ -654,19 +580,19 @@ fsl_pcib_init(struct fsl_pcib_softc *sc, int bus, int maxslot)
 
 			/* Program I/O decoder. */
 			fsl_pcib_write_config(sc->sc_dev, bus, slot, func,
-			    PCIR_IOBASEL_1, sc->sc_ioport.rm_start >> 8, 1);
+			    PCIR_IOBASEL_1, sc->sc_ioport_start >> 8, 1);
 			fsl_pcib_write_config(sc->sc_dev, bus, slot, func,
-			    PCIR_IOLIMITL_1, sc->sc_ioport.rm_end >> 8, 1);
+			    PCIR_IOLIMITL_1, sc->sc_ioport_end >> 8, 1);
 			fsl_pcib_write_config(sc->sc_dev, bus, slot, func,
-			    PCIR_IOBASEH_1, sc->sc_ioport.rm_start >> 16, 2);
+			    PCIR_IOBASEH_1, sc->sc_ioport_start >> 16, 2);
 			fsl_pcib_write_config(sc->sc_dev, bus, slot, func,
-			    PCIR_IOLIMITH_1, sc->sc_ioport.rm_end >> 16, 2);
+			    PCIR_IOLIMITH_1, sc->sc_ioport_end >> 16, 2);
 
 			/* Program (non-prefetchable) memory decoder. */
 			fsl_pcib_write_config(sc->sc_dev, bus, slot, func,
-			    PCIR_MEMBASE_1, sc->sc_iomem.rm_start >> 16, 2);
+			    PCIR_MEMBASE_1, sc->sc_iomem_start >> 16, 2);
 			fsl_pcib_write_config(sc->sc_dev, bus, slot, func,
-			    PCIR_MEMLIMIT_1, sc->sc_iomem.rm_end >> 16, 2);
+			    PCIR_MEMLIMIT_1, sc->sc_iomem_end >> 16, 2);
 
 			/* Program prefetchable memory decoder. */
 			fsl_pcib_write_config(sc->sc_dev, bus, slot, func,
@@ -769,62 +695,6 @@ fsl_pcib_outbound(struct fsl_pcib_softc *sc, int wnd, int res, u_long start,
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh, REG_POWAR(wnd), attr);
 }
 
-static int
-fsl_pcib_set_range(struct fsl_pcib_softc *sc, int type, int wnd, u_long start,
-    u_long size)
-{
-	struct rman *rm;
-	u_long end, alloc;
-	bus_addr_t pci_start, pci_end;
-	bus_addr_t *vap, *allocp;
-	int error;
-
-	end = start + size - 1;
-
-	switch (type) {
-	case SYS_RES_IOPORT:
-		rm = &sc->sc_ioport;
-		pci_start = 0x0000;
-		pci_end = 0xffff;
-		alloc = 0x1000;
-		vap = &sc->sc_ioport_va;
-		allocp = &sc->sc_ioport_alloc;
-		break;
-	case SYS_RES_MEMORY:
-		rm = &sc->sc_iomem;
-		pci_start = start;
-		pci_end = end;
-		alloc = 0;
-		vap = &sc->sc_iomem_va;
-		allocp = &sc->sc_iomem_alloc;
-		break;
-	default:
-		return (EINVAL);
-	}
-
-	rm->rm_type = RMAN_ARRAY;
-	rm->rm_start = pci_start;
-	rm->rm_end = pci_end;
-	error = rman_init(rm);
-	if (error)
-		return (error);
-
-	error = rman_manage_region(rm, pci_start, pci_end);
-	if (error) {
-		rman_fini(rm);
-		return (error);
-	}
-
-	*allocp = pci_start + alloc;
-	if (size > 0) {
-		*vap = (uintptr_t)pmap_mapdev(start, size);
-		fsl_pcib_outbound(sc, wnd, type, start, size, pci_start);
-	} else {
-		*vap = 0;
-		fsl_pcib_outbound(sc, wnd, -1, 0, 0, 0);
-	}
-	return (0);
-}
 
 static void
 fsl_pcib_err_init(device_t dev)
@@ -880,106 +750,15 @@ fsl_pcib_detach(device_t dev)
 	return (bus_generic_detach(dev));
 }
 
-static struct resource *
-fsl_pcib_alloc_resource(device_t dev, device_t child, int type, int *rid,
-    u_long start, u_long end, u_long count, u_int flags)
-{
-	struct fsl_pcib_softc *sc = device_get_softc(dev);
-	struct rman *rm;
-	struct resource *res;
-	bus_addr_t va;
-
-	switch (type) {
-	case SYS_RES_IOPORT:
-		rm = &sc->sc_ioport;
-		va = sc->sc_ioport_va;
-		break;
-	case SYS_RES_MEMORY:
-		rm = &sc->sc_iomem;
-		va = sc->sc_iomem_va;
-		break;
-	case SYS_RES_IRQ:
-		if (start < 16) {
-			device_printf(dev, "%s requested ISA interrupt %lu\n",
-			    device_get_nameunit(child), start);
-		}
-		flags |= RF_SHAREABLE;
-		return (BUS_ALLOC_RESOURCE(device_get_parent(dev), child,
-		    type, rid, start, end, count, flags));
-	default:
-		return (NULL);
-	}
-
-	res = rman_reserve_resource(rm, start, end, count, flags, child);
-	if (res == NULL)
-		return (NULL);
-
-	rman_set_bustag(res, &bs_le_tag);
-	rman_set_bushandle(res, va + rman_get_start(res) - rm->rm_start);
-	return (res);
-}
-
-static int
-fsl_pcib_release_resource(device_t dev, device_t child, int type, int rid,
-    struct resource *res)
-{
-
-	return (rman_release_resource(res));
-}
-
-static int
-fsl_pcib_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
-{
-	struct fsl_pcib_softc *sc = device_get_softc(dev);
-
-	switch (which) {
-	case PCIB_IVAR_BUS:
-		*result = sc->sc_busnr;
-		return (0);
-	case PCIB_IVAR_DOMAIN:
-		*result = device_get_unit(dev);
-		return (0);
-	}
-	return (ENOENT);
-}
-
-static int
-fsl_pcib_write_ivar(device_t dev, device_t child, int which, uintptr_t value)
-{
-	struct fsl_pcib_softc *sc = device_get_softc(dev);
-
-	switch (which) {
-	case PCIB_IVAR_BUS:
-		sc->sc_busnr = value;
-		return (0);
-	}
-	return (ENOENT);
-}
-
-static int
-fsl_pcib_intr_info(phandle_t node, struct fsl_pcib_softc *sc)
-{
-	int error;
-
-	if ((error = fdt_pci_intr_info(node, &sc->sc_intr_info)) != 0)
-		return (error);
-
-	return (0);
-}
-
 static int
 fsl_pcib_decode_win(phandle_t node, struct fsl_pcib_softc *sc)
 {
-	struct fdt_pci_range io_space, mem_space;
 	device_t dev;
-	int error;
+	int error, i, trgt;
 
 	dev = sc->sc_dev;
 
-	if ((error = fdt_pci_ranges(node, &io_space, &mem_space)) != 0) {
-		device_printf(dev, "could not retrieve 'ranges' data\n");
-		return (error);
-	}
+	fsl_pcib_outbound(sc, 0, -1, 0, 0, 0);
 
 	/*
 	 * Configure LAW decode windows.
@@ -990,30 +769,52 @@ fsl_pcib_decode_win(phandle_t node, struct fsl_pcib_softc *sc)
 		device_printf(dev, "could not retrieve PCI LAW target info\n");
 		return (error);
 	}
-	error = law_enable(sc->sc_iomem_target, mem_space.base_parent,
-	    mem_space.len);
-	if (error != 0) {
-		device_printf(dev, "could not program LAW for PCI MEM range\n");
-		return (error);
-	}
-	error = law_enable(sc->sc_ioport_target, io_space.base_parent,
-	    io_space.len);
-	if (error != 0) {
-		device_printf(dev, "could not program LAW for PCI IO range\n");
-		return (error);
+
+	for (i = 0; i < sc->pci_sc.sc_nrange; i++) {
+		switch (sc->pci_sc.sc_range[i].pci_hi &
+		    OFW_PCI_PHYS_HI_SPACEMASK) {
+		case OFW_PCI_PHYS_HI_SPACE_CONFIG:
+			continue;
+		case OFW_PCI_PHYS_HI_SPACE_IO:
+			trgt = sc->sc_ioport_target;
+			fsl_pcib_outbound(sc, 2, SYS_RES_IOPORT,
+			    sc->pci_sc.sc_range[i].host,
+			    sc->pci_sc.sc_range[i].size,
+			    sc->pci_sc.sc_range[i].pci);
+			sc->sc_ioport_start = sc->pci_sc.sc_range[i].host;
+			sc->sc_ioport_end = sc->pci_sc.sc_range[i].host +
+			    sc->pci_sc.sc_range[i].size;
+			sc->sc_ioport_alloc = 0x1000 + sc->pci_sc.sc_range[i].pci;
+			break;
+		case OFW_PCI_PHYS_HI_SPACE_MEM32:
+		case OFW_PCI_PHYS_HI_SPACE_MEM64:
+			trgt = sc->sc_iomem_target;
+			fsl_pcib_outbound(sc, 1, SYS_RES_MEMORY,
+			    sc->pci_sc.sc_range[i].host,
+			    sc->pci_sc.sc_range[i].size,
+			    sc->pci_sc.sc_range[i].pci);
+			sc->sc_iomem_start = sc->pci_sc.sc_range[i].host;
+			sc->sc_iomem_end = sc->pci_sc.sc_range[i].host +
+			    sc->pci_sc.sc_range[i].size;
+			sc->sc_iomem_alloc = sc->pci_sc.sc_range[i].pci;
+			break;
+		default:
+			panic("Unknown range type %#x\n",
+			    sc->pci_sc.sc_range[i].pci_hi &
+			    OFW_PCI_PHYS_HI_SPACEMASK);
+		}
+		error = law_enable(trgt, sc->pci_sc.sc_range[i].host,
+		    sc->pci_sc.sc_range[i].size);
+		if (error != 0) {
+			device_printf(dev, "could not program LAW for range "
+			    "%d\n", i);
+			return (error);
+		}
 	}
 
 	/*
 	 * Set outbout and inbound windows.
 	 */
-	fsl_pcib_outbound(sc, 0, -1, 0, 0, 0);
-	if ((error = fsl_pcib_set_range(sc, SYS_RES_MEMORY, 1,
-	    mem_space.base_parent, mem_space.len)) != 0)
-		return (error);
-	if ((error = fsl_pcib_set_range(sc, SYS_RES_IOPORT, 2,
-	    io_space.base_parent, io_space.len)) != 0)
-		return (error);
-
 	fsl_pcib_outbound(sc, 3, -1, 0, 0, 0);
 	fsl_pcib_outbound(sc, 4, -1, 0, 0, 0);
 
@@ -1024,3 +825,4 @@ fsl_pcib_decode_win(phandle_t node, struct fsl_pcib_softc *sc)
 
 	return (0);
 }
+
diff --git a/sys/powerpc/mpc85xx/platform_mpc85xx.c b/sys/powerpc/mpc85xx/platform_mpc85xx.c
new file mode 100644
index 00000000000..a7724cf05b7
--- /dev/null
+++ b/sys/powerpc/mpc85xx/platform_mpc85xx.c
@@ -0,0 +1,409 @@
+/*-
+ * Copyright (c) 2008-2012 Semihalf.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/pcpu.h>
+#include <sys/proc.h>
+#include <sys/smp.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/hid.h>
+#include <machine/platform.h>
+#include <machine/platformvar.h>
+#include <machine/smp.h>
+#include <machine/spr.h>
+#include <machine/vmparam.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/ofw/openfirm.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <powerpc/mpc85xx/mpc85xx.h>
+
+#include "platform_if.h"
+
+#ifdef SMP
+extern void *ap_pcpu;
+extern vm_paddr_t kernload;		/* Kernel physical load address */
+extern uint8_t __boot_page[];		/* Boot page body */
+extern uint32_t bp_ntlb1s;
+extern uint32_t bp_tlb1[];
+extern uint32_t bp_tlb1_end[];
+#endif
+
+extern uint32_t *bootinfo;
+vm_offset_t ccsrbar_va;
+
+static int cpu, maxcpu;
+
+static int mpc85xx_probe(platform_t);
+static int mpc85xx_attach(platform_t);
+static void mpc85xx_mem_regions(platform_t, struct mem_region *phys,
+    int *physsz, struct mem_region *avail, int *availsz);
+static u_long mpc85xx_timebase_freq(platform_t, struct cpuref *cpuref);
+static int mpc85xx_smp_first_cpu(platform_t, struct cpuref *cpuref);
+static int mpc85xx_smp_next_cpu(platform_t, struct cpuref *cpuref);
+static int mpc85xx_smp_get_bsp(platform_t, struct cpuref *cpuref);
+static int mpc85xx_smp_start_cpu(platform_t, struct pcpu *cpu);
+
+static void mpc85xx_reset(platform_t);
+
+static platform_method_t mpc85xx_methods[] = {
+	PLATFORMMETHOD(platform_probe,		mpc85xx_probe),
+	PLATFORMMETHOD(platform_attach,		mpc85xx_attach),
+	PLATFORMMETHOD(platform_mem_regions,	mpc85xx_mem_regions),
+	PLATFORMMETHOD(platform_timebase_freq,	mpc85xx_timebase_freq),
+
+	PLATFORMMETHOD(platform_smp_first_cpu,	mpc85xx_smp_first_cpu),
+	PLATFORMMETHOD(platform_smp_next_cpu,	mpc85xx_smp_next_cpu),
+	PLATFORMMETHOD(platform_smp_get_bsp,	mpc85xx_smp_get_bsp),
+	PLATFORMMETHOD(platform_smp_start_cpu,	mpc85xx_smp_start_cpu),
+
+	PLATFORMMETHOD(platform_reset,		mpc85xx_reset),
+
+	PLATFORMMETHOD_END
+};
+
+static platform_def_t mpc85xx_platform = {
+	"mpc85xx",
+	mpc85xx_methods,
+	0
+};
+
+PLATFORM_DEF(mpc85xx_platform);
+
+static int
+mpc85xx_probe(platform_t plat)
+{
+	u_int pvr = mfpvr() >> 16;
+
+	if ((pvr & 0xfff0) == FSL_E500v1)
+		return (BUS_PROBE_DEFAULT);
+
+	return (ENXIO);
+}
+
+static int
+mpc85xx_attach(platform_t plat)
+{
+	phandle_t cpus, child, ccsr;
+	const char *soc_name_guesses[] = {"/soc", "soc", NULL};
+	const char **name;
+	pcell_t ranges[6], acells, pacells, scells;
+	uint32_t sr;
+	uint64_t ccsrbar, ccsrsize;
+	int i, law_max, tgt;
+
+	if ((cpus = OF_finddevice("/cpus")) != -1) {
+		for (maxcpu = 0, child = OF_child(cpus); child != 0;
+		    child = OF_peer(child), maxcpu++)
+			;
+	} else
+		maxcpu = 1;
+
+	/*
+	 * Locate CCSR region. Irritatingly, there is no way to find it
+	 * unless you already know where it is. Try to infer its location
+	 * from the device tree.
+	 */
+
+	ccsr = -1;
+	for (name = soc_name_guesses; *name != NULL && ccsr == -1; name++)
+		ccsr = OF_finddevice(*name);
+	if (ccsr == -1) {
+		char type[64];
+
+	 	/* That didn't work. Search for devices of type "soc" */
+		child = OF_child(OF_peer(0));
+		for (OF_child(child); child != 0; child = OF_peer(child)) {
+			if (OF_getprop(child, "device_type", type, sizeof(type))
+			    <= 0)
+				continue;
+
+			if (strcmp(type, "soc") == 0) {
+				ccsr = child;
+				break;
+			}
+		}
+	}
+
+	if (ccsr == -1)
+		panic("Could not locate CCSR window!");
+
+	OF_getprop(ccsr, "#size-cells", &scells, sizeof(scells));
+	OF_getprop(ccsr, "#address-cells", &acells, sizeof(acells));
+	OF_searchprop(OF_parent(ccsr), "#address-cells", &pacells,
+	    sizeof(pacells));
+	OF_getprop(ccsr, "ranges", ranges, sizeof(ranges));
+	ccsrbar = ccsrsize = 0;
+	for (i = acells; i < acells + pacells; i++) {
+		ccsrbar <<= 32;
+		ccsrbar |= ranges[i];
+	}
+	for (i = acells + pacells; i < acells + pacells + scells; i++) {
+		ccsrsize <<= 32;
+		ccsrsize |= ranges[i];
+	}
+	ccsrbar_va = pmap_early_io_map(ccsrbar, ccsrsize);
+
+	/*
+	 * Clear local access windows. Skip DRAM entries, so we don't shoot
+	 * ourselves in the foot.
+	 */
+	law_max = law_getmax();
+	for (i = 0; i < law_max; i++) {
+		sr = ccsr_read4(OCP85XX_LAWSR(i));
+		if ((sr & 0x80000000) == 0)
+			continue;
+		tgt = (sr & 0x01f00000) >> 20;
+		if (tgt == OCP85XX_TGTIF_RAM1 || tgt == OCP85XX_TGTIF_RAM2 ||
+		    tgt == OCP85XX_TGTIF_RAM_INTL)
+			continue;
+
+		ccsr_write4(OCP85XX_LAWSR(i), sr & 0x7fffffff);
+	}
+
+	return (0);
+}
+
+void
+mpc85xx_mem_regions(platform_t plat, struct mem_region *phys, int *physsz,
+    struct mem_region *avail, int *availsz)
+{
+
+	ofw_mem_regions(phys, physsz, avail, availsz);
+}
+
+static u_long
+mpc85xx_timebase_freq(platform_t plat, struct cpuref *cpuref)
+{
+	u_long ticks;
+	phandle_t cpus, child;
+	pcell_t freq;
+
+	if (bootinfo != NULL) {
+		if (bootinfo[0] == 1) {
+			/* Backward compatibility. See 8-STABLE. */
+			ticks = bootinfo[3] >> 3;
+		} else {
+			/* Compatibility with Juniper's loader. */
+			ticks = bootinfo[5] >> 3;
+		}
+	} else
+		ticks = 0;
+
+	if ((cpus = OF_finddevice("/cpus")) == -1)
+		goto out;
+
+	if ((child = OF_child(cpus)) == 0)
+		goto out;
+
+	switch (OF_getproplen(child, "timebase-frequency")) {
+	case 4:
+	{
+		uint32_t tbase;
+		OF_getprop(child, "timebase-frequency", &tbase, sizeof(tbase));
+		ticks = tbase;
+		return (ticks);
+	}
+	case 8:
+	{
+		uint64_t tbase;
+		OF_getprop(child, "timebase-frequency", &tbase, sizeof(tbase));
+		ticks = tbase;
+		return (ticks);
+	}
+	default:
+		break;
+	}
+
+	freq = 0;
+	if (OF_getprop(child, "bus-frequency", (void *)&freq,
+	    sizeof(freq)) <= 0)
+		goto out;
+
+	/*
+	 * Time Base and Decrementer are updated every 8 CCB bus clocks.
+	 * HID0[SEL_TBCLK] = 0
+	 */
+	if (freq != 0)
+		ticks = freq / 8;
+
+out:
+	if (ticks <= 0)
+		panic("Unable to determine timebase frequency!");
+
+	return (ticks);
+}
+
+static int
+mpc85xx_smp_first_cpu(platform_t plat, struct cpuref *cpuref)
+{
+
+	cpu = 0;
+	cpuref->cr_cpuid = cpu;
+	cpuref->cr_hwref = cpuref->cr_cpuid;
+	if (bootverbose)
+		printf("powerpc_smp_first_cpu: cpuid %d\n", cpuref->cr_cpuid);
+	cpu++;
+
+	return (0);
+}
+
+static int
+mpc85xx_smp_next_cpu(platform_t plat, struct cpuref *cpuref)
+{
+
+	if (cpu >= maxcpu)
+		return (ENOENT);
+
+	cpuref->cr_cpuid = cpu++;
+	cpuref->cr_hwref = cpuref->cr_cpuid;
+	if (bootverbose)
+		printf("powerpc_smp_next_cpu: cpuid %d\n", cpuref->cr_cpuid);
+
+	return (0);
+}
+
+static int
+mpc85xx_smp_get_bsp(platform_t plat, struct cpuref *cpuref)
+{
+
+	cpuref->cr_cpuid = mfspr(SPR_PIR);
+	cpuref->cr_hwref = cpuref->cr_cpuid;
+
+	return (0);
+}
+
+static int
+mpc85xx_smp_start_cpu(platform_t plat, struct pcpu *pc)
+{
+#ifdef SMP
+	uint32_t *tlb1;
+	uint32_t bptr, eebpcr;
+	int i, timeout;
+
+	eebpcr = ccsr_read4(OCP85XX_EEBPCR);
+	if ((eebpcr & (1 << (pc->pc_cpuid + 24))) != 0) {
+		printf("SMP: CPU %d already out of hold-off state!\n",
+		    pc->pc_cpuid);
+		return (ENXIO);
+	}
+
+	ap_pcpu = pc;
+
+	i = 0;
+	tlb1 = bp_tlb1;
+	while (i < bp_ntlb1s && tlb1 < bp_tlb1_end) {
+		mtspr(SPR_MAS0, MAS0_TLBSEL(1) | MAS0_ESEL(i));
+		__asm __volatile("isync; tlbre");
+		tlb1[0] = mfspr(SPR_MAS1);
+		tlb1[1] = mfspr(SPR_MAS2);
+		tlb1[2] = mfspr(SPR_MAS3);
+		i++;
+		tlb1 += 3;
+	}
+	if (i < bp_ntlb1s)
+		bp_ntlb1s = i;
+
+	/*
+	 * Set BPTR to the physical address of the boot page
+	 */
+	bptr = ((uint32_t)__boot_page - KERNBASE) + kernload;
+	KASSERT((bptr & 0xfff) == 0,
+	    ("%s: boot page is not aligned (%#x)", __func__, bptr));
+	bptr = (bptr >> 12) | 0x80000000u;
+	ccsr_write4(OCP85XX_BPTR, bptr);
+	__asm __volatile("isync; msync");
+
+	/* Flush caches to have our changes hit DRAM. */
+	cpu_flush_dcache(__boot_page, 4096);
+
+	/*
+	 * Release AP from hold-off state
+	 */
+	eebpcr |= (1 << (pc->pc_cpuid + 24));
+	ccsr_write4(OCP85XX_EEBPCR, eebpcr);
+	__asm __volatile("isync; msync");
+
+	timeout = 500;
+	while (!pc->pc_awake && timeout--)
+		DELAY(1000);	/* wait 1ms */
+
+	/*
+	 * Disable boot page translation so that the 4K page at the default
+	 * address (= 0xfffff000) isn't permanently remapped and thus not
+	 * usable otherwise.
+	 */
+	ccsr_write4(OCP85XX_BPTR, 0);
+	__asm __volatile("isync; msync");
+
+	if (!pc->pc_awake)
+		printf("SMP: CPU %d didn't wake up.\n", pc->pc_cpuid);
+	return ((pc->pc_awake) ? 0 : EBUSY);
+#else
+	/* No SMP support */
+	return (ENXIO);
+#endif
+}
+
+static void
+mpc85xx_reset(platform_t plat)
+{
+
+	/*
+	 * Try the dedicated reset register first.
+	 * If the SoC doesn't have one, we'll fall
+	 * back to using the debug control register.
+	 */
+	ccsr_write4(OCP85XX_RSTCR, 2);
+
+	/* Clear DBCR0, disables debug interrupts and events. */
+	mtspr(SPR_DBCR0, 0);
+	__asm __volatile("isync");
+
+	/* Enable Debug Interrupts in MSR. */
+	mtmsr(mfmsr() | PSL_DE);
+
+	/* Enable debug interrupts and issue reset. */
+	mtspr(SPR_DBCR0, mfspr(SPR_DBCR0) | DBCR0_IDM | DBCR0_RST_SYSTEM);
+
+	printf("Reset failed...\n");
+	while (1)
+		;
+}
+
diff --git a/sys/powerpc/ofw/ofw_machdep.c b/sys/powerpc/ofw/ofw_machdep.c
index 92470f0ac1c..fdcf68f974d 100644
--- a/sys/powerpc/ofw/ofw_machdep.c
+++ b/sys/powerpc/ofw/ofw_machdep.c
@@ -59,18 +59,38 @@ __FBSDID("$FreeBSD$");
 #include <machine/md_var.h>
 #include <machine/platform.h>
 #include <machine/ofw_machdep.h>
+#include <machine/trap.h>
 
-static struct mem_region OFmem[PHYS_AVAIL_SZ], OFavail[PHYS_AVAIL_SZ];
-static struct mem_region OFfree[PHYS_AVAIL_SZ];
-
+#ifdef AIM
 extern register_t ofmsr[5];
 extern void	*openfirmware_entry;
 static void	*fdt;
 int		ofw_real_mode;
+extern char     save_trap_init[0x2f00];          /* EXC_LAST */
+char            save_trap_of[0x2f00];            /* EXC_LAST */
 
 int		ofwcall(void *);
 static int	openfirmware(void *args);
 
+__inline void
+ofw_save_trap_vec(char *save_trap_vec)
+{
+	if (!ofw_real_mode)
+                return;
+
+	bcopy((void *)EXC_RST, save_trap_vec, EXC_LAST - EXC_RST);
+}
+
+static __inline void
+ofw_restore_trap_vec(char *restore_trap_vec)
+{
+	if (!ofw_real_mode)
+                return;
+
+	bcopy(restore_trap_vec, (void *)EXC_RST, EXC_LAST - EXC_RST);
+	__syncicache(EXC_RSVD, EXC_LAST - EXC_RSVD);
+}
+
 /*
  * Saved SPRG0-3 from OpenFirmware. Will be restored prior to the callback.
  */
@@ -79,6 +99,9 @@ register_t	ofw_sprg0_save;
 static __inline void
 ofw_sprg_prepare(void)
 {
+	if (ofw_real_mode)
+		return;
+	
 	/*
 	 * Assume that interrupt are disabled at this point, or
 	 * SPRG1-3 could be trashed
@@ -98,6 +121,9 @@ ofw_sprg_prepare(void)
 static __inline void
 ofw_sprg_restore(void)
 {
+	if (ofw_real_mode)
+		return;
+	
 	/*
 	 * Note that SPRG1-3 contents are irrelevant. They are scratch
 	 * registers used in the early portion of trap handling when
@@ -107,50 +133,7 @@ ofw_sprg_restore(void)
 	 */
 	__asm __volatile("mtsprg0 %0" :: "r"(ofw_sprg0_save));
 }
-
-/*
- * Memory region utilities: determine if two regions overlap,
- * and merge two overlapping regions into one
- */
-static int
-memr_overlap(struct mem_region *r1, struct mem_region *r2)
-{
-	if ((r1->mr_start + r1->mr_size) < r2->mr_start ||
-	    (r2->mr_start + r2->mr_size) < r1->mr_start)
-		return (FALSE);
-	
-	return (TRUE);	
-}
-
-static void
-memr_merge(struct mem_region *from, struct mem_region *to)
-{
-	vm_offset_t end;
-	end = ulmax(to->mr_start + to->mr_size, from->mr_start + from->mr_size);
-	to->mr_start = ulmin(from->mr_start, to->mr_start);
-	to->mr_size = end - to->mr_start;
-}
-
-/*
- * Quick sort callout for comparing memory regions.
- */
-static int	mr_cmp(const void *a, const void *b);
-
-static int
-mr_cmp(const void *a, const void *b)
-{
-	const struct	mem_region *regiona;
-	const struct	mem_region *regionb;
-
-	regiona = a;
-	regionb = b;
-	if (regiona->mr_start < regionb->mr_start)
-		return (-1);
-	else if (regiona->mr_start > regionb->mr_start)
-		return (1);
-	else
-		return (0);
-}
+#endif
 
 static int
 parse_ofw_memory(phandle_t node, const char *prop, struct mem_region *output)
@@ -176,19 +159,6 @@ parse_ofw_memory(phandle_t node, const char *prop, struct mem_region *output)
 	    sizeof(size_cells)) < (ssize_t)sizeof(size_cells))
 		size_cells = 1;
 
-	/*
-	 * On Apple hardware, address_cells is always 1 for "available",
-	 * even when it is explicitly set to 2. Then all memory above 4 GB
-	 * should be added by hand to the available list. Detect Apple hardware
-	 * by seeing if ofw_real_mode is set -- only Apple seems to use
-	 * virtual-mode OF.
-	 */
-	if (strcmp(prop, "available") == 0 && !ofw_real_mode)
-		apple_hack_mode = 1;
-	
-	if (apple_hack_mode)
-		address_cells = 1;
-
 	/*
 	 * Get memory.
 	 */
@@ -240,102 +210,9 @@ parse_ofw_memory(phandle_t node, const char *prop, struct mem_region *output)
 	}
 	sz = j*sizeof(output[0]);
 
-	#ifdef __powerpc64__
-	if (apple_hack_mode) {
-		/* Add in regions above 4 GB to the available list */
-		struct mem_region himem[16];
-		int hisz;
-
-		hisz = parse_ofw_memory(node, "reg", himem);
-		for (i = 0; i < hisz/sizeof(himem[0]); i++) {
-			if (himem[i].mr_start > BUS_SPACE_MAXADDR_32BIT) {
-				output[j].mr_start = himem[i].mr_start;
-				output[j].mr_size = himem[i].mr_size;
-				j++;
-			}
-		}
-		sz = j*sizeof(output[0]);
-	}
-	#endif
-
 	return (sz);
 }
 
-static int
-parse_drconf_memory(int *msz, int *asz, struct mem_region *ofmem,
-		    struct mem_region *ofavail)
-{
-	phandle_t phandle;
-	vm_offset_t base;
-	int i, idx, len, lasz, lmsz, res;
-	uint32_t lmb_size[2];
-	unsigned long *dmem, flags;
-
-	lmsz = *msz;
-	lasz = *asz;
-
-	phandle = OF_finddevice("/ibm,dynamic-reconfiguration-memory");
-	if (phandle == -1)
-		/* No drconf node, return. */
-		return (0);
-
-	res = OF_getprop(phandle, "ibm,lmb-size", lmb_size, sizeof(lmb_size));
-	if (res == -1)
-		return (0);
-
-	/* Parse the /ibm,dynamic-memory.
-	   The first position gives the # of entries. The next two words
- 	   reflect the address of the memory block. The next four words are
-	   the DRC index, reserved, list index and flags.
-	   (see PAPR C.6.6.2 ibm,dynamic-reconfiguration-memory)
-	   
-	    #el  Addr   DRC-idx  res   list-idx  flags
-	   -------------------------------------------------
-	   | 4 |   8   |   4   |   4   |   4   |   4   |....
-	   -------------------------------------------------
-	*/
-
-	len = OF_getproplen(phandle, "ibm,dynamic-memory");
-	if (len > 0) {
-
-		/* We have to use a variable length array on the stack
-		   since we have very limited stack space.
-		*/
-		cell_t arr[len/sizeof(cell_t)];
-
-		res = OF_getprop(phandle, "ibm,dynamic-memory", &arr,
-				 sizeof(arr));
-		if (res == -1)
-			return (0);
-
-		/* Number of elements */
-		idx = arr[0];
-
-		/* First address. */
-		dmem = (void*)&arr[1];
-	
-		for (i = 0; i < idx; i++) {
-			base = *dmem;
-			dmem += 2;
-			flags = *dmem;
-			/* Use region only if available and not reserved. */
-			if ((flags & 0x8) && !(flags & 0x80)) {
-				ofmem[lmsz].mr_start = base;
-				ofmem[lmsz].mr_size = (vm_size_t)lmb_size[1];
-				ofavail[lasz].mr_start = base;
-				ofavail[lasz].mr_size = (vm_size_t)lmb_size[1];
-				lmsz++;
-				lasz++;
-			}
-			dmem++;
-		}
-	}
-
-	*msz = lmsz;
-	*asz = lasz;
-
-	return (1);
-}
 /*
  * This is called during powerpc_init, before the system is really initialized.
  * It shall provide the total and the available regions of RAM.
@@ -344,14 +221,12 @@ parse_drconf_memory(int *msz, int *asz, struct mem_region *ofmem,
  * to provide space for two additional entry beyond the terminating one.
  */
 void
-ofw_mem_regions(struct mem_region **memp, int *memsz,
-		struct mem_region **availp, int *availsz)
+ofw_mem_regions(struct mem_region *memp, int *memsz,
+		struct mem_region *availp, int *availsz)
 {
 	phandle_t phandle;
-	vm_offset_t maxphysaddr;
-	int asz, msz, fsz;
-	int i, j, res;
-	int still_merging;
+	int asz, msz;
+	int res;
 	char name[31];
 
 	asz = msz = 0;
@@ -366,74 +241,21 @@ ofw_mem_regions(struct mem_region **memp, int *memsz,
 		if (strncmp(name, "memory", sizeof(name)) != 0)
 			continue;
 
-		res = parse_ofw_memory(phandle, "reg", &OFmem[msz]);
+		res = parse_ofw_memory(phandle, "reg", &memp[msz]);
 		msz += res/sizeof(struct mem_region);
 		if (OF_getproplen(phandle, "available") >= 0)
 			res = parse_ofw_memory(phandle, "available",
-			    &OFavail[asz]);
+			    &availp[asz]);
 		else
-			res = parse_ofw_memory(phandle, "reg", &OFavail[asz]);
+			res = parse_ofw_memory(phandle, "reg", &availp[asz]);
 		asz += res/sizeof(struct mem_region);
 	}
 
-	/* Check for memory in ibm,dynamic-reconfiguration-memory */
-	parse_drconf_memory(&msz, &asz, OFmem, OFavail);
-
-	qsort(OFmem, msz, sizeof(*OFmem), mr_cmp);
-	qsort(OFavail, asz, sizeof(*OFavail), mr_cmp);
-
-	*memp = OFmem;
 	*memsz = msz;
-
-	/*
-	 * On some firmwares (SLOF), some memory may be marked available that
-	 * doesn't actually exist. This manifests as an extension of the last
-	 * available segment past the end of physical memory, so truncate that
-	 * one.
-	 */
-	maxphysaddr = 0;
-	for (i = 0; i < msz; i++)
-		if (OFmem[i].mr_start + OFmem[i].mr_size > maxphysaddr)
-			maxphysaddr = OFmem[i].mr_start + OFmem[i].mr_size;
-
-	if (OFavail[asz - 1].mr_start + OFavail[asz - 1].mr_size > maxphysaddr)
-		OFavail[asz - 1].mr_size = maxphysaddr -
-		    OFavail[asz - 1].mr_start;
-
-	/*
-	 * OFavail may have overlapping regions - collapse these
-	 * and copy out remaining regions to OFfree
-	 */
-	do {
-		still_merging = FALSE;
-		for (i = 0; i < asz; i++) {
-			if (OFavail[i].mr_size == 0)
-				continue;
-			for (j = i+1; j < asz; j++) {
-				if (OFavail[j].mr_size == 0)
-					continue;
-				if (memr_overlap(&OFavail[j], &OFavail[i])) {
-					memr_merge(&OFavail[j], &OFavail[i]);
-					/* mark inactive */
-					OFavail[j].mr_size = 0;
-					still_merging = TRUE;
-				}
-			}
-		}
-	} while (still_merging == TRUE);
-
-	/* evict inactive ranges */
-	for (i = 0, fsz = 0; i < asz; i++) {
-		if (OFavail[i].mr_size != 0) {
-			OFfree[fsz] = OFavail[i];
-			fsz++;
-		}
-	}
-
-	*availp = OFfree;
-	*availsz = fsz;
+	*availsz = asz;
 }
 
+#ifdef AIM
 void
 OF_initial_setup(void *fdt_ptr, void *junk, int (*openfirm)(void *))
 {
@@ -515,6 +337,12 @@ openfirmware_core(void *args)
 
 	ofw_sprg_prepare();
 
+	/* Save trap vectors */
+	ofw_save_trap_vec(save_trap_of);
+
+	/* Restore initially saved trap vectors */
+	ofw_restore_trap_vec(save_trap_init);
+
 #if defined(AIM) && !defined(__powerpc64__)
 	/*
 	 * Clear battable[] translations
@@ -526,6 +354,10 @@ openfirmware_core(void *args)
 #endif
 
 	result = ofwcall(args);
+
+	/* Restore trap vecotrs */
+	ofw_restore_trap_vec(save_trap_of);
+
 	ofw_sprg_restore();
 
 	intr_restore(oldmsr);
@@ -602,6 +434,8 @@ OF_reboot()
 	for (;;);	/* just in case */
 }
 
+#endif /* AIM */
+
 void
 OF_getetheraddr(device_t dev, u_char *addr)
 {
@@ -622,7 +456,7 @@ OF_getetheraddr(device_t dev, u_char *addr)
 static void
 OF_get_addr_props(phandle_t node, uint32_t *addrp, uint32_t *sizep, int *pcip)
 {
-	char name[16];
+	char type[64];
 	uint32_t addr, size;
 	int pci, res;
 
@@ -634,10 +468,10 @@ OF_get_addr_props(phandle_t node, uint32_t *addrp, uint32_t *sizep, int *pcip)
 		size = 1;
 	pci = 0;
 	if (addr == 3 && size == 2) {
-		res = OF_getprop(node, "name", name, sizeof(name));
+		res = OF_getprop(node, "device_type", type, sizeof(type));
 		if (res != -1) {
-			name[sizeof(name) - 1] = '\0';
-			pci = (strcmp(name, "pci") == 0) ? 1 : 0;
+			type[sizeof(type) - 1] = '\0';
+			pci = (strcmp(type, "pci") == 0) ? 1 : 0;
 		}
 	}
 	if (addrp != NULL)
@@ -671,8 +505,13 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag,
 	if (tag == NULL || handle == NULL)
 		return (EINVAL);
 
+	/* Assume big-endian unless we find a PCI device */
+	*tag = &bs_be_tag;
+
 	/* Get the requested register. */
 	OF_get_addr_props(bridge, &naddr, &nsize, &pci);
+	if (pci)
+		*tag = &bs_le_tag;
 	res = OF_getprop(dev, (pci) ? "assigned-addresses" : "reg",
 	    cell, sizeof(cell));
 	if (res == -1)
@@ -700,6 +539,8 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag,
 	parent = OF_parent(bridge);
 	while (parent != 0) {
 		OF_get_addr_props(parent, &nbridge, NULL, &pcib);
+		if (pcib)
+			*tag = &bs_le_tag;
 		res = OF_getprop(bridge, "ranges", cell, sizeof(cell));
 		if (res == -1)
 			goto next;
@@ -740,7 +581,6 @@ OF_decode_addr(phandle_t dev, int regno, bus_space_tag_t *tag,
 		OF_get_addr_props(bridge, &naddr, &nsize, &pci);
 	}
 
-	*tag = &bs_le_tag;
 	return (bus_space_map(*tag, addr, size,
 	    prefetch ? BUS_SPACE_MAP_PREFETCHABLE : 0, handle));
 }
diff --git a/sys/powerpc/ofw/ofw_pci.c b/sys/powerpc/ofw/ofw_pci.c
index 46d483d62b4..957a8caed2f 100644
--- a/sys/powerpc/ofw/ofw_pci.c
+++ b/sys/powerpc/ofw/ofw_pci.c
@@ -124,7 +124,7 @@ static device_method_t	ofw_pci_methods[] = {
 DEFINE_CLASS_0(ofw_pci, ofw_pci_driver, ofw_pci_methods, 0);
 
 int
-ofw_pci_attach(device_t dev)
+ofw_pci_init(device_t dev)
 {
 	struct		ofw_pci_softc *sc;
 	phandle_t	node;
@@ -134,6 +134,7 @@ ofw_pci_attach(device_t dev)
 
 	node = ofw_bus_get_node(dev);
 	sc = device_get_softc(dev);
+	sc->sc_initialized = 1;
 
 	if (OF_getprop(node, "reg", &sc->sc_pcir, sizeof(sc->sc_pcir)) == -1)
 		return (ENXIO);
@@ -217,13 +218,28 @@ ofw_pci_attach(device_t dev)
 			    "error = %d\n", rp->pci_hi &
 			    OFW_PCI_PHYS_HI_SPACEMASK, rp->pci,
 			    rp->pci + rp->size - 1, error);
-			panic("AHOY");
 			return (error);
 		}
 	}
 
 	ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t));
 
+	return (error);
+}
+
+int
+ofw_pci_attach(device_t dev)
+{
+	struct ofw_pci_softc *sc;
+	int error;
+
+	sc = device_get_softc(dev);
+	if (!sc->sc_initialized) {
+		error = ofw_pci_init(dev);
+		if (error)
+			return (error);
+	}
+
 	device_add_child(dev, "pci", device_get_unit(dev));
 	return (bus_generic_attach(dev));
 }
@@ -246,10 +262,17 @@ ofw_pci_route_interrupt(device_t bus, device_t dev, int pin)
 
 	sc = device_get_softc(bus);
 	pintr = pin;
+
+	/* Fabricate imap information in case this isn't an OFW device */
+	bzero(&reg, sizeof(reg));
+	reg.phys_hi = (pci_get_bus(dev) << OFW_PCI_PHYS_HI_BUSSHIFT) |
+	    (pci_get_slot(dev) << OFW_PCI_PHYS_HI_DEVICESHIFT) |
+	    (pci_get_function(dev) << OFW_PCI_PHYS_HI_FUNCTIONSHIFT);
+
 	if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, &reg,
 	    sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr),
 	    &iparent, maskbuf))
-		return (MAP_IRQ(iparent, mintr));
+		return (ofw_bus_map_intr(dev, iparent, mintr));
 
 	/* Maybe it's a real interrupt, not an intpin */
 	if (pin > 4)
diff --git a/sys/powerpc/ofw/ofw_pci.h b/sys/powerpc/ofw/ofw_pci.h
index dd277e9a0e9..388aa125a62 100644
--- a/sys/powerpc/ofw/ofw_pci.h
+++ b/sys/powerpc/ofw/ofw_pci.h
@@ -52,6 +52,7 @@ struct ofw_pci_softc {
 	device_t		sc_dev;
 	phandle_t		sc_node;
 	int			sc_bus;
+	int			sc_initialized;
 
 	int			sc_quirks;
 
@@ -68,6 +69,7 @@ struct ofw_pci_softc {
 	struct ofw_bus_iinfo    sc_pci_iinfo;
 };
 
+int ofw_pci_init(device_t dev);
 int ofw_pci_attach(device_t dev);
 
 #endif // POWERPC_OFW_OFW_PCI_H
diff --git a/sys/powerpc/ofw/ofw_pcib_pci.c b/sys/powerpc/ofw/ofw_pcib_pci.c
index d6c4168a61f..6e3faeafb32 100644
--- a/sys/powerpc/ofw/ofw_pcib_pci.c
+++ b/sys/powerpc/ofw/ofw_pcib_pci.c
@@ -29,6 +29,7 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/module.h>
 #include <sys/bus.h>
 #include <sys/malloc.h>
@@ -141,6 +142,13 @@ ofw_pcib_pci_route_interrupt(device_t bridge, device_t dev, int intpin)
 	ii = &sc->ops_iinfo;
 	if (ii->opi_imapsz > 0) {
 		pintr = intpin;
+
+		/* Fabricate imap information if this isn't an OFW device */
+		bzero(&reg, sizeof(reg));
+		reg.phys_hi = (pci_get_bus(dev) << OFW_PCI_PHYS_HI_BUSSHIFT) |
+		    (pci_get_slot(dev) << OFW_PCI_PHYS_HI_DEVICESHIFT) |
+		    (pci_get_function(dev) << OFW_PCI_PHYS_HI_FUNCTIONSHIFT);
+
 		if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), ii, &reg,
 		    sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr),
 		    &iparent, maskbuf)) {
@@ -149,7 +157,7 @@ ofw_pcib_pci_route_interrupt(device_t bridge, device_t dev, int intpin)
 			 * it again on higher levels - that causes problems
 			 * in some cases, and never seems to be required.
 			 */
-			return (MAP_IRQ(iparent, mintr));
+			return (ofw_bus_map_intr(dev, iparent, mintr));
 		}
 	} else if (intpin >= 1 && intpin <= 4) {
 		/*
diff --git a/sys/powerpc/ofw/ofw_pcibus.c b/sys/powerpc/ofw/ofw_pcibus.c
index 744b7ac7237..f1063a1f41a 100644
--- a/sys/powerpc/ofw/ofw_pcibus.c
+++ b/sys/powerpc/ofw/ofw_pcibus.c
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pci_private.h>
 
+#include "ofw_pcibus.h"
 #include "pcib_if.h"
 #include "pci_if.h"
 
@@ -85,12 +86,7 @@ static device_method_t ofw_pcibus_methods[] = {
 	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
 	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
 
-	{ 0, 0 }
-};
-
-struct ofw_pcibus_devinfo {
-	struct pci_devinfo	opd_dinfo;
-	struct ofw_bus_devinfo	opd_obdinfo;
+	DEVMETHOD_END
 };
 
 static devclass_t pci_devclass;
@@ -195,6 +191,7 @@ ofw_pcibus_enum_devtree(device_t dev, u_int domain, u_int busno)
 			pci_freecfg((struct pci_devinfo *)dinfo);
 			continue;
 		}
+		dinfo->opd_dma_tag = NULL;
 		pci_add_child(dev, (struct pci_devinfo *)dinfo);
 
 		/*
@@ -218,15 +215,13 @@ ofw_pcibus_enum_devtree(device_t dev, u_int domain, u_int busno)
 					OF_getprop(OF_xref_phandle(iparent),
 					    "#interrupt-cells", &icells,
 					    sizeof(icells));
-					intr[0] = MAP_IRQ(iparent, intr[0]);
+					intr[0] = ofw_bus_map_intr(dev, iparent,
+					    intr[0]);
 				}
 
-				if (iparent != 0 && icells > 1) {
-					powerpc_config_intr(intr[0],
-					    (intr[1] & 1) ? INTR_TRIGGER_LEVEL :
-					    INTR_TRIGGER_EDGE,
-					    INTR_POLARITY_LOW);
-				}
+				if (iparent != 0 && icells > 1)
+					ofw_bus_config_intr(dev, intr[0],
+					    intr[1]);
 
 				resource_list_add(&dinfo->opd_dinfo.resources,
 				    SYS_RES_IRQ, 0, intr[0], intr[0], 1);
@@ -274,6 +269,7 @@ ofw_pcibus_enum_bus(device_t dev, u_int domain, u_int busno)
 			if (dinfo == NULL)
 				continue;
 
+			dinfo->opd_dma_tag = NULL;
 			dinfo->opd_obdinfo.obd_node = -1;
 
 			dinfo->opd_obdinfo.obd_name = NULL;
@@ -322,20 +318,9 @@ ofw_pcibus_assign_interrupt(device_t dev, device_t child)
 	if (node == -1) {
 		/* Non-firmware enumerated child, use standard routing */
 	
-		/*
-		 * XXX: Right now we don't have anything sensible to do here,
-		 * since the ofw_imap stuff relies on nodes having a reg
-		 * property. There exist ways around this, so the ePAPR
-		 * spec will need to be studied.
-		 */
-
-		return (PCI_INVALID_IRQ);
-
-#ifdef NOTYET
 		intr = pci_get_intpin(child);
 		return (PCIB_ROUTE_INTERRUPT(device_get_parent(dev), child, 
 		    intr));
-#endif
 	}
 	
 	/*
@@ -354,12 +339,13 @@ ofw_pcibus_assign_interrupt(device_t dev, device_t child)
 
 	isz = OF_getprop(node, "AAPL,interrupts", &intr, sizeof(intr));
 	if (isz == sizeof(intr))
-		return ((iparent == -1) ? intr : MAP_IRQ(iparent, intr));
+		return ((iparent == -1) ? intr : ofw_bus_map_intr(dev, iparent,
+		    intr));
 
 	isz = OF_getprop(node, "interrupts", &intr, sizeof(intr));
 	if (isz == sizeof(intr)) {
 		if (iparent != -1)
-			intr = MAP_IRQ(iparent, intr);
+			intr = ofw_bus_map_intr(dev, iparent, intr);
 	} else {
 		/* No property: our best guess is the intpin. */
 		intr = pci_get_intpin(child);
diff --git a/sys/powerpc/ofw/ofw_pcibus.h b/sys/powerpc/ofw/ofw_pcibus.h
new file mode 100644
index 00000000000..c7b82d7ebdd
--- /dev/null
+++ b/sys/powerpc/ofw/ofw_pcibus.h
@@ -0,0 +1,51 @@
+/*-
+ * Copyright (c) 2011 Nathan Whitehorn
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 POWERPC_OFW_OFW_PCIBUS_H
+#define POWERPC_OFW_OFW_PCIBUS_H
+
+#include <sys/bus.h>
+#include <sys/pciio.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_pci.h>
+#include <dev/pci/pcivar.h>
+
+/*
+ * Export class definition for inheritance purposes
+ */
+DECLARE_CLASS(ofw_pcibus_driver);	/* PCI Bus Enumerators */
+
+struct ofw_pcibus_devinfo {
+        struct pci_devinfo      opd_dinfo;
+        struct ofw_bus_devinfo  opd_obdinfo;
+	bus_dma_tag_t		opd_dma_tag;
+};
+
+#endif // POWERPC_OFW_OFW_PCIBUS_H
+
diff --git a/sys/powerpc/ofw/ofw_syscons.c b/sys/powerpc/ofw/ofw_syscons.c
index bee967258ae..a8797c2c16e 100644
--- a/sys/powerpc/ofw/ofw_syscons.c
+++ b/sys/powerpc/ofw/ofw_syscons.c
@@ -57,9 +57,12 @@ __FBSDID("$FreeBSD$");
 #include <powerpc/ofw/ofw_syscons.h>
 
 static int ofwfb_ignore_mmap_checks = 1;
+static int ofwfb_reset_on_switch = 1;
 static SYSCTL_NODE(_hw, OID_AUTO, ofwfb, CTLFLAG_RD, 0, "ofwfb");
 SYSCTL_INT(_hw_ofwfb, OID_AUTO, relax_mmap, CTLFLAG_RW,
     &ofwfb_ignore_mmap_checks, 0, "relaxed mmap bounds checking");
+SYSCTL_INT(_hw_ofwfb, OID_AUTO, reset_on_mode_switch, CTLFLAG_RW,
+    &ofwfb_reset_on_switch, 0, "reset the framebuffer driver on mode switch");
 
 extern u_char dflt_font_16[];
 extern u_char dflt_font_14[];
@@ -447,26 +450,28 @@ ofwfb_set_mode(video_adapter_t *adp, int mode)
 
 	sc = (struct ofwfb_softc *)adp;
 
-	/*
-	 * Open the display device, which will initialize it.
-	 */
-
-	memset(name, 0, sizeof(name));
-	OF_package_to_path(sc->sc_node, name, sizeof(name));
-	ih = OF_open(name);
-
-	if (sc->sc_depth == 8) {
+	if (ofwfb_reset_on_switch) {
 		/*
-		 * Install the ISO6429 colormap - older OFW systems
-		 * don't do this by default
+		 * Open the display device, which will initialize it.
 		 */
-		for (i = 0; i < 16; i++) {
-			OF_call_method("color!", ih, 4, 1,
-				       ofwfb_cmap[i].red,
-				       ofwfb_cmap[i].green,
-				       ofwfb_cmap[i].blue,
-				       i,
-				       &retval);
+
+		memset(name, 0, sizeof(name));
+		OF_package_to_path(sc->sc_node, name, sizeof(name));
+		ih = OF_open(name);
+
+		if (sc->sc_depth == 8) {
+			/*
+			 * Install the ISO6429 colormap - older OFW systems
+			 * don't do this by default
+			 */
+			for (i = 0; i < 16; i++) {
+				OF_call_method("color!", ih, 4, 1,
+						   ofwfb_cmap[i].red,
+						   ofwfb_cmap[i].green,
+						   ofwfb_cmap[i].blue,
+						   i,
+						   &retval);
+			}
 		}
 	}
 
diff --git a/sys/powerpc/powermac/openpic_macio.c b/sys/powerpc/ofw/openpic_ofw.c
similarity index 56%
rename from sys/powerpc/powermac/openpic_macio.c
rename to sys/powerpc/ofw/openpic_ofw.c
index b40f9515977..0e85ddaa2ae 100644
--- a/sys/powerpc/powermac/openpic_macio.c
+++ b/sys/powerpc/ofw/openpic_ofw.c
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 
 #include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
 #include <dev/ofw/openfirm.h>
 
 #include <machine/bus.h>
@@ -55,15 +56,18 @@ __FBSDID("$FreeBSD$");
 #include "pic_if.h"
 
 /*
- * MacIO interface
+ * OFW interface
  */
-static int	openpic_macio_probe(device_t);
-static int	openpic_macio_attach(device_t);
+static int	openpic_ofw_probe(device_t);
+static int	openpic_ofw_attach(device_t);
 
-static device_method_t  openpic_macio_methods[] = {
+static void	openpic_ofw_translate_code(device_t, u_int irq, int code,
+		    enum intr_trigger *trig, enum intr_polarity *pol);
+
+static device_method_t  openpic_ofw_methods[] = {
 	/* Device interface */
-	DEVMETHOD(device_probe,		openpic_macio_probe),
-	DEVMETHOD(device_attach,	openpic_macio_attach),
+	DEVMETHOD(device_probe,		openpic_ofw_probe),
+	DEVMETHOD(device_attach,	openpic_ofw_attach),
 
 	/* PIC interface */
 	DEVMETHOD(pic_bind,		openpic_bind),
@@ -75,26 +79,37 @@ static device_method_t  openpic_macio_methods[] = {
 	DEVMETHOD(pic_mask,		openpic_mask),
 	DEVMETHOD(pic_unmask,		openpic_unmask),
 
-	{ 0, 0 },
+	DEVMETHOD(pic_translate_code,	openpic_ofw_translate_code),
+
+	DEVMETHOD_END
 };
 
-static driver_t openpic_macio_driver = {
+static driver_t openpic_ofw_driver = {
 	"openpic",
-	openpic_macio_methods,
+	openpic_ofw_methods,
 	sizeof(struct openpic_softc),
 };
 
-DRIVER_MODULE(openpic, macio, openpic_macio_driver, openpic_devclass, 0, 0);
+DRIVER_MODULE(openpic, nexus, openpic_ofw_driver, openpic_devclass, 0, 0);
+DRIVER_MODULE(openpic, simplebus, openpic_ofw_driver, openpic_devclass, 0, 0);
+DRIVER_MODULE(openpic, macio, openpic_ofw_driver, openpic_devclass, 0, 0);
 
 static int
-openpic_macio_probe(device_t dev)
+openpic_ofw_probe(device_t dev)
 {
 	const char *type = ofw_bus_get_type(dev);
 
-	if (strcmp(type, "open-pic") != 0)
+	if (type == NULL)
                 return (ENXIO);
 
-	/* On some U4 systems, there is a phantom MPIC in the mac-io cell */
+	if (!ofw_bus_is_compatible(dev, "chrp,open-pic") &&
+	    strcmp(type, "open-pic") != 0)
+                return (ENXIO);
+
+	/*
+	 * On some U4 systems, there is a phantom MPIC in the mac-io cell.
+	 * The uninorth driver will pick up the real PIC, so ignore it here.
+	 */
 	if (OF_finddevice("/u4") != (phandle_t)-1)
 		return (ENXIO);
 
@@ -103,8 +118,48 @@ openpic_macio_probe(device_t dev)
 }
 
 static int
-openpic_macio_attach(device_t dev)
+openpic_ofw_attach(device_t dev)
 {
- 
-	return (openpic_common_attach(dev, ofw_bus_get_node(dev)));
+	phandle_t xref, node;
+
+	node = ofw_bus_get_node(dev);
+
+	if (OF_getprop(node, "phandle", &xref, sizeof(xref)) == -1 &&
+	    OF_getprop(node, "ibm,phandle", &xref, sizeof(xref)) == -1 &&
+	    OF_getprop(node, "linux,phandle", &xref, sizeof(xref)) == -1)
+		xref = node;
+
+	return (openpic_common_attach(dev, xref));
 }
+
+static void
+openpic_ofw_translate_code(device_t dev, u_int irq, int code,
+    enum intr_trigger *trig, enum intr_polarity *pol)
+{
+	switch (code) {
+	case 0:
+		/* L to H edge */
+		*trig = INTR_TRIGGER_EDGE;
+		*pol = INTR_POLARITY_HIGH;
+		break;
+	case 1:
+		/* Active L level */
+		*trig = INTR_TRIGGER_LEVEL;
+		*pol = INTR_POLARITY_LOW;
+		break;
+	case 2:
+		/* Active H level */
+		*trig = INTR_TRIGGER_LEVEL;
+		*pol = INTR_POLARITY_HIGH;
+		break;
+	case 3:
+		/* H to L edge */
+		*trig = INTR_TRIGGER_EDGE;
+		*pol = INTR_POLARITY_LOW;
+		break;
+	default:
+		*trig = INTR_TRIGGER_CONFORM;
+		*pol = INTR_POLARITY_CONFORM;
+	}
+}
+
diff --git a/sys/powerpc/ofw/rtas.c b/sys/powerpc/ofw/rtas.c
index 34b7acfa3a6..3e751b3ec08 100644
--- a/sys/powerpc/ofw/rtas.c
+++ b/sys/powerpc/ofw/rtas.c
@@ -192,7 +192,7 @@ int
 rtas_call_method(cell_t token, int nargs, int nreturns, ...)
 {
 	vm_offset_t argsptr;
-	faultbuf env;
+	faultbuf env, *oldfaultbuf;
 	va_list ap;
 	struct {
 		cell_t token;
@@ -221,6 +221,7 @@ rtas_call_method(cell_t token, int nargs, int nreturns, ...)
 
 	/* Get rid of any stale machine checks that have been waiting.  */
 	__asm __volatile ("sync; isync");
+	oldfaultbuf = curthread->td_pcb->pcb_onfault;
         if (!setfault(env)) {
 		__asm __volatile ("sync");
 		result = rtascall(argsptr, rtas_private_data);
@@ -228,7 +229,7 @@ rtas_call_method(cell_t token, int nargs, int nreturns, ...)
 	} else {
 		result = RTAS_HW_ERROR;
 	}
-	curthread->td_pcb->pcb_onfault = 0;
+	curthread->td_pcb->pcb_onfault = oldfaultbuf;
 	__asm __volatile ("sync");
 
 	rtas_real_unmap(argsptr, &args, sizeof(args));
diff --git a/sys/powerpc/powermac/ata_kauai.c b/sys/powerpc/powermac/ata_kauai.c
index 1d72f75c7e4..33b6434dc26 100644
--- a/sys/powerpc/powermac/ata_kauai.c
+++ b/sys/powerpc/powermac/ata_kauai.c
@@ -194,12 +194,11 @@ static const u_int udma_timing_shasta[] = {
 static int
 ata_kauai_probe(device_t dev)
 {
-	struct ata_channel *ch;
 	struct ata_kauai_softc *sc;
 	u_int32_t devid;
 	phandle_t node;
 	const char *compatstring = NULL;
-	int i, found, rid;
+	int i, found;
 
 	found = 0;
 	devid = pci_get_devid(dev);
@@ -216,7 +215,6 @@ ata_kauai_probe(device_t dev)
 	node = ofw_bus_get_node(dev);
 	sc = device_get_softc(dev);
 	bzero(sc, sizeof(struct ata_kauai_softc));
-	ch = &sc->sc_ch.sc_ch;
 
 	compatstring = ofw_bus_get_compat(dev);
 	if (compatstring != NULL && strcmp(compatstring,"shasta-ata") == 0)
@@ -227,6 +225,35 @@ ata_kauai_probe(device_t dev)
 	    (compatstring == NULL || strcmp(compatstring, "K2-UATA") != 0))
 		bus_set_resource(dev, SYS_RES_IRQ, 0, 39, 1);
 
+        return (ata_probe(dev));
+}
+
+#if USE_DBDMA_IRQ
+static int
+ata_kauai_dma_interrupt(struct ata_kauai_softc *sc)
+{
+	/* Clear the DMA interrupt bits */
+
+	bus_write_4(sc->sc_memr, DMA_IRQ_REG, 0x80000000);
+
+	return ata_interrupt(sc);
+}
+#endif
+
+static int
+ata_kauai_attach(device_t dev)
+{
+	struct ata_kauai_softc *sc = device_get_softc(dev);
+	struct ata_channel *ch;
+	int i, rid;
+#if USE_DBDMA_IRQ
+	int dbdma_irq_rid = 1;
+	struct resource *dbdma_irq;
+	void *cookie;
+#endif
+
+	ch = &sc->sc_ch.sc_ch;
+
         rid = PCIR_BARS;
 	sc->sc_memr = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 
 	    RF_ACTIVE);
@@ -248,36 +275,11 @@ ata_kauai_probe(device_t dev)
 
 	ch->unit = 0;
 	ch->flags |= ATA_USE_16BIT;
-	
+
 	/* XXX: ATAPI DMA is unreliable. We should find out why. */
 	ch->flags |= ATA_NO_ATAPI_DMA;
 	ata_generic_hw(dev);
 
-        return (ata_probe(dev));
-}
-
-#if USE_DBDMA_IRQ
-static int
-ata_kauai_dma_interrupt(struct ata_kauai_softc *sc)
-{
-	/* Clear the DMA interrupt bits */
-
-	bus_write_4(sc->sc_memr, DMA_IRQ_REG, 0x80000000);
-
-	return ata_interrupt(sc);
-}
-#endif
-
-static int
-ata_kauai_attach(device_t dev)
-{
-	struct ata_kauai_softc *sc = device_get_softc(dev);
-#if USE_DBDMA_IRQ
-	int dbdma_irq_rid = 1;
-	struct resource *dbdma_irq;
-	void *cookie;
-#endif
-
 	pci_enable_busmaster(dev);
 
 	/* Init DMA engine */
diff --git a/sys/powerpc/powermac/ata_macio.c b/sys/powerpc/powermac/ata_macio.c
index e15ab00f626..85056642a46 100644
--- a/sys/powerpc/powermac/ata_macio.c
+++ b/sys/powerpc/powermac/ata_macio.c
@@ -152,8 +152,6 @@ ata_macio_probe(device_t dev)
 	const char *type = ofw_bus_get_type(dev);
 	const char *name = ofw_bus_get_name(dev);
 	struct ata_macio_softc *sc;
-	struct ata_channel *ch;
-	int rid, i;
 
 	if (strcmp(type, "ata") != 0 &&
 	    strcmp(type, "ide") != 0)
@@ -161,7 +159,6 @@ ata_macio_probe(device_t dev)
 
 	sc = device_get_softc(dev);
 	bzero(sc, sizeof(struct ata_macio_softc));
-	ch = &sc->sc_ch.sc_ch;
 
 	if (strcmp(name,"ata-4") == 0) {
 		device_set_desc(dev,"Apple MacIO Ultra ATA Controller");
@@ -173,7 +170,23 @@ ata_macio_probe(device_t dev)
 		sc->max_mode = ATA_WDMA2;
 	}
 
+	return (ata_probe(dev));
+}
+
+static int
+ata_macio_attach(device_t dev)
+{
+	struct ata_macio_softc *sc = device_get_softc(dev);
+	uint32_t timingreg;
+	struct ata_channel *ch;
+	int rid, i;
+
+	/*
+	 * Allocate resources
+	 */
+
 	rid = 0;
+	ch = &sc->sc_ch.sc_ch;
 	sc->sc_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, 
 	    RF_ACTIVE);
 	if (sc->sc_mem == NULL) {
@@ -196,15 +209,6 @@ ata_macio_probe(device_t dev)
 	ch->flags |= ATA_USE_16BIT | ATA_NO_ATAPI_DMA;
 	ata_generic_hw(dev);
 
-	return (ata_probe(dev));
-}
-
-static int
-ata_macio_attach(device_t dev)
-{
-	struct ata_macio_softc *sc = device_get_softc(dev);
-	uint32_t timingreg;
-
 #if USE_DBDMA_IRQ
 	int dbdma_irq_rid = 1;
 	struct resource *dbdma_irq;
diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c
index ddb7f702e60..03c975d3e4f 100644
--- a/sys/powerpc/powermac/grackle.c
+++ b/sys/powerpc/powermac/grackle.c
@@ -34,6 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
+#include <sys/proc.h>
 
 #include <dev/ofw/openfirm.h>
 #include <dev/ofw/ofw_pci.h>
@@ -59,8 +60,6 @@ __FBSDID("$FreeBSD$");
 
 #include "pcib_if.h"
 
-int      badaddr(void *, size_t);  /* XXX */
-
 /*
  * Device interface.
  */
@@ -81,6 +80,9 @@ static void		grackle_write_config(device_t, u_int, u_int, u_int,
 static int		grackle_enable_config(struct grackle_softc *, u_int,
 			    u_int, u_int, u_int);
 static void		grackle_disable_config(struct grackle_softc *);
+static int		badaddr(void *, size_t);
+
+int			setfault(faultbuf);	/* defined in locore.S */
 
 /*
  * Driver methods.
@@ -238,6 +240,50 @@ grackle_disable_config(struct grackle_softc *sc)
 	out32rb(sc->sc_addr, 0);
 }
 
+static int
+badaddr(void *addr, size_t size)
+{
+	struct thread	*td;
+	faultbuf	env, *oldfaultbuf;
+	int		x;
+
+	/* Get rid of any stale machine checks that have been waiting.  */
+	__asm __volatile ("sync; isync");
+
+	td = curthread;
+
+	oldfaultbuf = td->td_pcb->pcb_onfault;
+	if (setfault(env)) {
+		td->td_pcb->pcb_onfault = oldfaultbuf;
+		__asm __volatile ("sync");
+		return 1;
+	}
+
+	__asm __volatile ("sync");
+
+	switch (size) {
+	case 1:
+		x = *(volatile int8_t *)addr;
+		break;
+	case 2:
+		x = *(volatile int16_t *)addr;
+		break;
+	case 4:
+		x = *(volatile int32_t *)addr;
+		break;
+	default:
+		panic("badaddr: invalid size (%zd)", size);
+	}
+
+	/* Make sure we took the machine check, if we caused one. */
+	__asm __volatile ("sync; isync");
+
+	td->td_pcb->pcb_onfault = oldfaultbuf;
+	__asm __volatile ("sync");	/* To be sure. */
+
+	return (0);
+}
+
 /*
  * Driver to swallow Grackle host bridges from the PCI bus side.
  */
diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c
index b31cf15394f..dad261cbbb3 100644
--- a/sys/powerpc/powermac/macio.c
+++ b/sys/powerpc/powermac/macio.c
@@ -201,10 +201,6 @@ macio_add_intr(phandle_t devnode, struct macio_devinfo *dinfo)
 		return;
 	}
 
-	if (OF_searchprop(devnode, "#interrupt-cells", &icells, sizeof(icells))
-	    <= 0)
-		icells = 1;
-
 	nintr = OF_getprop_alloc(devnode, "interrupts", sizeof(*intr), 
 		(void **)&intr);
 	if (nintr == -1) {
@@ -221,6 +217,10 @@ macio_add_intr(phandle_t devnode, struct macio_devinfo *dinfo)
 	    <= 0)
 		panic("Interrupt but no interrupt parent!\n");
 
+	if (OF_getprop(OF_xref_phandle(iparent), "#interrupt-cells", &icells,
+	    sizeof(icells)) <= 0)
+		icells = 1;
+
 	for (i = 0; i < nintr; i+=icells) {
 		u_int irq = MAP_IRQ(iparent, intr[i]);
 
diff --git a/sys/powerpc/powermac/nvbl.c b/sys/powerpc/powermac/nvbl.c
index 033f972652a..12cc032fa5b 100644
--- a/sys/powerpc/powermac/nvbl.c
+++ b/sys/powerpc/powermac/nvbl.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #define NVIDIA_MMIO_PMC       (0x0)
 #define  NVIDIA_PMC_OFF         (NVIDIA_MMIO_PMC + 0x10f0)
 #define   NVIDIA_PMC_BL_SHIFT    (16)
-#define   NVIDIA_PMC_BL_EN       (1 << 31)
+#define   NVIDIA_PMC_BL_EN       (1U << 31)
 
 
 struct nvbl_softc {
diff --git a/sys/powerpc/powermac/platform_powermac.c b/sys/powerpc/powermac/platform_powermac.c
index 1954ae9f4e5..49f3e1a9b2b 100644
--- a/sys/powerpc/powermac/platform_powermac.c
+++ b/sys/powerpc/powermac/platform_powermac.c
@@ -57,8 +57,8 @@ extern void *ap_pcpu;
 
 static int powermac_probe(platform_t);
 static int powermac_attach(platform_t);
-void powermac_mem_regions(platform_t, struct mem_region **phys, int *physsz,
-    struct mem_region **avail, int *availsz);
+void powermac_mem_regions(platform_t, struct mem_region *phys, int *physsz,
+    struct mem_region *avail, int *availsz);
 static u_long powermac_timebase_freq(platform_t, struct cpuref *cpuref);
 static int powermac_smp_first_cpu(platform_t, struct cpuref *cpuref);
 static int powermac_smp_next_cpu(platform_t, struct cpuref *cpuref);
@@ -114,10 +114,60 @@ powermac_probe(platform_t plat)
 }
 
 void
-powermac_mem_regions(platform_t plat, struct mem_region **phys, int *physsz,
-    struct mem_region **avail, int *availsz)
+powermac_mem_regions(platform_t plat, struct mem_region *phys, int *physsz,
+    struct mem_region *avail, int *availsz)
 {
-	ofw_mem_regions(phys,physsz,avail,availsz);
+	phandle_t memory;
+	cell_t memoryprop[PHYS_AVAIL_SZ * 2];
+	ssize_t propsize, i, j;
+	int physacells = 1;
+
+	memory = OF_finddevice("/memory");
+
+	/* "reg" has variable #address-cells, but #size-cells is always 1 */
+	OF_getprop(OF_parent(memory), "#address-cells", &physacells,
+	    sizeof(physacells));
+
+	propsize = OF_getprop(memory, "reg", memoryprop, sizeof(memoryprop));
+	propsize /= sizeof(cell_t);
+	for (i = 0, j = 0; i < propsize; i += physacells+1, j++) {
+		phys[j].mr_start = memoryprop[i];
+		if (physacells == 2) {
+#ifndef __powerpc64__
+			/* On 32-bit PPC, ignore regions starting above 4 GB */
+			if (memoryprop[i] != 0) {
+				j--;
+				continue;
+			}
+#else
+			phys[j].mr_start <<= 32;
+#endif
+			phys[j].mr_start |= memoryprop[i+1];
+		}
+		phys[j].mr_size = memoryprop[i + physacells];
+	}
+	*physsz = j;
+
+	/* "available" always has #address-cells = 1 */
+	propsize = OF_getprop(memory, "available", memoryprop,
+	    sizeof(memoryprop));
+	propsize /= sizeof(cell_t);
+	for (i = 0, j = 0; i < propsize; i += 2, j++) {
+		avail[j].mr_start = memoryprop[i];
+		avail[j].mr_size = memoryprop[i + 1];
+	}
+
+#ifdef __powerpc64__
+	/* Add in regions above 4 GB to the available list */
+	for (i = 0; i < *physsz; i++) {
+		if (phys[i].mr_start > BUS_SPACE_MAXADDR_32BIT) {
+			avail[j].mr_start = phys[i].mr_start;
+			avail[j].mr_size = phys[i].mr_size;
+			j++;
+		}
+	}
+#endif
+	*availsz = j;
 }
 
 static int
@@ -169,7 +219,8 @@ powermac_timebase_freq(platform_t plat, struct cpuref *cpuref)
 static int
 powermac_smp_fill_cpuref(struct cpuref *cpuref, phandle_t cpu)
 {
-	cell_t cpuid, res;
+	cell_t cpuid;
+	int res;
 
 	cpuref->cr_hwref = cpu;
 	res = OF_getprop(cpu, "reg", &cpuid, sizeof(cpuid));
diff --git a/sys/powerpc/powermac/powermac_thermal.c b/sys/powerpc/powermac/powermac_thermal.c
index db0611a4d3c..8b9462c5a06 100644
--- a/sys/powerpc/powermac/powermac_thermal.c
+++ b/sys/powerpc/powermac/powermac_thermal.c
@@ -68,6 +68,8 @@ struct pmac_fan_le {
 struct pmac_sens_le {
 	struct pmac_therm		*sensor;
 	int				last_val;
+#define MAX_CRITICAL_COUNT 6
+	int				critical_count;
 	SLIST_ENTRY(pmac_sens_le)	entries;
 };
 static SLIST_HEAD(pmac_fans, pmac_fan_le) fans = SLIST_HEAD_INITIALIZER(fans);
@@ -106,14 +108,27 @@ pmac_therm_manage_fans(void)
 			sensor->last_val = temp;
 
 		if (sensor->last_val > sensor->sensor->max_temp) {
+			sensor->critical_count++;
 			printf("WARNING: Current temperature (%s: %d.%d C) "
-			    "exceeds critical temperature (%d.%d C)! "
-			    "Shutting down!\n", sensor->sensor->name,
-			       (sensor->last_val - ZERO_C_TO_K) / 10,
-			       (sensor->last_val - ZERO_C_TO_K) % 10,
-			       (sensor->sensor->max_temp - ZERO_C_TO_K) / 10,
-			       (sensor->sensor->max_temp - ZERO_C_TO_K) % 10);
-			shutdown_nice(RB_POWEROFF);
+			    "exceeds critical temperature (%d.%d C); "
+			    "count=%d\n",
+			    sensor->sensor->name,
+			    (sensor->last_val - ZERO_C_TO_K) / 10,
+			    (sensor->last_val - ZERO_C_TO_K) % 10,
+			    (sensor->sensor->max_temp - ZERO_C_TO_K) / 10,
+			    (sensor->sensor->max_temp - ZERO_C_TO_K) % 10,
+			    sensor->critical_count);
+			if (sensor->critical_count >= MAX_CRITICAL_COUNT) {
+				printf("WARNING: %s temperature exceeded "
+				    "critical temperature %d times in a row; "
+				    "shutting down!\n",
+				    sensor->sensor->name,
+				    sensor->critical_count);
+				shutdown_nice(RB_POWEROFF);
+			}
+		} else {
+			if (sensor->critical_count > 0)
+				sensor->critical_count--;
 		}
 	}
 
@@ -177,6 +192,8 @@ pmac_thermal_sensor_register(struct pmac_therm *sensor)
 	list_entry = malloc(sizeof(struct pmac_sens_le), M_PMACTHERM,
 	    M_ZERO | M_WAITOK);
 	list_entry->sensor = sensor;
+	list_entry->last_val = 0;
+	list_entry->critical_count = 0;
 
 	SLIST_INSERT_HEAD(&sensors, list_entry, entries);
 }
diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c
index e9ab291e33f..748148e7806 100644
--- a/sys/powerpc/powermac/uninorth.c
+++ b/sys/powerpc/powermac/uninorth.c
@@ -264,6 +264,7 @@ unin_chip_attach(device_t dev)
 	phandle_t  child;
 	phandle_t  iparent;
 	device_t   cdev;
+	cell_t     acells, scells;
 	char compat[32];
 	char name[32];
 	u_int irq, reg[3];
@@ -275,12 +276,21 @@ unin_chip_attach(device_t dev)
 	if (OF_getprop(root, "reg", reg, sizeof(reg)) < 8)
 		return (ENXIO);
 
-	if (strcmp(ofw_bus_get_name(dev), "u3") == 0
-	    || strcmp(ofw_bus_get_name(dev), "u4") == 0)
-		i = 1; /* #address-cells lies */
+	acells = scells = 1;
+	OF_getprop(OF_parent(root), "#address-cells", &acells, sizeof(acells));
+	OF_getprop(OF_parent(root), "#size-cells", &scells, sizeof(scells));
 
-	sc->sc_physaddr = reg[i];
-	sc->sc_size = reg[i+1];
+	i = 0;
+	sc->sc_physaddr = reg[i++];
+	if (acells == 2) {
+		sc->sc_physaddr <<= 32;
+		sc->sc_physaddr |= reg[i++];
+	}
+	sc->sc_size = reg[i++];
+	if (scells == 2) {
+		sc->sc_size <<= 32;
+		sc->sc_size |= reg[i++];
+	}
 
 	sc->sc_mem_rman.rm_type = RMAN_ARRAY;
 	sc->sc_mem_rman.rm_descr = "UniNorth Device Memory";
diff --git a/sys/powerpc/powermac/uninorthpci.c b/sys/powerpc/powermac/uninorthpci.c
index f55fb726429..5cf7a793ae4 100644
--- a/sys/powerpc/powermac/uninorthpci.c
+++ b/sys/powerpc/powermac/uninorthpci.c
@@ -134,7 +134,9 @@ uninorth_attach(device_t dev)
 	struct		uninorth_softc *sc;
 	const char	*compatible;
 	phandle_t	node;
-	u_int32_t	reg[3];
+	uint32_t	reg[3];
+	uint64_t	regbase;
+	cell_t		acells;
 
 	node = ofw_bus_get_node(dev);
 	sc = device_get_softc(dev);
@@ -149,14 +151,18 @@ uninorth_attach(device_t dev)
 	if (strcmp(compatible, "u4-pcie") == 0)
 		sc->sc_ver = 4;
 
-	if (sc->sc_ver >= 3) {
-	   sc->sc_addr = (vm_offset_t)pmap_mapdev(reg[1] + 0x800000, PAGE_SIZE);
-	   sc->sc_data = (vm_offset_t)pmap_mapdev(reg[1] + 0xc00000, PAGE_SIZE);
-	} else {
-	   sc->sc_addr = (vm_offset_t)pmap_mapdev(reg[0] + 0x800000, PAGE_SIZE);
-	   sc->sc_data = (vm_offset_t)pmap_mapdev(reg[0] + 0xc00000, PAGE_SIZE);
+	acells = 1;
+	OF_getprop(OF_parent(node), "#address-cells", &acells, sizeof(acells));
+
+	regbase = reg[0];
+	if (acells == 2) {
+		regbase <<= 32;
+		regbase |= reg[1];
 	}
 
+	sc->sc_addr = (vm_offset_t)pmap_mapdev(regbase + 0x800000, PAGE_SIZE);
+	sc->sc_data = (vm_offset_t)pmap_mapdev(regbase + 0xc00000, PAGE_SIZE);
+
 	return (ofw_pci_attach(dev));
 }
 
diff --git a/sys/powerpc/powermac/uninorthvar.h b/sys/powerpc/powermac/uninorthvar.h
index 43aa01d0e00..aa834f6a1e8 100644
--- a/sys/powerpc/powermac/uninorthvar.h
+++ b/sys/powerpc/powermac/uninorthvar.h
@@ -38,9 +38,9 @@ struct uninorth_softc {
 };
 
 struct unin_chip_softc {
-	u_int32_t		sc_physaddr;
+	uint64_t		sc_physaddr;
+	uint64_t		sc_size;
 	vm_offset_t		sc_addr;
-	u_int32_t		sc_size;
 	struct rman  		sc_mem_rman;
 	int			sc_version;
 };
diff --git a/sys/powerpc/powerpc/bus_machdep.c b/sys/powerpc/powerpc/bus_machdep.c
index 950d0262282..1928539dbbd 100644
--- a/sys/powerpc/powerpc/bus_machdep.c
+++ b/sys/powerpc/powerpc/bus_machdep.c
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 #define	MAX_EARLYBOOT_MAPPINGS	6
 
 static struct {
+	vm_offset_t virt;
 	bus_addr_t addr;
 	bus_size_t size;
 	int flags;
@@ -86,10 +87,12 @@ bs_gen_map(bus_addr_t addr, bus_size_t size, int flags,
 		KASSERT(earlyboot_map_idx < MAX_EARLYBOOT_MAPPINGS,
 		    ("%s: too many early boot mapping requests", __func__));
 		earlyboot_mappings[earlyboot_map_idx].addr = addr;
+		earlyboot_mappings[earlyboot_map_idx].virt =
+		    pmap_early_io_map(addr, size);
 		earlyboot_mappings[earlyboot_map_idx].size = size;
 		earlyboot_mappings[earlyboot_map_idx].flags = flags;
+		*bshp = earlyboot_mappings[earlyboot_map_idx].virt;
 		earlyboot_map_idx++;
-		*bshp = addr;
 	} else {
 		ma = VM_MEMATTR_DEFAULT;
 		switch (flags) {
@@ -110,13 +113,13 @@ void
 bs_remap_earlyboot(void)
 {
 	int i;
-	vm_offset_t pa, spa;
+	vm_offset_t pa, spa, va;
 	vm_memattr_t ma;
 
 	for (i = 0; i < earlyboot_map_idx; i++) {
 		spa = earlyboot_mappings[i].addr;
-		if (pmap_dev_direct_mapped(spa, earlyboot_mappings[i].size)
-		    == 0)
+		if (spa == earlyboot_mappings[i].virt &&
+		   pmap_dev_direct_mapped(spa, earlyboot_mappings[i].size) == 0)
 			continue;
 
 		ma = VM_MEMATTR_DEFAULT;
@@ -130,8 +133,10 @@ bs_remap_earlyboot(void)
 		}
 
 		pa = trunc_page(spa);
+		va = trunc_page(earlyboot_mappings[i].virt);
 		while (pa < spa + earlyboot_mappings[i].size) {
-			pmap_kenter_attr(pa, pa, ma);
+			pmap_kenter_attr(va, pa, ma);
+			va += PAGE_SIZE;
 			pa += PAGE_SIZE;
 		}
 	}
diff --git a/sys/powerpc/powerpc/busdma_machdep.c b/sys/powerpc/powerpc/busdma_machdep.c
index 144b7f9b730..e35ecec57fe 100644
--- a/sys/powerpc/powerpc/busdma_machdep.c
+++ b/sys/powerpc/powerpc/busdma_machdep.c
@@ -754,6 +754,16 @@ _bus_dmamap_load_phys(bus_dma_tag_t dmat,
 	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
 }
 
+int
+_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
+    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+    bus_dma_segment_t *segs, int *segp)
+{
+
+	return (bus_dmamap_load_ma_triv(dmat, map, ma, tlen, ma_offs, flags,
+	    segs, segp));
+}
+
 /*
  * Utility function to load a linear buffer.  segp contains
  * the starting segment on entrance, and the ending segment on exit.
diff --git a/sys/powerpc/aim/clock.c b/sys/powerpc/powerpc/clock.c
similarity index 90%
rename from sys/powerpc/aim/clock.c
rename to sys/powerpc/powerpc/clock.c
index ae98d26efda..a218a707d30 100644
--- a/sys/powerpc/aim/clock.c
+++ b/sys/powerpc/powerpc/clock.c
@@ -119,6 +119,14 @@ decr_intr(struct trapframe *frame)
 
 	(*decr_counts[curcpu])++;
 
+#ifdef BOOKE
+	/*
+	 * Interrupt handler must reset DIS to avoid getting another
+	 * interrupt once EE is enabled.
+	 */
+	mtspr(SPR_TSR, TSR_DIS);
+#endif
+
 	if (s->mode == 1) {
 		/*
 		 * Based on the actual time delay since the last decrementer
@@ -141,6 +149,14 @@ decr_intr(struct trapframe *frame)
 	}
 }
 
+void
+cpu_initclocks(void)
+{
+
+	decr_tc_init();
+	cpu_initclocks_bsp();
+}
+
 /*
  * BSP early initialization.
  */
@@ -151,8 +167,8 @@ decr_init(void)
 	char buf[32];
 
 	/*
-	 * Check the BSP's timebase frequency. Sometimes we can't find the BSP, so fall
-	 * back to the first CPU in this case.
+	 * Check the BSP's timebase frequency. Sometimes we can't find the BSP,
+	 * so fall back to the first CPU in this case.
 	 */
 	if (platform_smp_get_bsp(&cpu) != 0)
 		platform_smp_first_cpu(&cpu);
@@ -207,11 +223,13 @@ decr_tc_init(void)
  * Event timer start method.
  */
 static int
-decr_et_start(struct eventtimer *et,
-    sbintime_t first, sbintime_t period)
+decr_et_start(struct eventtimer *et, sbintime_t first, sbintime_t period)
 {
 	struct decr_state *s = DPCPU_PTR(decr_state);
 	uint32_t fdiv;
+#ifdef BOOKE
+	uint32_t tcr;
+#endif
 
 	if (period != 0) {
 		s->mode = 1;
@@ -220,12 +238,25 @@ decr_et_start(struct eventtimer *et,
 		s->mode = 2;
 		s->div = 0;
 	}
-	if (first != 0) {
+	if (first != 0)
 		fdiv = (decr_et.et_frequency * first) >> 32;
-	} else
+	else
 		fdiv = s->div;
 
+#ifdef BOOKE
+	tcr = mfspr(SPR_TCR);
+	tcr |= TCR_DIE;
+	if (s->mode == 1) {
+		mtspr(SPR_DECAR, s->div);
+		tcr |= TCR_ARE;
+	} else
+		tcr &= ~TCR_ARE;
 	mtdec(fdiv);
+	mtspr(SPR_TCR, tcr);
+#else
+	mtdec(fdiv);
+#endif
+
 	return (0);
 }
 
@@ -236,10 +267,19 @@ static int
 decr_et_stop(struct eventtimer *et)
 {
 	struct decr_state *s = DPCPU_PTR(decr_state);
+#ifdef BOOKE
+	uint32_t tcr;
+#endif
 
 	s->mode = 0;
 	s->div = 0x7fffffff;
+#ifdef BOOKE
+	tcr = mfspr(SPR_TCR);
+	tcr &= ~(TCR_DIE | TCR_ARE);
+	mtspr(SPR_TCR, tcr);
+#else
 	mtdec(s->div);
+#endif
 	return (0);
 }
 
@@ -249,10 +289,7 @@ decr_et_stop(struct eventtimer *et)
 static unsigned
 decr_get_timecount(struct timecounter *tc)
 {
-	register_t tb;
-
-	__asm __volatile("mftb %0" : "=r"(tb));
-	return (tb);
+	return (mftb());
 }
 
 /*
diff --git a/sys/powerpc/aim/copyinout.c b/sys/powerpc/powerpc/copyinout.c
similarity index 84%
rename from sys/powerpc/aim/copyinout.c
rename to sys/powerpc/powerpc/copyinout.c
index 69ba43152e6..a8108d634a5 100644
--- a/sys/powerpc/aim/copyinout.c
+++ b/sys/powerpc/powerpc/copyinout.c
@@ -69,9 +69,11 @@ __FBSDID("$FreeBSD$");
 #include <machine/pcb.h>
 #include <machine/sr.h>
 #include <machine/slb.h>
+#include <machine/vmparam.h>
 
 int	setfault(faultbuf);	/* defined in locore.S */
 
+#ifdef AIM
 /*
  * Makes sure that the right segment of userspace is mapped in.
  */
@@ -132,6 +134,43 @@ set_user_sr(pmap_t pm, const void *addr)
 }
 #endif
 
+static __inline int
+map_user_ptr(pmap_t pm, const void *uaddr, void **kaddr, size_t ulen,
+    size_t *klen)
+{
+	size_t l;
+
+	*kaddr = (char *)USER_ADDR + ((uintptr_t)uaddr & ~SEGMENT_MASK);
+
+	l = ((char *)USER_ADDR + SEGMENT_LENGTH) - (char *)(*kaddr);
+	if (l > ulen)
+		l = ulen;
+	if (klen)
+		*klen = l;
+	else if (l != ulen)
+		return (EFAULT);
+
+	set_user_sr(pm, uaddr);
+
+	return (0);
+}
+#else /* Book-E uses a combined kernel/user mapping */
+static __inline int
+map_user_ptr(pmap_t pm, const void *uaddr, void **kaddr, size_t ulen,
+    size_t *klen)
+{
+
+	if ((uintptr_t)uaddr + ulen > VM_MAXUSER_ADDRESS + PAGE_SIZE)
+		return (EFAULT);
+
+	*kaddr = (void *)(uintptr_t)uaddr;
+	if (klen)
+		*klen = ulen;
+
+	return (0);
+}
+#endif
+
 int
 copyout(const void *kaddr, void *udaddr, size_t len)
 {
@@ -154,13 +193,10 @@ copyout(const void *kaddr, void *udaddr, size_t len)
 	up = udaddr;
 
 	while (len > 0) {
-		p = (char *)USER_ADDR + ((uintptr_t)up & ~SEGMENT_MASK);
-
-		l = ((char *)USER_ADDR + SEGMENT_LENGTH) - p;
-		if (l > len)
-			l = len;
-
-		set_user_sr(pm,up);
+		if (map_user_ptr(pm, udaddr, (void **)&p, len, &l)) {
+			td->td_pcb->pcb_onfault = NULL;
+			return (EFAULT);
+		}
 
 		bcopy(kp, p, l);
 
@@ -195,13 +231,10 @@ copyin(const void *udaddr, void *kaddr, size_t len)
 	up = udaddr;
 
 	while (len > 0) {
-		p = (char *)USER_ADDR + ((uintptr_t)up & ~SEGMENT_MASK);
-
-		l = ((char *)USER_ADDR + SEGMENT_LENGTH) - p;
-		if (l > len)
-			l = len;
-
-		set_user_sr(pm,up);
+		if (map_user_ptr(pm, udaddr, (void **)&p, len, &l)) {
+			td->td_pcb->pcb_onfault = NULL;
+			return (EFAULT);
+		}
 
 		bcopy(p, kp, l);
 
@@ -217,22 +250,11 @@ copyin(const void *udaddr, void *kaddr, size_t len)
 int
 copyinstr(const void *udaddr, void *kaddr, size_t len, size_t *done)
 {
-	struct		thread *td;
-	pmap_t		pm;
-	faultbuf	env;
 	const char	*up;
 	char		*kp;
 	size_t		l;
 	int		rv, c;
 
-	td = curthread;
-	pm = &td->td_proc->p_vmspace->vm_pmap;
-
-	if (setfault(env)) {
-		td->td_pcb->pcb_onfault = NULL;
-		return (EFAULT);
-	}
-
 	kp = kaddr;
 	up = udaddr;
 
@@ -255,7 +277,6 @@ copyinstr(const void *udaddr, void *kaddr, size_t len, size_t *done)
 		*done = l;
 	}
 
-	td->td_pcb->pcb_onfault = NULL;
 	return (rv);
 }
 
@@ -269,14 +290,16 @@ subyte(void *addr, int byte)
 
 	td = curthread;
 	pm = &td->td_proc->p_vmspace->vm_pmap;
-	p = (char *)(USER_ADDR + ((uintptr_t)addr & ~SEGMENT_MASK));
 
 	if (setfault(env)) {
 		td->td_pcb->pcb_onfault = NULL;
 		return (-1);
 	}
 
-	set_user_sr(pm,addr);
+	if (map_user_ptr(pm, addr, (void **)&p, sizeof(*p), NULL)) {
+		td->td_pcb->pcb_onfault = NULL;
+		return (-1);
+	}
 
 	*p = (char)byte;
 
@@ -295,14 +318,16 @@ suword32(void *addr, int word)
 
 	td = curthread;
 	pm = &td->td_proc->p_vmspace->vm_pmap;
-	p = (int *)(USER_ADDR + ((uintptr_t)addr & ~SEGMENT_MASK));
 
 	if (setfault(env)) {
 		td->td_pcb->pcb_onfault = NULL;
 		return (-1);
 	}
 
-	set_user_sr(pm,addr);
+	if (map_user_ptr(pm, addr, (void **)&p, sizeof(*p), NULL)) {
+		td->td_pcb->pcb_onfault = NULL;
+		return (-1);
+	}
 
 	*p = word;
 
@@ -321,14 +346,16 @@ suword(void *addr, long word)
 
 	td = curthread;
 	pm = &td->td_proc->p_vmspace->vm_pmap;
-	p = (long *)(USER_ADDR + ((uintptr_t)addr & ~SEGMENT_MASK));
 
 	if (setfault(env)) {
 		td->td_pcb->pcb_onfault = NULL;
 		return (-1);
 	}
 
-	set_user_sr(pm,addr);
+	if (map_user_ptr(pm, addr, (void **)&p, sizeof(*p), NULL)) {
+		td->td_pcb->pcb_onfault = NULL;
+		return (-1);
+	}
 
 	*p = word;
 
@@ -361,14 +388,16 @@ fubyte(const void *addr)
 
 	td = curthread;
 	pm = &td->td_proc->p_vmspace->vm_pmap;
-	p = (u_char *)(USER_ADDR + ((uintptr_t)addr & ~SEGMENT_MASK));
 
 	if (setfault(env)) {
 		td->td_pcb->pcb_onfault = NULL;
 		return (-1);
 	}
 
-	set_user_sr(pm,addr);
+	if (map_user_ptr(pm, addr, (void **)&p, sizeof(*p), NULL)) {
+		td->td_pcb->pcb_onfault = NULL;
+		return (-1);
+	}
 
 	val = *p;
 
@@ -387,14 +416,16 @@ fuword32(const void *addr)
 
 	td = curthread;
 	pm = &td->td_proc->p_vmspace->vm_pmap;
-	p = (int32_t *)(USER_ADDR + ((uintptr_t)addr & ~SEGMENT_MASK));
 
 	if (setfault(env)) {
 		td->td_pcb->pcb_onfault = NULL;
 		return (-1);
 	}
 
-	set_user_sr(pm,addr);
+	if (map_user_ptr(pm, addr, (void **)&p, sizeof(*p), NULL)) {
+		td->td_pcb->pcb_onfault = NULL;
+		return (-1);
+	}
 
 	val = *p;
 
@@ -413,14 +444,16 @@ fuword(const void *addr)
 
 	td = curthread;
 	pm = &td->td_proc->p_vmspace->vm_pmap;
-	p = (long *)(USER_ADDR + ((uintptr_t)addr & ~SEGMENT_MASK));
 
 	if (setfault(env)) {
 		td->td_pcb->pcb_onfault = NULL;
 		return (-1);
 	}
 
-	set_user_sr(pm,addr);
+	if (map_user_ptr(pm, addr, (void **)&p, sizeof(*p), NULL)) {
+		td->td_pcb->pcb_onfault = NULL;
+		return (-1);
+	}
 
 	val = *p;
 
@@ -446,15 +479,18 @@ casuword32(volatile uint32_t *addr, uint32_t old, uint32_t new)
 
 	td = curthread;
 	pm = &td->td_proc->p_vmspace->vm_pmap;
-	p = (uint32_t *)(USER_ADDR + ((uintptr_t)addr & ~SEGMENT_MASK));
-
-	set_user_sr(pm,(const void *)(vm_offset_t)addr);
 
 	if (setfault(env)) {
 		td->td_pcb->pcb_onfault = NULL;
 		return (-1);
 	}
 
+	if (map_user_ptr(pm, (void *)(uintptr_t)addr, (void **)&p, sizeof(*p),
+	    NULL)) {
+		td->td_pcb->pcb_onfault = NULL;
+		return (-1);
+	}
+
 	__asm __volatile (
 		"1:\tlwarx %0, 0, %2\n\t"	/* load old value */
 		"cmplw %3, %0\n\t"		/* compare */
@@ -491,15 +527,18 @@ casuword(volatile u_long *addr, u_long old, u_long new)
 
 	td = curthread;
 	pm = &td->td_proc->p_vmspace->vm_pmap;
-	p = (u_long *)(USER_ADDR + ((uintptr_t)addr & ~SEGMENT_MASK));
-
-	set_user_sr(pm,(const void *)(vm_offset_t)addr);
 
 	if (setfault(env)) {
 		td->td_pcb->pcb_onfault = NULL;
 		return (-1);
 	}
 
+	if (map_user_ptr(pm, (void *)(uintptr_t)addr, (void **)&p, sizeof(*p),
+	    NULL)) {
+		td->td_pcb->pcb_onfault = NULL;
+		return (-1);
+	}
+
 	__asm __volatile (
 		"1:\tldarx %0, 0, %2\n\t"	/* load old value */
 		"cmpld %3, %0\n\t"		/* compare */
diff --git a/sys/powerpc/powerpc/cpu.c b/sys/powerpc/powerpc/cpu.c
index d7f8e2d4d05..99c8ca11dbe 100644
--- a/sys/powerpc/powerpc/cpu.c
+++ b/sys/powerpc/powerpc/cpu.c
@@ -74,6 +74,8 @@
 #include <machine/smp.h>
 #include <machine/spr.h>
 
+#include <dev/ofw/openfirm.h>
+
 static void	cpu_6xx_setup(int cpuid, uint16_t vers);
 static void	cpu_970_setup(int cpuid, uint16_t vers);
 static void	cpu_booke_setup(int cpuid, uint16_t vers);
@@ -273,6 +275,9 @@ cpu_est_clockrate(int cpu_id, uint64_t *cps)
 {
 	uint16_t	vers;
 	register_t	msr;
+	phandle_t	cpu, dev, root;
+	int		res  = 0;
+	char		buf[8];
 
 	vers = mfpvr() >> 16;
 	msr = mfmsr();
@@ -316,9 +321,40 @@ cpu_est_clockrate(int cpu_id, uint64_t *cps)
 
 			mtmsr(msr);
 			return (0);
+
+		default:
+			root = OF_peer(0);
+			if (root == 0)
+				return (ENXIO);
+
+			dev = OF_child(root);
+			while (dev != 0) {
+				res = OF_getprop(dev, "name", buf, sizeof(buf));
+				if (res > 0 && strcmp(buf, "cpus") == 0)
+					break;
+				dev = OF_peer(dev);
+			}
+			cpu = OF_child(dev);
+			while (cpu != 0) {
+				res = OF_getprop(cpu, "device_type", buf,
+						sizeof(buf));
+				if (res > 0 && strcmp(buf, "cpu") == 0)
+					break;
+				cpu = OF_peer(cpu);
+			}
+			if (cpu == 0)
+				return (ENOENT);
+			if (OF_getprop(cpu, "ibm,extended-clock-frequency",
+			    cps, sizeof(*cps)) >= 0) {
+				return (0);
+			} else if (OF_getprop(cpu, "clock-frequency", cps, 
+			    sizeof(cell_t)) >= 0) {
+				*cps >>= 32;
+				return (0);
+			} else {
+				return (ENOENT);
+			}
 	}
-	
-	return (ENXIO);
 }
 
 void
diff --git a/sys/powerpc/powerpc/dump_machdep.c b/sys/powerpc/powerpc/dump_machdep.c
index 043505f41cb..2de664c8d5d 100644
--- a/sys/powerpc/powerpc/dump_machdep.c
+++ b/sys/powerpc/powerpc/dump_machdep.c
@@ -114,7 +114,7 @@ cb_dumpdata(struct pmap_md *md, int seqnr, void *arg)
 {
 	struct dumperinfo *di = (struct dumperinfo*)arg;
 	vm_offset_t va;
-	size_t counter, ofs, resid, sz;
+	size_t counter, ofs, resid, sz, maxsz;
 	int c, error, twiddle;
 
 	error = 0;
@@ -123,11 +123,12 @@ cb_dumpdata(struct pmap_md *md, int seqnr, void *arg)
 
 	ofs = 0;	/* Logical offset within the chunk */
 	resid = md->md_size;
+	maxsz = min(DFLTPHYS, di->maxiosize);
 
 	printf("  chunk %d: %lu bytes ", seqnr, (u_long)resid);
 
 	while (resid) {
-		sz = (resid > DFLTPHYS) ? DFLTPHYS : resid;
+		sz = min(resid, maxsz);
 		va = pmap_dumpsys_map(md, ofs, &sz);
 		counter += sz;
 		if (counter >> 24) {
@@ -160,7 +161,7 @@ static int
 cb_dumphdr(struct pmap_md *md, int seqnr, void *arg)
 {
 	struct dumperinfo *di = (struct dumperinfo*)arg;
-	Elf32_Phdr phdr;
+	Elf_Phdr phdr;
 	int error;
 
 	bzero(&phdr, sizeof(phdr));
@@ -207,7 +208,7 @@ foreach_chunk(callback_t cb, void *arg)
 void
 dumpsys(struct dumperinfo *di)
 {
-	Elf32_Ehdr ehdr;
+	Elf_Ehdr ehdr;
 	uint32_t dumpsize;
 	off_t hdrgap;
 	size_t hdrsz;
@@ -218,7 +219,7 @@ dumpsys(struct dumperinfo *di)
 	ehdr.e_ident[EI_MAG1] = ELFMAG1;
 	ehdr.e_ident[EI_MAG2] = ELFMAG2;
 	ehdr.e_ident[EI_MAG3] = ELFMAG3;
-	ehdr.e_ident[EI_CLASS] = ELFCLASS32;
+	ehdr.e_ident[EI_CLASS] = ELF_TARG_CLASS;
 #if BYTE_ORDER == LITTLE_ENDIAN
 	ehdr.e_ident[EI_DATA] = ELFDATA2LSB;
 #else
@@ -227,11 +228,11 @@ dumpsys(struct dumperinfo *di)
 	ehdr.e_ident[EI_VERSION] = EV_CURRENT;
 	ehdr.e_ident[EI_OSABI] = ELFOSABI_STANDALONE;	/* XXX big picture? */
 	ehdr.e_type = ET_CORE;
-	ehdr.e_machine = EM_PPC;
+	ehdr.e_machine = ELF_ARCH;      /* Defined in powerpc/include/elf.h */
 	ehdr.e_phoff = sizeof(ehdr);
 	ehdr.e_ehsize = sizeof(ehdr);
-	ehdr.e_phentsize = sizeof(Elf32_Phdr);
-	ehdr.e_shentsize = sizeof(Elf32_Shdr);
+	ehdr.e_phentsize = sizeof(Elf_Phdr);
+	ehdr.e_shentsize = sizeof(Elf_Shdr);
 
 	/* Calculate dump size. */
 	dumpsize = 0L;
@@ -260,7 +261,7 @@ dumpsys(struct dumperinfo *di)
 	    ehdr.e_phnum);
 
 	/* Dump leader */
-	error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh));
+	error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
 	if (error)
 		goto fail;
 	dumplo += sizeof(kdh);
@@ -291,12 +292,12 @@ dumpsys(struct dumperinfo *di)
 		goto fail;
 
 	/* Dump trailer */
-	error = di->dumper(di->priv, &kdh, 0, dumplo, sizeof(kdh));
+	error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
 	if (error)
 		goto fail;
 
 	/* Signal completion, signoff and exit stage left. */
-	di->dumper(di->priv, NULL, 0, 0, 0);
+	dump_write(di, NULL, 0, 0, 0);
 	printf("\nDump complete\n");
 	return;
 
@@ -306,6 +307,8 @@ dumpsys(struct dumperinfo *di)
 
 	if (error == ECANCELED)
 		printf("\nDump aborted\n");
+	else if (error == ENOSPC)
+		printf("\nDump failed. Partition too small.\n");
 	else
 		printf("\n** DUMP FAILED (ERROR %d) **\n", error);
 }
diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c
index a23fd4c0fd1..acacb3d368d 100644
--- a/sys/powerpc/powerpc/exec_machdep.c
+++ b/sys/powerpc/powerpc/exec_machdep.c
@@ -58,6 +58,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
+#include "opt_fpu_emu.h"
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -92,6 +93,10 @@ __FBSDID("$FreeBSD$");
 #include <machine/trap.h>
 #include <machine/vmparam.h>
 
+#ifdef FPU_EMU
+#include <powerpc/fpu/fpu_extern.h>
+#endif
+
 #ifdef COMPAT_FREEBSD32
 #include <compat/freebsd32/freebsd32_signal.h>
 #include <compat/freebsd32/freebsd32_util.h>
@@ -381,19 +386,20 @@ grab_mcontext(struct thread *td, mcontext_t *mcp, int flags)
 		mcp->mc_gpr[4] = 0;
 	}
 
-#ifdef AIM
 	/*
 	 * This assumes that floating-point context is *not* lazy,
 	 * so if the thread has used FP there would have been a
 	 * FP-unavailable exception that would have set things up
 	 * correctly.
 	 */
-	if (pcb->pcb_flags & PCB_FPU) {
-		KASSERT(td == curthread,
-			("get_mcontext: fp save not curthread"));
-		critical_enter();
-		save_fpu(td);
-		critical_exit();
+	if (pcb->pcb_flags & PCB_FPREGS) {
+		if (pcb->pcb_flags & PCB_FPU) {
+			KASSERT(td == curthread,
+				("get_mcontext: fp save not curthread"));
+			critical_enter();
+			save_fpu(td);
+			critical_exit();
+		}
 		mcp->mc_flags |= _MC_FP_VALID;
 		memcpy(&mcp->mc_fpscr, &pcb->pcb_fpu.fpscr, sizeof(double));
 		memcpy(mcp->mc_fpreg, pcb->pcb_fpu.fpr, 32*sizeof(double));
@@ -414,7 +420,6 @@ grab_mcontext(struct thread *td, mcontext_t *mcp, int flags)
 		mcp->mc_vrsave =  pcb->pcb_vec.vrsave;
 		memcpy(mcp->mc_avec, pcb->pcb_vec.vr, sizeof(mcp->mc_avec));
 	}
-#endif
 
 	mcp->mc_len = sizeof(*mcp);
 
@@ -449,14 +454,12 @@ set_mcontext(struct thread *td, const mcontext_t *mcp)
 	if (mcp->mc_vers != _MC_VERSION || mcp->mc_len != sizeof(*mcp))
 		return (EINVAL);
 
-#ifdef AIM
 	/*
 	 * Don't let the user set privileged MSR bits
 	 */
 	if ((mcp->mc_srr1 & PSL_USERSTATIC) != (tf->srr1 & PSL_USERSTATIC)) {
 		return (EINVAL);
 	}
-#endif
 
 	/* Copy trapframe, preserving TLS pointer across context change */
 	if (SV_PROC_FLAG(td->td_proc, SV_LP64))
@@ -469,13 +472,9 @@ set_mcontext(struct thread *td, const mcontext_t *mcp)
 	else
 		tf->fixreg[2] = tls;
 
-#ifdef AIM
 	if (mcp->mc_flags & _MC_FP_VALID) {
-		if ((pcb->pcb_flags & PCB_FPU) != PCB_FPU) {
-			critical_enter();
-			enable_fpu(td);
-			critical_exit();
-		}
+		/* enable_fpu() will happen lazily on a fault */
+		pcb->pcb_flags |= PCB_FPREGS;
 		memcpy(&pcb->pcb_fpu.fpscr, &mcp->mc_fpscr, sizeof(double));
 		memcpy(pcb->pcb_fpu.fpr, mcp->mc_fpreg, 32*sizeof(double));
 	}
@@ -490,7 +489,6 @@ set_mcontext(struct thread *td, const mcontext_t *mcp)
 		pcb->pcb_vec.vrsave = mcp->mc_vrsave;
 		memcpy(pcb->pcb_vec.vr, mcp->mc_avec, sizeof(mcp->mc_avec));
 	}
-#endif
 
 	return (0);
 }
@@ -594,7 +592,7 @@ ppc32_setregs(struct thread *td, struct image_params *imgp, u_long stack)
 	tf->fixreg[8] = (register_t)imgp->ps_strings;	/* NetBSD extension */
 
 	tf->srr0 = imgp->entry_addr;
-	tf->srr1 = PSL_MBO | PSL_USERSET | PSL_FE_DFLT;
+	tf->srr1 = PSL_USERSET | PSL_FE_DFLT;
 	tf->srr1 &= ~PSL_SF;
 	if (mfmsr() & PSL_HV)
 		tf->srr1 |= PSL_HV;
@@ -627,7 +625,7 @@ fill_fpregs(struct thread *td, struct fpreg *fpregs)
 
 	pcb = td->td_pcb;
 
-	if ((pcb->pcb_flags & PCB_FPU) == 0)
+	if ((pcb->pcb_flags & PCB_FPREGS) == 0)
 		memset(fpregs, 0, sizeof(struct fpreg));
 	else
 		memcpy(fpregs, &pcb->pcb_fpu, sizeof(struct fpreg));
@@ -656,14 +654,11 @@ set_dbregs(struct thread *td, struct dbreg *dbregs)
 int
 set_fpregs(struct thread *td, struct fpreg *fpregs)
 {
-#ifdef AIM
 	struct pcb *pcb;
 
 	pcb = td->td_pcb;
-	if ((pcb->pcb_flags & PCB_FPU) == 0)
-		enable_fpu(td);
+	pcb->pcb_flags |= PCB_FPREGS;
 	memcpy(&pcb->pcb_fpu, fpregs, sizeof(struct fpreg));
-#endif
 
 	return (0);
 }
@@ -1023,14 +1018,10 @@ cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg,
 	tf->fixreg[3] = (register_t)arg;
 	if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) {
 		tf->srr0 = (register_t)entry;
-	    #ifdef AIM
-		tf->srr1 = PSL_MBO | PSL_USERSET | PSL_FE_DFLT;
+		tf->srr1 = PSL_USERSET | PSL_FE_DFLT;
 		#ifdef __powerpc64__
 		tf->srr1 &= ~PSL_SF;
 		#endif
-	    #else
-		tf->srr1 = PSL_USERSET;
-	    #endif
 	} else {
 	    #ifdef __powerpc64__
 		register_t entry_desc[3];
@@ -1038,7 +1029,7 @@ cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg,
 		tf->srr0 = entry_desc[0];
 		tf->fixreg[2] = entry_desc[1];
 		tf->fixreg[11] = entry_desc[2];
-		tf->srr1 = PSL_SF | PSL_MBO | PSL_USERSET | PSL_FE_DFLT;
+		tf->srr1 = PSL_SF | PSL_USERSET | PSL_FE_DFLT;
 	    #endif
 	}
 
@@ -1052,3 +1043,36 @@ cpu_set_upcall_kse(struct thread *td, void (*entry)(void *), void *arg,
 	td->td_retval[1] = 0;
 }
 
+int
+ppc_instr_emulate(struct trapframe *frame, struct pcb *pcb)
+{
+	uint32_t instr;
+	int reg, sig;
+
+	instr = fuword32((void *)frame->srr0);
+	sig = SIGILL;
+
+	if ((instr & 0xfc1fffff) == 0x7c1f42a6) {	/* mfpvr */
+		reg = (instr & ~0xfc1fffff) >> 21;
+		frame->fixreg[reg] = mfpvr();
+		frame->srr0 += 4;
+		return (0);
+	}
+
+	if ((instr & 0xfc000ffe) == 0x7c0004ac) {	/* various sync */
+		powerpc_sync(); /* Do a heavy-weight sync */
+		frame->srr0 += 4;
+		return (0);
+	}
+
+#ifdef FPU_EMU
+	if (!(pcb->pcb_flags & PCB_FPREGS)) {
+		bzero(&pcb->pcb_fpu, sizeof(pcb->pcb_fpu));
+		pcb->pcb_flags |= PCB_FPREGS;
+	}
+	sig = fpu_emulate(frame, (struct fpreg *)&pcb->pcb_fpu);
+#endif
+
+	return (sig);
+}
+
diff --git a/sys/powerpc/powerpc/fpu.c b/sys/powerpc/powerpc/fpu.c
index c4cc326da43..b719218b704 100644
--- a/sys/powerpc/powerpc/fpu.c
+++ b/sys/powerpc/powerpc/fpu.c
@@ -66,10 +66,11 @@ enable_fpu(struct thread *td)
 	 * initialise the FPU registers and FPSCR to 0, and set the flag
 	 * to indicate that the FPU is in use.
 	 */
+	pcb->pcb_flags |= PCB_FPU;
 	tf->srr1 |= PSL_FP;
-	if (!(pcb->pcb_flags & PCB_FPU)) {
+	if (!(pcb->pcb_flags & PCB_FPREGS)) {
 		memset(&pcb->pcb_fpu, 0, sizeof pcb->pcb_fpu);
-		pcb->pcb_flags |= PCB_FPU;
+		pcb->pcb_flags |= PCB_FPREGS;
 	}
 
 	/*
diff --git a/sys/powerpc/powerpc/genassym.c b/sys/powerpc/powerpc/genassym.c
index 904d98622be..eae20468ad1 100644
--- a/sys/powerpc/powerpc/genassym.c
+++ b/sys/powerpc/powerpc/genassym.c
@@ -192,8 +192,6 @@ ASSYM(PCB_FPU, PCB_FPU);
 ASSYM(PCB_VEC, PCB_VEC);
 
 ASSYM(PCB_AIM_USR_VSID, offsetof(struct pcb, pcb_cpu.aim.usr_vsid));
-ASSYM(PCB_BOOKE_CTR, offsetof(struct pcb, pcb_cpu.booke.ctr));
-ASSYM(PCB_BOOKE_XER, offsetof(struct pcb, pcb_cpu.booke.xer));
 ASSYM(PCB_BOOKE_DBCR0, offsetof(struct pcb, pcb_cpu.booke.dbcr0));
 
 ASSYM(TD_LOCK, offsetof(struct thread, td_lock));
@@ -214,28 +212,25 @@ ASSYM(SF_UC, offsetof(struct sigframe, sf_uc));
 ASSYM(KERNBASE, KERNBASE);
 ASSYM(MAXCOMLEN, MAXCOMLEN);
 
-#if defined(BOOKE)
 ASSYM(PSL_DE, PSL_DE);
 ASSYM(PSL_DS, PSL_DS);
 ASSYM(PSL_IS, PSL_IS);
 ASSYM(PSL_CE, PSL_CE);
-#endif
-#if defined(BOOKE_E500)
 ASSYM(PSL_UCLE, PSL_UCLE);
-ASSYM(PSL_SPE, PSL_SPE);
 ASSYM(PSL_WE, PSL_WE);
 ASSYM(PSL_UBLE, PSL_UBLE);
 
+#if defined(BOOKE_E500)
 ASSYM(PSL_KERNSET_INIT, PSL_KERNSET_INIT);
-#elif defined(AIM)
-#ifdef __powerpc64__
+#endif
+
+#if defined(AIM) && defined(__powerpc64__)
 ASSYM(PSL_SF, PSL_SF);
 ASSYM(PSL_HV, PSL_HV);
 #endif
-ASSYM(PSL_VEC, PSL_VEC);
+
 ASSYM(PSL_POW, PSL_POW);
 ASSYM(PSL_ILE, PSL_ILE);
-ASSYM(PSL_BE, PSL_BE);
 ASSYM(PSL_LE, PSL_LE);
 ASSYM(PSL_SE, PSL_SE);
 ASSYM(PSL_RI, PSL_RI);
@@ -248,18 +243,16 @@ ASSYM(PSL_FE_NONREC, PSL_FE_NONREC);
 ASSYM(PSL_FE_PREC, PSL_FE_PREC);
 ASSYM(PSL_FE_REC, PSL_FE_REC);
 
-ASSYM(PSL_USERSTATIC, PSL_USERSTATIC);
-#endif
-
+ASSYM(PSL_VEC, PSL_VEC);
+ASSYM(PSL_BE, PSL_BE);
 ASSYM(PSL_EE, PSL_EE);
 ASSYM(PSL_FE0, PSL_FE0);
 ASSYM(PSL_FE1, PSL_FE1);
 ASSYM(PSL_FP, PSL_FP);
 ASSYM(PSL_ME, PSL_ME);
 ASSYM(PSL_PR, PSL_PR);
-#if defined(BOOKE_E500)
 ASSYM(PSL_PMM, PSL_PMM);
-#endif
 ASSYM(PSL_KERNSET, PSL_KERNSET);
 ASSYM(PSL_USERSET, PSL_USERSET);
+ASSYM(PSL_USERSTATIC, PSL_USERSTATIC);
 
diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
index 539d3f6467b..0b13191e019 100644
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -102,6 +102,7 @@ struct powerpc_intr {
 	cpuset_t cpu;
 	enum intr_trigger trig;
 	enum intr_polarity pol;
+	int	fwcode;
 };
 
 struct pic {
@@ -427,6 +428,9 @@ powerpc_enable_intr(void)
 		if (error)
 			continue;
 
+		if (i->trig == -1)
+			PIC_TRANSLATE_CODE(i->pic, i->intline, i->fwcode,
+			    &i->trig, &i->pol);
 		if (i->trig != INTR_TRIGGER_CONFORM ||
 		    i->pol != INTR_POLARITY_CONFORM)
 			PIC_CONFIG(i->pic, i->intline, i->trig, i->pol);
@@ -469,15 +473,21 @@ powerpc_setup_intr(const char *name, u_int irq, driver_filter_t filter,
 	if (!cold) {
 		error = powerpc_map_irq(i);
 
-		if (!error && (i->trig != INTR_TRIGGER_CONFORM ||
-		    i->pol != INTR_POLARITY_CONFORM))
-			PIC_CONFIG(i->pic, i->intline, i->trig, i->pol);
+		if (!error) {
+			if (i->trig == -1)
+				PIC_TRANSLATE_CODE(i->pic, i->intline,
+				    i->fwcode, &i->trig, &i->pol);
+	
+			if (i->trig != INTR_TRIGGER_CONFORM ||
+			    i->pol != INTR_POLARITY_CONFORM)
+				PIC_CONFIG(i->pic, i->intline, i->trig, i->pol);
 
-		if (!error && i->pic == root_pic)
-			PIC_BIND(i->pic, i->intline, i->cpu);
+			if (i->pic == root_pic)
+				PIC_BIND(i->pic, i->intline, i->cpu);
 
-		if (!error && enable)
-			PIC_ENABLE(i->pic, i->intline, i->vector);
+			if (enable)
+				PIC_ENABLE(i->pic, i->intline, i->vector);
+		}
 	}
 	return (error);
 }
@@ -503,6 +513,28 @@ powerpc_bind_intr(u_int irq, u_char cpu)
 }
 #endif
 
+int
+powerpc_fw_config_intr(int irq, int sense_code)
+{
+	struct powerpc_intr *i;
+
+	i = intr_lookup(irq);
+	if (i == NULL)
+		return (ENOMEM);
+
+	i->trig = -1;
+	i->pol = INTR_POLARITY_CONFORM;
+	i->fwcode = sense_code;
+
+	if (!cold && i->pic != NULL) {
+		PIC_TRANSLATE_CODE(i->pic, i->intline, i->fwcode, &i->trig,
+		    &i->pol);
+		PIC_CONFIG(i->pic, i->intline, i->trig, i->pol);
+	}
+
+	return (0);
+}
+
 int
 powerpc_config_intr(int irq, enum intr_trigger trig, enum intr_polarity pol)
 {
diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c
new file mode 100644
index 00000000000..f7100f1e8d1
--- /dev/null
+++ b/sys/powerpc/powerpc/nexus.c
@@ -0,0 +1,213 @@
+/*-
+ * Copyright 1998 Massachusetts Institute of Technology
+ * Copyright 2001 by Thomas Moestl <tmm@FreeBSD.org>.
+ * Copyright 2006 by Marius Strobl <marius@FreeBSD.org>.
+ * All rights reserved.
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby
+ * granted, provided that both the above copyright notice and this
+ * permission notice appear in all copies, that both the above
+ * copyright notice and this permission notice appear in all
+ * supporting documentation, and that the name of M.I.T. not be used
+ * in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  M.I.T. makes
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ *
+ * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
+ * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
+ * SHALL M.I.T. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (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: FreeBSD: src/sys/i386/i386/nexus.c,v 1.43 2001/02/09
+ */
+
+#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/pcpu.h>
+#include <sys/rman.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+#include <dev/ofw/ofw_nexus.h>
+#include <dev/ofw/openfirm.h>
+
+#include <machine/bus.h>
+#include <machine/intr_machdep.h>
+#include <machine/resource.h>
+
+/*
+ * The nexus (which is a pseudo-bus actually) iterates over the nodes that
+ * hang from the Open Firmware root node and adds them as devices to this bus
+ * (except some special nodes which are excluded) so that drivers can be
+ * attached to them.
+ *
+ * Additionally, interrupt setup/teardown and some resource management are
+ * done at this level.
+ */
+
+static bus_setup_intr_t nexus_setup_intr;
+static bus_teardown_intr_t nexus_teardown_intr;
+static bus_activate_resource_t nexus_activate_resource;
+static bus_deactivate_resource_t nexus_deactivate_resource;
+#ifdef SMP
+static bus_bind_intr_t nexus_bind_intr;
+#endif
+static bus_config_intr_t nexus_config_intr;
+static ofw_bus_map_intr_t nexus_ofw_map_intr;
+static ofw_bus_config_intr_t nexus_ofw_config_intr;
+
+static device_method_t nexus_methods[] = {
+	/* Bus interface */
+	DEVMETHOD(bus_activate_resource,	nexus_activate_resource),
+	DEVMETHOD(bus_deactivate_resource,	nexus_deactivate_resource),
+	DEVMETHOD(bus_setup_intr,	nexus_setup_intr),
+	DEVMETHOD(bus_teardown_intr,	nexus_teardown_intr),
+#ifdef SMP
+	DEVMETHOD(bus_bind_intr,	nexus_bind_intr),
+#endif
+	DEVMETHOD(bus_config_intr,	nexus_config_intr),
+
+	/* ofw_bus interface */
+	DEVMETHOD(ofw_bus_map_intr,	nexus_ofw_map_intr),
+	DEVMETHOD(ofw_bus_config_intr,	nexus_ofw_config_intr),
+
+	DEVMETHOD_END
+};
+
+static devclass_t nexus_devclass;
+
+DEFINE_CLASS_1(nexus, nexus_driver, nexus_methods,
+    sizeof(struct ofw_nexus_softc), ofw_nexus_driver);
+EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0,
+    BUS_PASS_BUS);
+MODULE_VERSION(nexus, 1);
+
+static int
+nexus_setup_intr(device_t bus __unused, device_t child, struct resource *r,
+    int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg,
+    void **cookiep)
+{
+	int error;
+
+	if (r == NULL)
+		panic("%s: NULL interrupt resource!", __func__);
+
+	if ((rman_get_flags(r) & RF_SHAREABLE) == 0)
+		flags |= INTR_EXCL;
+
+	/* We depend here on rman_activate_resource() being idempotent. */
+	error = rman_activate_resource(r);
+	if (error)
+		return (error);
+
+	error = powerpc_setup_intr(device_get_nameunit(child),
+	    rman_get_start(r), filt, intr, arg, flags, cookiep);
+
+	return (error);
+}
+
+static int
+nexus_teardown_intr(device_t bus __unused, device_t child __unused,
+    struct resource *r, void *ih)
+{
+        
+	if (r == NULL)
+		return (EINVAL);
+
+	return (powerpc_teardown_intr(ih));
+}
+
+#ifdef SMP
+static int
+nexus_bind_intr(device_t bus __unused, device_t child __unused,
+    struct resource *r, int cpu)
+{
+
+	return (powerpc_bind_intr(rman_get_start(r), cpu));
+}
+#endif
+
+static int
+nexus_config_intr(device_t dev, int irq, enum intr_trigger trig,
+    enum intr_polarity pol)
+{
+ 
+	return (powerpc_config_intr(irq, trig, pol));
+} 
+
+static int
+nexus_ofw_map_intr(device_t dev, device_t child, phandle_t iparent, int irq)
+{
+	return (MAP_IRQ(iparent, irq));
+}
+
+static int
+nexus_ofw_config_intr(device_t dev, device_t child, int irq, int sense)
+{
+ 
+	return (powerpc_fw_config_intr(irq, sense));
+} 
+
+static int
+nexus_activate_resource(device_t bus __unused, device_t child __unused,
+    int type, int rid __unused, struct resource *r)
+{
+
+	if (type == SYS_RES_MEMORY) {
+		vm_offset_t start;
+		void *p;
+
+		start = (vm_offset_t) rman_get_start(r);
+		if (bootverbose)
+			printf("nexus mapdev: start %zx, len %ld\n", start,
+			    rman_get_size(r));
+
+		p = pmap_mapdev(start, (vm_size_t) rman_get_size(r));
+		if (p == NULL)
+			return (ENOMEM);
+		rman_set_virtual(r, p);
+		rman_set_bustag(r, &bs_be_tag);
+		rman_set_bushandle(r, (u_long)p);
+	}
+	return (rman_activate_resource(r));
+}
+
+static int
+nexus_deactivate_resource(device_t bus __unused, device_t child __unused,
+    int type __unused, int rid __unused, struct resource *r)
+{
+
+	/*
+	 * If this is a memory resource, unmap it.
+	 */
+	if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) {
+		bus_size_t psize;
+
+		psize = rman_get_size(r);
+		pmap_unmapdev((vm_offset_t)rman_get_virtual(r), psize);
+	}
+
+	return (rman_deactivate_resource(r));
+}
+
diff --git a/sys/powerpc/powerpc/pic_if.m b/sys/powerpc/powerpc/pic_if.m
index e429d31f503..f42c31a0692 100644
--- a/sys/powerpc/powerpc/pic_if.m
+++ b/sys/powerpc/powerpc/pic_if.m
@@ -33,12 +33,31 @@
 
 INTERFACE pic;
 
+CODE {
+	static pic_translate_code_t pic_translate_code_default;
+
+	static void pic_translate_code_default(device_t dev, u_int irq,
+	    int code, enum intr_trigger *trig, enum intr_polarity *pol)
+	{
+		*trig = INTR_TRIGGER_CONFORM;
+		*pol = INTR_POLARITY_CONFORM;
+	}
+};
+
 METHOD void bind {
 	device_t	dev;
 	u_int		irq;
 	cpuset_t	cpumask;
 };
 
+METHOD void translate_code {
+	device_t	dev;
+	u_int		irq;
+	int		code;
+	enum intr_trigger *trig;
+	enum intr_polarity *pol;
+} DEFAULT pic_translate_code_default;
+
 METHOD void config {
 	device_t	dev;
 	u_int		irq;
diff --git a/sys/powerpc/powerpc/platform.c b/sys/powerpc/powerpc/platform.c
index 6f7e7b56115..066045cf5cd 100644
--- a/sys/powerpc/powerpc/platform.c
+++ b/sys/powerpc/powerpc/platform.c
@@ -64,17 +64,94 @@ static char plat_name[64] = "";
 SYSCTL_STRING(_hw, OID_AUTO, platform, CTLFLAG_RD | CTLFLAG_TUN,
     plat_name, 0, "Platform currently in use");
 
-static struct mem_region *pregions = NULL;
-static struct mem_region *aregions = NULL;
+static struct mem_region pregions[PHYS_AVAIL_SZ];
+static struct mem_region aregions[PHYS_AVAIL_SZ];
 static int npregions, naregions;
 
+/*
+ * Memory region utilities: determine if two regions overlap,
+ * and merge two overlapping regions into one
+ */
+static int
+memr_overlap(struct mem_region *r1, struct mem_region *r2)
+{
+	if ((r1->mr_start + r1->mr_size) < r2->mr_start ||
+	    (r2->mr_start + r2->mr_size) < r1->mr_start)
+		return (FALSE);
+
+	return (TRUE);
+}
+
+static void
+memr_merge(struct mem_region *from, struct mem_region *to)
+{
+	vm_offset_t end;
+	end = ulmax(to->mr_start + to->mr_size, from->mr_start + from->mr_size);
+	to->mr_start = ulmin(from->mr_start, to->mr_start);
+	to->mr_size = end - to->mr_start;
+}
+
+/*
+ * Quick sort callout for comparing memory regions.
+ */
+static int
+mr_cmp(const void *a, const void *b)
+{
+	const struct mem_region *regiona, *regionb;
+
+	regiona = a;
+	regionb = b;
+	if (regiona->mr_start < regionb->mr_start)
+		return (-1);
+	else if (regiona->mr_start > regionb->mr_start)
+		return (1);
+	else
+		return (0);
+}
+
 void
 mem_regions(struct mem_region **phys, int *physsz, struct mem_region **avail,
     int *availsz)
 {
-	if (pregions == NULL)
-		PLATFORM_MEM_REGIONS(plat_obj, &pregions, &npregions,
-		    &aregions, &naregions);
+	int i, j, still_merging;
+
+	if (npregions == 0) {
+		PLATFORM_MEM_REGIONS(plat_obj, &pregions[0], &npregions,
+		    aregions, &naregions);
+		qsort(pregions, npregions, sizeof(*pregions), mr_cmp);
+		qsort(aregions, naregions, sizeof(*aregions), mr_cmp);
+
+		/* Remove overlapping available regions */
+		do {
+			still_merging = FALSE;
+			for (i = 0; i < naregions; i++) {
+				if (aregions[i].mr_size == 0)
+					continue;
+				for (j = i+1; j < naregions; j++) {
+					if (aregions[j].mr_size == 0)
+						continue;
+					if (!memr_overlap(&aregions[j],
+					    &aregions[i]))
+						continue;
+
+					memr_merge(&aregions[j], &aregions[i]);
+					/* mark inactive */
+					aregions[j].mr_size = 0;
+					still_merging = TRUE;
+				}
+			}
+		} while (still_merging == TRUE);
+
+		/* Collapse zero-length available regions */
+		for (i = 0; i < naregions; i++) {
+			if (aregions[i].mr_size == 0) {
+				memcpy(&aregions[i], &aregions[i+1],
+				    (naregions - i - 1)*sizeof(*aregions));
+				naregions--;
+				i--;
+			}
+		}
+	}
 
 	*phys = pregions;
 	*avail = aregions;
@@ -87,9 +164,11 @@ mem_valid(vm_offset_t addr, int len)
 {
 	int i;
 
-	if (pregions == NULL)
-		PLATFORM_MEM_REGIONS(plat_obj, &pregions, &npregions,
-		    &aregions, &naregions);
+	if (npregions == 0) {
+		struct mem_region *p, *a;
+		int na, np;
+		mem_regions(&p, &np, &a, &na);
+	}
 
 	for (i = 0; i < npregions; i++)
 		if ((addr >= pregions[i].mr_start)
diff --git a/sys/powerpc/powerpc/platform_if.m b/sys/powerpc/powerpc/platform_if.m
index cd878e02b6c..587811b1c52 100644
--- a/sys/powerpc/powerpc/platform_if.m
+++ b/sys/powerpc/powerpc/platform_if.m
@@ -120,9 +120,9 @@ METHOD int attach {
 
 METHOD void mem_regions {
 	platform_t	    _plat;
-	struct mem_region **_memp;
+	struct mem_region  *_memp;
 	int		   *_memsz;
-	struct mem_region **_availp;
+	struct mem_region  *_availp;
 	int		   *_availsz;
 };
 
diff --git a/sys/powerpc/aim/swtch32.S b/sys/powerpc/powerpc/swtch32.S
similarity index 97%
rename from sys/powerpc/aim/swtch32.S
rename to sys/powerpc/powerpc/swtch32.S
index fa87aba63c3..84f9eadc611 100644
--- a/sys/powerpc/aim/swtch32.S
+++ b/sys/powerpc/powerpc/swtch32.S
@@ -64,6 +64,7 @@
 #include <machine/trap.h>
 #include <machine/param.h>
 #include <machine/asm.h>
+#include <machine/spr.h>
 
 /*
  * void cpu_throw(struct thread *old, struct thread *new)
@@ -88,6 +89,10 @@ ENTRY(cpu_switch)
 	stw	%r16,PCB_CR(%r6)
 	mflr	%r16			/* Save the link register */
 	stw	%r16,PCB_LR(%r6)
+#ifdef BOOKE
+	mfspr	%r16,SPR_DBCR0
+	stw	%r16,PCB_BOOKE_DBCR0(%r6)
+#endif
 	stw	%r1,PCB_SP(%r6)		/* Save the stack pointer */
 
 	mr	%r14,%r3		/* Copy the old thread ptr... */
@@ -151,18 +156,24 @@ blocked_loop:
 	mr	%r3,%r2			/* Pass curthread to enable_vec */
 	bl	enable_vec
 
-	/* thread to restore is in r3 */
 .L4:
+	/* thread to restore is in r3 */
 	mr	%r3,%r17		/* Recover PCB ptr */
 	lmw	%r12,PCB_CONTEXT(%r3)	/* Load the non-volatile GP regs */
 	lwz	%r5,PCB_CR(%r3)		/* Load the condition register */
 	mtcr	%r5
 	lwz	%r5,PCB_LR(%r3)		/* Load the link register */
 	mtlr	%r5
+#ifdef AIM
 	lwz	%r5,PCB_AIM_USR_VSID(%r3) /* Load the USER_SR segment reg */
 	isync
 	mtsr	USER_SR,%r5
 	isync
+#endif
+#ifdef BOOKE
+	lwz	%r5,PCB_BOOKE_DBCR0(%r3)
+	mtspr	SPR_DBCR0,%r5
+#endif
 	lwz	%r1,PCB_SP(%r3)		/* Load the stack pointer */
 	/*
 	 * Perform a dummy stwcx. to clear any reservations we may have
diff --git a/sys/powerpc/aim/swtch64.S b/sys/powerpc/powerpc/swtch64.S
similarity index 100%
rename from sys/powerpc/aim/swtch64.S
rename to sys/powerpc/powerpc/swtch64.S
diff --git a/sys/powerpc/booke/vm_machdep.c b/sys/powerpc/powerpc/vm_machdep.c
similarity index 79%
rename from sys/powerpc/booke/vm_machdep.c
rename to sys/powerpc/powerpc/vm_machdep.c
index 4db39766b4f..d9d3987c23a 100644
--- a/sys/powerpc/booke/vm_machdep.c
+++ b/sys/powerpc/powerpc/vm_machdep.c
@@ -1,33 +1,3 @@
-/*-
- * Copyright (C) 2006 Semihalf, Marian Balakowicz <m8@semihalf.com>
- * Copyright (C) 2006 Semihalf, Rafal Jaworowski <raj@semihalf.com>
- * All rights reserved.
- *
- * Adapted for Freescale's e500 core CPUs.
- * sf_buf implementation was derived from sys/arm/arm/vm_machdep.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this 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.
- *
- *	from: $FreeBSD$
- */
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
  * Copyright (c) 1989, 1990 William Jolitz
@@ -48,8 +18,8 @@
  *    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.
+ *	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.
@@ -66,8 +36,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
+ *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
+ * $FreeBSD$
  */
 /*-
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -96,9 +67,6 @@
  * rights to redistribute these changes.
  */
 
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
@@ -113,18 +81,17 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/sf_buf.h>
-#include <sys/syscall.h>
 #include <sys/sysctl.h>
 #include <sys/sysent.h>
 #include <sys/unistd.h>
 
-#include <machine/clock.h>
 #include <machine/cpu.h>
+#include <machine/fpu.h>
 #include <machine/frame.h>
 #include <machine/md_var.h>
 #include <machine/pcb.h>
-#include <machine/spr.h>
-#include <machine/platform.h>
+
+#include <dev/ofw/openfirm.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
@@ -133,6 +100,13 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_map.h>
 #include <vm/vm_extern.h>
 
+/*
+ * On systems without a direct mapped region (e.g. PPC64),
+ * we use the same code as the Book E implementation. Since
+ * we need to have runtime detection of this, define some machinery
+ * for sf_bufs in this case, and ignore it on systems with direct maps.
+ */
+
 #ifndef NSFBUFS
 #define NSFBUFS		(512 + maxusers * 16)
 #endif
@@ -150,9 +124,9 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsused, CTLFLAG_RD, &nsfbufsused, 0,
 
 static void sf_buf_init(void *arg);
 SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL);
-
+ 
 LIST_HEAD(sf_head, sf_buf);
-
+ 
 /* A hash table of active sendfile(2) buffers */
 static struct sf_head *sf_buf_active;
 static u_long sf_buf_hashmask;
@@ -167,6 +141,11 @@ static u_int sf_buf_alloc_want;
  */
 static struct mtx sf_buf_lock;
 
+#ifdef __powerpc64__
+extern uintptr_t tocbase;
+#endif
+
+
 /*
  * Finish a fork operation, with process p2 nearly set up.
  * Copy and update the pcb, set up the stack so that the child
@@ -175,23 +154,20 @@ static struct mtx sf_buf_lock;
 void
 cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
 {
-	struct proc *p1;
-	struct trapframe *tf;
-	struct callframe *cf;
-	struct pcb *pcb;
+	struct	trapframe *tf;
+	struct	callframe *cf;
+	struct	pcb *pcb;
 
 	KASSERT(td1 == curthread || td1 == &thread0,
 	    ("cpu_fork: p1 not curproc and not proc0"));
-	CTR3(KTR_PROC, "cpu_fork: called td1=%08x p2=%08x flags=%x", (u_int)td1,
-	    (u_int)p2, flags);
+	CTR3(KTR_PROC, "cpu_fork: called td1=%p p2=%p flags=%x",
+	    td1, p2, flags);
 
 	if ((flags & RFPROC) == 0)
 		return;
 
-	p1 = td1->td_proc;
-
 	pcb = (struct pcb *)((td2->td_kstack +
-	    td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x3fU);
+	    td2->td_kstack_pages * PAGE_SIZE - sizeof(struct pcb)) & ~0x2fUL);
 	td2->td_pcb = pcb;
 
 	/* Copy the pcb */
@@ -214,19 +190,31 @@ cpu_fork(struct thread *td1, struct proc *p2, struct thread *td2, int flags)
 
 	cf = (struct callframe *)tf - 1;
 	memset(cf, 0, sizeof(struct callframe));
+	#ifdef __powerpc64__
+	cf->cf_toc = tocbase;
+	#endif
 	cf->cf_func = (register_t)fork_return;
 	cf->cf_arg0 = (register_t)td2;
 	cf->cf_arg1 = (register_t)tf;
 
 	pcb->pcb_sp = (register_t)cf;
+	KASSERT(pcb->pcb_sp % 16 == 0, ("stack misaligned"));
+	#ifdef __powerpc64__
+	pcb->pcb_lr = ((register_t *)fork_trampoline)[0];
+	pcb->pcb_toc = ((register_t *)fork_trampoline)[1];
+	#else
 	pcb->pcb_lr = (register_t)fork_trampoline;
+	#endif
+	#ifdef AIM
+	pcb->pcb_cpu.aim.usr_vsid = 0;
+	#endif
 
-	/* Setup to release sched_lock in fork_exit(). */
+	/* Setup to release spin count in fork_exit(). */
 	td2->td_md.md_spinlock_count = 1;
 	td2->td_md.md_saved_msr = PSL_KERNSET;
 
 	/*
-	 * Now cpu_switch() can schedule the new process.
+ 	 * Now cpu_switch() can schedule the new process.
 	 */
 }
 
@@ -241,8 +229,8 @@ cpu_set_fork_handler(struct thread *td, void (*func)(void *), void *arg)
 {
 	struct callframe *cf;
 
-	CTR3(KTR_PROC, "cpu_set_fork_handler: called with td=%08x func=%08x arg=%08x",
-	    (u_int)td, (u_int)func, (u_int)arg);
+	CTR4(KTR_PROC, "%s called with td=%p func=%p arg=%p",
+	    __func__, td, func, arg);
 
 	cf = (struct callframe *)td->td_pcb->pcb_sp;
 
@@ -266,13 +254,18 @@ sf_buf_init(void *arg)
 	vm_offset_t sf_base;
 	int i;
 
+	/* Don't bother on systems with a direct map */
+	if (hw_direct_map)
+		return;
+
 	nsfbufs = NSFBUFS;
 	TUNABLE_INT_FETCH("kern.ipc.nsfbufs", &nsfbufs);
 
 	sf_buf_active = hashinit(nsfbufs, M_TEMP, &sf_buf_hashmask);
 	TAILQ_INIT(&sf_buf_freelist);
 	sf_base = kva_alloc(nsfbufs * PAGE_SIZE);
-	sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, M_NOWAIT | M_ZERO);
+	sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP,
+	    M_NOWAIT | M_ZERO);
 
 	for (i = 0; i < nsfbufs; i++) {
 		sf_bufs[i].kva = sf_base + i * PAGE_SIZE;
@@ -292,6 +285,11 @@ sf_buf_alloc(struct vm_page *m, int flags)
 	struct sf_buf *sf;
 	int error;
 
+	if (hw_direct_map) {
+		/* Shortcut the direct mapped case */
+		return ((struct sf_buf *)m);
+	}
+
 	hash_list = &sf_buf_active[SF_BUF_HASH(m)];
 	mtx_lock(&sf_buf_lock);
 	LIST_FOREACH(sf, hash_list, list_entry) {
@@ -349,6 +347,8 @@ done:
 void
 sf_buf_free(struct sf_buf *sf)
 {
+	if (hw_direct_map)
+		return;
 
 	mtx_lock(&sf_buf_lock);
 	sf->ref_count--;
@@ -391,7 +391,9 @@ is_physical_memory(vm_offset_t addr)
 }
 
 /*
- * CPU threading functions related to VM.
+ * CPU threading functions related to the VM layer. These could be used
+ * to map the SLB bits required for the kernel stack instead of forcing a
+ * fixed-size KVA.
  */
 
 void
diff --git a/sys/powerpc/ps3/if_glc.c b/sys/powerpc/ps3/if_glc.c
index 178821221c8..3b34f1832e4 100644
--- a/sys/powerpc/ps3/if_glc.c
+++ b/sys/powerpc/ps3/if_glc.c
@@ -29,9 +29,11 @@
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/endian.h>
+#include <sys/lock.h>
 #include <sys/mbuf.h>
 #include <sys/module.h>
 #include <sys/malloc.h>
+#include <sys/mutex.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 
@@ -40,12 +42,11 @@
 
 #include <net/bpf.h>
 #include <net/if.h>
-#include <net/if_arp.h>
+#include <net/if_var.h>
 #include <net/ethernet.h>
-#include <net/if_dl.h>
 #include <net/if_media.h>
 #include <net/if_types.h>
-#include <net/if_vlan_var.h>
+#include <net/if_dl.h>
 
 #include <machine/pio.h>
 #include <machine/bus.h>
diff --git a/sys/powerpc/ps3/platform_ps3.c b/sys/powerpc/ps3/platform_ps3.c
index 207382d86fd..c772a8db370 100644
--- a/sys/powerpc/ps3/platform_ps3.c
+++ b/sys/powerpc/ps3/platform_ps3.c
@@ -58,8 +58,8 @@ extern void *ap_pcpu;
 
 static int ps3_probe(platform_t);
 static int ps3_attach(platform_t);
-static void ps3_mem_regions(platform_t, struct mem_region **phys, int *physsz,
-    struct mem_region **avail, int *availsz);
+static void ps3_mem_regions(platform_t, struct mem_region *phys, int *physsz,
+    struct mem_region *avail, int *availsz);
 static vm_offset_t ps3_real_maxaddr(platform_t);
 static u_long ps3_timebase_freq(platform_t, struct cpuref *cpuref);
 #ifdef SMP
@@ -107,11 +107,30 @@ ps3_probe(platform_t plat)
 	return (BUS_PROBE_NOWILDCARD);
 }
 
-#define MEM_REGIONS	2
-static struct mem_region avail_regions[MEM_REGIONS];
-
 static int
 ps3_attach(platform_t plat)
+{
+	uint64_t junk;
+	int count;
+	struct mem_region avail_regions[2];
+
+	ps3_mem_regions(plat, NULL, NULL, avail_regions, &count);
+
+	lv1_allocate_memory(avail_regions[1].mr_size, 24 /* 16 MB pages */,
+	    0, 0x04 /* any address */, &avail_regions[1].mr_start, &junk);
+
+	pmap_mmu_install("mmu_ps3", BUS_PROBE_SPECIFIC);
+	cpu_idle_hook = ps3_cpu_idle;
+
+	/* Set a breakpoint to make NULL an invalid address */
+	lv1_set_dabr(0x7 /* read and write, MMU on */, 2 /* kernel accesses */);
+
+	return (0);
+}
+
+void
+ps3_mem_regions(platform_t plat, struct mem_region *phys, int *physsz,
+    struct mem_region *avail_regions, int *availsz)
 {
 	uint64_t lpar_id, junk, ppe_id;
 
@@ -133,26 +152,12 @@ ps3_attach(platform_t plat)
 	/* Convert to maximum amount we can allocate in 16 MB pages */
 	avail_regions[1].mr_size -= avail_regions[0].mr_size;
 	avail_regions[1].mr_size -= avail_regions[1].mr_size % (16*1024*1024);
+	*availsz = 2;
 
-	lv1_allocate_memory(avail_regions[1].mr_size, 24 /* 16 MB pages */,
-	    0, 0x04 /* any address */, &avail_regions[1].mr_start, &junk);
-
-	pmap_mmu_install("mmu_ps3", BUS_PROBE_SPECIFIC);
-	cpu_idle_hook = ps3_cpu_idle;
-
-	/* Set a breakpoint to make NULL an invalid address */
-	lv1_set_dabr(0x7 /* read and write, MMU on */, 2 /* kernel accesses */);
-
-	return (0);
-}
-
-void
-ps3_mem_regions(platform_t plat, struct mem_region **phys, int *physsz,
-    struct mem_region **avail, int *availsz)
-{
-
-	*phys = *avail = avail_regions;
-	*physsz = *availsz = MEM_REGIONS;
+	if (phys != NULL) {
+		memcpy(phys, avail_regions, sizeof(*phys)*2);
+		*physsz = 2;
+	}
 }
 
 static u_long
@@ -241,7 +246,12 @@ ps3_reset(platform_t plat)
 static vm_offset_t
 ps3_real_maxaddr(platform_t plat)
 {
-	return (avail_regions[0].mr_start + avail_regions[0].mr_size);
+	struct mem_region *phys, *avail;
+	int nphys, navail;
+
+	mem_regions(&phys, &nphys, &avail, &navail);
+
+	return (phys[0].mr_start + phys[0].mr_size);
 }
 
 static void
diff --git a/sys/powerpc/pseries/mmu_phyp.c b/sys/powerpc/pseries/mmu_phyp.c
index 84cc3f5cf1f..cdf5dfefea5 100644
--- a/sys/powerpc/pseries/mmu_phyp.c
+++ b/sys/powerpc/pseries/mmu_phyp.c
@@ -165,8 +165,13 @@ mphyp_bootstrap(mmu_t mmup, vm_offset_t kernelstart, vm_offset_t kernelend)
 				nptlp--;
 			}
 		}
+
+		/* For now we allow shift only to be <= 0x18. */
+		if (shift >= 0x18)
+		    shift = 0x18;
+
 		moea64_large_page_shift = shift;
-		moea64_large_page_size = 1 << shift;
+		moea64_large_page_size = 1ULL << shift;
 	}
 
 	moea64_mid_bootstrap(mmup, kernelstart, kernelend);
diff --git a/sys/powerpc/pseries/phyp-hvcall.S b/sys/powerpc/pseries/phyp-hvcall.S
index 66bf97293df..d2ede10055f 100644
--- a/sys/powerpc/pseries/phyp-hvcall.S
+++ b/sys/powerpc/pseries/phyp-hvcall.S
@@ -36,6 +36,8 @@
 ASENTRY(phyp_hcall)
 	mflr	%r0
 	std	%r0,16(%r1)
+	ld	%r11,112(%r1)		/* Last couple args into volatile regs*/
+	ld	%r12,120(%r1)
 	hc				/* invoke the hypervisor */
 	ld	%r0,16(%r1)
 	mtlr	%r0
diff --git a/sys/powerpc/pseries/phyp_console.c b/sys/powerpc/pseries/phyp_console.c
index a72fe80c442..79d90940d7d 100644
--- a/sys/powerpc/pseries/phyp_console.c
+++ b/sys/powerpc/pseries/phyp_console.c
@@ -192,11 +192,9 @@ uart_phyp_cnprobe(struct consdev *cp)
 {
 	char buf[64];
 	ihandle_t stdout;
-	phandle_t input, opts, chosen;
+	phandle_t input, chosen;
 	static struct uart_phyp_softc sc;
 
-	if ((opts = OF_finddevice("/options")) == -1)
-		goto fail;
 	if ((chosen = OF_finddevice("/chosen")) == -1)
 		goto fail;
 
@@ -286,6 +284,7 @@ static int
 uart_phyp_get(struct uart_phyp_softc *sc, void *buffer, size_t bufsize)
 {
 	int err;
+	int hdr = 0;
 
 	uart_lock(&sc->sc_mtx);
 	if (sc->inbuflen == 0) {
@@ -296,6 +295,7 @@ uart_phyp_get(struct uart_phyp_softc *sc, void *buffer, size_t bufsize)
 			uart_unlock(&sc->sc_mtx);
 			return (-1);
 		}
+		hdr = 1; 
 	}
 
 	if (sc->inbuflen == 0) {
@@ -305,6 +305,14 @@ uart_phyp_get(struct uart_phyp_softc *sc, void *buffer, size_t bufsize)
 
 	if (bufsize > sc->inbuflen)
 		bufsize = sc->inbuflen;
+
+	if ((sc->protocol == HVTERMPROT) && (hdr == 1)) {
+		sc->inbuflen = sc->inbuflen - 4;
+		/* The VTERM protocol has a 4 byte header, skip it here. */
+		memmove(&sc->phyp_inbuf.str[0], &sc->phyp_inbuf.str[4],
+		    sc->inbuflen);
+	}
+
 	memcpy(buffer, sc->phyp_inbuf.str, bufsize);
 	sc->inbuflen -= bufsize;
 	if (sc->inbuflen > 0)
@@ -320,32 +328,40 @@ uart_phyp_put(struct uart_phyp_softc *sc, void *buffer, size_t bufsize)
 {
 	uint16_t seqno;
 	uint64_t len = 0;
+	int	err;
+
 	union {
-		uint64_t u64;
-		char bytes[8];
+		uint64_t u64[2];
+		char bytes[16];
 	} cbuf;
 
 	uart_lock(&sc->sc_mtx);
 	switch (sc->protocol) {
 	case HVTERM1:
-		if (bufsize > 8)
-			bufsize = 8;
+		if (bufsize > 16)
+			bufsize = 16;
 		memcpy(&cbuf, buffer, bufsize);
 		len = bufsize;
 		break;
 	case HVTERMPROT:
-		if (bufsize > 4)
-			bufsize = 4;
+		if (bufsize > 12)
+			bufsize = 12;
 		seqno = sc->outseqno++;
 		cbuf.bytes[0] = VS_DATA_PACKET_HEADER;
-		cbuf.bytes[1] = 4 + bufsize; /* total length */
+		cbuf.bytes[1] = 4 + bufsize; /* total length, max 16 bytes */
 		cbuf.bytes[2] = (seqno >> 8) & 0xff;
 		cbuf.bytes[3] = seqno & 0xff;
 		memcpy(&cbuf.bytes[4], buffer, bufsize);
 		len = 4 + bufsize;
 		break;
 	}
-	phyp_hcall(H_PUT_TERM_CHAR, sc->vtermid, len, cbuf.u64, 0);
+
+	do {
+	    err = phyp_hcall(H_PUT_TERM_CHAR, sc->vtermid, len, cbuf.u64[0],
+			    cbuf.u64[1]);
+		DELAY(100);
+	} while (err == H_BUSY);
+
 	uart_unlock(&sc->sc_mtx);
 
 	return (bufsize);
diff --git a/sys/powerpc/pseries/phyp_llan.c b/sys/powerpc/pseries/phyp_llan.c
new file mode 100644
index 00000000000..51f2bb14fd3
--- /dev/null
+++ b/sys/powerpc/pseries/phyp_llan.c
@@ -0,0 +1,499 @@
+/*-
+ * Copyright 2013 Nathan Whitehorn
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/sockio.h>
+#include <sys/endian.h>
+#include <sys/lock.h>
+#include <sys/mbuf.h>
+#include <sys/module.h>
+#include <sys/malloc.h>
+#include <sys/mutex.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+
+#include <net/bpf.h>
+#include <net/if.h>
+#include <net/if_var.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+#include <net/if_types.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/resource.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
+#include <powerpc/pseries/phyp-hvcall.h>
+
+#define LLAN_MAX_RX_PACKETS	100
+#define LLAN_MAX_TX_PACKETS	100
+#define LLAN_RX_BUF_LEN		8*PAGE_SIZE
+
+#define LLAN_BUFDESC_VALID	(1ULL << 63)
+#define LLAN_ADD_MULTICAST	0x1
+#define LLAN_DEL_MULTICAST	0x2
+#define LLAN_CLEAR_MULTICAST	0x3
+
+struct llan_xfer {
+	struct mbuf *rx_mbuf;
+	bus_dmamap_t rx_dmamap;
+	uint64_t rx_bufdesc;
+};
+
+struct llan_receive_queue_entry { /* PAPR page 539 */
+	uint8_t control;
+	uint8_t reserved;
+	uint16_t offset;
+	uint32_t length;
+	uint64_t handle;
+} __packed;
+
+struct llan_softc {
+	device_t	dev;
+	struct mtx	io_lock;
+
+	cell_t		unit;
+	uint8_t		mac_address[8];
+
+	int		irqid;
+	struct resource	*irq;
+	void		*irq_cookie;
+
+	bus_dma_tag_t	rx_dma_tag;
+	bus_dma_tag_t	rxbuf_dma_tag;
+	bus_dma_tag_t	tx_dma_tag;
+
+	bus_dmamap_t	tx_dma_map;
+
+	struct llan_receive_queue_entry *rx_buf;
+	int		rx_dma_slot;
+	int		rx_valid_val;
+	bus_dmamap_t	rx_buf_map;
+	bus_addr_t	rx_buf_phys;
+	bus_size_t	rx_buf_len;
+	bus_addr_t	input_buf_phys;
+	bus_addr_t	filter_buf_phys;
+	struct llan_xfer rx_xfer[LLAN_MAX_RX_PACKETS];
+
+	struct ifnet	*ifp;
+};
+
+static int	llan_probe(device_t);
+static int	llan_attach(device_t);
+static void	llan_intr(void *xsc);
+static void	llan_init(void *xsc);
+static void	llan_start(struct ifnet *ifp);
+static int	llan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
+static void	llan_rx_load_cb(void *xsc, bus_dma_segment_t *segs, int nsegs,
+		    int err);
+static int	llan_add_rxbuf(struct llan_softc *sc, struct llan_xfer *rx);
+static int	llan_set_multicast(struct llan_softc *sc);
+
+static devclass_t       llan_devclass;
+static device_method_t  llan_methods[] = {
+        DEVMETHOD(device_probe,         llan_probe),
+        DEVMETHOD(device_attach,        llan_attach),
+        
+        DEVMETHOD_END
+};
+static driver_t llan_driver = {
+        "llan",
+        llan_methods,
+        sizeof(struct llan_softc)
+};
+DRIVER_MODULE(llan, vdevice, llan_driver, llan_devclass, 0, 0);
+
+static int
+llan_probe(device_t dev)
+{
+	if (!ofw_bus_is_compatible(dev,"IBM,l-lan"))
+		return (ENXIO);
+
+	device_set_desc(dev, "POWER Hypervisor Virtual Ethernet");
+	return (0);
+}
+
+static int
+llan_attach(device_t dev)
+{
+	struct llan_softc *sc;
+	phandle_t node;
+	int error, i;
+
+	sc = device_get_softc(dev);
+	sc->dev = dev;
+
+	/* Get firmware properties */
+	node = ofw_bus_get_node(dev);
+	OF_getprop(node, "local-mac-address", sc->mac_address,
+	    sizeof(sc->mac_address));
+	OF_getprop(node, "reg", &sc->unit, sizeof(sc->unit));
+
+	mtx_init(&sc->io_lock, "llan", NULL, MTX_DEF);
+
+        /* Setup interrupt */
+	sc->irqid = 0;
+	sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &sc->irqid,
+	    RF_ACTIVE);
+
+	if (!sc->irq) {
+		device_printf(dev, "Could not allocate IRQ\n");
+		mtx_destroy(&sc->io_lock);
+		return (ENXIO);
+	}
+
+	bus_setup_intr(dev, sc->irq, INTR_TYPE_MISC | INTR_MPSAFE |
+	    INTR_ENTROPY, NULL, llan_intr, sc, &sc->irq_cookie);
+
+	/* Setup DMA */
+	error = bus_dma_tag_create(bus_get_dma_tag(dev), 16, 0,
+            BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
+	    LLAN_RX_BUF_LEN, 1, BUS_SPACE_MAXSIZE_32BIT,
+	    0, NULL, NULL, &sc->rx_dma_tag);
+	error = bus_dma_tag_create(bus_get_dma_tag(dev), 4, 0,
+            BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
+	    BUS_SPACE_MAXSIZE, 1, BUS_SPACE_MAXSIZE_32BIT,
+	    0, NULL, NULL, &sc->rxbuf_dma_tag);
+	error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
+            BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
+	    BUS_SPACE_MAXSIZE, 6, BUS_SPACE_MAXSIZE_32BIT, 0,
+	    busdma_lock_mutex, &sc->io_lock, &sc->tx_dma_tag);
+
+	error = bus_dmamem_alloc(sc->rx_dma_tag, (void **)&sc->rx_buf,
+	    BUS_DMA_WAITOK | BUS_DMA_ZERO, &sc->rx_buf_map);
+	error = bus_dmamap_load(sc->rx_dma_tag, sc->rx_buf_map, sc->rx_buf,
+	    LLAN_RX_BUF_LEN, llan_rx_load_cb, sc, 0);
+
+	/* TX DMA maps */
+	bus_dmamap_create(sc->tx_dma_tag, 0, &sc->tx_dma_map);
+
+	/* RX DMA */
+	for (i = 0; i < LLAN_MAX_RX_PACKETS; i++) {
+		error = bus_dmamap_create(sc->rxbuf_dma_tag, 0,
+		    &sc->rx_xfer[i].rx_dmamap);
+		sc->rx_xfer[i].rx_mbuf = NULL;
+	}
+
+	/* Attach to network stack */
+	sc->ifp = if_alloc(IFT_ETHER);
+	sc->ifp->if_softc = sc;
+
+	if_initname(sc->ifp, device_get_name(dev), device_get_unit(dev));
+	sc->ifp->if_mtu = ETHERMTU; /* XXX max-frame-size from OF? */
+	sc->ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
+	sc->ifp->if_hwassist = 0; /* XXX: ibm,illan-options */
+	sc->ifp->if_capabilities = 0;
+	sc->ifp->if_capenable = 0;
+	sc->ifp->if_start = llan_start;
+	sc->ifp->if_ioctl = llan_ioctl;
+	sc->ifp->if_init = llan_init;
+
+	IFQ_SET_MAXLEN(&sc->ifp->if_snd, LLAN_MAX_TX_PACKETS);
+	sc->ifp->if_snd.ifq_drv_maxlen = LLAN_MAX_TX_PACKETS;
+	IFQ_SET_READY(&sc->ifp->if_snd);
+
+	ether_ifattach(sc->ifp, &sc->mac_address[2]);
+
+	return (0);
+}
+
+static void
+llan_rx_load_cb(void *xsc, bus_dma_segment_t *segs, int nsegs, int err)
+{
+	struct llan_softc *sc = xsc;
+
+	sc->rx_buf_phys = segs[0].ds_addr;
+	sc->rx_buf_len = segs[0].ds_len - 2*PAGE_SIZE;
+	sc->input_buf_phys = segs[0].ds_addr + segs[0].ds_len - PAGE_SIZE;
+	sc->filter_buf_phys = segs[0].ds_addr + segs[0].ds_len - 2*PAGE_SIZE;
+}
+
+static void
+llan_init(void *xsc)
+{
+	struct llan_softc *sc = xsc;
+	uint64_t rx_buf_desc;
+	uint64_t macaddr;
+	int err, i;
+
+	mtx_lock(&sc->io_lock);
+
+	phyp_hcall(H_FREE_LOGICAL_LAN, sc->unit);
+
+	/* Create buffers (page 539) */
+	sc->rx_dma_slot = 0;
+	sc->rx_valid_val = 1;
+
+	rx_buf_desc = LLAN_BUFDESC_VALID;
+	rx_buf_desc |= (sc->rx_buf_len << 32);
+	rx_buf_desc |= sc->rx_buf_phys;
+	memcpy(&macaddr, sc->mac_address, 8);
+	err = phyp_hcall(H_REGISTER_LOGICAL_LAN, sc->unit, sc->input_buf_phys,
+	    rx_buf_desc, sc->filter_buf_phys, macaddr);
+
+	for (i = 0; i < LLAN_MAX_RX_PACKETS; i++)
+		llan_add_rxbuf(sc, &sc->rx_xfer[i]);
+
+	phyp_hcall(H_VIO_SIGNAL, sc->unit, 1); /* Enable interrupts */
+
+	/* Tell stack we're up */
+	sc->ifp->if_drv_flags |= IFF_DRV_RUNNING;
+	sc->ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
+
+	mtx_unlock(&sc->io_lock);
+}
+
+static int
+llan_add_rxbuf(struct llan_softc *sc, struct llan_xfer *rx)
+{
+	struct mbuf *m;
+	bus_dma_segment_t segs[1];
+	int error, nsegs;
+
+	mtx_assert(&sc->io_lock, MA_OWNED);
+
+	m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR);
+	if (m == NULL)
+		return (ENOBUFS);
+
+	m->m_len = m->m_pkthdr.len = m->m_ext.ext_size;
+	if (rx->rx_mbuf != NULL) {
+		bus_dmamap_sync(sc->rxbuf_dma_tag, rx->rx_dmamap,
+		    BUS_DMASYNC_POSTREAD);
+		bus_dmamap_unload(sc->rxbuf_dma_tag, rx->rx_dmamap);
+	}
+
+	/* Save pointer to buffer structure */
+	m_copyback(m, 0, 8, (void *)&rx);
+
+	error = bus_dmamap_load_mbuf_sg(sc->rxbuf_dma_tag, rx->rx_dmamap, m,
+	    segs, &nsegs, BUS_DMA_NOWAIT);
+	if (error != 0) {
+		device_printf(sc->dev,
+		    "cannot load RX DMA map %p, error = %d\n", rx, error);
+		m_freem(m);
+		return (error);
+	}
+
+	/* If nsegs is wrong then the stack is corrupt. */
+	KASSERT(nsegs == 1,
+	    ("%s: too many DMA segments (%d)", __func__, nsegs));
+	rx->rx_mbuf = m;
+
+	bus_dmamap_sync(sc->rxbuf_dma_tag, rx->rx_dmamap, BUS_DMASYNC_PREREAD);
+
+	rx->rx_bufdesc = LLAN_BUFDESC_VALID;
+	rx->rx_bufdesc |= (((uint64_t)segs[0].ds_len) << 32);
+	rx->rx_bufdesc |= segs[0].ds_addr;
+	error = phyp_hcall(H_ADD_LOGICAL_LAN_BUFFER, sc->unit, rx->rx_bufdesc);
+	if (error != 0) {
+		m_freem(m);
+		rx->rx_mbuf = NULL;
+		return (ENOBUFS);
+	}
+
+        return (0);
+}
+
+static void
+llan_intr(void *xsc)
+{
+	struct llan_softc *sc = xsc;
+	struct llan_xfer *rx;
+	struct mbuf *m;
+
+	mtx_lock(&sc->io_lock);
+	phyp_hcall(H_VIO_SIGNAL, sc->unit, 0);
+
+	while ((sc->rx_buf[sc->rx_dma_slot].control >> 7) == sc->rx_valid_val) {
+		rx = (struct llan_xfer *)sc->rx_buf[sc->rx_dma_slot].handle;
+		m = rx->rx_mbuf;
+		m_adj(m, sc->rx_buf[sc->rx_dma_slot].offset - 8);
+		m->m_len = sc->rx_buf[sc->rx_dma_slot].length;
+
+		/* llan_add_rxbuf does DMA sync and unload as well as requeue */
+		if (llan_add_rxbuf(sc, rx) != 0) {
+			sc->ifp->if_ierrors++;
+			phyp_hcall(H_ADD_LOGICAL_LAN_BUFFER, sc->unit,
+			    rx->rx_bufdesc);
+			continue;
+		}
+
+		sc->ifp->if_ipackets++;
+		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;
+		m->m_pkthdr.len = m->m_len;
+		sc->rx_dma_slot++;
+
+		if (sc->rx_dma_slot >= sc->rx_buf_len/sizeof(sc->rx_buf[0])) {
+			sc->rx_dma_slot = 0;
+			sc->rx_valid_val = !sc->rx_valid_val;
+		}
+
+		mtx_unlock(&sc->io_lock);
+		(*sc->ifp->if_input)(sc->ifp, m);
+		mtx_lock(&sc->io_lock);
+	}
+
+	phyp_hcall(H_VIO_SIGNAL, sc->unit, 1);
+	mtx_unlock(&sc->io_lock);
+}
+
+static void
+llan_send_packet(void *xsc, bus_dma_segment_t *segs, int nsegs,
+    bus_size_t mapsize, int error)
+{
+	struct llan_softc *sc = xsc;
+	uint64_t bufdescs[6];
+	int i;
+
+	bzero(bufdescs, sizeof(bufdescs));
+
+	for (i = 0; i < nsegs; i++) {
+		bufdescs[i] = LLAN_BUFDESC_VALID;
+		bufdescs[i] |= (((uint64_t)segs[i].ds_len) << 32);
+		bufdescs[i] |= segs[i].ds_addr;
+	}
+
+	phyp_hcall(H_SEND_LOGICAL_LAN, sc->unit, bufdescs[0],
+	    bufdescs[1], bufdescs[2], bufdescs[3], bufdescs[4], bufdescs[5], 0);
+	/*
+	 * The hypercall returning implies completion -- or that the call will
+	 * not complete. In principle, we should try a few times if we get back
+	 * H_BUSY based on the continuation token in R4. For now, just drop
+	 * the packet in such cases.
+	 */
+}
+
+static void
+llan_start_locked(struct ifnet *ifp)
+{
+	struct llan_softc *sc = ifp->if_softc;
+	bus_addr_t first;
+	int nsegs;
+	struct mbuf *mb_head, *m;
+
+	mtx_assert(&sc->io_lock, MA_OWNED);
+	first = 0;
+
+	if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) !=
+	    IFF_DRV_RUNNING)
+		return;
+
+	while (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) {
+		IFQ_DRV_DEQUEUE(&ifp->if_snd, mb_head);
+
+		if (mb_head == NULL)
+			break;
+
+		BPF_MTAP(ifp, mb_head);
+
+		for (m = mb_head, nsegs = 0; m != NULL; m = m->m_next)
+			nsegs++;
+		if (nsegs > 6) {
+			m = m_collapse(mb_head, M_NOWAIT, 6);
+			if (m == NULL) {
+				m_freem(mb_head);
+				continue;
+			}
+		}
+
+		bus_dmamap_load_mbuf(sc->tx_dma_tag, sc->tx_dma_map,
+			mb_head, llan_send_packet, sc, 0);
+		bus_dmamap_unload(sc->tx_dma_tag, sc->tx_dma_map);
+		m_freem(mb_head);
+	}
+}
+
+static void
+llan_start(struct ifnet *ifp)
+{
+	struct llan_softc *sc = ifp->if_softc;
+
+	mtx_lock(&sc->io_lock);
+	llan_start_locked(ifp);
+	mtx_unlock(&sc->io_lock);
+}
+
+static int
+llan_set_multicast(struct llan_softc *sc)
+{
+	struct ifnet *ifp = sc->ifp;
+	struct ifmultiaddr *inm;
+	uint64_t macaddr;
+
+	mtx_assert(&sc->io_lock, MA_OWNED);
+
+	phyp_hcall(H_MULTICAST_CTRL, sc->unit, LLAN_CLEAR_MULTICAST, 0);
+
+	if_maddr_rlock(ifp);
+	TAILQ_FOREACH(inm, &ifp->if_multiaddrs, ifma_link) {
+		if (inm->ifma_addr->sa_family != AF_LINK)
+			continue;
+
+		memcpy((uint8_t *)&macaddr + 2,
+		    LLADDR((struct sockaddr_dl *)inm->ifma_addr), 6);
+		phyp_hcall(H_MULTICAST_CTRL, sc->unit, LLAN_ADD_MULTICAST,
+		    macaddr);
+	}
+	if_maddr_runlock(ifp);
+
+	return (0);
+}
+
+static int
+llan_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
+{
+	int err = 0;
+	struct llan_softc *sc = ifp->if_softc;
+
+	switch (cmd) {
+	case SIOCADDMULTI:
+	case SIOCDELMULTI:
+		mtx_lock(&sc->io_lock);
+		if ((sc->ifp->if_drv_flags & IFF_DRV_RUNNING) != 0)
+			llan_set_multicast(sc);
+		mtx_unlock(&sc->io_lock);
+		break;
+	case SIOCSIFFLAGS:
+	default:
+		err = ether_ioctl(ifp, cmd, data);
+		break;
+	}
+
+	return (err);
+}
+
diff --git a/sys/powerpc/pseries/phyp_vscsi.c b/sys/powerpc/pseries/phyp_vscsi.c
index e3a1fec5d2a..fab7743c495 100644
--- a/sys/powerpc/pseries/phyp_vscsi.c
+++ b/sys/powerpc/pseries/phyp_vscsi.c
@@ -548,12 +548,6 @@ vscsi_task_management(struct vscsi_softc *sc, union ccb *ccb)
 	TAILQ_REMOVE(&sc->free_xferq, xp, queue);
 	TAILQ_INSERT_TAIL(&sc->active_xferq, xp, queue);
 
-	if (!(ccb->ccb_h.xflags & CAM_EXTLUN_VALID)) {
-		ccb->ccb_h.xflags |= CAM_EXTLUN_VALID;
-		ccb->ccb_h.ext_lun.lun64 = (0x1UL << 62) |
-		    ((uint64_t)ccb->ccb_h.target_lun << 48);
-	}
-
 	xp->srp_iu_size = crq.iu_length = sizeof(*cmd);
 	err = vmem_alloc(xp->sc->srp_iu_arena, xp->srp_iu_size,
 	    M_BESTFIT | M_NOWAIT, &xp->srp_iu_offset);
@@ -565,7 +559,7 @@ vscsi_task_management(struct vscsi_softc *sc, union ccb *ccb)
 	bzero(cmd, xp->srp_iu_size);
 	cmd->type = SRP_TSK_MGMT;
 	cmd->tag = (uint64_t)xp;
-	cmd->lun = ccb->ccb_h.ext_lun.lun64;
+	cmd->lun = htobe64(CAM_EXTLUN_BYTE_SWIZZLE(ccb->ccb_h.target_lun));
 
 	switch (ccb->ccb_h.func_code) {
 	case XPT_RESET_DEV:
@@ -608,12 +602,6 @@ vscsi_scsi_command(void *xxp, bus_dma_segment_t *segs, int nsegs, int err)
 	cdb = (ccb->ccb_h.flags & CAM_CDB_POINTER) ?
 	    ccb->csio.cdb_io.cdb_ptr : ccb->csio.cdb_io.cdb_bytes;
 
-	if (!(ccb->ccb_h.xflags & CAM_EXTLUN_VALID)) {
-		ccb->ccb_h.xflags |= CAM_EXTLUN_VALID;
-		ccb->ccb_h.ext_lun.lun64 = (0x1UL << 62) |
-		    ((uint64_t)ccb->ccb_h.target_lun << 48);
-	}
-
 	/* Command format from Table 20, page 37 of SRP spec */
 	crq.iu_length = 48 + ((nsegs > 1) ? 20 : 16) + 
 	    ((ccb->csio.cdb_len > 16) ? (ccb->csio.cdb_len - 16) : 0);
@@ -635,7 +623,7 @@ vscsi_scsi_command(void *xxp, bus_dma_segment_t *segs, int nsegs, int err)
 	memcpy(cmd->cdb, cdb, ccb->csio.cdb_len);
 
 	cmd->tag = (uint64_t)(xp); /* Let the responder find this again */
-	cmd->lun = ccb->ccb_h.ext_lun.lun64;
+	cmd->lun = htobe64(CAM_EXTLUN_BYTE_SWIZZLE(ccb->ccb_h.target_lun));
 
 	if (nsegs > 1) {
 		/* Use indirect descriptors */
diff --git a/sys/powerpc/pseries/platform_chrp.c b/sys/powerpc/pseries/platform_chrp.c
index 8d0f857037c..115d062b480 100644
--- a/sys/powerpc/pseries/platform_chrp.c
+++ b/sys/powerpc/pseries/platform_chrp.c
@@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <machine/rtas.h>
 #include <machine/smp.h>
 #include <machine/spr.h>
-#include <machine/trap_aim.h>
+#include <machine/trap.h>
 
 #include <dev/ofw/openfirm.h>
 #include <machine/ofw_machdep.h>
@@ -65,8 +65,8 @@ static vm_offset_t realmaxaddr = VM_MAX_ADDRESS;
 
 static int chrp_probe(platform_t);
 static int chrp_attach(platform_t);
-void chrp_mem_regions(platform_t, struct mem_region **phys, int *physsz,
-    struct mem_region **avail, int *availsz);
+void chrp_mem_regions(platform_t, struct mem_region *phys, int *physsz,
+    struct mem_region *avail, int *availsz);
 static vm_offset_t chrp_real_maxaddr(platform_t);
 static u_long chrp_timebase_freq(platform_t, struct cpuref *cpuref);
 static int chrp_smp_first_cpu(platform_t, struct cpuref *cpuref);
@@ -157,11 +157,107 @@ chrp_attach(platform_t plat)
 	return (0);
 }
 
-void
-chrp_mem_regions(platform_t plat, struct mem_region **phys, int *physsz,
-    struct mem_region **avail, int *availsz)
+static int
+parse_drconf_memory(struct mem_region *ofmem, int *msz,
+		    struct mem_region *ofavail, int *asz)
 {
-	ofw_mem_regions(phys,physsz,avail,availsz);
+	phandle_t phandle;
+	vm_offset_t base;
+	int i, idx, len, lasz, lmsz, res;
+	uint32_t flags, lmb_size[2];
+	uint64_t *dmem;
+
+	lmsz = *msz;
+	lasz = *asz;
+
+	phandle = OF_finddevice("/ibm,dynamic-reconfiguration-memory");
+	if (phandle == -1)
+		/* No drconf node, return. */
+		return (0);
+
+	res = OF_getprop(phandle, "ibm,lmb-size", lmb_size, sizeof(lmb_size));
+	if (res == -1)
+		return (0);
+	printf("Logical Memory Block size: %d MB\n", lmb_size[1] >> 20);
+
+	/* Parse the /ibm,dynamic-memory.
+	   The first position gives the # of entries. The next two words
+ 	   reflect the address of the memory block. The next four words are
+	   the DRC index, reserved, list index and flags.
+	   (see PAPR C.6.6.2 ibm,dynamic-reconfiguration-memory)
+	   
+	    #el  Addr   DRC-idx  res   list-idx  flags
+	   -------------------------------------------------
+	   | 4 |   8   |   4   |   4   |   4   |   4   |....
+	   -------------------------------------------------
+	*/
+
+	len = OF_getproplen(phandle, "ibm,dynamic-memory");
+	if (len > 0) {
+
+		/* We have to use a variable length array on the stack
+		   since we have very limited stack space.
+		*/
+		cell_t arr[len/sizeof(cell_t)];
+
+		res = OF_getprop(phandle, "ibm,dynamic-memory", &arr,
+				 sizeof(arr));
+		if (res == -1)
+			return (0);
+
+		/* Number of elements */
+		idx = arr[0];
+
+		/* First address, in arr[1], arr[2]*/
+		dmem = (uint64_t*)&arr[1];
+	
+		for (i = 0; i < idx; i++) {
+			base = *dmem;
+			dmem += 2;
+			flags = *dmem;
+			/* Use region only if available and not reserved. */
+			if ((flags & 0x8) && !(flags & 0x80)) {
+				ofmem[lmsz].mr_start = base;
+				ofmem[lmsz].mr_size = (vm_size_t)lmb_size[1];
+				ofavail[lasz].mr_start = base;
+				ofavail[lasz].mr_size = (vm_size_t)lmb_size[1];
+				lmsz++;
+				lasz++;
+			}
+			dmem++;
+		}
+	}
+
+	*msz = lmsz;
+	*asz = lasz;
+
+	return (1);
+}
+
+void
+chrp_mem_regions(platform_t plat, struct mem_region *phys, int *physsz,
+    struct mem_region *avail, int *availsz)
+{
+	vm_offset_t maxphysaddr;
+	int i;
+
+	ofw_mem_regions(phys, physsz, avail, availsz);
+	parse_drconf_memory(phys, physsz, avail, availsz);
+
+	/*
+	 * On some firmwares (SLOF), some memory may be marked available that
+	 * doesn't actually exist. This manifests as an extension of the last
+	 * available segment past the end of physical memory, so truncate that
+	 * one.
+	 */
+	maxphysaddr = 0;
+	for (i = 0; i < *physsz; i++)
+		if (phys[i].mr_start + phys[i].mr_size > maxphysaddr)
+			maxphysaddr = phys[i].mr_start + phys[i].mr_size;
+
+	for (i = 0; i < *availsz; i++)
+		if (avail[i].mr_start + avail[i].mr_size > maxphysaddr)
+			avail[i].mr_size = maxphysaddr - avail[i].mr_start;
 }
 
 static vm_offset_t
diff --git a/sys/powerpc/pseries/plpar_iommu.c b/sys/powerpc/pseries/plpar_iommu.c
index 3b67a3888e8..8db374c7bd6 100644
--- a/sys/powerpc/pseries/plpar_iommu.c
+++ b/sys/powerpc/pseries/plpar_iommu.c
@@ -69,14 +69,15 @@ struct dma_window {
 };
 
 int
-phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag)
+phyp_iommu_set_dma_tag(device_t bus, device_t dev, bus_dma_tag_t tag)
 {
 	device_t p;
 	phandle_t node;
-	cell_t dma_acells, dma_scells, dmawindow[5];
+	cell_t dma_acells, dma_scells, dmawindow[6];
 	struct iommu_map *i;
+	int cell;
 
-	for (p = child; p != NULL; p = device_get_parent(p)) {
+	for (p = dev; device_get_parent(p) != NULL; p = device_get_parent(p)) {
 		if (ofw_bus_has_prop(p, "ibm,my-dma-window"))
 			break;
 		if (ofw_bus_has_prop(p, "ibm,dma-window"))
@@ -104,17 +105,20 @@ phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag)
 
 	struct dma_window *window = malloc(sizeof(struct dma_window),
 	    M_PHYPIOMMU, M_WAITOK);
-	if (dma_acells == 1)
-		window->start = dmawindow[1];
-	else
-		window->start = ((uint64_t)(dmawindow[1]) << 32) | dmawindow[2];
-	if (dma_scells == 1)
-		window->end = window->start + dmawindow[dma_acells + 1];
-	else
-		window->end = window->start +
-		    (((uint64_t)(dmawindow[dma_acells + 1]) << 32) |
-		    dmawindow[dma_acells + 2]);
+	window->start = 0;
+	for (cell = 1; cell < 1 + dma_acells; cell++) {
+		window->start <<= 32;
+		window->start |= dmawindow[cell];
+	}
+	window->end = 0;
+	for (; cell < 1 + dma_acells + dma_scells; cell++) {
+		window->end <<= 32;
+		window->end |= dmawindow[cell];
+	}
+	window->end += window->start;
 
+	if (bootverbose)
+		device_printf(dev, "Mapping IOMMU domain %#x\n", dmawindow[0]);
 	window->map = NULL;
 	SLIST_FOREACH(i, &iommu_map_head, entries) {
 		if (i->iobn == dmawindow[0]) {
@@ -134,6 +138,7 @@ phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag)
 		window->map->vmem = vmem_create("IOMMU mappings", PAGE_SIZE,
 		    trunc_page(VMEM_ADDR_MAX) - PAGE_SIZE, PAGE_SIZE, 0,
 		    M_BESTFIT | M_NOWAIT);
+		SLIST_INSERT_HEAD(&iommu_map_head, window->map, entries);
 	}
 
 	/*
@@ -145,7 +150,7 @@ phyp_iommu_set_dma_tag(device_t dev, device_t child, bus_dma_tag_t tag)
 		papr_supports_stuff_tce = !(phyp_hcall(H_STUFF_TCE,
 		    window->map->iobn, 0, 0, 0) == H_FUNCTION);
 
-	bus_dma_tag_set_iommu(tag, dev, window);
+	bus_dma_tag_set_iommu(tag, bus, window);
 
 	return (0);
 }
diff --git a/sys/powerpc/pseries/plpar_pcibus.c b/sys/powerpc/pseries/plpar_pcibus.c
new file mode 100644
index 00000000000..640212f53f1
--- /dev/null
+++ b/sys/powerpc/pseries/plpar_pcibus.c
@@ -0,0 +1,113 @@
+/*-
+ * Copyright (c) 2011 Nathan Whitehorn
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/libkern.h>
+#include <sys/module.h>
+#include <sys/pciio.h>
+
+#include <dev/ofw/openfirm.h>
+
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pci_private.h>
+
+#include <machine/bus.h>
+#include <machine/rtas.h>
+
+#include <powerpc/ofw/ofw_pcibus.h>
+#include <powerpc/pseries/plpar_iommu.h>
+
+#include "pci_if.h"
+#include "iommu_if.h"
+
+static int		plpar_pcibus_probe(device_t);
+static bus_dma_tag_t	plpar_pcibus_get_dma_tag(device_t dev, device_t child);
+
+/*
+ * Driver methods.
+ */
+static device_method_t	plpar_pcibus_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		plpar_pcibus_probe),
+
+	/* IOMMU functions */
+	DEVMETHOD(bus_get_dma_tag,	plpar_pcibus_get_dma_tag),
+	DEVMETHOD(iommu_map,		phyp_iommu_map),
+	DEVMETHOD(iommu_unmap,		phyp_iommu_unmap),
+
+	DEVMETHOD_END
+};
+
+static devclass_t pci_devclass;
+DEFINE_CLASS_1(pci, plpar_pcibus_driver, plpar_pcibus_methods,
+    sizeof(struct pci_softc), ofw_pcibus_driver);
+DRIVER_MODULE(plpar_pcibus, pcib, plpar_pcibus_driver, pci_devclass, 0, 0);
+
+static int
+plpar_pcibus_probe(device_t dev)
+{
+	phandle_t rtas;
+ 
+	if (ofw_bus_get_node(dev) == -1 || !rtas_exists())
+		return (ENXIO);
+
+	rtas = OF_finddevice("/rtas");
+	if (!OF_hasprop(rtas, "ibm,hypertas-functions"))
+		return (ENXIO);
+
+	device_set_desc(dev, "POWER Hypervisor PCI bus");
+
+	return (BUS_PROBE_SPECIFIC);
+}
+
+static bus_dma_tag_t
+plpar_pcibus_get_dma_tag(device_t dev, device_t child)
+{
+	struct ofw_pcibus_devinfo *dinfo;
+
+	while (device_get_parent(child) != dev)
+		child = device_get_parent(child);
+
+	dinfo = device_get_ivars(child);
+
+	if (dinfo->opd_dma_tag != NULL)
+		return (dinfo->opd_dma_tag);
+
+	bus_dma_tag_create(bus_get_dma_tag(dev),
+	    1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
+	    NULL, NULL, BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED,
+	    BUS_SPACE_MAXSIZE, 0, NULL, NULL, &dinfo->opd_dma_tag);
+	phyp_iommu_set_dma_tag(dev, child, dinfo->opd_dma_tag);
+
+	return (dinfo->opd_dma_tag);
+}
+
diff --git a/sys/powerpc/pseries/rtas_pci.c b/sys/powerpc/pseries/rtas_pci.c
index f3e9a29a655..0835a279e75 100644
--- a/sys/powerpc/pseries/rtas_pci.c
+++ b/sys/powerpc/pseries/rtas_pci.c
@@ -73,11 +73,6 @@ static u_int32_t	rtaspci_read_config(device_t, u_int, u_int, u_int,
 static void		rtaspci_write_config(device_t, u_int, u_int, u_int,
 			    u_int, u_int32_t, int);
 
-/*
- * IOMMU LPAR interface
- */
-static bus_dma_tag_t	rtaspci_get_dma_tag(device_t dev, device_t child);
-
 /*
  * Driver methods.
  */
@@ -90,19 +85,11 @@ static device_method_t	rtaspci_methods[] = {
 	DEVMETHOD(pcib_read_config,	rtaspci_read_config),
 	DEVMETHOD(pcib_write_config,	rtaspci_write_config),
 
-	/* IOMMU functions */
-	DEVMETHOD(bus_get_dma_tag,	rtaspci_get_dma_tag),
-#ifdef __powerpc64__
-	DEVMETHOD(iommu_map,		phyp_iommu_map),
-	DEVMETHOD(iommu_unmap,		phyp_iommu_unmap),
-#endif
-
 	DEVMETHOD_END
 };
 
 struct rtaspci_softc {
 	struct ofw_pci_softc	pci_sc;
-	bus_dma_tag_t		dma_tag;
 
 	cell_t			read_pci_config, write_pci_config;
 	cell_t			ex_read_pci_config, ex_write_pci_config;
@@ -149,15 +136,6 @@ rtaspci_attach(device_t dev)
 	OF_getprop(ofw_bus_get_node(dev), "ibm,pci-config-space-type",
 	    &sc->sc_extended_config, sizeof(sc->sc_extended_config));
 
-	bus_dma_tag_create(bus_get_dma_tag(dev),
-	    1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR,
-	    NULL, NULL, BUS_SPACE_MAXSIZE, BUS_SPACE_UNRESTRICTED,
-	    BUS_SPACE_MAXSIZE, 0, NULL, NULL, &sc->dma_tag);
-#ifdef __powerpc64__
-	if (!(mfmsr() & PSL_HV))
-		phyp_iommu_set_dma_tag(dev, dev, sc->dma_tag);
-#endif
-
 	return (ofw_pci_attach(dev));
 }
 
@@ -225,12 +203,3 @@ rtaspci_write_config(device_t dev, u_int bus, u_int slot, u_int func,
 		    width, val, &pcierror);
 }
 
-static bus_dma_tag_t
-rtaspci_get_dma_tag(device_t dev, device_t child)
-{
-	struct rtaspci_softc *sc;
-
-	sc = device_get_softc(dev);
-	return (sc->dma_tag);
-}
-
diff --git a/sys/powerpc/pseries/vdevice.c b/sys/powerpc/pseries/vdevice.c
index 8ddd531e5e3..54cd5ddc6be 100644
--- a/sys/powerpc/pseries/vdevice.c
+++ b/sys/powerpc/pseries/vdevice.c
@@ -156,7 +156,8 @@ vdevice_attach(device_t dev)
 			for (i = 0; i < nintr; i += icells) {
 				u_int irq = intr[i];
 				if (iparent != -1)
-					irq = MAP_IRQ(iparent, intr[i]);
+					irq = ofw_bus_map_intr(dev, iparent,
+					    intr[i]);
 
 				resource_list_add(&dinfo->mdi_resources,
 				    SYS_RES_IRQ, i, irq, irq, i);
diff --git a/share/xml/atf/Makefile b/sys/powerpc/wii/ios_if.m
similarity index 73%
rename from share/xml/atf/Makefile
rename to sys/powerpc/wii/ios_if.m
index cf56ff181fb..f5c6a17b9ab 100644
--- a/share/xml/atf/Makefile
+++ b/sys/powerpc/wii/ios_if.m
@@ -1,7 +1,7 @@
 #-
-# Copyright (c) 2011 Google, Inc.
+# Copyright (c) 2013 Rui Paulo
 # All rights reserved.
-#
+# 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
@@ -10,7 +10,7 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this 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
@@ -24,16 +24,41 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
 
-ATF=		${.CURDIR}/../../../contrib/atf
+#include <sys/bus.h>
+#include <sys/uio.h>
 
-.PATH:		${ATF}/atf-report
+INTERFACE ios;
 
-NO_OBJ=
+METHOD int open {
+	device_t	dev;
+	const char	*path;
+	int		mode;
+};
 
-FILESGROUPS=    XML
+METHOD int close {
+	device_t	dev;
+	int		fd;
+};
 
-XMLDIR=		${SHAREDIR}/xml/atf
-XML=		tests-results.dtd
+METHOD int ioctl {
+	device_t	dev;
+	int 		fd;
+	unsigned int	request;
+	void		*ibuf;
+	size_t		ilen;
+	void		*obuf;
+	size_t		olen;
+};
+
+METHOD int ioctlv {
+	device_t	dev;
+	int 		fd;
+	unsigned int	request;
+	struct iovec 	*in;
+	size_t		ilen;
+	struct iovec	*out;
+	size_t		olen;
+};
 
-.include <bsd.prog.mk>
diff --git a/sys/powerpc/wii/platform_wii.c b/sys/powerpc/wii/platform_wii.c
index f43ee919806..c5709f4c8a5 100644
--- a/sys/powerpc/wii/platform_wii.c
+++ b/sys/powerpc/wii/platform_wii.c
@@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$");
 
 static int		wii_probe(platform_t);
 static int		wii_attach(platform_t);
-static void		wii_mem_regions(platform_t, struct mem_region **,
-			    int *, struct mem_region **, int *);
+static void		wii_mem_regions(platform_t, struct mem_region *,
+			    int *, struct mem_region *, int *);
 static unsigned long	wii_timebase_freq(platform_t, struct cpuref *);
 static void		wii_reset(platform_t);
 static void		wii_cpu_idle(sbintime_t);
@@ -107,12 +107,9 @@ wii_attach(platform_t plat)
 	return (0);
 }
 
-#define MEM_REGIONS     2
-static struct mem_region avail_regions[MEM_REGIONS];
-
 static void
-wii_mem_regions(platform_t plat, struct mem_region **phys, int *physsz,
-    struct mem_region **avail, int *availsz)
+wii_mem_regions(platform_t plat, struct mem_region *phys, int *physsz,
+    struct mem_region *avail_regions, int *availsz)
 {
 	/* 24MB 1T-SRAM */
 	avail_regions[0].mr_start = 0x00000000;
@@ -139,8 +136,8 @@ wii_mem_regions(platform_t plat, struct mem_region **phys, int *physsz,
 	 */
 	avail_regions[1].mr_size -= WIIIPC_IOH_LEN + 1;
 
-	*phys = *avail = avail_regions;
-	*physsz = *availsz = MEM_REGIONS;
+	memcpy(phys, avail_regions, 2*sizeof(*avail_regions));
+	*physsz = *availsz = 2;
 }
 
 static u_long
diff --git a/sys/rpc/auth.h b/sys/rpc/auth.h
index c2814d26308..bd6b04bcbce 100644
--- a/sys/rpc/auth.h
+++ b/sys/rpc/auth.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: auth.h,v 1.15 2000/06/02 22:57:55 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY 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
+ * 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 Sun Microsystems, 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 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.
  *
  *	from: @(#)auth.h 1.17 88/02/08 SMI
  *	from: @(#)auth.h	2.3 88/08/07 4.0 RPCSRC
diff --git a/sys/rpc/auth_none.c b/sys/rpc/auth_none.c
index a256b836878..2996b78553e 100644
--- a/sys/rpc/auth_none.c
+++ b/sys/rpc/auth_none.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: auth_none.c,v 1.13 2000/01/22 22:19:17 mycroft 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/rpc/auth_unix.c b/sys/rpc/auth_unix.c
index bd4be3475c0..3575c446073 100644
--- a/sys/rpc/auth_unix.c
+++ b/sys/rpc/auth_unix.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: auth_unix.c,v 1.18 2000/07/06 03:03:30 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/rpc/authunix_prot.c b/sys/rpc/authunix_prot.c
index b1b70a59673..3b167312bd6 100644
--- a/sys/rpc/authunix_prot.c
+++ b/sys/rpc/authunix_prot.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: authunix_prot.c,v 1.12 2000/01/22 22:19:17 mycroft 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/rpc/clnt.h b/sys/rpc/clnt.h
index 36dca8eb190..b9a5c6b213d 100644
--- a/sys/rpc/clnt.h
+++ b/sys/rpc/clnt.h
@@ -1,49 +1,31 @@
 /*	$NetBSD: clnt.h,v 1.14 2000/06/02 22:57:55 fvdl Exp $	*/
 
-/*
- * The contents of this file are subject to the Sun Standards
- * License Version 1.0 the (the "License";) You may not use
- * this file except in compliance with the License.  You may
- * obtain a copy of the License at lib/libc/rpc/LICENSE
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ * All rights reserved.
  *
- * Software distributed under the License is distributed on
- * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied.  See the License for the specific
- * language governing rights and limitations under the License.
+ * 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 the "Oracle America, Inc." nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * The Original Code is Copyright 1998 by Sun Microsystems, Inc
- *
- * The Initial Developer of the Original Code is:  Sun
- * Microsystems, Inc.
- *
- * All Rights Reserved.
- *
- * 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, MERCHANTABILITY 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
+ * 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.
  *
  *	from: @(#)clnt.h 1.31 94/04/29 SMI
  *	from: @(#)clnt.h	2.1 88/07/29 4.0 RPCSRC
diff --git a/sys/rpc/clnt_dg.c b/sys/rpc/clnt_dg.c
index 4c1fe8c3ef2..66fc4c0cb1b 100644
--- a/sys/rpc/clnt_dg.c
+++ b/sys/rpc/clnt_dg.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: clnt_dg.c,v 1.4 2000/07/14 08:40:41 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/sys/rpc/clnt_vc.c b/sys/rpc/clnt_vc.c
index eec9f509e88..9ab548f44bb 100644
--- a/sys/rpc/clnt_vc.c
+++ b/sys/rpc/clnt_vc.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: clnt_vc.c,v 1.4 2000/07/14 08:40:42 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/rpc/krpc.h b/sys/rpc/krpc.h
index 05bf1d451b6..280860b652e 100644
--- a/sys/rpc/krpc.h
+++ b/sys/rpc/krpc.h
@@ -1,30 +1,29 @@
 /*-
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  *
  * $FreeBSD$
  */
diff --git a/sys/rpc/nettype.h b/sys/rpc/nettype.h
index c325b4ffded..5d00607c7a2 100644
--- a/sys/rpc/nettype.h
+++ b/sys/rpc/nettype.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: nettype.h,v 1.2 2000/07/06 03:17:19 christos Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY 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
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/sys/rpc/pmap_prot.h b/sys/rpc/pmap_prot.h
index 42277e8a13d..9488f1aa5db 100644
--- a/sys/rpc/pmap_prot.h
+++ b/sys/rpc/pmap_prot.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: pmap_prot.h,v 1.8 2000/06/02 22:57:55 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY 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
+ * 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 Sun Microsystems, 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 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.
  *
  *	from: @(#)pmap_prot.h 1.14 88/02/08 SMI 
  *	from: @(#)pmap_prot.h	2.1 88/07/29 4.0 RPCSRC
diff --git a/sys/rpc/rpc.h b/sys/rpc/rpc.h
index 32ca5fde7c2..3e6417ff6e3 100644
--- a/sys/rpc/rpc.h
+++ b/sys/rpc/rpc.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc.h,v 1.13 2000/06/02 22:57:56 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY 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
+ * 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 Sun Microsystems, 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 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.
  *
  *	from: @(#)rpc.h 1.9 88/02/08 SMI
  *	from: @(#)rpc.h	2.4 89/07/11 4.0 RPCSRC
diff --git a/sys/rpc/rpc_callmsg.c b/sys/rpc/rpc_callmsg.c
index 65637c5fbc2..f30fcc600bf 100644
--- a/sys/rpc/rpc_callmsg.c
+++ b/sys/rpc/rpc_callmsg.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_callmsg.c,v 1.16 2000/07/14 08:40:42 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/rpc/rpc_com.h b/sys/rpc/rpc_com.h
index 66851321e2c..50cec752b2d 100644
--- a/sys/rpc/rpc_com.h
+++ b/sys/rpc/rpc_com.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_com.h,v 1.3 2000/12/10 04:10:08 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  *
  * $FreeBSD$
  */
diff --git a/sys/rpc/rpc_generic.c b/sys/rpc/rpc_generic.c
index dd5c6c354a2..4643bf5dc1f 100644
--- a/sys/rpc/rpc_generic.c
+++ b/sys/rpc/rpc_generic.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_generic.c,v 1.4 2000/09/28 09:07:04 kleink 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/sys/rpc/rpc_msg.h b/sys/rpc/rpc_msg.h
index ff2a6d8377f..dd884d145a5 100644
--- a/sys/rpc/rpc_msg.h
+++ b/sys/rpc/rpc_msg.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_msg.h,v 1.11 2000/06/02 22:57:56 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY 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
+ * 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 Sun Microsystems, 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 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.
  *
  *	from: @(#)rpc_msg.h 1.7 86/07/16 SMI
  *	from: @(#)rpc_msg.h	2.1 88/07/29 4.0 RPCSRC
diff --git a/sys/rpc/rpc_prot.c b/sys/rpc/rpc_prot.c
index 294c4e356b5..a83932dfa77 100644
--- a/sys/rpc/rpc_prot.c
+++ b/sys/rpc/rpc_prot.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpc_prot.c,v 1.16 2000/06/02 23:11:13 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/rpc/rpcb_clnt.c b/sys/rpc/rpcb_clnt.c
index d484df3bf4f..244a579f8cb 100644
--- a/sys/rpc/rpcb_clnt.c
+++ b/sys/rpc/rpcb_clnt.c
@@ -1,49 +1,31 @@
 /*	$NetBSD: rpcb_clnt.c,v 1.6 2000/07/16 06:41:43 itojun Exp $	*/
 
-/*
- * The contents of this file are subject to the Sun Standards
- * License Version 1.0 the (the "License";) You may not use
- * this file except in compliance with the License.  You may
- * obtain a copy of the License at lib/libc/rpc/LICENSE
+/*-
+ * Copyright (c) 2010, Oracle America, Inc.
+ * All rights reserved.
  *
- * Software distributed under the License is distributed on
- * an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either
- * express or implied.  See the License for the specific
- * language governing rights and limitations under the License.
+ * 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 the "Oracle America, Inc." nor the names of its
+ *   contributors may be used to endorse or promote products derived
+ *   from this software without specific prior written permission.
  *
- * The Original Code is Copyright 1998 by Sun Microsystems, Inc
- *
- * The Initial Developer of the Original Code is:  Sun
- * Microsystems, Inc.
- *
- * All Rights Reserved.
- *
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/sys/rpc/rpcb_clnt.h b/sys/rpc/rpcb_clnt.h
index 638bb5de8d6..0a665e55e75 100644
--- a/sys/rpc/rpcb_clnt.h
+++ b/sys/rpc/rpcb_clnt.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: rpcb_clnt.h,v 1.1 2000/06/02 22:57:56 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/sys/rpc/rpcb_prot.c b/sys/rpc/rpcb_prot.c
index be76571d347..f3c24089ac2 100644
--- a/sys/rpc/rpcb_prot.c
+++ b/sys/rpc/rpcb_prot.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: rpcb_prot.c,v 1.3 2000/07/14 08:40:42 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/sys/rpc/rpcb_prot.h b/sys/rpc/rpcb_prot.h
index ac4ef6c6e29..6b42a3698d1 100644
--- a/sys/rpc/rpcb_prot.h
+++ b/sys/rpc/rpcb_prot.h
@@ -12,35 +12,34 @@
 extern "C" {
 #endif
 
-/*
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
+ *
  * $FreeBSD$
- *
- * 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) 1988 by Sun Microsystems, Inc.
diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c
index bbc6f6d5450..5b480863669 100644
--- a/sys/rpc/svc.c
+++ b/sys/rpc/svc.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc.c,v 1.21 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
@@ -1010,6 +1009,18 @@ svc_run_internal(SVCPOOL *pool, bool_t ismaster)
 		pool->sp_state = SVCPOOL_ACTIVE;
 
 	while (pool->sp_state != SVCPOOL_CLOSING) {
+		/*
+		 * Create new thread if requested.
+		 */
+		if (pool->sp_state == SVCPOOL_THREADWANTED) {
+			pool->sp_state = SVCPOOL_THREADSTARTING;
+			pool->sp_lastcreatetime = time_uptime;
+			mtx_unlock(&pool->sp_lock);
+			svc_new_thread(pool);
+			mtx_lock(&pool->sp_lock);
+			continue;
+		}
+
 		/*
 		 * Check for idle transports once per second.
 		 */
@@ -1046,8 +1057,13 @@ svc_run_internal(SVCPOOL *pool, bool_t ismaster)
 				continue;
 
 			LIST_INSERT_HEAD(&pool->sp_idlethreads, st, st_ilink);
-			error = cv_timedwait_sig(&st->st_cond, &pool->sp_lock,
-				5 * hz);
+			if (ismaster || (!ismaster &&
+			    pool->sp_threadcount > pool->sp_minthreads))
+				error = cv_timedwait_sig(&st->st_cond,
+				    &pool->sp_lock, 5 * hz);
+			else
+				error = cv_wait_sig(&st->st_cond,
+				    &pool->sp_lock);
 			LIST_REMOVE(st, st_ilink);
 
 			/*
@@ -1060,24 +1076,11 @@ svc_run_internal(SVCPOOL *pool, bool_t ismaster)
 					&& !st->st_xprt
 					&& STAILQ_EMPTY(&st->st_reqs))
 					break;
-			}
-			if (error == EWOULDBLOCK)
-				continue;
-			if (error) {
-				if (pool->sp_state != SVCPOOL_CLOSING) {
-					mtx_unlock(&pool->sp_lock);
-					svc_exit(pool);
-					mtx_lock(&pool->sp_lock);
-				}
-				break;
-			}
-
-			if (pool->sp_state == SVCPOOL_THREADWANTED) {
-				pool->sp_state = SVCPOOL_THREADSTARTING;
-				pool->sp_lastcreatetime = time_uptime;
+			} else if (error) {
 				mtx_unlock(&pool->sp_lock);
-				svc_new_thread(pool);
+				svc_exit(pool);
 				mtx_lock(&pool->sp_lock);
+				break;
 			}
 			continue;
 		}
@@ -1245,9 +1248,11 @@ svc_exit(SVCPOOL *pool)
 
 	mtx_lock(&pool->sp_lock);
 
-	pool->sp_state = SVCPOOL_CLOSING;
-	LIST_FOREACH(st, &pool->sp_idlethreads, st_ilink)
-		cv_signal(&st->st_cond);
+	if (pool->sp_state != SVCPOOL_CLOSING) {
+		pool->sp_state = SVCPOOL_CLOSING;
+		LIST_FOREACH(st, &pool->sp_idlethreads, st_ilink)
+			cv_signal(&st->st_cond);
+	}
 
 	mtx_unlock(&pool->sp_lock);
 }
diff --git a/sys/rpc/svc.h b/sys/rpc/svc.h
index 54aaa2cc24a..28a3c5db678 100644
--- a/sys/rpc/svc.h
+++ b/sys/rpc/svc.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc.h,v 1.17 2000/06/02 22:57:56 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY 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
+ * 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 Sun Microsystems, 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 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.
  *
  *	from: @(#)svc.h 1.35 88/12/17 SMI
  *	from: @(#)svc.h      1.27    94/04/25 SMI
diff --git a/sys/rpc/svc_auth.c b/sys/rpc/svc_auth.c
index 5d83c8d2c90..caba75cf0ce 100644
--- a/sys/rpc/svc_auth.c
+++ b/sys/rpc/svc_auth.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_auth.c,v 1.12 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 /*
  * Copyright (c) 1986-1991 by Sun Microsystems Inc. 
diff --git a/sys/rpc/svc_auth.h b/sys/rpc/svc_auth.h
index 9e238766e0f..d6b31cdc9ce 100644
--- a/sys/rpc/svc_auth.h
+++ b/sys/rpc/svc_auth.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_auth.h,v 1.8 2000/06/02 22:57:57 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY 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
+ * 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 Sun Microsystems, 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 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.
  *
  *	from: @(#)svc_auth.h 1.6 86/07/16 SMI
  *	@(#)svc_auth.h	2.1 88/07/29 4.0 RPCSRC
diff --git a/sys/rpc/svc_auth_unix.c b/sys/rpc/svc_auth_unix.c
index 19ff40a3e0b..793821dcd3e 100644
--- a/sys/rpc/svc_auth_unix.c
+++ b/sys/rpc/svc_auth_unix.c
@@ -1,30 +1,29 @@
-/*
- * 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * 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
+ * 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 Sun Microsystems, 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 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/rpc/svc_dg.c b/sys/rpc/svc_dg.c
index 3df79bb96e0..861c26ec727 100644
--- a/sys/rpc/svc_dg.c
+++ b/sys/rpc/svc_dg.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_dg.c,v 1.4 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 /*
diff --git a/sys/rpc/svc_generic.c b/sys/rpc/svc_generic.c
index f8b70de00da..b0c72da53a2 100644
--- a/sys/rpc/svc_generic.c
+++ b/sys/rpc/svc_generic.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_generic.c,v 1.3 2000/07/06 03:10:35 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 /*
diff --git a/sys/rpc/svc_vc.c b/sys/rpc/svc_vc.c
index 54fa546bb4f..8298c9589fc 100644
--- a/sys/rpc/svc_vc.c
+++ b/sys/rpc/svc_vc.c
@@ -1,32 +1,31 @@
 /*	$NetBSD: svc_vc.c,v 1.7 2000/08/03 00:01:53 fvdl 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, Inc. nor the names of its 
+ *   contributors may be used to endorse or promote products derived 
+ *   from this software without specific prior written permission.
  * 
- * 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
+ * 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.
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
diff --git a/sys/rpc/types.h b/sys/rpc/types.h
index b476ada3718..dd51a8af064 100644
--- a/sys/rpc/types.h
+++ b/sys/rpc/types.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: types.h,v 1.13 2000/06/13 01:02:44 thorpej 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY 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
+ * 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 Sun Microsystems, 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 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.
  *
  *	from: @(#)types.h 1.18 87/07/24 SMI
  *	from: @(#)types.h	2.3 88/08/15 4.0 RPCSRC
diff --git a/sys/rpc/xdr.h b/sys/rpc/xdr.h
index 92af2302894..1c2e780618c 100644
--- a/sys/rpc/xdr.h
+++ b/sys/rpc/xdr.h
@@ -1,32 +1,31 @@
 /*	$NetBSD: xdr.h,v 1.19 2000/07/17 05:00:45 matt 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.
+/*-
+ * Copyright (c) 2009, Sun Microsystems, Inc.
+ * All rights reserved.
  *
- * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
- * WARRANTIES OF DESIGN, MERCHANTABILITY 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
+ * 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 Sun Microsystems, 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 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.
  *
  *	from: @(#)xdr.h 1.19 87/04/22 SMI
  *	from: @(#)xdr.h	2.2 88/07/29 4.0 RPCSRC
diff --git a/sys/security/audit/audit_bsm_klib.c b/sys/security/audit/audit_bsm_klib.c
index d06c7705eaf..91f7aaa318b 100644
--- a/sys/security/audit/audit_bsm_klib.c
+++ b/sys/security/audit/audit_bsm_klib.c
@@ -273,7 +273,6 @@ audit_ctlname_to_sysctlevent(int name[], uint64_t valid_arg)
 	case KERN_USRSTACK:
 	case KERN_LOGSIGEXIT:
 	case KERN_IOV_MAX:
-	case KERN_MAXID:
 		return ((valid_arg & ARG_VALUE) ?
 		    AUE_SYSCTL : AUE_SYSCTL_NONADMIN);
 
diff --git a/sys/security/mac/mac_audit.c b/sys/security/mac/mac_audit.c
index 4d453b5c83c..1cc571da834 100644
--- a/sys/security/mac/mac_audit.c
+++ b/sys/security/mac/mac_audit.c
@@ -43,8 +43,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
-
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
diff --git a/sys/security/mac/mac_cred.c b/sys/security/mac/mac_cred.c
index 64dab5bc3ce..372679b5e83 100644
--- a/sys/security/mac/mac_cred.c
+++ b/sys/security/mac/mac_cred.c
@@ -46,7 +46,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index 25ffa9195ba..d2416eb721d 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -66,7 +66,6 @@
  * src/sys/security/mac_*.
  */
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/cdefs.h>
@@ -94,11 +93,11 @@ __FBSDID("$FreeBSD$");
 SDT_PROVIDER_DEFINE(mac);
 SDT_PROVIDER_DEFINE(mac_framework);
 
-SDT_PROBE_DEFINE2(mac, kernel, policy, modevent, modevent, "int",
+SDT_PROBE_DEFINE2(mac, kernel, policy, modevent, "int",
     "struct mac_policy_conf *");
-SDT_PROBE_DEFINE1(mac, kernel, policy, register, register,
+SDT_PROBE_DEFINE1(mac, kernel, policy, register,
     "struct mac_policy_conf *");
-SDT_PROBE_DEFINE1(mac, kernel, policy, unregister, unregister,
+SDT_PROBE_DEFINE1(mac, kernel, policy, unregister,
     "struct mac_policy_conf *");
 
 /*
diff --git a/sys/security/mac/mac_inet.c b/sys/security/mac/mac_inet.c
index 5753bb6246f..a1bbea9caeb 100644
--- a/sys/security/mac/mac_inet.c
+++ b/sys/security/mac/mac_inet.c
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 6b1c50c1cf9..ceb1e8727d9 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -74,35 +74,35 @@ SDT_PROVIDER_DECLARE(mac);		/* MAC Framework-level events. */
 SDT_PROVIDER_DECLARE(mac_framework);	/* Entry points to MAC. */
 
 #define	MAC_CHECK_PROBE_DEFINE4(name, arg0, arg1, arg2, arg3)		\
-	SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac_check_err,	\
-	    mac-check-ok, "int", arg0, arg1, arg2, arg3);		\
-	SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac_check_ok,	\
-	    mac-check-ok, "int", arg0, arg1, arg2, arg3);
+	SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac__check__err,	\
+	    "int", arg0, arg1, arg2, arg3);				\
+	SDT_PROBE_DEFINE5(mac_framework, kernel, name, mac__check__ok,	\
+	    "int", arg0, arg1, arg2, arg3);
 
 #define	MAC_CHECK_PROBE_DEFINE3(name, arg0, arg1, arg2)			\
-	SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac_check_err,	\
-	    mac-check-err, "int", arg0, arg1, arg2);			\
-	SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac_check_ok,	\
-	    mac-check-ok, "int", arg0, arg1, arg2);
+	SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac__check__err,	\
+	    "int", arg0, arg1, arg2);					\
+	SDT_PROBE_DEFINE4(mac_framework, kernel, name, mac__check__ok,	\
+	    "int", arg0, arg1, arg2);
 
 #define	MAC_CHECK_PROBE_DEFINE2(name, arg0, arg1)			\
-	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_check_err,	\
-	    mac-check-err, "int", arg0, arg1);				\
-	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_check_ok,	\
-	    mac-check-ok, "int", arg0, arg1);
+	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__check__err,	\
+	    "int", arg0, arg1);						\
+	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__check__ok,	\
+	    "int", arg0, arg1);
 
 #define	MAC_CHECK_PROBE_DEFINE1(name, arg0)				\
-	SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac_check_err,	\
-	    mac-check-err, "int", arg0);				\
-	SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac_check_ok,	\
-	    mac-check-ok, "int", arg0);
+	SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac__check__err,	\
+	    "int", arg0);						\
+	SDT_PROBE_DEFINE2(mac_framework, kernel, name, mac__check__ok,	\
+	    "int", arg0);
 
 #define	MAC_CHECK_PROBE4(name, error, arg0, arg1, arg2, arg3)	do {	\
 	if (error) {							\
-		SDT_PROBE(mac_framework, kernel, name, mac_check_err,	\
+		SDT_PROBE(mac_framework, kernel, name, mac__check__err,	\
 		    error, arg0, arg1, arg2, arg3);			\
 	} else {							\
-		SDT_PROBE(mac_framework, kernel, name, mac_check_ok,	\
+		SDT_PROBE(mac_framework, kernel, name, mac__check__ok,	\
 		    0, arg0, arg1, arg2, arg3);				\
 	}								\
 } while (0)
@@ -116,17 +116,17 @@ SDT_PROVIDER_DECLARE(mac_framework);	/* Entry points to MAC. */
 #endif
 
 #define	MAC_GRANT_PROBE_DEFINE2(name, arg0, arg1)			\
-	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_err,	\
-	    mac-grant-err, "int", arg0, arg1);				\
-	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_ok,	\
-	    mac-grant-ok, "int", arg0, arg1);
+	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__grant__err,	\
+	    "int", arg0, arg1);						\
+	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac__grant__ok,	\
+	    "int", arg0, arg1);
 
 #define	MAC_GRANT_PROBE2(name, error, arg0, arg1)	do {		\
 	if (error) {							\
-		SDT_PROBE(mac_framework, kernel, name, mac_grant_err,	\
+		SDT_PROBE(mac_framework, kernel, name, mac__grant__err,	\
 		    error, arg0, arg1, 0, 0);				\
 	} else {							\
-		SDT_PROBE(mac_framework, kernel, name, mac_grant_ok,	\
+		SDT_PROBE(mac_framework, kernel, name, mac__grant__ok,	\
 		    error, arg0, arg1, 0, 0);				\
 	}								\
 } while (0)
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index b7e4c54fc84..5a87f47766b 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 91c3cff4ce9..d7cb86c1284 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -40,7 +40,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_posix_sem.c b/sys/security/mac/mac_posix_sem.c
index 461e5dbd341..4cf4109b953 100644
--- a/sys/security/mac/mac_posix_sem.c
+++ b/sys/security/mac/mac_posix_sem.c
@@ -39,7 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 #include "opt_posix.h"
 
diff --git a/sys/security/mac/mac_posix_shm.c b/sys/security/mac/mac_posix_shm.c
index 15b298d82d0..f094f066363 100644
--- a/sys/security/mac/mac_posix_shm.c
+++ b/sys/security/mac/mac_posix_shm.c
@@ -39,7 +39,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_priv.c b/sys/security/mac/mac_priv.c
index 537c0028829..5d39568ccc4 100644
--- a/sys/security/mac/mac_priv.c
+++ b/sys/security/mac/mac_priv.c
@@ -38,7 +38,6 @@
 #include "sys/cdefs.h"
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index 1a760cf629a..b0a880707c5 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_socket.c b/sys/security/mac/mac_socket.c
index 11d5e05d43e..95cfc6b0602 100644
--- a/sys/security/mac/mac_socket.c
+++ b/sys/security/mac/mac_socket.c
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index b705bbd2d3a..f3da0479ef8 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -53,7 +53,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_sysv_msg.c b/sys/security/mac/mac_sysv_msg.c
index c4023229085..6dcd2620840 100644
--- a/sys/security/mac/mac_sysv_msg.c
+++ b/sys/security/mac/mac_sysv_msg.c
@@ -41,7 +41,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_sysv_sem.c b/sys/security/mac/mac_sysv_sem.c
index 12e7cce12c3..f050ddd2347 100644
--- a/sys/security/mac/mac_sysv_sem.c
+++ b/sys/security/mac/mac_sysv_sem.c
@@ -40,7 +40,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_sysv_shm.c b/sys/security/mac/mac_sysv_shm.c
index 168e5b689f9..a5861d0f31b 100644
--- a/sys/security/mac/mac_sysv_shm.c
+++ b/sys/security/mac/mac_sysv_shm.c
@@ -40,7 +40,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 05f49c273e7..1d08f61b1a1 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -45,7 +45,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_kdtrace.h"
 #include "opt_mac.h"
 
 #include <sys/param.h>
diff --git a/sys/security/mac_ifoff/mac_ifoff.c b/sys/security/mac_ifoff/mac_ifoff.c
index acfbd255e6f..7165f905c83 100644
--- a/sys/security/mac_ifoff/mac_ifoff.c
+++ b/sys/security/mac_ifoff/mac_ifoff.c
@@ -49,11 +49,14 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/module.h>
+#include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 
-#include <net/bpfdesc.h>
+#include <net/if.h>
+#include <net/if_var.h>
 #include <net/if_types.h>
+#include <net/bpfdesc.h>
 
 #include <security/mac/mac_policy.h>
 
diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 2d826519b9e..5f2d0d4edeb 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -63,7 +63,6 @@ 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 	PROCDESC		# Support for process descriptors
 options 	MAC			# TrustedBSD MAC Framework
 options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
diff --git a/sys/sparc64/include/bus.h b/sys/sparc64/include/bus.h
index c641a25577d..9cdd2081597 100644
--- a/sys/sparc64/include/bus.h
+++ b/sys/sparc64/include/bus.h
@@ -58,7 +58,7 @@
  * (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: NetBSD: bus.h,v 1.58 2008/04/28 20:23:36 martin Exp
+ *	from: NetBSD: bus.h,v 1.58 2008/04/28 20:23:36 martin Exp
  *	and
  *	from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
  *
@@ -104,11 +104,7 @@ extern const int bus_stream_asi[];
 
 struct bus_space_tag {
 	void		*bst_cookie;
-	bus_space_tag_t	bst_parent;
 	int		bst_type;
-
-	void		(*bst_bus_barrier)(bus_space_tag_t, bus_space_handle_t,
-			    bus_size_t, bus_size_t, int);
 };
 
 /*
@@ -131,23 +127,23 @@ int bus_space_map(bus_space_tag_t tag, bus_addr_t address, bus_size_t size,
 void bus_space_unmap(bus_space_tag_t tag, bus_space_handle_t handle,
     bus_size_t size);
 
-/* This macro finds the first "upstream" implementation of method `f' */
-#define	_BS_CALL(t,f)							\
-	while (t->f == NULL)						\
-		t = t->bst_parent;					\
-	return (*(t)->f)
-
 static __inline void
-bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
-    bus_size_t s, int f)
+bus_space_barrier(bus_space_tag_t t __unused, bus_space_handle_t h __unused,
+    bus_size_t o __unused, bus_size_t s __unused, int f __unused)
 {
 
-	_BS_CALL(t, bst_bus_barrier)(t, h, o, s, f);
+	/*
+	 * We have lots of alternatives depending on whether we're
+	 * synchronizing loads with loads, loads with stores, stores
+	 * with loads, or stores with stores.  The only ones that seem
+	 * generic are #Sync and #MemIssue.  We use #Sync for safety.
+	 */
+	membar(Sync);
 }
 
 static __inline int
-bus_space_subregion(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
-    bus_size_t s, bus_space_handle_t *hp)
+bus_space_subregion(bus_space_tag_t t __unused, bus_space_handle_t h,
+    bus_size_t o __unused, bus_size_t s __unused, bus_space_handle_t *hp)
 {
 
 	*hp = h + o;
diff --git a/sys/sparc64/include/bus_dma.h b/sys/sparc64/include/bus_dma.h
index 7395794692a..7d74419cc6f 100644
--- a/sys/sparc64/include/bus_dma.h
+++ b/sys/sparc64/include/bus_dma.h
@@ -146,5 +146,7 @@ struct bus_dma_tag {
 	((t)->dt_mt->dm_dmamem_alloc((t), (v), (f), (m)))
 #define	bus_dmamem_free(t, v, m)					\
 	((t)->dt_mt->dm_dmamem_free((t), (v), (m)))
+#define _bus_dmamap_load_ma(t, m, a, tt, o, f, s, p)			\
+	bus_dmamap_load_ma_triv((t), (m), (a), (tt), (o), (f), (s), (p))
 
 #endif /* !_SPARC64_BUS_DMA_H_ */
diff --git a/sys/sparc64/include/bus_private.h b/sys/sparc64/include/bus_private.h
index bccd2293cdd..0905e86aab3 100644
--- a/sys/sparc64/include/bus_private.h
+++ b/sys/sparc64/include/bus_private.h
@@ -40,8 +40,7 @@ int sparc64_bus_mem_map(bus_space_tag_t tag, bus_addr_t addr, bus_size_t size,
     int flags, vm_offset_t vaddr, bus_space_handle_t *hp);
 int sparc64_bus_mem_unmap(bus_space_tag_t tag, bus_space_handle_t handle,
     bus_size_t size);
-bus_space_tag_t sparc64_alloc_bus_tag(void *cookie,
-    struct bus_space_tag *ptag, int type, void *barrier);
+bus_space_tag_t sparc64_alloc_bus_tag(void *cookie, int type);
 bus_space_handle_t sparc64_fake_bustag(int space, bus_addr_t addr,
     struct bus_space_tag *ptag);
 
diff --git a/sys/sparc64/include/vmparam.h b/sys/sparc64/include/vmparam.h
index 3cd744cb912..b1c90d290a8 100644
--- a/sys/sparc64/include/vmparam.h
+++ b/sys/sparc64/include/vmparam.h
@@ -198,24 +198,22 @@
 #define	USRSTACK		(VM_MAX_USER_ADDRESS)
 
 /*
- * Virtual size (bytes) for various kernel submaps.
- */
-#ifndef	VM_KMEM_SIZE
-#define	VM_KMEM_SIZE		(16*1024*1024)
-#endif
-
-/*
- * How many physical pages per KVA page allocated.
- * min(max(max(VM_KMEM_SIZE, Physical memory/VM_KMEM_SIZE_SCALE),
- *     VM_KMEM_SIZE_MIN), VM_KMEM_SIZE_MAX)
- * is the total KVA space allocated for kmem_map.
+ * How many physical pages per kmem arena virtual page.
  */
 #ifndef VM_KMEM_SIZE_SCALE
 #define	VM_KMEM_SIZE_SCALE	(tsb_kernel_ldd_phys == 0 ? 3 : 2)
 #endif
 
 /*
- * Ceiling on amount of kmem_map kva space.
+ * Optional floor (in bytes) on the size of the kmem arena.
+ */
+#ifndef VM_KMEM_SIZE_MIN
+#define	VM_KMEM_SIZE_MIN	(16 * 1024 * 1024)
+#endif
+
+/*
+ * Optional ceiling (in bytes) on the size of the kmem arena: 60% of the
+ * kernel map.
  */
 #ifndef VM_KMEM_SIZE_MAX
 #define	VM_KMEM_SIZE_MAX	((VM_MAX_KERNEL_ADDRESS - \
diff --git a/sys/sparc64/pci/fire.c b/sys/sparc64/pci/fire.c
index 080d57c5f08..9bbfab61aac 100644
--- a/sys/sparc64/pci/fire.c
+++ b/sys/sparc64/pci/fire.c
@@ -756,12 +756,10 @@ fire_attach(device_t dev)
 	free(range, M_OFWPROP);
 
 	/* Allocate our tags. */
-	sc->sc_pci_iot = sparc64_alloc_bus_tag(NULL, rman_get_bustag(
-	    sc->sc_mem_res[FIRE_PCI]), PCI_IO_BUS_SPACE, NULL);
+	sc->sc_pci_iot = sparc64_alloc_bus_tag(NULL, PCI_IO_BUS_SPACE);
 	if (sc->sc_pci_iot == NULL)
 		panic("%s: could not allocate PCI I/O tag", __func__);
-	sc->sc_pci_cfgt = sparc64_alloc_bus_tag(NULL, rman_get_bustag(
-	    sc->sc_mem_res[FIRE_PCI]), PCI_CONFIG_BUS_SPACE, NULL);
+	sc->sc_pci_cfgt = sparc64_alloc_bus_tag(NULL, PCI_CONFIG_BUS_SPACE);
 	if (sc->sc_pci_cfgt == NULL)
 		panic("%s: could not allocate PCI configuration space tag",
 		    __func__);
@@ -2072,8 +2070,7 @@ fire_activate_resource(device_t bus, device_t child, int type, int rid,
 		return (bus_generic_activate_resource(bus, child, type, rid,
 		    r));
 	case SYS_RES_MEMORY:
-		tag = sparc64_alloc_bus_tag(r, rman_get_bustag(
-		    sc->sc_mem_res[FIRE_PCI]), PCI_MEMORY_BUS_SPACE, NULL);
+		tag = sparc64_alloc_bus_tag(r, PCI_MEMORY_BUS_SPACE);
 		if (tag == NULL)
 			return (ENOMEM);
 		rman_set_bustag(r, tag);
diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c
index 871742683cf..d42fdadee8f 100644
--- a/sys/sparc64/pci/psycho.c
+++ b/sys/sparc64/pci/psycho.c
@@ -573,12 +573,10 @@ psycho_attach(device_t dev)
 	}
 
 	/* Allocate our tags. */
-	sc->sc_pci_iot = sparc64_alloc_bus_tag(NULL, rman_get_bustag(
-	    sc->sc_mem_res), PCI_IO_BUS_SPACE, NULL);
+	sc->sc_pci_iot = sparc64_alloc_bus_tag(NULL, PCI_IO_BUS_SPACE);
 	if (sc->sc_pci_iot == NULL)
 		panic("%s: could not allocate PCI I/O tag", __func__);
-	sc->sc_pci_cfgt = sparc64_alloc_bus_tag(NULL, rman_get_bustag(
-	    sc->sc_mem_res), PCI_CONFIG_BUS_SPACE, NULL);
+	sc->sc_pci_cfgt = sparc64_alloc_bus_tag(NULL, PCI_CONFIG_BUS_SPACE);
 	if (sc->sc_pci_cfgt == NULL)
 		panic("%s: could not allocate PCI configuration space tag",
 		    __func__);
@@ -1236,8 +1234,7 @@ psycho_activate_resource(device_t bus, device_t child, int type, int rid,
 		return (bus_generic_activate_resource(bus, child, type, rid,
 		    r));
 	case SYS_RES_MEMORY:
-		tag = sparc64_alloc_bus_tag(r, rman_get_bustag(
-		    sc->sc_mem_res), PCI_MEMORY_BUS_SPACE, NULL);
+		tag = sparc64_alloc_bus_tag(r, PCI_MEMORY_BUS_SPACE);
 		if (tag == NULL)
 			return (ENOMEM);
 		rman_set_bustag(r, tag);
diff --git a/sys/sparc64/pci/schizo.c b/sys/sparc64/pci/schizo.c
index f92aa78de26..9e522c02443 100644
--- a/sys/sparc64/pci/schizo.c
+++ b/sys/sparc64/pci/schizo.c
@@ -580,12 +580,10 @@ schizo_attach(device_t dev)
 	SLIST_INSERT_HEAD(&schizo_softcs, sc, sc_link);
 
 	/* Allocate our tags. */
-	sc->sc_pci_iot = sparc64_alloc_bus_tag(NULL, rman_get_bustag(
-	    sc->sc_mem_res[STX_PCI]), PCI_IO_BUS_SPACE, NULL);
+	sc->sc_pci_iot = sparc64_alloc_bus_tag(NULL, PCI_IO_BUS_SPACE);
 	if (sc->sc_pci_iot == NULL)
 		panic("%s: could not allocate PCI I/O tag", __func__);
-	sc->sc_pci_cfgt = sparc64_alloc_bus_tag(NULL, rman_get_bustag(
-	    sc->sc_mem_res[STX_PCI]), PCI_CONFIG_BUS_SPACE, NULL);
+	sc->sc_pci_cfgt = sparc64_alloc_bus_tag(NULL, PCI_CONFIG_BUS_SPACE);
 	if (sc->sc_pci_cfgt == NULL)
 		panic("%s: could not allocate PCI configuration space tag",
 		    __func__);
@@ -1412,8 +1410,7 @@ schizo_activate_resource(device_t bus, device_t child, int type, int rid,
 		return (bus_generic_activate_resource(bus, child, type, rid,
 		    r));
 	case SYS_RES_MEMORY:
-		tag = sparc64_alloc_bus_tag(r, rman_get_bustag(
-		    sc->sc_mem_res[STX_PCI]), PCI_MEMORY_BUS_SPACE, NULL);
+		tag = sparc64_alloc_bus_tag(r, PCI_MEMORY_BUS_SPACE);
 		if (tag == NULL)
 			return (ENOMEM);
 		rman_set_bustag(r, tag);
diff --git a/sys/sparc64/sbus/sbus.c b/sys/sparc64/sbus/sbus.c
index 580624fce0e..0b2765579f6 100644
--- a/sys/sparc64/sbus/sbus.c
+++ b/sys/sparc64/sbus/sbus.c
@@ -803,9 +803,7 @@ sbus_activate_resource(device_t bus, device_t child, int type, int rid,
 		for (i = 0; i < sc->sc_nrange; i++) {
 			if (rman_is_region_manager(r,
 			    &sc->sc_rd[i].rd_rman) != 0) {
-				tag = sparc64_alloc_bus_tag(r,
-				    rman_get_bustag(sc->sc_sysio_res),
-				    SBUS_BUS_SPACE, NULL);
+				tag = sparc64_alloc_bus_tag(r, SBUS_BUS_SPACE);
 				if (tag == NULL)
 					return (ENOMEM);
 				rman_set_bustag(r, tag);
diff --git a/sys/sparc64/sparc64/bus_machdep.c b/sys/sparc64/sparc64/bus_machdep.c
index 415f43dafbf..19221a46cc3 100644
--- a/sys/sparc64/sparc64/bus_machdep.c
+++ b/sys/sparc64/sparc64/bus_machdep.c
@@ -119,9 +119,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/smp.h>
 #include <machine/tlb.h>
 
-static void nexus_bus_barrier(bus_space_tag_t, bus_space_handle_t,
-    bus_size_t, bus_size_t, int);
-
 /* ASIs for bus access */
 const int bus_type_asi[] = {
 	ASI_PHYS_BYPASS_EC_WITH_EBIT,		/* nexus */
@@ -715,18 +712,15 @@ sparc64_fake_bustag(int space, bus_addr_t addr, struct bus_space_tag *ptag)
 {
 
 	ptag->bst_cookie = NULL;
-	ptag->bst_parent = NULL;
 	ptag->bst_type = space;
-	ptag->bst_bus_barrier = nexus_bus_barrier;
 	return (addr);
 }
 
 /*
- * Allocate a bus tag.
+ * Allocate a bus tag
  */
 bus_space_tag_t
-sparc64_alloc_bus_tag(void *cookie, struct bus_space_tag *ptag, int type,
-    void *barrier)
+sparc64_alloc_bus_tag(void *cookie, int type)
 {
 	bus_space_tag_t bt;
 
@@ -734,42 +728,11 @@ sparc64_alloc_bus_tag(void *cookie, struct bus_space_tag *ptag, int type,
 	if (bt == NULL)
 		return (NULL);
 	bt->bst_cookie = cookie;
-	bt->bst_parent = ptag;
 	bt->bst_type = type;
-	bt->bst_bus_barrier = barrier;
 	return (bt);
 }
 
-/*
- * Base bus space handlers.
- */
-
-static void
-nexus_bus_barrier(bus_space_tag_t t, bus_space_handle_t h, bus_size_t offset,
-    bus_size_t size, int flags)
-{
-
-	/*
-	 * We have lots of alternatives depending on whether we're
-	 * synchronizing loads with loads, loads with stores, stores
-	 * with loads, or stores with stores.  The only ones that seem
-	 * generic are #Sync and #MemIssue.  I'll use #Sync for safety.
-	 */
-	switch(flags) {
-	case BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE:
-	case BUS_SPACE_BARRIER_READ:
-	case BUS_SPACE_BARRIER_WRITE:
-		membar(Sync);
-		break;
-	default:
-		panic("%s: unknown flags", __func__);
-	}
-	return;
-}
-
 struct bus_space_tag nexus_bustag = {
 	NULL,				/* cookie */
-	NULL,				/* parent bus tag */
-	NEXUS_BUS_SPACE,		/* type */
-	nexus_bus_barrier,		/* bus_space_barrier */
+	NEXUS_BUS_SPACE			/* type */
 };
diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c
index de645da0b1e..9c0042eb67f 100644
--- a/sys/sparc64/sparc64/machdep.c
+++ b/sys/sparc64/sparc64/machdep.c
@@ -553,17 +553,15 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec)
 	 * trigger a fatal reset error or worse things further down the road.
 	 * XXX it should be possible to use this solely instead of writing
 	 * %tba in cpu_setregs().  Doing so causes a hang however.
-	 */
-	sun4u_set_traptable(tl0_base);
-
-	/*
-	 * Initialize the console.
+	 *
 	 * NB: the low-level console drivers require a working DELAY() and
 	 * some compiler optimizations may cause the curthread accesses of
 	 * mutex(9) to be factored out even if the latter aren't actually
-	 * called, both requiring PCPU_REG to be set.
+	 * called.  Both of these require PCPU_REG to be set.  However, we
+	 * can't set PCPU_REG without also taking over the trap table or the
+	 * firmware will overwrite it.
 	 */
-	cninit();
+	sun4u_set_traptable(tl0_base);
 
 	/*
 	 * Initialize the dynamic per-CPU area for the BSP and the message
@@ -577,6 +575,12 @@ sparc64_init(caddr_t mdp, u_long o1, u_long o2, u_long o3, ofw_vec_t *vec)
 	 */
 	mutex_init();
 
+	/*
+	 * Initialize console now that we have a reasonable set of system
+	 * services.
+	 */
+	cninit();
+
 	/*
 	 * Finish the interrupt initialization now that mutexes work and
 	 * enable them.
diff --git a/sys/sys/ata.h b/sys/sys/ata.h
index 6dfbf4ee704..2a46dba6a57 100644
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.h
@@ -259,6 +259,8 @@ struct ata_params {
 /*215*/ u_int16_t       nv_cache_size_1;
 	u_int16_t       nv_cache_size_2;
 /*217*/ u_int16_t       media_rotation_rate;
+#define ATA_RATE_NOT_REPORTED		0x0000
+#define ATA_RATE_NON_ROTATING		0x0001
 	u_int16_t       reserved218;
 /*219*/ u_int16_t       nv_cache_opt;
 /*220*/ u_int16_t       wrv_mode;
diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h
index 44a4f700494..5f8d53d88f3 100644
--- a/sys/sys/bufobj.h
+++ b/sys/sys/bufobj.h
@@ -63,7 +63,7 @@ extern struct buf_ops buf_ops_bio;
 
 TAILQ_HEAD(buflists, buf);
 
-/* A Buffer splay list */
+/* A Buffer list & trie */
 struct bufv {
 	struct buflists	bv_hd;		/* Sorted blocklist */
 	struct pctrie	bv_root;	/* Buf trie */
diff --git a/sys/sys/bus_dma.h b/sys/sys/bus_dma.h
index c3ac56eccb4..5f096f81b5c 100644
--- a/sys/sys/bus_dma.h
+++ b/sys/sys/bus_dma.h
@@ -246,6 +246,15 @@ int bus_dmamap_load_mem(bus_dma_tag_t dmat, bus_dmamap_t map,
 			struct memdesc *mem, bus_dmamap_callback_t *callback,
 			void *callback_arg, int flags);
 
+/*
+ * Placeholder for use by busdma implementations which do not benefit
+ * from optimized procedure to load an array of vm_page_t.  Falls back
+ * to do _bus_dmamap_load_phys() in loop.
+ */
+int bus_dmamap_load_ma_triv(bus_dma_tag_t dmat, bus_dmamap_t map,
+    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+    bus_dma_segment_t *segs, int *segp);
+
 /*
  * XXX sparc64 uses the same interface, but a much different implementation.
  *     <machine/bus_dma.h> for the sparc64 arch contains the equivalent
@@ -324,6 +333,10 @@ int _bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
 			  vm_paddr_t paddr, bus_size_t buflen,
 			  int flags, bus_dma_segment_t *segs, int *segp);
 
+int _bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map,
+    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+    bus_dma_segment_t *segs, int *segp);
+
 bus_dma_segment_t *_bus_dmamap_complete(bus_dma_tag_t dmat,
 			   		bus_dmamap_t map,
 					bus_dma_segment_t *segs,
diff --git a/sys/sys/capability.h b/sys/sys/capability.h
index e5b9ec721c9..aad4a15314b 100644
--- a/sys/sys/capability.h
+++ b/sys/sys/capability.h
@@ -79,9 +79,12 @@
 #define	CAP_SEEK_TELL		CAPRIGHT(0, 0x0000000000000004ULL)
 /* Allows for lseek(2). */
 #define	CAP_SEEK		(CAP_SEEK_TELL | 0x0000000000000008ULL)
-/* Allows for pread(2), preadv(2). */
+/* Allows for aio_read(2), pread(2), preadv(2). */
 #define	CAP_PREAD		(CAP_SEEK | CAP_READ)
-/* Allows for openat(O_WRONLY) (without O_APPEND), pwrite(2), pwritev(2). */
+/*
+ * Allows for aio_write(2), openat(O_WRONLY) (without O_APPEND), pwrite(2),
+ * pwritev(2).
+ */
 #define	CAP_PWRITE		(CAP_SEEK | CAP_WRITE)
 /* Allows for mmap(PROT_NONE). */
 #define	CAP_MMAP		CAPRIGHT(0, 0x0000000000000010ULL)
@@ -103,7 +106,7 @@
 #define	CAP_CREATE		CAPRIGHT(0, 0x0000000000000040ULL)
 /* Allows for openat(O_EXEC) and fexecve(2) in turn. */
 #define	CAP_FEXECVE		CAPRIGHT(0, 0x0000000000000080ULL)
-/* Allows for openat(O_SYNC), openat(O_FSYNC), fsync(2). */
+/* Allows for openat(O_SYNC), openat(O_FSYNC), fsync(2), aio_fsync(2). */
 #define	CAP_FSYNC		CAPRIGHT(0, 0x0000000000000100ULL)
 /* Allows for openat(O_TRUNC), ftruncate(2). */
 #define	CAP_FTRUNCATE		CAPRIGHT(0, 0x0000000000000200ULL)
@@ -112,55 +115,87 @@
 #define	CAP_LOOKUP		CAPRIGHT(0, 0x0000000000000400ULL)
 
 /* VFS methods. */
+/* Allows for fchdir(2). */
 #define	CAP_FCHDIR		CAPRIGHT(0, 0x0000000000000800ULL)
+/* Allows for fchflags(2). */
 #define	CAP_FCHFLAGS		CAPRIGHT(0, 0x0000000000001000ULL)
+/* Allows for fchflags(2) and chflagsat(2). */
 #define	CAP_CHFLAGSAT		(CAP_FCHFLAGS | CAP_LOOKUP)
+/* Allows for fchmod(2). */
 #define	CAP_FCHMOD		CAPRIGHT(0, 0x0000000000002000ULL)
+/* Allows for fchmod(2) and fchmodat(2). */
 #define	CAP_FCHMODAT		(CAP_FCHMOD | CAP_LOOKUP)
+/* Allows for fchown(2). */
 #define	CAP_FCHOWN		CAPRIGHT(0, 0x0000000000004000ULL)
+/* Allows for fchown(2) and fchownat(2). */
 #define	CAP_FCHOWNAT		(CAP_FCHOWN | CAP_LOOKUP)
+/* Allows for fcntl(2). */
 #define	CAP_FCNTL		CAPRIGHT(0, 0x0000000000008000ULL)
+/*
+ * Allows for flock(2), openat(O_SHLOCK), openat(O_EXLOCK),
+ * fcntl(F_SETLK_REMOTE), fcntl(F_SETLKW), fcntl(F_SETLK), fcntl(F_GETLK).
+ */
 #define	CAP_FLOCK		CAPRIGHT(0, 0x0000000000010000ULL)
+/* Allows for fpathconf(2). */
 #define	CAP_FPATHCONF		CAPRIGHT(0, 0x0000000000020000ULL)
+/* Allows for UFS background-fsck operations. */
 #define	CAP_FSCK		CAPRIGHT(0, 0x0000000000040000ULL)
+/* Allows for fstat(2). */
 #define	CAP_FSTAT		CAPRIGHT(0, 0x0000000000080000ULL)
+/* Allows for fstat(2), fstatat(2) and faccessat(2). */
 #define	CAP_FSTATAT		(CAP_FSTAT | CAP_LOOKUP)
+/* Allows for fstatfs(2). */
 #define	CAP_FSTATFS		CAPRIGHT(0, 0x0000000000100000ULL)
+/* Allows for futimes(2). */
 #define	CAP_FUTIMES		CAPRIGHT(0, 0x0000000000200000ULL)
+/* Allows for futimes(2) and futimesat(2). */
 #define	CAP_FUTIMESAT		(CAP_FUTIMES | CAP_LOOKUP)
-#define	CAP_LINKAT		CAPRIGHT(0, 0x0000000000400000ULL)
-#define	CAP_MKDIRAT		CAPRIGHT(0, 0x0000000000800000ULL)
-#define	CAP_MKFIFOAT		CAPRIGHT(0, 0x0000000001000000ULL)
-#define	CAP_MKNODAT		CAPRIGHT(0, 0x0000000002000000ULL)
-#define	CAP_RENAMEAT		CAPRIGHT(0, 0x0000000004000000ULL)
-#define	CAP_SYMLINKAT		CAPRIGHT(0, 0x0000000008000000ULL)
-#define	CAP_UNLINKAT		CAPRIGHT(0, 0x0000000010000000ULL)
-
-/* Extended attributes. */
-#define	CAP_EXTATTR_DELETE	CAPRIGHT(0, 0x0000000020000000ULL)
-#define	CAP_EXTATTR_GET		CAPRIGHT(0, 0x0000000040000000ULL)
-#define	CAP_EXTATTR_LIST	CAPRIGHT(0, 0x0000000080000000ULL)
-#define	CAP_EXTATTR_SET		CAPRIGHT(0, 0x0000000100000000ULL)
-
-/* Access Control Lists. */
-#define	CAP_ACL_CHECK		CAPRIGHT(0, 0x0000000200000000ULL)
-#define	CAP_ACL_DELETE		CAPRIGHT(0, 0x0000000400000000ULL)
-#define	CAP_ACL_GET		CAPRIGHT(0, 0x0000000800000000ULL)
-#define	CAP_ACL_SET		CAPRIGHT(0, 0x0000001000000000ULL)
+/* Allows for linkat(2) and renameat(2) (destination directory descriptor). */
+#define	CAP_LINKAT		(CAP_LOOKUP | 0x0000000000400000ULL)
+/* Allows for mkdirat(2). */
+#define	CAP_MKDIRAT		(CAP_LOOKUP | 0x0000000000800000ULL)
+/* Allows for mkfifoat(2). */
+#define	CAP_MKFIFOAT		(CAP_LOOKUP | 0x0000000001000000ULL)
+/* Allows for mknodat(2). */
+#define	CAP_MKNODAT		(CAP_LOOKUP | 0x0000000002000000ULL)
+/* Allows for renameat(2). */
+#define	CAP_RENAMEAT		(CAP_LOOKUP | 0x0000000004000000ULL)
+/* Allows for symlinkat(2). */
+#define	CAP_SYMLINKAT		(CAP_LOOKUP | 0x0000000008000000ULL)
+/*
+ * Allows for unlinkat(2) and renameat(2) if destination object exists and
+ * will be removed.
+ */
+#define	CAP_UNLINKAT		(CAP_LOOKUP | 0x0000000010000000ULL)
 
 /* Socket operations. */
-#define	CAP_ACCEPT		CAPRIGHT(0, 0x0000002000000000ULL)
-#define	CAP_BIND		CAPRIGHT(0, 0x0000004000000000ULL)
-#define	CAP_CONNECT		CAPRIGHT(0, 0x0000008000000000ULL)
-#define	CAP_GETPEERNAME		CAPRIGHT(0, 0x0000010000000000ULL)
-#define	CAP_GETSOCKNAME		CAPRIGHT(0, 0x0000020000000000ULL)
-#define	CAP_GETSOCKOPT		CAPRIGHT(0, 0x0000040000000000ULL)
-#define	CAP_LISTEN		CAPRIGHT(0, 0x0000080000000000ULL)
-#define	CAP_PEELOFF		CAPRIGHT(0, 0x0000100000000000ULL)
+/* Allows for accept(2) and accept4(2). */
+#define	CAP_ACCEPT		CAPRIGHT(0, 0x0000000020000000ULL)
+/* Allows for bind(2). */
+#define	CAP_BIND		CAPRIGHT(0, 0x0000000040000000ULL)
+/* Allows for connect(2). */
+#define	CAP_CONNECT		CAPRIGHT(0, 0x0000000080000000ULL)
+/* Allows for getpeername(2). */
+#define	CAP_GETPEERNAME		CAPRIGHT(0, 0x0000000100000000ULL)
+/* Allows for getsockname(2). */
+#define	CAP_GETSOCKNAME		CAPRIGHT(0, 0x0000000200000000ULL)
+/* Allows for getsockopt(2). */
+#define	CAP_GETSOCKOPT		CAPRIGHT(0, 0x0000000400000000ULL)
+/* Allows for listen(2). */
+#define	CAP_LISTEN		CAPRIGHT(0, 0x0000000800000000ULL)
+/* Allows for sctp_peeloff(2). */
+#define	CAP_PEELOFF		CAPRIGHT(0, 0x0000001000000000ULL)
 #define	CAP_RECV		CAP_READ
 #define	CAP_SEND		CAP_WRITE
-#define	CAP_SETSOCKOPT		CAPRIGHT(0, 0x0000200000000000ULL)
-#define	CAP_SHUTDOWN		CAPRIGHT(0, 0x0000400000000000ULL)
+/* Allows for setsockopt(2). */
+#define	CAP_SETSOCKOPT		CAPRIGHT(0, 0x0000002000000000ULL)
+/* Allows for shutdown(2). */
+#define	CAP_SHUTDOWN		CAPRIGHT(0, 0x0000004000000000ULL)
+
+/* Allows for bindat(2) on a directory descriptor. */
+#define	CAP_BINDAT		(CAP_LOOKUP | 0x0000008000000000ULL)
+/* Allows for connectat(2) on a directory descriptor. */
+#define	CAP_CONNECTAT		(CAP_LOOKUP | 0x0000010000000000ULL)
 
 #define	CAP_SOCK_CLIENT \
 	(CAP_CONNECT | CAP_GETPEERNAME | CAP_GETSOCKNAME | CAP_GETSOCKOPT | \
@@ -171,17 +206,19 @@
 	 CAP_SETSOCKOPT | CAP_SHUTDOWN)
 
 /* All used bits for index 0. */
-#define	CAP_ALL0		CAPRIGHT(0, 0x00007FFFFFFFFFFFULL)
+#define	CAP_ALL0		CAPRIGHT(0, 0x0000007FFFFFFFFFULL)
 
 /* Available bits for index 0. */
-#define	CAP_UNUSED0_48		CAPRIGHT(0, 0x0000800000000000ULL)
+#define	CAP_UNUSED0_40		CAPRIGHT(0, 0x0000008000000000ULL)
 /* ... */
 #define	CAP_UNUSED0_57		CAPRIGHT(0, 0x0100000000000000ULL)
 
 /* INDEX 1 */
 
 /* Mandatory Access Control. */
+/* Allows for mac_get_fd(3). */
 #define	CAP_MAC_GET		CAPRIGHT(1, 0x0000000000000001ULL)
+/* Allows for mac_set_fd(3). */
 #define	CAP_MAC_SET		CAPRIGHT(1, 0x0000000000000002ULL)
 
 /* Methods on semaphores. */
@@ -189,34 +226,60 @@
 #define	CAP_SEM_POST		CAPRIGHT(1, 0x0000000000000008ULL)
 #define	CAP_SEM_WAIT		CAPRIGHT(1, 0x0000000000000010ULL)
 
-/* kqueue events. */
-#define	CAP_POLL_EVENT		CAPRIGHT(1, 0x0000000000000020ULL)
-#define	CAP_POST_EVENT		CAPRIGHT(1, 0x0000000000000040ULL)
+/* Allows select(2) and poll(2) on descriptor. */
+#define	CAP_EVENT		CAPRIGHT(1, 0x0000000000000020ULL)
+/* Allows for kevent(2) on kqueue descriptor with eventlist != NULL. */
+#define	CAP_KQUEUE_EVENT	CAPRIGHT(1, 0x0000000000000040ULL)
 
 /* Strange and powerful rights that should not be given lightly. */
+/* Allows for ioctl(2). */
 #define	CAP_IOCTL		CAPRIGHT(1, 0x0000000000000080ULL)
 #define	CAP_TTYHOOK		CAPRIGHT(1, 0x0000000000000100ULL)
 
 /* Process management via process descriptors. */
+/* Allows for pdgetpid(2). */
 #define	CAP_PDGETPID		CAPRIGHT(1, 0x0000000000000200ULL)
+/* Allows for pdwait4(2). */
 #define	CAP_PDWAIT		CAPRIGHT(1, 0x0000000000000400ULL)
+/* Allows for pdkill(2). */
 #define	CAP_PDKILL		CAPRIGHT(1, 0x0000000000000800ULL)
 
-/*
- * Rights that allow to use bindat(2) and connectat(2) syscalls on a
- * directory descriptor.
- */
-#define	CAP_BINDAT		CAPRIGHT(1, 0x0000000000001000ULL)
-#define	CAP_CONNECTAT		CAPRIGHT(1, 0x0000000000002000ULL)
+/* Extended attributes. */
+/* Allows for extattr_delete_fd(2). */
+#define	CAP_EXTATTR_DELETE	CAPRIGHT(1, 0x0000000000001000ULL)
+/* Allows for extattr_get_fd(2). */
+#define	CAP_EXTATTR_GET		CAPRIGHT(1, 0x0000000000002000ULL)
+/* Allows for extattr_list_fd(2). */
+#define	CAP_EXTATTR_LIST	CAPRIGHT(1, 0x0000000000004000ULL)
+/* Allows for extattr_set_fd(2). */
+#define	CAP_EXTATTR_SET		CAPRIGHT(1, 0x0000000000008000ULL)
+
+/* Access Control Lists. */
+/* Allows for acl_valid_fd_np(3). */
+#define	CAP_ACL_CHECK		CAPRIGHT(1, 0x0000000000010000ULL)
+/* Allows for acl_delete_fd_np(3). */
+#define	CAP_ACL_DELETE		CAPRIGHT(1, 0x0000000000020000ULL)
+/* Allows for acl_get_fd(3) and acl_get_fd_np(3). */
+#define	CAP_ACL_GET		CAPRIGHT(1, 0x0000000000040000ULL)
+/* Allows for acl_set_fd(3) and acl_set_fd_np(3). */
+#define	CAP_ACL_SET		CAPRIGHT(1, 0x0000000000080000ULL)
+
+/* Allows for kevent(2) on kqueue descriptor with changelist != NULL. */
+#define	CAP_KQUEUE_CHANGE	CAPRIGHT(1, 0x0000000000100000ULL)
+
+#define	CAP_KQUEUE		(CAP_KQUEUE_EVENT | CAP_KQUEUE_CHANGE)
 
 /* All used bits for index 1. */
-#define	CAP_ALL1		CAPRIGHT(1, 0x0000000000003FFFULL)
+#define	CAP_ALL1		CAPRIGHT(1, 0x00000000001FFFFFULL)
 
 /* Available bits for index 1. */
-#define	CAP_UNUSED1_15		CAPRIGHT(1, 0x0000000000004000ULL)
+#define	CAP_UNUSED1_22		CAPRIGHT(1, 0x0000000000200000ULL)
 /* ... */
 #define	CAP_UNUSED1_57		CAPRIGHT(1, 0x0100000000000000ULL)
 
+/* Backward compatibility. */
+#define	CAP_POLL_EVENT		CAP_EVENT
+
 #define	CAP_ALL(rights)		do {					\
 	(rights)->cr_rights[0] =					\
 	    ((uint64_t)CAP_RIGHTS_VERSION << 62) | CAP_ALL0;		\
@@ -258,26 +321,26 @@ cap_rights_t *__cap_rights_init(int version, cap_rights_t *rights, ...);
 
 #define	cap_rights_set(rights, ...)					\
 	__cap_rights_set((rights), __VA_ARGS__, 0ULL)
-void __cap_rights_set(cap_rights_t *rights, ...);
+cap_rights_t *__cap_rights_set(cap_rights_t *rights, ...);
 
 #define	cap_rights_clear(rights, ...)					\
 	__cap_rights_clear((rights), __VA_ARGS__, 0ULL)
-void __cap_rights_clear(cap_rights_t *rights, ...);
+cap_rights_t *__cap_rights_clear(cap_rights_t *rights, ...);
 
 #define	cap_rights_is_set(rights, ...)					\
 	__cap_rights_is_set((rights), __VA_ARGS__, 0ULL)
 bool __cap_rights_is_set(const cap_rights_t *rights, ...);
 
 bool cap_rights_is_valid(const cap_rights_t *rights);
-void cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src);
-void cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src);
+cap_rights_t *cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src);
+cap_rights_t *cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src);
 bool cap_rights_contains(const cap_rights_t *big, const cap_rights_t *little);
 
 #ifdef _KERNEL
 
 #include <sys/systm.h>
 
-#define IN_CAPABILITY_MODE(td) ((td->td_ucred->cr_flags & CRED_FLAG_CAPMODE) != 0)
+#define IN_CAPABILITY_MODE(td) (((td)->td_ucred->cr_flags & CRED_FLAG_CAPMODE) != 0)
 
 struct filedesc;
 
@@ -328,8 +391,9 @@ int cap_rights_limit(int fd, const cap_rights_t *rights);
 /*
  * Returns capability rights for the given descriptor.
  */
-#define	cap_rights_get(fd, rights)	__cap_rights_get(CAP_RIGHTS_VERSION, (fd), (rights))
-int __cap_rights_get(int version, int fd, cap_rights_t *rightsp);
+#define	cap_rights_get(fd, rights)					\
+	__cap_rights_get(CAP_RIGHTS_VERSION, (fd), (rights))
+int __cap_rights_get(int version, int fd, cap_rights_t *rights);
 /*
  * Limits allowed ioctls for the given descriptor.
  */
diff --git a/sys/sys/consio.h b/sys/sys/consio.h
index a0022e888cc..516331c8184 100644
--- a/sys/sys/consio.h
+++ b/sys/sys/consio.h
@@ -184,7 +184,7 @@ typedef struct mouse_info mouse_info_t;
 #define CONS_CURSOR_ATTRS	(CONS_BLINK_CURSOR | CONS_CHAR_CURSOR |	\
 				 CONS_HIDDEN_CURSOR)
 #define CONS_RESET_CURSOR	(1 << 30)
-#define CONS_LOCAL_CURSOR	(1 << 31)
+#define CONS_LOCAL_CURSOR	(1U << 31)
 #define CONS_CURSOR_FLAGS	(CONS_RESET_CURSOR | CONS_LOCAL_CURSOR)
 struct cshape {
 	/* shape[0]: flags, shape[1]: base, shape[2]: height */
@@ -209,12 +209,33 @@ struct fnt16 {
 };
 typedef struct fnt16	fnt16_t;
 
+struct vfnt_map {
+	uint32_t	src;
+	uint16_t	dst;
+	uint16_t	len;
+};
+typedef struct vfnt_map	vfnt_map_t;
+
+struct vfnt {
+	vfnt_map_t	*normal;
+	vfnt_map_t	*bold;
+	uint8_t		*glyphs;
+	unsigned int	nnormal;
+	unsigned int	nbold;
+	unsigned int	nglyphs;
+	unsigned int	width;
+	unsigned int	height;
+};
+typedef struct vfnt	vfnt_t;
+
 #define PIO_FONT8x8	_IOW('c', 64, fnt8_t)
 #define GIO_FONT8x8	_IOR('c', 65, fnt8_t)
 #define PIO_FONT8x14	_IOW('c', 66, fnt14_t)
 #define GIO_FONT8x14	_IOR('c', 67, fnt14_t)
 #define PIO_FONT8x16	_IOW('c', 68, fnt16_t)
 #define GIO_FONT8x16	_IOR('c', 69, fnt16_t)
+#define PIO_VFONT	_IOW('c', 70, vfnt_t)
+#define GIO_VFONT	_IOR('c', 71, vfnt_t)
 
 /* get video mode information */
 struct colors	{
diff --git a/sys/sys/counter.h b/sys/sys/counter.h
index ec5cbfe9d36..2ce7134176f 100644
--- a/sys/sys/counter.h
+++ b/sys/sys/counter.h
@@ -31,6 +31,7 @@
 
 typedef uint64_t *counter_u64_t;
 
+#ifdef _KERNEL
 #include <machine/counter.h>
 
 counter_u64_t	counter_u64_alloc(int);
@@ -58,4 +59,5 @@ uint64_t	counter_u64_fetch(counter_u64_t);
 	for (int i = 0; i < (n); i++)				\
 		counter_u64_zero((a)[i]);			\
 } while (0)
+#endif	/* _KERNEL */
 #endif	/* ! __SYS_COUNTER_H__ */
diff --git a/sys/sys/devicestat.h b/sys/sys/devicestat.h
index 1a017cb31ca..bce0570401c 100644
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -199,6 +199,8 @@ void devstat_end_transaction(struct devstat *ds, u_int32_t bytes,
 			     devstat_trans_flags flags,
 			     struct bintime *now, struct bintime *then);
 void devstat_end_transaction_bio(struct devstat *ds, struct bio *bp);
+void devstat_end_transaction_bio_bt(struct devstat *ds, struct bio *bp,
+			     struct bintime *now);
 #endif
 
 #endif /* _DEVICESTAT_H */
diff --git a/sys/sys/dtrace_bsd.h b/sys/sys/dtrace_bsd.h
index 2198b264db2..fa54d7ed040 100644
--- a/sys/sys/dtrace_bsd.h
+++ b/sys/sys/dtrace_bsd.h
@@ -70,8 +70,6 @@ extern	dtrace_invop_func_t	dtrace_invop_func;
 extern	dtrace_doubletrap_func_t	dtrace_doubletrap_func;
 
 /* Pid provider hooks */
-typedef int (*dtrace_fasttrap_probe_ptr_t)(struct reg *);
-extern	dtrace_fasttrap_probe_ptr_t	dtrace_fasttrap_probe_ptr;
 typedef int (*dtrace_pid_probe_ptr_t)(struct reg *);
 extern	dtrace_pid_probe_ptr_t	dtrace_pid_probe_ptr;
 typedef int (*dtrace_return_probe_ptr_t)(struct reg *);
diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h
index bbcd3cd70e7..000035cd053 100644
--- a/sys/sys/elf_common.h
+++ b/sys/sys/elf_common.h
@@ -487,6 +487,7 @@ typedef struct {
 #define	DF_1_LOADFLTR	0x00000010	/* Immediate loading of filtees */
 #define	DF_1_NOOPEN     0x00000040	/* Do not allow loading on dlopen() */
 #define	DF_1_ORIGIN	0x00000080	/* Process $ORIGIN */
+#define	DF_1_INTERPOSE	0x00000400	/* Interpose all objects but main */
 #define	DF_1_NODEFLIB	0x00000800	/* Do not search default paths */
 
 /* Values for n_type.  Used in core files. */
diff --git a/sys/sys/eventhandler.h b/sys/sys/eventhandler.h
index f1d06b56ae3..111c21b856f 100644
--- a/sys/sys/eventhandler.h
+++ b/sys/sys/eventhandler.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef SYS_EVENTHANDLER_H
-#define SYS_EVENTHANDLER_H
+#ifndef _SYS_EVENTHANDLER_H_
+#define _SYS_EVENTHANDLER_H_
 
 #include <sys/lock.h>
 #include <sys/ktr.h>
@@ -203,19 +203,6 @@ typedef void (*vfs_unmounted_notify_fn)(void *, struct mount *,
 EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn);
 EVENTHANDLER_DECLARE(vfs_unmounted, vfs_unmounted_notify_fn);
 
-/* VLAN state change events */
-struct ifnet;
-typedef void (*vlan_config_fn)(void *, struct ifnet *, uint16_t);
-typedef void (*vlan_unconfig_fn)(void *, struct ifnet *, uint16_t);
-EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn);
-EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn);
-
-/* BPF attach/detach events */
-struct ifnet;
-typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* dlt */,
-    int /* 1 =>'s attach */);
-EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn);
-
 /*
  * Process events
  * process_fork and exit handlers are called without Giant.
@@ -275,4 +262,12 @@ EVENTHANDLER_DECLARE(kld_load, kld_load_fn);
 EVENTHANDLER_DECLARE(kld_unload, kld_unload_fn);
 EVENTHANDLER_DECLARE(kld_unload_try, kld_unload_try_fn);
 
-#endif /* SYS_EVENTHANDLER_H */
+/* Generic graphics framebuffer interface */
+struct fb_info;
+typedef void (*register_framebuffer_fn)(void *, struct fb_info *);
+typedef void (*unregister_framebuffer_fn)(void *, struct fb_info *);
+EVENTHANDLER_DECLARE(register_framebuffer, register_framebuffer_fn);
+EVENTHANDLER_DECLARE(unregister_framebuffer, unregister_framebuffer_fn);
+
+#endif /* _SYS_EVENTHANDLER_H_ */
+
diff --git a/sys/sys/eventvar.h b/sys/sys/eventvar.h
index ed1067f1015..ce79677f3be 100644
--- a/sys/sys/eventvar.h
+++ b/sys/sys/eventvar.h
@@ -60,6 +60,7 @@ struct kqueue {
 	u_long		kq_knhashmask;		/* size of knhash */
 	struct		klist *kq_knhash;	/* hash table for knotes */
 	struct		task kq_task;
+	struct		ucred *kq_cred;
 };
 
 #endif /* !_SYS_EVENTVAR_H_ */
diff --git a/sys/sys/fbio.h b/sys/sys/fbio.h
index 5745182316b..fe941a2263c 100644
--- a/sys/sys/fbio.h
+++ b/sys/sys/fbio.h
@@ -40,6 +40,10 @@
 
 #ifndef _KERNEL
 #include <sys/types.h>
+#else
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/eventhandler.h>
 #endif
 #include <sys/ioccom.h>
 
@@ -101,6 +105,78 @@ struct fbtype {
 };
 #define	FBIOGTYPE	_IOR('F', 0, struct fbtype)
 
+#define	FBTYPE_GET_STRIDE(_fb)	((_fb)->fb_size / (_fb)->fb_height)
+#define	FBTYPE_GET_BPP(_fb)	((_fb)->fb_bpp)
+#define	FBTYPE_GET_BYTESPP(_fb)	((_fb)->fb_bpp / 8)
+
+#ifdef	_KERNEL
+
+struct fb_info;
+
+typedef int fb_enter_t(void *priv);
+typedef int fb_leave_t(void *priv);
+typedef int fb_write_t(void *priv, int offset, void *data, int size);
+typedef int fb_read_t(void *priv, int offset, void *data, int size);
+
+/* XXX: should use priv instead of fb_info too. */
+typedef void fb_copy_t(struct fb_info *sc, uint32_t offset_to, uint32_t offset_from,
+    uint32_t size);
+typedef void fb_wr1_t(struct fb_info *sc, uint32_t offset, uint8_t value);
+typedef void fb_wr2_t(struct fb_info *sc, uint32_t offset, uint16_t value);
+typedef void fb_wr4_t(struct fb_info *sc, uint32_t offset, uint32_t value);
+
+struct fb_info {
+	/* Raw copy of fbtype. Do not change. */
+	int		fb_type;	/* as defined above */
+	int		fb_height;	/* in pixels */
+	int		fb_width;	/* in pixels */
+	int		fb_depth;	/* bits to define color */
+	int		fb_cmsize;	/* size of color map (entries) */
+	int		fb_size;	/* total size in bytes */
+
+	/* Methods. */
+	fb_write_t	*fb_write;	/* if NULL, direct mem write. */
+	fb_read_t	*fb_read;	/* if NULL, direct mem read. */
+
+	fb_wr1_t	*wr1;
+	fb_wr2_t	*wr2;
+	fb_wr4_t	*wr4;
+	fb_copy_t	*copy;
+	fb_enter_t	*enter;
+	fb_leave_t	*leave;
+
+	intptr_t	fb_pbase;	/* For FB mmap. */
+	intptr_t	fb_vbase;	/* if NULL, use fb_write/fb_read. */
+	void		*fb_priv;	/* First argument for read/write. */
+	const char	*fb_name;
+	uint32_t	fb_flags;
+	int		fb_stride;
+	int		fb_bpp;		/* bits per pixel */
+#define	FB_FLAG_NOMMAP		1	/* mmap unsupported. */
+	uint32_t	fb_cmap[16];
+};
+
+int fbd_list(void);
+int fbd_register(struct fb_info *);
+int fbd_unregister(struct fb_info *);
+
+static inline int
+register_framebuffer(struct fb_info *info)
+{
+
+	EVENTHANDLER_INVOKE(register_framebuffer, info);
+	return (0);
+}
+
+static inline int
+unregister_framebuffer(struct fb_info *info)
+{
+
+	EVENTHANDLER_INVOKE(unregister_framebuffer, info);
+	return (0);
+}
+#endif
+
 #ifdef notdef
 /*
  * General purpose structure for passing info in and out of frame buffers
diff --git a/sys/sys/file.h b/sys/sys/file.h
index 7b373f0d709..b7d358b7643 100644
--- a/sys/sys/file.h
+++ b/sys/sys/file.h
@@ -88,6 +88,9 @@ foffset_get(struct file *fp)
 	return (foffset_lock(fp, FOF_NOLOCK));
 }
 
+/* XXX pollution? */
+struct sendfile_sync;
+
 typedef int fo_rdwr_t(struct file *fp, struct uio *uio,
 		    struct ucred *active_cred, int flags,
 		    struct thread *td);
@@ -107,7 +110,8 @@ typedef	int fo_chown_t(struct file *fp, uid_t uid, gid_t gid,
 		    struct ucred *active_cred, struct thread *td);
 typedef int fo_sendfile_t(struct file *fp, int sockfd, struct uio *hdr_uio,
 		    struct uio *trl_uio, off_t offset, size_t nbytes,
-		    off_t *sent, int flags, int kflags, struct thread *td);
+		    off_t *sent, int flags, int kflags,
+		    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_flags_t;
@@ -368,11 +372,11 @@ fo_chown(struct file *fp, uid_t uid, gid_t gid, struct ucred *active_cred,
 static __inline int
 fo_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio,
     struct uio *trl_uio, off_t offset, size_t nbytes, off_t *sent, int flags,
-    int kflags, struct thread *td)
+    int kflags, struct sendfile_sync *sfs, struct thread *td)
 {
 
 	return ((*fp->f_ops->fo_sendfile)(fp, sockfd, hdr_uio, trl_uio, offset,
-	    nbytes, sent, flags, kflags, td));
+	    nbytes, sent, flags, kflags, sfs, td));
 }
 
 static __inline int
diff --git a/sys/sys/jail.h b/sys/sys/jail.h
index a82a4995106..59d791ca2a9 100644
--- a/sys/sys/jail.h
+++ b/sys/sys/jail.h
@@ -384,7 +384,7 @@ int prison_equal_ip4(struct prison *, struct prison *);
 int prison_get_ip4(struct ucred *cred, struct in_addr *ia);
 int prison_local_ip4(struct ucred *cred, struct in_addr *ia);
 int prison_remote_ip4(struct ucred *cred, struct in_addr *ia);
-int prison_check_ip4(struct ucred *cred, struct in_addr *ia);
+int prison_check_ip4(const struct ucred *, const struct in_addr *);
 int prison_saddrsel_ip4(struct ucred *, struct in_addr *);
 #ifdef INET6
 int prison_equal_ip6(struct prison *, struct prison *);
diff --git a/sys/sys/ktr.h b/sys/sys/ktr.h
index 28442e2abdc..6135bc05d7a 100644
--- a/sys/sys/ktr.h
+++ b/sys/sys/ktr.h
@@ -36,56 +36,7 @@
 #ifndef _SYS_KTR_H_
 #define _SYS_KTR_H_
 
-/*
- * Trace classes
- *
- * Two of the trace classes (KTR_DEV and KTR_SUBSYS) are special in that
- * they are really placeholders so that indvidual drivers and subsystems
- * can map their internal tracing to the general class when they wish to
- * have tracing enabled and map it to 0 when they don't.
- */
-#define	KTR_GEN		0x00000001		/* General (TR) */
-#define	KTR_NET		0x00000002		/* Network */
-#define	KTR_DEV		0x00000004		/* Device driver */
-#define	KTR_LOCK	0x00000008		/* MP locking */
-#define	KTR_SMP		0x00000010		/* MP general */
-#define	KTR_SUBSYS	0x00000020		/* Subsystem. */
-#define	KTR_PMAP	0x00000040		/* Pmap tracing */
-#define	KTR_MALLOC	0x00000080		/* Malloc tracing */
-#define	KTR_TRAP	0x00000100		/* Trap processing */
-#define	KTR_INTR	0x00000200		/* Interrupt tracing */
-#define	KTR_SIG		0x00000400		/* Signal processing */
-#define	KTR_SPARE2	0x00000800		/* XXX Used by cxgb */
-#define	KTR_PROC	0x00001000		/* Process scheduling */
-#define	KTR_SYSC	0x00002000		/* System call */
-#define	KTR_INIT	0x00004000		/* System initialization */
-#define	KTR_SPARE3	0x00008000		/* XXX Used by cxgb */
-#define	KTR_SPARE4	0x00010000		/* XXX Used by cxgb */
-#define	KTR_EVH		0x00020000		/* Eventhandler */
-#define	KTR_VFS		0x00040000		/* VFS events */
-#define	KTR_VOP		0x00080000		/* Auto-generated vop events */
-#define	KTR_VM		0x00100000		/* The virtual memory system */
-#define	KTR_INET	0x00200000		/* IPv4 stack */
-#define	KTR_RUNQ	0x00400000		/* Run queue */
-#define	KTR_CONTENTION	0x00800000		/* Lock contention */
-#define	KTR_UMA		0x01000000		/* UMA slab allocator */
-#define	KTR_CALLOUT	0x02000000		/* Callouts and timeouts */
-#define	KTR_GEOM	0x04000000		/* GEOM I/O events */
-#define	KTR_BUSDMA	0x08000000		/* busdma(9) events */
-#define	KTR_INET6	0x10000000		/* IPv6 stack */
-#define	KTR_SCHED	0x20000000		/* Machine parsed sched info. */
-#define	KTR_BUF		0x40000000		/* Buffer cache */
-#define	KTR_ALL		0x7fffffff
-
-/* Trace classes to compile in */
-#ifdef KTR
-#ifndef KTR_COMPILE
-#define	KTR_COMPILE	(KTR_ALL)
-#endif
-#else	/* !KTR */
-#undef KTR_COMPILE
-#define KTR_COMPILE 0
-#endif	/* KTR */
+#include <sys/ktr_class.h>
 
 /*
  * Version number for ktr_entry struct.  Increment this when you break binary
diff --git a/sys/sys/ktr_class.h b/sys/sys/ktr_class.h
new file mode 100644
index 00000000000..0f811c5b1ce
--- /dev/null
+++ b/sys/sys/ktr_class.h
@@ -0,0 +1,86 @@
+/*-
+ * Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must 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. Berkeley Software Design Inc's name may not be used to endorse or
+ *    promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN 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 BERKELEY SOFTWARE DESIGN 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.
+ *
+ *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
+ * $FreeBSD$
+ */
+
+#ifndef _SYS_KTR_CLASS_H_
+#define _SYS_KTR_CLASS_H_
+
+/*
+ * KTR trace classes
+ *
+ * Two of the trace classes (KTR_DEV and KTR_SUBSYS) are special in that
+ * they are really placeholders so that indvidual drivers and subsystems
+ * can map their internal tracing to the general class when they wish to
+ * have tracing enabled and map it to 0 when they don't.
+ */
+#define	KTR_GEN		0x00000001		/* General (TR) */
+#define	KTR_NET		0x00000002		/* Network */
+#define	KTR_DEV		0x00000004		/* Device driver */
+#define	KTR_LOCK	0x00000008		/* MP locking */
+#define	KTR_SMP		0x00000010		/* MP general */
+#define	KTR_SUBSYS	0x00000020		/* Subsystem. */
+#define	KTR_PMAP	0x00000040		/* Pmap tracing */
+#define	KTR_MALLOC	0x00000080		/* Malloc tracing */
+#define	KTR_TRAP	0x00000100		/* Trap processing */
+#define	KTR_INTR	0x00000200		/* Interrupt tracing */
+#define	KTR_SIG		0x00000400		/* Signal processing */
+#define	KTR_SPARE2	0x00000800		/* XXX Used by cxgb */
+#define	KTR_PROC	0x00001000		/* Process scheduling */
+#define	KTR_SYSC	0x00002000		/* System call */
+#define	KTR_INIT	0x00004000		/* System initialization */
+#define	KTR_SPARE3	0x00008000		/* XXX Used by cxgb */
+#define	KTR_SPARE4	0x00010000		/* XXX Used by cxgb */
+#define	KTR_EVH		0x00020000		/* Eventhandler */
+#define	KTR_VFS		0x00040000		/* VFS events */
+#define	KTR_VOP		0x00080000		/* Auto-generated vop events */
+#define	KTR_VM		0x00100000		/* The virtual memory system */
+#define	KTR_INET	0x00200000		/* IPv4 stack */
+#define	KTR_RUNQ	0x00400000		/* Run queue */
+#define	KTR_CONTENTION	0x00800000		/* Lock contention */
+#define	KTR_UMA		0x01000000		/* UMA slab allocator */
+#define	KTR_CALLOUT	0x02000000		/* Callouts and timeouts */
+#define	KTR_GEOM	0x04000000		/* GEOM I/O events */
+#define	KTR_BUSDMA	0x08000000		/* busdma(9) events */
+#define	KTR_INET6	0x10000000		/* IPv6 stack */
+#define	KTR_SCHED	0x20000000		/* Machine parsed sched info. */
+#define	KTR_BUF		0x40000000		/* Buffer cache */
+#define	KTR_ALL		0x7fffffff
+
+/* KTR trace classes to compile in */
+#ifdef KTR
+#ifndef KTR_COMPILE
+#define	KTR_COMPILE	(KTR_ALL)
+#endif
+#else	/* !KTR */
+#undef KTR_COMPILE
+#define KTR_COMPILE 0
+#endif	/* KTR */
+
+#endif /* !_SYS_KTR_CLASS_H_ */
diff --git a/sys/sys/lock.h b/sys/sys/lock.h
index 58343b59483..4ff0e79f816 100644
--- a/sys/sys/lock.h
+++ b/sys/sys/lock.h
@@ -34,6 +34,7 @@
 
 #include <sys/queue.h>
 #include <sys/_lock.h>
+#include <sys/ktr_class.h>
 
 struct lock_list_entry;
 struct thread;
@@ -123,7 +124,7 @@ struct lock_class {
  * calling conventions for this debugging code in modules so that modules can
  * work with both debug and non-debug kernels.
  */
-#if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || defined(INVARIANT_SUPPORT) || defined(KTR) || defined(LOCK_PROFILING)
+#if defined(KLD_MODULE) || defined(WITNESS) || defined(INVARIANTS) || defined(INVARIANT_SUPPORT) || defined(LOCK_PROFILING) || (defined(KTR) && (KTR_COMPILE & KTR_LOCK))
 #define	LOCK_DEBUG	1
 #else
 #define	LOCK_DEBUG	0
diff --git a/sys/sys/mdioctl.h b/sys/sys/mdioctl.h
index 5efae790800..acbfa4b2e9d 100644
--- a/sys/sys/mdioctl.h
+++ b/sys/sys/mdioctl.h
@@ -43,7 +43,7 @@
 #ifndef _SYS_MDIOCTL_H_
 #define _SYS_MDIOCTL_H_
 
-enum md_types {MD_MALLOC, MD_PRELOAD, MD_VNODE, MD_SWAP};
+enum md_types {MD_MALLOC, MD_PRELOAD, MD_VNODE, MD_SWAP, MD_NULL};
 
 /*
  * Ioctl definitions for memory disk pseudo-device.
diff --git a/sys/sys/mount.h b/sys/sys/mount.h
index 8f9445154b0..ca7e55c767e 100644
--- a/sys/sys/mount.h
+++ b/sys/sys/mount.h
@@ -362,8 +362,21 @@ void          __mnt_vnode_markerfree_active(struct vnode **mvp, struct mount *);
 #define MNTK_LOOKUP_SHARED	0x40000000 /* FS supports shared lock lookups */
 #define	MNTK_NOKNOTE	0x80000000	/* Don't send KNOTEs from VOP hooks */
 
-#define	MNT_SHARED_WRITES(mp) (((mp) != NULL) && 	\
-				((mp)->mnt_kern_flag & MNTK_SHARED_WRITES))
+#ifdef _KERNEL
+static inline int
+MNT_SHARED_WRITES(struct mount *mp)
+{
+
+	return (mp != NULL && (mp->mnt_kern_flag & MNTK_SHARED_WRITES) != 0);
+}
+
+static inline int
+MNT_EXTENDED_SHARED(struct mount *mp)
+{
+
+	return (mp != NULL && (mp->mnt_kern_flag & MNTK_EXTENDED_SHARED) != 0);
+}
+#endif
 
 /*
  * Sysctl CTL_VFS definitions.
@@ -636,10 +649,12 @@ struct vfsops {
 vfs_statfs_t	__vfs_statfs;
 
 #define	VFS_PROLOGUE(MP)	do {					\
+	struct mount *mp__;						\
 	int _enable_stops;						\
 									\
-	_enable_stops = ((MP) != NULL &&				\
-	    ((MP)->mnt_vfc->vfc_flags & VFCF_SBDRY) && sigdeferstop())
+	mp__ = (MP);							\
+	_enable_stops = (mp__ != NULL &&				\
+	    (mp__->mnt_vfc->vfc_flags & VFCF_SBDRY) && sigdeferstop())
 
 #define	VFS_EPILOGUE(MP)						\
 	if (_enable_stops)						\
@@ -806,8 +821,6 @@ vfs_statfs_t	__vfs_statfs;
 	};							\
 	DECLARE_MODULE(fsname, fsname ## _mod, SI_SUB_VFS, SI_ORDER_MIDDLE)
 
-extern	char *mountrootfsname;
-
 /*
  * exported vnode operations
  */
diff --git a/sys/sys/mutex.h b/sys/sys/mutex.h
index 1c9d5d53002..39d8f45a57a 100644
--- a/sys/sys/mutex.h
+++ b/sys/sys/mutex.h
@@ -229,6 +229,9 @@ void	thread_lock_flags_(struct thread *, int, const char *, int);
 #define __mtx_unlock(mp, tid, opts, file, line) do {			\
 	uintptr_t _tid = (uintptr_t)(tid);				\
 									\
+	if ((mp)->mtx_recurse == 0)					\
+		 LOCKSTAT_PROFILE_RELEASE_LOCK(LS_MTX_UNLOCK_RELEASE,	\
+		    (mp));						\
 	if (!_mtx_release_lock((mp), _tid))				\
 		_mtx_unlock_sleep((mp), (opts), (file), (line));	\
 } while (0)
diff --git a/sys/sys/param.h b/sys/sys/param.h
index b29ecb39231..fd1403715e5 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 1000055	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100003	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
@@ -80,6 +80,8 @@
 #define	P_OSREL_SIGWAIT		700000
 #define	P_OSREL_SIGSEGV		700004
 #define	P_OSREL_MAP_ANON	800104
+
+#define	P_OSREL_MAJOR(x)	((x) / 100000)
 #endif
 
 #ifndef LOCORE
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 5443b61773b..fce1f8aa769 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -793,6 +793,8 @@ extern pid_t pid_max;
 
 #define	THREAD_SLEEPING_OK()		((curthread)->td_no_sleeping--)
 
+#define	THREAD_CAN_SLEEP()		((curthread)->td_no_sleeping == 0)
+
 #define	PIDHASH(pid)	(&pidhashtbl[(pid) & pidhash])
 extern LIST_HEAD(pidhashhead, proc) *pidhashtbl;
 extern u_long pidhash;
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 2f86c82e854..9fee143751b 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -39,7 +39,8 @@ int read_random(void *, int);
  */
 enum esource {
 	RANDOM_START = 0,
-	RANDOM_WRITE = 0,
+	RANDOM_CACHED = 0,
+	RANDOM_ATTACH,
 	RANDOM_KEYBOARD,
 	RANDOM_MOUSE,
 	RANDOM_NET_TUN,
@@ -47,10 +48,17 @@ enum esource {
 	RANDOM_NET_NG,
 	RANDOM_INTERRUPT,
 	RANDOM_SWI,
-	RANDOM_PURE,
+	RANDOM_PURE_OCTEON,
+	RANDOM_PURE_SAFE,
+	RANDOM_PURE_GLXSB,
+	RANDOM_PURE_UBSEC,
+	RANDOM_PURE_HIFN,
+	RANDOM_PURE_RDRAND,
+	RANDOM_PURE_NEHEMIAH,
+	RANDOM_PURE_RNDTEST,
 	ENTROPYSOURCE
 };
-void random_harvest(void *, u_int, u_int, u_int, enum esource);
+void random_harvest(const void *, u_int, u_int, enum esource);
 
 /* Allow the sysadmin to select the broad category of
  * entropy types to harvest
diff --git a/sys/sys/resource.h b/sys/sys/resource.h
index 89dc967c233..fb9e05b2486 100644
--- a/sys/sys/resource.h
+++ b/sys/sys/resource.h
@@ -103,8 +103,9 @@ struct __wrusage {
 #define	RLIMIT_AS	RLIMIT_VMEM	/* standard name for RLIMIT_VMEM */
 #define	RLIMIT_NPTS	11		/* pseudo-terminals */
 #define	RLIMIT_SWAP	12		/* swap used */
+#define	RLIMIT_KQUEUES	13		/* kqueues allocated */
 
-#define	RLIM_NLIMITS	13		/* number of resource limits */
+#define	RLIM_NLIMITS	14		/* number of resource limits */
 
 #define	RLIM_INFINITY	((rlim_t)(((uint64_t)1 << 63) - 1))
 /* XXX Missing: RLIM_SAVED_MAX, RLIM_SAVED_CUR */
@@ -129,6 +130,7 @@ static const char *rlimit_ident[RLIM_NLIMITS] = {
 	"vmem",
 	"npts",
 	"swap",
+	"kqueues",
 };
 #endif
 
diff --git a/sys/sys/resourcevar.h b/sys/sys/resourcevar.h
index 0c9194895a3..1a35a9e8d3a 100644
--- a/sys/sys/resourcevar.h
+++ b/sys/sys/resourcevar.h
@@ -99,6 +99,7 @@ struct uidinfo {
 	long	ui_sbsize;		/* (b) socket buffer space consumed */
 	long	ui_proccnt;		/* (b) number of processes */
 	long	ui_ptscnt;		/* (b) number of pseudo-terminals */
+	long	ui_kqcnt;		/* (b) number of kqueues */
 	uid_t	ui_uid;			/* (a) uid */
 	u_int	ui_ref;			/* (b) reference count */
 	struct racct *ui_racct;		/* (a) resource accounting */
@@ -115,6 +116,7 @@ void	 addupc_intr(struct thread *td, uintfptr_t pc, u_int ticks);
 void	 addupc_task(struct thread *td, uintfptr_t pc, u_int ticks);
 void	 calccru(struct proc *p, struct timeval *up, struct timeval *sp);
 void	 calcru(struct proc *p, struct timeval *up, struct timeval *sp);
+int	 chgkqcnt(struct uidinfo *uip, int diff, rlim_t max);
 int	 chgproccnt(struct uidinfo *uip, int diff, rlim_t maxval);
 int	 chgsbsize(struct uidinfo *uip, u_int *hiwat, u_int to,
 	    rlim_t maxval);
diff --git a/sys/sys/rwlock.h b/sys/sys/rwlock.h
index 26e4ac7b43d..a3273408721 100644
--- a/sys/sys/rwlock.h
+++ b/sys/sys/rwlock.h
@@ -112,8 +112,12 @@
 									\
 	if ((rw)->rw_recurse)						\
 		(rw)->rw_recurse--;					\
-	else if (!_rw_write_unlock((rw), _tid))				\
-		_rw_wunlock_hard((rw), _tid, (file), (line));		\
+	else {								\
+		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_RW_WUNLOCK_RELEASE,	\
+		    (rw));						\
+		if (!_rw_write_unlock((rw), _tid))			\
+			_rw_wunlock_hard((rw), _tid, (file), (line));	\
+	}								\
 } while (0)
 
 /*
diff --git a/sys/sys/sdt.h b/sys/sys/sdt.h
index f7b58f64b64..ca820f68bce 100644
--- a/sys/sys/sdt.h
+++ b/sys/sys/sdt.h
@@ -84,20 +84,20 @@
 
 #define SDT_PROVIDER_DEFINE(prov)
 #define SDT_PROVIDER_DECLARE(prov)
-#define SDT_PROBE_DEFINE(prov, mod, func, name, sname)
+#define SDT_PROBE_DEFINE(prov, mod, func, name)
 #define SDT_PROBE_DECLARE(prov, mod, func, name)
 #define SDT_PROBE(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
 #define SDT_PROBE_ARGTYPE(prov, mod, func, name, num, type, xtype)
 
-#define	SDT_PROBE_DEFINE0(prov, mod, func, name, sname)
-#define	SDT_PROBE_DEFINE1(prov, mod, func, name, sname, arg0)
-#define	SDT_PROBE_DEFINE2(prov, mod, func, name, sname, arg0, arg1)
-#define	SDT_PROBE_DEFINE3(prov, mod, func, name, sname, arg0, arg1, arg2)
-#define	SDT_PROBE_DEFINE4(prov, mod, func, name, sname, arg0, arg1, arg2, arg3)
-#define	SDT_PROBE_DEFINE5(prov, mod, func, name, sname, arg0, arg1, arg2, arg3, arg4)
-#define	SDT_PROBE_DEFINE6(prov, mod, func, name, snamp, arg0, arg1, arg2,      \
+#define	SDT_PROBE_DEFINE0(prov, mod, func, name)
+#define	SDT_PROBE_DEFINE1(prov, mod, func, name, arg0)
+#define	SDT_PROBE_DEFINE2(prov, mod, func, name, arg0, arg1)
+#define	SDT_PROBE_DEFINE3(prov, mod, func, name, arg0, arg1, arg2)
+#define	SDT_PROBE_DEFINE4(prov, mod, func, name, arg0, arg1, arg2, arg3)
+#define	SDT_PROBE_DEFINE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4)
+#define	SDT_PROBE_DEFINE6(prov, mod, func, name, arg0, arg1, arg2,      \
     arg3, arg4, arg5)
-#define	SDT_PROBE_DEFINE7(prov, mod, func, name, snamp, arg0, arg1, arg2,      \
+#define	SDT_PROBE_DEFINE7(prov, mod, func, name, arg0, arg1, arg2,      \
     arg3, arg4, arg5, arg6)
 
 #define	SDT_PROBE0(prov, mod, func, name)
@@ -110,22 +110,30 @@
 #define	SDT_PROBE7(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4, arg5,  \
     arg6)
 
-#define	SDT_PROBE_DEFINE0_XLATE(prov, mod, func, name, sname)
-#define	SDT_PROBE_DEFINE1_XLATE(prov, mod, func, name, sname, arg0, xarg0)
-#define	SDT_PROBE_DEFINE2_XLATE(prov, mod, func, name, sname, arg0, xarg0,     \
+#define	SDT_PROBE_DEFINE0_XLATE(prov, mod, func, name)
+#define	SDT_PROBE_DEFINE1_XLATE(prov, mod, func, name, arg0, xarg0)
+#define	SDT_PROBE_DEFINE2_XLATE(prov, mod, func, name, arg0, xarg0,     \
     arg1, xarg1)
-#define	SDT_PROBE_DEFINE3_XLATE(prov, mod, func, name, sname, arg0, xarg0,     \
+#define	SDT_PROBE_DEFINE3_XLATE(prov, mod, func, name, arg0, xarg0,     \
     arg1, xarg1, arg2, xarg2)
-#define SDT_PROBE_DEFINE4_XLATE(prov, mod, func, name, sname, arg0, xarg0,     \
+#define SDT_PROBE_DEFINE4_XLATE(prov, mod, func, name, arg0, xarg0,     \
     arg1, xarg1, arg2, xarg2, arg3, xarg3)
-#define	SDT_PROBE_DEFINE5_XLATE(prov, mod, func, name, sname, arg0, xarg0,     \
+#define	SDT_PROBE_DEFINE5_XLATE(prov, mod, func, name, arg0, xarg0,     \
     arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4)
-#define	SDT_PROBE_DEFINE6_XLATE(prov, mod, func, name, sname, arg0, xarg0,     \
+#define	SDT_PROBE_DEFINE6_XLATE(prov, mod, func, name, arg0, xarg0,     \
     arg1,  xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5)
-#define	SDT_PROBE_DEFINE7_XLATE(prov, mod, func, name, sname, arg0, xarg0,     \
+#define	SDT_PROBE_DEFINE7_XLATE(prov, mod, func, name, arg0, xarg0,     \
     arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5, arg6,     \
     xarg6)
 
+#define	DTRACE_PROBE(name)
+#define	DTRACE_PROBE1(name, type0, arg0)
+#define	DTRACE_PROBE2(name, type0, arg0, type1, arg1)
+#define	DTRACE_PROBE3(name, type0, arg0, type1, arg1, type2, arg2)
+#define	DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3)
+#define	DTRACE_PROBE5(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3,\
+    type4, arg4)
+
 #else
 
 SET_DECLARE(sdt_providers_set, struct sdt_provider);
@@ -134,17 +142,17 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype);
 
 #define SDT_PROVIDER_DEFINE(prov)						\
 	struct sdt_provider sdt_provider_##prov[1] = {				\
-		{ #prov, { NULL, NULL }, { NULL, NULL }, 0, 0 }			\
+		{ #prov, { NULL, NULL }, 0, 0 }					\
 	};									\
 	DATA_SET(sdt_providers_set, sdt_provider_##prov);
 
 #define SDT_PROVIDER_DECLARE(prov)						\
 	extern struct sdt_provider sdt_provider_##prov[1]
 
-#define SDT_PROBE_DEFINE(prov, mod, func, name, sname)				\
+#define SDT_PROBE_DEFINE(prov, mod, func, name)					\
 	struct sdt_probe sdt_##prov##_##mod##_##func##_##name[1] = {		\
 		{ sizeof(struct sdt_probe), sdt_provider_##prov,		\
-		    { NULL, NULL }, { NULL, NULL }, #mod, #func, #sname, 0, 0,	\
+		    { NULL, NULL }, { NULL, NULL }, #mod, #func, #name, 0, 0,	\
 		    NULL }							\
 	};									\
 	DATA_SET(sdt_probes_set, sdt_##prov##_##mod##_##func##_##name);
@@ -166,42 +174,42 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype);
 	};									\
 	DATA_SET(sdt_argtypes_set, sdta_##prov##_##mod##_##func##_##name##num);
 
-#define	SDT_PROBE_DEFINE0(prov, mod, func, name, sname)			\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname)
+#define	SDT_PROBE_DEFINE0(prov, mod, func, name)			\
+	SDT_PROBE_DEFINE(prov, mod, func, name)
 
-#define	SDT_PROBE_DEFINE1(prov, mod, func, name, sname, arg0)		\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+#define	SDT_PROBE_DEFINE1(prov, mod, func, name, arg0)			\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL)
 
-#define	SDT_PROBE_DEFINE2(prov, mod, func, name, sname, arg0, arg1)	\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+#define	SDT_PROBE_DEFINE2(prov, mod, func, name, arg0, arg1)		\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL)
 
-#define	SDT_PROBE_DEFINE3(prov, mod, func, name, sname, arg0, arg1, arg2)\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+#define	SDT_PROBE_DEFINE3(prov, mod, func, name, arg0, arg1, arg2)\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL)
 
-#define	SDT_PROBE_DEFINE4(prov, mod, func, name, sname, arg0, arg1, arg2, arg3) \
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+#define	SDT_PROBE_DEFINE4(prov, mod, func, name, arg0, arg1, arg2, arg3) \
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, NULL)
 
-#define	SDT_PROBE_DEFINE5(prov, mod, func, name, sname, arg0, arg1, arg2, arg3, arg4) \
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+#define	SDT_PROBE_DEFINE5(prov, mod, func, name, arg0, arg1, arg2, arg3, arg4) \
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, NULL)
 
-#define	SDT_PROBE_DEFINE6(prov, mod, func, name, sname, arg0, arg1, arg2, arg3,\
+#define	SDT_PROBE_DEFINE6(prov, mod, func, name, arg0, arg1, arg2, arg3,\
     arg4, arg5) \
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL);	\
@@ -209,9 +217,9 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype);
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 5, arg5, NULL)
 
-#define	SDT_PROBE_DEFINE7(prov, mod, func, name, sname, arg0, arg1, arg2, arg3,\
+#define	SDT_PROBE_DEFINE7(prov, mod, func, name, arg0, arg1, arg2, arg3,\
     arg4, arg5, arg6) \
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, NULL);	\
@@ -220,46 +228,46 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype);
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 5, arg5, NULL);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 6, arg6, NULL)
 
-#define	SDT_PROBE_DEFINE0_XLATE(prov, mod, func, name, sname)		\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname)
+#define	SDT_PROBE_DEFINE0_XLATE(prov, mod, func, name)		\
+	SDT_PROBE_DEFINE(prov, mod, func, name)
 
-#define	SDT_PROBE_DEFINE1_XLATE(prov, mod, func, name, sname, arg0, xarg0) \
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+#define	SDT_PROBE_DEFINE1_XLATE(prov, mod, func, name, arg0, xarg0) \
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0)
 
-#define	SDT_PROBE_DEFINE2_XLATE(prov, mod, func, name, sname, arg0, xarg0, \
+#define	SDT_PROBE_DEFINE2_XLATE(prov, mod, func, name, arg0, xarg0, \
     arg1,  xarg1)							\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1)
 
-#define	SDT_PROBE_DEFINE3_XLATE(prov, mod, func, name, sname, arg0, xarg0, \
+#define	SDT_PROBE_DEFINE3_XLATE(prov, mod, func, name, arg0, xarg0, \
     arg1, xarg1, arg2, xarg2)						\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2)
 
-#define	SDT_PROBE_DEFINE4_XLATE(prov, mod, func, name, sname, arg0, xarg0, \
+#define	SDT_PROBE_DEFINE4_XLATE(prov, mod, func, name, arg0, xarg0, \
     arg1, xarg1, arg2, xarg2, arg3, xarg3)				\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, xarg3)
 
-#define	SDT_PROBE_DEFINE5_XLATE(prov, mod, func, name, sname, arg0, xarg0, \
+#define	SDT_PROBE_DEFINE5_XLATE(prov, mod, func, name, arg0, xarg0, \
     arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4)			\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 3, arg3, xarg3);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, xarg4)
 
-#define	SDT_PROBE_DEFINE6_XLATE(prov, mod, func, name, sname, arg0, xarg0, \
+#define	SDT_PROBE_DEFINE6_XLATE(prov, mod, func, name, arg0, xarg0, \
     arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5)	\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2);	\
@@ -267,10 +275,10 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype);
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 4, arg4, xarg4);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 5, arg5, xarg5)
 
-#define	SDT_PROBE_DEFINE7_XLATE(prov, mod, func, name, sname, arg0, xarg0, \
+#define	SDT_PROBE_DEFINE7_XLATE(prov, mod, func, name, arg0, xarg0, \
     arg1, xarg1, arg2, xarg2, arg3, xarg3, arg4, xarg4, arg5, xarg5, arg6, \
     xarg6)								\
-	SDT_PROBE_DEFINE(prov, mod, func, name, sname);			\
+	SDT_PROBE_DEFINE(prov, mod, func, name);			\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 0, arg0, xarg0);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 1, arg1, xarg1);	\
 	SDT_PROBE_ARGTYPE(prov, mod, func, name, 2, arg2, xarg2);	\
@@ -313,6 +321,51 @@ SET_DECLARE(sdt_argtypes_set, struct sdt_argtype);
 			    (uintptr_t)arg6);				       \
 	} while (0)
 
+#define	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, arg4)	do { \
+	static SDT_PROBE_DEFINE(sdt, , , name);				     \
+	SDT_PROBE(sdt, , , name, arg0, arg1, arg2, arg3, arg4);
+#define DTRACE_PROBE_IMPL_END	} while (0)
+
+#define DTRACE_PROBE(name)						\
+	DTRACE_PROBE_IMPL_START(name, 0, 0, 0, 0, 0)			\
+	DTRACE_PROBE_IMPL_END
+
+#define DTRACE_PROBE1(name, type0, arg0)				\
+	DTRACE_PROBE_IMPL_START(name, arg0, 0, 0, 0, 0) 		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
+	DTRACE_PROBE_IMPL_END
+
+#define DTRACE_PROBE2(name, type0, arg0, type1, arg1)			\
+	DTRACE_PROBE_IMPL_START(name, arg0, arg1, 0, 0, 0) 		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
+	DTRACE_PROBE_IMPL_END
+
+#define DTRACE_PROBE3(name, type0, arg0, type1, arg1, type2, arg2)	\
+	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, 0, 0)	 	\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		\
+	DTRACE_PROBE_IMPL_END
+
+#define DTRACE_PROBE4(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3)	\
+	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, 0) 	\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 3, #type3, NULL);		\
+	DTRACE_PROBE_IMPL_END
+
+#define DTRACE_PROBE5(name, type0, arg0, type1, arg1, type2, arg2, type3, arg3,	\
+    type4, arg4)								\
+	DTRACE_PROBE_IMPL_START(name, arg0, arg1, arg2, arg3, arg4) 	\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 0, #type0, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 1, #type1, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 2, #type2, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 3, #type3, NULL);		\
+	SDT_PROBE_ARGTYPE(sdt, , , name, 4, #type4, NULL);		\
+	DTRACE_PROBE_IMPL_END
+
 #endif /* KDTRACE_HOOKS */
 
 /*
@@ -358,7 +411,6 @@ struct sdt_provider {
 	char *name;			/* Provider name. */
 	TAILQ_ENTRY(sdt_provider)
 			prov_entry;	/* SDT provider list entry. */
-	TAILQ_HEAD(probe_list_head, sdt_probe) probe_list;
 	uintptr_t	id;		/* DTrace provider ID. */
 	int		sdt_refs;	/* Number of module references. */
 };
@@ -366,6 +418,8 @@ struct sdt_provider {
 void sdt_probe_stub(uint32_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t,
     uintptr_t);
 
+SDT_PROVIDER_DECLARE(sdt);
+
 #endif /* _KERNEL */
 
 #endif /* _SYS_SDT_H */
diff --git a/sys/sys/sf_sync.h b/sys/sys/sf_sync.h
new file mode 100644
index 00000000000..c66f4d99f16
--- /dev/null
+++ b/sys/sys/sf_sync.h
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 2013 Adrian Chadd <adrian@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 _SYS_SF_SYNC_H_
+#define _SYS_SF_SYNC_H_
+
+struct sendfile_sync {
+	uint32_t	flags;
+	struct mtx	mtx;
+	struct cv	cv;
+	unsigned	count;
+};
+
+extern	struct sendfile_sync * sf_sync_alloc(uint32_t flags);
+extern	void sf_sync_syscall_wait(struct sendfile_sync *);
+extern	void sf_sync_free(struct sendfile_sync *);
+extern	void sf_sync_ref(struct sendfile_sync *);
+extern	void sf_sync_deref(struct sendfile_sync *);
+
+#endif /* !_SYS_SF_BUF_H_ */
diff --git a/sys/sys/sockbuf.h b/sys/sys/sockbuf.h
index 402a8f0749f..e7162418e67 100644
--- a/sys/sys/sockbuf.h
+++ b/sys/sys/sockbuf.h
@@ -140,6 +140,8 @@ struct mbuf *
 void	sbdestroy(struct sockbuf *sb, struct socket *so);
 void	sbdrop(struct sockbuf *sb, int len);
 void	sbdrop_locked(struct sockbuf *sb, int len);
+struct mbuf *
+	sbcut_locked(struct sockbuf *sb, int len);
 void	sbdroprecord(struct sockbuf *sb);
 void	sbdroprecord_locked(struct sockbuf *sb);
 void	sbflush(struct sockbuf *sb);
diff --git a/sys/sys/sockio.h b/sys/sys/sockio.h
index df0d4b20e13..a09c11f6b00 100644
--- a/sys/sys/sockio.h
+++ b/sys/sys/sockio.h
@@ -50,28 +50,28 @@
 #define	SIOCGETSGCNT	_IOWR('r', 16, struct sioc_sg_req) /* get s,g pkt cnt */
 
 #define	SIOCSIFADDR	 _IOW('i', 12, struct ifreq)	/* set ifnet address */
-#define	OSIOCGIFADDR	_IOWR('i', 13, struct ifreq)	/* get ifnet address */
+/*	OSIOCGIFADDR	_IOWR('i', 13, struct ifreq)	4.3BSD */
 #define	SIOCGIFADDR	_IOWR('i', 33, struct ifreq)	/* get ifnet address */
 #define	SIOCSIFDSTADDR	 _IOW('i', 14, struct ifreq)	/* set p-p address */
-#define	OSIOCGIFDSTADDR	_IOWR('i', 15, struct ifreq)	/* get p-p address */
+/*	OSIOCGIFDSTADDR	_IOWR('i', 15, struct ifreq)	4.3BSD */
 #define	SIOCGIFDSTADDR	_IOWR('i', 34, struct ifreq)	/* get p-p address */
 #define	SIOCSIFFLAGS	 _IOW('i', 16, struct ifreq)	/* set ifnet flags */
 #define	SIOCGIFFLAGS	_IOWR('i', 17, struct ifreq)	/* get ifnet flags */
-#define	OSIOCGIFBRDADDR	_IOWR('i', 18, struct ifreq)	/* get broadcast addr */
+/*	OSIOCGIFBRDADDR	_IOWR('i', 18, struct ifreq)	4.3BSD */
 #define	SIOCGIFBRDADDR	_IOWR('i', 35, struct ifreq)	/* get broadcast addr */
 #define	SIOCSIFBRDADDR	 _IOW('i', 19, struct ifreq)	/* set broadcast addr */
-#define	OSIOCGIFCONF	_IOWR('i', 20, struct ifconf)	/* get ifnet list */
+/*	OSIOCGIFCONF	_IOWR('i', 20, struct ifconf)	4.3BSD */
 #define	SIOCGIFCONF	_IOWR('i', 36, struct ifconf)	/* get ifnet list */
-#define	OSIOCGIFNETMASK	_IOWR('i', 21, struct ifreq)	/* get net addr mask */
+/*	OSIOCGIFNETMASK	_IOWR('i', 21, struct ifreq)	4.3BSD */
 #define	SIOCGIFNETMASK	_IOWR('i', 37, struct ifreq)	/* get net addr mask */
 #define	SIOCSIFNETMASK	 _IOW('i', 22, struct ifreq)	/* set net addr mask */
 #define	SIOCGIFMETRIC	_IOWR('i', 23, struct ifreq)	/* get IF metric */
 #define	SIOCSIFMETRIC	 _IOW('i', 24, struct ifreq)	/* set IF metric */
 #define	SIOCDIFADDR	 _IOW('i', 25, struct ifreq)	/* delete IF addr */
-#define	OSIOCAIFADDR	 _IOW('i', 26, struct oifaliasreq)/* add/chg IF alias */
-#define	SIOCALIFADDR	 _IOW('i', 27, struct if_laddrreq) /* add IF addr */
-#define	SIOCGLIFADDR	_IOWR('i', 28, struct if_laddrreq) /* get IF addr */
-#define	SIOCDLIFADDR	 _IOW('i', 29, struct if_laddrreq) /* delete IF addr */
+#define	OSIOCAIFADDR	 _IOW('i', 26, struct oifaliasreq) /* FreeBSD 9.x */
+/*	SIOCALIFADDR	 _IOW('i', 27, struct if_laddrreq) KAME */
+/*	SIOCGLIFADDR	_IOWR('i', 28, struct if_laddrreq) KAME */
+/*	SIOCDLIFADDR	 _IOW('i', 29, struct if_laddrreq) KAME */
 #define	SIOCSIFCAP	 _IOW('i', 30, struct ifreq)	/* set IF features */
 #define	SIOCGIFCAP	_IOWR('i', 31, struct ifreq)	/* get IF features */
 #define	SIOCGIFINDEX	_IOWR('i', 32, struct ifreq)	/* get IF index */
@@ -101,8 +101,8 @@
 #define	SIOCGIFPSRCADDR	_IOWR('i', 71, struct ifreq)	/* get gif psrc addr */
 #define	SIOCGIFPDSTADDR	_IOWR('i', 72, struct ifreq)	/* get gif pdst addr */
 #define	SIOCDIFPHYADDR	 _IOW('i', 73, struct ifreq)	/* delete gif addrs */
-#define	SIOCSLIFPHYADDR	 _IOW('i', 74, struct if_laddrreq) /* set gif addrs */
-#define	SIOCGLIFPHYADDR	_IOWR('i', 75, struct if_laddrreq) /* get gif addrs */
+/*	SIOCSLIFPHYADDR	 _IOW('i', 74, struct if_laddrreq) KAME */
+/*	SIOCGLIFPHYADDR	_IOWR('i', 75, struct if_laddrreq) KAME */
 
 #define	SIOCGPRIVATE_0	_IOWR('i', 80, struct ifreq)	/* device private 0 */
 #define	SIOCGPRIVATE_1	_IOWR('i', 81, struct ifreq)	/* device private 1 */
diff --git a/sys/sys/sx.h b/sys/sys/sx.h
index 01d71126b01..8e4a6446808 100644
--- a/sys/sys/sx.h
+++ b/sys/sys/sx.h
@@ -86,6 +86,8 @@
 
 #ifdef _KERNEL
 
+#define	sx_recurse	lock_object.lo_data
+
 /*
  * Function prototipes.  Routines that start with an underscore are not part
  * of the public interface and are wrappered with a macro.
@@ -163,6 +165,8 @@ __sx_xunlock(struct sx *sx, struct thread *td, const char *file, int line)
 {
 	uintptr_t tid = (uintptr_t)td;
 
+	if (sx->sx_recurse == 0)
+		LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_XUNLOCK_RELEASE, sx);
 	if (!atomic_cmpset_rel_ptr(&sx->sx_lock, tid, SX_LOCK_UNLOCKED))
 		_sx_xunlock_hard(sx, tid, file, line);
 }
@@ -196,6 +200,7 @@ __sx_sunlock(struct sx *sx, const char *file, int line)
 {
 	uintptr_t x = sx->sx_lock;
 
+	LOCKSTAT_PROFILE_RELEASE_LOCK(LS_SX_SUNLOCK_RELEASE, sx);
 	if (x == (SX_SHARERS_LOCK(1) | SX_LOCK_EXCLUSIVE_WAITERS) ||
 	    !atomic_cmpset_rel_ptr(&sx->sx_lock, x, x - SX_ONE_SHARER))
 		_sx_sunlock_hard(sx, file, line);
diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h
index 64292baccc3..8e70a12f135 100644
--- a/sys/sys/sysctl.h
+++ b/sys/sys/sysctl.h
@@ -530,6 +530,7 @@ SYSCTL_ALLOWED_TYPES(UINT64, uint64_t *a; unsigned long long *b; );
 #define	KERN_PROC_PS_STRINGS	38	/* get ps_strings location */
 #define	KERN_PROC_UMASK		39	/* process umask */
 #define	KERN_PROC_OSREL		40	/* osreldate for process binary */
+#define	KERN_PROC_SIGTRAMP	41	/* signal trampoline location */
 
 /*
  * KERN_IPC identifiers
diff --git a/sys/sys/systm.h b/sys/sys/systm.h
index f097e83c1f0..0405d8b9f88 100644
--- a/sys/sys/systm.h
+++ b/sys/sys/systm.h
@@ -70,8 +70,10 @@ extern int vm_guest;		/* Running as virtual machine guest? */
  * Detected virtual machine guest types. The intention is to expand
  * and/or add to the VM_GUEST_VM type if specific VM functionality is
  * ever implemented (e.g. vendor-specific paravirtualization features).
+ * Keep in sync with vm_guest_sysctl_names[].
  */
-enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN };
+enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV,
+		VM_LAST };
 
 #if defined(WITNESS) || defined(INVARIANTS)
 void	kassert_panic(const char *fmt, ...)  __printflike(1, 2);
@@ -146,7 +148,9 @@ extern const void *zero_region;	/* address space maps to a zeroed page	*/
 
 extern int unmapped_buf_allowed;
 extern int iosize_max_clamp;
+extern int devfs_iosize_max_clamp;
 #define	IOSIZE_MAX	(iosize_max_clamp ? INT_MAX : SSIZE_MAX)
+#define	DEVFS_IOSIZE_MAX	(devfs_iosize_max_clamp ? INT_MAX : SSIZE_MAX)
 
 /*
  * General function declarations.
diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h
index 7836262b233..326eb91f59d 100644
--- a/sys/sys/taskqueue.h
+++ b/sys/sys/taskqueue.h
@@ -81,6 +81,7 @@ int	taskqueue_cancel_timeout(struct taskqueue *queue,
 void	taskqueue_drain(struct taskqueue *queue, struct task *task);
 void	taskqueue_drain_timeout(struct taskqueue *queue,
 	    struct timeout_task *timeout_task);
+void	taskqueue_drain_all(struct taskqueue *queue);
 void	taskqueue_free(struct taskqueue *queue);
 void	taskqueue_run(struct taskqueue *queue);
 void	taskqueue_block(struct taskqueue *queue);
diff --git a/sys/sys/terminal.h b/sys/sys/terminal.h
new file mode 100644
index 00000000000..146b9acdd08
--- /dev/null
+++ b/sys/sys/terminal.h
@@ -0,0 +1,161 @@
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten 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 _SYS_TERMINAL_H_
+#define	_SYS_TERMINAL_H_
+
+#include <sys/param.h>
+#include <sys/_lock.h>
+#include <sys/_mutex.h>
+#include <sys/cons.h>
+#include <sys/linker_set.h>
+#include <sys/ttycom.h>
+
+#include <teken/teken.h>
+
+struct terminal;
+struct thread;
+struct tty;
+
+/*
+ * The terminal layer is an abstraction on top of the TTY layer and the
+ * console interface.  It can be used by system console drivers to
+ * easily interact with the kernel console and TTYs.
+ *
+ * Terminals contain terminal emulators, which means console drivers
+ * don't need to implement their own terminal emulator. The terminal
+ * emulator deals with UTF-8 exclusively. This means that term_char_t,
+ * the data type used to store input/output characters will always
+ * contain Unicode codepoints.
+ *
+ * To save memory usage, the top bits of term_char_t will contain other
+ * attributes, like colors. Right now term_char_t is composed as
+ * follows:
+ *
+ *  Bits  Meaning
+ *  0-20: Character value
+ *    21: Unused
+ * 22-25: Bold, underline, blink, reverse
+ * 26-28: Foreground color
+ * 29-31: Background color
+ */
+
+typedef uint32_t term_char_t;
+#define	TCHAR_CHARACTER(c)	((c) & 0x1fffff)
+#define	TCHAR_FORMAT(c)		(((c) >> 22) & 0xf)
+#define	TCHAR_FGCOLOR(c)	(((c) >> 26) & 0x7)
+#define	TCHAR_BGCOLOR(c)	((c) >> 29)
+
+typedef teken_color_t term_color_t;
+#define	TCOLOR_LIGHT(c)	((c) | 0x8)
+#define	TCOLOR_DARK(c)	((c) & ~0x8)
+typedef teken_pos_t term_pos_t;
+typedef teken_rect_t term_rect_t;
+
+typedef void tc_cursor_t(struct terminal *tm, const term_pos_t *p);
+typedef void tc_putchar_t(struct terminal *tm, const term_pos_t *p,
+    term_char_t c);
+typedef void tc_fill_t(struct terminal *tm, const term_rect_t *r,
+    term_char_t c);
+typedef void tc_copy_t(struct terminal *tm, const term_rect_t *r,
+    const term_pos_t *p);
+typedef void tc_param_t(struct terminal *tm, int cmd, unsigned int arg);
+typedef void tc_done_t(struct terminal *tm);
+
+typedef void tc_cnprobe_t(struct terminal *tm, struct consdev *cd);
+typedef int tc_cngetc_t(struct terminal *tm);
+
+typedef void tc_opened_t(struct terminal *tm, int opened);
+typedef int tc_ioctl_t(struct terminal *tm, u_long cmd, caddr_t data,
+    struct thread *td);
+typedef void tc_bell_t(struct terminal *tm);
+
+struct terminal_class {
+	/* Terminal emulator. */
+	tc_cursor_t	*tc_cursor;
+	tc_putchar_t	*tc_putchar;
+	tc_fill_t	*tc_fill;
+	tc_copy_t	*tc_copy;
+	tc_param_t	*tc_param;
+	tc_done_t	*tc_done;
+
+	/* Low-level console interface. */
+	tc_cnprobe_t	*tc_cnprobe;
+	tc_cngetc_t	*tc_cngetc;
+	
+	/* Misc. */
+	tc_opened_t	*tc_opened;
+	tc_ioctl_t	*tc_ioctl;
+	tc_bell_t	*tc_bell;
+};
+
+struct terminal {
+	const struct terminal_class *tm_class;
+	void		*tm_softc;
+	struct mtx	 tm_mtx;
+	struct tty	*tm_tty;
+	teken_t		 tm_emulator;
+	struct winsize	 tm_winsize;
+	unsigned int	 tm_flags;
+#define	TF_MUTE		0x1	/* Drop incoming data. */
+#define	TF_BELL		0x2	/* Bell needs to be sent. */
+#define	TF_CONS		0x4	/* Console device (needs spinlock). */
+	struct consdev	*consdev;
+};
+
+#ifdef _KERNEL
+
+struct terminal *terminal_alloc(const struct terminal_class *tc, void *softc);
+void	terminal_maketty(struct terminal *tm, const char *fmt, ...);
+void	terminal_set_winsize_blank(struct terminal *tm,
+    const struct winsize *size, int blank);
+void	terminal_set_winsize(struct terminal *tm, const struct winsize *size);
+void	terminal_mute(struct terminal *tm, int yes);
+void	terminal_input_char(struct terminal *tm, term_char_t c);
+void	terminal_input_raw(struct terminal *tm, char c);
+void	terminal_input_special(struct terminal *tm, unsigned int k);
+
+void	termcn_cnregister(struct terminal *tm);
+
+/* Kernel console helper interface. */
+extern const struct consdev_ops termcn_cnops;
+
+#define	TERMINAL_DECLARE_EARLY(name, class, softc)			\
+	static struct terminal name = {					\
+		.tm_class = &class,					\
+		.tm_softc = softc,					\
+		.tm_flags = TF_CONS,					\
+	};								\
+	CONSOLE_DEVICE(name ## _consdev, termcn_cnops, &name)
+
+#endif /* _KERNEL */
+
+#endif /* !_SYS_TERMINAL_H_ */
diff --git a/sys/sys/tty.h b/sys/sys/tty.h
index c4d4d41ba8f..b9552186d9a 100644
--- a/sys/sys/tty.h
+++ b/sys/sys/tty.h
@@ -166,6 +166,7 @@ void	tty_rel_gone(struct tty *tp);
 
 #define	tty_lock(tp)		mtx_lock((tp)->t_mtx)
 #define	tty_unlock(tp)		mtx_unlock((tp)->t_mtx)
+#define	tty_lock_owned(tp)	mtx_owned((tp)->t_mtx)
 #define	tty_lock_assert(tp,ma)	mtx_assert((tp)->t_mtx, (ma))
 #define	tty_getlock(tp)		((tp)->t_mtx)
 
diff --git a/sys/sys/user.h b/sys/sys/user.h
index d2e2b6e7128..e926fe871c9 100644
--- a/sys/sys/user.h
+++ b/sys/sys/user.h
@@ -498,6 +498,12 @@ struct kinfo_kstack {
 	int	 _kkst_ispare[16];		/* Space for more stuff. */
 };
 
+struct kinfo_sigtramp {
+	void	*ksigtramp_start;
+	void	*ksigtramp_end;
+	void	*ksigtramp_spare[4];
+};
+
 #ifdef _KERNEL
 /* Flags for kern_proc_out function. */
 #define KERN_PROC_NOTHREADS	0x1
diff --git a/sys/teken/teken.c b/sys/teken/teken.c
index 8ca88d23815..a54c9f96e04 100644
--- a/sys/teken/teken.c
+++ b/sys/teken/teken.c
@@ -346,6 +346,14 @@ teken_set_winsize(teken_t *t, const teken_pos_t *p)
 	teken_subr_do_reset(t);
 }
 
+void
+teken_set_winsize_noreset(teken_t *t, const teken_pos_t *p)
+{
+
+	t->t_winsize = *p;
+	teken_subr_do_resize(t);
+}
+
 void
 teken_set_8bit(teken_t *t)
 {
diff --git a/sys/teken/teken.h b/sys/teken/teken.h
index 2feef6e0ddb..a9bca98e966 100644
--- a/sys/teken/teken.h
+++ b/sys/teken/teken.h
@@ -168,6 +168,7 @@ void	teken_set_cursor(teken_t *, const teken_pos_t *);
 void	teken_set_curattr(teken_t *, const teken_attr_t *);
 void	teken_set_defattr(teken_t *, const teken_attr_t *);
 void	teken_set_winsize(teken_t *, const teken_pos_t *);
+void	teken_set_winsize_noreset(teken_t *, const teken_pos_t *);
 
 /* Key input escape sequences. */
 #define	TKEY_UP		0x00
diff --git a/sys/teken/teken_subr.h b/sys/teken/teken_subr.h
index 64f4e5456bf..f25ab6aa34d 100644
--- a/sys/teken/teken_subr.h
+++ b/sys/teken/teken_subr.h
@@ -955,6 +955,15 @@ teken_subr_reset_mode(teken_t *t, unsigned int cmd)
 	}
 }
 
+static void
+teken_subr_do_resize(teken_t *t)
+{
+
+	t->t_scrollreg.ts_begin = 0;
+	t->t_scrollreg.ts_end = t->t_winsize.tp_row;
+	t->t_originreg = t->t_scrollreg;
+}
+
 static void
 teken_subr_do_reset(teken_t *t)
 {
diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk
index 2347004beb6..7d106e7f9c6 100644
--- a/sys/tools/vnode_if.awk
+++ b/sys/tools/vnode_if.awk
@@ -165,8 +165,6 @@ if (hfile) {
 
 if (cfile) {
 	printc(common_head \
-	    "#include \"opt_kdtrace.h\"\n" \
-	    "\n" \
 	    "#include <sys/param.h>\n" \
 	    "#include <sys/event.h>\n" \
 	    "#include <sys/kernel.h>\n" \
@@ -342,8 +340,8 @@ while ((getline < srcfile) > 0) {
 		printc("};");
 
 		printc("\n");
-		printc("SDT_PROBE_DEFINE2(vfs, vop, " name ", entry, entry, \"struct vnode *\", \"struct " name "_args *\");\n");
-		printc("SDT_PROBE_DEFINE3(vfs, vop, " name ", return, return, \"struct vnode *\", \"struct " name "_args *\", \"int\");\n");
+		printc("SDT_PROBE_DEFINE2(vfs, vop, " name ", entry, \"struct vnode *\", \"struct " name "_args *\");\n");
+		printc("SDT_PROBE_DEFINE3(vfs, vop, " name ", return, \"struct vnode *\", \"struct " name "_args *\", \"int\");\n");
 
 		# Print out function.
 		printc("\nint\n" uname "_AP(struct " name "_args *a)");
diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h
index 918383dcfcf..a50a88a6185 100644
--- a/sys/ufs/ffs/ffs_extern.h
+++ b/sys/ufs/ffs/ffs_extern.h
@@ -152,9 +152,7 @@ void	softdep_setup_sbupdate(struct ufsmount *, struct fs *, struct buf *);
 void	softdep_fsync_mountdev(struct vnode *);
 int	softdep_sync_metadata(struct vnode *);
 int	softdep_sync_buf(struct vnode *, struct buf *, int);
-int     softdep_process_worklist(struct mount *, int);
 int     softdep_fsync(struct vnode *);
-int	softdep_waitidle(struct mount *);
 int	softdep_prealloc(struct vnode *, int);
 int	softdep_journal_lookup(struct mount *, struct vnode **);
 void	softdep_journal_freeblocks(struct inode *, struct ucred *, off_t, int);
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 9662ab30ac6..47cbe27b6d2 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -138,6 +138,7 @@ softdep_unmount(mp)
 	struct mount *mp;
 {
 
+	panic("softdep_unmount called");
 }
 
 void
@@ -146,6 +147,8 @@ softdep_setup_sbupdate(ump, fs, bp)
 	struct fs *fs;
 	struct buf *bp;
 {
+
+	panic("softdep_setup_sbupdate called");
 }
 
 void
@@ -433,8 +436,6 @@ softdep_prealloc(vp, waitok)
 {
 
 	panic("%s called", __FUNCTION__);
-
-	return (0);
 }
 
 int
@@ -503,14 +504,14 @@ int
 softdep_sync_metadata(struct vnode *vp)
 {
 
-	return (0);
+	panic("softdep_sync_metadata called");
 }
 
 int
 softdep_sync_buf(struct vnode *vp, struct buf *bp, int waitfor)
 {
 
-	return (0);
+	panic("softdep_sync_buf called");
 }
 
 int
@@ -521,14 +522,6 @@ softdep_slowdown(vp)
 	panic("softdep_slowdown called");
 }
 
-void
-softdep_releasefile(ip)
-	struct inode *ip;	/* inode with the zero effective link count */
-{
-
-	panic("softdep_releasefile called");
-}
-
 int
 softdep_request_cleanup(fs, vp, cred, resource)
 	struct fs *fs;
@@ -543,16 +536,16 @@ softdep_request_cleanup(fs, vp, cred, resource)
 int
 softdep_check_suspend(struct mount *mp,
 		      struct vnode *devvp,
-		      int softdep_deps,
-		      int softdep_accdeps,
+		      int softdep_depcnt,
+		      int softdep_accdepcnt,
 		      int secondary_writes,
 		      int secondary_accwrites)
 {
 	struct bufobj *bo;
 	int error;
 	
-	(void) softdep_deps,
-	(void) softdep_accdeps;
+	(void) softdep_depcnt,
+	(void) softdep_accdepcnt;
 
 	bo = &devvp->v_bufobj;
 	ASSERT_BO_WLOCKED(bo);
@@ -623,48 +616,6 @@ softdep_freework(wkhd)
 
 FEATURE(softupdates, "FFS soft-updates support");
 
-/*
- * These definitions need to be adapted to the system to which
- * this file is being ported.
- */
-
-#define M_SOFTDEP_FLAGS	(M_WAITOK)
-
-#define	D_PAGEDEP	0
-#define	D_INODEDEP	1
-#define	D_BMSAFEMAP	2
-#define	D_NEWBLK	3
-#define	D_ALLOCDIRECT	4
-#define	D_INDIRDEP	5
-#define	D_ALLOCINDIR	6
-#define	D_FREEFRAG	7
-#define	D_FREEBLKS	8
-#define	D_FREEFILE	9
-#define	D_DIRADD	10
-#define	D_MKDIR		11
-#define	D_DIRREM	12
-#define	D_NEWDIRBLK	13
-#define	D_FREEWORK	14
-#define	D_FREEDEP	15
-#define	D_JADDREF	16
-#define	D_JREMREF	17
-#define	D_JMVREF	18
-#define	D_JNEWBLK	19
-#define	D_JFREEBLK	20
-#define	D_JFREEFRAG	21
-#define	D_JSEG		22
-#define	D_JSEGDEP	23
-#define	D_SBDEP		24
-#define	D_JTRUNC	25
-#define	D_JFSYNC	26
-#define	D_SENTINEL	27
-#define	D_LAST		D_SENTINEL
-
-unsigned long dep_current[D_LAST + 1];
-unsigned long dep_highuse[D_LAST + 1];
-unsigned long dep_total[D_LAST + 1];
-unsigned long dep_write[D_LAST + 1];
-
 static SYSCTL_NODE(_debug, OID_AUTO, softdep, CTLFLAG_RW, 0,
     "soft updates stats");
 static SYSCTL_NODE(_debug_softdep, OID_AUTO, total, CTLFLAG_RW, 0,
@@ -676,6 +627,11 @@ static SYSCTL_NODE(_debug_softdep, OID_AUTO, current, CTLFLAG_RW, 0,
 static SYSCTL_NODE(_debug_softdep, OID_AUTO, write, CTLFLAG_RW, 0,
     "current dependencies written");
 
+unsigned long dep_current[D_LAST + 1];
+unsigned long dep_highuse[D_LAST + 1];
+unsigned long dep_total[D_LAST + 1];
+unsigned long dep_write[D_LAST + 1];
+
 #define	SOFTDEP_TYPE(type, str, long)					\
     static MALLOC_DEFINE(M_ ## type, #str, long);			\
     SYSCTL_ULONG(_debug_softdep_total, OID_AUTO, str, CTLFLAG_RD,	\
@@ -720,6 +676,9 @@ static MALLOC_DEFINE(M_SENTINEL, "sentinel", "Worklist sentinel");
 
 static MALLOC_DEFINE(M_SAVEDINO, "savedino", "Saved inodes");
 static MALLOC_DEFINE(M_JBLOCKS, "jblocks", "Journal block locations");
+static MALLOC_DEFINE(M_MOUNTDATA, "softdep", "Softdep per-mount data");
+
+#define M_SOFTDEP_FLAGS	(M_WAITOK)
 
 /* 
  * translate from workitem type to memory type
@@ -756,8 +715,6 @@ static struct malloc_type *memtype[] = {
 	M_SENTINEL
 };
 
-static LIST_HEAD(mkdirlist, mkdir) mkdirlisthd;
-
 #define DtoM(type) (memtype[type])
 
 /*
@@ -772,50 +729,17 @@ static LIST_HEAD(mkdirlist, mkdir) mkdirlisthd;
 #define	DOTDOT_OFFSET	offsetof(struct dirtemplate, dotdot_ino)
 #define	DOT_OFFSET	offsetof(struct dirtemplate, dot_ino)
 
-/*
- * Forward declarations.
- */
-struct inodedep_hashhead;
-struct newblk_hashhead;
-struct pagedep_hashhead;
-struct bmsafemap_hashhead;
-
-/*
- * Private journaling structures.
- */
-struct jblocks {
-	struct jseglst	jb_segs;	/* TAILQ of current segments. */
-	struct jseg	*jb_writeseg;	/* Next write to complete. */
-	struct jseg	*jb_oldestseg;	/* Oldest segment with valid entries. */
-	struct jextent	*jb_extent;	/* Extent array. */
-	uint64_t	jb_nextseq;	/* Next sequence number. */
-	uint64_t	jb_oldestwrseq;	/* Oldest written sequence number. */
-	uint8_t		jb_needseg;	/* Need a forced segment. */
-	uint8_t		jb_suspended;	/* Did journal suspend writes? */
-	int		jb_avail;	/* Available extents. */
-	int		jb_used;	/* Last used extent. */
-	int		jb_head;	/* Allocator head. */
-	int		jb_off;		/* Allocator extent offset. */
-	int		jb_blocks;	/* Total disk blocks covered. */
-	int		jb_free;	/* Total disk blocks free. */
-	int		jb_min;		/* Minimum free space. */
-	int		jb_low;		/* Low on space. */
-	int		jb_age;		/* Insertion time of oldest rec. */
-};
-
-struct jextent {
-	ufs2_daddr_t	je_daddr;	/* Disk block address. */
-	int		je_blocks;	/* Disk block count. */
-};
-
 /*
  * Internal function prototypes.
  */
+static	void check_clear_deps(struct mount *);
 static	void softdep_error(char *, int);
+static	int softdep_process_worklist(struct mount *, int);
+static	int softdep_waitidle(struct mount *);
 static	void drain_output(struct vnode *);
 static	struct buf *getdirtybuf(struct buf *, struct rwlock *, int);
-static	void clear_remove(void);
-static	void clear_inodedeps(void);
+static	void clear_remove(struct mount *);
+static	void clear_inodedeps(struct mount *);
 static	void unlinked_inodedep(struct mount *, struct inodedep *);
 static	void clear_unlinked_inodedep(struct inodedep *);
 static	struct inodedep *first_unlinked_inodedep(struct ufsmount *);
@@ -926,7 +850,7 @@ static	inline void setup_freeindir(struct freeblks *, struct inode *, int,
 static	inline struct freeblks *newfreeblks(struct mount *, struct inode *);
 static	void freeblks_free(struct ufsmount *, struct freeblks *, int);
 static	void indir_trunc(struct freework *, ufs2_daddr_t, ufs_lbn_t);
-ufs2_daddr_t blkcount(struct fs *, ufs2_daddr_t, off_t);
+static	ufs2_daddr_t blkcount(struct fs *, ufs2_daddr_t, off_t);
 static	int trunc_check_buf(struct buf *, int *, ufs_lbn_t, int, int);
 static	void trunc_dependencies(struct inode *, struct freeblks *, ufs_lbn_t,
 	    int, int);
@@ -959,20 +883,20 @@ static	void allocdirect_merge(struct allocdirectlst *,
 	    struct allocdirect *, struct allocdirect *);
 static	struct freefrag *allocindir_merge(struct allocindir *,
 	    struct allocindir *);
-static	int bmsafemap_find(struct bmsafemap_hashhead *, struct mount *, int,
+static	int bmsafemap_find(struct bmsafemap_hashhead *, int,
 	    struct bmsafemap **);
 static	struct bmsafemap *bmsafemap_lookup(struct mount *, struct buf *,
 	    int cg, struct bmsafemap *);
-static	int newblk_find(struct newblk_hashhead *, struct mount *, ufs2_daddr_t,
-	    int, struct newblk **);
+static	int newblk_find(struct newblk_hashhead *, ufs2_daddr_t, int,
+	    struct newblk **);
 static	int newblk_lookup(struct mount *, ufs2_daddr_t, int, struct newblk **);
-static	int inodedep_find(struct inodedep_hashhead *, struct fs *, ino_t,
+static	int inodedep_find(struct inodedep_hashhead *, ino_t,
 	    struct inodedep **);
 static	int inodedep_lookup(struct mount *, ino_t, int, struct inodedep **);
 static	int pagedep_lookup(struct mount *, struct buf *bp, ino_t, ufs_lbn_t,
 	    int, struct pagedep **);
 static	int pagedep_find(struct pagedep_hashhead *, ino_t, ufs_lbn_t,
-	    struct mount *mp, int, struct pagedep **);
+	    struct pagedep **);
 static	void pause_timer(void *);
 static	int request_cleanup(struct mount *, int);
 static	int process_worklist_item(struct mount *, int, int);
@@ -987,9 +911,9 @@ static	void remove_from_worklist(struct worklist *);
 static	void softdep_flush(void);
 static	void softdep_flushjournal(struct mount *);
 static	int softdep_speedup(void);
-static	void worklist_speedup(void);
+static	void worklist_speedup(struct mount *);
 static	int journal_mount(struct mount *, struct fs *, struct ucred *);
-static	void journal_unmount(struct mount *);
+static	void journal_unmount(struct ufsmount *);
 static	int journal_space(struct ufsmount *, int);
 static	void journal_suspend(struct ufsmount *);
 static	int journal_unsuspend(struct ufsmount *ump);
@@ -1035,15 +959,25 @@ static	void softdep_disk_write_complete(struct buf *);
 static	void softdep_deallocate_dependencies(struct buf *);
 static	int softdep_count_dependencies(struct buf *bp, int);
 
+/*
+ * Global lock over all of soft updates.
+ */
 static struct rwlock lk;
 RW_SYSINIT(softdep_lock, &lk, "Softdep Lock");
 
-#define TRY_ACQUIRE_LOCK(lk)		rw_try_wlock(lk)
-#define ACQUIRE_LOCK(lk)		rw_wlock(lk)
-#define FREE_LOCK(lk)			rw_wunlock(lk)
+/*
+ * Allow per-filesystem soft-updates locking.
+ * For now all use the same global lock defined above.
+ */
+#define LOCK_PTR(ump)		((ump)->um_softdep->sd_fslock)
+#define TRY_ACQUIRE_LOCK(ump)	rw_try_wlock((ump)->um_softdep->sd_fslock)
+#define ACQUIRE_LOCK(ump)	rw_wlock((ump)->um_softdep->sd_fslock)
+#define FREE_LOCK(ump)		rw_wunlock((ump)->um_softdep->sd_fslock)
+#define LOCK_OWNED(ump)		rw_assert((ump)->um_softdep->sd_fslock, \
+				    RA_WLOCKED)
 
-#define	BUF_AREC(bp)			lockallowrecurse(&(bp)->b_lock)
-#define	BUF_NOREC(bp)			lockdisablerecurse(&(bp)->b_lock)
+#define	BUF_AREC(bp)		lockallowrecurse(&(bp)->b_lock)
+#define	BUF_NOREC(bp)		lockdisablerecurse(&(bp)->b_lock)
 
 /*
  * Worklist queue management.
@@ -1078,7 +1012,7 @@ worklist_insert(head, item, locked)
 {
 
 	if (locked)
-		rw_assert(&lk, RA_WLOCKED);
+		LOCK_OWNED(VFSTOUFS(item->wk_mp));
 	if (item->wk_state & ONWORKLIST)
 		panic("worklist_insert: %p %s(0x%X) already on list",
 		    item, TYPENAME(item->wk_type), item->wk_state);
@@ -1093,7 +1027,7 @@ worklist_remove(item, locked)
 {
 
 	if (locked)
-		rw_assert(&lk, RA_WLOCKED);
+		LOCK_OWNED(VFSTOUFS(item->wk_mp));
 	if ((item->wk_state & ONWORKLIST) == 0)
 		panic("worklist_remove: %p %s(0x%X) not on list",
 		    item, TYPENAME(item->wk_type), item->wk_state);
@@ -1162,11 +1096,10 @@ jwork_move(dst, src)
 	LIST_FOREACH_SAFE(wk, dst, wk_list, wkn) {
 		if (wk->wk_type == D_JSEGDEP)
 			jsegdep = jsegdep_merge(WK_JSEGDEP(wk), jsegdep);
-		if (wk->wk_type == D_FREEDEP)
+		else if (wk->wk_type == D_FREEDEP)
 			freedep = freedep_merge(WK_FREEDEP(wk), freedep);
 	}
 
-	rw_assert(&lk, RA_WLOCKED);
 	while ((wk = LIST_FIRST(src)) != NULL) {
 		WORKLIST_REMOVE(wk);
 		WORKLIST_INSERT(dst, wk);
@@ -1221,7 +1154,6 @@ workitem_free(item, type)
 	int type;
 {
 	struct ufsmount *ump;
-	rw_assert(&lk, RA_WLOCKED);
 
 #ifdef DEBUG
 	if (item->wk_state & ONWORKLIST)
@@ -1234,6 +1166,7 @@ workitem_free(item, type)
 	if (item->wk_state & IOWAITING)
 		wakeup(item);
 	ump = VFSTOUFS(item->wk_mp);
+	LOCK_OWNED(ump);
 	KASSERT(ump->softdep_deps > 0,
 	    ("workitem_free: %s: softdep_deps going negative",
 	    ump->um_fs->fs_fsmnt));
@@ -1242,7 +1175,11 @@ workitem_free(item, type)
 	KASSERT(dep_current[item->wk_type] > 0,
 	    ("workitem_free: %s: dep_current[%s] going negative",
 	    ump->um_fs->fs_fsmnt, TYPENAME(item->wk_type)));
+	KASSERT(ump->softdep_curdeps[item->wk_type] > 0,
+	    ("workitem_free: %s: softdep_curdeps[%s] going negative",
+	    ump->um_fs->fs_fsmnt, TYPENAME(item->wk_type)));
 	dep_current[item->wk_type]--;
+	ump->softdep_curdeps[item->wk_type] -= 1;
 	free(item, DtoM(type));
 }
 
@@ -1259,14 +1196,15 @@ workitem_alloc(item, type, mp)
 	item->wk_state = 0;
 
 	ump = VFSTOUFS(mp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	dep_current[type]++;
 	if (dep_current[type] > dep_highuse[type])
 		dep_highuse[type] = dep_current[type];
 	dep_total[type]++;
+	ump->softdep_curdeps[type] += 1;
 	ump->softdep_deps++;
 	ump->softdep_accdeps++;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
 static void
@@ -1274,7 +1212,15 @@ workitem_reassign(item, newtype)
 	struct worklist *item;
 	int newtype;
 {
+	struct ufsmount *ump;
 
+	ump = VFSTOUFS(item->wk_mp);
+	LOCK_OWNED(ump);
+	KASSERT(ump->softdep_curdeps[item->wk_type] > 0,
+	    ("workitem_reassign: %s: softdep_curdeps[%s] going negative",
+	    VFSTOUFS(item->wk_mp)->um_fs->fs_fsmnt, TYPENAME(item->wk_type)));
+	ump->softdep_curdeps[item->wk_type] -= 1;
+	ump->softdep_curdeps[newtype] += 1;
 	KASSERT(dep_current[item->wk_type] > 0,
 	    ("workitem_reassign: %s: dep_current[%s] going negative",
 	    VFSTOUFS(item->wk_mp)->um_fs->fs_fsmnt, TYPENAME(item->wk_type)));
@@ -1295,7 +1241,8 @@ static int tickdelay = 2;	/* number of ticks to pause during slowdown */
 static int proc_waiting;	/* tracks whether we have a timeout posted */
 static int *stat_countp;	/* statistic to count in proc_waiting timeout */
 static struct callout softdep_callout;
-static int req_pending;
+static struct mount *req_pending;
+#define ALLCLEAN ((struct mount *)-1)
 static int req_clear_inodedeps;	/* syncer process flush some inodedeps */
 static int req_clear_remove;	/* syncer process flush some freeblks */
 static int softdep_flushcache = 0; /* Should we do BIO_FLUSH? */
@@ -1303,6 +1250,7 @@ static int softdep_flushcache = 0; /* Should we do BIO_FLUSH? */
 /*
  * runtime statistics
  */
+static int stat_softdep_mounts;	/* number of softdep mounted filesystems */
 static int stat_worklist_push;	/* number of worklist cleanups */
 static int stat_blk_limit_push;	/* number of times block limit neared */
 static int stat_ino_limit_push;	/* number of times inode limit neared */
@@ -1334,6 +1282,8 @@ SYSCTL_INT(_debug_softdep, OID_AUTO, tickdelay, CTLFLAG_RW,
     &tickdelay, 0, "");
 SYSCTL_INT(_debug_softdep, OID_AUTO, maxindirdeps, CTLFLAG_RW,
     &maxindirdeps, 0, "");
+SYSCTL_INT(_debug_softdep, OID_AUTO, softdep_mounts, CTLFLAG_RD,
+    &stat_softdep_mounts, 0, "");
 SYSCTL_INT(_debug_softdep, OID_AUTO, worklist_push, CTLFLAG_RW,
     &stat_worklist_push, 0,"");
 SYSCTL_INT(_debug_softdep, OID_AUTO, blk_limit_push, CTLFLAG_RW,
@@ -1387,13 +1337,10 @@ SYSCTL_INT(_debug_softdep, OID_AUTO, flushcache, CTLFLAG_RW,
 
 SYSCTL_DECL(_vfs_ffs);
 
-LIST_HEAD(bmsafemap_hashhead, bmsafemap) *bmsafemap_hashtbl;
-static u_long	bmsafemap_hash;	/* size of hash table - 1 */
-
-static int compute_summary_at_mount = 0;	/* Whether to recompute the summary at mount time */
+/* Whether to recompute the summary at mount time */
+static int compute_summary_at_mount = 0;
 SYSCTL_INT(_vfs_ffs, OID_AUTO, compute_summary_at_mount, CTLFLAG_RW,
 	   &compute_summary_at_mount, 0, "Recompute summary at mount");
-
 static struct proc *softdepproc;
 static struct kproc_desc softdep_kp = {
 	"softdepflush",
@@ -1418,21 +1365,6 @@ softdep_flush(void)
 
 	for (;;) {	
 		kproc_suspend_check(softdepproc);
-		ACQUIRE_LOCK(&lk);
-		/*
-		 * If requested, try removing inode or removal dependencies.
-		 */
-		if (req_clear_inodedeps) {
-			clear_inodedeps();
-			req_clear_inodedeps -= 1;
-			wakeup_one(&proc_waiting);
-		}
-		if (req_clear_remove) {
-			clear_remove();
-			req_clear_remove -= 1;
-			wakeup_one(&proc_waiting);
-		}
-		FREE_LOCK(&lk);
 		remaining = progress = 0;
 		mtx_lock(&mountlist_mtx);
 		for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp)  {
@@ -1441,8 +1373,8 @@ softdep_flush(void)
 				continue;
 			if (vfs_busy(mp, MBF_NOWAIT | MBF_MNTLSTLOCK))
 				continue;
-			progress += softdep_process_worklist(mp, 0);
 			ump = VFSTOUFS(mp);
+			progress += softdep_process_worklist(mp, 0);
 			remaining += ump->softdep_on_worklist;
 			mtx_lock(&mountlist_mtx);
 			nmp = TAILQ_NEXT(mp, mnt_list);
@@ -1451,20 +1383,21 @@ softdep_flush(void)
 		mtx_unlock(&mountlist_mtx);
 		if (remaining && progress)
 			continue;
-		ACQUIRE_LOCK(&lk);
-		if (!req_pending)
+		rw_wlock(&lk);
+		if (req_pending == NULL)
 			msleep(&req_pending, &lk, PVM, "sdflush", hz);
-		req_pending = 0;
-		FREE_LOCK(&lk);
+		req_pending = NULL;
+		rw_wunlock(&lk);
 	}
 }
 
 static void
-worklist_speedup(void)
+worklist_speedup(mp)
+	struct mount *mp;
 {
 	rw_assert(&lk, RA_WLOCKED);
 	if (req_pending == 0) {
-		req_pending = 1;
+		req_pending = mp;
 		wakeup(&req_pending);
 	}
 }
@@ -1473,9 +1406,9 @@ static int
 softdep_speedup(void)
 {
 
-	worklist_speedup();
+	worklist_speedup(ALLCLEAN);
 	bd_speedup();
-	return speedup_syncer();
+	return (speedup_syncer());
 }
 
 /*
@@ -1496,8 +1429,8 @@ add_to_worklist(wk, flags)
 {
 	struct ufsmount *ump;
 
-	rw_assert(&lk, RA_WLOCKED);
 	ump = VFSTOUFS(wk->wk_mp);
+	LOCK_OWNED(ump);
 	if (wk->wk_state & ONWORKLIST)
 		panic("add_to_worklist: %s(0x%X) already on list",
 		    TYPENAME(wk->wk_type), wk->wk_state);
@@ -1513,7 +1446,7 @@ add_to_worklist(wk, flags)
 	}
 	ump->softdep_on_worklist += 1;
 	if (flags & WK_NODELAY)
-		worklist_speedup();
+		worklist_speedup(wk->wk_mp);
 }
 
 /*
@@ -1549,9 +1482,11 @@ wait_worklist(wk, wmesg)
 	struct worklist *wk;
 	char *wmesg;
 {
+	struct ufsmount *ump;
 
+	ump = VFSTOUFS(wk->wk_mp);
 	wk->wk_state |= IOWAITING;
-	msleep(wk, &lk, PVM, wmesg, 0);
+	msleep(wk, LOCK_PTR(ump), PVM, wmesg, 0);
 }
 
 /*
@@ -1563,7 +1498,7 @@ wait_worklist(wk, wmesg)
  * ordering ensures that no new <vfsid, inum, lbn> triples will be generated
  * until all the old ones have been purged from the dependency lists.
  */
-int 
+static int 
 softdep_process_worklist(mp, full)
 	struct mount *mp;
 	int full;
@@ -1573,54 +1508,41 @@ softdep_process_worklist(mp, full)
 	long starttime;
 
 	KASSERT(mp != NULL, ("softdep_process_worklist: NULL mp"));
-	/*
-	 * Record the process identifier of our caller so that we can give
-	 * this process preferential treatment in request_cleanup below.
-	 */
+	if (MOUNTEDSOFTDEP(mp) == 0)
+		return (0);
 	matchcnt = 0;
 	ump = VFSTOUFS(mp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	starttime = time_second;
-	softdep_process_journal(mp, NULL, full?MNT_WAIT:0);
+	softdep_process_journal(mp, NULL, full ? MNT_WAIT : 0);
+	check_clear_deps(mp);
 	while (ump->softdep_on_worklist > 0) {
 		if ((cnt = process_worklist_item(mp, 10, LK_NOWAIT)) == 0)
 			break;
 		else
 			matchcnt += cnt;
-		/*
-		 * If requested, try removing inode or removal dependencies.
-		 */
-		if (req_clear_inodedeps) {
-			clear_inodedeps();
-			req_clear_inodedeps -= 1;
-			wakeup_one(&proc_waiting);
-		}
-		if (req_clear_remove) {
-			clear_remove();
-			req_clear_remove -= 1;
-			wakeup_one(&proc_waiting);
-		}
+		check_clear_deps(mp);
 		/*
 		 * We do not generally want to stop for buffer space, but if
 		 * we are really being a buffer hog, we will stop and wait.
 		 */
 		if (should_yield()) {
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			kern_yield(PRI_USER);
 			bwillwrite();
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 		}
 		/*
 		 * Never allow processing to run for more than one
-		 * second. Otherwise the other mountpoints may get
-		 * excessively backlogged.
+		 * second. This gives the syncer thread the opportunity
+		 * to pause if appropriate.
 		 */
 		if (!full && starttime != time_second)
 			break;
 	}
 	if (full == 0)
 		journal_unsuspend(ump);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	return (matchcnt);
 }
 
@@ -1635,12 +1557,13 @@ process_removes(vp)
 {
 	struct inodedep *inodedep;
 	struct dirrem *dirrem;
+	struct ufsmount *ump;
 	struct mount *mp;
 	ino_t inum;
 
-	rw_assert(&lk, RA_WLOCKED);
-
 	mp = vp->v_mount;
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	inum = VTOI(vp)->i_number;
 	for (;;) {
 top:
@@ -1663,12 +1586,12 @@ top:
 		if (dirrem == NULL)
 			return;
 		remove_from_worklist(&dirrem->dm_list);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		if (vn_start_secondary_write(NULL, &mp, V_NOWAIT))
 			panic("process_removes: suspended filesystem");
 		handle_workitem_remove(dirrem, 0);
 		vn_finished_secondary_write(mp);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	}
 }
 
@@ -1684,13 +1607,14 @@ process_truncates(vp)
 {
 	struct inodedep *inodedep;
 	struct freeblks *freeblks;
+	struct ufsmount *ump;
 	struct mount *mp;
 	ino_t inum;
 	int cgwait;
 
-	rw_assert(&lk, RA_WLOCKED);
-
 	mp = vp->v_mount;
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	inum = VTOI(vp)->i_number;
 	for (;;) {
 		if (inodedep_lookup(mp, inum, 0, &inodedep) == 0)
@@ -1711,33 +1635,33 @@ process_truncates(vp)
 			}
 			/* Freeblks is waiting on a inode write. */
 			if ((freeblks->fb_state & COMPLETE) == 0) {
-				FREE_LOCK(&lk);
+				FREE_LOCK(ump);
 				ffs_update(vp, 1);
-				ACQUIRE_LOCK(&lk);
+				ACQUIRE_LOCK(ump);
 				break;
 			}
 			if ((freeblks->fb_state & (ALLCOMPLETE | ONWORKLIST)) ==
 			    (ALLCOMPLETE | ONWORKLIST)) {
 				remove_from_worklist(&freeblks->fb_list);
 				freeblks->fb_state |= INPROGRESS;
-				FREE_LOCK(&lk);
+				FREE_LOCK(ump);
 				if (vn_start_secondary_write(NULL, &mp,
 				    V_NOWAIT))
 					panic("process_truncates: "
 					    "suspended filesystem");
 				handle_workitem_freeblocks(freeblks, 0);
 				vn_finished_secondary_write(mp);
-				ACQUIRE_LOCK(&lk);
+				ACQUIRE_LOCK(ump);
 				break;
 			}
 			if (freeblks->fb_cgwait)
 				cgwait++;
 		}
 		if (cgwait) {
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			sync_cgs(mp, MNT_WAIT);
 			ffs_sync_snap(mp, MNT_WAIT);
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			continue;
 		}
 		if (freeblks == NULL)
@@ -1761,7 +1685,6 @@ process_worklist_item(mp, target, flags)
 	int matchcnt;
 	int error;
 
-	rw_assert(&lk, RA_WLOCKED);
 	KASSERT(mp != NULL, ("process_worklist_item: NULL mp"));
 	/*
 	 * If we are being called because of a process doing a
@@ -1772,6 +1695,7 @@ process_worklist_item(mp, target, flags)
 		return (-1);
 	PHOLD(curproc);	/* Don't let the stack go away. */
 	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	matchcnt = 0;
 	sentinel.wk_mp = NULL;
 	sentinel.wk_type = D_SENTINEL;
@@ -1788,7 +1712,7 @@ process_worklist_item(mp, target, flags)
 			    wk);
 		wk->wk_state |= INPROGRESS;
 		remove_from_worklist(wk);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		if (vn_start_secondary_write(NULL, &mp, V_NOWAIT))
 			panic("process_worklist_item: suspended filesystem");
 		switch (wk->wk_type) {
@@ -1821,7 +1745,7 @@ process_worklist_item(mp, target, flags)
 			/* NOTREACHED */
 		}
 		vn_finished_secondary_write(mp);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		if (error == 0) {
 			if (++matchcnt == target)
 				break;
@@ -1855,11 +1779,17 @@ softdep_move_dependencies(oldbp, newbp)
 	struct buf *newbp;
 {
 	struct worklist *wk, *wktail;
+	struct ufsmount *ump;
 	int dirty;
 
+	if ((wk = LIST_FIRST(&oldbp->b_dep)) == NULL)
+		return (0);
+	KASSERT(MOUNTEDSOFTDEP(wk->wk_mp) != 0,
+	    ("softdep_move_dependencies called on non-softdep filesystem"));
 	dirty = 0;
 	wktail = NULL;
-	ACQUIRE_LOCK(&lk);
+	ump = VFSTOUFS(wk->wk_mp);
+	ACQUIRE_LOCK(ump);
 	while ((wk = LIST_FIRST(&oldbp->b_dep)) != NULL) {
 		LIST_REMOVE(wk, wk_list);
 		if (wk->wk_type == D_BMSAFEMAP &&
@@ -1871,7 +1801,7 @@ softdep_move_dependencies(oldbp, newbp)
 			LIST_INSERT_AFTER(wktail, wk, wk_list);
 		wktail = wk;
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 
 	return (dirty);
 }
@@ -1909,7 +1839,7 @@ softdep_flushworklist(oldmnt, countp, td)
 	return (error);
 }
 
-int
+static int
 softdep_waitidle(struct mount *mp)
 {
 	struct ufsmount *ump;
@@ -1917,15 +1847,15 @@ softdep_waitidle(struct mount *mp)
 	int i;
 
 	ump = VFSTOUFS(mp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	for (i = 0; i < 10 && ump->softdep_deps; i++) {
 		ump->softdep_req = 1;
 		if (ump->softdep_on_worklist)
 			panic("softdep_waitidle: work added after flush.");
-		msleep(&ump->softdep_deps, &lk, PVM, "softdeps", 1);
+		msleep(&ump->softdep_deps, LOCK_PTR(ump), PVM, "softdeps", 1);
 	}
 	ump->softdep_req = 0;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	error = 0;
 	if (i == 10) {
 		error = EBUSY;
@@ -1952,6 +1882,8 @@ softdep_flushfiles(oldmnt, flags, td)
 	int error, early, depcount, loopcnt, retry_flush_count, retry;
 	int morework;
 
+	KASSERT(MOUNTEDSOFTDEP(oldmnt) != 0,
+	    ("softdep_flushfiles called on non-softdep filesystem"));
 	loopcnt = 10;
 	retry_flush_count = 3;
 retry_flush:
@@ -2022,12 +1954,14 @@ retry_flush:
 /*
  * Structure hashing.
  * 
- * There are three types of structures that can be looked up:
+ * There are four types of structures that can be looked up:
  *	1) pagedep structures identified by mount point, inode number,
  *	   and logical block.
  *	2) inodedep structures identified by mount point and inode number.
  *	3) newblk structures identified by mount point and
  *	   physical block number.
+ *	4) bmsafemap structures identified by mount point and
+ *	   cylinder group number.
  *
  * The "pagedep" and "inodedep" dependency structures are hashed
  * separately from the file blocks and inodes to which they correspond.
@@ -2039,7 +1973,8 @@ retry_flush:
  * their allocdirect or allocindir structure.
  *
  * The lookup routines optionally create and hash a new instance when
- * an existing entry is not found.
+ * an existing entry is not found. The bmsafemap lookup routine always
+ * allocates a new structure if an existing one is not found.
  */
 #define DEPALLOC	0x0001	/* allocate structure if lookup fails */
 #define NODELAY		0x0002	/* cannot do background work */
@@ -2047,26 +1982,20 @@ retry_flush:
 /*
  * Structures and routines associated with pagedep caching.
  */
-LIST_HEAD(pagedep_hashhead, pagedep) *pagedep_hashtbl;
-u_long	pagedep_hash;		/* size of hash table - 1 */
-#define	PAGEDEP_HASH(mp, inum, lbn) \
-	(&pagedep_hashtbl[((((register_t)(mp)) >> 13) + (inum) + (lbn)) & \
-	    pagedep_hash])
+#define	PAGEDEP_HASH(ump, inum, lbn) \
+	(&(ump)->pagedep_hashtbl[((inum) + (lbn)) & (ump)->pagedep_hash_size])
 
 static int
-pagedep_find(pagedephd, ino, lbn, mp, flags, pagedeppp)
+pagedep_find(pagedephd, ino, lbn, pagedeppp)
 	struct pagedep_hashhead *pagedephd;
 	ino_t ino;
 	ufs_lbn_t lbn;
-	struct mount *mp;
-	int flags;
 	struct pagedep **pagedeppp;
 {
 	struct pagedep *pagedep;
 
 	LIST_FOREACH(pagedep, pagedephd, pd_hash) {
-		if (ino == pagedep->pd_ino && lbn == pagedep->pd_lbn &&
-		    mp == pagedep->pd_list.wk_mp) {
+		if (ino == pagedep->pd_ino && lbn == pagedep->pd_lbn) {
 			*pagedeppp = pagedep;
 			return (1);
 		}
@@ -2092,10 +2021,12 @@ pagedep_lookup(mp, bp, ino, lbn, flags, pagedeppp)
 	struct pagedep *pagedep;
 	struct pagedep_hashhead *pagedephd;
 	struct worklist *wk;
+	struct ufsmount *ump;
 	int ret;
 	int i;
 
-	rw_assert(&lk, RA_WLOCKED);
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	if (bp) {
 		LIST_FOREACH(wk, &bp->b_dep, wk_list) {
 			if (wk->wk_type == D_PAGEDEP) {
@@ -2104,8 +2035,8 @@ pagedep_lookup(mp, bp, ino, lbn, flags, pagedeppp)
 			}
 		}
 	}
-	pagedephd = PAGEDEP_HASH(mp, ino, lbn);
-	ret = pagedep_find(pagedephd, ino, lbn, mp, flags, pagedeppp);
+	pagedephd = PAGEDEP_HASH(ump, ino, lbn);
+	ret = pagedep_find(pagedephd, ino, lbn, pagedeppp);
 	if (ret) {
 		if (((*pagedeppp)->pd_state & ONWORKLIST) == 0 && bp)
 			WORKLIST_INSERT(&bp->b_dep, &(*pagedeppp)->pd_list);
@@ -2113,12 +2044,12 @@ pagedep_lookup(mp, bp, ino, lbn, flags, pagedeppp)
 	}
 	if ((flags & DEPALLOC) == 0)
 		return (0);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	pagedep = malloc(sizeof(struct pagedep),
 	    M_PAGEDEP, M_SOFTDEP_FLAGS|M_ZERO);
 	workitem_alloc(&pagedep->pd_list, D_PAGEDEP, mp);
-	ACQUIRE_LOCK(&lk);
-	ret = pagedep_find(pagedephd, ino, lbn, mp, flags, pagedeppp);
+	ACQUIRE_LOCK(ump);
+	ret = pagedep_find(pagedephd, ino, lbn, pagedeppp);
 	if (*pagedeppp) {
 		/*
 		 * This should never happen since we only create pagedeps
@@ -2142,22 +2073,19 @@ pagedep_lookup(mp, bp, ino, lbn, flags, pagedeppp)
 /*
  * Structures and routines associated with inodedep caching.
  */
-LIST_HEAD(inodedep_hashhead, inodedep) *inodedep_hashtbl;
-static u_long	inodedep_hash;	/* size of hash table - 1 */
-#define	INODEDEP_HASH(fs, inum) \
-      (&inodedep_hashtbl[((((register_t)(fs)) >> 13) + (inum)) & inodedep_hash])
+#define	INODEDEP_HASH(ump, inum) \
+      (&(ump)->inodedep_hashtbl[(inum) & (ump)->inodedep_hash_size])
 
 static int
-inodedep_find(inodedephd, fs, inum, inodedeppp)
+inodedep_find(inodedephd, inum, inodedeppp)
 	struct inodedep_hashhead *inodedephd;
-	struct fs *fs;
 	ino_t inum;
 	struct inodedep **inodedeppp;
 {
 	struct inodedep *inodedep;
 
 	LIST_FOREACH(inodedep, inodedephd, id_hash)
-		if (inum == inodedep->id_ino && fs == inodedep->id_fs)
+		if (inum == inodedep->id_ino)
 			break;
 	if (inodedep) {
 		*inodedeppp = inodedep;
@@ -2182,13 +2110,15 @@ inodedep_lookup(mp, inum, flags, inodedeppp)
 {
 	struct inodedep *inodedep;
 	struct inodedep_hashhead *inodedephd;
+	struct ufsmount *ump;
 	struct fs *fs;
 
-	rw_assert(&lk, RA_WLOCKED);
-	fs = VFSTOUFS(mp)->um_fs;
-	inodedephd = INODEDEP_HASH(fs, inum);
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
+	fs = ump->um_fs;
+	inodedephd = INODEDEP_HASH(ump, inum);
 
-	if (inodedep_find(inodedephd, fs, inum, inodedeppp))
+	if (inodedep_find(inodedephd, inum, inodedeppp))
 		return (1);
 	if ((flags & DEPALLOC) == 0)
 		return (0);
@@ -2197,12 +2127,12 @@ inodedep_lookup(mp, inum, flags, inodedeppp)
 	 */
 	if (dep_current[D_INODEDEP] > max_softdeps && (flags & NODELAY) == 0)
 		request_cleanup(mp, FLUSH_INODES);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	inodedep = malloc(sizeof(struct inodedep),
 		M_INODEDEP, M_SOFTDEP_FLAGS);
 	workitem_alloc(&inodedep->id_list, D_INODEDEP, mp);
-	ACQUIRE_LOCK(&lk);
-	if (inodedep_find(inodedephd, fs, inum, inodedeppp)) {
+	ACQUIRE_LOCK(ump);
+	if (inodedep_find(inodedephd, inum, inodedeppp)) {
 		WORKITEM_FREE(inodedep, D_INODEDEP);
 		return (1);
 	}
@@ -2234,15 +2164,12 @@ inodedep_lookup(mp, inum, flags, inodedeppp)
 /*
  * Structures and routines associated with newblk caching.
  */
-LIST_HEAD(newblk_hashhead, newblk) *newblk_hashtbl;
-u_long	newblk_hash;		/* size of hash table - 1 */
-#define	NEWBLK_HASH(fs, inum) \
-	(&newblk_hashtbl[((((register_t)(fs)) >> 13) + (inum)) & newblk_hash])
+#define	NEWBLK_HASH(ump, inum) \
+	(&(ump)->newblk_hashtbl[(inum) & (ump)->newblk_hash_size])
 
 static int
-newblk_find(newblkhd, mp, newblkno, flags, newblkpp)
+newblk_find(newblkhd, newblkno, flags, newblkpp)
 	struct newblk_hashhead *newblkhd;
-	struct mount *mp;
 	ufs2_daddr_t newblkno;
 	int flags;
 	struct newblk **newblkpp;
@@ -2252,8 +2179,6 @@ newblk_find(newblkhd, mp, newblkno, flags, newblkpp)
 	LIST_FOREACH(newblk, newblkhd, nb_hash) {
 		if (newblkno != newblk->nb_newblkno)
 			continue;
-		if (mp != newblk->nb_list.wk_mp)
-			continue;
 		/*
 		 * If we're creating a new dependency don't match those that
 		 * have already been converted to allocdirects.  This is for
@@ -2285,18 +2210,21 @@ newblk_lookup(mp, newblkno, flags, newblkpp)
 {
 	struct newblk *newblk;
 	struct newblk_hashhead *newblkhd;
+	struct ufsmount *ump;
 
-	newblkhd = NEWBLK_HASH(VFSTOUFS(mp)->um_fs, newblkno);
-	if (newblk_find(newblkhd, mp, newblkno, flags, newblkpp))
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
+	newblkhd = NEWBLK_HASH(ump, newblkno);
+	if (newblk_find(newblkhd, newblkno, flags, newblkpp))
 		return (1);
 	if ((flags & DEPALLOC) == 0)
 		return (0);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	newblk = malloc(sizeof(union allblk), M_NEWBLK,
 	    M_SOFTDEP_FLAGS | M_ZERO);
 	workitem_alloc(&newblk->nb_list, D_NEWBLK, mp);
-	ACQUIRE_LOCK(&lk);
-	if (newblk_find(newblkhd, mp, newblkno, flags, newblkpp)) {
+	ACQUIRE_LOCK(ump);
+	if (newblk_find(newblkhd, newblkno, flags, newblkpp)) {
 		WORKITEM_FREE(newblk, D_NEWBLK);
 		return (1);
 	}
@@ -2314,10 +2242,8 @@ newblk_lookup(mp, newblkno, flags, newblkpp)
 /*
  * Structures and routines associated with freed indirect block caching.
  */
-struct freeworklst *indir_hashtbl;
-u_long	indir_hash;		/* size of hash table - 1 */
-#define	INDIR_HASH(mp, blkno) \
-	(&indir_hashtbl[((((register_t)(mp)) >> 13) + (blkno)) & indir_hash])
+#define	INDIR_HASH(ump, blkno) \
+	(&(ump)->indir_hashtbl[(blkno) & (ump)->indir_hash_size])
 
 /*
  * Lookup an indirect block in the indir hash table.  The freework is
@@ -2330,14 +2256,14 @@ indirblk_lookup(mp, blkno)
 	ufs2_daddr_t blkno;
 {
 	struct freework *freework;
-	struct freeworklst *wkhd;
+	struct indir_hashhead *wkhd;
+	struct ufsmount *ump;
 
-	wkhd = INDIR_HASH(mp, blkno);
+	ump = VFSTOUFS(mp);
+	wkhd = INDIR_HASH(ump, blkno);
 	TAILQ_FOREACH(freework, wkhd, fw_next) {
 		if (freework->fw_blkno != blkno)
 			continue;
-		if (freework->fw_list.wk_mp != mp)
-			continue;
 		indirblk_remove(freework);
 		return (1);
 	}
@@ -2355,15 +2281,17 @@ indirblk_insert(freework)
 {
 	struct jblocks *jblocks;
 	struct jseg *jseg;
+	struct ufsmount *ump;
 
-	jblocks = VFSTOUFS(freework->fw_list.wk_mp)->softdep_jblocks;
+	ump = VFSTOUFS(freework->fw_list.wk_mp);
+	jblocks = ump->softdep_jblocks;
 	jseg = TAILQ_LAST(&jblocks->jb_segs, jseglst);
 	if (jseg == NULL)
 		return;
 	
 	LIST_INSERT_HEAD(&jseg->js_indirs, freework, fw_segs);
-	TAILQ_INSERT_HEAD(INDIR_HASH(freework->fw_list.wk_mp,
-	    freework->fw_blkno), freework, fw_next);
+	TAILQ_INSERT_HEAD(INDIR_HASH(ump, freework->fw_blkno), freework,
+	    fw_next);
 	freework->fw_state &= ~DEPCOMPLETE;
 }
 
@@ -2371,10 +2299,11 @@ static void
 indirblk_remove(freework)
 	struct freework *freework;
 {
+	struct ufsmount *ump;
 
+	ump = VFSTOUFS(freework->fw_list.wk_mp);
 	LIST_REMOVE(freework, fw_segs);
-	TAILQ_REMOVE(INDIR_HASH(freework->fw_list.wk_mp,
-	    freework->fw_blkno), freework, fw_next);
+	TAILQ_REMOVE(INDIR_HASH(ump, freework->fw_blkno), freework, fw_next);
 	freework->fw_state |= DEPCOMPLETE;
 	if ((freework->fw_state & ALLCOMPLETE) == ALLCOMPLETE)
 		WORKITEM_FREE(freework, D_FREEWORK);
@@ -2387,20 +2316,8 @@ indirblk_remove(freework)
 void 
 softdep_initialize()
 {
-	int i;
 
-	LIST_INIT(&mkdirlisthd);
 	max_softdeps = desiredvnodes * 4;
-	pagedep_hashtbl = hashinit(desiredvnodes / 5, M_PAGEDEP, &pagedep_hash);
-	inodedep_hashtbl = hashinit(desiredvnodes, M_INODEDEP, &inodedep_hash);
-	newblk_hashtbl = hashinit(max_softdeps / 2,  M_NEWBLK, &newblk_hash);
-	bmsafemap_hashtbl = hashinit(1024, M_BMSAFEMAP, &bmsafemap_hash);
-	i = 1 << (ffs(desiredvnodes / 10) - 1);
-	indir_hashtbl = malloc(i * sizeof(indir_hashtbl[0]), M_FREEWORK,
-	    M_WAITOK);
-	indir_hash = i - 1;
-	for (i = 0; i <= indir_hash; i++)
-		TAILQ_INIT(&indir_hashtbl[i]);
 
 	/* initialise bioops hack */
 	bioops.io_start = softdep_disk_io_initiation;
@@ -2420,12 +2337,13 @@ void
 softdep_uninitialize()
 {
 
+	/* clear bioops hack */
+	bioops.io_start = NULL;
+	bioops.io_complete = NULL;
+	bioops.io_deallocate = NULL;
+	bioops.io_countdeps = NULL;
+
 	callout_drain(&softdep_callout);
-	hashdestroy(pagedep_hashtbl, M_PAGEDEP, pagedep_hash);
-	hashdestroy(inodedep_hashtbl, M_INODEDEP, inodedep_hash);
-	hashdestroy(newblk_hashtbl, M_NEWBLK, newblk_hash);
-	hashdestroy(bmsafemap_hashtbl, M_BMSAFEMAP, bmsafemap_hash);
-	free(indir_hashtbl, M_FREEWORK);
 }
 
 /*
@@ -2440,19 +2358,24 @@ softdep_mount(devvp, mp, fs, cred)
 	struct ucred *cred;
 {
 	struct csum_total cstotal;
+	struct mount_softdeps *sdp;
 	struct ufsmount *ump;
 	struct cg *cgp;
 	struct buf *bp;
-	int error, cyl;
+	int i, error, cyl;
 
+	sdp = malloc(sizeof(struct mount_softdeps), M_MOUNTDATA,
+	    M_WAITOK | M_ZERO);
 	MNT_ILOCK(mp);
 	mp->mnt_flag = (mp->mnt_flag & ~MNT_ASYNC) | MNT_SOFTDEP;
 	if ((mp->mnt_kern_flag & MNTK_SOFTDEP) == 0) {
 		mp->mnt_kern_flag = (mp->mnt_kern_flag & ~MNTK_ASYNC) | 
 			MNTK_SOFTDEP | MNTK_NOASYNC;
 	}
-	MNT_IUNLOCK(mp);
 	ump = VFSTOUFS(mp);
+	ump->um_softdep = sdp;
+	MNT_IUNLOCK(mp);
+	LOCK_PTR(ump) = &lk;
 	LIST_INIT(&ump->softdep_workitem_pending);
 	LIST_INIT(&ump->softdep_journal_pending);
 	TAILQ_INIT(&ump->softdep_unlinked);
@@ -2460,11 +2383,30 @@ softdep_mount(devvp, mp, fs, cred)
 	ump->softdep_worklist_tail = NULL;
 	ump->softdep_on_worklist = 0;
 	ump->softdep_deps = 0;
+	LIST_INIT(&ump->softdep_mkdirlisthd);
+	ump->pagedep_hashtbl = hashinit(desiredvnodes / 5, M_PAGEDEP,
+	    &ump->pagedep_hash_size);
+	ump->pagedep_nextclean = 0;
+	ump->inodedep_hashtbl = hashinit(desiredvnodes, M_INODEDEP,
+	    &ump->inodedep_hash_size);
+	ump->inodedep_nextclean = 0;
+	ump->newblk_hashtbl = hashinit(max_softdeps / 2,  M_NEWBLK,
+	    &ump->newblk_hash_size);
+	ump->bmsafemap_hashtbl = hashinit(1024, M_BMSAFEMAP,
+	    &ump->bmsafemap_hash_size);
+	i = 1 << (ffs(desiredvnodes / 10) - 1);
+	ump->indir_hashtbl = malloc(i * sizeof(struct indir_hashhead),
+	    M_FREEWORK, M_WAITOK);
+	ump->indir_hash_size = i - 1;
+	for (i = 0; i <= ump->indir_hash_size; i++)
+		TAILQ_INIT(&ump->indir_hashtbl[i]);
 	if ((fs->fs_flags & FS_SUJ) &&
 	    (error = journal_mount(mp, fs, cred)) != 0) {
 		printf("Failed to start journal: %d\n", error);
+		softdep_unmount(mp);
 		return (error);
 	}
+	atomic_add_int(&stat_softdep_mounts, 1);
 	/*
 	 * When doing soft updates, the counters in the
 	 * superblock may have gotten out of sync. Recomputation
@@ -2480,6 +2422,7 @@ softdep_mount(devvp, mp, fs, cred)
 		if ((error = bread(devvp, fsbtodb(fs, cgtod(fs, cyl)),
 		    fs->fs_cgsize, cred, &bp)) != 0) {
 			brelse(bp);
+			softdep_unmount(mp);
 			return (error);
 		}
 		cgp = (struct cg *)bp->b_data;
@@ -2502,16 +2445,37 @@ void
 softdep_unmount(mp)
 	struct mount *mp;
 {
+	struct ufsmount *ump;
+#ifdef INVARIANTS
+	int i;
+#endif
 
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_unmount called on non-softdep filesystem"));
+	ump = VFSTOUFS(mp);
 	MNT_ILOCK(mp);
 	mp->mnt_flag &= ~MNT_SOFTDEP;
 	if (MOUNTEDSUJ(mp) == 0) {
 		MNT_IUNLOCK(mp);
-		return;
+	} else {
+		mp->mnt_flag &= ~MNT_SUJ;
+		MNT_IUNLOCK(mp);
+		journal_unmount(ump);
 	}
-	mp->mnt_flag &= ~MNT_SUJ;
-	MNT_IUNLOCK(mp);
-	journal_unmount(mp);
+	atomic_subtract_int(&stat_softdep_mounts, 1);
+	hashdestroy(ump->pagedep_hashtbl, M_PAGEDEP, ump->pagedep_hash_size);
+	hashdestroy(ump->inodedep_hashtbl, M_INODEDEP, ump->inodedep_hash_size);
+	hashdestroy(ump->newblk_hashtbl, M_NEWBLK, ump->newblk_hash_size);
+	hashdestroy(ump->bmsafemap_hashtbl, M_BMSAFEMAP,
+	    ump->bmsafemap_hash_size);
+	free(ump->indir_hashtbl, M_FREEWORK);
+#ifdef INVARIANTS
+	for (i = 0; i <= D_LAST; i++)
+		KASSERT(ump->softdep_curdeps[i] == 0,
+		    ("Unmount %s: Dep type %s != 0 (%ld)", ump->um_fs->fs_fsmnt,
+		    TYPENAME(i), ump->softdep_curdeps[i]));
+#endif
+	free(ump->um_softdep, M_MOUNTDATA);
 }
 
 static struct jblocks *
@@ -2566,9 +2530,10 @@ jblocks_free(jblocks, mp, bytes)
 	int bytes;
 {
 
+	LOCK_OWNED(VFSTOUFS(mp));
 	jblocks->jb_free += bytes / DEV_BSIZE;
 	if (jblocks->jb_suspended)
-		worklist_speedup();
+		worklist_speedup(mp);
 	wakeup(jblocks);
 }
 
@@ -2659,6 +2624,7 @@ journal_mount(mp, fs, cred)
 	struct ucred *cred;
 {
 	struct jblocks *jblocks;
+	struct ufsmount *ump;
 	struct vnode *vp;
 	struct inode *ip;
 	ufs2_daddr_t blkno;
@@ -2666,6 +2632,12 @@ journal_mount(mp, fs, cred)
 	int error;
 	int i;
 
+	ump = VFSTOUFS(mp);
+	ump->softdep_journal_tail = NULL;
+	ump->softdep_on_journal = 0;
+	ump->softdep_accdeps = 0;
+	ump->softdep_req = 0;
+	ump->softdep_jblocks = NULL;
 	error = softdep_journal_lookup(mp, &vp);
 	if (error != 0) {
 		printf("Failed to find journal.  Use tunefs to create one\n");
@@ -2690,7 +2662,7 @@ journal_mount(mp, fs, cred)
 	}
 	jblocks->jb_low = jblocks->jb_free / 3;	/* Reserve 33%. */
 	jblocks->jb_min = jblocks->jb_free / 10; /* Suspend at 10%. */
-	VFSTOUFS(mp)->softdep_jblocks = jblocks;
+	ump->softdep_jblocks = jblocks;
 out:
 	if (error == 0) {
 		MNT_ILOCK(mp);
@@ -2716,12 +2688,10 @@ out:
 }
 
 static void
-journal_unmount(mp)
-	struct mount *mp;
-{
+journal_unmount(ump)
 	struct ufsmount *ump;
+{
 
-	ump = VFSTOUFS(mp);
 	if (ump->softdep_jblocks)
 		jblocks_destroy(ump->softdep_jblocks);
 	ump->softdep_jblocks = NULL;
@@ -2738,8 +2708,8 @@ add_to_journal(wk)
 {
 	struct ufsmount *ump;
 
-	rw_assert(&lk, RA_WLOCKED);
 	ump = VFSTOUFS(wk->wk_mp);
+	LOCK_OWNED(ump);
 	if (wk->wk_state & ONWORKLIST)
 		panic("add_to_journal: %s(0x%X) already on list",
 		    TYPENAME(wk->wk_type), wk->wk_state);
@@ -2764,8 +2734,8 @@ remove_from_journal(wk)
 {
 	struct ufsmount *ump;
 
-	rw_assert(&lk, RA_WLOCKED);
 	ump = VFSTOUFS(wk->wk_mp);
+	LOCK_OWNED(ump);
 #ifdef SUJ_DEBUG
 	{
 		struct worklist *wkn;
@@ -2802,7 +2772,7 @@ journal_space(ump, thresh)
 	int thresh;
 {
 	struct jblocks *jblocks;
-	int avail;
+	int limit, avail;
 
 	jblocks = ump->softdep_jblocks;
 	if (jblocks == NULL)
@@ -2810,8 +2780,12 @@ journal_space(ump, thresh)
 	/*
 	 * We use a tighter restriction here to prevent request_cleanup()
 	 * running in threads from running into locks we currently hold.
+	 * We have to be over the limit and our filesystem has to be
+	 * responsible for more than our share of that usage.
 	 */
-	if (dep_current[D_INODEDEP] > (max_softdeps / 10) * 9)
+	limit = (max_softdeps / 10) * 9;
+	if (dep_current[D_INODEDEP] > limit &&
+	    ump->softdep_curdeps[D_INODEDEP] > limit / stat_softdep_mounts)
 		return (0);
 	if (thresh)
 		thresh = jblocks->jb_min;
@@ -2854,10 +2828,10 @@ journal_unsuspend(struct ufsmount *ump)
 	if (jblocks != NULL && jblocks->jb_suspended &&
 	    journal_space(ump, jblocks->jb_min)) {
 		jblocks->jb_suspended = 0;
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		mp->mnt_susp_owner = curthread;
 		vfs_write_resume(mp, 0);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		return (1);
 	}
 	return (0);
@@ -2882,6 +2856,8 @@ softdep_prealloc(vp, waitok)
 {
 	struct ufsmount *ump;
 
+	KASSERT(MOUNTEDSOFTDEP(vp->v_mount) != 0,
+	    ("softdep_prealloc called on non-softdep filesystem"));
 	/*
 	 * Nothing to do if we are not running journaled soft updates.
 	 * If we currently hold the snapshot lock, we must avoid handling
@@ -2890,13 +2866,13 @@ softdep_prealloc(vp, waitok)
 	if (DOINGSUJ(vp) == 0 || IS_SNAPSHOT(VTOI(vp)))
 		return (0);
 	ump = VFSTOUFS(vp->v_mount);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	if (journal_space(ump, 0)) {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		return (0);
 	}
 	stat_journal_low++;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if (waitok == MNT_NOWAIT)
 		return (ENOSPC);
 	/*
@@ -2905,7 +2881,7 @@ softdep_prealloc(vp, waitok)
 	 */
 	if ((curthread->td_pflags & TDP_COWINPROGRESS) == 0)
 		ffs_syncvnode(vp, waitok, 0);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	process_removes(vp);
 	process_truncates(vp);
 	if (journal_space(ump, 0) == 0) {
@@ -2913,7 +2889,7 @@ softdep_prealloc(vp, waitok)
 		if (journal_space(ump, 1) == 0)
 			journal_suspend(ump);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 
 	return (0);
 }
@@ -2932,7 +2908,7 @@ softdep_prelink(dvp, vp)
 	struct ufsmount *ump;
 
 	ump = VFSTOUFS(dvp->v_mount);
-	rw_assert(&lk, RA_WLOCKED);
+	LOCK_OWNED(ump);
 	/*
 	 * Nothing to do if we have sufficient journal space.
 	 * If we currently hold the snapshot lock, we must avoid
@@ -2941,11 +2917,11 @@ softdep_prelink(dvp, vp)
 	if (journal_space(ump, 0) || (vp && IS_SNAPSHOT(VTOI(vp))))
 		return;
 	stat_journal_low++;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if (vp)
 		ffs_syncvnode(vp, MNT_NOWAIT, 0);
 	ffs_syncvnode(dvp, MNT_WAIT, 0);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	/* Process vp before dvp as it may create .. removes. */
 	if (vp) {
 		process_removes(vp);
@@ -3132,12 +3108,12 @@ softdep_flushjournal(mp)
 		return;
 	ump = VFSTOUFS(mp);
 	jblocks = ump->softdep_jblocks;
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	while (ump->softdep_on_journal) {
 		jblocks->jb_needseg = 1;
 		softdep_process_journal(mp, NULL, MNT_WAIT);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
 static void softdep_synchronize_completed(struct bio *);
@@ -3149,14 +3125,20 @@ softdep_synchronize_completed(bp)
 {
 	struct jseg *oldest;
 	struct jseg *jseg;
+	struct ufsmount *ump;
 
 	/*
 	 * caller1 marks the last segment written before we issued the
 	 * synchronize cache.
 	 */
 	jseg = bp->bio_caller1;
+	if (jseg == NULL) {
+		g_destroy_bio(bp);
+		return;
+	}
+	ump = VFSTOUFS(jseg->js_list.wk_mp);
+	ACQUIRE_LOCK(ump);
 	oldest = NULL;
-	ACQUIRE_LOCK(&lk);
 	/*
 	 * Mark all the journal entries waiting on the synchronize cache
 	 * as completed so they may continue on.
@@ -3173,7 +3155,7 @@ softdep_synchronize_completed(bp)
 	if (oldest)
 		complete_jsegs(oldest);
 
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	g_destroy_bio(bp);
 }
 
@@ -3233,6 +3215,7 @@ softdep_process_journal(mp, needwk, flags)
 	bio = NULL;
 	jseg = NULL;
 	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	fs = ump->um_fs;
 	jblocks = ump->softdep_jblocks;
 	devbsize = ump->um_devvp->v_bufobj.bo_bsize;
@@ -3272,9 +3255,9 @@ softdep_process_journal(mp, needwk, flags)
 				break;
 			printf("softdep: Out of journal space!\n");
 			softdep_speedup();
-			msleep(jblocks, &lk, PRIBIO, "jblocks", hz);
+			msleep(jblocks, LOCK_PTR(ump), PRIBIO, "jblocks", hz);
 		}
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		jseg = malloc(sizeof(*jseg), M_JSEG, M_SOFTDEP_FLAGS);
 		workitem_alloc(&jseg->js_list, D_JSEG, mp);
 		LIST_INIT(&jseg->js_entries);
@@ -3286,7 +3269,7 @@ softdep_process_journal(mp, needwk, flags)
 			bio = g_alloc_bio();
 		jseg->js_jblocks = jblocks;
 		bp = geteblk(fs->fs_bsize, 0);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		/*
 		 * If there was a race while we were allocating the block
 		 * and jseg the entry we care about was likely written.
@@ -3298,9 +3281,9 @@ softdep_process_journal(mp, needwk, flags)
 		if (cnt + jblocks->jb_needseg == 0 || jblocks->jb_free == 0) {
 			bp->b_flags |= B_INVAL | B_NOCACHE;
 			WORKITEM_FREE(jseg, D_JSEG);
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			brelse(bp);
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			break;
 		}
 		/*
@@ -3400,7 +3383,7 @@ softdep_process_journal(mp, needwk, flags)
 		segwritten = 1;
 		jblocks->jb_needseg = 0;
 		WORKLIST_INSERT(&bp->b_dep, &jseg->js_list);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		pbgetvp(ump->um_devvp, bp);
 		/*
 		 * We only do the blocking wait once we find the journal
@@ -3410,7 +3393,7 @@ softdep_process_journal(mp, needwk, flags)
 			bwrite(bp);
 		else
 			bawrite(bp);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	}
 	/*
 	 * If we wrote a segment issue a synchronize cache so the journal
@@ -3431,10 +3414,10 @@ softdep_process_journal(mp, needwk, flags)
 	if (flags == 0 && jblocks->jb_suspended) {
 		if (journal_unsuspend(ump))
 			return;
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		VFS_SYNC(mp, MNT_NOWAIT);
 		ffs_sbupdate(ump, MNT_WAIT, 0);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	}
 }
 
@@ -3961,8 +3944,8 @@ free_freedep(freedep)
 /*
  * Allocate a new freework structure that may be a level in an indirect
  * when parent is not NULL or a top level block when it is.  The top level
- * freework structures are allocated without lk held and before the freeblks
- * is visible outside of softdep_setup_freeblocks().
+ * freework structures are allocated without the soft updates lock held
+ * and before the freeblks is visible outside of softdep_setup_freeblocks().
  */
 static struct freework *
 newfreework(ump, freeblks, parent, lbn, nb, frags, off, journal)
@@ -3993,10 +3976,10 @@ newfreework(ump, freeblks, parent, lbn, nb, frags, off, journal)
 	if (journal)
 		newjfreeblk(freeblks, lbn, nb, frags);
 	if (parent == NULL) {
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		WORKLIST_INSERT(&freeblks->fb_freeworkhd, &freework->fw_list);
 		freeblks->fb_ref++;
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 	}
 
 	return (freework);
@@ -4030,7 +4013,8 @@ cancel_jfreeblk(freeblks, blkno)
 
 /*
  * Allocate a new jfreeblk to journal top level block pointer when truncating
- * a file.  The caller must add this to the worklist when lk is held.
+ * a file.  The caller must add this to the worklist when the soft updates
+ * lock is held.
  */
 static struct jfreeblk *
 newjfreeblk(freeblks, lbn, blkno, frags)
@@ -4418,6 +4402,7 @@ jwait(wk, waitfor)
 	int waitfor;
 {
 
+	LOCK_OWNED(VFSTOUFS(wk->wk_mp));
 	/*
 	 * Blocking journal waits cause slow synchronous behavior.  Record
 	 * stats on the frequency of these blocking operations.
@@ -4501,10 +4486,12 @@ softdep_setup_create(dp, ip)
 	struct jaddref *jaddref;
 	struct vnode *dvp;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_setup_create called on non-softdep filesystem"));
 	KASSERT(ip->i_nlink == 1,
 	    ("softdep_setup_create: Invalid link count."));
 	dvp = ITOV(dp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	inodedep = inodedep_lookup_ip(ip);
 	if (DOINGSUJ(dvp)) {
 		jaddref = (struct jaddref *)TAILQ_LAST(&inodedep->id_inoreflst,
@@ -4513,7 +4500,7 @@ softdep_setup_create(dp, ip)
 		    ("softdep_setup_create: No addref structure present."));
 	}
 	softdep_prelink(dvp, NULL);
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -4532,6 +4519,8 @@ softdep_setup_dotdot_link(dp, ip)
 	struct vnode *dvp;
 	struct vnode *vp;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_setup_dotdot_link called on non-softdep filesystem"));
 	dvp = ITOV(dp);
 	vp = ITOV(ip);
 	jaddref = NULL;
@@ -4542,13 +4531,13 @@ softdep_setup_dotdot_link(dp, ip)
 	if (DOINGSUJ(dvp))
 		jaddref = newjaddref(ip, dp->i_number, DOTDOT_OFFSET,
 		    dp->i_effnlink - 1, dp->i_mode);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	inodedep = inodedep_lookup_ip(dp);
 	if (jaddref)
 		TAILQ_INSERT_TAIL(&inodedep->id_inoreflst, &jaddref->ja_ref,
 		    if_deps);
 	softdep_prelink(dvp, ITOV(ip));
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -4566,18 +4555,20 @@ softdep_setup_link(dp, ip)
 	struct jaddref *jaddref;
 	struct vnode *dvp;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_setup_link called on non-softdep filesystem"));
 	dvp = ITOV(dp);
 	jaddref = NULL;
 	if (DOINGSUJ(dvp))
 		jaddref = newjaddref(dp, ip->i_number, 0, ip->i_effnlink - 1,
 		    ip->i_mode);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	inodedep = inodedep_lookup_ip(ip);
 	if (jaddref)
 		TAILQ_INSERT_TAIL(&inodedep->id_inoreflst, &jaddref->ja_ref,
 		    if_deps);
 	softdep_prelink(dvp, ITOV(ip));
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -4597,6 +4588,8 @@ softdep_setup_mkdir(dp, ip)
 	struct jaddref *jaddref;
 	struct vnode *dvp;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_setup_mkdir called on non-softdep filesystem"));
 	dvp = ITOV(dp);
 	dotaddref = dotdotaddref = NULL;
 	if (DOINGSUJ(dvp)) {
@@ -4607,7 +4600,7 @@ softdep_setup_mkdir(dp, ip)
 		    dp->i_effnlink - 1, dp->i_mode);
 		dotdotaddref->ja_state |= MKDIR_PARENT;
 	}
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	inodedep = inodedep_lookup_ip(ip);
 	if (DOINGSUJ(dvp)) {
 		jaddref = (struct jaddref *)TAILQ_LAST(&inodedep->id_inoreflst,
@@ -4625,7 +4618,7 @@ softdep_setup_mkdir(dp, ip)
 		TAILQ_INSERT_TAIL(&inodedep->id_inoreflst,
 		    &dotdotaddref->ja_ref, if_deps);
 	softdep_prelink(ITOV(dp), NULL);
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -4639,12 +4632,14 @@ softdep_setup_rmdir(dp, ip)
 {
 	struct vnode *dvp;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_setup_rmdir called on non-softdep filesystem"));
 	dvp = ITOV(dp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	(void) inodedep_lookup_ip(ip);
 	(void) inodedep_lookup_ip(dp);
 	softdep_prelink(dvp, ITOV(ip));
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -4658,12 +4653,14 @@ softdep_setup_unlink(dp, ip)
 {
 	struct vnode *dvp;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_setup_unlink called on non-softdep filesystem"));
 	dvp = ITOV(dp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	(void) inodedep_lookup_ip(ip);
 	(void) inodedep_lookup_ip(dp);
 	softdep_prelink(dvp, ITOV(ip));
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -4679,8 +4676,10 @@ softdep_revert_create(dp, ip)
 	struct jaddref *jaddref;
 	struct vnode *dvp;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_revert_create called on non-softdep filesystem"));
 	dvp = ITOV(dp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	inodedep = inodedep_lookup_ip(ip);
 	if (DOINGSUJ(dvp)) {
 		jaddref = (struct jaddref *)TAILQ_LAST(&inodedep->id_inoreflst,
@@ -4689,33 +4688,7 @@ softdep_revert_create(dp, ip)
 		    ("softdep_revert_create: addref parent mismatch"));
 		cancel_jaddref(jaddref, inodedep, &inodedep->id_inowait);
 	}
-	FREE_LOCK(&lk);
-}
-
-/*
- * Called to release the journal structures created by a failed dotdot link
- * creation.  Adjusts nlinkdelta for non-journaling softdep.
- */
-void
-softdep_revert_dotdot_link(dp, ip)
-	struct inode *dp;
-	struct inode *ip;
-{
-	struct inodedep *inodedep;
-	struct jaddref *jaddref;
-	struct vnode *dvp;
-
-	dvp = ITOV(dp);
-	ACQUIRE_LOCK(&lk);
-	inodedep = inodedep_lookup_ip(dp);
-	if (DOINGSUJ(dvp)) {
-		jaddref = (struct jaddref *)TAILQ_LAST(&inodedep->id_inoreflst,
-		    inoreflst);
-		KASSERT(jaddref->ja_parent == ip->i_number,
-		    ("softdep_revert_dotdot_link: addref parent mismatch"));
-		cancel_jaddref(jaddref, inodedep, &inodedep->id_inowait);
-	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -4731,8 +4704,10 @@ softdep_revert_link(dp, ip)
 	struct jaddref *jaddref;
 	struct vnode *dvp;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_revert_link called on non-softdep filesystem"));
 	dvp = ITOV(dp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	inodedep = inodedep_lookup_ip(ip);
 	if (DOINGSUJ(dvp)) {
 		jaddref = (struct jaddref *)TAILQ_LAST(&inodedep->id_inoreflst,
@@ -4741,7 +4716,7 @@ softdep_revert_link(dp, ip)
 		    ("softdep_revert_link: addref parent mismatch"));
 		cancel_jaddref(jaddref, inodedep, &inodedep->id_inowait);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -4758,9 +4733,11 @@ softdep_revert_mkdir(dp, ip)
 	struct jaddref *dotaddref;
 	struct vnode *dvp;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_revert_mkdir called on non-softdep filesystem"));
 	dvp = ITOV(dp);
 
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	inodedep = inodedep_lookup_ip(dp);
 	if (DOINGSUJ(dvp)) {
 		jaddref = (struct jaddref *)TAILQ_LAST(&inodedep->id_inoreflst,
@@ -4782,7 +4759,7 @@ softdep_revert_mkdir(dp, ip)
 		    ("softdep_revert_mkdir: dot addref parent mismatch"));
 		cancel_jaddref(dotaddref, inodedep, &inodedep->id_inowait);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /* 
@@ -4794,10 +4771,12 @@ softdep_revert_rmdir(dp, ip)
 	struct inode *ip;
 {
 
-	ACQUIRE_LOCK(&lk);
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(dp->i_ump)) != 0,
+	    ("softdep_revert_rmdir called on non-softdep filesystem"));
+	ACQUIRE_LOCK(dp->i_ump);
 	(void) inodedep_lookup_ip(ip);
 	(void) inodedep_lookup_ip(dp);
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -4849,6 +4828,8 @@ softdep_setup_inomapdep(bp, ip, newinum, mode)
 	struct fs *fs;
 
 	mp = UFSTOVFS(ip->i_ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_setup_inomapdep called on non-softdep filesystem"));
 	fs = ip->i_ump->um_fs;
 	jaddref = NULL;
 
@@ -4881,7 +4862,7 @@ softdep_setup_inomapdep(bp, ip, newinum, mode)
 	bmsafemap = malloc(sizeof(struct bmsafemap),
 	    M_BMSAFEMAP, M_SOFTDEP_FLAGS);
 	workitem_alloc(&bmsafemap->sm_list, D_BMSAFEMAP, mp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	if ((inodedep_lookup(mp, newinum, DEPALLOC | NODELAY, &inodedep)))
 		panic("softdep_setup_inomapdep: dependency %p for new"
 		    "inode already exists", inodedep);
@@ -4896,7 +4877,7 @@ softdep_setup_inomapdep(bp, ip, newinum, mode)
 	}
 	inodedep->id_bmsafemap = bmsafemap;
 	inodedep->id_state &= ~DEPCOMPLETE;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 }
 
 /*
@@ -4914,9 +4895,13 @@ softdep_setup_blkmapdep(bp, mp, newblkno, frags, oldfrags)
 	struct newblk *newblk;
 	struct bmsafemap *bmsafemap;
 	struct jnewblk *jnewblk;
+	struct ufsmount *ump;
 	struct fs *fs;
 
-	fs = VFSTOUFS(mp)->um_fs;
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_setup_blkmapdep called on non-softdep filesystem"));
+	ump = VFSTOUFS(mp);
+	fs = ump->um_fs;
 	jnewblk = NULL;
 	/*
 	 * Create a dependency for the newly allocated block.
@@ -4959,7 +4944,7 @@ softdep_setup_blkmapdep(bp, mp, newblkno, frags, oldfrags)
 	CTR3(KTR_SUJ,
 	    "softdep_setup_blkmapdep: blkno %jd frags %d oldfrags %d",
 	    newblkno, frags, oldfrags);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	if (newblk_lookup(mp, newblkno, DEPALLOC, &newblk) != 0)
 		panic("softdep_setup_blkmapdep: found block");
 	newblk->nb_bmsafemap = bmsafemap = bmsafemap_lookup(mp, bp,
@@ -4973,23 +4958,22 @@ softdep_setup_blkmapdep(bp, mp, newblkno, frags, oldfrags)
 	}
 	newblk->nb_bmsafemap = bmsafemap;
 	newblk->nb_jnewblk = jnewblk;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
-#define	BMSAFEMAP_HASH(fs, cg) \
-      (&bmsafemap_hashtbl[((((register_t)(fs)) >> 13) + (cg)) & bmsafemap_hash])
+#define	BMSAFEMAP_HASH(ump, cg) \
+      (&(ump)->bmsafemap_hashtbl[(cg) & (ump)->bmsafemap_hash_size])
 
 static int
-bmsafemap_find(bmsafemaphd, mp, cg, bmsafemapp)
+bmsafemap_find(bmsafemaphd, cg, bmsafemapp)
 	struct bmsafemap_hashhead *bmsafemaphd;
-	struct mount *mp;
 	int cg;
 	struct bmsafemap **bmsafemapp;
 {
 	struct bmsafemap *bmsafemap;
 
 	LIST_FOREACH(bmsafemap, bmsafemaphd, sm_hash)
-		if (bmsafemap->sm_list.wk_mp == mp && bmsafemap->sm_cg == cg)
+		if (bmsafemap->sm_cg == cg)
 			break;
 	if (bmsafemap) {
 		*bmsafemapp = bmsafemap;
@@ -5018,9 +5002,10 @@ bmsafemap_lookup(mp, bp, cg, newbmsafemap)
 	struct bmsafemap_hashhead *bmsafemaphd;
 	struct bmsafemap *bmsafemap, *collision;
 	struct worklist *wk;
-	struct fs *fs;
+	struct ufsmount *ump;
 
-	rw_assert(&lk, RA_WLOCKED);
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	KASSERT(bp != NULL, ("bmsafemap_lookup: missing buffer"));
 	LIST_FOREACH(wk, &bp->b_dep, wk_list) {
 		if (wk->wk_type == D_BMSAFEMAP) {
@@ -5029,9 +5014,8 @@ bmsafemap_lookup(mp, bp, cg, newbmsafemap)
 			return (WK_BMSAFEMAP(wk));
 		}
 	}
-	fs = VFSTOUFS(mp)->um_fs;
-	bmsafemaphd = BMSAFEMAP_HASH(fs, cg);
-	if (bmsafemap_find(bmsafemaphd, mp, cg, &bmsafemap) == 1) {
+	bmsafemaphd = BMSAFEMAP_HASH(ump, cg);
+	if (bmsafemap_find(bmsafemaphd, cg, &bmsafemap) == 1) {
 		if (newbmsafemap)
 			WORKITEM_FREE(newbmsafemap, D_BMSAFEMAP);
 		return (bmsafemap);
@@ -5039,11 +5023,11 @@ bmsafemap_lookup(mp, bp, cg, newbmsafemap)
 	if (newbmsafemap) {
 		bmsafemap = newbmsafemap;
 	} else {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		bmsafemap = malloc(sizeof(struct bmsafemap),
 			M_BMSAFEMAP, M_SOFTDEP_FLAGS);
 		workitem_alloc(&bmsafemap->sm_list, D_BMSAFEMAP, mp);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	}
 	bmsafemap->sm_buf = bp;
 	LIST_INIT(&bmsafemap->sm_inodedephd);
@@ -5054,13 +5038,13 @@ bmsafemap_lookup(mp, bp, cg, newbmsafemap)
 	LIST_INIT(&bmsafemap->sm_jnewblkhd);
 	LIST_INIT(&bmsafemap->sm_freehd);
 	LIST_INIT(&bmsafemap->sm_freewr);
-	if (bmsafemap_find(bmsafemaphd, mp, cg, &collision) == 1) {
+	if (bmsafemap_find(bmsafemaphd, cg, &collision) == 1) {
 		WORKITEM_FREE(bmsafemap, D_BMSAFEMAP);
 		return (collision);
 	}
 	bmsafemap->sm_cg = cg;
 	LIST_INSERT_HEAD(bmsafemaphd, bmsafemap, sm_hash);
-	LIST_INSERT_HEAD(&VFSTOUFS(mp)->softdep_dirtycg, bmsafemap, sm_next);
+	LIST_INSERT_HEAD(&ump->softdep_dirtycg, bmsafemap, sm_next);
 	WORKLIST_INSERT(&bp->b_dep, &bmsafemap->sm_list);
 	return (bmsafemap);
 }
@@ -5116,6 +5100,8 @@ softdep_setup_allocdirect(ip, off, newblkno, oldblkno, newsize, oldsize, bp)
 
 	lbn = bp->b_lblkno;
 	mp = UFSTOVFS(ip->i_ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_setup_allocdirect called on non-softdep filesystem"));
 	if (oldblkno && oldblkno != newblkno)
 		freefrag = newfreefrag(ip, oldblkno, oldsize, lbn);
 	else
@@ -5125,7 +5111,7 @@ softdep_setup_allocdirect(ip, off, newblkno, oldblkno, newsize, oldsize, bp)
 	    "softdep_setup_allocdirect: ino %d blkno %jd oldblkno %jd "
 	    "off %jd newsize %ld oldsize %d",
 	    ip->i_number, newblkno, oldblkno, off, newsize, oldsize);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	if (off >= NDADDR) {
 		if (lbn > 0)
 			panic("softdep_setup_allocdirect: bad lbn %jd, off %jd",
@@ -5197,7 +5183,7 @@ softdep_setup_allocdirect(ip, off, newblkno, oldblkno, newsize, oldsize, bp)
 		TAILQ_INSERT_TAIL(adphead, adp, ad_next);
 		if (oldadp != NULL && oldadp->ad_offset == off)
 			allocdirect_merge(adphead, adp, oldadp);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ip->i_ump);
 		return;
 	}
 	TAILQ_FOREACH(oldadp, adphead, ad_next) {
@@ -5211,7 +5197,7 @@ softdep_setup_allocdirect(ip, off, newblkno, oldblkno, newsize, oldsize, bp)
 	if (oldadp->ad_offset == off)
 		allocdirect_merge(adphead, adp, oldadp);
 
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 }
 
 /*
@@ -5291,7 +5277,7 @@ allocdirect_merge(adphead, newadp, oldadp)
 	struct freefrag *freefrag;
 
 	freefrag = NULL;
-	rw_assert(&lk, RA_WLOCKED);
+	LOCK_OWNED(VFSTOUFS(newadp->ad_list.wk_mp));
 	if (newadp->ad_oldblkno != oldadp->ad_newblkno ||
 	    newadp->ad_oldsize != oldadp->ad_newsize ||
 	    newadp->ad_offset >= NDADDR)
@@ -5449,7 +5435,7 @@ handle_workitem_freefrag(freefrag)
 	 * safe to modify the list head here.
 	 */
 	LIST_INIT(&wkhd);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	LIST_SWAP(&freefrag->ff_jwork, &wkhd, worklist, wk_list);
 	/*
 	 * If the journal has not been written we must cancel it here.
@@ -5460,12 +5446,12 @@ handle_workitem_freefrag(freefrag)
 			    freefrag->ff_jdep->wk_type);
 		cancel_jnewblk(WK_JNEWBLK(freefrag->ff_jdep), &wkhd);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	ffs_blkfree(ump, ump->um_fs, ump->um_devvp, freefrag->ff_blkno,
 	   freefrag->ff_fragsize, freefrag->ff_inum, freefrag->ff_vtype, &wkhd);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	WORKITEM_FREE(freefrag, D_FREEFRAG);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
 /*
@@ -5492,18 +5478,19 @@ softdep_setup_allocext(ip, off, newblkno, oldblkno, newsize, oldsize, bp)
 	struct mount *mp;
 	ufs_lbn_t lbn;
 
-	if (off >= NXADDR)
-		panic("softdep_setup_allocext: lbn %lld > NXADDR",
-		    (long long)off);
+	mp = UFSTOVFS(ip->i_ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_setup_allocext called on non-softdep filesystem"));
+	KASSERT(off < NXADDR, ("softdep_setup_allocext: lbn %lld > NXADDR",
+		    (long long)off));
 
 	lbn = bp->b_lblkno;
-	mp = UFSTOVFS(ip->i_ump);
 	if (oldblkno && oldblkno != newblkno)
 		freefrag = newfreefrag(ip, oldblkno, oldsize, lbn);
 	else
 		freefrag = NULL;
 
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	if (newblk_lookup(mp, newblkno, 0, &newblk) == 0)
 		panic("softdep_setup_allocext: lost block");
 	KASSERT(newblk->nb_list.wk_type == D_NEWBLK,
@@ -5554,7 +5541,7 @@ softdep_setup_allocext(ip, off, newblkno, oldblkno, newsize, oldsize, bp)
 		TAILQ_INSERT_TAIL(adphead, adp, ad_next);
 		if (oldadp != NULL && oldadp->ad_offset == off)
 			allocdirect_merge(adphead, adp, oldadp);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ip->i_ump);
 		return;
 	}
 	TAILQ_FOREACH(oldadp, adphead, ad_next) {
@@ -5567,7 +5554,7 @@ softdep_setup_allocext(ip, off, newblkno, oldblkno, newsize, oldsize, bp)
 	TAILQ_INSERT_BEFORE(oldadp, adp, ad_next);
 	if (oldadp->ad_offset == off)
 		allocdirect_merge(adphead, adp, oldadp);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 }
 
 /*
@@ -5615,7 +5602,7 @@ newallocindir(ip, ptrno, newblkno, oldblkno, lbn)
 		freefrag = newfreefrag(ip, oldblkno, ip->i_fs->fs_bsize, lbn);
 	else
 		freefrag = NULL;
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	if (newblk_lookup(UFSTOVFS(ip->i_ump), newblkno, 0, &newblk) == 0)
 		panic("new_allocindir: lost block");
 	KASSERT(newblk->nb_list.wk_type == D_NEWBLK,
@@ -5658,14 +5645,16 @@ softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp)
 	struct mount *mp;
 	int dflags;
 
-	if (lbn != nbp->b_lblkno)
-		panic("softdep_setup_allocindir_page: lbn %jd != lblkno %jd",
-		    lbn, bp->b_lblkno);
+	mp = UFSTOVFS(ip->i_ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_setup_allocindir_page called on non-softdep filesystem"));
+	KASSERT(lbn == nbp->b_lblkno,
+	    ("softdep_setup_allocindir_page: lbn %jd != lblkno %jd",
+	    lbn, bp->b_lblkno));
 	CTR4(KTR_SUJ,
 	    "softdep_setup_allocindir_page: ino %d blkno %jd oldblkno %jd "
 	    "lbn %jd", ip->i_number, newblkno, oldblkno, lbn);
 	ASSERT_VOP_LOCKED(ITOV(ip), "softdep_setup_allocindir_page");
-	mp = UFSTOVFS(ip->i_ump);
 	aip = newallocindir(ip, ptrno, newblkno, oldblkno, lbn);
 	dflags = DEPALLOC;
 	if (IS_SNAPSHOT(ip))
@@ -5680,7 +5669,7 @@ softdep_setup_allocindir_page(ip, lbn, bp, ptrno, newblkno, oldblkno, nbp)
 		pagedep_lookup(mp, nbp, ip->i_number, lbn, DEPALLOC, &pagedep);
 	WORKLIST_INSERT(&nbp->b_dep, &aip->ai_block.nb_list);
 	freefrag = setup_allocindir_phase2(bp, ip, inodedep, aip, lbn);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 	if (freefrag)
 		handle_workitem_freefrag(freefrag);
 }
@@ -5702,6 +5691,8 @@ softdep_setup_allocindir_meta(nbp, ip, bp, ptrno, newblkno)
 	ufs_lbn_t lbn;
 	int dflags;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ip->i_ump)) != 0,
+	    ("softdep_setup_allocindir_meta called on non-softdep filesystem"));
 	CTR3(KTR_SUJ,
 	    "softdep_setup_allocindir_meta: ino %d blkno %jd ptrno %d",
 	    ip->i_number, newblkno, ptrno);
@@ -5715,7 +5706,7 @@ softdep_setup_allocindir_meta(nbp, ip, bp, ptrno, newblkno)
 	WORKLIST_INSERT(&nbp->b_dep, &aip->ai_block.nb_list);
 	if (setup_allocindir_phase2(bp, ip, inodedep, aip, lbn))
 		panic("softdep_setup_allocindir_meta: Block already existed");
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 }
 
 static void
@@ -5748,11 +5739,13 @@ indirdep_lookup(mp, ip, bp)
 {
 	struct indirdep *indirdep, *newindirdep;
 	struct newblk *newblk;
+	struct ufsmount *ump;
 	struct worklist *wk;
 	struct fs *fs;
 	ufs2_daddr_t blkno;
 
-	rw_assert(&lk, RA_WLOCKED);
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	indirdep = NULL;
 	newindirdep = NULL;
 	fs = ip->i_fs;
@@ -5772,7 +5765,7 @@ indirdep_lookup(mp, ip, bp)
 		if (indirdep == NULL && newindirdep != NULL)
 			break;
 		/* None found and no new structure available. */
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		newindirdep = malloc(sizeof(struct indirdep),
 		    M_INDIRDEP, M_SOFTDEP_FLAGS);
 		workitem_alloc(&newindirdep->ir_list, D_INDIRDEP, mp);
@@ -5796,7 +5789,7 @@ indirdep_lookup(mp, ip, bp)
 		newindirdep->ir_bp = bp;
 		BUF_KERNPROC(newindirdep->ir_savebp);
 		bcopy(bp->b_data, newindirdep->ir_savebp->b_data, bp->b_bcount);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	}
 	indirdep = newindirdep;
 	WORKLIST_INSERT(&bp->b_dep, &indirdep->ir_list);
@@ -5831,7 +5824,7 @@ setup_allocindir_phase2(bp, ip, inodedep, aip, lbn)
 	struct freefrag *freefrag;
 	struct mount *mp;
 
-	rw_assert(&lk, RA_WLOCKED);
+	LOCK_OWNED(ip->i_ump);
 	mp = UFSTOVFS(ip->i_ump);
 	fs = ip->i_fs;
 	if (bp->b_lblkno >= 0)
@@ -6086,7 +6079,7 @@ setup_trunc_indir(freeblks, ip, lbn, lastlbn, blkno)
 	 * allocations from proceeding until we are finished with the
 	 * truncate and the block is written.
 	 */
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	indirdep = indirdep_lookup(mp, ip, bp);
 	if (indirdep->ir_freeblks)
 		panic("setup_trunc_indir: indirdep already truncated.");
@@ -6103,7 +6096,7 @@ setup_trunc_indir(freeblks, ip, lbn, lastlbn, blkno)
 			trunc_indirdep(indirn, freeblks, bp, off);
 	} else
 		trunc_indirdep(indirdep, freeblks, bp, off);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 	/*
 	 * Creation is protected by the buf lock. The saveddata is only
 	 * needed if a full truncation follows a partial truncation but it
@@ -6146,10 +6139,13 @@ complete_trunc_indir(freework)
 {
 	struct freework *fwn;
 	struct indirdep *indirdep;
+	struct ufsmount *ump;
 	struct buf *bp;
 	uintptr_t start;
 	int count;
 
+	ump = VFSTOUFS(freework->fw_list.wk_mp);
+	LOCK_OWNED(ump);
 	indirdep = freework->fw_indir;
 	for (;;) {
 		bp = indirdep->ir_bp;
@@ -6159,12 +6155,11 @@ complete_trunc_indir(freework)
 		/* Inline part of getdirtybuf().  We dont want bremfree. */
 		if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL) == 0)
 			break;
-		if (BUF_LOCK(bp,
-		    LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK, &lk) == 0)
+		if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL | LK_INTERLOCK,
+		    LOCK_PTR(ump)) == 0)
 			BUF_UNLOCK(bp);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	}
-	rw_assert(&lk, RA_WLOCKED);
 	freework->fw_state |= DEPCOMPLETE;
 	TAILQ_REMOVE(&indirdep->ir_trunc, freework, fw_next);
 	/*
@@ -6225,7 +6220,7 @@ complete_trunc_indir(freework)
  * Calculate the number of blocks we are going to release where datablocks
  * is the current total and length is the new file size.
  */
-ufs2_daddr_t
+static ufs2_daddr_t
 blkcount(fs, datablocks, length)
 	struct fs *fs;
 	ufs2_daddr_t datablocks;
@@ -6313,6 +6308,7 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 	struct inodedep *inodedep;
 	struct jblkdep *jblkdep;
 	struct allocdirect *adp, *adpn;
+	struct ufsmount *ump;
 	struct fs *fs;
 	struct buf *bp;
 	struct vnode *vp;
@@ -6322,7 +6318,10 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 	int frags, lastoff, iboff, allocblock, needj, dflags, error, i;
 
 	fs = ip->i_fs;
-	mp = UFSTOVFS(ip->i_ump);
+	ump = ip->i_ump;
+	mp = UFSTOVFS(ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_journal_freeblocks called on non-softdep filesystem"));
 	vp = ITOV(ip);
 	needj = 1;
 	iboff = -1;
@@ -6331,7 +6330,7 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 	datablocks = 0;
 	frags = 0;
 	freeblks = newfreeblks(mp, ip);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	/*
 	 * If we're truncating a removed file that will never be written
 	 * we don't need to journal the block frees.  The canceled journals
@@ -6346,7 +6345,7 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 		needj = 0;
 	CTR3(KTR_SUJ, "softdep_journal_freeblks: ip %d length %ld needj %d",
 	    ip->i_number, length, needj);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	/*
 	 * Calculate the lbn that we are truncating to.  This results in -1
 	 * if we're truncating the 0 bytes.  So it is the last lbn we want
@@ -6405,7 +6404,7 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 				oldfrags -= frags;
 				oldfrags = numfrags(ip->i_fs, oldfrags);
 				blkno += numfrags(ip->i_fs, frags);
-				newfreework(ip->i_ump, freeblks, NULL, lastlbn,
+				newfreework(ump, freeblks, NULL, lastlbn,
 				    blkno, oldfrags, 0, needj);
 			} else if (blkno == 0)
 				allocblock = 1;
@@ -6438,9 +6437,9 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 	(void) chkdq(ip, -datablocks, NOCRED, 0);
 #endif
 	freeblks->fb_chkcnt = -datablocks;
-	UFS_LOCK(ip->i_ump);
+	UFS_LOCK(ump);
 	fs->fs_pendingblocks += datablocks;
-	UFS_UNLOCK(ip->i_ump);
+	UFS_UNLOCK(ump);
 	DIP_SET(ip, i_blocks, DIP(ip, i_blocks) - datablocks);
 	/*
 	 * Handle truncation of incomplete alloc direct dependencies.  We
@@ -6460,13 +6459,13 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 	if (bp->b_bufsize == fs->fs_bsize)
 		bp->b_flags |= B_CLUSTEROK;
 	softdep_update_inodeblock(ip, bp, 0);
-	if (ip->i_ump->um_fstype == UFS1)
+	if (ump->um_fstype == UFS1)
 		*((struct ufs1_dinode *)bp->b_data +
 		    ino_to_fsbo(fs, ip->i_number)) = *ip->i_din1;
 	else
 		*((struct ufs2_dinode *)bp->b_data +
 		    ino_to_fsbo(fs, ip->i_number)) = *ip->i_din2;
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	(void) inodedep_lookup(mp, ip->i_number, dflags, &inodedep);
 	if ((inodedep->id_state & IOSTARTED) != 0)
 		panic("softdep_setup_freeblocks: inode busy");
@@ -6518,7 +6517,7 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 	 */
 	LIST_FOREACH(jblkdep, &freeblks->fb_jblkdephd, jb_deps)
 		add_to_journal(&jblkdep->jb_list);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	bdwrite(bp);
 	/*
 	 * Truncate dependency structures beyond length.
@@ -6559,7 +6558,7 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 		bawrite(bp);
 
 	}
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	inodedep_lookup(mp, ip->i_number, dflags, &inodedep);
 	TAILQ_INSERT_TAIL(&inodedep->id_freeblklst, freeblks, fb_next);
 	freeblks->fb_state |= DEPCOMPLETE | ONDEPLIST;
@@ -6575,7 +6574,7 @@ softdep_journal_freeblocks(ip, cred, length, flags)
 		freeblks->fb_state |= INPROGRESS;
 	else
 		freeblks = NULL;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if (freeblks)
 		handle_workitem_freeblocks(freeblks, 0);
 	trunc_pages(ip, length, extblocks, flags);
@@ -6591,6 +6590,8 @@ softdep_journal_fsync(ip)
 {
 	struct jfsync *jfsync;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ip->i_ump)) != 0,
+	    ("softdep_journal_fsync called on non-softdep filesystem"));
 	if ((ip->i_flag & IN_TRUNCATED) == 0)
 		return;
 	ip->i_flag &= ~IN_TRUNCATED;
@@ -6598,10 +6599,10 @@ softdep_journal_fsync(ip)
 	workitem_alloc(&jfsync->jfs_list, D_JFSYNC, UFSTOVFS(ip->i_ump));
 	jfsync->jfs_size = ip->i_size;
 	jfsync->jfs_ino = ip->i_number;
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	add_to_journal(&jfsync->jfs_list);
 	jwait(&jfsync->jfs_list, MNT_WAIT);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 }
 
 /*
@@ -6644,6 +6645,7 @@ softdep_setup_freeblocks(ip, length, flags)
 	struct freeblks *freeblks;
 	struct inodedep *inodedep;
 	struct allocdirect *adp;
+	struct ufsmount *ump;
 	struct buf *bp;
 	struct fs *fs;
 	ufs2_daddr_t extblocks, datablocks;
@@ -6652,12 +6654,14 @@ softdep_setup_freeblocks(ip, length, flags)
 	ufs_lbn_t tmpval;
 	ufs_lbn_t lbn;
 
+	ump = ip->i_ump;
+	mp = UFSTOVFS(ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_setup_freeblocks called on non-softdep filesystem"));
 	CTR2(KTR_SUJ, "softdep_setup_freeblks: ip %d length %ld",
 	    ip->i_number, length);
+	KASSERT(length == 0, ("softdep_setup_freeblocks: non-zero length"));
 	fs = ip->i_fs;
-	mp = UFSTOVFS(ip->i_ump);
-	if (length != 0)
-		panic("softdep_setup_freeblocks: non-zero length");
 	freeblks = newfreeblks(mp, ip);
 	extblocks = 0;
 	datablocks = 0;
@@ -6685,9 +6689,9 @@ softdep_setup_freeblocks(ip, length, flags)
 	(void) chkdq(ip, -datablocks, NOCRED, 0);
 #endif
 	freeblks->fb_chkcnt = -datablocks;
-	UFS_LOCK(ip->i_ump);
+	UFS_LOCK(ump);
 	fs->fs_pendingblocks += datablocks;
-	UFS_UNLOCK(ip->i_ump);
+	UFS_UNLOCK(ump);
 	DIP_SET(ip, i_blocks, DIP(ip, i_blocks) - datablocks);
 	/*
 	 * Push the zero'ed inode to to its disk buffer so that we are free
@@ -6700,7 +6704,7 @@ softdep_setup_freeblocks(ip, length, flags)
 		brelse(bp);
 		softdep_error("softdep_setup_freeblocks", error);
 	}
-	if (ip->i_ump->um_fstype == UFS1) {
+	if (ump->um_fstype == UFS1) {
 		dp1 = ((struct ufs1_dinode *)bp->b_data +
 		    ino_to_fsbo(fs, ip->i_number));
 		ip->i_din1->di_freelink = dp1->di_freelink;
@@ -6714,7 +6718,7 @@ softdep_setup_freeblocks(ip, length, flags)
 	/*
 	 * Find and eliminate any inode dependencies.
 	 */
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	dflags = DEPALLOC;
 	if (IS_SNAPSHOT(ip))
 		dflags |= NODELAY;
@@ -6756,10 +6760,10 @@ softdep_setup_freeblocks(ip, length, flags)
 			cancel_allocdirect(&inodedep->id_extupdt, adp,
 			    freeblks);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	bdwrite(bp);
 	trunc_dependencies(ip, freeblks, -1, 0, flags);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	if (inodedep_lookup(mp, ip->i_number, 0, &inodedep) != 0)
 		(void) free_inodedep(inodedep);
 	freeblks->fb_state |= DEPCOMPLETE;
@@ -6771,7 +6775,7 @@ softdep_setup_freeblocks(ip, length, flags)
 		freeblks->fb_state |= INPROGRESS;
 	else
 		freeblks = NULL;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if (freeblks)
 		handle_workitem_freeblocks(freeblks, 0);
 	trunc_pages(ip, length, extblocks, flags);
@@ -6908,6 +6912,7 @@ restart:
 			bp->b_vflags |= BV_SCANNED;
 			continue;
 		}
+		KASSERT(bp->b_bufobj == bo, ("Wrong object in buffer"));
 		if ((bp = getdirtybuf(bp, BO_LOCKPTR(bo), MNT_WAIT)) == NULL)
 			goto restart;
 		BO_UNLOCK(bo);
@@ -7045,8 +7050,12 @@ deallocate_dependencies(bp, freeblks, off)
 	struct pagedep *pagedep;
 	struct allocdirect *adp;
 	struct worklist *wk, *wkn;
+	struct ufsmount *ump;
 
-	ACQUIRE_LOCK(&lk);
+	if ((wk = LIST_FIRST(&bp->b_dep)) == NULL)
+		goto done;
+	ump = VFSTOUFS(wk->wk_mp);
+	ACQUIRE_LOCK(ump);
 	LIST_FOREACH_SAFE(wk, &bp->b_dep, wk_list, wkn) {
 		switch (wk->wk_type) {
 		case D_INDIRDEP:
@@ -7060,7 +7069,7 @@ deallocate_dependencies(bp, freeblks, off)
 		case D_PAGEDEP:
 			pagedep = WK_PAGEDEP(wk);
 			if (cancel_pagedep(pagedep, freeblks, off)) {
-				FREE_LOCK(&lk);
+				FREE_LOCK(ump);
 				return (ERESTART);
 			}
 			continue;
@@ -7096,7 +7105,8 @@ deallocate_dependencies(bp, freeblks, off)
 			/* NOTREACHED */
 		}
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
+done:
 	/*
 	 * Don't throw away this buf, we were partially truncating and
 	 * some deps may always remain.
@@ -7254,7 +7264,7 @@ free_newblk(newblk)
 	    ("free_newblk: jnewblk %p still attached", newblk->nb_jnewblk));
 	KASSERT(newblk->nb_list.wk_type != D_NEWBLK,
 	    ("free_newblk: unclaimed newblk"));
-	rw_assert(&lk, RA_WLOCKED);
+	LOCK_OWNED(VFSTOUFS(newblk->nb_list.wk_mp));
 	newblk_freefrag(newblk);
 	if (newblk->nb_state & ONDEPLIST)
 		LIST_REMOVE(newblk, nb_deps);
@@ -7283,7 +7293,7 @@ free_newdirblk(newdirblk)
 	struct diradd *dap;
 	struct worklist *wk;
 
-	rw_assert(&lk, RA_WLOCKED);
+	LOCK_OWNED(VFSTOUFS(newdirblk->db_list.wk_mp));
 	WORKLIST_REMOVE(&newdirblk->db_list);
 	/*
 	 * If the pagedep is still linked onto the directory buffer
@@ -7327,7 +7337,11 @@ softdep_freefile(pvp, ino, mode)
 	struct inodedep *inodedep;
 	struct freefile *freefile;
 	struct freeblks *freeblks;
+	struct ufsmount *ump;
 
+	ump = ip->i_ump;
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ump)) != 0,
+	    ("softdep_freefile called on non-softdep filesystem"));
 	/*
 	 * This sets up the inode de-allocation dependency.
 	 */
@@ -7338,9 +7352,9 @@ softdep_freefile(pvp, ino, mode)
 	freefile->fx_oldinum = ino;
 	freefile->fx_devvp = ip->i_devvp;
 	LIST_INIT(&freefile->fx_jwork);
-	UFS_LOCK(ip->i_ump);
+	UFS_LOCK(ump);
 	ip->i_fs->fs_pendinginodes += 1;
-	UFS_UNLOCK(ip->i_ump);
+	UFS_UNLOCK(ump);
 
 	/*
 	 * If the inodedep does not exist, then the zero'ed inode has
@@ -7353,7 +7367,7 @@ softdep_freefile(pvp, ino, mode)
 	 * Any blocks waiting on the inode to write can be safely freed
 	 * here as it will never been written.
 	 */
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	inodedep_lookup(pvp->v_mount, ino, 0, &inodedep);
 	if (inodedep) {
 		/*
@@ -7377,19 +7391,22 @@ softdep_freefile(pvp, ino, mode)
 			 */
 			handle_bufwait(inodedep, &freefile->fx_jwork);
 			clear_unlinked_inodedep(inodedep);
-			/* Re-acquire inodedep as we've dropped lk. */
+			/*
+			 * Re-acquire inodedep as we've dropped the
+			 * soft updates lock in clear_unlinked_inodedep().
+			 */
 			inodedep_lookup(pvp->v_mount, ino, 0, &inodedep);
 		}
 	}
 	if (inodedep == NULL || check_inode_unwritten(inodedep)) {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		handle_workitem_freefile(freefile);
 		return;
 	}
 	if ((inodedep->id_state & DEPCOMPLETE) == 0)
 		inodedep->id_state |= GOINGAWAY;
 	WORKLIST_INSERT(&inodedep->id_inowait, &freefile->fx_list);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if (ip->i_number == ino)
 		ip->i_flag |= IN_MODIFIED;
 }
@@ -7414,7 +7431,7 @@ check_inode_unwritten(inodedep)
 	struct inodedep *inodedep;
 {
 
-	rw_assert(&lk, RA_WLOCKED);
+	LOCK_OWNED(VFSTOUFS(inodedep->id_list.wk_mp));
 
 	if ((inodedep->id_state & (DEPCOMPLETE | UNLINKED)) != 0 ||
 	    !LIST_EMPTY(&inodedep->id_dirremhd) ||
@@ -7462,7 +7479,7 @@ free_inodedep(inodedep)
 	struct inodedep *inodedep;
 {
 
-	rw_assert(&lk, RA_WLOCKED);
+	LOCK_OWNED(VFSTOUFS(inodedep->id_list.wk_mp));
 	if ((inodedep->id_state & (ONWORKLIST | UNLINKED)) != 0 ||
 	    (inodedep->id_state & ALLCOMPLETE) != ALLCOMPLETE ||
 	    !LIST_EMPTY(&inodedep->id_dirremhd) ||
@@ -7505,7 +7522,8 @@ freework_freeblock(freework)
 	int bsize;
 	int needj;
 
-	rw_assert(&lk, RA_WLOCKED);
+	ump = VFSTOUFS(freework->fw_list.wk_mp);
+	LOCK_OWNED(ump);
 	/*
 	 * Handle partial truncate separately.
 	 */
@@ -7514,7 +7532,6 @@ freework_freeblock(freework)
 		return;
 	}
 	freeblks = freework->fw_freeblks;
-	ump = VFSTOUFS(freeblks->fb_list.wk_mp);
 	fs = ump->um_fs;
 	needj = MOUNTEDSUJ(freeblks->fb_list.wk_mp) != 0;
 	bsize = lfragtosize(fs, freework->fw_frags);
@@ -7546,14 +7563,14 @@ freework_freeblock(freework)
 		freeblks->fb_cgwait++;
 		WORKLIST_INSERT(&wkhd, &freework->fw_list);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	freeblks_free(ump, freeblks, btodb(bsize));
 	CTR4(KTR_SUJ,
 	    "freework_freeblock: ino %d blkno %jd lbn %jd size %ld",
 	    freeblks->fb_inum, freework->fw_blkno, freework->fw_lbn, bsize);
 	ffs_blkfree(ump, fs, freeblks->fb_devvp, freework->fw_blkno, bsize,
 	    freeblks->fb_inum, freeblks->fb_vtype, &wkhd);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	/*
 	 * The jnewblk will be discarded and the bits in the map never
 	 * made it to disk.  We can immediately free the freeblk.
@@ -7609,10 +7626,10 @@ handle_workitem_indirblk(freework)
 		return;
 	}
 	freework->fw_state |= INPROGRESS;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	indir_trunc(freework, fsbtodb(fs, freework->fw_blkno),
 	    freework->fw_lbn);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 }
 
 /*
@@ -7668,7 +7685,7 @@ handle_workitem_freeblocks(freeblks, flags)
 	KASSERT(LIST_EMPTY(&freeblks->fb_jblkdephd),
 	    ("handle_workitem_freeblocks: Journal entries not written."));
 	ump = VFSTOUFS(freeblks->fb_list.wk_mp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	while ((wk = LIST_FIRST(&freeblks->fb_freeworkhd)) != NULL) {
 		WORKLIST_REMOVE(wk);
 		switch (wk->wk_type) {
@@ -7685,11 +7702,11 @@ handle_workitem_freeblocks(freeblks, flags)
 			aip = WK_ALLOCINDIR(wk);
 			freework = NULL;
 			if (aip->ai_state & DELAYEDFREE) {
-				FREE_LOCK(&lk);
+				FREE_LOCK(ump);
 				freework = newfreework(ump, freeblks, NULL,
 				    aip->ai_lbn, aip->ai_newblkno,
 				    ump->um_fs->fs_frag, 0, 0);
-				ACQUIRE_LOCK(&lk);
+				ACQUIRE_LOCK(ump);
 			}
 			newblk = WK_NEWBLK(wk);
 			if (newblk->nb_jnewblk) {
@@ -7717,7 +7734,7 @@ handle_workitem_freeblocks(freeblks, flags)
 		wake_worklist(&freeblks->fb_list);
 		freeblks = NULL;
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if (freeblks)
 		return handle_complete_freeblocks(freeblks, flags);
 	return (0);
@@ -7804,7 +7821,7 @@ handle_complete_freeblocks(freeblks, flags)
 		quotaadj(freeblks->fb_quota, ump, -spare);
 	quotarele(freeblks->fb_quota);
 #endif
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	if (freeblks->fb_state & ONDEPLIST) {
 		inodedep_lookup(freeblks->fb_list.wk_mp, freeblks->fb_inum,
 		    0, &inodedep);
@@ -7819,7 +7836,7 @@ handle_complete_freeblocks(freeblks, flags)
 	 */
 	handle_jwork(&freeblks->fb_jwork);
 	WORKITEM_FREE(freeblks, D_FREEBLKS);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	return (0);
 }
 
@@ -7898,7 +7915,7 @@ indir_trunc(freework, dbn, lbn)
 		brelse(bp);
 		return;
 	}
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	/* Protects against a race with complete_trunc_indir(). */
 	freework->fw_state &= ~INPROGRESS;
 	/*
@@ -7915,7 +7932,7 @@ indir_trunc(freework, dbn, lbn)
 			if (freework->fw_indir == NULL)
 				TAILQ_INSERT_TAIL(&indirdep->ir_trunc,
 				    freework, fw_next);
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			return;
 		}
 		/*
@@ -7924,10 +7941,10 @@ indir_trunc(freework, dbn, lbn)
 		 */
 		if (goingaway) {
 			free_indirdep(indirdep);
-			ump->um_numindirdeps -= 1;
+			ump->softdep_numindirdeps -= 1;
 		}
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	/* Initialize pointers depending on block size. */
 	if (ump->um_fstype == UFS1) {
 		bap1 = (ufs1_daddr_t *)bp->b_data;
@@ -8007,7 +8024,7 @@ indir_trunc(freework, dbn, lbn)
 	 * indirect can be completed when its children are free.
 	 */
 	if (needj) {
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		freework->fw_off = i;
 		freework->fw_ref += freedeps;
 		freework->fw_ref -= NINDIR(fs) + 1;
@@ -8015,7 +8032,7 @@ indir_trunc(freework, dbn, lbn)
 			freeblks->fb_cgwait += freedeps;
 		if (freework->fw_ref == 0)
 			freework_freeblock(freework);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		return;
 	}
 	/*
@@ -8030,9 +8047,9 @@ indir_trunc(freework, dbn, lbn)
 	/* Non SUJ softdep does single-threaded truncations. */
 	if (freework->fw_blkno == dbn) {
 		freework->fw_state |= ALLCOMPLETE;
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		handle_written_freework(freework);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 	}
 	return;
 }
@@ -8097,7 +8114,8 @@ cancel_allocindir(aip, bp, freeblks, trunc)
  * Create the mkdir dependencies for . and .. in a new directory.  Link them
  * in to a newdirblk so any subsequent additions are tracked properly.  The
  * caller is responsible for adding the mkdir1 dependency to the journal
- * and updating id_mkdiradd.  This function returns with lk held.
+ * and updating id_mkdiradd.  This function returns with the soft updates
+ * lock held.
  */
 static struct mkdir *
 setup_newdir(dap, newinum, dinum, newdirbp, mkdirp)
@@ -8114,9 +8132,11 @@ setup_newdir(dap, newinum, dinum, newdirbp, mkdirp)
 	struct mkdir *mkdir1, *mkdir2;
 	struct worklist *wk;
 	struct jaddref *jaddref;
+	struct ufsmount *ump;
 	struct mount *mp;
 
 	mp = dap->da_list.wk_mp;
+	ump = VFSTOUFS(mp);
 	newdirblk = malloc(sizeof(struct newdirblk), M_NEWDIRBLK,
 	    M_SOFTDEP_FLAGS);
 	workitem_alloc(&newdirblk->db_list, D_NEWDIRBLK, mp);
@@ -8139,8 +8159,8 @@ setup_newdir(dap, newinum, dinum, newdirbp, mkdirp)
 	 * Dependency on "." and ".." being written to disk.
 	 */
 	mkdir1->md_buf = newdirbp;
-	ACQUIRE_LOCK(&lk);
-	LIST_INSERT_HEAD(&mkdirlisthd, mkdir1, md_mkdirs);
+	ACQUIRE_LOCK(VFSTOUFS(mp));
+	LIST_INSERT_HEAD(&ump->softdep_mkdirlisthd, mkdir1, md_mkdirs);
 	/*
 	 * We must link the pagedep, allocdirect, and newdirblk for
 	 * the initial file page so the pointer to the new directory
@@ -8179,7 +8199,7 @@ setup_newdir(dap, newinum, dinum, newdirbp, mkdirp)
 		KASSERT(jaddref != NULL && jaddref->ja_parent == newinum &&
 		    (jaddref->ja_state & MKDIR_PARENT),
 		    ("setup_newdir: bad dotdot jaddref %p", jaddref));
-		LIST_INSERT_HEAD(&mkdirlisthd, mkdir2, md_mkdirs);
+		LIST_INSERT_HEAD(&ump->softdep_mkdirlisthd, mkdir2, md_mkdirs);
 		mkdir2->md_jaddref = jaddref;
 		jaddref->ja_mkdir = mkdir2;
 	} else if (inodedep == NULL ||
@@ -8188,7 +8208,7 @@ setup_newdir(dap, newinum, dinum, newdirbp, mkdirp)
 		WORKITEM_FREE(mkdir2, D_MKDIR);
 		mkdir2 = NULL;
 	} else {
-		LIST_INSERT_HEAD(&mkdirlisthd, mkdir2, md_mkdirs);
+		LIST_INSERT_HEAD(&ump->softdep_mkdirlisthd, mkdir2, md_mkdirs);
 		WORKLIST_INSERT(&inodedep->id_bufwait, &mkdir2->md_list);
 	}
 	*mkdirp = mkdir2;
@@ -8238,9 +8258,14 @@ softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
 	struct newdirblk *newdirblk = 0;
 	struct mkdir *mkdir1, *mkdir2;
 	struct jaddref *jaddref;
+	struct ufsmount *ump;
 	struct mount *mp;
 	int isindir;
 
+	ump = dp->i_ump;
+	mp = UFSTOVFS(ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_setup_directory_add called on non-softdep filesystem"));
 	/*
 	 * Whiteouts have no dependencies.
 	 */
@@ -8251,7 +8276,6 @@ softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
 	}
 	jaddref = NULL;
 	mkdir1 = mkdir2 = NULL;
-	mp = UFSTOVFS(dp->i_ump);
 	fs = dp->i_fs;
 	lbn = lblkno(fs, diroffset);
 	offset = blkoff(fs, diroffset);
@@ -8277,7 +8301,7 @@ softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
 	 */
 	if (newdirbp == NULL) {
 		dap->da_state |= DEPCOMPLETE;
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	} else {
 		dap->da_state |= MKDIR_BODY | MKDIR_PARENT;
 		mkdir1 = setup_newdir(dap, newinum, dp->i_number, newdirbp,
@@ -8360,7 +8384,7 @@ softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
 		 */
 		if ((pagedep->pd_state & NEWBLOCK) != 0) {
 			WORKITEM_FREE(newdirblk, D_NEWDIRBLK);
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			return (0);
 		}
 		if (newblk_lookup(mp, dbtofsb(fs, bp->b_blkno), 0, &newblk)
@@ -8370,7 +8394,7 @@ softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
 		pagedep->pd_state |= NEWBLOCK;
 		pagedep->pd_newdirblk = newdirblk;
 		newdirblk->db_pagedep = pagedep;
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		/*
 		 * If we extended into an indirect signal direnter to sync.
 		 */
@@ -8378,7 +8402,7 @@ softdep_setup_directory_add(bp, dp, diroffset, newinum, newdirbp, isnewblk)
 			return (1);
 		return (0);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	return (0);
 }
 
@@ -8408,6 +8432,9 @@ softdep_change_directoryentry_offset(bp, dp, base, oldloc, newloc, entrysize)
 	int flags;
 
 	mp = UFSTOVFS(dp->i_ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_change_directoryentry_offset called on "
+	     "non-softdep filesystem"));
 	de = (struct direct *)oldloc;
 	jmvref = NULL;
 	flags = 0;
@@ -8426,7 +8453,7 @@ softdep_change_directoryentry_offset(bp, dp, base, oldloc, newloc, entrysize)
 	offset = blkoff(dp->i_fs, dp->i_offset);
 	oldoffset = offset + (oldloc - base);
 	newoffset = offset + (newloc - base);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(dp->i_ump);
 	if (pagedep_lookup(mp, bp, dp->i_number, lbn, flags, &pagedep) == 0)
 		goto done;
 	dap = diradd_lookup(pagedep, oldoffset);
@@ -8448,7 +8475,7 @@ done:
 		add_to_journal(&jmvref->jm_list);
 	}
 	bcopy(oldloc, newloc, entrysize);
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -8464,13 +8491,16 @@ merge_diradd(inodedep, newdap)
 {
 	struct diradd *olddap;
 	struct mkdir *mkdir, *nextmd;
+	struct ufsmount *ump;
 	short state;
 
 	olddap = inodedep->id_mkdiradd;
 	inodedep->id_mkdiradd = newdap;
 	if ((olddap->da_state & (MKDIR_PARENT | MKDIR_BODY)) != 0) {
 		newdap->da_state &= ~DEPCOMPLETE;
-		for (mkdir = LIST_FIRST(&mkdirlisthd); mkdir; mkdir = nextmd) {
+		ump = VFSTOUFS(inodedep->id_list.wk_mp);
+		for (mkdir = LIST_FIRST(&ump->softdep_mkdirlisthd); mkdir;
+		     mkdir = nextmd) {
 			nextmd = LIST_NEXT(mkdir, md_mkdirs);
 			if (mkdir->md_diradd != olddap)
 				continue;
@@ -8529,6 +8559,7 @@ cancel_diradd(dap, dirrem, jremref, dotremref, dotdotremref)
 	struct inodedep *inodedep;
 	struct jaddref *jaddref;
 	struct inoref *inoref;
+	struct ufsmount *ump;
 	struct mkdir *mkdir;
 
 	/*
@@ -8565,7 +8596,8 @@ cancel_diradd(dap, dirrem, jremref, dotremref, dotdotremref)
 	 * journaling.
 	 */
 	if ((dap->da_state & (MKDIR_PARENT | MKDIR_BODY)) != 0) {
-		LIST_FOREACH(mkdir, &mkdirlisthd, md_mkdirs) {
+		ump = VFSTOUFS(dap->da_list.wk_mp);
+		LIST_FOREACH(mkdir, &ump->softdep_mkdirlisthd, md_mkdirs) {
 			if (mkdir->md_diradd != dap)
 				continue;
 			if ((jaddref = mkdir->md_jaddref) == NULL)
@@ -8610,8 +8642,10 @@ free_diradd(dap, wkhd)
 	struct pagedep *pagedep;
 	struct inodedep *inodedep;
 	struct mkdir *mkdir, *nextmd;
+	struct ufsmount *ump;
 
-	rw_assert(&lk, RA_WLOCKED);
+	ump = VFSTOUFS(dap->da_list.wk_mp);
+	LOCK_OWNED(ump);
 	LIST_REMOVE(dap, da_pdlist);
 	if (dap->da_state & ONWORKLIST)
 		WORKLIST_REMOVE(&dap->da_list);
@@ -8630,7 +8664,8 @@ free_diradd(dap, wkhd)
 		if (inodedep->id_mkdiradd == dap)
 			inodedep->id_mkdiradd = NULL;
 	if ((dap->da_state & (MKDIR_PARENT | MKDIR_BODY)) != 0) {
-		for (mkdir = LIST_FIRST(&mkdirlisthd); mkdir; mkdir = nextmd) {
+		for (mkdir = LIST_FIRST(&ump->softdep_mkdirlisthd); mkdir;
+		     mkdir = nextmd) {
 			nextmd = LIST_NEXT(mkdir, md_mkdirs);
 			if (mkdir->md_diradd != dap)
 				continue;
@@ -8685,6 +8720,8 @@ softdep_setup_remove(bp, dp, ip, isrmdir)
 	struct inodedep *inodedep;
 	int direct;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ip->i_ump)) != 0,
+	    ("softdep_setup_remove called on non-softdep filesystem"));
 	/*
 	 * Allocate a new dirrem if appropriate and ACQUIRE_LOCK.  We want
 	 * newdirrem() to setup the full directory remove which requires
@@ -8716,14 +8753,14 @@ softdep_setup_remove(bp, dp, ip, isrmdir)
 	if ((dirrem->dm_state & COMPLETE) == 0) {
 		LIST_INSERT_HEAD(&dirrem->dm_pagedep->pd_dirremhd, dirrem,
 		    dm_next);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ip->i_ump);
 	} else {
 		if (prevdirrem != NULL)
 			LIST_INSERT_HEAD(&dirrem->dm_pagedep->pd_dirremhd,
 			    prevdirrem, dm_next);
 		dirrem->dm_dirinum = dirrem->dm_pagedep->pd_ino;
 		direct = LIST_EMPTY(&dirrem->dm_jremrefhd);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ip->i_ump);
 		if (direct)
 			handle_workitem_remove(dirrem, 0);
 	}
@@ -8795,6 +8832,7 @@ cancel_mkdir_dotdot(ip, dirrem, jremref)
 {
 	struct inodedep *inodedep;
 	struct jaddref *jaddref;
+	struct ufsmount *ump;
 	struct mkdir *mkdir;
 	struct diradd *dap;
 
@@ -8804,7 +8842,8 @@ cancel_mkdir_dotdot(ip, dirrem, jremref)
 	dap = inodedep->id_mkdiradd;
 	if (dap == NULL || (dap->da_state & MKDIR_PARENT) == 0)
 		return (jremref);
-	for (mkdir = LIST_FIRST(&mkdirlisthd); mkdir;
+	ump = VFSTOUFS(inodedep->id_list.wk_mp);
+	for (mkdir = LIST_FIRST(&ump->softdep_mkdirlisthd); mkdir;
 	    mkdir = LIST_NEXT(mkdir, md_mkdirs))
 		if (mkdir->md_diradd == dap && mkdir->md_state & MKDIR_PARENT)
 			break;
@@ -8897,10 +8936,10 @@ newdirrem(bp, dp, ip, isrmdir, prevdirremp)
 	 * Limiting the number of dirrem structures will also limit
 	 * the number of freefile and freeblks structures.
 	 */
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	if (!IS_SNAPSHOT(ip) && dep_current[D_DIRREM] > max_softdeps / 2)
 		(void) request_cleanup(ITOV(dp)->v_mount, FLUSH_BLOCKS);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 	dirrem = malloc(sizeof(struct dirrem),
 		M_DIRREM, M_SOFTDEP_FLAGS|M_ZERO);
 	workitem_alloc(&dirrem->dm_list, D_DIRREM, dvp->v_mount);
@@ -8930,7 +8969,7 @@ newdirrem(bp, dp, ip, isrmdir, prevdirremp)
 			jremref = newjremref(dirrem, dp, ip, dp->i_offset,
 			    ip->i_effnlink + 1);
 	}
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	lbn = lblkno(dp->i_fs, dp->i_offset);
 	offset = blkoff(dp->i_fs, dp->i_offset);
 	pagedep_lookup(UFSTOVFS(dp->i_ump), bp, dp->i_number, lbn, DEPALLOC,
@@ -9043,6 +9082,8 @@ softdep_setup_directory_change(bp, dp, ip, newinum, isrmdir)
 
 	offset = blkoff(dp->i_fs, dp->i_offset);
 	mp = UFSTOVFS(dp->i_ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	   ("softdep_setup_directory_change called on non-softdep filesystem"));
 
 	/*
 	 * Whiteouts do not need diradd dependencies.
@@ -9090,7 +9131,7 @@ softdep_setup_directory_change(bp, dp, ip, newinum, isrmdir)
 			if (LIST_EMPTY(&dirrem->dm_jremrefhd))
 				add_to_worklist(&dirrem->dm_list, 0);
 		}
-		FREE_LOCK(&lk);
+		FREE_LOCK(dp->i_ump);
 		return;
 	}
 	/*
@@ -9164,7 +9205,7 @@ softdep_setup_directory_change(bp, dp, ip, newinum, isrmdir)
 	 */
 	if (inodedep->id_mkdiradd && dp->i_offset != DOTDOT_OFFSET)
 		merge_diradd(inodedep, dap);
-	FREE_LOCK(&lk);
+	FREE_LOCK(dp->i_ump);
 }
 
 /*
@@ -9180,7 +9221,9 @@ softdep_change_linkcnt(ip)
 	struct inodedep *inodedep;
 	int dflags;
 
-	ACQUIRE_LOCK(&lk);
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ip->i_ump)) != 0,
+	    ("softdep_change_linkcnt called on non-softdep filesystem"));
+	ACQUIRE_LOCK(ip->i_ump);
 	dflags = DEPALLOC;
 	if (IS_SNAPSHOT(ip))
 		dflags |= NODELAY;
@@ -9188,7 +9231,7 @@ softdep_change_linkcnt(ip)
 	if (ip->i_nlink < ip->i_effnlink)
 		panic("softdep_change_linkcnt: bad delta");
 	inodedep->id_nlinkdelta = ip->i_nlink - ip->i_effnlink;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 }
 
 /*
@@ -9204,8 +9247,8 @@ softdep_setup_sbupdate(ump, fs, bp)
 	struct sbdep *sbdep;
 	struct worklist *wk;
 
-	if (MOUNTEDSUJ(UFSTOVFS(ump)) == 0)
-		return;
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ump)) != 0,
+	    ("softdep_setup_sbupdate called on non-softdep filesystem"));
 	LIST_FOREACH(wk, &bp->b_dep, wk_list)
 		if (wk->wk_type == D_SBDEP)
 			break;
@@ -9215,9 +9258,9 @@ softdep_setup_sbupdate(ump, fs, bp)
 	workitem_alloc(&sbdep->sb_list, D_SBDEP, UFSTOVFS(ump));
 	sbdep->sb_fs = fs;
 	sbdep->sb_ump = ump;
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	WORKLIST_INSERT(&bp->b_dep, &sbdep->sb_list);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
 /*
@@ -9231,7 +9274,7 @@ first_unlinked_inodedep(ump)
 	struct inodedep *inodedep;
 	struct inodedep *idp;
 
-	rw_assert(&lk, RA_WLOCKED);
+	LOCK_OWNED(ump);
 	for (inodedep = TAILQ_LAST(&ump->softdep_unlinked, inodedeplst);
 	    inodedep; inodedep = idp) {
 		if ((inodedep->id_state & UNLINKNEXT) == 0)
@@ -9280,7 +9323,7 @@ handle_written_sbdep(sbdep, bp)
 	struct mount *mp;
 	struct fs *fs;
 
-	rw_assert(&lk, RA_WLOCKED);
+	LOCK_OWNED(sbdep->sb_ump);
 	fs = sbdep->sb_fs;
 	mp = UFSTOVFS(sbdep->sb_ump);
 	/*
@@ -9322,10 +9365,10 @@ unlinked_inodedep(mp, inodedep)
 {
 	struct ufsmount *ump;
 
-	rw_assert(&lk, RA_WLOCKED);
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	if (MOUNTEDSUJ(mp) == 0)
 		return;
-	ump = VFSTOUFS(mp);
 	ump->um_fs->fs_fmod = 1;
 	if (inodedep->id_state & UNLINKED)
 		panic("unlinked_inodedep: %p already unlinked\n", inodedep);
@@ -9356,7 +9399,7 @@ clear_unlinked_inodedep(inodedep)
 	ino = inodedep->id_ino;
 	error = 0;
 	for (;;) {
-		rw_assert(&lk, RA_WLOCKED);
+		LOCK_OWNED(ump);
 		KASSERT((inodedep->id_state & UNLINKED) != 0,
 		    ("clear_unlinked_inodedep: inodedep %p not unlinked",
 		    inodedep));
@@ -9394,7 +9437,7 @@ clear_unlinked_inodedep(inodedep)
 		pino = 0;
 		if (idp && (idp->id_state & UNLINKNEXT))
 			pino = idp->id_ino;
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		if (pino == 0) {
 			bp = getblk(ump->um_devvp, btodb(fs->fs_sblockloc),
 			    (int)fs->fs_sbsize, 0, 0, 0);
@@ -9405,7 +9448,7 @@ clear_unlinked_inodedep(inodedep)
 			if (error)
 				brelse(bp);
 		}
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		if (error)
 			break;
 		/* If the list has changed restart the loop. */
@@ -9415,9 +9458,9 @@ clear_unlinked_inodedep(inodedep)
 			nino = idp->id_ino;
 		if (nino != pino ||
 		    (inodedep->id_state & UNLINKPREV) != UNLINKPREV) {
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			brelse(bp);
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			continue;
 		}
 		nino = 0;
@@ -9433,7 +9476,7 @@ clear_unlinked_inodedep(inodedep)
 		    inodedep));
 		inodedep->id_state &= ~(UNLINKED | UNLINKLINKS | UNLINKONLIST);
 		TAILQ_REMOVE(&ump->softdep_unlinked, inodedep, id_unlinked);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		/*
 		 * The predecessor's next pointer is manually updated here
 		 * so that the NEXT flag is never cleared for an element
@@ -9455,13 +9498,13 @@ clear_unlinked_inodedep(inodedep)
 		 * filesystem is corrupted already.
 		 */
 		bwrite(bp);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		/*
 		 * If the superblock pointer still needs to be cleared force
 		 * a write here.
 		 */
 		if (fs->fs_sujfree == ino) {
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			bp = getblk(ump->um_devvp, btodb(fs->fs_sblockloc),
 			    (int)fs->fs_sbsize, 0, 0, 0);
 			bcopy((caddr_t)fs, bp->b_data, (u_int)fs->fs_sbsize);
@@ -9469,7 +9512,7 @@ clear_unlinked_inodedep(inodedep)
 			softdep_setup_sbupdate(ump, (struct fs *)bp->b_data,
 			    bp);
 			bwrite(bp);
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 		}
 
 		if (fs->fs_sujfree != ino)
@@ -9511,7 +9554,7 @@ handle_workitem_remove(dirrem, flags)
 	if (ffs_vgetf(mp, oldinum, flags, &vp, FFSV_FORCEINSMQ) != 0)
 		return (EBUSY);
 	ip = VTOI(vp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	if ((inodedep_lookup(mp, oldinum, 0, &inodedep)) == 0)
 		panic("handle_workitem_remove: lost inodedep");
 	if (dirrem->dm_state & ONDEPLIST)
@@ -9553,7 +9596,7 @@ handle_workitem_remove(dirrem, flags)
 		    ("handle_workitem_remove: worklist not empty. %s",
 		    TYPENAME(LIST_FIRST(&dirrem->dm_jwork)->wk_type)));
 		WORKITEM_FREE(dirrem, D_DIRREM);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		goto out;
 	}
 	/*
@@ -9579,7 +9622,7 @@ handle_workitem_remove(dirrem, flags)
 		KASSERT(LIST_EMPTY(&dirrem->dm_jwork),
 		    ("handle_workitem_remove: DIRCHG and worklist not empty."));
 		WORKITEM_FREE(dirrem, D_DIRREM);
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		goto out;
 	}
 	dirrem->dm_state = ONDEPLIST;
@@ -9600,12 +9643,12 @@ handle_workitem_remove(dirrem, flags)
 	if (inodedep == NULL ||
 	    (inodedep->id_state & (DEPCOMPLETE | UNLINKED)) == UNLINKED ||
 	    check_inode_unwritten(inodedep)) {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		vput(vp);
 		return handle_workitem_remove(dirrem, flags);
 	}
 	WORKLIST_INSERT(&inodedep->id_inowait, &dirrem->dm_list);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	ip->i_flag |= IN_CHANGE;
 out:
 	ffs_update(vp, 0);
@@ -9640,9 +9683,9 @@ handle_workitem_freefile(freefile)
 	ump = VFSTOUFS(freefile->fx_list.wk_mp);
 	fs = ump->um_fs;
 #ifdef DEBUG
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	error = inodedep_lookup(UFSTOVFS(ump), freefile->fx_oldinum, 0, &idp);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if (error)
 		panic("handle_workitem_freefile: inodedep %p survived", idp);
 #endif
@@ -9654,9 +9697,9 @@ handle_workitem_freefile(freefile)
 	if ((error = ffs_freefile(ump, fs, freefile->fx_devvp,
 	    freefile->fx_oldinum, freefile->fx_mode, &wkhd)) != 0)
 		softdep_error("handle_workitem_freefile", error);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	WORKITEM_FREE(freefile, D_FREEFILE);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
 
@@ -9706,6 +9749,7 @@ softdep_disk_io_initiation(bp)
 	struct freeblks *freeblks;
 	struct jblkdep *jblkdep;
 	struct newblk *newblk;
+	struct ufsmount *ump;
 
 	/*
 	 * We only care about write operations. There should never
@@ -9718,10 +9762,13 @@ softdep_disk_io_initiation(bp)
 		panic("softdep_disk_io_initiation: Writing buffer with "
 		    "background write in progress: %p", bp);
 
+	if ((wk = LIST_FIRST(&bp->b_dep)) == NULL)
+		return;
+	ump = VFSTOUFS(wk->wk_mp);
+
 	marker.wk_type = D_LAST + 1;	/* Not a normal workitem */
 	PHOLD(curproc);			/* Don't swap out kernel stack */
-
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	/*
 	 * Do any necessary pre-I/O processing.
 	 */
@@ -9805,7 +9852,7 @@ softdep_disk_io_initiation(bp)
 			/* NOTREACHED */
 		}
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	PRELE(curproc);			/* Allow swapout of kernel stack */
 }
 
@@ -9841,8 +9888,8 @@ initiate_write_filepage(pagedep, bp)
 	 * Wait for all journal remove dependencies to hit the disk.
 	 * We can not allow any potentially conflicting directory adds
 	 * to be visible before removes and rollback is too difficult.
-	 * lk may be dropped and re-acquired, however we hold the buf
-	 * locked so the dependency can not go away.
+	 * The soft updates lock may be dropped and re-acquired, however 
+	 * we hold the buf locked so the dependency can not go away.
 	 */
 	LIST_FOREACH(dirrem, &pagedep->pd_dirremhd, dm_next)
 		while ((jremref = LIST_FIRST(&dirrem->dm_jremrefhd)) != NULL)
@@ -9887,6 +9934,7 @@ initiate_write_inodeblock_ufs1(inodedep, bp)
 	struct ufs1_dinode *dp;
 	struct ufs1_dinode *sip;
 	struct inoref *inoref;
+	struct ufsmount *ump;
 	struct fs *fs;
 	ufs_lbn_t i;
 #ifdef INVARIANTS
@@ -9898,6 +9946,8 @@ initiate_write_inodeblock_ufs1(inodedep, bp)
 		panic("initiate_write_inodeblock_ufs1: already started");
 	inodedep->id_state |= IOSTARTED;
 	fs = inodedep->id_fs;
+	ump = VFSTOUFS(inodedep->id_list.wk_mp);
+	LOCK_OWNED(ump);
 	dp = (struct ufs1_dinode *)bp->b_data +
 	    ino_to_fsbo(fs, inodedep->id_ino);
 
@@ -9918,10 +9968,10 @@ initiate_write_inodeblock_ufs1(inodedep, bp)
 	if ((inodedep->id_state & DEPCOMPLETE) == 0) {
 		if (inodedep->id_savedino1 != NULL)
 			panic("initiate_write_inodeblock_ufs1: I/O underway");
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		sip = malloc(sizeof(struct ufs1_dinode),
 		    M_SAVEDINO, M_SOFTDEP_FLAGS);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		inodedep->id_savedino1 = sip;
 		*inodedep->id_savedino1 = *dp;
 		bzero((caddr_t)dp, sizeof(struct ufs1_dinode));
@@ -10054,6 +10104,7 @@ initiate_write_inodeblock_ufs2(inodedep, bp)
 	struct ufs2_dinode *dp;
 	struct ufs2_dinode *sip;
 	struct inoref *inoref;
+	struct ufsmount *ump;
 	struct fs *fs;
 	ufs_lbn_t i;
 #ifdef INVARIANTS
@@ -10065,6 +10116,8 @@ initiate_write_inodeblock_ufs2(inodedep, bp)
 		panic("initiate_write_inodeblock_ufs2: already started");
 	inodedep->id_state |= IOSTARTED;
 	fs = inodedep->id_fs;
+	ump = VFSTOUFS(inodedep->id_list.wk_mp);
+	LOCK_OWNED(ump);
 	dp = (struct ufs2_dinode *)bp->b_data +
 	    ino_to_fsbo(fs, inodedep->id_ino);
 
@@ -10085,10 +10138,10 @@ initiate_write_inodeblock_ufs2(inodedep, bp)
 	if ((inodedep->id_state & DEPCOMPLETE) == 0) {
 		if (inodedep->id_savedino2 != NULL)
 			panic("initiate_write_inodeblock_ufs2: I/O underway");
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		sip = malloc(sizeof(struct ufs2_dinode),
 		    M_SAVEDINO, M_SOFTDEP_FLAGS);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		inodedep->id_savedino2 = sip;
 		*inodedep->id_savedino2 = *dp;
 		bzero((caddr_t)dp, sizeof(struct ufs2_dinode));
@@ -10299,7 +10352,7 @@ cancel_indirdep(indirdep, bp, freeblks)
 		LIST_REMOVE(indirdep, ir_next);
 	}
 	indirdep->ir_state |= GOINGAWAY;
-	VFSTOUFS(indirdep->ir_list.wk_mp)->um_numindirdeps += 1;
+	VFSTOUFS(indirdep->ir_list.wk_mp)->softdep_numindirdeps += 1;
 	/*
 	 * Pass in bp for blocks still have journal writes
 	 * pending so we can cancel them on their own.
@@ -10365,6 +10418,7 @@ initiate_write_indirdep(indirdep, bp)
 	struct indirdep *indirdep;
 	struct buf *bp;
 {
+	struct ufsmount *ump;
 
 	indirdep->ir_state |= IOSTARTED;
 	if (indirdep->ir_state & GOINGAWAY)
@@ -10380,10 +10434,12 @@ initiate_write_indirdep(indirdep, bp)
 	 * Replace up-to-date version with safe version.
 	 */
 	if (indirdep->ir_saveddata == NULL) {
-		FREE_LOCK(&lk);
+		ump = VFSTOUFS(indirdep->ir_list.wk_mp);
+		LOCK_OWNED(ump);
+		FREE_LOCK(ump);
 		indirdep->ir_saveddata = malloc(bp->b_bcount, M_INDIRDEP,
 		    M_SOFTDEP_FLAGS);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	}
 	indirdep->ir_state &= ~ATTACHED;
 	indirdep->ir_state |= UNDONE;
@@ -10405,12 +10461,16 @@ softdep_setup_inofree(mp, bp, ino, wkhd)
 {
 	struct worklist *wk, *wkn;
 	struct inodedep *inodedep;
+	struct ufsmount *ump;
 	uint8_t *inosused;
 	struct cg *cgp;
 	struct fs *fs;
 
-	ACQUIRE_LOCK(&lk);
-	fs = VFSTOUFS(mp)->um_fs;
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_setup_inofree called on non-softdep filesystem"));
+	ump = VFSTOUFS(mp);
+	ACQUIRE_LOCK(ump);
+	fs = ump->um_fs;
 	cgp = (struct cg *)bp->b_data;
 	inosused = cg_inosused(cgp);
 	if (isset(inosused, ino % fs->fs_ipg))
@@ -10434,7 +10494,7 @@ softdep_setup_inofree(mp, bp, ino, wkhd)
 		}
 		jwork_move(&bp->b_dep, wkhd);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
 
@@ -10454,6 +10514,7 @@ softdep_setup_blkfree(mp, bp, blkno, frags, wkhd)
 {
 	struct bmsafemap *bmsafemap;
 	struct jnewblk *jnewblk;
+	struct ufsmount *ump;
 	struct worklist *wk;
 	struct fs *fs;
 #ifdef SUJ_DEBUG
@@ -10470,9 +10531,12 @@ softdep_setup_blkfree(mp, bp, blkno, frags, wkhd)
 	    "softdep_setup_blkfree: blkno %jd frags %d wk head %p",
 	    blkno, frags, wkhd);
 
-	ACQUIRE_LOCK(&lk);
+	ump = VFSTOUFS(mp);
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ump)) != 0,
+	    ("softdep_setup_blkfree called on non-softdep filesystem"));
+	ACQUIRE_LOCK(ump);
 	/* Lookup the bmsafemap so we track when it is dirty. */
-	fs = VFSTOUFS(mp)->um_fs;
+	fs = ump->um_fs;
 	bmsafemap = bmsafemap_lookup(mp, bp, dtog(fs, blkno), NULL);
 	/*
 	 * Detach any jnewblks which have been canceled.  They must linger
@@ -10546,14 +10610,14 @@ softdep_setup_blkfree(mp, bp, blkno, frags, wkhd)
 		}
 	}
 #endif
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
 /*
  * Revert a block allocation when the journal record that describes it
  * is not yet written.
  */
-int
+static int
 jnewblk_rollback(jnewblk, fs, cgp, blksfree)
 	struct jnewblk *jnewblk;
 	struct fs *fs;
@@ -10692,6 +10756,7 @@ softdep_disk_write_complete(bp)
 {
 	struct worklist *wk;
 	struct worklist *owk;
+	struct ufsmount *ump;
 	struct workhead reattach;
 	struct freeblks *freeblks;
 	struct buf *sbp;
@@ -10702,13 +10767,16 @@ softdep_disk_write_complete(bp)
 	 */
 	if ((bp->b_ioflags & BIO_ERROR) != 0 && (bp->b_flags & B_INVAL) == 0)
 		return;
+	if ((wk = LIST_FIRST(&bp->b_dep)) == NULL)
+		return;
+	ump = VFSTOUFS(wk->wk_mp);
 	LIST_INIT(&reattach);
 	/*
 	 * This lock must not be released anywhere in this code segment.
 	 */
 	sbp = NULL;
 	owk = NULL;
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	while ((wk = LIST_FIRST(&bp->b_dep)) != NULL) {
 		WORKLIST_REMOVE(wk);
 		dep_write[wk->wk_type]++;
@@ -10793,7 +10861,7 @@ softdep_disk_write_complete(bp)
 		WORKLIST_REMOVE(wk);
 		WORKLIST_INSERT(&bp->b_dep, wk);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if (sbp)
 		brelse(sbp);
 }
@@ -11393,8 +11461,8 @@ diradd_inode_written(dap, inodedep)
 }
 
 /*
- * Returns true if the bmsafemap will have rollbacks when written.  Must
- * only be called with lk and the buf lock on the cg held.
+ * Returns true if the bmsafemap will have rollbacks when written.  Must only
+ * be called with the soft updates lock and the buf lock on the cg held.
  */
 static int
 bmsafemap_backgroundwrite(bmsafemap, bp)
@@ -11403,6 +11471,7 @@ bmsafemap_backgroundwrite(bmsafemap, bp)
 {
 	int dirty;
 
+	LOCK_OWNED(VFSTOUFS(bmsafemap->sm_list.wk_mp));
 	dirty = !LIST_EMPTY(&bmsafemap->sm_jaddrefhd) | 
 	    !LIST_EMPTY(&bmsafemap->sm_jnewblkhd);
 	/*
@@ -11759,18 +11828,20 @@ softdep_load_inodeblock(ip)
 {
 	struct inodedep *inodedep;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ip->i_ump)) != 0,
+	    ("softdep_load_inodeblock called on non-softdep filesystem"));
 	/*
 	 * Check for alternate nlink count.
 	 */
 	ip->i_effnlink = ip->i_nlink;
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	if (inodedep_lookup(UFSTOVFS(ip->i_ump), ip->i_number, 0,
 	    &inodedep) == 0) {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ip->i_ump);
 		return;
 	}
 	ip->i_effnlink -= inodedep->id_nlinkdelta;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 }
 
 /*
@@ -11791,13 +11862,17 @@ softdep_update_inodeblock(ip, bp, waitfor)
 {
 	struct inodedep *inodedep;
 	struct inoref *inoref;
+	struct ufsmount *ump;
 	struct worklist *wk;
 	struct mount *mp;
 	struct buf *ibp;
 	struct fs *fs;
 	int error;
 
-	mp = UFSTOVFS(ip->i_ump);
+	ump = ip->i_ump;
+	mp = UFSTOVFS(ump);
+	KASSERT(MOUNTEDSOFTDEP(mp) != 0,
+	    ("softdep_update_inodeblock called on non-softdep filesystem"));
 	fs = ip->i_fs;
 	/*
 	 * Preserve the freelink that is on disk.  clear_unlinked_inodedep()
@@ -11817,10 +11892,10 @@ softdep_update_inodeblock(ip, bp, waitfor)
 	 * if there is no existing inodedep, then there are no dependencies
 	 * to track.
 	 */
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 again:
 	if (inodedep_lookup(mp, ip->i_number, 0, &inodedep) == 0) {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		if (ip->i_effnlink != ip->i_nlink)
 			panic("softdep_update_inodeblock: bad link count");
 		return;
@@ -11879,16 +11954,16 @@ again:
 	 * to be written so that the update can be done.
 	 */
 	if (waitfor == 0) {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		return;
 	}
 retry:
 	if ((inodedep->id_state & (DEPCOMPLETE | GOINGAWAY)) != 0) {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		return;
 	}
 	ibp = inodedep->id_bmsafemap->sm_buf;
-	ibp = getdirtybuf(ibp, &lk, MNT_WAIT);
+	ibp = getdirtybuf(ibp, LOCK_PTR(ump), MNT_WAIT);
 	if (ibp == NULL) {
 		/*
 		 * If ibp came back as NULL, the dependency could have been
@@ -11897,10 +11972,10 @@ retry:
 		 */
 		if (inodedep_lookup(mp, ip->i_number, 0, &inodedep) != 0)
 			goto retry;
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		return;
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if ((error = bwrite(ibp)) != 0)
 		softdep_error("softdep_update_inodeblock: bwrite", error);
 }
@@ -11949,6 +12024,7 @@ softdep_fsync(vp)
 	struct inodedep *inodedep;
 	struct pagedep *pagedep;
 	struct inoref *inoref;
+	struct ufsmount *ump;
 	struct worklist *wk;
 	struct diradd *dap;
 	struct mount *mp;
@@ -11963,11 +12039,14 @@ softdep_fsync(vp)
 
 	ip = VTOI(vp);
 	fs = ip->i_fs;
+	ump = ip->i_ump;
 	mp = vp->v_mount;
-	ACQUIRE_LOCK(&lk);
+	if (MOUNTEDSOFTDEP(mp) == 0)
+		return (0);
+	ACQUIRE_LOCK(ump);
 restart:
 	if (inodedep_lookup(mp, ip->i_number, 0, &inodedep) == 0) {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		return (0);
 	}
 	TAILQ_FOREACH(inoref, &inodedep->id_inoreflst, if_deps) {
@@ -12025,7 +12104,7 @@ restart:
 		 * the lock on our parent. See the comment in ufs_lookup
 		 * for details on possible races.
 		 */
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		if (ffs_vgetf(mp, parentino, LK_NOWAIT | LK_EXCLUSIVE, &pvp,
 		    FFSV_FORCEINSMQ)) {
 			error = vfs_busy(mp, MBF_NOWAIT);
@@ -12070,7 +12149,7 @@ restart:
 				vput(pvp);
 				return (error);
 			}
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			locked = 1;
 			if (inodedep_lookup(mp, ip->i_number, 0, &inodedep) != 0) {
 				if ((wk = LIST_FIRST(&inodedep->id_pendinghd)) != NULL) {
@@ -12083,7 +12162,7 @@ restart:
 					else
 						pagedep = dap->da_pagedep;
 					pagedep_new_block = pagedep->pd_state & NEWBLOCK;
-					FREE_LOCK(&lk);
+					FREE_LOCK(ump);
 					locked = 0;
 					if (pagedep_new_block && (error =
 					    ffs_syncvnode(pvp, MNT_WAIT, 0))) {
@@ -12093,7 +12172,7 @@ restart:
 				}
 			}
 			if (locked)
-				FREE_LOCK(&lk);
+				FREE_LOCK(ump);
 		}
 		/*
 		 * Flush directory page containing the inode's name.
@@ -12107,11 +12186,11 @@ restart:
 		vput(pvp);
 		if (error != 0)
 			return (error);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		if (inodedep_lookup(mp, ip->i_number, 0, &inodedep) == 0)
 			break;
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	return (0);
 }
 
@@ -12135,7 +12214,6 @@ softdep_fsync_mountdev(vp)
 	bo = &vp->v_bufobj;
 restart:
 	BO_LOCK(bo);
-	ACQUIRE_LOCK(&lk);
 	TAILQ_FOREACH_SAFE(bp, &bo->bo_dirty.bv_hd, b_bobufs, nbp) {
 		/* 
 		 * If it is already scheduled, skip to the next buffer.
@@ -12155,13 +12233,11 @@ restart:
 			BUF_UNLOCK(bp);
 			continue;
 		}
-		FREE_LOCK(&lk);
 		BO_UNLOCK(bo);
 		bremfree(bp);
 		(void) bawrite(bp);
 		goto restart;
 	}
-	FREE_LOCK(&lk);
 	drain_output(vp);
 	BO_UNLOCK(bo);
 }
@@ -12187,7 +12263,7 @@ sync_cgs(mp, waitfor)
 	sentinel->sm_cg = -1;
 	ump = VFSTOUFS(mp);
 	error = 0;
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	LIST_INSERT_HEAD(&ump->softdep_dirtycg, sentinel, sm_next);
 	for (bmsafemap = LIST_NEXT(sentinel, sm_next); bmsafemap != NULL;
 	    bmsafemap = LIST_NEXT(sentinel, sm_next)) {
@@ -12203,24 +12279,24 @@ sync_cgs(mp, waitfor)
 		 * If we don't get the lock and we're waiting try again, if
 		 * not move on to the next buf and try to sync it.
 		 */
-		bp = getdirtybuf(bmsafemap->sm_buf, &lk, waitfor);
+		bp = getdirtybuf(bmsafemap->sm_buf, LOCK_PTR(ump), waitfor);
 		if (bp == NULL && waitfor == MNT_WAIT)
 			continue;
 		LIST_REMOVE(sentinel, sm_next);
 		LIST_INSERT_AFTER(bmsafemap, sentinel, sm_next);
 		if (bp == NULL)
 			continue;
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		if (waitfor == MNT_NOWAIT)
 			bawrite(bp);
 		else
 			error = bwrite(bp);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		if (error)
 			break;
 	}
 	LIST_REMOVE(sentinel, sm_next);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	free(sentinel, M_BMSAFEMAP);
 	return (error);
 }
@@ -12233,25 +12309,29 @@ sync_cgs(mp, waitfor)
 int
 softdep_sync_metadata(struct vnode *vp)
 {
+	struct inode *ip;
 	int error;
 
+	ip = VTOI(vp);
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ip->i_ump)) != 0,
+	    ("softdep_sync_metadata called on non-softdep filesystem"));
 	/*
 	 * Ensure that any direct block dependencies have been cleared,
 	 * truncations are started, and inode references are journaled.
 	 */
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ip->i_ump);
 	/*
 	 * Write all journal records to prevent rollbacks on devvp.
 	 */
 	if (vp->v_type == VCHR)
 		softdep_flushjournal(vp->v_mount);
-	error = flush_inodedep_deps(vp, vp->v_mount, VTOI(vp)->i_number);
+	error = flush_inodedep_deps(vp, vp->v_mount, ip->i_number);
 	/*
 	 * Ensure that all truncates are written so we won't find deps on
 	 * indirect blocks.
 	 */
 	process_truncates(vp);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ip->i_ump);
 
 	return (error);
 }
@@ -12270,10 +12350,13 @@ softdep_sync_buf(struct vnode *vp, struct buf *bp, int waitfor)
 	struct pagedep *pagedep;
 	struct allocindir *aip;
 	struct newblk *newblk;
+	struct ufsmount *ump;
 	struct buf *nbp;
 	struct worklist *wk;
 	int i, error;
 
+	KASSERT(MOUNTEDSOFTDEP(vp->v_mount) != 0,
+	    ("softdep_sync_buf called on non-softdep filesystem"));
 	/*
 	 * For VCHR we just don't want to force flush any dependencies that
 	 * will cause rollbacks.
@@ -12283,7 +12366,8 @@ softdep_sync_buf(struct vnode *vp, struct buf *bp, int waitfor)
 			return (EBUSY);
 		return (0);
 	}
-	ACQUIRE_LOCK(&lk);
+	ump = VTOI(vp)->i_ump;
+	ACQUIRE_LOCK(ump);
 	/*
 	 * As we hold the buffer locked, none of its dependencies
 	 * will disappear.
@@ -12308,13 +12392,13 @@ top:
 			    waitfor == MNT_NOWAIT)
 				continue;
 			nbp = newblk->nb_bmsafemap->sm_buf;
-			nbp = getdirtybuf(nbp, &lk, waitfor);
+			nbp = getdirtybuf(nbp, LOCK_PTR(ump), waitfor);
 			if (nbp == NULL)
 				goto top;
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			if ((error = bwrite(nbp)) != 0)
 				goto out;
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			continue;
 
 		case D_INDIRDEP:
@@ -12339,13 +12423,13 @@ top:
 				if (newblk->nb_state & DEPCOMPLETE)
 					continue;
 				nbp = newblk->nb_bmsafemap->sm_buf;
-				nbp = getdirtybuf(nbp, &lk, waitfor);
+				nbp = getdirtybuf(nbp, LOCK_PTR(ump), waitfor);
 				if (nbp == NULL)
 					goto restart;
-				FREE_LOCK(&lk);
+				FREE_LOCK(ump);
 				if ((error = bwrite(nbp)) != 0)
 					goto out;
-				ACQUIRE_LOCK(&lk);
+				ACQUIRE_LOCK(ump);
 				goto restart;
 			}
 			continue;
@@ -12396,7 +12480,7 @@ top:
 		}
 	}
 out_unlock:
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 out:
 	return (error);
 }
@@ -12413,6 +12497,7 @@ flush_inodedep_deps(vp, mp, ino)
 {
 	struct inodedep *inodedep;
 	struct inoref *inoref;
+	struct ufsmount *ump;
 	int error, waitfor;
 
 	/*
@@ -12428,11 +12513,13 @@ flush_inodedep_deps(vp, mp, ino)
 	 * We give a brief window at the top of the loop to allow
 	 * any pending I/O to complete.
 	 */
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	for (error = 0, waitfor = MNT_NOWAIT; ; ) {
 		if (error)
 			return (error);
-		FREE_LOCK(&lk);
-		ACQUIRE_LOCK(&lk);
+		FREE_LOCK(ump);
+		ACQUIRE_LOCK(ump);
 restart:
 		if (inodedep_lookup(mp, ino, 0, &inodedep) == 0)
 			return (0);
@@ -12475,9 +12562,13 @@ flush_deplist(listhead, waitfor, errorp)
 {
 	struct allocdirect *adp;
 	struct newblk *newblk;
+	struct ufsmount *ump;
 	struct buf *bp;
 
-	rw_assert(&lk, RA_WLOCKED);
+	if ((adp = TAILQ_FIRST(listhead)) == NULL)
+		return (0);
+	ump = VFSTOUFS(adp->ad_list.wk_mp);
+	LOCK_OWNED(ump);
 	TAILQ_FOREACH(adp, listhead, ad_next) {
 		newblk = (struct newblk *)adp;
 		if (newblk->nb_jnewblk != NULL) {
@@ -12487,18 +12578,18 @@ flush_deplist(listhead, waitfor, errorp)
 		if (newblk->nb_state & DEPCOMPLETE)
 			continue;
 		bp = newblk->nb_bmsafemap->sm_buf;
-		bp = getdirtybuf(bp, &lk, waitfor);
+		bp = getdirtybuf(bp, LOCK_PTR(ump), waitfor);
 		if (bp == NULL) {
 			if (waitfor == MNT_NOWAIT)
 				continue;
 			return (1);
 		}
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		if (waitfor == MNT_NOWAIT)
 			bawrite(bp);
 		else 
 			*errorp = bwrite(bp);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		return (1);
 	}
 	return (0);
@@ -12514,6 +12605,7 @@ flush_newblk_dep(vp, mp, lbn)
 	ufs_lbn_t lbn;
 {
 	struct newblk *newblk;
+	struct ufsmount *ump;
 	struct bufobj *bo;
 	struct inode *ip;
 	struct buf *bp;
@@ -12526,7 +12618,8 @@ flush_newblk_dep(vp, mp, lbn)
 	blkno = DIP(ip, i_db[lbn]);
 	if (blkno == 0)
 		panic("flush_newblk_dep: Missing block");
-	ACQUIRE_LOCK(&lk);
+	ump = VFSTOUFS(mp);
+	ACQUIRE_LOCK(ump);
 	/*
 	 * Loop until all dependencies related to this block are satisfied.
 	 * We must be careful to restart after each sleep in case a write
@@ -12534,7 +12627,7 @@ flush_newblk_dep(vp, mp, lbn)
 	 */
 	for (;;) {
 		if (newblk_lookup(mp, blkno, 0, &newblk) == 0) {
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			break;
 		}
 		if (newblk->nb_list.wk_type != D_ALLOCDIRECT)
@@ -12551,27 +12644,27 @@ flush_newblk_dep(vp, mp, lbn)
 		 */
 		if ((newblk->nb_state & DEPCOMPLETE) == 0) {
 			bp = newblk->nb_bmsafemap->sm_buf;
-			bp = getdirtybuf(bp, &lk, MNT_WAIT);
+			bp = getdirtybuf(bp, LOCK_PTR(ump), MNT_WAIT);
 			if (bp == NULL)
 				continue;
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			error = bwrite(bp);
 			if (error)
 				break;
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			continue;
 		}
 		/*
 		 * Write the buffer.
 		 */
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		BO_LOCK(bo);
 		bp = gbincore(bo, lbn);
 		if (bp != NULL) {
 			error = BUF_LOCK(bp, LK_EXCLUSIVE | LK_SLEEPFAIL |
 			    LK_INTERLOCK, BO_LOCKPTR(bo));
 			if (error == ENOLCK) {
-				ACQUIRE_LOCK(&lk);
+				ACQUIRE_LOCK(ump);
 				continue; /* Slept, retry */
 			}
 			if (error != 0)
@@ -12593,7 +12686,7 @@ flush_newblk_dep(vp, mp, lbn)
 		error = ffs_update(vp, 1);
 		if (error)
 			break;
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	}
 	return (error);
 }
@@ -12616,8 +12709,11 @@ flush_pagedep_deps(pvp, mp, diraddhdp)
 	int error = 0;
 	struct buf *bp;
 	ino_t inum;
+	struct diraddhd unfinished;
 
+	LIST_INIT(&unfinished);
 	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 restart:
 	while ((dap = LIST_FIRST(diraddhdp)) != NULL) {
 		/*
@@ -12625,17 +12721,29 @@ restart:
 		 * has a MKDIR_PARENT dependency.
 		 */
 		if (dap->da_state & MKDIR_PARENT) {
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			if ((error = ffs_update(pvp, 1)) != 0)
 				break;
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			/*
 			 * If that cleared dependencies, go on to next.
 			 */
 			if (dap != LIST_FIRST(diraddhdp))
 				continue;
-			if (dap->da_state & MKDIR_PARENT)
-				panic("flush_pagedep_deps: MKDIR_PARENT");
+			/*
+			 * All MKDIR_PARENT dependencies and all the
+			 * NEWBLOCK pagedeps that are contained in direct
+			 * blocks were resolved by doing above ffs_update.
+			 * Pagedeps contained in indirect blocks may
+			 * require a complete sync'ing of the directory.
+			 * We are in the midst of doing a complete sync,
+			 * so if they are not resolved in this pass we
+			 * defer them for now as they will be sync'ed by
+			 * our caller shortly.
+			 */
+			LIST_REMOVE(dap, da_pdlist);
+			LIST_INSERT_HEAD(&unfinished, dap, da_pdlist);
+			continue;
 		}
 		/*
 		 * A newly allocated directory must have its "." and
@@ -12657,7 +12765,7 @@ restart:
 			}
 		}
 		if (dap->da_state & MKDIR_BODY) {
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			if ((error = ffs_vgetf(mp, inum, LK_EXCLUSIVE, &vp,
 			    FFSV_FORCEINSMQ)))
 				break;
@@ -12672,7 +12780,7 @@ restart:
 			vput(vp);
 			if (error != 0)
 				break;
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			/*
 			 * If that cleared dependencies, go on to next.
 			 */
@@ -12705,13 +12813,13 @@ retry:
 		 */
 		if ((inodedep->id_state & (DEPCOMPLETE | GOINGAWAY)) == 0) {
 			bp = inodedep->id_bmsafemap->sm_buf;
-			bp = getdirtybuf(bp, &lk, MNT_WAIT);
+			bp = getdirtybuf(bp, LOCK_PTR(ump), MNT_WAIT);
 			if (bp == NULL)
 				goto retry;
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			if ((error = bwrite(bp)) != 0)
 				break;
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			if (dap != LIST_FIRST(diraddhdp))
 				continue;
 		}
@@ -12721,7 +12829,7 @@ retry:
 		 * adjusted update it here to flush it to disk.
 		 */
 		if (dap == LIST_FIRST(diraddhdp)) {
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			if ((error = ffs_vgetf(mp, inum, LK_EXCLUSIVE, &vp,
 			    FFSV_FORCEINSMQ)))
 				break;
@@ -12729,7 +12837,7 @@ retry:
 			vput(vp);
 			if (error)
 				break;
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 		}
 		/*
 		 * If we have failed to get rid of all the dependencies
@@ -12743,7 +12851,11 @@ retry:
 		}
 	}
 	if (error)
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
+	while ((dap = LIST_FIRST(&unfinished)) != NULL) {
+		LIST_REMOVE(dap, da_pdlist);
+		LIST_INSERT_HEAD(diraddhdp, dap, da_pdlist);
+	}
 	return (error);
 }
 
@@ -12762,28 +12874,30 @@ softdep_slowdown(vp)
 	int jlow;
 	int max_softdeps_hard;
 
-	ACQUIRE_LOCK(&lk);
+	KASSERT(MOUNTEDSOFTDEP(vp->v_mount) != 0,
+	    ("softdep_slowdown called on non-softdep filesystem"));
+	ump = VFSTOUFS(vp->v_mount);
+	ACQUIRE_LOCK(ump);
 	jlow = 0;
 	/*
 	 * Check for journal space if needed.
 	 */
 	if (DOINGSUJ(vp)) {
-		ump = VFSTOUFS(vp->v_mount);
 		if (journal_space(ump, 0) == 0)
 			jlow = 1;
 	}
 	max_softdeps_hard = max_softdeps * 11 / 10;
 	if (dep_current[D_DIRREM] < max_softdeps_hard / 2 &&
 	    dep_current[D_INODEDEP] < max_softdeps_hard &&
-	    VFSTOUFS(vp->v_mount)->um_numindirdeps < maxindirdeps &&
+	    VFSTOUFS(vp->v_mount)->softdep_numindirdeps < maxindirdeps &&
 	    dep_current[D_FREEBLKS] < max_softdeps_hard && jlow == 0) {
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
   		return (0);
 	}
-	if (VFSTOUFS(vp->v_mount)->um_numindirdeps >= maxindirdeps || jlow)
+	if (VFSTOUFS(vp->v_mount)->softdep_numindirdeps >= maxindirdeps || jlow)
 		softdep_speedup();
 	stat_sync_limit_hit += 1;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	if (DOINGSUJ(vp))
 		return (0);
 	return (1);
@@ -12836,7 +12950,7 @@ softdep_request_cleanup(fs, vp, cred, resource)
 	mtx_assert(UFS_MTX(ump), MA_OWNED);
 	UFS_UNLOCK(ump);
 	error = ffs_update(vp, 1);
-	if (error != 0) {
+	if (error != 0 || MOUNTEDSOFTDEP(mp) == 0) {
 		UFS_LOCK(ump);
 		return (0);
 	}
@@ -12844,11 +12958,11 @@ softdep_request_cleanup(fs, vp, cred, resource)
 	 * If we are in need of resources, consider pausing for
 	 * tickdelay to give ourselves some breathing room.
 	 */
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	process_removes(vp);
 	process_truncates(vp);
 	request_cleanup(UFSTOVFS(ump), resource);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	/*
 	 * Now clean up at least as many resources as we will need.
 	 *
@@ -12891,12 +13005,12 @@ retry:
 	    fs->fs_cstotal.cs_nbfree <= needed) ||
 	    (resource == FLUSH_INODES_WAIT && fs->fs_pendinginodes > 0 &&
 	    fs->fs_cstotal.cs_nifree <= needed)) {
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 		if (ump->softdep_on_worklist > 0 &&
 		    process_worklist_item(UFSTOVFS(ump),
 		    ump->softdep_on_worklist, LK_NOWAIT) != 0)
 			stat_worklist_push += 1;
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 	}
 	/*
 	 * If we still need resources and there are no more worklist
@@ -12946,7 +13060,6 @@ retry:
  * If memory utilization has gotten too high, deliberately slow things
  * down and speed up the I/O processing.
  */
-extern struct thread *syncertd;
 static int
 request_cleanup(mp, resource)
 	struct mount *mp;
@@ -12955,13 +13068,13 @@ request_cleanup(mp, resource)
 	struct thread *td = curthread;
 	struct ufsmount *ump;
 
-	rw_assert(&lk, RA_WLOCKED);
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 	/*
 	 * We never hold up the filesystem syncer or buf daemon.
 	 */
 	if (td->td_pflags & (TDP_SOFTDEP|TDP_NORUNNINGBUF))
 		return (0);
-	ump = VFSTOUFS(mp);
 	/*
 	 * First check to see if the work list has gotten backlogged.
 	 * If it has, co-opt this process to help clean up two entries.
@@ -13030,13 +13143,15 @@ request_cleanup(mp, resource)
 
 /*
  * Awaken processes pausing in request_cleanup and clear proc_waiting
- * to indicate that there is no longer a timer running.
+ * to indicate that there is no longer a timer running. Pause_timer
+ * will be called with the global softdep mutex (&lk) locked.
  */
 static void
 pause_timer(arg)
 	void *arg;
 {
 
+	rw_assert(&lk, RA_WLOCKED);
 	/*
 	 * The callout_ API has acquired mtx and will hold it around this
 	 * function call.
@@ -13048,36 +13163,66 @@ pause_timer(arg)
 		    pause_timer, 0);
 }
 
+/*
+ * If requested, try removing inode or removal dependencies.
+ */
+static void
+check_clear_deps(mp)
+	struct mount *mp;
+{
+
+	rw_assert(&lk, RA_WLOCKED);
+	/*
+	 * If we are suspended, it may be because of our using
+	 * too many inodedeps, so help clear them out.
+	 */
+	if (MOUNTEDSUJ(mp) && VFSTOUFS(mp)->softdep_jblocks->jb_suspended)
+		clear_inodedeps(mp);
+	/*
+	 * General requests for cleanup of backed up dependencies
+	 */
+	if (req_clear_inodedeps) {
+		req_clear_inodedeps -= 1;
+		clear_inodedeps(mp);
+		wakeup_one(&proc_waiting);
+	}
+	if (req_clear_remove) {
+		req_clear_remove -= 1;
+		clear_remove(mp);
+		wakeup_one(&proc_waiting);
+	}
+}
+
 /*
  * Flush out a directory with at least one removal dependency in an effort to
  * reduce the number of dirrem, freefile, and freeblks dependency structures.
  */
 static void
-clear_remove(void)
+clear_remove(mp)
+	struct mount *mp;
 {
 	struct pagedep_hashhead *pagedephd;
 	struct pagedep *pagedep;
-	static int next = 0;
-	struct mount *mp;
+	struct ufsmount *ump;
 	struct vnode *vp;
 	struct bufobj *bo;
 	int error, cnt;
 	ino_t ino;
 
-	rw_assert(&lk, RA_WLOCKED);
+	ump = VFSTOUFS(mp);
+	LOCK_OWNED(ump);
 
-	for (cnt = 0; cnt <= pagedep_hash; cnt++) {
-		pagedephd = &pagedep_hashtbl[next++];
-		if (next > pagedep_hash)
-			next = 0;
+	for (cnt = 0; cnt <= ump->pagedep_hash_size; cnt++) {
+		pagedephd = &ump->pagedep_hashtbl[ump->pagedep_nextclean++];
+		if (ump->pagedep_nextclean > ump->pagedep_hash_size)
+			ump->pagedep_nextclean = 0;
 		LIST_FOREACH(pagedep, pagedephd, pd_hash) {
 			if (LIST_EMPTY(&pagedep->pd_dirremhd))
 				continue;
-			mp = pagedep->pd_list.wk_mp;
 			ino = pagedep->pd_ino;
 			if (vn_start_write(NULL, &mp, V_NOWAIT) != 0)
 				continue;
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 
 			/*
 			 * Let unmount clear deps
@@ -13101,7 +13246,7 @@ clear_remove(void)
 			vput(vp);
 		finish_write:
 			vn_finished_write(mp);
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			return;
 		}
 	}
@@ -13112,34 +13257,34 @@ clear_remove(void)
  * the number of inodedep dependency structures.
  */
 static void
-clear_inodedeps(void)
+clear_inodedeps(mp)
+	struct mount *mp;
 {
 	struct inodedep_hashhead *inodedephd;
 	struct inodedep *inodedep;
-	static int next = 0;
-	struct mount *mp;
+	struct ufsmount *ump;
 	struct vnode *vp;
 	struct fs *fs;
 	int error, cnt;
 	ino_t firstino, lastino, ino;
 
-	rw_assert(&lk, RA_WLOCKED);
+	ump = VFSTOUFS(mp);
+	fs = ump->um_fs;
+	LOCK_OWNED(ump);
 	/*
 	 * Pick a random inode dependency to be cleared.
 	 * We will then gather up all the inodes in its block 
 	 * that have dependencies and flush them out.
 	 */
-	for (cnt = 0; cnt <= inodedep_hash; cnt++) {
-		inodedephd = &inodedep_hashtbl[next++];
-		if (next > inodedep_hash)
-			next = 0;
+	for (cnt = 0; cnt <= ump->inodedep_hash_size; cnt++) {
+		inodedephd = &ump->inodedep_hashtbl[ump->inodedep_nextclean++];
+		if (ump->inodedep_nextclean > ump->inodedep_hash_size)
+			ump->inodedep_nextclean = 0;
 		if ((inodedep = LIST_FIRST(inodedephd)) != NULL)
 			break;
 	}
 	if (inodedep == NULL)
 		return;
-	fs = inodedep->id_fs;
-	mp = inodedep->id_list.wk_mp;
 	/*
 	 * Find the last inode in the block with dependencies.
 	 */
@@ -13157,11 +13302,11 @@ clear_inodedeps(void)
 			continue;
 		if (vn_start_write(NULL, &mp, V_NOWAIT) != 0)
 			continue;
-		FREE_LOCK(&lk);
+		FREE_LOCK(ump);
 		error = vfs_busy(mp, MBF_NOWAIT); /* Let unmount clear deps */
 		if (error != 0) {
 			vn_finished_write(mp);
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			return;
 		}
 		if ((error = ffs_vgetf(mp, ino, LK_EXCLUSIVE, &vp,
@@ -13169,7 +13314,7 @@ clear_inodedeps(void)
 			softdep_error("clear_inodedeps: vget", error);
 			vfs_unbusy(mp);
 			vn_finished_write(mp);
-			ACQUIRE_LOCK(&lk);
+			ACQUIRE_LOCK(ump);
 			return;
 		}
 		vfs_unbusy(mp);
@@ -13185,7 +13330,7 @@ clear_inodedeps(void)
 		}
 		vput(vp);
 		vn_finished_write(mp);
-		ACQUIRE_LOCK(&lk);
+		ACQUIRE_LOCK(ump);
 	}
 }
 
@@ -13195,13 +13340,19 @@ softdep_buf_append(bp, wkhd)
 	struct workhead *wkhd;
 {
 	struct worklist *wk;
+	struct ufsmount *ump;
 
-	ACQUIRE_LOCK(&lk);
+	if ((wk = LIST_FIRST(wkhd)) == NULL)
+		return;
+	KASSERT(MOUNTEDSOFTDEP(wk->wk_mp) != 0,
+	    ("softdep_buf_append called on non-softdep filesystem"));
+	ump = VFSTOUFS(wk->wk_mp);
+	ACQUIRE_LOCK(ump);
 	while ((wk = LIST_FIRST(wkhd)) != NULL) {
 		WORKLIST_REMOVE(wk);
 		WORKLIST_INSERT(&bp->b_dep, wk);
 	}
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 
 }
 
@@ -13215,6 +13366,8 @@ softdep_inode_append(ip, cred, wkhd)
 	struct fs *fs;
 	int error;
 
+	KASSERT(MOUNTEDSOFTDEP(UFSTOVFS(ip->i_ump)) != 0,
+	    ("softdep_inode_append called on non-softdep filesystem"));
 	fs = ip->i_fs;
 	error = bread(ip->i_devvp, fsbtodb(fs, ino_to_fsba(fs, ip->i_number)),
 	    (int)fs->fs_bsize, cred, &bp);
@@ -13231,10 +13384,17 @@ void
 softdep_freework(wkhd)
 	struct workhead *wkhd;
 {
+	struct worklist *wk;
+	struct ufsmount *ump;
 
-	ACQUIRE_LOCK(&lk);
+	if ((wk = LIST_FIRST(wkhd)) == NULL)
+		return;
+	KASSERT(MOUNTEDSOFTDEP(wk->wk_mp) != 0,
+	    ("softdep_freework called on non-softdep filesystem"));
+	ump = VFSTOUFS(wk->wk_mp);
+	ACQUIRE_LOCK(ump);
 	handle_jwork(wkhd);
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
 /*
@@ -13248,6 +13408,7 @@ softdep_count_dependencies(bp, wantcount)
 	int wantcount;
 {
 	struct worklist *wk;
+	struct ufsmount *ump;
 	struct bmsafemap *bmsafemap;
 	struct freework *freework;
 	struct inodedep *inodedep;
@@ -13262,7 +13423,10 @@ softdep_count_dependencies(bp, wantcount)
 	int i, retval;
 
 	retval = 0;
-	ACQUIRE_LOCK(&lk);
+	if ((wk = LIST_FIRST(&bp->b_dep)) == NULL)
+		return (0);
+	ump = VFSTOUFS(wk->wk_mp);
+	ACQUIRE_LOCK(ump);
 	LIST_FOREACH(wk, &bp->b_dep, wk_list) {
 		switch (wk->wk_type) {
 
@@ -13395,7 +13559,7 @@ softdep_count_dependencies(bp, wantcount)
 		}
 	}
 out:
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	return retval;
 }
 
@@ -13412,7 +13576,6 @@ getdirtybuf(bp, lock, waitfor)
 {
 	int error;
 
-	rw_assert(lock, RA_WLOCKED);
 	if (BUF_LOCK(bp, LK_EXCLUSIVE | LK_NOWAIT, NULL) != 0) {
 		if (waitfor != MNT_WAIT)
 			return (NULL);
@@ -13430,7 +13593,7 @@ getdirtybuf(bp, lock, waitfor)
 		return (NULL);
 	}
 	if ((bp->b_vflags & BV_BKGRDINPROG) != 0) {
-		if (lock == &lk && waitfor == MNT_WAIT) {
+		if (lock != BO_LOCKPTR(bp->b_bufobj) && waitfor == MNT_WAIT) {
 			rw_wunlock(lock);
 			BO_LOCK(bp->b_bufobj);
 			BUF_UNLOCK(bp);
@@ -13476,8 +13639,8 @@ getdirtybuf(bp, lock, waitfor)
 int
 softdep_check_suspend(struct mount *mp,
 		      struct vnode *devvp,
-		      int softdep_deps,
-		      int softdep_accdeps,
+		      int softdep_depcnt,
+		      int softdep_accdepcnt,
 		      int secondary_writes,
 		      int secondary_accwrites)
 {
@@ -13485,21 +13648,55 @@ softdep_check_suspend(struct mount *mp,
 	struct ufsmount *ump;
 	int error;
 
-	ump = VFSTOUFS(mp);
 	bo = &devvp->v_bufobj;
 	ASSERT_BO_WLOCKED(bo);
 
-	for (;;) {
-		if (!TRY_ACQUIRE_LOCK(&lk)) {
+	/*
+	 * If we are not running with soft updates, then we need only
+	 * deal with secondary writes as we try to suspend.
+	 */
+	if (MOUNTEDSOFTDEP(mp) == 0) {
+		MNT_ILOCK(mp);
+		while (mp->mnt_secondary_writes != 0) {
 			BO_UNLOCK(bo);
-			ACQUIRE_LOCK(&lk);
-			FREE_LOCK(&lk);
+			msleep(&mp->mnt_secondary_writes, MNT_MTX(mp),
+			    (PUSER - 1) | PDROP, "secwr", 0);
+			BO_LOCK(bo);
+			MNT_ILOCK(mp);
+		}
+
+		/*
+		 * Reasons for needing more work before suspend:
+		 * - Dirty buffers on devvp.
+		 * - Secondary writes occurred after start of vnode sync loop
+		 */
+		error = 0;
+		if (bo->bo_numoutput > 0 ||
+		    bo->bo_dirty.bv_cnt > 0 ||
+		    secondary_writes != 0 ||
+		    mp->mnt_secondary_writes != 0 ||
+		    secondary_accwrites != mp->mnt_secondary_accwrites)
+			error = EAGAIN;
+		BO_UNLOCK(bo);
+		return (error);
+	}
+
+	/*
+	 * If we are running with soft updates, then we need to coordinate
+	 * with them as we try to suspend.
+	 */
+	ump = VFSTOUFS(mp);
+	for (;;) {
+		if (!TRY_ACQUIRE_LOCK(ump)) {
+			BO_UNLOCK(bo);
+			ACQUIRE_LOCK(ump);
+			FREE_LOCK(ump);
 			BO_LOCK(bo);
 			continue;
 		}
 		MNT_ILOCK(mp);
 		if (mp->mnt_secondary_writes != 0) {
-			FREE_LOCK(&lk);
+			FREE_LOCK(ump);
 			BO_UNLOCK(bo);
 			msleep(&mp->mnt_secondary_writes,
 			       MNT_MTX(mp),
@@ -13519,14 +13716,14 @@ softdep_check_suspend(struct mount *mp,
 	error = 0;
 	if (bo->bo_numoutput > 0 ||
 	    bo->bo_dirty.bv_cnt > 0 ||
-	    softdep_deps != 0 ||
+	    softdep_depcnt != 0 ||
 	    ump->softdep_deps != 0 ||
-	    softdep_accdeps != ump->softdep_accdeps ||
+	    softdep_accdepcnt != ump->softdep_accdeps ||
 	    secondary_writes != 0 ||
 	    mp->mnt_secondary_writes != 0 ||
 	    secondary_accwrites != mp->mnt_secondary_accwrites)
 		error = EAGAIN;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 	BO_UNLOCK(bo);
 	return (error);
 }
@@ -13544,11 +13741,16 @@ softdep_get_depcounts(struct mount *mp,
 {
 	struct ufsmount *ump;
 
+	if (MOUNTEDSOFTDEP(mp) == 0) {
+		*softdep_depsp = 0;
+		*softdep_accdepsp = 0;
+		return;
+	}
 	ump = VFSTOUFS(mp);
-	ACQUIRE_LOCK(&lk);
+	ACQUIRE_LOCK(ump);
 	*softdep_depsp = ump->softdep_deps;
 	*softdep_accdepsp = ump->softdep_accdeps;
-	FREE_LOCK(&lk);
+	FREE_LOCK(ump);
 }
 
 /*
@@ -13653,15 +13855,17 @@ DB_SHOW_COMMAND(inodedeps, db_show_inodedeps)
 {
 	struct inodedep_hashhead *inodedephd;
 	struct inodedep *inodedep;
-	struct fs *fs;
+	struct ufsmount *ump;
 	int cnt;
 
-	fs = have_addr ? (struct fs *)addr : NULL;
-	for (cnt = 0; cnt < inodedep_hash; cnt++) {
-		inodedephd = &inodedep_hashtbl[cnt];
+	if (have_addr == 0) {
+		db_printf("Address required\n");
+		return;
+	}
+	ump = (struct ufsmount *)addr;
+	for (cnt = 0; cnt < ump->inodedep_hash_size; cnt++) {
+		inodedephd = &ump->inodedep_hashtbl[cnt];
 		LIST_FOREACH(inodedep, inodedephd, id_hash) {
-			if (fs != NULL && fs != inodedep->id_fs)
-				continue;
 			inodedep_print(inodedep, 0);
 		}
 	}
@@ -13703,11 +13907,17 @@ DB_SHOW_COMMAND(workhead, db_show_workhead)
 
 DB_SHOW_COMMAND(mkdirs, db_show_mkdirs)
 {
+	struct mkdirlist *mkdirlisthd;
 	struct jaddref *jaddref;
 	struct diradd *diradd;
 	struct mkdir *mkdir;
 
-	LIST_FOREACH(mkdir, &mkdirlisthd, md_mkdirs) {
+	if (have_addr == 0) {
+		db_printf("Address required\n");
+		return;
+	}
+	mkdirlisthd = (struct mkdirlist *)addr;
+	LIST_FOREACH(mkdir, mkdirlisthd, md_mkdirs) {
 		diradd = mkdir->md_diradd;
 		db_printf("mkdir: %p state 0x%X dap %p state 0x%X",
 		    mkdir, mkdir->md_state, diradd, diradd->da_state);
@@ -13718,6 +13928,17 @@ DB_SHOW_COMMAND(mkdirs, db_show_mkdirs)
 	}
 }
 
+/* exported to ffs_vfsops.c */
+extern void db_print_ffs(struct ufsmount *ump);
+void
+db_print_ffs(struct ufsmount *ump)
+{
+	db_printf("mp %p %s devvp %p fs %p su_wl %d su_deps %d su_req %d\n",
+	    ump->um_mountp, ump->um_mountp->mnt_stat.f_mntonname,
+	    ump->um_devvp, ump->um_fs, ump->softdep_on_worklist,
+	    ump->softdep_deps, ump->softdep_req);
+}
+
 #endif /* DDB */
 
 #endif /* SOFTUPDATES */
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index a87fdfa2053..079e684a8b4 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1286,7 +1286,8 @@ ffs_unmount(mp, mntflags)
 		fs->fs_pendinginodes = 0;
 	}
 	UFS_UNLOCK(ump);
-	softdep_unmount(mp);
+	if (MOUNTEDSOFTDEP(mp))
+		softdep_unmount(mp);
 	if (fs->fs_ronly == 0 || ump->um_fsckpid > 0) {
 		fs->fs_clean = fs->fs_flags & (FS_UNCLEAN|FS_NEEDSFSCK) ? 0 : 1;
 		error = ffs_sbupdate(ump, MNT_WAIT, 0);
@@ -1943,7 +1944,7 @@ ffs_sbupdate(ump, waitfor, suspended)
 	}
 	fs->fs_fmod = 0;
 	fs->fs_time = time_second;
-	if (fs->fs_flags & FS_DOSOFTDEP)
+	if (MOUNTEDSOFTDEP(ump->um_mountp))
 		softdep_setup_sbupdate(ump, (struct fs *)bp->b_data, bp);
 	bcopy((caddr_t)fs, bp->b_data, (u_int)fs->fs_sbsize);
 	ffs_oldfscompat_write((struct fs *)bp->b_data, ump);
@@ -2220,15 +2221,10 @@ ffs_own_mount(const struct mount *mp)
 }
 
 #ifdef	DDB
+#ifdef SOFTUPDATES
 
-static void
-db_print_ffs(struct ufsmount *ump)
-{
-	db_printf("mp %p %s devvp %p fs %p su_wl %d su_deps %d su_req %d\n",
-	    ump->um_mountp, ump->um_mountp->mnt_stat.f_mntonname,
-	    ump->um_devvp, ump->um_fs, ump->softdep_on_worklist,
-	    ump->softdep_deps, ump->softdep_req);
-}
+/* defined in ffs_softdep.c */
+extern void db_print_ffs(struct ufsmount *ump);
 
 DB_SHOW_COMMAND(ffs, db_show_ffs)
 {
@@ -2247,4 +2243,5 @@ DB_SHOW_COMMAND(ffs, db_show_ffs)
 	}
 }
 
+#endif	/* SOFTUPDATES */
 #endif	/* DDB */
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 09e5a42388e..792d253bb36 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -531,7 +531,7 @@ ffs_read(ap)
 			 * arguments point to arrays of the size specified in
 			 * the 6th argument.
 			 */
-			int nextsize = blksize(fs, ip, nextlbn);
+			u_int nextsize = blksize(fs, ip, nextlbn);
 			error = breadn_flags(vp, lbn, size, &nextlbn,
 			    &nextsize, 1, NOCRED, GB_UNMAPPED, &bp);
 		} else {
@@ -956,7 +956,7 @@ ffs_extread(struct vnode *vp, struct uio *uio, int ioflag)
 			 * arguments point to arrays of the size specified in
 			 * the 6th argument.
 			 */
-			int nextsize = sblksize(fs, dp->di_extsize, nextlbn);
+			u_int nextsize = sblksize(fs, dp->di_extsize, nextlbn);
 
 			nextlbn = -1 - nextlbn;
 			error = breadn(vp, -1 - lbn,
@@ -1218,7 +1218,8 @@ ffs_rdextattr(u_char **p, struct vnode *vp, struct thread *td, int extra)
 	struct fs *fs;
 	struct uio luio;
 	struct iovec liovec;
-	int easize, error;
+	u_int easize;
+	int error;
 	u_char *eae;
 
 	ip = VTOI(vp);
diff --git a/sys/ufs/ffs/softdep.h b/sys/ufs/ffs/softdep.h
index b251ba8a3ff..8d1136ea499 100644
--- a/sys/ufs/ffs/softdep.h
+++ b/sys/ufs/ffs/softdep.h
@@ -132,7 +132,7 @@
 #define	INPROGRESS	0x001000 /* dirrem, freeblks, freefrag, freefile only */
 #define	UFS1FMT		0x002000 /* indirdep only */
 #define	EXTDATA		0x004000 /* allocdirect only */
-#define ONWORKLIST	0x008000
+#define	ONWORKLIST	0x008000
 #define	IOWAITING	0x010000 /* Thread is waiting for IO to complete. */
 #define	ONDEPLIST	0x020000 /* Structure is on a dependency list. */
 #define	UNLINKED	0x040000 /* inodedep has been unlinked. */
@@ -143,6 +143,39 @@
 
 #define	ALLCOMPLETE	(ATTACHED | COMPLETE | DEPCOMPLETE)
 
+/*
+ * Values for each of the soft dependency types.
+ */
+#define	D_PAGEDEP	0
+#define	D_INODEDEP	1
+#define	D_BMSAFEMAP	2
+#define	D_NEWBLK	3
+#define	D_ALLOCDIRECT	4
+#define	D_INDIRDEP	5
+#define	D_ALLOCINDIR	6
+#define	D_FREEFRAG	7
+#define	D_FREEBLKS	8
+#define	D_FREEFILE	9
+#define	D_DIRADD	10
+#define	D_MKDIR		11
+#define	D_DIRREM	12
+#define	D_NEWDIRBLK	13
+#define	D_FREEWORK	14
+#define	D_FREEDEP	15
+#define	D_JADDREF	16
+#define	D_JREMREF	17
+#define	D_JMVREF	18
+#define	D_JNEWBLK	19
+#define	D_JFREEBLK	20
+#define	D_JFREEFRAG	21
+#define	D_JSEG		22
+#define	D_JSEGDEP	23
+#define	D_SBDEP		24
+#define	D_JTRUNC	25
+#define	D_JFSYNC	26
+#define	D_SENTINEL	27
+#define	D_LAST		D_SENTINEL
+
 /*
  * The workitem queue.
  * 
@@ -416,7 +449,8 @@ struct newblk {
  */
 struct allocdirect {
 	struct	newblk ad_block;	/* Common block logic */
-#	define	ad_state ad_block.nb_list.wk_state /* block pointer state */
+#	define	ad_list ad_block.nb_list /* block pointer worklist */
+#	define	ad_state ad_list.wk_state /* block pointer state */
 	TAILQ_ENTRY(allocdirect) ad_next; /* inodedep's list of allocdirect's */
 	struct	inodedep *ad_inodedep;	/* associated inodedep */
 	ufs2_daddr_t	ad_oldblkno;	/* old value of block pointer */
@@ -947,3 +981,106 @@ struct sbdep {
 	struct	fs	*sb_fs;		/* Filesystem pointer within buf. */
 	struct	ufsmount *sb_ump;	/* Our mount structure */
 };
+
+/*
+ * Private journaling structures.
+ */
+struct jblocks {
+	struct jseglst	jb_segs;	/* TAILQ of current segments. */
+	struct jseg	*jb_writeseg;	/* Next write to complete. */
+	struct jseg	*jb_oldestseg;	/* Oldest segment with valid entries. */
+	struct jextent	*jb_extent;	/* Extent array. */
+	uint64_t	jb_nextseq;	/* Next sequence number. */
+	uint64_t	jb_oldestwrseq;	/* Oldest written sequence number. */
+	uint8_t		jb_needseg;	/* Need a forced segment. */
+	uint8_t		jb_suspended;	/* Did journal suspend writes? */
+	int		jb_avail;	/* Available extents. */
+	int		jb_used;	/* Last used extent. */
+	int		jb_head;	/* Allocator head. */
+	int		jb_off;		/* Allocator extent offset. */
+	int		jb_blocks;	/* Total disk blocks covered. */
+	int		jb_free;	/* Total disk blocks free. */
+	int		jb_min;		/* Minimum free space. */
+	int		jb_low;		/* Low on space. */
+	int		jb_age;		/* Insertion time of oldest rec. */
+};
+
+struct jextent {
+	ufs2_daddr_t	je_daddr;	/* Disk block address. */
+	int		je_blocks;	/* Disk block count. */
+};
+
+/*
+ * Hash table declarations.
+ */
+LIST_HEAD(mkdirlist, mkdir);
+LIST_HEAD(pagedep_hashhead, pagedep);
+LIST_HEAD(inodedep_hashhead, inodedep);
+LIST_HEAD(newblk_hashhead, newblk);
+LIST_HEAD(bmsafemap_hashhead, bmsafemap);
+TAILQ_HEAD(indir_hashhead, freework);
+
+/*
+ * Per-filesystem soft dependency data.
+ * Allocated at mount and freed at unmount.
+ */
+struct mount_softdeps {
+	struct	rwlock *sd_fslock;		/* softdep lock */
+	struct	workhead sd_workitem_pending;	/* softdep work queue */
+	struct	worklist *sd_worklist_tail;	/* Tail pointer for above */
+	struct	workhead sd_journal_pending;	/* journal work queue */
+	struct	worklist *sd_journal_tail;	/* Tail pointer for above */
+	struct	jblocks *sd_jblocks;		/* Journal block information */
+	struct	inodedeplst sd_unlinked;	/* Unlinked inodes */
+	struct	bmsafemaphd sd_dirtycg;		/* Dirty CGs */
+	struct	mkdirlist sd_mkdirlisthd;	/* Track mkdirs */
+	struct	pagedep_hashhead *sd_pdhash;	/* pagedep hash table */
+	u_long	sd_pdhashsize;			/* pagedep hash table size-1 */
+	long	sd_pdnextclean;			/* next hash bucket to clean */
+	struct	inodedep_hashhead *sd_idhash;	/* inodedep hash table */
+	u_long	sd_idhashsize;			/* inodedep hash table size-1 */
+	long	sd_idnextclean;			/* next hash bucket to clean */
+	struct	newblk_hashhead *sd_newblkhash;	/* newblk hash table */
+	u_long	sd_newblkhashsize;		/* newblk hash table size-1 */
+	struct	bmsafemap_hashhead *sd_bmhash;	/* bmsafemap hash table */
+	u_long	sd_bmhashsize;			/* bmsafemap hash table size-1*/
+	struct	indir_hashhead *sd_indirhash;	/* indir hash table */
+	u_long	sd_indirhashsize;		/* indir hash table size-1 */
+	long	sd_numindirdeps;		/* outstanding indirdeps */
+	int	sd_on_journal;			/* Items on the journal list */
+	int	sd_on_worklist;			/* Items on the worklist */
+	int	sd_deps;			/* Total dependency count */
+	int	sd_accdeps;			/* accumulated dep count */
+	int	sd_req;				/* Wakeup when deps hits 0. */
+	u_long	sd_curdeps[D_LAST + 1];		/* count of current deps */
+};
+/*
+ * Keep the old names from when these were in the ufsmount structure.
+ */
+#define softdep_workitem_pending	um_softdep->sd_workitem_pending
+#define softdep_worklist_tail		um_softdep->sd_worklist_tail
+#define softdep_journal_pending		um_softdep->sd_journal_pending
+#define softdep_journal_tail		um_softdep->sd_journal_tail
+#define softdep_jblocks			um_softdep->sd_jblocks
+#define softdep_unlinked		um_softdep->sd_unlinked
+#define softdep_dirtycg			um_softdep->sd_dirtycg
+#define softdep_mkdirlisthd		um_softdep->sd_mkdirlisthd
+#define pagedep_hashtbl			um_softdep->sd_pdhash
+#define pagedep_hash_size		um_softdep->sd_pdhashsize
+#define pagedep_nextclean		um_softdep->sd_pdnextclean
+#define inodedep_hashtbl		um_softdep->sd_idhash
+#define inodedep_hash_size		um_softdep->sd_idhashsize
+#define inodedep_nextclean		um_softdep->sd_idnextclean
+#define newblk_hashtbl			um_softdep->sd_newblkhash
+#define newblk_hash_size		um_softdep->sd_newblkhashsize
+#define bmsafemap_hashtbl		um_softdep->sd_bmhash
+#define bmsafemap_hash_size		um_softdep->sd_bmhashsize
+#define indir_hashtbl			um_softdep->sd_indirhash
+#define indir_hash_size			um_softdep->sd_indirhashsize
+#define softdep_numindirdeps		um_softdep->sd_numindirdeps
+#define softdep_on_journal		um_softdep->sd_on_journal
+#define softdep_on_worklist		um_softdep->sd_on_worklist
+#define softdep_deps			um_softdep->sd_deps
+#define softdep_accdeps			um_softdep->sd_accdeps
+#define softdep_req			um_softdep->sd_req
+#define softdep_curdeps			um_softdep->sd_curdeps
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h
index 6d06bdef40f..36a7c0da11a 100644
--- a/sys/ufs/ufs/dinode.h
+++ b/sys/ufs/ufs/dinode.h
@@ -141,7 +141,7 @@ struct ufs2_dinode {
 	u_int32_t	di_gen;		/*  80: Generation number. */
 	u_int32_t	di_kernflags;	/*  84: Kernel flags. */
 	u_int32_t	di_flags;	/*  88: Status flags (chflags). */
-	int32_t		di_extsize;	/*  92: External attributes block. */
+	u_int32_t	di_extsize;	/*  92: External attributes size. */
 	ufs2_daddr_t	di_extb[NXADDR];/*  96: External attributes block. */
 	ufs2_daddr_t	di_db[NDADDR];	/* 112: Direct disk blocks. */
 	ufs2_daddr_t	di_ib[NIADDR];	/* 208: Indirect disk blocks. */
@@ -179,7 +179,7 @@ struct ufs1_dinode {
 	ufs1_daddr_t	di_db[NDADDR];	/*  40: Direct disk blocks. */
 	ufs1_daddr_t	di_ib[NIADDR];	/*  88: Indirect disk blocks. */
 	u_int32_t	di_flags;	/* 100: Status flags (chflags). */
-	int32_t		di_blocks;	/* 104: Blocks actually held. */
+	u_int32_t	di_blocks;	/* 104: Blocks actually held. */
 	u_int32_t	di_gen;		/* 108: Generation number. */
 	u_int32_t	di_uid;		/* 112: File owner. */
 	u_int32_t	di_gid;		/* 116: File group. */
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 31a2ba89889..288eb62effe 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -98,7 +98,6 @@ void	softdep_setup_remove(struct buf *,struct inode *, struct inode *, int);
 void	softdep_setup_directory_change(struct buf *, struct inode *,
 	    struct inode *, ino_t, int);
 void	softdep_change_linkcnt(struct inode *);
-void	softdep_releasefile(struct inode *);
 int	softdep_slowdown(struct vnode *);
 void	softdep_setup_create(struct inode *, struct inode *);
 void	softdep_setup_dotdot_link(struct inode *, struct inode *);
@@ -107,7 +106,6 @@ void	softdep_setup_mkdir(struct inode *, struct inode *);
 void	softdep_setup_rmdir(struct inode *, struct inode *);
 void	softdep_setup_unlink(struct inode *, struct inode *);
 void	softdep_revert_create(struct inode *, struct inode *);
-void	softdep_revert_dotdot_link(struct inode *, struct inode *);
 void	softdep_revert_link(struct inode *, struct inode *);
 void	softdep_revert_mkdir(struct inode *, struct inode *);
 void	softdep_revert_rmdir(struct inode *, struct inode *);
diff --git a/sys/ufs/ufs/ufsmount.h b/sys/ufs/ufs/ufsmount.h
index ac0603e7d02..958d24a20b8 100644
--- a/sys/ufs/ufs/ufsmount.h
+++ b/sys/ufs/ufs/ufsmount.h
@@ -78,19 +78,7 @@ struct ufsmount {
 	u_long	um_seqinc;			/* inc between seq blocks */
 	struct	mtx um_lock;			/* Protects ufsmount & fs */
 	pid_t	um_fsckpid;			/* PID permitted fsck sysctls */
-	long	um_numindirdeps;		/* outstanding indirdeps */
-	struct	workhead softdep_workitem_pending; /* softdep work queue */
-	struct	worklist *softdep_worklist_tail; /* Tail pointer for above */
-	struct	workhead softdep_journal_pending; /* journal work queue */
-	struct	worklist *softdep_journal_tail;	/* Tail pointer for above */
-	struct	jblocks *softdep_jblocks;	/* Journal block information */
-	struct	inodedeplst softdep_unlinked;	/* Unlinked inodes */
-	struct	bmsafemaphd softdep_dirtycg;	/* Dirty CGs */
-	int	softdep_on_journal;		/* Items on the journal list */
-	int	softdep_on_worklist;		/* Items on the worklist */
-	int	softdep_deps;			/* Total dependency count */
-	int	softdep_accdeps;		/* accumulated dep count */
-	int	softdep_req;			/* Wakeup when deps hits 0. */
+	struct	mount_softdeps *um_softdep;	/* softdep mgmt structure */
 	struct	vnode *um_quotas[MAXQUOTAS];	/* pointer to quota files */
 	struct	ucred *um_cred[MAXQUOTAS];	/* quota file access cred */
 	time_t	um_btime[MAXQUOTAS];		/* block quota time limit */
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index e39654ea067..6030a1554ea 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -75,6 +75,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/sbuf.h>
+#include <sys/sched.h>
 #include <sys/smp.h>
 #include <sys/vmmeter.h>
 
@@ -130,6 +131,10 @@ static int bucketdisable = 1;
 /* Linked list of all kegs in the system */
 static LIST_HEAD(,uma_keg) uma_kegs = LIST_HEAD_INITIALIZER(uma_kegs);
 
+/* Linked list of all cache-only zones in the system */
+static LIST_HEAD(,uma_zone) uma_cachezones =
+    LIST_HEAD_INITIALIZER(uma_cachezones);
+
 /* This mutex protects the keg list */
 static struct mtx_padalign uma_mtx;
 
@@ -207,7 +212,9 @@ struct uma_bucket_zone {
 
 struct uma_bucket_zone bucket_zones[] = {
 	{ NULL, "4 Bucket", BUCKET_SIZE(4), 4096 },
+	{ NULL, "6 Bucket", BUCKET_SIZE(6), 3072 },
 	{ NULL, "8 Bucket", BUCKET_SIZE(8), 2048 },
+	{ NULL, "12 Bucket", BUCKET_SIZE(12), 1536 },
 	{ NULL, "16 Bucket", BUCKET_SIZE(16), 1024 },
 	{ NULL, "32 Bucket", BUCKET_SIZE(32), 512 },
 	{ NULL, "64 Bucket", BUCKET_SIZE(64), 256 },
@@ -366,12 +373,13 @@ bucket_alloc(uma_zone_t zone, void *udata, int flags)
 	 * buckets via the allocation path or bucket allocations in the
 	 * free path.
 	 */
-	if ((uintptr_t)udata & UMA_ZFLAG_BUCKET)
-		return (NULL);
 	if ((zone->uz_flags & UMA_ZFLAG_BUCKET) == 0)
 		udata = (void *)(uintptr_t)zone->uz_flags;
-	else
+	else {
+		if ((uintptr_t)udata & UMA_ZFLAG_BUCKET)
+			return (NULL);
 		udata = (void *)((uintptr_t)udata | UMA_ZFLAG_BUCKET);
+	}
 	if ((uintptr_t)udata & UMA_ZFLAG_CACHEONLY)
 		flags |= M_NOVM;
 	ubz = bucket_zone_lookup(zone->uz_count);
@@ -682,6 +690,90 @@ cache_drain(uma_zone_t zone)
 	ZONE_UNLOCK(zone);
 }
 
+static void
+cache_shrink(uma_zone_t zone)
+{
+
+	if (zone->uz_flags & UMA_ZFLAG_INTERNAL)
+		return;
+
+	ZONE_LOCK(zone);
+	zone->uz_count = (zone->uz_count_min + zone->uz_count) / 2;
+	ZONE_UNLOCK(zone);
+}
+
+static void
+cache_drain_safe_cpu(uma_zone_t zone)
+{
+	uma_cache_t cache;
+	uma_bucket_t b1, b2;
+
+	if (zone->uz_flags & UMA_ZFLAG_INTERNAL)
+		return;
+
+	b1 = b2 = NULL;
+	ZONE_LOCK(zone);
+	critical_enter();
+	cache = &zone->uz_cpu[curcpu];
+	if (cache->uc_allocbucket) {
+		if (cache->uc_allocbucket->ub_cnt != 0)
+			LIST_INSERT_HEAD(&zone->uz_buckets,
+			    cache->uc_allocbucket, ub_link);
+		else
+			b1 = cache->uc_allocbucket;
+		cache->uc_allocbucket = NULL;
+	}
+	if (cache->uc_freebucket) {
+		if (cache->uc_freebucket->ub_cnt != 0)
+			LIST_INSERT_HEAD(&zone->uz_buckets,
+			    cache->uc_freebucket, ub_link);
+		else
+			b2 = cache->uc_freebucket;
+		cache->uc_freebucket = NULL;
+	}
+	critical_exit();
+	ZONE_UNLOCK(zone);
+	if (b1)
+		bucket_free(zone, b1, NULL);
+	if (b2)
+		bucket_free(zone, b2, NULL);
+}
+
+/*
+ * Safely drain per-CPU caches of a zone(s) to alloc bucket.
+ * This is an expensive call because it needs to bind to all CPUs
+ * one by one and enter a critical section on each of them in order
+ * to safely access their cache buckets.
+ * Zone lock must not be held on call this function.
+ */
+static void
+cache_drain_safe(uma_zone_t zone)
+{
+	int cpu;
+
+	/*
+	 * Polite bucket sizes shrinking was not enouth, shrink aggressively.
+	 */
+	if (zone)
+		cache_shrink(zone);
+	else
+		zone_foreach(cache_shrink);
+
+	CPU_FOREACH(cpu) {
+		thread_lock(curthread);
+		sched_bind(curthread, cpu);
+		thread_unlock(curthread);
+
+		if (zone)
+			cache_drain_safe_cpu(zone);
+		else
+			zone_foreach(cache_drain_safe_cpu);
+	}
+	thread_lock(curthread);
+	sched_unbind(curthread);
+	thread_unlock(curthread);
+}
+
 /*
  * Drain the cached buckets from a zone.  Expects a locked zone on entry.
  */
@@ -701,6 +793,13 @@ bucket_cache_drain(uma_zone_t zone)
 		bucket_free(zone, bucket, NULL);
 		ZONE_LOCK(zone);
 	}
+
+	/*
+	 * Shrink further bucket sizes.  Price of single zone lock collision
+	 * is probably lower then price of global cache drain.
+	 */
+	if (zone->uz_count > zone->uz_count_min)
+		zone->uz_count--;
 }
 
 static void
@@ -1223,6 +1322,7 @@ keg_small_init(uma_keg_t keg)
 static void
 keg_large_init(uma_keg_t keg)
 {
+	u_int shsize;
 
 	KASSERT(keg != NULL, ("Keg is null in keg_large_init"));
 	KASSERT((keg->uk_flags & UMA_ZFLAG_CACHEONLY) == 0,
@@ -1239,8 +1339,21 @@ keg_large_init(uma_keg_t keg)
 	if (keg->uk_flags & UMA_ZFLAG_INTERNAL)
 		return;
 
-	keg->uk_flags |= UMA_ZONE_OFFPAGE;
-	if ((keg->uk_flags & UMA_ZONE_VTOSLAB) == 0)
+	/* Check whether we have enough space to not do OFFPAGE. */
+	if ((keg->uk_flags & UMA_ZONE_OFFPAGE) == 0) {
+		shsize = sizeof(struct uma_slab);
+		if (keg->uk_flags & UMA_ZONE_REFCNT)
+			shsize += keg->uk_ipers * sizeof(uint32_t);
+		if (shsize & UMA_ALIGN_PTR)
+			shsize = (shsize & ~UMA_ALIGN_PTR) +
+			    (UMA_ALIGN_PTR + 1);
+
+		if ((PAGE_SIZE * keg->uk_ppera) - keg->uk_rsize < shsize)
+			keg->uk_flags |= UMA_ZONE_OFFPAGE;
+	}
+
+	if ((keg->uk_flags & UMA_ZONE_OFFPAGE) &&
+	    (keg->uk_flags & UMA_ZONE_VTOSLAB) == 0)
 		keg->uk_flags |= UMA_ZONE_HASH;
 }
 
@@ -1461,6 +1574,7 @@ zone_ctor(void *mem, int size, void *udata, int flags)
 	zone->uz_fails = 0;
 	zone->uz_sleeps = 0;
 	zone->uz_count = 0;
+	zone->uz_count_min = 0;
 	zone->uz_flags = 0;
 	zone->uz_warning = NULL;
 	timevalclear(&zone->uz_ratecheck);
@@ -1480,6 +1594,9 @@ zone_ctor(void *mem, int size, void *udata, int flags)
 		zone->uz_release = arg->release;
 		zone->uz_arg = arg->arg;
 		zone->uz_lockptr = &zone->uz_lock;
+		mtx_lock(&uma_mtx);
+		LIST_INSERT_HEAD(&uma_cachezones, zone, uz_link);
+		mtx_unlock(&uma_mtx);
 		goto out;
 	}
 
@@ -1552,6 +1669,7 @@ out:
 		zone->uz_count = bucket_select(zone->uz_size);
 	else
 		zone->uz_count = BUCKET_MAX;
+	zone->uz_count_min = zone->uz_count;
 
 	return (0);
 }
@@ -1571,8 +1689,9 @@ keg_dtor(void *arg, int size, void *udata)
 	keg = (uma_keg_t)arg;
 	KEG_LOCK(keg);
 	if (keg->uk_free != 0) {
-		printf("Freed UMA keg was not empty (%d items). "
+		printf("Freed UMA keg (%s) was not empty (%d items). "
 		    " Lost %d pages of memory.\n",
+		    keg->uk_name ? keg->uk_name : "",
 		    keg->uk_free, keg->uk_pages);
 	}
 	KEG_UNLOCK(keg);
@@ -2412,7 +2531,7 @@ zone_alloc_bucket(uma_zone_t zone, void *udata, int flags)
 	/* Don't wait for buckets, preserve caller's NOVM setting. */
 	bucket = bucket_alloc(zone, udata, M_NOWAIT | (flags & M_NOVM));
 	if (bucket == NULL)
-		goto out;
+		return (NULL);
 
 	max = MIN(bucket->ub_entries, zone->uz_count);
 	bucket->ub_cnt = zone->uz_import(zone->uz_arg, bucket->ub_bucket,
@@ -2443,10 +2562,8 @@ zone_alloc_bucket(uma_zone_t zone, void *udata, int flags)
 		}
 	}
 
-out:
-	if (bucket == NULL || bucket->ub_cnt == 0) {
-		if (bucket != NULL)
-			bucket_free(zone, bucket, udata);
+	if (bucket->ub_cnt == 0) {
+		bucket_free(zone, bucket, udata);
 		atomic_add_long(&zone->uz_fails, 1);
 		return (NULL);
 	}
@@ -2518,6 +2635,7 @@ uma_zfree_arg(uma_zone_t zone, void *item, void *udata)
 {
 	uma_cache_t cache;
 	uma_bucket_t bucket;
+	int lockfail;
 	int cpu;
 
 #ifdef UMA_DEBUG_ALLOC_1
@@ -2602,7 +2720,12 @@ zfree_start:
 	if (zone->uz_count == 0 || bucketdisable)
 		goto zfree_item;
 
-	ZONE_LOCK(zone);
+	lockfail = 0;
+	if (ZONE_TRYLOCK(zone) == 0) {
+		/* Record contention to size the buckets. */
+		ZONE_LOCK(zone);
+		lockfail = 1;
+	}
 	critical_enter();
 	cpu = curcpu;
 	cache = &zone->uz_cpu[cpu];
@@ -2636,7 +2759,12 @@ zfree_start:
 	/* We are no longer associated with this CPU. */
 	critical_exit();
 
-	/* And the zone.. */
+	/*
+	 * We bump the uz count when the cache size is insufficient to
+	 * handle the working set.
+	 */
+	if (lockfail && zone->uz_count < BUCKET_MAX)
+		zone->uz_count++;
 	ZONE_UNLOCK(zone);
 
 #ifdef UMA_DEBUG_ALLOC
@@ -3046,6 +3174,10 @@ uma_reclaim(void)
 #endif
 	bucket_enable();
 	zone_foreach(zone_drain);
+	if (vm_page_count_min()) {
+		cache_drain_safe(NULL);
+		zone_foreach(zone_drain);
+	}
 	/*
 	 * Some slabs may have been freed but this zone will be visited early
 	 * we visit again so that we can free pages that are empty once other
@@ -3342,8 +3474,8 @@ DB_SHOW_COMMAND(uma, db_show_uma)
 	uma_zone_t z;
 	int cachefree;
 
-	db_printf("%18s %8s %8s %8s %12s %8s\n", "Zone", "Size", "Used", "Free",
-	    "Requests", "Sleeps");
+	db_printf("%18s %8s %8s %8s %12s %8s %8s\n", "Zone", "Size", "Used",
+	    "Free", "Requests", "Sleeps", "Bucket");
 	LIST_FOREACH(kz, &uma_kegs, uk_link) {
 		LIST_FOREACH(z, &kz->uk_zones, uz_link) {
 			if (kz->uk_flags & UMA_ZFLAG_INTERNAL) {
@@ -3359,13 +3491,35 @@ DB_SHOW_COMMAND(uma, db_show_uma)
 				cachefree += kz->uk_free;
 			LIST_FOREACH(bucket, &z->uz_buckets, ub_link)
 				cachefree += bucket->ub_cnt;
-			db_printf("%18s %8ju %8jd %8d %12ju %8ju\n", z->uz_name,
-			    (uintmax_t)kz->uk_size,
+			db_printf("%18s %8ju %8jd %8d %12ju %8ju %8u\n",
+			    z->uz_name, (uintmax_t)kz->uk_size,
 			    (intmax_t)(allocs - frees), cachefree,
-			    (uintmax_t)allocs, sleeps);
+			    (uintmax_t)allocs, sleeps, z->uz_count);
 			if (db_pager_quit)
 				return;
 		}
 	}
 }
+
+DB_SHOW_COMMAND(umacache, db_show_umacache)
+{
+	uint64_t allocs, frees;
+	uma_bucket_t bucket;
+	uma_zone_t z;
+	int cachefree;
+
+	db_printf("%18s %8s %8s %8s %12s %8s\n", "Zone", "Size", "Used", "Free",
+	    "Requests", "Bucket");
+	LIST_FOREACH(z, &uma_cachezones, uz_link) {
+		uma_zone_sumstat(z, &cachefree, &allocs, &frees, NULL);
+		LIST_FOREACH(bucket, &z->uz_buckets, ub_link)
+			cachefree += bucket->ub_cnt;
+		db_printf("%18s %8ju %8jd %8d %12ju %8u\n",
+		    z->uz_name, (uintmax_t)z->uz_size,
+		    (intmax_t)(allocs - frees), cachefree,
+		    (uintmax_t)allocs, z->uz_count);
+		if (db_pager_quit)
+			return;
+	}
+}
 #endif
diff --git a/sys/vm/uma_int.h b/sys/vm/uma_int.h
index 00e8519e07c..1ffc7d5fabb 100644
--- a/sys/vm/uma_int.h
+++ b/sys/vm/uma_int.h
@@ -300,7 +300,8 @@ struct uma_zone {
 	volatile u_long	uz_fails;	/* Total number of alloc failures */
 	volatile u_long	uz_frees;	/* Total number of frees */
 	uint64_t	uz_sleeps;	/* Total number of alloc sleeps */
-	uint16_t	uz_count;	/* Highest amount of items in bucket */
+	uint16_t	uz_count;	/* Amount of items in full bucket */
+	uint16_t	uz_count_min;	/* Minimal amount of items there */
 
 	/* The next three fields are used to print a rate-limited warnings. */
 	const char	*uz_warning;	/* Warning to print on failure */
diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c
index 26ad9f30864..4f4015da451 100644
--- a/sys/vm/vm_fault.c
+++ b/sys/vm/vm_fault.c
@@ -1079,7 +1079,7 @@ vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len,
 
 	if (len == 0)
 		return (0);
-	end = round_page(addr + len);	
+	end = round_page(addr + len);
 	addr = trunc_page(addr);
 
 	/*
@@ -1088,9 +1088,9 @@ vm_fault_quick_hold_pages(vm_map_t map, vm_offset_t addr, vm_size_t len,
 	if (addr < vm_map_min(map) || addr > end || end > vm_map_max(map))
 		return (-1);
 
-	count = howmany(end - addr, PAGE_SIZE);
-	if (count > max_count)
+	if (atop(end - addr) > max_count)
 		panic("vm_fault_quick_hold_pages: count > max_count");
+	count = atop(end - addr);
 
 	/*
 	 * Most likely, the physical pages are resident in the pmap, so it is
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
index 2e40bbd32dd..e3842a3182c 100644
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -1876,6 +1876,9 @@ vm_map_protect(vm_map_t map, vm_offset_t start, vm_offset_t end,
 	struct ucred *cred;
 	vm_prot_t old_prot;
 
+	if (start == end)
+		return (KERN_SUCCESS);
+
 	vm_map_lock(map);
 
 	VM_MAP_RANGE_CHECK(map, start, end);
@@ -2030,12 +2033,16 @@ vm_map_madvise(
 	case MADV_AUTOSYNC:
 	case MADV_NOCORE:
 	case MADV_CORE:
+		if (start == end)
+			return (KERN_SUCCESS);
 		modify_map = 1;
 		vm_map_lock(map);
 		break;
 	case MADV_WILLNEED:
 	case MADV_DONTNEED:
 	case MADV_FREE:
+		if (start == end)
+			return (KERN_SUCCESS);
 		vm_map_lock_read(map);
 		break;
 	default:
@@ -2190,6 +2197,8 @@ vm_map_inherit(vm_map_t map, vm_offset_t start, vm_offset_t end,
 	default:
 		return (KERN_INVALID_ARGUMENT);
 	}
+	if (start == end)
+		return (KERN_SUCCESS);
 	vm_map_lock(map);
 	VM_MAP_RANGE_CHECK(map, start, end);
 	if (vm_map_lookup_entry(map, start, &temp_entry)) {
@@ -2222,6 +2231,8 @@ vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 	int rv;
 	boolean_t need_wakeup, result, user_unwire;
 
+	if (start == end)
+		return (KERN_SUCCESS);
 	user_unwire = (flags & VM_MAP_WIRE_USER) ? TRUE : FALSE;
 	vm_map_lock(map);
 	VM_MAP_RANGE_CHECK(map, start, end);
@@ -2288,6 +2299,9 @@ vm_map_unwire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 		 * Mark the entry in case the map lock is released.  (See
 		 * above.)
 		 */
+		KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) == 0 &&
+		    entry->wiring_thread == NULL,
+		    ("owned map entry %p", entry));
 		entry->eflags |= MAP_ENTRY_IN_TRANSITION;
 		entry->wiring_thread = curthread;
 		/*
@@ -2356,7 +2370,9 @@ done:
 			}
 		}
 		KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) != 0,
-		    ("vm_map_unwire: in-transition flag missing"));
+		    ("vm_map_unwire: in-transition flag missing %p", entry));
+		KASSERT(entry->wiring_thread == curthread,
+		    ("vm_map_unwire: alien wire %p", entry));
 		entry->eflags &= ~MAP_ENTRY_IN_TRANSITION;
 		entry->wiring_thread = NULL;
 		if (entry->eflags & MAP_ENTRY_NEEDS_WAKEUP) {
@@ -2387,6 +2403,8 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 	boolean_t fictitious, need_wakeup, result, user_wire;
 	vm_prot_t prot;
 
+	if (start == end)
+		return (KERN_SUCCESS);
 	prot = 0;
 	if (flags & VM_MAP_WIRE_WRITE)
 		prot |= VM_PROT_WRITE;
@@ -2456,6 +2474,9 @@ vm_map_wire(vm_map_t map, vm_offset_t start, vm_offset_t end,
 		 * Mark the entry in case the map lock is released.  (See
 		 * above.)
 		 */
+		KASSERT((entry->eflags & MAP_ENTRY_IN_TRANSITION) == 0 &&
+		    entry->wiring_thread == NULL,
+		    ("owned map entry %p", entry));
 		entry->eflags |= MAP_ENTRY_IN_TRANSITION;
 		entry->wiring_thread = curthread;
 		if ((entry->protection & (VM_PROT_READ | VM_PROT_EXECUTE)) == 0
@@ -2825,6 +2846,8 @@ vm_map_delete(vm_map_t map, vm_offset_t start, vm_offset_t end)
 	vm_map_entry_t first_entry;
 
 	VM_MAP_ASSERT_LOCKED(map);
+	if (start == end)
+		return (KERN_SUCCESS);
 
 	/*
 	 * Find the start of the region, and clip it
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index 9dea3a1cbd9..8683e2f05ec 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -2099,8 +2099,9 @@ vm_object_coalesce(vm_object_t prev_object, vm_ooffset_t prev_offset,
 	if (prev_object == NULL)
 		return (TRUE);
 	VM_OBJECT_WLOCK(prev_object);
-	if (prev_object->type != OBJT_DEFAULT &&
-	    prev_object->type != OBJT_SWAP) {
+	if ((prev_object->type != OBJT_DEFAULT &&
+	    prev_object->type != OBJT_SWAP) ||
+	    (prev_object->flags & OBJ_TMPFS) != 0) {
 		VM_OBJECT_WUNLOCK(prev_object);
 		return (FALSE);
 	}
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 696f4eebfef..0242fe54f6f 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -1200,7 +1200,7 @@ vm_page_replace(vm_page_t mnew, vm_object_t object, vm_pindex_t pindex)
 
 	mnew->object = object;
 	mnew->pindex = pindex;
-	mold = vm_radix_replace(&object->rtree, mnew, pindex);
+	mold = vm_radix_replace(&object->rtree, mnew);
 	KASSERT(mold->queue == PQ_NONE,
 	    ("vm_page_replace: mold is on a paging queue"));
 
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 5660b561a0f..e7436408fb1 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -570,6 +570,7 @@ vm_pageout_launder(struct vm_pagequeue *pq, int tries, vm_paddr_t low,
 	vm_object_t object;
 	vm_paddr_t pa;
 	vm_page_t m, m_tmp, next;
+	int lockmode;
 
 	vm_pagequeue_lock(pq);
 	TAILQ_FOREACH_SAFE(m, &pq->pq_pl, plinks.q, next) {
@@ -605,7 +606,9 @@ vm_pageout_launder(struct vm_pagequeue *pq, int tries, vm_paddr_t low,
 				vm_object_reference_locked(object);
 				VM_OBJECT_WUNLOCK(object);
 				(void)vn_start_write(vp, &mp, V_WAIT);
-				vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+				lockmode = MNT_SHARED_WRITES(vp->v_mount) ?
+				    LK_SHARED : LK_EXCLUSIVE;
+				vn_lock(vp, lockmode | LK_RETRY);
 				VM_OBJECT_WLOCK(object);
 				vm_object_page_clean(object, 0, 0, OBJPC_SYNC);
 				VM_OBJECT_WUNLOCK(object);
@@ -902,6 +905,7 @@ vm_pageout_scan(struct vm_domain *vmd, int pass)
 	int act_delta;
 	int vnodes_skipped = 0;
 	int maxlaunder;
+	int lockmode;
 	boolean_t queues_locked;
 
 	/*
@@ -1193,7 +1197,9 @@ vm_pageout_scan(struct vm_domain *vmd, int pass)
 				    ("vp %p with NULL v_mount", vp));
 				vm_object_reference_locked(object);
 				VM_OBJECT_WUNLOCK(object);
-				if (vget(vp, LK_EXCLUSIVE | LK_TIMELOCK,
+				lockmode = MNT_SHARED_WRITES(vp->v_mount) ?
+				    LK_SHARED : LK_EXCLUSIVE;
+				if (vget(vp, lockmode | LK_TIMELOCK,
 				    curthread)) {
 					VM_OBJECT_WLOCK(object);
 					++pageout_lock_miss;
diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c
index ce6dfd3c161..a79a5f6463e 100644
--- a/sys/vm/vm_phys.c
+++ b/sys/vm/vm_phys.c
@@ -161,9 +161,9 @@ sysctl_vm_phys_free(SYSCTL_HANDLER_ARGS)
 		return (error);
 	sbuf_new_for_sysctl(&sbuf, NULL, 128 * vm_ndomains, req);
 	for (dom = 0; dom < vm_ndomains; dom++) {
-		sbuf_printf(&sbuf,"DOMAIN: %d\n", dom);
+		sbuf_printf(&sbuf,"\nDOMAIN %d:\n", dom);
 		for (flind = 0; flind < vm_nfreelists; flind++) {
-			sbuf_printf(&sbuf, "FREE LIST %d:\n"
+			sbuf_printf(&sbuf, "\nFREE LIST %d:\n"
 			    "\n  ORDER (SIZE)  |  NUMBER"
 			    "\n              ", flind);
 			for (pind = 0; pind < VM_NFREEPOOL; pind++)
@@ -177,14 +177,12 @@ sysctl_vm_phys_free(SYSCTL_HANDLER_ARGS)
 				    1 << (PAGE_SHIFT - 10 + oind));
 				for (pind = 0; pind < VM_NFREEPOOL; pind++) {
 				fl = vm_phys_free_queues[dom][flind][pind];
-					sbuf_printf(&sbuf, "  |  %6.6d",
+					sbuf_printf(&sbuf, "  |  %6d",
 					    fl[oind].lcnt);
 				}
 				sbuf_printf(&sbuf, "\n");
 			}
-			sbuf_printf(&sbuf, "\n");
 		}
-		sbuf_printf(&sbuf, "\n");
 	}
 	error = sbuf_finish(&sbuf);
 	sbuf_delete(&sbuf);
diff --git a/sys/vm/vm_radix.c b/sys/vm/vm_radix.c
index ff311b2d5b5..7c6f7fa4032 100644
--- a/sys/vm/vm_radix.c
+++ b/sys/vm/vm_radix.c
@@ -788,20 +788,18 @@ vm_radix_reclaim_allnodes(struct vm_radix *rtree)
 }
 
 /*
- * Replace an existing page into the trie with another one.
- * Panics if the replacing page is not present or if the new page has an
- * invalid key.
+ * Replace an existing page in the trie with another one.
+ * Panics if there is not an old page in the trie at the new page's index.
  */
 vm_page_t
-vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage, vm_pindex_t index)
+vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage)
 {
 	struct vm_radix_node *rnode;
 	vm_page_t m;
+	vm_pindex_t index;
 	int slot;
 
-	KASSERT(newpage->pindex == index, ("%s: newpage index invalid",
-	    __func__));
-
+	index = newpage->pindex;
 	rnode = vm_radix_getroot(rtree);
 	if (rnode == NULL)
 		panic("%s: replacing page on an empty trie", __func__);
diff --git a/sys/vm/vm_radix.h b/sys/vm/vm_radix.h
index 4491860027b..63d27d4f088 100644
--- a/sys/vm/vm_radix.h
+++ b/sys/vm/vm_radix.h
@@ -43,8 +43,7 @@ vm_page_t	vm_radix_lookup_ge(struct vm_radix *rtree, vm_pindex_t index);
 vm_page_t	vm_radix_lookup_le(struct vm_radix *rtree, vm_pindex_t index);
 void		vm_radix_reclaim_allnodes(struct vm_radix *rtree);
 void		vm_radix_remove(struct vm_radix *rtree, vm_pindex_t index);
-vm_page_t	vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage,
-		    vm_pindex_t index);
+vm_page_t	vm_radix_replace(struct vm_radix *rtree, vm_page_t newpage);
 
 #endif /* _KERNEL */
 #endif /* !_VM_RADIX_H_ */
diff --git a/sys/x86/acpica/madt.c b/sys/x86/acpica/madt.c
index 66af032732c..5929fde731b 100644
--- a/sys/x86/acpica/madt.c
+++ b/sys/x86/acpica/madt.c
@@ -517,9 +517,9 @@ madt_parse_local_nmi(ACPI_MADT_LOCAL_APIC_NMI *nmi)
 		return;
 	}
 	if (nmi->Lint == 0)
-		pin = LVT_LINT0;
+		pin = APIC_LVT_LINT0;
 	else
-		pin = LVT_LINT1;
+		pin = APIC_LVT_LINT1;
 	lapic_set_lvt_mode(apic_id, pin, APIC_LVT_DM_NMI);
 	if (!(nmi->IntiFlags & ACPI_MADT_TRIGGER_CONFORMS))
 		lapic_set_lvt_triggermode(apic_id, pin,
@@ -575,4 +575,4 @@ madt_set_ids(void *dummy)
 			    la->la_acpi_id);
 	}
 }
-SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_ANY, madt_set_ids, NULL);
+SYSINIT(madt_set_ids, SI_SUB_CPU, SI_ORDER_MIDDLE, madt_set_ids, NULL);
diff --git a/sys/x86/cpufreq/est.c b/sys/x86/cpufreq/est.c
index cc9502d0455..d8acfe672fb 100644
--- a/sys/x86/cpufreq/est.c
+++ b/sys/x86/cpufreq/est.c
@@ -1288,10 +1288,9 @@ est_set_id16(device_t dev, uint16_t id16, int need_check)
 	msr = (msr & ~0xffff) | id16;
 	wrmsr(MSR_PERF_CTL, msr);
 
-	/* Wait a short while for the new setting.  XXX Is this necessary? */
-	DELAY(EST_TRANS_LAT);
-
 	if  (need_check) {
+		/* Wait a short while and read the new status. */
+		DELAY(EST_TRANS_LAT);
 		est_get_id16(&new_id16);
 		if (new_id16 != id16) {
 			if (bootverbose)
diff --git a/sys/x86/cpufreq/hwpstate.c b/sys/x86/cpufreq/hwpstate.c
index 272792658e6..e86e31aab4c 100644
--- a/sys/x86/cpufreq/hwpstate.c
+++ b/sys/x86/cpufreq/hwpstate.c
@@ -184,16 +184,21 @@ hwpstate_goto_pstate(device_t dev, int pstate)
 			id, PCPU_GET(cpuid));
 		/* Go To Px-state */
 		wrmsr(MSR_AMD_10H_11H_CONTROL, id);
+	}
+	CPU_FOREACH(i) {
+		/* Bind to each cpu. */
+		thread_lock(curthread);
+		sched_bind(curthread, i);
+		thread_unlock(curthread);
 		/* wait loop (100*100 usec is enough ?) */
 		for(j = 0; j < 100; j++){
+			/* get the result. not assure msr=id */
 			msr = rdmsr(MSR_AMD_10H_11H_STATUS);
 			if(msr == id){
 				break;
 			}
 			DELAY(100);
 		}
-		/* get the result. not assure msr=id */
-		msr = rdmsr(MSR_AMD_10H_11H_STATUS);
 		HWPSTATE_DEBUG(dev, "result  P%d-state on cpu%d\n",
 		    (int)msr, PCPU_GET(cpuid));
 		if (msr != id) {
diff --git a/sys/x86/include/apicreg.h b/sys/x86/include/apicreg.h
index 00cb571154e..283d50e7222 100644
--- a/sys/x86/include/apicreg.h
+++ b/sys/x86/include/apicreg.h
@@ -357,6 +357,16 @@ typedef struct IOAPIC ioapic_t;
 #define APIC_TDCR_128		0x0a
 #define APIC_TDCR_1		0x0b
 
+/* LVT table indices */
+#define	APIC_LVT_LINT0		0
+#define	APIC_LVT_LINT1		1
+#define	APIC_LVT_TIMER		2
+#define	APIC_LVT_ERROR		3
+#define	APIC_LVT_PMC		4
+#define	APIC_LVT_THERMAL	5
+#define	APIC_LVT_CMCI		6
+#define	APIC_LVT_MAX		APIC_LVT_CMCI
+
 /******************************************************************************
  * I/O APIC defines
  */
diff --git a/sys/x86/include/busdma_impl.h b/sys/x86/include/busdma_impl.h
new file mode 100644
index 00000000000..b851e7a6079
--- /dev/null
+++ b/sys/x86/include/busdma_impl.h
@@ -0,0 +1,96 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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	__X86_BUSDMA_IMPL_H
+#define	__X86_BUSDMA_IMPL_H
+
+struct bus_dma_tag_common {
+	struct bus_dma_impl *impl;
+	struct bus_dma_tag_common *parent;
+	bus_size_t	  alignment;
+	bus_addr_t	  boundary;
+	bus_addr_t	  lowaddr;
+	bus_addr_t	  highaddr;
+	bus_dma_filter_t *filter;
+	void		 *filterarg;
+	bus_size_t	  maxsize;
+	u_int		  nsegments;
+	bus_size_t	  maxsegsz;
+	int		  flags;
+	bus_dma_lock_t	 *lockfunc;
+	void		 *lockfuncarg;
+	int		  ref_count;
+};
+
+struct bus_dma_impl {
+	int (*tag_create)(bus_dma_tag_t parent,
+	    bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr,
+	    bus_addr_t highaddr, bus_dma_filter_t *filter,
+	    void *filterarg, bus_size_t maxsize, int nsegments,
+	    bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
+	    void *lockfuncarg, bus_dma_tag_t *dmat);
+	int (*tag_destroy)(bus_dma_tag_t dmat);
+	int (*map_create)(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp);
+	int (*map_destroy)(bus_dma_tag_t dmat, bus_dmamap_t map);
+	int (*mem_alloc)(bus_dma_tag_t dmat, void** vaddr, int flags,
+	    bus_dmamap_t *mapp);
+	void (*mem_free)(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map);
+	int (*load_ma)(bus_dma_tag_t dmat, bus_dmamap_t map,
+	    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+	    bus_dma_segment_t *segs, int *segp);
+	int (*load_phys)(bus_dma_tag_t dmat, bus_dmamap_t map,
+	    vm_paddr_t buf, bus_size_t buflen, int flags,
+	    bus_dma_segment_t *segs, int *segp);
+	int (*load_buffer)(bus_dma_tag_t dmat, bus_dmamap_t map,
+	    void *buf, bus_size_t buflen, pmap_t pmap, int flags,
+	    bus_dma_segment_t *segs, int *segp);
+	void (*map_waitok)(bus_dma_tag_t dmat, bus_dmamap_t map,
+	    struct memdesc *mem, bus_dmamap_callback_t *callback,
+	    void *callback_arg);
+	bus_dma_segment_t *(*map_complete)(bus_dma_tag_t dmat, bus_dmamap_t map,
+	    bus_dma_segment_t *segs, int nsegs, int error);
+	void (*map_unload)(bus_dma_tag_t dmat, bus_dmamap_t map);
+	void (*map_sync)(bus_dma_tag_t dmat, bus_dmamap_t map,
+	    bus_dmasync_op_t op);
+};
+
+void bus_dma_dflt_lock(void *arg, bus_dma_lock_op_t op);
+int bus_dma_run_filter(struct bus_dma_tag_common *dmat, bus_addr_t paddr);
+int common_bus_dma_tag_create(struct bus_dma_tag_common *parent,
+    bus_size_t alignment,
+    bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
+    bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize,
+    int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
+    void *lockfuncarg, size_t sz, void **dmat);
+
+extern struct bus_dma_impl bus_dma_bounce_impl;
+
+#endif
diff --git a/sys/x86/include/mptable.h b/sys/x86/include/mptable.h
index 85a21c939a3..b8a9d791a6f 100644
--- a/sys/x86/include/mptable.h
+++ b/sys/x86/include/mptable.h
@@ -85,10 +85,10 @@ typedef struct PROCENTRY {
 	u_char  apic_id;
 	u_char  apic_version;
 	u_char  cpu_flags;
-	u_long  cpu_signature;
-	u_long  feature_flags;
-	u_long  reserved1;
-	u_long  reserved2;
+	u_int32_t cpu_signature;
+	u_int32_t feature_flags;
+	u_int32_t reserved1;
+	u_int32_t reserved2;
 }      *proc_entry_ptr;
 
 #define PROCENTRY_FLAG_EN	0x01
diff --git a/sys/x86/include/psl.h b/sys/x86/include/psl.h
index 12d05c5cfdb..47851e0bb0b 100644
--- a/sys/x86/include/psl.h
+++ b/sys/x86/include/psl.h
@@ -77,8 +77,16 @@
  * is undesirable but it may as well be allowed since users can inflict
  * it on the kernel directly.  Changes to PSL_AC are silently ignored on
  * 386's.
+ *
+ * Users are allowed to change the privileged flag PSL_RF.  The cpu sets PSL_RF
+ * in tf_eflags for faults.  Debuggers should sometimes set it there too.
+ * tf_eflags is kept in the signal context during signal handling and there is
+ * no other place to remember it, so the PSL_RF bit may be corrupted by the
+ * signal handler without us knowing.  Corruption of the PSL_RF bit at worst
+ * causes one more or one less debugger trap, so allowing it is fairly
+ * harmless.   
  */
 #define	PSL_USERCHANGE (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_T \
-			| PSL_D | PSL_V | PSL_NT | PSL_AC | PSL_ID)
+			| PSL_D | PSL_V | PSL_NT | PSL_RF | PSL_AC | PSL_ID)
 
 #endif /* !_MACHINE_PSL_H_ */
diff --git a/sys/x86/include/specialreg.h b/sys/x86/include/specialreg.h
index 6d9c3913bfb..5bcd57b8d11 100644
--- a/sys/x86/include/specialreg.h
+++ b/sys/x86/include/specialreg.h
@@ -202,9 +202,15 @@
 #define	AMDID2_WDT	0x00002000
 #define	AMDID2_LWP	0x00008000
 #define	AMDID2_FMA4	0x00010000
+#define	AMDID2_TCE	0x00020000
 #define	AMDID2_NODE_ID	0x00080000
 #define	AMDID2_TBM	0x00200000
 #define	AMDID2_TOPOLOGY	0x00400000
+#define	AMDID2_PCXC	0x00800000
+#define	AMDID2_PNXC	0x01000000
+#define	AMDID2_DBE	0x04000000
+#define	AMDID2_PTSC	0x08000000
+#define	AMDID2_PTSCEL2I	0x10000000
 
 /*
  * CPUID instruction 1 eax info
diff --git a/sys/x86/include/stdarg.h b/sys/x86/include/stdarg.h
index c315dfcee13..95bd02a37bb 100644
--- a/sys/x86/include/stdarg.h
+++ b/sys/x86/include/stdarg.h
@@ -64,6 +64,8 @@ typedef	__va_list	va_list;
 	(((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long))
 #define	va_start(ap, last) \
 	((ap) = (va_list)&(last) + __va_size(last))
+#define va_copy(dst, src) \
+	((dst) = (src))
 #define	va_arg(ap, type) \
 	(*(type *)((ap) += __va_size(type), (ap) - __va_size(type)))
 #define	va_end(ap)
diff --git a/sys/x86/include/trap.h b/sys/x86/include/trap.h
index a395d6241a5..c0d9e1619c1 100644
--- a/sys/x86/include/trap.h
+++ b/sys/x86/include/trap.h
@@ -63,7 +63,6 @@
 #define	T_XMMFLT	29	/* SIMD floating-point exception */
 #define	T_RESERVED	30	/* reserved (unknown) */
 #define	T_DTRACE_RET	32	/* DTrace pid return */
-#define	T_DTRACE_PROBE	33	/* DTrace fasttrap probe */
 
 /* XXX most of the following codes aren't used, but could be. */
 
diff --git a/sys/x86/iommu/busdma_dmar.c b/sys/x86/iommu/busdma_dmar.c
new file mode 100644
index 00000000000..cada29d4143
--- /dev/null
+++ b/sys/x86/iommu/busdma_dmar.c
@@ -0,0 +1,752 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/malloc.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/interrupt.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/lock.h>
+#include <sys/proc.h>
+#include <sys/memdesc.h>
+#include <sys/mutex.h>
+#include <sys/sysctl.h>
+#include <sys/rman.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
+#include <sys/uio.h>
+#include <dev/pci/pcivar.h>
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_object.h>
+#include <vm/vm_page.h>
+#include <vm/vm_map.h>
+#include <machine/atomic.h>
+#include <machine/bus.h>
+#include <machine/md_var.h>
+#include <machine/specialreg.h>
+#include <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/busdma_dmar.h>
+#include <x86/iommu/intel_dmar.h>
+
+/*
+ * busdma_dmar.c, the implementation of the busdma(9) interface using
+ * DMAR units from Intel VT-d.
+ */
+
+static bool
+dmar_bus_dma_is_dev_disabled(device_t dev)
+{
+	char str[128], *env;
+	int domain, bus, slot, func;
+
+	domain = pci_get_domain(dev);
+	bus = pci_get_bus(dev);
+	slot = pci_get_slot(dev);
+	func = pci_get_function(dev);
+	snprintf(str, sizeof(str), "hw.busdma.pci%d.%d.%d.%d.bounce",
+	    domain, bus, slot, func);
+	env = getenv(str);
+	if (env == NULL)
+		return (false);
+	freeenv(env);
+	return (true);
+}
+
+struct dmar_ctx *
+dmar_instantiate_ctx(struct dmar_unit *dmar, device_t dev, bool rmrr)
+{
+	struct dmar_ctx *ctx;
+	bool disabled;
+
+	/*
+	 * If the user requested the IOMMU disabled for the device, we
+	 * cannot disable the DMAR, due to possibility of other
+	 * devices on the same DMAR still requiring translation.
+	 * Instead provide the identity mapping for the device
+	 * context.
+	 */
+	disabled = dmar_bus_dma_is_dev_disabled(dev);
+	ctx = dmar_get_ctx(dmar, dev, disabled, rmrr);
+	if (ctx == NULL)
+		return (NULL);
+	ctx->ctx_tag.owner = dev;
+	if (disabled) {
+		/*
+		 * Keep the first reference on context, release the
+		 * later refs.
+		 */
+		DMAR_LOCK(dmar);
+		if ((ctx->flags & DMAR_CTX_DISABLED) == 0) {
+			ctx->flags |= DMAR_CTX_DISABLED;
+			DMAR_UNLOCK(dmar);
+		} else {
+			dmar_free_ctx_locked(dmar, ctx);
+		}
+		ctx = NULL;
+	}
+	return (ctx);
+}
+
+bus_dma_tag_t
+dmar_get_dma_tag(device_t dev, device_t child)
+{
+	struct dmar_unit *dmar;
+	struct dmar_ctx *ctx;
+	bus_dma_tag_t res;
+
+	dmar = dmar_find(child);
+	/* Not in scope of any DMAR ? */
+	if (dmar == NULL)
+		return (NULL);
+	dmar_quirks_pre_use(dmar);
+	dmar_instantiate_rmrr_ctxs(dmar);
+
+	ctx = dmar_instantiate_ctx(dmar, child, false);
+	res = ctx == NULL ? NULL : (bus_dma_tag_t)&ctx->ctx_tag;
+	return (res);
+}
+
+static MALLOC_DEFINE(M_DMAR_DMAMAP, "dmar_dmamap", "Intel DMAR DMA Map");
+
+static void dmar_bus_schedule_dmamap(struct dmar_unit *unit,
+    struct bus_dmamap_dmar *map);
+
+static int
+dmar_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
+    bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
+    bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize,
+    int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
+    void *lockfuncarg, bus_dma_tag_t *dmat)
+{
+	struct bus_dma_tag_dmar *newtag, *oldtag;
+	int error;
+
+	*dmat = NULL;
+	error = common_bus_dma_tag_create(parent != NULL ?
+	    &((struct bus_dma_tag_dmar *)parent)->common : NULL, alignment,
+	    boundary, lowaddr, highaddr, filter, filterarg, maxsize,
+	    nsegments, maxsegsz, flags, lockfunc, lockfuncarg,
+	    sizeof(struct bus_dma_tag_dmar), (void **)&newtag);
+	if (error != 0)
+		goto out;
+
+	oldtag = (struct bus_dma_tag_dmar *)parent;
+	newtag->common.impl = &bus_dma_dmar_impl;
+	newtag->ctx = oldtag->ctx;
+	newtag->owner = oldtag->owner;
+
+	*dmat = (bus_dma_tag_t)newtag;
+out:
+	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
+	    __func__, newtag, (newtag != NULL ? newtag->common.flags : 0),
+	    error);
+	return (error);
+}
+
+static int
+dmar_bus_dma_tag_destroy(bus_dma_tag_t dmat1)
+{
+	struct bus_dma_tag_dmar *dmat, *dmat_copy, *parent;
+	int error;
+
+	error = 0;
+	dmat_copy = dmat = (struct bus_dma_tag_dmar *)dmat1;
+
+	if (dmat != NULL) {
+		if (dmat->map_count != 0) {
+			error = EBUSY;
+			goto out;
+		}
+		while (dmat != NULL) {
+			parent = (struct bus_dma_tag_dmar *)dmat->common.parent;
+			if (atomic_fetchadd_int(&dmat->common.ref_count, -1) ==
+			    1) {
+				if (dmat == &dmat->ctx->ctx_tag)
+					dmar_free_ctx(dmat->ctx);
+				free(dmat->segments, M_DMAR_DMAMAP);
+				free(dmat, M_DEVBUF);
+				dmat = parent;
+			} else
+				dmat = NULL;
+		}
+	}
+out:
+	CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error);
+	return (error);
+}
+
+static int
+dmar_bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+
+	tag = (struct bus_dma_tag_dmar *)dmat;
+	map = malloc(sizeof(*map), M_DMAR_DMAMAP, M_NOWAIT | M_ZERO);
+	if (map == NULL) {
+		*mapp = NULL;
+		return (ENOMEM);
+	}
+	if (tag->segments == NULL) {
+		tag->segments = malloc(sizeof(bus_dma_segment_t) *
+		    tag->common.nsegments, M_DMAR_DMAMAP, M_NOWAIT);
+		if (tag->segments == NULL) {
+			free(map, M_DMAR_DMAMAP);
+			*mapp = NULL;
+			return (ENOMEM);
+		}
+	}
+	TAILQ_INIT(&map->map_entries);
+	map->tag = tag;
+	map->locked = true;
+	map->cansleep = false;
+	tag->map_count++;
+	*mapp = (bus_dmamap_t)map;
+	
+	return (0);
+}
+
+static int
+dmar_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map1)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+
+	tag = (struct bus_dma_tag_dmar *)dmat;
+	map = (struct bus_dmamap_dmar *)map1;
+	if (map != NULL) {
+		DMAR_CTX_LOCK(tag->ctx);
+		if (!TAILQ_EMPTY(&map->map_entries)) {
+			DMAR_CTX_UNLOCK(tag->ctx);
+			return (EBUSY);
+		}
+		DMAR_CTX_UNLOCK(tag->ctx);
+		free(map, M_DMAR_DMAMAP);
+	}
+	tag->map_count--;
+	return (0);
+}
+
+
+static int
+dmar_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
+    bus_dmamap_t *mapp)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+	int error, mflags;
+	vm_memattr_t attr;
+
+	error = dmar_bus_dmamap_create(dmat, flags, mapp);
+	if (error != 0)
+		return (error);
+
+	mflags = (flags & BUS_DMA_NOWAIT) != 0 ? M_NOWAIT : M_WAITOK;
+	mflags |= (flags & BUS_DMA_ZERO) != 0 ? M_ZERO : 0;
+	attr = (flags & BUS_DMA_NOCACHE) != 0 ? VM_MEMATTR_UNCACHEABLE :
+	    VM_MEMATTR_DEFAULT;
+	
+	tag = (struct bus_dma_tag_dmar *)dmat;
+	map = (struct bus_dmamap_dmar *)*mapp;
+
+	if (tag->common.maxsize < PAGE_SIZE &&
+	    tag->common.alignment <= tag->common.maxsize &&
+	    attr == VM_MEMATTR_DEFAULT) {
+		*vaddr = malloc(tag->common.maxsize, M_DEVBUF, mflags);
+		map->flags |= BUS_DMAMAP_DMAR_MALLOC;
+	} else {
+		*vaddr = (void *)kmem_alloc_attr(kernel_arena,
+		    tag->common.maxsize, mflags, 0ul, BUS_SPACE_MAXADDR,
+		    attr);
+		map->flags |= BUS_DMAMAP_DMAR_KMEM_ALLOC;
+	}
+	if (*vaddr == NULL) {
+		dmar_bus_dmamap_destroy(dmat, *mapp);
+		*mapp = NULL;
+		return (ENOMEM);
+	}
+	return (0);
+}
+
+static void
+dmar_bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map1)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+
+	tag = (struct bus_dma_tag_dmar *)dmat;
+	map = (struct bus_dmamap_dmar *)map1;
+
+	if ((map->flags & BUS_DMAMAP_DMAR_MALLOC) != 0) {
+		free(vaddr, M_DEVBUF);
+		map->flags &= ~BUS_DMAMAP_DMAR_MALLOC;
+	} else {
+		KASSERT((map->flags & BUS_DMAMAP_DMAR_KMEM_ALLOC) != 0,
+		    ("dmar_bus_dmamem_free for non alloced map %p", map));
+		kmem_free(kernel_arena, (vm_offset_t)vaddr, tag->common.maxsize);
+		map->flags &= ~BUS_DMAMAP_DMAR_KMEM_ALLOC;
+	}
+
+	dmar_bus_dmamap_destroy(dmat, map1);
+}
+
+static int
+dmar_bus_dmamap_load_something1(struct bus_dma_tag_dmar *tag,
+    struct bus_dmamap_dmar *map, vm_page_t *ma, int offset, bus_size_t buflen,
+    int flags, bus_dma_segment_t *segs, int *segp,
+    struct dmar_map_entries_tailq *unroll_list)
+{
+	struct dmar_ctx *ctx;
+	struct dmar_map_entry *entry;
+	dmar_gaddr_t size;
+	bus_size_t buflen1;
+	int error, idx, gas_flags, seg;
+
+	if (segs == NULL)
+		segs = tag->segments;
+	ctx = tag->ctx;
+	seg = *segp;
+	error = 0;
+	idx = 0;
+	while (buflen > 0) {
+		seg++;
+		if (seg >= tag->common.nsegments) {
+			error = EFBIG;
+			break;
+		}
+		buflen1 = buflen > tag->common.maxsegsz ?
+		    tag->common.maxsegsz : buflen;
+		buflen -= buflen1;
+		size = round_page(offset + buflen1);
+
+		/*
+		 * (Too) optimistically allow split if there are more
+		 * then one segments left.
+		 */
+		gas_flags = map->cansleep ? DMAR_GM_CANWAIT : 0;
+		if (seg + 1 < tag->common.nsegments)
+			gas_flags |= DMAR_GM_CANSPLIT;
+
+		error = dmar_gas_map(ctx, &tag->common, size,
+		    DMAR_MAP_ENTRY_READ | DMAR_MAP_ENTRY_WRITE,
+		    gas_flags, ma + idx, &entry);
+		if (error != 0)
+			break;
+		if ((gas_flags & DMAR_GM_CANSPLIT) != 0) {
+			KASSERT(size >= entry->end - entry->start,
+			    ("split increased entry size %jx %jx %jx",
+			    (uintmax_t)size, (uintmax_t)entry->start,
+			    (uintmax_t)entry->end));
+			size = entry->end - entry->start;
+			if (buflen1 > size)
+				buflen1 = size;
+		} else {
+			KASSERT(entry->end - entry->start == size,
+			    ("no split allowed %jx %jx %jx",
+			    (uintmax_t)size, (uintmax_t)entry->start,
+			    (uintmax_t)entry->end));
+		}
+
+		KASSERT(((entry->start + offset) & (tag->common.alignment - 1))
+		    == 0,
+		    ("alignment failed: ctx %p start 0x%jx offset %x "
+		    "align 0x%jx", ctx, (uintmax_t)entry->start, offset,
+		    (uintmax_t)tag->common.alignment));
+		KASSERT(entry->end <= tag->common.lowaddr ||
+		    entry->start >= tag->common.highaddr,
+		    ("entry placement failed: ctx %p start 0x%jx end 0x%jx "
+		    "lowaddr 0x%jx highaddr 0x%jx", ctx,
+		    (uintmax_t)entry->start, (uintmax_t)entry->end,
+		    (uintmax_t)tag->common.lowaddr,
+		    (uintmax_t)tag->common.highaddr));
+		KASSERT(dmar_test_boundary(entry->start, entry->end -
+		    entry->start, tag->common.boundary),
+		    ("boundary failed: ctx %p start 0x%jx end 0x%jx "
+		    "boundary 0x%jx", ctx, (uintmax_t)entry->start,
+		    (uintmax_t)entry->end, (uintmax_t)tag->common.boundary));
+		KASSERT(buflen1 <= tag->common.maxsegsz,
+		    ("segment too large: ctx %p start 0x%jx end 0x%jx "
+		    "maxsegsz 0x%jx", ctx, (uintmax_t)entry->start,
+		    (uintmax_t)entry->end, (uintmax_t)tag->common.maxsegsz));
+
+		DMAR_CTX_LOCK(ctx);
+		TAILQ_INSERT_TAIL(&map->map_entries, entry, dmamap_link);
+		entry->flags |= DMAR_MAP_ENTRY_MAP;
+		DMAR_CTX_UNLOCK(ctx);
+		TAILQ_INSERT_TAIL(unroll_list, entry, unroll_link);
+
+		segs[seg].ds_addr = entry->start + offset;
+		segs[seg].ds_len = buflen1;
+
+		idx += OFF_TO_IDX(trunc_page(offset + buflen1));
+		offset += buflen1;
+		offset &= DMAR_PAGE_MASK;
+	}
+	if (error == 0)
+		*segp = seg;
+	return (error);
+}
+
+static int
+dmar_bus_dmamap_load_something(struct bus_dma_tag_dmar *tag,
+    struct bus_dmamap_dmar *map, vm_page_t *ma, int offset, bus_size_t buflen,
+    int flags, bus_dma_segment_t *segs, int *segp)
+{
+	struct dmar_ctx *ctx;
+	struct dmar_map_entry *entry, *entry1;
+	struct dmar_map_entries_tailq unroll_list;
+	int error;
+
+	ctx = tag->ctx;
+	atomic_add_long(&ctx->loads, 1);
+
+	TAILQ_INIT(&unroll_list);
+	error = dmar_bus_dmamap_load_something1(tag, map, ma, offset,
+	    buflen, flags, segs, segp, &unroll_list);
+	if (error != 0) {
+		/*
+		 * The busdma interface does not allow us to report
+		 * partial buffer load, so unfortunately we have to
+		 * revert all work done.
+		 */
+		DMAR_CTX_LOCK(ctx);
+		TAILQ_FOREACH_SAFE(entry, &unroll_list, unroll_link,
+		    entry1) {
+			/*
+			 * No entries other than what we have created
+			 * during the failed run might have been
+			 * inserted there in between, since we own ctx
+			 * pglock.
+			 */
+			TAILQ_REMOVE(&map->map_entries, entry, dmamap_link);
+			TAILQ_REMOVE(&unroll_list, entry, unroll_link);
+			TAILQ_INSERT_TAIL(&ctx->unload_entries, entry,
+			    dmamap_link);
+		}
+		DMAR_CTX_UNLOCK(ctx);
+		taskqueue_enqueue(ctx->dmar->delayed_taskqueue,
+		    &ctx->unload_task);
+	}
+
+	if (error == ENOMEM && (flags & BUS_DMA_NOWAIT) == 0 &&
+	    !map->cansleep)
+		error = EINPROGRESS;
+	if (error == EINPROGRESS)
+		dmar_bus_schedule_dmamap(ctx->dmar, map);
+	return (error);
+}
+
+static int
+dmar_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map1,
+    struct vm_page **ma, bus_size_t tlen, int ma_offs, int flags,
+    bus_dma_segment_t *segs, int *segp)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+
+	tag = (struct bus_dma_tag_dmar *)dmat;
+	map = (struct bus_dmamap_dmar *)map1;
+	return (dmar_bus_dmamap_load_something(tag, map, ma, ma_offs, tlen,
+	    flags, segs, segp));
+}
+
+static int
+dmar_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map1,
+    vm_paddr_t buf, bus_size_t buflen, int flags, bus_dma_segment_t *segs,
+    int *segp)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+	vm_page_t *ma;
+	vm_paddr_t pstart, pend;
+	int error, i, ma_cnt, offset;
+
+	tag = (struct bus_dma_tag_dmar *)dmat;
+	map = (struct bus_dmamap_dmar *)map1;
+	pstart = trunc_page(buf);
+	pend = round_page(buf + buflen);
+	offset = buf & PAGE_MASK;
+	ma_cnt = OFF_TO_IDX(pend - pstart);
+	ma = malloc(sizeof(vm_page_t) * ma_cnt, M_DEVBUF, map->cansleep ?
+	    M_WAITOK : M_NOWAIT);
+	if (ma == NULL)
+		return (ENOMEM);
+	for (i = 0; i < ma_cnt; i++)
+		ma[i] = PHYS_TO_VM_PAGE(pstart + i * PAGE_SIZE);
+	error = dmar_bus_dmamap_load_something(tag, map, ma, offset, buflen,
+	    flags, segs, segp);
+	free(ma, M_DEVBUF);
+	return (error);
+}
+
+static int
+dmar_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map1, void *buf,
+    bus_size_t buflen, pmap_t pmap, int flags, bus_dma_segment_t *segs,
+    int *segp)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+	vm_page_t *ma, fma;
+	vm_paddr_t pstart, pend, paddr;
+	int error, i, ma_cnt, offset;
+
+	tag = (struct bus_dma_tag_dmar *)dmat;
+	map = (struct bus_dmamap_dmar *)map1;
+	pstart = trunc_page((vm_offset_t)buf);
+	pend = round_page((vm_offset_t)buf + buflen);
+	offset = (vm_offset_t)buf & PAGE_MASK;
+	ma_cnt = OFF_TO_IDX(pend - pstart);
+	ma = malloc(sizeof(vm_page_t) * ma_cnt, M_DEVBUF, map->cansleep ?
+	    M_WAITOK : M_NOWAIT);
+	if (ma == NULL)
+		return (ENOMEM);
+	if (dumping) {
+		/*
+		 * If dumping, do not attempt to call
+		 * PHYS_TO_VM_PAGE() at all.  It may return non-NULL
+		 * but the vm_page returned might be not initialized,
+		 * e.g. for the kernel itself.
+		 */
+		KASSERT(pmap == kernel_pmap, ("non-kernel address write"));
+		fma = malloc(sizeof(struct vm_page) * ma_cnt, M_DEVBUF,
+		    M_ZERO | (map->cansleep ? M_WAITOK : M_NOWAIT));
+		if (fma == NULL) {
+			free(ma, M_DEVBUF);
+			return (ENOMEM);
+		}
+		for (i = 0; i < ma_cnt; i++, pstart += PAGE_SIZE) {
+			paddr = pmap_kextract(pstart);
+			vm_page_initfake(&fma[i], paddr, VM_MEMATTR_DEFAULT);
+			ma[i] = &fma[i];
+		}
+	} else {
+		fma = NULL;
+		for (i = 0; i < ma_cnt; i++, pstart += PAGE_SIZE) {
+			if (pmap == kernel_pmap)
+				paddr = pmap_kextract(pstart);
+			else
+				paddr = pmap_extract(pmap, pstart);
+			ma[i] = PHYS_TO_VM_PAGE(paddr);
+			KASSERT(VM_PAGE_TO_PHYS(ma[i]) == paddr,
+			    ("PHYS_TO_VM_PAGE failed %jx %jx m %p",
+			    (uintmax_t)paddr, (uintmax_t)VM_PAGE_TO_PHYS(ma[i]),
+			    ma[i]));
+		}
+	}
+	error = dmar_bus_dmamap_load_something(tag, map, ma, offset, buflen,
+	    flags, segs, segp);
+	free(ma, M_DEVBUF);
+	free(fma, M_DEVBUF);
+	return (error);
+}
+
+static void
+dmar_bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map1,
+    struct memdesc *mem, bus_dmamap_callback_t *callback, void *callback_arg)
+{
+	struct bus_dmamap_dmar *map;
+
+	if (map1 == NULL)
+		return;
+	map = (struct bus_dmamap_dmar *)map1;
+	map->mem = *mem;
+	map->tag = (struct bus_dma_tag_dmar *)dmat;
+	map->callback = callback;
+	map->callback_arg = callback_arg;
+}
+
+static bus_dma_segment_t *
+dmar_bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map1,
+    bus_dma_segment_t *segs, int nsegs, int error)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+
+	tag = (struct bus_dma_tag_dmar *)dmat;
+	map = (struct bus_dmamap_dmar *)map1;
+
+	if (!map->locked) {
+		KASSERT(map->cansleep,
+		    ("map not locked and not sleepable context %p", map));
+
+		/*
+		 * We are called from the delayed context.  Relock the
+		 * driver.
+		 */
+		(tag->common.lockfunc)(tag->common.lockfuncarg, BUS_DMA_LOCK);
+		map->locked = true;
+	}
+
+	if (segs == NULL)
+		segs = tag->segments;
+	return (segs);
+}
+
+/*
+ * The limitations of busdma KPI forces the dmar to perform the actual
+ * unload, consisting of the unmapping of the map entries page tables,
+ * from the delayed context on i386, since page table page mapping
+ * might require a sleep to be successfull.  The unfortunate
+ * consequence is that the DMA requests can be served some time after
+ * the bus_dmamap_unload() call returned.
+ *
+ * On amd64, we assume that sf allocation cannot fail.
+ */
+static void
+dmar_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map1)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+	struct dmar_ctx *ctx;
+#if defined(__amd64__)
+	struct dmar_map_entries_tailq entries;
+#endif
+
+	tag = (struct bus_dma_tag_dmar *)dmat;
+	map = (struct bus_dmamap_dmar *)map1;
+	ctx = tag->ctx;
+	atomic_add_long(&ctx->unloads, 1);
+
+#if defined(__i386__)
+	DMAR_CTX_LOCK(ctx);
+	TAILQ_CONCAT(&ctx->unload_entries, &map->map_entries, dmamap_link);
+	DMAR_CTX_UNLOCK(ctx);
+	taskqueue_enqueue(ctx->dmar->delayed_taskqueue, &ctx->unload_task);
+#else /* defined(__amd64__) */
+	TAILQ_INIT(&entries);
+	DMAR_CTX_LOCK(ctx);
+	TAILQ_CONCAT(&entries, &map->map_entries, dmamap_link);
+	DMAR_CTX_UNLOCK(ctx);
+	THREAD_NO_SLEEPING();
+	dmar_ctx_unload(ctx, &entries, false);
+	THREAD_SLEEPING_OK();
+	KASSERT(TAILQ_EMPTY(&entries), ("lazy dmar_ctx_unload %p", ctx));
+#endif
+}
+
+static void
+dmar_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map,
+    bus_dmasync_op_t op)
+{
+}
+
+struct bus_dma_impl bus_dma_dmar_impl = {
+	.tag_create = dmar_bus_dma_tag_create,
+	.tag_destroy = dmar_bus_dma_tag_destroy,
+	.map_create = dmar_bus_dmamap_create,
+	.map_destroy = dmar_bus_dmamap_destroy,
+	.mem_alloc = dmar_bus_dmamem_alloc,
+	.mem_free = dmar_bus_dmamem_free,
+	.load_phys = dmar_bus_dmamap_load_phys,
+	.load_buffer = dmar_bus_dmamap_load_buffer,
+	.load_ma = dmar_bus_dmamap_load_ma,
+	.map_waitok = dmar_bus_dmamap_waitok,
+	.map_complete = dmar_bus_dmamap_complete,
+	.map_unload = dmar_bus_dmamap_unload,
+	.map_sync = dmar_bus_dmamap_sync
+};
+
+static void
+dmar_bus_task_dmamap(void *arg, int pending)
+{
+	struct bus_dma_tag_dmar *tag;
+	struct bus_dmamap_dmar *map;
+	struct dmar_unit *unit;
+	struct dmar_ctx *ctx;
+
+	unit = arg;
+	DMAR_LOCK(unit);
+	while ((map = TAILQ_FIRST(&unit->delayed_maps)) != NULL) {
+		TAILQ_REMOVE(&unit->delayed_maps, map, delay_link);
+		DMAR_UNLOCK(unit);
+		tag = map->tag;
+		ctx = map->tag->ctx;
+		map->cansleep = true;
+		map->locked = false;
+		bus_dmamap_load_mem((bus_dma_tag_t)tag, (bus_dmamap_t)map,
+		    &map->mem, map->callback, map->callback_arg,
+		    BUS_DMA_WAITOK);
+		map->cansleep = false;
+		if (map->locked) {
+			(tag->common.lockfunc)(tag->common.lockfuncarg,
+			    BUS_DMA_UNLOCK);
+		} else
+			map->locked = true;
+		map->cansleep = false;
+		DMAR_LOCK(unit);
+	}
+	DMAR_UNLOCK(unit);
+}
+
+static void
+dmar_bus_schedule_dmamap(struct dmar_unit *unit, struct bus_dmamap_dmar *map)
+{
+	struct dmar_ctx *ctx;
+
+	ctx = map->tag->ctx;
+	map->locked = false;
+	DMAR_LOCK(unit);
+	TAILQ_INSERT_TAIL(&unit->delayed_maps, map, delay_link);
+	DMAR_UNLOCK(unit);
+	taskqueue_enqueue(unit->delayed_taskqueue, &unit->dmamap_load_task);
+}
+
+int
+dmar_init_busdma(struct dmar_unit *unit)
+{
+
+	TAILQ_INIT(&unit->delayed_maps);
+	TASK_INIT(&unit->dmamap_load_task, 0, dmar_bus_task_dmamap, unit);
+	unit->delayed_taskqueue = taskqueue_create("dmar", M_WAITOK,
+	    taskqueue_thread_enqueue, &unit->delayed_taskqueue);
+	taskqueue_start_threads(&unit->delayed_taskqueue, 1, PI_DISK,
+	    "dmar%d busdma taskq", unit->unit);
+	return (0);
+}
+
+void
+dmar_fini_busdma(struct dmar_unit *unit)
+{
+
+	if (unit->delayed_taskqueue == NULL)
+		return;
+
+	taskqueue_drain(unit->delayed_taskqueue, &unit->dmamap_load_task);
+	taskqueue_free(unit->delayed_taskqueue);
+	unit->delayed_taskqueue = NULL;
+}
diff --git a/sys/x86/iommu/busdma_dmar.h b/sys/x86/iommu/busdma_dmar.h
new file mode 100644
index 00000000000..60ea6bcb0b4
--- /dev/null
+++ b/sys/x86/iommu/busdma_dmar.h
@@ -0,0 +1,65 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 __X86_IOMMU_BUSDMA_DMAR_H
+#define __X86_IOMMU_BUSDMA_DMAR_H
+
+struct dmar_map_entry;
+TAILQ_HEAD(dmar_map_entries_tailq, dmar_map_entry);
+
+struct bus_dma_tag_dmar {
+	struct bus_dma_tag_common common;
+	struct dmar_ctx *ctx;
+	device_t owner;
+	int map_count;
+	bus_dma_segment_t *segments;
+};
+
+struct bus_dmamap_dmar {
+	struct bus_dma_tag_dmar *tag;
+	struct memdesc mem;
+	bus_dmamap_callback_t *callback;
+	void *callback_arg;
+	struct dmar_map_entries_tailq map_entries;
+	TAILQ_ENTRY(bus_dmamap_dmar) delay_link;
+	bool locked;
+	bool cansleep;
+	int flags;
+};
+
+#define	BUS_DMAMAP_DMAR_MALLOC	0x0001
+#define	BUS_DMAMAP_DMAR_KMEM_ALLOC 0x0002
+
+extern struct bus_dma_impl bus_dma_dmar_impl;
+
+bus_dma_tag_t dmar_get_dma_tag(device_t dev, device_t child);
+
+#endif
diff --git a/sys/x86/iommu/intel_ctx.c b/sys/x86/iommu/intel_ctx.c
new file mode 100644
index 00000000000..fc5fe094e3e
--- /dev/null
+++ b/sys/x86/iommu/intel_ctx.c
@@ -0,0 +1,631 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/malloc.h>
+#include <sys/bus.h>
+#include <sys/interrupt.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/limits.h>
+#include <sys/lock.h>
+#include <sys/memdesc.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/rwlock.h>
+#include <sys/rman.h>
+#include <sys/sysctl.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
+#include <sys/uio.h>
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_object.h>
+#include <vm/vm_page.h>
+#include <vm/vm_pager.h>
+#include <vm/vm_map.h>
+#include <machine/atomic.h>
+#include <machine/bus.h>
+#include <machine/md_var.h>
+#include <machine/specialreg.h>
+#include <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/busdma_dmar.h>
+#include <x86/iommu/intel_dmar.h>
+#include <dev/pci/pcivar.h>
+
+static MALLOC_DEFINE(M_DMAR_CTX, "dmar_ctx", "Intel DMAR Context");
+
+static void dmar_ctx_unload_task(void *arg, int pending);
+
+static void
+dmar_ensure_ctx_page(struct dmar_unit *dmar, int bus)
+{
+	struct sf_buf *sf;
+	dmar_root_entry_t *re;
+	vm_page_t ctxm;
+
+	/*
+	 * Allocated context page must be linked.
+	 */
+	ctxm = dmar_pgalloc(dmar->ctx_obj, 1 + bus, DMAR_PGF_NOALLOC);
+	if (ctxm != NULL)
+		return;
+
+	/*
+	 * Page not present, allocate and link.  Note that other
+	 * thread might execute this sequence in parallel.  This
+	 * should be safe, because the context entries written by both
+	 * threads are equal.
+	 */
+	TD_PREP_PINNED_ASSERT;
+	ctxm = dmar_pgalloc(dmar->ctx_obj, 1 + bus, DMAR_PGF_ZERO |
+	    DMAR_PGF_WAITOK);
+	re = dmar_map_pgtbl(dmar->ctx_obj, 0, DMAR_PGF_NOALLOC, &sf);
+	re += bus;
+	dmar_pte_store(&re->r1, DMAR_ROOT_R1_P | (DMAR_ROOT_R1_CTP_MASK &
+	    VM_PAGE_TO_PHYS(ctxm)));
+	dmar_unmap_pgtbl(sf, DMAR_IS_COHERENT(dmar));
+	TD_PINNED_ASSERT;
+}
+
+static dmar_ctx_entry_t *
+dmar_map_ctx_entry(struct dmar_ctx *ctx, struct sf_buf **sfp)
+{
+	dmar_ctx_entry_t *ctxp;
+
+	ctxp = dmar_map_pgtbl(ctx->dmar->ctx_obj, 1 + ctx->bus,
+	    DMAR_PGF_NOALLOC | DMAR_PGF_WAITOK, sfp);
+	ctxp += ((ctx->slot & 0x1f) << 3) + (ctx->func & 0x7);
+	return (ctxp);
+}
+
+static void
+ctx_tag_init(struct dmar_ctx *ctx)
+{
+	bus_addr_t maxaddr;
+
+	maxaddr = MIN(ctx->end, BUS_SPACE_MAXADDR);
+	ctx->ctx_tag.common.ref_count = 1; /* Prevent free */
+	ctx->ctx_tag.common.impl = &bus_dma_dmar_impl;
+	ctx->ctx_tag.common.boundary = PCI_DMA_BOUNDARY;
+	ctx->ctx_tag.common.lowaddr = maxaddr;
+	ctx->ctx_tag.common.highaddr = maxaddr;
+	ctx->ctx_tag.common.maxsize = maxaddr;
+	ctx->ctx_tag.common.nsegments = BUS_SPACE_UNRESTRICTED;
+	ctx->ctx_tag.common.maxsegsz = maxaddr;
+	ctx->ctx_tag.ctx = ctx;
+	/* XXXKIB initialize tag further */
+}
+
+static void
+ctx_id_entry_init(struct dmar_ctx *ctx, dmar_ctx_entry_t *ctxp)
+{
+	struct dmar_unit *unit;
+	vm_page_t ctx_root;
+
+	unit = ctx->dmar;
+	KASSERT(ctxp->ctx1 == 0 && ctxp->ctx2 == 0,
+	    ("dmar%d: initialized ctx entry %d:%d:%d 0x%jx 0x%jx",
+	    unit->unit, ctx->bus, ctx->slot, ctx->func, ctxp->ctx1,
+	    ctxp->ctx2));
+	ctxp->ctx2 = DMAR_CTX2_DID(ctx->domain);
+	ctxp->ctx2 |= ctx->awlvl;
+	if ((ctx->flags & DMAR_CTX_IDMAP) != 0 &&
+	    (unit->hw_ecap & DMAR_ECAP_PT) != 0) {
+		KASSERT(ctx->pgtbl_obj == NULL,
+		    ("ctx %p non-null pgtbl_obj", ctx));
+		dmar_pte_store(&ctxp->ctx1, DMAR_CTX1_T_PASS | DMAR_CTX1_P);
+	} else {
+		ctx_root = dmar_pgalloc(ctx->pgtbl_obj, 0, DMAR_PGF_NOALLOC);
+		dmar_pte_store(&ctxp->ctx1, DMAR_CTX1_T_UNTR |
+		    (DMAR_CTX1_ASR_MASK & VM_PAGE_TO_PHYS(ctx_root)) |
+		    DMAR_CTX1_P);
+	}
+}
+
+static int
+ctx_init_rmrr(struct dmar_ctx *ctx, device_t dev)
+{
+	struct dmar_map_entries_tailq rmrr_entries;
+	struct dmar_map_entry *entry, *entry1;
+	vm_page_t *ma;
+	dmar_gaddr_t start, end;
+	vm_pindex_t size, i;
+	int error, error1;
+
+	error = 0;
+	TAILQ_INIT(&rmrr_entries);
+	dmar_ctx_parse_rmrr(ctx, dev, &rmrr_entries);
+	TAILQ_FOREACH_SAFE(entry, &rmrr_entries, unroll_link, entry1) {
+		/*
+		 * VT-d specification requires that the start of an
+		 * RMRR entry is 4k-aligned.  Buggy BIOSes put
+		 * anything into the start and end fields.  Truncate
+		 * and round as neccesary.
+		 *
+		 * We also allow the overlapping RMRR entries, see
+		 * dmar_gas_alloc_region().
+		 */
+		start = entry->start;
+		end = entry->end;
+		entry->start = trunc_page(start);
+		entry->end = round_page(end);
+		size = OFF_TO_IDX(entry->end - entry->start);
+		ma = malloc(sizeof(vm_page_t) * size, M_TEMP, M_WAITOK);
+		for (i = 0; i < size; i++) {
+			ma[i] = vm_page_getfake(entry->start + PAGE_SIZE * i,
+			    VM_MEMATTR_DEFAULT);
+		}
+		error1 = dmar_gas_map_region(ctx, entry, DMAR_MAP_ENTRY_READ |
+		    DMAR_MAP_ENTRY_WRITE, DMAR_GM_CANWAIT, ma);
+		/*
+		 * Non-failed RMRR entries are owned by context rb
+		 * tree.  Get rid of the failed entry, but do not stop
+		 * the loop.  Rest of the parsed RMRR entries are
+		 * loaded and removed on the context destruction.
+		 */
+		if (error1 == 0 && entry->end != entry->start) {
+			DMAR_LOCK(ctx->dmar);
+			ctx->flags |= DMAR_CTX_RMRR;
+			DMAR_UNLOCK(ctx->dmar);
+		} else {
+			if (error1 != 0) {
+				device_printf(dev,
+			    "dmar%d failed to map RMRR region (%jx, %jx) %d\n",
+				    ctx->dmar->unit, start, end, error1);
+				error = error1;
+			}
+			TAILQ_REMOVE(&rmrr_entries, entry, unroll_link);
+			dmar_gas_free_entry(ctx, entry);
+		}
+		for (i = 0; i < size; i++)
+			vm_page_putfake(ma[i]);
+		free(ma, M_TEMP);
+	}
+	return (error);
+}
+
+static struct dmar_ctx *
+dmar_get_ctx_alloc(struct dmar_unit *dmar, int bus, int slot, int func)
+{
+	struct dmar_ctx *ctx;
+
+	ctx = malloc(sizeof(*ctx), M_DMAR_CTX, M_WAITOK | M_ZERO);
+	RB_INIT(&ctx->rb_root);
+	TAILQ_INIT(&ctx->unload_entries);
+	TASK_INIT(&ctx->unload_task, 0, dmar_ctx_unload_task, ctx);
+	mtx_init(&ctx->lock, "dmarctx", NULL, MTX_DEF);
+	ctx->dmar = dmar;
+	ctx->bus = bus;
+	ctx->slot = slot;
+	ctx->func = func;
+	return (ctx);
+}
+
+static void
+dmar_ctx_dtr(struct dmar_ctx *ctx, bool gas_inited, bool pgtbl_inited)
+{
+
+	if (gas_inited) {
+		DMAR_CTX_LOCK(ctx);
+		dmar_gas_fini_ctx(ctx);
+		DMAR_CTX_UNLOCK(ctx);
+	}
+	if (pgtbl_inited) {
+		if (ctx->pgtbl_obj != NULL)
+			DMAR_CTX_PGLOCK(ctx);
+		ctx_free_pgtbl(ctx);
+	}
+	mtx_destroy(&ctx->lock);
+	free(ctx, M_DMAR_CTX);
+}
+
+struct dmar_ctx *
+dmar_get_ctx(struct dmar_unit *dmar, device_t dev, bool id_mapped, bool rmrr_init)
+{
+	struct dmar_ctx *ctx, *ctx1;
+	dmar_ctx_entry_t *ctxp;
+	struct sf_buf *sf;
+	int bus, slot, func, error, mgaw;
+	bool enable;
+
+	bus = pci_get_bus(dev);
+	slot = pci_get_slot(dev);
+	func = pci_get_function(dev);
+	enable = false;
+	TD_PREP_PINNED_ASSERT;
+	DMAR_LOCK(dmar);
+	ctx = dmar_find_ctx_locked(dmar, bus, slot, func);
+	error = 0;
+	if (ctx == NULL) {
+		/*
+		 * Perform the allocations which require sleep or have
+		 * higher chance to succeed if the sleep is allowed.
+		 */
+		DMAR_UNLOCK(dmar);
+		dmar_ensure_ctx_page(dmar, bus);
+		ctx1 = dmar_get_ctx_alloc(dmar, bus, slot, func);
+
+		if (id_mapped) {
+			/*
+			 * For now, use the maximal usable physical
+			 * address of the installed memory to
+			 * calculate the mgaw.  It is useful for the
+			 * identity mapping, and less so for the
+			 * virtualized bus address space.
+			 */
+			ctx1->end = ptoa(Maxmem);
+			mgaw = dmar_maxaddr2mgaw(dmar, ctx1->end, false);
+			error = ctx_set_agaw(ctx1, mgaw);
+			if (error != 0) {
+				dmar_ctx_dtr(ctx1, false, false);
+				TD_PINNED_ASSERT;
+				return (NULL);
+			}
+		} else {
+			ctx1->end = BUS_SPACE_MAXADDR;
+			mgaw = dmar_maxaddr2mgaw(dmar, ctx1->end, true);
+			error = ctx_set_agaw(ctx1, mgaw);
+			if (error != 0) {
+				dmar_ctx_dtr(ctx1, false, false);
+				TD_PINNED_ASSERT;
+				return (NULL);
+			}
+			/* Use all supported address space for remapping. */
+			ctx1->end = 1ULL << (ctx1->agaw - 1);
+		}
+
+
+		dmar_gas_init_ctx(ctx1);
+		if (id_mapped) {
+			if ((dmar->hw_ecap & DMAR_ECAP_PT) == 0) {
+				ctx1->pgtbl_obj = ctx_get_idmap_pgtbl(ctx1,
+				    ctx1->end);
+			}
+			ctx1->flags |= DMAR_CTX_IDMAP;
+		} else {
+			error = ctx_alloc_pgtbl(ctx1);
+			if (error != 0) {
+				dmar_ctx_dtr(ctx1, true, false);
+				TD_PINNED_ASSERT;
+				return (NULL);
+			}
+			/* Disable local apic region access */
+			error = dmar_gas_reserve_region(ctx1, 0xfee00000,
+			    0xfeefffff + 1);
+			if (error != 0) {
+				dmar_ctx_dtr(ctx1, true, true);
+				TD_PINNED_ASSERT;
+				return (NULL);
+			}
+			error = ctx_init_rmrr(ctx1, dev);
+			if (error != 0) {
+				dmar_ctx_dtr(ctx1, true, true);
+				TD_PINNED_ASSERT;
+				return (NULL);
+			}
+		}
+		ctxp = dmar_map_ctx_entry(ctx1, &sf);
+		DMAR_LOCK(dmar);
+
+		/*
+		 * Recheck the contexts, other thread might have
+		 * already allocated needed one.
+		 */
+		ctx = dmar_find_ctx_locked(dmar, bus, slot, func);
+		if (ctx == NULL) {
+			ctx = ctx1;
+			ctx->domain = alloc_unrl(dmar->domids);
+			if (ctx->domain == -1) {
+				DMAR_UNLOCK(dmar);
+				dmar_unmap_pgtbl(sf, true);
+				dmar_ctx_dtr(ctx, true, true);
+				TD_PINNED_ASSERT;
+				return (NULL);
+			}
+			ctx_tag_init(ctx);
+
+			/*
+			 * This is the first activated context for the
+			 * DMAR unit.  Enable the translation after
+			 * everything is set up.
+			 */
+			if (LIST_EMPTY(&dmar->contexts))
+				enable = true;
+			LIST_INSERT_HEAD(&dmar->contexts, ctx, link);
+			ctx_id_entry_init(ctx, ctxp);
+			device_printf(dev,
+			    "dmar%d pci%d:%d:%d:%d domain %d mgaw %d agaw %d\n",
+			    dmar->unit, dmar->segment, bus, slot,
+			    func, ctx->domain, ctx->mgaw, ctx->agaw);
+		} else {
+			dmar_ctx_dtr(ctx1, true, true);
+		}
+		dmar_unmap_pgtbl(sf, DMAR_IS_COHERENT(dmar));
+	}
+	ctx->refs++;
+	if ((ctx->flags & DMAR_CTX_RMRR) != 0)
+		ctx->refs++; /* XXXKIB */
+
+	/*
+	 * If dmar declares Caching Mode as Set, follow 11.5 "Caching
+	 * Mode Consideration" and do the (global) invalidation of the
+	 * negative TLB entries.
+	 */
+	if ((dmar->hw_cap & DMAR_CAP_CM) != 0 || enable) {
+		if (dmar->qi_enabled) {
+			dmar_qi_invalidate_ctx_glob_locked(dmar);
+			if ((dmar->hw_ecap & DMAR_ECAP_DI) != 0)
+				dmar_qi_invalidate_iotlb_glob_locked(dmar);
+		} else {
+			error = dmar_inv_ctx_glob(dmar);
+			if (error == 0 &&
+			    (dmar->hw_ecap & DMAR_ECAP_DI) != 0)
+				error = dmar_inv_iotlb_glob(dmar);
+			if (error != 0) {
+				dmar_free_ctx_locked(dmar, ctx);
+				TD_PINNED_ASSERT;
+				return (NULL);
+			}
+		}
+	}
+
+	/*
+	 * The dmar lock was potentially dropped between check for the
+	 * empty context list and now.  Recheck the state of GCMD_TE
+	 * to avoid unneeded command.
+	 */
+	if (enable && !rmrr_init && (dmar->hw_gcmd & DMAR_GCMD_TE) == 0) {
+		error = dmar_enable_translation(dmar);
+		if (error != 0) {
+			dmar_free_ctx_locked(dmar, ctx);
+			TD_PINNED_ASSERT;
+			return (NULL);
+		}
+	}
+	DMAR_UNLOCK(dmar);
+	TD_PINNED_ASSERT;
+	return (ctx);
+}
+
+void
+dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx)
+{
+	struct sf_buf *sf;
+	dmar_ctx_entry_t *ctxp;
+
+	DMAR_ASSERT_LOCKED(dmar);
+	KASSERT(ctx->refs >= 1,
+	    ("dmar %p ctx %p refs %u", dmar, ctx, ctx->refs));
+
+	/*
+	 * If our reference is not last, only the dereference should
+	 * be performed.
+	 */
+	if (ctx->refs > 1) {
+		ctx->refs--;
+		DMAR_UNLOCK(dmar);
+		return;
+	}
+
+	KASSERT((ctx->flags & DMAR_CTX_RMRR) == 0,
+	    ("lost ref on RMRR ctx %p", ctx));
+	KASSERT((ctx->flags & DMAR_CTX_DISABLED) == 0,
+	    ("lost ref on disabled ctx %p", ctx));
+
+	/*
+	 * Otherwise, the context entry must be cleared before the
+	 * page table is destroyed.  The mapping of the context
+	 * entries page could require sleep, unlock the dmar.
+	 */
+	DMAR_UNLOCK(dmar);
+	TD_PREP_PINNED_ASSERT;
+	ctxp = dmar_map_ctx_entry(ctx, &sf);
+	DMAR_LOCK(dmar);
+	KASSERT(ctx->refs >= 1,
+	    ("dmar %p ctx %p refs %u", dmar, ctx, ctx->refs));
+
+	/*
+	 * Other thread might have referenced the context, in which
+	 * case again only the dereference should be performed.
+	 */
+	if (ctx->refs > 1) {
+		ctx->refs--;
+		DMAR_UNLOCK(dmar);
+		dmar_unmap_pgtbl(sf, DMAR_IS_COHERENT(dmar));
+		TD_PINNED_ASSERT;
+		return;
+	}
+
+	KASSERT((ctx->flags & DMAR_CTX_RMRR) == 0,
+	    ("lost ref on RMRR ctx %p", ctx));
+	KASSERT((ctx->flags & DMAR_CTX_DISABLED) == 0,
+	    ("lost ref on disabled ctx %p", ctx));
+
+	/*
+	 * Clear the context pointer and flush the caches.
+	 * XXXKIB: cannot do this if any RMRR entries are still present.
+	 */
+	dmar_pte_clear(&ctxp->ctx1);
+	ctxp->ctx2 = 0;
+	dmar_inv_ctx_glob(dmar);
+	if ((dmar->hw_ecap & DMAR_ECAP_DI) != 0) {
+		if (dmar->qi_enabled)
+			dmar_qi_invalidate_iotlb_glob_locked(dmar);
+		else
+			dmar_inv_iotlb_glob(dmar);
+	}
+	LIST_REMOVE(ctx, link);
+	DMAR_UNLOCK(dmar);
+
+	/*
+	 * The rest of the destruction is invisible for other users of
+	 * the dmar unit.
+	 */
+	taskqueue_drain(dmar->delayed_taskqueue, &ctx->unload_task);
+	KASSERT(TAILQ_EMPTY(&ctx->unload_entries),
+	    ("unfinished unloads %p", ctx));
+	dmar_unmap_pgtbl(sf, DMAR_IS_COHERENT(dmar));
+	free_unr(dmar->domids, ctx->domain);
+	dmar_ctx_dtr(ctx, true, true);
+	TD_PINNED_ASSERT;
+}
+
+void
+dmar_free_ctx(struct dmar_ctx *ctx)
+{
+	struct dmar_unit *dmar;
+
+	dmar = ctx->dmar;
+	DMAR_LOCK(dmar);
+	dmar_free_ctx_locked(dmar, ctx);
+}
+
+struct dmar_ctx *
+dmar_find_ctx_locked(struct dmar_unit *dmar, int bus, int slot, int func)
+{
+	struct dmar_ctx *ctx;
+
+	DMAR_ASSERT_LOCKED(dmar);
+
+	LIST_FOREACH(ctx, &dmar->contexts, link) {
+		if (ctx->bus == bus && ctx->slot == slot && ctx->func == func)
+			return (ctx);
+	}
+	return (NULL);
+}
+
+void
+dmar_ctx_free_entry(struct dmar_map_entry *entry, bool free)
+{
+	struct dmar_ctx *ctx;
+
+	ctx = entry->ctx;
+	DMAR_CTX_LOCK(ctx);
+	if ((entry->flags & DMAR_MAP_ENTRY_RMRR) != 0)
+		dmar_gas_free_region(ctx, entry);
+	else
+		dmar_gas_free_space(ctx, entry);
+	DMAR_CTX_UNLOCK(ctx);
+	if (free)
+		dmar_gas_free_entry(ctx, entry);
+	else
+		entry->flags = 0;
+}
+
+void
+dmar_ctx_unload_entry(struct dmar_map_entry *entry, bool free)
+{
+	struct dmar_unit *unit;
+
+	unit = entry->ctx->dmar;
+	if (unit->qi_enabled) {
+		DMAR_LOCK(unit);
+		dmar_qi_invalidate_locked(entry->ctx, entry->start,
+		    entry->end - entry->start, &entry->gseq);
+		if (!free)
+			entry->flags |= DMAR_MAP_ENTRY_QI_NF;
+		TAILQ_INSERT_TAIL(&unit->tlb_flush_entries, entry, dmamap_link);
+		DMAR_UNLOCK(unit);
+	} else {
+		ctx_flush_iotlb_sync(entry->ctx, entry->start, entry->end -
+		    entry->start);
+		dmar_ctx_free_entry(entry, free);
+	}
+}
+
+void
+dmar_ctx_unload(struct dmar_ctx *ctx, struct dmar_map_entries_tailq *entries,
+    bool cansleep)
+{
+	struct dmar_unit *unit;
+	struct dmar_map_entry *entry, *entry1;
+	struct dmar_qi_genseq gseq;
+	int error;
+
+	unit = ctx->dmar;
+
+	TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) {
+		KASSERT((entry->flags & DMAR_MAP_ENTRY_MAP) != 0,
+		    ("not mapped entry %p %p", ctx, entry));
+		error = ctx_unmap_buf(ctx, entry->start, entry->end -
+		    entry->start, cansleep ? DMAR_PGF_WAITOK : 0);
+		KASSERT(error == 0, ("unmap %p error %d", ctx, error));
+		if (!unit->qi_enabled) {
+			ctx_flush_iotlb_sync(ctx, entry->start,
+			    entry->end - entry->start);
+			TAILQ_REMOVE(entries, entry, dmamap_link);
+			dmar_ctx_free_entry(entry, true);
+		}
+	}
+	if (TAILQ_EMPTY(entries))
+		return;
+
+	KASSERT(unit->qi_enabled, ("loaded entry left"));
+	DMAR_LOCK(unit);
+	TAILQ_FOREACH(entry, entries, dmamap_link) {
+		entry->gseq.gen = 0;
+		entry->gseq.seq = 0;
+		dmar_qi_invalidate_locked(ctx, entry->start, entry->end -
+		    entry->start, TAILQ_NEXT(entry, dmamap_link) == NULL ?
+		    &gseq : NULL);
+	}
+	TAILQ_FOREACH_SAFE(entry, entries, dmamap_link, entry1) {
+		entry->gseq = gseq;
+		TAILQ_REMOVE(entries, entry, dmamap_link);
+		TAILQ_INSERT_TAIL(&unit->tlb_flush_entries, entry, dmamap_link);
+	}
+	DMAR_UNLOCK(unit);
+}	
+
+static void
+dmar_ctx_unload_task(void *arg, int pending)
+{
+	struct dmar_ctx *ctx;
+	struct dmar_map_entries_tailq entries;
+
+	ctx = arg;
+	TAILQ_INIT(&entries);
+
+	for (;;) {
+		DMAR_CTX_LOCK(ctx);
+		TAILQ_SWAP(&ctx->unload_entries, &entries, dmar_map_entry,
+		    dmamap_link);
+		DMAR_CTX_UNLOCK(ctx);
+		if (TAILQ_EMPTY(&entries))
+			break;
+		dmar_ctx_unload(ctx, &entries, true);
+	}
+}
diff --git a/sys/x86/iommu/intel_dmar.h b/sys/x86/iommu/intel_dmar.h
new file mode 100644
index 00000000000..994e5e1d9ca
--- /dev/null
+++ b/sys/x86/iommu/intel_dmar.h
@@ -0,0 +1,435 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 __X86_IOMMU_INTEL_DMAR_H
+#define	__X86_IOMMU_INTEL_DMAR_H
+
+/* Host or physical memory address, after translation. */
+typedef uint64_t dmar_haddr_t;
+/* Guest or bus address, before translation. */
+typedef uint64_t dmar_gaddr_t;
+
+struct dmar_qi_genseq {
+	u_int gen;
+	uint32_t seq;
+};
+
+struct dmar_map_entry {
+	dmar_gaddr_t start;
+	dmar_gaddr_t end;
+	dmar_gaddr_t free_after;	/* Free space after the entry */
+	dmar_gaddr_t free_down;		/* Max free space below the
+					   current R/B tree node */
+	u_int flags;
+	TAILQ_ENTRY(dmar_map_entry) dmamap_link; /* Link for dmamap entries */
+	RB_ENTRY(dmar_map_entry) rb_entry;	 /* Links for ctx entries */
+	TAILQ_ENTRY(dmar_map_entry) unroll_link; /* Link for unroll after
+						    dmamap_load failure */
+	struct dmar_ctx *ctx;
+	struct dmar_qi_genseq gseq;
+};
+
+RB_HEAD(dmar_gas_entries_tree, dmar_map_entry);
+RB_PROTOTYPE(dmar_gas_entries_tree, dmar_map_entry, rb_entry,
+    dmar_gas_cmp_entries);
+
+#define	DMAR_MAP_ENTRY_PLACE	0x0001	/* Fake entry */
+#define	DMAR_MAP_ENTRY_RMRR	0x0002	/* Permanent, not linked by
+					   dmamap_link */
+#define	DMAR_MAP_ENTRY_MAP	0x0004	/* Busdma created, linked by
+					   dmamap_link */
+#define	DMAR_MAP_ENTRY_UNMAPPED	0x0010	/* No backing pages */
+#define	DMAR_MAP_ENTRY_QI_NF	0x0020	/* qi task, do not free entry */
+#define	DMAR_MAP_ENTRY_READ	0x1000	/* Read permitted */
+#define	DMAR_MAP_ENTRY_WRITE	0x2000	/* Write permitted */
+#define	DMAR_MAP_ENTRY_SNOOP	0x4000	/* Snoop */
+#define	DMAR_MAP_ENTRY_TM	0x8000	/* Transient */
+
+struct dmar_ctx {
+	int bus;	/* pci bus/slot/func */
+	int slot;
+	int func;
+	int domain;	/* DID */
+	int mgaw;	/* Real max address width */
+	int agaw;	/* Adjusted guest address width */
+	int pglvl;	/* The pagelevel */
+	int awlvl;	/* The pagelevel as the bitmask, to set in
+			   context entry */
+	dmar_gaddr_t end;/* Highest address + 1 in the guest AS */
+	u_int refs;	/* References to the context, from tags */
+	struct dmar_unit *dmar;
+	struct bus_dma_tag_dmar ctx_tag; /* Root tag */
+	struct mtx lock;
+	LIST_ENTRY(dmar_ctx) link;	/* Member in the dmar list */
+	vm_object_t pgtbl_obj;		/* Page table pages */
+	u_int flags;			/* Protected by dmar lock */
+	uint64_t last_fault_rec[2];	/* Last fault reported */
+	u_int entries_cnt;
+	u_long loads;
+	u_long unloads;
+	struct dmar_gas_entries_tree rb_root;
+	struct dmar_map_entries_tailq unload_entries; /* Entries to unload */
+	struct dmar_map_entry *first_place, *last_place;
+	struct task unload_task;
+};
+
+/* struct dmar_ctx flags */
+#define	DMAR_CTX_FAULTED	0x0001	/* Fault was reported,
+					   last_fault_rec is valid */
+#define	DMAR_CTX_IDMAP		0x0002	/* Context uses identity page table */
+#define	DMAR_CTX_RMRR		0x0004	/* Context contains RMRR entry,
+					   cannot be turned off */
+#define	DMAR_CTX_DISABLED	0x0008	/* Device is disabled, the
+					   ephemeral reference is kept
+					   to prevent context destruction */
+
+#define	DMAR_CTX_PGLOCK(ctx)	VM_OBJECT_WLOCK((ctx)->pgtbl_obj)
+#define	DMAR_CTX_PGTRYLOCK(ctx)	VM_OBJECT_TRYWLOCK((ctx)->pgtbl_obj)
+#define	DMAR_CTX_PGUNLOCK(ctx)	VM_OBJECT_WUNLOCK((ctx)->pgtbl_obj)
+#define	DMAR_CTX_ASSERT_PGLOCKED(ctx) \
+	VM_OBJECT_ASSERT_WLOCKED((ctx)->pgtbl_obj)
+
+#define	DMAR_CTX_LOCK(ctx)	mtx_lock(&(ctx)->lock)
+#define	DMAR_CTX_UNLOCK(ctx)	mtx_unlock(&(ctx)->lock)
+#define	DMAR_CTX_ASSERT_LOCKED(ctx) mtx_assert(&(ctx)->lock, MA_OWNED)
+
+struct dmar_msi_data {
+	int irq;
+	int irq_rid;
+	struct resource *irq_res;
+	void *intr_handle;
+	int (*handler)(void *);
+	int msi_data_reg;
+	int msi_addr_reg;
+	int msi_uaddr_reg;
+	void (*enable_intr)(struct dmar_unit *);
+	void (*disable_intr)(struct dmar_unit *);
+	const char *name;
+};
+
+#define	DMAR_INTR_FAULT		0
+#define	DMAR_INTR_QI		1
+#define	DMAR_INTR_TOTAL		2
+
+struct dmar_unit {
+	device_t dev;
+	int unit;
+	uint16_t segment;
+	uint64_t base;
+
+	/* Resources */
+	int reg_rid;
+	struct resource *regs;
+
+	struct dmar_msi_data intrs[DMAR_INTR_TOTAL];
+
+	/* Hardware registers cache */
+	uint32_t hw_ver;
+	uint64_t hw_cap;
+	uint64_t hw_ecap;
+	uint32_t hw_gcmd;
+
+	/* Data for being a dmar */
+	struct mtx lock;
+	LIST_HEAD(, dmar_ctx) contexts;
+	struct unrhdr *domids;
+	vm_object_t ctx_obj;
+	u_int barrier_flags;
+
+	/* Fault handler data */
+	struct mtx fault_lock;
+	uint64_t *fault_log;
+	int fault_log_head;
+	int fault_log_tail;
+	int fault_log_size;
+	struct task fault_task;
+	struct taskqueue *fault_taskqueue;
+
+	/* QI */
+	int qi_enabled;
+	vm_offset_t inv_queue;
+	vm_size_t inv_queue_size;
+	uint32_t inv_queue_avail;
+	uint32_t inv_queue_tail;
+	volatile uint32_t inv_waitd_seq_hw; /* hw writes there on wait
+					       descr completion */
+	uint64_t inv_waitd_seq_hw_phys;
+	uint32_t inv_waitd_seq; /* next sequence number to use for wait descr */
+	u_int inv_waitd_gen;	/* seq number generation AKA seq overflows */
+	u_int inv_seq_waiters;	/* count of waiters for seq */
+	u_int inv_queue_full;	/* informational counter */
+
+	/* Delayed freeing of map entries queue processing */
+	struct dmar_map_entries_tailq tlb_flush_entries;
+	struct task qi_task;
+	struct taskqueue *qi_taskqueue;
+
+	/* Busdma delayed map load */
+	struct task dmamap_load_task;
+	TAILQ_HEAD(, bus_dmamap_dmar) delayed_maps;
+	struct taskqueue *delayed_taskqueue;
+};
+
+#define	DMAR_LOCK(dmar)		mtx_lock(&(dmar)->lock)
+#define	DMAR_UNLOCK(dmar)	mtx_unlock(&(dmar)->lock)
+#define	DMAR_ASSERT_LOCKED(dmar) mtx_assert(&(dmar)->lock, MA_OWNED)
+
+#define	DMAR_FAULT_LOCK(dmar)	mtx_lock_spin(&(dmar)->fault_lock)
+#define	DMAR_FAULT_UNLOCK(dmar)	mtx_unlock_spin(&(dmar)->fault_lock)
+#define	DMAR_FAULT_ASSERT_LOCKED(dmar) mtx_assert(&(dmar)->fault_lock, MA_OWNED)
+
+#define	DMAR_IS_COHERENT(dmar)	(((dmar)->hw_ecap & DMAR_ECAP_C) != 0)
+#define	DMAR_HAS_QI(dmar)	(((dmar)->hw_ecap & DMAR_ECAP_QI) != 0)
+
+/* Barrier ids */
+#define	DMAR_BARRIER_RMRR	0
+#define	DMAR_BARRIER_USEQ	1
+
+struct dmar_unit *dmar_find(device_t dev);
+
+u_int dmar_nd2mask(u_int nd);
+bool dmar_pglvl_supported(struct dmar_unit *unit, int pglvl);
+int ctx_set_agaw(struct dmar_ctx *ctx, int mgaw);
+int dmar_maxaddr2mgaw(struct dmar_unit* unit, dmar_gaddr_t maxaddr,
+    bool allow_less);
+vm_pindex_t pglvl_max_pages(int pglvl);
+int ctx_is_sp_lvl(struct dmar_ctx *ctx, int lvl);
+dmar_gaddr_t pglvl_page_size(int total_pglvl, int lvl);
+dmar_gaddr_t ctx_page_size(struct dmar_ctx *ctx, int lvl);
+int calc_am(struct dmar_unit *unit, dmar_gaddr_t base, dmar_gaddr_t size,
+    dmar_gaddr_t *isizep);
+struct vm_page *dmar_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags);
+void dmar_pgfree(vm_object_t obj, vm_pindex_t idx, int flags);
+void *dmar_map_pgtbl(vm_object_t obj, vm_pindex_t idx, int flags,
+    struct sf_buf **sf);
+void dmar_unmap_pgtbl(struct sf_buf *sf, bool coherent);
+int dmar_load_root_entry_ptr(struct dmar_unit *unit);
+int dmar_inv_ctx_glob(struct dmar_unit *unit);
+int dmar_inv_iotlb_glob(struct dmar_unit *unit);
+int dmar_flush_write_bufs(struct dmar_unit *unit);
+int dmar_enable_translation(struct dmar_unit *unit);
+int dmar_disable_translation(struct dmar_unit *unit);
+bool dmar_barrier_enter(struct dmar_unit *dmar, u_int barrier_id);
+void dmar_barrier_exit(struct dmar_unit *dmar, u_int barrier_id);
+
+int dmar_fault_intr(void *arg);
+void dmar_enable_fault_intr(struct dmar_unit *unit);
+void dmar_disable_fault_intr(struct dmar_unit *unit);
+int dmar_init_fault_log(struct dmar_unit *unit);
+void dmar_fini_fault_log(struct dmar_unit *unit);
+
+int dmar_qi_intr(void *arg);
+void dmar_enable_qi_intr(struct dmar_unit *unit);
+void dmar_disable_qi_intr(struct dmar_unit *unit);
+int dmar_init_qi(struct dmar_unit *unit);
+void dmar_fini_qi(struct dmar_unit *unit);
+void dmar_qi_invalidate_locked(struct dmar_ctx *ctx, dmar_gaddr_t start,
+    dmar_gaddr_t size, struct dmar_qi_genseq *pseq);
+void dmar_qi_invalidate_ctx_glob_locked(struct dmar_unit *unit);
+void dmar_qi_invalidate_iotlb_glob_locked(struct dmar_unit *unit);
+
+vm_object_t ctx_get_idmap_pgtbl(struct dmar_ctx *ctx, dmar_gaddr_t maxaddr);
+void put_idmap_pgtbl(vm_object_t obj);
+int ctx_map_buf(struct dmar_ctx *ctx, dmar_gaddr_t base, dmar_gaddr_t size,
+    vm_page_t *ma, uint64_t pflags, int flags);
+int ctx_unmap_buf(struct dmar_ctx *ctx, dmar_gaddr_t base, dmar_gaddr_t size,
+    int flags);
+void ctx_flush_iotlb_sync(struct dmar_ctx *ctx, dmar_gaddr_t base,
+    dmar_gaddr_t size);
+int ctx_alloc_pgtbl(struct dmar_ctx *ctx);
+void ctx_free_pgtbl(struct dmar_ctx *ctx);
+
+struct dmar_ctx *dmar_instantiate_ctx(struct dmar_unit *dmar, device_t dev,
+    bool rmrr);
+struct dmar_ctx *dmar_get_ctx(struct dmar_unit *dmar, device_t dev,
+    bool id_mapped, bool rmrr_init);
+void dmar_free_ctx_locked(struct dmar_unit *dmar, struct dmar_ctx *ctx);
+void dmar_free_ctx(struct dmar_ctx *ctx);
+struct dmar_ctx *dmar_find_ctx_locked(struct dmar_unit *dmar, int bus,
+    int slot, int func);
+void dmar_ctx_unload_entry(struct dmar_map_entry *entry, bool free);
+void dmar_ctx_unload(struct dmar_ctx *ctx,
+    struct dmar_map_entries_tailq *entries, bool cansleep);
+void dmar_ctx_free_entry(struct dmar_map_entry *entry, bool free);
+
+int dmar_init_busdma(struct dmar_unit *unit);
+void dmar_fini_busdma(struct dmar_unit *unit);
+
+void dmar_gas_init_ctx(struct dmar_ctx *ctx);
+void dmar_gas_fini_ctx(struct dmar_ctx *ctx);
+struct dmar_map_entry *dmar_gas_alloc_entry(struct dmar_ctx *ctx, u_int flags);
+void dmar_gas_free_entry(struct dmar_ctx *ctx, struct dmar_map_entry *entry);
+void dmar_gas_free_space(struct dmar_ctx *ctx, struct dmar_map_entry *entry);
+int dmar_gas_map(struct dmar_ctx *ctx, const struct bus_dma_tag_common *common,
+    dmar_gaddr_t size, u_int eflags, u_int flags, vm_page_t *ma,
+    struct dmar_map_entry **res);
+void dmar_gas_free_region(struct dmar_ctx *ctx, struct dmar_map_entry *entry);
+int dmar_gas_map_region(struct dmar_ctx *ctx, struct dmar_map_entry *entry,
+    u_int eflags, u_int flags, vm_page_t *ma);
+int dmar_gas_reserve_region(struct dmar_ctx *ctx, dmar_gaddr_t start,
+    dmar_gaddr_t end);
+
+void dmar_ctx_parse_rmrr(struct dmar_ctx *ctx, device_t dev,
+    struct dmar_map_entries_tailq *rmrr_entries);
+int dmar_instantiate_rmrr_ctxs(struct dmar_unit *dmar);
+
+void dmar_quirks_post_ident(struct dmar_unit *dmar);
+void dmar_quirks_pre_use(struct dmar_unit *dmar);
+
+#define	DMAR_GM_CANWAIT	0x0001
+#define	DMAR_GM_CANSPLIT 0x0002
+
+#define	DMAR_PGF_WAITOK	0x0001
+#define	DMAR_PGF_ZERO	0x0002
+#define	DMAR_PGF_ALLOC	0x0004
+#define	DMAR_PGF_NOALLOC 0x0008
+#define	DMAR_PGF_OBJL	0x0010
+
+extern dmar_haddr_t dmar_high;
+extern int haw;
+extern int dmar_tbl_pagecnt;
+extern int dmar_match_verbose;
+extern int dmar_check_free;
+
+static inline uint32_t
+dmar_read4(const struct dmar_unit *unit, int reg)
+{
+
+	return (bus_read_4(unit->regs, reg));
+}
+
+static inline uint64_t
+dmar_read8(const struct dmar_unit *unit, int reg)
+{
+#ifdef __i386__
+	uint32_t high, low;
+
+	low = bus_read_4(unit->regs, reg);
+	high = bus_read_4(unit->regs, reg + 4);
+	return (low | ((uint64_t)high << 32));
+#else
+	return (bus_read_8(unit->regs, reg));
+#endif
+}
+
+static inline void
+dmar_write4(const struct dmar_unit *unit, int reg, uint32_t val)
+{
+
+	KASSERT(reg != DMAR_GCMD_REG || (val & DMAR_GCMD_TE) ==
+	    (unit->hw_gcmd & DMAR_GCMD_TE),
+	    ("dmar%d clearing TE 0x%08x 0x%08x", unit->unit,
+	    unit->hw_gcmd, val));
+	bus_write_4(unit->regs, reg, val);
+}
+
+static inline void
+dmar_write8(const struct dmar_unit *unit, int reg, uint64_t val)
+{
+
+	KASSERT(reg != DMAR_GCMD_REG, ("8byte GCMD write"));
+#ifdef __i386__
+	uint32_t high, low;
+
+	low = val;
+	high = val >> 32;
+	bus_write_4(unit->regs, reg, low);
+	bus_write_4(unit->regs, reg + 4, high);
+#else
+	bus_write_8(unit->regs, reg, val);
+#endif
+}
+
+/*
+ * dmar_pte_store and dmar_pte_clear ensure that on i386, 32bit writes
+ * are issued in the correct order.  For store, the lower word,
+ * containing the P or R and W bits, is set only after the high word
+ * is written.  For clear, the P bit is cleared first, then the high
+ * word is cleared.
+ */
+static inline void
+dmar_pte_store(volatile uint64_t *dst, uint64_t val)
+{
+
+	KASSERT(*dst == 0, ("used pte %p oldval %jx newval %jx",
+	    dst, (uintmax_t)*dst, (uintmax_t)val));
+#ifdef __i386__
+	volatile uint32_t *p;
+	uint32_t hi, lo;
+
+	hi = val >> 32;
+	lo = val;
+	p = (volatile uint32_t *)dst;
+	*(p + 1) = hi;
+	*p = lo;
+#else
+	*dst = val;
+#endif
+}
+
+static inline void
+dmar_pte_clear(volatile uint64_t *dst)
+{
+#ifdef __i386__
+	volatile uint32_t *p;
+
+	p = (volatile uint32_t *)dst;
+	*p = 0;
+	*(p + 1) = 0;
+#else
+	*dst = 0;
+#endif
+}
+
+static inline bool
+dmar_test_boundary(dmar_gaddr_t start, dmar_gaddr_t size,
+    dmar_gaddr_t boundary)
+{
+
+	if (boundary == 0)
+		return (true);
+	return (start + size <= ((start + boundary) & ~(boundary - 1)));
+}
+
+#ifdef INVARIANTS
+#define	TD_PREP_PINNED_ASSERT						\
+	int old_td_pinned;						\
+	old_td_pinned = curthread->td_pinned
+#define	TD_PINNED_ASSERT						\
+	KASSERT(curthread->td_pinned == old_td_pinned,			\
+	    ("pin count leak: %d %d %s:%d", curthread->td_pinned,	\
+	    old_td_pinned, __FILE__, __LINE__))
+#else
+#define	TD_PREP_PINNED_ASSERT
+#define	TD_PINNED_ASSERT
+#endif
+
+#endif
diff --git a/sys/x86/iommu/intel_drv.c b/sys/x86/iommu/intel_drv.c
new file mode 100644
index 00000000000..a846b924f05
--- /dev/null
+++ b/sys/x86/iommu/intel_drv.c
@@ -0,0 +1,1182 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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_acpi.h"
+#if defined(__amd64__) /* || defined(__ia64__) */
+#define	DEV_APIC
+#else
+#include "opt_apic.h"
+#endif
+#include "opt_ddb.h"
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/memdesc.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/rwlock.h>
+#include <sys/smp.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
+#include <machine/bus.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <dev/acpica/acpivar.h>
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_object.h>
+#include <vm/vm_page.h>
+#include <vm/vm_pager.h>
+#include <vm/vm_map.h>
+#include <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/busdma_dmar.h>
+#include <x86/iommu/intel_dmar.h>
+#include <dev/pci/pcivar.h>
+
+#ifdef DEV_APIC
+#include "pcib_if.h"
+#endif
+
+#define	DMAR_FAULT_IRQ_RID	0
+#define	DMAR_QI_IRQ_RID		1
+#define	DMAR_REG_RID		2
+
+static devclass_t dmar_devclass;
+static device_t *dmar_devs;
+static int dmar_devcnt;
+
+typedef int (*dmar_iter_t)(ACPI_DMAR_HEADER *, void *);
+
+static void
+dmar_iterate_tbl(dmar_iter_t iter, void *arg)
+{
+	ACPI_TABLE_DMAR *dmartbl;
+	ACPI_DMAR_HEADER *dmarh;
+	char *ptr, *ptrend;
+	ACPI_STATUS status;
+
+	status = AcpiGetTable(ACPI_SIG_DMAR, 1, (ACPI_TABLE_HEADER **)&dmartbl);
+	if (ACPI_FAILURE(status))
+		return;
+	ptr = (char *)dmartbl + sizeof(*dmartbl);
+	ptrend = (char *)dmartbl + dmartbl->Header.Length;
+	for (;;) {
+		if (ptr >= ptrend)
+			break;
+		dmarh = (ACPI_DMAR_HEADER *)ptr;
+		if (dmarh->Length <= 0) {
+			printf("dmar_identify: corrupted DMAR table, l %d\n",
+			    dmarh->Length);
+			break;
+		}
+		ptr += dmarh->Length;
+		if (!iter(dmarh, arg))
+			break;
+	}
+}
+
+struct find_iter_args {
+	int i;
+	ACPI_DMAR_HARDWARE_UNIT *res;
+};
+
+static int
+dmar_find_iter(ACPI_DMAR_HEADER *dmarh, void *arg)
+{
+	struct find_iter_args *fia;
+
+	if (dmarh->Type != ACPI_DMAR_TYPE_HARDWARE_UNIT)
+		return (1);
+
+	fia = arg;
+	if (fia->i == 0) {
+		fia->res = (ACPI_DMAR_HARDWARE_UNIT *)dmarh;
+		return (0);
+	}
+	fia->i--;
+	return (1);
+}
+
+static ACPI_DMAR_HARDWARE_UNIT *
+dmar_find_by_index(int idx)
+{
+	struct find_iter_args fia;
+
+	fia.i = idx;
+	fia.res = NULL;
+	dmar_iterate_tbl(dmar_find_iter, &fia);
+	return (fia.res);
+}
+
+static int
+dmar_count_iter(ACPI_DMAR_HEADER *dmarh, void *arg)
+{
+
+	if (dmarh->Type == ACPI_DMAR_TYPE_HARDWARE_UNIT)
+		dmar_devcnt++;
+	return (1);
+}
+
+static int dmar_enable = 0;
+static void
+dmar_identify(driver_t *driver, device_t parent)
+{
+	ACPI_TABLE_DMAR *dmartbl;
+	ACPI_DMAR_HARDWARE_UNIT *dmarh;
+	ACPI_STATUS status;
+	int i, error;
+
+	if (acpi_disabled("dmar"))
+		return;
+	TUNABLE_INT_FETCH("hw.dmar.enable", &dmar_enable);
+	if (!dmar_enable)
+		return;
+#ifdef INVARIANTS
+	TUNABLE_INT_FETCH("hw.dmar.check_free", &dmar_check_free);
+#endif
+	TUNABLE_INT_FETCH("hw.dmar.match_verbose", &dmar_match_verbose);
+	status = AcpiGetTable(ACPI_SIG_DMAR, 1, (ACPI_TABLE_HEADER **)&dmartbl);
+	if (ACPI_FAILURE(status))
+		return;
+	haw = dmartbl->Width + 1;
+	if ((1ULL << (haw + 1)) > BUS_SPACE_MAXADDR)
+		dmar_high = BUS_SPACE_MAXADDR;
+	else
+		dmar_high = 1ULL << (haw + 1);
+	if (bootverbose) {
+		printf("DMAR HAW=%d flags=<%b>\n", dmartbl->Width,
+		    (unsigned)dmartbl->Flags,
+		    "\020\001INTR_REMAP\002X2APIC_OPT_OUT");
+	}
+
+	dmar_iterate_tbl(dmar_count_iter, NULL);
+	if (dmar_devcnt == 0)
+		return;
+	dmar_devs = malloc(sizeof(device_t) * dmar_devcnt, M_DEVBUF,
+	    M_WAITOK | M_ZERO);
+	for (i = 0; i < dmar_devcnt; i++) {
+		dmarh = dmar_find_by_index(i);
+		if (dmarh == NULL) {
+			printf("dmar_identify: cannot find HWUNIT %d\n", i);
+			continue;
+		}
+		dmar_devs[i] = BUS_ADD_CHILD(parent, 1, "dmar", i);
+		if (dmar_devs[i] == NULL) {
+			printf("dmar_identify: cannot create instance %d\n", i);
+			continue;
+		}
+		error = bus_set_resource(dmar_devs[i], SYS_RES_MEMORY,
+		    DMAR_REG_RID, dmarh->Address, PAGE_SIZE);
+		if (error != 0) {
+			printf(
+	"dmar%d: unable to alloc register window at 0x%08jx: error %d\n",
+			    i, (uintmax_t)dmarh->Address, error);
+			device_delete_child(parent, dmar_devs[i]);
+			dmar_devs[i] = NULL;
+		}
+	}
+}
+
+static int
+dmar_probe(device_t dev)
+{
+
+	if (acpi_get_handle(dev) != NULL)
+		return (ENXIO);
+	device_set_desc(dev, "DMA remap");
+	return (BUS_PROBE_NOWILDCARD);
+}
+
+static void
+dmar_release_intr(device_t dev, struct dmar_unit *unit, int idx)
+{
+	struct dmar_msi_data *dmd;
+
+	dmd = &unit->intrs[idx];
+	if (dmd->irq == -1)
+		return;
+	bus_teardown_intr(dev, dmd->irq_res, dmd->intr_handle);
+	bus_release_resource(dev, SYS_RES_IRQ, dmd->irq_rid, dmd->irq_res);
+	bus_delete_resource(dev, SYS_RES_IRQ, dmd->irq_rid);
+	PCIB_RELEASE_MSIX(device_get_parent(device_get_parent(dev)),
+	    dev, dmd->irq);
+	dmd->irq = -1;
+}
+
+static void
+dmar_release_resources(device_t dev, struct dmar_unit *unit)
+{
+	int i;
+
+	dmar_fini_busdma(unit);
+	dmar_fini_qi(unit);
+	dmar_fini_fault_log(unit);
+	for (i = 0; i < DMAR_INTR_TOTAL; i++)
+		dmar_release_intr(dev, unit, i);
+	if (unit->regs != NULL) {
+		bus_deactivate_resource(dev, SYS_RES_MEMORY, unit->reg_rid,
+		    unit->regs);
+		bus_release_resource(dev, SYS_RES_MEMORY, unit->reg_rid,
+		    unit->regs);
+		unit->regs = NULL;
+	}
+	if (unit->domids != NULL) {
+		delete_unrhdr(unit->domids);
+		unit->domids = NULL;
+	}
+	if (unit->ctx_obj != NULL) {
+		vm_object_deallocate(unit->ctx_obj);
+		unit->ctx_obj = NULL;
+	}
+}
+
+static int
+dmar_alloc_irq(device_t dev, struct dmar_unit *unit, int idx)
+{
+	device_t pcib;
+	struct dmar_msi_data *dmd;
+	uint64_t msi_addr;
+	uint32_t msi_data;
+	int error;
+
+	dmd = &unit->intrs[idx];
+	pcib = device_get_parent(device_get_parent(dev)); /* Really not pcib */
+	error = PCIB_ALLOC_MSIX(pcib, dev, &dmd->irq);
+	if (error != 0) {
+		device_printf(dev, "cannot allocate %s interrupt, %d\n",
+		    dmd->name, error);
+		goto err1;
+	}
+	error = bus_set_resource(dev, SYS_RES_IRQ, dmd->irq_rid,
+	    dmd->irq, 1);
+	if (error != 0) {
+		device_printf(dev, "cannot set %s interrupt resource, %d\n",
+		    dmd->name, error);
+		goto err2;
+	}
+	dmd->irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ,
+	    &dmd->irq_rid, RF_ACTIVE);
+	if (dmd->irq_res == NULL) {
+		device_printf(dev,
+		    "cannot allocate resource for %s interrupt\n", dmd->name);
+		error = ENXIO;
+		goto err3;
+	}
+	error = bus_setup_intr(dev, dmd->irq_res, INTR_TYPE_MISC,
+	    dmd->handler, NULL, unit, &dmd->intr_handle);
+	if (error != 0) {
+		device_printf(dev, "cannot setup %s interrupt, %d\n",
+		    dmd->name, error);
+		goto err4;
+	}
+	bus_describe_intr(dev, dmd->irq_res, dmd->intr_handle, dmd->name);
+	error = PCIB_MAP_MSI(pcib, dev, dmd->irq, &msi_addr, &msi_data);
+	if (error != 0) {
+		device_printf(dev, "cannot map %s interrupt, %d\n",
+		    dmd->name, error);
+		goto err5;
+	}
+	dmar_write4(unit, dmd->msi_data_reg, msi_data);
+	dmar_write4(unit, dmd->msi_addr_reg, msi_addr);
+	/* Only for xAPIC mode */
+	dmar_write4(unit, dmd->msi_uaddr_reg, msi_addr >> 32);
+	return (0);
+
+err5:
+	bus_teardown_intr(dev, dmd->irq_res, dmd->intr_handle);
+err4:
+	bus_release_resource(dev, SYS_RES_IRQ, dmd->irq_rid, dmd->irq_res);
+err3:
+	bus_delete_resource(dev, SYS_RES_IRQ, dmd->irq_rid);
+err2:
+	PCIB_RELEASE_MSIX(pcib, dev, dmd->irq);
+	dmd->irq = -1;
+err1:
+	return (error);
+}
+
+#ifdef DEV_APIC
+static int
+dmar_remap_intr(device_t dev, device_t child, u_int irq)
+{
+	struct dmar_unit *unit;
+	struct dmar_msi_data *dmd;
+	uint64_t msi_addr;
+	uint32_t msi_data;
+	int i, error;
+
+	unit = device_get_softc(dev);
+	for (i = 0; i < DMAR_INTR_TOTAL; i++) {
+		dmd = &unit->intrs[i];
+		if (irq == dmd->irq) {
+			error = PCIB_MAP_MSI(device_get_parent(
+			    device_get_parent(dev)),
+			    dev, irq, &msi_addr, &msi_data);
+			if (error != 0)
+				return (error);
+			DMAR_LOCK(unit);
+			(dmd->disable_intr)(unit);
+			dmar_write4(unit, dmd->msi_data_reg, msi_data);
+			dmar_write4(unit, dmd->msi_addr_reg, msi_addr);
+			dmar_write4(unit, dmd->msi_uaddr_reg, msi_addr >> 32);
+			(dmd->enable_intr)(unit);
+			DMAR_UNLOCK(unit);
+			return (0);
+		}
+	}
+	return (ENOENT);
+}
+#endif
+
+static void
+dmar_print_caps(device_t dev, struct dmar_unit *unit,
+    ACPI_DMAR_HARDWARE_UNIT *dmaru)
+{
+	uint32_t caphi, ecaphi;
+
+	device_printf(dev, "regs@0x%08jx, ver=%d.%d, seg=%d, flags=<%b>\n",
+	    (uintmax_t)dmaru->Address, DMAR_MAJOR_VER(unit->hw_ver),
+	    DMAR_MINOR_VER(unit->hw_ver), dmaru->Segment,
+	    dmaru->Flags, "\020\001INCLUDE_ALL_PCI");
+	caphi = unit->hw_cap >> 32;
+	device_printf(dev, "cap=%b,", (u_int)unit->hw_cap,
+	    "\020\004AFL\005WBF\006PLMR\007PHMR\010CM\027ZLR\030ISOCH");
+	printf("%b, ", caphi, "\020\010PSI\027DWD\030DRD");
+	printf("ndoms=%d, sagaw=%d, mgaw=%d, fro=%d, nfr=%d, superp=%d",
+	    DMAR_CAP_ND(unit->hw_cap), DMAR_CAP_SAGAW(unit->hw_cap),
+	    DMAR_CAP_MGAW(unit->hw_cap), DMAR_CAP_FRO(unit->hw_cap),
+	    DMAR_CAP_NFR(unit->hw_cap), DMAR_CAP_SPS(unit->hw_cap));
+	if ((unit->hw_cap & DMAR_CAP_PSI) != 0)
+		printf(", mamv=%d", DMAR_CAP_MAMV(unit->hw_cap));
+	printf("\n");
+	ecaphi = unit->hw_ecap >> 32;
+	device_printf(dev, "ecap=%b,", (u_int)unit->hw_ecap,
+	    "\020\001C\002QI\003DI\004IR\005EIM\007PT\010SC");
+	printf("%b, ", ecaphi, "\020");
+	printf("mhmw=%d, iro=%d\n", DMAR_ECAP_MHMV(unit->hw_ecap),
+	    DMAR_ECAP_IRO(unit->hw_ecap));
+}
+
+static int
+dmar_attach(device_t dev)
+{
+	struct dmar_unit *unit;
+	ACPI_DMAR_HARDWARE_UNIT *dmaru;
+	int i, error;
+
+	unit = device_get_softc(dev);
+	unit->dev = dev;
+	unit->unit = device_get_unit(dev);
+	dmaru = dmar_find_by_index(unit->unit);
+	if (dmaru == NULL)
+		return (EINVAL);
+	unit->segment = dmaru->Segment;
+	unit->base = dmaru->Address;
+	unit->reg_rid = DMAR_REG_RID;
+	unit->regs = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+	    &unit->reg_rid, RF_ACTIVE);
+	if (unit->regs == NULL) {
+		device_printf(dev, "cannot allocate register window\n");
+		return (ENOMEM);
+	}
+	unit->hw_ver = dmar_read4(unit, DMAR_VER_REG);
+	unit->hw_cap = dmar_read8(unit, DMAR_CAP_REG);
+	unit->hw_ecap = dmar_read8(unit, DMAR_ECAP_REG);
+	if (bootverbose)
+		dmar_print_caps(dev, unit, dmaru);
+	dmar_quirks_post_ident(unit);
+
+	for (i = 0; i < DMAR_INTR_TOTAL; i++)
+		unit->intrs[i].irq = -1;
+
+	unit->intrs[DMAR_INTR_FAULT].name = "fault";
+	unit->intrs[DMAR_INTR_FAULT].irq_rid = DMAR_FAULT_IRQ_RID;
+	unit->intrs[DMAR_INTR_FAULT].handler = dmar_fault_intr;
+	unit->intrs[DMAR_INTR_FAULT].msi_data_reg = DMAR_FEDATA_REG;
+	unit->intrs[DMAR_INTR_FAULT].msi_addr_reg = DMAR_FEADDR_REG;
+	unit->intrs[DMAR_INTR_FAULT].msi_uaddr_reg = DMAR_FEUADDR_REG;
+	unit->intrs[DMAR_INTR_FAULT].enable_intr = dmar_enable_fault_intr;
+	unit->intrs[DMAR_INTR_FAULT].disable_intr = dmar_disable_fault_intr;
+	error = dmar_alloc_irq(dev, unit, DMAR_INTR_FAULT);
+	if (error != 0) {
+		dmar_release_resources(dev, unit);
+		return (error);
+	}
+	if (DMAR_HAS_QI(unit)) {
+		unit->intrs[DMAR_INTR_QI].name = "qi";
+		unit->intrs[DMAR_INTR_QI].irq_rid = DMAR_QI_IRQ_RID;
+		unit->intrs[DMAR_INTR_QI].handler = dmar_qi_intr;
+		unit->intrs[DMAR_INTR_QI].msi_data_reg = DMAR_IEDATA_REG;
+		unit->intrs[DMAR_INTR_QI].msi_addr_reg = DMAR_IEADDR_REG;
+		unit->intrs[DMAR_INTR_QI].msi_uaddr_reg = DMAR_IEUADDR_REG;
+		unit->intrs[DMAR_INTR_QI].enable_intr = dmar_enable_qi_intr;
+		unit->intrs[DMAR_INTR_QI].disable_intr = dmar_disable_qi_intr;
+		error = dmar_alloc_irq(dev, unit, DMAR_INTR_QI);
+		if (error != 0) {
+			dmar_release_resources(dev, unit);
+			return (error);
+		}
+	}
+
+	mtx_init(&unit->lock, "dmarhw", NULL, MTX_DEF);
+	unit->domids = new_unrhdr(0, dmar_nd2mask(DMAR_CAP_ND(unit->hw_cap)),
+	    &unit->lock);
+
+	/*
+	 * 9.2 "Context Entry":
+	 * When Caching Mode (CM) field is reported as Set, the
+	 * domain-id value of zero is architecturally reserved.
+	 * Software must not use domain-id value of zero
+	 * when CM is Set.
+	 */
+	if ((unit->hw_cap & DMAR_CAP_CM) != 0)
+		alloc_unr_specific(unit->domids, 0);
+
+	unit->ctx_obj = vm_pager_allocate(OBJT_PHYS, NULL, IDX_TO_OFF(1 +
+	    DMAR_CTX_CNT), 0, 0, NULL);
+
+	/*
+	 * Allocate and load the root entry table pointer.  Enable the
+	 * address translation after the required invalidations are
+	 * done.
+	 */
+	dmar_pgalloc(unit->ctx_obj, 0, DMAR_PGF_WAITOK | DMAR_PGF_ZERO);
+	DMAR_LOCK(unit);
+	error = dmar_load_root_entry_ptr(unit);
+	if (error != 0) {
+		DMAR_UNLOCK(unit);
+		dmar_release_resources(dev, unit);
+		return (error);
+	}
+	error = dmar_inv_ctx_glob(unit);
+	if (error != 0) {
+		DMAR_UNLOCK(unit);
+		dmar_release_resources(dev, unit);
+		return (error);
+	}
+	if ((unit->hw_ecap & DMAR_ECAP_DI) != 0) {
+		error = dmar_inv_iotlb_glob(unit);
+		if (error != 0) {
+			DMAR_UNLOCK(unit);
+			dmar_release_resources(dev, unit);
+			return (error);
+		}
+	}
+
+	DMAR_UNLOCK(unit);
+	error = dmar_init_fault_log(unit);
+	if (error != 0) {
+		dmar_release_resources(dev, unit);
+		return (error);
+	}
+	error = dmar_init_qi(unit);
+	if (error != 0) {
+		dmar_release_resources(dev, unit);
+		return (error);
+	}
+	error = dmar_init_busdma(unit);
+	if (error != 0) {
+		dmar_release_resources(dev, unit);
+		return (error);
+	}
+
+#ifdef NOTYET
+	DMAR_LOCK(unit);
+	error = dmar_enable_translation(unit);
+	if (error != 0) {
+		DMAR_UNLOCK(unit);
+		dmar_release_resources(dev, unit);
+		return (error);
+	}
+	DMAR_UNLOCK(unit);
+#endif
+
+	return (0);
+}
+
+static int
+dmar_detach(device_t dev)
+{
+
+	return (EBUSY);
+}
+
+static int
+dmar_suspend(device_t dev)
+{
+
+	return (0);
+}
+
+static int
+dmar_resume(device_t dev)
+{
+
+	/* XXXKIB */
+	return (0);
+}
+
+static device_method_t dmar_methods[] = {
+	DEVMETHOD(device_identify, dmar_identify),
+	DEVMETHOD(device_probe, dmar_probe),
+	DEVMETHOD(device_attach, dmar_attach),
+	DEVMETHOD(device_detach, dmar_detach),
+	DEVMETHOD(device_suspend, dmar_suspend),
+	DEVMETHOD(device_resume, dmar_resume),
+#ifdef DEV_APIC
+	DEVMETHOD(bus_remap_intr, dmar_remap_intr),
+#endif
+	DEVMETHOD_END
+};
+
+static driver_t	dmar_driver = {
+	"dmar",
+	dmar_methods,
+	sizeof(struct dmar_unit),
+};
+
+DRIVER_MODULE(dmar, acpi, dmar_driver, dmar_devclass, 0, 0);
+MODULE_DEPEND(dmar, acpi, 1, 1, 1);
+
+static void
+dmar_print_path(device_t dev, const char *banner, int busno, int depth,
+    const ACPI_DMAR_PCI_PATH *path)
+{
+	int i;
+
+	device_printf(dev, "%s [%d, ", banner, busno);
+	for (i = 0; i < depth; i++) {
+		if (i != 0)
+			printf(", ");
+		printf("(%d, %d)", path[i].Device, path[i].Function);
+	}
+	printf("]\n");
+}
+
+static int
+dmar_dev_depth(device_t child)
+{
+	devclass_t pci_class;
+	device_t bus, pcib;
+	int depth;
+
+	pci_class = devclass_find("pci");
+	for (depth = 1; ; depth++) {
+		bus = device_get_parent(child);
+		pcib = device_get_parent(bus);
+		if (device_get_devclass(device_get_parent(pcib)) !=
+		    pci_class)
+			return (depth);
+		child = pcib;
+	}
+}
+
+static void
+dmar_dev_path(device_t child, int *busno, ACPI_DMAR_PCI_PATH *path, int depth)
+{
+	devclass_t pci_class;
+	device_t bus, pcib;
+
+	pci_class = devclass_find("pci");
+	for (depth--; depth != -1; depth--) {
+		path[depth].Device = pci_get_slot(child);
+		path[depth].Function = pci_get_function(child);
+		bus = device_get_parent(child);
+		pcib = device_get_parent(bus);
+		if (device_get_devclass(device_get_parent(pcib)) !=
+		    pci_class) {
+			/* reached a host bridge */
+			*busno = pcib_get_bus(bus);
+			return;
+		}
+		child = pcib;
+	}
+	panic("wrong depth");
+}
+
+static int
+dmar_match_pathes(int busno1, const ACPI_DMAR_PCI_PATH *path1, int depth1,
+    int busno2, const ACPI_DMAR_PCI_PATH *path2, int depth2,
+    enum AcpiDmarScopeType scope_type)
+{
+	int i, depth;
+
+	if (busno1 != busno2)
+		return (0);
+	if (scope_type == ACPI_DMAR_SCOPE_TYPE_ENDPOINT && depth1 != depth2)
+		return (0);
+	depth = depth1;
+	if (depth2 < depth)
+		depth = depth2;
+	for (i = 0; i < depth; i++) {
+		if (path1[i].Device != path2[i].Device ||
+		    path1[i].Function != path2[i].Function)
+			return (0);
+	}
+	return (1);
+}
+
+static int
+dmar_match_devscope(ACPI_DMAR_DEVICE_SCOPE *devscope, device_t dev,
+    int dev_busno, const ACPI_DMAR_PCI_PATH *dev_path, int dev_path_len)
+{
+	ACPI_DMAR_PCI_PATH *path;
+	int path_len;
+
+	if (devscope->Length < sizeof(*devscope)) {
+		printf("dmar_find: corrupted DMAR table, dl %d\n",
+		    devscope->Length);
+		return (-1);
+	}
+	if (devscope->EntryType != ACPI_DMAR_SCOPE_TYPE_ENDPOINT &&
+	    devscope->EntryType != ACPI_DMAR_SCOPE_TYPE_BRIDGE)
+		return (0);
+	path_len = devscope->Length - sizeof(*devscope);
+	if (path_len % 2 != 0) {
+		printf("dmar_find_bsf: corrupted DMAR table, dl %d\n",
+		    devscope->Length);
+		return (-1);
+	}
+	path_len /= 2;
+	path = (ACPI_DMAR_PCI_PATH *)(devscope + 1);
+	if (path_len == 0) {
+		printf("dmar_find: corrupted DMAR table, dl %d\n",
+		    devscope->Length);
+		return (-1);
+	}
+	if (dmar_match_verbose)
+		dmar_print_path(dev, "DMAR", devscope->Bus, path_len, path);
+
+	return (dmar_match_pathes(devscope->Bus, path, path_len, dev_busno,
+	    dev_path, dev_path_len, devscope->EntryType));
+}
+
+struct dmar_unit *
+dmar_find(device_t dev)
+{
+	device_t dmar_dev;
+	ACPI_DMAR_HARDWARE_UNIT *dmarh;
+	ACPI_DMAR_DEVICE_SCOPE *devscope;
+	char *ptr, *ptrend;
+	int i, match, dev_domain, dev_busno, dev_path_len;
+
+	dmar_dev = NULL;
+	dev_domain = pci_get_domain(dev);
+	dev_path_len = dmar_dev_depth(dev);
+	ACPI_DMAR_PCI_PATH dev_path[dev_path_len];
+	dmar_dev_path(dev, &dev_busno, dev_path, dev_path_len);
+	if (dmar_match_verbose)
+		dmar_print_path(dev, "PCI", dev_busno, dev_path_len, dev_path);
+
+	for (i = 0; i < dmar_devcnt; i++) {
+		if (dmar_devs[i] == NULL)
+			continue;
+		dmarh = dmar_find_by_index(i);
+		if (dmarh == NULL)
+			continue;
+		if (dmarh->Segment != dev_domain)
+			continue;
+		if ((dmarh->Flags & ACPI_DMAR_INCLUDE_ALL) != 0) {
+			dmar_dev = dmar_devs[i];
+			if (dmar_match_verbose) {
+				device_printf(dev,
+				    "pci%d:%d:%d:%d matched dmar%d INCLUDE_ALL\n",
+				    dev_domain, pci_get_bus(dev),
+				    pci_get_slot(dev),
+				    pci_get_function(dev),
+				    ((struct dmar_unit *)device_get_softc(
+				    dmar_dev))->unit);
+			}
+			goto found;
+		}
+		ptr = (char *)dmarh + sizeof(*dmarh);
+		ptrend = (char *)dmarh + dmarh->Header.Length;
+		for (;;) {
+			if (ptr >= ptrend)
+				break;
+			devscope = (ACPI_DMAR_DEVICE_SCOPE *)ptr;
+			ptr += devscope->Length;
+			if (dmar_match_verbose) {
+				device_printf(dev,
+				    "pci%d:%d:%d:%d matching dmar%d\n",
+				    dev_domain, pci_get_bus(dev),
+				    pci_get_slot(dev),
+				    pci_get_function(dev),
+				    ((struct dmar_unit *)device_get_softc(
+				    dmar_devs[i]))->unit);
+			}
+			match = dmar_match_devscope(devscope, dev, dev_busno,
+			    dev_path, dev_path_len);
+			if (dmar_match_verbose) {
+				if (match == -1)
+					printf("table error\n");
+				else if (match == 0)
+					printf("not matched\n");
+				else
+					printf("matched\n");
+			}
+			if (match == -1)
+				return (NULL);
+			else if (match == 1) {
+				dmar_dev = dmar_devs[i];
+				goto found;
+			}
+		}
+	}
+	return (NULL);
+found:
+	return (device_get_softc(dmar_dev));
+}
+
+struct rmrr_iter_args {
+	struct dmar_ctx *ctx;
+	device_t dev;
+	int dev_domain;
+	int dev_busno;
+	ACPI_DMAR_PCI_PATH *dev_path;
+	int dev_path_len;
+	struct dmar_map_entries_tailq *rmrr_entries;
+};
+
+static int
+dmar_rmrr_iter(ACPI_DMAR_HEADER *dmarh, void *arg)
+{
+	struct rmrr_iter_args *ria;
+	ACPI_DMAR_RESERVED_MEMORY *resmem;
+	ACPI_DMAR_DEVICE_SCOPE *devscope;
+	struct dmar_map_entry *entry;
+	char *ptr, *ptrend;
+	int match;
+
+	if (dmarh->Type != ACPI_DMAR_TYPE_RESERVED_MEMORY)
+		return (1);
+
+	ria = arg;
+	resmem = (ACPI_DMAR_RESERVED_MEMORY *)dmarh;
+	if (dmar_match_verbose) {
+		printf("RMRR [%jx,%jx] segment %d\n",
+		    (uintmax_t)resmem->BaseAddress,
+		    (uintmax_t)resmem->EndAddress,
+		    resmem->Segment);
+	}
+	if (resmem->Segment != ria->dev_domain)
+		return (1);
+
+	ptr = (char *)resmem + sizeof(*resmem);
+	ptrend = (char *)resmem + resmem->Header.Length;
+	for (;;) {
+		if (ptr >= ptrend)
+			break;
+		devscope = (ACPI_DMAR_DEVICE_SCOPE *)ptr;
+		ptr += devscope->Length;
+		match = dmar_match_devscope(devscope, ria->dev, ria->dev_busno,
+		    ria->dev_path, ria->dev_path_len);
+		if (match == 1) {
+			if (dmar_match_verbose)
+				printf("matched\n");
+			entry = dmar_gas_alloc_entry(ria->ctx, DMAR_PGF_WAITOK);
+			entry->start = resmem->BaseAddress;
+			/* The RMRR entry end address is inclusive. */
+			entry->end = resmem->EndAddress;
+			TAILQ_INSERT_TAIL(ria->rmrr_entries, entry,
+			    unroll_link);
+		} else if (dmar_match_verbose) {
+			printf("not matched, err %d\n", match);
+		}
+	}
+
+	return (1);
+}
+
+void
+dmar_ctx_parse_rmrr(struct dmar_ctx *ctx, device_t dev,
+    struct dmar_map_entries_tailq *rmrr_entries)
+{
+	struct rmrr_iter_args ria;
+
+	ria.dev_domain = pci_get_domain(dev);
+	ria.dev_path_len = dmar_dev_depth(dev);
+	ACPI_DMAR_PCI_PATH dev_path[ria.dev_path_len];
+	dmar_dev_path(dev, &ria.dev_busno, dev_path, ria.dev_path_len);
+
+	if (dmar_match_verbose) {
+		device_printf(dev, "parsing RMRR entries for ");
+		dmar_print_path(dev, "PCI", ria.dev_busno, ria.dev_path_len,
+		    dev_path);
+	}
+
+	ria.ctx = ctx;
+	ria.dev = dev;
+	ria.dev_path = dev_path;
+	ria.rmrr_entries = rmrr_entries;
+	dmar_iterate_tbl(dmar_rmrr_iter, &ria);
+}
+
+struct inst_rmrr_iter_args {
+	struct dmar_unit *dmar;
+};
+
+static device_t
+dmar_path_dev(int segment, int path_len, int busno,
+    const ACPI_DMAR_PCI_PATH *path)
+{
+	devclass_t pci_class;
+	device_t bus, pcib, dev;
+	int i;
+
+	pci_class = devclass_find("pci");
+	dev = NULL;
+	for (i = 0; i < path_len; i++, path++) {
+		dev = pci_find_dbsf(segment, busno, path->Device,
+		    path->Function);
+		if (dev == NULL)
+			break;
+		if (i != path_len - 1) {
+			bus = device_get_parent(dev);
+			pcib = device_get_parent(bus);
+			if (device_get_devclass(device_get_parent(pcib)) !=
+			    pci_class)
+				return (NULL);
+		}
+		busno = pcib_get_bus(dev);
+	}
+	return (dev);
+}
+
+static int
+dmar_inst_rmrr_iter(ACPI_DMAR_HEADER *dmarh, void *arg)
+{
+	const ACPI_DMAR_RESERVED_MEMORY *resmem;
+	const ACPI_DMAR_DEVICE_SCOPE *devscope;
+	struct inst_rmrr_iter_args *iria;
+	const char *ptr, *ptrend;
+	struct dmar_unit *dev_dmar;
+	device_t dev;
+
+	if (dmarh->Type != ACPI_DMAR_TYPE_RESERVED_MEMORY)
+		return (1);
+
+	iria = arg;
+	resmem = (ACPI_DMAR_RESERVED_MEMORY *)dmarh;
+	if (resmem->Segment != iria->dmar->segment)
+		return (1);
+	if (dmar_match_verbose) {
+		printf("dmar%d: RMRR [%jx,%jx]\n", iria->dmar->unit,
+		    (uintmax_t)resmem->BaseAddress,
+		    (uintmax_t)resmem->EndAddress);
+	}
+
+	ptr = (const char *)resmem + sizeof(*resmem);
+	ptrend = (const char *)resmem + resmem->Header.Length;
+	for (;;) {
+		if (ptr >= ptrend)
+			break;
+		devscope = (const ACPI_DMAR_DEVICE_SCOPE *)ptr;
+		ptr += devscope->Length;
+		/* XXXKIB bridge */
+		if (devscope->EntryType != ACPI_DMAR_SCOPE_TYPE_ENDPOINT)
+			continue;
+		if (dmar_match_verbose) {
+			dmar_print_path(iria->dmar->dev, "RMRR scope",
+			    devscope->Bus, (devscope->Length -
+			    sizeof(ACPI_DMAR_DEVICE_SCOPE)) / 2,
+			    (const ACPI_DMAR_PCI_PATH *)(devscope + 1));
+		}
+		dev = dmar_path_dev(resmem->Segment, (devscope->Length -
+		    sizeof(ACPI_DMAR_DEVICE_SCOPE)) / 2, devscope->Bus,
+		    (const ACPI_DMAR_PCI_PATH *)(devscope + 1));
+		if (dev == NULL) {
+			if (dmar_match_verbose)
+				printf("null dev\n");
+			continue;
+		}
+		dev_dmar = dmar_find(dev);
+		if (dev_dmar != iria->dmar) {
+			if (dmar_match_verbose) {
+				printf("dmar%d matched, skipping\n",
+				    dev_dmar->unit);
+			}
+			continue;
+		}
+		if (dmar_match_verbose)
+			printf("matched, instantiating RMRR context\n");
+		dmar_instantiate_ctx(iria->dmar, dev, true);
+	}
+
+	return (1);
+
+}
+
+/*
+ * Pre-create all contexts for the DMAR which have RMRR entries.
+ */
+int
+dmar_instantiate_rmrr_ctxs(struct dmar_unit *dmar)
+{
+	struct inst_rmrr_iter_args iria;
+	int error;
+
+	if (!dmar_barrier_enter(dmar, DMAR_BARRIER_RMRR))
+		return (0);
+
+	error = 0;
+	iria.dmar = dmar;
+	if (dmar_match_verbose)
+		printf("dmar%d: instantiating RMRR contexts\n", dmar->unit);
+	dmar_iterate_tbl(dmar_inst_rmrr_iter, &iria);
+	DMAR_LOCK(dmar);
+	if (!LIST_EMPTY(&dmar->contexts)) {
+		KASSERT((dmar->hw_gcmd & DMAR_GCMD_TE) == 0,
+	    ("dmar%d: RMRR not handled but translation is already enabled",
+		    dmar->unit));
+		error = dmar_enable_translation(dmar);
+	}
+	dmar_barrier_exit(dmar, DMAR_BARRIER_RMRR);
+	return (error);
+}
+
+#ifdef DDB
+#include <ddb/ddb.h>
+#include <ddb/db_lex.h>
+
+static void
+dmar_print_ctx_entry(const struct dmar_map_entry *entry)
+{
+	struct dmar_map_entry *l, *r;
+
+	db_printf(
+	    "    start %jx end %jx free_after %jx free_down %jx flags %x ",
+	    entry->start, entry->end, entry->free_after, entry->free_down,
+	    entry->flags);
+	db_printf("left ");
+	l = RB_LEFT(entry, rb_entry);
+	if (l == NULL)
+		db_printf("NULL ");
+	else
+		db_printf("%jx ", l->start);
+	db_printf("right ");
+	r = RB_RIGHT(entry, rb_entry);
+	if (r == NULL)
+		db_printf("NULL");
+	else
+		db_printf("%jx", r->start);
+	db_printf("\n");
+}
+
+static void
+dmar_print_ctx(struct dmar_ctx *ctx, bool show_mappings)
+{
+	struct dmar_map_entry *entry;
+
+	db_printf(
+	    "  @%p pci%d:%d:%d dom %d mgaw %d agaw %d pglvl %d end %jx\n"
+	    "    refs %d flags %x pgobj %p map_ents %u loads %lu unloads %lu\n",
+	    ctx, ctx->bus, ctx->slot, ctx->func, ctx->domain, ctx->mgaw,
+	    ctx->agaw, ctx->pglvl, (uintmax_t)ctx->end, ctx->refs,
+	    ctx->flags, ctx->pgtbl_obj, ctx->entries_cnt, ctx->loads,
+	    ctx->unloads);
+	if (!show_mappings)
+		return;
+	db_printf("    mapped:\n");
+	RB_FOREACH(entry, dmar_gas_entries_tree, &ctx->rb_root) {
+		dmar_print_ctx_entry(entry);
+		if (db_pager_quit)
+			break;
+	}
+	if (db_pager_quit)
+		return;
+	db_printf("    unloading:\n");
+	TAILQ_FOREACH(entry, &ctx->unload_entries, dmamap_link) {
+		dmar_print_ctx_entry(entry);
+		if (db_pager_quit)
+			break;
+	}
+}
+
+DB_FUNC(dmar_ctx, db_dmar_print_ctx, db_show_table, CS_OWN, NULL)
+{
+	struct dmar_unit *unit;
+	struct dmar_ctx *ctx;
+	bool show_mappings, valid;
+	int domain, bus, device, function, i, t;
+	db_expr_t radix;
+
+	valid = false;
+	radix = db_radix;
+	db_radix = 10;
+	t = db_read_token();
+	if (t == tSLASH) {
+		t = db_read_token();
+		if (t != tIDENT) {
+			db_printf("Bad modifier\n");
+			db_radix = radix;
+			db_skip_to_eol();
+			return;
+		}
+		show_mappings = strchr(db_tok_string, 'm') != NULL;
+		t = db_read_token();
+	} else {
+		show_mappings = false;
+	}
+	if (t == tNUMBER) {
+		domain = db_tok_number;
+		t = db_read_token();
+		if (t == tNUMBER) {
+			bus = db_tok_number;
+			t = db_read_token();
+			if (t == tNUMBER) {
+				device = db_tok_number;
+				t = db_read_token();
+				if (t == tNUMBER) {
+					function = db_tok_number;
+					valid = true;
+				}
+			}
+		}
+	}
+			db_radix = radix;
+	db_skip_to_eol();
+	if (!valid) {
+		db_printf("usage: show dmar_ctx [/m] "
+		    "<domain> <bus> <device> <func>\n");
+		return;
+	}
+	for (i = 0; i < dmar_devcnt; i++) {
+		unit = device_get_softc(dmar_devs[i]);
+		LIST_FOREACH(ctx, &unit->contexts, link) {
+			if (domain == unit->segment && bus == ctx->bus &&
+			    device == ctx->slot && function == ctx->func) {
+				dmar_print_ctx(ctx, show_mappings);
+				goto out;
+			}
+		}
+	}
+out:;
+}
+
+static void
+dmar_print_one(int idx, bool show_ctxs, bool show_mappings)
+{
+	struct dmar_unit *unit;
+	struct dmar_ctx *ctx;
+	int i, frir;
+
+	unit = device_get_softc(dmar_devs[idx]);
+	db_printf("dmar%d at %p, root at 0x%jx, ver 0x%x\n", unit->unit, unit,
+	    dmar_read8(unit, DMAR_RTADDR_REG), dmar_read4(unit, DMAR_VER_REG));
+	db_printf("cap 0x%jx ecap 0x%jx gsts 0x%x fsts 0x%x fectl 0x%x\n",
+	    (uintmax_t)dmar_read8(unit, DMAR_CAP_REG),
+	    (uintmax_t)dmar_read8(unit, DMAR_ECAP_REG),
+	    dmar_read4(unit, DMAR_GSTS_REG),
+	    dmar_read4(unit, DMAR_FSTS_REG),
+	    dmar_read4(unit, DMAR_FECTL_REG));
+	db_printf("fed 0x%x fea 0x%x feua 0x%x\n",
+	    dmar_read4(unit, DMAR_FEDATA_REG),
+	    dmar_read4(unit, DMAR_FEADDR_REG),
+	    dmar_read4(unit, DMAR_FEUADDR_REG));
+	db_printf("primary fault log:\n");
+	for (i = 0; i < DMAR_CAP_NFR(unit->hw_cap); i++) {
+		frir = (DMAR_CAP_FRO(unit->hw_cap) + i) * 16;
+		db_printf("  %d at 0x%x: %jx %jx\n", i, frir,
+		    (uintmax_t)dmar_read8(unit, frir),
+		    (uintmax_t)dmar_read8(unit, frir + 8));
+	}
+	if (DMAR_HAS_QI(unit)) {
+		db_printf("ied 0x%x iea 0x%x ieua 0x%x\n",
+		    dmar_read4(unit, DMAR_IEDATA_REG),
+		    dmar_read4(unit, DMAR_IEADDR_REG),
+		    dmar_read4(unit, DMAR_IEUADDR_REG));
+		if (unit->qi_enabled) {
+			db_printf("qi is enabled: queue @0x%jx (IQA 0x%jx) "
+			    "size 0x%jx\n"
+		    "  head 0x%x tail 0x%x avail 0x%x status 0x%x ctrl 0x%x\n"
+		    "  hw compl 0x%x@%p/phys@%jx next seq 0x%x gen 0x%x\n",
+			    (uintmax_t)unit->inv_queue,
+			    (uintmax_t)dmar_read8(unit, DMAR_IQA_REG),
+			    (uintmax_t)unit->inv_queue_size,
+			    dmar_read4(unit, DMAR_IQH_REG),
+			    dmar_read4(unit, DMAR_IQT_REG),
+			    unit->inv_queue_avail,
+			    dmar_read4(unit, DMAR_ICS_REG),
+			    dmar_read4(unit, DMAR_IECTL_REG),
+			    unit->inv_waitd_seq_hw,
+			    &unit->inv_waitd_seq_hw,
+			    (uintmax_t)unit->inv_waitd_seq_hw_phys,
+			    unit->inv_waitd_seq,
+			    unit->inv_waitd_gen);
+		} else {
+			db_printf("qi is disabled\n");
+		}
+	}
+	if (show_ctxs) {
+		db_printf("contexts:\n");
+		LIST_FOREACH(ctx, &unit->contexts, link) {
+			dmar_print_ctx(ctx, show_mappings);
+			if (db_pager_quit)
+				break;
+		}
+	}
+}
+
+DB_SHOW_COMMAND(dmar, db_dmar_print)
+{
+	bool show_ctxs, show_mappings;
+
+	show_ctxs = strchr(modif, 'c') != NULL;
+	show_mappings = strchr(modif, 'm') != NULL;
+	if (!have_addr) {
+		db_printf("usage: show dmar [/c] [/m] index\n");
+		return;
+	}
+	dmar_print_one((int)addr, show_ctxs, show_mappings);
+}
+
+DB_SHOW_ALL_COMMAND(dmars, db_show_all_dmars)
+{
+	int i;
+	bool show_ctxs, show_mappings;
+
+	show_ctxs = strchr(modif, 'c') != NULL;
+	show_mappings = strchr(modif, 'm') != NULL;
+
+	for (i = 0; i < dmar_devcnt; i++) {
+		dmar_print_one(i, show_ctxs, show_mappings);
+		if (db_pager_quit)
+			break;
+	}
+}
+#endif
diff --git a/sys/x86/iommu/intel_fault.c b/sys/x86/iommu/intel_fault.c
new file mode 100644
index 00000000000..18f8fefd727
--- /dev/null
+++ b/sys/x86/iommu/intel_fault.c
@@ -0,0 +1,315 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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_acpi.h"
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/memdesc.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
+#include <machine/bus.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <dev/acpica/acpivar.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 <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/busdma_dmar.h>
+#include <x86/iommu/intel_dmar.h>
+
+/*
+ * Fault interrupt handling for DMARs.  If advanced fault logging is
+ * not implemented by hardware, the code emulates it.  Fast interrupt
+ * handler flushes the fault registers into circular buffer at
+ * unit->fault_log, and schedules a task.
+ *
+ * The fast handler is used since faults usually come in bursts, and
+ * number of fault log registers is limited, e.g. down to one for 5400
+ * MCH.  We are trying to reduce the latency for clearing the fault
+ * register file.  The task is usually long-running, since printf() is
+ * slow, but this is not problematic because bursts are rare.
+ *
+ * For the same reason, each translation unit task is executed in its
+ * own thread.
+ *
+ * XXXKIB It seems there is no hardware available which implements
+ * advanced fault logging, so the code to handle AFL is not written.
+ */
+
+static int
+dmar_fault_next(struct dmar_unit *unit, int faultp)
+{
+
+	faultp += 2;
+	if (faultp == unit->fault_log_size)
+		faultp = 0;
+	return (faultp);
+}
+
+static void
+dmar_fault_intr_clear(struct dmar_unit *unit, uint32_t fsts)
+{
+	uint32_t clear;
+
+	clear = 0;
+	if ((fsts & DMAR_FSTS_ITE) != 0) {
+		printf("DMAR%d: Invalidation timed out\n", unit->unit);
+		clear |= DMAR_FSTS_ITE;
+	}
+	if ((fsts & DMAR_FSTS_ICE) != 0) {
+		printf("DMAR%d: Invalidation completion error\n",
+		    unit->unit);
+		clear |= DMAR_FSTS_ICE;
+	}
+	if ((fsts & DMAR_FSTS_IQE) != 0) {
+		printf("DMAR%d: Invalidation queue error\n",
+		    unit->unit);
+		clear |= DMAR_FSTS_IQE;
+	}
+	if ((fsts & DMAR_FSTS_APF) != 0) {
+		printf("DMAR%d: Advanced pending fault\n", unit->unit);
+		clear |= DMAR_FSTS_APF;
+	}
+	if ((fsts & DMAR_FSTS_AFO) != 0) {
+		printf("DMAR%d: Advanced fault overflow\n", unit->unit);
+		clear |= DMAR_FSTS_AFO;
+	}
+	if (clear != 0)
+		dmar_write4(unit, DMAR_FSTS_REG, clear);
+}
+
+int
+dmar_fault_intr(void *arg)
+{
+	struct dmar_unit *unit;
+	uint64_t fault_rec[2];
+	uint32_t fsts;
+	int fri, frir, faultp;
+	bool enqueue;
+
+	unit = arg;
+	enqueue = false;
+	fsts = dmar_read4(unit, DMAR_FSTS_REG);
+	dmar_fault_intr_clear(unit, fsts);
+
+	if ((fsts & DMAR_FSTS_PPF) == 0)
+		goto done;
+
+	fri = DMAR_FSTS_FRI(fsts);
+	for (;;) {
+		frir = (DMAR_CAP_FRO(unit->hw_cap) + fri) * 16;
+		fault_rec[1] = dmar_read8(unit, frir + 8);
+		if ((fault_rec[1] & DMAR_FRCD2_F) == 0)
+			break;
+		fault_rec[0] = dmar_read8(unit, frir);
+		dmar_write4(unit, frir + 12, DMAR_FRCD2_F32);
+		DMAR_FAULT_LOCK(unit);
+		faultp = unit->fault_log_head;
+		if (dmar_fault_next(unit, faultp) == unit->fault_log_tail) {
+			/* XXXKIB log overflow */
+		} else {
+			unit->fault_log[faultp] = fault_rec[0];
+			unit->fault_log[faultp + 1] = fault_rec[1];
+			unit->fault_log_head = dmar_fault_next(unit, faultp);
+			enqueue = true;
+		}
+		DMAR_FAULT_UNLOCK(unit);
+		fri += 1;
+		if (fri >= DMAR_CAP_NFR(unit->hw_cap))
+			fri = 0;
+	}
+
+done:
+	/*
+	 * On SandyBridge, due to errata BJ124, IvyBridge errata
+	 * BV100, and Haswell errata HSD40, "Spurious Intel VT-d
+	 * Interrupts May Occur When the PFO Bit is Set".  Handle the
+	 * cases by clearing overflow bit even if no fault is
+	 * reported.
+	 *
+	 * On IvyBridge, errata BV30 states that clearing clear
+	 * DMAR_FRCD2_F bit in the fault register causes spurious
+	 * interrupt.  Do nothing.
+	 *
+	 */
+	if ((fsts & DMAR_FSTS_PFO) != 0) {
+		printf("DMAR%d: Fault Overflow\n", unit->unit);
+		dmar_write4(unit, DMAR_FSTS_REG, DMAR_FSTS_PFO);
+	}
+
+	if (enqueue) {
+		taskqueue_enqueue_fast(unit->fault_taskqueue,
+		    &unit->fault_task);
+	}
+	return (FILTER_HANDLED);
+}
+
+static void
+dmar_fault_task(void *arg, int pending __unused)
+{
+	struct dmar_unit *unit;
+	struct dmar_ctx *ctx;
+	uint64_t fault_rec[2];
+	int sid, bus, slot, func, faultp;
+
+	unit = arg;
+	DMAR_FAULT_LOCK(unit);
+	for (;;) {
+		faultp = unit->fault_log_tail;
+		if (faultp == unit->fault_log_head)
+			break;
+
+		fault_rec[0] = unit->fault_log[faultp];
+		fault_rec[1] = unit->fault_log[faultp + 1];
+		unit->fault_log_tail = dmar_fault_next(unit, faultp);
+		DMAR_FAULT_UNLOCK(unit);
+
+		sid = DMAR_FRCD2_SID(fault_rec[1]);
+		bus = (sid >> 8) & 0xf;
+		slot = (sid >> 3) & 0x1f;
+		func = sid & 0x7;
+		printf("DMAR%d: ", unit->unit);
+		DMAR_LOCK(unit);
+		ctx = dmar_find_ctx_locked(unit, bus, slot, func);
+		if (ctx == NULL) {
+			printf("<unknown dev>:");
+		} else {
+			ctx->flags |= DMAR_CTX_FAULTED;
+			ctx->last_fault_rec[0] = fault_rec[0];
+			ctx->last_fault_rec[1] = fault_rec[1];
+			device_print_prettyname(ctx->ctx_tag.owner);
+		}
+		DMAR_UNLOCK(unit);
+		printf(
+		    "pci%d:%d:%d fault acc %x adt 0x%x reason 0x%x addr %jx\n",
+		    bus, slot, func, DMAR_FRCD2_T(fault_rec[1]),
+		    DMAR_FRCD2_AT(fault_rec[1]), DMAR_FRCD2_FR(fault_rec[1]),
+		    (uintmax_t)fault_rec[0]);
+		DMAR_FAULT_LOCK(unit);
+	}
+	DMAR_FAULT_UNLOCK(unit);
+}
+
+static void
+dmar_clear_faults(struct dmar_unit *unit)
+{
+	uint32_t frec, frir, fsts;
+	int i;
+
+	for (i = 0; i < DMAR_CAP_NFR(unit->hw_cap); i++) {
+		frir = (DMAR_CAP_FRO(unit->hw_cap) + i) * 16;
+		frec = dmar_read4(unit, frir + 12);
+		if ((frec & DMAR_FRCD2_F32) == 0)
+			continue;
+		dmar_write4(unit, frir + 12, DMAR_FRCD2_F32);
+	}
+	fsts = dmar_read4(unit, DMAR_FSTS_REG);
+	dmar_write4(unit, DMAR_FSTS_REG, fsts);
+}
+
+int
+dmar_init_fault_log(struct dmar_unit *unit)
+{
+
+	mtx_init(&unit->fault_lock, "dmarflt", NULL, MTX_SPIN);
+	unit->fault_log_size = 256; /* 128 fault log entries */
+	TUNABLE_INT_FETCH("hw.dmar.fault_log_size", &unit->fault_log_size);
+	if (unit->fault_log_size % 2 != 0)
+		panic("hw.dmar_fault_log_size must be even");
+	unit->fault_log = malloc(sizeof(uint64_t) * unit->fault_log_size,
+	    M_DEVBUF, M_WAITOK | M_ZERO);
+
+	TASK_INIT(&unit->fault_task, 0, dmar_fault_task, unit);
+	unit->fault_taskqueue = taskqueue_create_fast("dmar", M_WAITOK,
+	    taskqueue_thread_enqueue, &unit->fault_taskqueue);
+	taskqueue_start_threads(&unit->fault_taskqueue, 1, PI_AV,
+	    "dmar%d fault taskq", unit->unit);
+
+	DMAR_LOCK(unit);
+	dmar_disable_fault_intr(unit);
+	dmar_clear_faults(unit);
+	dmar_enable_fault_intr(unit);
+	DMAR_UNLOCK(unit);
+
+	return (0);
+}
+
+void
+dmar_fini_fault_log(struct dmar_unit *unit)
+{
+
+	DMAR_LOCK(unit);
+	dmar_disable_fault_intr(unit);
+	DMAR_UNLOCK(unit);
+
+	if (unit->fault_taskqueue == NULL)
+		return;
+
+	taskqueue_drain(unit->fault_taskqueue, &unit->fault_task);
+	taskqueue_free(unit->fault_taskqueue);
+	unit->fault_taskqueue = NULL;
+	mtx_destroy(&unit->fault_lock);
+
+	free(unit->fault_log, M_DEVBUF);
+	unit->fault_log = NULL;
+	unit->fault_log_head = unit->fault_log_tail = 0;
+}
+
+void
+dmar_enable_fault_intr(struct dmar_unit *unit)
+{
+	uint32_t fectl;
+
+	DMAR_ASSERT_LOCKED(unit);
+	fectl = dmar_read4(unit, DMAR_FECTL_REG);
+	fectl &= ~DMAR_FECTL_IM;
+	dmar_write4(unit, DMAR_FECTL_REG, fectl);
+}
+
+void
+dmar_disable_fault_intr(struct dmar_unit *unit)
+{
+	uint32_t fectl;
+
+	DMAR_ASSERT_LOCKED(unit);
+	fectl = dmar_read4(unit, DMAR_FECTL_REG);
+	dmar_write4(unit, DMAR_FECTL_REG, fectl | DMAR_FECTL_IM);
+}
diff --git a/sys/x86/iommu/intel_gas.c b/sys/x86/iommu/intel_gas.c
new file mode 100644
index 00000000000..51ad1510a50
--- /dev/null
+++ b/sys/x86/iommu/intel_gas.c
@@ -0,0 +1,724 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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$");
+
+#define	RB_AUGMENT(entry) dmar_gas_augment_entry(entry)
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/bus.h>
+#include <sys/interrupt.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/lock.h>
+#include <sys/proc.h>
+#include <sys/rwlock.h>
+#include <sys/memdesc.h>
+#include <sys/mutex.h>
+#include <sys/sysctl.h>
+#include <sys/rman.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
+#include <sys/uio.h>
+#include <dev/pci/pcivar.h>
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_object.h>
+#include <vm/vm_page.h>
+#include <vm/vm_map.h>
+#include <vm/uma.h>
+#include <machine/atomic.h>
+#include <machine/bus.h>
+#include <machine/md_var.h>
+#include <machine/specialreg.h>
+#include <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/busdma_dmar.h>
+#include <x86/iommu/intel_dmar.h>
+
+/*
+ * Guest Address Space management.
+ */
+
+static uma_zone_t dmar_map_entry_zone;
+
+static void
+intel_gas_init(void)
+{
+
+	dmar_map_entry_zone = uma_zcreate("DMAR_MAP_ENTRY",
+	    sizeof(struct dmar_map_entry), NULL, NULL,
+	    NULL, NULL, UMA_ALIGN_PTR, 0);
+}
+SYSINIT(intel_gas, SI_SUB_DRIVERS, SI_ORDER_FIRST, intel_gas_init, NULL);
+
+struct dmar_map_entry *
+dmar_gas_alloc_entry(struct dmar_ctx *ctx, u_int flags)
+{
+	struct dmar_map_entry *res;
+
+	KASSERT((flags & ~(DMAR_PGF_WAITOK)) == 0,
+	    ("unsupported flags %x", flags));
+
+	res = uma_zalloc(dmar_map_entry_zone, ((flags & DMAR_PGF_WAITOK) !=
+	    0 ? M_WAITOK : M_NOWAIT) | M_ZERO);
+	if (res != NULL) {
+		res->ctx = ctx;
+		atomic_add_int(&ctx->entries_cnt, 1);
+	}
+	return (res);
+}
+
+void
+dmar_gas_free_entry(struct dmar_ctx *ctx, struct dmar_map_entry *entry)
+{
+
+	KASSERT(ctx == entry->ctx,
+	    ("mismatched free ctx %p entry %p entry->ctx %p", ctx,
+	    entry, entry->ctx));
+	atomic_subtract_int(&ctx->entries_cnt, 1);
+	uma_zfree(dmar_map_entry_zone, entry);
+}
+
+static int
+dmar_gas_cmp_entries(struct dmar_map_entry *a, struct dmar_map_entry *b)
+{
+
+	/* Last entry have zero size, so <= */
+	KASSERT(a->start <= a->end, ("inverted entry %p (%jx, %jx)",
+	    a, (uintmax_t)a->start, (uintmax_t)a->end));
+	KASSERT(b->start <= b->end, ("inverted entry %p (%jx, %jx)",
+	    b, (uintmax_t)b->start, (uintmax_t)b->end));
+	KASSERT(a->end <= b->start || b->end <= a->start ||
+	    a->end == a->start || b->end == b->start,
+	    ("overlapping entries %p (%jx, %jx) %p (%jx, %jx)",
+	    a, (uintmax_t)a->start, (uintmax_t)a->end,
+	    b, (uintmax_t)b->start, (uintmax_t)b->end));
+
+	if (a->end < b->end)
+		return (-1);
+	else if (b->end < a->end)
+		return (1);
+	return (0);
+}
+
+static void
+dmar_gas_augment_entry(struct dmar_map_entry *entry)
+{
+	struct dmar_map_entry *l, *r;
+
+	for (; entry != NULL; entry = RB_PARENT(entry, rb_entry)) {
+		l = RB_LEFT(entry, rb_entry);
+		r = RB_RIGHT(entry, rb_entry);
+		if (l == NULL && r == NULL) {
+			entry->free_down = entry->free_after;
+		} else if (l == NULL && r != NULL) {
+			entry->free_down = MAX(entry->free_after, r->free_down);
+		} else if (/*l != NULL && */ r == NULL) {
+			entry->free_down = MAX(entry->free_after, l->free_down);
+		} else /* if (l != NULL && r != NULL) */ {
+			entry->free_down = MAX(entry->free_after, l->free_down);
+			entry->free_down = MAX(entry->free_down, r->free_down);
+		}
+	}
+}
+
+RB_GENERATE(dmar_gas_entries_tree, dmar_map_entry, rb_entry,
+    dmar_gas_cmp_entries);
+
+static void
+dmar_gas_fix_free(struct dmar_ctx *ctx, struct dmar_map_entry *entry)
+{
+	struct dmar_map_entry *next;
+
+	next = RB_NEXT(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	entry->free_after = (next != NULL ? next->start : ctx->end) -
+	    entry->end;
+	dmar_gas_augment_entry(entry);
+}
+
+#ifdef INVARIANTS
+static void
+dmar_gas_check_free(struct dmar_ctx *ctx)
+{
+	struct dmar_map_entry *entry, *next, *l, *r;
+	dmar_gaddr_t v;
+
+	RB_FOREACH(entry, dmar_gas_entries_tree, &ctx->rb_root) {
+		KASSERT(ctx == entry->ctx,
+		    ("mismatched free ctx %p entry %p entry->ctx %p", ctx,
+		    entry, entry->ctx));
+		next = RB_NEXT(dmar_gas_entries_tree, &ctx->rb_root, entry);
+		if (next == NULL) {
+			MPASS(entry->free_after == ctx->end - entry->end);
+		} else {
+			MPASS(entry->free_after = next->start - entry->end);
+			MPASS(entry->end <= next->start);
+		}
+		l = RB_LEFT(entry, rb_entry);
+		r = RB_RIGHT(entry, rb_entry);
+		if (l == NULL && r == NULL) {
+			MPASS(entry->free_down == entry->free_after);
+		} else if (l == NULL && r != NULL) {
+			MPASS(entry->free_down = MAX(entry->free_after,
+			    r->free_down));
+		} else if (r == NULL) {
+			MPASS(entry->free_down = MAX(entry->free_after,
+			    l->free_down));
+		} else {
+			v = MAX(entry->free_after, l->free_down);
+			v = MAX(entry->free_down, r->free_down);
+			MPASS(entry->free_down == v);
+		}
+	}
+}
+#endif
+
+static bool
+dmar_gas_rb_insert(struct dmar_ctx *ctx, struct dmar_map_entry *entry)
+{
+	struct dmar_map_entry *prev, *found;
+
+	found = RB_INSERT(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	dmar_gas_fix_free(ctx, entry);
+	prev = RB_PREV(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	if (prev != NULL)
+		dmar_gas_fix_free(ctx, prev);
+	return (found == NULL);
+}
+
+static void
+dmar_gas_rb_remove(struct dmar_ctx *ctx, struct dmar_map_entry *entry)
+{
+	struct dmar_map_entry *prev;
+
+	prev = RB_PREV(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	RB_REMOVE(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	if (prev != NULL)
+		dmar_gas_fix_free(ctx, prev);
+}
+
+void
+dmar_gas_init_ctx(struct dmar_ctx *ctx)
+{
+	struct dmar_map_entry *begin, *end;
+
+	begin = dmar_gas_alloc_entry(ctx, DMAR_PGF_WAITOK);
+	end = dmar_gas_alloc_entry(ctx, DMAR_PGF_WAITOK);
+
+	DMAR_CTX_LOCK(ctx);
+	KASSERT(ctx->entries_cnt == 2, ("dirty ctx %p", ctx));
+	KASSERT(RB_EMPTY(&ctx->rb_root), ("non-empty entries %p", ctx));
+
+	begin->start = 0;
+	begin->end = DMAR_PAGE_SIZE;
+	begin->free_after = ctx->end - begin->end;
+	begin->flags = DMAR_MAP_ENTRY_PLACE | DMAR_MAP_ENTRY_UNMAPPED;
+	dmar_gas_rb_insert(ctx, begin);
+
+	end->start = ctx->end;
+	end->end = ctx->end;
+	end->free_after = 0;
+	end->flags = DMAR_MAP_ENTRY_PLACE | DMAR_MAP_ENTRY_UNMAPPED;
+	dmar_gas_rb_insert(ctx, end);
+
+	ctx->first_place = begin;
+	ctx->last_place = end;
+	DMAR_CTX_UNLOCK(ctx);
+}
+
+void
+dmar_gas_fini_ctx(struct dmar_ctx *ctx)
+{
+	struct dmar_map_entry *entry, *entry1;
+
+	DMAR_CTX_ASSERT_LOCKED(ctx);
+	KASSERT(ctx->entries_cnt == 2, ("ctx still in use %p", ctx));
+
+	entry = RB_MIN(dmar_gas_entries_tree, &ctx->rb_root);
+	KASSERT(entry->start == 0, ("start entry start %p", ctx));
+	KASSERT(entry->end == DMAR_PAGE_SIZE, ("start entry end %p", ctx));
+	KASSERT(entry->flags == DMAR_MAP_ENTRY_PLACE,
+	    ("start entry flags %p", ctx));
+	RB_REMOVE(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	dmar_gas_free_entry(ctx, entry);
+
+	entry = RB_MAX(dmar_gas_entries_tree, &ctx->rb_root);
+	KASSERT(entry->start == ctx->end, ("end entry start %p", ctx));
+	KASSERT(entry->end == ctx->end, ("end entry end %p", ctx));
+	KASSERT(entry->free_after == 0, ("end entry free_after%p", ctx));
+	KASSERT(entry->flags == DMAR_MAP_ENTRY_PLACE,
+	    ("end entry flags %p", ctx));
+	RB_REMOVE(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	dmar_gas_free_entry(ctx, entry);
+
+	RB_FOREACH_SAFE(entry, dmar_gas_entries_tree, &ctx->rb_root, entry1) {
+		KASSERT((entry->flags & DMAR_MAP_ENTRY_RMRR) != 0,
+		    ("non-RMRR entry left %p", ctx));
+		RB_REMOVE(dmar_gas_entries_tree, &ctx->rb_root, entry);
+		dmar_gas_free_entry(ctx, entry);
+	}
+}
+
+struct dmar_gas_match_args {
+	struct dmar_ctx *ctx;
+	dmar_gaddr_t size;
+	const struct bus_dma_tag_common *common;
+	u_int gas_flags;
+	struct dmar_map_entry *entry;
+};
+
+static bool
+dmar_gas_match_one(struct dmar_gas_match_args *a, struct dmar_map_entry *prev,
+    dmar_gaddr_t end)
+{
+	dmar_gaddr_t bs, start;
+
+	if (a->entry->start + a->size > end)
+		return (false);
+
+	/* DMAR_PAGE_SIZE to create gap after new entry. */
+	if (a->entry->start < prev->end + DMAR_PAGE_SIZE ||
+	    a->entry->start + a->size + DMAR_PAGE_SIZE > prev->end +
+	    prev->free_after)
+		return (false);
+
+	/* No boundary crossing. */
+	if (dmar_test_boundary(a->entry->start, a->size, a->common->boundary))
+		return (true);
+
+	/*
+	 * The start to start + size region crosses the boundary.
+	 * Check if there is enough space after the next boundary
+	 * after the prev->end.
+	 */
+	bs = (a->entry->start + a->common->boundary) & ~(a->common->boundary
+	    - 1);
+	start = roundup2(bs, a->common->alignment);
+	/* DMAR_PAGE_SIZE to create gap after new entry. */
+	if (start + a->size + DMAR_PAGE_SIZE <= prev->end + prev->free_after &&
+	    start + a->size <= end) {
+		a->entry->start = start;
+		return (true);
+	}
+
+	/*
+	 * Not enough space to align at boundary, but allowed to split.
+	 * We already checked that start + size does not overlap end.
+	 *
+	 * XXXKIB. It is possible that bs is exactly at the start of
+	 * the next entry, then we do not have gap.  Ignore for now.
+	 */
+	if ((a->gas_flags & DMAR_GM_CANSPLIT) != 0) {
+		a->size = bs - a->entry->start;
+		return (true);
+	}
+
+	return (false);
+}
+
+static void
+dmar_gas_match_insert(struct dmar_gas_match_args *a,
+    struct dmar_map_entry *prev)
+{
+	struct dmar_map_entry *next;
+	bool found;
+
+	/*
+	 * The prev->end is always aligned on the page size, which
+	 * causes page alignment for the entry->start too.  The size
+	 * is checked to be multiple of the page size.
+	 *
+	 * The page sized gap is created between consequent
+	 * allocations to ensure that out-of-bounds accesses fault.
+	 */
+	a->entry->end = a->entry->start + a->size;
+
+	next = RB_NEXT(dmar_gas_entries_tree, &a->ctx->rb_root, prev);
+	KASSERT(next->start >= a->entry->end &&
+	    next->start - a->entry->start >= a->size,
+	    ("dmar_gas_match_insert hole failed %p prev (%jx, %jx) "
+	    "free_after %jx next (%jx, %jx) entry (%jx, %jx)", a->ctx,
+	    (uintmax_t)prev->start, (uintmax_t)prev->end,
+	    (uintmax_t)prev->free_after,
+	    (uintmax_t)next->start, (uintmax_t)next->end,
+	    (uintmax_t)a->entry->start, (uintmax_t)a->entry->end));
+
+	prev->free_after = a->entry->start - prev->end;
+	a->entry->free_after = next->start - a->entry->end;
+
+	found = dmar_gas_rb_insert(a->ctx, a->entry);
+	KASSERT(found, ("found dup %p start %jx size %jx",
+	    a->ctx, (uintmax_t)a->entry->start, (uintmax_t)a->size));
+	a->entry->flags = DMAR_MAP_ENTRY_MAP;
+
+	KASSERT(RB_PREV(dmar_gas_entries_tree, &a->ctx->rb_root,
+	    a->entry) == prev,
+	    ("entry %p prev %p inserted prev %p", a->entry, prev,
+	    RB_PREV(dmar_gas_entries_tree, &a->ctx->rb_root, a->entry)));
+	KASSERT(RB_NEXT(dmar_gas_entries_tree, &a->ctx->rb_root,
+	    a->entry) == next,
+	    ("entry %p next %p inserted next %p", a->entry, next,
+	    RB_NEXT(dmar_gas_entries_tree, &a->ctx->rb_root, a->entry)));
+}
+
+static int
+dmar_gas_lowermatch(struct dmar_gas_match_args *a, struct dmar_map_entry *prev)
+{
+	struct dmar_map_entry *l;
+	int ret;
+
+	if (prev->end < a->common->lowaddr) {
+		a->entry->start = roundup2(prev->end + DMAR_PAGE_SIZE,
+		    a->common->alignment);
+		if (dmar_gas_match_one(a, prev, a->common->lowaddr)) {
+			dmar_gas_match_insert(a, prev);
+			return (0);
+		}
+	}
+	if (prev->free_down < a->size + DMAR_PAGE_SIZE)
+		return (ENOMEM);
+	l = RB_LEFT(prev, rb_entry);
+	if (l != NULL) {
+		ret = dmar_gas_lowermatch(a, l);
+		if (ret == 0)
+			return (0);
+	}
+	l = RB_RIGHT(prev, rb_entry);
+	if (l != NULL)
+		return (dmar_gas_lowermatch(a, l));
+	return (ENOMEM);
+}
+
+static int
+dmar_gas_uppermatch(struct dmar_gas_match_args *a)
+{
+	struct dmar_map_entry *next, *prev, find_entry;
+
+	find_entry.start = a->common->highaddr;
+	next = RB_NFIND(dmar_gas_entries_tree, &a->ctx->rb_root, &find_entry);
+	if (next == NULL)
+		return (ENOMEM);
+	prev = RB_PREV(dmar_gas_entries_tree, &a->ctx->rb_root, next);
+	KASSERT(prev != NULL, ("no prev %p %jx", a->ctx,
+	    (uintmax_t)find_entry.start));
+	for (;;) {
+		a->entry->start = prev->start + DMAR_PAGE_SIZE;
+		if (a->entry->start < a->common->highaddr)
+			a->entry->start = a->common->highaddr;
+		a->entry->start = roundup2(a->entry->start,
+		    a->common->alignment);
+		if (dmar_gas_match_one(a, prev, a->ctx->end)) {
+			dmar_gas_match_insert(a, prev);
+			return (0);
+		}
+
+		/*
+		 * XXXKIB.  This falls back to linear iteration over
+		 * the free space in the high region.  But high
+		 * regions are almost unused, the code should be
+		 * enough to cover the case, although in the
+		 * non-optimal way.
+		 */
+		prev = next;
+		next = RB_NEXT(dmar_gas_entries_tree, &a->ctx->rb_root, prev);
+		KASSERT(next != NULL, ("no next %p %jx", a->ctx,
+		    (uintmax_t)find_entry.start));
+		if (next->end >= a->ctx->end)
+			return (ENOMEM);
+	}
+}
+
+static int
+dmar_gas_find_space(struct dmar_ctx *ctx,
+    const struct bus_dma_tag_common *common, dmar_gaddr_t size,
+    u_int flags, struct dmar_map_entry *entry)
+{
+	struct dmar_gas_match_args a;
+	int error;
+
+	DMAR_CTX_ASSERT_LOCKED(ctx);
+	KASSERT(entry->flags == 0, ("dirty entry %p %p", ctx, entry));
+	KASSERT((size & DMAR_PAGE_MASK) == 0, ("size %jx", (uintmax_t)size));
+
+	a.ctx = ctx;
+	a.size = size;
+	a.common = common;
+	a.gas_flags = flags;
+	a.entry = entry;
+
+	/* Handle lower region. */
+	if (common->lowaddr > 0) {
+		error = dmar_gas_lowermatch(&a, RB_ROOT(&ctx->rb_root));
+		if (error == 0)
+			return (0);
+		KASSERT(error == ENOMEM,
+		    ("error %d from dmar_gas_lowermatch", error));
+	}
+	/* Handle upper region. */
+	if (common->highaddr >= ctx->end)
+		return (ENOMEM);
+	error = dmar_gas_uppermatch(&a);
+	KASSERT(error == ENOMEM,
+	    ("error %d from dmar_gas_uppermatch", error));
+	return (error);
+}
+
+static int
+dmar_gas_alloc_region(struct dmar_ctx *ctx, struct dmar_map_entry *entry,
+    u_int flags)
+{
+	struct dmar_map_entry *next, *prev;
+	bool found;
+
+	DMAR_CTX_ASSERT_LOCKED(ctx);
+
+	if ((entry->start & DMAR_PAGE_MASK) != 0 ||
+	    (entry->end & DMAR_PAGE_MASK) != 0)
+		return (EINVAL);
+	if (entry->start >= entry->end)
+		return (EINVAL);
+	if (entry->end >= ctx->end)
+		return (EINVAL);
+
+	next = RB_NFIND(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	KASSERT(next != NULL, ("next must be non-null %p %jx", ctx,
+	    (uintmax_t)entry->start));
+	prev = RB_PREV(dmar_gas_entries_tree, &ctx->rb_root, next);
+	/* prev could be NULL */
+
+	/*
+	 * Adapt to broken BIOSes which specify overlapping RMRR
+	 * entries.
+	 *
+	 * XXXKIB: this does not handle a case when prev or next
+	 * entries are completely covered by the current one, which
+	 * extends both ways.
+	 */
+	if (prev != NULL && prev->end > entry->start &&
+	    (prev->flags & DMAR_MAP_ENTRY_PLACE) == 0) {
+		if ((prev->flags & DMAR_MAP_ENTRY_RMRR) == 0)
+			return (EBUSY);
+		entry->start = prev->end;
+	}
+	if (next != NULL && next->start < entry->end &&
+	    (next->flags & DMAR_MAP_ENTRY_PLACE) == 0) {
+		if ((next->flags & DMAR_MAP_ENTRY_RMRR) == 0)
+			return (EBUSY);
+		entry->end = next->start;
+	}
+	if (entry->end == entry->start)
+		return (0);
+
+	if (prev != NULL && prev->end > entry->start) {
+		/* This assumes that prev is the placeholder entry. */
+		dmar_gas_rb_remove(ctx, prev);
+		prev = NULL;
+	}
+	if (next != NULL && next->start < entry->end) {
+		dmar_gas_rb_remove(ctx, next);
+		next = NULL;
+	}
+
+	found = dmar_gas_rb_insert(ctx, entry);
+	KASSERT(found, ("found RMRR dup %p start %jx end %jx",
+	    ctx, (uintmax_t)entry->start, (uintmax_t)entry->end));
+	entry->flags = DMAR_MAP_ENTRY_RMRR;
+
+#ifdef INVARIANTS
+	struct dmar_map_entry *ip, *in;
+	ip = RB_PREV(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	in = RB_NEXT(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	KASSERT(prev == NULL || ip == prev,
+	    ("RMRR %p (%jx %jx) prev %p (%jx %jx) ins prev %p (%jx %jx)",
+	    entry, entry->start, entry->end, prev,
+	    prev == NULL ? 0 : prev->start, prev == NULL ? 0 : prev->end,
+	    ip, ip == NULL ? 0 : ip->start, ip == NULL ? 0 : ip->end));
+	KASSERT(next == NULL || in == next,
+	    ("RMRR %p (%jx %jx) next %p (%jx %jx) ins next %p (%jx %jx)",
+	    entry, entry->start, entry->end, next,
+	    next == NULL ? 0 : next->start, next == NULL ? 0 : next->end,
+	    in, in == NULL ? 0 : in->start, in == NULL ? 0 : in->end));
+#endif
+
+	return (0);
+}
+
+void
+dmar_gas_free_space(struct dmar_ctx *ctx, struct dmar_map_entry *entry)
+{
+
+	DMAR_CTX_ASSERT_LOCKED(ctx);
+	KASSERT((entry->flags & (DMAR_MAP_ENTRY_PLACE | DMAR_MAP_ENTRY_RMRR |
+	    DMAR_MAP_ENTRY_MAP)) == DMAR_MAP_ENTRY_MAP,
+	    ("permanent entry %p %p", ctx, entry));
+
+	dmar_gas_rb_remove(ctx, entry);
+	entry->flags &= ~DMAR_MAP_ENTRY_MAP;
+#ifdef INVARIANTS
+	if (dmar_check_free)
+		dmar_gas_check_free(ctx);
+#endif
+}
+
+void
+dmar_gas_free_region(struct dmar_ctx *ctx, struct dmar_map_entry *entry)
+{
+	struct dmar_map_entry *next, *prev;
+
+	DMAR_CTX_ASSERT_LOCKED(ctx);
+	KASSERT((entry->flags & (DMAR_MAP_ENTRY_PLACE | DMAR_MAP_ENTRY_RMRR |
+	    DMAR_MAP_ENTRY_MAP)) == DMAR_MAP_ENTRY_RMRR,
+	    ("non-RMRR entry %p %p", ctx, entry));
+
+	prev = RB_PREV(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	next = RB_NEXT(dmar_gas_entries_tree, &ctx->rb_root, entry);
+	dmar_gas_rb_remove(ctx, entry);
+	entry->flags &= ~DMAR_MAP_ENTRY_RMRR;
+
+	if (prev == NULL)
+		dmar_gas_rb_insert(ctx, ctx->first_place);
+	if (next == NULL)
+		dmar_gas_rb_insert(ctx, ctx->last_place);
+}
+
+int
+dmar_gas_map(struct dmar_ctx *ctx, const struct bus_dma_tag_common *common,
+    dmar_gaddr_t size, u_int eflags, u_int flags, vm_page_t *ma,
+    struct dmar_map_entry **res)
+{
+	struct dmar_map_entry *entry;
+	int error;
+
+	KASSERT((flags & ~(DMAR_GM_CANWAIT | DMAR_GM_CANSPLIT)) == 0,
+	    ("invalid flags 0x%x", flags));
+
+	entry = dmar_gas_alloc_entry(ctx, (flags & DMAR_GM_CANWAIT) != 0 ?
+	    DMAR_PGF_WAITOK : 0);
+	if (entry == NULL)
+		return (ENOMEM);
+	DMAR_CTX_LOCK(ctx);
+	error = dmar_gas_find_space(ctx, common, size, flags, entry);
+	if (error == ENOMEM) {
+		DMAR_CTX_UNLOCK(ctx);
+		dmar_gas_free_entry(ctx, entry);
+		return (error);
+	}
+#ifdef INVARIANTS
+	if (dmar_check_free)
+		dmar_gas_check_free(ctx);
+#endif
+	KASSERT(error == 0,
+	    ("unexpected error %d from dmar_gas_find_entry", error));
+	KASSERT(entry->end < ctx->end, ("allocated GPA %jx, max GPA %jx",
+	    (uintmax_t)entry->end, (uintmax_t)ctx->end));
+	entry->flags |= eflags;
+	DMAR_CTX_UNLOCK(ctx);
+
+	error = ctx_map_buf(ctx, entry->start, size, ma,
+	    ((eflags & DMAR_MAP_ENTRY_READ) != 0 ? DMAR_PTE_R : 0) |
+	    ((eflags & DMAR_MAP_ENTRY_WRITE) != 0 ? DMAR_PTE_W : 0) |
+	    ((eflags & DMAR_MAP_ENTRY_SNOOP) != 0 ? DMAR_PTE_SNP : 0) |
+	    ((eflags & DMAR_MAP_ENTRY_TM) != 0 ? DMAR_PTE_TM : 0),
+	    (flags & DMAR_GM_CANWAIT) != 0 ? DMAR_PGF_WAITOK : 0);
+	if (error == ENOMEM) {
+		dmar_ctx_unload_entry(entry, true);
+		return (error);
+	}
+	KASSERT(error == 0,
+	    ("unexpected error %d from ctx_map_buf", error));
+
+	*res = entry;
+	return (0);
+}
+
+int
+dmar_gas_map_region(struct dmar_ctx *ctx, struct dmar_map_entry *entry,
+    u_int eflags, u_int flags, vm_page_t *ma)
+{
+	dmar_gaddr_t start;
+	int error;
+
+	KASSERT(entry->flags == 0, ("used RMRR entry %p %p %x", ctx,
+	    entry, entry->flags));
+	KASSERT((flags & ~(DMAR_GM_CANWAIT)) == 0,
+	    ("invalid flags 0x%x", flags));
+
+	start = entry->start;
+	DMAR_CTX_LOCK(ctx);
+	error = dmar_gas_alloc_region(ctx, entry, flags);
+	if (error != 0) {
+		DMAR_CTX_UNLOCK(ctx);
+		return (error);
+	}
+	entry->flags |= eflags;
+	DMAR_CTX_UNLOCK(ctx);
+	if (entry->end == entry->start)
+		return (0);
+
+	error = ctx_map_buf(ctx, entry->start, entry->end - entry->start,
+	    ma + OFF_TO_IDX(start - entry->start),
+	    ((eflags & DMAR_MAP_ENTRY_READ) != 0 ? DMAR_PTE_R : 0) |
+	    ((eflags & DMAR_MAP_ENTRY_WRITE) != 0 ? DMAR_PTE_W : 0) |
+	    ((eflags & DMAR_MAP_ENTRY_SNOOP) != 0 ? DMAR_PTE_SNP : 0) |
+	    ((eflags & DMAR_MAP_ENTRY_TM) != 0 ? DMAR_PTE_TM : 0),
+	    (flags & DMAR_GM_CANWAIT) != 0 ? DMAR_PGF_WAITOK : 0);
+	if (error == ENOMEM) {
+		dmar_ctx_unload_entry(entry, false);
+		return (error);
+	}
+	KASSERT(error == 0,
+	    ("unexpected error %d from ctx_map_buf", error));
+
+	return (0);
+}
+
+int
+dmar_gas_reserve_region(struct dmar_ctx *ctx, dmar_gaddr_t start,
+    dmar_gaddr_t end)
+{
+	struct dmar_map_entry *entry;
+	int error;
+
+	entry = dmar_gas_alloc_entry(ctx, DMAR_PGF_WAITOK);
+	entry->start = start;
+	entry->end = end;
+	DMAR_CTX_LOCK(ctx);
+	error = dmar_gas_alloc_region(ctx, entry, DMAR_GM_CANWAIT);
+	if (error == 0)
+		entry->flags |= DMAR_MAP_ENTRY_UNMAPPED;
+	DMAR_CTX_UNLOCK(ctx);
+	if (error != 0)
+		dmar_gas_free_entry(ctx, entry);
+	return (error);
+}
diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c
new file mode 100644
index 00000000000..b1a8c8fedac
--- /dev/null
+++ b/sys/x86/iommu/intel_idpgtbl.c
@@ -0,0 +1,783 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/malloc.h>
+#include <sys/bus.h>
+#include <sys/interrupt.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/lock.h>
+#include <sys/memdesc.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/rwlock.h>
+#include <sys/rman.h>
+#include <sys/sf_buf.h>
+#include <sys/sysctl.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
+#include <sys/uio.h>
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_object.h>
+#include <vm/vm_page.h>
+#include <vm/vm_pager.h>
+#include <vm/vm_map.h>
+#include <machine/atomic.h>
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/md_var.h>
+#include <machine/specialreg.h>
+#include <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/busdma_dmar.h>
+#include <x86/iommu/intel_dmar.h>
+
+static int ctx_unmap_buf_locked(struct dmar_ctx *ctx, dmar_gaddr_t base,
+    dmar_gaddr_t size, int flags);
+
+/*
+ * The cache of the identity mapping page tables for the DMARs.  Using
+ * the cache saves significant amount of memory for page tables by
+ * reusing the page tables, since usually DMARs are identical and have
+ * the same capabilities.  Still, cache records the information needed
+ * to match DMAR capabilities and page table format, to correctly
+ * handle different DMARs.
+ */
+
+struct idpgtbl {
+	dmar_gaddr_t maxaddr;	/* Page table covers the guest address
+				   range [0..maxaddr) */
+	int pglvl;		/* Total page table levels ignoring
+				   superpages */
+	int leaf;		/* The last materialized page table
+				   level, it is non-zero if superpages
+				   are supported */
+	vm_object_t pgtbl_obj;	/* The page table pages */
+	LIST_ENTRY(idpgtbl) link;
+};
+
+static struct sx idpgtbl_lock;
+SX_SYSINIT(idpgtbl, &idpgtbl_lock, "idpgtbl");
+static LIST_HEAD(, idpgtbl) idpgtbls = LIST_HEAD_INITIALIZER(idpgtbls);
+static MALLOC_DEFINE(M_DMAR_IDPGTBL, "dmar_idpgtbl",
+    "Intel DMAR Identity mappings cache elements");
+
+/*
+ * Build the next level of the page tables for the identity mapping.
+ * - lvl is the level to build;
+ * - idx is the index of the page table page in the pgtbl_obj, which is
+ *   being allocated filled now;
+ * - addr is the starting address in the bus address space which is
+ *   mapped by the page table page.
+ */
+static void
+ctx_idmap_nextlvl(struct idpgtbl *tbl, int lvl, vm_pindex_t idx,
+    dmar_gaddr_t addr)
+{
+	vm_page_t m, m1;
+	dmar_pte_t *pte;
+	struct sf_buf *sf;
+	dmar_gaddr_t f, pg_sz;
+	vm_pindex_t base;
+	int i;
+
+	VM_OBJECT_ASSERT_LOCKED(tbl->pgtbl_obj);
+	if (addr >= tbl->maxaddr)
+		return;
+	m = dmar_pgalloc(tbl->pgtbl_obj, idx, DMAR_PGF_OBJL | DMAR_PGF_WAITOK |
+	    DMAR_PGF_ZERO);
+	base = idx * DMAR_NPTEPG + 1; /* Index of the first child page of idx */
+	pg_sz = pglvl_page_size(tbl->pglvl, lvl);
+	if (lvl != tbl->leaf) {
+		for (i = 0, f = addr; i < DMAR_NPTEPG; i++, f += pg_sz)
+			ctx_idmap_nextlvl(tbl, lvl + 1, base + i, f);
+	}
+	VM_OBJECT_WUNLOCK(tbl->pgtbl_obj);
+	pte = dmar_map_pgtbl(tbl->pgtbl_obj, idx, DMAR_PGF_WAITOK, &sf);
+	if (lvl == tbl->leaf) {
+		for (i = 0, f = addr; i < DMAR_NPTEPG; i++, f += pg_sz) {
+			if (f >= tbl->maxaddr)
+				break;
+			pte[i].pte = (DMAR_PTE_ADDR_MASK & f) |
+			    DMAR_PTE_R | DMAR_PTE_W;
+		}
+	} else {
+		for (i = 0, f = addr; i < DMAR_NPTEPG; i++, f += pg_sz) {
+			if (f >= tbl->maxaddr)
+				break;
+			m1 = dmar_pgalloc(tbl->pgtbl_obj, base + i,
+			    DMAR_PGF_NOALLOC);
+			KASSERT(m1 != NULL, ("lost page table page"));
+			pte[i].pte = (DMAR_PTE_ADDR_MASK &
+			    VM_PAGE_TO_PHYS(m1)) | DMAR_PTE_R | DMAR_PTE_W;
+		}
+	}
+	/* ctx_get_idmap_pgtbl flushes CPU cache if needed. */
+	dmar_unmap_pgtbl(sf, true);
+	VM_OBJECT_WLOCK(tbl->pgtbl_obj);
+}
+
+/*
+ * Find a ready and compatible identity-mapping page table in the
+ * cache. If not found, populate the identity-mapping page table for
+ * the context, up to the maxaddr. The maxaddr byte is allowed to be
+ * not mapped, which is aligned with the definition of Maxmem as the
+ * highest usable physical address + 1.  If superpages are used, the
+ * maxaddr is typically mapped.
+ */
+vm_object_t
+ctx_get_idmap_pgtbl(struct dmar_ctx *ctx, dmar_gaddr_t maxaddr)
+{
+	struct dmar_unit *unit;
+	struct idpgtbl *tbl;
+	vm_object_t res;
+	vm_page_t m;
+	int leaf, i;
+
+	leaf = 0; /* silence gcc */
+
+	/*
+	 * First, determine where to stop the paging structures.
+	 */
+	for (i = 0; i < ctx->pglvl; i++) {
+		if (i == ctx->pglvl - 1 || ctx_is_sp_lvl(ctx, i)) {
+			leaf = i;
+			break;
+		}
+	}
+
+	/*
+	 * Search the cache for a compatible page table.  Qualified
+	 * page table must map up to maxaddr, its level must be
+	 * supported by the DMAR and leaf should be equal to the
+	 * calculated value.  The later restriction could be lifted
+	 * but I believe it is currently impossible to have any
+	 * deviations for existing hardware.
+	 */
+	sx_slock(&idpgtbl_lock);
+	LIST_FOREACH(tbl, &idpgtbls, link) {
+		if (tbl->maxaddr >= maxaddr &&
+		    dmar_pglvl_supported(ctx->dmar, tbl->pglvl) &&
+		    tbl->leaf == leaf) {
+			res = tbl->pgtbl_obj;
+			vm_object_reference(res);
+			sx_sunlock(&idpgtbl_lock);
+			ctx->pglvl = tbl->pglvl; /* XXXKIB ? */
+			goto end;
+		}
+	}
+
+	/*
+	 * Not found in cache, relock the cache into exclusive mode to
+	 * be able to add element, and recheck cache again after the
+	 * relock.
+	 */
+	sx_sunlock(&idpgtbl_lock);
+	sx_xlock(&idpgtbl_lock);
+	LIST_FOREACH(tbl, &idpgtbls, link) {
+		if (tbl->maxaddr >= maxaddr &&
+		    dmar_pglvl_supported(ctx->dmar, tbl->pglvl) &&
+		    tbl->leaf == leaf) {
+			res = tbl->pgtbl_obj;
+			vm_object_reference(res);
+			sx_xunlock(&idpgtbl_lock);
+			ctx->pglvl = tbl->pglvl; /* XXXKIB ? */
+			return (res);
+		}
+	}
+
+	/*
+	 * Still not found, create new page table.
+	 */
+	tbl = malloc(sizeof(*tbl), M_DMAR_IDPGTBL, M_WAITOK);
+	tbl->pglvl = ctx->pglvl;
+	tbl->leaf = leaf;
+	tbl->maxaddr = maxaddr;
+	tbl->pgtbl_obj = vm_pager_allocate(OBJT_PHYS, NULL,
+	    IDX_TO_OFF(pglvl_max_pages(tbl->pglvl)), 0, 0, NULL);
+	VM_OBJECT_WLOCK(tbl->pgtbl_obj);
+	ctx_idmap_nextlvl(tbl, 0, 0, 0);
+	VM_OBJECT_WUNLOCK(tbl->pgtbl_obj);
+	LIST_INSERT_HEAD(&idpgtbls, tbl, link);
+	res = tbl->pgtbl_obj;
+	vm_object_reference(res);
+	sx_xunlock(&idpgtbl_lock);
+
+end:
+	/*
+	 * Table was found or created.
+	 *
+	 * If DMAR does not snoop paging structures accesses, flush
+	 * CPU cache to memory.  Note that dmar_unmap_pgtbl() coherent
+	 * argument was possibly invalid at the time of the identity
+	 * page table creation, since DMAR which was passed at the
+	 * time of creation could be coherent, while current DMAR is
+	 * not.
+	 *
+	 * If DMAR cannot look into the chipset write buffer, flush it
+	 * as well.
+	 */
+	unit = ctx->dmar;
+	if (!DMAR_IS_COHERENT(unit)) {
+		VM_OBJECT_WLOCK(res);
+		for (m = vm_page_lookup(res, 0); m != NULL;
+		     m = vm_page_next(m))
+			pmap_invalidate_cache_pages(&m, 1);
+		VM_OBJECT_WUNLOCK(res);
+	}
+	if ((unit->hw_cap & DMAR_CAP_RWBF) != 0) {
+		DMAR_LOCK(unit);
+		dmar_flush_write_bufs(unit);
+		DMAR_UNLOCK(unit);
+	}
+	
+	return (res);
+}
+
+/*
+ * Return a reference to the identity mapping page table to the cache.
+ */
+void
+put_idmap_pgtbl(vm_object_t obj)
+{
+	struct idpgtbl *tbl, *tbl1;
+	vm_object_t rmobj;
+
+	sx_slock(&idpgtbl_lock);
+	KASSERT(obj->ref_count >= 2, ("lost cache reference"));
+	vm_object_deallocate(obj);
+
+	/*
+	 * Cache always owns one last reference on the page table object.
+	 * If there is an additional reference, object must stay.
+	 */
+	if (obj->ref_count > 1) {
+		sx_sunlock(&idpgtbl_lock);
+		return;
+	}
+
+	/*
+	 * Cache reference is the last, remove cache element and free
+	 * page table object, returning the page table pages to the
+	 * system.
+	 */
+	sx_sunlock(&idpgtbl_lock);
+	sx_xlock(&idpgtbl_lock);
+	LIST_FOREACH_SAFE(tbl, &idpgtbls, link, tbl1) {
+		rmobj = tbl->pgtbl_obj;
+		if (rmobj->ref_count == 1) {
+			LIST_REMOVE(tbl, link);
+			atomic_subtract_int(&dmar_tbl_pagecnt,
+			    rmobj->resident_page_count);
+			vm_object_deallocate(rmobj);
+			free(tbl, M_DMAR_IDPGTBL);
+		}
+	}
+	sx_xunlock(&idpgtbl_lock);
+}
+
+/*
+ * The core routines to map and unmap host pages at the given guest
+ * address.  Support superpages.
+ */
+
+/*
+ * Index of the pte for the guest address base in the page table at
+ * the level lvl.
+ */
+static int
+ctx_pgtbl_pte_off(struct dmar_ctx *ctx, dmar_gaddr_t base, int lvl)
+{
+
+	base >>= DMAR_PAGE_SHIFT + (ctx->pglvl - lvl - 1) * DMAR_NPTEPGSHIFT;
+	return (base & DMAR_PTEMASK);
+}
+
+/*
+ * Returns the page index of the page table page in the page table
+ * object, which maps the given address base at the page table level
+ * lvl.
+ */
+static vm_pindex_t
+ctx_pgtbl_get_pindex(struct dmar_ctx *ctx, dmar_gaddr_t base, int lvl)
+{
+	vm_pindex_t idx, pidx;
+	int i;
+
+	KASSERT(lvl >= 0 && lvl < ctx->pglvl, ("wrong lvl %p %d", ctx, lvl));
+
+	for (pidx = idx = 0, i = 0; i < lvl; i++, pidx = idx)
+		idx = ctx_pgtbl_pte_off(ctx, base, i) + pidx * DMAR_NPTEPG + 1;
+	return (idx);
+}
+
+static dmar_pte_t *
+ctx_pgtbl_map_pte(struct dmar_ctx *ctx, dmar_gaddr_t base, int lvl, int flags,
+    vm_pindex_t *idxp, struct sf_buf **sf)
+{
+	vm_page_t m;
+	struct sf_buf *sfp;
+	dmar_pte_t *pte, *ptep;
+	vm_pindex_t idx, idx1;
+
+	DMAR_CTX_ASSERT_PGLOCKED(ctx);
+	KASSERT((flags & DMAR_PGF_OBJL) != 0, ("lost PGF_OBJL"));
+
+	idx = ctx_pgtbl_get_pindex(ctx, base, lvl);
+	if (*sf != NULL && idx == *idxp) {
+		pte = (dmar_pte_t *)sf_buf_kva(*sf);
+	} else {
+		if (*sf != NULL)
+			dmar_unmap_pgtbl(*sf, DMAR_IS_COHERENT(ctx->dmar));
+		*idxp = idx;
+retry:
+		pte = dmar_map_pgtbl(ctx->pgtbl_obj, idx, flags, sf);
+		if (pte == NULL) {
+			KASSERT(lvl > 0, ("lost root page table page %p", ctx));
+			/*
+			 * Page table page does not exists, allocate
+			 * it and create pte in the up level.
+			 */
+			m = dmar_pgalloc(ctx->pgtbl_obj, idx, flags |
+			    DMAR_PGF_ZERO);
+			if (m == NULL)
+				return (NULL);
+
+			/*
+			 * Prevent potential free while pgtbl_obj is
+			 * unlocked in the recursive call to
+			 * ctx_pgtbl_map_pte(), if other thread did
+			 * pte write and clean while the lock if
+			 * dropped.
+			 */
+			m->wire_count++;
+
+			sfp = NULL;
+			ptep = ctx_pgtbl_map_pte(ctx, base, lvl - 1, flags,
+			    &idx1, &sfp);
+			if (ptep == NULL) {
+				KASSERT(m->pindex != 0,
+				    ("loosing root page %p", ctx));
+				m->wire_count--;
+				dmar_pgfree(ctx->pgtbl_obj, m->pindex, flags);
+				return (NULL);
+			}
+			dmar_pte_store(&ptep->pte, DMAR_PTE_R | DMAR_PTE_W |
+			    VM_PAGE_TO_PHYS(m));
+			sf_buf_page(sfp)->wire_count += 1;
+			m->wire_count--;
+			dmar_unmap_pgtbl(sfp, DMAR_IS_COHERENT(ctx->dmar));
+			/* Only executed once. */
+			goto retry;
+		}
+	}
+	pte += ctx_pgtbl_pte_off(ctx, base, lvl);
+	return (pte);
+}
+
+static int
+ctx_map_buf_locked(struct dmar_ctx *ctx, dmar_gaddr_t base, dmar_gaddr_t size,
+    vm_page_t *ma, uint64_t pflags, int flags)
+{
+	dmar_pte_t *pte;
+	struct sf_buf *sf;
+	dmar_gaddr_t pg_sz, base1, size1;
+	vm_pindex_t pi, c, idx, run_sz;
+	int lvl;
+	bool superpage;
+
+	DMAR_CTX_ASSERT_PGLOCKED(ctx);
+
+	base1 = base;
+	size1 = size;
+	flags |= DMAR_PGF_OBJL;
+	TD_PREP_PINNED_ASSERT;
+
+	for (sf = NULL, pi = 0; size > 0; base += pg_sz, size -= pg_sz,
+	    pi += run_sz) {
+		for (lvl = 0, c = 0, superpage = false;; lvl++) {
+			pg_sz = ctx_page_size(ctx, lvl);
+			run_sz = pg_sz >> DMAR_PAGE_SHIFT;
+			if (lvl == ctx->pglvl - 1)
+				break;
+			/*
+			 * Check if the current base suitable for the
+			 * superpage mapping.  First, verify the level.
+			 */
+			if (!ctx_is_sp_lvl(ctx, lvl))
+				continue;
+			/*
+			 * Next, look at the size of the mapping and
+			 * alignment of both guest and host addresses.
+			 */
+			if (size < pg_sz || (base & (pg_sz - 1)) != 0 ||
+			    (VM_PAGE_TO_PHYS(ma[pi]) & (pg_sz - 1)) != 0)
+				continue;
+			/* All passed, check host pages contiguouty. */
+			if (c == 0) {
+				for (c = 1; c < run_sz; c++) {
+					if (VM_PAGE_TO_PHYS(ma[pi + c]) !=
+					    VM_PAGE_TO_PHYS(ma[pi + c - 1]) +
+					    PAGE_SIZE)
+						break;
+				}
+			}
+			if (c >= run_sz) {
+				superpage = true;
+				break;
+			}
+		}
+		KASSERT(size >= pg_sz,
+		    ("mapping loop overflow %p %jx %jx %jx", ctx,
+		    (uintmax_t)base, (uintmax_t)size, (uintmax_t)pg_sz));
+		pte = ctx_pgtbl_map_pte(ctx, base, lvl, flags, &idx, &sf);
+		if (pte == NULL) {
+			KASSERT((flags & DMAR_PGF_WAITOK) == 0,
+			    ("failed waitable pte alloc %p", ctx));
+			if (sf != NULL) {
+				dmar_unmap_pgtbl(sf,
+				    DMAR_IS_COHERENT(ctx->dmar));
+			}
+			ctx_unmap_buf_locked(ctx, base1, base - base1, flags);
+			TD_PINNED_ASSERT;
+			return (ENOMEM);
+		}
+		dmar_pte_store(&pte->pte, VM_PAGE_TO_PHYS(ma[pi]) | pflags |
+		    (superpage ? DMAR_PTE_SP : 0));
+		sf_buf_page(sf)->wire_count += 1;
+	}
+	if (sf != NULL)
+		dmar_unmap_pgtbl(sf, DMAR_IS_COHERENT(ctx->dmar));
+	TD_PINNED_ASSERT;
+	return (0);
+}
+
+int
+ctx_map_buf(struct dmar_ctx *ctx, dmar_gaddr_t base, dmar_gaddr_t size,
+    vm_page_t *ma, uint64_t pflags, int flags)
+{
+	struct dmar_unit *unit;
+	int error;
+
+	unit = ctx->dmar;
+
+	KASSERT((ctx->flags & DMAR_CTX_IDMAP) == 0,
+	    ("modifying idmap pagetable ctx %p", ctx));
+	KASSERT((base & DMAR_PAGE_MASK) == 0,
+	    ("non-aligned base %p %jx %jx", ctx, (uintmax_t)base,
+	    (uintmax_t)size));
+	KASSERT((size & DMAR_PAGE_MASK) == 0,
+	    ("non-aligned size %p %jx %jx", ctx, (uintmax_t)base,
+	    (uintmax_t)size));
+	KASSERT(size > 0, ("zero size %p %jx %jx", ctx, (uintmax_t)base,
+	    (uintmax_t)size));
+	KASSERT(base < (1ULL << ctx->agaw),
+	    ("base too high %p %jx %jx agaw %d", ctx, (uintmax_t)base,
+	    (uintmax_t)size, ctx->agaw));
+	KASSERT(base + size < (1ULL << ctx->agaw),
+	    ("end too high %p %jx %jx agaw %d", ctx, (uintmax_t)base,
+	    (uintmax_t)size, ctx->agaw));
+	KASSERT(base + size > base,
+	    ("size overflow %p %jx %jx", ctx, (uintmax_t)base,
+	    (uintmax_t)size));
+	KASSERT((pflags & (DMAR_PTE_R | DMAR_PTE_W)) != 0,
+	    ("neither read nor write %jx", (uintmax_t)pflags));
+	KASSERT((pflags & ~(DMAR_PTE_R | DMAR_PTE_W | DMAR_PTE_SNP |
+	    DMAR_PTE_TM)) == 0,
+	    ("invalid pte flags %jx", (uintmax_t)pflags));
+	KASSERT((pflags & DMAR_PTE_SNP) == 0 ||
+	    (unit->hw_ecap & DMAR_ECAP_SC) != 0,
+	    ("PTE_SNP for dmar without snoop control %p %jx",
+	    ctx, (uintmax_t)pflags));
+	KASSERT((pflags & DMAR_PTE_TM) == 0 ||
+	    (unit->hw_ecap & DMAR_ECAP_DI) != 0,
+	    ("PTE_TM for dmar without DIOTLB %p %jx",
+	    ctx, (uintmax_t)pflags));
+	KASSERT((flags & ~DMAR_PGF_WAITOK) == 0, ("invalid flags %x", flags));
+
+	DMAR_CTX_PGLOCK(ctx);
+	error = ctx_map_buf_locked(ctx, base, size, ma, pflags, flags);
+	DMAR_CTX_PGUNLOCK(ctx);
+	if (error != 0)
+		return (error);
+
+	if ((unit->hw_cap & DMAR_CAP_CM) != 0)
+		ctx_flush_iotlb_sync(ctx, base, size);
+	else if ((unit->hw_cap & DMAR_CAP_RWBF) != 0) {
+		/* See 11.1 Write Buffer Flushing. */
+		DMAR_LOCK(unit);
+		dmar_flush_write_bufs(unit);
+		DMAR_UNLOCK(unit);
+	}
+	return (0);
+}
+
+static void ctx_unmap_clear_pte(struct dmar_ctx *ctx, dmar_gaddr_t base,
+    int lvl, int flags, dmar_pte_t *pte, struct sf_buf **sf, bool free_fs);
+
+static void
+ctx_free_pgtbl_pde(struct dmar_ctx *ctx, dmar_gaddr_t base, int lvl, int flags)
+{
+	struct sf_buf *sf;
+	dmar_pte_t *pde;
+	vm_pindex_t idx;
+
+	sf = NULL;
+	pde = ctx_pgtbl_map_pte(ctx, base, lvl, flags, &idx, &sf);
+	ctx_unmap_clear_pte(ctx, base, lvl, flags, pde, &sf, true);
+}
+
+static void
+ctx_unmap_clear_pte(struct dmar_ctx *ctx, dmar_gaddr_t base, int lvl,
+    int flags, dmar_pte_t *pte, struct sf_buf **sf, bool free_sf)
+{
+	vm_page_t m;
+
+	dmar_pte_clear(&pte->pte);
+	m = sf_buf_page(*sf);
+	if (free_sf) {
+		dmar_unmap_pgtbl(*sf, DMAR_IS_COHERENT(ctx->dmar));
+		*sf = NULL;
+	}
+	m->wire_count--;
+	if (m->wire_count != 0)
+		return;
+	KASSERT(lvl != 0,
+	    ("lost reference (lvl) on root pg ctx %p base %jx lvl %d",
+	    ctx, (uintmax_t)base, lvl));
+	KASSERT(m->pindex != 0,
+	    ("lost reference (idx) on root pg ctx %p base %jx lvl %d",
+	    ctx, (uintmax_t)base, lvl));
+	dmar_pgfree(ctx->pgtbl_obj, m->pindex, flags);
+	ctx_free_pgtbl_pde(ctx, base, lvl - 1, flags);
+}
+
+/*
+ * Assumes that the unmap is never partial.
+ */
+static int
+ctx_unmap_buf_locked(struct dmar_ctx *ctx, dmar_gaddr_t base,
+    dmar_gaddr_t size, int flags)
+{
+	dmar_pte_t *pte;
+	struct sf_buf *sf;
+	vm_pindex_t idx;
+	dmar_gaddr_t pg_sz, base1, size1;
+	int lvl;
+
+	DMAR_CTX_ASSERT_PGLOCKED(ctx);
+	if (size == 0)
+		return (0);
+
+	KASSERT((ctx->flags & DMAR_CTX_IDMAP) == 0,
+	    ("modifying idmap pagetable ctx %p", ctx));
+	KASSERT((base & DMAR_PAGE_MASK) == 0,
+	    ("non-aligned base %p %jx %jx", ctx, (uintmax_t)base,
+	    (uintmax_t)size));
+	KASSERT((size & DMAR_PAGE_MASK) == 0,
+	    ("non-aligned size %p %jx %jx", ctx, (uintmax_t)base,
+	    (uintmax_t)size));
+	KASSERT(base < (1ULL << ctx->agaw),
+	    ("base too high %p %jx %jx agaw %d", ctx, (uintmax_t)base,
+	    (uintmax_t)size, ctx->agaw));
+	KASSERT(base + size < (1ULL << ctx->agaw),
+	    ("end too high %p %jx %jx agaw %d", ctx, (uintmax_t)base,
+	    (uintmax_t)size, ctx->agaw));
+	KASSERT(base + size > base,
+	    ("size overflow %p %jx %jx", ctx, (uintmax_t)base,
+	    (uintmax_t)size));
+	KASSERT((flags & ~DMAR_PGF_WAITOK) == 0, ("invalid flags %x", flags));
+
+	pg_sz = 0; /* silence gcc */
+	base1 = base;
+	size1 = size;
+	flags |= DMAR_PGF_OBJL;
+	TD_PREP_PINNED_ASSERT;
+
+	for (sf = NULL; size > 0; base += pg_sz, size -= pg_sz) {
+		for (lvl = 0; lvl < ctx->pglvl; lvl++) {
+			if (lvl != ctx->pglvl - 1 && !ctx_is_sp_lvl(ctx, lvl))
+				continue;
+			pg_sz = ctx_page_size(ctx, lvl);
+			if (pg_sz > size)
+				continue;
+			pte = ctx_pgtbl_map_pte(ctx, base, lvl, flags,
+			    &idx, &sf);
+			KASSERT(pte != NULL,
+			    ("sleeping or page missed %p %jx %d 0x%x",
+			    ctx, (uintmax_t)base, lvl, flags));
+			if ((pte->pte & DMAR_PTE_SP) != 0 ||
+			    lvl == ctx->pglvl - 1) {
+				ctx_unmap_clear_pte(ctx, base, lvl, flags,
+				    pte, &sf, false);
+				break;
+			}
+		}
+		KASSERT(size >= pg_sz,
+		    ("unmapping loop overflow %p %jx %jx %jx", ctx,
+		    (uintmax_t)base, (uintmax_t)size, (uintmax_t)pg_sz));
+	}
+	if (sf != NULL)
+		dmar_unmap_pgtbl(sf, DMAR_IS_COHERENT(ctx->dmar));
+	/*
+	 * See 11.1 Write Buffer Flushing for an explanation why RWBF
+	 * can be ignored there.
+	 */
+
+	TD_PINNED_ASSERT;
+	return (0);
+}
+
+int
+ctx_unmap_buf(struct dmar_ctx *ctx, dmar_gaddr_t base, dmar_gaddr_t size,
+    int flags)
+{
+	int error;
+
+	DMAR_CTX_PGLOCK(ctx);
+	error = ctx_unmap_buf_locked(ctx, base, size, flags);
+	DMAR_CTX_PGUNLOCK(ctx);
+	return (error);
+}
+
+int
+ctx_alloc_pgtbl(struct dmar_ctx *ctx)
+{
+	vm_page_t m;
+
+	KASSERT(ctx->pgtbl_obj == NULL, ("already initialized %p", ctx));
+
+	ctx->pgtbl_obj = vm_pager_allocate(OBJT_PHYS, NULL,
+	    IDX_TO_OFF(pglvl_max_pages(ctx->pglvl)), 0, 0, NULL);
+	DMAR_CTX_PGLOCK(ctx);
+	m = dmar_pgalloc(ctx->pgtbl_obj, 0, DMAR_PGF_WAITOK |
+	    DMAR_PGF_ZERO | DMAR_PGF_OBJL);
+	/* No implicit free of the top level page table page. */
+	m->wire_count = 1;
+	DMAR_CTX_PGUNLOCK(ctx);
+	return (0);
+}
+
+void
+ctx_free_pgtbl(struct dmar_ctx *ctx)
+{
+	vm_object_t obj;
+	vm_page_t m;
+
+	obj = ctx->pgtbl_obj;
+	if (obj == NULL) {
+		KASSERT((ctx->dmar->hw_ecap & DMAR_ECAP_PT) != 0 &&
+		    (ctx->flags & DMAR_CTX_IDMAP) != 0,
+		    ("lost pagetable object ctx %p", ctx));
+		return;
+	}
+	DMAR_CTX_ASSERT_PGLOCKED(ctx);
+	ctx->pgtbl_obj = NULL;
+
+	if ((ctx->flags & DMAR_CTX_IDMAP) != 0) {
+		put_idmap_pgtbl(obj);
+		ctx->flags &= ~DMAR_CTX_IDMAP;
+		return;
+	}
+
+	/* Obliterate wire_counts */
+	VM_OBJECT_ASSERT_WLOCKED(obj);
+	for (m = vm_page_lookup(obj, 0); m != NULL; m = vm_page_next(m))
+		m->wire_count = 0;
+	VM_OBJECT_WUNLOCK(obj);
+	vm_object_deallocate(obj);
+}
+
+static inline uint64_t
+ctx_wait_iotlb_flush(struct dmar_unit *unit, uint64_t wt, int iro)
+{
+	uint64_t iotlbr;
+
+	dmar_write8(unit, iro + DMAR_IOTLB_REG_OFF, DMAR_IOTLB_IVT |
+	    DMAR_IOTLB_DR | DMAR_IOTLB_DW | wt);
+	for (;;) {
+		iotlbr = dmar_read8(unit, iro + DMAR_IOTLB_REG_OFF);
+		if ((iotlbr & DMAR_IOTLB_IVT) == 0)
+			break;
+		cpu_spinwait();
+	}
+	return (iotlbr);
+}
+
+void
+ctx_flush_iotlb_sync(struct dmar_ctx *ctx, dmar_gaddr_t base, dmar_gaddr_t size)
+{
+	struct dmar_unit *unit;
+	dmar_gaddr_t isize;
+	uint64_t iotlbr;
+	int am, iro;
+
+	unit = ctx->dmar;
+	KASSERT(!unit->qi_enabled, ("dmar%d: sync iotlb flush call",
+	    unit->unit));
+	iro = DMAR_ECAP_IRO(unit->hw_ecap) * 16;
+	DMAR_LOCK(unit);
+	if ((unit->hw_cap & DMAR_CAP_PSI) == 0 || size > 2 * 1024 * 1024) {
+		iotlbr = ctx_wait_iotlb_flush(unit, DMAR_IOTLB_IIRG_DOM |
+		    DMAR_IOTLB_DID(ctx->domain), iro);
+		KASSERT((iotlbr & DMAR_IOTLB_IAIG_MASK) !=
+		    DMAR_IOTLB_IAIG_INVLD,
+		    ("dmar%d: invalidation failed %jx", unit->unit,
+		    (uintmax_t)iotlbr));
+	} else {
+		for (; size > 0; base += isize, size -= isize) {
+			am = calc_am(unit, base, size, &isize);
+			dmar_write8(unit, iro, base | am);
+			iotlbr = ctx_wait_iotlb_flush(unit,
+			    DMAR_IOTLB_IIRG_PAGE | DMAR_IOTLB_DID(ctx->domain),
+			    iro);
+			KASSERT((iotlbr & DMAR_IOTLB_IAIG_MASK) !=
+			    DMAR_IOTLB_IAIG_INVLD,
+			    ("dmar%d: PSI invalidation failed "
+			    "iotlbr 0x%jx base 0x%jx size 0x%jx am %d",
+			    unit->unit, (uintmax_t)iotlbr,
+			    (uintmax_t)base, (uintmax_t)size, am));
+			/*
+			 * Any non-page granularity covers whole guest
+			 * address space for the domain.
+			 */
+			if ((iotlbr & DMAR_IOTLB_IAIG_MASK) !=
+			    DMAR_IOTLB_IAIG_PAGE)
+				break;
+		}
+	}
+	DMAR_UNLOCK(unit);
+}
diff --git a/sys/x86/iommu/intel_qi.c b/sys/x86/iommu/intel_qi.c
new file mode 100644
index 00000000000..a682c934041
--- /dev/null
+++ b/sys/x86/iommu/intel_qi.c
@@ -0,0 +1,414 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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_acpi.h"
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/malloc.h>
+#include <sys/memdesc.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
+#include <machine/bus.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <dev/acpica/acpivar.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 <machine/cpu.h>
+#include <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/busdma_dmar.h>
+#include <x86/iommu/intel_dmar.h>
+
+static bool
+dmar_qi_seq_processed(const struct dmar_unit *unit,
+    const struct dmar_qi_genseq *pseq)
+{
+
+	return (pseq->gen < unit->inv_waitd_gen ||
+	    (pseq->gen == unit->inv_waitd_gen &&
+	     pseq->seq <= unit->inv_waitd_seq_hw));
+}
+
+static int
+dmar_enable_qi(struct dmar_unit *unit)
+{
+
+	DMAR_ASSERT_LOCKED(unit);
+	unit->hw_gcmd |= DMAR_GCMD_QIE;
+	dmar_write4(unit, DMAR_GCMD_REG, unit->hw_gcmd);
+	/* XXXKIB should have a timeout */
+	while ((dmar_read4(unit, DMAR_GSTS_REG) & DMAR_GSTS_QIES) == 0)
+		cpu_spinwait();
+	return (0);
+}
+
+static int
+dmar_disable_qi(struct dmar_unit *unit)
+{
+
+	DMAR_ASSERT_LOCKED(unit);
+	unit->hw_gcmd &= ~DMAR_GCMD_QIE;
+	dmar_write4(unit, DMAR_GCMD_REG, unit->hw_gcmd);
+	/* XXXKIB should have a timeout */
+	while ((dmar_read4(unit, DMAR_GSTS_REG) & DMAR_GSTS_QIES) != 0)
+		cpu_spinwait();
+	return (0);
+}
+
+static void
+dmar_qi_advance_tail(struct dmar_unit *unit)
+{
+
+	DMAR_ASSERT_LOCKED(unit);
+	dmar_write4(unit, DMAR_IQT_REG, unit->inv_queue_tail);
+}
+
+static void
+dmar_qi_ensure(struct dmar_unit *unit, int descr_count)
+{
+	uint32_t head;
+	int bytes;
+
+	DMAR_ASSERT_LOCKED(unit);
+	bytes = descr_count << DMAR_IQ_DESCR_SZ_SHIFT;
+	for (;;) {
+		if (bytes <= unit->inv_queue_avail)
+			break;
+		/* refill */
+		head = dmar_read4(unit, DMAR_IQH_REG);
+		head &= DMAR_IQH_MASK;
+		unit->inv_queue_avail = head - unit->inv_queue_tail -
+		    DMAR_IQ_DESCR_SZ;
+		if (head <= unit->inv_queue_tail)
+			unit->inv_queue_avail += unit->inv_queue_size;
+		if (bytes <= unit->inv_queue_avail)
+			break;
+
+		/*
+		 * No space in the queue, do busy wait.  Hardware must
+		 * make a progress.  But first advance the tail to
+		 * inform the descriptor streamer about entries we
+		 * might have already filled, otherwise they could
+		 * clog the whole queue..
+		 */
+		dmar_qi_advance_tail(unit);
+		unit->inv_queue_full++;
+		cpu_spinwait();
+	}
+	unit->inv_queue_avail -= bytes;
+}
+
+static void
+dmar_qi_emit(struct dmar_unit *unit, uint64_t data1, uint64_t data2)
+{
+
+	DMAR_ASSERT_LOCKED(unit);
+	*(volatile uint64_t *)(unit->inv_queue + unit->inv_queue_tail) = data1;
+	unit->inv_queue_tail += DMAR_IQ_DESCR_SZ / 2;
+	KASSERT(unit->inv_queue_tail <= unit->inv_queue_size,
+	    ("tail overflow 0x%x 0x%jx", unit->inv_queue_tail,
+	    (uintmax_t)unit->inv_queue_size));
+	unit->inv_queue_tail &= unit->inv_queue_size - 1;
+	*(volatile uint64_t *)(unit->inv_queue + unit->inv_queue_tail) = data2;
+	unit->inv_queue_tail += DMAR_IQ_DESCR_SZ / 2;
+	KASSERT(unit->inv_queue_tail <= unit->inv_queue_size,
+	    ("tail overflow 0x%x 0x%jx", unit->inv_queue_tail,
+	    (uintmax_t)unit->inv_queue_size));
+	unit->inv_queue_tail &= unit->inv_queue_size - 1;
+}
+
+static void
+dmar_qi_emit_wait_descr(struct dmar_unit *unit, uint32_t seq, bool intr,
+    bool memw, bool fence)
+{
+
+	DMAR_ASSERT_LOCKED(unit);
+	dmar_qi_emit(unit, DMAR_IQ_DESCR_WAIT_ID |
+	    (intr ? DMAR_IQ_DESCR_WAIT_IF : 0) |
+	    (memw ? DMAR_IQ_DESCR_WAIT_SW : 0) |
+	    (fence ? DMAR_IQ_DESCR_WAIT_FN : 0) |
+	    (memw ? DMAR_IQ_DESCR_WAIT_SD(seq) : 0),
+	    memw ? unit->inv_waitd_seq_hw_phys : 0);
+}
+
+static void
+dmar_qi_emit_wait_seq(struct dmar_unit *unit, struct dmar_qi_genseq *pseq)
+{
+	struct dmar_qi_genseq gsec;
+	uint32_t seq;
+
+	KASSERT(pseq != NULL, ("wait descriptor with no place for seq"));
+	DMAR_ASSERT_LOCKED(unit);
+	if (unit->inv_waitd_seq == 0xffffffff) {
+		gsec.gen = unit->inv_waitd_gen;
+		gsec.seq = unit->inv_waitd_seq;
+		dmar_qi_ensure(unit, 1);
+		dmar_qi_emit_wait_descr(unit, gsec.seq, false, true, false);
+		dmar_qi_advance_tail(unit);
+		while (!dmar_qi_seq_processed(unit, &gsec))
+			cpu_spinwait();
+		unit->inv_waitd_gen++;
+		unit->inv_waitd_seq = 1;
+	}
+	seq = unit->inv_waitd_seq++;
+	pseq->gen = unit->inv_waitd_gen;
+	pseq->seq = seq;
+	dmar_qi_emit_wait_descr(unit, seq, true, true, false);
+}
+
+static void
+dmar_qi_wait_for_seq(struct dmar_unit *unit, const struct dmar_qi_genseq *gseq)
+{
+
+	DMAR_ASSERT_LOCKED(unit);
+	unit->inv_seq_waiters++;
+	while (!dmar_qi_seq_processed(unit, gseq)) {
+		if (cold) {
+			cpu_spinwait();
+		} else {
+			msleep(&unit->inv_seq_waiters, &unit->lock, 0,
+			    "dmarse", hz);
+		}
+	}
+	unit->inv_seq_waiters--;
+}
+
+void
+dmar_qi_invalidate_locked(struct dmar_ctx *ctx, dmar_gaddr_t base,
+    dmar_gaddr_t size, struct dmar_qi_genseq *pseq)
+{
+	struct dmar_unit *unit;
+	dmar_gaddr_t isize;
+	int am;
+
+	unit = ctx->dmar;
+	DMAR_ASSERT_LOCKED(unit);
+	for (; size > 0; base += isize, size -= isize) {
+		am = calc_am(unit, base, size, &isize);
+		dmar_qi_ensure(unit, 1);
+		dmar_qi_emit(unit, DMAR_IQ_DESCR_IOTLB_INV |
+		    DMAR_IQ_DESCR_IOTLB_PAGE | DMAR_IQ_DESCR_IOTLB_DW |
+		    DMAR_IQ_DESCR_IOTLB_DR |
+		    DMAR_IQ_DESCR_IOTLB_DID(ctx->domain),
+		    base | am);
+	}
+	if (pseq != NULL) {
+		dmar_qi_ensure(unit, 1);
+		dmar_qi_emit_wait_seq(unit, pseq);
+	}
+	dmar_qi_advance_tail(unit);
+}
+
+void
+dmar_qi_invalidate_ctx_glob_locked(struct dmar_unit *unit)
+{
+	struct dmar_qi_genseq gseq;
+
+	DMAR_ASSERT_LOCKED(unit);
+	dmar_qi_ensure(unit, 2);
+	dmar_qi_emit(unit, DMAR_IQ_DESCR_CTX_INV | DMAR_IQ_DESCR_CTX_GLOB, 0);
+	dmar_qi_emit_wait_seq(unit, &gseq);
+	dmar_qi_advance_tail(unit);
+	dmar_qi_wait_for_seq(unit, &gseq);
+}
+
+void
+dmar_qi_invalidate_iotlb_glob_locked(struct dmar_unit *unit)
+{
+	struct dmar_qi_genseq gseq;
+
+	DMAR_ASSERT_LOCKED(unit);
+	dmar_qi_ensure(unit, 2);
+	dmar_qi_emit(unit, DMAR_IQ_DESCR_IOTLB_INV | DMAR_IQ_DESCR_IOTLB_GLOB |
+	    DMAR_IQ_DESCR_IOTLB_DW | DMAR_IQ_DESCR_IOTLB_DR, 0);
+	dmar_qi_emit_wait_seq(unit, &gseq);
+	dmar_qi_advance_tail(unit);
+	dmar_qi_wait_for_seq(unit, &gseq);
+}
+
+int
+dmar_qi_intr(void *arg)
+{
+	struct dmar_unit *unit;
+
+	unit = arg;
+	KASSERT(unit->qi_enabled, ("dmar%d: QI is not enabled", unit->unit));
+	taskqueue_enqueue_fast(unit->qi_taskqueue, &unit->qi_task);
+	return (FILTER_HANDLED);
+}
+
+static void
+dmar_qi_task(void *arg, int pending __unused)
+{
+	struct dmar_unit *unit;
+	struct dmar_map_entry *entry;
+	uint32_t ics;
+
+	unit = arg;
+
+	DMAR_LOCK(unit);
+	for (;;) {
+		entry = TAILQ_FIRST(&unit->tlb_flush_entries);
+		if (entry == NULL)
+			break;
+		if ((entry->gseq.gen == 0 && entry->gseq.seq == 0) ||
+		    !dmar_qi_seq_processed(unit, &entry->gseq))
+			break;
+		TAILQ_REMOVE(&unit->tlb_flush_entries, entry, dmamap_link);
+		DMAR_UNLOCK(unit);
+		dmar_ctx_free_entry(entry, (entry->flags &
+		    DMAR_MAP_ENTRY_QI_NF) == 0);
+		DMAR_LOCK(unit);
+	}
+	ics = dmar_read4(unit, DMAR_ICS_REG);
+	if ((ics & DMAR_ICS_IWC) != 0) {
+		ics = DMAR_ICS_IWC;
+		dmar_write4(unit, DMAR_ICS_REG, ics);
+	}
+	if (unit->inv_seq_waiters > 0)
+		wakeup(&unit->inv_seq_waiters);
+	DMAR_UNLOCK(unit);
+}
+
+int
+dmar_init_qi(struct dmar_unit *unit)
+{
+	uint64_t iqa;
+	uint32_t ics;
+	int qi_sz;
+
+	if (!DMAR_HAS_QI(unit) || (unit->hw_cap & DMAR_CAP_CM) != 0)
+		return (0);
+	unit->qi_enabled = 1;
+	TUNABLE_INT_FETCH("hw.dmar.qi", &unit->qi_enabled);
+	if (!unit->qi_enabled)
+		return (0);
+
+	TAILQ_INIT(&unit->tlb_flush_entries);
+	TASK_INIT(&unit->qi_task, 0, dmar_qi_task, unit);
+	unit->qi_taskqueue = taskqueue_create_fast("dmar", M_WAITOK,
+	    taskqueue_thread_enqueue, &unit->qi_taskqueue);
+	taskqueue_start_threads(&unit->qi_taskqueue, 1, PI_AV,
+	    "dmar%d qi taskq", unit->unit);
+
+	unit->inv_waitd_gen = 0;
+	unit->inv_waitd_seq = 1;
+
+	qi_sz = DMAR_IQA_QS_DEF;
+	TUNABLE_INT_FETCH("hw.dmar.qi_size", &qi_sz);
+	if (qi_sz > DMAR_IQA_QS_MAX)
+		qi_sz = DMAR_IQA_QS_MAX;
+	unit->inv_queue_size = (1ULL << qi_sz) * PAGE_SIZE;
+	/* Reserve one descriptor to prevent wraparound. */
+	unit->inv_queue_avail = unit->inv_queue_size - DMAR_IQ_DESCR_SZ;
+
+	/* The invalidation queue reads by DMARs are always coherent. */
+	unit->inv_queue = kmem_alloc_contig(kernel_arena, unit->inv_queue_size,
+	    M_WAITOK | M_ZERO, 0, dmar_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT);
+	unit->inv_waitd_seq_hw_phys = pmap_kextract(
+	    (vm_offset_t)&unit->inv_waitd_seq_hw);
+
+	DMAR_LOCK(unit);
+	dmar_write8(unit, DMAR_IQT_REG, 0);
+	iqa = pmap_kextract(unit->inv_queue);
+	iqa |= qi_sz;
+	dmar_write8(unit, DMAR_IQA_REG, iqa);
+	dmar_enable_qi(unit);
+	ics = dmar_read4(unit, DMAR_ICS_REG);
+	if ((ics & DMAR_ICS_IWC) != 0) {
+		ics = DMAR_ICS_IWC;
+		dmar_write4(unit, DMAR_ICS_REG, ics);
+	}
+	DMAR_UNLOCK(unit);
+
+	return (0);
+}
+
+void
+dmar_fini_qi(struct dmar_unit *unit)
+{
+	struct dmar_qi_genseq gseq;
+
+	if (unit->qi_enabled)
+		return;
+	taskqueue_drain(unit->qi_taskqueue, &unit->qi_task);
+	taskqueue_free(unit->qi_taskqueue);
+	unit->qi_taskqueue = NULL;
+
+	DMAR_LOCK(unit);
+	/* quisce */
+	dmar_qi_ensure(unit, 1);
+	dmar_qi_emit_wait_seq(unit, &gseq);
+	dmar_qi_advance_tail(unit);
+	dmar_qi_wait_for_seq(unit, &gseq);
+	/* only after the quisce, disable queue */
+	dmar_disable_qi(unit);
+	KASSERT(unit->inv_seq_waiters == 0,
+	    ("dmar%d: waiters on disabled queue", unit->unit));
+	DMAR_UNLOCK(unit);
+
+	kmem_free(kernel_arena, unit->inv_queue, unit->inv_queue_size);
+	unit->inv_queue = 0;
+	unit->inv_queue_size = 0;
+	unit->qi_enabled = 0;
+}
+
+void
+dmar_enable_qi_intr(struct dmar_unit *unit)
+{
+	uint32_t iectl;
+
+	DMAR_ASSERT_LOCKED(unit);
+	KASSERT(DMAR_HAS_QI(unit), ("dmar%d: QI is not supported", unit->unit));
+	iectl = dmar_read4(unit, DMAR_IECTL_REG);
+	iectl &= ~DMAR_IECTL_IM;
+	dmar_write4(unit, DMAR_IECTL_REG, iectl);
+}
+
+void
+dmar_disable_qi_intr(struct dmar_unit *unit)
+{
+	uint32_t iectl;
+
+	DMAR_ASSERT_LOCKED(unit);
+	KASSERT(DMAR_HAS_QI(unit), ("dmar%d: QI is not supported", unit->unit));
+	iectl = dmar_read4(unit, DMAR_IECTL_REG);
+	dmar_write4(unit, DMAR_IECTL_REG, iectl | DMAR_IECTL_IM);
+}
diff --git a/sys/x86/iommu/intel_quirks.c b/sys/x86/iommu/intel_quirks.c
new file mode 100644
index 00000000000..7c35ae62b6a
--- /dev/null
+++ b/sys/x86/iommu/intel_quirks.c
@@ -0,0 +1,195 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/memdesc.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/rwlock.h>
+#include <sys/smp.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
+#include <machine/bus.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <dev/acpica/acpivar.h>
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_object.h>
+#include <vm/vm_page.h>
+#include <vm/vm_pager.h>
+#include <vm/vm_map.h>
+#include <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/busdma_dmar.h>
+#include <x86/iommu/intel_dmar.h>
+#include <dev/pci/pcivar.h>
+
+typedef void (*dmar_quirk_fun)(struct dmar_unit *);
+
+struct intel_dmar_quirk_cpu {
+	u_int ext_family;
+	u_int ext_model;
+	u_int family_code;
+	u_int model;
+	u_int stepping;
+	dmar_quirk_fun quirk;
+	const char *descr;
+};
+
+struct intel_dmar_quirk_nb {
+	u_int dev_id;
+	u_int rev_no;
+	dmar_quirk_fun quirk;
+	const char *descr;
+};
+
+static void
+dmar_match_quirks(struct dmar_unit *dmar,
+    const struct intel_dmar_quirk_nb *nb_quirks, int nb_quirks_len,
+    const struct intel_dmar_quirk_cpu *cpu_quirks, int cpu_quirks_len)
+{
+	device_t nb;
+	const struct intel_dmar_quirk_nb *nb_quirk;
+	const struct intel_dmar_quirk_cpu *cpu_quirk;
+	u_int p[4];
+	u_int dev_id, rev_no;
+	u_int ext_family, ext_model, family_code, model, stepping;
+	int i;
+
+	if (nb_quirks != NULL) {
+		nb = pci_find_bsf(0, 0, 0);
+		if (nb != NULL) {
+			dev_id = pci_get_device(nb);
+			rev_no = pci_get_revid(nb);
+			for (i = 0; i < nb_quirks_len; i++) {
+				nb_quirk = &nb_quirks[i];
+				if (nb_quirk->dev_id == dev_id &&
+				    nb_quirk->rev_no == rev_no) {
+					if (bootverbose) {
+						device_printf(dmar->dev,
+						    "NB IOMMU quirk %s\n",
+						    nb_quirk->descr);
+					}
+					nb_quirk->quirk(dmar);
+				}
+			}
+		} else {
+			device_printf(dmar->dev, "cannot find northbridge\n");
+		}
+	}
+	if (cpu_quirks != NULL) {
+		do_cpuid(1, p);
+		ext_family = (p[0] & CPUID_EXT_FAMILY) >> 20;
+		ext_model = (p[0] & CPUID_EXT_MODEL) >> 16;
+		family_code = (p[0] & CPUID_FAMILY) >> 8;
+		model = (p[0] & CPUID_MODEL) >> 4;
+		stepping = p[0] & CPUID_STEPPING;
+		for (i = 0; i < cpu_quirks_len; i++) {
+			cpu_quirk = &cpu_quirks[i];
+			if (cpu_quirk->ext_family == ext_family &&
+			    cpu_quirk->ext_model == ext_model &&
+			    cpu_quirk->family_code == family_code &&
+			    cpu_quirk->model == model &&
+			    (cpu_quirk->stepping == -1 ||
+			    cpu_quirk->stepping == stepping)) {
+				if (bootverbose) {
+					device_printf(dmar->dev,
+					    "CPU IOMMU quirk %s\n",
+					    cpu_quirk->descr);
+				}
+				cpu_quirk->quirk(dmar);
+			}
+		}
+	}
+}
+
+static void
+nb_5400_no_low_high_prot_mem(struct dmar_unit *unit)
+{
+
+	unit->hw_cap &= ~(DMAR_CAP_PHMR | DMAR_CAP_PLMR);
+}
+
+static const struct intel_dmar_quirk_nb pre_use_nb[] = {
+	{
+	    .dev_id = 0x4001, .rev_no = 0x20,
+	    .quirk = nb_5400_no_low_high_prot_mem,
+	    .descr = "5400 E23" /* no low/high protected memory */
+	},
+	{
+	    .dev_id = 0x4003, .rev_no = 0x20,
+	    .quirk = nb_5400_no_low_high_prot_mem,
+	    .descr = "5400 E23" /* no low/high protected memory */
+	},
+};
+
+static void
+cpu_e5_am9(struct dmar_unit *unit)
+{
+
+	unit->hw_cap &= ~(0x3fULL << 48);
+	unit->hw_cap |= (9ULL << 48);
+}
+
+static const struct intel_dmar_quirk_cpu post_ident_cpu[] = {
+	{
+	    .ext_family = 0, .ext_model = 2, .family_code = 6, .model = 13,
+	    .stepping = 6, .quirk = cpu_e5_am9,
+	    .descr = "E5 BT176" /* AM should be at most 9 */
+	},
+};
+
+void
+dmar_quirks_pre_use(struct dmar_unit *dmar)
+{
+
+	if (!dmar_barrier_enter(dmar, DMAR_BARRIER_USEQ))
+		return;
+	DMAR_LOCK(dmar);
+	dmar_match_quirks(dmar, pre_use_nb, nitems(pre_use_nb),
+	    NULL, 0);
+	dmar_barrier_exit(dmar, DMAR_BARRIER_USEQ);
+}
+
+void
+dmar_quirks_post_ident(struct dmar_unit *dmar)
+{
+
+	dmar_match_quirks(dmar, NULL, 0, post_ident_cpu,
+	    nitems(post_ident_cpu));
+}
diff --git a/sys/x86/iommu/intel_reg.h b/sys/x86/iommu/intel_reg.h
new file mode 100644
index 00000000000..18e1f600c34
--- /dev/null
+++ b/sys/x86/iommu/intel_reg.h
@@ -0,0 +1,330 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 __X86_IOMMU_INTEL_REG_H
+#define	__X86_IOMMU_INTEL_REG_H
+
+#define	DMAR_PAGE_SIZE	PAGE_SIZE
+#define	DMAR_PAGE_MASK	(DMAR_PAGE_SIZE - 1)
+#define	DMAR_PAGE_SHIFT	PAGE_SHIFT
+#define	DMAR_NPTEPG	(DMAR_PAGE_SIZE / sizeof(dmar_pte_t))
+#define	DMAR_NPTEPGSHIFT 9
+#define	DMAR_PTEMASK	(DMAR_NPTEPG - 1)
+
+typedef struct dmar_root_entry {
+	uint64_t r1;
+	uint64_t r2;
+} dmar_root_entry_t;
+#define	DMAR_ROOT_R1_P		1 		   /* Present */
+#define	DMAR_ROOT_R1_CTP_MASK	0xfffffffffffff000 /* Mask for Context-Entry
+						      Table Pointer */
+
+#define	DMAR_CTX_CNT		(DMAR_PAGE_SIZE / sizeof(dmar_root_entry_t))
+
+typedef	struct dmar_ctx_entry {
+	uint64_t ctx1;
+	uint64_t ctx2;
+} dmar_ctx_entry_t;
+#define	DMAR_CTX1_P		1		/* Present */
+#define	DMAR_CTX1_FPD		2		/* Fault Processing Disable */
+						/* Translation Type: */
+#define	DMAR_CTX1_T_UNTR	0		/* only Untranslated */
+#define	DMAR_CTX1_T_TR		4		/* both Untranslated
+						   and Translated */
+#define	DMAR_CTX1_T_PASS	8		/* Pass-Through */
+#define	DMAR_CTX1_ASR_MASK	0xfffffffffffff000 /* Mask for the Address
+						   Space Root */
+#define	DMAR_CTX2_AW_2LVL	0		/* 2-level page tables */
+#define	DMAR_CTX2_AW_3LVL	1		/* 3-level page tables */
+#define	DMAR_CTX2_AW_4LVL	2		/* 4-level page tables */
+#define	DMAR_CTX2_AW_5LVL	3		/* 5-level page tables */
+#define	DMAR_CTX2_AW_6LVL	4		/* 6-level page tables */
+#define	DMAR_CTX2_DID(x)	((x) << 8)	/* Domain Identifier */
+
+typedef struct dmar_pte {
+	uint64_t pte;
+} dmar_pte_t;
+#define	DMAR_PTE_R		1		/* Read */
+#define	DMAR_PTE_W		(1 << 1)	/* Write */
+#define	DMAR_PTE_SP		(1 << 7)	/* Super Page */
+#define	DMAR_PTE_SNP		(1 << 11)	/* Snoop Behaviour */
+#define	DMAR_PTE_ADDR_MASK	0xffffffffff000	/* Address Mask */
+#define	DMAR_PTE_TM		(1ULL << 62)	/* Transient Mapping */
+
+/* Version register */
+#define	DMAR_VER_REG	0
+#define	DMAR_MAJOR_VER(x)	(((x) >> 4) & 0xf)
+#define	DMAR_MINOR_VER(x)	((x) & 0xf)
+
+/* Capabilities register */
+#define	DMAR_CAP_REG	0x8
+#define	DMAR_CAP_DRD	(1ULL << 55)	/* DMA Read Draining */
+#define	DMAR_CAP_DWD	(1ULL << 54)	/* DMA Write Draining */
+#define	DMAR_CAP_MAMV(x) ((u_int)(((x) >> 48) & 0x3f))
+					/* Maximum Address Mask */
+#define	DMAR_CAP_NFR(x)	((u_int)(((x) >> 40) & 0xff) + 1)
+					/* Num of Fault-recording regs */
+#define	DMAR_CAP_PSI	(1ULL << 39)	/* Page Selective Invalidation */
+#define	DMAR_CAP_SPS(x)	((u_int)(((x) >> 34) & 0xf)) /* Super-Page Support */
+#define	DMAR_CAP_SPS_2M	0x1
+#define	DMAR_CAP_SPS_1G	0x2
+#define	DMAR_CAP_SPS_512G 0x4
+#define	DMAR_CAP_SPS_1T	0x8
+#define	DMAR_CAP_FRO(x)	((u_int)(((x) >> 24) & 0x1ff))
+					/* Fault-recording reg offset */
+#define	DMAR_CAP_ISOCH	(1 << 23)	/* Isochrony */
+#define	DMAR_CAP_ZLR	(1 << 22)	/* Zero-length reads */
+#define	DMAR_CAP_MGAW(x) ((u_int)(((x) >> 16) & 0x3f))
+					/* Max Guest Address Width */
+#define DMAR_CAP_SAGAW(x) ((u_int)(((x) >> 8) & 0x1f))
+					/* Adjusted Guest Address Width */
+#define	DMAR_CAP_SAGAW_2LVL	0x01
+#define	DMAR_CAP_SAGAW_3LVL	0x02
+#define	DMAR_CAP_SAGAW_4LVL	0x04
+#define	DMAR_CAP_SAGAW_5LVL	0x08
+#define	DMAR_CAP_SAGAW_6LVL	0x10
+#define	DMAR_CAP_CM	(1 << 7)	/* Caching mode */
+#define	DMAR_CAP_PHMR	(1 << 6)	/* Protected High-mem Region */
+#define	DMAR_CAP_PLMR	(1 << 5)	/* Protected Low-mem Region */
+#define	DMAR_CAP_RWBF	(1 << 4)	/* Required Write-Buffer Flushing */
+#define	DMAR_CAP_AFL	(1 << 3)	/* Advanced Fault Logging */
+#define	DMAR_CAP_ND(x)	((u_int)((x) & 0x3))	/* Number of domains */
+
+/* Extended Capabilities register */
+#define	DMAR_ECAP_REG	0x10
+#define	DMAR_ECAP_MHMV(x) ((u_int)(((x) >> 20) & 0xf))
+					/* Maximum Handle Mask Value */
+#define	DMAR_ECAP_IRO(x)  ((u_int)(((x) >> 8) & 0x3ff))
+					/* IOTLB Register Offset */
+#define	DMAR_ECAP_SC	(1 << 7)	/* Snoop Control */
+#define	DMAR_ECAP_PT	(1 << 6)	/* Pass Through */
+#define	DMAR_ECAP_EIM	(1 << 4)	/* Extended Interrupt Mode */
+#define	DMAR_ECAP_IR	(1 << 3)	/* Interrupt Remapping */
+#define	DMAR_ECAP_DI	(1 << 2)	/* Device IOTLB */
+#define	DMAR_ECAP_QI	(1 << 1)	/* Queued Invalidation */
+#define	DMAR_ECAP_C	(1 << 0)	/* Coherency */
+
+/* Global Command register */
+#define	DMAR_GCMD_REG	0x18
+#define	DMAR_GCMD_TE	(1U << 31)	/* Translation Enable */
+#define	DMAR_GCMD_SRTP	(1 << 30)	/* Set Root Table Pointer */
+#define	DMAR_GCMD_SFL	(1 << 29)	/* Set Fault Log */
+#define	DMAR_GCMD_EAFL	(1 << 28)	/* Enable Advanced Fault Logging */
+#define	DMAR_GCMD_WBF	(1 << 27)	/* Write Buffer Flush */
+#define	DMAR_GCMD_QIE	(1 << 26)	/* Queued Invalidation Enable */
+#define DMAR_GCMD_IRE	(1 << 25)	/* Interrupt Remapping Enable */
+#define	DMAR_GCMD_SIRTP	(1 << 24)	/* Set Interrupt Remap Table Pointer */
+#define	DMAR_GCMD_CFI	(1 << 23)	/* Compatibility Format Interrupt */
+
+/* Global Status register */
+#define	DMAR_GSTS_REG	0x1c
+#define	DMAR_GSTS_TES	(1U << 31)	/* Translation Enable Status */
+#define	DMAR_GSTS_RTPS	(1 << 30)	/* Root Table Pointer Status */
+#define	DMAR_GSTS_FLS	(1 << 29)	/* Fault Log Status */
+#define	DMAR_GSTS_AFLS	(1 << 28)	/* Advanced Fault Logging Status */
+#define	DMAR_GSTS_WBFS	(1 << 27)	/* Write Buffer Flush Status */
+#define	DMAR_GSTS_QIES	(1 << 26)	/* Queued Invalidation Enable Status */
+#define	DMAR_GSTS_IRES	(1 << 25)	/* Interrupt Remapping Enable Status */
+#define	DMAR_GSTS_IRTPS	(1 << 24)	/* Interrupt Remapping Table
+					   Pointer Status */
+#define	DMAR_GSTS_CFIS	(1 << 23)	/* Compatibility Format
+					   Interrupt Status */
+
+/* Root-Entry Table Address register */
+#define	DMAR_RTADDR_REG	0x20
+
+/* Context Command register */
+#define	DMAR_CCMD_REG	0x28
+#define	DMAR_CCMD_ICC	(1ULL << 63)	/* Invalidate Context-Cache */
+#define	DMAR_CCMD_ICC32	(1U << 31)
+#define	DMAR_CCMD_CIRG_MASK	(0x3ULL << 61)	/* Context Invalidation
+						   Request Granularity */
+#define	DMAR_CCMD_CIRG_GLOB	(0x1ULL << 61)	/* Global */
+#define	DMAR_CCMD_CIRG_DOM	(0x2ULL << 61)	/* Domain */
+#define	DMAR_CCMD_CIRG_DEV	(0x3ULL << 61)	/* Device */
+#define	DMAR_CCMD_CAIG(x)	(((x) >> 59) & 0x3) /* Context Actual
+						    Invalidation Granularity */
+#define	DMAR_CCMD_CAIG_GLOB	0x1		/* Global */
+#define	DMAR_CCMD_CAIG_DOM	0x2		/* Domain */
+#define	DMAR_CCMD_CAIG_DEV	0x3		/* Device */
+#define	DMAR_CCMD_FM		(0x3UUL << 32)	/* Function Mask */
+#define	DMAR_CCMD_SID(x)	(((x) & 0xffff) << 16) /* Source-ID */
+#define	DMAR_CCMD_DID(x)	((x) & 0xffff)	/* Domain-ID */
+
+/* Invalidate Address register */
+#define	DMAR_IVA_REG_OFF	0
+#define	DMAR_IVA_IH		(1 << 6)	/* Invalidation Hint */
+#define	DMAR_IVA_AM(x)		((x) & 0x1f)	/* Address Mask */
+#define	DMAR_IVA_ADDR(x)	((x) & ~0xfffULL) /* Address */
+
+/* IOTLB Invalidate register */
+#define	DMAR_IOTLB_REG_OFF	0x8
+#define	DMAR_IOTLB_IVT		(1ULL << 63)	/* Invalidate IOTLB */
+#define	DMAR_IOTLB_IVT32	(1U << 31)
+#define	DMAR_IOTLB_IIRG_MASK	(0x3ULL << 60)	/* Invalidation Request
+						   Granularity */
+#define	DMAR_IOTLB_IIRG_GLB	(0x1ULL << 60)	/* Global */
+#define	DMAR_IOTLB_IIRG_DOM	(0x2ULL << 60)	/* Domain-selective */
+#define	DMAR_IOTLB_IIRG_PAGE	(0x3ULL << 60)	/* Page-selective */
+#define	DMAR_IOTLB_IAIG_MASK	(0x3ULL << 57)	/* Actual Invalidation
+						   Granularity */
+#define	DMAR_IOTLB_IAIG_INVLD	0		/* Hw detected error */
+#define	DMAR_IOTLB_IAIG_GLB	(0x1ULL << 57)	/* Global */
+#define	DMAR_IOTLB_IAIG_DOM	(0x2ULL << 57)	/* Domain-selective */
+#define	DMAR_IOTLB_IAIG_PAGE	(0x3ULL << 57)	/* Page-selective */
+#define	DMAR_IOTLB_DR		(0x1ULL << 49)	/* Drain Reads */
+#define	DMAR_IOTLB_DW		(0x1ULL << 48)	/* Drain Writes */
+#define	DMAR_IOTLB_DID(x)	(((uint64_t)(x) & 0xffff) << 32) /* Domain Id */
+
+/* Fault Status register */
+#define	DMAR_FSTS_REG		0x34
+#define	DMAR_FSTS_FRI(x)	(((x) >> 8) & 0xff) /* Fault Record Index */
+#define	DMAR_FSTS_ITE		(1 << 6)	/* Invalidation Time-out */
+#define	DMAR_FSTS_ICE		(1 << 5)	/* Invalidation Completion */
+#define	DMAR_FSTS_IQE		(1 << 4)	/* Invalidation Queue */
+#define	DMAR_FSTS_APF		(1 << 3)	/* Advanced Pending Fault */
+#define	DMAR_FSTS_AFO		(1 << 2)	/* Advanced Fault Overflow */
+#define	DMAR_FSTS_PPF		(1 << 1)	/* Primary Pending Fault */
+#define	DMAR_FSTS_PFO		1		/* Fault Overflow */
+
+/* Fault Event Control register */
+#define	DMAR_FECTL_REG		0x38
+#define	DMAR_FECTL_IM		(1U << 31)	/* Interrupt Mask */
+#define	DMAR_FECTL_IP		(1 << 30)	/* Interrupt Pending */
+
+/* Fault Event Data register */
+#define	DMAR_FEDATA_REG		0x3c
+
+/* Fault Event Address register */
+#define	DMAR_FEADDR_REG		0x40
+
+/* Fault Event Upper Address register */
+#define	DMAR_FEUADDR_REG	0x44
+
+/* Advanced Fault Log register */
+#define	DMAR_AFLOG_REG		0x58
+
+/* Fault Recording Register, also usable for Advanced Fault Log records */
+#define	DMAR_FRCD2_F		(1ULL << 63)	/* Fault */
+#define	DMAR_FRCD2_F32		(1U << 31)
+#define	DMAR_FRCD2_T(x)		((int)((x >> 62) & 1))	/* Type */
+#define	DMAR_FRCD2_T_W		0		/* Write request */
+#define	DMAR_FRCD2_T_R		1		/* Read or AtomicOp */
+#define	DMAR_FRCD2_AT(x)	((int)((x >> 60) & 0x3)) /* Address Type */
+#define	DMAR_FRCD2_FR(x)	((int)((x >> 32) & 0xff)) /* Fault Reason */
+#define	DMAR_FRCD2_SID(x)	((int)(x & 0xffff))	/* Source Identifier */
+#define	DMAR_FRCS1_FI_MASK	0xffffffffff000	/* Fault Info, Address Mask */
+
+/* Protected Memory Enable register */
+#define	DMAR_PMEN_REG		0x64
+#define	DMAR_PMEN_EPM		(1U << 31)	/* Enable Protected Memory */
+#define	DMAR_PMEN_PRS		1		/* Protected Region Status */
+
+/* Protected Low-Memory Base register */
+#define	DMAR_PLMBASE_REG	0x68
+
+/* Protected Low-Memory Limit register */
+#define	DMAR_PLMLIMIT_REG	0x6c
+
+/* Protected High-Memory Base register */
+#define	DMAR_PHMBASE_REG	0x70
+
+/* Protected High-Memory Limit register */
+#define	DMAR_PHMLIMIT_REG	0x78
+
+/* Queued Invalidation Descriptors */
+#define	DMAR_IQ_DESCR_SZ_SHIFT	4	/* Shift for descriptor count
+					   to ring offset */
+#define	DMAR_IQ_DESCR_SZ	(1 << DMAR_IQ_DESCR_SZ_SHIFT)
+					/* Descriptor size */
+
+#define	DMAR_IQ_DESCR_CTX_INV	0x1	/* Context-cache Invalidate
+					   Descriptor */
+#define	DMAR_IQ_DESCR_CTX_GLOB	(0x1 << 4)	/* Granularity: Global */
+#define	DMAR_IQ_DESCR_CTX_DOM	(0x2 << 4)	/* Granularity: Domain */
+#define	DMAR_IQ_DESCR_CTX_DEV	(0x3 << 4)	/* Granularity: Device */
+#define	DMAR_IQ_DESCR_CTX_DID(x) (((uint32_t)(x)) << 16) /* Domain Id */
+#define	DMAR_IQ_DESCR_CTX_SRC(x) (((uint64_t)(x)) << 32) /* Source Id */
+#define	DMAR_IQ_DESCR_CTX_FM(x)  (((uint64_t)(x)) << 48) /* Function Mask */
+
+#define	DMAR_IQ_DESCR_IOTLB_INV	0x2	/* IOTLB Invalidate Descriptor */
+#define	DMAR_IQ_DESCR_IOTLB_GLOB (0x1 << 4)	/* Granularity: Global */
+#define	DMAR_IQ_DESCR_IOTLB_DOM	 (0x2 << 4)	/* Granularity: Domain */
+#define	DMAR_IQ_DESCR_IOTLB_PAGE (0x3 << 4)	/* Granularity: Page */
+#define	DMAR_IQ_DESCR_IOTLB_DW	(1 << 6)	/* Drain Writes */
+#define	DMAR_IQ_DESCR_IOTLB_DR	(1 << 7)	/* Drain Reads */
+#define	DMAR_IQ_DESCR_IOTLB_DID(x) (((uint32_t)(x)) << 16) /* Domain Id */
+
+#define	DMAR_IQ_DESCR_WAIT_ID	0x5	/* Invalidation Wait Descriptor */
+#define	DMAR_IQ_DESCR_WAIT_IF	(1 << 4)	/* Interrupt Flag */
+#define	DMAR_IQ_DESCR_WAIT_SW	(1 << 5)	/* Status Write */
+#define	DMAR_IQ_DESCR_WAIT_FN	(1 << 6)	/* Fence */
+#define	DMAR_IQ_DESCR_WAIT_SD(x) (((uint64_t)(x)) << 32) /* Status Data */
+
+/* Invalidation Queue Head register */
+#define	DMAR_IQH_REG		0x80
+#define	DMAR_IQH_MASK		0x7fff0		/* Next cmd index mask */
+
+/* Invalidation Queue Tail register */
+#define	DMAR_IQT_REG		0x88
+#define	DMAR_IQT_MASK		0x7fff0
+
+/* Invalidation Queue Address register */
+#define	DMAR_IQA_REG		0x90
+#define	DMAR_IQA_IQA_MASK	0xfffffffffffff000 /* Invalidation Queue
+						      Base Address mask */
+#define	DMAR_IQA_QS_MASK	0x7		/* Queue Size in pages */
+#define	DMAR_IQA_QS_MAX		0x7		/* Max Queue size */
+#define	DMAR_IQA_QS_DEF		3
+
+ /* Invalidation Completion Status register */
+#define	DMAR_ICS_REG		0x9c
+#define	DMAR_ICS_IWC		1		/* Invalidation Wait
+						   Descriptor Complete */
+
+/* Invalidation Event Control register */
+#define	DMAR_IECTL_REG		0xa0
+#define	DMAR_IECTL_IM		(1U << 31)	/* Interrupt Mask */
+#define	DMAR_IECTL_IP		(1 << 30)	/* Interrupt Pending */
+
+/* Invalidation Event Data register */
+#define	DMAR_IEDATA_REG		0xa4
+
+/* Invalidation Event Address register */
+#define	DMAR_IEADDR_REG		0xa8
+
+/* Invalidation Event Upper Address register */
+#define	DMAR_IEUADDR_REG	0xac
+
+/* Interrupt Remapping Table Address register */
+#define	DMAR_IRTA_REG		0xb8
+
+#endif
diff --git a/sys/x86/iommu/intel_utils.c b/sys/x86/iommu/intel_utils.c
new file mode 100644
index 00000000000..d81ec043b78
--- /dev/null
+++ b/sys/x86/iommu/intel_utils.c
@@ -0,0 +1,563 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed 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:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/memdesc.h>
+#include <sys/mutex.h>
+#include <sys/proc.h>
+#include <sys/queue.h>
+#include <sys/rman.h>
+#include <sys/rwlock.h>
+#include <sys/sched.h>
+#include <sys/sf_buf.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
+#include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_object.h>
+#include <vm/vm_page.h>
+#include <vm/vm_map.h>
+#include <vm/vm_pageout.h>
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <x86/include/busdma_impl.h>
+#include <x86/iommu/intel_reg.h>
+#include <x86/iommu/busdma_dmar.h>
+#include <x86/iommu/intel_dmar.h>
+
+u_int
+dmar_nd2mask(u_int nd)
+{
+	static const u_int masks[] = {
+		0x000f,	/* nd == 0 */
+		0x002f,	/* nd == 1 */
+		0x00ff,	/* nd == 2 */
+		0x02ff,	/* nd == 3 */
+		0x0fff,	/* nd == 4 */
+		0x2fff,	/* nd == 5 */
+		0xffff,	/* nd == 6 */
+		0x0000,	/* nd == 7 reserved */
+	};
+
+	KASSERT(nd <= 6, ("number of domains %d", nd));
+	return (masks[nd]);
+}
+
+static const struct sagaw_bits_tag {
+	int agaw;
+	int cap;
+	int awlvl;
+	int pglvl;
+} sagaw_bits[] = {
+	{.agaw = 30, .cap = DMAR_CAP_SAGAW_2LVL, .awlvl = DMAR_CTX2_AW_2LVL,
+	    .pglvl = 2},
+	{.agaw = 39, .cap = DMAR_CAP_SAGAW_3LVL, .awlvl = DMAR_CTX2_AW_3LVL,
+	    .pglvl = 3},
+	{.agaw = 48, .cap = DMAR_CAP_SAGAW_4LVL, .awlvl = DMAR_CTX2_AW_4LVL,
+	    .pglvl = 4},
+	{.agaw = 57, .cap = DMAR_CAP_SAGAW_5LVL, .awlvl = DMAR_CTX2_AW_5LVL,
+	    .pglvl = 5},
+	{.agaw = 64, .cap = DMAR_CAP_SAGAW_6LVL, .awlvl = DMAR_CTX2_AW_6LVL,
+	    .pglvl = 6}
+};
+#define SIZEOF_SAGAW_BITS (sizeof(sagaw_bits) / sizeof(sagaw_bits[0]))
+
+bool
+dmar_pglvl_supported(struct dmar_unit *unit, int pglvl)
+{
+	int i;
+
+	for (i = 0; i < SIZEOF_SAGAW_BITS; i++) {
+		if (sagaw_bits[i].pglvl != pglvl)
+			continue;
+		if ((DMAR_CAP_SAGAW(unit->hw_cap) & sagaw_bits[i].cap) != 0)
+			return (true);
+	}
+	return (false);
+}
+
+int
+ctx_set_agaw(struct dmar_ctx *ctx, int mgaw)
+{
+	int sagaw, i;
+
+	ctx->mgaw = mgaw;
+	sagaw = DMAR_CAP_SAGAW(ctx->dmar->hw_cap);
+	for (i = 0; i < SIZEOF_SAGAW_BITS; i++) {
+		if (sagaw_bits[i].agaw >= mgaw) {
+			ctx->agaw = sagaw_bits[i].agaw;
+			ctx->pglvl = sagaw_bits[i].pglvl;
+			ctx->awlvl = sagaw_bits[i].awlvl;
+			return (0);
+		}
+	}
+	device_printf(ctx->dmar->dev,
+	    "context request mgaw %d for pci%d:%d:%d:%d, "
+	    "no agaw found, sagaw %x\n", mgaw, ctx->dmar->segment, ctx->bus,
+	     ctx->slot, ctx->func, sagaw);
+	return (EINVAL);
+}
+
+/*
+ * Find a best fit mgaw for the given maxaddr:
+ *   - if allow_less is false, must find sagaw which maps all requested
+ *     addresses (used by identity mappings);
+ *   - if allow_less is true, and no supported sagaw can map all requested
+ *     address space, accept the biggest sagaw, whatever is it.
+ */
+int
+dmar_maxaddr2mgaw(struct dmar_unit *unit, dmar_gaddr_t maxaddr, bool allow_less)
+{
+	int i;
+
+	for (i = 0; i < SIZEOF_SAGAW_BITS; i++) {
+		if ((1ULL << sagaw_bits[i].agaw) >= maxaddr &&
+		    (DMAR_CAP_SAGAW(unit->hw_cap) & sagaw_bits[i].cap) != 0)
+			break;
+	}
+	if (allow_less && i == SIZEOF_SAGAW_BITS) {
+		do {
+			i--;
+		} while ((DMAR_CAP_SAGAW(unit->hw_cap) & sagaw_bits[i].cap)
+		    == 0);
+	}
+	if (i < SIZEOF_SAGAW_BITS)
+		return (sagaw_bits[i].agaw);
+	KASSERT(0, ("no mgaw for maxaddr %jx allow_less %d",
+	    (uintmax_t) maxaddr, allow_less));
+	return (-1);
+}
+
+/*
+ * Calculate the total amount of page table pages needed to map the
+ * whole bus address space on the context with the selected agaw.
+ */
+vm_pindex_t
+pglvl_max_pages(int pglvl)
+{
+	vm_pindex_t res;
+	int i;
+
+	for (res = 0, i = pglvl; i > 0; i--) {
+		res *= DMAR_NPTEPG;
+		res++;
+	}
+	return (res);
+}
+
+/*
+ * Return true if the page table level lvl supports the superpage for
+ * the context ctx.
+ */
+int
+ctx_is_sp_lvl(struct dmar_ctx *ctx, int lvl)
+{
+	int alvl, cap_sps;
+	static const int sagaw_sp[] = {
+		DMAR_CAP_SPS_2M,
+		DMAR_CAP_SPS_1G,
+		DMAR_CAP_SPS_512G,
+		DMAR_CAP_SPS_1T
+	};
+
+	alvl = ctx->pglvl - lvl - 1;
+	cap_sps = DMAR_CAP_SPS(ctx->dmar->hw_cap);
+	return (alvl < sizeof(sagaw_sp) / sizeof(sagaw_sp[0]) &&
+	    (sagaw_sp[alvl] & cap_sps) != 0);
+}
+
+dmar_gaddr_t
+pglvl_page_size(int total_pglvl, int lvl)
+{
+	int rlvl;
+	static const dmar_gaddr_t pg_sz[] = {
+		(dmar_gaddr_t)DMAR_PAGE_SIZE,
+		(dmar_gaddr_t)DMAR_PAGE_SIZE << DMAR_NPTEPGSHIFT,
+		(dmar_gaddr_t)DMAR_PAGE_SIZE << (2 * DMAR_NPTEPGSHIFT),
+		(dmar_gaddr_t)DMAR_PAGE_SIZE << (3 * DMAR_NPTEPGSHIFT),
+		(dmar_gaddr_t)DMAR_PAGE_SIZE << (4 * DMAR_NPTEPGSHIFT),
+		(dmar_gaddr_t)DMAR_PAGE_SIZE << (5 * DMAR_NPTEPGSHIFT)
+	};
+
+	KASSERT(lvl >= 0 && lvl < total_pglvl,
+	    ("total %d lvl %d", total_pglvl, lvl));
+	rlvl = total_pglvl - lvl - 1;
+	KASSERT(rlvl < sizeof(pg_sz) / sizeof(pg_sz[0]),
+	    ("sizeof pg_sz lvl %d", lvl));
+	return (pg_sz[rlvl]);
+}
+
+dmar_gaddr_t
+ctx_page_size(struct dmar_ctx *ctx, int lvl)
+{
+
+	return (pglvl_page_size(ctx->pglvl, lvl));
+}
+
+int
+calc_am(struct dmar_unit *unit, dmar_gaddr_t base, dmar_gaddr_t size,
+    dmar_gaddr_t *isizep)
+{
+	dmar_gaddr_t isize;
+	int am;
+
+	for (am = DMAR_CAP_MAMV(unit->hw_cap);; am--) {
+		isize = 1ULL << (am + DMAR_PAGE_SHIFT);
+		if ((base & (isize - 1)) == 0 && size >= isize)
+			break;
+		if (am == 0)
+			break;
+	}
+	*isizep = isize;
+	return (am);
+}
+
+dmar_haddr_t dmar_high;
+int haw;
+int dmar_tbl_pagecnt;
+
+vm_page_t
+dmar_pgalloc(vm_object_t obj, vm_pindex_t idx, int flags)
+{
+	vm_page_t m;
+	int zeroed;
+
+	zeroed = (flags & DMAR_PGF_ZERO) != 0 ? VM_ALLOC_ZERO : 0;
+	for (;;) {
+		if ((flags & DMAR_PGF_OBJL) == 0)
+			VM_OBJECT_WLOCK(obj);
+		m = vm_page_lookup(obj, idx);
+		if ((flags & DMAR_PGF_NOALLOC) != 0 || m != NULL) {
+			if ((flags & DMAR_PGF_OBJL) == 0)
+				VM_OBJECT_WUNLOCK(obj);
+			break;
+		}
+		m = vm_page_alloc_contig(obj, idx, VM_ALLOC_NOBUSY |
+		    VM_ALLOC_SYSTEM | VM_ALLOC_NODUMP | zeroed, 1, 0,
+		    dmar_high, PAGE_SIZE, 0, VM_MEMATTR_DEFAULT);
+		if ((flags & DMAR_PGF_OBJL) == 0)
+			VM_OBJECT_WUNLOCK(obj);
+		if (m != NULL) {
+			if (zeroed && (m->flags & PG_ZERO) == 0)
+				pmap_zero_page(m);
+			atomic_add_int(&dmar_tbl_pagecnt, 1);
+			break;
+		}
+		if ((flags & DMAR_PGF_WAITOK) == 0)
+			break;
+		if ((flags & DMAR_PGF_OBJL) != 0)
+			VM_OBJECT_WUNLOCK(obj);
+		VM_WAIT;
+		if ((flags & DMAR_PGF_OBJL) != 0)
+			VM_OBJECT_WLOCK(obj);
+	}
+	return (m);
+}
+
+void
+dmar_pgfree(vm_object_t obj, vm_pindex_t idx, int flags)
+{
+	vm_page_t m;
+
+	if ((flags & DMAR_PGF_OBJL) == 0)
+		VM_OBJECT_WLOCK(obj);
+	m = vm_page_lookup(obj, idx);
+	if (m != NULL) {
+		vm_page_free(m);
+		atomic_subtract_int(&dmar_tbl_pagecnt, 1);
+	}
+	if ((flags & DMAR_PGF_OBJL) == 0)
+		VM_OBJECT_WUNLOCK(obj);
+}
+
+void *
+dmar_map_pgtbl(vm_object_t obj, vm_pindex_t idx, int flags,
+    struct sf_buf **sf)
+{
+	vm_page_t m;
+	bool allocated;
+
+	if ((flags & DMAR_PGF_OBJL) == 0)
+		VM_OBJECT_WLOCK(obj);
+	m = vm_page_lookup(obj, idx);
+	if (m == NULL && (flags & DMAR_PGF_ALLOC) != 0) {
+		m = dmar_pgalloc(obj, idx, flags | DMAR_PGF_OBJL);
+		allocated = true;
+	} else
+		allocated = false;
+	if (m == NULL) {
+		if ((flags & DMAR_PGF_OBJL) == 0)
+			VM_OBJECT_WUNLOCK(obj);
+		return (NULL);
+	}
+	/* Sleepable allocations cannot fail. */
+	if ((flags & DMAR_PGF_WAITOK) != 0)
+		VM_OBJECT_WUNLOCK(obj);
+	sched_pin();
+	*sf = sf_buf_alloc(m, SFB_CPUPRIVATE | ((flags & DMAR_PGF_WAITOK)
+	    == 0 ? SFB_NOWAIT : 0));
+	if (*sf == NULL) {
+		sched_unpin();
+		if (allocated) {
+			VM_OBJECT_ASSERT_WLOCKED(obj);
+			dmar_pgfree(obj, m->pindex, flags | DMAR_PGF_OBJL);
+		}
+		if ((flags & DMAR_PGF_OBJL) == 0)
+			VM_OBJECT_WUNLOCK(obj);
+		return (NULL);
+	}
+	if ((flags & (DMAR_PGF_WAITOK | DMAR_PGF_OBJL)) ==
+	    (DMAR_PGF_WAITOK | DMAR_PGF_OBJL))
+		VM_OBJECT_WLOCK(obj);
+	else if ((flags & (DMAR_PGF_WAITOK | DMAR_PGF_OBJL)) == 0)
+		VM_OBJECT_WUNLOCK(obj);
+	return ((void *)sf_buf_kva(*sf));
+}
+
+void
+dmar_unmap_pgtbl(struct sf_buf *sf, bool coherent)
+{
+	vm_page_t m;
+
+	m = sf_buf_page(sf);
+	sf_buf_free(sf);
+	sched_unpin();
+
+	/*
+	 * If DMAR does not snoop paging structures accesses, flush
+	 * CPU cache to memory.
+	 */
+	if (!coherent)
+		pmap_invalidate_cache_pages(&m, 1);
+}
+
+/*
+ * Load the root entry pointer into the hardware, busily waiting for
+ * the completion.
+ */
+int
+dmar_load_root_entry_ptr(struct dmar_unit *unit)
+{
+	vm_page_t root_entry;
+
+	/*
+	 * Access to the GCMD register must be serialized while the
+	 * command is submitted.
+	 */
+	DMAR_ASSERT_LOCKED(unit);
+
+	/* VM_OBJECT_RLOCK(unit->ctx_obj); */
+	VM_OBJECT_WLOCK(unit->ctx_obj);
+	root_entry = vm_page_lookup(unit->ctx_obj, 0);
+	/* VM_OBJECT_RUNLOCK(unit->ctx_obj); */
+	VM_OBJECT_WUNLOCK(unit->ctx_obj);
+	dmar_write8(unit, DMAR_RTADDR_REG, VM_PAGE_TO_PHYS(root_entry));
+	dmar_write4(unit, DMAR_GCMD_REG, unit->hw_gcmd | DMAR_GCMD_SRTP);
+	/* XXXKIB should have a timeout */
+	while ((dmar_read4(unit, DMAR_GSTS_REG) & DMAR_GSTS_RTPS) == 0)
+		cpu_spinwait();
+	return (0);
+}
+
+/*
+ * Globally invalidate the context entries cache, busily waiting for
+ * the completion.
+ */
+int
+dmar_inv_ctx_glob(struct dmar_unit *unit)
+{
+
+	/*
+	 * Access to the CCMD register must be serialized while the
+	 * command is submitted.
+	 */
+	DMAR_ASSERT_LOCKED(unit);
+	KASSERT(!unit->qi_enabled, ("QI enabled"));
+
+	/*
+	 * The DMAR_CCMD_ICC bit in the upper dword should be written
+	 * after the low dword write is completed.  Amd64
+	 * dmar_write8() does not have this issue, i386 dmar_write8()
+	 * writes the upper dword last.
+	 */
+	dmar_write8(unit, DMAR_CCMD_REG, DMAR_CCMD_ICC | DMAR_CCMD_CIRG_GLOB);
+	/* XXXKIB should have a timeout */
+	while ((dmar_read4(unit, DMAR_CCMD_REG + 4) & DMAR_CCMD_ICC32) != 0)
+		cpu_spinwait();
+	return (0);
+}
+
+/*
+ * Globally invalidate the IOTLB, busily waiting for the completion.
+ */
+int
+dmar_inv_iotlb_glob(struct dmar_unit *unit)
+{
+	int reg;
+
+	DMAR_ASSERT_LOCKED(unit);
+	KASSERT(!unit->qi_enabled, ("QI enabled"));
+
+	reg = 16 * DMAR_ECAP_IRO(unit->hw_ecap);
+	/* See a comment about DMAR_CCMD_ICC in dmar_inv_ctx_glob. */
+	dmar_write8(unit, reg + DMAR_IOTLB_REG_OFF, DMAR_IOTLB_IVT |
+	    DMAR_IOTLB_IIRG_GLB | DMAR_IOTLB_DR | DMAR_IOTLB_DW);
+	/* XXXKIB should have a timeout */
+	while ((dmar_read4(unit, reg + DMAR_IOTLB_REG_OFF + 4) &
+	    DMAR_IOTLB_IVT32) != 0)
+		cpu_spinwait();
+	return (0);
+}
+
+/*
+ * Flush the chipset write buffers.  See 11.1 "Write Buffer Flushing"
+ * in the architecture specification.
+ */
+int
+dmar_flush_write_bufs(struct dmar_unit *unit)
+{
+
+	DMAR_ASSERT_LOCKED(unit);
+
+	/*
+	 * DMAR_GCMD_WBF is only valid when CAP_RWBF is reported.
+	 */
+	KASSERT((unit->hw_cap & DMAR_CAP_RWBF) != 0,
+	    ("dmar%d: no RWBF", unit->unit));
+
+	dmar_write4(unit, DMAR_GCMD_REG, unit->hw_gcmd | DMAR_GCMD_WBF);
+	/* XXXKIB should have a timeout */
+	while ((dmar_read4(unit, DMAR_GSTS_REG) & DMAR_GSTS_WBFS) == 0)
+		cpu_spinwait();
+	return (0);
+}
+
+int
+dmar_enable_translation(struct dmar_unit *unit)
+{
+
+	DMAR_ASSERT_LOCKED(unit);
+	unit->hw_gcmd |= DMAR_GCMD_TE;
+	dmar_write4(unit, DMAR_GCMD_REG, unit->hw_gcmd);
+	/* XXXKIB should have a timeout */
+	while ((dmar_read4(unit, DMAR_GSTS_REG) & DMAR_GSTS_TES) == 0)
+		cpu_spinwait();
+	return (0);
+}
+
+int
+dmar_disable_translation(struct dmar_unit *unit)
+{
+
+	DMAR_ASSERT_LOCKED(unit);
+	unit->hw_gcmd &= ~DMAR_GCMD_TE;
+	dmar_write4(unit, DMAR_GCMD_REG, unit->hw_gcmd);
+	/* XXXKIB should have a timeout */
+	while ((dmar_read4(unit, DMAR_GSTS_REG) & DMAR_GSTS_TES) != 0)
+		cpu_spinwait();
+	return (0);
+}
+
+#define BARRIER_F				\
+	u_int f_done, f_inproc, f_wakeup;	\
+						\
+	f_done = 1 << (barrier_id * 3);		\
+	f_inproc = 1 << (barrier_id * 3 + 1);	\
+	f_wakeup = 1 << (barrier_id * 3 + 2)
+
+bool
+dmar_barrier_enter(struct dmar_unit *dmar, u_int barrier_id)
+{
+	BARRIER_F;
+
+	DMAR_LOCK(dmar);
+	if ((dmar->barrier_flags & f_done) != 0) {
+		DMAR_UNLOCK(dmar);
+		return (false);
+	}
+
+	if ((dmar->barrier_flags & f_inproc) != 0) {
+		while ((dmar->barrier_flags & f_inproc) != 0) {
+			dmar->barrier_flags |= f_wakeup;
+			msleep(&dmar->barrier_flags, &dmar->lock, 0,
+			    "dmarb", 0);
+		}
+		KASSERT((dmar->barrier_flags & f_done) != 0,
+		    ("dmar%d barrier %d missing done", dmar->unit, barrier_id));
+		DMAR_UNLOCK(dmar);
+		return (false);
+	}
+
+	dmar->barrier_flags |= f_inproc;
+	DMAR_UNLOCK(dmar);
+	return (true);
+}
+
+void
+dmar_barrier_exit(struct dmar_unit *dmar, u_int barrier_id)
+{
+	BARRIER_F;
+
+	DMAR_ASSERT_LOCKED(dmar);
+	KASSERT((dmar->barrier_flags & (f_done | f_inproc)) == f_inproc,
+	    ("dmar%d barrier %d missed entry", dmar->unit, barrier_id));
+	dmar->barrier_flags |= f_done;
+	if ((dmar->barrier_flags & f_wakeup) != 0)
+		wakeup(&dmar->barrier_flags);
+	dmar->barrier_flags &= ~(f_inproc | f_wakeup);
+	DMAR_UNLOCK(dmar);
+}
+
+int dmar_match_verbose;
+
+static SYSCTL_NODE(_hw, OID_AUTO, dmar, CTLFLAG_RD, NULL,
+    "");
+SYSCTL_INT(_hw_dmar, OID_AUTO, tbl_pagecnt, CTLFLAG_RD | CTLFLAG_TUN,
+    &dmar_tbl_pagecnt, 0,
+    "Count of pages used for DMAR pagetables");
+SYSCTL_INT(_hw_dmar, OID_AUTO, match_verbose, CTLFLAG_RW | CTLFLAG_TUN,
+    &dmar_match_verbose, 0,
+    "Verbose matching of the PCI devices to DMAR paths");
+#ifdef INVARIANTS
+int dmar_check_free;
+SYSCTL_INT(_hw_dmar, OID_AUTO, check_free, CTLFLAG_RW | CTLFLAG_TUN,
+    &dmar_check_free, 0,
+    "Check the GPA RBtree for free_down and free_after validity");
+#endif
+
diff --git a/sys/x86/x86/busdma_bounce.c b/sys/x86/x86/busdma_bounce.c
new file mode 100644
index 00000000000..a767bff7409
--- /dev/null
+++ b/sys/x86/x86/busdma_bounce.c
@@ -0,0 +1,1080 @@
+/*-
+ * Copyright (c) 1997, 1998 Justin T. Gibbs.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that 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. 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/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/bus.h>
+#include <sys/interrupt.h>
+#include <sys/kernel.h>
+#include <sys/ktr.h>
+#include <sys/lock.h>
+#include <sys/proc.h>
+#include <sys/memdesc.h>
+#include <sys/mutex.h>
+#include <sys/sysctl.h>
+#include <sys/uio.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 <machine/atomic.h>
+#include <machine/bus.h>
+#include <machine/md_var.h>
+#include <machine/specialreg.h>
+#include <x86/include/busdma_impl.h>
+
+#ifdef __i386__
+#define MAX_BPAGES 512
+#else
+#define MAX_BPAGES 8192
+#endif
+#define BUS_DMA_COULD_BOUNCE	BUS_DMA_BUS3
+#define BUS_DMA_MIN_ALLOC_COMP	BUS_DMA_BUS4
+
+struct bounce_zone;
+
+struct bus_dma_tag {
+	struct bus_dma_tag_common common;
+	int		  map_count;
+	bus_dma_segment_t *segments;
+	struct bounce_zone *bounce_zone;
+};
+
+struct bounce_page {
+	vm_offset_t	vaddr;		/* kva of bounce buffer */
+	bus_addr_t	busaddr;	/* Physical address */
+	vm_offset_t	datavaddr;	/* kva of client data */
+	bus_addr_t	dataaddr;	/* client physical address */
+	bus_size_t	datacount;	/* client data count */
+	STAILQ_ENTRY(bounce_page) links;
+};
+
+int busdma_swi_pending;
+
+struct bounce_zone {
+	STAILQ_ENTRY(bounce_zone) links;
+	STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
+	int		total_bpages;
+	int		free_bpages;
+	int		reserved_bpages;
+	int		active_bpages;
+	int		total_bounced;
+	int		total_deferred;
+	int		map_count;
+	bus_size_t	alignment;
+	bus_addr_t	lowaddr;
+	char		zoneid[8];
+	char		lowaddrid[20];
+	struct sysctl_ctx_list sysctl_tree;
+	struct sysctl_oid *sysctl_tree_top;
+};
+
+static struct mtx bounce_lock;
+static int total_bpages;
+static int busdma_zonecount;
+static STAILQ_HEAD(, bounce_zone) bounce_zone_list;
+
+static SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters");
+SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0,
+	   "Total bounce pages");
+
+struct bus_dmamap {
+	struct bp_list	       bpages;
+	int		       pagesneeded;
+	int		       pagesreserved;
+	bus_dma_tag_t	       dmat;
+	struct memdesc	       mem;
+	bus_dmamap_callback_t *callback;
+	void		      *callback_arg;
+	STAILQ_ENTRY(bus_dmamap) links;
+};
+
+static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
+static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist;
+static struct bus_dmamap nobounce_dmamap, contig_dmamap;
+
+static void init_bounce_pages(void *dummy);
+static int alloc_bounce_zone(bus_dma_tag_t dmat);
+static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages);
+static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
+				int commit);
+static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map,
+				  vm_offset_t vaddr, bus_addr_t addr,
+				  bus_size_t size);
+static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage);
+int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr);
+static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
+				    pmap_t pmap, void *buf, bus_size_t buflen,
+				    int flags);
+static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
+				   vm_paddr_t buf, bus_size_t buflen,
+				   int flags);
+static int _bus_dmamap_reserve_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
+				     int flags);
+
+#ifdef XEN
+#undef pmap_kextract
+#define pmap_kextract pmap_kextract_ma
+#endif
+
+/*
+ * Allocate a device specific dma_tag.
+ */
+static int
+bounce_bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
+    bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
+    bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize,
+    int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
+    void *lockfuncarg, bus_dma_tag_t *dmat)
+{
+	bus_dma_tag_t newtag;
+	int error;
+
+	*dmat = NULL;
+	error = common_bus_dma_tag_create(parent != NULL ? &parent->common :
+	    NULL, alignment, boundary, lowaddr, highaddr, filter, filterarg,
+	    maxsize, nsegments, maxsegsz, flags, lockfunc, lockfuncarg,
+	    sizeof (struct bus_dma_tag), (void **)&newtag);
+	if (error != 0)
+		return (error);
+
+	newtag->common.impl = &bus_dma_bounce_impl;
+	newtag->map_count = 0;
+	newtag->segments = NULL;
+
+	if (parent != NULL && ((newtag->common.filter != NULL) ||
+	    ((parent->common.flags & BUS_DMA_COULD_BOUNCE) != 0)))
+		newtag->common.flags |= BUS_DMA_COULD_BOUNCE;
+
+	if (newtag->common.lowaddr < ptoa((vm_paddr_t)Maxmem) ||
+	    newtag->common.alignment > 1)
+		newtag->common.flags |= BUS_DMA_COULD_BOUNCE;
+
+	if (((newtag->common.flags & BUS_DMA_COULD_BOUNCE) != 0) &&
+	    (flags & BUS_DMA_ALLOCNOW) != 0) {
+		struct bounce_zone *bz;
+
+		/* Must bounce */
+		if ((error = alloc_bounce_zone(newtag)) != 0) {
+			free(newtag, M_DEVBUF);
+			return (error);
+		}
+		bz = newtag->bounce_zone;
+
+		if (ptoa(bz->total_bpages) < maxsize) {
+			int pages;
+
+			pages = atop(maxsize) - bz->total_bpages;
+
+			/* Add pages to our bounce pool */
+			if (alloc_bounce_pages(newtag, pages) < pages)
+				error = ENOMEM;
+		}
+		/* Performed initial allocation */
+		newtag->common.flags |= BUS_DMA_MIN_ALLOC_COMP;
+	} else
+		error = 0;
+	
+	if (error != 0)
+		free(newtag, M_DEVBUF);
+	else
+		*dmat = newtag;
+	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
+	    __func__, newtag, (newtag != NULL ? newtag->common.flags : 0),
+	    error);
+	return (error);
+}
+
+static int
+bounce_bus_dma_tag_destroy(bus_dma_tag_t dmat)
+{
+	bus_dma_tag_t dmat_copy, parent;
+	int error;
+
+	error = 0;
+	dmat_copy = dmat;
+
+	if (dmat != NULL) {
+		if (dmat->map_count != 0) {
+			error = EBUSY;
+			goto out;
+		}
+		while (dmat != NULL) {
+			parent = (bus_dma_tag_t)dmat->common.parent;
+			atomic_subtract_int(&dmat->common.ref_count, 1);
+			if (dmat->common.ref_count == 0) {
+				if (dmat->segments != NULL)
+					free(dmat->segments, M_DEVBUF);
+				free(dmat, M_DEVBUF);
+				/*
+				 * Last reference count, so
+				 * release our reference
+				 * count on our parent.
+				 */
+				dmat = parent;
+			} else
+				dmat = NULL;
+		}
+	}
+out:
+	CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error);
+	return (error);
+}
+
+/*
+ * Allocate a handle for mapping from kva/uva/physical
+ * address space into bus device space.
+ */
+static int
+bounce_bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
+{
+	struct bounce_zone *bz;
+	int error, maxpages, pages;
+
+	error = 0;
+
+	if (dmat->segments == NULL) {
+		dmat->segments = (bus_dma_segment_t *)malloc(
+		    sizeof(bus_dma_segment_t) * dmat->common.nsegments,
+		    M_DEVBUF, M_NOWAIT);
+		if (dmat->segments == NULL) {
+			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
+			    __func__, dmat, ENOMEM);
+			return (ENOMEM);
+		}
+	}
+
+	/*
+	 * Bouncing might be required if the driver asks for an active
+	 * exclusion region, a data alignment that is stricter than 1, and/or
+	 * an active address boundary.
+	 */
+	if (dmat->common.flags & BUS_DMA_COULD_BOUNCE) {
+		/* Must bounce */
+		if (dmat->bounce_zone == NULL) {
+			if ((error = alloc_bounce_zone(dmat)) != 0)
+				return (error);
+		}
+		bz = dmat->bounce_zone;
+
+		*mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF,
+		    M_NOWAIT | M_ZERO);
+		if (*mapp == NULL) {
+			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
+			    __func__, dmat, ENOMEM);
+			return (ENOMEM);
+		}
+
+		/* Initialize the new map */
+		STAILQ_INIT(&((*mapp)->bpages));
+
+		/*
+		 * Attempt to add pages to our pool on a per-instance
+		 * basis up to a sane limit.
+		 */
+		if (dmat->common.alignment > 1)
+			maxpages = MAX_BPAGES;
+		else
+			maxpages = MIN(MAX_BPAGES, Maxmem -
+			    atop(dmat->common.lowaddr));
+		if ((dmat->common.flags & BUS_DMA_MIN_ALLOC_COMP) == 0 ||
+		    (bz->map_count > 0 && bz->total_bpages < maxpages)) {
+			pages = MAX(atop(dmat->common.maxsize), 1);
+			pages = MIN(maxpages - bz->total_bpages, pages);
+			pages = MAX(pages, 1);
+			if (alloc_bounce_pages(dmat, pages) < pages)
+				error = ENOMEM;
+			if ((dmat->common.flags & BUS_DMA_MIN_ALLOC_COMP)
+			    == 0) {
+				if (error == 0) {
+					dmat->common.flags |=
+					    BUS_DMA_MIN_ALLOC_COMP;
+				}
+			} else
+				error = 0;
+		}
+		bz->map_count++;
+	} else {
+		*mapp = NULL;
+	}
+	if (error == 0)
+		dmat->map_count++;
+	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
+	    __func__, dmat, dmat->common.flags, error);
+	return (error);
+}
+
+/*
+ * Destroy a handle for mapping from kva/uva/physical
+ * address space into bus device space.
+ */
+static int
+bounce_bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
+{
+
+	if (map != NULL && map != &nobounce_dmamap && map != &contig_dmamap) {
+		if (STAILQ_FIRST(&map->bpages) != NULL) {
+			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
+			    __func__, dmat, EBUSY);
+			return (EBUSY);
+		}
+		if (dmat->bounce_zone)
+			dmat->bounce_zone->map_count--;
+		free(map, M_DEVBUF);
+	}
+	dmat->map_count--;
+	CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat);
+	return (0);
+}
+
+
+/*
+ * Allocate a piece of memory that can be efficiently mapped into
+ * bus device space based on the constraints lited in the dma tag.
+ * A dmamap to for use with dmamap_load is also allocated.
+ */
+static int
+bounce_bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
+    bus_dmamap_t *mapp)
+{
+	vm_memattr_t attr;
+	int mflags;
+
+	if (flags & BUS_DMA_NOWAIT)
+		mflags = M_NOWAIT;
+	else
+		mflags = M_WAITOK;
+
+	/* If we succeed, no mapping/bouncing will be required */
+	*mapp = NULL;
+
+	if (dmat->segments == NULL) {
+		dmat->segments = (bus_dma_segment_t *)malloc(
+		    sizeof(bus_dma_segment_t) * dmat->common.nsegments,
+		    M_DEVBUF, mflags);
+		if (dmat->segments == NULL) {
+			CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
+			    __func__, dmat, dmat->common.flags, ENOMEM);
+			return (ENOMEM);
+		}
+	}
+	if (flags & BUS_DMA_ZERO)
+		mflags |= M_ZERO;
+	if (flags & BUS_DMA_NOCACHE)
+		attr = VM_MEMATTR_UNCACHEABLE;
+	else
+		attr = VM_MEMATTR_DEFAULT;
+
+	/* 
+	 * XXX:
+	 * (dmat->alignment < dmat->maxsize) is just a quick hack; the exact
+	 * alignment guarantees of malloc need to be nailed down, and the
+	 * code below should be rewritten to take that into account.
+	 *
+	 * In the meantime, we'll warn the user if malloc gets it wrong.
+	 */
+	if ((dmat->common.maxsize <= PAGE_SIZE) &&
+	   (dmat->common.alignment < dmat->common.maxsize) &&
+	    dmat->common.lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
+	    attr == VM_MEMATTR_DEFAULT) {
+		*vaddr = malloc(dmat->common.maxsize, M_DEVBUF, mflags);
+	} else if (dmat->common.nsegments >= btoc(dmat->common.maxsize) &&
+	    dmat->common.alignment <= PAGE_SIZE &&
+	    (dmat->common.boundary == 0 ||
+	    dmat->common.boundary >= dmat->common.lowaddr)) {
+		/* Page-based multi-segment allocations allowed */
+		*vaddr = (void *)kmem_alloc_attr(kernel_arena,
+		    dmat->common.maxsize, mflags, 0ul, dmat->common.lowaddr,
+		    attr);
+		*mapp = &contig_dmamap;
+	} else {
+		*vaddr = (void *)kmem_alloc_contig(kernel_arena,
+		    dmat->common.maxsize, mflags, 0ul, dmat->common.lowaddr,
+		    dmat->common.alignment != 0 ? dmat->common.alignment : 1ul,
+		    dmat->common.boundary, attr);
+		*mapp = &contig_dmamap;
+	}
+	if (*vaddr == NULL) {
+		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
+		    __func__, dmat, dmat->common.flags, ENOMEM);
+		return (ENOMEM);
+	} else if (vtophys(*vaddr) & (dmat->common.alignment - 1)) {
+		printf("bus_dmamem_alloc failed to align memory properly.\n");
+	}
+	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
+	    __func__, dmat, dmat->common.flags, 0);
+	return (0);
+}
+
+/*
+ * Free a piece of memory and it's allociated dmamap, that was allocated
+ * via bus_dmamem_alloc.  Make the same choice for free/contigfree.
+ */
+static void
+bounce_bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
+{
+	/*
+	 * dmamem does not need to be bounced, so the map should be
+	 * NULL if malloc() was used and contig_dmamap if
+	 * kmem_alloc_contig() was used.
+	 */
+	if (!(map == NULL || map == &contig_dmamap))
+		panic("bus_dmamem_free: Invalid map freed\n");
+	if (map == NULL)
+		free(vaddr, M_DEVBUF);
+	else
+		kmem_free(kernel_arena, (vm_offset_t)vaddr,
+		    dmat->common.maxsize);
+	CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat,
+	    dmat->common.flags);
+}
+
+static void
+_bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
+    bus_size_t buflen, int flags)
+{
+	bus_addr_t curaddr;
+	bus_size_t sgsize;
+
+	if ((map != &nobounce_dmamap && map->pagesneeded == 0)) {
+		/*
+		 * Count the number of bounce pages
+		 * needed in order to complete this transfer
+		 */
+		curaddr = buf;
+		while (buflen != 0) {
+			sgsize = MIN(buflen, dmat->common.maxsegsz);
+			if (bus_dma_run_filter(&dmat->common, curaddr)) {
+				sgsize = MIN(sgsize, PAGE_SIZE);
+				map->pagesneeded++;
+			}
+			curaddr += sgsize;
+			buflen -= sgsize;
+		}
+		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
+	}
+}
+
+static void
+_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
+    void *buf, bus_size_t buflen, int flags)
+{
+	vm_offset_t vaddr;
+	vm_offset_t vendaddr;
+	bus_addr_t paddr;
+	bus_size_t sg_len;
+
+	if ((map != &nobounce_dmamap && map->pagesneeded == 0)) {
+		CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
+		    "alignment= %d", dmat->common.lowaddr,
+		    ptoa((vm_paddr_t)Maxmem),
+		    dmat->common.boundary, dmat->common.alignment);
+		CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d",
+		    map, &nobounce_dmamap, map->pagesneeded);
+		/*
+		 * Count the number of bounce pages
+		 * needed in order to complete this transfer
+		 */
+		vaddr = (vm_offset_t)buf;
+		vendaddr = (vm_offset_t)buf + buflen;
+
+		while (vaddr < vendaddr) {
+			sg_len = PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK);
+			if (pmap == kernel_pmap)
+				paddr = pmap_kextract(vaddr);
+			else
+				paddr = pmap_extract(pmap, vaddr);
+			if (bus_dma_run_filter(&dmat->common, paddr) != 0) {
+				sg_len = roundup2(sg_len,
+				    dmat->common.alignment);
+				map->pagesneeded++;
+			}
+			vaddr += sg_len;
+		}
+		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
+	}
+}
+
+static int
+_bus_dmamap_reserve_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int flags)
+{
+
+	/* Reserve Necessary Bounce Pages */
+	mtx_lock(&bounce_lock);
+	if (flags & BUS_DMA_NOWAIT) {
+		if (reserve_bounce_pages(dmat, map, 0) != 0) {
+			mtx_unlock(&bounce_lock);
+			return (ENOMEM);
+		}
+	} else {
+		if (reserve_bounce_pages(dmat, map, 1) != 0) {
+			/* Queue us for resources */
+			STAILQ_INSERT_TAIL(&bounce_map_waitinglist, map, links);
+			mtx_unlock(&bounce_lock);
+			return (EINPROGRESS);
+		}
+	}
+	mtx_unlock(&bounce_lock);
+
+	return (0);
+}
+
+/*
+ * Add a single contiguous physical range to the segment list.
+ */
+static int
+_bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr,
+    bus_size_t sgsize, bus_dma_segment_t *segs, int *segp)
+{
+	bus_addr_t baddr, bmask;
+	int seg;
+
+	/*
+	 * Make sure we don't cross any boundaries.
+	 */
+	bmask = ~(dmat->common.boundary - 1);
+	if (dmat->common.boundary > 0) {
+		baddr = (curaddr + dmat->common.boundary) & bmask;
+		if (sgsize > (baddr - curaddr))
+			sgsize = (baddr - curaddr);
+	}
+
+	/*
+	 * Insert chunk into a segment, coalescing with
+	 * previous segment if possible.
+	 */
+	seg = *segp;
+	if (seg == -1) {
+		seg = 0;
+		segs[seg].ds_addr = curaddr;
+		segs[seg].ds_len = sgsize;
+	} else {
+		if (curaddr == segs[seg].ds_addr + segs[seg].ds_len &&
+		    (segs[seg].ds_len + sgsize) <= dmat->common.maxsegsz &&
+		    (dmat->common.boundary == 0 ||
+		     (segs[seg].ds_addr & bmask) == (curaddr & bmask)))
+			segs[seg].ds_len += sgsize;
+		else {
+			if (++seg >= dmat->common.nsegments)
+				return (0);
+			segs[seg].ds_addr = curaddr;
+			segs[seg].ds_len = sgsize;
+		}
+	}
+	*segp = seg;
+	return (sgsize);
+}
+
+/*
+ * Utility function to load a physical buffer.  segp contains
+ * the starting segment on entrace, and the ending segment on exit.
+ */
+static int
+bounce_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
+    vm_paddr_t buf, bus_size_t buflen, int flags, bus_dma_segment_t *segs,
+    int *segp)
+{
+	bus_size_t sgsize;
+	bus_addr_t curaddr;
+	int error;
+
+	if (map == NULL || map == &contig_dmamap)
+		map = &nobounce_dmamap;
+
+	if (segs == NULL)
+		segs = dmat->segments;
+
+	if ((dmat->common.flags & BUS_DMA_COULD_BOUNCE) != 0) {
+		_bus_dmamap_count_phys(dmat, map, buf, buflen, flags);
+		if (map->pagesneeded != 0) {
+			error = _bus_dmamap_reserve_pages(dmat, map, flags);
+			if (error)
+				return (error);
+		}
+	}
+
+	while (buflen > 0) {
+		curaddr = buf;
+		sgsize = MIN(buflen, dmat->common.maxsegsz);
+		if (((dmat->common.flags & BUS_DMA_COULD_BOUNCE) != 0) &&
+		    map->pagesneeded != 0 &&
+		    bus_dma_run_filter(&dmat->common, curaddr)) {
+			sgsize = MIN(sgsize, PAGE_SIZE);
+			curaddr = add_bounce_page(dmat, map, 0, curaddr,
+			    sgsize);
+		}
+		sgsize = _bus_dmamap_addseg(dmat, map, curaddr, sgsize, segs,
+		    segp);
+		if (sgsize == 0)
+			break;
+		buf += sgsize;
+		buflen -= sgsize;
+	}
+
+	/*
+	 * Did we fit?
+	 */
+	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
+}
+
+/*
+ * Utility function to load a linear buffer.  segp contains
+ * the starting segment on entrace, and the ending segment on exit.
+ */
+static int
+bounce_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
+    bus_size_t buflen, pmap_t pmap, int flags, bus_dma_segment_t *segs,
+    int *segp)
+{
+	bus_size_t sgsize, max_sgsize;
+	bus_addr_t curaddr;
+	vm_offset_t vaddr;
+	int error;
+
+	if (map == NULL || map == &contig_dmamap)
+		map = &nobounce_dmamap;
+
+	if (segs == NULL)
+		segs = dmat->segments;
+
+	if ((dmat->common.flags & BUS_DMA_COULD_BOUNCE) != 0) {
+		_bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, flags);
+		if (map->pagesneeded != 0) {
+			error = _bus_dmamap_reserve_pages(dmat, map, flags);
+			if (error)
+				return (error);
+		}
+	}
+
+	vaddr = (vm_offset_t)buf;
+	while (buflen > 0) {
+		/*
+		 * Get the physical address for this segment.
+		 */
+		if (pmap == kernel_pmap)
+			curaddr = pmap_kextract(vaddr);
+		else
+			curaddr = pmap_extract(pmap, vaddr);
+
+		/*
+		 * Compute the segment size, and adjust counts.
+		 */
+		max_sgsize = MIN(buflen, dmat->common.maxsegsz);
+		sgsize = PAGE_SIZE - ((vm_offset_t)curaddr & PAGE_MASK);
+		if (((dmat->common.flags & BUS_DMA_COULD_BOUNCE) != 0) &&
+		    map->pagesneeded != 0 &&
+		    bus_dma_run_filter(&dmat->common, curaddr)) {
+			sgsize = roundup2(sgsize, dmat->common.alignment);
+			sgsize = MIN(sgsize, max_sgsize);
+			curaddr = add_bounce_page(dmat, map, vaddr, curaddr,
+			    sgsize);
+		} else {
+			sgsize = MIN(sgsize, max_sgsize);
+		}
+		sgsize = _bus_dmamap_addseg(dmat, map, curaddr, sgsize, segs,
+		    segp);
+		if (sgsize == 0)
+			break;
+		vaddr += sgsize;
+		buflen -= sgsize;
+	}
+
+	/*
+	 * Did we fit?
+	 */
+	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
+}
+
+static void
+bounce_bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
+    struct memdesc *mem, bus_dmamap_callback_t *callback, void *callback_arg)
+{
+
+	if (map == NULL)
+		return;
+	map->mem = *mem;
+	map->dmat = dmat;
+	map->callback = callback;
+	map->callback_arg = callback_arg;
+}
+
+static bus_dma_segment_t *
+bounce_bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
+    bus_dma_segment_t *segs, int nsegs, int error)
+{
+
+	if (segs == NULL)
+		segs = dmat->segments;
+	return (segs);
+}
+
+/*
+ * Release the mapping held by map.
+ */
+static void
+bounce_bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
+{
+	struct bounce_page *bpage;
+
+	while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) {
+		STAILQ_REMOVE_HEAD(&map->bpages, links);
+		free_bounce_page(dmat, bpage);
+	}
+}
+
+static void
+bounce_bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map,
+    bus_dmasync_op_t op)
+{
+	struct bounce_page *bpage;
+
+	if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) {
+		/*
+		 * Handle data bouncing.  We might also
+		 * want to add support for invalidating
+		 * the caches on broken hardware
+		 */
+		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x "
+		    "performing bounce", __func__, dmat,
+		    dmat->common.flags, op);
+
+		if ((op & BUS_DMASYNC_PREWRITE) != 0) {
+			while (bpage != NULL) {
+				if (bpage->datavaddr != 0) {
+					bcopy((void *)bpage->datavaddr,
+					    (void *)bpage->vaddr,
+					    bpage->datacount);
+				} else {
+					physcopyout(bpage->dataaddr,
+					    (void *)bpage->vaddr,
+					    bpage->datacount);
+				}
+				bpage = STAILQ_NEXT(bpage, links);
+			}
+			dmat->bounce_zone->total_bounced++;
+		}
+
+		if ((op & BUS_DMASYNC_POSTREAD) != 0) {
+			while (bpage != NULL) {
+				if (bpage->datavaddr != 0) {
+					bcopy((void *)bpage->vaddr,
+					    (void *)bpage->datavaddr,
+					    bpage->datacount);
+				} else {
+					physcopyin((void *)bpage->vaddr,
+					    bpage->dataaddr,
+					    bpage->datacount);
+				}
+				bpage = STAILQ_NEXT(bpage, links);
+			}
+			dmat->bounce_zone->total_bounced++;
+		}
+	}
+}
+
+static void
+init_bounce_pages(void *dummy __unused)
+{
+
+	total_bpages = 0;
+	STAILQ_INIT(&bounce_zone_list);
+	STAILQ_INIT(&bounce_map_waitinglist);
+	STAILQ_INIT(&bounce_map_callbacklist);
+	mtx_init(&bounce_lock, "bounce pages lock", NULL, MTX_DEF);
+}
+SYSINIT(bpages, SI_SUB_LOCK, SI_ORDER_ANY, init_bounce_pages, NULL);
+
+static struct sysctl_ctx_list *
+busdma_sysctl_tree(struct bounce_zone *bz)
+{
+	return (&bz->sysctl_tree);
+}
+
+static struct sysctl_oid *
+busdma_sysctl_tree_top(struct bounce_zone *bz)
+{
+	return (bz->sysctl_tree_top);
+}
+
+#if defined(__amd64__) || defined(PAE)
+#define	SYSCTL_ADD_BUS_SIZE_T	SYSCTL_ADD_UQUAD
+#else
+#define	SYSCTL_ADD_BUS_SIZE_T(ctx, parent, nbr, name, flag, ptr, desc)	\
+	SYSCTL_ADD_UINT(ctx, parent, nbr, name, flag, ptr, 0, desc)
+#endif
+
+static int
+alloc_bounce_zone(bus_dma_tag_t dmat)
+{
+	struct bounce_zone *bz;
+
+	/* Check to see if we already have a suitable zone */
+	STAILQ_FOREACH(bz, &bounce_zone_list, links) {
+		if ((dmat->common.alignment <= bz->alignment) &&
+		    (dmat->common.lowaddr >= bz->lowaddr)) {
+			dmat->bounce_zone = bz;
+			return (0);
+		}
+	}
+
+	if ((bz = (struct bounce_zone *)malloc(sizeof(*bz), M_DEVBUF,
+	    M_NOWAIT | M_ZERO)) == NULL)
+		return (ENOMEM);
+
+	STAILQ_INIT(&bz->bounce_page_list);
+	bz->free_bpages = 0;
+	bz->reserved_bpages = 0;
+	bz->active_bpages = 0;
+	bz->lowaddr = dmat->common.lowaddr;
+	bz->alignment = MAX(dmat->common.alignment, PAGE_SIZE);
+	bz->map_count = 0;
+	snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
+	busdma_zonecount++;
+	snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr);
+	STAILQ_INSERT_TAIL(&bounce_zone_list, bz, links);
+	dmat->bounce_zone = bz;
+
+	sysctl_ctx_init(&bz->sysctl_tree);
+	bz->sysctl_tree_top = SYSCTL_ADD_NODE(&bz->sysctl_tree,
+	    SYSCTL_STATIC_CHILDREN(_hw_busdma), OID_AUTO, bz->zoneid,
+	    CTLFLAG_RD, 0, "");
+	if (bz->sysctl_tree_top == NULL) {
+		sysctl_ctx_free(&bz->sysctl_tree);
+		return (0);	/* XXX error code? */
+	}
+
+	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+	    "total_bpages", CTLFLAG_RD, &bz->total_bpages, 0,
+	    "Total bounce pages");
+	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+	    "free_bpages", CTLFLAG_RD, &bz->free_bpages, 0,
+	    "Free bounce pages");
+	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+	    "reserved_bpages", CTLFLAG_RD, &bz->reserved_bpages, 0,
+	    "Reserved bounce pages");
+	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+	    "active_bpages", CTLFLAG_RD, &bz->active_bpages, 0,
+	    "Active bounce pages");
+	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+	    "total_bounced", CTLFLAG_RD, &bz->total_bounced, 0,
+	    "Total bounce requests");
+	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
+	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+	    "total_deferred", CTLFLAG_RD, &bz->total_deferred, 0,
+	    "Total bounce requests that were deferred");
+	SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
+	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+	    "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
+	SYSCTL_ADD_BUS_SIZE_T(busdma_sysctl_tree(bz),
+	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
+	    "alignment", CTLFLAG_RD, &bz->alignment, "");
+
+	return (0);
+}
+
+static int
+alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages)
+{
+	struct bounce_zone *bz;
+	int count;
+
+	bz = dmat->bounce_zone;
+	count = 0;
+	while (numpages > 0) {
+		struct bounce_page *bpage;
+
+		bpage = (struct bounce_page *)malloc(sizeof(*bpage), M_DEVBUF,
+						     M_NOWAIT | M_ZERO);
+
+		if (bpage == NULL)
+			break;
+		bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF,
+							 M_NOWAIT, 0ul,
+							 bz->lowaddr,
+							 PAGE_SIZE,
+							 0);
+		if (bpage->vaddr == 0) {
+			free(bpage, M_DEVBUF);
+			break;
+		}
+		bpage->busaddr = pmap_kextract(bpage->vaddr);
+		mtx_lock(&bounce_lock);
+		STAILQ_INSERT_TAIL(&bz->bounce_page_list, bpage, links);
+		total_bpages++;
+		bz->total_bpages++;
+		bz->free_bpages++;
+		mtx_unlock(&bounce_lock);
+		count++;
+		numpages--;
+	}
+	return (count);
+}
+
+static int
+reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int commit)
+{
+	struct bounce_zone *bz;
+	int pages;
+
+	mtx_assert(&bounce_lock, MA_OWNED);
+	bz = dmat->bounce_zone;
+	pages = MIN(bz->free_bpages, map->pagesneeded - map->pagesreserved);
+	if (commit == 0 && map->pagesneeded > (map->pagesreserved + pages))
+		return (map->pagesneeded - (map->pagesreserved + pages));
+	bz->free_bpages -= pages;
+	bz->reserved_bpages += pages;
+	map->pagesreserved += pages;
+	pages = map->pagesneeded - map->pagesreserved;
+
+	return (pages);
+}
+
+static bus_addr_t
+add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, vm_offset_t vaddr,
+		bus_addr_t addr, bus_size_t size)
+{
+	struct bounce_zone *bz;
+	struct bounce_page *bpage;
+
+	KASSERT(dmat->bounce_zone != NULL, ("no bounce zone in dma tag"));
+	KASSERT(map != NULL && map != &nobounce_dmamap && map != &contig_dmamap,
+	    ("add_bounce_page: bad map %p", map));
+
+	bz = dmat->bounce_zone;
+	if (map->pagesneeded == 0)
+		panic("add_bounce_page: map doesn't need any pages");
+	map->pagesneeded--;
+
+	if (map->pagesreserved == 0)
+		panic("add_bounce_page: map doesn't need any pages");
+	map->pagesreserved--;
+
+	mtx_lock(&bounce_lock);
+	bpage = STAILQ_FIRST(&bz->bounce_page_list);
+	if (bpage == NULL)
+		panic("add_bounce_page: free page list is empty");
+
+	STAILQ_REMOVE_HEAD(&bz->bounce_page_list, links);
+	bz->reserved_bpages--;
+	bz->active_bpages++;
+	mtx_unlock(&bounce_lock);
+
+	if (dmat->common.flags & BUS_DMA_KEEP_PG_OFFSET) {
+		/* Page offset needs to be preserved. */
+		bpage->vaddr |= vaddr & PAGE_MASK;
+		bpage->busaddr |= vaddr & PAGE_MASK;
+	}
+	bpage->datavaddr = vaddr;
+	bpage->dataaddr = addr;
+	bpage->datacount = size;
+	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);
+	return (bpage->busaddr);
+}
+
+static void
+free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage)
+{
+	struct bus_dmamap *map;
+	struct bounce_zone *bz;
+
+	bz = dmat->bounce_zone;
+	bpage->datavaddr = 0;
+	bpage->datacount = 0;
+	if (dmat->common.flags & BUS_DMA_KEEP_PG_OFFSET) {
+		/*
+		 * Reset the bounce page to start at offset 0.  Other uses
+		 * of this bounce page may need to store a full page of
+		 * data and/or assume it starts on a page boundary.
+		 */
+		bpage->vaddr &= ~PAGE_MASK;
+		bpage->busaddr &= ~PAGE_MASK;
+	}
+
+	mtx_lock(&bounce_lock);
+	STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links);
+	bz->free_bpages++;
+	bz->active_bpages--;
+	if ((map = STAILQ_FIRST(&bounce_map_waitinglist)) != NULL) {
+		if (reserve_bounce_pages(map->dmat, map, 1) == 0) {
+			STAILQ_REMOVE_HEAD(&bounce_map_waitinglist, links);
+			STAILQ_INSERT_TAIL(&bounce_map_callbacklist,
+			    map, links);
+			busdma_swi_pending = 1;
+			bz->total_deferred++;
+			swi_sched(vm_ih, 0);
+		}
+	}
+	mtx_unlock(&bounce_lock);
+}
+
+void
+busdma_swi(void)
+{
+	bus_dma_tag_t dmat;
+	struct bus_dmamap *map;
+
+	mtx_lock(&bounce_lock);
+	while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) {
+		STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links);
+		mtx_unlock(&bounce_lock);
+		dmat = map->dmat;
+		(dmat->common.lockfunc)(dmat->common.lockfuncarg, BUS_DMA_LOCK);
+		bus_dmamap_load_mem(map->dmat, map, &map->mem,
+		    map->callback, map->callback_arg, BUS_DMA_WAITOK);
+		(dmat->common.lockfunc)(dmat->common.lockfuncarg,
+		    BUS_DMA_UNLOCK);
+		mtx_lock(&bounce_lock);
+	}
+	mtx_unlock(&bounce_lock);
+}
+
+struct bus_dma_impl bus_dma_bounce_impl = {
+	.tag_create = bounce_bus_dma_tag_create,
+	.tag_destroy = bounce_bus_dma_tag_destroy,
+	.map_create = bounce_bus_dmamap_create,
+	.map_destroy = bounce_bus_dmamap_destroy,
+	.mem_alloc = bounce_bus_dmamem_alloc,
+	.mem_free = bounce_bus_dmamem_free,
+	.load_phys = bounce_bus_dmamap_load_phys,
+	.load_buffer = bounce_bus_dmamap_load_buffer,
+	.load_ma = bus_dmamap_load_ma_triv,
+	.map_waitok = bounce_bus_dmamap_waitok,
+	.map_complete = bounce_bus_dmamap_complete,
+	.map_unload = bounce_bus_dmamap_unload,
+	.map_sync = bounce_bus_dmamap_sync
+};
diff --git a/sys/x86/x86/busdma_machdep.c b/sys/x86/x86/busdma_machdep.c
index 0b5961683f3..c96b26d579f 100644
--- a/sys/x86/x86/busdma_machdep.c
+++ b/sys/x86/x86/busdma_machdep.c
@@ -1,7 +1,11 @@
 /*-
  * Copyright (c) 1997, 1998 Justin T. Gibbs.
+ * Copyright (c) 2013 The FreeBSD Foundation
  * All rights reserved.
  *
+ * This software was developed 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:
@@ -31,160 +35,17 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/bus.h>
-#include <sys/interrupt.h>
 #include <sys/kernel.h>
 #include <sys/ktr.h>
 #include <sys/lock.h>
-#include <sys/proc.h>
 #include <sys/memdesc.h>
 #include <sys/mutex.h>
-#include <sys/sysctl.h>
 #include <sys/uio.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 <machine/atomic.h>
+#include <vm/pmap.h>
 #include <machine/bus.h>
-#include <machine/md_var.h>
-#include <machine/specialreg.h>
-
-#ifdef __i386__
-#define MAX_BPAGES 512
-#else
-#define MAX_BPAGES 8192
-#endif
-#define BUS_DMA_COULD_BOUNCE	BUS_DMA_BUS3
-#define BUS_DMA_MIN_ALLOC_COMP	BUS_DMA_BUS4
-
-struct bounce_zone;
-
-struct bus_dma_tag {
-	bus_dma_tag_t	  parent;
-	bus_size_t	  alignment;
-	bus_addr_t	  boundary;
-	bus_addr_t	  lowaddr;
-	bus_addr_t	  highaddr;
-	bus_dma_filter_t *filter;
-	void		 *filterarg;
-	bus_size_t	  maxsize;
-	u_int		  nsegments;
-	bus_size_t	  maxsegsz;
-	int		  flags;
-	int		  ref_count;
-	int		  map_count;
-	bus_dma_lock_t	 *lockfunc;
-	void		 *lockfuncarg;
-	bus_dma_segment_t *segments;
-	struct bounce_zone *bounce_zone;
-};
-
-struct bounce_page {
-	vm_offset_t	vaddr;		/* kva of bounce buffer */
-	bus_addr_t	busaddr;	/* Physical address */
-	vm_offset_t	datavaddr;	/* kva of client data */
-	bus_addr_t	dataaddr;	/* client physical address */
-	bus_size_t	datacount;	/* client data count */
-	STAILQ_ENTRY(bounce_page) links;
-};
-
-int busdma_swi_pending;
-
-struct bounce_zone {
-	STAILQ_ENTRY(bounce_zone) links;
-	STAILQ_HEAD(bp_list, bounce_page) bounce_page_list;
-	int		total_bpages;
-	int		free_bpages;
-	int		reserved_bpages;
-	int		active_bpages;
-	int		total_bounced;
-	int		total_deferred;
-	int		map_count;
-	bus_size_t	alignment;
-	bus_addr_t	lowaddr;
-	char		zoneid[8];
-	char		lowaddrid[20];
-	struct sysctl_ctx_list sysctl_tree;
-	struct sysctl_oid *sysctl_tree_top;
-};
-
-static struct mtx bounce_lock;
-static int total_bpages;
-static int busdma_zonecount;
-static STAILQ_HEAD(, bounce_zone) bounce_zone_list;
-
-static SYSCTL_NODE(_hw, OID_AUTO, busdma, CTLFLAG_RD, 0, "Busdma parameters");
-SYSCTL_INT(_hw_busdma, OID_AUTO, total_bpages, CTLFLAG_RD, &total_bpages, 0,
-	   "Total bounce pages");
-
-struct bus_dmamap {
-	struct bp_list	       bpages;
-	int		       pagesneeded;
-	int		       pagesreserved;
-	bus_dma_tag_t	       dmat;
-	struct memdesc	       mem;
-	bus_dmamap_callback_t *callback;
-	void		      *callback_arg;
-	STAILQ_ENTRY(bus_dmamap) links;
-};
-
-static STAILQ_HEAD(, bus_dmamap) bounce_map_waitinglist;
-static STAILQ_HEAD(, bus_dmamap) bounce_map_callbacklist;
-static struct bus_dmamap nobounce_dmamap, contig_dmamap;
-
-static void init_bounce_pages(void *dummy);
-static int alloc_bounce_zone(bus_dma_tag_t dmat);
-static int alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages);
-static int reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
-				int commit);
-static bus_addr_t add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map,
-				  vm_offset_t vaddr, bus_addr_t addr,
-				  bus_size_t size);
-static void free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage);
-int run_filter(bus_dma_tag_t dmat, bus_addr_t paddr);
-static void _bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
-				    pmap_t pmap, void *buf, bus_size_t buflen,
-				    int flags);
-static void _bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map,
-				   vm_paddr_t buf, bus_size_t buflen,
-				   int flags);
-static int _bus_dmamap_reserve_pages(bus_dma_tag_t dmat, bus_dmamap_t map,
-				     int flags);
-
-#ifdef XEN
-#undef pmap_kextract
-#define pmap_kextract pmap_kextract_ma
-#endif
-
-/*
- * Return true if a match is made.
- *
- * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'.
- *
- * If paddr is within the bounds of the dma tag then call the filter callback
- * to check for a match, if there is no filter callback then assume a match.
- */
-int
-run_filter(bus_dma_tag_t dmat, bus_addr_t paddr)
-{
-	int retval;
-
-	retval = 0;
-
-	do {
-		if (((paddr > dmat->lowaddr && paddr <= dmat->highaddr)
-		 || ((paddr & (dmat->alignment - 1)) != 0))
-		 && (dmat->filter == NULL
-		  || (*dmat->filter)(dmat->filterarg, paddr) != 0))
-			retval = 1;
-
-		dmat = dmat->parent;		
-	} while (retval == 0 && dmat != NULL);
-	return (retval);
-}
+#include <x86/include/busdma_impl.h>
 
 /*
  * Convenience function for manipulating driver locks from busdma (during
@@ -216,169 +77,146 @@ busdma_lock_mutex(void *arg, bus_dma_lock_op_t op)
  * with the tag are meant to never be defered.
  * XXX Should have a way to identify which driver is responsible here.
  */
-static void
-dflt_lock(void *arg, bus_dma_lock_op_t op)
+void
+bus_dma_dflt_lock(void *arg, bus_dma_lock_op_t op)
 {
+
 	panic("driver error: busdma dflt_lock called");
 }
 
+/*
+ * Return true if a match is made.
+ *
+ * To find a match walk the chain of bus_dma_tag_t's looking for 'paddr'.
+ *
+ * If paddr is within the bounds of the dma tag then call the filter callback
+ * to check for a match, if there is no filter callback then assume a match.
+ */
+int
+bus_dma_run_filter(struct bus_dma_tag_common *tc, bus_addr_t paddr)
+{
+	int retval;
+
+	retval = 0;
+	do {
+		if (((paddr > tc->lowaddr && paddr <= tc->highaddr) ||
+		    ((paddr & (tc->alignment - 1)) != 0)) &&
+		    (tc->filter == NULL ||
+		    (*tc->filter)(tc->filterarg, paddr) != 0))
+			retval = 1;
+
+		tc = tc->parent;		
+	} while (retval == 0 && tc != NULL);
+	return (retval);
+}
+
+int
+common_bus_dma_tag_create(struct bus_dma_tag_common *parent,
+    bus_size_t alignment, bus_addr_t boundary, bus_addr_t lowaddr,
+    bus_addr_t highaddr, bus_dma_filter_t *filter, void *filterarg,
+    bus_size_t maxsize, int nsegments, bus_size_t maxsegsz, int flags,
+    bus_dma_lock_t *lockfunc, void *lockfuncarg, size_t sz, void **dmat)
+{
+	void *newtag;
+	struct bus_dma_tag_common *common;
+
+	KASSERT(sz >= sizeof(struct bus_dma_tag_common), ("sz"));
+	/* Basic sanity checking */
+	if (boundary != 0 && boundary < maxsegsz)
+		maxsegsz = boundary;
+	if (maxsegsz == 0)
+		return (EINVAL);
+	/* Return a NULL tag on failure */
+	*dmat = NULL;
+
+	newtag = malloc(sz, M_DEVBUF, M_ZERO | M_NOWAIT);
+	if (newtag == NULL) {
+		CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
+		    __func__, newtag, 0, ENOMEM);
+		return (ENOMEM);
+	}
+
+	common = newtag;
+	common->impl = &bus_dma_bounce_impl;
+	common->parent = parent;
+	common->alignment = alignment;
+	common->boundary = boundary;
+	common->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1);
+	common->highaddr = trunc_page((vm_paddr_t)highaddr) + (PAGE_SIZE - 1);
+	common->filter = filter;
+	common->filterarg = filterarg;
+	common->maxsize = maxsize;
+	common->nsegments = nsegments;
+	common->maxsegsz = maxsegsz;
+	common->flags = flags;
+	common->ref_count = 1; /* Count ourself */
+	if (lockfunc != NULL) {
+		common->lockfunc = lockfunc;
+		common->lockfuncarg = lockfuncarg;
+	} else {
+		common->lockfunc = bus_dma_dflt_lock;
+		common->lockfuncarg = NULL;
+	}
+
+	/* Take into account any restrictions imposed by our parent tag */
+	if (parent != NULL) {
+		common->impl = parent->impl;
+		common->lowaddr = MIN(parent->lowaddr, common->lowaddr);
+		common->highaddr = MAX(parent->highaddr, common->highaddr);
+		if (common->boundary == 0)
+			common->boundary = parent->boundary;
+		else if (parent->boundary != 0) {
+			common->boundary = MIN(parent->boundary,
+			    common->boundary);
+		}
+		if (common->filter == NULL) {
+			/*
+			 * Short circuit looking at our parent directly
+			 * since we have encapsulated all of its information
+			 */
+			common->filter = parent->filter;
+			common->filterarg = parent->filterarg;
+			common->parent = parent->parent;
+		}
+		atomic_add_int(&parent->ref_count, 1);
+	}
+	*dmat = common;
+	return (0);
+}
+
 /*
  * Allocate a device specific dma_tag.
  */
 int
 bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
-		   bus_addr_t boundary, bus_addr_t lowaddr,
-		   bus_addr_t highaddr, bus_dma_filter_t *filter,
-		   void *filterarg, bus_size_t maxsize, int nsegments,
-		   bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
-		   void *lockfuncarg, bus_dma_tag_t *dmat)
+    bus_addr_t boundary, bus_addr_t lowaddr, bus_addr_t highaddr,
+    bus_dma_filter_t *filter, void *filterarg, bus_size_t maxsize,
+    int nsegments, bus_size_t maxsegsz, int flags, bus_dma_lock_t *lockfunc,
+    void *lockfuncarg, bus_dma_tag_t *dmat)
 {
-	bus_dma_tag_t newtag;
-	int error = 0;
+	struct bus_dma_tag_common *tc;
+	int error;
 
-	/* Basic sanity checking */
-	if (boundary != 0 && boundary < maxsegsz)
-		maxsegsz = boundary;
-
-	if (maxsegsz == 0) {
-		return (EINVAL);
-	}
-
-	/* Return a NULL tag on failure */
-	*dmat = NULL;
-
-	newtag = (bus_dma_tag_t)malloc(sizeof(*newtag), M_DEVBUF,
-	    M_ZERO | M_NOWAIT);
-	if (newtag == NULL) {
-		CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
-		    __func__, newtag, 0, ENOMEM);
-		return (ENOMEM);
-	}
-
-	newtag->parent = parent;
-	newtag->alignment = alignment;
-	newtag->boundary = boundary;
-	newtag->lowaddr = trunc_page((vm_paddr_t)lowaddr) + (PAGE_SIZE - 1);
-	newtag->highaddr = trunc_page((vm_paddr_t)highaddr) + (PAGE_SIZE - 1);
-	newtag->filter = filter;
-	newtag->filterarg = filterarg;
-	newtag->maxsize = maxsize;
-	newtag->nsegments = nsegments;
-	newtag->maxsegsz = maxsegsz;
-	newtag->flags = flags;
-	newtag->ref_count = 1; /* Count ourself */
-	newtag->map_count = 0;
-	if (lockfunc != NULL) {
-		newtag->lockfunc = lockfunc;
-		newtag->lockfuncarg = lockfuncarg;
+	if (parent == NULL) {
+		error = bus_dma_bounce_impl.tag_create(parent, alignment,
+		    boundary, lowaddr, highaddr, filter, filterarg, maxsize,
+		    nsegments, maxsegsz, flags, lockfunc, lockfuncarg, dmat);
 	} else {
-		newtag->lockfunc = dflt_lock;
-		newtag->lockfuncarg = NULL;
+		tc = (struct bus_dma_tag_common *)parent;
+		error = tc->impl->tag_create(parent, alignment,
+		    boundary, lowaddr, highaddr, filter, filterarg, maxsize,
+		    nsegments, maxsegsz, flags, lockfunc, lockfuncarg, dmat);
 	}
-	newtag->segments = NULL;
-
-	/* Take into account any restrictions imposed by our parent tag */
-	if (parent != NULL) {
-		newtag->lowaddr = MIN(parent->lowaddr, newtag->lowaddr);
-		newtag->highaddr = MAX(parent->highaddr, newtag->highaddr);
-		if (newtag->boundary == 0)
-			newtag->boundary = parent->boundary;
-		else if (parent->boundary != 0)
-			newtag->boundary = MIN(parent->boundary,
-					       newtag->boundary);
-		if ((newtag->filter != NULL) ||
-		    ((parent->flags & BUS_DMA_COULD_BOUNCE) != 0))
-			newtag->flags |= BUS_DMA_COULD_BOUNCE;
-		if (newtag->filter == NULL) {
-			/*
-			 * Short circuit looking at our parent directly
-			 * since we have encapsulated all of its information
-			 */
-			newtag->filter = parent->filter;
-			newtag->filterarg = parent->filterarg;
-			newtag->parent = parent->parent;
-		}
-		if (newtag->parent != NULL)
-			atomic_add_int(&parent->ref_count, 1);
-	}
-
-	if (newtag->lowaddr < ptoa((vm_paddr_t)Maxmem)
-	 || newtag->alignment > 1)
-		newtag->flags |= BUS_DMA_COULD_BOUNCE;
-
-	if (((newtag->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
-	    (flags & BUS_DMA_ALLOCNOW) != 0) {
-		struct bounce_zone *bz;
-
-		/* Must bounce */
-
-		if ((error = alloc_bounce_zone(newtag)) != 0) {
-			free(newtag, M_DEVBUF);
-			return (error);
-		}
-		bz = newtag->bounce_zone;
-
-		if (ptoa(bz->total_bpages) < maxsize) {
-			int pages;
-
-			pages = atop(maxsize) - bz->total_bpages;
-
-			/* Add pages to our bounce pool */
-			if (alloc_bounce_pages(newtag, pages) < pages)
-				error = ENOMEM;
-		}
-		/* Performed initial allocation */
-		newtag->flags |= BUS_DMA_MIN_ALLOC_COMP;
-	}
-	
-	if (error != 0) {
-		free(newtag, M_DEVBUF);
-	} else {
-		*dmat = newtag;
-	}
-	CTR4(KTR_BUSDMA, "%s returned tag %p tag flags 0x%x error %d",
-	    __func__, newtag, (newtag != NULL ? newtag->flags : 0), error);
 	return (error);
 }
 
 int
 bus_dma_tag_destroy(bus_dma_tag_t dmat)
 {
-	bus_dma_tag_t dmat_copy;
-	int error;
+	struct bus_dma_tag_common *tc;
 
-	error = 0;
-	dmat_copy = dmat;
-
-	if (dmat != NULL) {
-
-		if (dmat->map_count != 0) {
-			error = EBUSY;
-			goto out;
-		}
-
-		while (dmat != NULL) {
-			bus_dma_tag_t parent;
-
-			parent = dmat->parent;
-			atomic_subtract_int(&dmat->ref_count, 1);
-			if (dmat->ref_count == 0) {
-				if (dmat->segments != NULL)
-					free(dmat->segments, M_DEVBUF);
-				free(dmat, M_DEVBUF);
-				/*
-				 * Last reference count, so
-				 * release our reference
-				 * count on our parent.
-				 */
-				dmat = parent;
-			} else
-				dmat = NULL;
-		}
-	}
-out:
-	CTR3(KTR_BUSDMA, "%s tag %p error %d", __func__, dmat_copy, error);
-	return (error);
+	tc = (struct bus_dma_tag_common *)dmat;
+	return (tc->impl->tag_destroy(dmat));
 }
 
 /*
@@ -388,83 +226,10 @@ out:
 int
 bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 {
-	int error;
+	struct bus_dma_tag_common *tc;
 
-	error = 0;
-
-	if (dmat->segments == NULL) {
-		dmat->segments = (bus_dma_segment_t *)malloc(
-		    sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF,
-		    M_NOWAIT);
-		if (dmat->segments == NULL) {
-			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
-			    __func__, dmat, ENOMEM);
-			return (ENOMEM);
-		}
-	}
-
-	/*
-	 * Bouncing might be required if the driver asks for an active
-	 * exclusion region, a data alignment that is stricter than 1, and/or
-	 * an active address boundary.
-	 */
-	if (dmat->flags & BUS_DMA_COULD_BOUNCE) {
-
-		/* Must bounce */
-		struct bounce_zone *bz;
-		int maxpages;
-
-		if (dmat->bounce_zone == NULL) {
-			if ((error = alloc_bounce_zone(dmat)) != 0)
-				return (error);
-		}
-		bz = dmat->bounce_zone;
-
-		*mapp = (bus_dmamap_t)malloc(sizeof(**mapp), M_DEVBUF,
-					     M_NOWAIT | M_ZERO);
-		if (*mapp == NULL) {
-			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
-			    __func__, dmat, ENOMEM);
-			return (ENOMEM);
-		}
-
-		/* Initialize the new map */
-		STAILQ_INIT(&((*mapp)->bpages));
-
-		/*
-		 * Attempt to add pages to our pool on a per-instance
-		 * basis up to a sane limit.
-		 */
-		if (dmat->alignment > 1)
-			maxpages = MAX_BPAGES;
-		else
-			maxpages = MIN(MAX_BPAGES, Maxmem -atop(dmat->lowaddr));
-		if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0
-		 || (bz->map_count > 0 && bz->total_bpages < maxpages)) {
-			int pages;
-
-			pages = MAX(atop(dmat->maxsize), 1);
-			pages = MIN(maxpages - bz->total_bpages, pages);
-			pages = MAX(pages, 1);
-			if (alloc_bounce_pages(dmat, pages) < pages)
-				error = ENOMEM;
-
-			if ((dmat->flags & BUS_DMA_MIN_ALLOC_COMP) == 0) {
-				if (error == 0)
-					dmat->flags |= BUS_DMA_MIN_ALLOC_COMP;
-			} else {
-				error = 0;
-			}
-		}
-		bz->map_count++;
-	} else {
-		*mapp = NULL;
-	}
-	if (error == 0)
-		dmat->map_count++;
-	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
-	    __func__, dmat, dmat->flags, error);
-	return (error);
+	tc = (struct bus_dma_tag_common *)dmat;
+	return (tc->impl->map_create(dmat, flags, mapp));
 }
 
 /*
@@ -474,19 +239,10 @@ bus_dmamap_create(bus_dma_tag_t dmat, int flags, bus_dmamap_t *mapp)
 int
 bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
-	if (map != NULL && map != &nobounce_dmamap && map != &contig_dmamap) {
-		if (STAILQ_FIRST(&map->bpages) != NULL) {
-			CTR3(KTR_BUSDMA, "%s: tag %p error %d",
-			    __func__, dmat, EBUSY);
-			return (EBUSY);
-		}
-		if (dmat->bounce_zone)
-			dmat->bounce_zone->map_count--;
-		free(map, M_DEVBUF);
-	}
-	dmat->map_count--;
-	CTR2(KTR_BUSDMA, "%s: tag %p error 0", __func__, dmat);
-	return (0);
+	struct bus_dma_tag_common *tc;
+
+	tc = (struct bus_dma_tag_common *)dmat;
+	return (tc->impl->map_destroy(dmat, map));
 }
 
 
@@ -497,72 +253,12 @@ bus_dmamap_destroy(bus_dma_tag_t dmat, bus_dmamap_t map)
  */
 int
 bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
-		 bus_dmamap_t *mapp)
+    bus_dmamap_t *mapp)
 {
-	vm_memattr_t attr;
-	int mflags;
+	struct bus_dma_tag_common *tc;
 
-	if (flags & BUS_DMA_NOWAIT)
-		mflags = M_NOWAIT;
-	else
-		mflags = M_WAITOK;
-
-	/* If we succeed, no mapping/bouncing will be required */
-	*mapp = NULL;
-
-	if (dmat->segments == NULL) {
-		dmat->segments = (bus_dma_segment_t *)malloc(
-		    sizeof(bus_dma_segment_t) * dmat->nsegments, M_DEVBUF,
-		    mflags);
-		if (dmat->segments == NULL) {
-			CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
-			    __func__, dmat, dmat->flags, ENOMEM);
-			return (ENOMEM);
-		}
-	}
-	if (flags & BUS_DMA_ZERO)
-		mflags |= M_ZERO;
-	if (flags & BUS_DMA_NOCACHE)
-		attr = VM_MEMATTR_UNCACHEABLE;
-	else
-		attr = VM_MEMATTR_DEFAULT;
-
-	/* 
-	 * XXX:
-	 * (dmat->alignment < dmat->maxsize) is just a quick hack; the exact
-	 * alignment guarantees of malloc need to be nailed down, and the
-	 * code below should be rewritten to take that into account.
-	 *
-	 * In the meantime, we'll warn the user if malloc gets it wrong.
-	 */
-	if ((dmat->maxsize <= PAGE_SIZE) &&
-	   (dmat->alignment < dmat->maxsize) &&
-	    dmat->lowaddr >= ptoa((vm_paddr_t)Maxmem) &&
-	    attr == VM_MEMATTR_DEFAULT) {
-		*vaddr = malloc(dmat->maxsize, M_DEVBUF, mflags);
-	} else if (dmat->nsegments >= btoc(dmat->maxsize) &&
-	    dmat->alignment <= PAGE_SIZE &&
-	    (dmat->boundary == 0 || dmat->boundary >= dmat->lowaddr)) {
-		/* Page-based multi-segment allocations allowed */
-		*vaddr = (void *)kmem_alloc_attr(kernel_arena, dmat->maxsize,
-		    mflags, 0ul, dmat->lowaddr, attr);
-		*mapp = &contig_dmamap;
-	} else {
-		*vaddr = (void *)kmem_alloc_contig(kernel_arena, dmat->maxsize,
-		    mflags, 0ul, dmat->lowaddr, dmat->alignment ?
-		    dmat->alignment : 1ul, dmat->boundary, attr);
-		*mapp = &contig_dmamap;
-	}
-	if (*vaddr == NULL) {
-		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
-		    __func__, dmat, dmat->flags, ENOMEM);
-		return (ENOMEM);
-	} else if (vtophys(*vaddr) & (dmat->alignment - 1)) {
-		printf("bus_dmamem_alloc failed to align memory properly.\n");
-	}
-	CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d",
-	    __func__, dmat, dmat->flags, 0);
-	return (0);
+	tc = (struct bus_dma_tag_common *)dmat;
+	return (tc->impl->mem_alloc(dmat, vaddr, flags, mapp));
 }
 
 /*
@@ -572,153 +268,10 @@ bus_dmamem_alloc(bus_dma_tag_t dmat, void** vaddr, int flags,
 void
 bus_dmamem_free(bus_dma_tag_t dmat, void *vaddr, bus_dmamap_t map)
 {
-	/*
-	 * dmamem does not need to be bounced, so the map should be
-	 * NULL if malloc() was used and contig_dmamap if
-	 * kmem_alloc_contig() was used.
-	 */
-	if (!(map == NULL || map == &contig_dmamap))
-		panic("bus_dmamem_free: Invalid map freed\n");
-	if (map == NULL)
-		free(vaddr, M_DEVBUF);
-	else
-		kmem_free(kernel_arena, (vm_offset_t)vaddr, dmat->maxsize);
-	CTR3(KTR_BUSDMA, "%s: tag %p flags 0x%x", __func__, dmat, dmat->flags);
-}
+	struct bus_dma_tag_common *tc;
 
-static void
-_bus_dmamap_count_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
-    bus_size_t buflen, int flags)
-{
-	bus_addr_t curaddr;
-	bus_size_t sgsize;
-
-	if ((map != &nobounce_dmamap && map->pagesneeded == 0)) {
-		/*
-		 * Count the number of bounce pages
-		 * needed in order to complete this transfer
-		 */
-		curaddr = buf;
-		while (buflen != 0) {
-			sgsize = MIN(buflen, dmat->maxsegsz);
-			if (run_filter(dmat, curaddr)) {
-				sgsize = MIN(sgsize, PAGE_SIZE);
-				map->pagesneeded++;
-			}
-			curaddr += sgsize;
-			buflen -= sgsize;
-		}
-		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
-	}
-}
-
-static void
-_bus_dmamap_count_pages(bus_dma_tag_t dmat, bus_dmamap_t map, pmap_t pmap,
-    void *buf, bus_size_t buflen, int flags)
-{
-	vm_offset_t vaddr;
-	vm_offset_t vendaddr;
-	bus_addr_t paddr;
-
-	if ((map != &nobounce_dmamap && map->pagesneeded == 0)) {
-		CTR4(KTR_BUSDMA, "lowaddr= %d Maxmem= %d, boundary= %d, "
-		    "alignment= %d", dmat->lowaddr, ptoa((vm_paddr_t)Maxmem),
-		    dmat->boundary, dmat->alignment);
-		CTR3(KTR_BUSDMA, "map= %p, nobouncemap= %p, pagesneeded= %d",
-		    map, &nobounce_dmamap, map->pagesneeded);
-		/*
-		 * Count the number of bounce pages
-		 * needed in order to complete this transfer
-		 */
-		vaddr = (vm_offset_t)buf;
-		vendaddr = (vm_offset_t)buf + buflen;
-
-		while (vaddr < vendaddr) {
-			bus_size_t sg_len;
-
-			sg_len = PAGE_SIZE - ((vm_offset_t)vaddr & PAGE_MASK);
-			if (pmap == kernel_pmap)
-				paddr = pmap_kextract(vaddr);
-			else
-				paddr = pmap_extract(pmap, vaddr);
-			if (run_filter(dmat, paddr) != 0) {
-				sg_len = roundup2(sg_len, dmat->alignment);
-				map->pagesneeded++;
-			}
-			vaddr += sg_len;
-		}
-		CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
-	}
-}
-
-static int
-_bus_dmamap_reserve_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int flags)
-{
-
-	/* Reserve Necessary Bounce Pages */
-	mtx_lock(&bounce_lock);
-	if (flags & BUS_DMA_NOWAIT) {
-		if (reserve_bounce_pages(dmat, map, 0) != 0) {
-			mtx_unlock(&bounce_lock);
-			return (ENOMEM);
-		}
-	} else {
-		if (reserve_bounce_pages(dmat, map, 1) != 0) {
-			/* Queue us for resources */
-			STAILQ_INSERT_TAIL(&bounce_map_waitinglist, map, links);
-			mtx_unlock(&bounce_lock);
-			return (EINPROGRESS);
-		}
-	}
-	mtx_unlock(&bounce_lock);
-
-	return (0);
-}
-
-/*
- * Add a single contiguous physical range to the segment list.
- */
-static int
-_bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr,
-		   bus_size_t sgsize, bus_dma_segment_t *segs, int *segp)
-{
-	bus_addr_t baddr, bmask;
-	int seg;
-
-	/*
-	 * Make sure we don't cross any boundaries.
-	 */
-	bmask = ~(dmat->boundary - 1);
-	if (dmat->boundary > 0) {
-		baddr = (curaddr + dmat->boundary) & bmask;
-		if (sgsize > (baddr - curaddr))
-			sgsize = (baddr - curaddr);
-	}
-
-	/*
-	 * Insert chunk into a segment, coalescing with
-	 * previous segment if possible.
-	 */
-	seg = *segp;
-	if (seg == -1) {
-		seg = 0;
-		segs[seg].ds_addr = curaddr;
-		segs[seg].ds_len = sgsize;
-	} else {
-		if (curaddr == segs[seg].ds_addr + segs[seg].ds_len &&
-		    (segs[seg].ds_len + sgsize) <= dmat->maxsegsz &&
-		    (dmat->boundary == 0 ||
-		     (segs[seg].ds_addr & bmask) == (curaddr & bmask)))
-			segs[seg].ds_len += sgsize;
-		else {
-			if (++seg >= dmat->nsegments)
-				return (0);
-			segs[seg].ds_addr = curaddr;
-			segs[seg].ds_len = sgsize;
-		}
-	}
-	*segp = seg;
-	return (sgsize);
+	tc = (struct bus_dma_tag_common *)dmat;
+	tc->impl->mem_free(dmat, vaddr, map);
 }
 
 /*
@@ -726,53 +279,26 @@ _bus_dmamap_addseg(bus_dma_tag_t dmat, bus_dmamap_t map, bus_addr_t curaddr,
  * the starting segment on entrace, and the ending segment on exit.
  */
 int
-_bus_dmamap_load_phys(bus_dma_tag_t dmat,
-		      bus_dmamap_t map,
-		      vm_paddr_t buf, bus_size_t buflen,
-		      int flags,
-		      bus_dma_segment_t *segs,
-		      int *segp)
+_bus_dmamap_load_phys(bus_dma_tag_t dmat, bus_dmamap_t map, vm_paddr_t buf,
+    bus_size_t buflen, int flags, bus_dma_segment_t *segs, int *segp)
 {
-	bus_size_t sgsize;
-	bus_addr_t curaddr;
-	int error;
+	struct bus_dma_tag_common *tc;
 
-	if (map == NULL || map == &contig_dmamap)
-		map = &nobounce_dmamap;
+	tc = (struct bus_dma_tag_common *)dmat;
+	return (tc->impl->load_phys(dmat, map, buf, buflen, flags, segs,
+	    segp));
+}
 
-	if (segs == NULL)
-		segs = dmat->segments;
+int
+_bus_dmamap_load_ma(bus_dma_tag_t dmat, bus_dmamap_t map, struct vm_page **ma,
+    bus_size_t tlen, int ma_offs, int flags, bus_dma_segment_t *segs,
+    int *segp)
+{
+	struct bus_dma_tag_common *tc;
 
-	if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) {
-		_bus_dmamap_count_phys(dmat, map, buf, buflen, flags);
-		if (map->pagesneeded != 0) {
-			error = _bus_dmamap_reserve_pages(dmat, map, flags);
-			if (error)
-				return (error);
-		}
-	}
-
-	while (buflen > 0) {
-		curaddr = buf;
-		sgsize = MIN(buflen, dmat->maxsegsz);
-		if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
-		    map->pagesneeded != 0 && run_filter(dmat, curaddr)) {
-			sgsize = MIN(sgsize, PAGE_SIZE);
-			curaddr = add_bounce_page(dmat, map, 0, curaddr,
-			    			  sgsize);
-		}
-		sgsize = _bus_dmamap_addseg(dmat, map, curaddr, sgsize, segs,
-		    segp);
-		if (sgsize == 0)
-			break;
-		buf += sgsize;
-		buflen -= sgsize;
-	}
-
-	/*
-	 * Did we fit?
-	 */
-	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
+	tc = (struct bus_dma_tag_common *)dmat;
+	return (tc->impl->load_ma(dmat, map, ma, tlen, ma_offs, flags,
+	    segs, segp));
 }
 
 /*
@@ -780,96 +306,35 @@ _bus_dmamap_load_phys(bus_dma_tag_t dmat,
  * the starting segment on entrace, and the ending segment on exit.
  */
 int
-_bus_dmamap_load_buffer(bus_dma_tag_t dmat,
-   			bus_dmamap_t map,
-			void *buf, bus_size_t buflen,
-			pmap_t pmap,
-			int flags,
-			bus_dma_segment_t *segs,
-			int *segp)
+_bus_dmamap_load_buffer(bus_dma_tag_t dmat, bus_dmamap_t map, void *buf,
+    bus_size_t buflen, pmap_t pmap, int flags, bus_dma_segment_t *segs,
+    int *segp)
 {
-	bus_size_t sgsize;
-	bus_addr_t curaddr;
-	vm_offset_t vaddr;
-	int error;
+	struct bus_dma_tag_common *tc;
 
-	if (map == NULL || map == &contig_dmamap)
-		map = &nobounce_dmamap;
-
-	if (segs == NULL)
-		segs = dmat->segments;
-
-	if ((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) {
-		_bus_dmamap_count_pages(dmat, map, pmap, buf, buflen, flags);
-		if (map->pagesneeded != 0) {
-			error = _bus_dmamap_reserve_pages(dmat, map, flags);
-			if (error)
-				return (error);
-		}
-	}
-
-	vaddr = (vm_offset_t)buf;
-
-	while (buflen > 0) {
-		bus_size_t max_sgsize;
-
-		/*
-		 * Get the physical address for this segment.
-		 */
-		if (pmap == kernel_pmap)
-			curaddr = pmap_kextract(vaddr);
-		else
-			curaddr = pmap_extract(pmap, vaddr);
-
-		/*
-		 * Compute the segment size, and adjust counts.
-		 */
-		max_sgsize = MIN(buflen, dmat->maxsegsz);
-		sgsize = PAGE_SIZE - ((vm_offset_t)curaddr & PAGE_MASK);
-		if (((dmat->flags & BUS_DMA_COULD_BOUNCE) != 0) &&
-		    map->pagesneeded != 0 && run_filter(dmat, curaddr)) {
-			sgsize = roundup2(sgsize, dmat->alignment);
-			sgsize = MIN(sgsize, max_sgsize);
-			curaddr = add_bounce_page(dmat, map, vaddr, curaddr,
-			    			  sgsize);
-		} else {
-			sgsize = MIN(sgsize, max_sgsize);
-		}
-		sgsize = _bus_dmamap_addseg(dmat, map, curaddr, sgsize, segs,
-					    segp);
-		if (sgsize == 0)
-			break;
-		vaddr += sgsize;
-		buflen -= sgsize;
-	}
-
-	/*
-	 * Did we fit?
-	 */
-	return (buflen != 0 ? EFBIG : 0); /* XXX better return value here? */
+	tc = (struct bus_dma_tag_common *)dmat;
+	return (tc->impl->load_buffer(dmat, map, buf, buflen, pmap, flags, segs,
+	    segp));
 }
 
 void
 __bus_dmamap_waitok(bus_dma_tag_t dmat, bus_dmamap_t map,
-		    struct memdesc *mem, bus_dmamap_callback_t *callback,
-		    void *callback_arg)
+    struct memdesc *mem, bus_dmamap_callback_t *callback, void *callback_arg)
 {
-	if (map != NULL) {
-		map->mem = *mem;
-		map->dmat = dmat;
-		map->callback = callback;
-		map->callback_arg = callback_arg;
-	}
+	struct bus_dma_tag_common *tc;
+
+	tc = (struct bus_dma_tag_common *)dmat;
+	tc->impl->map_waitok(dmat, map, mem, callback, callback_arg);
 }
 
 bus_dma_segment_t *
 _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
-		      bus_dma_segment_t *segs, int nsegs, int error)
+    bus_dma_segment_t *segs, int nsegs, int error)
 {
+	struct bus_dma_tag_common *tc;
 
-	if (segs == NULL)
-		segs = dmat->segments;
-	return (segs);
+	tc = (struct bus_dma_tag_common *)dmat;
+	return (tc->impl->map_complete(dmat, map, segs, nsegs, error));
 }
 
 /*
@@ -878,317 +343,17 @@ _bus_dmamap_complete(bus_dma_tag_t dmat, bus_dmamap_t map,
 void
 _bus_dmamap_unload(bus_dma_tag_t dmat, bus_dmamap_t map)
 {
-	struct bounce_page *bpage;
+	struct bus_dma_tag_common *tc;
 
-	while ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) {
-		STAILQ_REMOVE_HEAD(&map->bpages, links);
-		free_bounce_page(dmat, bpage);
-	}
+	tc = (struct bus_dma_tag_common *)dmat;
+	tc->impl->map_unload(dmat, map);
 }
 
 void
 _bus_dmamap_sync(bus_dma_tag_t dmat, bus_dmamap_t map, bus_dmasync_op_t op)
 {
-	struct bounce_page *bpage;
+	struct bus_dma_tag_common *tc;
 
-	if ((bpage = STAILQ_FIRST(&map->bpages)) != NULL) {
-		/*
-		 * Handle data bouncing.  We might also
-		 * want to add support for invalidating
-		 * the caches on broken hardware
-		 */
-		CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x op 0x%x "
-		    "performing bounce", __func__, dmat, dmat->flags, op);
-
-		if (op & BUS_DMASYNC_PREWRITE) {
-			while (bpage != NULL) {
-				if (bpage->datavaddr != 0)
-					bcopy((void *)bpage->datavaddr,
-					      (void *)bpage->vaddr,
-					      bpage->datacount);
-				else
-					physcopyout(bpage->dataaddr,
-					      (void *)bpage->vaddr,
-					      bpage->datacount);
-				bpage = STAILQ_NEXT(bpage, links);
-			}
-			dmat->bounce_zone->total_bounced++;
-		}
-
-		if (op & BUS_DMASYNC_POSTREAD) {
-			while (bpage != NULL) {
-				if (bpage->datavaddr != 0)
-					bcopy((void *)bpage->vaddr,
-					      (void *)bpage->datavaddr,
-					      bpage->datacount);
-				else
-					physcopyin((void *)bpage->vaddr,
-					      bpage->dataaddr,
-					      bpage->datacount);
-				bpage = STAILQ_NEXT(bpage, links);
-			}
-			dmat->bounce_zone->total_bounced++;
-		}
-	}
-}
-
-static void
-init_bounce_pages(void *dummy __unused)
-{
-
-	total_bpages = 0;
-	STAILQ_INIT(&bounce_zone_list);
-	STAILQ_INIT(&bounce_map_waitinglist);
-	STAILQ_INIT(&bounce_map_callbacklist);
-	mtx_init(&bounce_lock, "bounce pages lock", NULL, MTX_DEF);
-}
-SYSINIT(bpages, SI_SUB_LOCK, SI_ORDER_ANY, init_bounce_pages, NULL);
-
-static struct sysctl_ctx_list *
-busdma_sysctl_tree(struct bounce_zone *bz)
-{
-	return (&bz->sysctl_tree);
-}
-
-static struct sysctl_oid *
-busdma_sysctl_tree_top(struct bounce_zone *bz)
-{
-	return (bz->sysctl_tree_top);
-}
-
-#if defined(__amd64__) || defined(PAE)
-#define	SYSCTL_ADD_BUS_SIZE_T	SYSCTL_ADD_UQUAD
-#else
-#define	SYSCTL_ADD_BUS_SIZE_T(ctx, parent, nbr, name, flag, ptr, desc)	\
-	SYSCTL_ADD_UINT(ctx, parent, nbr, name, flag, ptr, 0, desc)
-#endif
-
-static int
-alloc_bounce_zone(bus_dma_tag_t dmat)
-{
-	struct bounce_zone *bz;
-
-	/* Check to see if we already have a suitable zone */
-	STAILQ_FOREACH(bz, &bounce_zone_list, links) {
-		if ((dmat->alignment <= bz->alignment)
-		 && (dmat->lowaddr >= bz->lowaddr)) {
-			dmat->bounce_zone = bz;
-			return (0);
-		}
-	}
-
-	if ((bz = (struct bounce_zone *)malloc(sizeof(*bz), M_DEVBUF,
-	    M_NOWAIT | M_ZERO)) == NULL)
-		return (ENOMEM);
-
-	STAILQ_INIT(&bz->bounce_page_list);
-	bz->free_bpages = 0;
-	bz->reserved_bpages = 0;
-	bz->active_bpages = 0;
-	bz->lowaddr = dmat->lowaddr;
-	bz->alignment = MAX(dmat->alignment, PAGE_SIZE);
-	bz->map_count = 0;
-	snprintf(bz->zoneid, 8, "zone%d", busdma_zonecount);
-	busdma_zonecount++;
-	snprintf(bz->lowaddrid, 18, "%#jx", (uintmax_t)bz->lowaddr);
-	STAILQ_INSERT_TAIL(&bounce_zone_list, bz, links);
-	dmat->bounce_zone = bz;
-
-	sysctl_ctx_init(&bz->sysctl_tree);
-	bz->sysctl_tree_top = SYSCTL_ADD_NODE(&bz->sysctl_tree,
-	    SYSCTL_STATIC_CHILDREN(_hw_busdma), OID_AUTO, bz->zoneid,
-	    CTLFLAG_RD, 0, "");
-	if (bz->sysctl_tree_top == NULL) {
-		sysctl_ctx_free(&bz->sysctl_tree);
-		return (0);	/* XXX error code? */
-	}
-
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "total_bpages", CTLFLAG_RD, &bz->total_bpages, 0,
-	    "Total bounce pages");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "free_bpages", CTLFLAG_RD, &bz->free_bpages, 0,
-	    "Free bounce pages");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "reserved_bpages", CTLFLAG_RD, &bz->reserved_bpages, 0,
-	    "Reserved bounce pages");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "active_bpages", CTLFLAG_RD, &bz->active_bpages, 0,
-	    "Active bounce pages");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "total_bounced", CTLFLAG_RD, &bz->total_bounced, 0,
-	    "Total bounce requests");
-	SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "total_deferred", CTLFLAG_RD, &bz->total_deferred, 0,
-	    "Total bounce requests that were deferred");
-	SYSCTL_ADD_STRING(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "lowaddr", CTLFLAG_RD, bz->lowaddrid, 0, "");
-	SYSCTL_ADD_BUS_SIZE_T(busdma_sysctl_tree(bz),
-	    SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
-	    "alignment", CTLFLAG_RD, &bz->alignment, "");
-
-	return (0);
-}
-
-static int
-alloc_bounce_pages(bus_dma_tag_t dmat, u_int numpages)
-{
-	struct bounce_zone *bz;
-	int count;
-
-	bz = dmat->bounce_zone;
-	count = 0;
-	while (numpages > 0) {
-		struct bounce_page *bpage;
-
-		bpage = (struct bounce_page *)malloc(sizeof(*bpage), M_DEVBUF,
-						     M_NOWAIT | M_ZERO);
-
-		if (bpage == NULL)
-			break;
-		bpage->vaddr = (vm_offset_t)contigmalloc(PAGE_SIZE, M_DEVBUF,
-							 M_NOWAIT, 0ul,
-							 bz->lowaddr,
-							 PAGE_SIZE,
-							 0);
-		if (bpage->vaddr == 0) {
-			free(bpage, M_DEVBUF);
-			break;
-		}
-		bpage->busaddr = pmap_kextract(bpage->vaddr);
-		mtx_lock(&bounce_lock);
-		STAILQ_INSERT_TAIL(&bz->bounce_page_list, bpage, links);
-		total_bpages++;
-		bz->total_bpages++;
-		bz->free_bpages++;
-		mtx_unlock(&bounce_lock);
-		count++;
-		numpages--;
-	}
-	return (count);
-}
-
-static int
-reserve_bounce_pages(bus_dma_tag_t dmat, bus_dmamap_t map, int commit)
-{
-	struct bounce_zone *bz;
-	int pages;
-
-	mtx_assert(&bounce_lock, MA_OWNED);
-	bz = dmat->bounce_zone;
-	pages = MIN(bz->free_bpages, map->pagesneeded - map->pagesreserved);
-	if (commit == 0 && map->pagesneeded > (map->pagesreserved + pages))
-		return (map->pagesneeded - (map->pagesreserved + pages));
-	bz->free_bpages -= pages;
-	bz->reserved_bpages += pages;
-	map->pagesreserved += pages;
-	pages = map->pagesneeded - map->pagesreserved;
-
-	return (pages);
-}
-
-static bus_addr_t
-add_bounce_page(bus_dma_tag_t dmat, bus_dmamap_t map, vm_offset_t vaddr,
-		bus_addr_t addr, bus_size_t size)
-{
-	struct bounce_zone *bz;
-	struct bounce_page *bpage;
-
-	KASSERT(dmat->bounce_zone != NULL, ("no bounce zone in dma tag"));
-	KASSERT(map != NULL && map != &nobounce_dmamap && map != &contig_dmamap,
-	    ("add_bounce_page: bad map %p", map));
-
-	bz = dmat->bounce_zone;
-	if (map->pagesneeded == 0)
-		panic("add_bounce_page: map doesn't need any pages");
-	map->pagesneeded--;
-
-	if (map->pagesreserved == 0)
-		panic("add_bounce_page: map doesn't need any pages");
-	map->pagesreserved--;
-
-	mtx_lock(&bounce_lock);
-	bpage = STAILQ_FIRST(&bz->bounce_page_list);
-	if (bpage == NULL)
-		panic("add_bounce_page: free page list is empty");
-
-	STAILQ_REMOVE_HEAD(&bz->bounce_page_list, links);
-	bz->reserved_bpages--;
-	bz->active_bpages++;
-	mtx_unlock(&bounce_lock);
-
-	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
-		/* Page offset needs to be preserved. */
-		bpage->vaddr |= vaddr & PAGE_MASK;
-		bpage->busaddr |= vaddr & PAGE_MASK;
-	}
-	bpage->datavaddr = vaddr;
-	bpage->dataaddr = addr;
-	bpage->datacount = size;
-	STAILQ_INSERT_TAIL(&(map->bpages), bpage, links);
-	return (bpage->busaddr);
-}
-
-static void
-free_bounce_page(bus_dma_tag_t dmat, struct bounce_page *bpage)
-{
-	struct bus_dmamap *map;
-	struct bounce_zone *bz;
-
-	bz = dmat->bounce_zone;
-	bpage->datavaddr = 0;
-	bpage->datacount = 0;
-	if (dmat->flags & BUS_DMA_KEEP_PG_OFFSET) {
-		/*
-		 * Reset the bounce page to start at offset 0.  Other uses
-		 * of this bounce page may need to store a full page of
-		 * data and/or assume it starts on a page boundary.
-		 */
-		bpage->vaddr &= ~PAGE_MASK;
-		bpage->busaddr &= ~PAGE_MASK;
-	}
-
-	mtx_lock(&bounce_lock);
-	STAILQ_INSERT_HEAD(&bz->bounce_page_list, bpage, links);
-	bz->free_bpages++;
-	bz->active_bpages--;
-	if ((map = STAILQ_FIRST(&bounce_map_waitinglist)) != NULL) {
-		if (reserve_bounce_pages(map->dmat, map, 1) == 0) {
-			STAILQ_REMOVE_HEAD(&bounce_map_waitinglist, links);
-			STAILQ_INSERT_TAIL(&bounce_map_callbacklist,
-					   map, links);
-			busdma_swi_pending = 1;
-			bz->total_deferred++;
-			swi_sched(vm_ih, 0);
-		}
-	}
-	mtx_unlock(&bounce_lock);
-}
-
-void
-busdma_swi(void)
-{
-	bus_dma_tag_t dmat;
-	struct bus_dmamap *map;
-
-	mtx_lock(&bounce_lock);
-	while ((map = STAILQ_FIRST(&bounce_map_callbacklist)) != NULL) {
-		STAILQ_REMOVE_HEAD(&bounce_map_callbacklist, links);
-		mtx_unlock(&bounce_lock);
-		dmat = map->dmat;
-		(dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_LOCK);
-		bus_dmamap_load_mem(map->dmat, map, &map->mem,
-				map->callback, map->callback_arg,
-				BUS_DMA_WAITOK);
-		(dmat->lockfunc)(dmat->lockfuncarg, BUS_DMA_UNLOCK);
-		mtx_lock(&bounce_lock);
-	}
-	mtx_unlock(&bounce_lock);
+	tc = (struct bus_dma_tag_common *)dmat;
+	tc->impl->map_sync(dmat, map, op);
 }
diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c
index 4467f8fa9d9..6d62b1ea30c 100644
--- a/sys/x86/x86/io_apic.c
+++ b/sys/x86/x86/io_apic.c
@@ -922,3 +922,99 @@ DEFINE_CLASS_0(apic, apic_driver, apic_methods, 0);
 
 static devclass_t apic_devclass;
 DRIVER_MODULE(apic, nexus, apic_driver, apic_devclass, 0, 0);
+
+#include "opt_ddb.h"
+
+#ifdef DDB
+#include <ddb/ddb.h>
+
+static const char *
+ioapic_delivery_mode(uint32_t mode)
+{
+
+	switch (mode) {
+	case IOART_DELFIXED:
+		return ("fixed");
+	case IOART_DELLOPRI:
+		return ("lowestpri");
+	case IOART_DELSMI:
+		return ("SMI");
+	case IOART_DELRSV1:
+		return ("rsrvd1");
+	case IOART_DELNMI:
+		return ("NMI");
+	case IOART_DELINIT:
+		return ("INIT");
+	case IOART_DELRSV2:
+		return ("rsrvd2");
+	case IOART_DELEXINT:
+		return ("ExtINT");
+	default:
+		return ("");
+	}
+}
+
+static u_int
+db_ioapic_read(volatile ioapic_t *apic, int reg)
+{
+
+	apic->ioregsel = reg;
+	return (apic->iowin);
+}
+
+static void
+db_show_ioapic_one(volatile ioapic_t *io_addr)
+{
+	uint32_t r, lo, hi;
+	int mre, i;
+
+	r = db_ioapic_read(io_addr, IOAPIC_VER);
+	mre = (r & IOART_VER_MAXREDIR) >> MAXREDIRSHIFT;
+	db_printf("Id 0x%08x Ver 0x%02x MRE %d\n",
+	    db_ioapic_read(io_addr, IOAPIC_ID), r & IOART_VER_VERSION, mre);
+	for (i = 0; i < mre; i++) {
+		lo = db_ioapic_read(io_addr, IOAPIC_REDTBL_LO(i));
+		hi = db_ioapic_read(io_addr, IOAPIC_REDTBL_HI(i));
+		db_printf("  pin %d Dest %s/%x %smasked Trig %s RemoteIRR %d "
+		    "Polarity %s Status %s DeliveryMode %s Vec %d\n", i,
+		    (lo & IOART_DESTMOD) == IOART_DESTLOG ? "log" : "phy",
+		    (hi & IOART_DEST) >> 24,
+		    (lo & IOART_INTMASK) == IOART_INTMSET ? "" : "not",
+		    (lo & IOART_TRGRMOD) == IOART_TRGRLVL ? "lvl" : "edge",
+		    (lo & IOART_REM_IRR) == IOART_REM_IRR ? 1 : 0,
+		    (lo & IOART_INTPOL) == IOART_INTALO ? "low" : "high",
+		    (lo & IOART_DELIVS) == IOART_DELIVS ? "pend" : "idle",
+		    ioapic_delivery_mode(lo & IOART_DELMOD),
+		    (lo & IOART_INTVEC));
+	  }
+}
+
+DB_SHOW_COMMAND(ioapic, db_show_ioapic)
+{
+	struct ioapic *ioapic;
+	int idx, i;
+
+	if (!have_addr) {
+		db_printf("usage: show ioapic index\n");
+		return;
+	}
+
+	idx = (int)addr;
+	i = 0;
+	STAILQ_FOREACH(ioapic, &ioapic_list, io_next) {
+		if (idx == i) {
+			db_show_ioapic_one(ioapic->io_addr);
+			break;
+		}
+		i++;
+	}
+}
+
+DB_SHOW_ALL_COMMAND(ioapics, db_show_all_ioapics)
+{
+	struct ioapic *ioapic;
+
+	STAILQ_FOREACH(ioapic, &ioapic_list, io_next)
+		db_show_ioapic_one(ioapic->io_addr);
+}
+#endif
diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c
index 8c8eef6450d..41bd6028362 100644
--- a/sys/x86/x86/local_apic.c
+++ b/sys/x86/x86/local_apic.c
@@ -36,7 +36,6 @@ __FBSDID("$FreeBSD$");
 
 #include "opt_atpic.h"
 #include "opt_hwpmc_hooks.h"
-#include "opt_kdtrace.h"
 
 #include "opt_ddb.h"
 
@@ -112,7 +111,7 @@ struct lvt {
 };
 
 struct lapic {
-	struct lvt la_lvts[LVT_MAX + 1];
+	struct lvt la_lvts[APIC_LVT_MAX + 1];
 	u_int la_id:8;
 	u_int la_cluster:4;
 	u_int la_cluster_id:2;
@@ -126,7 +125,7 @@ struct lapic {
 } static lapics[MAX_APIC_ID + 1];
 
 /* Global defaults for local APIC LVT entries. */
-static struct lvt lvts[LVT_MAX + 1] = {
+static struct lvt lvts[APIC_LVT_MAX + 1] = {
 	{ 1, 1, 1, 1, APIC_LVT_DM_EXTINT, 0 },	/* LINT0: masked ExtINT */
 	{ 1, 1, 0, 1, APIC_LVT_DM_NMI, 0 },	/* LINT1: NMI */
 	{ 1, 1, 1, 1, APIC_LVT_DM_FIXED, APIC_TIMER_INT },	/* Timer */
@@ -180,7 +179,7 @@ lvt_mode(struct lapic *la, u_int pin, uint32_t value)
 {
 	struct lvt *lvt;
 
-	KASSERT(pin <= LVT_MAX, ("%s: pin %u out of range", __func__, pin));
+	KASSERT(pin <= APIC_LVT_MAX, ("%s: pin %u out of range", __func__, pin));
 	if (la->la_lvts[pin].lvt_active)
 		lvt = &la->la_lvts[pin];
 	else
@@ -301,7 +300,7 @@ lapic_create(u_int apic_id, int boot_cpu)
 	 */
 	lapics[apic_id].la_present = 1;
 	lapics[apic_id].la_id = apic_id;
-	for (i = 0; i <= LVT_MAX; i++) {
+	for (i = 0; i <= APIC_LVT_MAX; i++) {
 		lapics[apic_id].la_lvts[i] = lvts[i];
 		lapics[apic_id].la_lvts[i].lvt_active = 0;
 	}
@@ -340,10 +339,10 @@ lapic_dump(const char* str)
 	    lapic->lvt_lint0, lapic->lvt_lint1, lapic->tpr, lapic->svr);
 	printf("  timer: 0x%08x therm: 0x%08x err: 0x%08x",
 	    lapic->lvt_timer, lapic->lvt_thermal, lapic->lvt_error);
-	if (maxlvt >= LVT_PMC)
+	if (maxlvt >= APIC_LVT_PMC)
 		printf(" pmc: 0x%08x", lapic->lvt_pcint);
 	printf("\n");
-	if (maxlvt >= LVT_CMCI)
+	if (maxlvt >= APIC_LVT_CMCI)
 		printf("   cmci: 0x%08x\n", lapic->lvt_cmci);
 }
 
@@ -367,16 +366,16 @@ lapic_setup(int boot)
 	lapic_enable();
 
 	/* Program LINT[01] LVT entries. */
-	lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0);
-	lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1);
+	lapic->lvt_lint0 = lvt_mode(la, APIC_LVT_LINT0, lapic->lvt_lint0);
+	lapic->lvt_lint1 = lvt_mode(la, APIC_LVT_LINT1, lapic->lvt_lint1);
 
 	/* Program the PMC LVT entry if present. */
-	if (maxlvt >= LVT_PMC)
-		lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint);
+	if (maxlvt >= APIC_LVT_PMC)
+		lapic->lvt_pcint = lvt_mode(la, APIC_LVT_PMC, lapic->lvt_pcint);
 
 	/* Program timer LVT and setup handler. */
 	la->lvt_timer_cache = lapic->lvt_timer =
-	    lvt_mode(la, LVT_TIMER, lapic->lvt_timer);
+	    lvt_mode(la, APIC_LVT_TIMER, lapic->lvt_timer);
 	if (boot) {
 		snprintf(buf, sizeof(buf), "cpu%d:timer", PCPU_GET(cpuid));
 		intrcnt_add(buf, &la->la_timer_count);
@@ -394,14 +393,14 @@ lapic_setup(int boot)
 	}
 
 	/* Program error LVT and clear any existing errors. */
-	lapic->lvt_error = lvt_mode(la, LVT_ERROR, lapic->lvt_error);
+	lapic->lvt_error = lvt_mode(la, APIC_LVT_ERROR, lapic->lvt_error);
 	lapic->esr = 0;
 
 	/* XXX: Thermal LVT */
 
 	/* Program the CMCI LVT entry if present. */
-	if (maxlvt >= LVT_CMCI)
-		lapic->lvt_cmci = lvt_mode(la, LVT_CMCI, lapic->lvt_cmci);
+	if (maxlvt >= APIC_LVT_CMCI)
+		lapic->lvt_cmci = lvt_mode(la, APIC_LVT_CMCI, lapic->lvt_cmci);
 	    
 	intr_restore(saveintr);
 }
@@ -425,7 +424,7 @@ lapic_update_pmc(void *dummy)
 	struct lapic *la;
 
 	la = &lapics[lapic_id()];
-	lapic->lvt_pcint = lvt_mode(la, LVT_PMC, lapic->lvt_pcint);
+	lapic->lvt_pcint = lvt_mode(la, APIC_LVT_PMC, lapic->lvt_pcint);
 }
 #endif
 
@@ -441,10 +440,10 @@ lapic_enable_pmc(void)
 
 	/* Fail if the PMC LVT is not present. */
 	maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT;
-	if (maxlvt < LVT_PMC)
+	if (maxlvt < APIC_LVT_PMC)
 		return (0);
 
-	lvts[LVT_PMC].lvt_masked = 0;
+	lvts[APIC_LVT_PMC].lvt_masked = 0;
 
 #ifdef SMP
 	/*
@@ -475,10 +474,10 @@ lapic_disable_pmc(void)
 
 	/* Fail if the PMC LVT is not present. */
 	maxlvt = (lapic->version & APIC_VER_MAXLVT) >> MAXLVTSHIFT;
-	if (maxlvt < LVT_PMC)
+	if (maxlvt < APIC_LVT_PMC)
 		return;
 
-	lvts[LVT_PMC].lvt_masked = 1;
+	lvts[APIC_LVT_PMC].lvt_masked = 1;
 
 #ifdef SMP
 	/* The APs should always be started when hwpmc is unloaded. */
@@ -618,7 +617,7 @@ int
 lapic_set_lvt_mask(u_int apic_id, u_int pin, u_char masked)
 {
 
-	if (pin > LVT_MAX)
+	if (pin > APIC_LVT_MAX)
 		return (EINVAL);
 	if (apic_id == APIC_ID_ALL) {
 		lvts[pin].lvt_masked = masked;
@@ -642,7 +641,7 @@ lapic_set_lvt_mode(u_int apic_id, u_int pin, u_int32_t mode)
 {
 	struct lvt *lvt;
 
-	if (pin > LVT_MAX)
+	if (pin > APIC_LVT_MAX)
 		return (EINVAL);
 	if (apic_id == APIC_ID_ALL) {
 		lvt = &lvts[pin];
@@ -697,7 +696,7 @@ int
 lapic_set_lvt_polarity(u_int apic_id, u_int pin, enum intr_polarity pol)
 {
 
-	if (pin > LVT_MAX || pol == INTR_POLARITY_CONFORM)
+	if (pin > APIC_LVT_MAX || pol == INTR_POLARITY_CONFORM)
 		return (EINVAL);
 	if (apic_id == APIC_ID_ALL) {
 		lvts[pin].lvt_activehi = (pol == INTR_POLARITY_HIGH);
@@ -722,7 +721,7 @@ int
 lapic_set_lvt_triggermode(u_int apic_id, u_int pin, enum intr_trigger trigger)
 {
 
-	if (pin > LVT_MAX || trigger == INTR_TRIGGER_CONFORM)
+	if (pin > APIC_LVT_MAX || trigger == INTR_TRIGGER_CONFORM)
 		return (EINVAL);
 	if (apic_id == APIC_ID_ALL) {
 		lvts[pin].lvt_edgetrigger = (trigger == INTR_TRIGGER_EDGE);
@@ -895,8 +894,8 @@ lapic_enable_cmc(void)
 	apic_id = PCPU_GET(apic_id);
 	KASSERT(lapics[apic_id].la_present,
 	    ("%s: missing APIC %u", __func__, apic_id));
-	lapics[apic_id].la_lvts[LVT_CMCI].lvt_masked = 0;
-	lapics[apic_id].la_lvts[LVT_CMCI].lvt_active = 1;
+	lapics[apic_id].la_lvts[APIC_LVT_CMCI].lvt_masked = 0;
+	lapics[apic_id].la_lvts[APIC_LVT_CMCI].lvt_active = 1;
 	if (bootverbose)
 		printf("lapic%u: CMCI unmasked\n", apic_id);
 }
diff --git a/sys/x86/x86/mptable.c b/sys/x86/x86/mptable.c
index fe520eb4cfd..f9fdbf3c0cd 100644
--- a/sys/x86/x86/mptable.c
+++ b/sys/x86/x86/mptable.c
@@ -786,9 +786,9 @@ mptable_parse_local_int(int_entry_ptr intr)
 	else
 		apic_id = intr->dst_apic_id;
 	if (intr->dst_apic_int == 0)
-		pin = LVT_LINT0;
+		pin = APIC_LVT_LINT0;
 	else
-		pin = LVT_LINT1;
+		pin = APIC_LVT_LINT1;
 	switch (intr->int_type) {
 	case INTENTRY_TYPE_INT:
 #if 1
@@ -902,8 +902,9 @@ mptable_parse_ints(void)
 	/* Is this a pre-defined config? */
 	if (mpfps->config_type != 0) {
 		/* Configure LINT pins. */
-		lapic_set_lvt_mode(APIC_ID_ALL, LVT_LINT0, APIC_LVT_DM_EXTINT);
-		lapic_set_lvt_mode(APIC_ID_ALL, LVT_LINT1, APIC_LVT_DM_NMI);
+		lapic_set_lvt_mode(APIC_ID_ALL, APIC_LVT_LINT0,
+		    APIC_LVT_DM_EXTINT);
+		lapic_set_lvt_mode(APIC_ID_ALL, APIC_LVT_LINT1, APIC_LVT_DM_NMI);
 
 		/* Configure I/O APIC pins. */
 		mptable_parse_default_config_ints();
diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c
index 510b8b9a9e7..72811dca5e1 100644
--- a/sys/x86/xen/hvm.c
+++ b/sys/x86/xen/hvm.c
@@ -743,6 +743,22 @@ xen_hvm_sysinit(void *arg __unused)
 	xen_hvm_init(XEN_HVM_INIT_COLD);
 }
 
+static void
+xen_set_vcpu_id(void)
+{
+	struct pcpu *pc;
+	int i;
+
+	/* Set vcpu_id to acpi_id */
+	CPU_FOREACH(i) {
+		pc = pcpu_find(i);
+		pc->pc_vcpu_id = pc->pc_acpi_id;
+		if (bootverbose)
+			printf("XEN: CPU %u has VCPU ID %u\n",
+			       i, pc->pc_vcpu_id);
+	}
+}
+
 static void
 xen_hvm_cpu_init(void)
 {
@@ -763,7 +779,7 @@ xen_hvm_cpu_init(void)
 	}
 
 	vcpu_info = DPCPU_PTR(vcpu_local_info);
-	cpu = PCPU_GET(acpi_id);
+	cpu = PCPU_GET(vcpu_id);
 	info.mfn = vtophys(vcpu_info) >> PAGE_SHIFT;
 	info.offset = vtophys(vcpu_info) - trunc_page(vtophys(vcpu_info));
 
@@ -779,3 +795,4 @@ SYSINIT(xen_hvm_init, SI_SUB_HYPERVISOR, SI_ORDER_FIRST, xen_hvm_sysinit, NULL);
 SYSINIT(xen_setup_cpus, SI_SUB_SMP, SI_ORDER_FIRST, xen_setup_cpus, NULL);
 #endif
 SYSINIT(xen_hvm_cpu_init, SI_SUB_INTR, SI_ORDER_FIRST, xen_hvm_cpu_init, NULL);
+SYSINIT(xen_set_vcpu_id, SI_SUB_CPU, SI_ORDER_ANY, xen_set_vcpu_id, NULL);
diff --git a/sys/x86/xen/xen_intr.c b/sys/x86/xen/xen_intr.c
index b94f8d98018..fd36e680c31 100644
--- a/sys/x86/xen/xen_intr.c
+++ b/sys/x86/xen/xen_intr.c
@@ -611,9 +611,9 @@ xen_rebind_ipi(struct xenisrc *isrc)
 {
 #ifdef SMP
 	int cpu = isrc->xi_cpu;
-	int acpi_id = pcpu_find(cpu)->pc_acpi_id;
+	int vcpu_id = pcpu_find(cpu)->pc_vcpu_id;
 	int error;
-	struct evtchn_bind_ipi bind_ipi = { .vcpu = acpi_id };
+	struct evtchn_bind_ipi bind_ipi = { .vcpu = vcpu_id };
 
 	error = HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi,
 	                                    &bind_ipi);
@@ -640,10 +640,10 @@ static void
 xen_rebind_virq(struct xenisrc *isrc)
 {
 	int cpu = isrc->xi_cpu;
-	int acpi_id = pcpu_find(cpu)->pc_acpi_id;
+	int vcpu_id = pcpu_find(cpu)->pc_vcpu_id;
 	int error;
 	struct evtchn_bind_virq bind_virq = { .virq = isrc->xi_virq,
-	                                      .vcpu = acpi_id };
+	                                      .vcpu = vcpu_id };
 
 	error = HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq,
 	                                    &bind_virq);
@@ -796,7 +796,7 @@ xen_intr_assign_cpu(struct intsrc *base_isrc, u_int apic_id)
 #ifdef SMP
 	struct evtchn_bind_vcpu bind_vcpu;
 	struct xenisrc *isrc;
-	u_int to_cpu, acpi_id;
+	u_int to_cpu, vcpu_id;
 	int error;
 
 #ifdef XENHVM
@@ -805,7 +805,7 @@ xen_intr_assign_cpu(struct intsrc *base_isrc, u_int apic_id)
 #endif
 
 	to_cpu = apic_cpuid(apic_id);
-	acpi_id = pcpu_find(to_cpu)->pc_acpi_id;
+	vcpu_id = pcpu_find(to_cpu)->pc_vcpu_id;
 	xen_intr_intrcnt_add(to_cpu);
 
 	mtx_lock(&xen_intr_isrc_lock);
@@ -830,7 +830,7 @@ xen_intr_assign_cpu(struct intsrc *base_isrc, u_int apic_id)
 	}
 
 	bind_vcpu.port = isrc->xi_port;
-	bind_vcpu.vcpu = acpi_id;
+	bind_vcpu.vcpu = vcpu_id;
 
 	/*
 	 * Allow interrupts to be fielded on the new VCPU before
@@ -1063,9 +1063,9 @@ xen_intr_bind_virq(device_t dev, u_int virq, u_int cpu,
     driver_filter_t filter, driver_intr_t handler, void *arg,
     enum intr_type flags, xen_intr_handle_t *port_handlep)
 {
-	int acpi_id = pcpu_find(cpu)->pc_acpi_id;
+	int vcpu_id = pcpu_find(cpu)->pc_vcpu_id;
 	struct xenisrc *isrc;
-	struct evtchn_bind_virq bind_virq = { .virq = virq, .vcpu = acpi_id };
+	struct evtchn_bind_virq bind_virq = { .virq = virq, .vcpu = vcpu_id };
 	int error;
 
 	/* Ensure the target CPU is ready to handle evtchn interrupts. */
@@ -1126,9 +1126,9 @@ xen_intr_alloc_and_bind_ipi(device_t dev, u_int cpu,
     xen_intr_handle_t *port_handlep)
 {
 #ifdef SMP
-	int acpi_id = pcpu_find(cpu)->pc_acpi_id;
+	int vcpu_id = pcpu_find(cpu)->pc_vcpu_id;
 	struct xenisrc *isrc;
-	struct evtchn_bind_ipi bind_ipi = { .vcpu = acpi_id };
+	struct evtchn_bind_ipi bind_ipi = { .vcpu = vcpu_id };
 	int error;
 
 	/* Ensure the target CPU is ready to handle evtchn interrupts. */
diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h
index 95e8c6a3a4b..87644e978e1 100644
--- a/sys/xen/xen-os.h
+++ b/sys/xen/xen-os.h
@@ -50,8 +50,6 @@
 /* Force a proper event-channel callback from Xen. */
 void force_evtchn_callback(void);
 
-extern int gdtset;
-
 extern shared_info_t *HYPERVISOR_shared_info;
 
 enum xen_domain_type {
diff --git a/tests/Kyuafile b/tests/Kyuafile
new file mode 100644
index 00000000000..10cf039ae04
--- /dev/null
+++ b/tests/Kyuafile
@@ -0,0 +1,52 @@
+-- $FreeBSD$
+--
+-- Copyright 2011 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.
+
+-- Automatically recurses into any subdirectory that holds a Kyuafile.
+-- As such, this Kyuafile is suitable for installation into the root of
+-- the tests hierarchy as well as into any other subdirectory that needs
+-- "auto-discovery" of tests.
+--
+-- This file is based on the Kyuafile.top sample file distributed in the
+-- kyua-cli package.
+
+syntax(2)
+
+local directory = fs.dirname(current_kyuafile())
+for file in fs.files(directory) do
+    if file == "." or file == ".." then
+        -- Skip these special entries.
+    else
+        local kyuafile_relative = fs.join(file, "Kyuafile")
+        local kyuafile_absolute = fs.join(directory, kyuafile_relative)
+        if fs.exists(kyuafile_absolute) then
+            include(kyuafile_relative)
+        end
+    end
+end
diff --git a/tests/Makefile b/tests/Makefile
new file mode 100644
index 00000000000..88386eb3700
--- /dev/null
+++ b/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+SUBDIR= # still empty
+
+TESTSDIR= ${TESTSBASE}
+KYUAFILE= yes
+
+.include <bsd.test.mk>
diff --git a/tests/README b/tests/README
new file mode 100644
index 00000000000..416cea7f0ae
--- /dev/null
+++ b/tests/README
@@ -0,0 +1,55 @@
+src/tests: The FreeBSD test suite
+=================================
+
+This file describes the build infrastructure of the FreeBSD test suite.
+If you are only interested in using the test suite itself, please refer
+to tests(7) instead.
+
+The build of the test suite is organized in the following manner:
+
+* The build of all test artifacts is protected by the MK_TESTS knob.
+  The user can disable these with the WITHOUT_TESTS setting in
+  src.conf(5).
+
+* The goal for /usr/tests/ (the installed test programs) is to follow
+  the same hierarchy as /usr/src/ wherever possible, which in turn drives
+  several of the design decisions described below.  This simplifies the
+  discoverability of tests.  We want a mapping such as:
+
+    /usr/src/bin/cp/      -> /usr/tests/bin/cp/
+    /usr/src/lib/libc/    -> /usr/tests/lib/libc/
+    /usr/src/usr.bin/cut/ -> /usr/tests/usr.bin/cut/
+    ... and many more ...
+
+* Test programs for specific utilities and libraries are located next
+  to the source code of such programs.  For example, the tests for the
+  src/lib/libcrypt/ library live in src/lib/libcrypt/tests/.  The tests/
+  subdirectory is optional and should, in general, be avoided.
+
+* The src/tests/ hierarchy (this directory) provides generic test
+  infrastructure and glue code to join all test programs together into
+  a single test suite definition.
+
+* The src/tests/ hierarchy also includes cross-functional test programs:
+  i.e. test programs that cover more than a single utility or library
+  and thus don't fit anywhere else in the tree.  Consider this to follow
+  the same rationale as src/share/man/: this directory contains generic
+  manual pages while the manual pages that are specific to individual
+  tools or libraries live next to the source code.
+
+In order to keep the src/tests/ hierarchy decoupled from the actual test
+programs being installed --which is a worthy goal because it simplifies
+the addition of new test programs and simplifies the maintenance of the
+tree-- the top-level Kyuafile does not know which subdirectories may
+exist upfront.  Instead, such Kyuafile automatically detects, at
+run-time, which */Kyuafile files exist and uses those directly.
+
+Similarly, every directory in src/ that wants to install a Kyuafile to
+just recurse into other subdirectories reuses this Kyuafile with
+auto-discovery features.  As an example, take a look at src/lib/tests/
+whose sole purpose is to install a Kyuafile into /usr/tests/lib/.
+The goal in this specific case is for /usr/tests/lib/ to be generated
+entirely from src/lib/.
+
+-- 
+$FreeBSD$
diff --git a/tests/lib/Makefile b/tests/lib/Makefile
new file mode 100644
index 00000000000..29b85b3f2f4
--- /dev/null
+++ b/tests/lib/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR= ${TESTSBASE}/lib
+
+KYUAFILE= yes
+
+CLEANFILES+= Kyuafile
+Kyuafile: ${.CURDIR}/../Kyuafile
+	cp -f ${.CURDIR}/../Kyuafile .
+
+.include <bsd.test.mk>
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index dada14d115b..3bb942bca5d 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -68,78 +68,6 @@ OLD_FILES+=usr/share/man/man1/batch.1.gz
 OLD_FILES+=usr/share/man/man8/atrun.8.gz
 .endif
 
-.if ${MK_ATF} == no
-OLD_DIRS+=etc/atf
-OLD_FILES+=etc/atf/FreeBSD.conf
-OLD_FILES+=etc/atf/atf-run.hooks
-OLD_FILES+=etc/atf/common.conf
-OLD_FILES+=usr/bin/atf-config
-OLD_FILES+=usr/bin/atf-report
-OLD_FILES+=usr/bin/atf-run
-OLD_FILES+=usr/bin/atf-sh
-OLD_FILES+=usr/bin/atf-version
-OLD_DIRS+=usr/include/atf-c
-OLD_FILES+=usr/include/atf-c/build.h
-OLD_FILES+=usr/include/atf-c/check.h
-OLD_FILES+=usr/include/atf-c/config.h
-OLD_FILES+=usr/include/atf-c/defs.h
-OLD_FILES+=usr/include/atf-c/error.h
-OLD_FILES+=usr/include/atf-c/error_fwd.h
-OLD_FILES+=usr/include/atf-c/macros.h
-OLD_FILES+=usr/include/atf-c/tc.h
-OLD_FILES+=usr/include/atf-c/tp.h
-OLD_FILES+=usr/include/atf-c/utils.h
-OLD_FILES+=usr/include/atf-c/atf-c.h
-OLD_FILES+=usr/include/atf-c.h
-OLD_DIRS+=usr/include/atf-c++
-OLD_FILES+=usr/include/atf-c++/build.hpp
-OLD_FILES+=usr/include/atf-c++/check.hpp
-OLD_FILES+=usr/include/atf-c++/config.hpp
-OLD_FILES+=usr/include/atf-c++/macros.hpp
-OLD_FILES+=usr/include/atf-c++/tests.hpp
-OLD_FILES+=usr/include/atf-c++/utils.hpp
-OLD_FILES+=usr/include/atf-c++/atf-c++.hpp
-OLD_FILES+=usr/include/atf-c++.hpp
-OLD_FILES+=usr/lib/libatf-c_p.a
-OLD_FILES+=usr/lib/libatf-c.so.1
-OLD_FILES+=usr/lib/libatf-c.so
-OLD_FILES+=usr/lib/libatf-c++.a
-OLD_FILES+=usr/lib/libatf-c++_p.a
-OLD_FILES+=usr/lib/libatf-c++.so.1
-OLD_FILES+=usr/lib/libatf-c++.so
-OLD_FILES+=usr/lib/libatf-c.a
-OLD_FILES+=usr/libexec/atf-check
-OLD_DIRS+=usr/share/atf
-OLD_FILES+=usr/share/atf/atf-run.hooks
-OLD_FILES+=usr/share/atf/libatf-sh.subr
-OLD_DIRS+=usr/share/doc/atf
-OLD_FILES+=usr/share/doc/atf/AUTHORS
-OLD_FILES+=usr/share/doc/atf/COPYING
-OLD_FILES+=usr/share/doc/atf/NEWS
-OLD_FILES+=usr/share/doc/atf/README
-OLD_DIRS+=usr/share/examples/atf
-OLD_FILES+=usr/share/examples/atf/atf-run.hooks
-OLD_FILES+=usr/share/examples/atf/tests-results.css
-OLD_FILES+=usr/share/man/man1/atf-check.1.gz
-OLD_FILES+=usr/share/man/man1/atf-config.1.gz
-OLD_FILES+=usr/share/man/man1/atf-report.1.gz
-OLD_FILES+=usr/share/man/man1/atf-run.1.gz
-OLD_FILES+=usr/share/man/man1/atf-sh.1.gz
-OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz
-OLD_FILES+=usr/share/man/man1/atf-version.1.gz
-OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
-OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
-OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz
-OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz
-OLD_FILES+=usr/share/man/man5/atf-formats.5.gz
-OLD_FILES+=usr/share/man/man7/atf.7.gz
-OLD_FILES+=usr/share/mk/atf.test.mk
-OLD_DIRS+=usr/share/xml/atf
-OLD_FILES+=usr/share/xml/atf/tests-results.dtd
-OLD_DIRS+=usr/share/xsl/atf
-OLD_FILES+=usr/share/xsl/atf/tests-results.xsl
-.endif
-
 .if ${MK_ATM} == no
 OLD_FILES+=rescue/atmconfig
 OLD_FILES+=sbin/atmconfig
@@ -149,6 +77,7 @@ OLD_FILES+=usr/include/netnatm/addr.h
 OLD_FILES+=usr/include/netnatm/api/atmapi.h
 OLD_FILES+=usr/include/netnatm/api/ccatm.h
 OLD_FILES+=usr/include/netnatm/api/unisap.h
+OLD_DIRS+=usr/include/netnatm/api
 OLD_FILES+=usr/include/netnatm/msg/uni_config.h
 OLD_FILES+=usr/include/netnatm/msg/uni_hdr.h
 OLD_FILES+=usr/include/netnatm/msg/uni_ie.h
@@ -156,13 +85,16 @@ OLD_FILES+=usr/include/netnatm/msg/uni_msg.h
 OLD_FILES+=usr/include/netnatm/msg/unimsglib.h
 OLD_FILES+=usr/include/netnatm/msg/uniprint.h
 OLD_FILES+=usr/include/netnatm/msg/unistruct.h
+OLD_DIRS+=usr/include/netnatm/msg
 OLD_FILES+=usr/include/netnatm/saal/sscfu.h
 OLD_FILES+=usr/include/netnatm/saal/sscfudef.h
 OLD_FILES+=usr/include/netnatm/saal/sscop.h
 OLD_FILES+=usr/include/netnatm/saal/sscopdef.h
+OLD_DIRS+=usr/include/netnatm/saal
 OLD_FILES+=usr/include/netnatm/sig/uni.h
 OLD_FILES+=usr/include/netnatm/sig/unidef.h
 OLD_FILES+=usr/include/netnatm/sig/unisig.h
+OLD_DIRS+=usr/include/netnatm/sig
 OLD_FILES+=usr/include/netnatm/unimsg.h
 OLD_FILES+=usr/lib/libngatm.a
 OLD_FILES+=usr/lib/libngatm.so
@@ -178,6 +110,7 @@ OLD_FILES+=usr/lib32/libngatm_p.a
 .endif
 OLD_FILES+=usr/share/doc/atm/atmconfig.help
 OLD_FILES+=usr/share/doc/atm/atmconfig_device.help
+OLD_DIRS+=usr/share/doc/atm
 OLD_FILES+=usr/share/man/man1/sscop.1.gz
 OLD_FILES+=usr/share/man/man3/libngatm.3.gz
 OLD_FILES+=usr/share/man/man3/snmp_atm.3.gz
@@ -215,6 +148,7 @@ OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz
 OLD_FILES+=etc/bluetooth/hcsecd.conf
 OLD_FILES+=etc/bluetooth/hosts
 OLD_FILES+=etc/bluetooth/protocols
+OLD_DIRS+=etc/bluetooth
 OLD_FILES+=usr/bin/bthost
 OLD_FILES+=usr/bin/btsockstat
 OLD_FILES+=usr/bin/rfcomm_sppd
@@ -346,6 +280,7 @@ OLD_FILES+=usr/bin/calendar
 OLD_FILES+=usr/share/calendar/calendar.all
 OLD_FILES+=usr/share/calendar/calendar.australia
 OLD_FILES+=usr/share/calendar/calendar.birthday
+OLD_FILES+=usr/share/calendar/calendar.brazilian
 OLD_FILES+=usr/share/calendar/calendar.christian
 OLD_FILES+=usr/share/calendar/calendar.computer
 OLD_FILES+=usr/share/calendar/calendar.croatian
@@ -365,8 +300,8 @@ OLD_FILES+=usr/share/calendar/calendar.southafrica
 OLD_FILES+=usr/share/calendar/calendar.ukrainian
 OLD_FILES+=usr/share/calendar/calendar.usholiday
 OLD_FILES+=usr/share/calendar/calendar.world
-OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
 OLD_FILES+=usr/share/calendar/de_AT.ISO_8859-15/calendar.feiertag
+OLD_DIRS+=usr/share/calendar/de_AT.ISO_8859-15
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.feiertag
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.geschichte
@@ -374,29 +309,52 @@ OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.kirche
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.literatur
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.musik
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-1/calendar.wissenschaft
+OLD_DIRS+=usr/share/calendar/de_DE.ISO8859-1
 OLD_FILES+=usr/share/calendar/de_DE.ISO8859-15
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.all
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.fetes
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.french
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.jferies
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-1/calendar.proverbes
+OLD_DIRS+=usr/share/calendar/fr_FR.ISO8859-1
 OLD_FILES+=usr/share/calendar/fr_FR.ISO8859-15
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hr_HR.ISO8859-2/calendar.praznici
+OLD_DIRS+=usr/share/calendar/hr_HR.ISO8859-2
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.all
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.nevnapok
 OLD_FILES+=usr/share/calendar/hu_HU.ISO8859-2/calendar.unnepek
+OLD_DIRS+=usr/share/calendar/hu_HU.ISO8859-2
+OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.all
+OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.commemorative
+OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.holidays
+OLD_FILES+=usr/share/calendar/pt_BR.ISO8859-1/calendar.mcommemorative
+OLD_DIRS+=usr/share/calendar/pt_BR.ISO8859-1
+OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.all
+OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.commemorative
+OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.holidays
+OLD_FILES+=usr/share/calendar/pt_BR.UTF-8/calendar.mcommemorative
+OLD_DIRS+=usr/share/calendar/pt_BR.UTF-8
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.all
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.common
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.holiday
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.military
-OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.msk
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.orthodox
 OLD_FILES+=usr/share/calendar/ru_RU.KOI8-R/calendar.pagan
+OLD_DIRS+=usr/share/calendar/ru_RU.KOI8-R
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.all
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.common
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.holiday
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.military
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.orthodox
+OLD_FILES+=usr/share/calendar/ru_RU.UTF-8/calendar.pagan
+OLD_DIRS+=usr/share/calendar/ru_RU.UTF-8
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.all
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.holiday
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.misc
 OLD_FILES+=usr/share/calendar/uk_UA.KOI8-U/calendar.orthodox
+OLD_DIRS+=usr/share/calendar/uk_UA.KOI8-U
+OLD_DIRS+=usr/share/calendar
 OLD_FILES+=usr/share/man/man1/calendar.1.gz
 .endif
 
@@ -413,9 +371,17 @@ OLD_FILES+=usr/bin/ctfmerge
 OLD_FILES+=usr/bin/sgsmsg
 OLD_FILES+=usr/lib/dtrace/drti.o
 OLD_FILES+=usr/lib/dtrace/errno.d
+OLD_FILES+=usr/lib/dtrace/io.d
+OLD_FILES+=usr/lib/dtrace/ip.d
 OLD_FILES+=usr/lib/dtrace/psinfo.d
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/lib/dtrace/regs_x86.d
+.endif
 OLD_FILES+=usr/lib/dtrace/signal.d
+OLD_FILES+=usr/lib/dtrace/tcp.d
+OLD_FILES+=usr/lib/dtrace/udp.d
 OLD_FILES+=usr/lib/dtrace/unistd.d
+OLD_DIRS+=usr/lib/dtrace
 OLD_FILES+=usr/lib/libavl.a
 OLD_FILES+=usr/lib/libavl.so
 OLD_FILES+=usr/lib/libavl_p.a
@@ -436,6 +402,7 @@ OLD_FILES+=usr/lib/libuutil.so
 OLD_FILES+=usr/lib/libuutil_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/dtrace/drti.o
+OLD_DIRS+=usr/lib32/dtrace
 OLD_FILES+=usr/lib32/libavl.a
 OLD_FILES+=usr/lib32/libavl.so
 OLD_LIBS+=usr/lib32/libavl.so.2
@@ -473,6 +440,7 @@ OLD_FILES+=boot/zfsloader
 OLD_FILES+=etc/periodic/daily/404.status-zfs
 OLD_FILES+=etc/periodic/daily/800.scrub-zfs
 OLD_LIBS+=lib/libzfs.so.2
+OLD_LIBS+=lib/libzfs_core.so.2
 OLD_LIBS+=lib/libzpool.so.2
 OLD_FILES+=rescue/zfs
 OLD_FILES+=rescue/zpool
@@ -482,6 +450,9 @@ OLD_FILES+=usr/bin/zinject
 OLD_FILES+=usr/bin/ztest
 OLD_FILES+=usr/lib/libzfs.a
 OLD_FILES+=usr/lib/libzfs.so
+OLD_FILES+=usr/lib/libzfs_core.a
+OLD_FILES+=usr/lib/libzfs_core.so
+OLD_FILES+=usr/lib/libzfs_core_p.a
 OLD_FILES+=usr/lib/libzfs_p.a
 OLD_FILES+=usr/lib/libzpool.a
 OLD_FILES+=usr/lib/libzpool.so
@@ -489,6 +460,10 @@ OLD_FILES+=usr/lib/libzpool.so
 OLD_FILES+=usr/lib32/libzfs.a
 OLD_FILES+=usr/lib32/libzfs.so
 OLD_LIBS+=usr/lib32/libzfs.so.2
+OLD_FILES+=usr/lib32/libzfs_core.a
+OLD_FILES+=usr/lib32/libzfs_core.so
+OLD_LIBS+=usr/lib32/libzfs_core.so.2
+OLD_FILES+=usr/lib32/libzfs_core_p.a
 OLD_FILES+=usr/lib32/libzfs_p.a
 OLD_FILES+=usr/lib32/libzpool.a
 OLD_FILES+=usr/lib32/libzpool.so
@@ -506,90 +481,6 @@ OLD_FILES+=usr/bin/clang++
 OLD_FILES+=usr/bin/clang-cpp
 OLD_FILES+=usr/bin/clang-tblgen
 OLD_FILES+=usr/bin/tblgen
-OLD_FILES+=usr/include/clang/2.8/emmintrin.h
-OLD_FILES+=usr/include/clang/2.8/mm_malloc.h
-OLD_FILES+=usr/include/clang/2.8/mmintrin.h
-OLD_FILES+=usr/include/clang/2.8/pmmintrin.h
-OLD_FILES+=usr/include/clang/2.8/tmmintrin.h
-OLD_FILES+=usr/include/clang/2.8/xmmintrin.h
-OLD_DIRS+=usr/include/clang/2.8
-OLD_FILES+=usr/include/clang/2.9/emmintrin.h
-OLD_FILES+=usr/include/clang/2.9/mm_malloc.h
-OLD_FILES+=usr/include/clang/2.9/mmintrin.h
-OLD_FILES+=usr/include/clang/2.9/pmmintrin.h
-OLD_FILES+=usr/include/clang/2.9/tmmintrin.h
-OLD_FILES+=usr/include/clang/2.9/xmmintrin.h
-OLD_DIRS+=usr/include/clang/2.9
-OLD_FILES+=usr/include/clang/3.0/altivec.h
-OLD_FILES+=usr/include/clang/3.0/avxintrin.h
-OLD_FILES+=usr/include/clang/3.0/emmintrin.h
-OLD_FILES+=usr/include/clang/3.0/immintrin.h
-OLD_FILES+=usr/include/clang/3.0/mm3dnow.h
-OLD_FILES+=usr/include/clang/3.0/mm_malloc.h
-OLD_FILES+=usr/include/clang/3.0/mmintrin.h
-OLD_FILES+=usr/include/clang/3.0/nmmintrin.h
-OLD_FILES+=usr/include/clang/3.0/pmmintrin.h
-OLD_FILES+=usr/include/clang/3.0/smmintrin.h
-OLD_FILES+=usr/include/clang/3.0/tmmintrin.h
-OLD_FILES+=usr/include/clang/3.0/wmmintrin.h
-OLD_FILES+=usr/include/clang/3.0/x86intrin.h
-OLD_FILES+=usr/include/clang/3.0/xmmintrin.h
-OLD_DIRS+=usr/include/clang/3.0
-OLD_FILES+=usr/include/clang/3.1/altivec.h
-OLD_FILES+=usr/include/clang/3.1/avx2intrin.h
-OLD_FILES+=usr/include/clang/3.1/avxintrin.h
-OLD_FILES+=usr/include/clang/3.1/bmi2intrin.h
-OLD_FILES+=usr/include/clang/3.1/bmiintrin.h
-OLD_FILES+=usr/include/clang/3.1/cpuid.h
-OLD_FILES+=usr/include/clang/3.1/emmintrin.h
-OLD_FILES+=usr/include/clang/3.1/fma4intrin.h
-OLD_FILES+=usr/include/clang/3.1/immintrin.h
-OLD_FILES+=usr/include/clang/3.1/lzcntintrin.h
-OLD_FILES+=usr/include/clang/3.1/mm3dnow.h
-OLD_FILES+=usr/include/clang/3.1/mm_malloc.h
-OLD_FILES+=usr/include/clang/3.1/mmintrin.h
-OLD_FILES+=usr/include/clang/3.1/module.map
-OLD_FILES+=usr/include/clang/3.1/nmmintrin.h
-OLD_FILES+=usr/include/clang/3.1/pmmintrin.h
-OLD_FILES+=usr/include/clang/3.1/popcntintrin.h
-OLD_FILES+=usr/include/clang/3.1/smmintrin.h
-OLD_FILES+=usr/include/clang/3.1/tmmintrin.h
-OLD_FILES+=usr/include/clang/3.1/unwind.h
-OLD_FILES+=usr/include/clang/3.1/wmmintrin.h
-OLD_FILES+=usr/include/clang/3.1/x86intrin.h
-OLD_FILES+=usr/include/clang/3.1/xmmintrin.h
-OLD_DIRS+=usr/include/clang/3.1
-OLD_FILES+=usr/include/clang/3.2/__wmmintrin_aes.h
-OLD_FILES+=usr/include/clang/3.2/__wmmintrin_pclmul.h
-OLD_FILES+=usr/include/clang/3.2/altivec.h
-OLD_FILES+=usr/include/clang/3.2/ammintrin.h
-OLD_FILES+=usr/include/clang/3.2/avx2intrin.h
-OLD_FILES+=usr/include/clang/3.2/avxintrin.h
-OLD_FILES+=usr/include/clang/3.2/bmi2intrin.h
-OLD_FILES+=usr/include/clang/3.2/bmiintrin.h
-OLD_FILES+=usr/include/clang/3.2/cpuid.h
-OLD_FILES+=usr/include/clang/3.2/emmintrin.h
-OLD_FILES+=usr/include/clang/3.2/f16cintrin.h
-OLD_FILES+=usr/include/clang/3.2/fma4intrin.h
-OLD_FILES+=usr/include/clang/3.2/fmaintrin.h
-OLD_FILES+=usr/include/clang/3.2/immintrin.h
-OLD_FILES+=usr/include/clang/3.2/lzcntintrin.h
-OLD_FILES+=usr/include/clang/3.2/mm3dnow.h
-OLD_FILES+=usr/include/clang/3.2/mm_malloc.h
-OLD_FILES+=usr/include/clang/3.2/mmintrin.h
-OLD_FILES+=usr/include/clang/3.2/module.map
-OLD_FILES+=usr/include/clang/3.2/nmmintrin.h
-OLD_FILES+=usr/include/clang/3.2/pmmintrin.h
-OLD_FILES+=usr/include/clang/3.2/popcntintrin.h
-OLD_FILES+=usr/include/clang/3.2/rtmintrin.h
-OLD_FILES+=usr/include/clang/3.2/smmintrin.h
-OLD_FILES+=usr/include/clang/3.2/tmmintrin.h
-OLD_FILES+=usr/include/clang/3.2/unwind.h
-OLD_FILES+=usr/include/clang/3.2/wmmintrin.h
-OLD_FILES+=usr/include/clang/3.2/x86intrin.h
-OLD_FILES+=usr/include/clang/3.2/xmmintrin.h
-OLD_FILES+=usr/include/clang/3.2/xopintrin.h
-OLD_DIRS+=usr/include/clang/3.2
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_aes.h
 OLD_FILES+=usr/include/clang/3.3/__wmmintrin_pclmul.h
 OLD_FILES+=usr/include/clang/3.3/altivec.h
@@ -1281,11 +1172,13 @@ OLD_FILES+=usr/libexec/cc1plus
 
 .if ${MK_DICT} == no
 OLD_FILES+=usr/share/dict/README
+OLD_FILES+=usr/share/dict/eign
 OLD_FILES+=usr/share/dict/freebsd
 OLD_FILES+=usr/share/dict/propernames
 OLD_FILES+=usr/share/dict/web2
 OLD_FILES+=usr/share/dict/web2a
 OLD_FILES+=usr/share/dict/words
+OLD_DIRS+=usr/share/dict
 .endif
 
 #.if ${MK_EXAMPLES} == no
@@ -1326,9 +1219,8 @@ OLD_FILES+=usr/games/random
 OLD_FILES+=usr/games/rot13
 OLD_FILES+=usr/games/strfile
 OLD_FILES+=usr/games/unstr
+OLD_DIRS+=usr/games
 OLD_FILES+=usr/share/games/fortune/fortunes
-OLD_FILES+=usr/share/games/fortune/fortunes-o
-OLD_FILES+=usr/share/games/fortune/fortunes-o.dat
 OLD_FILES+=usr/share/games/fortune/fortunes.dat
 OLD_FILES+=usr/share/games/fortune/freebsd-tips
 OLD_FILES+=usr/share/games/fortune/freebsd-tips.dat
@@ -1344,6 +1236,8 @@ OLD_FILES+=usr/share/games/fortune/startrek
 OLD_FILES+=usr/share/games/fortune/startrek.dat
 OLD_FILES+=usr/share/games/fortune/zippy
 OLD_FILES+=usr/share/games/fortune/zippy.dat
+OLD_DIRS+=usr/share/games/fortune
+OLD_DIRS+=usr/share/games
 OLD_FILES+=usr/share/man/man6/bcd.6.gz
 OLD_FILES+=usr/share/man/man6/caesar.6.gz
 OLD_FILES+=usr/share/man/man6/factor.6.gz
@@ -1419,9 +1313,12 @@ OLD_FILES+=usr/share/man/man1/kgdb.1.gz
 
 .if ${MK_GPIB} == no
 OLD_FILES+=usr/include/dev/ieee488/ibfoo_int.h
+OLD_FILES+=usr/include/dev/ieee488/tnt4882.h
 OLD_FILES+=usr/include/dev/ieee488/ugpib.h
 OLD_FILES+=usr/include/dev/ieee488/upd7210.h
+OLD_DIRS+=usr/include/dev/ieee488
 OLD_FILES+=usr/include/gpib/gpib.h
+OLD_DIRS+=usr/include/gpib
 OLD_FILES+=usr/lib/libgpib.a
 OLD_FILES+=usr/lib/libgpib.so
 OLD_LIBS+=usr/lib/libgpib.so.3
@@ -2074,6 +1971,7 @@ OLD_FILES+=rescue/ping6
 
 .if ${MK_IPFILTER} == no
 OLD_FILES+=etc/periodic/security/510.ipfdenied
+OLD_FILES+=etc/periodic/security/610.ipf6denied
 OLD_FILES+=rescue/ipf
 OLD_FILES+=sbin/ipf
 OLD_FILES+=sbin/ipfs
@@ -2132,6 +2030,8 @@ OLD_FILES+=usr/share/examples/ipfilter/ipnat.conf.sample
 OLD_FILES+=usr/share/examples/ipfilter/ipf-howto.txt
 OLD_FILES+=usr/share/examples/ipfilter/examples.txt
 OLD_FILES+=usr/share/examples/ipfilter/rules.txt
+OLD_FILES+=usr/share/examples/ipfilter/mkfilters
+OLD_DIRS+=usr/share/examples/ipfilter
 OLD_FILES+=usr/share/man/man1/ipftest.1.gz
 OLD_FILES+=usr/share/man/man1/ipresend.1.gz
 OLD_FILES+=usr/share/man/man4/ipf.4.gz
@@ -2150,8 +2050,6 @@ OLD_FILES+=usr/share/man/man8/ipfstat.8.gz
 OLD_FILES+=usr/share/man/man8/ipmon.8.gz
 OLD_FILES+=usr/share/man/man8/ipnat.8.gz
 OLD_FILES+=usr/share/man/man8/ippool.8.gz
-OLD_FILES+=etc/periodic/security/510.ipfdenied
-OLD_FILES+=etc/periodic/security/610.ipf6denied
 .endif
 
 .if ${MK_IPFW} == no
@@ -2240,6 +2138,7 @@ OLD_FILES+=usr/include/kadm5/kadm5-protos.h
 OLD_FILES+=usr/include/kadm5/kadm5-pwcheck.h
 OLD_FILES+=usr/include/kadm5/kadm5_err.h
 OLD_FILES+=usr/include/kadm5/private.h
+OLD_DIRS+=usr/include/kadm5
 OLD_FILES+=usr/include/kafs.h
 OLD_FILES+=usr/include/kdc-protos.h
 OLD_FILES+=usr/include/kdc.h
@@ -2251,6 +2150,7 @@ OLD_FILES+=usr/include/krb5/ccache_plugin.h
 OLD_FILES+=usr/include/krb5/locate_plugin.h
 OLD_FILES+=usr/include/krb5/send_to_kdc_plugin.h
 OLD_FILES+=usr/include/krb5/windc_plugin.h
+OLD_DIRS+=usr/include/krb5
 OLD_FILES+=usr/include/krb5_asn1.h
 OLD_FILES+=usr/include/krb5_ccapi.h
 OLD_FILES+=usr/include/krb5_err.h
@@ -2280,7 +2180,6 @@ OLD_FILES+=usr/lib/libcom_err.a
 OLD_FILES+=usr/lib/libcom_err.so
 OLD_LIBS+=usr/lib/libcom_err.so.5
 OLD_FILES+=usr/lib/libcom_err_p.a
-OLD_FILES+=usr/lib/libcom_err_p.a
 OLD_FILES+=usr/lib/libgssapi_krb5.a
 OLD_FILES+=usr/lib/libgssapi_krb5.so
 OLD_LIBS+=usr/lib/libgssapi_krb5.so.10
@@ -2659,27 +2558,16 @@ OLD_FILES+=usr/share/man/man3/hx509_verify_set_time.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_verify_signature.3.gz
 OLD_FILES+=usr/share/man/man3/hx509_xfree.3.gz
 OLD_FILES+=usr/share/man/man3/k_afs_cell_of_file.3.gz
-OLD_FILES+=usr/share/man/man3/k_afs_cell_of_file.3.gz
-OLD_FILES+=usr/share/man/man3/k_hasafs.3.gz
 OLD_FILES+=usr/share/man/man3/k_hasafs.3.gz
 OLD_FILES+=usr/share/man/man3/k_pioctl.3.gz
-OLD_FILES+=usr/share/man/man3/k_pioctl.3.gz
 OLD_FILES+=usr/share/man/man3/k_setpag.3.gz
-OLD_FILES+=usr/share/man/man3/k_setpag.3.gz
-OLD_FILES+=usr/share/man/man3/k_unlog.3.gz
 OLD_FILES+=usr/share/man/man3/k_unlog.3.gz
 OLD_FILES+=usr/share/man/man3/kadm5_pwcheck.3.gz
 OLD_FILES+=usr/share/man/man3/kafs.3.gz
-OLD_FILES+=usr/share/man/man3/kafs.3.gz
-OLD_FILES+=usr/share/man/man3/kafs5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs5.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_set_verbose.3.gz
-OLD_FILES+=usr/share/man/man3/kafs_set_verbose.3.gz
-OLD_FILES+=usr/share/man/man3/kafs_settoken.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken5.3.gz
-OLD_FILES+=usr/share/man/man3/kafs_settoken5.3.gz
-OLD_FILES+=usr/share/man/man3/kafs_settoken_rxkad.3.gz
 OLD_FILES+=usr/share/man/man3/kafs_settoken_rxkad.3.gz
 OLD_FILES+=usr/share/man/man3/krb5.3.gz
 OLD_FILES+=usr/share/man/man3/krb524_convert_creds_kdc.3.gz
@@ -2702,8 +2590,6 @@ OLD_FILES+=usr/share/man/man3/krb5_address_order.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_prefixlen_boundary.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_address_search.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog.3.gz
-OLD_FILES+=usr/share/man/man3/krb5_afslog.3.gz
-OLD_FILES+=usr/share/man/man3/krb5_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_allow_weak_crypto.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_aname_to_localname.3.gz
@@ -2740,7 +2626,6 @@ OLD_FILES+=usr/share/man/man3/krb5_auth_getcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getlocalseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_getremoteseqnumber.3.gz
-OLD_FILES+=usr/share/man/man3/krb5_auth_getremoteseqnumber.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setcksumtype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setkeytype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_auth_setlocalseqnumber.3.gz
@@ -2887,7 +2772,6 @@ OLD_FILES+=usr/share/man/man3/krb5_free_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_addresses.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_config_files.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_context.3.gz
-OLD_FILES+=usr/share/man/man3/krb5_free_context.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_cred_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_creds_contents.3.gz
@@ -2895,7 +2779,6 @@ OLD_FILES+=usr/share/man/man3/krb5_free_data.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_data_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_host_realm.3.gz
-OLD_FILES+=usr/share/man/man3/krb5_free_host_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_keyblock_contents.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_free_krbhst.3.gz
@@ -2975,7 +2858,6 @@ OLD_FILES+=usr/share/man/man3/krb5_keytype_to_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_format_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_free.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_get_addrinfo.3.gz
-OLD_FILES+=usr/share/man/man3/krb5_krbhst_get_addrinfo.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_init.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_krbhst_next_as_string.3.gz
@@ -3016,15 +2898,12 @@ OLD_FILES+=usr/share/man/man3/krb5_pac_get_buffer.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_pac_verify.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_address.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name.3.gz
-OLD_FILES+=usr/share/man/man3/krb5_parse_name.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_name_flags.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_parse_nametype.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_password_key_proc.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_plugin_register.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_prepend_config_files_default.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_realm.3.gz
-OLD_FILES+=usr/share/man/man3/krb5_princ_realm.3.gz
-OLD_FILES+=usr/share/man/man3/krb5_princ_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_princ_set_realm.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_principal_compare.3.gz
@@ -3158,8 +3037,6 @@ OLD_FILES+=usr/share/man/man3/krb5_vlog_msg.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vset_error_string.3.gz
 OLD_FILES+=usr/share/man/man3/krb5_vwarn.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog.3.gz
-OLD_FILES+=usr/share/man/man3/krb_afslog.3.gz
-OLD_FILES+=usr/share/man/man3/krb_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/krb_afslog_uid.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_buf.3.gz
 OLD_FILES+=usr/share/man/man3/ntlm_core.3.gz
@@ -3185,7 +3062,6 @@ OLD_FILES+=usr/share/man/man8/pam_krb5.8.gz
 OLD_FILES+=usr/share/man/man8/pam_ksu.8.gz
 OLD_FILES+=usr/share/man/man8/string2key.8.gz
 OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
-OLD_FILES+=usr/share/man/man8/verify_krb5_conf.8.gz
 .endif
 
 .if ${MK_LDNS} == no
@@ -3212,13 +3088,6 @@ OLD_FILES+=usr/share/man/man1/host.1.gz
 # to be filled in
 #.endif
 
-.if ${MK_LIBICONV_COMPAT} == no
-OLD_FILES+=usr/lib/libiconv.a
-OLD_FILES+=usr/lib/libiconv.so
-OLD_FILES+=usr/lib/libiconv.so.3
-OLD_FILES+=usr/lib/libiconv_p.a
-.endif
-
 .if ${MK_LIBCPLUSPLUS} == no
 OLD_LIBS+=lib/libcxxrt.so.1
 OLD_FILES+=usr/lib/libc++.a
@@ -3366,13 +3235,16 @@ OLD_FILES+=usr/bin/lprm
 OLD_FILES+=usr/libexec/lpr/ru/bjc-240.sh.sample
 OLD_FILES+=usr/libexec/lpr/ru/koi2alt
 OLD_FILES+=usr/libexec/lpr/ru/koi2855
+OLD_DIRS+=usr/libexec/lpr/ru
 OLD_FILES+=usr/libexec/lpr/lpf
+OLD_DIRS+=usr/libexec/lpr
 OLD_FILES+=usr/sbin/chkprintcap
 OLD_FILES+=usr/sbin/lpc
 OLD_FILES+=usr/sbin/lpd
 OLD_FILES+=usr/sbin/lptest
 OLD_FILES+=usr/sbin/pac
 OLD_FILES+=usr/share/doc/smm/07.lpd/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/07.lpd
 OLD_FILES+=usr/share/examples/etc/hosts.lpd
 OLD_FILES+=usr/share/examples/etc/printcap
 OLD_FILES+=usr/share/man/man1/lp.1.gz
@@ -3518,6 +3390,7 @@ OLD_FILES+=usr/share/doc/ntp/rdebug.html
 OLD_FILES+=usr/share/doc/ntp/refclock.html
 OLD_FILES+=usr/share/doc/ntp/release.html
 OLD_FILES+=usr/share/doc/ntp/tickadj.html
+OLD_DIRS+=usr/share/doc/ntp
 OLD_FILES+=usr/share/examples/etc/ntp.conf
 OLD_FILES+=usr/share/man/man5/ntp.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ntp.keys.5.gz
@@ -3668,6 +3541,7 @@ OLD_FILES+=usr/share/examples/pf/queue2
 OLD_FILES+=usr/share/examples/pf/queue3
 OLD_FILES+=usr/share/examples/pf/queue4
 OLD_FILES+=usr/share/examples/pf/spamd
+OLD_DIRS+=usr/share/examples/pf
 OLD_FILES+=usr/share/man/man4/pf.4.gz
 OLD_FILES+=usr/share/man/man4/pflog.4.gz
 OLD_FILES+=usr/share/man/man4/pfsync.4.gz
@@ -3681,29 +3555,7 @@ OLD_FILES+=usr/share/man/man8/tftp-proxy.8.gz
 
 .if ${MK_PKGBOOTSTRAP} == no
 OLD_FILES+=usr/sbin/pkg
-.endif
-
-.if ${MK_PKGTOOLS} == no
-OLD_FILES+=etc/periodic/daily/220.backup-pkgdb
-OLD_FILES+=etc/periodic/daily/490.status-pkg-changes
-OLD_FILES+=etc/periodic/security/460.chkportsum
-OLD_FILES+=etc/periodic/weekly/400.status-pkg
-OLD_FILES+=usr/include/pkg.h
-OLD_FILES+=usr/lib/libpkg.a
-OLD_FILES+=usr/lib/libpkg.so
-OLD_LIBS+=usr/lib/libpkg.so.0
-OLD_FILES+=usr/sbin/pkg_add
-OLD_FILES+=usr/sbin/pkg_create
-OLD_FILES+=usr/sbin/pkg_delete
-OLD_FILES+=usr/sbin/pkg_info
-OLD_FILES+=usr/sbin/pkg_updating
-OLD_FILES+=usr/sbin/pkg_version
-OLD_FILES+=usr/share/man/man1/pkg_add.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_create.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_delete.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_info.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_updating.1.gz
-OLD_FILES+=usr/share/man/man1/pkg_version.1.gz
+OLD_FILES+=usr/share/man/man7/pkg.7.gz
 .endif
 
 .if ${MK_PORTSNAP} == no
@@ -3717,6 +3569,7 @@ OLD_FILES+=usr/share/man/man8/portsnap.8.gz
 
 .if ${MK_PPP} == no
 OLD_FILES+=etc/ppp/ppp.conf
+OLD_DIRS+=etc/ppp
 OLD_FILES+=usr/sbin/ppp
 OLD_FILES+=usr/sbin/pppctl
 OLD_FILES+=usr/share/man/man8/ppp.8.gz
@@ -3759,7 +3612,6 @@ OLD_FILES+=usr/lib/libfetch_p.a
 OLD_FILES+=usr/lib/libfl_p.a
 OLD_FILES+=usr/lib/libform_p.a
 OLD_FILES+=usr/lib/libformw_p.a
-OLD_FILES+=usr/lib/libftpio_p.a
 OLD_FILES+=usr/lib/libgcc_p.a
 OLD_FILES+=usr/lib/libgeom_p.a
 OLD_FILES+=usr/lib/libgnuregex_p.a
@@ -3782,7 +3634,6 @@ OLD_FILES+=usr/lib/libkrb5_p.a
 OLD_FILES+=usr/lib/libkvm_p.a
 OLD_FILES+=usr/lib/libl_p.a
 OLD_FILES+=usr/lib/libln_p.a
-OLD_FILES+=usr/lib/liblwres_p.a
 OLD_FILES+=usr/lib/libm_p.a
 OLD_FILES+=usr/lib/libmagic_p.a
 OLD_FILES+=usr/lib/libmd_p.a
@@ -3791,12 +3642,10 @@ OLD_FILES+=usr/lib/libmenu_p.a
 OLD_FILES+=usr/lib/libmenuw_p.a
 OLD_FILES+=usr/lib/libmilter_p.a
 OLD_FILES+=usr/lib/libmp_p.a
-OLD_FILES+=usr/lib/libncp_p.a
 OLD_FILES+=usr/lib/libncurses_p.a
 OLD_FILES+=usr/lib/libncursesw_p.a
 OLD_FILES+=usr/lib/libnetgraph_p.a
 OLD_FILES+=usr/lib/libngatm_p.a
-OLD_FILES+=usr/lib/libobjc_p.a
 OLD_FILES+=usr/lib/libopie_p.a
 OLD_FILES+=usr/lib/libpanel_p.a
 OLD_FILES+=usr/lib/libpanelw_p.a
@@ -3906,11 +3755,14 @@ OLD_FILES+=bin/rmail
 OLD_FILES+=usr/bin/vacation
 OLD_FILES+=usr/include/libmilter/mfapi.h
 OLD_FILES+=usr/include/libmilter/mfdef.h
+OLD_DIRS+=usr/include/libmilter
 OLD_FILES+=usr/lib/libmilter.a
+OLD_FILES+=usr/lib/libmilter.so
 OLD_LIBS+=usr/lib/libmilter.so.5
 OLD_FILES+=usr/lib/libmilter_p.a
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
 OLD_FILES+=usr/lib32/libmilter.a
+OLD_FILES+=usr/lib32/libmilter.so
 OLD_LIBS+=usr/lib32/libmilter.so.5
 OLD_FILES+=usr/lib32/libmilter_p.a
 .endif
@@ -3922,6 +3774,7 @@ OLD_FILES+=usr/sbin/mailstats
 OLD_FILES+=usr/sbin/makemap
 OLD_FILES+=usr/sbin/praliases
 OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz
+OLD_DIRS+=usr/share/doc/smm/08.sendmailop
 OLD_FILES+=usr/share/man/man1/mailq.1.gz
 OLD_FILES+=usr/share/man/man1/newaliases.1.gz
 OLD_FILES+=usr/share/man/man1/vacation.1.gz
@@ -3973,12 +3826,14 @@ OLD_FILES+=usr/share/sendmail/cf/cf/ucbarpa.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/ucbvax.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/uucpproto.mc
 OLD_FILES+=usr/share/sendmail/cf/cf/vangogh.cs.mc
+OLD_DIRS+=usr/share/sendmail/cf/cf
 OLD_FILES+=usr/share/sendmail/cf/domain/Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/CS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/EECS.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/S2K.Berkeley.EDU.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/berkeley-only.m4
 OLD_FILES+=usr/share/sendmail/cf/domain/generic.m4
+OLD_DIRS+=usr/share/sendmail/cf/domain
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unqualified_senders.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/accept_unresolvable_domains.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/access_db.m4
@@ -4036,11 +3891,14 @@ OLD_FILES+=usr/share/sendmail/cf/feature/use_cw_file.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/uucpdomain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtuser_entire_domain.m4
 OLD_FILES+=usr/share/sendmail/cf/feature/virtusertable.m4
+OLD_DIRS+=usr/share/sendmail/cf/feature
 OLD_FILES+=usr/share/sendmail/cf/hack/cssubdomain.m4
+OLD_DIRS+=usr/share/sendmail/cf/hack
 OLD_FILES+=usr/share/sendmail/cf/m4/cf.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/cfhead.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/proto.m4
 OLD_FILES+=usr/share/sendmail/cf/m4/version.m4
+OLD_DIRS+=usr/share/sendmail/cf/m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrus.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/cyrusv2.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/fax.m4
@@ -4053,6 +3911,7 @@ OLD_FILES+=usr/share/sendmail/cf/mailer/qpage.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/smtp.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/usenet.m4
 OLD_FILES+=usr/share/sendmail/cf/mailer/uucp.m4
+OLD_DIRS+=usr/share/sendmail/cf/mailer
 OLD_FILES+=usr/share/sendmail/cf/ostype/a-ux.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix3.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/aix4.m4
@@ -4094,6 +3953,7 @@ OLD_FILES+=usr/share/sendmail/cf/ostype/riscos4.5.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco-uw-2.1.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sco3.2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/sinix.m4
+OLD_FILES+=usr/share/sendmail/cf/ostype/solaris11.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.ml.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/solaris2.pre5.m4
@@ -4108,12 +3968,17 @@ OLD_FILES+=usr/share/sendmail/cf/ostype/unicosmp.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unixware7.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/unknown.m4
 OLD_FILES+=usr/share/sendmail/cf/ostype/uxpds.m4
+OLD_DIRS+=usr/share/sendmail/cf/ostype
 OLD_FILES+=usr/share/sendmail/cf/sendmail.schema
 OLD_FILES+=usr/share/sendmail/cf/sh/makeinfo.sh
+OLD_DIRS+=usr/share/sendmail/cf/sh
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.cogsci.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.old.arpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbarpa.m4
 OLD_FILES+=usr/share/sendmail/cf/siteconfig/uucp.ucbvax.m4
+OLD_DIRS+=usr/share/sendmail/cf/siteconfig
+OLD_DIRS+=usr/share/sendmail/cf
+OLD_DIRS+=usr/share/sendmail
 .endif
 
 #.if ${MK_SHAREDOCS} == no
@@ -4131,35 +3996,57 @@ OLD_FILES+=rescue/csh
 OLD_FILES+=rescue/tcsh
 OLD_FILES+=usr/share/examples/tcsh/complete.tcsh
 OLD_FILES+=usr/share/examples/tcsh/csh-mode.el
+OLD_DIRS+=usr/share/examples/tcsh
 OLD_FILES+=usr/share/man/man1/csh.1.gz
 OLD_FILES+=usr/share/man/man1/tcsh.1.gz
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_AT.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/de_AT.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_CH.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/de_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/de_DE.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/de_DE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/el_GR.ISO8859-7/tcsh.cat
+OLD_FILES+=usr/share/nls/el_GR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/es_ES.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/es_ES.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/et_EE.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/et_EE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fi_FI.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fi_FI.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_BE.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_BE.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CA.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CA.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_CH.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_CH.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/it_CH.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-1/tcsh.cat
 OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat
+OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
+OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
 OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat
+OLD_FILES+=usr/share/nls/ru_RU.CP1251/tcsh.cat
+OLD_FILES+=usr/share/nls/ru_RU.CP866/tcsh.cat
+OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat
+OLD_FILES+=usr/share/nls/ru_RU.UTF-8/tcsh.cat
+OLD_FILES+=usr/share/nls/uk_UA.ISO8859-5/tcsh.cat
 OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat
+OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
 .endif
 
 .if ${MK_TELNET} == no
@@ -4169,6 +4056,66 @@ OLD_FILES+=usr/share/man/man1/telnet.1.gz
 OLD_FILES+=usr/share/man/man8/telnetd.8.gz
 .endif
 
+.if ${MK_TESTS} == yes
+OLD_FILES+=usr/tests/lib/atf/libatf-c/test_helpers_test
+OLD_FILES+=usr/tests/lib/atf/test-programs/fork_test
+.else
+# ATF libraries.
+OLD_FILES+=usr/bin/atf-sh
+OLD_DIRS+=usr/include/atf-c
+OLD_FILES+=usr/include/atf-c/build.h
+OLD_FILES+=usr/include/atf-c/check.h
+OLD_FILES+=usr/include/atf-c/config.h
+OLD_FILES+=usr/include/atf-c/defs.h
+OLD_FILES+=usr/include/atf-c/error.h
+OLD_FILES+=usr/include/atf-c/error_fwd.h
+OLD_FILES+=usr/include/atf-c/macros.h
+OLD_FILES+=usr/include/atf-c/tc.h
+OLD_FILES+=usr/include/atf-c/tp.h
+OLD_FILES+=usr/include/atf-c/utils.h
+OLD_FILES+=usr/include/atf-c.h
+OLD_DIRS+=usr/include/atf-c++
+OLD_FILES+=usr/include/atf-c++/build.hpp
+OLD_FILES+=usr/include/atf-c++/check.hpp
+OLD_FILES+=usr/include/atf-c++/config.hpp
+OLD_FILES+=usr/include/atf-c++/macros.hpp
+OLD_FILES+=usr/include/atf-c++/tests.hpp
+OLD_FILES+=usr/include/atf-c++/utils.hpp
+OLD_FILES+=usr/include/atf-c++.hpp
+OLD_FILES+=usr/lib/libatf-c_p.a
+OLD_FILES+=usr/lib/libatf-c.so.1
+OLD_FILES+=usr/lib/libatf-c.so
+OLD_FILES+=usr/lib/libatf-c++.a
+OLD_FILES+=usr/lib/libatf-c++_p.a
+OLD_FILES+=usr/lib/libatf-c++.so.1
+OLD_FILES+=usr/lib/libatf-c++.so
+OLD_FILES+=usr/lib/libatf-c.a
+OLD_FILES+=usr/libexec/atf-check
+OLD_DIRS+=usr/share/atf
+OLD_FILES+=usr/share/atf/libatf-sh.subr
+OLD_DIRS+=usr/share/doc/atf
+OLD_FILES+=usr/share/doc/atf/AUTHORS
+OLD_FILES+=usr/share/doc/atf/COPYING
+OLD_FILES+=usr/share/doc/atf/NEWS
+OLD_FILES+=usr/share/doc/atf/README
+OLD_FILES+=usr/share/man/man1/atf-check.1.gz
+OLD_FILES+=usr/share/man/man1/atf-sh.1.gz
+OLD_FILES+=usr/share/man/man1/atf-test-program.1.gz
+OLD_FILES+=usr/share/man/man3/atf-c-api.3.gz
+OLD_FILES+=usr/share/man/man3/atf-c++-api.3.gz
+OLD_FILES+=usr/share/man/man3/atf-sh-api.3.gz
+OLD_FILES+=usr/share/man/man4/atf-test-case.4.gz
+OLD_FILES+=usr/share/mk/atf.test.mk
+
+# Test suite.
+. if(exists(${DESTDIR}/usr/tests/))
+TESTS_DIRS!=find ${DESTDIR}/usr/tests -type d | sed -e 's,^${DESTDIR}/,,'; echo
+OLD_DIRS+=${TESTS_DIRS}
+TESTS_FILES!=find ${DESTDIR}/usr/tests \! -type d | sed -e 's,^${DESTDIR}/,,'; echo
+OLD_FILES+=${TESTS_FILES}
+. endif
+.endif	# Test suite.
+
 #.if ${MK_TOOLCHAIN} == no
 # to be filled in
 #.endif
@@ -4202,19 +4149,15 @@ OLD_FILES+=etc/periodic/monthly/200.accounting
 OLD_FILES+=usr/bin/last
 OLD_FILES+=usr/bin/users
 OLD_FILES+=usr/bin/who
-OLD_FILES+=usr/bin/wtmpcvt
 OLD_FILES+=usr/sbin/ac
 OLD_FILES+=usr/sbin/lastlogin
 OLD_FILES+=usr/sbin/utx
-OLD_FILES+=usr/sbin/utxrm
 OLD_FILES+=usr/share/man/man1/last.1.gz
 OLD_FILES+=usr/share/man/man1/users.1.gz
 OLD_FILES+=usr/share/man/man1/who.1.gz
-OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
 OLD_FILES+=usr/share/man/man8/ac.8.gz
 OLD_FILES+=usr/share/man/man8/lastlogin.8.gz
 OLD_FILES+=usr/share/man/man8/utx.8.gz
-OLD_FILES+=usr/share/man/man8/utxrm.8.gz
 .endif
 
 .if ${MK_WIRELESS} == no
@@ -4224,7 +4167,9 @@ OLD_FILES+=usr/sbin/hostapd
 OLD_FILES+=usr/sbin/hostapd_cli
 OLD_FILES+=usr/sbin/ndis_events
 OLD_FILES+=usr/sbin/wlandebug
+.if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/sbin/wlconfig
+.endif
 OLD_FILES+=usr/sbin/wpa_cli
 OLD_FILES+=usr/sbin/wpa_passphrase
 OLD_FILES+=usr/sbin/wpa_supplicant
@@ -4233,12 +4178,15 @@ OLD_FILES+=usr/share/examples/etc/wpa_supplicant.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.conf
 OLD_FILES+=usr/share/examples/hostapd/hostapd.eap_user
 OLD_FILES+=usr/share/examples/hostapd/hostapd.wpa_psk
+OLD_DIRS+=usr/share/examples/hostapd
 OLD_FILES+=usr/share/man/man5/hostapd.conf.5.gz
 OLD_FILES+=usr/share/man/man5/wpa_supplicant.conf.5.gz
 OLD_FILES+=usr/share/man/man8/ancontrol.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd.8.gz
 OLD_FILES+=usr/share/man/man8/hostapd_cli.8.gz
+.if ${TARGET_ARCH} == "i386"
 OLD_FILES+=usr/share/man/man8/i386/wlconfig.8.gz
+.endif
 OLD_FILES+=usr/share/man/man8/ndis_events.8.gz
 OLD_FILES+=usr/share/man/man8/wlandebug.8.gz
 OLD_FILES+=usr/share/man/man8/wpa_cli.8.gz
diff --git a/tools/build/options/WITHOUT_CASPER b/tools/build/options/WITHOUT_CASPER
new file mode 100644
index 00000000000..d364305caeb
--- /dev/null
+++ b/tools/build/options/WITHOUT_CASPER
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build Casper program and related libraries.
diff --git a/tools/build/options/WITH_NMTREE b/tools/build/options/WITHOUT_NMTREE
similarity index 100%
rename from tools/build/options/WITH_NMTREE
rename to tools/build/options/WITHOUT_NMTREE
index cbaa8733609..c92109662fe 100644
--- a/tools/build/options/WITH_NMTREE
+++ b/tools/build/options/WITHOUT_NMTREE
@@ -1,9 +1,9 @@
 .\" $FreeBSD$
 Set to install
-.Xr nmtree 8
+.Xr fmtree 8
 as
 .Xr mtree 8 .
 By default
-.Xr fmtree 8
+.Xr nmtree 8
 is installed as
 .Xr mtree 8 .
diff --git a/tools/build/options/WITHOUT_PKGBOOTSTRAP b/tools/build/options/WITHOUT_PKGBOOTSTRAP
index 1f98dd58e38..121209b0936 100644
--- a/tools/build/options/WITHOUT_PKGBOOTSTRAP
+++ b/tools/build/options/WITHOUT_PKGBOOTSTRAP
@@ -1,4 +1,4 @@
 .\" $FreeBSD$
 Set to not build
-.Xr pkg 1
-bootstrap tool
+.Xr pkg 7
+bootstrap tool.
diff --git a/tools/build/options/WITHOUT_TESTS b/tools/build/options/WITHOUT_TESTS
new file mode 100644
index 00000000000..05aeeb86ade
--- /dev/null
+++ b/tools/build/options/WITHOUT_TESTS
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to not build any test programs nor install them in /usr/tests.
diff --git a/tools/build/options/WITH_LIBICONV_COMPAT b/tools/build/options/WITH_LIBICONV_COMPAT
deleted file mode 100644
index f414798f672..00000000000
--- a/tools/build/options/WITH_LIBICONV_COMPAT
+++ /dev/null
@@ -1,2 +0,0 @@
-.\" $FreeBSD$
-Set to build libiconv API and link time compatibility.
diff --git a/tools/build/options/WITH_PKGTOOLS b/tools/build/options/WITH_PKGTOOLS
deleted file mode 100644
index 0c09224f5c1..00000000000
--- a/tools/build/options/WITH_PKGTOOLS
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Set to build
-.Xr pkg_add 8
-and related programs.
diff --git a/tools/build/options/WITH_TESTS b/tools/build/options/WITH_TESTS
new file mode 100644
index 00000000000..b50a3076c6e
--- /dev/null
+++ b/tools/build/options/WITH_TESTS
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to install the Kyua test suite.
diff --git a/tools/make_libdeps.sh b/tools/make_libdeps.sh
index 2f5b32b1928..dcd1c208698 100644
--- a/tools/make_libdeps.sh
+++ b/tools/make_libdeps.sh
@@ -48,7 +48,6 @@ sed -E
     -e's; ;! ;g'
     -e's;$;!;'
     -e's;-lbsdxml!;lib/libexpat;g'
-    -e's;-lbsdyml!;lib/libyaml;g'
     -e's;-lpthread!;lib/libthr;g'
     -e's;-lm!;lib/msun;g'
     -e's;-l(ncurses|termcap)!;lib/ncurses/ncurses;g'
diff --git a/tools/regression/bin/sh/builtins/command12.0 b/tools/regression/bin/sh/builtins/command12.0
new file mode 100644
index 00000000000..f981db32494
--- /dev/null
+++ b/tools/regression/bin/sh/builtins/command12.0
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+alias aa=echo\ \'\"\'
+cmd=$(command -v aa)
+alias aa=echo\ bad
+eval "$cmd"
+[ "$(eval aa)" = \" ]
diff --git a/tools/regression/bin/sh/builtins/trap13.0 b/tools/regression/bin/sh/builtins/trap13.0
new file mode 100644
index 00000000000..d90eb08eb24
--- /dev/null
+++ b/tools/regression/bin/sh/builtins/trap13.0
@@ -0,0 +1,8 @@
+# $FreeBSD$
+
+{
+	trap 'exit 0' INT
+	${SH} -c 'kill -INT $PPID'
+	exit 3
+} &
+wait $!
diff --git a/tools/regression/bin/sh/builtins/trap14.0 b/tools/regression/bin/sh/builtins/trap14.0
new file mode 100644
index 00000000000..97cce8d0d24
--- /dev/null
+++ b/tools/regression/bin/sh/builtins/trap14.0
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+{
+	trap - INT
+	${SH} -c 'kill -INT $PPID' &
+	wait
+} &
+wait $!
+r=$?
+[ "$r" -gt 128 ] && [ "$(kill -l "$r")" = INT ]
diff --git a/tools/regression/bin/sh/execution/bg10.0 b/tools/regression/bin/sh/execution/bg10.0
new file mode 100644
index 00000000000..44a25dc23b2
--- /dev/null
+++ b/tools/regression/bin/sh/execution/bg10.0
@@ -0,0 +1,4 @@
+# $FreeBSD$
+# The redirection overrides the </dev/null implicit in a background command.
+
+echo yes | ${SH} -c '{ cat & wait; } <&0'
diff --git a/tools/regression/bin/sh/execution/bg10.0.stdout b/tools/regression/bin/sh/execution/bg10.0.stdout
new file mode 100644
index 00000000000..7cfab5b05d6
--- /dev/null
+++ b/tools/regression/bin/sh/execution/bg10.0.stdout
@@ -0,0 +1 @@
+yes
diff --git a/tools/regression/bin/sh/execution/bg5.0 b/tools/regression/bin/sh/execution/bg5.0
new file mode 100644
index 00000000000..cc9ceaa41d4
--- /dev/null
+++ b/tools/regression/bin/sh/execution/bg5.0
@@ -0,0 +1,4 @@
+# $FreeBSD$
+# A background command has an implicit </dev/null redirection.
+
+echo bad | ${SH} -c '{ cat & wait; }'
diff --git a/tools/regression/bin/sh/execution/bg6.0 b/tools/regression/bin/sh/execution/bg6.0
new file mode 100644
index 00000000000..b0faf9e7370
--- /dev/null
+++ b/tools/regression/bin/sh/execution/bg6.0
@@ -0,0 +1,4 @@
+# $FreeBSD$
+# The redirection overrides the </dev/null implicit in a background command.
+
+echo yes | ${SH} -c '{ cat & wait; } </dev/stdin'
diff --git a/tools/regression/bin/sh/execution/bg6.0.stdout b/tools/regression/bin/sh/execution/bg6.0.stdout
new file mode 100644
index 00000000000..7cfab5b05d6
--- /dev/null
+++ b/tools/regression/bin/sh/execution/bg6.0.stdout
@@ -0,0 +1 @@
+yes
diff --git a/tools/regression/bin/sh/execution/bg7.0 b/tools/regression/bin/sh/execution/bg7.0
new file mode 100644
index 00000000000..f771edc56cd
--- /dev/null
+++ b/tools/regression/bin/sh/execution/bg7.0
@@ -0,0 +1,5 @@
+# $FreeBSD$
+# The redirection does not apply to the background command, and therefore
+# does not override the implicit </dev/null.
+
+echo bad | ${SH} -c '</dev/null; { cat & wait; }'
diff --git a/tools/regression/bin/sh/execution/bg8.0 b/tools/regression/bin/sh/execution/bg8.0
new file mode 100644
index 00000000000..33667cb1922
--- /dev/null
+++ b/tools/regression/bin/sh/execution/bg8.0
@@ -0,0 +1,5 @@
+# $FreeBSD$
+# The redirection does not apply to the background command, and therefore
+# does not override the implicit </dev/null.
+
+echo bad | ${SH} -c 'command eval \) </dev/null 2>/dev/null; { cat & wait; }'
diff --git a/tools/regression/bin/sh/execution/bg9.0 b/tools/regression/bin/sh/execution/bg9.0
new file mode 100644
index 00000000000..64fde3e3e33
--- /dev/null
+++ b/tools/regression/bin/sh/execution/bg9.0
@@ -0,0 +1,5 @@
+# $FreeBSD$
+# The redirection does not apply to the background command, and therefore
+# does not override the implicit </dev/null.
+
+echo bad | ${SH} -c 'command eval eval \\\) \</dev/null 2>/dev/null; { cat & wait; }'
diff --git a/tools/regression/bin/sh/parser/var-assign1.0 b/tools/regression/bin/sh/parser/var-assign1.0
new file mode 100644
index 00000000000..1fd3b26f8a2
--- /dev/null
+++ b/tools/regression/bin/sh/parser/var-assign1.0
@@ -0,0 +1,19 @@
+# $FreeBSD$
+# In a variable assignment, both the name and the equals sign must be entirely
+# unquoted. Therefore, there is only one assignment below; the other words
+# containing equals signs are command words.
+
+abc=0
+\abc=1 2>/dev/null
+a\bc=2 2>/dev/null
+abc\=3 2>/dev/null
+a\bc\=4 2>/dev/null
+'abc'=5 2>/dev/null
+a'b'c=6 2>/dev/null
+abc'='7 2>/dev/null
+'abc=8' 2>/dev/null
+"abc"=9 2>/dev/null
+a"b"c=10 2>/dev/null
+abc"="11 2>/dev/null
+"abc=12" 2>/dev/null
+[ "$abc" = 0 ]
diff --git a/tools/regression/capsicum/libcapsicum/Makefile b/tools/regression/capsicum/libcapsicum/Makefile
new file mode 100644
index 00000000000..6fc98ba7d94
--- /dev/null
+++ b/tools/regression/capsicum/libcapsicum/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD$
+
+SERVICES=	dns
+SERVICES+=	grp
+SERVICES+=	pwd
+SERVICES+=	sysctl
+
+CFLAGS=		-O2 -pipe -std=gnu99 -fstack-protector
+CFLAGS+=	-Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter
+CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type
+CFLAGS+=	-Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter
+CFLAGS+=	-Wcast-align -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls
+CFLAGS+=	-Wold-style-definition -Wno-pointer-sign
+
+CFLAGS+=	-I${.CURDIR}/../../../../lib/libcapsicum
+CFLAGS+=	-ggdb
+
+all:	${SERVICES}
+
+.for SERVICE in ${SERVICES}
+
+${SERVICE}:	${SERVICE}.c
+	${CC} ${CFLAGS} ${@}.c -o $@ -lcapsicum -lnv
+
+.endfor
+
+test:	all
+	@prove -r ${.CURDIR}
+
+clean:
+	rm -f ${SERVICES}
diff --git a/tools/regression/capsicum/libcapsicum/dns.c b/tools/regression/capsicum/libcapsicum/dns.c
new file mode 100644
index 00000000000..bb7f613dd3f
--- /dev/null
+++ b/tools/regression/capsicum/libcapsicum/dns.c
@@ -0,0 +1,587 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/capability.h>
+
+#include <arpa/inet.h>
+#include <netinet/in.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <libcapsicum.h>
+#include <libcapsicum_dns.h>
+#include <libcapsicum_service.h>
+
+static int ntest = 1;
+
+#define CHECK(expr)     do {						\
+	if ((expr))							\
+		printf("ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	ntest++;							\
+} while (0)
+#define CHECKX(expr)     do {						\
+	if ((expr)) {							\
+		printf("ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	} else {							\
+		printf("not ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+		exit(1);						\
+	}								\
+} while (0)
+
+#define	GETHOSTBYNAME			0x01
+#define	GETHOSTBYNAME2_AF_INET		0x02
+#define	GETHOSTBYNAME2_AF_INET6		0x04
+#define	GETHOSTBYADDR_AF_INET		0x08
+#define	GETHOSTBYADDR_AF_INET6		0x10
+
+static bool
+hostent_aliases_compare(char **aliases0, char **aliases1)
+{
+	int i0, i1;
+
+	if (aliases0 == NULL && aliases1 == NULL)
+		return (true);
+	if (aliases0 == NULL || aliases1 == NULL)
+		return (false);
+
+	for (i0 = 0; aliases0[i0] != NULL; i0++) {
+		for (i1 = 0; aliases1[i1] != NULL; i1++) {
+			if (strcmp(aliases0[i0], aliases1[i1]) == 0)
+				break;
+		}
+		if (aliases1[i1] == NULL)
+			return (false);
+	}
+
+	return (true);
+}
+
+static bool
+hostent_addr_list_compare(char **addr_list0, char **addr_list1, int length)
+{
+	int i0, i1;
+
+	if (addr_list0 == NULL && addr_list1 == NULL)
+		return (true);
+	if (addr_list0 == NULL || addr_list1 == NULL)
+		return (false);
+
+	for (i0 = 0; addr_list0[i0] != NULL; i0++) {
+		for (i1 = 0; addr_list1[i1] != NULL; i1++) {
+			if (memcmp(addr_list0[i0], addr_list1[i1], length) == 0)
+				break;
+		}
+		if (addr_list1[i1] == NULL)
+			return (false);
+	}
+
+	return (true);
+}
+
+static bool
+hostent_compare(const struct hostent *hp0, const struct hostent *hp1)
+{
+
+	if (hp0 == NULL && hp1 != NULL)
+		return (true);
+
+	if (hp0 == NULL || hp1 == NULL)
+		return (false);
+
+	if (hp0->h_name != NULL || hp1->h_name != NULL) {
+		if (hp0->h_name == NULL || hp1->h_name == NULL)
+			return (false);
+		if (strcmp(hp0->h_name, hp1->h_name) != 0)
+			return (false);
+	}
+
+	if (!hostent_aliases_compare(hp0->h_aliases, hp1->h_aliases))
+		return (false);
+	if (!hostent_aliases_compare(hp1->h_aliases, hp0->h_aliases))
+		return (false);
+
+	if (hp0->h_addrtype != hp1->h_addrtype)
+		return (false);
+
+	if (hp0->h_length != hp1->h_length)
+		return (false);
+
+	if (!hostent_addr_list_compare(hp0->h_addr_list, hp1->h_addr_list,
+	    hp0->h_length)) {
+		return (false);
+	}
+	if (!hostent_addr_list_compare(hp1->h_addr_list, hp0->h_addr_list,
+	    hp0->h_length)) {
+		return (false);
+	}
+
+	return (true);
+}
+
+static unsigned int
+runtest(cap_channel_t *capdns)
+{
+	unsigned int result;
+	struct hostent *hps, *hpc;
+	struct in_addr ip4;
+	struct in6_addr ip6;
+
+	result = 0;
+
+	hps = gethostbyname("example.com");
+	if (hps == NULL)
+		fprintf(stderr, "Unable to resolve %s IPv4.\n", "example.com");
+	hpc = cap_gethostbyname(capdns, "example.com");
+	if (hostent_compare(hps, hpc))
+		result |= GETHOSTBYNAME;
+
+	hps = gethostbyname2("example.com", AF_INET);
+	if (hps == NULL)
+		fprintf(stderr, "Unable to resolve %s IPv4.\n", "example.com");
+	hpc = cap_gethostbyname2(capdns, "example.com", AF_INET);
+	if (hostent_compare(hps, hpc))
+		result |= GETHOSTBYNAME2_AF_INET;
+
+	hps = gethostbyname2("example.com", AF_INET6);
+	if (hps == NULL)
+		fprintf(stderr, "Unable to resolve %s IPv6.\n", "example.com");
+	hpc = cap_gethostbyname2(capdns, "example.com", AF_INET6);
+	if (hostent_compare(hps, hpc))
+		result |= GETHOSTBYNAME2_AF_INET6;
+
+	/*
+	 * 8.8.178.135 is IPv4 address of freefall.freebsd.org
+	 * as of 27 October 2013.
+	 */
+	inet_pton(AF_INET, "8.8.178.135", &ip4);
+	hps = gethostbyaddr(&ip4, sizeof(ip4), AF_INET);
+	if (hps == NULL)
+		fprintf(stderr, "Unable to resolve %s.\n", "8.8.178.135");
+	hpc = cap_gethostbyaddr(capdns, &ip4, sizeof(ip4), AF_INET);
+	if (hostent_compare(hps, hpc))
+		result |= GETHOSTBYADDR_AF_INET;
+
+	/*
+	 * 2001:1900:2254:206c::16:87 is IPv6 address of freefall.freebsd.org
+	 * as of 27 October 2013.
+	 */
+	inet_pton(AF_INET6, "2001:1900:2254:206c::16:87", &ip6);
+	hps = gethostbyaddr(&ip6, sizeof(ip6), AF_INET6);
+	if (hps == NULL) {
+		fprintf(stderr, "Unable to resolve %s.\n",
+		    "2001:1900:2254:206c::16:87");
+	}
+	hpc = cap_gethostbyaddr(capdns, &ip6, sizeof(ip6), AF_INET6);
+	if (hostent_compare(hps, hpc))
+		result |= GETHOSTBYADDR_AF_INET6;
+
+	return (result);
+}
+
+int
+main(void)
+{
+	cap_channel_t *capcas, *capdns, *origcapdns;
+	const char *types[2];
+	int families[2];
+
+	printf("1..89\n");
+
+	capcas = cap_init();
+	CHECKX(capcas != NULL);
+
+	origcapdns = capdns = cap_service_open(capcas, "system.dns");
+	CHECKX(capdns != NULL);
+
+	cap_close(capcas);
+
+	/* No limits set. */
+
+	CHECK(runtest(capdns) ==
+	    (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYNAME2_AF_INET6 |
+	     GETHOSTBYADDR_AF_INET | GETHOSTBYADDR_AF_INET6));
+
+	/*
+	 * Allow:
+	 * type: NAME, ADDR
+	 * family: AF_INET, AF_INET6
+	 */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "NAME";
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
+
+	CHECK(runtest(capdns) ==
+	    (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYNAME2_AF_INET6 |
+	     GETHOSTBYADDR_AF_INET | GETHOSTBYADDR_AF_INET6));
+
+	cap_close(capdns);
+
+	/*
+	 * Allow:
+	 * type: NAME
+	 * family: AF_INET, AF_INET6
+	 */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	types[0] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
+
+	CHECK(runtest(capdns) ==
+	    (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYNAME2_AF_INET6));
+
+	cap_close(capdns);
+
+	/*
+	 * Allow:
+	 * type: ADDR
+	 * family: AF_INET, AF_INET6
+	 */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
+	types[1] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	types[0] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
+
+	CHECK(runtest(capdns) ==
+	    (GETHOSTBYADDR_AF_INET | GETHOSTBYADDR_AF_INET6));
+
+	cap_close(capdns);
+
+	/*
+	 * Allow:
+	 * type: NAME, ADDR
+	 * family: AF_INET
+	 */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "NAME";
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
+	families[0] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest(capdns) ==
+	    (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET | GETHOSTBYADDR_AF_INET));
+
+	cap_close(capdns);
+
+	/*
+	 * Allow:
+	 * type: NAME, ADDR
+	 * family: AF_INET6
+	 */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "NAME";
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
+	families[0] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
+	families[1] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest(capdns) ==
+	    (GETHOSTBYNAME2_AF_INET6 | GETHOSTBYADDR_AF_INET6));
+
+	cap_close(capdns);
+
+	/* Below we also test further limiting capability. */
+
+	/*
+	 * Allow:
+	 * type: NAME
+	 * family: AF_INET
+	 */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "NAME";
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
+	types[0] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	types[0] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest(capdns) == (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET));
+
+	cap_close(capdns);
+
+	/*
+	 * Allow:
+	 * type: NAME
+	 * family: AF_INET6
+	 */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "NAME";
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
+	types[0] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	types[0] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
+	families[1] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest(capdns) == GETHOSTBYNAME2_AF_INET6);
+
+	cap_close(capdns);
+
+	/*
+	 * Allow:
+	 * type: ADDR
+	 * family: AF_INET
+	 */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "NAME";
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
+	types[0] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
+	types[1] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	types[0] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest(capdns) == GETHOSTBYADDR_AF_INET);
+
+	cap_close(capdns);
+
+	/*
+	 * Allow:
+	 * type: ADDR
+	 * family: AF_INET6
+	 */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "NAME";
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == 0);
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == 0);
+	types[0] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
+	types[1] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	types[0] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
+	families[1] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest(capdns) == GETHOSTBYADDR_AF_INET6);
+
+	cap_close(capdns);
+
+	/* Trying to rise the limits. */
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
+	families[0] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
+
+	types[0] = "NAME";
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	types[0] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(cap_dns_type_limit(capdns, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	CHECK(cap_dns_family_limit(capdns, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	/* Do the limits still hold? */
+	CHECK(runtest(capdns) == (GETHOSTBYNAME | GETHOSTBYNAME2_AF_INET));
+
+	cap_close(capdns);
+
+	capdns = cap_clone(origcapdns);
+	CHECK(capdns != NULL);
+
+	types[0] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == 0);
+	families[0] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == 0);
+
+	types[0] = "NAME";
+	types[1] = "ADDR";
+	CHECK(cap_dns_type_limit(capdns, types, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	families[1] = AF_INET6;
+	CHECK(cap_dns_family_limit(capdns, families, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	types[0] = "NAME";
+	CHECK(cap_dns_type_limit(capdns, types, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	families[0] = AF_INET;
+	CHECK(cap_dns_family_limit(capdns, families, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(cap_dns_type_limit(capdns, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	CHECK(cap_dns_family_limit(capdns, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	/* Do the limits still hold? */
+	CHECK(runtest(capdns) == GETHOSTBYADDR_AF_INET6);
+
+	cap_close(capdns);
+
+	cap_close(origcapdns);
+
+	exit(0);
+}
diff --git a/tools/regression/capsicum/libcapsicum/grp.c b/tools/regression/capsicum/libcapsicum/grp.c
new file mode 100644
index 00000000000..1d3adfb845a
--- /dev/null
+++ b/tools/regression/capsicum/libcapsicum/grp.c
@@ -0,0 +1,1549 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/capability.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <grp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <libcapsicum.h>
+#include <libcapsicum_grp.h>
+#include <libcapsicum_service.h>
+
+static int ntest = 1;
+
+#define CHECK(expr)     do {						\
+	if ((expr))							\
+		printf("ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	ntest++;							\
+} while (0)
+#define CHECKX(expr)     do {						\
+	if ((expr)) {							\
+		printf("ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	} else {							\
+		printf("not ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+		exit(1);						\
+	}								\
+} while (0)
+
+#define	GID_WHEEL	0
+#define	GID_OPERATOR	5
+
+#define	GETGRENT0	0x0001
+#define	GETGRENT1	0x0002
+#define	GETGRENT2	0x0004
+#define	GETGRENT	(GETGRENT0 | GETGRENT1 | GETGRENT2)
+#define	GETGRENT_R0	0x0008
+#define	GETGRENT_R1	0x0010
+#define	GETGRENT_R2	0x0020
+#define	GETGRENT_R	(GETGRENT_R0 | GETGRENT_R1 | GETGRENT_R2)
+#define	GETGRNAM	0x0040
+#define	GETGRNAM_R	0x0080
+#define	GETGRGID	0x0100
+#define	GETGRGID_R	0x0200
+#define	SETGRENT	0x0400
+
+static bool
+group_mem_compare(char **mem0, char **mem1)
+{
+	int i0, i1;
+
+	if (mem0 == NULL && mem1 == NULL)
+		return (true);
+	if (mem0 == NULL || mem1 == NULL)
+		return (false);
+
+	for (i0 = 0; mem0[i0] != NULL; i0++) {
+		for (i1 = 0; mem1[i1] != NULL; i1++) {
+			if (strcmp(mem0[i0], mem1[i1]) == 0)
+				break;
+		}
+		if (mem1[i1] == NULL)
+			return (false);
+	}
+
+	return (true);
+}
+
+static bool
+group_compare(const struct group *grp0, const struct group *grp1)
+{
+
+	if (grp0 == NULL && grp1 == NULL)
+		return (true);
+	if (grp0 == NULL || grp1 == NULL)
+		return (false);
+
+	if (strcmp(grp0->gr_name, grp1->gr_name) != 0)
+		return (false);
+
+	if (grp0->gr_passwd != NULL || grp1->gr_passwd != NULL) {
+		if (grp0->gr_passwd == NULL || grp1->gr_passwd == NULL)
+			return (false);
+		if (strcmp(grp0->gr_passwd, grp1->gr_passwd) != 0)
+			return (false);
+	}
+
+	if (grp0->gr_gid != grp1->gr_gid)
+		return (false);
+
+	if (!group_mem_compare(grp0->gr_mem, grp1->gr_mem))
+		return (false);
+
+	return (true);
+}
+
+static unsigned int
+runtest_cmds(cap_channel_t *capgrp)
+{
+	char bufs[1024], bufc[1024];
+	unsigned int result;
+	struct group *grps, *grpc;
+	struct group sts, stc;
+
+	result = 0;
+
+	(void)setgrent();
+	if (cap_setgrent(capgrp) == 1)
+		result |= SETGRENT;
+
+	grps = getgrent();
+	grpc = cap_getgrent(capgrp);
+	if (group_compare(grps, grpc)) {
+		result |= GETGRENT0;
+		grps = getgrent();
+		grpc = cap_getgrent(capgrp);
+		if (group_compare(grps, grpc))
+			result |= GETGRENT1;
+	}
+
+	getgrent_r(&sts, bufs, sizeof(bufs), &grps);
+	cap_getgrent_r(capgrp, &stc, bufc, sizeof(bufc), &grpc);
+	if (group_compare(grps, grpc)) {
+		result |= GETGRENT_R0;
+		getgrent_r(&sts, bufs, sizeof(bufs), &grps);
+		cap_getgrent_r(capgrp, &stc, bufc, sizeof(bufc), &grpc);
+		if (group_compare(grps, grpc))
+			result |= GETGRENT_R1;
+	}
+
+	(void)setgrent();
+	if (cap_setgrent(capgrp) == 1)
+		result |= SETGRENT;
+
+	getgrent_r(&sts, bufs, sizeof(bufs), &grps);
+	cap_getgrent_r(capgrp, &stc, bufc, sizeof(bufc), &grpc);
+	if (group_compare(grps, grpc))
+		result |= GETGRENT_R2;
+
+	grps = getgrent();
+	grpc = cap_getgrent(capgrp);
+	if (group_compare(grps, grpc))
+		result |= GETGRENT2;
+
+	grps = getgrnam("wheel");
+	grpc = cap_getgrnam(capgrp, "wheel");
+	if (group_compare(grps, grpc)) {
+		grps = getgrnam("operator");
+		grpc = cap_getgrnam(capgrp, "operator");
+		if (group_compare(grps, grpc))
+			result |= GETGRNAM;
+	}
+
+	getgrnam_r("wheel", &sts, bufs, sizeof(bufs), &grps);
+	cap_getgrnam_r(capgrp, "wheel", &stc, bufc, sizeof(bufc), &grpc);
+	if (group_compare(grps, grpc)) {
+		getgrnam_r("operator", &sts, bufs, sizeof(bufs), &grps);
+		cap_getgrnam_r(capgrp, "operator", &stc, bufc, sizeof(bufc),
+		    &grpc);
+		if (group_compare(grps, grpc))
+			result |= GETGRNAM_R;
+	}
+
+	grps = getgrgid(GID_WHEEL);
+	grpc = cap_getgrgid(capgrp, GID_WHEEL);
+	if (group_compare(grps, grpc)) {
+		grps = getgrgid(GID_OPERATOR);
+		grpc = cap_getgrgid(capgrp, GID_OPERATOR);
+		if (group_compare(grps, grpc))
+			result |= GETGRGID;
+	}
+
+	getgrgid_r(GID_WHEEL, &sts, bufs, sizeof(bufs), &grps);
+	cap_getgrgid_r(capgrp, GID_WHEEL, &stc, bufc, sizeof(bufc), &grpc);
+	if (group_compare(grps, grpc)) {
+		getgrgid_r(GID_OPERATOR, &sts, bufs, sizeof(bufs), &grps);
+		cap_getgrgid_r(capgrp, GID_OPERATOR, &stc, bufc, sizeof(bufc),
+		    &grpc);
+		if (group_compare(grps, grpc))
+			result |= GETGRGID_R;
+	}
+
+	return (result);
+}
+
+static void
+test_cmds(cap_channel_t *origcapgrp)
+{
+	cap_channel_t *capgrp;
+	const char *cmds[7], *fields[4], *names[5];
+	gid_t gids[5];
+
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+
+	names[0] = "wheel";
+	names[1] = "daemon";
+	names[2] = "kmem";
+	names[3] = "sys";
+	names[4] = "operator";
+
+	gids[0] = 0;
+	gids[1] = 1;
+	gids[2] = 2;
+	gids[3] = 3;
+	gids[4] = 5;
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names: wheel, daemon, kmem, sys, operator
+	 *     gids:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == 0);
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == 0);
+	CHECK(cap_grp_limit_groups(capgrp, names, 5, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM | GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names:
+	 *     gids: 0, 1, 2, 3, 5
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == 0);
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == 0);
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 5) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM | GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: getgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names: wheel, daemon, kmem, sys, operator
+	 *     gids:
+	 * Disallow:
+	 * cmds: setgrent
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "getgrent";
+	cmds[1] = "getgrent_r";
+	cmds[2] = "getgrnam";
+	cmds[3] = "getgrnam_r";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "setgrent";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_groups(capgrp, names, 5, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (GETGRENT0 | GETGRENT1 | GETGRENT_R0 |
+	    GETGRENT_R1 | GETGRNAM | GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: getgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names:
+	 *     gids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: setgrent
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "getgrent";
+	cmds[1] = "getgrent_r";
+	cmds[2] = "getgrnam";
+	cmds[3] = "getgrnam_r";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "setgrent";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 5) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (GETGRENT0 | GETGRENT1 | GETGRENT_R0 |
+	    GETGRENT_R1 | GETGRNAM | GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names: wheel, daemon, kmem, sys, operator
+	 *     gids:
+	 * Disallow:
+	 * cmds: getgrent
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent_r";
+	cmds[2] = "getgrnam";
+	cmds[3] = "getgrnam_r";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrent";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == 0);
+	CHECK(cap_grp_limit_groups(capgrp, names, 5, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT_R2 |
+	    GETGRNAM | GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names:
+	 *     gids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getgrent
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent_r";
+	cmds[2] = "getgrnam";
+	cmds[3] = "getgrnam_r";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrent";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == 0);
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 5) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT_R2 |
+	    GETGRNAM | GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrnam, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names: wheel, daemon, kmem, sys, operator
+	 *     gids:
+	 * Disallow:
+	 * cmds: getgrent_r
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrnam";
+	cmds[3] = "getgrnam_r";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrent_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_groups(capgrp, names, 5, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT0 | GETGRENT1 |
+	    GETGRNAM | GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrnam, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names:
+	 *     gids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getgrent_r
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrnam";
+	cmds[3] = "getgrnam_r";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrent_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 5) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT0 | GETGRENT1 |
+	    GETGRNAM | GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names: wheel, daemon, kmem, sys, operator
+	 *     gids:
+	 * Disallow:
+	 * cmds: getgrnam
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam_r";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrnam";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == 0);
+	CHECK(cap_grp_limit_groups(capgrp, names, 5, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam_r,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names:
+	 *     gids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getgrnam
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam_r";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrnam";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == 0);
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 5) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names: wheel, daemon, kmem, sys, operator
+	 *     gids:
+	 * Disallow:
+	 * cmds: getgrnam_r
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrnam_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_groups(capgrp, names, 5, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam,
+	 *       getgrgid, getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names:
+	 *     gids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getgrnam_r
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrgid";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrnam_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 5) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM | GETGRGID | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names: wheel, daemon, kmem, sys, operator
+	 *     gids:
+	 * Disallow:
+	 * cmds: getgrgid
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrgid";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == 0);
+	CHECK(cap_grp_limit_groups(capgrp, names, 5, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM | GETGRNAM_R | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid_r
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names:
+	 *     gids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getgrgid
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrgid";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == 0);
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 5) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM | GETGRNAM_R | GETGRGID_R));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names: wheel, daemon, kmem, sys, operator
+	 *     gids:
+	 * Disallow:
+	 * cmds: getgrgid_r
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_groups(capgrp, names, 5, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM | GETGRNAM_R | GETGRGID));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * cmds: setgrent, getgrent, getgrent_r, getgrnam, getgrnam_r,
+	 *       getgrgid
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 * groups:
+	 *     names:
+	 *     gids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getgrgid_r
+	 * fields:
+	 * groups:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 6) == 0);
+	cmds[0] = "setgrent";
+	cmds[1] = "getgrent";
+	cmds[2] = "getgrent_r";
+	cmds[3] = "getgrnam";
+	cmds[4] = "getgrnam_r";
+	cmds[5] = "getgrgid";
+	cmds[6] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getgrgid_r";
+	CHECK(cap_grp_limit_cmds(capgrp, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 5) == 0);
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM | GETGRNAM_R | GETGRGID));
+
+	cap_close(capgrp);
+}
+
+#define	GR_NAME		0x01
+#define	GR_PASSWD	0x02
+#define	GR_GID		0x04
+#define	GR_MEM		0x08
+
+static unsigned int
+group_fields(const struct group *grp)
+{
+	unsigned int result;
+
+	result = 0;
+
+	if (grp->gr_name != NULL && grp->gr_name[0] != '\0')
+		result |= GR_NAME;
+
+	if (grp->gr_passwd != NULL && grp->gr_passwd[0] != '\0')
+		result |= GR_PASSWD;
+
+	if (grp->gr_gid != (gid_t)-1)
+		result |= GR_GID;
+
+	if (grp->gr_mem != NULL && grp->gr_mem[0] != NULL)
+		result |= GR_MEM;
+
+	return (result);
+}
+
+static bool
+runtest_fields(cap_channel_t *capgrp, unsigned int expected)
+{
+	char buf[1024];
+	struct group *grp;
+	struct group st;
+
+	(void)cap_setgrent(capgrp);
+	grp = cap_getgrent(capgrp);
+	if (group_fields(grp) != expected)
+		return (false);
+
+	(void)cap_setgrent(capgrp);
+	cap_getgrent_r(capgrp, &st, buf, sizeof(buf), &grp);
+	if (group_fields(grp) != expected)
+		return (false);
+
+	grp = cap_getgrnam(capgrp, "wheel");
+	if (group_fields(grp) != expected)
+		return (false);
+
+	cap_getgrnam_r(capgrp, "wheel", &st, buf, sizeof(buf), &grp);
+	if (group_fields(grp) != expected)
+		return (false);
+
+	grp = cap_getgrgid(capgrp, GID_WHEEL);
+	if (group_fields(grp) != expected)
+		return (false);
+
+	cap_getgrgid_r(capgrp, GID_WHEEL, &st, buf, sizeof(buf), &grp);
+	if (group_fields(grp) != expected)
+		return (false);
+
+	return (true);
+}
+
+static void
+test_fields(cap_channel_t *origcapgrp)
+{
+	cap_channel_t *capgrp;
+	const char *fields[4];
+
+	/* No limits. */
+
+	CHECK(runtest_fields(origcapgrp, GR_NAME | GR_PASSWD | GR_GID | GR_MEM));
+
+	/*
+	 * Allow:
+	 * fields: gr_name, gr_passwd, gr_gid, gr_mem
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == 0);
+
+	CHECK(runtest_fields(capgrp, GR_NAME | GR_PASSWD | GR_GID | GR_MEM));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_passwd, gr_gid, gr_mem
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_passwd";
+	fields[1] = "gr_gid";
+	fields[2] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 3) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_PASSWD | GR_GID | GR_MEM));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_name, gr_gid, gr_mem
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_name";
+	fields[1] = "gr_gid";
+	fields[2] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 3) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "gr_passwd";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_NAME | GR_GID | GR_MEM));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_name, gr_passwd, gr_mem
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 3) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "gr_gid";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_NAME | GR_PASSWD | GR_MEM));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_name, gr_passwd, gr_gid
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 3) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_NAME | GR_PASSWD | GR_GID));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_name, gr_passwd
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 2) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "gr_gid";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_NAME | GR_PASSWD));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_name, gr_gid
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_name";
+	fields[1] = "gr_gid";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 2) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_NAME | GR_GID));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_name, gr_mem
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_name";
+	fields[1] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 2) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "gr_passwd";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_NAME | GR_MEM));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_passwd, gr_gid
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_passwd";
+	fields[1] = "gr_gid";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 2) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_PASSWD | GR_GID));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_passwd, gr_mem
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_passwd";
+	fields[1] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 2) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "gr_gid";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_PASSWD | GR_MEM));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * fields: gr_gid, gr_mem
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	fields[0] = "gr_gid";
+	fields[1] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 2) == 0);
+	fields[0] = "gr_name";
+	fields[1] = "gr_passwd";
+	fields[2] = "gr_gid";
+	fields[3] = "gr_mem";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "gr_passwd";
+	CHECK(cap_grp_limit_fields(capgrp, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(capgrp, GR_GID | GR_MEM));
+
+	cap_close(capgrp);
+}
+
+static bool
+runtest_groups(cap_channel_t *capgrp, const char **names, const gid_t *gids,
+    size_t ngroups)
+{
+	char buf[1024];
+	struct group *grp;
+	struct group st;
+	unsigned int i, got;
+
+	(void)cap_setgrent(capgrp);
+	got = 0;
+	for (;;) {
+		grp = cap_getgrent(capgrp);
+		if (grp == NULL)
+			break;
+		got++;
+		for (i = 0; i < ngroups; i++) {
+			if (strcmp(names[i], grp->gr_name) == 0 &&
+			    gids[i] == grp->gr_gid) {
+				break;
+			}
+		}
+		if (i == ngroups)
+			return (false);
+	}
+	if (got != ngroups)
+		return (false);
+
+	(void)cap_setgrent(capgrp);
+	got = 0;
+	for (;;) {
+		cap_getgrent_r(capgrp, &st, buf, sizeof(buf), &grp);
+		if (grp == NULL)
+			break;
+		got++;
+		for (i = 0; i < ngroups; i++) {
+			if (strcmp(names[i], grp->gr_name) == 0 &&
+			    gids[i] == grp->gr_gid) {
+				break;
+			}
+		}
+		if (i == ngroups)
+			return (false);
+	}
+	if (got != ngroups)
+		return (false);
+
+	for (i = 0; i < ngroups; i++) {
+		grp = cap_getgrnam(capgrp, names[i]);
+		if (grp == NULL)
+			return (false);
+	}
+
+	for (i = 0; i < ngroups; i++) {
+		cap_getgrnam_r(capgrp, names[i], &st, buf, sizeof(buf), &grp);
+		if (grp == NULL)
+			return (false);
+	}
+
+	for (i = 0; i < ngroups; i++) {
+		grp = cap_getgrgid(capgrp, gids[i]);
+		if (grp == NULL)
+			return (false);
+	}
+
+	for (i = 0; i < ngroups; i++) {
+		cap_getgrgid_r(capgrp, gids[i], &st, buf, sizeof(buf), &grp);
+		if (grp == NULL)
+			return (false);
+	}
+
+	return (true);
+}
+
+static void
+test_groups(cap_channel_t *origcapgrp)
+{
+	cap_channel_t *capgrp;
+	const char *names[5];
+	gid_t gids[5];
+
+	/*
+	 * Allow:
+	 * groups:
+	 *     names: wheel, daemon, kmem, sys, tty
+	 *     gids:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	names[0] = "wheel";
+	names[1] = "daemon";
+	names[2] = "kmem";
+	names[3] = "sys";
+	names[4] = "tty";
+	CHECK(cap_grp_limit_groups(capgrp, names, 5, NULL, 0) == 0);
+	gids[0] = 0;
+	gids[1] = 1;
+	gids[2] = 2;
+	gids[3] = 3;
+	gids[4] = 4;
+
+	CHECK(runtest_groups(capgrp, names, gids, 5));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * groups:
+	 *     names: kmem, sys, tty
+	 *     gids:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	names[0] = "kmem";
+	names[1] = "sys";
+	names[2] = "tty";
+	CHECK(cap_grp_limit_groups(capgrp, names, 3, NULL, 0) == 0);
+	names[3] = "daemon";
+	CHECK(cap_grp_limit_groups(capgrp, names, 4, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "daemon";
+	CHECK(cap_grp_limit_groups(capgrp, names, 1, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "kmem";
+	gids[0] = 2;
+	gids[1] = 3;
+	gids[2] = 4;
+
+	CHECK(runtest_groups(capgrp, names, gids, 3));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * groups:
+	 *     names: wheel, kmem, tty
+	 *     gids:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	names[0] = "wheel";
+	names[1] = "kmem";
+	names[2] = "tty";
+	CHECK(cap_grp_limit_groups(capgrp, names, 3, NULL, 0) == 0);
+	names[3] = "daemon";
+	CHECK(cap_grp_limit_groups(capgrp, names, 4, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "daemon";
+	CHECK(cap_grp_limit_groups(capgrp, names, 1, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "wheel";
+	gids[0] = 0;
+	gids[1] = 2;
+	gids[2] = 4;
+
+	CHECK(runtest_groups(capgrp, names, gids, 3));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * groups:
+	 *     names:
+	 *     gids: 2, 3, 4
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	names[0] = "kmem";
+	names[1] = "sys";
+	names[2] = "tty";
+	gids[0] = 2;
+	gids[1] = 3;
+	gids[2] = 4;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 3) == 0);
+	gids[3] = 0;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	gids[0] = 0;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	gids[0] = 2;
+
+	CHECK(runtest_groups(capgrp, names, gids, 3));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * groups:
+	 *     names:
+	 *     gids: 0, 2, 4
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	names[0] = "wheel";
+	names[1] = "kmem";
+	names[2] = "tty";
+	gids[0] = 0;
+	gids[1] = 2;
+	gids[2] = 4;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 3) == 0);
+	gids[3] = 1;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	gids[0] = 1;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	gids[0] = 0;
+
+	CHECK(runtest_groups(capgrp, names, gids, 3));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * groups:
+	 *     names: kmem
+	 *     gids:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	names[0] = "kmem";
+	CHECK(cap_grp_limit_groups(capgrp, names, 1, NULL, 0) == 0);
+	names[1] = "daemon";
+	CHECK(cap_grp_limit_groups(capgrp, names, 2, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "daemon";
+	CHECK(cap_grp_limit_groups(capgrp, names, 1, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "kmem";
+	gids[0] = 2;
+
+	CHECK(runtest_groups(capgrp, names, gids, 1));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * groups:
+	 *     names: wheel, tty
+	 *     gids:
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	names[0] = "wheel";
+	names[1] = "tty";
+	CHECK(cap_grp_limit_groups(capgrp, names, 2, NULL, 0) == 0);
+	names[2] = "daemon";
+	CHECK(cap_grp_limit_groups(capgrp, names, 3, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "daemon";
+	CHECK(cap_grp_limit_groups(capgrp, names, 1, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "wheel";
+	gids[0] = 0;
+	gids[1] = 4;
+
+	CHECK(runtest_groups(capgrp, names, gids, 2));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * groups:
+	 *     names:
+	 *     gids: 2
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	names[0] = "kmem";
+	gids[0] = 2;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 1) == 0);
+	gids[1] = 1;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	gids[0] = 1;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	gids[0] = 2;
+
+	CHECK(runtest_groups(capgrp, names, gids, 1));
+
+	cap_close(capgrp);
+
+	/*
+	 * Allow:
+	 * groups:
+	 *     names:
+	 *     gids: 0, 4
+	 */
+	capgrp = cap_clone(origcapgrp);
+	CHECK(capgrp != NULL);
+
+	names[0] = "wheel";
+	names[1] = "tty";
+	gids[0] = 0;
+	gids[1] = 4;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 2) == 0);
+	gids[2] = 1;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 3) == -1 &&
+	    errno == ENOTCAPABLE);
+	gids[0] = 1;
+	CHECK(cap_grp_limit_groups(capgrp, NULL, 0, gids, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	gids[0] = 0;
+
+	CHECK(runtest_groups(capgrp, names, gids, 2));
+
+	cap_close(capgrp);
+}
+
+int
+main(void)
+{
+	cap_channel_t *capcas, *capgrp;
+
+	printf("1..197\n");
+
+	capcas = cap_init();
+	CHECKX(capcas != NULL);
+
+	capgrp = cap_service_open(capcas, "system.grp");
+	CHECKX(capgrp != NULL);
+
+	cap_close(capcas);
+
+	/* No limits. */
+
+	CHECK(runtest_cmds(capgrp) == (SETGRENT | GETGRENT | GETGRENT_R |
+	    GETGRNAM | GETGRNAM_R | GETGRGID | GETGRGID_R));
+
+	test_cmds(capgrp);
+
+	test_fields(capgrp);
+
+	test_groups(capgrp);
+
+	cap_close(capgrp);
+
+	exit(0);
+}
diff --git a/tools/regression/capsicum/libcapsicum/pwd.c b/tools/regression/capsicum/libcapsicum/pwd.c
new file mode 100644
index 00000000000..161885dd421
--- /dev/null
+++ b/tools/regression/capsicum/libcapsicum/pwd.c
@@ -0,0 +1,1535 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/capability.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <pwd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <libcapsicum.h>
+#include <libcapsicum_pwd.h>
+#include <libcapsicum_service.h>
+
+static int ntest = 1;
+
+#define CHECK(expr)     do {						\
+	if ((expr))							\
+		printf("ok # %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok # %d %s:%u\n", ntest, __FILE__, __LINE__);\
+	ntest++;							\
+} while (0)
+#define CHECKX(expr)     do {						\
+	if ((expr)) {							\
+		printf("ok # %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	} else {							\
+		printf("not ok # %d %s:%u\n", ntest, __FILE__, __LINE__);\
+		exit(1);						\
+	}								\
+} while (0)
+
+#define	UID_ROOT	0
+#define	UID_OPERATOR	2
+
+#define	GETPWENT0	0x0001
+#define	GETPWENT1	0x0002
+#define	GETPWENT2	0x0004
+#define	GETPWENT	(GETPWENT0 | GETPWENT1 | GETPWENT2)
+#define	GETPWENT_R0	0x0008
+#define	GETPWENT_R1	0x0010
+#define	GETPWENT_R2	0x0020
+#define	GETPWENT_R	(GETPWENT_R0 | GETPWENT_R1 | GETPWENT_R2)
+#define	GETPWNAM	0x0040
+#define	GETPWNAM_R	0x0080
+#define	GETPWUID	0x0100
+#define	GETPWUID_R	0x0200
+
+static bool
+passwd_compare(const struct passwd *pwd0, const struct passwd *pwd1)
+{
+
+	if (pwd0 == NULL && pwd1 == NULL)
+		return (true);
+	if (pwd0 == NULL || pwd1 == NULL)
+		return (false);
+
+	if (strcmp(pwd0->pw_name, pwd1->pw_name) != 0)
+		return (false);
+
+	if (pwd0->pw_passwd != NULL || pwd1->pw_passwd != NULL) {
+		if (pwd0->pw_passwd == NULL || pwd1->pw_passwd == NULL)
+			return (false);
+		if (strcmp(pwd0->pw_passwd, pwd1->pw_passwd) != 0)
+			return (false);
+	}
+
+	if (pwd0->pw_uid != pwd1->pw_uid)
+		return (false);
+
+	if (pwd0->pw_gid != pwd1->pw_gid)
+		return (false);
+
+	if (pwd0->pw_change != pwd1->pw_change)
+		return (false);
+
+	if (pwd0->pw_class != NULL || pwd1->pw_class != NULL) {
+		if (pwd0->pw_class == NULL || pwd1->pw_class == NULL)
+			return (false);
+		if (strcmp(pwd0->pw_class, pwd1->pw_class) != 0)
+			return (false);
+	}
+
+	if (pwd0->pw_gecos != NULL || pwd1->pw_gecos != NULL) {
+		if (pwd0->pw_gecos == NULL || pwd1->pw_gecos == NULL)
+			return (false);
+		if (strcmp(pwd0->pw_gecos, pwd1->pw_gecos) != 0)
+			return (false);
+	}
+
+	if (pwd0->pw_dir != NULL || pwd1->pw_dir != NULL) {
+		if (pwd0->pw_dir == NULL || pwd1->pw_dir == NULL)
+			return (false);
+		if (strcmp(pwd0->pw_dir, pwd1->pw_dir) != 0)
+			return (false);
+	}
+
+	if (pwd0->pw_shell != NULL || pwd1->pw_shell != NULL) {
+		if (pwd0->pw_shell == NULL || pwd1->pw_shell == NULL)
+			return (false);
+		if (strcmp(pwd0->pw_shell, pwd1->pw_shell) != 0)
+			return (false);
+	}
+
+	if (pwd0->pw_expire != pwd1->pw_expire)
+		return (false);
+
+	if (pwd0->pw_fields != pwd1->pw_fields)
+		return (false);
+
+	return (true);
+}
+
+static unsigned int
+runtest_cmds(cap_channel_t *cappwd)
+{
+	char bufs[1024], bufc[1024];
+	unsigned int result;
+	struct passwd *pwds, *pwdc;
+	struct passwd sts, stc;
+
+	result = 0;
+
+	setpwent();
+	cap_setpwent(cappwd);
+
+	pwds = getpwent();
+	pwdc = cap_getpwent(cappwd);
+	if (passwd_compare(pwds, pwdc)) {
+		result |= GETPWENT0;
+		pwds = getpwent();
+		pwdc = cap_getpwent(cappwd);
+		if (passwd_compare(pwds, pwdc))
+			result |= GETPWENT1;
+	}
+
+	getpwent_r(&sts, bufs, sizeof(bufs), &pwds);
+	cap_getpwent_r(cappwd, &stc, bufc, sizeof(bufc), &pwdc);
+	if (passwd_compare(pwds, pwdc)) {
+		result |= GETPWENT_R0;
+		getpwent_r(&sts, bufs, sizeof(bufs), &pwds);
+		cap_getpwent_r(cappwd, &stc, bufc, sizeof(bufc), &pwdc);
+		if (passwd_compare(pwds, pwdc))
+			result |= GETPWENT_R1;
+	}
+
+	setpwent();
+	cap_setpwent(cappwd);
+
+	getpwent_r(&sts, bufs, sizeof(bufs), &pwds);
+	cap_getpwent_r(cappwd, &stc, bufc, sizeof(bufc), &pwdc);
+	if (passwd_compare(pwds, pwdc))
+		result |= GETPWENT_R2;
+
+	pwds = getpwent();
+	pwdc = cap_getpwent(cappwd);
+	if (passwd_compare(pwds, pwdc))
+		result |= GETPWENT2;
+
+	pwds = getpwnam("root");
+	pwdc = cap_getpwnam(cappwd, "root");
+	if (passwd_compare(pwds, pwdc)) {
+		pwds = getpwnam("operator");
+		pwdc = cap_getpwnam(cappwd, "operator");
+		if (passwd_compare(pwds, pwdc))
+			result |= GETPWNAM;
+	}
+
+	getpwnam_r("root", &sts, bufs, sizeof(bufs), &pwds);
+	cap_getpwnam_r(cappwd, "root", &stc, bufc, sizeof(bufc), &pwdc);
+	if (passwd_compare(pwds, pwdc)) {
+		getpwnam_r("operator", &sts, bufs, sizeof(bufs), &pwds);
+		cap_getpwnam_r(cappwd, "operator", &stc, bufc, sizeof(bufc),
+		    &pwdc);
+		if (passwd_compare(pwds, pwdc))
+			result |= GETPWNAM_R;
+	}
+
+	pwds = getpwuid(UID_ROOT);
+	pwdc = cap_getpwuid(cappwd, UID_ROOT);
+	if (passwd_compare(pwds, pwdc)) {
+		pwds = getpwuid(UID_OPERATOR);
+		pwdc = cap_getpwuid(cappwd, UID_OPERATOR);
+		if (passwd_compare(pwds, pwdc))
+			result |= GETPWUID;
+	}
+
+	getpwuid_r(UID_ROOT, &sts, bufs, sizeof(bufs), &pwds);
+	cap_getpwuid_r(cappwd, UID_ROOT, &stc, bufc, sizeof(bufc), &pwdc);
+	if (passwd_compare(pwds, pwdc)) {
+		getpwuid_r(UID_OPERATOR, &sts, bufs, sizeof(bufs), &pwds);
+		cap_getpwuid_r(cappwd, UID_OPERATOR, &stc, bufc, sizeof(bufc),
+		    &pwdc);
+		if (passwd_compare(pwds, pwdc))
+			result |= GETPWUID_R;
+	}
+
+	return (result);
+}
+
+static void
+test_cmds(cap_channel_t *origcappwd)
+{
+	cap_channel_t *cappwd;
+	const char *cmds[7], *fields[10], *names[6];
+	uid_t uids[5];
+
+	fields[0] = "pw_name";
+	fields[1] = "pw_passwd";
+	fields[2] = "pw_uid";
+	fields[3] = "pw_gid";
+	fields[4] = "pw_change";
+	fields[5] = "pw_class";
+	fields[6] = "pw_gecos";
+	fields[7] = "pw_dir";
+	fields[8] = "pw_shell";
+	fields[9] = "pw_expire";
+
+	names[0] = "root";
+	names[1] = "toor";
+	names[2] = "daemon";
+	names[3] = "operator";
+	names[4] = "bin";
+	names[5] = "kmem";
+
+	uids[0] = 0;
+	uids[1] = 1;
+	uids[2] = 2;
+	uids[3] = 3;
+	uids[4] = 5;
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names: root, toor, daemon, operator, bin, kmem
+	 *     uids:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == 0);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, names, 6, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM | GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names:
+	 *     uids: 0, 1, 2, 3, 5
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == 0);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 5) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM | GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: getpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names: root, toor, daemon, operator, bin, kmem
+	 *     uids:
+	 * Disallow:
+	 * cmds: setpwent
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cap_setpwent(cappwd);
+
+	cmds[0] = "getpwent";
+	cmds[1] = "getpwent_r";
+	cmds[2] = "getpwnam";
+	cmds[3] = "getpwnam_r";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "setpwent";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, names, 6, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT0 | GETPWENT1 | GETPWENT_R0 |
+	    GETPWENT_R1 | GETPWNAM | GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: getpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names:
+	 *     uids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: setpwent
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cap_setpwent(cappwd);
+
+	cmds[0] = "getpwent";
+	cmds[1] = "getpwent_r";
+	cmds[2] = "getpwnam";
+	cmds[3] = "getpwnam_r";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "setpwent";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 5) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT0 | GETPWENT1 | GETPWENT_R0 |
+	    GETPWENT_R1 | GETPWNAM | GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names: root, toor, daemon, operator, bin, kmem
+	 *     uids:
+	 * Disallow:
+	 * cmds: getpwent
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent_r";
+	cmds[2] = "getpwnam";
+	cmds[3] = "getpwnam_r";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwent";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, names, 6, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT_R2 |
+	    GETPWNAM | GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names:
+	 *     uids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getpwent
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent_r";
+	cmds[2] = "getpwnam";
+	cmds[3] = "getpwnam_r";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwent";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 5) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT_R2 |
+	    GETPWNAM | GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwnam, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names: root, toor, daemon, operator, bin, kmem
+	 *     uids:
+	 * Disallow:
+	 * cmds: getpwent_r
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwnam";
+	cmds[3] = "getpwnam_r";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwent_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, names, 6, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT0 | GETPWENT1 |
+	    GETPWNAM | GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwnam, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names:
+	 *     uids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getpwent_r
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwnam";
+	cmds[3] = "getpwnam_r";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwent_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 5) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT0 | GETPWENT1 |
+	    GETPWNAM | GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names: root, toor, daemon, operator, bin, kmem
+	 *     uids:
+	 * Disallow:
+	 * cmds: getpwnam
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam_r";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwnam";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, names, 6, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam_r,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names:
+	 *     uids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getpwnam
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam_r";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwnam";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 5) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names: root, toor, daemon, operator, bin, kmem
+	 *     uids:
+	 * Disallow:
+	 * cmds: getpwnam_r
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwnam_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, names, 6, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam,
+	 *       getpwuid, getpwuid_r
+	 * users:
+	 *     names:
+	 *     uids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getpwnam_r
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwuid";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwnam_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 5) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM | GETPWUID | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid_r
+	 * users:
+	 *     names: root, toor, daemon, operator, bin, kmem
+	 *     uids:
+	 * Disallow:
+	 * cmds: getpwuid
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwuid";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, names, 6, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM | GETPWNAM_R | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid_r
+	 * users:
+	 *     names:
+	 *     uids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getpwuid
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwuid";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 5) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM | GETPWNAM_R | GETPWUID_R));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid
+	 * users:
+	 *     names: root, toor, daemon, operator, bin, kmem
+	 *     uids:
+	 * Disallow:
+	 * cmds: getpwuid_r
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, names, 6, NULL, 0) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM | GETPWNAM_R | GETPWUID));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * cmds: setpwent, getpwent, getpwent_r, getpwnam, getpwnam_r,
+	 *       getpwuid
+	 * users:
+	 *     names:
+	 *     uids: 0, 1, 2, 3, 5
+	 * Disallow:
+	 * cmds: getpwuid_r
+	 * users:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 6) == 0);
+	cmds[0] = "setpwent";
+	cmds[1] = "getpwent";
+	cmds[2] = "getpwent_r";
+	cmds[3] = "getpwnam";
+	cmds[4] = "getpwnam_r";
+	cmds[5] = "getpwuid";
+	cmds[6] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 7) == -1 && errno == ENOTCAPABLE);
+	cmds[0] = "getpwuid_r";
+	CHECK(cap_pwd_limit_cmds(cappwd, cmds, 1) == -1 && errno == ENOTCAPABLE);
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 5) == 0);
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R |
+	    GETPWNAM | GETPWNAM_R | GETPWUID));
+
+	cap_close(cappwd);
+}
+
+#define	PW_NAME		_PWF_NAME
+#define	PW_PASSWD	_PWF_PASSWD
+#define	PW_UID		_PWF_UID
+#define	PW_GID		_PWF_GID
+#define	PW_CHANGE	_PWF_CHANGE
+#define	PW_CLASS	_PWF_CLASS
+#define	PW_GECOS	_PWF_GECOS
+#define	PW_DIR		_PWF_DIR
+#define	PW_SHELL	_PWF_SHELL
+#define	PW_EXPIRE	_PWF_EXPIRE
+
+static unsigned int
+passwd_fields(const struct passwd *pwd)
+{
+	unsigned int result;
+
+	result = 0;
+
+	if (pwd->pw_name != NULL && pwd->pw_name[0] != '\0')
+		result |= PW_NAME;
+//	else
+//		printf("No pw_name\n");
+
+	if (pwd->pw_passwd != NULL && pwd->pw_passwd[0] != '\0')
+		result |= PW_PASSWD;
+	else if ((pwd->pw_fields & _PWF_PASSWD) != 0)
+		result |= PW_PASSWD;
+//	else
+//		printf("No pw_passwd\n");
+
+	if (pwd->pw_uid != (uid_t)-1)
+		result |= PW_UID;
+//	else
+//		printf("No pw_uid\n");
+
+	if (pwd->pw_gid != (gid_t)-1)
+		result |= PW_GID;
+//	else
+//		printf("No pw_gid\n");
+
+	if (pwd->pw_change != 0 || (pwd->pw_fields & _PWF_CHANGE) != 0)
+		result |= PW_CHANGE;
+//	else
+//		printf("No pw_change\n");
+
+	if (pwd->pw_class != NULL && pwd->pw_class[0] != '\0')
+		result |= PW_CLASS;
+	else if ((pwd->pw_fields & _PWF_CLASS) != 0)
+		result |= PW_CLASS;
+//	else
+//		printf("No pw_class\n");
+
+	if (pwd->pw_gecos != NULL && pwd->pw_gecos[0] != '\0')
+		result |= PW_GECOS;
+	else if ((pwd->pw_fields & _PWF_GECOS) != 0)
+		result |= PW_GECOS;
+//	else
+//		printf("No pw_gecos\n");
+
+	if (pwd->pw_dir != NULL && pwd->pw_dir[0] != '\0')
+		result |= PW_DIR;
+	else if ((pwd->pw_fields & _PWF_DIR) != 0)
+		result |= PW_DIR;
+//	else
+//		printf("No pw_dir\n");
+
+	if (pwd->pw_shell != NULL && pwd->pw_shell[0] != '\0')
+		result |= PW_SHELL;
+	else if ((pwd->pw_fields & _PWF_SHELL) != 0)
+		result |= PW_SHELL;
+//	else
+//		printf("No pw_shell\n");
+
+	if (pwd->pw_expire != 0 || (pwd->pw_fields & _PWF_EXPIRE) != 0)
+		result |= PW_EXPIRE;
+//	else
+//		printf("No pw_expire\n");
+
+if (false && pwd->pw_fields != (int)result) {
+printf("fields=0x%x != result=0x%x\n", (const unsigned int)pwd->pw_fields, result);
+printf("           fields result\n");
+printf("PW_NAME    %d      %d\n", (pwd->pw_fields & PW_NAME) != 0, (result & PW_NAME) != 0);
+printf("PW_PASSWD  %d      %d\n", (pwd->pw_fields & PW_PASSWD) != 0, (result & PW_PASSWD) != 0);
+printf("PW_UID     %d      %d\n", (pwd->pw_fields & PW_UID) != 0, (result & PW_UID) != 0);
+printf("PW_GID     %d      %d\n", (pwd->pw_fields & PW_GID) != 0, (result & PW_GID) != 0);
+printf("PW_CHANGE  %d      %d\n", (pwd->pw_fields & PW_CHANGE) != 0, (result & PW_CHANGE) != 0);
+printf("PW_CLASS   %d      %d\n", (pwd->pw_fields & PW_CLASS) != 0, (result & PW_CLASS) != 0);
+printf("PW_GECOS   %d      %d\n", (pwd->pw_fields & PW_GECOS) != 0, (result & PW_GECOS) != 0);
+printf("PW_DIR     %d      %d\n", (pwd->pw_fields & PW_DIR) != 0, (result & PW_DIR) != 0);
+printf("PW_SHELL   %d      %d\n", (pwd->pw_fields & PW_SHELL) != 0, (result & PW_SHELL) != 0);
+printf("PW_EXPIRE  %d      %d\n", (pwd->pw_fields & PW_EXPIRE) != 0, (result & PW_EXPIRE) != 0);
+}
+
+//printf("result=0x%x\n", result);
+	return (result);
+}
+
+static bool
+runtest_fields(cap_channel_t *cappwd, unsigned int expected)
+{
+	char buf[1024];
+	struct passwd *pwd;
+	struct passwd st;
+
+//printf("expected=0x%x\n", expected);
+	cap_setpwent(cappwd);
+	pwd = cap_getpwent(cappwd);
+	if ((passwd_fields(pwd) & ~expected) != 0)
+		return (false);
+
+	cap_setpwent(cappwd);
+	cap_getpwent_r(cappwd, &st, buf, sizeof(buf), &pwd);
+	if ((passwd_fields(pwd) & ~expected) != 0)
+		return (false);
+
+	pwd = cap_getpwnam(cappwd, "root");
+	if ((passwd_fields(pwd) & ~expected) != 0)
+		return (false);
+
+	cap_getpwnam_r(cappwd, "root", &st, buf, sizeof(buf), &pwd);
+	if ((passwd_fields(pwd) & ~expected) != 0)
+		return (false);
+
+	pwd = cap_getpwuid(cappwd, UID_ROOT);
+	if ((passwd_fields(pwd) & ~expected) != 0)
+		return (false);
+
+	cap_getpwuid_r(cappwd, UID_ROOT, &st, buf, sizeof(buf), &pwd);
+	if ((passwd_fields(pwd) & ~expected) != 0)
+		return (false);
+
+	return (true);
+}
+
+static void
+test_fields(cap_channel_t *origcappwd)
+{
+	cap_channel_t *cappwd;
+	const char *fields[10];
+
+	/* No limits. */
+
+	CHECK(runtest_fields(origcappwd, PW_NAME | PW_PASSWD | PW_UID |
+	    PW_GID | PW_CHANGE | PW_CLASS | PW_GECOS | PW_DIR | PW_SHELL |
+	    PW_EXPIRE));
+
+	/*
+	 * Allow:
+	 * fields: pw_name, pw_passwd, pw_uid, pw_gid, pw_change, pw_class,
+	 *         pw_gecos, pw_dir, pw_shell, pw_expire
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	fields[0] = "pw_name";
+	fields[1] = "pw_passwd";
+	fields[2] = "pw_uid";
+	fields[3] = "pw_gid";
+	fields[4] = "pw_change";
+	fields[5] = "pw_class";
+	fields[6] = "pw_gecos";
+	fields[7] = "pw_dir";
+	fields[8] = "pw_shell";
+	fields[9] = "pw_expire";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 10) == 0);
+
+	CHECK(runtest_fields(origcappwd, PW_NAME | PW_PASSWD | PW_UID |
+	    PW_GID | PW_CHANGE | PW_CLASS | PW_GECOS | PW_DIR | PW_SHELL |
+	    PW_EXPIRE));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * fields: pw_name, pw_passwd, pw_uid, pw_gid, pw_change
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	fields[0] = "pw_name";
+	fields[1] = "pw_passwd";
+	fields[2] = "pw_uid";
+	fields[3] = "pw_gid";
+	fields[4] = "pw_change";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 5) == 0);
+	fields[5] = "pw_class";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 6) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "pw_class";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(cappwd, PW_NAME | PW_PASSWD | PW_UID |
+	    PW_GID | PW_CHANGE));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * fields: pw_class, pw_gecos, pw_dir, pw_shell, pw_expire
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	fields[0] = "pw_class";
+	fields[1] = "pw_gecos";
+	fields[2] = "pw_dir";
+	fields[3] = "pw_shell";
+	fields[4] = "pw_expire";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 5) == 0);
+	fields[5] = "pw_uid";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 6) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "pw_uid";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(cappwd, PW_CLASS | PW_GECOS | PW_DIR |
+	    PW_SHELL | PW_EXPIRE));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * fields: pw_name, pw_uid, pw_change, pw_gecos, pw_shell
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	fields[0] = "pw_name";
+	fields[1] = "pw_uid";
+	fields[2] = "pw_change";
+	fields[3] = "pw_gecos";
+	fields[4] = "pw_shell";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 5) == 0);
+	fields[5] = "pw_class";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 6) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "pw_class";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(cappwd, PW_NAME | PW_UID | PW_CHANGE |
+	    PW_GECOS | PW_SHELL));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * fields: pw_passwd, pw_gid, pw_class, pw_dir, pw_expire
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	fields[0] = "pw_passwd";
+	fields[1] = "pw_gid";
+	fields[2] = "pw_class";
+	fields[3] = "pw_dir";
+	fields[4] = "pw_expire";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 5) == 0);
+	fields[5] = "pw_uid";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 6) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "pw_uid";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(cappwd, PW_PASSWD | PW_GID | PW_CLASS |
+	    PW_DIR | PW_EXPIRE));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * fields: pw_uid, pw_class, pw_shell
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	fields[0] = "pw_uid";
+	fields[1] = "pw_class";
+	fields[2] = "pw_shell";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 3) == 0);
+	fields[3] = "pw_change";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "pw_change";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(cappwd, PW_UID | PW_CLASS | PW_SHELL));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * fields: pw_change
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	fields[0] = "pw_change";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 1) == 0);
+	fields[1] = "pw_uid";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	fields[0] = "pw_uid";
+	CHECK(cap_pwd_limit_fields(cappwd, fields, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+
+	CHECK(runtest_fields(cappwd, PW_CHANGE));
+
+	cap_close(cappwd);
+}
+
+static bool
+runtest_users(cap_channel_t *cappwd, const char **names, const uid_t *uids,
+    size_t nusers)
+{
+	char buf[1024];
+	struct passwd *pwd;
+	struct passwd st;
+	unsigned int i, got;
+
+	cap_setpwent(cappwd);
+	got = 0;
+	for (;;) {
+		pwd = cap_getpwent(cappwd);
+		if (pwd == NULL)
+			break;
+		got++;
+		for (i = 0; i < nusers; i++) {
+			if (strcmp(names[i], pwd->pw_name) == 0 &&
+			    uids[i] == pwd->pw_uid) {
+				break;
+			}
+		}
+		if (i == nusers)
+			return (false);
+	}
+	if (got != nusers)
+		return (false);
+
+	cap_setpwent(cappwd);
+	got = 0;
+	for (;;) {
+		cap_getpwent_r(cappwd, &st, buf, sizeof(buf), &pwd);
+		if (pwd == NULL)
+			break;
+		got++;
+		for (i = 0; i < nusers; i++) {
+			if (strcmp(names[i], pwd->pw_name) == 0 &&
+			    uids[i] == pwd->pw_uid) {
+				break;
+			}
+		}
+		if (i == nusers)
+			return (false);
+	}
+	if (got != nusers)
+		return (false);
+
+	for (i = 0; i < nusers; i++) {
+		pwd = cap_getpwnam(cappwd, names[i]);
+		if (pwd == NULL)
+			return (false);
+	}
+
+	for (i = 0; i < nusers; i++) {
+		cap_getpwnam_r(cappwd, names[i], &st, buf, sizeof(buf), &pwd);
+		if (pwd == NULL)
+			return (false);
+	}
+
+	for (i = 0; i < nusers; i++) {
+		pwd = cap_getpwuid(cappwd, uids[i]);
+		if (pwd == NULL)
+			return (false);
+	}
+
+	for (i = 0; i < nusers; i++) {
+		cap_getpwuid_r(cappwd, uids[i], &st, buf, sizeof(buf), &pwd);
+		if (pwd == NULL)
+			return (false);
+	}
+
+	return (true);
+}
+
+static void
+test_users(cap_channel_t *origcappwd)
+{
+	cap_channel_t *cappwd;
+	const char *names[6];
+	uid_t uids[6];
+
+	/*
+	 * Allow:
+	 * users:
+	 *     names: root, toor, daemon, operator, bin, tty
+	 *     uids:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	names[0] = "root";
+	names[1] = "toor";
+	names[2] = "daemon";
+	names[3] = "operator";
+	names[4] = "bin";
+	names[5] = "tty";
+	CHECK(cap_pwd_limit_users(cappwd, names, 6, NULL, 0) == 0);
+	uids[0] = 0;
+	uids[1] = 0;
+	uids[2] = 1;
+	uids[3] = 2;
+	uids[4] = 3;
+	uids[5] = 4;
+
+	CHECK(runtest_users(cappwd, names, uids, 6));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * users:
+	 *     names: daemon, operator, bin
+	 *     uids:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	names[0] = "daemon";
+	names[1] = "operator";
+	names[2] = "bin";
+	CHECK(cap_pwd_limit_users(cappwd, names, 3, NULL, 0) == 0);
+	names[3] = "tty";
+	CHECK(cap_pwd_limit_users(cappwd, names, 4, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "tty";
+	CHECK(cap_pwd_limit_users(cappwd, names, 1, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "daemon";
+	uids[0] = 1;
+	uids[1] = 2;
+	uids[2] = 3;
+
+	CHECK(runtest_users(cappwd, names, uids, 3));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * users:
+	 *     names: daemon, bin, tty
+	 *     uids:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	names[0] = "daemon";
+	names[1] = "bin";
+	names[2] = "tty";
+	CHECK(cap_pwd_limit_users(cappwd, names, 3, NULL, 0) == 0);
+	names[3] = "operator";
+	CHECK(cap_pwd_limit_users(cappwd, names, 4, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "operator";
+	CHECK(cap_pwd_limit_users(cappwd, names, 1, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "daemon";
+	uids[0] = 1;
+	uids[1] = 3;
+	uids[2] = 4;
+
+	CHECK(runtest_users(cappwd, names, uids, 3));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * users:
+	 *     names:
+	 *     uids: 1, 2, 3
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	names[0] = "daemon";
+	names[1] = "operator";
+	names[2] = "bin";
+	uids[0] = 1;
+	uids[1] = 2;
+	uids[2] = 3;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 3) == 0);
+	uids[3] = 4;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	uids[0] = 4;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	uids[0] = 1;
+
+	CHECK(runtest_users(cappwd, names, uids, 3));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * users:
+	 *     names:
+	 *     uids: 1, 3, 4
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	names[0] = "daemon";
+	names[1] = "bin";
+	names[2] = "tty";
+	uids[0] = 1;
+	uids[1] = 3;
+	uids[2] = 4;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 3) == 0);
+	uids[3] = 5;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 4) == -1 &&
+	    errno == ENOTCAPABLE);
+	uids[0] = 5;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	uids[0] = 1;
+
+	CHECK(runtest_users(cappwd, names, uids, 3));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * users:
+	 *     names: bin
+	 *     uids:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	names[0] = "bin";
+	CHECK(cap_pwd_limit_users(cappwd, names, 1, NULL, 0) == 0);
+	names[1] = "operator";
+	CHECK(cap_pwd_limit_users(cappwd, names, 2, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "operator";
+	CHECK(cap_pwd_limit_users(cappwd, names, 1, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "bin";
+	uids[0] = 3;
+
+	CHECK(runtest_users(cappwd, names, uids, 1));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * users:
+	 *     names: daemon, tty
+	 *     uids:
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	names[0] = "daemon";
+	names[1] = "tty";
+	CHECK(cap_pwd_limit_users(cappwd, names, 2, NULL, 0) == 0);
+	names[2] = "operator";
+	CHECK(cap_pwd_limit_users(cappwd, names, 3, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "operator";
+	CHECK(cap_pwd_limit_users(cappwd, names, 1, NULL, 0) == -1 &&
+	    errno == ENOTCAPABLE);
+	names[0] = "daemon";
+	uids[0] = 1;
+	uids[1] = 4;
+
+	CHECK(runtest_users(cappwd, names, uids, 2));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * users:
+	 *     names:
+	 *     uids: 3
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	names[0] = "bin";
+	uids[0] = 3;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 1) == 0);
+	uids[1] = 4;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 2) == -1 &&
+	    errno == ENOTCAPABLE);
+	uids[0] = 4;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	uids[0] = 3;
+
+	CHECK(runtest_users(cappwd, names, uids, 1));
+
+	cap_close(cappwd);
+
+	/*
+	 * Allow:
+	 * users:
+	 *     names:
+	 *     uids: 1, 4
+	 */
+	cappwd = cap_clone(origcappwd);
+	CHECK(cappwd != NULL);
+
+	names[0] = "daemon";
+	names[1] = "tty";
+	uids[0] = 1;
+	uids[1] = 4;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 2) == 0);
+	uids[2] = 3;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 3) == -1 &&
+	    errno == ENOTCAPABLE);
+	uids[0] = 3;
+	CHECK(cap_pwd_limit_users(cappwd, NULL, 0, uids, 1) == -1 &&
+	    errno == ENOTCAPABLE);
+	uids[0] = 1;
+
+	CHECK(runtest_users(cappwd, names, uids, 2));
+
+	cap_close(cappwd);
+}
+
+int
+main(void)
+{
+	cap_channel_t *capcas, *cappwd;
+
+	printf("1..186\n");
+
+	capcas = cap_init();
+	CHECKX(capcas != NULL);
+
+	cappwd = cap_service_open(capcas, "system.pwd");
+	CHECKX(cappwd != NULL);
+
+	cap_close(capcas);
+
+	/* No limits. */
+
+	CHECK(runtest_cmds(cappwd) == (GETPWENT | GETPWENT_R | GETPWNAM |
+	    GETPWNAM_R | GETPWUID | GETPWUID_R));
+
+	test_cmds(cappwd);
+
+	test_fields(cappwd);
+
+	test_users(cappwd);
+
+	cap_close(cappwd);
+
+	exit(0);
+}
diff --git a/tools/regression/capsicum/libcapsicum/sysctl.c b/tools/regression/capsicum/libcapsicum/sysctl.c
new file mode 100644
index 00000000000..14c735f0e76
--- /dev/null
+++ b/tools/regression/capsicum/libcapsicum/sysctl.c
@@ -0,0 +1,1509 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/capability.h>
+#include <sys/sysctl.h>
+
+#include <assert.h>
+#include <err.h>
+#include <errno.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <libcapsicum.h>
+#include <libcapsicum_service.h>
+#include <libcapsicum_sysctl.h>
+#include <nv.h>
+
+/*
+ * We need some sysctls to perform the tests on.
+ * We remember their values and restore them afer the test is done.
+ */
+#define	SYSCTL0_PARENT	"kern"
+#define	SYSCTL0_NAME	"kern.sync_on_panic"
+#define	SYSCTL1_PARENT	"debug"
+#define	SYSCTL1_NAME	"debug.minidump"
+
+static int ntest = 1;
+
+#define CHECK(expr)     do {						\
+	if ((expr))							\
+		printf("ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	ntest++;							\
+} while (0)
+#define CHECKX(expr)     do {						\
+	if ((expr)) {							\
+		printf("ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	} else {							\
+		printf("not ok %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+		exit(1);						\
+	}								\
+} while (0)
+
+#define	SYSCTL0_READ0		0x0001
+#define	SYSCTL0_READ1		0x0002
+#define	SYSCTL0_READ2		0x0004
+#define	SYSCTL0_WRITE		0x0008
+#define	SYSCTL0_READ_WRITE	0x0010
+#define	SYSCTL1_READ0		0x0020
+#define	SYSCTL1_READ1		0x0040
+#define	SYSCTL1_READ2		0x0080
+#define	SYSCTL1_WRITE		0x0100
+#define	SYSCTL1_READ_WRITE	0x0200
+
+static unsigned int
+runtest(cap_channel_t *capsysctl)
+{
+	unsigned int result;
+	int oldvalue, newvalue;
+	size_t oldsize;
+
+	result = 0;
+
+	oldsize = sizeof(oldvalue);
+	if (cap_sysctlbyname(capsysctl, SYSCTL0_NAME, &oldvalue, &oldsize,
+	    NULL, 0) == 0) {
+		if (oldsize == sizeof(oldvalue))
+			result |= SYSCTL0_READ0;
+	}
+
+	newvalue = 123;
+	if (cap_sysctlbyname(capsysctl, SYSCTL0_NAME, NULL, NULL, &newvalue,
+	    sizeof(newvalue)) == 0) {
+		result |= SYSCTL0_WRITE;
+	}
+
+	if ((result & SYSCTL0_WRITE) != 0) {
+		oldsize = sizeof(oldvalue);
+		if (cap_sysctlbyname(capsysctl, SYSCTL0_NAME, &oldvalue,
+		    &oldsize, NULL, 0) == 0) {
+			if (oldsize == sizeof(oldvalue) && oldvalue == 123)
+				result |= SYSCTL0_READ1;
+		}
+	}
+
+	oldsize = sizeof(oldvalue);
+	newvalue = 4567;
+	if (cap_sysctlbyname(capsysctl, SYSCTL0_NAME, &oldvalue, &oldsize,
+	    &newvalue, sizeof(newvalue)) == 0) {
+		if (oldsize == sizeof(oldvalue) && oldvalue == 123)
+			result |= SYSCTL0_READ_WRITE;
+	}
+
+	if ((result & SYSCTL0_READ_WRITE) != 0) {
+		oldsize = sizeof(oldvalue);
+		if (cap_sysctlbyname(capsysctl, SYSCTL0_NAME, &oldvalue,
+		    &oldsize, NULL, 0) == 0) {
+			if (oldsize == sizeof(oldvalue) && oldvalue == 4567)
+				result |= SYSCTL0_READ2;
+		}
+	}
+
+	oldsize = sizeof(oldvalue);
+	if (cap_sysctlbyname(capsysctl, SYSCTL1_NAME, &oldvalue, &oldsize,
+	    NULL, 0) == 0) {
+		if (oldsize == sizeof(oldvalue))
+			result |= SYSCTL1_READ0;
+	}
+
+	newvalue = 506;
+	if (cap_sysctlbyname(capsysctl, SYSCTL1_NAME, NULL, NULL, &newvalue,
+	    sizeof(newvalue)) == 0) {
+		result |= SYSCTL1_WRITE;
+	}
+
+	if ((result & SYSCTL1_WRITE) != 0) {
+		oldsize = sizeof(oldvalue);
+		if (cap_sysctlbyname(capsysctl, SYSCTL1_NAME, &oldvalue,
+		    &oldsize, NULL, 0) == 0) {
+			if (oldsize == sizeof(oldvalue) && oldvalue == 506)
+				result |= SYSCTL1_READ1;
+		}
+	}
+
+	oldsize = sizeof(oldvalue);
+	newvalue = 7008;
+	if (cap_sysctlbyname(capsysctl, SYSCTL1_NAME, &oldvalue, &oldsize,
+	    &newvalue, sizeof(newvalue)) == 0) {
+		if (oldsize == sizeof(oldvalue) && oldvalue == 506)
+			result |= SYSCTL1_READ_WRITE;
+	}
+
+	if ((result & SYSCTL1_READ_WRITE) != 0) {
+		oldsize = sizeof(oldvalue);
+		if (cap_sysctlbyname(capsysctl, SYSCTL1_NAME, &oldvalue,
+		    &oldsize, NULL, 0) == 0) {
+			if (oldsize == sizeof(oldvalue) && oldvalue == 7008)
+				result |= SYSCTL1_READ2;
+		}
+	}
+
+	return (result);
+}
+
+static void
+test_operation(cap_channel_t *origcapsysctl)
+{
+	cap_channel_t *capsysctl;
+	nvlist_t *limits;
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/RDWR/RECURSIVE
+	 * SYSCTL1_PARENT/RDWR/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, "foo.bar",
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, "foo.bar",
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 |
+	    SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE |
+	    SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE |
+	    SYSCTL1_READ_WRITE));
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 |
+	    SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE |
+	    SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE |
+	    SYSCTL1_READ_WRITE));
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE));
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE));
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == SYSCTL0_READ0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/RDWR/RECURSIVE
+	 * SYSCTL1_NAME/RDWR/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 |
+	    SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE |
+	    SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE |
+	    SYSCTL1_READ_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/RDWR
+	 * SYSCTL1_PARENT/RDWR
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == 0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/RDWR
+	 * SYSCTL1_NAME/RDWR
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 |
+	    SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE |
+	    SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE |
+	    SYSCTL1_READ_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/RDWR
+	 * SYSCTL1_PARENT/RDWR/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL1_READ0 | SYSCTL1_READ1 |
+	    SYSCTL1_READ2 | SYSCTL1_WRITE | SYSCTL1_READ_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/RDWR
+	 * SYSCTL1_NAME/RDWR/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 |
+	    SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE |
+	    SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE |
+	    SYSCTL1_READ_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/READ/RECURSIVE
+	 * SYSCTL1_PARENT/READ/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/READ/RECURSIVE
+	 * SYSCTL1_NAME/READ/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/READ
+	 * SYSCTL1_PARENT/READ
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == 0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/READ
+	 * SYSCTL1_NAME/READ
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/READ
+	 * SYSCTL1_PARENT/READ/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == SYSCTL1_READ0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/READ
+	 * SYSCTL1_NAME/READ/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_READ0));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/WRITE/RECURSIVE
+	 * SYSCTL1_PARENT/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_WRITE | SYSCTL1_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/WRITE/RECURSIVE
+	 * SYSCTL1_NAME/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_WRITE | SYSCTL1_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/WRITE
+	 * SYSCTL1_PARENT/WRITE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == 0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/WRITE
+	 * SYSCTL1_NAME/WRITE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_WRITE | SYSCTL1_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/WRITE
+	 * SYSCTL1_PARENT/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == SYSCTL1_WRITE);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/WRITE
+	 * SYSCTL1_NAME/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_WRITE | SYSCTL1_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/READ/RECURSIVE
+	 * SYSCTL1_PARENT/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/READ/RECURSIVE
+	 * SYSCTL1_NAME/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/READ
+	 * SYSCTL1_PARENT/WRITE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == 0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/READ
+	 * SYSCTL1_NAME/WRITE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/READ
+	 * SYSCTL1_PARENT/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == SYSCTL1_WRITE);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_NAME/READ
+	 * SYSCTL1_NAME/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL1_WRITE));
+
+	cap_close(capsysctl);
+}
+
+static void
+test_names(cap_channel_t *origcapsysctl)
+{
+	cap_channel_t *capsysctl;
+	nvlist_t *limits;
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/READ/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == SYSCTL0_READ0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL1_NAME/READ/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_READ | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == SYSCTL1_READ0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == SYSCTL0_WRITE);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL1_NAME/WRITE/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_WRITE | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == SYSCTL1_WRITE);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/RDWR/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 |
+	    SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL1_NAME/RDWR/RECURSIVE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	nvlist_add_number(limits, SYSCTL1_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME,
+	    CAP_SYSCTL_RDWR | CAP_SYSCTL_RECURSIVE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL1_READ0 | SYSCTL1_READ1 |
+	    SYSCTL1_READ2 | SYSCTL1_WRITE | SYSCTL1_READ_WRITE));
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/READ
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == 0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL1_NAME/READ
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_READ);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == SYSCTL1_READ0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/WRITE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == 0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL1_NAME/WRITE
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_WRITE);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == SYSCTL1_WRITE);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL0_PARENT/RDWR
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_PARENT, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_PARENT, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == 0);
+
+	cap_close(capsysctl);
+
+	/*
+	 * Allow:
+	 * SYSCTL1_NAME/RDWR
+	 */
+
+	capsysctl = cap_clone(origcapsysctl);
+	CHECK(capsysctl != NULL);
+
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == 0);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_RDWR);
+	nvlist_add_number(limits, SYSCTL1_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+	limits = nvlist_create(0);
+	nvlist_add_number(limits, SYSCTL0_NAME, CAP_SYSCTL_RDWR);
+	CHECK(cap_limit_set(capsysctl, limits) == -1 && errno == ENOTCAPABLE);
+
+	CHECK(runtest(capsysctl) == (SYSCTL1_READ0 | SYSCTL1_READ1 |
+	    SYSCTL1_READ2 | SYSCTL1_WRITE | SYSCTL1_READ_WRITE));
+
+	cap_close(capsysctl);
+}
+
+int
+main(void)
+{
+	cap_channel_t *capcas, *capsysctl;
+	int scvalue0, scvalue1;
+	size_t scsize;
+
+	printf("1..250\n");
+
+	scsize = sizeof(scvalue0);
+	CHECKX(sysctlbyname(SYSCTL0_NAME, &scvalue0, &scsize, NULL, 0) == 0);
+	CHECKX(scsize == sizeof(scvalue0));
+	scsize = sizeof(scvalue1);
+	CHECKX(sysctlbyname(SYSCTL1_NAME, &scvalue1, &scsize, NULL, 0) == 0);
+	CHECKX(scsize == sizeof(scvalue1));
+
+	capcas = cap_init();
+	CHECKX(capcas != NULL);
+
+	capsysctl = cap_service_open(capcas, "system.sysctl");
+	CHECKX(capsysctl != NULL);
+
+	cap_close(capcas);
+
+	/* No limits set. */
+
+	CHECK(runtest(capsysctl) == (SYSCTL0_READ0 | SYSCTL0_READ1 |
+	    SYSCTL0_READ2 | SYSCTL0_WRITE | SYSCTL0_READ_WRITE |
+	    SYSCTL1_READ0 | SYSCTL1_READ1 | SYSCTL1_READ2 | SYSCTL1_WRITE |
+	    SYSCTL1_READ_WRITE));
+
+	test_operation(capsysctl);
+
+	test_names(capsysctl);
+
+	cap_close(capsysctl);
+
+	CHECK(sysctlbyname(SYSCTL0_NAME, NULL, NULL, &scvalue0,
+	    sizeof(scvalue0)) == 0);
+	CHECK(sysctlbyname(SYSCTL1_NAME, NULL, NULL, &scvalue1,
+	    sizeof(scvalue1)) == 0);
+
+	exit(0);
+}
diff --git a/tools/regression/fsx/fsx.c b/tools/regression/fsx/fsx.c
index cee7d9008b9..5e9b45178c9 100644
--- a/tools/regression/fsx/fsx.c
+++ b/tools/regression/fsx/fsx.c
@@ -90,6 +90,7 @@ int			logcount = 0;	/* total ops */
 #define OP_MAPREAD	5
 #define OP_MAPWRITE	6
 #define OP_SKIPPED	7
+#define OP_INVALIDATE	8
 
 int page_size;
 int page_mask;
@@ -107,6 +108,7 @@ unsigned long	testcalls = 0;		/* calls to function "test" */
 
 unsigned long	simulatedopcount = 0;	/* -b flag */
 int	closeprob = 0;			/* -c flag */
+int	invlprob = 0;			/* -i flag */
 int	debug = 0;			/* -d flag */
 unsigned long	debugstart = 0;		/* -D flag */
 unsigned long	maxfilelen = 256 * 1024;	/* -l flag */
@@ -126,10 +128,12 @@ int	randomoplen = 1;		/* -O flag disables it */
 int	seed = 1;			/* -S flag */
 int     mapped_writes = 1;	      /* -W flag disables */
 int 	mapped_reads = 1;		/* -R flag disables it */
+int     mapped_msync = 1;	      /* -U flag disables */
 int	fsxgoodfd = 0;
 FILE *	fsxlogf = NULL;
 int badoff = -1;
 int closeopen = 0;
+int invl = 0;
 
 
 void
@@ -181,14 +185,12 @@ prterr(char *prefix)
 
 
 void
-log4(int operation, int arg0, int arg1, int arg2)
+do_log4(int operation, int arg0, int arg1, int arg2)
 {
 	struct log_entry *le;
 
 	le = &oplog[logptr];
 	le->operation = operation;
-	if (closeopen)
-		le->operation = ~ le->operation;
 	le->args[0] = arg0;
 	le->args[1] = arg1;
 	le->args[2] = arg2;
@@ -199,11 +201,22 @@ log4(int operation, int arg0, int arg1, int arg2)
 }
 
 
+void
+log4(int operation, int arg0, int arg1, int arg2)
+{
+	do_log4(operation, arg0, arg1, arg2);
+	if (closeopen)
+		do_log4(OP_CLOSEOPEN, 0, 0, 0);
+	if (invl)
+		do_log4(OP_INVALIDATE, 0, 0, 0);
+}
+
+
 void
 logdump(void)
 {
-	int	i, count, down;
 	struct log_entry	*lp;
+	int	i, count, down, opnum;
 
 	prt("LOG DUMP (%d total operations):\n", logcount);
 	if (logcount < LOGSIZE) {
@@ -213,15 +226,28 @@ logdump(void)
 		i = logptr;
 		count = LOGSIZE;
 	}
-	for ( ; count > 0; count--) {
-		int opnum;
 
-		opnum = i+1 + (logcount/LOGSIZE)*LOGSIZE;
-		prt("%d(%d mod 256): ", opnum, opnum%256);
+	opnum = i + 1 + (logcount/LOGSIZE)*LOGSIZE;
+	for ( ; count > 0; count--) {
 		lp = &oplog[i];
-		if ((closeopen = lp->operation < 0))
-			lp->operation = ~ lp->operation;
-			
+
+		if (lp->operation == OP_CLOSEOPEN ||
+		    lp->operation == OP_INVALIDATE) {
+			switch (lp->operation) {
+			case OP_CLOSEOPEN:
+				prt("\t\tCLOSE/OPEN\n");
+				break;
+			case OP_INVALIDATE:
+				prt("\t\tMS_INVALIDATE\n");
+				break;
+			}
+			i++;
+			if (i == LOGSIZE)
+				i = 0;
+			continue;
+		}
+
+		prt("%d(%d mod 256): ", opnum, opnum%256);
 		switch (lp->operation) {
 		case OP_MAPREAD:
 			prt("MAPREAD\t0x%x thru 0x%x\t(0x%x bytes)",
@@ -274,9 +300,8 @@ logdump(void)
 			prt("BOGUS LOG ENTRY (operation code = %d)!",
 			    lp->operation);
 		}
-		if (closeopen)
-			prt("\n\t\tCLOSE/OPEN");
 		prt("\n");
+		opnum++;
 		i++;
 		if (i == LOGSIZE)
 			i = 0;
@@ -679,12 +704,12 @@ domapwrite(unsigned offset, unsigned size)
 
 	if ((p = (char *)mmap(0, map_size, PROT_READ | PROT_WRITE,
 			      MAP_FILE | MAP_SHARED, fd,
-			      (off_t)(offset - pg_offset))) == (char *)-1) {
+			      (off_t)(offset - pg_offset))) == MAP_FAILED) {
 		prterr("domapwrite: mmap");
 		report_failure(202);
 	}
 	memcpy(p + pg_offset, good_buf + offset, size);
-	if (msync(p, map_size, 0) != 0) {
+	if (mapped_msync && msync(p, map_size, MS_SYNC) != 0) {
 		prterr("domapwrite: msync");
 		report_failure(203);
 	}
@@ -777,6 +802,36 @@ docloseopen(void)
 }
 
 
+void
+doinvl(void)
+{
+	char *p;
+
+	if (file_size == 0)
+		return;
+	if (testcalls <= simulatedopcount)
+		return;
+	if (debug)
+		prt("%lu msync(MS_INVALIDATE)\n", testcalls);
+
+	if ((p = (char *)mmap(0, file_size, PROT_READ | PROT_WRITE,
+			      MAP_FILE | MAP_SHARED, fd, 0)) == MAP_FAILED) {
+		prterr("doinvl: mmap");
+		report_failure(205);
+	}
+
+	if (msync(p, 0, MS_SYNC | MS_INVALIDATE) != 0) {
+		prterr("doinvl: msync");
+		report_failure(206);
+	}
+
+	if (munmap(p, file_size) != 0) {
+		prterr("doinvl: munmap");
+		report_failure(207);
+	}
+}
+
+
 void
 test(void)
 {
@@ -797,6 +852,8 @@ test(void)
 
 	if (closeprob)
 		closeopen = (rv >> 3) < (1 << 28) / closeprob;
+	if (invlprob)
+		invl = (rv >> 3) < (1 << 28) / invlprob;
 
 	if (debugstart > 0 && testcalls >= debugstart)
 		debug = 1;
@@ -844,6 +901,8 @@ test(void)
 	}
 	if (sizechecks && testcalls > simulatedopcount)
 		check_size();
+	if (invl)
+		doinvl();
 	if (closeopen)
 		docloseopen();
 }
@@ -868,6 +927,7 @@ usage(void)
 	-b opnum: beginning operation number (default 1)\n\
 	-c P: 1 in P chance of file close+open at each op (default infinity)\n\
 	-d: debug output for all operations\n\
+	-i P: 1 in P chance of calling msync(MS_INVALIDATE) (default infinity)\n\
 	-l flen: the upper bound on file size (default 262144)\n\
 	-m startop:endop: monitor (print debug output) specified byte range (default 0:infinity)\n\
 	-n: no verifications of file size\n\
@@ -886,6 +946,7 @@ usage(void)
 	-S seed: for random # generator (default 1) 0 gets timestamp\n\
 	-W: mapped write operations DISabled\n\
 	-R: mapped read operations DISabled)\n\
+	-U: msync after mapped write operations DISabled\n\
 	fname: this filename is REQUIRED (no default)\n");
 	exit(90);
 }
@@ -941,8 +1002,8 @@ main(int argc, char **argv)
 
 	setvbuf(stdout, (char *)0, _IOLBF, 0); /* line buffered stdout */
 
-	while ((ch = getopt(argc, argv, "b:c:dl:m:no:p:qr:s:t:w:D:LN:OP:RS:W"))
-	       != -1)
+	while ((ch = getopt(argc, argv,
+	    "b:c:di:l:m:no:p:qr:s:t:w:D:LN:OP:RS:UW")) != -1)
 		switch (ch) {
 		case 'b':
 			simulatedopcount = getnum(optarg, &endp);
@@ -965,6 +1026,15 @@ main(int argc, char **argv)
 		case 'd':
 			debug = 1;
 			break;
+		case 'i':
+			invlprob = getnum(optarg, &endp);
+			if (!quiet)
+				fprintf(stdout,
+					"Chance of MS_INVALIDATE is 1 in %d\n",
+					invlprob);
+			if (invlprob <= 0)
+				usage();
+			break;
 		case 'l':
 			maxfilelen = getnum(optarg, &endp);
 			if (maxfilelen <= 0)
@@ -1057,6 +1127,11 @@ main(int argc, char **argv)
 			if (!quiet)
 				fprintf(stdout, "mapped writes DISABLED\n");
 			break;
+		case 'U':
+			mapped_msync = 0;
+			if (!quiet)
+				fprintf(stdout, "mapped msync DISABLED\n");
+			break;
 
 		default:
 			usage();
diff --git a/tools/regression/lib/libnv/Makefile b/tools/regression/lib/libnv/Makefile
new file mode 100644
index 00000000000..a64cb63fbe6
--- /dev/null
+++ b/tools/regression/lib/libnv/Makefile
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+TESTS=	nvlist_add
+TESTS+=	nvlist_exists
+TESTS+=	nvlist_free
+TESTS+=	nvlist_get
+TESTS+=	nvlist_move
+TESTS+=	nvlist_send_recv
+
+CFLAGS=	-O2 -pipe -fstack-protector
+CFLAGS+=-Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter
+CFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wreturn-type
+CFLAGS+=-Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-parameter
+CFLAGS+=-Wcast-align -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls
+CFLAGS+=-Wold-style-definition -Wno-pointer-sign -Wextra
+
+LDFLAGS+=-lnv
+
+all:	${TESTS} ${TESTS:=.t}
+
+.for TEST in ${TESTS}
+
+${TEST}:	${TEST}.c
+	${CC} ${CFLAGS} ${LDFLAGS} ${@}.c -o $@
+
+${TEST}.t:   ${TEST}
+	@printf "#!/bin/sh\n\n%s/%s\n" ${.CURDIR} ${@:.t=} > $@
+
+.endfor
+
+test:   all
+	@prove -r ${.CURDIR}
+
+clean:
+	rm -f ${TESTS} ${TESTS:=.t}
diff --git a/tools/regression/lib/libnv/nvlist_add.c b/tools/regression/lib/libnv/nvlist_add.c
new file mode 100644
index 00000000000..06bcc639df9
--- /dev/null
+++ b/tools/regression/lib/libnv/nvlist_add.c
@@ -0,0 +1,196 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include <nv.h>
+
+static int ntest = 1;
+
+#define	CHECK(expr)	do {						\
+	if ((expr))							\
+		printf("ok # %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok # %d %s:%u\n", ntest, __FILE__, __LINE__);\
+	ntest++;							\
+} while (0)
+
+int
+main(void)
+{
+	const nvlist_t *cnvl;
+	nvlist_t *nvl;
+
+	printf("1..94\n");
+
+	nvl = nvlist_create(0);
+
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	nvlist_add_null(nvl, "nvlist/null");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_null(nvl, "nvlist/null"));
+
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool/true"));
+	nvlist_add_bool(nvl, "nvlist/bool/true", true);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool/true"));
+
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool/false"));
+	nvlist_add_bool(nvl, "nvlist/bool/false", false);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool/false"));
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/0"));
+	nvlist_add_number(nvl, "nvlist/number/0", 0);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/0"));
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/1"));
+	nvlist_add_number(nvl, "nvlist/number/1", 1);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/1"));
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/-1"));
+	nvlist_add_number(nvl, "nvlist/number/-1", -1);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/-1"));
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/UINT64_MAX"));
+	nvlist_add_number(nvl, "nvlist/number/UINT64_MAX", UINT64_MAX);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/UINT64_MAX"));
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/INT64_MIN"));
+	nvlist_add_number(nvl, "nvlist/number/INT64_MIN", INT64_MIN);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/INT64_MIN"));
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/INT64_MAX"));
+	nvlist_add_number(nvl, "nvlist/number/INT64_MAX", INT64_MAX);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/INT64_MAX"));
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string/"));
+	nvlist_add_string(nvl, "nvlist/string/", "");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/"));
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string/x"));
+	nvlist_add_string(nvl, "nvlist/string/x", "x");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/x"));
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+	nvlist_add_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/stringf/"));
+	nvlist_add_stringf(nvl, "nvlist/stringf/", "%s", "");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_string(nvl, "nvlist/stringf/"));
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/stringf/x"));
+	nvlist_add_stringf(nvl, "nvlist/stringf/x", "%s", "x");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_string(nvl, "nvlist/stringf/x"));
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/stringf/666Xabc"));
+	nvlist_add_stringf(nvl, "nvlist/stringf/666Xabc", "%d%c%s", 666, 'X', "abc");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_string(nvl, "nvlist/stringf/666Xabc"));
+
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO"));
+	nvlist_add_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO", STDERR_FILENO);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO"));
+
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/binary/x"));
+	nvlist_add_binary(nvl, "nvlist/binary/x", "x", 1);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary/x"));
+
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz"));
+	nvlist_add_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz"));
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz"));
+
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	nvlist_add_nvlist(nvl, "nvlist/nvlist", nvl);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+
+	CHECK(nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool/true"));
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool/false"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/0"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/1"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/-1"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/UINT64_MAX"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/INT64_MIN"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number/INT64_MAX"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/x"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/stringf/"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/stringf/x"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/stringf/666Xabc"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary/x"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+
+	cnvl = nvlist_get_nvlist(nvl, "nvlist/nvlist");
+	CHECK(nvlist_exists_null(cnvl, "nvlist/null"));
+	CHECK(nvlist_exists_bool(cnvl, "nvlist/bool/true"));
+	CHECK(nvlist_exists_bool(cnvl, "nvlist/bool/false"));
+	CHECK(nvlist_exists_number(cnvl, "nvlist/number/0"));
+	CHECK(nvlist_exists_number(cnvl, "nvlist/number/1"));
+	CHECK(nvlist_exists_number(cnvl, "nvlist/number/-1"));
+	CHECK(nvlist_exists_number(cnvl, "nvlist/number/UINT64_MAX"));
+	CHECK(nvlist_exists_number(cnvl, "nvlist/number/INT64_MIN"));
+	CHECK(nvlist_exists_number(cnvl, "nvlist/number/INT64_MAX"));
+	CHECK(nvlist_exists_string(cnvl, "nvlist/string/"));
+	CHECK(nvlist_exists_string(cnvl, "nvlist/string/x"));
+	CHECK(nvlist_exists_string(cnvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+	CHECK(nvlist_exists_string(cnvl, "nvlist/stringf/"));
+	CHECK(nvlist_exists_string(cnvl, "nvlist/stringf/x"));
+	CHECK(nvlist_exists_string(cnvl, "nvlist/stringf/666Xabc"));
+	CHECK(nvlist_exists_descriptor(cnvl, "nvlist/descriptor/STDERR_FILENO"));
+	CHECK(nvlist_exists_binary(cnvl, "nvlist/binary/x"));
+	CHECK(nvlist_exists_binary(cnvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz"));
+
+	nvlist_destroy(nvl);
+
+	return (0);
+}
diff --git a/tools/regression/lib/libnv/nvlist_exists.c b/tools/regression/lib/libnv/nvlist_exists.c
new file mode 100644
index 00000000000..cb595d7b784
--- /dev/null
+++ b/tools/regression/lib/libnv/nvlist_exists.c
@@ -0,0 +1,321 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include <nv.h>
+
+static int ntest = 1;
+
+#define	CHECK(expr)	do {						\
+	if ((expr))							\
+		printf("ok # %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok # %d %s:%u\n", ntest, __FILE__, __LINE__);\
+	ntest++;							\
+} while (0)
+
+int
+main(void)
+{
+	nvlist_t *nvl;
+
+	printf("1..232\n");
+
+	nvl = nvlist_create(0);
+
+	CHECK(!nvlist_exists(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/null"));
+	nvlist_add_null(nvl, "nvlist/null");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists(nvl, "nvlist/null"));
+	CHECK(nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/null"));
+
+	CHECK(!nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/bool"));
+	nvlist_add_bool(nvl, "nvlist/bool", true);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/bool"));
+
+	CHECK(!nvlist_exists(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/number"));
+	nvlist_add_number(nvl, "nvlist/number", 0);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/number"));
+
+	CHECK(!nvlist_exists(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/string"));
+	nvlist_add_string(nvl, "nvlist/string", "test");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/string"));
+
+	CHECK(!nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/nvlist"));
+	nvlist_add_nvlist(nvl, "nvlist/nvlist", nvl);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/nvlist"));
+
+	CHECK(!nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/descriptor"));
+	nvlist_add_descriptor(nvl, "nvlist/descriptor", STDERR_FILENO);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/descriptor"));
+
+	CHECK(!nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/binary"));
+	nvlist_add_binary(nvl, "nvlist/binary", "test", 4);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/binary"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	CHECK(nvlist_exists(nvl, "nvlist/null"));
+	CHECK(nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists(nvl, "nvlist/number"));
+	CHECK(nvlist_exists(nvl, "nvlist/string"));
+	CHECK(nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_null(nvl, "nvlist/null");
+	CHECK(!nvlist_exists(nvl, "nvlist/null"));
+	CHECK(nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists(nvl, "nvlist/number"));
+	CHECK(nvlist_exists(nvl, "nvlist/string"));
+	CHECK(nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_bool(nvl, "nvlist/bool");
+	CHECK(!nvlist_exists(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists(nvl, "nvlist/number"));
+	CHECK(nvlist_exists(nvl, "nvlist/string"));
+	CHECK(nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_number(nvl, "nvlist/number");
+	CHECK(!nvlist_exists(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists(nvl, "nvlist/number"));
+	CHECK(nvlist_exists(nvl, "nvlist/string"));
+	CHECK(nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_string(nvl, "nvlist/string");
+	CHECK(!nvlist_exists(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists(nvl, "nvlist/string"));
+	CHECK(nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_nvlist(nvl, "nvlist/nvlist");
+	CHECK(!nvlist_exists(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_descriptor(nvl, "nvlist/descriptor");
+	CHECK(!nvlist_exists(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_binary(nvl, "nvlist/binary");
+	CHECK(!nvlist_exists(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists(nvl, "nvlist/binary"));
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	CHECK(nvlist_empty(nvl));
+
+	nvlist_destroy(nvl);
+
+	return (0);
+}
diff --git a/tools/regression/lib/libnv/nvlist_free.c b/tools/regression/lib/libnv/nvlist_free.c
new file mode 100644
index 00000000000..4417a446497
--- /dev/null
+++ b/tools/regression/lib/libnv/nvlist_free.c
@@ -0,0 +1,221 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include <nv.h>
+
+static int ntest = 1;
+
+#define	CHECK(expr)	do {						\
+	if ((expr))							\
+		printf("ok # %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok # %d %s:%u\n", ntest, __FILE__, __LINE__);\
+	ntest++;							\
+} while (0)
+
+int
+main(void)
+{
+	nvlist_t *nvl;
+
+	printf("1..114\n");
+
+	nvl = nvlist_create(0);
+
+	nvlist_add_null(nvl, "nvlist/null");
+	nvlist_add_bool(nvl, "nvlist/bool", true);
+	nvlist_add_number(nvl, "nvlist/number", 0);
+	nvlist_add_string(nvl, "nvlist/string", "test");
+	nvlist_add_nvlist(nvl, "nvlist/nvlist", nvl);
+	nvlist_add_descriptor(nvl, "nvlist/descriptor", STDERR_FILENO);
+	nvlist_add_binary(nvl, "nvlist/binary", "test", 4);
+
+	CHECK(nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_null(nvl, "nvlist/null");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_bool(nvl, "nvlist/bool");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_number(nvl, "nvlist/number");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_string(nvl, "nvlist/string");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_nvlist(nvl, "nvlist/nvlist");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_descriptor(nvl, "nvlist/descriptor");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free_binary(nvl, "nvlist/binary");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	CHECK(nvlist_empty(nvl));
+
+	nvlist_add_null(nvl, "nvlist/null");
+	nvlist_add_bool(nvl, "nvlist/bool", true);
+	nvlist_add_number(nvl, "nvlist/number", 0);
+	nvlist_add_string(nvl, "nvlist/string", "test");
+	nvlist_add_nvlist(nvl, "nvlist/nvlist", nvl);
+	nvlist_add_descriptor(nvl, "nvlist/descriptor", STDERR_FILENO);
+	nvlist_add_binary(nvl, "nvlist/binary", "test", 4);
+
+	CHECK(nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free(nvl, "nvlist/null");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free(nvl, "nvlist/bool");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free(nvl, "nvlist/number");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free(nvl, "nvlist/string");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free(nvl, "nvlist/nvlist");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free(nvl, "nvlist/descriptor");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	nvlist_free(nvl, "nvlist/binary");
+	CHECK(!nvlist_exists_null(nvl, "nvlist/null"));
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool"));
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number"));
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string"));
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/descriptor"));
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/binary"));
+
+	CHECK(nvlist_empty(nvl));
+
+	nvlist_destroy(nvl);
+
+	return (0);
+}
diff --git a/tools/regression/lib/libnv/nvlist_get.c b/tools/regression/lib/libnv/nvlist_get.c
new file mode 100644
index 00000000000..b4468db88b1
--- /dev/null
+++ b/tools/regression/lib/libnv/nvlist_get.c
@@ -0,0 +1,182 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nv.h>
+
+static int ntest = 1;
+
+#define	CHECK(expr)	do {						\
+	if ((expr))							\
+		printf("ok # %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok # %d %s:%u\n", ntest, __FILE__, __LINE__);\
+	ntest++;							\
+} while (0)
+
+#define	fd_is_valid(fd)	(fcntl((fd), F_GETFL) != -1 || errno != EBADF)
+
+int
+main(void)
+{
+	const nvlist_t *cnvl;
+	nvlist_t *nvl;
+	size_t size;
+
+	printf("1..83\n");
+
+	nvl = nvlist_create(0);
+
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool/true"));
+	nvlist_add_bool(nvl, "nvlist/bool/true", true);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_get_bool(nvl, "nvlist/bool/true") == true);
+
+	CHECK(!nvlist_exists_bool(nvl, "nvlist/bool/false"));
+	nvlist_add_bool(nvl, "nvlist/bool/false", false);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_get_bool(nvl, "nvlist/bool/false") == false);
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/0"));
+	nvlist_add_number(nvl, "nvlist/number/0", 0);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_get_number(nvl, "nvlist/number/0") == 0);
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/1"));
+	nvlist_add_number(nvl, "nvlist/number/1", 1);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_get_number(nvl, "nvlist/number/1") == 1);
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/-1"));
+	nvlist_add_number(nvl, "nvlist/number/-1", -1);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK((int)nvlist_get_number(nvl, "nvlist/number/-1") == -1);
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/UINT64_MAX"));
+	nvlist_add_number(nvl, "nvlist/number/UINT64_MAX", UINT64_MAX);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_get_number(nvl, "nvlist/number/UINT64_MAX") == UINT64_MAX);
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/INT64_MIN"));
+	nvlist_add_number(nvl, "nvlist/number/INT64_MIN", INT64_MIN);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK((int64_t)nvlist_get_number(nvl, "nvlist/number/INT64_MIN") == INT64_MIN);
+
+	CHECK(!nvlist_exists_number(nvl, "nvlist/number/INT64_MAX"));
+	nvlist_add_number(nvl, "nvlist/number/INT64_MAX", INT64_MAX);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK((int64_t)nvlist_get_number(nvl, "nvlist/number/INT64_MAX") == INT64_MAX);
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string/"));
+	nvlist_add_string(nvl, "nvlist/string/", "");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(strcmp(nvlist_get_string(nvl, "nvlist/string/"), "") == 0);
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string/x"));
+	nvlist_add_string(nvl, "nvlist/string/x", "x");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(strcmp(nvlist_get_string(nvl, "nvlist/string/x"), "x") == 0);
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+	nvlist_add_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz");
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(strcmp(nvlist_get_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz"), "abcdefghijklmnopqrstuvwxyz") == 0);
+
+	CHECK(!nvlist_exists_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO"));
+	nvlist_add_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO", STDERR_FILENO);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(fd_is_valid(nvlist_get_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO")));
+
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/binary/x"));
+	nvlist_add_binary(nvl, "nvlist/binary/x", "x", 1);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, "nvlist/binary/x", NULL), "x", 1) == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, "nvlist/binary/x", &size), "x", 1) == 0);
+	CHECK(size == 1);
+
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz"));
+	nvlist_add_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz"));
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz", NULL), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz", &size), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(size == sizeof("abcdefghijklmnopqrstuvwxyz"));
+
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	nvlist_add_nvlist(nvl, "nvlist/nvlist", nvl);
+	CHECK(nvlist_error(nvl) == 0);
+	cnvl = nvlist_get_nvlist(nvl, "nvlist/nvlist");
+	CHECK(nvlist_get_bool(cnvl, "nvlist/bool/true") == true);
+	CHECK(nvlist_get_bool(cnvl, "nvlist/bool/false") == false);
+	CHECK(nvlist_get_number(cnvl, "nvlist/number/0") == 0);
+	CHECK(nvlist_get_number(cnvl, "nvlist/number/1") == 1);
+	CHECK((int)nvlist_get_number(cnvl, "nvlist/number/-1") == -1);
+	CHECK(nvlist_get_number(cnvl, "nvlist/number/UINT64_MAX") == UINT64_MAX);
+	CHECK((int64_t)nvlist_get_number(cnvl, "nvlist/number/INT64_MIN") == INT64_MIN);
+	CHECK((int64_t)nvlist_get_number(cnvl, "nvlist/number/INT64_MAX") == INT64_MAX);
+	CHECK(strcmp(nvlist_get_string(cnvl, "nvlist/string/"), "") == 0);
+	CHECK(strcmp(nvlist_get_string(cnvl, "nvlist/string/x"), "x") == 0);
+	CHECK(strcmp(nvlist_get_string(cnvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz"), "abcdefghijklmnopqrstuvwxyz") == 0);
+	/* TODO */
+	CHECK(memcmp(nvlist_get_binary(cnvl, "nvlist/binary/x", NULL), "x", 1) == 0);
+	CHECK(memcmp(nvlist_get_binary(cnvl, "nvlist/binary/x", &size), "x", 1) == 0);
+	CHECK(size == 1);
+	CHECK(memcmp(nvlist_get_binary(cnvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz", NULL), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(memcmp(nvlist_get_binary(cnvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz", &size), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(size == sizeof("abcdefghijklmnopqrstuvwxyz"));
+
+	CHECK(nvlist_get_bool(nvl, "nvlist/bool/true") == true);
+	CHECK(nvlist_get_bool(nvl, "nvlist/bool/false") == false);
+	CHECK(nvlist_get_number(nvl, "nvlist/number/0") == 0);
+	CHECK(nvlist_get_number(nvl, "nvlist/number/1") == 1);
+	CHECK((int)nvlist_get_number(nvl, "nvlist/number/-1") == -1);
+	CHECK(nvlist_get_number(nvl, "nvlist/number/UINT64_MAX") == UINT64_MAX);
+	CHECK((int64_t)nvlist_get_number(nvl, "nvlist/number/INT64_MIN") == INT64_MIN);
+	CHECK((int64_t)nvlist_get_number(nvl, "nvlist/number/INT64_MAX") == INT64_MAX);
+	CHECK(strcmp(nvlist_get_string(nvl, "nvlist/string/"), "") == 0);
+	CHECK(strcmp(nvlist_get_string(nvl, "nvlist/string/x"), "x") == 0);
+	CHECK(strcmp(nvlist_get_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz"), "abcdefghijklmnopqrstuvwxyz") == 0);
+	CHECK(fd_is_valid(nvlist_get_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO")));
+	CHECK(memcmp(nvlist_get_binary(nvl, "nvlist/binary/x", NULL), "x", 1) == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, "nvlist/binary/x", &size), "x", 1) == 0);
+	CHECK(size == 1);
+	CHECK(memcmp(nvlist_get_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz", NULL), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz", &size), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(size == sizeof("abcdefghijklmnopqrstuvwxyz"));
+
+	nvlist_destroy(nvl);
+
+	return (0);
+}
diff --git a/tools/regression/lib/libnv/nvlist_move.c b/tools/regression/lib/libnv/nvlist_move.c
new file mode 100644
index 00000000000..760399da263
--- /dev/null
+++ b/tools/regression/lib/libnv/nvlist_move.c
@@ -0,0 +1,161 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nv.h>
+
+static int ntest = 1;
+
+#define	CHECK(expr)	do {						\
+	if ((expr))							\
+		printf("ok # %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok # %d %s:%u\n", ntest, __FILE__, __LINE__);\
+	ntest++;							\
+} while (0)
+
+int
+main(void)
+{
+	const nvlist_t *cnvl;
+	nvlist_t *nvl;
+	void *ptr;
+	size_t size;
+	int fd;
+
+	printf("1..52\n");
+
+	nvl = nvlist_create(0);
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string/"));
+	ptr = strdup("");
+	CHECK(ptr != NULL);
+	nvlist_move_string(nvl, "nvlist/string/", ptr);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/"));
+	CHECK(ptr == nvlist_get_string(nvl, "nvlist/string/"));
+
+	CHECK(!nvlist_exists_string(nvl, "nvlist/string/x"));
+	ptr = strdup("x");
+	CHECK(ptr != NULL);
+	nvlist_move_string(nvl, "nvlist/string/x", ptr);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/x"));
+	CHECK(ptr == nvlist_get_string(nvl, "nvlist/string/x"));
+
+	CHECK(!nvlist_exists_string(nvl,
+	    "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+	ptr = strdup("abcdefghijklmnopqrstuvwxyz");
+	CHECK(ptr != NULL);
+	nvlist_move_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz",
+	    ptr);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_string(nvl,
+	    "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+	CHECK(ptr ==
+	    nvlist_get_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+
+	CHECK(!nvlist_exists_descriptor(nvl,
+	    "nvlist/descriptor/STDERR_FILENO"));
+	fd = dup(STDERR_FILENO);
+	CHECK(fd >= 0);
+	nvlist_move_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO", fd);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO"));
+	CHECK(fd ==
+	    nvlist_get_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO"));
+
+	CHECK(!nvlist_exists_binary(nvl, "nvlist/binary/x"));
+	ptr = malloc(1);
+	CHECK(ptr != NULL);
+	memcpy(ptr, "x", 1);
+	nvlist_move_binary(nvl, "nvlist/binary/x", ptr, 1);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary/x"));
+	CHECK(ptr == nvlist_get_binary(nvl, "nvlist/binary/x", NULL));
+	CHECK(ptr == nvlist_get_binary(nvl, "nvlist/binary/x", &size));
+	CHECK(size == 1);
+
+	CHECK(!nvlist_exists_binary(nvl,
+	    "nvlist/binary/abcdefghijklmnopqrstuvwxyz"));
+	ptr = malloc(sizeof("abcdefghijklmnopqrstuvwxyz"));
+	CHECK(ptr != NULL);
+	memcpy(ptr, "abcdefghijklmnopqrstuvwxyz",
+	    sizeof("abcdefghijklmnopqrstuvwxyz"));
+	nvlist_move_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz",
+	    ptr, sizeof("abcdefghijklmnopqrstuvwxyz"));
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_binary(nvl,
+	    "nvlist/binary/abcdefghijklmnopqrstuvwxyz"));
+	CHECK(ptr == nvlist_get_binary(nvl,
+	    "nvlist/binary/abcdefghijklmnopqrstuvwxyz", NULL));
+	CHECK(ptr == nvlist_get_binary(nvl,
+	    "nvlist/binary/abcdefghijklmnopqrstuvwxyz", &size));
+	CHECK(size == sizeof("abcdefghijklmnopqrstuvwxyz"));
+
+	CHECK(!nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	ptr = nvlist_clone(nvl);
+	CHECK(ptr != NULL);
+	nvlist_move_nvlist(nvl, "nvlist/nvlist", ptr);
+	CHECK(nvlist_error(nvl) == 0);
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+	CHECK(ptr == nvlist_get_nvlist(nvl, "nvlist/nvlist"));
+
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/"));
+	CHECK(nvlist_exists_string(nvl, "nvlist/string/x"));
+	CHECK(nvlist_exists_string(nvl,
+	    "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+	CHECK(nvlist_exists_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO"));
+	CHECK(nvlist_exists_binary(nvl, "nvlist/binary/x"));
+	CHECK(nvlist_exists_binary(nvl,
+	    "nvlist/binary/abcdefghijklmnopqrstuvwxyz"));
+	CHECK(nvlist_exists_nvlist(nvl, "nvlist/nvlist"));
+
+	cnvl = nvlist_get_nvlist(nvl, "nvlist/nvlist");
+	CHECK(nvlist_exists_string(cnvl, "nvlist/string/"));
+	CHECK(nvlist_exists_string(cnvl, "nvlist/string/x"));
+	CHECK(nvlist_exists_string(cnvl,
+	    "nvlist/string/abcdefghijklmnopqrstuvwxyz"));
+	CHECK(nvlist_exists_descriptor(cnvl,
+	    "nvlist/descriptor/STDERR_FILENO"));
+	CHECK(nvlist_exists_binary(cnvl, "nvlist/binary/x"));
+	CHECK(nvlist_exists_binary(cnvl,
+	    "nvlist/binary/abcdefghijklmnopqrstuvwxyz"));
+
+	nvlist_destroy(nvl);
+
+	return (0);
+}
diff --git a/tools/regression/lib/libnv/nvlist_send_recv.c b/tools/regression/lib/libnv/nvlist_send_recv.c
new file mode 100644
index 00000000000..c751bf78252
--- /dev/null
+++ b/tools/regression/lib/libnv/nvlist_send_recv.c
@@ -0,0 +1,325 @@
+/*-
+ * Copyright (c) 2013 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Pawel Jakub Dawidek 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 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$
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/wait.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <nv.h>
+
+static int ntest = 1;
+
+#define	CHECK(expr)	do {						\
+	if ((expr))							\
+		printf("ok # %d %s:%u\n", ntest, __FILE__, __LINE__);	\
+	else								\
+		printf("not ok # %d %s:%u\n", ntest, __FILE__, __LINE__);\
+	ntest++;							\
+} while (0)
+
+#define	fd_is_valid(fd)	(fcntl((fd), F_GETFL) != -1 || errno != EBADF)
+
+static void
+child(int sock)
+{
+	nvlist_t *nvl;
+
+	nvl = nvlist_create(0);
+
+	nvlist_add_bool(nvl, "nvlist/bool/true", true);
+	nvlist_add_bool(nvl, "nvlist/bool/false", false);
+	nvlist_add_number(nvl, "nvlist/number/0", 0);
+	nvlist_add_number(nvl, "nvlist/number/1", 1);
+	nvlist_add_number(nvl, "nvlist/number/-1", -1);
+	nvlist_add_number(nvl, "nvlist/number/UINT64_MAX", UINT64_MAX);
+	nvlist_add_number(nvl, "nvlist/number/INT64_MIN", INT64_MIN);
+	nvlist_add_number(nvl, "nvlist/number/INT64_MAX", INT64_MAX);
+	nvlist_add_string(nvl, "nvlist/string/", "");
+	nvlist_add_string(nvl, "nvlist/string/x", "x");
+	nvlist_add_string(nvl, "nvlist/string/abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz");
+	nvlist_add_descriptor(nvl, "nvlist/descriptor/STDERR_FILENO", STDERR_FILENO);
+	nvlist_add_binary(nvl, "nvlist/binary/x", "x", 1);
+	nvlist_add_binary(nvl, "nvlist/binary/abcdefghijklmnopqrstuvwxyz", "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz"));
+	nvlist_add_nvlist(nvl, "nvlist/nvlist", nvl);
+
+	nvlist_send(sock, nvl);
+
+	nvlist_destroy(nvl);
+}
+
+static void
+parent(int sock)
+{
+	nvlist_t *nvl;
+	const nvlist_t *cnvl;
+	const char *name, *cname;
+	void *cookie, *ccookie;
+	int type, ctype;
+	size_t size;
+
+	nvl = nvlist_recv(sock);
+	CHECK(nvlist_error(nvl) == 0);
+	if (nvlist_error(nvl) != 0)
+		err(1, "nvlist_recv() failed");
+
+	cookie = NULL;
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_BOOL);
+	CHECK(strcmp(name, "nvlist/bool/true") == 0);
+	CHECK(nvlist_get_bool(nvl, name) == true);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_BOOL);
+	CHECK(strcmp(name, "nvlist/bool/false") == 0);
+	CHECK(nvlist_get_bool(nvl, name) == false);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_NUMBER);
+	CHECK(strcmp(name, "nvlist/number/0") == 0);
+	CHECK(nvlist_get_number(nvl, name) == 0);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_NUMBER);
+	CHECK(strcmp(name, "nvlist/number/1") == 0);
+	CHECK(nvlist_get_number(nvl, name) == 1);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_NUMBER);
+	CHECK(strcmp(name, "nvlist/number/-1") == 0);
+	CHECK((int)nvlist_get_number(nvl, name) == -1);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_NUMBER);
+	CHECK(strcmp(name, "nvlist/number/UINT64_MAX") == 0);
+	CHECK(nvlist_get_number(nvl, name) == UINT64_MAX);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_NUMBER);
+	CHECK(strcmp(name, "nvlist/number/INT64_MIN") == 0);
+	CHECK((int64_t)nvlist_get_number(nvl, name) == INT64_MIN);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_NUMBER);
+	CHECK(strcmp(name, "nvlist/number/INT64_MAX") == 0);
+	CHECK((int64_t)nvlist_get_number(nvl, name) == INT64_MAX);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_STRING);
+	CHECK(strcmp(name, "nvlist/string/") == 0);
+	CHECK(strcmp(nvlist_get_string(nvl, name), "") == 0);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_STRING);
+	CHECK(strcmp(name, "nvlist/string/x") == 0);
+	CHECK(strcmp(nvlist_get_string(nvl, name), "x") == 0);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_STRING);
+	CHECK(strcmp(name, "nvlist/string/abcdefghijklmnopqrstuvwxyz") == 0);
+	CHECK(strcmp(nvlist_get_string(nvl, name), "abcdefghijklmnopqrstuvwxyz") == 0);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_DESCRIPTOR);
+	CHECK(strcmp(name, "nvlist/descriptor/STDERR_FILENO") == 0);
+	CHECK(fd_is_valid(nvlist_get_descriptor(nvl, name)));
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_BINARY);
+	CHECK(strcmp(name, "nvlist/binary/x") == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, name, NULL), "x", 1) == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, name, &size), "x", 1) == 0);
+	CHECK(size == 1);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_BINARY);
+	CHECK(strcmp(name, "nvlist/binary/abcdefghijklmnopqrstuvwxyz") == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, name, NULL), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(memcmp(nvlist_get_binary(nvl, name, &size), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(size == sizeof("abcdefghijklmnopqrstuvwxyz"));
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name != NULL);
+	CHECK(type == NV_TYPE_NVLIST);
+	CHECK(strcmp(name, "nvlist/nvlist") == 0);
+	cnvl = nvlist_get_nvlist(nvl, name);
+
+	ccookie = NULL;
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_BOOL);
+	CHECK(strcmp(cname, "nvlist/bool/true") == 0);
+	CHECK(nvlist_get_bool(cnvl, cname) == true);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_BOOL);
+	CHECK(strcmp(cname, "nvlist/bool/false") == 0);
+	CHECK(nvlist_get_bool(cnvl, cname) == false);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_NUMBER);
+	CHECK(strcmp(cname, "nvlist/number/0") == 0);
+	CHECK(nvlist_get_number(cnvl, cname) == 0);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_NUMBER);
+	CHECK(strcmp(cname, "nvlist/number/1") == 0);
+	CHECK(nvlist_get_number(cnvl, cname) == 1);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_NUMBER);
+	CHECK(strcmp(cname, "nvlist/number/-1") == 0);
+	CHECK((int)nvlist_get_number(cnvl, cname) == -1);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_NUMBER);
+	CHECK(strcmp(cname, "nvlist/number/UINT64_MAX") == 0);
+	CHECK(nvlist_get_number(cnvl, cname) == UINT64_MAX);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_NUMBER);
+	CHECK(strcmp(cname, "nvlist/number/INT64_MIN") == 0);
+	CHECK((int64_t)nvlist_get_number(cnvl, cname) == INT64_MIN);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_NUMBER);
+	CHECK(strcmp(cname, "nvlist/number/INT64_MAX") == 0);
+	CHECK((int64_t)nvlist_get_number(cnvl, cname) == INT64_MAX);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_STRING);
+	CHECK(strcmp(cname, "nvlist/string/") == 0);
+	CHECK(strcmp(nvlist_get_string(cnvl, cname), "") == 0);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_STRING);
+	CHECK(strcmp(cname, "nvlist/string/x") == 0);
+	CHECK(strcmp(nvlist_get_string(cnvl, cname), "x") == 0);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_STRING);
+	CHECK(strcmp(cname, "nvlist/string/abcdefghijklmnopqrstuvwxyz") == 0);
+	CHECK(strcmp(nvlist_get_string(cnvl, cname), "abcdefghijklmnopqrstuvwxyz") == 0);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_DESCRIPTOR);
+	CHECK(strcmp(cname, "nvlist/descriptor/STDERR_FILENO") == 0);
+	CHECK(fd_is_valid(nvlist_get_descriptor(cnvl, cname)));
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_BINARY);
+	CHECK(strcmp(cname, "nvlist/binary/x") == 0);
+	CHECK(memcmp(nvlist_get_binary(cnvl, cname, NULL), "x", 1) == 0);
+	CHECK(memcmp(nvlist_get_binary(cnvl, cname, &size), "x", 1) == 0);
+	CHECK(size == 1);
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname != NULL);
+	CHECK(ctype == NV_TYPE_BINARY);
+	CHECK(strcmp(cname, "nvlist/binary/abcdefghijklmnopqrstuvwxyz") == 0);
+	CHECK(memcmp(nvlist_get_binary(cnvl, cname, NULL), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(memcmp(nvlist_get_binary(cnvl, cname, &size), "abcdefghijklmnopqrstuvwxyz", sizeof("abcdefghijklmnopqrstuvwxyz")) == 0);
+	CHECK(size == sizeof("abcdefghijklmnopqrstuvwxyz"));
+
+	cname = nvlist_next(cnvl, &ctype, &ccookie);
+	CHECK(cname == NULL);
+
+	name = nvlist_next(nvl, &type, &cookie);
+	CHECK(name == NULL);
+}
+
+int
+main(void)
+{
+	int status, socks[2];
+	pid_t pid;
+
+	printf("1..126\n");
+	fflush(stdout);
+
+	if (socketpair(PF_UNIX, SOCK_STREAM, 0, socks) < 0)
+		err(1, "socketpair() failed");
+	pid = fork();
+	switch (pid) {
+	case -1:
+		/* Failure. */
+		err(1, "unable to fork");
+	case 0:
+		/* Child. */
+		close(socks[0]);
+		child(socks[1]);
+		return (0);
+	default:
+		/* Parent. */
+		close(socks[1]);
+		parent(socks[0]);
+		break;
+	}
+
+	if (waitpid(pid, &status, 0) < 0)
+		err(1, "waitpid() failed");
+
+	return (0);
+}
diff --git a/tools/regression/lib/libutil/Makefile b/tools/regression/lib/libutil/Makefile
index 6fc97aaa425..229b4d264eb 100644
--- a/tools/regression/lib/libutil/Makefile
+++ b/tools/regression/lib/libutil/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
-TESTS=	test-trimdomain test-trimdomain-nodomain test-flopen test-grp test-pidfile
+TESTS=	test-trimdomain test-trimdomain-nodomain test-flopen test-grp \
+	test-pidfile test-humanize_number
 CFLAGS+= -g -Wall -Wextra -Werror -lutil
 
 .PHONY: tests
diff --git a/tools/regression/lib/libutil/test-humanize_number.c b/tools/regression/lib/libutil/test-humanize_number.c
new file mode 100644
index 00000000000..24f197dac1e
--- /dev/null
+++ b/tools/regression/lib/libutil/test-humanize_number.c
@@ -0,0 +1,592 @@
+/*-
+ * Copyright 2012 Clifton Royston
+ * Copyright 2013 John-Mark Gurney
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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 <stdlib.h>
+#include <libutil.h>
+#include <stdio.h>
+#include <string.h>
+#include <inttypes.h>
+#include <math.h>
+#include <unistd.h>
+#include <limits.h>
+
+extern char * optarg;
+
+#define	MAX_STR_FLAGS_RESULT	80
+#define MAX_INT_STR_DIGITS	12
+
+static const int64_t halfExabyte = (int64_t)500*1000*1000*1000*1000*1000L;
+
+static struct {
+	int retval;
+	const char *res;
+	int64_t num;
+	int flags;
+	int scale;
+} test_args[] = {
+	/* tests 0-13 test 1000 suffixes */
+	{ 2, "0 ", (int64_t)0L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "1 k", (int64_t)500L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "1 M", (int64_t)500*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "1 G", (int64_t)500*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "1 T", (int64_t)500*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "1 P", (int64_t)500*1000*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "1 E", (int64_t)500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 2, "1 ", (int64_t)1L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "2 k", (int64_t)1500L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "2 M", (int64_t)1500*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "2 G", (int64_t)1500*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "2 T", (int64_t)1500*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "2 P", (int64_t)1500*1000*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "2 E", (int64_t)1500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+
+	/* tests 14-27 test 1024 suffixes */
+	{ 2, "0 ", (int64_t)0L, 0, HN_AUTOSCALE },
+	{ 3, "1 K", (int64_t)512L, 0, HN_AUTOSCALE },
+	{ 3, "1 M", (int64_t)512*1024L, 0, HN_AUTOSCALE },
+	{ 3, "1 G", (int64_t)512*1024*1024L, 0, HN_AUTOSCALE },
+	{ 3, "1 T", (int64_t)512*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 3, "1 P", (int64_t)512*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 3, "1 E", (int64_t)512*1024*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 2, "1 ", (int64_t)1L, 0, HN_AUTOSCALE },
+	{ 3, "2 K", (int64_t)1536L, 0, HN_AUTOSCALE },
+	{ 3, "2 M", (int64_t)1536*1024L, 0, HN_AUTOSCALE },
+	{ 3, "2 G", (int64_t)1536*1024*1024L, 0, HN_AUTOSCALE },
+	{ 3, "2 T", (int64_t)1536*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 3, "2 P", (int64_t)1536*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 3, "2 E", (int64_t)1536*1024*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+
+	/* tests 28-37 test rounding */
+	{ 3, "0 M", (int64_t)500*1000L-1, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "1 M", (int64_t)500*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "1 M", (int64_t)1000*1000L + 500*1000L-1, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "2 M", (int64_t)1000*1000L + 500*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 3, "0 K", (int64_t)512L-1, 0, HN_AUTOSCALE },
+	{ 3, "1 K", (int64_t)512L, 0, HN_AUTOSCALE },
+	{ 3, "0 M", (int64_t)512*1024L-1, 0, HN_AUTOSCALE },
+	{ 3, "1 M", (int64_t)512*1024L, 0, HN_AUTOSCALE },
+	{ 3, "1 M", (int64_t)1024*1024L + 512*1024L-1, 0, HN_AUTOSCALE },
+	{ 3, "2 M", (int64_t)1024*1024L + 512*1024L, 0, HN_AUTOSCALE },
+
+	/* tests 38-61 test specific scale factors with 1000 divisor */
+	{ 3, "0 k", (int64_t)0L, HN_DIVISOR_1000, 1 },
+	{ 3, "1 k", (int64_t)500L, HN_DIVISOR_1000, 1 },
+	{ 3, "0 M", (int64_t)500L, HN_DIVISOR_1000, 2 },
+	{ 3, "1 M", (int64_t)500*1000L, HN_DIVISOR_1000, 2 },
+	{ 3, "0 G", (int64_t)500*1000L, HN_DIVISOR_1000, 3 },
+	{ 3, "1 G", (int64_t)500*1000*1000L, HN_DIVISOR_1000, 3 },
+	{ 3, "0 T", (int64_t)500*1000*1000L, HN_DIVISOR_1000, 4 },
+	{ 3, "1 T", (int64_t)500*1000*1000*1000L, HN_DIVISOR_1000, 4 },
+	{ 3, "0 P", (int64_t)500*1000*1000*1000L, HN_DIVISOR_1000, 5 },
+	{ 3, "1 P", (int64_t)500*1000*1000*1000*1000L, HN_DIVISOR_1000, 5 },
+	{ 3, "0 E", (int64_t)500*1000*1000*1000*1000L, HN_DIVISOR_1000, 6 },
+	{ 3, "1 E", (int64_t)500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, 6 },
+	{ 3, "0 k", (int64_t)1L, HN_DIVISOR_1000, 1 },
+	{ 3, "2 k", (int64_t)1500L, HN_DIVISOR_1000, 1 },
+	{ 3, "0 M", (int64_t)1500L, HN_DIVISOR_1000, 2 },
+	{ 3, "2 M", (int64_t)1500*1000L, HN_DIVISOR_1000, 2 },
+	{ 3, "0 G", (int64_t)1500*1000L, HN_DIVISOR_1000, 3 },
+	{ 3, "2 G", (int64_t)1500*1000*1000L, HN_DIVISOR_1000, 3 },
+	{ 3, "0 T", (int64_t)1500*1000*1000L, HN_DIVISOR_1000, 4 },
+	{ 3, "2 T", (int64_t)1500*1000*1000*1000L, HN_DIVISOR_1000, 4 },
+	{ 3, "0 P", (int64_t)1500*1000*1000*1000L, HN_DIVISOR_1000, 5 },
+	{ 3, "2 P", (int64_t)1500*1000*1000*1000*1000L, HN_DIVISOR_1000, 5 },
+	{ 3, "0 E", (int64_t)1500*1000*1000*1000*1000L, HN_DIVISOR_1000, 6 },
+	{ 3, "2 E", (int64_t)1500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, 6 },
+
+	/* tests 62-85 test specific scale factors with 1024 divisor */
+	{ 3, "0 K", (int64_t)0L, 0, 1 },
+	{ 3, "1 K", (int64_t)512L, 0, 1 },
+	{ 3, "0 M", (int64_t)512L, 0, 2 },
+	{ 3, "1 M", (int64_t)512*1024L, 0, 2 },
+	{ 3, "0 G", (int64_t)512*1024L, 0, 3 },
+	{ 3, "1 G", (int64_t)512*1024*1024L, 0, 3 },
+	{ 3, "0 T", (int64_t)512*1024*1024L, 0, 4 },
+	{ 3, "1 T", (int64_t)512*1024*1024*1024L, 0, 4 },
+	{ 3, "0 P", (int64_t)512*1024*1024*1024L, 0, 5 },
+	{ 3, "1 P", (int64_t)512*1024*1024*1024*1024L, 0, 5 },
+	{ 3, "0 E", (int64_t)512*1024*1024*1024*1024L, 0, 6 },
+	{ 3, "1 E", (int64_t)512*1024*1024*1024*1024*1024L, 0, 6 },
+	{ 3, "0 K", (int64_t)1L, 0, 1 },
+	{ 3, "2 K", (int64_t)1536L, 0, 1 },
+	{ 3, "0 M", (int64_t)1536L, 0, 2 },
+	{ 3, "2 M", (int64_t)1536*1024L, 0, 2 },
+	{ 3, "0 G", (int64_t)1536*1024L, 0, 3 },
+	{ 3, "2 G", (int64_t)1536*1024*1024L, 0, 3 },
+	{ 3, "0 T", (int64_t)1536*1024*1024L, 0, 4 },
+	{ 3, "2 T", (int64_t)1536*1024*1024*1024L, 0, 4 },
+	{ 3, "0 P", (int64_t)1536*1024*1024*1024L, 0, 5 },
+	{ 3, "2 P", (int64_t)1536*1024*1024*1024*1024L, 0, 5 },
+	{ 3, "0 E", (int64_t)1536*1024*1024*1024*1024L, 0, 6 },
+	{ 3, "2 E", (int64_t)1536*1024*1024*1024*1024*1024L, 0, 6 },
+
+	/* tests 86-99 test invalid specific scale values of < 0 or >= 7 with
+	and without HN_DIVISOR_1000 set */
+	/*  all should return errors with new code; with old, the latter 3
+	are instead processed as if having AUTOSCALE and/or GETSCALE set */
+	{ -1, "", (int64_t)1L, 0, 7 },
+	{ -1, "", (int64_t)1L, HN_DIVISOR_1000, 7 },
+	{ -1, "", (int64_t)1L, 0, 1000 },
+	{ -1, "", (int64_t)1L, HN_DIVISOR_1000, 1000 },
+	{ -1, "", (int64_t)0L, 0, 1000*1000 },
+	{ -1, "", (int64_t)0L, HN_DIVISOR_1000, 1000*1000 },
+	{ -1, "", (int64_t)0L, 0, INT_MAX },
+	{ -1, "", (int64_t)0L, HN_DIVISOR_1000, INT_MAX },
+
+	/* Negative scale values are not handled well
+	 by the existing library routine - should report as error */
+	/*  all should return errors with new code, fail assertion with old */
+
+	{ -1, "", (int64_t)1L, 0, -1 },
+	{ -1, "", (int64_t)1L, HN_DIVISOR_1000, -1 },
+	{ -1, "", (int64_t)1L, 0, -1000 },
+	{ -1, "", (int64_t)1L, HN_DIVISOR_1000, -1000 },
+
+	/* __INT_MIN doesn't print properly, skipped. */
+
+	{ -1, "", (int64_t)1L, 0, -__INT_MAX },
+	{ -1, "", (int64_t)1L, HN_DIVISOR_1000, -__INT_MAX },
+
+
+	/* tests for scale == 0, without autoscale */
+	/* tests 100-114 test scale 0 with 1000 divisor - print first N digits */
+	{ 2, "0 ", (int64_t)0L, HN_DIVISOR_1000, 0 },
+	{ 2, "1 ", (int64_t)1L, HN_DIVISOR_1000, 0 },
+	{ 3, "10 ", (int64_t)10L, HN_DIVISOR_1000, 0 },
+	{ 3, "0 M", (int64_t)150L, HN_DIVISOR_1000, HN_NOSPACE },
+	{ 3, "0 M", (int64_t)500L, HN_DIVISOR_1000, HN_NOSPACE },
+	{ 3, "0 M", (int64_t)999L, HN_DIVISOR_1000, HN_NOSPACE },
+	{ 4, "150", (int64_t)150L, HN_DIVISOR_1000, 0 },
+	{ 4, "500", (int64_t)500L, HN_DIVISOR_1000, 0 },
+	{ 4, "999", (int64_t)999L, HN_DIVISOR_1000, 0 },
+	{ 5, "100", (int64_t)1000L, HN_DIVISOR_1000, 0 },
+	{ 5, "150", (int64_t)1500L, HN_DIVISOR_1000, 0 },
+	{ 7, "500", (int64_t)500*1000L, HN_DIVISOR_1000, 0 },
+	{ 8, "150", (int64_t)1500*1000L, HN_DIVISOR_1000, 0 },
+	{ 10, "500", (int64_t)500*1000*1000L, HN_DIVISOR_1000, 0 },
+	{ 11, "150", (int64_t)1500*1000*1000L, HN_DIVISOR_1000, 0 },
+
+	/* tests 115-126 test scale 0 with 1024 divisor - print first N digits */
+	{ 2, "0 ", (int64_t)0L, 0, 0 },
+	{ 2, "1 ", (int64_t)1L, 0, 0 },
+	{ 3, "10 ", (int64_t)10L, 0, 0 },
+	{ 4, "150", (int64_t)150L, 0, 0 },
+	{ 4, "500", (int64_t)500L, 0, 0 },
+	{ 4, "999", (int64_t)999L, 0, 0 },
+	{ 5, "100", (int64_t)1000L, 0, 0 },
+	{ 5, "150", (int64_t)1500L, 0, 0 },
+	{ 7, "500", (int64_t)500*1000L, 0, 0 },
+	{ 8, "150", (int64_t)1500*1000L, 0, 0 },
+	{ 10, "500", (int64_t)500*1000*1000L, 0, 0 },
+	{ 11, "150", (int64_t)1500*1000*1000L, 0, 0 },
+
+	/* Test boundary cases for very large positive/negative number formatting */
+	/* Explicit scale, divisor 1024 */
+
+	/* XXX = requires length 5 (buflen 6) for some cases*/
+	/* KLUDGE - test loop below will bump length 5 up to 5 */
+	{ 3, "8 E",   INT64_MAX, 0, 6 },
+	{ 4, "-8 E", -INT64_MAX, 0, 6 },
+	{ 3, "0 E", (int64_t)92*1024*1024*1024*1024*1024L, 0, 6 },
+	{ 3, "0 E", -(int64_t)92*1024*1024*1024*1024*1024L, 0, 6 },
+	{ 3, "0 E", (int64_t)82*1024*1024*1024*1024*1024L, 0, 6 },
+	{ 3, "0 E", -(int64_t)82*1024*1024*1024*1024*1024L, 0, 6 },
+	{ 3, "0 E", (int64_t)81*1024*1024*1024*1024*1024L, 0, 6 },
+	{ 3, "0 E", -(int64_t)81*1024*1024*1024*1024*1024L, 0, 6 },
+	{ 4, "92 P", (int64_t)92*1024*1024*1024*1024*1024L, 0, 5 },
+	{ 5, "-92 P", -(int64_t)92*1024*1024*1024*1024*1024L, 0, 5 },
+	{ 4, "82 P", (int64_t)82*1024*1024*1024*1024*1024L, 0, 5 },
+	{ 5, "-82 P", -(int64_t)82*1024*1024*1024*1024*1024L, 0, 5 },
+	{ 4, "81 P", (int64_t)81*1024*1024*1024*1024*1024L, 0, 5 },
+	{ 5, "-81 P", -(int64_t)81*1024*1024*1024*1024*1024L, 0, 5 },
+
+	/* Explicit scale, divisor 1000 */
+	{ 3, "9 E",   INT64_MAX, HN_DIVISOR_1000, 6 },
+	{ 4, "-9 E", -INT64_MAX, HN_DIVISOR_1000,  6 },
+	{ 3, "0 E", (int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  6 },
+	{ 3, "0 E", -(int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  6 },
+	{ 3, "0 E", (int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  6 },
+	{ 3, "0 E", -(int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  6 },
+	{ 4, "92 P", (int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  5 },
+	{ 5, "-92 P", -(int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  5 },
+	{ 4, "91 P", (int64_t)81*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  5 },
+	{ 5, "-91 P", -(int64_t)81*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  5 },
+
+	/* Autoscale, divisor 1024 */
+	{ 3, "8 E",   INT64_MAX, 0, HN_AUTOSCALE },
+	{ 4, "-8 E", -INT64_MAX, 0, HN_AUTOSCALE },
+	{ 4, "92 P", (int64_t)92*1024*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 5, "-92 P", -(int64_t)92*1024*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 4, "82 P", (int64_t)82*1024*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 5, "-82 P", -(int64_t)82*1024*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 4, "81 P", (int64_t)81*1024*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+	{ 5, "-81 P", -(int64_t)81*1024*1024*1024*1024*1024L, 0, HN_AUTOSCALE },
+	/* Autoscale, divisor 1000 */
+	{ 3, "9 E",   INT64_MAX, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 4, "-9 E", -INT64_MAX, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 4, "92 P", (int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "-92 P", -(int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 4, "91 P", (int64_t)81*1024*1024*1024*1024*1024L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "-91 P", -(int64_t)81*1024*1024*1024*1024*1024L, HN_DIVISOR_1000, HN_AUTOSCALE },
+
+	/* 0 scale, divisor 1024 */
+	{ 12, "skdj",  INT64_MAX, 0, 0 },
+	{ 21, "-9223", -INT64_MAX, 0, 0 },
+	{ 19, "10358", (int64_t)92*1024*1024*1024*1024*1024L, 0, 0 },
+	{ 20, "-1035", -(int64_t)92*1024*1024*1024*1024*1024L, 0, 0 },
+	{ 18, "92323", (int64_t)82*1024*1024*1024*1024*1024L, 0, 0 },
+	{ 19, "-9232", -(int64_t)82*1024*1024*1024*1024*1024L, 0, 0 },
+	{ 18, "91197", (int64_t)81*1024*1024*1024*1024*1024L, 0, 0 },
+	{ 19, "-9119", -(int64_t)81*1024*1024*1024*1024*1024L, 0, 0 },
+
+	/* 0 scale, divisor 1000 */
+	/* XXX - why does this fail? */
+	{ -1, "", INT64_MAX, HN_DIVISOR_1000, 0 },
+	{ 21, "-9223", -INT64_MAX, HN_DIVISOR_1000,  0 },
+	{ 19, "10358", (int64_t)92*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  0 },
+	{ 20, "-1035", -(int64_t)92*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  0 },
+	{ 18, "92323", (int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  0 },
+	{ 19, "-9232", -(int64_t)82*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  0 },
+	/* Expected to pass */
+	{ 18, "91197", (int64_t)81*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  0 },
+	{ 19, "-9119", -(int64_t)81*1024*1024*1024*1024*1024L, HN_DIVISOR_1000,  0 },
+
+
+
+	/* Need to implement tests for GETSCALE */
+/*	{ ?, "", (int64_t)0L, HN_DIVISOR_1000, HN_GETSCALE },
+	...
+*/
+        /* Tests for HN_DECIMAL */
+        /* Positive, Autoscale */
+	{ 5, "500 k", (int64_t)500*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "994 k", (int64_t)994*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "995 k", (int64_t)995*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "999 k", (int64_t)999*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "1.0 M", (int64_t)1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "1.5 M", (int64_t)1500*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "1.9 M", (int64_t)1949*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "2.0 M", (int64_t)1950*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "9.9 M", (int64_t)9949*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 4, "10 M", (int64_t)9950*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "500 M", (int64_t)500*1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "994 M", (int64_t)994*1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "995 M", (int64_t)995*1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "999 M", (int64_t)999*1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+
+	{ 5, "500 K", (int64_t)500*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "994 K", (int64_t)994*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "995 K", (int64_t)995*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "999 K", (int64_t)999*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "1.0 M", (int64_t)1000*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "1.0 M", (int64_t)1018*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "1.0 M", (int64_t)1019*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "1.5 M", (int64_t)1536*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "1.9 M", (int64_t)1996*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "2.0 M", (int64_t)1997*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "2.0 M", (int64_t)2047*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "2.0 M", (int64_t)2048*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "2.0 M", (int64_t)2099*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "2.1 M", (int64_t)2100*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "9.9 M", (int64_t)10188*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	/* XXX - shouldn't the following two be "10. M"? */
+	{ 4, "10 M", (int64_t)10189*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 4, "10 M", (int64_t)10240*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "500 M", (int64_t)500*1024*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "994 M", (int64_t)994*1024*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "995 M", (int64_t)995*1024*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "999 M", (int64_t)999*1024*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "1.0 G", (int64_t)1000*1024*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "1.0 G", (int64_t)1023*1024*1024L, HN_DECIMAL, HN_AUTOSCALE },
+
+        /* Negative, Autoscale - should pass */
+	{ 6, "-1.5 ", -(int64_t)1500*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 6, "-1.9 ", -(int64_t)1949*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 6, "-9.9 ", -(int64_t)9949*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+
+	{ 6, "-1.5 ", -(int64_t)1536*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 6, "-1.9 ", -(int64_t)1949*1024L, HN_DECIMAL, HN_AUTOSCALE },
+	{ 6, "-9.7 ", -(int64_t)9949*1024L, HN_DECIMAL, HN_AUTOSCALE },
+
+	/* Positive/negative, at maximum scale */
+	{ 5, "500 P", (int64_t)500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "1.9 E", (int64_t)1949*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "8.9 E", (int64_t)8949*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 5, "9.2 E", INT64_MAX, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+        /* Negatives work with latest rev only: */
+	{ 6, "-9.2 ", -INT64_MAX, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+	{ 6, "-8.9 ", -(int64_t)8949*1000*1000*1000*1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, HN_AUTOSCALE },
+
+	{ 5, "8.0 E",   INT64_MAX, HN_DECIMAL, HN_AUTOSCALE },
+	{ 5, "7.9 E",   INT64_MAX-(int64_t)100*1024*1024*1024*1024*1024LL, HN_DECIMAL, HN_AUTOSCALE },
+	{ 6, "-8.0 ", -INT64_MAX, HN_DECIMAL, HN_AUTOSCALE },
+	{ 6, "-7.9 ",   -INT64_MAX+(int64_t)100*1024*1024*1024*1024*1024LL, HN_DECIMAL, HN_AUTOSCALE },
+
+	/* Positive, Fixed scales */
+	{ 5, "500 k", (int64_t)500*1000L, HN_DECIMAL|HN_DIVISOR_1000, 1 },
+	{ 5, "0.5 M", (int64_t)500*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "949 k", (int64_t)949*1000L, HN_DECIMAL|HN_DIVISOR_1000, 1 },
+	{ 5, "0.9 M", (int64_t)949*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "950 k", (int64_t)950*1000L, HN_DECIMAL|HN_DIVISOR_1000, 1 },
+	{ 5, "1.0 M", (int64_t)950*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "999 k", (int64_t)999*1000L, HN_DECIMAL|HN_DIVISOR_1000, 1 },
+	{ 5, "1.0 M", (int64_t)999*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "1.5 M", (int64_t)1500*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "1.9 M", (int64_t)1949*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "2.0 M", (int64_t)1950*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "9.9 M", (int64_t)9949*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 4, "10 M", (int64_t)9950*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "500 M", (int64_t)500*1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "0.5 G", (int64_t)500*1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, 3 },
+	{ 5, "999 M", (int64_t)999*1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, 2 },
+	{ 5, "1.0 G", (int64_t)999*1000*1000L, HN_DECIMAL|HN_DIVISOR_1000, 3 },
+	/* Positive/negative, at maximum scale */
+	{ 5, "500 P", (int64_t)500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, 5 },
+	{ 5, "1.0 E", (int64_t)500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, 6 },
+	{ 5, "1.9 E", (int64_t)1949*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, 6 },
+	{ 5, "8.9 E", (int64_t)8949*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, 6 },
+	{ 5, "9.2 E", INT64_MAX, HN_DECIMAL|HN_DIVISOR_1000, 6 },
+
+	/* HN_DECIMAL + binary + fixed scale cases not completed */
+	{ 5, "512 K", (int64_t)512*1024L, HN_DECIMAL, 1 },
+	{ 5, "0.5 M", (int64_t)512*1024L, HN_DECIMAL, 2 },
+
+	/* Negative, Fixed scales */
+        /* Not yet added, but should work with latest rev */
+
+};
+
+
+/* Command line options usage */
+static void
+usage(char * progname) {
+	printf("%s: tests libutil humanize_number function\n", progname);
+	printf("Usage: %s [-nE] [-l num] [-v]\n\n", progname);
+	printf("Options:\n");
+	printf("\t-l num\tSet max length for result; buflen = num + 1\n");
+	printf("\t\t  (NOTE: does not change expected result strings.)\n");
+	printf("\t-n\tInclude negative scale tests, which cause older libutil\n");
+	printf("\t\t  version of function to coredump with assertion failure\n");
+	printf("\t-E\tInclude numbers > 1/2 Exa[byte] which currently fail\n");
+	printf("\t-v\tVerbose - always print summary results\n");
+	printf("\t-h, -?\tShow options\n");
+}
+
+/* Parse command line options */
+static void
+read_options(int argc, char * const argv[], size_t *bufLength,
+    int *includeNegativeScale, int *includeExabytes, int *verbose) {
+	int ch;
+	size_t temp;
+
+	while ((ch = getopt(argc, argv, "nEh?vl:")) != -1) {
+		switch (ch) {
+			default:
+				usage(argv[0]);
+				exit(1);
+				break;	/* UNREACHABLE */
+			case 'h' :
+			case '?' :
+				usage(argv[0]);
+				exit(0);
+				break;	/* UNREACHABLE */
+			case 'l' :
+				sscanf(optarg, "%zu", &temp);
+				*bufLength = temp + 1;
+				break;
+			case 'n' :
+				*includeNegativeScale = 1;
+				break;
+			case 'E' :
+				*includeExabytes = 1;
+				break;
+			case 'v' :
+				*verbose = 1;
+				break;
+		}
+	}
+}
+
+static struct {
+	int value;
+	const char *name;
+ } flags[] = {
+	{ HN_AUTOSCALE, "HN_AUTOSCALE" },
+	{ HN_GETSCALE, "HN_GETSCALE" },
+	{ HN_DIVISOR_1000, "HN_DIVISOR_1000"},
+	{ HN_B, "HN_B"},
+	{ HN_DECIMAL, "HN_DECIMAL"},
+};
+
+static const char *separator = "|";
+
+/* Format flags parameter for meaningful display */
+static char *
+str_flags(int hn_flags, char *noFlags) {
+	size_t i;
+	char * result;
+
+	result = malloc(MAX_STR_FLAGS_RESULT);
+	result[0] = '\0';
+
+	for (i = 0; i < sizeof flags / sizeof *flags; i++) {
+		if (hn_flags & flags[i].value) {
+			if (*result != 0)
+				strlcat(result, separator,
+				    MAX_STR_FLAGS_RESULT);
+			strlcat(result, flags[i].name, MAX_STR_FLAGS_RESULT);
+		}
+	}
+
+	if (strlen(result) == 0)
+		strlcat(result, noFlags, MAX_STR_FLAGS_RESULT);
+	return result;
+}
+
+
+/* Format scale parameter for meaningful display */
+static char *
+str_scale(int scale) {
+	char *result;
+
+	if (scale == HN_AUTOSCALE || scale == HN_GETSCALE)
+		return str_flags(scale, "");
+
+	result = malloc(MAX_INT_STR_DIGITS);
+	result[0] = '\0';
+	snprintf(result, MAX_INT_STR_DIGITS, "%d", scale);
+	return result;
+}
+
+static void
+testskipped(size_t i)
+{
+
+	printf("ok %lu # skip - not turned on\n", i);
+}
+
+int
+main(int argc, char * const argv[])
+{
+	char *buf;
+	char *flag_str, *scale_str;
+	size_t i;
+	size_t errcnt, tested, skipped;
+	int r;
+	size_t buflen;
+	int includeNegScale;
+	int includeExabyteTests;
+	int verbose;
+
+	buflen = 4;
+	includeNegScale = 0;
+	includeExabyteTests = 0;
+	verbose = 0;
+
+	read_options(argc, argv, &buflen, &includeNegScale,
+	    &includeExabyteTests, &verbose);
+
+	buf = malloc(buflen);
+	errcnt = 0;
+	tested = 0;
+	skipped = 0;
+
+	if (buflen != 4)
+		printf("Warning: buffer size %zu != 4, expect some results to differ.\n", buflen);
+
+	printf("1..%lu\n", sizeof test_args / sizeof *test_args);
+	for (i = 0; i < sizeof test_args / sizeof *test_args; i++) {
+		/* KLUDGE */
+		if (test_args[i].num == INT64_MAX && buflen == 4) {
+		        /* Start final tests which require buffer of 6 */
+		        free(buf);
+		        buflen = 6;
+                        buf = malloc(buflen);
+                        if (verbose)
+                                printf("Buffer length increased to %zu\n",
+				    buflen);
+		}
+
+		if (test_args[i].scale < 0 && ! includeNegScale) {
+			skipped++;
+			testskipped(i);
+			continue;
+		}
+		if (test_args[i].num >= halfExabyte && ! includeExabyteTests) {
+			skipped++;
+			testskipped(i);
+			continue;
+		}
+
+		r = humanize_number(buf, buflen, test_args[i].num, "",
+		    test_args[i].scale, test_args[i].flags);
+		flag_str = str_flags(test_args[i].flags, "[no flags]");
+		scale_str = str_scale(test_args[i].scale);
+
+		if (r != test_args[i].retval) {
+			if (verbose)
+				printf("wrong return value on index %lu, buflen: %zu, got: %d + \"%s\", expected %d + \"%s\"; num = %" PRId64 ", scale = %s, flags= %s.\n",
+				    i, buflen, r, buf, test_args[i].retval,
+				    test_args[i].res, test_args[i].num,
+				    scale_str, flag_str);
+			else
+				printf("not ok %lu # return %d != %d\n", i, r,
+				    test_args[i].retval);
+			errcnt++;
+		} else if (strcmp(buf, test_args[i].res) != 0) {
+			if (verbose)
+				printf("result mismatch on index %lu, got: \"%s\", expected \"%s\"; num = %" PRId64 ", scale = %s, flags= %s.\n",
+				    i, buf, test_args[i].res, test_args[i].num,
+				    scale_str, flag_str);
+			else
+				printf("not ok %lu # buf \"%s\" != \"%s\"\n", i,
+				    buf, test_args[i].res);
+			errcnt++;
+		} else {
+			if (verbose)
+				printf("successful result on index %lu, returned %d, got: \"%s\"; num = %" PRId64 ", scale = %s, flags= %s.\n",
+				    i, r, buf, test_args[i].num, scale_str,
+				    flag_str);
+			else
+				printf("ok %lu\n", i);
+		}
+		tested++;
+	}
+
+	if (verbose)
+		printf("total errors: %lu/%lu tests, %lu skipped\n", errcnt,
+		    tested, skipped);
+
+	if (errcnt)
+		return 1;
+
+	return 0;
+}
diff --git a/tools/regression/lib/libutil/test-humanize_number.t b/tools/regression/lib/libutil/test-humanize_number.t
new file mode 100755
index 00000000000..516bc4c2575
--- /dev/null
+++ b/tools/regression/lib/libutil/test-humanize_number.t
@@ -0,0 +1,10 @@
+#!/bin/sh
+# $FreeBSD$
+
+cd `dirname $0`
+
+executable=`basename $0 .t`
+
+make $executable 2>&1 > /dev/null
+
+exec ./$executable && echo humanize_numbers ok
diff --git a/tools/regression/pjdfstest/Makefile b/tools/regression/pjdfstest/Makefile
index eca598f241e..a3e35f89b38 100644
--- a/tools/regression/pjdfstest/Makefile
+++ b/tools/regression/pjdfstest/Makefile
@@ -6,7 +6,7 @@ ${PROG}:	${PROG}.c
 	@OSTYPE=`uname`; \
 	CFLAGS=-D__OS_$${OSTYPE}__; \
 	if [ $$OSTYPE = "FreeBSD" ]; then \
-		CFLAGS="$$CFLAGS -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT -DHAS_CONNECTAT"; \
+		CFLAGS="$$CFLAGS -DHAS_LCHMOD -DHAS_CHFLAGS -DHAS_FCHFLAGS -DHAS_CHFLAGSAT -DHAS_LCHFLAGS -DHAS_FREEBSD_ACL -DHAS_BINDAT -DHAS_CONNECTAT -DHAS_LPATHCONF"; \
 	elif [ $$OSTYPE = "SunOS" ]; then \
 		CFLAGS="$$CFLAGS -DHAS_TRUNCATE64 -DHAS_STAT64"; \
 		CFLAGS="$$CFLAGS -lsocket"; \
diff --git a/tools/regression/pjdfstest/pjdfstest.c b/tools/regression/pjdfstest/pjdfstest.c
index ceab2dc6920..046df490e4f 100644
--- a/tools/regression/pjdfstest/pjdfstest.c
+++ b/tools/regression/pjdfstest/pjdfstest.c
@@ -119,7 +119,9 @@ enum action {
 	ACTION_FSTATAT,
 	ACTION_PATHCONF,
 	ACTION_FPATHCONF,
+#ifdef HAS_LPATHCONF
 	ACTION_LPATHCONF,
+#endif
 #ifdef HAS_FREEBSD_ACL
 	ACTION_PREPENDACL,
 	ACTION_READACL,
@@ -200,7 +202,9 @@ static struct syscall_desc syscalls[] = {
 	{ "fstatat", ACTION_FSTATAT, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 	{ "pathconf", ACTION_PATHCONF, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 	{ "fpathconf", ACTION_FPATHCONF, { TYPE_DESCRIPTOR, TYPE_STRING, TYPE_NONE } },
+#ifdef HAS_LPATHCONF
 	{ "lpathconf", ACTION_LPATHCONF, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
+#endif
 #ifdef HAS_FREEBSD_ACL
 	{ "prependacl", ACTION_PREPENDACL, { TYPE_STRING, TYPE_STRING, TYPE_NONE } },
 	{ "readacl", ACTION_READACL, { TYPE_STRING, TYPE_NONE } },
@@ -899,7 +903,9 @@ call_syscall(struct syscall_desc *scall, char *argv[])
 		break;
 	case ACTION_PATHCONF:
 	case ACTION_FPATHCONF:
+#ifdef HAS_LPATHCONF
 	case ACTION_LPATHCONF:
+#endif
 	    {
 		long lrval;
 
@@ -916,9 +922,11 @@ call_syscall(struct syscall_desc *scall, char *argv[])
 		case ACTION_FPATHCONF:
 			lrval = fpathconf(NUM(0), name);
 			break;
+#ifdef HAS_LPATHCONF
 		case ACTION_LPATHCONF:
 			lrval = lpathconf(STR(0), name);
 			break;
+#endif
 		default:
 			abort();
 		}
diff --git a/tools/regression/usr.bin/sed/regress.icase4.out b/tools/regression/usr.bin/sed/regress.icase4.out
new file mode 100644
index 00000000000..b803373b6a5
--- /dev/null
+++ b/tools/regression/usr.bin/sed/regress.icase4.out
@@ -0,0 +1,4 @@
+input
+data
+for validation
+of Foo(1)
diff --git a/tools/regression/usr.bin/sed/regress.sh b/tools/regression/usr.bin/sed/regress.sh
index 98282ef60ac..37dc0379383 100644
--- a/tools/regression/usr.bin/sed/regress.sh
+++ b/tools/regression/usr.bin/sed/regress.sh
@@ -66,6 +66,7 @@ REGRESSION_TEST_FREEFORM(`inplace5', `inplace_test "3x;6G"')
 REGRESSION_TEST(`icase1', `sed /SED/Id < regress.in')
 REGRESSION_TEST(`icase2', `sed s/SED/Foo/I < regress.in')
 REGRESSION_TEST(`icase3', `sed s/SED/Foo/ < regress.in')
+REGRESSION_TEST(`icase4', `sed s/SED/Foo/i < regress.in')
 
 REGRESSION_TEST(`hanoi', `echo ":abcd: : :" | sed -f hanoi.sed')
 REGRESSION_TEST(`math', `echo "4+7*3+2^7/3" | sed -f math.sed')
diff --git a/tools/regression/usr.sbin/etcupdate/always.sh b/tools/regression/usr.sbin/etcupdate/always.sh
index 5f5e586819f..b67fd8b74e8 100755
--- a/tools/regression/usr.sbin/etcupdate/always.sh
+++ b/tools/regression/usr.sbin/etcupdate/always.sh
@@ -33,13 +33,17 @@ WORKDIR=work
 
 usage()
 {
-	echo "Usage: always.sh [-w workdir]"
+	echo "Usage: always.sh [-s script] [-w workdir]"
 	exit 1
 }
 
-# Allow the user to specify an alternate work directory.
-while getopts "w:" option; do
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
 	case $option in
+		s)
+			COMMAND="sh $OPTARG"
+			;;
 		w)
 			WORKDIR=$OPTARG
 			;;
@@ -372,7 +376,7 @@ fi
 
 build_trees
 
-etcupdate -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
+$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
 
 cat > $WORKDIR/correct.out <<EOF
   D /dirchange/fromdir/extradir/file
@@ -492,7 +496,7 @@ fifo /dirchange/todir/difftype
 
 build_trees
 
-etcupdate -r -A '/first*' -A '/second* /*di*' -d $WORKDIR -D $TEST > \
+$COMMAND -r -A '/first*' -A '/second* /*di*' -d $WORKDIR -D $TEST > \
     $WORKDIR/test1.out
 
 cat > $WORKDIR/correct1.out <<EOF
diff --git a/tools/regression/usr.sbin/etcupdate/conflicts.sh b/tools/regression/usr.sbin/etcupdate/conflicts.sh
index 0c1932345f7..ec4692739e8 100755
--- a/tools/regression/usr.sbin/etcupdate/conflicts.sh
+++ b/tools/regression/usr.sbin/etcupdate/conflicts.sh
@@ -33,13 +33,17 @@ WORKDIR=work
 
 usage()
 {
-	echo "Usage: tests.sh [-w workdir]"
+	echo "Usage: conflicts.sh [-s script] [-w workdir]"
 	exit 1
 }
 
-# Allow the user to specify an alternate work directory.
-while getopts "w:" option; do
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
 	case $option in
+		s)
+			COMMAND="sh $OPTARG"
+			;;
 		w)
 			WORKDIR=$OPTARG
 			;;
@@ -84,7 +88,7 @@ default:\\
         :welcome=/etc/motd:
 EOF
 
-	etcupdate -r -d $WORKDIR -D $TEST >/dev/null
+	$COMMAND -r -d $WORKDIR -D $TEST >/dev/null
 }
 
 # This is used to verify special handling for /etc/mail/aliases and
@@ -122,7 +126,7 @@ MAILER-DAEMON: postmaster
 postmaster: foo
 EOF
 
-	etcupdate -r -d $WORKDIR -D $TEST >/dev/null
+	$COMMAND -r -d $WORKDIR -D $TEST >/dev/null
 }
 
 # $1 - relative path to file that should be missing from TEST
@@ -201,7 +205,7 @@ build_login_conflict
 
 # Verify that 'p' doesn't do anything.
 echo "Checking 'p':"
-echo 'p' | etcupdate resolve -d $WORKDIR -D $TEST >/dev/null
+echo 'p' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
 
 file /etc/login.conf "" 95de92ea3f1bb1bf4f612a8b5908cddd
 missing /etc/login.conf.db
@@ -209,7 +213,7 @@ conflict /etc/login.conf
 
 # Verify that 'mf' removes the conflict, but does nothing else.
 echo "Checking 'mf':"
-echo 'mf' | etcupdate resolve -d $WORKDIR -D $TEST >/dev/null
+echo 'mf' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
 
 file /etc/login.conf "" 95de92ea3f1bb1bf4f612a8b5908cddd
 missing /etc/login.conf.db
@@ -219,7 +223,7 @@ build_login_conflict
 
 # Verify that 'tf' installs the new version of the file.
 echo "Checking 'tf':"
-echo 'tf' | etcupdate resolve -d $WORKDIR -D $TEST >/dev/null
+echo 'tf' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
 
 file /etc/login.conf "" 7774a0f9a3a372c7c109c32fd31c4b6b
 file /etc/login.conf.db
@@ -238,7 +242,7 @@ default:\\
         :welcome=/etc/motd:
 EOF
 
-echo 'r' | etcupdate resolve -d $WORKDIR -D $TEST >/dev/null
+echo 'r' | $COMMAND resolve -d $WORKDIR -D $TEST >/dev/null
 
 file /etc/login.conf "" 966e25984b9b63da8eaac8479dcb0d4d
 file /etc/login.conf.db
@@ -248,12 +252,12 @@ build_aliases_conflict
 
 # Verify that 'p' and 'mf' do not generate the newaliases warning.
 echo "Checking newalias warning for 'p'":
-echo 'p' | etcupdate resolve -d $WORKDIR -D $TEST | grep -q newalias
+echo 'p' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias
 if [ $? -eq 0 ]; then
 	echo "+ Extra warning"
 fi
 echo "Checking newalias warning for 'mf'":
-echo 'mf' | etcupdate resolve -d $WORKDIR -D $TEST | grep -q newalias
+echo 'mf' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias
 if [ $? -eq 0 ]; then
 	echo "+ Extra warning"
 fi
@@ -261,14 +265,14 @@ fi
 # Verify that 'tf' and 'r' do generate the newaliases warning.
 build_aliases_conflict
 echo "Checking newalias warning for 'tf'":
-echo 'tf' | etcupdate resolve -d $WORKDIR -D $TEST | grep -q newalias
+echo 'tf' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias
 if [ $? -ne 0 ]; then
 	echo "- Missing warning"
 fi
 
 build_aliases_conflict
 cp $TEST/etc/mail/aliases $CONFLICTS/etc/mail/aliases
-echo 'r' | etcupdate resolve -d $WORKDIR -D $TEST | grep -q newalias
+echo 'r' | $COMMAND resolve -d $WORKDIR -D $TEST | grep -q newalias
 if [ $? -ne 0 ]; then
 	echo "- Missing warning"
 fi
diff --git a/tools/regression/usr.sbin/etcupdate/fbsdid.sh b/tools/regression/usr.sbin/etcupdate/fbsdid.sh
index 3a90a1e280c..e713c35a8b3 100755
--- a/tools/regression/usr.sbin/etcupdate/fbsdid.sh
+++ b/tools/regression/usr.sbin/etcupdate/fbsdid.sh
@@ -33,13 +33,17 @@ WORKDIR=work
 
 usage()
 {
-	echo "Usage: fbsdid.sh [-w workdir]"
+	echo "Usage: fbsdid.sh [-s script] [-w workdir]"
 	exit 1
 }
 
-# Allow the user to specify an alternate work directory.
-while getopts "w:" option; do
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
 	case $option in
+		s)
+			COMMAND="sh $OPTARG"
+			;;
 		w)
 			WORKDIR=$OPTARG
 			;;
@@ -191,6 +195,17 @@ EOF
 
 these are some local mods to the file
 EOF
+
+	# local-remove: A file removed locally changed it's FreeBSD ID
+	# but nothing else
+	store_id $OLD/local-remove ": head/local-remove 12000 jhb "
+	store_id $NEW/local-remove ": head/local-remove 12345 jhb "
+	for i in $OLD $NEW; do
+		cat >> $i/local-remove <<EOF
+
+this is a file
+EOF
+	done
 }
 
 # $1 - relative path to file that should be missing from TEST
@@ -267,7 +282,7 @@ fi
 
 build_trees
 
-etcupdate -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
+$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
 
 cat > $WORKDIR/correct.out <<EOF
   C /already
@@ -278,6 +293,7 @@ cat > $WORKDIR/correct.out <<EOF
   C /add
 Warnings:
   Modified regular file remains: /remove
+  Removed file changed: /local-remove
 EOF
 
 echo "Differences for regular:"
@@ -295,12 +311,13 @@ conflict /conflict 868452f666fea1c60ffb918ad9ad9607
 file /local "" aa33e614b5e749449f230e2a2b0072eb
 conflict /local 3df93e64043c8e348fc625b93ea220f4
 file /local-already "" 0298b958a603049f45ae6a109c4f7fea
+missing /local-remove
 
 # Now test with -F.
 
 build_trees
 
-etcupdate -rF -d $WORKDIR -D $TEST > $WORKDIR/testF.out
+$COMMAND -rF -d $WORKDIR -D $TEST > $WORKDIR/testF.out
 
 cat > $WORKDIR/correctF.out <<EOF
   D /remove
@@ -325,3 +342,38 @@ file /conflict "" dc27978df125b0daeb7d9b93265f03fd
 conflict /conflict 868452f666fea1c60ffb918ad9ad9607
 file /local "" 3ed5a35e380c8a93fb5f599d4c052713
 file /local-already "" 0298b958a603049f45ae6a109c4f7fea
+missing /local-remove
+
+# Now test with -F and -A forcing all installs.  (-A should have
+# precedence over -F)
+
+build_trees
+
+$COMMAND -A '/*' -rF -d $WORKDIR -D $TEST > $WORKDIR/testAF.out
+
+cat > $WORKDIR/correctAF.out <<EOF
+  D /remove
+  U /already
+  U /conflict
+  U /local
+  U /local-already
+  A /local-remove
+  U /old
+  U /add
+EOF
+
+echo "Differences for -A '/*' -F:"
+diff -u -L "correct" $WORKDIR/correctAF.out -L "test" $WORKDIR/testAF.out
+
+missing /remove
+file /old "" 6a9f34f109d94406a4de3bc5d72de259
+noconflict /old
+file /already "" 21f4eca3aacc702c49878c8da7afd3d0
+noconflict /already
+file /add "" 0208bd647111fedf6318511712ab9e97
+noconflict /add
+file /conflict "" 75ee141c4136beaf14e39de92efa84e4
+noconflict /conflict
+file /local "" 6a8fc5c2755b7a49015089f5e1dbe092
+file /local-already "" 49045f8b51542dd634655301cd296f66
+file /local-remove "" 5c38322efed4014797d7127f5c652d9d
diff --git a/tools/regression/usr.sbin/etcupdate/ignore.sh b/tools/regression/usr.sbin/etcupdate/ignore.sh
index e2249fb6986..d6bd2ffa038 100755
--- a/tools/regression/usr.sbin/etcupdate/ignore.sh
+++ b/tools/regression/usr.sbin/etcupdate/ignore.sh
@@ -33,13 +33,17 @@ WORKDIR=work
 
 usage()
 {
-	echo "Usage: ignore.sh [-w workdir]"
+	echo "Usage: ignore.sh [-s script] [-w workdir]"
 	exit 1
 }
 
-# Allow the user to specify an alternate work directory.
-while getopts "w:" option; do
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
 	case $option in
+		s)
+			COMMAND="sh $OPTARG"
+			;;
 		w)
 			WORKDIR=$OPTARG
 			;;
@@ -172,7 +176,7 @@ fi
 
 build_trees
 
-etcupdate -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
+$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
 
 cat > $WORKDIR/correct.out <<EOF
   D /rmdir/file
@@ -195,7 +199,7 @@ missing /rmdir
 
 build_trees
 
-etcupdate -r -I '/tree/*' -d $WORKDIR -D $TEST > $WORKDIR/test1.out
+$COMMAND -r -I '/tree/*' -d $WORKDIR -D $TEST > $WORKDIR/test1.out
 
 cat > $WORKDIR/correct1.out <<EOF
   D /rmdir/file
@@ -215,7 +219,7 @@ missing /rmdir
 
 build_trees
 
-etcupdate -r -I '/tree/*' -I '/rmdir*' -d $WORKDIR -D $TEST > \
+$COMMAND -r -I '/tree/*' -I '/rmdir*' -d $WORKDIR -D $TEST > \
     $WORKDIR/test2.out
 
 cat > $WORKDIR/correct2.out <<EOF
@@ -236,7 +240,7 @@ file /rmdir/file "foo"
 
 build_trees
 
-etcupdate -r -I '/tree/* /rmdir/*' -d $WORKDIR -D $TEST > \
+$COMMAND -r -I '/tree/* /rmdir/*' -d $WORKDIR -D $TEST > \
     $WORKDIR/test3.out
 
 cat > $WORKDIR/correct3.out <<EOF
diff --git a/tools/regression/usr.sbin/etcupdate/preworld.sh b/tools/regression/usr.sbin/etcupdate/preworld.sh
new file mode 100755
index 00000000000..ccd7b75101c
--- /dev/null
+++ b/tools/regression/usr.sbin/etcupdate/preworld.sh
@@ -0,0 +1,239 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Advanced Computing Technologies LLC
+# Written by: John H. Baldwin <jhb@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$
+
+# Regression tests for the pre-world (-p) mode 
+
+WORKDIR=work
+
+usage()
+{
+	echo "Usage: preworld.sh [-s script] [-w workdir]"
+	exit 1
+}
+
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
+	case $option in
+		s)
+			COMMAND="sh $OPTARG"
+			;;
+		w)
+			WORKDIR=$OPTARG
+			;;
+		*)
+			echo
+			usage
+			;;
+	esac
+done
+shift $((OPTIND - 1))
+if [ $# -ne 0 ]; then
+	usage
+fi
+
+CONFLICTS=$WORKDIR/conflicts
+SRC=$WORKDIR/src
+OLD=$WORKDIR/current
+TEST=$WORKDIR/test
+
+build_trees()
+{
+
+	# Populate trees with pre-world files and additional files
+	# that should not be touched.
+
+	rm -rf $SRC $OLD $TEST $CONFLICTS
+
+	# Create the "old" source tree as the starting point
+	mkdir -p $OLD/etc
+	cat >> $OLD/etc/master.passwd <<EOF
+#
+root::0:0::0:0:Charlie &:/root:/bin/csh
+toor:*:0:0::0:0:Bourne-again Superuser:/root:
+daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
+operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
+_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin
+uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
+pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
+www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
+hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin
+nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
+EOF
+	cat >> $OLD/etc/group <<EOF
+#
+wheel:*:0:root
+daemon:*:1:
+kmem:*:2:
+sys:*:3:
+tty:*:4:
+operator:*:5:root
+_dhcp:*:65:
+uucp:*:66:
+dialer:*:68:
+network:*:69:
+www:*:80:
+hast:*:845:
+nogroup:*:65533:
+nobody:*:65534:
+EOF
+	cat >> $OLD/etc/inetd.conf <<EOF
+# Yet another file
+EOF
+
+	# Copy the "old" source tree to the test tree and make local
+	# modifications.
+	cp -R $OLD $TEST
+	sed -I "" -e 's/root::/root:<rpass>:/' $TEST/etc/master.passwd
+	cat >> $TEST/etc/master.passwd <<EOF
+john:<password>:1001:1001::0:0:John Baldwin:/home/john:/bin/tcsh
+messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin
+polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin
+haldaemon:*:560:560::0:0:HAL Daemon User:/nonexistent:/usr/sbin/nologin
+EOF
+	awk '/wheel/ { printf "%s,john\n", $0; next } // { print }' \
+	    $OLD/etc/group > $TEST/etc/group
+	cat >> $TEST/etc/group <<EOF
+john:*:1001:
+messagebus:*:556:
+polkit:*:562:
+haldaemon:*:560:
+EOF
+	rm $TEST/etc/inetd.conf
+	touch $TEST/etc/localtime
+
+	# Copy the "old" source tree to the new source tree and
+	# make upstream modifications.
+	cp -R $OLD $SRC
+	sed -I "" -e '/:80:/i\
+auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin' \
+	    $SRC/etc/master.passwd
+	sed -I "" -e '/:80:/i\
+audit:*:77:' \
+	    $SRC/etc/group
+	cat >> $SRC/etc/inetd.conf <<EOF
+# Making this larger
+EOF
+}
+
+# $1 - relative path to file that should be missing from TEST
+missing()
+{
+	if [ -e $TEST/$1 -o -L $TEST/$1 ]; then
+		echo "File $1 should be missing"
+	fi
+}
+
+# $1 - relative path to file that should be present in TEST
+present()
+{
+	if ! [ -e $TEST/$1 -o -L $TEST/$1 ]; then
+		echo "File $1 should be present"
+	fi
+}
+
+# $1 - relative path to regular file that should be present in TEST
+# $2 - optional string that should match file contents
+# $3 - optional MD5 of the flie contents, overrides $2 if present
+file()
+{
+	local contents sum
+
+	if ! [ -f $TEST/$1 ]; then
+		echo "File $1 should be a regular file"
+	elif [ $# -eq 2 ]; then
+		contents=`cat $TEST/$1`
+		if [ "$contents" != "$2" ]; then
+			echo "File $1 has wrong contents"
+		fi
+	elif [ $# -eq 3 ]; then
+		sum=`md5 -q $TEST/$1`
+		if [ "$sum" != "$3" ]; then
+			echo "File $1 has wrong contents"
+		fi
+	fi
+}
+
+# $1 - relative path to a regular file that should have a conflict
+# $2 - optional MD5 of the conflict file contents
+conflict()
+{
+	local sum
+
+	if ! [ -f $CONFLICTS/$1 ]; then
+		echo "File $1 missing conflict"
+	elif [ $# -gt 1 ]; then
+		sum=`md5 -q $CONFLICTS/$1`
+		if [ "$sum" != "$2" ]; then
+			echo "Conflict $1 has wrong contents"
+		fi
+	fi
+}
+
+check_trees()
+{
+
+	echo "Checking tree for correct results:"
+
+	file /etc/master.passwd "" 1385366e8b424d33d59b7d8a2bdb15d3
+	file /etc/group "" 21273f845f6ec0cda9188c4ddac9ed47
+	missing /etc/inetd.conf
+
+	# These should be auto-generated by pwd_mkdb
+	file /etc/passwd "" 9831537874bdc99adccaa2b0293248a1
+	file /etc/pwd.db
+	file /etc/spwd.db
+}
+
+if [ `id -u` -ne 0 ]; then
+	echo "must be root"
+fi
+
+if [ -r /etc/etcupdate.conf ]; then
+	echo "WARNING: /etc/etcupdate.conf settings may break some tests."
+fi
+
+build_trees
+
+$COMMAND -np -s $SRC -d $WORKDIR -D $TEST > $WORKDIR/testn.out
+
+cat > $WORKDIR/correct.out <<EOF
+  M /etc/group
+  M /etc/master.passwd
+EOF
+
+echo "Differences for -n:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out
+
+$COMMAND -p -s $SRC -d $WORKDIR -D $TEST > $WORKDIR/test.out
+
+echo "Differences for real:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out
+
+check_trees
diff --git a/tools/regression/usr.sbin/etcupdate/tests.sh b/tools/regression/usr.sbin/etcupdate/tests.sh
index 798302099a5..22b3d0bebc9 100755
--- a/tools/regression/usr.sbin/etcupdate/tests.sh
+++ b/tools/regression/usr.sbin/etcupdate/tests.sh
@@ -33,13 +33,17 @@ WORKDIR=work
 
 usage()
 {
-	echo "Usage: tests.sh [-w workdir]"
+	echo "Usage: tests.sh [-s script] [-w workdir]"
 	exit 1
 }
 
-# Allow the user to specify an alternate work directory.
-while getopts "w:" option; do
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
 	case $option in
+		s)
+			COMMAND="sh $OPTARG"
+			;;
 		w)
 			WORKDIR=$OPTARG
 			;;
@@ -624,6 +628,24 @@ root: someone@example.com
 MAILER-DAEMON: postmaster
 postmaster: root
 EOF
+
+	# - Verify that updating an unmodified /etc/services builds
+	# /var/db/services.db.
+	cat > $OLD/etc/services <<EOF
+rtmp		  1/ddp	   #Routing Table Maintenance Protocol
+tcpmux		  1/tcp	   #TCP Port Service Multiplexer
+tcpmux		  1/udp	   #TCP Port Service Multiplexer
+EOF
+	cat > $NEW/etc/services <<EOF
+rtmp		  1/ddp	   #Routing Table Maintenance Protocol
+tcpmux		  1/tcp	   #TCP Port Service Multiplexer
+tcpmux		  1/udp	   #TCP Port Service Multiplexer
+nbp		  2/ddp	   #Name Binding Protocol
+compressnet	  2/tcp	   #Management Utility
+compressnet	  2/udp	   #Management Utility
+EOF
+	cp $OLD/etc/services $TEST/etc/services
+	mkdir -p $TEST/var/db
 }
 
 # $1 - relative path to file that should be missing from TEST
@@ -892,6 +914,8 @@ check_trees()
 	file /etc/login.conf "" 7774a0f9a3a372c7c109c32fd31c4b6b
 	file /etc/login.conf.db
 	file /etc/mail/aliases "" 7d598f89ec040ab56af54011bdb83337
+	file /etc/services "" 37fb6a8d1273f3b78329d431f21d9c7d
+	file /var/db/services.db
 }
 
 if [ `id -u` -ne 0 ]; then
@@ -904,7 +928,7 @@ fi
 
 build_trees
 
-etcupdate -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out
+$COMMAND -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out
 
 cat > $WORKDIR/correct.out <<EOF
   D /dirchange/fromdir/extradir/file
@@ -930,6 +954,7 @@ cat > $WORKDIR/correct.out <<EOF
   U /dirchange/old/todir
   U /etc/login.conf
   M /etc/mail/aliases
+  U /etc/services
   A /adddir/partial/file
   A /dirchange/old/todir/file
   A /etc/master.passwd
@@ -971,7 +996,7 @@ EOF
 echo "Differences for -n:"
 diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out
 
-etcupdate -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
+$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
 
 echo "Differences for real:"
 diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out
diff --git a/tools/regression/usr.sbin/etcupdate/tzsetup.sh b/tools/regression/usr.sbin/etcupdate/tzsetup.sh
new file mode 100755
index 00000000000..20107f42e0d
--- /dev/null
+++ b/tools/regression/usr.sbin/etcupdate/tzsetup.sh
@@ -0,0 +1,221 @@
+#!/bin/sh
+#
+# Copyright (c) 2013 Advanced Computing Technologies LLC
+# Written by: John H. Baldwin <jhb@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$
+
+# Various regression tests for the tzsetup handling in the 'update' command.
+
+WORKDIR=work
+
+usage()
+{
+	echo "Usage: tzsetup.sh [-s script] [-w workdir]"
+	exit 1
+}
+
+# Allow the user to specify an alternate work directory or script.
+COMMAND=etcupdate
+while getopts "s:w:" option; do
+	case $option in
+		s)
+			COMMAND="sh $OPTARG"
+			;;
+		w)
+			WORKDIR=$OPTARG
+			;;
+		*)
+			echo
+			usage
+			;;
+	esac
+done
+shift $((OPTIND - 1))
+if [ $# -ne 0 ]; then
+	usage
+fi
+
+CONFLICTS=$WORKDIR/conflicts
+OLD=$WORKDIR/old
+NEW=$WORKDIR/current
+TEST=$WORKDIR/test
+
+build_trees()
+{
+
+	# Build the base tree, but not /etc/localtime itself
+	local i j k
+
+	rm -rf $OLD $NEW $TEST $CONFLICTS
+	mkdir -p $OLD $NEW $TEST
+	mkdir -p $TEST/etc
+	mkdir -p $TEST/var/db
+	mkdir -p $TEST/usr/share/zoneinfo
+
+	# Create a dummy timezone file
+	echo "foo" > $TEST/usr/share/zoneinfo/foo
+
+}
+
+# $1 - relative path to file that should be missing from TEST
+missing()
+{
+	if [ -e $TEST/$1 -o -L $TEST/$1 ]; then
+		echo "File $1 should be missing"
+	fi
+}
+
+# $1 - relative path to file that should be a symlink in TEST
+# $2 - optional value of the link
+link()
+{
+	local val
+
+	if ! [ -L $TEST/$1 ]; then
+		echo "File $1 should be a link"
+	elif [ $# -gt 1 ]; then
+		val=`readlink $TEST/$1`
+		if [ "$val" != "$2" ]; then
+			echo "Link $1 should link to \"$2\""
+		fi
+	fi
+}
+
+# $1 - relative path to regular file that should be present in TEST
+# $2 - optional string that should match file contents
+# $3 - optional MD5 of the flie contents, overrides $2 if present
+file()
+{
+	local contents sum
+
+	if ! [ -f $TEST/$1 ]; then
+		echo "File $1 should be a regular file"
+	elif [ $# -eq 2 ]; then
+		contents=`cat $TEST/$1`
+		if [ "$contents" != "$2" ]; then
+			echo "File $1 has wrong contents"
+		fi
+	elif [ $# -eq 3 ]; then
+		sum=`md5 -q $TEST/$1`
+		if [ "$sum" != "$3" ]; then
+			echo "File $1 has wrong contents"
+		fi
+	fi
+}
+
+if [ `id -u` -ne 0 ]; then
+	echo "must be root"
+fi
+
+if [ -r /etc/etcupdate.conf ]; then
+	echo "WARNING: /etc/etcupdate.conf settings may break some tests."
+fi
+
+# First, test for /etc/localtime not existing
+
+build_trees
+
+$COMMAND -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out
+
+cat > $WORKDIR/correct.out <<EOF
+EOF
+
+echo "Differences for no /etc/localtime with -n:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out
+
+$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
+
+echo "Differences for no /etc/localtime:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out
+
+missing /etc/localtime
+missing /var/db/zoneinfo
+
+# Second, test for /etc/localtime being a symlink
+
+build_trees
+ln -s /dev/null $TEST/etc/localtime
+
+$COMMAND -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out
+
+cat > $WORKDIR/correct.out <<EOF
+EOF
+
+echo "Differences for symlinked /etc/localtime with -n:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out
+
+$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
+
+echo "Differences for symlinked /etc/localtime:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out
+
+link /etc/localtime "/dev/null"
+missing /var/db/zoneinfo
+
+# Third, test for /etc/localtime as a file and a missing /var/db/zoneinfo
+
+build_trees
+echo "bar" > $TEST/etc/localtime
+
+$COMMAND -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out
+
+cat > $WORKDIR/correct.out <<EOF
+Warnings:
+  Needs update: /etc/localtime (required manual update via tzsetup(1))
+EOF
+
+echo "Differences for missing /var/db/zoneinfo with -n:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out
+
+$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
+
+echo "Differences for missing /var/db/zoneinfo:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out
+
+file /etc/localtime "bar"
+missing /var/db/zoneinfo
+
+# Finally, test the case where it should update /etc/localtime
+
+build_trees
+echo "bar" > $TEST/etc/localtime
+echo "foo" > $TEST/var/db/zoneinfo
+
+$COMMAND -nr -d $WORKDIR -D $TEST > $WORKDIR/testn.out
+
+cat > $WORKDIR/correct.out <<EOF
+EOF
+
+echo "Differences for real update with -n:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/testn.out
+
+$COMMAND -r -d $WORKDIR -D $TEST > $WORKDIR/test.out
+
+echo "Differences for real update:"
+diff -u -L "correct" $WORKDIR/correct.out -L "test" $WORKDIR/test.out
+
+file /etc/localtime "foo"
+file /var/db/zoneinfo "foo"
diff --git a/tools/test/dtrace/Makefile b/tools/test/dtrace/Makefile
index c9e9a20375e..fc8af340658 100644
--- a/tools/test/dtrace/Makefile
+++ b/tools/test/dtrace/Makefile
@@ -59,7 +59,6 @@ IGNORE=		\
 	${TESTSRCDIR}/tst/common/proc/tst.discard.ksh			\
 	${TESTSRCDIR}/tst/common/proc/tst.signal.ksh			\
 	${TESTSRCDIR}/tst/common/proc/tst.startexit.ksh			\
-	${TESTSRCDIR}/tst/common/profile-n/tst.ufuncsort.c		\
 	${TESTSRCDIR}/tst/common/scalars/tst.misc.d			\
 	${TESTSRCDIR}/tst/common/scalars/tst.selfarray2.d		\
 	${TESTSRCDIR}/tst/common/sysevent/tst.post.c			\
@@ -115,10 +114,6 @@ NOTWORK+= \
 	${TESTSRCDIR}/tst/common/profile-n/tst.func.ksh			\
 	${TESTSRCDIR}/tst/common/profile-n/tst.mod.ksh			\
 	${TESTSRCDIR}/tst/common/profile-n/tst.sym.ksh			\
-	${TESTSRCDIR}/tst/common/profile-n/tst.ufunc.ksh		\
-	${TESTSRCDIR}/tst/common/profile-n/tst.ufuncsort.ksh		\
-	${TESTSRCDIR}/tst/common/profile-n/tst.umod.ksh			\
-	${TESTSRCDIR}/tst/common/profile-n/tst.usym.ksh			\
 	${TESTSRCDIR}/tst/common/safety/tst.basename.d			\
 	${TESTSRCDIR}/tst/common/safety/tst.caller.d			\
 	${TESTSRCDIR}/tst/common/safety/tst.cleanpath.d			\
diff --git a/tools/tools/ath/athstats/Makefile b/tools/tools/ath/athstats/Makefile
index 1db2dc1b039..a4348e533e6 100644
--- a/tools/tools/ath/athstats/Makefile
+++ b/tools/tools/ath/athstats/Makefile
@@ -1,12 +1,16 @@
 # $FreeBSD$
 
+NO_MAN=1
+
+.include <bsd.own.mk>
+
 .PATH:	${.CURDIR}/../../../../sys/dev/ath/ath_hal
 
 PROG=	athstats
 
 # Because of a clang preprocessor parser limitation causing this
 # to not compile, use gcc for now.
-CC=	gcc
+#CC=	gcc
 
 SRCS=	main.c statfoo.c athstats.c opt_ah.h ah_osdep.h
 
@@ -17,6 +21,10 @@ CLEANFILES+=	opt_ah.h
 CFLAGS+=-DATH_SUPPORT_ANI
 CFLAGS+=-DATH_SUPPORT_TDMA
 
+.if (${COMPILER_TYPE} == "clang")
+CFLAGS+=-fbracket-depth=512
+.endif
+
 opt_ah.h:
 	echo "#define AH_DEBUG 1" > opt_ah.h
 	echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h
diff --git a/tools/tools/atsectl/Makefile b/tools/tools/atsectl/Makefile
new file mode 100644
index 00000000000..3171561c81f
--- /dev/null
+++ b/tools/tools/atsectl/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PROG=	atsectl
+
+DPADD=	${LIBMD}
+LDADD=	-lmd
+
+BINDIR?=	/usr/sbin
+
+NO_MAN=
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/atsectl/atsectl.c b/tools/tools/atsectl/atsectl.c
new file mode 100644
index 00000000000..6e593c93382
--- /dev/null
+++ b/tools/tools/atsectl/atsectl.c
@@ -0,0 +1,327 @@
+/*-
+ * Copyright (c) 2012 SRI International
+ * Copyright (c) 2013 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-10-C-0237)
+ * ("CTSRD"), as part of the DARPA CRASH research programme.
+ *
+ * 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: head/usr.sbin/isfctl/isfctl.c 239685 2012-08-25 18:08:20Z brooks $
+ * $FreeBSD$
+ */
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/endian.h>
+#include <sys/errno.h>
+#include <sys/socket.h>
+
+#include <assert.h>
+#include <err.h>
+#include <fcntl.h>
+#include <inttypes.h>
+#include <kenv.h>
+#include <md5.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <net/if_dl.h>
+#include <net/ethernet.h>
+
+
+#define	CONFIG_BLOCK (128 * 1024)
+#define	DEV_CFI0_PATH	"/dev/cfi0"
+
+static u_char block[CONFIG_BLOCK];
+
+#define	UNKNOWN	0
+#define	CFI	1
+static int fdev	= UNKNOWN;
+static const char *fdevs[] = {
+	"UNKNOWN",
+	"CFI"
+};
+static int gflag;
+
+/* XXX-BZ should include if_atsereg.h. */
+#define	ALTERA_ETHERNET_OPTION_BITS_OFF 0x00008000
+#define	ALTERA_ETHERNET_OPTION_BITS_LEN 0x00007fff
+
+
+static void
+usage(int rc)
+{
+
+	fprintf(stderr, "usage: atsectl [-ghlu] [-s <etheraddr>]\n");
+	exit(rc);
+}
+
+static void
+read_block(void)
+{
+	int fd;
+
+	fd = open(DEV_CFI0_PATH, O_RDONLY, 0);
+	if (fd == -1)
+		errx(1, "Failed to open " DEV_CFI0_PATH);
+	else
+		fdev = CFI;
+
+	if (read(fd, block, sizeof(block)) != CONFIG_BLOCK)
+		errx(1, "Short read from %s", fdevs[fdev]);
+
+	close(fd);
+}
+
+static void
+write_block(void)
+{
+	int fd;
+
+	assert(fdev == CFI);
+
+	fd = open(DEV_CFI0_PATH, O_WRONLY, 0);
+	if (fd == -1)
+		errx(1, "Failed to open " DEV_CFI0_PATH);
+
+	if (write(fd, block, sizeof(block)) != CONFIG_BLOCK)
+		errx(1, "Short write on %s", fdevs[fdev]);
+
+	close(fd);
+}
+
+static void
+print_eaddr(void)
+{
+	uint32_t safe;
+	
+	/*
+	 * XXX-BZ we are on our own: keep in sync with atse(4).
+	 * Everything past the first address is a guess currently.
+	 * So we will always only write one address into there.
+	 */
+#if 0
+root@cheri1:/root # dd if=/dev/isf0 bs=32k skip=1 count=1 | hd
+00000000  fe 5a 00 00 00 07 ed ff  ed 15 ff ff c0 a8 01 ea  |.Z..............|
+00000010  ff ff ff ff ff ff ff 00  c0 a8 01 ff ff ff ff ff  |................|
+00000020  ff ff ff ff ff ff ff ff  ff ff ff ff ff ff ff ff  |................|
+*
+1+0 records in
+1+0 records out
+32768 bytes transferred in 0.053036 secs (617845 bytes/sec)
+00008000
+#endif
+
+	safe  = block[ALTERA_ETHERNET_OPTION_BITS_OFF + 0] << 24;
+	safe |= block[ALTERA_ETHERNET_OPTION_BITS_OFF + 1] << 16;
+	safe |= block[ALTERA_ETHERNET_OPTION_BITS_OFF + 2] << 8;
+	safe |= block[ALTERA_ETHERNET_OPTION_BITS_OFF + 3];
+
+	printf("%02x:%02x:%02x:%02x:%02x:%02x%s\n",
+	    block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4],
+	    block[ALTERA_ETHERNET_OPTION_BITS_OFF + 5],
+	    block[ALTERA_ETHERNET_OPTION_BITS_OFF + 6],
+	    block[ALTERA_ETHERNET_OPTION_BITS_OFF + 7],
+	    block[ALTERA_ETHERNET_OPTION_BITS_OFF + 8],
+	    block[ALTERA_ETHERNET_OPTION_BITS_OFF + 9],
+	    (safe != le32toh(0x00005afe)) ?
+		" (invalid control pattern)" : "");
+}
+
+static void
+list(void)
+{
+
+	read_block();
+	print_eaddr();
+	exit(0);
+}
+
+static void
+_set(uint8_t *eaddr)
+{
+	uint8_t buf[32];
+	MD5_CTX ctx;
+	int rc;
+
+	printf("Original:\n");
+	read_block();
+	print_eaddr();
+
+	if (eaddr == NULL) {
+		/* cfi0.factory_ppr="0x0123456789abcdef" */
+		rc = kenv(KENV_GET, "cfi0.factory_ppr", buf, sizeof(buf));
+		if (rc == -1)
+			err(1, "Could not find Intel flash PPR serial\n");
+
+		MD5Init(&ctx);
+		MD5Update(&ctx, buf+2, 16);
+		MD5Final(buf, &ctx);
+		
+		/* Set the device specifc address (prefix). */
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 7] =
+		    buf[14] << 4 | buf[13] >> 4;
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 8] =
+		    buf[13] << 4 | buf[12] >> 4;
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 9] = buf[12] << 4;
+		/* Just make sure the last half-byte is really zero. */
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 9] &= ~0x0f;
+
+		/* Set (or clear) locally administred flag. */
+		if (gflag == 0)
+			block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] |= 2;
+		else
+			block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] &= ~2;
+		/* Make sure it is not a MC address by accident we start with. */
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] &= ~1;
+	} else {
+		int e;
+
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 4] = eaddr[0];
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 5] = eaddr[1];
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 6] = eaddr[2];
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 7] = eaddr[3];
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 8] = eaddr[4];
+		block[ALTERA_ETHERNET_OPTION_BITS_OFF + 9] = eaddr[5];
+
+		e = 0;
+		if ((eaddr[5] & 0xf) != 0x0) {
+			e++;
+			warnx("WARN: Selected Ethernet Address is "
+			    "not multi-MAC compatible.\n");
+		}
+		if (gflag == 0 && ((eaddr[0] & 0x2) == 0x0)) {
+			e++;
+			warnx("WARN: Locally administered bit not set.\n");
+		}
+		if ((eaddr[0] & 0x1) != 0x0) {
+			e++;
+			warnx("WARN: You are setting a Multicast address.\n");
+		}
+		if (e != 0)
+			warnx("Suggesting to re-run with: "
+			    "%02x:%02x:%02x:%02x:%02x:%02x",
+			    (eaddr[0] & 0xfe) | 0x2,
+			    eaddr[1], eaddr[2], eaddr[3], eaddr[4],
+			    eaddr[5] & 0xf0);
+	}
+
+	/* Write the "safe" out, just to be sure. */
+	block[ALTERA_ETHERNET_OPTION_BITS_OFF + 0] = 0xfe;
+	block[ALTERA_ETHERNET_OPTION_BITS_OFF + 1] = 0x5a;
+	block[ALTERA_ETHERNET_OPTION_BITS_OFF + 2] = 0x00;
+	block[ALTERA_ETHERNET_OPTION_BITS_OFF + 3] = 0x00;
+
+	write_block();
+
+	printf("Updated to:\n");
+	read_block();
+	print_eaddr();
+	exit(0);
+}
+
+static void
+update(void)
+{
+
+	_set(NULL);
+	exit(0);
+}
+
+static void
+set(char *eaddrstr)
+{
+	uint8_t eaddr[ETHER_ADDR_LEN];
+	char *p;
+	long l;
+	int i;
+
+	memset(eaddr, 0x00, ETHER_ADDR_LEN);
+	i = 0;
+	while ((p = strsep(&eaddrstr, ":")) != NULL && i < ETHER_ADDR_LEN) {
+		errno = 0;
+		l = strtol(p, (char **)NULL, 16);
+		if (l == 0 && errno != 0)
+			errx(1, "Failed to parse Ethernet address given: %s\n", p);
+		if (l < 0x00 || l > 0xff)
+			errx(1, "Failed to parse Ethernet address given: %lx\n", l);
+		eaddr[i++] = strtol(p, (char **)NULL, 16);
+	}
+
+	if (i != ETHER_ADDR_LEN)
+		errx(1, "Failed to parse Ethernet address given\n");
+
+	_set(eaddr);
+	exit(0);
+}
+
+int
+main(int argc, char **argv)
+{
+	char ch, *s;
+
+	s = NULL;
+	while ((ch = getopt(argc, argv, "ghlus:")) != -1) {
+		switch (ch) {
+		case 'g':
+			gflag = 1;
+			break;
+		case 'h':
+			usage(0);
+			/* NOTREACHED */
+			break;
+		case 'l':
+			list();
+			/* NOTREACHED */
+			break;
+		case 'u':
+			update();
+			/* NOTREACHED */
+			break;
+
+		case 's':
+			set(optarg);
+			/* NOTREACHED */
+			break;
+
+		case '?':
+		default:
+			usage(1);
+			/* NOTREACHED */
+			break;
+		}
+	}
+
+	usage(1);
+	/* NOTREACHED */
+
+	return (0);
+}
diff --git a/tools/tools/bus_autoconf/bus_autoconf.sh b/tools/tools/bus_autoconf/bus_autoconf.sh
index c99df91e18f..68d15f897ef 100644
--- a/tools/tools/bus_autoconf/bus_autoconf.sh
+++ b/tools/tools/bus_autoconf/bus_autoconf.sh
@@ -34,7 +34,7 @@ cat <<EOF
 #
 # ${DOLLAR}${OS}${DOLLAR}
 #
-# This file was automatically generated by "tools/bus_autoconf.sh".
+# This file was automatically generated by "tools/tools/bus_autoconf/bus_autoconf.sh".
 # Please do not edit!
 #
 
diff --git a/tools/tools/cxgbetool/Makefile b/tools/tools/cxgbetool/Makefile
index dc2beda39ff..21f12837416 100644
--- a/tools/tools/cxgbetool/Makefile
+++ b/tools/tools/cxgbetool/Makefile
@@ -3,7 +3,7 @@
 PROG=	cxgbetool
 SRCS=	cxgbetool.c
 NO_MAN=
-CFLAGS+= -I${.CURDIR}/../../../sys/dev/cxgbe -I.
+CFLAGS+= -I${.CURDIR}/../../../sys/dev/cxgbe -I${.CURDIR}/../../../sys -I.
 BINDIR?= /usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/tools/tools/cxgbetool/cxgbetool.c b/tools/tools/cxgbetool/cxgbetool.c
index e5704e7a44b..42f13bb8961 100644
--- a/tools/tools/cxgbetool/cxgbetool.c
+++ b/tools/tools/cxgbetool/cxgbetool.c
@@ -46,11 +46,12 @@ __FBSDID("$FreeBSD$");
 #include <net/ethernet.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <net/sff8472.h>
 
 #include "t4_ioctl.h"
 
 #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-
+#define in_range(val, lo, hi) ( val < 0 || (val <= hi && val >= lo))
 #define	max(x, y) ((x) > (y) ? (x) : (y))
 
 static const char *progname, *nexus;
@@ -94,12 +95,15 @@ usage(FILE *fp)
 	    "\ti2c <port> <devaddr> <addr> [<len>] read from i2c device\n"
 	    "\tloadfw <fw-image.bin>               install firmware\n"
 	    "\tmemdump <addr> <len>                dump a memory range\n"
+	    "\tmodinfo <port>                      optics/cable information\n"
 	    "\treg <address>[=<val>]               read/write register\n"
 	    "\treg64 <address>[=<val>]             read/write 64 bit register\n"
 	    "\tregdump [<module>] ...              dump registers\n"
+	    "\tsched-class params <param> <val> .. configure TX scheduler class\n"
+	    "\tsched-queue <port> <queue> <class>  bind NIC queues to TX Scheduling class\n"
 	    "\tstdio                               interactive mode\n"
 	    "\ttcb <tid>                           read TCB\n"
-	    "\ttracer <idx> tx<n>|rx<n>            set and enable a tracer)\n"
+	    "\ttracer <idx> tx<n>|rx<n>            set and enable a tracer\n"
 	    "\ttracer <idx> disable|enable         disable or enable a tracer\n"
 	    "\ttracer list                         list all tracers\n"
 	    );
@@ -321,7 +325,7 @@ dump_regs_t4(int argc, const char *argv[], const uint32_t *regs)
 		T4_MODREGS(ma),
 		{ "edc0", t4_edc_0_regs },
 		{ "edc1", t4_edc_1_regs },
-		T4_MODREGS(cim), 
+		T4_MODREGS(cim),
 		T4_MODREGS(tp),
 		T4_MODREGS(ulp_rx),
 		T4_MODREGS(ulp_tx),
@@ -333,7 +337,7 @@ dump_regs_t4(int argc, const char *argv[], const uint32_t *regs)
 		{ "i2c", t4_i2cm_regs },
 		T4_MODREGS(mi),
 		T4_MODREGS(uart),
-		T4_MODREGS(pmu), 
+		T4_MODREGS(pmu),
 		T4_MODREGS(sf),
 		T4_MODREGS(pl),
 		T4_MODREGS(le),
@@ -1868,6 +1872,420 @@ tracer_cmd(int argc, const char *argv[])
 	return set_tracer(idx, argc - 1, argv + 1);
 }
 
+static int
+modinfo(int argc, const char *argv[])
+{
+	long port;
+	char string[16], *p;
+	struct t4_i2c_data i2cd;
+	int rc, i;
+	uint16_t temp, vcc, tx_bias, tx_power, rx_power;
+
+	if (argc != 1) {
+		warnx("must supply a port");
+		return (EINVAL);
+	}
+
+	p = str_to_number(argv[0], &port, NULL);
+	if (*p || port > UCHAR_MAX) {
+		warnx("invalid port id \"%s\"", argv[0]);
+		return (EINVAL);
+	}
+
+	bzero(&i2cd, sizeof(i2cd));
+	i2cd.len = 1;
+	i2cd.port_id = port;
+	i2cd.dev_addr = SFF_8472_BASE;
+
+	i2cd.offset = SFF_8472_ID;
+	if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+		goto fail;
+
+	if (i2cd.data[0] > SFF_8472_ID_LAST)
+		printf("Unknown ID\n");
+	else
+		printf("ID: %s\n", sff_8472_id[i2cd.data[0]]);
+
+	bzero(&string, sizeof(string));
+	for (i = SFF_8472_VENDOR_START; i < SFF_8472_VENDOR_END; i++) {
+		i2cd.offset = i;
+		if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+			goto fail;
+		string[i - SFF_8472_VENDOR_START] = i2cd.data[0];
+	}
+	printf("Vendor %s\n", string);
+
+	bzero(&string, sizeof(string));
+	for (i = SFF_8472_SN_START; i < SFF_8472_SN_END; i++) {
+		i2cd.offset = i;
+		if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+			goto fail;
+		string[i - SFF_8472_SN_START] = i2cd.data[0];
+	}
+	printf("SN %s\n", string);
+
+	bzero(&string, sizeof(string));
+	for (i = SFF_8472_PN_START; i < SFF_8472_PN_END; i++) {
+		i2cd.offset = i;
+		if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+			goto fail;
+		string[i - SFF_8472_PN_START] = i2cd.data[0];
+	}
+	printf("PN %s\n", string);
+
+	bzero(&string, sizeof(string));
+	for (i = SFF_8472_REV_START; i < SFF_8472_REV_END; i++) {
+		i2cd.offset = i;
+		if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+			goto fail;
+		string[i - SFF_8472_REV_START] = i2cd.data[0];
+	}
+	printf("Rev %s\n", string);
+
+	i2cd.offset = SFF_8472_DIAG_TYPE;
+	if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+		goto fail;
+
+	if ((char )i2cd.data[0] & (SFF_8472_DIAG_IMPL |
+				   SFF_8472_DIAG_INTERNAL)) {
+
+		/* Switch to reading from the Diagnostic address. */
+		i2cd.dev_addr = SFF_8472_DIAG;
+		i2cd.len = 1;
+
+		i2cd.offset = SFF_8472_TEMP;
+		if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+			goto fail;
+		temp = i2cd.data[0] << 8;
+		printf("Temp: ");
+		if ((temp & SFF_8472_TEMP_SIGN) == SFF_8472_TEMP_SIGN)
+			printf("-");
+		else
+			printf("+");
+		printf("%dC\n", (temp & SFF_8472_TEMP_MSK) >>
+		    SFF_8472_TEMP_SHIFT);
+
+		i2cd.offset = SFF_8472_VCC;
+		if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+			goto fail;
+		vcc = i2cd.data[0] << 8;
+		printf("Vcc %fV\n", vcc / SFF_8472_VCC_FACTOR);
+
+		i2cd.offset = SFF_8472_TX_BIAS;
+		if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+			goto fail;
+		tx_bias = i2cd.data[0] << 8;
+		printf("TX Bias %fuA\n", tx_bias / SFF_8472_BIAS_FACTOR);
+
+		i2cd.offset = SFF_8472_TX_POWER;
+		if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+			goto fail;
+		tx_power = i2cd.data[0] << 8;
+		printf("TX Power %fmW\n", tx_power / SFF_8472_POWER_FACTOR);
+
+		i2cd.offset = SFF_8472_RX_POWER;
+		if ((rc = doit(CHELSIO_T4_GET_I2C, &i2cd)) != 0)
+			goto fail;
+		rx_power = i2cd.data[0] << 8;
+		printf("RX Power %fmW\n", rx_power / SFF_8472_POWER_FACTOR);
+
+	} else
+		printf("Diagnostics not supported.\n");
+
+	return(0);
+
+fail:
+	if (rc == EPERM)
+		warnx("No module/cable in port %ld", port);
+	return (rc);
+
+}
+
+/* XXX: pass in a low/high and do range checks as well */
+static int
+get_sched_param(const char *param, const char *args[], long *val)
+{
+	char *p;
+
+	if (strcmp(param, args[0]) != 0)
+		return (EINVAL);
+
+	p = str_to_number(args[1], val, NULL);
+	if (*p) {
+		warnx("parameter \"%s\" has bad value \"%s\"", args[0],
+		    args[1]);
+		return (EINVAL);
+	}
+
+	return (0);
+}
+
+static int
+sched_class(int argc, const char *argv[])
+{
+	struct t4_sched_params op;
+	int errs, i;
+
+	memset(&op, 0xff, sizeof(op));
+	op.subcmd = -1;
+	op.type = -1;
+	if (argc == 0) {
+		warnx("missing scheduling sub-command");
+		return (EINVAL);
+	}
+	if (!strcmp(argv[0], "config")) {
+		op.subcmd = SCHED_CLASS_SUBCMD_CONFIG;
+		op.u.config.minmax = -1;
+	} else if (!strcmp(argv[0], "params")) {
+		op.subcmd = SCHED_CLASS_SUBCMD_PARAMS;
+		op.u.params.level = op.u.params.mode = op.u.params.rateunit =
+		    op.u.params.ratemode = op.u.params.channel =
+		    op.u.params.cl = op.u.params.minrate = op.u.params.maxrate =
+		    op.u.params.weight = op.u.params.pktsize = -1;
+	} else {
+		warnx("invalid scheduling sub-command \"%s\"", argv[0]);
+		return (EINVAL);
+	}
+
+	/* Decode remaining arguments ... */
+	errs = 0;
+	for (i = 1; i < argc; i += 2) {
+		const char **args = &argv[i];
+		long l;
+
+		if (i + 1 == argc) {
+			warnx("missing argument for \"%s\"", args[0]);
+			errs++;
+			break;
+		}
+
+		if (!strcmp(args[0], "type")) {
+			if (!strcmp(args[1], "packet"))
+				op.type = SCHED_CLASS_TYPE_PACKET;
+			else {
+				warnx("invalid type parameter \"%s\"", args[1]);
+				errs++;
+			}
+
+			continue;
+		}
+
+		if (op.subcmd == SCHED_CLASS_SUBCMD_CONFIG) {
+			if(!get_sched_param("minmax", args, &l))
+				op.u.config.minmax = (int8_t)l;
+			else {
+				warnx("unknown scheduler config parameter "
+				    "\"%s\"", args[0]);
+				errs++;
+			}
+
+			continue;
+		}
+
+		/* Rest applies only to SUBCMD_PARAMS */
+		if (op.subcmd != SCHED_CLASS_SUBCMD_PARAMS)
+			continue;
+
+		if (!strcmp(args[0], "level")) {
+			if (!strcmp(args[1], "cl-rl"))
+				op.u.params.level = SCHED_CLASS_LEVEL_CL_RL;
+			else if (!strcmp(args[1], "cl-wrr"))
+				op.u.params.level = SCHED_CLASS_LEVEL_CL_WRR;
+			else if (!strcmp(args[1], "ch-rl"))
+				op.u.params.level = SCHED_CLASS_LEVEL_CH_RL;
+			else {
+				warnx("invalid level parameter \"%s\"",
+				    args[1]);
+				errs++;
+			}
+		} else if (!strcmp(args[0], "mode")) {
+			if (!strcmp(args[1], "class"))
+				op.u.params.mode = SCHED_CLASS_MODE_CLASS;
+			else if (!strcmp(args[1], "flow"))
+				op.u.params.mode = SCHED_CLASS_MODE_FLOW;
+			else {
+				warnx("invalid mode parameter \"%s\"", args[1]);
+				errs++;
+			}
+		} else if (!strcmp(args[0], "rate-unit")) {
+			if (!strcmp(args[1], "bits"))
+				op.u.params.rateunit = SCHED_CLASS_RATEUNIT_BITS;
+			else if (!strcmp(args[1], "pkts"))
+				op.u.params.rateunit = SCHED_CLASS_RATEUNIT_PKTS;
+			else {
+				warnx("invalid rate-unit parameter \"%s\"",
+				    args[1]);
+				errs++;
+			}
+		} else if (!strcmp(args[0], "rate-mode")) {
+			if (!strcmp(args[1], "relative"))
+				op.u.params.ratemode = SCHED_CLASS_RATEMODE_REL;
+			else if (!strcmp(args[1], "absolute"))
+				op.u.params.ratemode = SCHED_CLASS_RATEMODE_ABS;
+			else {
+				warnx("invalid rate-mode parameter \"%s\"",
+				    args[1]);
+				errs++;
+			}
+		} else if (!get_sched_param("channel", args, &l))
+			op.u.params.channel = (int8_t)l;
+		else if (!get_sched_param("class", args, &l))
+			op.u.params.cl = (int8_t)l;
+		else if (!get_sched_param("min-rate", args, &l))
+			op.u.params.minrate = (int32_t)l;
+		else if (!get_sched_param("max-rate", args, &l))
+			op.u.params.maxrate = (int32_t)l;
+		else if (!get_sched_param("weight", args, &l))
+			op.u.params.weight = (int16_t)l;
+		else if (!get_sched_param("pkt-size", args, &l))
+			op.u.params.pktsize = (int16_t)l;
+		else {
+			warnx("unknown scheduler parameter \"%s\"", args[0]);
+			errs++;
+		}
+	}
+
+	/*
+	 * Catch some logical fallacies in terms of argument combinations here
+	 * so we can offer more than just the EINVAL return from the driver.
+	 * The driver will be able to catch a lot more issues since it knows
+	 * the specifics of the device hardware capabilities like how many
+	 * channels, classes, etc. the device supports.
+	 */
+	if (op.type < 0) {
+		warnx("sched \"type\" parameter missing");
+		errs++;
+	}
+	if (op.subcmd == SCHED_CLASS_SUBCMD_CONFIG) {
+		if (op.u.config.minmax < 0) {
+			warnx("sched config \"minmax\" parameter missing");
+			errs++;
+		}
+	}
+	if (op.subcmd == SCHED_CLASS_SUBCMD_PARAMS) {
+		if (op.u.params.level < 0) {
+			warnx("sched params \"level\" parameter missing");
+			errs++;
+		}
+		if (op.u.params.mode < 0) {
+			warnx("sched params \"mode\" parameter missing");
+			errs++;
+		}
+		if (op.u.params.rateunit < 0) {
+			warnx("sched params \"rate-unit\" parameter missing");
+			errs++;
+		}
+		if (op.u.params.ratemode < 0) {
+			warnx("sched params \"rate-mode\" parameter missing");
+			errs++;
+		}
+		if (op.u.params.channel < 0) {
+			warnx("sched params \"channel\" missing");
+			errs++;
+		}
+		if (op.u.params.cl < 0) {
+			warnx("sched params \"class\" missing");
+			errs++;
+		}
+		if (op.u.params.maxrate < 0 &&
+		    (op.u.params.level == SCHED_CLASS_LEVEL_CL_RL ||
+		    op.u.params.level == SCHED_CLASS_LEVEL_CH_RL)) {
+			warnx("sched params \"max-rate\" missing for "
+			    "rate-limit level");
+			errs++;
+		}
+		if (op.u.params.weight < 0 &&
+		    op.u.params.level == SCHED_CLASS_LEVEL_CL_WRR) {
+			warnx("sched params \"weight\" missing for "
+			    "weighted-round-robin level");
+			errs++;
+		}
+		if (op.u.params.pktsize < 0 &&
+		    (op.u.params.level == SCHED_CLASS_LEVEL_CL_RL ||
+		    op.u.params.level == SCHED_CLASS_LEVEL_CH_RL)) {
+			warnx("sched params \"pkt-size\" missing for "
+			    "rate-limit level");
+			errs++;
+		}
+		if (op.u.params.mode == SCHED_CLASS_MODE_FLOW &&
+		    op.u.params.ratemode != SCHED_CLASS_RATEMODE_ABS) {
+			warnx("sched params mode flow needs rate-mode absolute");
+			errs++;
+		}
+		if (op.u.params.ratemode == SCHED_CLASS_RATEMODE_REL &&
+		    !in_range(op.u.params.maxrate, 1, 100)) {
+                        warnx("sched params \"max-rate\" takes "
+			    "percentage value(1-100) for rate-mode relative");
+                        errs++;
+                }
+                if (op.u.params.ratemode == SCHED_CLASS_RATEMODE_ABS &&
+		    !in_range(op.u.params.maxrate, 1, 10000000)) {
+                        warnx("sched params \"max-rate\" takes "
+			    "value(1-10000000) for rate-mode absolute");
+                        errs++;
+                }
+                if (op.u.params.maxrate > 0 &&
+		    op.u.params.maxrate < op.u.params.minrate) {
+                        warnx("sched params \"max-rate\" is less than "
+			    "\"min-rate\"");
+                        errs++;
+                }
+	}
+
+	if (errs > 0) {
+		warnx("%d error%s in sched-class command", errs,
+		    errs == 1 ? "" : "s");
+		return (EINVAL);
+	}
+
+	return doit(CHELSIO_T4_SCHED_CLASS, &op);
+}
+
+static int
+sched_queue(int argc, const char *argv[])
+{
+	struct t4_sched_queue op = {0};
+	char *p;
+	long val;
+
+	if (argc != 3) {
+		/* need "<port> <queue> <class> */
+		warnx("incorrect number of arguments.");
+		return (EINVAL);
+	}
+
+	p = str_to_number(argv[0], &val, NULL);
+	if (*p || val > UCHAR_MAX) {
+		warnx("invalid port id \"%s\"", argv[0]);
+		return (EINVAL);
+	}
+	op.port = (uint8_t)val;
+
+	if (!strcmp(argv[1], "all") || !strcmp(argv[1], "*"))
+		op.queue = -1;
+	else {
+		p = str_to_number(argv[1], &val, NULL);
+		if (*p || val < -1) {
+			warnx("invalid queue \"%s\"", argv[1]);
+			return (EINVAL);
+		}
+		op.queue = (int8_t)val;
+	}
+
+	if (!strcmp(argv[2], "unbind") || !strcmp(argv[2], "clear"))
+		op.cl = -1;
+	else {
+		p = str_to_number(argv[2], &val, NULL);
+		if (*p || val < -1) {
+			warnx("invalid class \"%s\"", argv[2]);
+			return (EINVAL);
+		}
+		op.cl = (int8_t)val;
+	}
+
+	return doit(CHELSIO_T4_SCHED_QUEUE, &op);
+}
+
 static int
 run_cmd(int argc, const char *argv[])
 {
@@ -1900,6 +2318,12 @@ run_cmd(int argc, const char *argv[])
 		rc = clearstats(argc, argv);
 	else if (!strcmp(cmd, "tracer"))
 		rc = tracer_cmd(argc, argv);
+	else if (!strcmp(cmd, "modinfo"))
+		rc = modinfo(argc, argv);
+	else if (!strcmp(cmd, "sched-class"))
+		rc = sched_class(argc, argv);
+	else if (!strcmp(cmd, "sched-queue"))
+		rc = sched_queue(argc, argv);
 	else {
 		rc = EINVAL;
 		warnx("invalid command \"%s\"", cmd);
diff --git a/tools/tools/nanobsd/nanobsd.sh b/tools/tools/nanobsd/nanobsd.sh
index 216c9004ebe..f8bd2cd01ac 100644
--- a/tools/tools/nanobsd/nanobsd.sh
+++ b/tools/tools/nanobsd/nanobsd.sh
@@ -57,7 +57,8 @@ NANO_PACKAGE_LIST="*"
 # default is ${NANO_OBJ}
 #NANO_DISKIMGDIR=""
 
-# Parallel Make
+# Make & parallel Make
+NANO_MAKE="make"
 NANO_PMAKE="make -j 3"
 
 # The default name for any image we create.
@@ -254,7 +255,7 @@ install_world ( ) (
 
 	cd ${NANO_SRC}
 	env TARGET_ARCH=${NANO_ARCH} \
-	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
+	${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} installworld \
 		DESTDIR=${NANO_WORLDDIR} \
 		> ${NANO_OBJ}/_.iw 2>&1
 	chflags -R noschg ${NANO_WORLDDIR}
@@ -267,7 +268,7 @@ install_etc ( ) (
 
 	cd ${NANO_SRC}
 	env TARGET_ARCH=${NANO_ARCH} \
-	${NANO_PMAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
+	${NANO_MAKE} __MAKE_CONF=${NANO_MAKE_CONF_INSTALL} distribution \
 		DESTDIR=${NANO_WORLDDIR} \
 		> ${NANO_OBJ}/_.etc 2>&1
 	# make.conf doesn't get created by default, but some ports need it
@@ -288,7 +289,7 @@ install_kernel ( ) (
 	fi
 
 	cd ${NANO_SRC}
-	env TARGET_ARCH=${NANO_ARCH} ${NANO_PMAKE} installkernel \
+	env TARGET_ARCH=${NANO_ARCH} ${NANO_MAKE} installkernel \
 		DESTDIR=${NANO_WORLDDIR} \
 		__MAKE_CONF=${NANO_MAKE_CONF_INSTALL} \
 		${kernconfdir:+"KERNCONFDIR="}${kernconfdir} \
@@ -733,6 +734,77 @@ cust_pkg () (
 	rm -rf ${NANO_WORLDDIR}/Pkg
 )
 
+cust_pkgng () (
+
+	# If the package directory doesn't exist, we're done.
+	if [ ! -d ${NANO_PACKAGE_DIR} ]; then
+		echo "DONE 0 packages"
+		return 0
+	fi
+
+	# Find a pkg-* package
+	for x in `find -s ${NANO_PACKAGE_DIR} -iname 'pkg-*'`; do
+		_NANO_PKG_PACKAGE=`basename "$x"`
+	done
+	if [ -z "${_NANO_PKG_PACKAGE}" -o ! -f "${NANO_PACKAGE_DIR}/${_NANO_PKG_PACKAGE}" ]; then
+		echo "FAILED: need a pkg/ package for bootstrapping"
+		exit 2
+	fi
+
+	# Copy packages into chroot
+	mkdir -p ${NANO_WORLDDIR}/Pkg
+	(
+		cd ${NANO_PACKAGE_DIR}
+		find ${NANO_PACKAGE_LIST} -print |
+		cpio -Ldumpv ${NANO_WORLDDIR}/Pkg
+	)
+
+	#Bootstrap pkg
+	chroot ${NANO_WORLDDIR} sh -c \
+		"env ASSUME_ALWAYS_YES=YES SIGNATURE_TYPE=none /usr/sbin/pkg add /Pkg/${_NANO_PKG_PACKAGE}"
+	chroot ${NANO_WORLDDIR} sh -c "pkg -N >/dev/null 2>&1;"
+	if [ "$?" -ne "0" ]; then
+		echo "FAILED: pkg bootstrapping faied"
+		exit 2
+	fi
+	rm -f ${NANO_WORLDDIR}/Pkg/pkg-*
+
+	# Count & report how many we have to install
+	todo=`ls ${NANO_WORLDDIR}/Pkg | /usr/bin/wc -l`
+	todo=$(expr $todo + 1) # add one for pkg since it is installed already
+	echo "=== TODO: $todo"
+	ls ${NANO_WORLDDIR}/Pkg
+	echo "==="
+	while true
+	do
+		# Record how many we have now
+		have=`chroot ${NANO_WORLDDIR} sh -c \
+			'env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg info | /usr/bin/wc -l'`
+
+		# Attempt to install more packages
+		# ...but no more than 200 at a time due to (XXX still the case?) pkg_add's internal
+		# limitations.
+		chroot ${NANO_WORLDDIR} sh -c \
+			'ls Pkg/*txz | xargs -n 200 env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg add ' || true
+
+		# See what that got us
+		now=`chroot ${NANO_WORLDDIR} sh -c \
+			'env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg info | /usr/bin/wc -l'`
+		echo "=== NOW $now"
+		chroot ${NANO_WORLDDIR} sh -c \
+			'env ASSUME_ALWAYS_YES=YES /usr/sbin/pkg info'
+		echo "==="
+		if [ $now -eq $todo ] ; then
+			echo "DONE $now packages"
+			break
+		elif [ $now -eq $have ] ; then
+			echo "FAILED: Nothing happened on this pass"
+			exit 2
+		fi
+	done
+	rm -rf ${NANO_WORLDDIR}/Pkg
+)
+
 #######################################################################
 # Convenience function:
 # 	Register all args as customize function.
@@ -878,6 +950,7 @@ fi
 if $do_clean ; then
 	true
 else
+	NANO_MAKE="${NANO_MAKE} -DNO_CLEAN"
 	NANO_PMAKE="${NANO_PMAKE} -DNO_CLEAN"
 fi
 
@@ -897,6 +970,7 @@ export NANO_DRIVE
 export NANO_HEADS
 export NANO_IMAGES
 export NANO_IMGNAME
+export NANO_MAKE
 export NANO_MAKE_CONF_BUILD
 export NANO_MAKE_CONF_INSTALL
 export NANO_MEDIASIZE
diff --git a/tools/tools/netmap/nm_util.c b/tools/tools/netmap/nm_util.c
index 615360355f8..195b68776c3 100644
--- a/tools/tools/netmap/nm_util.c
+++ b/tools/tools/netmap/nm_util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Luigi Rizzo. All rights reserved.
+ * Copyright (C) 2012-2013 Luigi Rizzo. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -130,20 +130,14 @@ netmap_open(struct my_ring *me, int ringid, int promisc)
 	req.nr_version = NETMAP_API;
 	strncpy(req.nr_name, me->ifname, sizeof(req.nr_name));
 	req.nr_ringid = ringid;
-	err = ioctl(fd, NIOCGINFO, &req);
-	if (err) {
-		D("cannot get info on %s, errno %d ver %d",
-			me->ifname, errno, req.nr_version);
-		goto error;
-	}
-	me->memsize = l = req.nr_memsize;
-	if (verbose)
-		D("memsize is %d MB", l>>20);
 	err = ioctl(fd, NIOCREGIF, &req);
 	if (err) {
 		D("Unable to register %s", me->ifname);
 		goto error;
 	}
+	me->memsize = l = req.nr_memsize;
+	if (verbose)
+		D("memsize is %d MB", l>>20);
 
 	if (me->mem == NULL) {
 		me->mem = mmap(0, l, PROT_WRITE | PROT_READ, MAP_SHARED, fd, 0);
diff --git a/tools/tools/netmap/pkt-gen.c b/tools/tools/netmap/pkt-gen.c
index 901175e3a74..a6e5eeb227f 100644
--- a/tools/tools/netmap/pkt-gen.c
+++ b/tools/tools/netmap/pkt-gen.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Matteo Landi, Luigi Rizzo. All rights reserved.
+ * Copyright (C) 2011-2013 Matteo Landi, Luigi Rizzo. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -25,7 +25,7 @@
 
 /*
  * $FreeBSD$
- * $Id$
+ * $Id: pkt-gen.c 12346 2013-06-12 17:36:25Z luigi $
  *
  * Example program to show how to build a multithreaded packet
  * source/sink using the netmap device.
@@ -40,7 +40,10 @@
 
 #include <ctype.h>	// isprint()
 
-const char *default_payload="netmap pkt-gen payload\n"
+const char *default_payload="netmap pkt-gen DIRECT payload\n"
+	"http://info.iet.unipi.it/~luigi/netmap/ ";
+
+const char *indirect_payload="netmap pkt-gen indirect payload\n"
 	"http://info.iet.unipi.it/~luigi/netmap/ ";
 
 int time_second;	// support for RD() debugging macro
@@ -58,8 +61,8 @@ struct pkt {
 
 struct ip_range {
 	char *name;
-	struct in_addr start, end, cur;
-	uint16_t port0, port1, cur_p;
+	uint32_t start, end; /* same as struct in_addr */
+	uint16_t port0, port1;
 };
 
 struct mac_range {
@@ -80,6 +83,7 @@ struct glob_arg {
 	int burst;
 	int forever;
 	int npackets;	/* total packets to send */
+	int frags;	/* fragments per packet */
 	int nthreads;
 	int cpus;
 	int options;	/* testing */
@@ -103,6 +107,8 @@ struct glob_arg {
 	void *mmap_addr;
 	int mmap_size;
 	char *ifname;
+	char *nmr_config;
+	int dummy_send;
 };
 enum dev_type { DEV_NONE, DEV_NETMAP, DEV_PCAP, DEV_TAP };
 
@@ -137,45 +143,58 @@ struct targ {
 static void
 extract_ip_range(struct ip_range *r)
 {
-	char *p_lo, *p_hi;
-	char buf1[16]; // one ip address
+	char *ap, *pp;
+	struct in_addr a;
 
 	D("extract IP range from %s", r->name);
-	p_lo = index(r->name, ':');	/* do we have ports ? */
-	if (p_lo) {
-		D(" found ports at %s", p_lo);
-		*p_lo++ = '\0';
-		p_hi = index(p_lo, '-');
-		if (p_hi)
-			*p_hi++ = '\0';
-		else
-			p_hi = p_lo;
-		r->port0 = strtol(p_lo, NULL, 0);
-		r->port1 = strtol(p_hi, NULL, 0);
-		if (r->port1 < r->port0) {
-			r->cur_p = r->port0;
-			r->port0 = r->port1;
-			r->port1 = r->cur_p;
+	r->port0 = r->port1 = 0;
+	r->start = r->end = 0;
+
+	/* the first - splits start/end of range */
+	ap = index(r->name, '-');	/* do we have ports ? */
+	if (ap) {
+		*ap++ = '\0';
+	}
+	/* grab the initial values (mandatory) */
+	pp = index(r->name, ':');
+	if (pp) {
+		*pp++ = '\0';
+		r->port0 = r->port1 = strtol(pp, NULL, 0);
+	};
+	inet_aton(r->name, &a);
+	r->start = r->end = ntohl(a.s_addr);
+	if (ap) {
+		pp = index(ap, ':');
+		if (pp) {
+			*pp++ = '\0';
+			if (*pp) 
+				r->port1 = strtol(pp, NULL, 0);
+		}
+		if (*ap) {
+			inet_aton(ap, &a);
+			r->end = ntohl(a.s_addr);
 		}
-		r->cur_p = r->port0;
-		D("ports are %d to %d", r->port0, r->port1);
 	}
-	p_hi = index(r->name, '-');	/* do we have upper ip ? */
-	if (p_hi) {
-		*p_hi++ = '\0';
-	} else
-		p_hi = r->name;
-	inet_aton(r->name, &r->start);
-	inet_aton(p_hi, &r->end);
-	if (r->start.s_addr > r->end.s_addr) {
-		r->cur = r->start;
+	if (r->port0 > r->port1) {
+		uint16_t tmp = r->port0;
+		r->port0 = r->port1;
+		r->port1 = tmp;
+	}
+	if (r->start > r->end) {
+		uint32_t tmp = r->start;
 		r->start = r->end;
-		r->end = r->cur;
+		r->end = tmp;
+	}
+	{
+		struct in_addr a;
+		char buf1[16]; // one ip address
+
+		a.s_addr = htonl(r->end);
+		strncpy(buf1, inet_ntoa(a), sizeof(buf1));
+		a.s_addr = htonl(r->start);
+		D("range is %s:%d to %s:%d",
+			inet_ntoa(a), r->port0, buf1, r->port1);
 	}
-	r->cur = r->start;
-	strncpy(buf1, inet_ntoa(r->end), sizeof(buf1));
-	D("range is %s %d to %s %d", inet_ntoa(r->start), r->port0,
-		buf1, r->port1);
 }
 
 static void
@@ -255,6 +274,53 @@ system_ncpus(void)
 #endif /* __APPLE__ */
 
 
+/*
+ * parse the vale configuration in conf and put it in nmr.
+ * The configuration may consist of 0 to 4 numbers separated
+ * by commas: #tx-slots,#rx-slots,#tx-rings,#rx-rings.
+ * Missing numbers or zeroes stand for default values.
+ * As an additional convenience, if exactly one number
+ * is specified, then this is assigned to both #tx-slots and #rx-slots.
+ * If there is no 4th number, then the 3rd is assigned to both #tx-rings
+ * and #rx-rings.
+ */
+void parse_nmr_config(const char* conf, struct nmreq *nmr)
+{
+	char *w, *tok;
+	int i, v;
+
+	nmr->nr_tx_rings = nmr->nr_rx_rings = 0;
+	nmr->nr_tx_slots = nmr->nr_rx_slots = 0;
+	if (conf == NULL || ! *conf)
+		return;
+	w = strdup(conf);
+	for (i = 0, tok = strtok(w, ","); tok; i++, tok = strtok(NULL, ",")) {
+		v = atoi(tok);
+		switch (i) {
+		case 0:
+			nmr->nr_tx_slots = nmr->nr_rx_slots = v;
+			break;
+		case 1:
+			nmr->nr_rx_slots = v;
+			break;
+		case 2:
+			nmr->nr_tx_rings = nmr->nr_rx_rings = v;
+			break;
+		case 3:
+			nmr->nr_rx_rings = v;
+			break;
+		default:
+			D("ignored config: %s", tok);
+			break;
+		}
+	}
+	D("txr %d txd %d rxr %d rxd %d",
+			nmr->nr_tx_rings, nmr->nr_tx_slots,
+			nmr->nr_rx_rings, nmr->nr_rx_slots);
+	free(w);
+}
+
+
 /*
  * locate the src mac address for our interface, put it
  * into the user-supplied buffer. return 0 if ok, -1 on error.
@@ -361,7 +427,9 @@ dump_payload(char *p, int len, struct netmap_ring *ring, int cur)
 
 	/* get the length in ASCII of the length of the packet. */
 	
-	printf("ring %p cur %5d len %5d buf %p\n", ring, cur, len, p);
+	printf("ring %p cur %5d [buf %6d flags 0x%04x len %5d]\n",
+		ring, cur, ring->slot[cur].buf_idx,
+		ring->slot[cur].flags, len);
 	/* hexdump routine */
 	for (i = 0; i < len; ) {
 		memset(buf, sizeof(buf), ' ');
@@ -389,6 +457,54 @@ dump_payload(char *p, int len, struct netmap_ring *ring, int cur)
 #define uh_sum check
 #endif /* linux */
 
+/*
+ * increment the addressed in the packet,
+ * starting from the least significant field.
+ *	DST_IP DST_PORT SRC_IP SRC_PORT
+ */
+static void
+update_addresses(struct pkt *pkt, struct glob_arg *g)
+{
+	uint32_t a;
+	uint16_t p;
+	struct ip *ip = &pkt->ip;
+	struct udphdr *udp = &pkt->udp;
+
+	p = ntohs(udp->uh_sport);
+	if (p < g->src_ip.port1) { /* just inc, no wrap */
+		udp->uh_sport = htons(p + 1);
+		return;
+	}
+	udp->uh_sport = htons(g->src_ip.port0);
+
+	a = ntohl(ip->ip_src.s_addr);
+	if (a < g->src_ip.end) { /* just inc, no wrap */
+		ip->ip_src.s_addr = htonl(a + 1);
+		return;
+	}
+	ip->ip_src.s_addr = htonl(g->src_ip.start);
+
+	udp->uh_sport = htons(g->src_ip.port0);
+	p = ntohs(udp->uh_dport);
+	if (p < g->dst_ip.port1) { /* just inc, no wrap */
+		udp->uh_dport = htons(p + 1);
+		return;
+	}
+	udp->uh_dport = htons(g->dst_ip.port0);
+
+	a = ntohl(ip->ip_dst.s_addr);
+	if (a < g->dst_ip.end) { /* just inc, no wrap */
+		ip->ip_dst.s_addr = htonl(a + 1);
+		return;
+	}
+	ip->ip_dst.s_addr = htonl(g->dst_ip.start);
+
+}
+
+/*
+ * initialize one packet and prepare for the next one.
+ * The copy could be done better instead of repeating it each time.
+ */
 static void
 initialize_packet(struct targ *targ)
 {
@@ -398,9 +514,10 @@ initialize_packet(struct targ *targ)
 	struct udphdr *udp;
 	uint16_t paylen = targ->g->pkt_size - sizeof(*eh) - sizeof(struct ip);
 	const char *payload = targ->g->options & OPT_INDIRECT ?
-		"XXXXXXXXXXXXXXXXXXXXXX" : default_payload;
+		indirect_payload : default_payload;
 	int i, l, l0 = strlen(payload);
 
+	/* create a nice NUL-terminated string */
 	for (i = 0; i < paylen;) {
 		l = min(l0, paylen - i);
 		bcopy(payload, pkt->body + i, l);
@@ -409,6 +526,7 @@ initialize_packet(struct targ *targ)
 	pkt->body[i-1] = '\0';
 	ip = &pkt->ip;
 
+	/* prepare the headers */
         ip->ip_v = IPVERSION;
         ip->ip_hl = 5;
         ip->ip_id = 0;
@@ -418,22 +536,14 @@ initialize_packet(struct targ *targ)
         ip->ip_off = htons(IP_DF); /* Don't fragment */
         ip->ip_ttl = IPDEFTTL;
 	ip->ip_p = IPPROTO_UDP;
-	ip->ip_dst.s_addr = targ->g->dst_ip.cur.s_addr;
-	if (++targ->g->dst_ip.cur.s_addr > targ->g->dst_ip.end.s_addr)
-		targ->g->dst_ip.cur.s_addr = targ->g->dst_ip.start.s_addr;
-	ip->ip_src.s_addr = targ->g->src_ip.cur.s_addr;
-	if (++targ->g->src_ip.cur.s_addr > targ->g->src_ip.end.s_addr)
-		targ->g->src_ip.cur.s_addr = targ->g->src_ip.start.s_addr;
+	ip->ip_dst.s_addr = htonl(targ->g->dst_ip.start);
+	ip->ip_src.s_addr = htonl(targ->g->src_ip.start);
 	ip->ip_sum = wrapsum(checksum(ip, sizeof(*ip), 0));
 
 
 	udp = &pkt->udp;
-        udp->uh_sport = htons(targ->g->src_ip.cur_p);
-	if (++targ->g->src_ip.cur_p > targ->g->src_ip.port1)
-		targ->g->src_ip.cur_p = targ->g->src_ip.port0;
-        udp->uh_dport = htons(targ->g->dst_ip.cur_p);
-	if (++targ->g->dst_ip.cur_p > targ->g->dst_ip.port1)
-		targ->g->dst_ip.cur_p = targ->g->dst_ip.port0;
+        udp->uh_sport = htons(targ->g->src_ip.port0);
+        udp->uh_dport = htons(targ->g->dst_ip.port0);
 	udp->uh_ulen = htons(paylen);
 	/* Magic: taken from sbin/dhclient/packet.c */
 	udp->uh_sum = wrapsum(checksum(udp, sizeof(*udp),
@@ -461,13 +571,18 @@ initialize_packet(struct targ *targ)
  */
 static int
 send_packets(struct netmap_ring *ring, struct pkt *pkt, 
-		int size, u_int count, int options)
+		struct glob_arg *g, u_int count, int options, u_int nfrags)
 {
 	u_int sent, cur = ring->cur;
+	int fcnt;
+	int size = g->pkt_size;
 
 	if (ring->avail < count)
 		count = ring->avail;
-
+	if (count < nfrags) {
+		D("truncating packet, no room for frags %d %d",
+			count, nfrags);
+	}
 #if 0
 	if (options & (OPT_COPY | OPT_PREFETCH) ) {
 		for (sent = 0; sent < count; sent++) {
@@ -480,25 +595,36 @@ send_packets(struct netmap_ring *ring, struct pkt *pkt,
 		cur = ring->cur;
 	}
 #endif
-	for (sent = 0; sent < count; sent++) {
+	for (fcnt = nfrags, sent = 0; sent < count; sent++) {
 		struct netmap_slot *slot = &ring->slot[cur];
 		char *p = NETMAP_BUF(ring, slot->buf_idx);
 
 		slot->flags = 0;
-		if (options & OPT_DUMP)
-			dump_payload(p, size, ring, cur);
 		if (options & OPT_INDIRECT) {
 			slot->flags |= NS_INDIRECT;
-			*((struct pkt **)(void *)p) = pkt;
-		} else if (options & OPT_COPY)
+			slot->ptr = (uint64_t)pkt;
+		} else if (options & OPT_COPY) {
 			pkt_copy(pkt, p, size);
-		else if (options & OPT_MEMCPY)
+			if (fcnt == 1)
+				update_addresses(pkt, g);
+		} else if (options & OPT_MEMCPY) {
 			memcpy(p, pkt, size);
-		else if (options & OPT_PREFETCH)
+			if (fcnt == 1)
+				update_addresses(pkt, g);
+		} else if (options & OPT_PREFETCH) {
 			prefetch(p);
+		}
+		if (options & OPT_DUMP)
+			dump_payload(p, size, ring, cur);
 		slot->len = size;
-		if (sent == count - 1)
+		if (--fcnt > 0)
+			slot->flags |= NS_MOREFRAG;
+		else
+			fcnt = nfrags;
+		if (sent == count - 1) {
+			slot->flags &= ~NS_MOREFRAG;
 			slot->flags |= NS_REPORT;
+		}
 		cur = NETMAP_RING_NEXT(ring, cur);
 	}
 	ring->avail -= sent;
@@ -801,6 +927,7 @@ sender_body(void *data)
 	    for (i = 0; !targ->cancel && (n == 0 || sent < n); i++) {
 		if (pcap_inject(p, pkt, size) != -1)
 			sent++;
+		update_addresses(pkt, targ->g);
 		if (i > 10000) {
 			targ->count = sent;
 			i = 0;
@@ -814,6 +941,7 @@ sender_body(void *data)
 	    for (i = 0; !targ->cancel && (n == 0 || sent < n); i++) {
 		if (write(targ->g->main_fd, pkt, size) != -1)
 			sent++;
+		update_addresses(pkt, targ->g);
 		if (i > 10000) {
 			targ->count = sent;
 			i = 0;
@@ -821,6 +949,8 @@ sender_body(void *data)
 	    }
     } else {
 	int tosend = 0;
+	int frags = targ->g->frags;
+
 	while (!targ->cancel && (n == 0 || sent < n)) {
 
 		if (rate_limit && tosend <= 0) {
@@ -855,11 +985,20 @@ sender_body(void *data)
 			txring = NETMAP_TXRING(nifp, i);
 			if (txring->avail == 0)
 				continue;
-			m = send_packets(txring, &targ->pkt, targ->g->pkt_size,
-					 limit, options);
+			if (frags > 1)
+				limit = ((limit + frags - 1) / frags) * frags;
+				
+			m = send_packets(txring, &targ->pkt, targ->g,
+					 limit, options, frags);
+			ND("limit %d avail %d frags %d m %d", 
+				limit, txring->avail, frags, m);
 			sent += m;
-			tosend -= m;
 			targ->count = sent;
+			if (rate_limit) {
+				tosend -= m;
+				if (tosend <= 0)
+					break;
+			}
 		}
 	}
 	/* flush any remaining packets */
@@ -909,7 +1048,6 @@ receive_packets(struct netmap_ring *ring, u_int limit, int dump)
 		struct netmap_slot *slot = &ring->slot[cur];
 		char *p = NETMAP_BUF(ring, slot->buf_idx);
 
-		slot->flags = OPT_INDIRECT; // XXX
 		if (dump)
 			dump_payload(p, slot->len, ring, cur);
 
@@ -1063,18 +1201,20 @@ usage(void)
 		"\t-n count		number of iterations (can be 0)\n"
 		"\t-t pkts_to_send		also forces tx mode\n"
 		"\t-r pkts_to_receive	also forces rx mode\n"
-		"\t-l pkts_size		in bytes excluding CRC\n"
-		"\t-d dst-ip		end with %%n to sweep n addresses\n"
-		"\t-s src-ip		end with %%n to sweep n addresses\n"
-		"\t-D dst-mac		end with %%n to sweep n addresses\n"
-		"\t-S src-mac		end with %%n to sweep n addresses\n"
+		"\t-l pkt_size		in bytes excluding CRC\n"
+		"\t-d dst_ip[:port[-dst_ip:port]]   single or range\n"
+		"\t-s src_ip[:port[-src_ip:port]]   single or range\n"
+		"\t-D dst-mac\n"
+		"\t-S src-mac\n"
 		"\t-a cpu_id		use setaffinity\n"
 		"\t-b burst size		testing, mostly\n"
 		"\t-c cores		cores to use\n"
 		"\t-p threads		processes/threads to use\n"
 		"\t-T report_ms		milliseconds between reports\n"
-		"\t-P				use libpcap instead of netmap\n"
+		"\t-P			use libpcap instead of netmap\n"
 		"\t-w wait_for_link_time	in seconds\n"
+		"\t-R rate		in packets per second\n"
+		"\t-X			dump payload\n"
 		"",
 		cmd);
 
@@ -1112,6 +1252,7 @@ start_threads(struct glob_arg *g)
 		strncpy(tifreq.nr_name, g->ifname, sizeof(tifreq.nr_name));
 		tifreq.nr_version = NETMAP_API;
 		tifreq.nr_ringid = (g->nthreads > 1) ? (i | NETMAP_HW_RING) : 0;
+		parse_nmr_config(g->nmr_config, &tifreq);
 
 		/*
 		 * if we are acting as a receiver only, do not touch the transmit ring.
@@ -1126,8 +1267,10 @@ start_threads(struct glob_arg *g)
 			D("Unable to register %s", g->ifname);
 			continue;
 		}
+		D("memsize is %d MB", tifreq.nr_memsize >> 20);
 		targs[i].nmr = tifreq;
 		targs[i].nifp = NETMAP_IF(g->mmap_addr, tifreq.nr_offset);
+		D("nifp flags 0x%x", targs[i].nifp->ni_flags);
 		/* start threads. */
 		targs[i].qfirst = (g->nthreads > 1) ? i : 0;
 		targs[i].qlast = (g->nthreads > 1) ? i+1 :
@@ -1343,9 +1486,11 @@ main(int arc, char **argv)
 	g.cpus = 1;
 	g.forever = 1;
 	g.tx_rate = 0;
+	g.frags = 1;
+	g.nmr_config = "";
 
 	while ( (ch = getopt(arc, argv,
-			"a:f:n:i:It:r:l:d:s:D:S:b:c:o:p:PT:w:WvR:X")) != -1) {
+			"a:f:F:n:i:It:r:l:d:s:D:S:b:c:o:p:PT:w:WvR:XC:")) != -1) {
 		struct sf *fn;
 
 		switch(ch) {
@@ -1358,6 +1503,15 @@ main(int arc, char **argv)
 			g.npackets = atoi(optarg);
 			break;
 
+		case 'F':
+			i = atoi(optarg);
+			if (i < 1 || i > 63) {
+				D("invalid frags %d [1..63], ignore", i);
+				break;
+			}
+			g.frags = i;
+			break;
+
 		case 'f':
 			for (fn = func; fn->key; fn++) {
 				if (!strcmp(fn->key, optarg))
@@ -1383,6 +1537,8 @@ main(int arc, char **argv)
 				g.dev_type = DEV_TAP;
 			else
 				g.dev_type = DEV_NETMAP;
+			if (!strcmp(g.ifname, "null"))
+				g.dummy_send = 1;
 			break;
 
 		case 'I':
@@ -1454,6 +1610,9 @@ main(int arc, char **argv)
 			break;
 		case 'X':
 			g.options |= OPT_DUMP;
+			break;
+		case 'C':
+			g.nmr_config = strdup(optarg);
 		}
 	}
 
@@ -1507,6 +1666,8 @@ main(int arc, char **argv)
 		D("cannot open pcap on %s", g.ifname);
 		usage();
 	}
+    } else if (g.dummy_send) {
+	D("using a dummy send routine");
     } else {
 	bzero(&nmr, sizeof(nmr));
 	nmr.nr_version = NETMAP_API;
@@ -1523,20 +1684,36 @@ main(int arc, char **argv)
 	if (g.main_fd == -1) {
 		D("Unable to open /dev/netmap");
 		// fail later
-	} else {
-		if ((ioctl(g.main_fd, NIOCGINFO, &nmr)) == -1) {
-			D("Unable to get if info without name");
-		} else {
-			D("map size is %d Kb", nmr.nr_memsize >> 10);
-		}
-		bzero(&nmr, sizeof(nmr));
-		nmr.nr_version = NETMAP_API;
-		strncpy(nmr.nr_name, g.ifname, sizeof(nmr.nr_name));
-		if ((ioctl(g.main_fd, NIOCGINFO, &nmr)) == -1) {
-			D("Unable to get if info for %s", g.ifname);
-		}
-		devqueues = nmr.nr_rx_rings;
 	}
+	/*
+	 * Register the interface on the netmap device: from now on,
+	 * we can operate on the network interface without any
+	 * interference from the legacy network stack.
+	 *
+	 * We decide to put the first interface registration here to
+	 * give time to cards that take a long time to reset the PHY.
+	 */
+	bzero(&nmr, sizeof(nmr));
+	nmr.nr_version = NETMAP_API;
+	strncpy(nmr.nr_name, g.ifname, sizeof(nmr.nr_name));
+	nmr.nr_version = NETMAP_API;
+	parse_nmr_config(g.nmr_config, &nmr);
+	if (ioctl(g.main_fd, NIOCREGIF, &nmr) == -1) {
+		D("Unable to register interface %s", g.ifname);
+		//continue, fail later
+	}
+	ND("%s: txr %d txd %d rxr %d rxd %d", g.ifname,
+			nmr.nr_tx_rings, nmr.nr_tx_slots,
+			nmr.nr_rx_rings, nmr.nr_rx_slots);
+	//if ((ioctl(g.main_fd, NIOCGINFO, &nmr)) == -1) {
+	//	D("Unable to get if info without name");
+	//} else {
+	//	D("map size is %d Kb", nmr.nr_memsize >> 10);
+	//}
+	if ((ioctl(g.main_fd, NIOCGINFO, &nmr)) == -1) {
+		D("Unable to get if info for %s", g.ifname);
+	}
+	devqueues = nmr.nr_rx_rings;
 
 	/* validate provided nthreads. */
 	if (g.nthreads < 1 || g.nthreads > devqueues) {
@@ -1559,19 +1736,6 @@ main(int arc, char **argv)
 		// continue, fail later
 	}
 
-	/*
-	 * Register the interface on the netmap device: from now on,
-	 * we can operate on the network interface without any
-	 * interference from the legacy network stack.
-	 *
-	 * We decide to put the first interface registration here to
-	 * give time to cards that take a long time to reset the PHY.
-	 */
-	nmr.nr_version = NETMAP_API;
-	if (ioctl(g.main_fd, NIOCREGIF, &nmr) == -1) {
-		D("Unable to register interface %s", g.ifname);
-		//continue, fail later
-	}
 
 
 	/* Print some debug information. */
@@ -1595,6 +1759,7 @@ main(int arc, char **argv)
 	}
     }
 
+		
 	if (g.options) {
 		D("--- SPECIAL OPTIONS:%s%s%s%s%s\n",
 			g.options & OPT_PREFETCH ? " prefetch" : "",
@@ -1603,23 +1768,24 @@ main(int arc, char **argv)
 			g.options & OPT_INDIRECT ? " indirect" : "",
 			g.options & OPT_COPY ? " copy" : "");
 	}
-	
-	if (g.tx_rate == 0) {
-		g.tx_period.tv_sec = 0;
-		g.tx_period.tv_nsec = 0;
-	} else if (g.tx_rate == 1) {
-		g.tx_period.tv_sec = 1;
-		g.tx_period.tv_nsec = 0;
-	} else {
-		g.tx_period.tv_sec = 0;
+
+	g.tx_period.tv_sec = g.tx_period.tv_nsec = 0;
+	if (g.tx_rate > 0) {
+		/* try to have at least something every second,
+		 * reducing the burst size to 0.5s worth of data
+		 * (but no less than one full set of fragments)
+	 	 */
+		if (g.burst > g.tx_rate/2)
+			g.burst = g.tx_rate/2;
+		if (g.burst < g.frags)
+			g.burst = g.frags;
 		g.tx_period.tv_nsec = (1e9 / g.tx_rate) * g.burst;
-		if (g.tx_period.tv_nsec > 1000000000) {
-			g.tx_period.tv_sec = g.tx_period.tv_nsec / 1000000000;
-			g.tx_period.tv_nsec = g.tx_period.tv_nsec % 1000000000;
-		}
+		g.tx_period.tv_sec = g.tx_period.tv_nsec / 1000000000;
+		g.tx_period.tv_nsec = g.tx_period.tv_nsec % 1000000000;
 	}
-	D("Sending %d packets every  %d.%09d ns",
-			g.burst, (int)g.tx_period.tv_sec, (int)g.tx_period.tv_nsec);
+	if (g.td_body == sender_body)
+	    D("Sending %d packets every  %ld.%09ld s",
+			g.burst, g.tx_period.tv_sec, g.tx_period.tv_nsec);
 	/* Wait for PHY reset. */
 	D("Wait %d secs for phy reset", wait_link);
 	sleep(wait_link);
diff --git a/tools/tools/syscall_timing/syscall_timing.c b/tools/tools/syscall_timing/syscall_timing.c
index 175c1bc9bd6..52d3359f17c 100644
--- a/tools/tools/syscall_timing/syscall_timing.c
+++ b/tools/tools/syscall_timing/syscall_timing.c
@@ -192,7 +192,8 @@ test_pipe(uintmax_t num, uintmax_t int_arg, const char *path)
 uintmax_t
 test_socket_stream(uintmax_t num, uintmax_t int_arg, const char *path)
 {
-	uintmax_t i, so;
+	uintmax_t i;
+	int so;
 
 	so = socket(int_arg, SOCK_STREAM, 0);
 	if (so < 0)
@@ -214,7 +215,8 @@ test_socket_stream(uintmax_t num, uintmax_t int_arg, const char *path)
 uintmax_t
 test_socket_dgram(uintmax_t num, uintmax_t int_arg, const char *path)
 {
-	uintmax_t i, so;
+	uintmax_t i;
+	int so;
 
 	so = socket(int_arg, SOCK_DGRAM, 0);
 	if (so < 0)
@@ -408,7 +410,8 @@ test_dup(uintmax_t num, uintmax_t int_arg, const char *path)
 uintmax_t
 test_shmfd(uintmax_t num, uintmax_t int_arg, const char *path)
 {
-	uintmax_t i, shmfd;
+	uintmax_t i;
+	int shmfd;
 
 	shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600);
 	if (shmfd < 0)
@@ -431,7 +434,8 @@ uintmax_t
 test_fstat_shmfd(uintmax_t num, uintmax_t int_arg, const char *path)
 {
 	struct stat sb;
-	uintmax_t i, shmfd;
+	uintmax_t i;
+	int shmfd;
 
 	shmfd = shm_open(SHM_ANON, O_CREAT | O_RDWR, 0600);
 	if (shmfd < 0)
@@ -785,7 +789,7 @@ main(int argc, char *argv[])
 			    path);
 			timespecsub(&ts_end, &ts_start);
 			printf("%s\t%d\t", the_test->t_name, k);
-			printf("%ju.%09ju\t%d\t", (uintmax_t)ts_end.tv_sec,
+			printf("%ju.%09ju\t%ju\t", (uintmax_t)ts_end.tv_sec,
 			    (uintmax_t)ts_end.tv_nsec, calls);
 
 		/*
diff --git a/tools/tools/umastat/umastat.c b/tools/tools/umastat/umastat.c
index 758195ef323..77bc590f420 100644
--- a/tools/tools/umastat/umastat.c
+++ b/tools/tools/umastat/umastat.c
@@ -117,7 +117,9 @@ static const struct flaginfo {
 	u_int32_t	 fi_flag;
 	const char	*fi_name;
 } flaginfo[] = {
-	{ UMA_ZFLAG_PRIVALLOC, "privalloc" },
+	{ UMA_ZFLAG_MULTI, "multi" },
+	{ UMA_ZFLAG_DRAINING, "draining" },
+	{ UMA_ZFLAG_BUCKET, "bucket" },
 	{ UMA_ZFLAG_INTERNAL, "internal" },
 	{ UMA_ZFLAG_FULL, "full" },
 	{ UMA_ZFLAG_CACHEONLY, "cacheonly" },
@@ -133,6 +135,10 @@ static const struct flaginfo {
 	{ UMA_ZONE_SECONDARY, "secondary" },
 	{ UMA_ZONE_REFCNT, "refcnt" },
 	{ UMA_ZONE_MAXBUCKET, "maxbucket" },
+	{ UMA_ZONE_CACHESPREAD, "cachespread" },
+	{ UMA_ZONE_VTOSLAB, "vtoslab" },
+	{ UMA_ZONE_NODUMP, "nodump" },
+	{ UMA_ZONE_PCPU, "pcpu" },
 };
 static const int flaginfo_count = sizeof(flaginfo) / sizeof(struct flaginfo);
 
@@ -364,14 +370,15 @@ main(int argc, char *argv[])
 		}
 		printf("Keg {\n");
 
-		printf("  uk_recurse = %d\n", kz.uk_recurse);
 		uma_print_keg_align(&kz, "  ");
 		printf("  uk_pages = %d\n", kz.uk_pages);
 		printf("  uk_free = %d\n", kz.uk_free);
+		printf("  uk_reserve = %d\n", kz.uk_reserve);
 		printf("  uk_size = %d\n", kz.uk_size);
 		printf("  uk_rsize = %d\n", kz.uk_rsize);
 		printf("  uk_maxpages = %d\n", kz.uk_maxpages);
 
+		printf("  uk_slabsize = %d\n", kz.uk_slabsize);
 		printf("  uk_pgoff = %d\n", kz.uk_pgoff);
 		printf("  uk_ppera = %d\n", kz.uk_ppera);
 		printf("  uk_ipers = %d\n", kz.uk_ipers);
@@ -414,21 +421,18 @@ main(int argc, char *argv[])
 			}
 			printf("  Zone {\n");
 			printf("    uz_name = \"%s\";\n", name);
-			printf("    uz_allocs = %ju;\n",
+			printf("    uz_allocs = %lu;\n",
 			    uzp_userspace->uz_allocs);
-			printf("    uz_frees = %ju;\n",
+			printf("    uz_frees = %lu;\n",
 			    uzp_userspace->uz_frees);
-			printf("    uz_fails = %ju;\n",
+			printf("    uz_fails = %lu;\n",
 			    uzp_userspace->uz_fails);
-			printf("    uz_fills = %u;\n",
-			    uzp_userspace->uz_fills);
+			printf("    uz_sleeps = %ju;\n",
+			    uzp_userspace->uz_sleeps);
 			printf("    uz_count = %u;\n",
 			    uzp_userspace->uz_count);
 			uma_print_bucketlist(kvm, (void *)
-			    &uzp_userspace->uz_full_bucket, "uz_full_bucket",
-			    "    ");
-			uma_print_bucketlist(kvm, (void *)
-			    &uzp_userspace->uz_free_bucket, "uz_free_bucket",
+			    &uzp_userspace->uz_buckets, "uz_buckets",
 			    "    ");
 
 			if (!(kz.uk_flags & UMA_ZFLAG_INTERNAL)) {
diff --git a/tools/tools/vt/fontcvt/Makefile b/tools/tools/vt/fontcvt/Makefile
new file mode 100644
index 00000000000..06692d0fecc
--- /dev/null
+++ b/tools/tools/vt/fontcvt/Makefile
@@ -0,0 +1,6 @@
+PROG=	fontcvt
+MAN1=
+
+WARNS?=	6
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/vt/fontcvt/fontcvt.c b/tools/tools/vt/fontcvt/fontcvt.c
new file mode 100644
index 00000000000..714db5231a5
--- /dev/null
+++ b/tools/tools/vt/fontcvt/fontcvt.c
@@ -0,0 +1,385 @@
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten 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/endian.h>
+#include <sys/param.h>
+#include <sys/queue.h>
+
+#include <assert.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static unsigned int width, wbytes, height;
+
+struct glyph {
+	TAILQ_ENTRY(glyph)	 g_list;
+	uint8_t			*g_data;
+	unsigned int		 g_index;
+};
+
+static TAILQ_HEAD(, glyph) glyph_list = TAILQ_HEAD_INITIALIZER(glyph_list);
+static unsigned int glyph_total, glyph_normal, glyph_bold,
+    glyph_unique, glyph_dupe;
+
+struct mapping {
+	TAILQ_ENTRY(mapping)	 m_list;
+	unsigned int		 m_char;
+	unsigned int		 m_length;
+	struct glyph		*m_glyph;
+};
+
+TAILQ_HEAD(mapping_list, mapping);
+static struct mapping_list mapping_list_normal =
+    TAILQ_HEAD_INITIALIZER(mapping_list_normal);
+static struct mapping_list mapping_list_bold =
+    TAILQ_HEAD_INITIALIZER(mapping_list_bold);
+static unsigned int mapping_total, mapping_normal, mapping_normal_folded,
+    mapping_bold, mapping_bold_folded, mapping_unique, mapping_dupe;
+
+static void
+usage(void)
+{
+
+	fprintf(stderr,
+"usage: fontcvt width height normal.bdf bold.bdf out.fnt\n");
+	exit(1);
+}
+
+static int
+add_mapping(struct glyph *gl, unsigned int c, int bold)
+{
+	struct mapping *mp;
+	struct mapping_list *ml;
+
+	mapping_total++;
+
+	if (bold) {
+		int found = 0;
+
+		TAILQ_FOREACH(mp, &mapping_list_normal, m_list) {
+			if (mp->m_char < c)
+				continue;
+			else if (mp->m_char > c)
+				break;
+			found = 1;
+
+			/*
+			 * No mapping is needed if it's equal to the
+			 * normal mapping.
+			 */
+			if (mp->m_glyph == gl) {
+				mapping_dupe++;
+				return (0);
+			}
+		}
+
+		if (!found) {
+			fprintf(stderr,
+			    "Character %u not in normal font!\n", c);
+			return (1);
+		}
+	}
+
+	mp = malloc(sizeof *mp);
+	mp->m_char = c;
+	mp->m_glyph = gl;
+	mp->m_length = 0;
+
+	ml = bold ? &mapping_list_bold : &mapping_list_normal;
+	if (TAILQ_LAST(ml, mapping_list) != NULL &&
+	    TAILQ_LAST(ml, mapping_list)->m_char >= c) {
+		fprintf(stderr, "Bad ordering at character %u\n", c);
+		return (1);
+	}
+	TAILQ_INSERT_TAIL(ml, mp, m_list);
+
+	if (bold)
+		mapping_bold++;
+	else
+		mapping_normal++;
+	mapping_unique++;
+
+	return (0);
+}
+
+static struct glyph *
+add_glyph(const uint8_t *bytes, int bold, int fallback)
+{
+	struct glyph *gl;
+
+	glyph_total++;
+	if (bold)
+		glyph_bold++;
+	else
+		glyph_normal++;
+
+	TAILQ_FOREACH(gl, &glyph_list, g_list) {
+		if (memcmp(gl->g_data, bytes, wbytes * height) == 0) {
+			glyph_dupe++;
+			return (gl);
+		}
+	}
+
+	gl = malloc(sizeof *gl);
+	gl->g_data = malloc(wbytes * height);
+	memcpy(gl->g_data, bytes, wbytes * height);
+	if (fallback)
+		TAILQ_INSERT_HEAD(&glyph_list, gl, g_list);
+	else
+		TAILQ_INSERT_TAIL(&glyph_list, gl, g_list);
+
+	glyph_unique++;
+	return (gl);
+}
+
+static int
+parse_bdf(const char *filename, int bold __unused)
+{
+	FILE *fp;
+	char *ln;
+	size_t length;
+	uint8_t bytes[wbytes * height];
+	unsigned int curchar = 0, i, line;
+	struct glyph *gl;
+
+	fp = fopen(filename, "r");
+	if (fp == NULL) {
+		perror(filename);
+		return (1);
+	}
+
+	while ((ln = fgetln(fp, &length)) != NULL) {
+		ln[length - 1] = '\0';
+
+		if (strncmp(ln, "ENCODING ", 9) == 0) {
+			curchar = atoi(ln + 9);
+		}
+
+		if (strcmp(ln, "BITMAP") == 0) {
+			for (i = 0; i < height; i++) {
+				if ((ln = fgetln(fp, &length)) == NULL) {
+					fprintf(stderr, "Unexpected EOF!\n");
+					return (1);
+				}
+				ln[length - 1] = '\0';
+				sscanf(ln, "%x", &line);
+				if (wbytes == 1) {
+					bytes[i] = line;
+				} else if (wbytes == 2) {
+					bytes[i * 2 + 0] = line >> 8;
+					bytes[i * 2 + 1] = line;
+				} else {
+					fprintf(stderr,
+					    "Unsupported wbytes!\n");
+					return (1);
+				}
+			}
+
+			/* Prevent adding two glyphs for 0xFFFD */
+			if (curchar == 0xFFFD) {
+				if (!bold)
+					gl = add_glyph(bytes, bold, 1);
+			} else if (curchar >= 0x20) {
+				gl = add_glyph(bytes, bold, 0);
+				if (add_mapping(gl, curchar, bold) != 0)
+					return (1);
+			}
+		}
+	}
+
+	return (0);
+}
+
+static void
+number_glyphs(void)
+{
+	struct glyph *gl;
+	unsigned int idx = 0;
+
+	TAILQ_FOREACH(gl, &glyph_list, g_list)
+		gl->g_index = idx++;
+}
+
+static void
+write_glyphs(FILE *fp)
+{
+	struct glyph *gl;
+
+	TAILQ_FOREACH(gl, &glyph_list, g_list)
+		fwrite(gl->g_data, wbytes * height, 1, fp);
+}
+
+static void
+fold_mappings(int bold)
+{
+	struct mapping_list *ml;
+	struct mapping *mn, *mp, *mbase;
+
+	if (bold)
+		ml = &mapping_list_bold;
+	else
+		ml = &mapping_list_normal;
+
+	mp = mbase = TAILQ_FIRST(ml);
+	for (mp = mbase = TAILQ_FIRST(ml); mp != NULL; mp = mn) {
+		mn = TAILQ_NEXT(mp, m_list);
+		if (mn != NULL && mn->m_char == mp->m_char + 1 &&
+		    mn->m_glyph->g_index == mp->m_glyph->g_index + 1)
+			continue;
+		mbase->m_length = mp->m_char - mbase->m_char + 1;
+		mbase = mp = mn;
+		if (bold)
+			mapping_bold_folded++;
+		else
+			mapping_normal_folded++;
+	}
+}
+
+struct file_mapping {
+	uint32_t	source;
+	uint16_t	destination;
+	uint16_t	length;
+} __packed;
+
+static void
+write_mappings(FILE *fp, int bold)
+{
+	struct mapping_list *ml;
+	struct mapping *mp;
+	struct file_mapping fm;
+	unsigned int i = 0, j = 0;
+
+	if (bold)
+		ml = &mapping_list_bold;
+	else
+		ml = &mapping_list_normal;
+
+	TAILQ_FOREACH(mp, ml, m_list) {
+		j++;
+		if (mp->m_length > 0) {
+			i += mp->m_length;
+			fm.source = htobe32(mp->m_char);
+			fm.destination = htobe16(mp->m_glyph->g_index);
+			fm.length = htobe16(mp->m_length - 1);
+			fwrite(&fm, sizeof fm, 1, fp);
+		}
+	}
+	assert(i == j);
+}
+
+struct file_header {
+	uint8_t		magic[8];
+	uint8_t		width;
+	uint8_t		height;
+	uint16_t	nglyphs;
+	uint16_t	nmappings_normal;
+	uint16_t	nmappings_bold;
+} __packed;
+
+static int
+write_fnt(const char *filename)
+{
+	FILE *fp;
+	struct file_header fh = {
+		.magic = "VFNT 1.0",
+	};
+
+	fp = fopen(filename, "wb");
+	if (fp == NULL) {
+		perror(filename);
+		return (1);
+	}
+
+	fh.width = width;
+	fh.height = height;
+	fh.nglyphs = htobe16(glyph_unique);
+	fh.nmappings_normal = htobe16(mapping_normal_folded);
+	fh.nmappings_bold = htobe16(mapping_bold_folded);
+	fwrite(&fh, sizeof fh, 1, fp);
+	
+	write_glyphs(fp);
+	write_mappings(fp, 0);
+	write_mappings(fp, 1);
+
+	return (0);
+}
+
+int
+main(int argc, char *argv[])
+{
+
+	assert(sizeof(struct file_header) == 16);
+	assert(sizeof(struct file_mapping) == 8);
+
+	if (argc != 6)
+		usage();
+	
+	width = atoi(argv[1]);
+	wbytes = howmany(width, 8);
+	height = atoi(argv[2]);
+
+	if (parse_bdf(argv[3], 0) != 0)
+		return (1);
+	if (parse_bdf(argv[4], 1) != 0)
+		return (1);
+	number_glyphs();
+	fold_mappings(0);
+	fold_mappings(1);
+	if (write_fnt(argv[5]) != 0)
+		return (1);
+	
+	printf(
+"Statistics:\n"
+"- glyph_total:           %5u\n"
+"- glyph_normal:          %5u\n"
+"- glyph_bold:            %5u\n"
+"- glyph_unique:          %5u\n"
+"- glyph_dupe:            %5u\n"
+"- mapping_total:         %5u\n"
+"- mapping_normal:        %5u\n"
+"- mapping_normal_folded: %5u\n"
+"- mapping_bold:          %5u\n"
+"- mapping_bold_folded:   %5u\n"
+"- mapping_unique:        %5u\n"
+"- mapping_dupe:          %5u\n",
+	    glyph_total,
+	    glyph_normal, glyph_bold,
+	    glyph_unique, glyph_dupe,
+	    mapping_total,
+	    mapping_normal, mapping_normal_folded,
+	    mapping_bold, mapping_bold_folded,
+	    mapping_unique, mapping_dupe);
+	
+	return (0);
+}
diff --git a/tools/tools/vt/fontcvt/terminus.sh b/tools/tools/vt/fontcvt/terminus.sh
new file mode 100644
index 00000000000..260ee07bf8a
--- /dev/null
+++ b/tools/tools/vt/fontcvt/terminus.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+for i in 6:12 8:14 8:16 10:18 10:20 11:22 12:24 14:28 16:32
+do
+	C=`echo $i | cut -f 1 -d :`
+	R=`echo $i | cut -f 2 -d :`
+	./fontcvt \
+		$C $R \
+		~/terminus-font-4.36/ter-u${R}n.bdf \
+		~/terminus-font-4.36/ter-u${R}b.bdf \
+		terminus-u${R}.vfnt
+	gzip -9nf terminus-u${R}.vfnt
+done
diff --git a/tools/tools/vt/mkkfont/Makefile b/tools/tools/vt/mkkfont/Makefile
new file mode 100644
index 00000000000..d963d83680d
--- /dev/null
+++ b/tools/tools/vt/mkkfont/Makefile
@@ -0,0 +1,6 @@
+PROG=	mkkfont
+MAN1=
+
+WARNS?=	6
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/vt/mkkfont/mkkfont.c b/tools/tools/vt/mkkfont/mkkfont.c
new file mode 100644
index 00000000000..076dad23804
--- /dev/null
+++ b/tools/tools/vt/mkkfont/mkkfont.c
@@ -0,0 +1,181 @@
+/*-
+ * Copyright (c) 2009 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Schouten 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/endian.h>
+#include <sys/param.h>
+
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+struct file_mapping {
+	uint32_t	source;
+	uint16_t	destination;
+	uint16_t	length;
+} __packed;
+
+struct file_header {
+	uint8_t		magic[8];
+	uint8_t		width;
+	uint8_t		height;
+	uint16_t	nglyphs;
+	uint16_t	nmappings_normal;
+	uint16_t	nmappings_bold;
+} __packed;
+
+static int
+print_glyphs(struct file_header *fh)
+{
+	unsigned int gbytes, nglyphs, j, k, total;
+	uint8_t *gbuf;
+
+	gbytes = howmany(fh->width, 8) * fh->height;
+	nglyphs = be16toh(fh->nglyphs);
+
+	printf("\nstatic uint8_t font_bytes[%u * %u] = {", nglyphs, gbytes);
+	total = nglyphs * gbytes;
+	gbuf = malloc(total);
+
+	if (fread(gbuf, total, 1, stdin) != 1) {
+		perror("glyph");
+		return (1);
+	}
+
+	for (j = 0; j < total; j += 12) {
+		for (k = 0; k < 12 && k < total - j; k++) {
+			printf(k == 0 ? "\n\t" : " ");
+			printf("0x%02hhx,", gbuf[j + k]);
+		}
+	}
+
+	free(gbuf);
+	printf("\n};\n");
+
+	return (0);
+}
+
+static int
+print_mappings(struct file_header *fh, int bold)
+{
+	struct file_mapping fm;
+	const char *name;
+	unsigned int nmappings, i, col = 0;
+
+	if (bold) {
+		nmappings = be16toh(fh->nmappings_bold);
+		name = "bold";
+	} else {
+		nmappings = be16toh(fh->nmappings_normal);
+		name = "normal";
+	}
+
+	if (nmappings == 0)
+		return (0);
+
+	printf("\nstatic struct vt_font_map font_mapping_%s[%u] = {",
+	    name, nmappings);
+
+	for (i = 0; i < nmappings; i++) {
+		if (fread(&fm, sizeof fm, 1, stdin) != 1) {
+			perror("mapping");
+			return (1);
+		}
+
+		printf(col == 0 ? "\n\t" : " ");
+		printf("{ 0x%04x, 0x%04x, 0x%02x },",
+		    be32toh(fm.source), be16toh(fm.destination),
+		    be16toh(fm.length));
+		col = (col + 1) % 2;
+	}
+
+	printf("\n};\n");
+
+	return (0);
+}
+
+static int
+print_info(struct file_header *fh)
+{
+	unsigned int nnormal, nbold;
+
+	printf(
+	    "\nstruct vt_font vt_font_default = {\n"
+	    "\t.vf_width\t\t= %u,\n"
+	    "\t.vf_height\t\t= %u,\n"
+	    "\t.vf_bytes\t\t= font_bytes,\n",
+	    fh->width, fh->height);
+
+	nnormal = be16toh(fh->nmappings_normal);
+	nbold = be16toh(fh->nmappings_bold);
+
+	if (nnormal != 0)
+		printf(
+		    "\t.vf_normal\t\t= font_mapping_normal,\n"
+		    "\t.vf_normal_length\t= %u,\n", nnormal);
+	if (nbold != 0)
+		printf(
+		    "\t.vf_bold\t\t= font_mapping_bold,\n"
+		    "\t.vf_bold_length\t\t= %u,\n", nbold);
+	printf("\t.vf_refcount\t\t= 1,\n};\n");
+
+	return (0);
+}
+
+int
+main(int argc __unused, char *argv[] __unused)
+{
+	struct file_header fh;
+
+	if (fread(&fh, sizeof fh, 1, stdin) != 1) {
+		perror("file_header");
+		return (1);
+	}
+
+	if (memcmp(fh.magic, "VFNT 1.0", 8) != 0) {
+		fprintf(stderr, "Bad magic\n");
+		return (1);
+	}
+
+	printf("#include <dev/vt/vt.h>\n");
+
+	if (print_glyphs(&fh) != 0)
+		return (1);
+	if (print_mappings(&fh, 0) != 0)
+		return (1);
+	if (print_mappings(&fh, 1) != 0)
+		return (1);
+	if (print_info(&fh) != 0)
+		return (1);
+
+	return (0);
+}
diff --git a/tools/tools/vt/mkkfont/terminus.sh b/tools/tools/vt/mkkfont/terminus.sh
new file mode 100644
index 00000000000..2f5863ab9ee
--- /dev/null
+++ b/tools/tools/vt/mkkfont/terminus.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+for i in 12 14 16 20 22 24 28 32
+do
+	zcat ../fontcvt/terminus-u${i}.vfnt.gz | ./mkkfont > terminus-u${i}.c
+done
diff --git a/tools/tools/vt/setfont/Makefile b/tools/tools/vt/setfont/Makefile
new file mode 100644
index 00000000000..a242d519be2
--- /dev/null
+++ b/tools/tools/vt/setfont/Makefile
@@ -0,0 +1,6 @@
+PROG=	setfont
+MAN1=
+
+WARNS?=	6
+
+.include <bsd.prog.mk>
diff --git a/tools/tools/vt/setfont/setfont.c b/tools/tools/vt/setfont/setfont.c
new file mode 100644
index 00000000000..f76fe78ca8d
--- /dev/null
+++ b/tools/tools/vt/setfont/setfont.c
@@ -0,0 +1,85 @@
+#include <sys/consio.h>
+#include <sys/endian.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+struct file_header {
+	uint8_t		magic[8];
+	uint8_t		width;
+	uint8_t		height;
+	uint16_t	nglyphs;
+	uint16_t	nmappings_normal;
+	uint16_t	nmappings_bold;
+} __packed;
+
+static vfnt_map_t *
+load_mappingtable(unsigned int nmappings)
+{
+	vfnt_map_t *t;
+	unsigned int i;
+
+	if (nmappings == 0)
+		return (NULL);
+
+	t = malloc(sizeof *t * nmappings);
+
+	if (fread(t, sizeof *t * nmappings, 1, stdin) != 1) {
+		perror("mappings");
+		exit(1);
+	}
+
+	for (i = 0; i < nmappings; i++) {
+		t[i].src = be32toh(t[i].src);
+		t[i].dst = be16toh(t[i].dst);
+		t[i].len = be16toh(t[i].len);
+	}
+
+	return (t);
+}
+
+int
+main(int argc __unused, char *argv[] __unused)
+{
+	struct file_header fh;
+	static vfnt_t vfnt;
+	size_t glyphsize;
+
+	if (fread(&fh, sizeof fh, 1, stdin) != 1) {
+		perror("file_header");
+		return (1);
+	}
+
+	if (memcmp(fh.magic, "VFNT 1.0", 8) != 0) {
+		fprintf(stderr, "Bad magic\n");
+		return (1);
+	}
+
+	vfnt.nnormal = be16toh(fh.nmappings_normal);
+	vfnt.nbold = be16toh(fh.nmappings_bold);
+	vfnt.nglyphs = be16toh(fh.nglyphs);
+	vfnt.width = fh.width;
+	vfnt.height = fh.height;
+
+	glyphsize = howmany(vfnt.width, 8) * vfnt.height * vfnt.nglyphs;
+	vfnt.glyphs = malloc(glyphsize);
+
+	if (fread(vfnt.glyphs, glyphsize, 1, stdin) != 1) {
+		perror("glyphs");
+		return (1);
+	}
+
+	vfnt.normal = load_mappingtable(vfnt.nnormal);
+	vfnt.bold = load_mappingtable(vfnt.nbold);
+
+	if (ioctl(STDOUT_FILENO, PIO_VFONT, &vfnt) == -1) {
+		perror("PIO_VFONT");
+		return (1);
+	}
+
+	return (0);
+}
diff --git a/tools/tools/zfsboottest/Makefile b/tools/tools/zfsboottest/Makefile
index a04c78fa25e..a194a8384a2 100644
--- a/tools/tools/zfsboottest/Makefile
+++ b/tools/tools/zfsboottest/Makefile
@@ -16,7 +16,7 @@ CFLAGS=	-O1 \
 	-I. \
 	-fdiagnostics-show-option \
 	-W -Wextra -Wno-sign-compare -Wno-unused-parameter
-LDFLAGS+=-lmd
+LDADD+=	-lmd
 
 .if ${MACHINE_CPUARCH} == "amd64"
 beforedepend zfsboottest.o: machine
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 92958ae55f1..0a6145bc6d4 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -160,6 +160,7 @@ SUBDIR=	alias \
 	tar \
 	tcopy \
 	tee \
+	${_tests} \
 	tftp \
 	time \
 	tip \
@@ -210,10 +211,6 @@ SUBDIR=	alias \
 SUBDIR+=	at
 .endif
 
-.if ${MK_ATF} != "no"
-_atf=		atf
-.endif
-
 .if ${MK_ATM} != "no"
 SUBDIR+=	atm
 .endif
@@ -332,6 +329,11 @@ SUBDIR+=	vacation
 SUBDIR+=	telnet
 .endif
 
+.if ${MK_TESTS} != "no"
+_atf=		atf
+_tests=		tests
+.endif
+
 .if ${MK_TEXTPROC} != "no"
 SUBDIR+=	checknr
 SUBDIR+=	colcrt
diff --git a/usr.bin/atf/Makefile b/usr.bin/atf/Makefile
index 77d3299645e..054cdf2ac21 100644
--- a/usr.bin/atf/Makefile
+++ b/usr.bin/atf/Makefile
@@ -25,10 +25,6 @@
 #
 # $FreeBSD$
 
-SUBDIR=	atf-config \
-	atf-report \
-	atf-run \
-	atf-sh \
-	atf-version
+SUBDIR=	atf-sh tests
 
 .include <bsd.subdir.mk>
diff --git a/usr.bin/atf/Makefile.inc b/usr.bin/atf/Makefile.inc
index 0b2188bd1de..a79cd6defdc 100644
--- a/usr.bin/atf/Makefile.inc
+++ b/usr.bin/atf/Makefile.inc
@@ -1,8 +1,4 @@
 # $FreeBSD$
 
-ATF=		${.CURDIR}/../../../contrib/atf
-
-CFLAGS+=	-DGDB=\"gdb\"
-
 BINDIR?=	/usr/bin
 WARNS?=		3
diff --git a/usr.bin/atf/atf-config/Makefile b/usr.bin/atf/atf-config/Makefile
deleted file mode 100644
index d84ed11b0b0..00000000000
--- a/usr.bin/atf/atf-config/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#-
-# Copyright (c) 2011 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:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this 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 <bsd.init.mk>
-
-.PATH:		${ATF}/atf-config
-
-PROG_CXX=	atf-config
-SRCS=		atf-config.cpp
-MAN=		atf-config.1
-
-CFLAGS+=	-DHAVE_CONFIG_H
-CFLAGS+=	-I${ATF}
-
-DPADD+=		${LIBATF_C} ${LIBATF_CXX}
-LDADD+=		-latf-c++ -latf-c
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/atf/atf-report/Makefile b/usr.bin/atf/atf-report/Makefile
deleted file mode 100644
index 0b1e8d2ae84..00000000000
--- a/usr.bin/atf/atf-report/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#-
-# Copyright (c) 2011 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:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this 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 <bsd.init.mk>
-
-.PATH:		${ATF}/atf-report
-
-PROG_CXX=	atf-report
-SRCS=		atf-report.cpp reader.cpp
-MAN=		atf-report.1
-
-CFLAGS+=	-DHAVE_CONFIG_H
-CFLAGS+=	-I${ATF}
-
-DPADD+=		${LIBATF_C} ${LIBATF_CXX}
-LDADD+=		-latf-c++ -latf-c
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/atf/atf-run/Makefile b/usr.bin/atf/atf-run/Makefile
deleted file mode 100644
index d33cae178da..00000000000
--- a/usr.bin/atf/atf-run/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#-
-# Copyright (c) 2011 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:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this 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 <bsd.init.mk>
-
-.PATH:		${ATF}/atf-run
-
-PROG_CXX=	atf-run
-SRCS=		atf-run.cpp atffile.cpp config.cpp fs.cpp io.cpp requirements.cpp \
-		signals.cpp test-program.cpp timer.cpp user.cpp
-MAN=		atf-run.1
-
-CFLAGS+=	-DHAVE_CONFIG_H
-CFLAGS+=	-I${ATF}
-CFLAGS+=	-I${.CURDIR}/../../lib/libatf-c
-
-DPADD+=		${LIBATF_C} ${LIBATF_CXX}
-LDADD+=		-latf-c++ -latf-c
-
-.include <bsd.prog.mk>
diff --git a/usr.bin/atf/atf-sh/Makefile b/usr.bin/atf/atf-sh/Makefile
index 81120984316..1688b191f5c 100644
--- a/usr.bin/atf/atf-sh/Makefile
+++ b/usr.bin/atf/atf-sh/Makefile
@@ -27,6 +27,7 @@
 
 .include <bsd.init.mk>
 
+ATF=		${.CURDIR:H:H:H}/contrib/atf
 .PATH:		${ATF}/atf-sh
 
 PROG_CXX=	atf-sh
@@ -44,4 +45,8 @@ FILESGROUPS=	SUBR
 SUBRDIR=	${SHAREDIR}/atf
 SUBR=		libatf-sh.subr
 
+.if ${MK_TESTS} != "no"
+SUBDIR+=	tests
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/atf/atf-sh/tests/Makefile b/usr.bin/atf/atf-sh/tests/Makefile
new file mode 100644
index 00000000000..664f25ab645
--- /dev/null
+++ b/usr.bin/atf/atf-sh/tests/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+.include <bsd.init.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/atf/atf-sh
+
+ATF=		${.CURDIR:H:H:H:H}/contrib/atf
+.PATH:		${ATF}/atf-sh
+
+ATF_TESTS_SH+=	atf_check_test
+ATF_TESTS_SH+=	config_test
+ATF_TESTS_SH+=	integration_test
+ATF_TESTS_SH+=	misc_helpers
+ATF_TESTS_SH+=	normalize_test
+ATF_TESTS_SH+=	tc_test
+ATF_TESTS_SH+=	tp_test
+
+.include <atf.test.mk>
diff --git a/usr.bin/atf/tests/Makefile b/usr.bin/atf/tests/Makefile
new file mode 100644
index 00000000000..3ff9f93f2de
--- /dev/null
+++ b/usr.bin/atf/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin/atf
+
+.PATH:		${.CURDIR:H:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/usr.bin/bc/bc.1 b/usr.bin/bc/bc.1
index 4f071e00c59..0592acda0d6 100644
--- a/usr.bin/bc/bc.1
+++ b/usr.bin/bc/bc.1
@@ -35,7 +35,7 @@
 .\"
 .\"	@(#)bc.1	6.8 (Berkeley) 8/8/91
 .\"
-.Dd January 22, 2010
+.Dd December 6, 2013
 .Dt BC 1
 .Os
 .Sh NAME
@@ -43,7 +43,7 @@
 .Nd arbitrary-precision arithmetic language and calculator
 .Sh SYNOPSIS
 .Nm bc
-.Op Fl chlqv
+.Op Fl chlv
 .Op Fl e Ar expression
 .Op Ar file ...
 .Sh DESCRIPTION
@@ -349,6 +349,14 @@ math library, read when the
 .Fl l
 option is specified on the command line.
 .El
+.Sh COMPATIBILITY
+The
+.Fl q
+and
+.Fl Fl quiet
+options are no-ops for compatibility with some other implementations of
+.Nm
+and their use is discouraged.
 .Sh SEE ALSO
 .Xr dc 1
 .Pp
diff --git a/usr.bin/bc/bc.y b/usr.bin/bc/bc.y
index a802f5a3ef2..a819e3f51f0 100644
--- a/usr.bin/bc/bc.y
+++ b/usr.bin/bc/bc.y
@@ -1023,7 +1023,7 @@ static void
 usage(void)
 {
 
-	fprintf(stderr, "usage: %s [-chlqv] [-e expression] [file ...]\n",
+	fprintf(stderr, "usage: %s [-chlv] [-e expression] [file ...]\n",
 	    __progname);
 	exit(1);
 }
diff --git a/usr.bin/calendar/calcpp.c b/usr.bin/calendar/calcpp.c
index 6e3b3398b0a..413739b361f 100644
--- a/usr.bin/calendar/calcpp.c
+++ b/usr.bin/calendar/calcpp.c
@@ -155,8 +155,11 @@ tokenscpp(char *buf, char *string)
 			s = p+1;
 			if ((p = strchr(s, '>')) != NULL)
 				*p = '\0';
-			snprintf (string, MAXPATHLEN, "%s/%s",
-				_PATH_INCLUDE, s);
+			if (*s != '/')
+				snprintf (string, MAXPATHLEN, "%s/%s",
+					_PATH_INCLUDE, s);
+			else
+				strncpy(string, s, MAXPATHLEN);
 		} else if (*p == '(') {
 			s = p+1;
 			if ((p = strchr(p, '>')) != NULL)
diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd
index 4222d7b9a94..c3f099ee02c 100644
--- a/usr.bin/calendar/calendars/calendar.freebsd
+++ b/usr.bin/calendar/calendars/calendar.freebsd
@@ -132,6 +132,7 @@
 04/14	Crist J. Clark <cjc@FreeBSD.org> born in Milwaukee, Wisconsin, United States, 1970
 04/14	Glen J. Barber <gjb@FreeBSD.org> born in Wilkes-Barre, Pennsylvania, United States, 1981
 04/15	David Malone <dwmalone@FreeBSD.org> born in Dublin, Ireland, 1973
+04/17	Alexey Degtyarev <alexey@FreeBSD.org> born in Ahtubinsk, Russian Federation, 1984
 04/17	Dryice Liu <dryice@FreeBSD.org> born in Jinan, Shandong, China, 1975
 04/22	Joerg Wunsch <joerg@FreeBSD.org> born in Dresden, Sachsen, Germany, 1962
 04/22	Jun Kuriyama <kuriyama@FreeBSD.org> born in Matsue, Shimane, Japan, 1973
@@ -252,6 +253,7 @@
 08/06	Damjan Marion <dmarion@FreeBSD.org> born in Rijeka, Croatia, 1978
 08/07	Jonathan Mini <mini@FreeBSD.org> born in San Mateo, California, United States, 1979
 08/08	Mikolaj Golub <trociny@FreeBSD.org> born in Kharkov, USSR, 1977
+08/10	Julio Merino <jmmv@FreeBSD.org> born in Barcelona, Spain, 1984
 08/10	Peter Pentchev <roam@FreeBSD.org> born in Sofia, Bulgaria, 1977
 08/12	Joe Marcus Clarke <marcus@FreeBSD.org> born in Lakeland, Florida, United States, 1976
 08/12	Max Brazhnikov <makc@FreeBSD.org> born in Leningradskaya, Russian Federation, 1979
@@ -340,6 +342,7 @@
 11/19	Konstantin Belousov <kib@FreeBSD.org> born in Kiev, USSR, 1972
 11/20	Dmitry Morozovsky <marck@FreeBSD.org> born in Moscow, USSR, 1968
 11/20	Gavin Atkinson <gavin@FreeBSD.org> born in Middlesbrough, United Kingdom, 1979
+11/21	Mark Johnston <markj@FreeBSD.org> born in Toronto, Ontario, Canada, 1989
 11/22	Frederic Culot <culot@FreeBSD.org> born in Saint-Germain-En-Laye, France, 1976
 11/23	Josef Lawrence Karthauser <joe@FreeBSD.org> born in Pembury, Kent, United Kingdom, 1972
 11/24	Andrey Zakhvatov <andy@FreeBSD.org> born in Chelyabinsk, Russian Federation, 1974
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 7646190e118..142bd3ece24 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -31,7 +31,7 @@
 .\"     @(#)cmp.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd December 19, 2006
+.Dd November 18, 2013
 .Dt CMP 1
 .Os
 .Sh NAME
@@ -115,6 +115,12 @@ The
 utility is expected to be
 .St -p1003.2
 compatible.
+The
+.Fl h ,
+.Fl x ,
+and
+.Fl z
+options are extensions to the standard.
 .Sh HISTORY
 A
 .Nm
diff --git a/usr.bin/dtc/fdt.cc b/usr.bin/dtc/fdt.cc
index eb944fca2cc..7810c0d3c7a 100644
--- a/usr.bin/dtc/fdt.cc
+++ b/usr.bin/dtc/fdt.cc
@@ -1190,7 +1190,7 @@ device_tree::write_dts(int fd)
 		for (std::vector<reservation>::iterator i=reservations.begin(),
 		     e=reservations.end() ; i!=e ; ++i)
 		{
-			fprintf(stderr, " %" PRIx64 " %" PRIx64, i->first, i->second);
+			fprintf(file, " %" PRIx64 " %" PRIx64, i->first, i->second);
 		}
 		fputs(";\n\n", file);
 	}
diff --git a/usr.bin/from/from.c b/usr.bin/from/from.c
index 7bf7271e06f..226270359dc 100644
--- a/usr.bin/from/from.c
+++ b/usr.bin/from/from.c
@@ -51,7 +51,7 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
-int match(const char *, const char *);
+static int match(const char *, const char *);
 static void usage(void);
 
 int
@@ -81,8 +81,7 @@ main(int argc, char **argv)
 		case 's':
 			sender = optarg;
 			for (p = sender; *p; ++p)
-				if (isupper(*p))
-					*p = tolower(*p);
+				*p = tolower(*p);
 			break;
 		case '?':
 		default:
@@ -142,7 +141,7 @@ usage(void)
 	exit(1);
 }
 
-int
+static int
 match(const char *line, const char *sender)
 {
 	char ch, pch, first;
@@ -152,15 +151,14 @@ match(const char *line, const char *sender)
 		if (isspace(ch = *line))
 			return(0);
 		++line;
-		if (isupper(ch))
-			ch = tolower(ch);
+		ch = tolower(ch);
 		if (ch != first)
 			continue;
 		for (p = sender, t = line;;) {
 			if (!(pch = *p++))
 				return(1);
-			if (isupper(ch = *t++))
-				ch = tolower(ch);
+			ch = tolower(*t);
+			t++;
 			if (ch != pch)
 				break;
 		}
diff --git a/usr.bin/iscsictl/iscsictl.8 b/usr.bin/iscsictl/iscsictl.8
index 03525df1238..cb2f2cc0e0a 100644
--- a/usr.bin/iscsictl/iscsictl.8
+++ b/usr.bin/iscsictl/iscsictl.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 20, 2012
+.Dd October 30, 2013
 .Dt ISCSICTL 8
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Sh SYNOPSIS
 .Nm
 .Fl A
-.Fl h Ar host Fl t Ar target Op Fl u Ar user Fl s Ar secret
+.Fl p Ar portal Fl t Ar target Op Fl u Ar user Fl s Ar secret
 .Nm
 .Fl A
 .Fl d Ar discovery-host Op Fl u Ar user Fl s Ar secret
@@ -48,7 +48,7 @@
 .Fl n Ar nickname Op Fl c Ar path
 .Nm
 .Fl R
-.Op Fl h Ar host
+.Op Fl p Ar portal
 .Op Fl t Ar target
 .Nm
 .Fl R
@@ -84,10 +84,10 @@ Target host name or address used for SendTargets discovery.
 When used, it will add a temporary discovery session.
 After discovery is done, sessions will be added for each discovered target,
 and the temporary discovery sesion will be removed.
-.It Fl h
-Target host name or address for statically defined targets.
 .It Fl n
 The "nickname" of session defined in the configuration file.
+.It Fl p
+Target portal - host name or address - for statically defined targets.
 .It Fl t
 Target name.
 .It Fl v
@@ -133,7 +133,7 @@ The
 utility exits 0 on success, and >0 if an error occurs.
 .Sh EXAMPLES
 Attach to target qn.2012-06.com.example:target0, served by 192.168.1.1:
-.Dl Nm Fl A Fl t Ar qn.2012-06.com.example:target0 Fl h Ar 192.168.1.1
+.Dl Nm Fl A Fl t Ar qn.2012-06.com.example:target0 Fl p Ar 192.168.1.1
 .Pp
 Disconnect all iSCSI sessions:
 .Dl Nm Fl Ra
diff --git a/usr.bin/iscsictl/iscsictl.c b/usr.bin/iscsictl/iscsictl.c
index 1088d69f03e..66b9803e947 100644
--- a/usr.bin/iscsictl/iscsictl.c
+++ b/usr.bin/iscsictl/iscsictl.c
@@ -410,48 +410,48 @@ kernel_list(int iscsi_fd, const struct target *targ __unused,
 			state = &states[i];
 			conf = &state->iss_conf;
 
-			printf("Session ID:      %d\n", state->iss_id);
-			printf("Initiator name:  %s\n", conf->isc_initiator);
-			printf("Initiator addr:  %s\n",
+			printf("Session ID:       %d\n", state->iss_id);
+			printf("Initiator name:   %s\n", conf->isc_initiator);
+			printf("Initiator portal: %s\n",
 			    conf->isc_initiator_addr);
-			printf("Initiator alias: %s\n",
+			printf("Initiator alias:  %s\n",
 			    conf->isc_initiator_alias);
-			printf("Target name:     %s\n", conf->isc_target);
-			printf("Target addr:     %s\n",
+			printf("Target name:      %s\n", conf->isc_target);
+			printf("Target portal:    %s\n",
 			    conf->isc_target_addr);
-			printf("Target alias:    %s\n",
+			printf("Target alias:     %s\n",
 			    state->iss_target_alias);
-			printf("User:            %s\n", conf->isc_user);
-			printf("Secret:          %s\n", conf->isc_secret);
-			printf("Mutual user:     %s\n",
+			printf("User:             %s\n", conf->isc_user);
+			printf("Secret:           %s\n", conf->isc_secret);
+			printf("Mutual user:      %s\n",
 			    conf->isc_mutual_user);
-			printf("Mutual secret:   %s\n",
+			printf("Mutual secret:    %s\n",
 			    conf->isc_mutual_secret);
-			printf("Session type:    %s\n",
+			printf("Session type:     %s\n",
 			    conf->isc_discovery ? "Discovery" : "Normal");
-			printf("Session state:   %s\n",
+			printf("Session state:    %s\n",
 			    state->iss_connected ?
 			    "Connected" : "Disconnected");
-			printf("Failure reason:  %s\n", state->iss_reason);
-			printf("Header digest:   %s\n",
+			printf("Failure reason:   %s\n", state->iss_reason);
+			printf("Header digest:    %s\n",
 			    state->iss_header_digest == ISCSI_DIGEST_CRC32C ?
 			    "CRC32C" : "None");
-			printf("Data digest:     %s\n",
+			printf("Data digest:      %s\n",
 			    state->iss_data_digest == ISCSI_DIGEST_CRC32C ?
 			    "CRC32C" : "None");
-			printf("DataSegmentLen:  %d\n",
+			printf("DataSegmentLen:   %d\n",
 			    state->iss_max_data_segment_length);
-			printf("ImmediateData:   %s\n",
+			printf("ImmediateData:    %s\n",
 			    state->iss_immediate_data ? "Yes" : "No");
-			printf("iSER (RDMA):     %s\n",
+			printf("iSER (RDMA):      %s\n",
 			    conf->isc_iser ? "Yes" : "No");
-			printf("Device nodes:	 ");
+			printf("Device nodes:     ");
 			print_periphs(state->iss_id);
 			printf("\n\n");
 		}
 	} else {
 		printf("%-36s %-16s %s\n",
-		    "Target name", "Target addr", "State");
+		    "Target name", "Target portal", "State");
 		for (i = 0; i < isl.isl_nentries; i++) {
 			state = &states[i];
 			conf = &state->iss_conf;
@@ -483,13 +483,13 @@ static void
 usage(void)
 {
 
-	fprintf(stderr, "usage: iscsictl -A -h host -t target "
+	fprintf(stderr, "usage: iscsictl -A -p portal -t target "
 	    "[-u user -s secret]\n");
 	fprintf(stderr, "       iscsictl -A -d discovery-host "
 	    "[-u user -s secret]\n");
 	fprintf(stderr, "       iscsictl -A -a [-c path]\n");
 	fprintf(stderr, "       iscsictl -A -n nickname [-c path]\n");
-	fprintf(stderr, "       iscsictl -R [-h host] [-t target]\n");
+	fprintf(stderr, "       iscsictl -R [-p portal] [-t target]\n");
 	fprintf(stderr, "       iscsictl -R -a\n");
 	fprintf(stderr, "       iscsictl -R -n nickname [-c path]\n");
 	fprintf(stderr, "       iscsictl -L [-v]\n");
@@ -519,7 +519,7 @@ main(int argc, char **argv)
 	struct conf *conf;
 	struct target *targ;
 
-	while ((ch = getopt(argc, argv, "ARLac:d:n:h:t:u:s:v")) != -1) {
+	while ((ch = getopt(argc, argv, "ARLac:d:n:p:t:u:s:v")) != -1) {
 		switch (ch) {
 		case 'A':
 			Aflag = 1;
@@ -542,7 +542,7 @@ main(int argc, char **argv)
 		case 'n':
 			nickname = optarg;
 			break;
-		case 'h':
+		case 'p':
 			host = optarg;
 			break;
 		case 't':
@@ -579,7 +579,7 @@ main(int argc, char **argv)
 	if (Aflag != 0) {
 		if (aflag != 0) {
 			if (host != NULL)
-				errx(1, "-a and -h and mutually exclusive");
+				errx(1, "-a and -p and mutually exclusive");
 			if (target != NULL)
 				errx(1, "-a and -t and mutually exclusive");
 			if (user != NULL)
@@ -592,7 +592,7 @@ main(int argc, char **argv)
 				errx(1, "-a and -d and mutually exclusive");
 		} else if (nickname != NULL) {
 			if (host != NULL)
-				errx(1, "-n and -h and mutually exclusive");
+				errx(1, "-n and -p and mutually exclusive");
 			if (target != NULL)
 				errx(1, "-n and -t and mutually exclusive");
 			if (user != NULL)
@@ -603,17 +603,17 @@ main(int argc, char **argv)
 				errx(1, "-n and -d and mutually exclusive");
 		} else if (discovery_host != NULL) {
 			if (host != NULL)
-				errx(1, "-d and -h and mutually exclusive");
+				errx(1, "-d and -p and mutually exclusive");
 			if (target != NULL)
 				errx(1, "-d and -t and mutually exclusive");
 		} else {
 			if (target == NULL && host == NULL)
-				errx(1, "must specify -a, -n or -t/-h");
+				errx(1, "must specify -a, -n or -t/-p");
 
 			if (target != NULL && host == NULL)
-				errx(1, "-t must always be used with -h");
+				errx(1, "-t must always be used with -p");
 			if (host != NULL && target == NULL)
-				errx(1, "-h must always be used with -t");
+				errx(1, "-p must always be used with -t");
 		}
 
 		if (user != NULL && secret == NULL)
@@ -634,24 +634,24 @@ main(int argc, char **argv)
 
 		if (aflag != 0) {
 			if (host != NULL)
-				errx(1, "-a and -h and mutually exclusive");
+				errx(1, "-a and -p and mutually exclusive");
 			if (target != NULL)
 				errx(1, "-a and -t and mutually exclusive");
 			if (nickname != NULL)
 				errx(1, "-a and -n and mutually exclusive");
 		} else if (nickname != NULL) {
 			if (host != NULL)
-				errx(1, "-n and -h and mutually exclusive");
+				errx(1, "-n and -p and mutually exclusive");
 			if (target != NULL)
 				errx(1, "-n and -t and mutually exclusive");
 		} else if (host != NULL) {
 			if (target != NULL)
-				errx(1, "-h and -t and mutually exclusive");
+				errx(1, "-p and -t and mutually exclusive");
 		} else if (target != NULL) {
 			if (host != NULL)
-				errx(1, "-t and -h and mutually exclusive");
+				errx(1, "-t and -p and mutually exclusive");
 		} else
-			errx(1, "must specify either-a, -n, -t, or -h");
+			errx(1, "must specify either -a, -n, -t, or -p");
 
 		if (vflag != 0)
 			errx(1, "-v cannot be used with -R");
@@ -660,7 +660,7 @@ main(int argc, char **argv)
 		assert(Lflag != 0);
 
 		if (host != NULL)
-			errx(1, "-L and -h and mutually exclusive");
+			errx(1, "-L and -p and mutually exclusive");
 		if (target != NULL)
 			errx(1, "-L and -t and mutually exclusive");
 		if (user != NULL)
diff --git a/usr.bin/kdump/kdump.c b/usr.bin/kdump/kdump.c
index e3e6927510c..24bb0fd34e0 100644
--- a/usr.bin/kdump/kdump.c
+++ b/usr.bin/kdump/kdump.c
@@ -1655,10 +1655,15 @@ ktrstat(struct stat *statp)
 	 * buffer exactly sizeof(struct stat) bytes long.
 	 */
 	printf("struct stat {");
-	strmode(statp->st_mode, mode);
-	printf("dev=%ju, ino=%ju, mode=%s, nlink=%ju, ",
-		(uintmax_t)statp->st_dev, (uintmax_t)statp->st_ino, mode,
-		(uintmax_t)statp->st_nlink);
+	printf("dev=%ju, ino=%ju, ",
+		(uintmax_t)statp->st_dev, (uintmax_t)statp->st_ino);
+	if (resolv == 0)
+		printf("mode=0%jo, ", (uintmax_t)statp->st_mode);
+	else {
+		strmode(statp->st_mode, mode);
+		printf("mode=%s, ", mode);
+	}
+	printf("nlink=%ju, ", (uintmax_t)statp->st_nlink);
 	if (resolv == 0 || (pwd = getpwuid(statp->st_uid)) == NULL)
 		printf("uid=%ju, ", (uintmax_t)statp->st_uid);
 	else
diff --git a/usr.bin/limits/limits.1 b/usr.bin/limits/limits.1
index 26e8929374f..3962feff194 100644
--- a/usr.bin/limits/limits.1
+++ b/usr.bin/limits/limits.1
@@ -19,7 +19,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 23, 2012
+.Dd November 1, 2013
 .Dt LIMITS 1
 .Os
 .Sh NAME
@@ -30,11 +30,11 @@
 .Op Fl C Ar class | Fl P Ar pid | Fl U Ar user
 .Op Fl SHB
 .Op Fl ea
-.Op Fl bcdflmnstuvpw Op Ar val
+.Op Fl bcdfklmnstuvpw Op Ar val
 .Nm
 .Op Fl C Ar class | Fl U Ar user
 .Op Fl SHB
-.Op Fl bcdflmnstuvpw Op Ar val
+.Op Fl bcdfklmnstuvpw Op Ar val
 .Op Fl E
 .Oo
 .Op Ar name Ns = Ns Ar value ...
@@ -87,9 +87,6 @@ Like the previous usage, it outputs these values to standard
 output, except that it will emit them in
 .Ic eval
 format, suitable for the calling shell.
-The calling shell is determined by examining the entries in the
-.Pa /proc
-file system for the parent process.
 If the shell is known (i.e., it is one of
 .Nm sh , csh , bash , tcsh , ksh , pdksh
 or
@@ -210,6 +207,10 @@ resource limit.
 Select or set the
 .Va filesize
 resource limit.
+.It Fl k Op Ar val
+Select or set the
+.Va kqueues
+resource limit.
 .It Fl l Op Ar val
 Select or set the
 .Va memorylocked
@@ -386,21 +387,6 @@ utility does not handle commands with equal
 signs in their
 names, for obvious reasons.
 .Pp
-When eval output is selected, the
-.Pa /proc
-file system must be installed
-and mounted for the shell to be correctly determined, and therefore
-output syntax correct for the running shell.
-The default output is valid for
-.Xr sh 1 ,
-so this means that any
-usage of
-.Nm
-in eval mode prior mounting
-.Pa /proc
-may only occur in standard bourne
-shell scripts.
-.Pp
 The
 .Nm
 utility makes no effort to ensure that resource settings emitted or displayed
diff --git a/usr.bin/limits/limits.c b/usr.bin/limits/limits.c
index 3c5fd6de310..28b09ca0a62 100644
--- a/usr.bin/limits/limits.c
+++ b/usr.bin/limits/limits.c
@@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
+#include <sys/user.h>
 #include <sys/param.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -89,7 +90,8 @@ static struct {
 	  { "  sbsize%-4s           %8s", " bytes\n", 1    },
 	  { "  vmemoryuse%-4s       %8s", " kB\n",    1024 },
 	  { "  pseudo-terminals%-4s %8s", "\n",       1    },
-	  { "  swapuse%-4s          %8s", " kB\n",    1024 }
+	  { "  swapuse%-4s          %8s", " kB\n",    1024 },
+	  { "  kqueues%-4s          %8s", "\n",       1    },
       }
     },
     { "sh", "unlimited", "", " -H", " -S", "",
@@ -106,7 +108,8 @@ static struct {
 	  { "ulimit%s -b %s", ";\n",  1    },
 	  { "ulimit%s -v %s", ";\n",  1024 },
 	  { "ulimit%s -p %s", ";\n",  1    },
-	  { "ulimit%s -w %s", ";\n",  1024 }
+	  { "ulimit%s -w %s", ";\n",  1024 },
+	  { "ulimit%s -k %s", ";\n",  1    },
       }
     },
     { "csh", "unlimited", "", " -h", "", NULL,
@@ -123,7 +126,8 @@ static struct {
 	  { "limit%s sbsize %s",          ";\n",  1    },
 	  { "limit%s vmemoryuse %s",      ";\n",  1024 },
 	  { "limit%s pseudoterminals %s", ";\n",  1    },
-	  { "limit%s swapuse %s",         ";\n",  1024 }
+	  { "limit%s swapsize %s",        ";\n",  1024 },
+	  { "limit%s kqueues %s",         ";\n",  1    },
       }
     },
     { "bash|bash2", "unlimited", "", " -H", " -S", "",
@@ -157,7 +161,8 @@ static struct {
 	  { "limit%s sbsize %s",          ";\n",  1    },
 	  { "limit%s vmemoryuse %s",      ";\n",  1024 },
 	  { "limit%s pseudoterminals %s", ";\n",  1    },
-	  { "limit%s swapuse %s",         ";\n",  1024 }
+	  { "limit%s swapsize %s",        ";\n",  1024 },
+	  { "limit%s kqueues %s",         ";\n",  1    },
       }
     },
     { "ksh|pdksh", "unlimited", "", " -H", " -S", "",
@@ -232,7 +237,8 @@ static struct {
     { "sbsize",		login_getcapsize },
     { "vmemoryuse",	login_getcapsize },
     { "pseudoterminals",login_getcapnum  },
-    { "swapuse",	login_getcapsize }
+    { "swapuse",	login_getcapsize },
+    { "kqueues",	login_getcapnum  },
 };
 
 /*
@@ -243,7 +249,7 @@ static struct {
  * to be modified accordingly!
  */
 
-#define RCS_STRING  "tfdscmlunbvpw"
+#define RCS_STRING  "tfdscmlunbvpwk"
 
 static rlim_t resource_num(int which, int ch, const char *str);
 static void usage(void);
@@ -282,7 +288,8 @@ main(int argc, char *argv[])
 
     pid = -1;
     optarg = NULL;
-    while ((ch = getopt(argc, argv, ":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:")) != -1) {
+    while ((ch = getopt(argc, argv,
+      ":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:k:")) != -1) {
 	switch(ch) {
 	case 'a':
 	    doall = 1;
@@ -539,7 +546,7 @@ usage(void)
 {
     (void)fprintf(stderr,
 	"usage: limits [-C class|-P pid|-U user] [-eaSHBE] "
-	"[-bcdflmnstuvpw [val]] [[name=val ...] cmd]\n");
+	"[-bcdflmnstuvpwk [val]] [[name=val ...] cmd]\n");
     exit(EXIT_FAILURE);
 }
 
@@ -647,6 +654,7 @@ resource_num(int which, int ch, const char *str)
 	case RLIMIT_NPROC:
 	case RLIMIT_NOFILE:
 	case RLIMIT_NPTS:
+	case RLIMIT_KQUEUES:
 	    res = strtoq(s, &e, 0);
 	    s = e;
 	    break;
@@ -698,27 +706,32 @@ getshelltype(void)
     pid_t ppid = getppid();
 
     if (ppid != 1) {
-	FILE * fp;
+	struct kinfo_proc kp;
 	struct stat st;
-	char procdir[MAXPATHLEN], buf[128];
-	int l = sprintf(procdir, "/proc/%ld/", (long)ppid);
+	char path[MAXPATHLEN];
 	char * shell = getenv("SHELL");
+	int mib[4];
+	size_t len;
+
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_PROC;
+	mib[3] = ppid;
 
 	if (shell != NULL && stat(shell, &st) != -1) {
 	    struct stat st1;
 
-	    strcpy(procdir+l, "file");
-	    /* $SHELL is actual shell? */
-	    if (stat(procdir, &st1) != -1 && memcmp(&st, &st1, sizeof st) == 0)
-		return getshellbyname(shell);
-	}
-	strcpy(procdir+l, "status");
-	if (stat(procdir, &st) == 0 && (fp = fopen(procdir, "r")) != NULL) {
-	    char * p = fgets(buf, sizeof buf, fp)==NULL ? NULL : strtok(buf, " \t");
-	    fclose(fp);
-	    if (p != NULL)
-		return getshellbyname(p);
+	    mib[2] = KERN_PROC_PATHNAME;
+	    len = sizeof(path);
+	    if (sysctl(mib, 4, path, &len, NULL, 0) != -1) {
+		/* $SHELL is actual shell? */
+		if (stat(path, &st1) != -1 && memcmp(&st, &st1, sizeof st) == 0)
+		    return getshellbyname(shell);
+	    }
 	}
+	mib[2] = KERN_PROC_PID;
+	len = sizeof(kp);
+	if (sysctl(mib, 4, &kp, &len, NULL, 0) != -1)
+	    return getshellbyname(kp.ki_comm);
     }
     return SH_SH;
 }
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 1de440bfc44..166dfdc5456 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -103,8 +103,8 @@ static void		 usage(void);
 #define	DEFAULT_PASSWD_PROMPT	"Password:"
 #define	TERM_UNKNOWN		"su"
 #define	DEFAULT_WARN		(2L * 7L * 86400L)	/* Two weeks */
-#define NO_SLEEP_EXIT		0
-#define SLEEP_EXIT		5
+#define	NO_SLEEP_EXIT		0
+#define	SLEEP_EXIT		5
 
 /*
  * This bounds the time given to login.  Not a define so it can
@@ -380,12 +380,12 @@ main(int argc, char *argv[])
 		au_login_success();
 #endif
 
-        /*
-         * This needs to happen before login_getpwclass to support
-         * home directories on GSS-API authenticated NFS where the
-         * kerberos credentials need to be saved so that the kernel
-         * can authenticate to the NFS server.
-         */
+	/*
+	 * This needs to happen before login_getpwclass to support
+	 * home directories on GSS-API authenticated NFS where the
+	 * kerberos credentials need to be saved so that the kernel
+	 * can authenticate to the NFS server.
+	 */
 	pam_err = pam_setcred(pamh, pam_silent|PAM_ESTABLISH_CRED);
 	if (pam_err != PAM_SUCCESS) {
 		pam_syslog("pam_setcred()");
diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile
index 1071f0e97a2..3e250775697 100644
--- a/usr.bin/netstat/Makefile
+++ b/usr.bin/netstat/Makefile
@@ -26,6 +26,10 @@ CFLAGS+=-DINET6
 CFLAGS+=-DSDP
 .endif
 
+.if ${MK_PF} != "no"
+CFLAGS+=-DPF
+.endif
+
 BINGRP=	kmem
 BINMODE=2555
 DPADD=	${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c
index 854844fb637..573a75d8248 100644
--- a/usr.bin/netstat/if.c
+++ b/usr.bin/netstat/if.c
@@ -48,39 +48,41 @@ __FBSDID("$FreeBSD$");
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/ethernet.h>
-#include <net/pfvar.h>
-#include <net/if_pfsync.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <netipx/ipx.h>
 #include <netipx/ipx_if.h>
 #include <arpa/inet.h>
+#ifdef PF
+#include <net/pfvar.h>
+#include <net/if_pfsync.h>
+#endif
 
 #include <err.h>
 #include <errno.h>
+#include <ifaddrs.h>
 #include <libutil.h>
 #ifdef INET6
 #include <netdb.h>
 #endif
 #include <signal.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sysexits.h>
 #include <unistd.h>
 
 #include "netstat.h"
 
-#define	YES	1
-#define	NO	0
-
-static void sidewaysintpr(int, u_long);
-static void catchalarm(int);
+static void sidewaysintpr(int);
 
 #ifdef INET6
 static char addr_buf[NI_MAXHOST];		/* for getnameinfo() */
 #endif
 
+#ifdef PF
 static const char* pfsyncacts[] = {
 	/* PFSYNC_ACT_CLR */		"clear all request",
 	/* PFSYNC_ACT_INS */		"state insert",
@@ -155,6 +157,7 @@ pfsync_stats(u_long off, const char *name, int af1 __unused, int proto __unused)
 	p(pfsyncs_oerrors, "\t\t%ju send error%s\n");
 #undef p
 }
+#endif /* PF */
 
 /*
  * Display a formatted value, or a '-' in the same space.
@@ -197,53 +200,41 @@ show_stat(const char *fmt, int width, u_long value, short showvalue)
 	}
 }
 
+/*
+ * Find next multiaddr for a given interface name.
+ */
+static struct ifmaddrs *
+next_ifma(struct ifmaddrs *ifma, const char *name, const sa_family_t family)
+{
+
+	for(; ifma != NULL; ifma = ifma->ifma_next) {
+		struct sockaddr_dl *sdl;
+
+		sdl = (struct sockaddr_dl *)ifma->ifma_name;
+		if (ifma->ifma_addr->sa_family == family &&
+		    strcmp(sdl->sdl_data, name) == 0)
+			break;
+	}
+
+	return (ifma);
+}
+
 /*
  * Print a description of the network interfaces.
  */
 void
-intpr(int interval1, u_long ifnetaddr, void (*pfunc)(char *))
+intpr(int interval, void (*pfunc)(char *))
 {
-	struct ifnet ifnet;
-	struct ifnethead ifnethead;
-	union {
-		struct ifaddr ifa;
-		struct in_ifaddr in;
-#ifdef INET6
-		struct in6_ifaddr in6;
-#endif
-		struct ipx_ifaddr ipx;
-	} ifaddr;
-	u_long ifaddraddr;
-	u_long ifaddrfound;
-	u_long opackets;
-	u_long ipackets;
-	u_long obytes;
-	u_long ibytes;
-	u_long omcasts;
-	u_long imcasts;
-	u_long oerrors;
-	u_long ierrors;
-	u_long idrops;
-	u_long collisions;
-	int drops;
-	struct sockaddr *sa = NULL;
-	char name[IFNAMSIZ];
-	short network_layer;
-	short link_layer;
+	struct ifaddrs *ifap, *ifa;
+	struct ifmaddrs *ifmap, *ifma;
+	
+	if (interval)
+		return sidewaysintpr(interval);
 
-	if (ifnetaddr == 0) {
-		printf("ifnet: symbol not defined\n");
-		return;
-	}
-	if (interval1) {
-		sidewaysintpr(interval1, ifnetaddr);
-		return;
-	}
-	if (kread(ifnetaddr, (char *)&ifnethead, sizeof ifnethead) != 0)
-		return;
-	ifnetaddr = (u_long)TAILQ_FIRST(&ifnethead);
-	if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet) != 0)
-		return;
+	if (getifaddrs(&ifap) != 0)
+		err(EX_OSERR, "getifaddrs");
+	if (aflag && getifmaddrs(&ifmap) != 0)
+		err(EX_OSERR, "getifmaddrs");
 
 	if (!pfunc) {
 		if (Wflag)
@@ -262,364 +253,295 @@ intpr(int interval1, u_long ifnetaddr, void (*pfunc)(char *))
 			printf(" %s", "Drop");
 		putchar('\n');
 	}
-	ifaddraddr = 0;
-	while (ifnetaddr || ifaddraddr) {
-		struct sockaddr_in *sockin;
-#ifdef INET6
-		struct sockaddr_in6 *sockin6;
-#endif
-		char *cp;
-		int n, m;
 
-		network_layer = 0;
-		link_layer = 0;
+	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+		bool network = false, link = false;
 
-		if (ifaddraddr == 0) {
-			if (kread(ifnetaddr, (char *)&ifnet, sizeof ifnet) != 0)
-				return;
-			strlcpy(name, ifnet.if_xname, sizeof(name));
-			ifnetaddr = (u_long)TAILQ_NEXT(&ifnet, if_link);
-			if (interface != 0 && strcmp(name, interface) != 0)
-				continue;
-			cp = strchr(name, '\0');
+		if (interface != NULL && strcmp(ifa->ifa_name, interface) != 0)
+			continue;
 
-			if (pfunc) {
-				(*pfunc)(name);
-				continue;
-			}
+		if (pfunc) {
+			char *name;
 
-			if ((ifnet.if_flags&IFF_UP) == 0)
-				*cp++ = '*';
-			*cp = '\0';
-			ifaddraddr = (u_long)TAILQ_FIRST(&ifnet.if_addrhead);
-		}
-		ifaddrfound = ifaddraddr;
-
-		/*
-		 * Get the interface stats.  These may get
-		 * overriden below on a per-interface basis.
-		 */
-		opackets = ifnet.if_opackets;
-		ipackets = ifnet.if_ipackets;
-		obytes = ifnet.if_obytes;
-		ibytes = ifnet.if_ibytes;
-		omcasts = ifnet.if_omcasts;
-		imcasts = ifnet.if_imcasts;
-		oerrors = ifnet.if_oerrors;
-		ierrors = ifnet.if_ierrors;
-		idrops = ifnet.if_iqdrops;
-		collisions = ifnet.if_collisions;
-		drops = ifnet.if_snd.ifq_drops;
-
-		if (ifaddraddr == 0) {
-			if (Wflag)
-				printf("%-7.7s", name);
-			else
-				printf("%-5.5s", name);
-			printf(" %5lu ", ifnet.if_mtu);
-			printf("%-13.13s ", "none");
-			printf("%-17.17s ", "none");
-		} else {
-			if (kread(ifaddraddr, (char *)&ifaddr, sizeof ifaddr)
-			    != 0) {
-				ifaddraddr = 0;
-				continue;
-			}
-#define	CP(x) ((char *)(x))
-			cp = (CP(ifaddr.ifa.ifa_addr) - CP(ifaddraddr)) +
-				CP(&ifaddr);
-			sa = (struct sockaddr *)cp;
-			if (af != AF_UNSPEC && sa->sa_family != af) {
-				ifaddraddr =
-				    (u_long)TAILQ_NEXT(&ifaddr.ifa, ifa_link);
-				continue;
-			}
-			if (Wflag)
-				printf("%-7.7s", name);
-			else
-				printf("%-5.5s", name);
-			printf(" %5lu ", ifnet.if_mtu);
-			switch (sa->sa_family) {
-			case AF_UNSPEC:
-				printf("%-13.13s ", "none");
-				printf("%-15.15s ", "none");
-				break;
-			case AF_INET:
-				sockin = (struct sockaddr_in *)sa;
-#ifdef notdef
-				/* can't use inet_makeaddr because kernel
-				 * keeps nets unshifted.
-				 */
-				in = inet_makeaddr(ifaddr.in.ia_subnet,
-					INADDR_ANY);
-				printf("%-13.13s ", netname(in.s_addr,
-				    ifaddr.in.ia_subnetmask));
-#else
-				printf("%-13.13s ",
-				    netname(htonl(ifaddr.in.ia_subnet),
-				    ifaddr.in.ia_subnetmask));
-#endif
-				printf("%-17.17s ",
-				    routename(sockin->sin_addr.s_addr));
-
-				network_layer = 1;
-				break;
-#ifdef INET6
-			case AF_INET6:
-				sockin6 = (struct sockaddr_in6 *)sa;
-				in6_fillscopeid(&ifaddr.in6.ia_addr);
-				printf("%-13.13s ",
-				       netname6(&ifaddr.in6.ia_addr,
-						&ifaddr.in6.ia_prefixmask.sin6_addr));
-				in6_fillscopeid(sockin6);
-				getnameinfo(sa, sa->sa_len, addr_buf,
-				    sizeof(addr_buf), 0, 0, NI_NUMERICHOST);
-				printf("%-17.17s ", addr_buf);
-
-				network_layer = 1;
-				break;
-#endif /*INET6*/
-			case AF_IPX:
-				{
-				struct sockaddr_ipx *sipx =
-					(struct sockaddr_ipx *)sa;
-				u_long net;
-				char netnum[10];
-
-				*(union ipx_net *) &net = sipx->sipx_addr.x_net;
-				sprintf(netnum, "%lx", (u_long)ntohl(net));
-				printf("ipx:%-8s  ", netnum);
-/*				printf("ipx:%-8s ", netname(net, 0L)); */
-				printf("%-17s ",
-				    ipx_phost((struct sockaddr *)sipx));
-				}
-
-				network_layer = 1;
-				break;
-
-			case AF_APPLETALK:
-				printf("atalk:%-12.12s ",atalk_print(sa,0x10) );
-				printf("%-11.11s  ",atalk_print(sa,0x0b) );
-				break;
-			case AF_LINK:
-				{
-				struct sockaddr_dl *sdl =
-					(struct sockaddr_dl *)sa;
-				char linknum[10];
-				cp = (char *)LLADDR(sdl);
-				n = sdl->sdl_alen;
-				sprintf(linknum, "<Link#%d>", sdl->sdl_index);
-				m = printf("%-13.13s ", linknum);
-				}
-				goto hexprint;
-			default:
-				m = printf("(%d)", sa->sa_family);
-				for (cp = sa->sa_len + (char *)sa;
-					--cp > sa->sa_data && (*cp == 0);) {}
-				n = cp - sa->sa_data + 1;
-				cp = sa->sa_data;
-			hexprint:
-				while ((--n >= 0) && (m < 30))
-					m += printf("%02x%c", *cp++ & 0xff,
-						    n > 0 ? ':' : ' ');
-				m = 32 - m;
-				while (m-- > 0)
-					putchar(' ');
-
-				link_layer = 1;
-				break;
-			}
+			name = ifa->ifa_name;
+			(*pfunc)(name);
 
 			/*
-			 * Fixup the statistics for interfaces that
-			 * update stats for their network addresses
+			 * Skip all ifaddrs belonging to same interface.
 			 */
-			if (network_layer) {
-				opackets = ifaddr.in.ia_ifa.if_opackets;
-				ipackets = ifaddr.in.ia_ifa.if_ipackets;
-				obytes = ifaddr.in.ia_ifa.if_obytes;
-				ibytes = ifaddr.in.ia_ifa.if_ibytes;
+			while(ifa->ifa_next != NULL &&
+			    (strcmp(ifa->ifa_next->ifa_name, name) == 0)) {
+				ifa = ifa->ifa_next;
 			}
-
-			ifaddraddr = (u_long)TAILQ_NEXT(&ifaddr.ifa, ifa_link);
+			continue;
 		}
 
-		show_stat("lu", 8, ipackets, link_layer|network_layer);
-		show_stat("lu", 5, ierrors, link_layer);
-		show_stat("lu", 5, idrops, link_layer);
-		if (bflag)
-			show_stat("lu", 10, ibytes, link_layer|network_layer);
+		if (af != AF_UNSPEC && ifa->ifa_addr->sa_family != af)
+			continue;
 
-		show_stat("lu", 8, opackets, link_layer|network_layer);
-		show_stat("lu", 5, oerrors, link_layer);
-		if (bflag)
-			show_stat("lu", 10, obytes, link_layer|network_layer);
+		if (Wflag)
+			printf("%-7.7s", ifa->ifa_name);
+		else
+			printf("%-5.5s", ifa->ifa_name);
 
-		show_stat("NRSlu", 5, collisions, link_layer);
-		if (dflag)
-			show_stat("LSd", 4, drops, link_layer);
+#define IFA_MTU(ifa)	(((struct if_data *)(ifa)->ifa_data)->ifi_mtu)
+		show_stat("lu", 6, IFA_MTU(ifa), IFA_MTU(ifa));
+#undef IFA_MTU
+
+		switch (ifa->ifa_addr->sa_family) {
+		case AF_UNSPEC:
+			printf("%-13.13s ", "none");
+			printf("%-15.15s ", "none");
+			break;
+		case AF_INET:
+		    {
+			struct sockaddr_in *sin, *mask;
+
+			sin = (struct sockaddr_in *)ifa->ifa_addr;
+			mask = (struct sockaddr_in *)ifa->ifa_netmask;
+			printf("%-13.13s ", netname(sin->sin_addr.s_addr,
+			    mask->sin_addr.s_addr));
+			printf("%-17.17s ",
+			    routename(sin->sin_addr.s_addr));
+
+			network = true;
+			break;
+		    }
+#ifdef INET6
+		case AF_INET6:
+		    {
+			struct sockaddr_in6 *sin6, *mask;
+
+			sin6 = (struct sockaddr_in6 *)ifa->ifa_addr;
+			mask = (struct sockaddr_in6 *)ifa->ifa_netmask;
+
+			printf("%-13.13s ", netname6(sin6, &mask->sin6_addr));
+			getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len,
+			    addr_buf, sizeof(addr_buf), 0, 0, NI_NUMERICHOST);
+			printf("%-17.17s ", addr_buf);
+
+			network = 1;
+			break;
+	            }
+#endif /* INET6 */
+		case AF_IPX:
+		    {
+			struct sockaddr_ipx *sipx;
+			u_long net;
+			char netnum[10];
+
+			sipx = (struct sockaddr_ipx *)ifa->ifa_addr;
+			*(union ipx_net *) &net = sipx->sipx_addr.x_net;
+
+			sprintf(netnum, "%lx", (u_long)ntohl(net));
+			printf("ipx:%-8s  ", netnum);
+			printf("%-17s ", ipx_phost((struct sockaddr *)sipx));
+
+			network = 1;
+			break;
+		    }
+		case AF_APPLETALK:
+			printf("atalk:%-12.12s ",
+			    atalk_print(ifa->ifa_addr, 0x10));
+			printf("%-11.11s  ",
+			    atalk_print(ifa->ifa_addr, 0x0b));
+			break;
+		case AF_LINK:
+		    {
+			struct sockaddr_dl *sdl;
+			char *cp, linknum[10];
+			int n, m;
+
+			sdl = (struct sockaddr_dl *)ifa->ifa_addr;
+			cp = (char *)LLADDR(sdl);
+			n = sdl->sdl_alen;
+			sprintf(linknum, "<Link#%d>", sdl->sdl_index);
+			m = printf("%-13.13s ", linknum);
+
+			while ((--n >= 0) && (m < 30))
+				m += printf("%02x%c", *cp++ & 0xff,
+					    n > 0 ? ':' : ' ');
+			m = 32 - m;
+			while (m-- > 0)
+				putchar(' ');
+
+			link = 1;
+			break;
+		    }
+		}
+
+#define	IFA_STAT(s)	(((struct if_data *)ifa->ifa_data)->ifi_ ## s)
+		show_stat("lu", 8, IFA_STAT(ipackets), link|network);
+		show_stat("lu", 5, IFA_STAT(ierrors), link);
+		show_stat("lu", 5, IFA_STAT(iqdrops), link);
+		if (bflag)
+			show_stat("lu", 10, IFA_STAT(ibytes), link|network);
+		show_stat("lu", 8, IFA_STAT(opackets), link|network);
+		show_stat("lu", 5, IFA_STAT(oerrors), link);
+		if (bflag)
+			show_stat("lu", 10, IFA_STAT(obytes), link|network);
+		show_stat("NRSlu", 5, IFA_STAT(collisions), link);
+		/* XXXGL: output queue drops */
 		putchar('\n');
 
-		if (aflag && ifaddrfound) {
-			/*
-			 * Print family's multicast addresses
-			 */
-			struct ifmultiaddr *multiaddr;
-			struct ifmultiaddr ifma;
-			union {
-				struct sockaddr sa;
-				struct sockaddr_in in;
-#ifdef INET6
-				struct sockaddr_in6 in6;
-#endif /* INET6 */
-				struct sockaddr_dl dl;
-			} msa;
-			const char *fmt;
+		if (!aflag)
+			continue;
 
-			TAILQ_FOREACH(multiaddr, &ifnet.if_multiaddrs, ifma_link) {
-				if (kread((u_long)multiaddr, (char *)&ifma,
-					  sizeof ifma) != 0)
-					break;
-				multiaddr = &ifma;
-				if (kread((u_long)ifma.ifma_addr, (char *)&msa,
-					  sizeof msa) != 0)
-					break;
-				if (msa.sa.sa_family != sa->sa_family)
-					continue;
+		/*
+		 * Print family's multicast addresses.
+		 */
+		for (ifma = next_ifma(ifmap, ifa->ifa_name,
+		     ifa->ifa_addr->sa_family);
+		     ifma != NULL;
+		     ifma = next_ifma(ifma, ifa->ifa_name,
+		     ifa->ifa_addr->sa_family)) {
+			const char *fmt = NULL;
 
-				fmt = 0;
-				switch (msa.sa.sa_family) {
-				case AF_INET:
-					fmt = routename(msa.in.sin_addr.s_addr);
-					break;
+			switch (ifma->ifma_addr->sa_family) {
+			case AF_INET:
+			    {
+				struct sockaddr_in *sin;
+
+				sin = (struct sockaddr_in *)ifma->ifma_addr;
+				fmt = routename(sin->sin_addr.s_addr);
+				break;
+			    }
 #ifdef INET6
-				case AF_INET6:
-					in6_fillscopeid(&msa.in6);
-					getnameinfo(&msa.sa, msa.sa.sa_len,
-					    addr_buf, sizeof(addr_buf), 0, 0,
-					    NI_NUMERICHOST);
-					printf("%*s %-19.19s(refs: %d)\n",
-					       Wflag ? 27 : 25, "",
-					       addr_buf, ifma.ifma_refcount);
-					break;
+			case AF_INET6:
+
+				/* in6_fillscopeid(&msa.in6); */
+				getnameinfo(ifma->ifma_addr,
+				    ifma->ifma_addr->sa_len, addr_buf,
+				    sizeof(addr_buf), 0, 0, NI_NUMERICHOST);
+				printf("%*s %s\n",
+				    Wflag ? 27 : 25, "", addr_buf);
+				break;
 #endif /* INET6 */
-				case AF_LINK:
-					switch (msa.dl.sdl_type) {
-					case IFT_ETHER:
-					case IFT_FDDI:
-						fmt = ether_ntoa(
-							(struct ether_addr *)
-							LLADDR(&msa.dl));
-						break;
-					}
+			case AF_LINK:
+			    {
+				struct sockaddr_dl *sdl;
+
+				sdl = (struct sockaddr_dl *)ifma->ifma_addr;
+				switch (sdl->sdl_type) {
+				case IFT_ETHER:
+				case IFT_FDDI:
+					fmt = ether_ntoa(
+					    (struct ether_addr *)LLADDR(sdl));
 					break;
 				}
-				if (fmt) {
-					printf("%*s %-17.17s",
-					    Wflag ? 27 : 25, "", fmt);
-					if (msa.sa.sa_family == AF_LINK) {
-						printf(" %8lu", imcasts);
-						printf("%*s",
-						    bflag ? 17 : 6, "");
-						printf(" %8lu", omcasts);
-					}
-					putchar('\n');
-				}
+				break;
+			    }
 			}
+
+			if (fmt) {
+				printf("%*s %-17.17s",
+				    Wflag ? 27 : 25, "", fmt);
+				if (ifma->ifma_addr->sa_family == AF_LINK) {
+					printf(" %8lu", IFA_STAT(imcasts));
+					printf("%*s", bflag ? 17 : 6, "");
+					printf(" %8lu", IFA_STAT(omcasts));
+				}
+				putchar('\n');
+			}
+
+			ifma = ifma->ifma_next;
 		}
 	}
+
+	freeifaddrs(ifap);
+	if (aflag)
+		freeifmaddrs(ifmap);
 }
 
-struct	iftot {
-	SLIST_ENTRY(iftot) chain;
-	char	ift_name[IFNAMSIZ];	/* interface name */
+struct iftot {
 	u_long	ift_ip;			/* input packets */
 	u_long	ift_ie;			/* input errors */
 	u_long	ift_id;			/* input drops */
 	u_long	ift_op;			/* output packets */
 	u_long	ift_oe;			/* output errors */
 	u_long	ift_co;			/* collisions */
-	u_int	ift_dr;			/* drops */
 	u_long	ift_ib;			/* input bytes */
 	u_long	ift_ob;			/* output bytes */
 };
 
-u_char	signalled;			/* set if alarm goes off "early" */
+/*
+ * Obtain stats for interface(s).
+ */
+static void
+fill_iftot(struct iftot *st)
+{
+	struct ifaddrs *ifap, *ifa;
+	bool found = false;
+
+	if (getifaddrs(&ifap) != 0)
+		err(EX_OSERR, "getifaddrs");
+
+	bzero(st, sizeof(*st));
+
+	for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
+		if (ifa->ifa_addr->sa_family != AF_LINK)
+			continue;
+		if (interface) {
+			if (strcmp(ifa->ifa_name, interface) == 0)
+				found = true;
+			else
+				continue;
+		}
+
+		st->ift_ip += IFA_STAT(ipackets);
+		st->ift_ie += IFA_STAT(ierrors);
+		st->ift_id += IFA_STAT(iqdrops);
+		st->ift_ib += IFA_STAT(ibytes);
+		st->ift_op += IFA_STAT(opackets);
+		st->ift_oe += IFA_STAT(oerrors);
+		st->ift_ob += IFA_STAT(obytes);
+ 		st->ift_co += IFA_STAT(collisions);
+	}
+
+	if (interface && found == false)
+		err(EX_DATAERR, "interface %s not found", interface);
+
+	freeifaddrs(ifap);
+}
+
+/*
+ * Set a flag to indicate that a signal from the periodic itimer has been
+ * caught.
+ */
+static sig_atomic_t signalled;
+static void
+catchalarm(int signo __unused)
+{
+	signalled = true;
+}
 
 /*
  * Print a running summary of interface statistics.
- * Repeat display every interval1 seconds, showing statistics
- * collected over that interval.  Assumes that interval1 is non-zero.
+ * Repeat display every interval seconds, showing statistics
+ * collected over that interval.  Assumes that interval is non-zero.
  * First line printed at top of screen is always cumulative.
- * XXX - should be rewritten to use ifmib(4).
  */
 static void
-sidewaysintpr(int interval1, u_long off)
+sidewaysintpr(int interval)
 {
-	struct ifnet ifnet;
-	u_long firstifnet;
-	struct ifnethead ifnethead;
+	struct iftot ift[2], *new, *old;
 	struct itimerval interval_it;
-	struct iftot *iftot, *ip, *ipn, *total, *sum, *interesting;
-	int line;
-	int oldmask, first;
-	u_long interesting_off;
+	int oldmask, line;
 
-	if (kread(off, (char *)&ifnethead, sizeof ifnethead) != 0)
-		return;
-	firstifnet = (u_long)TAILQ_FIRST(&ifnethead);
-
-	if ((iftot = malloc(sizeof(struct iftot))) == NULL) {
-		printf("malloc failed\n");
-		exit(1);
-	}
-	memset(iftot, 0, sizeof(struct iftot));
-
-	interesting = NULL;
-	interesting_off = 0;
-	for (off = firstifnet, ip = iftot; off;) {
-		char name[IFNAMSIZ];
-
-		if (kread(off, (char *)&ifnet, sizeof ifnet) != 0)
-			break;
-		strlcpy(name, ifnet.if_xname, sizeof(name));
-		if (interface && strcmp(name, interface) == 0) {
-			interesting = ip;
-			interesting_off = off;
-		}
-		snprintf(ip->ift_name, sizeof(ip->ift_name), "(%s)", name);
-		if ((ipn = malloc(sizeof(struct iftot))) == NULL) {
-			printf("malloc failed\n");
-			exit(1);
-		}
-		memset(ipn, 0, sizeof(struct iftot));
-		SLIST_NEXT(ip, chain) = ipn;
-		ip = ipn;
-		off = (u_long)TAILQ_NEXT(&ifnet, if_link);
-	}
-	if (interface && interesting == NULL)
-		errx(1, "%s: unknown interface", interface);
-	if ((total = malloc(sizeof(struct iftot))) == NULL) {
-		printf("malloc failed\n");
-		exit(1);
-	}
-	memset(total, 0, sizeof(struct iftot));
-	if ((sum = malloc(sizeof(struct iftot))) == NULL) {
-		printf("malloc failed\n");
-		exit(1);
-	}
-	memset(sum, 0, sizeof(struct iftot));
+	new = &ift[0];
+	old = &ift[1];
+	fill_iftot(old);
 
 	(void)signal(SIGALRM, catchalarm);
-	signalled = NO;
-	interval_it.it_interval.tv_sec = interval1;
+	signalled = false;
+	interval_it.it_interval.tv_sec = interval;
 	interval_it.it_interval.tv_usec = 0;
 	interval_it.it_value = interval_it.it_interval;
 	setitimer(ITIMER_REAL, &interval_it, NULL);
-	first = 1;
+
 banner:
 	printf("%17s %14s %16s", "input",
-	    interesting ? interesting->ift_name : "(Total)", "output");
+	    interface != NULL ? interface : "(Total)", "output");
 	putchar('\n');
 	printf("%10s %5s %5s %10s %10s %5s %10s %5s",
 	    "packets", "errs", "idrops", "bytes", "packets", "errs", "bytes",
@@ -629,104 +551,43 @@ banner:
 	putchar('\n');
 	fflush(stdout);
 	line = 0;
+
 loop:
-	if (interesting != NULL) {
-		ip = interesting;
-		if (kread(interesting_off, (char *)&ifnet, sizeof ifnet) != 0) {
-			printf("???\n");
-			exit(1);
-		};
-		if (!first) {
-			show_stat("lu", 10, ifnet.if_ipackets - ip->ift_ip, 1);
-			show_stat("lu", 5, ifnet.if_ierrors - ip->ift_ie, 1);
-			show_stat("lu", 5, ifnet.if_iqdrops - ip->ift_id, 1);
-			show_stat("lu", 10, ifnet.if_ibytes - ip->ift_ib, 1);
-			show_stat("lu", 10, ifnet.if_opackets - ip->ift_op, 1);
-			show_stat("lu", 5, ifnet.if_oerrors - ip->ift_oe, 1);
-			show_stat("lu", 10, ifnet.if_obytes - ip->ift_ob, 1);
-			show_stat("NRSlu", 5,
-			    ifnet.if_collisions - ip->ift_co, 1);
-			if (dflag)
-				show_stat("LSu", 5,
-				    ifnet.if_snd.ifq_drops - ip->ift_dr, 1);
-		}
-		ip->ift_ip = ifnet.if_ipackets;
-		ip->ift_ie = ifnet.if_ierrors;
-		ip->ift_id = ifnet.if_iqdrops;
-		ip->ift_ib = ifnet.if_ibytes;
-		ip->ift_op = ifnet.if_opackets;
-		ip->ift_oe = ifnet.if_oerrors;
-		ip->ift_ob = ifnet.if_obytes;
-		ip->ift_co = ifnet.if_collisions;
-		ip->ift_dr = ifnet.if_snd.ifq_drops;
-	} else {
-		sum->ift_ip = 0;
-		sum->ift_ie = 0;
-		sum->ift_id = 0;
-		sum->ift_ib = 0;
-		sum->ift_op = 0;
-		sum->ift_oe = 0;
-		sum->ift_ob = 0;
-		sum->ift_co = 0;
-		sum->ift_dr = 0;
-		for (off = firstifnet, ip = iftot;
-		     off && SLIST_NEXT(ip, chain) != NULL;
-		     ip = SLIST_NEXT(ip, chain)) {
-			if (kread(off, (char *)&ifnet, sizeof ifnet) != 0) {
-				off = 0;
-				continue;
-			}
-			sum->ift_ip += ifnet.if_ipackets;
-			sum->ift_ie += ifnet.if_ierrors;
-			sum->ift_id += ifnet.if_iqdrops;
-			sum->ift_ib += ifnet.if_ibytes;
-			sum->ift_op += ifnet.if_opackets;
-			sum->ift_oe += ifnet.if_oerrors;
-			sum->ift_ob += ifnet.if_obytes;
-			sum->ift_co += ifnet.if_collisions;
-			sum->ift_dr += ifnet.if_snd.ifq_drops;
-			off = (u_long)TAILQ_NEXT(&ifnet, if_link);
-		}
-		if (!first) {
-			show_stat("lu", 10, sum->ift_ip - total->ift_ip, 1);
-			show_stat("lu", 5, sum->ift_ie - total->ift_ie, 1);
-			show_stat("lu", 5, sum->ift_id - total->ift_id, 1);
-			show_stat("lu", 10, sum->ift_ib - total->ift_ib, 1);
-			show_stat("lu", 10, sum->ift_op - total->ift_op, 1);
-			show_stat("lu", 5, sum->ift_oe - total->ift_oe, 1);
-			show_stat("lu", 10, sum->ift_ob - total->ift_ob, 1);
-			show_stat("NRSlu", 5, sum->ift_co - total->ift_co, 1);
-			if (dflag)
-				show_stat("LSu", 5,
-				    sum->ift_dr - total->ift_dr, 1);
-		}
-		*total = *sum;
-	}
-	if (!first)
-		putchar('\n');
-	fflush(stdout);
 	if ((noutputs != 0) && (--noutputs == 0))
 		exit(0);
 	oldmask = sigblock(sigmask(SIGALRM));
 	while (!signalled)
 		sigpause(0);
-	signalled = NO;
+	signalled = false;
 	sigsetmask(oldmask);
 	line++;
-	first = 0;
+
+	fill_iftot(new);
+
+	show_stat("lu", 10, new->ift_ip - old->ift_ip, 1);
+	show_stat("lu", 5, new->ift_ie - old->ift_ie, 1);
+	show_stat("lu", 5, new->ift_id - old->ift_id, 1);
+	show_stat("lu", 10, new->ift_ib - old->ift_ib, 1);
+	show_stat("lu", 10, new->ift_op - old->ift_op, 1);
+	show_stat("lu", 5, new->ift_oe - old->ift_oe, 1);
+	show_stat("lu", 10, new->ift_ob - old->ift_ob, 1);
+	show_stat("NRSlu", 5, new->ift_co - old->ift_co, 1);
+	/* XXXGL: output queue drops */
+	putchar('\n');
+	fflush(stdout);
+
+	if (new == &ift[0]) {
+		new = &ift[1];
+		old = &ift[0];
+	} else {
+		new = &ift[0];
+		old = &ift[1];
+	}
+
 	if (line == 21)
 		goto banner;
 	else
 		goto loop;
-	/*NOTREACHED*/
-}
 
-/*
- * Set a flag to indicate that a signal from the periodic itimer has been
- * caught.
- */
-static void
-catchalarm(int signo __unused)
-{
-	signalled = YES;
+	/* NOTREACHED */
 }
diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c
index 4efa280591c..d733e937810 100644
--- a/usr.bin/netstat/main.c
+++ b/usr.bin/netstat/main.c
@@ -71,7 +71,7 @@ __FBSDID("$FreeBSD$");
 
 static struct nlist nl[] = {
 #define	N_IFNET		0
-	{ .n_name = "_ifnet" },
+	{ .n_name = "_ifnet" },		/* XXXGL: can be deleted */
 #define	N_RTSTAT	1
 	{ .n_name = "_rtstat" },
 #define	N_RTREE		2
@@ -214,8 +214,10 @@ struct protox {
 	  pim_stats,	NULL,		"pim",	1,	IPPROTO_PIM },
 	{ -1,		N_CARPSTAT,	1,	NULL,
 	  carp_stats,	NULL,		"carp",	1,	0 },
+#ifdef PF
 	{ -1,		N_PFSYNCSTAT,	1,	NULL,
 	  pfsync_stats,	NULL,		"pfsync", 1,	0 },
+#endif
 	{ -1,		N_ARPSTAT,	1,	NULL,
 	  arp_stats,	NULL,		"arp", 1,	0 },
 	{ -1,		-1,		0,	NULL,
@@ -552,7 +554,7 @@ main(int argc, char *argv[])
 #endif
 	kread(0, NULL, 0);
 	if (iflag && !sflag) {
-		intpr(interval, nl[N_IFNET].n_value, NULL);
+		intpr(interval, NULL);
 		exit(0);
 	}
 	if (rflag) {
@@ -636,8 +638,7 @@ printproto(struct protox *tp, const char *name)
 	if (sflag) {
 		if (iflag) {
 			if (tp->pr_istats)
-				intpr(interval, nl[N_IFNET].n_value,
-				      tp->pr_istats);
+				intpr(interval, tp->pr_istats);
 			else if (pflag)
 				printf("%s: no per-interface stats routine\n",
 				    tp->pr_name);
diff --git a/usr.bin/netstat/mbuf.c b/usr.bin/netstat/mbuf.c
index d32304de656..ebd843fdae2 100644
--- a/usr.bin/netstat/mbuf.c
+++ b/usr.bin/netstat/mbuf.c
@@ -69,16 +69,16 @@ mbpr(void *kvmd, u_long mbaddr)
 	struct memory_type *mtp;
 	uintmax_t mbuf_count, mbuf_bytes, mbuf_free, mbuf_failures, mbuf_size;
 	uintmax_t mbuf_sleeps;
-	uintmax_t cluster_count, cluster_bytes, cluster_limit, cluster_free;
+	uintmax_t cluster_count, cluster_limit, cluster_free;
 	uintmax_t cluster_failures, cluster_size, cluster_sleeps;
 	uintmax_t packet_count, packet_bytes, packet_free, packet_failures;
 	uintmax_t packet_sleeps;
-	uintmax_t tag_count, tag_bytes;
-	uintmax_t jumbop_count, jumbop_bytes, jumbop_limit, jumbop_free;
+	uintmax_t tag_bytes;
+	uintmax_t jumbop_count, jumbop_limit, jumbop_free;
 	uintmax_t jumbop_failures, jumbop_sleeps, jumbop_size;
-	uintmax_t jumbo9_count, jumbo9_bytes, jumbo9_limit, jumbo9_free;
+	uintmax_t jumbo9_count, jumbo9_limit, jumbo9_free;
 	uintmax_t jumbo9_failures, jumbo9_sleeps, jumbo9_size;
-	uintmax_t jumbo16_count, jumbo16_bytes, jumbo16_limit, jumbo16_free;
+	uintmax_t jumbo16_count, jumbo16_limit, jumbo16_free;
 	uintmax_t jumbo16_failures, jumbo16_sleeps, jumbo16_size;
 	uintmax_t bytes_inuse, bytes_incache, bytes_total;
 	int nsfbufs, nsfbufspeak, nsfbufsused;
@@ -146,7 +146,6 @@ mbpr(void *kvmd, u_long mbaddr)
 		goto out;
 	}
 	cluster_count = memstat_get_count(mtp);
-	cluster_bytes = memstat_get_bytes(mtp);
 	cluster_limit = memstat_get_countlimit(mtp);
 	cluster_free = memstat_get_free(mtp);
 	cluster_failures = memstat_get_failures(mtp);
@@ -159,7 +158,6 @@ mbpr(void *kvmd, u_long mbaddr)
 		    MBUF_TAG_MEM_NAME);
 		goto out;
 	}
-	tag_count = memstat_get_count(mtp);
 	tag_bytes = memstat_get_bytes(mtp);
 
 	mtp = memstat_mtl_find(mtlp, ALLOCATOR_UMA, MBUF_JUMBOP_MEM_NAME);
@@ -169,7 +167,6 @@ mbpr(void *kvmd, u_long mbaddr)
 		goto out;
 	}
 	jumbop_count = memstat_get_count(mtp);
-	jumbop_bytes = memstat_get_bytes(mtp);
 	jumbop_limit = memstat_get_countlimit(mtp);
 	jumbop_free = memstat_get_free(mtp);
 	jumbop_failures = memstat_get_failures(mtp);
@@ -183,7 +180,6 @@ mbpr(void *kvmd, u_long mbaddr)
 		goto out;
 	}
 	jumbo9_count = memstat_get_count(mtp);
-	jumbo9_bytes = memstat_get_bytes(mtp);
 	jumbo9_limit = memstat_get_countlimit(mtp);
 	jumbo9_free = memstat_get_free(mtp);
 	jumbo9_failures = memstat_get_failures(mtp);
@@ -197,7 +193,6 @@ mbpr(void *kvmd, u_long mbaddr)
 		goto out;
 	}
 	jumbo16_count = memstat_get_count(mtp);
-	jumbo16_bytes = memstat_get_bytes(mtp);
 	jumbo16_limit = memstat_get_countlimit(mtp);
 	jumbo16_free = memstat_get_free(mtp);
 	jumbo16_failures = memstat_get_failures(mtp);
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index 0a37994ca3b..cd2ddedd3a7 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -28,7 +28,7 @@
 .\"	@(#)netstat.1	8.8 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd May 17, 2013
+.Dd October 15, 2013
 .Dt NETSTAT 1
 .Os
 .Sh NAME
@@ -94,8 +94,6 @@ retransmits, out-of-order packets received, and zero-sized windows advertised.
 .Fl i | I Ar interface
 .Op Fl abdhnW
 .Op Fl f Ar address_family
-.Op Fl M Ar core
-.Op Fl N Ar system
 .Ek
 .Xc
 Show the state of all network interfaces or a single
diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h
index 02b8a17c309..114c84cdc66 100644
--- a/usr.bin/netstat/netstat.h
+++ b/usr.bin/netstat/netstat.h
@@ -119,7 +119,7 @@ void	netisr_stats(void *);
 void	hostpr(u_long, u_long);
 void	impstats(u_long, u_long);
 
-void	intpr(int, u_long, void (*)(char *));
+void	intpr(int, void (*)(char *));
 
 void	pr_rthdr(int);
 void	pr_family(int);
@@ -130,7 +130,7 @@ char	*ns_phost(struct sockaddr *);
 void	upHex(char *);
 
 char	*routename(in_addr_t);
-char	*netname(in_addr_t, u_long);
+char	*netname(in_addr_t, in_addr_t);
 char	*atalk_print(struct sockaddr *, int);
 char	*atalk_print2(struct sockaddr *, struct sockaddr *, int);
 char	*ipx_print(struct sockaddr *);
diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c
index 1de12cc9fd5..4381ffd31b6 100644
--- a/usr.bin/netstat/route.c
+++ b/usr.bin/netstat/route.c
@@ -631,10 +631,9 @@ fmt_sockaddr(struct sockaddr *sa, struct sockaddr *mask, int flags)
 			cp = routename(sockin->sin_addr.s_addr);
 		else if (mask)
 			cp = netname(sockin->sin_addr.s_addr,
-				     ntohl(((struct sockaddr_in *)mask)
-					   ->sin_addr.s_addr));
+			    ((struct sockaddr_in *)mask)->sin_addr.s_addr);
 		else
-			cp = netname(sockin->sin_addr.s_addr, 0L);
+			cp = netname(sockin->sin_addr.s_addr, INADDR_ANY);
 		break;
 	    }
 
@@ -870,19 +869,21 @@ domask(char *dst, in_addr_t addr __unused, u_long mask)
 
 /*
  * Return the name of the network whose address is given.
- * The address is assumed to be that of a net or subnet, not a host.
  */
 char *
-netname(in_addr_t in, u_long mask)
+netname(in_addr_t in, in_addr_t mask)
 {
 	char *cp = 0;
 	static char line[MAXHOSTNAMELEN];
 	struct netent *np = 0;
 	in_addr_t i;
 
+	/* It is ok to supply host address. */
+	in &= mask;
+
 	i = ntohl(in);
 	if (!numeric_addr && i) {
-		np = getnetbyaddr(i >> NSHIFT(mask), AF_INET);
+		np = getnetbyaddr(i >> NSHIFT(ntohl(mask)), AF_INET);
 		if (np != NULL) {
 			cp = np->n_name;
 			trimdomain(cp, strlen(cp));
@@ -893,7 +894,7 @@ netname(in_addr_t in, u_long mask)
 	} else {
 		inet_ntop(AF_INET, &in, line, sizeof(line) - 1);
 	}
-	domask(line + strlen(line), i, mask);
+	domask(line + strlen(line), i, ntohl(mask));
 	return (line);
 }
 
diff --git a/usr.bin/pathchk/pathchk.c b/usr.bin/pathchk/pathchk.c
index 2d8fa595d32..3dc901bb049 100644
--- a/usr.bin/pathchk/pathchk.c
+++ b/usr.bin/pathchk/pathchk.c
@@ -98,7 +98,7 @@ check(const char *path)
 {
 	struct stat sb;
 	long complen, namemax, pathmax, svnamemax;
-	int badch, last;
+	int last;
 	char *end, *p, *pathd;
 
 	if ((pathd = strdup(path)) == NULL)
@@ -142,9 +142,9 @@ check(const char *path)
 			goto bad;
 		}
 
-		if (pflag && (badch = portable(p)) >= 0) {
+		if (pflag && !portable(p)) {
 			warnx("%s: %s: component contains non-portable "
-			    "character `%c'", path, p, badch);
+			    "character", path, p);
 			goto bad;
 		}
 
@@ -183,8 +183,7 @@ bad:	free(pathd);
 }
 
 /*
- * Check whether a path component contains only portable characters. Return
- * the first non-portable character found.
+ * Check whether a path component contains only portable characters.
  */
 static int
 portable(const char *path)
@@ -197,7 +196,7 @@ portable(const char *path)
 
 	s = strspn(path, charset);
 	if (path[s] != '\0')
-		return (path[s]);
+		return (0);
 
-	return (-1);
+	return (1);
 }
diff --git a/usr.bin/procstat/procstat.1 b/usr.bin/procstat/procstat.1
index d7b7d3f0827..a0aca05be31 100644
--- a/usr.bin/procstat/procstat.1
+++ b/usr.bin/procstat/procstat.1
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 17, 2013
+.Dd October 27, 2013
 .Dt PROCSTAT 1
 .Os
 .Sh NAME
@@ -225,8 +225,6 @@ non-blocking
 direct I/O
 .It l
 lock held
-.It c
-descriptor is a capability
 .El
 .Pp
 If the
diff --git a/usr.bin/procstat/procstat_files.c b/usr.bin/procstat/procstat_files.c
index d65c1ae9398..484dc2db750 100644
--- a/usr.bin/procstat/procstat_files.c
+++ b/usr.bin/procstat/procstat_files.c
@@ -203,8 +203,9 @@ static struct cap_desc {
 	{ CAP_SEM_WAIT,		"sw" },
 
 	/* Event monitoring and posting. */
-	{ CAP_POLL_EVENT,	"po" },
-	{ CAP_POST_EVENT,	"ev" },
+	{ CAP_EVENT,		"ev" },
+	{ CAP_KQUEUE_EVENT,	"ke" },
+	{ CAP_KQUEUE_CHANGE,	"kc" },
 
 	/* Strange and powerful rights that should not be given lightly. */
 	{ CAP_IOCTL,		"io" },
diff --git a/usr.bin/procstat/procstat_rlimit.c b/usr.bin/procstat/procstat_rlimit.c
index f3ed5fc4517..f7f67af1e0f 100644
--- a/usr.bin/procstat/procstat_rlimit.c
+++ b/usr.bin/procstat/procstat_rlimit.c
@@ -46,7 +46,7 @@
 static struct {
 	const char *name;
 	const char *suffix;
-} rlimit_param[13] = {
+} rlimit_param[14] = {
 	{"cputime",          "sec"},
 	{"filesize",         "B  "},
 	{"datasize",         "B  "},
@@ -60,9 +60,10 @@ static struct {
 	{"vmemoryuse",       "B  "},
 	{"pseudo-terminals", "   "},
 	{"swapuse",          "B  "},
+	{"kqueues",          "   "},
 };
 
-#if RLIM_NLIMITS > 13
+#if RLIM_NLIMITS > 14
 #error "Resource limits have grown. Add new entries to rlimit_param[]."
 #endif
 
diff --git a/usr.bin/rpcinfo/rpcinfo.c b/usr.bin/rpcinfo/rpcinfo.c
index 884f80dc52d..a12b93263f6 100644
--- a/usr.bin/rpcinfo/rpcinfo.c
+++ b/usr.bin/rpcinfo/rpcinfo.c
@@ -563,7 +563,8 @@ get_inet_address(struct sockaddr_in *addr, char *host)
 
 	(void) memset((char *)addr, 0, sizeof (*addr));
 	addr->sin_addr.s_addr = inet_addr(host);
-	if (addr->sin_addr.s_addr == -1 || addr->sin_addr.s_addr == 0) {
+	if (addr->sin_addr.s_addr == INADDR_NONE ||
+	    addr->sin_addr.s_addr == INADDR_ANY) {
 		if ((nconf = __rpc_getconfip("udp")) == NULL &&
 		    (nconf = __rpc_getconfip("tcp")) == NULL)
 			errx(1, "couldn't find a suitable transport");
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index 9b8efcd8af3..de8e7fff17b 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -28,7 +28,7 @@
 .\"	@(#)script.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD$
 .\"
-.Dd Oct 27, 2012
+.Dd December 4, 2013
 .Dt SCRIPT 1
 .Os
 .Sh NAME
@@ -37,6 +37,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl adfkpqr
+.Op Fl F Ar pipe
 .Op Fl t Ar time
 .Op Ar file Op Ar command ...
 .Sh DESCRIPTION
@@ -76,6 +77,12 @@ retaining the prior contents.
 When playing back a session with the
 .Fl p
 flag, do not sleep between records when playing back a timestamped session.
+.It Fl F Ar pipe
+Immediately flush output after each write.
+This will allow a user to create a named pipe using
+.Xr mkfifo 1
+and another user may watch the live session using a utility like
+.Xr cat 1 .
 .It Fl f
 Create
 .Ar file.filemon
diff --git a/usr.bin/script/script.c b/usr.bin/script/script.c
index 515a10eb2d7..1396d3d1f38 100644
--- a/usr.bin/script/script.c
+++ b/usr.bin/script/script.c
@@ -98,18 +98,18 @@ main(int argc, char *argv[])
 	char obuf[BUFSIZ];
 	char ibuf[BUFSIZ];
 	fd_set rfd;
-	int aflg, kflg, pflg, ch, k, n;
+	int aflg, Fflg, kflg, pflg, ch, k, n;
 	int flushtime, readstdin;
 	int fm_fd, fm_log;
 
-	aflg = kflg = pflg = 0;
+	aflg = Fflg = kflg = pflg = 0;
 	usesleep = 1;
 	rawout = 0;
 	flushtime = 30;
 	fm_fd = -1;	/* Shut up stupid "may be used uninitialized" GCC
 			   warning. (not needed w/clang) */
 
-	while ((ch = getopt(argc, argv, "adfkpqrt:")) != -1)
+	while ((ch = getopt(argc, argv, "adFfkpqrt:")) != -1)
 		switch(ch) {
 		case 'a':
 			aflg = 1;
@@ -117,6 +117,9 @@ main(int argc, char *argv[])
 		case 'd':
 			usesleep = 0;
 			break;
+		case 'F':
+			Fflg = 1;
+			break;
 		case 'f':
 			fflg = 1;
 			break;
@@ -283,6 +286,8 @@ main(int argc, char *argv[])
 			fflush(fscript);
 			start = tvec;
 		}
+		if (Fflg)
+			fflush(fscript);
 	}
 	finish();
 	done(0);
diff --git a/usr.bin/sed/compile.c b/usr.bin/sed/compile.c
index cea8e07b9c3..e14666883d0 100644
--- a/usr.bin/sed/compile.c
+++ b/usr.bin/sed/compile.c
@@ -582,6 +582,7 @@ compile_flags(char *p, struct s_subst *s)
 		case 'p':
 			s->p = 1;
 			break;
+		case 'i':
 		case 'I':
 			s->icase = 1;
 			break;
diff --git a/usr.bin/sed/sed.1 b/usr.bin/sed/sed.1
index 075988997ac..cf274960129 100644
--- a/usr.bin/sed/sed.1
+++ b/usr.bin/sed/sed.1
@@ -31,7 +31,7 @@
 .\"	@(#)sed.1	8.2 (Berkeley) 12/30/93
 .\" $FreeBSD$
 .\"
-.Dd May 24, 2009
+.Dd December 9, 2013
 .Dt SED 1
 .Os
 .Sh NAME
@@ -196,7 +196,7 @@ option was specified);
 a context address
 that consists of a regular expression preceded and followed by a
 delimiter. The closing delimiter can also optionally be followed by the
-.Dq I
+.Dq i
 character, to indicate that the regular expression is to be matched
 in a case-insensitive way.
 .El
@@ -507,7 +507,7 @@ Append the pattern space to
 if a replacement was made.
 If the replacement string is identical to that which it replaces, it
 is still considered to have been a replacement.
-.It I
+.It i or I
 Match the regular expression in a case-insensitive way.
 .El
 .Pp
diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile
index d176fdd7d45..097932c1900 100644
--- a/usr.bin/split/Makefile
+++ b/usr.bin/split/Makefile
@@ -2,5 +2,7 @@
 # $FreeBSD$
 
 PROG=	split
+LDADD=	-lutil
+DPADD=	${LIBUTIL}
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/split/split.c b/usr.bin/split/split.c
index 572af599307..9a0b0ecbe1a 100644
--- a/usr.bin/split/split.c
+++ b/usr.bin/split/split.c
@@ -49,6 +49,7 @@ static const char sccsid[] = "@(#)split.c	8.2 (Berkeley) 4/16/94";
 #include <errno.h>
 #include <fcntl.h>
 #include <inttypes.h>
+#include <libutil.h>
 #include <limits.h>
 #include <locale.h>
 #include <stdbool.h>
@@ -83,9 +84,8 @@ static void usage(void);
 int
 main(int argc, char **argv)
 {
-	intmax_t bytecnti;
-	long scale;
 	int ch;
+	int error;
 	char *ep, *p;
 
 	setlocale(LC_ALL, "");
@@ -118,21 +118,9 @@ main(int argc, char **argv)
 			break;
 		case 'b':		/* Byte count. */
 			errno = 0;
-			if ((bytecnti = strtoimax(optarg, &ep, 10)) <= 0 ||
-			    strchr("kKmMgG", *ep) == NULL || errno != 0)
-				errx(EX_USAGE,
-				    "%s: illegal byte count", optarg);
-			if (*ep == 'k' || *ep == 'K')
-				scale = 1024;
-			else if (*ep == 'm' || *ep == 'M')
-				scale = 1024 * 1024;
-			else if (*ep == 'g' || *ep == 'G')
-				scale = 1024 * 1024 * 1024;
-			else
-				scale = 1;
-			if (bytecnti > OFF_MAX / scale)
+			error = expand_number(optarg, &bytecnt);
+			if (error == -1)
 				errx(EX_USAGE, "%s: offset too large", optarg);
-			bytecnt = (off_t)(bytecnti * scale);
 			break;
 		case 'd':		/* Decimal suffix */
 			dflag = true;
diff --git a/usr.bin/svn/svn/Makefile b/usr.bin/svn/svn/Makefile
index 4638c1758cd..61c62e6a24d 100644
--- a/usr.bin/svn/svn/Makefile
+++ b/usr.bin/svn/svn/Makefile
@@ -53,4 +53,13 @@ DPADD=	${LIBSVN_CLIENT} ${LIBSVN_WC} ${LIBSVN_RA} ${LIBSVN_RA_LOCAL} \
 	${LIBBSDXML} ${LIBAPR} ${LIBSQLITE} ${LIBZ} ${LIBCRYPT} ${LIBMAGIC} \
 	${LIBCRYPTO} ${LIBSSL} ${LIBPTHREAD}
 
+.if(defined(ORGANIZATION) && !empty(ORGANIZATION))
+DPSRCS+=	freebsd-organization.h
+CLEANFILES+=	freebsd-organization.h
+CFLAGS+=	-I. -DHAS_ORGANIZATION_NAME
+freebsd-organization.h:
+	@echo '#define ORGANIZATION_NAME ${ORGANIZATION}' \
+	    > freebsd-organization.h
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.bin/svn/svn_private_config.h b/usr.bin/svn/svn_private_config.h
index 061109534b7..1de2e512ba3 100644
--- a/usr.bin/svn/svn_private_config.h
+++ b/usr.bin/svn/svn_private_config.h
@@ -105,7 +105,7 @@
 #define PACKAGE_NAME "subversion"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "subversion 1.8.1"
+#define PACKAGE_STRING "subversion 1.8.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "subversion"
@@ -114,7 +114,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.8.1"
+#define PACKAGE_VERSION "1.8.5"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
@@ -129,10 +129,10 @@
 #define SVN_BINDIR "/usr/bin"
 
 /* Defined to the config.guess name of the build system */
-#define SVN_BUILD_HOST "bikeshed-green-indigo-orange-freebsd"
+#define SVN_BUILD_HOST "bikeshed-red-green-blue-freebsd"
 
 /* Defined to the config.guess name of the build target */
-#define SVN_BUILD_TARGET "bikeshed-green-indigo-orange-freebsd"
+#define SVN_BUILD_TARGET "bikeshed-red-green-blue-freebsd"
 
 /* The path of a default editor for the client. */
 /* #undef SVN_CLIENT_EDITOR */
diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c
index 7ee8f15a273..f9da13e1667 100644
--- a/usr.bin/systat/netcmds.c
+++ b/usr.bin/systat/netcmds.c
@@ -152,7 +152,7 @@ changeitems(const char *args, int onoff)
 		hp = gethostbyname(tmpstr1);
 		if (hp == 0) {
 			in.s_addr = inet_addr(tmpstr1);
-			if ((int)in.s_addr == -1) {
+			if (in.s_addr == INADDR_NONE) {
 				error("%s: unknown host or port", tmpstr1);
 				continue;
 			}
diff --git a/usr.bin/tests/Makefile b/usr.bin/tests/Makefile
new file mode 100644
index 00000000000..f8ead8890f2
--- /dev/null
+++ b/usr.bin/tests/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.include <bsd.own.mk>
+
+TESTSDIR=	${TESTSBASE}/usr.bin
+
+.PATH:		${.CURDIR:H:H}/tests
+KYUAFILE=	yes
+
+.include <bsd.test.mk>
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index dd7d5a03f0a..28cb0718ee3 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -28,7 +28,7 @@
 .\"	@(#)uname.1	8.3 (Berkeley) 4/8/94
 .\" $FreeBSD$
 .\"
-.Dd January 26, 2010
+.Dd November 20, 2013
 .Dt UNAME 1
 .Os
 .Sh NAME
@@ -36,7 +36,7 @@
 .Nd display information about the system
 .Sh SYNOPSIS
 .Nm
-.Op Fl aimnoprsv
+.Op Fl aiKmnoprsUv
 .Sh DESCRIPTION
 The
 .Nm
@@ -55,6 +55,10 @@ and
 were specified.
 .It Fl i
 Write the kernel ident to standard output.
+.It Fl K
+Write the
+.Fx
+version of the kernel.
 .It Fl m
 Write the type of the current hardware platform to standard output.
 .It Fl n
@@ -70,6 +74,10 @@ Write the current release level of the operating system
 to standard output.
 .It Fl s
 Write the name of the operating system implementation to standard output.
+.It Fl U
+Write the
+.Fx
+version of the user environment.
 .It Fl v
 Write the version level of this release of the operating system
 to standard output.
@@ -79,6 +87,14 @@ If the
 .Fl a
 flag is specified, or multiple flags are specified, all
 output is written on a single line, separated by spaces.
+.Pp
+The
+.Fl K
+and
+.Fl U
+flags are intended to be used for fine grain differentiation of incremental
+.Fx
+development and user visible changes.
 .Sh ENVIRONMENT
 An environment variable composed of the string
 .Ev UNAME_
@@ -91,6 +107,8 @@ of the environment variable.
 .Sh EXIT STATUS
 .Ex -std
 .Sh SEE ALSO
+.Xr feature_present 3 ,
+.Xr getosreldate 3 ,
 .Xr sysctl 3 ,
 .Xr uname 3 ,
 .Xr sysctl 8
@@ -104,3 +122,10 @@ specification.
 The
 .Nm
 command appeared in PWB UNIX.
+.Pp
+The
+.Fl K
+and
+.Fl U
+extension flags appeared in
+.Fx 10.0 .
diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c
index 810b218cb97..cf616223275 100644
--- a/usr.bin/uname/uname.c
+++ b/usr.bin/uname/uname.c
@@ -54,6 +54,8 @@ static const char sccsid[] = "@(#)uname.c	8.2 (Berkeley) 5/4/95";
 #include <stdlib.h>
 #include <unistd.h>
 
+#include <osreldate.h>
+
 #define	MFLAG	0x01
 #define	NFLAG	0x02
 #define	PFLAG	0x04
@@ -61,10 +63,12 @@ static const char sccsid[] = "@(#)uname.c	8.2 (Berkeley) 5/4/95";
 #define	SFLAG	0x10
 #define	VFLAG	0x20
 #define	IFLAG	0x40
+#define	UFLAG	0x80
+#define	KFLAG	0x100
 
 typedef void (*get_t)(void);
 static get_t get_ident, get_platform, get_hostname, get_arch,
-    get_release, get_sysname, get_version;
+    get_release, get_sysname, get_kernvers, get_uservers, get_version;
 
 static void native_ident(void);
 static void native_platform(void);
@@ -73,11 +77,13 @@ static void native_arch(void);
 static void native_release(void);
 static void native_sysname(void);
 static void native_version(void);
+static void native_kernvers(void);
+static void native_uservers(void);
 static void print_uname(u_int);
 static void setup_get(void);
 static void usage(void);
 
-static char *ident, *platform, *hostname, *arch, *release, *sysname, *version;
+static char *ident, *platform, *hostname, *arch, *release, *sysname, *version, *kernvers, *uservers;
 static int space;
 
 int
@@ -89,7 +95,7 @@ main(int argc, char *argv[])
 	setup_get();
 	flags = 0;
 
-	while ((ch = getopt(argc, argv, "aimnoprsv")) != -1)
+	while ((ch = getopt(argc, argv, "aiKmnoprsUv")) != -1)
 		switch(ch) {
 		case 'a':
 			flags |= (MFLAG | NFLAG | RFLAG | SFLAG | VFLAG);
@@ -97,6 +103,9 @@ main(int argc, char *argv[])
 		case 'i':
 			flags |= IFLAG;
 			break;
+		case 'K':
+			flags |= KFLAG;
+			break;
 		case 'm':
 			flags |= MFLAG;
 			break;
@@ -113,6 +122,9 @@ main(int argc, char *argv[])
 		case 'o':
 			flags |= SFLAG;
 			break;
+		case 'U':
+			flags |= UFLAG;
+			break;
 		case 'v':
 			flags |= VFLAG;
 			break;
@@ -153,6 +165,8 @@ setup_get(void)
 	CHECK_ENV("m", platform);
 	CHECK_ENV("p", arch);
 	CHECK_ENV("i", ident);
+	CHECK_ENV("K", kernvers);
+	CHECK_ENV("U", uservers);
 }
 
 #define	PRINT_FLAG(flags,flag,var)		\
@@ -176,6 +190,8 @@ print_uname(u_int flags)
 	PRINT_FLAG(flags, MFLAG, platform);
 	PRINT_FLAG(flags, PFLAG, arch);
 	PRINT_FLAG(flags, IFLAG, ident);
+	PRINT_FLAG(flags, KFLAG, kernvers);
+	PRINT_FLAG(flags, UFLAG, uservers);
 	printf("\n");
 }
 
@@ -243,9 +259,27 @@ NATIVE_SYSCTL2_GET(arch, CTL_HW, HW_MACHINE_ARCH) {
 NATIVE_SYSCTLNAME_GET(ident, "kern.ident") {
 } NATIVE_SET;
 
+static void
+native_uservers(void)
+{
+	static char buf[128];
+
+	snprintf(buf, sizeof(buf), "%d", __FreeBSD_version);
+	uservers = buf;
+}
+
+static void
+native_kernvers(void)
+{
+	static char buf[128];
+
+	snprintf(buf, sizeof(buf), "%d", getosreldate());
+	kernvers = buf;
+}
+
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: uname [-aimnoprsv]\n");
+	fprintf(stderr, "usage: uname [-aiKmnoprsUv]\n");
 	exit(1);
 }
diff --git a/usr.bin/xinstall/xinstall.c b/usr.bin/xinstall/xinstall.c
index 15b115abfcc..2a2dc15fc64 100644
--- a/usr.bin/xinstall/xinstall.c
+++ b/usr.bin/xinstall/xinstall.c
@@ -72,11 +72,6 @@ __FBSDID("$FreeBSD$");
 
 #include "mtree.h"
 
-/* Bootstrap aid - this doesn't exist in most older releases */
-#ifndef MAP_FAILED
-#define MAP_FAILED ((void *)-1)	/* from <sys/mman.h> */
-#endif
-
 #define MAX_CMP_SIZE	(16 * 1024 * 1024)
 
 #define	LN_ABSOLUTE	0x01
@@ -126,7 +121,7 @@ static int	create_tempfile(const char *, char *, size_t);
 static char	*quiet_mktemp(char *template);
 static char	*digest_file(const char *);
 static void	digest_init(DIGEST_CTX *);
-static void	digest_update(DIGEST_CTX *, const unsigned char *, size_t);
+static void	digest_update(DIGEST_CTX *, const char *, size_t);
 static char	*digest_end(DIGEST_CTX *, char *);
 static int	do_link(const char *, const char *, const struct stat *);
 static void	do_symlink(const char *, const char *, const struct stat *);
@@ -431,7 +426,7 @@ digest_init(DIGEST_CTX *c)
 }
 
 static void
-digest_update(DIGEST_CTX *c, const unsigned char *data, size_t len)
+digest_update(DIGEST_CTX *c, const char *data, size_t len)
 {
 
 	switch (digesttype) {
@@ -1018,11 +1013,11 @@ compare(int from_fd, const char *from_name __unused, size_t from_len,
 		if (trymmap(from_fd) && trymmap(to_fd)) {
 			p = mmap(NULL, from_len, PROT_READ, MAP_SHARED,
 			    from_fd, (off_t)0);
-			if (p == (char *)MAP_FAILED)
+			if (p == MAP_FAILED)
 				goto out;
 			q = mmap(NULL, from_len, PROT_READ, MAP_SHARED,
 			    to_fd, (off_t)0);
-			if (q == (char *)MAP_FAILED) {
+			if (q == MAP_FAILED) {
 				munmap(p, from_len);
 				goto out;
 			}
@@ -1146,7 +1141,8 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name,
 {
 	int nr, nw;
 	int serrno;
-	char *p, buf[MAXBSIZE];
+	char *p;
+	char buf[MAXBSIZE];
 	int done_copy;
 	DIGEST_CTX ctx;
 
@@ -1166,7 +1162,7 @@ copy(int from_fd, const char *from_name, int to_fd, const char *to_name,
 	done_copy = 0;
 	if (size <= 8 * 1048576 && trymmap(from_fd) &&
 	    (p = mmap(NULL, (size_t)size, PROT_READ, MAP_SHARED,
-		    from_fd, (off_t)0)) != (char *)MAP_FAILED) {
+		    from_fd, (off_t)0)) != MAP_FAILED) {
 		nw = write(to_fd, p, size);
 		if (nw != size) {
 			serrno = errno;
diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile
index 677486fd732..a5f0d1b78ba 100644
--- a/usr.bin/yacc/Makefile
+++ b/usr.bin/yacc/Makefile
@@ -1,7 +1,8 @@
 #	@(#)Makefile	5.3 (Berkeley) 5/12/90
 # $FreeBSD$
 
-.PATH: ${.CURDIR}/../../contrib/byacc
+BYACC_SRC=	${.CURDIR}/../../contrib/byacc
+.PATH: ${BYACC_SRC}
 
 PROG=	yacc
 SRCS=	closure.c error.c graph.c lalr.c lr0.c main.c mkpar.c output.c \
@@ -12,7 +13,10 @@ CFLAGS+=	-DMIXEDCASE_FILENAMES=1 \
 		-DHAVE_FCNTL_H=1 \
 		-DHAVE_ATEXIT=1 \
 		-DHAVE_MKSTEMP=1
-		
+
+YYPATCH!=	cat ${BYACC_SRC}/VERSION
+CFLAGS+=	-DYYPATCH=${YYPATCH}
+
 LINKS=	${BINDIR}/yacc ${BINDIR}/byacc
 MLINKS=	yacc.1 byacc.1
 
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index ba44cd300e2..730495bf37b 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -37,7 +37,6 @@ SUBDIR=	adduser \
 	inetd \
 	iostat \
 	iscsid \
-	isfctl \
 	kldxref \
 	mailwrapper \
 	makefs \
@@ -252,10 +251,6 @@ SUBDIR+=	ftp-proxy
 SUBDIR+=	pkg
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-SUBDIR+=	pkg_install
-.endif
-
 # XXX MK_TOOLCHAIN?
 .if ${MK_PMC} != "no"
 SUBDIR+=	pmcannotate
diff --git a/usr.sbin/acpi/acpidump/acpi.c b/usr.sbin/acpi/acpidump/acpi.c
index d3f968594ba..66cd7bd0087 100644
--- a/usr.sbin/acpi/acpidump/acpi.c
+++ b/usr.sbin/acpi/acpidump/acpi.c
@@ -501,6 +501,7 @@ acpi_handle_hpet(ACPI_TABLE_HEADER *sdp)
 		printf("FALSE}\n");
 	printf("\tPCI Vendor ID=0x%04x\n", hpet->Id >> 16);
 	printf("\tMinimal Tick=%d\n", hpet->MinimumTick);
+	printf("\tFlags=0x%02x\n", hpet->Flags);
 	printf(END_COMMENT);
 }
 
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 93cfd07529c..7bfa8ecf287 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -28,7 +28,7 @@
 .\"	@(#)arp4.4	6.5 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd May 11, 2013
+.Dd November 5, 2013
 .Dt ARP 4
 .Os
 .Sh NAME
@@ -165,10 +165,6 @@ Default is 5 tries.
 .It Va proxyall
 Enables ARP proxying for all hosts on net.
 Turned off by default.
-.It Va useloopback
-If an ARP entry is added for local address, force the traffic to go through
-the loopback interface.
-Turned on by default.
 .It Va wait
 Lifetime of an incomplete ARP entry.
 Default is 20 seconds.
diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile
index ff9425f9a1a..a08341f9d8c 100644
--- a/usr.sbin/bhyve/Makefile
+++ b/usr.sbin/bhyve/Makefile
@@ -7,18 +7,18 @@ PROG=	bhyve
 DEBUG_FLAGS= -g -O0 
 
 SRCS=	acpi.c atpic.c bhyverun.c block_if.c consport.c dbgport.c elcr.c
-SRCS+=  inout.c ioapic.c mem.c mevent.c mptbl.c pci_ahci.c
-SRCS+=	pci_emul.c pci_hostbridge.c pci_passthru.c pci_virtio_block.c
+SRCS+=  inout.c legacy_irq.c mem.c mevent.c mptbl.c pci_ahci.c
+SRCS+=	pci_emul.c pci_hostbridge.c pci_lpc.c pci_passthru.c pci_virtio_block.c
 SRCS+=	pci_virtio_net.c pci_uart.c pit_8254.c pmtmr.c post.c rtc.c
-SRCS+=	virtio.c xmsr.c spinup_ap.c
+SRCS+=	uart_emul.c virtio.c xmsr.c spinup_ap.c
 
 .PATH:	${.CURDIR}/../../sys/amd64/vmm
 SRCS+=	vmm_instruction_emul.c
 
 NO_MAN=
 
-DPADD=	${LIBVMMAPI} ${LIBMD} ${LIBPTHREAD}
-LDADD=	-lvmmapi -lmd -lpthread
+DPADD=	${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD}
+LDADD=	-lvmmapi -lmd -lutil -lpthread
 
 WARNS?=	2
 
diff --git a/usr.sbin/bhyve/acpi.c b/usr.sbin/bhyve/acpi.c
index 89c11bce3cb..32dd8424303 100644
--- a/usr.sbin/bhyve/acpi.c
+++ b/usr.sbin/bhyve/acpi.c
@@ -44,6 +44,7 @@
  *     XSDT  ->   0xf0480    (36 bytes + 8*N table addrs, 2 used)
  *       MADT  ->   0xf0500  (depends on #CPUs)
  *       FADT  ->   0xf0600  (268 bytes)
+ *       HPET  ->   0xf0740  (56 bytes)
  *         FACS  ->   0xf0780 (64 bytes)
  *         DSDT  ->   0xf0800 (variable - can go up to 0x100000)
  */
@@ -61,6 +62,9 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <unistd.h>
 
+#include <machine/vmm.h>
+#include <vmmapi.h>
+
 #include "bhyverun.h"
 #include "acpi.h"
 
@@ -73,6 +77,7 @@ __FBSDID("$FreeBSD$");
 #define XSDT_OFFSET		0x080
 #define MADT_OFFSET		0x100
 #define FADT_OFFSET		0x200
+#define	HPET_OFFSET		0x340
 #define FACS_OFFSET		0x380
 #define DSDT_OFFSET		0x400
 
@@ -86,6 +91,7 @@ static int basl_keep_temps;
 static int basl_verbose_iasl;
 static int basl_ncpu;
 static uint32_t basl_acpi_base = BHYVE_ACPI_BASE;
+static uint32_t hpet_capabilities;
 
 /*
  * Contains the full pathname of the template to be passed
@@ -158,11 +164,13 @@ basl_fwrite_rsdt(FILE *fp)
 	EFPRINTF(fp, "[0004]\t\tAsl Compiler Revision : 00000000\n");
 	EFPRINTF(fp, "\n");
 
-	/* Add in pointers to the MADT and FADT */
+	/* Add in pointers to the MADT, FADT and HPET */
 	EFPRINTF(fp, "[0004]\t\tACPI Table Address 0 : %08X\n",
 	    basl_acpi_base + MADT_OFFSET);
 	EFPRINTF(fp, "[0004]\t\tACPI Table Address 1 : %08X\n",
 	    basl_acpi_base + FADT_OFFSET);
+	EFPRINTF(fp, "[0004]\t\tACPI Table Address 2 : %08X\n",
+	    basl_acpi_base + HPET_OFFSET);
 
 	EFFLUSH(fp);
 
@@ -194,11 +202,13 @@ basl_fwrite_xsdt(FILE *fp)
 	EFPRINTF(fp, "[0004]\t\tAsl Compiler Revision : 00000000\n");
 	EFPRINTF(fp, "\n");
 
-	/* Add in pointers to the MADT and FADT */
+	/* Add in pointers to the MADT, FADT and HPET */
 	EFPRINTF(fp, "[0004]\t\tACPI Table Address 0 : 00000000%08X\n",
 	    basl_acpi_base + MADT_OFFSET);
 	EFPRINTF(fp, "[0004]\t\tACPI Table Address 1 : 00000000%08X\n",
 	    basl_acpi_base + FADT_OFFSET);
+	EFPRINTF(fp, "[0004]\t\tACPI Table Address 2 : 00000000%08X\n",
+	    basl_acpi_base + HPET_OFFSET);
 
 	EFFLUSH(fp);
 
@@ -249,17 +259,27 @@ basl_fwrite_madt(FILE *fp)
 		EFPRINTF(fp, "\n");
 	}
 
-	/* Always a single IOAPIC entry, with ID ncpu+1 */
+	/* Always a single IOAPIC entry, with ID 0 */
 	EFPRINTF(fp, "[0001]\t\tSubtable Type : 01\n");
 	EFPRINTF(fp, "[0001]\t\tLength : 0C\n");
 	/* iasl expects a hex value for the i/o apic id */
-	EFPRINTF(fp, "[0001]\t\tI/O Apic ID : %02x\n", basl_ncpu);
+	EFPRINTF(fp, "[0001]\t\tI/O Apic ID : %02x\n", 0);
 	EFPRINTF(fp, "[0001]\t\tReserved : 00\n");
 	EFPRINTF(fp, "[0004]\t\tAddress : fec00000\n");
 	EFPRINTF(fp, "[0004]\t\tInterrupt : 00000000\n");
 	EFPRINTF(fp, "\n");
 
-	/* Override the 8259 chained vector. XXX maybe not needed */
+	/* Legacy IRQ0 is connected to pin 2 of the IOAPIC */
+	EFPRINTF(fp, "[0001]\t\tSubtable Type : 02\n");
+	EFPRINTF(fp, "[0001]\t\tLength : 0A\n");
+	EFPRINTF(fp, "[0001]\t\tBus : 00\n");
+	EFPRINTF(fp, "[0001]\t\tSource : 00\n");
+	EFPRINTF(fp, "[0004]\t\tInterrupt : 00000002\n");
+	EFPRINTF(fp, "[0002]\t\tFlags (decoded below) : 0005\n");
+	EFPRINTF(fp, "\t\t\tPolarity : 1\n");
+	EFPRINTF(fp, "\t\t\tTrigger Mode : 1\n");
+	EFPRINTF(fp, "\n");
+
 	EFPRINTF(fp, "[0001]\t\tSubtable Type : 02\n");
 	EFPRINTF(fp, "[0001]\t\tLength : 0A\n");
 	EFPRINTF(fp, "[0001]\t\tBus : 00\n");
@@ -488,6 +508,55 @@ err_exit:
 	return (errno);
 }
 
+static int
+basl_fwrite_hpet(FILE *fp)
+{
+	int err;
+
+	err = 0;
+
+	EFPRINTF(fp, "/*\n");
+	EFPRINTF(fp, " * bhyve HPET template\n");
+	EFPRINTF(fp, " */\n");
+	EFPRINTF(fp, "[0004]\t\tSignature : \"HPET\"\n");
+	EFPRINTF(fp, "[0004]\t\tTable Length : 00000000\n");
+	EFPRINTF(fp, "[0001]\t\tRevision : 01\n");
+	EFPRINTF(fp, "[0001]\t\tChecksum : 00\n");
+	EFPRINTF(fp, "[0006]\t\tOem ID : \"BHYVE \"\n");
+	EFPRINTF(fp, "[0008]\t\tOem Table ID : \"BVHPET  \"\n");
+	EFPRINTF(fp, "[0004]\t\tOem Revision : 00000001\n");
+
+	/* iasl will fill in the compiler ID/revision fields */
+	EFPRINTF(fp, "[0004]\t\tAsl Compiler ID : \"xxxx\"\n");
+	EFPRINTF(fp, "[0004]\t\tAsl Compiler Revision : 00000000\n");
+	EFPRINTF(fp, "\n");
+
+	EFPRINTF(fp, "[0004]\t\tTimer Block ID : %08X\n", hpet_capabilities);
+	EFPRINTF(fp,
+	    "[0012]\t\tTimer Block Register : [Generic Address Structure]\n");
+	EFPRINTF(fp, "[0001]\t\tSpace ID : 00 [SystemMemory]\n");
+	EFPRINTF(fp, "[0001]\t\tBit Width : 00\n");
+	EFPRINTF(fp, "[0001]\t\tBit Offset : 00\n");
+	EFPRINTF(fp,
+		 "[0001]\t\tEncoded Access Width : 00 [Undefined/Legacy]\n");
+	EFPRINTF(fp, "[0008]\t\tAddress : 00000000FED00000\n");
+	EFPRINTF(fp, "\n");
+
+	EFPRINTF(fp, "[0001]\t\tHPET Number : 00\n");
+	EFPRINTF(fp, "[0002]\t\tMinimum Clock Ticks : 0000\n");
+	EFPRINTF(fp, "[0004]\t\tFlags (decoded below) : 00000001\n");
+	EFPRINTF(fp, "\t\t\t4K Page Protect : 1\n");
+	EFPRINTF(fp, "\t\t\t64K Page Protect : 0\n");
+	EFPRINTF(fp, "\n");
+
+	EFFLUSH(fp);
+
+	return (0);
+
+err_exit:
+	return (errno);
+}
+
 static int
 basl_fwrite_facs(FILE *fp)
 {
@@ -584,6 +653,24 @@ basl_fwrite_dsdt(FILE *fp)
 	EFPRINTF(fp, "      Name (_ADR, 0x00010000)\n");
 	EFPRINTF(fp, "      OperationRegion (P40C, PCI_Config, 0x60, 0x04)\n");
 	EFPRINTF(fp, "    }\n");
+
+	EFPRINTF(fp, "    Device (HPET)\n");
+	EFPRINTF(fp, "    {\n");
+	EFPRINTF(fp, "      Name (_HID, EISAID(\"PNP0103\"))\n");
+	EFPRINTF(fp, "      Name (_UID, 0)\n");
+	EFPRINTF(fp, "      Name (_CRS, ResourceTemplate ()\n");
+	EFPRINTF(fp, "      {\n");
+	EFPRINTF(fp, "        DWordMemory (ResourceConsumer, PosDecode, "
+		 "MinFixed, MaxFixed, NonCacheable, ReadWrite,\n");
+	EFPRINTF(fp, "            0x00000000,\n");
+	EFPRINTF(fp, "            0xFED00000,\n");
+	EFPRINTF(fp, "            0xFED003FF,\n");
+	EFPRINTF(fp, "            0x00000000,\n");
+	EFPRINTF(fp, "            0x00000400\n");
+	EFPRINTF(fp, "            )\n");
+	EFPRINTF(fp, "      })\n");
+	EFPRINTF(fp, "    }\n");
+
 	EFPRINTF(fp, "  }\n");
 	EFPRINTF(fp, "\n");
 	EFPRINTF(fp, "  Scope (_SB.PCI0.ISA)\n");
@@ -800,24 +887,23 @@ static struct {
 	{ basl_fwrite_xsdt, XSDT_OFFSET },
 	{ basl_fwrite_madt, MADT_OFFSET },
 	{ basl_fwrite_fadt, FADT_OFFSET },
+	{ basl_fwrite_hpet, HPET_OFFSET },
 	{ basl_fwrite_facs, FACS_OFFSET },
 	{ basl_fwrite_dsdt, DSDT_OFFSET },
 	{ NULL }
 };
 
 int
-acpi_build(struct vmctx *ctx, int ncpu, int ioapic)
+acpi_build(struct vmctx *ctx, int ncpu)
 {
 	int err;
 	int i;
 
-	err = 0;
 	basl_ncpu = ncpu;
 
-	if (!ioapic) {
-		fprintf(stderr, "ACPI tables require an ioapic\n");
-		return (EINVAL);
-	}
+	err = vm_get_hpet_capabilities(ctx, &hpet_capabilities);
+	if (err != 0)
+		return (err);
 
 	/*
 	 * For debug, allow the user to have iasl compiler output sent
diff --git a/usr.sbin/bhyve/acpi.h b/usr.sbin/bhyve/acpi.h
index fec6c9d6073..12d1ee059bf 100644
--- a/usr.sbin/bhyve/acpi.h
+++ b/usr.sbin/bhyve/acpi.h
@@ -29,6 +29,6 @@
 #ifndef _ACPI_H_
 #define _ACPI_H_
 
-int	acpi_build(struct vmctx *ctx, int ncpu, int ioapic);
+int	acpi_build(struct vmctx *ctx, int ncpu);
 
 #endif /* _ACPI_H_ */
diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c
index f37177fdbd0..0ea2904b6f3 100644
--- a/usr.sbin/bhyve/bhyverun.c
+++ b/usr.sbin/bhyve/bhyverun.c
@@ -33,16 +33,20 @@ __FBSDID("$FreeBSD$");
 #include <sys/mman.h>
 #include <sys/time.h>
 
+#include <machine/atomic.h>
 #include <machine/segments.h>
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <err.h>
 #include <libgen.h>
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
 #include <pthread.h>
 #include <pthread_np.h>
+#include <sysexits.h>
 
 #include <machine/vmm.h>
 #include <vmmapi.h>
@@ -51,12 +55,13 @@ __FBSDID("$FreeBSD$");
 #include "acpi.h"
 #include "inout.h"
 #include "dbgport.h"
+#include "legacy_irq.h"
 #include "mem.h"
 #include "mevent.h"
 #include "mptbl.h"
 #include "pci_emul.h"
+#include "pci_lpc.h"
 #include "xmsr.h"
-#include "ioapic.h"
 #include "spinup_ap.h"
 #include "rtc.h"
 
@@ -79,8 +84,7 @@ int guest_ncpus;
 
 static int pincpu = -1;
 static int guest_vmexit_on_hlt, guest_vmexit_on_pause, disable_x2apic;
-
-static int foundcpus;
+static int virtio_msix = 1;
 
 static int strictio;
 
@@ -118,23 +122,23 @@ usage(int code)
 {
 
         fprintf(stderr,
-                "Usage: %s [-aehAHIP][-g <gdb port>][-s <pci>][-S <pci>]"
-		"[-c vcpus][-p pincpu][-m mem]"
-		" <vmname>\n"
+                "Usage: %s [-aehAHIPW] [-g <gdb port>] [-s <pci>] [-S <pci>]\n"
+		"       %*s [-c vcpus] [-p pincpu] [-m mem] [-l <lpc>] <vm>\n"
 		"       -a: local apic is in XAPIC mode (default is X2APIC)\n"
 		"       -A: create an ACPI table\n"
-		"       -g: gdb port (default is %d and 0 means don't open)\n"
+		"       -g: gdb port\n"
 		"       -c: # cpus (default 1)\n"
 		"       -p: pin vcpu 'n' to host cpu 'pincpu + n'\n"
 		"       -H: vmexit from the guest on hlt\n"
-		"       -I: present an ioapic to the guest\n"
 		"       -P: vmexit from the guest on pause\n"
-		"	-e: exit on unhandled i/o access\n"
+		"       -W: force virtio to use single-vector MSI\n"
+		"       -e: exit on unhandled I/O access\n"
 		"       -h: help\n"
 		"       -s: <slot,driver,configinfo> PCI slot config\n"
 		"       -S: <slot,driver,configinfo> legacy PCI slot config\n"
+		"       -l: LPC device configuration\n"
 		"       -m: memory size in MB\n",
-		progname, DEFAULT_GDB_PORT);
+		progname, (int)strlen(progname), "");
 
 	exit(code);
 }
@@ -167,6 +171,13 @@ fbsdrun_vmexit_on_hlt(void)
 	return (guest_vmexit_on_hlt);
 }
 
+int
+fbsdrun_virtio_msix(void)
+{
+
+	return (virtio_msix);
+}
+
 static void *
 fbsdrun_start_thread(void *param)
 {
@@ -177,7 +188,7 @@ fbsdrun_start_thread(void *param)
 	mtp = param;
 	vcpu = mtp->mt_vcpu;
 
-	snprintf(tname, sizeof(tname), "%s vcpu %d", vmname, vcpu);
+	snprintf(tname, sizeof(tname), "vcpu %d", vcpu);
 	pthread_set_name_np(mtp->mt_thr, tname);
 
 	vm_loop(mtp->mt_ctx, vcpu, vmexit[vcpu].rip);
@@ -198,8 +209,7 @@ fbsdrun_addcpu(struct vmctx *ctx, int vcpu, uint64_t rip)
 		exit(1);
 	}
 
-	cpumask |= 1 << vcpu;
-	foundcpus++;
+	atomic_set_int(&cpumask, 1 << vcpu);
 
 	/*
 	 * Set up the vmexit struct to allow execution to start
@@ -217,14 +227,17 @@ fbsdrun_addcpu(struct vmctx *ctx, int vcpu, uint64_t rip)
 }
 
 static int
-fbsdrun_get_next_cpu(int curcpu)
+fbsdrun_deletecpu(struct vmctx *ctx, int vcpu)
 {
 
-	/*
-	 * Get the next available CPU. Assumes they arrive
-	 * in ascending order with no gaps.
-	 */
-	return ((curcpu + 1) % foundcpus);
+	if ((cpumask & (1 << vcpu)) == 0) {
+		fprintf(stderr, "addcpu: attempting to delete unknown cpu %d\n",
+		    vcpu);
+		exit(1);
+	}
+
+	atomic_clear_int(&cpumask, 1 << vcpu);
+	return (cpumask == 0);
 }
 
 static int
@@ -325,6 +338,17 @@ vmexit_spinup_ap(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu)
 	return (retval);
 }
 
+static int
+vmexit_spindown_cpu(struct vmctx *ctx, struct vm_exit *vme, int *pvcpu)
+{
+	int lastcpu;
+
+	lastcpu = fbsdrun_deletecpu(ctx, *pvcpu);
+	if (!lastcpu)
+		pthread_exit(NULL);
+	return (vmexit_catch_reset());
+}
+
 static int
 vmexit_vmx(struct vmctx *ctx, struct vm_exit *vmexit, int *pvcpu)
 {
@@ -416,6 +440,7 @@ static vmexit_handler_t handler[VM_EXITCODE_MAX] = {
 	[VM_EXITCODE_MTRAP]  = vmexit_mtrap,
 	[VM_EXITCODE_INST_EMUL] = vmexit_inst_emul,
 	[VM_EXITCODE_SPINUP_AP] = vmexit_spinup_ap,
+	[VM_EXITCODE_SPINDOWN_CPU] = vmexit_spindown_cpu,
 };
 
 static void
@@ -493,10 +518,54 @@ num_vcpus_allowed(struct vmctx *ctx)
 		return (1);
 }
 
+void
+fbsdrun_set_capabilities(struct vmctx *ctx, int cpu)
+{
+	int err, tmp;
+
+	if (fbsdrun_vmexit_on_hlt()) {
+		err = vm_get_capability(ctx, cpu, VM_CAP_HALT_EXIT, &tmp);
+		if (err < 0) {
+			fprintf(stderr, "VM exit on HLT not supported\n");
+			exit(1);
+		}
+		vm_set_capability(ctx, cpu, VM_CAP_HALT_EXIT, 1);
+		if (cpu == BSP)
+			handler[VM_EXITCODE_HLT] = vmexit_hlt;
+	}
+
+        if (fbsdrun_vmexit_on_pause()) {
+		/*
+		 * pause exit support required for this mode
+		 */
+		err = vm_get_capability(ctx, cpu, VM_CAP_PAUSE_EXIT, &tmp);
+		if (err < 0) {
+			fprintf(stderr,
+			    "SMP mux requested, no pause support\n");
+			exit(1);
+		}
+		vm_set_capability(ctx, cpu, VM_CAP_PAUSE_EXIT, 1);
+		if (cpu == BSP)
+			handler[VM_EXITCODE_PAUSE] = vmexit_pause;
+        }
+
+	if (fbsdrun_disable_x2apic())
+		err = vm_set_x2apic_state(ctx, cpu, X2APIC_DISABLED);
+	else
+		err = vm_set_x2apic_state(ctx, cpu, X2APIC_ENABLED);
+
+	if (err) {
+		fprintf(stderr, "Unable to set x2apic state (%d)\n", err);
+		exit(1);
+	}
+
+	vm_set_capability(ctx, cpu, VM_CAP_ENABLE_INVPCID, 1);
+}
+
 int
 main(int argc, char *argv[])
 {
-	int c, error, gdb_port, tmp, err, ioapic, bvmcons;
+	int c, error, gdb_port, err, bvmcons;
 	int max_vcpus;
 	struct vmctx *ctx;
 	uint64_t rip;
@@ -504,12 +573,11 @@ main(int argc, char *argv[])
 
 	bvmcons = 0;
 	progname = basename(argv[0]);
-	gdb_port = DEFAULT_GDB_PORT;
+	gdb_port = 0;
 	guest_ncpus = 1;
-	ioapic = 0;
 	memsize = 256 * MB;
 
-	while ((c = getopt(argc, argv, "abehAHIPp:g:c:s:S:m:")) != -1) {
+	while ((c = getopt(argc, argv, "abehAHIPWp:g:c:s:S:m:l:")) != -1) {
 		switch (c) {
 		case 'a':
 			disable_x2apic = 1;
@@ -529,6 +597,12 @@ main(int argc, char *argv[])
 		case 'g':
 			gdb_port = atoi(optarg);
 			break;
+		case 'l':
+			if (lpc_device_parse(optarg) != 0) {
+				errx(EX_USAGE, "invalid lpc device "
+				    "configuration '%s'", optarg);
+			}
+			break;
 		case 's':
 			if (pci_parse_slot(optarg, 0) != 0)
 				exit(1);
@@ -540,13 +614,21 @@ main(int argc, char *argv[])
 			else
 				break;
                 case 'm':
-			memsize = strtoul(optarg, NULL, 0) * MB;
+			error = vm_parse_memsize(optarg, &memsize);
+			if (error)
+				errx(EX_USAGE, "invalid memsize '%s'", optarg);
 			break;
 		case 'H':
 			guest_vmexit_on_hlt = 1;
 			break;
 		case 'I':
-			ioapic = 1;
+			/*
+			 * The "-I" option was used to add an ioapic to the
+			 * virtual machine.
+			 *
+			 * An ioapic is now provided unconditionally for each
+			 * virtual machine and this option is now deprecated.
+			 */
 			break;
 		case 'P':
 			guest_vmexit_on_pause = 1;
@@ -554,6 +636,9 @@ main(int argc, char *argv[])
 		case 'e':
 			strictio = 1;
 			break;
+		case 'W':
+			virtio_msix = 0;
+			break;
 		case 'h':
 			usage(0);			
 		default:
@@ -581,39 +666,7 @@ main(int argc, char *argv[])
 		exit(1);
 	}
 
-	if (fbsdrun_vmexit_on_hlt()) {
-		err = vm_get_capability(ctx, BSP, VM_CAP_HALT_EXIT, &tmp);
-		if (err < 0) {
-			fprintf(stderr, "VM exit on HLT not supported\n");
-			exit(1);
-		}
-		vm_set_capability(ctx, BSP, VM_CAP_HALT_EXIT, 1);
-		handler[VM_EXITCODE_HLT] = vmexit_hlt;
-	}
-
-        if (fbsdrun_vmexit_on_pause()) {
-		/*
-		 * pause exit support required for this mode
-		 */
-		err = vm_get_capability(ctx, BSP, VM_CAP_PAUSE_EXIT, &tmp);
-		if (err < 0) {
-			fprintf(stderr,
-			    "SMP mux requested, no pause support\n");
-			exit(1);
-		}
-		vm_set_capability(ctx, BSP, VM_CAP_PAUSE_EXIT, 1);
-		handler[VM_EXITCODE_PAUSE] = vmexit_pause;
-        }
-
-	if (fbsdrun_disable_x2apic())
-		err = vm_set_x2apic_state(ctx, BSP, X2APIC_DISABLED);
-	else
-		err = vm_set_x2apic_state(ctx, BSP, X2APIC_ENABLED);
-
-	if (err) {
-		fprintf(stderr, "Unable to set x2apic state (%d)\n", err);
-		exit(1);
-	}
+	fbsdrun_set_capabilities(ctx, BSP);
 
 	err = vm_setup_memory(ctx, memsize, VM_MMAP_ALL);
 	if (err) {
@@ -623,6 +676,7 @@ main(int argc, char *argv[])
 
 	init_mem();
 	init_inout();
+	legacy_irq_init();
 
 	rtc_init(ctx);
 
@@ -632,9 +686,6 @@ main(int argc, char *argv[])
 	if (init_pci(ctx) != 0)
 		exit(1);
 
-	if (ioapic)
-		ioapic_init(0);
-
 	if (gdb_port != 0)
 		init_dbgport(gdb_port);
 
@@ -647,13 +698,18 @@ main(int argc, char *argv[])
 	/*
 	 * build the guest tables, MP etc.
 	 */
-	mptable_build(ctx, guest_ncpus, ioapic);
+	mptable_build(ctx, guest_ncpus);
 
 	if (acpi) {
-		error = acpi_build(ctx, guest_ncpus, ioapic);
+		error = acpi_build(ctx, guest_ncpus);
 		assert(error == 0);
 	}
 
+	/*
+	 * Change the proc title to include the VM name.
+	 */
+	setproctitle("%s", vmname); 
+	
 	/*
 	 * Add CPU 0
 	 */
diff --git a/usr.sbin/bhyve/bhyverun.h b/usr.sbin/bhyve/bhyverun.h
index 28ffb3cc727..f5246d45a74 100644
--- a/usr.sbin/bhyve/bhyverun.h
+++ b/usr.sbin/bhyve/bhyverun.h
@@ -41,9 +41,11 @@ extern char *vmname;
 
 void *paddr_guest2host(struct vmctx *ctx, uintptr_t addr, size_t len);
 
+void fbsdrun_set_capabilities(struct vmctx *ctx, int cpu);
 void fbsdrun_addcpu(struct vmctx *ctx, int cpu, uint64_t rip);
 int  fbsdrun_muxed(void);
 int  fbsdrun_vmexit_on_hlt(void);
 int  fbsdrun_vmexit_on_pause(void);
 int  fbsdrun_disable_x2apic(void);
+int  fbsdrun_virtio_msix(void);
 #endif
diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c
index 9228b9af0ac..ba7cfcddadf 100644
--- a/usr.sbin/bhyve/block_if.c
+++ b/usr.sbin/bhyve/block_if.c
@@ -293,7 +293,7 @@ blockif_open(const char *optstr, const char *ident)
 
 	pthread_create(&bc->bc_btid, NULL, blockif_thr, bc);
 
-	snprintf(tname, sizeof(tname), "%s blk-%s", vmname, ident);
+	snprintf(tname, sizeof(tname), "blk-%s", ident);
 	pthread_set_name_np(bc->bc_btid, tname);
 
 	return (bc);
diff --git a/usr.sbin/bhyve/dbgport.h b/usr.sbin/bhyve/dbgport.h
index 8c7dab7f83c..2ddcbf8f803 100644
--- a/usr.sbin/bhyve/dbgport.h
+++ b/usr.sbin/bhyve/dbgport.h
@@ -29,8 +29,6 @@
 #ifndef _DBGPORT_H_
 #define	_DBGPORT_H_
 
-#define	DEFAULT_GDB_PORT	6466
-
 void	init_dbgport(int port);
 
 #endif
diff --git a/usr.sbin/bhyve/inout.c b/usr.sbin/bhyve/inout.c
index 29d9f17966b..a2002652d03 100644
--- a/usr.sbin/bhyve/inout.c
+++ b/usr.sbin/bhyve/inout.c
@@ -84,7 +84,7 @@ register_default_iohandler(int start, int size)
 	iop.name = "default";
 	iop.port = start;
 	iop.size = size;
-	iop.flags = IOPORT_F_INOUT;
+	iop.flags = IOPORT_F_INOUT | IOPORT_F_DEFAULT;
 	iop.handler = default_inout;
 
 	register_inout(&iop);
@@ -159,7 +159,18 @@ register_inout(struct inout_port *iop)
 	int i;
 
 	VERIFY_IOPORT(iop->port, iop->size);
-	
+
+	/*
+	 * Verify that the new registration is not overwriting an already
+	 * allocated i/o range.
+	 */
+	if ((iop->flags & IOPORT_F_DEFAULT) == 0) {
+		for (i = iop->port; i < iop->port + iop->size; i++) {
+			if ((inout_handlers[i].flags & IOPORT_F_DEFAULT) == 0)
+				return (-1);
+		}
+	}
+
 	for (i = iop->port; i < iop->port + iop->size; i++) {
 		inout_handlers[i].name = iop->name;
 		inout_handlers[i].flags = iop->flags;
diff --git a/usr.sbin/bhyve/inout.h b/usr.sbin/bhyve/inout.h
index 4de58d10f58..2f93ea0701f 100644
--- a/usr.sbin/bhyve/inout.h
+++ b/usr.sbin/bhyve/inout.h
@@ -46,7 +46,13 @@ struct inout_port {
 };
 #define	IOPORT_F_IN		0x1
 #define	IOPORT_F_OUT		0x2
-#define	IOPORT_F_INOUT		0x3
+#define	IOPORT_F_INOUT		(IOPORT_F_IN | IOPORT_F_OUT)
+
+/*
+ * The following flags are used internally and must not be used by
+ * device models.
+ */
+#define	IOPORT_F_DEFAULT	0x80000000	/* claimed by default handler */
 
 #define	INOUT_PORT(name, port, flags, handler)				\
 	static struct inout_port __CONCAT(__inout_port, __LINE__) = {	\
diff --git a/usr.sbin/bhyve/ioapic.c b/usr.sbin/bhyve/ioapic.c
deleted file mode 100644
index aeb008ea2c2..00000000000
--- a/usr.sbin/bhyve/ioapic.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/*-
- * Copyright (c) 2012 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/types.h>
-
-#include <x86/apicreg.h>
-#include <machine/vmm.h>
-
-#include <string.h>
-#include <assert.h>
-#include <stdbool.h>
-
-#include <vmmapi.h>
-
-#include "inout.h"
-#include "mem.h"
-#include "bhyverun.h"
-
-#include <stdio.h>
-
-#define	IOAPIC_PADDR	0xFEC00000
-
-#define	IOREGSEL	0x00
-#define	IOWIN		0x10
-
-#define	REDIR_ENTRIES	16
-#define	INTR_ASSERTED(ioapic, pin)	((ioapic)->pinstate[(pin)] == true)
-
-struct ioapic {
-	int		inited;
-	uint32_t	id;
-	uint64_t	redtbl[REDIR_ENTRIES];
-	bool		pinstate[REDIR_ENTRIES];
-
-	uintptr_t	paddr;		/* gpa where the ioapic is mapped */
-	uint32_t	ioregsel;
-	struct memory_region *region;
-};
-
-static struct ioapic ioapics[1];	/* only a single ioapic for now */
-
-static int ioapic_region_read(struct ioapic *ioapic, uintptr_t paddr,
-				int size, uint64_t *data);
-static int ioapic_region_write(struct ioapic *ioapic, uintptr_t paddr,
-				int size, uint64_t data);
-static int ioapic_region_handler(struct vmctx *vm, int vcpu, int dir,
-				 uintptr_t paddr, int size, uint64_t *val,
-				 void *arg1, long arg2);
-
-static void
-ioapic_set_pinstate(struct vmctx *ctx, int pin, bool newstate)
-{
-	int vector, apicid, vcpu;
-	uint32_t low, high;
-	struct ioapic *ioapic;
-	
-	ioapic = &ioapics[0];		/* assume a single ioapic */
-
-	if (pin < 0 || pin >= REDIR_ENTRIES)
-		return;
-
-	/* Nothing to do if interrupt pin has not changed state */
-	if (ioapic->pinstate[pin] == newstate)
-		return;
-
-	ioapic->pinstate[pin] = newstate;	/* record it */
-
-	/* Nothing to do if interrupt pin is deasserted */
-	if (!INTR_ASSERTED(ioapic, pin))
-		return;
-
-	/*
-	 * XXX
-	 * We only deal with:
-	 * - edge triggered interrupts
-	 * - fixed delivery mode
-	 *  Level-triggered sources will work so long as there is
-	 * no sharing.
-	 */
-	low = ioapic->redtbl[pin];
-	high = ioapic->redtbl[pin] >> 32;
-	if ((low & IOART_INTMASK) == IOART_INTMCLR &&
-	    (low & IOART_DESTMOD) == IOART_DESTPHY &&
-	    (low & IOART_DELMOD) == IOART_DELFIXED) {
-		vector = low & IOART_INTVEC;
-		apicid = high >> APIC_ID_SHIFT;
-		if (apicid != 0xff) {
-			/* unicast */
-			vcpu = vm_apicid2vcpu(ctx, apicid);
-			vm_lapic_irq(ctx, vcpu, vector);
-		} else {
-			/* broadcast */
-			vcpu = 0;
-			while (vcpu < guest_ncpus) {
-				vm_lapic_irq(ctx, vcpu, vector);
-				vcpu++;
-			}
-		}
-	}
-}
-
-void
-ioapic_deassert_pin(struct vmctx *ctx, int pin)
-{
-	ioapic_set_pinstate(ctx, pin, false);
-}
-
-void
-ioapic_assert_pin(struct vmctx *ctx, int pin)
-{
-	ioapic_set_pinstate(ctx, pin, true);
-}
-
-void
-ioapic_init(int which)
-{
-	struct mem_range memp;
-	struct ioapic *ioapic;
-	int error;
-	int i;
-
-	assert(which == 0);
-
-	ioapic = &ioapics[which];
-	assert(ioapic->inited == 0);
-
-	bzero(ioapic, sizeof(struct ioapic));
-
-	/* Initialize all redirection entries to mask all interrupts */
-	for (i = 0; i < REDIR_ENTRIES; i++)
-		ioapic->redtbl[i] = 0x0001000000010000UL;
-
-	ioapic->paddr = IOAPIC_PADDR;
-
-	/* Register emulated memory region */
-	memp.name = "ioapic";
-	memp.flags = MEM_F_RW;
-	memp.handler = ioapic_region_handler;
-	memp.arg1 = ioapic;
-	memp.arg2 = which;
-	memp.base = ioapic->paddr;
-	memp.size = sizeof(struct IOAPIC);
-	error = register_mem(&memp);
-
-	assert (error == 0);
-
-	ioapic->inited = 1;
-}
-
-static uint32_t
-ioapic_read(struct ioapic *ioapic, uint32_t addr)
-{
-	int regnum, pin, rshift;
-
-	assert(ioapic->inited);
-
-	regnum = addr & 0xff;
-	switch (regnum) {
-	case IOAPIC_ID:
-		return (ioapic->id);
-		break;
-	case IOAPIC_VER:
-		return ((REDIR_ENTRIES << MAXREDIRSHIFT) | 0x11);
-		break;
-	case IOAPIC_ARB:
-		return (ioapic->id);
-		break;
-	default:
-		break;
-	}
-
-	/* redirection table entries */
-	if (regnum >= IOAPIC_REDTBL &&
-	    regnum < IOAPIC_REDTBL + REDIR_ENTRIES * 2) {
-		pin = (regnum - IOAPIC_REDTBL) / 2;
-		if ((regnum - IOAPIC_REDTBL) % 2)
-			rshift = 32;
-		else
-			rshift = 0;
-
-		return (ioapic->redtbl[pin] >> rshift);
-	}
-
-	return (0);
-}
-
-static void
-ioapic_write(struct ioapic *ioapic, uint32_t addr, uint32_t data)
-{
-	int regnum, pin, lshift;
-
-	assert(ioapic->inited);
-
-	regnum = addr & 0xff;
-	switch (regnum) {
-	case IOAPIC_ID:
-		ioapic->id = data & APIC_ID_MASK;
-		break;
-	case IOAPIC_VER:
-	case IOAPIC_ARB:
-		/* readonly */
-		break;
-	default:
-		break;
-	}
-
-	/* redirection table entries */
-	if (regnum >= IOAPIC_REDTBL &&
-	    regnum < IOAPIC_REDTBL + REDIR_ENTRIES * 2) {
-		pin = (regnum - IOAPIC_REDTBL) / 2;
-		if ((regnum - IOAPIC_REDTBL) % 2)
-			lshift = 32;
-		else
-			lshift = 0;
-
-		ioapic->redtbl[pin] &= ~((uint64_t)0xffffffff << lshift);
-		ioapic->redtbl[pin] |= ((uint64_t)data << lshift);
-	}
-}
-
-static int
-ioapic_region_read(struct ioapic *ioapic, uintptr_t paddr, int size,
-		   uint64_t *data)
-{
-	int offset;
-
-	offset = paddr - ioapic->paddr;
-
-	/*
-	 * The IOAPIC specification allows 32-bit wide accesses to the
-	 * IOREGSEL (offset 0) and IOWIN (offset 16) registers.
-	 */
-	if (size != 4 || (offset != IOREGSEL && offset != IOWIN)) {
-#if 1
-		printf("invalid access to ioapic%d: size %d, offset %d\n",
-		       (int)(ioapic - ioapics), size, offset);
-#endif
-		*data = 0;
-		return (0);
-	}
-
-	if (offset == IOREGSEL)
-		*data = ioapic->ioregsel;
-	else
-		*data = ioapic_read(ioapic, ioapic->ioregsel);
-
-	return (0);
-}
-
-static int
-ioapic_region_write(struct ioapic *ioapic, uintptr_t paddr, int size,
-		    uint64_t data)
-{
-	int offset;
-
-	offset = paddr - ioapic->paddr;
-
-	/*
-	 * The ioapic specification allows 32-bit wide accesses to the
-	 * IOREGSEL (offset 0) and IOWIN (offset 16) registers.
-	 */
-	if (size != 4 || (offset != IOREGSEL && offset != IOWIN)) {
-#if 1
-		printf("invalid access to ioapic%d: size %d, offset %d\n",
-		       (int)(ioapic - ioapics), size, offset);
-#endif
-		return (0);
-	}
-
-	if (offset == IOREGSEL)
-		ioapic->ioregsel = data;
-	else
-		ioapic_write(ioapic, ioapic->ioregsel, data);
-
-	return (0);
-}
-
-static int
-ioapic_region_handler(struct vmctx *vm, int vcpu, int dir, uintptr_t paddr,
-		      int size, uint64_t *val, void *arg1, long arg2)
-{
-	struct ioapic *ioapic;
-	int which;
-
-	ioapic = arg1;
-	which = arg2;
-
-	assert(ioapic == &ioapics[which]);
-
-	if (dir == MEM_F_READ)
-		ioapic_region_read(ioapic, paddr, size, val);
-	else
-		ioapic_region_write(ioapic, paddr, size, *val);
-
-	return (0);
-}
diff --git a/sys/amd64/vmm/io/vdev.h b/usr.sbin/bhyve/legacy_irq.c
similarity index 51%
rename from sys/amd64/vmm/io/vdev.h
rename to usr.sbin/bhyve/legacy_irq.c
index 6feeba87b7c..9e86efdbbf4 100644
--- a/sys/amd64/vmm/io/vdev.h
+++ b/usr.sbin/bhyve/legacy_irq.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2011 NetApp, Inc.
+ * Copyright (c) 2013 Neel Natu <neel@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,59 +26,55 @@
  * $FreeBSD$
  */
 
-#ifndef _VDEV_H_
-#define	_VDEV_H_
+#include <stdbool.h>
+#include <assert.h>
 
-typedef enum {
-	BYTE	= 1,
-	WORD	= 2,
-	DWORD	= 4,
-	QWORD	= 8,
-} opsize_t;
+/*
+ * Used to keep track of legacy interrupt owners/requestors
+ */
+#define NLIRQ		16
 
-typedef enum {
-	MMIO_READ = 1,
-	MMIO_WRITE = 2,
-} region_attr_t;
+static struct lirqinfo {
+	bool	li_generic;
+	bool	li_allocated;
+} lirq[NLIRQ];
 
-struct io_region {
-	uint64_t	base;
-	uint64_t	len;
-	region_attr_t	attr;
-	int		vcpu;
-};
+void
+legacy_irq_init(void)
+{
 
-typedef int (*vdev_init_t)(void* dev);
-typedef int (*vdev_reset_t)(void* dev);
-typedef int (*vdev_halt_t)(void* dev);
-typedef int (*vdev_memread_t)(void* dev, uint64_t gpa, opsize_t size, uint64_t *data);
-typedef int (*vdev_memwrite_t)(void* dev, uint64_t gpa, opsize_t size, uint64_t data);
+	/*
+	 * Allow ISA IRQs 5,10,11,12, and 15 to be available for generic use.
+	 */
+	lirq[5].li_generic = true;
+	lirq[10].li_generic = true;
+	lirq[11].li_generic = true;
+	lirq[12].li_generic = true;
+	lirq[15].li_generic = true;
+}
 
+int
+legacy_irq_alloc(int irq)
+{
+	int i;
 
-struct vdev_ops {
-	const char	*name;
-	vdev_init_t	init;
-	vdev_reset_t	reset;
-	vdev_halt_t	halt;
-	vdev_memread_t	memread;
-	vdev_memwrite_t	memwrite;
-};
+	assert(irq < NLIRQ);
 
+	if (irq < 0) {
+		for (i = 0; i < NLIRQ; i++) {
+			if (lirq[i].li_generic && !lirq[i].li_allocated) {
+				irq = i;
+				break;
+			}
+		}
+	} else {
+		if (lirq[irq].li_allocated)
+			irq = -1;
+	}
 
-void vdev_vm_init(void);
-void vdev_vm_cleanup(void);
-
-int  vdev_register(struct vdev_ops *ops, void *dev);
-void vdev_unregister(void *dev);
-
-int  vdev_register_region(struct vdev_ops *ops, void *dev, struct io_region *io);
-void vdev_unregister_region(void *dev, struct io_region *io);
-
-int vdev_init(void);
-int vdev_reset(void);
-int vdev_halt(void);
-int vdev_memread(uint64_t gpa, opsize_t size, uint64_t *data);
-int vdev_memwrite(uint64_t gpa, opsize_t size, uint64_t data);
-
-#endif	/* _VDEV_H_ */
-
+	if (irq >= 0) {
+		lirq[irq].li_allocated = true;
+		return (irq);
+	} else
+		return (-1);
+}
diff --git a/usr.sbin/bhyve/legacy_irq.h b/usr.sbin/bhyve/legacy_irq.h
new file mode 100644
index 00000000000..3531e11a5f2
--- /dev/null
+++ b/usr.sbin/bhyve/legacy_irq.h
@@ -0,0 +1,41 @@
+/*-
+ * Copyright (c) 2013 Neel Natu <neel@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 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$
+ */
+
+#ifndef _LEGACY_IRQ_H_
+#define	_LEGACY_IRQ_H_
+
+/*
+ * Allocate a legacy irq. The argument 'irq' can be set to -1 to allocate any
+ * available irq.
+ *
+ * Returns -1 on failure or the allocated irq number on success.
+ */
+int	legacy_irq_alloc(int irq);
+void	legacy_irq_init(void);
+
+#endif
diff --git a/usr.sbin/bhyve/mevent.c b/usr.sbin/bhyve/mevent.c
index eff061017f4..82e5edd7013 100644
--- a/usr.sbin/bhyve/mevent.c
+++ b/usr.sbin/bhyve/mevent.c
@@ -381,10 +381,8 @@ mevent_delete_close(struct mevent *evp)
 static void
 mevent_set_name(void)
 {
-	char tname[MAXCOMLEN + 1];
 
-	snprintf(tname, sizeof(tname), "%s mevent", vmname);
-	pthread_set_name_np(mevent_tid, tname);
+	pthread_set_name_np(mevent_tid, "mevent");
 }
 
 void
diff --git a/usr.sbin/bhyve/mptbl.c b/usr.sbin/bhyve/mptbl.c
index 74db2ea96c3..3d45cc6cd77 100644
--- a/usr.sbin/bhyve/mptbl.c
+++ b/usr.sbin/bhyve/mptbl.c
@@ -71,18 +71,8 @@ __FBSDID("$FreeBSD$");
 
 #define MPEP_FEATURES           (0xBFEBFBFF) /* XXX Intel i7 */
 
-/* Define processor entry struct since <x86/mptable.h> gets it wrong */
-typedef struct BPROCENTRY {
-	u_char		type;
-	u_char		apic_id;
-	u_char		apic_version;
-	u_char		cpu_flags;
-	uint32_t	cpu_signature;
-	uint32_t	feature_flags;
-	uint32_t	reserved1;
-	uint32_t	reserved2;
-}      *bproc_entry_ptr;
-CTASSERT(sizeof(struct BPROCENTRY) == 20);
+/* Number of i/o intr entries */
+#define	MPEII_MAX_IRQ		24
 
 /* Bus entry defines */
 #define MPE_NUM_BUSES		2
@@ -131,7 +121,7 @@ mpt_build_mpch(mpcth_t mpch)
 }
 
 static void
-mpt_build_proc_entries(bproc_entry_ptr mpep, int ncpu)
+mpt_build_proc_entries(proc_entry_ptr mpep, int ncpu)
 {
 	int i;
 
@@ -155,14 +145,14 @@ mpt_build_bus_entries(bus_entry_ptr mpeb)
 
 	memset(mpeb, 0, sizeof(*mpeb));
 	mpeb->type = MPCT_ENTRY_BUS;
-	mpeb->bus_id = ISA;
-	memcpy(mpeb->bus_type, MPE_BUSNAME_ISA, MPE_BUSNAME_LEN);
+	mpeb->bus_id = 0;
+	memcpy(mpeb->bus_type, MPE_BUSNAME_PCI, MPE_BUSNAME_LEN);
 	mpeb++;
 
 	memset(mpeb, 0, sizeof(*mpeb));
 	mpeb->type = MPCT_ENTRY_BUS;
-	mpeb->bus_id = PCI;
-	memcpy(mpeb->bus_type, MPE_BUSNAME_PCI, MPE_BUSNAME_LEN);
+	mpeb->bus_id = 1;	
+	memcpy(mpeb->bus_type, MPE_BUSNAME_ISA, MPE_BUSNAME_LEN);
 }
 
 static void
@@ -177,9 +167,8 @@ mpt_build_ioapic_entries(io_apic_entry_ptr mpei, int id)
 	mpei->apic_address = IOAPIC_PADDR;
 }
 
-#ifdef notyet
 static void
-mpt_build_ioint_entries(struct mpe_ioint *mpeii, int num_pins, int id)
+mpt_build_ioint_entries(int_entry_ptr mpie, int num_pins, int id)
 {
 	int pin;
 
@@ -189,28 +178,27 @@ mpt_build_ioint_entries(struct mpe_ioint *mpeii, int num_pins, int id)
 	 * just use the default config, tweek later if needed.
 	 */
 
-
 	/* Run through all 16 pins. */
 	for (pin = 0; pin < num_pins; pin++) {
-		memset(mpeii, 0, sizeof(*mpeii));
-		mpeii->entry_type = MP_ENTRY_IOINT;
-		mpeii->src_bus_id = MPE_BUSID_ISA;
-		mpeii->dst_apic_id = id;
+		memset(mpie, 0, sizeof(*mpie));
+		mpie->type = MPCT_ENTRY_INT;
+		mpie->src_bus_id = 1;
+		mpie->dst_apic_id = id;
 
 		/*
 		 * All default configs route IRQs from bus 0 to the first 16
 		 * pins of the first I/O APIC with an APIC ID of 2.
 		 */
-		mpeii->dst_apic_intin = pin;
+		mpie->dst_apic_int = pin;
 		switch (pin) {
 		case 0:
 			/* Pin 0 is an ExtINT pin. */
-			mpeii->intr_type = MPEII_INTR_EXTINT;
+			mpie->int_type = INTENTRY_TYPE_EXTINT;
 			break;
 		case 2:
 			/* IRQ 0 is routed to pin 2. */
-			mpeii->intr_type = MPEII_INTR_INT;
-			mpeii->src_bus_irq = 0;
+			mpie->int_type = INTENTRY_TYPE_INT;
+			mpie->src_bus_irq = 0;
 			break;
 		case 5:
 		case 10:
@@ -218,118 +206,20 @@ mpt_build_ioint_entries(struct mpe_ioint *mpeii, int num_pins, int id)
 			/*
 			 * PCI Irqs set to level triggered.
 			 */
-			mpeii->intr_flags = MPEII_FLAGS_TRIGMODE_LEVEL;
-			mpeii->src_bus_id = MPE_BUSID_PCI;
+			mpie->int_flags = INTENTRY_FLAGS_TRIGGER_LEVEL;
+			mpie->src_bus_id = 0;
+			/* fall through.. */
 		default:
 			/* All other pins are identity mapped. */
-			mpeii->intr_type = MPEII_INTR_INT;
-			mpeii->src_bus_irq = pin;
+			mpie->int_type = INTENTRY_TYPE_INT;
+			mpie->src_bus_irq = pin;
 			break;
 		}
-		mpeii++;
+		mpie++;
 	}
 
 }
 
-#define COPYSTR(dest, src, bytes)		\
-	memcpy(dest, src, bytes); 		\
-	str[bytes] = 0;
-
-static void
-mptable_dump(struct mp_floating_pointer *mpfp, struct mp_config_hdr *mpch)
-{
-	static char 	 str[16];
-	int 		 i;
-	char 		*cur;
-
-	union mpe {
-		struct mpe_proc 	*proc;
-		struct mpe_bus  	*bus;
-		struct mpe_ioapic 	*ioapic;
-		struct mpe_ioint 	*ioint;
-		struct mpe_lint 	*lnit;
-		char   			*p;
-	};
-
-	union mpe mpe;
-
-	printf(" MP Floating Pointer :\n");
-	COPYSTR(str, mpfp->signature, 4);
-	printf("\tsignature:\t%s\n", str);
-	printf("\tmpch paddr:\t%x\n", mpfp->mptable_paddr);
-	printf("\tlength:\t%x\n", mpfp->length);
-	printf("\tspecrec:\t%x\n", mpfp->specrev);
-	printf("\tchecksum:\t%x\n", mpfp->checksum);
-	printf("\tfeature1:\t%x\n", mpfp->feature1);
-	printf("\tfeature2:\t%x\n", mpfp->feature2);
-	printf("\tfeature3:\t%x\n", mpfp->feature3);
-	printf("\tfeature4:\t%x\n", mpfp->feature4);
-
-	printf(" MP Configuration Header :\n");
-	COPYSTR(str, mpch->signature, 4);
-	printf("    signature: 		%s\n", str);
-	printf("    length: 		%x\n", mpch->length);
-	printf("    specrec: 		%x\n", mpch->specrev);
-	printf("    checksum: 		%x\n", mpch->checksum);
-	COPYSTR(str, mpch->oemid, MPCH_OEMID_LEN);
-	printf("    oemid: 		%s\n", str);
-	COPYSTR(str, mpch->prodid, MPCH_PRODID_LEN);
-	printf("    prodid: 		%s\n", str);
-	printf("    oem_ptr: 		%x\n", mpch->oem_ptr);
-	printf("    oem_sz: 		%x\n", mpch->oem_sz);
-	printf("    nr_entries: 	%x\n", mpch->nr_entries);
-	printf("    apic paddr: 	%x\n", mpch->lapic_paddr);
-	printf("    ext_length: 	%x\n", mpch->ext_length);
-	printf("    ext_checksum: 	%x\n", mpch->ext_checksum);
-
-	cur = (char *)mpch + sizeof(*mpch);
-	for (i = 0; i < mpch->nr_entries; i++) {
-		mpe.p = cur;
-		switch(*mpe.p) {		
-			case MP_ENTRY_PROC:
-				printf(" MP Processor Entry :\n");
-				printf("	lapic_id: 	%x\n", mpe.proc->lapic_id);
-				printf("	lapic_version:	%x\n", mpe.proc->lapic_version);
-				printf("	proc_flags: 	%x\n", mpe.proc->proc_flags);
-				printf("	proc_signature: %x\n", mpe.proc->proc_signature);
-				printf("	feature_flags: 	%x\n", mpe.proc->feature_flags);
-				cur += sizeof(struct mpe_proc);
-				break;
-			case MP_ENTRY_BUS:
-				printf(" MP Bus Entry :\n");
-				printf("	busid: 		%x\n", mpe.bus->busid);
-				COPYSTR(str, mpe.bus->busname, MPE_BUSNAME_LEN);
-				printf("	busname: 	%s\n", str);
-				cur += sizeof(struct mpe_bus);
-				break;
-			case MP_ENTRY_IOAPIC:
-				printf(" MP IOAPIC Entry :\n");
-				printf("	ioapi_id: 		%x\n", mpe.ioapic->ioapic_id);
-				printf("	ioapi_version: 		%x\n", mpe.ioapic->ioapic_version);
-				printf("	ioapi_flags: 		%x\n", mpe.ioapic->ioapic_flags);
-				printf("	ioapi_paddr: 		%x\n", mpe.ioapic->ioapic_paddr);
-				cur += sizeof(struct mpe_ioapic);
-				break;
-			case MP_ENTRY_IOINT:
-				printf(" MP IO Interrupt Entry :\n");
-				printf("	intr_type: 		%x\n", mpe.ioint->intr_type);
-				printf("	intr_flags: 		%x\n", mpe.ioint->intr_flags);
-				printf("	src_bus_id: 		%x\n", mpe.ioint->src_bus_id);
-				printf("	src_bus_irq: 		%x\n", mpe.ioint->src_bus_irq);
-				printf("	dst_apic_id: 		%x\n", mpe.ioint->dst_apic_id);
-				printf("	dst_apic_intin:		%x\n", mpe.ioint->dst_apic_intin);
-				cur += sizeof(struct mpe_ioint);
-				break;
-			case MP_ENTRY_LINT:
-				printf(" MP Local Interrupt Entry :\n");
-				cur += sizeof(struct mpe_lint);
-				break;
-		}
-
-	}
-}
-#endif
-
 void
 mptable_add_oemtbl(void *tbl, int tblsz)
 {
@@ -339,13 +229,14 @@ mptable_add_oemtbl(void *tbl, int tblsz)
 }
 
 int
-mptable_build(struct vmctx *ctx, int ncpu, int ioapic)
+mptable_build(struct vmctx *ctx, int ncpu)
 {
 	mpcth_t			mpch;
 	bus_entry_ptr		mpeb;
 	io_apic_entry_ptr	mpei;
-	bproc_entry_ptr		mpep;
+	proc_entry_ptr		mpep;
 	mpfps_t			mpfp;
+	int_entry_ptr		mpie;
 	char 			*curraddr;
 	char 			*startaddr;
 
@@ -364,7 +255,7 @@ mptable_build(struct vmctx *ctx, int ncpu, int ioapic)
 	mpt_build_mpch(mpch);
 	curraddr += sizeof(*mpch);
 
-	mpep = (bproc_entry_ptr)curraddr;
+	mpep = (proc_entry_ptr)curraddr;
 	mpt_build_proc_entries(mpep, ncpu);
 	curraddr += sizeof(*mpep) * ncpu;
 	mpch->entry_count += ncpu;
@@ -374,19 +265,15 @@ mptable_build(struct vmctx *ctx, int ncpu, int ioapic)
 	curraddr += sizeof(*mpeb) * MPE_NUM_BUSES;
 	mpch->entry_count += MPE_NUM_BUSES;
 
-	if (ioapic) {
-		mpei = (io_apic_entry_ptr)curraddr;
-		mpt_build_ioapic_entries(mpei, ncpu + 1);
-		curraddr += sizeof(*mpei);
-		mpch->entry_count++;
-	}
+	mpei = (io_apic_entry_ptr)curraddr;
+	mpt_build_ioapic_entries(mpei, 0);
+	curraddr += sizeof(*mpei);
+	mpch->entry_count++;
 
-#ifdef notyet
-	mpt_build_ioint_entries((struct mpe_ioint*)curraddr, MPEII_MAX_IRQ,
-				ncpu + 1);
-	curraddr += sizeof(struct mpe_ioint) * MPEII_MAX_IRQ;
+	mpie = (int_entry_ptr) curraddr;
+	mpt_build_ioint_entries(mpie, MPEII_MAX_IRQ, 0);
+	curraddr += sizeof(*mpie) * MPEII_MAX_IRQ;
 	mpch->entry_count += MPEII_MAX_IRQ;
-#endif
 
 	if (oem_tbl_start) {
 		mpch->oem_table_pointer = curraddr - startaddr + MPTABLE_BASE;
diff --git a/usr.sbin/bhyve/mptbl.h b/usr.sbin/bhyve/mptbl.h
index 3c4c527712e..e9e1c426eac 100644
--- a/usr.sbin/bhyve/mptbl.h
+++ b/usr.sbin/bhyve/mptbl.h
@@ -29,7 +29,7 @@
 #ifndef _MPTBL_H_
 #define _MPTBL_H_
 
-int	mptable_build(struct vmctx *ctx, int ncpu, int ioapic);
+int	mptable_build(struct vmctx *ctx, int ncpu);
 void	mptable_add_oemtbl(void *tbl, int tblsz);
 
 #endif /* _MPTBL_H_ */
diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c
index d50d8f4922e..0109975d2eb 100644
--- a/usr.sbin/bhyve/pci_ahci.c
+++ b/usr.sbin/bhyve/pci_ahci.c
@@ -119,8 +119,8 @@ struct ahci_ioreq {
 struct ahci_port {
 	struct blockif_ctxt *bctx;
 	struct pci_ahci_softc *pr_sc;
-	uint64_t cmd_lst;
-	uint64_t rfis;
+	uint8_t *cmd_lst;
+	uint8_t *rfis;
 	int atapi;
 	int reset;
 	int mult_sectors;
@@ -165,6 +165,7 @@ struct ahci_cmd_hdr {
 struct ahci_prdt_entry {
 	uint64_t dba;
 	uint32_t reserved;
+#define	DBCMASK		0x3fffff
 	uint32_t dbc;
 };
 
@@ -222,7 +223,7 @@ ahci_write_fis(struct ahci_port *p, enum sata_fis_type ft, uint8_t *fis)
 {
 	int offset, len, irq;
 
-	if (p->rfis == 0 || !(p->cmd & AHCI_P_CMD_FRE))
+	if (p->rfis == NULL || !(p->cmd & AHCI_P_CMD_FRE))
 		return;
 
 	switch (ft) {
@@ -396,7 +397,7 @@ ahci_handle_dma(struct ahci_port *p, int slot, uint8_t *cfis, uint32_t done,
 
 	sc = p->pr_sc;
 	prdt = (struct ahci_prdt_entry *)(cfis + 0x80);
-	hdr = p->cmd_lst + slot * AHCI_CL_SIZE;
+	hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE);
 	ncq = 0;
 	readop = 1;
 
@@ -461,10 +462,13 @@ ahci_handle_dma(struct ahci_port *p, int slot, uint8_t *cfis, uint32_t done,
 	 * Build up the iovec based on the prdt
 	 */
 	for (i = 0; i < iovcnt; i++) {
+		uint32_t dbcsz;
+
+		dbcsz = (prdt->dbc & DBCMASK) + 1;
 		breq->br_iov[i].iov_base = paddr_guest2host(ahci_ctx(sc),
-				prdt->dba, prdt->dbc + 1);
-		breq->br_iov[i].iov_len = prdt->dbc + 1;
-		aior->done += (prdt->dbc + 1);
+		    prdt->dba, dbcsz);
+		breq->br_iov[i].iov_len = dbcsz;
+		aior->done += dbcsz;
 		prdt++;
 	}
 	if (readop)
@@ -508,16 +512,19 @@ write_prdt(struct ahci_port *p, int slot, uint8_t *cfis,
 	void *from;
 	int i, len;
 
-	hdr = p->cmd_lst + slot * AHCI_CL_SIZE;
+	hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE);
 	len = size;
 	from = buf;
 	prdt = (struct ahci_prdt_entry *)(cfis + 0x80);
 	for (i = 0; i < hdr->prdtl && len; i++) {
-		uint8_t *ptr = paddr_guest2host(ahci_ctx(p->pr_sc),
-				prdt->dba, prdt->dbc + 1);
-		memcpy(ptr, from, prdt->dbc + 1);
-		len -= (prdt->dbc + 1);
-		from += (prdt->dbc + 1);
+		uint8_t *ptr;
+		uint32_t dbcsz;
+
+		dbcsz = (prdt->dbc & DBCMASK) + 1;
+		ptr = paddr_guest2host(ahci_ctx(p->pr_sc), prdt->dba, dbcsz);
+		memcpy(ptr, from, dbcsz);
+		len -= dbcsz;
+		from += dbcsz;
 		prdt++;
 	}
 	hdr->prdbc = size - len;
@@ -528,7 +535,7 @@ handle_identify(struct ahci_port *p, int slot, uint8_t *cfis)
 {
 	struct ahci_cmd_hdr *hdr;
 
-	hdr = p->cmd_lst + slot * AHCI_CL_SIZE;
+	hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE);
 	if (p->atapi || hdr->prdtl == 0) {
 		p->tfd = (ATA_E_ABORT << 8) | ATA_S_READY | ATA_S_ERROR;
 		p->is |= AHCI_P_IX_TFE;
@@ -663,8 +670,7 @@ atapi_read_capacity(struct ahci_port *p, int slot, uint8_t *cfis)
 	uint8_t buf[8];
 	uint64_t sectors;
 
-	sectors = blockif_size(p->bctx) / blockif_sectsz(p->bctx);
-	sectors >>= 2;
+	sectors = blockif_size(p->bctx) / 2048;
 	be32enc(buf, sectors - 1);
 	be32enc(buf + 4, 2048);
 	cfis[4] = (cfis[4] & ~7) | ATA_I_CMD | ATA_I_IN;
@@ -869,7 +875,7 @@ atapi_read(struct ahci_port *p, int slot, uint8_t *cfis,
 
 	sc = p->pr_sc;
 	acmd = cfis + 0x40;
-	hdr = p->cmd_lst + slot * AHCI_CL_SIZE;
+	hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE);
 	prdt = (struct ahci_prdt_entry *)(cfis + 0x80);
 
 	prdt += seek;
@@ -908,11 +914,14 @@ atapi_read(struct ahci_port *p, int slot, uint8_t *cfis,
 	/*
 	 * Build up the iovec based on the prdt
 	 */
-	for (i = 0; i < hdr->prdtl; i++) {
+	for (i = 0; i < iovcnt; i++) {
+		uint32_t dbcsz;
+
+		dbcsz = (prdt->dbc & DBCMASK) + 1;
 		breq->br_iov[i].iov_base = paddr_guest2host(ahci_ctx(sc),
-				prdt->dba, prdt->dbc + 1);
-		breq->br_iov[i].iov_len = prdt->dbc + 1;
-		aior->done += (prdt->dbc + 1);
+		    prdt->dba, dbcsz);
+		breq->br_iov[i].iov_len = dbcsz;
+		aior->done += dbcsz;
 		prdt++;
 	}
 	err = blockif_read(p->bctx, breq);
@@ -1178,7 +1187,7 @@ ahci_handle_cmd(struct ahci_port *p, int slot, uint8_t *cfis)
 	}
 	case ATA_SET_MULTI:
 		if (cfis[12] != 0 &&
-			(cfis[12] > 128 || (cfis[12] & cfis[12] - 1))) {
+			(cfis[12] > 128 || (cfis[12] & (cfis[12] - 1)))) {
 			p->tfd = ATA_S_ERROR | ATA_S_READY;
 			p->tfd |= (ATA_ERROR_ABORT << 8);
 		} else {
@@ -1241,7 +1250,7 @@ ahci_handle_slot(struct ahci_port *p, int slot)
 	int cfl;
 
 	sc = p->pr_sc;
-	hdr = p->cmd_lst + slot * AHCI_CL_SIZE;
+	hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE);
 	cfl = (hdr->flags & 0x1f) * 4;
 	cfis = paddr_guest2host(ahci_ctx(sc), hdr->ctba,
 			0x80 + hdr->prdtl * sizeof(struct ahci_prdt_entry));
@@ -1318,7 +1327,7 @@ ata_ioreq_cb(struct blockif_req *br, int err)
 	slot = aior->slot;
 	pending = aior->prdtl;
 	sc = p->pr_sc;
-	hdr = p->cmd_lst + slot * AHCI_CL_SIZE;
+	hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + slot * AHCI_CL_SIZE);
 
 	if (cfis[2] == ATA_WRITE_FPDMA_QUEUED ||
 			cfis[2] == ATA_READ_FPDMA_QUEUED)
@@ -1380,7 +1389,7 @@ atapi_ioreq_cb(struct blockif_req *br, int err)
 	slot = aior->slot;
 	pending = aior->prdtl;
 	sc = p->pr_sc;
-	hdr = p->cmd_lst + aior->slot * AHCI_CL_SIZE;
+	hdr = (struct ahci_cmd_hdr *)(p->cmd_lst + aior->slot * AHCI_CL_SIZE);
 
 	pthread_mutex_lock(&sc->mtx);
 
@@ -1543,7 +1552,7 @@ pci_ahci_host_write(struct pci_ahci_softc *sc, uint64_t offset, uint64_t value)
 	case AHCI_PI:
 	case AHCI_VS:
 	case AHCI_CAP2:
-		WPRINTF("pci_ahci_host: read only registers 0x%"PRIx64"\n", offset);
+		DPRINTF("pci_ahci_host: read only registers 0x%"PRIx64"\n", offset);
 		break;
 	case AHCI_GHC:
 		if (value & AHCI_GHC_HR)
@@ -1715,11 +1724,9 @@ pci_ahci_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts, int atapi)
 
 	/*
 	 * Attempt to open the backing image. Use the PCI
-	 * slot/func/ahci_port for the identifier string
-	 * since that uniquely identifies a storage device.
+	 * slot/func for the identifier string.
 	 */
-	snprintf(bident, sizeof(bident), "%d:%d:%d", pi->pi_slot, pi->pi_func,
-	    0);
+	snprintf(bident, sizeof(bident), "%d:%d", pi->pi_slot, pi->pi_func);
 	bctxt = blockif_open(opts, bident);
 	if (bctxt == NULL) {       	
 		ret = 1;
diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c
index a95f26101e3..c7086ddcbcf 100644
--- a/usr.sbin/bhyve/pci_emul.c
+++ b/usr.sbin/bhyve/pci_emul.c
@@ -46,9 +46,9 @@ __FBSDID("$FreeBSD$");
 
 #include "bhyverun.h"
 #include "inout.h"
+#include "legacy_irq.h"
 #include "mem.h"
 #include "pci_emul.h"
-#include "ioapic.h"
 
 #define CONF1_ADDR_PORT    0x0cf8
 #define CONF1_DATA_PORT    0x0cfc
@@ -76,17 +76,6 @@ static struct slotinfo {
 	int	si_legacy;
 } pci_slotinfo[MAXSLOTS][MAXFUNCS];
 
-/*
- * Used to keep track of legacy interrupt owners/requestors
- */
-#define NLIRQ		16
-
-static struct lirqinfo {
-	int	li_generic;
-	int	li_acount;
-	struct pci_devinst *li_owner;	/* XXX should be a list */
-} lirq[NLIRQ];
-
 SET_DECLARE(pci_devemu_set, struct pci_devemu);
 
 static uint64_t pci_emul_iobase;
@@ -682,6 +671,7 @@ pci_emul_init(struct vmctx *ctx, struct pci_devemu *pde, int slot, int func,
 	pdi->pi_bus = 0;
 	pdi->pi_slot = slot;
 	pdi->pi_func = func;
+	pdi->pi_lintr_pin = -1;
 	pdi->pi_d = pde;
 	snprintf(pdi->pi_name, PI_NAMESZ, "%s-pci-%d", pde->pe_emu, slot);
 
@@ -941,10 +931,19 @@ pci_emul_capwrite(struct pci_devinst *pi, int offset, int bytes, uint32_t val)
 	assert(offset >= capoff);
 
 	/*
-	 * Capability ID and Next Capability Pointer are readonly
+	 * Capability ID and Next Capability Pointer are readonly.
+	 * However, some o/s's do 4-byte writes that include these.
+	 * For this case, trim the write back to 2 bytes and adjust
+	 * the data.
 	 */
-	if (offset == capoff || offset == capoff + 1)
-		return;
+	if (offset == capoff || offset == capoff + 1) {
+		if (offset == capoff && bytes == 4) {
+			bytes = 2;
+			offset += 2;
+			val >>= 16;
+		} else
+			return;
+	}
 
 	switch (capid) {
 	case PCIY_MSI:
@@ -1014,16 +1013,6 @@ init_pci(struct vmctx *ctx)
 	pci_emul_membase32 = vm_get_lowmem_limit(ctx);
 	pci_emul_membase64 = PCI_EMUL_MEMBASE64;
 
-	/*
-	 * Allow ISA IRQs 5,10,11,12, and 15 to be available for
-	 * generic use
-	 */
-	lirq[5].li_generic = 1;
-	lirq[10].li_generic = 1;
-	lirq[11].li_generic = 1;
-	lirq[12].li_generic = 1;
-	lirq[15].li_generic = 1;
-
 	for (slot = 0; slot < MAXSLOTS; slot++) {
 		for (func = 0; func < MAXFUNCS; func++) {
 			si = &pci_slotinfo[slot][func];
@@ -1126,40 +1115,17 @@ pci_is_legacy(struct pci_devinst *pi)
 	return (pci_slotinfo[pi->pi_slot][pi->pi_func].si_legacy);
 }
 
-static int
-pci_lintr_alloc(struct pci_devinst *pi, int vec)
-{
-	int i;
-
-	assert(vec < NLIRQ);
-
-	if (vec == -1) {
-		for (i = 0; i < NLIRQ; i++) {
-			if (lirq[i].li_generic &&
-			    lirq[i].li_owner == NULL) {
-				vec = i;
-				break;
-			}
-		}
-	} else {
-		if (lirq[vec].li_owner != NULL) {
-			vec = -1;
-		}
-	}
-	assert(vec != -1);
-
-	lirq[vec].li_owner = pi;
-	pi->pi_lintr_pin = vec;
-
-	return (vec);
-}
-
 int
-pci_lintr_request(struct pci_devinst *pi, int vec)
+pci_lintr_request(struct pci_devinst *pi, int req)
 {
+	int irq;
 
-	vec = pci_lintr_alloc(pi, vec);
-	pci_set_cfgdata8(pi, PCIR_INTLINE, vec);
+	irq = legacy_irq_alloc(req);
+	if (irq < 0)
+		return (-1);
+
+	pi->pi_lintr_pin = irq;
+	pci_set_cfgdata8(pi, PCIR_INTLINE, irq);
 	pci_set_cfgdata8(pi, PCIR_INTPIN, 1);
 	return (0);
 }
@@ -1168,16 +1134,24 @@ void
 pci_lintr_assert(struct pci_devinst *pi)
 {
 
-	assert(pi->pi_lintr_pin);
-	ioapic_assert_pin(pi->pi_vmctx, pi->pi_lintr_pin);
+	assert(pi->pi_lintr_pin >= 0);
+
+	if (pi->pi_lintr_state == 0) {
+		pi->pi_lintr_state = 1;
+		vm_ioapic_assert_irq(pi->pi_vmctx, pi->pi_lintr_pin);
+	}
 }
 
 void
 pci_lintr_deassert(struct pci_devinst *pi)
 {
 
-	assert(pi->pi_lintr_pin);
-	ioapic_deassert_pin(pi->pi_vmctx, pi->pi_lintr_pin);
+	assert(pi->pi_lintr_pin >= 0);
+
+	if (pi->pi_lintr_state == 1) {
+		pi->pi_lintr_state = 0;
+		vm_ioapic_deassert_irq(pi->pi_vmctx, pi->pi_lintr_pin);
+	}
 }
 
 /*
@@ -1285,7 +1259,7 @@ pci_emul_cmdwrite(struct pci_devinst *pi, uint32_t new, int bytes)
 	 * If the MMIO or I/O address space decoding has changed then
 	 * register/unregister all BARs that decode that address space.
 	 */
-	for (i = 0; i < PCI_BARMAX; i++) {
+	for (i = 0; i <= PCI_BARMAX; i++) {
 		switch (pi->pi_bar[i].type) {
 			case PCIBAR_NONE:
 			case PCIBAR_MEMHI64:
diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h
index 4e04a1ede30..6a1d7575b44 100644
--- a/usr.sbin/bhyve/pci_emul.h
+++ b/usr.sbin/bhyve/pci_emul.h
@@ -103,7 +103,8 @@ struct pci_devinst {
 	struct pci_devemu *pi_d;
 	struct vmctx *pi_vmctx;
 	uint8_t	  pi_bus, pi_slot, pi_func;
-	uint8_t   pi_lintr_pin;
+	int8_t    pi_lintr_pin;
+	int8_t	  pi_lintr_state;
 	char	  pi_name[PI_NAMESZ];
 	int	  pi_bar_getsize;
 
diff --git a/usr.sbin/bhyve/pci_hostbridge.c b/usr.sbin/bhyve/pci_hostbridge.c
index dee0a47e5d7..54a25aeac57 100644
--- a/usr.sbin/bhyve/pci_hostbridge.c
+++ b/usr.sbin/bhyve/pci_hostbridge.c
@@ -47,6 +47,22 @@ pci_hostbridge_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 	return (0);
 }
 
+static int
+pci_amd_hostbridge_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
+{
+	(void) pci_hostbridge_init(ctx, pi, opts);
+	pci_set_cfgdata16(pi, PCIR_VENDOR, 0x1022);	/* AMD */
+	pci_set_cfgdata16(pi, PCIR_DEVICE, 0x7432);	/* made up */
+
+	return (0);
+}
+
+struct pci_devemu pci_de_amd_hostbridge = {
+	.pe_emu = "amd_hostbridge",
+	.pe_init = pci_amd_hostbridge_init,
+};
+PCI_EMUL_SET(pci_de_amd_hostbridge);
+
 struct pci_devemu pci_de_hostbridge = {
 	.pe_emu = "hostbridge",
 	.pe_init = pci_hostbridge_init,
diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c
new file mode 100644
index 00000000000..4157c5cb0c7
--- /dev/null
+++ b/usr.sbin/bhyve/pci_lpc.c
@@ -0,0 +1,217 @@
+/*-
+ * Copyright (c) 2013 Neel Natu <neel@freebsd.org>
+ * Copyright (c) 2013 Tycho Nightingale <tycho.nightingale@pluribusnetworks.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 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/types.h>
+#include <machine/vmm.h>
+#include <machine/vmm_dev.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <vmmapi.h>
+
+#include "inout.h"
+#include "pci_emul.h"
+#include "uart_emul.h"
+
+static struct pci_devinst *lpc_bridge;
+
+#define	LPC_UART_NUM	2
+static struct lpc_uart_softc {
+	struct uart_softc *uart_softc;
+	const char *opts;
+	int	iobase;
+	int	irq;
+} lpc_uart_softc[LPC_UART_NUM];
+
+static const char *lpc_uart_names[LPC_UART_NUM] = { "COM1", "COM2" };
+
+/*
+ * LPC device configuration is in the following form:
+ * <lpc_device_name>[,<options>]
+ * For e.g. "com1,stdio"
+ */
+int
+lpc_device_parse(const char *opts)
+{
+	int unit, error;
+	char *str, *cpy, *lpcdev;
+
+	error = -1;
+	str = cpy = strdup(opts);
+	lpcdev = strsep(&str, ",");
+	if (lpcdev != NULL) {
+		for (unit = 0; unit < LPC_UART_NUM; unit++) {
+			if (strcasecmp(lpcdev, lpc_uart_names[unit]) == 0) {
+				lpc_uart_softc[unit].opts = str;
+				error = 0;
+				goto done;
+			}
+		}
+	}
+
+done:
+	if (error)
+		free(cpy);
+
+	return (error);
+}
+
+static void
+lpc_uart_intr_assert(void *arg)
+{
+	struct lpc_uart_softc *sc = arg;
+
+	assert(sc->irq >= 0);
+
+	vm_ioapic_pulse_irq(lpc_bridge->pi_vmctx, sc->irq);
+}
+
+static void
+lpc_uart_intr_deassert(void *arg)
+{
+	/* 
+	 * The COM devices on the LPC bus generate edge triggered interrupts,
+	 * so nothing more to do here.
+	 */
+}
+
+static int
+lpc_uart_io_handler(struct vmctx *ctx, int vcpu, int in, int port, int bytes,
+		    uint32_t *eax, void *arg)
+{
+	int offset;
+	struct lpc_uart_softc *sc = arg;
+
+	if (bytes != 1)
+		return (-1);
+
+	offset = port - sc->iobase;
+
+	if (in)
+		*eax = uart_read(sc->uart_softc, offset); 
+	else
+		uart_write(sc->uart_softc, offset, *eax);
+
+	return (0);
+}
+
+static int
+lpc_init(void)
+{
+	struct lpc_uart_softc *sc;
+	struct inout_port iop;
+	const char *name;
+	int unit, error;
+
+	/* COM1 and COM2 */
+	for (unit = 0; unit < LPC_UART_NUM; unit++) {
+		sc = &lpc_uart_softc[unit];
+		name = lpc_uart_names[unit];
+
+		if (uart_legacy_alloc(unit, &sc->iobase, &sc->irq) != 0) {
+			fprintf(stderr, "Unable to allocate resources for "
+			    "LPC device %s\n", name);
+			return (-1);
+		}
+
+		sc->uart_softc = uart_init(lpc_uart_intr_assert,
+				    lpc_uart_intr_deassert, sc);
+
+		if (uart_set_backend(sc->uart_softc, sc->opts) != 0) {
+			fprintf(stderr, "Unable to initialize backend '%s' "
+			    "for LPC device %s\n", sc->opts, name);
+			return (-1);
+		}
+
+		bzero(&iop, sizeof(struct inout_port));
+		iop.name = name;
+		iop.port = sc->iobase;
+		iop.size = UART_IO_BAR_SIZE;
+		iop.flags = IOPORT_F_INOUT;
+		iop.handler = lpc_uart_io_handler;
+		iop.arg = sc;
+
+		error = register_inout(&iop);
+		assert(error == 0);
+	}
+
+	return (0);
+}
+
+static void
+pci_lpc_write(struct vmctx *ctx, int vcpu, struct pci_devinst *pi,
+	       int baridx, uint64_t offset, int size, uint64_t value)
+{
+}
+
+uint64_t
+pci_lpc_read(struct vmctx *ctx, int vcpu, struct pci_devinst *pi,
+	      int baridx, uint64_t offset, int size)
+{
+	return (0);
+}
+
+#define	LPC_DEV		0x7000
+#define	LPC_VENDOR	0x8086
+
+static int
+pci_lpc_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
+{
+	/*
+	 * Do not allow more than one LPC bridge to be configured.
+	 */
+	if (lpc_bridge != NULL)
+		return (-1);
+
+	if (lpc_init() != 0)
+		return (-1);
+
+	/* initialize config space */
+	pci_set_cfgdata16(pi, PCIR_DEVICE, LPC_DEV);
+	pci_set_cfgdata16(pi, PCIR_VENDOR, LPC_VENDOR);
+	pci_set_cfgdata8(pi, PCIR_CLASS, PCIC_BRIDGE);
+	pci_set_cfgdata8(pi, PCIR_SUBCLASS, PCIS_BRIDGE_ISA);
+
+	lpc_bridge = pi;
+
+	return (0);
+}
+
+struct pci_devemu pci_de_lpc = {
+	.pe_emu =	"lpc",
+	.pe_init =	pci_lpc_init,
+	.pe_barwrite =	pci_lpc_write,
+	.pe_barread =	pci_lpc_read
+};
+PCI_EMUL_SET(pci_de_lpc);
diff --git a/usr.sbin/bhyve/ioapic.h b/usr.sbin/bhyve/pci_lpc.h
similarity index 85%
rename from usr.sbin/bhyve/ioapic.h
rename to usr.sbin/bhyve/pci_lpc.h
index 4696f9a5527..b228eacd218 100644
--- a/usr.sbin/bhyve/ioapic.h
+++ b/usr.sbin/bhyve/pci_lpc.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012 NetApp, Inc.
+ * Copyright (c) 2013 Neel Natu <neel@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,13 +26,9 @@
  * $FreeBSD$
  */
 
-#ifndef _IOAPIC_H_
-#define	_IOAPIC_H_
+#ifndef _LPC_H_
+#define	_LPC_H_
 
-struct vmctx;
-
-void	ioapic_init(int num);
-void	ioapic_deassert_pin(struct vmctx *ctx, int pin);
-void	ioapic_assert_pin(struct vmctx *ctx, int pin);
+int	lpc_device_parse(const char *opt);
 
 #endif
diff --git a/usr.sbin/bhyve/pci_uart.c b/usr.sbin/bhyve/pci_uart.c
index dd305519359..f8e529255ee 100644
--- a/usr.sbin/bhyve/pci_uart.c
+++ b/usr.sbin/bhyve/pci_uart.c
@@ -30,42 +30,12 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
-#include <sys/select.h>
-#include <dev/ic/ns16550.h>
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <termios.h>
-#include <unistd.h>
-#include <stdbool.h>
-#include <string.h>
-#include <pthread.h>
 
 #include "bhyverun.h"
 #include "pci_emul.h"
-#include "mevent.h"
-
-#define	COM1_BASE      	0x3F8
-#define COM1_IRQ	4
-#define	COM2_BASE      	0x2F8
-#define COM2_IRQ	3
-
-#define	DEFAULT_RCLK	1843200
-#define	DEFAULT_BAUD	9600
-
-#define	FCR_RX_MASK	0xC0
-
-#define	MCR_OUT1	0x04
-#define	MCR_OUT2	0x08
-
-#define	MSR_DELTA_MASK	0x0f
-
-#ifndef REG_SCR
-#define REG_SCR		com_scr
-#endif
-
-#define	FIFOSZ	16
+#include "uart_emul.h"
 
 /*
  * Pick a PCI vid/did of a chip with a single uart at
@@ -75,544 +45,82 @@ __FBSDID("$FreeBSD$");
 #define COM_VENDOR	0x131f
 #define COM_DEV		0x2000
 
-static int pci_uart_stdio;	/* stdio in use for i/o */
-
-static int pci_uart_nldevs;	/* number of legacy devices - 2 max */
-
-static struct {
-	uint64_t	baddr;
-	int		vector;
-} pci_uart_lres[] = {
-	{ COM1_BASE, COM1_IRQ},
-	{ COM2_BASE, COM2_IRQ},
-	{ 0, 0 }
-};
-
-struct fifo {
-	uint8_t	buf[FIFOSZ];
-	int	rindex;		/* index to read from */
-	int	windex;		/* index to write to */
-	int	num;		/* number of characters in the fifo */
-	int	size;		/* size of the fifo */
-};
-
-struct pci_uart_softc {
-	struct pci_devinst *pi;
-	pthread_mutex_t mtx;	/* protects all softc elements */
-	uint8_t data;		/* Data register (R/W) */
-	uint8_t ier;		/* Interrupt enable register (R/W) */
-	uint8_t lcr;		/* Line control register (R/W) */
-	uint8_t mcr;		/* Modem control register (R/W) */
-	uint8_t lsr;		/* Line status register (R/W) */
-	uint8_t msr;		/* Modem status register (R/W) */
-	uint8_t fcr;		/* FIFO control register (W) */
-	uint8_t scr;		/* Scratch register (R/W) */
-
-	uint8_t dll;		/* Baudrate divisor latch LSB */
-	uint8_t dlh;		/* Baudrate divisor latch MSB */
-
-	struct fifo rxfifo;
-
-	int	opened;
-	int	stdio;
-	bool	thre_int_pending;	/* THRE interrupt pending */
-};
-
-static void pci_uart_drain(int fd, enum ev_type ev, void *arg);
-
-static struct termios tio_orig, tio_new;	/* I/O Terminals */
-
 static void
-ttyclose(void)
+pci_uart_intr_assert(void *arg)
 {
-	tcsetattr(STDIN_FILENO, TCSANOW, &tio_orig);
+	struct pci_devinst *pi = arg;
+
+	pci_lintr_assert(pi);
 }
 
 static void
-ttyopen(void)
+pci_uart_intr_deassert(void *arg)
 {
-	tcgetattr(STDIN_FILENO, &tio_orig);
+	struct pci_devinst *pi = arg;
 
-	cfmakeraw(&tio_new);
-	tcsetattr(STDIN_FILENO, TCSANOW, &tio_new);
-
-	atexit(ttyclose);
-}
-
-static bool
-tty_char_available(void)
-{
-	fd_set rfds;
-	struct timeval tv;
-
-	FD_ZERO(&rfds);
-	FD_SET(STDIN_FILENO, &rfds);
-	tv.tv_sec = 0;
-	tv.tv_usec = 0;
-	if (select(STDIN_FILENO + 1, &rfds, NULL, NULL, &tv) > 0 ) {
-		return (true);
-	} else {
-		return (false);
-	}
-}
-
-static int
-ttyread(void)
-{
-	char rb;
-
-	if (tty_char_available()) {
-		read(STDIN_FILENO, &rb, 1);
-		return (rb & 0xff);
-	} else {
-		return (-1);
-	}
-}
-
-static void
-ttywrite(unsigned char wb)
-{
-	(void) write(STDIN_FILENO, &wb, 1);
-}
-
-static void
-fifo_reset(struct fifo *fifo, int size)
-{
-	bzero(fifo, sizeof(struct fifo));
-	fifo->size = size;
-}
-
-static int
-fifo_putchar(struct fifo *fifo, uint8_t ch)
-{
-
-	if (fifo->num < fifo->size) {
-		fifo->buf[fifo->windex] = ch;
-		fifo->windex = (fifo->windex + 1) % fifo->size;
-		fifo->num++;
-		return (0);
-	} else
-		return (-1);
-}
-
-static int
-fifo_getchar(struct fifo *fifo)
-{
-	int c;
-
-	if (fifo->num > 0) {
-		c = fifo->buf[fifo->rindex];
-		fifo->rindex = (fifo->rindex + 1) % fifo->size;
-		fifo->num--;
-		return (c);
-	} else
-		return (-1);
-}
-
-static int
-fifo_numchars(struct fifo *fifo)
-{
-
-	return (fifo->num);
-}
-
-static int
-fifo_available(struct fifo *fifo)
-{
-
-	return (fifo->num < fifo->size);
-}
-
-static void
-pci_uart_opentty(struct pci_uart_softc *sc)
-{
-	struct mevent *mev;
-
-	assert(sc->opened == 0);
-	assert(sc->stdio);
-
-	ttyopen();
-	mev = mevent_add(STDIN_FILENO, EVF_READ, pci_uart_drain, sc);
-	assert(mev);
-}
-
-static void
-pci_uart_legacy_res(uint64_t *bar, int *ivec)
-{
-	if (pci_uart_lres[pci_uart_nldevs].baddr != 0) {
-		*bar = pci_uart_lres[pci_uart_nldevs].baddr;
-		*ivec = pci_uart_lres[pci_uart_nldevs].vector;
-		pci_uart_nldevs++;
-	} else {
-		/* TODO: print warning ? */
-		*bar = 0;
-		*ivec= -1;
-	}
-}
-
-/*
- * The IIR returns a prioritized interrupt reason:
- * - receive data available
- * - transmit holding register empty
- * - modem status change
- *
- * Return an interrupt reason if one is available.
- */
-static int
-pci_uart_intr_reason(struct pci_uart_softc *sc)
-{
-
-	if ((sc->lsr & LSR_OE) != 0 && (sc->ier & IER_ERLS) != 0)
-		return (IIR_RLS);
-	else if (fifo_numchars(&sc->rxfifo) > 0 && (sc->ier & IER_ERXRDY) != 0)
-		return (IIR_RXTOUT);
-	else if (sc->thre_int_pending && (sc->ier & IER_ETXRDY) != 0)
-		return (IIR_TXRDY);
-	else if ((sc->msr & MSR_DELTA_MASK) != 0 && (sc->ier & IER_EMSC) != 0)
-		return (IIR_MLSC);
-	else
-		return (IIR_NOPEND);
-}
-
-static void
-pci_uart_reset(struct pci_uart_softc *sc)
-{
-	uint16_t divisor;
-
-	divisor = DEFAULT_RCLK / DEFAULT_BAUD / 16;
-	sc->dll = divisor;
-	sc->dlh = divisor >> 16;
-
-	fifo_reset(&sc->rxfifo, 1);	/* no fifo until enabled by software */
-}
-
-/*
- * Toggle the COM port's intr pin depending on whether or not we have an
- * interrupt condition to report to the processor.
- */
-static void
-pci_uart_toggle_intr(struct pci_uart_softc *sc)
-{
-	uint8_t intr_reason;
-
-	intr_reason = pci_uart_intr_reason(sc);
-
-	if (intr_reason == IIR_NOPEND)
-		pci_lintr_deassert(sc->pi);
-	else
-		pci_lintr_assert(sc->pi);
-}
-
-static void
-pci_uart_drain(int fd, enum ev_type ev, void *arg)
-{
-	struct pci_uart_softc *sc;
-	int ch;
-
-	sc = arg;	
-
-	assert(fd == STDIN_FILENO);
-	assert(ev == EVF_READ);
-	
-	/*
-	 * This routine is called in the context of the mevent thread
-	 * to take out the softc lock to protect against concurrent
-	 * access from a vCPU i/o exit
-	 */
-	pthread_mutex_lock(&sc->mtx);
-
-	if ((sc->mcr & MCR_LOOPBACK) != 0) {
-		(void) ttyread();
-	} else {
-		while (fifo_available(&sc->rxfifo) &&
-		       ((ch = ttyread()) != -1)) {
-			fifo_putchar(&sc->rxfifo, ch);
-		}
-		pci_uart_toggle_intr(sc);
-	}
-
-	pthread_mutex_unlock(&sc->mtx);
+	pci_lintr_deassert(pi);
 }
 
 static void
 pci_uart_write(struct vmctx *ctx, int vcpu, struct pci_devinst *pi,
 	       int baridx, uint64_t offset, int size, uint64_t value)
 {
-        struct pci_uart_softc *sc;
-	int fifosz;
-	uint8_t msr;
-
-	sc = pi->pi_arg;
 
 	assert(baridx == 0);
 	assert(size == 1);
 
-	/* Open terminal */
-	if (!sc->opened && sc->stdio) {
-		pci_uart_opentty(sc);
-		sc->opened = 1;
-	}
-
-	pthread_mutex_lock(&sc->mtx);
-	
-	/*
-	 * Take care of the special case DLAB accesses first
-	 */
-	if ((sc->lcr & LCR_DLAB) != 0) {
-		if (offset == REG_DLL) {
-			sc->dll = value;
-			goto done;
-		}
-		
-		if (offset == REG_DLH) {
-			sc->dlh = value;
-			goto done;
-		}
-	}
-
-        switch (offset) {
-	case REG_DATA:
-		if (sc->mcr & MCR_LOOPBACK) {
-			if (fifo_putchar(&sc->rxfifo, value) != 0)
-				sc->lsr |= LSR_OE;
-		} else if (sc->stdio) {
-			ttywrite(value);
-		} /* else drop on floor */
-		sc->thre_int_pending = true;
-		break;
-	case REG_IER:
-		/*
-		 * Apply mask so that bits 4-7 are 0
-		 * Also enables bits 0-3 only if they're 1
-		 */
-		sc->ier = value & 0x0F;
-		break;
-		case REG_FCR:
-			/*
-			 * When moving from FIFO and 16450 mode and vice versa,
-			 * the FIFO contents are reset.
-			 */
-			if ((sc->fcr & FCR_ENABLE) ^ (value & FCR_ENABLE)) {
-				fifosz = (value & FCR_ENABLE) ? FIFOSZ : 1;
-				fifo_reset(&sc->rxfifo, fifosz);
-			}
-
-			/*
-			 * The FCR_ENABLE bit must be '1' for the programming
-			 * of other FCR bits to be effective.
-			 */
-			if ((value & FCR_ENABLE) == 0) {
-				sc->fcr = 0;
-			} else {
-				if ((value & FCR_RCV_RST) != 0)
-					fifo_reset(&sc->rxfifo, FIFOSZ);
-
-				sc->fcr = value &
-					 (FCR_ENABLE | FCR_DMA | FCR_RX_MASK);
-			}
-			break;
-		case REG_LCR:
-			sc->lcr = value;
-			break;
-		case REG_MCR:
-			/* Apply mask so that bits 5-7 are 0 */
-			sc->mcr = value & 0x1F;
-
-			msr = 0;
-			if (sc->mcr & MCR_LOOPBACK) {
-				/*
-				 * In the loopback mode certain bits from the
-				 * MCR are reflected back into MSR
-				 */
-				if (sc->mcr & MCR_RTS)
-					msr |= MSR_CTS;
-				if (sc->mcr & MCR_DTR)
-					msr |= MSR_DSR;
-				if (sc->mcr & MCR_OUT1)
-					msr |= MSR_RI;
-				if (sc->mcr & MCR_OUT2)
-					msr |= MSR_DCD;
-			}
-
-			/*
-			 * Detect if there has been any change between the
-			 * previous and the new value of MSR. If there is
-			 * then assert the appropriate MSR delta bit.
-			 */
-			if ((msr & MSR_CTS) ^ (sc->msr & MSR_CTS))
-				sc->msr |= MSR_DCTS;
-			if ((msr & MSR_DSR) ^ (sc->msr & MSR_DSR))
-				sc->msr |= MSR_DDSR;
-			if ((msr & MSR_DCD) ^ (sc->msr & MSR_DCD))
-				sc->msr |= MSR_DDCD;
-			if ((sc->msr & MSR_RI) != 0 && (msr & MSR_RI) == 0)
-				sc->msr |= MSR_TERI;
-
-			/*
-			 * Update the value of MSR while retaining the delta
-			 * bits.
-			 */
-			sc->msr &= MSR_DELTA_MASK;
-			sc->msr |= msr;
-			break;
-		case REG_LSR:
-			/*
-			 * Line status register is not meant to be written to
-			 * during normal operation.
-			 */
-			break;
-		case REG_MSR:
-			/*
-			 * As far as I can tell MSR is a read-only register.
-			 */
-			break;
-		case REG_SCR:
-			sc->scr = value;
-			break;
-		default:
-			break;
-	}
-
-done:
-	pci_uart_toggle_intr(sc);
-	pthread_mutex_unlock(&sc->mtx);
+	uart_write(pi->pi_arg, offset, value);
 }
 
 uint64_t
 pci_uart_read(struct vmctx *ctx, int vcpu, struct pci_devinst *pi,
 	      int baridx, uint64_t offset, int size)
 {
-	struct pci_uart_softc *sc;
-	uint8_t iir, intr_reason;
-	uint64_t reg;
-
-	sc = pi->pi_arg;
+	uint8_t val;
 
 	assert(baridx == 0);
 	assert(size == 1);
 
-	/* Open terminal */
-	if (!sc->opened && sc->stdio) {
-		pci_uart_opentty(sc);
-		sc->opened = 1;
-	}
-
-	pthread_mutex_lock(&sc->mtx);
-
-	/*
-	 * Take care of the special case DLAB accesses first
-	 */
-	if ((sc->lcr & LCR_DLAB) != 0) {
-		if (offset == REG_DLL) {
-			reg = sc->dll;
-			goto done;
-		}
-		
-		if (offset == REG_DLH) {
-			reg = sc->dlh;
-			goto done;
-		}
-	}
-
-	switch (offset) {
-	case REG_DATA:
-		reg = fifo_getchar(&sc->rxfifo);
-		break;
-	case REG_IER:
-		reg = sc->ier;
-		break;
-	case REG_IIR:
-		iir = (sc->fcr & FCR_ENABLE) ? IIR_FIFO_MASK : 0;
-
-		intr_reason = pci_uart_intr_reason(sc);
-			
-		/*
-		 * Deal with side effects of reading the IIR register
-		 */
-		if (intr_reason == IIR_TXRDY)
-			sc->thre_int_pending = false;
-
-		iir |= intr_reason;
-
-		reg = iir;
-		break;
-	case REG_LCR:
-		reg = sc->lcr;
-		break;
-	case REG_MCR:
-		reg = sc->mcr;
-		break;
-	case REG_LSR:
-		/* Transmitter is always ready for more data */
-		sc->lsr |= LSR_TEMT | LSR_THRE;
-
-		/* Check for new receive data */
-		if (fifo_numchars(&sc->rxfifo) > 0)
-			sc->lsr |= LSR_RXRDY;
-		else
-			sc->lsr &= ~LSR_RXRDY;
-
-		reg = sc->lsr;
-
-		/* The LSR_OE bit is cleared on LSR read */
-		sc->lsr &= ~LSR_OE;
-		break;
-	case REG_MSR:
-		/*
-		 * MSR delta bits are cleared on read
-		 */
-		reg = sc->msr;
-		sc->msr &= ~MSR_DELTA_MASK;
-		break;
-	case REG_SCR:
-		reg = sc->scr;
-		break;
-	default:
-		reg = 0xFF;
-		break;
-	}
-
-done:
-	pci_uart_toggle_intr(sc);
-	pthread_mutex_unlock(&sc->mtx);
-
-	return (reg);
+	val = uart_read(pi->pi_arg, offset);
+	return (val);
 }
 
+static int pci_uart_nldevs;	/* number of legacy uart ports allocated */
+
 static int
 pci_uart_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 {
-	struct pci_uart_softc *sc;
-	uint64_t bar;
-	int ivec;
+	struct uart_softc *sc;
+	int ioaddr, ivec;
 
-	sc = malloc(sizeof(struct pci_uart_softc));
-	memset(sc, 0, sizeof(struct pci_uart_softc));
-
-	pi->pi_arg = sc;
-	sc->pi = pi;
-
-	pthread_mutex_init(&sc->mtx, NULL);
+	if (pci_is_legacy(pi)) {
+		if (uart_legacy_alloc(pci_uart_nldevs, &ioaddr, &ivec) != 0) {
+			fprintf(stderr, "Unable to allocate resources for "
+			    "legacy COM%d port at pci device %d:%d\n",
+			    pci_uart_nldevs + 1, pi->pi_slot, pi->pi_func);
+			return (-1);
+		}
+		pci_uart_nldevs++;
+		pci_emul_alloc_pbar(pi, 0, ioaddr, PCIBAR_IO, UART_IO_BAR_SIZE);
+	} else {
+		ivec = -1;
+		pci_emul_alloc_bar(pi, 0, PCIBAR_IO, UART_IO_BAR_SIZE);
+	}
+	pci_lintr_request(pi, ivec);
 
 	/* initialize config space */
 	pci_set_cfgdata16(pi, PCIR_DEVICE, COM_DEV);
 	pci_set_cfgdata16(pi, PCIR_VENDOR, COM_VENDOR);
 	pci_set_cfgdata8(pi, PCIR_CLASS, PCIC_SIMPLECOMM);
-	if (pci_is_legacy(pi)) {
-		pci_uart_legacy_res(&bar, &ivec);
-		pci_emul_alloc_pbar(pi, 0, bar, PCIBAR_IO, 8);
-	} else {
-		ivec = -1;
-		pci_emul_alloc_bar(pi, 0, PCIBAR_IO, 8);
-	}
-	pci_lintr_request(pi, ivec);
 
-	if (opts != NULL && !strcmp("stdio", opts) && !pci_uart_stdio) {
-		pci_uart_stdio = 1;
-		sc->stdio = 1;
-	}
+	sc = uart_init(pci_uart_intr_assert, pci_uart_intr_deassert, pi);
+	pi->pi_arg = sc;
 
-	pci_uart_reset(sc);
+	if (uart_set_backend(sc, opts) != 0) {
+		fprintf(stderr, "Unable to initialize backend '%s' for "
+		    "pci uart at %d:%d\n", opts, pi->pi_slot, pi->pi_func);
+		return (-1);
+	}
 
 	return (0);
 }
diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c
index 529cd4260c0..a642b11434b 100644
--- a/usr.sbin/bhyve/pci_virtio_block.c
+++ b/usr.sbin/bhyve/pci_virtio_block.c
@@ -46,23 +46,36 @@ __FBSDID("$FreeBSD$");
 #include <unistd.h>
 #include <assert.h>
 #include <pthread.h>
+#include <md5.h>
 
 #include "bhyverun.h"
 #include "pci_emul.h"
 #include "virtio.h"
 
+#ifndef min
+#define	min(a, b)	((a) < (b) ? (a) : (b))
+#endif
+
 #define VTBLK_RINGSZ	64
 
 #define VTBLK_MAXSEGS	32
 
 #define VTBLK_S_OK	0
 #define VTBLK_S_IOERR	1
+#define	VTBLK_S_UNSUPP	2
+
+#define	VTBLK_BLK_ID_BYTES	20
+
+/* Capability bits */
+#define	VTBLK_F_SEG_MAX		(1 << 2)	/* Maximum request segments */
+#define	VTBLK_F_BLK_SIZE       	(1 << 6)	/* cfg block size valid */
 
 /*
  * Host capabilities
  */
 #define VTBLK_S_HOSTCAPS      \
-  ( 0x00000004 |	/* host maximum request segments */ \
+  ( VTBLK_F_SEG_MAX  |						    \
+    VTBLK_F_BLK_SIZE |						    \
     VIRTIO_RING_F_INDIRECT_DESC )	/* indirect descriptors */
 
 /*
@@ -85,6 +98,7 @@ struct vtblk_config {
 struct virtio_blk_hdr {
 #define	VBH_OP_READ		0
 #define	VBH_OP_WRITE		1
+#define	VBH_OP_IDENT		8		
 #define	VBH_FLAG_BARRIER	0x80000000	/* OR'ed into vbh_type */
 	uint32_t       	vbh_type;
 	uint32_t	vbh_ioprio;
@@ -106,6 +120,7 @@ struct pci_vtblk_softc {
 	struct vqueue_info vbsc_vq;
 	int		vbsc_fd;
 	struct vtblk_config vbsc_cfg;	
+	char vbsc_ident[VTBLK_BLK_ID_BYTES];
 };
 
 static void pci_vtblk_reset(void *);
@@ -180,7 +195,7 @@ pci_vtblk_proc(struct pci_vtblk_softc *sc, struct vqueue_info *vq)
 	for (i = 1; i < n; i++) {
 		/*
 		 * - write op implies read-only descriptor,
-		 * - read op implies write-only descriptor,
+		 * - read/ident op implies write-only descriptor,
 		 * therefore test the inverse of the descriptor bit
 		 * to the op.
 		 */
@@ -189,14 +204,34 @@ pci_vtblk_proc(struct pci_vtblk_softc *sc, struct vqueue_info *vq)
 	}
 
 	DPRINTF(("virtio-block: %s op, %d bytes, %d segs, offset %ld\n\r", 
-		 writeop ? "write" : "read", iolen, i - 1, offset));
+		 writeop ? "write" : "read/ident", iolen, i - 1, offset));
 
-	if (writeop)
+	switch (type) {
+	case VBH_OP_WRITE:
 		err = pwritev(sc->vbsc_fd, iov + 1, i - 1, offset);
-	else
+		break;
+	case VBH_OP_READ:
 		err = preadv(sc->vbsc_fd, iov + 1, i - 1, offset);
+		break;
+	case VBH_OP_IDENT:
+		/* Assume a single buffer */
+		strlcpy(iov[1].iov_base, sc->vbsc_ident,
+		    min(iov[1].iov_len, sizeof(sc->vbsc_ident)));
+		err = 0;
+		break;
+	default:
+		err = -ENOSYS;
+		break;
+	}
 
-	*status = err < 0 ? VTBLK_S_IOERR : VTBLK_S_OK;
+	/* convert errno into a virtio block error return */
+	if (err < 0) {
+		if (err == -ENOSYS)
+			*status = VTBLK_S_UNSUPP;
+		else
+			*status = VTBLK_S_IOERR;
+	} else
+		*status = VTBLK_S_OK;
 
 	/*
 	 * Return the descriptor back to the host.
@@ -220,12 +255,12 @@ static int
 pci_vtblk_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 {
 	struct stat sbuf;
+	MD5_CTX mdctx;
+	u_char digest[16];
 	struct pci_vtblk_softc *sc;
 	off_t size;	
 	int fd;
 	int sectsz;
-	int use_msix;
-	const char *env_msi;
 
 	if (opts == NULL) {
 		printf("virtio-block: backing device required\n");
@@ -274,8 +309,18 @@ pci_vtblk_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 	sc->vbsc_vq.vq_qsize = VTBLK_RINGSZ;
 	/* sc->vbsc_vq.vq_notify = we have no per-queue notify */
 
+	/*
+	 * Create an identifier for the backing file. Use parts of the
+	 * md5 sum of the filename
+	 */
+	MD5Init(&mdctx);
+	MD5Update(&mdctx, opts, strlen(opts));
+	MD5Final(digest, &mdctx);	
+	sprintf(sc->vbsc_ident, "BHYVE-%02X%02X-%02X%02X-%02X%02X",
+	    digest[0], digest[1], digest[2], digest[3], digest[4], digest[5]);
+
 	/* setup virtio block config space */
-	sc->vbsc_cfg.vbc_capacity = size / sectsz;
+	sc->vbsc_cfg.vbc_capacity = size / DEV_BSIZE; /* 512-byte units */
 	sc->vbsc_cfg.vbc_seg_max = VTBLK_MAXSEGS;
 	sc->vbsc_cfg.vbc_blk_size = sectsz;
 	sc->vbsc_cfg.vbc_size_max = 0;	/* not negotiated */
@@ -294,12 +339,7 @@ pci_vtblk_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 	pci_set_cfgdata8(pi, PCIR_CLASS, PCIC_STORAGE);
 	pci_set_cfgdata16(pi, PCIR_SUBDEV_0, VIRTIO_TYPE_BLOCK);
 
-	use_msix = 1;
-	if ((env_msi = getenv("BHYVE_USE_MSI"))) {
-		if (strcasecmp(env_msi, "yes") == 0)
-			use_msix = 0;
-	} 
-	if (vi_intr_init(&sc->vbsc_vs, 1, use_msix))
+	if (vi_intr_init(&sc->vbsc_vs, 1, fbsdrun_virtio_msix()))
 		return (1);
 	vi_set_io_bar(&sc->vbsc_vs, 0);
 	return (0);
diff --git a/usr.sbin/bhyve/pci_virtio_net.c b/usr.sbin/bhyve/pci_virtio_net.c
index 29399490390..57ab0419b52 100644
--- a/usr.sbin/bhyve/pci_virtio_net.c
+++ b/usr.sbin/bhyve/pci_virtio_net.c
@@ -509,11 +509,9 @@ pci_vtnet_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 	char nstr[80];
 	char tname[MAXCOMLEN + 1];
 	struct pci_vtnet_softc *sc;
-	const char *env_msi;
 	char *devname;
 	char *vtopts;
 	int mac_provided;
-	int use_msix;
 
 	sc = malloc(sizeof(struct pci_vtnet_softc));
 	memset(sc, 0, sizeof(struct pci_vtnet_softc));
@@ -530,15 +528,6 @@ pci_vtnet_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
         sc->vsc_queues[VTNET_CTLQ].vq_notify = pci_vtnet_ping_ctlq;
 #endif
  
-	/*
-	 * Use MSI if set by user
-	 */
-	use_msix = 1;
-	if ((env_msi = getenv("BHYVE_USE_MSI")) != NULL) {
-		if (strcasecmp(env_msi, "yes") == 0)
-			use_msix = 0;
-	}
-
 	/*
 	 * Attempt to open the tap device and read the MAC address
 	 * if specified
@@ -599,7 +588,7 @@ pci_vtnet_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 	 */
 	if (!mac_provided) {
 		snprintf(nstr, sizeof(nstr), "%d-%d-%s", pi->pi_slot,
-	            pi->pi_func, vmname);
+		    pi->pi_func, vmname);
 
 		MD5Init(&mdctx);
 		MD5Update(&mdctx, nstr, strlen(nstr));
@@ -623,7 +612,7 @@ pci_vtnet_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 	sc->vsc_config.status = 1;
 	
 	/* use BAR 1 to map MSI-X table and PBA, if we're using MSI-X */
-	if (vi_intr_init(&sc->vsc_vs, 1, use_msix))
+	if (vi_intr_init(&sc->vsc_vs, 1, fbsdrun_virtio_msix()))
 		return (1);
 
 	/* use BAR 0 to map config regs in IO space */
@@ -643,7 +632,8 @@ pci_vtnet_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts)
 	pthread_mutex_init(&sc->tx_mtx, NULL);
 	pthread_cond_init(&sc->tx_cond, NULL);
 	pthread_create(&sc->tx_tid, NULL, pci_vtnet_tx_thread, (void *)sc);
-        snprintf(tname, sizeof(tname), "%s vtnet%d tx", vmname, pi->pi_slot);
+	snprintf(tname, sizeof(tname), "vtnet-%d:%d tx", pi->pi_slot,
+	    pi->pi_func);
         pthread_set_name_np(sc->tx_tid, tname);
 
 	return (0);
diff --git a/usr.sbin/bhyve/pit_8254.c b/usr.sbin/bhyve/pit_8254.c
index 3987da3b45a..9ecb565369f 100644
--- a/usr.sbin/bhyve/pit_8254.c
+++ b/usr.sbin/bhyve/pit_8254.c
@@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
 
 #include "bhyverun.h"
 #include "inout.h"
-#include "ioapic.h"
 #include "mevent.h"
 #include "pit_8254.h"
 
@@ -106,8 +105,7 @@ pit_mevent_cb(int fd, enum ev_type type, void *param)
 
 	pit_mev_count++;
 
-	ioapic_assert_pin(c->ctx, 0);
-	ioapic_deassert_pin(c->ctx, 0);
+	vm_ioapic_pulse_irq(c->ctx, 2);
 
 	/*
 	 * Delete the timer for one-shots
diff --git a/usr.sbin/bhyve/rtc.c b/usr.sbin/bhyve/rtc.c
index c1a84d74761..f3ce2bc9725 100644
--- a/usr.sbin/bhyve/rtc.c
+++ b/usr.sbin/bhyve/rtc.c
@@ -331,7 +331,7 @@ rtc_init(struct vmctx *ctx)
 
 	memset(rtc_nvram, 0, sizeof(rtc_nvram));
 
-	rtc_nvram[nvoff(RTC_CENTURY)] = rtcout(tm.tm_year / 100);
+	rtc_nvram[nvoff(RTC_CENTURY)] = bin2bcd((tm.tm_year + 1900) / 100);
 
 	/* XXX init diag/reset code/equipment/checksum ? */
 
diff --git a/usr.sbin/bhyve/spinup_ap.c b/usr.sbin/bhyve/spinup_ap.c
index 2632aed0e5f..729108ae1ee 100644
--- a/usr.sbin/bhyve/spinup_ap.c
+++ b/usr.sbin/bhyve/spinup_ap.c
@@ -85,22 +85,7 @@ spinup_ap(struct vmctx *ctx, int vcpu, int newcpu, uint64_t rip)
 	error = vcpu_reset(ctx, newcpu);
 	assert(error == 0);
 
-	/* Set up capabilities */
-	if (fbsdrun_vmexit_on_hlt()) {
-		error = vm_set_capability(ctx, newcpu, VM_CAP_HALT_EXIT, 1);
-		assert(error == 0);
-	}
-
-	if (fbsdrun_vmexit_on_pause()) {
-		error = vm_set_capability(ctx, newcpu, VM_CAP_PAUSE_EXIT, 1);
-		assert(error == 0);
-	}
-
-	if (fbsdrun_disable_x2apic())
-		error = vm_set_x2apic_state(ctx, newcpu, X2APIC_DISABLED);
-	else
-		error = vm_set_x2apic_state(ctx, newcpu, X2APIC_ENABLED);
-	assert(error == 0);
+	fbsdrun_set_capabilities(ctx, newcpu);
 
 	/*
 	 * Enable the 'unrestricted guest' mode for 'newcpu'.
diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c
new file mode 100644
index 00000000000..2fbbd15ea87
--- /dev/null
+++ b/usr.sbin/bhyve/uart_emul.c
@@ -0,0 +1,623 @@
+/*-
+ * Copyright (c) 2012 NetApp, Inc.
+ * Copyright (c) 2013 Neel Natu <neel@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 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/types.h>
+#include <dev/ic/ns16550.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <fcntl.h>
+#include <termios.h>
+#include <unistd.h>
+#include <stdbool.h>
+#include <string.h>
+#include <pthread.h>
+
+#include "mevent.h"
+#include "uart_emul.h"
+
+#define	COM1_BASE      	0x3F8
+#define COM1_IRQ	4
+#define	COM2_BASE      	0x2F8
+#define COM2_IRQ	3
+
+#define	DEFAULT_RCLK	1843200
+#define	DEFAULT_BAUD	9600
+
+#define	FCR_RX_MASK	0xC0
+
+#define	MCR_OUT1	0x04
+#define	MCR_OUT2	0x08
+
+#define	MSR_DELTA_MASK	0x0f
+
+#ifndef REG_SCR
+#define REG_SCR		com_scr
+#endif
+
+#define	FIFOSZ	16
+
+static bool uart_stdio;		/* stdio in use for i/o */
+static struct termios tio_stdio_orig;
+
+static struct {
+	int	baseaddr;
+	int	irq;
+	bool	inuse;
+} uart_lres[] = {
+	{ COM1_BASE, COM1_IRQ, false},
+	{ COM2_BASE, COM2_IRQ, false},
+};
+
+#define	UART_NLDEVS	(sizeof(uart_lres) / sizeof(uart_lres[0]))
+
+struct fifo {
+	uint8_t	buf[FIFOSZ];
+	int	rindex;		/* index to read from */
+	int	windex;		/* index to write to */
+	int	num;		/* number of characters in the fifo */
+	int	size;		/* size of the fifo */
+};
+
+struct ttyfd {
+	bool	opened;
+	int	fd;		/* tty device file descriptor */
+	struct termios tio_orig, tio_new;    /* I/O Terminals */
+};
+
+struct uart_softc {
+	pthread_mutex_t mtx;	/* protects all softc elements */
+	uint8_t	data;		/* Data register (R/W) */
+	uint8_t ier;		/* Interrupt enable register (R/W) */
+	uint8_t lcr;		/* Line control register (R/W) */
+	uint8_t mcr;		/* Modem control register (R/W) */
+	uint8_t lsr;		/* Line status register (R/W) */
+	uint8_t msr;		/* Modem status register (R/W) */
+	uint8_t fcr;		/* FIFO control register (W) */
+	uint8_t scr;		/* Scratch register (R/W) */
+
+	uint8_t dll;		/* Baudrate divisor latch LSB */
+	uint8_t dlh;		/* Baudrate divisor latch MSB */
+
+	struct fifo rxfifo;
+
+	struct ttyfd tty;
+	bool	thre_int_pending;	/* THRE interrupt pending */
+
+	void	*arg;
+	uart_intr_func_t intr_assert;
+	uart_intr_func_t intr_deassert;
+};
+
+static void uart_drain(int fd, enum ev_type ev, void *arg);
+
+static void
+ttyclose(void)
+{
+
+	tcsetattr(STDIN_FILENO, TCSANOW, &tio_stdio_orig);
+}
+
+static void
+ttyopen(struct ttyfd *tf)
+{
+
+	tcgetattr(tf->fd, &tf->tio_orig);
+
+	tf->tio_new = tf->tio_orig;
+	cfmakeraw(&tf->tio_new);
+	tf->tio_new.c_cflag |= CLOCAL;
+	tcsetattr(tf->fd, TCSANOW, &tf->tio_new);
+
+	if (tf->fd == STDIN_FILENO) {
+		tio_stdio_orig = tf->tio_orig;
+		atexit(ttyclose);
+	}
+}
+
+static bool
+tty_char_available(struct ttyfd *tf)
+{
+	fd_set rfds;
+	struct timeval tv;
+
+	FD_ZERO(&rfds);
+	FD_SET(tf->fd, &rfds);
+	tv.tv_sec = 0;
+	tv.tv_usec = 0;
+	if (select(tf->fd + 1, &rfds, NULL, NULL, &tv) > 0 ) {
+		return (true);
+	} else {
+		return (false);
+	}
+}
+
+static int
+ttyread(struct ttyfd *tf)
+{
+	char rb;
+
+	if (tty_char_available(tf)) {
+		read(tf->fd, &rb, 1);
+		return (rb & 0xff);
+	} else {
+		return (-1);
+	}
+}
+
+static void
+ttywrite(struct ttyfd *tf, unsigned char wb)
+{
+
+	(void)write(tf->fd, &wb, 1);
+}
+
+static void
+fifo_reset(struct fifo *fifo, int size)
+{
+
+	bzero(fifo, sizeof(struct fifo));
+	fifo->size = size;
+}
+
+static int
+fifo_putchar(struct fifo *fifo, uint8_t ch)
+{
+
+	if (fifo->num < fifo->size) {
+		fifo->buf[fifo->windex] = ch;
+		fifo->windex = (fifo->windex + 1) % fifo->size;
+		fifo->num++;
+		return (0);
+	} else
+		return (-1);
+}
+
+static int
+fifo_getchar(struct fifo *fifo)
+{
+	int c;
+
+	if (fifo->num > 0) {
+		c = fifo->buf[fifo->rindex];
+		fifo->rindex = (fifo->rindex + 1) % fifo->size;
+		fifo->num--;
+		return (c);
+	} else
+		return (-1);
+}
+
+static int
+fifo_numchars(struct fifo *fifo)
+{
+
+	return (fifo->num);
+}
+
+static int
+fifo_available(struct fifo *fifo)
+{
+
+	return (fifo->num < fifo->size);
+}
+
+static void
+uart_opentty(struct uart_softc *sc)
+{
+	struct mevent *mev;
+
+	ttyopen(&sc->tty);
+	mev = mevent_add(sc->tty.fd, EVF_READ, uart_drain, sc);
+	assert(mev);
+}
+
+/*
+ * The IIR returns a prioritized interrupt reason:
+ * - receive data available
+ * - transmit holding register empty
+ * - modem status change
+ *
+ * Return an interrupt reason if one is available.
+ */
+static int
+uart_intr_reason(struct uart_softc *sc)
+{
+
+	if ((sc->lsr & LSR_OE) != 0 && (sc->ier & IER_ERLS) != 0)
+		return (IIR_RLS);
+	else if (fifo_numchars(&sc->rxfifo) > 0 && (sc->ier & IER_ERXRDY) != 0)
+		return (IIR_RXTOUT);
+	else if (sc->thre_int_pending && (sc->ier & IER_ETXRDY) != 0)
+		return (IIR_TXRDY);
+	else if ((sc->msr & MSR_DELTA_MASK) != 0 && (sc->ier & IER_EMSC) != 0)
+		return (IIR_MLSC);
+	else
+		return (IIR_NOPEND);
+}
+
+static void
+uart_reset(struct uart_softc *sc)
+{
+	uint16_t divisor;
+
+	divisor = DEFAULT_RCLK / DEFAULT_BAUD / 16;
+	sc->dll = divisor;
+	sc->dlh = divisor >> 16;
+
+	fifo_reset(&sc->rxfifo, 1);	/* no fifo until enabled by software */
+}
+
+/*
+ * Toggle the COM port's intr pin depending on whether or not we have an
+ * interrupt condition to report to the processor.
+ */
+static void
+uart_toggle_intr(struct uart_softc *sc)
+{
+	uint8_t intr_reason;
+
+	intr_reason = uart_intr_reason(sc);
+
+	if (intr_reason == IIR_NOPEND)
+		(*sc->intr_deassert)(sc->arg);
+	else
+		(*sc->intr_assert)(sc->arg);
+}
+
+static void
+uart_drain(int fd, enum ev_type ev, void *arg)
+{
+	struct uart_softc *sc;
+	int ch;
+
+	sc = arg;	
+
+	assert(fd == sc->tty.fd);
+	assert(ev == EVF_READ);
+	
+	/*
+	 * This routine is called in the context of the mevent thread
+	 * to take out the softc lock to protect against concurrent
+	 * access from a vCPU i/o exit
+	 */
+	pthread_mutex_lock(&sc->mtx);
+
+	if ((sc->mcr & MCR_LOOPBACK) != 0) {
+		(void) ttyread(&sc->tty);
+	} else {
+		while (fifo_available(&sc->rxfifo) &&
+		       ((ch = ttyread(&sc->tty)) != -1)) {
+			fifo_putchar(&sc->rxfifo, ch);
+		}
+		uart_toggle_intr(sc);
+	}
+
+	pthread_mutex_unlock(&sc->mtx);
+}
+
+void
+uart_write(struct uart_softc *sc, int offset, uint8_t value)
+{
+	int fifosz;
+	uint8_t msr;
+
+	pthread_mutex_lock(&sc->mtx);
+	
+	/*
+	 * Take care of the special case DLAB accesses first
+	 */
+	if ((sc->lcr & LCR_DLAB) != 0) {
+		if (offset == REG_DLL) {
+			sc->dll = value;
+			goto done;
+		}
+		
+		if (offset == REG_DLH) {
+			sc->dlh = value;
+			goto done;
+		}
+	}
+
+        switch (offset) {
+	case REG_DATA:
+		if (sc->mcr & MCR_LOOPBACK) {
+			if (fifo_putchar(&sc->rxfifo, value) != 0)
+				sc->lsr |= LSR_OE;
+		} else if (sc->tty.opened) {
+			ttywrite(&sc->tty, value);
+		} /* else drop on floor */
+		sc->thre_int_pending = true;
+		break;
+	case REG_IER:
+		/*
+		 * Apply mask so that bits 4-7 are 0
+		 * Also enables bits 0-3 only if they're 1
+		 */
+		sc->ier = value & 0x0F;
+		break;
+		case REG_FCR:
+			/*
+			 * When moving from FIFO and 16450 mode and vice versa,
+			 * the FIFO contents are reset.
+			 */
+			if ((sc->fcr & FCR_ENABLE) ^ (value & FCR_ENABLE)) {
+				fifosz = (value & FCR_ENABLE) ? FIFOSZ : 1;
+				fifo_reset(&sc->rxfifo, fifosz);
+			}
+
+			/*
+			 * The FCR_ENABLE bit must be '1' for the programming
+			 * of other FCR bits to be effective.
+			 */
+			if ((value & FCR_ENABLE) == 0) {
+				sc->fcr = 0;
+			} else {
+				if ((value & FCR_RCV_RST) != 0)
+					fifo_reset(&sc->rxfifo, FIFOSZ);
+
+				sc->fcr = value &
+					 (FCR_ENABLE | FCR_DMA | FCR_RX_MASK);
+			}
+			break;
+		case REG_LCR:
+			sc->lcr = value;
+			break;
+		case REG_MCR:
+			/* Apply mask so that bits 5-7 are 0 */
+			sc->mcr = value & 0x1F;
+
+			msr = 0;
+			if (sc->mcr & MCR_LOOPBACK) {
+				/*
+				 * In the loopback mode certain bits from the
+				 * MCR are reflected back into MSR
+				 */
+				if (sc->mcr & MCR_RTS)
+					msr |= MSR_CTS;
+				if (sc->mcr & MCR_DTR)
+					msr |= MSR_DSR;
+				if (sc->mcr & MCR_OUT1)
+					msr |= MSR_RI;
+				if (sc->mcr & MCR_OUT2)
+					msr |= MSR_DCD;
+			}
+
+			/*
+			 * Detect if there has been any change between the
+			 * previous and the new value of MSR. If there is
+			 * then assert the appropriate MSR delta bit.
+			 */
+			if ((msr & MSR_CTS) ^ (sc->msr & MSR_CTS))
+				sc->msr |= MSR_DCTS;
+			if ((msr & MSR_DSR) ^ (sc->msr & MSR_DSR))
+				sc->msr |= MSR_DDSR;
+			if ((msr & MSR_DCD) ^ (sc->msr & MSR_DCD))
+				sc->msr |= MSR_DDCD;
+			if ((sc->msr & MSR_RI) != 0 && (msr & MSR_RI) == 0)
+				sc->msr |= MSR_TERI;
+
+			/*
+			 * Update the value of MSR while retaining the delta
+			 * bits.
+			 */
+			sc->msr &= MSR_DELTA_MASK;
+			sc->msr |= msr;
+			break;
+		case REG_LSR:
+			/*
+			 * Line status register is not meant to be written to
+			 * during normal operation.
+			 */
+			break;
+		case REG_MSR:
+			/*
+			 * As far as I can tell MSR is a read-only register.
+			 */
+			break;
+		case REG_SCR:
+			sc->scr = value;
+			break;
+		default:
+			break;
+	}
+
+done:
+	uart_toggle_intr(sc);
+	pthread_mutex_unlock(&sc->mtx);
+}
+
+uint8_t
+uart_read(struct uart_softc *sc, int offset)
+{
+	uint8_t iir, intr_reason, reg;
+
+	pthread_mutex_lock(&sc->mtx);
+
+	/*
+	 * Take care of the special case DLAB accesses first
+	 */
+	if ((sc->lcr & LCR_DLAB) != 0) {
+		if (offset == REG_DLL) {
+			reg = sc->dll;
+			goto done;
+		}
+		
+		if (offset == REG_DLH) {
+			reg = sc->dlh;
+			goto done;
+		}
+	}
+
+	switch (offset) {
+	case REG_DATA:
+		reg = fifo_getchar(&sc->rxfifo);
+		break;
+	case REG_IER:
+		reg = sc->ier;
+		break;
+	case REG_IIR:
+		iir = (sc->fcr & FCR_ENABLE) ? IIR_FIFO_MASK : 0;
+
+		intr_reason = uart_intr_reason(sc);
+			
+		/*
+		 * Deal with side effects of reading the IIR register
+		 */
+		if (intr_reason == IIR_TXRDY)
+			sc->thre_int_pending = false;
+
+		iir |= intr_reason;
+
+		reg = iir;
+		break;
+	case REG_LCR:
+		reg = sc->lcr;
+		break;
+	case REG_MCR:
+		reg = sc->mcr;
+		break;
+	case REG_LSR:
+		/* Transmitter is always ready for more data */
+		sc->lsr |= LSR_TEMT | LSR_THRE;
+
+		/* Check for new receive data */
+		if (fifo_numchars(&sc->rxfifo) > 0)
+			sc->lsr |= LSR_RXRDY;
+		else
+			sc->lsr &= ~LSR_RXRDY;
+
+		reg = sc->lsr;
+
+		/* The LSR_OE bit is cleared on LSR read */
+		sc->lsr &= ~LSR_OE;
+		break;
+	case REG_MSR:
+		/*
+		 * MSR delta bits are cleared on read
+		 */
+		reg = sc->msr;
+		sc->msr &= ~MSR_DELTA_MASK;
+		break;
+	case REG_SCR:
+		reg = sc->scr;
+		break;
+	default:
+		reg = 0xFF;
+		break;
+	}
+
+done:
+	uart_toggle_intr(sc);
+	pthread_mutex_unlock(&sc->mtx);
+
+	return (reg);
+}
+
+int
+uart_legacy_alloc(int which, int *baseaddr, int *irq)
+{
+
+	if (which < 0 || which >= UART_NLDEVS || uart_lres[which].inuse)
+		return (-1);
+
+	uart_lres[which].inuse = true;
+	*baseaddr = uart_lres[which].baseaddr;
+	*irq = uart_lres[which].irq;
+
+	return (0);
+}
+
+struct uart_softc *
+uart_init(uart_intr_func_t intr_assert, uart_intr_func_t intr_deassert,
+    void *arg)
+{
+	struct uart_softc *sc;
+
+	sc = malloc(sizeof(struct uart_softc));
+	bzero(sc, sizeof(struct uart_softc));
+
+	sc->arg = arg;
+	sc->intr_assert = intr_assert;
+	sc->intr_deassert = intr_deassert;
+
+	pthread_mutex_init(&sc->mtx, NULL);
+
+	uart_reset(sc);
+
+	return (sc);
+}
+
+static int
+uart_tty_backend(struct uart_softc *sc, const char *opts)
+{
+	int fd;
+	int retval;
+
+	retval = -1;
+
+	fd = open(opts, O_RDWR);
+	if (fd > 0 && isatty(fd)) {
+		sc->tty.fd = fd;
+		sc->tty.opened = true;
+		retval = 0;
+	}
+	    
+	return (retval);
+}
+
+int
+uart_set_backend(struct uart_softc *sc, const char *opts)
+{
+	int retval;
+
+	retval = -1;
+
+	if (opts == NULL)
+		return (0);
+
+	if (strcmp("stdio", opts) == 0) {
+		if (!uart_stdio) {
+			sc->tty.fd = STDIN_FILENO;
+			sc->tty.opened = true;
+			uart_stdio = true;
+			retval = 0;
+		}
+	} else if (uart_tty_backend(sc, opts) == 0) {
+		retval = 0;
+	}
+
+	if (retval == 0)
+		uart_opentty(sc);
+
+	return (retval);
+}
diff --git a/usr.sbin/bhyve/uart_emul.h b/usr.sbin/bhyve/uart_emul.h
new file mode 100644
index 00000000000..993b92e3cfe
--- /dev/null
+++ b/usr.sbin/bhyve/uart_emul.h
@@ -0,0 +1,45 @@
+/*-
+ * Copyright (c) 2013 Neel Natu <neel@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 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$
+ */
+
+#ifndef _UART_EMUL_H_
+#define	_UART_EMUL_H_
+
+
+#define	UART_IO_BAR_SIZE	8
+
+struct uart_softc;
+
+typedef void (*uart_intr_func_t)(void *arg);
+struct uart_softc *uart_init(uart_intr_func_t intr_assert,
+		uart_intr_func_t intr_deassert, void *arg);
+
+int	uart_legacy_alloc(int unit, int *ioaddr, int *irq);
+uint8_t	uart_read(struct uart_softc *sc, int offset);
+void	uart_write(struct uart_softc *sc, int offset, uint8_t value);
+int	uart_set_backend(struct uart_softc *sc, const char *opt);
+#endif
diff --git a/usr.sbin/bhyvectl/Makefile b/usr.sbin/bhyvectl/Makefile
index 9fde12ccc23..df3f19c56c3 100644
--- a/usr.sbin/bhyvectl/Makefile
+++ b/usr.sbin/bhyvectl/Makefile
@@ -7,8 +7,8 @@ SRCS=	bhyvectl.c
 
 NO_MAN=
 
-DPADD=	${LIBVMMAPI}
-LDADD=	-lvmmapi
+DPADD=	${LIBVMMAPI} ${LIBUTIL}
+LDADD=	-lvmmapi -lutil
 
 WARNS?=	3
 
diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c
index d6b32b83e15..0e9220494e3 100644
--- a/usr.sbin/bhyvectl/bhyvectl.c
+++ b/usr.sbin/bhyvectl/bhyvectl.c
@@ -1495,6 +1495,7 @@ main(int argc, char *argv[])
 					vm_capability_type2name(captype),
 					val ? "set" : "not set", vcpu);
 			} else if (errno == ENOENT) {
+				error = 0;
 				printf("Capability \"%s\" is not available\n",
 					vm_capability_type2name(captype));
 			} else {
diff --git a/usr.sbin/bhyveload/Makefile b/usr.sbin/bhyveload/Makefile
index 7b0081836a3..e7b19bd8288 100644
--- a/usr.sbin/bhyveload/Makefile
+++ b/usr.sbin/bhyveload/Makefile
@@ -4,8 +4,8 @@ PROG=	bhyveload
 SRCS=	bhyveload.c
 MAN=	bhyveload.8
 
-DPADD+=	${LIBVMMAPI}
-LDADD+=	-lvmmapi
+DPADD+=	${LIBVMMAPI} ${LIBUTIL}
+LDADD+=	-lvmmapi -lutil
 
 WARNS?=	3
 
diff --git a/usr.sbin/bhyveload/bhyveload.8 b/usr.sbin/bhyveload/bhyveload.8
index f2e5e3590d1..eed1f1ad0bc 100644
--- a/usr.sbin/bhyveload/bhyveload.8
+++ b/usr.sbin/bhyveload/bhyveload.8
@@ -38,6 +38,8 @@ guest inside a bhyve virtual machine
 .Op Fl m Ar mem-size
 .Op Fl d Ar disk-path
 .Op Fl h Ar host-path
+.Op Fl e Ar name=value
+.Op Fl c Ar cons-dev
 .Ar vmname
 .Sh DESCRIPTION
 .Nm
@@ -60,13 +62,29 @@ and will be created if it does not already exist.
 .Sh OPTIONS
 The following options are available:
 .Bl -tag -width indent
-.It Fl m Ar mem-size
+.It Fl m Ar mem-size Xo
+.Sm off
+.Op Cm K | k | M | m | G | g | T | t
+.Xc
+.Sm on
 .Ar mem-size
-is the amount of memory allocated to the guest in units of megabytes.
+is the amount of memory allocated to the guest.
+.Pp
+The
+.Ar mem-size
+argument may be suffixed with one of
+.Cm K ,
+.Cm M ,
+.Cm G
+or
+.Cm T
+(either upper or lower case) to indicate a multiple of
+Kilobytes, Megabytes, Gigabytes or Terabytes
+respectively.
 .Pp
 The default value of
 .Ar mem-size
-is 256.
+is 256M.
 .It Fl d Ar disk-path
 The
 .Ar disk-path
@@ -75,6 +93,24 @@ is the pathname of the guest's boot disk image.
 The
 .Ar host-path
 is the directory at the top of the guest's boot filesystem.
+.It Fl e Ar name=value
+Set the FreeBSD loader environment variable
+.Ar name
+to
+.Ar value .
+.Pp
+The option may be used more than once to set more than one environment
+variable.
+.It Fl c Ar cons-dev
+.Ar cons-dev
+is a
+.Xr tty 4
+device to use for
+.Nm
+terminal I/O.
+.Pp
+The text string "stdio" is also accepted and selects the use of
+unbuffered standard I/O. This is the default value.
 .El
 .Sh EXAMPLES
 To create a virtual machine named
@@ -83,11 +119,24 @@ that boots off the ISO image
 .Pa /freebsd/release.iso
 and has 1GB memory allocated to it:
 .Pp
-.Dl "bhyveload -m 1024 -d /freebsd/release.iso freebsd-vm"
+.Dl "bhyveload -m 1G -d /freebsd/release.iso freebsd-vm"
+.Pp
+To create a virtual machine named
+.Ar test-vm
+with 256MB of memory allocated, the guest root filesystem under the host
+directory
+.Pa /user/images/test
+and terminal I/O sent to the
+.Xr nmdm 4
+device
+.Pa /dev/nmdm1B
+.Pp
+.Dl "bhyveload -m 256MB -h /usr/images/test -c /dev/nmdm1B test-vm"
 .Sh SEE ALSO
 .Xr bhyve 4 ,
 .Xr bhyve 8 ,
 .Xr loader 8 ,
+.Xr nmdm 4,
 .Xr vmm 4
 .Sh HISTORY
 .Nm
diff --git a/usr.sbin/bhyveload/bhyveload.c b/usr.sbin/bhyveload/bhyveload.c
index c4bafd3a595..94cb1b19fd6 100644
--- a/usr.sbin/bhyveload/bhyveload.c
+++ b/usr.sbin/bhyveload/bhyveload.c
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/disk.h>
+#include <sys/queue.h>
 
 #include <machine/specialreg.h>
 #include <machine/vmm.h>
@@ -67,12 +68,15 @@ __FBSDID("$FreeBSD$");
 #include <dirent.h>
 #include <dlfcn.h>
 #include <errno.h>
+#include <err.h>
 #include <fcntl.h>
 #include <getopt.h>
+#include <libgen.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sysexits.h>
 #include <termios.h>
 #include <unistd.h>
 
@@ -84,9 +88,10 @@ __FBSDID("$FreeBSD$");
 #define	GB	(1024 * 1024 * 1024UL)
 #define	BSP	0
 
-static char *host_base = "/";
+static char *host_base;
 static struct termios term, oldterm;
 static int disk_fd = -1;
+static int consin_fd, consout_fd;
 
 static char *vmname, *progname;
 static struct vmctx *ctx;
@@ -104,7 +109,7 @@ cb_putc(void *arg, int ch)
 {
 	char c = ch;
 
-	write(1, &c, 1);
+	(void) write(consout_fd, &c, 1);
 }
 
 static int
@@ -112,7 +117,7 @@ cb_getc(void *arg)
 {
 	char c;
 
-	if (read(0, &c, 1) == 1)
+	if (read(consin_fd, &c, 1) == 1)
 		return (c);
 	return (-1);
 }
@@ -122,7 +127,7 @@ cb_poll(void *arg)
 {
 	int n;
 
-	if (ioctl(0, FIONREAD, &n) >= 0)
+	if (ioctl(consin_fd, FIONREAD, &n) >= 0)
 		return (n > 0);
 	return (0);
 }
@@ -484,7 +489,7 @@ static void
 cb_exit(void *arg, int v)
 {
 
-	tcsetattr(0, TCSAFLUSH, &oldterm);
+	tcsetattr(consout_fd, TCSAFLUSH, &oldterm);
 	exit(v);
 }
 
@@ -496,23 +501,37 @@ cb_getmem(void *arg, uint64_t *ret_lowmem, uint64_t *ret_highmem)
 	vm_get_memory_seg(ctx, 4 * GB, ret_highmem, NULL);
 }
 
+struct env {
+	const char *str;	/* name=value */
+	SLIST_ENTRY(env) next;
+};
+
+static SLIST_HEAD(envhead, env) envhead;
+
+static void
+addenv(const char *str)
+{
+	struct env *env;
+
+	env = malloc(sizeof(struct env));
+	env->str = str;
+	SLIST_INSERT_HEAD(&envhead, env, next);
+}
+
 static const char *
 cb_getenv(void *arg, int num)
 {
-	int max;
+	int i;
+	struct env *env;
 
-	static const char * var[] = {
-		"smbios.bios.vendor=BHYVE",
-		"boot_serial=1",
-		NULL
-	};
+	i = 0;
+	SLIST_FOREACH(env, &envhead, next) {
+		if (i == num)
+			return (env->str);
+		i++;
+	}
 
-	max = sizeof(var) / sizeof(var[0]);
-
-	if (num < max)
-		return (var[num]);
-	else
-		return (NULL);
+	return (NULL);
 }
 
 static struct loader_callbacks cb = {
@@ -546,13 +565,46 @@ static struct loader_callbacks cb = {
 	.getenv = cb_getenv,
 };
 
+static int
+altcons_open(char *path)
+{
+	struct stat sb;
+	int err;
+	int fd;
+
+	/*
+	 * Allow stdio to be passed in so that the same string
+	 * can be used for the bhyveload console and bhyve com-port
+	 * parameters
+	 */
+	if (!strcmp(path, "stdio"))
+		return (0);
+
+	err = stat(path, &sb);
+	if (err == 0) {
+		if (!S_ISCHR(sb.st_mode))
+			err = ENOTSUP;
+		else {
+			fd = open(path, O_RDWR | O_NONBLOCK);
+			if (fd < 0)
+				err = errno;
+			else
+				consin_fd = consout_fd = fd;
+		}
+	}
+
+	return (err);
+}
+
 static void
 usage(void)
 {
 
 	fprintf(stderr,
-		"usage: %s [-m mem-size][-d <disk-path>] [-h <host-path>] "
-		"<vmname>\n", progname);
+	    "usage: %s [-m mem-size] [-d <disk-path>] [-h <host-path>]\n"
+	    "       %*s [-e <name=value>] [-c <console-device>] <vmname>\n",
+	    progname,
+	    (int)strlen(progname), "");
 	exit(1);
 }
 
@@ -565,25 +617,38 @@ main(int argc, char** argv)
 	int opt, error;
 	char *disk_image;
 
-	progname = argv[0];
+	progname = basename(argv[0]);
 
 	mem_size = 256 * MB;
 	disk_image = NULL;
 
-	while ((opt = getopt(argc, argv, "d:h:m:")) != -1) {
+	consin_fd = STDIN_FILENO;
+	consout_fd = STDOUT_FILENO;
+
+	while ((opt = getopt(argc, argv, "c:d:e:h:m:")) != -1) {
 		switch (opt) {
+		case 'c':
+			error = altcons_open(optarg);
+			if (error != 0)
+				errx(EX_USAGE, "Could not open '%s'", optarg);
+			break;
 		case 'd':
 			disk_image = optarg;
 			break;
 
+		case 'e':
+			addenv(optarg);
+			break;
+
 		case 'h':
 			host_base = optarg;
 			break;
 
 		case 'm':
-			mem_size = strtoul(optarg, NULL, 0) * MB;
+			error = vm_parse_memsize(optarg, &mem_size);
+			if (error != 0)
+				errx(EX_USAGE, "Invalid memsize '%s'", optarg);
 			break;
-		
 		case '?':
 			usage();
 		}
@@ -616,11 +681,13 @@ main(int argc, char** argv)
 		exit(1);
 	}
 
-	tcgetattr(0, &term);
+	tcgetattr(consout_fd, &term);
 	oldterm = term;
-	term.c_lflag &= ~(ICANON|ECHO);
-	term.c_iflag &= ~ICRNL;
-	tcsetattr(0, TCSAFLUSH, &term);
+	cfmakeraw(&term);
+	term.c_cflag |= CLOCAL;
+	
+	tcsetattr(consout_fd, TCSAFLUSH, &term);
+
 	h = dlopen("/boot/userboot.so", RTLD_LOCAL);
 	if (!h) {
 		printf("%s\n", dlerror());
@@ -635,5 +702,9 @@ main(int argc, char** argv)
 	if (disk_image) {
 		disk_fd = open(disk_image, O_RDONLY);
 	}
+
+	addenv("smbios.bios.vendor=BHYVE");
+	addenv("boot_serial=1");
+
 	func(&cb, NULL, USERBOOT_VERSION_3, disk_fd >= 0);
 }
diff --git a/usr.sbin/bluetooth/bthidd/kbd.c b/usr.sbin/bluetooth/bthidd/kbd.c
index e1ab870d800..b5bdfe16e70 100644
--- a/usr.sbin/bluetooth/bthidd/kbd.c
+++ b/usr.sbin/bluetooth/bthidd/kbd.c
@@ -67,7 +67,7 @@ static int32_t	kbd_xlate(int32_t code, int32_t make, int32_t *b, int32_t const *
  * The "break" (key released) code is generated as "make" | 0x80
  */
 
-#define E0PREFIX	(1 << 31)
+#define E0PREFIX	(1U << 31)
 #define NOBREAK		(1 << 30)
 #define CODEMASK	(~(E0PREFIX|NOBREAK))
 
diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c
index 8c93c1f8e37..85a1fca429a 100644
--- a/usr.sbin/bootparamd/bootparamd/main.c
+++ b/usr.sbin/bootparamd/bootparamd/main.c
@@ -86,7 +86,7 @@ char **argv;
 	if ( stat(bootpfile, &buf ) )
 	  err(1, "%s", bootpfile);
 
-	if (route_addr == -1) {
+	if (route_addr == INADDR_NONE) {
 	  get_myaddress(&my_addr);
 	  bcopy(&my_addr.sin_addr.s_addr, &route_addr, sizeof (route_addr));
 	}
diff --git a/usr.sbin/bootparamd/callbootd/callbootd.c b/usr.sbin/bootparamd/callbootd/callbootd.c
index a0a4ef62f82..7c32fee75f4 100644
--- a/usr.sbin/bootparamd/callbootd/callbootd.c
+++ b/usr.sbin/bootparamd/callbootd/callbootd.c
@@ -104,7 +104,7 @@ char **argv;
   case 3:
     whoami_arg.client_address.address_type = IP_ADDR_TYPE;
     the_inet_addr = inet_addr(argv[2]);
-    if ( the_inet_addr == -1)
+    if ( the_inet_addr == INADDR_NONE)
       errx(2, "bogus addr %s", argv[2]);
     bcopy(&the_inet_addr,&whoami_arg.client_address.bp_address_u.ip_addr,4);
 
diff --git a/usr.sbin/bsdconfig/Makefile b/usr.sbin/bsdconfig/Makefile
index 13cc1c7d663..72187dee570 100644
--- a/usr.sbin/bsdconfig/Makefile
+++ b/usr.sbin/bsdconfig/Makefile
@@ -6,6 +6,7 @@ SUBDIR=	console \
 	dot \
 	examples \
 	include \
+	includes \
 	mouse \
 	networking \
 	packages \
diff --git a/usr.sbin/bsdconfig/bsdconfig b/usr.sbin/bsdconfig/bsdconfig
index b23e083bcf6..c158bfa12fe 100755
--- a/usr.sbin/bsdconfig/bsdconfig
+++ b/usr.sbin/bsdconfig/bsdconfig
@@ -300,7 +300,7 @@ dialog_menu_main()
 	f_dialog_menutag_store "$menu_choice"
 
 	# Only update default-item on success
-	[ $retval -eq 0 ] && f_dialog_default_store "$menu_choice"
+	[ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
 
 	return $retval
 }
@@ -342,7 +342,7 @@ while getopts f:h$GETOPTS_STDARGS flag; do
 	h|\?) usage ;;
 	esac
 done
-shift $(( $OPTIND -1 ))
+shift $(( $OPTIND - 1 ))
 
 # If we've loaded any scripts, do not continue any further
 [ $scripts_loaded -gt 0 ] && exit
@@ -396,11 +396,10 @@ while :; do
 	f_dialog_menutag_fetch mtag
 	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
 
-	if [ $retval -eq 2 ]; then
-		# The Help button was pressed
+	if [ $retval -eq $DIALOG_HELP ]; then
 		f_show_help "$BSDCONFIG_HELPFILE"
 		continue
-	elif [ $retval -ne 0 ]; then
+	elif [ $retval -ne $DIALOG_OK ]; then
 		f_die
 	fi
 
diff --git a/usr.sbin/bsdconfig/console/console b/usr.sbin/bsdconfig/console/console
index ce3d01450bf..cfa44bee1ab 100755
--- a/usr.sbin/bsdconfig/console/console
+++ b/usr.sbin/bsdconfig/console/console
@@ -37,8 +37,8 @@ f_include $BSDCFG_SHARE/mustberoot.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
diff --git a/usr.sbin/bsdconfig/console/font b/usr.sbin/bsdconfig/console/font
index 1ffa696f2d7..ce16730dd25 100755
--- a/usr.sbin/bsdconfig/console/font
+++ b/usr.sbin/bsdconfig/console/font
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -174,14 +174,16 @@ esac
 
 [ "$f8" -a "$f14" -a "$f16" ] || f_die 1 "$msg_unknown_font_selection"
 
-f_sysrc_set font8x8 "$f8" || f_die
-f_sysrc_set font8x14 "$f14" || f_die
-f_sysrc_set font8x16 "$f16" || f_die
+f_eval_catch "$0" f_sysrc_set 'f_sysrc_set font8x8 "%s"' "$f8" || f_die
+f_eval_catch "$0" f_sysrc_set 'f_sysrc_set font8x14 "%s"' "$f14" || f_die
+f_eval_catch "$0" f_sysrc_set 'f_sysrc_set font8x16 "%s"' "$f16" || f_die
 
 if [ "$mc_start" ]; then
-	f_sysrc_set mousechar_start "$mc_start" || f_die
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set mousechar_start "%s"' "$mc_start" || f_die
 else
-	f_sysrc_delete mousechar_start || f_die
+	f_eval_catch "$0" f_sysrc_delete \
+		'f_sysrc_delete mousechar_start' || f_die
 fi
 
 exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/console/include/messages.subr b/usr.sbin/bsdconfig/console/include/messages.subr
index 11e3022f352..295f3e302db 100644
--- a/usr.sbin/bsdconfig/console/include/messages.subr
+++ b/usr.sbin/bsdconfig/console/include/messages.subr
@@ -51,8 +51,8 @@ msg_cancel="Cancel"
 msg_central_european_iso="Central European ISO"
 msg_central_european_iso_desc="Central European ISO keymap"
 msg_choose_alternate_keyboard_map="Choose an alternate keyboard map"
-msg_choose_alternate_screenmap="Choose an alternate screenmap"
 msg_choose_alternate_screen_font="Choose an alternate screen font"
+msg_choose_alternate_screenmap="Choose an alternate screenmap"
 msg_choose_console_terminal_type="Choose console terminal type"
 msg_configure_screen_saver="Configure the screen saver"
 msg_console_menu_text="The system console driver for FreeBSD has a number of configuration\noptions which may be set according to your preference.\n\nWhen you are done setting configuration options, select Cancel."
@@ -74,9 +74,9 @@ msg_enter_timeout_period="Enter time-out period in seconds for screen saver"
 msg_estonian_cp850="Estonian CP850"
 msg_estonian_cp850_desc="Estonian Code Page 850 keymap"
 msg_estonian_iso="Estonian ISO"
-msg_estonian_iso_desc="Estonian ISO keymap"
 msg_estonian_iso_15="Estonian ISO 15"
 msg_estonian_iso_15_desc="Estonian ISO 8859-15 keymap"
+msg_estonian_iso_desc="Estonian ISO keymap"
 msg_exit="Exit"
 msg_exit_this_menu="Exit this menu"
 msg_fade="Fade"
@@ -97,8 +97,6 @@ msg_french_iso_accent_desc="French ISO keymap (accent keys)"
 msg_french_iso_desc="French ISO keymap"
 msg_french_iso_macbook="French ISO/Macbook"
 msg_french_iso_macbook_desc="French ISO keymap on macbook"
-msg_green="Green"
-msg_green_desc="\"Green\" power saving mode (if supported by monitor)"
 msg_german_cp850="German CP850"
 msg_german_cp850_desc="German Code Page 850 keymap"
 msg_german_iso="German ISO"
@@ -109,10 +107,14 @@ msg_greek_104="Greek 104"
 msg_greek_104_desc="Greek ISO keymap (104 keys)"
 msg_greek_elot="Greek ELOT"
 msg_greek_elot_desc="Greek ISO keymap (ELOT 1000)"
+msg_green="Green"
+msg_green_desc="\"Green\" power saving mode (if supported by monitor)"
 msg_hungarian_101="Hungarian 101"
 msg_hungarian_101_desc="Hungarian ISO keymap (101 key)"
 msg_hungarian_102="Hungarian 102"
 msg_hungarian_102_desc="Hungarian ISO keymap (102 key)"
+msg_ibm_1251="IBM 1251"
+msg_ibm_1251_desc="Cyrillic, MS Windows encoding"
 msg_ibm_437="IBM 437"
 msg_ibm_437_desc="English and others, VGA default"
 msg_ibm_437_vga_default="IBM437 (VGA default)"
@@ -124,12 +126,12 @@ msg_ibm_866="IBM 866"
 msg_ibm_866_desc="Russian, IBM encoding (use with KOI8-R screenmap)"
 msg_ibm_866u="IBM 866u"
 msg_ibm_866u_desc="Ukrainian, IBM encoding (use with KOI8-U screenmap)"
-msg_ibm_1251="IBM 1251"
-msg_ibm_1251_desc="Cyrillic, MS Windows encoding"
 msg_icelandic="Icelandic"
 msg_icelandic_accent="Icelandic (accent)"
 msg_icelandic_accent_desc="Icelandic ISO keymap (accent keys)"
 msg_icelandic_desc="Icelandic ISO keymap"
+msg_iso_8859_15="ISO 8859-15"
+msg_iso_8859_15_desc="Europe, ISO encoding"
 msg_iso_8859_1="ISO 8859-1"
 msg_iso_8859_1_desc="Western Europe, ISO encoding"
 msg_iso_8859_1_to_ibm437="ISO 8859-1 to IBM437"
@@ -144,8 +146,6 @@ msg_iso_8859_7_to_ibm437="ISO 8859-7 to IBM437"
 msg_iso_8859_7_to_ibm437_desc="Greek ISO 8859-1 to IBM 437 screenmap"
 msg_iso_8859_8="ISO 8859-8"
 msg_iso_8859_8_desc="Hebrew, ISO encoding"
-msg_iso_8859_15="ISO 8859-15"
-msg_iso_8859_15_desc="Europe, ISO encoding"
 msg_italian="Italian"
 msg_italian_desc="Italian ISO keymap"
 msg_japanese_106="Japanese 106"
@@ -153,9 +153,9 @@ msg_japanese_106_desc="Japanese 106 keymap"
 msg_keymap="Keymap"
 msg_keymap_menu_text="The system console driver for FreeBSD defaults to a standard\n\"US\" keyboard map.  Users may wish to choose one of the\nother keymaps below."
 msg_koi8_r="KOI8-R"
-msg_koi8_u="KOI8-U"
 msg_koi8_r_to_ibm866="KOI8-R to IBM866"
 msg_koi8_r_to_ibm866_desc="Russian KOI8-R to IBM 866 screenmap"
+msg_koi8_u="KOI8-U"
 msg_koi8_u_to_ibm866u="KOI8-U to IBM866u"
 msg_koi8_u_to_ibm866u_desc="Ukrainian KOI8-U to IBM 866u screenmap"
 msg_latin_american="Latin American"
@@ -224,8 +224,8 @@ msg_swiss_german_iso_accent_desc="Swiss German ISO keymap (accent keys)"
 msg_swiss_german_iso_desc="Swiss German ISO keymap"
 msg_system_console_configuration="System Console Configuration"
 msg_system_console_font="System Console Font"
-msg_system_console_keymap="System Console Keymap"
 msg_system_console_keyboard_repeat_rate="System Console Keyboard Repeat Rate"
+msg_system_console_keymap="System Console Keymap"
 msg_system_console_screen_saver="System Console Screen Saver"
 msg_system_console_screenmap="System Console Screenmap"
 msg_system_console_terminal_type="System Console Terminal Type"
diff --git a/usr.sbin/bsdconfig/console/keymap b/usr.sbin/bsdconfig/console/keymap
index 99072b539ee..c163a1b7e1b 100755
--- a/usr.sbin/bsdconfig/console/keymap
+++ b/usr.sbin/bsdconfig/console/keymap
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -246,10 +246,8 @@ while :; do
 	keymap_name=
 	mtag="${mtag# }" # remove single leading-space if-present
 	for name in $KEYMAP_NAMES; do
-		if [ "$( eval echo \"\$msg_$name\" )" = "$mtag" ]; then
-			keymap_name="$name"
-			break
-		fi
+		debug= f_getvar msg_$name msg
+		[ "$msg" = "$mtag" ] && keymap_name="$name" break
 	done
 
 	[ "$keymap_name" ] || continue
@@ -319,7 +317,8 @@ while :; do
 	esac
 
 	if [ "$keymap_to_set" ]; then
-		f_sysrc_set keymap "$keymap_to_set" || f_die
+		f_eval_catch "$0" f_sysrc_set \
+			'f_sysrc_set keymap "%s"' "$keymap_to_set" || f_die
 		break
 	else
 		f_die 1 "$msg_unknown_keymap"
diff --git a/usr.sbin/bsdconfig/console/repeat b/usr.sbin/bsdconfig/console/repeat
index 54134c6365b..ff000234dc7 100755
--- a/usr.sbin/bsdconfig/console/repeat
+++ b/usr.sbin/bsdconfig/console/repeat
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -129,7 +129,8 @@ case "$mtag" in
 esac
 
 if [ "$repeat_rate_to_set" ]; then
-	f_sysrc_set keyrate "$repeat_rate_to_set" || f_die
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set keyrate "%s"' "$repeat_rate_to_set" || f_die
 	break
 else
 	f_die 1 "$msg_unknown_repeat_rate"
diff --git a/usr.sbin/bsdconfig/console/saver b/usr.sbin/bsdconfig/console/saver
index 00d9e940cb4..0df487c9583 100755
--- a/usr.sbin/bsdconfig/console/saver
+++ b/usr.sbin/bsdconfig/console/saver
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -144,7 +144,8 @@ case "$mtag" in
 	f_dialog_title "$msg_value_required"
 	f_dialog_input blanktime "$msg_enter_timeout_period" \
 	               "$( f_sysrc_get blanktime )" &&
-		f_sysrc_set blanktime "$blanktime" || f_die
+		f_eval_catch "$0" f_sysrc_set \
+			'f_sysrc_set blanktime "%s"' "$blanktime" || f_die
 	f_dialog_title_restore
 	exit $SUCCESS
 esac
@@ -180,7 +181,8 @@ case "$mtag" in
 esac
 
 if [ "$saver_to_set" ]; then
-	f_sysrc_set saver "$saver_to_set" || f_die
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set saver "%s"' "$saver_to_set" || f_die
 	break
 else
 	f_die 1 "$msg_unknown_saver"
diff --git a/usr.sbin/bsdconfig/console/screenmap b/usr.sbin/bsdconfig/console/screenmap
index f9bbcd81ae8..5bf5bd872da 100755
--- a/usr.sbin/bsdconfig/console/screenmap
+++ b/usr.sbin/bsdconfig/console/screenmap
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -141,7 +141,8 @@ case "$mtag" in
 esac
 
 if [ "$scrnmap_to_set" ]; then
-	f_sysrc_set scrnmap "$scrnmap_to_set" || f_die
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set scrnmap "%s"' "$scrnmap_to_set" || f_die
 	break
 else
 	f_die 1 "$msg_unknown_screenmap_selection"
diff --git a/usr.sbin/bsdconfig/console/ttys b/usr.sbin/bsdconfig/console/ttys
index c0f3ee8fa8b..54dcb66bdd9 100755
--- a/usr.sbin/bsdconfig/console/ttys
+++ b/usr.sbin/bsdconfig/console/ttys
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="080.console"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -92,7 +92,7 @@ dialog_menu_main()
 	local retval=$?
 	f_dialog_menutag_store -s "$menu_choice"
 
-	if [ $retval -eq $SUCCESS ]; then
+	if [ $retval -eq $DIALOG_OK ]; then
 		local item
 		item=$( eval f_dialog_menutag2item \
 		        	\"\$menu_choice\" $menu_list )
@@ -108,23 +108,28 @@ dialog_menu_main()
 #
 ttys_set_type()
 {
+	local funcname=ttys_set_type
 	local consterm="$1" err
 
 	#
 	# Create new temporary file to write our ttys(5) update with new types.
 	#
-	local tmpfile="$( mktemp -t "pgm" )"
-	[ "$tmpfile" ] || return $FAILURE
+	local tmpfile
+	f_eval_catch -k tmpfile $funcname mktemp 'mktemp -t "%s"' "$pgm" ||
+		return $FAILURE
 
 	#
 	# Fixup permissions and ownership (mktemp(1) creates the temporary file
 	# with 0600 permissions -- change the permissions and ownership to
 	# match ttys(5) before we write it out and mv(1) it into place).
 	#
-	local mode="$( stat -f '%#Lp' "$ETC_TTYS" 2> /dev/null )"
-	local owner="$( stat -f '%u:%g' "$ETC_TTYS" 2> /dev/null )"
-	f_quietly chmod "${mode:-0644}" "$tmpfile"
-	f_quietly chown "${owner:-root:wheel}" "$tmpfile"
+	local mode owner
+	f_eval_catch -dk mode $funcname stat \
+		'stat -f "%%#Lp" "%s"' "$ETC_TTYS" || mode=0644
+	f_eval_catch -dk owner $funcname stat \
+		'stat -f "%%u:%%g" "%s"' "$ETC_TTYS" || owner="root:wheel"
+	f_eval_catch -d $funcname chmod 'chmod "%s" "%s"' "$mode" "$tmpfile"
+	f_eval_catch -d $funcname chown 'chown "%s" "%s"' "$owner" "$tmpfile"
 
 	#
 	# Operate on ttys(5), replacing only the types of `ttyv*' and
@@ -156,10 +161,8 @@ ttys_set_type()
 		f_dialog_msgbox "$err"
 		return $FAILURE
 	fi
-	if ! err=$( mv -f "$tmpfile" "$ETC_TTYS" 2>&1 ); then
-		f_dialog_msgbox "$err"
+	f_eval_catch $funcname mv 'mv -f "%s" "%s"' "$tmpfile" "$ETC_TTYS" ||
 		return $FAILURE
-	fi
 
 	return $SUCCESS
 }
diff --git a/usr.sbin/bsdconfig/diskmgmt/diskmgmt b/usr.sbin/bsdconfig/diskmgmt/diskmgmt
index 8c3435df9bc..ec567f550e7 100755
--- a/usr.sbin/bsdconfig/diskmgmt/diskmgmt
+++ b/usr.sbin/bsdconfig/diskmgmt/diskmgmt
@@ -37,8 +37,8 @@ f_include $BSDCFG_SHARE/mustberoot.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="050.diskmgmt"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
diff --git a/usr.sbin/bsdconfig/docsinstall/docsinstall b/usr.sbin/bsdconfig/docsinstall/docsinstall
index 5e3a0d3089d..19128fed656 100755
--- a/usr.sbin/bsdconfig/docsinstall/docsinstall
+++ b/usr.sbin/bsdconfig/docsinstall/docsinstall
@@ -37,8 +37,8 @@ f_include $BSDCFG_SHARE/mustberoot.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="020.docsinstall"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
diff --git a/usr.sbin/bsdconfig/dot/dot b/usr.sbin/bsdconfig/dot/dot
index e13a269ae51..7f34c814cca 100755
--- a/usr.sbin/bsdconfig/dot/dot
+++ b/usr.sbin/bsdconfig/dot/dot
@@ -41,8 +41,8 @@ BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="dot"
 f_include_lang $BSDCFG_LIBE/include/messages.subr
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -163,7 +163,7 @@ while getopts cdhi flag; do
 done
 shift $(( $OPTIND - 1 ))
 
-cd $BSDCFG_LIBE || f_die 1 "$msg_directory_not_found" "$BSDCFG_LIB"
+cd $BSDCFG_LIBE || f_die # Pedantic
 
 #
 # Get a list of menu programs
diff --git a/usr.sbin/bsdconfig/include/messages.subr b/usr.sbin/bsdconfig/include/messages.subr
index 1c558f20653..bf16e087558 100644
--- a/usr.sbin/bsdconfig/include/messages.subr
+++ b/usr.sbin/bsdconfig/include/messages.subr
@@ -40,6 +40,7 @@ msg_afterstep_desc="Ports to support the AfterStep window manager."
 msg_all="All"
 msg_all_desc="All available packages in all categories."
 msg_always_try_sudo_when_run_as="Always try sudo(8) when run as %s"
+msg_an_unknown_error_occurred="An unknown error occurred"
 msg_arabic_desc="Ported software for Arab countries."
 msg_archivers_desc="Utilities for archiving and unarchiving data."
 msg_armenia="Armenia"
@@ -48,7 +49,7 @@ msg_assume_yes_to_all_non_critical_dialogs="Assume \"Yes\" answers to all non-cr
 msg_astro_desc="Applications related to astronomy."
 msg_attempt_automatic_dhcp_configuration="Attempt automatic DHCP configuration of interfaces"
 msg_attempt_ipv6_configuration_of_interfaces="Attempt IPv6 configuration of interfaces"
-msg_attempting_to_fetch_file_from_selected_media="Attempting to fetch %s file from selected media."
+msg_attempting_to_update_repository_catalogue="Attempting to update repository catalogue from selected media."
 msg_audio_desc="Audio utilities - most require a supported sound card."
 msg_australia="Australia"
 msg_austria="Austria"
@@ -137,9 +138,12 @@ msg_ftp_desc="FTP client and server utilities."
 msg_ftp_passive="FTP Passive"
 msg_ftp_username="FTP username"
 msg_games_desc="Various games and sundry amusements."
+msg_generating_index_from_pkg_database="Generating INDEX from pkg(8) database\n(this can take a while)..."
 msg_geography_desc="Geography-related software."
 msg_german_desc="Ported software for Germanic countries."
 msg_germany="Germany"
+msg_getting_package_categories_via_pkg_rquery="Getting package categories via pkg-rquery(8)..."
+msg_getting_package_dependencies_via_pkg_rquery="Getting package dependencies via pkg-rquery(8)\n(this can take a while)..."
 msg_gnome_desc="Components of the Gnome Desktop environment."
 msg_gnustep_desc="Software for GNUstep desktop environment."
 msg_graphics_desc="Graphics libraries and utilities."
@@ -166,8 +170,8 @@ msg_install_from_an_http_server="Install from an HTTP server"
 msg_install_from_the_existing_filesystem="Install from the existing filesystem"
 msg_install_over_nfs="Install over NFS"
 msg_installed="Installed"
-msg_installed_lc="installed"
 msg_installed_desc="Leave package as-is, installed"
+msg_installed_lc="installed"
 msg_invalid_gateway_ipv4_address_specified="Invalid gateway IPv4 address specified"
 msg_invalid_hostname_value="Invalid hostname value"
 msg_invalid_ipv4_address="Invalid IPv4 address"
@@ -175,7 +179,7 @@ msg_invalid_name_server_ip_address_specified="Invalid name server IP address spe
 msg_invalid_netmask_value="Invalid netmask value"
 msg_invalid_nfs_path_specification="Invalid NFS path specification.  Must be of the form:\nhost:/full/pathname/to/FreeBSD/distdir"
 msg_io_error_while_reading_in_the_package="I/O error while reading in the %s package."
-msg_io_or_format_error_on_index_file="I/O or format error on %s file.\nPlease verify media (or path to media) and try again."
+msg_io_or_format_error_on_index_file="I/O or format error on INDEX file.\nPlease verify media (or path to media) and try again."
 msg_ipv4_address="IPv4 Address"
 msg_ipv4_gateway="IPv4 Gateway"
 msg_ipv6="IPv6"
@@ -201,6 +205,7 @@ msg_lithuania="Lithuania"
 msg_loading_of_dependent_package_failed="Loading of dependent package %s failed"
 msg_located_index_now_reading_package_data_from_it="Located INDEX, now reading package data from it..."
 msg_logging_in_to_user_at_host="Logging in to %s@%s.."
+msg_looking_for_keymap_files="Looking for keymap files..."
 msg_looking_up_host="Looking up host %s"
 msg_mail_desc="Electronic mail packages and utilities."
 msg_main_menu="Main Menu"
@@ -244,6 +249,7 @@ msg_no_gateway_has_been_set="No gateway has been set. You will be unable to acce
 msg_no_network_devices="No network devices available!"
 msg_no_package_name_passed_in_package_variable="No package name passed in package variable"
 msg_no_packages_were_selected_for_extraction="No packages were selected for extraction."
+msg_no_pkg_database_found="No pkg(8) database found!"
 msg_no_such_file_or_directory="%s: %s: No such file or directory"
 msg_no_usb_devices_found="No USB devices found (try Options/Re-scan Devices)"
 msg_no_username="No username provided!"
@@ -255,10 +261,8 @@ msg_ok="OK"
 msg_options="Options"
 msg_options_editor="Options Editor"
 msg_other="other"
-msg_pkg_delete_failed="Warning: pkg_delete of %s failed.\n  Run with debugging for details."
 msg_package_is_needed_by_other_installed_packages="Warning: Package %s is needed by\n  %d other installed package%s."
 msg_package_not_installed_cannot_delete="Warning: package %s not installed\n No package can be deleted."
-msg_package_read_successfully_waiting_for_pkg_add="Package %s read successfully - waiting for pkg_add(1)"
 msg_package_temp="Package Temp"
 msg_package_was_added_successfully="Package %s was added successfully"
 msg_packages="packages"
@@ -268,7 +272,8 @@ msg_parallel_desc="Applications dealing with parallelism in computing."
 msg_pear_desc="Software related to the Pear PHP framework."
 msg_perl5_desc="Utilities/modules for the PERL5 language."
 msg_permission_denied="%s: %s: Permission denied"
-msg_pkg_add_apparently_did_not_like_the_package="pkg_add(1) apparently did not like the %s package."
+msg_pkg_delete_failed="Warning: pkg-delete(8) of %s failed.\n  Run with debugging for details."
+msg_pkg_install_apparently_did_not_like_the_package="pkg-install(8) apparently did not like the %s package."
 msg_plan9_desc="Software from the Plan9 operating system."
 msg_please_check_the_url_and_try_again="No such directory: %s\nplease check the URL and try again.\n"
 msg_please_enter_password="Please enter your password for sudo(8):"
@@ -371,9 +376,12 @@ msg_unable_to_get_proper_ftp_path="Unable to get proper FTP path.  FTP media not
 msg_unable_to_initialize_media_type_for_package_extract="Unable to initialize media type for package extract."
 msg_unable_to_make_directory_mountpoint="Unable to make %s directory mountpoint for %s!"
 msg_unable_to_open="Unable to open %s"
+msg_unable_to_pkg_rquery_package_categories="Unable to pkg-rquery(8) package categories!"
+msg_unable_to_pkg_rquery_package_dependencies="Unable to pkg-rquery(8) package dependencies!"
+msg_unable_to_update_pkg_from_selected_media="Unable to update pkg(8) from selected media."
 msg_uninstall="Uninstall"
 msg_uninstall_desc="Mark this package for deletion"
-msg_uninstalling_package_waiting_for_pkg_delete="Uninstalling %s package - waiting for pkg_delete(1)"
+msg_uninstalling_package_waiting_for_pkg_delete="Uninstalling %s package - waiting for pkg-delete(8)"
 msg_unknown="unknown"
 msg_unknown_user="Unknown user: %s"
 msg_url_was_not_found="%s was not found, maybe directory or release-version are wrong?"
diff --git a/etc/periodic/security/460.chkportsum b/usr.sbin/bsdconfig/includes/INDEX
old mode 100755
new mode 100644
similarity index 52%
rename from etc/periodic/security/460.chkportsum
rename to usr.sbin/bsdconfig/includes/INDEX
index 18a12ecbadb..6e829be2f42
--- a/etc/periodic/security/460.chkportsum
+++ b/usr.sbin/bsdconfig/includes/INDEX
@@ -1,6 +1,4 @@
-#!/bin/sh -
-#
-# Copyright (c) 2010  The FreeBSD Project
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,42 +23,34 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+
 #
+# Title that will be shown in the bsdconfig menu.
+#
+menu_title=""
 
-if [ -r /etc/defaults/periodic.conf ]
-then
-    . /etc/defaults/periodic.conf
-    source_periodic_confs
-fi
+#
+# A short descriptive line shown at the bottom of the bsdconfig menu. keep it
+# short because any line longer than the terminal width will be truncated.
+#
+menu_help=""
 
-. /etc/periodic/security/security.functions
+#
+# Two-part variable that defines an action to take when `keyword' is passed on
+# a bsdconfig command line. Variable takes the form "keyword|command" and
+# multiple occurrences of the variable (with different `keyword's, or different
+# `keyword's AND `command's) are allowed.  If `command' begins with a '/' then
+# the full path to the program is needed. If `command' begins with anything
+# else it is a path relative to the directory this INDEX file is in. `keyword'
+# can be i18n'ed but `command' is the name of a script.
+#
+menu_selection="includes|includes"
 
-security_daily_compat_var security_status_chkportsum_enable
-
-rc=0
-
-echo ""
-echo 'Checking for ports with mismatched checksums:'
-
-if check_yesno_period security_status_chkportsum_enable
-then
-	set -f
-	pkg_info -ga 2>/dev/null | \
-	while IFS= read -r line; do
-		set -- $line
-		case $1 in
-			Information)
-			case $2 in
-				for) name="${3%%:}" ;;
-				*) name='??' ;;
-			esac
-			;;
-			Mismatched|'') ;;
-			*) [ -n "${name}" ] &&
-				echo "${name}: ${line%% fails the original MD5 checksum}"
-			;;
-		esac
-	done
-fi
-
-exit $rc
+#
+# ------------ Items below this line do NOT need i18n translation ------------
+#
+# Name of the program to be run when this menu choice is selected. If it begins
+# with a '/' then the full path to the program is needed. If it begins with
+# anything else it is a path relative to the directory this INDEX file is in.
+#
+menu_program=""
diff --git a/usr.sbin/bsdconfig/includes/Makefile b/usr.sbin/bsdconfig/includes/Makefile
new file mode 100644
index 00000000000..f7cbc1e4e2f
--- /dev/null
+++ b/usr.sbin/bsdconfig/includes/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+SUBDIR= include
+
+FILESDIR=	${LIBEXECDIR}/bsdconfig/includes
+FILES=		INDEX USAGE
+
+SCRIPTSDIR=	${FILESDIR}
+SCRIPTS=	includes
+
+beforeinstall:
+	mkdir -p ${DESTDIR}${FILESDIR}
+
+.include <bsd.prog.mk>
diff --git a/usr.bin/atf/atf-version/Makefile b/usr.sbin/bsdconfig/includes/USAGE
similarity index 51%
rename from usr.bin/atf/atf-version/Makefile
rename to usr.sbin/bsdconfig/includes/USAGE
index 0320380f457..4af1b732c71 100644
--- a/usr.bin/atf/atf-version/Makefile
+++ b/usr.sbin/bsdconfig/includes/USAGE
@@ -1,5 +1,4 @@
-#-
-# Copyright (c) 2011 Google, Inc.
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,28 +24,48 @@
 #
 # $FreeBSD$
 
-.include <bsd.init.mk>
+Usage: bsdconfig @PROGRAM_NAME@ [OPTIONS] [include ...]
 
-.PATH:		${ATF}/atf-version
+OPTIONS:
+	-a    Always use color even when output is not to a terminal.
+	-d    Print description for each function selected. Implies `-f'.
+	-f    Show functions for selected includes.
+	-F pattern
+	      If `-f', only print functions matching pattern. Without `-f'
+	      print only includes containing functions matching pattern.
+	-h    Print this usage statement and exit.
+	-n    Disable the use of color.
 
-PROG_CXX=	atf-version
-SRCS=		atf-version.cpp revision.h
-MAN=		atf-version.1
+EXAMPLES:
+	View a list of available includes:
 
-CFLAGS+=	-DHAVE_CONFIG_H
-CFLAGS+=	-I${ATF}
-CFLAGS+=	-I${.CURDIR}/../../lib/libatf-c
-CFLAGS+=	-I${.CURDIR}
-CFLAGS+=	-I.
+		bsdconfig @PROGRAM_NAME@
 
-CLEANFILES+=	revision.h
-revision.h:
-	@sh ${ATF}/atf-version/generate-revision.sh \
-		-o ${.TARGET} \
-		-r ${ATF} \
-		-v `awk '$$2 == "VERSION" { print $$3 }' ${ATF}/bconfig.h`
+	View functions for all available includes (function names are
+	highlighted):
 
-DPADD+=		${LIBATF_C} ${LIBATF_CXX}
-LDADD+=		-latf-c++ -latf-c
+		bsdconfig @PROGRAM_NAME@ -f
 
-.include <bsd.prog.mk>
+	View functions with less(1) (function names are not highlighted):
+
+		bsdconfig @PROGRAM_NAME@ -f | less
+
+	View functions with less(1) and color:
+
+		bsdconfig @PROGRAM_NAME@ -af | less -R
+
+	View functions from `common.subr':
+
+		bsdconfig @PROGRAM_NAME@ common.subr
+
+	NB: The `-f' flag is implied when given an include.
+
+	Show only functions containing the word `show' in common.subr:
+
+		bsdconfig @PROGRAM_NAME@ -F show common
+
+	NB: The `.subr' suffix on the end of the include is optional.
+
+	Show descriptions of each of the `show' functions:
+
+		bsdconfig @PROGRAM_NAME@ -dF show
diff --git a/usr.sbin/bsdconfig/includes/include/Makefile b/usr.sbin/bsdconfig/includes/include/Makefile
new file mode 100644
index 00000000000..79c44817fef
--- /dev/null
+++ b/usr.sbin/bsdconfig/includes/include/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+NO_OBJ=
+
+FILESDIR=	${LIBEXECDIR}/bsdconfig/includes/include
+FILES=		messages.subr
+
+beforeinstall:
+	mkdir -p ${DESTDIR}${FILESDIR}
+
+.include <bsd.prog.mk>
diff --git a/share/xsl/Makefile.inc b/usr.sbin/bsdconfig/includes/include/messages.subr
similarity index 90%
rename from share/xsl/Makefile.inc
rename to usr.sbin/bsdconfig/includes/include/messages.subr
index c2ed4690237..8fa881b4cf1 100644
--- a/share/xsl/Makefile.inc
+++ b/usr.sbin/bsdconfig/includes/include/messages.subr
@@ -1,5 +1,4 @@
-#-
-# Copyright (c) 2012 EMC Corporation.
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,6 +24,5 @@
 #
 # $FreeBSD$
 
-BINDIR?=	${SHAREDIR}/xsl
-
-# vim: syntax=make
+msg_functions_in="Functions in %s:"
+msg_functions_in_matching="Functions in %s matching \`%s':"
diff --git a/usr.sbin/bsdconfig/includes/includes b/usr.sbin/bsdconfig/includes/includes
new file mode 100755
index 00000000000..d831649e050
--- /dev/null
+++ b/usr.sbin/bsdconfig/includes/includes
@@ -0,0 +1,203 @@
+#!/bin/sh
+#-
+# Copyright (c) 2013 Devin Teske
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this 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$
+#
+############################################################ INCLUDES
+
+# Prevent common.subr from auto initializing debugging (this is not an inter-
+# active utility that requires debugging; also `-d' has been repurposed).
+#
+DEBUG_SELF_INITIALIZE=NO
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
+
+BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="includes"
+f_include_lang $BSDCFG_LIBE/include/messages.subr
+f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
+
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
+
+############################################################ GLOBALS
+
+#
+# Options
+#
+USE_COLOR=1
+SHOW_DESC=
+SHOW_FUNCS=
+FUNC_PATTERN=
+
+############################################################ FUNCTIONS
+
+# show_functions $file
+#
+# Show the functions in the given include file.
+#
+show_include()
+{
+	local file="${1#./}"
+
+	local pattern="${FUNC_PATTERN:-.*}"
+	output=$( awk \
+		-v use_color=${USE_COLOR:-0} \
+		-v re="$pattern" \
+		-v show_desc=${SHOW_DESC:-0} '
+        function asorti(src, dest)
+        {
+		# Copy src indices to dest and calculate array length
+		nitems = 0; for (i in src) dest[++nitems] = i
+
+		# Sort the array of indices (dest) using insertion sort method
+		for (i = 1; i <= nitems; k = i++)
+		{
+			idx = dest[i]
+			while ((k > 0) && (dest[k] > idx))
+			{
+				dest[k+1] = dest[k]
+				k--
+			}
+			dest[k+1] = idx
+		}
+
+		return nitems
+        }
+	/^$/,/^#/ {
+		if ($0 ~ /^# f_/) {
+			if (!match($2, re)) next
+			fn = $2
+			if (use_color)
+				syntax[fn] = sprintf("+%s%s%s\n",
+				       substr($0, 2, RSTART),
+				       substr($0, 2 + RSTART, RLENGTH),
+				       substr($0, 2 + RSTART + RLENGTH))
+			else
+				syntax[fn] = "+" substr($0, 2) "\n"
+			if (show_desc)
+				print_more = 1
+			else
+				print_more = substr($0, length($0)) == "\\"
+		}
+		if (show_desc && print_more) {
+			getline
+			while ($0 ~ /^#/) {
+				syntax[fn] = syntax[fn] " " substr($0, 2) "\n"
+				getline
+			}
+			print_more = 0
+		} else while (print_more) {
+			getline
+			syntax[fn] = syntax[fn] " " substr($0, 2) "\n"
+			print_more = substr($0, length($0)) == "\\"
+		}
+	}
+	END {
+		n = asorti(syntax, sorted_indices)
+		for (i = 1; i <= n; i++)
+			printf "%s", syntax[sorted_indices[i]]
+	}' "$file" )
+	if [ "$output" ]; then
+		if [ ! "$SHOW_FUNCS" ]; then
+			echo "$file"
+			return $SUCCESS
+		fi
+		if [ "$FUNC_PATTERN" ]; then
+			printf ">>> $msg_functions_in_matching\n" \
+			       "$file" "$FUNC_PATTERN"
+		else
+			printf ">>> $msg_functions_in\n" "$file"
+		fi
+		echo "$output"
+		echo # blank line to simplify awk(1)-based reparse
+	fi
+}
+
+############################################################ MAIN
+
+# Incorporate rc-file if it exists
+[ -f "$HOME/.bsdconfigrc" ] && f_include "$HOME/.bsdconfigrc"
+
+# Are we in a terminal?
+[ -t 1 ] || USE_COLOR=
+
+#
+# Process command-line arguments
+#
+while getopts adfF:hn flag; do
+	case "$flag" in
+	a) USE_COLOR=1 ;;
+	d) SHOW_DESC=1 SHOW_FUNCS=1 ;;
+	f) SHOW_FUNCS=1 ;;
+	F) FUNC_PATTERN="$OPTARG" ;;
+	n) USE_COLOR= ;;
+	h|\?) f_usage $BSDCFG_LIBE/$APP_DIR/USAGE "PROGRAM_NAME" "$pgm" ;;
+	esac
+done
+shift $(( $OPTIND - 1 ))
+
+# cd(1) to `share' dir so relative paths work for find and positional args
+cd $BSDCFG_SHARE || f_die # Pedantic
+
+#
+# If given an argument, operate on it specifically (implied `-f') and exit
+#
+[ $# -gt 0 ] && SHOW_FUNCS=1
+for include in "$@"; do
+	# See if they've just omitted the `*.subr' suffix
+	[ -f "$include.subr" -a ! -f "$include" ] && include="$include.subr"
+	if [ ! -f "$include" ]; then
+		printf "$msg_no_such_file_or_directory\n" "$0" "$include"
+		exit $FAILURE
+	elif [ ! -r "$include" ]; then
+		printf "$msg_permission_denied\n" "$0" "$include"
+		exit $FAILURE
+	fi
+	show_include "$include" || f_die
+done
+
+# Exit if we processed some include arguments
+[ $# -gt 0 ] && exit $SUCCESS
+
+#
+# Operate an all known include files
+# NB: If we get this far, we had no include arguments
+#
+find -s . -type f -and -iname '*.subr' | while read file; do
+	if [ "$SHOW_FUNCS" -o "$FUNC_PATTERN" ]; then
+		show_include "$file"
+	else
+		echo "${file#./}"
+	fi
+done
+
+exit $SUCCESS
+
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdconfig/mouse/disable b/usr.sbin/bsdconfig/mouse/disable
index 6807abdcd56..f2c528f2b7b 100755
--- a/usr.sbin/bsdconfig/mouse/disable
+++ b/usr.sbin/bsdconfig/mouse/disable
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -73,12 +73,16 @@ f_mustberoot_init
 #
 # Stop the mouse daemon
 #
-[ -r "$MOUSED_PIDFILE" ] &&
-	f_quietly kill "$( cat "$MOUSED_PIDFILE" )"
-f_sysrc_set moused_enable "NO" || f_die
-f_sysrc_set moused_type "NO" || f_die
-f_sysrc_delete moused_port || f_die
-f_sysrc_delete moused_flags || f_die
+if [ -r "$MOUSED_PIDFILE" ]; then
+	f_eval_catch -dk pid "$0" cat 'cat "%s"' "$MOUSED_PIDFILE" &&
+		f_isinteger "$pid" &&
+		[ $pid -gt 0 ] &&
+		f_eval_catch -d "$0" kill 'kill %s' $pid
+fi
+f_eval_catch "$0" f_sysrc_set 'f_sysrc_set moused_enable NO' || f_die
+f_eval_catch "$0" f_sysrc_set 'f_sysrc_set moused_type NO' || f_die
+f_eval_catch "$0" f_sysrc_delete 'f_sysrc_delete moused_port' || f_die
+f_eval_catch "$0" f_sysrc_delete 'f_sysrc_delete moused_flags' || f_die
 
 #
 # Message box
diff --git a/usr.sbin/bsdconfig/mouse/enable b/usr.sbin/bsdconfig/mouse/enable
index 695eac08d9c..9ad6857e139 100755
--- a/usr.sbin/bsdconfig/mouse/enable
+++ b/usr.sbin/bsdconfig/mouse/enable
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -85,10 +85,15 @@ flags=$( f_sysrc_get moused_flags )
 # Start the mouse daemon
 #
 f_dialog_info "$msg_trying_to_start_the_mouse_daemon"
-[ -r "$MOUSED_PIDFILE" ] &&
-	f_quietly kill "$( cat "$MOUSED_PIDFILE" 2> /dev/null )"
-f_quietly vidcontrol -m on
-f_quietly moused -t "$type" -p "$port" $flags
+if [ -r "$MOUSED_PIDFILE" ]; then
+	f_eval_catch -dk pid "$0" cat 'cat "%s"' "$MOUSED_PIDFILE" &&
+		f_isinteger "$pid" &&
+		[ $pid -gt 0 ] &&
+		f_eval_catch -d "$0" kill 'kill %s' $pid
+fi
+f_eval_catch -d "$0" vidcontrol 'vidcontrol -m on'
+f_eval_catch -d "$0" moused \
+	'moused -t "%s" -p "%s" %s' "$type" "$port" "$flags"
 
 #
 # Confirm with the user that the mouse is working
@@ -101,14 +106,19 @@ f_dialog_title_restore
 #
 # Stop the mouse daemon
 #
-f_quietly vidcontrol -m off
-if [ $retval -eq $SUCCESS ]; then
-	f_sysrc_set moused_enable "YES" || f_die
-	ln -fs /dev/sysmouse /dev/mouse || f_die # backwards compat
+f_eval_catch -d "$0" vidcontrol 'vidcontrol -m off'
+if [ $retval -eq $DIALOG_OK ]; then
+	f_eval_catch "$0" f_sysrc_set 'f_sysrc_set moused_enable YES' || f_die
+	f_eval_catch "$0" ln \
+		'ln -fs /dev/sysmouse /dev/mouse' || f_die # backwards compat
 else
-	[ -r "$MOUSED_PIDFILE" ] &&
-		f_quietly kill "$( cat "$MOUSED_PIDFILE" )"
-	f_sysrc_set moused_enable "NO" || f_die
+	if [ -r "$MOUSED_PIDFILE" ]; then
+		f_eval_catch -dk pid "$0" cat 'cat "%s"' "$MOUSED_PIDFILE" &&
+			f_isinteger "$pid" &&
+			[ $pid -gt 0 ] &&
+			f_eval_catch -d "$0" kill 'kill %s' $pid
+	fi
+	f_eval_catch "$0" f_sysrc_set 'f_sysrc_set moused_enable NO' || f_die
 fi
 
 exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/mouse/flags b/usr.sbin/bsdconfig/mouse/flags
index de2ca763385..181ee3f41c5 100755
--- a/usr.sbin/bsdconfig/mouse/flags
+++ b/usr.sbin/bsdconfig/mouse/flags
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -86,7 +86,7 @@ f_dialog_title_restore
 #
 # Save the new value
 #
-f_sysrc_set moused_flags "$flags" || f_die
+f_eval_catch "$0" f_sysrc_set 'f_sysrc_set moused_flags "%s"' "$flags" || f_die
 
 exit $SUCCESS
 
diff --git a/usr.sbin/bsdconfig/mouse/include/messages.subr b/usr.sbin/bsdconfig/mouse/include/messages.subr
index 74d998081a1..82cbad3088e 100644
--- a/usr.sbin/bsdconfig/mouse/include/messages.subr
+++ b/usr.sbin/bsdconfig/mouse/include/messages.subr
@@ -58,14 +58,14 @@ msg_microsoft="Microsoft"
 msg_microsoft_desc="Microsoft protocol (serial)"
 msg_mm_series="MM Series"
 msg_mm_series_desc="MM Series protocol (serial)"
-msg_mouseman="MouseMan"
-msg_mouseman_desc="Logitech MouseMan/TrackMan models (serial)"
-msg_mousesystems="MouseSystems"
-msg_mousesystems_desc="MouseSystems protocol (serial)"
 msg_mouse_daemon_is_disabled="The mouse daemon is disabled."
 msg_mouse_disable="Mouse Disable"
 msg_mouse_enable="Mouse Enable"
 msg_mouse_flags="Mouse Flags"
+msg_mouseman="MouseMan"
+msg_mouseman_desc="Logitech MouseMan/TrackMan models (serial)"
+msg_mousesystems="MouseSystems"
+msg_mousesystems_desc="MouseSystems protocol (serial)"
 msg_now_move_the_mouse="Now move the mouse and see if it works.\n(Note that buttons don't have any effect for now.)\n\n         Is the mouse cursor moving?\n"
 msg_ok="OK"
 msg_please_configure_your_mouse="Please configure your mouse"
diff --git a/usr.sbin/bsdconfig/mouse/mouse b/usr.sbin/bsdconfig/mouse/mouse
index bafed0415cb..0dce574feea 100755
--- a/usr.sbin/bsdconfig/mouse/mouse
+++ b/usr.sbin/bsdconfig/mouse/mouse
@@ -37,8 +37,8 @@ f_include $BSDCFG_SHARE/mustberoot.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
diff --git a/usr.sbin/bsdconfig/mouse/port b/usr.sbin/bsdconfig/mouse/port
index 41dd481b69b..1040795628e 100755
--- a/usr.sbin/bsdconfig/mouse/port
+++ b/usr.sbin/bsdconfig/mouse/port
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -141,7 +141,8 @@ case "$mtag" in
 esac
 
 if [ "$moused_port_to_set" ]; then
-	f_sysrc_set moused_port "$moused_port_to_set" || f_die
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set moused_port "%s"' "$moused_port_to_set" || f_die
 else
 	f_die 1 "$msg_unknown_mouse_port_selection"
 fi
diff --git a/usr.sbin/bsdconfig/mouse/type b/usr.sbin/bsdconfig/mouse/type
index 30d20229268..7d99753a62b 100755
--- a/usr.sbin/bsdconfig/mouse/type
+++ b/usr.sbin/bsdconfig/mouse/type
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="110.mouse"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -157,7 +157,8 @@ case "$mtag" in
 esac
 
 if [ "$moused_type_to_set" ]; then
-	f_sysrc_set moused_type "$moused_type_to_set" || f_die
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set moused_type "%s"' "$moused_type_to_set" || f_die
 else
 	f_die 1 "$msg_unknown_mouse_protocol_selection"
 fi
diff --git a/usr.sbin/bsdconfig/networking/defaultrouter b/usr.sbin/bsdconfig/networking/defaultrouter
index 4719e45fc3d..b65981f604f 100755
--- a/usr.sbin/bsdconfig/networking/defaultrouter
+++ b/usr.sbin/bsdconfig/networking/defaultrouter
@@ -28,6 +28,9 @@
 #
 ############################################################ INCLUDES
 
+# Prevent device.subr (included indirectly) from auto scanning on load
+DEVICE_SELF_SCAN_ALL=NO
+
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 f_dprintf "%s: loading includes..." "$0"
@@ -38,8 +41,8 @@ f_include $BSDCFG_SHARE/networking/routing.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
diff --git a/usr.sbin/bsdconfig/networking/devices b/usr.sbin/bsdconfig/networking/devices
index 00a50c51535..433f25c75fa 100755
--- a/usr.sbin/bsdconfig/networking/devices
+++ b/usr.sbin/bsdconfig/networking/devices
@@ -28,6 +28,12 @@
 #
 ############################################################ INCLUDES
 
+# Prevent device.subr (included indirectly) from auto scanning; this will be
+# performed indirectly later via f_dialog_menu_netdev() -- but only after we've
+# successfully completed f_mustberoot_init().
+#
+DEVICE_SELF_SCAN_ALL=NO
+
 BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 f_dprintf "%s: loading includes..." "$0"
@@ -43,8 +49,8 @@ f_include $BSDCFG_SHARE/networking/netmask.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
@@ -137,8 +143,8 @@ while :; do
 	# Fill in IP address/netmask from active settings if no
 	# configuration could be extrapolated from rc.conf(5)
 	#
-	[ "$_ipaddr"  ] || _ipaddr=$( f_ifconfig_inet $interface )
-	[ "$_netmask" ] || _netmask=$( f_ifconfig_netmask $interface )
+	[ "$_ipaddr"  ] || f_ifconfig_inet $interface _ipaddr
+	[ "$_netmask" ] || f_ifconfig_netmask $interface _netmask
 
 	# Get the extra options (this always comes from rc.conf(5))
 	_options=$( f_ifconfig_options $interface )
@@ -148,7 +154,7 @@ while :; do
 		"$interface" "$_ipaddr" "$_netmask" "$_options" $dhcp
 
 	# Return to root menu if above returns success
-	[ $? -eq $SUCCESS ] && break
+	[ $? -eq $DIALOG_OK ] && break
 done
 
 exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/networking/hostname b/usr.sbin/bsdconfig/networking/hostname
index 23cf804db57..d0fff0120ee 100755
--- a/usr.sbin/bsdconfig/networking/hostname
+++ b/usr.sbin/bsdconfig/networking/hostname
@@ -41,8 +41,8 @@ f_include $BSDCFG_SHARE/networking/hostname.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
diff --git a/usr.sbin/bsdconfig/networking/include/messages.subr b/usr.sbin/bsdconfig/networking/include/messages.subr
index ad5461ca627..bb94c36cd6d 100644
--- a/usr.sbin/bsdconfig/networking/include/messages.subr
+++ b/usr.sbin/bsdconfig/networking/include/messages.subr
@@ -59,15 +59,15 @@ msg_ipv4_addr_octet_contains_invalid_chars="ERROR! One or more individual octets
 msg_ipv4_addr_octet_exceeds_max_value="ERROR! One or more individual octets within the IPv4 address\n(separated by dots) exceeds the maximum of 255.\n\nInvalid IP Address: %s"
 msg_ipv4_addr_octet_is_null="ERROR! One or more individual octets within the IPv4 address\n(separated by dots) are null and/or missing.\n\nInvalid IP Address: %s"
 msg_ipv4_addr_octet_missing_or_extra="ERROR! The IPv4 address entered has either too few (less than\nfour) or too many (more than four) octets, separated by dots.\n\nInvalid IP Address: %s"
-msg_ipv6_addr_segment_contains_invalid_chars="ERROR! One or more individual segments within the IP address\n(separated by colons) contains one or more invalid characters.\nSegments must contain only combinations of the characters 0-9,\nA-F, or a-f.\n\nInvalid IPv6 Address: %s"
-msg_ipv6_addr_segment_contains_too_many_chars="ERROR! One or more individual segments within the IP address\n(separated by colons) exceeds the length of 4 hex-digits.\n\nInvalid IPv6 Address: %s"
-msg_ipv6_addr_too_few_or_extra_segments="ERROR! The IP address entered has either too few (less than 3), too\nmany (more than 8), or not enough segments, separated by colons.\n\nInvalid IPv6 Address: %s"
-msg_ipv6_addr_too_many_null_segments="ERROR! Too many/incorrect null segments. A single null\nsegment is allowed within the IP address (separated by\ncolons) but not allowed at the beginning or end (unless\na double-null segment; i.e., \"::*\" or \"*::\").\n\nInvalid IPv6 Address: %s"
 msg_ipv4_mask_field_contains_invalid_chars="ERROR! One or more individual fields within the subnet mask\n(separated by dots) contains one or more invalid characters.\n\nInvalid Subnet Mask: %s"
 msg_ipv4_mask_field_exceeds_max_value="ERROR! One or more individual fields within the subnet mask\n(separated by dots) exceeds the maximum of 255.\n\nInvalid Subnet Mask: %s"
 msg_ipv4_mask_field_invalid_value="ERROR! One or more individual fields within the subnet mask\n(separated by dots) contains one or more invalid integers.\nFields must be one of 0/128/192/224/240/248/252/254/255.\n\nInvalid Subnet Mask: %s"
 msg_ipv4_mask_field_is_null="ERROR! One or more individual fields within the subnet mask\n(separated by dots) are null and/or missing.\n\nInvalid Subnet Mask: %s"
 msg_ipv4_mask_field_missing_or_extra="ERROR! The subnet mask entered has either too few or too many\nfields.\n\nInvalid Subnet Mask: %s"
+msg_ipv6_addr_segment_contains_invalid_chars="ERROR! One or more individual segments within the IP address\n(separated by colons) contains one or more invalid characters.\nSegments must contain only combinations of the characters 0-9,\nA-F, or a-f.\n\nInvalid IPv6 Address: %s"
+msg_ipv6_addr_segment_contains_too_many_chars="ERROR! One or more individual segments within the IP address\n(separated by colons) exceeds the length of 4 hex-digits.\n\nInvalid IPv6 Address: %s"
+msg_ipv6_addr_too_few_or_extra_segments="ERROR! The IP address entered has either too few (less than 3), too\nmany (more than 8), or not enough segments, separated by colons.\n\nInvalid IPv6 Address: %s"
+msg_ipv6_addr_too_many_null_segments="ERROR! Too many/incorrect null segments. A single null\nsegment is allowed within the IP address (separated by\ncolons) but not allowed at the beginning or end (unless\na double-null segment; i.e., \"::*\" or \"*::\").\n\nInvalid IPv6 Address: %s"
 msg_netmask="netmask"
 msg_network_configuration="%s Network Configuration:\nChoose Save/Exit when finished or Cancel."
 msg_network_interfaces="Network Interfaces"
diff --git a/usr.sbin/bsdconfig/networking/nameservers b/usr.sbin/bsdconfig/networking/nameservers
index 108c56781fb..e18f00493ef 100755
--- a/usr.sbin/bsdconfig/networking/nameservers
+++ b/usr.sbin/bsdconfig/networking/nameservers
@@ -41,8 +41,8 @@ f_include $BSDCFG_SHARE/networking/resolv.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
diff --git a/usr.sbin/bsdconfig/networking/networking b/usr.sbin/bsdconfig/networking/networking
index b320e5d7791..c61ce8f109d 100755
--- a/usr.sbin/bsdconfig/networking/networking
+++ b/usr.sbin/bsdconfig/networking/networking
@@ -37,8 +37,8 @@ f_include $BSDCFG_SHARE/mustberoot.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
diff --git a/usr.sbin/bsdconfig/networking/share/device.subr b/usr.sbin/bsdconfig/networking/share/device.subr
index a0ca5cc313f..2d72045fb67 100644
--- a/usr.sbin/bsdconfig/networking/share/device.subr
+++ b/usr.sbin/bsdconfig/networking/share/device.subr
@@ -40,6 +40,7 @@ f_include $BSDCFG_SHARE/networking/media.subr
 f_include $BSDCFG_SHARE/networking/netmask.subr
 f_include $BSDCFG_SHARE/networking/resolv.subr
 f_include $BSDCFG_SHARE/networking/routing.subr
+f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
@@ -62,7 +63,8 @@ f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 #
 f_dialog_menu_netdev()
 {
-	local defaultitem="${1%\*}" # Tim trailing asterisk if present
+	local menu_list # Calculated below
+	local defaultitem="${1%\*}" # Trim trailing asterisk if present
 
 	#
 	# Display a message to let the user know we're working...
@@ -73,20 +75,17 @@ f_dialog_menu_netdev()
 	#
 	# Get list of usable network interfaces
 	#
-	local d='[[:digit:]]+:'
-	local iflist="`echo "$(ifconfig -l):" | sed -E -e "
-		# Convert all spaces to colons
-		y/ /:/
-
-		# Prune unsavory interfaces
-		s/lo$d//g
-		s/ppp$d//g
-		s/sl$d//g
-		s/faith$d//g
-
-		# Convert all colons back into spaces
-		y/:/ /
-	"`"
+	local devs if iflist= # Calculated below
+	f_device_rescan_network
+	f_device_find "" $DEVICE_TYPE_NETWORK devs
+	for if in $devs; do
+		# Skip unsavory interfaces
+		case "$if" in
+		lo[0-9]*|ppp[0-9]*|sl[0-9]*|faith[0-9]*) continue ;;
+		esac
+		iflist="$iflist $if"
+	done
+	iflist="${iflist# }"
 
 	#
 	# Optionally kick interfaces in the head to get them to accurately
@@ -95,9 +94,8 @@ f_dialog_menu_netdev()
 	if [ "$DIALOG_MENU_NETDEV_KICK_INTERFACES" ]; then
 		DIALOG_MENU_NETDEV_KICK_INTERFACES=
 
-		local ifn
-		for ifn in $iflist; do
-			f_quietly ifconfig $ifn up
+		for if in $iflist; do
+			f_quietly ifconfig $if up
 		done
 
 		if [ "$DIALOG_MENU_NETDEV_SLEEP_AFTER_KICK" ]; then
@@ -110,46 +108,37 @@ f_dialog_menu_netdev()
 	# Mark any "active" interfaces with an asterisk (*)
 	# to the right of the device name.
 	#
-	interfaces=$(
-		for ifn in $iflist; do
-			active=$( ifconfig $ifn | awk \
-			'
-				( $1 == "status:" ) \
-				{
-					if ( $2 == "active" ) { print 1; exit }
-				}
-			' )
-			printf "'%s%s' '%s'\n" \
-				$ifn "${active:+*}" "$( f_device_desc $ifn )"
+	menu_list=$(
+		for if in $iflist; do
+			f_device_desc $if $DEVICE_TYPE_NETWORK desc
+			f_shell_escape "$desc" desc
+			if f_device_is_active $if; then
+				printf "'%s\*' '%s'\n" $if "$desc"
+			else
+				printf "'%s' '%s'\n" $if "$desc"
+			fi
 		done
 	)
-	if [ ! "$interfaces" ]; then
+	if [ ! "$menu_list" ]; then
 		f_show_msg "$msg_no_network_interfaces"
-		return $FAILURE
+		return $DIALOG_CANCEL
 	fi
 
-	#
 	# Maybe the default item was marked as active
-	#
-	if [ "$defaultitem" ]; then
-		ifconfig "$defaultitem" 2> /dev/null | awk \
-			'( $1 == "status:" && $2 != "active" ) { exit 0 }' ||
-			defaultitem="$defaultitem*"
-	fi
-
-	local hline="$hline_arrows_tab_enter"
+	f_device_is_active "$defaultitem" && defaultitem="$defaultitem*"
 
 	#
 	# Ask user to select an interface
 	#
 	local prompt="$msg_select_network_interface"
+	local hline="$hline_arrows_tab_enter"
 	local height width rows
 	eval f_dialog_menu_size height width rows \
 	                        \"\$DIALOG_TITLE\"     \
 	                        \"\$DIALOG_BACKTITLE\" \
 	                        \"\$prompt\"           \
 	                        \"\$hline\"            \
-	                        $interfaces
+	                        $menu_list
 	local menu_choice
 	menu_choice=$( eval $DIALOG \
 		--title \"\$DIALOG_TITLE\"         \
@@ -160,7 +149,7 @@ f_dialog_menu_netdev()
 		--default-item \"\$defaultitem\"   \
 		--menu \"\$prompt\"                \
 		$height $width $rows               \
-		$interfaces                        \
+		$menu_list                         \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
 	)
 	local retval=$?
@@ -175,6 +164,7 @@ f_dialog_menu_netdev()
 #
 f_dialog_menu_netdev_edit()
 {
+	local funcname=f_dialog_menu_netdev_edit
 	local interface="$1" ipaddr="$2" netmask="$3" options="$4" dhcp="$5"
 	local prompt menu_list height width rows
 
@@ -187,7 +177,7 @@ f_dialog_menu_netdev_edit()
 	      dhcp_orig="$5"
 
 	local hline="$hline_arrows_tab_enter"
-	prompt=$( printf "$msg_network_configuration" "$interface" )
+	f_sprintf prompt "$msg_network_configuration" "$interface"
 
 	#
 	# Loop forever until the user has finished configuring the different
@@ -242,12 +232,10 @@ f_dialog_menu_netdev_edit()
 		local retval=$?
 		f_dialog_data_sanitize tag
 
-		if [ $retval -eq 2 ]; then
-			# The Help button was pressed
+		if [ $retval -eq $DIALOG_HELP ]; then
 			f_show_help "$TCP_HELPFILE"
 			continue
-		elif [ $retval -ne $SUCCESS ]; then
-			# "Cancel" was chosen (-1) or ESC was pressed (255)
+		elif [ $retval -ne $DIALOG_OK ]; then
 			return $retval
 		else
 			# Only update default-item on success
@@ -268,8 +256,9 @@ f_dialog_menu_netdev_edit()
 		      # are made is changed parts of the system may hang.
 		      #
 		      if f_nfs_mounted && ! f_jailed; then
-		      	local setting="$( printf "$msg_current_dhcp_status" \
-		      	                         "$interface" "$dhcp_status" )"
+			local setting
+			f_sprintf setting "$msg_current_dhcp_status" \
+		      	                  "$interface" "$dhcp_status"
 			f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
 		      		continue
 		      fi
@@ -283,25 +272,26 @@ f_dialog_menu_netdev_edit()
 		      	trap - SIGINT
 		      	( # Execute within sub-shell to allow/catch Ctrl-C
 		      	  trap 'exit $FAILURE' SIGINT
-		      	  msg=$( printf "$msg_scanning_for_dhcp" "$interface" )
+			  f_sprintf msg "$msg_scanning_for_dhcp" "$interface"
 		      	  if [ "$USE_XDIALOG" ]; then
 		      	  	(
-		      	  	  f_quietly ifconfig $interface delete
-		      	  	  f_quietly dhclient $interface
+		      	  	  f_quietly ifconfig "$interface" delete
+		      	  	  f_quietly dhclient "$interface"
 		      	  	) |
 		      	  	  f_xdialog_info "$msg"
 		      	  else
 		      	  	f_dialog_info "$msg"
-		      	  	f_quietly ifconfig $interface delete
-		      	  	f_quietly dhclient $interface
+		      	  	f_quietly ifconfig "$interface" delete
+		      	  	f_quietly dhclient "$interface"
 		      	  fi
 		      	)
 		      	retval=$?
 		      	trap 'interrupt' SIGINT
-		      	if [ $retval -eq $SUCCESS ]; then
+		      	if [ $retval -eq $DIALOG_OK ]; then
 		      		dhcp=1
-		      		ipaddr=$( f_ifconfig_inet $interface )
-		      		netmask=$( f_ifconfig_netmask $interface )
+		      		f_ifconfig_inet "$interface" ipaddr
+				f_ifconfig_inet6 "$interface" ipaddr6
+		      		f_ifconfig_netmask "$interface" netmask
 		      		options=
 
 		      		# Fixup search/domain in resolv.conf(5)
@@ -312,11 +302,11 @@ f_dialog_menu_netdev_edit()
 		      fi
 		      ;;
 		3\ *) f_dialog_input_ipaddr "$interface" "$ipaddr"
-		      [ $? -eq $SUCCESS ] && dhcp= ;;
+		      [ $? -eq $DIALOG_OK ] && dhcp= ;;
 		4\ *) f_dialog_input_netmask "$interface" "$netmask"
-		      [ $? -eq $SUCCESS -a "$_netmask" ] && dhcp= ;;
+		      [ $? -eq $DIALOG_OK -a "$_netmask" ] && dhcp= ;;
 		5\ *) f_dialog_menu_media_options "$interface" "$options"
-		      [ $? -eq $SUCCESS ] && dhcp= ;;
+		      [ $? -eq $DIALOG_OK ] && dhcp= ;;
 		esac
 	done
 
@@ -332,14 +322,16 @@ f_dialog_menu_netdev_edit()
 
 		local value=
 		if [ "$dhcp" ]; then
-			f_sysrc_delete defaultrouter
+			f_eval_catch $funcname f_sysrc_delete \
+				'f_sysrc_delete defaultrouter'
 			value=DHCP
 		else
 			value="inet $ipaddr netmask $netmask"
 			value="$value${options:+ }$options"
 		fi
 
-		f_sysrc_set ifconfig_$interface "$value"
+		f_eval_catch $funcname f_sysrc_set \
+			'f_sysrc_set "ifconfig_%s" "%s"' "$interface" "$value"
 	fi
 
 	#
@@ -350,10 +342,12 @@ f_dialog_menu_netdev_edit()
 		then
 			f_show_info "$msg_bring_interface_up" "$interface"
 
-			local dr="$( f_sysrc_get defaultrouter )" err
+			local dr="$( f_sysrc_get defaultrouter )"
 			if [ "$dr" = "NO" -o ! "$dr" ]; then
-				dr=$( f_route_get_default )
-				[ "$dr" ] && f_sysrc_set defaultrouter "$dr"
+				f_route_get_default dr
+				[ "$dr" ] && f_eval_catch \
+					$funcname f_sysrc_set \
+					'f_sysrc_set defaultrouter "%s"' "$dr"
 			fi
 			#
 			# Make a backup of resolv.conf(5) before using
@@ -364,16 +358,13 @@ f_dialog_menu_netdev_edit()
 			# resolv.conf(5) by-default upon termination).
 			#
 			f_quietly cp -fp "$RESOLV_CONF" "$RESOLV_CONF.$$"
-			err=$( ifconfig $interface inet $ipaddr \
-			       	netmask $netmask $options 2>&1 )
-			if [ $? -eq $SUCCESS ]; then
-				if [ "$dr" -a "$dr" != "NO" ]; then
-					err=$( route add default "$dr" 2>&1 )
-					[ $? -eq $SUCCESS ] || \
-						dialog_msgbox "$err"
-				fi
-			else
-				dialog_msgbox "$err"
+			if f_eval_catch $funcname ifconfig \
+				'ifconfig "%s" inet "%s" netmask "%s" %s' \
+				"$interface" "$ipaddr" "$netmask" "$options"
+			then
+				[ "$dr" -a "$dr" != "NO" ] &&
+					f_eval_catch $funcname route \
+						'route add default "%s"' "$dr"
 			fi
 			if cmp -s "$RESOLV_CONF" "$RESOLV_CONF.$$"; then
 				f_quietly rm -f "$RESOLV_CONF.$$"
@@ -383,7 +374,7 @@ f_dialog_menu_netdev_edit()
 		fi
 	fi
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/networking/share/hostname.subr b/usr.sbin/bsdconfig/networking/share/hostname.subr
index 05f03154c67..1c3a67b7139 100644
--- a/usr.sbin/bsdconfig/networking/share/hostname.subr
+++ b/usr.sbin/bsdconfig/networking/share/hostname.subr
@@ -95,6 +95,7 @@ f_dialog_validate_hostname()
 #
 f_dialog_input_hostname()
 {
+	local funcname=f_dialog_input_hostname
 	local hostname="$( f_sysrc_get 'hostname:-$(hostname)' )"
 	local hostname_orig="$hostname" # for change-tracking
 
@@ -110,7 +111,7 @@ f_dialog_input_hostname()
 	#
 	while :; do
 		f_dialog_input hostname "$msg" "$hostname" \
-		               "$hline_alnum_punc_tab_enter" || return
+		               "$hline_alnum_punc_tab_enter" || return $?
 		# Taint-check the user's input
 		f_dialog_validate_hostname "$hostname" && break
 	done
@@ -120,7 +121,8 @@ f_dialog_input_hostname()
 	#
 	if [ "$hostname" != "$hostname_orig" ]; then
 		f_dialog_info "$msg_saving_hostname"
-		f_sysrc_set hostname "$hostname"
+		f_eval_catch $funcname f_sysrc_set \
+			'f_sysrc_set hostname "%s"' "$hostname"
 	fi
 
 	#
@@ -150,7 +152,7 @@ f_dialog_input_hostname()
 		fi
 	fi
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/networking/share/ipaddr.subr b/usr.sbin/bsdconfig/networking/share/ipaddr.subr
index 9c51f592a90..b7624cc792d 100644
--- a/usr.sbin/bsdconfig/networking/share/ipaddr.subr
+++ b/usr.sbin/bsdconfig/networking/share/ipaddr.subr
@@ -144,13 +144,14 @@ f_dialog_input_ipaddr()
 	# system may hang (if any NFS mounts are using that interface).
 	#
 	if f_nfs_mounted && ! f_jailed; then
-		local setting="$( printf "$msg_current_ipaddr" \
-		                         "$interface" "$_ipaddr" )"
+		local setting
+		f_sprintf setting "$msg_current_ipaddr" "$interface" "$_ipaddr"
 		f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
-			return $FAILURE
+			return $DIALOG_CANCEL
 	fi
 
-	local msg="$( printf "$msg_please_enter_new_ip_addr" "$interface" )"
+	local msg
+	f_sprintf msg "$msg_please_enter_new_ip_addr" "$interface"
 
 	#
 	# Loop until the user provides taint-free input.
@@ -163,11 +164,11 @@ f_dialog_input_ipaddr()
 		# - User has not made any changes to the given value
 		#
 		f_dialog_input _input "$msg" "$_ipaddr" \
-		               "$hline_num_punc_tab_enter" || return
-		[ "$_ipaddr" = "$_input" ] && return $FAILURE
+		               "$hline_num_punc_tab_enter" || return $?
+		[ "$_ipaddr" = "$_input" ] && return $DIALOG_CANCEL
 
 		# Return success if NULL value was entered
-		[ "$_input" ] || return $SUCCESS
+		[ "$_input" ] || return $DIALOG_OK
 
 		# Take only the first "word" of the user's input
 		_ipaddr="$_input"
@@ -208,7 +209,7 @@ f_dialog_input_ipaddr()
 	ipaddr="$_ipaddr"
 	[ "$_netmask" ] && netmask="$_netmask"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/networking/share/media.subr b/usr.sbin/bsdconfig/networking/share/media.subr
index c6efa57a945..1cb77f80294 100644
--- a/usr.sbin/bsdconfig/networking/share/media.subr
+++ b/usr.sbin/bsdconfig/networking/share/media.subr
@@ -115,13 +115,15 @@ f_dialog_input_options()
 	# the system may hang (if any NFS mounts are using that interface).
 	#
 	if f_nfs_mounted && ! f_jailed; then
-		local setting="$( printf "$msg_current_options" \
-		                         "$interface" "$options" )"
+		local setting
+		f_sprintf setting "$msg_current_options" \
+		                  "$interface" "$options"
 		f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
-			return $FAILURE
+			return $DIALOG_CANCEL
 	fi
 
-	local msg="$( printf "$msg_please_enter_mediaopts" "$interface" )"
+	local msg
+	f_sprintf msg "$msg_please_enter_mediaopts" "$interface"
 	local hline="$hline_alnum_punc_tab_enter"
 
 	local _options
@@ -138,7 +140,7 @@ f_dialog_input_options()
 	local retval=$?
 	f_dialog_line_sanitize _options
 
-	[ $retval -eq $SUCCESS ] && options="$_options"
+	[ $retval -eq $DIALOG_OK ] && options="$_options"
 
 	return $retval
 }
@@ -162,10 +164,11 @@ f_dialog_menu_media_options()
 	# the system may hang (if any NFS mounts are using that interface).
 	#
 	if f_nfs_mounted && ! f_jailed; then
-		local setting="$( printf "$msg_current_options" \
-		                         "$interface" "$_options" )"
+		local setting
+		f_sprintf setting "$msg_current_options" \
+		                  "$interface" "$_options"
 		f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
-			return $FAILURE
+			return $DIALOG_CANCEL
 	fi
 
 	#
@@ -196,11 +199,11 @@ f_dialog_menu_media_options()
 
 	local msg
 	if [ "$USE_XDIALOG" ]; then
-		msg=$( printf "$xmsg_supported_media_options" \
-		       		"$interface" "$interface" )
+		f_sprintf msg "$xmsg_supported_media_options" \
+		              "$interface" "$interface"
 	else
-		msg=$( printf "$msg_supported_media_options" \
-		       		"$interface" "$interface" )
+		f_sprintf msg "$msg_supported_media_options" \
+		              "$interface" "$interface"
 	fi
 
 	local hline="$hline_arrows_tab_enter"
@@ -219,7 +222,7 @@ f_dialog_menu_media_options()
 	local retval=$?
 	f_dialog_data_sanitize tag
 
-	if [ $retval -eq $SUCCESS ]; then
+	if [ $retval -eq $DIALOG_OK ]; then
 		options=$( eval f_dialog_menutag2item \"\$tag\" \
 		                                      $supported_media )
 		case "$options" in
diff --git a/usr.sbin/bsdconfig/networking/share/netmask.subr b/usr.sbin/bsdconfig/networking/share/netmask.subr
index 845bf7e0c26..a7d44a55e00 100644
--- a/usr.sbin/bsdconfig/networking/share/netmask.subr
+++ b/usr.sbin/bsdconfig/networking/share/netmask.subr
@@ -94,16 +94,18 @@ f_dialog_input_netmask()
 	# the system may hang (if any NFS mounts are using that interface).
 	#
 	if f_nfs_mounted && ! f_jailed; then
-		local setting="$( printf "$msg_current_subnet" \
-		                         "$interface" "$_netmask" )"
+		local setting
+		f_sprintf setting "$msg_current_subnet" \
+		                  "$interface" "$_netmask"
 		f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
-			return $FAILURE
+			return $DIALOG_CANCEL
 	fi
 
 	#
 	# Loop until the user provides taint-free input.
 	#
-	local msg="$( printf "$msg_please_enter_subnet_mask" "$interface" )"
+	local msg
+	f_sprintf msg "$msg_please_enter_subnet_mask" "$interface"
 	while :; do
 		#
 		# Return error status if:
@@ -111,11 +113,11 @@ f_dialog_input_netmask()
 		# - User has not made any changes to the given value
 		#
 		f_dialog_input _input "$msg" "$_netmask" \
-		               "$hline_num_punc_tab_enter" || return
-		[ "$_netmask" = "$_input" ] && return $FAILURE
+		               "$hline_num_punc_tab_enter" || return $?
+		[ "$_netmask" = "$_input" ] && return $DIALOG_CANCEL
 
 		# Return success if NULL value was entered
-		[ "$_input" ] || return $SUCCESS
+		[ "$_input" ] || return $DIALOG_OK
 
 		# Take only the first "word" of the user's input
 		_netmask="$_input"
diff --git a/usr.sbin/bsdconfig/networking/share/resolv.subr b/usr.sbin/bsdconfig/networking/share/resolv.subr
index ac281fc9ba5..fc42e1265c9 100644
--- a/usr.sbin/bsdconfig/networking/share/resolv.subr
+++ b/usr.sbin/bsdconfig/networking/share/resolv.subr
@@ -162,20 +162,23 @@ END {
 '
 f_dialog_resolv_conf_update()
 {
+	local funcname=f_dialog_resolv_conf_update
 	local hostname="$1"
 
 	#
 	# Extrapolate the desired domain search parameter for resolv.conf(5)
 	#
-	local search ndots domain="${hostname#*.}"
+	local search nfields ndots domain="${hostname#*.}"
 	if [ "$RESOLVER_SEARCH_DOMAINS_ALL" = "1" ]; then
-		search=""
-		ndots=$( IFS=.; set -- $domain; echo $(( $# - 1 )) )
+		search=
+		IFS=. f_count_ifs nfields "$domain"
+		ndots=$(( $nfields - 1 ))
 		while [ $ndots -ge ${RESOLVER_SEARCH_NDOTS:-1} ]; do
-			search="$search${search:+ }$domain"
+			search="$search $domain"
 			domain="${domain#*.}"
 			ndots=$(( $ndots - 1 ))
 		done
+		search="${search# }"
 		domain="${hostname#*.}"
 	else
 		search="$domain"
@@ -194,8 +197,9 @@ f_dialog_resolv_conf_update()
 		# Create a new temporary file to write our resolv.conf(5)
 		# update with our new `domain' and `search' directives.
 		#
-		local tmpfile="$( mktemp -t "$pgm" )"
-		[ "$tmpfile" ] || return $FAILURE
+		local tmpfile
+		f_eval_catch -dk tmpfile $funcname mktemp \
+			'mktemp -t "%s"' "$tmpfile" || return $DIALOG_CANCEL
 
 		#
 		# Fixup permissions and ownership (mktemp(1) creates the
@@ -203,10 +207,16 @@ f_dialog_resolv_conf_update()
 		# permissions and ownership to match resolv.conf(5) before
 		# we write it out and mv(1) it into place).
 		#
-		local mode="$( stat -f '%#Lp' "$RESOLV_CONF" 2> /dev/null )"
-		local owner="$( stat -f '%u:%g' "$RESOLV_CONF" 2> /dev/null )"
-		f_quietly chmod "${mode:-0644}" "$tmpfile"
-		f_quietly chown "${owner:-root:wheel}" "$tmpfile"
+		local mode owner
+		f_eval_catch -dk mode $funcname stat \
+			'stat -f "%%#Lp" "%s"' "$RESOLV_CONF" || mode=0644
+		f_eval_catch -dk owner $funcname stat \
+			'stat -f "%%u:%%g" "%s"' "$RESOLV_CONF" ||
+			owner="root:wheel"
+		f_eval_catch -d $funcname chmod \
+			'chmod "%s" "%s"' "$mode" "$tmpfile"
+		f_eval_catch -d $funcname chown \
+			'chown "%s" "%s"' "$owner" "$tmpfile"
 
 		#
 		# Operate on resolv.conf(5), replacing only the last
@@ -235,8 +245,10 @@ f_dialog_resolv_conf_update()
 		# Write the temporary file contents and move the temporary
 		# file into place.
 		#
-		echo "$new_contents" | tail -r > "$tmpfile" || return $FAILURE
-		f_quietly mv "$tmpfile" "$RESOLV_CONF"
+		echo "$new_contents" | tail -r > "$tmpfile" ||
+			return $DIALOG_CANCEL
+		f_eval_catch -d $funcname mv \
+			'mv "%s" "%s"' "$tmpfile" "$RESOLV_CONF"
 
 	fi
 }
@@ -287,14 +299,15 @@ END { if ( ! found ) exit 3 }
 '
 f_dialog_input_nameserver()
 {
+	local funcname=f_dialog_input_nameserver
 	local index="${1:-0}" old_ns="$2" new_ns
 	local ns="$old_ns"
 
 	#
 	# Perform sanity checks
 	#
-	f_isinteger "$index" || return $FAILURE
-	[ $index -ge 0 ] || return $FAILURE
+	f_isinteger "$index" || return $DIALOG_CANCEL
+	[ $index -ge 0 ] || return $DIALOG_CANCEL
 
 	local msg
 	if [ $index -gt 0 ]; then
@@ -312,7 +325,7 @@ f_dialog_input_nameserver()
 	#
 	while :; do
 		f_dialog_input new_ns "$msg" "$ns" \
-		               "$hline_num_punc_tab_enter" || return
+		               "$hline_num_punc_tab_enter" || return $?
 
 		# Take only the first "word" of the user's input
 		new_ns="${new_ns%%[$IFS]*}"
@@ -331,7 +344,7 @@ f_dialog_input_nameserver()
 	if [ $index -eq "0" -a "$new_ns" ]; then
 		f_dialog_info "$msg_saving_nameserver"
 		printf "nameserver\t%s\n" "$new_ns" >> "$RESOLV_CONF"
-		return $SUCCESS
+		return $DIALOG_OK
 	elif [ $index -gt 0 -a "$old_ns" != "$new_ns" ]; then
 		if [ "$new_ns" ]; then
 			msg="$msg_saving_nameserver_existing"
@@ -343,17 +356,23 @@ f_dialog_input_nameserver()
 		#
 		# Create a new temporary file to write our new resolv.conf(5)
 		#
-		local tmpfile="$( mktemp -t "$pgm" )"
-		[ "$tmpfile" ] || return $FAILURE
+		local tmpfile
+		f_eval_catch -dk tmpfile $funcname mktemp \
+			'mktemp -t "%s"' "$pgm" || return $DIALOG_CANCEL
 
 		#
 		# Quietly fixup permissions and ownership
 		#
 		local mode owner
-		mode=$( stat -f '%#Lp' "$RESOLV_CONF" 2> /dev/null )
-		owner=$( stat -f '%u:%g' "$RESOLV_CONF" 2> /dev/null )
-		f_quietly chmod "${mode:-0644}" "$tmpfile"
-		f_quietly chown "${owner:-root:wheel}" "$tmpfile"
+		f_eval_catch -dk mode $funcname stat \
+			'stat -f "%%#Lp" "%s"' "$RESOLV_CONF" || mode=0644
+		f_eval_catch -dk owner $funcname stat \
+			'stat -f "%%u:%%g" "%s"' "$RESOLV_CONF" ||
+			owner="root:wheel"
+		f_eval_catch -d $funcname chmod \
+			'chmod "%s" "%s"' "$mode" "$tmpfile"
+		f_eval_catch -d $funcname chown \
+			'chown "%s" "%s"' "$owner" "$tmpfile"
 
 		#
 		# Operate on resolv.conf(5)
@@ -381,8 +400,9 @@ f_dialog_input_nameserver()
 		# Write the temporary file contents and move the temporary
 		# file into place.
 		#
-		echo "$new_contents" > "$tmpfile" || return $FAILURE
-		f_quietly mv "$tmpfile" "$RESOLV_CONF"
+		echo "$new_contents" > "$tmpfile" || return $DIALOG_CANCEL
+		f_eval_catch -d $funcname mv \
+			'mv "%s" "%s"' "$tmpfile" "$RESOLV_CONF"
 	fi
 }
 
@@ -408,7 +428,8 @@ f_dialog_menu_nameservers()
 		#
 		# Re/Build list of nameservers
 		#
-		local nameservers="$( f_resolv_conf_nameservers )"
+		local nameservers
+		f_resolv_conf_nameservers nameservers
 		menu_list=$(
 			index=1
 
@@ -452,7 +473,7 @@ f_dialog_menu_nameservers()
 		f_dialog_data_sanitize tag
 
 		# Return if "Cancel" was chosen (-1) or ESC was pressed (255)
-		if [ $retval -ne $SUCCESS ]; then
+		if [ $retval -ne $DIALOG_OK ]; then
 			return $retval
 		else
 			# Only update default-item on success
diff --git a/usr.sbin/bsdconfig/networking/share/routing.subr b/usr.sbin/bsdconfig/networking/share/routing.subr
index 3af9f36df32..826ac6e10ba 100644
--- a/usr.sbin/bsdconfig/networking/share/routing.subr
+++ b/usr.sbin/bsdconfig/networking/share/routing.subr
@@ -35,6 +35,7 @@ f_include $BSDCFG_SHARE/dialog.subr
 f_include $BSDCFG_SHARE/media/tcpip.subr
 f_include $BSDCFG_SHARE/networking/common.subr
 f_include $BSDCFG_SHARE/networking/ipaddr.subr
+f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="120.networking"
@@ -48,6 +49,8 @@ f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 #
 f_dialog_input_defaultrouter()
 {
+	local funcname=f_dialog_input_defaultrouter
+
 	#
 	# Get the defaultrouter. When this is not configured, the default is
 	# "NO", however we don't ever want to present this default to the user
@@ -61,9 +64,7 @@ f_dialog_input_defaultrouter()
 	local defaultrouter="$( f_sysrc_get 'defaultrouter:-NO' )"
 	local defaultrouter_orig="$defaultrouter" # for change-tracking
 	case "$defaultrouter" in
-	[Nn][Oo])
-		defaultrouter=$( f_route_get_default )
-		;;
+	[Nn][Oo]) f_route_get_default defaultrouter ;;
 	esac
 
 	#
@@ -72,10 +73,11 @@ f_dialog_input_defaultrouter()
 	# mounted, the system will hang.
 	#
 	if f_nfs_mounted && ! f_jailed; then
-		local setting="$( printf "$msg_current_default_router" \
-		                         "$defaultrouter" )"
+		local setting
+		f_sprintf setting "$msg_current_default_router" \
+		                  "$defaultrouter"
 		f_noyes "$msg_nfs_mounts_may_cause_hang" "$setting" ||
-			return $FAILURE
+			return $DIALOG_CANCEL
 	fi
 
 	#
@@ -87,8 +89,8 @@ f_dialog_input_defaultrouter()
 		               "$msg_please_enter_default_router" \
 		               "$defaultrouter" "$hline_num_punc_tab_enter"
 		retval=$?
-		[ "$defaultrouter" ] || return $SUCCESS
-		[ $retval -eq $SUCCESS ] || return $retval
+		[ "$defaultrouter" ] || return $DIALOG_OK
+		[ $retval -eq $DIALOG_OK ] || return $retval
 
 		# Taint-check the user's input
 		f_dialog_validate_ipaddr "$defaultrouter" && break
@@ -101,27 +103,25 @@ f_dialog_input_defaultrouter()
 		f_dialog_info "$msg_saving_default_router"
 
 		# Save the default router/gateway
-		f_sysrc_set defaultrouter "$defaultrouter"
+		f_eval_catch $funcname f_sysrc_set \
+			'f_sysrc_set defaultrouter "%s"' "$defaultrouter"
 	fi
 
 	#
 	# Only ask to apply setting if the current defaultrouter is different
 	# than the stored configuration (in rc.conf(5)).
 	#
-	if [ "$( f_route_get_default )" != "$defaultrouter" ]; then
+	local dr
+	f_route_get_default dr
+	if [ "$dr" != "$defaultrouter" ]; then
 		f_dialog_clear
-		f_yesno "$msg_activate_default_router" \
-		        "$( f_route_get_default )" "$defaultrouter"
-		if [ $? -eq $SUCCESS ]; then
-			local err
-
+		f_yesno "$msg_activate_default_router" "$dr" "$defaultrouter"
+		if [ $? -eq $DIALOG_OK ]; then
 			# Apply the default router/gateway
-			f_quietly route delete default
-			err=$( route add default "$defaultrouter" 2>&1 )
-			if [ $? -ne $SUCCESS ]; then
-				f_dialog_msgbox "$err"
-				return $FAILURE
-			fi
+			f_eval_catch -d $funcname route 'route delete default'
+			f_eval_catch $funcname route \
+				'route add default "%s"' "$defaultrouter" ||
+				return $DIALOG_CANCEL
 		fi
 	fi
 }
diff --git a/usr.sbin/bsdconfig/networking/share/services.subr b/usr.sbin/bsdconfig/networking/share/services.subr
index b0cf95be62b..246d8956e32 100644
--- a/usr.sbin/bsdconfig/networking/share/services.subr
+++ b/usr.sbin/bsdconfig/networking/share/services.subr
@@ -42,8 +42,9 @@ f_include $BSDCFG_SHARE/sysrc.subr
 #
 f_config_pcnfsd()
 {
+	local funcname=f_config_pcnfsd
 	f_package_add "pcnfsd" || return $?
-	f_sysrc_set mountd_flags "-n"
+	f_eval_catch $funcname f_sysrc_set 'f_sysrc_set mountd_flags -n'
 	return $SUCCESS
 }
 
diff --git a/usr.sbin/bsdconfig/packages/packages b/usr.sbin/bsdconfig/packages/packages
index 5b01c3e96e7..ec429f28246 100755
--- a/usr.sbin/bsdconfig/packages/packages
+++ b/usr.sbin/bsdconfig/packages/packages
@@ -38,14 +38,15 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 f_dprintf "%s: loading includes..." "$0"
 f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/media/common.subr
 f_include $BSDCFG_SHARE/mustberoot.subr
 f_include $BSDCFG_SHARE/packages/packages.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="030.packages"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
@@ -73,6 +74,7 @@ f_device_get_all
 #
 # Display the package configuration menu and exit
 #
+trap 'f_media_close' EXIT
 f_package_config
 
 ################################################################################
diff --git a/usr.sbin/bsdconfig/password/password b/usr.sbin/bsdconfig/password/password
index 662a536aff7..b73a8d0936f 100755
--- a/usr.sbin/bsdconfig/password/password
+++ b/usr.sbin/bsdconfig/password/password
@@ -37,8 +37,8 @@ f_include $BSDCFG_SHARE/password/password.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="040.password"
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -73,8 +73,8 @@ f_mustberoot_init
 # Prompt the user to input a new password (and change it if they don't cancel)
 #
 if f_dialog_input_password; then
-	err=$( echo "$pw_password" | pw usermod $USER_ROOT -h 0 2>&1 ) ||
-		f_die $? "%s" "$err"
+	echo "$pw_password" | f_eval_catch "$0" pw \
+		'pw usermod "%s" -h 0' "$USER_ROOT" || f_die
 	f_show_msg "$msg_password_changed"
 fi
 
diff --git a/usr.sbin/bsdconfig/password/share/password.subr b/usr.sbin/bsdconfig/password/share/password.subr
index 05db7f1d882..22803394fc3 100644
--- a/usr.sbin/bsdconfig/password/share/password.subr
+++ b/usr.sbin/bsdconfig/password/share/password.subr
@@ -114,7 +114,7 @@ f_dialog_input_password()
 		break
 	done
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/security/kern_securelevel b/usr.sbin/bsdconfig/security/kern_securelevel
index fd1c91c9882..9aa79b7de8f 100755
--- a/usr.sbin/bsdconfig/security/kern_securelevel
+++ b/usr.sbin/bsdconfig/security/kern_securelevel
@@ -40,8 +40,8 @@ f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 SECURELEVEL_HELPFILE=$BSDCFG_LIBE/$APP_DIR/include/securelevel.hlp
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -131,11 +131,10 @@ while :; do
 	retval=$?
 	f_dialog_menutag_fetch mtag
 
-	if [ $retval -eq 2 ]; then
-		# The Help button was pressed
+	if [ $retval -eq $DIALOG_HELP ]; then
 		f_show_help "$SECURELEVEL_HELPFILE"
 		continue
-	elif [ $retval -ne 0 ]; then
+	elif [ $retval -ne $DIALOG_OK ]; then
 		f_die
 	fi
 
@@ -144,19 +143,26 @@ done
 
 case "$mtag" in
 "$msg_disabled")
-	f_sysrc_set kern_securelevel_enable "NO"
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set kern_securelevel_enable NO' || f_die
 	;;
 "$msg_secure")
-	f_sysrc_set kern_securelevel_enable "YES"
-	f_sysrc_set kern_securelevel "1" 
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set kern_securelevel_enable YES' || f_die
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set kern_securelevel 1' || f_die
 	;;
 "$msg_highly_secure")
-	f_sysrc_set kern_securelevel_enable "YES"
-	f_sysrc_set kern_securelevel "2" 
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set kern_securelevel_enable YES' || f_die
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set kern_securelevel 2' || f_die
 	;;
 "$msg_network_secure")
-	f_sysrc_set kern_securelevel_enable "YES"
-	f_sysrc_set kern_securelevel "3" 
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set kern_securelevel_enable YES' || f_die
+	f_eval_catch "$0" f_sysrc_set \
+		'f_sysrc_set kern_securelevel 3' || f_die
 	;;
 *)
 	f_die 1 "$msg_unknown_kern_securelevel_selection"
diff --git a/usr.sbin/bsdconfig/security/security b/usr.sbin/bsdconfig/security/security
index ca19a26aaf1..e045ad8a202 100755
--- a/usr.sbin/bsdconfig/security/security
+++ b/usr.sbin/bsdconfig/security/security
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="130.security"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -123,7 +123,7 @@ dialog_menu_main()
 	f_dialog_menutag_store "$menu_choice"
 
 	# Only update default-item on success
-	[ $retval -eq 0 ] && f_dialog_default_store "$menu_choice"
+	[ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
 
 	return $retval
 }
@@ -162,9 +162,11 @@ while :; do
 	"2 ["?"] $msg_securelevel") # Configure securelevels for the system
 		$BSDCFG_LIBE/$APP_DIR/kern_securelevel ${USE_XDIALOG:+-X} ;;
 	"3 [X] $msg_nfs_port") # Require that NFS clients use reserved ports
-		f_sysrc_set nfs_reserved_port_only "NO" ;;
+		f_eval_catch "$0" f_sysrc_set \
+			'f_sysrc_set nfs_reserved_port_only NO' ;;
 	"3 [ ] $msg_nfs_port") # Same; Toggle value
-		f_sysrc_set nfs_reserved_port_only "YES" ;;
+		f_eval_catch "$0" f_sysrc_set \
+			'f_sysrc_set nfs_reserved_port_only YES' ;;
 	*)
 		f_die 1 "$msg_unknown_security_menu_selection"
 	esac
diff --git a/usr.sbin/bsdconfig/share/Makefile b/usr.sbin/bsdconfig/share/Makefile
index 3392e2ac53e..98cc779e49c 100644
--- a/usr.sbin/bsdconfig/share/Makefile
+++ b/usr.sbin/bsdconfig/share/Makefile
@@ -5,8 +5,9 @@ NO_OBJ=
 SUBDIR=	media packages
 
 FILESDIR=	${SHAREDIR}/bsdconfig
-FILES=		common.subr device.subr dialog.subr mustberoot.subr \
-		script.subr strings.subr struct.subr sysrc.subr variable.subr
+FILES=		common.subr device.subr dialog.subr keymap.subr \
+		mustberoot.subr script.subr strings.subr struct.subr \
+		sysrc.subr variable.subr
 
 beforeinstall:
 	mkdir -p ${DESTDIR}${FILESDIR}
diff --git a/usr.sbin/bsdconfig/share/common.subr b/usr.sbin/bsdconfig/share/common.subr
index 985bf6b1c1f..94b5cfdb8a7 100644
--- a/usr.sbin/bsdconfig/share/common.subr
+++ b/usr.sbin/bsdconfig/share/common.subr
@@ -58,15 +58,30 @@ FAILURE=1
 #
 # Operating environment details
 #
-export UNAME_S="$(uname -s)" # Operating System (i.e. FreeBSD)
-export UNAME_P="$(uname -p)" # Processor Architecture (i.e. i386)
-export UNAME_R="$(uname -r)" # Release Level (i.e. X.Y-RELEASE)
+export UNAME_S="$( uname -s )" # Operating System (i.e. FreeBSD)
+export UNAME_P="$( uname -p )" # Processor Architecture (i.e. i386)
+export UNAME_M="$( uname -m )" # Machine platform (i.e. i386)
+export UNAME_R="$( uname -r )" # Release Level (i.e. X.Y-RELEASE)
+if [ ! "${PKG_ABI+set}" ]; then
+	export PKG_ABI="$(
+		ASSUME_ALWAYS_YES=1 pkg -vv 2> /dev/null |
+			awk '$1=="ABI"{print $3;exit}'
+	)"
+fi
 
 #
 # Default behavior is to call f_debug_init() automatically when loaded.
 #
 : ${DEBUG_SELF_INITIALIZE=1}
 
+#
+# Default behavior of f_debug_init() is to truncate $debugFile (set to NULL to
+# disable truncating the debug file when initializing). To get child processes
+# to append to the same log file, export this variarable (with a NULL value)
+# and also export debugFile with the desired value.
+# 
+: ${DEBUG_INITIALIZE_FILE=1}
+
 #
 # Define standard optstring arguments that should be supported by all programs
 # using this include (unless DEBUG_SELF_INITIALIZE is set to NULL to prevent
@@ -106,7 +121,7 @@ GETOPTS_ALLFLAGS="${GETOPTS_ALLFLAGS}0123456789"
 
 ############################################################ FUNCTIONS
 
-# f_dprintf $fmt [ $opts ... ]
+# f_dprintf $format [$arguments ...]
 #
 # Sensible debug function. Override in ~/.bsdconfigrc if desired.
 # See /usr/share/examples/bsdconfig/bsdconfigrc for example.
@@ -164,18 +179,17 @@ f_debug_init()
 	[ "$debugFile" ] && export debugFile
 
 	#
-	# Truncate the debug file upon. Note that we will trim a leading plus
-	# (`+') from the value of debugFile to support persistant meaning that
-	# f_dprintf() should print both to standard output and $debugFile
-	# (minus the leading plus, of course).
+	# Truncate debug file unless requested otherwise. Note that we will
+	# trim a leading plus (`+') from the value of debugFile to support
+	# persistant meaning that f_dprintf() should print both to standard
+	# output and $debugFile (minus the leading plus, of course).
 	#
 	local _debug_file="${debugFile#+}"
-	if [ "$_debug_file" ]; then
+	if [ "$_debug_file" -a "$DEBUG_INITIALIZE_FILE" ]; then
 		if ( umask 022 && :> "$_debug_file" ); then
 			f_dprintf "Successfully initialized debugFile \`%s'" \
 			          "$_debug_file"
-			[ "${debug+set}" ] ||
-				debug=1 # turn debugging on if not set
+			f_isset debug || debug=1 # turn debugging on if not set
 		else
 			unset debugFile
 			f_dprintf "Unable to initialize debugFile \`%s'" \
@@ -184,16 +198,16 @@ f_debug_init()
 	fi
 }
 
-# f_err $fmt [ $opts ... ]
+# f_err $format [$arguments ...]
 #
 # Print a message to stderr (fd=2).
 #
 f_err()
 {
-	printf "$@" >&${TERMINAL_STDERR_PASSTHRU:-2}
+	printf "$@" >&2
 }
 
-# f_quietly $command [ $arguments ... ]
+# f_quietly $command [$arguments ...]
 #
 # Run a command quietly (quell any output to stdout or stderr)
 #
@@ -275,7 +289,7 @@ f_isset()
 	eval [ \"\${${1%%[$IFS]*}+set}\" ]
 }
 
-# f_die [ $status [ $fmt [ $opts ... ]]]
+# f_die [$status [$format [$arguments ...]]]
 #
 # Abruptly terminate due to an error optionally displaying a message in a
 # dialog box using printf(1) syntax.
@@ -309,7 +323,7 @@ f_interrupt()
 	f_die
 }
 
-# f_show_info $fmt [ $opts ... ]
+# f_show_info $format [$arguments ...]
 #
 # Display a message in a dialog infobox using printf(1) syntax.
 #
@@ -330,7 +344,7 @@ f_show_info()
 	fi
 }
 
-# f_show_msg $fmt [ $opts ... ]
+# f_show_msg $format [$arguments ...]
 #
 # Display a message in a dialog box using printf(1) syntax.
 #
@@ -351,8 +365,32 @@ f_show_msg()
 	fi
 }
 
+# f_show_err $format [$arguments ...]
+#
+# Display a message in a dialog box with ``Error'' i18n title (overridden by
+# setting msg_error) using printf(1) syntax. If running non-interactively,
+# the process will terminate (using [above] f_die()).
+#
+f_show_err()
+{
+	[ "$nonInteractive" ] && f_die
 
-# f_yesno $fmt [ $opts ... ]
+	local msg
+	msg=$( printf "$@" )
+
+	: ${msg:=${msg_an_unknown_error_occurred:-An unknown error occurred}}
+
+	if [ "$_DIALOG_SUBR" ]; then
+		f_dialog_title "${msg_error:-Error}"
+		f_dialog_msgbox "$msg"
+		f_dialog_title_restore
+	else
+		dialog --title "${msg_error:-Error}" --msgbox "$msg" 0 0
+	fi
+	return $SUCCESS
+}
+
+# f_yesno $format [$arguments ...]
 #
 # Display a message in a dialog yes/no box using printf(1) syntax.
 #
@@ -373,7 +411,7 @@ f_yesno()
 	fi
 }
 
-# f_noyes $fmt [ $opts ... ]
+# f_noyes $format [$arguments ...]
 #
 # Display a message in a dialog yes/no box using printf(1) syntax.
 # NOTE: THis is just like the f_yesno function except "No" is default.
@@ -466,7 +504,7 @@ f_include_lang()
 	fi
 }
 
-# f_usage $file [ $key1 $value1 ... ]
+# f_usage $file [$key1 $value1 ...]
 #
 # Display USAGE file with optional pre-processor macro definitions. The first
 # argument is the template file containing the usage text to be displayed. If
@@ -527,7 +565,7 @@ f_usage()
 	exit $FAILURE
 }
 
-# f_index_file $keyword
+# f_index_file $keyword [$var_to_set]
 #
 # Process all INDEX files known to bsdconfig and return the path to first file
 # containing a menu_selection line with a keyword portion matching $keyword.
@@ -537,6 +575,9 @@ f_usage()
 #
 # If no file is found, error status is returned along with the NULL string.
 #
+# If $var_to_set is NULL or missing, output is printed to stdout (which is less
+# recommended due to performance degradation; in a loop for example).
+#
 # This function is a two-parter. Below is the awk(1) portion of the function,
 # afterward is the sh(1) function which utilizes the below awk script.
 #
@@ -553,32 +594,55 @@ END { exit ! found }
 '
 f_index_file()
 {
-	local keyword="$1"
-	local lang="${LANG:-$LC_ALL}"
+	local __keyword="$1" __var_to_set="$2"
+	local __lang="${LANG:-$LC_ALL}"
+	local __indexes="$BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX"
 
-	f_dprintf "f_index_file: keyword=[%s] lang=[%s]" "$keyword" "$lang"
+	f_dprintf "f_index_file: keyword=[%s] lang=[%s]" "$__keyword" "$__lang"
 
-	if [ "$lang" ]; then
-		awk -v keyword="$keyword" "$f_index_file_awk" \
-			$BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang && return
+	if [ "$__lang" ]; then
+		if [ "$__var_to_set" ]; then
+			eval "$__var_to_set"='"$( awk -v keyword="$__keyword" \
+				"$f_index_file_awk" $__indexes.$__lang
+			)"' && return $SUCCESS
+		else
+			awk -v keyword="$__keyword" "$f_index_file_awk" \
+				$__indexes.$__lang && return $SUCCESS
+		fi
 		# No match, fall-thru to non-i18n sources
 	fi
-	awk -v keyword="$keyword" "$f_index_file_awk" \
-		$BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX && return
+	if [ "$__var_to_set" ]; then
+		eval "$__var_to_set"='"$( awk -v keyword="$__keyword" \
+			"$f_index_file_awk" $__indexes )"' && return $SUCCESS
+	else
+		awk -v keyword="$__keyword" "$f_index_file_awk" $__indexes &&
+			return $SUCCESS
+	fi
 
 	# No match? Fall-thru to `local' libexec sources (add-on modules)
 
 	[ "$BSDCFG_LOCAL_LIBE" ] || return $FAILURE
-	if [ "$lang" ]; then
-		awk -v keyword="$keyword" "$f_index_file_awk" \
-			$BSDCFG_LOCAL_LIBE/*/INDEX.$lang && return
+	__indexes="$BSDCFG_LOCAL_LIBE/*/INDEX"
+	if [ "$__lang" ]; then
+		if [ "$__var_to_set" ]; then
+			eval "$__var_to_set"='"$( awk -v keyword="$__keyword" \
+				"$f_index_file_awk" $__indexes.$__lang
+			)"' && return $SUCCESS
+		else
+			awk -v keyword="$__keyword" "$f_index_file_awk" \
+				$__indexes.$__lang && return $SUCCESS
+		fi
 		# No match, fall-thru to non-i18n sources
 	fi
-	awk -v keyword="$keyword" "$f_index_file_awk" \
-		$BSDCFG_LOCAL_LIBE/*/INDEX
+	if [ "$__var_to_set" ]; then
+		eval "$__var_to_set"='$( awk -v keyword="$__keyword" \
+			"$f_index_file_awk" $__indexes )"'
+	else
+		awk -v keyword="$__keyword" "$f_index_file_awk" $__indexes
+	fi
 }
 
-# f_index_menusel_keyword $indexfile $pgm
+# f_index_menusel_keyword $indexfile $pgm [$var_to_set]
 #
 # Process $indexfile and return only the keyword portion of the menu_selection
 # line with a command portion matching $pgm.
@@ -595,6 +659,9 @@ f_index_file()
 #
 # If $indexfile does not exist, error status is returned with NULL.
 #
+# If $var_to_set is NULL or missing, output is printed to stdout (which is less
+# recommended due to performance degradation; in a loop for example).
+#
 # This function is a two-parter. Below is the awk(1) portion of the function,
 # afterward is the sh(1) function which utilizes the below awk script.
 #
@@ -625,24 +692,23 @@ END { exit ! found }
 '
 f_index_menusel_keyword()
 {
-	local indexfile="$1" pgm="$2"
-	local lang="${LANG:-$LC_ALL}"
+	local __indexfile="$1" __pgm="$2" __var_to_set="$3"
+	local __lang="${LANG:-$LC_ALL}" __file="$__indexfile"
 
+	[ -f "$__indexfile.$__lang" ] && __file="$__indexfile.$__lang"
 	f_dprintf "f_index_menusel_keyword: index=[%s] pgm=[%s] lang=[%s]" \
-	          "$indexfile" "$pgm" "$lang"
+	          "$__file" "$__pgm" "$__lang"
 
-	if [ -f "$indexfile.$lang" ]; then
-		awk -v pgm="$pgm" \
-			"$f_index_menusel_keyword_awk" \
-			"$indexfile.$lang"
-	elif [ -f "$indexfile" ]; then
-		awk -v pgm="$pgm" \
-			"$f_index_menusel_keyword_awk" \
-			"$indexfile"
+	if [ "$__var_to_set" ]; then
+		setvar "$__var_to_set" "$( awk \
+		    -v pgm="$__pgm" "$f_index_menusel_keyword_awk" "$__file"
+		)"
+	else
+		awk -v pgm="$__pgm" "$f_index_menusel_keyword_awk" "$__file"
 	fi
 }
 
-# f_index_menusel_command $indexfile $keyword
+# f_index_menusel_command $indexfile $keyword [$var_to_set]
 #
 # Process $indexfile and return only the command portion of the menu_selection
 # line with a keyword portion matching $keyword.
@@ -658,6 +724,9 @@ f_index_menusel_keyword()
 #
 # If $indexfile doesn't exist, error status is returned with NULL.
 #
+# If $var_to_set is NULL or missing, output is printed to stdout (which is less
+# recommended due to performance degradation; in a loop for example).
+#
 # This function is a two-parter. Below is the awk(1) portion of the function,
 # afterward is the sh(1) function which utilizes the below awk script.
 #
@@ -688,37 +757,34 @@ END { exit ! found }
 '
 f_index_menusel_command()
 {
-	local indexfile="$1" keyword="$2" command
-	local lang="${LANG:-$LC_ALL}"
+	local __indexfile="$1" __keyword="$2" __var_to_set="$3" __command
+	local __lang="${LANG:-$LC_ALL}" __file="$__indexfile"
 
+	[ -f "$__indexfile.$__lang" ] && __file="$__indexfile.$__lang"
 	f_dprintf "f_index_menusel_command: index=[%s] key=[%s] lang=[%s]" \
-	          "$indexfile" "$keyword" "$lang"
+	          "$__file" "$__keyword" "$__lang"
 
-	if [ -f "$indexfile.$lang" ]; then
-		command=$( awk -v key="$keyword" \
-				"$f_index_menusel_command_awk" \
-				"$indexfile.$lang" ) || return $FAILURE
-	elif [ -f "$indexfile" ]; then
-		command=$( awk -v key="$keyword" \
-				"$f_index_menusel_command_awk" \
-				"$indexfile" ) || return $FAILURE
-	else
-		return $FAILURE
-	fi
+	[ -f "$__file" ] || return $FAILURE
+	__command=$( awk -v key="$__keyword" \
+		"$f_index_menusel_command_awk" "$__file" ) || return $FAILURE
 
 	#
 	# If the command pathname is not fully qualified fix-up/force to be
 	# relative to the $indexfile directory.
 	#
-	case "$command" in
+	case "$__command" in
 	/*) : already fully qualified ;;
 	*)
-		local indexdir="${indexfile%/*}"
-		[ "$indexdir" != "$indexfile" ] || indexdir="."
-		command="$indexdir/$command"
+		local __indexdir="${__indexfile%/*}"
+		[ "$__indexdir" != "$__indexfile" ] || __indexdir="."
+		__command="$__indexdir/$__command"
 	esac
 
-	echo "$command"
+	if [ "$__var_to_set" ]; then
+		setvar "$__var_to_set" "$__command"
+	else
+		echo "$__command"
+	fi
 }
 
 # f_running_as_init
@@ -745,6 +811,168 @@ f_mounted()
 	mount | grep -Eq " on $dir \([^)]+\)$"
 }
 
+# f_eval_catch [-de] [-k $var_to_set] $funcname $utility \
+#              $format [$arguments ...]
+#
+# Silently evaluate a command in a sub-shell and test for error. If debugging
+# is enabled a copy of the command and its output is sent to debug (either
+# stdout or file depending on environment). If an error occurs, output of the
+# command is displayed in a dialog(1) msgbox using the [above] f_show_err()
+# function (unless optional `-d' flag is given, then no dialog).
+#
+# The $funcname argument is sent to debugging while the $utility argument is
+# used in the title of the dialog box. The command that is executed as well as
+# sent to debugging with $funcname is the product of the printf(1) syntax
+# produced by $format with optional $arguments.
+#
+# The following options are supported:
+#
+# 	-d	Do not use dialog(1).
+# 	-e	Produce error text from failed command on stderr.
+# 	-k var	Save output from the command in var.
+#
+# Example 1:
+#
+# 	debug=1
+# 	f_eval_catch myfunc echo 'echo "%s"' "Hello, World!"
+#
+# 	Produces the following debug output:
+#
+# 		DEBUG: myfunc: echo "Hello, World!"
+# 		DEBUG: myfunc: retval=0 <output below>
+# 		Hello, World!
+#
+# Example 2:
+#
+# 	debug=1
+# 	f_eval_catch -k contents myfunc cat 'cat "%s"' /some/file
+# 	# dialog(1) Error ``cat: /some/file: No such file or directory''
+# 	# contents=[cat: /some/file: No such file or directory]
+#
+# 	Produces the following debug output:
+#
+# 		DEBUG: myfunc: cat "/some/file"
+# 		DEBUG: myfunc: retval=1 <output below>
+# 		cat: /some/file: No such file or directory
+#
+# Example 3:
+#
+# 	debug=1
+# 	echo 123 | f_eval_catch myfunc rev rev
+#
+# 	Produces the following debug output:
+#
+# 		DEBUG: myfunc: rev
+# 		DEBUG: myfunc: retval=0 <output below>
+# 		321
+#
+# Example 4:
+#
+# 	debug=1
+# 	f_eval_catch myfunc true true
+#
+# 	Produces the following debug output:
+#
+# 		DEBUG: myfunc: true
+# 		DEBUG: myfunc: retval=0 <no output>
+#
+# Example 5:
+#
+# 	f_eval_catch -de myfunc ls 'ls "%s"' /some/dir
+# 	# Output on stderr ``ls: /some/dir: No such file or directory''
+#
+# Example 6:
+#
+# 	f_eval_catch -dek contents myfunc ls 'ls "%s"' /etc
+# 	# Output from `ls' sent to stderr and also saved in $contents
+#
+f_eval_catch()
+{
+	local __no_dialog= __show_err= __var_to_set=
+
+	#
+	# Process local function arguments
+	#
+	local OPTIND __flag
+	while getopts "dek:" __flag > /dev/null; do
+		case "$__flag" in
+		d) __no_dialog=1 ;;
+		e) __show_err=1 ;;
+		k) __var_to_set="$OPTARG" ;;
+		esac
+	done
+	shift $(( $OPTIND - 1 ))
+
+	local __funcname="$1" __utility="$2"; shift 2
+	local __cmd __output __retval
+
+	__cmd=$( printf -- "$@" )
+	f_dprintf "%s: %s" "$__funcname" "$__cmd" # Log command *before* eval
+	__output=$( exec 2>&1; eval "$__cmd" )
+	__retval=$?
+	if [ "$__output" ]; then
+		[ "$__show_err" ] && echo "$__output" >&2
+		f_dprintf "%s: retval=%i <output below>\n%s" "$__funcname" \
+		          $__retval "$__output"
+	else
+		f_dprintf "%s: retval=%i <no output>" "$__funcname" $__retval
+	fi
+
+	! [ "$__no_dialog" -o "$nonInteractive" -o $__retval -eq $SUCCESS ] &&
+		msg_error="${msg_error:-Error}${__utility:+: $__utility}" \
+			f_show_err "%s" "$__output"
+		# NB: f_show_err will handle NULL output appropriately
+
+	[ "$__var_to_set" ] && setvar "$__var_to_set" "$__output"
+
+	return $__retval
+}
+
+# f_count $var_to_set arguments ...
+#
+# Sets $var_to_set to the number of arguments minus one (the effective number
+# of arguments following $var_to_set).
+#
+# Example:
+# 	f_count count dog house # count=[2]
+#
+f_count()
+{
+	setvar "$1" $(( $# - 1 ))
+}
+
+# f_count_ifs $var_to_set string ...
+#
+# Sets $var_to_set to the number of words (split by the internal field
+# separator, IFS) following $var_to_set.
+#
+# Example 1:
+#
+# 	string="word1   word2   word3"
+# 	f_count_ifs count "$string" # count=[3]
+# 	f_count_ifs count $string # count=[3]
+#
+# Example 2:
+#
+# 	IFS=. f_count_ifs count www.freebsd.org # count=[3]
+#
+# NB: Make sure to use double-quotes if you are using a custom value for IFS
+# and you don't want the current value to effect the result. See example 3.
+#
+# Example 3:
+#
+# 	string="a-b c-d"
+# 	IFS=- f_count_ifs count "$string" # count=[3]
+# 	IFS=- f_count_ifs count $string # count=[4]
+#
+f_count_ifs()
+{
+	local __var_to_set="$1"
+	shift 1
+	set -- $*
+	setvar "$__var_to_set" $#
+}
+
 ############################################################ MAIN
 
 #
diff --git a/usr.sbin/bsdconfig/share/device.subr b/usr.sbin/bsdconfig/share/device.subr
index bbd3a104f15..e42751e46ff 100644
--- a/usr.sbin/bsdconfig/share/device.subr
+++ b/usr.sbin/bsdconfig/share/device.subr
@@ -42,6 +42,7 @@ f_include_lang $BSDCFG_LIBE/include/messages.subr
 
 DEVICES=
 DEVICE_NAMES=
+NDEVICES=0
 
 # A "device" from sysinstall's point of view
 f_struct_define DEVICE \
@@ -49,6 +50,7 @@ f_struct_define DEVICE \
 	desc		\
 	devname		\
 	type		\
+	capacity	\
 	enabled		\
 	init		\
 	get		\
@@ -75,6 +77,11 @@ setvar DEVICE_TYPE_ANY		11
 setvar DEVICE_TYPE_HTTP_PROXY	12
 setvar DEVICE_TYPE_HTTP		13
 
+# Network devices have the following flags available
+setvar IF_ETHERNET	1
+setvar IF_WIRELESS	2
+setvar IF_ACTIVE	4
+
 #
 # Default behavior is to call f_device_get_all() automatically when loaded.
 #
@@ -94,7 +101,7 @@ f_device_try()
 {
 	local name="$1" i="$2" var_path="$3" unit
 	if [ "$i" ]; then
-		unit=$( printf "$name" "$i" )
+		f_sprintf unit "$name" "$i"
 	else
 		unit="$name"
 	fi
@@ -114,7 +121,7 @@ f_device_try()
 }
 
 # f_device_register $name $desc $devname $type $enabled $init_function \
-#                   $get_function $shutdown_function $private
+#                   $get_function $shutdown_function $private $capacity
 #
 # Register a device. A `structure' (see struct.subr) is created with the name
 # device_$name (so make sure $name contains only alpha-numeric characters or
@@ -128,6 +135,7 @@ f_device_register()
 {
 	local name="$1" desc="$2" devname="$3" type="$4" enabled="$5"
 	local init_func="$6" get_func="$7" shutdown_func="$8" private="$9"
+	local capacity="${10}"
 
 	f_struct_new DEVICE "device_$name" || return $FAILURE
 	device_$name set name     "$name"
@@ -139,6 +147,7 @@ f_device_register()
 	device_$name set get      "$get_func"
 	device_$name set shutdown "$shutdown_func"
 	device_$name set private  "$private"
+	device_$name set capacity "$capacity"
 
 	# Scan our global register to see if it needs ammending
 	local dev found=
@@ -172,42 +181,60 @@ f_device_reset()
 	DEVICES=
 }
 
+# f_device_reset_network
+#
+# Reset the registered network device chain.
+#
+f_device_reset_network()
+{
+	local dev type private pruned_list=
+	for dev in $DEVICES; do
+		device_$dev get type type
+		if [ "$type" != "$DEVICE_TYPE_NETWORK" ]; then
+			pruned_list="$pruned_list $dev"
+			continue
+		fi
+
+		#
+		# Leave the device up (don't call shutdown routine)
+		#
+
+		# Network devices may have DEVICE_INFO private member
+		device_$dev get private private
+		[ "$private" ] && f_struct_free "$private"
+
+		f_struct_free device_$dev
+	done
+	DEVICES="${pruned_list# }"
+}
+
 # f_device_get_all
 #
 # Get all device information for devices we have attached.
 #
 f_device_get_all()
 {
-	local devname desc
+	local devname desc capacity
 
 	f_dprintf "f_device_get_all: Probing devices..."
 	f_dialog_info "$msg_probing_devices_please_wait_this_can_take_a_while"
 
 	# First go for the network interfaces
-	for devname in $( ifconfig -l ); do
-		# Eliminate network devices that don't make sense
-		case "$devname" in
-		lo*) continue ;;
-		esac
-
-		# Try and find its description
-		f_device_desc "$devname" $DEVICE_TYPE_NETWORK desc
-
-		f_dprintf "Found a network device named %s" "$devname"
-		f_device_register $devname \
-			"$desc" "$devname" $DEVICE_TYPE_NETWORK 1 \
-			f_media_init_network "" f_media_shutdown_network ""
-	done
+	f_device_get_all_network
 
 	# Next, try to find all the types of devices one might use
 	# as a media source for content
 	#
 
-	local dev desc type max n=0
+	local dev type max n=0
 	for dev in $DEVICE_NAMES; do
 		n=$(( $n + 1 ))
 		# Get the desc, type, and max (with debugging disabled)
 		# NOTE: Bypassing f_device_name_get() for efficiency
+		# ASIDE: This would be equivalent to the following:
+		# 	debug= f_device_name_get $dev desc
+		# 	debug= f_device_name_get $dev type
+		# 	debug= f_device_name_get $dev max
 		debug= f_getvar _device_desc$n desc
 		debug= f_getvar _device_type$n type
 		debug= f_getvar _device_max$n max
@@ -219,29 +246,32 @@ f_device_get_all()
 			case "$type" in
 			$DEVICE_TYPE_CDROM)
 				f_device_try "$dev" "$i" devname || continue
+				f_device_capacity "$devname" capacity
 				f_device_register "${devname##*/}" "$desc" \
 					"$devname" $DEVICE_TYPE_CDROM 1 \
 					f_media_init_cdrom f_media_get_cdrom \
-					f_media_shutdown_cdrom ""
+					f_media_shutdown_cdrom "" "$capacity"
 				f_dprintf "Found a CDROM device for %s" \
 				          "$devname"
 				;;
 			$DEVICE_TYPE_FLOPPY)
 				f_device_try "$dev" "$i" devname || continue
+				f_device_capacity "$devname" capacity
 				f_device_register "${devname##*/}" "$desc" \
 					"$devname" $DEVICE_TYPE_FLOPPY 1 \
 					f_media_init_floppy \
 					f_media_get_floppy \
-					f_media_shutdown_floppy ""
+					f_media_shutdown_floppy "" "$capacity"
 				f_dprintf "Found a floppy device for %s" \
 				          "$devname"
 				;;
 			$DEVICE_TYPE_USB)
 				f_device_try "$dev" "$i" devname || continue
+				f_device_capacity "$devname" capacity
 				f_device_register "${devname##*/}" "$desc" \
 					"$devname" $DEVICE_TYPE_USB 1 \
 					f_media_init_usb f_media_get_usb \
-					f_media_shutdown_usb ""
+					f_media_shutdown_usb "" "$capacity"
 				f_dprintf "Found a USB disk for %s" "$devname"
 				;;
 			esac
@@ -251,10 +281,11 @@ f_device_get_all()
 	# Register ISO9660 providers as CDROM devices
 	for devname in /dev/iso9660/*; do
 		f_device_try "$devname" || continue
+		f_device_capacity "$devname" capacity
 		f_device_register "${devname##*/}" "ISO9660 file system" \
 			"$devname" $DEVICE_TYPE_CDROM 1 \
 			f_media_init_cdrom f_media_get_cdrom \
-			f_media_shutdown_cdrom ""
+			f_media_shutdown_cdrom "" "$capacity"
 		f_dprintf "Found a CDROM device for %s" "$devname"
 	done
 
@@ -277,11 +308,12 @@ f_device_get_all()
 			' )
 		case "$filename" in
 		*.iso) # Register the device as an ISO9660 provider
+			f_device_capacity "$devname" capacity
 			f_device_register "${devname##*/}" \
 				"md(4) vnode file system" \
 				"$devname" $DEVICE_TYPE_CDROM 1 \
 				f_media_init_cdrom f_media_get_cdrom \
-				f_media_shutdown_cdrom ""
+				f_media_shutdown_cdrom "" "$capacity"
 			f_dprintf "Found a CDROM device for %s" "$devname"
 			;;
 		esac
@@ -313,8 +345,13 @@ f_device_get_all()
 			continue
 		fi
 
-		f_device_register "$diskname" "" \
-		                  "/dev/$diskname" $DEVICE_TYPE_DISK 0
+		# Try and find its description
+		f_device_desc "$diskname" $DEVICE_TYPE_DISK desc
+
+		f_device_capacity "$diskname" capacity
+		f_device_register "$diskname" "$desc" \
+		                  "/dev/$diskname" $DEVICE_TYPE_DISK 0 \
+		                  "" "" "" "" "$capacity"
 		f_dprintf "Found a disk device named %s" "$diskname"
 
 		# Look for existing partitions to register
@@ -324,10 +361,11 @@ f_device_get_all()
 			case "$type" in
 			0x01|0x04|0x06|0x0b|0x0c|0x0e|0xef)
 				# DOS partitions to add as "DOS media devices"
+				f_device_capacity "/dev/$slice" capacity
 				f_device_register "$slice" "" \
 					"/dev/$slice" $DEVICE_TYPE_DOS 1 \
 					f_media_init_dos f_media_get_dos \
-					f_media_shutdown_dos ""
+					f_media_shutdown_dos "" "$capacity"
 				f_dprintf "Found a DOS partition %s" "$slice"
 				;;
 			0xa5) # FreeBSD partition
@@ -342,12 +380,15 @@ f_device_get_all()
 				); do
 					f_quietly dumpfs -m /dev/$part ||
 						continue
+					f_device_capacity \
+						"$/dev/$part" capacity
 					f_device_register \
 						"$part" "" "/dev/$part" \
 						$DEVICE_TYPE_UFS 1 \
 						f_media_init_ufs \
 						f_media_get_ufs \
-						f_media_shutdown_ufs ""
+						f_media_shutdown_ufs "" \
+						"$capacity"
 					f_dprintf "Found a UFS partition %s" \
 					          "$part"
 				done # parts
@@ -358,6 +399,48 @@ f_device_get_all()
 	done # disks
 }
 
+# f_device_get_all_network
+#
+# Get all network device information for attached network devices.
+#
+f_device_get_all_network()
+{
+	local devname desc flags
+	for devname in $( ifconfig -l ); do
+		# Eliminate network devices that don't make sense
+		case "$devname" in
+		lo*) continue ;;
+		esac
+
+		# Try and find its description
+		f_device_desc "$devname" $DEVICE_TYPE_NETWORK desc
+
+		f_dprintf "Found a network device named %s" "$devname"
+		f_device_register $devname \
+			"$desc" "$devname" $DEVICE_TYPE_NETWORK 1 \
+			f_media_init_network "" f_media_shutdown_network "" -1
+
+		# Set flags based on media and status
+		flags=0
+		eval "$( ifconfig $devname 2> /dev/null | awk -v var=flags '
+		function _or(var, mask) {
+			printf "%s=$(( $%s | $%s ))\n", var, var, mask
+		}
+		BEGIN { S = "[[:space:]]+" }
+		{
+			if (!match($0, "^" S "(media|status):" S)) next
+			value = substr($0, RLENGTH + 1)
+			if ($1 == "media:") {
+				if (value ~ /Ethernet/) _or(var, "IF_ETHERNET")
+				if (value ~ /802\.11/) _or(var, "IF_WIRELESS")
+			} else if ($1 == "status:") {
+				if (value ~ /^active/) _or(var, "IF_ACTIVE")
+			}
+		}' )"
+		device_$devname set flags $flags
+	done
+}
+
 # f_device_name_get $type $name type|desc|max [$var_to_set]
 #
 # Fetch the device type (type), description (desc), or maximum number of
@@ -379,10 +462,27 @@ f_device_name_get()
 	case "$__prop" in type|desc|max) : good ;;
 	*) return $FAILURE; esac
 
+	#
+	# Attempt to create an alternate-form of $__name that contains the
+	# first contiguous string of numbers replaced with `%d' for comparison
+	# against stored pattern names (see MAIN).
+	#
+	local __left="${__name%%[0-9]*}" __right="${__name#*[0-9]}" __dname=
+	if [ "$__left" != "$__name" ]; then
+		# Chop leading digits from right 'til we hit first non-digit
+		while :; do
+			case "$__right" in
+			[0-9]*) __right="${__right#[0-9]}" ;;
+			     *) break
+			esac
+		done
+		__dname="${__left}%d$__right"
+	fi
+
 	[ "$__type" = "$DEVICE_TYPE_ANY" ] && __type=
 	for __dev in $DEVICE_NAMES; do
 		__n=$(( $__n + 1 ))
-		[ "$__dev" = "$__name" ] || continue
+		[ "$__dev" = "$__name" -o "$__dev" = "$__dname" ] || continue
 		f_getvar _device_type$__n __devtype
 		[ "${__type:-$__devtype}" = "$__devtype" ] || continue
 		f_getvar _device_$__prop$__n $__var_to_set
@@ -463,6 +563,39 @@ f_device_desc()
 		fi
 	fi
 
+	#
+	# For disks, attempt to return camcontrol(8) descriptions.
+	# Otherwise fall through to below static list.
+	#
+	f_have camcontrol &&
+	[ "${__type:-$DEVICE_TYPE_DISK}" = "$DEVICE_TYPE_DISK" ] &&
+	__cp=$( camcontrol devlist 2> /dev/null | awk -v disk="$__name" '
+		$0~"(\\(|,)"disk"(,|\\))" {
+			if (!match($0, "<[^>]+>")) next
+			print substr($0, RSTART+1, RLENGTH-2)
+			found = 1
+			exit
+		}
+		END { exit ! found }
+	' ) && setvar "$__var_to_set" "$__cp" && return $SUCCESS
+
+	#
+	# Attempt to create an alternate-form of $__name that contains the
+	# first contiguous string of numbers replaced with `%d' for comparison
+	# against stored pattern names (see MAIN).
+	#
+	local __left="${__name%%[0-9]*}" __right="${__name#*[0-9]}" __dname=
+	if [ "$__left" != "$__name" ]; then
+		# Chop leading digits from right 'til we hit first non-digit
+		while :; do
+			case "$__right" in
+			[0-9]*) __right="${__right#[0-9]}" ;;
+			     *) break
+			esac
+		done
+		__dname="${__left}%d$__right"
+	fi
+
 	local __dev __devtype __n=0
 	for __dev in $DEVICE_NAMES; do
 		__n=$(( $__n + 1 ))
@@ -472,11 +605,8 @@ f_device_desc()
 			__devname=$( f_substr "$__name" 0 ${#__dev} )
 			[ "$__devname" = "$__dev" ] || continue
 		else
-			__devname="${__name%%[0-9]*}"
-			__devunit="${__name#$__devname}"
-			__devunit="${__devunit%%[!0-9]*}"
-			__devname=$( printf "$__dev" $__devunit )
-			[ "$__devname" = "$__name" ] || continue
+			[ "$__dev" = "$__name" -o "$__dev" = "$__dname" ] ||
+				continue
 		fi
 		debug= f_getvar _device_desc$__n $__var_to_set
 		return $?
@@ -504,6 +634,72 @@ f_device_desc()
 	return $FAILURE
 }
 
+# f_device_is_ethernet $device
+#
+# Returns true if $device is a wired Ethernet network interface. Otherwise
+# returns false. Example wired interfaces include: fxp0 em0 bge0 rl0 etc.
+#
+f_device_is_ethernet()
+{
+	local dev="$1" type flags
+
+	# Make sure we have an actual device by that name
+	f_struct "device_$dev" || return $FAILURE
+
+	# Make sure that the device is a network device
+	device_$dev get type type
+	[ "$type" = "$DEVICE_TYPE_NETWORK" ] || return $FAILURE
+
+	# Make sure that the media flags indicate that it is Ethernet
+	device_$dev get flags flags
+	[ $(( ${flags:-0} & $IF_ETHERNET )) -eq $IF_ETHERNET ]
+}
+
+# f_device_is_wireless $device
+#
+# Returns true if $device is a Wireless network interface. Otherwise returns
+# false. Examples of wireless interfaces include: iwn0
+#
+f_device_is_wireless()
+{
+	local dev="$1" type flags
+
+	# Make sure we have an actual device by that name
+	f_struct "device_$dev" || return $FAILURE
+
+	# Make sure that the device is a network device
+	device_$dev get type type
+	[ "$type" = "$DEVICE_TYPE_NETWORK" ] || return $FAILURE
+
+	# Make sure that the media flags indicate that it is Ethernet
+	device_$dev get flags flags
+	[ $(( ${flags:-0} & $IF_WIRELESS )) -eq $IF_WIRELESS ]
+}
+
+# f_device_is_active $device
+#
+# Returns true if $device is active. Otherwise returns false. Currently this
+# only works for network interfaces.
+#
+f_device_is_active()
+{
+	local dev="$1" type flags=0
+
+	# Make sure we have an actual device by that name
+	f_struct "device_$dev" || return $FAILURE
+
+	device_$dev get type type
+	case "$type" in
+	$DEVICE_TYPE_NETWORK)
+		# Make sure that the media flags indicate that it is active
+		device_$dev get flags flags
+		[ $(( ${flags:-0} & $IF_ACTIVE )) -eq $IF_ACTIVE ]
+		;;
+	*)
+		return $FAILURE
+	esac
+}
+
 # f_device_rescan
 #
 # Rescan all devices, after closing previous set - convenience function.
@@ -514,6 +710,16 @@ f_device_rescan()
 	f_device_get_all
 }
 
+# f_device_rescan_network
+#
+# Rescan all network devices, after closing previous set - for convenience.
+#
+f_device_rescan_network()
+{
+	f_device_reset_network
+	f_device_get_all_network
+}
+
 # f_device_find $name [$type [$var_to_set]] 
 #
 # Find one or more registered devices by name, type, or both. Returns a space-
@@ -552,7 +758,7 @@ f_device_find()
 f_device_init()
 {
 	local name="$1" init_func
-	device_$name get init init_func || return
+	device_$name get init init_func || return $?
 	${init_func:-:} $name
 }
 
@@ -564,7 +770,7 @@ f_device_init()
 f_device_get()
 {
 	local name="$1" file="$2" probe="$3" get_func
-	device_$name get get get_func || return
+	device_$name get get get_func || return $?
 	${get_func:-:} $name "$file" ${3+"$probe"}
 }
 
@@ -575,7 +781,7 @@ f_device_get()
 f_device_shutdown()
 {
 	local name="$1" shutdown_func
-	device_$name get shutdown shutdown_func || return
+	device_$name get shutdown shutdown_func || return $?
 	${shutdown_func:-:} $name
 }
 
@@ -597,7 +803,7 @@ f_device_menu()
 		[ "$devtype" = "$type" ] || continue
 		devs="$devs $dev"
 	done
-	[ "$devs" ] || return $FAILURE
+	[ "$devs" ] || return $DIALOG_CANCEL
 
 	local desc menu_list=
 	for dev in $devs; do
@@ -637,7 +843,7 @@ f_device_menu()
 		)
 		local retval=$?
 
-		[ $retval -ne 2 ] && break
+		[ $retval -ne $DIALOG_HELP ] && break
 			# Otherwise, the Help button was pressed
 		f_show_help "$helpfile"
 			# ...then loop back to menu
@@ -646,7 +852,7 @@ f_device_menu()
 
 	[ "$errexit" ] && set -e
 
-	if [ $retval -eq 0 ]; then
+	if [ $retval -eq $DIALOG_OK ]; then
 		# Clean up the output of [X]dialog(1) and return it
 		f_dialog_data_sanitize mtag
 		echo "$mtag" >&2
@@ -655,6 +861,25 @@ f_device_menu()
 	return $retval
 }
 
+# f_device_capacity $device [$var_to_set]
+#
+# Return the capacity of $device in bytes.
+#
+f_device_capacity()
+{
+	local __dev="$1" __var_to_set="$2"
+	local __bytes
+
+	__bytes=$( diskinfo -v "$__dev" 2> /dev/null |
+		awk '/# mediasize in bytes/{print $1}' ) || __bytes=-1
+
+	if [ "$__var_to_set" ]; then
+		setvar "$__var_to_set" "$__bytes"
+	else
+		echo "$__bytes"
+	fi
+}
+
 #
 # Short-hand
 #
@@ -680,6 +905,7 @@ f_disk   "ipsd%d" "IBM ServeRAID RAID array"          4
 f_disk   "mfid%d" "LSI MegaRAID SAS array"            4
 f_disk   "mlxd%d" "Mylex RAID disk"                   4
 f_disk   "twed%d" "3ware ATA RAID array"              4
+f_disk   "vtbd%d" "VirtIO Block Device"               16
 f_floppy "fd%d"   "Floppy Drive unit A"               4
 f_serial "cuau%d" "%s on device %s (COM%d)"           16
 f_usb    "da%da"  "USB Mass Storage Device"           16
@@ -783,8 +1009,9 @@ f_network "xe"    "Xircom/Intel EtherExpress Pro100/16 Ethernet card"
 f_network "xl"    "3COM 3c90x / 3c90xB PCI Ethernet card"
 f_network "zyd"   "ZyDAS ZD1211/ZD1211B USB 802.11 wireless adapter"
 
+f_count NDEVICES $DEVICE_NAMES
 f_dprintf "%s: Initialized %u known device names/descriptions." device.subr \
-	  "$( set -- $DEVICE_NAMES; echo $# )"
+	  $NDEVICES
 
 #
 # Scan for the above devices unless requeted otherwise
diff --git a/usr.sbin/bsdconfig/share/dialog.subr b/usr.sbin/bsdconfig/share/dialog.subr
index bde3753ba5b..d05d4fb4913 100644
--- a/usr.sbin/bsdconfig/share/dialog.subr
+++ b/usr.sbin/bsdconfig/share/dialog.subr
@@ -73,6 +73,18 @@ unset XDIALOG_HIGH_DIALOG_COMPAT
 unset XDIALOG_FORCE_AUTOSIZE
 unset XDIALOG_INFOBOX_TIMEOUT
 
+#
+# Exit codes for [X]dialog(1)
+#
+DIALOG_OK=${SUCCESS:-0}
+DIALOG_CANCEL=${FAILURE:-1}
+DIALOG_HELP=2
+DIALOG_ITEM_HELP=2
+DIALOG_EXTRA=3
+DIALOG_ITEM_HELP=4
+export DIALOG_ERROR=254 # sh(1) can't handle the default of `-1'
+DIALOG_ESC=255
+
 #
 # Default behavior is to call f_dialog_init() automatically when loaded.
 #
@@ -284,12 +296,25 @@ f_dialog_backtitle_restore()
 #
 f_dialog_max_size()
 {
+	local funcname=f_dialog_max_size
 	local __var_height="$1" __var_width="$2" __max_size
 	[ "$__var_height" -o "$__var_width" ] || return $FAILURE
 	if [ "$USE_XDIALOG" ]; then
 		__max_size="$XDIALOG_MAXSIZE" # see CONFIGURATION
 	else
-		__max_size=$( stty size 2> /dev/null ) # usually "24 80"
+		if __max_size=$( $DIALOG --print-maxsize \
+			2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD )
+		then
+			f_dprintf "$funcname: %s --print-maxsize = [%s]" \
+			          "$DIALOG" "$__max_size"
+			# usually "MaxSize: 24, 80"
+			__max_size="${__max_size#*: }"
+			f_replaceall "$__max_size" "," "" __max_size
+		else
+			f_eval_catch -dk __max_size $funcname stty \
+				'stty size' || __max_size=
+			# usually "24 80"
+		fi
 		: ${__max_size:=$DEFAULT_TERMINAL_SIZE}
 	fi
 	if [ "$__var_height" ]; then
@@ -403,8 +428,8 @@ f_dialog_size_constrain()
 
 	if [ "$debug" ]; then
 		# Print final constrained values to debugging
-		f_quietly f_getvar "$__var_height"
-		f_quietly f_getvar "$__var_width"
+		[ "$__var_height" ] && f_quietly f_getvar "$__var_height"
+		[ "$__var_width"  ] && f_quietly f_getvar "$__var_width"
 	fi
 
 	return $__retval # success if no debug warnings were printed
@@ -506,7 +531,7 @@ f_dialog_menu_constrain()
 			: ${__min_rows:=0}
 		fi
 
-		local __max_rows=$(( $__max_height_menu_constrain - 8 ))
+		local __max_rows=$(( $__max_height_menu_constrain - 7 ))
 		# If prompt_len is zero (no prompt), bump the max-rows by 1
 		# Default assumption is (if no argument) that there's no prompt
 		[ ${__prompt_len:-0} -gt 0 ] ||
@@ -520,10 +545,10 @@ f_dialog_menu_constrain()
 	fi
 
 	if [ "$debug" ]; then
-		# Print final constrained values to debuggin
-		f_quietly f_getvar "$__var_height"
-		f_quietly f_getvar "$__var_width"
-		f_quietly f_getvar "$__var_rows"
+		# Print final constrained values to debugging
+		[ "$__var_height" ] && f_quietly f_getvar "$__var_height"
+		[ "$__var_width"  ] && f_quietly f_getvar "$__var_width"
+		[ "$__var_rows"   ] && f_quietly f_getvar "$__var_rows"
 	fi
 
 	return $__retval # success if no debug warnings were printed
@@ -2031,7 +2056,10 @@ f_dialog_menutag2index_with_help()
 #
 f_dialog_init()
 {
+	local funcname=f_dialog_init
+
 	DIALOG_SELF_INITIALIZE=
+	USE_DIALOG=1
 
 	#
 	# Clone terminal stdout so we can redirect to it from within sub-shells
@@ -2075,7 +2103,7 @@ f_dialog_init()
 	#
 	# Process `-X' command-line option
 	#
-	[ "$USE_XDIALOG" ] && DIALOG=Xdialog
+	[ "$USE_XDIALOG" ] && DIALOG=Xdialog USE_DIALOG=
 
 	#
 	# Sanity check, or die gracefully
@@ -2118,7 +2146,7 @@ f_dialog_init()
 			DIALOG=dialog
 			f_die 1 "$msg_no_such_file_or_directory" "$pgm" "xauth"
 		fi
-		HOSTNAME=$(hostname)
+		HOSTNAME=$( hostname )
 		local displaynum="${DISPLAY#*:}"
 		eval xauth -if \~$SUDO_USER/.Xauthority extract - \
 			\"\$HOSTNAME/unix:\$displaynum\" \
@@ -2132,7 +2160,8 @@ f_dialog_init()
 	#
 	if [ "$USE_XDIALOG" ]; then
 		local maxsize
-		if ! maxsize=$( LANG= LC_ALL= $DIALOG --print-maxsize 2>&1 )
+		if ! f_eval_catch -dk maxsize $funcname "$DIALOG" \
+			'LANG= LC_ALL= %s --print-maxsize' "$DIALOG"
 		then
 			# Xdialog(1) failed, fall back to dialog(1)
 			unset USE_XDIALOG
diff --git a/usr.sbin/bsdconfig/share/keymap.subr b/usr.sbin/bsdconfig/share/keymap.subr
new file mode 100644
index 00000000000..39b6b541c64
--- /dev/null
+++ b/usr.sbin/bsdconfig/share/keymap.subr
@@ -0,0 +1,263 @@
+if [ ! "$_KEYMAP_SUBR" ]; then _KEYMAP_SUBR=1
+#
+# Copyright (c) 2013 Devin Teske
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this 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$
+#
+############################################################ INCLUDES
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." keymap.subr
+f_include $BSDCFG_SHARE/struct.subr
+
+############################################################ CONFIGURATION
+
+#
+# Defaults taken from usr.sbin/kbdmap/kbdmap.h
+#
+: ${DEFAULT_LANG:=en}
+: ${DEFAULT_KEYMAP_DIR:=/usr/share/syscons/keymaps}
+
+############################################################ GLOBALS
+
+KEYMAPS=
+NKEYMAPS=0
+
+# A "keymap" from kbdmap's point of view
+f_struct_define KEYMAP \
+	desc \
+	keym \
+	mark
+
+#
+# Default behavior is to call f_keymap_get_all() automatically when loaded.
+#
+: ${KEYMAP_SELF_SCAN_ALL=1}
+
+############################################################ FUNCTIONS
+
+# f_keymap_register $name $desc $keym $mark
+#
+# Register a keymap. A `structure' (see struct.subr) is created with the name
+# keymap_$name (so make sure $name contains only alpha-numeric characters or
+# the underscore, `_'). The remaining arguments after $name correspond to the
+# propertise of the `KEYMAP' structure-type (defined above).
+#
+# If not already registered, the keymap is then appended to the KEYMAPS
+# environment variable, a space-separated list of all registered keymaps.
+#
+f_keymap_register()
+{
+	local name="$1" desc="$2" keym="$3" mark="$4"
+
+	f_struct_new KEYMAP "keymap_$name" || return $FAILURE
+	keymap_$name set desc "$desc"
+	keymap_$name set keym "$keym"
+	keymap_$name set mark "$mark"
+
+	# Scan our global register to see if needs ammending
+	local k found=
+	for k in $KEYMAPS; do
+		[ "$k" = "$name" ] || continue
+		found=1 && break
+	done
+	[ "$found" ] || KEYMAPS="$KEYMAPS $name"
+
+	return $SUCCESS
+}
+
+# f_keymap_checkfile $keymap
+#
+# Check that $keymap is a readable kbdmap(5) file. Returns success if $keymap
+# is a file, is readable, and exists in $DEFAULT_KEYMAP_DIR; otherwise failure.
+# If debugging is enabled, an appropriate debug error message is printed if
+# $keymap is not available.
+#
+f_keymap_checkfile()
+{
+	local keym="$1"
+	
+	# Fixup keymap if it doesn't already contain at least one `/'
+	[ "${keym#*/}" = "$keym" ] && keym="$DEFAULT_KEYMAP_DIR/$keym"
+
+	# Short-cuts
+	[ -f "$keym" -a -r "$keym" ] && return $SUCCESS
+	f_debugging || return $FAILURE
+
+	# Print an appropriate debug error message
+	if [ ! -e "$keym" ]; then
+		f_dprintf "%s: No such file or directory" "$keym"
+	elif [ ! -f "$keym" ]; then
+		f_dprintf "%s: Not a file!" "$keym"
+	elif [ ! -r "$keym" ]; then
+		f_dprintf "%s: Permission denied" "$keym"
+	fi
+
+	return $FAILURE
+}
+
+# f_keymap_get_all
+#
+# Get all keymap information for kbdmap(5) entries both in the database and
+# loosely existing in $DEFAULT_KEYMAP_DIR.
+#
+f_keymap_get_all()
+{
+	local fname=f_keymap_get_all
+	local lang="${LC_ALL:-${LC_CTYPE:-${LANG:-$DEFAULT_LANG}}}"
+	[ "$lang" = "C" ] && lang="$DEFAULT_LANG"
+
+	f_dprintf "%s: Looking for keymap files..." $fname
+	f_dialog_info "$msg_looking_for_keymap_files"
+	f_dprintf "DEFAULT_LANG=[%s]" "$DEFAULT_LANG"
+
+	eval "$( awk -F: -v lang="$lang" -v lang_default="$DEFAULT_LANG" '
+		BEGIN {
+			# en_US.ISO8859-1 -> en_..\.ISO8859-1
+			dialect = lang
+			if (length(dialect) >= 6 &&
+			    substr(dialect, 3, 1) == "_")
+				dialect = substr(dialect, 1, 3) ".." \
+				          substr(dialect, 6)
+			printf "f_dprintf \"dialect=[%%s]\" \"%s\";\n", dialect
+
+			# en_US.ISO8859-1 -> en
+			lang_abk = lang
+			if (length(lang_abk) >= 3 &&
+			    substr(lang_abk, 3, 1) == "_")
+				lang_abk = substr(lang_abk, 1, 2)
+			printf "f_dprintf \"lang_abk=[%%s]\" \"%s\";\n",
+			       lang_abk
+		}
+		function find_token(buffer, token)
+		{
+			if (split(buffer, tokens, /,/) == 0) return 0
+			found = 0
+			for (t in tokens)
+				if (token == tokens[t]) { found = 1; break }
+			return found
+		}
+		function add_keymap(desc,mark,keym)
+		{
+			marks[keym] = mark
+			name = keym
+			gsub(/[^[:alnum:]_]/, "_", name)
+			gsub(/'\''/, "'\''\\'\'''\''", desc);
+			printf "f_keymap_checkfile %s && " \
+			       "f_keymap_register %s '\'%s\'' %s %u\n",
+			       keym, name, desc, keym, mark
+		}
+		!/^[[:space:]]*(#|$)/ {
+			sub(/^[[:space:]]*/, "", $0)
+			keym = $1
+			if (keym ~ /^(MENU|FONT)$/) next
+			lg = ($2 == "" ? lang_default : $2)
+
+			# Match the entry and store the type of match we made
+			# as the mark value (so that if we make a better match
+			# later on with a higher mark, it overwrites previous)
+
+			mark = marks[keym];
+			if (find_token(lg, lang))
+				add_keymap($3, 4, keym) # Best match
+			else if (mark <= 3 && find_token(lg, dialect))
+				add_keymap($3, 3, keym)
+			else if (mark <= 2 && find_token(lg, lang_abk))
+				add_keymap($3, 2, keym)
+			else if (mark <= 1 && find_token(lg, lang_default))
+				add_keymap($3, 1, keym)
+			else if (mark <= 0)
+				add_keymap($3, 0, keym)
+		}
+	' "$DEFAULT_KEYMAP_DIR/INDEX.${DEFAULT_KEYMAP_DIR##*/}" )"
+
+
+	#
+	# Look for keymaps not in database
+	#
+	local direntry keym name
+	set +f # glob
+	for direntry in "$DEFAULT_KEYMAP_DIR"/*; do
+		[ "${direntry##*.}" = ".kbd" ] || continue
+		keym="${direntry##*/}"
+		f_str2varname "$keym" name
+		f_struct keymap_$name && continue
+		f_keymap_checkfile "$keym" &&
+			f_keymap_register $name "${keym%.*}" "$keym" 0
+		f_dprintf "%s: not in kbdmap(5) database" "$keym"
+	done
+
+	#
+	# Sort the items by their descriptions
+	#
+	f_dprintf "%s: Sorting keymap entries by description..." $fname
+	KEYMAPS=$(
+		for k in $KEYMAPS; do
+			echo -n "$k "
+			# NOTE: Translate '8x8' to '8x08' before sending to
+			# sort(1) so that things work out as we might expect.
+			debug= keymap_$k get desc | sed -e 's/8x8/8x08/g'
+		done | sort -k2 | awk '{
+			printf "%s%s", (started ? " " : ""), $1; started = 1
+		}'
+	)
+
+	return $SUCCESS
+}
+
+# f_keymap_kbdcontrol $keymap
+#
+# Install keyboard map file from $keymap.
+#
+f_keymap_kbdcontrol()
+{
+	local keymap="$1"
+
+	[ "$keymap" ] || return $SUCCESS
+
+	# Fixup keymap if it doesn't already contain at least one `/'
+	[ "${keymap#*/}" = "$keymap" ] && keymap="$DEFAULT_KEYMAP_DIR/$keymap"
+
+	[ "$USE_XDIALOG" ] || kbdcontrol -l "$keymap"
+}
+
+############################################################ MAIN
+
+#
+# Scan for keymaps unless requeted otherwise
+#
+f_dprintf "%s: KEYMAP_SELF_SCAN_ALL=[%s]" keymap.subr "$KEYMAP_SELF_SCAN_ALL"
+case "$KEYMAP_SELF_SCAN_ALL" in
+""|0|[Nn][Oo]|[Oo][Ff][Ff]|[Ff][Aa][Ll][Ss][Ee]) : do nothing ;;
+*) f_keymap_get_all
+esac
+
+f_count NKEYMAPS $KEYMAPS
+f_dprintf "%s: Found %u keymap file(s)." keymap.subr $NKEYMAPS
+
+f_dprintf "%s: Successfully loaded." keymap.subr
+
+fi # ! $_KEYMAP_SUBR
diff --git a/usr.sbin/bsdconfig/share/media/any.subr b/usr.sbin/bsdconfig/share/media/any.subr
index 3675713389c..516d2d2bd4b 100644
--- a/usr.sbin/bsdconfig/share/media/any.subr
+++ b/usr.sbin/bsdconfig/share/media/any.subr
@@ -113,11 +113,10 @@ f_media_get_type()
 		f_dialog_data_sanitize mtag
 		f_dprintf "retval=%s mtag=[%s]" $retval "$mtag"
 
-		if [ $retval -eq 2 ]; then
-			# The Help button was pressed
+		if [ $retval -eq $DIALOG_HELP ]; then
 			f_show_help "$MEDIA_HELPFILE"
 			continue
-		elif [ $retval -ne 0 ]; then
+		elif [ $retval -ne $DIALOG_OK ]; then
 			return $FAILURE
 		fi
 
diff --git a/usr.sbin/bsdconfig/share/media/cdrom.subr b/usr.sbin/bsdconfig/share/media/cdrom.subr
index cd68029e079..f14021e2f9e 100644
--- a/usr.sbin/bsdconfig/share/media/cdrom.subr
+++ b/usr.sbin/bsdconfig/share/media/cdrom.subr
@@ -58,7 +58,7 @@ f_media_set_cdrom()
 
 	local devs ndevs
 	f_device_find "" $DEVICE_TYPE_CDROM devs
-	ndevs=$( set -- $devs; echo $# )
+	f_count ndevs $devs
 
 	if [ ${ndevs:=0} -eq 0 ]; then
 		f_interactive && f_show_msg "$msg_no_cd_dvd_devices_found"
@@ -95,6 +95,7 @@ f_media_set_cdrom()
 #
 f_media_init_cdrom()
 {
+	local funcname=f_media_init_cdrom
 	local dev="$1" devname err
 
 	device_$dev get devname devname || return $FAILURE
@@ -106,14 +107,13 @@ f_media_init_cdrom()
 		return $SUCCESS
 	fi
 
-	if [ ! -e "$MOUNTPOINT" ] &&
-	   ! err=$( mkdir -p "$MOUNTPOINT" 2>&1 )
-	then
-		f_dialog_msgbox "$err"
-		return $FAILURE
+	if [ ! -e "$MOUNTPOINT" ]; then
+		f_eval_catch $funcname mkdir 'mkdir -p "%s"' "$MOUNTPOINT" ||
+			return $FAILURE
 	fi
 
-	if ! err=$( mount_cd9660 "$devname" "$MOUNTPOINT" 2>&1 )
+	if ! f_eval_catch -dk err $funcname mount_cd9660 \
+		'mount_cd9660 "%s" "%s"' "$devname" "$MOUNTPOINT"
 	then
 		err="${err#mount_cd9660: }"; err="${err#$devname: }"
 		case "$err" in
@@ -163,29 +163,29 @@ f_media_get_cdrom()
 
 # f_media_shutdown_cdrom $device
 #
-# Shuts down the CDROM device and ejects the media using f_media_eject_cdrom(),
-# below. Return status should be ignored.
+# Shuts down the CDROM device. Return status should be ignored.
 #
 f_media_shutdown_cdrom()
 {
+	local funcname=f_media_shutdown_cdrom
 	local dev="$1" err
 
-	[ "$CDROM_MOUNTED" ] || return
+	[ "$CDROM_MOUNTED" ] || return $FAILURE
 
 	if [ "$CDROM_PREVIOUSLY_MOUNTED" ]; then
 		CDROM_MOUNTED=
 		return $SUCCESS
 	fi
 
-	if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
+	if ! f_eval_catch -dk err $funcname umount \
+		'umount -f "%s"' "$MOUNPOINT"
+	then
 		err="${err#umount: }"; err="${err#*: }"
 		f_show_msg "$msg_could_not_unmount_the_cdrom_dvd" \
 		           "$MOUNTPOINT" "$err"
 	else
 		CDROM_MOUNTED=
 	fi
-
-	f_media_eject_cdrom "$dev"
 }
 
 # f_media_eject_cdrom $device
@@ -194,11 +194,14 @@ f_media_shutdown_cdrom()
 #
 f_media_eject_cdrom()
 {
+	local funcname=f_media_eject_cdrom
 	local dev="$1" devname err
 	device_$dev get name devname || return $SUCCESS
 	case "$devname" in /dev/iso9660/*) return $SUCCESS; esac
 	f_dprintf "Ejecting CDROM/DVD at %s" "$devname"
-	if ! err=$( cdcontrol -f "$devname" eject 2>&1 ); then
+	if ! f_eval_catch -dk err $funcname cdcontrol \
+		'cdcontrol -f "%s" eject' "$devname"
+	then
 		f_dprintf "Could not eject the CDROM/DVD from %s: %s" \
 		          "$devname" "${err#cdcontrol: }"
 	fi
diff --git a/usr.sbin/bsdconfig/share/media/common.subr b/usr.sbin/bsdconfig/share/media/common.subr
index 495aca73ea4..aac2cdd27df 100644
--- a/usr.sbin/bsdconfig/share/media/common.subr
+++ b/usr.sbin/bsdconfig/share/media/common.subr
@@ -99,6 +99,7 @@ f_media_verify()
 # 
 f_media_generic_get()
 {
+	local funcname=f_media_generic_get
 	local base="$1" file="$2" probe_type="$3"
 
 	local fname=f_media_generic_get
@@ -117,17 +118,14 @@ f_media_generic_get()
 			f_dprintf "%s: file exists path=[%s]" $fname "$path"
 			if [ "$probe_type" = "$PROBE_SIZE" ]; then
 				local size
-				if ! size=$( stat -f %z "$path" 2>&1 ); then
-					f_dprintf "stat: %s" "$size"
-					echo "-1"
-				else
-					f_isinteger "$size" || size=-1
-					echo $size
-				fi
+				f_eval_catch -dk size $funcname stat \
+					'stat -f %%z "%s"' "$path" || size=-1
+				f_isinteger "$size" || size=-1
+				echo $size
 			fi
 			[ "$probe_type" ] && return $SUCCESS
 			cat "$path"
-			return
+			return $?
 		fi
 	done
 
@@ -136,13 +134,10 @@ f_media_generic_get()
 		f_dprintf "%s: file exists path=[%s]" $fname "$path"
 		if [ "$probe_type" = "$PROBE_SIZE" ]; then
 			local size
-			if ! size=$( stat -f %z "$path" 2>&1 ); then
-				f_dprintf "stat: %s" "$size"
-				echo "-1"
-			else
-				f_isinteger "$size" || size=-1
-				echo $size
-			fi
+			f_eval_catch -dk size $funcname stat \
+				'stat -f %%z "%s"' "$path" || size=-1
+			f_isinteger "$size" || size=-1
+			echo $size
 		fi
 		[ "$probe_type" ] && return $SUCCESS
 	elif [ "$probe_type" ]; then
diff --git a/usr.sbin/bsdconfig/share/media/dos.subr b/usr.sbin/bsdconfig/share/media/dos.subr
index 440c5c949e3..e8e6aa6f71b 100644
--- a/usr.sbin/bsdconfig/share/media/dos.subr
+++ b/usr.sbin/bsdconfig/share/media/dos.subr
@@ -56,7 +56,7 @@ f_media_set_dos()
 
 	local devs ndevs
 	f_device_find "" $DEVICE_TYPE_DOS devs
-	ndevs=$( set -- $devs; echo $# )
+	f_count ndevs $devs
 
 	if [ ${ndevs:=0} -eq 0 ]; then
 		f_show_msg "$msg_no_dos_primary_partitions_found"
@@ -93,6 +93,7 @@ f_media_set_dos()
 #
 f_media_init_dos()
 {
+	local funcname=f_media_init_dos
 	local dev="$1" devname err
 
 	device_$dev get devname devname || return $FAILURE
@@ -104,14 +105,13 @@ f_media_init_dos()
 		return $SUCCESS
 	fi
 
-	if [ ! -e "$MOUNTPOINT" ] &&
-	   ! err=$( mkdir -p "$MOUNTPOINT" 2>&1 )
-	then
-		f_dialog_msgbox "$err"
-		return $FAILURE
+	if [ ! -e "$MOUNTPOINT" ]; then
+		f_eval_catch $funcname mkdir 'mkdir -p "%s"' "$MOUNTPOINT" ||
+			return $FAILURE
 	fi
 
-	if ! err=$( mount_msdosfs "$devname" "$MOUNTPOINT" 2>&1 )
+	if ! f_eval_catch -dk err $funcname mount_msdosfs \
+		'mount_msdosfs "%s" "%s"' "$devname" "$MOUNTPOINT"
 	then
 		err="${err#mount_msdosfs: }"; err="${err#$devname: }"
 		f_show_msg "$msg_error_mounting_device" \
@@ -146,11 +146,14 @@ f_media_get_dos()
 #
 f_media_shutdown_dos()
 {
+	local funcname=f_media_shutdown_dos
 	local dev="$1" err
 
-	[ "$DOS_MOUNTED" ] || return
+	[ "$DOS_MOUNTED" ] || return $FAILURE
 
-	if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
+	if ! f_eval_catch -dk err $funcname umount \
+		'umount -f "%s"' "$MOUNTPOINT"
+	then
 		err="${err#umount: }"; err="${err#*: }"
 		f_show_msg "$msg_could_not_unmount_the_dos_partition" \
 		           "$MOUNTPOINT" "$err"
diff --git a/usr.sbin/bsdconfig/share/media/floppy.subr b/usr.sbin/bsdconfig/share/media/floppy.subr
index eb6bc5e5198..e0e2df4fd93 100644
--- a/usr.sbin/bsdconfig/share/media/floppy.subr
+++ b/usr.sbin/bsdconfig/share/media/floppy.subr
@@ -57,7 +57,7 @@ f_media_set_floppy()
 
 	local devs ndevs
 	f_device_find "" $DEVICE_TYPE_FLOPPY devs
-	ndevs=$( set -- $devs; echo $# )
+	f_count ndevs $devs
 
 	if [ ${ndevs:=0} -eq 0 ]; then
 		f_interactive && f_show_msg "$msg_no_floppy_devices_found"
@@ -98,6 +98,7 @@ f_media_set_floppy()
 #
 f_media_init_floppy()
 {
+	local funcname=f_media_init_floppy
 	local dev="$1" devname err
 
 	device_$dev get devname devname || return $FAILURE
@@ -129,8 +130,11 @@ f_media_init_floppy()
 	fi
 
 	if ! {
-	    f_quietly mount_msdosfs -o ro -m 0777 -u 0 -g 0 "$devname" "$mp" ||
-	    err=$( mount -o ro "$devname" "$mp" 2>&1 )
+	    f_eval_catch -dk err $funcname mount_msdosfs \
+		'mount_msdosfs -o ro -m 0777 -u 0 -g 0 "%s" "%s"' \
+		"$devname" "$mp" ||
+	    f_eval_catch -dk err $funcname mount \
+		'mount -o ro "%s" "%s"' "$devname" "$mp"
 	}; then
 		err="${err#mount: }"; err="${err#*: }"
 		local name
@@ -153,6 +157,7 @@ f_media_init_floppy()
 #
 f_media_get_floppy()
 {
+	local funcname=f_media_get_floppy
 	local dev="$1" file="$2" probe_type="$3"
 
 	f_dprintf "f_media_get_floppy: dev=[%s] file=[%s] probe_type=%s" \
@@ -188,7 +193,7 @@ f_media_get_floppy()
 	#
 	if [ "$probe_type" = "$PROBE_SIZE" ]; then
 		local size
-		size=$( stat -f %z "$fp" 2>&1 ) || f_dprintf "stat: %s" "$size"
+		f_eval_catch -dk size $funcname stat 'stat -f %%z "%s"' "$fp"
 		f_isinteger "$size" || size=-1
 		echo "$size"
 	fi
@@ -203,15 +208,15 @@ f_media_get_floppy()
 #
 f_media_shutdown_floppy()
 {
+	local funcname=f_media_shutdown_floppy
 	local dev="$1" err mp
 
-	[ "$FLOPPY_MOUNTED" ] || return
+	[ "$FLOPPY_MOUNTED" ] || return $FAILURE
 
 	device_$dev get private mp
-	if ! err=$( umount -f "${mp:=$MOUNTPOINT}" 2>&1 ); then
-		err="${err#umount: }"; err="${err#*:}"
-		f_dprintf "Umount of floppy on %s failed: %s" "$mp" "$err"
-	else
+	if f_eval_catch -d $funcname umount \
+		'umount -f "%s"' "${mp:=$MOUNTPOINT}"
+	then
 		FLOPPY_MOUNTED=
 		if f_interactive && [ "$_systemState" != "fixit" ]; then
 			local desc
diff --git a/usr.sbin/bsdconfig/share/media/ftp.subr b/usr.sbin/bsdconfig/share/media/ftp.subr
index 5aad8ee4b2c..7f5256a3034 100644
--- a/usr.sbin/bsdconfig/share/media/ftp.subr
+++ b/usr.sbin/bsdconfig/share/media/ftp.subr
@@ -213,7 +213,7 @@ f_dialog_menu_media_ftp()
 		$height $width $rows            \
 		$menu_list                      \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	) || return $FAILURE
+	) || return $DIALOG_CANCEL
 	f_dialog_data_sanitize mtag
 
 	case "$mtag" in
@@ -224,7 +224,7 @@ f_dialog_menu_media_ftp()
 		setvar $VAR_FTP_PATH "ftp://$value"
 	esac
 	
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_media_set_ftp
@@ -740,7 +740,7 @@ f_media_init_ftp()
 			else
 				f_yesno "$msg_cant_find_distribution" \
 				        "$rel" "$ftp_host"
-				if [ $? -eq $SUCCESS ]; then
+				if [ $? -eq $DIALOG_OK ]; then
 					unset $VAR_FTP_PATH
 					f_media_set_ftp && continue
 				fi
@@ -794,6 +794,7 @@ f_media_init_ftp()
 #
 f_media_get_ftp()
 {
+	local funcname=f_media_get_ftp
 	local dev="$1" file="$2" probe_type="$3" hosts=
 
 	f_dprintf "f_media_get_ftp: dev=[%s] file=[%s] probe_type=%s" \
@@ -870,9 +871,10 @@ f_media_get_ftp()
 	if [ "$probe_type" ]; then
 		local url="ftp://$userpass$host$port/$dir/$file" size
 		[ "$use_anon" ] && url="ftp://$host$port/$dir/$file"
-		if ! size=$( fetch -s "$url" 2>&1 ) || ! f_isinteger "$size"
+		if ! f_eval_catch -dk size $funcname fetch \
+			'fetch -s "%s"' "$url" || ! f_isinteger "$size"
 		then
-			f_dprintf "request failed! size response=[%s]" "$size"
+			f_dprintf "size request failed!"
 			[ "$probe_type" = "$PROBE_SIZE" ] && echo "-1"
 			return $FAILURE
 		fi
diff --git a/usr.sbin/bsdconfig/share/media/http.subr b/usr.sbin/bsdconfig/share/media/http.subr
index 984d7712a14..23c146ccb04 100644
--- a/usr.sbin/bsdconfig/share/media/http.subr
+++ b/usr.sbin/bsdconfig/share/media/http.subr
@@ -77,7 +77,8 @@ f_dialog_menu_media_http()
 	f_dialog_title_restore
 	local prompt="$msg_please_select_the_site_closest_to_you_or_other"
 	local menu_list="
-		'$msg_main_site'      'ftp.freebsd.org'
+		'dist $msg_main_site' 'ftp.freebsd.org'
+		'pkg $msg_main_site'  'pkg.freebsd.org'
 		'URL'                 '$msg_specify_some_other_http_site'
 	" # END-QUOTE
 	local hline="$msg_select_a_site_thats_close"
@@ -101,7 +102,7 @@ f_dialog_menu_media_http()
 		$height $width $rows            \
 		$menu_list                      \
 		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
-	) || return $FAILURE
+	) || return $DIALOG_CANCEL
 	f_dialog_data_sanitize mtag
 
 	case "$mtag" in
@@ -112,7 +113,7 @@ f_dialog_menu_media_http()
 		setvar $VAR_HTTP_PATH "http://$value"
 	esac
 	
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_media_set_http
@@ -452,6 +453,11 @@ f_media_init_http()
 	local dev="$1"
 	f_dprintf "Init routine called for HTTP device. dev=[%s]" "$dev"
 
+	if [ "$HTTP_INITIALIZED" ]; then
+		f_dprintf "HTTP device already initialized."
+		return $SUCCESS
+	fi
+
 	#
 	# First verify access
 	#
@@ -481,7 +487,7 @@ f_media_init_http()
 
 		case "$rel" in
 		__RELEASE|any)
-			setvar $VAR_HTTP_PATH "$VAR_HTTP_DIR"
+			f_getvar $VAR_HTTP_DIR $VAR_HTTP_PATH
 			f_http_check_access
 			http_found=$?
 			;;
@@ -493,22 +499,31 @@ f_media_init_http()
 			#
 			local fdir hp
 			f_getvar $VAR_HTTP_PATH%/ hp
-			for fdir in $HTTP_DIRS; do
-				setvar $VAR_HTTP_PATH "$hp/$fdir/$rel"
-				if f_http_check_access; then
-					http_found=$SUCCESS
-					break
-				fi
-			done
+			setvar $VAR_HTTP_PATH "$hp/$PKG_ABI/latest"
+			if [ "$PKG_ABI" ] && f_http_check_access; then
+				http_found=$SUCCESS
+				setvar $VAR_HTTP_PATH "$hp"
+			else
+				for fdir in $HTTP_DIRS; do
+					setvar $VAR_HTTP_PATH "$hp/$fdir/$rel"
+					if f_http_check_access; then
+						http_found=$SUCCESS
+						break
+					fi
+				done
+			fi
 		esac
 
-		[ $http_found -eq $SUCCESS ] && break
+		if [ $http_found -eq $SUCCESS ]; then
+			HTTP_INITIALIZED=YES
+			break
+		fi
 
 		f_getvar $VAR_HTTP_PATH http_path
 		f_show_msg "$msg_please_check_the_url_and_try_again" \
 		           "$http_path"
 
-		unset $VAR_HTTP_PATH
+		unset HTTP_INITIALIZED $VAR_HTTP_PATH
 		f_media_set_http || break
 	done
 
@@ -558,6 +573,11 @@ f_media_get_http()
 	f_getvar $VAR_HTTP_HOST http_host
 	f_getvar $VAR_HTTP_PORT http_port
 
+	if [ ! "$HTTP_INITIALIZED" ]; then
+		f_dprintf "No HTTP connection open, can't get file %s" "$file"
+		return $FAILURE
+	fi
+
 	if ! {
 		f_validate_ipaddr "$http_host" ||
 		f_validate_ipaddr6 "$http_host" ||
@@ -595,6 +615,7 @@ f_media_get_http()
 
 	local url="$http_path/$file" rx
 	f_dprintf "sending http request for: %s" "$url"
+	f_dprintf "using nc to connect to: %s:%s" "$host" "$http_port"
 	printf "GET %s HTTP/1.0\r\n\r\n" "$url" | nc -n "$host" "$http_port" |
 	(
 		#
@@ -648,6 +669,18 @@ f_media_get_http()
 	return $FAILURE
 }
 
+# f_media_shutdown_http $device
+#
+# Shuts down the HTTP device. Return status should be ignored. Note that since
+# we don't maintain an open connection to the HTTP server, nothing to do.
+#
+f_media_shutdown_http()
+{
+	[ "$HTTP_INITIALIZED" ] || return $SUCCESS
+
+	unset HTTP_INITIALIZED
+}
+
 ############################################################ MAIN
 
 f_dprintf "%s: Successfully loaded." media/http.subr
diff --git a/usr.sbin/bsdconfig/share/media/nfs.subr b/usr.sbin/bsdconfig/share/media/nfs.subr
index 9ce0467df45..33b37c8c513 100644
--- a/usr.sbin/bsdconfig/share/media/nfs.subr
+++ b/usr.sbin/bsdconfig/share/media/nfs.subr
@@ -154,6 +154,7 @@ f_media_set_nfs()
 #
 f_media_init_nfs()
 {
+	local funcname=f_media_init_nfs
 	local dev="$1" name err
 
 	device_$dev get name name || return $FAILURE
@@ -170,11 +171,9 @@ f_media_init_nfs()
 		return $FAILURE
 	fi
 
-	if [ ! -e "$MOUNTPOINT" ] &&
-	   ! err=$( mkdir -p "$MOUNTPOINT" 2>&1 )
-	then
-		f_dialog_msgbox "$err"
-		return $FAILURE
+	if [ ! -e "$MOUNTPOINT" ]; then
+		f_eval_catch $funcname mkdir 'mkdir -p "%s"' "$MOUNTPOINT" ||
+			return $FAILURE
 	fi
 
 	local cp tcp="" use3="" secure="" readsize=4096 writesize=4096
@@ -191,8 +190,9 @@ f_media_init_nfs()
 	[ "$use3" ] && options="$options,nfsv3"
 	[ "$tcp" ] && options="$options,tcp"
 
-	if ! err=$( mount_nfs \
-		${secure:+-P} -o "$options" "$name" "$MOUNTPOINT" 2>&1 )
+	if ! f_eval_catch -dk err $funcname mount_nfs \
+		'mount_nfs %s -o "%s" "%s" "%s"' \
+		"${secure:+-P}" "$options" "$name" "$MOUNTPOINT"
 	then
 		err="${err#mount_nfs: }"
 		f_show_msg "$msg_error_mounting_device" \
@@ -231,12 +231,15 @@ f_media_get_nfs()
 #
 f_media_shutdown_nfs()
 {
+	local funcname=f_media_shutdown_nfs
 	local dev="$1" err
 
-	[ "$NFS_MOUNTED" ] || return
+	[ "$NFS_MOUNTED" ] || return $FAILURE
 
 	f_dprintf "Unmounting NFS partition on %s" "$MOUNTPOINT"
-	if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
+	if ! f_eval_catch -dk err $funcname umount \
+		'umount -f "%s"' "$MOUNTPOINT"
+	then
 		err="${err#umount: }"; err="${err#*: }"
 		f_show_msg "$msg_could_not_unmount_the_nfs_partition" \
 		           "$MOUNTPOINT" "$err"
diff --git a/usr.sbin/bsdconfig/share/media/options.subr b/usr.sbin/bsdconfig/share/media/options.subr
index 3f71a96a81f..bc9568e6510 100644
--- a/usr.sbin/bsdconfig/share/media/options.subr
+++ b/usr.sbin/bsdconfig/share/media/options.subr
@@ -224,11 +224,10 @@ f_media_options_menu()
 		defaultitem="$mtag"
 		f_dprintf "retval=%s mtag=[%s]" $retval "$mtag"
 
-		if [ $retval -eq 2 ]; then
-			# The Help button was pressed
+		if [ $retval -eq $DIALOG_HELP ]; then
 			f_show_help "$OPTIONS_HELPFILE"
 			continue
-		elif [ $retval -ne 0 ]; then
+		elif [ $retval -ne $DIALOG_OK ]; then
 			break # to success
 		fi
 
diff --git a/usr.sbin/bsdconfig/share/media/tcpip.subr b/usr.sbin/bsdconfig/share/media/tcpip.subr
index 6b4791edcaa..ea7350d80e5 100644
--- a/usr.sbin/bsdconfig/share/media/tcpip.subr
+++ b/usr.sbin/bsdconfig/share/media/tcpip.subr
@@ -33,6 +33,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 f_dprintf "%s: loading includes..." media/tcpip.subr
 f_include $BSDCFG_SHARE/device.subr
 f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/struct.subr
 f_include $BSDCFG_SHARE/variable.subr
 
@@ -110,10 +111,11 @@ f_struct_define DHCP_LEASE \
 # 	   	begin or end with a hyphen).
 # 	  3	One or more individual labels within the hostname are null.
 #
-# f_dialog_validate_hostname $hostname
+# To call this function and display an appropriate error message to the user
+# based on the above error codes, use the following function defined in
+# dialog.subr:
 #
-# If the hostname is determined to be invalid, the appropriate error will be
-# displayed using the f_show_msg function.
+# 	f_dialog_validate_hostname $hostname
 #
 f_validate_hostname()
 {
@@ -167,8 +169,9 @@ f_inet_atoi()
 {
 	local __addr="$1" __var_to_set="$2" __num=0
 	if f_validate_ipaddr "$__addr"; then
-		__num=$( IFS=.;  set -- $__addr; \
-			echo $(( ($1 << 24) + ($2 << 16) + ($3 << 8) + $4 )) )
+		IFS=.
+		set -- $__addr
+		__num=$(( ($1 << 24) + ($2 << 16) + ($3 << 8) + $4 ))
 	fi
 	if [ "$__var_to_set" ]; then
 		setvar "$__var_to_set" $__num
@@ -471,10 +474,10 @@ f_dialog_validate_tcpip()
 	     ! f_validate_gateway "$gateway" "$ipaddr" "$netmask"; then
 		f_show_msg "$msg_invalid_gateway_ipv4_address_specified"
 	else
-		return $SUCCESS
+		return $DIALOG_OK
 	fi
 
-	return $FAILURE
+	return $DIALOG_CANCEL
 }
 
 # f_ifconfig_inet $interface [$var_to_set]
@@ -573,7 +576,7 @@ f_ifconfig_netmask()
 
 	local __octet __netmask=
 	for __octet in $__octets; do
-		__netmask="$__netmask.$( printf "%u" "0x$__octet" )"
+		f_sprintf __netmask "%s.%u" "$__netmask" "0x$__octet"
 	done
 	__netmask="${__netmask#.}"
 	if [ "$__var_to_set" ]; then
@@ -1020,10 +1023,42 @@ f_host_lookup()
 	# Fall back to host(1) -- which is further governed by nsswitch.conf(5)
 	#
 
-	local __output __ip6 __addrs="" __wait=""
-	f_getvar $VAR_MEDIA_TIMEOUT __wait
-	[ "$__wait" ] && __wait="-W $(( $__wait / 2 ))"
+	local __output __ip6 __addrs=
 	f_getvar $VAR_IPV6_ENABLE __ip6
+
+	# If we have a TCP media type configured, check for an SRV record
+	local __srvtypes=
+	{ f_quietly f_getvar $VAR_HTTP_PATH ||
+	  f_quietly f_getvar $VAR_HTTP_PROXY_PATH
+	} && __srvtypes="$__srvtypes _http._tcp"
+	f_quietly f_getvar $VAR_FTP_PATH && __srvtypes="$__srvtypes _ftp._tcp"
+	f_quietly f_getvar $VAR_NFS_PATH &&
+		__srvtypes="$__srvtypes _nfs._tcp _nfs._udp"
+
+	# Calculate wait time as dividend of total time and host(1) invocations
+	local __host_runs __wait
+	f_count __host_runs $__srvtypes
+	if [ "$__ip6" = "YES" ]; then
+		__host_runs=$(( $__host_runs + 2 ))
+	else
+		__host_runs=$(( $__host_runs + 1 ))
+	fi
+	f_getvar $VAR_MEDIA_TIMEOUT __wait
+	[ "$__wait" ] && __wait="-W $(( $__wait / $__host_runs ))"
+
+	# Query SRV types first (1st host response taken as new host to query)
+	for __type in $__srvtypes; do
+		if __output=$(
+			host -t SRV $__wait -- "$__type.$__host" \
+			2> /dev/null
+		); then
+			__host=$( echo "$__output" |
+					awk '/ SRV /{print $NF;exit}' )
+			break
+		fi
+	done
+
+	# Try IPv6 first (if enabled)
 	if [ "$__ip6" = "YES" ]; then
 		if ! __output=$( host -t AAAA $__wait -- "$__host" 2>&1 ); then
 			# An error occurred, display in-full and return error
@@ -1031,13 +1066,17 @@ f_host_lookup()
 				setvar "$__var_to_set" "$__output"
 			return $FAILURE
 		fi
+		# Add the IPv6 addresses and fall-through to collect IPv4 too
 		__addrs=$( echo "$__output" | awk '/ address /{print $NF}' )
 	fi
+
+	# Good ol' IPv4
 	if ! __output=$( host -t A $__wait -- "$__host" 2>&1 ); then
 		# An error occurred, display it in-full and return error
 		[ "$__var_to_set" ] && setvar "$__var_to_set" "$__output"
 		return $FAILURE
 	fi
+
 	__addrs="$__addrs${__addrs:+ }$(
 		echo "$__output" | awk '/ address /{print $NF}' )"
 	if [ "$__var_to_set" ]; then
@@ -1102,7 +1141,7 @@ f_device_dialog_tcp()
 	local use_dhcp="" use_rtsol=""
 	local _ipaddr _netmask _extras
 
-	[ "$dev" ] || return $FAILURE
+	[ "$dev" ] || return $DIALOG_CANCEL
 
 	# Initialize vars from previous device values
 	local private
@@ -1125,7 +1164,6 @@ f_device_dialog_tcp()
 			unset $VAR_NONINTERACTIVE
 		fi
 
-
 		#
 		# Try a RTSOL scan if such behavior is desired.
 		# If the variable was configured and is YES, do it.
@@ -1321,7 +1359,7 @@ f_device_dialog_tcp()
 				if [ ! "$cp" ]; then
 					# User either chose "Cancel", pressed
 					# ESC, or blanked every form field
-					return $FAILURE
+					return $DIALOG_CANCEL
 				else
 					n=$( echo "$cp" | f_number_of_lines )
 					[ $n -eq 1 ] && case "$cp" in HELP*)
@@ -1404,14 +1442,12 @@ f_device_dialog_tcp()
 				f_dialog_data_sanitize cp
 				f_dprintf "retval=%u mtag=[%s]" $retval "$cp"
 
-				if [ $retval -eq 2 ]; then
-					# The Help button was pressed
+				if [ $retval -eq $DIALOG_HELP ]; then
 					f_show_help "$TCP_HELPFILE"
 					continue
-				elif [ $retval -ne 0 ]; then
-					# User chose "Cancel" or pressed ESC
+				elif [ $retval -ne $DIALOG_OK ]; then
 					f_dialog_title_restore
-					return $FAILURE
+					return $DIALOG_CANCEL
 				fi
 
 				case "$cp" in
@@ -1490,7 +1526,7 @@ f_device_dialog_tcp()
 	[ "$use_dhcp" ] ||
 		f_config_resolv # XXX this will do it on the MFS copy
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_device_scan_tcp [$var_to_set]
@@ -1581,25 +1617,25 @@ f_device_select_tcp()
 			esac
 
 			f_device_find "$dev" $DEVICE_TYPE_NETWORK devs
-			cnt=$( set -- $devs; echo $# )
+			f_count cnt $devs
 
 			if [ ${cnt:=0} -gt 0 ]; then
 				dev="${devs%%[$IFS]*}"
 				f_device_dialog_tcp $dev
-				if [ $? -eq $SUCCESS ]; then
+				if [ $? -eq $DIALOG_OK ]; then
 					setvar $VAR_NETWORK_DEVICE $dev
-					return $SUCCESS
+					return $DIALOG_OK
 				fi
 			fi
 		done
 
 		f_interactive && f_show_msg "$msg_no_network_devices"
-		return $FAILURE
+		return $DIALOG_CANCEL
 
 	fi # $network_dev
 
 	f_device_find "" $DEVICE_TYPE_NETWORK devs
-	cnt=$( set -- $devs; echo $# )
+	f_count cnt $devs
 	dev="${devs%%[$IFS]*}"
 
 	f_quietly f_getvar NETWORK_CONFIGURED # for debugging info
@@ -1610,18 +1646,18 @@ f_device_select_tcp()
 		if f_dialog_yesno "$msg_assume_network_is_already_configured"
 		then
 			setvar $VAR_NETWORK_DEVICE $dev
-			return $SUCCESS
+			return $DIALOG_OK
 		fi
 	fi
 
 	local retval=$SUCCESS
 	if [ ${cnt:=0} -eq 0 ]; then
 		f_show_msg "$msg_no_network_devices"
-		retval=$FAILURE
+		retval=$DIALOG_CANCEL
 	elif [ $cnt -eq 1 ]; then
 		f_device_dialog_tcp $dev
 		retval=$?
-		[ $retval -eq $SUCCESS ] && setvar $VAR_NETWORK_DEVICE $dev
+		[ $retval -eq $DIALOG_OK ] && setvar $VAR_NETWORK_DEVICE $dev
 	else
 		local title="$msg_network_interface_information_required"
 		local prompt="$msg_please_select_ethernet_device_to_configure"
@@ -1632,15 +1668,15 @@ f_device_select_tcp()
 			"$NETWORK_DEVICE_HELPFILE" \
 			2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD )
 		retval=$?
-		[ "$dev" ] || return $FAILURE
+		[ "$dev" ] || return $DIALOG_CANCEL
 
 		f_device_find "$dev" $DEVICE_TYPE_NETWORK devs
-		[ "$devs" ] || return $FAILURE
+		[ "$devs" ] || return $DIALOG_CANCEL
 		dev="${devs%%[$IFS]*}"
 
 		f_device_dialog_tcp $dev
 		retval=$?
-		if [ $retval -eq $SUCCESS ]; then
+		if [ $retval -eq $DIALOG_OK ]; then
 			f_struct_copy device_$dev device_network
 			setvar $VAR_NETWORK_DEVICE network
 		else
@@ -1675,7 +1711,7 @@ f_dialog_menu_select_tcp()
 			           "$name"
 		fi
 	fi
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/share/media/ufs.subr b/usr.sbin/bsdconfig/share/media/ufs.subr
index cc634757e80..a16b53db7fd 100644
--- a/usr.sbin/bsdconfig/share/media/ufs.subr
+++ b/usr.sbin/bsdconfig/share/media/ufs.subr
@@ -67,7 +67,7 @@ f_media_set_ufs()
 
 	local devs ndevs
 	f_device_find "" $DEVICE_TYPE_UFS devs
-	ndevs=$( set -- $devs; echo $# )
+	f_count ndevs $devs
 
 	if [ ${ndevs:=0} -eq 0 ]; then
 		f_variable_get_value $VAR_UFS_PATH \
@@ -117,6 +117,7 @@ f_media_set_ufs()
 #
 f_media_init_ufs()
 {
+	local funcname=f_media_init_ufs
 	local dev="$1" devname err
 
 	device_$dev get devname devname || return $FAILURE
@@ -134,14 +135,13 @@ f_media_init_ufs()
 		return $FAILURE
 	fi
 
-	if [ ! -e "$MOUNTPOINT" ] &&
-	   ! err=$( mkdir -p "$MOUNTPOINT" 2>&1 )
-	then
-		f_dialog_msgbox "$err"
-		return $FAILURE
+	if [ ! -e "$MOUNTPOINT" ]; then
+		f_eval_catch $funcname mkdir 'mkdir -p "%s"' "$MOUNTPOINT" ||
+			return $FAILURE
 	fi
 
-	if ! err=$( mount "$devname" "$MOUNTPOINT" 2>&1 )
+	if ! f_eval_catch -dk err $funcname mount \
+		'mount "%s" "%s"' "$devname" "$MOUNTPOINT"
 	then
 		err="${err#mount: }"; err="${err#$devname : }"
 		f_show_msg "$msg_error_mounting_device" \
@@ -175,11 +175,14 @@ f_media_get_ufs()
 #
 f_media_shutdown_ufs()
 {
+	local funcname=f_media_shutdown_ufs
 	local dev="$1" err
 
-	[ "$UFS_MOUNTED" ] || return
+	[ "$UFS_MOUNTED" ] || return $FAILURE
 
-	if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
+	if ! f_eval_catch -dk err $funcname umount \
+		'umount -f "%s"' "$MOUNTPOINT"
+	then
 		err="${err#umount: }"; err="${err#*: }"
 		f_show_msg "$msg_could_not_unmount_the_ufs_partition" \
 		           "$MOUNTPOINT" "$err"
diff --git a/usr.sbin/bsdconfig/share/media/usb.subr b/usr.sbin/bsdconfig/share/media/usb.subr
index e345ae0a874..39384fa3cac 100644
--- a/usr.sbin/bsdconfig/share/media/usb.subr
+++ b/usr.sbin/bsdconfig/share/media/usb.subr
@@ -57,7 +57,7 @@ f_media_set_usb()
 
 	local devs ndevs
 	f_device_find "" $DEVICE_TYPE_USB devs
-	ndevs=$( set -- $devs; echo $# )
+	f_count ndevs $devs
 
 	if [ ${ndevs:=0} -eq 0 ]; then
 		f_show_msg "$msg_no_usb_devices_found"
@@ -103,6 +103,7 @@ f_media_set_usb()
 #
 f_media_init_usb()
 {
+	local funcname=f_media_init_usb
 	local dev="$1" devname err
 
 	device_$dev get devname devname || return $FAILURE
@@ -114,14 +115,14 @@ f_media_init_usb()
 		return $SUCCESS
 	fi
 
-	if [ ! -e "$MOUNTPOINT" ] &&
-	   ! err=$( mkdir -p "$MOUNTPOINT" 2>&1 )
-	then
-		f_dialog_msgbox "$err"
-		return $FAILURE
+	if [ ! -e "$MOUNTPOINT" ]; then
+		f_eval_catch $funcname mkdir 'mkdir -p "%s"' "$MOUNTPOINT" ||
+			return $FAILURE
 	fi
 
-	if err=$( mount "$devname" "$MOUNTPOINT" 2>&1 ); then
+	if f_eval_catch -dk err $funcname mount \
+		'mount "%s" "%s"' "$devname" "$MOUNTPOINT"
+	then
 		USB_MOUNTED=1
 		return $SUCCESS
 	fi
@@ -156,11 +157,14 @@ f_media_get_usb()
 #
 f_media_shutdown_usb()
 {
+	local funcname=f_media_shutdown_usb
 	local dev="$1" err
 
-	[ "$USB_MOUNTED" ] || return
+	[ "$USB_MOUNTED" ] || return $FAILURE
 
-	if ! err=$( umount -f "$MOUNTPOINT" 2>&1 ); then
+	if ! f_eval_catch -dk err $funcname umount \
+		'umount -f "%s"' "$MOUNTPOINT"
+	then
 		err="${err#umount: }"; err="${err#*: }"
 		f_show_msg "$msg_could_not_unmount_the_ufs_partition" \
 		           "$MOUNTPOINT" "$err"
diff --git a/usr.sbin/bsdconfig/share/mustberoot.subr b/usr.sbin/bsdconfig/share/mustberoot.subr
index 765487dc457..88ff81868d4 100644
--- a/usr.sbin/bsdconfig/share/mustberoot.subr
+++ b/usr.sbin/bsdconfig/share/mustberoot.subr
@@ -32,6 +32,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 f_dprintf "%s: loading includes..." mustberoot.subr
 f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/strings.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig"
 f_include_lang $BSDCFG_LIBE/include/messages.subr
@@ -77,6 +78,7 @@ SECURE_DIVULGE_UNKNOWN_USER=
 #
 f_become_root_via_sudo()
 {
+	local funcname=f_become_root_via_sudo
 	local prompt hline height width rows msg
 
 	[ "$( id -u )" = "0" ] && return $SUCCESS
@@ -90,8 +92,8 @@ f_become_root_via_sudo()
 	#
 	local checkpath="${HOME%/}/.bsdconfig_uses_sudo"
 	if [ ! -e "$checkpath" ]; then
-		prompt=$( printf "$msg_you_are_not_root_but" bsdconfig )
-		msg=$( printf "$msg_always_try_sudo_when_run_as" "$USER" )
+		f_sprintf prompt "$msg_you_are_not_root_but" bsdconfig
+		f_sprintf msg "$msg_always_try_sudo_when_run_as" "$USER"
 		local menu_list="
 			'X' '$msg_cancel_exit'
 			'1' '$msg'
@@ -124,12 +126,9 @@ f_become_root_via_sudo()
 		X) # Cancel/Exit
 		   f_die ;;
 		1) # Always try sudo(8) when run as $user
-			local err
-			if ! err=$( touch "$checkpath" 2>&1 ); then
-				f_dialog_msgbox "$err"
-			else
+			f_eval_catch $funcname touch \
+				'touch "%s"' "$checkpath" &&
 				f_show_msg "$msg_created_path" "$checkpath"
-			fi
 		esac
 	else
 		#
@@ -176,9 +175,9 @@ f_become_root_via_sudo()
 				retval=$?
 
 				# Catch X11-related errors
-				if [ $retval -eq 255 ]; then
+				if [ $retval -eq $DIALOG_ESC ]; then
 					f_die $retval "$password"
-				elif [ $retval -ne 0 ]; then
+				elif [ $retval -ne $DIALOG_OK ]; then
 					# User cancelled
 					exit $retval
 				fi
@@ -225,7 +224,7 @@ f_become_root_via_sudo()
 		# the security event and exit immediately.
 		#
 		if [ $nfailures -ge $PASSWD_TRIES ]; then
-			msg=$( printf "$msg_nfailed_attempts" "$nfailures" )
+			f_sprintf msg "$msg_nfailed_attempts" "$nfailures"
 			logger -p auth.notice -t sudo " " \
 				"$USER : $msg" \
 				"; TTY=$(tty)" \
@@ -316,10 +315,10 @@ f_authenticate_some_user()
 		retval=$?
 
 		# Catch X11-related errors
-		[ $retval -eq 255 ] && f_die $retval "$user_pass"
+		[ $retval -eq $DIALOG_ESC ] && f_die $retval "$user_pass"
 
 		# Exit if the user cancelled.
-		[ $retval -eq $SUCCESS ] || exit $retval
+		[ $retval -eq $DIALOG_OK ] || exit $retval
 
 		#
 		# Make sure the user exists and is non-root
@@ -387,7 +386,7 @@ f_authenticate_some_user()
 	# the security event and exit immediately.
 	#
 	if [ $nfailures -ge $PASSWD_TRIES ]; then
-		msg=$( printf "$msg_nfailed_attempts" "$nfailures" )
+		f_sprintf msg "$msg_nfailed_attempts" "$nfailures"
 		logger -p auth.notice -t sudo " " \
 			"${SUDO_USER:-$USER} : $msg" \
 			"; TTY=$(tty)"               \
diff --git a/usr.sbin/bsdconfig/share/packages/categories.subr b/usr.sbin/bsdconfig/share/packages/categories.subr
index dd2fa8f4428..474c41d948e 100755
--- a/usr.sbin/bsdconfig/share/packages/categories.subr
+++ b/usr.sbin/bsdconfig/share/packages/categories.subr
@@ -39,6 +39,7 @@ f_include_lang $BSDCFG_LIBE/include/messages.subr
 ############################################################ GLOBALS
 
 CATEGORIES=
+NCATEGORIES=0
 
 ############################################################ FUNCTIONS
 
@@ -199,8 +200,9 @@ f_category x11-wm        "$msg_x11_wm_desc"
 f_category xfce          "$msg_xfce_desc"
 f_category zope          "$msg_zope_desc"
 
+f_count NCATEGORIES $CATEGORIES
 f_dprintf "%s: Initialized %u package category descriptions." \
-          packages/categories.subr "$( set -- $CATEGORIES; echo $# )"
+          packages/categories.subr $NCATEGORIES
 
 f_dprintf "%s: Successfully loaded." packages/categories.subr
 
diff --git a/usr.sbin/bsdconfig/share/packages/index.subr b/usr.sbin/bsdconfig/share/packages/index.subr
index 863249c2178..5f4f523b626 100755
--- a/usr.sbin/bsdconfig/share/packages/index.subr
+++ b/usr.sbin/bsdconfig/share/packages/index.subr
@@ -43,24 +43,53 @@ f_include_lang $BSDCFG_LIBE/include/messages.subr
 PACKAGE_INDEX=
 _INDEX_INITTED=
 
+#
+# Default path to pkg(8) repo-packagesite.sqlite database
+#
+SQLITE_REPO="/var/db/pkg/repo-packagesite.sqlite"
+
+#
+# Default path to on-disk cache INDEX file
+#
+PACKAGES_INDEX_CACHEFILE="/var/run/bsdconfig/packages_INDEX.cache"
+
+#
+# INDEX format for FreeBSD-6.0 or higher:
+#
+# 	package|port-origin|install-prefix|comment|port-desc-file|maintainer|
+# 	categories|build-deps|run-deps|www-site|reserve|reserve|reserve|disc
+#
+INDEX_FORMAT="%n-%v" # package
+INDEX_FORMAT="$INDEX_FORMAT|/usr/ports/%o"	# port-origin
+INDEX_FORMAT="$INDEX_FORMAT|%p"			# install-prefix
+INDEX_FORMAT="$INDEX_FORMAT|%c"			# comment
+INDEX_FORMAT="$INDEX_FORMAT|/usr/ports/%o/pkg-descr"	# port-desc-file
+INDEX_FORMAT="$INDEX_FORMAT|%m"			# maintainer
+INDEX_FORMAT="$INDEX_FORMAT|@CATEGORIES@"	# place-holder
+INDEX_FORMAT="$INDEX_FORMAT|"			# build-deps
+INDEX_FORMAT="$INDEX_FORMAT|@RUNDEPS@"		# place-holder
+INDEX_FORMAT="$INDEX_FORMAT|%w"			# www-site
+INDEX_FORMAT="$INDEX_FORMAT|"			# reserved
+INDEX_FORMAT="$INDEX_FORMAT|"			# reserved
+INDEX_FORMAT="$INDEX_FORMAT|"			# reserved
+INDEX_FORMAT="$INDEX_FORMAT|"			# disc
+
 ############################################################ FUNCTIONS
 
-# f_index_initialize $path [$var_to_set]
+# f_index_initialize [$var_to_set]
 #
-# Read and initialize the global index. $path is to be relative to the chosen
-# media (not necessarily the filesystem; e.g. FTP) -- this is usually going to
-# be `packages/INDEX'. Returns success unless media cannot be initialized for
-# any reason (e.g. user cancels media selection dialog) or an error occurs. The
-# index is sorted before being loaded into $var_to_set.
+# Read and initialize the global index. Returns success unless media cannot be
+# initialized for any reason (e.g. user cancels media selection dialog or an
+# error occurs). The index is sorted before being loaded into $var_to_set.
 #
 # NOTE: The index is processed with f_index_read() [below] after being loaded.
 #
 f_index_initialize()
 {
-	local __path="$1" __var_to_set="${2:-PACKAGE_INDEX}"
+	local __funcname=f_index_initialize
+	local __var_to_set="${2:-PACKAGE_INDEX}"
 
 	[ "$_INDEX_INITTED" ] && return $SUCCESS
-	[ "$__path" ] || return $FAILURE
 
 	# Got any media?
 	f_media_verify || return $FAILURE
@@ -68,20 +97,174 @@ f_index_initialize()
 	# Does it move when you kick it?
 	f_device_init media || return $FAILURE
 
-	f_show_info "$msg_attempting_to_fetch_file_from_selected_media" \
-	            "$__path"
-	eval "$__var_to_set"='$( f_device_get media "$__path" )'
-	if [ $? -ne $SUCCESS ]; then
-		f_show_msg "$msg_unable_to_get_file_from_selected_media" \
-		           "$__path"
+	f_show_info "$msg_attempting_to_update_repository_catalogue"
+
+	#
+	# Generate $PACKAGESITE variable for pkg(8) based on media type
+	#
+	local __type __data __site
+	device_media get type __type
+	device_media get private __data
+	case "$__type" in
+	$DEVICE_TYPE_DIRECTORY)
+		__site="file://$__data/packages/$PKG_ABI" ;;
+	$DEVICE_TYPE_FLOPPY)
+		__site="file://${__data:-$MOUNTPOINT}/packages/$PKG_ABI" ;;
+	$DEVICE_TYPE_FTP)
+		f_getvar $VAR_FTP_PATH __site
+		__site="$__site/packages/$PKG_ABI" ;;
+	$DEVICE_TYPE_HTTP)
+		f_getvar $VAR_HTTP_PATH __site
+		__site="$__site/$PKG_ABI/latest" ;;
+	$DEVICE_TYPE_HTTP_PROXY)
+		f_getvar $VAR_HTTP_PROXY_PATH __site
+		__site="$__site/packages/$PKG_ABI" ;;
+	*) # UFS, DISK, CDROM, USB, DOS, NFS, etc.
+		__site="file://$MOUNTPOINT/packages/$PKG_ABI"
+	esac
+
+	export PACKAGESITE="$__site"
+	f_dprintf "PACKAGESITE=[%s]" "$PACKAGESITE"
+	if ! f_eval_catch $__funcname pkg "pkg update"; then
+		f_show_err "$msg_unable_to_update_pkg_from_selected_media"
 		f_device_shutdown media
 		return $FAILURE
 	fi
+
+	#
+	# Try to get contents from validated on-disk cache
+	#
+
+	#
+	# Calculate digest used to determine if the on-disk persistant cache
+	# INDEX (containing this digest on the first line) is valid and can be
+	# used to quickly populate the environment.
+	#
+	local __sqlite_digest
+	if ! __sqlite_digest=$( md5 < "$SQLITE_REPO" 2> /dev/null ); then
+		f_show_err "$msg_no_pkg_database_found"
+		f_device_shutdown media
+		return $FAILURE
+	fi
+
+	#
+	# Check to see if the persistant cache INDEX file exists
+	#
+	if [ -f "$PACKAGES_INDEX_CACHEFILE" ]; then
+		#
+		# Attempt to populate the environment with the (soon to be)
+		# validated on-disk cache. If validation fails, fall-back to
+		# generating a fresh cache.
+		#
+		if eval $__var_to_set='$(
+			(	# Get digest as the first word on first line
+				read digest rest_ignored
+
+				#
+				# If the stored digest matches the calculated-
+				# one populate the environment from the on-disk
+				# cache and provide success exit status.
+				#
+				if [ "$digest" = "$__sqlite_digest" ]; then
+					cat
+					exit $SUCCESS
+				else
+					# Otherwise, return the current value
+					eval echo \"\$__var_to_set\"
+					exit $FAILURE
+				fi
+			) < "$PACKAGES_INDEX_CACHEFILE" 2> /dev/null
+		)'; then
+			f_show_info \
+			  "$msg_located_index_now_reading_package_data_from_it"
+			if ! f_index_read "$__var_to_set"; then
+				f_show_err \
+					"$msg_io_or_format_error_on_index_file"
+				return $FAILURE
+			fi
+			_INDEX_INITTED=1
+			return $SUCCESS
+		fi
+		# Otherwise, fall-thru to create a fresh cache from scratch
+	fi
+
+	#
+	# If we reach this point, we need to generate the data from scratch
+	#
+
+	f_show_info "$msg_getting_package_categories_via_pkg_rquery"
+	if ! eval "$( pkg rquery "%n-%v %C" | awk '
+	{ categories[$1] = categories[$1] " " $2 }
+	END {
+		for (package in categories)
+		{
+			cats = categories[package]
+			sub(/^ /, "", cats)
+			gsub(/[^[:alnum:]_]/, "_", package)
+			printf "local _%s_categories=\"%s\";\n", package, cats
+		}
+	}' )"; then
+		f_show_err "$msg_unable_to_pkg_rquery_package_dependencies"
+		f_device_shutdown media
+		return $FAILURE
+	fi
+
+	f_show_info "$msg_getting_package_dependencies_via_pkg_rquery"
+	if ! eval "$( pkg rquery "%n-%v %dn-%dv" | awk '
+	{ rundeps[$1] = rundeps[$1] " " $2 }
+	END {
+		for (package in rundeps)
+		{
+			deps = rundeps[package]
+			sub(/^ /, "", deps)
+			gsub(/[^[:alnum:]_]/, "_", package)
+			printf "local _%s_rundeps=\"%s\";\n", package, deps
+		}
+	}' )"; then
+		f_show_err "$msg_unable_to_pkg_rquery_package_dependencies"
+		f_device_shutdown media
+		return $FAILURE
+	fi
+
+	f_show_info "$msg_generating_index_from_pkg_database"
+	eval "$__var_to_set"='$( pkg rquery "$INDEX_FORMAT" |
+		while read LINE; do
+			package="${LINE%%|*}";
+			f_str2varname "$package" varpkg;
+			eval f_replaceall \"\$LINE\" \"\|@CATEGORIES@\|\" \
+				\"\|\$_${varpkg}_categories\|\" LINE
+			eval f_replaceall \"\$LINE\" \"\|@RUNDEPS@\|\" \
+				\"\|\$_${varpkg}_rundeps\|\" LINE
+			echo "$LINE"
+		done
+	)' # always returns true (status of last item in pipe-chain)
 	eval "$__var_to_set"='$( debug= f_getvar "$__var_to_set" | sort )'
 
+	#
+	# Attempt to create the persistant on-disk cache
+	#
+
+	# Create a new temporary file to write to
+	local __tmpfile
+	if f_eval_catch -dk __tmpfile $__funcname mktemp \
+		'mktemp -t "%s"' "$pgm"
+	then
+		# Write the temporary file contents
+		echo "$__sqlite_digest" > "$__tmpfile"
+		debug= f_getvar "$__var_to_set" >> "$__tmpfile"
+
+		# Finally, move the temporary file into place
+		case "$PACKAGES_INDEX_CACHEFILE" in
+		*/*) f_eval_catch -d $funcname mkdir \
+			'mkdir -p "%s"' "${PACKAGES_INDEX_CACHEFILE%/*}"
+		esac
+		f_eval_catch -d $__funcname mv 'mv -f "%s" "%s"' \
+			"$__tmpfile" "$PACKAGES_INDEX_CACHEFILE"
+	fi
+
 	f_show_info "$msg_located_index_now_reading_package_data_from_it"
 	if ! f_index_read "$__var_to_set"; then
-		f_show_msg "$msg_io_or_format_error_on_index_file" "$__path"
+		f_show_err "$msg_io_or_format_error_on_index_file"
 		return $FAILURE
 	fi
 
diff --git a/usr.sbin/bsdconfig/share/packages/packages.subr b/usr.sbin/bsdconfig/share/packages/packages.subr
index e447b2ed9ae..36c117210a4 100755
--- a/usr.sbin/bsdconfig/share/packages/packages.subr
+++ b/usr.sbin/bsdconfig/share/packages/packages.subr
@@ -53,7 +53,7 @@ f_include_lang $BSDCFG_LIBE/include/messages.subr
 #
 # Package extensions to try
 #
-PACKAGE_EXTENSIONS=".tbz .tbz2 .tgz"
+PACKAGE_EXTENSIONS=".txz .tbz .tbz2 .tgz"
 
 #
 # Variables used to track runtime states
@@ -132,7 +132,7 @@ f_package_select()
 		package="$1"
 		shift 1 # package
 		for pkgsel in $SELECTED_PACKAGES; do
-			[ "$package" = "$pkgsel" ] && return
+			[ "$package" = "$pkgsel" ] && return $SUCCESS
 		done
 		SELECTED_PACKAGES="$SELECTED_PACKAGES $package"
 		f_dprintf "Added %s to selection list" "$package"
@@ -164,24 +164,13 @@ f_package_deselect()
 
 # f_package_detect_installed
 #
-# Detect installed packages. Currently this searches /var/db/pkg for directory
+# Detect installed packages. Currently this uses pkg-query(8) for querying
 # entries and marks each entry as an installed/selected package.
 #
 f_package_detect_installed()
 {
-	local installed package varpkg
-	#
-	# XXX KLUDGE ALERT! This makes evil assumptions about how XXX
-	# packages register themselves and should *really* be done with
-	# `pkg_info -e <name>' except that this is too slow for an
-	# item check routine.. :-(
-	#
-	# NOTE: When transitioning to pkgng, make a single fork to `pkg' to
-	#       produce a list of all installed packages and parse _that_
-	#
-	installed=$( find -s /var/db/pkg -mindepth 1 -maxdepth 1 -type d |
-			sed -e 's:/var/db/pkg/::' )
-	for package in $installed; do
+	local package varpkg
+	for package in $( pkg query "%n-%v" ); do
 		f_str2varname $package varpkg
 		export _mark_$varpkg=X # exported for awk(1) ENVIRON[]
 		f_package_select $package
@@ -312,7 +301,7 @@ f_package_menu_categories()
 		# creates _{varcat}_ninstalled and _{varcat}_nselected
 
 	local category_list
-	debug= f_getvar "$var_to_get" category_list || return $FAILURE
+	debug= f_getvar "$var_to_get" category_list || return $DIALOG_CANCEL
 
 	# Accent the category menu list with ninstalled/nselected
 	eval f_package_accent_category_menu category_list $category_list
@@ -395,7 +384,7 @@ f_package_menu_select()
 	local defaultitem="$3"
 	local hline="$hline_arrows_tab_punc_enter"
 
-	f_isinteger "$page" || return $FAILURE
+	f_isinteger "$page" || return $DIALOG_CANCEL
 
 	local varcat
 	f_str2varname "$category" varcat
@@ -483,8 +472,7 @@ f_package_menu_select()
 	"$msg_all"|"") f_category_desc_get "All" prompt ;;
 	            *) f_category_desc_get "$category" prompt ;;
 	esac
-	prompt="$prompt $( printf "$msg_page_of_npages" \
-	                          "$page" "$npages" )"
+	f_sprintf prompt "%s $msg_page_of_npages" "$prompt" "$page" "$npages"
 
 	local mheight mwidth mrows
 	eval f_dialog_menu${SHOW_DESC:+_with_help}_size mheight mwidth mrows \
@@ -518,7 +506,7 @@ f_package_menu_select()
 	f_dialog_data_sanitize menu_choice
 	f_dialog_menutag_store "$menu_choice"
 
-	if [ $retval -eq $SUCCESS ]; then
+	if [ $retval -eq $DIALOG_OK ]; then
 		local item
 		item=$( eval f_dialog_menutag2item${SHOW_DESC:+_with_help} \
 		             	\"\$menu_choice\" $menu_list )
@@ -547,7 +535,7 @@ f_package_menu_deselect()
 	" # End-Quote
 	local hline="$hline_alnum_arrows_punc_tab_enter"
 
-	prompt=$( printf "$msg_what_would_you_like_to_do_with" "$package" )
+	f_sprintf prompt "$msg_what_would_you_like_to_do_with" "$package"
 
 	local height width rows
 	eval f_dialog_menu_size height width rows \
@@ -582,14 +570,14 @@ f_package_menu_deselect()
 #
 f_package_review()
 {
+	local funcname=f_package_review
 	local prompt # Calculated below
 	local menu_list # Calculated below
 	local hline="$hline_alnum_arrows_punc_tab_enter"
 
-	local fname=f_package_review
-	f_dprintf "%s: SELECTED_PACKAGES=[%s]" $fname "$SELECTED_PACKAGES"
+	f_dprintf "$funcname: SELECTED_PACKAGES=[%s]" "$SELECTED_PACKAGES"
 
-	prompt=$( printf "$msg_reviewing_selected_packages" "$_All_nselected" )
+	f_sprintf prompt "$msg_reviewing_selected_packages" "$_All_nselected"
 
 	local package varpkg mark
 	for package in $SELECTED_PACKAGES; do
@@ -603,7 +591,7 @@ f_package_review()
 	done
 	if [ ! "$menu_list" ]; then
 		f_show_msg "$msg_no_packages_were_selected_for_extraction"
-		return $FAILURE # They might have selected this by accident
+		return $DIALOG_CANCEL # Might have selected this by accident
 	fi
 	menu_list=$( echo "$menu_list" | sort )
 
@@ -639,7 +627,7 @@ f_package_review()
 		f_str2varname "$package" varpkg
 		debug= f_getvar _mark_$varpkg mark
 		[ "$mark" = "I" ] || continue
-		f_dprintf "%s: Installing %s package" $fname "$package"
+		f_dprintf "$funcname: Installing %s package" "$package"
 		f_package_add "$package"
 	done
 	for package in $SELECTED_PACKAGES; do
@@ -647,7 +635,7 @@ f_package_review()
 		f_str2varname "$package" varpkg
 		debug= f_getvar _mark_$varpkg mark
 		[ "$mark" = "R" ] || continue
-		f_dprintf "%s: Reinstalling %s package" $fname "$package"
+		f_dprintf "$funcname: Reinstalling %s package" "$package"
 		f_package_reinstall "$package"
 	done
 	for package in $SELECTED_PACKAGES; do
@@ -655,12 +643,12 @@ f_package_review()
 		f_str2varname "$package" varpkg
 		debug= f_getvar _mark_$varpkg mark
 		[ "$mark" = "U" ] || continue
-		f_dprintf "%s: Uninstalling %s package" $fname "$package"
+		f_dprintf "$funcname: Uninstalling %s package" "$package"
 		f_package_delete "$package" || continue
 		f_package_deselect "$package"
 	done
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_package_config
@@ -693,7 +681,7 @@ f_package_config()
 		f_dprintf "retval=%u mtag=[%s]" $retval "$category"
 		category_defaultitem="$category"
 
-		[ $retval -eq $SUCCESS ] || break
+		[ $retval -eq $DIALOG_OK ] || break
 
 		# Maybe the user chose an action (like `Review')
 		case "$category" in
@@ -729,14 +717,14 @@ f_package_config()
 			# the Cancel button because stdout will be NULL.
 			# Alternatively, Xdialog(1) will terminate with 1
 			# if/when Cancel is chosen on any widget.
-			if [ $retval -eq 255 -o ! "$menu_choice" ]; then
-				# User pressed ESC or chose Cancel
+			if [ $retval -eq $DIALOG_ESC -o ! "$menu_choice" ]
+			then
 				break
-			elif [ $retval -eq 1 ]; then
+			elif [ $retval -eq $DIALOG_CANCEL ]; then
 				# Using X11, Xdialog(1) returned 1 for Cancel
 				f_show_msg "%s" "$menu_choice"
 				break
-			elif [ $retval -ne $SUCCESS ]; then
+			elif [ $retval -ne $DIALOG_OK ]; then
 				# X11-related error occurred using Xdialog(1)
 				f_show_msg "%s" "$menu_choice"
 				break
@@ -954,11 +942,11 @@ f_package_add()
 #
 f_package_extract()
 {
+	local funcname=f_package_extract
 	local device="$1" name="$2" depended="$3"
 
-	local fname=f_package_extract
-	f_dprintf "%s: device=[%s] name=[%s] depended=[%s]" \
-	          $fname "$device" "$name" "$depended"
+	f_dprintf "$funcname: device=[%s] name=[%s] depended=[%s]" \
+	          "$device" "$name" "$depended"
 
 	# Check to make sure it's not already there
 	local varpkg mark=
@@ -982,35 +970,45 @@ f_package_extract()
 	f_getvar $VAR_PKG_TMPDIR:-/var/tmp tmpdir
 	f_quietly mkdir -p -m 1777 "$tmpdir"
 
-	local path
+	local path device_type
+	device_$device get type device_type
 	case "$name" in
 	*/*) path="$name" ;;
 	*)
-		case "$name" in
-		*-*|*_*) path="packages/All/$name" ;;
-		      *) path="packages/Latest/$name"
-		esac
+		if [ "$device_type" = "$DEVICE_TYPE_HTTP" ]; then
+			path="$PKG_ABI/latest/All/$name"
+		else
+			path="packages/$PKG_ABI/All/$name"
+		fi
 	esac
 
-	# We have a path, call the device strategy routine to get the file
+	# We have a path, call the device strategy routine to check the file
 	local pkg_ext found=
 	for pkg_ext in "" $PACKAGE_EXTENSIONS; do
 		if f_device_get $device "$path$pkg_ext" $PROBE_EXIST; then
 			path="$path$pkg_ext"
-			f_dprintf "%s: found path=[%s] dev=[%s]" \
-			          $fname "$path" "$device"
+			found=1
+			break
+		elif [ "$device_type" = "$DEVICE_TYPE_HTTP" ] &&
+		     f_device_get $device \
+			"packages/$PKG_ABI/All/$name$pkg_ext" $PROBE_EXIST
+		then
+			# Mirroring physical media over HTTP
+			path="packages/$PKG_ABI/All/$name$pkg_ext"
 			found=1
 			break
 		fi
 	done
+	[ "$found" ] && f_dprintf "$funcname: found path=[%s] dev=[%s]" \
+	                          "$path" "$device"
 
 	local alert=f_show_msg no_confirm=
 	f_getvar $VAR_NO_CONFIRM no_confirm
 	[ "$no_confirm" ] && alert=f_show_info
 
 	if [ ! "$found" ]; then
-		f_dprintf "%s: No such %s file on %s device" \
-	                  $fname "$path" "$device"
+		f_dprintf "$funcname: No such %s file on %s device" \
+	                  "$path" "$device"
 		$alert "$msg_unable_to_fetch_package_from_selected_media" \
 		       "$name"
 		[ "$no_confirm" ] && sleep 2
@@ -1026,27 +1024,14 @@ f_package_extract()
 		f_show_info "$msg_adding_package_from_media" "$name" "$devname"
 	fi
 
-	# Get package data and pipe into pkg_add(1) while providing feedback
-	{
-		if ! f_device_get $device "$path"; then
-			$alert "$msg_io_error_while_reading_in_the_package" \
-			       "$name" \
-			       >&$DIALOG_TERMINAL_PASSTHRU_FD 2> /dev/null
-			[ "$no_confirm" ] && sleep 2
-		else
-			f_show_info \
-			 "$msg_package_read_successfully_waiting_for_pkg_add" \
-			 "$name" >&$DIALOG_TERMINAL_PASSTHRU_FD 2> /dev/null
-		fi
-	} | {
-		if f_debugging; then
-			/usr/sbin/pkg_add -v -
-		else
-			f_quietly /usr/sbin/pkg_add -
-		fi
-	}
+	# Request the package be added via pkg-install(8)
+	if f_debugging; then
+		f_eval_catch $funcname pkg 'pkg -d install -y "%s"' "$name"
+	else
+		f_eval_catch $funcname pkg 'pkg install -y "%s"' "$name"
+	fi
 	if [ $? -ne $SUCCESS ]; then
-		$alert "$msg_pkg_add_apparently_did_not_like_the_package" \
+		$alert "$msg_pkg_install_apparently_did_not_like_the_package" \
 		       "$name"
 		[ "$no_confirm" ] && sleep 2
 	else
@@ -1063,8 +1048,8 @@ f_package_extract()
 #
 f_package_delete()
 {
+	local funcname=f_package_delete
 	local name="$1"
-	local fname=f_package_delete
 
 	if ! { [ "$name" ] || { f_getvar $VAR_PACKAGE name && [ "$name" ]; }; }
 	then
@@ -1073,7 +1058,7 @@ f_package_delete()
 		return $FAILURE
 	fi
 
-	f_dprintf "%s: name=[%s]" $fname "$name"
+	f_dprintf "$funcname: name=[%s]" "$name"
 
 	[ "$name" ] || return $FAILURE
 
@@ -1110,7 +1095,7 @@ f_package_delete()
 	# detected the installed packages -- something we should do only once.
 	#
 	if [ ! "$PACKAGES_DETECTED" ]; then
-		f_dprintf "%s: Detecting installed packages" $fname
+		f_dprintf "$funcname: Detecting installed packages"
 		f_package_detect_installed
 		export PACKAGES_DETECTED=1 # exported for awk(1) ENVIRON[]
 	fi
@@ -1162,8 +1147,8 @@ f_package_delete()
 	# Chase dependencies that are marked for uninstallation
 	#
 	for pkgsel in $udeps; do
-		f_dprintf "%s: Uninstalling dependecy %s (marked for delete)" \
-		          $fname "$pkgsel"
+		f_dprintf "$funcname: Uninstalling dependency %s (%s)" \
+		          "$pkgsel" "marked for delete"
 		f_package_delete "$pkgsel"
 	done
 
@@ -1172,15 +1157,15 @@ f_package_delete()
 	#
 	f_show_info "$msg_uninstalling_package_waiting_for_pkg_delete" "$name"
 	if f_debugging; then
-		pkg_delete -v "$name"
+		f_eval_catch $funcname pkg 'pkg -d delete -y "%s"' "$name"
 	else
-		f_quietly pkg_delete "$name"
+		f_eval_catch $funcname pkg 'pkg delete -y "%s"' "$name"
 	fi
 	if [ $? -ne $SUCCESS ]; then
 		f_show_msg "$msg_pkg_delete_failed" "$name"
 		return $FAILURE
 	else
-		f_dprintf "%s: pkg_delete(1) of %s successful" $fname "$name"
+		f_dprintf "$funcname: pkg-delete(8) of %s successful" "$name"
 		f_str2varname "$name" varpkg
 		setvar _mark_$varpkg ""
 	fi
diff --git a/usr.sbin/bsdconfig/share/strings.subr b/usr.sbin/bsdconfig/share/strings.subr
index 0a77048c2a6..9b0014fc7e1 100644
--- a/usr.sbin/bsdconfig/share/strings.subr
+++ b/usr.sbin/bsdconfig/share/strings.subr
@@ -26,6 +26,11 @@ if [ ! "$_STRINGS_SUBR" ]; then _STRINGS_SUBR=1
 #
 # $FreeBSD$
 #
+############################################################ INCLUDES
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+
 ############################################################ GLOBALS
 
 #
@@ -41,7 +46,7 @@ VALID_VARNAME_CHARS="0-9ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_"
 
 ############################################################ FUNCTIONS
 
-# f_substr "$string" $start [ $length ]
+# f_substr "$string" $start [$length]
 #
 # Simple wrapper to awk(1)'s `substr' function.
 #
@@ -51,17 +56,18 @@ f_substr()
 	echo "$string" | awk "{ print substr(\$0, $start, $len) }"
 }
 
-# f_snprintf $var_to_set $size $format ...
+# f_snprintf $var_to_set $size $format [$arguments ...]
 #
 # Similar to snprintf(3), write at most $size number of bytes into $var_to_set
-# using printf(1) syntax (`$format ...'). The value of $var_to_set is NULL
-# unless at-least one byte is stored from the output.
+# using printf(1) syntax (`$format [$arguments ...]'). The value of $var_to_set
+# is NULL unless at-least one byte is stored from the output.
 #
 f_snprintf()
 {
 	local __var_to_set="$1" __size="$2"
-	shift 2 # var_to_set/size
-	eval "$__var_to_set"=\$\( printf \"\$@\" \| awk -v max=\"\$__size\" \''
+	shift 2 # var_to_set size
+	eval "$__var_to_set"=\$\( printf -- \"\$@\" \| \
+		awk -v max=\"\$__size\" \''
 	{
 		len = length($0)
 		max -= len
@@ -71,6 +77,18 @@ f_snprintf()
 	}'\' \)
 }
 
+# f_sprintf $var_to_set $format [$arguments ...]
+#
+# Similar to sprintf(3), write a string into $var_to_set using printf(1) syntax
+# (`$format [$arguments ...]').
+#
+f_sprintf()
+{
+	local __var_to_set="$1"
+	shift 1 # var_to_set
+	eval "$__var_to_set"=\$\( printf -- \"\$@\" \)
+}
+
 # f_vsnprintf $var_to_set $size $format $format_args
 #
 # Similar to vsnprintf(3), write at most $size number of bytes into $var_to_set
@@ -106,6 +124,16 @@ f_vsnprintf()
 	eval f_snprintf \"\$1\" \"\$2\" \"\$3\" $4
 }
 
+# f_vsprintf $var_to_set $format $format_args
+#
+# Similar to vsprintf(3), write a string into $var_to_set using printf(1)
+# syntax (`$format $format_args').
+#
+f_vsprintf()
+{
+	eval f_sprintf \"\$1\" \"\$2\" $3
+}
+
 # f_longest_line_length
 #
 # Simple wrapper to an awk(1) script to print the length of the longest line of
@@ -160,15 +188,8 @@ f_number_of_lines()
 #
 f_isinteger()
 {
-	local arg="$1"
-
-	# Prevent division-by-zero
-	[ "$arg" = "0" ] && return $SUCCESS
-
-	# Attempt to perform arithmetic divison (an operation which will exit
-	# with error unless arg is a valid positive/negative whole integer).
-	#
-	( : $((0/$arg)) ) > /dev/null 2>&1
+	local arg="${1#-}"
+	[ "${arg:-x}" = "${arg#[!0-9]*}" ]
 }
 
 # f_uriencode [$text]
@@ -319,6 +340,122 @@ f_shell_unescape()
 	f_replaceall "$__string" "'\\''" "'" "$__var_to_set"
 }
 
+# f_expand_number $string [$var_to_set]
+#
+# Unformat $string into a number, optionally to be stored in $var_to_set. This
+# function follows the SI power of two convention.
+#
+# The prefixes are:
+#
+# 	Prefix	Description	Multiplier
+# 	k	kilo		1024
+# 	M	mega		1048576
+# 	G	giga		1073741824
+# 	T	tera		1099511627776
+# 	P	peta		1125899906842624
+# 	E	exa		1152921504606846976
+#
+# NOTE: Prefixes are case-insensitive.
+#
+# Upon successful completion, success status is returned; otherwise the number
+# -1 is produced ($var_to_set set to -1 or if $var_to_set is NULL or missing)
+# on standard output. In the case of failure, the error status will be one of:
+#
+# 	Status	Reason
+# 	1	Given $string contains no digits
+# 	2	An unrecognized prefix was given
+# 	3	Result too large to calculate
+#
+f_expand_number()
+{
+	local __string="$1" __var_to_set="$2"
+	local __cp __num __bshift __maxinput
+
+	# Remove any leading non-digits
+	while :; do
+		__cp="$__string"
+		__string="${__cp#[!0-9]}"
+		[ "$__string" = "$__cp" ] && break
+	done
+
+	# Produce `-1' if string didn't contain any digits
+	if [ ! "$__string" ]; then
+		if [ "$__var_to_set" ]; then
+			setvar "$__var_to_set" -1
+		else
+			echo -1
+		fi
+		return 1 # 1 = "Given $string contains no digits"
+	fi
+
+	# Store the numbers
+	__num="${__string%%[!0-9]*}"
+
+	# Shortcut
+	if [ $__num -eq 0 ]; then
+		if [ "$__var_to_set" ]; then
+			setvar "$__var_to_set" 0
+		else
+			echo 0
+		fi
+		return $SUCCESS
+	fi
+
+	# Remove all the leading numbers from the string to get at the prefix
+	while :; do
+		__cp="$__string"
+		__string="${__cp#[0-9]}"
+		[ "$__string" = "$__cp" ] && break
+	done
+
+	#
+	# Test for invalid prefix (and determine bitshift length)
+	#
+	case "$__string" in
+	""|[[:space:]]*) # Shortcut
+		if [ "$__var_to_set" ]; then
+			setvar "$__var_to_set" $__num
+		else
+			echo $__num
+		fi
+		return $SUCCESS ;;
+	[Kk]*) __bshift=10 ;;
+	[Mm]*) __bshift=20 ;;
+	[Gg]*) __bshift=30 ;;
+	[Tt]*) __bshift=40 ;;
+	[Pp]*) __bshift=50 ;;
+	[Ee]*) __bshift=60 ;;
+	*)
+		# Unknown prefix
+		if [ "$__var_to_set" ]; then
+			setvar "$__var_to_set" -1
+		else
+			echo -1
+		fi
+		return 2 # 2 = "An unrecognized prefix was given"
+	esac
+
+	# Determine if the wheels fall off
+	__maxinput=$(( 0x7fffffffffffffff >> $__bshift ))
+	if [ $__num -gt $__maxinput ]; then
+		# Input (before expanding) would exceed 64-bit signed int
+		if [ "$__var_to_set" ]; then
+			setvar "$__var_to_set" -1
+		else
+			echo -1
+		fi
+		return 3 # 3 = "Result too large to calculate"
+	fi
+
+	# Shift the number out and produce it
+	__num=$(( $__num << $__bshift ))
+	if [ "$__var_to_set" ]; then
+		setvar "$__var_to_set" $__num
+	else
+		echo $__num
+	fi
+}
+
 ############################################################ MAIN
 
 f_dprintf "%s: Successfully loaded." strings.subr
diff --git a/usr.sbin/bsdconfig/share/sysrc.subr b/usr.sbin/bsdconfig/share/sysrc.subr
index 66a4cf34e94..d863ba05907 100644
--- a/usr.sbin/bsdconfig/share/sysrc.subr
+++ b/usr.sbin/bsdconfig/share/sysrc.subr
@@ -118,8 +118,8 @@ f_clean_env()
 # f_sysrc_get $varname
 #
 # Get a system configuration setting from the collection of system-
-# configuration files (in order: /etc/defaults/rc.conf /etc/rc.conf
-# and /etc/rc.conf).
+# configuration files (in order: /etc/defaults/rc.conf /etc/rc.conf and
+# /etc/rc.conf.local)
 #
 # NOTE: Additional shell parameter-expansion formats are supported. For
 # example, passing an argument of "hostname%%.*" (properly quoted) will
@@ -428,6 +428,7 @@ END { exit retval }
 '
 f_sysrc_set()
 {
+	local funcname=f_sysrc_set
 	local varname="$1" new_value="$2"
 
 	# Check arguments
@@ -478,8 +479,12 @@ f_sysrc_set()
 	#
 	# Create a new temporary file to write to.
 	#
-	local tmpfile="$( mktemp -t "$pgm" )"
-	[ "$tmpfile" ] || return $FAILURE
+	local tmpfile
+	if ! f_eval_catch -dk tmpfile $funcname mktemp 'mktemp -t "%s"' "$pgm"
+	then
+		echo "$tmpfile" >&2
+		return $FAILURE
+	fi
 
 	#
 	# Fixup permissions (else we're in for a surprise, as mktemp(1) creates
@@ -488,8 +493,9 @@ f_sysrc_set()
 	# permissions from the temporary file).
 	#
 	local mode
-	mode=$( stat -f '%#Lp' "$file" 2> /dev/null )
-	f_quietly chmod "${mode:-0644}" "$tmpfile"
+	f_eval_catch -dk mode $funcname stat 'stat -f "%%#Lp" "%s"' "$file" ||
+		mode=0644
+	f_eval_catch -d $funcname chmod 'chmod "%s" "%s"' "$mode" "$tmpfile"
 
 	#
 	# Fixup ownership. The destination file _is_ writable (we tested
@@ -497,8 +503,9 @@ f_sysrc_set()
 	# permissions (so we throw stderr into the bit-bucket).
 	#
 	local owner
-	owner=$( stat -f '%u:%g' "$file" 2> /dev/null )
-	f_quietly chown "${owner:-root:wheel}" "$tmpfile"
+	f_eval_catch -dk owner $funcname stat \
+		'stat -f "%%u:%%g" "%s"' "$file" || owner="root:wheel"
+	f_eval_catch -d $funcname chown 'chown "%s" "%s"' "$owner" "$tmpfile"
 
 	#
 	# Operate on the matching file, replacing only the last occurrence.
@@ -520,7 +527,7 @@ f_sysrc_set()
 	#
 	# Taint-check our results.
 	#
-	if ! /bin/sh -n "$tmpfile"; then
+	if ! f_eval_catch -d $funcname sh '/bin/sh -n "%s"' "$tmpfile"; then
 		f_err "$msg_previous_syntax_errors\n" "$pgm" "$file"
 		rm -f "$tmpfile"
 		return $FAILURE
@@ -529,7 +536,7 @@ f_sysrc_set()
 	#
 	# Finally, move the temporary file into place.
 	#
-	mv "$tmpfile" "$file"
+	f_eval_catch -de $funcname mv 'mv "%s" "%s"' "$tmpfile" "$file"
 }
 
 # f_sysrc_delete $varname
@@ -560,6 +567,7 @@ END { exit ! found }
 '
 f_sysrc_delete()
 {
+	local funcname=f_sysrc_delete
 	local varname="$1"
 	local file
 
@@ -569,24 +577,33 @@ f_sysrc_delete()
 	#
 	# Operate on each of the specified files
 	#
+	local tmpfile
 	for file in ${RC_CONFS-$( f_sysrc_get rc_conf_files )}; do
 		[ -e "$file" ] || continue
 
 		#
 		# Create a new temporary file to write to.
 		#
-		local tmpfile="$( mktemp -t "$pgm" )"
-		[ "$tmpfile" ] || return $FAILURE
+		if ! f_eval_catch -dk tmpfile $funcname mktemp \
+			'mktemp -t "%s"' "$pgm"
+		then
+			echo "$tmpfile" >&2
+			return $FAILURE
+		fi
 
 		#
 		# Fixup permissions and ownership (mktemp(1) defaults to 0600
 		# permissions) to instead match the destination file.
 		#
 		local mode owner
-		mode=$( stat -f '%#Lp' "$file" 2> /dev/null )
-		owner=$( stat -f '%u:%g' "$file" 2> /dev/null )
-		f_quietly chmod "${mode:-0644}" "$tmpfile"
-		f_quietly chown "${owner:-root:wheel}" "$tmpfile"
+		f_eval_catch -dk mode $funcname stat \
+			'stat -f "%%#Lp" "%s"' "$file" || mode=0644
+		f_eval_catch -dk owner $funcname stat \
+			'stat -f "%%u:%%g" "%s"' "$file" || owner="root:wheel"
+		f_eval_catch -d $funcname chmod \
+			'chmod "%s" "%s"' "$mode" "$tmpfile"
+		f_eval_catch -d $funcname chown \
+			'chown "%s" "%s"' "$owner" "$tmpfile"
 
 		#
 		# Operate on the file, removing all occurrences, saving the
@@ -603,7 +620,8 @@ f_sysrc_delete()
 		#
 		# Taint-check our results.
 		#
-		if ! /bin/sh -n "$tmpfile"; then
+		if ! f_eval_catch -d $funcname sh '/bin/sh -n "%s"' "$tmpfile"
+		then
 			f_err "$msg_previous_syntax_errors\n" \
 			      "$pgm" "$file"
 			rm -f "$tmpfile"
@@ -622,7 +640,8 @@ f_sysrc_delete()
 		#
 		# Finally, move the temporary file into place.
 		#
-		mv "$tmpfile" "$file"
+		f_eval_catch -de $funcname mv \
+			'mv "%s" "%s"' "$tmpfile" "$file" || return $FAILURE
 	done
 }
 
diff --git a/usr.sbin/bsdconfig/share/variable.subr b/usr.sbin/bsdconfig/share/variable.subr
index 86523d6b38e..55bc8506822 100644
--- a/usr.sbin/bsdconfig/share/variable.subr
+++ b/usr.sbin/bsdconfig/share/variable.subr
@@ -179,7 +179,7 @@ f_debugging()
 	f_getvar $VAR_DEBUG value && [ "$value" ]
 }
 
-# f_interactive()
+# f_interactive
 #
 # Are we running interactively? Return error if $nonInteractive is set and non-
 # NULL, otherwise return success.
@@ -190,7 +190,7 @@ f_interactive()
 	! f_getvar $VAR_NONINTERACTIVE value || [ ! "$value" ]
 }
 
-# f_netinteractive()
+# f_netinteractive
 #
 # Has the user specifically requested the network-portion of configuration and
 # setup to be performed interactively? Returns success if the user has asked
@@ -205,6 +205,21 @@ f_netinteractive()
 	f_getvar $VAR_NETINTERACTIVE value && [ "$value" ]
 }
 
+# f_zfsinteractive
+#
+# Has the user specifically requested the ZFS-portion of configuration and
+# setup to be performed interactively? Returns success if the user has asked
+# for the ZFS configuration to be done interactively even if perhaps overall
+# non-interactive mode has been requested (by setting nonInteractive).
+#
+# Returns success if $zfsInteractive is set and non-NULL.
+#
+f_zfsinteractive()
+{
+	local value
+	f_getvar $VAR_ZFSINTERACTIVE value && [ "$value" ]
+}
+
 ############################################################ MAIN
 
 #
@@ -240,6 +255,7 @@ f_variable_new VAR_IFCONFIG		ifconfig_
 f_variable_new VAR_IPADDR		ipaddr
 f_variable_new VAR_IPV6ADDR		ipv6addr
 f_variable_new VAR_IPV6_ENABLE		ipv6_activate_all_interfaces
+f_variable_new VAR_KEYMAP		keymap
 f_variable_new VAR_MEDIA_TIMEOUT	MEDIA_TIMEOUT
 f_variable_new VAR_MEDIA_TYPE		mediaType
 f_variable_new VAR_NAMESERVER		nameserver
@@ -263,6 +279,7 @@ f_variable_new VAR_SLOW_ETHER		slowEthernetCard
 f_variable_new VAR_TRY_DHCP		tryDHCP
 f_variable_new VAR_TRY_RTSOL		tryRTSOL
 f_variable_new VAR_UFS_PATH		ufs
+f_variable_new VAR_ZFSINTERACTIVE	zfsInteractive
 
 #
 # Self-initialize unless requested otherwise
diff --git a/usr.sbin/bsdconfig/startup/include/messages.subr b/usr.sbin/bsdconfig/startup/include/messages.subr
index 87bde269a50..78daa8a9d0e 100644
--- a/usr.sbin/bsdconfig/startup/include/messages.subr
+++ b/usr.sbin/bsdconfig/startup/include/messages.subr
@@ -39,8 +39,8 @@ msg_all_desc="Select all directives"
 msg_all_help="Select all displayed rc.conf(5) configuration directives"
 msg_apm="APM"
 msg_apm_desc="Auto-power management services (typically laptops)"
-msg_are_you_sure_you_want_to_delete="Are you sure you want to delete the \`%s' directive\nfrom the rc.conf(5) collection of system configuration files?"
 msg_are_you_sure_you_want_delete_the_following="Are you sure you want to delete the following directives\nfrom the rc.conf(5) collection of system configuration files?"
+msg_are_you_sure_you_want_to_delete="Are you sure you want to delete the \`%s' directive\nfrom the rc.conf(5) collection of system configuration files?"
 msg_cancel="Cancel"
 msg_choose_view_details="Choose View Details"
 msg_creating_menu_list="Creating menu list...\nThis may take a while."
@@ -67,8 +67,8 @@ msg_exit_this_menu="Exit this menu"
 msg_info="Info"
 msg_lpd="lpd"
 msg_lpd_desc="This host has a printer and wants to run lpd."
-msg_miscellaneous_startup_services="Miscellaneous Startup Services"
 msg_miscellaneous_menu_text="This menu allows you to configure various aspects of your system's\nstartup configuration.  Use [SPACE] or [ENTER] to select items, and\n[TAB] to move to the buttons.  Select Exit to leave this menu."
+msg_miscellaneous_startup_services="Miscellaneous Startup Services"
 msg_named="named"
 msg_named_desc="Run a local name server on this host"
 msg_named_flags="named flags"
diff --git a/usr.sbin/bsdconfig/startup/misc b/usr.sbin/bsdconfig/startup/misc
index edfc1acbee9..a792daf4efc 100755
--- a/usr.sbin/bsdconfig/startup/misc
+++ b/usr.sbin/bsdconfig/startup/misc
@@ -38,15 +38,8 @@ f_include $BSDCFG_SHARE/sysrc.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
-
-############################################################ GLOBALS
-
-#
-# Operating environment
-#
-UNAME_P=$( uname -p ) # Processor Architecture (i.e. i386)
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -309,10 +302,10 @@ dialog_input_value()
 	f_dialog_title_restore
 
 	# Return if user has either pressed ESC or chosen Cancel/No
-	[ $retval -eq $SUCCESS ] || return $retval
+	[ $retval -eq $DIALOG_OK ] || return $retval
 
 	value="$_input"
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 ############################################################ MAIN
@@ -346,90 +339,64 @@ while :; do
 
 	case "$mtag" in
 	"X $msg_exit") break ;;
-	?" [X] "*) toggled=1 ;;
-	        *) toggled=
+	?" [X] "*) toggled=1 reverse=NO ;;
+	        *) toggled= reverse=YES
 	esac
 
 	case "$mtag" in
 	# Simple On/Off toggle bits
 	?" ["?"] $msg_apm")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set apm_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set apm_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set apm_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_named")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set named_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set named_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set named_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_accounting")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set accounting_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set accounting_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set accounting_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_lpd")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set lpd_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set lpd_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set lpd_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_sco")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set ibcs2_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set ibcs2_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set ibcs2_enable "%s"' "$reverse" ;;
 	?" ["?"] $msg_svr4")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set svr4_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set svr4_enable YES 2>&1 )
-		fi
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set svr4_enable "%s"' "$reverse" ;;
 	# Multi-variable On/Off toggle bits
 	?" ["?"] $msg_nis_client")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set nis_client_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set nis_client_enable YES 2>&1 ) \
-			&& err=$( f_sysrc_set rpcbind_enable YES 2>&1 )
-		fi
-		;;
+		if f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set nis_client_enable "%s"' "$reverse"
+		then
+			[ "$reverse" = "NO" ] || f_eval_catch -dk err "$0" \
+				f_sysrc_set 'f_sysrc_set rpcbind_enable YES'
+		fi ;;
 	?" ["?"] $msg_nis_server")
-		if [ "$toggled" ]; then
-			err=$( f_sysrc_set nis_server_enable NO 2>&1 )
-		else
-			err=$( f_sysrc_set nis_server_enable YES 2>&1 ) \
-			&& err=$( f_sysrc_set rpcbind_enable YES 2>&1 )
-		fi
-		;;
+		if f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set nis_server_enable "%s"' "$reverse"
+		then
+			[ "$reverse" = "NO" ] || f_eval_catch -dk err "$0" \
+				f_sysrc_set 'f_sysrc_set rpcbind_enable YES'
+		fi ;;
 	# Checkboxes for non-boolean options
 	?" ["?"] $msg_nis_domainname")
 		dialog_input_value "$msg_nis_domainname_desc" \
 		                   "$( f_sysrc_get nisdomainname )" || continue
-		err=$( f_sysrc_set nisdomainname "$value" 2>&1 )
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set nisdomainname "%s"' "$value" ;;
 	?" ["?"] $msg_startup_dirs")
 		dialog_input_value "$msg_startup_dirs_desc" \
 		                   "$( f_sysrc_get local_startup )" || continue
-		err=$( f_sysrc_set local_startup "$value" 2>&1 )
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set local_startup "%s"' "$value" ;;
 	?" ["?"] $msg_named_flags")
 		dialog_input_value "$msg_named_flags_desc" \
 		                   "$( f_sysrc_get named_flags )" || continue
-		err=$( f_sysrc_set named_flags "$value" 2>&1 )
-		;;
+		f_eval_catch -dk err "$0" f_sysrc_set \
+			'f_sysrc_set named_flags "%s"' "$value" ;;
 	esac
 
-	[ $? -eq $SUCCESS ] || f_dialog_msgbox "$err\n"
+	[ $? -eq $DIALOG_OK ] || f_dialog_msgbox "$err\n"
 done
 
 exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/startup/rcadd b/usr.sbin/bsdconfig/startup/rcadd
index 9fd3bdda7c9..7b536c2be9c 100755
--- a/usr.sbin/bsdconfig/startup/rcadd
+++ b/usr.sbin/bsdconfig/startup/rcadd
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/startup/rcconf.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ GLOBALS
 
diff --git a/usr.sbin/bsdconfig/startup/rcconf b/usr.sbin/bsdconfig/startup/rcconf
index d064224d354..6a6247b818e 100755
--- a/usr.sbin/bsdconfig/startup/rcconf
+++ b/usr.sbin/bsdconfig/startup/rcconf
@@ -39,8 +39,8 @@ f_include $BSDCFG_SHARE/startup/rcconf.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ GLOBALS
 
@@ -195,7 +195,7 @@ dialog_menu_main()
 	f_dialog_menutag_store "$menu_choice"
 
 	# Only update default-item on success
-	[ $retval -eq 0 ] && f_dialog_default_store "$menu_choice"
+	[ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
 
 	return $retval
 }
@@ -236,13 +236,13 @@ while :; do
 			f_dialog_input_view_details
 			continue
 		esac
-	elif [ $retval -eq 2 ]; then
+	elif [ $retval -eq $DIALOG_HELP ]; then
 		# The ``Help'' button (labeled "Details") was pressed
 		f_dialog_input_view_details
 		continue
 	fi
 
-	[ $retval -eq 0 ] || f_die
+	[ $retval -eq $DIALOG_OK ] || f_die
 
 	case "$mtag" in
 	"X $msg_exit") break ;;
diff --git a/usr.sbin/bsdconfig/startup/rcdelete b/usr.sbin/bsdconfig/startup/rcdelete
index b6eeba4814a..ccc15ba3380 100755
--- a/usr.sbin/bsdconfig/startup/rcdelete
+++ b/usr.sbin/bsdconfig/startup/rcdelete
@@ -39,8 +39,8 @@ f_include $BSDCFG_SHARE/startup/rcconf.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ GLOBALS
 
@@ -232,7 +232,7 @@ dialog_menu_main()
 	f_dialog_menutag_store "$menu_choice"
 
 	# Only update default-item on success
-	[ $retval -eq 0 ] && f_dialog_default_store "$menu_choice"
+	[ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
 
 	return $retval
 }
@@ -249,7 +249,7 @@ dialog_menu_confirm_delete()
 	local menu_list # Calculated below
 	local hline="$hline_arrows_tab_enter"
 
-	[ $# -ge 1 ] || return $FAILURE
+	[ $# -ge 1 ] || return $DIALOG_CANCEL
 
 	# If asked to delete only one variable, simply ask and return
 	if [ $# -eq 1 ]; then
@@ -351,31 +351,30 @@ while :; do
 			f_dialog_input_view_details && dialog_create_main
 			continue
 		esac
-	elif [ $retval -eq 2 ]; then
+	elif [ $retval -eq $DIALOG_HELP ]; then
 		# The ``Help'' button (labeled "Details") was pressed
 		f_dialog_input_view_details && dialog_create_main
 		continue
 	fi
 
-	[ $retval -eq 0 ] || f_die
+	[ $retval -eq $DIALOG_OK ] || f_die
 
 	case "$mtag" in
 	"X $msg_exit_cancel") break ;;
 	"> $msg_delete_selected")
 		delete_vars=
 		for var in $( f_startup_rcconf_list ); do
-			[ "$( eval echo \$_${var}_delete )" ] || continue
-			delete_vars="$delete_vars${delete_vars:+ }$var"
+			f_getvar _${var}_delete _delete
+			[ "$_delete" ] || continue
+			delete_vars="$delete_vars $var"
 		done
 		if dialog_menu_confirm_delete $delete_vars; then
 			f_dialog_title "$msg_info"
 			f_dialog_info "$msg_deleting_selected_directives"
 			f_dialog_title_restore
 			for var in $delete_vars; do
-				if ! err=$( f_sysrc_delete $var 2>&1 ); then
-					f_dialog_msgbox "$err\n"
-					break
-				fi
+				f_eval_catch "$0" f_sysrc_delete \
+					'f_sysrc_delete "%s"' "$var" || break
 			done
 			dialog_create_main
 		fi
diff --git a/usr.sbin/bsdconfig/startup/rcedit b/usr.sbin/bsdconfig/startup/rcedit
index de7f3210034..54061b54e0a 100755
--- a/usr.sbin/bsdconfig/startup/rcedit
+++ b/usr.sbin/bsdconfig/startup/rcedit
@@ -38,8 +38,8 @@ f_include $BSDCFG_SHARE/startup/rcedit.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
diff --git a/usr.sbin/bsdconfig/startup/rcvar b/usr.sbin/bsdconfig/startup/rcvar
index 7d29bfcd5d2..ddca9066e6e 100755
--- a/usr.sbin/bsdconfig/startup/rcvar
+++ b/usr.sbin/bsdconfig/startup/rcvar
@@ -39,8 +39,8 @@ f_include $BSDCFG_SHARE/startup/rcvar.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ GLOBALS
 
@@ -158,7 +158,7 @@ dialog_menu_main()
 	f_dialog_menutag_store "$menu_choice"
 	f_dialog_default_store "$menu_choice"
 
-	if [ $retval -eq $SUCCESS ]; then
+	if [ $retval -eq $DIALOG_OK ]; then
 		local item
 		item=$( eval f_dialog_menutag2item${SHOW_DESC:+_with_help} \
 		         	\"\$menu_choice\" $menu_list )
@@ -210,7 +210,7 @@ while :; do
 	     *) value="YES"
 	esac
 
-	err=$( f_sysrc_set "$rcvar" "$value" 2>&1 ) || f_dialog_msgbox "$err"
+	f_eval_catch "$0" f_sysrc_set 'f_sysrc_set "%s" "%s"' "$rcvar" "$value"
 done
 
 exit $SUCCESS
diff --git a/usr.sbin/bsdconfig/startup/share/rcconf.subr b/usr.sbin/bsdconfig/startup/share/rcconf.subr
index 4c3e0d67600..38b4cc896e7 100644
--- a/usr.sbin/bsdconfig/startup/share/rcconf.subr
+++ b/usr.sbin/bsdconfig/startup/share/rcconf.subr
@@ -106,6 +106,7 @@ f_startup_rcconf_list()
 #
 f_startup_rcconf_map()
 {
+	local __funcname=f_startup_rcconf_map
 	local __var_to_set="$1"
 
 	# If the in-memory cached value is available, return it immediately
@@ -119,7 +120,7 @@ f_startup_rcconf_map()
 	fi
 
 	#
-	# create the in-memory cache (potentially from validated on-disk cache)
+	# Create the in-memory cache (potentially from validated on-disk cache)
 	#
 
 	#
@@ -128,7 +129,7 @@ f_startup_rcconf_map()
 	# can be used to quickly populate the cache value for immediate return.
 	#
 	local __rc_defaults_digest
-	__rc_defaults_digest=$( md5 < "$RC_DEFAULTS" )
+	__rc_defaults_digest=$( exec 2> /dev/null; md5 < "$RC_DEFAULTS" )
 
 	#
 	# Check to see if the global persistant cache file exists
@@ -140,7 +141,7 @@ f_startup_rcconf_map()
 		# the current value and provide error exit status.
 		#
 		STARTUP_RCCONF_MAP=$(
-			(	# Get digest as the first word on the first line
+			(	# Get digest as the first word on first line
 				read digest rest_ignored
 
 				#
@@ -218,8 +219,9 @@ f_startup_rcconf_map()
 	#
 
 	# Create a new temporary file to write to
-	local __tmpfile="$( mktemp -t "$pgm" )"
-	[ "$__tmpfile" ] || return $FAILURE
+	local __tmpfile
+	f_eval_catch -dk __tmpfile $__funcname mktemp \
+		'mktemp -t "%s"' "$pgm" || return $FAILURE
 
 	# Write the temporary file contents
 	echo "$__rc_defaults_digest" > "$__tmpfile"
@@ -227,9 +229,11 @@ f_startup_rcconf_map()
 
 	# Finally, move the temporary file into place
 	case "$STARTUP_RCCONF_MAP_CACHEFILE" in
-	*/*) f_quietly mkdir -p "${STARTUP_RCCONF_MAP_CACHEFILE%/*}"
+	*/*) f_eval_catch -d $__funcname mkdir \
+		'mkdir -p "%s"' "${STARTUP_RCCONF_MAP_CACHEFILE%/*}"
 	esac
-	mv "$__tmpfile" "$STARTUP_RCCONF_MAP_CACHEFILE"
+	f_eval_catch -d $__funcname mv \
+		'mv "%s" "%s"' "$__tmpfile" "$STARTUP_RCCONF_MAP_CACHEFILE"
 }
 
 # f_startup_rcconf_map_expand $var_to_get
@@ -243,7 +247,7 @@ f_startup_rcconf_map()
 f_startup_rcconf_map_expand()
 {
 	local var_to_get="$1"
-	eval "$( f_getvar "$var_to_get" | awk '
+	eval "$( debug= f_getvar "$var_to_get" | awk '
 	BEGIN {
 		rword = "^[[:space:]]*[^[:space:]]*[[:space:]]*"
 	}
@@ -336,7 +340,7 @@ f_dialog_input_view_details()
 
 	f_dialog_title_restore
 
-	[ $retval -eq 0 ] || return $FAILURE
+	[ $retval -eq $DIALOG_OK ] || return $DIALOG_CANCEL
 
 	case "$mtag" in
 	"R $msg_reset")
@@ -465,7 +469,7 @@ f_dialog_input_rcvar()
 
 		# Return if user either pressed ESC or chosen Cancel/No
 		f_dialog_input _input "$msg_please_enter_rcvar_name" \
-		               "$_input" "$hline_alnum_tab_enter" || return
+		               "$_input" "$hline_alnum_tab_enter" || return $?
 
 		# Check for invalid entry (1of2)
 		if ! echo "$_input" | grep -q "^[[:alpha:]_]"; then
@@ -486,7 +490,7 @@ f_dialog_input_rcvar()
 
 	f_dprintf "f_dialog_input_rcvar: rcvar->[%s]" "$rcvar"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/startup/share/rcedit.subr b/usr.sbin/bsdconfig/startup/share/rcedit.subr
index 64ee1ccf0d8..1adca477ebf 100644
--- a/usr.sbin/bsdconfig/startup/share/rcedit.subr
+++ b/usr.sbin/bsdconfig/startup/share/rcedit.subr
@@ -32,6 +32,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 f_dprintf "%s: loading includes..." startup/rcedit.subr
 f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/sysrc.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
@@ -54,10 +55,11 @@ f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 #
 f_dialog_rcedit()
 {
+	local funcname=f_dialog_rcedit
 	local msg var="$1" _input
 
-	msg=$( printf "$msg_please_enter_a_new_value" \
-	              "$var" "$( f_sysrc_get_default "$var" )" )
+	f_sprintf msg "$msg_please_enter_a_new_value" \
+	              "$var" "$( f_sysrc_get_default "$var" )"
 
 	shift 1 # var
 	if [ "$1" ]; then
@@ -69,15 +71,16 @@ f_dialog_rcedit()
 
 	# Return if user has either pressed ESC or chosen Cancel/No
 	f_dialog_input _input "$msg" "$_input" \
-	               "$hline_alnum_punc_tab_enter" || return
+	               "$hline_alnum_punc_tab_enter" || return $?
 
 	# Return if the value has not changed from current
 	local cur_val="$( f_sysrc_get "$var" )"
-	[ "$_input" = "$cur_val" ] && return $SUCCESS
+	[ "$_input" = "$cur_val" ] && return $DIALOG_OK
 
 	f_dprintf "%s: [%s]->[%s]" "$var" "$cur_val" "$_input"
 
-	err=$( f_sysrc_set "$var" "$_input" 2>&1 ) || f_dialog_msgbox "$err"
+	f_eval_catch $funcname f_sysrc_set \
+		'f_sysrc_set "%s" "%s"' "$var" "$_input"
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/startup/share/rcvar.subr b/usr.sbin/bsdconfig/startup/share/rcvar.subr
index 09868953123..c5a7885296b 100644
--- a/usr.sbin/bsdconfig/startup/share/rcvar.subr
+++ b/usr.sbin/bsdconfig/startup/share/rcvar.subr
@@ -85,6 +85,7 @@ STARTUP_RCVAR_MAP_CACHEFILE="/var/run/bsdconfig/startup_rcvar_map.cache"
 #
 f_startup_rcvar_map()
 {
+	local __funcname=f_startup_rcvar_map
 	local __var_to_set="$1"
 
 	# If the in-memory cached value is available, return it immediately
@@ -125,8 +126,8 @@ f_startup_rcvar_map()
 	# value for immediate return.
 	#
 	local __rc_script_list_digest
-	__rc_script_list_digest=$( cd "$ETC_RC_D" &&
-		cksum "$RC_DEFAULTS" $__rc_script_list | md5 )
+	__rc_script_list_digest=$( cd "$ETC_RC_D" 2> /dev/null &&
+		cksum "$RC_DEFAULTS" $__rc_script_list 2> /dev/null | md5 )
 
 	#
 	# Check to see if the global persistant cache file exists
@@ -179,7 +180,7 @@ f_startup_rcvar_map()
 
 	STARTUP_RCVAR_MAP=$(
 		for script in $__rc_script_list; do
-			rcvar_list=$( $script rcvar | awk -F= \
+			rcvar_list=$( $script rcvar 2> /dev/null | awk -F= \
 				-v script="$script" '
 		              	/^'"$STARTUP_RCVAR_REGEX"'/ {
 		              		if ( $2 ~ /^"[Yy][Ee][Ss]"$/ )
@@ -211,8 +212,9 @@ f_startup_rcvar_map()
 	#
 
 	# Create a new temporary file to write to
-	local __tmpfile="$( mktemp -t "$pgm" )"
-	[ "$__tmpfile" ] || return $FAILURE
+	local __tmpfile
+	f_eval_catch -dk __tmpfile $__funcname mktemp \
+		'mktemp -t "%s"' "$__tmpfile" || return $FAILURE
 
 	# Write the temporary file contents
 	echo "$__rc_script_list_digest" > "$__tmpfile"
@@ -220,9 +222,11 @@ f_startup_rcvar_map()
 
 	# Finally, move the temporary file into place
 	case "$STARTUP_RCVAR_MAP_CACHEFILE" in
-	*/*) f_quietly mkdir -p "${STARTUP_RCVAR_MAP_CACHEFILE%/*}"
+	*/*) f_eval_catch -d $__funcname mkdir \
+		'mkdir -p "%s"' "${STARTUP_RCVAR_MAP_CACHEFILE%/*}"
 	esac
-	mv "$__tmpfile" "$STARTUP_RCVAR_MAP_CACHEFILE"
+	f_eval_catch -d $__funcname mv \
+		'mv "%s" "%s"' "$__tmpfile" "$STARTUP_RCVAR_MAP_CACHEFILE"
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/startup/startup b/usr.sbin/bsdconfig/startup/startup
index 6b02cb41368..17755d12085 100755
--- a/usr.sbin/bsdconfig/startup/startup
+++ b/usr.sbin/bsdconfig/startup/startup
@@ -37,8 +37,8 @@ f_include $BSDCFG_SHARE/mustberoot.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="140.startup"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
diff --git a/usr.sbin/bsdconfig/timezone/share/zones.subr b/usr.sbin/bsdconfig/timezone/share/zones.subr
index b356323ec71..59a933013e5 100644
--- a/usr.sbin/bsdconfig/timezone/share/zones.subr
+++ b/usr.sbin/bsdconfig/timezone/share/zones.subr
@@ -32,6 +32,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
 . $BSDCFG_SHARE/common.subr || exit 1
 f_dprintf "%s: loading includes..." timezone/zones.subr
 f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/strings.subr
 f_include $BSDCFG_SHARE/timezone/continents.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
@@ -347,8 +348,9 @@ f_read_zones()
 #
 f_install_zoneinfo_file()
 {
+	local funcname=f_install_zoneinfo_file
 	local zoneinfo_file="$1"
-	local copymode title msg err height width
+	local copymode title msg height width
 
 	if [ -L "$_PATH_LOCALTIME" ]; then
 		copymode=
@@ -361,13 +363,13 @@ f_install_zoneinfo_file()
 
 	if [ "$VERBOSE" ]; then
 		if [ ! "$zoneinfo_file" ]; then
-			msg=$( printf "$msg_removing_file" "$_PATH_LOCALTIME" )
+			f_sprintf msg "$msg_removing_file" "$_PATH_LOCALTIME"
 		elif [ "$copymode" ]; then
-			msg=$( printf "$msg_copying_file" \
-			              "$zoneinfo_file" "$_PATH_LOCALTIME" )
+			f_sprintf msg "$msg_copying_file" \
+			              "$zoneinfo_file" "$_PATH_LOCALTIME"
 		else
-			msg=$( printf "$msg_creating_symlink" \
-			              "$_PATH_LOCALTIME" "$zoneinfo_file" )
+			f_sprintf msg "$msg_creating_symlink" \
+			              "$_PATH_LOCALTIME" "$zoneinfo_file"
 		fi
 		if [ "$USEDIALOG" ]; then
 			f_dialog_title "$msg_info"
@@ -380,33 +382,17 @@ f_install_zoneinfo_file()
 
 	[ "$REALLYDOIT" ] || return $SUCCESS
 
-	if [ ! "$zoneinfo_file" ]; then
-		err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
-		if [ "$err" ]; then
-			if [ "$USEDIALOG" ]; then
-				f_dialog_title "$msg_error"
-				f_dialog_msgbox "$err"
-				f_dialog_title_restore
-			else
-				f_err "%s\n" "$err"
-			fi
-			return $FAILURE
-		fi
+	local catch_args="-de"
+	[ "$USEDIALOG" ] && catch_args=
 
-		err=$( rm -f "$_PATH_DB" 2>&1 )
-		if [ "$err" ]; then
-			if [ "$USEDIALOG" ]; then
-				f_dialog_title "$msg_error"
-				f_dialog_msgbox "$err"
-				f_dialog_title_restore
-			else
-				f_err "%s\n" "$err"
-			fi
-			return $FAILURE
-		fi
+	if [ ! "$zoneinfo_file" ]; then
+		f_eval_catch $catch_args $funcname rm \
+			'rm -f "%s"' "$_PATH_LOCALTIME" || return $FAILURE
+		f_eval_catch $catch_args $funcname rm \
+			'rm -f "%s"' "$_PATH_DB" || return $FAILURE
 
 		if [ "$VERBOSE" ]; then
-			msg=$( printf "$msg_removed_file" "$_PATH_LOCALTIME" )
+			f_sprintf msg "$msg_removed_file" "$_PATH_LOCALTIME"
 			if [ "$USEDIALOG" ]; then
 				f_dialog_title "$msg_done"
 				f_dialog_msgbox "$msg"
@@ -415,96 +401,35 @@ f_install_zoneinfo_file()
 				printf "%s\n" "$msg"
 			fi
 		fi
-
 		return $SUCCESS
-
 	fi # ! zoneinfo_file
 
 	if [ "$copymode" ]; then
-
-		err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
-		if [ "$err" ]; then
-			if [ "$USEDIALOG" ]; then
-				f_dialog_title "$msg_error"
-				f_dialog_msgbox "$err"
-				f_dialog_title_restore
-			else
-				f_err "%s\n" "$err"
-			fi
+		f_eval_catch $catch_args $funcname rm \
+			'rm -f "%s"' "$_PATH_LOCALTIME" || return $FAILURE
+		f_eval_catch $catch_args $funcname sh \
+			'umask 222 && :> "%s"' "$_PATH_LOCALTIME" ||
 			return $FAILURE
-		fi
-
-		err=$( umask 222 && : 2>&1 > "$_PATH_LOCALTIME" )
-		if [ "$err" ]; then
-			if [ "$USEDIALOG" ]; then
-				f_dialog_title "$msg_error"
-				f_dialog_msgbox "$err"
-				f_dialog_title_restore
-			else
-				f_err "%s\n" "$err"
-			fi
-			return $FAILURE
-		fi
-
-		err=$( cat "$zoneinfo_file" 2>&1 > "$_PATH_LOCALTIME" )
-		if [ "$err" ]; then
-			if [ "$USEDIALOG" ]; then
-				f_dialog_title "$msg_error"
-				f_dialog_msgbox "$err"
-				f_dialog_title_restore
-			else
-				f_err "%s\n" "$err"
-			fi
-			return $FAILURE
-		fi
-
-	else # ! copymode
-
-		err=$( ( :< "$zoneinfo_file" ) 2>&1 )
-		if [ "$err" ]; then
-			if [ "$USEDIALOG" ]; then
-				f_dialog_title "$msg_error"
-				f_dialog_msgbox "$err"
-				f_dialog_title_restore
-			else
-				f_err "%s\n" "$err"
-			fi
-			return $FAILURE
-		fi
-
-		err=$( rm -f "$_PATH_LOCALTIME" 2>&1 )
-		if [ "$err" ]; then
-			if [ "$USEDIALOG" ]; then
-				f_dialog_title "$msg_error"
-				f_dialog_msgbox "$err"
-				f_dialog_title_restore
-			else
-				f_err "%s\n" "$err"
-			fi
-			return $FAILURE
-		fi
-
-		err=$( ln -s "$zoneinfo_file" "$_PATH_LOCALTIME" 2>&1 )
-		if [ "$err" ]; then
-			if [ "$USEDIALOG" ]; then
-				f_dialog_title "$msg_error"
-				f_dialog_msgbox "$err"
-				f_dialog_title_restore
-			else
-				f_err "%s\n" "$err"
-			fi
-			return $FAILURE
-		fi
-
+		f_eval_catch $catch_args $funcname sh \
+			'cat "%s" > "%s"' \
+			"$zoneinfo_file" "$_PATH_LOCALTIME" || return $FAILURE
+	else
+		f_eval_catch $catch_args $funcname sh \
+			'( :< "%s" )' "$zoneinfo_file" || return $FAILURE
+		f_eval_catch $catch_args $funcname rm \
+			'rm -f "%s"' "$_PATH_LOCALTIME" || return $FAILURE
+		f_eval_catch $catch_args $funcname ln \
+			'ln -s "%s" "%s"' \
+			"$zoneinfo_file" "$_PATH_LOCALTIME" || return $FAILURE
 	fi # copymode
 
 	if [ "$VERBOSE" ]; then
 		if [ "$copymode" ]; then
-			msg=$( printf "$msg_copied_timezone_file" \
-			              "$zoneinfo_file" "$_PATH_LOCALTIME" )
+			f_sprintf msg "$msg_copied_timezone_file" \
+			              "$zoneinfo_file" "$_PATH_LOCALTIME"
 		else
-			msg=$( printf "$msg_created_symlink" \
-			              "$_PATH_LOCALTIME" "$zoneinfo_file" )
+			f_sprintf msg "$msg_created_symlink" \
+			              "$_PATH_LOCALTIME" "$zoneinfo_file"
 		fi
 		if [ "$USEDIALOG" ]; then
 			f_dialog_title "$msg_done"
@@ -559,16 +484,17 @@ f_confirm_zone()
 	local title="$DIALOG_TITLE" btitle="$DIALOG_BACKTITLE"
 	f_dialog_title_restore
 	local tm_zone="$( TZ="$filename" date +%Z )"
-	local prompt="$( printf "$msg_look_reasonable" "$tm_zone" )"
+	local prompt # Calculated below
 	local height=5 width=72
 
+	f_sprintf prompt "$msg_look_reasonable" "$tm_zone"
 	if [ "$USE_XDIALOG" ]; then
 		height=$(( $height + 4 ))
 		$DIALOG \
-			--title "$title"       \
-			--backtitle "$btitle"  \
-			--ok-label "$msg_yes" \
-			--cancel-label "$msg_no"   \
+			--title "$title"         \
+			--backtitle "$btitle"    \
+			--ok-label "$msg_yes"    \
+			--cancel-label "$msg_no" \
 			--yesno "$prompt" $height $width
 	else
 		$DIALOG \
diff --git a/usr.sbin/bsdconfig/timezone/timezone b/usr.sbin/bsdconfig/timezone/timezone
index 709c8a81a36..0452230441b 100755
--- a/usr.sbin/bsdconfig/timezone/timezone
+++ b/usr.sbin/bsdconfig/timezone/timezone
@@ -43,8 +43,8 @@ f_include $BSDCFG_SHARE/timezone/zones.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="090.timezone"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -164,7 +164,7 @@ fi
 if [ "$REINSTALL" ]; then
 	[ -f "$_PATH_DB" -a -r "$_PATH_DB" ] ||
 		f_die 1 "$msg_cannot_open_for_reading" "$_PATH_DB"
-	zoneinfo=$( cat "$_PATH_DB" ) ||
+	f_eval_catch -dk zoneinfo "$0" cat 'cat "%s"' "$_PATH_DB" ||
 		f_die 1 "$msg_error_reading" "$_PATH_DB"
 	[ "$zoneinfo" ] ||
 		f_die 1 "$msg_unable_to_determine_name_from_db" "$_PATH_DB"
@@ -226,7 +226,7 @@ if [ "$_PATH_WALL_CMOS_CLOCK" -a ! "$SKIPUTC" ]; then
 		result=$?
 	fi
 
-	if [ $result -eq 0 ]; then
+	if [ $result -eq $DIALOG_OK ]; then
 		# User chose YES
 		[ "$REALLYDOIT" ] &&
 			f_quietly rm -f "$_PATH_WALL_CMOS_CLOCK"
@@ -244,13 +244,13 @@ if [ $# -ge 1 ]; then
 	default="$1"
 
 	f_dialog_title "$msg_default_zone_provided"
-	msg=$( printf "\n$msg_use_default_zone" "$default" )
+	f_sprintf msg "\n$msg_use_default_zone" "$default"
 	hline=
 	f_dialog_yesno "$msg" "$hline"
 	result=$?
 	f_dialog_title_restore
 
-	if [ $result -eq 0 ]; then
+	if [ $result -eq $DIALOG_OK ]; then
 		# User chose YES
 		f_install_zoneinfo_file "$default"
 		result=$?
@@ -287,7 +287,7 @@ while :; do
 		retval=$?
 		f_dialog_menutag_fetch mtag
 
-		if [ $retval -ne 0 ]; then
+		if [ $retval -ne $DIALOG_OK ]; then
 			[ "$TZ_OR_FAIL" ] && f_die
 			exit $SUCCESS
 		fi
@@ -322,16 +322,16 @@ while :; do
 			# It's amazing how much good grammar really matters...
 			#
 			if [ ! "$isocean" ]; then
-				title=$( printf "$msg_country_title" \
-				                "$cont_title" )
+				f_sprintf title "$msg_country_title" \
+				                "$cont_title"
 				f_dialog_title "$title"
 				title="$DIALOG_TITLE"
 				btitle="$DIALOG_BACKTITLE"
 				f_dialog_title_restore
 				prompt="$msg_select_country"
 			else
-				title=$( printf "$msg_island_and_group_title" \
-				                "$cont_title" )
+				f_sprintf title "$msg_island_and_group_title" \
+				                "$cont_title"
 				f_dialog_title "$title"
 				title="$DIALOG_TITLE"
 				btitle="$DIALOG_BACKTITLE"
@@ -368,7 +368,7 @@ while :; do
 			f_dialog_data_sanitize tag
 			defaultctry="$tag"
 
-			if [ $retval -ne 0 ]; then
+			if [ $retval -ne $DIALOG_OK ]; then
 				NEED_CONTINENT=1
 				continue # back to main menu
 			fi
@@ -397,11 +397,10 @@ while :; do
 			continue
 		fi
 	else
-		title=$( printf "$msg_country_time_zones" \
-		                "$( f_country $tlc name )" )
+		f_sprintf title "$msg_country_time_zones" \
+		                "$( f_country $tlc name )"
 		f_dialog_title "$title"
-		title="$DIALOG_TITLE"
-		btitle="$DIALOG_BACKTITLE"
+		title="$DIALOG_TITLE" btitle="$DIALOG_BACKTITLE"
 		f_dialog_title_restore
 		prompt="$msg_select_zone"
 		menu_list=$( f_country $tlc menu_list )
@@ -427,7 +426,7 @@ while :; do
 		f_dialog_data_sanitize n
 		defaultzone="$n"
 
-		if [ $retval -ne 0 ]; then
+		if [ $retval -ne $DIALOG_OK ]; then
 			[ $nitems -eq 1 ] && NEED_CONTINENT=1
 			NEED_COUNTRY=1
 			continue
@@ -441,7 +440,7 @@ while :; do
 		f_confirm_zone "$real_continent/$filename" || continue
 	fi
 
-	[ $retval -eq 0 ] || continue # back to main menu
+	[ $retval -eq $DIALOG_OK ] || continue # back to main menu
 
 	if ! f_install_zoneinfo "$real_continent/$filename"; then
 		[ $nzones -lt 0 ] && NEED_COUNTRY=1
diff --git a/usr.sbin/bsdconfig/ttys/ttys b/usr.sbin/bsdconfig/ttys/ttys
index 999ce7619ac..ed7ba756b78 100755
--- a/usr.sbin/bsdconfig/ttys/ttys
+++ b/usr.sbin/bsdconfig/ttys/ttys
@@ -37,8 +37,8 @@ f_include $BSDCFG_SHARE/mustberoot.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="150.ttys"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
diff --git a/usr.sbin/bsdconfig/usermgmt/groupadd b/usr.sbin/bsdconfig/usermgmt/groupadd
index 6f806a65a8a..62f062d85ec 100755
--- a/usr.sbin/bsdconfig/usermgmt/groupadd
+++ b/usr.sbin/bsdconfig/usermgmt/groupadd
@@ -36,8 +36,8 @@ f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
diff --git a/usr.sbin/bsdconfig/usermgmt/groupdel b/usr.sbin/bsdconfig/usermgmt/groupdel
index 30762168eed..aa1c305ad04 100755
--- a/usr.sbin/bsdconfig/usermgmt/groupdel
+++ b/usr.sbin/bsdconfig/usermgmt/groupdel
@@ -39,8 +39,8 @@ f_include $BSDCFG_SHARE/usermgmt/group_input.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
@@ -75,7 +75,7 @@ while :; do
 	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
 	defaultitem="$mtag"
 
-	[ $retval -eq 0 ] || f_die
+	[ $retval -eq $DIALOG_OK ] || f_die
 
 	[ "$mtag" = "X $msg_exit" ] && break
 
diff --git a/usr.sbin/bsdconfig/usermgmt/groupedit b/usr.sbin/bsdconfig/usermgmt/groupedit
index 1f1c744d62c..953f4f56748 100755
--- a/usr.sbin/bsdconfig/usermgmt/groupedit
+++ b/usr.sbin/bsdconfig/usermgmt/groupedit
@@ -39,8 +39,8 @@ f_include $BSDCFG_SHARE/usermgmt/group_input.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
@@ -75,7 +75,7 @@ while :; do
 	f_dprintf "retval=%s mtag=[%s]" $retval "$mtag"
 	defaultitem="$mtag"
 
-	[ $retval -eq 0 ] || f_die
+	[ $retval -eq $DIALOG_OK ] || f_die
 
 	[ "$mtag" = "X $msg_exit" ] && break
 
diff --git a/usr.sbin/bsdconfig/usermgmt/groupinput b/usr.sbin/bsdconfig/usermgmt/groupinput
index 6fff40fa372..f98e890b603 100755
--- a/usr.sbin/bsdconfig/usermgmt/groupinput
+++ b/usr.sbin/bsdconfig/usermgmt/groupinput
@@ -39,8 +39,8 @@ f_include $BSDCFG_SHARE/usermgmt/group_input.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -56,16 +56,12 @@ ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
 #
 save_changes()
 {
-	local err retval=$SUCCESS
+	local funcname=save_changes
 
 	case "$mode" in
 	Delete)
-		err=$( pw groupdel "$group_name" 2>&1 )
-		retval=$?
-		if [ $retval -ne $SUCCESS ]; then
-			f_dialog_msgbox "$msg_error $err\n"
-			return $retval
-		fi
+		f_eval_catch $funcname pw 'pw groupdel "%s"' "$group_name" ||
+			return $?
 		f_show_msg "$msg_group_deleted"
 		;;
 	Add)
@@ -74,17 +70,13 @@ save_changes()
 		[ "$group_members" != "$cur_group_members" ] &&
 			cmd="$cmd -M '$group_members'"
 		if [ "$pw_group_password_disable" ]; then
-			cmd="$cmd -h -"
+			f_eval_catch $funcname pw '%s -h -' "$cmd"
 		elif [ "$group_password" ]; then
-			cmd="echo \"\$group_password\" | $cmd -h 0"
-		fi
-		f_dprintf "cmd=%s" "$cmd"
-		err=$( eval $cmd 2>&1 )
-		retval=$?
-		if [ $retval -ne $SUCCESS ]; then
-			f_dialog_msgbox "$msg_error $err\n"
-			return $retval
-		fi
+			echo "$group_password" |
+				f_eval_catch $funcname pw '%s -h 0' "$cmd"
+		else
+			f_eval_catch $funcname pw '%s' "$cmd"
+		fi || return $?
 		f_show_msg "$msg_group_added"
 		;;
 	Edit/View)
@@ -93,17 +85,13 @@ save_changes()
 		[ "$group_members" != "$cur_group_members" ] &&
 			cmd="$cmd -M '$group_members'"
 		if [ "$pw_group_password_disable" ]; then
-			cmd="$cmd -h -"
+			f_eval_catch $funcname pw '%s -h -' "$cmd"
 		elif [ "$group_password" ]; then
-			cmd="echo \"\$group_password\" | $cmd -h 0"
-		fi
-		f_dprintf "cmd=%s" "$cmd"
-		err=$( eval $cmd 2>&1 )
-		retval=$?
-		if [ $retval -ne $SUCCESS ]; then
-			f_dialog_msgbox "$msg_error $err\n"
-			return $retval
-		fi
+			echo "$group_password" |
+				f_eval_catch $funcname pw '%s -h 0' "$cmd"
+		else
+			f_eval_catch $funcname pw '%s' "$cmd"
+		fi || return $?
 		f_show_msg "$msg_group_updated"
 		;;
 	esac
@@ -162,9 +150,9 @@ if [ "$mode" = "Add" ]; then
 	f_dialog_noyes "$msg_use_default_values_for_all_account_details"
 	retval=$?
 
-	if [ $retval -eq 255 ]; then # User pressed ESC
+	if [ $retval -eq $DIALOG_ESC ]; then
 		exit $SUCCESS
-	elif [ $retval -ne $SUCCESS ]; then
+	elif [ $retval -ne $DIALOG_OK ]; then
 		#
 		# Ask a series of questions to pre-fill the editor screen.
 		#
@@ -174,9 +162,9 @@ if [ "$mode" = "Add" ]; then
 		#
 	
 		[ "$passwdtype" = "yes" ] &&
-			{ f_dialog_input_group_password || exit 0; }
-		f_dialog_input_group_gid  || exit 0
-		f_dialog_input_group_members || exit 0
+			{ f_dialog_input_group_password || exit $SUCCESS; }
+		f_dialog_input_group_gid  || exit $SUCCESS
+		f_dialog_input_group_members || exit $SUCCESS
 	fi
 fi
 
@@ -255,13 +243,11 @@ while :; do
 	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
 
 	# Exit if user has either pressed ESC or chosen Cancel/No
-	[ $retval -eq $SUCCESS ] || f_die
+	[ $retval -eq $DIALOG_OK ] || f_die
 
 	case "$mtag" in
 	X) # Exit
-	   if [ "$save_flag" ]; then
-	   	save_changes || continue
-	   fi
+	   [ "$save_flag" ] && { save_changes || continue; }
 	   break
 	   ;;
 	1) # Group Name
@@ -274,7 +260,7 @@ while :; do
 	   	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
 
 	   	# Loop if user has either pressed ESC or chosen Cancel/No
-	   	[ $retval -eq $SUCCESS ] || continue
+	   	[ $retval -eq $DIALOG_OK ] || continue
 
 	   	[ "$mtag" = "X $msg_exit" ] && continue
 
diff --git a/usr.sbin/bsdconfig/usermgmt/include/messages.subr b/usr.sbin/bsdconfig/usermgmt/include/messages.subr
index 71cc51d926f..e139f32b710 100644
--- a/usr.sbin/bsdconfig/usermgmt/include/messages.subr
+++ b/usr.sbin/bsdconfig/usermgmt/include/messages.subr
@@ -32,9 +32,9 @@ hline_arrows_space_tab_enter="Use arrows, SPACE, TAB or ENTER"
 hline_arrows_tab_enter="Press arrows, TAB or ENTER"
 hline_num_arrows_tab_enter="Use numbers, arrows, TAB or ENTER"
 hline_num_tab_enter="Use numbers, TAB or ENTER"
+msg_account_does_not_expire="Account does not expire"
 msg_account_expires_in_how_many_days="Account expires in how many days?"
 msg_account_expires_on="Account Expires on"
-msg_account_does_not_expire="Account does not expire"
 msg_add="Add"
 msg_add_group="Add Group"
 msg_add_login="Add Login"
@@ -65,9 +65,9 @@ msg_group="Group"
 msg_group_added="Group Added"
 msg_group_already_used="%s: Group is already used."
 msg_group_deleted="Group Deleted"
-msg_group_is_empty="Group is empty."
 msg_group_id="Group ID"
 msg_group_id_leave_empty_for_default="Group ID (Leave empty for default)"
+msg_group_is_empty="Group is empty."
 msg_group_members="Group Members"
 msg_group_must_start_with_letter="Group must start with a letter."
 msg_group_not_found="%s: Group not found."
@@ -89,21 +89,21 @@ msg_login_not_found="Login not found."
 msg_login_updated="Login Updated"
 msg_member_of_groups="Member of Groups"
 msg_n_a="N/A"
-msg_number_of_seconds_since_epoch="Number of seconds since the Epoch\n(1 = %s)\nNULL or zero to disable:"
 msg_no="No"
+msg_number_of_seconds_since_epoch="Number of seconds since the Epoch\n(1 = %s)\nNULL or zero to disable:"
 msg_ok="OK"
 msg_password="Password"
+msg_password_does_not_expire="Password does not expire"
 msg_password_expires_in_how_many_days="Password expires in how many days?"
 msg_password_expires_on="Password Expires on"
 msg_passwords_do_not_match="Passwords do not match."
-msg_password_does_not_expire="Password does not expire"
 msg_reenter_group_password="Re-enter Group Password"
 msg_reenter_password="Re-enter Password"
 msg_save="Save"
 msg_save_exit_or_cancel="Choose Save/Exit when finished or Cancel."
-msg_separated_by_commas="Separated by commas"
 msg_select_group_members_from_list="Select Group Members from a list"
 msg_select_login_shell="Select Login Shell"
+msg_separated_by_commas="Separated by commas"
 msg_shell="Shell"
 msg_unknown_user_management_menu_selection="Unknown user management menu selection"
 msg_use_default_values_for_all_account_details="Use default values for all account details?"
diff --git a/usr.sbin/bsdconfig/usermgmt/share/group_input.subr b/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
index 93d981acd98..e0f47f75f50 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/group_input.subr
@@ -125,15 +125,15 @@ f_dialog_input_group_name()
 
 		# Return if user has either pressed ESC or chosen Cancel/No
 		f_dialog_input _input "$msg_group" "$_input" \
-		               "$hline_alnum_tab_enter" || return
+		               "$hline_alnum_tab_enter" || return $?
 
 		# Check for no-change
-		[ "$_input" = "$_name" ] && return $SUCCESS
+		[ "$_input" = "$_name" ] && return $DIALOG_OK
 
 		# Check for reversion
 		if [ "$_input" = "$cur_group_name" ]; then
 			group_name="$cur_group_name"
-			return $SUCCESS
+			return $DIALOG_OK
 		fi
 
 		# Check for NULL entry
@@ -161,7 +161,7 @@ f_dialog_input_group_name()
 
 	f_dprintf "group_name: [%s]->[%s]" "$cur_group_name" "$group_name"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_group_password
@@ -210,7 +210,7 @@ f_dialog_input_group_password()
 		debug= f_dialog_line_sanitize _password1
 
 		# Return if user has either pressed ESC or chosen Cancel/No
-		[ $retval -eq $SUCCESS ] || return $retval
+		[ $retval -eq $DIALOG_OK ] || return $retval
 
 		_password2=$( $DIALOG \
 			--title "$DIALOG_TITLE"         \
@@ -227,7 +227,7 @@ f_dialog_input_group_password()
 		debug= f_dialog_line_sanitize _password2
 
 		# Return if user has either pressed ESC or chosen Cancel/No
-		[ $retval -eq $SUCCESS ] || return $retval
+		[ $retval -eq $DIALOG_OK ] || return $retval
 
 		# Check for password mismatch
 		if [ "$_password1" != "$_password2" ]; then
@@ -239,9 +239,9 @@ f_dialog_input_group_password()
 		if [ ! "$_password1" ]; then
 			f_dialog_yesno "$msg_disable_password_auth_for_group"
 			local retval=$?
-			if [ $retval -eq 255 ]; then # ESC was pressed
+			if [ $retval -eq $DIALOG_ESC ]; then
 				return $retval
-			elif [ $retval -eq $SUCCESS ]; then
+			elif [ $retval -eq $DIALOG_OK ]; then
 				pw_group_password_disable=1
 			else
 				continue # back to password prompt
@@ -258,7 +258,7 @@ f_dialog_input_group_password()
 	f_dprintf "group_password: [%s]->[%s]" \
 	          "$cur_group_password" "$group_password"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_group_gid [$group_gid]
@@ -273,14 +273,14 @@ f_dialog_input_group_gid()
 
 	# Return if user has either pressed ESC or chosen Cancel/No
 	f_dialog_input _input "$msg_group_id_leave_empty_for_default" \
-	               "$_input" "$hline_num_tab_enter" || return
+	               "$_input" "$hline_num_tab_enter" || return $?
 
 	group_gid="$_input"
 	save_flag=1
 
 	f_dprintf "group_gid: [%s]->[%s]" "$cur_group_gid" "$group_gid"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_group_members [$group_members]
@@ -329,7 +329,7 @@ f_dialog_input_group_members()
 		f_dprintf "retval=%u menu_choice=[%s]" $retval "$menu_choice"
 
 		# Return if user has either pressed ESC or chosen Cancel/No
-		[ $retval -eq $SUCCESS ] || return $retval
+		[ $retval -eq $DIALOG_OK ] || return $retval
 
 		local _group_members
 		case "$menu_choice" in
@@ -371,15 +371,12 @@ f_dialog_input_group_members()
 				# pressed ESC or chose Cancel/No
 			f_dialog_data_sanitize _group_members
 
+			#
 			# Convert the newline separated list into a comma-
 			# separated one so that if the user switches over to
 			# manual editing, list reflects checklist selections
-			_group_members=$( echo "$_group_members" |
-				tr '\n' ' ' |
-				sed -e 's/[[:space:]]\{1,\}/,/g;s/^,//;s/,$//'
-			)
-
-			_input="$_group_members"
+			#
+			f_replaceall "$_group_members" "[$IFS]" "," _input
 			;;
 		2) # Enter Group Members manually
 			local p="$msg_group_members ($msg_separated_by_commas)"
@@ -399,7 +396,7 @@ f_dialog_input_group_members()
 	f_dprintf "group_members: [%s]->[%s]" \
 	          "$cur_group_members" "$group_members"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
index 21bfbd37589..c95685c4aec 100644
--- a/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
+++ b/usr.sbin/bsdconfig/usermgmt/share/user_input.subr
@@ -206,7 +206,7 @@ f_dialog_input_member_groups()
 	f_dprintf "pw_member_groups: [%s]->[%s]" \
 	          "$cur_pw_member_groups" "$pw_member_groups"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_name [$name]
@@ -229,15 +229,15 @@ f_dialog_input_name()
 
 		# Return if user has either pressed ESC or chosen Cancel/No
 		f_dialog_input _input "$msg_login" "$_input" \
-		               "$hline_alnum_tab_enter" || return
+		               "$hline_alnum_tab_enter" || return $?
 
 		# Check for no-change
-		[ "$_input" = "$_name" ] && return $SUCCESS
+		[ "$_input" = "$_name" ] && return $DIALOG_OK
 
 		# Check for reversion
 		if [ "$_input" = "$cur_pw_name" ]; then
 			pw_name="$cur_pw_name"
-			return $SUCCESS
+			return $DIALOG_OK
 		fi
 
 		# Check for NULL entry
@@ -265,7 +265,7 @@ f_dialog_input_name()
 
 	f_dprintf "pw_name: [%s]->[%s]" "$cur_pw_name" "$pw_name"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_password
@@ -336,9 +336,9 @@ f_dialog_input_password()
 		if [ ! "$_password1" ]; then
 			f_dialog_yesno "$msg_disable_password_auth_for_account"
 			local retval=$?
-			if [ $retval -eq 255 ]; then # ESC was pressed
+			if [ $retval -eq $DIALOG_ESC ]; then
 				return $retval
-			elif [ $retval -eq $SUCCESS ]; then
+			elif [ $retval -eq $DIALOG_OK ]; then
 				pw_password_disable=1
 			else
 				continue # back to password prompt
@@ -354,7 +354,7 @@ f_dialog_input_password()
 
 	f_dprintf "pw_password: [%s]->[%s]" "$cur_pw_password" "$pw_password"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_gecos [$gecos]
@@ -370,14 +370,14 @@ f_dialog_input_gecos()
 
 	# Return if user has either pressed ESC or chosen Cancel/No
 	f_dialog_input _input "$msg_full_name" "$_input" \
-	               "$hline_alnum_punc_tab_enter" || return
+	               "$hline_alnum_punc_tab_enter" || return $?
 
 	pw_gecos="$_input"
 	save_flag=1
 
 	f_dprintf "pw_gecos: [%s]->[%s]" "$cur_pw_gecos" "$pw_gecos"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_uid [$uid]
@@ -392,14 +392,14 @@ f_dialog_input_uid()
 
 	# Return if user has either pressed ESC or chosen Cancel/No
 	f_dialog_input _input "$msg_user_id_leave_empty_for_default" \
-	               "$_input" "$hline_num_tab_enter" || return
+	               "$_input" "$hline_num_tab_enter" || return $?
 
 	pw_uid="$_input"
 	save_flag=1
 
 	f_dprintf "pw_uid: [%s]->[%s]" "$cur_pw_uid" "$pw_uid"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_gid [$gid]
@@ -414,14 +414,14 @@ f_dialog_input_gid()
 
 	# Return if user has either pressed ESC or chosen Cancel/No
 	f_dialog_input _input "$msg_group_id_leave_empty_for_default" \
-	               "$_input" "$hline_num_tab_enter" || return
+	               "$_input" "$hline_num_tab_enter" || return $?
 
 	pw_gid="$_input"
 	save_flag=1
 
 	f_dprintf "pw_gid: [%s]->[%s]" "$cur_pw_gid" "$pw_gid"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_class [$class]
@@ -436,14 +436,14 @@ f_dialog_input_class()
 
 	# Return if user has either pressed ESC or chosen Cancel/No
 	f_dialog_input _input "$msg_login_class" "$_input" \
-	               "$hline_alnum_tab_enter" || return
+	               "$hline_alnum_tab_enter" || return $?
 
 	pw_class="$_input"
 	save_flag=1
 
 	f_dprintf "pw_class: [%s]->[%s]" "$cur_pw_class" "$pw_class"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_expire_password [$seconds]
@@ -508,7 +508,7 @@ f_dialog_input_expire_password()
 		f_dprintf "retval=%u date_type=[%s]" $retval "$date_type"
 
 		# Return if user has either pressed ESC or chosen Cancel/No
-		[ $retval -eq $SUCCESS ] || return $retval
+		[ $retval -eq $DIALOG_OK ] || return $retval
 
 		case "$date_type" in
 		1) # Password does not expire
@@ -538,7 +538,7 @@ f_dialog_input_expire_password()
 			f_dprintf "retval=%u ret_date=[%s]" $retval "$ret_date"
 
 			# Return to menu if either ESC or Cancel/No
-			[ $retval -eq $SUCCESS ] || continue
+			[ $retval -eq $DIALOG_OK ] || continue
 
 			_input_time=
 			[ "$secs" ] && _input_time=$( date -j \
@@ -559,7 +559,7 @@ f_dialog_input_expire_password()
 			f_dprintf "retval=%u ret_time=[%s]" $retval "$ret_time"
 
 			# Return to menu if either ESC or Cancel/No
-			[ $retval -eq $SUCCESS ] || continue
+			[ $retval -eq $DIALOG_OK ] || continue
 
 			_input=$( date \
 			          	-j -f "%d/%m/%Y %T" \
@@ -599,8 +599,8 @@ f_dialog_input_expire_password()
 
 		4) # Enter value manually
 			local msg ret_secs
-			msg=$( printf "$msg_number_of_seconds_since_epoch" \
-			              "$( date -r 1 "+%c %Z" )" )
+			f_sprintf msg "$msg_number_of_seconds_since_epoch" \
+			              "$( date -r 1 "+%c %Z" )"
 
 			# Return to menu if either ESC or Cancel/No
 			f_dialog_input ret_secs \
@@ -627,7 +627,7 @@ f_dialog_input_expire_password()
 	f_dprintf "pw_password_expire: [%s]->[%s]" \
 	          "$cur_pw_password_expire" "$pw_password_expire"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_expire_account [$seconds]
@@ -692,7 +692,7 @@ f_dialog_input_expire_account()
 		f_dprintf "retval=%u date_type=[%s]" $retval "$date_type"
 
 		# Return if user has either pressed ESC or chosen Cancel/No
-		[ $retval -eq $SUCCESS ] || return $retval
+		[ $retval -eq $DIALOG_OK ] || return $retval
 
 		case "$date_type" in
 		1) # Account does not expire
@@ -722,7 +722,7 @@ f_dialog_input_expire_account()
 			f_dprintf "retval=%u ret_date=[%s]" $retval "$ret_date"
 
 			# Return to menu if either ESC or Cancel/No
-			[ $retval -eq $SUCCESS ] || continue
+			[ $retval -eq $DIALOG_OK ] || continue
 
 			_input_time=
 			[ "$secs" ] && _input_time=$( date -j \
@@ -743,7 +743,7 @@ f_dialog_input_expire_account()
 			f_dprintf "retval=%u ret_time=[%s]" $retval "$ret_time"
 
 			# Return to menu if either ESC or Cancel/No
-			[ $retval -eq $SUCCESS ] || continue
+			[ $retval -eq $DIALOG_OK ] || continue
 
 			_input=$( date \
 			          	-j -f "%d/%m/%Y %T" \
@@ -783,8 +783,8 @@ f_dialog_input_expire_account()
 
 		4) # Enter value manually
 			local msg ret_secs
-			msg=$( printf "$msg_number_of_seconds_since_epoch" \
-			              "$( date -r 1 "+%c %Z" )" )
+			f_sprintf msg "$msg_number_of_seconds_since_epoch" \
+			              "$( date -r 1 "+%c %Z" )"
 
 			# Return to menu if either ESC or Cancel/No
 			f_dialog_input ret_secs "$msg" \
@@ -811,7 +811,7 @@ f_dialog_input_expire_account()
 	f_dprintf "pw_account_expire: [%s]->[%s]" \
 	          "$cur_pw_account_expire" "$pw_account_expire"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_home_dir [$home_dir]
@@ -826,14 +826,14 @@ f_dialog_input_home_dir()
 
 	# Return if user has either pressed ESC or chosen Cancel/No
 	f_dialog_input _input "$msg_home_directory" "$_input" \
-	               "$hline_alnum_punc_tab_enter" || return
+	               "$hline_alnum_punc_tab_enter" || return $?
 
 	pw_home_dir="$_input"
 	save_flag=1
 
 	f_dprintf "pw_home_dir: [%s]->[%s]" "$cur_pw_home_dir" "$pw_home_dir"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 # f_dialog_input_home_create
@@ -850,7 +850,7 @@ f_dialog_input_home_create()
 	f_dialog_yesno "$msg_create_home_directory"
 	retval=$?
 
-	if [ $retval -eq $SUCCESS ]; then
+	if [ $retval -eq $DIALOG_OK ]; then
 		pw_home_create="$msg_yes"
 	else
 		pw_home_create="$msg_no"
@@ -860,7 +860,7 @@ f_dialog_input_home_create()
 	f_dprintf "pw_home_create: [%s]->[%s]" \
 	          "$cur_pw_home_create" "$pw_home_create"
 
-	[ $retval -ne 255 ] # return failure if user pressed ESC
+	[ $retval -ne $DIALOG_ESC ] # return failure if user pressed ESC
 }
 
 # f_dialog_input_group_delete
@@ -893,7 +893,7 @@ f_dialog_input_group_delete()
 	fi
 	retval=$?
 
-	if [ $retval -eq $SUCCESS ]; then
+	if [ $retval -eq $DIALOG_OK ]; then
 		pw_group_delete="$msg_yes"
 	else
 		pw_group_delete="$msg_no"
@@ -903,7 +903,7 @@ f_dialog_input_group_delete()
 	f_dprintf "pw_group_delete: [%s]->[%s]" \
 	          "$cur_pw_group_delete" "$pw_group_delete"
 
-	[ $retval -ne 255 ] # return failure if user pressed ESC
+	[ $retval -ne $DIALOG_ESC ] # return failure if user pressed ESC
 }
 
 # f_dialog_input_home_delete
@@ -920,7 +920,7 @@ f_dialog_input_home_delete()
 	f_dialog_yesno "$msg_delete_home_directory"
 	retval=$?
 
-	if [ $retval -eq $SUCCESS ]; then
+	if [ $retval -eq $DIALOG_OK ]; then
 		pw_home_delete="$msg_yes"
 	else
 		pw_home_delete="$msg_no"
@@ -930,7 +930,7 @@ f_dialog_input_home_delete()
 	f_dprintf "pw_home_delete: [%s]->[%s]" \
 	          "$cur_pw_home_delete" "$pw_home_delete"
 
-	[ $retval -ne 255 ] # return failure if user pressed ESC
+	[ $retval -ne $DIALOG_ESC ] # return failure if user pressed ESC
 }
 
 # f_dialog_input_dotfiles_create
@@ -948,7 +948,7 @@ f_dialog_input_dotfiles_create()
 	f_dialog_yesno "$msg_create_dotfiles"
 	retval=$?
 
-	if [ $retval -eq $SUCCESS ]; then
+	if [ $retval -eq $DIALOG_OK ]; then
 		pw_dotfiles_create="$msg_yes"
 	else
 		pw_dotfiles_create="$msg_no"
@@ -958,7 +958,7 @@ f_dialog_input_dotfiles_create()
 	f_dprintf "pw_dotfiles_create: [%s]->[%s]" \
 	          "$cur_pw_dotfiles_create" "$pw_dotfiles_create"
 
-	[ $retval -ne 255 ] # return failure if user pressed ESC
+	[ $retval -ne $DIALOG_ESC ] # return failure if user pressed ESC
 }
 
 # f_dialog_input_shell [$shell]
@@ -1015,7 +1015,7 @@ f_dialog_input_shell()
 
 	f_dprintf "pw_shell: [%s]->[%s]" "$cur_pw_shell" "$pw_shell"
 
-	return $SUCCESS
+	return $DIALOG_OK
 }
 
 ############################################################ MAIN
diff --git a/usr.sbin/bsdconfig/usermgmt/useradd b/usr.sbin/bsdconfig/usermgmt/useradd
index b8cac27ba4e..2d6b4d05782 100755
--- a/usr.sbin/bsdconfig/usermgmt/useradd
+++ b/usr.sbin/bsdconfig/usermgmt/useradd
@@ -36,8 +36,8 @@ f_include $BSDCFG_SHARE/dialog.subr
 
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
diff --git a/usr.sbin/bsdconfig/usermgmt/userdel b/usr.sbin/bsdconfig/usermgmt/userdel
index f2664979885..33aa062ce6c 100755
--- a/usr.sbin/bsdconfig/usermgmt/userdel
+++ b/usr.sbin/bsdconfig/usermgmt/userdel
@@ -39,8 +39,8 @@ f_include $BSDCFG_SHARE/usermgmt/user_input.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
@@ -75,7 +75,7 @@ while :; do
 	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
 	defaultitem="$mtag"
 
-	[ $retval -eq 0 ] || f_die
+	[ $retval -eq $DIALOG_OK ] || f_die
 
 	[ "$mtag" = "X $msg_exit" ] && break
 
diff --git a/usr.sbin/bsdconfig/usermgmt/useredit b/usr.sbin/bsdconfig/usermgmt/useredit
index 64b7b8e2fc8..30ee5780294 100755
--- a/usr.sbin/bsdconfig/usermgmt/useredit
+++ b/usr.sbin/bsdconfig/usermgmt/useredit
@@ -39,8 +39,8 @@ f_include $BSDCFG_SHARE/usermgmt/user_input.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ MAIN
 
@@ -75,7 +75,7 @@ while :; do
 	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
 	defaultitem="$mtag"
 
-	[ $retval -eq 0 ] || f_die
+	[ $retval -eq $DIALOG_OK ] || f_die
 
 	[ "$mtag" = "X $msg_exit" ] && break
 
diff --git a/usr.sbin/bsdconfig/usermgmt/userinput b/usr.sbin/bsdconfig/usermgmt/userinput
index 196262b229e..5cf55547a7c 100755
--- a/usr.sbin/bsdconfig/usermgmt/userinput
+++ b/usr.sbin/bsdconfig/usermgmt/userinput
@@ -39,8 +39,8 @@ f_include $BSDCFG_SHARE/usermgmt/user_input.subr
 BSDCFG_LIBE="/usr/libexec/bsdconfig" APP_DIR="070.usermgmt"
 f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ CONFIGURATION
 
@@ -74,29 +74,24 @@ copy_dotfiles()
 #
 save_changes()
 {
-	local err retval=$SUCCESS
+	local funcname=save_changes
 
 	case "$mode" in
 	Delete)
-		err=$( pw userdel -u "$pw_uid" 2>&1 )
-		retval=$?
-		if [ $retval -ne $SUCCESS ]; then
-			f_dialog_msgbox "$msg_error $err\n"
-			return $retval
-		fi
+		f_eval_catch $funcname pw 'pw userdel -u "%s"' "$pw_uid" ||
+			return $?
 		f_show_msg "$msg_login_deleted"
 
 		if [ "$pw_group_delete" = "$msg_yes" ] &&
 		   f_quietly pw groupshow -g "$pw_gid"
 		then
-			err=$( pw groupdel -g "$pw_gid" 2>&1 ) ||
-				f_dialog_msgbox "$msg_warning $err\n"
+			f_eval_catch $funcname pw \
+				'pw groupdel -g "%s"' "$pw_gid"
 		fi
 
 		if [ "$pw_home_delete" = "$msg_yes" ]; then
 			f_dialog_info "$msg_deleting_home_directory"
-			err=$( rm -Rf "$pw_home_dir" 2>&1 ) ||
-				f_dialog_msgbox "$msg_warning $err\n"
+			f_eval_catch $funcname rm 'rm -Rf "%s"' "$pw_home_dir"
 		fi
 		;;
 	Add)
@@ -111,35 +106,27 @@ save_changes()
 		[ "$pw_shell"           ] && cmd="$cmd -s '$pw_shell'"
 		[ "$pw_uid"             ] && cmd="$cmd -u '$pw_uid'"
 		if [ "$pw_password_disable" ]; then
-			cmd="$cmd -h -"
+			f_eval_catch $funcname pw '%s -h -' "$cmd"
 		elif [ "$pw_password" ]; then
-			cmd="echo \"\$pw_password\" | $cmd -h 0"
-		fi
-		f_dprintf "cmd=%s" "$cmd"
-		err=$( eval $cmd 2>&1 )
-		retval=$?
-		if [ $retval -ne $SUCCESS ]; then
-			f_dialog_msgbox "$msg_error $err\n"
-			return $retval
-		fi
+			echo "$pw_password" |
+				f_eval_catch $funcname pw '%s -h 0' "$cmd"
+		else
+			f_eval_catch $funcname pw '%s' "$cmd"
+		fi || return $?
 		f_show_msg "$msg_login_added"
 
 		if [ "$pw_home_create" = "$msg_yes" ]; then
-			err=$( mkdir -p "$pw_home_dir" 2>&1 )
-			if [ $? -ne $SUCCESS ]; then
-				f_dialog_msgbox "$msg_warning $err\n"
-			elif [ -e "$pw_home_dir" ]; then
-				err=$( chown -R "$pw_uid:$pw_gid" \
-				                "$pw_home_dir" 2>&1 )
-				[ $? -eq $SUCCESS ] ||
-					f_dialog_msgbox "$msg_warning $err\n"
+			if f_eval_catch $funcname mkdir \
+				'mkdir -p "%s"' "$pw_home_dir"
+			then
+				f_eval_catch $funcname chown \
+					'chown -R "%s" "%s"' \
+					"$pw_uid:$pw_gid" "$pw_home_dir"
 			fi
 		fi
 
-		if [ "$pw_dotfiles_create" = "$msg_yes" ]; then
-			err=$( copy_dotfiles 2>&1 ) ||
-				f_dialog_msgbox "$msg_warning $err\n"
-		fi
+		[ "$pw_dotfiles_create" = "$msg_yes" ] &&
+			f_eval_catch $funcname copy_dotfiles copy_dotfiles
 
 		user="$pw_name"
 		f_quietly pw usershow -n "$pw_name" &&
@@ -157,35 +144,27 @@ save_changes()
 		[ "$pw_shell"           ] && cmd="$cmd -s '$pw_shell'"
 		[ "$pw_uid"             ] && cmd="$cmd -u '$pw_uid'"
 		if [ "$pw_password_disable" ]; then
-			cmd="$cmd -h -"
+			f_eval_catch $funcname pw '%s -h -' "$cmd"
 		elif [ "$pw_password" ]; then
-			cmd="echo \"\$pw_password\" | $cmd -h 0"
-		fi
-		f_dprintf "cmd=%s" "$cmd"
-		err=$( eval $cmd 2>&1 )
-		retval=$?
-		if [ $retval -ne $SUCCESS ]; then
-			f_dialog_msgbox "$msg_error $err\n"
-			return $retval
-		fi
+			echo "$pw_password" |
+				f_eval_catch $funcname pw '%s -h 0' "$cmd"
+		else
+			f_eval_catch $funcname pw '%s' "$cmd"
+		fi || return $?
 		f_show_msg "$msg_login_updated"
 
 		if [ "$pw_home_create" = "$msg_yes" ]; then
-			err=$( mkdir -p "$pw_home_dir" )
-			if [ $? -ne $SUCCESS ]; then
-				f_dialog_msgbox "$msg_warning $err\n"
-			elif [ -e "$pw_home_dir" ]; then
-				err=$( chown -R "$pw_uid:$pw_gid" \
-				                "$pw_home_dir" 2>&1 )
-				[ $? -eq $SUCCESS ] ||
-					f_dialog_msgbox "$msg_warning $err\n"
+			if f_eval_catch $funcname mkdir \
+				'mkdir -p "%s"' "$pw_home_dir"
+			then
+				f_eval_catch $funcname chown \
+					'chown -R "%i:%i" "%s"' \
+					"$pw_uid" "$pw_gid" "$pw_home_dir"
 			fi
 		fi
 
-		if [ "$pw_dotfiles_create" = "$msg_yes" ]; then
-			err=$( copy_dotfiles 2>&1 ) ||
-				f_dialog_msgbox "$msg_warning $err\n"
-		fi
+		[ "$pw_dotfiles_create" = "$msg_yes" ] &&
+			f_eval_catch $funcname copy_dotfiles copy_dotfiles
 		;;
 	esac
 
@@ -257,9 +236,9 @@ if [ "$mode" = "Add" ]; then
 	f_dialog_noyes "$msg_use_default_values_for_all_account_details"
 	retval=$?
 
-	if [ $retval -eq 255 ]; then # User pressed ESC
+	if [ $retval -eq $DIALOG_ESC ]; then
 		exit $SUCCESS
-	elif [ $retval -ne $SUCCESS ]; then
+	elif [ $retval -ne $DIALOG_OK ]; then
 		#
 		# Ask a series of questions to pre-fill the editor screen.
 		#
@@ -431,7 +410,7 @@ while :; do
 	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
 
 	# Exit if user has either pressed ESC or chosen Cancel/No
-	[ $retval -eq $SUCCESS ] || f_die
+	[ $retval -eq $DIALOG_OK ] || f_die
 
 	case "$mtag" in
 	X) # Exit
@@ -450,7 +429,7 @@ while :; do
 	   	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
 
 	   	# Loop if user has either pressed ESC or chosen Cancel/No
-	   	[ $retval -eq $SUCCESS ] || continue
+	   	[ $retval -eq $DIALOG_OK ] || continue
 
 	   	[ "$mtag" = "X $msg_exit" ] && continue
 
diff --git a/usr.sbin/bsdconfig/usermgmt/usermgmt b/usr.sbin/bsdconfig/usermgmt/usermgmt
index 0a4c160b35b..79fbc955133 100755
--- a/usr.sbin/bsdconfig/usermgmt/usermgmt
+++ b/usr.sbin/bsdconfig/usermgmt/usermgmt
@@ -40,8 +40,8 @@ f_include_lang $BSDCFG_LIBE/$APP_DIR/include/messages.subr
 
 USERMGMT_HELPFILE=$BSDCFG_LIBE/$APP_DIR/include/usermgmt.hlp
 
-ipgm=$( f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" )
-[ $? -eq $SUCCESS -a "$ipgm" ] && pgm="$ipgm"
+f_index_menusel_keyword $BSDCFG_LIBE/$APP_DIR/INDEX "$pgm" ipgm &&
+	pgm="${ipgm:-$pgm}"
 
 ############################################################ FUNCTIONS
 
@@ -100,7 +100,7 @@ dialog_menu_main()
 	f_dialog_menutag_store "$menu_choice"
 
 	# Only update default-item on success
-	[ $retval -eq 0 ] && f_dialog_default_store "$menu_choice"
+	[ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
 
 	return $retval
 }
@@ -136,11 +136,10 @@ while :; do
 	f_dialog_menutag_fetch mtag
 	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
 
-	if [ $retval -eq 2 ]; then
-		# The Help button was pressed
+	if [ $retval -eq $DIALOG_HELP ]; then
 		f_show_help "$USERMGMT_HELPFILE"
 		continue
-	elif [ $retval -ne $SUCCESS ]; then
+	elif [ $retval -ne $DIALOG_OK ]; then
 		f_die
 	fi
 
diff --git a/usr.sbin/bsdinstall/bsdinstall b/usr.sbin/bsdinstall/bsdinstall
index 2b555019344..a258e47cc2c 100755
--- a/usr.sbin/bsdinstall/bsdinstall
+++ b/usr.sbin/bsdinstall/bsdinstall
@@ -1,6 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,15 +26,63 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ INCLUDES
+
+# Delay processing of debug flags as the parent until MAIN. export'd to disable
+# re-processing of flags (all children log to the parent's log file).
+#
+export DEBUG_SELF_INITIALIZE=
+export DEBUG_INITIALIZE_FILE=
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+
+############################################################ GLOBALS
 
-: ${BSDINSTALL_LOG="/tmp/bsdinstall_log"}; export BSDINSTALL_LOG
 : ${BSDINSTALL_TMPETC="/tmp/bsdinstall_etc"}; export BSDINSTALL_TMPETC
+: ${BSDINSTALL_TMPBOOT="/tmp/bsdinstall_boot"}; export BSDINSTALL_TMPBOOT
 : ${PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"}; export PATH_FSTAB
 : ${BSDINSTALL_DISTDIR="/usr/freebsd-dist"}; export BSDINSTALL_DISTDIR
 : ${BSDINSTALL_CHROOT="/mnt"}; export BSDINSTALL_CHROOT
 
-VERB=${1:-auto}; shift
+export debugFile="${debugFile-${BSDINSTALL_LOG-/tmp/bsdinstall_log}}"
+
+############################################################ MAIN
+
+#
+# Process command-line arguments
+#
+while getopts $GETOPTS_STDARGS ignored; do
+	: just skipping known flags
+done
+shift $(( $OPTIND - 1 ))
+
+# What are we here to do?
+VERB="${1:-auto}"; shift
 
 [ -d "$BSDINSTALL_TMPETC" ] || mkdir -p "$BSDINSTALL_TMPETC"
-echo "Running installation step: $VERB $@" >> "$BSDINSTALL_LOG"
-exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>> "$BSDINSTALL_LOG"
+[ -d "$BSDINSTALL_TMPBOOT" ] || mkdir -p "$BSDINSTALL_TMPBOOT"
+
+# Only enable debugging if debugFile is non-NULL and can be initialized
+f_quietly f_debug_init
+f_isset debugFile || debug=
+
+f_dprintf "Running installation step: %s %s" "$VERB" "$*"
+if [ "$debug" ]; then
+	case "$debugFile" in
+	# If NULL, send errors to the bit-bucket
+	"") exec "/usr/libexec/bsdinstall/$VERB" "$@" 2> /dev/null ;;
+	# If begins with `+', send errors to both terminal and file (no `+')
+	+*) exec "/usr/libexec/bsdinstall/$VERB" "$@" \
+		2>&1 >&$TERMINAL_STDOUT_PASSTHRU | tee "${debugFile#+}" ;;
+	# Otherwise, just send errors to the file specified
+	*) exec "/usr/libexec/bsdinstall/$VERB" "$@" 2>> "$debugFile"
+	esac
+else
+	exec "/usr/libexec/bsdinstall/$VERB" "$@" 2> /dev/null
+fi
+
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdinstall/bsdinstall.8 b/usr.sbin/bsdinstall/bsdinstall.8
index 095062f7a2a..b841c36df81 100644
--- a/usr.sbin/bsdinstall/bsdinstall.8
+++ b/usr.sbin/bsdinstall/bsdinstall.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 21, 2013
+.Dd October 15, 2013
 .Dt BSDINSTALL 8
 .Os
 .Sh NAME
@@ -33,6 +33,7 @@
 .Nd system installer
 .Sh SYNOPSIS
 .Nm
+.Op Ar options
 .Op Ar target
 .Op Ar ...
 .Sh DESCRIPTION
@@ -49,6 +50,18 @@ invoked with no arguments, it will invoke the
 target, which provides a standard interactive installation, invoking the
 others in sequence. To perform a scripted installation, these subtargets
 can be invoked separately by an installation script.
+.Sh OPTIONS
+.Nm
+supports the following options, global to all targets:
+.Bl -tag -width indent+
+.It Fl D Ar file
+Provide a path for the installation log file
+.Pq overrides Ev BSDINSTALL_LOG .
+See
+.Sx ENVIRONMENT VARIABLES
+for more information on
+.Ev BSDINSTALL_LOG .
+.El
 .Sh TARGETS
 Most of the following targets are only useful for scripting the installer.
 For interactive use, most users will be interested only in the
@@ -60,6 +73,10 @@ targets.
 .Bl -tag -width ".Cm jail Ar destination"
 .It Cm auto
 Run the standard interactive installation, including disk partitioning.
+.It Cm entropy
+Reads a small amount of data from
+.Pa /dev/random
+and stores it in a file in the new system's root directory.
 .It Cm jail Ar destination
 Sets up a new chroot system at
 .Pa destination ,
@@ -104,6 +121,21 @@ installations. Partitions disks, runs
 .Xr newfs 8 ,
 and writes the new system's
 .Pa fstab .
+.It Cm zfsboot
+Provides the installer's
+.Pq experimental
+interactive/scriptable ZFS partitioner for multi-disk installations.
+Creates a single
+.Ic zpool
+with datasets and writes to the new system's
+.Pa rc.conf ,
+.Pa loader.conf ,
+and
+.Pa fstab .
+Supports
+.Xr geli 8 ,
+.Xr gnop 8 ,
+and many other features.
 .It Cm partedit
 Provides the installer's interactive manual disk partitioner, with support
 for multi disk setups, non-UFS file systems, and manual selection of
@@ -250,6 +282,14 @@ will be stored until the
 target is executed. If this directory does not already exist, it will be
 created. Default:
 .Pa /tmp/bsdinstall_etc
+.It Ev BSDINSTALL_TMPBOOT
+Directory where files destined for the new system's
+.Pa /boot
+will be stored until the
+.Cm config
+target is executed. If this directory does not already exist, it will be
+created. Default:
+.Pa /tmp/bsdinstall_boot
 .El
 .Sh SCRIPTING
 .Nm
@@ -303,6 +343,15 @@ the preamble can contain a variable
 which is passed to the
 .Cm scriptedpart
 target to control disk setup.
+Alternatively,
+instead of
+.Ev PARTITIONS ,
+the preamble can contain the variable
+.Ev ZFSBOOT_DATASETS
+which is parsed by the
+.Pq experimental
+.Cm zfsboot
+target to control ZFS datasets/options of the boot pool setup.
 .Ss SETUP SCRIPT
 Following the preamble is an optional shell script, beginning with a #!
 declaration. This script will be run at the end of the installation process
diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile
index bcfafc04838..07e3338252a 100644
--- a/usr.sbin/bsdinstall/scripts/Makefile
+++ b/usr.sbin/bsdinstall/scripts/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-SCRIPTS= auto adduser checksum config docsinstall hostname jail keymap \
-	 mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 rootpass \
-	 script services time umount wlanconfig
+SCRIPTS= auto adduser checksum config docsinstall entropy hostname jail \
+	 keymap mirrorselect mount netconfig netconfig_ipv4 netconfig_ipv6 \
+	 rootpass script services time umount wlanconfig zfsboot
 BINDIR= /usr/libexec/bsdinstall
 
 NO_MAN=	true
diff --git a/usr.sbin/bsdinstall/scripts/auto b/usr.sbin/bsdinstall/scripts/auto
index fe4e0412bb0..dce4fe560de 100755
--- a/usr.sbin/bsdinstall/scripts/auto
+++ b/usr.sbin/bsdinstall/scripts/auto
@@ -1,6 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,8 +26,13 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ INCLUDES
 
-echo "Begun Installation at $(date)" > $BSDINSTALL_LOG
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+
+############################################################ FUNCTIONS
 
 error() {
 	test -n "$DISTDIR_IS_UNIONFS" && umount -f $BSDINSTALL_DISTDIR
@@ -41,6 +47,9 @@ error() {
 	fi
 }
 
+############################################################ MAIN
+
+f_dprintf "Began Installation at %s" "$( date )"
 
 rm -rf $BSDINSTALL_TMPETC
 mkdir $BSDINSTALL_TMPETC
@@ -93,22 +102,49 @@ fi
 rm $PATH_FSTAB
 touch $PATH_FSTAB
 
-dialog --backtitle "FreeBSD Installer" --title "Partitioning" --extra-button \
-    --extra-label "Manual" --ok-label "Guided" --cancel-label "Shell" \
-    --yesno "Would you like to use the guided partitioning tool (recommended for beginners) or to set up partitions manually (experts)? You can also open a shell and set up partitions entirely by hand." 0 0
+PMODES="\
+Guided \"Partitioning Tool (Recommended for Beginners)\" \
+Manual \"Manually Configure Partitions (Expert)\" \
+Shell \"Open a shell and partition by hand\""
 
-case $? in
-0)	# Guided
+CURARCH=$( uname -m )
+case $CURARCH in
+	amd64|i386)	# Booting ZFS Supported
+		PMODES="$PMODES ZFS \"Automatic Root-on-ZFS (Experimental)\""
+		;;
+	*)		# Booting ZFS Unspported
+		;;
+esac
+
+exec 3>&1
+PARTMODE=`echo $PMODES | xargs dialog --backtitle "FreeBSD Installer" \
+	--title "Partitioning" \
+	--menu "How would you like to partition your disk?" \
+	0 0 0 2>&1 1>&3`
+if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi
+exec 3>&-
+
+case "$PARTMODE" in
+"Guided")	# Guided
 	bsdinstall autopart || error
 	bsdinstall mount || error
 	;;
-1)	# Shell
+"Shell")	# Shell
 	clear
 	echo "Use this shell to set up partitions for the new system. When finished, mount the system at $BSDINSTALL_CHROOT and place an fstab file for the new system at $PATH_FSTAB. Then type 'exit'. You can also enter the partition editor at any time by entering 'bsdinstall partedit'."
 	sh 2>&1
 	;;
-3)	# Manual
-	bsdinstall partedit || error
+"Manual")	# Manual
+	if f_isset debugFile; then
+		# Give partedit the path to our logfile so it can append
+		BSDINSTALL_LOG="${debugFile#+}" bsdinstall partedit || error
+	else
+		bsdinstall partedit || error
+	fi
+	bsdinstall mount || error
+	;;
+"ZFS")	# ZFS
+	bsdinstall zfsboot || error
 	bsdinstall mount || error
 	;;
 *)
@@ -222,5 +258,11 @@ if [ $? -eq 0 ]; then
 	chroot "$BSDINSTALL_CHROOT" /bin/sh 2>&1
 fi
 
-echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG
+bsdinstall entropy
+bsdinstall umount
 
+f_dprintf "Installation Completed at %s" "$( date )"
+
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdinstall/scripts/config b/usr.sbin/bsdinstall/scripts/config
index 4340450b896..3ddcadaa895 100755
--- a/usr.sbin/bsdinstall/scripts/config
+++ b/usr.sbin/bsdinstall/scripts/config
@@ -1,6 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,12 +26,24 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ MAIN
 
 cat $BSDINSTALL_TMPETC/rc.conf.* >> $BSDINSTALL_TMPETC/rc.conf
 rm $BSDINSTALL_TMPETC/rc.conf.*
 
 cp $BSDINSTALL_TMPETC/* $BSDINSTALL_CHROOT/etc
 
+cat $BSDINSTALL_TMPBOOT/loader.conf.* >> $BSDINSTALL_TMPBOOT/loader.conf
+rm $BSDINSTALL_TMPBOOT/loader.conf.*
+
+cp $BSDINSTALL_TMPBOOT/* $BSDINSTALL_CHROOT/boot
+
+[ "${debugFile#+}" ] && cp "${debugFile#+}" $BSDINSTALL_CHROOT/var/log/
+
 # Set up other things from installed config
 chroot $BSDINSTALL_CHROOT /usr/bin/newaliases
 
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdinstall/scripts/docsinstall b/usr.sbin/bsdinstall/scripts/docsinstall
old mode 100644
new mode 100755
index e16116c6262..2e893b53537
--- a/usr.sbin/bsdinstall/scripts/docsinstall
+++ b/usr.sbin/bsdinstall/scripts/docsinstall
@@ -1,6 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Marc Fonvieille
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,55 +26,137 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ INCLUDES
 
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/mustberoot.subr
+f_include $BSDCFG_SHARE/packages/packages.subr
 
-exec 3>&1
-DOCS=$(dialog --backtitle "FreeBSD Installer" \
-    --title "FreeBSD Documentation Installation" --separate-output \
-    --checklist "This menu will allow you to install the whole documentation set
-from the FreeBSD Documentation Project: Handbook, FAQ and articles.\n\n
-Please select the language versions you wish to install.  At minimum,
-you should install the English version, this is the original version
-of the documentation.\n\n
-NB: This requires a working, configured network connection." 0 0 0 \
-	bn	"Bengali Documentation" ${DIST_DOC_BN:-off} \
-	da	"Danish Documentation" ${DIST_DOC_DA:-off} \
-	de	"German Documentation" ${DIST_DOC_DE:-off} \
-	el	"Greek Documentation" ${DIST_DOC_EL:-off} \
-	en	"English Documentation (recommended)" ${DIST_DOC_EN:-on} \
-	es	"Spanish Documentation" ${DIST_DOC_ES:-off} \
-	fr	"French Documentation" ${DIST_DOC_FR:-off} \
-	hu	"Hungarian Documentation" ${DIST_DOC_HU:-off} \
-	it	"Italian Documentation" ${DIST_DOC_IT:-off} \
-	ja	"Japanese Documentation" ${DIST_DOC_JA:-off} \
-	mn	"Mongolian Documentation" ${DIST_DOC_MN:-off} \
-	nl	"Dutch Documentation" ${DIST_DOC_NL:-off} \
-	pl	"Polish Documentation" ${DIST_DOC_PL:-off} \
-	pt	"Portuguese Documentation" ${DIST_DOC_PT:-off} \
-	ru	"Russian Documentation" ${DIST_DOC_RU:-off} \
-	sr	"Serbian Documentation" ${DIST_DOC_SR:-off} \
-	tr	"Turkish Documentation" ${DIST_DOC_TR:-off} \
-	zh_cn	"Simplified Chinese Documentation" ${DIST_DOC_ZH_CN:-off} \
-	zh_tw	"Traditional Chinese Documentation" ${DIST_DOC_ZH_TW:-off} \
-2>&1 1>&3)
-test $? -eq 0 || exit 0
-exec 3>&-
+############################################################ CONFIGURATION
 
-# Let pkg_add be able to use name servers
-cp ${BSDINSTALL_TMPETC}/resolv.conf ${BSDINSTALL_CHROOT}/etc
-
-error() {
-	dialog --backtitle "FreeBSD Installer" --title "Error" --msgbox \
-	    "Could not install package $1 (`tail -n 1 ${BSDINSTALL_LOG}`)" 0 0
-	exit 1
+#
+# List of languages to display (descriptions pulled from $msg_{lang}doc_desc)
+#
+: ${DOCSINSTALL_LANGS:=\
+	bn da de el en es fr hu it ja mn nl pl pt ru sr tr zh_cn zh_tw \
 }
 
+############################################################ GLOBALS
 
-clear
-echo "FreeBSD Installer"
-echo "========================"
-echo
+#
+# Strings that should be moved to an i18n file and loaded with f_include_lang()
+#
+hline_arrows_space_tab_enter="Use arrows, SPACE, TAB or ENTER"
+msg_bndoc_desc="Bengali Documentation"
+msg_cancel="Cancel"
+msg_dadoc_desc="Danish Documentation"
+msg_dedoc_desc="German Documentation"
+msg_docsinstall_menu_text="This menu allows you to install the whole documentation set from\nthe FreeBSD Documentation Project: Handbook, FAQ, and articles.\n\nPlease select the language versions you wish to install. At\nminimum, you should install the English version, the original\nversion of the documentation."
+msg_eldoc_desc="Greek Documentation"
+msg_endoc_desc="English Documentation (recommended)"
+msg_esdoc_desc="Spanish Documentation"
+msg_frdoc_desc="French Documentation"
+msg_freebsd_documentation_installation="FreeBSD Documentation Installation"
+msg_freebsd_installer="FreeBSD Installer"
+msg_hudoc_desc="Hungarian Documentation"
+msg_itdoc_desc="Italian Documentation"
+msg_jadoc_desc="Japanese Documentation"
+msg_mndoc_desc="Mongolian Documentation"
+msg_nldoc_desc="Dutch Documentation"
+msg_ok="OK"
+msg_pldoc_desc="Polish Documentation"
+msg_ptdoc_desc="Portuguese Documentation"
+msg_rudoc_desc="Russian Documentation"
+msg_srdoc_desc="Serbian Documentation"
+msg_trdoc_desc="Turkish Documentation"
+msg_zh_cndoc_desc="Simplified Chinese Documentation"
+msg_zh_twdoc_desc="Traditional Chinese Documentation"
 
-for i in $DOCS; do
-    pkg_add -C ${BSDINSTALL_CHROOT} -r ${i}-freebsd-doc || error $i-freebsd-doc
+############################################################ FUNCTIONS
+
+# dialog_menu_main
+#
+# Display the dialog(1)-based application main menu.
+#
+dialog_menu_main()
+{
+	local title="$DIALOG_TITLE"
+	local btitle="$DIALOG_BACKTITLE"
+	local prompt="$msg_docsinstall_menu_text"
+	local check_list= # Calculated below
+	local hline="$hline_arrows_space_tab_enter"
+
+	local lang desc upper status
+	for lang in $DOCSINSTALL_LANGS; do
+		# Fetch the i18n description to display
+		f_getvar msg_${lang}doc_desc desc
+		f_shell_escape "$desc" desc
+
+		# Get default status for each language
+		upper=$( echo "$lang" | awk '{print toupper($0)}' )
+		case "$lang" in
+		en) f_getvar DIST_DOC_$upper:-on status ;;
+		 *) f_getvar DIST_DOC_$upper:-off status
+		esac
+
+		check_list="$check_list
+			'$lang' '$desc' '$status'
+		" # END-QUOTE
+	done
+
+	local height width rows
+	eval f_dialog_checklist_size height width rows \
+	                             \"\$title\"  \
+	                             \"\$btitle\" \
+	                             \"\$prompt\" \
+	                             \"\$hline\"  \
+	                             $check_list
+	local selected
+	selected=$( eval $DIALOG \
+		--title \"\$title\"             \
+		--backtitle \"\$btitle\"        \
+		--hline \"\$hline\"             \
+		--ok-label \"\$msg_ok\"         \
+		--cancel-label \"\$msg_cancel\" \
+		--checklist \"\$prompt\"        \
+		$height $width $rows            \
+		$check_list                     \
+		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
+	)
+	local retval=$?
+	f_dialog_menutag_store -s "$selected"
+	return $retval
+}
+
+############################################################ MAIN
+
+#
+# Initialize
+#
+f_dialog_title "$msg_freebsd_documentation_installation"
+f_dialog_backtitle "$msg_freebsd_installer"
+f_mustberoot_init
+
+#
+# Launch application main menu
+#
+dialog_menu_main || f_die
+f_dialog_menutag_fetch selected
+
+# Let pkg_add be able to use name servers
+f_quietly cp -f $BSDINSTALL_TMPETC/resolv.conf $BSDINSTALL_CHROOT/etc/
+
+#
+# Install each of the selected packages
+#
+for lang in $selected; do
+	f_package_add $lang-freebsd-doc || return $FAILURE
 done
+
+################################################################################
+# END
+################################################################################
diff --git a/share/xml/Makefile.inc b/usr.sbin/bsdinstall/scripts/entropy
old mode 100644
new mode 100755
similarity index 91%
rename from share/xml/Makefile.inc
rename to usr.sbin/bsdinstall/scripts/entropy
index e1c33983869..add6f30da3b
--- a/share/xml/Makefile.inc
+++ b/usr.sbin/bsdinstall/scripts/entropy
@@ -1,5 +1,6 @@
+#!/bin/sh
 #-
-# Copyright (c) 2012 EMC Corporation.
+# Copyright (c) 2013 Dag-Erling Smørgrav
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,6 +26,4 @@
 #
 # $FreeBSD$
 
-BINDIR?=	${SHAREDIR}/xml
-
-# vim: syntax=make
+dd if=/dev/random of=$BSDINSTALL_CHROOT/entropy bs=4096 count=1
diff --git a/usr.sbin/bsdinstall/scripts/jail b/usr.sbin/bsdinstall/scripts/jail
index 78fd4c89454..e709145dd8d 100755
--- a/usr.sbin/bsdinstall/scripts/jail
+++ b/usr.sbin/bsdinstall/scripts/jail
@@ -1,6 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,8 +26,15 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ INCLUDES
 
-echo "Begun Installation at $(date)" > $BSDINSTALL_LOG
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+
+############################################################ MAIN
+
+f_dprintf "Began Installation at %s" "$( date )"
 export BSDINSTALL_CHROOT=$1
 
 error() {
@@ -110,5 +118,10 @@ bsdinstall config  || error
 cp /etc/resolv.conf $1/etc
 cp /etc/localtime $1/etc
 
-echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG
+bsdinstall entropy
 
+f_dprintf "Installation Completed at %s" "$(date)"
+
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdinstall/scripts/keymap b/usr.sbin/bsdinstall/scripts/keymap
index 97ae83346f3..c36651fc872 100755
--- a/usr.sbin/bsdinstall/scripts/keymap
+++ b/usr.sbin/bsdinstall/scripts/keymap
@@ -1,6 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,11 +26,212 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ INCLUDES
+ 
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/keymap.subr
+f_include $BSDCFG_SHARE/sysrc.subr
 
-kbdcontrol -d >/dev/null 2>&1
-if [ $? -eq 0 ]; then
-	dialog --backtitle "FreeBSD Installer" --title "Keymap Selection" \
-	    --yesno "Would you like to set a non-default key mapping for your keyboard?" 0 0 || exit 0
-	exec 3>&1
-	kbdmap 2>&1 1>&3 | grep 'keymap=' > $BSDINSTALL_TMPETC/rc.conf.keymap
+############################################################ CONFIGURATION
+
+#
+# Default file to store keymap selection in
+#
+: ${KEYMAPFILE:=$BSDINSTALL_TMPETC/rc.conf.keymap}
+
+#
+# Default path to keymap INDEX containing descriptions
+#
+: ${MAPDESCFILE:=/usr/share/syscons/keymaps/INDEX.keymaps}
+
+############################################################ GLOBALS
+
+#
+# Strings that should be moved to an i18n file and loaded with f_include_lang()
+#
+hline_arrows_tab_enter="Press arrows, TAB or ENTER"
+msg_continue_with_keymap="Continue with %s keymap"
+msg_default="default"
+msg_error="Error"
+msg_freebsd_installer="FreeBSD Installer"
+msg_keymap_menu_text="The system console driver for FreeBSD defaults to standard \"US\"\nkeyboard map. Other keymaps can be chosen below."
+msg_keymap_selection="Keymap Selection"
+msg_ok="OK"
+msg_select="Select"
+msg_test_keymap="Test %s keymap"
+msg_test_the_currently_selected_keymap="Test the currently selected keymap"
+msg_test_the_keymap_by_typing="Test the keymap by typing letters, numbers, and symbols. Characters\nshould match labels on the keyboard keys. Press Enter to stop testing."
+
+############################################################ FUNCTIONS
+
+# dialog_keymap_test $keymap
+#
+# Activate $keymap and display an input box (without cancel button) for the
+# user to test keyboard input and return. Always returns success.
+#
+dialog_keymap_test()
+{
+	local keym="$1"
+	local title= # Calculated below
+	local btitle= # Calculated below
+	local prompt="$msg_test_the_keymap_by_typing"
+	local hline=
+
+	# Attempt to activate the keymap
+	if [ "$keym" ]; then
+		local err
+		err=$( f_keymap_kbdcontrol "$keym" 2>&1 > /dev/null )
+		if [ "$err" ]; then
+			f_dialog_title "$msg_error"
+			f_dialog_msgbox "$err"
+			f_dialog_title_restore
+			return $FAILURE
+		fi
+	fi
+
+	f_dialog_title "$( printf "$msg_test_keymap" "${keym:-$msg_default}" )"
+	title="$DIALOG_TITLE"
+	btitle="$DIALOG_BACKTITLE"
+	f_dialog_title_restore
+
+	local height width
+	f_dialog_inputbox_size height width \
+		"$title" "$btitle" "$prompt" "" "$hline"
+
+	$DIALOG \
+		--title "$title"      \
+		--backtitle "$btitle" \
+		--hline "$hline"      \
+		--ok-label "$msg_ok"  \
+		--no-cancel           \
+		--inputbox "$prompt"  \
+		$height $width        \
+		2>/dev/null >&$DIALOG_TERMINAL_PASSTHRU_FD
+
+	return $DIALOG_OK
+}
+
+############################################################ MAIN
+
+#
+# Initialize
+#
+f_dialog_title "$msg_keymap_selection"
+f_dialog_backtitle "$msg_freebsd_installer"
+
+#
+# Die immediately if we can't dump the current keyboard map
+#
+#error=$( kbdcontrol -d 2>&1 > /dev/null ) || f_die $FAILURE "%s" "$error"
+
+# Capture Ctrl-C for clean-up
+trap 'rm -f $KEYMAPFILE; exit $FAILURE' SIGINT
+
+# Get a value from rc.conf(5) as initial value (if not being scripted)
+f_getvar $VAR_KEYMAP keymap
+if [ ! "$keymap" ]; then
+	keymap=$( f_sysrc_get keymap )
+	case "$keymap" in [Nn][Oo]) keymap="";; esac
 fi
+
+#
+# Loop until the user has finalized their selection (by clicking the
+# [relabeled] Cancel button).
+#
+width=67 first_pass=1 back_from_testing=
+[ "$USE_XDIALOG" ] && width=70
+prompt="$msg_keymap_menu_text"
+hline="$hline_arrows_tab_enter"
+while :; do
+	#
+	# Re/Build list of keymaps
+	#
+	cont_msg=$( printf "$msg_continue_with_keymap" \
+	                   "${keymap:-$msg_default}" )
+	test_msg=$( printf "$msg_test_keymap" "${keymap:-$msg_default}" )
+	menu_list="
+		'>>> $cont_msg' '' '$msg_continue_with_current_keymap'
+		'->- $test_msg' '' '$msg_test_the_currently_selected_keymap'
+	" # END-QUOTE
+	if [ "$first_pass" ]; then
+		defaultitem=
+		first_pass=
+	else
+		defaultitem="->- $test_msg"
+	fi
+	for k in $KEYMAPS; do
+		keymap_$k get keym keym
+		keymap_$k get desc desc
+		radio=" "
+		if [ "$keym" = "$keymap" ]; then
+			radio="*"
+			if [ "$back_from_testing" ]; then
+				defaultitem="(*) $desc"
+				back_from_testing=
+			fi
+		fi
+		f_shell_escape "$desc" desc
+		menu_list="$menu_list
+			'($radio) $desc' '' '$keym: $desc'
+		" # END-QUOTE
+	done
+	back_from_testing=
+
+	#
+	# Display keymap configuration menu
+	#
+	eval f_dialog_menu_with_help_size height \"\" rows \
+		\"\$DIALOG_TITLE\"     \
+		\"\$DIALOG_BACKTITLE\" \
+		\"\$prompt\"           \
+		\"\$hline\"            \
+		$menu_list
+	menu_choice=$( eval $DIALOG \
+		--title \"\$DIALOG_TITLE\"         \
+		--backtitle \"\$DIALOG_BACKTITLE\" \
+		--hline \"\$hline\"                \
+		--keep-tite                        \
+		--item-help                        \
+		--ok-label \"\$msg_select\"        \
+		--cancel-label \"\$msg_cancel\"    \
+		--default-item \"\$defaultitem\"   \
+		--menu \"\$prompt\"                \
+		$height $width $rows               \
+		$menu_list                         \
+		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
+	) || {
+		f_quietly rm -f "$KEYMAPFILE"
+		exit $FAILURE # Exit with an error so bsdinstall restarts
+	}
+	f_dialog_data_sanitize menu_choice
+
+	case "$menu_choice" in
+	">>> "*) # Continue with keymap
+		break ;;
+	"->-"*) # Test keymap
+		dialog_keymap_test "$keymap"
+		back_from_testing=1
+		continue ;;
+	esac
+
+	# Turn the user's choice into a number
+	n=$( eval f_dialog_menutag2index_with_help \
+		\"\$menu_choice\" $menu_list )
+
+	# Turn that number ithe name of the keymap struct
+	k=$( set -- $KEYMAPS; eval echo \"\${$(( $n - 2))}\" )
+
+	# Get actual keymap setting while we update $keymap and $KEYMAPFILE
+	keymap_$k get keym keymap
+	echo "keymap=\"$keymap\"" > "$KEYMAPFILE"
+done
+
+f_quietly f_keymap_kbdcontrol "$keymap"
+
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdinstall/scripts/netconfig b/usr.sbin/bsdinstall/scripts/netconfig
index 382ff2ce473..d5a14ce2b47 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig
+++ b/usr.sbin/bsdinstall/scripts/netconfig
@@ -41,11 +41,19 @@ DIALOG_TAGS=""
 : ${DIALOG_ITEM_HELP=4}
 : ${DIALOG_ESC=255}
 
+# Do a dirty check to see if this a wireless interface -- there should be a
+# better way
+is_wireless_if() {
+	ifconfig $1 | grep -q 'media: IEEE 802.11 Wireless'
+}
+
 for IF in `ifconfig -l`; do
 	test "$IF" = "lo0" && continue
 	(ifconfig -g wlan | egrep -wq $IF) && continue
 	INTERFACES="$INTERFACES $IF"
 	DESC=`sysctl -n dev.$(echo $IF | sed -E 's/([[:alpha:]]*)([[:digit:]]*)/\1.\2/g').%desc`
+	is_wireless_if $IF && echo $DESC |
+		grep -iqv wireless && DESC="Wireless $DESC"
 	DIALOG_TAGS="$DIALOG_TAGS $IF \"$DESC\""
 done
 
@@ -63,10 +71,8 @@ exec 3>&-
 
 : > $BSDINSTALL_TMPETC/._rc.conf.net
 
-# Do a dirty check to see if this a wireless interface -- there should be a
-# better way
 IFCONFIG_PREFIX=""
-if ifconfig $INTERFACE | grep -q 'media: IEEE 802.11 Wireless'; then
+if is_wireless_if $INTERFACE; then
 	NEXT_WLAN_IFACE=wlan0	# XXX
 	echo wlans_$INTERFACE=\"$NEXT_WLAN_IFACE\" >> $BSDINSTALL_TMPETC/._rc.conf.net
 	IFCONFIG_PREFIX="WPA "
diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv4 b/usr.sbin/bsdinstall/scripts/netconfig_ipv4
index 452a5920f49..856c999351d 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig_ipv4
+++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv4
@@ -1,6 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,13 +26,15 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ INCLUDES
 
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_HELP=2}
-: ${DIALOG_EXTRA=3}
-: ${DIALOG_ITEM_HELP=4}
-: ${DIALOG_ESC=255}
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
+f_include $BSDCFG_SHARE/dialog.subr
+
+############################################################ MAIN
 
 INTERFACE=$1
 IFCONFIG_PREFIX="$2"
@@ -49,8 +52,9 @@ if [ $? -eq $DIALOG_OK ]; then
 
 	if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
 		dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0
-		dhclient $INTERFACE 2>> $BSDINSTALL_LOG
+		err=$( dhclient $INTERFACE 2>&1 )
 		if [ $? -ne 0 ]; then
+			f_dprintf "%s" "$err"
 			dialog --backtitle 'FreeBSD Installer' --msgbox "DHCP lease acquisition failed." 0 0
 			exec $0 ${INTERFACE} "${IFCONFIG_PREFIX}"
 		fi
@@ -86,3 +90,6 @@ if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
 	fi
 fi
 
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdinstall/scripts/netconfig_ipv6 b/usr.sbin/bsdinstall/scripts/netconfig_ipv6
index dc0d69f09dc..aa1a579d2b3 100755
--- a/usr.sbin/bsdinstall/scripts/netconfig_ipv6
+++ b/usr.sbin/bsdinstall/scripts/netconfig_ipv6
@@ -1,8 +1,8 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
-# All rights reserved.
 # Copyright (c) 2011 The FreeBSD Foundation
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Portions of this software were developed by Bjoern Zeeb
@@ -30,19 +30,21 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ INCLUDES
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
+f_include $BSDCFG_SHARE/dialog.subr
+
+############################################################ MAIN
 
 #
 # TODO: 
 # - Add DHCPv6 support once FreeBSD ships with it.
 # 
 
-: ${DIALOG_OK=0}
-: ${DIALOG_CANCEL=1}
-: ${DIALOG_HELP=2}
-: ${DIALOG_EXTRA=3}
-: ${DIALOG_ITEM_HELP=4}
-: ${DIALOG_ESC=255}
-
 INTERFACE=$1
 case "${INTERFACE}" in
 "")	dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' \
@@ -61,8 +63,9 @@ while : ; do
 			dialog --backtitle 'FreeBSD Installer' \
 			    --infobox "Sending Router Solicitation ..." 0 0
 			ifconfig ${INTERFACE} inet6 -ifdisabled accept_rtadv up
-			rtsol -F $INTERFACE 2>> $BSDINSTALL_LOG
+			err=$( rtsol -F $INTERFACE 2>&1 )
 			if [ $? -ne 0 ]; then
+				f_dprintf "%s" "$err"
 				dialog --backtitle 'FreeBSD Installer' --msgbox "SLAAC failed." 0 0
 				AGAIN=" again"
 				continue
@@ -148,3 +151,6 @@ if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then
 	fi
 fi
 
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdinstall/scripts/script b/usr.sbin/bsdinstall/scripts/script
index 58ae6e973cd..2915391d61a 100755
--- a/usr.sbin/bsdinstall/scripts/script
+++ b/usr.sbin/bsdinstall/scripts/script
@@ -1,6 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2013 Nathan Whitehorn
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,27 +26,55 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ INCLUDES
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/variable.subr
+
+############################################################ CONFIGURATION
 
 # VARIABLES:
 # PARTITIONS
 # DISTRIBUTIONS
 # BSDINSTALL_DISTDIR
 
-error() {
-	test -f $PATH_FSTAB && bsdinstall umount
-	echo "Installation Error!"
-	cat $BSDINSTALL_LOG
-	echo "Installation Error!"
+############################################################ GLOBALS
+
+#
+# Strings that should be moved to an i18n file and loaded with f_include_lang()
+#
+msg_installation_error="Installation Error!"
+
+############################################################ FUNCTIONS
+
+error()
+{
+	[ -f "$PATH_FSTAB" ] && bsdinstall umount
+	
+	local file
+	f_getvar "$VAR_DEBUG_FILE#+" file
+	if [ "$file" ]; then
+		f_dialog_title "$msg_installation_error"
+		f_dialog_textbox "$file"
+		# No need to restore title, pining for the fjords
+	fi
+
 	exit 1
 }
 
+############################################################ MAIN
+
 set -e
 trap error EXIT
 
 SCRIPT="$1"
 shift
 
-echo "Begun Installation at $(date)" > $BSDINSTALL_LOG
+f_dprintf "Began Instalation at %s" "$( date )"
 rm -rf $BSDINSTALL_TMPETC
 mkdir $BSDINSTALL_TMPETC
 
@@ -55,6 +84,14 @@ split -a 2 -p '^#!.*' "$SCRIPT" /tmp/bsdinstall-installscript-
 : ${DISTRIBUTIONS="kernel.txz base.txz"}; export DISTRIBUTIONS
 export BSDINSTALL_DISTDIR
 
+# Re-initialize a new log if preamble changed BSDINSTALL_LOG
+if [ "$BSDINSTALL_LOG" != "${debugFile#+}" ]; then
+	export debugFile="$BSDINSTALL_LOG"
+	f_quietly f_debug_init
+	# NB: Being scripted, let debug go to terminal for invalid debugFile
+	f_dprintf "Began Instalation at %s" "$( date )"
+fi
+
 # Make partitions
 rm -f $PATH_FSTAB
 touch $PATH_FSTAB
@@ -83,8 +120,13 @@ if [ -f /tmp/bsdinstall-installscript-ab ]; then
 	rm $BSDINSTALL_CHROOT/tmp/installscript
 fi
 
+bsdinstall entropy
 bsdinstall umount
 
-echo "Installation Completed at $(date)" >> $BSDINSTALL_LOG
+f_dprintf "Installation Completed at %s" "$( date )"
 
 trap true EXIT
+
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdinstall/scripts/services b/usr.sbin/bsdinstall/scripts/services
index a4cfd4681e4..8ce9e7bcd6e 100755
--- a/usr.sbin/bsdinstall/scripts/services
+++ b/usr.sbin/bsdinstall/scripts/services
@@ -29,7 +29,7 @@
 : ${DIALOG_OK=0}
 
 if [ -f $BSDINSTALL_TMPETC/rc.conf.services ]; then
-	eval `sed -e s/YES/on/I -e s/NO/off/I $BSDINSTALL_TMPETC/rc.conf.services`
+	eval `sed -e s/YES/on/i -e s/NO/off/i $BSDINSTALL_TMPETC/rc.conf.services`
 else
 	# Default service states. Everything is off if not enabled.
 	sshd_enable="on"
@@ -46,22 +46,23 @@ DAEMONS=$(dialog --backtitle "FreeBSD Installer" \
 	moused	"PS/2 mouse pointer on console" ${moused_enable:-off} \
 	ntpd	"Synchronize system and network time" ${ntpd_enable:-off} \
 	powerd	"Adjust CPU frequency dynamically if supported" ${powerd_enable:-off} \
+	dumpdev "Enable kernel crash dumps to /var/crash" ${dumpdev:-on} \
 2>&1 1>&3)
 exec 3>&-
 
+local havedump=
 for daemon in $DAEMONS; do
+	if [ "$daemon" == "dumpdev" ]; then
+		havedump=1
+		echo \# Set dumpdev to \"AUTO\" to enable crash dumps, \
+			\"NO\" to disable >> \ 
+			$BSDINSTALL_TMPETC/rc.conf.services
+		echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services
+		continue
+	fi
 	echo ${daemon}_enable=\"YES\" >> $BSDINSTALL_TMPETC/rc.conf.services
 done
 
-echo \# Set dumpdev to \"AUTO\" to enable crash dumps, \"NO\" to disable >> \
-	$BSDINSTALL_TMPETC/rc.conf.services
-
-dialog --backtitle "FreeBSD Installer" --title "Dumpdev Configuration" \
-	--nocancel --yesno \
-	"Would you like to enable crash dumps?  If you start having problems with the system it can help the FreeBSD developers debug the problem.  But the crash dumps can take up a lot of disk space in /var." 0 0
-
-if [ $? -eq $DIALOG_OK ]; then
-	echo dumpdev=\"AUTO\" >> $BSDINSTALL_TMPETC/rc.conf.services
-else
+if [ ! "$havedump" ]; then
 	echo dumpdev=\"NO\" >> $BSDINSTALL_TMPETC/rc.conf.services
 fi
diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig
index 0a3599ca081..a1ccaf773e3 100755
--- a/usr.sbin/bsdinstall/scripts/wlanconfig
+++ b/usr.sbin/bsdinstall/scripts/wlanconfig
@@ -1,6 +1,7 @@
 #!/bin/sh
 #-
 # Copyright (c) 2011 Nathan Whitehorn
+# Copyright (c) 2013 Devin Teske
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,6 +26,13 @@
 # SUCH DAMAGE.
 #
 # $FreeBSD$
+#
+############################################################ INCLUDES
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+
+############################################################ MAIN
 
 echo -n > $BSDINSTALL_TMPETC/wpa_supplicant.conf
 chmod 0600 $BSDINSTALL_TMPETC/wpa_supplicant.conf
@@ -50,7 +58,8 @@ if [ $? -ne 0 -a -z $BSDINSTALL_CONFIGCURRENT ]; then
 	exit 1
 fi
 
-wpa_cli scan >>$BSDINSTALL_LOG
+output=$( wpa_cli scan 2>&1 )
+f_dprintf "%s" "$output"
 dialog --backtitle "FreeBSD Installer" --title "Scanning" --ok-label "Skip" \
 	--pause "Waiting 5 seconds to scan for wireless networks..." \
 	9 40 5 || exit 1
@@ -132,6 +141,13 @@ echo "network={
 }" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
 
 # Bring up new network
-test ! -z $BSDINSTALL_CONFIGCURRENT && wpa_cli reconfigure >>$BSDINSTALL_LOG
+if [ "$BSDINSTALL_CONFIGCURRENT" ]; then
+	output=$( wpa_cli reconfigure 2>&1 )
+	f_dprintf "%s" "$output"
+fi
 
 exit 0
+
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot
new file mode 100755
index 00000000000..78eb43c6ad8
--- /dev/null
+++ b/usr.sbin/bsdinstall/scripts/zfsboot
@@ -0,0 +1,1398 @@
+#!/bin/sh
+#-
+# Copyright (c) 2013 Allan Jude
+# Copyright (c) 2013 Devin Teske
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this 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$
+#
+############################################################ INCLUDES
+
+BSDCFG_SHARE="/usr/share/bsdconfig"
+. $BSDCFG_SHARE/common.subr || exit 1
+f_dprintf "%s: loading includes..." "$0"
+f_include $BSDCFG_SHARE/device.subr
+f_include $BSDCFG_SHARE/dialog.subr
+f_include $BSDCFG_SHARE/password/password.subr
+f_include $BSDCFG_SHARE/variable.subr
+
+############################################################ CONFIGURATION
+
+#
+# Default name of the boot-pool
+#
+: ${ZFSBOOT_POOL_NAME:=zroot}
+
+#
+# Default name for the boot environment parent dataset
+#
+: ${ZFSBOOT_BEROOT_NAME:=ROOT}
+
+#
+# Default name for the primany boot environment
+#
+: ${ZFSBOOT_BOOTFS_NAME:=default}
+
+#
+# Default Virtual Device (vdev) type to create
+#
+: ${ZFSBOOT_VDEV_TYPE:=stripe}
+
+#
+# Should we use gnop(8) to configure a transparent mapping to 4K sectors?
+#
+: ${ZFSBOOT_GNOP_4K_FORCE_ALIGN:=1}
+
+#
+# Should we use geli(8) to encrypt the drives?
+#
+: ${ZFSBOOT_GELI_ENCRYPTION=}
+
+#
+# Default name the unencrypted pool when using geli(8) to encrypt the drives
+#
+: ${ZFSBOOT_GELI_POOL_NAME:=bootpool}
+
+#
+# Default size for the unencrypted boot pool when using geli(8)
+#
+: ${ZFSBOOT_GELI_BOOT_SIZE:=2g}
+
+#
+# Default path to the geli(8) keyfile used in drive encryption
+#
+: ${ZFSBOOT_GELI_KEY_FILE:=/boot/encryption.key}
+
+#
+# Default disks to use (always empty unless being scripted)
+#
+: ${ZFSBOOT_DISKS:=}
+
+#
+# Default partitioning scheme to use on disks
+#
+: ${ZFSBOOT_PARTITION_SCHEME:=GPT}
+
+#
+# How much swap to put on each block device in the boot zpool
+# NOTE: Value passed to gpart(8); which supports SI unit suffixes.
+#
+: ${ZFSBOOT_SWAP_SIZE:=2g}
+
+#
+# Default ZFS datasets for root zpool
+#
+# NOTE: Requires /tmp, /var/tmp, /$ZFSBOOT_BOOTFS_NAME/$ZFSBOOT_BOOTFS_NAME
+# NOTE: Anything after pound/hash character [#] is ignored as a comment.
+#
+f_isset ZFSBOOT_DATASETS || ZFSBOOT_DATASETS="
+	# DATASET	OPTIONS (comma or space separated; or both)
+
+	# Boot Environment [BE] root and default boot dataset
+	/$ZFSBOOT_BEROOT_NAME				mountpoint=none
+	/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME	mountpoint=/
+
+	# Compress /tmp, allow exec but not setuid
+	/tmp		mountpoint=/tmp,compression=lz4,exec=on,setuid=off
+
+	# Don't mount /usr so that 'base' files go to the BEROOT
+	/usr		mountpoint=/usr,canmount=off
+
+	# Home directories separated so they are common to all BEs
+	/usr/home	# NB: /home is a symlink to /usr/home
+
+	# Ports tree
+	/usr/ports		compression=lz4,setuid=off
+
+	# Source tree (compressed)
+	/usr/src	compression=lz4,exec=off,setuid=off
+
+	# Create /var and friends
+	/var		mountpoint=/var
+	/var/crash	compression=lz4,exec=off,setuid=off
+	/var/log	compression=lz4,exec=off,setuid=off
+	/var/tmp	compression=lz4,exec=on,setuid=off
+" # END-QUOTE
+
+#
+# If interactive and the user has not explicitly chosen a vdev type or disks,
+# make the user confirm scripted/default choices when proceeding to install.
+#
+: ${ZFSBOOT_CONFIRM_LAYOUT:=1}
+
+############################################################ GLOBALS
+
+#
+# Format of a line in printf(1) syntax to add to fstab(5)
+#
+FSTAB_FMT="%s\t\t%s\t%s\t%s\t\t%s\t%s\n"
+
+#
+# Command strings for various tasks
+#
+CHMOD_MODE='chmod %s "%s"'
+DD_WITH_OPTIONS='dd if="%s" of="%s" %s'
+ECHO_APPEND='echo "%s" >> "%s"'
+GELI_ATTACH='geli attach -j - -k "%s" "%s"'
+GELI_PASSWORD_INIT='geli init -b -B "%s" -e %s -J - -K "%s" -l 256 -s 4096 "%s"'
+GNOP_CREATE='gnop create -S 4096 "%s"'
+GPART_ADD='gpart add -t %s "%s"'
+GPART_ADD_INDEX='gpart add -i %s -t %s "%s"'
+GPART_ADD_INDEX_WITH_SIZE='gpart add -i %s -t %s -s %s "%s"'
+GPART_ADD_LABEL='gpart add -l %s -t %s "%s"'
+GPART_ADD_LABEL_WITH_SIZE='gpart add -l %s -t %s -s %s "%s"'
+GPART_BOOTCODE='gpart bootcode -b "%s" "%s"'
+GPART_BOOTCODE_PART='gpart bootcode -b "%s" -p "%s" -i %s "%s"'
+GPART_CREATE='gpart create -s %s "%s"'
+GPART_SET_ACTIVE='gpart set -a active -i %s "%s"'
+LN_SF='ln -sf "%s" "%s"'
+MKDIR_P='mkdir -p "%s"'
+MOUNT_TYPE='mount -t %s "%s" "%s"'
+PRINTF_CONF="printf '%s=\"%%s\"\\\n' %s >> \"%s\""
+PRINTF_FSTAB='printf "$FSTAB_FMT" "%s" "%s" "%s" "%s" "%s" "%s" >> "%s"'
+SHELL_TRUNCATE=':> "%s"'
+ZFS_CREATE_WITH_OPTIONS='zfs create %s "%s"'
+ZFS_SET='zfs set "%s" "%s"'
+ZFS_UNMOUNT='zfs unmount "%s"'
+ZPOOL_CREATE_WITH_OPTIONS='zpool create %s "%s" %s %s'
+ZPOOL_EXPORT='zpool export "%s"'
+ZPOOL_IMPORT_WITH_OPTIONS='zpool import %s "%s"'
+ZPOOL_SET='zpool set %s "%s"'
+
+#
+# Strings that should be moved to an i18n file and loaded with f_include_lang()
+#
+hline_alnum_arrows_punc_tab_enter="Use alnum, arrows, punctuation, TAB or ENTER"
+hline_arrows_space_tab_enter="Use arrows, SPACE, TAB or ENTER"
+hline_arrows_tab_enter="Press arrows, TAB or ENTER"
+msg_an_unknown_error_occurred="An unknown error occurred"
+msg_back="Back"
+msg_cancel="Cancel"
+msg_change_selection="Change Selection"
+msg_configure_options="Configure Options:"
+msg_detailed_disk_info="gpart(8) show %s:\n%s\n\ncamcontrol(8) inquiry %s:\n%s\n\n\ncamcontrol(8) identify %s:\n%s\n"
+msg_disk_info="Disk Info"
+msg_disk_info_help="Get detailed information on disk device(s)"
+msg_encrypt_disks="Encrypt Disks?"
+msg_encrypt_disks_help="Use geli(8) to encrypt all data partitions"
+msg_error="Error"
+msg_force_4k_sectors="Force 4K Sectors?"
+msg_force_4k_sectors_help="Use gnop(8) to configure forced 4K sector alignment"
+msg_freebsd_installer="FreeBSD Installer"
+msg_geli_password="Enter a strong passphrase, used to protect your encryption keys. You will be required to enter this passphrase each time the system is booted"
+msg_geli_setup="Initializing encryption on the selected disks, this will take several seconds per disk"
+msg_install="Install"
+msg_install_desc="Proceed with Installation"
+msg_install_help="Create ZFS boot pool with displayed options"
+msg_invalid_disk_argument="Invalid disk argument \`%s'"
+msg_invalid_geli_boot_size="Invalid geli(8) boot size \`%s'"
+msg_invalid_index_argument="Invalid index argument \`%s'"
+msg_invalid_swap_size="Invalid swap size \`%s'"
+msg_invalid_virtual_device_type="Invalid Virtual Device type \`%s'"
+msg_last_chance_are_you_sure="Last Chance! Are you sure you want to destroy\nthe current contents of the following disks:\n\n   %s"
+msg_last_chance_are_you_sure_color='\\ZrLast Chance!\\ZR Are you \\Z1sure\\Zn you want to \\Zr\\Z1destroy\\Zn\nthe current contents of the following disks:\n\n   %s'
+msg_mirror_desc="Mirror - n-Way Mirroring"
+msg_mirror_help="[2+ Disks] Mirroring provides the best performance, but the least storage"
+msg_missing_disk_arguments="missing disk arguments"
+msg_missing_one_or_more_scripted_disks="Missing one or more scripted disks!"
+msg_no="NO"
+msg_no_disks_present_to_configure="No disk(s) present to configure"
+msg_no_disks_selected="No disks selected."
+msg_not_enough_disks_selected="Not enough disks selected. (%u < %u minimum)"
+msg_null_disk_argument="NULL disk argument"
+msg_null_index_argument="NULL index argument"
+msg_null_poolname="NULL poolname"
+msg_ok="OK"
+msg_partition_scheme="Partition Scheme"
+msg_partition_scheme_help="Toggle between GPT and MBR partitioning schemes"
+msg_please_enter_a_name_for_your_zpool="Please enter a name for your zpool:"
+msg_please_enter_amount_of_swap_space="Please enter amount of swap space (SI-Unit suffixes\nrecommended; e.g., \`2g' for 2 Gigabytes):"
+msg_please_select_one_or_more_disks="Please select one or more disks to create a zpool:"
+msg_pool_name="Pool Name"
+msg_pool_name_cannot_be_empty="Pool name cannot be empty."
+msg_pool_name_help="Customize the name of the zpool to be created (Required)"
+msg_pool_type_disks="Pool Type/Disks:"
+msg_pool_type_disks_help="Choose type of ZFS Virtual Device and disks to use (Required)"
+msg_processing_selection="Processing selection..."
+msg_raidz1_desc="RAID-Z1 - Single Redundant RAID"
+msg_raidz1_help="[3+ Disks] Withstand failure of 1 disk. Recommended for: 3, 5 or 9 disks"
+msg_raidz2_desc="RAID-Z2 - Double Redundant RAID"
+msg_raidz2_help="[4+ Disks] Withstand failure of 2 disks. Recommended for: 4, 6 or 10 disks"
+msg_raidz3_desc="RAID-Z3 - Triple Redundant RAID"
+msg_raidz3_help="[5+ Disks] Withstand failure of 3 disks. Recommended for: 5, 7 or 11 disks"
+msg_rescan_devices="Rescan Devices"
+msg_rescan_devices_help="Scan for device changes"
+msg_select="Select"
+msg_select_a_disk_device="Select a disk device"
+msg_select_virtual_device_type="Select Virtual Device type:"
+msg_stripe_desc="Stripe - No Redundancy"
+msg_stripe_help="[1+ Disks] Striping provides maximum storage but no redundancy"
+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_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."
+msg_yes="YES"
+msg_zfs_configuration="ZFS Configuration"
+
+############################################################ FUNCTIONS
+
+# dialog_menu_main
+#
+# Display the dialog(1)-based application main menu.
+#
+dialog_menu_main()
+{
+	local title="$DIALOG_TITLE"
+	local btitle="$DIALOG_BACKTITLE"
+	local prompt="$msg_configure_options"
+	local force4k="$msg_no"
+	local usegeli="$msg_no"
+	[ "$ZFSBOOT_GNOP_4K_FORCE_ALIGN" ] && force4k="$msg_yes"
+	[ "$ZFSBOOT_GELI_ENCRYPTION" ] && usegeli="$msg_yes"
+	local disks n=$( set -- $ZFSBOOT_DISKS; echo $# )
+	{ [ $n -eq 1 ] && disks=disk; } || disks=disks # grammar
+	local menu_list="
+		'>>> $msg_install'        '$msg_install_desc'
+		                          '$msg_install_help'
+		'T $msg_pool_type_disks'  '$ZFSBOOT_VDEV_TYPE: $n $disks'
+                                          '$msg_pool_type_disks_help'
+		'- $msg_rescan_devices'   '*'
+		                          '$msg_rescan_devices_help'
+		'- $msg_disk_info'        '*'
+		                          '$msg_disk_info_help'
+		'N $msg_pool_name'        '$ZFSBOOT_POOL_NAME'
+		                          '$msg_pool_name_help'
+		'4 $msg_force_4k_sectors' '$force4k'
+		                          '$msg_force_4k_sectors_help'
+		'E $msg_encrypt_disks'    '$usegeli'
+		                          '$msg_encrypt_disks_help'
+		'P $msg_partition_scheme' '$ZFSBOOT_PARTITION_SCHEME'
+		                          '$msg_partition_scheme_help'
+		'S $msg_swap_size'        '$ZFSBOOT_SWAP_SIZE'
+		                          '$msg_swap_size_help'
+	" # END-QUOTE
+	local defaultitem= # Calculated below
+	local hline="$hline_alnum_arrows_punc_tab_enter"
+
+	local height width rows
+	eval f_dialog_menu_with_help_size height width rows \
+		\"\$title\" \"\$btitle\" \"\$prompt\" \"\$hline\" $menu_list
+
+	# Obtain default-item from previously stored selection
+	f_dialog_default_fetch defaultitem
+
+	local menu_choice
+	menu_choice=$( eval $DIALOG \
+		--title \"\$title\"              \
+		--backtitle \"\$btitle\"         \
+		--hline \"\$hline\"              \
+		--item-help                      \
+		--ok-label \"\$msg_select\"      \
+		--cancel-label \"\$msg_cancel\"  \
+		--default-item \"\$defaultitem\" \
+		--menu \"\$prompt\"              \
+		$height $width $rows             \
+		$menu_list                       \
+		2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
+	)
+	local retval=$?
+	f_dialog_data_sanitize menu_choice
+	f_dialog_menutag_store "$menu_choice"
+
+	# Only update default-item on success
+	[ $retval -eq $DIALOG_OK ] && f_dialog_default_store "$menu_choice"
+
+	return $retval
+}
+
+# dialog_last_chance $disks ...
+#
+# Display a list of the disks that the user is about to destroy. The default
+# action is to return error status unless the user explicitly (non-default)
+# selects "Yes" from the noyes dialog.
+#
+dialog_last_chance()
+{
+	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_last_chance_are_you_sure"
+	else
+		yes=yes no=no defaultno=defaultno
+		extra_args="--colors --cr-wrap"
+		format="$msg_last_chance_are_you_sure_color"
+	fi
+
+	local disk line_width
+	for disk in $*; do
+		if [ "$line" ]; then
+			line_width=${#line}
+		else
+			line_width=$plen
+		fi
+		line_width=$(( $line_width + 1 + ${#disk} ))
+		# Add newline before disk if it would exceed max_width
+		if [ $line_width -gt $max_width ]; then
+			list="$list$line\n"
+			line="$prefix"
+			height=$(( $height + 1 ))
+		fi
+		# Add the disk to the list
+		line="$line $disk"
+	done
+	# Append the left-overs
+	if [ "${line#$prefix}" ]; then
+		list="$list$line"
+		height=$(( $height + 1 ))
+	fi
+
+	# Add height for Xdialog(1)
+	[ "$USE_XDIALOG" ] && height=$(( $height + $height / 5 + 3 ))
+
+	prompt=$( printf "$format" "$list" )
+	f_dprintf "%s: Last Chance!" "$0"
+	$DIALOG \
+		--title "$title"        \
+		--backtitle "$btitle"   \
+		--hline "$hline"        \
+		--$defaultno            \
+		--$yes-label "$msg_yes" \
+		--$no-label "$msg_no"   \
+		$extra_args             \
+		--yesno "$prompt" $height $width
+}
+
+# dialog_menu_layout
+#
+# Configure Virtual Device type and disks to use for the ZFS boot pool. User
+# must select enough disks to satisfy the chosen vdev type.
+#
+dialog_menu_layout()
+{
+	local funcname=dialog_menu_layout
+	local title="$DIALOG_TITLE"
+	local btitle="$DIALOG_BACKTITLE"
+	local vdev_prompt="$msg_select_virtual_device_type"
+	local disk_prompt="$msg_please_select_one_or_more_disks"
+	local vdev_menu_list="
+		'stripe' '$msg_stripe_desc' '$msg_stripe_help'
+		'mirror' '$msg_mirror_desc' '$msg_mirror_help'
+		'raidz1' '$msg_raidz1_desc' '$msg_raidz1_help'
+		'raidz2' '$msg_raidz2_desc' '$msg_raidz2_help'
+		'raidz3' '$msg_raidz3_desc' '$msg_raidz3_help'
+	" # END-QUOTE
+	local disk_check_list= # Calculated below
+	local vdev_hline="$hline_arrows_tab_enter"
+	local disk_hline="$hline_arrows_space_tab_enter"
+
+	# Warn the user if vdev type is not valid
+	case "$ZFSBOOT_VDEV_TYPE" in
+	stripe|mirror|raidz1|raidz2|raidz3) : known good ;;
+	*)
+		f_dprintf "%s: Invalid virtual device type \`%s'" \
+			  $funcname "$ZFSBOOT_VDEV_TYPE"
+		f_show_err "$msg_invalid_virtual_device_type" \
+			   "$ZFSBOOT_VDEV_TYPE"
+		f_interactive || return $FAILURE
+	esac
+
+	# Calculate size of vdev menu once only
+	local vheight vwidth vrows
+	eval f_dialog_menu_with_help_size vheight vwidth vrows \
+		\"\$title\" \"\$btitle\" \"\$vdev_prompt\" \"\$vdev_hline\" \
+		$vdev_menu_list
+
+	# Get a list of probed disk devices
+	local disks=
+	f_device_find "" $DEVICE_TYPE_DISK disks
+	f_dprintf "$funcname: disks=[%s]" "$disks"
+	if [ ! "$disks" ]; then
+		f_dprintf "No disk(s) present to configure"
+		f_show_err "$msg_no_disks_present_to_configure"
+		return $FAILURE
+	fi
+
+	# Lets sort the disks array to be more user friendly
+	disks=$( echo "$disks" | tr ' ' '\n' | sort | tr '\n' ' ' )
+
+	#
+	# Operate in a loop so we can (if interactive) repeat if not enough
+	# disks are selected to satisfy the chosen vdev type or user wants to
+	# back-up to the previous menu.
+	#
+	local vardisk ndisks onoff selections vdev_choice
+	while :; do
+		#
+		# Confirm the vdev type that was selected
+		#
+		if f_interactive && [ "$ZFSBOOT_CONFIRM_LAYOUT" ]; then
+			vdev_choice=$( eval $DIALOG \
+				--title \"\$title\"              \
+				--backtitle \"\$btitle\"         \
+				--hline \"\$vdev_hline\"         \
+				--ok-label \"\$msg_ok\"          \
+				--cancel-label \"\$msg_cancel\"  \
+				--item-help                      \
+				--default-item \"\$ZFSBOOT_VDEV_TYPE\" \
+				--menu \"\$vdev_prompt\"         \
+				$vheight $vwidth $vrows          \
+				$vdev_menu_list                  \
+				2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
+			) || return $?
+				# Exit if user pressed ESC or chose Cancel/No
+			f_dialog_data_sanitize vdev_choice
+
+			ZFSBOOT_VDEV_TYPE="$vdev_choice"
+			f_dprintf "$funcname: ZFSBOOT_VDEV_TYPE=[%s]" \
+			          "$ZFSBOOT_VDEV_TYPE"
+		fi
+
+		# Determine the number of disks needed for this vdev type
+		local want_disks=0
+		case "$ZFSBOOT_VDEV_TYPE" in
+		stripe) want_disks=1 ;;
+		mirror) want_disks=2 ;;
+		raidz1) want_disks=3 ;;
+		raidz2) want_disks=4 ;;
+		raidz3) want_disks=5 ;;
+		esac
+
+		# Warn the user if any scripted disks are invalid
+		local disk valid_disks=
+		local all_valid=${ZFSBOOT_DISKS:+1} # optimism
+		for disk in $ZFSBOOT_DISKS; do
+			if f_struct device_$disk; then
+				valid_disks="$valid_disks $disk"
+				continue
+			fi
+			f_dprintf "$funcname: \`%s' is not a real disk" "$disk"
+			all_valid=
+		done
+		if [ ! "$all_valid" ]; then
+			if [ "$ZFSBOOT_DISKS" ]; then
+				f_show_err \
+				    "$msg_missing_one_or_more_scripted_disks"
+			else
+				f_dprintf "No disks selected."
+				f_interactive ||
+					f_show_err "$msg_no_disks_selected"
+			fi
+			f_interactive || return $FAILURE
+		fi
+		ZFSBOOT_DISKS="${valid_disks# }"
+
+		#
+		# Short-circuit if we're running non-interactively
+		#
+		if ! f_interactive || [ ! "$ZFSBOOT_CONFIRM_LAYOUT" ]; then
+			ndisks=$( set -- $ZFSBOOT_DISKS; echo $# )
+			[ $ndisks -ge $want_disks ] && break # to success
+
+			# Not enough disks selected
+			f_dprintf "$funcname: %s: %s (%u < %u minimum)" \
+				  "$ZFSBOOT_VDEV_TYPE" \
+			          "Not enough disks selected." \
+				  $ndisks $want_disks
+			f_interactive || return $FAILURE
+			msg_yes="$msg_change_selection" msg_no="$msg_cancel" \
+				f_yesno "%s: $msg_not_enough_disks_selected" \
+				"$ZFSBOOT_VDEV_TYPE" $ndisks $want_disks ||
+				return $FAILURE
+		fi
+
+		#
+		# Confirm the disks that were selected
+		# Loop until the user cancels or selects enough disks
+		#
+		local breakout=
+		while :; do
+			# Loop over list of available disks, resetting state
+			for disk in $disks; do unset _${disk}_status; done
+
+			# Loop over list of selected disks and create temporary
+			# locals to map statuses onto up-to-date list of disks
+			for disk in $ZFSBOOT_DISKS; do
+				local _${disk}_status=on
+			done
+
+			# Create the checklist menu of discovered disk devices
+			disk_check_list=
+			for disk in $disks; do
+				local desc=
+				device_$disk get desc desc
+				f_shell_escape "$desc" desc
+				f_getvar _${disk}_status:-off onoff
+				disk_check_list="$disk_check_list
+					$disk '$desc' $onoff"
+			done
+
+			local height width rows
+			eval f_dialog_checklist_size height width rows \
+				\"\$title\" \"\$btitle\" \"\$prompt\" \
+				\"\$hline\" $disk_check_list
+
+			selections=$( eval $DIALOG \
+				--title \"\$DIALOG_TITLE\"         \
+				--backtitle \"\$DIALOG_BACKTITLE\" \
+				--hline \"\$hline\"                \
+				--ok-label \"\$msg_ok\"            \
+				--cancel-label \"\$msg_back\"      \
+				--checklist \"\$prompt\"           \
+				$height $width $rows               \
+				$disk_check_list                   \
+				2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
+			) || break
+				# Loop if user pressed ESC or chose Cancel/No
+			f_dialog_data_sanitize selections
+
+			ZFSBOOT_DISKS="$selections"
+			f_dprintf "$funcname: ZFSBOOT_DISKS=[%s]" \
+			          "$ZFSBOOT_DISKS"
+
+			ndisks=$( set -- $ZFSBOOT_DISKS; echo $# )
+			[ $ndisks -ge $want_disks ] &&
+				breakout=break && break
+
+			# Not enough disks selected
+			f_dprintf "$funcname: %s: %s (%u < %u minimum)" \
+				  "$ZFSBOOT_VDEV_TYPE" \
+			          "Not enough disks selected." \
+			          $ndisks $want_disks
+			msg_yes="$msg_change_selection" msg_no="$msg_cancel" \
+				f_yesno "%s: $msg_not_enough_disks_selected" \
+				"$ZFSBOOT_VDEV_TYPE" $ndisks $want_disks ||
+				break
+		done
+		[ "$breakout" = "break" ] && break
+		[ "$ZFSBOOT_CONFIRM_LAYOUT" ] || return $FAILURE
+	done
+
+	return $DIALOG_OK
+}
+
+# zfs_create_diskpart $disk $index
+#
+# For each block device to be used in the zpool, rather than just create the
+# zpool with the raw block devices (e.g., da0, da1, etc.) we create partitions
+# so we can have some real swap. This also provides wiggle room incase your
+# replacement drivers do not have the exact same sector counts.
+#
+# NOTE: The MBR layout is more complicated (GPT is preferred).
+#
+zfs_create_diskpart()
+{
+	local funcname=zfs_create_diskpart
+	local disk="$1" index="$2"
+	local disksize partsize
+
+	# Check arguments
+	if [ ! "$disk" ]; then
+		f_dprintf "$funcname: NULL disk argument"
+		msg_error="$msg_error: $funcname" \
+			f_show_err "$msg_null_disk_argument"
+		return $FAILURE
+	fi
+	if [ "${disk#*[$IFS]}" != "$disk" ]; then
+		f_dprintf "$funcname: Invalid disk argument \`%s'" "$disk"
+		msg_error="$msg_error: $funcname" \
+			f_show_err "$msg_invalid_disk_argument" "$disk"
+		return $FAILURE
+	fi
+	if [ ! "$index" ]; then
+		f_dprintf "$funcname: NULL index argument"
+		msg_error="$msg_error: $funcname" \
+			f_show_err "$msg_null_index_argument"
+		return $FAILURE
+	fi
+	if ! f_isinteger "$index"; then
+		f_dprintf "$funcname: Invalid index argument \`%s'" "$index"
+		msg_error="$msg_error: $funcname" \
+			f_show_err "$msg_invalid_index_argument" "$index"
+		return $FAILURE
+	fi
+	f_dprintf "$funcname: disk=[%s] index=[%s]" "$disk" "$index"
+
+	# Check for unknown partition scheme before proceeding further
+	case "$ZFSBOOT_PARTITION_SCHEME" in
+	""|MBR|GPT) : known good ;;
+	*)
+		f_dprintf "$funcname: %s is an unsupported partition scheme" \
+		          "$ZFSBOOT_PARTITION_SCHEME"
+		msg_error="$msg_error: $funcname" f_show_err \
+			"$msg_unsupported_partition_scheme" \
+			"$ZFSBOOT_PARTITION_SCHEME"
+		return $FAILURE
+	esac
+
+	#
+	# Destroy whatever partition layout is currently on disk.
+	# NOTE: `-F' required to destroy if partitions still exist.
+	# NOTE: Failure is ok here, blank disk will have nothing to destroy.
+	#
+	f_dprintf "$funcname: Destroying all data/layouts on \`%s'..." "$disk"
+	f_quietly gpart destroy -F $disk
+	f_quietly graid destroy $disk
+	f_quietly zpool labelclear -f /dev/$disk # Kill it with fire
+
+	# Make doubly-sure backup GPT is destroyed
+	f_quietly gpart create -s gpt $disk
+	f_quietly gpart destroy -F $disk
+
+	# Calculate partition size given desired amount of swap
+	f_dprintf "$funcname: Getting disk capactiy for \`%s'" "$disk"
+	if ! device_$disk get capacity disksize; then
+		f_dprintf "$funcname: Unable to get disk capacity of \`%s'" \
+		          "$disk"
+		msg_error="$msg_error: $funcname" \
+			f_show_err "$msg_unable_to_get_disk_capacity" "$disk"
+		return $FAILURE
+	fi
+	partsize=$(( $disksize - $swapsize ))
+	f_dprintf "$funcname: disksize=[%s] partsize=[%s]" \
+	          "$disksize" "$partsize"
+
+	#
+	# Lay down the desired type of partition scheme
+	#
+	local setsize mbrindex
+	case "$ZFSBOOT_PARTITION_SCHEME" in
+	""|GPT) f_dprintf "$funcname: Creating GPT layout..."
+		#
+		# 1. Create GPT layout using labels
+		#
+		f_eval_catch $funcname gpart "$GPART_CREATE" gpt \$disk ||
+		             return $FAILURE
+
+		#
+		# 2. Add small freebsd-boot partition labeled `boot#'
+		#
+		f_eval_catch $funcname gpart "$GPART_ADD_LABEL_WITH_SIZE" \
+		             gptboot\$index freebsd-boot 512k \$disk ||
+		             return $FAILURE
+		f_eval_catch $funcname gpart "$GPART_BOOTCODE_PART" \
+		             /boot/pmbr /boot/gptzfsboot 1 \$disk ||
+		             return $FAILURE
+
+		# zpool will use the `zfs#' GPT labels
+		bootpart=p2 targetpart=p2
+
+		# Change things around if we are using geli(8)
+		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+			bootpart=p2 targetpart=p3
+			partsize=$(( $partsize - $gelisize ))
+			f_dprintf "$funcname: gelisize=[%s]" \
+			          "gelisize=[$gelisize]"
+			f_eval_catch $funcname gpart \
+			             "$GPART_ADD_LABEL_WITH_SIZE" boot\$index \
+			             freebsd-zfs \${gelisize}b \$disk ||
+			             return $FAILURE
+
+			# Pedantically nuke any old labels, stop geli
+			f_quietly zpool labelclear -f "/dev/$disk$bootpart"
+			f_quietly geli detach -f "/dev/$disk$targetpart"
+		fi
+
+		#
+		# 3. Add freebsd-zfs partition labeled `zfs#' for zpool
+		# NOTE: Using above calculated partsize to leave room for swap.
+		#
+		if [ ${swapsize:-0} -gt 0 ]; then
+			f_dprintf "$funcname: partsize=[%s]" \
+			          "partsize=[$partsize]"
+			f_eval_catch $funcname gpart \
+			             "$GPART_ADD_LABEL_WITH_SIZE" zfs\$index \
+			             freebsd-zfs \${partsize}b \$disk ||
+			             return $FAILURE
+		else
+			f_eval_catch $funcname gpart "$GPART_ADD_LABEL" \
+			             zfs\$index freebsd-zfs \$disk ||
+			             return $FAILURE
+		fi
+		f_quietly zpool labelclear -f "/dev/$disk$targetpart"
+
+		#
+		# 4. Add freebsd-swap partition labeled `swap#'
+		#
+		if [ $swapsize -gt 0 ]; then
+			f_eval_catch $funcname gpart "$GPART_ADD_LABEL" \
+			             swap\$index freebsd-swap \$disk ||
+			             return $FAILURE
+			# Update fstab(5)
+			f_eval_catch $funcname printf "$PRINTF_FSTAB" \
+			             /dev/gpt/swap\$index none swap sw 0 0 \
+			             \$BSDINSTALL_TMPETC/fstab ||
+			             return $FAILURE
+		fi
+		;;
+
+	MBR) f_dprintf "$funcname: Creating MBR layout..."
+		#
+		# 1. Create MBR layout (no labels)
+		#
+		f_eval_catch $funcname gpart "$GPART_CREATE" mbr \$disk ||
+		             return $FAILURE
+		f_eval_catch $funcname gpart "$GPART_BOOTCODE" /boot/mbr \
+		             \$disk || return $FAILURE
+
+		#
+		# 2. Add freebsd slice with all available space
+		#
+		f_eval_catch $funcname gpart "$GPART_ADD" freebsd \$disk ||
+		             return $FAILURE
+		f_eval_catch $funcname gpart "$GPART_SET_ACTIVE" 1 \$disk ||
+		             return $FAILURE
+		f_quietly zpool labelclear -f /dev/${disk}s1 # Pedantic
+		f_quietly gpart destroy -F ${disk}s1 # Pedantic
+
+		#
+		# 3. Write BSD scheme to the freebsd slice
+		#
+		f_eval_catch $funcname gpart "$GPART_CREATE" BSD \${disk}s1 ||
+		             return $FAILURE
+
+		# zpool will use s1a (no labels)
+		bootpart=s1a targetpart=s1a mbrindex=1
+
+		# Change things around if we are using geli(8)
+		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+			bootpart=s1a targetpart=s1d
+			partsize=$(( $partsize - $gelisize ))
+			mbrindex=4 # If this is s1a then make the zpool s1d
+			f_dprintf "$funcname: mbrindex=[%s] gelisize=[%s]" \
+			          "$mbrindex" "$gelisize"
+			f_eval_catch $funcname gpart \
+			             "$GPART_ADD_INDEX_WITH_SIZE" \
+			             1 freebsd-zfs \${gelisize}b \${disk}s1 ||
+			             return $FAILURE
+			# Pedantically nuke any old labels, stop geli
+			f_quietly zpool labelclear -f "/dev/$disk$bootpart"
+			f_quietly geli detach -f "/dev/$disk$targetpart"
+		fi
+
+		#
+		# 4. Partition the BSD slice for ZFS
+		# NOTE: Using above calculated partsize to leave room for swap.
+		#
+		if [ ${swapsize:-0} -gt 0 ]; then
+			f_dprintf "$funcname: mbrindex=[%s] partsize=[%s]" \
+			          "$mbrindex" "$partsize"
+			f_eval_catch $funcname gpart \
+			             "$GPART_ADD_INDEX_WITH_SIZE" \
+			             \$mbrindex freebsd-zfs \${partsize}b \
+			             \${disk}s1 || return $FAILURE
+		else
+			f_dprintf "$funcname: mbrindex=[%s]" "$mbrindex"
+			f_eval_catch $funcname gpart "$GPART_ADD_INDEX" \
+			             \$mbrindex freebsd-zfs \${disk}s1 ||
+			             return $FAILURE
+		fi
+		f_quietly zpool labelclear -f /dev/$disk$targetpart # Pedantic
+
+		#
+		# 5. Add freebsd-swap partition
+		#
+		if [ $swapsize -gt 0 ]; then
+			f_eval_catch $funcname gpart "$GPART_ADD_INDEX" \
+			             2 freebsd-swap \${disk}s1 ||
+			             return $FAILURE
+			# Update fstab(5)
+			f_eval_catch $funcname printf "$PRINTF_FSTAB" \
+			             /dev/\${disk}s1b none swap sw 0 0 \
+			             \$BSDINSTALL_TMPETC/fstab ||
+			             return $FAILURE
+		fi
+		;;
+
+	esac # $ZFSBOOT_PARTITION_SCHEME
+
+	return $SUCCESS
+}
+
+# zfs_create_boot $poolname $vdev_type $disks ...
+#
+# Creates boot pool and dataset layout. Returns error if something goes wrong.
+# Errors are printed to stderr for collection and display.
+#
+zfs_create_boot()
+{
+	local funcname=zfs_create_boot
+	local poolname="$1" vdev_type="$2"
+	local bootpart targetpart
+
+	shift 2 # name vdev_type
+
+	# We may need this later
+	local disks="$*"
+
+	# Pedantic checks; should never be seen
+	if [ ! "$poolname" ]; then
+		f_dprintf "$funcname: NULL poolname"
+		msg_error="$msg_error: $funcname" \
+			f_show_err "$msg_null_poolname"
+		return $FAILURE
+	fi
+	if [ $# -lt 1 ]; then
+		f_dprintf "$funcname: missing disk arguments"
+		msg_error="$msg_error: $funcname" \
+			f_show_err "$msg_missing_disk_arguments"
+		return $FAILURE
+	fi
+	f_dprintf "$funcname: poolname=[%s] vdev_type=[%s]" \
+	          "$poolname" "$vdev_type"
+
+	# Initialize fstab(5)
+	f_dprintf "$funcname: Initializing temporary fstab(5) file..."
+	f_eval_catch $funcname sh \
+	             "$SHELL_TRUNCATE" \$BSDINSTALL_TMPETC/fstab ||
+	             return $FAILURE
+	f_eval_catch $funcname printf "$PRINTF_FSTAB" \
+	             "# Device" Mountpoint FStype Options Dump "Pass#" \
+	             \$BSDINSTALL_TMPETC/fstab || return $FAILURE
+
+	# Expand SI units in desired sizes
+	f_dprintf "$funcname: Expanding supplied swapsize/gelisize values..."
+	local swapsize gelisize
+	if ! f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize; then
+		f_dprintf "$funcname: Invalid swap size \`%s'" \
+		          "$ZFSBOOT_SWAP_SIZE"
+		f_show_err "$msg_invalid_swap_size" "$ZFSBOOT_SWAP_SIZE"
+		return $FAILURE
+	fi
+	if ! f_expand_number "$ZFSBOOT_GELI_BOOT_SIZE" gelisize; then
+		f_dprintf "$funcname: Invalid geli(8) boot size \`%s'" \
+		          "$ZFSBOOT_GELI_BOOT_SIZE"
+		f_show_err "$msg_invalid_geli_boot_size" \
+		           "$ZFSBOOT_GELI_BOOT_SIZE"
+		return $FAILURE
+	fi
+	f_dprintf "$funcname: ZFSBOOT_SWAP_SIZE=[%s] swapsize=[%s]" \
+	          "$ZFSBOOT_SWAP_SIZE" "$swapsize"
+	f_dprintf "$funcname: ZFSBOOT_GELI_BOOT_SIZE=[%s] gelisize=[%s]" \
+	          "$ZFSBOOT_GELI_BOOT_SIZE" "$gelisize"
+
+	# Prepare the disks
+	f_dprintf "$funcname: Preparing disk partitions for ZFS pool..."
+	local n=0
+	for disk in $*; do
+		zfs_create_diskpart $disk $n || return $FAILURE
+		n=$(( $n + 1 ))
+	done
+
+	# MBR boot loader hack part 1
+	# We have to do this early because geli gets in the way later
+	if [ "$ZFSBOOT_PARTITION_SCHEME" = "MBR" ]; then
+		f_dprintf "$funcname: Copying MBR boot loader to disks..."
+		f_dprintf "$funcname: disks=[%s]" "$disks"
+		for disk in $disks; do
+			f_dprintf "$funcname: disk=[%s]" "$disk"
+			f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \
+			             /boot/zfsboot /dev/\${disk}s1 count=1 ||
+			             return $FAILURE
+		done
+	fi
+
+	# Forced 4k alignment support provided by Geom NOP (see gnop(8))
+	local unenc_list=
+	if [ "$ZFSBOOT_GNOP_4K_FORCE_ALIGN" ]; then
+		local part="$targetpart" new_list=
+
+		# We don't gnop the encrypted partition because geli will do
+		# this for us gnop the unencrypted disk
+		[ "$ZFSBOOT_GELI_ENCRYPTION" ] && part="$bootpart"
+
+		f_dprintf "$funcname: Applying 4k alignment with gnop(8)..."
+		f_dprintf "$funcname: *=[%s]" "$*"
+		for disk in $*; do
+			f_dprintf "$funcname: disk=[%s] part=[%s]" \
+			          "$disk" "$part"
+			f_eval_catch $funcname gnop "$GNOP_CREATE" \
+			             \$disk\$part || return $FAILURE
+			if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+				unenc_list="$unenc_list $disk$part.nop"
+			else
+				new_list="$new_list $disk$targetpart.nop"
+			fi
+		done
+		set -- $new_list
+	else
+		local new_list=
+		for disk in $*; do
+			new_list="$new_list $disk$targetpart"
+			[ "$ZFSBOOT_GELI_ENCRYPTION" ] &&
+				unenc_list="$unenc_list $disk$bootpart"
+		done
+		set -- $new_list
+	fi
+
+	#
+	# If encryption is enabled, we need to create the GEOMs
+	#
+	if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+		local bootvdev= options=
+		local geli_pool="$BSDINSTALL_CHROOT/$ZFSBOOT_GELI_POOL_NAME"
+		local key="$ZFSBOOT_GELI_KEY_FILE"
+
+		f_dprintf "$funcname: Setting up disk encryption..."
+
+		# Create the parent directories for our unencrypted pool
+		f_quietly umount /mnt
+		f_eval_catch $funcname mount "$MOUNT_TYPE" tmpfs none \
+		             \$BSDINSTALL_CHROOT || return $FAILURE
+
+		# Create mirror across the unencrypted partition on all disks
+		[ $( set -- $unenc_list; echo $# ) -gt 1 ] && bootvdev=mirror
+
+		f_dprintf "$funcname: %s %s %s" \
+		          "ZFSBOOT_GELI_POOL_NAME=[$ZFSBOOT_GELI_POOL_NAME]" \
+		          "bootvdev=[$bootvdev]" "unenc_list=[$unenc_list]"
+		options="-o altroot=\"\$BSDINSTALL_CHROOT\""
+		options="$options -m \"/\$ZFSBOOT_GELI_POOL_NAME\""
+		options="$options -f"
+		f_eval_catch $funcname zpool "$ZPOOL_CREATE_WITH_OPTIONS" \
+		             "$options" \$ZFSBOOT_GELI_POOL_NAME \$bootvdev \
+		             \$unenc_list || return $FAILURE
+
+		f_dprintf "$funcname: geli_pool=[%s]" "$geli_pool"
+		f_eval_catch $funcname mkdir "$MKDIR_P" \$geli_pool/boot ||
+		             return $FAILURE
+
+		# Generate an encryption key using random(4)
+		f_dprintf "$funcname: key=[%s]" "$key"
+		f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \
+		             /dev/random \$geli_pool/\$key "bs=4096 count=1" ||
+		             return $FAILURE
+
+		# Create the geli(8) GEOMS
+		local geli_list
+		if ! msg_enter_new_password="$msg_geli_password" \
+			f_dialog_input_password
+		then
+			f_dprintf "$funcname: User cancelled"
+			f_show_err "$msg_user_cancelled"
+			return $FAILURE
+		fi
+		f_dprintf "$funcname: disks=[%s]" "$disks"
+		for disk in $disks; do
+			f_dprintf "$funcname: disk=[%s] targetpart=[%s]" \
+			          "$disk" "$targetpart"
+			f_dialog_info "$msg_geli_setup" \
+				2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
+			if ! echo "$pw_password" | f_eval_catch $funcname \
+				geli "$GELI_PASSWORD_INIT" \
+				\$geli_pool/boot/\$disk\$targetpart.eli \
+				AES-XTS \$geli_pool/\$key \$disk\$targetpart
+			then
+				f_interactive || f_die
+				return $FAILURE
+			fi
+			if ! echo "$pw_password" | f_eval_catch $funcname \
+				geli "$GELI_ATTACH" \$geli_pool/\$key \
+				\$disk\$targetpart
+			then
+				f_interactive || f_die
+				return $FAILURE
+			fi
+			geli_list="$geli_list $disk$targetpart.eli"
+		done
+		set -- $geli_list
+		f_eval_catch $funcname zfs "$ZFS_UNMOUNT" \
+		             \$ZFSBOOT_GELI_POOL_NAME || return $FAILURE
+		f_quietly umount /mnt # done with tmpfs
+	fi
+
+	#
+	# Create the ZFS pool with desired type and disk devices
+	#
+	local vdevs="$*"
+	f_dprintf "$funcname: Creating boot pool..."
+	f_dprintf "poolname=[%s] vdev_type=[%s] vdevs=[%s]" \
+	          "$poolname" "$vdev_type" "$vdevs"
+	f_eval_catch $funcname zpool "$ZPOOL_CREATE_WITH_OPTIONS" \
+	             "-o altroot=\"\$BSDINSTALL_CHROOT\" -m none -f" \
+	             \$poolname \$vdev_type \$vdevs
+
+	# Customize the zpool a bit...
+	local option
+	f_dprintf "$funcname: Setting miscellaneous options on boot pool..."
+	for option in checksum=fletcher4 atime=off; do
+		f_dprintf "$funcname: option=[%s]" "$option"
+		f_eval_catch $funcname zfs "$ZFS_SET" \$option \$poolname ||
+		             return $FAILURE
+	done
+
+	#
+	# Create ZFS dataset layout within the new boot pool
+	#
+	f_dprintf "$funcname: Creating ZFS datasets..."
+	echo "$ZFSBOOT_DATASETS" | while read dataset options; do
+		# Skip blank lines and comments
+		case "$dataset" in "#"*|"") continue; esac
+		# Remove potential inline comments in options
+		options="${options%%#*}"
+		# Replace tabs with spaces
+		f_replaceall "$options" "	" " " options
+		# Reduce contiguous runs of space to one single space
+		oldoptions=
+		while [ "$oldoptions" != "$options" ]; do
+			oldoptions="$options"
+			f_replaceall "$options" "  " " " options
+		done
+		# Replace both commas and spaces with ` -o '
+		f_replaceall "$options" "[ ,]" " -o " options
+		# Create the dataset with desired options
+		f_dprintf "$funcname: dataset=[%s] options=[%s]" \
+		          "$dataset" "$options"
+		f_eval_catch $funcname zfs "$ZFS_CREATE_WITH_OPTIONS" \
+		             "\${options:+-o \$options}" \$poolname\$dataset ||
+		             return $FAILURE
+	done
+
+	# Touch up permissions on the tmp directories
+	f_dprintf "$funcname: Modifying directory permissions..."
+	local dir
+	for dir in /tmp /var/tmp; do
+		f_dprintf "$funcname: dir=[%s]" "$dir"
+		f_eval_catch $funcname chmod "$CHMOD_MODE" 1777 \
+		             \$BSDINSTALL_CHROOTDIR\$dir || return $FAILURE
+	done
+
+	# Create symlink(s)
+	if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+		f_dprintf "$funcname: Creating /boot symlink for GELI..."
+		f_eval_catch $funcname ln "$LN_SF" \
+		             \$ZFSBOOT_GELI_POOL_NAME/boot \
+		             \$BSDINSTALL_CHROOT/boot || return $FAILURE
+	fi
+
+	# Set bootfs property
+	f_dprintf "$funcname: Setting bootfs property..."
+	f_dprintf "$funcname: %s %s" \
+	          "ZFSBOOT_BEROOT_NAME=[$ZFSBOOT_BEROOT_NAME]" \
+	          "ZFSBOOT_BOOTFS_NAME=[$ZFSBOOT_BOOTFS_NAME]"
+	f_eval_catch $funcname zpool "$ZPOOL_SET" \
+	    bootfs=\"\$poolname/\$ZFSBOOT_BEROOT_NAME/\$ZFSBOOT_BOOTFS_NAME\" \
+	    \$poolname || return $FAILURE
+
+	# Export the pool(s)
+	f_dprintf "$funcname: Temporarily exporting ZFS pool(s)..."
+	f_eval_catch $funcname zpool "$ZPOOL_EXPORT" \$poolname ||
+	             return $FAILURE
+	if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+		f_eval_catch $funcname zpool "$ZPOOL_EXPORT" \
+		             \$ZFSBOOT_GELI_POOL_NAME || return $FAILURE
+	fi
+
+	# Destroy the gnop devices (if enabled)
+	for disk in ${ZFSBOOT_GNOP_4K_FORCE_ALIGN:+$disks}; do
+		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+			f_quietly gnop destroy $disk$bootpart.nop
+		else
+			f_quietly gnop destroy $disk$targetpart.nop
+		fi
+	done
+
+	# MBR boot loader hack part 2
+	if [ "$ZFSBOOT_PARTITION_SCHEME" = "MBR" ]; then
+		f_dprintf "$funcname: Updating MBR boot loader on disks..."
+		f_dprintf "$funcname: disks=[%s]"
+		# Stick the ZFS boot loader in the "convienient hole" after 
+		# the ZFS internal metadata
+		for disk in $disks; do
+			f_dprintf "$funcname: disk=[%s] bootpart=[%s]" \
+			          "$disk" "$bootpart"
+			f_eval_catch $funcname dd "$DD_WITH_OPTIONS" \
+			             /boot/zfsboot /dev/\$disk\$bootpart \
+			             "skip=1 seek=1024" || return $FAILURE
+		done
+	fi
+
+	# Re-import the ZFS pool(s)
+	f_dprintf "$funcname: Re-importing ZFS pool(s)..."
+	f_eval_catch $funcname zpool "$ZPOOL_IMPORT_WITH_OPTIONS" \
+	             "-o altroot=\"\$BSDINSTALL_CHROOT\"" \$poolname ||
+	             return $FAILURE
+	if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+		f_eval_catch $funcname zpool "$ZPOOL_IMPORT_WITH_OPTIONS" \
+		             "-o altroot=\"\$BSDINSTALL_CHROOT\"" \
+		             \$ZFSBOOT_GELI_POOL_NAME || return $FAILURE
+	fi
+
+	# While this is apparently not needed, it seems to help MBR
+	f_dprintf "$funcname: Configuring zpool.cache..."
+	f_eval_catch $funcname mkdir "$MKDIR_P" \$BSDINSTALL_CHROOT/boot/zfs ||
+	             return $FAILURE
+	f_eval_catch $funcname zpool "$ZPOOL_SET" \
+	             cachefile=\"\$BSDINSTALL_CHROOT/boot/zfs/zpool.cache\" \
+	             \$poolname || return $FAILURE
+
+	# Last, but not least... required lines for rc.conf(5)/loader.conf(5)
+	# NOTE: We later concatenate these into their destination
+	f_dprintf "%s: Configuring rc.conf(5)/loader.conf(5) additions..." \
+	          "$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
+
+	# We're all done unless we should go on to do encryption
+	[ "$ZFSBOOT_GELI_ENCRYPTION" ] || return $SUCCESS
+
+	# Some additional geli(8) requirements for loader.conf(5)
+	for option in \
+		zpool_cache_load=\"YES\" \
+		zpool_cache_type=\"/boot/zfs/zpool.cache\" \
+		zpool_cache_name=\"/boot/zfs/zpool.cache\" \
+	; do
+		f_eval_catch $funcname echo "$ECHO_APPEND" \$option \
+		             \$BSDINSTALL_TMPBOOT/loader.conf.zfs ||
+		             return $FAILURE
+	done
+
+	#
+	# Configure geli(8)-based encryption
+	#
+	f_dprintf "$funcname: Configuring disk encryption..."
+	f_eval_catch $funcname echo "$ECHO_APPEND" 'aesni_load=\"YES\"' \
+	    \$BSDINSTALL_TMPBOOT/loader.conf.aesni || return $FAILURE
+	f_eval_catch $funcname echo "$ECHO_APPEND" 'geom_eli_load=\"YES\"' \
+	    \$BSDINSTALL_TMPBOOT/loader.conf.geli || return $FAILURE
+	f_eval_catch $funcname printf "$PRINTF_CONF" vfs.root.mountfrom \
+	    '"zfs:$poolname/$ZFSBOOT_BEROOT_NAME/$ZFSBOOT_BOOTFS_NAME"' \
+	    \$BSDINSTALL_TMPBOOT/loader.conf.root || return $FAILURE
+	f_dprintf "$funcname: disks=[%s]" "$disks"
+	for disk in $disks; do
+		f_dprintf "$funcname: %s %s %s" \
+		          "disk=[$disk]" "targetpart=[$targetpart]" \
+		          "ZFSBOOT_GELI_KEY_FILE=[$ZFSBOOT_GELI_KEY_FILE]"
+		f_eval_catch $funcname printf "$PRINTF_CONF" \
+			geli_%s_keyfile0_load '"$disk$targetpart" YES' \
+			\$BSDINSTALL_TMPBOOT/loader.conf.\$disk\$targetpart ||
+			return $FAILURE
+		f_eval_catch $funcname printf "$PRINTF_CONF" \
+			geli_%s_keyfile0_type \
+			'"$disk$targetpart" "$disk$targetpart:geli_keyfile0"' \
+			\$BSDINSTALL_TMPBOOT/loader.conf.\$disk\$targetpart ||
+			return $FAILURE
+		f_eval_catch $funcname printf "$PRINTF_CONF" \
+			geli_%s_keyfile0_name \
+			'"$disk$targetpart" "$ZFSBOOT_GELI_KEY_FILE"' \
+			\$BSDINSTALL_TMPBOOT/loader.conf.\$disk\$targetpart ||
+			return $FAILURE
+	done
+
+	return $SUCCESS
+}
+
+# dialog_menu_diskinfo
+#
+# Prompt the user to select a disk and then provide detailed info on it.
+#
+dialog_menu_diskinfo()
+{
+	local disk
+
+	#
+	# Break from loop when user cancels disk selection
+	#
+	while :; do
+		disk=$( msg_cancel="$msg_back" f_device_menu \
+			"$DIALOG_TITLE" "$msg_select_a_disk_device" "" \
+			$DEVICE_TYPE_DISK 2>&1 ) || break
+
+		# Show gpart(8) `show' and camcontrol(8) `inquiry' data
+		f_show_msg "$msg_detailed_disk_info" \
+			"$disk" "$( gpart show $disk 2> /dev/null )" \
+			"$disk" "$( camcontrol inquiry $disk 2> /dev/null )" \
+			"$disk" "$( camcontrol identify $disk 2> /dev/null )"
+	done
+
+	return $SUCCESS
+}
+
+############################################################ MAIN
+
+#
+# Initialize
+#
+f_dialog_title "$msg_zfs_configuration"
+f_dialog_backtitle "$msg_freebsd_installer"
+
+# User may have specifically requested ZFS-related operations be interactive
+! f_interactive && f_zfsinteractive && unset $VAR_NONINTERACTIVE
+
+#
+# Debugging
+#
+f_dprintf "BSDINSTALL_CHROOT=[%s]" "$BSDINSTALL_CHROOT"
+f_dprintf "BSDINSTALL_TMPETC=[%s]" "$BSDINSTALL_TMPETC"
+f_dprintf "PRINTF_FSTAB=[%s]" "$PRINTF_FSTAB"
+
+#
+# Loop over the main menu until we've accomplished what we came here to do
+#
+while :; do
+	if ! f_interactive; then
+		retval=$DIALOG_OK
+		mtag=">>> $msg_install"
+	else
+		dialog_menu_main
+		retval=$?
+		f_dialog_menutag_fetch mtag
+	fi
+
+	f_dprintf "retval=%u mtag=[%s]" $retval "$mtag"
+	[ $retval -eq $DIALOG_OK ] || f_die
+
+	case "$mtag" in
+	">>> $msg_install")
+		#
+		# First, validate the user's selections
+		#
+
+		# Make sure they gave us a name for the pool
+		if [ ! "$ZFSBOOT_POOL_NAME" ]; then
+			f_dprintf "Pool name cannot be empty."
+			f_show_err "$msg_pool_name_cannot_be_empty"
+			continue
+		fi
+
+		# Validate vdev type against number of disks selected/scripted
+		# (also validates that ZFSBOOT_DISKS are real [probed] disks)
+		# NB: dialog_menu_layout supports running non-interactively
+		dialog_menu_layout || continue
+
+		# Make sure each disk will be at least 50% ZFS
+		if f_expand_number "$ZFSBOOT_SWAP_SIZE" swapsize &&
+		   f_expand_number "$ZFSBOOT_GELI_BOOT_SIZE" gelisize
+		then
+			minsize=$swapsize teeny_disks=
+			[ "$ZFSBOOT_GELI_ENCRYPTION" ] &&
+				minsize=$(( $minsize + $gelisize ))
+			for disk in $ZFSBOOT_DISKS; do
+				device_$disk get capacity disksize || continue
+				disksize=$(( $disksize - $minsize ))
+				[ $disksize -lt $minsize ] &&
+					teeny_disks="$teeny_disks $disk"
+			done
+			if [ "$teeny_disks" ]; then
+				f_dprintf "swapsize=[%s] gelisize[%s]" \
+				          "$ZFSBOOT_SWAP_SIZE" \
+				          "$ZFSBOOT_GELI_BOOT_SIZE"
+				f_dprintf "These disks are too small: %s" \
+				          "$teeny_disks"
+				f_show_err "$msg_these_disks_are_too_small" \
+				           "$ZFSBOOT_SWAP_SIZE" \
+				           "$ZFSBOOT_GELI_BOOT_SIZE" \
+				           "$teeny_disks"
+				continue
+			fi
+		fi
+
+		#
+		# Last Chance!
+		#
+		if f_interactive; then
+			dialog_last_chance $ZFSBOOT_DISKS || continue
+		fi
+
+		#
+		# Let's do this
+		#
+
+		vdev_type="$ZFSBOOT_VDEV_TYPE"
+
+		# Blank the vdev type for the default layout
+		[ "$vdev_type" = "stripe" ] && vdev_type=
+
+		zfs_create_boot "$ZFSBOOT_POOL_NAME" \
+		                "$vdev_type" $ZFSBOOT_DISKS || continue
+
+		break # to success
+		;;
+	?" $msg_pool_type_disks")
+		ZFSBOOT_CONFIRM_LAYOUT=1
+		dialog_menu_layout
+		# User has poked settings, disable later confirmation
+		ZFSBOOT_CONFIRM_LAYOUT=
+		;;
+	"- $msg_rescan_devices") f_device_rescan ;;
+	"- $msg_disk_info") dialog_menu_diskinfo ;;
+	?" $msg_pool_name")
+		# Prompt the user to input/change the name for the new pool
+		f_dialog_input input \
+			"$msg_please_enter_a_name_for_your_zpool" \
+			"$ZFSBOOT_POOL_NAME" &&
+			ZFSBOOT_POOL_NAME="$input"
+		;;
+	?" $msg_force_4k_sectors")
+		# Toggle the variable referenced both by the menu and later
+		if [ "$ZFSBOOT_GNOP_4K_FORCE_ALIGN" ]; then
+			ZFSBOOT_GNOP_4K_FORCE_ALIGN=
+		else
+			ZFSBOOT_GNOP_4K_FORCE_ALIGN=1
+		fi
+		;;
+	?" $msg_encrypt_disks")
+		# Toggle the variable referenced both by the menu and later
+		if [ "$ZFSBOOT_GELI_ENCRYPTION" ]; then
+			ZFSBOOT_GELI_ENCRYPTION=
+		else
+			ZFSBOOT_GELI_ENCRYPTION=1
+		fi
+		;;
+	?" $msg_partition_scheme")
+		# Toggle between GPT and MBR
+		if [ "$ZFSBOOT_PARTITION_SCHEME" = GPT ]; then
+			ZFSBOOT_PARTITION_SCHEME=MBR
+		else
+			ZFSBOOT_PARTITION_SCHEME=GPT
+		fi
+		;;
+	?" $msg_swap_size")
+		# Prompt the user to input/change the swap size for each disk
+		f_dialog_input input \
+			"$msg_please_enter_amount_of_swap_space" \
+			"$ZFSBOOT_SWAP_SIZE" &&
+			ZFSBOOT_SWAP_SIZE="$input"
+		;;
+	esac
+done
+
+return $SUCCESS
+
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/crashinfo/crashinfo.sh b/usr.sbin/crashinfo/crashinfo.sh
index cf60a62ae8f..06108d5b84c 100755
--- a/usr.sbin/crashinfo/crashinfo.sh
+++ b/usr.sbin/crashinfo/crashinfo.sh
@@ -267,12 +267,6 @@ echo
 netstat -M $VMCORE -N $KERNEL -m
 echo
 
-echo "------------------------------------------------------------------------"
-echo "netstat -idW"
-echo
-netstat -M $VMCORE -N $KERNEL -idW
-echo
-
 echo "------------------------------------------------------------------------"
 echo "netstat -anr"
 echo
diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8
index b9d4e61ae83..005225c41a9 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 April 2, 2013
+.Dd October 30, 2013
 .Dt CTLADM 8
 .Os
 .Sh NAME
@@ -202,10 +202,10 @@
 .Op Fl x
 .Nm
 .Ic islogout
-.Aq Fl a | Fl h Ar host | Fl c Ar connection-id | Fl i Ar name
+.Aq Fl a | Fl c Ar connection-id | Fl i Ar name | Fl p Ar portal
 .Nm
 .Ic isterminate
-.Aq Fl a | Fl h Ar host | Fl c Ar connection-id | Fl i Ar name
+.Aq Fl a | Fl c Ar connection-id | Fl i Ar name | Fl p Ar portal
 .Nm
 .Ic help
 .Sh DESCRIPTION
@@ -909,24 +909,24 @@ Ask the initiator to log out iSCSI connections matching criteria.
 .Bl -tag -width 11n
 .It Fl a
 Log out all connections.
-.It Fl h
-Specify initiator IP address.
 .It Fl c
 Specify connection ID.
 .It Fl i
 Specify initiator name.
+.It Fl p
+Specify initiator portal (hostname or IP address).
 .El
 .It Ic isterminate
 Forcibly terminate iSCSI connections matching criteria.
 .Bl -tag -width 11n
 .It Fl a
 Terminate all connections.
-.It Fl h
-Specify initiator IP address.
 .It Fl c
 Specify connection ID.
 .It Fl i
 Specify initiator name.
+.It Fl p
+Specify initiator portal (hostname or IP address).
 .El
 .It Ic help
 Display
diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c
index d26bf72d140..783315524a3 100644
--- a/usr.sbin/ctladm/ctladm.c
+++ b/usr.sbin/ctladm/ctladm.c
@@ -184,8 +184,8 @@ static struct ctladm_opts option_table[] = {
 	{"inject", CTLADM_CMD_ERR_INJECT, CTLADM_ARG_NEED_TL, "cd:i:p:r:s:"},
 	{"inquiry", CTLADM_CMD_INQUIRY, CTLADM_ARG_NEED_TL, NULL},
 	{"islist", CTLADM_CMD_ISLIST, CTLADM_ARG_NONE, "vx"},
-	{"islogout", CTLADM_CMD_ISLOGOUT, CTLADM_ARG_NONE, "ah:c:i:"},
-	{"isterminate", CTLADM_CMD_ISTERMINATE, CTLADM_ARG_NONE, "ah:c:i:"},
+	{"islogout", CTLADM_CMD_ISLOGOUT, CTLADM_ARG_NONE, "ac:i:p:"},
+	{"isterminate", CTLADM_CMD_ISTERMINATE, CTLADM_ARG_NONE, "ac:i:p:"},
 	{"lunlist", CTLADM_CMD_LUNLIST, CTLADM_ARG_NONE, NULL},
 	{"modesense", CTLADM_CMD_MODESENSE, CTLADM_ARG_NEED_TL, "P:S:dlm:c:"},
 	{"modify", CTLADM_CMD_MODIFY, CTLADM_ARG_NONE, "b:l:s:"},
@@ -700,7 +700,7 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt)
 	} else if ((targ_port == -1) && (port_type == CTL_PORT_NONE))
 		port_type = CTL_PORT_ALL;
 
-	bzero(&entry, sizeof(&entry));
+	bzero(&entry, sizeof(entry));
 
 	/*
 	 * These are needed for all but list/dump mode.
@@ -3442,7 +3442,7 @@ cctl_islist_start_element(void *user_data, const char *name, const char **attr)
 	islist = (struct cctl_islist_data *)user_data;
 	cur_conn = islist->cur_conn;
 	islist->level++;
-	if ((u_int)islist->level > (sizeof(islist->cur_sb) /
+	if ((u_int)islist->level >= (sizeof(islist->cur_sb) /
 	    sizeof(islist->cur_sb[0])))
 		errx(1, "%s: too many nesting levels, %zd max", __func__,
 		     sizeof(islist->cur_sb) / sizeof(islist->cur_sb[0]));
@@ -3633,21 +3633,21 @@ retry:
 
 	if (verbose != 0) {
 		STAILQ_FOREACH(conn, &islist.conn_list, links) {
-			printf("Session ID:      %d\n", conn->connection_id);
-			printf("Initiator name:  %s\n", conn->initiator);
-			printf("Initiator addr:  %s\n", conn->initiator_addr);
-			printf("Initiator alias: %s\n", conn->initiator_alias);
-			printf("Target name:     %s\n", conn->target);
-			printf("Target alias:    %s\n", conn->target_alias);
-			printf("Header digest:   %s\n", conn->header_digest);
-			printf("Data digest:     %s\n", conn->data_digest);
-			printf("DataSegmentLen:  %s\n", conn->max_data_segment_length);
-			printf("ImmediateData:   %s\n", conn->immediate_data ? "Yes" : "No");
-			printf("iSER (RDMA):     %s\n", conn->iser ? "Yes" : "No");
+			printf("Session ID:       %d\n", conn->connection_id);
+			printf("Initiator name:   %s\n", conn->initiator);
+			printf("Initiator portal: %s\n", conn->initiator_addr);
+			printf("Initiator alias:  %s\n", conn->initiator_alias);
+			printf("Target name:      %s\n", conn->target);
+			printf("Target alias:     %s\n", conn->target_alias);
+			printf("Header digest:    %s\n", conn->header_digest);
+			printf("Data digest:      %s\n", conn->data_digest);
+			printf("DataSegmentLen:   %s\n", conn->max_data_segment_length);
+			printf("ImmediateData:    %s\n", conn->immediate_data ? "Yes" : "No");
+			printf("iSER (RDMA):      %s\n", conn->iser ? "Yes" : "No");
 			printf("\n");
 		}
 	} else {
-		printf("%4s %-16s %-36s %-36s\n", "ID", "Address", "Initiator name",
+		printf("%4s %-16s %-36s %-36s\n", "ID", "Portal", "Initiator name",
 		    "Target name");
 		STAILQ_FOREACH(conn, &islist.conn_list, links) {
 			printf("%4u %-16s %-36s %-36s\n",
@@ -3675,12 +3675,6 @@ cctl_islogout(int fd, int argc, char **argv, char *combinedopt)
 			all = 1;
 			nargs++;
 			break;
-		case 'h':
-			initiator_addr = strdup(optarg);
-			if (initiator_addr == NULL)
-				err(1, "%s: strdup", __func__);
-			nargs++;
-			break;
 		case 'c':
 			connection_id = strtoul(optarg, NULL, 0);
 			nargs++;
@@ -3691,16 +3685,22 @@ cctl_islogout(int fd, int argc, char **argv, char *combinedopt)
 				err(1, "%s: strdup", __func__);
 			nargs++;
 			break;
+		case 'p':
+			initiator_addr = strdup(optarg);
+			if (initiator_addr == NULL)
+				err(1, "%s: strdup", __func__);
+			nargs++;
+			break;
 		default:
 			break;
 		}
 	}
 
 	if (nargs == 0)
-		errx(1, "%s: either -a, -h, -c, or -i must be specified",
+		errx(1, "%s: either -a, -c, -i, or -p must be specified",
 		    __func__);
 	if (nargs > 1)
-		errx(1, "%s: only one of -a, -h, -c, or -i may be specified",
+		errx(1, "%s: only one of -a, -c, -i, or -p may be specified",
 		    __func__);
 
 	bzero(&req, sizeof(req));
@@ -3748,12 +3748,6 @@ cctl_isterminate(int fd, int argc, char **argv, char *combinedopt)
 			all = 1;
 			nargs++;
 			break;
-		case 'h':
-			initiator_addr = strdup(optarg);
-			if (initiator_addr == NULL)
-				err(1, "%s: strdup", __func__);
-			nargs++;
-			break;
 		case 'c':
 			connection_id = strtoul(optarg, NULL, 0);
 			nargs++;
@@ -3764,16 +3758,22 @@ cctl_isterminate(int fd, int argc, char **argv, char *combinedopt)
 				err(1, "%s: strdup", __func__);
 			nargs++;
 			break;
+		case 'p':
+			initiator_addr = strdup(optarg);
+			if (initiator_addr == NULL)
+				err(1, "%s: strdup", __func__);
+			nargs++;
+			break;
 		default:
 			break;
 		}
 	}
 
 	if (nargs == 0)
-		errx(1, "%s: either -a, -h, -c, or -i must be specified",
+		errx(1, "%s: either -a, -c, -i, or -p must be specified",
 		    __func__);
 	if (nargs > 1)
-		errx(1, "%s: only one of -a, -h, -c, or -i may be specified",
+		errx(1, "%s: only one of -a, -c, -i, or -p may be specified",
 		    __func__);
 
 	bzero(&req, sizeof(req));
@@ -3848,7 +3848,7 @@ cctl_start_element(void *user_data, const char *name, const char **attr)
 	devlist = (struct cctl_devlist_data *)user_data;
 	cur_lun = devlist->cur_lun;
 	devlist->level++;
-	if ((u_int)devlist->level > (sizeof(devlist->cur_sb) /
+	if ((u_int)devlist->level >= (sizeof(devlist->cur_sb) /
 	    sizeof(devlist->cur_sb[0])))
 		errx(1, "%s: too many nesting levels, %zd max", __func__,
 		     sizeof(devlist->cur_sb) / sizeof(devlist->cur_sb[0]));
@@ -4121,8 +4121,8 @@ usage(int error)
 "         ctladm port        <-l | -o <on|off> | [-w wwnn][-W wwpn]>\n"
 "                            [-p targ_port] [-t port_type] [-q] [-x]\n"
 "         ctladm islist      [-v | -x]\n"
-"         ctladm islogout    <-A | -a addr | -c connection-id | -n name>\n"
-"         ctladm isterminate <-A | -a addr | -c connection-id | -n name>\n"
+"         ctladm islogout    <-a | -c connection-id | -i name | -p portal>\n"
+"         ctladm isterminate <-a | -c connection-id | -i name | -p portal>\n"
 "         ctladm dumpooa\n"
 "         ctladm dumpstructs\n"
 "         ctladm help\n"
diff --git a/usr.sbin/ctld/ctl.conf.5 b/usr.sbin/ctld/ctl.conf.5
index fb8bc2a4f83..a0f6ad8779b 100644
--- a/usr.sbin/ctld/ctl.conf.5
+++ b/usr.sbin/ctld/ctl.conf.5
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 24, 2013
+.Dd December 2, 2013
 .Dt CTL.CONF 5
 .Os
 .Sh NAME
@@ -98,7 +98,7 @@ will be forcibly terminated.
 The default is 60.
 Setting it to 0 disables the timeout.
 .El
-.Ss auth-grup level
+.Ss auth-group level
 The following statements are available at the auth-group level:
 .Bl -tag -width indent
 .It Ic chap Ao Ar user Ac Aq Ar secret
@@ -141,7 +141,7 @@ Note that targets must use either auth-group, or chap,
 or chap-mutual clauses; it's 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,
+Note that targets must use either auth-group, chap, or
 chap-mutual clauses; it's a configuration error to mix them in one target.
 .It Ic portal-group Aq Ar name
 Assigns previously defined portal group to that target.
diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c
index 0e002042192..dc55594d157 100644
--- a/usr.sbin/ctld/kernel.c
+++ b/usr.sbin/ctld/kernel.c
@@ -135,7 +135,7 @@ cctl_start_element(void *user_data, const char *name, const char **attr)
 	devlist = (struct cctl_devlist_data *)user_data;
 	cur_lun = devlist->cur_lun;
 	devlist->level++;
-	if ((u_int)devlist->level > (sizeof(devlist->cur_sb) /
+	if ((u_int)devlist->level >= (sizeof(devlist->cur_sb) /
 	    sizeof(devlist->cur_sb[0])))
 		log_errx(1, "%s: too many nesting levels, %zd max", __func__,
 		     sizeof(devlist->cur_sb) / sizeof(devlist->cur_sb[0]));
diff --git a/usr.sbin/ctld/login.c b/usr.sbin/ctld/login.c
index 4ee7c9798e2..b528fc0feae 100644
--- a/usr.sbin/ctld/login.c
+++ b/usr.sbin/ctld/login.c
@@ -419,8 +419,9 @@ login_send_chap_c(struct pdu *request, const unsigned char id,
 	keys_add(response_keys, "CHAP_C", chap_c);
 	free(chap_c);
 	keys_save(response_keys, response);
-	keys_delete(response_keys);
 	pdu_send(response);
+	pdu_delete(response);
+	keys_delete(response_keys);
 }
 
 static struct pdu *
@@ -558,6 +559,7 @@ login_send_chap_success(struct pdu *request,
 
 	keys_delete(request_keys);
 	pdu_send(response);
+	pdu_delete(response);
 }
 
 static void
@@ -1005,6 +1007,14 @@ login(struct connection *conn)
 		return;
 	}
 
+	if (ag->ag_type == AG_TYPE_UNKNOWN) {
+		/*
+		 * This can happen with empty auth-group.
+		 */
+		login_send_error(request, 0x02, 0x01);
+		log_errx(1, "auth-group type not set, denying access");
+	}
+
 	log_debugx("CHAP authentication required");
 
 	auth_method = keys_find(request_keys, "AuthMethod");
diff --git a/usr.sbin/ctld/parse.y b/usr.sbin/ctld/parse.y
index 333e9642aa5..07b4d671c73 100644
--- a/usr.sbin/ctld/parse.y
+++ b/usr.sbin/ctld/parse.y
@@ -300,7 +300,7 @@ auth_group_statement:	AUTH_GROUP STR
 				log_warnx("auth-group for target \"%s\" "
 				    "specified more than once", target->t_iqn);
 			else
-				log_warnx("cannot mix auth-grup with explicit "
+				log_warnx("cannot mix auth-group with explicit "
 				    "authorisations for target \"%s\"",
 				    target->t_iqn);
 			return (1);
@@ -321,7 +321,7 @@ chap_statement:	CHAP STR STR
 
 		if (target->t_auth_group != NULL) {
 			if (target->t_auth_group->ag_name != NULL) {
-				log_warnx("cannot mix auth-grup with explicit "
+				log_warnx("cannot mix auth-group with explicit "
 				    "authorisations for target \"%s\"",
 				    target->t_iqn);
 				free($2);
@@ -351,7 +351,7 @@ chap_mutual_statement:	CHAP_MUTUAL STR STR STR STR
 
 		if (target->t_auth_group != NULL) {
 			if (target->t_auth_group->ag_name != NULL) {
-				log_warnx("cannot mix auth-grup with explicit "
+				log_warnx("cannot mix auth-group with explicit "
 				    "authorisations for target \"%s\"",
 				    target->t_iqn);
 				free($2);
diff --git a/usr.sbin/edquota/edquota.c b/usr.sbin/edquota/edquota.c
index a92a3c8f992..0cd117f1996 100644
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@@ -284,7 +284,7 @@ main(int argc, char *argv[])
 			freeprivs(protoprivs);
 		exit(0);
 	}
-	tmpfd = mkstemp(tmpfil);
+	tmpfd = mkostemp(tmpfil, O_CLOEXEC);
 	fchown(tmpfd, getuid(), getgid());
 	if (tflag) {
 		if ((protoprivs = getprivs(0, quotatype, fspath)) != NULL) {
diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8
index a61f1815362..ffd05160731 100644
--- a/usr.sbin/etcupdate/etcupdate.8
+++ b/usr.sbin/etcupdate/etcupdate.8
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2010-2012 Advanced Computing Technologies LLC
+.\" Copyright (c) 2010-2013 Advanced Computing Technologies LLC
 .\" Written by: John H. Baldwin <jhb@FreeBSD.org>
 .\" All rights reserved.
 .\"
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 16, 2012
+.Dd December 9, 2013
 .Dt ETCUPDATE 8
 .Os
 .Sh NAME
@@ -33,7 +33,7 @@
 .Nd "manage updates to system files not updated by installworld"
 .Sh SYNOPSIS
 .Nm
-.Op Fl nBF
+.Op Fl npBF
 .Op Fl d Ar workdir
 .Op Fl r | Fl s Ar source | Fl t Ar tarball
 .Op Fl A Ar patterns
@@ -64,6 +64,7 @@
 .Op Fl M Ar options
 .Nm
 .Cm resolve
+.Op Fl p
 .Op Fl d Ar workdir
 .Op Fl D Ar destdir
 .Op Fl L Ar logfile
@@ -342,27 +343,7 @@ then nothing will be output.
 .Sh OPTIONS
 The following options are available.
 Note that most options do not apply to all modes.
-.Bl -tag -width ".Fl d Ar workdir"
-.It Fl B
-Do not build generated files in a private object tree.
-Instead,
-reuse the generated files from a previously built object tree that matches
-the source tree.
-This can be useful to avoid gratuitous conflicts in
-.Xr sendmail 8
-configuration
-files when bootstrapping.
-It can also be useful for building a tarball that matches a specific
-world build.
-.It Fl d Ar workdir
-Specify an alternate directory to use as the work directory.
-The work directory is used to store the
-.Dq current
-and
-.Dq previous
-trees as well as unresolved conflicts.
-The default work directory is
-.Pa <destdir>/var/db/etcupdate .
+.Bl -tag -width ".Fl A Ar patterns"
 .It Fl A Ar patterns
 Always install the new version of any files that match any of the patterns
 listed in
@@ -378,6 +359,17 @@ Note that ignored files specified via the
 variable or the
 .Fl I
 option will not be installed.
+.It Fl B
+Do not build generated files in a private object tree.
+Instead,
+reuse the generated files from a previously built object tree that matches
+the source tree.
+This can be useful to avoid gratuitous conflicts in
+.Xr sendmail 8
+configuration
+files when bootstrapping.
+It can also be useful for building a tarball that matches a specific
+world build.
 .It Fl D Ar destdir
 Specify an alternate destination directory as the target of a merge.
 This is analogous to the
@@ -388,6 +380,15 @@ The default destination directory is an empty string which results in
 merges updating
 .Pa /etc
 on the local machine.
+.It Fl d Ar workdir
+Specify an alternate directory to use as the work directory.
+The work directory is used to store the
+.Dq current
+and
+.Dq previous
+trees as well as unresolved conflicts.
+The default work directory is
+.Pa <destdir>/var/db/etcupdate .
 .It Fl F
 Ignore changes in the FreeBSD ID string when comparing files in the
 destination directory to files in either of the
@@ -481,6 +482,33 @@ option is not specified,
 then a temporary
 .Dq current
 tree will be extracted to perform the comparison.
+.It Fl p
+Enable
+.Dq pre-world
+mode.
+Only merge changes to files that are necessary to successfully run
+.Sq make installworld
+or
+.Sq make installkernel .
+When this flag is enabled,
+the existing
+.Dq current
+and
+.Dq previous
+trees are left alone.
+Instead,
+a temporary tree is populated with the necessary files.
+This temporary tree is compared against the
+.Dq current
+tree.
+This allows a normal update to be run after
+.Sq make installworld
+has completed.
+Any conflicts generated during a
+.Dq pre-world
+update should be resolved by a
+.Dq pre-world
+.Cm resolve .
 .It Fl r
 Do not update the
 .Dq current
@@ -667,6 +695,25 @@ has been removed from the
 tree,
 but it has been locally modified.
 The modified version of the file remains in the destination directory.
+.It "Needs update: /etc/localtime (required manual update via tzsetup(1))"
+The
+.Fa /var/db/zoneinfo
+file does not exist,
+so
+.Nm
+was not able to refresh
+.Fa /etc/localtime
+from its source file in
+.Fa /usr/share/zoneinfo .
+Running
+.Xr tzsetup 1
+will both refresh
+.Fa /etc/localtime
+and generate
+.Fa /var/db/zoneinfo
+permitting future updates to refresh
+.Fa /etc/localtime
+automatically.
 .It "Needs update: /etc/mail/aliases.db (required manual update via newaliases(1))"
 The file
 .Pa /etc/mail/aliases
diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh
index 22168360d79..addcc14e536 100755
--- a/usr.sbin/etcupdate/etcupdate.sh
+++ b/usr.sbin/etcupdate/etcupdate.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (c) 2010 Advanced Computing Technologies LLC
+# Copyright (c) 2010-2013 Advanced Computing Technologies LLC
 # Written by: John H. Baldwin <jhb@FreeBSD.org>
 # All rights reserved.
 #
@@ -61,14 +61,15 @@
 usage()
 {
 	cat <<EOF
-usage: etcupdate [-nBF] [-d workdir] [-r | -s source | -t tarball] [-A patterns]
-                 [-D destdir] [-I patterns] [-L logfile] [-M options]
+usage: etcupdate [-npBF] [-d workdir] [-r | -s source | -t tarball]
+                 [-A patterns] [-D destdir] [-I patterns] [-L logfile]
+                 [-M options]
        etcupdate build [-B] [-d workdir] [-s source] [-L logfile] [-M options]
                  <tarball>
        etcupdate diff [-d workdir] [-D destdir] [-I patterns] [-L logfile]
        etcupdate extract [-B] [-d workdir] [-s source | -t tarball] [-L logfile]
                  [-M options]
-       etcupdate resolve [-d workdir] [-D destdir] [-L logfile]
+       etcupdate resolve [-p] [-d workdir] [-D destdir] [-L logfile]
        etcupdate status [-d workdir] [-D destdir]
 EOF
 	exit 1
@@ -181,22 +182,31 @@ always_install()
 # $1 - directory to store new tree in
 build_tree()
 {
-	local make
+	local destdir dir file make
 
 	make="make $MAKE_OPTIONS"
 
 	log "Building tree at $1 with $make"
 	mkdir -p $1/usr/obj >&3 2>&1
-	(cd $SRCDIR; $make DESTDIR=$1 distrib-dirs) >&3 2>&1 || return 1
+	destdir=`realpath $1`
 
-	if ! [ -n "$nobuild" ]; then
-		(cd $SRCDIR; \
-	    MAKEOBJDIRPREFIX=$1/usr/obj $make _obj SUBDIR_OVERRIDE=etc &&
-	    MAKEOBJDIRPREFIX=$1/usr/obj $make everything SUBDIR_OVERRIDE=etc &&
-	    MAKEOBJDIRPREFIX=$1/usr/obj $make DESTDIR=$1 distribution) \
+	if [ -n "$preworld" ]; then
+		# Build a limited tree that only contains files that are
+		# crucial to installworld.
+		for file in $PREWORLD_FILES; do
+			dir=`dirname /$file`
+			mkdir -p $1/$dir >&3 2>&1 || return 1
+			cp -p $SRCDIR/$file $1/$file || return 1
+		done
+	elif ! [ -n "$nobuild" ]; then
+		(cd $SRCDIR; $make DESTDIR=$destdir distrib-dirs &&
+    MAKEOBJDIRPREFIX=$destdir/usr/obj $make _obj SUBDIR_OVERRIDE=etc &&
+    MAKEOBJDIRPREFIX=$destdir/usr/obj $make everything SUBDIR_OVERRIDE=etc &&
+    MAKEOBJDIRPREFIX=$destdir/usr/obj $make DESTDIR=$destdir distribution) \
 		    >&3 2>&1 || return 1
 	else
-		(cd $SRCDIR; $make DESTDIR=$1 distribution) >&3 2>&1 || return 1
+		(cd $SRCDIR; $make DESTDIR=$destdir distrib-dirs &&
+		    $make DESTDIR=$destdir distribution) >&3 2>&1 || return 1
 	fi
 	chflags -R noschg $1 >&3 2>&1 || return 1
 	rm -rf $1/usr/obj >&3 2>&1 || return 1
@@ -218,9 +228,15 @@ build_tree()
 # source tree.
 extract_tree()
 {
+	local files
+
 	# If we have a tarball, extract that into the new directory.
 	if [ -n "$tarball" ]; then
-		if ! (mkdir -p $NEWTREE && tar xf $tarball -C $NEWTREE) \
+		files=
+		if [ -n "$preworld" ]; then
+			files="$PREWORLD_FILES"
+		fi
+		if ! (mkdir -p $NEWTREE && tar xf $tarball -C $NEWTREE $files) \
 		    >&3 2>&1; then
 			echo "Failed to extract new tree."
 			remove_tree $NEWTREE
@@ -470,6 +486,39 @@ diffnode()
 	esac
 }
 
+# Run one-off commands after an update has completed.  These commands
+# are not tied to a specific file, so they cannot be handled by
+# post_install_file().
+post_update()
+{
+	local args
+
+	# None of these commands should be run for a pre-world update.
+	if [ -n "$preworld" ]; then
+		return
+	fi
+
+	# If /etc/localtime exists and is not a symlink and /var/db/zoneinfo
+	# exists, run tzsetup -r to refresh /etc/localtime.
+	if [ -f ${DESTDIR}/etc/localtime -a \
+	    ! -L ${DESTDIR}/etc/localtime ]; then
+		if [ -f ${DESTDIR}/var/db/zoneinfo ]; then
+			if [ -n "${DESTDIR}" ]; then
+				args="-C ${DESTDIR}"
+			else
+				args=""
+			fi
+			log "tzsetup -r ${args}"
+			if [ -z "$dryrun" ]; then
+				tzsetup -r ${args} >&3 2>&1
+			fi
+		else
+			warn "Needs update: /etc/localtime (required" \
+			    "manual update via tzsetup(1))"
+		fi
+	fi
+}
+
 # Create missing parent directories of a node in a target tree
 # preserving the owner, group, and permissions from a specified
 # template tree.
@@ -567,6 +616,14 @@ post_install_file()
 				fi
 			fi
 			;;
+		/etc/services)
+			log "services_mkdb -q -o $DESTDIR/var/db/services.db" \
+			    "${DESTDIR}$1"
+			if [ -z "$dryrun" ]; then
+				services_mkdb -q -o $DESTDIR/var/db/services.db \
+				    ${DESTDIR}$1 >&3 2>&1
+			fi
+			;;
 	esac
 }
 
@@ -1010,16 +1067,6 @@ handle_modified_file()
 		fi
 	fi
 
-	# If the only change in the new file versus the old file is a
-	# change in the FreeBSD ID string and -F is specified, just
-	# update the FreeBSD ID string in the local file.
-	if [ -n "$FREEBSD_ID" -a $cmp -eq $COMPARE_DIFFFILES ] && \
-	    fbsdid_only $OLDTREE/$file $NEWTREE/$file; then
-		if update_freebsdid $file; then
-			continue
-		fi
-	fi
-
 	# If the file was removed from the dest tree, just whine.
 	if [ $newdestcmp -eq $COMPARE_ONLYFIRST ]; then
 		# If the removed file matches an ALWAYS_INSTALL glob,
@@ -1034,6 +1081,14 @@ handle_modified_file()
 			return
 		fi
 
+		# If the only change in the new file versus the old
+		# file is a change in the FreeBSD ID string and -F is
+		# specified, don't warn.
+		if [ -n "$FREEBSD_ID" -a $cmp -eq $COMPARE_DIFFFILES ] && \
+		    fbsdid_only $OLDTREE/$file $NEWTREE/$file; then
+			return
+		fi
+
 		case $cmp in
 			$COMPARE_DIFFTYPE)
 				old=`file_type $OLDTREE/$file`
@@ -1064,6 +1119,16 @@ handle_modified_file()
 		fi
 	fi
 
+	# If the only change in the new file versus the old file is a
+	# change in the FreeBSD ID string and -F is specified, just
+	# update the FreeBSD ID string in the local file.
+	if [ -n "$FREEBSD_ID" -a $cmp -eq $COMPARE_DIFFFILES ] && \
+	    fbsdid_only $OLDTREE/$file $NEWTREE/$file; then
+		if update_freebsdid $file; then
+			continue
+		fi
+	fi
+
 	# If the file changed types between the old and new trees but
 	# the files in the new and dest tree are both of the same
 	# type, treat it like an added file just comparing the new and
@@ -1298,6 +1363,11 @@ resolve_cmd()
 		return
 	fi
 
+	if ! [ -d $NEWTREE ]; then
+		echo "The current tree is not present to resolve conflicts."
+		exit 1
+	fi
+
 	conflicts=`(cd $CONFLICTS; find . ! -type d) | sed -e 's/^\.//'`
 	for file in $conflicts; do
 		resolve_conflict $file
@@ -1343,7 +1413,7 @@ update_cmd()
 		usage
 	fi
 
-	log "update command: rerun=$rerun tarball=$tarball"
+	log "update command: rerun=$rerun tarball=$tarball preworld=$preworld"
 
 	if [ `id -u` -ne 0 ]; then
 		echo "Must be root to update a tree."
@@ -1376,9 +1446,22 @@ update_cmd()
 				echo "Unable to create temporary directory."
 				exit 1
 			fi
-			OLDTREE=$NEWTREE
+
+			# A pre-world dryrun has already set OLDTREE to
+			# point to the current stock tree.
+			if [ -z "$preworld" ]; then
+				OLDTREE=$NEWTREE
+			fi
 			NEWTREE=$dir
 
+		# For a pre-world update, blow away any pre-existing
+		# NEWTREE.
+		elif [ -n "$preworld" ]; then
+			if ! remove_tree $NEWTREE; then
+				echo "Unable to remove pre-world tree."
+				exit 1
+			fi
+
 		# Rotate the existing stock tree to the old tree.
 		elif [ -d $NEWTREE ]; then
 			# First, delete the previous old tree if it exists.
@@ -1421,6 +1504,12 @@ EOF
 	# Initialize conflicts and warnings handling.
 	rm -f $WARNINGS
 	mkdir -p $CONFLICTS
+
+	# Ignore removed files for the pre-world case.  A pre-world
+	# update uses a stripped-down tree.
+	if [ -n "$preworld" ]; then
+		> $WORKDIR/removed.files
+	fi
 	
 	# The order for the following sections is important.  In the
 	# odd case that a directory is converted into a file, the
@@ -1458,6 +1547,9 @@ EOF
 		    "(requires manual update via newaliases(1))"
 	fi
 
+	# Run any special one-off commands after an update has completed.
+	post_update
+
 	if [ -s $WARNINGS ]; then
 		echo "Warnings:"
 		cat $WARNINGS
@@ -1535,7 +1627,8 @@ always=
 dryrun=
 ignore=
 nobuild=
-while getopts "d:nrs:t:A:BD:FI:L:M:" option; do
+preworld=
+while getopts "d:nprs:t:A:BD:FI:L:M:" option; do
 	case "$option" in
 		d)
 			WORKDIR=$OPTARG
@@ -1543,6 +1636,9 @@ while getopts "d:nrs:t:A:BD:FI:L:M:" option; do
 		n)
 			dryrun=YES
 			;;
+		p)
+			preworld=YES
+			;;
 		r)
 			rerun=YES
 			;;
@@ -1633,6 +1729,9 @@ WARNINGS=$WORKDIR/warnings
 # Use $EDITOR for resolving conflicts.  If it is not set, default to vi.
 EDITOR=${EDITOR:-/usr/bin/vi}
 
+# Files that need to be updated before installworld.
+PREWORLD_FILES="etc/master.passwd etc/group"
+
 # Handle command-specific argument processing such as complaining
 # about unsupported options.  Since the configuration file is always
 # included, do not complain about extra command line arguments that
@@ -1644,19 +1743,39 @@ case $command in
 			echo
 			usage
 		fi
+		if [ -n "$rerun" -a -n "$preworld" ]; then
+			echo "Only one of -p or -r can be specified."
+			echo
+			usage
+		fi
 		;;
-	build|diff|resolve|status)
+	build|diff|status)
+		if [ -n "$dryrun" -o -n "$rerun" -o -n "$tarball" -o \
+		     -n "$preworld" ]; then
+			usage
+		fi
+		;;
+	resolve)
 		if [ -n "$dryrun" -o -n "$rerun" -o -n "$tarball" ]; then
 			usage
 		fi
 		;;
 	extract)
-		if [ -n "$dryrun" -o -n "$rerun" ]; then
+		if [ -n "$dryrun" -o -n "$rerun" -o -n "$preworld" ]; then
 			usage
 		fi
 		;;
 esac
 
+# Pre-world mode uses a different set of trees.  It leaves the current
+# tree as-is so it is still present for a full etcupdate run after the
+# world install is complete.  Instead, it installs a few critical files
+# into a separate tree.
+if [ -n "$preworld" ]; then
+	OLDTREE=$NEWTREE
+	NEWTREE=$WORKDIR/preworld
+fi
+
 # Open the log file.  Don't truncate it if doing a minor operation so
 # that a minor operation doesn't lose log info from a major operation.
 if ! mkdir -p $WORKDIR 2>/dev/null; then
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index ea4099a0a68..ee702e3a4f7 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -1200,7 +1200,7 @@ fetch_metadata_sanity () {
 	# Some aliases to save space later: ${P} is a character which can
 	# appear in a path; ${M} is the four numeric metadata fields; and
 	# ${H} is a sha256 hash.
-	P="[-+./:=%@_[[:alnum:]]"
+	P="[-+./:=%@_[~[:alnum:]]"
 	M="[0-9]+\|[0-9]+\|[0-9]+\|[0-9]+"
 	H="[0-9a-f]{64}"
 
@@ -2814,16 +2814,24 @@ Kernel updates have been installed.  Please reboot and run
 
 	# If we haven't already dealt with the world, deal with it.
 	if ! [ -f $1/worlddone ]; then
+		# Create any necessary directories first
+		grep -vE '^/boot/' $1/INDEX-NEW |
+		    grep -E '^[^|]+\|d\|' > INDEX-NEW
+		install_from_index INDEX-NEW || return 1
+
 		# Install new shared libraries next
 		grep -vE '^/boot/' $1/INDEX-NEW |
-		    grep -E '/lib/.*\.so\.[0-9]+\|' > INDEX-NEW
+		    grep -vE '^[^|]+\|d\|' |
+		    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW
 		install_from_index INDEX-NEW || return 1
 
 		# Deal with everything else
 		grep -vE '^/boot/' $1/INDEX-OLD |
-		    grep -vE '/lib/.*\.so\.[0-9]+\|' > INDEX-OLD
+		    grep -vE '^[^|]+\|d\|' |
+		    grep -vE '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-OLD
 		grep -vE '^/boot/' $1/INDEX-NEW |
-		    grep -vE '/lib/.*\.so\.[0-9]+\|' > INDEX-NEW
+		    grep -vE '^[^|]+\|d\|' |
+		    grep -vE '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW
 		install_from_index INDEX-NEW || return 1
 		install_delete INDEX-OLD INDEX-NEW || return 1
 
@@ -2844,11 +2852,11 @@ Kernel updates have been installed.  Please reboot and run
 
 		# Do we need to ask the user to portupgrade now?
 		grep -vE '^/boot/' $1/INDEX-NEW |
-		    grep -E '/lib/.*\.so\.[0-9]+\|' |
+		    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' |
 		    cut -f 1 -d '|' |
 		    sort > newfiles
 		if grep -vE '^/boot/' $1/INDEX-OLD |
-		    grep -E '/lib/.*\.so\.[0-9]+\|' |
+		    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' |
 		    cut -f 1 -d '|' |
 		    sort |
 		    join -v 1 - newfiles |
@@ -2868,9 +2876,18 @@ again to finish installing updates.
 
 	# Remove old shared libraries
 	grep -vE '^/boot/' $1/INDEX-NEW |
-	    grep -E '/lib/.*\.so\.[0-9]+\|' > INDEX-NEW
+	    grep -vE '^[^|]+\|d\|' |
+	    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-NEW
 	grep -vE '^/boot/' $1/INDEX-OLD |
-	    grep -E '/lib/.*\.so\.[0-9]+\|' > INDEX-OLD
+	    grep -vE '^[^|]+\|d\|' |
+	    grep -E '^[^|]*/lib/[^|]*\.so\.[0-9]+\|' > INDEX-OLD
+	install_delete INDEX-OLD INDEX-NEW || return 1
+
+	# Remove old directories
+	grep -vE '^/boot/' $1/INDEX-NEW |
+	    grep -E '^[^|]+\|d\|' > INDEX-NEW
+	grep -vE '^/boot/' $1/INDEX-OLD |
+	    grep -E '^[^|]+\|d\|' > INDEX-OLD
 	install_delete INDEX-OLD INDEX-NEW || return 1
 
 	# Remove temporary files
@@ -3033,21 +3050,8 @@ IDS_compare () {
 	mv INDEX-NOTMATCHING.tmp INDEX-NOTMATCHING
 
 	# Go through the lines and print warnings.
-	while read LINE; do
-		FPATH=`echo "${LINE}" | cut -f 1 -d '|'`
-		TYPE=`echo "${LINE}" | cut -f 2 -d '|'`
-		OWNER=`echo "${LINE}" | cut -f 3 -d '|'`
-		GROUP=`echo "${LINE}" | cut -f 4 -d '|'`
-		PERM=`echo "${LINE}" | cut -f 5 -d '|'`
-		HASH=`echo "${LINE}" | cut -f 6 -d '|'`
-		LINK=`echo "${LINE}" | cut -f 7 -d '|'`
-		P_TYPE=`echo "${LINE}" | cut -f 8 -d '|'`
-		P_OWNER=`echo "${LINE}" | cut -f 9 -d '|'`
-		P_GROUP=`echo "${LINE}" | cut -f 10 -d '|'`
-		P_PERM=`echo "${LINE}" | cut -f 11 -d '|'`
-		P_HASH=`echo "${LINE}" | cut -f 12 -d '|'`
-		P_LINK=`echo "${LINE}" | cut -f 13 -d '|'`
-
+	local IFS='|'
+	while read FPATH TYPE OWNER GROUP PERM HASH LINK P_TYPE P_OWNER P_GROUP P_PERM P_HASH P_LINK; do
 		# Warn about different object types.
 		if ! [ "${TYPE}" = "${P_TYPE}" ]; then
 			echo -n "${FPATH} is a "
diff --git a/usr.sbin/gpioctl/gpioctl.8 b/usr.sbin/gpioctl/gpioctl.8
index c1abb5e399f..4db6714f5bd 100644
--- a/usr.sbin/gpioctl/gpioctl.8
+++ b/usr.sbin/gpioctl/gpioctl.8
@@ -27,7 +27,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 13, 2013
+.Dd November 7, 2013
 .Dt GPIOCTL 1
 .Os
 .Sh NAME
@@ -109,6 +109,8 @@ gpioctl -f /dev/gpioc0 -c 12 IN
 .El
 .Sh SEE ALSO
 .Xr gpio 4
+.Xr gpioiic 4
+.Xr gpioled 4
 .Sh HISTORY
 The
 .Nm
diff --git a/usr.sbin/ifmcstat/ifmcstat.c b/usr.sbin/ifmcstat/ifmcstat.c
index 599e8503896..b1ae171a7d6 100644
--- a/usr.sbin/ifmcstat/ifmcstat.c
+++ b/usr.sbin/ifmcstat/ifmcstat.c
@@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/tree.h>
 
 #include <net/if.h>
+#define	_WANT_IFADDR
 #include <net/if_var.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
diff --git a/usr.sbin/iostat/iostat.c b/usr.sbin/iostat/iostat.c
index 92b98e46229..f566f39036b 100644
--- a/usr.sbin/iostat/iostat.c
+++ b/usr.sbin/iostat/iostat.c
@@ -117,10 +117,10 @@
 #include <unistd.h>
 
 struct nlist namelist[] = {
-#define X_TK_NIN	0
-	{ "_tk_nin" },
-#define X_TK_NOUT	1
-	{ "_tk_nout" },
+#define X_TTY_NIN	0
+	{ "_tty_nin" },
+#define X_TTY_NOUT	1
+	{ "_tty_nout" },
 #define X_BOOTTIME	2
 	{ "_boottime" },
 #define X_END		2
@@ -448,9 +448,9 @@ main(int argc, char **argv)
 		long double etime;
 
 		if (Tflag > 0) {
-			if ((readvar(kd, "kern.tty_nin", X_TK_NIN, &cur.tk_nin,
+			if ((readvar(kd, "kern.tty_nin", X_TTY_NIN, &cur.tk_nin,
 			     sizeof(cur.tk_nin)) != 0)
-			 || (readvar(kd, "kern.tty_nout", X_TK_NOUT,
+			 || (readvar(kd, "kern.tty_nout", X_TTY_NOUT,
 			     &cur.tk_nout, sizeof(cur.tk_nout))!= 0)) {
 				Tflag = 0;
 				warnx("disabling TTY statistics");
diff --git a/usr.sbin/iscsid/discovery.c b/usr.sbin/iscsid/discovery.c
index 639b71ac358..b5731de9716 100644
--- a/usr.sbin/iscsid/discovery.c
+++ b/usr.sbin/iscsid/discovery.c
@@ -146,7 +146,7 @@ kernel_add(const struct connection *conn, const char *target)
 	int error;
 
 	memset(&isa, 0, sizeof(isa));
-	memcpy(&isa.isa_conf, &conn->conn_conf, sizeof(isa));
+	memcpy(&isa.isa_conf, &conn->conn_conf, sizeof(isa.isa_conf));
 	strlcpy(isa.isa_conf.isc_target, target,
 	    sizeof(isa.isa_conf.isc_target));
 	isa.isa_conf.isc_discovery = 0;
@@ -212,6 +212,7 @@ discovery(struct connection *conn)
 	log_debugx("discovery done; logging out");
 	request = logout_new_request(conn);
 	pdu_send(request);
+	pdu_delete(request);
 	request = NULL;
 
 	log_debugx("waiting for Logout Response");
diff --git a/usr.sbin/isfctl/Makefile b/usr.sbin/isfctl/Makefile
deleted file mode 100644
index 30f8e5b800d..00000000000
--- a/usr.sbin/isfctl/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# $FreeBSD$
-
-PROG=	isfctl
-
-MAN=	isfctl.8
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/isfctl/isfctl.c b/usr.sbin/isfctl/isfctl.c
deleted file mode 100644
index af99093e19a..00000000000
--- a/usr.sbin/isfctl/isfctl.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * Copyright (c) 2012 SRI International
- * 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$
- */
-
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
-#include <err.h>
-#include <fcntl.h>
-#include <inttypes.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
-/* XXXBED: should install and include sys/dev/isf.h */
-struct isf_range {
-	off_t	ir_off;		/* Offset of range to delete (set to 0xFF) */
-	size_t	ir_size;	/* Size of range */
-};
-
-#define ISF_ERASE	_IOW('I', 1, struct isf_range)
-
-#define ISF_ERASE_BLOCK (128 * 1024)
-
-static enum {UNSET, ERASE} action = UNSET;
-
-static void
-usage(void)
-{
-	fprintf(stderr, "usage: isfctl <device> erase <offset> <size>\n");
-	exit(1);
-}
-
-int
-main(int argc, char **argv)
-{
-	struct isf_range	ir;
-	int			fd, i;
-	char			*p, *dev;
-	
-	if (argc < 2)
-		usage();
-	argc--; argv++;
-	
-	if (*argv[0] == '/')
-		dev = argv[0];
-	else
-		asprintf(&dev, "/dev/%s", argv[0]);
-	argc--; argv++;
-	fd = open(dev, O_RDWR);
-	if (fd < 0)
-		err(1, "unable to open device -- %s", dev);
-
-	if (strcmp(argv[0], "erase") == 0) {
-		if (argc != 3)
-			usage();
-		action = ERASE;
-		ir.ir_off = strtol(argv[1], &p, 0);
-		if (*p)
-			errx(1, "invalid offset -- %s", argv[2]);
-		ir.ir_size = strtol(argv[2], &p, 0);
-		if (*p)
-			errx(1, "invalid size -- %s", argv[3]);
-		/*
-		 * If the user requests to delete less than 32K of space
-		 * then assume that they want to delete a number of 128K
-		 * blocks.
-		 */
-		if (ir.ir_size < 32 * 1024)
-			ir.ir_size *= 128 * 1024;
-	}
-
-	switch (action) {
-	case ERASE:
-		i = ioctl(fd, ISF_ERASE, &ir);
-		if (i < 0)
-			err(1, "ioctl(%s, %jx, %zx)", dev,
-			    (intmax_t)ir.ir_off, ir.ir_size);
-		break;
-	default:
-		usage();
-	}
-
-	close(fd);
-	return (0);
-}
diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c
index 452a079829d..04a4514da36 100644
--- a/usr.sbin/jail/command.c
+++ b/usr.sbin/jail/command.c
@@ -106,7 +106,12 @@ next_command(struct cfjail *j)
 			case IP_MOUNT_DEVFS:
 				if (!bool_param(j->intparams[IP_MOUNT_DEVFS]))
 					continue;
-				/* FALLTHROUGH */
+				j->comstring = &dummystring;
+				break;
+			case IP_MOUNT_FDESCFS:
+				if (!bool_param(j->intparams[IP_MOUNT_FDESCFS]))
+					continue;
+				j->comstring = &dummystring;
 			case IP__OP:
 			case IP_STOP_TIMEOUT:
 				j->comstring = &dummystring;
@@ -452,6 +457,32 @@ run_command(struct cfjail *j)
 		}
 		break;
 
+	case IP_MOUNT_FDESCFS:
+		argv = alloca(7 * sizeof(char *));
+		path = string_param(j->intparams[KP_PATH]);
+		if (path == NULL) {
+			jail_warnx(j, "mount.fdescfs: no path");
+			return -1;
+		}
+		devpath = alloca(strlen(path) + 8);
+		sprintf(devpath, "%s/dev/fd", path);
+		if (check_path(j, "mount.fdescfs", devpath, 0,
+		    down ? "fdescfs" : NULL) < 0)
+			return -1;
+		if (down) {
+			*(const char **)&argv[0] = "/sbin/umount";
+			argv[1] = devpath;
+			argv[2] = NULL;
+		} else {
+			*(const char **)&argv[0] = _PATH_MOUNT;
+			*(const char **)&argv[1] = "-t";
+			*(const char **)&argv[2] = "fdescfs";
+			*(const char **)&argv[3] = ".";
+			argv[4] = devpath;
+			argv[5] = NULL;
+		}
+		break;
+
 	case IP_COMMAND:
 		if (j->name != NULL)
 			goto default_command;
diff --git a/usr.sbin/jail/config.c b/usr.sbin/jail/config.c
index a201f314e57..57967082b9f 100644
--- a/usr.sbin/jail/config.c
+++ b/usr.sbin/jail/config.c
@@ -83,6 +83,7 @@ static const struct ipspec intparams[] = {
 #endif
     [IP_MOUNT] =		{"mount",		PF_INTERNAL | PF_REV},
     [IP_MOUNT_DEVFS] =		{"mount.devfs",		PF_INTERNAL | PF_BOOL},
+    [IP_MOUNT_FDESCFS] =	{"mount.fdescfs",	PF_INTERNAL | PF_BOOL},
     [IP_MOUNT_FSTAB] =		{"mount.fstab",		PF_INTERNAL},
     [IP_STOP_TIMEOUT] =		{"stop.timeout",	PF_INTERNAL | PF_INT},
     [IP_VNET_INTERFACE] =	{"vnet.interface",	PF_INTERNAL},
diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8
index 88d69f99241..4a16e9aba5e 100644
--- a/usr.sbin/jail/jail.8
+++ b/usr.sbin/jail/jail.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 23, 2013
+.Dd October 12, 2013
 .Dt JAIL 8
 .Os
 .Sh NAME
@@ -682,7 +682,7 @@ to.
 An alias for each address will be added to the interface before the
 prison is created, and will be removed from the interface after the
 prison is removed.
-.It Op Va ip4.addr
+.It Va ip4.addr
 In addition to the IP addresses that are passed to the kernel, and
 interface and/or a netmask may also be specified, in the form
 .Dq Ar interface Ns | Ns Ar ip-address Ns / Ns Ar netmask .
@@ -691,7 +691,7 @@ will be added to that interface, as it is with the
 .Va interface
 parameter.  If a netmask in either dotted-quad or CIDR form is given
 after IP address, it will be used when adding the IP alias.
-.It Op Va ip6.addr
+.It Va ip6.addr
 In addition to the IP addresses that are passed to the kernel,
 and interface and/or a prefix may also be specified, in the form
 .Dq Ar interface Ns | Ns Ar ip-address Ns / Ns Ar prefix .
@@ -722,11 +722,19 @@ An
 format file containing filesystems to mount before creating a jail.
 .It Va mount.devfs
 Mount a
-.Xr devfs
-filesystem on the chrooted /dev directory, and apply the ruleset in the
+.Xr devfs 5
+filesystem on the chrooted
+.Pa /dev
+directory, and apply the ruleset in the
 .Va devfs_ruleset
 parameter (or a default of ruleset 4: devfsrules_jail)
 to restrict the devices visible inside the prison.
+.It Va mount.fdescfs
+Mount a
+.Xr fdescfs 5
+filesystem on the chrooted
+.Pa /dev/fd
+directory.
 .It Va allow.dying
 Allow making changes to a
 .Va dying
@@ -1165,6 +1173,8 @@ environment of the first jail.
 .Xr ps 1 ,
 .Xr quota 1 ,
 .Xr jail_set 2 ,
+.Xr devfs 5 ,
+.Xr fdescfs 5 ,
 .Xr jail.conf 5 ,
 .Xr procfs 5 ,
 .Xr rc.conf 5 ,
diff --git a/usr.sbin/jail/jail.c b/usr.sbin/jail/jail.c
index 6970ae17628..661c4adfc66 100644
--- a/usr.sbin/jail/jail.c
+++ b/usr.sbin/jail/jail.c
@@ -92,6 +92,7 @@ static const enum intparam startcommands[] = {
     IP_MOUNT,
     IP__MOUNT_FROM_FSTAB,
     IP_MOUNT_DEVFS,
+    IP_MOUNT_FDESCFS,
     IP_EXEC_PRESTART, 
     IP__OP,
     IP_VNET_INTERFACE,
@@ -108,6 +109,7 @@ static const enum intparam stopcommands[] = {
     IP_STOP_TIMEOUT,
     IP__OP,
     IP_EXEC_POSTSTOP,
+    IP_MOUNT_FDESCFS,
     IP_MOUNT_DEVFS,
     IP__MOUNT_FROM_FSTAB,
     IP_MOUNT,
@@ -470,10 +472,12 @@ main(int argc, char **argv)
 				if (dep_check(j))
 					continue;
 				if (j->jid < 0) {
-					if (!(j->flags & (JF_DEPEND | JF_WILD))
-					    && verbose >= 0)
-						jail_quoted_warnx(j,
-						    "not found", NULL);
+					if (!(j->flags & (JF_DEPEND|JF_WILD))) {
+						if (verbose >= 0)
+							jail_quoted_warnx(j,
+							    "not found", NULL);
+						failed(j);
+					}
 					goto jail_remove_done;
 				}
 				j->comparam = stopcommands;
diff --git a/usr.sbin/jail/jailp.h b/usr.sbin/jail/jailp.h
index 63995b2be6a..3f893920ab2 100644
--- a/usr.sbin/jail/jailp.h
+++ b/usr.sbin/jail/jailp.h
@@ -95,6 +95,7 @@ enum intparam {
 #endif
 	IP_MOUNT,		/* Mount points in fstab(5) form */
 	IP_MOUNT_DEVFS,		/* Mount /dev under prison root */
+	IP_MOUNT_FDESCFS,	/* Mount /dev/fd under prison root */
 	IP_MOUNT_FSTAB,		/* A standard fstab(5) file */
 	IP_STOP_TIMEOUT,	/* Time to wait after sending SIGTERM */
 	IP_VNET_INTERFACE,	/* Assign interface(s) to vnet jail */
diff --git a/usr.sbin/kldxref/kldxref.c b/usr.sbin/kldxref/kldxref.c
index e74be96a521..9144ba03056 100644
--- a/usr.sbin/kldxref/kldxref.c
+++ b/usr.sbin/kldxref/kldxref.c
@@ -274,7 +274,7 @@ usage(void)
 	exit(1);
 }
 
-int 
+static int
 compare(const FTSENT *const *a, const FTSENT *const *b)
 {
 	if ((*a)->fts_info == FTS_D && (*b)->fts_info != FTS_D)
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 0417d86095e..92d5508f5d2 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -361,6 +361,13 @@ 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)
+		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,
+		    (long long)fsopts->minsize, ffs_opts->bsize,
+		    (long long)fsopts->maxsize);
+
 		/* calculate size of tree */
 	ffs_size_dir(root, fsopts);
 	fsopts->inodes += ROOTINO;		/* include first two inodes */
diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh
index 361cef9146f..f3aafaecfbc 100755
--- a/usr.sbin/mergemaster/mergemaster.sh
+++ b/usr.sbin/mergemaster/mergemaster.sh
@@ -492,8 +492,14 @@ MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk"
 # files the user changed from the reference files.
 #
 if [ -n "${AUTO_UPGRADE}" -a -s "${MTREEFILE}" ]; then
+	# Force FreeBSD 9 compatible output when available.
+	if mtree -F freebsd9 -c -p /var/empty/ > /dev/null 2>&1; then
+		MTREE_FLAVOR="-F freebsd9"
+	else
+		MTREE_FLAVOR=
+	fi
 	CHANGED=:
-	for file in `mtree -eqL -f ${MTREEFILE} -p ${DESTDIR}/ \
+	for file in `mtree -eqL ${MTREE_FLAVOR} -f ${MTREEFILE} -p ${DESTDIR}/ \
 		2>/dev/null | awk '($2 == "changed") {print $1}'`; do
 		if [ -f "${DESTDIR}/$file" ]; then
 			CHANGED="${CHANGED}${DESTDIR}/${file}:"
diff --git a/usr.sbin/mfiutil/Makefile b/usr.sbin/mfiutil/Makefile
index f6e358a24e6..014bfbf55e9 100644
--- a/usr.sbin/mfiutil/Makefile
+++ b/usr.sbin/mfiutil/Makefile
@@ -2,7 +2,8 @@
 PROG=	mfiutil
 
 SRCS=	mfiutil.c mfi_bbu.c mfi_cmd.c mfi_config.c mfi_drive.c mfi_evt.c \
-	mfi_flash.c mfi_patrol.c mfi_show.c mfi_volume.c mfi_foreign.c
+	mfi_flash.c mfi_patrol.c mfi_show.c mfi_volume.c mfi_foreign.c \
+	mfi_properties.c
 MAN8=	mfiutil.8
 
 CFLAGS+= -fno-builtin-strftime
diff --git a/usr.sbin/mfiutil/mfi_properties.c b/usr.sbin/mfiutil/mfi_properties.c
new file mode 100644
index 00000000000..c9c9204d500
--- /dev/null
+++ b/usr.sbin/mfiutil/mfi_properties.c
@@ -0,0 +1,171 @@
+/*-
+ * Copyright (c) 2013 Yahoo!, Inc.
+ * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this 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/errno.h>
+#include <sys/ioctl.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/uio.h>
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include "mfiutil.h"
+#include <dev/mfi/mfi_ioctl.h>
+
+MFI_TABLE(top, ctrlprop);
+
+static int
+mfi_ctrl_get_properties(int fd, struct mfi_ctrl_props *info)
+{
+
+	return (mfi_dcmd_command(fd, MFI_DCMD_CTRL_GET_PROPS, info,
+	    sizeof(struct mfi_ctrl_props), NULL, 0, NULL));
+}
+
+static int
+mfi_ctrl_set_properties(int fd, struct mfi_ctrl_props *info)
+{
+
+	return (mfi_dcmd_command(fd, MFI_DCMD_CTRL_SET_PROPS, info,
+	    sizeof(struct mfi_ctrl_props), NULL, 0, NULL));
+}
+
+/*
+ * aquite the controller properties data structure modify the 
+ * rebuild rate if requested and then retun
+ */
+static int
+mfi_ctrl_rebuild_rate(int ac, char **av)
+{
+        int error, fd;
+	struct mfi_ctrl_props ctrl_props;
+
+	if (ac > 2) {
+		warn("mfi_ctrl_set_rebuild_rate");
+		return(-1);
+	}
+		
+        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);
+        }
+	/*
+	 * 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);
+        	}
+
+		error = mfi_ctrl_get_properties(fd, &ctrl_props);
+        	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);
+	return (0);
+}
+MFI_COMMAND(ctrlprop, rebuild, mfi_ctrl_rebuild_rate);
+
+static int
+mfi_ctrl_alarm_enable(int ac, char **av)
+{
+        int error, fd;
+	struct mfi_ctrl_props ctrl_props;
+
+	if (ac > 2) {
+		warn("mfi_ctrl_alarm_enable");
+		return(-1);
+	}
+		
+        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);
+        }
+	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);
+        	}
+
+		error = mfi_ctrl_get_properties(fd, &ctrl_props);
+        	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"));
+	return (0);
+}
+
+MFI_COMMAND(ctrlprop, alarm, mfi_ctrl_alarm_enable);
diff --git a/usr.sbin/mfiutil/mfi_show.c b/usr.sbin/mfiutil/mfi_show.c
index 6bb86124f99..f0f5bab60e9 100644
--- a/usr.sbin/mfiutil/mfi_show.c
+++ b/usr.sbin/mfiutil/mfi_show.c
@@ -320,7 +320,7 @@ print_pd(struct mfi_pd_info *info, int state_len)
 	const char *s;
 	char buf[256];
 
-	humanize_number(buf, sizeof(buf), info->raw_size * 512, "",
+	humanize_number(buf, 6, info->raw_size * 512, "",
 	    HN_AUTOSCALE, HN_B | HN_NOSPACE |HN_DECIMAL);
 	printf("(%6s) ", buf);
 	if (info->state.ddf.v.pd_type.is_foreign) {
diff --git a/usr.sbin/mfiutil/mfiutil.8 b/usr.sbin/mfiutil/mfiutil.8
index 8346922c9e6..e999c77a35b 100644
--- a/usr.sbin/mfiutil/mfiutil.8
+++ b/usr.sbin/mfiutil/mfiutil.8
@@ -168,6 +168,12 @@
 .Nm
 .Op Fl u Ar unit
 .Cm bbu Ar setting Ar value
+.Nm
+.Op Fl u Ar unit
+.Cm ctrlprop Ar rebuild Op Ar rate
+.Nm
+.Op Fl u Ar unit
+.Cm ctrlprop Ar alarm Op Ar 0/1
 .Sh DESCRIPTION
 The
 .Nm
@@ -659,6 +665,12 @@ inclusive.
 Modes 1, 2 and 3 enable a transparent learn cycle, whereas modes 4 and 5 do not.
 The BBU's data retention time is greater when transparent learning is not used.
 .El
+.It Cm ctrlprop Ar rebuild Op Ar rate
+With no arguments display the rate of rebuild (percentage)a for volumes.
+With an integer argument (0-100), set that value as the new rebuild rate for volumes.
+.It Cm ctrlprop Ar alarm Op Ar 0/1
+With no arguments display the current alarm enable/disable status.
+With a 0, disable alarms.  With a 1, enable alarms.
 .El
 .Sh EXAMPLES
 Configure the cache for volume mfid0 to cache only writes:
@@ -699,6 +711,9 @@ patrol read starting in 5 minutes:
 Display the second detected foreign configuration:
 .Pp
 .Dl Nm Cm show foreign 1
+.Pp
+Set the current rebuild rate for volumes to 40%:
+.Dl Nm Cm ctrlprop rebuild 40
 .Sh SEE ALSO
 .Xr mfi 4
 .Sh HISTORY
diff --git a/usr.sbin/mfiutil/mfiutil.c b/usr.sbin/mfiutil/mfiutil.c
index a8d9ef82644..85ce25c11f3 100644
--- a/usr.sbin/mfiutil/mfiutil.c
+++ b/usr.sbin/mfiutil/mfiutil.c
@@ -78,7 +78,7 @@ usage(void)
 	fprintf(stderr, "    name <volume> <name>\n");
 	fprintf(stderr, "    volume progress <volume>  - display status of active operations\n");
 	fprintf(stderr, "    clear                     - clear volume configuration\n");
-	fprintf(stderr, "    create <type> [-v] <drive>[,<drive>[,...]] [<drive>[,<drive>[,...]]\n");
+	fprintf(stderr, "    create <type> [-v] [-s stripe_size] <drive>[,<drive>[,...]] [<drive>[,<drive>[,...]]\n");
 	fprintf(stderr, "    delete <volume>\n");
 	fprintf(stderr, "    add <drive> [volume]      - add a hot spare\n");
 	fprintf(stderr, "    remove <drive>            - remove a hot spare\n");
@@ -93,6 +93,8 @@ usage(void)
 	fprintf(stderr, "    flash <firmware>\n");
 	fprintf(stderr, "    start learn               - start a BBU relearn\n");
 	fprintf(stderr, "    bbu <setting> <value>     - set BBU properties\n");
+	fprintf(stderr, "    ctrlprop rebuild [rate]   - get/set the volume rebuild rate\n");
+	fprintf(stderr, "    ctrlprop alarm [0/1]      - enable/disable controller alarms\n");
 #ifdef DEBUG
 	fprintf(stderr, "    debug                     - debug 'show config'\n");
 	fprintf(stderr, "    dump                      - display 'saved' config\n");
diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile
index 9b7394411bb..bbc084fc998 100644
--- a/usr.sbin/mount_smbfs/Makefile
+++ b/usr.sbin/mount_smbfs/Makefile
@@ -11,11 +11,6 @@ CFLAGS+=	-DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include
 LDADD=	-lsmb -lkiconv
 DPADD=	${LIBSMB} ${LIBKICONV}
 
-# Needs to be dynamically linked for optional dlopen() access to
-# userland libiconv (see the -E option).
-#
-NO_SHARED?=	NO
-
 .PATH:	${CONTRIBDIR}/mount_smbfs
 .PATH:  ${MOUNTDIR}
 
diff --git a/usr.sbin/mtest/mtest.8 b/usr.sbin/mtest/mtest.8
index dca6a5fa6eb..5ccfa941e18 100644
--- a/usr.sbin/mtest/mtest.8
+++ b/usr.sbin/mtest/mtest.8
@@ -131,9 +131,9 @@ to allow traffic from source
 Print
 .Ar n
 source filter entries for
-.An mcast-addr
+.Ar mcast-addr
 on interface
-.An ifname .
+.Ar ifname .
 .\"
 .Pp
 .It Ic f Ar filename
diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c
index 2ff1e315aef..3888b057b85 100644
--- a/usr.sbin/ndp/ndp.c
+++ b/usr.sbin/ndp/ndp.c
@@ -109,11 +109,6 @@
 #include <unistd.h>
 #include "gmt2local.h"
 
-/* packing rule for routing socket */
-#define ROUNDUP(a) \
-	((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-#define ADVANCE(x, n) (x += ROUNDUP((n)->sa_len))
-
 #define NEXTADDR(w, s) \
 	if (rtm->rtm_addrs & (w)) { \
 		bcopy((char *)&s, cp, sizeof(s)); cp += SA_SIZE(&s);}
@@ -136,7 +131,7 @@ void getsocket(void);
 int set(int, char **);
 void get(char *);
 int delete(char *);
-void dump(struct in6_addr *, int);
+void dump(struct sockaddr_in6 *, int);
 static struct in6_nbrinfo *getnbrinfo(struct in6_addr *, int, int);
 static char *ether_str(struct sockaddr_dl *);
 int ndp_ether_aton(char *, u_char *);
@@ -168,9 +163,7 @@ int mode = 0;
 char *arg = NULL;
 
 int
-main(argc, argv)
-	int argc;
-	char **argv;
+main(int argc, char **argv)
 {
 	int ch;
 
@@ -320,8 +313,7 @@ main(argc, argv)
  * Process a file to set standard ndp entries
  */
 int
-file(name)
-	char *name;
+file(char *name)
 {
 	FILE *fp;
 	int i, retval;
@@ -378,9 +370,7 @@ struct	{
  * Set an individual neighbor cache entry
  */
 int
-set(argc, argv)
-	int argc;
-	char **argv;
+set(int argc, char **argv)
 {
 	register struct sockaddr_in6 *sin = &sin_m;
 	register struct sockaddr_dl *sdl;
@@ -426,7 +416,7 @@ set(argc, argv)
 		/* NOTREACHED */
 	}
 	sin = (struct sockaddr_in6 *)(rtm + 1);
-	sdl = (struct sockaddr_dl *)(ROUNDUP(sin->sin6_len) + (char *)sin);
+	sdl = (struct sockaddr_dl *)(ALIGN(sin->sin6_len) + (char *)sin);
 	if (IN6_ARE_ADDR_EQUAL(&sin->sin6_addr, &sin_m.sin6_addr)) {
 		if (sdl->sdl_family == AF_LINK &&
 		    !(rtm->rtm_flags & RTF_GATEWAY)) {
@@ -455,8 +445,7 @@ overwrite:
  * Display an individual neighbor cache entry
  */
 void
-get(host)
-	char *host;
+get(char *host)
 {
 	struct sockaddr_in6 *sin = &sin_m;
 	struct addrinfo hints, *res;
@@ -472,7 +461,9 @@ get(host)
 		return;
 	}
 	sin->sin6_addr = ((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
-	dump(&sin->sin6_addr, 0);
+	sin->sin6_scope_id =
+	    ((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id;
+	dump(sin, 0);
 	if (found_entry == 0) {
 		getnameinfo((struct sockaddr *)sin, sin->sin6_len, host_buf,
 		    sizeof(host_buf), NULL ,0,
@@ -486,8 +477,7 @@ get(host)
  * Delete a neighbor cache entry
  */
 int
-delete(host)
-	char *host;
+delete(char *host)
 {
 	struct sockaddr_in6 *sin = &sin_m;
 	register struct rt_msghdr *rtm = &m_rtmsg.m_rtm;
@@ -515,7 +505,7 @@ delete(host)
 		/* NOTREACHED */
 	}
 	sin = (struct sockaddr_in6 *)(rtm + 1);
-	sdl = (struct sockaddr_dl *)(ROUNDUP(sin->sin6_len) + (char *)sin);
+	sdl = (struct sockaddr_dl *)(ALIGN(sin->sin6_len) + (char *)sin);
 	if (IN6_ARE_ADDR_EQUAL(&sin->sin6_addr, &sin_m.sin6_addr)) {
 		if (sdl->sdl_family == AF_LINK &&
 		    !(rtm->rtm_flags & RTF_GATEWAY)) {
@@ -555,9 +545,7 @@ delete:
  * Dump the entire neighbor cache
  */
 void
-dump(addr, cflag)
-	struct in6_addr *addr;
-	int cflag;
+dump(struct sockaddr_in6 *addr, int cflag)
 {
 	int mib[6];
 	size_t needed;
@@ -607,7 +595,7 @@ again:;
 
 		rtm = (struct rt_msghdr *)next;
 		sin = (struct sockaddr_in6 *)(rtm + 1);
-		sdl = (struct sockaddr_dl *)((char *)sin + ROUNDUP(sin->sin6_len));
+		sdl = (struct sockaddr_dl *)((char *)sin + ALIGN(sin->sin6_len));
 
 		/*
 		 * Some OSes can produce a route that has the LINK flag but
@@ -629,7 +617,9 @@ again:;
 			continue;
 
 		if (addr) {
-			if (!IN6_ARE_ADDR_EQUAL(addr, &sin->sin6_addr))
+			if (IN6_ARE_ADDR_EQUAL(&addr->sin6_addr,
+			    &sin->sin6_addr) == 0 ||
+			    addr->sin6_scope_id != sin->sin6_scope_id)
 				continue;
 			found_entry = 1;
 		} else if (IN6_IS_ADDR_MULTICAST(&sin->sin6_addr))
@@ -762,10 +752,7 @@ again:;
 }
 
 static struct in6_nbrinfo *
-getnbrinfo(addr, ifindex, warning)
-	struct in6_addr *addr;
-	int ifindex;
-	int warning;
+getnbrinfo(struct in6_addr *addr, int ifindex, int warning)
 {
 	static struct in6_nbrinfo nbi;
 	int s;
@@ -806,9 +793,7 @@ ether_str(struct sockaddr_dl *sdl)
 }
 
 int
-ndp_ether_aton(a, n)
-	char *a;
-	u_char *n;
+ndp_ether_aton(char *a, u_char *n)
 {
 	int i, o[6];
 
@@ -840,8 +825,7 @@ usage()
 }
 
 int
-rtmsg(cmd)
-	int cmd;
+rtmsg(int cmd)
 {
 	static int seq;
 	int rlen;
@@ -906,10 +890,7 @@ doit:
 }
 
 void
-ifinfo(ifname, argc, argv)
-	char *ifname;
-	int argc;
-	char **argv;
+ifinfo(char *ifname, int argc, char **argv)
 {
 	struct in6_ndireq nd;
 	int i, s;
@@ -1478,8 +1459,7 @@ harmonize_rtr()
 
 #ifdef SIOCSDEFIFACE_IN6	/* XXX: check SIOCGDEFIFACE_IN6 as well? */
 static void
-setdefif(ifname)
-	char *ifname;
+setdefif(char *ifname)
 {
 	struct in6_ndifreq ndifreq;
 	unsigned int ifindex;
@@ -1532,8 +1512,7 @@ getdefif()
 #endif
 
 static char *
-sec2str(total)
-	time_t total;
+sec2str(time_t total)
 {
 	static char result[256];
 	int days, hours, mins, secs;
@@ -1578,8 +1557,7 @@ sec2str(total)
  * from tcpdump/util.c
  */
 static void
-ts_print(tvp)
-	const struct timeval *tvp;
+ts_print(const struct timeval *tvp)
 {
 	int s;
 
diff --git a/usr.sbin/newsyslog/newsyslog.c b/usr.sbin/newsyslog/newsyslog.c
index 69a63c4c5fe..66856d23a90 100644
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@@ -1491,6 +1491,7 @@ validate_old_timelog(int fd, const struct dirent *dp, const char *logfname,
 			    &dp->d_name[logfname_len]);
 		return (0);
 	}
+	memset(tm, 0, sizeof(*tm));
 	if ((s = strptime(&dp->d_name[logfname_len + 1],
 	    timefnamefmt, tm)) == NULL) {
 		/*
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index d244bd29f01..ce5a4fabd44 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -2,9 +2,13 @@
 
 PROG=	pkg
 SRCS=	pkg.c dns_utils.c config.c
+MAN=	pkg.7
 
-NO_MAN=	yes
-DPADD=	${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBBSDYML} ${LIBSBUF}
-LDADD=	-larchive -lelf -lfetch -lbsdyml -lsbuf
+CFLAGS+=-I${.CURDIR}/../../contrib/libyaml/include
+.PATH:	${.CURDIR}/../../contrib/libyaml/include
+DPADD=	${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBYAML} ${LIBSBUF} ${LIBSSL} \
+	${LIBCRYPTO}
+LDADD=	-larchive -lelf -lfetch -lyaml -lsbuf -lssl -lcrypto
+USEPRIVATELIB=	yaml
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c
index 01eaa9f7f94..affcee999cd 100644
--- a/usr.sbin/pkg/config.c
+++ b/usr.sbin/pkg/config.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2013 Baptiste Daroussin <bapt@FreeBSD.org>
+ * Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,7 +34,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/endian.h>
 
 #include <assert.h>
-#include <bsdyml.h>
+#include <yaml.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
@@ -62,7 +63,7 @@ static struct config_entry c[] = {
 	[PACKAGESITE] = {
 		PKG_CONFIG_STRING,
 		"PACKAGESITE",
-		"http://pkg.FreeBSD.org/${ABI}/latest",
+		URL_SCHEME_PREFIX "http://pkg.FreeBSD.org/${ABI}/latest",
 		NULL,
 		false,
 	},
@@ -86,7 +87,21 @@ static struct config_entry c[] = {
 		"NO",
 		NULL,
 		false,
-	}
+	},
+	[SIGNATURE_TYPE] = {
+		PKG_CONFIG_STRING,
+		"SIGNATURE_TYPE",
+		NULL,
+		NULL,
+		false,
+	},
+	[FINGERPRINTS] = {
+		PKG_CONFIG_STRING,
+		"FINGERPRINTS",
+		NULL,
+		NULL,
+		false,
+	},
 };
 
 static const char *
@@ -460,7 +475,7 @@ subst_packagesite(const char *abi)
 }
 
 static void
-config_parse(yaml_document_t *doc, yaml_node_t *node)
+config_parse(yaml_document_t *doc, yaml_node_t *node, pkg_conf_file_t conftype)
 {
 	yaml_node_pair_t *pair;
 	yaml_node_t *key, *val;
@@ -495,15 +510,39 @@ config_parse(yaml_document_t *doc, yaml_node_t *node)
 		}
 
 		sbuf_clear(buf);
-		for (j = 0; j < strlen(key->data.scalar.value); ++j)
-			sbuf_putc(buf, toupper(key->data.scalar.value[j]));
 
-		sbuf_finish(buf);
+		if (conftype == CONFFILE_PKG) {
+			for (j = 0; j < strlen(key->data.scalar.value); ++j)
+				sbuf_putc(buf,
+				    toupper(key->data.scalar.value[j]));
+			sbuf_finish(buf);
+		} else if (conftype == CONFFILE_REPO) {
+			/* The CONFFILE_REPO type is more restrictive. Only
+			   parse known elements. */
+			if (strcasecmp(key->data.scalar.value, "url") == 0)
+				sbuf_cpy(buf, "PACKAGESITE");
+			else if (strcasecmp(key->data.scalar.value,
+			    "mirror_type") == 0)
+				sbuf_cpy(buf, "MIRROR_TYPE");
+			else if (strcasecmp(key->data.scalar.value,
+			    "signature_type") == 0)
+				sbuf_cpy(buf, "SIGNATURE_TYPE");
+			else if (strcasecmp(key->data.scalar.value,
+			    "fingerprints") == 0)
+				sbuf_cpy(buf, "FINGERPRINTS");
+			else { /* Skip unknown entries for future use. */
+				++pair;
+				continue;
+			}
+			sbuf_finish(buf);
+		}
+
 		for (i = 0; i < CONFIG_SIZE; i++) {
 			if (strcmp(sbuf_data(buf), c[i].key) == 0)
 				break;
 		}
 
+		/* Silently skip unknown keys to be future compatible. */
 		if (i == CONFIG_SIZE) {
 			++pair;
 			continue;
@@ -522,13 +561,80 @@ config_parse(yaml_document_t *doc, yaml_node_t *node)
 	sbuf_delete(buf);
 }
 
-int
-config_init(void)
+/*-
+ * Parse new repo style configs in style:
+ * Name:
+ *   URL:
+ *   MIRROR_TYPE:
+ * etc...
+ */
+static void
+parse_repo_file(yaml_document_t *doc, yaml_node_t *node)
+{
+	yaml_node_pair_t *pair;
+
+	pair = node->data.mapping.pairs.start;
+	while (pair < node->data.mapping.pairs.top) {
+		yaml_node_t *key = yaml_document_get_node(doc, pair->key);
+		yaml_node_t *val = yaml_document_get_node(doc, pair->value);
+
+		if (key->data.scalar.length <= 0) {
+			++pair;
+			continue;
+		}
+
+		if (val->type != YAML_MAPPING_NODE) {
+			++pair;
+			continue;
+		}
+
+		config_parse(doc, val, CONFFILE_REPO);
+		++pair;
+	}
+}
+
+
+static int
+read_conf_file(const char *confpath, pkg_conf_file_t conftype)
 {
 	FILE *fp;
 	yaml_parser_t parser;
 	yaml_document_t doc;
 	yaml_node_t *node;
+
+	if ((fp = fopen(confpath, "r")) == NULL) {
+		if (errno != ENOENT)
+			err(EXIT_FAILURE, "Unable to open configuration "
+			    "file %s", confpath);
+		/* no configuration present */
+		return (1);
+	}
+
+	yaml_parser_initialize(&parser);
+	yaml_parser_set_input_file(&parser, fp);
+	yaml_parser_load(&parser, &doc);
+
+	node = yaml_document_get_root_node(&doc);
+
+	if (node == NULL || node->type != YAML_MAPPING_NODE)
+		warnx("Invalid configuration format, ignoring the "
+		    "configuration file %s", confpath);
+	else {
+		if (conftype == CONFFILE_PKG)
+			config_parse(&doc, node, conftype);
+		else if (conftype == CONFFILE_REPO)
+			parse_repo_file(&doc, node);
+	}
+
+	yaml_document_delete(&doc);
+	yaml_parser_delete(&parser);
+
+	return (0);
+}
+
+int
+config_init(void)
+{
 	const char *val;
 	int i;
 	const char *localbase;
@@ -544,37 +650,23 @@ config_init(void)
 	}
 
 	localbase = getenv("LOCALBASE") ? getenv("LOCALBASE") : _LOCALBASE;
-	snprintf(confpath, sizeof(confpath), "%s/etc/pkg.conf", localbase);
+	snprintf(confpath, sizeof(confpath), "%s/etc/pkg.conf",
+	    localbase);
 
-	if ((fp = fopen(confpath, "r")) == NULL) {
-		if (errno != ENOENT)
-			err(EXIT_FAILURE, "Unable to open configuration file %s", confpath);
-		/* no configuration present */
+	if (access(confpath, F_OK) == 0 && read_conf_file(confpath,
+	    CONFFILE_PKG))
 		goto finalize;
-	}
 
-	yaml_parser_initialize(&parser);
-	yaml_parser_set_input_file(&parser, fp);
-	yaml_parser_load(&parser, &doc);
-
-	node = yaml_document_get_root_node(&doc);
-
-	if (node != NULL) {
-		if (node->type != YAML_MAPPING_NODE)
-			warnx("Invalid configuration format, ignoring the configuration file");
-		else
-			config_parse(&doc, node);
-	} else {
-		warnx("Invalid configuration format, ignoring the configuration file");
-	}
-
-	yaml_document_delete(&doc);
-	yaml_parser_delete(&parser);
+	snprintf(confpath, sizeof(confpath), "/etc/pkg/FreeBSD.conf");
+	if (access(confpath, F_OK) == 0 && read_conf_file(confpath,
+	    CONFFILE_REPO))
+		goto finalize;
 
 finalize:
 	if (c[ABI].val == NULL && c[ABI].value == NULL) {
 		if (pkg_get_myabi(abi, BUFSIZ) != 0)
-			errx(EXIT_FAILURE, "Failed to determine the system ABI");
+			errx(EXIT_FAILURE, "Failed to determine the system "
+			    "ABI");
 		c[ABI].val = abi;
 	}
 
diff --git a/usr.sbin/pkg/config.h b/usr.sbin/pkg/config.h
index e592f6dee59..72d2ec0b01a 100644
--- a/usr.sbin/pkg/config.h
+++ b/usr.sbin/pkg/config.h
@@ -30,12 +30,15 @@
 #define _PKG_CONFIG_H
 
 #define _LOCALBASE "/usr/local"
+#define URL_SCHEME_PREFIX "pkg+"
 
 typedef enum {
 	PACKAGESITE = 0,
 	ABI,
 	MIRROR_TYPE,
 	ASSUME_ALWAYS_YES,
+	SIGNATURE_TYPE,
+	FINGERPRINTS,
 	CONFIG_SIZE
 } pkg_config_key;
 
@@ -44,6 +47,11 @@ typedef enum {
 	PKG_CONFIG_BOOL,
 } pkg_config_t;
 
+typedef enum {
+	CONFFILE_PKG=0,
+	CONFFILE_REPO,
+} pkg_conf_file_t;
+
 int config_init(void);
 void config_finish(void);
 int config_string(pkg_config_key, const char **);
diff --git a/usr.sbin/pkg/dns_utils.c b/usr.sbin/pkg/dns_utils.c
index cbdb3d58868..ce88048a4aa 100644
--- a/usr.sbin/pkg/dns_utils.c
+++ b/usr.sbin/pkg/dns_utils.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012 Baptiste Daroussin <bapt@FreeBSD.org>
+ * Copyright (c) 2012-2013 Baptiste Daroussin <bapt@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,77 @@ typedef union {
 	unsigned char buf[1024];
 } dns_query;
 
+static int
+srv_priority_cmp(const void *a, const void *b)
+{
+	const struct dns_srvinfo *da, *db;
+	unsigned int r, l;
+
+	da = *(struct dns_srvinfo * const *)a;
+	db = *(struct dns_srvinfo * const *)b;
+
+	l = da->priority;
+	r = db->priority;
+
+	return ((l > r) - (l < r));
+}
+
+static int
+srv_final_cmp(const void *a, const void *b)
+{
+	const struct dns_srvinfo *da, *db;
+	unsigned int r, l, wr, wl;
+	int res;
+
+	da = *(struct dns_srvinfo * const *)a;
+	db = *(struct dns_srvinfo * const *)b;
+
+	l = da->priority;
+	r = db->priority;
+
+	res = ((l > r) - (l < r));
+
+	if (res == 0) {
+		wl = da->finalweight;
+		wr = db->finalweight;
+		res = ((wr > wl) - (wr < wl));
+	}
+
+	return (res);
+}
+
+static void
+compute_weight(struct dns_srvinfo **d, int first, int last)
+{
+	int i, j, totalweight;
+	int *chosen;
+
+	chosen = malloc(sizeof(int) * (last - first + 1));
+	totalweight = 0;
+	
+	for (i = 0; i <= last; i++)
+		totalweight += d[i]->weight;
+
+	if (totalweight == 0)
+		return;
+
+	for (i = 0; i <= last; i++) {
+		for (;;) {
+			chosen[i] = random() % (d[i]->weight * 100 / totalweight);
+			for (j = 0; j < i; j++) {
+				if (chosen[i] == chosen[j])
+					break;
+			}
+			if (j == i) {
+				d[i]->finalweight = chosen[i];
+				break;
+			}
+		}
+	}
+
+	free(chosen);
+}
+
 struct dns_srvinfo *
 dns_getsrvinfo(const char *zone)
 {
@@ -46,7 +117,7 @@ dns_getsrvinfo(const char *zone)
 	unsigned char *end, *p;
 	char host[MAXHOSTNAMELEN];
 	dns_query q;
-	int len, qdcount, ancount, n, i;
+	int len, qdcount, ancount, n, i, f, l;
 	unsigned int type, class, ttl, priority, weight, port;
 
 	if ((len = res_query(zone, C_IN, T_SRV, q.buf, sizeof(q.buf))) == -1 ||
@@ -125,6 +196,21 @@ dns_getsrvinfo(const char *zone)
 		n++;
 	}
 
+	qsort(res, n, sizeof(res[0]), srv_priority_cmp);
+
+	priority = f = l = 0;
+	for (i = 0; i < n; i++) {
+		if (res[i]->priority != priority) {
+			if (f != l)
+				compute_weight(res, f, l);
+			f = i;
+			priority = res[i]->priority;
+		}
+		l = i;
+	}
+
+	qsort(res, n, sizeof(res[0]), srv_final_cmp);
+
 	for (i = 0; i < n - 1; i++)
 		res[i]->next = res[i + 1];
 
diff --git a/usr.sbin/pkg/dns_utils.h b/usr.sbin/pkg/dns_utils.h
index 0f3367b526c..b1418bb2ddd 100644
--- a/usr.sbin/pkg/dns_utils.h
+++ b/usr.sbin/pkg/dns_utils.h
@@ -35,6 +35,7 @@ struct dns_srvinfo {
 	unsigned int priority;
 	unsigned int weight;
 	unsigned int port;
+	unsigned int finalweight;
 	char host[MAXHOSTNAMELEN];
 	struct dns_srvinfo *next;
 };
diff --git a/usr.sbin/pkg/pkg.7 b/usr.sbin/pkg/pkg.7
new file mode 100644
index 00000000000..e46f3ddbf7f
--- /dev/null
+++ b/usr.sbin/pkg/pkg.7
@@ -0,0 +1,274 @@
+.\" Copyright (c) 2013 Bryan Drewery <bdrewery@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 November 19, 2013
+.Dt PKG 7
+.Os
+.Sh NAME
+.Nm pkg
+.Nd a utility for manipulating packages
+.Sh SYNOPSIS
+.Nm
+.Ao Ar command Ac
+.Nm
+add
+.Op Fl f
+.Ao Pa pkg.txz Ac
+.Nm
+.Fl N
+.Nm
+bootstrap
+.Op Fl f
+.Sh DESCRIPTION
+.Nm
+is the package management tool.
+It is used to manage local packages installed from
+.Xr ports 7
+and install/upgrade packages from remote repositories.
+.Pp
+To avoid backwards incompatibility issues, the actual
+.Xr pkg 8
+tool is not installed in the base system.
+The first time invoked,
+.Nm
+will bootstrap the real
+.Xr pkg 8
+from a remote repository.
+.Bl -tag -width "pkg bootstrap"
+.It Nm Ao Ar command Ac
+If
+.Xr pkg 8
+is not installed yet, it will be fetched, have its signature verified,
+installed, and then have the original command forwarded to it.
+If already installed, the command requested will be forwarded to the real
+.Xr pkg 8 .
+.It Nm Li add Oo Fl f Oc Ao Pa pkg.txz Ac
+Install
+.Xr pkg 8
+from a local package instead of fetching from remote.
+If a
+.Pa pkg.txz.sig
+file exists and
+signature checking is enabled, then the signature will be verified
+before installing the package.
+If the
+.Fl f
+flag is specified, then
+.Xr pkg 8
+will be installed regardless if it is already installed.
+.It Nm Fl N
+Do not bootstrap, just determine if
+.Xr pkg 8
+is actually installed or not.
+Returns 0 and the number of packages installed
+if it is, otherwise 1.
+.It Nm Li bootstrap Op Fl f
+Attempt to bootstrap and do not forward anything to
+.Xr pkg 8
+after it is installed.
+If the
+.Fl f
+flag is specified, then
+.Xr pkg 8
+will be fetched and installed regardless if it is already installed.
+.El
+.Sh CONFIGURATION
+Configuration varies in whether it is in a repository configuration file
+or the global configuration file.
+.Pp
+Repository configuration can be stored in
+.Pa /etc/pkg/FreeBSD.conf
+in the following format:
+.Bd -literal -offset indent
+FreeBSD: {
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
+  mirror_type: "srv",
+  signature_type: "none",
+  fingerprints: "/usr/share/keys/pkg",
+  enabled: yes
+}
+.Ed
+.Bl -tag -width signature_type -compact
+.It url
+Refer to
+.Dv PACKAGESITE
+in
+.Sx ENVIRONMENT
+.It mirror_type
+Refer to
+.Dv MIRROR_TYPE
+in
+.Sx ENVIRONMENT
+.It signature_type
+Refer to
+.Dv SIGNATURE_TYPE
+in
+.Sx ENVIRONMENT
+.It fingerprints
+Refer to
+.Dv FINGERPRINTS
+in
+.Sx ENVIRONMENT
+.It enabled
+Defines whether this repository should be used or not.
+Valid values are
+.Dv yes ,
+.Dv true ,
+.Dv 1 ,
+.Dv no ,
+.Dv false ,
+.Dv 0 .
+.El
+.Pp
+Global configuration can be stored in
+.Pa /usr/local/etc/pkg.conf
+in the following format:
+.Bd -literal -offset indent
+PACKAGESITE: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
+MIRROR_TYPE: "srv",
+SIGNATURE_TYPE: "none",
+FINGERPRINTS: "/usr/share/keys/pkg",
+ASSUME_ALWAYS_YES: "yes"
+.Ed
+.Pp
+Reference
+.Sx ENVIRONMENT
+for each variable.
+.Sh ENVIRONMENT
+The following environment variables can be set to override the settings
+from the
+.Pa pkg.conf
+file used.
+.Bl -tag -width "ASSUME_ALWAYS_YES"
+.It Ev MIRROR_TYPE
+This defines which mirror type should be used.
+Valid values are
+.Dv SRV ,
+.Dv HTTP ,
+.Dv NONE .
+.It Ev ABI
+This defines the ABI for the package to be installed.
+Default ABI is determined from
+.Pa /bin/sh .
+.It Ev ASSUME_ALWAYS_YES
+If set, no confirmation will be asked when bootstrapping
+.Xr pkg 8 .
+.It Ev SIGNATURE_TYPE
+If set to
+.Dv FINGERPRINTS
+then a signature will be required and validated against known
+certificate fingerprints when bootstrapping
+.Xr pkg 8 .
+.It Ev FINGERPRINTS
+If
+.Sy SIGNATURE_TYPE
+is set to
+.Dv FINGERPRINTS
+this value should be set to the directory path where known fingerprints are
+located.
+.It Ev PACKAGESITE
+The URL that
+.Xr pkg 8
+and other packages
+will be fetched from.
+.El
+.Sh FILES
+Configuration is read from the files in the listed order.
+The first enabled repository is the one used for bootstrapping
+.Xr pkg 8 .
+.Bl -tag -width "/usr/local/etc/pkg/repos/*.conf"
+.It Pa /usr/local/etc/pkg.conf
+.It Pa /etc/pkg/FreeBSD.conf
+.El
+.Sh EXAMPLES
+Some examples are listed here.
+The full list of available commands are available in
+.Xr pkg 8
+once it is bootstrapped.
+.Pp
+Search for a package:
+.Dl $ pkg search perl
+.Pp
+Install a package:
+.Dl % pkg install perl
+.Pp
+List installed packages:
+.Dl $ pkg info
+.Pp
+Upgrade from remote repository:
+.Dl % pkg upgrade
+.Pp
+List non-automatic packages:
+.Dl $ pkg query -e '%a = 0' %o
+.Pp
+List automatic packages:
+.Dl $ pkg query -e '%a = 1' %o
+.Pp
+Delete an installed package:
+.Dl % pkg delete perl
+.Pp
+Remove unneeded dependencies:
+.Dl % pkg autoremove
+.Pp
+Change a package from automatic to non-automatic, which will prevent
+.Ic autoremove
+from removing it:
+.Dl % pkg set -A 0 perl
+.Pp
+Change a package from non-automatic to automatic, which will make
+.Ic autoremove
+allow it be removed once nothing depends on it:
+.Dl % pkg set -A 1 perl
+.Pp
+Create package file from an installed package:
+.Dl % pkg create -o /usr/ports/packages/All perl
+.Pp
+Determine which package installed a file:
+.Dl $ pkg which /usr/local/bin/perl
+.Pp
+Audit installed packages for security advisories:
+.Dl $ pkg audit
+.Pp
+Check installed packages for checksum mismatches:
+.Dl # pkg check -s -a
+.Pp
+Check for missing dependencies:
+.Dl # pkg check -d -a
+.Sh SEE ALSO
+.Xr ports 7 ,
+.Xr pkg 8
+.Sh HISTORY
+The
+.Nm
+command first appeared in
+.Fx 9.1 .
+It became the default package tool in
+.Fx 10.0 ,
+replacing the
+pkg_install suite of tools
+.Xr pkg_add 1 ,
+.Xr pkg_info 1 and
+.Xr pkg_create 1 .
diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c
index 0aef3da2099..89e07cc8b1b 100644
--- a/usr.sbin/pkg/pkg.c
+++ b/usr.sbin/pkg/pkg.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2012-2013 Baptiste Daroussin <bapt@FreeBSD.org>
+ * Copyright (c) 2013 Bryan Drewery <bdrewery@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,12 +29,18 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/sbuf.h>
 #include <sys/wait.h>
 
+#define _WITH_GETLINE
 #include <archive.h>
 #include <archive_entry.h>
+#include <dirent.h>
 #include <err.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <fetch.h>
 #include <paths.h>
 #include <stdbool.h>
@@ -42,10 +49,37 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <yaml.h>
+
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 
 #include "dns_utils.h"
 #include "config.h"
 
+struct sig_cert {
+	char *name;
+	unsigned char *sig;
+	int siglen;
+	unsigned char *cert;
+	int certlen;
+	bool trusted;
+};
+
+typedef enum {
+       HASH_UNKNOWN,
+       HASH_SHA256,
+} hash_t;
+
+struct fingerprint {
+       hash_t type;
+       char *name;
+       char hash[BUFSIZ];
+       STAILQ_ENTRY(fingerprint) next;
+};
+
+STAILQ_HEAD(fingerprint_list, fingerprint);
+
 static int
 extract_pkg_static(int fd, char *p, int sz)
 {
@@ -101,7 +135,7 @@ cleanup:
 }
 
 static int
-install_pkg_static(char *path, char *pkgpath)
+install_pkg_static(const char *path, const char *pkgpath, bool force)
 {
 	int pstat;
 	pid_t pid;
@@ -110,7 +144,12 @@ install_pkg_static(char *path, char *pkgpath)
 	case -1:
 		return (-1);
 	case 0:
-		execl(path, "pkg-static", "add", pkgpath, (char *)NULL);
+		if (force)
+			execl(path, "pkg-static", "add", "-f", pkgpath,
+			    (char *)NULL);
+		else
+			execl(path, "pkg-static", "add", pkgpath,
+			    (char *)NULL);
 		_exit(1);
 	default:
 		break;
@@ -128,51 +167,34 @@ install_pkg_static(char *path, char *pkgpath)
 }
 
 static int
-bootstrap_pkg(void)
+fetch_to_fd(const char *url, char *path)
 {
 	struct url *u;
-	FILE *remote;
-	FILE *config;
-	char *site;
 	struct dns_srvinfo *mirrors, *current;
-	/* To store _https._tcp. + hostname + \0 */
-	char zone[MAXHOSTNAMELEN + 13];
-	char url[MAXPATHLEN];
-	char conf[MAXPATHLEN];
-	char tmppkg[MAXPATHLEN];
-	const char *packagesite, *mirror_type;
-	char buf[10240];
-	char pkgstatic[MAXPATHLEN];
-	int fd, retry, ret, max_retry;
 	struct url_stat st;
+	FILE *remote;
+	/* To store _https._tcp. + hostname + \0 */
+	int fd;
+	int retry, max_retry;
 	off_t done, r;
-	time_t now;
-	time_t last;
+	time_t now, last;
+	char buf[10240];
+	char zone[MAXHOSTNAMELEN + 13];
+	static const char *mirror_type = NULL;
 
 	done = 0;
 	last = 0;
 	max_retry = 3;
-	ret = -1;
-	remote = NULL;
-	config = NULL;
 	current = mirrors = NULL;
+	remote = NULL;
 
-	printf("Bootstrapping pkg please wait\n");
-
-	if (config_string(PACKAGESITE, &packagesite) != 0) {
-		warnx("No PACKAGESITE defined");
-		return (-1);
-	}
-	if (config_string(MIRROR_TYPE, &mirror_type) != 0) {
+	if (mirror_type == NULL && config_string(MIRROR_TYPE, &mirror_type)
+	    != 0) {
 		warnx("No MIRROR_TYPE defined");
 		return (-1);
 	}
-	snprintf(url, MAXPATHLEN, "%s/Latest/pkg.txz", packagesite);
 
-	snprintf(tmppkg, MAXPATHLEN, "%s/pkg.txz.XXXXXX",
-	    getenv("TMPDIR") ? getenv("TMPDIR") : _PATH_TMP);
-
-	if ((fd = mkstemp(tmppkg)) == -1) {
+	if ((fd = mkstemp(path)) == -1) {
 		warn("mkstemp()");
 		return (-1);
 	}
@@ -191,8 +213,10 @@ bootstrap_pkg(void)
 			}
 		}
 
-		if (mirrors != NULL)
+		if (mirrors != NULL) {
 			strlcpy(u->host, current->host, sizeof(u->host));
+			u->port = current->port;
+		}
 
 		remote = fetchXGet(u, &st, "");
 		if (remote == NULL) {
@@ -209,16 +233,13 @@ bootstrap_pkg(void)
 		}
 	}
 
-	if (remote == NULL)
-		goto fetchfail;
-
 	while (done < st.size) {
 		if ((r = fread(buf, 1, sizeof(buf), remote)) < 1)
 			break;
 
 		if (write(fd, buf, r) != r) {
 			warn("write()");
-			goto cleanup;
+			goto fetchfail;
 		}
 
 		done += r;
@@ -230,40 +251,567 @@ bootstrap_pkg(void)
 	if (ferror(remote))
 		goto fetchfail;
 
-	if ((ret = extract_pkg_static(fd, pkgstatic, MAXPATHLEN)) == 0)
-		ret = install_pkg_static(pkgstatic, tmppkg);
+	goto cleanup;
 
-	snprintf(conf, MAXPATHLEN, "%s/etc/pkg.conf",
-	    getenv("LOCALBASE") ? getenv("LOCALBASE") : _LOCALBASE);
-
-	if (access(conf, R_OK) == -1) {
-		site = strrchr(url, '/');
-		if (site == NULL)
-			goto cleanup;
-		site[0] = '\0';
-		site = strrchr(url, '/');
-		if (site == NULL)
-			goto cleanup;
-		site[0] = '\0';
-
-		config = fopen(conf, "w+");
-		if (config == NULL)
-			goto cleanup;
-		fprintf(config, "packagesite: %s\n", url);
-		fclose(config);
+fetchfail:
+	if (fd != -1) {
+		close(fd);
+		fd = -1;
+		unlink(path);
 	}
 
+cleanup:
+	if (remote != NULL)
+		fclose(remote);
+
+	return fd;
+}
+
+static struct fingerprint *
+parse_fingerprint(yaml_document_t *doc, yaml_node_t *node)
+{
+	yaml_node_pair_t *pair;
+	yaml_char_t *function, *fp;
+	struct fingerprint *f;
+	hash_t fct = HASH_UNKNOWN;
+
+	function = fp = NULL;
+
+	pair = node->data.mapping.pairs.start;
+	while (pair < node->data.mapping.pairs.top) {
+		yaml_node_t *key = yaml_document_get_node(doc, pair->key);
+		yaml_node_t *val = yaml_document_get_node(doc, pair->value);
+
+		if (key->data.scalar.length <= 0) {
+			++pair;
+			continue;
+		}
+
+		if (val->type != YAML_SCALAR_NODE) {
+			++pair;
+			continue;
+		}
+
+		if (strcasecmp(key->data.scalar.value, "function") == 0)
+			function = val->data.scalar.value;
+		else if (strcasecmp(key->data.scalar.value, "fingerprint")
+		    == 0)
+			fp = val->data.scalar.value;
+
+		++pair;
+		continue;
+	}
+
+	if (fp == NULL || function == NULL)
+		return (NULL);
+
+	if (strcasecmp(function, "sha256") == 0)
+		fct = HASH_SHA256;
+
+	if (fct == HASH_UNKNOWN) {
+		fprintf(stderr, "Unsupported hashing function: %s\n", function);
+		return (NULL);
+	}
+
+	f = calloc(1, sizeof(struct fingerprint));
+	f->type = fct;
+	strlcpy(f->hash, fp, sizeof(f->hash));
+
+	return (f);
+}
+
+static void
+free_fingerprint_list(struct fingerprint_list* list)
+{
+	struct fingerprint *fingerprint, *tmp;
+
+	STAILQ_FOREACH_SAFE(fingerprint, list, next, tmp) {
+		free(fingerprint->name);
+		free(fingerprint);
+	}
+	free(list);
+}
+
+static struct fingerprint *
+load_fingerprint(const char *dir, const char *filename)
+{
+	yaml_parser_t parser;
+	yaml_document_t doc;
+	yaml_node_t *node;
+	FILE *fp;
+	struct fingerprint *f;
+	char path[MAXPATHLEN];
+
+	f = NULL;
+
+	snprintf(path, MAXPATHLEN, "%s/%s", dir, filename);
+
+	if ((fp = fopen(path, "r")) == NULL)
+		return (NULL);
+
+	yaml_parser_initialize(&parser);
+	yaml_parser_set_input_file(&parser, fp);
+	yaml_parser_load(&parser, &doc);
+
+	node = yaml_document_get_root_node(&doc);
+	if (node == NULL || node->type != YAML_MAPPING_NODE)
+		goto out;
+
+	f = parse_fingerprint(&doc, node);
+	f->name = strdup(filename);
+
+out:
+	yaml_document_delete(&doc);
+	yaml_parser_delete(&parser);
+	fclose(fp);
+
+	return (f);
+}
+
+static struct fingerprint_list *
+load_fingerprints(const char *path, int *count)
+{
+	DIR *d;
+	struct dirent *ent;
+	struct fingerprint *finger;
+	struct fingerprint_list *fingerprints;
+
+	*count = 0;
+
+	fingerprints = calloc(1, sizeof(struct fingerprint_list));
+	if (fingerprints == NULL)
+		return (NULL);
+	STAILQ_INIT(fingerprints);
+
+	if ((d = opendir(path)) == NULL)
+		return (NULL);
+
+	while ((ent = readdir(d))) {
+		if (strcmp(ent->d_name, ".") == 0 ||
+		    strcmp(ent->d_name, "..") == 0)
+			continue;
+		finger = load_fingerprint(path, ent->d_name);
+		if (finger != NULL) {
+			STAILQ_INSERT_TAIL(fingerprints, finger, next);
+			++(*count);
+		}
+	}
+
+	closedir(d);
+
+	return (fingerprints);
+}
+
+static void
+sha256_hash(unsigned char hash[SHA256_DIGEST_LENGTH],
+    char out[SHA256_DIGEST_LENGTH * 2 + 1])
+{
+	int i;
+
+	for (i = 0; i < SHA256_DIGEST_LENGTH; i++)
+		sprintf(out + (i * 2), "%02x", hash[i]);
+
+	out[SHA256_DIGEST_LENGTH * 2] = '\0';
+}
+
+static void
+sha256_buf(char *buf, size_t len, char out[SHA256_DIGEST_LENGTH * 2 + 1])
+{
+	unsigned char hash[SHA256_DIGEST_LENGTH];
+	SHA256_CTX sha256;
+
+	out[0] = '\0';
+
+	SHA256_Init(&sha256);
+	SHA256_Update(&sha256, buf, len);
+	SHA256_Final(hash, &sha256);
+	sha256_hash(hash, out);
+}
+
+static int
+sha256_fd(int fd, char out[SHA256_DIGEST_LENGTH * 2 + 1])
+{
+	int my_fd;
+	FILE *fp;
+	char buffer[BUFSIZ];
+	unsigned char hash[SHA256_DIGEST_LENGTH];
+	size_t r;
+	int ret;
+	SHA256_CTX sha256;
+
+	my_fd = -1;
+	fp = NULL;
+	r = 0;
+	ret = 1;
+
+	out[0] = '\0';
+
+	/* Duplicate the fd so that fclose(3) does not close it. */
+	if ((my_fd = dup(fd)) == -1) {
+		warnx("dup");
+		goto cleanup;
+	}
+
+	if ((fp = fdopen(my_fd, "rb")) == NULL) {
+		warnx("fdopen");
+		goto cleanup;
+	}
+
+	SHA256_Init(&sha256);
+
+	while ((r = fread(buffer, 1, BUFSIZ, fp)) > 0)
+		SHA256_Update(&sha256, buffer, r);
+
+	if (ferror(fp) != 0) {
+		warnx("fread");
+		goto cleanup;
+	}
+
+	SHA256_Final(hash, &sha256);
+	sha256_hash(hash, out);
+	ret = 0;
+
+cleanup:
+	if (fp != NULL)
+		fclose(fp);
+	else if (my_fd != -1)
+		close(my_fd);
+	(void)lseek(fd, 0, SEEK_SET);
+
+	return (ret);
+}
+
+static EVP_PKEY *
+load_public_key_buf(const unsigned char *cert, int certlen)
+{
+	EVP_PKEY *pkey;
+	BIO *bp;
+	char errbuf[1024];
+
+	bp = BIO_new_mem_buf(__DECONST(void *, cert), certlen);
+
+	if ((pkey = PEM_read_bio_PUBKEY(bp, NULL, NULL, NULL)) == NULL)
+		warnx("%s", ERR_error_string(ERR_get_error(), errbuf));
+
+	BIO_free(bp);
+
+	return (pkey);
+}
+
+static bool
+rsa_verify_cert(int fd, const unsigned char *key, int keylen,
+    unsigned char *sig, int siglen)
+{
+	EVP_MD_CTX *mdctx;
+	EVP_PKEY *pkey;
+	char sha256[(SHA256_DIGEST_LENGTH * 2) + 2];
+	char errbuf[1024];
+	bool ret;
+
+	pkey = NULL;
+	mdctx = NULL;
+	ret = false;
+
+	/* Compute SHA256 of the package. */
+	if (lseek(fd, 0, 0) == -1) {
+		warn("lseek");
+		goto cleanup;
+	}
+	if ((sha256_fd(fd, sha256)) == -1) {
+		warnx("Error creating SHA256 hash for package");
+		goto cleanup;
+	}
+
+	if ((pkey = load_public_key_buf(key, keylen)) == NULL) {
+		warnx("Error reading public key");
+		goto cleanup;
+	}
+
+	/* Verify signature of the SHA256(pkg) is valid. */
+	if ((mdctx = EVP_MD_CTX_create()) == NULL) {
+		warnx("%s", ERR_error_string(ERR_get_error(), errbuf));
+		goto error;
+	}
+
+	if (EVP_DigestVerifyInit(mdctx, NULL, EVP_sha256(), NULL, pkey) != 1) {
+		warnx("%s", ERR_error_string(ERR_get_error(), errbuf));
+		goto error;
+	}
+	if (EVP_DigestVerifyUpdate(mdctx, sha256, strlen(sha256)) != 1) {
+		warnx("%s", ERR_error_string(ERR_get_error(), errbuf));
+		goto error;
+	}
+
+	if (EVP_DigestVerifyFinal(mdctx, sig, siglen) != 1) {
+		warnx("%s", ERR_error_string(ERR_get_error(), errbuf));
+		goto error;
+	}
+
+	ret = true;
+	printf("done\n");
+	goto cleanup;
+
+error:
+	printf("failed\n");
+
+cleanup:
+	if (pkey)
+		EVP_PKEY_free(pkey);
+	if (mdctx)
+		EVP_MD_CTX_destroy(mdctx);
+	ERR_free_strings();
+
+	return (ret);
+}
+
+static struct sig_cert *
+parse_cert(int fd) {
+	int my_fd;
+	struct sig_cert *sc;
+	FILE *fp;
+	struct sbuf *buf, *sig, *cert;
+	char *line;
+	size_t linecap;
+	ssize_t linelen;
+
+	buf = NULL;
+	my_fd = -1;
+	sc = NULL;
+	line = NULL;
+	linecap = 0;
+
+	if (lseek(fd, 0, 0) == -1) {
+		warn("lseek");
+		return (NULL);
+	}
+
+	/* Duplicate the fd so that fclose(3) does not close it. */
+	if ((my_fd = dup(fd)) == -1) {
+		warnx("dup");
+		return (NULL);
+	}
+
+	if ((fp = fdopen(my_fd, "rb")) == NULL) {
+		warn("fdopen");
+		close(my_fd);
+		return (NULL);
+	}
+
+	sig = sbuf_new_auto();
+	cert = sbuf_new_auto();
+
+	while ((linelen = getline(&line, &linecap, fp)) > 0) {
+		if (strcmp(line, "SIGNATURE\n") == 0) {
+			buf = sig;
+			continue;
+		} else if (strcmp(line, "CERT\n") == 0) {
+			buf = cert;
+			continue;
+		} else if (strcmp(line, "END\n") == 0) {
+			break;
+		}
+		if (buf != NULL)
+			sbuf_bcat(buf, line, linelen);
+	}
+
+	fclose(fp);
+
+	/* Trim out unrelated trailing newline */
+	sbuf_setpos(sig, sbuf_len(sig) - 1);
+
+	sbuf_finish(sig);
+	sbuf_finish(cert);
+
+	sc = calloc(1, sizeof(struct sig_cert));
+	sc->siglen = sbuf_len(sig);
+	sc->sig = calloc(1, sc->siglen);
+	memcpy(sc->sig, sbuf_data(sig), sc->siglen);
+
+	sc->certlen = sbuf_len(cert);
+	sc->cert = strdup(sbuf_data(cert));
+
+	sbuf_delete(sig);
+	sbuf_delete(cert);
+
+	return (sc);
+}
+
+static bool
+verify_signature(int fd_pkg, int fd_sig)
+{
+	struct fingerprint_list *trusted, *revoked;
+	struct fingerprint *fingerprint;
+	struct sig_cert *sc;
+	bool ret;
+	int trusted_count, revoked_count;
+	const char *fingerprints;
+	char path[MAXPATHLEN];
+	char hash[SHA256_DIGEST_LENGTH * 2 + 1];
+
+	sc = NULL;
+	trusted = revoked = NULL;
+	ret = false;
+
+	/* Read and parse fingerprints. */
+	if (config_string(FINGERPRINTS, &fingerprints) != 0) {
+		warnx("No CONFIG_FINGERPRINTS defined");
+		goto cleanup;
+	}
+
+	snprintf(path, MAXPATHLEN, "%s/trusted", fingerprints);
+	if ((trusted = load_fingerprints(path, &trusted_count)) == NULL) {
+		warnx("Error loading trusted certificates");
+		goto cleanup;
+	}
+
+	if (trusted_count == 0 || trusted == NULL) {
+		fprintf(stderr, "No trusted certificates found.\n");
+		goto cleanup;
+	}
+
+	snprintf(path, MAXPATHLEN, "%s/revoked", fingerprints);
+	if ((revoked = load_fingerprints(path, &revoked_count)) == NULL) {
+		warnx("Error loading revoked certificates");
+		goto cleanup;
+	}
+
+	/* Read certificate and signature in. */
+	if ((sc = parse_cert(fd_sig)) == NULL) {
+		warnx("Error parsing certificate");
+		goto cleanup;
+	}
+	/* Explicitly mark as non-trusted until proven otherwise. */
+	sc->trusted = false;
+
+	/* Parse signature and pubkey out of the certificate */
+	sha256_buf(sc->cert, sc->certlen, hash);
+
+	/* Check if this hash is revoked */
+	if (revoked != NULL) {
+		STAILQ_FOREACH(fingerprint, revoked, next) {
+			if (strcasecmp(fingerprint->hash, hash) == 0) {
+				fprintf(stderr, "The package was signed with "
+				    "revoked certificate %s\n",
+				    fingerprint->name);
+				goto cleanup;
+			}
+		}
+	}
+
+	STAILQ_FOREACH(fingerprint, trusted, next) {
+		if (strcasecmp(fingerprint->hash, hash) == 0) {
+			sc->trusted = true;
+			sc->name = strdup(fingerprint->name);
+			break;
+		}
+	}
+
+	if (sc->trusted == false) {
+		fprintf(stderr, "No trusted fingerprint found matching "
+		    "package's certificate\n");
+		goto cleanup;
+	}
+
+	/* Verify the signature. */
+	printf("Verifying signature with trusted certificate %s... ", sc->name);
+	if (rsa_verify_cert(fd_pkg, sc->cert, sc->certlen, sc->sig,
+	    sc->siglen) == false) {
+		fprintf(stderr, "Signature is not valid\n");
+		goto cleanup;
+	}
+
+	ret = true;
+
+cleanup:
+	if (trusted)
+		free_fingerprint_list(trusted);
+	if (revoked)
+		free_fingerprint_list(revoked);
+	if (sc) {
+		free(sc->cert);
+		free(sc->sig);
+		free(sc->name);
+		free(sc);
+	}
+
+	return (ret);
+}
+
+static int
+bootstrap_pkg(bool force)
+{
+	int fd_pkg, fd_sig;
+	int ret;
+	char url[MAXPATHLEN];
+	char tmppkg[MAXPATHLEN];
+	char tmpsig[MAXPATHLEN];
+	const char *packagesite;
+	const char *signature_type;
+	char pkgstatic[MAXPATHLEN];
+
+	fd_sig = -1;
+	ret = -1;
+
+	if (config_string(PACKAGESITE, &packagesite) != 0) {
+		warnx("No PACKAGESITE defined");
+		return (-1);
+	}
+
+	if (config_string(SIGNATURE_TYPE, &signature_type) != 0) {
+		warnx("Error looking up SIGNATURE_TYPE");
+		return (-1);
+	}
+
+	printf("Bootstrapping pkg from %s, please wait...\n", packagesite);
+
+	/* Support pkg+http:// for PACKAGESITE which is the new format
+	   in 1.2 to avoid confusion on why http://pkg.FreeBSD.org has
+	   no A record. */
+	if (strncmp(URL_SCHEME_PREFIX, packagesite,
+	    strlen(URL_SCHEME_PREFIX)) == 0)
+		packagesite += strlen(URL_SCHEME_PREFIX);
+	snprintf(url, MAXPATHLEN, "%s/Latest/pkg.txz", packagesite);
+
+	snprintf(tmppkg, MAXPATHLEN, "%s/pkg.txz.XXXXXX",
+	    getenv("TMPDIR") ? getenv("TMPDIR") : _PATH_TMP);
+
+	if ((fd_pkg = fetch_to_fd(url, tmppkg)) == -1)
+		goto fetchfail;
+
+	if (signature_type != NULL &&
+	    strcasecmp(signature_type, "FINGERPRINTS") == 0) {
+		snprintf(tmpsig, MAXPATHLEN, "%s/pkg.txz.sig.XXXXXX",
+		    getenv("TMPDIR") ? getenv("TMPDIR") : _PATH_TMP);
+		snprintf(url, MAXPATHLEN, "%s/Latest/pkg.txz.sig",
+		    packagesite);
+
+		if ((fd_sig = fetch_to_fd(url, tmpsig)) == -1) {
+			fprintf(stderr, "Signature for pkg not available.\n");
+			goto fetchfail;
+		}
+
+		if (verify_signature(fd_pkg, fd_sig) == false)
+			goto cleanup;
+	}
+
+	if ((ret = extract_pkg_static(fd_pkg, pkgstatic, MAXPATHLEN)) == 0)
+		ret = install_pkg_static(pkgstatic, tmppkg, force);
+
 	goto cleanup;
 
 fetchfail:
 	warnx("Error fetching %s: %s", url, fetchLastErrString);
-	fprintf(stderr, "A pre-built version of pkg could not be found for your system.\n");
-	fprintf(stderr, "Consider changing PACKAGESITE or installing it from ports: 'ports-mgmt/pkg'.\n");
+	fprintf(stderr, "A pre-built version of pkg could not be found for "
+	    "your system.\n");
+	fprintf(stderr, "Consider changing PACKAGESITE or installing it from "
+	    "ports: 'ports-mgmt/pkg'.\n");
 
 cleanup:
-	if (remote != NULL)
-		fclose(remote);
-	close(fd);
+	if (fd_sig != -1) {
+		close(fd_sig);
+		unlink(tmpsig);
+	}
+	close(fd_pkg);
 	unlink(tmppkg);
 
 	return (ret);
@@ -291,16 +839,71 @@ pkg_query_yes_no(void)
 	return (ret);
 }
 
+static int
+bootstrap_pkg_local(const char *pkgpath, bool force)
+{
+	char path[MAXPATHLEN];
+	char pkgstatic[MAXPATHLEN];
+	const char *signature_type;
+	int fd_pkg, fd_sig, ret;
+
+	fd_sig = -1;
+	ret = -1;
+
+	fd_pkg = open(pkgpath, O_RDONLY);
+	if (fd_pkg == -1)
+		err(EXIT_FAILURE, "Unable to open %s", pkgpath);
+
+	if (config_string(SIGNATURE_TYPE, &signature_type) != 0) {
+		warnx("Error looking up SIGNATURE_TYPE");
+		return (-1);
+	}
+	if (signature_type != NULL &&
+	    strcasecmp(signature_type, "FINGERPRINTS") == 0) {
+		snprintf(path, sizeof(path), "%s.sig", pkgpath);
+
+		if ((fd_sig = open(path, O_RDONLY)) == -1) {
+			fprintf(stderr, "Signature for pkg not available.\n");
+			goto cleanup;
+		}
+
+		if (verify_signature(fd_pkg, fd_sig) == false)
+			goto cleanup;
+	}
+
+	if ((ret = extract_pkg_static(fd_pkg, pkgstatic, MAXPATHLEN)) == 0)
+		ret = install_pkg_static(pkgstatic, pkgpath, force);
+
+cleanup:
+	close(fd_pkg);
+	if (fd_sig != -1)
+		close(fd_sig);
+
+	return (ret);
+}
+
 int
-main(__unused int argc, char *argv[])
+main(int argc, char *argv[])
 {
 	char pkgpath[MAXPATHLEN];
-	bool yes = false;
+	const char *pkgarg;
+	bool bootstrap_only, force, yes;
+
+	bootstrap_only = false;
+	force = false;
+	pkgarg = NULL;
+	yes = false;
 
 	snprintf(pkgpath, MAXPATHLEN, "%s/sbin/pkg",
 	    getenv("LOCALBASE") ? getenv("LOCALBASE") : _LOCALBASE);
 
-	if (access(pkgpath, X_OK) == -1) {
+	if (argc > 1 && strcmp(argv[1], "bootstrap") == 0) {
+		bootstrap_only = true;
+		if (argc == 3 && strcmp(argv[2], "-f") == 0)
+			force = true;
+	}
+
+	if ((bootstrap_only && force) || access(pkgpath, X_OK) == -1) {
 		/* 
 		 * To allow 'pkg -N' to be used as a reliable test for whether
 		 * a system is configured to use pkg, don't bootstrap pkg
@@ -309,12 +912,31 @@ main(__unused int argc, char *argv[])
 		if (argv[1] != NULL && strcmp(argv[1], "-N") == 0)
 			errx(EXIT_FAILURE, "pkg is not installed");
 
+		config_init();
+
+		if (argc > 1 && strcmp(argv[1], "add") == 0) {
+			if (argc > 2 && strcmp(argv[2], "-f") == 0) {
+				force = true;
+				pkgarg = argv[3];
+			} else
+				pkgarg = argv[2];
+			if (pkgarg == NULL) {
+				fprintf(stderr, "Path to pkg.txz required\n");
+				exit(EXIT_FAILURE);
+			}
+			if (access(pkgarg, R_OK) == -1) {
+				fprintf(stderr, "No such file: %s\n", pkgarg);
+				exit(EXIT_FAILURE);
+			}
+			if (bootstrap_pkg_local(pkgarg, force) != 0)
+				exit(EXIT_FAILURE);
+			exit(EXIT_SUCCESS);
+		}
 		/*
 		 * Do not ask for confirmation if either of stdin or stdout is
 		 * not tty. Check the environment to see if user has answer
 		 * tucked in there already.
 		 */
-		config_init();
 		config_bool(ASSUME_ALWAYS_YES, &yes);
 		if (!yes) {
 			printf("%s", confirmation_message);
@@ -324,9 +946,15 @@ main(__unused int argc, char *argv[])
 			if (pkg_query_yes_no() == 0)
 				exit(EXIT_FAILURE);
 		}
-		if (bootstrap_pkg() != 0)
+		if (bootstrap_pkg(force) != 0)
 			exit(EXIT_FAILURE);
 		config_finish();
+
+		if (bootstrap_only)
+			exit(EXIT_SUCCESS);
+	} else if (bootstrap_only) {
+		printf("pkg already bootstrapped at %s\n", pkgpath);
+		exit(EXIT_SUCCESS);
 	}
 
 	execv(pkgpath, argv);
diff --git a/usr.sbin/pkg_install/Makefile b/usr.sbin/pkg_install/Makefile
deleted file mode 100644
index bf1a2135cc7..00000000000
--- a/usr.sbin/pkg_install/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-SUBDIR=	lib add create delete info updating version
-
-.include <bsd.subdir.mk>
-
-DATE!=	grep PKG_INSTALL_VERSION ${.CURDIR}/lib/lib.h | sed 's|.*[ 	]||'
-
-distfile: clean
-	@(cd ${.CURDIR}/..; \
-		cp -r pkg_install pkg_install-${DATE}; \
-		tar -czf pkg_install/pkg_install-${DATE}.tar.gz \
-			--exclude .#* --exclude *~ --exclude CVS \
-			--exclude .svn --exclude pkg_install-*.tar.gz \
-			pkg_install-${DATE}; \
-		rm -rf pkg_install-${DATE})
-		
-	
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
deleted file mode 100644
index 2fa20aa1c39..00000000000
--- a/usr.sbin/pkg_install/Makefile.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-LIBINSTALL=	${.OBJDIR}/../lib/libinstall.a
-
-DPADD+=		${LIBUTIL}
-LDADD+=		-lutil
-
-.if ${MK_OPENSSL} != "no" && \
-    defined(LDADD) && ${LDADD:M-lfetch} != ""
-DPADD+=		${LIBSSL} ${LIBCRYPTO}
-LDADD+=		-lssl -lcrypto
-.endif
-
-# Inherit BINDIR from one level up.
-.include "../Makefile.inc"
diff --git a/usr.sbin/pkg_install/README b/usr.sbin/pkg_install/README
deleted file mode 100644
index 874b58877a7..00000000000
--- a/usr.sbin/pkg_install/README
+++ /dev/null
@@ -1,10 +0,0 @@
-$FreeBSD$
-
-This is the pkg_install suite of tools for doing maintenance of
-software "packages".  More documentation is available in the man pages
-for each individual command.
-
-This code was written by Jordan Hubbard for FreeBSD, snatched and
-mildly reshaped by John Kohl in NetBSD and the changes taken back into
-FreeBSD again by Jordan, who then proceeded to add another couple
-of dozen features on top.  Whee! :-)
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile
deleted file mode 100644
index 89988e78b22..00000000000
--- a/usr.sbin/pkg_install/add/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PROG=	pkg_add
-SRCS=	main.c perform.c futil.c extract.c
-
-CFLAGS+= -I${.CURDIR}/../lib
-
-WARNS?=	3
-WFORMAT?=	1
-
-DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
-LDADD=	${LIBINSTALL} -lfetch -lmd
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/add/add.h b/usr.sbin/pkg_install/add/add.h
deleted file mode 100644
index e796120e981..00000000000
--- a/usr.sbin/pkg_install/add/add.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* $FreeBSD$ */
-
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Include and define various things wanted by the add command.
- *
- */
-
-#ifndef _INST_ADD_H_INCLUDE
-#define _INST_ADD_H_INCLUDE
-
-typedef enum { NORMAL, MASTER, SLAVE } add_mode_t;
-
-extern char	*Prefix;
-extern Boolean	PrefixRecursive;
-extern Boolean	NoInstall;
-extern Boolean	NoRecord;
-extern Boolean	FailOnAlreadyInstalled;
-extern Boolean	KeepPackage;
-extern Boolean	IgnoreDeps;
-extern char	*Mode;
-extern char	*Owner;
-extern char	*Group;
-extern char	*Directory;
-extern char	*PkgName;
-extern char	*PkgAddCmd;
-extern char	FirstPen[];
-extern add_mode_t AddMode;
-
-int		make_hierarchy(char *, Boolean);
-void		extract_plist(const char *, Package *);
-void		apply_perms(const char *, const char *);
-
-#endif	/* _INST_ADD_H_INCLUDE */
diff --git a/usr.sbin/pkg_install/add/extract.c b/usr.sbin/pkg_install/add/extract.c
deleted file mode 100644
index 9913126c066..00000000000
--- a/usr.sbin/pkg_install/add/extract.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * This is the package extraction code for the add module.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <ctype.h>
-#include <err.h>
-#include "lib.h"
-#include "add.h"
-
-
-#define STARTSTRING "/usr/bin/tar cf -"
-#define TOOBIG(str) \
-    (((int)strlen(str) + FILENAME_MAX + where_count > maxargs) ||\
-	((int)strlen(str) + FILENAME_MAX + perm_count > maxargs))
-
-#define PUSHOUT(todir) /* push out string */ \
-    if (where_count > (int)sizeof(STARTSTRING)-1) { \
-	strcat(where_args, "|/usr/bin/tar --unlink -xpPf - -C "); \
-	strcat(where_args, todir); \
-	if (system(where_args)) { \
-	    cleanup(0); \
-	    errx(2, "%s: can not invoke %ld byte tar pipeline: %s", \
-		 __func__, (long)strlen(where_args), where_args); \
-	} \
-	strcpy(where_args, STARTSTRING); \
-	where_count = sizeof(STARTSTRING)-1; \
-    } \
-    if (perm_count) { \
-	apply_perms(todir, perm_args); \
-	perm_args[0] = 0;\
-	perm_count = 0; \
-    }
-
-static void
-rollback(const char *name, const char *home, PackingList start, PackingList stop)
-{
-    PackingList q;
-    char try[FILENAME_MAX], bup[FILENAME_MAX];
-    const char *dir;
-    char *prefix = NULL;
-
-    dir = home;
-    for (q = start; q != stop; q = q->next) {
-	if (q->type == PLIST_FILE) {
-	    snprintf(try, FILENAME_MAX, "%s/%s", dir, q->name);
-	    if (make_preserve_name(bup, FILENAME_MAX, name, try) && fexists(bup)) {
-		(void)chflags(try, 0);
-		(void)unlink(try);
-		if (rename(bup, try))
-		    warnx("rollback: unable to rename %s back to %s", bup, try);
-	    }
-	}
-	else if (q->type == PLIST_CWD) {
-	    if (!prefix)
-		prefix = q->name;
-	    if (q->name == NULL)
-		q->name = prefix;
-	    else if (strcmp(q->name, "."))
-		dir = q->name;
-	    else
-		dir = home;
-	}
-    }
-}
-
-#define add_char(buf, len, pos, ch) do {\
-    if ((pos) < (len)) { \
-        buf[(pos)] = (ch); \
-        buf[(pos) + 1] = '\0'; \
-    } \
-    ++(pos); \
-} while (0)
-
-static int
-add_arg(char *buf, int len, const char *str)
-{
-    int i = 0;
-
-    add_char(buf, len, i, ' ');
-    for (; *str != '\0'; ++str) {
-	if (!isalnum(*str) && *str != '/' && *str != '.' && *str != '-')
-	    add_char(buf, len, i, '\\');
-	add_char(buf, len, i, *str);
-    }
-    return (i);
-}
-
-void
-extract_plist(const char *home, Package *pkg)
-{
-    PackingList p = pkg->head;
-    char *last_file, *prefix = NULL;
-    char *where_args, *perm_args, *last_chdir;
-    long maxargs;
-    int where_count = 0, perm_count = 0, add_count;
-    Boolean preserve;
-
-    maxargs = sysconf(_SC_ARG_MAX) / 2;	/* Just use half the argument space */
-    where_args = alloca(maxargs);
-    if (!where_args) {
-	cleanup(0);
-	errx(2, "%s: can't get argument list space", __func__);
-    }
-    perm_args = alloca(maxargs);
-    if (!perm_args) {
-	cleanup(0);
-	errx(2, "%s: can't get argument list space", __func__);
-    }
-
-    strcpy(where_args, STARTSTRING);
-    where_count = sizeof(STARTSTRING)-1;
-    perm_args[0] = 0;
-
-    last_chdir = 0;
-    preserve = find_plist_option(pkg, "preserve") ? TRUE : FALSE;
-
-    /* Reset the world */
-    Owner = NULL;
-    Group = NULL;
-    Mode = NULL;
-    last_file = NULL;
-    Directory = (char *)home;
-
-    /* Do it */
-    while (p) {
-	char cmd[FILENAME_MAX];
-
-	switch(p->type) {
-	case PLIST_NAME:
-	    PkgName = p->name;
-	    if (Verbose)
-		printf("extract: Package name is %s\n", p->name);
-	    break;
-
-	case PLIST_FILE:
-	    last_file = p->name;
-	    if (Verbose)
-		printf("extract: %s/%s\n", Directory, p->name);
-	    if (!Fake) {
-		char try[FILENAME_MAX];
-
-		/* first try to rename it into place */
-		snprintf(try, FILENAME_MAX, "%s/%s", Directory, p->name);
-		if (fexists(try)) {
-		    (void)chflags(try, 0);	/* XXX hack - if truly immutable, rename fails */
-		    if (preserve && PkgName) {
-			char pf[FILENAME_MAX];
-
-			if (make_preserve_name(pf, FILENAME_MAX, PkgName, try)) {
-			    if (rename(try, pf)) {
-				warnx(
-				"unable to back up %s to %s, aborting pkg_add",
-				try, pf);
-				rollback(PkgName, home, pkg->head, p);
-				return;
-			    }
-			}
-		    }
-		}
-		if (rename(p->name, try) == 0) {
-		    /* try to add to list of perms to be changed and run in bulk. */
-		    if (p->name[0] == '/' || TOOBIG(p->name)) {
-			PUSHOUT(Directory);
-		    }
-		    add_count = add_arg(&perm_args[perm_count], maxargs - perm_count, p->name);
-		    if (add_count < 0 || add_count >= maxargs - perm_count) {
-			cleanup(0);
-			errx(2, "%s: oops, miscounted strings!", __func__);
-		    }
-		    perm_count += add_count;
-		}
-		else {
-		    /* rename failed, try copying with a big tar command */
-		    if (last_chdir != Directory) {
-			if (last_chdir == NULL) {
-			    PUSHOUT(Directory);
-			} else {
-			    PUSHOUT(last_chdir);
-			}
-			last_chdir = Directory;
-		    }
-		    else if (p->name[0] == '/' || TOOBIG(p->name)) {
-			PUSHOUT(Directory);
-		    }
-		    add_count = add_arg(&where_args[where_count], maxargs - where_count, p->name);
-		    if (add_count < 0 || add_count >= maxargs - where_count) {
-			cleanup(0);
-			errx(2, "%s: oops, miscounted strings!", __func__);
-		    }
-		    where_count += add_count;
-		    add_count = add_arg(&perm_args[perm_count], maxargs - perm_count, p->name);
-		    if (add_count < 0 || add_count >= maxargs - perm_count) {
-			cleanup(0);
-			errx(2, "%s: oops, miscounted strings!", __func__);
-		    }
-		    perm_count += add_count;
-		}
-	    }
-	    break;
-
-	case PLIST_CWD:
-	    if (!prefix)
-		prefix = p->name;
-	    if (p->name == NULL)
-		p->name = strdup(prefix);
-	    if (Verbose)
-		printf("extract: CWD to %s\n", p->name);
-	    PUSHOUT(Directory);
-	    if (strcmp(p->name, ".")) {
-		if (!Fake && make_hierarchy(p->name, TRUE) == FAIL) {
-		    cleanup(0);
-		    errx(2, "%s: unable to cwd to '%s'", __func__, p->name);
-		}
-		Directory = p->name;
-	    }
-	    else
-		Directory = (char *)home;
-	    break;
-
-	case PLIST_CMD:
-	    if ((strstr(p->name, "%B") || strstr(p->name, "%F") ||
-		 strstr(p->name, "%f")) && last_file == NULL) {
-		cleanup(0);
-		errx(2, "%s: no last file specified for '%s' command",
-		    __func__, p->name);
-	    }
-	    if (strstr(p->name, "%D") && Directory == NULL) {
-		cleanup(0);
-		errx(2, "%s: no directory specified for '%s' command",
-		    __func__, p->name);
-	    }
-	    format_cmd(cmd, FILENAME_MAX, p->name, Directory, last_file);
-	    PUSHOUT(Directory);
-	    if (Verbose)
-		printf("extract: execute '%s'\n", cmd);
-	    if (!Fake && system(cmd))
-		warnx("command '%s' failed", cmd);
-	    break;
-
-	case PLIST_CHMOD:
-	    PUSHOUT(Directory);
-	    Mode = p->name;
-	    break;
-
-	case PLIST_CHOWN:
-	    PUSHOUT(Directory);
-	    Owner = p->name;
-	    break;
-
-	case PLIST_CHGRP:
-	    PUSHOUT(Directory);
-	    Group = p->name;
-	    break;
-
-	case PLIST_COMMENT: /* FALLTHROUGH */
-	case PLIST_NOINST:
-	    break;
-
-	case PLIST_IGNORE:
-	    p = p->next;
-	    break;
-
-	default:
-	    break;
-	}
-	p = p->next;
-    }
-    PUSHOUT(Directory);
-}
diff --git a/usr.sbin/pkg_install/add/futil.c b/usr.sbin/pkg_install/add/futil.c
deleted file mode 100644
index 82217f51543..00000000000
--- a/usr.sbin/pkg_install/add/futil.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Miscellaneous file access utilities.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <err.h>
-#include "lib.h"
-#include "add.h"
-
-/*
- * Assuming dir is a desired directory name, make it and all intervening
- * directories necessary.
- */
-
-int
-make_hierarchy(char *dir, Boolean set_perm)
-{
-    char *cp1, *cp2;
-
-    if (dir[0] == '/')
-	cp1 = cp2 = dir + 1;
-    else
-	cp1 = cp2 = dir;
-    while (cp2) {
-	if ((cp2 = strchr(cp1, '/')) !=NULL )
-	    *cp2 = '\0';
-	if (fexists(dir)) {
-	    if (!isdir(dir)) {
-		if (cp2)
-		    *cp2 = '/';
-		return FAIL;
-	    }
-	}
-	else {
-	    if (mkdir(dir, 0777) < 0) {
-		if (cp2)
-		    *cp2 = '/';
-		return FAIL;
-	    }
-	    if (set_perm)
-		apply_perms(NULL, dir);
-	}
-	/* Put it back */
-	if (cp2) {
-	    *cp2 = '/';
-	    cp1 = cp2 + 1;
-	}
-    }
-    return SUCCESS;
-}
-
-/* Using permission defaults, apply them as necessary */
-void
-apply_perms(const char *dir, const char *arg)
-{
-    const char *cd_to;
-
-    if (!dir || *arg == '/')	/* absolute path? */
-	cd_to = "/";
-    else
-	cd_to = dir;
-
-    if (Mode)
-	if (vsystem("cd %s && /bin/chmod -R %s %s", cd_to, Mode, arg))
-	    warnx("couldn't change modes of '%s' to '%s'", arg, Mode);
-    if (Owner && Group) {
-	if (vsystem("cd %s && /usr/sbin/chown -R %s:%s %s", cd_to, Owner, Group, arg))
-	    warnx("couldn't change owner/group of '%s' to '%s:%s'",
-		   arg, Owner, Group);
-	return;
-    }
-    if (Owner) {
-	if (vsystem("cd %s && /usr/sbin/chown -R %s %s", cd_to, Owner, arg))
-	    warnx("couldn't change owner of '%s' to '%s'", arg, Owner);
-	return;
-    } else if (Group)
-	if (vsystem("cd %s && /usr/bin/chgrp -R %s %s", cd_to, Group, arg))
-	    warnx("couldn't change group of '%s' to '%s'", arg, Group);
-}
-
diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
deleted file mode 100644
index 548f92e6bff..00000000000
--- a/usr.sbin/pkg_install/add/main.c
+++ /dev/null
@@ -1,376 +0,0 @@
-/*
- *
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * This is the add module.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <err.h>
-#include <getopt.h>
-
-#include "lib.h"
-#include "add.h"
-
-char	*Prefix		= NULL;
-Boolean	PrefixRecursive	= FALSE;
-char	*Chroot		= NULL;
-Boolean	NoInstall	= FALSE;
-Boolean	NoRecord	= FALSE;
-Boolean Remote		= FALSE;
-Boolean KeepPackage	= FALSE;
-Boolean FailOnAlreadyInstalled	= TRUE;
-Boolean IgnoreDeps	= FALSE;
-
-char	*Mode		= NULL;
-char	*Owner		= NULL;
-char	*Group		= NULL;
-char	*PkgName	= NULL;
-char	*PkgAddCmd	= NULL;
-char	*Directory	= NULL;
-char	FirstPen[FILENAME_MAX];
-add_mode_t AddMode	= NORMAL;
-
-char	**pkgs;
-
-struct {
-	int lowver;	/* Lowest version number to match */
-	int hiver;	/* Highest version number to match */
-	const char *directory;	/* Directory it lives in */
-} releases[] = {
-	{ 410000, 410000, "/packages-4.1-release" },
-	{ 420000, 420000, "/packages-4.2-release" },
-	{ 430000, 430000, "/packages-4.3-release" },
-	{ 440000, 440000, "/packages-4.4-release" },
-	{ 450000, 450000, "/packages-4.5-release" },
-	{ 460000, 460001, "/packages-4.6-release" },
-	{ 460002, 460099, "/packages-4.6.2-release" },
-	{ 470000, 470099, "/packages-4.7-release" },
-	{ 480000, 480099, "/packages-4.8-release" },
-	{ 490000, 490099, "/packages-4.9-release" },
-	{ 491000, 491099, "/packages-4.10-release" },
-	{ 492000, 492099, "/packages-4.11-release" },
-	{ 500000, 500099, "/packages-5.0-release" },
-	{ 501000, 501099, "/packages-5.1-release" },
-	{ 502000, 502009, "/packages-5.2-release" },
-	{ 502010, 502099, "/packages-5.2.1-release" },
-	{ 503000, 503099, "/packages-5.3-release" },
-	{ 504000, 504099, "/packages-5.4-release" },
-	{ 505000, 505099, "/packages-5.5-release" },
-	{ 600000, 600099, "/packages-6.0-release" },
-	{ 601000, 601099, "/packages-6.1-release" },
-	{ 602000, 602099, "/packages-6.2-release" },
-	{ 603000, 603099, "/packages-6.3-release" },
-	{ 604000, 604099, "/packages-6.4-release" },
-	{ 700000, 700099, "/packages-7.0-release" },
-	{ 701000, 701099, "/packages-7.1-release" },
-	{ 702000, 702099, "/packages-7.2-release" },
-	{ 703000, 703099, "/packages-7.3-release" },
-	{ 704000, 704099, "/packages-7.4-release" },
-	{ 800000, 800499, "/packages-8.0-release" },
-	{ 801000, 801499, "/packages-8.1-release" },
-	{ 802000, 802499, "/packages-8.2-release" },
-	{ 803000, 803499, "/packages-8.3-release" },
-	{ 900000, 900499, "/packages-9.0-release" },
-	{ 901000, 901499, "/packages-9.1-release" },
-	{ 902000, 902499, "/packages-9.2-release" },
-	{ 300000, 399000, "/packages-3-stable" },
-	{ 400000, 499000, "/packages-4-stable" },
-	{ 502100, 502128, "/packages-5-current" },
-	{ 503100, 599000, "/packages-5-stable" },
-	{ 600100, 699000, "/packages-6-stable" },
-	{ 700100, 799000, "/packages-7-stable" },
-	{ 800500, 899000, "/packages-8-stable" },
-	{ 900500, 999000, "/packages-9-stable" },
-	{ 1000000, 1099000, "/packages-10-current" },
-	{ 0, 9999999, "/packages-current" },
-	{ 0, 0, NULL }
-};
-
-static char *getpackagesite(void);
-int getosreldate(void);
-
-static void usage(void);
-
-static char opts[] = "hviIRfFnrp:P:SMt:C:K";
-static struct option longopts[] = {
-	{ "chroot",	required_argument,	NULL,		'C' },
-	{ "dry-run",	no_argument,		NULL,		'n' },
-	{ "force",	no_argument,		NULL,		'f' },
-	{ "help",	no_argument,		NULL,		'h' },
-	{ "keep",	no_argument,		NULL,		'K' },
-	{ "master",	no_argument,		NULL,		'M' },
-	{ "no-deps",	no_argument,		NULL,		'i' },
-	{ "no-record",	no_argument,		NULL,		'R' },
-	{ "no-script",	no_argument,		NULL,		'I' },
-	{ "prefix",	required_argument,	NULL,		'p' },
-	{ "remote",	no_argument,		NULL,		'r' },
-	{ "template",	required_argument,	NULL,		't' },
-	{ "slave",	no_argument,		NULL,		'S' },
-	{ "verbose",	no_argument,		NULL,		'v' },
-	{ NULL,		0,			NULL,		0 }
-};
-
-int
-main(int argc, char **argv)
-{
-    int ch, error;
-    char **start;
-    char *cp, *packagesite = NULL, *remotepkg = NULL, *ptr;
-    static char temppackageroot[MAXPATHLEN];
-    static char pkgaddpath[MAXPATHLEN];
-
-    if (*argv[0] != '/' && strchr(argv[0], '/') != NULL)
-	PkgAddCmd = realpath(argv[0], pkgaddpath);
-    else
-	PkgAddCmd = argv[0];
-
-    start = argv;
-    while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) {
-	switch(ch) {
-	case 'v':
-	    Verbose++;
-	    break;
-
-	case 'p':
-	    Prefix = optarg;
-	    PrefixRecursive = FALSE;
-	    break;
-
-	case 'P':
-	    Prefix = optarg;
-	    PrefixRecursive = TRUE;
-	    break;
-
-	case 'I':
-	    NoInstall = TRUE;
-	    break;
-
-	case 'R':
-	    NoRecord = TRUE;
-	    break;
-
-	case 'f':
-	    Force = TRUE;
-	    break;
-
-	case 'F':
-	    FailOnAlreadyInstalled = FALSE;
-	    break;
-
-	case 'K':
-	    KeepPackage = TRUE;
-	    break;
-
-	case 'n':
-	    Fake = TRUE;
-	    break;
-
-	case 'r':
-	    Remote = TRUE;
-	    break;
-
-	case 't':
-	    if (strlcpy(FirstPen, optarg, sizeof(FirstPen)) >= sizeof(FirstPen))
-		errx(1, "-t Argument too long.");
-	    break;
-
-	case 'S':
-	    AddMode = SLAVE;
-	    break;
-
-	case 'M':
-	    AddMode = MASTER;
-	    break;
-
-	case 'C':
-	    Chroot = optarg;
-	    break;
-
-	case 'i':
-	    IgnoreDeps = TRUE;
-	    break;
-
-	case 'h':
-	default:
-	    usage();
-	    break;
-	}
-    }
-    argc -= optind;
-    argv += optind;
-
-    if (AddMode != SLAVE) {
-	pkgs = (char **)malloc((argc+1) * sizeof(char *));
-	for (ch = 0; ch <= argc; pkgs[ch++] = NULL) ;
-
-	/* Get all the remaining package names, if any */
-	for (ch = 0; *argv; ch++, argv++) {
-	    char temp[MAXPATHLEN];
-    	    if (Remote) {
-		if ((packagesite = getpackagesite()) == NULL)
-		    errx(1, "package name too long");
-		if (strlcpy(temppackageroot, packagesite,
-		    sizeof(temppackageroot)) >= sizeof(temppackageroot))
-		    errx(1, "package name too long");
-		if (strlcat(temppackageroot, *argv, sizeof(temppackageroot))
-		    >= sizeof(temppackageroot))
-		    errx(1, "package name too long");
-		remotepkg = temppackageroot;
-		if (!((ptr = strrchr(remotepkg, '.')) && ptr[1] == 't' &&
-			(ptr[2] == 'b' || ptr[2] == 'g' || ptr[2] == 'x') &&
-			ptr[3] == 'z' && !ptr[4])) {
-    		    if (getenv("PACKAGESUFFIX")) {
-		       if (strlcat(remotepkg, getenv("PACKAGESUFFIX"),
-			   sizeof(temppackageroot)) >= sizeof(temppackageroot))
-			   errx(1, "package name too long");
-		    } else {
-		       if (strlcat(remotepkg, ".tbz",
-			   sizeof(temppackageroot)) >= sizeof(temppackageroot))
-			   errx(1, "package name too long");
-		    }
-		}
-    	    }
-	    if (!strcmp(*argv, "-"))	/* stdin? */
-		pkgs[ch] = (char *)"-";
-	    else if (isURL(*argv)) {  	/* preserve URLs */
-		if (strlcpy(temp, *argv, sizeof(temp)) >= sizeof(temp))
-		    errx(1, "package name too long");
-		pkgs[ch] = strdup(temp);
-	    }
-	    else if ((Remote) && isURL(remotepkg)) {
-	    	if (strlcpy(temp, remotepkg, sizeof(temp)) >= sizeof(temp))
-		    errx(1, "package name too long");
-		pkgs[ch] = strdup(temp);
-	    } else {			/* expand all pathnames to fullnames */
-		if (fexists(*argv)) /* refers to a file directly */
-		    pkgs[ch] = strdup(realpath(*argv, temp));
-		else {		/* look for the file in the expected places */
-		    if (!(cp = fileFindByPath(NULL, *argv))) {
-			/* let pkg_do() fail later, so that error is reported */
-			if (strlcpy(temp, *argv, sizeof(temp)) >= sizeof(temp))
-			    errx(1, "package name too long");
-			pkgs[ch] = strdup(temp);
-		    } else {
-			if (strlcpy(temp, cp, sizeof(temp)) >= sizeof(temp))
-			    errx(1, "package name too long");
-			pkgs[ch] = strdup(temp);
-		    }
-		}
-	    }
-	    if (packagesite != NULL)
-		packagesite[0] = '\0';
-	}
-    }
-    /* If no packages, yelp */
-    if (!ch) {
-	warnx("missing package name(s)");
-	usage();
-    }
-    else if (ch > 1 && AddMode == MASTER) {
-	warnx("only one package name may be specified with master mode");
-	usage();
-    }
-    /* Perform chroot if requested */
-    if (Chroot != NULL) {
-	if (chdir(Chroot))
-	    errx(1, "chdir to %s failed", Chroot);
-	if (chroot("."))
-	    errx(1, "chroot to %s failed", Chroot);
-    }
-    warnpkgng();
-    /* Make sure the sub-execs we invoke get found */
-    setenv("PATH", 
-	   "/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin",
-	   1);
-
-    /* Set a reasonable umask */
-    umask(022);
-
-    if ((error = pkg_perform(pkgs)) != 0) {
-	if (Verbose)
-	    warnx("%d package addition(s) failed", error);
-	return error;
-    }
-    else
-	return 0;
-}
-
-static char *
-getpackagesite(void)
-{
-    int reldate, i;
-    static char sitepath[MAXPATHLEN];
-    int archmib[] = { CTL_HW, HW_MACHINE_ARCH };
-    char arch[64];
-    size_t archlen = sizeof(arch);
-
-    if (getenv("PACKAGESITE")) {
-	if (strlcpy(sitepath, getenv("PACKAGESITE"), sizeof(sitepath))
-	    >= sizeof(sitepath))
-	    return NULL;
-	return sitepath;
-    }
-
-    if (getenv("PACKAGEROOT")) {
-	if (strlcpy(sitepath, getenv("PACKAGEROOT"), sizeof(sitepath))
-	    >= sizeof(sitepath))
-	    return NULL;
-    } else {
-	if (strlcat(sitepath, "ftp://ftp.freebsd.org", sizeof(sitepath))
-	    >= sizeof(sitepath))
-	    return NULL;
-    }
-
-    if (strlcat(sitepath, "/pub/FreeBSD/ports/", sizeof(sitepath))
-	>= sizeof(sitepath))
-	return NULL;
-
-    if (sysctl(archmib, 2, arch, &archlen, NULL, 0) == -1)
-	return NULL;
-    arch[archlen-1] = 0;
-    if (strlcat(sitepath, arch, sizeof(sitepath)) >= sizeof(sitepath))
-	return NULL;
-
-    reldate = getosreldate();
-    for(i = 0; releases[i].directory != NULL; i++) {
-	if (reldate >= releases[i].lowver && reldate <= releases[i].hiver) {
-	    if (strlcat(sitepath, releases[i].directory, sizeof(sitepath))
-		>= sizeof(sitepath))
-		return NULL;
-	    break;
-	}
-    }
-
-    if (strlcat(sitepath, "/Latest/", sizeof(sitepath)) >= sizeof(sitepath))
-	return NULL;
-
-    return sitepath;
-
-}
-
-static void
-usage(void)
-{
-    fprintf(stderr, "%s\n%s\n",
-	"usage: pkg_add [-viInfFrRMSK] [-t template] [-p prefix] [-P prefix] [-C chrootdir]",
-	"               pkg-name [pkg-name ...]");
-    exit(1);
-}
diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c
deleted file mode 100644
index 638e0462775..00000000000
--- a/usr.sbin/pkg_install/add/perform.c
+++ /dev/null
@@ -1,709 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * This is the main body of the add module.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <err.h>
-#include <paths.h>
-#include "lib.h"
-#include "add.h"
-
-#include <libgen.h>
-#include <signal.h>
-#include <sys/wait.h>
-
-static int pkg_do(char *);
-static int sanity_check(char *);
-static char LogDir[FILENAME_MAX];
-static int zapLogDir;		/* Should we delete LogDir? */
-
-int
-pkg_perform(char **pkgs)
-{
-    int i, err_cnt = 0;
-
-    signal(SIGINT, cleanup);
-    signal(SIGHUP, cleanup);
-
-    if (AddMode == SLAVE)
-	err_cnt = pkg_do(NULL);
-    else {
-	for (i = 0; pkgs[i]; i++)
-	    err_cnt += pkg_do(pkgs[i]);
-    }
-    return err_cnt;
-}
-
-/*
- * This is seriously ugly code following.  Written very fast!
- * [And subsequently made even worse..  Sigh!  This code was just born
- * to be hacked, I guess.. :) -jkh]
- */
-static int
-pkg_do(char *pkg)
-{
-    Package Plist;
-    char pkg_fullname[FILENAME_MAX];
-    char playpen[FILENAME_MAX];
-    char extract_contents[FILENAME_MAX];
-    char *extract;
-    const char *where_to;
-    FILE *cfile;
-    int code;
-    PackingList p;
-    struct stat sb;
-    int inPlace, conflictsfound, errcode;
-    /* support for separate pre/post install scripts */
-    int new_m = 0;
-    char pre_script[FILENAME_MAX] = INSTALL_FNAME;
-    char post_script[FILENAME_MAX];
-    char pre_arg[FILENAME_MAX], post_arg[FILENAME_MAX];
-    char *conflict[2];
-    char **matched;
-    int fd;
-
-    conflictsfound = 0;
-    code = 0;
-    zapLogDir = 0;
-    LogDir[0] = '\0';
-    strcpy(playpen, FirstPen);
-    inPlace = 0;
-
-    memset(&Plist, '\0', sizeof(Plist));
-
-    /* Are we coming in for a second pass, everything already extracted? */
-    if (!pkg) {
-	fgets(playpen, FILENAME_MAX, stdin);
-	playpen[strlen(playpen) - 1] = '\0'; /* pesky newline! */
-	if (chdir(playpen) == FAIL) {
-	    warnx("pkg_add in SLAVE mode can't chdir to %s", playpen);
-	    return 1;
-	}
-	read_plist(&Plist, stdin);
-	where_to = playpen;
-    }
-    /* Nope - do it now */
-    else {
-	/* Is it an ftp://foo.bar.baz/file.t[bg]z specification? */
-	if (isURL(pkg)) {
-	    if (!(where_to = fileGetURL(NULL, pkg, KeepPackage))) {
-		warnx("unable to fetch '%s' by URL", pkg);
-		return 1;
-	    }
-	    strcpy(pkg_fullname, pkg);
-	    cfile = fopen(CONTENTS_FNAME, "r");
-	    if (!cfile) {
-		warnx(
-		"unable to open table of contents file '%s' - not a package?",
-		CONTENTS_FNAME);
-		goto bomb;
-	    }
-	    read_plist(&Plist, cfile);
-	    fclose(cfile);
-	}
-	else {
-	    strcpy(pkg_fullname, pkg);		/*
-						 * Copy for sanity's sake,
-						 * could remove pkg_fullname
-						 */
-	    if (strcmp(pkg, "-")) {
-		if (stat(pkg_fullname, &sb) == FAIL) {
-		    warnx("can't stat package file '%s'", pkg_fullname);
-		    goto bomb;
-		}
-		sprintf(extract_contents, "--fast-read %s", CONTENTS_FNAME);
-		extract = extract_contents;
-	    }
-	    else {
-		extract = NULL;
-		sb.st_size = 100000;	/* Make up a plausible average size */
-	    }
-	    if (!(where_to = make_playpen(playpen, sb.st_size * 4)))
-		errx(1, "unable to make playpen for %lld bytes", (long long)sb.st_size * 4);
-	    /* Since we can call ourselves recursively, keep notes on where we came from */
-	    if (!getenv("_TOP"))
-		setenv("_TOP", where_to, 1);
-	    if (unpack(pkg_fullname, extract)) {
-		warnx(
-	"unable to extract table of contents file from '%s' - not a package?",
-		pkg_fullname);
-		goto bomb;
-	    }
-	    cfile = fopen(CONTENTS_FNAME, "r");
-	    if (!cfile) {
-		warnx(
-	"unable to open table of contents file '%s' - not a package?",
-		CONTENTS_FNAME);
-		goto bomb;
-	    }
-	    read_plist(&Plist, cfile);
-	    fclose(cfile);
-
-	    /* Extract directly rather than moving?  Oh goodie! */
-	    if (find_plist_option(&Plist, "extract-in-place")) {
-		if (Verbose)
-		    printf("Doing in-place extraction for %s\n", pkg_fullname);
-		p = find_plist(&Plist, PLIST_CWD);
-		if (p) {
-		    if (!isdir(p->name) && !Fake) {
-			if (Verbose)
-			    printf("Desired prefix of %s does not exist, creating..\n", p->name);
-			vsystem("/bin/mkdir -p %s", p->name);
-			if (chdir(p->name) == -1) {
-			    warn("unable to change directory to '%s'", p->name);
-			    goto bomb;
-			}
-		    }
-		    where_to = p->name;
-		    inPlace = 1;
-		}
-		else {
-		    warnx(
-		"no prefix specified in '%s' - this is a bad package!",
-			pkg_fullname);
-		    goto bomb;
-		}
-	    }
-
-	    /*
-	     * Apply a crude heuristic to see how much space the package will
-	     * take up once it's unpacked.  I've noticed that most packages
-	     * compress an average of 75%, so multiply by 4 for good measure.
-	     */
-
-	    if (!extract && !inPlace && min_free(playpen) < sb.st_size * 4) {
-		warnx("projected size of %lld exceeds available free space.\n"
-"Please set your PKG_TMPDIR variable to point to a location with more\n"
-		       "free space and try again", (long long)sb.st_size * 4);
-		warnx("not extracting %s\ninto %s, sorry!",
-			pkg_fullname, where_to);
-		goto bomb;
-	    }
-
-	    /* If this is a direct extract and we didn't want it, stop now */
-	    if (inPlace && Fake)
-		goto success;
-
-	    /* Finally unpack the whole mess.  If extract is null we
-	       already + did so so don't bother doing it again. */
-	    if (extract && unpack(pkg_fullname, NULL)) {
-		warnx("unable to extract '%s'!", pkg_fullname);
-		goto bomb;
-	    }
-	}
-
-	/* Check for sanity and dependencies */
-	if (sanity_check(pkg))
-	    goto bomb;
-
-	/* If we're running in MASTER mode, just output the plist and return */
-	if (AddMode == MASTER) {
-	    printf("%s\n", where_playpen());
-	    write_plist(&Plist, stdout);
-	    return 0;
-	}
-    }
-
-    /*
-     * If we have a prefix, delete the first one we see and add this
-     * one in place of it.
-     */
-    if (Prefix) {
-	delete_plist(&Plist, FALSE, PLIST_CWD, NULL);
-	add_plist_top(&Plist, PLIST_CWD, Prefix);
-    }
-
-    setenv(PKG_PREFIX_VNAME, (p = find_plist(&Plist, PLIST_CWD)) ? p->name : ".", 1);
-    /* Protect against old packages with bogus @name and origin fields */
-    if (Plist.name == NULL)
-	Plist.name = "anonymous";
-    if (Plist.origin == NULL)
-	Plist.origin = "anonymous/anonymous";
-
-    /*
-     * See if we're already registered either with the same name (the same
-     * version) or some other version with the same origin.
-     */
-    if ((isinstalledpkg(Plist.name) > 0 ||
-         matchbyorigin(Plist.origin, NULL) != NULL) && !Force) {
-	warnx("package '%s' or its older version already installed%s",
-	      Plist.name, FailOnAlreadyInstalled ? "" : " (ignored)");
-	code = FailOnAlreadyInstalled != FALSE;
-	goto success;	/* close enough for government work */
-    }
-
-    /* Now check the packing list for conflicts */
-    if (!IgnoreDeps){
-    for (p = Plist.head; p != NULL; p = p->next) {
-	if (p->type == PLIST_CONFLICTS) {
-	    int i;
-	    conflict[0] = strdup(p->name);
-	    conflict[1] = NULL;
-	    matched = matchinstalled(MATCH_GLOB, conflict, &errcode);
-	    free(conflict[0]);
-	    if (errcode == 0 && matched != NULL)
-		for (i = 0; matched[i] != NULL; i++)
-		    if (isinstalledpkg(matched[i]) > 0) {
-			warnx("package '%s' conflicts with %s", Plist.name,
-				matched[i]);
-			conflictsfound = 1;
-		    }
-
-	    continue;
-	}
-    }
-    if(conflictsfound) {
-	if(!Force) {
-	    warnx("please use pkg_delete first to remove conflicting package(s) or -f to force installation");
-	    code = 1;
-	    goto bomb;
-	} else
-	    warnx("-f specified; proceeding anyway");
-    }
-
-#if ENSURE_THAT_ALL_REQUIREMENTS_ARE_MET
-    /*
-     * Before attempting to do the slave mode bit, ensure that we've
-     * downloaded & processed everything we need.
-     * It's possible that we haven't already installed all of our
-     * dependencies if the dependency list was misgenerated due to
-     * other dynamic dependencies or if a dependency was added to a
-     * package without all REQUIRED_BY packages being regenerated.
-     */
-    for (p = pkg ? Plist.head : NULL; p; p = p->next) {
-	const char *ext;
-	char *deporigin;
-
-	if (p->type != PLIST_PKGDEP)
-	    continue;
-	deporigin = (p->next->type == PLIST_DEPORIGIN) ? p->next->name : NULL;
-
-	if (isinstalledpkg(p->name) <= 0 &&
-	    !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) {
-	    char subpkg[FILENAME_MAX], *sep;
-
-	    strlcpy(subpkg, pkg, sizeof subpkg);
-	    if ((sep = strrchr(subpkg, '/')) != NULL) {
-		*sep = '\0';
-		if ((sep = strrchr(subpkg, '/')) != NULL) {
-		    *sep = '\0';
-		    strlcat(subpkg, "/All/", sizeof subpkg);
-		    strlcat(subpkg, p->name, sizeof subpkg);
-		    if ((ext = strrchr(pkg, '.')) == NULL) {
-			if (getenv("PACKAGESUFFIX"))
-			  ext = getenv("PACKAGESUFFIX");
-			else
-			  ext = ".tbz";
-		    }
-		    strlcat(subpkg, ext, sizeof subpkg);
-		    pkg_do(subpkg);
-		}
-	    }
-	}
-    }
-#endif
-
-    /* Now check the packing list for dependencies */
-    for (p = Plist.head; p ; p = p->next) {
-	char *deporigin;
-
-	if (p->type != PLIST_PKGDEP)
-	    continue;
-	deporigin = (p->next->type == PLIST_DEPORIGIN) ? p->next->name : NULL;
-	if (Verbose) {
-	    printf("Package '%s' depends on '%s'", Plist.name, p->name);
-	    if (deporigin != NULL)
-		printf(" with '%s' origin", deporigin);
-	    printf(".\n");
-	}
-	if (isinstalledpkg(p->name) <= 0 &&
-	    !(deporigin != NULL && matchbyorigin(deporigin, NULL) != NULL)) {
-	    char path[FILENAME_MAX];
-	    const char *cp = NULL;
-
-	    if (!Fake) {
-		char prefixArg[2 + MAXPATHLEN]; /* "-P" + Prefix */
-		if (PrefixRecursive) {
-		    strlcpy(prefixArg, "-P", sizeof(prefixArg));
-		    strlcat(prefixArg, Prefix, sizeof(prefixArg));
-		}
-		if (!isURL(pkg) && !getenv("PKG_ADD_BASE")) {
-		    const char *ext;
-
-		    ext = strrchr(pkg_fullname, '.');
-		    if (ext == NULL) {
-			if (getenv("PACKAGESUFFIX")) {
-			  ext = getenv("PACKAGESUFFIX");
-			} else {
-			  ext = ".tbz";
-			}
-		    }
-		    snprintf(path, FILENAME_MAX, "%s/%s%s", getenv("_TOP"), p->name, ext);
-		    if (fexists(path))
-			cp = path;
-		    else
-			cp = fileFindByPath(pkg, p->name);
-		    if (cp) {
-			if (Verbose)
-			    printf("Loading it from %s.\n", cp);
-			if (vsystem("%s %s %s '%s'", PkgAddCmd, Verbose ? "-v " : "", PrefixRecursive ? prefixArg : "", cp)) {
-			    warnx("autoload of dependency '%s' failed%s",
-				cp, Force ? " (proceeding anyway)" : "!");
-			    if (!Force)
-				++code;
-			}
-		    }
-		    else {
-			warnx("could not find package %s %s",
-			      p->name, Force ? " (proceeding anyway)" : "!");
-			if (!Force)
-			    ++code;
-		    }
-		}
-		else if ((cp = fileGetURL(pkg, p->name, KeepPackage)) != NULL) {
-		    if (Verbose)
-			printf("Finished loading %s via a URL\n", p->name);
-		    if (!fexists("+CONTENTS")) {
-			warnx("autoloaded package %s has no +CONTENTS file?",
-				p->name);
-			if (!Force)
-			    ++code;
-		    }
-		    else if (vsystem("(pwd; /bin/cat +CONTENTS) | %s %s %s %s -S", PkgAddCmd, Verbose ? "-v" : "", PrefixRecursive ? prefixArg : "", KeepPackage ? "-K" : "")) {
-			warnx("pkg_add of dependency '%s' failed%s",
-				p->name, Force ? " (proceeding anyway)" : "!");
-			if (!Force)
-			    ++code;
-		    }
-		    else if (Verbose)
-			printf("\t'%s' loaded successfully.\n", p->name);
-		    /* Nuke the temporary playpen */
-		    leave_playpen();
-		}
-	    }
-	    else {
-		if (Verbose)
-		    printf("and was not found%s.\n", Force ? " (proceeding anyway)" : "");
-		else
-		    printf("Package dependency %s for %s not found%s\n", p->name, pkg,
-			   Force ? " (proceeding anyway)" : "!");
-		if (!Force)
-		    ++code;
-	    }
-	}
-	else if (Verbose)
-	    printf(" - already installed.\n");
-    }
-    } /* if (!IgnoreDeps) */
-
-    if (code != 0)
-	goto bomb;
-
-    /* Look for the requirements file */
-    if ((fd = open(REQUIRE_FNAME, O_RDWR)) != -1) {
-	fstat(fd, &sb);
-	fchmod(fd, sb.st_mode | S_IXALL);	/* be sure, chmod a+x */
-	close(fd);
-	if (Verbose)
-	    printf("Running requirements file first for %s..\n", Plist.name);
-	if (!Fake && vsystem("./%s %s INSTALL", REQUIRE_FNAME, Plist.name)) {
-	    warnx("package %s fails requirements %s", pkg_fullname,
-		   Force ? "installing anyway" : "- not installed");
-	    if (!Force) {
-		code = 1;
-		goto success;	/* close enough for government work */
-	    }
-	}
-    }
-
-    /*
-     * Test whether to use the old method of passing tokens to installation
-     * scripts, and set appropriate variables..
-     */
-
-    if (fexists(POST_INSTALL_FNAME)) {
-	new_m = 1;
-	sprintf(post_script, "%s", POST_INSTALL_FNAME);
-	pre_arg[0] = '\0';
-	post_arg[0] = '\0';
-    } else {
-	if (fexists(INSTALL_FNAME)) {
-	    sprintf(post_script, "%s", INSTALL_FNAME);
-	    sprintf(pre_arg, "PRE-INSTALL");
-	    sprintf(post_arg, "POST-INSTALL");
-	}
-    }
-
-    /* If we're really installing, and have an installation file, run it */
-    if (!NoInstall && (fd = open(pre_script, O_RDWR)) != -1) {
-	fstat(fd, &sb);
-	fchmod(fd, sb.st_mode | S_IXALL);	/* be sure, chmod a+x */
-	close(fd);
-	if (Verbose)
-	    printf("Running pre-install for %s..\n", Plist.name);
-	if (!Fake && vsystem("./%s %s %s", pre_script, Plist.name, pre_arg)) {
-	    warnx("install script returned error status");
-	    unlink(pre_script);
-	    code = 1;
-	    goto success;		/* nothing to uninstall yet */
-	}
-    }
-
-    /* Now finally extract the entire show if we're not going direct */
-    if (!inPlace && !Fake)
-	extract_plist(".", &Plist);
-
-    if (!Fake && fexists(MTREE_FNAME)) {
-	if (Verbose)
-	    printf("Running mtree for %s..\n", Plist.name);
-	p = find_plist(&Plist, PLIST_CWD);
-	if (Verbose)
-	    printf("mtree -U -f %s -d -e -p %s >%s\n", MTREE_FNAME, p ? p->name : "/", _PATH_DEVNULL);
-	if (!Fake) {
-	    if (vsystem("/usr/sbin/mtree -U -f %s -d -e -p %s >%s", MTREE_FNAME, p ? p->name : "/", _PATH_DEVNULL))
-		warnx("mtree returned a non-zero status - continuing");
-	}
-    }
-
-    /* Run the installation script one last time? */
-    if (!NoInstall && (fd = open(post_script, O_RDWR)) != -1) {
-	fstat(fd, &sb);
-	fchmod(fd, sb.st_mode | S_IXALL);	/* be sure, chmod a+x */
-	close(fd);
-	if (Verbose)
-	    printf("Running post-install for %s..\n", Plist.name);
-	if (!Fake && vsystem("./%s %s %s", post_script, Plist.name, post_arg)) {
-	    warnx("install script returned error status");
-	    unlink(post_script);
-	    code = 1;
-	    goto fail;
-	}
-    }
-
-    /* Time to record the deed? */
-    if (!NoRecord && !Fake) {
-	char contents[FILENAME_MAX];
-	char **depnames = NULL, **deporigins = NULL, ***depmatches;
-	int i, dep_count = 0;
-	FILE *contfile;
-
-	if (getuid() != 0)
-	    warnx("not running as root - trying to record install anyway");
-	sprintf(LogDir, "%s/%s", LOG_DIR, Plist.name);
-	zapLogDir = 1;
-	if (Verbose)
-	    printf("Attempting to record package into %s..\n", LogDir);
-	if (make_hierarchy(LogDir, FALSE)) {
-	    warnx("can't record package into '%s', you're on your own!",
-		   LogDir);
-	    bzero(LogDir, FILENAME_MAX);
-	    code = 1;
-	    goto success;	/* close enough for government work */
-	}
-	/* Make sure pkg_info can read the entry */
-	fd = open(LogDir, O_RDWR);
-	fstat(fd, &sb);
-	fchmod(fd, sb.st_mode | S_IRALL | S_IXALL);	/* be sure, chmod a+rx */
-	close(fd);
-	move_file(".", DESC_FNAME, LogDir);
-	move_file(".", COMMENT_FNAME, LogDir);
-	if (fexists(INSTALL_FNAME))
-	    move_file(".", INSTALL_FNAME, LogDir);
-	if (fexists(POST_INSTALL_FNAME))
-	    move_file(".", POST_INSTALL_FNAME, LogDir);
-	if (fexists(DEINSTALL_FNAME))
-	    move_file(".", DEINSTALL_FNAME, LogDir);
-	if (fexists(POST_DEINSTALL_FNAME))
-	    move_file(".", POST_DEINSTALL_FNAME, LogDir);
-	if (fexists(REQUIRE_FNAME))
-	    move_file(".", REQUIRE_FNAME, LogDir);
-	if (fexists(DISPLAY_FNAME))
-	    move_file(".", DISPLAY_FNAME, LogDir);
-	if (fexists(MTREE_FNAME))
-	    move_file(".", MTREE_FNAME, LogDir);
-	sprintf(contents, "%s/%s", LogDir, CONTENTS_FNAME);
-	contfile = fopen(contents, "w");
-	if (!contfile) {
-	    warnx("can't open new contents file '%s'! can't register pkg",
-		contents);
-	    goto success; /* can't log, but still keep pkg */
-	}
-	write_plist(&Plist, contfile);
-	fclose(contfile);
-	for (p = Plist.head; p ; p = p->next) {
-	    char *deporigin;
-
-	    if (p->type != PLIST_PKGDEP)
-		continue;
-	    deporigin = (p->next->type == PLIST_DEPORIGIN) ? p->next->name :
-							     NULL;
-	    if (Verbose) {
-		printf("Trying to record dependency on package '%s'", p->name);
-		if (deporigin != NULL)
-		    printf(" with '%s' origin", deporigin);
-		printf(".\n");
-	    }
-
-	    if (deporigin) {
-		/* Defer to origin lookup */
-		depnames = realloc(depnames, (dep_count + 1) * sizeof(*depnames));
-		depnames[dep_count] = p->name;
-		deporigins = realloc(deporigins, (dep_count + 2) * sizeof(*deporigins));
-		deporigins[dep_count] = deporigin;
-		deporigins[dep_count + 1] = NULL;
-		dep_count++;
-	    } else {
-	       /* No origin recorded, try to register on literal package name */
-	       sprintf(contents, "%s/%s/%s", LOG_DIR, p->name,
-		     REQUIRED_BY_FNAME);
-	       contfile = fopen(contents, "a");
-	       if (!contfile) {
-		  warnx("can't open dependency file '%s'!\n"
-			"dependency registration is incomplete", contents);
-	       } else {
-		  fprintf(contfile, "%s\n", Plist.name);
-		  if (fclose(contfile) == EOF) {
-		     warnx("cannot properly close file %s", contents);
-		  }
-	       }
-	    }
-	}
-	if (dep_count > 0) {
-	    depmatches = matchallbyorigin((const char **)deporigins, NULL);
-	    free(deporigins);
-	    if (!IgnoreDeps && depmatches) {
-		for (i = 0; i < dep_count; i++) {
-		    if (depmatches[i]) {
-			int j;
-			char **tmp = depmatches[i];
-			for (j = 0; tmp[j] != NULL; j++) {
-			    /* Origin looked up */
-			    sprintf(contents, "%s/%s/%s", LOG_DIR, tmp[j],
-				REQUIRED_BY_FNAME);
-			    if (depnames[i] && strcmp(depnames[i], tmp[j]) != 0)
-				warnx("warning: package '%s' requires '%s', but '%s' "
-				    "is installed", Plist.name, depnames[i], tmp[j]);
-			    contfile = fopen(contents, "a");
-			    if (!contfile) {
-				warnx("can't open dependency file '%s'!\n"
-				    "dependency registration is incomplete", contents);
-			    } else {
-				fprintf(contfile, "%s\n", Plist.name);
-				if (fclose(contfile) == EOF)
-				    warnx("cannot properly close file %s", contents);
-			    }
-			}
-		    } else if (depnames[i]) {
-			/* No package present with this origin, try literal package name */
-			sprintf(contents, "%s/%s/%s", LOG_DIR, depnames[i],
-			    REQUIRED_BY_FNAME);
-			contfile = fopen(contents, "a");
-			if (!contfile) {
-			    warnx("can't open dependency file '%s'!\n"
-				"dependency registration is incomplete", contents);
-			} else {
-			    fprintf(contfile, "%s\n", Plist.name);
-			    if (fclose(contfile) == EOF) {
-				warnx("cannot properly close file %s", contents);
-			    }
-			}
-		    }
-		}
-	    }
-	}
-	if (Verbose)
-	    printf("Package %s registered in %s\n", Plist.name, LogDir);
-    }
-
-    if ((p = find_plist(&Plist, PLIST_DISPLAY)) != NULL) {
-	FILE *fp;
-	char buf[BUFSIZ];
-
-	snprintf(buf, sizeof buf, "%s/%s", LogDir, p->name);
-	fp = fopen(buf, "r");
-	if (fp) {
-	    putc('\n', stdout);
-	    while (fgets(buf, sizeof(buf), fp))
-		fputs(buf, stdout);
-	    putc('\n', stdout);
-	    (void) fclose(fp);
-	} else {
-    	    if (!Fake) {
-		warnx("cannot open %s as display file", buf);  
-	    }
-	}
-    }
-
-    goto success;
-
- bomb:
-    code = 1;
-    goto success;
-
- fail:
-    /* Nuke the whole (installed) show, XXX but don't clean directories */
-    if (!Fake)
-	delete_package(FALSE, FALSE, &Plist);
-
- success:
-    /* delete the packing list contents */
-    free_plist(&Plist);
-    leave_playpen();
-    return code;
-}
-
-static int
-sanity_check(char *pkg)
-{
-    int code = 0;
-
-    if (!fexists(CONTENTS_FNAME)) {
-	warnx("package %s has no CONTENTS file!", pkg);
-	code = 1;
-    }
-    else if (!fexists(COMMENT_FNAME)) {
-	warnx("package %s has no COMMENT file!", pkg);
-	code = 1;
-    }
-    else if (!fexists(DESC_FNAME)) {
-	warnx("package %s has no DESC file!", pkg);
-	code = 1;
-    }
-    return code;
-}
-
-void
-cleanup(int sig)
-{
-    static int in_cleanup = 0;
-
-    if (!in_cleanup) {
-	in_cleanup = 1;
-    	if (sig)
-	    printf("Signal %d received, cleaning up..\n", sig);
-    	if (!Fake && zapLogDir && LogDir[0])
-	    vsystem("%s -rf %s", REMOVE_CMD, LogDir);
-    	while (leave_playpen())
-	    ;
-    }
-    if (sig)
-	exit(1);
-}
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
deleted file mode 100644
index 923fe4561fc..00000000000
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ /dev/null
@@ -1,612 +0,0 @@
-.\"
-.\" FreeBSD install - a package for the installation and maintenance
-.\" of non-core utilities.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" Jordan K. Hubbard
-.\"
-.\" $FreeBSD$
-.\"
-.Dd November 9, 2012
-.Dt PKG_ADD 1
-.Os
-.Sh NAME
-.Nm pkg_add
-.Nd a utility for installing software package distributions
-.Sh SYNOPSIS
-.Nm
-.Op Fl viInfFrRMSK
-.Op Fl t Ar template
-.Op Fl p Ar prefix
-.Op Fl P Ar prefix
-.Op Fl C Ar chrootdir
-.Ar pkg-name Op Ar pkg-name ...
-.Sh DESCRIPTION
-The
-.Nm
-command is used to extract packages that have been previously created
-with the
-.Xr pkg_create 1
-command.
-.Sh WARNING
-.Bf -emphasis
-Since the
-.Nm
-command may execute scripts or programs contained within a package file,
-your system may be susceptible to
-.Dq Em trojan horses
-or other subtle
-attacks from miscreants who create dangerous package files.
-.Pp
-You are advised to verify the competence and identity of those who
-provide installable package files.
-For extra protection, use the
-.Fl M
-flag to extract the package file, and inspect its contents and scripts to
-ensure it poses no danger to your system's integrity.
-Pay particular
-attention to any +INSTALL, +POST-INSTALL, +DEINSTALL, +POST-DEINSTALL,
-+REQUIRE or +MTREE_DIRS files, and inspect the +CONTENTS file for
-.Cm @cwd ,
-.Cm @mode
-(check for setuid),
-.Cm @dirrm ,
-.Cm @exec ,
-and
-.Cm @unexec
-directives, and/or use the
-.Xr pkg_info 1
-command to examine the package file.
-.Ef
-.Sh OPTIONS
-The following command line arguments are supported:
-.Bl -tag -width indent
-.It Ar pkg-name Op Ar pkg-name ...
-The named packages are installed.
-A package name of
-.Fl
-will cause
-.Nm
-to read from stdin.
-If the packages are not found in the current
-working directory,
-.Nm
-will search them in each directory named by
-.Ev PKG_PATH .
-.It Fl v , -verbose
-Turn on verbose output.
-.It Fl K , -keep
-Keep any downloaded package in
-.Ev PKGDIR
-if it is defined or in current directory by default.
-.It Fl i , -no-deps
-Install the package without fetching and installing
-dependencies.
-.It Fl I , -no-script
-If any installation scripts (pre-install or post-install) exist for a given
-package, do not execute them.
-.It Fl n , -dry-run
-Do not actually install a package, just report the steps that
-would be taken if it was.
-.It Fl R , -no-record
-Do not record the installation of a package.
-This means
-that you cannot deinstall it later, so only use this option if
-you know what you are doing!
-.It Fl r , -remote
-Use the remote fetching feature.
-This will determine the appropriate
-objformat and release and then fetch and install the package.
-.It Fl f , -force
-Force installation to proceed even if prerequisite packages are not
-installed or the requirements script fails.
-Although
-.Nm
-will still try to find and auto-install missing prerequisite packages,
-a failure to find one will not be fatal.
-.It Fl F
-Already installed packages are not an error.
-.It Fl p , -prefix Ar prefix
-Set
-.Ar prefix
-as the directory in which to extract files from a package.
-If a package has set its default directory, it will be overridden
-by this flag.
-Note that only the first
-.Cm @cwd
-directive will be replaced, since
-.Nm
-has no way of knowing which directory settings are relative and
-which are absolute.
-It is rare in any case to see more than one
-directory transition made, but when such does happen and you wish
-to have control over *all* directory transitions, then you
-may then wish to look into the use of
-.Cm MASTER
-and
-.Cm SLAVE
-modes (see the
-.Fl M
-and
-.Fl S
-options).
-If the
-.Fl p
-flag appears after any
-.Fl P
-flag on the command line, it overrides its effect, causing
-.Nm
-not to use the given
-.Ar prefix
-recursively.
-.It Fl P Ar prefix
-Does the same as the
-.Fl p
-option, except that the given
-.Ar prefix
-is also used recursively for the dependency packages, if any.
-If the
-.Fl P
-flag appears after any
-.Fl p
-flag on the command line, it overrides its effect, causing
-.Nm
-to use the given
-.Ar prefix
-recursively.
-.It Fl t , -template Ar template
-Use
-.Ar template
-as the input to
-.Xr mktemp 3
-when creating a
-.Dq staging area .
-By default, this is the string
-.Pa /var/tmp/instmp.XXXXXX ,
-but it may be necessary to override it in the situation where
-space in your
-.Pa /var/tmp
-directory is limited.
-Be sure to leave some number of `X' characters
-for
-.Xr mktemp 3
-to fill in with a unique ID.
-.Pp
-You can get a performance boost by setting the staging area
-.Ar template
-to reside on the same disk partition as target directories for package
-file installation; often this is
-.Pa /usr .
-.It Fl M , -master
-Run in
-.Cm MASTER
-mode.
-This is a very specialized mode for running
-.Nm
-and is meant to be run in conjunction with
-.Cm SLAVE
-mode.
-When run in this mode,
-.Nm
-does no work beyond extracting the package into a temporary staging
-area (see the
-.Fl t
-option), reading in the packing list, and then dumping it (prefaced by
-the current staging area) to stdout where it may be filtered by a
-program such as
-.Xr sed 1 .
-When used in conjunction with
-.Cm SLAVE
-mode, it allows you to make radical changes to the package structure
-before acting on its contents.
-.It Fl S , -slave
-Run in
-.Cm SLAVE
-mode.
-This is a very specialized mode for running
-.Nm
-and is meant to be run in conjunction with
-.Cm MASTER
-mode.
-When run in this mode,
-.Nm
-expects the release contents to be already extracted and waiting
-in the staging area, the location of which is read as a string
-from stdin.
-The complete packing list is also read from stdin,
-and the contents then acted on as normal.
-.It Fl C , -chroot Ar chrootdir
-Before doing any operations,
-.Xr chroot 2
-to the
-.Ar chrootdir
-directory so that all package files, and the package database, are
-installed to
-.Ar chrootdir .
-Note that
-.Ar chrootdir
-needs to be a fairly complete file system, including everything normally
-needed by
-.Nm
-to run.
-This flag was added to help support operations done by
-.Xr sysinstall 8
-and is not expected to be useful for much else.
-Be careful that
-.Ar chrootdir
-is properly configured and cannot be modified by normal users,
-versions of commands like
-.Xr fetch 1
-may be run inside
-.Ar chrootdir
-as a side effect.
-.El
-.Pp
-One or more
-.Ar pkg-name
-arguments may be specified, each being either a file containing the
-package (these usually end with a
-.Dq .tbz
-suffix) or a
-URL pointing at a file available on an ftp site.
-Thus you may
-extract files directly from their anonymous ftp locations (e.g.\&
-.Nm
-.Li ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/packages/shells/bash-1.14.7.tbz ) .
-Note: If you wish to use
-.Bf -emphasis
-passive mode
-.Ef
-ftp in such transfers, set
-the variable
-.Bf -emphasis
-FTP_PASSIVE_MODE
-.Ef
-to some value in your environment.
-Otherwise, the more standard
-ACTIVE mode may be used.
-If
-.Nm
-consistently fails to fetch a package from a site known to work,
-it may be because you have a firewall that demands the usage of
-.Bf -emphasis
-passive mode
-.Ef
-ftp.
-.Sh TECHNICAL DETAILS
-The
-.Nm
-utility extracts each package's
-.Dq "packing list"
-into a special staging directory (see
-.Sx ENVIRONMENT ) ,
-parses it, and then runs
-through the following sequence to fully extract the contents of the package:
-.Bl -enum
-.It
-A check is made to determine if the package is already recorded as installed.
-If it is, installation is terminated.
-.It
-A check is made to determine if the package conflicts (from
-.Ic @conflicts
-directives, see
-.Xr pkg_create 1 )
-with an already installed package.
-If it is, installation is terminated.
-.It
-Scan all the package dependencies (from
-.Ic @pkgdep
-directives, see
-.Xr pkg_create 1 )
-are read from the packing list.
-If any of these required packages is not currently installed,
-an attempt is made to find and install it;
-if the missing package cannot be found or installed,
-the installation is terminated.
-.It
-Search for any
-.Ic @option
-directives which control how the package is added to the system.
-At the time of this writing, the only currently implemented option is
-.Ic @option Cm extract-in-place
-which will cause the package to be extracted directly into its
-prefix directory without moving through a staging area.
-.It
-If
-.Ic @option Cm extract-in-place
-is enabled, the package is now extracted directly into its
-final location, otherwise it is extracted into the staging area.
-.It
-If a requirements script
-.Pa +REQUIRE
-exists for the package (see the
-.Fl r
-flag of
-.Xr pkg_create 1 ) ,
-then execute it with the following arguments:
-.Pp
-.D1 Ar pkg-name Li INSTALL
-.Pp
-where
-.Ar pkg-name
-is the name of the package in question and the
-.Dq Li INSTALL
-keyword denotes this as an installation requirements check (useful if
-you want to have one script serving multiple functions).
-.It
-If a pre-install script
-.Pa +INSTALL
-exists for the package,
-it is then executed with the following arguments:
-.Pp
-.D1 Ar pkg-name Li PRE-INSTALL
-.Pp
-where
-.Ar pkg-name
-is the name of the package in question and
-.Dq Li PRE-INSTALL
-is a keyword denoting this as the preinstallation phase.
-.Pp
-.Sy Note :
-The
-.Dq Li PRE-INSTALL
-keyword will not appear if separate scripts for pre-install and post-install
-are given during package creation time (using the
-.Fl i
-and
-.Fl I
-flags to
-.Xr pkg_create 1 ) .
-.It
-If
-.Cm @option Cm extract-in-place
-is not used, then the packing list (this is the
-.Pa +CONTENTS
-file) is now used as a guide for moving (or copying, as necessary) files from
-the staging area into their final locations.
-.It
-If an mtree file
-.Pa +MTREE_DIRS
-exists for the package (see the
-.Fl m
-flag of
-.Xr pkg_create 1 ) ,
-then
-.Xr mtree 8
-is invoked as:
-.Pp
-.D1 Nm mtree Fl U f Pa +MTREE_DIRS Fl d e p Ar prefix
-.Pp
-where
-.Ar prefix
-is either the prefix specified with the
-.Fl p
-or
-.Fl P
-flag or,
-if neither flag was specified, the name of the first directory named by a
-.Ic @cwd
-directive within this package.
-.It
-If a post-install script
-.Pa +POST-INSTALL
-exists for the package,
-it is then executed with the following arguments:
-.Pp
-.D1 Ar pkg-name Li POST-INSTALL
-.Pp
-where
-.Ar pkg-name
-is the name of the package in question and
-.Dq Li POST-INSTALL
-is a keyword denoting this as the post-installation phase.
-.Pp
-.Sy Note :
-The
-.Dq Li POST-INSTALL
-keyword will not appear if separate scripts for pre-install and post-install
-are given during package creation time (using the
-.Fl i
-and
-.Fl I
-flags to
-.Xr pkg_create 1 ) .
-.Pp
-Reasoning behind passing keywords such as
-.Dq Li POST-INSTALL
-and
-.Dq Li PRE-INSTALL
-is that this allows you to write a single
-install
-script that does both
-.Dq before
-and
-.Dq after
-actions.
-But, separating the
-functionality is more advantageous and easier from a maintenance viewpoint.
-.It
-After installation is complete, a copy of the
-description
-.Pq Pa +DESC ,
-comment
-.Pq Pa +COMMENT ,
-pre-install script
-.Pq Pa +INSTALL ,
-post-install script
-.Pq Pa +POST-INSTALL ,
-deinstall script
-.Pq Pa +DEINSTALL ,
-post-deinstall script
-.Pq Pa +POST-DEINSTALL ,
-requirements script
-.Pq Pa +REQUIRE ,
-display
-.Pq Pa +DISPLAY ,
-mtree
-.Pq Pa +MTREE_DIRS ,
-and packing list
-.Pq Pa +CONTENTS
-files are copied into
-.Pa /var/db/pkg/ Ns Aq Ar pkg-name
-for subsequent possible use by
-.Xr pkg_delete 1 .
-Any package dependencies are recorded in the other packages'
-.Pa /var/db/pkg/ Ns Ao Ar other-pkg Ac Ns Pa /+REQUIRED_BY
-file
-(if the environment variable
-.Ev PKG_DBDIR
-is set, this overrides the
-.Pa /var/db/pkg/
-path shown above).
-.It
-Finally, the staging area is deleted and the program terminates.
-.El
-.Pp
-All the scripts are called with the environment variable
-.Ev PKG_PREFIX
-set to the installation prefix (see the
-.Fl p
-and
-.Fl P
-options above).
-This allows a package author to write a script
-that reliably performs some action on the directory where the package
-is installed, even if the user might change it with the
-.Fl p
-or
-.Fl P
-flags to
-.Nm .
-.Sh ENVIRONMENT
-The value of the
-.Ev PKG_PATH
-is used if a given package cannot be found.
-The environment variable
-should be a series of entries separated by colons.
-Each entry
-consists of a directory name.
-The current directory may be indicated
-implicitly by an empty directory name, or explicitly by a single
-period.
-.Pp
-The environment variable
-.Ev PKG_DBDIR
-specifies an alternative location for the installed package database,
-default location is
-.Pa /var/db/pkg .
-.Pp
-The environment variables
-.Ev PKG_TMPDIR
-and
-.Ev TMPDIR ,
-in that order, are taken to name temporary directories where
-.Nm
-will attempt to create its staging area in.
-If these variables are not present or if the directories named lack
-sufficient space, then
-.Nm
-will use the first of
-.Pa /var/tmp ,
-.Pa /tmp
-or
-.Pa /usr/tmp
-with sufficient space.
-.Pp
-The environment variable
-.Ev PACKAGEROOT
-specifies an alternate location for
-.Nm
-to fetch from.
-The fetch URL is built using this environment variable and the automatic
-directory logic that
-.Nm
-uses when the
-.Fl r
-option is invoked.
-An example setting would be
-.Qq Li ftp://ftp3.FreeBSD.org .
-.Pp
-The environment variable
-.Ev PACKAGESITE
-specifies an alternate location for
-.Nm
-to fetch from.
-This variable subverts the automatic directory logic
-that
-.Nm
-uses when the
-.Fl r
-option is invoked.
-Thus it should be a complete URL to the remote package file(s).
-.Pp
-The environment variable
-.Ev PKGDIR
-specifies an alternative location to save downloaded packages to when
-.Fl K
-option is used.
-.Pp
-The environment variable
-.Ev PACKAGESUFFIX
-specifies an alternative file extension to use when fetching remote
-packages. Default is .tbz
-.Sh FILES
-.Bl -tag -width /var/db/pkg -compact
-.It Pa /var/tmp
-Temporary directory for creating the staging area, if environmental variables
-.Ev PKG_TMPDIR
-or
-.Ev TMPDIR
-do not point to a suitable directory.
-.It Pa /tmp
-Next choice if
-.Pa /var/tmp
-does not exist or has insufficient space.
-.It Pa /usr/tmp
-Last choice if
-.Pa /var/tmp
-and
-.Pa /tmp
-are not suitable for creating the staging area.
-.It Pa /var/db/pkg
-Default location of the installed package database.
-.It Ev PKG_OLD_NOWARN
-If set
-.Nm
-will not warn about its use in the presence of pkgng databases.
-.El
-.Sh SEE ALSO
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_info 1 ,
-.Xr pkg_version 1 ,
-.Xr mktemp 3 ,
-.Xr sysconf 3 ,
-.Xr mtree 8
-.Sh AUTHORS
-.An Jordan Hubbard
-.Sh CONTRIBUTORS
-.An John Kohl Aq jtk@rational.com
-.Sh BUGS
-Hard links between files in a distribution are only preserved if either
-(1) the staging area is on the same file system as the target directory of
-all the links to the file, or (2) all the links to the file are bracketed by
-.Cm @cwd
-directives in the contents file,
-.Em and
-the link names are extracted with a single
-.Cm tar
-command (not split between
-invocations due to exec argument-space limitations--this depends on the
-value returned by
-.Fn sysconf _SC_ARG_MAX ) .
-.Pp
-Sure to be others.
diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
deleted file mode 100644
index 42718c6f927..00000000000
--- a/usr.sbin/pkg_install/create/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $FreeBSD$
-
-PROG=	pkg_create
-SRCS=	main.c perform.c pl.c
-
-CFLAGS+= -I${.CURDIR}/../lib
-
-WARNS?=	3
-WFORMAT?=	1
-
-DPADD=	${LIBINSTALL} ${LIBMD}
-LDADD=	${LIBINSTALL} -lmd
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/create/create.h b/usr.sbin/pkg_install/create/create.h
deleted file mode 100644
index 301bcffee2c..00000000000
--- a/usr.sbin/pkg_install/create/create.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* $FreeBSD$ */
-
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Include and define various things wanted by the create command.
- *
- */
-
-#ifndef _INST_CREATE_H_INCLUDE
-#define _INST_CREATE_H_INCLUDE
-
-extern match_t	MatchType;
-extern char	*Prefix;
-extern char	*Comment;
-extern char	*Desc;
-extern char	*Display;
-extern char	*Install;
-extern char	*PostInstall;
-extern char	*DeInstall;
-extern char	*PostDeInstall;
-extern char	*Contents;
-extern char	*Require;
-extern char	*SrcDir;
-extern char	*BaseDir;
-extern char	*ExcludeFrom;
-extern char	*Mtree;
-extern char	*Pkgdeps;
-extern char	*Conflicts;
-extern char	*Origin;
-extern char	*InstalledPkg;
-extern char	PlayPen[];
-extern int	Dereference;
-extern int	PlistOnly;
-extern int	Recursive;
-extern int	Regenerate;
-
-enum zipper {NONE, GZIP, BZIP, BZIP2, XZ };
-extern enum zipper	Zipper;
-
-void		add_cksum(Package *, PackingList, const char *);
-void		check_list(const char *, Package *);
-void		copy_plist(const char *, Package *);
-
-#endif	/* _INST_CREATE_H_INCLUDE */
diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
deleted file mode 100644
index 4f68697b85e..00000000000
--- a/usr.sbin/pkg_install/create/main.c
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * This is the create module.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <getopt.h>
-#include <err.h>
-
-#include "lib.h"
-#include "create.h"
-
-match_t	MatchType	= MATCH_GLOB;
-char	*Prefix		= NULL;
-char	*Comment        = NULL;
-char	*Desc		= NULL;
-char	*SrcDir		= NULL;
-char	*BaseDir	= NULL;
-char	*Display	= NULL;
-char	*Install	= NULL;
-char	*PostInstall	= NULL;
-char	*DeInstall	= NULL;
-char	*PostDeInstall	= NULL;
-char	*Contents	= NULL;
-char	*Require	= NULL;
-char	*ExcludeFrom	= NULL;
-char	*Mtree		= NULL;
-char	*Pkgdeps	= NULL;
-char	*Conflicts	= NULL;
-char	*Origin		= NULL;
-char	*InstalledPkg	= NULL;
-char	PlayPen[FILENAME_MAX];
-int	Dereference	= FALSE;
-int	PlistOnly	= FALSE;
-int	Recursive	= FALSE;
-int	Regenerate	= TRUE;
-int	Help		= FALSE;
-enum zipper	Zipper  = BZIP2;
-
-
-static void usage(void);
-
-static char opts[] = "EGYNnORhjJvxyzf:p:P:C:c:d:i:I:k:K:r:t:X:D:m:s:S:o:b:";
-static struct option longopts[] = {
-	{ "backup",	required_argument,	NULL,		'b' },
-	{ "extended",	no_argument,		NULL,		'E' },
-	{ "help",	no_argument,		&Help,		TRUE },
-	{ "no",		no_argument,		NULL,		'N' },
-	{ "no-glob",	no_argument,		NULL,		'G' },
-	{ "origin",	required_argument,	NULL,		'o' },
-	{ "plist-only",	no_argument,		NULL,		'O' },
-	{ "prefix",	required_argument,	NULL,		'p' },
-	{ "recursive",	no_argument,		NULL,		'R' },
-	{ "regex",	no_argument,		NULL,		'x' },
-	{ "template",	required_argument,	NULL,		't' },
-	{ "verbose",	no_argument,		NULL,		'v' },
-	{ "yes",	no_argument,		NULL,		'Y' },
-	{ NULL,		0,			NULL,		0 },
-};
-
-int
-main(int argc, char **argv)
-{
-    int ch;
-    char **pkgs, **start, *tmp;
-
-    warnpkgng();
-    pkgs = start = argv;
-    while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1)
-	switch(ch) {
-	case 'v':
-	    Verbose++;
-	    break;
-
-	case 'x':
-	    MatchType = MATCH_REGEX;
-	    break;
-
-	case 'E':
-	    MatchType = MATCH_EREGEX;
-	    break;
-
-	case 'G':
-	    MatchType = MATCH_EXACT;
-	    break;
-
-	case 'N':
-	    AutoAnswer = NO;
-	    break;
-
-	case 'Y':
-	    AutoAnswer = YES;
-	    break;
-
-	case 'O':
-	    PlistOnly = TRUE;
-	    break;
-
-	case 'p':
-	    Prefix = optarg;
-	    break;
-
-	case 's':
-	    SrcDir = optarg;
-	    break;
-
-	case 'S':
-	    BaseDir = optarg;
-	    break;
-
-	case 'f':
-	    Contents = optarg;
-	    break;
-
-	case 'C':
-	    Conflicts = optarg;
-	    break;
-
-	case 'c':
-	    Comment = optarg;
-	    break;
-
-	case 'd':
-	    Desc = optarg;
-	    break;
-
-	case 'i':
-	    Install = optarg;
-	    break;
-
-	case 'I':
-	    PostInstall = optarg;
-	    break;
-
-	case 'k':
-	    DeInstall = optarg;
-	    break;
-
-	case 'K':
-	    PostDeInstall = optarg;
-	    break;
-
-	case 'r':
-	    Require = optarg;
-	    break;
-
-	case 't':
-	    strlcpy(PlayPen, optarg, sizeof(PlayPen));
-	    break;
-
-	case 'X':
-	    ExcludeFrom = optarg;
-	    break;
-
-	case 'h':
-	    Dereference = TRUE;
-	    break;
-
-	case 'D':
-	    Display = optarg;
-	    break;
-
-	case 'm':
-	    Mtree = optarg;
-	    break;
-
-	case 'P':
-	    Pkgdeps = optarg;
-	    break;
-
-	case 'o':
-	    Origin = optarg;
-	    break;
-
-	case 'y':
-	case 'j':
-	    Zipper = BZIP2;
-	    break;
-
-	case 'z':
-	    Zipper = GZIP;
-	    break;
-
-	case 'J':
-	    Zipper = XZ;
-	    break;
-
-	case 'b':
-	    InstalledPkg = optarg;
-	    while ((tmp = strrchr(optarg, (int)'/')) != NULL) {
-		*tmp++ = '\0';
-		/*
-		 * If character after the '/' is alphanumeric, then we've
-		 * found the package name.  Otherwise we've come across
-		 * a trailing '/' and need to continue our quest.
-		 */
-		if (isalpha(*tmp)) {
-		    InstalledPkg = tmp;
-		    break;
-		}
-	    }
-	    break;
-
-	case 'R':
-	    Recursive = TRUE;
-	    break;
-
-	case 'n':
-	    Regenerate = FALSE;
-	    break;
-
-	case 0:
-	    if (Help)
-		usage();
-	    break;
-
-	default:
-	    usage();
-	    break;
-	}
-
-    argc -= optind;
-    argv += optind;
-
-    /* Get all the remaining package names, if any */
-    while (*argv)
-	*pkgs++ = *argv++;
-
-    /* If no packages, yelp */
-    if ((pkgs == start) && (InstalledPkg == NULL))
-	warnx("missing package name"), usage();
-    *pkgs = NULL;
-    if ((start[0] != NULL) && (start[1] != NULL)) {
-	warnx("only one package name allowed ('%s' extraneous)", start[1]);
-	usage();
-    }
-    if (start[0] == NULL)
-	start[0] = InstalledPkg;
-    if (!pkg_perform(start)) {
-	if (Verbose)
-	    warnx("package creation failed");
-	return 1;
-    }
-    else
-	return 0;
-}
-
-static void
-usage(void)
-{
-    fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
-"usage: pkg_create [-YNOhjnvyz] [-C conflicts] [-P pkgs] [-p prefix]",
-"                  [-i iscript] [-I piscript] [-k dscript] [-K pdscript]",
-"                  [-r rscript] [-s srcdir] [-S basedir]",
-"                  [-t template] [-X excludefile]",
-"                  [-D displayfile] [-m mtreefile] [-o originpath]",
-"                  -c comment -d description -f packlist pkg-filename",
-"       pkg_create [-EGYNRhnvxy] -b pkg-name [pkg-filename]");
-    exit(1);
-}
diff --git a/usr.sbin/pkg_install/create/perform.c b/usr.sbin/pkg_install/create/perform.c
deleted file mode 100644
index e2a884ace7d..00000000000
--- a/usr.sbin/pkg_install/create/perform.c
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * This is the main body of the create module.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include "create.h"
-
-#include <err.h>
-#include <libgen.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/syslimits.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-static void sanity_check(void);
-static void make_dist(const char *, const char *, const char *, Package *);
-static int create_from_installed_recursive(const char *, const char *);
-static int create_from_installed(const char *, const char *, const char *);
-
-int
-pkg_perform(char **pkgs)
-{
-    static const char *home;
-    char *pkg = *pkgs;		/* Only one arg to create */
-    char *cp;
-    FILE *pkg_in, *fp;
-    Package plist;
-    int len;
-    const char *suf;
-
-    /* Preliminary setup */
-    if (InstalledPkg == NULL)
-	sanity_check();
-    if (Verbose && !PlistOnly)
-	printf("Creating package %s\n", pkg);
-
-    /* chop suffix off if already specified, remembering if we want to compress  */
-    len = strlen(pkg);
-    if (len > 4) {
-	if (!strcmp(&pkg[len - 4], ".tbz")) {
-	    Zipper = BZIP2;
-	    pkg[len - 4] = '\0';
-	}
-	else if (!strcmp(&pkg[len - 4], ".tgz")) {
-	    Zipper = GZIP;
-	    pkg[len - 4] = '\0';
-	}
-	else if (!strcmp(&pkg[len - 4], ".txz")) {
-	    Zipper = XZ;
-	    pkg[len - 4] = '\0';
-	}
-	else if (!strcmp(&pkg[len - 4], ".tar")) {
-	    Zipper = NONE;
-	    pkg[len - 4] = '\0';
-	}
-    }
-    if (Zipper == BZIP2) {
-	suf = "tbz";
-	setenv("BZIP2", "--best", 0);
-    } else if (Zipper == GZIP) {
-	suf = "tgz";
-	setenv("GZIP", "-9", 0);
-    } else if (Zipper == XZ) {
-	suf = "txz";
-    } else
-	suf = "tar";
-
-    if (InstalledPkg != NULL) {
-	char *pkgglob[] = { InstalledPkg, NULL };
-	char **matched, **pkgs;
-	int i, error;
-
-	pkgs = pkgglob;
-	if (MatchType != MATCH_EXACT) {
-		matched = matchinstalled(MatchType, pkgs, &error);
-		if (!error && matched != NULL)
-			pkgs = matched;
-		else if (MatchType != MATCH_GLOB)
-	    		errx(1, "no packages match pattern");
-	}
-	/*
-	 * Is there is only one installed package matching the pattern,
-	 * we need to respect the optional pkg-filename parameter.  If,
-	 * however, the pattern matches several packages, this parameter
-	 * makes no sense and is ignored.
-	 */
-	if (pkgs[1] == NULL) {
-	    if (pkg == InstalledPkg)
-		pkg = *pkgs;
-	    InstalledPkg = *pkgs;
-	    if (!Recursive)
-		return (create_from_installed(InstalledPkg, pkg, suf));
-	    return (create_from_installed_recursive(pkg, suf));
-	}
-	for (i = 0; pkgs[i] != NULL; i++) {
-	    InstalledPkg = pkg = pkgs[i];
-	    if (!Recursive)
-		create_from_installed(pkg, pkg, suf);
-	    else
-	        create_from_installed_recursive(pkg, suf);
-	}
-	return TRUE;
-    }
-
-    get_dash_string(&Comment);
-    get_dash_string(&Desc);
-    if (!strcmp(Contents, "-"))
-	pkg_in = stdin;
-    else {
-	pkg_in = fopen(Contents, "r");
-	if (!pkg_in) {
-	    cleanup(0);
-	    errx(2, "%s: unable to open contents file '%s' for input",
-		__func__, Contents);
-	}
-    }
-    plist.head = plist.tail = NULL;
-
-    /* Stick the dependencies, if any, at the top */
-    if (Pkgdeps) {
-	char **deps, *deporigin;
-	int i;
-	int ndeps = 0;
-
-	if (Verbose && !PlistOnly)
-	    printf("Registering depends:");
-
-	/* Count number of dependencies */
-	for (cp = Pkgdeps; cp != NULL && *cp != '\0';
-			   cp = strpbrk(++cp, " \t\n")) {
-	    ndeps++;
-	}
-
-	if (ndeps != 0) {
-	    /* Create easy to use NULL-terminated list */
-	    deps = alloca(sizeof(*deps) * ndeps + 1);
-	    if (deps == NULL) {
-		errx(2, "%s: alloca() failed", __func__);
-		/* Not reached */
-	    }
-	    for (i = 0; Pkgdeps;) {
-		cp = strsep(&Pkgdeps, " \t\n");
-		if (*cp) {
-		    deps[i] = cp;
-		    i++;
-		}
-	    }
-	    ndeps = i;
-	    deps[ndeps] = NULL;
-
-	    sortdeps(deps);
-	    for (i = 0; i < ndeps; i++) {
-		deporigin = strchr(deps[i], ':');
-		if (deporigin != NULL) {
-		    *deporigin = '\0';
-		    add_plist_top(&plist, PLIST_DEPORIGIN, ++deporigin);
-		}
-		add_plist_top(&plist, PLIST_PKGDEP, deps[i]);
-		if (Verbose && !PlistOnly)
-		    printf(" %s", deps[i]);
-	    }
-	}
-
-	if (Verbose && !PlistOnly)
-	    printf(".\n");
-    }
-
-    /* Put the conflicts directly after the dependencies, if any */
-    if (Conflicts) {
-	if (Verbose && !PlistOnly)
-	    printf("Registering conflicts:");
-	while (Conflicts) {
-	   cp = strsep(&Conflicts, " \t\n");
-	   if (*cp) {
-		add_plist(&plist, PLIST_CONFLICTS, cp);
-		if (Verbose && !PlistOnly)
-		    printf(" %s", cp);
-	   }
-	}
-	if (Verbose && !PlistOnly)
-	    printf(".\n");
-    }
-
-    /* If a SrcDir override is set, add it now */
-    if (SrcDir) {
-	if (Verbose && !PlistOnly)
-	    printf("Using SrcDir value of %s\n", SrcDir);
-	add_plist(&plist, PLIST_SRC, SrcDir);
-    }
-
-    /* Slurp in the packing list */
-    read_plist(&plist, pkg_in);
-
-    /* Prefix should add an @cwd to the packing list */
-    if (Prefix) {
-	if (Prefix[0] != '/') {
-		char resolved_prefix[PATH_MAX];
-		if (realpath(Prefix, resolved_prefix) == NULL)
-		    err(EXIT_FAILURE, "couldn't resolve path for prefix: %s", Prefix);
-		add_plist_top(&plist, PLIST_CWD, resolved_prefix);
-	} else {
-		add_plist_top(&plist, PLIST_CWD, Prefix);
-	}
-    }
-
-    /* Add the origin if asked, at the top */
-    if (Origin)
-	add_plist_top(&plist, PLIST_ORIGIN, Origin);
-
-    /*
-     * Run down the list and see if we've named it, if not stick in a name
-     * at the top.
-     */
-    if (find_plist(&plist, PLIST_NAME) == NULL)
-	add_plist_top(&plist, PLIST_NAME, basename(pkg));
-
-    if (asprintf(&cp, "PKG_FORMAT_REVISION:%d.%d", PLIST_FMT_VER_MAJOR,
-		 PLIST_FMT_VER_MINOR) == -1) {
-	errx(2, "%s: asprintf() failed", __func__);
-    }
-    add_plist_top(&plist, PLIST_COMMENT, cp);
-    free(cp);
-
-    /*
-     * We're just here for to dump out a revised plist for the FreeBSD ports
-     * hack.  It's not a real create in progress.
-     */
-    if (PlistOnly) {
-	check_list(home, &plist);
-	write_plist(&plist, stdout);
-	exit(0);
-    }
-
-    /* Make a directory to stomp around in */
-    home = make_playpen(PlayPen, 0);
-    signal(SIGINT, cleanup);
-    signal(SIGHUP, cleanup);
-
-    /* Make first "real contents" pass over it */
-    check_list(home, &plist);
-    (void) umask(022);	/*
-			 * Make sure gen'ed directories, files don't have
-			 * group or other write bits.
-			 */
-    /* copy_plist(home, &plist); */
-    /* mark_plist(&plist); */
-
-    /* Now put the release specific items in */
-    if (!Prefix) {
-	add_plist(&plist, PLIST_CWD, ".");
-    }
-    write_file(COMMENT_FNAME, Comment);
-    add_plist(&plist, PLIST_IGNORE, NULL);
-    add_plist(&plist, PLIST_FILE, COMMENT_FNAME);
-    add_cksum(&plist, plist.tail, COMMENT_FNAME);
-    write_file(DESC_FNAME, Desc);
-    add_plist(&plist, PLIST_IGNORE, NULL);
-    add_plist(&plist, PLIST_FILE, DESC_FNAME);
-    add_cksum(&plist, plist.tail, DESC_FNAME);
-
-    if (Install) {
-	copy_file(home, Install, INSTALL_FNAME);
-	add_plist(&plist, PLIST_IGNORE, NULL);
-	add_plist(&plist, PLIST_FILE, INSTALL_FNAME);
-	add_cksum(&plist, plist.tail, INSTALL_FNAME);
-    }
-    if (PostInstall) {
-	copy_file(home, PostInstall, POST_INSTALL_FNAME);
-	add_plist(&plist, PLIST_IGNORE, NULL);
-	add_plist(&plist, PLIST_FILE, POST_INSTALL_FNAME);
-	add_cksum(&plist, plist.tail, POST_INSTALL_FNAME);
-    }
-    if (DeInstall) {
-	copy_file(home, DeInstall, DEINSTALL_FNAME);
-	add_plist(&plist, PLIST_IGNORE, NULL);
-	add_plist(&plist, PLIST_FILE, DEINSTALL_FNAME);
-	add_cksum(&plist, plist.tail, DEINSTALL_FNAME);
-    }
-    if (PostDeInstall) {
-	copy_file(home, PostDeInstall, POST_DEINSTALL_FNAME);
-	add_plist(&plist, PLIST_IGNORE, NULL);
-	add_plist(&plist, PLIST_FILE, POST_DEINSTALL_FNAME);
-	add_cksum(&plist, plist.tail, POST_DEINSTALL_FNAME);
-    }
-    if (Require) {
-	copy_file(home, Require, REQUIRE_FNAME);
-	add_plist(&plist, PLIST_IGNORE, NULL);
-	add_plist(&plist, PLIST_FILE, REQUIRE_FNAME);
-	add_cksum(&plist, plist.tail, REQUIRE_FNAME);
-    }
-    if (Display) {
-	copy_file(home, Display, DISPLAY_FNAME);
-	add_plist(&plist, PLIST_IGNORE, NULL);
-	add_plist(&plist, PLIST_FILE, DISPLAY_FNAME);
-	add_cksum(&plist, plist.tail, DISPLAY_FNAME);
-	add_plist(&plist, PLIST_DISPLAY, DISPLAY_FNAME);
-    }
-    if (Mtree) {
-	copy_file(home, Mtree, MTREE_FNAME);
-	add_plist(&plist, PLIST_IGNORE, NULL);
-	add_plist(&plist, PLIST_FILE, MTREE_FNAME);
-	add_cksum(&plist, plist.tail, MTREE_FNAME);
-	add_plist(&plist, PLIST_MTREE, MTREE_FNAME);
-    }
-
-    /* Finally, write out the packing list */
-    fp = fopen(CONTENTS_FNAME, "w");
-    if (!fp) {
-	cleanup(0);
-	errx(2, "%s: can't open file %s for writing",
-	    __func__, CONTENTS_FNAME);
-    }
-    write_plist(&plist, fp);
-    if (fclose(fp)) {
-	cleanup(0);
-	errx(2, "%s: error while closing %s",
-	    __func__, CONTENTS_FNAME);
-    }
-
-    /* And stick it into a tar ball */
-    make_dist(home, pkg, suf, &plist);
-
-    /* Cleanup */
-    free(Comment);
-    free(Desc);
-    free_plist(&plist);
-    leave_playpen();
-    return TRUE;	/* Success */
-}
-
-static void
-make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist)
-{
-    struct stat sb;
-    char tball[FILENAME_MAX];
-    PackingList p;
-    int ret;
-    const char *args[50];	/* Much more than enough. */
-    int nargs = 0;
-    int pipefds[2];
-    FILE *totar;
-    pid_t pid;
-    const char *cname;
-    char *prefix = NULL;
-
-
-    args[nargs++] = "tar";	/* argv[0] */
-
-    if (*pkg == '/')
-	snprintf(tball, FILENAME_MAX, "%s.%s", pkg, suff);
-    else
-	snprintf(tball, FILENAME_MAX, "%s/%s.%s", homedir, pkg, suff);
-
-    /*
-     * If the package tarball exists already, and we are running in `no
-     * clobber' mode, skip this package.
-     */
-    if (stat(tball, &sb) == 0 && Regenerate == FALSE) {
-	if (Verbose)
-	    printf("Skipping package '%s'.  It already exists.\n", tball);
-	return;
-    }
-
-    args[nargs++] = "-c";
-    args[nargs++] = "-f";
-    args[nargs++] = tball;
-    if (strchr(suff, 'z')) {	/* Compress/gzip/bzip2? */
-	if (Zipper == BZIP2) {
-	    args[nargs++] = "-j";
-	    cname = "bzip'd ";
-	}
-	else if (Zipper == XZ) {
-	    args[nargs++] = "-J";
-	    cname = "xz'd ";
-	}
-	else {
-	    args[nargs++] = "-z";
-	    cname = "gzip'd ";
-	}
-    } else {
-	cname = "";
-    }
-    if (Dereference)
-	args[nargs++] = "-h";
-    if (ExcludeFrom) {
-	args[nargs++] = "-X";
-	args[nargs++] = ExcludeFrom;
-    }
-    args[nargs++] = "-T";	/* Take filenames from file instead of args. */
-    args[nargs++] = "-";	/* Use stdin for the file. */
-    args[nargs] = NULL;
-
-    if (Verbose)
-	printf("Creating %star ball in '%s'\n", cname, tball);
-
-    /* Set up a pipe for passing the filenames, and fork off a tar process. */
-    if (pipe(pipefds) == -1) {
-	cleanup(0);
-	errx(2, "%s: cannot create pipe", __func__);
-    }
-    if ((pid = fork()) == -1) {
-	cleanup(0);
-	errx(2, "%s: cannot fork process for tar", __func__);
-    }
-    if (pid == 0) {	/* The child */
-	dup2(pipefds[0], 0);
-	close(pipefds[0]);
-	close(pipefds[1]);
-	execv("/usr/bin/tar", (char * const *)(uintptr_t)args);
-	cleanup(0);
-	errx(2, "%s: failed to execute tar command", __func__);
-    }
-
-    /* Meanwhile, back in the parent process ... */
-    close(pipefds[0]);
-    if ((totar = fdopen(pipefds[1], "w")) == NULL) {
-	cleanup(0);
-	errx(2, "%s: fdopen failed", __func__);
-    }
-
-    fprintf(totar, "%s\n", CONTENTS_FNAME);
-    fprintf(totar, "%s\n", COMMENT_FNAME);
-    fprintf(totar, "%s\n", DESC_FNAME);
-
-    if (Install)
-	fprintf(totar, "%s\n", INSTALL_FNAME);
-    if (PostInstall)
-	fprintf(totar, "%s\n", POST_INSTALL_FNAME);
-    if (DeInstall)
-	fprintf(totar, "%s\n", DEINSTALL_FNAME);
-    if (PostDeInstall)
-	fprintf(totar, "%s\n", POST_DEINSTALL_FNAME);
-    if (Require)
-	fprintf(totar, "%s\n", REQUIRE_FNAME);
-    if (Display)
-	fprintf(totar, "%s\n", DISPLAY_FNAME);
-    if (Mtree)
-	fprintf(totar, "%s\n", MTREE_FNAME);
-
-    for (p = plist->head; p; p = p->next) {
-	if (p->type == PLIST_FILE)
-	    fprintf(totar, "%s\n", p->name);
-	else if (p->type == PLIST_CWD && p->name == NULL)
-	    fprintf(totar, "-C\n%s\n", prefix);
-	else if (p->type == PLIST_CWD && BaseDir && p->name && p->name[0] == '/')
-	    fprintf(totar, "-C\n%s%s\n", BaseDir, p->name);
-	else if (p->type == PLIST_CWD || p->type == PLIST_SRC)
-	    fprintf(totar, "-C\n%s\n", p->name);
-	else if (p->type == PLIST_IGNORE)
-	     p = p->next;
-	if (p->type == PLIST_CWD && !prefix)
-	    prefix = p->name;
-
-    }
-
-    fclose(totar);
-    wait(&ret);
-    /* assume either signal or bad exit is enough for us */
-    if (ret) {
-	cleanup(0);
-	errx(2, "%s: tar command failed with code %d", __func__, ret);
-    }
-}
-
-static void
-sanity_check()
-{
-    if (!Comment) {
-	cleanup(0);
-	errx(2, "%s: required package comment string is missing (-c comment)",
-	    __func__);
-    }
-    if (!Desc) {
-	cleanup(0);
-	errx(2,	"%s: required package description string is missing (-d desc)",
-	    __func__);
-    }
-    if (!Contents) {
-	cleanup(0);
-	errx(2,	"%s: required package contents list is missing (-f [-]file)",
-	    __func__);
-    }
-}
-
-
-/* Clean up those things that would otherwise hang around */
-void
-cleanup(int sig)
-{
-    int in_cleanup = 0;
-
-    if (!in_cleanup) {
-	in_cleanup = 1;
-    	leave_playpen();
-    }
-    if (sig)
-	exit(1);
-}
-
-static int
-create_from_installed_recursive(const char *pkg, const char *suf)
-{
-    FILE *fp;
-    Package plist;
-    PackingList p;
-    char tmp[PATH_MAX];
-    int rval;
-
-    if (!create_from_installed(InstalledPkg, pkg, suf))
-	return FALSE;
-    snprintf(tmp, sizeof(tmp), "%s/%s/%s", LOG_DIR, InstalledPkg, CONTENTS_FNAME);
-    if (!fexists(tmp)) {
-	warnx("can't find package '%s' installed!", InstalledPkg);
-	return FALSE;
-    }
-    /* Suck in the contents list */
-    plist.head = plist.tail = NULL;
-    fp = fopen(tmp, "r");
-    if (!fp) {
-	warnx("unable to open %s file", tmp);
-	return FALSE;
-    }
-    read_plist(&plist, fp);
-    fclose(fp);
-    rval = TRUE;
-    for (p = plist.head; p ; p = p->next) {
-	if (p->type != PLIST_PKGDEP)
-	    continue;
-	if (Verbose)
-	    printf("Creating package %s\n", p->name);
-	if (!create_from_installed(p->name, p->name, suf)) {
-	    rval = FALSE;
-	    break;
-	}
-    }
-    free_plist(&plist);
-    return rval;
-}
-
-static int
-create_from_installed(const char *ipkg, const char *pkg, const char *suf)
-{
-    FILE *fp;
-    Package plist;
-    char homedir[MAXPATHLEN], log_dir[FILENAME_MAX];
-
-    snprintf(log_dir, sizeof(log_dir), "%s/%s", LOG_DIR, ipkg);
-    if (!fexists(log_dir)) {
-	warnx("can't find package '%s' installed!", ipkg);
-	return FALSE;
-    }
-    getcwd(homedir, sizeof(homedir));
-    if (chdir(log_dir) == FAIL) {
-	warnx("can't change directory to '%s'!", log_dir);
-	return FALSE;
-    }
-    /* Suck in the contents list */
-    plist.head = plist.tail = NULL;
-    fp = fopen(CONTENTS_FNAME, "r");
-    if (!fp) {
-	warnx("unable to open %s file", CONTENTS_FNAME);
-	return FALSE;
-    }
-    read_plist(&plist, fp);
-    fclose(fp);
-
-    Install = isfile(INSTALL_FNAME) ? (char *)INSTALL_FNAME : NULL;
-    PostInstall = isfile(POST_INSTALL_FNAME) ?
-	(char *)POST_INSTALL_FNAME : NULL;
-    DeInstall = isfile(DEINSTALL_FNAME) ? (char *)DEINSTALL_FNAME : NULL;
-    PostDeInstall = isfile(POST_DEINSTALL_FNAME) ?
-	(char *)POST_DEINSTALL_FNAME : NULL;
-    Require = isfile(REQUIRE_FNAME) ? (char *)REQUIRE_FNAME : NULL;
-    Display = isfile(DISPLAY_FNAME) ? (char *)DISPLAY_FNAME : NULL;
-    Mtree = isfile(MTREE_FNAME) ?  (char *)MTREE_FNAME : NULL;
-
-    make_dist(homedir, pkg, suf, &plist);
-
-    free_plist(&plist);
-    if (chdir(homedir) == FAIL) {
-	warnx("can't change directory to '%s'!", homedir);
-	return FALSE;
-    }
-    return TRUE;
-}
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
deleted file mode 100644
index 18780a0f1b5..00000000000
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ /dev/null
@@ -1,670 +0,0 @@
-.\"
-.\" FreeBSD install - a package for the installation and maintenance
-.\" of non-core utilities.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" Jordan K. Hubbard
-.\"
-.\"
-.\"     @(#)pkg_create.1
-.\" $FreeBSD$
-.\"
-.\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
-.\" added dependency tracking, etc.
-.\"
-.\" [jkh] Took John's changes back and made some additional extensions for
-.\" better integration with FreeBSD's new ports collection.
-.\"
-.Dd November 9, 2012
-.Dt PKG_CREATE 1
-.Os
-.Sh NAME
-.Nm pkg_create
-.Nd a utility for creating software package distributions
-.Sh SYNOPSIS
-.Nm
-.Op Fl YNOhjnvyz
-.Op Fl C Ar conflicts
-.Op Fl P Ar pkgs
-.Op Fl p Ar prefix
-.Op Fl i Ar iscript
-.Op Fl I Ar piscript
-.Op Fl k Ar dscript
-.Op Fl K Ar pdscript
-.Op Fl r Ar rscript
-.Op Fl s Ar srcdir
-.Op Fl S Ar basedir
-.Op Fl t Ar template
-.Op Fl X Ar excludefile
-.Op Fl D Ar displayfile
-.Op Fl m Ar mtreefile
-.Op Fl o Ar originpath
-.Fl c Ar comment
-.Fl d Ar description
-.Fl f Ar packlist
-.Ar pkg-filename
-.Nm
-.Op Fl EGYNRhnvxy
-.Fl b Ar pkg-name
-.Op Ar pkg-filename
-.Sh DESCRIPTION
-The
-.Nm
-command is used to create packages that will subsequently be fed to
-one of the package extraction/info utilities.
-The input description
-and command line arguments for the creation of a package are not
-meant to be human-generated, though it is easy enough to do so.
-It is more expected that you will use a front-end tool for
-the job rather than muddling through it yourself.
-Nonetheless, a short
-description of the input syntax is included in this document.
-.Sh OPTIONS
-The following command line options are supported:
-.Bl -tag -width indent
-.It Fl f Ar packinglist
-Fetch
-.Dq packing list
-for package from the file
-.Ar packinglist
-or
-.Cm stdin
-if
-.Ar packinglist
-is a
-.Cm -
-(dash).
-.It Fl c Xo
-.Oo Fl Oc Ns Ar desc
-.Xc
-Fetch package
-.Dq one line description
-from file
-.Ar desc
-or, if preceded by
-.Cm - ,
-the argument itself.
-This string should also
-give some idea of which version of the product (if any) the package
-represents.
-.It Fl d Xo
-.Oo Fl Oc Ns Ar desc
-.Xc
-Fetch long description for package from file
-.Ar desc
-or, if preceded by
-.Cm - ,
-the argument itself.
-.It Fl Y , -yes
-Assume a default answer of `Yes' for any questions asked.
-.It Fl N , -no
-Assume a default answer of `No' for any questions asked.
-.It Fl O , -plist-only
-Go into a `packing list Only' mode.
-This is a custom hack for the
-.Fx
-.Em "Ports Collection"
-and is used to do `fake pkg_add' operations when a port is installed.
-In such cases, it is necessary to know what the final, adjusted packing
-list will look like.
-.It Fl v , -verbose
-Turn on verbose output.
-.It Fl h
-Force tar to follow symbolic links, so that the files they point to
-are dumped, rather than the links themselves.
-.It Fl i Ar iscript
-Set
-.Ar iscript
-to be the pre-install procedure for the package.
-This can be any executable
-program (or shell script).
-It will be invoked automatically when the
-package is later installed.
-It will be passed the package's name as the
-first argument.
-.Pp
-.Sy Note :
-if the
-.Fl I
-option is not given, this script will serve as both the pre-install and the
-post-install script for the package, differentiating between the
-functionality by passing the keywords
-.Ar PRE-INSTALL
-and
-.Ar POST-INSTALL
-respectively, after the package's name.
-.It Fl I Ar piscript
-Set
-.Ar piscript
-to be the post-install procedure for the package.
-This can be any
-executable program (or shell script).
-It will be invoked automatically
-when the package is later installed.
-It will be passed the package's name as
-the first argument.
-.It Fl C Ar conflicts
-Set the initial package conflict list to
-.Ar conflicts .
-This is assumed to be a whitespace separated list of package names
-and is meant as a convenient shorthand for specifying multiple
-.Cm @conflicts
-directives in the packing list (see PACKING LIST DETAILS section below).
-.It Fl P Ar pkgs
-Set the initial package dependency list to
-.Ar pkgs .
-This is assumed to be a whitespace separated list of package names
-and is meant as a convenient shorthand for specifying multiple
-.Cm @pkgdep
-directives in the packing list (see
-.Sx "PACKING LIST DETAILS"
-section below).
-Each argument from the
-.Ar pkgs
-list could be in the form
-.Ar pkgname Ns Op : Ns Ar pkgorigin ,
-where optional
-.Ar pkgorigin
-element denotes origin of each dependency from the list and it is
-recorded into the packing list along with the
-.Ar pkgname
-using
-.Cm @comment
-directive.
-.It Fl p , -prefix Ar prefix
-Set
-.Ar prefix
-as the initial directory
-.Dq base
-to start from in selecting files for
-the package.
-.It Fl k Ar dscript
-Set
-.Ar dscript
-to be the de-install procedure for the package.
-This can be any executable
-program (or shell script).
-It will be invoked automatically when the
-package is later (if ever) de-installed.
-It will be passed the package's
-name as the first argument.
-.Pp
-.Sy Note :
-if the
-.Fl K
-option is not given, this script will serve as both the de-install and the
-post-deinstall script for the package, differentiating between the
-functionality by passing the keywords
-.Ar DEINSTALL
-and
-.Ar POST-DEINSTALL
-respectively, along with the package's name.
-.It Fl K Ar pdscript
-Set
-.Ar pdscript
-to be the post-deinstall procedure for the package.
-This can be any
-executable program (or shell script).
-It will be invoked automatically when
-the package is later de-installed.
-It will be passed the package's name as
-the first argument.
-.It Fl r Ar rscript
-Set
-.Ar rscript
-to be the
-.Dq requirements
-procedure for the package.
-This can be any
-executable program (or shell script).
-It will be invoked automatically
-at installation/deinstallation time to determine whether or not
-installation/deinstallation should proceed.
-To differentiate between installation and deinstallation, the keywords
-.Ar INSTALL
-and
-.Ar DEINSTALL
-are passed respectively, along with the package's name.
-.It Fl s Ar srcdir
-.Ar srcdir
-will override the value of
-.Cm @cwd
-during package creation.
-.It Fl S Ar basedir
-.Ar basedir
-will be prefixed to all
-.Cm @cwd
-during package creation.
-.It Fl t , -template Ar template
-Use
-.Ar template
-as the input to
-.Xr mktemp 3 .
-By default, this is the string
-.Pa /tmp/instmp.XXXXXX ,
-but it may be necessary to override it in the situation where
-space in your
-.Pa /tmp
-directory is limited.
-Be sure to leave some number of `X' characters
-for
-.Xr mktemp 3
-to fill in with a unique ID.
-.It Fl X Ar excludefile
-Pass
-.Ar excludefile
-as a
-.Fl exclude-from
-argument to
-.Cm tar
-when creating final package.
-See
-.Cm tar
-man page (or run
-.Cm tar
-with
-.Fl -help
-flag) for further information on using this flag.
-.It Fl D Ar displayfile
-Display the file (by concatenating it to stdout)
-after installing the package.
-Useful for things like
-legal notices on almost-free software, etc.
-.It Fl m Ar mtreefile
-Run
-.Xr mtree 8
-with input from mtreefile before the package is installed.
-Mtree is invoked as
-.Cm mtree
-.Fl u
-.Fl f
-.Ar mtreefile
-.Fl d
-.Fl e
-.Fl p
-.Pa prefix ,
-where
-.Pa prefix
-is the name of the first directory named by a
-.Cm @cwd
-directive.
-.It Fl o , -origin Ar originpath
-Record an
-.Ar originpath ,
-as location of the port from which package has been created in the
-.Fx
-.Em "Ports Collection" .
-It should be in the form
-.Pa MASTERCATEGORY/PORTDIR .
-.It Fl j
-Use
-.Xr bzip2 1
-utility to compress package tarball instead of
-.Xr gzip 1 .
-Please note that this option is a NO-OP if the format of the resulting
-archive is explicitly specified by the recognizable suffix of
-.Ar pkg-filename .
-Currently
-.Nm
-recognizes the following suffixes:
-.Pa .tbz , .tgz, .txz
-and
-.Pa .tar .
-.It Fl y
-Compatibility synonym for
-.Fl j .
-.It Fl z
-Use
-.Xr gzip 1
-utility to compress package tarball.
-.It Fl J
-Use
-.Xr xz 1
-utility to compress package tarball instead of
-.Xr gzip 1 .
-Please note that this option is a NO-OP if the format of the resulting
-archive is explicitly specified by the recognizable suffix of
-.Ar pkg-filename .
-Currently
-.Nm
-recognizes the following suffixes:
-.Pa .tbz , .tgz, .txz
-and
-.Pa .tar .
-.It Fl b , -backup Ar pkg-name
-Create package file from a locally installed package named
-.Ar pkg-name .
-If the
-.Ar pkg-filename
-is not specified, then resulting archive will be created in the
-current directory and named
-.Ar pkg-name
-with an appropriate extraction suffix applied.
-.It Fl R , -recursive
-When creating package file from a locally installed package
-also create package files for all packages required by
-.Ar pkg-name .
-Resulting archive(s) will be created in the current directory
-and named using name of the respective package with appropriate
-extraction suffix applied.
-.It Fl x , -regex
-Use basic regular expressions for
-.Ar pkg-name .
-.It Fl E , -extended
-Use extended (modern) regular expressions for
-.Ar pkg-name .
-.It Fl G , -no-glob
-Use exact matching for
-.Ar pkg-name .
-.It Fl n
-Run in
-.Dq no clobber
-mode.
-If a package tarball exists, the
-.Nm
-utility will not overwrite it.
-This is useful, for example, when multiple packages are saved with
-several consecutive runs of
-.Nm
-with the
-.Fl Rb
-options.
-Saving common dependencies multiple times would do a lot of duplicate
-work in this case.
-The
-.Fl n
-option avoids repackaging common dependencies multiple times.
-.El
-.Sh PACKING LIST DETAILS
-The
-.Dq packing list
-format (see
-.Fl f )
-is fairly simple, being
-nothing more than a single column of filenames to include in the
-package.
-However, since absolute pathnames are generally a bad idea
-for a package that could be installed potentially anywhere, there is
-another method of specifying where things are supposed to go
-and, optionally, what ownership and mode information they should be
-installed with.
-This is done by embedding specialized command sequences
-in the packing list.
-Briefly described, these sequences are:
-.Bl -tag -width indent -compact
-.It Cm @cwd Op Ar directory
-Set the internal directory pointer to point to
-.Ar directory .
-All subsequent filenames will be assumed relative to this directory.
-If no
-.Ar directory
-argument is given, it will set the internal directory pointer to the
-first prefix value.
-Note:
-.Cm @cd
-is also an alias for this command.
-.It Cm @srcdir Ar directory
-Set the internal directory pointer for _creation only_ to
-.Ar directory .
-That is to say that it overrides
-.Cm @cwd
-for package creation but not extraction.
-.It Cm @exec Ar command
-Execute
-.Ar command
-as part of the unpacking process.
-If
-.Ar command
-contains any of the following sequences somewhere in it, they will
-be expanded inline.
-For the following examples, assume that
-.Cm @cwd
-is set to
-.Pa /usr/local
-and the last extracted file was
-.Pa bin/emacs .
-.Bl -tag -width indent -compact
-.It Cm "%F"
-Expands to the last filename extracted (as specified), in the example case
-.Pa bin/emacs
-.It Cm "\&%D"
-Expand to the current directory prefix, as set with
-.Cm @cwd ,
-in the example case
-.Pa /usr/local .
-.It Cm "\&%B"
-Expand to the
-.Dq basename
-of the fully qualified filename, that
-is the current directory prefix, plus the last filespec, minus
-the trailing filename.
-In the example case, that would be
-.Pa /usr/local/bin .
-.It Cm "%f"
-Expand to the
-filename
-part of the fully qualified name, or
-the converse of
-.Cm \&%B ,
-being in the example case,
-.Pa emacs .
-.El
-.It Cm @unexec Ar command
-Execute
-.Ar command
-as part of the deinstallation process.
-Expansion of special
-.Cm %
-sequences is the same as for
-.Cm @exec .
-This command is not executed during the package add, as
-.Cm @exec
-is, but rather when the package is deleted.
-This is useful
-for deleting links and other ancillary files that were created
-as a result of adding the package, but not directly known to
-the package's table of contents (and hence not automatically
-removable).
-The advantage of using
-.Cm @unexec
-over a deinstallation script is that you can use the
-.Dq special sequence expansion
-to get at files regardless of where they have
-been potentially redirected (see
-.Fl p ) .
-.It Cm @mode Ar mode
-Set default permission for all subsequently extracted files to
-.Ar mode .
-Format is the same as that used by the
-.Cm chmod
-command (well, considering that it is later handed off to it, that is
-no surprise).
-Use without an arg to set back to default (extraction)
-permissions.
-.It Cm @option Ar option
-Set internal package options, the only two currently supported ones
-being
-.Ar extract-in-place ,
-which tells the pkg_add command not to extract the package's tarball
-into a staging area but rather directly into the target
-hierarchy (this is typically meant to be used only by distributions
-or other special package types), and
-.Ar preserve ,
-which tells pkg_add to move any existing files out of the way,
-preserving the previous contents (which are also resurrected on
-pkg_delete, so caveat emptor).
-.It Cm @owner Ar user
-Set default ownership for all subsequently extracted files to
-.Ar user .
-Use without an arg to set back to default (extraction)
-ownership.
-.It Cm @group Ar group
-Set default group ownership for all subsequently extracted files to
-.Ar group .
-Use without an arg to set back to default (extraction)
-group ownership.
-.It Cm @comment Ar string
-Imbed a comment in the packing list.
-Useful in
-trying to document some particularly hairy sequence that
-may trip someone up later.
-.It Cm @noinst Ar option Ar file
-Specify that the package would have installed
-.Pa file
-if
-.Pa option
-had been specified at build time.
-The action of
-.Cm @noinst
-is the same that
-.Cm @comment
-(which is doing nothing, it is just additional information).
-.It Cm @ignore
-Used internally to tell extraction to ignore the next file (do not
-copy it anywhere), as it is used for some special purpose.
-.It Cm @ignore_inst
-Similar to
-.Cm @ignore ,
-but the ignoring of the next file is delayed one evaluation cycle.
-This
-makes it possible to use this directive in the
-.Ar packinglist
-file, so you can pack a
-specialized datafile in with a distribution for your install script (or
-something) yet have the installer ignore it.
-.It Cm @name Ar name
-Set the name of the package.
-This is mandatory and is usually
-put at the top.
-This name is potentially different from the name of
-the file it came in, and is used when keeping track of the package
-for later deinstallation.
-Note that
-.Nm
-will derive this field from the package name and add it automatically
-if none is given.
-.It Cm @dirrm Ar name
-Declare directory
-.Pa name
-to be deleted at deinstall time.
-By default, directories created by a
-package installation are not deleted when the package is deinstalled;
-this provides an explicit directory cleanup method.
-This directive
-should appear at the end of the package list.
-If more than one
-.Cm @dirrm
-directives are used, the directories are removed in the order specified.
-The
-.Pa name
-directory will not be removed unless it is empty.
-.It Cm @mtree Ar name
-Declare
-.Pa name
-as an
-.Xr mtree 8
-input file to be used at install time (see
-.Fl m
-above).
-Only the first
-.Cm @mtree
-directive is honored.
-.It Cm @display Ar name
-Declare
-.Pa name
-as the file to be displayed at install time (see
-.Fl D
-above).
-.It Cm @pkgdep Ar pkgname
-Declare a dependency on the
-.Ar pkgname
-package.
-The
-.Ar pkgname
-package must be installed before this package may be
-installed, and this package must be deinstalled before the
-.Ar pkgname
-package is deinstalled.
-Multiple
-.Cm @pkgdep
-directives may be used if the package depends on multiple other packages.
-.It Cm @conflicts Ar pkgcflname
-Declare a conflict with the
-.Ar pkgcflname
-package, as the two packages contain references to the same files,
-and so cannot co-exist on the same system.
-.El
-.Sh ENVIRONMENT
-The environment variable
-.Ev PKG_TMPDIR
-names the directory where
-.Nm
-will attempt to create its temporary files.
-If
-.Ev PKG_TMPDIR
-is not set,
-the directory named by the contents of
-.Ev TMPDIR
-will be used.
-If neither of
-.Ev PKG_TMPDIR
-and
-.Ev TMPDIR
-are set, the builtin defaults are used.
-.Sh FILES
-.Bl -tag -width /usr/tmp -compact
-.It Pa /var/tmp
-Temporary directory if environmental variables
-.Ev PKG_TMPDIR
-and
-.Ev TMPDIR
-are not set.
-.It Pa /tmp
-The next choice if
-.Pa /var/tmp
-does not exist.
-.It Pa /usr/tmp
-The last choice if
-.Pa /tmp
-is unsuitable.
-.It Ev PKG_OLD_NOWARN
-If set
-.Nm
-will not warn about its use in the presence of pkgng databases.
-.El
-.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_info 1 ,
-.Xr pkg_version 1 ,
-.Xr sysconf 3
-.Sh HISTORY
-The
-.Nm
-command first appeared in
-.Fx .
-.Sh AUTHORS
-.An Jordan Hubbard
-.Sh CONTRIBUTORS
-.An John Kohl Aq jtk@rational.com ,
-.An Oliver Eikemeier Aq eik@FreeBSD.org
-.Sh BUGS
-Hard links between files in a distribution must be bracketed by
-.Cm @cwd
-directives in order to be preserved as hard links when the package is
-extracted.
-They additionally must not end up being split between
-.Cm tar
-invocations due to exec argument-space limitations (this depends on the
-value returned by
-.Fn sysconf _SC_ARG_MAX ) .
-.Pp
-Sure to be others.
diff --git a/usr.sbin/pkg_install/create/pl.c b/usr.sbin/pkg_install/create/pl.c
deleted file mode 100644
index 1316eda8212..00000000000
--- a/usr.sbin/pkg_install/create/pl.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Routines for dealing with the packing list.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include "create.h"
-#include <errno.h>
-#include <err.h>
-#include <md5.h>
-
-/* Add an MD5 checksum entry for a file or link */
-void
-add_cksum(Package *pkg, PackingList p, const char *fname)
-{
-    char *cp = NULL, buf[33];
-
-    if (issymlink(fname)) {
-	int len;
-	char lnk[FILENAME_MAX];
-
-	if ((len = readlink(fname, lnk, FILENAME_MAX)) > 0)
-	    cp = MD5Data((unsigned char *)lnk, len, buf);
-    } else if (isfile(fname)) {
-	/* Don't record MD5 checksum for device nodes and such */
-	cp = MD5File(fname, buf);
-    }
-
-    if (cp != NULL) {
-	PackingList tmp = new_plist_entry();
-
-	tmp->name = copy_string(strconcat("MD5:", cp));
-	tmp->type = PLIST_COMMENT;
-	tmp->next = p->next;
-	tmp->prev = p;
-	p->next = tmp;
-	if (pkg->tail == p)
-	    pkg->tail = tmp;
-    }
-}
-
-/* Check a list for files that require preconversion */
-void
-check_list(const char *home, Package *pkg)
-{
-    const char *where = home;
-    const char *there = NULL;
-    char name[FILENAME_MAX];
-    char *prefix = NULL;
-    PackingList p;
-
-    for (p = pkg->head; p != NULL; p = p->next)
-	switch (p->type) {
-	case PLIST_CWD:
-	    if (!prefix)
-		prefix = p->name;
-	    where = (p->name == NULL) ? prefix : p->name;
-	    break;
-
-	case PLIST_IGNORE:
-	    p = p->next;
-	    break;
-
-	case PLIST_SRC:
-	    there = p->name;
-	    break;
-
-	case PLIST_FILE:
-	    if (there)
-		snprintf(name, sizeof(name), "%s/%s", there, p->name);
-	    else
-		snprintf(name, sizeof(name), "%s%s/%s",
-		    BaseDir && where && where[0] == '/' ? BaseDir : "", where, p->name);
-
-	    add_cksum(pkg, p, name);
-	    break;
-	default:
-	    break;
-	}
-}
-
-static int
-trylink(const char *from, const char *to)
-{
-    if (link(from, to) == 0)
-	return 0;
-    if (errno == ENOENT) {
-	/* try making the container directory */
-	char *cp = strrchr(to, '/');
-	if (cp)
-	    vsystem("/bin/mkdir -p %.*s", cp - to,
-		    to);
-	return link(from, to);
-    }
-    return -1;
-}
-
-#define STARTSTRING "/usr/bin/tar cf -"
-#define TOOBIG(str) (int)strlen(str) + 6 + (int)strlen(home) + where_count > maxargs
-#define PUSHOUT() /* push out string */ \
-	if (where_count > (int)sizeof(STARTSTRING)-1) { \
-		    strcat(where_args, "|/usr/bin/tar xpf -"); \
-		    if (system(where_args)) { \
-			cleanup(0); \
-			errx(2, "%s: can't invoke tar pipeline", __func__); \
-		    } \
-		    memset(where_args, 0, maxargs); \
- 		    last_chdir = NULL; \
-		    strcpy(where_args, STARTSTRING); \
-		    where_count = sizeof(STARTSTRING)-1; \
-	}
-
-/*
- * Copy unmarked files in packing list to playpen - marked files
- * have already been copied in an earlier pass through the list.
- */
-void
-copy_plist(const char *home, Package *plist)
-{
-    PackingList p = plist->head;
-    const char *where = home;
-    const char *there = NULL, *mythere;
-    char *where_args, *prefix = NULL;
-    const char *last_chdir, *root = "/";
-    long maxargs;
-    int where_count = 0, add_count;
-    struct stat stb;
-    dev_t curdir;
-
-    maxargs = sysconf(_SC_ARG_MAX);
-    maxargs -= 64;			/*
-					 * Some slop for the tar cmd text,
-					 * and sh -c
-					 */
-    where_args = malloc(maxargs);
-    if (!where_args) {
-	cleanup(0);
-	errx(2, "%s: can't get argument list space", __func__);
-    }
-
-    memset(where_args, 0, maxargs);
-    strcpy(where_args, STARTSTRING);
-    where_count = sizeof(STARTSTRING)-1;
-    last_chdir = 0;
-
-    if (stat(".", &stb) == 0)
-	curdir = stb.st_dev;
-    else
-	curdir = (dev_t) -1;		/*
-					 * It's ok if this is a valid dev_t;
-					 * this is just a hint for an
-					 * optimization.
-					 */
-
-    while (p) {
-	if (p->type == PLIST_CWD)
-	{
-	    if (!prefix)
-		prefix = p->name;
-	    where = p->name == NULL ? prefix : p->name;
-	}
-	else if (p->type == PLIST_SRC)
-	    there = p->name;
-	else if (p->type == PLIST_IGNORE)
-	    p = p->next;
-	else if (p->type == PLIST_FILE && !p->marked) {
-	    char fn[FILENAME_MAX];
-
-
-	    /* First, look for it in the "home" dir */
-	    sprintf(fn, "%s/%s", home, p->name);
-	    if (fexists(fn)) {
-		if (lstat(fn, &stb) == 0 && stb.st_dev == curdir &&
-		    S_ISREG(stb.st_mode)) {
-		    /*
-		     * If we can link it to the playpen, that avoids a copy
-		     * and saves time.
-		     */
-		    if (p->name[0] != '/') {
-			/*
-			 * Don't link abspn stuff--it doesn't come from
-			 * local dir!
-			 */
-			if (trylink(fn, p->name) == 0) {
-			    p = p->next;
-			    continue;
-			}
-		    }
-		}
-		if (TOOBIG(fn)) {
-		    PUSHOUT();
-		}
-		if (p->name[0] == '/') {
-		    add_count = snprintf(&where_args[where_count],
-					 maxargs - where_count,
-					 " %s %s",
-					 last_chdir == root ? "" : "-C /",
-					 p->name);
-		    last_chdir = root;
-		} else {
-		    add_count = snprintf(&where_args[where_count],
-					 maxargs - where_count,
-					 " %s%s %s",
-					 last_chdir == home ? "" : "-C ",
-					 last_chdir == home ? "" : home,
-					 p->name);
-		    last_chdir = home;
-		}
-		if (add_count < 0 || add_count >= maxargs - where_count) {
-		    cleanup(0);
-		    errx(2, "%s: oops, miscounted strings!", __func__);
-		}
-		where_count += add_count;
-	    }
-	    /*
-	     * Otherwise, try along the actual extraction path..
-	     */
-	    else {
-		if (p->name[0] == '/')
-		    mythere = root;
-		else mythere = there;
-		if (mythere)
-		    snprintf(fn, sizeof(fn), "%s/%s", mythere, p->name);
-		else
-		    snprintf(fn, sizeof(fn), "%s%s/%s",
-			BaseDir && where && where[0] == '/' ? BaseDir : "", where, p->name);
-		if (lstat(fn, &stb) == 0 && stb.st_dev == curdir &&
-		    S_ISREG(stb.st_mode)) {
-		    /*
-		     * If we can link it to the playpen, that avoids a copy
-		     * and saves time.
-		     */
-		    if (trylink(fn, p->name) == 0) {
-			p = p->next;
-			continue;
-		    }
-		}
-		if (TOOBIG(p->name)) {
-		    PUSHOUT();
-		}
-		if (last_chdir == (mythere ? mythere : where))
-		    add_count = snprintf(&where_args[where_count],
-					 maxargs - where_count,
-					 " %s", p->name);
-		else
-		    add_count = snprintf(&where_args[where_count],
-					 maxargs - where_count,
-					 " -C %s %s",
-					 mythere ? mythere : where,
-					 p->name);
-		if (add_count < 0 || add_count >= maxargs - where_count) {
-		    cleanup(0);
-		    errx(2, "%s: oops, miscounted strings!", __func__);
-		}
-		where_count += add_count;
-		last_chdir = (mythere ? mythere : where);
-	    }
-	}
-	p = p->next;
-    }
-    PUSHOUT();
-    free(where_args);
-}
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
deleted file mode 100644
index c9a0fdebea2..00000000000
--- a/usr.sbin/pkg_install/delete/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PROG=	pkg_delete
-SRCS=	main.c perform.c
-
-CFLAGS+= -I${.CURDIR}/../lib
-
-WFORMAT?=	1
-
-DPADD=	${LIBINSTALL} ${LIBMD}
-LDADD=	${LIBINSTALL} -lmd
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/delete/delete.h b/usr.sbin/pkg_install/delete/delete.h
deleted file mode 100644
index f2f405704d5..00000000000
--- a/usr.sbin/pkg_install/delete/delete.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* $FreeBSD$ */
-
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Include and define various things wanted by the delete command.
- *
- */
-
-#ifndef _INST_DELETE_H_INCLUDE
-#define _INST_DELETE_H_INCLUDE
-
-extern char	*Prefix;
-extern Boolean	CleanDirs;
-extern Boolean	Interactive;
-extern Boolean	NoDeInstall;
-extern Boolean	Recursive;
-extern char	*Directory;
-extern char	*PkgName;
-extern match_t	MatchType;
-
-#endif	/* _INST_DELETE_H_INCLUDE */
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
deleted file mode 100644
index 0b97ddde273..00000000000
--- a/usr.sbin/pkg_install/delete/main.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- *
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * This is the delete module.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <getopt.h>
-#include <err.h>
-
-#include "lib.h"
-#include "delete.h"
-
-char	*Prefix		= NULL;
-Boolean	CleanDirs	= FALSE;
-Boolean	Interactive	= FALSE;
-Boolean	NoDeInstall	= FALSE;
-Boolean	Recursive	= FALSE;
-match_t	MatchType	= MATCH_GLOB;
-
-static void usage(void);
-
-static char opts[] = "adDfGhinp:rvxX";
-static struct option longopts[] = {
-	{ "all",	no_argument,		NULL,		'a' },
-	{ "clean-dirs",	no_argument,		NULL,		'd' },
-	{ "dry-run",	no_argument,		NULL,		'n' },
-	{ "extended",	no_argument,		NULL,		'X' },
-	{ "force",	no_argument,		NULL,		'f' },
-	{ "help",	no_argument,		NULL,		'h' },
-	{ "interactive",no_argument,		NULL,		'i' },
-	{ "prefix",	required_argument,	NULL,		'p' },
-	{ "recursive",	no_argument,		NULL,		'r' },
-	{ "regex",	no_argument,		NULL,		'x' },
-	{ "no-glob",	no_argument,		NULL,		'G' },
-	{ "no-script",	no_argument,		NULL,		'D' },
-	{ "no-scripts",	no_argument,		NULL,		'D' },
-	{ "verbose",	no_argument,		NULL,		'v' },
-	{ NULL,		0,			NULL,		0 },
-};
-
-int
-main(int argc, char **argv)
-{
-    int ch, error;
-    char **pkgs, **start;
-    char *pkgs_split;
-    const char *tmp;
-    struct stat stat_s;
-
-    warnpkgng();
-    pkgs = start = argv;
-    while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1)
-	switch(ch) {
-	case 'v':
-	    Verbose++;
-	    break;
-
-	case 'f':
-	    Force = TRUE;
-	    break;
-
-	case 'p':
-	    Prefix = optarg;
-	    break;
-
-	case 'D':
-	    NoDeInstall = TRUE;
-	    break;
-
-	case 'd':
-	    CleanDirs = TRUE;
-	    break;
-
-	case 'n':
-	    Fake = TRUE;
-	    Verbose = TRUE;
-	    break;
-
-	case 'a':
-	    MatchType = MATCH_ALL;
-	    break;
-
-	case 'G':
-	    MatchType = MATCH_EXACT;
-	    break;
-
-	case 'x':
-	    MatchType = MATCH_REGEX;
-	    break;
-
-	case 'X':
-	    MatchType = MATCH_EREGEX;
-	    break;
-
-	case 'i':
-	    Interactive = TRUE;
-	    break;
-
-	case 'r':
-	    Recursive = TRUE;
-	    break;
-
-	case 'h':
-	default:
-	    usage();
-	    break;
-	}
-
-    argc -= optind;
-    argv += optind;
-
-    /* Get all the remaining package names, if any */
-    while (*argv) {
-	/* Don't try to apply heuristics if arguments are regexs */
-	if (MatchType != MATCH_REGEX)
-	    while ((pkgs_split = strrchr(*argv, (int)'/')) != NULL) {
-		*pkgs_split++ = '\0';
-		/*
-		 * If character after the '/' is alphanumeric, then we've found the
-		 * package name.  Otherwise we've come across a trailing '/' and
-		 * need to continue our quest.
-		 */
-		if (isalnum(*pkgs_split) || ((MatchType == MATCH_GLOB) && \
-		    strpbrk(pkgs_split, "*?[]") != NULL)) {
-		    *argv = pkgs_split;
-		    break;
-		}
-	    }
-	*pkgs++ = *argv++;
-    }
-
-    /* If no packages, yelp */
-    if (pkgs == start && MatchType != MATCH_ALL)
-	warnx("missing package name(s)"), usage();
-    *pkgs = NULL;
-    tmp = LOG_DIR;
-    (void) stat(tmp, &stat_s);
-    if (!Fake && getuid() && geteuid() != stat_s.st_uid) {
-	if (!Force)
-	    errx(1, "you do not own %s, use -f to force", tmp);
-	else
-	    warnx("you do not own %s (proceeding anyways)", tmp);
-    }
-    if ((error = pkg_perform(start)) != 0) {
-	if (Verbose)
-	    warnx("%d package deletion(s) failed", error);
-	return error;
-    }
-    else
-	return 0;
-}
-
-static void
-usage(void)
-{
-    fprintf(stderr, "%s\n%s\n",
-	"usage: pkg_delete [-dDfGinrvxX] [-p prefix] pkg-name ...",
-	"       pkg_delete -a [flags]");
-    exit(1);
-}
diff --git a/usr.sbin/pkg_install/delete/perform.c b/usr.sbin/pkg_install/delete/perform.c
deleted file mode 100644
index ea00055a316..00000000000
--- a/usr.sbin/pkg_install/delete/perform.c
+++ /dev/null
@@ -1,425 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * This is the main body of the delete module.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <err.h>
-#include "lib.h"
-#include "delete.h"
-
-static int pkg_do(char *);
-static void sanity_check(char *);
-static void undepend(char *, char *);
-static char LogDir[FILENAME_MAX];
-
-
-int
-pkg_perform(char **pkgs)
-{
-    char **matched, **rb, **rbtmp;
-    int errcode, i, j;
-    int err_cnt = 0;
-    struct reqr_by_entry *rb_entry;
-    struct reqr_by_head *rb_list;
-
-    if (MatchType != MATCH_EXACT) {
-	matched = matchinstalled(MatchType, pkgs, &errcode);
-	if (errcode != 0)
-	    return 1;
-	    /* Not reached */
-
-	/*
-	 * Copy matched[] into pkgs[], because we'll need to use
-	 * matchinstalled() later on.
-	 */
-	if (matched != NULL) {
-	    pkgs = NULL;
-	    for (i = 0; matched[i] != NULL; i++) {
-		pkgs = realloc(pkgs, sizeof(*pkgs) * (i + 2));
-		pkgs[i] = strdup(matched[i]);
-	    }
-	    pkgs[i] = NULL;
-	}
-	else switch (MatchType) {
-	    case MATCH_GLOB:
-		break;
-	    case MATCH_ALL:
-		warnx("no packages installed");
-		return 0;
-	    case MATCH_EREGEX:
-	    case MATCH_REGEX:
-		warnx("no packages match pattern(s)");
-		return 1;
-	    default:
-		break;
-	}
-    }
-
-    err_cnt += sortdeps(pkgs);
-    for (i = 0; pkgs[i]; i++) {
-	if (Recursive == TRUE) {
-	    errcode = requiredby(pkgs[i], &rb_list, FALSE, TRUE);
-	    if (errcode < 0) {
-		err_cnt++;
-	    } else if (errcode > 0) {
-		/*
-		 * Copy values from the rb_list queue into argv-like NULL
-		 * terminated list because requiredby() uses some static
-		 * storage, while pkg_do() below will call this function,
-		 * thus blowing our rb_list away.
-		 */
-		rbtmp = rb = alloca((errcode + 1) * sizeof(*rb));
-		if (rb == NULL) {
-		    warnx("%s(): alloca() failed", __func__);
-		    err_cnt++;
-		    continue;
-		}
-		STAILQ_FOREACH(rb_entry, rb_list, link) {
-		    *rbtmp = alloca(strlen(rb_entry->pkgname) + 1);
-		    if (*rbtmp == NULL) {
-			warnx("%s(): alloca() failed", __func__);
-			err_cnt++;
-			continue;
-		    }
-		    strcpy(*rbtmp, rb_entry->pkgname);
-		    rbtmp++;
-		}
-		*rbtmp = NULL;
-
-		err_cnt += sortdeps(rb);
-		for (j = 0; rb[j]; j++)
-		    err_cnt += pkg_do(rb[j]);
-	    }
-	}
-	err_cnt += pkg_do(pkgs[i]);
-    }
-
-    return err_cnt;
-}
-
-static Package Plist;
-
-/* This is seriously ugly code following.  Written very fast! */
-static int
-pkg_do(char *pkg)
-{
-    FILE *cfile;
-    char *deporigin, **deporigins = NULL, **depnames = NULL, ***depmatches, home[FILENAME_MAX];
-    PackingList p;
-    int i, len;
-    int isinstalled;
-    /* support for separate pre/post install scripts */
-    int new_m = 0, dep_count = 0;
-    const char *pre_script = DEINSTALL_FNAME;
-    const char *post_script, *pre_arg, *post_arg;
-    struct reqr_by_entry *rb_entry;
-    struct reqr_by_head *rb_list;
-    int fd;
-    struct stat sb;
-
-    if (!pkg || !(len = strlen(pkg)))
-	return 1;
-    if (pkg[len - 1] == '/')
-	pkg[len - 1] = '\0';
-
-    /* Reset some state */
-    if (Plist.head)
-	free_plist(&Plist);
-
-    sprintf(LogDir, "%s/%s", LOG_DIR, pkg);
-
-    isinstalled = isinstalledpkg(pkg);
-    if (isinstalled == 0) {
-	warnx("no such package '%s' installed", pkg);
-	return 1;
-    } else if (isinstalled < 0) {
-	warnx("the package info for package '%s' is corrupt%s",
-	      pkg, Force ? " (but I'll delete it anyway)" : " (use -f to force removal)");
-	if (!Force)
-	    return 1;
-    	if (!Fake) {
-	    if (vsystem("%s -rf %s", REMOVE_CMD, LogDir)) {
-    		warnx("couldn't remove log entry in %s, deinstall failed", LogDir);
-	    } else {
-    		warnx("couldn't completely deinstall package '%s',\n"
-		      "only the log entry in %s was removed", pkg, LogDir);
-	    }
-	}
-	return 0;
-    }
-
-    if (!getcwd(home, FILENAME_MAX)) {
-	cleanup(0);
-	errx(2, "%s: unable to get current working directory!", __func__);
-    }
-
-    if (chdir(LogDir) == FAIL) {
-	warnx("unable to change directory to %s! deinstall failed", LogDir);
-	return 1;
-    }
-
-    if (Interactive == TRUE) {
-	int first, ch;
-
-	(void)fprintf(stderr, "delete %s? ", pkg);
-	(void)fflush(stderr);
-	first = ch = getchar();
-	while (ch != '\n' && ch != EOF)
-	    ch = getchar();
-	if (first != 'y' && first != 'Y')
-	    return 0;
-	    /* Not reached */
-    }
-
-    if (requiredby(pkg, &rb_list, FALSE, TRUE) < 0)
-	return 1;
-    if (!STAILQ_EMPTY(rb_list)) {
-	warnx("package '%s' is required by these other packages\n"
-	      "and may not be deinstalled%s:",
-	      pkg, Force ? " (but I'll delete it anyway)" : "");
-	STAILQ_FOREACH(rb_entry, rb_list, link)
-	    fprintf(stderr, "%s\n", rb_entry->pkgname);
-	if (!Force)
-	    return 1;
-    }
-
-    sanity_check(LogDir);
-    cfile = fopen(CONTENTS_FNAME, "r");
-
-    if (!cfile) {
-	warnx("unable to open '%s' file", CONTENTS_FNAME);
-	return 1;
-    }
-
-    /* If we have a prefix, add it now */
-    if (Prefix)
-	add_plist(&Plist, PLIST_CWD, Prefix);
-    read_plist(&Plist, cfile);
-    fclose(cfile);
-    p = find_plist(&Plist, PLIST_CWD);
-
-    if (!p) {
-	warnx("package '%s' doesn't have a prefix", pkg);
-	return 1;
-    }
-
-    setenv(PKG_PREFIX_VNAME, p->name, 1);
-
-    if ((fd = open(REQUIRE_FNAME, O_RDWR)) != -1) {
-	fstat(fd, &sb);
-	fchmod(fd, sb.st_mode | S_IXALL);       /* be sure, chmod a+x */
-	close(fd);
-	if (Verbose)
-	    printf("Executing 'require' script.\n");
-	if (vsystem("./%s %s DEINSTALL", REQUIRE_FNAME, pkg)) {
-	    warnx("package %s fails requirements %s", pkg,
-		   Force ? "" : "- not deleted");
-	    if (!Force)
-		return 1;
-	}
-    }
-
-    /*
-     * Test whether to use the old method of passing tokens to deinstallation
-     * scripts, and set appropriate variables..
-     */
-
-    if (fexists(POST_DEINSTALL_FNAME)) {
-	new_m = 1;
-	post_script = POST_DEINSTALL_FNAME;
-	pre_arg = post_arg = "";
-    } else if (fexists(DEINSTALL_FNAME)) {
-	post_script = DEINSTALL_FNAME;
-	pre_arg = "DEINSTALL";
-	post_arg = "POST-DEINSTALL";
-    } else {
-	post_script = pre_arg = post_arg = NULL;
-    }
-
-    if (!NoDeInstall && pre_script != NULL && (fd = open(pre_script, O_RDWR)) != -1) {
-	if (Fake)
-	    printf("Would execute de-install script at this point.\n");
-	else {
-	    fstat(fd, &sb);
-	    fchmod(fd, sb.st_mode | S_IXALL);       /* be sure, chmod a+x */
-	    close(fd);
-	    if (vsystem("./%s %s %s", pre_script, pkg, pre_arg)) {
-		warnx("deinstall script returned error status");
-		if (!Force)
-		    return 1;
-	    }
-	}
-    }
-
-    for (p = Plist.head; p ; p = p->next) {
-	if (p->type != PLIST_PKGDEP)
-	    continue;
-	deporigin = (p->next != NULL && p->next->type == PLIST_DEPORIGIN) ? p->next->name :
-							 NULL;
-	if (Verbose) {
-	    printf("Trying to remove dependency on package '%s'", p->name);
-	    if (deporigin != NULL)
-		printf(" with '%s' origin", deporigin);
-	    printf(".\n");
-	}
-	if (!Fake) {
-	    if (deporigin) {
-		deporigins = realloc(deporigins, (dep_count + 2) * sizeof(*deporigins));
-		depnames = realloc(depnames, (dep_count + 1) * sizeof(*depnames));
-		deporigins[dep_count] = deporigin;
-		deporigins[dep_count + 1] = NULL;
-		depnames[dep_count] = p->name;
-		dep_count++;
-	    } else {
-		undepend(p->name, pkg);
-	    }
-	}
-    }
-
-    if (dep_count > 0) {
-	/* Undepend all the dependencies at once */
-	depmatches = matchallbyorigin((const char **)deporigins, NULL);
-	free(deporigins);
-	if (depmatches) {
-	    for (i = 0; i < dep_count; i++) {
-		if (depmatches[i]) {
-		    char **tmp = depmatches[i];
-		    int j;
-		    for (j = 0; tmp[j] != NULL; j++)
-			undepend(tmp[j], pkg);
-		} else if (depnames[i]) {
-		    undepend(depnames[i], pkg);
-		}
-	    }
-	}
-    }
-
-    if (chdir(home) == FAIL) {
-	cleanup(0);
-	errx(2, "%s: unable to return to working directory %s!", __func__,
-	    home);
-    }
-
-    /*
-     * Some packages aren't packed right, so we need to just ignore
-     * delete_package()'s status.  Ugh! :-(
-     */
-    if (delete_package(FALSE, CleanDirs, &Plist) == FAIL)
-	warnx(
-	"couldn't entirely delete package `%s'\n"
-	"(perhaps the packing list is incorrectly specified?)", pkg);
-
-    if (chdir(LogDir) == FAIL) {
- 	warnx("unable to change directory to %s! deinstall failed", LogDir);
- 	return 1;
-    }
-
-    if (!NoDeInstall && post_script != NULL && (fd = open(post_script, O_RDWR)) != -1) {
- 	if (Fake)
- 	    printf("Would execute post-deinstall script at this point.\n");
- 	else {
-	    fstat(fd, &sb);
-	    fchmod(fd, sb.st_mode | S_IXALL);       /* be sure, chmod a+x */
-	    close(fd);
- 	    if (vsystem("./%s %s %s", post_script, pkg, post_arg)) {
- 		warnx("post-deinstall script returned error status");
- 		if (!Force)
- 		    return 1;
- 	    }
- 	}
-    }
-
-    if (chdir(home) == FAIL) {
- 	cleanup(0);
-	errx(2, "%s: unable to return to working directory %s!", __func__,
-	    home);
-    }
-
-    if (!Fake) {
-	if (vsystem("%s -r%c %s", REMOVE_CMD, Force ? 'f' : ' ', LogDir)) {
-	    warnx("couldn't remove log entry in %s, deinstall failed", LogDir);
-	    if (!Force)
-		return 1;
-	}
-    }
-    return 0;
-}
-
-static void
-sanity_check(char *pkg)
-{
-    if (!fexists(CONTENTS_FNAME)) {
-	cleanup(0);
-	errx(2, "%s: installed package %s has no %s file!", __func__,
-	    pkg, CONTENTS_FNAME);
-    }
-}
-
-void
-cleanup(int sig)
-{
-    if (sig)
-	exit(1);
-}
-
-static void
-undepend(char *p, char *pkgname)
-{
-    char fname[FILENAME_MAX], ftmp[FILENAME_MAX];
-    FILE *fpwr;
-    int s;
-    struct reqr_by_entry *rb_entry;
-    struct reqr_by_head *rb_list;
-
-
-    if (requiredby(p, &rb_list, Verbose, FALSE) <= 0)
-	return;
-    snprintf(fname, sizeof(fname), "%s/%s/%s", LOG_DIR, p, REQUIRED_BY_FNAME);
-    snprintf(ftmp, sizeof(ftmp), "%s.XXXXXX", fname);
-    s = mkstemp(ftmp);
-    if (s == -1) {
-	warnx("couldn't open temp file '%s'", ftmp);
-	return;
-    }
-    fpwr = fdopen(s, "w");
-    if (fpwr == NULL) {
-	close(s);
-	warnx("couldn't fdopen temp file '%s'", ftmp);
-	goto cleanexit;
-    }
-    STAILQ_FOREACH(rb_entry, rb_list, link)
-	if (strcmp(rb_entry->pkgname, pkgname))		/* no match */
-	    fputs(rb_entry->pkgname, fpwr), putc('\n', fpwr);
-    if (fchmod(s, 0644) == FAIL) {
-	warnx("error changing permission of temp file '%s'", ftmp);
-	fclose(fpwr);
-	goto cleanexit;
-    }
-    if (fclose(fpwr) == EOF) {
-	warnx("error closing temp file '%s'", ftmp);
-	goto cleanexit;
-    }
-    if (rename(ftmp, fname) == -1)
-	warnx("error renaming '%s' to '%s'", ftmp, fname);
-cleanexit:
-    remove(ftmp);
-    return;
-}
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
deleted file mode 100644
index a07b1b60f4c..00000000000
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ /dev/null
@@ -1,297 +0,0 @@
-.\"
-.\" FreeBSD install - a package for the installation and maintenance
-.\" of non-core utilities.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" Jordan K. Hubbard
-.\"
-.\"
-.\"     @(#)pkg_delete.1
-.\" $FreeBSD$
-.\"
-.Dd November 9, 2012
-.Dt PKG_DELETE 1
-.Os
-.Sh NAME
-.Nm pkg_delete
-.Nd a utility for deleting previously installed software package distributions
-.Sh SYNOPSIS
-.Nm
-.Op Fl dDfGinrvxX
-.Op Fl p Ar prefix
-.Ar pkg-name ...
-.Nm
-.Fl a
-.Op Ar flags
-.Sh DESCRIPTION
-The
-.Nm
-command is used to delete packages that have been previously installed
-with the
-.Xr pkg_add 1
-command.
-.Sh WARNING
-.Bf -emphasis
-Since the
-.Nm
-command may execute scripts or programs provided by a package file,
-your system may be susceptible to
-.Dq Em trojan horses
-or other subtle
-attacks from miscreants who create dangerous package files.
-.Pp
-You are advised to verify the competence and identity of those who
-provide installable package files.
-For extra protection, examine all
-the package control files in the package record directory
-.Pa ( /var/db/pkg/<pkg-name>/ ) .
-Pay particular attention to any +INSTALL, +POST-INSTALL, +DEINSTALL,
-+POST-DEINSTALL, +REQUIRE or +MTREE_DIRS files, and inspect the +CONTENTS
-file for
-.Cm @cwd ,
-.Cm @mode
-(check for setuid),
-.Cm @dirrm ,
-.Cm @exec ,
-and
-.Cm @unexec
-directives, and/or use the
-.Xr pkg_info 1
-command to examine the installed package control files.
-.Ef
-.Sh OPTIONS
-The following command line options are supported:
-.Bl -tag -width indent
-.It Ar pkg-name ...
-The named packages are deinstalled.
-.It Fl a , -all
-Unconditionally delete all currently installed packages.
-.It Fl i , -interactive
-Request confirmation before attempting to delete each package,
-regardless whether or not the standard input device is a
-terminal.
-.It Fl v , -verbose
-Turn on verbose output.
-.It Fl D , -no-script , -no-scripts
-If a deinstallation script exists for a given package, do not execute it.
-.It Fl n , -dry-run
-Do not actually deinstall a package, just report the steps that
-would be taken if it were.
-.It Fl p , -prefix Ar prefix
-Set
-.Ar prefix
-as the directory in which to delete files from any installed packages
-which do not explicitly set theirs.
-For most packages, the prefix will
-be set automatically to the installed location by
-.Xr pkg_add 1 .
-.It Fl d , -clean-dirs
-Remove empty directories created by file cleanup.
-By default, only
-files/directories explicitly listed in a package's contents (either as
-normal files/directories or with the
-.Cm @dirrm
-directive) will be removed at deinstallation time.
-This option tells
-.Nm
-to also remove any directories that were emptied as a result of removing
-the package.
-.It Fl f , -force
-Force removal of the package, even if a dependency is recorded or the
-deinstall or require script fails.
-.It Fl G , -no-glob
-Do not try to expand shell glob patterns in the
-.Ar pkg-name
-when selecting packages to be deleted (by default
-.Nm
-automatically expands shell glob patterns in the
-.Ar pkg-name ) .
-.It Fl x , -regex
-Treat the
-.Ar pkg-name
-as a regular expression and delete all packages whose names match
-that regular expression.
-Multiple regular expressions could be
-provided, in that case
-.Nm
-deletes all packages that match at least one
-regular expression from the list.
-.It Fl X , -extended
-Like
-.Fl x ,
-but treats the
-.Ar pkg-name
-as an extended regular expression.
-.It Fl r , -recursive
-Recursive removal.
-In addition to specified packages, delete all
-packages that depend on those packages as well.
-.El
-.Sh TECHNICAL DETAILS
-The
-.Nm
-utility
-does pretty much what it says.
-It examines installed package records in
-.Pa /var/db/pkg/<pkg-name> ,
-deletes the package contents, and finally removes the package records.
-If the environment variable
-.Ev PKG_DBDIR
-is set, this overrides the
-.Pa /var/db/pkg/
-path shown above.
-.Pp
-If a package is required by other installed packages,
-.Nm
-will list those dependent packages and refuse to delete the package
-(unless the
-.Fl f
-option is given).
-.Pp
-If the package contains a
-.Ar require
-file (see
-.Xr pkg_create 1 ) ,
-then this is executed first as
-.Bd -ragged -offset indent -compact
-.Cm require
-.Ar <pkg-name>
-.Ar DEINSTALL
-.Ed
-(where
-.Ar pkg-name
-is the name of the package in question and
-.Ar DEINSTALL
-is a keyword denoting that this is a deinstallation)
-to see whether or not deinstallation should continue.
-A non-zero exit
-status means no, unless the
-.Fl f
-option is specified.
-.Pp
-If a
-.Cm deinstall
-script exists for the package, it is executed before any files are removed.
-It is this script's responsibility to clean up any additional messy details
-around the package's installation, since all
-.Nm
-knows how to do is delete the files created in the original distribution.
-The
-.Nm deinstall
-script is called as:
-.Bd -ragged -offset indent -compact
-.Cm script
-.Ar <pkg-name>
-.Ar DEINSTALL
-.Ed
-where
-.Ar pkg-name
-is the name of the package in question and
-.Ar DEINSTALL
-is a keyword denoting this as the pre-deinstallation phase.
-.Pp
-.Sy Note :
-The
-.Ar DEINSTALL
-keyword will not appear if separate scripts for deinstall and post-deinstall
-are given during package creation time (using the
-.Fl k
-and
-.Fl K
-flags to
-.Xr pkg_create 1 ) .
-.Pp
-If a
-.Cm post-deinstall
-script exists for the package, it is executed
-.Cm after
-all files are removed.
-It is this script's responsibility to clean up any
-additional messy details around the package's installation, and leave the
-system (hopefully) in the same state that it was prior to the installation
-of the package.
-.Pp
-The
-.Nm post-deinstall
-script is called as:
-.Bd -ragged -offset indent -compact
-.Cm script
-.Ar <pkg-name>
-.Ar POST-DEINSTALL
-.Ed
-where
-.Ar pkg-name
-is the name of the package in question and
-.Ar POST-DEINSTALL
-is a keyword denoting this as the post-deinstallation phase.
-.Pp
-.Sy Note :
-The
-.Ar POST-DEINSTALL
-keyword will not appear if separate scripts for deinstall and post-deinstall
-are given during package creation time (using the
-.Fl k
-and
-.Fl K
-flags to
-.Xr pkg_create 1 ) .
-.Pp
-Reasoning behind passing keywords such as
-.Ar DEINSTALL
-and
-.Ar POST-DEINSTALL
-is that it lets you potentially write only one program/script that handles
-all aspects of installation and deletion.
-.Pp
-But experience has proved that this is a lot more difficult to maintain and
-is not as advantageous as having separate scripts that handle each aspect of
-installation and deinstallation.
-.Pp
-All scripts are called with the environment variable
-.Ev PKG_PREFIX
-set to the installation prefix (see the
-.Fl p
-option above).
-This allows a package author to write a script
-that reliably performs some action on the directory where the package
-is installed, even if the user might have changed it by specifying the
-.Fl p
-option when running
-.Nm
-or
-.Cm pkg_add .
-.Sh ENVIRONMENT
-The environment variable
-.Ev PKG_DBDIR
-specifies an alternative location for the installed package database.
-.Sh FILES
-.Bl -tag -width /var/db/pkg -compact
-.It Pa /var/db/pkg
-Default location of the installed package database.
-.It Ev PKG_OLD_NOWARN
-If set
-.Nm
-will not warn about its use in the presence of pkgng databases.
-.El
-.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_create 1 ,
-.Xr pkg_info 1 ,
-.Xr pkg_version 1 ,
-.Xr mktemp 3 ,
-.Xr mtree 8
-.Sh AUTHORS
-.An Jordan Hubbard
-.Sh CONTRIBUTORS
-.An John Kohl Aq jtk@rational.com ,
-.An Oliver Eikemeier Aq eik@FreeBSD.org
-.Sh BUGS
-Sure to be some.
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
deleted file mode 100644
index 485cb226321..00000000000
--- a/usr.sbin/pkg_install/info/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PROG=	pkg_info
-SRCS=	main.c perform.c show.c
-
-CFLAGS+= -I${.CURDIR}/../lib
-
-WFORMAT?=	1
-
-DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
-LDADD=	${LIBINSTALL} -lfetch -lmd
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/info/info.h b/usr.sbin/pkg_install/info/info.h
deleted file mode 100644
index 6569b5f30e4..00000000000
--- a/usr.sbin/pkg_install/info/info.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/* $FreeBSD$ */
-
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 23 August 1993
- *
- * Include and define various things wanted by the info command.
- *
- */
-
-#ifndef _INST_INFO_H_INCLUDE
-#define _INST_INFO_H_INCLUDE
-
-#include <sys/queue.h>
-
-#ifndef MAXINDEXSIZE
-#define MAXINDEXSIZE 59
-#endif
-
-#ifndef MAXNAMESIZE
-#define MAXNAMESIZE  20
-#endif
-
-#define SHOW_COMMENT	0x00001
-#define SHOW_DESC	0x00002
-#define SHOW_PLIST	0x00004
-#define SHOW_INSTALL	0x00008
-#define SHOW_DEINSTALL	0x00010
-#define SHOW_REQUIRE	0x00020
-#define SHOW_PREFIX	0x00040
-#define SHOW_INDEX	0x00080
-#define SHOW_FILES	0x00100
-#define SHOW_DISPLAY	0x00200
-#define SHOW_REQBY	0x00400
-#define SHOW_MTREE	0x00800
-#define SHOW_SIZE	0x01000
-#define SHOW_ORIGIN	0x02000
-#define SHOW_CKSUM	0x04000
-#define SHOW_FMTREV	0x08000
-#define SHOW_PTREV	0x10000
-#define SHOW_DEPEND	0x20000
-#define SHOW_PKGNAME	0x40000
-
-struct which_entry {
-    TAILQ_ENTRY(which_entry) next;
-    char file[PATH_MAX];
-    char package[PATH_MAX];
-    Boolean skip;
-};
-TAILQ_HEAD(which_head, which_entry);
-
-extern int Flags;
-extern Boolean QUIET;
-extern Boolean UseBlkSz;
-extern Boolean KeepPackage;
-extern char *InfoPrefix;
-extern char PlayPen[];
-extern char *CheckPkg;
-extern char *LookUpOrigin;
-extern match_t MatchType;
-extern struct which_head *whead;
-
-extern void	show_file(const char *, const char *);
-extern void	show_plist(const char *, Package *, plist_t, Boolean);
-extern void	show_files(const char *, Package *);
-extern void	show_index(const char *, const char *);
-extern void	show_size(const char *, Package *);
-extern int	show_cksum(const char *, Package *);
-extern void	show_origin(const char *, Package *);
-extern void	show_fmtrev(const char *, Package *);
-
-#endif	/* _INST_INFO_H_INCLUDE */
diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c
deleted file mode 100644
index ff2ea79d3e8..00000000000
--- a/usr.sbin/pkg_install/info/main.c
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- *
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * This is the info module.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <getopt.h>
-#include <err.h>
-
-#include "lib.h"
-#include "info.h"
-
-int	Flags		= 0;
-match_t	MatchType	= MATCH_GLOB;
-Boolean QUIET		= FALSE;
-Boolean UseBlkSz	= FALSE;
-char *InfoPrefix	= (char *)(uintptr_t)"";
-char PlayPen[FILENAME_MAX];
-char *CheckPkg		= NULL;
-char *LookUpOrigin	= NULL;
-Boolean KeepPackage	= FALSE;
-struct which_head *whead;
-
-static void usage(void);
-
-static char opts[] = "abcdDe:EfgGhiIjkKl:LmoO:pPqQrRst:vVW:xX";
-static struct option longopts[] = {
-	{ "all",	no_argument,		NULL,		'a' },
-	{ "blocksize",	no_argument,		NULL,		'b' },
-	{ "exist",	required_argument,	NULL,		'X' },
-	{ "exists",	required_argument,	NULL,		'X' },
-	{ "extended",	no_argument,		NULL,		'e' },
-	{ "help",	no_argument,		NULL,		'h' },
-	{ "keep",	no_argument,		NULL,		'K' },
-	{ "no-glob",	no_argument,		NULL,		'G' },
-	{ "origin",	required_argument,	NULL,		'O' },
-	{ "quiet",	no_argument,		NULL,		'q' },
-	{ "regex",	no_argument,		NULL,		'x' },
-	{ "template",	required_argument,	NULL,		't' },
-	{ "verbose",	no_argument,		NULL,		'v' },
-	{ "version",	no_argument,		NULL,		'P' },
-	{ "which",	required_argument,	NULL,		'W' },
-	{ NULL,		0,			NULL,		0 }
-};
-
-int
-main(int argc, char **argv)
-{
-    int ch;
-    char **pkgs, **start;
-    char *pkgs_split;
-
-    warnpkgng();
-    whead = malloc(sizeof(struct which_head));
-    if (whead == NULL)
-	err(2, NULL);
-    TAILQ_INIT(whead);
-
-    pkgs = start = argv;
-    if (argc == 1) {
-	MatchType = MATCH_ALL;
-	Flags = SHOW_INDEX;
-    }
-    else while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) {
-	switch(ch) {
-	case 'a':
-	    MatchType = MATCH_ALL;
-	    break;
-
-	case 'b':
-	    UseBlkSz = TRUE;
-	    break;
-
-	case 'v':
-	    Verbose++;
-	    /* Reasonable definition of 'everything' */
-	    Flags = SHOW_COMMENT | SHOW_DESC | SHOW_PLIST | SHOW_INSTALL |
-		SHOW_DEINSTALL | SHOW_REQUIRE | SHOW_DISPLAY | SHOW_MTREE;
-	    break;
-
-	case 'E':
-	    Flags |= SHOW_PKGNAME;
-	    break;
-
-	case 'I':
-	    Flags |= SHOW_INDEX;
-	    break;
-
-	case 'p':
-	    Flags |= SHOW_PREFIX;
-	    break;
-
-	case 'c':
-	    Flags |= SHOW_COMMENT;
-	    break;
-
-	case 'd':
-	    Flags |= SHOW_DESC;
-	    break;
-
-	case 'D':
-	    Flags |= SHOW_DISPLAY;
-	    break;
-
-	case 'f':
-	    Flags |= SHOW_PLIST;
-	    break;
-
-	case 'g':
-	    Flags |= SHOW_CKSUM;
-	    break;
-
-	case 'G':
-	    MatchType = MATCH_EXACT;
-	    break;
-
-	case 'i':
-	    Flags |= SHOW_INSTALL;
-	    break;
-
-	case 'j':
-	    Flags |= SHOW_REQUIRE;
-	    break;
-
-	case 'k':
-	    Flags |= SHOW_DEINSTALL;
-	    break;
-
-	case 'K':
-	    KeepPackage = TRUE;
-	    break;
-
-	case 'r':
-	    Flags |= SHOW_DEPEND;
-	    break;
-
-	case 'R':
-	    Flags |= SHOW_REQBY;
-	    break;
-
-	case 'L':
-	    Flags |= SHOW_FILES;
-	    break;
-
-	case 'm':
-	    Flags |= SHOW_MTREE;
-	    break;
-
-	case 's':
-	    Flags |= SHOW_SIZE;
-	    break;
-
-	case 'o':
-	    Flags |= SHOW_ORIGIN;
-	    break;
-
-	case 'O':
-	    LookUpOrigin = strdup(optarg);
-	    if (LookUpOrigin == NULL)
-		err(2, NULL);
-	    break;
-
-	case 'V':
-	    Flags |= SHOW_FMTREV;
-	    break;
-
-	case 'l':
-	    InfoPrefix = optarg;
-	    break;
-
-	case 'q':
-	    Quiet = TRUE;
-	    break;
-
-	case 'Q':
-	    Quiet = TRUE;
-	    QUIET = TRUE;
-	    break;
-
-	case 't':
-	    strlcpy(PlayPen, optarg, sizeof(PlayPen));
-	    break;
-
-	case 'x':
-	    MatchType = MATCH_REGEX;
-	    break;
-
-	case 'X':
-	    MatchType = MATCH_EREGEX;
-	    break;
-
-	case 'e':
-	    CheckPkg = optarg;
-	    break;
-
-	case 'W':
-	    {
-		struct which_entry *entp;
-
-		entp = calloc(1, sizeof(struct which_entry));
-		if (entp == NULL)
-		    err(2, NULL);
-		
-		strlcpy(entp->file, optarg, PATH_MAX);
-		entp->skip = FALSE;
-		TAILQ_INSERT_TAIL(whead, entp, next);
-		break;
-	    }
-
-	case 'P':
-	    Flags = SHOW_PTREV;
-	    break;
-
-	case 'h':
-	default:
-	    usage();
-	    break;
-	}
-    }
-
-    argc -= optind;
-    argv += optind;
-
-    if (Flags & SHOW_PTREV) {
-	if (!Quiet)
-	    printf("Package tools revision: ");
-	printf("%d\n", PKG_INSTALL_VERSION);
-	exit(0);
-    }
-
-    /* Set some reasonable defaults */
-    if (!Flags)
-	Flags = SHOW_COMMENT | SHOW_DESC | SHOW_REQBY;
-
-    /* Get all the remaining package names, if any */
-    while (*argv) {
-	/* 
-	 * Don't try to apply heuristics if arguments are regexs or if
-	 * the argument refers to an existing file.
-	 */
-	if (MatchType != MATCH_REGEX && MatchType != MATCH_EREGEX && !isfile(*argv) && !isURL(*argv))
-	    while ((pkgs_split = strrchr(*argv, (int)'/')) != NULL) {
-		*pkgs_split++ = '\0';
-		/*
-		 * If character after the '/' is alphanumeric or shell
-		 * metachar, then we've found the package name.  Otherwise
-		 * we've come across a trailing '/' and need to continue our
-		 * quest.
-		 */
-		if (isalnum(*pkgs_split) || ((MatchType == MATCH_GLOB) && \
-		    strpbrk(pkgs_split, "*?[]") != NULL)) {
-		    *argv = pkgs_split;
-		    break;
-		}
-	    }
-	*pkgs++ = *argv++;
-    }
-
-    /* If no packages, yelp */
-    if (pkgs == start && MatchType != MATCH_ALL && !CheckPkg && 
-	TAILQ_EMPTY(whead) && LookUpOrigin == NULL)
-	warnx("missing package name(s)"), usage();
-    *pkgs = NULL;
-    return pkg_perform(start);
-}
-
-static void
-usage(void)
-{
-    fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n",
-	"usage: pkg_info [-bcdDEfgGiIjkKLmopPqQrRsvVxX] [-e package] [-l prefix]",
-	"                [-t template] -a | pkg-name ...",
-	"       pkg_info [-qQ] -W filename",
-	"       pkg_info [-qQ] -O origin",
-	"       pkg_info");
-    exit(1);
-}
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
deleted file mode 100644
index 551f862a032..00000000000
--- a/usr.sbin/pkg_install/info/perform.c
+++ /dev/null
@@ -1,476 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 23 Aug 1993
- *
- * This is the main body of the info module.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include "info.h"
-#include <err.h>
-#include <signal.h>
-
-static int pkg_do(char *);
-static int find_pkg(struct which_head *);
-static int cmp_path(const char *, const char *, const char *);
-static char *abspath(const char *);
-static int find_pkgs_by_origin(const char *);
-static int matched_packages(char **pkgs);
-
-int
-pkg_perform(char **pkgs)
-{
-    char **matched;
-    int err_cnt = 0;
-    int i, errcode;
-
-    signal(SIGINT, cleanup);
-
-    /* Overriding action? */
-    if (Flags & SHOW_PKGNAME) {
-	return matched_packages(pkgs);
-    } else if (CheckPkg) {
-	return isinstalledpkg(CheckPkg) > 0 ? 0 : 1;
-	/* Not reached */
-    } else if (!TAILQ_EMPTY(whead)) {
-	return find_pkg(whead);
-    } else if (LookUpOrigin != NULL) {
-	return find_pkgs_by_origin(LookUpOrigin);
-    }
-
-    if (MatchType != MATCH_EXACT) {
-	matched = matchinstalled(MatchType, pkgs, &errcode);
-	if (errcode != 0)
-	    return 1;
-	    /* Not reached */
-
-	if (matched != NULL)
-	    pkgs = matched;
-	else switch (MatchType) {
-	    case MATCH_GLOB:
-		break;
-	    case MATCH_ALL:
-		warnx("no packages installed");
-		return 0;
-		/* Not reached */
-	    case MATCH_REGEX:
-	    case MATCH_EREGEX:
-		warnx("no packages match pattern(s)");
-		return 1;
-		/* Not reached */
-	    default:
-		break;
-	}
-    }
-
-    for (i = 0; pkgs[i]; i++)
-	err_cnt += pkg_do(pkgs[i]);
-
-    return err_cnt;
-}
-
-static int
-pkg_do(char *pkg)
-{
-    Boolean installed = FALSE, isTMP = FALSE;
-    char log_dir[FILENAME_MAX];
-    char fname[FILENAME_MAX];
-    Package plist;
-    FILE *fp;
-    struct stat sb;
-    const char *cp = NULL;
-    int code = 0;
-
-    if (isURL(pkg)) {
-	if ((cp = fileGetURL(NULL, pkg, KeepPackage)) != NULL) {
-	    if (!getcwd(fname, FILENAME_MAX))
-		upchuck("getcwd");
-	    isTMP = TRUE;
-	} else {
-	    goto bail;
-	}
-    }
-    else if (fexists(pkg) && isfile(pkg)) {
-	int len;
-
-	if (*pkg != '/') {
-	    if (!getcwd(fname, FILENAME_MAX))
-		upchuck("getcwd");
-	    len = strlen(fname);
-	    snprintf(&fname[len], FILENAME_MAX - len, "/%s", pkg);
-	}
-	else
-	    strcpy(fname, pkg);
-	cp = fname;
-    }
-    else {
-	if ((cp = fileFindByPath(NULL, pkg)) != NULL)
-	    strncpy(fname, cp, FILENAME_MAX);
-    }
-    if (cp) {
-	if (!isURL(pkg)) {
-	    /*
-	     * Apply a crude heuristic to see how much space the package will
-	     * take up once it's unpacked.  I've noticed that most packages
-	     * compress an average of 75%, but we're only unpacking the + files so
-	     * be very optimistic.
-	     */
-	    if (stat(fname, &sb) == FAIL) {
-	        warnx("can't stat package file '%s'", fname);
-	        code = 1;
-	        goto bail;
-	    }
-	    make_playpen(PlayPen, sb.st_size / 2);
-	    if (unpack(fname, "'+*'")) {
-		warnx("error during unpacking, no info for '%s' available", pkg);
-		code = 1;
-		goto bail;
-	    }
-	}
-    }
-    /* It's not an uninstalled package, try and find it among the installed */
-    else {
-	int isinstalled = isinstalledpkg(pkg);
-	if (isinstalled < 0) {
-	    warnx("the package info for package '%s' is corrupt", pkg);
-	    return 1;
-	} else if (isinstalled == 0) {
-	    warnx("can't find package '%s' installed or in a file!", pkg);
-	    return 1;
-	}
-	sprintf(log_dir, "%s/%s", LOG_DIR, pkg);
-	if (chdir(log_dir) == FAIL) {
-	    warnx("can't change directory to '%s'!", log_dir);
-	    return 1;
-	}
-	installed = TRUE;
-    }
-
-    /* Suck in the contents list */
-    plist.head = plist.tail = NULL;
-    fp = fopen(CONTENTS_FNAME, "r");
-    if (!fp) {
-	warnx("unable to open %s file", CONTENTS_FNAME);
-	code = 1;
-	goto bail;
-    }
-    /* If we have a prefix, add it now */
-    read_plist(&plist, fp);
-    fclose(fp);
-
-    /*
-     * Index is special info type that has to override all others to make
-     * any sense.
-     */
-    if (Flags & SHOW_INDEX) {
-	char tmp[FILENAME_MAX];
-
-	snprintf(tmp, FILENAME_MAX, "%-19s ", pkg);
-	show_index(tmp, COMMENT_FNAME);
-    }
-    else {
-	/* Start showing the package contents */
-	if (!Quiet)
-	    printf("%sInformation for %s:\n\n", InfoPrefix, pkg);
-	else if (QUIET)
-	    printf("%s%s:", InfoPrefix, pkg);
-	if (Flags & SHOW_COMMENT)
-	    show_file("Comment:\n", COMMENT_FNAME);
-	if (Flags & SHOW_DEPEND)
-	    show_plist("Depends on:\n", &plist, PLIST_PKGDEP, FALSE);
-	if ((Flags & SHOW_REQBY) && !isemptyfile(REQUIRED_BY_FNAME))
-	    show_file("Required by:\n", REQUIRED_BY_FNAME);
-	if (Flags & SHOW_DESC)
-	    show_file("Description:\n", DESC_FNAME);
-	if ((Flags & SHOW_DISPLAY) && fexists(DISPLAY_FNAME))
-	    show_file("Install notice:\n", DISPLAY_FNAME);
-	if (Flags & SHOW_PLIST)
-	    show_plist("Packing list:\n", &plist, (plist_t)0, TRUE);
-	if (Flags & SHOW_REQUIRE && fexists(REQUIRE_FNAME))
-	    show_file("Requirements script:\n", REQUIRE_FNAME);
-	if ((Flags & SHOW_INSTALL) && fexists(INSTALL_FNAME))
-	    show_file("Install script:\n", INSTALL_FNAME);
-	if ((Flags & SHOW_INSTALL) && fexists(POST_INSTALL_FNAME))
-	    show_file("Post-Install script:\n", POST_INSTALL_FNAME);
-	if ((Flags & SHOW_DEINSTALL) && fexists(DEINSTALL_FNAME))
-	    show_file("De-Install script:\n", DEINSTALL_FNAME);
-	if ((Flags & SHOW_DEINSTALL) && fexists(POST_DEINSTALL_FNAME))
-	    show_file("Post-DeInstall script:\n", POST_DEINSTALL_FNAME);
-	if ((Flags & SHOW_MTREE) && fexists(MTREE_FNAME))
-	    show_file("mtree file:\n", MTREE_FNAME);
-	if (Flags & SHOW_PREFIX)
-	    show_plist("Prefix(s):\n", &plist, PLIST_CWD, FALSE);
-	if (Flags & SHOW_FILES)
-	    show_files("Files:\n", &plist);
-	if ((Flags & SHOW_SIZE) && installed)
-	    show_size("Package Size:\n", &plist);
-	if ((Flags & SHOW_CKSUM) && installed)
-	    code += show_cksum("Mismatched Checksums:\n", &plist);
-	if (Flags & SHOW_ORIGIN)
-	    show_origin("Origin:\n", &plist);
-	if (Flags & SHOW_FMTREV)
-	    show_fmtrev("Packing list format revision:\n", &plist);
-	if (!Quiet)
-	    puts(InfoPrefix);
-    }
-    free_plist(&plist);
- bail:
-    leave_playpen();
-    if (isTMP)
-	unlink(fname);
-    return (code ? 1 : 0);
-}
-
-void
-cleanup(int sig)
-{
-    static int in_cleanup = 0;
-
-    if (!in_cleanup) {
-	in_cleanup = 1;
-	leave_playpen();
-    }
-    if (sig)
-	exit(1);
-}
-
-/*
- * Return an absolute path, additionally removing all .'s, ..'s, and extraneous
- * /'s, as realpath() would, but without resolving symlinks, because that can
- * potentially screw up our comparisons later.
- */
-static char *
-abspath(const char *pathname)
-{
-    char *tmp, *tmp1, *resolved_path;
-    char *cwd = NULL;
-    int len;
-
-    if (pathname[0] != '/') {
-	cwd = getcwd(NULL, MAXPATHLEN);
-	asprintf(&resolved_path, "%s/%s/", cwd, pathname);
-    } else
-	asprintf(&resolved_path, "%s/", pathname);
-
-    if (resolved_path == NULL)
-	errx(2, NULL);
-
-    if (cwd != NULL)
-	free(cwd);    
-
-    while ((tmp = strstr(resolved_path, "//")) != NULL)
-	strcpy(tmp, tmp + 1);
- 
-    while ((tmp = strstr(resolved_path, "/./")) != NULL)
-	strcpy(tmp, tmp + 2);
- 
-    while ((tmp = strstr(resolved_path, "/../")) != NULL) {
-	*tmp = '\0';
-	if ((tmp1 = strrchr(resolved_path, '/')) == NULL)
-	   tmp1 = resolved_path;
-	strcpy(tmp1, tmp + 3);
-    }
-
-    len = strlen(resolved_path);
-    if (len > 1 && resolved_path[len - 1] == '/')
-	resolved_path[len - 1] = '\0';
-
-    return resolved_path;
-}
-
-/*
- * Comparison to see if the path we're on matches the
- * one we are looking for.
- */
-static int
-cmp_path(const char *target, const char *current, const char *cwd) 
-{
-    char *resolved, *temp;
-    int rval;
-
-    asprintf(&temp, "%s/%s", cwd, current);
-    if (temp == NULL)
-        errx(2, NULL);
-
-    /*
-     * Make sure there's no multiple /'s or other weird things in the PLIST,
-     * since some plists seem to have them and it could screw up our strncmp.
-     */
-    resolved = abspath(temp);
-
-    if (strcmp(target, resolved) == 0)
-	rval = 1;
-    else
-	rval = 0;
-
-    free(temp);
-    free(resolved);
-    return rval;
-}
-
-/* 
- * Look through package dbs in LOG_DIR and find which
- * packages installed the files in which_list.
- */
-static int 
-find_pkg(struct which_head *which_list)
-{
-    char **installed;
-    int errcode, i;
-    struct which_entry *wp;
-
-    TAILQ_FOREACH(wp, which_list, next) {
-	const char *msg = "file cannot be found";
-	char *tmp;
-
-	wp->skip = TRUE;
-	/* If it's not a file, we'll see if it's an executable. */
-	if (isfile(wp->file) == FALSE) {
-	    if (strchr(wp->file, '/') == NULL) {
-		tmp = vpipe("/usr/bin/which %s", wp->file);
-		if (tmp != NULL) {
-		    strlcpy(wp->file, tmp, PATH_MAX);
-		    wp->skip = FALSE;
-		    free(tmp);
-		} else
-		    msg = "file is not in PATH";
-	    }
-	} else {
-	    tmp = abspath(wp->file);
-	    if (isfile(tmp)) {
-	    	strlcpy(wp->file, tmp, PATH_MAX);
-	    	wp->skip = FALSE;
-	    }
-	    free(tmp);
-	}
-	if (wp->skip == TRUE)
-	    warnx("%s: %s", wp->file, msg);
-    }
-
-    installed = matchinstalled(MATCH_ALL, NULL, &errcode);
-    if (installed == NULL)
-        return errcode;
- 
-    for (i = 0; installed[i] != NULL; i++) {
-     	FILE *fp;
-     	Package pkg;
-     	PackingList itr;
-     	char *cwd = NULL;
-     	char tmp[PATH_MAX];
-
-	snprintf(tmp, PATH_MAX, "%s/%s/%s", LOG_DIR, installed[i],
-		 CONTENTS_FNAME);
-	fp = fopen(tmp, "r");
-	if (fp == NULL) {
-	    warn("%s", tmp);
-	    return 1;
-	}
-
-	pkg.head = pkg.tail = NULL;
-	read_plist(&pkg, fp);
-	fclose(fp);
-	for (itr = pkg.head; itr != pkg.tail; itr = itr->next) {
-	    if (itr->type == PLIST_CWD) {
-		cwd = itr->name;
-	    } else if (itr->type == PLIST_FILE) {
-		TAILQ_FOREACH(wp, which_list, next) {
-		    if (wp->skip == TRUE)
-			continue;
-		    if (!cmp_path(wp->file, itr->name, cwd))
-			continue;
-		    if (wp->package[0] != '\0') {
-			warnx("both %s and %s claim to have installed %s\n",
-			      wp->package, installed[i], wp->file);
-		    } else {
-			strlcpy(wp->package, installed[i], PATH_MAX);
-		    }
-		}
-	    }
-	}
-	free_plist(&pkg);
-    }
-
-    TAILQ_FOREACH(wp, which_list, next) {
-	if (wp->package[0] != '\0') {
-	    if (Quiet)
-		puts(wp->package);
-	    else
-		printf("%s was installed by package %s\n", \
-		       wp->file, wp->package);
-	}
-    }
-    while (!TAILQ_EMPTY(which_list)) {
-	wp = TAILQ_FIRST(which_list);
-	TAILQ_REMOVE(which_list, wp, next);
-	free(wp);
-    }
-
-    free(which_list);
-    return 0;
-}
-
-/* 
- * Look through package dbs in LOG_DIR and find which
- * packages have the given origin. Don't use read_plist()
- * because this increases time necessary for lookup by 40
- * times, as we don't really have to parse all plist to
- * get origin.
- */
-static int 
-find_pkgs_by_origin(const char *origin)
-{
-    char **matched;
-    int errcode, i;
-
-    if (!Quiet)
-	printf("The following installed package(s) has %s origin:\n", origin);
-
-    matched = matchbyorigin(origin, &errcode);
-    if (matched == NULL)
-	return errcode;
-
-    for (i = 0; matched[i] != NULL; i++)
-	puts(matched[i]);
-
-    return 0;
-}
-
-/*
- * List only the matching package names.
- * Mainly intended for scripts.
- */
-static int
-matched_packages(char **pkgs)
-{
-    char **matched;
-    int i, errcode;
-
-    matched = matchinstalled(MatchType == MATCH_GLOB ? MATCH_NGLOB : MatchType, pkgs, &errcode);
-
-    if (errcode != 0 || matched == NULL)
-	return 1;
-
-    for (i = 0; matched[i]; i++)
-	if (!Quiet)
-	    printf("%s\n", matched[i]);
-	else if (QUIET)
-	    printf("%s%s\n", InfoPrefix, matched[i]);
-
-    return 0;
-}
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
deleted file mode 100644
index c29687d3961..00000000000
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ /dev/null
@@ -1,302 +0,0 @@
-.\"
-.\" FreeBSD install - a package for the installation and maintenance
-.\" of non-core utilities.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" Jordan K. Hubbard
-.\"
-.\"
-.\"     @(#)pkg_info.1
-.\" $FreeBSD$
-.\"
-.Dd November 9, 2012
-.Dt PKG_INFO 1
-.Os
-.Sh NAME
-.Nm pkg_info
-.Nd a utility for displaying information on software packages
-.Sh SYNOPSIS
-.Nm
-.Op Fl bcdDEfghGiIjkKLmopPqQrRsvVxX
-.Op Fl e Ar package
-.Op Fl l Ar prefix
-.Op Fl t Ar template
-.Fl a | Ar pkg-name ...
-.Nm
-.Op Fl qQ
-.Fl W Ar filename
-.Nm
-.Op Fl qQ
-.Fl O Ar origin
-.Nm
-.Sh DESCRIPTION
-The
-.Nm
-command is used to dump out information for packages, either packed up in
-files with the
-.Xr pkg_create 1
-command or already installed on the system
-with the
-.Xr pkg_add 1
-command.
-.Sh OPTIONS
-The following command line options are supported:
-.Bl -tag -width indent
-.It Ar pkg-name ...
-The named packages are described.
-A package name may either be the name of
-an installed package, the pathname to a package distribution file or a
-URL to an FTP available package.
-Package version numbers can also be matched in a relational manner using the
-.Pa >= , <= , >
-and
-.Pa <
-operators.
-For example,
-.Pp
-.Dl "pkg_info 'portupgrade>=20030723'"
-.Pp
-will match versions 20030723 and later of the
-.Pa portupgrade
-package.
-.It Fl a , -all
-Show all currently installed packages.
-.It Fl b , -blocksize
-Use the
-.Ev BLOCKSIZE
-environment variable for output even when the
-.Fl q
-or
-.Fl Q
-flag is present.
-.It Fl h , -help
-Print help message.
-.It Fl v , -verbose
-Turn on verbose output.
-.It Fl p
-Show the installation prefix for each package.
-.It Fl q , -quiet
-Be
-.Dq quiet
-in emitting report headers and such, just dump the
-raw info (basically, assume a non-human reading).
-.It Fl Q
-Be
-.Dq quiet
-as above but print preface output with the package name.
-.It Fl c
-Show the (one line) comment field for each package.
-.It Fl d
-Show the long description field for each package.
-.It Fl D
-Show the install-message file for each package.
-.It Fl f
-Show the packing list instructions for each package.
-.It Fl g
-Show files that do not match the recorded checksum.
-.It Fl i
-Show the install script (if any) for each package.
-.It Fl I
-Show an index line for each package.
-This option takes
-precedence over all other package formatting options.
-.It Fl j
-Show the requirements script (if any) for each package.
-.It Fl k
-Show the de-install script (if any) for each package.
-.It Fl K , -keep
-Keep any downloaded package in
-.Ev PKGDIR
-if it is defined or in current directory by default.
-.It Fl r
-For each of the specified packages,
-show the list of packages on which it depends.
-.It Fl R
-For each of the specified packages,
-show the list of installed packages which require it.
-.It Fl m
-Show the
-.Xr mtree 8
-file (if any) for each package.
-.It Fl L
-Show the files within each package.
-This is different from just
-viewing the packing list, since full pathnames for everything
-are generated.
-.It Fl s
-Show the total size occupied by files installed within each package.
-.It Fl o
-Show the
-.Dq origin
-path recorded on package generation.
-This path is the directory name in the
-.Fx
-.Em "Ports Collection"
-of the underlying port from which the package was generated.
-.It Fl G , -no-glob
-Do not try to expand shell glob patterns in the
-.Ar pkg-name
-when selecting packages to be displayed (by default
-.Nm
-automatically expands shell glob patterns in the
-.Ar pkg-name ) .
-.It Fl W , -which Ar filename
-For the specified
-.Ar filename
-argument show which package it belongs to.
-If the file is not in the
-current directory, and does not have an absolute path, then the
-directories specified in the environment variable
-.Ev PATH
-are searched using
-.Xr which 1 .
-.It Fl O , -origin Ar origin
-List all packages having the specified
-.Ar origin .
-.It Fl x , -regex
-Treat the
-.Ar pkg-name
-as a regular expression and display information only for packages
-whose names match that regular expression.
-Multiple regular
-expressions could be provided, in that case
-.Nm
-displays information about all packages that match at least one
-regular expression from the list.
-.It Fl X , -extended
-Like
-.Fl x ,
-but treats the
-.Ar pkg-name
-as an extended regular expression.
-.It Fl e , -exists Ar package
-If the package identified by
-.Ar package
-is currently installed, return 0, otherwise return 1.
-This option
-allows you to easily test for the presence of another (perhaps
-prerequisite) package from a script.
-.It Fl E
-Show only matching package names.
-This option takes
-precedence over all other package formatting options.
-If any packages match, return 0, otherwise return 1.
-.It Fl l Ar prefix
-Prefix each information category header (see
-.Fl q )
-shown with
-.Ar prefix .
-This is primarily of use to front-end programs that want to request a
-lot of different information fields at once for a package, but do not
-necessarily want the output intermingled in such a way that they cannot
-organize it.
-This lets you add a special token to the start of
-each field.
-.It Fl t , -template Ar template
-Use
-.Ar template
-as the argument to
-.Xr mktemp 3
-when creating a
-.Dq staging area .
-By default, this is the string
-.Pa /tmp/instmp.XXXXXX ,
-but it may be necessary to override it in the situation where
-space in your
-.Pa /tmp
-directory is limited.
-Be sure to leave some number of
-.Ql X
-characters for
-.Xr mktemp 3
-to fill in with a unique ID.
-.Bd -ragged -offset indent -compact
-Note: This should really not be necessary with
-.Nm ,
-since very little information is extracted from each package
-and one would have to have a very small
-.Pa /tmp
-indeed to overflow it.
-.Ed
-.It Fl V
-Show revision number of the packing list format.
-.It Fl P , -version
-Show revision number of package tools.
-.El
-.Sh TECHNICAL DETAILS
-Package info is either extracted from package files named on the
-command line, or from already installed package information
-in
-.Pa /var/db/pkg/ Ns Aq Ar pkg-name .
-.Sh ENVIRONMENT
-.Bl -tag -width ".Ev PKG_TMPDIR"
-.It Ev BLOCKSIZE
-If the environment variable
-.Ev BLOCKSIZE
-is set the block counts will be displayed in units of that
-size block.
-.It Ev PKG_TMPDIR
-Points to the directory where
-.Nm
-creates its temporary files.
-If this variable is not set,
-.Ev TMPDIR
-is used.
-If both are unset, the builtin defaults are used.
-.It Ev PKG_DBDIR
-Specifies an alternative location for the installed package database.
-.It Ev PKG_PATH
-Specifies an alternative package location, if a given package cannot be
-found.
-.It Ev PKGDIR
-Specifies an alternative location to save downloaded packages to.
-.It Ev PKG_OLD_NOWARN
-If set
-.Nm
-will not warn about its use in the presence of pkgng databases.
-.El
-.Sh FILES
-.Bl -tag -width ".Pa /var/db/pkg" -compact
-.It Pa /var/tmp
-Used if the environment variables
-.Ev PKG_TMPDIR
-and
-.Ev TMPDIR
-are not set, or if the directories named have insufficient space.
-.It Pa /tmp
-The next choice if
-.Pa /var/tmp
-does not exist or has insufficient space.
-.It Pa /usr/tmp
-The last choice if
-.Pa /tmp
-is unsuitable.
-.It Pa /var/db/pkg
-Default location of the installed package database.
-.It Ev PKG_OLD_NOWARN
-If set
-.Nm
-will not warn about its use in the presence of pkgng databases.
-.El
-.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_version 1 ,
-.Xr mktemp 3 ,
-.Xr mtree 8
-.Sh AUTHORS
-.An Jordan Hubbard
-.Sh CONTRIBUTORS
-.An John Kohl Aq jtk@rational.com ,
-.An Oliver Eikemeier Aq eik@FreeBSD.org
-.Sh BUGS
-Sure to be some.
diff --git a/usr.sbin/pkg_install/info/show.c b/usr.sbin/pkg_install/info/show.c
deleted file mode 100644
index be056958363..00000000000
--- a/usr.sbin/pkg_install/info/show.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 23 Aug 1993
- *
- * Various display routines for the info module.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include "info.h"
-#include <err.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <md5.h>
-
-void
-show_file(const char *title, const char *fname)
-{
-    FILE *fp;
-    char line[1024];
-    int n;
-
-    if (!Quiet)
-	printf("%s%s", InfoPrefix, title);
-    fp = fopen(fname, "r");
-    if (fp == (FILE *) NULL)
-	printf("ERROR: show_file: Can't open '%s' for reading!\n", fname);
-    else {
-	int append_nl = 0;
-	while ((n = fread(line, 1, 1024, fp)) != 0)
-	    fwrite(line, 1, n, stdout);
-	fclose(fp);
-	append_nl = (line[n - 1] != '\n');	/* Do we have a trailing \n ? */
-	if (append_nl)
-	   printf("\n");
-    }
-    printf("\n");	/* just in case */
-}
-
-void
-show_index(const char *title, const char *fname)
-{
-    FILE *fp;
-    char line[MAXINDEXSIZE+2];
-
-    strlcpy(line, "???\n", sizeof(line));
-
-    if (!Quiet) {
-        printf("%s%s", InfoPrefix, title);
-        fflush(stdout);
-    }
-    fp = fopen(fname, "r");
-    if (fp == (FILE *) NULL) {
-        warnx("show_file: can't open '%s' for reading", fname);
-    } else {
-    	if(fgets(line, MAXINDEXSIZE + 1, fp)) {
-		size_t line_length = strlen(line);
-
-		if (line[line_length - 1] != '\n') {	/* Do we have a trailing \n ? */
-			line[line_length] = '\n';	/* Add a trailing \n */
-			line[line_length + 1] = '\0';	/* Terminate string */
-		}
-	}
-	fclose(fp);
-    }
-    fputs(line, stdout);
-}
-
-/* Show a packing list item type.  If showall is TRUE, show all */
-void
-show_plist(const char *title, Package *plist, plist_t type, Boolean showall)
-{
-    PackingList p;
-    Boolean ign = FALSE;
-    char *prefix = NULL;
-
-    if (!Quiet) {
-	printf("%s%s", InfoPrefix, title);
-	fflush(stdout);
-    }
-    p = plist->head;
-    while (p) {
-	if (p->type != type && showall != TRUE) {
-	    p = p->next;
-	    continue;
-	}
-	switch(p->type) {
-	case PLIST_FILE:
-	    if (ign) {
-		printf(Quiet ? "%s\n" : "File: %s (ignored)\n", p->name);
-		ign = FALSE;
-	    }
-	    else
-		printf(Quiet ? "%s\n" : "File: %s\n", p->name);
-	    break;
-
-	case PLIST_CWD:
-	    if (!prefix)
-		prefix = p->name;
-	    printf(Quiet ? "@cwd %s\n" : "\tCWD to %s\n", (p->name == NULL) ? prefix : p->name);
-	    break;
-
-	case PLIST_SRC:
-	    printf(Quiet ? "@srcdir %s\n" : "\tSRCDIR to %s\n", p->name);
-	    break;
-
-	case PLIST_CMD:
-	    printf(Quiet ? "@exec %s\n" : "\tEXEC '%s'\n", p->name);
-	    break;
-
-	case PLIST_UNEXEC:
-	    printf(Quiet ? "@unexec %s\n" : "\tUNEXEC '%s'\n", p->name);
-	    break;
-
-	case PLIST_CHMOD:
-	    printf(Quiet ? "@chmod %s\n" : "\tCHMOD to %s\n",
-		   p->name ? p->name : "(clear default)");
-	    break;
-
-	case PLIST_CHOWN:
-	    printf(Quiet ? "@chown %s\n" : "\tCHOWN to %s\n",
-		   p->name ? p->name : "(clear default)");
-	    break;
-
-	case PLIST_CHGRP:
-	    printf(Quiet ? "@chgrp %s\n" : "\tCHGRP to %s\n",
-		   p->name ? p->name : "(clear default)");
-	    break;
-
-	case PLIST_COMMENT:
-	    printf(Quiet ? "@comment %s\n" : "\tComment: %s\n", p->name);
-	    break;
-
-	case PLIST_NOINST:
-	    printf(Quiet ? "@noinst %s\n" : "\tNot installed: %s\n", p->name);
-	    break;
-
-	case PLIST_IGNORE:
-	    ign = TRUE;
-	    break;
-
-	case PLIST_IGNORE_INST:
-	    printf(Quiet ? "@ignore_inst ??? doesn't belong here.\n" :
-		   "\tIgnore next file installation directive (doesn't belong)\n");
-	    ign = TRUE;
-	    break;
-
-	case PLIST_NAME:
-	    printf(Quiet ? "@name %s\n" : "\tPackage name: %s\n", p->name);
-	    break;
-
-	case PLIST_DISPLAY:
-	    printf(Quiet ? "@display %s\n" : "\tInstall message file: %s\n", p->name);
-	    break;
-
-	case PLIST_PKGDEP:
-	    printf(Quiet ? "@pkgdep %s\n" : "Dependency: %s\n", p->name);
-	    break;
-
-	case PLIST_DEPORIGIN:
-	    printf(Quiet ? "@comment DEPORIGIN:%s\n" :
-		"\tdependency origin: %s\n", p->name);
-	    break;
-
-	case PLIST_CONFLICTS:
-	    printf(Quiet ? "@conflicts %s\n" : "Conflicts: %s\n", p->name);
-	    break;
-
-	case PLIST_MTREE:
-	    printf(Quiet ? "@mtree %s\n" : "\tPackage mtree file: %s\n", p->name);
-	    break;
-
-	case PLIST_DIR_RM:
-	    printf(Quiet ? "@dirrm %s\n" : "\tDeinstall directory remove: %s\n", p->name);
-	    break;
-
-	case PLIST_OPTION:
-	    printf(Quiet ? "@option %s\n" :
-		"\tOption \"%s\" controlling package installation behaviour\n",
-		p->name);
-	    break;
-
-	case PLIST_ORIGIN:
-	    printf(Quiet ? "@comment ORIGIN:%s\n" :
-		"\tPackage origin: %s\n", p->name); 
-	    break;
-
-	default:
-	    cleanup(0);
-	    errx(2, "%s: unknown command type %d (%s)",
-		__func__, p->type, p->name);
-	    break;
-	}
-	p = p->next;
-    }
-}
-
-static const char *
-elide_root(const char *dir)
-{
-    if (strcmp(dir, "/") == 0)
-	return "";
-    return dir;
-}
-
-/* Show all files in the packing list (except ignored ones) */
-void
-show_files(const char *title, Package *plist)
-{
-    PackingList p;
-    Boolean ign = FALSE;
-    char *prefix = NULL;
-    const char *dir = ".";
-
-    if (!Quiet)
-	printf("%s%s", InfoPrefix, title);
-    p = plist->head;
-    while (p) {
-	switch(p->type) {
-	case PLIST_FILE:
-	    if (!ign)
-		printf("%s/%s\n", elide_root(dir), p->name);
-	    ign = FALSE;
-	    break;
-
-	case PLIST_CWD:
-	    if (!prefix)
-		prefix = p->name;
-	    if (p->name == NULL)
-		dir = prefix;
-	    else
-		dir = p->name;
-	    break;
-
-	case PLIST_IGNORE:
-	    ign = TRUE;
-	    break;
-
-        /* Silence GCC in the -Wall mode */
-	default:
-	    break;
-	}
-	p = p->next;
-    }
-}
-
-/* Calculate and show size of all installed package files (except ignored ones) */
-void
-show_size(const char *title, Package *plist)
-{
-    PackingList p;
-    Boolean ign = FALSE;
-    const char *dir = ".";
-    struct stat sb;
-    char tmp[FILENAME_MAX];
-    unsigned long size = 0;
-    long blksize;
-    int headerlen;
-    char *descr;
-    char *prefix = NULL;
-
-    descr = getbsize(&headerlen, &blksize);
-    if (!Quiet) {
-	printf("%s%s", InfoPrefix, title);
-        fflush(stdout);
-    }
-    for (p = plist->head; p != NULL; p = p->next) {
-	switch (p->type) {
-	case PLIST_FILE:
-	    if (!ign) {
-		snprintf(tmp, FILENAME_MAX, "%s/%s", elide_root(dir), p->name);
-		if (!lstat(tmp, &sb)) {
-		    size += sb.st_size;
-		    if (Verbose)
-			printf("%lu\t%s\n", (unsigned long) howmany(sb.st_size, blksize), tmp);
-		}
-	    }
-	    ign = FALSE;
-	    break;
-
-	case PLIST_CWD:
-	    if (!prefix)
-		prefix = p->name;
-	    if (p->name == NULL)
-		dir = prefix;
-	    else
-		dir = p->name;
-	    break;
-
-	case PLIST_IGNORE:
-	    ign = TRUE;
-	    break;
-
-	/* Silence GCC in the -Wall mode */	    
-	default:
-	    break;
-	}
-    }
-    if (!Quiet)
-	printf("%lu\t(%s)\n", howmany(size, blksize), descr);
-    else
-	if (UseBlkSz)
-		printf("%lu\n", howmany(size, blksize));
-	else
-		printf("%lu\n", size);
-}
-
-/* Show files that don't match the recorded checksum */
-int
-show_cksum(const char *title, Package *plist)
-{
-    PackingList p;
-    const char *dir = ".";
-    char *prefix = NULL;
-    char tmp[FILENAME_MAX];
-    int errcode = 0;
-
-    if (!Quiet) {
-	printf("%s%s", InfoPrefix, title);
-	fflush(stdout);
-    }
-
-    for (p = plist->head; p != NULL; p = p->next)
-	if (p->type == PLIST_CWD) {
-	    if (!prefix)
-		prefix = p->name;
-	    if (p->name == NULL)
-		dir = prefix;
-	    else
-		dir = p->name;
-	} else if (p->type == PLIST_FILE) {
-	    snprintf(tmp, FILENAME_MAX, "%s/%s", elide_root(dir), p->name);
-	    if (!fexists(tmp)) {
-		warnx("%s doesn't exist", tmp);
-		errcode = 1;
-	    } else if (p->next && p->next->type == PLIST_COMMENT &&
-	             (strncmp(p->next->name, "MD5:", 4) == 0)) {
-		char *cp = NULL, buf[33];
-
-		/*
-		 * For packing lists whose version is 1.1 or greater, the md5
-		 * hash for a symlink is calculated on the string returned
-		 * by readlink().
-		 */
-		if (issymlink(tmp) && verscmp(plist, 1, 0) > 0) {
-		    int len;
-		    char linkbuf[FILENAME_MAX];
-
-		    if ((len = readlink(tmp, linkbuf, FILENAME_MAX)) > 0)
-			cp = MD5Data((unsigned char *)linkbuf, len, buf);
-		} else if (isfile(tmp) || verscmp(plist, 1, 1) < 0)
-		    cp = MD5File(tmp, buf);
-
-		if (cp != NULL) {
-		    /* Mismatch? */
-		    if (strcmp(cp, p->next->name + 4))
-			printf("%s fails the original MD5 checksum\n", tmp);
-		    else if (Verbose)
-			printf("%s matched the original MD5 checksum\n", tmp);
-		}
-	    }
-	}
-    return (errcode);
-}
-
-/* Show an "origin" path (usually category/portname) */
-void
-show_origin(const char *title, Package *plist)
-{
-
-    if (!Quiet) {
-	printf("%s%s", InfoPrefix, title);
-	fflush(stdout);
-    }
-    printf("%s\n", plist->origin != NULL ? plist->origin : "");
-}
-
-/* Show revision number of the packing list */
-void
-show_fmtrev(const char *title, Package *plist)
-{
-
-    if (!Quiet) {
-	printf("%s%s", InfoPrefix, title);
-	fflush(stdout);
-    }
-    printf("%d.%d\n", plist->fmtver_maj, plist->fmtver_mnr);
-}
diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile
deleted file mode 100644
index 12cc3073eb7..00000000000
--- a/usr.sbin/pkg_install/lib/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-LIB=	install
-INTERNALLIB=
-SRCS=	file.c msg.c plist.c str.c exec.c global.c pen.c match.c \
-	deps.c version.c pkgwrap.c url.c pkgng.c
-
-WARNS?=	3
-WFORMAT?=	1
-
-.include <bsd.lib.mk>
diff --git a/usr.sbin/pkg_install/lib/deps.c b/usr.sbin/pkg_install/lib/deps.c
deleted file mode 100644
index c6e70fe4510..00000000000
--- a/usr.sbin/pkg_install/lib/deps.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Maxim Sobolev
- * 14 March 2001
- *
- * Routines used to do various operations with dependencies
- * among installed packages.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <err.h>
-#include <stdio.h>
-
-void list_deps(const char *pkgname, char **pkgs, char *listed, 
-               char *check_loop, char **newpkgs, int *nrnewpkgs,
-               int *err_cnt);
-
-/*
- * Sort given NULL-terminated list of installed packages (pkgs) in
- * such a way that if package A depends on package B then after
- * sorting A will be listed before B no matter how they were
- * originally positioned in the list.
- *
- * Works by performing a recursive depth-first search on the 
- * required-by lists.
- */
-
-int
-sortdeps(char **pkgs)
-{
-    int i, err_cnt=0;
-    int nrpkgs, nrnewpkgs;
-    char *listed, *check_loop, **newpkgs;
-    char *cp;
-
-    if (pkgs[0] == NULL || pkgs[1] == NULL)
-	return (0);
-
-    nrpkgs = 0;
-    while (pkgs[nrpkgs]) nrpkgs++;
-    listed = alloca(nrpkgs);
-    if (listed == NULL) {
-	warnx("%s(): alloca() failed", __func__);
-	return 1;
-    }
-    bzero(listed,nrpkgs);
-    check_loop = alloca(nrpkgs);
-    if (check_loop == NULL) {
-	warnx("%s(): alloca() failed", __func__);
-	return 1;
-    }
-    bzero(check_loop,nrpkgs);
-    newpkgs = alloca(nrpkgs*sizeof(char*));
-    if (newpkgs == NULL) {
-	warnx("%s(): alloca() failed", __func__);
-	return 1;
-    }
-    nrnewpkgs = 0;
-
-    for (i = 0; pkgs[i]; i++) if (!listed[i]) {
-	check_loop[i] = 1;
-	cp = strchr(pkgs[i], ':');
-	if (cp != NULL)
-	    *cp = '\0';
-	list_deps(pkgs[i],pkgs,listed,check_loop,newpkgs,&nrnewpkgs,&err_cnt);
-	if (cp != NULL)
-	    *cp = ':';
-	listed[i] = 1;
-	newpkgs[nrnewpkgs] = pkgs[i];
-	nrnewpkgs++;
-    }
-
-    if (nrnewpkgs != nrpkgs) {
-	fprintf(stderr,"This shouldn't happen, and indicates a huge error in the code.\n");
-	exit(1);
-    }
-    for (i = 0; i < nrnewpkgs; i++) pkgs[i] = newpkgs[i];
-
-    return err_cnt;
-}
-
-/*
- * This recursive function lists the dependencies (that is, the 
- * "required-by"s) for pkgname, putting them into newpkgs.
- */
-
-void list_deps(const char *pkgname, char **pkgs, char *listed, 
-               char *check_loop, char **newpkgs, int *nrnewpkgs,
-               int *err_cnt) {
-    char **rb, **rbtmp;
-    char *cp;
-    int errcode, i, j;
-    struct reqr_by_entry *rb_entry;
-    struct reqr_by_head *rb_list;
-
-    if (isinstalledpkg(pkgname) <= 0)
-	return;
-
-    errcode = requiredby(pkgname, &rb_list, FALSE, TRUE);
-    if (errcode < 0)
-	return;
-    /*
-     * We put rb_list into an argv style NULL terminated list,
-     * because requiredby uses some static storage, and list_deps
-     * is a recursive function.
-     */
-
-    rbtmp = rb = alloca((errcode + 1) * sizeof(*rb));
-    if (rb == NULL) {
-	warnx("%s(): alloca() failed", __func__);
-	(*err_cnt)++;
-	return;
-    }
-    STAILQ_FOREACH(rb_entry, rb_list, link) {
-	*rbtmp = alloca(strlen(rb_entry->pkgname) + 1);
-	if (*rbtmp == NULL) {
-	    warnx("%s(): alloca() failed", __func__);
-	    (*err_cnt)++;
-	    return;
-	}
-	strcpy(*rbtmp, rb_entry->pkgname);
-	rbtmp++;
-    }
-    *rbtmp = NULL;
-
-    for (i = 0; rb[i]; i++)
-	for (j = 0; pkgs[j]; j++) if (!listed[j]) {
-	    cp = strchr(pkgs[j], ':');
-	    if (cp != NULL)
-		*cp = '\0';
-	    if (strcmp(rb[i], pkgs[j]) == 0) { /*match */
-		/*
-		 * Try to avoid deadlock if package A depends on B which in
-		 * turn depends on C and C due to an error depends on A.
-		 * It Should Never Happen[tm] in real life.
-		 */
-		if (check_loop[j]) {
-		    warnx("dependency loop detected for package %s", pkgs[j]);
-		    (*err_cnt)++;
-		}
-		else {
-		    check_loop[j] = 1;
-		    list_deps(pkgs[j],pkgs,listed,check_loop,newpkgs,nrnewpkgs,err_cnt);
-		    listed[j] = 1;
-		    newpkgs[*nrnewpkgs] = pkgs[j];
-		    (*nrnewpkgs)++;
-		}
-	    }
-	    if (cp != NULL)
-		*cp = ':';
-	}
-}
-
-/*
- * Load +REQUIRED_BY file and return a list with names of
- * packages that require package referred to by `pkgname'.
- *
- * Optionally check that packages listed there are actually
- * installed and filter out those that don't (filter == TRUE).
- *
- * strict argument controls whether the caller want warnings
- * to be emitted when there are some non-fatal conditions,
- * i.e. package doesn't have +REQUIRED_BY file or some packages
- * listed in +REQUIRED_BY don't exist.
- *
- * Result returned in the **list, while return value is equal
- * to the number of entries in the resulting list. Print error
- * message and return -1 on error.
- */
-int
-requiredby(const char *pkgname, struct reqr_by_head **list, Boolean strict, Boolean filter)
-{
-    FILE *fp;
-    char fbuf[FILENAME_MAX], fname[FILENAME_MAX];
-    int retval;
-    struct reqr_by_entry *rb_entry;
-    static struct reqr_by_head rb_list = STAILQ_HEAD_INITIALIZER(rb_list);
-
-    *list = &rb_list;
-    /* Deallocate any previously allocated space */
-    while (!STAILQ_EMPTY(&rb_list)) {
-	rb_entry = STAILQ_FIRST(&rb_list);
-	STAILQ_REMOVE_HEAD(&rb_list, link);
-	free(rb_entry);
-    }
-
-    if (isinstalledpkg(pkgname) <= 0) {
-	if (strict == TRUE)
-	    warnx("no such package '%s' installed", pkgname);
-	return -1;
-    }
-
-    snprintf(fname, sizeof(fname), "%s/%s/%s", LOG_DIR, pkgname,
-	     REQUIRED_BY_FNAME);
-    fp = fopen(fname, "r");
-    if (fp == NULL) {
-	/* Probably pkgname doesn't have any packages that depend on it */
-	if (strict == TRUE)
-	    warnx("couldn't open dependency file '%s'", fname);
-	return 0;
-    }
-
-    retval = 0;
-    while (fgets(fbuf, sizeof(fbuf), fp) != NULL) {
-	if (fbuf[strlen(fbuf) - 1] == '\n')
-	    fbuf[strlen(fbuf) - 1] = '\0';
-	if (filter == TRUE && isinstalledpkg(fbuf) <= 0) {
-	    if (strict == TRUE)
-		warnx("package '%s' is recorded in the '%s' but isn't "
-		      "actually installed", fbuf, fname);
-	    continue;
-	}
-	retval++;
-	rb_entry = malloc(sizeof(*rb_entry));
-	if (rb_entry == NULL) {
-	    warnx("%s(): malloc() failed", __func__);
-	    retval = -1;
-	    break;
-	}
-	strlcpy(rb_entry->pkgname, fbuf, sizeof(rb_entry->pkgname));
-	STAILQ_INSERT_TAIL(&rb_list, rb_entry, link);
-    }
-    fclose(fp);
-
-    return retval;
-}
diff --git a/usr.sbin/pkg_install/lib/exec.c b/usr.sbin/pkg_install/lib/exec.c
deleted file mode 100644
index c0b4ac32997..00000000000
--- a/usr.sbin/pkg_install/lib/exec.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Miscellaneous system routines.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <err.h>
-
-/*
- * Unusual system() substitute.  Accepts format string and args,
- * builds and executes command.  Returns exit code.
- */
-
-int
-vsystem(const char *fmt, ...)
-{
-    va_list args;
-    char *cmd;
-    long maxargs;
-    int ret;
-
-    maxargs = sysconf(_SC_ARG_MAX);
-    maxargs -= 32;			/* some slop for the sh -c */
-    cmd = malloc(maxargs);
-    if (!cmd) {
-	warnx("vsystem can't alloc arg space");
-	return 1;
-    }
-
-    va_start(args, fmt);
-    if (vsnprintf(cmd, maxargs, fmt, args) > maxargs) {
-	warnx("vsystem args are too long");
-	va_end(args);
-	return 1;
-    }
-#ifdef DEBUG
-printf("Executing %s\n", cmd);
-#endif
-    ret = system(cmd);
-    va_end(args);
-    free(cmd);
-    return ret;
-}
-
-char *
-vpipe(const char *fmt, ...)
-{
-   FILE *fp;
-   char *cmd, *rp;
-   long maxargs;
-   va_list args;
-
-    rp = malloc(MAXPATHLEN);
-    if (!rp) {
-	warnx("vpipe can't alloc buffer space");
-	return NULL;
-    }
-    maxargs = sysconf(_SC_ARG_MAX);
-    maxargs -= 32;			    /* some slop for the sh -c */
-    cmd = alloca(maxargs);
-    if (!cmd) {
-	warnx("vpipe can't alloc arg space");
-	return NULL;
-    }
-
-    va_start(args, fmt);
-    if (vsnprintf(cmd, maxargs, fmt, args) > maxargs) {
-	warnx("vsystem args are too long");
-	va_end(args);
-	return NULL;
-    }
-#ifdef DEBUG
-    fprintf(stderr, "Executing %s\n", cmd);
-#endif
-    fflush(NULL);
-    fp = popen(cmd, "r");
-    if (fp == NULL) {
-	warnx("popen() failed");
-	va_end(args);
-	return NULL;
-    }
-    get_string(rp, MAXPATHLEN, fp);
-#ifdef DEBUG
-    fprintf(stderr, "Returned %s\n", rp);
-#endif
-    va_end(args);
-    if (pclose(fp) || (strlen(rp) == 0)) {
-	free(rp);
-	return NULL;
-    }
-    return rp;
-}
diff --git a/usr.sbin/pkg_install/lib/file.c b/usr.sbin/pkg_install/lib/file.c
deleted file mode 100644
index 98413c6c5bf..00000000000
--- a/usr.sbin/pkg_install/lib/file.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Miscellaneous file access utilities.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <err.h>
-#include <pwd.h>
-#include <time.h>
-#include <sys/wait.h>
-
-/* Quick check to see if a file exists */
-Boolean
-fexists(const char *fname)
-{
-    int fd;
-
-    if ((fd = open(fname, O_RDONLY)) == -1)
-	return FALSE;
-
-    close(fd);
-    return TRUE;
-}
-
-/* Quick check to see if something is a directory or symlink to a directory */
-Boolean
-isdir(const char *fname)
-{
-    struct stat sb;
-
-    if (lstat(fname, &sb) != FAIL && S_ISDIR(sb.st_mode))
-	return TRUE;
-    else if (lstat(strconcat(fname, "/."), &sb) != FAIL && S_ISDIR(sb.st_mode))
-	return TRUE;
-    else
-	return FALSE;
-}
-
-/* Check to see if file is a dir or symlink to a dir, and is empty */
-Boolean
-isemptydir(const char *fname)
-{
-    if (isdir(fname)) {
-	DIR *dirp;
-	struct dirent *dp;
-
-	dirp = opendir(fname);
-	if (!dirp)
-	    return FALSE;	/* no perms, leave it alone */
-	for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
-	    if (strcmp(dp->d_name, ".") && strcmp(dp->d_name, "..")) {
-		closedir(dirp);
-		return FALSE;
-	    }
-	}
-	(void)closedir(dirp);
-	return TRUE;
-    }
-    return FALSE;
-}
-
-/*
- * Returns TRUE if file is a regular file or symlink pointing to a regular
- * file
- */
-Boolean
-isfile(const char *fname)
-{
-    struct stat sb;
-    if (stat(fname, &sb) != FAIL && S_ISREG(sb.st_mode))
-	return TRUE;
-    return FALSE;
-}
-
-/*
- * Check to see if file is a file or symlink pointing to a file and is empty.
- * If nonexistent or not a file, say "it's empty", otherwise return TRUE if
- * zero sized.
- */
-Boolean
-isemptyfile(const char *fname)
-{
-    struct stat sb;
-    if (stat(fname, &sb) != FAIL && S_ISREG(sb.st_mode)) {
-	if (sb.st_size != 0)
-	    return FALSE;
-    }
-    return TRUE;
-}
-
-/* Returns TRUE if file is a symbolic link. */
-Boolean
-issymlink(const char *fname)
-{
-    struct stat sb;
-    if (lstat(fname, &sb) != FAIL && S_ISLNK(sb.st_mode))
-	return TRUE;
-    return FALSE;
-}
-
-/* Returns TRUE if file is a URL specification */
-Boolean
-isURL(const char *fname)
-{
-    /*
-     * I'm sure there are other types of URL specifications that I could
-     * also be looking for here, but for now I'll just be happy to get ftp
-     * and http working.
-     */
-    if (!fname)
-	return FALSE;
-    while (isspace(*fname))
-	++fname;
-    if (!strncmp(fname, "ftp://", 6) || !strncmp(fname, "http://", 7) ||
-	!strncmp(fname, "https://", 8) || !strncmp(fname, "file://", 7))
-	return TRUE;
-    return FALSE;
-}
-
-char *
-fileFindByPath(const char *base, const char *fname)
-{
-    static char tmp[FILENAME_MAX];
-    char *cp;
-    const char *suffixes[] = {".tbz", ".tgz", ".tar", ".txz", NULL};
-    int i;
-
-    if (fexists(fname) && isfile(fname)) {
-	strcpy(tmp, fname);
-	return tmp;
-    }
-    if (base) {
-	strcpy(tmp, base);
-
-	cp = strrchr(tmp, '/');
-	if (cp) {
-	    *cp = '\0';	/* chop name */
-	    cp = strrchr(tmp, '/');
-	}
-	if (cp)
-	    for (i = 0; suffixes[i] != NULL; i++) {
-		*(cp + 1) = '\0';
-		strcat(cp, "All/");
-		strcat(cp, fname);
-		strcat(cp, suffixes[i]);
-		if (fexists(tmp))
-		    return tmp;
-	    }
-    }
-
-    cp = getenv("PKG_PATH");
-    while (cp) {
-	char *cp2 = strsep(&cp, ":");
-
-	for (i = 0; suffixes[i] != NULL; i++) {
-	    snprintf(tmp, FILENAME_MAX, "%s/%s%s", cp2 ? cp2 : cp, fname, suffixes[i]);
-	    if (fexists(tmp) && isfile(tmp))
-		return tmp;
-	}
-    }
-    return NULL;
-}
-
-char *
-fileGetContents(const char *fname)
-{
-    char *contents;
-    struct stat sb;
-    int fd;
-
-    if (stat(fname, &sb) == FAIL) {
-	cleanup(0);
-	errx(2, "%s: can't stat '%s'", __func__, fname);
-    }
-
-    contents = (char *)malloc(sb.st_size + 1);
-    fd = open(fname, O_RDONLY, 0);
-    if (fd == FAIL) {
-	cleanup(0);
-	errx(2, "%s: unable to open '%s' for reading", __func__, fname);
-    }
-    if (read(fd, contents, sb.st_size) != sb.st_size) {
-	cleanup(0);
-	errx(2, "%s: short read on '%s' - did not get %lld bytes", __func__,
-	     fname, (long long)sb.st_size);
-    }
-    close(fd);
-    contents[sb.st_size] = '\0';
-    return contents;
-}
-
-/*
- * Takes a filename and package name, returning (in "try") the
- * canonical "preserve" name for it.
- */
-Boolean
-make_preserve_name(char *try, int max, const char *name, const char *file)
-{
-    int len, i;
-
-    if ((len = strlen(file)) == 0)
-	return FALSE;
-    else
-	i = len - 1;
-    strncpy(try, file, max);
-    if (try[i] == '/') /* Catch trailing slash early and save checking in the loop */
-	--i;
-    for (; i; i--) {
-	if (try[i] == '/') {
-	    try[i + 1]= '.';
-	    strncpy(&try[i + 2], &file[i + 1], max - i - 2);
-	    break;
-	}
-    }
-    if (!i) {
-	try[0] = '.';
-	strncpy(try + 1, file, max - 1);
-    }
-    /* I should probably be called rude names for these inline assignments */
-    strncat(try, ".",  max -= strlen(try));
-    strncat(try, name, max -= strlen(name));
-    strncat(try, ".",  max--);
-    strncat(try, "backup", max -= 6);
-    return TRUE;
-}
-
-/* Write the contents of "str" to a file */
-void
-write_file(const char *name, const char *str)
-{
-    FILE *fp;
-    size_t len;
-
-    fp = fopen(name, "w");
-    if (!fp) {
-	cleanup(0);
-	errx(2, "%s: cannot fopen '%s' for writing", __func__, name);
-    }
-    len = strlen(str);
-    if (fwrite(str, 1, len, fp) != len) {
-	cleanup(0);
-	errx(2, "%s: short fwrite on '%s', tried to write %ld bytes",
-	    __func__, name, (long)len);
-    }
-    if (fclose(fp)) {
-	cleanup(0);
-	errx(2, "%s: failure to fclose '%s'", __func__, name);
-    }
-}
-
-void
-copy_file(const char *dir, const char *fname, const char *to)
-{
-    char cmd[FILENAME_MAX];
-
-    if (fname[0] == '/')
-	snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s %s", fname, to);
-    else
-	snprintf(cmd, FILENAME_MAX, "/bin/cp -r %s/%s %s", dir, fname, to);
-    if (vsystem(cmd)) {
-	cleanup(0);
-	errx(2, "%s: could not perform '%s'", __func__, cmd);
-    }
-}
-
-void
-move_file(const char *dir, const char *fname, const char *tdir)
-{
-    char from[FILENAME_MAX];
-    char to[FILENAME_MAX];
-
-    if (fname[0] == '/')
-	strncpy(from, fname, FILENAME_MAX);
-    else
-	snprintf(from, FILENAME_MAX, "%s/%s", dir, fname);
-
-    snprintf(to, FILENAME_MAX, "%s/%s", tdir, fname);
-
-    if (rename(from, to) == -1) {
-        if (vsystem("/bin/mv %s %s", from, to)) {
-	    cleanup(0);
-	    errx(2, "%s: could not move '%s' to '%s'", __func__, from, to);
-	}
-    }
-}
-
-/*
- * Copy a hierarchy (possibly from dir) to the current directory, or
- * if "to" is TRUE, from the current directory to a location someplace
- * else.
- *
- * Though slower, using tar to copy preserves symlinks and everything
- * without me having to write some big hairy routine to do it.
- */
-void
-copy_hierarchy(const char *dir, const char *fname, Boolean to)
-{
-    char cmd[FILENAME_MAX * 3];
-
-    if (!to) {
-	/* If absolute path, use it */
-	if (*fname == '/')
-	    dir = "/";
-	snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - -C %s %s | /usr/bin/tar xpf -",
-		 dir, fname);
-    }
-    else
-	snprintf(cmd, FILENAME_MAX * 3, "/usr/bin/tar cf - %s | /usr/bin/tar xpf - -C %s",
-		 fname, dir);
-#ifdef DEBUG
-    printf("Using '%s' to copy trees.\n", cmd);
-#endif
-    if (system(cmd)) {
-	cleanup(0);
-	errx(2, "%s: could not perform '%s'", __func__, cmd);
-    }
-}
-
-/* Unpack a tar file */
-int
-unpack(const char *pkg, const char *flist)
-{
-    const char *comp, *cp;
-    char suff[80];
-
-    comp = "";
-    /*
-     * Figure out by a crude heuristic whether this or not this is probably
-     * compressed and whichever compression utility was used (gzip or bzip2).
-     */
-    if (strcmp(pkg, "-")) {
-	cp = strrchr(pkg, '.');
-	if (cp) {
-	    strcpy(suff, cp + 1);
-	    if (strchr(suff, 'z') || strchr(suff, 'Z')) {
-		if (strchr(suff, 'b'))
-		    comp = "-j";
-		else
-		    comp = "-z";
-	    }
-	}
-    }
-    else
-	comp = "-j";
-    if (vsystem("/usr/bin/tar -xp %s -f '%s' %s", comp, pkg, flist ? flist : "")) {
-	warnx("tar extract of %s failed!", pkg);
-	return 1;
-    }
-    return 0;
-}
-
-/*
- * Using fmt, replace all instances of:
- *
- * %F	With the parameter "name"
- * %D	With the parameter "dir"
- * %B	Return the directory part ("base") of %D/%F
- * %f	Return the filename part of %D/%F
- *
- * Does not check for overflow - caution!
- *
- */
-void
-format_cmd(char *buf, int max, const char *fmt, const char *dir, const char *name)
-{
-    char *cp, scratch[FILENAME_MAX * 2];
-    int l;
-
-    while (*fmt && max > 0) {
-	if (*fmt == '%') {
-	    switch (*++fmt) {
-	    case 'F':
-		strncpy(buf, name, max);
-		l = strlen(name);
-		buf += l, max -= l;
-		break;
-
-	    case 'D':
-		strncpy(buf, dir, max);
-		l = strlen(dir);
-		buf += l, max -= l;
-		break;
-
-	    case 'B':
-		snprintf(scratch, FILENAME_MAX * 2, "%s/%s", dir, name);
-		cp = &scratch[strlen(scratch) - 1];
-		while (cp != scratch && *cp != '/')
-		    --cp;
-		*cp = '\0';
-		strncpy(buf, scratch, max);
-		l = strlen(scratch);
-		buf += l, max -= l;
-		break;
-
-	    case 'f':
-		snprintf(scratch, FILENAME_MAX * 2, "%s/%s", dir, name);
-		cp = &scratch[strlen(scratch) - 1];
-		while (cp != scratch && *(cp - 1) != '/')
-		    --cp;
-		strncpy(buf, cp, max);
-		l = strlen(cp);
-		buf += l, max -= l;
-		break;
-
-	    default:
-		*buf++ = *fmt;
-		--max;
-		break;
-	    }
-	    ++fmt;
-	}
-	else {
-	    *buf++ = *fmt++;
-	    --max;
-	}
-    }
-    *buf = '\0';
-}
diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c
deleted file mode 100644
index 25d2a539bd3..00000000000
--- a/usr.sbin/pkg_install/lib/global.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
-
- * 18 July 1993
- *
- * Semi-convenient place to stick some needed globals.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-
-/* These are global for all utils */
-Boolean	Quiet		= FALSE;
-Boolean	Fake		= FALSE;
-Boolean	Force		= FALSE;
-int AutoAnswer		= FALSE;
-int	Verbose			= 0;		/* Allow multiple levels of verbose. */
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
deleted file mode 100644
index 77b2c716df4..00000000000
--- a/usr.sbin/pkg_install/lib/lib.h
+++ /dev/null
@@ -1,243 +0,0 @@
-/* $FreeBSD$ */
-
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Include and define various things wanted by the library routines.
- *
- */
-
-#ifndef _INST_LIB_LIB_H_
-#define _INST_LIB_LIB_H_
-
-/* Includes */
-#include <sys/param.h>
-#include <sys/file.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-#include <sys/utsname.h>
-#include <ctype.h>
-#include <dirent.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Macros */
-#define SUCCESS	(0)
-#define	FAIL	(-1)
-
-#ifndef TRUE
-#define TRUE	(1)
-#endif
-
-#ifndef FALSE
-#define FALSE	(0)
-#endif
-
-#define YES		2
-#define NO		1
-
-/* Some more stat macros. */
-#define S_IRALL		0000444
-#define S_IWALL		0000222
-#define S_IXALL		0000111
-
-/* Usually "rm", but often "echo" during debugging! */
-#define REMOVE_CMD	"/bin/rm"
-
-/* Usually "rm", but often "echo" during debugging! */
-#define RMDIR_CMD	"/bin/rmdir"
-
-/* Where the ports lives by default */
-#define DEF_PORTS_DIR   "/usr/ports"
-/* just in case we change the environment variable name */
-#define PORTSDIR    "PORTSDIR"
-/* macro to get name of directory where the ports lives */
-#define PORTS_DIR       (getenv(PORTSDIR) ? getenv(PORTSDIR) : DEF_PORTS_DIR)
-
-/* Where we put logging information by default, else ${PKG_DBDIR} if set */
-#define DEF_LOG_DIR	"/var/db/pkg"
-/* just in case we change the environment variable name */
-#define PKG_DBDIR	"PKG_DBDIR"
-/* macro to get name of directory where we put logging information */
-#define LOG_DIR		(getenv(PKG_DBDIR) ? getenv(PKG_DBDIR) : DEF_LOG_DIR)
-
-/* The names of our "special" files */
-#define CONTENTS_FNAME		"+CONTENTS"
-#define COMMENT_FNAME		"+COMMENT"
-#define DESC_FNAME		"+DESC"
-#define INSTALL_FNAME		"+INSTALL"
-#define POST_INSTALL_FNAME	"+POST-INSTALL"
-#define DEINSTALL_FNAME		"+DEINSTALL"
-#define POST_DEINSTALL_FNAME	"+POST-DEINSTALL"
-#define REQUIRE_FNAME		"+REQUIRE"
-#define REQUIRED_BY_FNAME	"+REQUIRED_BY"
-#define DISPLAY_FNAME		"+DISPLAY"
-#define MTREE_FNAME		"+MTREE_DIRS"
-
-#define CMD_CHAR		'@'	/* prefix for extended PLIST cmd */
-
-/* The name of the "prefix" environment variable given to scripts */
-#define PKG_PREFIX_VNAME	"PKG_PREFIX"
-
-/*
- * Version of the package tools - increase whenever you make a change
- * in the code that is not cosmetic only.
- */
-#define PKG_INSTALL_VERSION	20130122
-
-#define PKG_WRAPCONF_FNAME	"/var/db/pkg_install.conf"
-#define main(argc, argv)	real_main(argc, argv)
-
-/* Version numbers to assist with changes in package file format */
-#define PLIST_FMT_VER_MAJOR	1
-#define PLIST_FMT_VER_MINOR	1
-
-enum _plist_t {
-    PLIST_FILE, PLIST_CWD, PLIST_CMD, PLIST_CHMOD,
-    PLIST_CHOWN, PLIST_CHGRP, PLIST_COMMENT, PLIST_IGNORE,
-    PLIST_NAME, PLIST_UNEXEC, PLIST_SRC, PLIST_DISPLAY,
-    PLIST_PKGDEP, PLIST_CONFLICTS, PLIST_MTREE, PLIST_DIR_RM,
-    PLIST_IGNORE_INST, PLIST_OPTION, PLIST_ORIGIN, PLIST_DEPORIGIN,
-    PLIST_NOINST
-};
-typedef enum _plist_t plist_t;
-
-enum _match_t {
-    MATCH_ALL, MATCH_EXACT, MATCH_GLOB, MATCH_NGLOB, MATCH_EREGEX, MATCH_REGEX
-};
-typedef enum _match_t match_t;
-
-/* Types */
-typedef unsigned int Boolean;
-
-struct _plist {
-    struct _plist *prev, *next;
-    char *name;
-    Boolean marked;
-    plist_t type;
-};
-typedef struct _plist *PackingList;
-
-struct _pack {
-    struct _plist *head, *tail;
-    const char *name;
-    const char *origin;
-    int fmtver_maj, fmtver_mnr;
-};
-typedef struct _pack Package;
-
-struct reqr_by_entry {
-    STAILQ_ENTRY(reqr_by_entry) link;
-    char pkgname[PATH_MAX];
-};
-STAILQ_HEAD(reqr_by_head, reqr_by_entry);
-
-/* Prototypes */
-/* Misc */
-int		vsystem(const char *, ...);
-char		*vpipe(const char *, ...);
-void		cleanup(int);
-const char	*make_playpen(char *, off_t);
-char		*where_playpen(void);
-int		leave_playpen(void);
-off_t		min_free(const char *);
-void		warnpkgng(void);
-
-/* String */
-char 		*get_dash_string(char **);
-char		*copy_string(const char *);
-char		*copy_string_adds_newline(const char *);
-Boolean		suffix(const char *, const char *);
-void		nuke_suffix(char *);
-void		str_lowercase(char *);
-char		*strconcat(const char *, const char *);
-char		*get_string(char *, int, FILE *);
-
-/* File */
-Boolean		fexists(const char *);
-Boolean		isdir(const char *);
-Boolean		isemptydir(const char *fname);
-Boolean		isemptyfile(const char *fname);
-Boolean		isfile(const char *);
-Boolean		isempty(const char *);
-Boolean		issymlink(const char *);
-Boolean		isURL(const char *);
-const char	*fileGetURL(const char *, const char *, int);
-char		*fileFindByPath(const char *, const char *);
-char		*fileGetContents(const char *);
-void		write_file(const char *, const char *);
-void		copy_file(const char *, const char *, const char *);
-void		move_file(const char *, const char *, const char *);
-void		copy_hierarchy(const char *, const char *, Boolean);
-int		delete_hierarchy(const char *, Boolean, Boolean);
-int		unpack(const char *, const char *);
-void		format_cmd(char *, int, const char *, const char *, const char *);
-
-/* Msg */
-void		upchuck(const char *);
-void		barf(const char *, ...);
-void		whinge(const char *, ...);
-Boolean		y_or_n(Boolean, const char *, ...);
-
-/* Packing list */
-PackingList	new_plist_entry(void);
-PackingList	last_plist(Package *);
-PackingList	find_plist(Package *, plist_t);
-char		*find_plist_option(Package *, const char *name);
-void		plist_delete(Package *, Boolean, plist_t, const char *);
-void		free_plist(Package *);
-void		mark_plist(Package *);
-void		csum_plist_entry(char *, PackingList);
-void		add_plist(Package *, plist_t, const char *);
-void		add_plist_top(Package *, plist_t, const char *);
-void		delete_plist(Package *pkg, Boolean all, plist_t type, const char *name);
-void		write_plist(Package *, FILE *);
-void		read_plist(Package *, FILE *);
-int		plist_cmd(const char *, char **);
-int		delete_package(Boolean, Boolean, Package *);
-Boolean 	make_preserve_name(char *, int, const char *, const char *);
-
-/* For all */
-int		pkg_perform(char **);
-int		real_main(int, char **);
-
-/* Query installed packages */
-char		**matchinstalled(match_t, char **, int *);
-char		**matchbyorigin(const char *, int *);
-char		***matchallbyorigin(const char **, int *);
-int		isinstalledpkg(const char *name);
-int		pattern_match(match_t MatchType, char *pattern, const char *pkgname);
-
-/* Dependencies */
-int		sortdeps(char **);
-int		chkifdepends(const char *, const char *);
-int		requiredby(const char *, struct reqr_by_head **, Boolean, Boolean);
-
-/* Version */
-int		verscmp(Package *, int, int);
-int		version_cmp(const char *, const char *);
-
-/* Externs */
-extern Boolean	Quiet;
-extern Boolean	Fake;
-extern Boolean  Force;
-extern int	AutoAnswer;
-extern int	Verbose;
-
-#endif /* _INST_LIB_LIB_H_ */
diff --git a/usr.sbin/pkg_install/lib/match.c b/usr.sbin/pkg_install/lib/match.c
deleted file mode 100644
index 905d7cb1f6a..00000000000
--- a/usr.sbin/pkg_install/lib/match.c
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Maxim Sobolev
- * 24 February 2001
- *
- * Routines used to query installed packages.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <err.h>
-#include <fnmatch.h>
-#include <fts.h>
-#include <regex.h>
-
-/*
- * Simple structure representing argv-like
- * NULL-terminated list.
- */
-struct store {
-    int currlen;
-    int used;
-    char **store;
-};
-
-static int rex_match(const char *, const char *, int);
-static int csh_match(const char *, const char *, int);
-struct store *storecreate(struct store *);
-static int storeappend(struct store *, const char *);
-static int fname_cmp(const FTSENT * const *, const FTSENT * const *);
-
-/*
- * Function to query names of installed packages.
- * MatchType	- one of MATCH_ALL, MATCH_EREGEX, MATCH_REGEX, MATCH_GLOB, MATCH_NGLOB;
- * patterns	- NULL-terminated list of glob or regex patterns
- *		  (could be NULL for MATCH_ALL);
- * retval	- return value (could be NULL if you don't want/need
- *		  return value).
- * Returns NULL-terminated list with matching names.
- * Names in list returned are dynamically allocated and should
- * not be altered by the caller.
- */
-char **
-matchinstalled(match_t MatchType, char **patterns, int *retval)
-{
-    int i, errcode, len;
-    char *matched;
-    const char *paths[2] = {LOG_DIR, NULL};
-    static struct store *store = NULL;
-    FTS *ftsp;
-    FTSENT *f;
-    Boolean *lmatched = NULL;
-
-    store = storecreate(store);
-    if (store == NULL) {
-	if (retval != NULL)
-	    *retval = 1;
-	return NULL;
-    }
-
-    if (retval != NULL)
-	*retval = 0;
-
-    if (!isdir(paths[0])) {
-	if (retval != NULL)
-	    *retval = 1;
-	return NULL;
-	/* Not reached */
-    }
-
-    /* Count number of patterns */
-    if (patterns != NULL) {
-	for (len = 0; patterns[len]; len++) {}
-	lmatched = alloca(sizeof(*lmatched) * len);
-	if (lmatched == NULL) {
-	    warnx("%s(): alloca() failed", __func__);
-	    if (retval != NULL)
-		*retval = 1;
-	    return NULL;
-    	} 
-    } else
-	len = 0;
-    
-    for (i = 0; i < len; i++)
-	lmatched[i] = FALSE;
-
-    ftsp = fts_open((char * const *)(uintptr_t)paths, FTS_LOGICAL | FTS_NOCHDIR | FTS_NOSTAT, fname_cmp);
-    if (ftsp != NULL) {
-	while ((f = fts_read(ftsp)) != NULL) {
-	    if (f->fts_info == FTS_D && f->fts_level == 1) {
-		fts_set(ftsp, f, FTS_SKIP);
-		matched = NULL;
-		errcode = 0;
-		if (MatchType == MATCH_ALL)
-		    matched = f->fts_name;
-		else 
-		    for (i = 0; patterns[i]; i++) {
-			errcode = pattern_match(MatchType, patterns[i], f->fts_name);
-			if (errcode == 1) {
-			    matched = f->fts_name;
-			    lmatched[i] = TRUE;
-			    errcode = 0;
-			}
-			if (matched != NULL || errcode != 0)
-			    break;
-		    }
-		if (errcode == 0 && matched != NULL)
-		    errcode = storeappend(store, matched);
-		if (errcode != 0) {
-		    if (retval != NULL)
-			*retval = 1;
-		    return NULL;
-		    /* Not reached */
-		}
-	    }
-	}
-	fts_close(ftsp);
-    }
-
-    if (MatchType == MATCH_GLOB) {
-	for (i = 0; i < len; i++)
-	    if (lmatched[i] == FALSE)
-		storeappend(store, patterns[i]);
-    }
-
-    if (store->used == 0)
-	return NULL;
-    else
-	return store->store;
-}
-
-int
-pattern_match(match_t MatchType, char *pattern, const char *pkgname)
-{
-    int errcode = 0;
-    const char *fname = pkgname;
-    char basefname[PATH_MAX];
-    char condchar = '\0';
-    char *condition;
-
-    /* do we have an appended condition? */
-    condition = strpbrk(pattern, "<>=");
-    if (condition) {
-	const char *ch;
-	/* yes, isolate the pattern from the condition ... */
-	if (condition > pattern && condition[-1] == '!')
-	    condition--;
-	condchar = *condition;
-	*condition = '\0';
-	/* ... and compare the name without version */
-	ch = strrchr(fname, '-');
-	if (ch && ch - fname < PATH_MAX) {
-	    strlcpy(basefname, fname, ch - fname + 1);
-	    fname = basefname;
-	}
-    }
-
-    switch (MatchType) {
-    case MATCH_EREGEX:
-    case MATCH_REGEX:
-	errcode = rex_match(pattern, fname, MatchType == MATCH_EREGEX ? 1 : 0);
-	break;
-    case MATCH_NGLOB:
-    case MATCH_GLOB:
-	errcode = (csh_match(pattern, fname, 0) == 0) ? 1 : 0;
-	break;
-    case MATCH_EXACT:
-	errcode = (strcmp(pattern, fname) == 0) ? 1 : 0;
-	break;
-    case MATCH_ALL:
-	errcode = 1;
-	break;
-    default:
-	break;
-    }
-
-    /* loop over all appended conditions */
-    while (condition) {
-	/* restore the pattern */
-	*condition = condchar;
-	/* parse the condition (fun with bits) */
-	if (errcode == 1) {
-	    char *nextcondition;
-	    /* compare version numbers */
-	    int match = 0;
-	    if (*++condition == '=') {
-		match = 2;
-		condition++;
-	    }
-	    switch(condchar) {
-	    case '<':
-		match |= 1;
-		break;
-	    case '>':
-		match |= 4;
-		break;
-	    case '=':
-		match |= 2;
-		break;
-	    case '!':
-		match = 5;
-		break;
-	    }
-	    /* isolate the version number from the next condition ... */
-	    nextcondition = strpbrk(condition, "<>=!");
-	    if (nextcondition) {
-		condchar = *nextcondition;
-		*nextcondition = '\0';
-	    }
-	    /* and compare the versions (version_cmp removes the filename for us) */
-	    if ((match & (1 << (version_cmp(pkgname, condition) + 1))) == 0)
-		errcode = 0;
-	    condition = nextcondition;
-	} else {
-	    break;
-	}
-    }
-
-    return errcode;
-}
-
-/*
- * Synopsis is similar to matchinstalled(), but use origin
- * as a key for matching packages.
- */
-char ***
-matchallbyorigin(const char **origins, int *retval)
-{
-    char **installed, **allorigins = NULL;
-    char ***matches = NULL;
-    int i, j;
-
-    if (retval != NULL)
-	*retval = 0;
-
-    installed = matchinstalled(MATCH_ALL, NULL, retval);
-    if (installed == NULL)
-	return NULL;
-
-    /* Gather origins for all installed packages */
-    for (i = 0; installed[i] != NULL; i++) {
-	FILE *fp;
-	char *buf, *cp, tmp[PATH_MAX];
-	int cmd;
-
-	allorigins = realloc(allorigins, (i + 1) * sizeof(*allorigins));
-	allorigins[i] = NULL;
-
-	snprintf(tmp, PATH_MAX, "%s/%s", LOG_DIR, installed[i]);
-	/*
-	 * SPECIAL CASE: ignore empty dirs, since we can can see them
-	 * during port installation.
-	 */
-	if (isemptydir(tmp))
-	    continue;
-	strncat(tmp, "/" CONTENTS_FNAME, PATH_MAX);
-	fp = fopen(tmp, "r");
-	if (fp == NULL) {
-	    warnx("the package info for package '%s' is corrupt", installed[i]);
-	    continue;
-	}
-
-	cmd = -1;
-	while (fgets(tmp, sizeof(tmp), fp)) {
-	    int len = strlen(tmp);
-
-	    while (len && isspace(tmp[len - 1]))
-		tmp[--len] = '\0';
-	    if (!len)
-		continue;
-	    cp = tmp;
-	    if (tmp[0] != CMD_CHAR)
-		continue;
-	    cmd = plist_cmd(tmp + 1, &cp);
-	    if (cmd == PLIST_ORIGIN) {
-		asprintf(&buf, "%s", cp);
-		allorigins[i] = buf;
-		break;
-	    }
-	}
-	if (cmd != PLIST_ORIGIN && ( Verbose || 0 != strncmp("bsdpan-", installed[i], 7 ) ) )
-	    warnx("package %s has no origin recorded", installed[i]);
-	fclose(fp);
-    }
-
-    /* Resolve origins into package names, retaining the sequence */
-    for (i = 0; origins[i] != NULL; i++) {
-	matches = realloc(matches, (i + 1) * sizeof(*matches));
-	struct store *store = NULL;
-	store = storecreate(store);
-
-	for (j = 0; installed[j] != NULL; j++) {
-	    if (allorigins[j]) {
-		if (csh_match(origins[i], allorigins[j], FNM_PATHNAME) == 0) {
-		    storeappend(store, installed[j]);
-		}
-	    }
-	}
-	if (store->used == 0)
-	    matches[i] = NULL;
-	else
-	    matches[i] = store->store;
-    }
-
-    if (allorigins) {
-	for (i = 0; installed[i] != NULL; i++)
-	    if (allorigins[i])
-		free(allorigins[i]);
-	free(allorigins);
-    }
-
-    return matches;
-}
-
-/*
- * Synopsis is similar to matchinstalled(), but use origin
- * as a key for matching packages.
- */
-char **
-matchbyorigin(const char *origin, int *retval)
-{
-   const char *origins[2];
-   char ***tmp;
-
-   origins[0] = origin;
-   origins[1] = NULL;
-
-   tmp = matchallbyorigin(origins, retval);
-   if (tmp && tmp[0]) {
-	return tmp[0];
-   } else {
-	return NULL;
-   }
-}
-
-/*
- * Small linked list to memoize results of isinstalledpkg().  A hash table
- * would be faster but for n ~= 1000 may be overkill.
- */
-struct iip_memo {
-	LIST_ENTRY(iip_memo) iip_link;
-	char	*iip_name;
-	int	 iip_result;
-};
-LIST_HEAD(, iip_memo) iip_memo = LIST_HEAD_INITIALIZER(iip_memo);
-
-/*
- * 
- * Return 1 if the specified package is installed,
- * 0 if not, and -1 if an error occurred.
- */
-int
-isinstalledpkg(const char *name)
-{
-    int result;
-    char *buf, *buf2;
-    struct iip_memo *memo;
-
-    LIST_FOREACH(memo, &iip_memo, iip_link) {
-	if (strcmp(memo->iip_name, name) == 0)
-	    return memo->iip_result;
-    }
-    
-    buf2 = NULL;
-    asprintf(&buf, "%s/%s", LOG_DIR, name);
-    if (buf == NULL)
-	goto errout;
-    if (!isdir(buf) || access(buf, R_OK) == FAIL) {
-	result = 0;
-    } else {
-	asprintf(&buf2, "%s/%s", buf, CONTENTS_FNAME);
-	if (buf2 == NULL)
-	    goto errout;
-
-	if (!isfile(buf2) || access(buf2, R_OK) == FAIL)
-	    result = -1;
-	else
-	    result = 1;
-    }
-
-    free(buf);
-    buf = strdup(name);
-    if (buf == NULL)
-	goto errout;
-    free(buf2);
-    buf2 = NULL;
-
-    memo = malloc(sizeof *memo);
-    if (memo == NULL)
-	goto errout;
-    memo->iip_name = buf;
-    memo->iip_result = result;
-    LIST_INSERT_HEAD(&iip_memo, memo, iip_link);
-    return result;
-
-errout:
-    if (buf != NULL)
-	free(buf);
-    if (buf2 != NULL)
-	free(buf2);
-    return -1;
-}
-
-/*
- * Returns 1 if specified pkgname matches RE pattern.
- * Otherwise returns 0 if doesn't match or -1 if RE
- * engine reported an error (usually invalid syntax).
- */
-static int
-rex_match(const char *pattern, const char *pkgname, int extended)
-{
-    char errbuf[128];
-    int errcode;
-    int retval;
-    regex_t rex;
-
-    retval = 0;
-
-    errcode = regcomp(&rex, pattern, (extended ? REG_EXTENDED : REG_BASIC) | REG_NOSUB);
-    if (errcode == 0)
-	errcode = regexec(&rex, pkgname, 0, NULL, 0);
-
-    if (errcode == 0) {
-	retval = 1;
-    } else if (errcode != REG_NOMATCH) {
-	regerror(errcode, &rex, errbuf, sizeof(errbuf));
-	warnx("%s: %s", pattern, errbuf);
-	retval = -1;
-    }
-
-    regfree(&rex);
-
-    return retval;
-}
-
-/*
- * Match string by a csh-style glob pattern. Returns 0 on
- * match and FNM_NOMATCH otherwise, to be compatible with
- * fnmatch(3).
- */
-static int
-csh_match(const char *pattern, const char *string, int flags)
-{
-    int ret = FNM_NOMATCH;
-
-
-    const char *nextchoice = pattern;
-    const char *current = NULL;
-
-    int prefixlen = -1;
-    int currentlen = 0;
-
-    int level = 0;
-
-    do {
-	const char *pos = nextchoice;
-	const char *postfix = NULL;
-
-	Boolean quoted = FALSE;
-
-	nextchoice = NULL;
-
-	do {
-	    const char *eb;
-	    if (!*pos) {
-		postfix = pos;
-	    } else if (quoted) {
-		quoted = FALSE;
-	    } else {
-		switch (*pos) {
-		case '{':
-		    ++level;
-		    if (level == 1) {
-			current = pos+1;
-			prefixlen = pos-pattern;
-		    }
-		    break;
-		case ',':
-		    if (level == 1 && !nextchoice) {
-			nextchoice = pos+1;
-			currentlen = pos-current;
-		    }
-		    break;
-		case '}':
-		    if (level == 1) {
-			postfix = pos+1;
-			if (!nextchoice)
-			    currentlen = pos-current;
-		    }
-		    level--;
-		    break;
-		case '[':
-		    eb = pos+1;
-		    if (*eb == '!' || *eb == '^')
-			eb++;
-		    if (*eb == ']')
-			eb++;
-		    while(*eb && *eb != ']')
-			eb++;
-		    if (*eb)
-			pos=eb;
-		    break;
-		case '\\':
-		    quoted = TRUE;
-		    break;
-		default:
-		    ;
-		}
-	    }
-	    pos++;
-	} while (!postfix);
-
-	if (current) {
-	    char buf[FILENAME_MAX];
-	    snprintf(buf, sizeof(buf), "%.*s%.*s%s", prefixlen, pattern, currentlen, current, postfix);
-	    ret = csh_match(buf, string, flags);
-	    if (ret) {
-		current = nextchoice;
-		level = 1;
-	    } else
-		current = NULL;
-	} else
-	    ret = fnmatch(pattern, string, flags);
-    } while (current);
-
-    return ret;
-}
-
-/*
- * Create an empty store, optionally deallocating
- * any previously allocated space if store != NULL.
- */
-struct store *
-storecreate(struct store *store)
-{
-    int i;
-
-    if (store == NULL) {
-	store = malloc(sizeof *store);
-	if (store == NULL) {
-	    warnx("%s(): malloc() failed", __func__);
-	    return NULL;
-	}
-	store->currlen = 0;
-	store->store = NULL;
-    } else if (store->store != NULL) {
-	    /* Free previously allocated memory */
-	    for (i = 0; store->store[i] != NULL; i++)
-		free(store->store[i]);
-	    store->store[0] = NULL;
-    }
-    store->used = 0;
-
-    return store;
-}
-
-/*
- * Append specified element to the provided store.
- */
-static int
-storeappend(struct store *store, const char *item)
-{
-    if (store->used + 2 > store->currlen) {
-	store->currlen += 16;
-	store->store = reallocf(store->store,
-				store->currlen * sizeof(*(store->store)));
-	if (store->store == NULL) {
-	    store->currlen = 0;
-	    warnx("%s(): reallocf() failed", __func__);
-	    return 1;
-	}
-    }
-
-    asprintf(&(store->store[store->used]), "%s", item);
-    if (store->store[store->used] == NULL) {
-	warnx("%s(): malloc() failed", __func__);
-	return 1;
-    }
-    store->used++;
-    store->store[store->used] = NULL;
-
-    return 0;
-}
-
-static int
-fname_cmp(const FTSENT * const *a, const FTSENT * const *b)
-{
-    return strcmp((*a)->fts_name, (*b)->fts_name);
-}
diff --git a/usr.sbin/pkg_install/lib/msg.c b/usr.sbin/pkg_install/lib/msg.c
deleted file mode 100644
index 57c84d321af..00000000000
--- a/usr.sbin/pkg_install/lib/msg.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Miscellaneous message routines.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <err.h>
-#include <paths.h>
-
-/* Die a relatively simple death */
-void
-upchuck(const char *message)
-{
-    cleanup(0);
-    errx(1, "fatal error during execution: %s", message);
-}
-
-/*
- * As a yes/no question, prompting from the varargs string and using
- * default if user just hits return.
- */
-Boolean
-y_or_n(Boolean def, const char *msg, ...)
-{
-    va_list args;
-    int ch = 0;
-    FILE *tty;
-
-    va_start(args, msg);
-    /*
-     * Need to open /dev/tty because file collection may have been
-     * collected on stdin
-     */
-    tty = fopen(_PATH_TTY, "r");
-    if (!tty) {
-	cleanup(0);
-	errx(2, "can't open %s!", _PATH_TTY);
-    }
-    while (ch != 'Y' && ch != 'N') {
-	vfprintf(stderr, msg, args);
-	if (def)
-	    fprintf(stderr, " [yes]? ");
-	else
-	    fprintf(stderr, " [no]? ");
-	fflush(stderr);
-	if (AutoAnswer) {
-	    ch = (AutoAnswer == YES) ? 'Y' : 'N';
-	    fprintf(stderr, "%c\n", ch);
-	}
-	else
-	    ch = toupper(fgetc(tty));
-	if (ch == '\n')
-	    ch = (def) ? 'Y' : 'N';
-    }
-    fclose(tty) ;
-    va_end(args);
-    return (ch == 'Y') ? TRUE : FALSE;
-}
diff --git a/usr.sbin/pkg_install/lib/pen.c b/usr.sbin/pkg_install/lib/pen.c
deleted file mode 100644
index f4ecd75a84a..00000000000
--- a/usr.sbin/pkg_install/lib/pen.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Routines for managing the "play pen".
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <err.h>
-#include <libutil.h>
-#include <libgen.h>
-#include <sys/signal.h>
-#include <sys/param.h>
-#include <sys/mount.h>
-
-/* For keeping track of where we are */
-static char PenLocation[FILENAME_MAX];
-
-char *
-where_playpen(void)
-{
-    return PenLocation;
-}
-
-/* Find a good place to play. */
-static char *
-find_play_pen(char *pen, off_t sz)
-{
-    char *cp;
-    struct stat sb;
-    char humbuf[6];
-
-    if (pen[0] && isdir(dirname(pen)) == TRUE && (min_free(dirname(pen)) >= sz))
-	return pen;
-    else if ((cp = getenv("PKG_TMPDIR")) != NULL && stat(cp, &sb) != FAIL && (min_free(cp) >= sz))
-	sprintf(pen, "%s/instmp.XXXXXX", cp);
-    else if ((cp = getenv("TMPDIR")) != NULL && stat(cp, &sb) != FAIL && (min_free(cp) >= sz))
-	sprintf(pen, "%s/instmp.XXXXXX", cp);
-    else if (stat("/var/tmp", &sb) != FAIL && min_free("/var/tmp") >= sz)
-	strcpy(pen, "/var/tmp/instmp.XXXXXX");
-    else if (stat("/tmp", &sb) != FAIL && min_free("/tmp") >= sz)
-	strcpy(pen, "/tmp/instmp.XXXXXX");
-    else if ((stat("/usr/tmp", &sb) == SUCCESS || mkdir("/usr/tmp", 01777) == SUCCESS) && min_free("/usr/tmp") >= sz)
-	strcpy(pen, "/usr/tmp/instmp.XXXXXX");
-    else {
-	cleanup(0);
-	humanize_number(humbuf, sizeof humbuf, sz, "", HN_AUTOSCALE,
-	    HN_NOSPACE);
-	errx(2,
-"%s: can't find enough temporary space to extract the files, please set your\n"
-"PKG_TMPDIR environment variable to a location with at least %s bytes\n"
-"free", __func__, humbuf);
-	return NULL;
-    }
-    return pen;
-}
-
-#define MAX_STACK	20
-static char *pstack[MAX_STACK];
-static int pdepth = -1;
-
-static const char *
-pushPen(const char *pen)
-{
-    if (++pdepth == MAX_STACK)
-	errx(2, "%s: stack overflow.\n", __func__);
-    pstack[pdepth] = strdup(pen);
-
-    return pstack[pdepth];
-}
-
-static void
-popPen(char *pen)
-{
-    if (pdepth == -1) {
-	pen[0] = '\0';
-	return;
-    }
-    strcpy(pen, pstack[pdepth]);
-    free(pstack[pdepth--]);
-}
-    
-/*
- * Make a temporary directory to play in and chdir() to it, returning
- * pathname of previous working directory.
- */
-const char *
-make_playpen(char *pen, off_t sz)
-{
-    char humbuf1[6], humbuf2[6];
-    char cwd[FILENAME_MAX];
-
-    if (!find_play_pen(pen, sz))
-	return NULL;
-
-    if (!mkdtemp(pen)) {
-	cleanup(0);
-	errx(2, "%s: can't mktemp '%s'", __func__, pen);
-    }
-
-    if (Verbose) {
-	if (sz) {
-	    humanize_number(humbuf1, sizeof humbuf1, sz, "", HN_AUTOSCALE,
-	        HN_NOSPACE);
-	    humanize_number(humbuf2, sizeof humbuf2, min_free(pen),
-	        "", HN_AUTOSCALE, HN_NOSPACE);
-	    fprintf(stderr, "Requested space: %s bytes, free space: %s bytes in %s\n", humbuf1, humbuf2, pen);
-	}
-    }
-
-    if (min_free(pen) < sz) {
-	rmdir(pen);
-	cleanup(0);
-	errx(2, "%s: not enough free space to create '%s'.\n"
-	     "Please set your PKG_TMPDIR environment variable to a location\n"
-	     "with more space and\ntry the command again", __func__, pen);
-    }
-
-    if (!getcwd(cwd, FILENAME_MAX)) {
-	upchuck("getcwd");
-	return NULL;
-    }
-
-    if (chdir(pen) == FAIL) {
-	cleanup(0);
-	errx(2, "%s: can't chdir to '%s'", __func__, pen);
-    }
-
-    strcpy(PenLocation, pen);
-    return pushPen(cwd);
-}
-
-/* Convenience routine for getting out of playpen */
-int
-leave_playpen()
-{
-    static char left[FILENAME_MAX];
-    void (*oldsig)(int);
-
-    if (!PenLocation[0])
-	return 0;
-
-    /* Don't interrupt while we're cleaning up */
-    oldsig = signal(SIGINT, SIG_IGN);
-    strcpy(left, PenLocation);
-    popPen(PenLocation);
-
-    if (chdir(PenLocation) == FAIL) {
-	cleanup(0);
-	errx(2, "%s: can't chdir back to '%s'", __func__, PenLocation);
-    }
-
-    if (left[0] == '/' && vsystem("/bin/rm -rf %s", left))
-	warnx("couldn't remove temporary dir '%s'", left);
-    signal(SIGINT, oldsig);
-
-    return 1;
-}
-
-off_t
-min_free(const char *tmpdir)
-{
-    struct statfs buf;
-
-    if (statfs(tmpdir, &buf) != 0) {
-	warn("statfs");
-	return -1;
-    }
-    return (off_t)buf.f_bavail * (off_t)buf.f_bsize;
-}
diff --git a/usr.sbin/pkg_install/lib/pkgwrap.c b/usr.sbin/pkg_install/lib/pkgwrap.c
deleted file mode 100644
index cbd15cd7b44..00000000000
--- a/usr.sbin/pkg_install/lib/pkgwrap.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Maxim Sobolev
- * 8 September 2002
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#undef main
-
-#define SEPARATORS " \t"
-
-extern char **environ;
-
-int
-main(int argc, char **argv)
-{
-    FILE *f;
-    char buffer[FILENAME_MAX], *cp, *verstr;
-    int len;
-
-    if (getenv("PKG_NOWRAP") != NULL)
-	goto nowrap;
-    f = fopen(PKG_WRAPCONF_FNAME, "r");
-    if (f == NULL)
-	goto nowrap;
-    cp = fgets(buffer, 256, f);
-    fclose(f);
-    if (cp == NULL)
-	goto nowrap;
-    len = strlen(cp);
-    if (cp[len - 1] == '\n')
-	cp[len - 1] = '\0';
-    while (strchr(SEPARATORS, *cp) != NULL)
-	cp++;
-    verstr = cp;
-    cp = strpbrk(cp, SEPARATORS);
-    if (cp == NULL)
-	goto nowrap;
-    *cp = '\0';
-    for (cp = verstr; *cp != '\0'; cp++)
-	if (isdigit(*cp) == 0)
-	    goto nowrap;
-    if (atoi(verstr) < PKG_INSTALL_VERSION)
-	goto nowrap;
-    cp++;
-    while (*cp != '\0' && strchr(SEPARATORS, *cp) != NULL)
-	cp++;
-    if (*cp == '\0')
-	goto nowrap;
-    bcopy(cp, buffer, strlen(cp) + 1);
-    cp = strpbrk(buffer, SEPARATORS);
-    if (cp != NULL)
-	*cp = '\0';
-    if (!isdir(buffer))
-	goto nowrap;
-    cp = strrchr(argv[0], '/');
-    if (cp == NULL)
-	cp = argv[0];
-    else
-	cp++;
-    strlcat(buffer, "/", sizeof(buffer));
-    strlcat(buffer, cp, sizeof(buffer));
-    setenv("PKG_NOWRAP", "1", 1);
-    execve(buffer, argv, environ);
-
-nowrap:
-    unsetenv("PKG_NOWRAP");
-    return(real_main(argc, argv));
-}
diff --git a/usr.sbin/pkg_install/lib/plist.c b/usr.sbin/pkg_install/lib/plist.c
deleted file mode 100644
index bce6d04018c..00000000000
--- a/usr.sbin/pkg_install/lib/plist.c
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * General packing list routines.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <err.h>
-#include <md5.h>
-
-/* Add an item to a packing list */
-void
-add_plist(Package *p, plist_t type, const char *arg)
-{
-    PackingList tmp;
-
-    tmp = new_plist_entry();
-    tmp->name = copy_string(arg);
-    tmp->type = type;
-
-    if (!p->head)
-	p->head = p->tail = tmp;
-    else {
-	tmp->prev = p->tail;
-	p->tail->next = tmp;
-	p->tail = tmp;
-    }
-    switch (type) {
-    case PLIST_NAME:
-	p->name = tmp->name;
-	break;
-
-    case PLIST_ORIGIN:
-	p->origin = tmp->name;
-	break;
-
-    default:
-	break;
-    }
-}
-
-void
-add_plist_top(Package *p, plist_t type, const char *arg)
-{
-    PackingList tmp;
-
-    tmp = new_plist_entry();
-    tmp->name = copy_string(arg);
-    tmp->type = type;
-
-    if (!p->head)
-	p->head = p->tail = tmp;
-    else {
-	tmp->next = p->head;
-	p->head->prev = tmp;
-	p->head = tmp;
-    }
-}
-
-/* Return the last (most recent) entry in a packing list */
-PackingList
-last_plist(Package *p)
-{
-    return p->tail;
-}
-
-/* Mark all items in a packing list to prevent iteration over them */
-void
-mark_plist(Package *pkg)
-{
-    PackingList p = pkg->head;
-
-    while (p) {
-	p->marked = TRUE;
-	p = p->next;
-    }
-}
-
-/* Find a given item in a packing list and, if so, return it (else NULL) */
-PackingList
-find_plist(Package *pkg, plist_t type)
-{
-    PackingList p = pkg->head;
-
-    while (p) {
-	if (p->type == type)
-	    return p;
-	p = p->next;
-    }
-    return NULL;
-}
-
-/* Look for a specific boolean option argument in the list */
-char *
-find_plist_option(Package *pkg, const char *name)
-{
-    PackingList p = pkg->head;
-
-    while (p) {
-	if (p->type == PLIST_OPTION && !strcmp(p->name, name))
-	    return p->name;
-	p = p->next;
-    }
-    return NULL;
-}
-
-/*
- * Delete plist item 'type' in the list (if 'name' is non-null, match it
- * too.)  If 'all' is set, delete all items, not just the first occurrence.
- */
-void
-delete_plist(Package *pkg, Boolean all, plist_t type, const char *name)
-{
-    PackingList p = pkg->head;
-
-    while (p) {
-	PackingList pnext = p->next;
-
-	if (p->type == type && (!name || !strcmp(name, p->name))) {
-	    free(p->name);
-	    if (p->prev)
-		p->prev->next = pnext;
-	    else
-		pkg->head = pnext;
-	    if (pnext)
-		pnext->prev = p->prev;
-	    else
-		pkg->tail = p->prev;
-	    free(p);
-	    if (!all)
-		return;
-	    p = pnext;
-	}
-	else
-	    p = p->next;
-    }
-}
-
-/* Allocate a new packing list entry */
-PackingList
-new_plist_entry(void)
-{
-    PackingList ret;
-
-    ret = (PackingList)malloc(sizeof(struct _plist));
-    bzero(ret, sizeof(struct _plist));
-    return ret;
-}
-
-/* Free an entire packing list */
-void
-free_plist(Package *pkg)
-{
-    PackingList p = pkg->head;
-
-    while (p) {
-	PackingList p1 = p->next;
-
-	free(p->name);
-	free(p);
-	p = p1;
-    }
-    pkg->head = pkg->tail = NULL;
-}
-
-/*
- * For an ascii string denoting a plist command, return its code and
- * optionally its argument(s)
- */
-int
-plist_cmd(const char *s, char **arg)
-{
-    char cmd[FILENAME_MAX + 20];	/* 20 == fudge for max cmd len */
-    char *cp;
-    const char *sp;
-
-    strcpy(cmd, s);
-    str_lowercase(cmd);
-    cp = cmd;
-    sp = s;
-    while (*cp) {
-	if (isspace(*cp)) {
-	    *cp = '\0';
-	    while (isspace(*sp)) /* Never sure if macro, increment later */
-		++sp;
-	    break;
-	}
-	++cp, ++sp;
-    }
-    if (arg)
-	*arg = (char *)sp;
-    if (!strcmp(cmd, "cwd"))
-	return PLIST_CWD;
-    else if (!strcmp(cmd, "srcdir"))
-	return PLIST_SRC;
-    else if (!strcmp(cmd, "cd"))
-	return PLIST_CWD;
-    else if (!strcmp(cmd, "exec"))
-	return PLIST_CMD;
-    else if (!strcmp(cmd, "unexec"))
-	return PLIST_UNEXEC;
-    else if (!strcmp(cmd, "mode"))
-	return PLIST_CHMOD;
-    else if (!strcmp(cmd, "owner"))
-	return PLIST_CHOWN;
-    else if (!strcmp(cmd, "group"))
-	return PLIST_CHGRP;
-    else if (!strcmp(cmd, "noinst"))
-	return PLIST_NOINST;
-    else if (!strcmp(cmd, "comment")) {
-	if (!strncmp(*arg, "ORIGIN:", 7)) {
-	    *arg += 7;
-	    return PLIST_ORIGIN;
-	} else if (!strncmp(*arg, "DEPORIGIN:", 10)) {
-	    *arg += 10;
-	    return PLIST_DEPORIGIN;
-	}
-	return PLIST_COMMENT;
-    } else if (!strcmp(cmd, "ignore"))
-	return PLIST_IGNORE;
-    else if (!strcmp(cmd, "ignore_inst"))
-	return PLIST_IGNORE_INST;
-    else if (!strcmp(cmd, "name"))
-	return PLIST_NAME;
-    else if (!strcmp(cmd, "display"))
-	return PLIST_DISPLAY;
-    else if (!strcmp(cmd, "pkgdep"))
-	return PLIST_PKGDEP;
-    else if (!strcmp(cmd, "conflicts"))
-	return PLIST_CONFLICTS;
-    else if (!strcmp(cmd, "mtree"))
-	return PLIST_MTREE;
-    else if (!strcmp(cmd, "dirrm"))
-	return PLIST_DIR_RM;
-    else if (!strcmp(cmd, "option"))
-	return PLIST_OPTION;
-    else
-	return FAIL;
-}
-
-/* Read a packing list from a file */
-void
-read_plist(Package *pkg, FILE *fp)
-{
-    char *cp, pline[FILENAME_MAX];
-    int cmd, major, minor;
-
-    pkg->fmtver_maj = 1;
-    pkg->fmtver_mnr = 0;
-    pkg->origin = NULL;
-    while (fgets(pline, FILENAME_MAX, fp)) {
-	int len = strlen(pline);
-
-	while (len && isspace(pline[len - 1]))
-	    pline[--len] = '\0';
-	if (!len)
-	    continue;
-	cp = pline;
-	if (pline[0] != CMD_CHAR) {
-	    cmd = PLIST_FILE;
-	    goto bottom;
-	}
-	cmd = plist_cmd(pline + 1, &cp);
-	if (cmd == FAIL) {
-	    warnx("%s: unknown command '%s' (package tools out of date?)",
-		__func__, pline);
-	    goto bottom;
-	}
-	if (*cp == '\0') {
-	    cp = NULL;
-	    if (cmd == PLIST_PKGDEP) {
-		warnx("corrupted record for package %s (pkgdep line without "
-			"argument), ignoring", pkg->name);
-		cmd = FAIL;
-	    }
-	    goto bottom;
-	}
-	if (cmd == PLIST_COMMENT && sscanf(cp, "PKG_FORMAT_REVISION:%d.%d\n",
-					   &major, &minor) == 2) {
-	    pkg->fmtver_maj = major;
-	    pkg->fmtver_mnr = minor;
-	    if (verscmp(pkg, PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR) <= 0)
-		goto bottom;
-
-	    warnx("plist format revision (%d.%d) is higher than supported"
-		  "(%d.%d)", pkg->fmtver_maj, pkg->fmtver_mnr,
-		  PLIST_FMT_VER_MAJOR, PLIST_FMT_VER_MINOR);
-	    if (pkg->fmtver_maj > PLIST_FMT_VER_MAJOR) {
-		cleanup(0);
-		exit(2);
-	    }
-	}
-bottom:
-	add_plist(pkg, cmd, cp);
-    }
-}
-
-/* Write a packing list to a file, converting commands to ascii equivs */
-void
-write_plist(Package *pkg, FILE *fp)
-{
-    PackingList plist = pkg->head;
-
-    while (plist) {
-	switch(plist->type) {
-	case PLIST_FILE:
-	    fprintf(fp, "%s\n", plist->name);
-	    break;
-
-	case PLIST_CWD:
-	    fprintf(fp, "%ccwd %s\n", CMD_CHAR, (plist->name == NULL) ? "" : plist->name);
-	    break;
-
-	case PLIST_SRC:
-	    fprintf(fp, "%csrcdir %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_CMD:
-	    fprintf(fp, "%cexec %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_UNEXEC:
-	    fprintf(fp, "%cunexec %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_CHMOD:
-	    fprintf(fp, "%cmode %s\n", CMD_CHAR, plist->name ? plist->name : "");
-	    break;
-
-	case PLIST_CHOWN:
-	    fprintf(fp, "%cowner %s\n", CMD_CHAR, plist->name ? plist->name : "");
-	    break;
-
-	case PLIST_CHGRP:
-	    fprintf(fp, "%cgroup %s\n", CMD_CHAR, plist->name ? plist->name : "");
-	    break;
-
-	case PLIST_COMMENT:
-	    fprintf(fp, "%ccomment %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_NOINST:
-	    fprintf(fp, "%cnoinst %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_IGNORE:
-	case PLIST_IGNORE_INST:		/* a one-time non-ignored file */
-	    fprintf(fp, "%cignore\n", CMD_CHAR);
-	    break;
-
-	case PLIST_NAME:
-	    fprintf(fp, "%cname %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_DISPLAY:
-	    fprintf(fp, "%cdisplay %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_PKGDEP:
-	    fprintf(fp, "%cpkgdep %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_CONFLICTS:
-	    fprintf(fp, "%cconflicts %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_MTREE:
-	    fprintf(fp, "%cmtree %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_DIR_RM:
-	    fprintf(fp, "%cdirrm %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_OPTION:
-	    fprintf(fp, "%coption %s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_ORIGIN:
-	    fprintf(fp, "%ccomment ORIGIN:%s\n", CMD_CHAR, plist->name);
-	    break;
-
-	case PLIST_DEPORIGIN:
-	    fprintf(fp, "%ccomment DEPORIGIN:%s\n", CMD_CHAR, plist->name);
-	    break;
-
-	default:
-	    cleanup(0);
-	    errx(2, "%s: unknown command type %d (%s)", __func__,
-		plist->type, plist->name);
-	    break;
-	}
-	plist = plist->next;
-    }
-}
-
-/*
- * Delete the results of a package installation.
- *
- * This is here rather than in the pkg_delete code because pkg_add needs to
- * run it too in cases of failure.
- */
-int
-delete_package(Boolean ign_err, Boolean nukedirs, Package *pkg)
-{
-    PackingList p;
-    const char *Where = ".", *last_file = "";
-    Boolean fail = SUCCESS;
-    Boolean preserve;
-    char tmp[FILENAME_MAX], *name = NULL;
-    char *prefix = NULL;
-
-    preserve = find_plist_option(pkg, "preserve") ? TRUE : FALSE;
-    for (p = pkg->head; p; p = p->next) {
-	switch (p->type)  {
-	case PLIST_NAME:
-	    name = p->name;
-	    break;
-
-	case PLIST_IGNORE:
-	    p = p->next;
-	    break;
-
-	case PLIST_CWD:
-	    if (!prefix)
-		prefix = p->name;
-	    Where = (p->name == NULL) ? prefix : p->name;
-	    if (Verbose)
-		printf("Change working directory to %s\n", Where);
-	    break;
-
-	case PLIST_UNEXEC:
-	    format_cmd(tmp, FILENAME_MAX, p->name, Where, last_file);
-	    if (Verbose)
-		printf("Execute '%s'\n", tmp);
-	    if (!Fake && system(tmp)) {
-		warnx("unexec command for '%s' failed", tmp);
-		fail = FAIL;
-	    }
-	    break;
-
-	case PLIST_FILE:
-	    last_file = p->name;
-	    if (*p->name == '/')
-		strlcpy(tmp, p->name, FILENAME_MAX);
-	    else
-		sprintf(tmp, "%s/%s", Where, p->name);
-	    if (isdir(tmp) && fexists(tmp) && !issymlink(tmp)) {
-		warnx("cannot delete specified file '%s' - it is a directory!\n"
-	   "this packing list is incorrect - ignoring delete request", tmp);
-	    }
-	    else {
-		if (p->next && p->next->type == PLIST_COMMENT && !strncmp(p->next->name, "MD5:", 4)) {
-		    char *cp = NULL, buf[33];
-
-		    /*
-		     * For packing lists whose version is 1.1 or greater, the md5
-		     * hash for a symlink is calculated on the string returned
-		     * by readlink().
-		     */
-		    if (issymlink(tmp) && verscmp(pkg, 1, 0) > 0) {
-			int len;
-			char linkbuf[FILENAME_MAX];
-
-			if ((len = readlink(tmp, linkbuf, FILENAME_MAX)) > 0)
-			     cp = MD5Data((unsigned char *)linkbuf, len, buf);
-		    } else if (isfile(tmp) || verscmp(pkg, 1, 1) < 0)
-			cp = MD5File(tmp, buf);
-
-		    if (cp != NULL) {
-			/* Mismatch? */
-			if (strcmp(cp, p->next->name + 4)) {
-			    warnx("'%s' fails original MD5 checksum - %s",
-				  tmp, Force ? "deleted anyway." : "not deleted.");
-			    if (!Force) {
-				fail = FAIL;
-				continue;
-			    }
-			}
-		    }
-		}
-		if (Verbose)
-		    printf("Delete file %s\n", tmp);
-		if (!Fake) {
-		    if (delete_hierarchy(tmp, ign_err, nukedirs))
-			fail = FAIL;
-		    if (preserve && name) {
-			char tmp2[FILENAME_MAX];
-			    
-			if (make_preserve_name(tmp2, FILENAME_MAX, name, tmp)) {
-			    if (fexists(tmp2)) {
-				if (rename(tmp2, tmp))
-				   warn("preserve: unable to restore %s as %s",
-					tmp2, tmp);
-			    }
-			}
-		    }
-		}
-	    }
-	    break;
-
-	case PLIST_DIR_RM:
-	    sprintf(tmp, "%s/%s", Where, p->name);
-	    if (!isdir(tmp) && fexists(tmp)) {
-		warnx("cannot delete specified directory '%s' - it is a file!\n"
-	"this packing list is incorrect - ignoring delete request", tmp);
-	    }
-	    else {
-		if (Verbose)
-		    printf("Delete directory %s\n", tmp);
-		if (!Fake && delete_hierarchy(tmp, ign_err, FALSE)) {
-		    warnx("unable to completely remove directory '%s'", tmp);
-		    fail = FAIL;
-		}
-	    }
-	    last_file = p->name;
-	    break;
-
-	default:
-	    break;
-	}
-    }
-    return fail;
-}
-
-#ifdef DEBUG
-#define RMDIR(dir) vsystem("%s %s", RMDIR_CMD, dir)
-#define REMOVE(dir,ie) vsystem("%s %s%s", REMOVE_CMD, (ie ? "-f " : ""), dir)
-#else
-#define RMDIR rmdir
-#define	REMOVE(file,ie) (remove(file) && !(ie))
-#endif
-
-/* Selectively delete a hierarchy */
-int
-delete_hierarchy(const char *dir, Boolean ign_err, Boolean nukedirs)
-{
-    char *cp1, *cp2;
-
-    cp1 = cp2 = strdup(dir);
-    if (!fexists(dir) && !issymlink(dir)) {
-	if (!ign_err)
-	    warnx("%s '%s' doesn't exist",
-		isdir(dir) ? "directory" : "file", dir);
-	return !ign_err;
-    }
-    else if (nukedirs) {
-	if (vsystem("%s -r%s %s", REMOVE_CMD, (ign_err ? "f" : ""), dir))
-	    return 1;
-    }
-    else if (isdir(dir) && !issymlink(dir)) {
-	if (RMDIR(dir) && !ign_err)
-	    return 1;
-    }
-    else {
-	if (REMOVE(dir, ign_err))
-	    return 1;
-    }
-
-    if (!nukedirs)
-	return 0;
-    while (cp2) {
-	if ((cp2 = strrchr(cp1, '/')) != NULL)
-	    *cp2 = '\0';
-	if (!isemptydir(dir))
-	    return 0;
-	if (RMDIR(dir) && !ign_err) {
-	    if (!fexists(dir))
-		warnx("directory '%s' doesn't exist", dir);
-	    else
-		return 1;
-	}
-	/* back up the pathname one component */
-	if (cp2) {
-	    cp1 = strdup(dir);
-	}
-    }
-    return 0;
-}
diff --git a/usr.sbin/pkg_install/lib/str.c b/usr.sbin/pkg_install/lib/str.c
deleted file mode 100644
index f1a087fbc4d..00000000000
--- a/usr.sbin/pkg_install/lib/str.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * Miscellaneous string utilities.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-
-char *
-strconcat(const char *s1, const char *s2)
-{
-    static char tmp[FILENAME_MAX];
-
-    tmp[0] = '\0';
-    strncpy(tmp, s1 ? s1 : s2, FILENAME_MAX);  /* XXX: what if both are NULL? */
-    if (s1 && s2)
-	strncat(tmp, s2, FILENAME_MAX - strlen(tmp));
-    return tmp;
-}
-
-/* Get a string parameter as a file spec or as a "contents follow -" spec */
-char *
-get_dash_string(char **str)
-{
-    char *s = *str;
-
-    if (*s == '-')
-	*str = copy_string_adds_newline(s + 1);
-    else
-	*str = fileGetContents(s);
-    return *str;
-}
-
-/* Rather Obvious */
-char *
-copy_string(const char *str)
-{
-    return (str ? strdup(str) : NULL);
-}
-
-/* Rather Obvious but adds a trailing \n newline */
-char *
-copy_string_adds_newline(const char *str)
-{
-    if (str == NULL) {
-	return (NULL);
-    } else  {
-	char *copy;
-	size_t line_length;
-
-	line_length = strlen(str) + 2;
-	if ((copy = malloc(line_length)) == NULL)
-		return (NULL);
-	memcpy(copy, str, line_length - 2);
-	copy[line_length - 2] = '\n';	/* Adds trailing \n */
-	copy[line_length - 1] = '\0';
-
-	return (copy);
-   }
-}
-
-/* Return TRUE if 'str' ends in suffix 'suff' */
-Boolean
-suffix(const char *str, const char *suff)
-{
-    char *idx;
-    Boolean ret = FALSE;
-
-    idx = strrchr(str, '.');
-    if (idx && !strcmp(idx + 1, suff))
-	ret = TRUE;
-    return ret;
-}
-
-/* Assuming str has a suffix, brutally murder it! */
-void
-nuke_suffix(char *str)
-{
-    char *idx;
-
-    idx = strrchr(str, '.');
-    if (idx)
-	*idx = '\0';  /* Yow!  Don't try this on a const! */
-}
-
-/* Lowercase a whole string */
-void
-str_lowercase(char *str)
-{
-    while (*str) {
-	*str = tolower(*str);
-	++str;
-    }
-}
-
-char *
-get_string(char *str, int max, FILE *fp)
-{
-    int len;
-
-    if (!str)
-	return NULL;
-    str[0] = '\0';
-    while (fgets(str, max, fp)) {
-	len = strlen(str);
-	while (len && isspace(str[len - 1]))
-	    str[--len] = '\0';
-	if (len)
-	   return str;
-    }
-    return NULL;
-}
diff --git a/usr.sbin/pkg_install/lib/url.c b/usr.sbin/pkg_install/lib/url.c
deleted file mode 100644
index 80d306c7b96..00000000000
--- a/usr.sbin/pkg_install/lib/url.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jordan K. Hubbard
- * 18 July 1993
- *
- * URL file access utilities.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <err.h>
-#include <fetch.h>
-#include <libgen.h>
-#include <sys/wait.h>
-#include <stdio.h>
-
-/*
- * Try and fetch a file by URL, returning the directory name for where
- * it's unpacked, if successful.
- */
-const char *
-fileGetURL(const char *base, const char *spec, int keep_package)
-{
-    const char *rp;
-    char *cp, *tmp;
-    char fname[FILENAME_MAX];
-    char pen[FILENAME_MAX];
-    char pkg[FILENAME_MAX];
-    char buf[8192];
-    FILE *ftp;
-    pid_t tpid;
-    int pfd[2], pstat, r, w = 0;
-    char *hint;
-    int fd, pkgfd = 0;
-
-    rp = NULL;
-    /* Special tip that sysinstall left for us */
-    hint = getenv("PKG_ADD_BASE");
-    if (!isURL(spec)) {
-	if (!base && !hint)
-	    return NULL;
-	/*
-	 * We've been given an existing URL (that's known-good) and now we need
-	 * to construct a composite one out of that and the basename we were
-	 * handed as a dependency.
-	 */
-	if (base) {
-	    strcpy(fname, base);
-	    /*
-	     * Advance back two slashes to get to the root of the package
-	     * hierarchy
-	     */
-	    cp = strrchr(fname, '/');
-	    if (cp) {
-		*cp = '\0';	/* chop name */
-		cp = strrchr(fname, '/');
-	    }
-	    if (cp) {
-		*(cp + 1) = '\0';
-		strcat(cp, "All/");
-		strcat(cp, spec);
-		if (getenv("PACKAGESUFFIX"))
-		   strcat(cp, getenv("PACKAGESUFFIX"));
-                else
-		   strcat(cp, ".tbz");
-	    }
-	    else
-		return NULL;
-	}
-	else {
-	    /*
-	     * Otherwise, we've been given an environment variable hinting
-	     * at the right location from sysinstall
-	     */
-	    strcpy(fname, hint);
-	    strcat(fname, spec);
-	    if (getenv("PACKAGESUFFIX"))
-	       strcat(fname, getenv("PACKAGESUFFIX"));
-            else
-	       strcat(fname, ".tbz");
-	}
-    }
-    else
-	strcpy(fname, spec);
-
-    if (keep_package) {
-	tmp = getenv("PKGDIR");
-	strlcpy(pkg, tmp ? tmp : ".", sizeof(pkg));
-	tmp = basename(fname);
-	strlcat(pkg, "/", sizeof(pkg));
-	strlcat(pkg, tmp, sizeof(pkg));
-	if ((pkgfd = open(pkg, O_WRONLY|O_CREAT|O_TRUNC, 0644)) == -1) {
-	    printf("Error: Unable to open %s\n", pkg);
-	    perror("open");
-	    return NULL;
-	}
-    }
-
-    fetchDebug = (Verbose > 0);
-    if ((ftp = fetchGetURL(fname, Verbose ? "v" : NULL)) == NULL) {
-	printf("Error: Unable to get %s: %s\n",
-	       fname, fetchLastErrString);
-	/* If the fetch fails, yank the package. */
-	if (keep_package && unlink(pkg) < 0 && Verbose) {
-	    warnx("failed to remove partially fetched package: %s", pkg);
-	}
-	return NULL;
-    }
-
-    if (isatty(0) || Verbose)
-	printf("Fetching %s...", fname), fflush(stdout);
-    pen[0] = '\0';
-    if ((rp = make_playpen(pen, 0)) == NULL) {
-	printf("Error: Unable to construct a new playpen for FTP!\n");
-	fclose(ftp);
-	return NULL;
-    }
-    if (pipe(pfd) == -1) {
-	warn("pipe()");
-	cleanup(0);
-	exit(2);
-    }
-    if ((tpid = fork()) == -1) {
-	warn("pipe()");
-	cleanup(0);
-	exit(2);
-    }
-    if (!tpid) {
-	dup2(pfd[0], 0);
-	for (fd = getdtablesize() - 1; fd >= 3; --fd)
-	    close(fd);
-	execl("/usr/bin/tar", "tar",
-	    Verbose ? "-xpjvf" : "-xpjf",
-	    "-", (char *)0);
-	_exit(2);
-    }
-    close(pfd[0]);
-    for (;;) {
-	if ((r = fread(buf, 1, sizeof buf, ftp)) < 1)
-	    break;
-	if ((w = write(pfd[1], buf, r)) != r)
-	    break;
-	if (keep_package) {
-	    if ((w = write(pkgfd, buf, r)) != r)
-		break;
-	}    
-    }
-    if (ferror(ftp))
-	warn("warning: error reading from server");
-    fclose(ftp);
-    if (keep_package) {
-	close(pkgfd);
-    } 
-    close(pfd[1]);
-    if (w == -1)
-	warn("warning: error writing to tar");
-    tpid = waitpid(tpid, &pstat, 0);
-    if (Verbose)
-	printf("tar command returns %d status\n", WEXITSTATUS(pstat));
-    if (rp && (isatty(0) || Verbose))
-	printf(" Done.\n");
-    return rp;
-}
diff --git a/usr.sbin/pkg_install/lib/version.c b/usr.sbin/pkg_install/lib/version.c
deleted file mode 100644
index c25d272362a..00000000000
--- a/usr.sbin/pkg_install/lib/version.c
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Maxim Sobolev
- * 31 July 2001
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include <err.h>
-
-/*
- * Routines to assist with PLIST_FMT_VER numbers in the packing
- * lists.
- *
- * Following is the PLIST_FMT_VER history:
- * 1.0 - Initial revision;
- * 1.1 - When recording/checking checksum of symlink use hash of readlink()
- *	 value instead of the hash of an object this links points to.
- *
- */
-int
-verscmp(Package *pkg, int major, int minor)
-{
-    int rval = 0;
-
-    if ((pkg->fmtver_maj < major) || (pkg->fmtver_maj == major &&
-	pkg->fmtver_mnr < minor))
-	rval = -1;
-    else if ((pkg->fmtver_maj > major) || (pkg->fmtver_maj == major &&
-	     pkg->fmtver_mnr > minor))
-	rval = 1;
-
-    return rval;
-}
-
-/*
- * split_version(pkgname, endname, epoch, revision) returns a pointer to
- * the version portion of a package name and the two special components.
- *
- * Syntax is:  ${PORTNAME}-${PORTVERSION}[_${PORTREVISION}][,${PORTEPOCH}]
- *
- * Written by Oliver Eikemeier
- * Based on work of Jeremy D. Lea.
- */
-static const char *
-split_version(const char *pkgname, const char **endname, unsigned long *epoch, unsigned long *revision)
-{
-    char *ch;
-    const char *versionstr;
-    const char *endversionstr;
-
-    if (pkgname == NULL)
-	errx(2, "%s: Passed NULL pkgname.", __func__);
-
-    /* Look for the last '-' in the pkgname */
-    ch = strrchr(pkgname, '-');
-    /* Cheat if we are just passed a version, not a valid package name */
-    versionstr = ch ? ch + 1 : pkgname;
-
-    /* Look for the last '_' in the version string, advancing the end pointer */
-    ch = strrchr(versionstr, '_');
-    if (revision != NULL) {
-	*revision = ch ? strtoul(ch + 1, NULL, 10) : 0;
-    }
-    endversionstr = ch;
-
-    /* Look for the last ',' in the remaining version string */
-    ch = strrchr(endversionstr ? endversionstr + 1 : versionstr, ',');
-    if (epoch != NULL) {
-	*epoch = ch ? strtoul(ch + 1, NULL, 10) : 0;
-    }
-    if (ch && !endversionstr)
-	endversionstr = ch;
-
-    /* set the pointer behind the last character of the version without revision or epoch */
-    if (endname)
-	*endname = endversionstr ? endversionstr : strrchr(versionstr, '\0');
-
-    return versionstr;
-}
-
-/*
- * PORTVERSIONs are composed of components separated by dots. A component
- * consists of a version number, a letter and a patchlevel number. This does
- * not conform to the porter's handbook, but let us formulate rules that
- * fit the current practice and are far simpler than to make decisions
- * based on the order of netters and lumbers. Besides, people use versions
- * like 10b2 in the ports...
- */
-
-typedef struct {
-#ifdef __LONG_LONG_SUPPORTED
-    long long n;
-    long long pl;
-#else
-    long n;
-    long pl;
-#endif
-    int a;
-} version_component;
-
-/*
- * get_component(position, component) gets the value of the next component
- * (number - letter - number triple) and returns a pointer to the next character
- * after any leading separators
- *
- * - components are separated by dots
- * - characters !~ [a-zA-Z0-9.+*] are treated as separators
- *   (1.0:2003.09.16 = 1.0.2003.09.16), this may not be what you expect:
- *   1.0.1:2003.09.16 < 1.0:2003.09.16
- * - consecutive separators are collapsed (10..1 = 10.1)
- * - missing separators are inserted, essentially
- *   letter number letter => letter number . letter (10a1b2 = 10a1.b2)
- * - missing components are assumed to be equal to 0 (10 = 10.0 = 10.0.0)
- * - the letter sort order is: [none], a, b, ..., z; numbers without letters
- *   sort first (10 < 10a < 10b)
- * - missing version numbers (in components starting with a letter) sort as -1
- *   (a < 0, 10.a < 10)
- * - a separator is inserted before the special strings "pl", "alpha", "beta", 
- *   "pre" and "rc".
- * - "pl" sorts before every other letter, "alpha", "beta", "pre" and "rc"
- *   sort as a, b, p and r. (10alpha = 10.a < 10, but 10 < 10a; pl11 < alpha3
- *   < 0.1beta2 = 0.1.b2 < 0.1)
- * - other strings use only the first letter for sorting, case is ignored
- *   (1.d2 = 1.dev2 = 1.Development2)
- * - The special component `*' is guaranteed to be the smallest possible
- *   component (2.* < 2pl1 < 2alpha3 < 2.9f7 < 3.*)
- * - components separated by `+' are handled by version_cmp below
- *
- * Oliver Eikemeier
- */
-
-static const struct {
-    const char *name;
-    size_t namelen;
-    int value;
-} stage[] = {
-    { "pl",    2,  0        },
-    { "alpha", 5, 'a'-'a'+1 },
-    { "beta",  4, 'b'-'a'+1 },
-    { "pre",   3, 'p'-'a'+1 },
-    { "rc",    2, 'r'-'a'+1 },
-    { NULL,    0,  -1       }
-};
-
-static const char *
-get_component(const char *position, version_component *component)
-{
-    const char *pos = position;
-    int hasstage = 0, haspatchlevel = 0;
-
-    if (!pos)
-	errx(2, "%s: Passed NULL position.", __func__);
-
-    /* handle version number */
-    if (isdigit(*pos)) {
-	char *endptr;
-#ifdef __LONG_LONG_SUPPORTED
-	component->n = strtoll(pos, &endptr, 10);
-#else
-	component->n = strtol(pos, &endptr, 10);
-#endif
-	/* should we test for errno == ERANGE? */
-	pos = endptr;
-    } else if (*pos == '*') {
-	component->n = -2;
-	do {
-	    pos++;
-	} while(*pos && *pos != '+');
-    } else {
-	component->n = -1;
-	hasstage = 1;
-    }
-
-    /* handle letter */
-    if (isalpha(*pos)) {
-	int c = tolower(*pos);
-	haspatchlevel = 1;
-	/* handle special suffixes */
-	if (isalpha(pos[1])) {
-	    int i;
-	    for (i = 0; stage[i].name; i++) {
-		if (strncasecmp(pos, stage[i].name, stage[i].namelen) == 0
-                    && !isalpha(pos[stage[i].namelen])) {
-		    if (hasstage) {
-			/* stage to value */
-			component->a = stage[i].value;
-			pos += stage[i].namelen;
-		    } else {
-			/* insert dot */
-			component->a = 0;
-			haspatchlevel = 0;
-		    }
-		    c = 0;
-		    break;
-		}
-	    }
-	}
-	/* unhandled above */
-	if (c) {
-	    /* use the first letter and skip following */
-	    component->a = c - 'a' + 1;
-	    do {
-		++pos;
-	    } while (isalpha(*pos));
-	}
-    } else {
-	component->a = 0;
-	haspatchlevel = 0;
-    }
-
-    if (haspatchlevel) {
-	/* handle patch number */
-	if (isdigit(*pos)) {
-	    char *endptr;
-#ifdef __LONG_LONG_SUPPORTED
-	    component->pl = strtoll(pos, &endptr, 10);
-#else
-	    component->pl = strtol(pos, &endptr, 10);
-#endif
-	    /* should we test for errno == ERANGE? */
-	    pos = endptr;
-	} else {
-	    component->pl = -1;
-	}
-    } else {
-	component->pl = 0;
-    }
-
-    /* skip trailing separators */
-    while (*pos && !isdigit(*pos) && !isalpha(*pos) && *pos != '+' && *pos != '*') {
-	pos++;
-    }
-
-    return pos;
-}
-
-/*
- * version_cmp(pkg1, pkg2) returns -1, 0 or 1 depending on if the version
- * components of pkg1 is less than, equal to or greater than pkg2. No
- * comparison of the basenames is done.
- *
- * The port version is defined by:
- * ${PORTVERSION}[_${PORTREVISION}][,${PORTEPOCH}]
- * ${PORTEPOCH} supersedes ${PORTVERSION} supersedes ${PORTREVISION}.
- * See the commit log for revision 1.349 of ports/Mk/bsd.port.mk
- * for more information.
- *
- * The epoch and revision are defined to be a single number, while the rest
- * of the version should conform to the porting guidelines. It can contain
- * multiple components, separated by a period, including letters.
- *
- * The tests allow for significantly more latitude in the version numbers
- * than is allowed in the guidelines. No point in enforcing them here.
- * That's what portlint is for.
- *
- * Jeremy D. Lea.
- * reimplemented by Oliver Eikemeier
- */
-int
-version_cmp(const char *pkg1, const char *pkg2)
-{
-    const char *v1, *v2, *ve1, *ve2;
-    unsigned long e1, e2, r1, r2;
-    int result = 0;
-
-    v1 = split_version(pkg1, &ve1, &e1, &r1);
-    v2 = split_version(pkg2, &ve2, &e2, &r2);
-
-    /* Check epoch, port version, and port revision, in that order. */
-    if (e1 != e2) {
-	result = (e1 < e2 ? -1 : 1);
-    }
-
-    /* Shortcut check for equality before invoking the parsing routines. */
-    if (result == 0 && (ve1 - v1 != ve2 - v2 || strncasecmp(v1, v2, ve1 - v1) != 0)) {
-	/* Loop over different components (the parts separated by dots).
-	 * If any component differs, we have the basis for an inequality. */
-	while(result == 0 && (v1 < ve1 || v2 < ve2)) {
-	    int block_v1 = 0;
-	    int block_v2 = 0;
-	    version_component vc1 = {0, 0, 0};
-	    version_component vc2 = {0, 0, 0};
-	    if (v1 < ve1 && *v1 != '+') {
-		v1 = get_component(v1, &vc1);
-	    } else {
-		block_v1 = 1;
-	    }
-	    if (v2 < ve2 && *v2 != '+') {
-		v2 = get_component(v2, &vc2);
-	    } else {
-		block_v2 = 1;
-	    }
-	    if (block_v1 && block_v2) {
-		if (v1 < ve1)
-		    v1++;
-		if (v2 < ve2)
-		    v2++;
-	    } else if (vc1.n != vc2.n) {
-		result = (vc1.n < vc2.n ? -1 : 1);
-	    } else if (vc1.a != vc2.a) {
-		result = (vc1.a < vc2.a ? -1 : 1);
-	    } else if (vc1.pl != vc2.pl) {
-		result = (vc1.pl < vc2.pl ? -1 : 1);
-	    }
-	}
-    }
-
-    /* Compare FreeBSD revision numbers. */
-    if (result == 0 && r1 != r2) {
-	result = (r1 < r2 ? -1 : 1);
-    }
-    return result;
-}
diff --git a/usr.sbin/pkg_install/tkpkg b/usr.sbin/pkg_install/tkpkg
deleted file mode 100755
index 9c95abf2519..00000000000
--- a/usr.sbin/pkg_install/tkpkg
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/usr/local/bin/wish -f
-#$FreeBSD$
-#
-set pkgname ""
-wm title . "Package Installation"
-#--------------------------------------------------------------
-# The top level main window, consisting of a bar of buttons and a list
-# of packages and a description of the current package.
-#--------------------------------------------------------------
-frame .menu -relief raised -borderwidth 1
-frame .frame -borderwidth 4
-
-scrollbar .frame.scroll -relief sunken -command ".frame.list yview"
-listbox .frame.list -yscroll ".frame.scroll set" -relief sunken -setgrid 1
-pack append .frame .frame.scroll {right filly} \
-        .frame.list {left expand fill}
-
-# build the lower window shoing the complete description of a pacage
-frame .f -borderwidth 4
-text .f.t -width 80 -height 20 -yscrollcommand ".f.s set" -relief sunken
-
-# Initially display instructions in this window.  Erase the
-# instructions and show the package description when the user clicks
-# on a package.
-# 
-.f.t insert end "Double click on a package above to see its
-complete description here."
-scrollbar .f.s -relief sunken -command ".f.t yview"
-pack append .f .f.s {right filly} .f.t {left expand fill}
-
-bind .frame.list <Double-Button-1> \
-    {foreach i [selection get] {do_description $i}}
-pack append .  .menu {top fill} \
-   .f {bottom expand fill} \
-   .frame {bottom expand fill}
-
-#----------------------------------------------------------------
-# Make menu bar:
-#----------------------------------------------------------------
-button .menu.inst -text "Install" \
-   -command "apply_to_pkg \"pkg_add -v\""
-button .menu.dein -text "Deinstall" \
-   -command "apply_to_pkg \"pkg_delete -v\""
-button .menu.installed -text "What is Installed?" \
-   -command "list_pkgs \"pkg_info -I -a |tr '	' ' '\""
-button .menu.available -text "What can I install?" \
-   -command "list_pkgs \"pkg_info -I -c [glob -nocomplain *.{tgz,tar.z,tar.gz,tar.Z}] |tr '	' ' '\""
-button .menu.cont -text "Contents?" \
-   -command "apply_to_pkg \"pkg_info -d -v\""
-button .menu.quit -text "Quit" -command "destroy ."
-button .menu.help -text "Help" -command "do_help"
-
-pack append .menu \
-  .menu.inst left \
-  .menu.dein left \
-  .menu.installed left \
-  .menu.available left \
-  .menu.cont left \
-  .menu.quit left \
-  .menu.help right
-#-------------------------------------------------------
-# Display the package description.
-#-------------------------------------------------------
-proc list_pkgs {s} {
-  set line ""
-  set f [eval "open {| sh -c \"$s\" } r"]
-  .frame.list delete 0 end
-  while {[gets $f line] > 0} {
-    .frame.list insert end $line
-  }
-  close $f
-}
-
-# display the list of available packages
-set archives [glob -nocomplain *.{tgz,tar.z,tar.gz,tar.Z}]
-if {$archives == ""} {
-  .frame.list delete 0 end
- .frame.list insert end "Warning: no compressed tar archives files found."
-} else {
-  list_pkgs "pkg_info -I -c $archives |tr '	' ' '"
-}
-
-#-------------------------------------------------------
-# Display the package description.
-#-------------------------------------------------------
-proc do_description {s} {
-  global pkgname
-  regexp {[^ 	]*} $s filename
-  set pkgname $filename
-  .f.t delete 0.0 end
-  set cmd "pkg_info -d $filename |tr -d ''"
-  set f [eval "open {| csh -c \"$cmd\" } r"]
-  while {![eof $f]} {
-    .f.t insert end [read $f]
-  }
-}
-#-------------------------------------------------------
-# package install window.
-#-------------------------------------------------------
-proc do_help {{w .help}} {
-  catch {destroy $w}
-  toplevel $w
-  wm title $w "Help"
-  wm iconname $w "Help"
-  button $w.ok -text OK -command "destroy $w"
-  message $w.t -relief raised -bd 2 \
-    -text "You can install, deinstall and list info on the available packages.  To select a package and see its complete description, press mouse button 1 over the package name.  To install a selected package, press the Install button.  To exit, press the \"Quit\" button."
-  pack append $w $w.ok {bottom fillx} $w.t {expand fill}
-}
-#-------------------------------------------------------
-# Apply a command to a package.
-#-------------------------------------------------------
-proc apply_to_pkg {s} {
-    apply_to_pkg_err $s ""
-}
-#-------------------------------------------------------
-# Apply a command to a package, with error stream redirection instructions.
-#-------------------------------------------------------
-proc apply_to_pkg_err {s errredir} {
-  global pkgname
-  .f.t delete 0.0 end
-  if {$pkgname == ""} {
-    .f.t insert end "You must double click on a package name first!"
-  } else {
-    apply_to_pkg_int "$s $pkgname" "2>&1"
-  }
-}
-proc apply_to_pkg_int {s errredir} {
-    .f.t delete 0.0 end
-    .f.t insert end "Running: $s\n"
-    set f [eval "open {| sh -c \"$s $errredir\" } r"]
-    while {![eof $f]} {
-      .f.t insert end [read $f 64]
-    }
-}
-#-------------------------------------------------------
-# Invoke an arbitrary command.
-#-------------------------------------------------------
-proc do_command {s} {
-  .f.t delete 0.0 end
-  .f.t insert end "Running: $s\n"
-  set f [eval "open {| $s} r"]
-  while {![eof $f]} {
-    .f.t insert end [read $f 64]
-  }
-}
-# local variables:
-# mode: csh
-# compile-command: ""
-# comment-start: "# "
-# comment-start-skip: "# "
-# end:
diff --git a/usr.sbin/pkg_install/updating/Makefile b/usr.sbin/pkg_install/updating/Makefile
deleted file mode 100644
index b0d3689779e..00000000000
--- a/usr.sbin/pkg_install/updating/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $FreeBSD$
-
-PROG=	pkg_updating
-SRCS=	main.c
-
-CFLAGS+= -I${.CURDIR}/../lib
-
-WFORMAT?= 1
-
-DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
-LDADD=	${LIBINSTALL} -lfetch -lmd
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/updating/main.c b/usr.sbin/pkg_install/updating/main.c
deleted file mode 100644
index 4a36e22b842..00000000000
--- a/usr.sbin/pkg_install/updating/main.c
+++ /dev/null
@@ -1,284 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <beat@chruetertee.ch> wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.          Beat Gätzi
- * ----------------------------------------------------------------------------
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
-#include <sys/param.h>
-#include <stdio.h>
-#include <errno.h>
-#include <fetch.h>
-#include <limits.h>
-#include <sysexits.h>
-#include <getopt.h>
-
-#include "lib.h"
-#include "pathnames.h"
-
-typedef struct installedport {
-	struct installedport *next;				/* List of installed ports. */
-	char name[LINE_MAX];					/* Name of the installed port. */
-} INSTALLEDPORT;
-
-int usage(void);
-
-static char opts[] = "d:f:h";
-static struct option longopts[] = {
-	{ "date",	required_argument,	NULL,		'd' },
-	{ "file",	required_argument,	NULL,		'f' },
-	{ "help",	no_argument,		NULL,		'h' },
-	{ NULL,		0,			NULL,		0 },
-};
-
-/*
- * Parse /usr/port/UPDATING for corresponding entries. If no argument is
- * passed to pkg_updating all entries for all installed ports are displayed.
- * If a list of portnames is passed to pkg_updating only entries for the
- * given portnames are displayed. Use the -d option to define that only newer
- * entries as this date are shown.
- */
-int
-main(int argc, char *argv[])
-{
-	/* Keyword for searching portname in UPDATING. */
-	const char *affects = "AFFECTS";
-	/* Indicate a date -> end of a entry. Will fail on 2100-01-01... */
-	const char *end = "20";
-	/* Keyword for searching origin portname of installed port. */
-	const char *origin = "@comment ORIGIN:";
-	const char *pkgdbpath = LOG_DIR;		/* Location of pkgdb */
-	const char *updatingfile = UPDATING;	/* Location of UPDATING */
-
-	char *date = NULL; 						/* Passed -d argument */
-	char *dateline = NULL;					/* Saved date of an entry */
-	/* Tmp lines for parsing file */
-	char *tmpline1 = NULL;
-	char *tmpline2 = NULL;
-
-	char originline[LINE_MAX];				/* Line of +CONTENTS */
-	/* Temporary variable to create path to +CONTENTS for installed ports. */
-	char tmp_file[MAXPATHLEN];
-	char updatingline[LINE_MAX];			/* Line of UPDATING */
-
-	int ch;									/* Char used by getopt */
-	int found = 0;							/* Found an entry */
-	int linelength;							/* Length of parsed line */
-	int maxcharperline = LINE_MAX;			/* Max chars per line */
-	int dflag = 0;							/* -d option set */
-	/* If pflag = 0 UPDATING will be checked for all installed ports. */
-	int pflag = 0;
-
-	size_t n;								/* Offset to create path */
-
-	struct dirent *pkgdbdir;				/* pkgdb directory */
-	struct stat attribute;					/* attribute of pkgdb element */
-
-	/* Needed nodes for linked list with installed ports. */
-	INSTALLEDPORT *head = (INSTALLEDPORT *) NULL;
-	INSTALLEDPORT *curr = (INSTALLEDPORT *) NULL;
-
-	DIR *dir;
-	FILE *fd;
-
-	warnpkgng();
-	while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) {
-		switch (ch) {
-			case 'd':
-				dflag = 1;
-				date = optarg;
-				break;
-			case 'f':
-				updatingfile = optarg;
-				break;
-			case 'h':
-			default:
-				usage();
-		}
-	}
-	argc -= optind;
-	argv += optind;
-
-	/* Check if passed date has a correct format. */
-	if (dflag == 1) {
-		linelength = strlen(date);
-		if (linelength != 8)
-			exit(EX_DATAERR);
-		if (strspn(date, "0123456789") != 8) {
-			fprintf(stderr, "unknown date format: %s\n", date);
-			exit(EX_DATAERR);
-		}
-	}
-
-	/* Save the list of passed portnames. */
-	if (argc != 0) {
-		pflag = 1;
-		while (*argv) {
-			if ((curr = (INSTALLEDPORT *)
-				malloc(sizeof(INSTALLEDPORT))) == NULL)
-				(void)exit(EXIT_FAILURE);
-			strlcpy(curr->name, *argv, strlen(*argv) + 1);
-			curr->next = head;
-			head = curr;
-			(void)*argv++;
-		}
-	}
-
-	/*
-	 * UPDATING will be parsed for all installed ports
-	 * if no portname is passed.
-	 */
-	if (pflag == 0) {
-		/* Open /var/db/pkg and search for all installed ports. */
-		if ((dir = opendir(pkgdbpath)) != NULL) {
-			while ((pkgdbdir = readdir(dir)) != NULL) {
-				if (strcmp(pkgdbdir->d_name, ".") != 0 && 
-					strcmp(pkgdbdir->d_name, "..") != 0) {
-
-					/* Create path to +CONTENTS file for each installed port */
-					n = strlcpy(tmp_file, pkgdbpath, sizeof(tmp_file));
-					n = strlcpy(tmp_file + n, "/", sizeof(tmp_file) - n);
-					n = strlcat(tmp_file + n, pkgdbdir->d_name,
-						sizeof(tmp_file) - n);
-					if (stat(tmp_file, &attribute) == -1) {
-						fprintf(stderr, "can't open %s: %s\n",
-							tmp_file, strerror(errno));
-						return EXIT_FAILURE;
-					}
-					if (attribute.st_mode & S_IFREG)
-						continue;
-					(void)strlcat(tmp_file + n, "/",
-						sizeof(tmp_file) - n);
-					(void)strlcat(tmp_file + n, CONTENTS_FNAME,
-						sizeof(tmp_file) - n);
-
-					/* Open +CONTENT file */
-					fd = fopen(tmp_file, "r");
-					if (fd == NULL) {
-						fprintf(stderr, "warning: can't open %s: %s\n",
-						tmp_file, strerror(errno));
-						continue;
-					}
-
-					/*
-					 * Parses +CONTENT for ORIGIN line and
-					 * put element into linked list.
-					 */
-					while (fgets(originline, maxcharperline, fd) != NULL) {
-						tmpline1 = strstr(originline, origin);
-						if (tmpline1 != NULL) {
-							/* Tmp variable to store port name. */
-							char *pname;
-							pname = strrchr(originline, (int)':');
-							pname++;
-							if ((curr = (INSTALLEDPORT *)
-								malloc(sizeof(INSTALLEDPORT))) == NULL)
-								(void)exit(EXIT_FAILURE);
-							if (pname[strlen(pname) - 1] == '\n')
-								pname[strlen(pname) - 1] = '\0';
-							strlcpy (curr->name, pname, sizeof(curr->name));
-							curr->next = head;
-							head = curr;
-						}
-					}
-					
-					if (ferror(fd)) {
-						fprintf(stderr, "error reading input\n");
-						exit(EX_IOERR);
-					}
-
-					(void)fclose(fd);
-				}
-			}
-			closedir(dir);
-		} 
-	}
-
-	/* Fetch UPDATING file if needed and open file */
-	if (isURL(updatingfile)) {
-		if ((fd = fetchGetURL(updatingfile, "")) == NULL) {
-			fprintf(stderr, "Error: Unable to get %s: %s\n",
-				updatingfile, fetchLastErrString);
-			exit(EX_UNAVAILABLE);
-		}
-	}
-	else {
-		fd = fopen(updatingfile, "r");
-	}
-	if (fd == NULL) {
-		fprintf(stderr, "can't open %s: %s\n",
-			updatingfile, strerror(errno));
-		exit(EX_UNAVAILABLE);
-	}
-
-	/* Parse opened UPDATING file. */
-	while (fgets(updatingline, maxcharperline, fd) != NULL) {
-		/* No entry is found so far */
-		if (found == 0) {
-			/* Search for AFFECTS line to parse the portname. */
-			tmpline1 = strstr(updatingline, affects);
-
-			if (tmpline1 != NULL) {
-				curr = head; 
-				while (curr != NULL) {
-					tmpline2 = strstr(updatingline, curr->name);
-					if (tmpline2 != NULL)
-						break;
-					curr = curr->next;
-				}
-				if (tmpline2 != NULL) {
-					/* If -d is set, check if entry is newer than the date. */
-					if ((dflag == 1) && (strncmp(dateline, date, 8) < 0))
-						continue;
-					printf("%s", dateline);
-					printf("%s", updatingline);
-					found = 1;
-				}
-			}
-		}
-		/* Search for the end of an entry, if not found print the line. */
-		else {
-			tmpline1 = strstr(updatingline, end);
-			if (tmpline1 == NULL)
-				printf("%s", updatingline);
-			else {
-				linelength = strlen(updatingline);
-				if (linelength == 10)
-					found = 0;
-				else
-					printf("%s", updatingline);
-			}
-		}
-		/* Save the actual line, it could be a date. */
-		dateline = strdup(updatingline);
-	}
-
-	if (ferror(fd)) {
-		fprintf(stderr, "error reading input\n");
-		exit(EX_IOERR);
-	}
-	(void)fclose(fd);
-
-	exit(EX_OK);
-}
-
-int
-usage(void)
-{
-	fprintf(stderr,
-		"usage: pkg_updating [-h] [-d YYYYMMDD] [-f file] [portname ...]\n");
-	exit(EX_USAGE);
-}
-
-void
-cleanup(int sig)
-{
-	if (sig)
-		exit(1);
-}
diff --git a/usr.sbin/pkg_install/updating/pathnames.h b/usr.sbin/pkg_install/updating/pathnames.h
deleted file mode 100644
index b9a94ed39c1..00000000000
--- a/usr.sbin/pkg_install/updating/pathnames.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*-
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <beat@chruetertee.ch> wrote this file. As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.          Beat Gätzi
- * ----------------------------------------------------------------------------
- *
- * $FreeBSD$
- *
- */
-
-/* Where the updating file lives by default */
-#define DEF_UPDATING "/usr/ports/UPDATING"
-/* macro to define location of the UPDATING file */
-#define UPDATING (getenv(PORTSDIR) ? strcat(getenv(PORTSDIR), \
-        "/UPDATING") : DEF_UPDATING)
diff --git a/usr.sbin/pkg_install/updating/pkg_updating.1 b/usr.sbin/pkg_install/updating/pkg_updating.1
deleted file mode 100644
index 3fe16fd8902..00000000000
--- a/usr.sbin/pkg_install/updating/pkg_updating.1
+++ /dev/null
@@ -1,97 +0,0 @@
-.\"
-.\" FreeBSD updating - Scan the installed ports and show all UPDATING entries
-.\"	that affect one of the installed ports. Alternative a list of portnames
-.\" could be passed to pkg_updating
-.\"
-.\" "THE BEER-WARE LICENSE" (Revision 42):
-.\" <beat@chruetertee.ch> wrote this file. As long as you retain this notice you
-.\" can do whatever you want with this stuff. If we meet some day, and you think
-.\" this stuff is worth it, you can buy me a beer in return.          Beat Gätzi
-.\"
-.\" $FreeBSD$
-.\"
-.Dd November 9, 2012
-.Dt PKG_UPDATING 1
-.Os
-.Sh NAME
-.Nm pkg_updating
-.Nd a utility for displaying UPDATING entries of software packages
-.Sh SYNOPSIS
-.Nm
-.Op Fl h
-.Op Fl d Ar date
-.Op Fl f Ar file
-.Op Ar pkg-name ...
-.Nm
-.Sh DESCRIPTION
-The
-.Nm
-command scans the installed ports and show all UPDATING entries that affect one
-of the installed ports. Alternative a list of pkg-names could be passed.
-.Sh OPTIONS
-The following command line options are supported:
-.Bl -tag -width indent
-.It Ar pkg-name ...
-UPDATING entries for the named packages are displayed.
-.It Fl d , -date Ar date
-Only entries newer than
-.Ar date
-are shown. Use a YYYYMMDD date format.
-.It Fl f , -file Ar file
-Defines a alternative location of the UPDATING
-.Ar file .
-.It Fl h , -help
-Print help message.
-.El
-.Sh ENVIRONMENT
-.Bl -tag -width PKG_DBDIR
-.It Ev PKG_DBDIR
-Specifies an alternative location for the installed package database.
-.It Ev PORTSDIR
-Location of the ports tree.
-.El
-.Sh FILES
-.Bl -tag -width /var/db/pkg -compact
-.It Pa /var/db/pkg
-Default location of the installed package database.
-.It Pa /usr/ports
-The default ports directory and default location of the UPDATING file.
-.El
-.Sh EXAMPLES
-Shows all entries of all installed ports:
-.Dl % pkg_updating
-.Pp
-Shows all entries of all installed ports since 2007-01-01:
-.Dl % pkg_updating -d 20070101
-.Pp
-Shows all entries for all apache and mysql ports:
-.Dl % pkg_updating apache mysql
-.Pp
-Shows all apache entries since 2006-01-01:
-.Dl % pkg_updating -d 20060101 apache
-.Pp
-Defines that the UPDATING file is in /tmp and shows all entries of all
-installed ports:
-.Dl % pkg_updating -f /tmp/UPDATING
-.Pp
-Fetch UPDATING file from ftp mirror and show all entries of all
-installed ports:
-.Dl % pkg_updating -f ftp://ftp.freebsd.org/pub/FreeBSD/ports/packages/UPDATING
-.Sh ENVRIOMENT
-.Bl -tag -width indent
-.It Ev PKG_OLD_NOWARN
-If set
-.Nm
-will not warn about its use in the presence of pkgng databases.
-.El
-.Sh SEE ALSO
-.Xr pkg_add 1 ,
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_version 1
-.Sh AUTHORS
-.An Beat G\(:atzi Aq beat@chruetertee.ch
-.Sh CONTRIBUTORS
-.An Martin Tournoij Aq carpetsmoker@xs4all.nl
-.Sh BUGS
-Sure to be some.
diff --git a/usr.sbin/pkg_install/version/Makefile b/usr.sbin/pkg_install/version/Makefile
deleted file mode 100644
index 3e1d7a522f2..00000000000
--- a/usr.sbin/pkg_install/version/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PROG=	pkg_version
-SRCS=	main.c perform.c
-
-CFLAGS+= -I${.CURDIR}/../lib
-
-WFORMAT?=	1
-
-DPADD=	${LIBINSTALL} ${LIBFETCH} ${LIBMD}
-LDADD=	${LIBINSTALL} -lfetch -lmd
-
-test:
-	sh ${.CURDIR}/test-pkg_version.sh
-
-.include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/version/main.c b/usr.sbin/pkg_install/version/main.c
deleted file mode 100644
index dd67e635f31..00000000000
--- a/usr.sbin/pkg_install/version/main.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jeremy D. Lea.
- * 11 May 2002
- *
- * This is the version module. Based on pkg_version.pl by Bruce A. Mah.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-
-#include <getopt.h>
-#include <err.h>
-
-#include "lib.h"
-#include "version.h"
-
-char	*LimitChars = NULL;
-char	*PreventChars = NULL;
-char	*MatchName = NULL;
-char	*LookUpOrigin = NULL;
-Boolean RegexExtended = FALSE;
-Boolean UseINDEXOnly = FALSE;
-Boolean ShowOrigin = FALSE;
-
-static void usage(void);
-
-static char opts[] = "dIhl:L:qs:XtTO:ov";
-static struct option longopts[] = {
-	{ "extended",	no_argument,		NULL,		'X' },
-	{ "help",	no_argument,		NULL,		'h' },
-	{ "match",	required_argument,	NULL,		's' },
-	{ "no-status",	required_argument,	NULL,		'L' },
-	{ "origin",	required_argument,	NULL,		'O' },
-	{ "quiet",	no_argument,		NULL,		'q' },
-	{ "show-origin",no_argument,		NULL,		'o' },
-	{ "status",	required_argument,	NULL,		'l' },
-	{ "index-only",	no_argument,		NULL,		'I' },
-	{ "verbose",	no_argument,		NULL,		'v' },
-	{ NULL,		0,			NULL,		0 }
-};
-
-int
-main(int argc, char **argv)
-{
-    int ch, cmp = 0;
-
-    warnpkgng();
-    if (argc == 4 && !strcmp(argv[1], "-t")) {
-	cmp = version_cmp(argv[2], argv[3]);
-	printf(cmp > 0 ? ">\n" : (cmp < 0 ? "<\n" : "=\n"));
-	exit(0);
-    }
-    else if (argc == 4 && !strcmp(argv[1], "-T")) {
-	cmp = version_match(argv[3], argv[2]);
-	exit(cmp == 1 ? 0 : 1);
-    }
-    else while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) {
-	switch(ch) {
-	case 'v':
-	    Verbose++;
-	    break;
-
-	case 'I':
-	    UseINDEXOnly = TRUE;
-	    break;
-
-	case 'l':
-	    LimitChars = optarg;
-	    break;
-
-	case 'L':
-	    PreventChars = optarg;
-	    break;
-
-	case 'q':
-	    Quiet = TRUE;
-	    break;
-
-	case 's':
-	    MatchName = optarg;
-	    break;
-
-	case 'O':
-	    LookUpOrigin = optarg;
-	    break;
-
-	case 'o':
-	    ShowOrigin = TRUE;
-	    break;
-
-	case 't':
-	    errx(2, "Invalid -t usage.");
-	    break;
-
-	case 'T':
-	    errx(2, "Invalid -T usage.");
-	    break;
-
-	case 'X':
-	    RegexExtended = TRUE;
-	    break;
-
-	case 'h':
-	default:
-	    usage();
-	    break;
-	}
-    }
-
-    argc -= optind;
-    argv += optind;
-
-    return pkg_perform(argv);
-}
-
-static void
-usage(void)
-{
-    fprintf(stderr, "%s\n%s\n%s\n",
-	"usage: pkg_version [-hIoqv] [-l limchar] [-L limchar] [[-X] -s string] [-O origin] [index]",
-	"       pkg_version -t v1 v2",
-	"       pkg_version -T name pattern");
-    exit(1);
-}
diff --git a/usr.sbin/pkg_install/version/perform.c b/usr.sbin/pkg_install/version/perform.c
deleted file mode 100644
index 426d979bdba..00000000000
--- a/usr.sbin/pkg_install/version/perform.c
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jeremy D. Lea.
- * 11 May 2002
- *
- * This is the version module. Based on pkg_version.pl by Bruce A. Mah.
- *
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "lib.h"
-#include "version.h"
-#include <err.h>
-#include <fetch.h>
-#include <signal.h>
-
-static FILE *IndexFile;
-static char IndexPath[PATH_MAX] = "";
-static struct index_head Index = SLIST_HEAD_INITIALIZER(Index);
-
-static int pkg_do(char *);
-static void show_version(Package, const char *, const char *);
-
-/*
- * This is the traditional pkg_perform, except that the argument is _not_ a
- * list of packages. It is the index file from the command line.
- *
- * We loop over the installed packages, matching them with the -s flag if
- * needed and calling pkg_do(). Beforehand we set up a few things, and after
- * we tear them down...
- *
- * Returns 0 on success, non-zero on failure, corresponding to the number of
- * failed attempts to access the INDEX.
- */
-int
-pkg_perform(char **indexarg)
-{
-    char **pkgs, *pat[2], **patterns;
-    struct index_entry *ie;
-    int i, err_cnt = 0, rel_major_ver;
-    int MatchType;
-
-    struct utsname u;
-
-    if (uname(&u) == -1) {
-	warn("%s: failed to determine uname information", __func__);
-	return 1;
-    } else if ((rel_major_ver = (int) strtol(u.release, NULL, 10)) <= 0) {
-	warnx("%s: bad release version specified: %s", __func__, u.release);
-	return 1;
-    }
-
-    /*
-     * Try to find and open the INDEX. We only check IndexFile != NULL
-     * later, if we actually need the INDEX.
-     */
-    if (*indexarg == NULL) {
-	snprintf(IndexPath, sizeof(IndexPath), "%s/INDEX-%d", PORTS_DIR,
-	    rel_major_ver);
-    } else
-	strlcpy(IndexPath, *indexarg, sizeof(IndexPath));
-    if (isURL(IndexPath))
-	IndexFile = fetchGetURL(IndexPath, "");
-    else
-	IndexFile = fopen(IndexPath, "r");
-
-    /* Get either a list of matching or all packages */
-    if (MatchName != NULL) {
-	pat[0] = MatchName;
-	pat[1] = NULL;
-	MatchType = RegexExtended ? MATCH_EREGEX : MATCH_REGEX;
-	patterns = pat;
-     } else {
-	MatchType = MATCH_ALL;
-	patterns = NULL;
-     }
-
-    if (LookUpOrigin != NULL)
-	pkgs = matchbyorigin(LookUpOrigin, &err_cnt);
-    else
-	pkgs = matchinstalled(MatchType, patterns, &err_cnt);
-
-    if (err_cnt != 0)
-	errx(2, "Unable to find package database directory!");
-    if (pkgs == NULL) {
-	if (LookUpOrigin != NULL) {
-	    warnx("no packages recorded with this origin");
-	    return (1);
-	} else {
-	    switch (MatchType) {
-	    case MATCH_ALL:
-		warnx("no packages installed");
-		return (0);
-	    case MATCH_EREGEX:
-	    case MATCH_REGEX:
-		warnx("no packages match pattern");
-		return (1);
-	    default:
-		break;
-	    }
-	}
-    }
-
-    for (i = 0; pkgs[i] != NULL; i++)
-	err_cnt += pkg_do(pkgs[i]);
-
-    /* If we opened the INDEX in pkg_do(), clean up. */
-    while (!SLIST_EMPTY(&Index)) {
-	ie = SLIST_FIRST(&Index);
-	SLIST_REMOVE_HEAD(&Index, next);
-	if (ie->name != NULL)
-	    free(ie->name);
-	if (ie->origin != NULL)
-	    free(ie->origin);
-	free(ie);
-    }
-    if (IndexFile != NULL)
-	fclose(IndexFile);
-
-    return err_cnt;
-}
-
-/*
- * Traditional pkg_do(). We take the package name we are passed and
- * first slurp in the CONTENTS file, getting name and origin, then
- * we look for it's corresponding Makefile. If that fails we pull in
- * the INDEX, and check there.
- */
-static int
-pkg_do(char *pkg)
-{
-    char *ch, tmp[PATH_MAX], tmp2[PATH_MAX], *latest = NULL;
-    Package plist;
-    struct index_entry *ie;
-    FILE *fp;
-    size_t len;
-
-    /* Suck in the contents list. */
-    plist.head = plist.tail = NULL;
-    plist.name = plist.origin = NULL;
-    snprintf(tmp, PATH_MAX, "%s/%s/%s", LOG_DIR, pkg, CONTENTS_FNAME);
-    fp = fopen(tmp, "r");
-    if (!fp) {
-	warnx("the package info for package '%s' is corrupt", pkg);
-	return 1;
-    }
-    read_plist(&plist, fp);
-    fclose(fp);
-    if (plist.name == NULL) {
-    	warnx("%s does not appear to be a valid package!", pkg);
-    	return 1;
-    }
-
-    /*
-     * First we check if the installed package has an origin, and try
-     * looking for it's Makefile. If we find the Makefile we get the
-     * latest version from there. If we fail, we start looking in the
-     * INDEX, first matching the origin and then the package name.
-     */
-    if (plist.origin != NULL && !UseINDEXOnly) {
-	snprintf(tmp, PATH_MAX, "%s/%s", PORTS_DIR, plist.origin);
-	if (isdir(tmp) && chdir(tmp) != FAIL && isfile("Makefile")) {
-	    if ((latest = vpipe("/usr/bin/make -V PKGNAME", tmp)) == NULL)
-		warnx("Failed to get PKGNAME from %s/Makefile!", tmp);
-	    else
-		show_version(plist, latest, "port");
-	}
-    }
-    if (latest == NULL) {
-	/* Report package as not found in INDEX if the INDEX is not required. */
-	if (IndexFile == NULL && !UseINDEXOnly)
-		show_version(plist, NULL, plist.origin);
-	else {
-	/* We only pull in the INDEX once, if needed. */
-	if (SLIST_EMPTY(&Index)) {
-	    if (!IndexFile)
-		errx(2, "Unable to open %s in %s.", IndexPath, __func__);
-	    while ((ch = fgetln(IndexFile, &len)) != NULL) {
-		/*
-		 * Don't use strlcpy() because fgetln() doesn't
-		 * return a valid C string.
-		 */
-		strncpy(tmp, ch, MIN(len, PATH_MAX));
-		tmp[PATH_MAX-1] = '\0';
-		/* The INDEX has pkgname|portdir|... */
-		if ((ch = strchr(tmp, '|')) != NULL)
-		    ch[0] = '\0';
-		if (ch != NULL && (ch = strchr(&ch[1], '|')) != NULL)
-		    ch[0] = '\0';
-		/* Look backwards for the last two dirs = origin */
-		while (ch != NULL && *--ch != '/')
-		    if (ch[0] == '\0')
-			ch = NULL;
-		while (ch != NULL && *--ch != '/')
-		    if (ch[0] == '\0')
-			ch = NULL;
-		if (ch == NULL)
-		    errx(2, "The INDEX does not appear to be valid!");
-		if ((ie = malloc(sizeof(struct index_entry))) == NULL)
-		    errx(2, "Unable to allocate memory in %s.", __func__);
-		bzero(ie, sizeof(struct index_entry));
-		ie->name = strdup(tmp);
-		ie->origin = strdup(&ch[1]);
-		/* Who really cares if we reverse the index... */
-		SLIST_INSERT_HEAD(&Index, ie, next);
-	    }
-	}
-	/* Now that we've slurped in the INDEX... */
-	SLIST_FOREACH(ie, &Index, next) {
-	    if (plist.origin != NULL) {
-		if (strcmp(plist.origin, ie->origin) == 0)
-		    latest = strdup(ie->name);
-	    } else {
-		strlcpy(tmp, ie->name, PATH_MAX);
-		strlcpy(tmp2, plist.name, PATH_MAX);
-		/* Chop off the versions and compare. */
-		if ((ch = strrchr(tmp, '-')) == NULL)
-		    errx(2, "The INDEX does not appear to be valid!");
-		ch[0] = '\0';
-		if ((ch = strrchr(tmp2, '-')) == NULL)
-		    warnx("%s is not a valid package!", plist.name);
-		else
-		    ch[0] = '\0';
-		if (strcmp(tmp2, tmp) == 0) {
-		    if (latest != NULL) {
-			/* Multiple matches */
-			snprintf(tmp, PATH_MAX, "%s|%s", latest, ie->name);
-			free(latest);
-			latest = strdup(tmp);
-		    } else
-			latest = strdup(ie->name);
-		}
-	    }
-	}
-	if (latest == NULL)
-	    show_version(plist, NULL, NULL);
-	else
-	    show_version(plist, latest, "index");
-	}
-    }
-    if (latest != NULL)
-	free(latest);
-    free_plist(&plist);
-    return 0;
-}
-
-#define OUTPUT(c) ((PreventChars != NULL && !strchr(PreventChars, (c))) || \
-			(LimitChars != NULL && strchr(LimitChars, (c))) || \
-			(PreventChars == NULL && LimitChars == NULL))
-
-/*
- * Do the work of comparing and outputing. Ugly, but well that's what
- * You get when you try to match perl output in C ;-).
- */
-void
-show_version(Package plist, const char *latest, const char *source)
-{
-    char *ch, tmp[PATH_MAX];
-    const char *ver;
-    int cmp = 0;
-
-    if (!plist.name || strlen(plist.name) == 0)
-	return;
-    if (ShowOrigin != FALSE && plist.origin != NULL)
-	strlcpy(tmp, plist.origin, PATH_MAX);
-    else {
-	strlcpy(tmp, plist.name, PATH_MAX);
-	if (!Verbose) {
-	    if ((ch = strrchr(tmp, '-')) != NULL)
-		ch[0] = '\0';
-	}
-    }
-    if (latest == NULL) {
-	if (source == NULL && OUTPUT('!')) {
-	    printf("%-34s  !", tmp);
-	    if (Verbose)
-		printf("   Comparison failed");
-	    printf("\n");
-	} else if (OUTPUT('?')) {
-	    printf("%-34s  ?", tmp);
-	    if (Verbose)
-		printf("   orphaned: %s", plist.origin);
-	    printf("\n");
-	}
-    } else if (strchr(latest,'|') != NULL) {
-	if (OUTPUT('*')) {
-	    printf("%-34s  *", tmp);
-	    if (Verbose) {
-		strlcpy(tmp, latest, PATH_MAX);
-		ch = strchr(tmp, '|');
-		ch[0] = '\0';
-
-		ver = strrchr(tmp, '-');
-		ver = ver ? &ver[1] : tmp;
-		printf("   multiple versions (index has %s", ver);
-		do {
-		    ver = strrchr(&ch[1], '-');
-		    ver = ver ? &ver[1] : &ch[1];
-		    if ((ch = strchr(&ch[1], '|')) != NULL)
-			    ch[0] = '\0';
-		    printf(", %s", ver);
-		} while (ch != NULL);
-		printf(")");
-	    }
-	    printf("\n");
-	}
-    } else {
-	cmp = version_cmp(plist.name, latest);
-	ver = strrchr(latest, '-');
-	ver = ver ? &ver[1] : latest;
-	if (cmp < 0 && OUTPUT('<')) {
-	    if (Quiet)
-		printf("%s", tmp);
-	    else {
-		printf("%-34s  <", tmp);
-		if (Verbose)
-		    printf("   needs updating (%s has %s)", source, ver);
-	    }
-	    printf("\n");
-	} else if (cmp == 0 && OUTPUT('=')) {
-	    if (Quiet)
-		printf("%s", tmp);
-	    else {
-		printf("%-34s  =", tmp);
-		if (Verbose)
-		    printf("   up-to-date with %s", source);
-	    }
-	    printf("\n");
-	} else if (cmp > 0 && OUTPUT('>')) {
-	    if (Quiet)
-		printf("%s", tmp);
-	    else {
-		printf("%-34s  >", tmp);
-		if (Verbose)
-		    printf("   succeeds %s (%s has %s)", source, source, ver);
-	    }
-	    printf("\n");
-	}
-    }
-}
-
-int
-version_match(char *pattern, const char *pkgname)
-{
-    int ret = 0;
-    int matchstream = 0;
-    FILE *fp = NULL;
-    Boolean isTMP = FALSE;
-
-    if (isURL(pkgname)) {
-	fp = fetchGetURL(pkgname, "");
-	isTMP = TRUE;
-	matchstream = 1;
-	if (fp == NULL)
-	    errx(2, "Unable to open %s.", pkgname);
-    } else if (pkgname[0] == '/') {
-	fp = fopen(pkgname, "r");
-	isTMP = TRUE;
-	matchstream = 1;
-	if (fp == NULL)
-	    errx(2, "Unable to open %s.", pkgname);
-    } else if (strcmp(pkgname, "-") == 0) {
-	fp = stdin;
-	matchstream = 1;
-    } else if (isURL(pattern)) {
-	fp = fetchGetURL(pattern, "");
-	isTMP = TRUE;
-	matchstream = -1;
-	if (fp == NULL)
-	    errx(2, "Unable to open %s.", pattern);
-    } else if (pattern[0] == '/') {
-	fp = fopen(pattern, "r");
-	isTMP = TRUE;
-	matchstream = -1;
-	if (fp == NULL)
-	    errx(2, "Unable to open %s.", pattern);
-    } else if (strcmp(pattern, "-") == 0) {
-	fp = stdin;
-	matchstream = -1;
-    } else {
-	ret = pattern_match(MATCH_GLOB, pattern, pkgname);
-    }
-
-    if (fp != NULL) {
-	size_t len;
-	char *line;
-	while ((line = fgetln(fp, &len)) != NULL) {
-	    int match;
-	    char *ch, ln[2048];
-	    size_t lnlen;
-	    if (len > 0 && line[len-1] == '\n')
-		len --;
-	    lnlen = len;
-	    if (lnlen > sizeof(ln)-1)
-		lnlen = sizeof(ln)-1;
-	    memcpy(ln, line, lnlen);
-	    ln[lnlen] = '\0';
-	    if ((ch = strchr(ln, '|')) != NULL)
-    		ch[0] = '\0';
-	    if (matchstream > 0)
-	    	match = pattern_match(MATCH_GLOB, pattern, ln);
-	    else
-	    	match = pattern_match(MATCH_GLOB, ln, pkgname);
-	    if (match == 1) {
-		ret = 1;
-		printf("%.*s\n", (int)len, line);
-	    }
-	}
-	if (isTMP)
-	    fclose(fp);
-    }
-
-    return ret;
-}
-
-void
-cleanup(int sig)
-{
-    if (sig)
-	exit(1);
-}
diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1
deleted file mode 100644
index 42f4bfc5c8e..00000000000
--- a/usr.sbin/pkg_install/version/pkg_version.1
+++ /dev/null
@@ -1,263 +0,0 @@
-.\"
-.\" Copyright 1998 Bruce A. Mah
-.\"
-.\" All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR
-.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-.\" IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-.\" (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 May 18, 2013
-.Dt PKG_VERSION 1
-.Os
-.Sh NAME
-.Nm pkg_version
-.Nd summarize installed versions of packages
-.Sh SYNOPSIS
-.Nm
-.Op Fl hIoqv
-.Op Fl l Ar limchar
-.Op Fl L Ar limchar
-.Oo
-.Op Fl X
-.Fl s Ar string
-.Oc
-.Op Fl O Ar origin
-.Op Ar index
-.Nm
-.Fl t Ar version1 version2
-.Nm
-.Fl T Ar pkgname pattern
-.Sh DESCRIPTION
-The
-.Nm
-command is used to produce a report of non-base software packages
-installed using the
-.Xr pkg_add 1
-command.
-.Pp
-Each package's version number is checked against one of two sources to
-see if that package may require updating.
-If the package contains
-information about its origin in the
-.Fx
-ports tree, and a version number can be determined from the port's
-.Pa Makefile ,
-then the version number from the
-.Pa Makefile
-will be used to determine whether the installed package is up-to-date
-or requires updating.
-.Pp
-If no origin for a package can be found, or if the port's
-.Pa Makefile
-cannot be located,
-.Nm
-will search for the package in the ports collection index file
-(typically
-.Pa /usr/ports/INDEX-10 ) .
-Any matching version number(s) there will be used to determine whether
-the installed package is up-to-date or requires updating.
-.Pp
-Generally, using the version number from a port's
-.Pa Makefile
-will provide a more accurate result, since, unlike the index file, it
-provides an unambiguous current version number, even when multiple
-versions of a port exist in the ports collection.
-Moreover, the ports collection index file is only updated at
-intervals, meaning that it may not completely reflect the version
-numbers of the software contained in the ports collection.
-.Pp
-Each package name is printed, along with a one-character status flag:
-.Bl -tag -width indent
-.It Li =
-The installed version of the package is current.
-.It Li \&<
-The installed version of the package is older than the current version.
-.It Li \&>
-The installed version of the package is newer than the current version.
-This situation can arise with an out-of-date index file, or when
-testing new ports.
-.It Li \&?
-The installed package does not appear in the index.
-This could be due to an out of date index or a package taken from a PR
-that has not yet been committed.
-.It Li *
-There are multiple versions of a particular software package
-listed in the index file.
-Examples from the
-.Fx
-ports collection are the Tcl toolkit or the
-.Tn EMACS
-editor.
-.It Li \&!
-The installed package exists in the index but for some reason,
-.Nm
-was unable to compare the version number of the installed package
-with the corresponding entry in the index.
-.El
-.Sh OPTIONS
-The
-.Nm
-utility supports several command-line arguments:
-.Bl -tag -width indent
-.It Fl h , -help
-Print help message.
-.It Fl I , -index-only
-Use only the index file for determining if a package is out of date.
-This is much faster than using the version number from a port's
-Makefile, at the expense of potentially giving an incorrect result if
-the index file is out of date.
-.It Fl l , -status Ar limchar
-Limit the output to those packages whose status flag matches the
-character(s) in
-.Ar limchar .
-More than one character can be specified in
-.Ar limchar .
-Note that because some of the status flag characters are also special
-to the shell, it is best to quote
-.Ar limchar
-with single quotes.
-.It Fl L , -no-status Ar limchar
-Limit the output to those packages whose status flag does not match
-.Ar limchar .
-You may specify more than one character to match in
-.Ar limchar .
-Note that because some of the status flag characters are also special
-to the shell, it is best to quote
-.Ar limchar
-with single quotes.
-.It Fl o , -show-origin
-Show the origin recorded on package generation instead of the package
-name.
-.It Fl O , -origin Ar origin
-Only list packages whose registered origin is
-.Ar origin .
-.It Fl q , -quiet
-Enable quiet output.
-Quiet output precludes printing the
-.Ar limchar
-when used with
-.Fl l
-or
-.Fl L .
-This is useful when used as the input to
-.Xr portupgrade 8 .
-.It Fl s , -match Ar string
-Limit the output to those packages whose names match a given
-.Ar string .
-.It Fl X , -extended
-Interpret
-.Ar string
-as a extended regular expression.
-.It Fl t
-Test a pair of version number strings and exit.
-The output consists of one of the single characters
-.Li =
-(equal),
-.Li \&<
-(right-hand number greater), or
-.Li \&>
-(left-hand number greater) on standard output.
-This flag is mostly useful for scripts or for testing.
-.It Fl T
-Test whether
-.Ar pkgname
-is matched by
-.Ar pattern
-and set the exit code accordingly.
-.Fl T
-can also be used in `filter mode':
-When one of the arguments is `-', standard input is used, and lines
-with matching package names/patterns are echoed to standard output.
-.It Fl v
-Enable verbose output.
-Verbose output includes some English-text
-interpretations of the version number comparisons, as well as the
-version numbers compared for each package.
-Non-verbose output is
-probably easier for programs or scripts to parse.
-.It Ar index
-Specify the index to be used as a basis of comparison.
-This index can
-be specified as a filename (in the local file system) or a URL.
-Any
-URL understandable by
-.Xr fetch 1
-can be used here.
-If no
-.Ar index
-file is specified on the command line,
-.Pa /usr/ports/INDEX-10
-is used.
-.El
-.Sh FILES
-.Bl -tag -width /usr/ports/INDEX-10 -compact
-.It Pa /usr/ports/INDEX-10
-Default index file.
-.El
-.Sh EXAMPLES
-The following is a typical invocation of the
-.Nm
-command, which checks the installed packages against the local ports
-index file:
-.Pp
-.Dl % pkg_version -v
-.Pp
-The command below generates a report against
-the version numbers in the on-line ports collection:
-.Pp
-.Dl % pkg_version http://www.FreeBSD.org/ports/INDEX-10
-.Pp
-The following command compares two package version strings:
-.Pp
-.Dl % pkg_version -t 1.5 1.5.1
-.Sh COMPATIBILITY
-The
-.Fl c
-option has been deprecated and is no longer supported.
-.Sh ENVRIOMENT
-.Bl -tag -width indent
-.It Ev PKG_OLD_NOWARN
-If set
-.Nm
-will not warn about its use in the presence of pkgng databases.
-.El
-.Sh SEE ALSO
-.Xr fetch 1 ,
-.Xr pkg_add 1 ,
-.Xr pkg_create 1 ,
-.Xr pkg_delete 1 ,
-.Xr pkg_info 1 ,
-.Xr portupgrade 8
-.Sh AUTHORS
-The
-.Nm
-utility was written by
-.An Jeremy D. Lea Aq reg@FreeBSD.org ,
-partially based on a Perl script written by
-.An Bruce A. Mah Aq bmah@FreeBSD.org .
-.Sh CONTRIBUTORS
-.An Nik Clayton Aq nik@FreeBSD.org ,
-.An Dominic Mitchell Aq dom@palmerharvey.co.uk ,
-.An Mark Ovens Aq marko@FreeBSD.org ,
-.An Doug Barton Aq DougB@gorean.org ,
-.An Akinori MUSHA Aq knu@FreeBSD.org ,
-.An Oliver Eikemeier Aq eik@FreeBSD.org
diff --git a/usr.sbin/pkg_install/version/test-pkg_version.sh b/usr.sbin/pkg_install/version/test-pkg_version.sh
deleted file mode 100755
index 95486c1f7bd..00000000000
--- a/usr.sbin/pkg_install/version/test-pkg_version.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2001 Bruce A. Mah
-#
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE DEVELOPERS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (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-pkg_version.sh
-#
-# Regression testing for pkg_version
-# Originally from an idea by "Akinori MUSHA" <knu@iDaemons.org>
-#
-# $FreeBSD$
-#
-
-ECHO=echo
-PKG_VERSION=./pkg_version
-
-test-pv ( ) { \
-    setvar v1 $1
-    setvar answer $2
-    setvar v2 $3
-    setvar type $4
-    res=`${PKG_VERSION} -t ${v1} ${v2}`
-    if [ ${res} != ${answer} ]; then \
-	${ECHO} "${type} test failed (${v1} ${res} ${v2}, should have been ${answer})"; \
-    fi
-}
-
-# Test coercion of default PORTREVISION and PORTEPOCH
-test-pv 0.10 "=" 0.10_0 coercion
-test-pv 0.10 "=" 0.10,0 coercion
-test-pv 0.10 "=" 0.10_0,0 coercion
-
-# Test various comparisons
-test-pv 1.0 "=" 1.0 equality
-test-pv 2.15a "=" 2.15a equality
-
-test-pv 0.10 ">" 0.9 inequality
-test-pv 0.9 "<" 0.10 inequality
-
-test-pv 2.3p10 ">" 2.3p9 number/letter
-test-pv 1.6.0 ">" 1.6.0.p3 number/letter
-test-pv 1.0.b ">" 1.0.a3 number/letter
-test-pv 1.0a ">" 1.0 number/letter
-test-pv 1.0a "<" 1.0b number/letter
-test-pv 5.0a ">" 5.0.b number/letter
-
-test-pv 1.5_1 ">" 1.5 portrevision
-test-pv 1.5_2 ">" 1.5_1 portrevision
-test-pv 1.5_1 "<" 1.5.0.1 portrevision
-test-pv 1.5 "<" 1.5.0.1 portrevision
-
-test-pv 00.01.01,1 ">" 99.12.31 portepoch
-test-pv 0.0.1_1,2 ">" 0.0.1,2 portrevision/portepoch
-test-pv 0.0.1_1,3 ">" 0.0.1_2,2 portrevision/portepoch
-
-test-pv 2.0 ">" 2.a2 number/letter
-test-pv 3 "=" 3.0 equality
-test-pv 4a "<" 4a0 letter/zero
-test-pv 10a1b2 "=" 10a1.b2 separator
-
-test-pv 7pl "=" 7.pl patchevel
-test-pv 8.0.a "=" 8.0alpha alpha
-test-pv 9.b3.0 "=" 9beta3 beta
-test-pv 10.pre7 "=" 10pre7.0 pre
-test-pv 11.r "=" 11.rc rc
-
-test-pv 12pl "<" 12alpha alpha/patchevel
-test-pv 13.* "<" 13.pl star/patchevel
-
-test-pv 1.0.0+2003.09.06 "=" 1.0+2003.09.06 plus/multiple
-test-pv 1.0.1+2003.09.06 ">" 1.0+2003.09.06 plus/multiple
-test-pv 1.0.0+2003.09.06 "<" 1.0+2003.09.06_1 plus/portrevision
-test-pv 1.0.1+2003.09.06 ">" 1.0+2003.09.06_1 plus/portrevision
diff --git a/usr.sbin/pkg_install/version/version.h b/usr.sbin/pkg_install/version/version.h
deleted file mode 100644
index 1f265d4cf6e..00000000000
--- a/usr.sbin/pkg_install/version/version.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* $FreeBSD$ */
-
-/*
- * FreeBSD install - a package for the installation and maintenance
- * of non-core utilities.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * Jeremy D. Lea.
- * 11 May 2002
- *
- * This is the version module. Based on pkg_version.pl by Bruce A. Mah.
- *
- */
-
-#ifndef _INST_VERSION_H_INCLUDE
-#define _INST_VERSION_H_INCLUDE
-
-struct index_entry {
-    SLIST_ENTRY(index_entry) next;
-    char *name;
-    char *origin;
-};
-SLIST_HEAD(index_head, index_entry);
-
-extern char	*LimitChars;
-extern char	*PreventChars;
-extern char	*MatchName;
-extern char	*LookUpOrigin;
-extern Boolean	RegexExtended;
-extern Boolean	UseINDEXOnly;
-extern Boolean	ShowOrigin;
-
-extern int	version_match(char *, const char *);
-
-#endif	/* _INST_VERSION_H_INCLUDE */
diff --git a/usr.sbin/portsnap/portsnap/portsnap.8 b/usr.sbin/portsnap/portsnap/portsnap.8
index baa1a571d7a..0e9bd7efce3 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.8
+++ b/usr.sbin/portsnap/portsnap/portsnap.8
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 14, 2012
+.Dd October 22, 2013
 .Dt PORTSNAP 8
 .Os FreeBSD
 .Sh NAME
@@ -161,6 +161,18 @@ or
 commands.
 Again, note that in the parts of the ports tree which are being
 updated, any local changes or additions will be removed.
+.It auto
+Run
+.Cm fetch
+or
+.Cm cron
+depending on whether stdin is a terminal; then run
+.Cm update
+or
+.Cm extract
+depending on whether
+.Ar portsdir
+exists.
 .El
 .Sh TIPS
 .Bl -bullet
diff --git a/usr.sbin/portsnap/portsnap/portsnap.sh b/usr.sbin/portsnap/portsnap/portsnap.sh
index 14e54413eb0..81efbb70c0c 100644
--- a/usr.sbin/portsnap/portsnap/portsnap.sh
+++ b/usr.sbin/portsnap/portsnap/portsnap.sh
@@ -61,6 +61,8 @@ Commands:
                   files and directories.
   update       -- Update ports tree to match current snapshot, replacing
                   files and directories which have changed.
+  auto         -- Fetch updates, and either extract a new ports tree or
+                  update an existing tree.
 EOF
 	exit 0
 }
@@ -147,12 +149,15 @@ parse_cmdline() {
 			if [ ! -z "${SERVERNAME}" ]; then usage; fi
 			shift; SERVERNAME="$1"
 			;;
-		cron | extract | fetch | update | alfred)
+		cron | extract | fetch | update | auto)
 			COMMANDS="${COMMANDS} $1"
 			;;
 		up)
 			COMMANDS="${COMMANDS} update"
 			;;
+		alfred)
+			COMMANDS="${COMMANDS} auto"
+			;;
 		*)
 			if [ $# -gt 1 ]; then usage; fi
 			if echo ${COMMANDS} | grep -vq extract; then
@@ -947,7 +952,7 @@ extract_run() {
 			cat ${WORKDIR}/INDEX
 		fi | while read FILE HASH; do
 		echo ${PORTSDIR}/${FILE}
-		if ! [ -r "${WORKDIR}/files/${HASH}.gz" ]; then
+		if ! [ -s "${WORKDIR}/files/${HASH}.gz" ]; then
 			echo "files/${HASH}.gz not found -- snapshot corrupt."
 			return 1
 		fi
@@ -991,7 +996,7 @@ update_run_extract() {
 	    comm -13 ${PORTSDIR}/.portsnap.INDEX - |
 	    while read FILE HASH; do
 		echo ${PORTSDIR}/${FILE}
-		if ! [ -r "${WORKDIR}/files/${HASH}.gz" ]; then
+		if ! [ -s "${WORKDIR}/files/${HASH}.gz" ]; then
 			echo "files/${HASH}.gz not found -- snapshot corrupt."
 			return 1
 		fi
@@ -1104,10 +1109,10 @@ cmd_update() {
 	update_run || exit 1
 }
 
-# Alfred command.  Run 'fetch' or 'cron' depending on
+# Auto command.  Run 'fetch' or 'cron' depending on
 # whether stdin is a terminal; then run 'update' or
 # 'extract' depending on whether ${PORTSDIR} exists.
-cmd_alfred() {
+cmd_auto() {
 	if [ "${INTERACTIVE}" = "YES" ]; then
 		cmd_fetch
 	else
diff --git a/usr.sbin/ppp/mppe.c b/usr.sbin/ppp/mppe.c
index 141574ff275..f1fadc39614 100644
--- a/usr.sbin/ppp/mppe.c
+++ b/usr.sbin/ppp/mppe.c
@@ -168,7 +168,7 @@ MPPEOutput(void *v, struct ccp *ccp, struct link *l __unused, int pri __unused,
   dictinit = 0;
 
   log_Printf(LogDEBUG, "MPPE: Output: Proto %02x (%d bytes)\n", *proto, ilen);
-  if (*proto < 0x21 && *proto > 0xFA) {
+  if (*proto < 0x21 || *proto > 0xFA) {
     log_Printf(LogDEBUG, "MPPE: Output: Not encrypting\n");
     ccp->compout += ilen;
     ccp->uncompout += ilen;
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c
index 421ac1ae09d..94fb3aec642 100644
--- a/usr.sbin/route6d/route6d.c
+++ b/usr.sbin/route6d/route6d.c
@@ -2584,9 +2584,6 @@ do { \
 	IFFLAG("POINTOPOINT", IFF_POINTOPOINT);
 #ifdef IFF_NOTRAILERS
 	IFFLAG("NOTRAILERS", IFF_NOTRAILERS);
-#endif
-#ifdef IFF_SMART
-	IFFLAG("SMART", IFF_SMART);
 #endif
 	IFFLAG("RUNNING", IFF_RUNNING);
 	IFFLAG("NOARP", IFF_NOARP);
diff --git a/usr.sbin/rpcbind/check_bound.c b/usr.sbin/rpcbind/check_bound.c
index 35e0a5ad140..3691f5f1a2f 100644
--- a/usr.sbin/rpcbind/check_bound.c
+++ b/usr.sbin/rpcbind/check_bound.c
@@ -1,33 +1,32 @@
 /*	$NetBSD: check_bound.c,v 1.2 2000/06/22 08:09:26 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/usr.sbin/rpcbind/pmap_svc.c b/usr.sbin/rpcbind/pmap_svc.c
index 5df3097281c..d20f18f88f8 100644
--- a/usr.sbin/rpcbind/pmap_svc.c
+++ b/usr.sbin/rpcbind/pmap_svc.c
@@ -1,33 +1,32 @@
 /*	$NetBSD: pmap_svc.c,v 1.2 2000/10/20 11:49:40 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1984 - 1991 by Sun Microsystems, Inc.
diff --git a/usr.sbin/rpcbind/rpcb_stat.c b/usr.sbin/rpcbind/rpcb_stat.c
index 30617545f7b..fd92d78ea16 100644
--- a/usr.sbin/rpcbind/rpcb_stat.c
+++ b/usr.sbin/rpcbind/rpcb_stat.c
@@ -2,33 +2,32 @@
  * $NetBSD: rpcb_stat.c,v 1.2 2000/07/04 20:27:40 matt Exp $
  * $FreeBSD$
  */
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /* #pragma ident   "@(#)rpcb_stat.c 1.7     94/04/25 SMI" */
 
diff --git a/usr.sbin/rpcbind/rpcb_svc.c b/usr.sbin/rpcbind/rpcb_svc.c
index 9ed05347bd3..7aa5393ac42 100644
--- a/usr.sbin/rpcbind/rpcb_svc.c
+++ b/usr.sbin/rpcbind/rpcb_svc.c
@@ -1,33 +1,32 @@
 /*	$NetBSD: rpcb_svc.c,v 1.1 2000/06/02 23:15:41 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/usr.sbin/rpcbind/rpcb_svc_4.c b/usr.sbin/rpcbind/rpcb_svc_4.c
index 86bfc08eb96..852abaff6c2 100644
--- a/usr.sbin/rpcbind/rpcb_svc_4.c
+++ b/usr.sbin/rpcbind/rpcb_svc_4.c
@@ -3,33 +3,32 @@
  * $FreeBSD$
  */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/usr.sbin/rpcbind/rpcb_svc_com.c b/usr.sbin/rpcbind/rpcb_svc_com.c
index f90dc5964b5..a362c8509a4 100644
--- a/usr.sbin/rpcbind/rpcb_svc_com.c
+++ b/usr.sbin/rpcbind/rpcb_svc_com.c
@@ -1,33 +1,32 @@
 /*	$NetBSD: rpcb_svc_com.c,v 1.9 2002/11/08 00:16:39 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c
index fb6c99d5e53..e692c6e1b26 100644
--- a/usr.sbin/rpcbind/rpcbind.c
+++ b/usr.sbin/rpcbind/rpcbind.c
@@ -1,33 +1,32 @@
 /*	$NetBSD: rpcbind.c,v 1.3 2002/11/08 00:16:40 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1984 - 1991 by Sun Microsystems, Inc.
diff --git a/usr.sbin/rpcbind/rpcbind.h b/usr.sbin/rpcbind/rpcbind.h
index 717bb3bb11e..f76bf3e6c8c 100644
--- a/usr.sbin/rpcbind/rpcbind.h
+++ b/usr.sbin/rpcbind/rpcbind.h
@@ -1,33 +1,32 @@
 /*	$NetBSD: rpcbind.h,v 1.1 2000/06/03 00:47:21 fvdl Exp $	*/
 /*	$FreeBSD$ */
 
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * Copyright (c) 1986 - 1991 by Sun Microsystems, Inc.
diff --git a/usr.sbin/rpcbind/warmstart.c b/usr.sbin/rpcbind/warmstart.c
index fc0956f574f..473b6f7e957 100644
--- a/usr.sbin/rpcbind/warmstart.c
+++ b/usr.sbin/rpcbind/warmstart.c
@@ -1,30 +1,29 @@
-/*
- * 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) 2009, Sun Microsystems, Inc.
+ * 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 Sun Microsystems, 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 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.
  */
 /*
  * warmstart.c
diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 87a41667be1..a29aee1a85b 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -281,7 +281,7 @@ main(int argc, char *argv[])
 		} else if (pid_child_receiver == -1) {
 			if (errno == ENOSYS) {
 				syslog(LOG_ERR,
-				    "The pdfork(2) system call is not available; recompile the kernel with options PROCDESC");
+				    "The pdfork(2) system call is not available - kernel too old.");
 			} else {
 				syslog(LOG_ERR, "pdfork: %m");
 			}
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 8fc26782ec2..60c74d1d3d5 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -74,6 +74,7 @@ __FBSDID("$FreeBSD$");
 #define	DEFSPRI		(LOG_KERN|LOG_CRIT)
 #define	TIMERINTVL	30		/* interval for checking flush, mark */
 #define	TTYMSGTIME	1		/* timeout passed to ttymsg */
+#define	RCVBUF_MINSIZE	(80 * 1024)	/* minimum size of dgram rcv buffer */
 
 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -336,7 +337,7 @@ static void	unmapped(struct sockaddr *);
 static void	wallmsg(struct filed *, struct iovec *, const int iovlen);
 static int	waitdaemon(int, int, int);
 static void	timedout(int);
-static void	double_rbuf(int);
+static void	increase_rcvbuf(int);
 
 int
 main(int argc, char *argv[])
@@ -547,8 +548,8 @@ main(int argc, char *argv[])
 				STAILQ_REMOVE(&funixes, fx, funix, next);
 				continue;
 			}
-			double_rbuf(fx->s);
 		}
+		increase_rcvbuf(fx->s);
 	}
 	if (SecureMode <= 1)
 		finet = socksetup(family, bindhostname);
@@ -1241,8 +1242,10 @@ fprintlog(struct filed *f, int flags, const char *msg)
 				switch (errno) {
 				case ENOBUFS:
 				case ENETDOWN:
+				case ENETUNREACH:
 				case EHOSTUNREACH:
 				case EHOSTDOWN:
+				case EADDRNOTAVAIL:
 					break;
 				/* case EBADF: */
 				/* case EACCES: */
@@ -1253,7 +1256,7 @@ fprintlog(struct filed *f, int flags, const char *msg)
 				/* case ENOBUFS: */
 				/* case ECONNREFUSED: */
 				default:
-					dprintf("removing entry\n");
+					dprintf("removing entry: errno=%d\n", e);
 					f->f_type = F_UNUSED;
 					break;
 				}
@@ -2720,7 +2723,7 @@ socksetup(int af, char *bindhostname)
 			}
 
 			if (!SecureMode)
-				double_rbuf(*s);
+				increase_rcvbuf(*s);
 		}
 
 		(*socks)++;
@@ -2741,12 +2744,16 @@ socksetup(int af, char *bindhostname)
 }
 
 static void
-double_rbuf(int fd)
+increase_rcvbuf(int fd)
 {
-	socklen_t slen, len;
+	socklen_t len, slen;
+
+	slen = sizeof(len);
 
 	if (getsockopt(fd, SOL_SOCKET, SO_RCVBUF, &len, &slen) == 0) {
-		len *= 2;
-		setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &len, slen);
+		if (len < RCVBUF_MINSIZE) {
+			len = RCVBUF_MINSIZE;
+			setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &len, sizeof(len));
+		}
 	}
 }
diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc
index 7e1ddcb79ef..bc603b1c699 100644
--- a/usr.sbin/sysrc/sysrc
+++ b/usr.sbin/sysrc/sysrc
@@ -28,15 +28,24 @@
 #
 ############################################################ INCLUDES
 
+# Prevent `-d' from being interpreted as a debug flag by common.subr
+DEBUG_SELF_INITIALIZE=
+
 BSDCFG_SHARE="/usr/share/bsdconfig"
 [ "$_COMMON_SUBR" ] || . $BSDCFG_SHARE/common.subr || exit 1
 [ "$_SYSRC_SUBR"  ] || f_include $BSDCFG_SHARE/sysrc.subr
 
 ############################################################ GLOBALS
 
+#
+# Version information
+#
+SYSRC_VERSION="6.0 Nov-07,2013"
+
 #
 # Options
 #
+CHECK_ONLY=
 DELETE=
 DESCRIBE=
 IGNORE_UNKNOWNS=
@@ -92,6 +101,8 @@ help()
 	      "Dump a list of all non-default configuration variables."
 	f_err "$optfmt" "-A" \
 	      "Dump a list of all configuration variables (incl. defaults)."
+	f_err "$optfmt" "-c" \
+	      "Check. Return success if no changes needed, else error."
 	f_err "$optfmt" "-d" \
 	      "Print a description of the given variable."
 	f_err "$optfmt" "-D" \
@@ -130,6 +141,8 @@ help()
 	      "Verbose. Print the pathname of the specific rc.conf(5)"
 	f_err "$optfmt" "" \
 	      "file where the directive was found."
+	f_err "$optfmt" "--version" \
+	      "Print version information to stdout and exit."
 	f_err "$optfmt" "-x" \
 	      "Remove variable(s) from specified file(s)."
 	f_err "\n"
@@ -179,6 +192,7 @@ jail_depend()
 	#
 	# Print include dependencies
 	#
+	echo DEBUG_SELF_INITIALIZE=
 	cat $BSDCFG_SHARE/common.subr
 	cat $BSDCFG_SHARE/sysrc.subr
 }
@@ -191,27 +205,31 @@ jail_depend()
 [ $# -gt 0 ] || usage
 
 #
-# Check for `--help' command-line option
+# Check for `--help' and `--version' command-line option
 #
 ( # Operate in sub-shell to protect $@ in parent
 	while [ $# -gt 0 ]; do
 		case "$1" in
-		--help) exit 1;;
+		--help) help ;;
+		--version) # see GLOBALS
+			echo "$SYSRC_VERSION"
+			exit 1 ;;
 		-[fRj]) # These flags take an argument
-			shift 1;;
+			shift 1 ;;
 		esac
 		shift 1
 	done
 	exit 0
-) || help
+) || die
 
 #
 # Process command-line flags
 #
-while getopts aAdDef:Fhij:nNqR:vxX flag; do
+while getopts aAcdDef:Fhij:nNqR:vxX flag; do
 	case "$flag" in
 	a) SHOW_ALL=${SHOW_ALL:-1};;
 	A) SHOW_ALL=2;;
+	c) CHECK_ONLY=1;;
 	d) DESCRIBE=1;;
 	D) RC_CONFS=;;
 	e) SHOW_EQUALS=1;;
@@ -272,17 +290,24 @@ if [ "$DELETE" -a "$SHOW_ALL" ]; then
 	[ "$DELETE" = "2" ] || die "$errmsg"
 fi
 
+#
+# Pre-flight for `-c' command-line option
+#
+[ "$CHECK_ONLY" -a "$SHOW_ALL" ] &&
+	die "$pgm: \`-c' option incompatible with \`-a'/\`-A' options"
+
 #
 # Process `-e', `-n', and `-N' command-line options
 #
 SEP=': '
-[ "$SHOW_EQUALS" ] && SEP='="'
+[ "$SHOW_FILE" ] && SHOW_EQUALS=
 [ "$SHOW_NAME" ] || SHOW_EQUALS=
 [ "$SYSRC_VERBOSE" = "0" ] && SYSRC_VERBOSE=
 if [ ! "$SHOW_VALUE" ]; then
 	SHOW_NAME=1
 	SHOW_EQUALS=
 fi
+[ "$SHOW_EQUALS" ] && SEP='="'
 
 #
 # Process `-j jail' and `-R dir' command-line options
@@ -298,6 +323,7 @@ if [ "$JAIL" -o "$ROOTDIR" ]; then
 		$( [ "$DELETE" = "2" ] && echo \ -X )
 		$( [ "$SHOW_ALL" = "1" ] && echo \ -a )
 		$( [ "$SHOW_ALL" = "2" ] && echo \ -A )
+		${CHECK_ONLY:+-c}
 		${DESCRIBE:+-d}
 		${SHOW_EQUALS:+-e}
 		${IGNORE_UNKNOWNS:+-i}
@@ -408,7 +434,7 @@ if [ "$SHOW_ALL" ]; then
 		EXCEPT="IFS|EXCEPT|PATH|RC_DEFAULTS|OPTIND|DESCRIBE|SEP"
 		EXCEPT="$EXCEPT|DELETE|SHOW_ALL|SHOW_EQUALS|SHOW_NAME"
 		EXCEPT="$EXCEPT|SHOW_VALUE|SHOW_FILE|SYSRC_VERBOSE|RC_CONFS"
-		EXCEPT="$EXCEPT|pgm|SUCCESS|FAILURE"
+		EXCEPT="$EXCEPT|pgm|SUCCESS|FAILURE|CHECK_ONLY"
 		EXCEPT="$EXCEPT|f_sysrc_desc_awk|f_sysrc_delete_awk"
 
 		#
@@ -501,6 +527,7 @@ fi
 #
 # Process command-line arguments
 #
+costatus=$SUCCESS
 while [ $# -gt 0 ]; do
 	NAME="${1%%=*}"
 
@@ -511,14 +538,19 @@ while [ $# -gt 0 ]; do
 	*=*)
 		#
 		# Like sysctl(8), if both `-d' AND "name=value" is passed,
-		# first describe, then attempt to set
+		# first describe (done above), then attempt to set
 		#
 
-		if [ "$SYSRC_VERBOSE" ]; then
+		# If verbose, prefix line with where the directive lives
+		if [ "$SYSRC_VERBOSE" -a ! "$CHECK_ONLY" ]; then
 			file=$( f_sysrc_find "$NAME" )
 			[ "$file" = "$RC_DEFAULTS" -o ! "$file" ] && \
 				file=$( f_sysrc_get 'rc_conf_files%%[$IFS]*' )
-			echo -n "$file: "
+			if [ "$SHOW_EQUALS" ]; then
+				echo -n ": $file; "
+			else
+				echo -n "$file: "
+			fi
 		fi
 
 		#
@@ -531,6 +563,20 @@ while [ $# -gt 0 ]; do
 			continue
 		fi
 
+		#
+		# If `-c' is passed, simply compare and move on
+		#
+		if [ "$CHECK_ONLY" ]; then
+			if ! IGNORED=$( f_sysrc_get "$NAME?" ); then
+				costatus=$FAILURE
+			else
+				value=$( f_sysrc_get "$NAME" )
+				[ "$value" = "${1#*=}" ] || costatus=$FAILURE
+			fi
+			shift 1
+			continue
+		fi
+
 		#
 		# If `-N' is passed, simplify the output
 		#
@@ -546,28 +592,34 @@ while [ $# -gt 0 ]; do
 			if f_sysrc_set "$NAME" "${1#*=}"; then
 				if [ "$SHOW_FILE" ]; then
 					after=$( f_sysrc_find "$NAME" )
-					echo -n "${SHOW_NAME:+$NAME$SEP}"
-					echo -n "$before${SHOW_EQUALS:+\"}"
-					echo " -> $after"
 				else
 					after=$( f_sysrc_get "$NAME" )
-					echo -n "${SHOW_NAME:+$NAME$SEP}"
-					echo "$before -> $after"
 				fi
+				echo -n "${SHOW_NAME:+$NAME$SEP}"
+				echo -n "$before${SHOW_EQUALS:+\" #}"
+				echo -n " -> ${SHOW_EQUALS:+\"}$after"
+				echo "${SHOW_EQUALS:+\"}"
 			fi
 		fi
 		;;
 	*)
-		if ! IGNORED="$( f_sysrc_get "$NAME?" )"; then
-			[ "$IGNORE_UNKNOWNS" ] \
-				|| echo "$pgm: unknown variable '$NAME'"
+		if ! IGNORED=$( f_sysrc_get "$NAME?" ); then
+			[ "$IGNORE_UNKNOWNS" ] ||
+				echo "$pgm: unknown variable '$NAME'"
+			shift 1
+			costatus=$FAILURE
+			continue
+		fi
+
+		# The above check told us what we needed for `-c'
+		if [ "$CHECK_ONLY" ]; then
 			shift 1
 			continue
 		fi
 
 		#
-		# Like sysctl(8), when `-d' is passed,
-		# desribe it rather than expanding it
+		# Like sysctl(8), when `-d' is passed, desribe it
+		# (already done above) rather than expanding it
 		#
 
 		if [ "$DESCRIBE" ]; then
@@ -594,8 +646,13 @@ while [ $# -gt 0 ]; do
 			continue
 		fi
 
-		[ "$SYSRC_VERBOSE" ] && \
-			echo -n "$( f_sysrc_find "$NAME" ): "
+		if [ "$SYSRC_VERBOSE" ]; then
+			if [ "$SHOW_EQUALS" ]; then
+				echo -n ": $( f_sysrc_find "$NAME" ); "
+			else
+				echo -n "$( f_sysrc_find "$NAME" ): "
+			fi
+		fi
 
 		#
 		# If `-N' is passed, simplify the output
@@ -609,3 +666,9 @@ while [ $# -gt 0 ]; do
 	esac
 	shift 1
 done
+
+[ ! "$CHECK_ONLY" ] || exit $costatus
+
+################################################################################
+# END
+################################################################################
diff --git a/usr.sbin/sysrc/sysrc.8 b/usr.sbin/sysrc/sysrc.8
index b5671a0a59f..e3b873fee1a 100644
--- a/usr.sbin/sysrc/sysrc.8
+++ b/usr.sbin/sysrc/sysrc.8
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Jul 5, 2013
+.Dd Nov 20, 2013
 .Dt SYSRC 8
 .Os
 .Sh NAME
@@ -32,13 +32,13 @@
 .Nd safely edit system rc files
 .Sh SYNOPSIS
 .Nm
-.Op Fl dDeFhinNqvx
+.Op Fl cdDeFhinNqvx
 .Op Fl f Ar file
 .Op Fl j Ar jail | Fl R Ar dir
 .Ar name Ns Op = Ns Ar value
 .Ar ...
 .Nm
-.Op Fl dDeFhinNqvx
+.Op Fl cdDeFhinNqvx
 .Op Fl f Ar file
 .Op Fl j Ar jail | Fl R Ar dir
 .Fl a | A
@@ -57,6 +57,12 @@ Dump a list of all non-default configuration variables.
 .It Fl A
 Dump a list of all configuration variables
 .Pq incl. defaults .
+.It Fl c
+Check if the value will change when assigning a new value.
+If verbose
+.Pq see Dq Fl v
+prints a message stating whether a change would occur.
+Exits with success if no change is necessary, else returns error status.
 .It Fl d
 Print a description of the given variable.
 .It Fl D
@@ -64,10 +70,13 @@ Show default value(s) only (this is the same as setting RC_CONFS to NULL or
 passing `-f' with a NULL file-argument).
 .It Fl e
 Print query results as
-.Ql var=value
-.Pq useful for producing output to be fed back in .
-Ignored if
-.Fl n
+.Xr sh 1
+compatible syntax
+.Pq for example, Ql var=value .
+Ignored if either
+.Ql Fl n
+or
+.Ql Fl F
 is specified.
 .It Fl f Ar file
 Operate on the specified file(s) instead of the files obtained by reading the
@@ -112,6 +121,8 @@ Verbose.
 Print the pathname of the specific
 .Xr rc.conf 5
 file where the directive was found.
+.It Fl -version
+Print version information to stdout and exit.
 .It Fl x
 Remove variable(s) from specified file(s).
 .El
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index fe2a001fa0f..3ec7efd6024 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -89,7 +89,6 @@ SRCS=	addrtoname.c \
 	print-olsr.c \
 	print-ospf.c \
 	print-otv.c \
-	print-pfsync.c \
 	print-pgm.c \
 	print-pim.c \
 	print-ppi.c \
@@ -171,7 +170,8 @@ CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_OPENSSL_EVP_H
 .endif
 
 .if ${MK_PF} != "no"
-SRCS+=	print-pflog.c
+SRCS+=	print-pflog.c \
+	print-pfsync.c
 CFLAGS+= -DHAVE_NET_PFVAR_H
 .endif
 
diff --git a/usr.sbin/utx/Makefile b/usr.sbin/utx/Makefile
index a70c71c508e..78c4f90160b 100644
--- a/usr.sbin/utx/Makefile
+++ b/usr.sbin/utx/Makefile
@@ -3,7 +3,4 @@
 PROG=	utx
 MAN=	utx.8
 
-LINKS=	${BINDIR}/utx ${BINDIR}/utxrm
-MLINKS=	utx.8 utxrm.8
-
 .include <bsd.prog.mk>
diff --git a/usr.sbin/utx/utx.8 b/usr.sbin/utx/utx.8
index c3e71e259df..363a46a281d 100644
--- a/usr.sbin/utx/utx.8
+++ b/usr.sbin/utx/utx.8
@@ -24,12 +24,11 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 11, 2012
+.Dd November 3, 2013
 .Dt UTX 8
 .Os
 .Sh NAME
-.Nm utx ,
-.Nm utxrm
+.Nm utx
 .Nd manage the user accounting database
 .Sh SYNOPSIS
 .Nm
@@ -40,9 +39,6 @@
 .Cm rm
 .Ar identifier
 .Ar ...
-.Nm utxrm
-.Ar identifier
-.Ar ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -82,11 +78,6 @@ accounting database's active session table, including its identifiers:
 Identifiers can either be supplied in hexadecimal form as displayed by
 .Xr getent 1 ,
 or as a string if the identifier allows such a representation.
-.Pp
-To remain backward compatible, this action can also be invoked directly
-by using the
-.Nm utxrm
-command.
 .El
 .Pp
 Because this utility requires write-access to the user accounting
diff --git a/usr.sbin/utx/utx.c b/usr.sbin/utx/utx.c
index 99d9591ff3f..59edf3b47c3 100644
--- a/usr.sbin/utx/utx.c
+++ b/usr.sbin/utx/utx.c
@@ -95,10 +95,7 @@ int
 main(int argc, char *argv[])
 {
 
-	if (argc >= 2 && strcmp(getprogname(), "utxrm") == 0)
-		/* For compatibility. */
-		return (rm(&argv[1]));
-	else if (argc == 2 && strcmp(argv[1], "boot") == 0)
+	if (argc == 2 && strcmp(argv[1], "boot") == 0)
 		return (boot(BOOT_TIME));
 	else if (argc == 2 && strcmp(argv[1], "shutdown") == 0)
 		return (boot(SHUTDOWN_TIME));
@@ -108,7 +105,6 @@ main(int argc, char *argv[])
 	fprintf(stderr,
 	    "usage: utx boot\n"
 	    "       utx shutdown\n"
-	    "       utx rm identifier ...\n"
-	    "       utxrm identifier ...\n");
+	    "       utx rm identifier ...\n");
 	exit(1);
 }
diff --git a/usr.sbin/wpa/ndis_events/ndis_events.8 b/usr.sbin/wpa/ndis_events/ndis_events.8
index 9cc2bcdca94..44ce6b9bca7 100644
--- a/usr.sbin/wpa/ndis_events/ndis_events.8
+++ b/usr.sbin/wpa/ndis_events/ndis_events.8
@@ -81,7 +81,7 @@ The
 version performs the same functions as the
 .Tn Windows\[rg]
 one, except that it uses an
-.Xr ioctl 4
+.Xr ioctl 2
 and routing socket interface instead of WMI.
 .Pp
 Note that a single instance of
diff --git a/usr.sbin/ypset/ypset.c b/usr.sbin/ypset/ypset.c
index b63578ac3ad..d77909e90f0 100644
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@@ -75,7 +75,7 @@ bind_tohost(struct sockaddr_in *sin, char *dom, char *server)
 		bcopy (hp->h_addr_list[0],
 		       (u_long *)&ypsd.ypsetdom_binding.ypbind_binding_addr,
 		       sizeof (unsigned long));
-	} else if ((long)(server_addr = inet_addr (server)) == -1) {
+	} else if ((server_addr = inet_addr(server)) == INADDR_NONE) {
 		errx(1, "can't find address for %s", server);
 	} else
 		bcopy (&server_addr,
@@ -129,7 +129,8 @@ main(int argc, char *argv[])
 			domainname = optarg;
 			break;
 		case 'h':
-			if ((sin.sin_addr.s_addr = inet_addr(optarg)) == -1) {
+			if ((sin.sin_addr.s_addr = inet_addr(optarg)) ==
+			    INADDR_NONE) {
 				hent = gethostbyname(optarg);
 				if (hent == NULL)
 					errx(1, "host %s unknown", optarg);